Merge branch 'tb/git-mv-icase-fix'
Fix a corner case bug in "git mv" on case insensitive systems,
which was introduced in 2.29 timeframe.
* tb/git-mv-icase-fix:
git mv foo FOO ; git mv foo bar gave an assert
diff --git a/.gitattributes b/.gitattributes
index b08a141..b0044cf 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6,6 +6,7 @@
*.pm eol=lf diff=perl
*.py eol=lf diff=python
*.bat eol=crlf
+CODE_OF_CONDUCT.md -whitespace
/Documentation/**/*.txt eol=lf
/command-list.txt eol=lf
/GIT-VERSION-GEN eol=lf
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index e7b4e2f..c8755e3 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -16,4 +16,7 @@
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/.github/workflows/check-whitespace.yml b/.github/workflows/check-whitespace.yml
new file mode 100644
index 0000000..f148305
--- /dev/null
+++ b/.github/workflows/check-whitespace.yml
@@ -0,0 +1,71 @@
+name: check-whitespace
+
+# Get the repo with the commits(+1) in the series.
+# Process `git log --check` output to extract just the check errors.
+# Add a comment to the pull request with the check errors.
+
+on:
+ pull_request:
+ types: [opened, synchronize]
+
+jobs:
+ check-whitespace:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Set commit count
+ shell: bash
+ run: echo "COMMIT_DEPTH=$((1+$COMMITS))" >>$GITHUB_ENV
+ env:
+ COMMITS: ${{ github.event.pull_request.commits }}
+
+ - uses: actions/checkout@v2
+ with:
+ fetch-depth: ${{ env.COMMIT_DEPTH }}
+
+ - name: git log --check
+ id: check_out
+ run: |
+ log=
+ commit=
+ while read dash etc
+ do
+ case "${dash}" in
+ "---")
+ commit="${etc}"
+ ;;
+ "")
+ ;;
+ *)
+ if test -n "${commit}"
+ then
+ log="${log}\n${commit}"
+ echo ""
+ echo "--- ${commit}"
+ fi
+ commit=
+ log="${log}\n${dash} ${etc}"
+ echo "${dash} ${etc}"
+ ;;
+ esac
+ done <<< $(git log --check --pretty=format:"---% h% s" -${{github.event.pull_request.commits}})
+
+ if test -n "${log}"
+ then
+ echo "::set-output name=checkout::"${log}""
+ exit 2
+ fi
+
+ - name: Add Check Output as Comment
+ uses: actions/github-script@v3
+ id: add-comment
+ env:
+ log: ${{ steps.check_out.outputs.checkout }}
+ with:
+ script: |
+ await github.issues.createComment({
+ issue_number: context.issue.number,
+ owner: context.repo.owner,
+ repo: context.repo.repo,
+ body: `Whitespace errors found in workflow ${{ github.workflow }}:\n\n\`\`\`\n${process.env.log.replace(/\\n/g, "\n")}\n\`\`\``
+ })
+ if: ${{ failure() }}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..5f2f884
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,357 @@
+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: |
+ try {
+ // 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 (run.head_commit && 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;
+ }
+ }
+ } catch (e) {
+ core.warning(e);
+ }
+
+ 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:
+ fail-fast: false
+ 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 \
+ -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:
+ fail-fast: false
+ 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:
+ fail-fast: false
+ 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: linux-gcc-default
+ 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:
+ fail-fast: false
+ 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-18.04
+ 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/.gitignore b/.gitignore
index aebe7c0..3dcdb6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@
/git-bisect--helper
/git-blame
/git-branch
+/git-bugreport
/git-bundle
/git-cat-file
/git-check-attr
@@ -66,6 +67,7 @@
/git-filter-branch
/git-fmt-merge-msg
/git-for-each-ref
+/git-for-each-repo
/git-format-patch
/git-fsck
/git-fsck-objects
@@ -83,13 +85,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
@@ -113,7 +115,6 @@
/git-pack-redundant
/git-pack-objects
/git-pack-refs
-/git-parse-remote
/git-patch-id
/git-prune
/git-prune-packed
@@ -133,8 +134,6 @@
/git-remote-ftps
/git-remote-fd
/git-remote-ext
-/git-remote-testpy
-/git-remote-testsvn
/git-repack
/git-replace
/git-request-pull
@@ -147,11 +146,9 @@
/git-rm
/git-send-email
/git-send-pack
-/git-serve
/git-sh-i18n
/git-sh-i18n--envsubst
/git-sh-setup
-/git-sh-i18n
/git-shell
/git-shortlog
/git-show
@@ -189,6 +186,7 @@
/gitweb/gitweb.cgi
/gitweb/static/gitweb.js
/gitweb/static/gitweb.min.*
+/config-list.h
/command-list.h
*.tar.gz
*.dsc
@@ -196,6 +194,7 @@
/git.spec
*.exe
*.[aos]
+*.o.json
*.py[co]
.depend/
*.gcda
@@ -217,6 +216,7 @@
/tags
/TAGS
/cscope*
+/compile_commands.json
*.hcc
*.obj
*.lib
@@ -239,3 +239,4 @@
/git.VC.VC.opendb
/git.VC.db
*.dSYM
+/contrib/buildsystems/out
diff --git a/.travis.yml b/.travis.yml
index fc5730b..908330a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@
matrix:
include:
- - env: jobname=GIT_TEST_GETTEXT_POISON
+ - env: jobname=linux-gcc-default
os: linux
compiler:
addons:
@@ -32,7 +32,15 @@
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/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index fc4645d..65651be 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -8,73 +8,64 @@
## 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.
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible 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.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
## Our Standards
-Examples of behavior that contributes to creating a positive environment
-include:
+Examples of behavior that contributes to a positive environment for our
+community 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
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+ and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+ overall community
-Examples of unacceptable behavior by participants include:
+Examples of unacceptable behavior include:
-* The use of sexualized language or imagery and unwelcome sexual attention or
- advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
+* The use of sexualized language or imagery, and sexual attention or
+ advances of any kind
+* Trolling, insulting or 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
+* Publishing others' private information, such as a physical or email
+ address, without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting
-## Our Responsibilities
+## Enforcement 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.
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
-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.
+Community leaders 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, and will communicate reasons for moderation
+decisions when appropriate.
## 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.
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
## 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
+reported to the community leaders responsible for enforcement at
git@sfconservancy.org, or individually:
- Ævar Arnfjörð Bjarmason <avarab@gmail.com>
@@ -82,12 +73,73 @@
- Jeff King <peff@peff.net>
- Junio C Hamano <gitster@pobox.com>
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
## 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
+version 2.0, available at
+[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0].
+
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
+
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available
+at [https://www.contributor-covenant.org/translations][translations].
[homepage]: https://www.contributor-covenant.org
+[v2.0]: https://www.contributor-covenant.org/version/2/0/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq
diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines
index ed4e443..45465bc 100644
--- a/Documentation/CodingGuidelines
+++ b/Documentation/CodingGuidelines
@@ -91,16 +91,10 @@
- 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.
@@ -238,6 +232,18 @@
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 @@
- 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/Documentation/Makefile b/Documentation/Makefile
index 8fe829c..81d1bf7 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -17,9 +17,11 @@
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
+MAN5_TXT += gitmailmap.txt
MAN5_TXT += gitmodules.txt
MAN5_TXT += gitrepository-layout.txt
MAN5_TXT += gitweb.conf.txt
@@ -30,6 +32,7 @@
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
@@ -92,6 +95,7 @@
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
@@ -149,32 +153,9 @@
-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
@@ -292,7 +273,9 @@
../GIT-VERSION-FILE: FORCE
$(QUIET_SUBDIR0)../ $(QUIET_SUBDIR1) GIT-VERSION-FILE
+ifneq ($(MAKECMDGOALS),clean)
-include ../GIT-VERSION-FILE
+endif
#
# Determine "include::" file references in asciidoc files.
@@ -306,7 +289,9 @@
$(PERL_PATH) ./build-docdep.perl >$@+ $(QUIET_STDERR) && \
mv $@+ $@
+ifneq ($(MAKECMDGOALS),clean)
-include doc.dep
+endif
cmds_txt = cmds-ancillaryinterrogators.txt \
cmds-ancillarymanipulators.txt \
@@ -315,6 +300,7 @@
cmds-plumbingmanipulators.txt \
cmds-synchingrepositories.txt \
cmds-synchelpers.txt \
+ cmds-guide.txt \
cmds-purehelpers.txt \
cmds-foreignscminterface.txt
@@ -322,7 +308,7 @@
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
@@ -399,7 +385,10 @@
$(QUIET_GEN) cp $< $@
XSLT = docbook.xsl
-XSLTOPTS = --xinclude --stringparam html.stylesheet docbook-xsl.css
+XSLTOPTS =
+XSLTOPTS += --xinclude
+XSLTOPTS += --stringparam html.stylesheet docbook-xsl.css
+XSLTOPTS += --param generate.consistent.ids 1
user-manual.html: user-manual.xml $(XSLT)
$(QUIET_XSLTPROC)$(RM) $@+ $@ && \
diff --git a/Documentation/MyFirstContribution.txt b/Documentation/MyFirstContribution.txt
index 427274d..af0a9da 100644
--- a/Documentation/MyFirstContribution.txt
+++ b/Documentation/MyFirstContribution.txt
@@ -249,7 +249,7 @@
the body of your commit message, which should provide the bulk of the context.
Remember to be explicit and provide the "Why" of your change, especially if it
couldn't easily be understood from your diff. When editing your commit message,
-don't remove the Signed-off-by line which was added by `-s` above.
+don't remove the `Signed-off-by` trailer which was added by `-s` above.
----
psuh: add a built-in by popular demand
@@ -319,14 +319,14 @@
...
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`.
@@ -507,6 +507,9 @@
easier for your user, who can skip to the section they know contains the
information they need.
+NOTE: Before trying to build the docs, make sure you have the package `asciidoc`
+installed.
+
Now that you've written your manpage, you'll need to build it explicitly. We
convert your AsciiDoc to troff which is man-readable like so:
@@ -522,8 +525,6 @@
$ man Documentation/git-psuh.1
----
-NOTE: You may need to install the package `asciidoc` to get this to work.
-
While this isn't as satisfying as running through `git help`, you can at least
check that your help page looks right.
@@ -663,7 +664,7 @@
----
test_expect_success 'runs correctly with no args and good output' '
git psuh >actual &&
- test_i18ngrep Pony actual
+ grep Pony actual
'
----
@@ -1142,11 +1143,25 @@
comments. Woohoo! Now you can get back to work.
It's good manners to reply to each comment, notifying the reviewer that you have
-made the change requested, feel the original is better, or that the comment
+made the change suggested, feel the original is better, or that the comment
inspired you to do something a new way which is superior to both the original
and the suggested change. This way reviewers don't need to inspect your v2 to
figure out whether you implemented their comment or not.
+Reviewers may ask you about what you wrote in the patchset, either in
+the proposed commit log message or in the changes themselves. You
+should answer these questions in your response messages, but often the
+reason why reviewers asked these questions to understand what you meant
+to write is because your patchset needed clarification to be understood.
+
+Do not be satisfied by just answering their questions in your response
+and hear them say that they now understand what you wanted to say.
+Update your patches to clarify the points reviewers had trouble with,
+and prepare your v2; the words you used to explain your v1 to answer
+reviewers' questions may be useful thing to use. Your goal is to make
+your v2 clear enough so that it becomes unnecessary for you to give the
+same explanation to the next person who reads it.
+
If you are going to push back on a comment, be polite and explain why you feel
your original is better; be prepared that the reviewer may still disagree with
you, and the rest of the community may weigh in on one side or the other. As
@@ -1179,8 +1194,8 @@
[[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/Documentation/MyFirstObjectWalk.txt b/Documentation/MyFirstObjectWalk.txt
index aa828df..2d10eea 100644
--- a/Documentation/MyFirstObjectWalk.txt
+++ b/Documentation/MyFirstObjectWalk.txt
@@ -182,30 +182,6 @@
`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.,
@@ -357,9 +333,6 @@
...
while ((commit = get_revision(rev))) {
- if (!commit)
- continue;
-
strbuf_reset(&prettybuf);
pp_commit_easy(CMIT_FMT_ONELINE, commit, &prettybuf);
puts(prettybuf.buf);
@@ -391,17 +364,9 @@
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()`:
+First some setup. 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);
diff --git a/Documentation/RelNotes/2.17.6.txt b/Documentation/RelNotes/2.17.6.txt
new file mode 100644
index 0000000..2f181e8
--- /dev/null
+++ b/Documentation/RelNotes/2.17.6.txt
@@ -0,0 +1,16 @@
+Git v2.17.6 Release Notes
+=========================
+
+This release addresses the security issues CVE-2021-21300.
+
+Fixes since v2.17.5
+-------------------
+
+ * CVE-2021-21300:
+ On case-insensitive file systems with support for symbolic links,
+ if Git is configured globally to apply delay-capable clean/smudge
+ filters (such as Git LFS), Git could be fooled into running
+ remote code during a clone.
+
+Credit for finding and fixing this vulnerability goes to Matheus
+Tavares, helped by Johannes Schindelin.
diff --git a/Documentation/RelNotes/2.18.5.txt b/Documentation/RelNotes/2.18.5.txt
new file mode 100644
index 0000000..dfb1de4
--- /dev/null
+++ b/Documentation/RelNotes/2.18.5.txt
@@ -0,0 +1,6 @@
+Git v2.18.5 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.17.6 to address
+the security issue CVE-2021-21300; see the release notes for that
+version for details.
diff --git a/Documentation/RelNotes/2.19.6.txt b/Documentation/RelNotes/2.19.6.txt
new file mode 100644
index 0000000..bcca6cd
--- /dev/null
+++ b/Documentation/RelNotes/2.19.6.txt
@@ -0,0 +1,6 @@
+Git v2.19.6 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.17.6 and
+v2.18.5 to address the security issue CVE-2021-21300; see the
+release notes for these versions for details.
diff --git a/Documentation/RelNotes/2.20.5.txt b/Documentation/RelNotes/2.20.5.txt
new file mode 100644
index 0000000..1dfb784
--- /dev/null
+++ b/Documentation/RelNotes/2.20.5.txt
@@ -0,0 +1,6 @@
+Git v2.20.5 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.17.6, v2.18.5
+and v2.19.6 to address the security issue CVE-2021-21300; see
+the release notes for these versions for details.
diff --git a/Documentation/RelNotes/2.21.4.txt b/Documentation/RelNotes/2.21.4.txt
new file mode 100644
index 0000000..0089dd6
--- /dev/null
+++ b/Documentation/RelNotes/2.21.4.txt
@@ -0,0 +1,6 @@
+Git v2.21.4 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.17.6, v2.18.5,
+v2.19.6 and v2.20.5 to address the security issue CVE-2021-21300;
+see the release notes for these versions for details.
diff --git a/Documentation/RelNotes/2.22.5.txt b/Documentation/RelNotes/2.22.5.txt
new file mode 100644
index 0000000..6b280d9
--- /dev/null
+++ b/Documentation/RelNotes/2.22.5.txt
@@ -0,0 +1,7 @@
+Git v2.22.5 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.17.6,
+v2.18.5, v2.19.6, v2.20.5 and v2.21.4 to address the security
+issue CVE-2021-21300; see the release notes for these versions
+for details.
diff --git a/Documentation/RelNotes/2.23.4.txt b/Documentation/RelNotes/2.23.4.txt
new file mode 100644
index 0000000..6e5424d
--- /dev/null
+++ b/Documentation/RelNotes/2.23.4.txt
@@ -0,0 +1,7 @@
+Git v2.23.4 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.17.6, v2.18.5,
+v2.19.6, v2.20.5, v2.21.4 and v2.22.5 to address the security
+issue CVE-2021-21300; see the release notes for these versions
+for details.
diff --git a/Documentation/RelNotes/2.24.4.txt b/Documentation/RelNotes/2.24.4.txt
new file mode 100644
index 0000000..4e216ee
--- /dev/null
+++ b/Documentation/RelNotes/2.24.4.txt
@@ -0,0 +1,7 @@
+Git v2.24.4 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.17.6, v2.18.5,
+v2.19.6, v2.20.5, v2.21.4, v2.22.5 and v2.23.4 to address the
+security issue CVE-2021-21300; see the release notes for these
+versions for details.
diff --git a/Documentation/RelNotes/2.25.5.txt b/Documentation/RelNotes/2.25.5.txt
new file mode 100644
index 0000000..fcb9566
--- /dev/null
+++ b/Documentation/RelNotes/2.25.5.txt
@@ -0,0 +1,7 @@
+Git v2.25.5 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.17.6, v2.18.5,
+v2.19.6, v2.20.5, v2.21.4, v2.22.5, v2.23.4 and v2.24.4 to address
+the security issue CVE-2021-21300; see the release notes for
+these versions for details.
diff --git a/Documentation/RelNotes/2.26.3.txt b/Documentation/RelNotes/2.26.3.txt
new file mode 100644
index 0000000..4111c38
--- /dev/null
+++ b/Documentation/RelNotes/2.26.3.txt
@@ -0,0 +1,7 @@
+Git v2.26.3 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.17.6, v2.18.5,
+v2.19.6, v2.20.5, v2.21.4, v2.22.5, v2.23.4, v2.24.4 and v2.25.5
+to address the security issue CVE-2021-21300; see the release
+notes for these versions for details.
diff --git a/Documentation/RelNotes/2.27.0.txt b/Documentation/RelNotes/2.27.0.txt
new file mode 100644
index 0000000..15518d0
--- /dev/null
+++ b/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/Documentation/RelNotes/2.27.1.txt b/Documentation/RelNotes/2.27.1.txt
new file mode 100644
index 0000000..a1e08a9
--- /dev/null
+++ b/Documentation/RelNotes/2.27.1.txt
@@ -0,0 +1,7 @@
+Git v2.27.1 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.17.6, v2.18.5,
+v2.19.6, v2.20.5, v2.21.4, v2.22.5, v2.23.4, v2.24.4, v2.25.5
+and v2.26.3 to address the security issue CVE-2021-21300; see
+the release notes for these versions for details.
diff --git a/Documentation/RelNotes/2.28.0.txt b/Documentation/RelNotes/2.28.0.txt
new file mode 100644
index 0000000..6baf781
--- /dev/null
+++ b/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/Documentation/RelNotes/2.28.1.txt b/Documentation/RelNotes/2.28.1.txt
new file mode 100644
index 0000000..8484c82
--- /dev/null
+++ b/Documentation/RelNotes/2.28.1.txt
@@ -0,0 +1,7 @@
+Git v2.28.1 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.17.6, v2.18.5,
+v2.19.6, v2.20.5, v2.21.4, v2.22.5, v2.23.4, v2.24.4, v2.25.5,
+v2.26.3 and v2.27.1 to address the security issue CVE-2021-21300;
+see the release notes for these versions for details.
diff --git a/Documentation/RelNotes/2.29.0.txt b/Documentation/RelNotes/2.29.0.txt
new file mode 100644
index 0000000..06ba2f8
--- /dev/null
+++ b/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/Documentation/RelNotes/2.29.1.txt b/Documentation/RelNotes/2.29.1.txt
new file mode 100644
index 0000000..295ee21
--- /dev/null
+++ b/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/Documentation/RelNotes/2.29.2.txt b/Documentation/RelNotes/2.29.2.txt
new file mode 100644
index 0000000..632b5b5
--- /dev/null
+++ b/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/Documentation/RelNotes/2.29.3.txt b/Documentation/RelNotes/2.29.3.txt
new file mode 100644
index 0000000..e10eedb
--- /dev/null
+++ b/Documentation/RelNotes/2.29.3.txt
@@ -0,0 +1,8 @@
+Git v2.29.3 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.17.6,
+v2.18.5, v2.19.6, v2.20.5, v2.21.4, v2.22.5, v2.23.4, v2.24.4,
+v2.25.5, v2.26.3, v2.27.1 and v2.28.1 to address the security
+issue CVE-2021-21300; see the release notes for these versions
+for details.
diff --git a/Documentation/RelNotes/2.30.0.txt b/Documentation/RelNotes/2.30.0.txt
new file mode 100644
index 0000000..c2f1dc7
--- /dev/null
+++ b/Documentation/RelNotes/2.30.0.txt
@@ -0,0 +1,401 @@
+Git 2.30 Release Notes
+======================
+
+Updates since v2.29
+-------------------
+
+UI, Workflows & Features
+
+ * Userdiff for PHP update.
+
+ * Userdiff for Rust update.
+
+ * Userdiff for CSS update.
+
+ * The command line completion script (in contrib/) learned that "git
+ stash show" takes the options "git diff" takes.
+
+ * "git worktree list" now shows if each worktree is locked. This
+ possibly may open us to show other kinds of states in the future.
+
+ * "git maintenance", an extended big brother of "git gc", continues
+ to evolve.
+
+ * "git push --force-with-lease[=<ref>]" can easily be misused to lose
+ commits unless the user takes good care of their own "git fetch".
+ A new option "--force-if-includes" attempts to ensure that what is
+ being force-pushed was created after examining the commit at the
+ tip of the remote ref that is about to be force-replaced.
+
+ * "git clone" learned clone.defaultremotename configuration variable
+ to customize what nickname to use to call the remote the repository
+ was cloned from.
+
+ * "git checkout" learned to use checkout.guess configuration variable
+ and enable/disable its "--[no-]guess" option accordingly.
+
+ * "git resurrect" script (in contrib/) learned that the object names
+ may be longer than 40-hex depending on the hash function in use.
+
+ * "git diff A...B" learned "git diff --merge-base A B", which is a
+ longer short-hand to say the same thing.
+
+ * A sample 'push-to-checkout' hook, that performs the same as
+ what the built-in default action does, has been added.
+
+ * "git diff" family of commands learned the "-I<regex>" option to
+ ignore hunks whose changed lines all match the given pattern.
+
+ * The userdiff pattern learned to identify the function definition in
+ POSIX shells and bash.
+
+ * "git checkout-index" did not consistently signal an error with its
+ exit status, but now it does.
+
+ * A commit and tag object may have CR at the end of each and
+ every line (you can create such an object with hash-object or
+ using --cleanup=verbatim to decline the default clean-up
+ action), but it would make it impossible to have a blank line
+ to separate the title from the body of the message. We are now
+ more lenient and accept a line with lone CR on it as a blank line,
+ too.
+
+ * Exit codes from "git remote add" etc. were not usable by scripted
+ callers, but now they are.
+
+ * "git archive" now allows compression level higher than "-9"
+ when generating tar.gz output.
+
+ * Zsh autocompletion (in contrib/) update.
+
+ * The maximum length of output filenames "git format-patch" creates
+ has become configurable (used to be capped at 64).
+
+ * "git rev-parse" learned the "--end-of-options" to help scripts to
+ safely take a parameter that is supposed to be a revision, e.g.
+ "git rev-parse --verify -q --end-of-options $rev".
+
+ * The command line completion script (in contrib/) learned to expand
+ commands that are alias of alias.
+
+ * "git update-ref --stdin" learns to take multiple transactions in a
+ single session.
+
+ * Various subcommands of "git config" that take value_regex
+ learned the "--literal-value" option to take the value_regex option
+ as a literal string.
+
+ * The transport layer was taught to optionally exchange the session
+ ID assigned by the trace2 subsystem during fetch/push transactions.
+
+ * "git imap-send" used to ignore configuration variables like
+ core.askpass; this has been corrected.
+
+ * "git $cmd $args", when $cmd is not a recognised subcommand, by
+ default tries to see if $cmd is a typo of an existing subcommand
+ and optionally executes the corrected command if there is only one
+ possibility, depending on the setting of help.autocorrect; the
+ users can now disable the whole thing, including the cycles spent
+ to find a likely typo, by setting the configuration variable to
+ 'never'.
+
+ * "@" sometimes worked (e.g. "git push origin @:there") as a part of
+ a refspec element, but "git push origin @" did not work, which has
+ been corrected.
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * Use "git archive" more to produce the release tarball.
+
+ * GitHub Actions automated test improvement to skip tests on a tree
+ identical to what has already been tested.
+
+ * Test-coverage for running commit-graph task "git maintenance" has
+ been extended.
+
+ * Our test scripts can be told to run only individual pieces while
+ skipping others with the "--run=..." option; they were taught to
+ take a substring of test title, in addition to numbers, to name the
+ test pieces to run.
+
+ * Adjust tests so that they won't scream when the default initial
+ branch name is different from 'master'.
+
+ * Rewriting "git bisect" in C continues.
+
+ * More preliminary tests have been added to document desired outcomes
+ of various "directory rename" situations.
+
+ * Micro clean-up of a couple of test scripts.
+
+ * "git diff" and other commands that share the same machinery to
+ compare with working tree files have been taught to take advantage
+ of the fsmonitor data when available.
+
+ * The code to detect premature EOF in the sideband demultiplexer has
+ been cleaned up.
+
+ * "git fetch --depth=<n>" over the stateless RPC / smart HTTP
+ transport handled EOF from the client poorly at the server end.
+
+ * A specialization of hashmap that uses a string as key has been
+ introduced. Hopefully it will see wider use over time.
+
+ * "git bisect start/next" in a large span of history spends a lot of
+ time trying to come up with exactly the half-way point; this can be
+ optimized by stopping when we see a commit that is close enough to
+ the half-way point.
+
+ * A lazily defined test prerequisite can now be defined in terms of
+ another lazily defined test prerequisite.
+
+ * Expectation for the original contributor after responding to a
+ review comment to use the explanation in a patch update has been
+ described.
+
+ * Multiple "credential-store" backends can race to lock the same
+ file, causing everybody else but one to fail---reattempt locking
+ with some timeout to reduce the rate of the failure.
+
+ * "git-parse-remote" shell script library outlived its usefulness.
+
+ * Like die() and error(), a call to warning() will also trigger a
+ trace2 event.
+
+ * Use of non-reentrant localtime() has been removed.
+
+ * Non-reentrant time-related library functions and ctime/asctime with
+ awkward calling interfaces are banned from the codebase.
+
+
+Fixes since v2.29
+-----------------
+
+ * 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.
+ (merge 5f35edd9d7 jk/committer-date-is-author-date-fix later to maint).
+
+ * "git checkout -p A...B [-- <path>]" did not work, even though the
+ same command without "-p" correctly used the merge-base between
+ commits A and B.
+ (merge 35166b1fb5 dl/checkout-p-merge-base later to maint).
+
+ * The side-band status report can be sent at the same time as the
+ primary payload multiplexed, but the demultiplexer on the receiving
+ end incorrectly split a single status report into two, which has
+ been corrected.
+ (merge 712b0377db js/avoid-split-sideband-message later to maint).
+
+ * "git fast-import" wasted a lot of memory when many marks were in use.
+ (merge 3f018ec716 jk/fast-import-marks-alloc-fix later to maint).
+
+ * A test helper "test_cmp A B" was taught to diagnose missing files A
+ or B as a bug in test, but some tests legitimately wanted to notice
+ a failure to even create file B as an error, in addition to leaving
+ the expected result in it, and were misdiagnosed as a bug. This
+ has been corrected.
+ (merge 262d5ad5a5 es/test-cmp-typocatcher later to maint).
+
+ * When "git commit-graph" detects the same commit recorded more than
+ once while it is merging the layers, it used to die. The code now
+ ignores all but one of them and continues.
+ (merge 85102ac71b ds/commit-graph-merging-fix later to maint).
+
+ * The meaning of a Signed-off-by trailer can vary from project to
+ project; this and also what it means to this project has been
+ clarified in the documentation.
+ (merge 3abd4a67d9 bk/sob-dco later to maint).
+
+ * "git credential' didn't honor the core.askPass configuration
+ variable (among other things), which has been corrected.
+ (merge 567ad2c0f9 tk/credential-config later to maint).
+
+ * Dev support to catch a tentative definition of a variable in our C
+ code as an error.
+ (merge 5539183622 jk/no-common later to maint).
+
+ * "git rebase --rebase-merges" did not correctly pass --gpg-sign
+ command line option to underlying "git merge" when replaying a merge
+ using non-default merge strategy or when replaying an octopus merge
+ (because replaying a two-head merge with the default strategy was
+ done in a separate codepath, the problem did not trigger for most
+ users), which has been corrected.
+ (merge 43ad4f2eca sc/sequencer-gpg-octopus later to maint).
+
+ * "git apply -R" did not handle patches that touch the same path
+ twice correctly, which has been corrected. This is most relevant
+ in a patch that changes a path from a regular file to a symbolic
+ link (and vice versa).
+ (merge b0f266de11 jt/apply-reverse-twice later to maint).
+
+ * A recent oid->hash conversion missed one spot, breaking "git svn".
+ (merge 03bb366de4 bc/svn-hash-oid-fix later to maint).
+
+ * The documentation on the "--abbrev=<n>" option did not say the
+ output may be longer than "<n>" hexdigits, which has been
+ clarified.
+ (merge cda34e0d0c jc/abbrev-doc later to maint).
+
+ * "git p4" now honors init.defaultBranch configuration.
+ (merge 1b09d1917f js/p4-default-branch later to maint).
+
+ * Recently the format of an internal state file "rebase -i" uses has
+ been tightened up for consistency, which would hurt those who start
+ "rebase -i" with old git and then continue with new git. Loosen
+ the reader side a bit (which we may want to tighten again in a year
+ or so).
+ (merge c779386182 jc/sequencer-stopped-sha-simplify later to maint).
+
+ * The code to see if "git stash drop" can safely remove refs/stash
+ has been made more careful.
+ (merge 4f44c5659b rs/empty-reflog-check-fix later to maint).
+
+ * "git log -L<range>:<path>" is documented to take no pathspec, but
+ this was not enforced by the command line option parser, which has
+ been corrected.
+ (merge 39664cb0ac jc/line-log-takes-no-pathspec later to maint).
+
+ * "git format-patch --output=there" did not work as expected and
+ instead crashed. The option is now supported.
+ (merge dc1672dd10 jk/format-patch-output later to maint).
+
+ * Define ARM64 compiled with MSVC to be little-endian.
+ (merge 0c038fc65a dg/bswap-msvc later to maint).
+
+ * "git rebase -i" did not store ORIG_HEAD correctly.
+ (merge 8843302307 pw/rebase-i-orig-head later to maint).
+
+ * "git blame -L :funcname -- path" did not work well for a path for
+ which a userdiff driver is defined.
+
+ * "make DEVELOPER=1 sparse" used to run sparse and let it emit
+ warnings; now such warnings will cause an error.
+ (merge 521dc56270 jc/sparse-error-for-developer-build later to maint).
+
+ * "git blame --ignore-revs-file=<file>" learned to ignore a
+ non-existent object name in the input, instead of complaining.
+ (merge c714d05875 jc/blame-ignore-fix later to maint).
+
+ * Running "git diff" while allowing external diff in a state with
+ unmerged paths used to segfault, which has been corrected.
+ (merge d66851806f jk/diff-release-filespec-fix later to maint).
+
+ * Build configuration cleanup.
+ (merge b990f02fd8 ab/config-mak-uname-simplify later to maint).
+
+ * Fix regression introduced when nvimdiff support in mergetool was added.
+ (merge 12026f46e7 pd/mergetool-nvimdiff later to maint).
+
+ * The exchange between receive-pack and proc-receive hook did not
+ carefully check for errors.
+
+ * The code was not prepared to deal with pack .idx file that is
+ larger than 4GB.
+ (merge 81c4c5cf2e jk/4gb-idx later to maint).
+
+ * Since jgit does not yet work with SHA-256 repositories, mark the
+ tests that use it not to run unless we are testing with ShA-1
+ repositories.
+ (merge ea699b4adc sg/t5310-jgit-wants-sha1 later to maint).
+
+ * Config parser fix for "git notes".
+ (merge 45fef1599a na/notes-displayref-is-not-boolean later to maint).
+
+ * Move a definition of compatibility wrapper from cache.h to
+ git-compat-util.h
+ (merge a76b138daa hn/sleep-millisec-decl later to maint).
+
+ * Error message fix.
+ (merge eaf5341538 km/stash-error-message-fix later to maint).
+
+ * "git pull --rebase --recurse-submodules" checked for local changes
+ in a wrong range and failed to run correctly when it should.
+ (merge 5176f20ffe pb/pull-rebase-recurse-submodules later to maint).
+
+ * "git push" that is killed may leave a pack-objects process behind,
+ still computing to find a good compression, wasting cycles. This
+ has been corrected.
+ (merge 8b59935114 jk/stop-pack-objects-when-push-is-killed later to maint).
+
+ * "git fetch" that is killed may leave a pack-objects process behind,
+ still computing to find a good compression, wasting cycles. This
+ has been corrected.
+ (merge 309a4028e7 jk/stop-pack-objects-when-fetch-is-killed later to maint).
+
+ * "git add -i" failed to honor custom colors configured to show
+ patches, which has been corrected.
+ (merge 96386faa03 js/add-i-color-fix later to maint).
+
+ * Processes that access packdata while the .idx file gets removed
+ (e.g. while repacking) did not fail or fall back gracefully as they
+ could.
+ (merge 506ec2fbda tb/idx-midx-race-fix later to maint).
+
+ * "git apply" adjusted the permission bits of working-tree files and
+ directories according to core.sharedRepository setting by mistake and
+ for a long time, which has been corrected.
+ (merge eb3c027e17 mt/do-not-use-scld-in-working-tree later to maint).
+
+ * "fetch-pack" could pass NULL pointer to unlink(2) when it sees an
+ invalid filename; the error checking has been tightened to make
+ this impossible.
+ (merge 6031af387e rs/fetch-pack-invalid-lockfile later to maint).
+
+ * "git maintenance run/start/stop" needed to be run in a repository
+ to hold the lockfile they use, but didn't make sure they are
+ actually in a repository, which has been corrected.
+
+ * The glossary described a branch as an "active" line of development,
+ which is misleading---a stale and non-moving branch is still a
+ branch.
+ (merge eef1ceabd8 so/glossary-branch-is-not-necessarily-active later to maint).
+
+ * Newer versions of xsltproc can assign IDs in HTML documents it
+ generates in a consistent manner. Use the feature to help format
+ HTML version of the user manual reproducibly.
+ (merge 3569e11d69 ae/doc-reproducible-html later to maint).
+
+ * Tighten error checking in the codepath that responds to "git fetch".
+ (merge d43a21bdbb jk/check-config-parsing-error-in-upload-pack later to maint).
+
+ * "git pack-redundant" when there is only one packfile used to crash,
+ which has been corrected.
+ (merge 0696232390 jx/pack-redundant-on-single-pack later to maint).
+
+ * Other code cleanup, docfix, build fix, etc.
+ (merge 3e0a5dc9af cc/doc-filter-branch-typofix later to maint).
+ (merge 32c83afc2c cw/ci-ghwf-check-ws-errors later to maint).
+ (merge 5eb2ed691b rs/tighten-callers-of-deref-tag later to maint).
+ (merge 6db29ab213 jk/fast-import-marks-cleanup later to maint).
+ (merge e5cf6d3df4 nk/dir-c-comment-update later to maint).
+ (merge 5710dcce74 jk/report-fn-typedef later to maint).
+ (merge 9a82db1056 en/sequencer-rollback-lock-cleanup later to maint).
+ (merge 4e1bee9a99 js/t7006-cleanup later to maint).
+ (merge f5bcde6c58 es/tutorial-mention-asciidoc-early later to maint).
+ (merge 714d491af0 so/format-patch-doc-on-default-diff-format later to maint).
+ (merge 0795df4b9b rs/clear-commit-marks-in-repo later to maint).
+ (merge 9542d56379 sd/prompt-local-variable later to maint).
+ (merge 06d43fad18 rs/pack-write-hashwrite-simplify later to maint).
+ (merge b7e20b4373 mc/typofix later to maint).
+ (merge f6bcd9a8a4 js/test-whitespace-fixes later to maint).
+ (merge 53b67a801b js/test-file-size later to maint).
+ (merge 970909c2a7 rs/hashwrite-be64 later to maint).
+ (merge 5a923bb1f0 ma/list-object-filter-opt-msgfix later to maint).
+ (merge 1c3e412916 rs/archive-plug-leak-refname later to maint).
+ (merge d44e5267ea rs/plug-diff-cache-leak later to maint).
+ (merge 793c1464d3 ab/gc-keep-base-option later to maint).
+ (merge b86339b12b mt/worktree-error-message-fix later to maint).
+ (merge e01ae2a4a7 js/pull-rebase-use-advise later to maint).
+ (merge e63d774242 sn/config-doc-typofix later to maint).
+ (merge 08e9df2395 jk/multi-line-indent-style-fix later to maint).
+ (merge e66590348a da/vs-build-iconv-fix later to maint).
+ (merge 7fe07275be js/cmake-extra-built-ins-fix later to maint).
+ (merge 633eebe142 jb/midx-doc-update later to maint).
+ (merge 5885367e8f jh/index-v2-doc-on-fsmn later to maint).
+ (merge 14639a4779 jc/compat-util-setitimer-fix later to maint).
+ (merge 56f56ac50b ab/unreachable-break later to maint).
+ (merge 731d578b4f rb/nonstop-config-mak-uname-update later to maint).
+ (merge f4698738f9 es/perf-export-fix later to maint).
+ (merge 773c694142 nk/refspecs-negative-fix later to maint).
diff --git a/Documentation/RelNotes/2.30.1.txt b/Documentation/RelNotes/2.30.1.txt
new file mode 100644
index 0000000..249ef14
--- /dev/null
+++ b/Documentation/RelNotes/2.30.1.txt
@@ -0,0 +1,55 @@
+Git v2.30.1 Release Notes
+=========================
+
+This release is primarily to merge fixes accumulated on the 'master'
+front to prepare for 2.31 release that are still relevant to 2.30.x
+maintenance track.
+
+Fixes since v2.30
+-----------------
+
+ * "git fetch --recurse-submodules" failed to update a submodule
+ when it has an uninitialized (hence of no interest to the user)
+ sub-submodule, which has been corrected.
+
+ * Command line error of "git rebase" are diagnosed earlier.
+
+ * "git stash" did not work well in a sparsely checked out working
+ tree.
+
+ * Some tests expect that "ls -l" output has either '-' or 'x' for
+ group executable bit, but setgid bit can be inherited from parent
+ directory and make these fields 'S' or 's' instead, causing test
+ failures.
+
+ * "git for-each-repo --config=<var> <cmd>" should not run <cmd> for
+ any repository when the configuration variable <var> is not defined
+ even once.
+
+ * "git mergetool --tool-help" was broken in 2.29 and failed to list
+ all the available tools.
+
+ * Fix for procedure to building CI test environment for mac.
+
+ * Newline characters in the host and path part of git:// URL are
+ now forbidden.
+
+ * When more than one commit with the same patch ID appears on one
+ side, "git log --cherry-pick A...B" did not exclude them all when a
+ commit with the same patch ID appears on the other side. Now it
+ does.
+
+ * Documentation for "git fsck" lost stale bits that has become
+ incorrect.
+
+ * Doc for packfile URI feature has been clarified.
+
+ * The implementation of "git branch --sort" wrt the detached HEAD
+ display has always been hacky, which has been cleaned up.
+
+ * Our setting of GitHub CI test jobs were a bit too eager to give up
+ once there is even one failure found. Tweak the knob to allow
+ other jobs keep running even when we see a failure, so that we can
+ find more failures in a single run.
+
+Also contains minor documentation updates and code clean-ups.
diff --git a/Documentation/RelNotes/2.30.2.txt b/Documentation/RelNotes/2.30.2.txt
new file mode 100644
index 0000000..bada398
--- /dev/null
+++ b/Documentation/RelNotes/2.30.2.txt
@@ -0,0 +1,8 @@
+Git v2.30.2 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.17.6, v2.18.5,
+v2.19.6, v2.20.5, v2.21.4, v2.22.5, v2.23.4, v2.24.4, v2.25.5,
+v2.26.3, v2.27.1, v2.28.1 and v2.29.3 to address the security
+issue CVE-2021-21300; see the release notes for these versions
+for details.
diff --git a/Documentation/RelNotes/2.31.0.txt b/Documentation/RelNotes/2.31.0.txt
new file mode 100644
index 0000000..cf0c7d8
--- /dev/null
+++ b/Documentation/RelNotes/2.31.0.txt
@@ -0,0 +1,365 @@
+Git 2.31 Release Notes
+======================
+
+Updates since v2.30
+-------------------
+
+Backward incompatible and other important changes
+
+ * The "pack-redundant" command, which has been left stale with almost
+ unusable performance issues, now warns loudly when it gets used, as
+ we no longer want to recommend its use (instead just "repack -d"
+ instead).
+
+ * The development community has adopted Contributor Covenant v2.0 to
+ update from v1.4 that we have been using.
+
+ * The support for deprecated PCRE1 library has been dropped.
+
+ * Fixes for CVE-2021-21300 in Git 2.30.2 (and earlier) is included.
+
+
+UI, Workflows & Features
+
+ * The "--format=%(trailers)" mechanism gets enhanced to make it
+ easier to design output for machine consumption.
+
+ * When a user does not tell "git pull" to use rebase or merge, the
+ command gives a loud message telling a user to choose between
+ rebase or merge but creates a merge anyway, forcing users who would
+ want to rebase to redo the operation. Fix an early part of this
+ problem by tightening the condition to give the message---there is
+ no reason to stop or force the user to choose between rebase or
+ merge if the history fast-forwards.
+
+ * The configuration variable 'core.abbrev' can be set to 'no' to
+ force no abbreviation regardless of the hash algorithm.
+
+ * "git rev-parse" can be explicitly told to give output as absolute
+ or relative path with the `--path-format=(absolute|relative)` option.
+
+ * Bash completion (in contrib/) update to make it easier for
+ end-users to add completion for their custom "git" subcommands.
+
+ * "git maintenance" learned to drive scheduled maintenance on
+ platforms whose native scheduling methods are not 'cron'.
+
+ * After expiring a reflog and making a single commit, the reflog for
+ the branch would record a single entry that knows both @{0} and
+ @{1}, but we failed to answer "what commit were we on?", i.e. @{1}
+
+ * "git bundle" learns "--stdin" option to read its refs from the
+ standard input. Also, it now does not lose refs whey they point
+ at the same object.
+
+ * "git log" learned a new "--diff-merges=<how>" option.
+
+ * "git ls-files" can and does show multiple entries when the index is
+ unmerged, which is a source for confusion unless -s/-u option is in
+ use. A new option --deduplicate has been introduced.
+
+ * `git worktree list` now annotates worktrees as prunable, shows
+ locked and prunable attributes in --porcelain mode, and gained
+ a --verbose option.
+
+ * "git clone" tries to locally check out the branch pointed at by
+ HEAD of the remote repository after it is done, but the protocol
+ did not convey the information necessary to do so when copying an
+ empty repository. The protocol v2 learned how to do so.
+
+ * There are other ways than ".." for a single token to denote a
+ "commit range", namely "<rev>^!" and "<rev>^-<n>", but "git
+ range-diff" did not understand them.
+
+ * The "git range-diff" command learned "--(left|right)-only" option
+ to show only one side of the compared range.
+
+ * "git mergetool" feeds three versions (base, local and remote) of
+ a conflicted path unmodified. The command learned to optionally
+ prepare these files with unconflicted parts already resolved.
+
+ * The .mailmap is documented to be read only from the root level of a
+ working tree, but a stray file in a bare repository also was read
+ by accident, which has been corrected.
+
+ * "git maintenance" tool learned a new "pack-refs" maintenance task.
+
+ * The error message given when a configuration variable that is
+ expected to have a boolean value has been improved.
+
+ * Signed commits and tags now allow verification of objects, whose
+ two object names (one in SHA-1, the other in SHA-256) are both
+ signed.
+
+ * "git rev-list" command learned "--disk-usage" option.
+
+ * "git {diff,log} --{skip,rotate}-to=<path>" allows the user to
+ discard diff output for early paths or move them to the end of the
+ output.
+
+ * "git difftool" learned "--skip-to=<path>" option to restart an
+ interrupted session from an arbitrary path.
+
+ * "git grep" has been tweaked to be limited to the sparse checkout
+ paths.
+
+ * "git rebase --[no-]fork-point" gained a configuration variable
+ rebase.forkPoint so that users do not have to keep specifying a
+ non-default setting.
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * A 3-year old test that was not testing anything useful has been
+ corrected.
+
+ * Retire more names with "sha1" in it.
+
+ * The topological walk codepath is covered by new trace2 stats.
+
+ * Update the Code-of-conduct to version 2.0 from the upstream (we've
+ been using version 1.4).
+
+ * "git mktag" validates its input using its own rules before writing
+ a tag object---it has been updated to share the logic with "git
+ fsck".
+
+ * Two new ways to feed configuration variable-value pairs via
+ environment variables have been introduced, and the way
+ GIT_CONFIG_PARAMETERS encodes variable/value pairs has been tweaked
+ to make it more robust.
+
+ * Tests have been updated so that they do not to get affected by the
+ name of the default branch "git init" creates.
+
+ * "git fetch" learns to treat ref updates atomically in all-or-none
+ fashion, just like "git push" does, with the new "--atomic" option.
+
+ * The peel_ref() API has been replaced with peel_iterated_oid().
+
+ * The .use_shell flag in struct child_process that is passed to
+ run_command() API has been clarified with a bit more documentation.
+
+ * Document, clean-up and optimize the code around the cache-tree
+ extension in the index.
+
+ * The ls-refs protocol operation has been optimized to narrow the
+ sub-hierarchy of refs/ it walks to produce response.
+
+ * When removing many branches and tags, the code used to do so one
+ ref at a time. There is another API it can use to delete multiple
+ refs, and it makes quite a lot of performance difference when the
+ refs are packed.
+
+ * The "pack-objects" command needs to iterate over all the tags when
+ automatic tag following is enabled, but it actually iterated over
+ all refs and then discarded everything outside "refs/tags/"
+ hierarchy, which was quite wasteful.
+
+ * A perf script was made more portable.
+
+ * Our setting of GitHub CI test jobs were a bit too eager to give up
+ once there is even one failure found. Tweak the knob to allow
+ other jobs keep running even when we see a failure, so that we can
+ find more failures in a single run.
+
+ * We've carried compatibility codepaths for compilers without
+ variadic macros for quite some time, but the world may be ready for
+ them to be removed. Force compilation failure on exotic platforms
+ where variadic macros are not available to find out who screams in
+ such a way that we can easily revert if it turns out that the world
+ is not yet ready.
+
+ * Code clean-up to ensure our use of hashtables using object names as
+ keys use the "struct object_id" objects, not the raw hash values.
+
+ * Lose the debugging aid that may have been useful in the past, but
+ no longer is, in the "grep" codepaths.
+
+ * Some pretty-format specifiers do not need the data in commit object
+ (e.g. "%H"), but we were over-eager to load and parse it, which has
+ been made even lazier.
+
+ * Get rid of "GETTEXT_POISON" support altogether, which may or may
+ not be controversial.
+
+ * Introduce an on-disk file to record revindex for packdata, which
+ traditionally was always created on the fly and only in-core.
+
+ * The commit-graph learned to use corrected commit dates instead of
+ the generation number to help topological revision traversal.
+
+ * Piecemeal of rewrite of "git bisect" in C continues.
+
+ * When a pager spawned by us exited, the trace log did not record its
+ exit status correctly, which has been corrected.
+
+ * Removal of GIT_TEST_GETTEXT_POISON continues.
+
+ * The code to implement "git merge-base --independent" was poorly
+ done and was kept from the very beginning of the feature.
+
+ * Preliminary changes to fsmonitor integration.
+
+ * Performance improvements for rename detection.
+
+ * The common code to deal with "chunked file format" that is shared
+ by the multi-pack-index and commit-graph files have been factored
+ out, to help codepaths for both filetypes to become more robust.
+
+ * The approach to "fsck" the incoming objects in "index-pack" is
+ attractive for performance reasons (we have them already in core,
+ inflated and ready to be inspected), but fundamentally cannot be
+ applied fully when we receive more than one pack stream, as a tree
+ object in one pack may refer to a blob object in another pack as
+ ".gitmodules", when we want to inspect blobs that are used as
+ ".gitmodules" file, for example. Teach "index-pack" to emit
+ objects that must be inspected later and check them in the calling
+ "fetch-pack" process.
+
+ * The logic to handle "trailer" related placeholders in the
+ "--format=" mechanisms in the "log" family and "for-each-ref"
+ family is getting unified.
+
+ * Raise the buffer size used when writing the index file out from
+ (obviously too small) 8kB to (clearly sufficiently large) 128kB.
+
+ * It is reported that open() on some platforms (e.g. macOS Big Sur)
+ can return EINTR even though our timers are set up with SA_RESTART.
+ A workaround has been implemented and enabled for macOS to rerun
+ open() transparently from the caller when this happens.
+
+
+Fixes since v2.30
+-----------------
+
+ * Diagnose command line error of "git rebase" early.
+
+ * Clean up option descriptions in "git cmd --help".
+
+ * "git stash" did not work well in a sparsely checked out working
+ tree.
+
+ * Some tests expect that "ls -l" output has either '-' or 'x' for
+ group executable bit, but setgid bit can be inherited from parent
+ directory and make these fields 'S' or 's' instead, causing test
+ failures.
+
+ * "git for-each-repo --config=<var> <cmd>" should not run <cmd> for
+ any repository when the configuration variable <var> is not defined
+ even once.
+
+ * Fix 2.29 regression where "git mergetool --tool-help" fails to list
+ all the available tools.
+
+ * Fix for procedure to building CI test environment for mac.
+
+ * The implementation of "git branch --sort" wrt the detached HEAD
+ display has always been hacky, which has been cleaned up.
+
+ * Newline characters in the host and path part of git:// URL are
+ now forbidden.
+
+ * "git diff" showed a submodule working tree with untracked cruft as
+ "Submodule commit <objectname>-dirty", but a natural expectation is
+ that the "-dirty" indicator would align with "git describe --dirty",
+ which does not consider having untracked files in the working tree
+ as source of dirtiness. The inconsistency has been fixed.
+
+ * When more than one commit with the same patch ID appears on one
+ side, "git log --cherry-pick A...B" did not exclude them all when a
+ commit with the same patch ID appears on the other side. Now it
+ does.
+
+ * Documentation for "git fsck" lost stale bits that has become
+ incorrect.
+
+ * Doc fix for packfile URI feature.
+
+ * When "git rebase -i" processes "fixup" insn, there is no reason to
+ clean up the commit log message, but we did the usual stripspace
+ processing. This has been corrected.
+ (merge f7d42ceec5 js/rebase-i-commit-cleanup-fix later to maint).
+
+ * Fix in passing custom args from "git clone" to "upload-pack" on the
+ other side.
+ (merge ad6b5fefbd jv/upload-pack-filter-spec-quotefix later to maint).
+
+ * The command line completion (in contrib/) completed "git branch -d"
+ with branch names, but "git branch -D" offered tagnames in addition,
+ which has been corrected. "git branch -M" had the same problem.
+ (merge 27dc071b9a jk/complete-branch-force-delete later to maint).
+
+ * When commands are started from a subdirectory, they may have to
+ compare the path to the subdirectory (called prefix and found out
+ from $(pwd)) with the tracked paths. On macOS, $(pwd) and
+ readdir() yield decomposed path, while the tracked paths are
+ usually normalized to the precomposed form, causing mismatch. This
+ has been fixed by taking the same approach used to normalize the
+ command line arguments.
+ (merge 5c327502db tb/precompose-prefix-too later to maint).
+
+ * Even though invocations of "die()" were logged to the trace2
+ system, "BUG()"s were not, which has been corrected.
+ (merge 0a9dde4a04 jt/trace2-BUG later to maint).
+
+ * "git grep --untracked" is meant to be "let's ALSO find in these
+ files on the filesystem" when looking for matches in the working
+ tree files, and does not make any sense if the primary search is
+ done against the index, or the tree objects. The "--cached" and
+ "--untracked" options have been marked as mutually incompatible.
+ (merge 0c5d83b248 mt/grep-cached-untracked later to maint).
+
+ * Fix "git fsck --name-objects" which apparently has not been used by
+ anybody who is motivated enough to report breakage.
+ (merge e89f89361c js/fsck-name-objects-fix later to maint).
+
+ * Avoid individual tests in t5411 from getting affected by each other
+ by forcing them to use separate output files during the test.
+ (merge 822ee894f6 jx/t5411-unique-filenames later to maint).
+
+ * Test to make sure "git rev-parse one-thing one-thing" gives
+ the same thing twice (when one-thing is --since=X).
+ (merge a5cdca4520 ew/rev-parse-since-test later to maint).
+
+ * When certain features (e.g. grafts) used in the repository are
+ incompatible with the use of the commit-graph, we used to silently
+ turned commit-graph off; we now tell the user what we are doing.
+ (merge c85eec7fc3 js/commit-graph-warning later to maint).
+
+ * Objects that lost references can be pruned away, even when they
+ have notes attached to it (and these notes will become dangling,
+ which in turn can be pruned with "git notes prune"). This has been
+ clarified in the documentation.
+ (merge fa9ab027ba mz/doc-notes-are-not-anchors later to maint).
+
+ * The error codepath around the "--temp/--prefix" feature of "git
+ checkout-index" has been improved.
+ (merge 3f7ba60350 mt/checkout-index-corner-cases later to maint).
+
+ * The "git maintenance register" command had trouble registering bare
+ repositories, which had been corrected.
+
+ * A handful of multi-word configuration variable names in
+ documentation that are spelled in all lowercase have been corrected
+ to use the more canonical camelCase.
+ (merge 7dd0eaa39c dl/doc-config-camelcase later to maint).
+
+ * "git push $there --delete ''" should have been diagnosed as an
+ error, but instead turned into a matching push, which has been
+ corrected.
+ (merge 20e416409f jc/push-delete-nothing later to maint).
+
+ * Test script modernization.
+ (merge 488acf15df sv/t7001-modernize later to maint).
+
+ * An under-allocation for the untracked cache data has been corrected.
+ (merge 6347d649bc jh/untracked-cache-fix later to maint).
+
+ * Other code cleanup, docfix, build fix, etc.
+ (merge e3f5da7e60 sg/t7800-difftool-robustify later to maint).
+ (merge 9d336655ba js/doc-proto-v2-response-end later to maint).
+ (merge 1b5b8cf072 jc/maint-column-doc-typofix later to maint).
+ (merge 3a837b58e3 cw/pack-config-doc later to maint).
+ (merge 01168a9d89 ug/doc-commit-approxidate later to maint).
+ (merge b865734760 js/params-vs-args later to maint).
diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches
index 4515cab..0452db2 100644
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
@@ -3,8 +3,9 @@
== 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 @@
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 @@
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 @@
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]]
@@ -208,7 +209,7 @@
(see below), the first patch, or the respective preceding patch.
If your log message (including your name on the
-Signed-off-by line) is not writable in ASCII, make sure that
+`Signed-off-by` trailer) is not writable in ASCII, make sure that
you send off a message in the correct encoding.
WARNING: Be wary of your MUAs word-wrap
@@ -228,7 +229,7 @@
The `git format-patch` command follows the best current practice to
format the body of an e-mail message. At the beginning of the
patch should come your commit message, ending with the
-Signed-off-by: lines, and a line that consists of three dashes,
+`Signed-off-by` trailers, and a line that consists of three dashes,
followed by the diffstat information and the patch itself. If
you are forwarding a patch from somebody else, optionally, at
the beginning of the e-mail message just before the commit
@@ -289,25 +290,24 @@
:git-ml: footnote:[The mailing list: git@vger.kernel.org]
After the list reached a consensus that it is a good idea to apply the
-patch, re-send it with "To:" set to the maintainer{current-maintainer} and "cc:" the
-list{git-ml} for inclusion.
+patch, re-send it with "To:" set to the maintainer{current-maintainer}
+and "cc:" the list{git-ml} for inclusion. This is especially relevant
+when the maintainer did not heavily participate in the discussion and
+instead left the review to trusted others.
Do not forget to add trailers such as `Acked-by:`, `Reviewed-by:` and
`Tested-by:` lines as necessary to credit people who helped your
-patch.
+patch, and "cc:" them when sending such a final version for inclusion.
[[sign-off]]
-=== Certify your work by adding your "Signed-off-by: " line
+=== Certify your work by adding your `Signed-off-by` trailer
-To improve tracking of who did what, we've borrowed the
-"sign-off" procedure from the Linux kernel project on patches
-that are being emailed around. Although core Git is a lot
-smaller project it is a good discipline to follow it.
+To improve tracking of who did what, we ask you to certify that you
+wrote the patch or have the right to pass it on under the same license
+as ours, by "signing off" your patch. Without sign-off, we cannot
+accept your patches.
-The sign-off is a simple line at the end of the explanation for
-the patch, which certifies that you wrote it or otherwise have
-the right to pass it on as an open-source patch. The rules are
-pretty simple: if you can certify the below D-C-O:
+If (and only if) you certify the below D-C-O:
[[dco]]
.Developer's Certificate of Origin 1.1
@@ -337,23 +337,29 @@
this project or the open source license(s) involved.
____
-then you just add a line saying
+you add a "Signed-off-by" trailer to your commit, that looks like
+this:
....
Signed-off-by: Random J Developer <random@developer.example.org>
....
-This line can be automatically added by Git if you run the git-commit
-command with the -s option.
+This line can be added by Git if you run the git-commit command with
+the -s option.
-Notice that you can place your own Signed-off-by: line when
+Notice that you can place your own `Signed-off-by` trailer when
forwarding somebody else's patch with the above rules for
D-C-O. Indeed you are encouraged to do so. Do not forget to
place an in-body "From: " line at the beginning to properly attribute
the change to its true author (see (2) above).
+This procedure originally came from the Linux kernel project, so our
+rule is quite similar to theirs, but what exactly it means to sign-off
+your patch differs from project to project, so it may be different
+from that of the project you are accustomed to.
+
[[real-name]]
-Also notice that a real name is used in the Signed-off-by: line. Please
+Also notice that a real name is used in the `Signed-off-by` trailer. Please
don't hide your real name.
[[commit-trailers]]
@@ -423,7 +429,7 @@
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.
@@ -434,7 +440,7 @@
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/Documentation/asciidoc.conf b/Documentation/asciidoc.conf
index 8fc4b67..3e4c139 100644
--- a/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf
@@ -31,24 +31,6 @@
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 @@
{title#}</para></formalpara>
{title%}<simpara></simpara>
endif::doctype-manpage[]
-endif::git-asciidoc-no-roff[]
endif::backend-docbook[]
ifdef::doctype-manpage[]
diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt
index 5d122db..117f4cf 100644
--- a/Documentation/blame-options.txt
+++ b/Documentation/blame-options.txt
@@ -1,6 +1,6 @@
-b::
Show blank SHA-1 for boundary commits. This can also
- be controlled via the `blame.blankboundary` config option.
+ be controlled via the `blame.blankBoundary` config option.
--root::
Do not treat root commits as boundaries. This can also be
@@ -11,11 +11,12 @@
-L <start>,<end>::
-L :<funcname>::
- Annotate only the given line range. May be specified multiple times.
- Overlapping ranges are allowed.
+ Annotate only the line range given by '<start>,<end>',
+ or by the function name regex '<funcname>'.
+ May be specified multiple times. Overlapping ranges are allowed.
+
-<start> and <end> are optional. ``-L <start>'' or ``-L <start>,'' spans from
-<start> to end of file. ``-L ,<end>'' spans from start of file to <end>.
+'<start>' and '<end>' are optional. `-L <start>` or `-L <start>,` spans from
+'<start>' to end of file. `-L ,<end>` spans from start of file to '<end>'.
+
include::line-range-format.txt[]
@@ -36,6 +37,12 @@
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/Documentation/cmd-list.perl b/Documentation/cmd-list.perl
index 5aa73cf..af5da45 100755
--- a/Documentation/cmd-list.perl
+++ b/Documentation/cmd-list.perl
@@ -6,9 +6,14 @@
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 @@
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 @@
}
}
-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 @@
$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/Documentation/config.txt b/Documentation/config.txt
index 08b13ba..bf82766 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -3,11 +3,12 @@
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
@@ -45,7 +46,7 @@
newline and the null byte. Doublequote `"` and backslash can be included
by escaping them as `\"` and `\\`, respectively. Backslashes preceding
other characters are dropped when reading; for example, `\t` is read as
-`t` and `\0` is read as `0` Section headers cannot span multiple lines.
+`t` and `\0` is read as `0`. Section headers cannot span multiple lines.
Variables may belong directly to a section or to a given subsection. You
can have `[section]` if you have `[section "subsection"]`, but you don't
need to.
@@ -63,7 +64,7 @@
and `-`, and must start with an alphabetic character.
A line that defines a value can be continued to the next line by
-ending it with a `\`; the backquote and the end-of-line are
+ending it with a `\`; the backslash and the end-of-line are
stripped. Leading whitespaces after 'name =', the remainder of the
line after the first comment character '#' or ';', and trailing
whitespaces of the line are discarded unless they are enclosed in
@@ -220,12 +221,12 @@
; 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
+; include only if we are in a worktree where foo-branch is
+; currently checked out
+[includeIf "onbranch:foo-branch"]
+ path = foo.inc
+----
Values
~~~~~~
@@ -264,7 +265,7 @@
The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`,
`blue`, `magenta`, `cyan` and `white`. The first color given is the
foreground; the second is the background. All the basic colors except
-`normal` have a bright variant that can be speficied by prefixing the
+`normal` have a bright variant that can be specified by prefixing the
color with `bright`, like `brightred`.
+
Colors may also be given as numbers between 0 and 255; these use ANSI
@@ -333,12 +334,16 @@
include::config/clean.txt[]
+include::config/clone.txt[]
+
include::config/color.txt[]
include::config/column.txt[]
include::config/commit.txt[]
+include::config/commitgraph.txt[]
+
include::config/credential.txt[]
include::config/completion.txt[]
@@ -347,6 +352,8 @@
include::config/difftool.txt[]
+include::config/extensions.txt[]
+
include::config/fastimport.txt[]
include::config/feature.txt[]
@@ -391,10 +398,14 @@
include::config/log.txt[]
+include::config/lsrefs.txt[]
+
include::config/mailinfo.txt[]
include::config/mailmap.txt[]
+include::config/maintenance.txt[]
+
include::config/man.txt[]
include::config/merge.txt[]
@@ -447,6 +458,8 @@
include::config/tag.txt[]
+include::config/tar.txt[]
+
include::config/trace2.txt[]
include::config/transfer.txt[]
diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt
index bdd37c3..acbd0c0 100644
--- a/Documentation/config/advice.txt
+++ b/Documentation/config/advice.txt
@@ -10,9 +10,8 @@
that the check is disabled.
pushUpdateRejected::
Set this variable to 'false' if you want to disable
- 'pushNonFFCurrent',
- 'pushNonFFMatching', 'pushAlreadyExists',
- 'pushFetchFirst', and 'pushNeedsForce'
+ 'pushNonFFCurrent', 'pushNonFFMatching', 'pushAlreadyExists',
+ 'pushFetchFirst', 'pushNeedsForce', and 'pushRefNeedsUpdate'
simultaneously.
pushNonFFCurrent::
Advice shown when linkgit:git-push[1] fails due to a
@@ -41,6 +40,10 @@
we can still suggest that the user push to either
refs/heads/* or refs/tags/* based on the type of the
source object.
+ pushRefNeedsUpdate::
+ Shown when linkgit:git-push[1] rejects a forced update of
+ a branch when its remote-tracking ref has updates that we
+ do not have locally.
statusAheadBehind::
Shown when linkgit:git-status[1] computes the ahead/behind
counts for a local ref compared to its remote tracking ref,
diff --git a/Documentation/config/checkout.txt b/Documentation/config/checkout.txt
index 6b64681..2cddf7b 100644
--- a/Documentation/config/checkout.txt
+++ b/Documentation/config/checkout.txt
@@ -1,18 +1,23 @@
checkout.defaultRemote::
- When you run 'git checkout <something>'
- or 'git switch <something>' and only have one
+ When you run `git checkout <something>`
+ or `git switch <something>` and only have one
remote, it may implicitly fall back on checking out and
- tracking e.g. 'origin/<something>'. This stops working as soon
- as you have more than one remote with a '<something>'
+ tracking e.g. `origin/<something>`. This stops working as soon
+ as you have more than one remote with a `<something>`
reference. This setting allows for setting the name of a
preferred remote that should always win when it comes to
disambiguation. The typical use-case is to set this to
`origin`.
+
Currently this is used by linkgit:git-switch[1] and
-linkgit:git-checkout[1] when 'git checkout <something>'
-or 'git switch <something>'
-will checkout the '<something>' branch on another remote,
-and by linkgit:git-worktree[1] when 'git worktree add' refers to a
+linkgit:git-checkout[1] when `git checkout <something>`
+or `git switch <something>`
+will checkout the `<something>` branch on another remote,
+and by linkgit:git-worktree[1] when `git worktree add` refers to a
remote branch. This setting might be used for other checkout-like
commands or functionality in the future.
+
+checkout.guess::
+ Provides the default value for the `--guess` or `--no-guess`
+ option in `git checkout` and `git switch`. See
+ linkgit:git-switch[1] and linkgit:git-checkout[1].
diff --git a/Documentation/config/clone.txt b/Documentation/config/clone.txt
new file mode 100644
index 0000000..47de36a
--- /dev/null
+++ b/Documentation/config/clone.txt
@@ -0,0 +1,4 @@
+clone.defaultRemoteName::
+ The name of the remote to create when cloning a repository. Defaults to
+ `origin`, and can be overridden by passing the `--origin` command-line
+ option to linkgit:git-clone[1].
diff --git a/Documentation/config/commitgraph.txt b/Documentation/config/commitgraph.txt
new file mode 100644
index 0000000..4582c39
--- /dev/null
+++ b/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/Documentation/config/core.txt b/Documentation/config/core.txt
index 74619a9..c04f62a 100644
--- a/Documentation/config/core.txt
+++ b/Documentation/config/core.txt
@@ -399,7 +399,7 @@
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
@@ -606,8 +606,8 @@
core.multiPackIndex::
Use the multi-pack-index file to track multiple packfiles using a
- single index. See link:technical/multi-pack-index.html[the
- multi-pack-index design document].
+ single index. See linkgit:git-multi-pack-index[1] for more
+ information. Defaults to true.
core.sparseCheckout::
Enable "sparse checkout" feature. See linkgit:git-sparse-checkout[1]
@@ -625,4 +625,6 @@
computed based on the approximate number of packed objects
in your repository, which hopefully is enough for
abbreviated object names to stay unique for some time.
+ If set to "no", no abbreviation is made and the object names
+ are shown in their full length.
The minimum length is 4.
diff --git a/Documentation/config/credential.txt b/Documentation/config/credential.txt
index 60fb318..512f318 100644
--- a/Documentation/config/credential.txt
+++ b/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
@@ -24,3 +28,9 @@
credentialCache.ignoreSIGHUP::
Tell git-credential-cache--daemon to ignore SIGHUP, instead of quitting.
+
+credentialStore.lockTimeoutMS::
+ The length of time, in milliseconds, for git-credential-store to retry
+ when trying to lock the credentials file. Value 0 means not to retry at
+ all; -1 means to try indefinitely. Default is 1000 (i.e., retry for
+ 1s).
diff --git a/Documentation/config/diff.txt b/Documentation/config/diff.txt
index ff09f1c..2d3331f 100644
--- a/Documentation/config/diff.txt
+++ b/Documentation/config/diff.txt
@@ -85,6 +85,8 @@
and 'git status' when `status.submoduleSummary` is set unless it is
overridden by using the --ignore-submodules command-line option.
The 'git submodule' commands are not affected by this setting.
+ By default this is set to untracked so that any untracked
+ submodules are ignored.
diff.mnemonicPrefix::
If set, 'git diff' uses a prefix pair that is different from the
@@ -105,6 +107,10 @@
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.
diff --git a/Documentation/config/extensions.txt b/Documentation/config/extensions.txt
new file mode 100644
index 0000000..4e23d73
--- /dev/null
+++ b/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/Documentation/config/feature.txt b/Documentation/config/feature.txt
index 875f8c8..cdecd04 100644
--- a/Documentation/config/feature.txt
+++ b/Documentation/config/feature.txt
@@ -12,19 +12,8 @@
setting if you are interested in providing feedback on experimental
features. The new default values are:
+
-* `pack.useSparse=true` uses a new algorithm when constructing a pack-file
-which can improve `git push` performance in repos with many files.
-+
* `fetch.negotiationAlgorithm=skipping` may improve fetch negotiation times by
skipping more commits at a time, reducing the number of round trips.
-+
-* `fetch.writeCommitGraph=true` writes a commit-graph after every `git fetch`
-command that downloads a pack-file from a remote. Using the `--split` option,
-most executions will create a very small commit-graph file on top of the
-existing commit-graph file(s). Occasionally, these files will merge and the
-write may take longer. Having an updated commit-graph file helps performance
-of many Git commands, including `git merge-base`, `git push -f`, and
-`git log --graph`.
feature.manyFiles::
Enable config options that optimize for repos with many files in the
diff --git a/Documentation/config/fetch.txt b/Documentation/config/fetch.txt
index f119402..6af6f5e 100644
--- a/Documentation/config/fetch.txt
+++ b/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,7 +60,10 @@
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). If `feature.experimental` is enabled, then this
setting defaults to "skipping".
@@ -87,5 +93,4 @@
the existing commit-graph file(s). Occasionally, these files will
merge and the write may take longer. Having an updated commit-graph
file helps performance of many Git commands, including `git merge-base`,
- `git push -f`, and `git log --graph`. Defaults to false, unless
- `feature.experimental` is true.
+ `git push -f`, and `git log --graph`. Defaults to false.
diff --git a/Documentation/config/fmt-merge-msg.txt b/Documentation/config/fmt-merge-msg.txt
index c73cfa9..3fbf40e 100644
--- a/Documentation/config/fmt-merge-msg.txt
+++ b/Documentation/config/fmt-merge-msg.txt
@@ -8,3 +8,15 @@
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/Documentation/config/format.txt b/Documentation/config/format.txt
index 45c7bd5..fdbc06a 100644
--- a/Documentation/config/format.txt
+++ b/Documentation/config/format.txt
@@ -57,6 +57,11 @@
`.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],
@@ -74,7 +79,7 @@
format.signOff::
A boolean value which lets you enable the `-s/--signoff` option of
- format-patch by default. *Note:* Adding the Signed-off-by: line to a
+ format-patch by default. *Note:* Adding the `Signed-off-by` trailer to a
patch should be a conscious act and means that you certify you have
the rights to submit this work under the same open source license.
Please see the 'SubmittingPatches' document for further discussion.
@@ -89,9 +94,16 @@
Set a custom directory to store the resulting files instead of the
current working directory. All directory components will be created.
+format.filenameMaxLength::
+ The maximum length of the output filenames generated by the
+ `format-patch` command; defaults to 64. Can be overridden
+ by the `--filename-max-length=<n>` command line option.
+
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
diff --git a/Documentation/config/gc.txt b/Documentation/config/gc.txt
index 00ea0a6..c834e07 100644
--- a/Documentation/config/gc.txt
+++ b/Documentation/config/gc.txt
@@ -44,9 +44,9 @@
gc.bigPackThreshold::
If non-zero, all packs larger than this limit are kept when
- `git gc` is run. This is very similar to `--keep-base-pack`
+ `git gc` is run. This is very similar to `--keep-largest-pack`
except that all packs that meet the threshold are kept, not
- just the base pack. Defaults to zero. Common unit suffixes of
+ just the largest pack. Defaults to zero. Common unit suffixes of
'k', 'm', or 'g' are supported.
+
Note that if the number of kept packs is more than gc.autoPackLimit,
@@ -57,7 +57,7 @@
If the amount of memory estimated for `git repack` to run smoothly is
not available and `gc.bigPackThreshold` is not set, the largest pack
will also be excluded (this is the equivalent of running `git gc` with
-`--keep-base-pack`).
+`--keep-largest-pack`).
gc.writeCommitGraph::
If true, then gc will rewrite the commit-graph file when
diff --git a/Documentation/config/help.txt b/Documentation/config/help.txt
index 224bbf5..783a90a 100644
--- a/Documentation/config/help.txt
+++ b/Documentation/config/help.txt
@@ -8,13 +8,14 @@
the default. 'web' and 'html' are the same.
help.autoCorrect::
- Automatically correct and execute mistyped commands after
- waiting for the given number of deciseconds (0.1 sec). If more
- than one command can be deduced from the entered text, nothing
- will be executed. If the value of this option is negative,
- the corrected command will be executed immediately. If the
- value is 0 - the command will be just shown but not executed.
- This is the default.
+ If git detects typos and can identify exactly one valid command similar
+ to the error, git will automatically run the intended command after
+ waiting a duration of time defined by this configuration value in
+ deciseconds (0.1 sec). If this value is 0, the suggested corrections
+ will be shown, but not executed. If it is a negative integer, or
+ "immediate", the suggested command
+ is run immediately. If "never", suggestions are not shown at all. The
+ default value is zero.
help.htmlPath::
Specify the path where the HTML documentation resides. File system paths
diff --git a/Documentation/config/http.txt b/Documentation/config/http.txt
index e806033..7003661 100644
--- a/Documentation/config/http.txt
+++ b/Documentation/config/http.txt
@@ -29,6 +29,27 @@
* `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 overridden 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 overridden 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
diff --git a/Documentation/config/init.txt b/Documentation/config/init.txt
index 46fa8c6..79c79d6 100644
--- a/Documentation/config/init.txt
+++ b/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.
diff --git a/Documentation/config/log.txt b/Documentation/config/log.txt
index e9e1e39..208d5fd 100644
--- a/Documentation/config/log.txt
+++ b/Documentation/config/log.txt
@@ -18,6 +18,12 @@
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/Documentation/config/lsrefs.txt b/Documentation/config/lsrefs.txt
new file mode 100644
index 0000000..adeda0f
--- /dev/null
+++ b/Documentation/config/lsrefs.txt
@@ -0,0 +1,9 @@
+lsrefs.unborn::
+ May be "advertise" (the default), "allow", or "ignore". If "advertise",
+ the server will respond to the client sending "unborn" (as described in
+ protocol-v2.txt) and will advertise support for this feature during the
+ protocol v2 capability advertisement. "allow" is the same as
+ "advertise" except that the server will not advertise support for this
+ feature; this is useful for load-balanced servers that cannot be
+ updated atomically (for example), since the administrator could
+ configure "allow", then after a delay, configure "advertise".
diff --git a/Documentation/config/maintenance.txt b/Documentation/config/maintenance.txt
new file mode 100644
index 0000000..18f0562
--- /dev/null
+++ b/Documentation/config/maintenance.txt
@@ -0,0 +1,60 @@
+maintenance.auto::
+ This boolean config option controls whether some commands run
+ `git maintenance run --auto` after doing their normal work. Defaults
+ to true.
+
+maintenance.strategy::
+ This string config option provides a way to specify one of a few
+ recommended schedules for background maintenance. This only affects
+ which tasks are run during `git maintenance run --schedule=X`
+ commands, provided no `--task=<task>` arguments are provided.
+ Further, if a `maintenance.<task>.schedule` config value is set,
+ then that value is used instead of the one provided by
+ `maintenance.strategy`. The possible strategy strings are:
++
+* `none`: This default setting implies no task are run at any schedule.
+* `incremental`: This setting optimizes for performing small maintenance
+ activities that do not delete any data. This does not schedule the `gc`
+ task, but runs the `prefetch` and `commit-graph` tasks hourly, the
+ `loose-objects` and `incremental-repack` tasks daily, and the `pack-refs`
+ task weekly.
+
+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.<task>.schedule::
+ This config option controls whether or not the given `<task>` runs
+ during a `git maintenance run --schedule=<frequency>` command. The
+ value must be one of "hourly", "daily", or "weekly".
+
+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.
+
+maintenance.loose-objects.auto::
+ This integer config option controls how often the `loose-objects` task
+ should be run as part of `git maintenance run --auto`. If zero, then
+ the `loose-objects` 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
+ loose objects is at least the value of `maintenance.loose-objects.auto`.
+ The default value is 100.
+
+maintenance.incremental-repack.auto::
+ This integer config option controls how often the `incremental-repack`
+ task should be run as part of `git maintenance run --auto`. If zero,
+ then the `incremental-repack` 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 pack-files not in the multi-pack-index is at least the value
+ of `maintenance.incremental-repack.auto`. The default value is 10.
diff --git a/Documentation/config/merge.txt b/Documentation/config/merge.txt
index 6a31393..cb2ed58 100644
--- a/Documentation/config/merge.txt
+++ b/Documentation/config/merge.txt
@@ -70,6 +70,16 @@
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/Documentation/config/mergetool.txt b/Documentation/config/mergetool.txt
index 09ed31d..cafbbef 100644
--- a/Documentation/config/mergetool.txt
+++ b/Documentation/config/mergetool.txt
@@ -13,6 +13,11 @@
merged; 'MERGED' contains the name of the file to which the merge
tool should write the results of a successful merge.
+mergetool.<tool>.hideResolved::
+ Allows the user to override the global `mergetool.hideResolved` value
+ for a specific tool. See `mergetool.hideResolved` for the full
+ description.
+
mergetool.<tool>.trustExitCode::
For a custom merge command, specify whether the exit code of
the merge command can be used to determine whether the merge was
@@ -30,6 +35,26 @@
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.hideResolved::
+ During a merge Git will automatically resolve as many conflicts as
+ possible and write the 'MERGED' file containing conflict markers around
+ any conflicts that it cannot resolve; 'LOCAL' and 'REMOTE' normally
+ represent the versions of the file from before Git's conflict
+ resolution. This flag causes 'LOCAL' and 'REMOTE' to be overwriten so
+ that only the unresolved conflicts are presented to the merge tool. Can
+ be configured per-tool via the `mergetool.<tool>.hideResolved`
+ configuration variable. Defaults to `false`.
+
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/Documentation/config/pack.txt b/Documentation/config/pack.txt
index 0dac580..3da4ea9 100644
--- a/Documentation/config/pack.txt
+++ b/Documentation/config/pack.txt
@@ -119,8 +119,8 @@
objects. This can have significant performance benefits when
computing a pack to send a small change. However, it is possible
that extra objects are added to the pack-file if the included
- commits contain certain types of direct renames. Default is `false`
- unless `feature.experimental` is enabled.
+ commits contain certain types of direct renames. Default is
+ `true`.
pack.writeBitmaps (deprecated)::
This is a deprecated synonym for `repack.writeBitmaps`.
@@ -133,3 +133,10 @@
between an older, bitmapped pack and objects that have been
pushed since the last gc). The downside is that it consumes 4
bytes per object of disk space. Defaults to true.
+
+pack.writeReverseIndex::
+ When true, git will write a corresponding .rev file (see:
+ link:../technical/pack-format.html[Documentation/technical/pack-format.txt])
+ for each new packfile that it writes in all places except for
+ linkgit:git-fast-import[1] and in the bulk checkin mechanism.
+ Defaults to false.
diff --git a/Documentation/config/push.txt b/Documentation/config/push.txt
index 0a7aa32..21b256e 100644
--- a/Documentation/config/push.txt
+++ b/Documentation/config/push.txt
@@ -112,3 +112,11 @@
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').
+
+push.useForceIfIncludes::
+ If set to "true", it is equivalent to specifying
+ `--force-if-includes` as an option to linkgit:git-push[1]
+ in the command line. Adding `--no-force-if-includes` at the
+ time of push overrides this configuration setting.
diff --git a/Documentation/config/rebase.txt b/Documentation/config/rebase.txt
index 7f7a07d..214f31b 100644
--- a/Documentation/config/rebase.txt
+++ b/Documentation/config/rebase.txt
@@ -68,3 +68,6 @@
Automatically reschedule `exec` commands that failed. This only makes
sense in interactive mode (or when an `--exec` option was provided).
This is the same as specifying the `--reschedule-failed-exec` option.
+
+rebase.forkPoint::
+ If set to false set `--no-fork-point` option by default.
diff --git a/Documentation/config/receive.txt b/Documentation/config/receive.txt
index 65f78aa..85d5b5a 100644
--- a/Documentation/config/receive.txt
+++ b/Documentation/config/receive.txt
@@ -114,6 +114,28 @@
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/Documentation/config/sendemail.txt b/Documentation/config/sendemail.txt
index 0006faf..cbc5af4 100644
--- a/Documentation/config/sendemail.txt
+++ b/Documentation/config/sendemail.txt
@@ -61,3 +61,8 @@
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/Documentation/config/stash.txt b/Documentation/config/stash.txt
index abc7ef4..00eb354 100644
--- a/Documentation/config/stash.txt
+++ b/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/Documentation/config/submodule.txt b/Documentation/config/submodule.txt
index b331771..d7a63c8 100644
--- a/Documentation/config/submodule.txt
+++ b/Documentation/config/submodule.txt
@@ -59,9 +59,17 @@
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.
diff --git a/Documentation/config/tag.txt b/Documentation/config/tag.txt
index 6d9110d..5062a05 100644
--- a/Documentation/config/tag.txt
+++ b/Documentation/config/tag.txt
@@ -15,10 +15,3 @@
convenient to use an agent to avoid typing your gpg passphrase
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/Documentation/config/tar.txt b/Documentation/config/tar.txt
new file mode 100644
index 0000000..de8ff48
--- /dev/null
+++ b/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/Documentation/config/trace2.txt b/Documentation/config/trace2.txt
index 4ce0b9a..fe1642f 100644
--- a/Documentation/config/trace2.txt
+++ b/Documentation/config/trace2.txt
@@ -48,6 +48,15 @@
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
+ overridden 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.
diff --git a/Documentation/config/transfer.txt b/Documentation/config/transfer.txt
index f5b6245..505126a 100644
--- a/Documentation/config/transfer.txt
+++ b/Documentation/config/transfer.txt
@@ -69,3 +69,7 @@
When `fetch.unpackLimit` or `receive.unpackLimit` are
not set, the value of this variable is used instead.
The default value is 100.
+
+transfer.advertiseSID::
+ Boolean. When true, client and server processes will advertise their
+ unique session IDs to their remote counterpart. Defaults to false.
diff --git a/Documentation/config/uploadpack.txt b/Documentation/config/uploadpack.txt
index ed1c835..b0d7612 100644
--- a/Documentation/config/uploadpack.txt
+++ b/Documentation/config/uploadpack.txt
@@ -57,6 +57,24 @@
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/Documentation/date-formats.txt b/Documentation/date-formats.txt
index 6926e0a..99c455f 100644
--- a/Documentation/date-formats.txt
+++ b/Documentation/date-formats.txt
@@ -1,10 +1,7 @@
DATE FORMATS
------------
-The `GIT_AUTHOR_DATE`, `GIT_COMMITTER_DATE` environment variables
-ifdef::git-commit[]
-and the `--date` option
-endif::git-commit[]
+The `GIT_AUTHOR_DATE` and `GIT_COMMITTER_DATE` environment variables
support the following date formats:
Git internal format::
@@ -20,7 +17,15 @@
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`.
+
+ifdef::git-commit[]
+In addition to recognizing all date formats above, the `--date` option
+will also try to make sense of other, more human-centric date formats,
+such as relative dates like "yesterday" or "last Friday at noon".
+endif::git-commit[]
diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt
index e8ed647..2db8eac 100644
--- a/Documentation/diff-generate-patch.txt
+++ b/Documentation/diff-generate-patch.txt
@@ -10,7 +10,8 @@
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.
+`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:
@@ -80,9 +81,9 @@
Any diff-generating command can take the `-c` or `--cc` option to
produce a 'combined diff' when showing a merge. This is the default
format when showing merges with linkgit:git-diff[1] or
-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.
+linkgit:git-show[1]. Note also that you can give suitable
+`--diff-merges` option to any of these commands to force generation of
+diffs in specific format.
A "combined diff" format looks like this:
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index bb31f0c..aa2b5c1 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -33,12 +33,63 @@
show the patch by default, or to cancel the effect of `--patch`.
endif::git-format-patch[]
+ifdef::git-log[]
+--diff-merges=(off|none|first-parent|1|separate|m|combined|c|dense-combined|cc)::
+--no-diff-merges::
+ Specify diff format to be used for merge commits. Default is
+ {diff-merges-default} unless `--first-parent` is in use, in which case
+ `first-parent` is the default.
++
+--diff-merges=(off|none):::
+--no-diff-merges:::
+ Disable output of diffs for merge commits. Useful to override
+ implied value.
++
+--diff-merges=first-parent:::
+--diff-merges=1:::
+ This option makes merge commits show the full diff with
+ respect to the first parent only.
++
+--diff-merges=separate:::
+--diff-merges=m:::
+-m:::
+ This makes merge commits show the full diff with respect to
+ each of the parents. Separate log entry and diff is generated
+ for each parent. `-m` doesn't produce any output without `-p`.
++
+--diff-merges=combined:::
+--diff-merges=c:::
+-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. `-c` implies
+ `-p`.
++
+--diff-merges=dense-combined:::
+--diff-merges=cc:::
+--cc:::
+ With this option the output produced by
+ `--diff-merges=combined` is further compressed by omitting
+ uninteresting hunks whose contents in the parents have only
+ two variants and the merge result picks one of them without
+ modification. `--cc` implies `-p`.
+
+--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 `--diff-merges=[dense-]combined` is in use, and
+ is likely only useful if filename changes are detected (i.e.
+ when either rename or copy detection have been requested).
+endif::git-log[]
+
-U<n>::
--unified=<n>::
Generate diffs with <n> lines of context instead of
- the usual three. Implies `--patch`.
+ the usual three.
ifndef::git-format-patch[]
- Implies `-p`.
+ Implies `--patch`.
endif::git-format-patch[]
--output=<file>::
@@ -73,6 +124,11 @@
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.
@@ -436,15 +492,20 @@
--binary::
In addition to `--full-index`, output a binary diff that
- can be applied with `git-apply`. Implies `--patch`.
+ can be applied with `git-apply`.
+ifndef::git-format-patch[]
+ Implies `--patch`.
+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 the shortest prefix that is at least '<n>'
+ hexdigits long that uniquely refers the object.
+ 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>]]::
@@ -639,19 +700,30 @@
components matches the pattern. For example, the pattern "`foo*bar`"
matches "`fooasdfbar`" and "`foo/bar/baz/asdf`" but not "`foobarx`".
+--skip-to=<file>::
+--rotate-to=<file>::
+ Discard the files before the named <file> from the output
+ (i.e. 'skip to'), or move them to the end of the output
+ (i.e. 'rotate to'). These were invented primarily for use
+ of the `git difftool` command, and may not be very useful
+ otherwise.
+
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::
@@ -678,6 +750,11 @@
--ignore-blank-lines::
Ignore changes whose lines are all blank.
+-I<regex>::
+--ignore-matching-lines=<regex>::
+ Ignore changes whose all lines match <regex>. This option may
+ be specified more than once.
+
--inter-hunk-context=<lines>::
Show the context between diff hunks, up to the specified number
of lines, thereby fusing hunks that are close to each other.
@@ -686,7 +763,10 @@
-W::
--function-context::
- Show whole surrounding functions of changes.
+ Show whole function as context lines for each change.
+ The function names are determined in the same way as
+ `git diff` works out patch hunk headers (see 'Defining a
+ custom hunk-header' in linkgit:gitattributes[5]).
ifndef::git-format-patch[]
ifndef::git-log[]
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index a115a1a..07783de 100644
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -7,6 +7,10 @@
existing contents of `.git/FETCH_HEAD`. Without this
option old data in `.git/FETCH_HEAD` will be overwritten.
+--atomic::
+ Use an atomic transaction to update local refs. Either all refs are
+ updated, or on error, no refs are updated.
+
--depth=<depth>::
Limit fetching to the specified number of commits from the tip of
each remote branch history. If fetching to a 'shallow' repository
@@ -61,9 +65,16 @@
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,13 +99,16 @@
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::
@@ -107,6 +121,7 @@
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.
@@ -133,7 +148,6 @@
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
@@ -154,6 +168,7 @@
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
@@ -163,7 +178,9 @@
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>::
@@ -177,17 +194,20 @@
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, pull and add 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
@@ -200,7 +220,6 @@
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::
@@ -210,6 +229,7 @@
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/Documentation/git-am.txt b/Documentation/git-am.txt
index ab5754e..decd8ae 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -33,7 +33,7 @@
-s::
--signoff::
- Add a `Signed-off-by:` line to the commit message, using
+ Add a `Signed-off-by` trailer to the commit message, using
the committer identity of yourself.
See the signoff option in linkgit:git-commit[1] for more information.
@@ -79,7 +79,7 @@
Pass `-u` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]).
The proposed commit log message taken from the e-mail
is re-coded into UTF-8 encoding (configuration variable
- `i18n.commitencoding` can be used to specify project's
+ `i18n.commitEncoding` can be used to specify project's
preferred encoding if it is not UTF-8).
+
This was optional in prior versions of git, but now it is the
@@ -148,9 +148,12 @@
-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::
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index b9aa390..91d9a86 100644
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@ -61,18 +61,18 @@
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/Documentation/git-archive.txt b/Documentation/git-archive.txt
index cfa1e4e..9f81728 100644
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@ -55,6 +55,12 @@
--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/Documentation/git-bisect-lk2009.txt b/Documentation/git-bisect-lk2009.txt
index 3ba49e8..f3d9566 100644
--- a/Documentation/git-bisect-lk2009.txt
+++ b/Documentation/git-bisect-lk2009.txt
@@ -473,7 +473,7 @@
-------------
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 @@
-------------
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 @@
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 @@
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
diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt
index 7586c5a..fbb39fb 100644
--- a/Documentation/git-bisect.txt
+++ b/Documentation/git-bisect.txt
@@ -16,8 +16,8 @@
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 @@
+
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
--------
diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt
index 7e81541..3bf5d5d 100644
--- a/Documentation/git-blame.txt
+++ b/Documentation/git-blame.txt
@@ -87,7 +87,9 @@
--abbrev=<n>::
Instead of using the default 7+1 hexadecimal digits as the
- abbreviated object name, use <n>+1 digits. Note that 1 column
+ abbreviated object name, use <m>+1 digits, where <m> is at
+ least <n> but ensures the commit object names are unique.
+ Note that 1 column
is used for a caret to mark the boundary commit.
@@ -224,7 +226,7 @@
MAPPING AUTHORS
---------------
-include::mailmap.txt[]
+See linkgit:gitmailmap[5].
SEE ALSO
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 135206f..94dc9a5 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -9,10 +9,10 @@
--------
[verse]
'git branch' [--color[=<when>] | --no-color] [--show-current]
- [-v [--abbrev=<length> | --no-abbrev]]
+ [-v [--abbrev=<n> | --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>...]
@@ -78,8 +78,8 @@
to happen.
The `-c` and `-C` options have the exact same semantics as `-m` and
-`-M`, except instead of the branch being renamed it along with its
-config and reflog will be copied to a new name.
+`-M`, except instead of the branch being renamed, it will be copied to a
+new name, along with its config and reflog.
With a `-d` or `-D` option, `<branchname>` will be deleted. You may
specify more than one branch for deletion. If the branch currently
@@ -153,7 +153,7 @@
--column[=<options>]::
--no-column::
Display branch listing in columns. See configuration variable
- column.branch for option syntax.`--column` and `--no-column`
+ `column.branch` for option syntax. `--column` and `--no-column`
without options are equivalent to 'always' and 'never' respectively.
+
This option is only applicable in non-verbose mode.
@@ -194,8 +194,10 @@
Be more quiet when creating or deleting a branch, suppressing
non-error messages.
---abbrev=<length>::
- Alter the sha1's minimum display length in the output listing.
+--abbrev=<n>::
+ In the verbose listing that show the commit object name,
+ show the shortest prefix that is at least '<n>' hexdigits
+ long that uniquely refers the object.
The default value is 7 and can be overridden by the `core.abbrev`
config option.
@@ -252,13 +254,11 @@
--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 +370,8 @@
- `--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/Documentation/git-bugreport.txt b/Documentation/git-bugreport.txt
new file mode 100644
index 0000000..66e88c2
--- /dev/null
+++ b/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/Documentation/git-bundle.txt b/Documentation/git-bundle.txt
index d34b096..53804ca 100644
--- a/Documentation/git-bundle.txt
+++ b/Documentation/git-bundle.txt
@@ -9,7 +9,8 @@
SYNOPSIS
--------
[verse]
-'git bundle' create [-q | --quiet | --progress | --all-progress] [--all-progress-implied] <file> <git-rev-list-args>
+'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>...]
@@ -102,6 +103,12 @@
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
diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt
index 8eca671..8e192d8 100644
--- a/Documentation/git-cat-file.txt
+++ b/Documentation/git-cat-file.txt
@@ -10,7 +10,7 @@
--------
[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/Documentation/git-check-mailmap.txt b/Documentation/git-check-mailmap.txt
index aa2055d..02f4418 100644
--- a/Documentation/git-check-mailmap.txt
+++ b/Documentation/git-check-mailmap.txt
@@ -36,10 +36,17 @@
printed; otherwise only ``$$<user@host>$$'' is printed.
+CONFIGURATION
+-------------
+
+See `mailmap.file` and `mailmap.blob` in linkgit:git-config[1] for how
+to specify a custom `.mailmap` target file or object.
+
+
MAPPING AUTHORS
---------------
-include::mailmap.txt[]
+See linkgit:gitmailmap[5].
GIT
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index c8fb995..b1a6fe4 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -192,12 +192,16 @@
'origin' remote. See also `checkout.defaultRemote` in
linkgit:git-config[1].
+
-Use `--no-guess` to disable this.
+`--guess` is the default behavior. Use `--no-guess` to disable it.
++
+The default behavior can be set via the `checkout.guess` configuration
+variable.
-l::
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.
@@ -292,11 +296,11 @@
--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.
@@ -350,6 +354,10 @@
<tree-ish>::
Tree to checkout from (when paths are given). If not specified,
the index will be used.
++
+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`.
\--::
Do not interpret any more arguments as options.
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index 83ce51a..5d75031 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -104,14 +104,17 @@
-s::
--signoff::
- Add Signed-off-by line at the end of the commit message.
+ Add a `Signed-off-by` trailer at the end of the commit message.
See the signoff option in linkgit:git-commit[1] for more information.
-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/Documentation/git-clone.txt b/Documentation/git-clone.txt
index bf24f18..02d9c19 100644
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -15,7 +15,8 @@
[--dissociate] [--separate-git-dir <git dir>]
[--depth <depth>] [--[no-]single-branch] [--no-tags]
[--recurse-submodules[=<pathspec>]] [--[no-]shallow-submodules]
- [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--] <repository>
+ [--[no-]remote-submodules] [--jobs <n>] [--sparse]
+ [--filter=<filter>] [--] <repository>
[<directory>]
DESCRIPTION
@@ -56,6 +57,10 @@
never use the local optimizations). Specifying `--no-local` will
override the default when `/path/to/repo` is given, using the regular
Git transport instead.
++
+*NOTE*: this operation can race with concurrent modification to the
+source repository, similar to running `cp -r src dst` while modifying
+`src`.
--no-hardlinks::
Force the cloning process from a repository on a local
@@ -77,9 +82,9 @@
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
@@ -162,6 +167,16 @@
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
@@ -172,8 +187,9 @@
-o <name>::
--origin <name>::
- Instead of using the remote name `origin` to keep track
- of the upstream repository, use `<name>`.
+ Instead of using the remote name `origin` to keep track of the upstream
+ repository, use `<name>`. Overrides `clone.defaultRemoteName` from the
+ config.
-b <name>::
--branch <name>::
@@ -248,7 +264,7 @@
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.
diff --git a/Documentation/git-commit-graph.txt b/Documentation/git-commit-graph.txt
index 28d1fee..e1f48c9 100644
--- a/Documentation/git-commit-graph.txt
+++ b/Documentation/git-commit-graph.txt
@@ -39,7 +39,9 @@
--------
'write'::
-Write a commit-graph file based on the commits found in packfiles.
+Write a commit-graph file based on the commits found in packfiles. If
+the config option `core.commitGraph` is disabled, then this command will
+output a warning, then return success without writing a commit-graph file.
+
With the `--stdin-packs` option, generate the new commit graph by
walking objects only in the specified pack-indexes. (Cannot be combined
@@ -47,8 +49,10 @@
+
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`
@@ -57,11 +61,34 @@
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
diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt
index ec15ee8..2e2c581 100644
--- a/Documentation/git-commit-tree.txt
+++ b/Documentation/git-commit-tree.txt
@@ -61,13 +61,11 @@
-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
------------------
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 13f6539..17150fa 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -59,6 +59,7 @@
If you make a commit and then find a mistake immediately after
that, you can recover from it with 'git reset'.
+:git-commit: 1
OPTIONS
-------
@@ -163,14 +164,7 @@
message, the commit is aborted. This has no effect when a message
is given by other means, e.g. with the `-m` or `-F` options.
--s::
---signoff::
- Add Signed-off-by line by the committer at the end of the commit
- log message. The meaning of a signoff depends on the project,
- but it typically certifies that committer has
- the rights to submit this work under the same license and
- agrees to a Developer Certificate of Origin
- (see http://developercertificate.org/ for more information).
+include::signoff-option.txt[]
-n::
--no-verify::
@@ -348,13 +342,12 @@
-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.
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 7573160..4b4cc5c 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -9,15 +9,15 @@
SYNOPSIS
--------
[verse]
-'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] name [value [value_regex]]
+'git config' [<file-option>] [--type=<type>] [--fixed-value] [--show-origin] [--show-scope] [-z|--null] name [value [value-pattern]]
'git config' [<file-option>] [--type=<type>] --add name value
-'git config' [<file-option>] [--type=<type>] --replace-all name value [value_regex]
-'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get name [value_regex]
-'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] --get-all name [value_regex]
-'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]
+'git config' [<file-option>] [--type=<type>] [--fixed-value] --replace-all name value [value-pattern]
+'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get name [value-pattern]
+'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] --get-all name [value-pattern]
+'git config' [<file-option>] [--type=<type>] [--show-origin] [--show-scope] [-z|--null] [--fixed-value] [--name-only] --get-regexp name_regex [value-pattern]
'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>] [--fixed-value] --unset name [value-pattern]
+'git config' [<file-option>] [--fixed-value] --unset-all name [value-pattern]
'git config' [<file-option>] --rename-section old_name new_name
'git config' [<file-option>] --remove-section name
'git config' [<file-option>] [--show-origin] [--show-scope] [-z|--null] [--name-only] -l | --list
@@ -33,10 +33,13 @@
Multiple lines can be added to an option by using the `--add` option.
If you want to update or unset an option which can occur on multiple
-lines, a POSIX regexp `value_regex` needs to be given. Only the
-existing values that match the regexp are updated or unset. If
-you want to handle the lines that do *not* match the regex, just
-prepend a single exclamation mark in front (see also <<EXAMPLES>>).
+lines, a `value-pattern` (which is an extended regular expression,
+unless the `--fixed-value` option is given) needs to be given. Only the
+existing values that match the pattern are updated or unset. If
+you want to handle the lines that do *not* match the pattern, just
+prepend a single exclamation mark in front (see also <<EXAMPLES>>),
+but note that this only works when the `--fixed-value` option is not
+in use.
The `--type=<type>` option instructs 'git config' to ensure that incoming and
outgoing values are canonicalize-able under the given <type>. If no
@@ -73,11 +76,11 @@
--replace-all::
Default behavior is to replace at most one line. This replaces
- all lines matching the key (and optionally the value_regex).
+ all lines matching the key (and optionally the `value-pattern`).
--add::
Adds a new line to the option without altering any existing
- values. This is the same as providing '^$' as the value_regex
+ values. This is the same as providing '^$' as the `value-pattern`
in `--replace-all`.
--get::
@@ -165,6 +168,12 @@
--list::
List all variables set in config file, along with their values.
+--fixed-value::
+ When used with the `value-pattern` argument, treat `value-pattern` as
+ an exact string instead of a regular expression. This will restrict
+ the name/value pairs that are matched to only those where the value
+ is exactly equal to the `value-pattern`.
+
--type <type>::
'git config' will ensure that any input or output is valid under the given
type constraint(s), and will canonicalize outgoing values in `<type>`'s
@@ -337,6 +346,22 @@
See also <<FILES>>.
+GIT_CONFIG_COUNT::
+GIT_CONFIG_KEY_<n>::
+GIT_CONFIG_VALUE_<n>::
+ If GIT_CONFIG_COUNT is set to a positive number, all environment pairs
+ GIT_CONFIG_KEY_<n> and GIT_CONFIG_VALUE_<n> up to that number will be
+ added to the process's runtime configuration. The config pairs are
+ zero-indexed. Any missing key or value is treated as an error. An empty
+ GIT_CONFIG_COUNT is treated the same as GIT_CONFIG_COUNT=0, namely no
+ pairs are processed. These environment variables will override values
+ in configuration files, but will be overridden by any explicit options
+ passed via `git -c`.
++
+This is useful for cases where you want to spawn multiple git commands
+with a common configuration but cannot depend on a configuration file,
+for example when writing scripts.
+
[[EXAMPLES]]
EXAMPLES
diff --git a/Documentation/git-credential-store.txt b/Documentation/git-credential-store.txt
index 693dd9d..76b0798 100644
--- a/Documentation/git-credential-store.txt
+++ b/Documentation/git-credential-store.txt
@@ -94,6 +94,10 @@
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/Documentation/git-credential.txt b/Documentation/git-credential.txt
index 6f0c7ca..31c81c4 100644
--- a/Documentation/git-credential.txt
+++ b/Documentation/git-credential.txt
@@ -103,17 +103,20 @@
`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`::
@@ -123,7 +126,8 @@
`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`::
@@ -134,7 +138,7 @@
`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`::
@@ -146,8 +150,12 @@
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/Documentation/git-diff-index.txt b/Documentation/git-diff-index.txt
index f4bd815..27acb31 100644
--- a/Documentation/git-diff-index.txt
+++ b/Documentation/git-diff-index.txt
@@ -9,7 +9,7 @@
SYNOPSIS
--------
[verse]
-'git diff-index' [-m] [--cached] [<common diff options>] <tree-ish> [<path>...]
+'git diff-index' [-m] [--cached] [--merge-base] [<common diff options>] <tree-ish> [<path>...]
DESCRIPTION
-----------
@@ -27,7 +27,12 @@
The id of a tree object to diff against.
--cached::
- do not consider the on-disk file at all
+ Do not consider the on-disk file at all.
+
+--merge-base::
+ Instead of comparing <tree-ish> directly, use the merge base
+ between <tree-ish> and HEAD instead. <tree-ish> must be a
+ commit.
-m::
By default, files recorded in the index but not checked
diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt
index 5c8a2a5..2fc24c5 100644
--- a/Documentation/git-diff-tree.txt
+++ b/Documentation/git-diff-tree.txt
@@ -10,7 +10,7 @@
--------
[verse]
'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]
- [-t] [-r] [-c | --cc] [--combined-all-paths] [--root]
+ [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]
[<common diff options>] <tree-ish> [<tree-ish>] [<path>...]
DESCRIPTION
@@ -43,6 +43,11 @@
When `--root` is specified the initial commit will be shown as a big
creation event. This is equivalent to a diff against the NULL tree.
+--merge-base::
+ Instead of comparing the <tree-ish>s directly, use the merge
+ base between the two <tree-ish>s as the "before" side. There
+ must be two <tree-ish>s given and they must both be commits.
+
--stdin::
When `--stdin` is specified, the command does not take
<tree-ish> arguments from the command line. Instead, it
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index 37781cf..7f4c8a8 100644
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -10,16 +10,18 @@
--------
[verse]
'git diff' [<options>] [<commit>] [--] [<path>...]
-'git diff' [<options>] --cached [<commit>] [--] [<path>...]
-'git diff' [<options>] <commit> <commit> [--] [<path>...]
+'git diff' [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]
+'git diff' [<options>] [--merge-base] <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>...]::
@@ -38,7 +40,7 @@
or when running the command outside a working tree
controlled by Git. This form implies `--exit-code`.
-'git diff' [<options>] --cached [<commit>] [--] [<path>...]::
+'git diff' [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]::
This form is to view the changes you staged for the next
commit relative to the named <commit>. Typically you
@@ -47,6 +49,10 @@
If HEAD does not exist (e.g. unborn branches) and
<commit> is not given, it shows all staged changes.
--staged is a synonym of --cached.
++
+If --merge-base is given, instead of using <commit>, use the merge base
+of <commit> and HEAD. `git diff --merge-base A` is equivalent to
+`git diff $(git merge-base A HEAD)`.
'git diff' [<options>] <commit> [--] [<path>...]::
@@ -56,14 +62,28 @@
branch name to compare with the tip of a different
branch.
-'git diff' [<options>] <commit> <commit> [--] [<path>...]::
+'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<path>...]::
This is to view the changes between two arbitrary
<commit>.
++
+If --merge-base is given, use the merge base of the two commits for the
+"before" side. `git diff --merge-base A B` is equivalent to
+`git diff $(git merge-base A B) B`.
+
+'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 `^@` 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.
@@ -71,20 +91,20 @@
This form is to view the changes on the branch containing
and up to the second <commit>, starting at a common ancestor
- of both <commit>. "git diff A\...B" is equivalent to
- "git diff $(git merge-base A B) B". You can omit any one
+ of both <commit>. `git diff A...B` is equivalent to
+ `git diff $(git merge-base A B) B`. You can omit any one
of <commit>, which has the same effect as using HEAD instead.
Just in case you are doing something exotic, it should be
noted that all of the <commit> in the above description, except
-in the last two forms that use ".." notations, can be any
-<tree>.
+in the `--merge-base` case and in the last two forms that use `..`
+notations, can be any <tree>.
For a more complete list of ways to spell <commit>, see
"SPECIFYING REVISIONS" section in linkgit:gitrevisions[7].
However, "diff" is about comparing two _endpoints_, not ranges,
-and the range notations ("<commit>..<commit>" and
-"<commit>\...<commit>") do not mean a range as defined in the
+and the range notations (`<commit>..<commit>` and
+`<commit>...<commit>`) do not mean a range as defined in the
"SPECIFYING RANGES" section in linkgit:gitrevisions[7].
'git diff' [<options>] <blob> <blob>::
@@ -132,9 +152,9 @@
+
<1> Changes in the working tree not yet staged for the next commit.
<2> Changes between the index and your last commit; what you
- would be committing if you run "git commit" without "-a" option.
+ would be committing if you run `git commit` without `-a` option.
<3> Changes in the working tree since your last commit; what you
- would be committing if you run "git commit -a"
+ would be committing if you run `git commit -a`
Comparing with arbitrary commits::
+
@@ -196,7 +216,8 @@
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/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index 484c485..143b0c4 100644
--- a/Documentation/git-difftool.txt
+++ b/Documentation/git-difftool.txt
@@ -34,6 +34,14 @@
This is the default behaviour; the option is provided to
override any configuration settings.
+--rotate-to=<file>::
+ Start showing the diff for the given path,
+ the paths before it will move to end and output.
+
+--skip-to=<file>::
+ Start showing the diff for the given path, skipping all
+ the paths before it.
+
-t <tool>::
--tool=<tool>::
Use the diff tool specified by <tool>. Valid values include
diff --git a/Documentation/git-fast-export.txt b/Documentation/git-fast-export.txt
index e8950de..1978dbd 100644
--- a/Documentation/git-fast-export.txt
+++ b/Documentation/git-fast-export.txt
@@ -119,6 +119,11 @@
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
@@ -238,6 +243,30 @@
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/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index 7889f95..39cfa05 100644
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@ -122,6 +122,26 @@
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
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -273,7 +293,14 @@
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.
@@ -787,7 +814,7 @@
'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`
~~~~~
diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
index 5b1909f..9067c20 100644
--- a/Documentation/git-fetch.txt
+++ b/Documentation/git-fetch.txt
@@ -48,6 +48,10 @@
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 @@
* 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/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt
index 40ba4aa..62e482a 100644
--- a/Documentation/git-filter-branch.txt
+++ b/Documentation/git-filter-branch.txt
@@ -532,7 +532,7 @@
an alternative to git-filter-branch which does not suffer from these
performance problems or the safety problems (mentioned below). For those
with existing tooling which relies upon git-filter-branch, 'git
-repo-filter' also provides
+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
diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt
index 6dcd39f..2ae2478 100644
--- a/Documentation/git-for-each-ref.txt
+++ b/Documentation/git-for-each-ref.txt
@@ -11,7 +11,7 @@
'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 @@
--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 @@
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,20 +230,39 @@
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.
+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 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`.
+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
-with `trailers:only`. Whitespace-continuations can be removed from trailers so
-that each trailer appears on a line by itself with its full content with
-`trailers:unfold`. Both can be used together as `trailers:unfold,only`.
+are obtained as `trailers[:options]` (or by using the historical alias
+`contents:trailers[:options]`). For valid [:option] values see `trailers`
+section of linkgit:git-log[1].
For sorting purposes, fields with numeric values sort in numeric order
(`objectsize`, `authordate`, `committerdate`, `creatordate`, `taggerdate`).
@@ -385,6 +404,11 @@
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/Documentation/git-for-each-repo.txt b/Documentation/git-for-each-repo.txt
new file mode 100644
index 0000000..94bd19d
--- /dev/null
+++ b/Documentation/git-for-each-repo.txt
@@ -0,0 +1,59 @@
+git-for-each-repo(1)
+====================
+
+NAME
+----
+git-for-each-repo - Run a Git command on a list of repositories
+
+
+SYNOPSIS
+--------
+[verse]
+'git for-each-repo' --config=<config> [--] <arguments>
+
+
+DESCRIPTION
+-----------
+Run a Git command on a list of repositories. The arguments after the
+known options or `--` indicator are used as the arguments for the Git
+subprocess.
+
+THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE.
+
+For example, we could run maintenance on each of a list of repositories
+stored in a `maintenance.repo` config variable using
+
+-------------
+git for-each-repo --config=maintenance.repo maintenance run
+-------------
+
+This will run `git -C <repo> maintenance run` for each value `<repo>`
+in the multi-valued config variable `maintenance.repo`.
+
+
+OPTIONS
+-------
+--config=<config>::
+ Use the given config variable as a multi-valued list storing
+ absolute path names. Iterate on that list of paths to run
+ the given arguments.
++
+These config values are loaded from system, global, and local Git config,
+as available. If `git for-each-repo` is run in a directory that is not a
+Git repository, then only the system and global config is used.
+
+
+SUBPROCESS BEHAVIOR
+-------------------
+
+If any `git -C <repo> <arguments>` subprocess returns a non-zero exit code,
+then the `git for-each-repo` process returns that exit code without running
+more subprocesses.
+
+Each `git -C <repo> <arguments>` subprocess inherits the standard file
+descriptors `stdin`, `stdout`, and `stderr`.
+
+
+GIT
+---
+Part of the linkgit:git[1] suite
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 0d4f895..3e49bf2 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -24,9 +24,11 @@
[(--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>]]
+ [--filename-max-length=<n>]
[--progress]
[<common diff options>]
[ <since> | <revision range> ]
@@ -118,7 +120,7 @@
-s::
--signoff::
- Add `Signed-off-by:` line to the commit message, using
+ Add a `Signed-off-by` trailer to the commit message, using
the committer identity of yourself.
See the signoff option in linkgit:git-commit[1] for more information.
@@ -199,6 +201,13 @@
allows for useful naming of a patch series, and can be
combined with the `--numbered` option.
+--filename-max-length=<n>::
+ Instead of the standard 64 bytes, chomp the generated output
+ filenames at around '<n>' bytes (too short a value will be
+ silently raised to a reasonable length). Defaults to the
+ value of the `format.filenameMaxLength` configuration
+ variable, or 64 if unconfigured.
+
--rfc::
Alias for `--subject-prefix="RFC PATCH"`. RFC means "Request For
Comments"; use this when sending an experimental patch for
@@ -253,6 +262,13 @@
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
diff --git a/Documentation/git-fsck.txt b/Documentation/git-fsck.txt
index d72d15b..bd59661 100644
--- a/Documentation/git-fsck.txt
+++ b/Documentation/git-fsck.txt
@@ -129,14 +129,6 @@
Extracted Diagnostics
---------------------
-expect dangling commits - potential heads - due to lack of head information::
- You haven't specified any nodes as heads so it won't be
- possible to differentiate between un-parented commits and
- root nodes.
-
-missing sha1 directory '<dir>'::
- The directory holding the sha1 objects is missing.
-
unreachable <type> <object>::
The <type> object <object>, isn't actually referred to directly
or indirectly in any of the trees or commits seen. This can
diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt
index 0c114ad..853967d 100644
--- a/Documentation/git-gc.txt
+++ b/Documentation/git-gc.txt
@@ -117,12 +117,14 @@
'git gc' tries very hard not to delete objects that are referenced
anywhere in your repository. In particular, it will keep not only
objects referenced by your current set of branches and tags, but also
-objects referenced by the index, remote-tracking branches, notes saved
-by 'git notes' under refs/notes/, reflogs (which may reference commits
-in branches that were later amended or rewound), and anything else in
-the refs/* namespace. If you are expecting some objects to be deleted
-and they aren't, check all of those locations and decide whether it
-makes sense in your case to remove those references.
+objects referenced by the index, remote-tracking branches, reflogs
+(which may reference commits in branches that were later amended or
+rewound), and anything else in the refs/* namespace. Note that a note
+(of the kind created by 'git notes') attached to an object does not
+contribute in keeping the object alive. 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/Documentation/git-grep.txt b/Documentation/git-grep.txt
index ddb6acc..4e0ba82 100644
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -93,7 +93,7 @@
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. This option has no effect
@@ -206,8 +206,10 @@
-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::
@@ -239,7 +241,7 @@
--show-function::
Show the preceding line that contains the function name of
the match, unless the matching line is a function name itself.
- The name is determined in the same way as 'git diff' works out
+ The name is determined in the same way as `git diff` works out
patch hunk headers (see 'Defining a custom hunk-header' in
linkgit:gitattributes[5]).
@@ -264,7 +266,9 @@
Show the surrounding text from the previous line containing a
function name up to the one before the next function name,
effectively showing the whole function in which the match was
- found.
+ found. The function names are determined in the same way as
+ `git diff` works out patch hunk headers (see 'Defining a
+ custom hunk-header' in linkgit:gitattributes[5]).
--threads <num>::
Number of grep worker threads to use.
diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt
index f71db0d..44fe886 100644
--- a/Documentation/git-help.txt
+++ b/Documentation/git-help.txt
@@ -8,7 +8,7 @@
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 @@
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 @@
-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/Documentation/git-http-fetch.txt b/Documentation/git-http-fetch.txt
index 666b042..9fa17b6 100644
--- a/Documentation/git-http-fetch.txt
+++ b/Documentation/git-http-fetch.txt
@@ -9,7 +9,7 @@
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,19 @@
<commit-id>['\t'<filename-as-in--w>]
+--packfile=<hash>::
+ For internal use only. 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. Requires
+ --index-pack-args.
+
+--index-pack-args=<args>::
+ For internal use only. The command to run on the contents of the
+ downloaded pack. Arguments are URL-encoded separated by spaces.
+
--recover::
Verify that everything reachable from target is fetched. Used after
an earlier fetch is interrupted.
diff --git a/Documentation/git-imap-send.txt b/Documentation/git-imap-send.txt
index 65b53fc..63cf498 100644
--- a/Documentation/git-imap-send.txt
+++ b/Documentation/git-imap-send.txt
@@ -51,17 +51,13 @@
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 @@
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 @@
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/Documentation/git-index-pack.txt b/Documentation/git-index-pack.txt
index d5b7560..7fa74b9 100644
--- a/Documentation/git-index-pack.txt
+++ b/Documentation/git-index-pack.txt
@@ -9,17 +9,18 @@
SYNOPSIS
--------
[verse]
-'git index-pack' [-v] [-o <index-file>] <pack-file>
+'git index-pack' [-v] [-o <index-file>] [--[no-]rev-index] <pack-file>
'git index-pack' --stdin [--fix-thin] [--keep] [-v] [-o <index-file>]
- [<pack-file>]
+ [--[no-]rev-index] [<pack-file>]
DESCRIPTION
-----------
Reads a packed archive (.pack) from the specified file, and
-builds a pack index file (.idx) for it. The packed archive
-together with the pack index can then be placed in the
-objects/pack/ directory of a Git repository.
+builds a pack index file (.idx) for it. Optionally writes a
+reverse-index (.rev) for the specified pack. The packed
+archive together with the pack index can then be placed in
+the objects/pack/ directory of a Git repository.
OPTIONS
@@ -35,6 +36,13 @@
fails if the name of packed archive does not end
with .pack).
+--[no-]rev-index::
+ When this flag is provided, generate a reverse index
+ (a `.rev` file) corresponding to the given pack. If
+ `--verify` is given, ensure that the existing
+ reverse index is correct. Takes precedence over
+ `pack.writeReverseIndex`.
+
--stdin::
When this flag is provided, the pack is read from stdin
instead and a copy is then written to <pack-file>. If
@@ -78,7 +86,12 @@
Die if the pack contains broken links. For internal use only.
--fsck-objects::
- Die if the pack contains broken objects. For internal use only.
+ For internal use only.
++
+Die if the pack contains broken objects. If the pack contains a tree
+pointing to a .gitmodules blob that does not exist, prints the hash of
+that blob (for the caller to check) after the hash that goes into the
+name of the pack/idx file (see "Notes").
--threads=<n>::
Specifies the number of threads to spawn when resolving
@@ -93,11 +106,21 @@
--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/Documentation/git-init.txt b/Documentation/git-init.txt
index 32880aa..b611d80 100644
--- a/Documentation/git-init.txt
+++ b/Documentation/git-init.txt
@@ -10,7 +10,8 @@
--------
[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]
@@ -19,8 +20,9 @@
This command creates an empty Git repository - basically a `.git`
directory with subdirectories for `objects`, `refs/heads`,
-`refs/tags`, and template files. An initial `HEAD` file that
-references the HEAD of the master branch is also created.
+`refs/tags`, and template files. An initial branch without any
+commits will be created (see the `--initial-branch` option below
+for its name).
If the `$GIT_DIR` environment variable is set then it specifies a path
to use instead of `./.git` for the base of the repository.
@@ -48,6 +50,13 @@
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 +71,14 @@
+
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 (currently
+`master`, but this is subject to change in the future; the name can be
+customized via the `init.defaultBranch` configuration variable).
+
--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/Documentation/git-log.txt b/Documentation/git-log.txt
index bed09bb..1bbf865 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -15,9 +15,12 @@
-----------
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 @@
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
@@ -70,20 +77,7 @@
Intended to speed up tools that read log messages from `git log`
output by allowing them to allocate space in advance.
--L <start>,<end>:<file>::
--L :<funcname>:<file>::
- Trace the evolution of the line range given by "<start>,<end>"
- (or the function name regex <funcname>) within the <file>. You may
- not give any pathspec limiters. This is currently limited to
- a walk starting from a single revision, i.e., you may only
- give zero or one positive revision arguments, and
- <start> and <end> (or <funcname>) must exist in the starting revision.
- You can specify this option more than once. Implies `--patch`.
- Patch output can be suppressed using `--no-patch`, but other diff formats
- (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`,
- `--name-only`, `--name-status`, `--check`) are not currently implemented.
-+
-include::line-range-format.txt[]
+include::line-range-options.txt[]
<revision range>::
Show only commits in the specified revision range. When no
@@ -107,10 +101,21 @@
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 `--diff-merges` variants (including short
+`-m`, `-c`, and `--cc` options) is explicitly given, merge commits
+will not 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 case `first-parent` is
+the default format.
:git-log: 1
+:diff-merges-default: `off`
include::diff-options.txt[]
include::diff-generate-patch.txt[]
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 8461c0e..6d11ab5 100644
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -13,19 +13,19 @@
(--[cached|deleted|others|ignored|stage|unmerged|killed|modified])*
(-[c|d|o|i|s|u|k|m])*
[--eol]
+ [--deduplicate]
[-x <pattern>|--exclude=<pattern>]
[-X <file>|--exclude-from=<file>]
[--exclude-per-directory=<file>]
[--exclude-standard]
[--error-unmatch] [--with-tree=<tree-ish>]
[--full-name] [--recurse-submodules]
- [--abbrev] [--] [<file>...]
+ [--abbrev[=<n>]] [--] [<file>...]
DESCRIPTION
-----------
-This merges the file listing in the directory cache index with the
-actual working directory list, and shows different combinations of the
-two.
+This merges the file listing in the index with the actual working
+directory list, and shows different combinations of the two.
One or more of the options below may be used to determine the files
shown:
@@ -81,6 +81,13 @@
\0 line termination on output and do not quote filenames.
See OUTPUT below for more information.
+--deduplicate::
+ When only filenames are shown, suppress duplicates that may
+ come from having multiple stages during a merge, or giving
+ `--deleted` and `--modified` option at the same time.
+ When any of the `-t`, `--unmerged`, or `--stage` option is
+ in use, this option has no effect.
+
-x <pattern>::
--exclude=<pattern>::
Skip untracked files matching pattern.
@@ -148,12 +155,13 @@
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>]::
Instead of showing the full 40-byte hexadecimal object
- lines, show only a partial prefix.
+ lines, show the shortest prefix that is at least '<n>'
+ hexdigits long that uniquely refers the object.
Non default number of digits can be specified with --abbrev=<n>.
--debug::
diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt
index 0a5c8b7..492e573 100644
--- a/Documentation/git-ls-remote.txt
+++ b/Documentation/git-ls-remote.txt
@@ -101,9 +101,9 @@
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
+$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master seen rc
5fe978a5381f1fbad26a80e682ddd2a401966740 refs/heads/master
-c781a84b5204fb294c9ccc79f8b3baceeb32c061 refs/heads/pu
+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
diff --git a/Documentation/git-ls-tree.txt b/Documentation/git-ls-tree.txt
index a751571..db02d6d 100644
--- a/Documentation/git-ls-tree.txt
+++ b/Documentation/git-ls-tree.txt
@@ -62,7 +62,8 @@
--abbrev[=<n>]::
Instead of showing the full 40-byte hexadecimal object
- lines, show only a partial prefix.
+ lines, show the shortest prefix that is at least '<n>'
+ hexdigits long that uniquely refers the object.
Non default number of digits can be specified with --abbrev=<n>.
--full-name::
diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt
index 3bbc731..d343f04 100644
--- a/Documentation/git-mailinfo.txt
+++ b/Documentation/git-mailinfo.txt
@@ -53,7 +53,7 @@
The commit log message, author name and author email are
taken from the e-mail, and after minimally decoding MIME
transfer encoding, re-coded in the charset specified by
- i18n.commitencoding (defaulting to UTF-8) by transliterating
+ `i18n.commitEncoding` (defaulting to UTF-8) by transliterating
them. This used to be optional but now it is the default.
+
Note that the patch is always used as-is without charset
@@ -61,7 +61,7 @@
--encoding=<encoding>::
Similar to -u. But when re-coding, the charset specified here is
- used instead of the one specified by i18n.commitencoding or UTF-8.
+ used instead of the one specified by `i18n.commitEncoding` or UTF-8.
-n::
Disable all charset re-coding of the metadata.
@@ -72,10 +72,9 @@
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/Documentation/git-maintenance.txt b/Documentation/git-maintenance.txt
new file mode 100644
index 0000000..80ddd33
--- /dev/null
+++ b/Documentation/git-maintenance.txt
@@ -0,0 +1,346 @@
+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
+-----------
+
+register::
+ Initialize Git config values so any scheduled maintenance will
+ start running on this repository. This adds the repository to the
+ `maintenance.repo` config variable in the current user's global
+ config and enables some recommended configuration values for
+ `maintenance.<task>.schedule`. The tasks that are enabled are safe
+ for running in the background without disrupting foreground
+ processes.
++
+The `register` subcommand will also set the `maintenance.strategy` config
+value to `incremental`, if this value is not previously set. The
+`incremental` strategy uses the following schedule for each maintenance
+task:
++
+--
+* `gc`: disabled.
+* `commit-graph`: hourly.
+* `prefetch`: hourly.
+* `loose-objects`: daily.
+* `incremental-repack`: daily.
+--
++
+`git maintenance register` will also disable foreground maintenance by
+setting `maintenance.auto = false` in the current repository. This config
+setting will remain after a `git maintenance unregister` command.
+
+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.
+
+start::
+ Start running maintenance on the current repository. This performs
+ the same config updates as the `register` subcommand, then updates
+ the background scheduler to run `git maintenance run --scheduled`
+ on an hourly basis.
+
+stop::
+ Halt the background maintenance schedule. The current repository
+ is not removed from the list of maintained repositories, in case
+ the background maintenance is restarted later.
+
+unregister::
+ Remove the current repository from background maintenance. This
+ only removes the repository from the configured list. It does not
+ stop the background maintenance processes from running.
+
+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.
+
+prefetch::
+ The `prefetch` task updates the object directory with the latest
+ objects from all registered remotes. For each remote, a `git fetch`
+ command is run. The refmap is custom to avoid updating local or remote
+ branches (those in `refs/heads` or `refs/remotes`). Instead, the
+ remote refs are stored in `refs/prefetch/<remote>/`. Also, tags are
+ not updated.
++
+This is done to avoid disrupting the remote-tracking branches. The end users
+expect these refs to stay unmoved unless they initiate a fetch. With prefetch
+task, however, the objects necessary to complete a later real fetch would
+already be obtained, so the real fetch would go faster. In the ideal case,
+it will just become an update to a bunch of remote-tracking branches without
+any object transfer.
+
+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.
+
+loose-objects::
+ The `loose-objects` job cleans up loose objects and places them into
+ pack-files. In order to prevent race conditions with concurrent Git
+ commands, it follows a two-step process. First, it deletes any loose
+ objects that already exist in a pack-file; concurrent Git processes
+ will examine the pack-file for the object data instead of the loose
+ object. Second, it creates a new pack-file (starting with "loose-")
+ containing a batch of loose objects. The batch size is limited to 50
+ thousand objects to prevent the job from taking too long on a
+ repository with many loose objects. The `gc` task writes unreachable
+ objects as loose objects to be cleaned up by a later step only if
+ they are not re-added to a pack-file; for this reason it is not
+ advisable to enable both the `loose-objects` and `gc` tasks at the
+ same time.
+
+incremental-repack::
+ The `incremental-repack` job repacks the object directory
+ using the `multi-pack-index` feature. In order to prevent race
+ conditions with concurrent Git commands, it follows a two-step
+ process. First, it calls `git multi-pack-index expire` to delete
+ pack-files unreferenced by the `multi-pack-index` file. Second, it
+ calls `git multi-pack-index repack` to select several small
+ pack-files and repack them into a bigger one, and then update the
+ `multi-pack-index` entries that refer to the small pack-files to
+ refer to the new pack-file. This prepares those small pack-files
+ for deletion upon the next run of `git multi-pack-index expire`.
+ The selection of the small pack-files is such that the expected
+ size of the big pack-file is at least the batch size; see the
+ `--batch-size` option for the `repack` subcommand in
+ linkgit:git-multi-pack-index[1]. The default batch-size is zero,
+ which is a special case that attempts to repack all pack-files
+ into a single pack-file.
+
+pack-refs::
+ The `pack-refs` task collects the loose reference files and
+ collects them into a single file. This speeds up operations that
+ need to iterate across many references. See linkgit:git-pack-refs[1]
+ for more information.
+
+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. Not compatible with
+ the `--schedule` option.
+
+--schedule::
+ When combined with the `run` subcommand, run maintenance tasks
+ only if certain time conditions are met, as specified by the
+ `maintenance.<task>.schedule` config value for each `<task>`.
+ This config value specifies a number of seconds since the last
+ time that task ran, according to the `maintenance.<task>.lastRun`
+ config value. The tasks that are tested are those provided by
+ the `--task=<task>` option(s) or those with
+ `maintenance.<task>.enabled` set to true.
+
+--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.
+
+
+TROUBLESHOOTING
+---------------
+The `git maintenance` command is designed to simplify the repository
+maintenance patterns while minimizing user wait time during Git commands.
+A variety of configuration options are available to allow customizing this
+process. The default maintenance options focus on operations that complete
+quickly, even on large repositories.
+
+Users may find some cases where scheduled maintenance tasks do not run as
+frequently as intended. Each `git maintenance run` command takes a lock on
+the repository's object database, and this prevents other concurrent
+`git maintenance run` commands from running on the same repository. Without
+this safeguard, competing processes could leave the repository in an
+unpredictable state.
+
+The background maintenance schedule runs `git maintenance run` processes
+on an hourly basis. Each run executes the "hourly" tasks. At midnight,
+that process also executes the "daily" tasks. At midnight on the first day
+of the week, that process also executes the "weekly" tasks. A single
+process iterates over each registered repository, performing the scheduled
+tasks for that frequency. Depending on the number of registered
+repositories and their sizes, this process may take longer than an hour.
+In this case, multiple `git maintenance run` commands may run on the same
+repository at the same time, colliding on the object database lock. This
+results in one of the two tasks not running.
+
+If you find that some maintenance windows are taking longer than one hour
+to complete, then consider reducing the complexity of your maintenance
+tasks. For example, the `gc` task is much slower than the
+`incremental-repack` task. However, this comes at a cost of a slightly
+larger object database. Consider moving more expensive tasks to be run
+less frequently.
+
+Expert users may consider scheduling their own maintenance tasks using a
+different schedule than is available through `git maintenance start` and
+Git configuration options. These users should be aware of the object
+database lock and how concurrent `git maintenance run` commands behave.
+Further, the `git gc` command should not be combined with
+`git maintenance run` commands. `git gc` modifies the object database
+but does not take the lock in the same way as `git maintenance run`. If
+possible, use `git maintenance run --task=gc` instead of `git gc`.
+
+The following sections describe the mechanisms put in place to run
+background maintenance by `git maintenance start` and how to customize
+them.
+
+BACKGROUND MAINTENANCE ON POSIX SYSTEMS
+---------------------------------------
+
+The standard mechanism for scheduling background tasks on POSIX systems
+is cron(8). This tool executes commands based on a given schedule. The
+current list of user-scheduled tasks can be found by running `crontab -l`.
+The schedule written by `git maintenance start` is similar to this:
+
+-----------------------------------------------------------------------
+# BEGIN GIT MAINTENANCE SCHEDULE
+# The following schedule was created by Git
+# Any edits made in this region might be
+# replaced in the future by a Git command.
+
+0 1-23 * * * "/<path>/git" --exec-path="/<path>" for-each-repo --config=maintenance.repo maintenance run --schedule=hourly
+0 0 * * 1-6 "/<path>/git" --exec-path="/<path>" for-each-repo --config=maintenance.repo maintenance run --schedule=daily
+0 0 * * 0 "/<path>/git" --exec-path="/<path>" for-each-repo --config=maintenance.repo maintenance run --schedule=weekly
+
+# END GIT MAINTENANCE SCHEDULE
+-----------------------------------------------------------------------
+
+The comments are used as a region to mark the schedule as written by Git.
+Any modifications within this region will be completely deleted by
+`git maintenance stop` or overwritten by `git maintenance start`.
+
+The `crontab` entry specifies the full path of the `git` executable to
+ensure that the executed `git` command is the same one with which
+`git maintenance start` was issued independent of `PATH`. If the same user
+runs `git maintenance start` with multiple Git executables, then only the
+latest executable is used.
+
+These commands use `git for-each-repo --config=maintenance.repo` to run
+`git maintenance run --schedule=<frequency>` on each repository listed in
+the multi-valued `maintenance.repo` config option. These are typically
+loaded from the user-specific global config. The `git maintenance` process
+then determines which maintenance tasks are configured to run on each
+repository with each `<frequency>` using the `maintenance.<task>.schedule`
+config options. These values are loaded from the global or repository
+config values.
+
+If the config values are insufficient to achieve your desired background
+maintenance schedule, then you can create your own schedule. If you run
+`crontab -e`, then an editor will load with your user-specific `cron`
+schedule. In that editor, you can add your own schedule lines. You could
+start by adapting the default schedule listed earlier, or you could read
+the crontab(5) documentation for advanced scheduling techniques. Please
+do use the full path and `--exec-path` techniques from the default
+schedule to ensure you are executing the correct binaries in your
+schedule.
+
+
+BACKGROUND MAINTENANCE ON MACOS SYSTEMS
+---------------------------------------
+
+While macOS technically supports `cron`, using `crontab -e` requires
+elevated privileges and the executed process does not have a full user
+context. Without a full user context, Git and its credential helpers
+cannot access stored credentials, so some maintenance tasks are not
+functional.
+
+Instead, `git maintenance start` interacts with the `launchctl` tool,
+which is the recommended way to schedule timed jobs in macOS. Scheduling
+maintenance through `git maintenance (start|stop)` requires some
+`launchctl` features available only in macOS 10.11 or later.
+
+Your user-specific scheduled tasks are stored as XML-formatted `.plist`
+files in `~/Library/LaunchAgents/`. You can see the currently-registered
+tasks using the following command:
+
+-----------------------------------------------------------------------
+$ ls ~/Library/LaunchAgents/org.git-scm.git*
+org.git-scm.git.daily.plist
+org.git-scm.git.hourly.plist
+org.git-scm.git.weekly.plist
+-----------------------------------------------------------------------
+
+One task is registered for each `--schedule=<frequency>` option. To
+inspect how the XML format describes each schedule, open one of these
+`.plist` files in an editor and inspect the `<array>` element following
+the `<key>StartCalendarInterval</key>` element.
+
+`git maintenance start` will overwrite these files and register the
+tasks again with `launchctl`, so any customizations should be done by
+creating your own `.plist` files with distinct names. Similarly, the
+`git maintenance stop` command will unregister the tasks with `launchctl`
+and delete the `.plist` files.
+
+To create more advanced customizations to your background tasks, see
+launchctl.plist(5) for more information.
+
+
+BACKGROUND MAINTENANCE ON WINDOWS SYSTEMS
+-----------------------------------------
+
+Windows does not support `cron` and instead has its own system for
+scheduling background tasks. The `git maintenance start` command uses
+the `schtasks` command to submit tasks to this system. You can inspect
+all background tasks using the Task Scheduler application. The tasks
+added by Git have names of the form `Git Maintenance (<frequency>)`.
+The Task Scheduler GUI has ways to inspect these tasks, but you can also
+export the tasks to XML files and view the details there.
+
+Note that since Git is a console application, these background tasks
+create a console window visible to the current user. This can be changed
+manually by selecting the "Run whether user is logged in or not" option
+in Task Scheduler. This change requires a password input, which is why
+`git maintenance start` does not select it by default.
+
+If you want to customize the background tasks, please rename the tasks
+so future calls to `git maintenance (start|stop)` do not overwrite your
+custom tasks.
+
+
+GIT
+---
+Part of the linkgit:git[1] suite
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 092529c..3819fad 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -94,7 +94,8 @@
--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 @@
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/Documentation/git-mergetool--lib.txt b/Documentation/git-mergetool--lib.txt
index 4da9d24..3e8f59a 100644
--- a/Documentation/git-mergetool--lib.txt
+++ b/Documentation/git-mergetool--lib.txt
@@ -38,6 +38,10 @@
get_merge_tool_path::
returns the custom path for a merge tool.
+initialize_merge_tool::
+ bring merge tool specific functions into scope so they can be used or
+ overridden.
+
run_merge_tool::
launches a merge tool given the tool name and a true/false
flag to indicate whether a merge base is present.
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
index 6b14702..e587c77 100644
--- a/Documentation/git-mergetool.txt
+++ b/Documentation/git-mergetool.txt
@@ -99,6 +99,10 @@
(see linkgit:git-config[1]). To cancel `diff.orderFile`,
use `-O/dev/null`.
+CONFIGURATION
+-------------
+include::config/mergetool.txt[]
+
TEMPORARY FILES
---------------
`git mergetool` creates `*.orig` backup files while resolving merges.
diff --git a/Documentation/git-mktag.txt b/Documentation/git-mktag.txt
index fa6a756..17a2603 100644
--- a/Documentation/git-mktag.txt
+++ b/Documentation/git-mktag.txt
@@ -3,7 +3,7 @@
NAME
----
-git-mktag - Creates a tag object
+git-mktag - Creates a tag object with extra validation
SYNOPSIS
@@ -11,25 +11,52 @@
[verse]
'git mktag'
+OPTIONS
+-------
+
+--strict::
+ By default mktag turns on the equivalent of
+ linkgit:git-fsck[1] `--strict` mode. Use `--no-strict` to
+ disable it.
+
DESCRIPTION
-----------
-Reads a tag contents on standard input and creates a tag object
-that can also be used to sign other objects.
-The output is the new tag's <object> identifier.
+Reads a tag contents on standard input and creates a tag object. The
+output is the new tag's <object> identifier.
+
+This command is mostly equivalent to linkgit:git-hash-object[1]
+invoked with `-t tag -w --stdin`. I.e. both of these will create and
+write a tag found in `my-tag`:
+
+ git mktag <my-tag
+ git hash-object -t tag -w --stdin <my-tag
+
+The difference is that mktag will die before writing the tag if the
+tag doesn't pass a linkgit:git-fsck[1] check.
+
+The "fsck" check done mktag is stricter than what linkgit:git-fsck[1]
+would run by default in that all `fsck.<msg-id>` messages are promoted
+from warnings to errors (so e.g. a missing "tagger" line is an error).
+
+Extra headers in the object are also an error under mktag, but ignored
+by linkgit:git-fsck[1]. This extra check can be turned off by setting
+the appropriate `fsck.<msg-id>` varible:
+
+ git -c fsck.extraHeaderEntry=ignore mktag <my-tag-with-headers
Tag Format
----------
A tag signature file, to be fed to this command's standard input,
has a very simple fixed format: four lines of
- object <sha1>
+ object <hash>
type <typename>
tag <tagname>
tagger <tagger>
followed by some 'optional' free-form message (some tags created
-by older Git may not have `tagger` line). The message, when
+by older Git may not have `tagger` line). The message, when it
exists, is separated by a blank line from the header. The
message part may contain a signature that Git itself doesn't
care about, but that can be verified with gpg.
diff --git a/Documentation/git-multi-pack-index.txt b/Documentation/git-multi-pack-index.txt
index 642d9ac..eb0caa0 100644
--- a/Documentation/git-multi-pack-index.txt
+++ b/Documentation/git-multi-pack-index.txt
@@ -51,11 +51,15 @@
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/Documentation/git-notes.txt b/Documentation/git-notes.txt
index ced2e82..0a42006 100644
--- a/Documentation/git-notes.txt
+++ b/Documentation/git-notes.txt
@@ -223,7 +223,7 @@
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/Documentation/git-p4.txt b/Documentation/git-p4.txt
index 3494a1d..f89e68b 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -374,14 +374,55 @@
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 suppressed 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 occurred 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/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt
index fecdf26..f85cb7e 100644
--- a/Documentation/git-pack-objects.txt
+++ b/Documentation/git-pack-objects.txt
@@ -14,7 +14,7 @@
[--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 @@
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 @@
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
@@ -395,6 +400,17 @@
one wins" ordering (which allows repo-specific config to take precedence
over user-wide config, and so forth).
+
+CONFIGURATION
+-------------
+
+Various configuration variables affect packing, see
+linkgit:git-config[1] (search for "pack" and "delta").
+
+Notably, delta compression is not used on objects larger than the
+`core.bigFileThreshold` configuration variable and on files with the
+attribute `delta` set to false.
+
SEE ALSO
--------
linkgit:git-rev-list[1]
diff --git a/Documentation/git-parse-remote.txt b/Documentation/git-parse-remote.txt
deleted file mode 100644
index a45ea1e..0000000
--- a/Documentation/git-parse-remote.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-git-parse-remote(1)
-===================
-
-NAME
-----
-git-parse-remote - Routines to help parsing remote repository access parameters
-
-
-SYNOPSIS
---------
-[verse]
-'. "$(git --exec-path)/git-parse-remote"'
-
-DESCRIPTION
------------
-This script is included in various scripts to supply
-routines to parse files under $GIT_DIR/remotes/ and
-$GIT_DIR/branches/ and configuration variables that are related
-to fetching, pulling and pushing.
-
-GIT
----
-Part of the linkgit:git[1] suite
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index dfb901f..5c3fb67 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -85,8 +85,9 @@
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 @@
--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 @@
$ 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/Documentation/git-push.txt b/Documentation/git-push.txt
index 3b80534..ab103c8 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -13,7 +13,7 @@
[--repo=<repository>] [-f | --force] [-d | --delete] [--prune] [-v | --verbose]
[-u | --set-upstream] [-o <string> | --push-option=<string>]
[--[no-]signed|--signed=(true|false|if-asked)]
- [--force-with-lease[=<refname>[:<expect>]]]
+ [--force-with-lease[=<refname>[:<expect>]] [--force-if-includes]]
[--no-verify] [<repository> [<refspec>...]]
DESCRIPTION
@@ -320,6 +320,14 @@
force push changes to `master` if the remote version is still at
`base`, regardless of what your local `remotes/origin/master` has been
updated to in the background.
++
+Alternatively, specifying `--force-if-includes` as an ancillary option
+along with `--force-with-lease[=<refname>]` (i.e., without saying what
+exact commit the ref on the remote side must be pointing at, or which
+refs on the remote side are being protected) at the time of "push" will
+verify if updates from the remote-tracking refs that may have been
+implicitly updated in the background are integrated locally before
+allowing a forced update.
-f::
--force::
@@ -341,6 +349,22 @@
origin +master` to force a push to the `master` branch). See the
`<refspec>...` section above for details.
+--[no-]force-if-includes::
+ Force an update only if the tip of the remote-tracking ref
+ has been integrated locally.
++
+This option enables a check that verifies if the tip of the
+remote-tracking ref is reachable from one of the "reflog" entries of
+the local branch based in it for a rewrite. The check ensures that any
+updates from the remote have been incorporated locally by rejecting the
+forced update if that is not the case.
++
+If the option is passed without specifying `--force-with-lease`, or
+specified along with `--force-with-lease=<refname>:<expect>`, it is
+a "no-op".
++
+Specifying `--no-force-if-includes` disables this behavior.
+
--repo=<repository>::
This option is equivalent to the <repository> argument. If both
are specified, the command-line argument takes precedence.
diff --git a/Documentation/git-range-diff.txt b/Documentation/git-range-diff.txt
index 9701c1e..fe350d7 100644
--- a/Documentation/git-range-diff.txt
+++ b/Documentation/git-range-diff.txt
@@ -10,6 +10,7 @@
[verse]
'git range-diff' [--color=[<when>]] [--no-color] [<diff-options>]
[--no-dual-color] [--creation-factor=<factor>]
+ [--left-only | --right-only]
( <range1> <range2> | <rev1>...<rev2> | <base> <rev1> <rev2> )
DESCRIPTION
@@ -28,6 +29,17 @@
second commit range, with unmatched commits being inserted just after
all of their ancestors have been shown.
+There are three ways to specify the commit ranges:
+
+- `<range1> <range2>`: Either commit range can be of the form
+ `<base>..<rev>`, `<rev>^!` or `<rev>^-<n>`. See `SPECIFYING RANGES`
+ in linkgit:gitrevisions[7] for more details.
+
+- `<rev1>...<rev2>`. This is equivalent to
+ `<rev2>..<rev1> <rev1>..<rev2>`.
+
+- `<base> <rev1> <rev2>`: This is equivalent to `<base>..<rev1>
+ <base>..<rev2>`.
OPTIONS
-------
@@ -57,6 +69,14 @@
See the ``Algorithm`` section below for an explanation why this is
needed.
+--left-only::
+ Suppress commits that are missing from the first specified range
+ (or the "left range" when using the `<rev1>...<rev2>` format).
+
+--right-only::
+ Suppress commits that are missing from the second specified range
+ (or the "right range" when using the `<rev1>...<rev2>` format).
+
--[no-]notes[=<ref>]::
This flag is passed to the `git log` program
(see linkgit:git-log[1]) that generates the patches.
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index da33f84..5fa8bab 100644
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@ -116,9 +116,9 @@
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::
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index f7a6033..a0487b5 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -204,6 +204,7 @@
-------------
include::config/rebase.txt[]
+include::config/sequencer.txt[]
OPTIONS
-------
@@ -256,9 +257,10 @@
--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:
+--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.
@@ -277,20 +279,51 @@
Other options, like --exec, will use the default of drop unless
-i/--interactive is explicitly specified.
+
-Note that commits which start empty are kept, and commits which are
-clean cherry-picks (as determined by `git log --cherry-mark ...`) are
-always dropped.
+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::
- No-op. Rebasing commits that started empty (had no change
- relative to their parent) used to fail and this option would
- override that behavior, allowing commits with empty changes to
- be rebased. Now commits with no changes do not cause rebasing
- to halt.
+ 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.
+
-See also BEHAVIORAL DIFFERENCES and INCOMPATIBLE OPTIONS below.
+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::
No-op. Rebasing commits with an empty message used to fail
@@ -354,9 +387,12 @@
-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::
@@ -414,30 +450,53 @@
<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 flags 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.
--signoff::
- Add a Signed-off-by: trailer to all the rebased commits. Note
+ Add a `Signed-off-by` trailer to all the rebased commits. Note
that if `--interactive` is given then only commits marked to be
picked, edited or reworded will have the trailer added.
+
@@ -570,9 +629,6 @@
The following options:
* --apply
- * --committer-date-is-author-date
- * --ignore-date
- * --ignore-whitespace
* --whitespace
* -C
@@ -587,8 +643,9 @@
* --preserve-merges
* --interactive
* --exec
- * --keep-empty
+ * --no-keep-empty
* --empty=
+ * --reapply-cherry-picks
* --edit-todo
* --root when used in combination with --onto
@@ -598,14 +655,18 @@
* --preserve-merges and --signoff
* --preserve-merges and --rebase-merges
* --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
-----------------------
git rebase has two primary backends: apply and merge. (The apply
-backend used to known as the 'am' backend, but the name led to
+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
@@ -620,12 +681,15 @@
also drops commits that become empty and has no option for controlling
this behavior.
-The merge backend keeps intentionally empty commits. Similar to the
-apply backend, by default the merge backend drops commits that become
-empty unless -i/--interactive is specified (in which case it stops and
-asks the user what to do). The merge backend also has an
---empty={drop,keep,ask} option for changing the behavior of handling
-commits that become empty.
+The 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).
+
+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
~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -684,9 +748,17 @@
~~~~~
The apply backend has not traditionally called the post-commit hook,
-while the merge backend has. However, this was by accident of
-implementation rather than by design. Both backends should have the
-same behavior, though it is not clear which one is correct.
+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
~~~~~~~~~~~~~~~~
@@ -1002,7 +1074,8 @@
'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
diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt
index 9659abb..31c29c9 100644
--- a/Documentation/git-remote.txt
+++ b/Documentation/git-remote.txt
@@ -10,7 +10,7 @@
--------
[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 @@
-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 @@
'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 `-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 @@
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 @@
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.
@@ -203,6 +203,17 @@
`remote.origin.fetch` configuration variables. (See
linkgit:git-config[1]).
+EXIT STATUS
+-----------
+
+On success, the exit status is `0`.
+
+When subcommands such as 'add', 'rename', and 'remove' can't find the
+remote in question, the exit status is `2`. When the remote already
+exists, the exit status is `3`.
+
+On any other error, the exit status may be any other non-zero value.
+
EXAMPLES
--------
diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt
index 92f146d..fbd4b4a 100644
--- a/Documentation/git-repack.txt
+++ b/Documentation/git-repack.txt
@@ -165,9 +165,12 @@
Pass the `--delta-islands` option to `git-pack-objects`, see
linkgit:git-pack-objects[1].
-Configuration
+CONFIGURATION
-------------
+Various configuration variables affect packing, see
+linkgit:git-config[1] (search for "pack" and "delta").
+
By default, the command passes `--delta-base-offset` option to
'git pack-objects'; this typically results in slightly smaller packs,
but the generated packs are incompatible with versions of Git older than
@@ -178,6 +181,10 @@
is unaffected by this option as the conversion is performed on the fly
as needed in that case.
+Delta compression is not used on objects larger than the
+`core.bigFileThreshold` configuration variable and on files with the
+attribute `delta` set to false.
+
SEE ALSO
--------
linkgit:git-pack-objects[1]
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index 932080c..252e2d4 100644
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -87,6 +87,12 @@
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
diff --git a/Documentation/git-restore.txt b/Documentation/git-restore.txt
index 5bf60d4..55bde91 100644
--- a/Documentation/git-restore.txt
+++ b/Documentation/git-restore.txt
@@ -22,9 +22,8 @@
`--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.
@@ -39,10 +38,12 @@
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.
++
+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`.
-p::
--patch::
@@ -107,6 +108,17 @@
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
diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
index 025c911..20bb8e8 100644
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@ -14,44 +14,8 @@
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
@@ -67,6 +31,99 @@
include::pretty-formats.txt[]
+EXAMPLES
+--------
+
+* Print the list of commits reachable from the current branch.
++
+----------
+git rev-list HEAD
+----------
+
+* Print the list of commits on this branch, but not present in the
+ upstream branch.
++
+----------
+git rev-list @{upstream}..HEAD
+----------
+
+* Format commits with their author and commit message (see also the
+ porcelain linkgit:git-log[1]).
++
+----------
+git rev-list --format=medium HEAD
+----------
+
+* Format commits along with their diffs (see also the porcelain
+ linkgit:git-log[1], which can do this in a single process).
++
+----------
+git rev-list HEAD |
+git diff-tree --stdin --format=medium -p
+----------
+
+* Print the list of commits on the current branch that touched any
+ file in the `Documentation` directory.
++
+----------
+git rev-list HEAD -- Documentation/
+----------
+
+* Print the list of commits authored by you in the past year, on
+ any branch, tag, or other ref.
++
+----------
+git rev-list --author=you@example.com --since=1.year.ago --all
+----------
+
+* Print the list of objects reachable from the current branch (i.e., all
+ commits and the blobs and trees they contain).
++
+----------
+git rev-list --objects HEAD
+----------
+
+* Compare the disk size of all reachable objects, versus those
+ reachable from reflogs, versus the total packed size. This can tell
+ you whether running `git repack -ad` might reduce the repository size
+ (by dropping unreachable objects), and whether expiring reflogs might
+ help.
++
+----------
+# reachable objects
+git rev-list --disk-usage --objects --all
+# plus reflogs
+git rev-list --disk-usage --objects --all --reflog
+# total disk size used
+du -c .git/objects/pack/*.pack .git/objects/??/*
+# alternative to du: add up "size" and "size-pack" fields
+git count-objects -v
+----------
+
+* Report the disk size of each branch, not including objects used by the
+ current branch. This can find outliers that are contributing to a
+ bloated repository size (e.g., because somebody accidentally committed
+ large build artifacts).
++
+----------
+git for-each-ref --format='%(refname)' |
+while read branch
+do
+ size=$(git rev-list --disk-usage --objects HEAD..$branch)
+ echo "$size $branch"
+done |
+sort -n
+----------
+
+* Compare the on-disk size of branches in one group of refs, excluding
+ another. If you co-mingle objects from multiple remotes in a single
+ repository, this can show which remotes are contributing to the
+ repository size (taking the size of `origin` as a baseline).
++
+----------
+git rev-list --disk-usage --objects --remotes=$suspect --not --remotes=origin
+----------
+
GIT
---
Part of the linkgit:git[1] suite
diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index 19b12b6..6b8ca08 100644
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@ -109,6 +109,10 @@
annotated tag that points at a commit). To make sure that `$VAR`
names an existing object of any type, `git rev-parse "$VAR^{object}"`
can be used.
++
+Note that if you are verifying a name from an untrusted source, it is
+wise to use `--end-of-options` so that the name argument is not mistaken
+for another option.
-q::
--quiet::
@@ -208,6 +212,18 @@
Only the names of the variables are listed, not their value,
even if they are set.
+--path-format=(absolute|relative)::
+ Controls the behavior of certain other options. If specified as absolute, the
+ paths printed by those options will be absolute and canonical. If specified as
+ relative, the paths will be relative to the current working directory if that
+ is possible. The default is option specific.
++
+This option may be specified multiple times and affects only the arguments that
+follow it on the command line, either to the end of the command line or the next
+instance of this option.
+
+The following options are modified by `--path-format`:
+
--git-dir::
Show `$GIT_DIR` if defined. Otherwise show the path to
the .git directory. The path shown, when relative, is
@@ -217,13 +233,42 @@
is not detected to lie in a Git repository or work tree
print a message to stderr and exit with nonzero status.
+--git-common-dir::
+ Show `$GIT_COMMON_DIR` if defined, else `$GIT_DIR`.
+
+--resolve-git-dir <path>::
+ Check if <path> is a valid repository or a gitfile that
+ points at a valid repository, and print the location of the
+ repository. If <path> is a gitfile then the resolved path
+ to the real repository is printed.
+
+--git-path <path>::
+ Resolve "$GIT_DIR/<path>" and takes other path relocation
+ variables such as $GIT_OBJECT_DIRECTORY,
+ $GIT_INDEX_FILE... into account. For example, if
+ $GIT_OBJECT_DIRECTORY is set to /foo/bar then "git rev-parse
+ --git-path objects/abc" returns /foo/bar/abc.
+
+--show-toplevel::
+ Show the (by default, 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
+ working tree (if exists) that uses the current repository as
+ its submodule. Outputs nothing if the current repository is
+ not used as a submodule by any project.
+
+--shared-index-path::
+ Show the path to the shared index file in split index mode, or
+ empty if not in split-index mode.
+
+The following options are unaffected by `--path-format`:
+
--absolute-git-dir::
Like `--git-dir`, but its output is always the canonicalized
absolute path.
---git-common-dir::
- Show `$GIT_COMMON_DIR` if defined, else `$GIT_DIR`.
-
--is-inside-git-dir::
When the current working directory is below the repository
directory print "true", otherwise "false".
@@ -238,19 +283,6 @@
--is-shallow-repository::
When the repository is shallow print "true", otherwise "false".
---resolve-git-dir <path>::
- Check if <path> is a valid repository or a gitfile that
- points at a valid repository, and print the location of the
- repository. If <path> is a gitfile then the resolved path
- to the real repository is printed.
-
---git-path <path>::
- Resolve "$GIT_DIR/<path>" and takes other path relocation
- variables such as $GIT_OBJECT_DIRECTORY,
- $GIT_INDEX_FILE... into account. For example, if
- $GIT_OBJECT_DIRECTORY is set to /foo/bar then "git rev-parse
- --git-path objects/abc" returns /foo/bar/abc.
-
--show-cdup::
When the command is invoked from a subdirectory, show the
path of the top-level directory relative to the current
@@ -261,20 +293,6 @@
path of the current directory relative to the top-level
directory.
---show-toplevel::
- Show the absolute path of the top-level directory of the working
- tree. If there is no working tree, report an error.
-
---show-superproject-working-tree::
- Show the absolute path of the root of the superproject's
- working tree (if exists) that uses the current repository as
- its submodule. Outputs nothing if the current repository is
- not used as a submodule by any project.
-
---shared-index-path::
- 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
@@ -446,7 +464,7 @@
* Print the commit object name from the revision in the $REV shell variable:
+
------------
-$ git rev-parse --verify $REV^{commit}
+$ git rev-parse --verify --end-of-options $REV^{commit}
------------
+
This will error out if $REV is empty or not a valid revision.
@@ -454,7 +472,7 @@
* Similar to above:
+
------------
-$ git rev-parse --default master --verify $REV
+$ git rev-parse --default master --verify --end-of-options $REV
------------
+
but if $REV is empty, the commit object name from master will be printed.
diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt
index 9d22270..bb92a4a 100644
--- a/Documentation/git-revert.txt
+++ b/Documentation/git-revert.txt
@@ -90,13 +90,16 @@
-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::
- Add Signed-off-by line at the end of the commit message.
+ Add a `Signed-off-by` trailer at the end of the commit message.
See the signoff option in linkgit:git-commit[1] for more information.
--strategy=<strategy>::
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 0a69810..93708ae 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -313,7 +313,7 @@
the value of `sendemail.identity`.
--[no-]signed-off-by-cc::
- If this is set, add emails found in Signed-off-by: or Cc: lines to the
+ If this is set, add emails found in the `Signed-off-by` trailer or Cc: lines to the
cc list. Default is the value of `sendemail.signedoffbycc` configuration
value; if that is unspecified, default to --signed-off-by-cc.
@@ -340,7 +340,7 @@
except for self (use 'self' for that).
- 'bodycc' will avoid including anyone mentioned in Cc lines in the
patch body (commit message) except for self (use 'self' for that).
-- 'sob' will avoid including anyone mentioned in Signed-off-by lines except
+- 'sob' will avoid including anyone mentioned in the Signed-off-by trailers except
for self (use 'self' for that).
- 'misc-by' will avoid including anyone mentioned in Acked-by,
Reviewed-by, Tested-by and other "-by" lines in the patch body,
@@ -494,10 +494,14 @@
smtpServerPort = 587
----
-If you have multifactor authentication setup on your gmail account, you will
+If you have multi-factor authentication set up on your Gmail account, you will
need to generate an app-specific password for use with 'git send-email'. Visit
https://security.google.com/settings/security/apppasswords to create it.
+If you do not have multi-factor authentication set up on your Gmail account,
+you will need to allow less secure app access. Visit
+https://myaccount.google.com/lesssecureapps to enable it.
+
Once your commits are ready to be sent to the mailing list, run the
following commands:
diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt
index a72ea7f..c9c7f30 100644
--- a/Documentation/git-shortlog.txt
+++ b/Documentation/git-shortlog.txt
@@ -47,9 +47,38 @@
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
@@ -82,11 +111,11 @@
MAPPING AUTHORS
---------------
-The `.mailmap` feature is used to coalesce together commits by the same
-person in the shortlog, where their name and/or email address was
-spelled differently.
+See linkgit:gitmailmap[5].
-include::mailmap.txt[]
+Note that if `git shortlog` is run outside of a repository (to process
+log contents on standard input), it will look for a `.mailmap` file in
+the current directory.
GIT
---
diff --git a/Documentation/git-show-index.txt b/Documentation/git-show-index.txt
index 424e4ba..e49318a 100644
--- a/Documentation/git-show-index.txt
+++ b/Documentation/git-show-index.txt
@@ -9,7 +9,7 @@
SYNOPSIS
--------
[verse]
-'git show-index'
+'git show-index' [--object-format=<hash-algorithm>]
DESCRIPTION
@@ -36,6 +36,17 @@
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/Documentation/git-show.txt b/Documentation/git-show.txt
index fcf528c..2b1bc72 100644
--- a/Documentation/git-show.txt
+++ b/Documentation/git-show.txt
@@ -45,10 +45,13 @@
include::pretty-formats.txt[]
-COMMON DIFF OPTIONS
--------------------
+DIFF FORMATTING
+---------------
+The options below can be used to change the way `git show` generates
+diff output.
:git-log: 1
+:diff-merges-default: `dense-combined`
include::diff-options.txt[]
include::diff-generate-patch.txt[]
diff --git a/Documentation/git-sparse-checkout.txt b/Documentation/git-sparse-checkout.txt
index c0342e5..a0eeaeb 100644
--- a/Documentation/git-sparse-checkout.txt
+++ b/Documentation/git-sparse-checkout.txt
@@ -70,6 +70,16 @@
`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
@@ -190,10 +200,32 @@
SUBMODULES
----------
-If your repository contains one or more submodules, then those submodules will
-appear based on which you initialized with the `git submodule` command. If
-your sparse-checkout patterns exclude an initialized submodule, then that
-submodule will still appear in your working directory.
+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
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 31f1beb..f1197d6 100644
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -8,8 +8,8 @@
SYNOPSIS
--------
[verse]
-'git stash' list [<options>]
-'git stash' show [<options>] [<stash>]
+'git stash' list [<log-options>]
+'git stash' show [<diff-options>] [<stash>]
'git stash' drop [-q|--quiet] [<stash>]
'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>]
'git stash' branch <branchname> [<stash>]
@@ -67,7 +67,7 @@
Instead, all non-option arguments are concatenated to form the stash
message.
-list [<options>]::
+list [<log-options>]::
List the stash entries that you currently have. Each 'stash entry' is
listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is
@@ -83,7 +83,7 @@
The command takes options applicable to the 'git log'
command to control what is shown and how. See linkgit:git-log[1].
-show [<options>] [<stash>]::
+show [<diff-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
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index 7731b45..83f38e3 100644
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -130,7 +130,7 @@
--column[=<options>]::
--no-column::
Display untracked files in columns. See configuration variable
- column.status for option syntax.`--column` and `--no-column`
+ `column.status` for option syntax. `--column` and `--no-column`
without options are equivalent to 'always' and 'never'
respectively.
@@ -184,11 +184,26 @@
literal: surrounded by ASCII double quote (34) characters, and with
interior special characters backslash-escaped.
-For paths with merge conflicts, `X` and `Y` show the modification
-states of each side of the merge. For paths that do not have merge
-conflicts, `X` shows the status of the index, and `Y` shows the status
-of the work tree. For untracked paths, `XY` are `??`. Other status
-codes can be interpreted as follows:
+There are three different types of states that are shown using this format, and
+each one uses the `XY` syntax differently:
+
+* When a merge is occurring and the merge was successful, or outside of a merge
+ situation, `X` shows the status of the index and `Y` shows the status of the
+ working tree.
+* When a merge conflict has occurred and has not yet been resolved, `X` and `Y`
+ show the state introduced by each head of the merge, relative to the common
+ ancestor. These paths are said to be _unmerged_.
+* When a path is untracked, `X` and `Y` are always the same, since they are
+ unknown to the index. `??` is used for untracked paths. Ignored files are
+ not listed unless `--ignored` is used; if it is, ignored files are indicated
+ by `!!`.
+
+Note that the term _merge_ here also includes rebases using the default
+`--merge` strategy, cherry-picks, and anything else using the merge machinery.
+
+In the following table, these three classes are shown in separate sections, and
+these characters are used for `X` and `Y` fields for the first two sections that
+show tracked paths:
* ' ' = unmodified
* 'M' = modified
@@ -198,9 +213,6 @@
* 'C' = copied
* 'U' = updated but unmerged
-Ignored files are not listed, unless `--ignored` option is in effect,
-in which case `XY` are `!!`.
-
....
X Y Meaning
-------------------------------------------------
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index c9ed2bf..7e5f995 100644
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -183,7 +183,7 @@
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
@@ -284,7 +284,7 @@
`.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::
@@ -322,10 +322,10 @@
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.
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 6624a14..67b143c 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -701,7 +701,7 @@
--use-log-author::
When retrieving svn commits into Git (as part of 'fetch', 'rebase', or
- 'dcommit' operations), look for the first `From:` or `Signed-off-by:` line
+ 'dcommit' operations), look for the first `From:` line or `Signed-off-by` trailer
in the log message and use that as the author string.
+
[verse]
@@ -710,7 +710,7 @@
--add-author-from::
When committing to svn from Git (as part of 'set-tree' or 'dcommit'
operations), if the existing log message doesn't already have a
- `From:` or `Signed-off-by:` line, append a `From:` line based on the
+ `From:` or `Signed-off-by` trailer, append a `From:` line based on the
Git commit's author string. If you use this, then `--use-log-author`
will retrieve a valid author string for all commits.
+
diff --git a/Documentation/git-switch.txt b/Documentation/git-switch.txt
index 1979003..5c438cd 100644
--- a/Documentation/git-switch.txt
+++ b/Documentation/git-switch.txt
@@ -103,6 +103,9 @@
`checkout.defaultRemote` in linkgit:git-config[1].
+
`--guess` is the default behavior. Use `--no-guess` to disable it.
++
+The default behavior can be set via the `checkout.guess` configuration
+variable.
-f::
--force::
@@ -181,9 +184,9 @@
--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/Documentation/git-tag.txt b/Documentation/git-tag.txt
index f6d9791..31a97a1 100644
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -15,7 +15,7 @@
'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
@@ -134,7 +134,7 @@
--column[=<options>]::
--no-column::
Display tag listing in columns. See configuration variable
- column.tag for option syntax.`--column` and `--no-column`
+ `column.tag` for option syntax. `--column` and `--no-column`
without options are equivalent to 'always' and 'never' respectively.
+
This option is only applicable when listing tags without annotation lines.
@@ -149,11 +149,11 @@
--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 @@
include::date-formats.txt[]
+NOTES
+-----
+
+include::ref-reachability-filters.txt[]
+
SEE ALSO
--------
linkgit:git-check-ref-format[1].
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index 1489cb0..2853f16 100644
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -30,9 +30,8 @@
DESCRIPTION
-----------
-Modifies the index or directory cache. Each file mentioned is updated
-into the index and any 'unmerged' or 'needs updating' state is
-cleared.
+Modifies the index. Each file mentioned is updated into the index and
+any 'unmerged' or 'needs updating' state is cleared.
See also linkgit:git-add[1] for a more user-friendly way to do some of
the most common operations on the index.
diff --git a/Documentation/git-update-ref.txt b/Documentation/git-update-ref.txt
index 9671423..48b6683 100644
--- a/Documentation/git-update-ref.txt
+++ b/Documentation/git-update-ref.txt
@@ -66,6 +66,10 @@
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 @@
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,32 @@
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. This command may create a new empty transaction when
+ the current one has been committed or aborted already.
+
+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 +149,13 @@
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/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
index 85d92c9..f1bb1fa 100644
--- a/Documentation/git-worktree.txt
+++ b/Documentation/git-worktree.txt
@@ -15,6 +15,7 @@
'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 @@
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 @@
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,26 @@
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, the
+branch currently checked out (or "detached HEAD" if none), "locked" if
+the worktree is locked, "prunable" if the worktree can be pruned by `prune`
+command.
lock::
@@ -96,11 +112,14 @@
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 +128,28 @@
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.
++
+If both the main working tree and linked working trees have been moved
+manually, then running `repair` in the main working tree and specifying the
+new `<path>` of each linked working tree will reestablish all connections
+in both directions.
+
unlock::
Unlock a working tree, allowing it to be pruned, moved or deleted.
@@ -126,7 +167,9 @@
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 +178,14 @@
-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 +196,7 @@
--[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 +208,12 @@
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 +227,19 @@
-q::
--quiet::
- With 'add', suppress feedback messages.
+ With `add`, suppress feedback messages.
-v::
--verbose::
With `prune`, report all removals.
++
+With `list`, output additional information about worktrees (see below).
--expire <time>::
- With `prune`, only expire unused working trees older than <time>.
+ With `prune`, only expire unused working trees older than `<time>`.
++
+With `list`, annotate missing working trees as prunable if they are
+older than `<time>`.
--reason <string>::
With `lock`, an explanation why the working tree is locked.
@@ -200,48 +249,48 @@
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 +302,7 @@
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 +315,7 @@
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 +323,52 @@
`$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:
------------
@@ -328,13 +378,46 @@
/path/to/other-linked-worktree 1234abc (detached HEAD)
------------
+The command also shows annotations for each working tree, according to its state.
+These annotations are:
+
+ * `locked`, if the working tree is locked.
+ * `prunable`, if the working tree can be pruned via `git worktree prune`.
+
+------------
+$ git worktree list
+/path/to/linked-worktree abcd1234 [master]
+/path/to/locked-worktreee acbd5678 (brancha) locked
+/path/to/prunable-worktree 5678abc (detached HEAD) prunable
+------------
+
+For these annotations, a reason might also be available and this can be
+seen using the verbose mode. The annotation is then moved to the next line
+indented followed by the additional information.
+
+------------
+$ git worktree list --verbose
+/path/to/linked-worktree abcd1234 [master]
+/path/to/locked-worktree-no-reason abcd5678 (detached HEAD) locked
+/path/to/locked-worktree-with-reason 1234abcd (brancha)
+ locked: working tree path is mounted on a portable device
+/path/to/prunable-worktree 5678abc1 (detached HEAD)
+ prunable: gitdir file points to non-existent location
+------------
+
+Note that the annotation is moved to the next line if the additional
+information is available, otherwise it stays on the same line as the
+working tree itself.
+
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. Some attributes (like `locked`) can be listed as a label
+only or with a value depending upon whether a reason is available. 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
@@ -349,6 +432,33 @@
HEAD 1234abc1234abc1234abc1234abc1234abc1234a
detached
+worktree /path/to/linked-worktree-locked-no-reason
+HEAD 5678abc5678abc5678abc5678abc5678abc5678c
+branch refs/heads/locked-no-reason
+locked
+
+worktree /path/to/linked-worktree-locked-with-reason
+HEAD 3456def3456def3456def3456def3456def3456b
+branch refs/heads/locked-with-reason
+locked reason why is locked
+
+worktree /path/to/linked-worktree-prunable
+HEAD 1233def1234def1234def1234def1234def1234b
+detached
+prunable gitdir file points to non-existent location
+
+------------
+
+If the lock reason contains "unusual" characters such as newline, they
+are escaped and the entire reason is quoted as explained for the
+configuration variable `core.quotePath` (see linkgit:git-config[1]).
+For Example:
+
+------------
+$ git worktree list --porcelain
+...
+locked "reason\nwhy is locked"
+...
------------
EXAMPLES
diff --git a/Documentation/git.txt b/Documentation/git.txt
index b0672bd..3a9c449 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -13,7 +13,7 @@
[--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
[-p|--paginate|-P|--no-pager] [--no-replace-objects] [--bare]
[--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]
- [--super-prefix=<path>]
+ [--super-prefix=<path>] [--config-env <name>=<envvar>]
<command> [<args>]
DESCRIPTION
@@ -80,6 +80,28 @@
foo.bar= ...`) sets `foo.bar` to the empty string which `git config
--type=bool` will convert to `false`.
+--config-env=<name>=<envvar>::
+ Like `-c <name>=<value>`, give configuration variable
+ '<name>' a value, where <envvar> is the name of an
+ environment variable from which to retrieve the value. Unlike
+ `-c` there is no shortcut for directly setting the value to an
+ empty string, instead the environment variable itself must be
+ set to the empty string. It is an error if the `<envvar>` does not exist
+ in the environment. `<envvar>` may not contain an equals sign
+ to avoid ambiguity with `<name>` containing one.
++
+This is useful for cases where you want to pass transitory
+configuration options to git, but are doing so on OS's where
+other processes might be able to read your cmdline
+(e.g. `/proc/self/cmdline`), but not your environ
+(e.g. `/proc/self/environ`). That behavior is the default on
+Linux, but may not be on your system.
++
+Note that this might add security for variables such as
+`http.extraHeader` where the sensitive information is part of
+the value, but not e.g. `url.<base>.insteadOf` where the
+sensitive information can be part of the key.
+
--exec-path[=<path>]::
Path to wherever your core Git programs are installed.
This can also be controlled by setting the GIT_EXEC_PATH
@@ -304,6 +326,13 @@
include::cmds-purehelpers.txt[]
+Guides
+------
+
+The following documentation pages are guides about Git concepts.
+
+include::cmds-guide.txt[]
+
Configuration Mechanism
-----------------------
@@ -493,6 +522,13 @@
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`::
@@ -537,8 +573,9 @@
`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
@@ -591,6 +628,12 @@
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
+ linkgit:git-rebase[1] and the `sequence.editor` option in
+ linkgit:git-config[1].
+
`GIT_SSH`::
`GIT_SSH_COMMAND`::
If either of these environment variables is set then 'git fetch'
@@ -701,6 +744,10 @@
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.
@@ -715,8 +762,6 @@
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`::
@@ -771,11 +816,10 @@
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
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 508fe71..e84e104 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -802,6 +802,9 @@
- `ada` suitable for source code in the Ada language.
+- `bash` suitable for source code in the Bourne-Again SHell language.
+ Covers a superset of POSIX shell function definitions.
+
- `bibtex` suitable for files with BibTeX coded references.
- `cpp` suitable for source code in the C and C++ languages.
@@ -824,6 +827,8 @@
- `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/Documentation/gitcredentials.txt b/Documentation/gitcredentials.txt
index 1814d2d..758bf39 100644
--- a/Documentation/gitcredentials.txt
+++ b/Documentation/gitcredentials.txt
@@ -3,7 +3,7 @@
NAME
----
-gitcredentials - providing usernames and passwords to Git
+gitcredentials - Providing usernames and passwords to Git
SYNOPSIS
--------
@@ -216,20 +216,26 @@
----------------------------------------------------
# run "git credential-foo"
-foo
+[credential]
+ helper = foo
# same as above, but pass an argument to the helper
-foo --bar=baz
+[credential]
+ helper = "foo --bar=baz"
# the arguments are parsed by the shell, so use shell
# quoting if necessary
-foo --bar="whitespace arg"
+[credential]
+ helper = "foo --bar='whitespace arg'"
# you can also use an absolute path, which will not use the git wrapper
-/path/to/my/helper --with-arguments
+[credential]
+ helper = "/path/to/my/helper --with-arguments"
# or you can specify your own shell snippet
-!f() { echo "password=`cat $HOME/.secret`"; }; f
+[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.
@@ -262,16 +268,26 @@
stdout in the same format (see linkgit:git-credential[1] for common
attributes). A helper is free to produce a subset, or even no values at
all if it has nothing useful to provide. Any provided attributes will
-overwrite those already known about by Git. If a helper outputs a
-`quit` attribute with a value of `true` or `1`, no further helpers will
-be consulted, nor will the user be prompted (if no credential has been
-provided, the operation will then fail).
+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 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 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
diff --git a/Documentation/gitdiffcore.txt b/Documentation/gitdiffcore.txt
index c970d9f..1c72696 100644
--- a/Documentation/gitdiffcore.txt
+++ b/Documentation/gitdiffcore.txt
@@ -74,6 +74,7 @@
- diffcore-merge-broken
- diffcore-pickaxe
- diffcore-order
+- diffcore-rotate
These are applied in sequence. The set of filepairs 'git diff-{asterisk}'
commands find are used as the input to diffcore-break, and
@@ -168,6 +169,26 @@
number after the "-M" or "-C" option (e.g. "-M8" to tell it to use
8/10 = 80%).
+Note that when rename detection is on but both copy and break
+detection are off, rename detection adds a preliminary step that first
+checks if files are moved across directories while keeping their
+filename the same. If there is a file added to a directory whose
+contents is sufficiently similar to a file with the same name that got
+deleted from a different directory, it will mark them as renames and
+exclude them from the later quadratic step (the one that pairwise
+compares all unmatched files to find the "best" matches, determined by
+the highest content similarity). So, for example, if a deleted
+docs/ext.txt and an added docs/config/ext.txt are similar enough, they
+will be marked as a rename and prevent an added docs/ext.md that may
+be even more similar to the deleted docs/ext.txt from being considered
+as the rename destination in the later step. For this reason, the
+preliminary "match same filename" step uses a bit higher threshold to
+mark a file pair as a rename and stop considering other candidates for
+better matches. At most, one comparison is done per file in this
+preliminary pass; so if there are several remaining ext.txt files
+throughout the directory hierarchy after exact rename detection, this
+preliminary step will be skipped for those files.
+
Note. When the "-C" option is used with `--find-copies-harder`
option, 'git diff-{asterisk}' commands feed unmodified filepairs to
diffcore mechanism as well as modified ones. This lets the copy
@@ -276,6 +297,26 @@
t
------------------------------------------------
+diffcore-rotate: For Changing At Which Path Output Starts
+---------------------------------------------------------
+
+This transformation takes one pathname, and rotates the set of
+filepairs so that the filepair for the given pathname comes first,
+optionally discarding the paths that come before it. This is used
+to implement the `--skip-to` and the `--rotate-to` options. It is
+an error when the specified pathname is not in the set of filepairs,
+but it is not useful to error out when used with "git log" family of
+commands, because it is unreasonable to expect that a given path
+would be modified by each and every commit shown by the "git log"
+command. For this reason, when used with "git log", the filepair
+that sorts the same as, or the first one that sorts after, the given
+pathname is where the output starts.
+
+Use of this transformation combined with diffcore-order will produce
+unexpected results, as the input to this transformation is likely
+not sorted when diffcore-order is in effect.
+
+
SEE ALSO
--------
linkgit:git-diff[1],
diff --git a/Documentation/giteveryday.txt b/Documentation/giteveryday.txt
index 1bd919f..faba2ef 100644
--- a/Documentation/giteveryday.txt
+++ b/Documentation/giteveryday.txt
@@ -278,13 +278,13 @@
$ 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 @@
<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 @@
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/Documentation/gitfaq.txt b/Documentation/gitfaq.txt
new file mode 100644
index 0000000..afdaeab
--- /dev/null
+++ b/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/Documentation/githooks.txt b/Documentation/githooks.txt
index 3dccab5..1f3b57d 100644
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -164,7 +164,7 @@
file.
The default 'commit-msg' hook, when enabled, detects duplicate
-"Signed-off-by" lines, and aborts the commit if one is found.
+`Signed-off-by` trailers, and aborts the commit if one is found.
post-commit
~~~~~~~~~~~
@@ -193,7 +193,9 @@
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
@@ -333,6 +335,68 @@
`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
~~~~~~~~~~~~
@@ -404,6 +468,35 @@
`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
~~~~~~~~~~~~~~~~
@@ -522,12 +615,61 @@
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 suppressed 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 occurred 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/Documentation/gitk.txt b/Documentation/gitk.txt
index c653ebb..d50e9ed 100644
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@@ -98,25 +98,7 @@
(See "History simplification" in linkgit:git-log[1] for a more
detailed explanation.)
--L<start>,<end>:<file>::
--L:<funcname>:<file>::
-
- Trace the evolution of the line range given by "<start>,<end>"
- (or the function name regex <funcname>) within the <file>. You may
- not give any pathspec limiters. This is currently limited to
- a walk starting from a single revision, i.e., you may only
- give zero or one positive revision arguments, and
- <start> and <end> (or <funcname>) must exist in the starting revision.
- You can specify this option more than once. Implies `--patch`.
- Patch output can be suppressed using `--no-patch`, but other diff formats
- (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`,
- `--name-only`, `--name-status`, `--check`) are not currently implemented.
-+
-*Note:* gitk (unlike linkgit:git-log[1]) currently only understands
-this option if you specify it "glued together" with its argument. Do
-*not* put a space after `-L`.
-+
-include::line-range-format.txt[]
+include::line-range-options.txt[]
<revision range>::
diff --git a/Documentation/gitmailmap.txt b/Documentation/gitmailmap.txt
new file mode 100644
index 0000000..3fb39f8
--- /dev/null
+++ b/Documentation/gitmailmap.txt
@@ -0,0 +1,123 @@
+gitmailmap(5)
+=============
+
+NAME
+----
+gitmailmap - Map author/committer names and/or E-Mail addresses
+
+SYNOPSIS
+--------
+$GIT_WORK_TREE/.mailmap
+
+
+DESCRIPTION
+-----------
+
+If the file `.mailmap` exists at the toplevel of the repository, or at
+the location pointed to by the `mailmap.file` or `mailmap.blob`
+configuration options (see linkgit:git-config[1]), it
+is used to map author and committer names and email addresses to
+canonical real names and email addresses.
+
+
+SYNTAX
+------
+
+The '#' character begins a comment to the end of line, blank lines
+are ignored.
+
+In the simple form, each line in the file consists of the canonical
+real name of an author, whitespace, and an email address used in the
+commit (enclosed by '<' and '>') to map to the name. For example:
+--
+ Proper Name <commit@email.xx>
+--
+
+The more complex forms are:
+--
+ <proper@email.xx> <commit@email.xx>
+--
+which allows mailmap to replace only the email part of a commit, and:
+--
+ Proper Name <proper@email.xx> <commit@email.xx>
+--
+which allows mailmap to replace both the name and the email of a
+commit matching the specified commit email address, and:
+--
+ Proper Name <proper@email.xx> Commit Name <commit@email.xx>
+--
+which allows mailmap to replace both the name and the email of a
+commit matching both the specified commit name and email address.
+
+Both E-Mails and names are matched case-insensitively. For example
+this would also match the 'Commit Name <commit@email.xx>' above:
+--
+ Proper Name <proper@email.xx> CoMmIt NaMe <CoMmIt@EmAiL.xX>
+--
+
+EXAMPLES
+--------
+
+Your history contains commits by two authors, Jane
+and Joe, whose names appear in the repository under several forms:
+
+------------
+Joe Developer <joe@example.com>
+Joe R. Developer <joe@example.com>
+Jane Doe <jane@example.com>
+Jane Doe <jane@laptop.(none)>
+Jane D. <jane@desktop.(none)>
+------------
+
+Now suppose that Joe wants his middle name initial used, and Jane
+prefers her family name fully spelled out. A `.mailmap` file to
+correct the names would look like:
+
+------------
+Joe R. Developer <joe@example.com>
+Jane Doe <jane@example.com>
+Jane Doe <jane@desktop.(none)>
+------------
+
+Note that there's no need to map the name for '<jane@laptop.(none)>' to
+only correct the names. However, leaving the obviously broken
+'<jane@laptop.(none)>' and '<jane@desktop.(none)>' E-Mails as-is is
+usually not what you want. A `.mailmap` file which also corrects those
+is:
+
+------------
+Joe R. Developer <joe@example.com>
+Jane Doe <jane@example.com> <jane@laptop.(none)>
+Jane Doe <jane@example.com> <jane@desktop.(none)>
+------------
+
+Finally, let's say that Joe and Jane shared an E-Mail address, but not
+a name, e.g. by having these two commits in the history generated by a
+bug reporting system. I.e. names appearing in history as:
+
+------------
+Joe <bugs@example.com>
+Jane <bugs@example.com>
+------------
+
+A full `.mailmap` file which also handles those cases (an addition of
+two lines to the above example) would be:
+
+------------
+Joe R. Developer <joe@example.com>
+Jane Doe <jane@example.com> <jane@laptop.(none)>
+Jane Doe <jane@example.com> <jane@desktop.(none)>
+Joe R. Developer <joe@example.com> Joe <bugs@example.com>
+Jane Doe <jane@example.com> Jane <bugs@example.com>
+------------
+
+
+
+SEE ALSO
+--------
+linkgit:git-check-mailmap[1]
+
+
+GIT
+---
+Part of the linkgit:git[1] suite
diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt
index 67275fd..8e333dd 100644
--- a/Documentation/gitmodules.txt
+++ b/Documentation/gitmodules.txt
@@ -7,7 +7,7 @@
SYNOPSIS
--------
-$GIT_WORK_DIR/.gitmodules
+$GIT_WORK_TREE/.gitmodules
DESCRIPTION
@@ -27,19 +27,19 @@
Defines the path, relative to the top-level directory of the Git
working tree, where the submodule is expected to be checked out.
The path name must not end with a `/`. All submodule paths must
- be unique within the .gitmodules file.
+ be unique within the `.gitmodules` file.
submodule.<name>.url::
Defines a URL from which the submodule repository can be cloned.
This may be either an absolute URL ready to be passed to
- linkgit:git-clone[1] or (if it begins with ./ or ../) a location
+ linkgit:git-clone[1] or (if it begins with `./` or `../`) a location
relative to the superproject's origin repository.
In addition, there are a number of optional keys:
submodule.<name>.update::
Defines the default update procedure for the named submodule,
- i.e. how the submodule is updated by "git submodule update"
+ i.e. how the submodule is updated by the `git submodule update`
command in the superproject. This is only used by `git
submodule init` to initialize the configuration variable of
the same name. Allowed values here are 'checkout', 'rebase',
@@ -49,22 +49,22 @@
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.
submodule.<name>.fetchRecurseSubmodules::
This option can be used to control recursive fetching of this
- submodule. If this option is also present in the submodules entry in
- .git/config of the superproject, the setting there will override the
- one found in .gitmodules.
+ submodule. If this option is also present in the submodule's entry in
+ `.git/config` 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
- "--[no-]recurse-submodules" option to "git fetch" and "git pull".
+ `--[no-]recurse-submodules` option to `git fetch` and `git pull`.
submodule.<name>.ignore::
- Defines under what circumstances "git status" and the diff family show
+ Defines under what circumstances `git status` and the diff family show
a submodule as modified. The following values are supported:
+
--
@@ -73,7 +73,7 @@
been staged).
dirty;; All changes to the submodule's work tree will be ignored, only
- committed differences between the HEAD of the submodule and its
+ committed differences between the `HEAD` of the submodule and its
recorded state in the superproject are taken into account.
untracked;; Only untracked files in submodules will be ignored.
@@ -84,12 +84,12 @@
differences, and modifications to tracked and untracked files are
shown. This is the default option.
-If this option is also present in the submodules entry in .git/config
+If this option is also present in the submodule's entry in `.git/config`
of the superproject, the setting there will override the one found in
-.gitmodules.
+`.gitmodules`.
Both settings can be overridden on the command line by using the
-"--ignore-submodules" option. The 'git submodule' commands are not
+`--ignore-submodules` option. The `git submodule` commands are not
affected by this setting.
--
@@ -102,7 +102,7 @@
EXAMPLES
--------
-Consider the following .gitmodules file:
+Consider the following `.gitmodules` file:
----
[submodule "libfoo"]
diff --git a/Documentation/gitremote-helpers.txt b/Documentation/gitremote-helpers.txt
index f48a031..6f1e269 100644
--- a/Documentation/gitremote-helpers.txt
+++ b/Documentation/gitremote-helpers.txt
@@ -238,6 +238,9 @@
`--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 @@
'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.
@@ -405,7 +410,9 @@
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.
+
@@ -430,6 +437,18 @@
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
-------
@@ -514,6 +533,14 @@
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/Documentation/gitsubmodules.txt b/Documentation/gitsubmodules.txt
index c476f89..891c8da 100644
--- a/Documentation/gitsubmodules.txt
+++ b/Documentation/gitsubmodules.txt
@@ -225,10 +225,10 @@
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 @@
# 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 @@
----------------------
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/Documentation/gitworkflows.txt b/Documentation/gitworkflows.txt
index abc0dc6..47cf97f 100644
--- a/Documentation/gitworkflows.txt
+++ b/Documentation/gitworkflows.txt
@@ -85,15 +85,15 @@
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 @@
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 @@
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 @@
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/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index 090c888..67c7a50 100644
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -18,7 +18,7 @@
Untyped <<def_object,object>>, e.g. the contents of a file.
[[def_branch]]branch::
- A "branch" is an active line of development. The most recent
+ A "branch" is a line of development. The most recent
<<def_commit,commit>> on a branch is referred to as the tip of
that branch. The tip of the branch is referenced by a branch
<<def_head,head>>, which moves forward as additional development
diff --git a/Documentation/howto/maintain-git.txt b/Documentation/howto/maintain-git.txt
index ca43787..a67130d 100644
--- a/Documentation/howto/maintain-git.txt
+++ b/Documentation/howto/maintain-git.txt
@@ -66,7 +66,7 @@
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 @@
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 @@
- 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 @@
- 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
- then replace some parts with the new patch, and reapplying:
+ to prepare the new round on a detached HEAD, and then
- $ git checkout ai/topic
- $ git reset --hard ai/topic~$n
- $ git am -sc3 -s 000*.txt
+ $ git range-diff @{-1}...
+ $ git diff @{-1}
- The full test suite is always run for 'maint' and 'master'
- after patch application; for topic branches the tests are run
- as time permits.
+ to double check what changed since the last round, and finally
+
+ $ 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.
+
- Merge maint to master as needed:
@@ -211,12 +229,12 @@
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 @@
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 @@
$ 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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/Documentation/howto/rebase-from-internal-branch.txt b/Documentation/howto/rebase-from-internal-branch.txt
index 02cb5f7..f2e10a7 100644
--- a/Documentation/howto/rebase-from-internal-branch.txt
+++ b/Documentation/howto/rebase-from-internal-branch.txt
@@ -4,7 +4,7 @@
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 @@
> 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 @@
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 @@
After the commit, the ancestry graph would look like this:
- *"pu" head
+ *"seen" head
master^ --> #1 --> #2 --> #3
\
\---> master
@@ -58,31 +58,31 @@
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 @@
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/Documentation/howto/revert-branch-rebase.txt b/Documentation/howto/revert-branch-rebase.txt
index 149508e..a3e5595 100644
--- a/Documentation/howto/revert-branch-rebase.txt
+++ b/Documentation/howto/revert-branch-rebase.txt
@@ -15,7 +15,7 @@
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 @@
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.
------------------------------------------------
-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 @@
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 @@
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/Documentation/howto/update-hook-example.txt b/Documentation/howto/update-hook-example.txt
index 89821ec..151ee84 100644
--- a/Documentation/howto/update-hook-example.txt
+++ b/Documentation/howto/update-hook-example.txt
@@ -179,7 +179,7 @@
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 @@
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/Documentation/i18n.txt b/Documentation/i18n.txt
index 7e36e5b..6c6baee 100644
--- a/Documentation/i18n.txt
+++ b/Documentation/i18n.txt
@@ -38,7 +38,7 @@
a warning if the commit log message given to it does not look
like a valid UTF-8 string, unless you explicitly say your
project uses a legacy encoding. The way to say this is to
- have i18n.commitencoding in `.git/config` file, like this:
+ have `i18n.commitEncoding` in `.git/config` file, like this:
+
------------
[i18n]
diff --git a/Documentation/line-range-format.txt b/Documentation/line-range-format.txt
index 829676f..9b51e9f 100644
--- a/Documentation/line-range-format.txt
+++ b/Documentation/line-range-format.txt
@@ -1,30 +1,32 @@
-<start> and <end> can take one of these forms:
+'<start>' and '<end>' can take one of these forms:
- number
+
-If <start> or <end> is a number, it specifies an
+If '<start>' or '<end>' is a number, it specifies an
absolute line number (lines count from 1).
+
-- /regex/
+- `/regex/`
+
This form will use the first line matching the given
-POSIX regex. If <start> is a regex, it will search from the end of
+POSIX regex. If '<start>' is a regex, it will search from the end of
the previous `-L` range, if any, otherwise from the start of file.
-If <start> is ``^/regex/'', it will search from the start of file.
-If <end> is a regex, it will search
-starting at the line given by <start>.
+If '<start>' is `^/regex/`, it will search from the start of file.
+If '<end>' is a regex, it will search
+starting at the line given by '<start>'.
+
- +offset or -offset
+
-This is only valid for <end> and will specify a number
-of lines before or after the line given by <start>.
+This is only valid for '<end>' and will specify a number
+of lines before or after the line given by '<start>'.
+
-If ``:<funcname>'' is given in place of <start> and <end>, it is a
+If `:<funcname>` is given in place of '<start>' and '<end>', it is a
regular expression that denotes the range from the first funcname line
-that matches <funcname>, up to the next funcname line. ``:<funcname>''
+that matches '<funcname>', up to the next funcname line. `:<funcname>`
searches from the end of the previous `-L` range, if any, otherwise
-from the start of file. ``^:<funcname>'' searches from the start of
-file.
+from the start of file. `^:<funcname>` searches from the start of
+file. The function names are determined in the same way as `git diff`
+works out patch hunk headers (see 'Defining a custom hunk-header'
+in linkgit:gitattributes[5]).
diff --git a/Documentation/line-range-options.txt b/Documentation/line-range-options.txt
new file mode 100644
index 0000000..8e295a6
--- /dev/null
+++ b/Documentation/line-range-options.txt
@@ -0,0 +1,15 @@
+-L<start>,<end>:<file>::
+-L:<funcname>:<file>::
+
+ Trace the evolution of the line range given by '<start>,<end>',
+ or by the function name regex '<funcname>', within the '<file>'. You may
+ not give any pathspec limiters. This is currently limited to
+ a walk starting from a single revision, i.e., you may only
+ give zero or one positive revision arguments, and
+ '<start>' and '<end>' (or '<funcname>') must exist in the starting revision.
+ You can specify this option more than once. Implies `--patch`.
+ Patch output can be suppressed using `--no-patch`, but other diff formats
+ (namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`,
+ `--name-only`, `--name-status`, `--check`) are not currently implemented.
++
+include::line-range-format.txt[]
diff --git a/Documentation/mailmap.txt b/Documentation/mailmap.txt
deleted file mode 100644
index 4a8c276..0000000
--- a/Documentation/mailmap.txt
+++ /dev/null
@@ -1,75 +0,0 @@
-If the file `.mailmap` exists at the toplevel of the repository, or at
-the location pointed to by the mailmap.file or mailmap.blob
-configuration options, it
-is used to map author and committer names and email addresses to
-canonical real names and email addresses.
-
-In the simple form, each line in the file consists of the canonical
-real name of an author, whitespace, and an email address used in the
-commit (enclosed by '<' and '>') to map to the name. For example:
---
- Proper Name <commit@email.xx>
---
-
-The more complex forms are:
---
- <proper@email.xx> <commit@email.xx>
---
-which allows mailmap to replace only the email part of a commit, and:
---
- Proper Name <proper@email.xx> <commit@email.xx>
---
-which allows mailmap to replace both the name and the email of a
-commit matching the specified commit email address, and:
---
- Proper Name <proper@email.xx> Commit Name <commit@email.xx>
---
-which allows mailmap to replace both the name and the email of a
-commit matching both the specified commit name and email address.
-
-Example 1: Your history contains commits by two authors, Jane
-and Joe, whose names appear in the repository under several forms:
-
-------------
-Joe Developer <joe@example.com>
-Joe R. Developer <joe@example.com>
-Jane Doe <jane@example.com>
-Jane Doe <jane@laptop.(none)>
-Jane D. <jane@desktop.(none)>
-------------
-
-Now suppose that Joe wants his middle name initial used, and Jane
-prefers her family name fully spelled out. A proper `.mailmap` file
-would look like:
-
-------------
-Jane Doe <jane@desktop.(none)>
-Joe R. Developer <joe@example.com>
-------------
-
-Note how there is no need for an entry for `<jane@laptop.(none)>`, because the
-real name of that author is already correct.
-
-Example 2: Your repository contains commits from the following
-authors:
-
-------------
-nick1 <bugs@company.xx>
-nick2 <bugs@company.xx>
-nick2 <nick2@company.xx>
-santa <me@company.xx>
-claus <me@company.xx>
-CTO <cto@coompany.xx>
-------------
-
-Then you might want a `.mailmap` file that looks like:
-------------
-<cto@company.xx> <cto@coompany.xx>
-Some Dude <some@dude.xx> nick1 <bugs@company.xx>
-Other Author <other@author.xx> nick2 <bugs@company.xx>
-Other Author <other@author.xx> <nick2@company.xx>
-Santa Claus <santa.claus@northpole.xx> <me@company.xx>
-------------
-
-Use hash '#' for comments that are either on their own line, or after
-the email address.
diff --git a/Documentation/manpage-1.72.xsl b/Documentation/manpage-1.72.xsl
deleted file mode 100644
index b4d315c..0000000
--- a/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/Documentation/manpage-base.xsl b/Documentation/manpage-base.xsl
deleted file mode 100644
index a264fa6..0000000
--- a/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/Documentation/manpage-bold-literal.xsl b/Documentation/manpage-bold-literal.xsl
index 94d6c1b..e13db85 100644
--- a/Documentation/manpage-bold-literal.xsl
+++ b/Documentation/manpage-bold-literal.xsl
@@ -8,11 +8,9 @@
this makes literal text easier to distinguish in manpages
viewed on a tty -->
<xsl:template match="literal|d:literal">
- <xsl:value-of select="$git.docbook.backslash"/>
- <xsl:text>fB</xsl:text>
+ <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/Documentation/manpage-normal.xsl b/Documentation/manpage-normal.xsl
index a48f5b1..a9c7ec6 100644
--- a/Documentation/manpage-normal.xsl
+++ b/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/Documentation/manpage-suppress-sp.xsl b/Documentation/manpage-suppress-sp.xsl
deleted file mode 100644
index a63c763..0000000
--- a/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/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 40dc4f5..eb0aabd 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -61,9 +61,12 @@
-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::
@@ -74,16 +77,7 @@
With --no-log do not list one-line descriptions from the
actual commits being merged.
---signoff::
---no-signoff::
- Add Signed-off-by line by the committer at the end of the commit
- log message. The meaning of a signoff depends on the project,
- but it typically certifies that committer has
- the rights to submit this work under the same license and
- agrees to a Developer Certificate of Origin
- (see http://developercertificate.org/ for more information).
-+
-With --no-signoff do not add a Signed-off-by line.
+include::signoff-option.txt[]
--stat::
-n::
@@ -157,6 +151,14 @@
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/Documentation/object-format-disclaimer.txt b/Documentation/object-format-disclaimer.txt
new file mode 100644
index 0000000..4cb106f
--- /dev/null
+++ b/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/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index a4b6f49..6b59e28 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -83,6 +83,12 @@
<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
@@ -190,8 +196,8 @@
'%ce':: committer email
'%cE':: committer email (respecting .mailmap, see
linkgit:git-shortlog[1] or linkgit:git-blame[1])
-'%cl':: author email local-part (the part before the '@' sign)
-'%cL':: author local-part (see '%cl') respecting .mailmap, see
+'%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
@@ -246,7 +252,15 @@
interpreted by
linkgit:git-interpret-trailers[1]. The
`trailers` string may be followed by a colon
- and zero or more comma-separated options:
+ and zero or more comma-separated options.
+ If any option is provided multiple times the
+ last occurance wins.
++
+The boolean options accept an optional value `[=<BOOL>]`. The values
+`true`, `false`, `on`, `off` etc. are all accepted. See the "boolean"
+sub-section in "EXAMPLES" in linkgit:git-config[1]. If a boolean
+option is given with no value, it's enabled.
++
** 'key=<K>': only show trailers with specified key. Matching is done
case-insensitively and trailing colon is optional. If option is
given multiple times trailer lines matching any of the keys are
@@ -255,27 +269,25 @@
desired it can be disabled with `only=false`. E.g.,
`%(trailers:key=Reviewed-by)` shows trailer lines with key
`Reviewed-by`.
-** 'only[=val]': select whether non-trailer lines from the trailer
- block should be included. The `only` keyword may optionally be
- followed by an equal sign and one of `true`, `on`, `yes` to omit or
- `false`, `off`, `no` to show the non-trailer lines. If option is
- given without value it is enabled. If given multiple times the last
- value is used.
+** 'only[=<BOOL>]': select whether non-trailer lines from the trailer
+ block should be included.
** 'separator=<SEP>': specify a separator inserted between trailer
lines. When this option is not given each trailer line is
terminated with a line feed character. The string SEP may contain
the literal formatting codes described above. To use comma as
separator one must use `%x2C` as it would otherwise be parsed as
- next option. If separator option is given multiple times only the
- last one is used. E.g., `%(trailers:key=Ticket,separator=%x2C )`
+ next option. E.g., `%(trailers:key=Ticket,separator=%x2C )`
shows all trailer lines whose key is "Ticket" separated by a comma
and a space.
-** 'unfold[=val]': make it behave as if interpret-trailer's `--unfold`
- option was given. In same way as to for `only` it can be followed
- by an equal sign and explicit value. E.g.,
+** 'unfold[=<BOOL>]': make it behave as if interpret-trailer's `--unfold`
+ option was given. E.g.,
`%(trailers:only,unfold=true)` unfolds and shows all trailer lines.
-** 'valueonly[=val]': skip over the key part of the trailer line and only
- show the value part. Also this optionally allows explicit value.
+** 'keyonly[=<BOOL>]': only show the key part of the trailer.
+** 'valueonly[=<BOOL>]': only show the value part of the trailer.
+** 'key_value_separator=<SEP>': specify a separator inserted between
+ trailer lines. When this option is not given each trailer key-value
+ pair is separated by ": ". Otherwise it shares the same semantics
+ as 'separator=<SEP>' above.
NOTE: Some placeholders may depend on other options given to the
revision traversal engine. For example, the `%g*` reflog options will
diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt
index 7a6da6d..27ddaf8 100644
--- a/Documentation/pretty-options.txt
+++ b/Documentation/pretty-options.txt
@@ -16,17 +16,17 @@
--abbrev-commit::
Instead of showing the full 40-byte hexadecimal commit object
- name, show only a partial prefix. Non default number of
- digits can be specified with "--abbrev=<n>" (which also modifies
- diff output, if it is displayed).
+ name, show a prefix that names the object uniquely.
+ "--abbrev=<n>" (which also modifies diff output, if it is displayed)
+ option can be used to specify the minimum length of the prefix.
+
This should make "--pretty=oneline" a whole lot more readable for
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"
diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt
index 7d3a60f..95a7390 100644
--- a/Documentation/pull-fetch-param.txt
+++ b/Documentation/pull-fetch-param.txt
@@ -19,7 +19,8 @@
(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 @@
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/Documentation/ref-reachability-filters.txt b/Documentation/ref-reachability-filters.txt
new file mode 100644
index 0000000..9bae46d
--- /dev/null
+++ b/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/Documentation/rev-list-description.txt b/Documentation/rev-list-description.txt
new file mode 100644
index 0000000..a9efa7f
--- /dev/null
+++ b/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/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index bfd02ad..b1c8f86 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -128,8 +128,12 @@
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.
+ifdef::git-log[]
++
+This option also changes default diff format for merge commits
+to `first-parent`, see `--diff-merges=first-parent` for details.
+endif::git-log[]
--not::
Reverses the meaning of the '{caret}' prefix (or lack thereof)
@@ -207,7 +211,7 @@
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::
@@ -223,6 +227,15 @@
test the exit status to see if a range of objects is fully
connected (or not). It is faster than redirecting stdout
to `/dev/null` as the output does not have to be formatted.
+
+--disk-usage::
+ Suppress normal output; instead, print the sum of the bytes used
+ for on-disk storage by the selected commits or objects. This is
+ equivalent to piping the output into `git cat-file
+ --batch-check='%(objectsize:disk)'`, except that it runs much
+ faster (especially with `--use-bitmap-index`). See the `CAVEATS`
+ section in linkgit:git-cat-file[1] for the limitations of what
+ "on-disk storage" means.
endif::git-rev-list[]
--cherry-mark::
@@ -342,6 +355,12 @@
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.
@@ -534,7 +553,7 @@
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
@@ -573,6 +592,135 @@
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
@@ -608,7 +756,7 @@
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
@@ -982,48 +1130,3 @@
by a tab.
endif::git-rev-list[]
endif::git-shortlog[]
-
-ifndef::git-shortlog[]
-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/Documentation/revisions.txt b/Documentation/revisions.txt
index 97f995e..d9169c0 100644
--- a/Documentation/revisions.txt
+++ b/Documentation/revisions.txt
@@ -233,7 +233,7 @@
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 @@
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/Documentation/signoff-option.txt b/Documentation/signoff-option.txt
new file mode 100644
index 0000000..12aa233
--- /dev/null
+++ b/Documentation/signoff-option.txt
@@ -0,0 +1,18 @@
+ifdef::git-commit[]
+-s::
+endif::git-commit[]
+--signoff::
+--no-signoff::
+ Add a `Signed-off-by` trailer by the committer at the end of the commit
+ log message. The meaning of a signoff depends on the project
+ to which you're committing. For example, it may certify that
+ the committer has the rights to submit the work under the
+ project's license or agrees to some contributor representation,
+ such as a Developer Certificate of Origin.
+ (See http://developercertificate.org for the one used by the
+ Linux kernel and Git projects.) Consult the documentation or
+ leadership of the project to which you're contributing to
+ understand how the signoffs are used in that project.
++
+The --no-signoff option can be used to countermand an earlier --signoff
+option on the command line.
diff --git a/Documentation/technical/api-parse-options.txt b/Documentation/technical/api-parse-options.txt
index 2e2e7c1..5a60bbf 100644
--- a/Documentation/technical/api-parse-options.txt
+++ b/Documentation/technical/api-parse-options.txt
@@ -232,9 +232,9 @@
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/Documentation/technical/api-trace2.txt b/Documentation/technical/api-trace2.txt
index 4f07cea..c65ffaf 100644
--- a/Documentation/technical/api-trace2.txt
+++ b/Documentation/technical/api-trace2.txt
@@ -466,7 +466,7 @@
`"error"`::
This event is emitted when one of the `error()`, `die()`,
- or `usage()` functions are called.
+ `warning()`, or `usage()` functions are called.
+
------------
{
@@ -656,7 +656,8 @@
------------
`"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.
+
------------
{
diff --git a/Documentation/technical/bundle-format.txt b/Documentation/technical/bundle-format.txt
index 0e82815..bac558d 100644
--- a/Documentation/technical/bundle-format.txt
+++ b/Documentation/technical/bundle-format.txt
@@ -7,6 +7,8 @@
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
@@ -18,9 +20,28 @@
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 three parts.
+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
@@ -46,3 +67,10 @@
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/Documentation/technical/chunk-format.txt b/Documentation/technical/chunk-format.txt
new file mode 100644
index 0000000..593614f
--- /dev/null
+++ b/Documentation/technical/chunk-format.txt
@@ -0,0 +1,116 @@
+Chunk-based file formats
+========================
+
+Some file formats in Git use a common concept of "chunks" to describe
+sections of the file. This allows structured access to a large file by
+scanning a small "table of contents" for the remaining data. This common
+format is used by the `commit-graph` and `multi-pack-index` files. See
+link:technical/pack-format.html[the `multi-pack-index` format] and
+link:technical/commit-graph-format.html[the `commit-graph` format] for
+how they use the chunks to describe structured data.
+
+A chunk-based file format begins with some header information custom to
+that format. That header should include enough information to identify
+the file type, format version, and number of chunks in the file. From this
+information, that file can determine the start of the chunk-based region.
+
+The chunk-based region starts with a table of contents describing where
+each chunk starts and ends. This consists of (C+1) rows of 12 bytes each,
+where C is the number of chunks. Consider the following table:
+
+ | Chunk ID (4 bytes) | Chunk Offset (8 bytes) |
+ |--------------------|------------------------|
+ | ID[0] | OFFSET[0] |
+ | ... | ... |
+ | ID[C] | OFFSET[C] |
+ | 0x0000 | OFFSET[C+1] |
+
+Each row consists of a 4-byte chunk identifier (ID) and an 8-byte offset.
+Each integer is stored in network-byte order.
+
+The chunk identifier `ID[i]` is a label for the data stored within this
+fill from `OFFSET[i]` (inclusive) to `OFFSET[i+1]` (exclusive). Thus, the
+size of the `i`th chunk is equal to the difference between `OFFSET[i+1]`
+and `OFFSET[i]`. This requires that the chunk data appears contiguously
+in the same order as the table of contents.
+
+The final entry in the table of contents must be four zero bytes. This
+confirms that the table of contents is ending and provides the offset for
+the end of the chunk-based data.
+
+Note: The chunk-based format expects that the file contains _at least_ a
+trailing hash after `OFFSET[C+1]`.
+
+Functions for working with chunk-based file formats are declared in
+`chunk-format.h`. Using these methods provide extra checks that assist
+developers when creating new file formats.
+
+Writing chunk-based file formats
+--------------------------------
+
+To write a chunk-based file format, create a `struct chunkfile` by
+calling `init_chunkfile()` and pass a `struct hashfile` pointer. The
+caller is responsible for opening the `hashfile` and writing header
+information so the file format is identifiable before the chunk-based
+format begins.
+
+Then, call `add_chunk()` for each chunk that is intended for write. This
+populates the `chunkfile` with information about the order and size of
+each chunk to write. Provide a `chunk_write_fn` function pointer to
+perform the write of the chunk data upon request.
+
+Call `write_chunkfile()` to write the table of contents to the `hashfile`
+followed by each of the chunks. This will verify that each chunk wrote
+the expected amount of data so the table of contents is correct.
+
+Finally, call `free_chunkfile()` to clear the `struct chunkfile` data. The
+caller is responsible for finalizing the `hashfile` by writing the trailing
+hash and closing the file.
+
+Reading chunk-based file formats
+--------------------------------
+
+To read a chunk-based file format, the file must be opened as a
+memory-mapped region. The chunk-format API expects that the entire file
+is mapped as a contiguous memory region.
+
+Initialize a `struct chunkfile` pointer with `init_chunkfile(NULL)`.
+
+After reading the header information from the beginning of the file,
+including the chunk count, call `read_table_of_contents()` to populate
+the `struct chunkfile` with the list of chunks, their offsets, and their
+sizes.
+
+Extract the data information for each chunk using `pair_chunk()` or
+`read_chunk()`:
+
+* `pair_chunk()` assigns a given pointer with the location inside the
+ memory-mapped file corresponding to that chunk's offset. If the chunk
+ does not exist, then the pointer is not modified.
+
+* `read_chunk()` takes a `chunk_read_fn` function pointer and calls it
+ with the appropriate initial pointer and size information. The function
+ is not called if the chunk does not exist. Use this method to read chunks
+ if you need to perform immediate parsing or if you need to execute logic
+ based on the size of the chunk.
+
+After calling these methods, call `free_chunkfile()` to clear the
+`struct chunkfile` data. This will not close the memory-mapped region.
+Callers are expected to own that data for the timeframe the pointers into
+the region are needed.
+
+Examples
+--------
+
+These file formats use the chunk-format API, and can be used as examples
+for future formats:
+
+* *commit-graph:* see `write_commit_graph_file()` and `parse_commit_graph()`
+ in `commit-graph.c` for how the chunk-format API is used to write and
+ parse the commit-graph file format documented in
+ link:technical/commit-graph-format.html[the commit-graph file format].
+
+* *multi-pack-index:* see `write_midx_internal()` and `load_multi_pack_index()`
+ in `midx.c` for how the chunk-format API is used to write and
+ parse the multi-pack-index file format documented in
+ link:technical/pack-format.html[the multi-pack-index file format].
diff --git a/Documentation/technical/commit-graph-format.txt b/Documentation/technical/commit-graph-format.txt
index a4f1744..87971c2 100644
--- a/Documentation/technical/commit-graph-format.txt
+++ b/Documentation/technical/commit-graph-format.txt
@@ -4,11 +4,7 @@
The Git commit graph stores a list of commit OIDs and some associated
metadata, including:
-- The generation number of the commit. Commits with no parents have
- generation number 1; commits with parents have generation number
- one more than the maximum generation number of its parents. We
- reserve zero as special, and can be used to mark a generation
- number invalid or as "not computed".
+- The generation number of the commit.
- The root tree OID.
@@ -17,6 +13,9 @@
- 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 +28,7 @@
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 +38,13 @@
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"
@@ -57,6 +61,9 @@
the length using the next chunk position if necessary.) Each chunk
ID appears at most once.
+ The CHUNK LOOKUP matches the table of contents from
+ link:technical/chunk-format.html[the chunk-based file format].
+
The remaining data in the body is described one chunk at a time, and
these chunks may be given in any order. Chunks are required unless
otherwise specified.
@@ -74,17 +81,37 @@
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.
- * The next 8 bytes store the generation number of the commit and
+ * The next 8 bytes store the topological level (generation number v1)
+ of the commit and
the commit time in seconds since EPOCH. The generation number
uses the higher 30 bits of the first 4 bytes, while the commit
time uses the 32 bits of the second 4 bytes, along with the lowest
2 bits of the lowest byte, storing the 33rd and 34th bit of the
commit time.
+ Generation Data (ID: {'G', 'D', 'A', 'T' }) (N * 4 bytes) [Optional]
+ * This list of 4-byte values store corrected commit date offsets for the
+ commits, arranged in the same order as commit data chunk.
+ * If the corrected commit date offset cannot be stored within 31 bits,
+ the value has its most-significant bit on and the other bits store
+ the position of corrected commit date into the Generation Data Overflow
+ chunk.
+ * Generation Data chunk is present only when commit-graph file is written
+ by compatible versions of Git and in case of split commit-graph chains,
+ the topmost layer also has Generation Data chunk.
+
+ Generation Data Overflow (ID: {'G', 'D', 'O', 'V' }) [Optional]
+ * This list of 8-byte values stores the corrected commit date offsets
+ for commits with corrected commit date offsets that cannot be
+ stored within 31 bits.
+ * Generation Data Overflow chunk is present only when Generation Data
+ chunk is present and atleast one corrected commit date offset cannot
+ be stored within 31 bits.
+
Extra Edge List (ID: {'E', 'D', 'G', 'E'}) [Optional]
This list of 4-byte values store the second through nth parents for
all octopus merges. The second parent value in the commit data stores
@@ -93,6 +120,33 @@
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/Documentation/technical/commit-graph.txt b/Documentation/technical/commit-graph.txt
index 808fa30..f05e7bd 100644
--- a/Documentation/technical/commit-graph.txt
+++ b/Documentation/technical/commit-graph.txt
@@ -38,14 +38,31 @@
Values 1-4 satisfy the requirements of parse_commit_gently().
-Define the "generation number" of a commit recursively as follows:
+There are two definitions of generation number:
+1. Corrected committer dates (generation number v2)
+2. Topological levels (generation nummber v1)
- * A commit with no parents (a root commit) has generation number one.
+Define "corrected committer date" of a commit recursively as follows:
- * A commit with at least one parent has generation number one more than
- the largest generation number among its parents.
+ * A commit with no parents (a root commit) has corrected committer date
+ equal to its committer date.
-Equivalently, the generation number of a commit A is one more than the
+ * A commit with at least one parent has corrected committer date equal to
+ the maximum of its commiter date and one more than the largest corrected
+ committer date among its parents.
+
+ * As a special case, a root commit with timestamp zero has corrected commit
+ date of 1, to be able to distinguish it from GENERATION_NUMBER_ZERO
+ (that is, an uncomputed corrected commit date).
+
+Define the "topological level" of a commit recursively as follows:
+
+ * A commit with no parents (a root commit) has topological level of one.
+
+ * A commit with at least one parent has topological level one more than
+ the largest topological level among its parents.
+
+Equivalently, the topological level of a commit A is one more than the
length of a longest path from A to a root commit. The recursive definition
is easier to use for computation and observing the following property:
@@ -60,6 +77,9 @@
generation numbers, then we always expand the boundary commit with highest
generation number and can easily detect the stopping condition.
+The property applies to both versions of generation number, that is both
+corrected committer dates and topological levels.
+
This property can be used to significantly reduce the time it takes to
walk commits and determine topological relationships. Without generation
numbers, the general heuristic is the following:
@@ -67,7 +87,9 @@
If A and B are commits with commit time X and Y, respectively, and
X < Y, then A _probably_ cannot reach B.
-This heuristic is currently used whenever the computation is allowed to
+In absence of corrected commit dates (for example, old versions of Git or
+mixed generation graph chains),
+this heuristic is currently used whenever the computation is allowed to
violate topological relationships due to clock skew (such as "git log"
with default order), but is not used when the topological order is
required (such as merge base calculations, "git log --graph").
@@ -77,7 +99,7 @@
generation number and walk until reaching commits with known generation
number.
-We use the macro GENERATION_NUMBER_INFINITY = 0xFFFFFFFF to mark commits not
+We use the macro GENERATION_NUMBER_INFINITY to mark commits not
in the commit-graph file. If a commit-graph file was written by a version
of Git that did not compute generation numbers, then those commits will
have generation number represented by the macro GENERATION_NUMBER_ZERO = 0.
@@ -93,12 +115,12 @@
walking a few extra commits, but the simplicity in dealing with commits
with generation number *_INFINITY or *_ZERO is valuable.
-We use the macro GENERATION_NUMBER_MAX = 0x3FFFFFFF to for commits whose
-generation numbers are computed to be at least this value. We limit at
-this value since it is the largest value that can be stored in the
-commit-graph file using the 30 bits available to generation numbers. This
-presents another case where a commit can have generation number equal to
-that of a parent.
+We use the macro GENERATION_NUMBER_V1_MAX = 0x3FFFFFFF for commits whose
+topological levels (generation number v1) are computed to be at least
+this value. We limit at this value since it is the largest value that
+can be stored in the commit-graph file using the 30 bits available
+to topological levels. This presents another case where a commit can
+have generation number equal to that of a parent.
Design Details
--------------
@@ -210,12 +232,12 @@
+---------------------+
| |
+-----------------------+ +---------------------+
- | graph-{hash2} |->| |
+ | graph-{hash2} |->| |
+-----------------------+ +---------------------+
| | |
+-----------------------+ +---------------------+
| | | |
- | graph-{hash1} |->| |
+ | graph-{hash1} |->| |
| | | |
+-----------------------+ +---------------------+
| tmp_graphXXX
@@ -223,7 +245,7 @@
| |
| |
| |
- | graph-{hash0} |
+ | graph-{hash0} |
| |
| |
| |
@@ -267,6 +289,35 @@
number of commits) could be extracted into config settings for full
flexibility.
+## Handling Mixed Generation Number Chains
+
+With the introduction of generation number v2 and generation data chunk, the
+following scenario is possible:
+
+1. "New" Git writes a commit-graph with the corrected commit dates.
+2. "Old" Git writes a split commit-graph on top without corrected commit dates.
+
+A naive approach of using the newest available generation number from
+each layer would lead to violated expectations: the lower layer would
+use corrected commit dates which are much larger than the topological
+levels of the higher layer. For this reason, Git inspects the topmost
+layer to see if the layer is missing corrected commit dates. In such a case
+Git only uses topological level for generation numbers.
+
+When writing a new layer in split commit-graph, we write corrected commit
+dates if the topmost layer has corrected commit dates written. This
+guarantees that if a layer has corrected commit dates, all lower layers
+must have corrected commit dates as well.
+
+When merging layers, we do not consider whether the merged layers had corrected
+commit dates. Instead, the new layer will have corrected commit dates if the
+layer below the new layer has corrected commit dates.
+
+While writing or merging layers, if the new layer is the only layer, it will
+have corrected commit dates when written by compatible versions of Git. Thus,
+rewriting split commit-graph as a single file (`--split=replace`) creates a
+single layer with corrected commit dates.
+
## Deleting graph-{hash} files
After a new tip file is written, some `graph-{hash}` files may no longer
diff --git a/Documentation/technical/directory-rename-detection.txt b/Documentation/technical/directory-rename-detection.txt
index 844629c..49b83ef 100644
--- a/Documentation/technical/directory-rename-detection.txt
+++ b/Documentation/technical/directory-rename-detection.txt
@@ -18,7 +18,8 @@
More interesting possibilities exist, though, such as:
* one side of history renames x -> z, and the other renames some file to
- x/e, causing the need for the merge to do a transitive rename.
+ x/e, causing the need for the merge to do a transitive rename so that
+ the rename ends up at z/e.
* one side of history renames x -> z, but also renames all files within x.
For example, x/a -> z/alpha, x/b -> z/bravo, etc.
@@ -35,7 +36,7 @@
directory itself contained inner directories that were renamed to yet
other locations).
- * combinations of the above; see t/t6043-merge-rename-directories.sh for
+ * combinations of the above; see t/t6423-merge-rename-directories.sh for
various interesting cases.
Limitations -- applicability of directory renames
@@ -62,19 +63,19 @@
Limitations -- detailed rules and testcases
-------------------------------------------
-t/t6043-merge-rename-directories.sh contains extensive tests and commentary
+t/t6423-merge-rename-directories.sh contains extensive tests and commentary
which generate and explore the rules listed above. It also lists a few
additional rules:
a) If renames split a directory into two or more others, the directory
with the most renames, "wins".
- b) Avoid directory-rename-detection for a path, if that path is the
- source of a rename on either side of a merge.
-
- c) Only apply implicit directory renames to directories if the other side
+ b) Only apply implicit directory renames to directories if the other side
of history is the one doing the renaming.
+ c) Do not perform directory rename detection for directories which had no
+ new paths added to them.
+
Limitations -- support in different commands
--------------------------------------------
diff --git a/Documentation/technical/hash-function-transition.txt b/Documentation/technical/hash-function-transition.txt
index 5b2db3b..7c1630b 100644
--- a/Documentation/technical/hash-function-transition.txt
+++ b/Documentation/technical/hash-function-transition.txt
@@ -33,16 +33,9 @@
Git v2.13.0 and later subsequently moved to a hardened SHA-1
implementation by default, which isn't vulnerable to the SHAttered
-attack.
+attack, but SHA-1 is still weak.
-Thus Git has in effect already migrated to a new hash that isn't SHA-1
-and doesn't share its vulnerabilities, its new hash function just
-happens to produce exactly the same output for all known inputs,
-except two PDFs published by the SHAttered researchers, and the new
-implementation (written by those researchers) claims to detect future
-cryptanalytic collision attacks.
-
-Regardless, it's considered prudent to move past any variant of SHA-1
+Thus it's considered prudent to move past any variant of SHA-1
to a new hash. There's no guarantee that future attacks on SHA-1 won't
be published in the future, and those attacks may not have viable
mitigations.
@@ -57,6 +50,38 @@
and safe error checking, but other hash functions are equally suitable
that are believed to be cryptographically secure.
+Choice of Hash
+--------------
+The hash to replace the hardened SHA-1 should be stronger than SHA-1
+was: we would like it to be trustworthy and useful in practice for at
+least 10 years.
+
+Some other relevant properties:
+
+1. A 256-bit hash (long enough to match common security practice; not
+ excessively long to hurt performance and disk usage).
+
+2. High quality implementations should be widely available (e.g., in
+ OpenSSL and Apple CommonCrypto).
+
+3. The hash function's properties should match Git's needs (e.g. Git
+ requires collision and 2nd preimage resistance and does not require
+ length extension resistance).
+
+4. As a tiebreaker, the hash should be fast to compute (fortunately
+ many contenders are faster than SHA-1).
+
+There were several contenders for a successor hash to SHA-1, including
+SHA-256, SHA-512/256, SHA-256x16, K12, and BLAKE2bp-256.
+
+In late 2018 the project picked SHA-256 as its successor hash.
+
+See 0ed8d8da374 (doc hash-function-transition: pick SHA-256 as
+NewHash, 2018-08-04) and numerous mailing list threads at the time,
+particularly the one starting at
+https://lore.kernel.org/git/20180609224913.GC38834@genre.crustytoothpaste.net/
+for more information.
+
Goals
-----
1. The transition to SHA-256 can be done one local repository at a time.
@@ -94,7 +119,7 @@
--------
We introduce a new repository format extension. Repositories with this
extension enabled use SHA-256 instead of SHA-1 to name their objects.
-This affects both object names and object content --- both the names
+This affects both object names and object content -- both the names
of objects and all references to other objects within an object are
switched to the new hash function.
@@ -107,7 +132,7 @@
interchangeably.
"git cat-file" and "git hash-object" gain options to display an object
-in its sha1 form and write an object given its sha1 form. This
+in its SHA-1 form and write an object given its SHA-1 form. This
requires all objects referenced by that object to be present in the
object database so that they can be named using the appropriate name
(using the bidirectional hash mapping).
@@ -115,7 +140,7 @@
Fetches from a SHA-1 based server convert the fetched objects into
SHA-256 form and record the mapping in the bidirectional mapping table
(see below for details). Pushes to a SHA-1 based server convert the
-objects being pushed into sha1 form so the server does not have to be
+objects being pushed into SHA-1 form so the server does not have to be
aware of the hash function the client is using.
Detailed Design
@@ -151,38 +176,38 @@
Object names
~~~~~~~~~~~~
-Objects can be named by their 40 hexadecimal digit sha1-name or 64
-hexadecimal digit sha256-name, plus names derived from those (see
+Objects can be named by their 40 hexadecimal digit SHA-1 name or 64
+hexadecimal digit SHA-256 name, plus names derived from those (see
gitrevisions(7)).
-The sha1-name of an object is the SHA-1 of the concatenation of its
-type, length, a nul byte, and the object's sha1-content. This is the
+The SHA-1 name of an object is the SHA-1 of the concatenation of its
+type, length, a nul byte, and the object's SHA-1 content. This is the
traditional <sha1> used in Git to name objects.
-The sha256-name of an object is the SHA-256 of the concatenation of its
-type, length, a nul byte, and the object's sha256-content.
+The SHA-256 name of an object is the SHA-256 of the concatenation of its
+type, length, a nul byte, and the object's SHA-256 content.
Object format
~~~~~~~~~~~~~
The content as a byte sequence of a tag, commit, or tree object named
-by sha1 and sha256 differ because an object named by sha256-name refers to
-other objects by their sha256-names and an object named by sha1-name
-refers to other objects by their sha1-names.
+by SHA-1 and SHA-256 differ because an object named by SHA-256 name refers to
+other objects by their SHA-256 names and an object named by SHA-1 name
+refers to other objects by their SHA-1 names.
-The sha256-content of an object is the same as its sha1-content, except
-that objects referenced by the object are named using their sha256-names
-instead of sha1-names. Because a blob object does not refer to any
-other object, its sha1-content and sha256-content are the same.
+The SHA-256 content of an object is the same as its SHA-1 content, except
+that objects referenced by the object are named using their SHA-256 names
+instead of SHA-1 names. Because a blob object does not refer to any
+other object, its SHA-1 content and SHA-256 content are the same.
-The format allows round-trip conversion between sha256-content and
-sha1-content.
+The format allows round-trip conversion between SHA-256 content and
+SHA-1 content.
Object storage
~~~~~~~~~~~~~~
Loose objects use zlib compression and packed objects use the packed
format described in Documentation/technical/pack-format.txt, just like
-today. The content that is compressed and stored uses sha256-content
-instead of sha1-content.
+today. The content that is compressed and stored uses SHA-256 content
+instead of SHA-1 content.
Pack index
~~~~~~~~~~
@@ -191,21 +216,21 @@
network byte order):
- A header appears at the beginning and consists of the following:
- - The 4-byte pack index signature: '\377t0c'
- - 4-byte version number: 3
- - 4-byte length of the header section, including the signature and
+ * The 4-byte pack index signature: '\377t0c'
+ * 4-byte version number: 3
+ * 4-byte length of the header section, including the signature and
version number
- - 4-byte number of objects contained in the pack
- - 4-byte number of object formats in this pack index: 2
- - For each object format:
- - 4-byte format identifier (e.g., 'sha1' for SHA-1)
- - 4-byte length in bytes of shortened object names. This is the
+ * 4-byte number of objects contained in the pack
+ * 4-byte number of object formats in this pack index: 2
+ * For each object format:
+ ** 4-byte format identifier (e.g., 'sha1' for SHA-1)
+ ** 4-byte length in bytes of shortened object names. This is the
shortest possible length needed to make names in the shortened
object name table unambiguous.
- - 4-byte integer, recording where tables relating to this format
+ ** 4-byte integer, recording where tables relating to this format
are stored in this index file, as an offset from the beginning.
- - 4-byte offset to the trailer from the beginning of this file.
- - Zero or more additional key/value pairs (4-byte key, 4-byte
+ * 4-byte offset to the trailer from the beginning of this file.
+ * Zero or more additional key/value pairs (4-byte key, 4-byte
value). Only one key is supported: 'PSRC'. See the "Loose objects
and unreachable objects" section for supported values and how this
is used. All other keys are reserved. Readers must ignore
@@ -213,37 +238,36 @@
- Zero or more NUL bytes. This can optionally be used to improve the
alignment of the full object name table below.
- Tables for the first object format:
- - A sorted table of shortened object names. These are prefixes of
+ * A sorted table of shortened object names. These are prefixes of
the names of all objects in this pack file, packed together
without offset values to reduce the cache footprint of the binary
search for a specific object name.
- - A table of full object names in pack order. This allows resolving
+ * A table of full object names in pack order. This allows resolving
a reference to "the nth object in the pack file" (from a
reachability bitmap or from the next table of another object
format) to its object name.
- - A table of 4-byte values mapping object name order to pack order.
+ * A table of 4-byte values mapping object name order to pack order.
For an object in the table of sorted shortened object names, the
value at the corresponding index in this table is the index in the
previous table for that same object.
-
This can be used to look up the object in reachability bitmaps or
to look up its name in another object format.
- - A table of 4-byte CRC32 values of the packed object data, in the
+ * A table of 4-byte CRC32 values of the packed object data, in the
order that the objects appear in the pack file. This is to allow
compressed data to be copied directly from pack to pack during
repacking without undetected data corruption.
- - A table of 4-byte offset values. For an object in the table of
+ * A table of 4-byte offset values. For an object in the table of
sorted shortened object names, the value at the corresponding
index in this table indicates where that object can be found in
the pack file. These are usually 31-bit pack file offsets, but
large offsets are encoded as an index into the next table with the
most significant bit set.
- - A table of 8-byte offset entries (empty for pack files less than
+ * A table of 8-byte offset entries (empty for pack files less than
2 GiB). Pack files are organized with heavily used objects toward
the front, so most object references should not need to refer to
this table.
@@ -252,10 +276,10 @@
up to and not including the table of CRC32 values.
- Zero or more NUL bytes.
- The trailer consists of the following:
- - A copy of the 20-byte SHA-256 checksum at the end of the
+ * A copy of the 20-byte SHA-256 checksum at the end of the
corresponding packfile.
- - 20-byte SHA-256 checksum of all of the above.
+ * 20-byte SHA-256 checksum of all of the above.
Loose object index
~~~~~~~~~~~~~~~~~~
@@ -288,18 +312,18 @@
Translation table
~~~~~~~~~~~~~~~~~
-The index files support a bidirectional mapping between sha1-names
-and sha256-names. The lookup proceeds similarly to ordinary object
-lookups. For example, to convert a sha1-name to a sha256-name:
+The index files support a bidirectional mapping between SHA-1 names
+and SHA-256 names. The lookup proceeds similarly to ordinary object
+lookups. For example, to convert a SHA-1 name to a SHA-256 name:
1. Look for the object in idx files. If a match is present in the
- idx's sorted list of truncated sha1-names, then:
- a. Read the corresponding entry in the sha1-name order to pack
+ idx's sorted list of truncated SHA-1 names, then:
+ a. Read the corresponding entry in the SHA-1 name order to pack
name order mapping.
- b. Read the corresponding entry in the full sha1-name table to
+ b. Read the corresponding entry in the full SHA-1 name table to
verify we found the right object. If it is, then
- c. Read the corresponding entry in the full sha256-name table.
- That is the object's sha256-name.
+ c. Read the corresponding entry in the full SHA-256 name table.
+ That is the object's SHA-256 name.
2. Check for a loose object. Read lines from loose-object-idx until
we find a match.
@@ -313,10 +337,10 @@
the new objects to the corresponding index, this mapping is possible
for all objects in the object store.
-Reading an object's sha1-content
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The sha1-content of an object can be read by converting all sha256-names
-its sha256-content references to sha1-names using the translation table.
+Reading an object's SHA-1 content
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The SHA-1 content of an object can be read by converting all SHA-256 names
+of its SHA-256 content references to SHA-1 names using the translation table.
Fetch
~~~~~
@@ -339,7 +363,7 @@
1. index-pack: inflate each object in the packfile and compute its
SHA-1. Objects can contain deltas in OBJ_REF_DELTA format against
objects the client has locally. These objects can be looked up
- using the translation table and their sha1-content read as
+ using the translation table and their SHA-1 content read as
described above to resolve the deltas.
2. topological sort: starting at the "want"s from the negotiation
phase, walk through objects in the pack and emit a list of them,
@@ -348,12 +372,12 @@
(This list only contains objects reachable from the "wants". If the
pack from the server contained additional extraneous objects, then
they will be discarded.)
-3. convert to sha256: open a new (sha256) packfile. Read the topologically
+3. convert to SHA-256: open a new SHA-256 packfile. Read the topologically
sorted list just generated. For each object, inflate its
- sha1-content, convert to sha256-content, and write it to the sha256
- pack. Record the new sha1<->sha256 mapping entry for use in the idx.
+ SHA-1 content, convert to SHA-256 content, and write it to the SHA-256
+ pack. Record the new SHA-1<-->SHA-256 mapping entry for use in the idx.
4. sort: reorder entries in the new pack to match the order of objects
- in the pack the server generated and include blobs. Write a sha256 idx
+ in the pack the server generated and include blobs. Write a SHA-256 idx
file
5. clean up: remove the SHA-1 based pack file, index, and
topologically sorted list obtained from the server in steps 1
@@ -378,19 +402,20 @@
Push
~~~~
Push is simpler than fetch because the objects referenced by the
-pushed objects are already in the translation table. The sha1-content
+pushed objects are already in the translation table. The SHA-1 content
of each object being pushed can be read as described in the "Reading
-an object's sha1-content" section to generate the pack written by git
+an object's SHA-1 content" section to generate the pack written by git
send-pack.
Signed Commits
~~~~~~~~~~~~~~
We add a new field "gpgsig-sha256" to the commit object format to allow
signing commits without relying on SHA-1. It is similar to the
-existing "gpgsig" field. Its signed payload is the sha256-content of the
+existing "gpgsig" field. Its signed payload is the SHA-256 content of the
commit object with any "gpgsig" and "gpgsig-sha256" fields removed.
This means commits can be signed
+
1. using SHA-1 only, as in existing signed commit objects
2. using both SHA-1 and SHA-256, by using both gpgsig-sha256 and gpgsig
fields.
@@ -404,10 +429,11 @@
~~~~~~~~~~~
We add a new field "gpgsig-sha256" to the tag object format to allow
signing tags without relying on SHA-1. Its signed payload is the
-sha256-content of the tag with its gpgsig-sha256 field and "-----BEGIN PGP
+SHA-256 content of the tag with its gpgsig-sha256 field and "-----BEGIN PGP
SIGNATURE-----" delimited in-body signature removed.
This means tags can be signed
+
1. using SHA-1 only, as in existing signed tag objects
2. using both SHA-1 and SHA-256, by using gpgsig-sha256 and an in-body
signature.
@@ -415,11 +441,11 @@
Mergetag embedding
~~~~~~~~~~~~~~~~~~
-The mergetag field in the sha1-content of a commit contains the
-sha1-content of a tag that was merged by that commit.
+The mergetag field in the SHA-1 content of a commit contains the
+SHA-1 content of a tag that was merged by that commit.
-The mergetag field in the sha256-content of the same commit contains the
-sha256-content of the same tag.
+The mergetag field in the SHA-256 content of the same commit contains the
+SHA-256 content of the same tag.
Submodules
~~~~~~~~~~
@@ -494,7 +520,7 @@
-------
Invalid objects
~~~~~~~~~~~~~~~
-The conversion from sha1-content to sha256-content retains any
+The conversion from SHA-1 content to SHA-256 content retains any
brokenness in the original object (e.g., tree entry modes encoded with
leading 0, tree objects whose paths are not sorted correctly, and
commit objects without an author or committer). This is a deliberate
@@ -513,15 +539,15 @@
Alternates
~~~~~~~~~~
-For the same reason, a sha256 repository cannot borrow objects from a
-sha1 repository using objects/info/alternates or
+For the same reason, a SHA-256 repository cannot borrow objects from a
+SHA-1 repository using objects/info/alternates or
$GIT_ALTERNATE_OBJECT_REPOSITORIES.
git notes
~~~~~~~~~
-The "git notes" tool annotates objects using their sha1-name as key.
+The "git notes" tool annotates objects using their SHA-1 name as key.
This design does not describe a way to migrate notes trees to use
-sha256-names. That migration is expected to happen separately (for
+SHA-256 names. That migration is expected to happen separately (for
example using a file at the root of the notes tree to describe which
hash it uses).
@@ -555,7 +581,7 @@
Git 2.12
-Does this mean Git v2.12.0 is the commit with sha1-name
+Does this mean Git v2.12.0 is the commit with SHA-1 name
e7e07d5a4fcc2a203d9873968ad3e6bd4d7419d7 or the commit with
new-40-digit-hash-name e7e07d5a4fcc2a203d9873968ad3e6bd4d7419d7?
@@ -598,44 +624,12 @@
particular revision specifier and for output, overriding the mode. For
example:
-git --output-format=sha1 log abac87a^{sha1}..f787cac^{sha256}
-
-Choice of Hash
---------------
-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
-published until 10 years later, in 2017.
-
-Git v2.13.0 and later subsequently moved to a hardened SHA-1
-implementation by default that mitigates the SHAttered attack, but
-SHA-1 is still believed to be weak.
-
-The hash to replace this hardened SHA-1 should be stronger than SHA-1
-was: we would like it to be trustworthy and useful in practice for at
-least 10 years.
-
-Some other relevant properties:
-
-1. A 256-bit hash (long enough to match common security practice; not
- excessively long to hurt performance and disk usage).
-
-2. High quality implementations should be widely available (e.g., in
- OpenSSL and Apple CommonCrypto).
-
-3. The hash function's properties should match Git's needs (e.g. Git
- requires collision and 2nd preimage resistance and does not require
- length extension resistance).
-
-4. As a tiebreaker, the hash should be fast to compute (fortunately
- many contenders are faster than SHA-1).
-
-We choose SHA-256.
+ git --output-format=sha1 log abac87a^{sha1}..f787cac^{sha256}
Transition plan
---------------
Some initial steps can be implemented independently of one another:
+
- adding a hash function API (vtable)
- teaching fsck to tolerate the gpgsig-sha256 field
- excluding gpgsig-* from the fields copied by "git commit --amend"
@@ -647,10 +641,9 @@
- introducing index v3
- adding support for the PSRC field and safer object pruning
-
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 +651,8 @@
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
@@ -669,10 +664,11 @@
"Object names on the command line" above)
The next step is supporting fetches and pushes to SHA-1 repositories:
+
- allow pushes to a repository using the compat format
- generate a topologically sorted list of the SHA-1 names of fetched
objects
-- convert the fetched packfile to sha256 format and generate an idx
+- convert the fetched packfile to SHA-256 format and generate an idx
file
- re-sort to match the order of objects in the fetched packfile
@@ -734,6 +730,7 @@
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.
+
* You cannot trust its history (needed for bisectability) in the
future without further work
* Maintenance burden as the number of supported hash functions grows
@@ -743,36 +740,38 @@
Signed objects with multiple hashes
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Instead of introducing the gpgsig-sha256 field in commit and tag objects
-for sha256-content based signatures, an earlier version of this design
-added "hash sha256 <sha256-name>" fields to strengthen the existing
-sha1-content based signatures.
+for SHA-256 content based signatures, an earlier version of this design
+added "hash sha256 <SHA-256 name>" fields to strengthen the existing
+SHA-1 content based signatures.
In other words, a single signature was used to attest to the object
content using both hash functions. This had some advantages:
+
* Using one signature instead of two speeds up the signing process.
* Having one signed payload with both hashes allows the signer to
- attest to the sha1-name and sha256-name referring to the same object.
+ attest to the SHA-1 name and SHA-256 name referring to the same object.
* All users consume the same signature. Broken signatures are likely
to be detected quickly using current versions of git.
However, it also came with disadvantages:
-* Verifying a signed object requires access to the sha1-names of all
+
+* Verifying a signed object requires access to the SHA-1 names of all
objects it references, even after the transition is complete and
translation table is no longer needed for anything else. To support
- this, the design added fields such as "hash sha1 tree <sha1-name>"
- and "hash sha1 parent <sha1-name>" to the sha256-content of a signed
+ this, the design added fields such as "hash sha1 tree <SHA-1 name>"
+ and "hash sha1 parent <SHA-1 name>" to the SHA-256 content of a signed
commit, complicating the conversion process.
-* Allowing signed objects without a sha1 (for after the transition is
+* Allowing signed objects without a SHA-1 (for after the transition is
complete) complicated the design further, requiring a "nohash sha1"
- field to suppress including "hash sha1" fields in the sha256-content
+ field to suppress including "hash sha1" fields in the SHA-256 content
and signed payload.
Lazily populated translation table
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Some of the work of building the translation table could be deferred to
push time, but that would significantly complicate and slow down pushes.
-Calculating the sha1-name at object creation time at the same time it is
-being streamed to disk and having its sha256-name calculated should be
+Calculating the SHA-1 name at object creation time at the same time it is
+being streamed to disk and having its SHA-256 name calculated should be
an acceptable cost.
Document History
@@ -782,18 +781,19 @@
bmwill@google.com, jonathantanmy@google.com, jrnieder@gmail.com,
sbeller@google.com
-Initial version sent to
-http://lore.kernel.org/git/20170304011251.GA26789@aiede.mtv.corp.google.com
+* Initial version sent to https://lore.kernel.org/git/20170304011251.GA26789@aiede.mtv.corp.google.com
2017-03-03 jrnieder@gmail.com
Incorporated suggestions from jonathantanmy and sbeller:
-* describe purpose of signed objects with each hash type
-* redefine signed object verification using object content under the
+
+* Describe purpose of signed objects with each hash type
+* Redefine signed object verification using object content under the
first hash function
2017-03-06 jrnieder@gmail.com
+
* Use SHA3-256 instead of SHA2 (thanks, Linus and brian m. carlson).[1][2]
-* Make sha3-based signatures a separate field, avoiding the need for
+* Make SHA3-based signatures a separate field, avoiding the need for
"hash" and "nohash" fields (thanks to peff[3]).
* Add a sorting phase to fetch (thanks to Junio for noticing the need
for this).
@@ -805,23 +805,26 @@
especially Junio).
2017-09-27 jrnieder@gmail.com, sbeller@google.com
-* use placeholder NewHash instead of SHA3-256
-* describe criteria for picking a hash function.
-* include a transition plan (thanks especially to Brandon Williams
+
+* Use placeholder NewHash instead of SHA3-256
+* Describe criteria for picking a hash function.
+* Include a transition plan (thanks especially to Brandon Williams
for fleshing these ideas out)
-* define the translation table (thanks, Shawn Pearce[5], Jonathan
+* Define the translation table (thanks, Shawn Pearce[5], Jonathan
Tan, and Masaya Suzuki)
-* avoid loose object overhead by packing more aggressively in
+* Avoid loose object overhead by packing more aggressively in
"git gc --auto"
Later history:
- See the history of this file in git.git for the history of subsequent
- edits. This document history is no longer being maintained as it
- would now be superfluous to the commit log
+* See the history of this file in git.git for the history of subsequent
+ edits. This document history is no longer being maintained as it
+ would now be superfluous to the commit log
-[1] http://lore.kernel.org/git/CA+55aFzJtejiCjV0e43+9oR3QuJK2PiFiLQemytoLpyJWe6P9w@mail.gmail.com/
-[2] http://lore.kernel.org/git/CA+55aFz+gkAsDZ24zmePQuEs1XPS9BP_s8O7Q4wQ7LV7X5-oDA@mail.gmail.com/
-[3] http://lore.kernel.org/git/20170306084353.nrns455dvkdsfgo5@sigill.intra.peff.net/
-[4] http://lore.kernel.org/git/20170304224936.rqqtkdvfjgyezsht@genre.crustytoothpaste.net
-[5] https://lore.kernel.org/git/CAJo=hJtoX9=AyLHHpUJS7fueV9ciZ_MNpnEPHUz8Whui6g9F0A@mail.gmail.com/
+References:
+
+ [1] https://lore.kernel.org/git/CA+55aFzJtejiCjV0e43+9oR3QuJK2PiFiLQemytoLpyJWe6P9w@mail.gmail.com/
+ [2] https://lore.kernel.org/git/CA+55aFz+gkAsDZ24zmePQuEs1XPS9BP_s8O7Q4wQ7LV7X5-oDA@mail.gmail.com/
+ [3] https://lore.kernel.org/git/20170306084353.nrns455dvkdsfgo5@sigill.intra.peff.net/
+ [4] https://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/Documentation/technical/http-protocol.txt b/Documentation/technical/http-protocol.txt
index 9c5b6f0..96d89ea 100644
--- a/Documentation/technical/http-protocol.txt
+++ b/Documentation/technical/http-protocol.txt
@@ -216,7 +216,7 @@
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 @@
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/Documentation/technical/index-format.txt b/Documentation/technical/index-format.txt
index faa25c5..d363a71 100644
--- a/Documentation/technical/index-format.txt
+++ b/Documentation/technical/index-format.txt
@@ -3,8 +3,11 @@
== 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
@@ -23,7 +26,7 @@
Extensions are identified by signature. Optional extensions can
be ignored if Git does not understand them.
- Git currently supports cached tree and resolve undo extensions.
+ Git currently supports cache tree and resolve undo extensions.
4-byte extension signature. If the first byte is 'A'..'Z' the
extension is optional and can be ignored.
@@ -32,8 +35,7 @@
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 @@
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)
@@ -134,14 +136,35 @@
== Extensions
-=== Cached tree
+=== Cache tree
- Cached tree extension contains pre-computed hashes for trees that can
- be derived from the index. It helps speed up tree object generation
- from index for a new commit.
+ Since the index does not record entries for directories, the cache
+ entries cannot describe tree objects that already exist in the object
+ database for regions of the index that are unchanged from an existing
+ commit. The cache tree extension stores a recursive tree structure that
+ describes the trees that already exist and completely match sections of
+ the cache entries. This speeds up tree object generation from the index
+ for a new commit by only computing the trees that are "new" to that
+ commit. It also assists when comparing the index to another tree, such
+ as `HEAD^{tree}`, since sections of the index can be skipped when a tree
+ comparison demonstrates equality.
- When a path is updated in index, the path must be invalidated and
- removed from tree cache.
+ The recursive tree structure uses nodes that store a number of cache
+ entries, a list of subnodes, and an object ID (OID). The OID references
+ the existing tree for that node, if it is known to exist. The subnodes
+ correspond to subdirectories that themselves have cache tree nodes. The
+ number of cache entries corresponds to the number of cache entries in
+ the index that describe paths within that tree's directory.
+
+ The extension tracks the full directory structure in the cache tree
+ extension, but this is generally smaller than the full cache entry list.
+
+ When a path is updated in index, Git invalidates all nodes of the
+ recursive cache tree corresponding to the parent directories of that
+ path. We store these tree nodes as being "invalid" by using "-1" as the
+ number of cache entries. Invalid nodes still store a span of index
+ entries, allowing Git to focus its efforts when reconstructing a full
+ cache tree.
The signature for this extension is { 'T', 'R', 'E', 'E' }.
@@ -160,8 +183,8 @@
- 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
@@ -172,7 +195,8 @@
first entry represents the root level of the repository, followed by the
first subtree--let's call this A--of the root level (with its name
relative to the root level), followed by the first subtree of A (with
- its name relative to A), ...
+ its name relative to A), and so on. The specified number of subtrees
+ indicates when the current level of the recursive stack is complete.
=== Resolve undo
@@ -198,7 +222,7 @@
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 +235,8 @@
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
@@ -249,14 +273,14 @@
- Stat data of $GIT_DIR/info/exclude. See "Index entry" section from
ctime field until "file size".
- - Stat data of core.excludesfile
+ - Stat data of core.excludesFile
- 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 +309,13 @@
- 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.
@@ -304,12 +328,18 @@
The extension starts with
- - 32-bit version number: the current supported version is 1.
+ - 32-bit version number: the current supported versions are 1 and 2.
- - 64-bit time: the extension data reflects all changes through the given
+ - (Version 1)
+ 64-bit time: the extension data reflects all changes through the given
time which is stored as the nanoseconds elapsed since midnight,
January 1, 1970.
+ - (Version 2)
+ A null terminated string: an opaque token defined by the file system
+ monitor application. The extension data reflects all changes relative
+ to that token.
+
- 32-bit bitmap size: the size of the CE_FSMONITOR_VALID bitmap.
- An ewah bitmap, the n-th bit indicates whether the n-th index entry
@@ -330,12 +360,12 @@
- 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
diff --git a/Documentation/technical/multi-pack-index.txt b/Documentation/technical/multi-pack-index.txt
index 4e76314..e8e377a 100644
--- a/Documentation/technical/multi-pack-index.txt
+++ b/Documentation/technical/multi-pack-index.txt
@@ -60,10 +60,6 @@
Future Work
-----------
-- Add a 'verify' subcommand to the 'git midx' builtin to verify the
- contents of the multi-pack-index file match the offsets listed in
- the corresponding pack-indexes.
-
- The multi-pack-index allows many packfiles, especially in a context
where repacking is expensive (such as a very large repo), or
unexpected maintenance time is unacceptable (such as a high-demand
diff --git a/Documentation/technical/pack-format.txt b/Documentation/technical/pack-format.txt
index d3a142c..1faa949 100644
--- a/Documentation/technical/pack-format.txt
+++ b/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 @@
(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 @@
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
@@ -49,6 +55,18 @@
Type 5 is reserved for future expansion. Type 0 is invalid.
+=== Size encoding
+
+This document uses the following "size encoding" of non-negative
+integers: From each byte, the seven least significant bits are
+used to form the resulting integer. As long as the most significant
+bit is 1, this process continues; the byte with MSB 0 provides the
+last seven bits. The seven-bit chunks are concatenated. Later
+values are more significant.
+
+This size encoding should not be confused with the "offset encoding",
+which is also used in this document.
+
=== Deltified representation
Conceptually there are only four object types: commit, tree, tag and
@@ -58,8 +76,8 @@
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.
@@ -67,7 +85,10 @@
so-called "thin pack"). When stored on disk however, the pack should
be self contained to avoid cyclic dependency.
-The delta data is a sequence of instructions to reconstruct an object
+The delta data starts with the size of the base object and the
+size of the object to be reconstructed. These sizes are
+encoded using the size encoding from above. The remainder of
+the delta data is a sequence of instructions to reconstruct the object
from the base object. If the base object is deltified, it must be
converted to canonical form first. Each instruction appends more and
more data to the target object until it's complete. There are two
@@ -143,14 +164,14 @@
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 +219,7 @@
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 +248,9 @@
- 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 +269,30 @@
- 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.
+
+== pack-*.rev files have the format:
+
+ - A 4-byte magic number '0x52494458' ('RIDX').
+
+ - A 4-byte version identifier (= 1).
+
+ - A 4-byte hash function identifier (= 1 for SHA-1, 2 for SHA-256).
+
+ - A table of index positions (one per packed object, num_objects in
+ total, each a 4-byte unsigned integer in network order), sorted by
+ their corresponding offsets in the packfile.
+
+ - A trailer, containing a:
+
+ checksum of the corresponding packfile, and
+
+ a checksum of all of the above.
+
+All 4-byte numbers are in network order.
== multi-pack-index (MIDX) files have the following format:
@@ -273,7 +314,12 @@
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"
@@ -290,6 +336,9 @@
(Chunks are provided in file-order, so you can infer the length
using the next chunk position if necessary.)
+ The CHUNK LOOKUP matches the table of contents from
+ link:technical/chunk-format.html[the chunk-based file format].
+
The remaining data in the body is described one chunk at a time, and
these chunks may be given in any order. Chunks are required unless
otherwise specified.
@@ -329,4 +378,4 @@
TRAILER:
- 20-byte SHA1-checksum of the above contents.
+ Index checksum of the above contents.
diff --git a/Documentation/technical/pack-protocol.txt b/Documentation/technical/pack-protocol.txt
index d5ce4ee..e13a2c0 100644
--- a/Documentation/technical/pack-protocol.txt
+++ b/Documentation/technical/pack-protocol.txt
@@ -96,7 +96,7 @@
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 @@
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 @@
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 @@
-------------
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
@@ -647,6 +647,41 @@
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
changed since the reference discovery phase was originally sent, meaning
someone pushed in the meantime. The reference being pushed could be a
diff --git a/Documentation/technical/packfile-uri.txt b/Documentation/technical/packfile-uri.txt
new file mode 100644
index 0000000..f7eabc6
--- /dev/null
+++ b/Documentation/technical/packfile-uri.txt
@@ -0,0 +1,81 @@
+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. As noted in "Future work" below, the
+server can evolve in the future to support excluding other objects (or other
+implementations of servers could be made that support excluding other objects)
+without needing a protocol change, so clients should not expect that packfiles
+downloaded in this way only contain 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/Documentation/technical/partial-clone.txt b/Documentation/technical/partial-clone.txt
index b9e17e7..0780d30 100644
--- a/Documentation/technical/partial-clone.txt
+++ b/Documentation/technical/partial-clone.txt
@@ -171,20 +171,13 @@
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.
diff --git a/Documentation/technical/protocol-capabilities.txt b/Documentation/technical/protocol-capabilities.txt
index 2b267c0..9dfade9 100644
--- a/Documentation/technical/protocol-capabilities.txt
+++ b/Documentation/technical/protocol-capabilities.txt
@@ -22,13 +22,13 @@
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
-may optionally be sent in both protocols.
+by both upload-pack and receive-pack protocols. The 'agent' and 'session-id'
+capabilities may optionally be sent in both protocols.
All other capabilities are only recognized by the upload-pack (fetch
from server) process.
@@ -176,6 +176,21 @@
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 @@
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 @@
----------------------
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>
-----------------
@@ -335,3 +365,16 @@
fetch-pack may send "filter" commands to request a partial clone
or partial fetch and request that the server omit various objects
from the packfile.
+
+session-id=<session id>
+-----------------------
+
+The server may advertise a session ID that can be used to identify this process
+across multiple requests. The client may advertise its own session ID back to
+the server as well.
+
+Session IDs should be unique to a given process. They must fit within a
+packet-line, and must not contain non-printable or whitespace characters. The
+current implementation uses trace2 session IDs (see
+link:api-trace2.html[api-trace2] for details), but this may change and users of
+the session ID should not rely on this fact.
diff --git a/Documentation/technical/protocol-v2.txt b/Documentation/technical/protocol-v2.txt
index 7e3766c..a7c806a 100644
--- a/Documentation/technical/protocol-v2.txt
+++ b/Documentation/technical/protocol-v2.txt
@@ -33,6 +33,8 @@
* '0000' Flush Packet (flush-pkt) - indicates the end of a message
* '0001' Delimiter Packet (delim-pkt) - separates sections of a message
+ * '0002' Response End Packet (response-end-pkt) - indicates the end of a
+ response for stateless connections
Initial Client Request
----------------------
@@ -190,11 +192,20 @@
When specified, only references having a prefix matching one of
the provided prefixes are displayed.
+If the 'unborn' feature is advertised the following argument can be
+included in the client's request.
+
+ unborn
+ The server will send information about HEAD even if it is a symref
+ pointing to an unborn branch in the form "unborn HEAD
+ symref-target:<target>".
+
The output of ls-refs is as follows:
output = *ref
flush-pkt
- ref = PKT-LINE(obj-id SP refname *(SP ref-attribute) LF)
+ obj-id-or-unborn = (obj-id | "unborn")
+ ref = PKT-LINE(obj-id-or-unborn SP refname *(SP ref-attribute) LF)
ref-attribute = (symref | peeled)
symref = "symref-target:" symref-target
peeled = "peeled:" obj-id
@@ -323,13 +334,26 @@
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 +371,17 @@
*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 +432,6 @@
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 +445,20 @@
* 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 +492,25 @@
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.
+
+session-id=<session id>
+~~~~~~~~~~~~~~~~~~~~~~~
+
+The server may advertise a session ID that can be used to identify this process
+across multiple requests. The client may advertise its own session ID back to
+the server as well.
+
+Session IDs should be unique to a given process. They must fit within a
+packet-line, and must not contain non-printable or whitespace characters. The
+current implementation uses trace2 session IDs (see
+link:api-trace2.html[api-trace2] for details), but this may change and users of
+the session ID should not rely on this fact.
diff --git a/Documentation/technical/reftable.txt b/Documentation/technical/reftable.txt
new file mode 100644
index 0000000..3ef169a
--- /dev/null
+++ b/Documentation/technical/reftable.txt
@@ -0,0 +1,1093 @@
+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 abbreviation 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.
+Their names should have a random element, such that each filename is globally
+unique; this helps avoid spurious failures on Windows, where open files cannot
+be removed or overwritten. It suggested to use
+`${min_update_index}-${max_update_index}-${random}.ref` as a naming convention.
+
+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-RANDOM1.log
+00000002-00000002-RANDOM2.ref
+00000003-00000003-RANDOM3.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}-${random}.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}-${random}.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.
+
+Windows
+^^^^^^^
+
+On windows, and other systems that do not allow deleting or renaming to open
+files, compaction may succeed, but other readers may prevent obsolete tables
+from being deleted.
+
+On these platforms, the following strategy can be followed: on closing a
+reftable stack, reload `tables.list`, and delete any tables no longer mentioned
+in `tables.list`.
+
+Irregular program exit may still leave about unused files. In this case, a
+cleanup operation can read `tables.list`, note its modification timestamp, and
+delete any unreferenced `*.ref` files that are older.
+
+
+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/Documentation/technical/shallow.txt b/Documentation/technical/shallow.txt
index 01dedfe..f3738ba 100644
--- a/Documentation/technical/shallow.txt
+++ b/Documentation/technical/shallow.txt
@@ -13,7 +13,7 @@
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/Documentation/user-manual.conf b/Documentation/user-manual.conf
index d87294d..0148f12 100644
--- a/Documentation/user-manual.conf
+++ b/Documentation/user-manual.conf
@@ -9,13 +9,3 @@
[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/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 8336529..fd480b8 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -347,7 +347,7 @@
origin/man
origin/master
origin/next
- origin/pu
+ origin/seen
origin/todo
------------------------------------------------
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index dafe6d0..8f6334d 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.26.2
+DEF_VER=v2.31.0
LF='
'
diff --git a/INSTALL b/INSTALL
index 22c364f..8474ad0 100644
--- a/INSTALL
+++ b/INSTALL
@@ -165,8 +165,7 @@
use English. Under autoconf the configure script will do this
automatically if it can't find libintl on the system.
- - Python version 2.4 or later (but not 3.x, which is not
- supported by Perforce) is needed to use the git-p4 interface
+ - Python version 2.7 or later is needed to use the git-p4 interface
to Perforce.
- Some platform specific issues are dealt with Makefile rules,
@@ -206,9 +205,7 @@
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/Makefile b/Makefile
index 9804a07..f3dc217 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,9 @@
# when attempting to read from an fopen'ed directory (or even to fopen
# it at all).
#
+# Define OPEN_RETURNS_EINTR if your open() system call may return EINTR
+# when a signal is received (as opposed to restarting).
+#
# Define NO_OPENSSL environment variable if you do not have OpenSSL.
#
# Define USE_LIBPCRE if you have and want to use libpcre. Various
@@ -29,18 +32,11 @@
# Perl-compatible regular expressions instead of standard or extended
# POSIX regular expressions.
#
-# USE_LIBPCRE is a synonym for USE_LIBPCRE2, define USE_LIBPCRE1
-# instead if you'd like to use the legacy version 1 of the PCRE
-# library. Support for version 1 will likely be removed in some future
-# release of Git, as upstream has all but abandoned it.
-#
-# When using USE_LIBPCRE1, define NO_LIBPCRE1_JIT if you want to
-# disable JIT even if supported by your library.
+# Only libpcre version 2 is supported. USE_LIBPCRE2 is a synonym for
+# USE_LIBPCRE, support for the old USE_LIBPCRE1 has been removed.
#
# Define LIBPCREDIR=/foo/bar if your PCRE header and library files are
-# in /foo/bar/include and /foo/bar/lib directories. Which version of
-# PCRE this points to determined by the USE_LIBPCRE1 and USE_LIBPCRE2
-# variables.
+# in /foo/bar/include and /foo/bar/lib directories.
#
# Define HAVE_ALLOCA_H if you have working alloca(3) defined in that header.
#
@@ -282,12 +278,6 @@
# 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.
@@ -309,7 +299,7 @@
# modules, instead of the fallbacks shipped with Git.
#
# Define PYTHON_PATH to the path of your Python binary (often /usr/bin/python
-# but /usr/bin/python2.7 on some platforms).
+# but /usr/bin/python2.7 or /usr/bin/python3 on some platforms).
#
# Define NO_PYTHON if you do not want Python scripts or libraries at all.
#
@@ -354,6 +344,9 @@
# 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.
#
@@ -405,9 +398,6 @@
# 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.
@@ -471,6 +461,12 @@
# 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
@@ -578,7 +574,6 @@
COMPAT_CFLAGS =
COMPAT_OBJS =
XDIFF_OBJS =
-VCSSVN_OBJS =
GENERATED_H =
EXTRA_CPPFLAGS =
FUZZ_OBJS =
@@ -609,16 +604,14 @@
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
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
@@ -681,22 +674,22 @@
# ... 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-crontab.o
TEST_BUILTINS_OBJS += test-ctype.o
TEST_BUILTINS_OBJS += test-date.o
TEST_BUILTINS_OBJS += test-delta.o
@@ -707,24 +700,28 @@
TEST_BUILTINS_OBJS += test-dump-split-index.o
TEST_BUILTINS_OBJS += test-dump-untracked-cache.o
TEST_BUILTINS_OBJS += test-example-decorate.o
+TEST_BUILTINS_OBJS += test-fast-rebase.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-pcre2-config.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
@@ -738,7 +735,6 @@
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
@@ -748,16 +744,14 @@
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))
@@ -771,6 +765,7 @@
BUILT_INS += git-format-patch$X
BUILT_INS += git-fsck-objects$X
BUILT_INS += git-init$X
+BUILT_INS += git-maintenance$X
BUILT_INS += git-merge-subtree$X
BUILT_INS += git-restore$X
BUILT_INS += git-show$X
@@ -779,19 +774,15 @@
BUILT_INS += git-switch$X
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)
-
# 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
@@ -813,9 +804,9 @@
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 $(patsubst ./%,%,$(shell git ls-files '*.h' ':!t/' ':!Documentation/' 2>/dev/null || \
$(FIND) . \
@@ -831,27 +822,28 @@
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
LIB_OBJS += cache-tree.o
LIB_OBJS += chdir-notify.o
LIB_OBJS += checkout.o
+LIB_OBJS += chunk-format.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
@@ -865,17 +857,19 @@
LIB_OBJS += date.o
LIB_OBJS += decorate.o
LIB_OBJS += delta-islands.o
+LIB_OBJS += diff-delta.o
+LIB_OBJS += diff-merges.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 += diffcore-rotate.o
LIB_OBJS += dir-iterator.o
+LIB_OBJS += dir.o
LIB_OBJS += editor.o
LIB_OBJS += entry.o
LIB_OBJS += environment.o
@@ -886,26 +880,27 @@
LIB_OBJS += exec-cmd.o
LIB_OBJS += fetch-negotiator.o
LIB_OBJS += fetch-pack.o
+LIB_OBJS += fmt-merge-msg.o
LIB_OBJS += fsck.o
LIB_OBJS += fsmonitor.o
LIB_OBJS += gettext.o
LIB_OBJS += gpg-interface.o
LIB_OBJS += graph.o
LIB_OBJS += grep.o
+LIB_OBJS += hash-lookup.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 +909,37 @@
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-ort.o
+LIB_OBJS += merge-ort-wrappers.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-file.o
+LIB_OBJS += object-name.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
@@ -951,25 +952,28 @@
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.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
@@ -978,10 +982,6 @@
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-name.o
LIB_OBJS += shallow.o
LIB_OBJS += sideband.o
LIB_OBJS += sigchain.o
@@ -990,9 +990,11 @@
LIB_OBJS += strbuf.o
LIB_OBJS += streaming.o
LIB_OBJS += string-list.o
-LIB_OBJS += submodule.o
-LIB_OBJS += submodule-config.o
+LIB_OBJS += strmap.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
@@ -1011,11 +1013,11 @@
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
@@ -1044,6 +1046,7 @@
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
@@ -1055,11 +1058,14 @@
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
@@ -1069,10 +1075,12 @@
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
BUILTIN_OBJS += builtin/for-each-ref.o
+BUILTIN_OBJS += builtin/for-each-repo.o
BUILTIN_OBJS += builtin/fsck.o
BUILTIN_OBJS += builtin/gc.o
BUILTIN_OBJS += builtin/get-tar-commit-id.o
@@ -1088,13 +1096,13 @@
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
@@ -1114,9 +1122,9 @@
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
@@ -1188,7 +1196,7 @@
# 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.
@@ -1204,6 +1212,20 @@
include config.mak.dev
endif
+# 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
+
ALL_CFLAGS = $(DEVELOPER_CFLAGS) $(CPPFLAGS) $(CFLAGS)
ALL_LDFLAGS = $(LDFLAGS)
@@ -1216,7 +1238,6 @@
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)),)
@@ -1260,6 +1281,27 @@
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)"|'
@@ -1317,26 +1359,17 @@
COMPAT_OBJS += compat/basename.o
endif
+ifdef USE_LIBPCRE1
+$(error The USE_LIBPCRE1 build option has been removed, use version 2 with USE_LIBPCRE)
+endif
+
USE_LIBPCRE2 ?= $(USE_LIBPCRE)
ifneq (,$(USE_LIBPCRE2))
- ifdef USE_LIBPCRE1
-$(error Only set USE_LIBPCRE2 (or its alias USE_LIBPCRE) or USE_LIBPCRE1, not both!)
- endif
-
BASIC_CFLAGS += -DUSE_LIBPCRE2
EXTLIBS += -lpcre2-8
endif
-ifdef USE_LIBPCRE1
- BASIC_CFLAGS += -DUSE_LIBPCRE1
- EXTLIBS += -lpcre
-
-ifdef NO_LIBPCRE1_JIT
- BASIC_CFLAGS += -DNO_LIBPCRE1_JIT
-endif
-endif
-
ifdef LIBPCREDIR
BASIC_CFLAGS += -I$(LIBPCREDIR)/include
EXTLIBS += -L$(LIBPCREDIR)/$(lib) $(CC_LD_DYNPATH)$(LIBPCREDIR)/$(lib)
@@ -1358,17 +1391,22 @@
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
@@ -1504,12 +1542,13 @@
COMPAT_CFLAGS += -DFREAD_READS_DIRECTORIES
COMPAT_OBJS += compat/fopen.o
endif
+ifdef OPEN_RETURNS_EINTR
+ COMPAT_CFLAGS += -DOPEN_RETURNS_EINTR
+ COMPAT_OBJS += compat/open.o
+endif
ifdef NO_SYMLINK_HEAD
BASIC_CFLAGS += -DNO_SYMLINK_HEAD
endif
-ifdef GETTEXT_POISON
-$(warning The GETTEXT_POISON option has been removed in favor of runtime GIT_TEST_GETTEXT_POISON. See t/README!)
-endif
ifdef NO_GETTEXT
BASIC_CFLAGS += -DNO_GETTEXT
USE_GETTEXT_SCHEME ?= fallthrough
@@ -1631,11 +1670,8 @@
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
@@ -1803,11 +1839,6 @@
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
@@ -2068,9 +2099,9 @@
$(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::
@@ -2133,7 +2164,7 @@
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)"' \
@@ -2153,6 +2184,12 @@
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
@@ -2335,23 +2372,16 @@
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
@@ -2377,16 +2407,30 @@
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) $<
@@ -2409,6 +2453,14 @@
$(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)"' \
@@ -2466,10 +2518,6 @@
$(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 || \
@@ -2486,9 +2534,6 @@
$(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
@@ -2530,7 +2575,6 @@
--keyword=__ --keyword=N__ --keyword="__n:1,2"
LOCALIZED_C = $(C_OBJ:o=c) $(LIB_H) $(GENERATED_H)
LOCALIZED_SH = $(SCRIPT_SH)
-LOCALIZED_SH += git-parse-remote.sh
LOCALIZED_SH += git-rebase--preserve-merges.sh
LOCALIZED_SH += git-sh-setup.sh
LOCALIZED_PERL = $(SCRIPT_PERL)
@@ -2677,9 +2721,7 @@
@echo TAR=\''$(subst ','\'',$(subst ','\'',$(TAR)))'\' >>$@+
@echo NO_CURL=\''$(subst ','\'',$(subst ','\'',$(NO_CURL)))'\' >>$@+
@echo NO_EXPAT=\''$(subst ','\'',$(subst ','\'',$(NO_EXPAT)))'\' >>$@+
- @echo USE_LIBPCRE1=\''$(subst ','\'',$(subst ','\'',$(USE_LIBPCRE1)))'\' >>$@+
@echo USE_LIBPCRE2=\''$(subst ','\'',$(subst ','\'',$(USE_LIBPCRE2)))'\' >>$@+
- @echo NO_LIBPCRE1_JIT=\''$(subst ','\'',$(subst ','\'',$(NO_LIBPCRE1_JIT)))'\' >>$@+
@echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@+
@echo NO_PTHREADS=\''$(subst ','\'',$(subst ','\'',$(NO_PTHREADS)))'\' >>$@+
@echo NO_PYTHON=\''$(subst ','\'',$(subst ','\'',$(NO_PYTHON)))'\' >>$@+
@@ -2721,6 +2763,9 @@
ifdef GIT_TEST_INDEX_VERSION
@echo GIT_TEST_INDEX_VERSION=\''$(subst ','\'',$(subst ','\'',$(GIT_TEST_INDEX_VERSION)))'\' >>$@+
endif
+ifdef GIT_TEST_PERL_FATAL_WARNINGS
+ @echo GIT_TEST_PERL_FATAL_WARNINGS=\''$(subst ','\'',$(subst ','\'',$(GIT_TEST_PERL_FATAL_WARNINGS)))'\' >>$@+
+endif
@if cmp $@+ $@ >/dev/null 2>&1; then $(RM) $@+; else mv $@+ $@; fi
### Detect Python interpreter path changes
@@ -2763,10 +2808,6 @@
.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))
@@ -2786,7 +2827,7 @@
.PHONY: sparse $(SP_OBJ)
sparse: $(SP_OBJ)
-EXCEPT_HDRS := command-list.h unicode-width.h compat/% xdiff/%
+EXCEPT_HDRS := command-list.h config-list.h unicode-width.h compat/% xdiff/%
ifndef GCRYPT_SHA256
EXCEPT_HDRS += sha256/gcrypt.h
endif
@@ -2808,7 +2849,7 @@
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"; \
@@ -2891,20 +2932,8 @@
# 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)'
@@ -2932,7 +2961,7 @@
$(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) && \
@@ -2955,16 +2984,19 @@
{ 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 \
@@ -3017,33 +3049,31 @@
### Maintainer's dist rules
GIT_TARNAME = git-$(GIT_VERSION)
-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
+GIT_ARCHIVE_EXTRA_FILES = \
+ --prefix=$(GIT_TARNAME)/ \
+ --add-file=configure \
+ --add-file=.dist-tmp-dir/version \
+ --prefix=$(GIT_TARNAME)/git-gui/ \
+ --add-file=.dist-tmp-dir/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]
+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
- @$(RM) -r $(GIT_TARNAME)
+dist: git-archive$(X) configure
+ @$(RM) -r .dist-tmp-dir
+ @mkdir .dist-tmp-dir
+ @echo $(GIT_VERSION) > .dist-tmp-dir/version
+ @$(MAKE) -C git-gui TARDIR=../.dist-tmp-dir/git-gui dist-version
+ ./git-archive --format=tar \
+ $(GIT_ARCHIVE_EXTRA_FILES) \
+ --prefix=$(GIT_TARNAME)/ HEAD^{tree} > $(GIT_TARNAME).tar
+ @$(RM) -r .dist-tmp-dir
gzip -f -9 $(GIT_TARNAME).tar
rpm::
@@ -3055,7 +3085,7 @@
OTHER_PROGRAMS += $(shell echo *.dll t/helper/*.dll)
endif
-artifacts-tar:: $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) $(OTHER_PROGRAMS) \
+artifacts-tar:: $(ALL_COMMANDS_TO_INSTALL) $(SCRIPT_LIB) $(OTHER_PROGRAMS) \
GIT-BUILD-OPTIONS $(TEST_PROGRAMS) $(test_bindir_programs) \
$(MOFILES)
$(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1) \
@@ -3068,11 +3098,15 @@
htmldocs = git-htmldocs-$(GIT_VERSION)
manpages = git-manpages-$(GIT_VERSION)
.PHONY: dist-doc distclean
-dist-doc:
+dist-doc: git$X
$(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 .
+ ./git -C .doc-tmp-dir init
+ ./git -C .doc-tmp-dir add .
+ ./git -C .doc-tmp-dir commit -m htmldocs
+ ./git -C .doc-tmp-dir archive --format=tar --prefix=./ HEAD^{tree} \
+ > $(htmldocs).tar
gzip -n -9 -f $(htmldocs).tar
:
$(RM) -r .doc-tmp-dir
@@ -3082,7 +3116,11 @@
man5dir=../.doc-tmp-dir/man5 \
man7dir=../.doc-tmp-dir/man7 \
install
- cd .doc-tmp-dir && $(TAR) cf ../$(manpages).tar .
+ ./git -C .doc-tmp-dir init
+ ./git -C .doc-tmp-dir add .
+ ./git -C .doc-tmp-dir commit -m manpages
+ ./git -C .doc-tmp-dir archive --format=tar --prefix=./ HEAD^{tree} \
+ > $(manpages).tar
gzip -n -9 -f $(manpages).tar
$(RM) -r .doc-tmp-dir
@@ -3104,16 +3142,16 @@
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) $(HCC)
- $(RM) -r bin-wrappers $(dep_dirs)
+ $(RM) -r bin-wrappers $(dep_dirs) $(compdb_dir) compile_commands.json
$(RM) -r po/build/
$(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) -r .dist-tmp-dir .doc-tmp-dir
+ $(RM) $(GIT_TARNAME).tar.gz
$(RM) $(htmldocs).tar.gz $(manpages).tar.gz
$(MAKE) -C Documentation/ clean
$(RM) Documentation/GIT-EXCLUDED-PROGRAMS
@@ -3150,11 +3188,12 @@
### 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::
@@ -3189,7 +3228,7 @@
-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; \
@@ -3260,11 +3299,11 @@
# are not necessarily appropriate for general builds, and that vary greatly
# depending on the compiler version used.
#
-# An example command to build against libFuzzer from LLVM 4.0.0:
+# An example command to build against libFuzzer from LLVM 11.0.0:
#
# make CC=clang CXX=clang++ \
-# CFLAGS="-fsanitize-coverage=trace-pc-guard -fsanitize=address" \
-# LIB_FUZZING_ENGINE=/usr/lib/llvm-4.0/lib/libFuzzer.a \
+# CFLAGS="-fsanitize=fuzzer-no-link,address" \
+# LIB_FUZZING_ENGINE="-fsanitize=fuzzer" \
# fuzz-all
#
FUZZ_CXXFLAGS ?= $(CFLAGS)
diff --git a/README.md b/README.md
index 9d4564c..eb8115e 100644
--- a/README.md
+++ b/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
=========================================================
diff --git a/RelNotes b/RelNotes
index 3427be6..3324fc0 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.26.2.txt
\ No newline at end of file
+Documentation/RelNotes/2.31.0.txt
\ No newline at end of file
diff --git a/abspath.c b/abspath.c
index 9857985..39e06b5 100644
--- a/abspath.c
+++ b/abspath.c
@@ -67,19 +67,15 @@
#endif
/*
- * Return the real path (i.e., absolute path, with symlinks resolved
- * and extra slashes removed) equivalent to the specified path. (If
- * you want an absolute path but don't mind links, use
- * absolute_path().) Places the resolved realpath in the provided strbuf.
- *
- * The directory part of path (i.e., everything up to the last
- * dir_sep) must denote a valid, existing directory, but the last
- * component need not exist. If die_on_error is set, then die with an
- * informative error message if there is a problem. Otherwise, return
- * NULL on errors (without generating any output).
+ * If set, any number of trailing components may be missing; otherwise, only one
+ * may be.
*/
-char *strbuf_realpath(struct strbuf *resolved, const char *path,
- int die_on_error)
+#define REALPATH_MANY_MISSING (1 << 0)
+/* Should we die if there's an error? */
+#define REALPATH_DIE_ON_ERROR (1 << 1)
+
+static char *strbuf_realpath_1(struct strbuf *resolved, const char *path,
+ int flags)
{
struct strbuf remaining = STRBUF_INIT;
struct strbuf next = STRBUF_INIT;
@@ -89,7 +85,7 @@
struct stat st;
if (!*path) {
- if (die_on_error)
+ if (flags & REALPATH_DIE_ON_ERROR)
die("The empty string is not a valid path");
else
goto error_out;
@@ -101,7 +97,7 @@
if (!resolved->len) {
/* relative path; can use CWD as the initial resolved path */
if (strbuf_getcwd(resolved)) {
- if (die_on_error)
+ if (flags & REALPATH_DIE_ON_ERROR)
die_errno("unable to get current working directory");
else
goto error_out;
@@ -129,8 +125,9 @@
if (lstat(resolved->buf, &st)) {
/* error out unless this was the last component */
- if (errno != ENOENT || remaining.len) {
- if (die_on_error)
+ if (errno != ENOENT ||
+ (!(flags & REALPATH_MANY_MISSING) && remaining.len)) {
+ if (flags & REALPATH_DIE_ON_ERROR)
die_errno("Invalid path '%s'",
resolved->buf);
else
@@ -143,7 +140,7 @@
if (num_symlinks++ > MAXSYMLINKS) {
errno = ELOOP;
- if (die_on_error)
+ if (flags & REALPATH_DIE_ON_ERROR)
die("More than %d nested symlinks "
"on path '%s'", MAXSYMLINKS, path);
else
@@ -153,7 +150,7 @@
len = strbuf_readlink(&symlink, resolved->buf,
st.st_size);
if (len < 0) {
- if (die_on_error)
+ if (flags & REALPATH_DIE_ON_ERROR)
die_errno("Invalid symlink '%s'",
resolved->buf);
else
@@ -203,19 +200,34 @@
}
/*
- * Resolve `path` into an absolute, cleaned-up path. The return value
- * comes from a shared buffer.
+ * Return the real path (i.e., absolute path, with symlinks resolved
+ * and extra slashes removed) equivalent to the specified path. (If
+ * you want an absolute path but don't mind links, use
+ * absolute_path().) Places the resolved realpath in the provided strbuf.
+ *
+ * The directory part of path (i.e., everything up to the last
+ * dir_sep) must denote a valid, existing directory, but the last
+ * component need not exist. If die_on_error is set, then die with an
+ * informative error message if there is a problem. Otherwise, return
+ * NULL on errors (without generating any output).
*/
-const char *real_path(const char *path)
+char *strbuf_realpath(struct strbuf *resolved, const char *path,
+ int die_on_error)
{
- static struct strbuf realpath = STRBUF_INIT;
- return strbuf_realpath(&realpath, path, 1);
+ return strbuf_realpath_1(resolved, path,
+ die_on_error ? REALPATH_DIE_ON_ERROR : 0);
}
-const char *real_path_if_valid(const char *path)
+/*
+ * Just like strbuf_realpath, but allows an arbitrary number of path
+ * components to be missing.
+ */
+char *strbuf_realpath_forgiving(struct strbuf *resolved, const char *path,
+ int die_on_error)
{
- static struct strbuf realpath = STRBUF_INIT;
- return strbuf_realpath(&realpath, path, 0);
+ return strbuf_realpath_1(resolved, path,
+ ((die_on_error ? REALPATH_DIE_ON_ERROR : 0) |
+ REALPATH_MANY_MISSING));
}
char *real_pathdup(const char *path, int die_on_error)
@@ -233,7 +245,7 @@
/*
* 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/add-interactive.c b/add-interactive.c
index 4a9bf85..36ebdbd 100644
--- a/add-interactive.c
+++ b/add-interactive.c
@@ -9,12 +9,13 @@
#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 *section_and_slot, char *dst,
const char *default_color)
{
- char *key = xstrfmt("color.interactive.%s", slot_name);
+ char *key = xstrfmt("color.%s", section_and_slot);
const char *value;
if (!s->use_color)
@@ -39,20 +40,27 @@
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,
+ init_color(r, s, "interactive.header", s->header_color, GIT_COLOR_BOLD);
+ init_color(r, s, "interactive.help", s->help_color, GIT_COLOR_BOLD_RED);
+ init_color(r, s, "interactive.prompt", s->prompt_color,
+ GIT_COLOR_BOLD_BLUE);
+ init_color(r, s, "interactive.error", s->error_color,
+ GIT_COLOR_BOLD_RED);
+
+ init_color(r, s, "diff.frag", 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,
+ init_color(r, s, "diff.context", s->context_color, "fall back");
+ if (!strcmp(s->context_color, "fall back"))
+ init_color(r, s, "diff.plain", s->context_color,
+ diff_get_color(s->use_color, DIFF_CONTEXT));
+ init_color(r, s, "diff.old", s->file_old_color,
diff_get_color(s->use_color, DIFF_FILE_OLD));
- init_color(r, s, "new", s->file_new_color,
+ init_color(r, s, "diff.new", s->file_new_color,
diff_get_color(s->use_color, DIFF_FILE_NEW));
+ strlcpy(s->reset_color,
+ s->use_color ? GIT_COLOR_RESET : "", COLOR_MAXLEN);
+
FREE_AND_NULL(s->interactive_diff_filter);
git_config_get_string("interactive.difffilter",
&s->interactive_diff_filter);
@@ -193,7 +201,8 @@
else if (index + 1 < list->sorted.nr &&
starts_with(list->sorted.items[index + 1].string, string))
return -1;
- else if (index < list->sorted.nr)
+ else if (index < list->sorted.nr &&
+ starts_with(list->sorted.items[index].string, string))
item = list->sorted.items[index].util;
else
return -1;
@@ -289,13 +298,12 @@
fputs(singleton ? "> " : ">> ", stdout);
fflush(stdout);
- if (strbuf_getline(&input, stdin) == EOF) {
+ if (git_read_line_interactively(&input) == EOF) {
putchar('\n');
if (immediate)
res = LIST_AND_CHOOSE_QUIT;
break;
}
- strbuf_trim(&input);
if (!input.len)
break;
@@ -364,7 +372,7 @@
if (from < 0 || from >= items->items.nr ||
(singleton && from + 1 != to)) {
- color_fprintf_ln(stdout, s->error_color,
+ color_fprintf_ln(stderr, s->error_color,
_("Huh (%s)?"), p);
break;
} else if (singleton) {
@@ -405,7 +413,7 @@
static void add_file_item(struct string_list *files, const char *name)
{
- struct file_item *item = xcalloc(sizeof(*item), 1);
+ struct file_item *item = xcalloc(1, sizeof(*item));
string_list_append(files, name)->util = item;
}
@@ -468,7 +476,7 @@
add_file_item(s->files, name);
- entry = xcalloc(sizeof(*entry), 1);
+ CALLOC_ARRAY(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;
@@ -557,7 +565,7 @@
if (ps)
clear_pathspec(&rev.prune_data);
}
- hashmap_free_entries(&s.file_map, struct pathname_entry, ent);
+ hashmap_clear_and_free(&s.file_map, struct pathname_entry, ent);
if (unmerged_count)
*unmerged_count = s.unmerged_count;
if (binary_count)
@@ -935,18 +943,18 @@
opts->prompt = N_("Patch update");
count = list_and_choose(s, files, opts);
if (count > 0) {
- struct argv_array args = ARGV_ARRAY_INIT;
+ struct strvec args = STRVEC_INIT;
struct pathspec ps_selected = { 0 };
for (i = 0; i < files->items.nr; i++)
if (files->selected[i])
- argv_array_push(&args,
- files->items.items[i].string);
+ strvec_push(&args,
+ files->items.items[i].string);
parse_pathspec(&ps_selected,
PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
- PATHSPEC_LITERAL_PATH, "", args.argv);
+ PATHSPEC_LITERAL_PATH, "", args.v);
res = run_add_p(s->r, ADD_P_ADD, NULL, &ps_selected);
- argv_array_clear(&args);
+ strvec_clear(&args);
clear_pathspec(&ps_selected);
}
@@ -976,18 +984,18 @@
count = list_and_choose(s, files, opts);
opts->flags = 0;
if (count > 0) {
- struct argv_array args = ARGV_ARRAY_INIT;
+ struct strvec args = STRVEC_INIT;
- argv_array_pushl(&args, "git", "diff", "-p", "--cached",
- oid_to_hex(!is_initial ? &oid :
- s->r->hash_algo->empty_tree),
- "--", NULL);
+ 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])
- argv_array_push(&args,
- files->items.items[i].string);
- res = run_command_v_opt(args.argv, 0);
- argv_array_clear(&args);
+ strvec_push(&args,
+ files->items.items[i].string);
+ res = run_command_v_opt(args.v, 0);
+ strvec_clear(&args);
}
putchar('\n');
@@ -1112,7 +1120,7 @@
int res = 0;
for (i = 0; i < ARRAY_SIZE(command_list); i++) {
- struct command_item *util = xcalloc(sizeof(*util), 1);
+ struct command_item *util = xcalloc(1, sizeof(*util));
util->command = command_list[i].command;
string_list_append(&commands.items, command_list[i].string)
->util = util;
@@ -1131,7 +1139,7 @@
print_file_item_data.color = data.color;
print_file_item_data.reset = data.reset;
- strbuf_addstr(&header, " ");
+ strbuf_addstr(&header, " ");
strbuf_addf(&header, print_file_item_data.modified_fmt,
_("staged"), _("unstaged"), _("path"));
opts.list_opts.header = header.buf;
diff --git a/add-patch.c b/add-patch.c
index d8dafa8..2fad92c 100644
--- a/add-patch.c
+++ b/add-patch.c
@@ -2,14 +2,15 @@
#include "add-interactive.h"
#include "strbuf.h"
#include "run-command.h"
-#include "argv-array.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_HUNK,
+ PROMPT_MODE_CHANGE = 0, PROMPT_DELETION, PROMPT_ADDITION, PROMPT_HUNK,
PROMPT_MODE_MAX, /* must be last */
};
@@ -32,6 +33,7 @@
.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 "
@@ -53,6 +55,7 @@
.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 "
@@ -76,6 +79,7 @@
.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 "
@@ -98,6 +102,7 @@
.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 "
@@ -120,6 +125,7 @@
.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 "
@@ -142,6 +148,7 @@
.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 "
@@ -163,6 +170,7 @@
.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 "
@@ -185,6 +193,7 @@
.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 "
@@ -206,6 +215,7 @@
.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 "
@@ -247,7 +257,7 @@
struct hunk head;
struct hunk *hunk;
size_t hunk_nr, hunk_alloc;
- unsigned deleted:1, mode_change:1,binary:1;
+ unsigned deleted:1, added:1, mode_change:1,binary:1;
} *file_diff;
size_t file_diff_nr;
@@ -256,6 +266,20 @@
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;
@@ -276,12 +300,12 @@
va_start(ap, cp);
while ((arg = va_arg(ap, const char *)))
- argv_array_push(&cp->args, arg);
+ strvec_push(&cp->args, arg);
va_end(ap);
cp->git_cmd = 1;
- argv_array_pushf(&cp->env_array,
- INDEX_ENVIRONMENT "=%s", s->s.r->index_file);
+ strvec_pushf(&cp->env_array,
+ INDEX_ENVIRONMENT "=%s", s->s.r->index_file);
}
static int parse_range(const char **p,
@@ -360,7 +384,7 @@
static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
{
- struct argv_array args = ARGV_ARRAY_INIT;
+ 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;
@@ -370,32 +394,32 @@
struct hunk *hunk = NULL;
int res;
- argv_array_pushv(&args, s->mode->diff_cmd);
+ strvec_pushv(&args, s->mode->diff_cmd);
if (diff_algorithm)
- argv_array_pushf(&args, "--diff-algorithm=%s", diff_algorithm);
+ strvec_pushf(&args, "--diff-algorithm=%s", diff_algorithm);
if (s->revision) {
struct object_id oid;
- argv_array_push(&args,
- /* could be on an unborn branch */
- !strcmp("HEAD", s->revision) &&
- get_oid("HEAD", &oid) ?
- empty_tree_oid_hex() : s->revision);
+ 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.argc;
+ color_arg_index = args.nr;
/* Use `--no-color` explicitly, just in case `diff.color = always`. */
- argv_array_pushl(&args, "--no-color", "-p", "--", NULL);
+ strvec_pushl(&args, "--no-color", "-p", "--", NULL);
for (i = 0; i < ps->nr; i++)
- argv_array_push(&args, ps->items[i].original);
+ strvec_push(&args, ps->items[i].original);
setup_child_process(s, &cp, NULL);
- cp.argv = args.argv;
+ cp.argv = args.v;
res = capture_command(&cp, plain, 0);
if (res) {
- argv_array_clear(&args);
+ strvec_clear(&args);
return error(_("could not parse diff"));
}
if (!plain->len) {
- argv_array_clear(&args);
+ strvec_clear(&args);
return 0;
}
strbuf_complete_line(plain);
@@ -405,11 +429,11 @@
const char *diff_filter = s->s.interactive_diff_filter;
setup_child_process(s, &colored_cp, NULL);
- xsnprintf((char *)args.argv[color_arg_index], 8, "--color");
- colored_cp.argv = args.argv;
+ xsnprintf((char *)args.v[color_arg_index], 8, "--color");
+ colored_cp.argv = args.v;
colored = &s->colored;
res = capture_command(&colored_cp, colored, 0);
- argv_array_clear(&args);
+ strvec_clear(&args);
if (res)
return error(_("could not parse colored diff"));
@@ -434,7 +458,7 @@
colored_p = colored->buf;
colored_pend = colored_p + colored->len;
}
- argv_array_clear(&args);
+ strvec_clear(&args);
/* parse files and hunks */
p = plain->buf;
@@ -447,11 +471,9 @@
eol = pend;
if (starts_with(p, "diff ")) {
- s->file_diff_nr++;
- ALLOC_GROW(s->file_diff, s->file_diff_nr,
+ ALLOC_GROW_BY(s->file_diff, s->file_diff_nr, 1,
file_diff_alloc);
file_diff = s->file_diff + s->file_diff_nr - 1;
- memset(file_diff, 0, sizeof(*file_diff));
hunk = &file_diff->head;
hunk->start = p - plain->buf;
if (colored_p)
@@ -464,7 +486,7 @@
; /* 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))) {
+ (skip_prefix(p, "deleted file", &deleted)))) {
if (marker == '-' || marker == '+')
/*
* Should not happen; previous hunk did not end
@@ -472,11 +494,9 @@
*/
hunk->splittable_into++;
- file_diff->hunk_nr++;
- ALLOC_GROW(file_diff->hunk, file_diff->hunk_nr,
+ ALLOC_GROW_BY(file_diff->hunk, file_diff->hunk_nr, 1,
file_diff->hunk_alloc);
hunk = file_diff->hunk + file_diff->hunk_nr - 1;
- memset(hunk, 0, sizeof(*hunk));
hunk->start = p - plain->buf;
if (colored)
@@ -493,12 +513,15 @@
*/
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++)
+ if (file_diff->hunk_nr)
BUG("mode change in the middle?\n\n%.*s",
(int)(eol - plain->buf), plain->buf);
@@ -507,9 +530,8 @@
* is _part of_ the header "hunk".
*/
file_diff->mode_change = 1;
- ALLOC_GROW(file_diff->hunk, file_diff->hunk_nr,
+ ALLOC_GROW_BY(file_diff->hunk, file_diff->hunk_nr, 1,
file_diff->hunk_alloc);
- memset(file_diff->hunk, 0, sizeof(struct hunk));
file_diff->hunk->start = p - plain->buf;
if (colored_p)
file_diff->hunk->colored_start =
@@ -536,8 +558,10 @@
starts_with(p, "Binary files "))
file_diff->binary = 1;
- if (file_diff->deleted && file_diff->mode_change)
- BUG("diff contains delete *and* a mode change?!?\n%.*s",
+ 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);
@@ -637,13 +661,18 @@
else
new_offset += delta;
- strbuf_addf(out, "@@ -%lu,%lu +%lu,%lu @@",
- old_offset, header->old_count,
- new_offset, header->new_count);
+ strbuf_addf(out, "@@ -%lu", old_offset);
+ if (header->old_count != 1)
+ strbuf_addf(out, ",%lu", header->old_count);
+ strbuf_addf(out, " +%lu", new_offset);
+ if (header->new_count != 1)
+ strbuf_addf(out, ",%lu", header->new_count);
+ strbuf_addstr(out, " @@");
+
if (len)
strbuf_add(out, p, len);
else if (colored)
- strbuf_addf(out, "%s\n", GIT_COLOR_RESET);
+ strbuf_addf(out, "%s\n", s->s.reset_color);
else
strbuf_addch(out, '\n');
}
@@ -1036,7 +1065,7 @@
s->s.file_new_color :
s->s.context_color);
strbuf_add(&s->colored, plain + current, eol - current);
- strbuf_addstr(&s->colored, GIT_COLOR_RESET);
+ strbuf_addstr(&s->colored, s->s.reset_color);
if (next > eol)
strbuf_add(&s->colored, plain + eol, next - eol);
current = next;
@@ -1143,7 +1172,7 @@
setup_child_process(s, &cp,
"apply", "--check", NULL);
- argv_array_pushv(&cp.args, s->mode->apply_check_args);
+ 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"));
@@ -1158,9 +1187,8 @@
return res;
}
- if (strbuf_getline(&s->answer, stdin) == EOF)
+ if (git_read_line_interactively(&s->answer) == EOF)
return EOF;
- strbuf_trim_trailing_newline(&s->answer);
return 0;
}
@@ -1189,7 +1217,7 @@
for (;;) {
int res = edit_hunk_manually(s, hunk);
if (res == 0) {
- /* abandonded */
+ /* abandoned */
*hunk = backup;
return -1;
}
@@ -1343,8 +1371,18 @@
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;
- if (!file_diff->hunk_nr)
+ /* Empty added files have no hunks */
+ if (!file_diff->hunk_nr && !file_diff->added)
return 0;
strbuf_reset(&s->buf);
@@ -1353,21 +1391,25 @@
for (;;) {
if (hunk_index >= file_diff->hunk_nr)
hunk_index = 0;
- hunk = file_diff->hunk + hunk_index;
-
+ hunk = file_diff->hunk_nr
+ ? file_diff->hunk + hunk_index
+ : &file_diff->head;
undecided_previous = -1;
- for (i = hunk_index - 1; i >= 0; i--)
- if (file_diff->hunk[i].use == UNDECIDED_HUNK) {
- undecided_previous = i;
- break;
- }
-
undecided_next = -1;
- for (i = hunk_index + 1; i < file_diff->hunk_nr; i++)
- if (file_diff->hunk[i].use == UNDECIDED_HUNK) {
- undecided_next = i;
- break;
- }
+
+ 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 &&
@@ -1375,40 +1417,59 @@
break;
strbuf_reset(&s->buf);
- render_hunk(s, hunk, 0, colored, &s->buf);
- fputs(s->buf.buf, stdout);
+ 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)
- strbuf_addstr(&s->buf, ",k");
- if (hunk_index)
- strbuf_addstr(&s->buf, ",K");
- if (undecided_next >= 0)
- strbuf_addstr(&s->buf, ",j");
- if (hunk_index + 1 < file_diff->hunk_nr)
- strbuf_addstr(&s->buf, ",J");
- if (file_diff->hunk_nr > 1)
- strbuf_addstr(&s->buf, ",g,/");
- if (hunk->splittable_into > 1)
- strbuf_addstr(&s->buf, ",s");
- if (hunk_index + 1 > file_diff->mode_change &&
- !file_diff->deleted)
- strbuf_addstr(&s->buf, ",e");
-
+ 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") ",
+ printf("%s(%"PRIuMAX"/%"PRIuMAX") ", s->s.prompt_color,
(uintmax_t)hunk_index + 1,
- (uintmax_t)file_diff->hunk_nr);
- color_fprintf(stdout, s->s.prompt_color,
- _(s->mode->prompt_mode[prompt_mode_type]),
- s->buf.buf);
+ (uintmax_t)(file_diff->hunk_nr
+ ? file_diff->hunk_nr
+ : 1));
+ printf(_(s->mode->prompt_mode[prompt_mode_type]),
+ s->buf.buf);
+ if (*s->s.reset_color)
+ fputs(s->s.reset_color, stdout);
fflush(stdout);
if (read_single_character(s) == EOF)
break;
@@ -1425,38 +1486,46 @@
hunk->use = SKIP_HUNK;
goto soft_increment;
} else if (ch == 'a') {
- for (; hunk_index < file_diff->hunk_nr; hunk_index++) {
- hunk = file_diff->hunk + hunk_index;
- if (hunk->use == UNDECIDED_HUNK)
- hunk->use = USE_HUNK;
+ 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') {
- for (; hunk_index < file_diff->hunk_nr; hunk_index++) {
- hunk = file_diff->hunk + hunk_index;
- if (hunk->use == UNDECIDED_HUNK)
- hunk->use = SKIP_HUNK;
+ if (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 (hunk_index)
+ if (permitted & ALLOW_GOTO_PREVIOUS_HUNK)
hunk_index--;
else
err(s, _("No previous hunk"));
} else if (s->answer.buf[0] == 'J') {
- if (hunk_index + 1 < file_diff->hunk_nr)
+ if (permitted & ALLOW_GOTO_NEXT_HUNK)
hunk_index++;
else
err(s, _("No next hunk"));
} else if (s->answer.buf[0] == 'k') {
- if (undecided_previous >= 0)
+ 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 (undecided_next >= 0)
+ if (permitted & ALLOW_GOTO_NEXT_UNDECIDED_HUNK)
hunk_index = undecided_next;
else
err(s, _("No next hunk"));
@@ -1464,7 +1533,7 @@
char *pend;
unsigned long response;
- if (file_diff->hunk_nr < 2) {
+ if (!(permitted & ALLOW_SEARCH_AND_GOTO)) {
err(s, _("No other hunks to goto"));
continue;
}
@@ -1501,7 +1570,7 @@
regex_t regex;
int ret;
- if (file_diff->hunk_nr < 2) {
+ if (!(permitted & ALLOW_SEARCH_AND_GOTO)) {
err(s, _("No other hunks to search"));
continue;
}
@@ -1546,7 +1615,7 @@
hunk_index = i;
} else if (s->answer.buf[0] == 's') {
size_t splittable_into = hunk->splittable_into;
- if (splittable_into < 2)
+ if (!(permitted & ALLOW_SPLIT))
err(s, _("Sorry, cannot split this hunk"));
else if (!split_hunk(s, file_diff,
hunk - file_diff->hunk))
@@ -1554,7 +1623,7 @@
_("Split into %d hunks."),
(int)splittable_into);
} else if (s->answer.buf[0] == 'e') {
- if (hunk_index + 1 == file_diff->mode_change)
+ 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;
@@ -1592,7 +1661,8 @@
if (file_diff->hunk[i].use == USE_HUNK)
break;
- if (i < file_diff->hunk_nr) {
+ 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);
@@ -1603,12 +1673,12 @@
s->mode->is_reverse);
else {
setup_child_process(s, &cp, "apply", NULL);
- argv_array_pushv(&cp.args, s->mode->apply_args);
+ 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))
+ if (repo_read_index(s->s.r) >= 0)
repo_refresh_and_write_index(s->s.r, REFRESH_QUIET, 0,
1, NULL, NULL, NULL);
}
@@ -1630,6 +1700,14 @@
if (mode == ADD_P_STASH)
s.mode = &patch_mode_stash;
else if (mode == ADD_P_RESET) {
+ /*
+ * NEEDSWORK: Instead of comparing to the literal "HEAD",
+ * compare the commit objects instead so that other ways of
+ * saying the same thing (such as "@") are also handled
+ * appropriately.
+ *
+ * This applies to the cases below too.
+ */
if (!revision || !strcmp(revision, "HEAD"))
s.mode = &patch_mode_reset_head;
else
@@ -1657,9 +1735,7 @@
repo_refresh_and_write_index(r, REFRESH_QUIET, 0, 1,
NULL, NULL, NULL) < 0) ||
parse_diff(&s, ps) < 0) {
- strbuf_release(&s.plain);
- strbuf_release(&s.colored);
- clear_add_i_state(&s.s);
+ add_p_state_clear(&s);
return -1;
}
@@ -1674,10 +1750,6 @@
else if (binary_count == s.file_diff_nr)
fprintf(stderr, _("Only binary files changed.\n"));
- strbuf_release(&s.answer);
- strbuf_release(&s.buf);
- strbuf_release(&s.plain);
- strbuf_release(&s.colored);
- clear_add_i_state(&s.s);
+ add_p_state_clear(&s);
return 0;
}
diff --git a/advice.c b/advice.c
index 97f3f98..1647423 100644
--- a/advice.c
+++ b/advice.c
@@ -11,6 +11,7 @@
int advice_push_fetch_first = 1;
int advice_push_needs_force = 1;
int advice_push_unqualified_ref_name = 1;
+int advice_push_ref_needs_update = 1;
int advice_status_hints = 1;
int advice_status_u_option = 1;
int advice_status_ahead_behind_warning = 1;
@@ -29,7 +30,6 @@
int advice_waiting_for_editor = 1;
int advice_graft_file_deprecated = 1;
int advice_checkout_ambiguous_remote_branch_name = 1;
-int advice_nested_tag = 1;
int advice_submodule_alternate_error_strategy_die = 1;
int advice_add_ignored_file = 1;
int advice_add_empty_pathspec = 1;
@@ -73,6 +73,7 @@
{ "pushFetchFirst", &advice_push_fetch_first },
{ "pushNeedsForce", &advice_push_needs_force },
{ "pushUnqualifiedRefName", &advice_push_unqualified_ref_name },
+ { "pushRefNeedsUpdate", &advice_push_ref_needs_update },
{ "statusHints", &advice_status_hints },
{ "statusUoption", &advice_status_u_option },
{ "statusAheadBehindWarning", &advice_status_ahead_behind_warning },
@@ -82,7 +83,7 @@
{ "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 },
@@ -91,7 +92,6 @@
{ "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 },
@@ -100,15 +100,59 @@
{ "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 },
+ [ADVICE_PUSH_REF_NEEDS_UPDATE] = { "pushRefNeedsUpdate", 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');
@@ -122,6 +166,37 @@
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;
@@ -148,6 +223,13 @@
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;
}
@@ -158,8 +240,8 @@
{
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/advice.h b/advice.h
index 0e6e58d..bc24329 100644
--- a/advice.h
+++ b/advice.h
@@ -11,6 +11,7 @@
extern int advice_push_fetch_first;
extern int advice_push_needs_force;
extern int advice_push_unqualified_ref_name;
+extern int advice_push_ref_needs_update;
extern int advice_status_hints;
extern int advice_status_u_option;
extern int advice_status_ahead_behind_warning;
@@ -29,14 +30,65 @@
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_PUSH_REF_NEEDS_UPDATE,
+ 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/alloc.c b/alloc.c
index 1c64c4d..957a0af 100644
--- a/alloc.c
+++ b/alloc.c
@@ -99,23 +99,27 @@
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/alloc.h b/alloc.h
index ed1071c..371d388 100644
--- a/alloc.h
+++ b/alloc.h
@@ -9,7 +9,7 @@
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/apply.c b/apply.c
index bdc008f..6695a93 100644
--- a/apply.c
+++ b/apply.c
@@ -30,8 +30,8 @@
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_get_string("apply.whitespace", &apply_default_whitespace);
+ git_config_get_string("apply.ignorewhitespace", &apply_default_ignorewhitespace);
git_config(git_xmerge_config, NULL);
}
@@ -1781,7 +1781,7 @@
struct fragment *fragment;
int len;
- fragment = xcalloc(1, sizeof(*fragment));
+ CALLOC_ARRAY(fragment, 1);
fragment->linenr = state->linenr;
len = parse_fragment(state, line, size, patch, fragment);
if (len <= 0) {
@@ -1959,7 +1959,7 @@
size -= llen;
}
- frag = xcalloc(1, sizeof(*frag));
+ CALLOC_ARRAY(frag, 1);
frag->patch = inflate_it(data, hunk_size, origlen);
frag->free_patch = 1;
if (!frag->patch)
@@ -3178,7 +3178,7 @@
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;
@@ -3740,6 +3740,7 @@
#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,
@@ -3747,10 +3748,23 @@
{
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;
@@ -3934,7 +3948,8 @@
break; /* happy */
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);
case EXISTS_IN_WORKTREE:
return error(_("%s: already exists in working directory"),
new_name);
@@ -4349,7 +4364,7 @@
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;
}
@@ -4392,7 +4407,7 @@
return 0;
if (errno == ENOENT) {
- if (safe_create_leading_directories(path))
+ if (safe_create_leading_directories_no_share(path))
return 0;
res = try_create_file(state, path, mode, buf, size);
if (res < 0)
@@ -4666,7 +4681,7 @@
struct patch *patch;
int nr;
- patch = xcalloc(1, sizeof(*patch));
+ CALLOC_ARRAY(patch, 1);
patch->inaccurate_eof = !!(options & APPLY_OPT_INACCURATE_EOF);
patch->recount = !!(options & APPLY_OPT_RECOUNT);
nr = parse_chunk(state, buf.buf + offset, buf.len - offset, patch);
@@ -4682,8 +4697,13 @@
reverse_patches(patch);
if (use_patch(state, patch)) {
patch_stats(state, patch);
- *listp = patch;
- listp = &patch->next;
+ if (!list || !state->apply_in_reverse) {
+ *listp = patch;
+ listp = &patch->next;
+ } else {
+ patch->next = list;
+ list = patch;
+ }
if ((patch->new_name &&
ends_with_path_components(patch->new_name,
@@ -4964,15 +4984,15 @@
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,
@@ -5005,15 +5025,15 @@
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,
@@ -5029,9 +5049,9 @@
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/archive-tar.c b/archive-tar.c
index 5a77701..05d2455 100644
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -242,13 +242,12 @@
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));
@@ -282,20 +281,6 @@
} 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),
@@ -326,7 +311,6 @@
else
err = stream_blocked(args->repo, oid);
}
- free(buffer);
return err;
}
@@ -364,7 +348,7 @@
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++) {
@@ -380,17 +364,18 @@
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;
ar = find_tar_filter(name, namelen);
if (!ar) {
- ar = xcalloc(1, sizeof(*ar));
+ CALLOC_ARRAY(ar, 1);
ar->name = xmemdupz(name, namelen);
ar->write_archive = write_tar_filter_archive;
- ar->flags = ARCHIVER_WANT_COMPRESSION_LEVELS;
+ ar->flags = ARCHIVER_WANT_COMPRESSION_LEVELS |
+ ARCHIVER_HIGH_COMPRESSION_LEVELS;
ALLOC_GROW(tar_filters, nr_tar_filters + 1, alloc_tar_filters);
tar_filters[nr_tar_filters++] = ar;
}
diff --git a/archive-zip.c b/archive-zip.c
index e9f4262..2961e01 100644
--- a/archive-zip.c
+++ b/archive-zip.c
@@ -285,7 +285,8 @@
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;
@@ -299,10 +300,8 @@
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;
@@ -328,13 +327,8 @@
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 = ZIP_METHOD_STORE;
attr2 = S_ISLNK(mode) ? ((mode | 0777) << 16) :
(mode & 0111) ? ((mode) << 16) : 0;
@@ -343,21 +337,16 @@
if (S_ISREG(mode) && args->compression_level != 0 && size > 0)
method = ZIP_METHOD_DEFLATE;
- if (S_ISREG(mode) && type == OBJ_BLOB && !args->convert &&
- size > big_file_threshold) {
+ 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,
@@ -511,7 +500,6 @@
}
free(deflated);
- free(buffer);
if (compressed_size > 0xffffffff || size > 0xffffffff ||
offset > 0xffffffff) {
diff --git a/archive.c b/archive.c
index a8da0fc..5919d9e 100644
--- a/archive.c
+++ b/archive.c
@@ -70,13 +70,20 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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,16 +486,55 @@
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;
}
-#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) \
- OPT_SET_INT_F(s, NULL, v, "", p, PARSE_OPT_NONEG | PARSE_OPT_HIDDEN)
+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;
+}
+
+static int number_callback(const struct option *opt, const char *arg, int unset)
+{
+ BUG_ON_OPT_NEG(unset);
+ *(int *)opt->value = strtol(arg, NULL, 10);
+ return 0;
+}
static int parse_archive_args(int argc, const char **argv,
const struct archiver **ar, struct archiver_args *args,
@@ -457,21 +555,16 @@
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,
N_("read .gitattributes in working directory")),
OPT__VERBOSE(&verbose, N_("report archived files on stderr")),
- OPT__COMPR('0', &compression_level, N_("store only"), 0),
- OPT__COMPR('1', &compression_level, N_("compress faster"), 1),
- OPT__COMPR_HIDDEN('2', &compression_level, 2),
- OPT__COMPR_HIDDEN('3', &compression_level, 3),
- OPT__COMPR_HIDDEN('4', &compression_level, 4),
- OPT__COMPR_HIDDEN('5', &compression_level, 5),
- OPT__COMPR_HIDDEN('6', &compression_level, 6),
- OPT__COMPR_HIDDEN('7', &compression_level, 7),
- OPT__COMPR_HIDDEN('8', &compression_level, 8),
- OPT__COMPR('9', &compression_level, N_("compress better"), 9),
+ OPT_NUMBER_CALLBACK(&compression_level,
+ N_("set compression level"), number_callback),
OPT_GROUP(""),
OPT_BOOL('l', "list", &list,
N_("list supported archive formats")),
@@ -491,6 +584,8 @@
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 = "";
@@ -516,7 +611,9 @@
args->compression_level = Z_DEFAULT_COMPRESSION;
if (compression_level != -1) {
- if ((*ar)->flags & ARCHIVER_WANT_COMPRESSION_LEVELS)
+ int levels_ok = (*ar)->flags & ARCHIVER_WANT_COMPRESSION_LEVELS;
+ int high_ok = (*ar)->flags & ARCHIVER_HIGH_COMPRESSION_LEVELS;
+ if (levels_ok && (compression_level <= 9 || high_ok))
args->compression_level = compression_level;
else {
die(_("Argument not supported for format '%s': -%d"),
@@ -537,11 +634,14 @@
{
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 +655,12 @@
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);
+ free(args.refname);
+
+ return rc;
}
static int match_extension(const char *filename, const char *ext)
diff --git a/archive.h b/archive.h
index e60e3dd..33551b7 100644
--- a/archive.h
+++ b/archive.h
@@ -8,6 +8,8 @@
struct archiver_args {
struct repository *repo;
+ char *refname;
+ const char *prefix;
const char *base;
size_t baselen;
struct tree *tree;
@@ -19,6 +21,7 @@
unsigned int worktree_attributes : 1;
unsigned int convert : 1;
int compression_level;
+ struct string_list extra_files;
};
/* main api */
@@ -33,6 +36,7 @@
#define ARCHIVER_WANT_COMPRESSION_LEVELS 1
#define ARCHIVER_REMOTE 2
+#define ARCHIVER_HIGH_COMPRESSION_LEVELS 4
struct archiver {
const char *name;
int (*write_archive)(const struct archiver *, struct archiver_args *);
@@ -48,12 +52,9 @@
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/argv-array.c b/argv-array.c
deleted file mode 100644
index 61ef8c0..0000000
--- a/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/argv-array.h b/argv-array.h
deleted file mode 100644
index a7d3b10..0000000
--- a/argv-array.h
+++ /dev/null
@@ -1,89 +0,0 @@
-#ifndef ARGV_ARRAY_H
-#define ARGV_ARRAY_H
-
-/**
- * The argv-array API allows one to dynamically build and store
- * NULL-terminated lists. An argv-array maintains the invariant that the
- * `argv` member always points to a non-NULL array, and that the array is
- * always NULL-terminated at the element pointed to by `argv[argc]`. This
- * makes the result suitable for passing to functions expecting to receive
- * argv from main().
- *
- * The string-list API (documented in string-list.h) is similar, but cannot be
- * used for these purposes; instead of storing a straight string pointer,
- * it contains an item structure with a `util` field that is not compatible
- * with the traditional argv interface.
- *
- * Each `argv_array` manages its own memory. Any strings pushed into the
- * array are duplicated, and all memory is freed by argv_array_clear().
- */
-
-extern const char *empty_argv[];
-
-/**
- * A single array. This should be initialized by assignment from
- * `ARGV_ARRAY_INIT`, or by calling `argv_array_init`. The `argv`
- * member contains the actual array; the `argc` member contains the
- * number of elements in the array, not including the terminating
- * NULL.
- */
-struct argv_array {
- const char **argv;
- int argc;
- int alloc;
-};
-
-#define ARGV_ARRAY_INIT { empty_argv, 0, 0 }
-
-/**
- * Initialize an array. This is no different than assigning from
- * `ARGV_ARRAY_INIT`.
- */
-void argv_array_init(struct argv_array *);
-
-/* Push a copy of a string onto the end of the array. */
-const char *argv_array_push(struct argv_array *, const char *);
-
-/**
- * Format a string and push it onto the end of the array. This is a
- * convenience wrapper combining `strbuf_addf` and `argv_array_push`.
- */
-__attribute__((format (printf,2,3)))
-const char *argv_array_pushf(struct argv_array *, const char *fmt, ...);
-
-/**
- * Push a list of strings onto the end of the array. The arguments
- * should be a list of `const char *` strings, terminated by a NULL
- * argument.
- */
-LAST_ARG_MUST_BE_NULL
-void argv_array_pushl(struct argv_array *, ...);
-
-/* Push a null-terminated array of strings onto the end of the array. */
-void argv_array_pushv(struct argv_array *, const char **);
-
-/**
- * Remove the final element from the array. If there are no
- * elements in the array, do nothing.
- */
-void argv_array_pop(struct argv_array *);
-
-/* Splits by whitespace; does not handle quoted arguments! */
-void argv_array_split(struct argv_array *, const char *);
-
-/**
- * Free all memory associated with the array and return it to the
- * initial, empty state.
- */
-void argv_array_clear(struct argv_array *);
-
-/**
- * Disconnect the `argv` member from the `argv_array` struct and
- * return it. The caller is responsible for freeing the memory used
- * by the array, and by the strings it references. After detaching,
- * the `argv_array` is in a reinitialized state and can be pushed
- * into again.
- */
-const char **argv_array_detach(struct argv_array *);
-
-#endif /* ARGV_ARRAY_H */
diff --git a/attr.c b/attr.c
index a826b2e..59a8d8a 100644
--- a/attr.c
+++ b/attr.c
@@ -52,13 +52,6 @@
pthread_mutex_unlock(&map->mutex);
}
-/*
- * The global dictionary of all interned attributes. This
- * is a singleton object which is shared between threads.
- * Access to this dictionary must be surrounded with a mutex.
- */
-static struct attr_hashmap g_attr_hashmap;
-
/* The container for objects stored in "struct attr_hashmap" */
struct attr_hash_entry {
struct hashmap_entry ent;
@@ -80,11 +73,14 @@
return (a->keylen != b->keylen) || strncmp(a->key, b->key, a->keylen);
}
-/* Initialize an 'attr_hashmap' object */
-static void attr_hashmap_init(struct attr_hashmap *map)
-{
- hashmap_init(&map->map, attr_hash_entry_cmp, NULL, 0);
-}
+/*
+ * The global dictionary of all interned attributes. This
+ * is a singleton object which is shared between threads.
+ * Access to this dictionary must be surrounded with a mutex.
+ */
+static struct attr_hashmap g_attr_hashmap = {
+ HASHMAP_INIT(attr_hash_entry_cmp, NULL)
+};
/*
* Retrieve the 'value' stored in a hashmap given the provided 'key'.
@@ -96,9 +92,6 @@
struct attr_hash_entry k;
struct attr_hash_entry *e;
- if (!map->map.tablesize)
- attr_hashmap_init(map);
-
hashmap_entry_init(&k.ent, memhash(key, keylen));
k.key = key;
k.keylen = keylen;
@@ -114,9 +107,6 @@
{
struct attr_hash_entry *e;
- if (!map->map.tablesize)
- attr_hashmap_init(map);
-
e = xmalloc(sizeof(struct attr_hash_entry));
hashmap_entry_init(&e->ent, memhash(key, keylen));
e->key = key;
@@ -579,7 +569,7 @@
check = attr_check_alloc();
check->nr = cnt;
check->alloc = cnt;
- check->items = xcalloc(cnt, sizeof(struct attr_check_item));
+ CALLOC_ARRAY(check->items, cnt);
check->items[0].attr = git_attr(one);
va_start(params, one);
@@ -680,7 +670,7 @@
const char *line;
int lineno = 0;
- res = xcalloc(1, sizeof(*res));
+ CALLOC_ARRAY(res, 1);
while ((line = *(list++)) != NULL)
handle_attr_line(res, line, "[builtin]", ++lineno, 1);
return res;
@@ -717,7 +707,7 @@
if (!fp)
return NULL;
- res = xcalloc(1, sizeof(*res));
+ CALLOC_ARRAY(res, 1);
while (fgets(buf, sizeof(buf), fp)) {
char *bufp = buf;
if (!lineno)
@@ -743,7 +733,7 @@
if (!buf)
return NULL;
- res = xcalloc(1, sizeof(*res));
+ CALLOC_ARRAY(res, 1);
for (sp = buf; *sp; ) {
char *ep;
int more;
@@ -784,7 +774,7 @@
}
if (!res)
- res = xcalloc(1, sizeof(*res));
+ CALLOC_ARRAY(res, 1);
return res;
}
@@ -884,7 +874,7 @@
else
e = NULL;
if (!e)
- e = xcalloc(1, sizeof(struct attr_stack));
+ CALLOC_ARRAY(e, 1);
push_stack(stack, e, NULL, 0);
}
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
deleted file mode 100644
index 675c3a4..0000000
--- a/azure-pipelines.yml
+++ /dev/null
@@ -1,558 +0,0 @@
-variables:
- Agent.Source.Git.ShallowFetchDepth: 1
-
-jobs:
-- job: windows_build
- displayName: Windows Build
- condition: succeeded()
- pool:
- vmImage: windows-latest
- timeoutInMinutes: 240
- steps:
- - powershell: |
- if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") {
- net use s: \\gitfileshare.file.core.windows.net\test-cache "$GITFILESHAREPWD" /user:AZURE\gitfileshare /persistent:no
- cmd /c mklink /d "$(Build.SourcesDirectory)\test-cache" S:\
- }
- displayName: 'Mount test-cache'
- env:
- GITFILESHAREPWD: $(gitfileshare.pwd)
- - powershell: |
- $urlbase = "https://dev.azure.com/git-for-windows/git/_apis/build/builds"
- $id = ((Invoke-WebRequest -UseBasicParsing "${urlbase}?definitions=22&statusFilter=completed&resultFilter=succeeded&`$top=1").content | ConvertFrom-JSON).value[0].id
- $downloadUrl = ((Invoke-WebRequest -UseBasicParsing "${urlbase}/$id/artifacts").content | ConvertFrom-JSON).value[1].resource.downloadUrl
- (New-Object Net.WebClient).DownloadFile($downloadUrl,"git-sdk-64-minimal.zip")
- Expand-Archive git-sdk-64-minimal.zip -DestinationPath . -Force
- Remove-Item git-sdk-64-minimal.zip
-
- # Let Git ignore the SDK and the test-cache
- "/git-sdk-64-minimal/`n/test-cache/`n" | Out-File -NoNewLine -Encoding ascii -Append "$(Build.SourcesDirectory)\.git\info\exclude"
- displayName: 'Download git-sdk-64-minimal'
- - powershell: |
- & git-sdk-64-minimal\usr\bin\bash.exe -lc @"
- 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:
- vmImage: windows-latest
- timeoutInMinutes: 240
- strategy:
- parallel: 10
- steps:
- - powershell: |
- if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") {
- net use s: \\gitfileshare.file.core.windows.net\test-cache "$GITFILESHAREPWD" /user:AZURE\gitfileshare /persistent:no
- cmd /c mklink /d "$(Build.SourcesDirectory)\test-cache" S:\
- }
- displayName: 'Mount test-cache'
- env:
- GITFILESHAREPWD: $(gitfileshare.pwd)
- - task: DownloadPipelineArtifact@0
- displayName: 'Download Pipeline Artifact: 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: vs_build
- displayName: Visual Studio Build
- condition: succeeded()
- pool:
- vmImage: windows-latest
- timeoutInMinutes: 240
- steps:
- - powershell: |
- if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") {
- net use s: \\gitfileshare.file.core.windows.net\test-cache "$GITFILESHAREPWD" /user:AZURE\gitfileshare /persistent:no
- cmd /c mklink /d "$(Build.SourcesDirectory)\test-cache" S:\
- }
- displayName: 'Mount test-cache'
- env:
- GITFILESHAREPWD: $(gitfileshare.pwd)
- - powershell: |
- $urlbase = "https://dev.azure.com/git-for-windows/git/_apis/build/builds"
- $id = ((Invoke-WebRequest -UseBasicParsing "${urlbase}?definitions=22&statusFilter=completed&resultFilter=succeeded&`$top=1").content | ConvertFrom-JSON).value[0].id
- $downloadUrl = ((Invoke-WebRequest -UseBasicParsing "${urlbase}/$id/artifacts").content | ConvertFrom-JSON).value[1].resource.downloadUrl
- (New-Object Net.WebClient).DownloadFile($downloadUrl,"git-sdk-64-minimal.zip")
- Expand-Archive git-sdk-64-minimal.zip -DestinationPath . -Force
- Remove-Item git-sdk-64-minimal.zip
-
- # Let Git ignore the SDK and the test-cache
- "/git-sdk-64-minimal/`n/test-cache/`n" | Out-File -NoNewLine -Encoding ascii -Append "$(Build.SourcesDirectory)\.git\info\exclude"
- displayName: 'Download git-sdk-64-minimal'
- - powershell: |
- & git-sdk-64-minimal\usr\bin\bash.exe -lc @"
- make NDEBUG=1 DEVELOPER=1 vcxproj
- "@
- if (!$?) { exit(1) }
- displayName: Generate Visual Studio Solution
- env:
- HOME: $(Build.SourcesDirectory)
- MSYSTEM: MINGW64
- DEVELOPER: 1
- NO_PERL: 1
- GIT_CONFIG_PARAMETERS: "'user.name=CI' 'user.email=ci@git'"
- - powershell: |
- $urlbase = "https://dev.azure.com/git/git/_apis/build/builds"
- $id = ((Invoke-WebRequest -UseBasicParsing "${urlbase}?definitions=9&statusFilter=completed&resultFilter=succeeded&`$top=1").content | ConvertFrom-JSON).value[0].id
- $downloadUrl = ((Invoke-WebRequest -UseBasicParsing "${urlbase}/$id/artifacts").content | ConvertFrom-JSON).value[0].resource.downloadUrl
- (New-Object Net.WebClient).DownloadFile($downloadUrl, "compat.zip")
- Expand-Archive compat.zip -DestinationPath . -Force
- Remove-Item compat.zip
- displayName: 'Download vcpkg artifacts'
- - task: MSBuild@1
- inputs:
- solution: git.sln
- platform: x64
- configuration: Release
- maximumCpuCount: 4
- msbuildArguments: /p:PlatformToolset=v142
- - powershell: |
- & compat\vcbuild\vcpkg_copy_dlls.bat release
- if (!$?) { exit(1) }
- & git-sdk-64-minimal\usr\bin\bash.exe -lc @"
- mkdir -p artifacts &&
- eval \"`$(make -n artifacts-tar INCLUDE_DLLS_IN_ARTIFACTS=YesPlease ARTIFACTS_DIRECTORY=artifacts | grep ^tar)\"
- "@
- if (!$?) { exit(1) }
- displayName: Bundle artifact tar
- env:
- HOME: $(Build.SourcesDirectory)
- MSYSTEM: MINGW64
- DEVELOPER: 1
- NO_PERL: 1
- MSVC: 1
- VCPKG_ROOT: $(Build.SourcesDirectory)\compat\vcbuild\vcpkg
- - powershell: |
- $tag = (Invoke-WebRequest -UseBasicParsing "https://gitforwindows.org/latest-tag.txt").content
- $version = (Invoke-WebRequest -UseBasicParsing "https://gitforwindows.org/latest-version.txt").content
- $url = "https://github.com/git-for-windows/git/releases/download/${tag}/PortableGit-${version}-64-bit.7z.exe"
- (New-Object Net.WebClient).DownloadFile($url,"PortableGit.exe")
- & .\PortableGit.exe -y -oartifacts\PortableGit
- # Wait until it is unpacked
- while (-not @(Remove-Item -ErrorAction SilentlyContinue PortableGit.exe; $?)) { sleep 1 }
- displayName: Download & extract portable Git
- - task: PublishPipelineArtifact@0
- displayName: 'Publish Pipeline Artifact: MSVC test artifacts'
- inputs:
- artifactName: 'vs-artifacts'
- targetPath: '$(Build.SourcesDirectory)\artifacts'
- - powershell: |
- if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") {
- cmd /c rmdir "$(Build.SourcesDirectory)\test-cache"
- }
- displayName: 'Unmount test-cache'
- condition: true
- env:
- GITFILESHAREPWD: $(gitfileshare.pwd)
-
-- job: vs_test
- displayName: Visual Studio Test
- dependsOn: vs_build
- condition: succeeded()
- pool:
- vmImage: windows-latest
- timeoutInMinutes: 240
- strategy:
- parallel: 10
- steps:
- - powershell: |
- if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") {
- net use s: \\gitfileshare.file.core.windows.net\test-cache "$GITFILESHAREPWD" /user:AZURE\gitfileshare /persistent:no
- cmd /c mklink /d "$(Build.SourcesDirectory)\test-cache" S:\
- }
- displayName: 'Mount test-cache'
- env:
- GITFILESHAREPWD: $(gitfileshare.pwd)
- - task: DownloadPipelineArtifact@0
- displayName: 'Download Pipeline Artifact: VS test artifacts'
- inputs:
- artifactName: 'vs-artifacts'
- targetPath: '$(Build.SourcesDirectory)'
- - powershell: |
- & PortableGit\git-cmd.exe --command=usr\bin\bash.exe -lc @"
- test -f artifacts.tar.gz || {
- echo No test artifacts found\; skipping >&2
- exit 0
- }
- tar xf artifacts.tar.gz || exit 1
-
- # Let Git ignore the SDK and the test-cache
- printf '%s\n' /PortableGit/ /test-cache/ >>.git/info/exclude
-
- cd t &&
- PATH=\"`$PWD/helper:`$PATH\" &&
- test-tool.exe run-command testsuite --jobs=10 -V -x --write-junit-xml \
- `$(test-tool.exe path-utils slice-tests \
- `$SYSTEM_JOBPOSITIONINPHASE `$SYSTEM_TOTALJOBSINPHASE t[0-9]*.sh)
- "@
- if (!$?) { exit(1) }
- displayName: 'Test (parallel)'
- env:
- HOME: $(Build.SourcesDirectory)
- MSYSTEM: MINGW64
- NO_SVN_TESTS: 1
- GIT_TEST_SKIP_REBASE_P: 1
- - powershell: |
- if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") {
- cmd /c rmdir "$(Build.SourcesDirectory)\test-cache"
- }
- displayName: 'Unmount test-cache'
- condition: true
- env:
- GITFILESHAREPWD: $(gitfileshare.pwd)
- - task: PublishTestResults@2
- displayName: 'Publish Test Results **/TEST-*.xml'
- inputs:
- mergeTestResults: true
- testRunTitle: 'vs'
- platform: Windows
- publishRunAttachments: false
- condition: succeededOrFailed()
- - task: PublishBuildArtifacts@1
- displayName: 'Publish trash directories of failed tests'
- condition: failed()
- inputs:
- PathtoPublish: t/failed-test-artifacts
- ArtifactName: failed-vs-test-artifacts
-
-- job: linux_clang
- displayName: linux-clang
- condition: succeeded()
- pool:
- vmImage: ubuntu-latest
- 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:
- vmImage: ubuntu-latest
- 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:
- vmImage: macOS-latest
- 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:
- vmImage: macOS-latest
- 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:
- vmImage: ubuntu-latest
- 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:
- vmImage: ubuntu-latest
- 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:
- vmImage: ubuntu-latest
- steps:
- - bash: |
- test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1
-
- sudo apt-get update &&
- sudo apt-get install -y coccinelle libcurl4-openssl-dev libssl-dev libexpat-dev gettext &&
-
- 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:
- vmImage: ubuntu-latest
- steps:
- - bash: |
- test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1
-
- sudo apt-get update &&
- sudo apt-get install -y asciidoc xmlto asciidoctor docbook-xsl-ns &&
-
- 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/banned.h b/banned.h
index 60a18d4..7ab4f2e 100644
--- a/banned.h
+++ b/banned.h
@@ -29,4 +29,17 @@
#define vsprintf(buf,fmt,arg) BANNED(vsprintf)
#endif
+#undef gmtime
+#define gmtime(t) BANNED(gmtime)
+#undef localtime
+#define localtime(t) BANNED(localtime)
+#undef ctime
+#define ctime(t) BANNED(ctime)
+#undef ctime_r
+#define ctime_r(t, buf) BANNED(ctime_r)
+#undef asctime
+#define asctime(t) BANNED(asctime)
+#undef asctime_r
+#define asctime_r(t, buf) BANNED(asctime_r)
+
#endif /* BANNED_H */
diff --git a/bisect.c b/bisect.c
index 9154f81..af2863d 100644
--- a/bisect.c
+++ b/bisect.c
@@ -6,15 +6,16 @@
#include "refs.h"
#include "list-objects.h"
#include "quote.h"
-#include "sha1-lookup.h"
+#include "hash-lookup.h"
#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,21 +89,24 @@
**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;
}
-static inline int halfway(struct commit_list *p, int nr)
+static inline int approx_halfway(struct commit_list *p, int nr)
{
+ int diff;
+
/*
* Don't short-cut something we are not going to return!
*/
@@ -111,13 +115,22 @@
if (DEBUG_BISECT)
return 0;
/*
- * 2 and 3 are halfway of 5.
+ * For small number of commits 2 and 3 are halfway of 5, and
* 3 is halfway of 6 but 2 and 4 are not.
*/
- switch (2 * weight(p) - nr) {
+ diff = 2 * weight(p) - nr;
+ switch (diff) {
case -1: case 0: case 1:
return 1;
default:
+ /*
+ * For large number of commits we are not so strict, it's
+ * good enough if it's within ~0.1% of the halfway point,
+ * e.g. 5000 is exactly halfway of 10000, but we consider
+ * the values [4996, 5004] as halfway as well.
+ */
+ if (abs(diff) < nr / 1024)
+ return 1;
return 0;
}
}
@@ -135,7 +148,7 @@
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 +157,9 @@
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 +184,9 @@
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 +225,9 @@
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 +272,7 @@
*/
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 +281,12 @@
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 +327,14 @@
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))
+ /* Does it happen to be at half-way? */
+ if (!(bisect_flags & FIND_BISECTION_ALL) &&
+ approx_halfway(p, nr))
return p;
counted++;
}
@@ -328,11 +344,14 @@
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 +365,7 @@
* 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",
@@ -355,22 +374,23 @@
else
weight_set(p, weight(q));
- /* Does it happen to be at exactly half-way? */
- if (!find_all && halfway(p, nr))
+ /* Does it happen to be at half-way? */
+ if (!(bisect_flags & FIND_BISECTION_ALL) &&
+ approx_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 +406,16 @@
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++;
}
@@ -403,12 +423,12 @@
show_list("bisection 2 sorted", 0, nr, list);
*all = nr;
- weights = xcalloc(on_list, sizeof(*weights));
+ CALLOC_ARRAY(weights, on_list);
/* 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 +474,10 @@
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 +485,7 @@
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 +494,7 @@
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;
@@ -632,7 +653,7 @@
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 +661,16 @@
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 */
}
@@ -709,7 +730,7 @@
char bisect_rev_hex[GIT_MAX_HEXSZ + 1];
enum bisect_error res = BISECT_OK;
- memcpy(bisect_rev_hex, oid_to_hex(bisect_rev), the_hash_algo->hexsz + 1);
+ 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;
@@ -765,7 +786,7 @@
{
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 "
@@ -796,7 +817,7 @@
{
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"
@@ -980,10 +1001,13 @@
* the bisection process finished successfully.
* In this case the calling function or command should not turn a
* BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND return code into an error or a non zero exit code.
- * 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.
*/
-enum bisect_error 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;
@@ -991,21 +1015,35 @@
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"));
+ 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) {
@@ -1026,7 +1064,7 @@
if (!all) {
fprintf(stderr, _("No testable commit found.\n"
- "Maybe you started with bad path parameters?\n"));
+ "Maybe you started with bad path arguments?\n"));
return BISECT_NO_TESTABLE_COMMIT;
}
@@ -1064,6 +1102,8 @@
"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. */
+ repo_clear_commit_marks(r, ALL_REV_FLAGS);
return bisect_checkout(bisect_rev, no_checkout);
}
@@ -1133,6 +1173,7 @@
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/bisect.h b/bisect.h
index 8bad8d8..ec24ac2 100644
--- a/bisect.h
+++ b/bisect.h
@@ -12,7 +12,7 @@
* 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 @@
#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;
@@ -58,9 +61,7 @@
BISECT_INTERNAL_SUCCESS_MERGE_BASE = -11
};
-enum bisect_error bisect_next_all(struct repository *r,
- const char *prefix,
- int no_checkout);
+enum bisect_error bisect_next_all(struct repository *r, const char *prefix);
int estimate_bisect_steps(int all);
diff --git a/blame.c b/blame.c
index 29770e5..5018bb8 100644
--- a/blame.c
+++ b/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;
@@ -433,7 +435,7 @@
static void free_fingerprint(struct fingerprint *f)
{
- hashmap_free(&f->map);
+ hashmap_clear(&f->map);
free(f->entries);
}
@@ -949,13 +951,13 @@
max_search_distance_b = ((2 * max_search_distance_a + 1) * length_b
- 1) / length_a;
- result = xcalloc(sizeof(int), length_b);
- second_best_result = xcalloc(sizeof(int), length_b);
- certainties = xcalloc(sizeof(int), length_b);
+ CALLOC_ARRAY(result, length_b);
+ CALLOC_ARRAY(second_best_result, length_b);
+ CALLOC_ARRAY(certainties, length_b);
/* See get_similarity() for details of similarities. */
similarity_count = length_b * (max_search_distance_a * 2 + 1);
- similarities = xcalloc(sizeof(int), similarity_count);
+ CALLOC_ARRAY(similarities, similarity_count);
for (i = 0; i < length_b; ++i) {
result[i] = -1;
@@ -993,7 +995,7 @@
return;
o->num_lines = find_line_starts(&line_starts, o->file.ptr,
o->file.size);
- o->fingerprints = xcalloc(sizeof(struct fingerprint), o->num_lines);
+ CALLOC_ARRAY(o->fingerprints, o->num_lines);
get_line_fingerprints(o->fingerprints, o->file.ptr, line_starts,
0, o->num_lines);
free(line_starts);
@@ -1182,6 +1184,7 @@
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;
@@ -1246,13 +1249,74 @@
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;
@@ -1286,10 +1350,18 @@
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) {
@@ -1341,7 +1413,8 @@
*/
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;
@@ -1366,6 +1439,7 @@
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;
@@ -1779,8 +1853,7 @@
diffp = NULL;
if (ignore_diffs && same - tlno > 0) {
- line_blames = xcalloc(sizeof(struct blame_line_tracker),
- same - tlno);
+ CALLOC_ARRAY(line_blames, same - tlno);
guess_line_blames(parent, target, tlno, offset, same,
parent_len, line_blames);
}
@@ -2142,7 +2215,7 @@
for (e = unblamed, num_ents = 0; e; e = e->next)
num_ents++;
if (num_ents) {
- blame_list = xcalloc(num_ents, sizeof(struct blame_list));
+ CALLOC_ARRAY(blame_list, num_ents);
for (e = unblamed, i = 0; e; e = e->next)
blame_list[i++].ent = e;
}
@@ -2332,6 +2405,11 @@
#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;
@@ -2349,15 +2427,14 @@
else if (num_sg < ARRAY_SIZE(sg_buf))
memset(sg_buf, 0, sizeof(sg_buf));
else
- sg_origin = xcalloc(num_sg, sizeof(*sg_origin));
+ CALLOC_ARRAY(sg_origin, num_sg);
/*
* The first pass looks for unrenamed path to optimize for
* 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;
@@ -2369,7 +2446,7 @@
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)) {
@@ -2592,7 +2669,7 @@
if (obj->flags & UNINTERESTING)
continue;
obj = deref_tag(revs->repo, obj, NULL, 0);
- if (obj->type != OBJ_COMMIT)
+ if (!obj || obj->type != OBJ_COMMIT)
die("Non commit %s?", revs->pending.objects[i].name);
if (found)
die("More than one commit to dig from %s and %s?",
@@ -2623,7 +2700,7 @@
/* Is that sole rev a committish? */
obj = revs->pending.objects[0].item;
obj = deref_tag(revs->repo, obj, NULL, 0);
- if (obj->type != OBJ_COMMIT)
+ if (!obj || obj->type != OBJ_COMMIT)
return NULL;
/* Do we have HEAD? */
@@ -2659,7 +2736,7 @@
if (!(obj->flags & UNINTERESTING))
continue;
obj = deref_tag(revs->repo, obj, NULL, 0);
- if (obj->type != OBJ_COMMIT)
+ if (!obj || obj->type != OBJ_COMMIT)
die("Non commit %s?", revs->pending.objects[i].name);
if (found)
die("More than one commit to dig up from, %s and %s?",
@@ -2686,7 +2763,6 @@
}
void setup_scoreboard(struct blame_scoreboard *sb,
- const char *path,
struct blame_origin **orig)
{
const char *final_commit_name = NULL;
@@ -2725,7 +2801,7 @@
setup_work_tree();
sb->final = fake_working_tree_commit(sb->repo,
&sb->revs->diffopt,
- path, sb->contents_from);
+ sb->path, sb->contents_from);
add_pending_object(sb->revs, &(sb->final->object), ":");
}
@@ -2768,12 +2844,12 @@
sb->final_buf_size = o->file.size;
}
else {
- o = get_origin(sb->final, path);
+ o = get_origin(sb->final, sb->path);
if (fill_blob_sha1_and_mode(sb->repo, o))
- die(_("no such path %s in %s"), path, final_commit_name);
+ die(_("no such path %s in %s"), sb->path, final_commit_name);
if (sb->revs->diffopt.flags.allow_textconv &&
- textconv_object(sb->repo, path, o->mode, &o->blob_oid, 1, (char **) &sb->final_buf,
+ textconv_object(sb->repo, sb->path, o->mode, &o->blob_oid, 1, (char **) &sb->final_buf,
&sb->final_buf_size))
;
else
@@ -2783,7 +2859,7 @@
if (!sb->final_buf)
die(_("cannot read blob %s for path %s"),
oid_to_hex(&o->blob_oid),
- path);
+ sb->path);
}
sb->num_read_blob++;
prepare_lines(sb);
@@ -2809,3 +2885,46 @@
blame_origin_incref(o);
return new_head;
}
+
+void setup_blame_bloom_data(struct blame_scoreboard *sb)
+{
+ 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, sb->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/blame.h b/blame.h
index 089b181..38bde53 100644
--- a/blame.h
+++ b/blame.h
@@ -100,6 +100,8 @@
int unblamable;
};
+struct blame_bloom_data;
+
/*
* The current state of the blame assignment.
*/
@@ -156,6 +158,7 @@
void(*found_guilty_entry)(struct blame_entry *, void *);
void *found_guilty_entry_data;
+ struct blame_bloom_data *bloom_data;
};
/*
@@ -178,8 +181,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);
+void cleanup_scoreboard(struct blame_scoreboard *sb);
struct blame_entry *blame_entry_prepend(struct blame_entry *head,
long start, long end,
diff --git a/blob.c b/blob.c
index 36f9abd..182718a 100644
--- a/blob.c
+++ b/blob.c
@@ -10,7 +10,7 @@
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/block-sha1/sha1.c b/block-sha1/sha1.c
index 22b125c..1bb6e7c 100644
--- a/block-sha1/sha1.c
+++ b/block-sha1/sha1.c
@@ -70,7 +70,7 @@
* the input data, the next mix it from the 512-bit array.
*/
#define SHA_SRC(t) get_be32((unsigned char *) block + (t)*4)
-#define SHA_MIX(t) SHA_ROL(W((t)+13) ^ W((t)+8) ^ W((t)+2) ^ W(t), 1);
+#define SHA_MIX(t) SHA_ROL(W((t)+13) ^ W((t)+8) ^ W((t)+2) ^ W(t), 1)
#define SHA_ROUND(t, input, fn, constant, A, B, C, D, E) do { \
unsigned int TEMP = input(t); setW(t, TEMP); \
@@ -203,7 +203,7 @@
ctx->H[4] = 0xc3d2e1f0;
}
-void blk_SHA1_Update(blk_SHA_CTX *ctx, const void *data, unsigned long len)
+void blk_SHA1_Update(blk_SHA_CTX *ctx, const void *data, size_t len)
{
unsigned int lenW = ctx->size & 63;
diff --git a/block-sha1/sha1.h b/block-sha1/sha1.h
index 4df6747..9fb0441 100644
--- a/block-sha1/sha1.h
+++ b/block-sha1/sha1.h
@@ -13,7 +13,7 @@
} blk_SHA_CTX;
void blk_SHA1_Init(blk_SHA_CTX *ctx);
-void blk_SHA1_Update(blk_SHA_CTX *ctx, const void *dataIn, unsigned long len);
+void blk_SHA1_Update(blk_SHA_CTX *ctx, const void *dataIn, size_t len);
void blk_SHA1_Final(unsigned char hashout[20], blk_SHA_CTX *ctx);
#define platform_SHA_CTX blk_SHA_CTX
diff --git a/bloom.c b/bloom.c
new file mode 100644
index 0000000..52b8747
--- /dev/null
+++ b/bloom.c
@@ -0,0 +1,326 @@
+#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 = HASHMAP_INIT(pathmap_cmp, NULL);
+ struct pathmap_hash_entry *e;
+ struct hashmap_iter iter;
+
+ 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;
+ }
+ CALLOC_ARRAY(filter->data, filter->len);
+
+ 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_clear_and_free(&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/bloom.h b/bloom.h
new file mode 100644
index 0000000..adde6df
--- /dev/null
+++ b/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/branch.c b/branch.c
index 5794947..9c9dae1 100644
--- a/branch.c
+++ b/branch.c
@@ -281,7 +281,7 @@
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 @@
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 @@
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/builtin.h b/builtin.h
index 2b25a80..b6ce981 100644
--- a/builtin.h
+++ b/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_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_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,10 +150,12 @@
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);
int cmd_for_each_ref(int argc, const char **argv, const char *prefix);
+int cmd_for_each_repo(int argc, const char **argv, const char *prefix);
int cmd_format_patch(int argc, const char **argv, const char *prefix);
int cmd_fsck(int argc, const char **argv, const char *prefix);
int cmd_gc(int argc, const char **argv, const char *prefix);
@@ -183,6 +173,7 @@
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);
diff --git a/builtin/add.c b/builtin/add.c
index 18a0881..ea762a4 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -18,7 +18,7 @@
#include "diffcore.h"
#include "revision.h"
#include "bulk-checkin.h"
-#include "argv-array.h"
+#include "strvec.h"
#include "submodule.h"
#include "add-interactive.h"
@@ -38,19 +38,27 @@
int add_errors;
};
-static void chmod_pathspec(struct pathspec *pathspec, char flip)
+static int chmod_pathspec(struct pathspec *pathspec, char flip, int show_only)
{
- int i;
+ int i, ret = 0;
for (i = 0; i < active_nr; i++) {
struct cache_entry *ce = active_cache[i];
+ int err;
if (pathspec && !ce_path_match(&the_index, ce, pathspec, NULL))
continue;
- if (chmod_cache_entry(ce, flip) < 0)
- fprintf(stderr, "cannot chmod %cx '%s'\n", flip, ce->name);
+ if (!show_only)
+ err = chmod_cache_entry(ce, flip);
+ else
+ err = S_ISREG(ce->ce_mode) ? 0 : -1;
+
+ if (err < 0)
+ ret = error(_("cannot chmod %cx '%s'"), flip, ce->name);
}
+
+ return ret;
}
static int fix_unmerged_status(struct diff_filepair *p,
@@ -188,13 +196,19 @@
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)
- git_config_get_bool("add.interactive.usebuiltin",
- &use_builtin_add_i);
+ 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;
@@ -218,22 +232,22 @@
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;
@@ -330,10 +344,10 @@
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")),
@@ -445,7 +459,7 @@
if (add_interactive) {
if (pathspec_from_file)
die(_("--pathspec-from-file is incompatible with --interactive/--patch"));
- exit(interactive_add(argc - 1, argv + 1, prefix, patch_interactive));
+ exit(interactive_add(argv + 1, prefix, patch_interactive));
}
if (legacy_stash_p) {
struct pathspec pathspec;
@@ -534,11 +548,11 @@
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);
@@ -603,7 +617,7 @@
exit_status |= add_files(&dir, flags);
if (chmod_arg && pathspec.nr)
- chmod_pathspec(&pathspec, chmod_arg[0]);
+ exit_status |= chmod_pathspec(&pathspec, chmod_arg[0], show_only);
unplug_bulk_checkin();
finish:
@@ -611,7 +625,7 @@
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/builtin/am.c b/builtin/am.c
index e3dfd93..8355e35 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -116,7 +116,7 @@
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;
@@ -146,7 +146,7 @@
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;
@@ -162,7 +162,7 @@
free(state->author_email);
free(state->author_date);
free(state->msg);
- argv_array_clear(&state->git_apply_opts);
+ strvec_clear(&state->git_apply_opts);
}
/**
@@ -398,8 +398,8 @@
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"));
@@ -452,8 +452,8 @@
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;
@@ -651,16 +651,16 @@
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)
@@ -787,7 +787,7 @@
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;
@@ -805,16 +805,16 @@
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;
}
@@ -1002,7 +1002,7 @@
}
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)
@@ -1390,8 +1390,8 @@
*/
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;
@@ -1400,10 +1400,10 @@
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);
@@ -1426,12 +1426,12 @@
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)
@@ -1454,10 +1454,10 @@
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;
@@ -1556,7 +1556,7 @@
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))
@@ -1580,11 +1580,16 @@
IDENT_STRICT);
if (state->committer_date_is_author_date)
- setenv("GIT_COMMITTER_DATE",
- state->ignore_date ? "" : state->author_date, 1);
+ committer = fmt_ident(getenv("GIT_COMMITTER_NAME"),
+ getenv("GIT_COMMITTER_EMAIL"),
+ WANT_COMMITTER_IDENT,
+ state->ignore_date ? NULL
+ : state->author_date,
+ IDENT_STRICT);
- if (commit_tree(state->msg, state->msg_len, &tree, parents, &commit,
- author, state->sign_commit))
+ 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");
@@ -1676,7 +1681,7 @@
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);
}
}
@@ -1691,7 +1696,6 @@
*/
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"));
@@ -1796,7 +1800,7 @@
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);
}
}
@@ -2163,6 +2167,8 @@
};
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]))
@@ -2218,7 +2224,7 @@
N_("allow fall back on 3way merging if needed")),
OPT__QUIET(&state.quiet, N_("be quiet")),
OPT_SET_INT('s', "signoff", &state.signoff,
- N_("add a Signed-off-by line to the commit message"),
+ N_("add a Signed-off-by trailer to the commit message"),
SIGNOFF_EXPLICIT),
OPT_BOOL('u', "utf8", &state.utf8,
N_("recode into utf8 (default)")),
@@ -2278,10 +2284,10 @@
N_("skip the current patch"),
RESUME_SKIP),
OPT_CMDMODE(0, "abort", &resume.mode,
- N_("restore the original branch and abort the patching operation."),
+ N_("restore the original branch and abort the patching operation"),
RESUME_ABORT),
OPT_CMDMODE(0, "quit", &resume.mode,
- N_("abort the patching operation but keep HEAD where it is."),
+ N_("abort the patching operation but keep HEAD where it is"),
RESUME_QUIT),
{ OPTION_CALLBACK, 0, "show-current-patch", &resume.mode,
"(diff|raw)",
@@ -2347,7 +2353,7 @@
if (state.signoff == SIGNOFF_EXPLICIT)
am_append_signoff(&state);
} else {
- struct argv_array paths = ARGV_ARRAY_INIT;
+ struct strvec paths = STRVEC_INIT;
int i;
/*
@@ -2372,17 +2378,17 @@
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.mode) {
diff --git a/builtin/annotate.c b/builtin/annotate.c
index da413ae..58ff977 100644
--- a/builtin/annotate.c
+++ b/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/builtin/bisect--helper.c b/builtin/bisect--helper.c
index c1c40b5..1fdb7d9 100644
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -4,34 +4,40 @@
#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 --write-terms <bad_term> <good_term>"),
- N_("git bisect--helper --bisect-clean-state"),
N_("git bisect--helper --bisect-reset [<commit>]"),
- N_("git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> <bad_term>"),
- 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-state (bad|new) [<rev>]"),
+ N_("git bisect--helper --bisect-state (good|old) [<rev>...]"),
+ N_("git bisect--helper --bisect-replay <filename>"),
+ N_("git bisect--helper --bisect-skip [(<rev>|<range>)...]"),
NULL
};
+struct add_bisect_ref_data {
+ struct rev_info *revs;
+ unsigned int object_flags;
+};
+
struct bisect_terms {
char *term_good;
char *term_bad;
@@ -55,6 +61,8 @@
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
* included in the variable arguments.
@@ -74,6 +82,65 @@
return res;
}
+/*
+ * return code BISECT_INTERNAL_SUCCESS_MERGE_BASE
+ * and BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND are codes
+ * that indicate special success.
+ */
+
+static int is_bisect_success(enum bisect_error res)
+{
+ return !res ||
+ res == BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND ||
+ res == BISECT_INTERNAL_SUCCESS_MERGE_BASE;
+}
+
+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 +171,6 @@
static int write_terms(const char *bad, const char *good)
{
- FILE *fp = NULL;
int res;
if (!strcmp(bad, good))
@@ -113,39 +179,11 @@
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;
-}
-
-static int is_expected_rev(const char *expected_hex)
-{
- struct strbuf actual_hex = STRBUF_INIT;
- int res = 0;
- if (strbuf_read_file(&actual_hex, git_path_bisect_expected_rev(), 0) >= 40) {
- strbuf_trim(&actual_hex);
- res = !strcmp(actual_hex.buf, expected_hex);
- }
- strbuf_release(&actual_hex);
return res;
}
-static void check_expected_revs(const char **revs, int rev_nr)
-{
- int i;
-
- for (i = 0; i < rev_nr; i++) {
- if (!is_expected_rev(revs[i])) {
- unlink_or_warn(git_path_bisect_ancestors_ok());
- unlink_or_warn(git_path_bisect_expected_rev());
- }
- }
-}
-
static int bisect_reset(const char *commit)
{
struct strbuf branch = STRBUF_INIT;
@@ -164,19 +202,19 @@
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);
+ strvec_clear(&argv);
return -1;
}
- argv_array_clear(&argv);
+ strvec_clear(&argv);
}
strbuf_release(&branch);
@@ -421,11 +459,149 @@
return res;
}
-static int bisect_start(struct bisect_terms *terms, int no_checkout,
- const char **argv, int argc)
+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_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 enum bisect_error 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, res = 0;
+ int flags, pathspec_pos;
+ enum bisect_error res = BISECT_OK;
struct string_list revs = STRING_LIST_INIT_DUP;
struct string_list states = STRING_LIST_INIT_DUP;
struct strbuf start_head = STRBUF_INIT;
@@ -453,11 +629,16 @@
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;
@@ -465,25 +646,26 @@
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;
@@ -521,11 +703,11 @@
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)) {
+ 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>'."),
@@ -558,20 +740,16 @@
* Get rid of any old bisect state.
*/
if (bisect_clean_state())
- return -1;
-
- /*
- * In case of mistaken revs or checkout error, or signals received,
- * "bisect_auto_next" below may exit or misbehave.
- * We have to trap this to be able to clean up using
- * "bisect_clean_state".
- */
+ return BISECT_FAILED;
/*
* Write new start state
*/
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) {
res = error(_("invalid ref: '%s'"), start_head.buf);
@@ -579,7 +757,7 @@
}
if (update_ref(NULL, "BISECT_HEAD", &oid, NULL, 0,
UPDATE_REFS_MSG_ON_ERR)) {
- res = -1;
+ res = BISECT_FAILED;
goto finish;
}
}
@@ -591,66 +769,305 @@
for (i = 0; i < states.nr; i++)
if (bisect_write(states.items[i].string,
revs.items[i].string, terms, 1)) {
- res = -1;
+ res = BISECT_FAILED;
goto finish;
}
if (must_write_terms && write_terms(terms->term_bad,
terms->term_good)) {
- res = -1;
+ res = BISECT_FAILED;
goto finish;
}
res = bisect_append_log_quoted(argv);
if (res)
- res = -1;
+ res = BISECT_FAILED;
finish:
string_list_clear(&revs, 0);
string_list_clear(&states, 0);
strbuf_release(&start_head);
strbuf_release(&bisect_names);
+ if (res)
+ return res;
+
+ res = bisect_auto_next(terms, NULL);
+ if (!is_bisect_success(res))
+ bisect_clean_state();
+ 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;
+}
+
+static enum bisect_error bisect_state(struct bisect_terms *terms, const char **argv,
+ int argc)
+{
+ const char *state;
+ int i, verify_expected = 1;
+ struct object_id oid, expected;
+ struct strbuf buf = STRBUF_INIT;
+ struct oid_array revs = OID_ARRAY_INIT;
+
+ if (!argc)
+ return error(_("Please call `--bisect-state` with at least one argument"));
+
+ if (bisect_autostart(terms))
+ return BISECT_FAILED;
+
+ state = argv[0];
+ if (check_and_set_terms(terms, state) ||
+ !one_of(state, terms->term_good, terms->term_bad, "skip", NULL))
+ return BISECT_FAILED;
+
+ argv++;
+ argc--;
+ if (argc > 1 && !strcmp(state, terms->term_bad))
+ return error(_("'git bisect %s' can take only one argument."), terms->term_bad);
+
+ if (argc == 0) {
+ const char *head = "BISECT_HEAD";
+ enum get_oid_result res_head = get_oid(head, &oid);
+
+ if (res_head == MISSING_OBJECT) {
+ head = "HEAD";
+ res_head = get_oid(head, &oid);
+ }
+
+ if (res_head)
+ error(_("Bad rev input: %s"), head);
+ oid_array_append(&revs, &oid);
+ }
+
+ /*
+ * All input revs must be checked before executing bisect_write()
+ * to discard junk revs.
+ */
+
+ for (; argc; argc--, argv++) {
+ struct commit *commit;
+
+ if (get_oid(*argv, &oid)){
+ error(_("Bad rev input: %s"), *argv);
+ oid_array_clear(&revs);
+ return BISECT_FAILED;
+ }
+
+ commit = lookup_commit_reference(the_repository, &oid);
+ if (!commit)
+ die(_("Bad rev input (not a commit): %s"), *argv);
+
+ oid_array_append(&revs, &commit->object.oid);
+ }
+
+ if (strbuf_read_file(&buf, git_path_bisect_expected_rev(), 0) < the_hash_algo->hexsz ||
+ get_oid_hex(buf.buf, &expected) < 0)
+ verify_expected = 0; /* Ignore invalid file contents */
+ strbuf_release(&buf);
+
+ for (i = 0; i < revs.nr; i++) {
+ if (bisect_write(state, oid_to_hex(&revs.oid[i]), terms, 0)) {
+ oid_array_clear(&revs);
+ return BISECT_FAILED;
+ }
+ if (verify_expected && !oideq(&revs.oid[i], &expected)) {
+ unlink_or_warn(git_path_bisect_ancestors_ok());
+ unlink_or_warn(git_path_bisect_expected_rev());
+ verify_expected = 0;
+ }
+ }
+
+ oid_array_clear(&revs);
+ return bisect_auto_next(terms, NULL);
+}
+
+static enum bisect_error bisect_log(void)
+{
+ int fd, status;
+ const char* filename = git_path_bisect_log();
+
+ if (is_empty_or_missing_file(filename))
+ return error(_("We are not bisecting."));
+
+ fd = open(filename, O_RDONLY);
+ if (fd < 0)
+ return BISECT_FAILED;
+
+ status = copy_fd(fd, STDOUT_FILENO);
+ close(fd);
+ return status ? BISECT_FAILED : BISECT_OK;
+}
+
+static int process_replay_line(struct bisect_terms *terms, struct strbuf *line)
+{
+ const char *p = line->buf + strspn(line->buf, " \t");
+ char *word_end, *rev;
+
+ if ((!skip_prefix(p, "git bisect", &p) &&
+ !skip_prefix(p, "git-bisect", &p)) || !isspace(*p))
+ return 0;
+ p += strspn(p, " \t");
+
+ word_end = (char *)p + strcspn(p, " \t");
+ rev = word_end + strspn(word_end, " \t");
+ *word_end = '\0'; /* NUL-terminate the word */
+
+ get_terms(terms);
+ if (check_and_set_terms(terms, p))
+ return -1;
+
+ if (!strcmp(p, "start")) {
+ struct strvec argv = STRVEC_INIT;
+ int res;
+ sq_dequote_to_strvec(rev, &argv);
+ res = bisect_start(terms, argv.v, argv.nr);
+ strvec_clear(&argv);
+ return res;
+ }
+
+ if (one_of(p, terms->term_good,
+ terms->term_bad, "skip", NULL))
+ return bisect_write(p, rev, terms, 0);
+
+ if (!strcmp(p, "terms")) {
+ struct strvec argv = STRVEC_INIT;
+ int res;
+ sq_dequote_to_strvec(rev, &argv);
+ res = bisect_terms(terms, argv.nr == 1 ? argv.v[0] : NULL);
+ strvec_clear(&argv);
+ return res;
+ }
+ error(_("'%s'?? what are you talking about?"), p);
+
+ return -1;
+}
+
+static enum bisect_error bisect_replay(struct bisect_terms *terms, const char *filename)
+{
+ FILE *fp = NULL;
+ enum bisect_error res = BISECT_OK;
+ struct strbuf line = STRBUF_INIT;
+
+ if (is_empty_or_missing_file(filename))
+ return error(_("cannot read file '%s' for replaying"), filename);
+
+ if (bisect_reset(NULL))
+ return BISECT_FAILED;
+
+ fp = fopen(filename, "r");
+ if (!fp)
+ return BISECT_FAILED;
+
+ while ((strbuf_getline(&line, fp) != EOF) && !res)
+ res = process_replay_line(terms, &line);
+
+ strbuf_release(&line);
+ fclose(fp);
+
+ if (res)
+ return BISECT_FAILED;
+
+ return bisect_auto_next(terms, NULL);
+}
+
+static enum bisect_error bisect_skip(struct bisect_terms *terms, const char **argv, int argc)
+{
+ int i;
+ enum bisect_error res;
+ struct strvec argv_state = STRVEC_INIT;
+
+ strvec_push(&argv_state, "skip");
+
+ for (i = 0; i < argc; i++) {
+ const char *dotdot = strstr(argv[i], "..");
+
+ if (dotdot) {
+ struct rev_info revs;
+ struct commit *commit;
+
+ init_revisions(&revs, NULL);
+ setup_revisions(2, argv + i - 1, &revs, NULL);
+
+ if (prepare_revision_walk(&revs))
+ die(_("revision walk setup failed\n"));
+ while ((commit = get_revision(&revs)) != NULL)
+ strvec_push(&argv_state,
+ oid_to_hex(&commit->object.oid));
+
+ reset_revision_walk();
+ } else {
+ strvec_push(&argv_state, argv[i]);
+ }
+ }
+ res = bisect_state(terms, argv_state.v, argv_state.nr);
+
+ strvec_clear(&argv_state);
return res;
}
int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
{
enum {
- NEXT_ALL = 1,
- WRITE_TERMS,
- BISECT_CLEAN_STATE,
- CHECK_EXPECTED_REVS,
- BISECT_RESET,
- BISECT_WRITE,
- CHECK_AND_SET_TERMS,
+ BISECT_RESET = 1,
BISECT_NEXT_CHECK,
BISECT_TERMS,
- BISECT_START
+ BISECT_START,
+ BISECT_AUTOSTART,
+ BISECT_NEXT,
+ BISECT_STATE,
+ BISECT_LOG,
+ BISECT_REPLAY,
+ BISECT_SKIP
} 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),
- OPT_CMDMODE(0, "write-terms", &cmdmode,
- N_("write the terms to .git/BISECT_TERMS"), WRITE_TERMS),
- OPT_CMDMODE(0, "bisect-clean-state", &cmdmode,
- N_("cleanup the bisection state"), BISECT_CLEAN_STATE),
- OPT_CMDMODE(0, "check-expected-revs", &cmdmode,
- N_("check for expected revs"), CHECK_EXPECTED_REVS),
OPT_CMDMODE(0, "bisect-reset", &cmdmode,
N_("reset the bisection state"), BISECT_RESET),
- OPT_CMDMODE(0, "bisect-write", &cmdmode,
- N_("write out the bisection state in BISECT_LOG"), BISECT_WRITE),
- OPT_CMDMODE(0, "check-and-set-terms", &cmdmode,
- N_("check and set terms in a bisection state"), CHECK_AND_SET_TERMS),
OPT_CMDMODE(0, "bisect-next-check", &cmdmode,
N_("check whether bad or good terms exist"), BISECT_NEXT_CHECK),
OPT_CMDMODE(0, "bisect-terms", &cmdmode,
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-state", &cmdmode,
+ N_("mark the state of ref (or refs)"), BISECT_STATE),
+ OPT_CMDMODE(0, "bisect-log", &cmdmode,
+ N_("list the bisection steps so far"), BISECT_LOG),
+ OPT_CMDMODE(0, "bisect-replay", &cmdmode,
+ N_("replay the bisection process from the given file"), BISECT_REPLAY),
+ OPT_CMDMODE(0, "bisect-skip", &cmdmode,
+ N_("skip some commits for checkout"), BISECT_SKIP),
OPT_BOOL(0, "no-log", &nolog,
N_("no log for BISECT_WRITE")),
OPT_END()
@@ -665,35 +1082,10 @@
usage_with_options(git_bisect_helper_usage, options);
switch (cmdmode) {
- case NEXT_ALL:
- res = bisect_next_all(the_repository, prefix, no_checkout);
- break;
- case WRITE_TERMS:
- if (argc != 2)
- return error(_("--write-terms requires two arguments"));
- return write_terms(argv[0], argv[1]);
- case BISECT_CLEAN_STATE:
- if (argc != 0)
- return error(_("--bisect-clean-state requires no arguments"));
- return bisect_clean_state();
- case CHECK_EXPECTED_REVS:
- check_expected_revs(argv, argc);
- return 0;
case BISECT_RESET:
if (argc > 1)
return error(_("--bisect-reset requires either no argument or a commit"));
- return !!bisect_reset(argc ? argv[0] : NULL);
- case BISECT_WRITE:
- if (argc != 4 && argc != 5)
- return error(_("--bisect-write requires either 4 or 5 arguments"));
- set_terms(&terms, argv[3], argv[2]);
- res = bisect_write(argv[0], argv[1], &terms, nolog);
- break;
- case CHECK_AND_SET_TERMS:
- if (argc != 3)
- return error(_("--check-and-set-terms requires 3 arguments"));
- set_terms(&terms, argv[2], argv[1]);
- res = check_and_set_terms(&terms, argv[0]);
+ res = bisect_reset(argc ? argv[0] : NULL);
break;
case BISECT_NEXT_CHECK:
if (argc != 2 && argc != 3)
@@ -708,10 +1100,36 @@
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_STATE:
+ set_terms(&terms, "bad", "good");
+ get_terms(&terms);
+ res = bisect_state(&terms, argv, argc);
+ break;
+ case BISECT_LOG:
+ if (argc)
+ return error(_("--bisect-log requires 0 arguments"));
+ res = bisect_log();
+ break;
+ case BISECT_REPLAY:
+ if (argc != 1)
+ return error(_("no logfile given"));
+ set_terms(&terms, "bad", "good");
+ res = bisect_replay(&terms, argv[0]);
+ break;
+ case BISECT_SKIP:
+ set_terms(&terms, "bad", "good");
+ res = bisect_skip(&terms, argv, argc);
break;
default:
- return error("BUG: unknown subcommand '%d'", cmdmode);
+ BUG("unknown subcommand %d", cmdmode);
}
free_terms(&terms);
@@ -719,8 +1137,8 @@
* Handle early success
* From check_merge_bases > check_good_are_ancestors_of_bad > bisect_next_all
*/
- if (res == BISECT_INTERNAL_SUCCESS_MERGE_BASE)
+ if ((res == BISECT_INTERNAL_SUCCESS_MERGE_BASE) || (res == BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND))
res = BISECT_OK;
- return abs(res);
+ return -res;
}
diff --git a/builtin/blame.c b/builtin/blame.c
index bf1cecd..641523f 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -27,6 +27,7 @@
#include "object-store.h"
#include "blame.h"
#include "refs.h"
+#include "tag.h"
static char blame_usage[] = N_("git blame [<options>] [<rev-opts>] [<rev>] [--] <file>");
@@ -424,13 +425,11 @@
parse_color_fields("blue,12 month ago,white,1 month ago,red");
}
-static void determine_line_heat(struct blame_entry *ent, const char **dest_color)
+static void determine_line_heat(struct commit_info *ci, const char **dest_color)
{
int i = 0;
- struct commit_info ci;
- get_commit_info(ent->suspect->commit, &ci, 1);
- while (i < colorfield_nr && ci.author_time > colorfield[i].hop)
+ while (i < colorfield_nr && ci->author_time > colorfield[i].hop)
i++;
*dest_color = colorfield[i].col;
@@ -452,7 +451,7 @@
cp = blame_nth_line(sb, ent->lno);
if (opt & OUTPUT_SHOW_AGE_WITH_COLOR) {
- determine_line_heat(ent, &default_color);
+ determine_line_heat(&ci, &default_color);
color = default_color;
reset = GIT_COLOR_RESET;
}
@@ -803,6 +802,28 @@
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);
+ if (!obj)
+ return -1;
+ 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)
@@ -815,10 +836,12 @@
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);
}
@@ -841,32 +864,33 @@
const char *revs_file = NULL;
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(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")),
- OPT_BIT(0, "score-debug", &output_option, N_("Show output score for blame entries"), OUTPUT_SHOW_SCORE),
- OPT_BIT('f', "show-name", &output_option, N_("Show original filename (Default: auto)"), OUTPUT_SHOW_NAME),
- OPT_BIT('n', "show-number", &output_option, N_("Show original linenumber (Default: off)"), OUTPUT_SHOW_NUMBER),
- OPT_BIT('p', "porcelain", &output_option, N_("Show in a format designed for machine consumption"), OUTPUT_PORCELAIN),
- OPT_BIT(0, "line-porcelain", &output_option, N_("Show porcelain format with per-line commit information"), OUTPUT_PORCELAIN|OUTPUT_LINE_PORCELAIN),
- OPT_BIT('c', NULL, &output_option, N_("Use the same output mode as git-annotate (Default: off)"), OUTPUT_ANNOTATE_COMPAT),
- OPT_BIT('t', NULL, &output_option, N_("Show raw timestamp (Default: off)"), OUTPUT_RAW_TIMESTAMP),
- OPT_BIT('l', NULL, &output_option, N_("Show long commit SHA1 (Default: off)"), OUTPUT_LONG_OBJECT_NAME),
- OPT_BIT('s', NULL, &output_option, N_("Suppress author name and timestamp (Default: off)"), OUTPUT_NO_AUTHOR),
- OPT_BIT('e', "show-email", &output_option, N_("Show author email instead of name (Default: off)"), OUTPUT_SHOW_EMAIL),
- OPT_BIT('w', NULL, &xdl_opts, N_("Ignore whitespace differences"), XDF_IGNORE_WHITESPACE),
- OPT_STRING_LIST(0, "ignore-rev", &ignore_rev_list, N_("rev"), N_("Ignore <rev> when blaming")),
- OPT_STRING_LIST(0, "ignore-revs-file", &ignore_revs_file_list, N_("file"), N_("Ignore revisions from <file>")),
+ OPT_BOOL(0, "incremental", &incremental, N_("show blame entries as we find them, incrementally")),
+ 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")),
+ OPT_BIT(0, "score-debug", &output_option, N_("show output score for blame entries"), OUTPUT_SHOW_SCORE),
+ OPT_BIT('f', "show-name", &output_option, N_("show original filename (Default: auto)"), OUTPUT_SHOW_NAME),
+ OPT_BIT('n', "show-number", &output_option, N_("show original linenumber (Default: off)"), OUTPUT_SHOW_NUMBER),
+ OPT_BIT('p', "porcelain", &output_option, N_("show in a format designed for machine consumption"), OUTPUT_PORCELAIN),
+ OPT_BIT(0, "line-porcelain", &output_option, N_("show porcelain format with per-line commit information"), OUTPUT_PORCELAIN|OUTPUT_LINE_PORCELAIN),
+ OPT_BIT('c', NULL, &output_option, N_("use the same output mode as git-annotate (Default: off)"), OUTPUT_ANNOTATE_COMPAT),
+ OPT_BIT('t', NULL, &output_option, N_("show raw timestamp (Default: off)"), OUTPUT_RAW_TIMESTAMP),
+ OPT_BIT('l', NULL, &output_option, N_("show long commit SHA1 (Default: off)"), OUTPUT_LONG_OBJECT_NAME),
+ OPT_BIT('s', NULL, &output_option, N_("suppress author name and timestamp (Default: off)"), OUTPUT_NO_AUTHOR),
+ OPT_BIT('e', "show-email", &output_option, N_("show author email instead of name (Default: off)"), OUTPUT_SHOW_EMAIL),
+ OPT_BIT('w', NULL, &xdl_opts, N_("ignore whitespace differences"), XDF_IGNORE_WHITESPACE),
+ OPT_STRING_LIST(0, "ignore-rev", &ignore_rev_list, N_("rev"), N_("ignore <rev> when blaming")),
+ 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),
- 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_STRING_LIST('L', NULL, &range_list, N_("n,m"), N_("Process only line range n,m, counting from 1")),
+ 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")),
+ 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_("range"),
+ N_("process only line range <start>,<end> or function :<funcname>")),
OPT__ABBREV(&abbrev),
OPT_END()
};
@@ -1057,10 +1081,19 @@
sb.contents_from = contents_from;
sb.reverse = reverse;
sb.repo = the_repository;
+ sb.path = path;
build_ignorelist(&sb, &ignore_revs_file_list, &ignore_rev_list);
string_list_clear(&ignore_revs_file_list, 0);
string_list_clear(&ignore_rev_list, 0);
- setup_scoreboard(&sb, path, &o);
+ setup_scoreboard(&sb, &o);
+
+ /*
+ * Changed-path Bloom filters are disabled when looking
+ * for copies.
+ */
+ if (!(opt & PICKAXE_BLAME_COPY))
+ setup_blame_bloom_data(&sb);
+
lno = sb.num_lines;
if (lno && !range_list.nr)
@@ -1078,7 +1111,7 @@
if ((!lno && (top || bottom)) || lno < bottom)
die(Q_("file %s has only %lu line",
"file %s has only %lu lines",
- lno), path, lno);
+ lno), sb.path, lno);
if (bottom < 1)
bottom = 1;
if (top < 1 || lno < top)
@@ -1103,7 +1136,6 @@
string_list_clear(&range_list, 0);
sb.ent = NULL;
- sb.path = path;
if (blame_move_score)
sb.move_score = blame_move_score;
@@ -1117,7 +1149,7 @@
sb.xdl_opts = xdl_opts;
sb.no_whole_file_rename = no_whole_file_rename;
- read_mailmap(&mailmap, NULL);
+ read_mailmap(&mailmap);
sb.found_guilty_entry = &found_guilty_entry;
sb.found_guilty_entry_data = π
@@ -1164,5 +1196,7 @@
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/builtin/branch.c b/builtin/branch.c
index d8297f8..bcc00bc 100644
--- a/builtin/branch.c
+++ b/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>"),
@@ -202,6 +202,9 @@
int remote_branch = 0;
struct strbuf bname = STRBUF_INIT;
unsigned allowed_interpret;
+ struct string_list refs_to_delete = STRING_LIST_INIT_DUP;
+ struct string_list_item *item;
+ int branch_name_pos;
switch (kinds) {
case FILTER_REFS_REMOTES:
@@ -219,6 +222,7 @@
default:
die(_("cannot use -a with -d"));
}
+ branch_name_pos = strcspn(fmt, "%");
if (!force) {
head_rev = lookup_commit_reference(the_repository, &head_oid);
@@ -265,30 +269,35 @@
goto next;
}
- if (delete_ref(NULL, name, is_null_oid(&oid) ? NULL : &oid,
- REF_NO_DEREF)) {
- error(remote_branch
- ? _("Error deleting remote-tracking branch '%s'")
- : _("Error deleting branch '%s'"),
- bname.buf);
- ret = 1;
- goto next;
- }
- if (!quiet) {
- printf(remote_branch
- ? _("Deleted remote-tracking branch %s (was %s).\n")
- : _("Deleted branch %s (was %s).\n"),
- bname.buf,
- (flags & REF_ISBROKEN) ? "broken"
- : (flags & REF_ISSYMREF) ? target
- : find_unique_abbrev(&oid, DEFAULT_ABBREV));
- }
- delete_branch_config(bname.buf);
+ item = string_list_append(&refs_to_delete, name);
+ item->util = xstrdup((flags & REF_ISBROKEN) ? "broken"
+ : (flags & REF_ISSYMREF) ? target
+ : find_unique_abbrev(&oid, DEFAULT_ABBREV));
next:
free(target);
}
+ if (delete_refs(NULL, &refs_to_delete, REF_NO_DEREF))
+ ret = 1;
+
+ for_each_string_list_item(item, &refs_to_delete) {
+ char *describe_ref = item->util;
+ char *name = item->string;
+ if (!ref_exists(name)) {
+ char *refname = name + branch_name_pos;
+ if (!quiet)
+ printf(remote_branch
+ ? _("Deleted remote-tracking branch %s (was %s).\n")
+ : _("Deleted branch %s (was %s).\n"),
+ name + branch_name_pos, describe_ref);
+
+ delete_branch_config(refname);
+ }
+ free(describe_ref);
+ }
+ string_list_clear(&refs_to_delete, 0);
+
free(name);
strbuf_release(&bname);
@@ -468,7 +477,7 @@
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++) {
@@ -538,7 +547,9 @@
strbuf_addf(&logmsg, "Branch: renamed %s to %s",
oldref.buf, newref.buf);
- if (!copy && rename_ref(oldref.buf, newref.buf, logmsg.buf))
+ if (!copy &&
+ (!head || strcmp(oldname, head) || !is_null_oid(&head_oid)) &&
+ rename_ref(oldref.buf, newref.buf, logmsg.buf))
die(_("Branch rename failed"));
if (copy && copy_existing_ref(oldref.buf, newref.buf, logmsg.buf))
die(_("Branch copy failed"));
@@ -653,10 +664,8 @@
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 +699,12 @@
!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)
@@ -726,7 +735,7 @@
print_current_branch_name();
return 0;
} else if (list) {
- /* git branch --local also shows HEAD when it is detached */
+ /* git branch --list also shows HEAD when it is detached */
if ((filter.kind & FILTER_REFS_BRANCHES) && filter.detached)
filter.kind |= FILTER_REFS_DETACHED_HEAD;
filter.name_patterns = argv;
@@ -739,7 +748,9 @@
*/
if (!sorting)
sorting = ref_default_sorting();
- sorting->ignore_case = icase;
+ ref_sorting_set_sort_flags_all(sorting, REF_SORTING_ICASE, icase);
+ ref_sorting_set_sort_flags_all(
+ sorting, REF_SORTING_DETACHED_HEAD_FIRST, 1);
print_ref_list(&filter, sorting, &format);
print_columns(&output, colopts, NULL);
string_list_clear(&output, 0);
@@ -831,10 +842,10 @@
die(_("Branch '%s' has no upstream information"), branch->name);
strbuf_addf(&buf, "branch.%s.remote", branch->name);
- git_config_set_multivar(buf.buf, NULL, NULL, 1);
+ git_config_set_multivar(buf.buf, NULL, NULL, CONFIG_FLAGS_MULTI_REPLACE);
strbuf_reset(&buf);
strbuf_addf(&buf, "branch.%s.merge", branch->name);
- git_config_set_multivar(buf.buf, NULL, NULL, 1);
+ git_config_set_multivar(buf.buf, NULL, NULL, CONFIG_FLAGS_MULTI_REPLACE);
strbuf_release(&buf);
} else if (argc > 0 && argc <= 2) {
if (filter.kind != FILTER_REFS_BRANCHES)
diff --git a/builtin/bugreport.c b/builtin/bugreport.c
new file mode 100644
index 0000000..ad3cc9c
--- /dev/null
+++ b/builtin/bugreport.c
@@ -0,0 +1,195 @@
+#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);
+ struct tm tm;
+ 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_r(&now, &tm), 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/builtin/bundle.c b/builtin/bundle.c
index f049d27..ea69481 100644
--- a/builtin/bundle.c
+++ b/builtin/bundle.c
@@ -1,5 +1,5 @@
#include "builtin.h"
-#include "argv-array.h"
+#include "strvec.h"
#include "parse-options.h"
#include "cache.h"
#include "bundle.h"
@@ -59,7 +59,8 @@
static int cmd_bundle_create(int argc, const char **argv, const char *prefix) {
int all_progress_implied = 0;
int progress = isatty(STDERR_FILENO);
- struct argv_array pack_opts;
+ struct strvec pack_opts;
+ int version = -1;
struct option options[] = {
OPT_SET_INT('q', "quiet", &progress,
@@ -71,6 +72,8 @@
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;
@@ -79,19 +82,19 @@
builtin_bundle_create_usage, options, &bundle_file);
/* bundle internals use argv[1] as further parameters */
- argv_array_init(&pack_opts);
+ strvec_init(&pack_opts);
if (progress == 0)
- argv_array_push(&pack_opts, "--quiet");
+ strvec_push(&pack_opts, "--quiet");
else if (progress == 1)
- argv_array_push(&pack_opts, "--progress");
+ strvec_push(&pack_opts, "--progress");
else if (progress == 2)
- argv_array_push(&pack_opts, "--all-progress");
+ strvec_push(&pack_opts, "--all-progress");
if (progress && all_progress_implied)
- argv_array_push(&pack_opts, "--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);
+ 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) {
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 272f9fc..5ebf133 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -12,7 +12,7 @@
#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"
@@ -42,7 +42,10 @@
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);
@@ -593,7 +596,7 @@
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
};
@@ -647,14 +650,14 @@
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/builtin/check-ignore.c b/builtin/check-ignore.c
index ea5d0ae..3c65274 100644
--- a/builtin/check-ignore.c
+++ b/builtin/check-ignore.c
@@ -180,7 +180,7 @@
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) {
@@ -190,7 +190,7 @@
maybe_flush_or_die(stdout, "ignore to stdout");
}
- clear_directory(&dir);
+ dir_clear(&dir);
return !num_ignored;
}
diff --git a/builtin/check-mailmap.c b/builtin/check-mailmap.c
index cdce144..7dc47e4 100644
--- a/builtin/check-mailmap.c
+++ b/builtin/check-mailmap.c
@@ -47,7 +47,7 @@
if (argc == 0 && !use_stdin)
die(_("no contacts specified"));
- read_mailmap(&mailmap, NULL);
+ read_mailmap(&mailmap);
for (i = 0; i < argc; ++i)
check_mailmap(&mailmap, argv[i]);
diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c
index 1ac1cc2..023e49e 100644
--- a/builtin/checkout-index.c
+++ b/builtin/checkout-index.c
@@ -23,22 +23,35 @@
static void write_tempfile_record(const char *name, const char *prefix)
{
int i;
+ int have_tempname = 0;
if (CHECKOUT_ALL == checkout_stage) {
- for (i = 1; i < 4; i++) {
- if (i > 1)
- putchar(' ');
- if (topath[i][0])
- fputs(topath[i], stdout);
- else
- putchar('.');
- }
- } else
- fputs(topath[checkout_stage], stdout);
+ for (i = 1; i < 4; i++)
+ if (topath[i][0]) {
+ have_tempname = 1;
+ break;
+ }
- putchar('\t');
- write_name_quoted_relative(name, prefix, stdout,
- nul_term_line ? '\0' : '\n');
+ if (have_tempname) {
+ for (i = 1; i < 4; i++) {
+ if (i > 1)
+ putchar(' ');
+ if (topath[i][0])
+ fputs(topath[i], stdout);
+ else
+ putchar('.');
+ }
+ }
+ } else if (topath[checkout_stage][0]) {
+ have_tempname = 1;
+ fputs(topath[checkout_stage], stdout);
+ }
+
+ if (have_tempname) {
+ putchar('\t');
+ write_name_quoted_relative(name, prefix, stdout,
+ nul_term_line ? '\0' : '\n');
+ }
for (i = 0; i < 4; i++) {
topath[i][0] = 0;
@@ -79,6 +92,14 @@
return errs > 0 ? -1 : 0;
}
+ /*
+ * At this point we know we didn't try to check anything out. If it was
+ * because we did find an entry but it was stage 0, that's not an
+ * error.
+ */
+ if (has_same_name && checkout_stage == CHECKOUT_ALL)
+ return 0;
+
if (!state.quiet) {
fprintf(stderr, "git checkout-index: %s ", name);
if (!has_same_name)
@@ -159,6 +180,7 @@
int prefix_length;
int force = 0, quiet = 0, not_new = 0;
int index_opt = 0;
+ int err = 0;
struct option builtin_checkout_index_options[] = {
OPT_BOOL('a', "all", &all,
N_("check out all files in the index")),
@@ -177,9 +199,9 @@
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()
};
@@ -223,7 +245,7 @@
if (read_from_stdin)
die("git checkout-index: don't mix '--stdin' and explicit filenames");
p = prefix_path(prefix, prefix_length, arg);
- checkout_file(p, prefix);
+ err |= checkout_file(p, prefix);
free(p);
}
@@ -245,13 +267,16 @@
strbuf_swap(&buf, &unquoted);
}
p = prefix_path(prefix, prefix_length, buf.buf);
- checkout_file(p, prefix);
+ err |= checkout_file(p, prefix);
free(p);
}
strbuf_release(&unquoted);
strbuf_release(&buf);
}
+ if (err)
+ return 1;
+
if (all)
checkout_all(prefix, prefix_length);
diff --git a/builtin/checkout.c b/builtin/checkout.c
index d677381..2d6550b 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -88,6 +88,19 @@
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)
{
@@ -226,6 +239,8 @@
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) {
@@ -246,13 +261,12 @@
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);
@@ -337,7 +351,8 @@
}
}
-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;
@@ -348,6 +363,10 @@
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];
@@ -396,7 +415,7 @@
}
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;
@@ -452,6 +471,21 @@
if (opts->patch_mode) {
const char *patch_mode;
+ const char *rev = new_branch_info->name;
+ char rev_oid[GIT_MAX_HEXSZ + 1];
+
+ /*
+ * Since rev can be in the form of `<a>...<b>` (which is not
+ * recognized by diff-index), we will always replace the name
+ * with the hex of the commit (whether it's in `...` form or
+ * not) for the run_add_interactive() machinery to work
+ * properly. However, there is special logic for the HEAD case
+ * so we mustn't replace that. Also, when we were given a
+ * tree-object, new_branch_info->commit would be NULL, but we
+ * do not have to do any replacement, either.
+ */
+ if (rev && new_branch_info->commit && strcmp(rev, "HEAD"))
+ rev = oid_to_hex_r(rev_oid, &new_branch_info->commit->object.oid);
if (opts->checkout_index && opts->checkout_worktree)
patch_mode = "--patch=checkout";
@@ -462,7 +496,7 @@
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(rev, patch_mode, &opts->pathspec);
}
repo_hold_locked_index(the_repository, &lock_file, LOCK_DIE_ON_ERROR);
@@ -523,7 +557,7 @@
/* 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);
@@ -586,7 +620,8 @@
}
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;
@@ -601,6 +636,9 @@
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)) {
@@ -620,21 +658,17 @@
}
}
-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);
@@ -663,7 +697,7 @@
} 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 {
@@ -692,6 +726,10 @@
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;
@@ -749,20 +787,13 @@
*/
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_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;
@@ -782,7 +813,7 @@
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)
@@ -790,9 +821,6 @@
}
}
- if (!active_cache_tree)
- active_cache_tree = cache_tree();
-
if (!cache_tree_fully_valid(active_cache_tree))
cache_tree_update(&the_index, WRITE_TREE_SILENT | WRITE_TREE_REPAIR);
@@ -1013,7 +1041,7 @@
describe_detached_head(_("Previous HEAD position was"), old_commit);
/* Clean up objects used, as they will be reused. */
- clear_commit_marks_all(ALL_REV_FLAGS);
+ repo_clear_commit_marks(the_repository, ALL_REV_FLAGS);
}
static int switch_branches(const struct checkout_opts *opts,
@@ -1077,11 +1105,16 @@
static int git_checkout_config(const char *var, const char *value, void *cb)
{
+ struct checkout_opts *opts = cb;
+
if (!strcmp(var, "diff.ignoresubmodules")) {
- struct checkout_opts *opts = cb;
handle_ignore_submodules_arg(&opts->diff_options, value);
return 0;
}
+ if (!strcmp(var, "checkout.guess")) {
+ opts->dwim_new_local_branch = git_config_bool(var, value);
+ return 0;
+ }
if (starts_with(var, "submodule."))
return git_default_submodule_config(var, value, NULL);
@@ -1104,8 +1137,10 @@
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) {
@@ -1327,7 +1362,7 @@
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))
@@ -1462,9 +1497,9 @@
{
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"),
@@ -1520,6 +1555,9 @@
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[])
@@ -1562,7 +1600,8 @@
}
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"));
@@ -1581,16 +1620,16 @@
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;
@@ -1598,7 +1637,7 @@
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, "--"))
@@ -1607,7 +1646,7 @@
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;
}
@@ -1661,7 +1700,7 @@
* 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);
@@ -1687,6 +1726,8 @@
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"
@@ -1710,7 +1751,7 @@
UNLEAK(opts);
if (opts->patch_mode || opts->pathspec.nr)
- return checkout_paths(opts, new_branch_info.name);
+ return checkout_paths(opts, &new_branch_info);
else
return checkout_branch(opts, &new_branch_info);
}
@@ -1798,6 +1839,8 @@
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/builtin/clean.c b/builtin/clean.c
index 5abf087..995053b 100644
--- a/builtin/clean.c
+++ b/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;
@@ -161,7 +162,7 @@
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);
}
@@ -176,7 +177,7 @@
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;
@@ -201,7 +202,7 @@
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;
@@ -209,11 +210,11 @@
} 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;
@@ -237,7 +238,7 @@
*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;
@@ -265,7 +266,7 @@
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);
}
@@ -420,7 +421,6 @@
return found;
}
-
/*
* Parse user input, and return choice(s) for menu (menu_stuff).
*
@@ -580,9 +580,7 @@
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;
}
@@ -625,7 +623,7 @@
nr += chosen[i];
}
- result = xcalloc(st_add(nr, 1), sizeof(int));
+ CALLOC_ARRAY(result, st_add(nr, 1));
for (i = 0; i < stuff->nr && j < nr; i++) {
if (chosen[i])
result[j++] = i;
@@ -662,16 +660,14 @@
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));
+ dir_init(&dir);
pl = add_pattern_list(&dir, EXC_CMDL, "manual exclude");
ignore_list = strbuf_split_max(&confirm, ' ', 0);
@@ -702,7 +698,7 @@
}
strbuf_list_free(ignore_list);
- clear_directory(&dir);
+ dir_clear(&dir);
}
strbuf_release(&confirm);
@@ -757,12 +753,10 @@
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;
}
@@ -912,8 +906,8 @@
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")),
@@ -929,13 +923,7 @@
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; "
@@ -952,6 +940,13 @@
dir.flags |= DIR_SHOW_OTHER_DIRECTORIES;
+ 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
@@ -960,15 +955,41 @@
remove_directories = 1;
}
- if (remove_directories)
- dir.flags |= DIR_SHOW_IGNORED_TOO | DIR_KEEP_UNTRACKED_CONTENTS;
+ 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);
-
pl = add_pattern_list(&dir, EXC_CMDL, "--exclude option");
for (i = 0; i < exclude_list.nr; i++)
add_pattern(exclude_list.items[i].string, "", 0, pl, -(i+1));
@@ -989,12 +1010,6 @@
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);
@@ -1006,11 +1021,7 @@
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();
@@ -1036,19 +1047,19 @@
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);
}
}
diff --git a/builtin/clone.c b/builtin/clone.c
index 1ad26f4..51e844a 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -53,6 +53,7 @@
static int deepen;
static char *option_template, *option_depth, *option_since;
static char *option_origin = NULL;
+static char *remote_name = NULL;
static char *option_branch = NULL;
static struct string_list option_not = STRING_LIST_INIT_NODUP;
static const char *real_git_dir;
@@ -102,10 +103,10 @@
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"),
@@ -420,6 +421,7 @@
struct dir_iterator *iter;
int iter_status;
unsigned int flags;
+ struct strbuf realpath = STRBUF_INIT;
mkdir_if_missing(dest->buf, 0777);
@@ -454,7 +456,8 @@
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);
@@ -468,6 +471,8 @@
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)
@@ -639,7 +644,9 @@
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);
@@ -672,8 +679,7 @@
const char *branch_top,
const char *msg,
struct transport *transport,
- int check_connectivity,
- int check_refs_are_promisor_objects_only)
+ int check_connectivity)
{
const struct ref *rm = mapped_refs;
@@ -682,8 +688,6 @@
opt.transport = transport;
opt.progress = transport->progress;
- opt.check_refs_are_promisor_objects_only =
- !!check_refs_are_promisor_objects_only;
if (check_connected(iterate_ref_map, &rm, &opt))
die(_("remote did not send all necessary objects"));
@@ -718,7 +722,7 @@
if (!option_bare) {
update_ref(msg, "HEAD", &our->old_oid, NULL, 0,
UPDATE_REFS_DIE_ON_ERR);
- install_branch_config(0, head, option_origin, our->name);
+ install_branch_config(0, head, remote_name, our->name);
}
} else if (our) {
struct commit *c = lookup_commit_reference(the_repository,
@@ -739,9 +743,9 @@
static int git_sparse_checkout_init(const char *repo)
{
- struct argv_array argv = ARGV_ARRAY_INIT;
+ struct strvec argv = STRVEC_INIT;
int result = 0;
- argv_array_pushl(&argv, "-C", repo, "sparse-checkout", "init", NULL);
+ strvec_pushl(&argv, "-C", repo, "sparse-checkout", "init", NULL);
/*
* We must apply the setting in the current process
@@ -749,12 +753,12 @@
*/
core_apply_sparse_checkout = 1;
- if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
+ if (run_command_v_opt(argv.v, RUN_GIT_CMD)) {
error(_("failed to initialize sparse-checkout"));
result = 1;
}
- argv_array_clear(&argv);
+ strvec_clear(&argv);
return result;
}
@@ -780,11 +784,11 @@
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();
@@ -799,6 +803,7 @@
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);
@@ -806,6 +811,8 @@
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"));
@@ -813,40 +820,58 @@
oid_to_hex(&oid), "1", NULL);
if (!err && (option_recurse_submodules.nr > 0)) {
- struct argv_array args = ARGV_ARRAY_INIT;
- argv_array_pushl(&args, "submodule", "update", "--require-init", "--recursive", NULL);
+ 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");
}
if (option_single_branch >= 0)
- argv_array_push(&args, option_single_branch ?
+ strvec_push(&args, option_single_branch ?
"--single-branch" :
"--no-single-branch");
- err = run_command_v_opt(args.argv, RUN_GIT_CMD);
- argv_array_clear(&args);
+ err = run_command_v_opt(args.v, RUN_GIT_CMD);
+ strvec_clear(&args);
}
return err;
}
+static int git_clone_config(const char *k, const char *v, void *cb)
+{
+ if (!strcmp(k, "clone.defaultremotename")) {
+ free(remote_name);
+ remote_name = xstrdup(v);
+ }
+ return git_default_config(k, v, cb);
+}
+
static int write_one_config(const char *key, const char *value, void *data)
{
+ /*
+ * give git_clone_config a chance to write config values back to the
+ * environment, since git_config_set_multivar_gently only deals with
+ * config-file writes
+ */
+ int apply_failed = git_clone_config(key, value, data);
+ if (apply_failed)
+ return apply_failed;
+
return git_config_set_multivar_gently(key,
value ? value : "true",
CONFIG_REGEX_NONE, 0);
@@ -899,12 +924,12 @@
}
/* Configure the remote */
if (value.len) {
- strbuf_addf(&key, "remote.%s.fetch", option_origin);
+ strbuf_addf(&key, "remote.%s.fetch", remote_name);
git_config_set_multivar(key.buf, value.buf, "^$", 0);
strbuf_reset(&key);
if (option_mirror) {
- strbuf_addf(&key, "remote.%s.mirror", option_origin);
+ strbuf_addf(&key, "remote.%s.mirror", remote_name);
git_config_set(key.buf, "true");
strbuf_reset(&key);
}
@@ -939,15 +964,14 @@
{
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/";
@@ -955,9 +979,13 @@
int err = 0, complete_refs_before_fetch = 1;
int submodule_progress;
- struct argv_array ref_prefixes = ARGV_ARRAY_INIT;
+ struct transport_ls_refs_options transport_ls_refs_options =
+ TRANSPORT_LS_REFS_OPTIONS_INIT;
packet_trace_identity("clone");
+
+ git_config(git_clone_config, NULL);
+
argc = parse_options(argc, argv, prefix, builtin_clone_options,
builtin_clone_usage, 0);
@@ -986,18 +1014,16 @@
option_no_checkout = 1;
}
- if (!option_origin)
- option_origin = "origin";
-
repo_name = argv[0];
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)
@@ -1014,7 +1040,17 @@
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;
@@ -1048,7 +1084,7 @@
}
if (real_git_dir) {
- if (path_exists(real_git_dir))
+ if (real_dest_exists)
junk_git_dir_flags |= REMOVE_DIR_KEEP_TOPLEVEL;
junk_git_dir = real_git_dir;
} else {
@@ -1102,14 +1138,36 @@
}
}
- 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;
+ /*
+ * additional config can be injected with -c, make sure it's included
+ * after init_db, which clears the entire config environment.
+ */
write_config(&option_config);
- git_config(git_default_config, NULL);
+ /*
+ * re-read config after init_db and write_config to pick up any config
+ * injected by --template and --config, respectively.
+ */
+ git_config(git_clone_config, NULL);
+
+ /*
+ * apply the remote name provided by --origin only after this second
+ * call to git_config, to ensure it overrides all config-based values.
+ */
+ if (option_origin != NULL)
+ remote_name = xstrdup(option_origin);
+
+ if (remote_name == NULL)
+ remote_name = xstrdup("origin");
+
+ if (!valid_remote_name(remote_name))
+ die(_("'%s' is not a valid remote name"), remote_name);
if (option_bare) {
if (option_mirror)
@@ -1118,15 +1176,15 @@
git_config_set("core.bare", "true");
} else {
- strbuf_addf(&branch_top, "refs/remotes/%s/", option_origin);
+ strbuf_addf(&branch_top, "refs/remotes/%s/", remote_name);
}
- strbuf_addf(&key, "remote.%s.url", option_origin);
+ strbuf_addf(&key, "remote.%s.url", remote_name);
git_config_set(key.buf, repo);
strbuf_reset(&key);
if (option_no_tags) {
- strbuf_addf(&key, "remote.%s.tagOpt", option_origin);
+ strbuf_addf(&key, "remote.%s.tagOpt", remote_name);
git_config_set(key.buf, "--no-tags");
strbuf_reset(&key);
}
@@ -1137,11 +1195,10 @@
if (option_sparse_checkout && git_sparse_checkout_init(dir))
return 1;
- remote = remote_get(option_origin);
+ remote = remote_get(remote_name);
- 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);
@@ -1201,16 +1258,28 @@
transport->smart_options->check_self_contained_and_connected = 1;
- argv_array_push(&ref_prefixes, "HEAD");
- refspec_ref_prefixes(&remote->fetch, &ref_prefixes);
+ strvec_push(&transport_ls_refs_options.ref_prefixes, "HEAD");
+ refspec_ref_prefixes(&remote->fetch,
+ &transport_ls_refs_options.ref_prefixes);
if (option_branch)
- expand_ref_prefix(&ref_prefixes, option_branch);
+ expand_ref_prefix(&transport_ls_refs_options.ref_prefixes,
+ option_branch);
if (!option_no_tags)
- argv_array_push(&ref_prefixes, "refs/tags/");
+ strvec_push(&transport_ls_refs_options.ref_prefixes,
+ "refs/tags/");
- refs = transport_get_remote_refs(transport, &ref_prefixes);
+ refs = transport_get_remote_refs(transport, &transport_ls_refs_options);
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
@@ -1228,8 +1297,11 @@
break;
}
- if (!is_local && !complete_refs_before_fetch)
- transport_fetch_refs(transport, mapped_refs);
+ if (!is_local && !complete_refs_before_fetch) {
+ err = transport_fetch_refs(transport, mapped_refs);
+ if (err)
+ goto cleanup;
+ }
remote_head = find_ref_by_name(refs, "HEAD");
remote_head_points_at =
@@ -1241,7 +1313,7 @@
if (!our_head_points_at)
die(_("Remote branch %s not found in upstream %s"),
- option_branch, option_origin);
+ option_branch, remote_name);
}
else
our_head_points_at = remote_head_points_at;
@@ -1249,7 +1321,7 @@
else {
if (option_branch)
die(_("Remote branch %s not found in upstream %s"),
- option_branch, option_origin);
+ option_branch, remote_name);
warning(_("You appear to have cloned an empty repository."));
mapped_refs = NULL;
@@ -1257,25 +1329,43 @@
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;
+ char *ref;
+
+ if (transport_ls_refs_options.unborn_head_target &&
+ skip_prefix(transport_ls_refs_options.unborn_head_target,
+ "refs/heads/", &branch)) {
+ ref = transport_ls_refs_options.unborn_head_target;
+ transport_ls_refs_options.unborn_head_target = NULL;
+ create_symref("HEAD", ref, reflog_msg.buf);
+ } else {
+ branch = git_default_branch_name(0);
+ ref = xstrfmt("refs/heads/%s", branch);
+ }
+
+ install_branch_config(0, branch, remote_name, ref);
+ free(ref);
+ }
}
write_refspec_config(src_ref_prefix, our_head_points_at,
remote_head_points_at, &branch_top);
if (filter_options.choice)
- partial_clone_register(option_origin, &filter_options);
+ partial_clone_register(remote_name, &filter_options);
if (is_local)
clone_local(path, git_dir);
- else if (refs && complete_refs_before_fetch)
- transport_fetch_refs(transport, mapped_refs);
+ else if (refs && complete_refs_before_fetch) {
+ err = transport_fetch_refs(transport, mapped_refs);
+ if (err)
+ goto cleanup;
+ }
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);
@@ -1298,12 +1388,14 @@
junk_mode = JUNK_LEAVE_REPO;
err = checkout(submodule_progress);
+cleanup:
+ free(remote_name);
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(&transport_ls_refs_options.ref_prefixes);
+ free(transport_ls_refs_options.unborn_head_target);
return err;
}
diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c
index 4a70b33..cd86315 100644
--- a/builtin/commit-graph.c
+++ b/builtin/commit-graph.c
@@ -6,10 +6,15 @@
#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 verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"),
- N_("git commit-graph write [--object-dir <objdir>] [--append|--split] [--reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"),
+ N_("git commit-graph write [--object-dir <objdir>] [--append] "
+ "[--split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] "
+ "[--changed-paths] [--[no-]max-new-filters <n>] [--[no-]progress] "
+ "<split options>"),
NULL
};
@@ -19,7 +24,10 @@
};
static const char * const builtin_commit_graph_write_usage[] = {
- N_("git commit-graph write [--object-dir <objdir>] [--append|--split] [--reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"),
+ N_("git commit-graph write [--object-dir <objdir>] [--append] "
+ "[--split[=<strategy>]] [--reachable|--stdin-packs|--stdin-commits] "
+ "[--changed-paths] [--[no-]max-new-filters <n>] [--[no-]progress] "
+ "<split options>"),
NULL
};
@@ -32,6 +40,7 @@
int split;
int shallow;
int progress;
+ int enable_changed_paths;
} opts;
static struct object_directory *find_odb(struct repository *r,
@@ -39,14 +48,17 @@
{
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) {
- if (!strcmp(obj_dir_real, real_path(odb->path)))
+ 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);
@@ -66,7 +78,7 @@
static struct option builtin_commit_graph_verify_options[] = {
OPT_STRING(0, "object-dir", &opts.obj_dir,
N_("dir"),
- N_("The object directory to store the graph")),
+ 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")),
@@ -96,7 +108,7 @@
FREE_AND_NULL(graph_name);
if (open_ok)
- graph = load_commit_graph_one_fd_st(fd, &st, odb);
+ graph = load_commit_graph_one_fd_st(the_repository, fd, &st, odb);
else
graph = read_commit_graph_one(the_repository, odb);
@@ -109,21 +121,94 @@
}
extern int read_replace_refs;
-static struct split_commit_graph_opts split_opts;
+static struct commit_graph_opts write_opts;
+
+static int write_option_parse_split(const struct option *opt, const char *arg,
+ int unset)
+{
+ enum commit_graph_split_flags *flags = opt->value;
+
+ BUG_ON_OPT_NEG(unset);
+
+ opts.split = 1;
+ if (!arg)
+ return 0;
+
+ 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);
+
+ return 0;
+}
+
+static int read_one_commit(struct oidset *commits, struct progress *progress,
+ const char *hash)
+{
+ struct object *result;
+ struct object_id oid;
+ const char *end;
+
+ if (parse_oid_hex(hash, &oid, &end))
+ return error(_("unexpected non-hex object ID: %s"), hash);
+
+ 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);
+
+ display_progress(progress, oidset_size(commits));
+
+ 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;
+}
+
+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 pack_indexes = STRING_LIST_INIT_NODUP;
+ struct strbuf buf = STRBUF_INIT;
+ struct oidset commits = OIDSET_INIT;
struct object_directory *odb = NULL;
- struct string_list lines;
int result = 0;
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,
N_("dir"),
- N_("The object directory to store the graph")),
+ N_("the object directory to store the graph")),
OPT_BOOL(0, "reachable", &opts.reachable,
N_("start walk at all refs")),
OPT_BOOL(0, "stdin-packs", &opts.stdin_packs,
@@ -132,25 +217,36 @@
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, "changed-paths", &opts.enable_changed_paths,
+ N_("enable computation for changed paths")),
OPT_BOOL(0, "progress", &opts.progress, N_("force progress reporting")),
- OPT_BOOL(0, "split", &opts.split,
- N_("allow writing an incremental commit-graph file")),
- OPT_INTEGER(0, "max-commits", &split_opts.max_commits,
+ 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(),
};
opts.progress = isatty(2);
- split_opts.size_multiple = 2;
- split_opts.max_commits = 0;
- split_opts.expire_time = 0;
+ 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,
builtin_commit_graph_write_usage, 0);
@@ -165,41 +261,51 @@
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(odb, 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));
+ 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);
- if (opts.stdin_packs)
- pack_indexes = &lines;
- if (opts.stdin_commits) {
- commit_hex = &lines;
- flags |= COMMIT_GRAPH_WRITE_CHECK_OIDS;
+ while (strbuf_getline(&buf, stdin) != EOF) {
+ if (read_one_commit(&commits, progress, buf.buf)) {
+ result = 1;
+ goto cleanup;
+ }
}
- UNLEAK(buf);
+ stop_progress(&progress);
}
if (write_commit_graph(odb,
- pack_indexes,
- commit_hex,
+ 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;
}
@@ -208,7 +314,7 @@
static struct option builtin_commit_graph_options[] = {
OPT_STRING(0, "object-dir", &opts.obj_dir,
N_("dir"),
- N_("The object directory to store the graph")),
+ N_("the object directory to store the graph")),
OPT_END(),
};
diff --git a/builtin/commit-tree.c b/builtin/commit-tree.c
index b866d83..1031b9a 100644
--- a/builtin/commit-tree.c
+++ b/builtin/commit-tree.c
@@ -108,15 +108,15 @@
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/builtin/commit.c b/builtin/commit.c
index 7ba33a3..739110c 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -59,6 +59,9 @@
" 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");
@@ -122,7 +125,6 @@
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 @@
{
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 @@
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;
@@ -381,7 +378,7 @@
old_index_env = xstrdup_or_null(getenv(INDEX_ENVIRONMENT));
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;
@@ -477,8 +474,10 @@
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))
@@ -795,7 +794,7 @@
*/
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";
}
@@ -848,21 +847,19 @@
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");
@@ -973,12 +970,15 @@
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;
}
@@ -1003,15 +1003,15 @@
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 &&
@@ -1039,7 +1039,7 @@
av[++ac] = NULL;
setup_revisions(ac, av, &revs, NULL);
revs.mailmap = &mailmap;
- read_mailmap(revs.mailmap, NULL);
+ read_mailmap(revs.mailmap);
if (prepare_revision_walk(&revs))
die(_("revision walk setup failed"));
@@ -1181,8 +1181,10 @@
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"));
@@ -1204,7 +1206,8 @@
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);
@@ -1213,7 +1216,8 @@
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);
}
@@ -1237,13 +1241,13 @@
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();
@@ -1366,9 +1370,9 @@
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),
@@ -1387,9 +1391,9 @@
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(),
};
@@ -1488,7 +1492,6 @@
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")),
@@ -1504,7 +1507,7 @@
OPT_STRING(0, "fixup", &fixup_message, N_("commit"), N_("use autosquash formatted message to fixup specified commit")),
OPT_STRING(0, "squash", &squash_message, N_("commit"), N_("use autosquash formatted message to squash specified commit")),
OPT_BOOL(0, "reset-author", &renew_authorship, N_("the commit is authored by me now (used with -C/-c/--amend)")),
- OPT_BOOL('s', "signoff", &signoff, N_("add Signed-off-by:")),
+ OPT_BOOL('s', "signoff", &signoff, N_("add a Signed-off-by trailer")),
OPT_FILENAME('t', "template", &template_file, N_("use specified template file")),
OPT_BOOL('e', "edit", &edit_flag, N_("force edit of commit")),
OPT_CLEANUP(&cleanup_arg),
@@ -1581,8 +1584,8 @@
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. */
@@ -1631,8 +1634,10 @@
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);
}
@@ -1659,7 +1664,7 @@
}
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;
@@ -1667,8 +1672,8 @@
}
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"));
}
@@ -1692,12 +1697,10 @@
"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(the_repository->objects->odb, 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);
@@ -1713,6 +1716,8 @@
&oid, flags);
}
+ apply_autostash(git_path_merge_autostash(the_repository));
+
UNLEAK(err);
UNLEAK(sb);
return 0;
diff --git a/builtin/config.c b/builtin/config.c
index ee4aef6..f71fa39 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -14,6 +14,7 @@
static char *key;
static regex_t *key_regexp;
+static const char *value_pattern;
static regex_t *regexp;
static int show_keys;
static int omit_values;
@@ -34,6 +35,7 @@
static struct config_options config_options;
static int show_origin;
static int show_scope;
+static int fixed_value;
#define ACTION_GET (1<<0)
#define ACTION_GET_ALL (1<<1)
@@ -65,6 +67,7 @@
#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 | \
@@ -94,6 +97,8 @@
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"))
@@ -130,17 +135,18 @@
OPT_STRING('f', "file", &given_config_source.file, N_("file"), N_("use given config file")),
OPT_STRING(0, "blob", &given_config_source.blob, N_("blob-id"), N_("read config from given blob object")),
OPT_GROUP(N_("Action")),
- OPT_BIT(0, "get", &actions, N_("get value: name [value-regex]"), ACTION_GET),
- OPT_BIT(0, "get-all", &actions, N_("get all values: key [value-regex]"), ACTION_GET_ALL),
- OPT_BIT(0, "get-regexp", &actions, N_("get values for regexp: name-regex [value-regex]"), ACTION_GET_REGEXP),
+ OPT_BIT(0, "get", &actions, N_("get value: name [value-pattern]"), ACTION_GET),
+ OPT_BIT(0, "get-all", &actions, N_("get all values: key [value-pattern]"), ACTION_GET_ALL),
+ OPT_BIT(0, "get-regexp", &actions, N_("get values for regexp: name-regex [value-pattern]"), ACTION_GET_REGEXP),
OPT_BIT(0, "get-urlmatch", &actions, N_("get value specific for the URL: section[.var] URL"), ACTION_GET_URLMATCH),
- OPT_BIT(0, "replace-all", &actions, N_("replace all matching variables: name value [value_regex]"), ACTION_REPLACE_ALL),
+ OPT_BIT(0, "replace-all", &actions, N_("replace all matching variables: name value [value-pattern]"), ACTION_REPLACE_ALL),
OPT_BIT(0, "add", &actions, N_("add a new variable: name value"), ACTION_ADD),
- OPT_BIT(0, "unset", &actions, N_("remove a variable: name [value-regex]"), ACTION_UNSET),
- OPT_BIT(0, "unset-all", &actions, N_("remove all matches: name [value-regex]"), ACTION_UNSET_ALL),
+ OPT_BIT(0, "unset", &actions, N_("remove a variable: name [value-pattern]"), ACTION_UNSET),
+ OPT_BIT(0, "unset-all", &actions, N_("remove all matches: name [value-pattern]"), ACTION_UNSET_ALL),
OPT_BIT(0, "rename-section", &actions, N_("rename section: old-name new-name"), ACTION_RENAME_SECTION),
OPT_BIT(0, "remove-section", &actions, N_("remove a section: name"), ACTION_REMOVE_SECTION),
OPT_BIT('l', "list", &actions, N_("list all"), ACTION_LIST),
+ OPT_BOOL(0, "fixed-value", &fixed_value, N_("use string equality when comparing values to 'value-pattern'")),
OPT_BIT('e', "edit", &actions, N_("open an editor"), ACTION_EDIT),
OPT_BIT(0, "get-color", &actions, N_("find the color configured: slot [default]"), ACTION_GET_COLOR),
OPT_BIT(0, "get-colorbool", &actions, N_("find the color setting: slot [stdout-is-tty]"), ACTION_GET_COLORBOOL),
@@ -149,6 +155,7 @@
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")),
@@ -250,6 +257,12 @@
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)
@@ -286,6 +299,8 @@
return 0;
if (use_key_regexp && regexec(key_regexp, key_, 0, NULL, 0))
return 0;
+ if (fixed_value && strcmp(value_pattern, (value_?value_:"")))
+ return 0;
if (regexp != NULL &&
(do_not_match ^ !!regexec(regexp, (value_?value_:""), 0, NULL, 0)))
return 0;
@@ -296,7 +311,7 @@
return format_config(&values->items[values->nr++], key_, value_);
}
-static int get_value(const char *key_, const char *regex_)
+static int get_value(const char *key_, const char *regex_, unsigned flags)
{
int ret = CONFIG_GENERIC_ERROR;
struct strbuf_list values = {NULL};
@@ -333,7 +348,9 @@
}
}
- if (regex_) {
+ if (regex_ && (flags & CONFIG_FLAGS_FIXED_VALUE))
+ value_pattern = regex_;
+ else if (regex_) {
if (regex_[0] == '!') {
do_not_match = 1;
regex_++;
@@ -411,6 +428,13 @@
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))
@@ -614,6 +638,7 @@
{
int nongit = !startup_info->have_repository;
char *value;
+ int flags = 0;
given_config_source.file = xstrdup_or_null(getenv(CONFIG_ENVIRONMENT));
@@ -628,11 +653,15 @@
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, "-")) {
@@ -672,7 +701,7 @@
given_config_source.file = git_pathdup("config");
given_config_source.scope = CONFIG_SCOPE_LOCAL;
} else if (use_worktree_config) {
- struct worktree **worktrees = get_worktrees(0);
+ struct worktree **worktrees = get_worktrees();
if (repository_format_worktree_config)
given_config_source.file = git_pathdup("config.worktree");
else if (worktrees[0] && worktrees[1])
@@ -745,6 +774,42 @@
usage_builtin_config();
}
+ /* check usage of --fixed-value */
+ if (fixed_value) {
+ int allowed_usage = 0;
+
+ switch (actions) {
+ /* git config --get <name> <value-pattern> */
+ case ACTION_GET:
+ /* git config --get-all <name> <value-pattern> */
+ case ACTION_GET_ALL:
+ /* git config --get-regexp <name-pattern> <value-pattern> */
+ case ACTION_GET_REGEXP:
+ /* git config --unset <name> <value-pattern> */
+ case ACTION_UNSET:
+ /* git config --unset-all <name> <value-pattern> */
+ case ACTION_UNSET_ALL:
+ allowed_usage = argc > 1 && !!argv[1];
+ break;
+
+ /* git config <name> <value> <value-pattern> */
+ case ACTION_SET_ALL:
+ /* git config --replace-all <name> <value> <value-pattern> */
+ case ACTION_REPLACE_ALL:
+ allowed_usage = argc > 2 && !!argv[2];
+ break;
+
+ /* other options don't allow --fixed-value */
+ }
+
+ if (!allowed_usage) {
+ error(_("--fixed-value only applies with 'value-pattern'"));
+ usage_builtin_config();
+ }
+
+ flags |= CONFIG_FLAGS_FIXED_VALUE;
+ }
+
if (actions & PAGING_ACTIONS)
setup_auto_pager("config", 1);
@@ -806,7 +871,8 @@
value = normalize_value(argv[0], argv[1]);
UNLEAK(value);
return git_config_set_multivar_in_file_gently(given_config_source.file,
- argv[0], value, argv[2], 0);
+ argv[0], value, argv[2],
+ flags);
}
else if (actions == ACTION_ADD) {
check_write();
@@ -815,7 +881,8 @@
UNLEAK(value);
return git_config_set_multivar_in_file_gently(given_config_source.file,
argv[0], value,
- CONFIG_REGEX_NONE, 0);
+ CONFIG_REGEX_NONE,
+ flags);
}
else if (actions == ACTION_REPLACE_ALL) {
check_write();
@@ -823,23 +890,24 @@
value = normalize_value(argv[0], argv[1]);
UNLEAK(value);
return git_config_set_multivar_in_file_gently(given_config_source.file,
- argv[0], value, argv[2], 1);
+ argv[0], value, argv[2],
+ flags | CONFIG_FLAGS_MULTI_REPLACE);
}
else if (actions == ACTION_GET) {
check_argc(argc, 1, 2);
- return get_value(argv[0], argv[1]);
+ return get_value(argv[0], argv[1], flags);
}
else if (actions == ACTION_GET_ALL) {
do_all = 1;
check_argc(argc, 1, 2);
- return get_value(argv[0], argv[1]);
+ return get_value(argv[0], argv[1], flags);
}
else if (actions == ACTION_GET_REGEXP) {
show_keys = 1;
use_key_regexp = 1;
do_all = 1;
check_argc(argc, 1, 2);
- return get_value(argv[0], argv[1]);
+ return get_value(argv[0], argv[1], flags);
}
else if (actions == ACTION_GET_URLMATCH) {
check_argc(argc, 2, 2);
@@ -850,7 +918,8 @@
check_argc(argc, 1, 2);
if (argc == 2)
return git_config_set_multivar_in_file_gently(given_config_source.file,
- argv[0], NULL, argv[1], 0);
+ argv[0], NULL, argv[1],
+ flags);
else
return git_config_set_in_file_gently(given_config_source.file,
argv[0], NULL);
@@ -859,7 +928,8 @@
check_write();
check_argc(argc, 1, 2);
return git_config_set_multivar_in_file_gently(given_config_source.file,
- argv[0], NULL, argv[1], 1);
+ argv[0], NULL, argv[1],
+ flags | CONFIG_FLAGS_MULTI_REPLACE);
}
else if (actions == ACTION_RENAME_SECTION) {
int ret;
diff --git a/credential-cache--daemon.c b/builtin/credential-cache--daemon.c
similarity index 90%
rename from credential-cache--daemon.c
rename to builtin/credential-cache--daemon.c
index ec1271f..c61f123 100644
--- a/credential-cache--daemon.c
+++ b/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 @@
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 @@
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 @@
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/credential-cache.c b/builtin/credential-cache.c
similarity index 80%
rename from credential-cache.c
rename to builtin/credential-cache.c
index 1cccc3a..9b3f709 100644
--- a/credential-cache.c
+++ b/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 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 @@
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 @@
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 @@
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/credential-store.c b/builtin/credential-store.c
similarity index 89%
rename from credential-store.c
rename to builtin/credential-store.c
index c010497..ae3c1ba 100644
--- a/credential-store.c
+++ b/builtin/credential-store.c
@@ -1,4 +1,5 @@
-#include "cache.h"
+#include "builtin.h"
+#include "config.h"
#include "lockfile.h"
#include "credential.h"
#include "string-list.h"
@@ -24,8 +25,8 @@
}
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) {
@@ -58,8 +59,11 @@
static void rewrite_credential_file(const char *fn, struct credential *c,
struct strbuf *extra)
{
- if (hold_lock_file_for_update(&credential_lock, fn, 0) < 0)
- die_errno("unable to get credential storage lock");
+ int timeout_ms = 1000;
+
+ git_config_get_int("credentialstore.locktimeoutms", &timeout_ms);
+ if (hold_lock_file_for_update_timeout(&credential_lock, fn, 0, timeout_ms) < 0)
+ die_errno(_("unable to get credential storage lock in %d ms"), timeout_ms);
if (extra)
print_line(extra);
parse_credential_file(fn, c, NULL, print_line);
@@ -143,7 +147,7 @@
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>",
@@ -161,7 +165,7 @@
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/builtin/credential.c b/builtin/credential.c
index 879acfb..d75dcdc 100644
--- a/builtin/credential.c
+++ b/builtin/credential.c
@@ -1,6 +1,7 @@
#include "git-compat-util.h"
#include "credential.h"
#include "builtin.h"
+#include "config.h"
static const char usage_msg[] =
"git credential [fill|approve|reject]";
@@ -10,6 +11,8 @@
const char *op;
struct credential c = CREDENTIAL_INIT;
+ git_config(git_default_config, NULL);
+
if (argc != 2 || !strcmp(argv[1], "-h"))
usage(usage_msg);
op = argv[1];
diff --git a/builtin/describe.c b/builtin/describe.c
index 420f4c6..40482d8 100644
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -12,7 +12,7 @@
#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 "list-objects.h"
@@ -54,6 +54,7 @@
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;
};
@@ -132,6 +133,7 @@
e->tag = tag;
e->prio = prio;
e->name_checked = 0;
+ e->misnamed = 0;
oidcpy(&e->oid, oid);
free(e->path);
e->path = xstrdup(path);
@@ -192,7 +194,7 @@
}
/* Is it annotated? */
- if (!peel_ref(path, &peeled)) {
+ if (!peel_iterated_oid(oid, &peeled)) {
is_annotated = !oideq(oid, &peeled);
} else {
oidcpy(&peeled, oid);
@@ -275,10 +277,11 @@
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;
}
@@ -314,7 +317,7 @@
* Exact match to an existing ref.
*/
append_name(n, dst);
- if (longformat)
+ if (n->misnamed || longformat)
append_suffix(0, n->tag ? get_tagged_oid(n->tag) : oid, dst);
if (suffix)
strbuf_addstr(dst, suffix);
@@ -463,7 +466,7 @@
}
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);
@@ -498,15 +501,15 @@
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))
@@ -591,26 +594,26 @@
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);
@@ -621,7 +624,7 @@
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;
@@ -643,7 +646,7 @@
} 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();
@@ -655,8 +658,8 @@
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/builtin/diff-files.c b/builtin/diff-files.c
index 86ae474..70103c4 100644
--- a/builtin/diff-files.c
+++ b/builtin/diff-files.c
@@ -7,6 +7,7 @@
#include "cache.h"
#include "config.h"
#include "diff.h"
+#include "diff-merges.h"
#include "commit.h"
#include "revision.h"
#include "builtin.h"
@@ -28,7 +29,14 @@
git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
repo_init_revisions(the_repository, &rev, prefix);
rev.abbrev = 0;
- precompose_argv(argc, argv);
+
+ /*
+ * 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;
+
+ prefix = precompose_argv_prefix(argc, argv, prefix);
argc = setup_revisions(argc, argv, &rev, NULL);
while (1 < argc && argv[1][0] == '-') {
@@ -46,6 +54,7 @@
}
if (!rev.diffopt.output_format)
rev.diffopt.output_format = DIFF_FORMAT_RAW;
+ rev.diffopt.rotate_to_strict = 1;
/*
* Make sure there are NO revision (i.e. pending object) parameter,
@@ -62,9 +71,9 @@
* was not asked to. "diff-files -c -p" should not densify
* (the user should ask with "diff-files --cc" explicitly).
*/
- if (rev.max_count == -1 && !rev.combine_merges &&
+ if (rev.max_count == -1 &&
(rev.diffopt.output_format & DIFF_FORMAT_PATCH))
- rev.combine_merges = rev.dense_combined_merges = 1;
+ diff_merges_set_dense_combined_if_unset(&rev);
if (read_cache_preload(&rev.diffopt.pathspec) < 0) {
perror("read_cache_preload");
diff --git a/builtin/diff-index.c b/builtin/diff-index.c
index 93ec642..176fe7f 100644
--- a/builtin/diff-index.c
+++ b/builtin/diff-index.c
@@ -15,7 +15,7 @@
int cmd_diff_index(int argc, const char **argv, const char *prefix)
{
struct rev_info rev;
- int cached = 0;
+ unsigned int option = 0;
int i;
int result;
@@ -25,20 +25,24 @@
git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
repo_init_revisions(the_repository, &rev, prefix);
rev.abbrev = 0;
- precompose_argv(argc, argv);
+ prefix = precompose_argv_prefix(argc, argv, prefix);
argc = setup_revisions(argc, argv, &rev, NULL);
for (i = 1; i < argc; i++) {
const char *arg = argv[i];
if (!strcmp(arg, "--cached"))
- cached = 1;
+ option |= DIFF_INDEX_CACHED;
+ else if (!strcmp(arg, "--merge-base"))
+ option |= DIFF_INDEX_MERGE_BASE;
else
usage(diff_cache_usage);
}
if (!rev.diffopt.output_format)
rev.diffopt.output_format = DIFF_FORMAT_RAW;
+ rev.diffopt.rotate_to_strict = 1;
+
/*
* Make sure there is one revision (i.e. pending object),
* and there is no revision filtering parameters.
@@ -46,7 +50,7 @@
if (rev.pending.nr != 1 ||
rev.max_count != -1 || rev.min_age != -1 || rev.max_age != -1)
usage(diff_cache_usage);
- if (!cached) {
+ if (!(option & DIFF_INDEX_CACHED)) {
setup_work_tree();
if (read_cache_preload(&rev.diffopt.pathspec) < 0) {
perror("read_cache_preload");
@@ -56,7 +60,7 @@
perror("read_cache");
return -1;
}
- result = run_diff_index(&rev, cached);
+ result = run_diff_index(&rev, option);
UNLEAK(rev);
return diff_result_code(&rev.diffopt, result);
}
diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c
index cb9ea79..f33d30d 100644
--- a/builtin/diff-tree.c
+++ b/builtin/diff-tree.c
@@ -109,7 +109,9 @@
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;
+ int merge_base = 0;
if (argc == 2 && !strcmp(argv[1], "-h"))
usage(diff_tree_usage);
@@ -124,9 +126,17 @@
memset(&s_r_opt, 0, sizeof(s_r_opt));
s_r_opt.tweak = diff_tree_tweak_rev;
- precompose_argv(argc, argv);
+ prefix = precompose_argv_prefix(argc, argv, prefix);
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;
@@ -134,9 +144,20 @@
read_stdin = 1;
continue;
}
+ if (!strcmp(arg, "--merge-base")) {
+ merge_base = 1;
+ continue;
+ }
usage(diff_tree_usage);
}
+ if (read_stdin && merge_base)
+ die(_("--stdin and --merge-base are mutually exclusive"));
+ if (merge_base && opt->pending.nr != 2)
+ die(_("--merge-base only works with two commits"));
+
+ opt->diffopt.rotate_to_strict = 1;
+
/*
* NOTE! We expect "a..b" to expand to "^a b" but it is
* perfectly valid for revision range parser to yield "b ^a",
@@ -156,7 +177,12 @@
case 2:
tree1 = opt->pending.objects[0].item;
tree2 = opt->pending.objects[1].item;
- if (tree2->flags & UNINTERESTING) {
+ if (merge_base) {
+ struct object_id oid;
+
+ diff_get_merge_base(opt, &oid);
+ tree1 = lookup_object(the_repository, &oid);
+ } else if (tree2->flags & UNINTERESTING) {
SWAP(tree2, tree1);
}
diff_tree_oid(&tree1->oid, &tree2->oid, "", &opt->diffopt);
@@ -168,6 +194,7 @@
int saved_nrl = 0;
int saved_dcctc = 0;
+ opt->diffopt.rotate_to_strict = 0;
if (opt->diffopt.detect_rename) {
if (!the_index.cache)
repo_read_index(the_repository);
diff --git a/builtin/diff.c b/builtin/diff.c
index 42ac803..617b9a4 100644
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -6,24 +6,32 @@
#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"
#include "blob.h"
#include "tag.h"
#include "diff.h"
+#include "diff-merges.h"
#include "diffcore.h"
#include "revision.h"
#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> [--merge-base] [<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)
{
@@ -127,11 +135,13 @@
static int builtin_diff_index(struct rev_info *revs,
int argc, const char **argv)
{
- int cached = 0;
+ unsigned int option = 0;
while (1 < argc) {
const char *arg = argv[1];
if (!strcmp(arg, "--cached") || !strcmp(arg, "--staged"))
- cached = 1;
+ option |= DIFF_INDEX_CACHED;
+ else if (!strcmp(arg, "--merge-base"))
+ option |= DIFF_INDEX_MERGE_BASE;
else
usage(builtin_diff_usage);
argv++; argc--;
@@ -144,7 +154,7 @@
revs->max_count != -1 || revs->min_age != -1 ||
revs->max_age != -1)
usage(builtin_diff_usage);
- if (!cached) {
+ if (!(option & DIFF_INDEX_CACHED)) {
setup_work_tree();
if (read_cache_preload(&revs->diffopt.pathspec) < 0) {
perror("read_cache_preload");
@@ -154,7 +164,7 @@
perror("read_cache");
return -1;
}
- return run_diff_index(revs, cached);
+ return run_diff_index(revs, option);
}
static int builtin_diff_tree(struct rev_info *revs,
@@ -163,19 +173,34 @@
struct object_array_entry *ent1)
{
const struct object_id *(oid[2]);
- int swap = 0;
+ struct object_id mb_oid;
+ int merge_base = 0;
- if (argc > 1)
- usage(builtin_diff_usage);
+ while (1 < argc) {
+ const char *arg = argv[1];
+ if (!strcmp(arg, "--merge-base"))
+ merge_base = 1;
+ else
+ usage(builtin_diff_usage);
+ argv++; argc--;
+ }
- /*
- * We saw two trees, ent0 and ent1. If ent1 is uninteresting,
- * swap them.
- */
- if (ent1->item->flags & UNINTERESTING)
- swap = 1;
- oid[swap] = &ent0->item->oid;
- oid[1 - swap] = &ent1->item->oid;
+ if (merge_base) {
+ diff_get_merge_base(revs, &mb_oid);
+ oid[0] = &mb_oid;
+ oid[1] = &revs->pending.objects[1].item->oid;
+ } else {
+ int swap = 0;
+
+ /*
+ * We saw two trees, ent0 and ent1. If ent1 is uninteresting,
+ * swap them.
+ */
+ if (ent1->item->flags & UNINTERESTING)
+ swap = 1;
+ oid[swap] = &ent0->item->oid;
+ oid[1 - swap] = &ent1->item->oid;
+ }
diff_tree_oid(oid[0], oid[1], "", &revs->diffopt);
log_tree_diff_flush(revs);
return 0;
@@ -192,12 +217,11 @@
if (argc > 1)
usage(builtin_diff_usage);
- if (!revs->dense_combined_merges && !revs->combine_merges)
- revs->dense_combined_merges = revs->combine_merges = 1;
+ diff_merges_set_dense_combined_if_unset(revs);
+
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;
}
@@ -242,9 +266,9 @@
* dense one, --cc can be explicitly asked for, or just rely
* on the default).
*/
- if (revs->max_count == -1 && !revs->combine_merges &&
+ if (revs->max_count == -1 &&
(revs->diffopt.output_format & DIFF_FORMAT_PATCH))
- revs->combine_merges = revs->dense_combined_merges = 1;
+ diff_merges_set_dense_combined_if_unset(revs);
setup_work_tree();
if (read_cache_preload(&revs->diffopt.pathspec) < 0) {
@@ -254,6 +278,108 @@
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 +389,29 @@
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:
@@ -317,7 +453,7 @@
init_diff_ui_defaults();
git_config(git_diff_ui_config, NULL);
- precompose_argv(argc, argv);
+ prefix = precompose_argv_prefix(argc, argv, prefix);
repo_init_revisions(the_repository, &rev, prefix);
@@ -355,6 +491,7 @@
}
rev.diffopt.flags.recursive = 1;
+ rev.diffopt.rotate_to_strict = 1;
setup_diff_pager(&rev.diffopt);
@@ -382,6 +519,7 @@
}
}
+ 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 +534,8 @@
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 +577,12 @@
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/builtin/difftool.c b/builtin/difftool.c
index c280e68..6e18e62 100644
--- a/builtin/difftool.c
+++ b/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"
@@ -210,10 +210,10 @@
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;
@@ -225,9 +225,9 @@
/* 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;
@@ -342,7 +342,10 @@
const char *workdir, *tmp;
int ret = 0, i;
FILE *fp;
- struct hashmap working_tree_dups, submodules, symlinks2;
+ struct hashmap working_tree_dups = HASHMAP_INIT(working_tree_entry_cmp,
+ NULL);
+ struct hashmap submodules = HASHMAP_INIT(pair_cmp, NULL);
+ struct hashmap symlinks2 = HASHMAP_INIT(pair_cmp, NULL);
struct hashmap_iter iter;
struct pair_entry *entry;
struct index_state wtindex;
@@ -383,20 +386,16 @@
rdir_len = rdir.len;
wtdir_len = wtdir.len;
- hashmap_init(&working_tree_dups, working_tree_entry_cmp, NULL, 0);
- hashmap_init(&submodules, pair_cmp, NULL, 0);
- hashmap_init(&symlinks2, pair_cmp, NULL, 0);
-
child.no_stdin = 1;
child.git_cmd = 1;
child.use_shell = 0;
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");
@@ -667,7 +666,7 @@
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
@@ -680,10 +679,10 @@
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/builtin/env--helper.c b/builtin/env--helper.c
index 23c214f..2734909 100644
--- a/builtin/env--helper.c
+++ b/builtin/env--helper.c
@@ -7,18 +7,22 @@
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 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/builtin/fast-export.c b/builtin/fast-export.c
index 8586816..85a76e0 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -45,6 +45,7 @@
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,
@@ -120,24 +121,33 @@
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 struct hashmap_entry *eptr,
const struct hashmap_entry *entry_or_key,
- const void *unused_keydata)
+ const void *keydata)
{
const struct anonymized_entry *a, *b;
a = container_of(eptr, const struct anonymized_entry, hash);
- b = container_of(entry_or_key, const struct anonymized_entry, hash);
+ 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;
+ }
- return a->orig_len != b->orig_len ||
- memcmp(a->orig, b->orig, a->orig_len);
+ b = container_of(entry_or_key, const struct anonymized_entry, hash);
+ return strcmp(a->orig, b->orig);
}
/*
@@ -145,31 +155,39 @@
* 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.hash, memhash(orig, *len));
+ hashmap_entry_init(&key.hash, memhash(orig, len));
key.orig = orig;
- key.orig_len = *len;
- ret = hashmap_get_entry(map, &key, hash, 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;
+ ret->anon = generate(data);
hashmap_put(map, &ret->hash);
}
- *len = ret->anon_len;
return ret->anon;
}
@@ -181,13 +199,13 @@
*/
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++);
@@ -361,12 +379,12 @@
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)
@@ -383,20 +401,23 @@
}
}
-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,
@@ -455,9 +476,9 @@
*/
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);
@@ -493,12 +514,12 @@
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)
@@ -517,13 +538,6 @@
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)) {
@@ -546,14 +560,13 @@
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);
}
/*
@@ -563,6 +576,7 @@
*/
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;
@@ -588,9 +602,9 @@
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 {
@@ -712,9 +726,10 @@
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++;
}
@@ -729,12 +744,12 @@
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,
@@ -804,8 +819,8 @@
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);
}
}
@@ -908,7 +923,6 @@
if (!tag)
die("Tag %s points nowhere?", e->name);
return (struct commit *)tag;
- break;
}
default:
return NULL;
@@ -928,7 +942,7 @@
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) {
@@ -1011,7 +1025,7 @@
/*
* 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
@@ -1136,6 +1150,37 @@
}
}
+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;
@@ -1160,29 +1205,32 @@
N_("select handling of commit messages in an alternate encoding"),
parse_opt_reencode_mode),
OPT_STRING(0, "export-marks", &export_filename, N_("file"),
- N_("Dump marks to this file")),
+ N_("dump marks to this file")),
OPT_STRING(0, "import-marks", &import_filename, N_("file"),
- N_("Import marks from this 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")),
+ 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")),
+ N_("fake a tagger when tags lack one")),
OPT_BOOL(0, "full-tree", &full_tree,
- N_("Output full tree for each commit")),
+ N_("output full tree for each commit")),
OPT_BOOL(0, "use-done-feature", &use_done_feature,
- N_("Use the done feature to terminate the stream")),
- OPT_BOOL(0, "no-data", &no_data, N_("Skip output of blob data")),
+ N_("use the done feature to terminate the stream")),
+ OPT_BOOL(0, "no-data", &no_data, N_("skip output of blob data")),
OPT_STRING_LIST(0, "refspec", &refspecs_list, N_("refspec"),
- N_("Apply refspec to exported refs")),
+ 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")),
+ &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")),
+ N_("show original object ids of blobs/commits")),
OPT_BOOL(0, "mark-tags", &mark_tags,
- N_("Label tags with mark ids")),
+ N_("label tags with mark ids")),
OPT_END()
};
@@ -1204,6 +1252,9 @@
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;
diff --git a/fast-import.c b/builtin/fast-import.c
similarity index 91%
rename from fast-import.c
rename to builtin/fast-import.c
index b8b65a8..3afa81c 100644
--- a/fast-import.c
+++ b/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 mark_set {
union {
+ struct object_id *oids[1024];
struct object_entry *marked[1024];
struct mark_set *sets[1024];
} data;
@@ -121,6 +139,7 @@
typedef enum {
WHENSPEC_RAW = 1,
+ WHENSPEC_RAW_PERMISSIVE,
WHENSPEC_RFC2822,
WHENSPEC_NOW
} whenspec_type;
@@ -131,6 +150,9 @@
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 @@
/* 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;
@@ -222,6 +244,11 @@
/* 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;
@@ -230,6 +257,29 @@
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);
@@ -258,8 +308,6 @@
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());
@@ -338,7 +386,7 @@
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);
@@ -424,44 +472,37 @@
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++) {
@@ -485,22 +526,15 @@
return r;
}
-static char *pool_strdup(const char *s)
+static void insert_mark(struct mark_set **top, uintmax_t idnum, struct object_entry *oe)
{
- size_t len = strlen(s) + 1;
- char *r = mem_pool_alloc(&fi_mem_pool, len);
- memcpy(r, s, len);
- return r;
-}
+ struct mark_set *s = *top;
-static void insert_mark(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;
- s->data.sets[0] = marks;
- marks = s;
+ s->shift = (*top)->shift + 10;
+ s->data.sets[0] = *top;
+ *top = s;
}
while (s->shift) {
uintmax_t i = idnum >> s->shift;
@@ -516,10 +550,9 @@
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) {
@@ -576,7 +609,7 @@
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;
@@ -708,7 +741,6 @@
{
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");
@@ -719,13 +751,8 @@
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);
@@ -804,9 +831,9 @@
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);
}
@@ -919,7 +946,7 @@
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;
@@ -1117,7 +1144,7 @@
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]++;
@@ -1655,26 +1682,6 @@
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;
@@ -1704,7 +1711,7 @@
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);
@@ -1712,21 +1719,38 @@
}
}
-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)
@@ -1734,21 +1758,23 @@
*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;
@@ -1874,7 +1900,7 @@
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;
@@ -1883,7 +1909,11 @@
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;
@@ -1892,7 +1922,13 @@
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);
@@ -1926,7 +1962,11 @@
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:
@@ -2134,6 +2174,30 @@
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:
*
@@ -2214,13 +2278,13 @@
}
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++ != ' ')
@@ -2388,13 +2452,13 @@
/* 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++ != ' ')
@@ -2409,7 +2473,7 @@
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);
@@ -2513,7 +2577,7 @@
oidcpy(&b->branch_tree.versions[1].oid, t);
} else if (*objectish == ':') {
uintmax_t idnum = parse_mark_ref_eol(objectish);
- 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);
if (!oideq(&b->oid, &oe->idx.oid)) {
@@ -2577,7 +2641,7 @@
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);
@@ -2730,7 +2794,7 @@
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
@@ -2751,7 +2815,7 @@
} 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)) {
@@ -2909,7 +2973,7 @@
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);
@@ -2924,12 +2988,12 @@
/* 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);
@@ -2993,18 +3057,54 @@
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)++ != ' ')
@@ -3130,7 +3230,7 @@
die(_("Expected 'to' command, got %s"), command_buf.buf);
e = find_object(&b.oid);
assert(e);
- insert_mark(next_mark, e);
+ insert_mark(&marks, next_mark, e);
}
static char* make_fast_import_path(const char *path)
@@ -3161,6 +3261,8 @@
{
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"))
@@ -3210,6 +3312,27 @@
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++;
+ CALLOC_ARRAY(ms, 1);
+
+ fp = fopen(f, "r");
+ if (!fp)
+ die_errno("cannot read '%s'", f);
+ read_mark_file(&ms, fp, insert_oid_entry);
+ fclose(fp);
+
+ string_list_insert(list, s)->util = ms;
+}
+
static int parse_one_option(const char *option)
{
if (skip_prefix(option, "max-pack-size=", &option)) {
@@ -3272,6 +3395,10 @@
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 (!strcmp(feature, "get-mark")) {
; /* Don't die - this feature is supported */
} else if (!strcmp(feature, "cat-blob")) {
@@ -3377,26 +3504,28 @@
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();
alloc_objects(object_entry_alloc);
strbuf_init(&command_buf, 0);
- atom_table = xcalloc(atom_table_sz, sizeof(struct atom_str*));
- branch_table = xcalloc(branch_table_sz, sizeof(struct branch*));
- avail_tree_table = xcalloc(avail_tree_table_sz, sizeof(struct avail_tree_content*));
+ CALLOC_ARRAY(atom_table, atom_table_sz);
+ CALLOC_ARRAY(branch_table, branch_table_sz);
+ CALLOC_ARRAY(avail_tree_table, avail_tree_table_sz);
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
diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index dc1485c..c2d96f4 100644
--- a/builtin/fetch-pack.c
+++ b/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 @@
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 @@
}
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 @@
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,8 @@
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 +232,15 @@
}
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/builtin/fetch.c b/builtin/fetch.c
index bf6bab8..0b90de8 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -19,7 +19,7 @@
#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"
@@ -27,6 +27,7 @@
#include "branch.h"
#include "promisor-remote.h"
#include "commit-graph.h"
+#include "shallow.h"
#define FORCED_UPDATES_DELAY_WARNING_IN_MS (10 * 1000)
@@ -55,12 +56,14 @@
#define PRUNE_TAGS_BY_DEFAULT 0 /* do we prune tags by default? */
static int all, append, dry_run, force, keep, multiple, update_head_ok;
+static int 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_jobs = -1, submodule_fetch_jobs_config = -1;
static int fetch_parallel_config = 1;
+static int atomic_fetch;
static enum transport_family family;
static const char *depth;
static const char *deepen_since;
@@ -78,6 +81,7 @@
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)
{
@@ -141,6 +145,8 @@
N_("set upstream for git pull/fetch")),
OPT_BOOL('a', "append", &append,
N_("append to .git/FETCH_HEAD instead of overwriting")),
+ OPT_BOOL(0, "atomic", &atomic_fetch,
+ N_("use atomic transaction to update references")),
OPT_STRING(0, "upload-pack", &upload_pack, N_("path"),
N_("path to upload pack on remote end")),
OPT__FORCE(&force, N_("force overwrite of local reference"), 0),
@@ -156,11 +162,13 @@
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")),
@@ -178,15 +186,15 @@
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),
@@ -195,12 +203,16 @@
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()
};
@@ -384,7 +396,7 @@
item = refname_hash_add(&remote_refs, ref->name, &ref->old_oid);
string_list_insert(&remote_refs_list, ref->name);
}
- hashmap_free_entries(&existing_refs, struct refname_hash_entry, ent);
+ hashmap_clear_and_free(&existing_refs, struct refname_hash_entry, ent);
/*
* We may have a final lightweight tag that needs to be
@@ -419,7 +431,7 @@
**tail = rm;
*tail = &rm->next;
}
- hashmap_free_entries(&remote_refs, struct refname_hash_entry, ent);
+ hashmap_clear_and_free(&remote_refs, struct refname_hash_entry, ent);
string_list_clear(&remote_refs_list, 0);
oidset_clear(&fetch_oids);
}
@@ -438,6 +450,7 @@
struct ref *orefs = NULL, **oref_tail = &orefs;
struct hashmap existing_refs;
+ int existing_refs_populated = 0;
if (rs->nr) {
struct refspec *fetch_refspec;
@@ -529,10 +542,17 @@
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) {
@@ -540,6 +560,12 @@
struct refname_hash_entry *peer_item;
unsigned int hash = strhash(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);
@@ -549,7 +575,8 @@
}
}
}
- hashmap_free_entries(&existing_refs, struct refname_hash_entry, ent);
+ if (existing_refs_populated)
+ hashmap_clear_and_free(&existing_refs, struct refname_hash_entry, ent);
return ref_map;
}
@@ -559,13 +586,14 @@
static int s_update_ref(const char *action,
struct ref *ref,
+ struct ref_transaction *transaction,
int check_old)
{
char *msg;
char *rla = getenv("GIT_REFLOG_ACTION");
- struct ref_transaction *transaction;
+ struct ref_transaction *our_transaction = NULL;
struct strbuf err = STRBUF_INIT;
- int ret, df_conflict = 0;
+ int ret;
if (dry_run)
return 0;
@@ -573,31 +601,47 @@
rla = default_rla.buf;
msg = xstrfmt("%s: %s", rla, action);
- transaction = ref_transaction_begin(&err);
- if (!transaction ||
- ref_transaction_update(transaction, ref->name,
- &ref->new_oid,
- check_old ? &ref->old_oid : NULL,
- 0, msg, &err))
- goto fail;
-
- ret = ref_transaction_commit(transaction, &err);
- if (ret) {
- df_conflict = (ret == TRANSACTION_NAME_CONFLICT);
- goto fail;
+ /*
+ * If no transaction was passed to us, we manage the transaction
+ * ourselves. Otherwise, we trust the caller to handle the transaction
+ * lifecycle.
+ */
+ if (!transaction) {
+ transaction = our_transaction = ref_transaction_begin(&err);
+ if (!transaction) {
+ ret = STORE_REF_ERROR_OTHER;
+ goto out;
+ }
}
- ref_transaction_free(transaction);
+ ret = ref_transaction_update(transaction, ref->name, &ref->new_oid,
+ check_old ? &ref->old_oid : NULL,
+ 0, msg, &err);
+ if (ret) {
+ ret = STORE_REF_ERROR_OTHER;
+ goto out;
+ }
+
+ if (our_transaction) {
+ switch (ref_transaction_commit(our_transaction, &err)) {
+ case 0:
+ break;
+ case TRANSACTION_NAME_CONFLICT:
+ ret = STORE_REF_ERROR_DF_CONFLICT;
+ goto out;
+ default:
+ ret = STORE_REF_ERROR_OTHER;
+ goto out;
+ }
+ }
+
+out:
+ ref_transaction_free(our_transaction);
+ if (ret)
+ error("%s", err.buf);
strbuf_release(&err);
free(msg);
- return 0;
-fail:
- ref_transaction_free(transaction);
- error("%s", err.buf);
- strbuf_release(&err);
- free(msg);
- return df_conflict ? STORE_REF_ERROR_DF_CONFLICT
- : STORE_REF_ERROR_OTHER;
+ return ret;
}
static int refcol_width = 10;
@@ -644,7 +688,7 @@
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"))
@@ -735,6 +779,7 @@
}
static int update_local_ref(struct ref *ref,
+ struct ref_transaction *transaction,
const char *remote,
const struct ref *remote_ref,
struct strbuf *display,
@@ -775,7 +820,7 @@
starts_with(ref->name, "refs/tags/")) {
if (force || ref->force) {
int r;
- r = s_update_ref("updating tag", ref, 0);
+ r = s_update_ref("updating tag", ref, transaction, 0);
format_display(display, r ? '!' : 't', _("[tag update]"),
r ? _("unable to update local ref") : NULL,
remote, pretty_ref, summary_width);
@@ -812,7 +857,7 @@
what = _("[new ref]");
}
- r = s_update_ref(msg, ref, 0);
+ r = s_update_ref(msg, ref, transaction, 0);
format_display(display, r ? '!' : '*', what,
r ? _("unable to update local ref") : NULL,
remote, pretty_ref, summary_width);
@@ -834,7 +879,7 @@
strbuf_add_unique_abbrev(&quickref, ¤t->object.oid, DEFAULT_ABBREV);
strbuf_addstr(&quickref, "..");
strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV);
- r = s_update_ref("fast-forward", ref, 1);
+ r = s_update_ref("fast-forward", ref, transaction, 1);
format_display(display, r ? '!' : ' ', quickref.buf,
r ? _("unable to update local ref") : NULL,
remote, pretty_ref, summary_width);
@@ -846,7 +891,7 @@
strbuf_add_unique_abbrev(&quickref, ¤t->object.oid, DEFAULT_ABBREV);
strbuf_addstr(&quickref, "...");
strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV);
- r = s_update_ref("forced-update", ref, 1);
+ r = s_update_ref("forced-update", ref, transaction, 1);
format_display(display, r ? '!' : '+', quickref.buf,
r ? _("unable to update local ref") : _("forced update"),
remote, pretty_ref, summary_width);
@@ -873,6 +918,89 @@
return 0;
}
+struct fetch_head {
+ FILE *fp;
+ struct strbuf buf;
+};
+
+static int open_fetch_head(struct fetch_head *fetch_head)
+{
+ const char *filename = git_path_fetch_head(the_repository);
+
+ if (write_fetch_head) {
+ fetch_head->fp = fopen(filename, "a");
+ if (!fetch_head->fp)
+ return error_errno(_("cannot open %s"), filename);
+ strbuf_init(&fetch_head->buf, 0);
+ } else {
+ fetch_head->fp = NULL;
+ }
+
+ return 0;
+}
+
+static void append_fetch_head(struct fetch_head *fetch_head,
+ const struct object_id *old_oid,
+ enum fetch_head_status fetch_head_status,
+ const char *note,
+ const char *url, size_t url_len)
+{
+ char old_oid_hex[GIT_MAX_HEXSZ + 1];
+ const char *merge_status_marker;
+ size_t i;
+
+ if (!fetch_head->fp)
+ return;
+
+ switch (fetch_head_status) {
+ case FETCH_HEAD_NOT_FOR_MERGE:
+ merge_status_marker = "not-for-merge";
+ break;
+ case FETCH_HEAD_MERGE:
+ merge_status_marker = "";
+ break;
+ default:
+ /* do not write anything to FETCH_HEAD */
+ return;
+ }
+
+ strbuf_addf(&fetch_head->buf, "%s\t%s\t%s",
+ oid_to_hex_r(old_oid_hex, old_oid), merge_status_marker, note);
+ for (i = 0; i < url_len; ++i)
+ if ('\n' == url[i])
+ strbuf_addstr(&fetch_head->buf, "\\n");
+ else
+ strbuf_addch(&fetch_head->buf, url[i]);
+ strbuf_addch(&fetch_head->buf, '\n');
+
+ /*
+ * When using an atomic fetch, we do not want to update FETCH_HEAD if
+ * any of the reference updates fails. We thus have to write all
+ * updates to a buffer first and only commit it as soon as all
+ * references have been successfully updated.
+ */
+ if (!atomic_fetch) {
+ strbuf_write(&fetch_head->buf, fetch_head->fp);
+ strbuf_reset(&fetch_head->buf);
+ }
+}
+
+static void commit_fetch_head(struct fetch_head *fetch_head)
+{
+ if (!fetch_head->fp || !atomic_fetch)
+ return;
+ strbuf_write(&fetch_head->buf, fetch_head->fp);
+}
+
+static void close_fetch_head(struct fetch_head *fetch_head)
+{
+ if (!fetch_head->fp)
+ return;
+
+ fclose(fetch_head->fp);
+ strbuf_release(&fetch_head->buf);
+}
+
static const char warn_show_forced_updates[] =
N_("Fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
@@ -885,20 +1013,20 @@
static int store_updated_refs(const char *raw_url, const char *remote_name,
int connectivity_checked, struct ref *ref_map)
{
- FILE *fp;
+ struct fetch_head fetch_head;
struct commit *commit;
int url_len, i, rc = 0;
- struct strbuf note = STRBUF_INIT;
+ struct strbuf note = STRBUF_INIT, err = STRBUF_INIT;
+ struct ref_transaction *transaction = NULL;
const char *what, *kind;
struct ref *rm;
char *url;
- const char *filename = dry_run ? "/dev/null" : git_path_fetch_head(the_repository);
int want_status;
int summary_width = transport_summary_width(ref_map);
- fp = fopen(filename, "a");
- if (!fp)
- return error_errno(_("cannot open %s"), filename);
+ rc = open_fetch_head(&fetch_head);
+ if (rc)
+ return -1;
if (raw_url)
url = transport_anonymize_url(raw_url);
@@ -908,13 +1036,6 @@
if (!connectivity_checked) {
struct check_connected_options opt = CHECK_CONNECTED_INIT;
- if (filter_options.choice)
- /*
- * Since a filter is specified, objects indirectly
- * referenced by refs are allowed to be absent.
- */
- opt.check_refs_are_promisor_objects_only = 1;
-
rm = ref_map;
if (check_connected(iterate_ref_map, &rm, &opt)) {
rc = error(_("%s did not send all necessary objects\n"), url);
@@ -922,6 +1043,14 @@
}
}
+ if (atomic_fetch) {
+ transaction = ref_transaction_begin(&err);
+ if (!transaction) {
+ error("%s", err.buf);
+ goto abort;
+ }
+ }
+
prepare_format_display(ref_map);
/*
@@ -934,7 +1063,6 @@
want_status++) {
for (rm = ref_map; rm; rm = rm->next) {
struct ref *ref = NULL;
- const char *merge_status_marker = "";
if (rm->status == REF_STATUS_REJECT_SHALLOW) {
if (want_status == FETCH_HEAD_MERGE)
@@ -959,8 +1087,10 @@
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 = "";
@@ -990,37 +1120,27 @@
strbuf_addf(¬e, "%s ", kind);
strbuf_addf(¬e, "'%s' of ", what);
}
- switch (rm->fetch_head_status) {
- case FETCH_HEAD_NOT_FOR_MERGE:
- merge_status_marker = "not-for-merge";
- /* fall-through */
- case FETCH_HEAD_MERGE:
- fprintf(fp, "%s\t%s\t%s",
- oid_to_hex(&rm->old_oid),
- merge_status_marker,
- note.buf);
- for (i = 0; i < url_len; ++i)
- if ('\n' == url[i])
- fputs("\\n", fp);
- else
- fputc(url[i], fp);
- fputc('\n', fp);
- break;
- default:
- /* do not write anything to FETCH_HEAD */
- break;
- }
+
+ append_fetch_head(&fetch_head, &rm->old_oid,
+ rm->fetch_head_status,
+ note.buf, url, url_len);
strbuf_reset(¬e);
if (ref) {
- rc |= update_local_ref(ref, what, rm, ¬e,
- summary_width);
+ rc |= update_local_ref(ref, transaction, 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"),
@@ -1033,6 +1153,17 @@
}
}
+ if (!rc && transaction) {
+ rc = ref_transaction_commit(transaction, &err);
+ if (rc) {
+ error("%s", err.buf);
+ goto abort;
+ }
+ }
+
+ if (!rc)
+ commit_fetch_head(&fetch_head);
+
if (rc & STORE_REF_ERROR_DF_CONFLICT)
error(_("some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting "
@@ -1049,8 +1180,10 @@
abort:
strbuf_release(¬e);
+ strbuf_release(&err);
+ ref_transaction_free(transaction);
free(url);
- fclose(fp);
+ close_fetch_head(&fetch_head);
return rc;
}
@@ -1322,7 +1455,8 @@
int autotags = (transport->remote->fetch_tags == 1);
int retcode = 0;
const struct ref *remote_refs;
- struct argv_array ref_prefixes = ARGV_ARRAY_INIT;
+ struct transport_ls_refs_options transport_ls_refs_options =
+ TRANSPORT_LS_REFS_OPTIONS_INIT;
int must_list_refs = 1;
if (tags == TAGS_DEFAULT) {
@@ -1333,7 +1467,7 @@
}
/* if not appending, truncate FETCH_HEAD */
- if (!append && !dry_run) {
+ if (!append && write_fetch_head) {
retcode = truncate_fetch_head();
if (retcode)
goto cleanup;
@@ -1342,7 +1476,7 @@
if (rs->nr) {
int i;
- refspec_ref_prefixes(rs, &ref_prefixes);
+ refspec_ref_prefixes(rs, &transport_ls_refs_options.ref_prefixes);
/*
* We can avoid listing refs if all of them are exact
@@ -1356,22 +1490,25 @@
}
}
} else if (transport->remote && transport->remote->fetch.nr)
- refspec_ref_prefixes(&transport->remote->fetch, &ref_prefixes);
+ refspec_ref_prefixes(&transport->remote->fetch,
+ &transport_ls_refs_options.ref_prefixes);
if (tags == TAGS_SET || tags == TAGS_DEFAULT) {
must_list_refs = 1;
- if (ref_prefixes.argc)
- argv_array_push(&ref_prefixes, "refs/tags/");
+ if (transport_ls_refs_options.ref_prefixes.nr)
+ strvec_push(&transport_ls_refs_options.ref_prefixes,
+ "refs/tags/");
}
if (must_list_refs) {
trace2_region_enter("fetch", "remote_refs", the_repository);
- remote_refs = transport_get_remote_refs(transport, &ref_prefixes);
+ remote_refs = transport_get_remote_refs(transport,
+ &transport_ls_refs_options);
trace2_region_leave("fetch", "remote_refs", the_repository);
} else
remote_refs = NULL;
- argv_array_clear(&ref_prefixes);
+ strvec_clear(&transport_ls_refs_options.ref_prefixes);
ref_map = get_ref_map(transport->remote, remote_refs, rs,
tags, &autotags);
@@ -1509,35 +1646,38 @@
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 */
@@ -1560,8 +1700,8 @@
remote = state->remotes->items[state->next++].string;
*task_cb = remote;
- argv_array_pushv(&cp->args, state->argv);
- argv_array_push(&cp->args, remote);
+ strvec_pushv(&cp->args, state->argv);
+ strvec_push(&cp->args, remote);
cp->git_cmd = 1;
if (verbosity >= 0)
@@ -1598,22 +1738,22 @@
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",
- "--no-write-commit-graph", NULL);
+ strvec_pushl(&argv, "fetch", "--append", "--no-auto-gc",
+ "--no-write-commit-graph", NULL);
add_options_to_argv(&argv);
if (max_children != 1 && list->nr != 1) {
- struct parallel_fetch_state state = { argv.argv, list, 0, 0 };
+ struct parallel_fetch_state state = { argv.v, list, 0, 0 };
- argv_array_push(&argv, "--end-of-options");
+ strvec_push(&argv, "--end-of-options");
result = run_processes_parallel_tr2(max_children,
&fetch_next_remote,
&fetch_failed_to_start,
@@ -1626,17 +1766,17 @@
} else
for (i = 0; i < list->nr; i++) {
const char *name = list->items[i].string;
- argv_array_push(&argv, name);
+ strvec_push(&argv, name);
if (verbosity >= 0)
printf(_("Fetching %s\n"), name);
- if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
+ if (run_command_v_opt(argv.v, RUN_GIT_CMD)) {
error(_("Could not fetch %s"), name);
result = 1;
}
- argv_array_pop(&argv);
+ strvec_pop(&argv);
}
- argv_array_clear(&argv);
+ strvec_clear(&argv);
return !!result;
}
@@ -1664,7 +1804,7 @@
* 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.
+ * remote if there is currently no default filter-spec.
*/
if (filter_options.choice) {
partial_clone_register(remote->name, &filter_options);
@@ -1681,7 +1821,8 @@
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;
@@ -1724,20 +1865,24 @@
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;
@@ -1759,21 +1904,31 @@
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");
/* 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]);
- fetch_config_from_gitmodules(&submodule_fetch_jobs_config,
- &recurse_submodules);
+ strbuf_addf(&default_rla, " %s", anon);
+ free(anon);
+ }
+
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)
@@ -1797,8 +1952,9 @@
if (depth || deepen_since || deepen_not.nr)
deepen = 1;
- if (filter_options.choice && !has_promisor_remote())
- 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)
@@ -1833,7 +1989,7 @@
if (remote) {
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;
@@ -1841,6 +1997,14 @@
die(_("--filter can only be used with the remote "
"configured in extensions.partialclone"));
+ if (atomic_fetch)
+ die(_("--atomic can only be used when fetching "
+ "from one remote"));
+
+ if (stdin_refspecs)
+ die(_("--stdin can only be used when fetching "
+ "from one remote"));
+
if (max_children < 0)
max_children = fetch_parallel_config;
@@ -1849,7 +2013,7 @@
}
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)
@@ -1865,7 +2029,7 @@
recurse_submodules_default,
verbosity < 0,
max_children);
- argv_array_clear(&options);
+ strvec_clear(&options);
}
string_list_clear(&list, 0);
@@ -1886,13 +2050,8 @@
close_object_store(the_repository->objects);
- 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);
- }
+ if (enable_auto_gc)
+ run_auto_maintenance(verbosity < 0);
return result;
}
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index 736f666..48a8699 100644
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -1,666 +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, *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);
-}
-
-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/builtin/for-each-ref.c b/builtin/for-each-ref.c
index 465153e..cb9c81a 100644
--- a/builtin/for-each-ref.c
+++ b/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 @@
if (!sorting)
sorting = ref_default_sorting();
- sorting->ignore_case = icase;
+ ref_sorting_set_sort_flags_all(sorting, REF_SORTING_ICASE, icase);
filter.ignore_case = icase;
filter.name_patterns = argv;
diff --git a/builtin/for-each-repo.c b/builtin/for-each-repo.c
new file mode 100644
index 0000000..52be64a
--- /dev/null
+++ b/builtin/for-each-repo.c
@@ -0,0 +1,65 @@
+#include "cache.h"
+#include "config.h"
+#include "builtin.h"
+#include "parse-options.h"
+#include "run-command.h"
+#include "string-list.h"
+
+static const char * const for_each_repo_usage[] = {
+ N_("git for-each-repo --config=<config> <command-args>"),
+ NULL
+};
+
+static int run_command_on_repo(const char *path,
+ void *cbdata)
+{
+ int i;
+ struct child_process child = CHILD_PROCESS_INIT;
+ struct strvec *args = (struct strvec *)cbdata;
+
+ child.git_cmd = 1;
+ strvec_pushl(&child.args, "-C", path, NULL);
+
+ for (i = 0; i < args->nr; i++)
+ strvec_push(&child.args, args->v[i]);
+
+ return run_command(&child);
+}
+
+int cmd_for_each_repo(int argc, const char **argv, const char *prefix)
+{
+ static const char *config_key = NULL;
+ int i, result = 0;
+ const struct string_list *values;
+ struct strvec args = STRVEC_INIT;
+
+ const struct option options[] = {
+ OPT_STRING(0, "config", &config_key, N_("config"),
+ N_("config key storing a list of repository paths")),
+ OPT_END()
+ };
+
+ argc = parse_options(argc, argv, prefix, options, for_each_repo_usage,
+ PARSE_OPT_STOP_AT_NON_OPTION);
+
+ if (!config_key)
+ die(_("missing --config=<config>"));
+
+ for (i = 0; i < argc; i++)
+ strvec_push(&args, argv[i]);
+
+ values = repo_config_get_value_multi(the_repository,
+ config_key);
+
+ /*
+ * Do nothing on an empty list, which is equivalent to the case
+ * where the config variable does not exist at all.
+ */
+ if (!values)
+ return 0;
+
+ for (i = 0; !result && i < values->nr; i++)
+ result = run_command_on_repo(values->items[i].string, &args);
+
+ return result;
+}
diff --git a/builtin/fsck.c b/builtin/fsck.c
index 8d13794..821e779 100644
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -49,6 +49,7 @@
#define ERROR_PACK 04
#define ERROR_REFS 010
#define ERROR_COMMIT_GRAPH 020
+#define ERROR_MULTI_PACK_INDEX 040
static const char *describe_object(const struct object_id *oid)
{
@@ -72,25 +73,7 @@
static int fsck_config(const char *var, const char *value, void *cb)
{
- if (strcmp(var, "fsck.skiplist") == 0) {
- const char *path;
- struct strbuf sb = STRBUF_INIT;
-
- if (git_config_pathname(&path, var, value))
- return 1;
- strbuf_addf(&sb, "skiplist=%s", path);
- free((char *)path);
- fsck_set_msg_types(&fsck_obj_options, sb.buf);
- strbuf_release(&sb);
- return 0;
- }
-
- if (skip_prefix(var, "fsck.", &var)) {
- fsck_set_msg_type(&fsck_obj_options, var, value);
- return 0;
- }
-
- return git_default_config(var, value, cb);
+ return fsck_config_internal(var, value, cb, &fsck_obj_options);
}
static int objerror(struct object *obj, const char *err)
@@ -167,7 +150,7 @@
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->oid, parent->type),
@@ -240,7 +223,7 @@
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;
@@ -576,7 +559,7 @@
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;
@@ -952,7 +935,7 @@
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/builtin/gc.c b/builtin/gc.c
index 8e0b9cf..ef7226d 100644
--- a/builtin/gc.c
+++ b/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"
@@ -28,6 +28,10 @@
#include "blob.h"
#include "tree.h"
#include "promisor-remote.h"
+#include "refs.h"
+#include "remote.h"
+#include "object-store.h"
+#include "exec-cmd.h"
#define FAILED_RUN "failed to run %s"
@@ -50,12 +54,11 @@
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 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;
@@ -88,7 +91,7 @@
*/
int saved_errno = errno;
fprintf(stderr, _("Failed to fstat %s: %s"),
- get_tempfile_path(log_lock.tempfile),
+ get_lock_file_path(&log_lock),
strerror(saved_errno));
fflush(stderr);
commit_lock_file(&log_lock);
@@ -159,6 +162,15 @@
git_config(git_default_config, NULL);
}
+struct maintenance_run_opts;
+static int maintenance_task_pack_refs(MAYBE_UNUSED struct maintenance_run_opts *opts)
+{
+ struct strvec pack_refs_cmd = STRVEC_INIT;
+ strvec_pushl(&pack_refs_cmd, "pack-refs", "--all", "--prune", NULL);
+
+ return run_command_v_opt(pack_refs_cmd.v, RUN_GIT_CMD);
+}
+
static int too_many_loose_objects(void)
{
/*
@@ -297,7 +309,7 @@
/* and then obj_hash[], underestimated in fact */
heap += sizeof(struct object *) * nr_objects;
/* revindex is used also */
- heap += sizeof(struct revindex_entry) * nr_objects;
+ heap += (sizeof(off_t) + sizeof(uint32_t)) * nr_objects;
/*
* read_sha1_file() (either at delta calculation phase, or
* writing phase) also fills up the delta base cache
@@ -311,18 +323,18 @@
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)
@@ -331,7 +343,7 @@
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)
@@ -514,11 +526,11 @@
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 && maintenance_task_pack_refs(NULL))
+ die(FAILED_RUN, "pack-refs");
- 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)
@@ -530,7 +542,7 @@
const char *name;
pid_t pid;
int daemonized = 0;
- int keep_base_pack = -1;
+ int keep_largest_pack = -1;
timestamp_t dummy;
struct option builtin_gc_options[] = {
@@ -544,7 +556,7 @@
OPT_BOOL_F(0, "force", &force,
N_("force running gc even if there may be another gc running"),
PARSE_OPT_NOCOMPLETE),
- OPT_BOOL(0, "keep-largest-pack", &keep_base_pack,
+ OPT_BOOL(0, "keep-largest-pack", &keep_largest_pack,
N_("repack all other packs except the largest pack")),
OPT_END()
};
@@ -552,12 +564,11 @@
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(&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();
@@ -576,14 +587,14 @@
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) {
/*
@@ -621,8 +632,8 @@
} else {
struct string_list keep_pack = STRING_LIST_INIT_NODUP;
- if (keep_base_pack != -1) {
- if (keep_base_pack)
+ if (keep_largest_pack != -1) {
+ if (keep_largest_pack)
find_base_packs(&keep_pack, 0);
} else if (big_pack_threshold) {
find_base_packs(&keep_pack, big_pack_threshold);
@@ -653,29 +664,29 @@
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");
+ strvec_push(&prune, "--no-progress");
if (has_promisor_remote())
- 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,
+ "--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);
@@ -699,3 +710,1330 @@
return 0;
}
+
+static const char *const builtin_maintenance_run_usage[] = {
+ N_("git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"),
+ NULL
+};
+
+enum schedule_priority {
+ SCHEDULE_NONE = 0,
+ SCHEDULE_WEEKLY = 1,
+ SCHEDULE_DAILY = 2,
+ SCHEDULE_HOURLY = 3,
+};
+
+static enum schedule_priority parse_schedule(const char *value)
+{
+ if (!value)
+ return SCHEDULE_NONE;
+ if (!strcasecmp(value, "hourly"))
+ return SCHEDULE_HOURLY;
+ if (!strcasecmp(value, "daily"))
+ return SCHEDULE_DAILY;
+ if (!strcasecmp(value, "weekly"))
+ return SCHEDULE_WEEKLY;
+ return SCHEDULE_NONE;
+}
+
+static int maintenance_opt_schedule(const struct option *opt, const char *arg,
+ int unset)
+{
+ enum schedule_priority *priority = opt->value;
+
+ if (unset)
+ die(_("--no-schedule is not allowed"));
+
+ *priority = parse_schedule(arg);
+
+ if (!*priority)
+ die(_("unrecognized --schedule argument '%s'"), arg);
+
+ return 0;
+}
+
+struct maintenance_run_opts {
+ int auto_flag;
+ int quiet;
+ enum schedule_priority schedule;
+};
+
+/* 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_iterated_oid(oid, &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) ||
+ commit_graph_position(commit) != COMMIT_NOT_FROM_GRAPH)
+ return 0;
+
+ data->num_not_in_graph++;
+
+ if (data->num_not_in_graph >= data->limit)
+ return 1;
+
+ 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);
+
+ repo_clear_commit_marks(the_repository, 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)
+{
+ prepare_repo_settings(the_repository);
+ if (!the_repository->settings.core_commit_graph)
+ return 0;
+
+ close_object_store(the_repository->objects);
+ if (run_write_commit_graph(opts)) {
+ error(_("failed to write commit-graph"));
+ return 1;
+ }
+
+ return 0;
+}
+
+static int fetch_remote(const char *remote, struct maintenance_run_opts *opts)
+{
+ struct child_process child = CHILD_PROCESS_INIT;
+
+ child.git_cmd = 1;
+ strvec_pushl(&child.args, "fetch", remote, "--prune", "--no-tags",
+ "--no-write-fetch-head", "--recurse-submodules=no",
+ "--refmap=", NULL);
+
+ if (opts->quiet)
+ strvec_push(&child.args, "--quiet");
+
+ strvec_pushf(&child.args, "+refs/heads/*:refs/prefetch/%s/*", remote);
+
+ return !!run_command(&child);
+}
+
+static int append_remote(struct remote *remote, void *cbdata)
+{
+ struct string_list *remotes = (struct string_list *)cbdata;
+
+ string_list_append(remotes, remote->name);
+ return 0;
+}
+
+static int maintenance_task_prefetch(struct maintenance_run_opts *opts)
+{
+ int result = 0;
+ struct string_list_item *item;
+ struct string_list remotes = STRING_LIST_INIT_DUP;
+
+ git_config_set_multivar_gently("log.excludedecoration",
+ "refs/prefetch/",
+ "refs/prefetch/",
+ CONFIG_FLAGS_FIXED_VALUE |
+ CONFIG_FLAGS_MULTI_REPLACE);
+
+ if (for_each_remote(append_remote, &remotes)) {
+ error(_("failed to fill remotes"));
+ result = 1;
+ goto cleanup;
+ }
+
+ for_each_string_list_item(item, &remotes)
+ result |= fetch_remote(item->string, opts);
+
+cleanup:
+ string_list_clear(&remotes, 0);
+ return result;
+}
+
+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);
+}
+
+static int prune_packed(struct maintenance_run_opts *opts)
+{
+ struct child_process child = CHILD_PROCESS_INIT;
+
+ child.git_cmd = 1;
+ strvec_push(&child.args, "prune-packed");
+
+ if (opts->quiet)
+ strvec_push(&child.args, "--quiet");
+
+ return !!run_command(&child);
+}
+
+struct write_loose_object_data {
+ FILE *in;
+ int count;
+ int batch_size;
+};
+
+static int loose_object_auto_limit = 100;
+
+static int loose_object_count(const struct object_id *oid,
+ const char *path,
+ void *data)
+{
+ int *count = (int*)data;
+ if (++(*count) >= loose_object_auto_limit)
+ return 1;
+ return 0;
+}
+
+static int loose_object_auto_condition(void)
+{
+ int count = 0;
+
+ git_config_get_int("maintenance.loose-objects.auto",
+ &loose_object_auto_limit);
+
+ if (!loose_object_auto_limit)
+ return 0;
+ if (loose_object_auto_limit < 0)
+ return 1;
+
+ return for_each_loose_file_in_objdir(the_repository->objects->odb->path,
+ loose_object_count,
+ NULL, NULL, &count);
+}
+
+static int bail_on_loose(const struct object_id *oid,
+ const char *path,
+ void *data)
+{
+ return 1;
+}
+
+static int write_loose_object_to_stdin(const struct object_id *oid,
+ const char *path,
+ void *data)
+{
+ struct write_loose_object_data *d = (struct write_loose_object_data *)data;
+
+ fprintf(d->in, "%s\n", oid_to_hex(oid));
+
+ return ++(d->count) > d->batch_size;
+}
+
+static int pack_loose(struct maintenance_run_opts *opts)
+{
+ struct repository *r = the_repository;
+ int result = 0;
+ struct write_loose_object_data data;
+ struct child_process pack_proc = CHILD_PROCESS_INIT;
+
+ /*
+ * Do not start pack-objects process
+ * if there are no loose objects.
+ */
+ if (!for_each_loose_file_in_objdir(r->objects->odb->path,
+ bail_on_loose,
+ NULL, NULL, NULL))
+ return 0;
+
+ pack_proc.git_cmd = 1;
+
+ strvec_push(&pack_proc.args, "pack-objects");
+ if (opts->quiet)
+ strvec_push(&pack_proc.args, "--quiet");
+ strvec_pushf(&pack_proc.args, "%s/pack/loose", r->objects->odb->path);
+
+ pack_proc.in = -1;
+
+ if (start_command(&pack_proc)) {
+ error(_("failed to start 'git pack-objects' process"));
+ return 1;
+ }
+
+ data.in = xfdopen(pack_proc.in, "w");
+ data.count = 0;
+ data.batch_size = 50000;
+
+ for_each_loose_file_in_objdir(r->objects->odb->path,
+ write_loose_object_to_stdin,
+ NULL,
+ NULL,
+ &data);
+
+ fclose(data.in);
+
+ if (finish_command(&pack_proc)) {
+ error(_("failed to finish 'git pack-objects' process"));
+ result = 1;
+ }
+
+ return result;
+}
+
+static int maintenance_task_loose_objects(struct maintenance_run_opts *opts)
+{
+ return prune_packed(opts) || pack_loose(opts);
+}
+
+static int incremental_repack_auto_condition(void)
+{
+ struct packed_git *p;
+ int enabled;
+ int incremental_repack_auto_limit = 10;
+ int count = 0;
+
+ if (git_config_get_bool("core.multiPackIndex", &enabled) ||
+ !enabled)
+ return 0;
+
+ git_config_get_int("maintenance.incremental-repack.auto",
+ &incremental_repack_auto_limit);
+
+ if (!incremental_repack_auto_limit)
+ return 0;
+ if (incremental_repack_auto_limit < 0)
+ return 1;
+
+ for (p = get_packed_git(the_repository);
+ count < incremental_repack_auto_limit && p;
+ p = p->next) {
+ if (!p->multi_pack_index)
+ count++;
+ }
+
+ return count >= incremental_repack_auto_limit;
+}
+
+static int multi_pack_index_write(struct maintenance_run_opts *opts)
+{
+ struct child_process child = CHILD_PROCESS_INIT;
+
+ child.git_cmd = 1;
+ strvec_pushl(&child.args, "multi-pack-index", "write", NULL);
+
+ if (opts->quiet)
+ strvec_push(&child.args, "--no-progress");
+
+ if (run_command(&child))
+ return error(_("failed to write multi-pack-index"));
+
+ return 0;
+}
+
+static int multi_pack_index_expire(struct maintenance_run_opts *opts)
+{
+ struct child_process child = CHILD_PROCESS_INIT;
+
+ child.git_cmd = 1;
+ strvec_pushl(&child.args, "multi-pack-index", "expire", NULL);
+
+ if (opts->quiet)
+ strvec_push(&child.args, "--no-progress");
+
+ close_object_store(the_repository->objects);
+
+ if (run_command(&child))
+ return error(_("'git multi-pack-index expire' failed"));
+
+ return 0;
+}
+
+#define TWO_GIGABYTES (INT32_MAX)
+
+static off_t get_auto_pack_size(void)
+{
+ /*
+ * The "auto" value is special: we optimize for
+ * one large pack-file (i.e. from a clone) and
+ * expect the rest to be small and they can be
+ * repacked quickly.
+ *
+ * The strategy we select here is to select a
+ * size that is one more than the second largest
+ * pack-file. This ensures that we will repack
+ * at least two packs if there are three or more
+ * packs.
+ */
+ off_t max_size = 0;
+ off_t second_largest_size = 0;
+ off_t result_size;
+ struct packed_git *p;
+ struct repository *r = the_repository;
+
+ reprepare_packed_git(r);
+ for (p = get_all_packs(r); p; p = p->next) {
+ if (p->pack_size > max_size) {
+ second_largest_size = max_size;
+ max_size = p->pack_size;
+ } else if (p->pack_size > second_largest_size)
+ second_largest_size = p->pack_size;
+ }
+
+ result_size = second_largest_size + 1;
+
+ /* But limit ourselves to a batch size of 2g */
+ if (result_size > TWO_GIGABYTES)
+ result_size = TWO_GIGABYTES;
+
+ return result_size;
+}
+
+static int multi_pack_index_repack(struct maintenance_run_opts *opts)
+{
+ struct child_process child = CHILD_PROCESS_INIT;
+
+ child.git_cmd = 1;
+ strvec_pushl(&child.args, "multi-pack-index", "repack", NULL);
+
+ if (opts->quiet)
+ strvec_push(&child.args, "--no-progress");
+
+ strvec_pushf(&child.args, "--batch-size=%"PRIuMAX,
+ (uintmax_t)get_auto_pack_size());
+
+ close_object_store(the_repository->objects);
+
+ if (run_command(&child))
+ return error(_("'git multi-pack-index repack' failed"));
+
+ return 0;
+}
+
+static int maintenance_task_incremental_repack(struct maintenance_run_opts *opts)
+{
+ prepare_repo_settings(the_repository);
+ if (!the_repository->settings.core_multi_pack_index) {
+ warning(_("skipping incremental-repack task because core.multiPackIndex is disabled"));
+ return 0;
+ }
+
+ if (multi_pack_index_write(opts))
+ return 1;
+ if (multi_pack_index_expire(opts))
+ return 1;
+ if (multi_pack_index_repack(opts))
+ return 1;
+ return 0;
+}
+
+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;
+
+ enum schedule_priority schedule;
+
+ /* -1 if not selected. */
+ int selected_order;
+};
+
+enum maintenance_task_label {
+ TASK_PREFETCH,
+ TASK_LOOSE_OBJECTS,
+ TASK_INCREMENTAL_REPACK,
+ TASK_GC,
+ TASK_COMMIT_GRAPH,
+ TASK_PACK_REFS,
+
+ /* Leave as final value */
+ TASK__COUNT
+};
+
+static struct maintenance_task tasks[] = {
+ [TASK_PREFETCH] = {
+ "prefetch",
+ maintenance_task_prefetch,
+ },
+ [TASK_LOOSE_OBJECTS] = {
+ "loose-objects",
+ maintenance_task_loose_objects,
+ loose_object_auto_condition,
+ },
+ [TASK_INCREMENTAL_REPACK] = {
+ "incremental-repack",
+ maintenance_task_incremental_repack,
+ incremental_repack_auto_condition,
+ },
+ [TASK_GC] = {
+ "gc",
+ maintenance_task_gc,
+ need_to_gc,
+ 1,
+ },
+ [TASK_COMMIT_GRAPH] = {
+ "commit-graph",
+ maintenance_task_commit_graph,
+ should_write_commit_graph,
+ },
+ [TASK_PACK_REFS] = {
+ "pack-refs",
+ maintenance_task_pack_refs,
+ NULL,
+ },
+};
+
+static int compare_tasks_by_selection(const void *a_, const void *b_)
+{
+ const struct maintenance_task *a = a_;
+ const struct maintenance_task *b = 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;
+
+ if (opts->schedule && tasks[i].schedule < opts->schedule)
+ 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_maintenance_strategy(void)
+{
+ char *config_str;
+
+ if (git_config_get_string("maintenance.strategy", &config_str))
+ return;
+
+ if (!strcasecmp(config_str, "incremental")) {
+ tasks[TASK_GC].schedule = SCHEDULE_NONE;
+ tasks[TASK_COMMIT_GRAPH].enabled = 1;
+ tasks[TASK_COMMIT_GRAPH].schedule = SCHEDULE_HOURLY;
+ tasks[TASK_PREFETCH].enabled = 1;
+ tasks[TASK_PREFETCH].schedule = SCHEDULE_HOURLY;
+ tasks[TASK_INCREMENTAL_REPACK].enabled = 1;
+ tasks[TASK_INCREMENTAL_REPACK].schedule = SCHEDULE_DAILY;
+ tasks[TASK_LOOSE_OBJECTS].enabled = 1;
+ tasks[TASK_LOOSE_OBJECTS].schedule = SCHEDULE_DAILY;
+ tasks[TASK_PACK_REFS].enabled = 1;
+ tasks[TASK_PACK_REFS].schedule = SCHEDULE_WEEKLY;
+ }
+}
+
+static void initialize_task_config(int schedule)
+{
+ int i;
+ struct strbuf config_name = STRBUF_INIT;
+ gc_config();
+
+ if (schedule)
+ initialize_maintenance_strategy();
+
+ for (i = 0; i < TASK__COUNT; i++) {
+ int config_value;
+ char *config_str;
+
+ strbuf_reset(&config_name);
+ 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_reset(&config_name);
+ strbuf_addf(&config_name, "maintenance.%s.schedule",
+ tasks[i].name);
+
+ if (!git_config_get_string(config_name.buf, &config_str)) {
+ tasks[i].schedule = parse_schedule(config_str);
+ free(config_str);
+ }
+ }
+
+ 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_CALLBACK(0, "schedule", &opts.schedule, N_("frequency"),
+ N_("run tasks based on frequency"),
+ maintenance_opt_schedule),
+ 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);
+
+ 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 (opts.auto_flag && opts.schedule)
+ die(_("use at most one of --auto and --schedule=<frequency>"));
+
+ initialize_task_config(opts.schedule);
+
+ if (argc != 0)
+ usage_with_options(builtin_maintenance_run_usage,
+ builtin_maintenance_run_options);
+ return maintenance_run_tasks(&opts);
+}
+
+static char *get_maintpath(void)
+{
+ struct strbuf sb = STRBUF_INIT;
+ const char *p = the_repository->worktree ?
+ the_repository->worktree : the_repository->gitdir;
+
+ strbuf_realpath(&sb, p, 1);
+ return strbuf_detach(&sb, NULL);
+}
+
+static int maintenance_register(void)
+{
+ int rc;
+ char *config_value;
+ struct child_process config_set = CHILD_PROCESS_INIT;
+ struct child_process config_get = CHILD_PROCESS_INIT;
+ char *maintpath = get_maintpath();
+
+ /* Disable foreground maintenance */
+ git_config_set("maintenance.auto", "false");
+
+ /* Set maintenance strategy, if unset */
+ if (!git_config_get_string("maintenance.strategy", &config_value))
+ free(config_value);
+ else
+ git_config_set("maintenance.strategy", "incremental");
+
+ config_get.git_cmd = 1;
+ strvec_pushl(&config_get.args, "config", "--global", "--get",
+ "--fixed-value", "maintenance.repo", maintpath, NULL);
+ config_get.out = -1;
+
+ if (start_command(&config_get)) {
+ rc = error(_("failed to run 'git config'"));
+ goto done;
+ }
+
+ /* We already have this value in our config! */
+ if (!finish_command(&config_get)) {
+ rc = 0;
+ goto done;
+ }
+
+ config_set.git_cmd = 1;
+ strvec_pushl(&config_set.args, "config", "--add", "--global", "maintenance.repo",
+ maintpath, NULL);
+
+ rc = run_command(&config_set);
+
+done:
+ free(maintpath);
+ return rc;
+}
+
+static int maintenance_unregister(void)
+{
+ int rc;
+ struct child_process config_unset = CHILD_PROCESS_INIT;
+ char *maintpath = get_maintpath();
+
+ config_unset.git_cmd = 1;
+ strvec_pushl(&config_unset.args, "config", "--global", "--unset",
+ "--fixed-value", "maintenance.repo", maintpath, NULL);
+
+ rc = run_command(&config_unset);
+ free(maintpath);
+ return rc;
+}
+
+static const char *get_frequency(enum schedule_priority schedule)
+{
+ switch (schedule) {
+ case SCHEDULE_HOURLY:
+ return "hourly";
+ case SCHEDULE_DAILY:
+ return "daily";
+ case SCHEDULE_WEEKLY:
+ return "weekly";
+ default:
+ BUG("invalid schedule %d", schedule);
+ }
+}
+
+static char *launchctl_service_name(const char *frequency)
+{
+ struct strbuf label = STRBUF_INIT;
+ strbuf_addf(&label, "org.git-scm.git.%s", frequency);
+ return strbuf_detach(&label, NULL);
+}
+
+static char *launchctl_service_filename(const char *name)
+{
+ char *expanded;
+ struct strbuf filename = STRBUF_INIT;
+ strbuf_addf(&filename, "~/Library/LaunchAgents/%s.plist", name);
+
+ expanded = expand_user_path(filename.buf, 1);
+ if (!expanded)
+ die(_("failed to expand path '%s'"), filename.buf);
+
+ strbuf_release(&filename);
+ return expanded;
+}
+
+static char *launchctl_get_uid(void)
+{
+ return xstrfmt("gui/%d", getuid());
+}
+
+static int launchctl_boot_plist(int enable, const char *filename, const char *cmd)
+{
+ int result;
+ struct child_process child = CHILD_PROCESS_INIT;
+ char *uid = launchctl_get_uid();
+
+ strvec_split(&child.args, cmd);
+ if (enable)
+ strvec_push(&child.args, "bootstrap");
+ else
+ strvec_push(&child.args, "bootout");
+ strvec_push(&child.args, uid);
+ strvec_push(&child.args, filename);
+
+ child.no_stderr = 1;
+ child.no_stdout = 1;
+
+ if (start_command(&child))
+ die(_("failed to start launchctl"));
+
+ result = finish_command(&child);
+
+ free(uid);
+ return result;
+}
+
+static int launchctl_remove_plist(enum schedule_priority schedule, const char *cmd)
+{
+ const char *frequency = get_frequency(schedule);
+ char *name = launchctl_service_name(frequency);
+ char *filename = launchctl_service_filename(name);
+ int result = launchctl_boot_plist(0, filename, cmd);
+ unlink(filename);
+ free(filename);
+ free(name);
+ return result;
+}
+
+static int launchctl_remove_plists(const char *cmd)
+{
+ return launchctl_remove_plist(SCHEDULE_HOURLY, cmd) ||
+ launchctl_remove_plist(SCHEDULE_DAILY, cmd) ||
+ launchctl_remove_plist(SCHEDULE_WEEKLY, cmd);
+}
+
+static int launchctl_schedule_plist(const char *exec_path, enum schedule_priority schedule, const char *cmd)
+{
+ FILE *plist;
+ int i;
+ const char *preamble, *repeat;
+ const char *frequency = get_frequency(schedule);
+ char *name = launchctl_service_name(frequency);
+ char *filename = launchctl_service_filename(name);
+
+ if (safe_create_leading_directories(filename))
+ die(_("failed to create directories for '%s'"), filename);
+ plist = xfopen(filename, "w");
+
+ preamble = "<?xml version=\"1.0\"?>\n"
+ "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">\n"
+ "<plist version=\"1.0\">"
+ "<dict>\n"
+ "<key>Label</key><string>%s</string>\n"
+ "<key>ProgramArguments</key>\n"
+ "<array>\n"
+ "<string>%s/git</string>\n"
+ "<string>--exec-path=%s</string>\n"
+ "<string>for-each-repo</string>\n"
+ "<string>--config=maintenance.repo</string>\n"
+ "<string>maintenance</string>\n"
+ "<string>run</string>\n"
+ "<string>--schedule=%s</string>\n"
+ "</array>\n"
+ "<key>StartCalendarInterval</key>\n"
+ "<array>\n";
+ fprintf(plist, preamble, name, exec_path, exec_path, frequency);
+
+ switch (schedule) {
+ case SCHEDULE_HOURLY:
+ repeat = "<dict>\n"
+ "<key>Hour</key><integer>%d</integer>\n"
+ "<key>Minute</key><integer>0</integer>\n"
+ "</dict>\n";
+ for (i = 1; i <= 23; i++)
+ fprintf(plist, repeat, i);
+ break;
+
+ case SCHEDULE_DAILY:
+ repeat = "<dict>\n"
+ "<key>Day</key><integer>%d</integer>\n"
+ "<key>Hour</key><integer>0</integer>\n"
+ "<key>Minute</key><integer>0</integer>\n"
+ "</dict>\n";
+ for (i = 1; i <= 6; i++)
+ fprintf(plist, repeat, i);
+ break;
+
+ case SCHEDULE_WEEKLY:
+ fprintf(plist,
+ "<dict>\n"
+ "<key>Day</key><integer>0</integer>\n"
+ "<key>Hour</key><integer>0</integer>\n"
+ "<key>Minute</key><integer>0</integer>\n"
+ "</dict>\n");
+ break;
+
+ default:
+ /* unreachable */
+ break;
+ }
+ fprintf(plist, "</array>\n</dict>\n</plist>\n");
+ fclose(plist);
+
+ /* bootout might fail if not already running, so ignore */
+ launchctl_boot_plist(0, filename, cmd);
+ if (launchctl_boot_plist(1, filename, cmd))
+ die(_("failed to bootstrap service %s"), filename);
+
+ free(filename);
+ free(name);
+ return 0;
+}
+
+static int launchctl_add_plists(const char *cmd)
+{
+ const char *exec_path = git_exec_path();
+
+ return launchctl_schedule_plist(exec_path, SCHEDULE_HOURLY, cmd) ||
+ launchctl_schedule_plist(exec_path, SCHEDULE_DAILY, cmd) ||
+ launchctl_schedule_plist(exec_path, SCHEDULE_WEEKLY, cmd);
+}
+
+static int launchctl_update_schedule(int run_maintenance, int fd, const char *cmd)
+{
+ if (run_maintenance)
+ return launchctl_add_plists(cmd);
+ else
+ return launchctl_remove_plists(cmd);
+}
+
+static char *schtasks_task_name(const char *frequency)
+{
+ struct strbuf label = STRBUF_INIT;
+ strbuf_addf(&label, "Git Maintenance (%s)", frequency);
+ return strbuf_detach(&label, NULL);
+}
+
+static int schtasks_remove_task(enum schedule_priority schedule, const char *cmd)
+{
+ int result;
+ struct strvec args = STRVEC_INIT;
+ const char *frequency = get_frequency(schedule);
+ char *name = schtasks_task_name(frequency);
+
+ strvec_split(&args, cmd);
+ strvec_pushl(&args, "/delete", "/tn", name, "/f", NULL);
+
+ result = run_command_v_opt(args.v, 0);
+
+ strvec_clear(&args);
+ free(name);
+ return result;
+}
+
+static int schtasks_remove_tasks(const char *cmd)
+{
+ return schtasks_remove_task(SCHEDULE_HOURLY, cmd) ||
+ schtasks_remove_task(SCHEDULE_DAILY, cmd) ||
+ schtasks_remove_task(SCHEDULE_WEEKLY, cmd);
+}
+
+static int schtasks_schedule_task(const char *exec_path, enum schedule_priority schedule, const char *cmd)
+{
+ int result;
+ struct child_process child = CHILD_PROCESS_INIT;
+ const char *xml;
+ struct tempfile *tfile;
+ const char *frequency = get_frequency(schedule);
+ char *name = schtasks_task_name(frequency);
+ struct strbuf tfilename = STRBUF_INIT;
+
+ strbuf_addf(&tfilename, "%s/schedule_%s_XXXXXX",
+ get_git_common_dir(), frequency);
+ tfile = xmks_tempfile(tfilename.buf);
+ strbuf_release(&tfilename);
+
+ if (!fdopen_tempfile(tfile, "w"))
+ die(_("failed to create temp xml file"));
+
+ xml = "<?xml version=\"1.0\" ?>\n"
+ "<Task version=\"1.4\" xmlns=\"http://schemas.microsoft.com/windows/2004/02/mit/task\">\n"
+ "<Triggers>\n"
+ "<CalendarTrigger>\n";
+ fputs(xml, tfile->fp);
+
+ switch (schedule) {
+ case SCHEDULE_HOURLY:
+ fprintf(tfile->fp,
+ "<StartBoundary>2020-01-01T01:00:00</StartBoundary>\n"
+ "<Enabled>true</Enabled>\n"
+ "<ScheduleByDay>\n"
+ "<DaysInterval>1</DaysInterval>\n"
+ "</ScheduleByDay>\n"
+ "<Repetition>\n"
+ "<Interval>PT1H</Interval>\n"
+ "<Duration>PT23H</Duration>\n"
+ "<StopAtDurationEnd>false</StopAtDurationEnd>\n"
+ "</Repetition>\n");
+ break;
+
+ case SCHEDULE_DAILY:
+ fprintf(tfile->fp,
+ "<StartBoundary>2020-01-01T00:00:00</StartBoundary>\n"
+ "<Enabled>true</Enabled>\n"
+ "<ScheduleByWeek>\n"
+ "<DaysOfWeek>\n"
+ "<Monday />\n"
+ "<Tuesday />\n"
+ "<Wednesday />\n"
+ "<Thursday />\n"
+ "<Friday />\n"
+ "<Saturday />\n"
+ "</DaysOfWeek>\n"
+ "<WeeksInterval>1</WeeksInterval>\n"
+ "</ScheduleByWeek>\n");
+ break;
+
+ case SCHEDULE_WEEKLY:
+ fprintf(tfile->fp,
+ "<StartBoundary>2020-01-01T00:00:00</StartBoundary>\n"
+ "<Enabled>true</Enabled>\n"
+ "<ScheduleByWeek>\n"
+ "<DaysOfWeek>\n"
+ "<Sunday />\n"
+ "</DaysOfWeek>\n"
+ "<WeeksInterval>1</WeeksInterval>\n"
+ "</ScheduleByWeek>\n");
+ break;
+
+ default:
+ break;
+ }
+
+ xml = "</CalendarTrigger>\n"
+ "</Triggers>\n"
+ "<Principals>\n"
+ "<Principal id=\"Author\">\n"
+ "<LogonType>InteractiveToken</LogonType>\n"
+ "<RunLevel>LeastPrivilege</RunLevel>\n"
+ "</Principal>\n"
+ "</Principals>\n"
+ "<Settings>\n"
+ "<MultipleInstancesPolicy>IgnoreNew</MultipleInstancesPolicy>\n"
+ "<Enabled>true</Enabled>\n"
+ "<Hidden>true</Hidden>\n"
+ "<UseUnifiedSchedulingEngine>true</UseUnifiedSchedulingEngine>\n"
+ "<WakeToRun>false</WakeToRun>\n"
+ "<ExecutionTimeLimit>PT72H</ExecutionTimeLimit>\n"
+ "<Priority>7</Priority>\n"
+ "</Settings>\n"
+ "<Actions Context=\"Author\">\n"
+ "<Exec>\n"
+ "<Command>\"%s\\git.exe\"</Command>\n"
+ "<Arguments>--exec-path=\"%s\" for-each-repo --config=maintenance.repo maintenance run --schedule=%s</Arguments>\n"
+ "</Exec>\n"
+ "</Actions>\n"
+ "</Task>\n";
+ fprintf(tfile->fp, xml, exec_path, exec_path, frequency);
+ strvec_split(&child.args, cmd);
+ strvec_pushl(&child.args, "/create", "/tn", name, "/f", "/xml",
+ get_tempfile_path(tfile), NULL);
+ close_tempfile_gently(tfile);
+
+ child.no_stdout = 1;
+ child.no_stderr = 1;
+
+ if (start_command(&child))
+ die(_("failed to start schtasks"));
+ result = finish_command(&child);
+
+ delete_tempfile(&tfile);
+ free(name);
+ return result;
+}
+
+static int schtasks_schedule_tasks(const char *cmd)
+{
+ const char *exec_path = git_exec_path();
+
+ return schtasks_schedule_task(exec_path, SCHEDULE_HOURLY, cmd) ||
+ schtasks_schedule_task(exec_path, SCHEDULE_DAILY, cmd) ||
+ schtasks_schedule_task(exec_path, SCHEDULE_WEEKLY, cmd);
+}
+
+static int schtasks_update_schedule(int run_maintenance, int fd, const char *cmd)
+{
+ if (run_maintenance)
+ return schtasks_schedule_tasks(cmd);
+ else
+ return schtasks_remove_tasks(cmd);
+}
+
+#define BEGIN_LINE "# BEGIN GIT MAINTENANCE SCHEDULE"
+#define END_LINE "# END GIT MAINTENANCE SCHEDULE"
+
+static int crontab_update_schedule(int run_maintenance, int fd, const char *cmd)
+{
+ int result = 0;
+ int in_old_region = 0;
+ struct child_process crontab_list = CHILD_PROCESS_INIT;
+ struct child_process crontab_edit = CHILD_PROCESS_INIT;
+ FILE *cron_list, *cron_in;
+ struct strbuf line = STRBUF_INIT;
+
+ strvec_split(&crontab_list.args, cmd);
+ strvec_push(&crontab_list.args, "-l");
+ crontab_list.in = -1;
+ crontab_list.out = dup(fd);
+ crontab_list.git_cmd = 0;
+
+ if (start_command(&crontab_list))
+ return error(_("failed to run 'crontab -l'; your system might not support 'cron'"));
+
+ /* Ignore exit code, as an empty crontab will return error. */
+ finish_command(&crontab_list);
+
+ /*
+ * Read from the .lock file, filtering out the old
+ * schedule while appending the new schedule.
+ */
+ cron_list = fdopen(fd, "r");
+ rewind(cron_list);
+
+ strvec_split(&crontab_edit.args, cmd);
+ crontab_edit.in = -1;
+ crontab_edit.git_cmd = 0;
+
+ if (start_command(&crontab_edit))
+ return error(_("failed to run 'crontab'; your system might not support 'cron'"));
+
+ cron_in = fdopen(crontab_edit.in, "w");
+ if (!cron_in) {
+ result = error(_("failed to open stdin of 'crontab'"));
+ goto done_editing;
+ }
+
+ while (!strbuf_getline_lf(&line, cron_list)) {
+ if (!in_old_region && !strcmp(line.buf, BEGIN_LINE))
+ in_old_region = 1;
+ else if (in_old_region && !strcmp(line.buf, END_LINE))
+ in_old_region = 0;
+ else if (!in_old_region)
+ fprintf(cron_in, "%s\n", line.buf);
+ }
+
+ if (run_maintenance) {
+ struct strbuf line_format = STRBUF_INIT;
+ const char *exec_path = git_exec_path();
+
+ fprintf(cron_in, "%s\n", BEGIN_LINE);
+ fprintf(cron_in,
+ "# The following schedule was created by Git\n");
+ fprintf(cron_in, "# Any edits made in this region might be\n");
+ fprintf(cron_in,
+ "# replaced in the future by a Git command.\n\n");
+
+ strbuf_addf(&line_format,
+ "%%s %%s * * %%s \"%s/git\" --exec-path=\"%s\" for-each-repo --config=maintenance.repo maintenance run --schedule=%%s\n",
+ exec_path, exec_path);
+ fprintf(cron_in, line_format.buf, "0", "1-23", "*", "hourly");
+ fprintf(cron_in, line_format.buf, "0", "0", "1-6", "daily");
+ fprintf(cron_in, line_format.buf, "0", "0", "0", "weekly");
+ strbuf_release(&line_format);
+
+ fprintf(cron_in, "\n%s\n", END_LINE);
+ }
+
+ fflush(cron_in);
+ fclose(cron_in);
+ close(crontab_edit.in);
+
+done_editing:
+ if (finish_command(&crontab_edit))
+ result = error(_("'crontab' died"));
+ else
+ fclose(cron_list);
+ return result;
+}
+
+#if defined(__APPLE__)
+static const char platform_scheduler[] = "launchctl";
+#elif defined(GIT_WINDOWS_NATIVE)
+static const char platform_scheduler[] = "schtasks";
+#else
+static const char platform_scheduler[] = "crontab";
+#endif
+
+static int update_background_schedule(int enable)
+{
+ int result;
+ const char *scheduler = platform_scheduler;
+ const char *cmd = scheduler;
+ char *testing;
+ struct lock_file lk;
+ char *lock_path = xstrfmt("%s/schedule", the_repository->objects->odb->path);
+
+ testing = xstrdup_or_null(getenv("GIT_TEST_MAINT_SCHEDULER"));
+ if (testing) {
+ char *sep = strchr(testing, ':');
+ if (!sep)
+ die("GIT_TEST_MAINT_SCHEDULER unparseable: %s", testing);
+ *sep = '\0';
+ scheduler = testing;
+ cmd = sep + 1;
+ }
+
+ if (hold_lock_file_for_update(&lk, lock_path, LOCK_NO_DEREF) < 0)
+ return error(_("another process is scheduling background maintenance"));
+
+ if (!strcmp(scheduler, "launchctl"))
+ result = launchctl_update_schedule(enable, get_lock_file_fd(&lk), cmd);
+ else if (!strcmp(scheduler, "schtasks"))
+ result = schtasks_update_schedule(enable, get_lock_file_fd(&lk), cmd);
+ else if (!strcmp(scheduler, "crontab"))
+ result = crontab_update_schedule(enable, get_lock_file_fd(&lk), cmd);
+ else
+ die("unknown background scheduler: %s", scheduler);
+
+ rollback_lock_file(&lk);
+ free(testing);
+ return result;
+}
+
+static int maintenance_start(void)
+{
+ if (maintenance_register())
+ warning(_("failed to add repo to global config"));
+
+ return update_background_schedule(1);
+}
+
+static int maintenance_stop(void)
+{
+ return update_background_schedule(0);
+}
+
+static const char builtin_maintenance_usage[] = N_("git maintenance <subcommand> [<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);
+ if (!strcmp(argv[1], "start"))
+ return maintenance_start();
+ if (!strcmp(argv[1], "stop"))
+ return maintenance_stop();
+ if (!strcmp(argv[1], "register"))
+ return maintenance_register();
+ if (!strcmp(argv[1], "unregister"))
+ return maintenance_unregister();
+
+ die(_("invalid subcommand: %s"), argv[1]);
+}
diff --git a/builtin/grep.c b/builtin/grep.c
index 99e2685..ccd8d08 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -211,13 +211,11 @@
strbuf_init(&todo[i].out, 0);
}
- threads = xcalloc(num_threads, sizeof(*threads));
+ CALLOC_ARRAY(threads, num_threads);
for (i = 0; i < num_threads; i++) {
int err;
struct grep_opt *o = grep_opt_dup(opt);
o->output = strbuf_out;
- if (i)
- o->debug = 0;
compile_grep_patterns(o);
err = pthread_create(&threads[i], NULL, run, o);
@@ -295,6 +293,38 @@
return st;
}
+static void grep_source_name(struct grep_opt *opt, const char *filename,
+ int tree_name_len, struct strbuf *out)
+{
+ 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;
+ }
+
+ 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,
const char *filename, int tree_name_len,
const char *path)
@@ -302,13 +332,7 @@
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);
@@ -334,11 +358,7 @@
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);
@@ -375,7 +395,7 @@
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;
@@ -444,7 +464,7 @@
struct strbuf base = STRBUF_INIT;
obj_read_lock();
- object = parse_object_or_die(oid, oid_to_hex(oid));
+ object = parse_object_or_die(oid, NULL);
obj_read_unlock();
data = read_object_with_reference(&subrepo,
&object->oid, tree_type,
@@ -486,6 +506,10 @@
for (nr = 0; nr < repo->index->cache_nr; nr++) {
const struct cache_entry *ce = repo->index->cache[nr];
+
+ if (!cached && ce_skip_worktree(ce))
+ continue;
+
strbuf_setlen(&name, name_base_len);
strbuf_addstr(&name, ce->name);
@@ -498,8 +522,7 @@
* cache entry are identical, even if worktree file has
* been modified, so use cache version instead
*/
- if (cached || (ce->ce_flags & CE_VALID) ||
- ce_skip_worktree(ce)) {
+ if (cached || (ce->ce_flags & CE_VALID)) {
if (ce_stage(ce) || ce_intent_to_add(ce))
continue;
hit |= grep_oid(opt, &ce->oid, name.buf,
@@ -648,6 +671,17 @@
NULL, 0);
obj_read_unlock();
+ if (!real_obj) {
+ char hex[GIT_MAX_HEXSZ + 1];
+ const char *name = list->objects[i].name;
+
+ if (!name) {
+ oid_to_hex_r(hex, &list->objects[i].item->oid);
+ name = hex;
+ }
+ die(_("invalid object '%s' given."), name);
+ }
+
/* load the gitmodules file for this rev */
if (recurse_submodules) {
submodule_free(opt->repo);
@@ -671,7 +705,7 @@
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)
@@ -679,12 +713,11 @@
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;
}
@@ -886,27 +919,24 @@
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,
N_("show only matches from files that match all patterns")),
- OPT_SET_INT_F(0, "debug", &opt.debug,
- N_("show parse tree for grep expression"),
- 1, PARSE_OPT_HIDDEN),
OPT_GROUP(""),
{ OPTION_STRING, 'O', "open-files-in-pager", &show_in_pager,
N_("pager"), N_("show matching files in the pager"),
@@ -918,7 +948,6 @@
OPT_END()
};
- init_grep_defaults(the_repository);
git_config(grep_cmd_config, NULL);
grep_init(&opt, the_repository, prefix);
@@ -1126,6 +1155,9 @@
if (!use_index && (untracked || cached))
die(_("--cached or --untracked cannot be used with --no-index"));
+ if (untracked && cached)
+ die(_("--untracked cannot be used with --cached"));
+
if (!use_index || untracked) {
int use_exclude = (opt_exclude < 0) ? use_index : !!opt_exclude;
hit = grep_directory(&opt, &pathspec, use_exclude, use_index);
diff --git a/builtin/help.c b/builtin/help.c
index e5590d7..bb339f0 100644
--- a/builtin/help.c
+++ b/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 @@
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_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 @@
}
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/builtin/index-pack.c b/builtin/index-pack.c
index d967d18..2189968 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -17,7 +17,7 @@
#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>])";
+"git index-pack [-v] [-o <index-file>] [--keep | --keep=<msg>] [--[no-]rev-index] [--verify] [--strict] (<pack-file> | --stdin [--fix-thin] [<pack-file>])";
struct object_entry {
struct pack_idx_entry idx;
@@ -33,19 +33,61 @@
};
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 @@
#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,11 +182,10 @@
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);
- thread_data = xcalloc(nr_threads, sizeof(*thread_data));
+ CALLOC_ARRAY(thread_data, nr_threads);
for (i = 0; i < nr_threads; i++) {
thread_data[i].pack_fd = open(curr_pack, O_RDONLY);
if (thread_data[i].pack_fd == -1)
@@ -167,7 +204,6 @@
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 @@
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)
+ struct list_head *pos;
+
+ if (base_cache_used <= base_cache_limit)
+ return;
+
+ 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 link_base_data(struct base_data *base, struct base_data *c)
-{
- if (base)
- base->child = c;
- else
- get_thread_data()->base_cache = c;
-
- c->base = base;
- c->child = NULL;
- if (c->data)
- get_thread_data()->base_cache_used += c->size;
- prune_base_data(c);
-}
-
-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 @@
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 @@
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 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 @@
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 @@
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 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;
@@ -866,26 +888,15 @@
}
/*
- * This function is part of find_unresolved_deltas(). There are two
- * walkers going in the opposite ways.
+ * Ensure that this node has been reconstructed and return its contents.
*
- * 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.
- *
- * 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)
{
@@ -902,7 +913,7 @@
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--) {
@@ -918,7 +929,7 @@
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);
@@ -926,10 +937,27 @@
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;
@@ -942,115 +970,26 @@
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(the_hash_algo, 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))
- die("REF_DELTA at offset %"PRIuMAX" already resolved (duplicate base %s?)",
- (uintmax_t)child->idx.offset,
- oid_to_hex(&base->obj->idx.oid));
-
- 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)
@@ -1071,34 +1010,135 @@
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;
}
@@ -1199,6 +1239,7 @@
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++) {
@@ -1213,15 +1254,7 @@
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);
}
/*
@@ -1368,45 +1401,50 @@
continue;
oid_array_append(&to_fetch, &d->oid);
}
- if (to_fetch.nr)
- promisor_remote_get_direct(the_repository,
- 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(the_repository, &d->oid,
- base_obj->data, base_obj->size,
+ 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);
}
-static const char *derive_filename(const char *pack_name, const char *suffix,
- struct strbuf *buf)
+static const char *derive_filename(const char *pack_name, const char *strip,
+ const char *suffix, struct strbuf *buf)
{
size_t len;
- if (!strip_suffix(pack_name, ".pack", &len))
- die(_("packfile name '%s' does not end with '.pack'"),
- pack_name);
+ if (!strip_suffix(pack_name, strip, &len) || !len ||
+ pack_name[len - 1] != '.')
+ die(_("packfile name '%s' does not end with '.%s'"),
+ pack_name, strip);
strbuf_add(buf, pack_name, len);
- strbuf_addch(buf, '.');
strbuf_addstr(buf, suffix);
return buf->buf;
}
@@ -1421,7 +1459,7 @@
int msg_len = strlen(msg);
if (pack_name)
- filename = derive_filename(pack_name, suffix, &name_buf);
+ filename = derive_filename(pack_name, "pack", suffix, &name_buf);
else
filename = odb_pack_name(&name_buf, hash, suffix);
@@ -1446,12 +1484,14 @@
static void final(const char *final_pack_name, const char *curr_pack_name,
const char *final_index_name, const char *curr_index_name,
+ const char *final_rev_index_name, const char *curr_rev_index_name,
const char *keep_msg, const char *promisor_msg,
unsigned char *hash)
{
const char *report = "pack";
struct strbuf pack_name = STRBUF_INIT;
struct strbuf index_name = STRBUF_INIT;
+ struct strbuf rev_index_name = STRBUF_INIT;
int err;
if (!from_stdin) {
@@ -1486,6 +1526,16 @@
} else
chmod(final_index_name, 0444);
+ if (curr_rev_index_name) {
+ if (final_rev_index_name != curr_rev_index_name) {
+ if (!final_rev_index_name)
+ final_rev_index_name = odb_pack_name(&rev_index_name, hash, "rev");
+ if (finalize_object_file(curr_rev_index_name, final_rev_index_name))
+ die(_("cannot store reverse index file"));
+ } else
+ chmod(final_rev_index_name, 0444);
+ }
+
if (do_fsck_object) {
struct packed_git *p;
p = add_packed_git(final_index_name, strlen(final_index_name), 0);
@@ -1515,6 +1565,7 @@
}
}
+ strbuf_release(&rev_index_name);
strbuf_release(&index_name);
strbuf_release(&pack_name);
}
@@ -1540,6 +1591,12 @@
}
return 0;
}
+ if (!strcmp(k, "pack.writereverseindex")) {
+ if (git_config_bool(k, v))
+ opts->flags |= WRITE_REV;
+ else
+ opts->flags &= ~WRITE_REV;
+ }
return git_default_config(k, v, cb);
}
@@ -1556,14 +1613,10 @@
{
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 */
- + p->num_objects /* CRC32 table */
+ idx1 = (((const uint32_t *)((const uint8_t *)p->index_data + p->crc_offset))
+ + (size_t)p->num_objects /* CRC32 table */
);
/* The address of the 8-byte offset table */
@@ -1607,7 +1660,7 @@
/*
* Get rid of the idx file as we do not need it anymore.
* NEEDSWORK: extract this bit from free_pack_by_name() in
- * sha1-file.c, perhaps? It shouldn't matter very much as we
+ * object-file.c, perhaps? It shouldn't matter very much as we
* know we haven't installed this pack (hence we never have
* read anything from it).
*/
@@ -1621,7 +1674,7 @@
unsigned long *chain_histogram = NULL;
if (deepest_delta)
- chain_histogram = xcalloc(deepest_delta, sizeof(unsigned long));
+ CALLOC_ARRAY(chain_histogram, deepest_delta);
for (i = 0; i < nr_objects; i++) {
struct object_entry *obj = &objects[i];
@@ -1659,19 +1712,38 @@
}
}
+static int print_dangling_gitmodules(struct fsck_options *o,
+ const struct object_id *oid,
+ enum object_type object_type,
+ int msg_type, const char *message)
+{
+ /*
+ * NEEDSWORK: Plumb the MSG_ID (from fsck.c) here and use it
+ * instead of relying on this string check.
+ */
+ if (starts_with(message, "gitmodulesMissing")) {
+ printf("%s\n", oid_to_hex(oid));
+ return 0;
+ }
+ return fsck_error_function(o, oid, object_type, msg_type, message);
+}
+
int cmd_index_pack(int argc, const char **argv, const char *prefix)
{
- int i, fix_thin_pack = 0, verify = 0, stat_only = 0;
+ int i, fix_thin_pack = 0, verify = 0, stat_only = 0, rev_index;
const char *curr_index;
- const char *index_name = NULL, *pack_name = NULL;
+ const char *curr_rev_index = NULL;
+ const char *index_name = NULL, *pack_name = NULL, *rev_index_name = NULL;
const char *keep_msg = NULL;
const char *promisor_msg = NULL;
struct strbuf index_name_buf = STRBUF_INIT;
+ struct strbuf rev_index_name_buf = STRBUF_INIT;
struct pack_idx_entry **idx_objects;
struct pack_idx_option opts;
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
@@ -1692,6 +1764,11 @@
if (prefix && chdir(prefix))
die(_("Cannot come back to cwd"));
+ if (git_env_bool(GIT_TEST_WRITE_REV_INDEX, 0))
+ rev_index = 1;
+ else
+ rev_index = !!(opts.flags & (WRITE_REV_VERIFY | WRITE_REV));
+
for (i = 1; i < argc; i++) {
const char *arg = argv[i];
@@ -1765,6 +1842,15 @@
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 if (!strcmp(arg, "--rev-index")) {
+ rev_index = 1;
+ } else if (!strcmp(arg, "--no-rev-index")) {
+ rev_index = 0;
} else
usage(index_pack_usage);
continue;
@@ -1781,8 +1867,19 @@
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);
+ index_name = derive_filename(pack_name, "pack", "idx", &index_name_buf);
+
+ opts.flags &= ~(WRITE_REV | WRITE_REV_VERIFY);
+ if (rev_index) {
+ opts.flags |= verify ? WRITE_REV_VERIFY : WRITE_REV;
+ if (index_name)
+ rev_index_name = derive_filename(index_name,
+ "idx", "rev",
+ &rev_index_name_buf);
+ }
if (verify) {
if (!index_name)
@@ -1795,17 +1892,30 @@
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);
parse_pack_header();
- objects = xcalloc(st_add(nr_objects, 1), sizeof(struct object_entry));
+ CALLOC_ARRAY(objects, st_add(nr_objects, 1));
if (show_stat)
- obj_stat = xcalloc(st_add(nr_objects, 1), sizeof(struct object_stat));
- ofs_deltas = xcalloc(nr_objects, sizeof(struct ofs_delta_entry));
+ CALLOC_ARRAY(obj_stat, st_add(nr_objects, 1));
+ CALLOC_ARRAY(ofs_deltas, nr_objects);
parse_pack_objects(pack_hash);
if (report_end_of_input)
write_in_full(2, "\0", 1);
@@ -1823,25 +1933,38 @@
for (i = 0; i < nr_objects; i++)
idx_objects[i] = &objects[i].idx;
curr_index = write_idx_file(index_name, idx_objects, nr_objects, &opts, pack_hash);
+ if (rev_index)
+ curr_rev_index = write_rev_file(rev_index_name, idx_objects,
+ nr_objects, pack_hash,
+ opts.flags);
free(idx_objects);
if (!verify)
final(pack_name, curr_pack,
index_name, curr_index,
+ rev_index_name, curr_rev_index,
keep_msg, promisor_msg,
pack_hash);
else
close(input_fd);
- if (do_fsck_object && fsck_finish(&fsck_options))
- die(_("fsck error in pack objects"));
+ if (do_fsck_object) {
+ struct fsck_options fo = fsck_options;
+
+ fo.error_func = print_dangling_gitmodules;
+ if (fsck_finish(&fo))
+ die(_("fsck error in pack objects"));
+ }
free(objects);
strbuf_release(&index_name_buf);
+ strbuf_release(&rev_index_name_buf);
if (pack_name == NULL)
free((void *) curr_pack);
if (index_name == NULL)
free((void *) curr_index);
+ if (rev_index_name == NULL)
+ free((void *) curr_rev_index);
/*
* Let the caller know this pack is not self contained
diff --git a/builtin/init-db.c b/builtin/init-db.c
index 944ec77..dcc45be 100644
--- a/builtin/init-db.c
+++ b/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,35 @@
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,
+ int quiet)
{
struct stat st1;
struct strbuf buf = STRBUF_INIT;
char *path;
- char repo_version_string[10];
char junk[2];
int reinit;
int filemode;
@@ -233,21 +258,29 @@
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(quiet);
+
+ 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 +368,40 @@
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 +412,12 @@
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 +434,16 @@
* 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,
+ flags & INIT_DB_QUIET);
+ if (reinit && initial_branch)
+ warning(_("re-init: ignored --initial-branch=%s"),
+ initial_branch);
create_object_directory();
@@ -482,6 +545,9 @@
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 +560,18 @@
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 +619,12 @@
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 +646,30 @@
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 +691,8 @@
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 +702,6 @@
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/builtin/interpret-trailers.c b/builtin/interpret-trailers.c
index f101d09..84748ea 100644
--- a/builtin/interpret-trailers.c
+++ b/builtin/interpret-trailers.c
@@ -105,8 +105,8 @@
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/builtin/log.c b/builtin/log.c
index 83a4a61..f67b67d 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -12,6 +12,7 @@
#include "color.h"
#include "commit.h"
#include "diff.h"
+#include "diff-merges.h"
#include "revision.h"
#include "log-tree.h"
#include "builtin.h"
@@ -33,11 +34,11 @@
#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
+#define FORMAT_PATCH_NAME_MAX_DEFAULT 64
/* Set a default date-time format for git log ("log.date" config variable) */
static const char *default_date_mode = NULL;
@@ -46,10 +47,12 @@
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;
static const char *fmt_patch_subject_prefix = "PATCH";
+static int fmt_patch_name_max = FORMAT_PATCH_NAME_MAX_DEFAULT;
static const char *fmt_pretty;
static const char * const builtin_log_usage[] = {
@@ -131,7 +134,6 @@
static void init_log_defaults(void)
{
- init_grep_defaults(the_repository);
init_diff_ui_defaults();
decoration_style = auto_decoration_style();
@@ -150,7 +152,9 @@
rev->abbrev_commit = default_abbrev_commit;
rev->show_root_diff = default_show_root;
rev->subject_prefix = fmt_patch_subject_prefix;
+ rev->patch_name_max = fmt_patch_name_max;
rev->show_signature = default_show_signature;
+ rev->encode_email_headers = default_encode_email_headers;
rev->diffopt.flags.allow_textconv = 1;
if (default_date_mode)
@@ -164,23 +168,26 @@
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_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('L', NULL, &line_cb, "n,m:file",
- N_("Process line range n,m in file, counting from 1"),
+ OPT_CALLBACK_F(0, "decorate", NULL, NULL, N_("decorate options"),
+ PARSE_OPT_OPTARG, decorate_callback),
+ OPT_CALLBACK('L', NULL, &line_cb, "range:file",
+ N_("trace the evolution of line range <start>,<end> or function :<funcname> in <file>"),
log_line_range_callback),
OPT_END()
};
@@ -202,6 +209,9 @@
if (argc > 1)
die(_("unrecognized argument: %s"), argv[1]);
+ if (rev->line_level_traverse && rev->prune_data.nr)
+ die(_("-L<range>:<file> cannot be used with pathspec"));
+
memset(&w, 0, sizeof(w));
userformat_find_requirements(NULL, &w);
@@ -221,7 +231,7 @@
if (mailmap) {
rev->mailmap = xcalloc(1, sizeof(struct string_list));
- read_mailmap(rev->mailmap, NULL);
+ read_mailmap(rev->mailmap);
}
if (rev->pretty_given && rev->commit_format == CMIT_FMT_RAW) {
@@ -236,7 +246,19 @@
}
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);
}
@@ -285,10 +307,11 @@
static void log_show_early(struct rev_info *revs, struct commit_list *list)
{
- int i = revs->early_output, close_file = revs->diffopt.close_file;
+ int i = revs->early_output;
int show_header = 1;
+ int no_free = revs->diffopt.no_free;
- revs->diffopt.close_file = 0;
+ revs->diffopt.no_free = 0;
sort_in_topological_order(&list, revs->sort_order);
while (list && i) {
struct commit *commit = list->item;
@@ -305,8 +328,8 @@
case commit_ignore:
break;
case commit_error:
- if (close_file)
- fclose(revs->diffopt.file);
+ revs->diffopt.no_free = no_free;
+ diff_free(&revs->diffopt);
return;
}
list = list->next;
@@ -314,8 +337,8 @@
/* Did we already get enough commits for the early output? */
if (!i) {
- if (close_file)
- fclose(revs->diffopt.file);
+ revs->diffopt.no_free = 0;
+ diff_free(&revs->diffopt);
return;
}
@@ -379,7 +402,7 @@
{
struct commit *commit;
int saved_nrl = 0;
- int saved_dcctc = 0, close_file = rev->diffopt.close_file;
+ int saved_dcctc = 0;
if (rev->early_output)
setup_early_output();
@@ -395,7 +418,7 @@
* and HAS_CHANGES being accumulated in rev->diffopt, so be careful to
* retain that state information if replacing rev->diffopt in this loop
*/
- rev->diffopt.close_file = 0;
+ rev->diffopt.no_free = 1;
while ((commit = get_revision(rev)) != NULL) {
if (!log_tree_commit(rev, commit) && rev->max_count >= 0)
/*
@@ -420,8 +443,8 @@
}
rev->diffopt.degraded_cc_to_c = saved_dcctc;
rev->diffopt.needed_rename_limit = saved_nrl;
- if (close_file)
- fclose(rev->diffopt.file);
+ rev->diffopt.no_free = 0;
+ diff_free(&rev->diffopt);
if (rev->diffopt.output_format & DIFF_FORMAT_CHECKDIFF &&
rev->diffopt.flags.check_failed) {
@@ -438,6 +461,14 @@
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.filenamemaxlength")) {
+ fmt_patch_name_max = git_config_int(var, value);
+ return 0;
+ }
+ 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;
@@ -578,15 +609,10 @@
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 */
- rev->ignore_merges = 0;
- if (!rev->first_parent_only && !rev->combine_merges) {
- /* No "--first-parent", "-c", or "--cc" */
- rev->combine_merges = 1;
- rev->dense_combined_merges = 1;
- }
- }
+ if (rev->first_parent_only)
+ diff_merges_default_to_first_parent(rev);
+ else
+ diff_merges_default_to_dense_combined(rev);
if (!rev->diffopt.output_format)
rev->diffopt.output_format = DIFF_FORMAT_PATCH;
}
@@ -707,13 +733,8 @@
rev->prune_data.nr == 1)
rev->diffopt.flags.follow_renames = 1;
- /* Turn --cc/-c into -p --cc/-c when -p was not given */
- 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)
- rev->ignore_merges = 0;
+ if (rev->first_parent_only)
+ diff_merges_default_to_first_parent(rev);
}
int cmd_log(int argc, const char **argv, const char *prefix)
@@ -786,9 +807,15 @@
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;
@@ -887,7 +914,11 @@
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")) {
@@ -926,15 +957,9 @@
struct rev_info *rev, int quiet)
{
struct strbuf filename = STRBUF_INIT;
- int suffix_len = strlen(rev->patch_suffix) + 1;
if (output_directory) {
strbuf_addstr(&filename, output_directory);
- if (filename.len >=
- PATH_MAX - FORMAT_PATCH_NAME_MAX - suffix_len) {
- strbuf_release(&filename);
- return error(_("name of output directory is too long"));
- }
strbuf_complete(&filename, '/');
}
@@ -1041,7 +1066,7 @@
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);
@@ -1107,24 +1132,24 @@
static int get_notes_refs(struct string_list_item *item, void *arg)
{
- argv_array_pushf(arg, "--notes=%s", item->string);
+ strvec_pushf(arg, "--notes=%s", item->string);
return 0;
}
-static void get_notes_args(struct argv_array *arg, struct rev_info *rev)
+static void get_notes_args(struct strvec *arg, struct rev_info *rev)
{
if (!rev->show_notes) {
- argv_array_push(arg, "--no-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)) {
- argv_array_push(arg, "--notes");
+ 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,
+static void make_cover_letter(struct rev_info *rev, int use_separate_file,
struct commit *origin,
int nr, struct commit **list,
const char *branch_name,
@@ -1144,7 +1169,7 @@
committer = git_committer_info(0);
- if (!use_stdout &&
+ if (use_separate_file &&
open_next_file(NULL, rev->numbered_files ? NULL : "cover-letter", rev, quiet))
die(_("failed to create cover-letter file"));
@@ -1176,6 +1201,7 @@
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]);
@@ -1187,7 +1213,8 @@
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) {
@@ -1196,16 +1223,22 @@
* can be added later if deemed desirable.
*/
struct diff_options opts;
- struct argv_array other_arg = ARGV_ARRAY_INIT;
+ struct strvec other_arg = STRVEC_INIT;
+ struct range_diff_options range_diff_opts = {
+ .creation_factor = rev->creation_factor,
+ .dual_color = 1,
+ .diffopt = &opts,
+ .other_arg = &other_arg
+ };
+
diff_setup(&opts);
opts.file = rev->diffopt.file;
opts.use_color = rev->diffopt.use_color;
diff_setup_done(&opts);
fprintf_ln(rev->diffopt.file, "%s", rev->rdiff_title);
get_notes_args(&other_arg, rev);
- show_range_diff(rev->rdiff1, rev->rdiff2,
- rev->creation_factor, 1, &opts, &other_arg);
- argv_array_clear(&other_arg);
+ show_range_diff(rev->rdiff1, rev->rdiff2, &range_diff_opts);
+ strvec_clear(&other_arg);
}
}
@@ -1404,6 +1437,23 @@
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;
@@ -1416,13 +1466,36 @@
{
struct commit *base = NULL;
struct commit **rev;
- int i = 0, rev_nr = 0;
+ int i = 0, rev_nr = 0, auto_select, die_on_failure;
- if (base_commit && strcmp(base_commit, "auto")) {
+ 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 (!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"))) {
+ } else {
struct branch *curr_branch = branch_get(NULL);
const char *upstream = branch_get_upstream(curr_branch, NULL);
if (upstream) {
@@ -1430,19 +1503,32 @@
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;
}
}
@@ -1459,8 +1545,14 @@
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;
}
@@ -1470,12 +1562,24 @@
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);
@@ -1575,16 +1679,20 @@
struct commit *head)
{
const char *head_oid = oid_to_hex(&head->object.oid);
+ int prev_is_range = is_range_diff_range(prev);
- if (!strstr(prev, "..")) {
- strbuf_addf(r1, "%s..%s", head_oid, prev);
- strbuf_addf(r2, "%s..%s", prev, head_oid);
- } else if (!origin) {
- die(_("failed to infer range-diff ranges"));
- } else {
+ if (prev_is_range)
strbuf_addstr(r1, prev);
- strbuf_addf(r2, "%s..%s",
- oid_to_hex(&origin->object.oid), head_oid);
+ 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);
}
}
@@ -1614,6 +1722,7 @@
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;
@@ -1625,13 +1734,13 @@
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 },
- OPT_BOOL('s', "signoff", &do_signoff, N_("add Signed-off-by:")),
+ PARSE_OPT_NOARG | PARSE_OPT_NONEG, no_numbered_callback),
+ OPT_BOOL('s', "signoff", &do_signoff, N_("add a Signed-off-by trailer")),
OPT_BOOL(0, "stdout", &use_stdout,
N_("print patches to standard out")),
OPT_BOOL(0, "cover-letter", &cover_letter,
@@ -1644,21 +1753,23 @@
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,
- N_("Use [RFC PATCH] instead of [PATCH]"),
- PARSE_OPT_NOARG | PARSE_OPT_NONEG, rfc_callback },
+ OPT_INTEGER(0, "filename-max-length", &fmt_patch_name_max,
+ N_("max length of output filename")),
+ OPT_CALLBACK_F(0, "rfc", &rev, NULL,
+ N_("use [RFC PATCH] instead of [PATCH]"),
+ PARSE_OPT_NOARG | PARSE_OPT_NONEG, rfc_callback),
OPT_STRING(0, "cover-from-description", &cover_from_description_arg,
N_("cover-from-description-mode"),
N_("generate parts of a cover letter based on a branch's description")),
- { OPTION_CALLBACK, 0, "subject-prefix", &rev, N_("prefix"),
- N_("Use [<prefix>] instead of [PATCH]"),
- PARSE_OPT_NONEG, subject_prefix_callback },
- { OPTION_CALLBACK, 'o', "output-directory", &output_directory,
+ OPT_CALLBACK_F(0, "subject-prefix", &rev, N_("prefix"),
+ N_("use [<prefix>] instead of [PATCH]"),
+ 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,
@@ -1669,31 +1780,30 @@
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")),
@@ -1719,6 +1829,7 @@
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;
@@ -1729,9 +1840,6 @@
s_r_opt.def = "HEAD";
s_r_opt.revarg_opt = REVARG_COMMITTISH;
- if (base_auto)
- base_commit = "auto";
-
if (default_attach) {
rev.mime_boundary = default_attach;
rev.no_inline = 1;
@@ -1747,6 +1855,10 @@
PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN |
PARSE_OPT_KEEP_DASHDASH);
+ /* Make sure "0000-$sub.patch" gives non-negative length for $sub */
+ if (fmt_patch_name_max <= strlen("0000-") + strlen(fmt_patch_suffix))
+ fmt_patch_name_max = strlen("0000-") + strlen(fmt_patch_suffix);
+
if (cover_from_description_arg)
cover_from_description_mode = parse_cover_from_description(cover_from_description_arg);
@@ -1831,6 +1943,7 @@
rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
rev.zero_commit = zero_commit;
+ rev.patch_name_max = fmt_patch_name_max;
if (!rev.diffopt.flags.text && !no_binary_diff)
rev.diffopt.flags.binary = 1;
@@ -1838,20 +1951,27 @@
if (rev.show_notes)
load_display_notes(&rev.notes_opt);
- if (!output_directory && !use_stdout)
- output_directory = config_output_directory;
+ if (use_stdout + rev.diffopt.close_file + !!output_directory > 1)
+ die(_("--stdout, --output, and --output-directory are mutually exclusive"));
- if (!use_stdout)
- output_directory = set_outdir(prefix, output_directory);
- else
+ if (use_stdout) {
setup_pager();
-
- if (output_directory) {
+ } else if (rev.diffopt.close_file) {
+ /*
+ * The diff code parsed --output; it has already opened the
+ * file, but but we must instruct it not to close after each
+ * diff.
+ */
+ rev.diffopt.no_free = 1;
+ } else {
int saved;
+
+ if (!output_directory)
+ output_directory = config_output_directory;
+ output_directory = set_outdir(prefix, output_directory);
+
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.
@@ -1995,8 +2115,8 @@
}
memset(&bases, 0, sizeof(bases));
- if (base_commit) {
- 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);
@@ -2013,7 +2133,7 @@
if (cover_letter) {
if (thread)
gen_message_id(&rev, "cover");
- make_cover_letter(&rev, use_stdout,
+ make_cover_letter(&rev, !!output_directory,
origin, nr, list, branch_name, quiet);
print_bases(&bases, rev.diffopt.file);
print_signature(rev.diffopt.file);
@@ -2068,7 +2188,7 @@
gen_message_id(&rev, oid_to_hex(&commit->object.oid));
}
- if (!use_stdout &&
+ if (output_directory &&
open_next_file(rev.numbered_files ? NULL : commit, NULL, &rev, quiet))
die(_("failed to create output files"));
shown = log_tree_commit(&rev, commit);
@@ -2081,7 +2201,7 @@
* the log; when using one file per patch, we do
* not want the extra blank line.
*/
- if (!use_stdout)
+ if (output_directory)
rev.shown_one = 0;
if (shown) {
print_bases(&bases, rev.diffopt.file);
@@ -2092,7 +2212,7 @@
else
print_signature(rev.diffopt.file);
}
- if (!use_stdout)
+ if (output_directory)
fclose(rev.diffopt.file);
}
stop_progress(&progress);
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index f069a02..f6f9e48 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -35,6 +35,7 @@
static int debug_mode;
static int show_eol;
static int recurse_submodules;
+static int skipping_duplicates;
static const char *prefix;
static int max_prefix_len;
@@ -128,8 +129,9 @@
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);
@@ -311,45 +313,59 @@
if (show_killed)
show_killed_files(repo->index, dir);
}
- if (show_cached || show_stage) {
- for (i = 0; i < repo->index->cache_nr; i++) {
- const struct cache_entry *ce = repo->index->cache[i];
- construct_fullname(&fullname, repo, ce);
+ if (!(show_cached || show_stage || show_deleted || show_modified))
+ return;
+ for (i = 0; i < repo->index->cache_nr; i++) {
+ const struct cache_entry *ce = repo->index->cache[i];
+ struct stat st;
+ int stat_err;
- if ((dir->flags & DIR_SHOW_IGNORED) &&
- !ce_excluded(dir, repo->index, fullname.buf, ce))
- continue;
- if (show_unmerged && !ce_stage(ce))
- continue;
- if (ce->ce_flags & CE_UPDATE)
- continue;
+ construct_fullname(&fullname, repo, ce);
+
+ if ((dir->flags & DIR_SHOW_IGNORED) &&
+ !ce_excluded(dir, repo->index, fullname.buf, ce))
+ continue;
+ if (ce->ce_flags & CE_UPDATE)
+ continue;
+ if ((show_cached || show_stage) &&
+ (!show_unmerged || ce_stage(ce))) {
show_ce(repo, dir, ce, fullname.buf,
ce_stage(ce) ? tag_unmerged :
(ce_skip_worktree(ce) ? tag_skip_worktree :
tag_cached));
+ if (skipping_duplicates)
+ goto skip_to_next_name;
}
- }
- if (show_deleted || show_modified) {
- for (i = 0; i < repo->index->cache_nr; i++) {
- const struct cache_entry *ce = repo->index->cache[i];
- struct stat st;
- int err;
- construct_fullname(&fullname, repo, ce);
+ if (!(show_deleted || show_modified))
+ continue;
+ if (ce_skip_worktree(ce))
+ continue;
+ stat_err = lstat(fullname.buf, &st);
+ if (stat_err && (errno != ENOENT && errno != ENOTDIR))
+ error_errno("cannot lstat '%s'", fullname.buf);
+ if (stat_err && show_deleted) {
+ show_ce(repo, dir, ce, fullname.buf, tag_removed);
+ if (skipping_duplicates)
+ goto skip_to_next_name;
+ }
+ if (show_modified &&
+ (stat_err || ie_modified(repo->index, ce, &st, 0))) {
+ show_ce(repo, dir, ce, fullname.buf, tag_modified);
+ if (skipping_duplicates)
+ goto skip_to_next_name;
+ }
+ continue;
- if ((dir->flags & DIR_SHOW_IGNORED) &&
- !ce_excluded(dir, repo->index, fullname.buf, ce))
- continue;
- if (ce->ce_flags & CE_UPDATE)
- continue;
- if (ce_skip_worktree(ce))
- continue;
- err = lstat(fullname.buf, &st);
- if (show_deleted && err)
- show_ce(repo, dir, ce, fullname.buf, tag_removed);
- if (show_modified && ie_modified(repo->index, ce, &st, 0))
- show_ce(repo, dir, ce, fullname.buf, tag_modified);
+skip_to_next_name:
+ {
+ int j;
+ struct cache_entry **cache = repo->index->cache;
+ for (j = i + 1; j < repo->index->cache_nr; j++)
+ if (strcmp(ce->name, cache[j]->name))
+ break;
+ i = j - 1; /* compensate for the for loop */
}
}
@@ -554,18 +570,18 @@
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),
@@ -577,13 +593,15 @@
N_("pretend that paths removed since <tree-ish> are still present")),
OPT__ABBREV(&abbrev),
OPT_BOOL(0, "debug", &debug_mode, N_("show debugging data")),
+ OPT_BOOL(0, "deduplicate", &skipping_duplicates,
+ N_("suppress duplicate entries")),
OPT_END()
};
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);
@@ -616,6 +634,8 @@
* you also show the stage information.
*/
show_stage = 1;
+ if (show_tag || show_stage)
+ skipping_duplicates = 0;
if (dir.exclude_per_dir)
exc_given = 1;
@@ -687,6 +707,6 @@
return bad ? 1 : 0;
}
- UNLEAK(dir);
+ dir_clear(&dir);
return 0;
}
diff --git a/builtin/ls-remote.c b/builtin/ls-remote.c
index 6ef5195..abfa984 100644
--- a/builtin/ls-remote.c
+++ b/builtin/ls-remote.c
@@ -45,7 +45,8 @@
int show_symref_target = 0;
const char *uploadpack = NULL;
const char **pattern = NULL;
- struct argv_array ref_prefixes = ARGV_ARRAY_INIT;
+ struct transport_ls_refs_options transport_options =
+ TRANSPORT_LS_REFS_OPTIONS_INIT;
int i;
struct string_list server_options = STRING_LIST_INIT_DUP;
@@ -83,18 +84,20 @@
PARSE_OPT_STOP_AT_NON_OPTION);
dest = argv[0];
+ UNLEAK(sorting);
+
if (argc > 1) {
int i;
- pattern = xcalloc(argc, sizeof(const char *));
+ CALLOC_ARRAY(pattern, argc);
for (i = 1; i < argc; i++) {
pattern[i - 1] = xstrfmt("*/%s", argv[i]);
}
}
if (flags & REF_TAGS)
- argv_array_push(&ref_prefixes, "refs/tags/");
+ strvec_push(&transport_options.ref_prefixes, "refs/tags/");
if (flags & REF_HEADS)
- argv_array_push(&ref_prefixes, "refs/heads/");
+ strvec_push(&transport_options.ref_prefixes, "refs/heads/");
remote = remote_get(dest);
if (!remote) {
@@ -107,7 +110,6 @@
if (get_url) {
printf("%s\n", *remote->url);
- UNLEAK(sorting);
return 0;
}
@@ -117,11 +119,13 @@
if (server_options.nr)
transport->server_options = &server_options;
- ref = transport_get_remote_refs(transport, &ref_prefixes);
- if (transport_disconnect(transport)) {
- UNLEAK(sorting);
- return 1;
+ ref = transport_get_remote_refs(transport, &transport_options);
+ 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 +150,6 @@
status = 0; /* we found something */
}
- UNLEAK(sorting);
ref_array_clear(&ref_array);
return status;
}
diff --git a/builtin/merge-base.c b/builtin/merge-base.c
index e3f8da1..6719ac1 100644
--- a/builtin/merge-base.c
+++ b/builtin/merge-base.c
@@ -114,26 +114,16 @@
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/builtin/merge-tree.c b/builtin/merge-tree.c
index e72714a..de85207 100644
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -109,6 +109,7 @@
xdemitconf_t xecfg;
xdemitcb_t ecb;
+ memset(&xpp, 0, sizeof(xpp));
xpp.flags = 0;
memset(&xecfg, 0, sizeof(xecfg));
xecfg.ctxlen = 3;
diff --git a/builtin/merge.c b/builtin/merge.c
index d127d22..3886195 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -14,6 +14,7 @@
#include "lockfile.h"
#include "run-command.h"
#include "diff.h"
+#include "diff-merges.h"
#include "refs.h"
#include "refspec.h"
#include "commit.h"
@@ -28,6 +29,7 @@
#include "rerere.h"
#include "help.h"
#include "merge-recursive.h"
+#include "merge-ort-wrappers.h"
#include "resolve-undo.h"
#include "remote.h"
#include "fmt-merge-msg.h"
@@ -40,6 +42,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)
@@ -71,7 +74,6 @@
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;
@@ -82,11 +84,13 @@
static int default_to_upstream = 1;
static int signoff;
static const char *sign_commit;
+static int autostash;
static int no_verify;
static struct strategy all_strategy[] = {
{ "recursive", DEFAULT_TWOHEAD | NO_TRIVIAL },
{ "octopus", DEFAULT_OCTOPUS },
+ { "ort", NO_TRIVIAL },
{ "resolve", 0 },
{ "ours", NO_FAST_FORWARD | NO_TRIVIAL },
{ "subtree", NO_FAST_FORWARD | NO_TRIVIAL },
@@ -158,10 +162,17 @@
struct strategy *ret;
static struct cmdnames main_cmds, other_cmds;
static int loaded;
+ char *default_strategy = getenv("GIT_TEST_MERGE_ALGORITHM");
if (!name)
return NULL;
+ if (default_strategy &&
+ !strcmp(default_strategy, "ort") &&
+ !strcmp(name, "recursive")) {
+ name = "ort";
+ }
+
for (i = 0; i < ARRAY_SIZE(all_strategy); i++)
if (!strcmp(name, all_strategy[i].name))
return &all_strategy[i];
@@ -199,7 +210,7 @@
exit(1);
}
- ret = xcalloc(1, sizeof(struct strategy));
+ CALLOC_ARRAY(ret, 1);
ret->name = xstrdup(name);
ret->attr = NO_TRIVIAL;
return ret;
@@ -241,9 +252,9 @@
}
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)")),
@@ -286,8 +297,9 @@
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, "signoff", &signoff, N_("add a Signed-off-by trailer")),
OPT_BOOL(0, "no-verify", &no_verify, N_("bypass pre-merge-commit and commit-msg hooks")),
OPT_END()
};
@@ -398,7 +410,7 @@
printf(_("Squash commit -- not updating HEAD\n"));
repo_init_revisions(the_repository, &rev, NULL);
- rev.ignore_merges = 1;
+ diff_merges_suppress(&rev);
rev.commit_format = CMIT_FMT_MEDIUM;
commit->object.flags |= UNINTERESTING;
@@ -447,7 +459,6 @@
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);
/*
@@ -455,7 +466,7 @@
* 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) {
@@ -475,6 +486,7 @@
/* 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);
}
@@ -498,7 +510,7 @@
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);
@@ -597,10 +609,12 @@
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;
@@ -616,8 +630,6 @@
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) {
@@ -634,6 +646,9 @@
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);
@@ -696,7 +711,8 @@
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")) {
+ if (!strcmp(strategy, "recursive") || !strcmp(strategy, "subtree") ||
+ !strcmp(strategy, "ort")) {
struct lock_file lock = LOCK_INIT;
int clean, x;
struct commit *result;
@@ -713,7 +729,6 @@
if (!strcmp(strategy, "subtree"))
o.subtree_shift = "";
- o.renormalize = option_renormalize;
o.show_rename_progress =
show_progress == -1 ? isatty(2) : show_progress;
@@ -728,8 +743,12 @@
commit_list_insert(j->item, &reversed);
hold_locked_index(&lock, LOCK_DIE_ON_ERROR);
- clean = merge_recursive(&o, head,
- remoteheads->item, reversed, &result);
+ if (!strcmp(strategy, "ort"))
+ clean = merge_ort_recursive(&o, head, remoteheads->item,
+ reversed, &result);
+ else
+ clean = merge_recursive(&o, head, remoteheads->item,
+ reversed, &result);
if (clean < 0)
exit(128);
if (write_locked_index(&the_index, &lock,
@@ -1260,6 +1279,12 @@
if (branch)
skip_prefix(branch, "refs/heads/", &branch);
+ if (!pull_twohead) {
+ char *default_strategy = getenv("GIT_TEST_MERGE_ALGORITHM");
+ if (default_strategy && !strcmp(default_strategy, "ort"))
+ pull_twohead = "ort";
+ }
+
init_diff_ui_defaults();
git_config(git_merge_config, NULL);
@@ -1281,6 +1306,7 @@
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"),
@@ -1289,8 +1315,17 @@
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;
}
@@ -1334,7 +1369,7 @@
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."));
@@ -1513,6 +1548,10 @@
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,
@@ -1579,6 +1618,11 @@
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);
@@ -1629,7 +1673,7 @@
}
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;
@@ -1673,9 +1717,11 @@
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/builtin/mktag.c b/builtin/mktag.c
index 4982d3a..41a399a 100644
--- a/builtin/mktag.c
+++ b/builtin/mktag.c
@@ -1,179 +1,110 @@
#include "builtin.h"
+#include "parse-options.h"
#include "tag.h"
#include "replace-object.h"
#include "object-store.h"
+#include "fsck.h"
+#include "config.h"
-/*
- * A signature file has a very simple fixed format: four lines
- * of "object <sha1>" + "type <typename>" + "tag <tagname>" +
- * "tagger <committer>", followed by a blank line, a free-form tag
- * message and a signature block that git itself doesn't care about,
- * but that can be verified with gpg or similar.
- *
- * The first four lines are guaranteed to be at least 83 bytes:
- * "object <sha1>\n" is 48 bytes, "type tag\n" at 9 bytes is the
- * shortest possible type-line, "tag .\n" at 6 bytes is the shortest
- * single-character-tag line, and "tagger . <> 0 +0000\n" at 20 bytes is
- * the shortest possible tagger-line.
- */
+static char const * const builtin_mktag_usage[] = {
+ N_("git mktag"),
+ NULL
+};
+static int option_strict = 1;
-/*
- * We refuse to tag something we can't verify. Just because.
- */
-static int verify_object(const struct object_id *oid, const char *expected_type)
+static struct fsck_options fsck_options = FSCK_OPTIONS_STRICT;
+
+static int mktag_config(const char *var, const char *value, void *cb)
{
- int ret = -1;
- enum object_type type;
- unsigned long size;
- void *buffer = read_object_file(oid, &type, &size);
- const struct object_id *repl = lookup_replace_object(the_repository, oid);
-
- if (buffer) {
- if (type == type_from_string(expected_type)) {
- ret = check_object_signature(the_repository, repl,
- buffer, size,
- expected_type);
- }
- free(buffer);
- }
- return ret;
+ return fsck_config_internal(var, value, cb, &fsck_options);
}
-static int verify_tag(char *buffer, unsigned long size)
+static int mktag_fsck_error_func(struct fsck_options *o,
+ const struct object_id *oid,
+ enum object_type object_type,
+ int msg_type, const char *message)
{
- int typelen;
- char type[20];
- struct object_id oid;
- const char *object, *type_line, *tag_line, *tagger_line, *lb, *rb, *p;
- size_t len;
+ switch (msg_type) {
+ case FSCK_WARN:
+ if (!option_strict) {
+ fprintf_ln(stderr, _("warning: tag input does not pass fsck: %s"), message);
+ return 0;
- if (size < 84)
- return error("wanna fool me ? you obviously got the size wrong !");
-
- buffer[size] = 0;
-
- /* Verify object line */
- object = buffer;
- if (memcmp(object, "object ", 7))
- return error("char%d: does not start with \"object \"", 0);
-
- if (parse_oid_hex(object + 7, &oid, &p))
- return error("char%d: could not get SHA1 hash", 7);
-
- /* Verify type line */
- type_line = p + 1;
- if (memcmp(type_line - 1, "\ntype ", 6))
- return error("char%d: could not find \"\\ntype \"", 47);
-
- /* Verify tag-line */
- tag_line = strchr(type_line, '\n');
- if (!tag_line)
- return error("char%"PRIuMAX": could not find next \"\\n\"",
- (uintmax_t) (type_line - buffer));
- tag_line++;
- if (memcmp(tag_line, "tag ", 4) || tag_line[4] == '\n')
- return error("char%"PRIuMAX": no \"tag \" found",
- (uintmax_t) (tag_line - buffer));
-
- /* Get the actual type */
- typelen = tag_line - type_line - strlen("type \n");
- if (typelen >= sizeof(type))
- return error("char%"PRIuMAX": type too long",
- (uintmax_t) (type_line+5 - buffer));
-
- memcpy(type, type_line+5, typelen);
- type[typelen] = 0;
-
- /* Verify that the object matches */
- if (verify_object(&oid, type))
- return error("char%d: could not verify object %s", 7, oid_to_hex(&oid));
-
- /* Verify the tag-name: we don't allow control characters or spaces in it */
- tag_line += 4;
- for (;;) {
- unsigned char c = *tag_line++;
- if (c == '\n')
- break;
- if (c > ' ')
- continue;
- return error("char%"PRIuMAX": could not verify tag name",
- (uintmax_t) (tag_line - buffer));
+ }
+ /* fallthrough */
+ case FSCK_ERROR:
+ /*
+ * We treat both warnings and errors as errors, things
+ * like missing "tagger" lines are "only" warnings
+ * under fsck, we've always considered them an error.
+ */
+ fprintf_ln(stderr, _("error: tag input does not pass fsck: %s"), message);
+ return 1;
+ default:
+ BUG(_("%d (FSCK_IGNORE?) should never trigger this callback"),
+ msg_type);
}
+}
- /* Verify the tagger line */
- tagger_line = tag_line;
+static int verify_object_in_tag(struct object_id *tagged_oid, int *tagged_type)
+{
+ int ret;
+ enum object_type type;
+ unsigned long size;
+ void *buffer;
+ const struct object_id *repl;
- if (memcmp(tagger_line, "tagger ", 7))
- return error("char%"PRIuMAX": could not find \"tagger \"",
- (uintmax_t) (tagger_line - buffer));
+ buffer = read_object_file(tagged_oid, &type, &size);
+ if (!buffer)
+ die(_("could not read tagged object '%s'"),
+ oid_to_hex(tagged_oid));
+ if (type != *tagged_type)
+ die(_("object '%s' tagged as '%s', but is a '%s' type"),
+ oid_to_hex(tagged_oid),
+ type_name(*tagged_type), type_name(type));
- /*
- * Check for correct form for name and email
- * i.e. " <" followed by "> " on _this_ line
- * No angle brackets within the name or email address fields.
- * No spaces within the email address field.
- */
- tagger_line += 7;
- if (!(lb = strstr(tagger_line, " <")) || !(rb = strstr(lb+2, "> ")) ||
- strpbrk(tagger_line, "<>\n") != lb+1 ||
- strpbrk(lb+2, "><\n ") != rb)
- return error("char%"PRIuMAX": malformed tagger field",
- (uintmax_t) (tagger_line - buffer));
+ repl = lookup_replace_object(the_repository, tagged_oid);
+ ret = check_object_signature(the_repository, repl,
+ buffer, size, type_name(*tagged_type));
+ free(buffer);
- /* Check for author name, at least one character, space is acceptable */
- if (lb == tagger_line)
- return error("char%"PRIuMAX": missing tagger name",
- (uintmax_t) (tagger_line - buffer));
-
- /* timestamp, 1 or more digits followed by space */
- tagger_line = rb + 2;
- if (!(len = strspn(tagger_line, "0123456789")))
- return error("char%"PRIuMAX": missing tag timestamp",
- (uintmax_t) (tagger_line - buffer));
- tagger_line += len;
- if (*tagger_line != ' ')
- return error("char%"PRIuMAX": malformed tag timestamp",
- (uintmax_t) (tagger_line - buffer));
- tagger_line++;
-
- /* timezone, 5 digits [+-]hhmm, max. 1400 */
- if (!((tagger_line[0] == '+' || tagger_line[0] == '-') &&
- strspn(tagger_line+1, "0123456789") == 4 &&
- tagger_line[5] == '\n' && atoi(tagger_line+1) <= 1400))
- return error("char%"PRIuMAX": malformed tag timezone",
- (uintmax_t) (tagger_line - buffer));
- tagger_line += 6;
-
- /* Verify the blank line separating the header from the body */
- if (*tagger_line != '\n')
- return error("char%"PRIuMAX": trailing garbage in tag header",
- (uintmax_t) (tagger_line - buffer));
-
- /* The actual stuff afterwards we don't care about.. */
- return 0;
+ return ret;
}
int cmd_mktag(int argc, const char **argv, const char *prefix)
{
+ static struct option builtin_mktag_options[] = {
+ OPT_BOOL(0, "strict", &option_strict,
+ N_("enable more strict checking")),
+ OPT_END(),
+ };
struct strbuf buf = STRBUF_INIT;
+ struct object_id tagged_oid;
+ int tagged_type;
struct object_id result;
- if (argc != 1)
- usage("git mktag");
+ argc = parse_options(argc, argv, NULL,
+ builtin_mktag_options,
+ builtin_mktag_usage, 0);
- if (strbuf_read(&buf, 0, 4096) < 0) {
- die_errno("could not read from stdin");
- }
+ if (strbuf_read(&buf, 0, 0) < 0)
+ die_errno(_("could not read from stdin"));
- /* Verify it for some basic sanity: it needs to start with
- "object <sha1>\ntype\ntagger " */
- if (verify_tag(buf.buf, buf.len) < 0)
- die("invalid tag signature file");
+ fsck_options.error_func = mktag_fsck_error_func;
+ fsck_set_msg_type(&fsck_options, "extraheaderentry", "warn");
+ /* config might set fsck.extraHeaderEntry=* again */
+ git_config(mktag_config, NULL);
+ if (fsck_tag_standalone(NULL, buf.buf, buf.len, &fsck_options,
+ &tagged_oid, &tagged_type))
+ die(_("tag on stdin did not pass our strict fsck check"));
+
+ if (verify_object_in_tag(&tagged_oid, &tagged_type))
+ die(_("tag on stdin did not refer to a valid object"));
if (write_object_file(buf.buf, buf.len, tag_type, &result) < 0)
- die("unable to write tag file");
+ die(_("unable to write tag file"));
strbuf_release(&buf);
- printf("%s\n", oid_to_hex(&result));
+ puts(oid_to_hex(&result));
return 0;
}
diff --git a/builtin/name-rev.c b/builtin/name-rev.c
index a9dcd25..b221d30 100644
--- a/builtin/name-rev.c
+++ b/builtin/name-rev.c
@@ -7,7 +7,7 @@
#include "refs.h"
#include "parse-options.h"
#include "prio-queue.h"
-#include "sha1-lookup.h"
+#include "hash-lookup.h"
#include "commit-slab.h"
/*
@@ -390,10 +390,10 @@
}
}
-static const unsigned char *nth_tip_table_ent(size_t ix, void *table_)
+static const struct object_id *nth_tip_table_ent(size_t ix, const void *table_)
{
- struct tip_table_entry *table = table_;
- return table[ix].oid.hash;
+ const struct tip_table_entry *table = table_;
+ return &table[ix].oid;
}
static const char *get_exact_ref_match(const struct object *o)
@@ -408,8 +408,8 @@
tip_table.sorted = 1;
}
- found = sha1_pos(o->oid.hash, tip_table.table, tip_table.nr,
- nth_tip_table_ent);
+ found = oid_pos(&o->oid, tip_table.table, tip_table.nr,
+ nth_tip_table_ent);
if (0 <= found)
return tip_table.table[found].refname;
return NULL;
@@ -521,7 +521,7 @@
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>")),
diff --git a/builtin/notes.c b/builtin/notes.c
index 35e468e..74bba39 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -373,7 +373,7 @@
git_notes_list_usage, 0);
if (1 < argc) {
- error(_("too many parameters"));
+ error(_("too many arguments"));
usage_with_options(git_notes_list_usage, options);
}
@@ -406,18 +406,18 @@
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),
@@ -428,7 +428,7 @@
PARSE_OPT_KEEP_ARGV0);
if (2 < argc) {
- error(_("too many parameters"));
+ error(_("too many arguments"));
usage_with_options(git_notes_add_usage, options);
}
@@ -506,7 +506,7 @@
if (from_stdin || rewrite_cmd) {
if (argc) {
- error(_("too many parameters"));
+ error(_("too many arguments"));
usage_with_options(git_notes_copy_usage, options);
} else {
return notes_copy_from_stdin(force, rewrite_cmd);
@@ -514,11 +514,11 @@
}
if (argc < 1) {
- error(_("too few parameters"));
+ error(_("too few arguments"));
usage_with_options(git_notes_copy_usage, options);
}
if (2 < argc) {
- error(_("too many parameters"));
+ error(_("too many arguments"));
usage_with_options(git_notes_copy_usage, options);
}
@@ -572,18 +572,18 @@
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()
@@ -595,7 +595,7 @@
PARSE_OPT_KEEP_ARGV0);
if (2 < argc) {
- error(_("too many parameters"));
+ error(_("too many arguments"));
usage_with_options(usage, options);
}
@@ -662,7 +662,7 @@
0);
if (1 < argc) {
- error(_("too many parameters"));
+ error(_("too many arguments"));
usage_with_options(git_notes_show_usage, options);
}
@@ -730,7 +730,7 @@
else
oidclr(&parent_oid);
- t = xcalloc(1, sizeof(struct notes_tree));
+ CALLOC_ARRAY(t, 1);
init_notes(t, "NOTES_MERGE_PARTIAL", combine_notes_overwrite, 0);
o->local_ref = local_ref_to_free =
@@ -812,7 +812,7 @@
error(_("must specify a notes ref to merge"));
usage_with_options(git_notes_merge_usage, options);
} else if (!do_merge && argc) {
- error(_("too many parameters"));
+ error(_("too many arguments"));
usage_with_options(git_notes_merge_usage, options);
}
@@ -960,7 +960,7 @@
0);
if (argc) {
- error(_("too many parameters"));
+ error(_("too many arguments"));
usage_with_options(git_notes_prune_usage, options);
}
@@ -982,7 +982,7 @@
git_notes_get_ref_usage, 0);
if (argc) {
- error(_("too many parameters"));
+ error(_("too many arguments"));
usage_with_options(git_notes_get_ref_usage, options);
}
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 02aa6ee..4bb6026 100644
--- a/builtin/pack-objects.c
+++ b/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)
@@ -116,6 +118,8 @@
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 */
@@ -124,6 +128,15 @@
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
*/
@@ -406,7 +419,7 @@
{
struct packed_git *p = IN_PACK(entry);
struct pack_window *w_curs = NULL;
- struct revindex_entry *revidx;
+ uint32_t pos;
off_t offset;
enum object_type type = oe_type(entry);
off_t datalen;
@@ -423,10 +436,15 @@
type, entry_size);
offset = entry->in_pack_offset;
- revidx = find_pack_revindex(p, offset);
- datalen = revidx[1].offset - offset;
+ if (offset_to_pack_pos(p, offset, &pos) < 0)
+ die(_("write_reuse_object: could not locate %s, expected at "
+ "offset %"PRIuMAX" in pack %s"),
+ oid_to_hex(&entry->idx.oid), (uintmax_t)offset,
+ p->pack_name);
+ datalen = pack_pos_to_offset(p, pos + 1) - offset;
if (!pack_to_stdout && p->index_version > 1 &&
- check_pack_crc(p, &w_curs, offset, datalen, revidx->nr)) {
+ check_pack_crc(p, &w_curs, offset, datalen,
+ pack_pos_to_index(p, pos))) {
error(_("bad packed object CRC for %s"),
oid_to_hex(&entry->idx.oid));
unuse_pack(&w_curs);
@@ -616,7 +634,7 @@
if (entry)
entry->tagged = 1;
- if (!peel_ref(path, &peeled)) {
+ if (!peel_iterated_oid(oid, &peeled)) {
entry = packlist_find(&to_pack, &peeled);
if (entry)
entry->tagged = 1;
@@ -850,8 +868,8 @@
enum object_type type;
unsigned long size;
- offset = reuse_packfile->revindex[pos].offset;
- next = reuse_packfile->revindex[pos + 1].offset;
+ offset = pack_pos_to_offset(reuse_packfile, pos);
+ next = pack_pos_to_offset(reuse_packfile, pos + 1);
record_reused_object(offset, offset - hashfile_total(out));
@@ -871,16 +889,22 @@
/* Convert to REF_DELTA if we must... */
if (!allow_ofs_delta) {
- int base_pos = find_revindex_position(reuse_packfile, base_offset);
+ uint32_t base_pos;
struct object_id base_oid;
+ if (offset_to_pack_pos(reuse_packfile, base_offset, &base_pos) < 0)
+ die(_("expected object at offset %"PRIuMAX" "
+ "in pack %s"),
+ (uintmax_t)base_offset,
+ reuse_packfile->pack_name);
+
nth_packed_object_id(&base_oid, reuse_packfile,
- reuse_packfile->revindex[base_pos].nr);
+ pack_pos_to_index(reuse_packfile, base_pos));
len = encode_in_pack_object_header(header, sizeof(header),
OBJ_REF_DELTA, size);
hashwrite(out, header, len);
- hashwrite(out, base_oid.hash, 20);
+ hashwrite(out, base_oid.hash, the_hash_algo->rawsz);
copy_pack_data(out, reuse_packfile, w_curs, cur, next - cur);
return;
}
@@ -928,7 +952,7 @@
off_t to_write;
written = (pos * BITS_IN_EWORD);
- to_write = reuse_packfile->revindex[written].offset
+ to_write = pack_pos_to_offset(reuse_packfile, written)
- sizeof(struct pack_header);
/* We're recording one chunk, not one object. */
@@ -968,6 +992,25 @@
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_(
"disabling bitmap writing, packs are split due to pack.packSizeLimit"
);
@@ -1072,7 +1115,6 @@
stop_progress(&progress_state);
bitmap_writer_show_progress(progress);
- bitmap_writer_reuse_bitmaps(&to_pack);
bitmap_writer_select_commits(indexed_commits, indexed_commits_nr, -1);
bitmap_writer_build(&to_pack);
bitmap_writer_finish(written_list, nr_written,
@@ -1265,6 +1307,25 @@
}
}
+ 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;
}
@@ -1574,7 +1635,7 @@
}
}
- it = xcalloc(1, sizeof(*it));
+ CALLOC_ARRAY(it, 1);
it->next = pbase_tree;
pbase_tree = it;
@@ -1654,9 +1715,30 @@
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);
@@ -1735,11 +1817,11 @@
goto give_up;
}
if (reuse_delta && !entry->preferred_base) {
- struct revindex_entry *revidx;
- revidx = find_pack_revindex(p, ofs);
- if (!revidx)
+ uint32_t pos;
+ if (offset_to_pack_pos(p, ofs, &pos) < 0)
goto give_up;
- if (!nth_packed_object_id(&base_ref, p, revidx->nr))
+ if (!nth_packed_object_id(&base_ref, p,
+ pack_pos_to_index(p, pos)))
have_base = 1;
}
entry->in_pack_header_size = used + used_0;
@@ -1790,8 +1872,18 @@
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 {
@@ -2004,14 +2096,14 @@
progress_state = start_progress(_("Counting objects"),
to_pack.nr_objects);
- sorted_by_offset = xcalloc(to_pack.nr_objects, sizeof(struct object_entry *));
+ CALLOC_ARRAY(sorted_by_offset, to_pack.nr_objects);
for (i = 0; i < to_pack.nr_objects; i++)
sorted_by_offset[i] = to_pack.objects + i;
QSORT(sorted_by_offset, to_pack.nr_objects, pack_offset_sort);
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;
@@ -2336,7 +2428,7 @@
struct unpacked *array;
unsigned long mem_usage = 0;
- array = xcalloc(window, sizeof(struct unpacked));
+ CALLOC_ARRAY(array, window);
for (;;) {
struct object_entry *entry;
@@ -2573,7 +2665,7 @@
if (progress > pack_to_stdout)
fprintf_ln(stderr, _("Delta compression using up to %d threads"),
delta_search_threads);
- p = xcalloc(delta_search_threads, sizeof(*p));
+ CALLOC_ARRAY(p, delta_search_threads);
/* Partition the work amongst work threads. */
for (i = 0; i < delta_search_threads; i++) {
@@ -2722,13 +2814,11 @@
}
}
-static int add_ref_tag(const char *path, const struct object_id *oid, int flag, void *cb_data)
+static int add_ref_tag(const char *tag, const struct object_id *oid, int flag, void *cb_data)
{
struct object_id peeled;
- if (starts_with(path, "refs/tags/") && /* is a tag? */
- !peel_ref(path, &peeled) && /* peelable? */
- obj_is_packed(&peeled)) /* object packed? */
+ if (!peel_iterated_oid(oid, &peeled) && obj_is_packed(&peeled))
add_tag_chain(oid);
return 0;
}
@@ -2863,6 +2953,36 @@
pack_idx_opts.version);
return 0;
}
+ if (!strcmp(k, "pack.writereverseindex")) {
+ if (git_config_bool(k, v))
+ pack_idx_opts.flags |= WRITE_REV;
+ else
+ pack_idx_opts.flags &= ~WRITE_REV;
+ 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);
}
@@ -2943,7 +3063,7 @@
* 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);
@@ -2957,7 +3077,7 @@
* 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);
@@ -3252,7 +3372,7 @@
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;
@@ -3366,7 +3486,7 @@
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;
@@ -3380,9 +3500,9 @@
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,
@@ -3427,9 +3547,9 @@
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,
@@ -3454,13 +3574,16 @@
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(),
};
@@ -3469,13 +3592,15 @@
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 && the_repository->settings.pack_use_sparse != -1)
+ if (sparse < 0)
sparse = the_repository->settings.pack_use_sparse;
reset_pack_idx_option(&pack_idx_opts);
git_config(git_pack_config, NULL);
+ if (git_env_bool(GIT_TEST_WRITE_REV_INDEX, 0))
+ pack_idx_opts.flags |= WRITE_REV;
progress = isatty(2);
argc = parse_options(argc, argv, prefix, pack_objects_options,
@@ -3499,36 +3624,36 @@
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;
@@ -3590,7 +3715,7 @@
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;
@@ -3628,12 +3753,12 @@
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)
- for_each_ref(add_ref_tag, NULL);
+ for_each_tag_ref(add_ref_tag, NULL);
stop_progress(&progress_state);
trace2_region_leave("pack-objects", "enumerate-objects",
the_repository);
@@ -3649,6 +3774,7 @@
}
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);
diff --git a/builtin/pack-redundant.c b/builtin/pack-redundant.c
index 178e340..7102996 100644
--- a/builtin/pack-redundant.c
+++ b/builtin/pack-redundant.c
@@ -236,7 +236,7 @@
static void cmp_two_packs(struct pack_list *p1, struct pack_list *p2)
{
- unsigned long p1_off = 0, p2_off = 0, p1_step, p2_step;
+ size_t p1_off = 0, p2_off = 0, p1_step, p2_step;
const unsigned char *p1_base, *p2_base;
struct llist_item *p1_hint = NULL, *p2_hint = NULL;
const unsigned int hashsz = the_hash_algo->rawsz;
@@ -280,7 +280,7 @@
static size_t sizeof_union(struct packed_git *p1, struct packed_git *p2)
{
size_t ret = 0;
- unsigned long p1_off = 0, p2_off = 0, p1_step, p2_step;
+ size_t p1_off = 0, p2_off = 0, p1_step, p2_step;
const unsigned char *p1_base, *p2_base;
const unsigned int hashsz = the_hash_algo->rawsz;
@@ -373,7 +373,7 @@
return;
/* prepare an array of packed_list for easier sorting */
- ary = xcalloc(n, sizeof(struct pack_list *));
+ CALLOC_ARRAY(ary, n);
for (n = 0, p = *pl; p; p = p->next)
ary[n++] = p;
@@ -473,6 +473,12 @@
{
struct pack_list *subset, *pl = local_packs;
+ /* only one packfile */
+ if (!pl->next) {
+ llist_init(&pl->unique_objects);
+ return;
+ }
+
while ((subset = pl)) {
while ((subset = subset->next))
cmp_two_packs(pl, subset);
@@ -499,7 +505,7 @@
static struct pack_list * add_pack(struct packed_git *p)
{
struct pack_list l;
- unsigned long off = 0, step;
+ size_t off = 0, step;
const unsigned char *base;
if (!p->pack_local && !(alt_odb || verbose))
@@ -554,6 +560,7 @@
int cmd_pack_redundant(int argc, const char **argv, const char *prefix)
{
int i;
+ int i_still_use_this = 0;
struct pack_list *min = NULL, *red, *pl;
struct llist *ignore;
struct object_id *oid;
@@ -580,12 +587,24 @@
alt_odb = 1;
continue;
}
+ if (!strcmp(arg, "--i-still-use-this")) {
+ i_still_use_this = 1;
+ continue;
+ }
if (*arg == '-')
usage(pack_redundant_usage);
else
break;
}
+ if (!i_still_use_this) {
+ fputs(_("'git pack-redundant' is nominated for removal.\n"
+ "If you still use this command, please add an extra\n"
+ "option, '--i-still-use-this', on the command line\n"
+ "and let us know you still use it by sending an e-mail\n"
+ "to <git@vger.kernel.org>. Thanks.\n"), stderr);
+ }
+
if (load_all_packs)
load_all();
else
diff --git a/builtin/prune-packed.c b/builtin/prune-packed.c
index 48c5e78..b7b9281 100644
--- a/builtin/prune-packed.c
+++ b/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/builtin/prune.c b/builtin/prune.c
index 2b76872..02c6ab7 100644
--- a/builtin/prune.c
+++ b/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/builtin/pull.c b/builtin/pull.c
index 3e624d1..e8927fc 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -12,7 +12,7 @@
#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"
@@ -87,8 +87,8 @@
static int opt_autostash = -1;
static int config_autostash;
static int check_trust_level = 1;
-static struct argv_array opt_strategies = ARGV_ARRAY_INIT;
-static struct argv_array opt_strategy_opts = ARGV_ARRAY_INIT;
+static 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;
@@ -110,6 +110,7 @@
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 */
@@ -117,17 +118,17 @@
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),
@@ -141,7 +142,7 @@
N_("add (at most <n>) entries from shortlog to merge commit message"),
PARSE_OPT_OPTARG),
OPT_PASSTHRU(0, "signoff", &opt_signoff, NULL,
- N_("add Signed-off-by:"),
+ N_("add a Signed-off-by trailer"),
PARSE_OPT_OPTARG),
OPT_PASSTHRU(0, "squash", &opt_squash, NULL,
N_("create a single commit instead of doing a merge"),
@@ -163,7 +164,7 @@
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),
@@ -207,6 +208,15 @@
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),
@@ -216,12 +226,19 @@
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,
@@ -234,25 +251,25 @@
/**
* 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");
}
/**
@@ -307,7 +324,7 @@
* looks for the value of "pull.rebase". If both configuration keys do not
* exist, returns REBASE_FALSE.
*/
-static enum rebase_type config_get_rebase(void)
+static enum rebase_type config_get_rebase(int *rebase_unspecified)
{
struct branch *curr_branch = branch_get("HEAD");
const char *value;
@@ -327,6 +344,8 @@
if (!git_config_get_value("pull.rebase", &value))
return parse_config_rebase("pull.rebase", value, 1);
+ *rebase_unspecified = 1;
+
return REBASE_FALSE;
}
@@ -491,74 +510,75 @@
*/
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)
- argv_array_push(&args, 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;
}
@@ -603,8 +623,8 @@
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);
@@ -616,8 +636,8 @@
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);
@@ -629,44 +649,48 @@
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;
}
@@ -763,8 +787,8 @@
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;
@@ -815,60 +839,108 @@
/**
* Given the current HEAD oid, the merge head returned from git-fetch and the
- * fork point calculated by get_rebase_fork_point(), runs git-rebase with the
- * appropriate arguments and returns its exit status.
+ * fork point calculated by get_rebase_fork_point(), compute the <newbase> and
+ * <upstream> arguments to use for the upcoming git-rebase invocation.
*/
-static int run_rebase(const struct object_id *curr_head,
+static int get_rebase_newbase_and_upstream(struct object_id *newbase,
+ struct object_id *upstream,
+ const struct object_id *curr_head,
const struct object_id *merge_head,
const struct object_id *fork_point)
{
- int ret;
struct object_id oct_merge_base;
- struct argv_array args = ARGV_ARRAY_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");
+ if (fork_point && !is_null_oid(fork_point))
+ oidcpy(upstream, fork_point);
+ else
+ oidcpy(upstream, merge_head);
+
+ oidcpy(newbase, merge_head);
+
+ return 0;
+}
+
+/**
+ * Given the <newbase> and <upstream> calculated by
+ * get_rebase_newbase_and_upstream(), runs git-rebase with the
+ * appropriate arguments and returns its exit status.
+ */
+static int run_rebase(const struct object_id *newbase,
+ const struct object_id *upstream)
+{
+ int ret;
+ struct strvec args = STRVEC_INIT;
+
+ 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(newbase));
- if (fork_point && !is_null_oid(fork_point))
- argv_array_push(&args, oid_to_hex(fork_point));
- else
- argv_array_push(&args, oid_to_hex(merge_head));
+ strvec_push(&args, oid_to_hex(upstream));
- 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;
}
+static int get_can_ff(struct object_id *orig_head, struct object_id *orig_merge_head)
+{
+ int ret;
+ struct commit_list *list = NULL;
+ struct commit *merge_head, *head;
+
+ head = lookup_commit_reference(the_repository, orig_head);
+ commit_list_insert(head, &list);
+ merge_head = lookup_commit_reference(the_repository, orig_merge_head);
+ ret = repo_is_descendant_of(the_repository, merge_head, list);
+ free_commit_list(list);
+ return ret;
+}
+
+static void show_advice_pull_non_ff(void)
+{
+ advise(_("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"));
+}
+
int cmd_pull(int argc, const char **argv, const char *prefix)
{
const char *repo, **refspecs;
@@ -876,6 +948,8 @@
struct object_id orig_head, curr_head;
struct object_id rebase_fork_point;
int autostash;
+ int rebase_unspecified = 0;
+ int can_ff;
if (!getenv("GIT_REFLOG_ACTION"))
set_reflog_message(argc, argv);
@@ -897,7 +971,7 @@
opt_ff = xstrdup_or_null(config_get_ff());
if (opt_rebase < 0)
- opt_rebase = config_get_rebase();
+ opt_rebase = config_get_rebase(&rebase_unspecified);
if (read_cache_unmerged())
die_resolve_conflict("pull");
@@ -908,9 +982,6 @@
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)
@@ -974,28 +1045,36 @@
if (opt_rebase && merge_heads.nr > 1)
die(_("Cannot rebase onto multiple branches."));
+ can_ff = get_can_ff(&orig_head, &merge_heads.oid[0]);
+
+ if (rebase_unspecified && !opt_ff && !can_ff) {
+ if (opt_verbosity >= 0)
+ show_advice_pull_non_ff();
+ }
+
if (opt_rebase) {
int ret = 0;
+ int ran_ff = 0;
+
+ struct object_id newbase;
+ struct object_id upstream;
+ get_rebase_newbase_and_upstream(&newbase, &upstream, &curr_head,
+ merge_heads.oid, &rebase_fork_point);
+
if ((recurse_submodules == RECURSE_SUBMODULES_ON ||
recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND) &&
- submodule_touches_in_range(the_repository, &rebase_fork_point, &curr_head))
+ submodule_touches_in_range(the_repository, &upstream, &curr_head))
die(_("cannot rebase with locally recorded submodule modifications"));
if (!autostash) {
- struct commit_list *list = NULL;
- struct commit *merge_head, *head;
-
- head = lookup_commit_reference(the_repository,
- &orig_head);
- commit_list_insert(head, &list);
- merge_head = lookup_commit_reference(the_repository,
- &merge_heads.oid[0]);
- if (is_descendant_of(merge_head, list)) {
+ if (can_ff) {
/* we can fast-forward this without invoking rebase */
opt_ff = "--ff-only";
+ ran_ff = 1;
ret = run_merge();
}
}
- ret = run_rebase(&curr_head, merge_heads.oid, &rebase_fork_point);
+ if (!ran_ff)
+ ret = run_rebase(&newbase, &upstream);
if (!ret && (recurse_submodules == RECURSE_SUBMODULES_ON ||
recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND))
diff --git a/builtin/push.c b/builtin/push.c
index 6dbf0f0..194967e 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -61,26 +61,27 @@
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;
}
}
@@ -88,14 +89,13 @@
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)
@@ -107,30 +107,26 @@
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, ':'))
+ if (strchr(ref, ':') || !*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);
}
}
@@ -192,8 +188,6 @@
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)
@@ -219,18 +213,14 @@
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)
@@ -300,6 +290,12 @@
"or update a remote ref to make it point at a non-commit object,\n"
"without using the '--force' option.\n");
+static const char message_advice_ref_needs_update[] =
+ N_("Updates were rejected because the tip of the remote-tracking\n"
+ "branch has been updated since the last checkout. You may want\n"
+ "to integrate those changes locally (e.g., 'git pull ...')\n"
+ "before forcing an update.\n");
+
static void advise_pull_before_push(void)
{
if (!advice_push_non_ff_current || !advice_push_update_rejected)
@@ -335,11 +331,19 @@
advise(_(message_advice_ref_needs_force));
}
+static void advise_ref_needs_update(void)
+{
+ if (!advice_push_ref_needs_update || !advice_push_update_rejected)
+ return;
+ advise(_(message_advice_ref_needs_update));
+}
+
static int push_with_options(struct transport *transport, struct refspec *rs,
int flags)
{
int err;
unsigned int reject_reasons;
+ char *anon_url = transport_anonymize_url(transport->url);
transport_set_verbosity(transport, verbosity, progress);
transport->family = family;
@@ -357,18 +361,19 @@
}
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;
@@ -382,12 +387,14 @@
advise_ref_fetch_first();
} else if (reject_reasons & REJECT_NEEDS_FORCE) {
advise_ref_needs_force();
+ } else if (reject_reasons & REJECT_REF_NEEDS_UPDATE) {
+ advise_ref_needs_update();
}
return 1;
}
-static int do_push(const char *repo, int flags,
+static int do_push(int flags,
const struct string_list *push_options,
struct remote *remote)
{
@@ -434,10 +441,8 @@
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;
}
@@ -520,6 +525,12 @@
if (!v)
return config_error_nonbool(k);
return color_parse(v, push_colors[slot]);
+ } else if (!strcmp(k, "push.useforceifincludes")) {
+ if (git_config_bool(k, v))
+ *flags |= TRANSPORT_PUSH_FORCE_IF_INCLUDES;
+ else
+ *flags &= ~TRANSPORT_PUSH_FORCE_IF_INCLUDES;
+ return 0;
}
return git_default_config(k, v, NULL);
@@ -548,13 +559,14 @@
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_BIT(0, TRANS_OPT_FORCE_IF_INCLUDES, &flags,
+ N_("require remote updates to be integrated locally"),
+ TRANSPORT_PUSH_FORCE_IF_INCLUDES),
+ 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")),
@@ -566,9 +578,8 @@
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"),
@@ -638,11 +649,14 @@
if ((flags & TRANSPORT_PUSH_ALL) && (flags & TRANSPORT_PUSH_MIRROR))
die(_("--all and --mirror are incompatible"));
+ if (!is_empty_cas(&cas) && (flags & TRANSPORT_PUSH_FORCE_IF_INCLUDES))
+ cas.use_force_if_includes = 1;
+
for_each_string_list_item(item, push_options)
if (strchr(item->string, '\n'))
die(_("push options must not have new line characters"));
- rc = do_push(repo, flags, push_options, remote);
+ rc = do_push(flags, push_options, remote);
string_list_clear(&push_options_cmdline, 0);
string_list_clear(&push_options_config, 0);
if (rc == -1)
diff --git a/builtin/range-diff.c b/builtin/range-diff.c
index d8a4670..78bc9fa 100644
--- a/builtin/range-diff.c
+++ b/builtin/range-diff.c
@@ -3,6 +3,7 @@
#include "parse-options.h"
#include "range-diff.h"
#include "config.h"
+#include "revision.h"
static const char * const builtin_range_diff_usage[] = {
N_("git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"),
@@ -13,18 +14,27 @@
int cmd_range_diff(int argc, const char **argv, const char *prefix)
{
- int creation_factor = RANGE_DIFF_CREATION_FACTOR_DEFAULT;
struct diff_options diffopt = { NULL };
- struct argv_array other_arg = ARGV_ARRAY_INIT;
- int simple_color = -1;
+ struct strvec other_arg = STRVEC_INIT;
+ struct range_diff_options range_diff_opts = {
+ .creation_factor = RANGE_DIFF_CREATION_FACTOR_DEFAULT,
+ .diffopt = &diffopt,
+ .other_arg = &other_arg
+ };
+ int simple_color = -1, left_only = 0, right_only = 0;
struct option range_diff_options[] = {
- OPT_INTEGER(0, "creation-factor", &creation_factor,
+ OPT_INTEGER(0, "creation-factor",
+ &range_diff_opts.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_BOOL(0, "left-only", &left_only,
+ N_("only emit output related to the first range")),
+ OPT_BOOL(0, "right-only", &right_only,
+ N_("only emit output related to the second range")),
OPT_END()
};
struct option *options;
@@ -46,12 +56,12 @@
diffopt.use_color = 1;
if (argc == 2) {
- if (!strstr(argv[0], ".."))
- die(_("no .. in range: '%s'"), argv[0]);
+ if (!is_range_diff_range(argv[0]))
+ die(_("not a commit range: '%s'"), argv[0]);
strbuf_addstr(&range1, argv[0]);
- if (!strstr(argv[1], ".."))
- die(_("no .. in range: '%s'"), argv[1]);
+ if (!is_range_diff_range(argv[1]))
+ die(_("not a commit range: '%s'"), argv[1]);
strbuf_addstr(&range2, argv[1]);
} else if (argc == 3) {
strbuf_addf(&range1, "%s..%s", argv[0], argv[1]);
@@ -81,10 +91,12 @@
}
FREE_AND_NULL(options);
- res = show_range_diff(range1.buf, range2.buf, creation_factor,
- simple_color < 1, &diffopt, &other_arg);
+ range_diff_opts.dual_color = simple_color < 1;
+ range_diff_opts.left_only = left_only;
+ range_diff_opts.right_only = right_only;
+ res = show_range_diff(range1.buf, range2.buf, &range_diff_opts);
- argv_array_clear(&other_arg);
+ strvec_clear(&other_arg);
strbuf_release(&range1);
strbuf_release(&range2);
diff --git a/builtin/read-tree.c b/builtin/read-tree.c
index af7424b..485e7b0 100644
--- a/builtin/read-tree.c
+++ b/builtin/read-tree.c
@@ -120,9 +120,9 @@
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 @@
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 @@
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()
};
diff --git a/builtin/rebase.c b/builtin/rebase.c
index bff53d5..de400f9 100644
--- a/builtin/rebase.c
+++ b/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,6 +27,9 @@
#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>] "
@@ -81,13 +84,16 @@
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;
+ int keep_empty;
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;
@@ -95,15 +101,19 @@
struct strbuf git_format_patch_opt;
int reschedule_failed_exec;
int use_legacy_rebase;
+ int reapply_cherry_picks;
+ int fork_point;
};
#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_format_patch_opt = STRBUF_INIT \
+ .git_am_opts = STRVEC_INIT, \
+ .git_format_patch_opt = STRBUF_INIT, \
+ .fork_point = -1, \
}
static struct replay_opts get_replay_opts(const struct rebase_options *opts)
@@ -111,6 +121,7 @@
struct replay_opts replay = REPLAY_OPTS_INIT;
replay.action = REPLAY_INTERACTIVE_REBASE;
+ replay.strategy = NULL;
sequencer_init_config(&replay);
replay.signoff = opts->signoff;
@@ -124,8 +135,17 @@
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)
+ replay.strategy = opts->strategy;
+ else if (!replay.strategy && replay.default_strategy) {
+ replay.strategy = replay.default_strategy;
+ replay.default_strategy = NULL;
+ }
+
if (opts->strategy_opts)
parse_strategy_opts(&replay, opts->strategy_opts);
@@ -258,15 +278,14 @@
}
static int get_revision_ranges(struct commit *upstream, struct commit *onto,
- struct object_id *orig_head, const char **head_hash,
- char **revisions, char **shortrevisions)
+ struct object_id *orig_head, char **revisions,
+ char **shortrevisions)
{
struct commit *base_rev = upstream ? upstream : onto;
const char *shorthead;
- *head_hash = find_unique_abbrev(orig_head, GIT_MAX_HEXSZ);
*revisions = xstrfmt("%s...%s", oid_to_hex(&base_rev->object.oid),
- *head_hash);
+ oid_to_hex(orig_head));
shorthead = find_unique_abbrev(orig_head, DEFAULT_ABBREV);
@@ -284,7 +303,8 @@
}
static int init_basic_state(struct replay_opts *opts, const char *head_name,
- struct commit *onto, const char *orig_head)
+ struct commit *onto,
+ const struct object_id *orig_head)
{
FILE *interactive;
@@ -315,20 +335,19 @@
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 (get_revision_ranges(opts->upstream, opts->onto, &opts->orig_head,
- &head_hash, &revisions, &shortrevisions))
+ &revisions, &shortrevisions))
return -1;
if (init_basic_state(&replay,
opts->head_name ? opts->head_name : "detached HEAD",
- opts->onto, head_hash)) {
+ opts->onto, &opts->orig_head)) {
free(revisions);
free(shortrevisions);
@@ -339,13 +358,13 @@
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_pushf(&make_script_args, "^%s",
- 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)
@@ -358,15 +377,16 @@
split_exec_commands(opts->cmd, &commands);
ret = complete_action(the_repository, &replay, flags,
- shortrevisions, opts->onto_name, opts->onto, head_hash,
- &commands, opts->autosquash, &todo_list);
+ shortrevisions, opts->onto_name, opts->onto,
+ &opts->orig_head, &commands, opts->autosquash,
+ &todo_list);
}
string_list_clear(&commands, 0);
free(revisions);
free(shortrevisions);
todo_list_release(&todo_list);
- argv_array_clear(&make_script_args);
+ strvec_clear(&make_script_args);
return ret;
}
@@ -379,11 +399,13 @@
git_config_get_bool("rebase.abbreviatecommands", &abbreviate_commands);
+ flags |= opts->keep_empty ? TODO_LIST_KEEP_EMPTY : 0;
flags |= abbreviate_commands ? TODO_LIST_ABBREVIATE_CMDS : 0;
flags |= opts->rebase_merges ? TODO_LIST_REBASE_MERGES : 0;
flags |= opts->rebase_cousins > 0 ? TODO_LIST_REBASE_COUSINS : 0;
flags |= opts->root_with_onto ? TODO_LIST_ROOT_WITH_ONTO : 0;
flags |= command == ACTION_SHORTEN_OIDS ? TODO_LIST_SHORTEN_IDS : 0;
+ flags |= opts->reapply_cherry_picks ? TODO_LIST_REAPPLY_CHERRY_PICKS : 0;
switch (command) {
case ACTION_NONE: {
@@ -412,7 +434,7 @@
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;
@@ -442,6 +464,7 @@
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)
{
@@ -449,10 +472,8 @@
BUG_ON_OPT_ARG(arg);
- /*
- * If we ever want to remap --keep-empty to --empty=keep, insert:
- * opts->empty = unset ? EMPTY_UNSPECIFIED : EMPTY_KEEP;
- */
+ imply_merge(opts, unset ? "--no-keep-empty" : "--keep-empty");
+ opts->keep_empty = !unset;
opts->type = REBASE_MERGE;
return 0;
}
@@ -470,10 +491,10 @@
struct option options[] = {
OPT_NEGBIT(0, "ff", &opts.flags, N_("allow fast-forward"),
REBASE_FORCE),
- { OPTION_CALLBACK, 'k', "keep-empty", &options, NULL,
- N_("(DEPRECATED) keep empty commits"),
+ OPT_CALLBACK_F('k', "keep-empty", &options, NULL,
+ N_("keep commits which start empty"),
PARSE_OPT_NOARG | PARSE_OPT_HIDDEN,
- parse_opt_keep_empty },
+ parse_opt_keep_empty),
OPT_BOOL_F(0, "allow-empty-message", &opts.allow_empty_message,
N_("allow commits with empty messages"),
PARSE_OPT_HIDDEN),
@@ -559,7 +580,7 @@
{
switch (opts->type) {
case REBASE_APPLY:
- die(_("%s requires an interactive rebase"), option);
+ die(_("%s requires the merge backend"), option);
break;
case REBASE_MERGE:
case REBASE_PRESERVE_MERGES:
@@ -586,15 +607,6 @@
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)
{
@@ -602,8 +614,10 @@
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;
@@ -619,9 +633,11 @@
*/
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);
@@ -641,8 +657,8 @@
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;
@@ -655,8 +671,8 @@
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);
@@ -664,7 +680,8 @@
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);
@@ -672,7 +689,8 @@
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);
@@ -715,65 +733,19 @@
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);
+ run_auto_maintenance(!(opts->flags & (REBASE_NO_QUIET|REBASE_VERBOSE)));
if (opts->type == REBASE_MERGE) {
struct replay_opts replay = REPLAY_OPTS_INIT;
@@ -812,143 +784,6 @@
}
}
-#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;
@@ -964,8 +799,10 @@
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);
@@ -988,13 +825,13 @@
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;
@@ -1002,8 +839,8 @@
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;
@@ -1011,7 +848,7 @@
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);
}
@@ -1029,32 +866,33 @@
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",
- "--no-base", 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"
@@ -1072,20 +910,20 @@
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);
@@ -1145,7 +983,7 @@
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);
- 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",
@@ -1162,6 +1000,7 @@
opts->allow_rerere_autoupdate ?
opts->allow_rerere_autoupdate == RERERE_AUTOUPDATE ?
"--rerere-autoupdate" : "--no-rerere-autoupdate" : "");
+ add_var(&script_snippet, "keep_empty", opts->keep_empty ? "yes" : "");
add_var(&script_snippet, "autosquash", opts->autosquash ? "t" : "");
add_var(&script_snippet, "gpg_sign_opt", opts->gpg_sign_opt);
add_var(&script_snippet, "cmd", opts->cmd);
@@ -1212,7 +1051,7 @@
} 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);
@@ -1258,6 +1097,11 @@
return 0;
}
+ if (!strcmp(var, "rebase.forkpoint")) {
+ opts->fork_point = git_config_bool(var, value) ? -1 : 0;
+ return 0;
+ }
+
if (!strcmp(var, "rebase.usebuiltin")) {
opts->use_legacy_rebase = !git_config_bool(var, value);
return 0;
@@ -1453,7 +1297,6 @@
return 0;
}
-
int cmd_rebase(int argc, const char **argv, const char *prefix)
{
struct rebase_options options = REBASE_OPTIONS_INIT;
@@ -1465,11 +1308,11 @@
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;
const char *rebase_merges = NULL;
- int fork_point = -1;
struct string_list strategy_options = STRING_LIST_INIT_NODUP;
struct object_id squash_onto;
char *squash_onto_name = NULL;
@@ -1493,17 +1336,18 @@
N_("do not show diffstat of what changed upstream"),
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),
+ N_("add a Signed-off-by trailer to each commit")),
+ 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,
@@ -1526,18 +1370,18 @@
OPT_CMDMODE(0, "show-current-patch", &action,
N_("show the patch file being applied or merged"),
ACTION_SHOW_CURRENT_PATCH),
- { OPTION_CALLBACK, 0, "apply", &options, NULL,
+ OPT_CALLBACK_F(0, "apply", &options, NULL,
N_("use apply strategies to rebase"),
PARSE_OPT_NOARG | PARSE_OPT_NONEG,
- parse_opt_am },
- { OPTION_CALLBACK, 'm', "merge", &options, NULL,
+ 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 },
+ parse_opt_interactive),
OPT_SET_INT_F('p', "preserve-merges", &options.type,
N_("(DEPRECATED) try to recreate merges instead of "
"ignoring them"),
@@ -1546,18 +1390,17 @@
OPT_CALLBACK_F(0, "empty", &options, "{drop,keep,ask}",
N_("how to handle commits that become empty"),
PARSE_OPT_NONEG, parse_opt_empty),
- { OPTION_CALLBACK, 'k', "keep-empty", &options, NULL,
- N_("(DEPRECATED) keep empty commits"),
+ OPT_CALLBACK_F('k', "keep-empty", &options, NULL,
+ N_("keep commits which start empty"),
PARSE_OPT_NOARG | PARSE_OPT_HIDDEN,
- parse_opt_keep_empty },
+ 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")),
@@ -1569,7 +1412,7 @@
N_("mode"),
N_("try to rebase merges instead of skipping them"),
PARSE_OPT_OPTARG, NULL, (intptr_t)""},
- OPT_BOOL(0, "fork-point", &fork_point,
+ OPT_BOOL(0, "fork-point", &options.fork_point,
N_("use 'merge-base --fork-point' to refine upstream")),
OPT_STRING('s', "strategy", &options.strategy,
N_("strategy"), N_("use the given merge strategy")),
@@ -1582,6 +1425,8 @@
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;
@@ -1592,6 +1437,9 @@
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))
@@ -1652,6 +1500,9 @@
die(_("cannot combine '--keep-base' with '--root'"));
}
+ if (options.root && options.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);
@@ -1709,8 +1560,8 @@
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))
@@ -1727,9 +1578,9 @@
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);
@@ -1737,6 +1588,7 @@
goto cleanup;
}
case ACTION_QUIT: {
+ save_autostash(state_dir_path("autostash", &options));
if (options.type == REBASE_MERGE) {
struct replay_opts replay = REPLAY_OPTS_INIT;
@@ -1792,12 +1644,12 @@
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.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") ||
+ 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"))
allow_preemptive_ff = 0;
else if (skip_prefix(option, "-C", &p)) {
@@ -1817,15 +1669,16 @@
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 (gpg_sign) {
- free(options.gpg_sign_opt);
+ if (options.reapply_cherry_picks)
+ imply_merge(&options, "--reapply-cherry-picks");
+
+ if (gpg_sign)
options.gpg_sign_opt = xstrfmt("-S%s", gpg_sign);
- }
if (exec.nr) {
int i;
@@ -1849,6 +1702,23 @@
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) {
int i;
@@ -1888,10 +1758,10 @@
if (isatty(2) && options.flags & REBASE_NO_QUIET)
strbuf_addstr(&options.git_format_patch_opt, " --progress");
- if (options.git_am_opts.argc || options.type == REBASE_APPLY) {
+ 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.argc - 1; i >= 0; i--)
- if (strcmp(options.git_am_opts.argv[i], "-q"))
+ for (i = options.git_am_opts.nr - 1; i >= 0; i--)
+ if (strcmp(options.git_am_opts.v[i], "-q"))
break;
if (i >= 0) {
@@ -1913,6 +1783,11 @@
options.default_backend);
}
+ if (options.type == REBASE_MERGE &&
+ !options.strategy &&
+ getenv("GIT_TEST_MERGE_ALGORITHM"))
+ options.strategy = xstrdup(getenv("GIT_TEST_MERGE_ALGORITHM"));
+
switch (options.type) {
case REBASE_MERGE:
case REBASE_PRESERVE_MERGES:
@@ -1943,7 +1818,7 @@
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;
}
@@ -1971,8 +1846,8 @@
NULL);
if (!options.upstream_name)
error_on_missing_default_upstream();
- if (fork_point < 0)
- fork_point = 1;
+ if (options.fork_point < 0)
+ options.fork_point = 1;
} else {
options.upstream_name = argv[0];
argc--;
@@ -2048,7 +1923,9 @@
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) &&
+ lookup_commit_reference(the_repository,
+ &options.orig_head))
options.head_name = NULL;
else
die(_("fatal: no such branch/commit '%s'"),
@@ -2074,7 +1951,7 @@
} else
BUG("unexpected number of arguments left to parse");
- if (fork_point > 0) {
+ if (options.fork_point > 0) {
struct commit *head =
lookup_commit_reference(the_repository,
&options.orig_head);
@@ -2086,49 +1963,8 @@
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;
-
- 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(NULL, "reset --hard",
- NULL, RESET_HEAD_HARD, NULL, NULL) < 0)
- die(_("could not reset --hard"));
-
- 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",
@@ -2162,10 +1998,12 @@
strbuf_addf(&buf, "%s: checkout %s",
getenv(GIT_REFLOG_ACTION_ENVIRONMENT),
options.switch_to);
- if (reset_head(&options.orig_head, "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);
@@ -2237,10 +2075,10 @@
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);
@@ -2255,8 +2093,9 @@
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/builtin/receive-pack.c b/builtin/receive-pack.c
index 2cc18bb..6bc12c8 100644
--- a/builtin/receive-pack.c
+++ b/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"
@@ -28,6 +28,7 @@
#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>"),
@@ -53,9 +54,11 @@
static int transfer_unpack_limit = -1;
static int advertise_atomic_push = 1;
static int advertise_push_options;
+static int advertise_sid;
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;
@@ -96,6 +99,17 @@
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) {
@@ -228,6 +242,18 @@
return 0;
}
+ if (strcmp(var, "receive.procreceiverefs") == 0) {
+ if (!value)
+ return config_error_nonbool(var);
+ proc_receive_ref_append(value);
+ return 0;
+ }
+
+ if (strcmp(var, "transfer.advertisesid") == 0) {
+ advertise_sid = git_config_bool(var, value);
+ return 0;
+ }
+
return git_default_config(var, value, cb);
}
@@ -239,7 +265,7 @@
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)
@@ -248,6 +274,9 @@
strbuf_addf(&cap, " push-cert=%s", push_cert_nonce);
if (advertise_push_options)
strbuf_addstr(&cap, " push-options");
+ if (advertise_sid)
+ strbuf_addf(&cap, " session-id=%s", trace2_session_id());
+ 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);
@@ -308,17 +337,94 @@
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;
+
+ CALLOC_ARRAY(ref_pattern, 1);
+ 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)));
@@ -418,7 +524,7 @@
return 0;
}
-static void hmac(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)
{
@@ -463,10 +569,10 @@
unsigned char hash[GIT_MAX_RAWSZ];
strbuf_addf(&buf, "%s:%"PRItime, path, stamp);
- hmac(hash, 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 */
+ /* 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);
}
@@ -499,12 +605,27 @@
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;
@@ -546,8 +667,14 @@
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;
@@ -637,38 +764,39 @@
memset(&sigcheck, '\0', sizeof(sigcheck));
- bogs = parse_signature(push_cert.buf, push_cert.len);
+ bogs = parse_signed_buffer(push_cert.buf, push_cert.len);
check_signature(push_cert.buf, bogs, push_cert.buf + bogs,
push_cert.len - bogs, &sigcheck);
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;
@@ -697,16 +825,16 @@
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));
@@ -756,11 +884,31 @@
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;
@@ -779,6 +927,7 @@
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;
@@ -817,6 +966,312 @@
return finish_command(&proc);
}
+static struct command *find_command_by_refname(struct command *list,
+ const char *refname)
+{
+ for (; list; list = list->next)
+ if (!strcmp(list->ref_name, refname))
+ return list;
+ return NULL;
+}
+
+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;
+ int response = 0;
+
+ for (;;) {
+ struct object_id old_oid, new_oid;
+ const char *head;
+ const char *refname;
+ char *p;
+ enum packet_read_status status;
+
+ status = packet_reader_read(reader);
+ if (status != PACKET_READ_NORMAL) {
+ /* Check whether proc-receive exited abnormally */
+ if (status == PACKET_READ_EOF && !response) {
+ strbuf_addstr(errmsg, "proc-receive exited abnormally");
+ return -1;
+ }
+ break;
+ }
+ response++;
+
+ 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) {
+ CALLOC_ARRAY(hint->report, 1);
+ 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) {
+ code = packet_write_fmt_gently(proc.in, "version=1%c%s\n", '\0', cap.buf + 1);
+ strbuf_release(&cap);
+ } else {
+ code = packet_write_fmt_gently(proc.in, "version=1\n");
+ }
+ if (!code)
+ code = packet_flush_gently(proc.in);
+
+ if (!code)
+ for (;;) {
+ int linelen;
+ enum packet_read_status status;
+
+ status = packet_reader_read(&reader);
+ if (status != PACKET_READ_NORMAL) {
+ /* Check whether proc-receive exited abnormally */
+ if (status == PACKET_READ_EOF)
+ code = -1;
+ 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 (code) {
+ strbuf_addstr(&errmsg, "fail to negotiate version with proc-receive hook");
+ goto cleanup;
+ }
+
+ switch (version) {
+ case 0:
+ /* fallthrough */
+ case 1:
+ break;
+ default:
+ 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;
+ code = packet_write_fmt_gently(proc.in, "%s %s %s",
+ oid_to_hex(&cmd->old_oid),
+ oid_to_hex(&cmd->new_oid),
+ cmd->ref_name);
+ if (code)
+ break;
+ }
+ if (!code)
+ code = packet_flush_gently(proc.in);
+ if (code) {
+ strbuf_addstr(&errmsg, "fail to write commands to proc-receive hook");
+ goto cleanup;
+ }
+
+ /* Send push options */
+ if (hook_use_push_options) {
+ struct string_list_item *item;
+
+ for_each_string_list_item(item, push_options) {
+ code = packet_write_fmt_gently(proc.in, "%s", item->string);
+ if (code)
+ break;
+ }
+ if (!code)
+ code = packet_flush_gently(proc.in);
+ if (code) {
+ strbuf_addstr(&errmsg,
+ "fail to write push-options to proc-receive hook");
+ goto cleanup;
+ }
+ }
+
+ /* 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 =
N_("By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
@@ -855,7 +1310,7 @@
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);
@@ -872,12 +1327,12 @@
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
@@ -908,7 +1363,7 @@
}
static const char *push_to_deploy(unsigned char *sha1,
- struct argv_array *env,
+ struct strvec *env,
const char *work_tree)
{
const char *update_refresh[] = {
@@ -927,7 +1382,7 @@
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;
@@ -938,7 +1393,7 @@
/* 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;
@@ -951,7 +1406,7 @@
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;
@@ -962,7 +1417,7 @@
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;
@@ -977,11 +1432,11 @@
static const char *push_to_checkout_hook = "push-to-checkout";
static const char *push_to_checkout(unsigned char *hash,
- struct argv_array *env,
+ 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,
+ 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
@@ -991,7 +1446,7 @@
static const char *update_worktree(unsigned char *sha1, const struct worktree *worktree)
{
const char *retval, *work_tree, *git_dir = NULL;
- struct argv_array env = ARGV_ARRAY_INIT;
+ struct strvec env = STRVEC_INIT;
if (worktree && worktree->path)
work_tree = worktree->path;
@@ -1007,14 +1462,14 @@
if (!git_dir)
git_dir = get_git_dir();
- argv_array_pushf(&env, "GIT_DIR=%s", absolute_path(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;
}
@@ -1182,11 +1637,11 @@
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 +1847,7 @@
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 +1887,7 @@
}
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 +1923,7 @@
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 +1953,22 @@
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 +1995,14 @@
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
@@ -1570,7 +2050,7 @@
die("malformed push certificate %.*s", 100, push_cert->buf);
else
boc += 2;
- eoc = push_cert->buf + parse_signature(push_cert->buf, push_cert->len);
+ eoc = push_cert->buf + parse_signed_buffer(push_cert->buf, push_cert->len);
while (boc < eoc) {
const char *eol = memchr(boc, '\n', eoc - boc);
@@ -1602,8 +2082,13 @@
linelen = strlen(reader->line);
if (linelen < reader->pktlen) {
const char *feature_list = reader->line + linelen + 1;
+ const char *hash = NULL;
+ const char *client_sid;
+ 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 +2099,19 @@
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);
+ client_sid = parse_feature_value(feature_list, "session-id", &len, NULL);
+ if (client_sid) {
+ char *sid = xstrndup(client_sid, len);
+ trace2_data_string("transfer", NULL, "client-sid", client_sid);
+ free(sid);
+ }
}
if (!strcmp(reader->line, "push-cert")) {
@@ -1683,10 +2181,10 @@
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 +2208,8 @@
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 +2228,16 @@
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,35 +2247,35 @@
} 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;
status = start_command(&child);
if (status)
return "index-pack fork failed";
- pack_lockfile = index_pack_lockfile(child.out);
+ pack_lockfile = index_pack_lockfile(child.out, NULL);
close(child.out);
status = finish_command(&child);
if (status)
@@ -1815,11 +2313,9 @@
ALLOC_ARRAY(si->used_shallow, si->shallow->nr);
assign_shallow_commits_to_refs(si, si->used_shallow, NULL);
- si->need_reachability_test =
- xcalloc(si->shallow->nr, sizeof(*si->need_reachability_test));
- si->reachable =
- xcalloc(si->shallow->nr, sizeof(*si->reachable));
- si->shallow_ref = xcalloc(si->ref->nr, sizeof(*si->shallow_ref));
+ CALLOC_ARRAY(si->need_reachability_test, si->shallow->nr);
+ CALLOC_ARRAY(si->reachable, si->shallow->nr);
+ CALLOC_ARRAY(si->shallow_ref, si->ref->nr);
for (i = 0; i < si->nr_ours; i++)
si->need_reachability_test[si->ours[i]] = 1;
@@ -1915,6 +2411,51 @@
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 +2564,9 @@
&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/builtin/reflog.c b/builtin/reflog.c
index 81dfd56..09541d1 100644
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -459,7 +459,7 @@
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;
@@ -602,6 +602,9 @@
*/
if (cb.cmd.stalefix) {
repo_init_revisions(the_repository, &cb.cmd.revs, prefix);
+ cb.cmd.revs.do_not_die_on_missing_tree = 1;
+ cb.cmd.revs.ignore_missing = 1;
+ cb.cmd.revs.ignore_missing_links = 1;
if (flags & EXPIRE_REFLOGS_VERBOSE)
printf(_("Marking reachable objects..."));
mark_reachable_objects(&cb.cmd.revs, 0, 0, NULL);
@@ -615,7 +618,7 @@
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/builtin/remote-ext.c b/builtin/remote-ext.c
index 6a9127a..fd3538d 100644
--- a/builtin/remote-ext.c
+++ b/builtin/remote-ext.c
@@ -117,12 +117,12 @@
}
}
-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/builtin/remote.c b/builtin/remote.c
index 555d4c8..d11a558 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -10,7 +10,7 @@
#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[] = {
@@ -170,9 +170,9 @@
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()
};
@@ -191,11 +191,12 @@
url = argv[1];
remote = remote_get(name);
- if (remote_is_configured(remote, 1))
- die(_("remote %s already exists."), name);
+ if (remote_is_configured(remote, 1)) {
+ error(_("remote %s already exists."), name);
+ exit(3);
+ }
- strbuf_addf(&buf2, "refs/heads/test:refs/remotes/%s/test", name);
- if (!valid_fetch_refspec(buf2.buf))
+ if (!valid_remote_name(name))
die(_("'%s' is not a valid remote name"), name);
strbuf_addf(&buf, "remote.%s.url", name);
@@ -478,6 +479,7 @@
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/*";
@@ -685,21 +687,23 @@
rename.remote_branches = &remote_branches;
oldremote = remote_get(rename.old_name);
- if (!remote_is_configured(oldremote, 1))
- die(_("No such remote: '%s'"), rename.old_name);
+ if (!remote_is_configured(oldremote, 1)) {
+ error(_("No such remote: '%s'"), rename.old_name);
+ exit(2);
+ }
if (!strcmp(rename.old_name, rename.new_name) && oldremote->origin != REMOTE_CONFIG)
return migrate_file(oldremote);
newremote = remote_get(rename.new_name);
- if (remote_is_configured(newremote, 1))
- die(_("remote %s already exists."), rename.new_name);
+ if (remote_is_configured(newremote, 1)) {
+ error(_("remote %s already exists."), rename.new_name);
+ exit(3);
+ }
- strbuf_addf(&buf, "refs/heads/test:refs/remotes/%s/test", rename.new_name);
- if (!valid_fetch_refspec(buf.buf))
+ if (!valid_remote_name(rename.new_name))
die(_("'%s' is not a valid remote name"), rename.new_name);
- strbuf_reset(&buf);
strbuf_addf(&buf, "remote.%s", rename.old_name);
strbuf_addf(&buf2, "remote.%s", rename.new_name);
if (git_config_rename_section(buf.buf, buf2.buf) < 1)
@@ -708,7 +712,7 @@
strbuf_reset(&buf);
strbuf_addf(&buf, "remote.%s.fetch", rename.new_name);
- git_config_set_multivar(buf.buf, NULL, NULL, 1);
+ git_config_set_multivar(buf.buf, NULL, NULL, CONFIG_FLAGS_MULTI_REPLACE);
strbuf_addf(&old_remote_context, ":refs/remotes/%s/", rename.old_name);
for (i = 0; i < oldremote->fetch.raw_nr; i++) {
char *ptr;
@@ -828,8 +832,10 @@
usage_with_options(builtin_remote_rm_usage, options);
remote = remote_get(argv[1]);
- if (!remote_is_configured(remote, 1))
- die(_("No such remote: '%s'"), argv[1]);
+ if (!remote_is_configured(remote, 1)) {
+ error(_("No such remote: '%s'"), argv[1]);
+ exit(2);
+ }
known_remotes.to_delete = remote;
for_each_remote(add_known_remote, &known_remotes);
@@ -1355,7 +1361,7 @@
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);
}
@@ -1451,41 +1457,42 @@
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;
}
static int remove_all_fetch_refspecs(const char *key)
{
- return git_config_set_multivar_gently(key, NULL, NULL, 1);
+ return git_config_set_multivar_gently(key, NULL, NULL,
+ CONFIG_FLAGS_MULTI_REPLACE);
}
static void add_branches(struct remote *remote, const char **branches,
@@ -1510,8 +1517,10 @@
strbuf_addf(&key, "remote.%s.fetch", remotename);
remote = remote_get(remotename);
- if (!remote_is_configured(remote, 1))
- die(_("No such remote '%s'"), remotename);
+ if (!remote_is_configured(remote, 1)) {
+ error(_("No such remote '%s'"), remotename);
+ exit(2);
+ }
if (!add_mode && remove_all_fetch_refspecs(key.buf)) {
strbuf_release(&key);
@@ -1564,8 +1573,10 @@
remotename = argv[0];
remote = remote_get(remotename);
- if (!remote_is_configured(remote, 1))
- die(_("No such remote '%s'"), remotename);
+ if (!remote_is_configured(remote, 1)) {
+ error(_("No such remote '%s'"), remotename);
+ exit(2);
+ }
url_nr = 0;
if (push_mode) {
@@ -1632,8 +1643,10 @@
oldurl = newurl;
remote = remote_get(remotename);
- if (!remote_is_configured(remote, 1))
- die(_("No such remote '%s'"), remotename);
+ if (!remote_is_configured(remote, 1)) {
+ error(_("No such remote '%s'"), remotename);
+ exit(2);
+ }
if (push_mode) {
strbuf_addf(&name_buf, "remote.%s.pushurl", remotename);
@@ -1674,7 +1687,8 @@
if (!delete_mode)
git_config_set_multivar(name_buf.buf, newurl, oldurl, 0);
else
- git_config_set_multivar(name_buf.buf, NULL, oldurl, 1);
+ git_config_set_multivar(name_buf.buf, NULL, oldurl,
+ CONFIG_FLAGS_MULTI_REPLACE);
out:
strbuf_release(&name_buf);
return 0;
diff --git a/builtin/repack.c b/builtin/repack.c
index 0781763..01440de 100644
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -7,11 +7,14 @@
#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"
+#include "pack.h"
static int delta_base_offset = 1;
static int pack_kept_objects = -1;
@@ -131,7 +134,11 @@
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);
}
@@ -151,28 +158,28 @@
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;
}
@@ -196,6 +203,38 @@
return 0;
}
+static struct {
+ const char *name;
+ unsigned optional:1;
+} exts[] = {
+ {".pack"},
+ {".idx"},
+ {".rev", 1},
+ {".bitmap", 1},
+ {".promisor", 1},
+};
+
+static unsigned populate_pack_exts(char *name)
+{
+ struct stat statbuf;
+ struct strbuf path = STRBUF_INIT;
+ unsigned ret = 0;
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(exts); i++) {
+ strbuf_reset(&path);
+ strbuf_addf(&path, "%s-%s%s", packtmp, name, exts[i].name);
+
+ if (stat(path.buf, &statbuf))
+ continue;
+
+ ret |= (1 << i);
+ }
+
+ strbuf_release(&path);
+ return ret;
+}
+
static void repack_promisor_objects(const struct pack_objects_args *args,
struct string_list *names)
{
@@ -224,11 +263,12 @@
out = xfdopen(cmd.out, "r");
while (strbuf_getline_lf(&line, out) != EOF) {
+ struct string_list_item *item;
char *promisor_name;
- int fd;
+
if (line.len != the_hash_algo->hexsz)
die(_("repack: Expecting full hex object ID lines only from pack-objects."));
- string_list_append(names, line.buf);
+ item = string_list_append(names, line.buf);
/*
* pack-objects creates the .pack and .idx files, but not the
@@ -243,10 +283,10 @@
*/
promisor_name = mkpathdup("%s-%s.promisor", packtmp,
line.buf);
- fd = open(promisor_name, O_CREAT|O_EXCL|O_WRONLY, 0600);
- if (fd < 0)
- die_errno(_("unable to create '%s'"), promisor_name);
- close(fd);
+ write_promisor_file(promisor_name, NULL, 0);
+
+ item->util = (void *)(uintptr_t)populate_pack_exts(item->string);
+
free(promisor_name);
}
fclose(out);
@@ -259,22 +299,13 @@
int cmd_repack(int argc, const char **argv, const char *prefix)
{
- struct {
- const char *name;
- unsigned optional:1;
- } exts[] = {
- {".pack"},
- {".idx"},
- {".bitmap", 1},
- {".promisor", 1},
- };
struct child_process cmd = CHILD_PROCESS_INIT;
struct string_list_item *item;
struct string_list names = STRING_LIST_INIT_DUP;
struct string_list rollback = STRING_LIST_INIT_NODUP;
struct string_list existing_packs = STRING_LIST_INIT_DUP;
struct strbuf line = STRBUF_INIT;
- int i, ext, ret, failed;
+ int i, ext, ret;
FILE *out;
/* variables to be filled by option parsing */
@@ -284,7 +315,6 @@
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[] = {
@@ -359,24 +389,24 @@
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");
+ 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())
- argv_array_push(&cmd.args, "--exclude-promisor-objects");
+ 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);
@@ -385,23 +415,23 @@
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;
@@ -424,118 +454,42 @@
if (!names.nr && !po_args.quiet)
printf_ln(_("Nothing new to pack."));
+ for_each_string_list_item(item, &names) {
+ item->util = (void *)(uintptr_t)populate_pack_exts(item->string);
+ }
+
close_object_store(the_repository->objects);
/*
* Ok we have prepared all new packfiles.
- * First see if there are packs of the same name and if so
- * if we can move them out of the way (this can happen if we
- * repacked immediately after packing fully.
*/
- failed = 0;
for_each_string_list_item(item, &names) {
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)) {
- free(fname);
- continue;
- }
-
- fname_old = mkpathdup("%s/old-%s%s", packdir,
- item->string, exts[ext].name);
- if (file_exists(fname_old))
- if (unlink(fname_old))
- failed = 1;
-
- if (!failed && rename(fname, fname_old)) {
- free(fname);
- free(fname_old);
- failed = 1;
- break;
- } else {
- string_list_append(&rollback, fname);
- free(fname_old);
- }
- }
- if (failed)
- break;
- }
- if (failed) {
- struct string_list rollback_failure = STRING_LIST_INIT_DUP;
- for_each_string_list_item(item, &rollback) {
- char *fname, *fname_old;
- fname = mkpathdup("%s/%s", packdir, item->string);
- fname_old = mkpathdup("%s/old-%s", packdir, item->string);
- if (rename(fname_old, fname))
- string_list_append(&rollback_failure, fname);
- free(fname);
- free(fname_old);
- }
-
- if (rollback_failure.nr) {
- int i;
- fprintf(stderr,
- _("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"), packdir);
- for (i = 0; i < rollback_failure.nr; i++)
- fprintf(stderr, "WARNING: old-%s -> %s\n",
- rollback_failure.items[i].string,
- rollback_failure.items[i].string);
- }
- exit(1);
- }
-
- /* Now the ones with the same name are out of the way... */
- for_each_string_list_item(item, &names) {
- for (ext = 0; ext < ARRAY_SIZE(exts); ext++) {
- char *fname, *fname_old;
- struct stat statbuffer;
- int exists = 0;
fname = mkpathdup("%s/pack-%s%s",
packdir, item->string, exts[ext].name);
fname_old = mkpathdup("%s-%s%s",
packtmp, item->string, exts[ext].name);
- if (!stat(fname_old, &statbuffer)) {
- statbuffer.st_mode &= ~(S_IWUSR | S_IWGRP | S_IWOTH);
- chmod(fname_old, statbuffer.st_mode);
- exists = 1;
- }
- if (exists || !exts[ext].optional) {
+
+ if (((uintptr_t)item->util) & (1 << ext)) {
+ struct stat statbuffer;
+ if (!stat(fname_old, &statbuffer)) {
+ statbuffer.st_mode &= ~(S_IWUSR | S_IWGRP | S_IWOTH);
+ chmod(fname_old, statbuffer.st_mode);
+ }
+
if (rename(fname_old, fname))
die_errno(_("renaming '%s' failed"), fname_old);
- }
+ } else if (!exts[ext].optional)
+ die(_("missing required file: %s"), fname_old);
+ else if (unlink(fname) < 0 && errno != ENOENT)
+ die_errno(_("could not unlink: %s"), fname);
+
free(fname);
free(fname_old);
}
}
-
- /* Remove the "old-" files */
- for_each_string_list_item(item, &names) {
- for (ext = 0; ext < ARRAY_SIZE(exts); ext++) {
- char *fname;
- fname = mkpathdup("%s/old-%s%s",
- packdir,
- item->string,
- exts[ext].name);
- if (remove_path(fname))
- warning(_("failed to remove '%s'"), fname);
- free(fname);
- }
- }
-
/* End of pack replacement. */
reprepare_packed_git(the_repository);
diff --git a/builtin/replace.c b/builtin/replace.c
index b36d17a..cd48765 100644
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -228,13 +228,13 @@
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;
@@ -502,7 +502,7 @@
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;
@@ -512,10 +512,10 @@
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/builtin/reset.c b/builtin/reset.c
index 18228c3..c635b06 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -46,7 +46,7 @@
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];
@@ -60,6 +60,7 @@
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) {
@@ -301,9 +302,9 @@
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")),
@@ -418,11 +419,20 @@
}
}
} 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/builtin/rev-list.c b/builtin/rev-list.c
index f520111..b4d8ea0 100644
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -80,6 +80,19 @@
#define DEFAULT_OIDSET_SIZE (16*1024)
+static int show_disk_usage;
+static off_t total_disk_usage;
+
+static off_t get_object_disk_usage(struct object *obj)
+{
+ off_t size;
+ struct object_info oi = OBJECT_INFO_INIT;
+ oi.disk_sizep = &size;
+ if (oid_object_info_extended(the_repository, &obj->oid, &oi, 0) < 0)
+ die(_("unable to get disk usage of %s"), oid_to_hex(&obj->oid));
+ return size;
+}
+
static void finish_commit(struct commit *commit);
static void show_commit(struct commit *commit, void *data)
{
@@ -88,6 +101,9 @@
display_progress(progress, ++progress_counter);
+ if (show_disk_usage)
+ total_disk_usage += get_object_disk_usage(&commit->object);
+
if (info->flags & REV_LIST_QUIET) {
finish_commit(commit);
return;
@@ -258,6 +274,8 @@
if (finish_object(obj, name, cb_data))
return;
display_progress(progress, ++progress_counter);
+ if (show_disk_usage)
+ total_disk_usage += get_object_disk_usage(obj);
if (info->flags & REV_LIST_QUIET)
return;
@@ -452,6 +470,23 @@
return 0;
}
+static int try_bitmap_disk_usage(struct rev_info *revs,
+ struct list_objects_filter_options *filter)
+{
+ struct bitmap_index *bitmap_git;
+
+ if (!show_disk_usage)
+ return -1;
+
+ bitmap_git = prepare_bitmap_walk(revs, filter);
+ if (!bitmap_git)
+ return -1;
+
+ printf("%"PRIuMAX"\n",
+ (uintmax_t)get_disk_usage_from_bitmap(bitmap_git, revs));
+ return 0;
+}
+
int cmd_rev_list(int argc, const char **argv, const char *prefix)
{
struct rev_info revs;
@@ -584,6 +619,12 @@
continue;
}
+ if (!strcmp(arg, "--disk-usage")) {
+ show_disk_usage = 1;
+ info.flags |= REV_LIST_QUIET;
+ continue;
+ }
+
usage(rev_list_usage);
}
@@ -626,6 +667,8 @@
if (use_bitmap_index) {
if (!try_bitmap_count(&revs, &filter_options))
return 0;
+ if (!try_bitmap_disk_usage(&revs, &filter_options))
+ return 0;
if (!try_bitmap_traversal(&revs, &filter_options))
return 0;
}
@@ -637,8 +680,15 @@
if (bisect_list) {
int reaches, all;
+ unsigned bisect_flags = 0;
- find_bisection(&revs.commits, &reaches, &all, bisect_find_all);
+ 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_flags);
if (bisect_show_vars)
return show_bisect_vars(&info, reaches, all);
@@ -683,5 +733,8 @@
printf("%d\n", revs.count_left + revs.count_right);
}
+ if (show_disk_usage)
+ printf("%"PRIuMAX"\n", (uintmax_t)total_disk_usage);
+
return 0;
}
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index 7a00da8..85bad90 100644
--- a/builtin/rev-parse.c
+++ b/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 @@
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
@@ -582,6 +583,75 @@
clear_ref_exclusion(&ref_excludes);
}
+enum format_type {
+ /* We would like a relative path. */
+ FORMAT_RELATIVE,
+ /* We would like a canonical absolute path. */
+ FORMAT_CANONICAL,
+ /* We would like the default behavior. */
+ FORMAT_DEFAULT,
+};
+
+enum default_type {
+ /* Our default is a relative path. */
+ DEFAULT_RELATIVE,
+ /* Our default is a relative path if there's a shared root. */
+ DEFAULT_RELATIVE_IF_SHARED,
+ /* Our default is a canonical absolute path. */
+ DEFAULT_CANONICAL,
+ /* Our default is not to modify the item. */
+ DEFAULT_UNMODIFIED,
+};
+
+static void print_path(const char *path, const char *prefix, enum format_type format, enum default_type def)
+{
+ char *cwd = NULL;
+ /*
+ * We don't ever produce a relative path if prefix is NULL, so set the
+ * prefix to the current directory so that we can produce a relative
+ * path whenever possible. If we're using RELATIVE_IF_SHARED mode, then
+ * we want an absolute path unless the two share a common prefix, so don't
+ * set it in that case, since doing so causes a relative path to always
+ * be produced if possible.
+ */
+ if (!prefix && (format != FORMAT_DEFAULT || def != DEFAULT_RELATIVE_IF_SHARED))
+ prefix = cwd = xgetcwd();
+ if (format == FORMAT_DEFAULT && def == DEFAULT_UNMODIFIED) {
+ puts(path);
+ } else if (format == FORMAT_RELATIVE ||
+ (format == FORMAT_DEFAULT && def == DEFAULT_RELATIVE)) {
+ /*
+ * In order for relative_path to work as expected, we need to
+ * make sure that both paths are absolute paths. If we don't,
+ * we can end up with an unexpected absolute path that the user
+ * didn't want.
+ */
+ struct strbuf buf = STRBUF_INIT, realbuf = STRBUF_INIT, prefixbuf = STRBUF_INIT;
+ if (!is_absolute_path(path)) {
+ strbuf_realpath_forgiving(&realbuf, path, 1);
+ path = realbuf.buf;
+ }
+ if (!is_absolute_path(prefix)) {
+ strbuf_realpath_forgiving(&prefixbuf, prefix, 1);
+ prefix = prefixbuf.buf;
+ }
+ puts(relative_path(path, prefix, &buf));
+ strbuf_release(&buf);
+ strbuf_release(&realbuf);
+ strbuf_release(&prefixbuf);
+ } else if (format == FORMAT_DEFAULT && def == DEFAULT_RELATIVE_IF_SHARED) {
+ struct strbuf buf = STRBUF_INIT;
+ puts(relative_path(path, prefix, &buf));
+ strbuf_release(&buf);
+ } else {
+ struct strbuf buf = STRBUF_INIT;
+ strbuf_realpath_forgiving(&buf, path, 1);
+ puts(buf.buf);
+ strbuf_release(&buf);
+ }
+ free(cwd);
+}
+
int cmd_rev_parse(int argc, const char **argv, const char *prefix)
{
int i, as_is = 0, verify = 0, quiet = 0, revs_count = 0, type = 0;
@@ -594,6 +664,8 @@
struct object_context unused;
struct strbuf buf = STRBUF_INIT;
const int hexsz = the_hash_algo->hexsz;
+ int seen_end_of_options = 0;
+ enum format_type format = FORMAT_DEFAULT;
if (argc > 1 && !strcmp("--parseopt", argv[1]))
return cmd_parseopt(argc - 1, argv + 1, prefix);
@@ -621,21 +693,29 @@
for (i = 1; i < argc; i++) {
const char *arg = argv[i];
- if (!strcmp(arg, "--local-env-vars")) {
- int i;
- for (i = 0; local_repo_env[i]; i++)
- printf("%s\n", local_repo_env[i]);
+ if (as_is) {
+ if (show_file(arg, output_prefix) && as_is < 2)
+ verify_filename(prefix, arg, 0);
continue;
}
- if (!strcmp(arg, "--resolve-git-dir")) {
- const char *gitdir = argv[++i];
- if (!gitdir)
- die("--resolve-git-dir requires an argument");
- gitdir = resolve_gitdir(gitdir);
- if (!gitdir)
- die("not a gitdir '%s'", argv[i]);
- puts(gitdir);
- continue;
+
+ if (!seen_end_of_options) {
+ if (!strcmp(arg, "--local-env-vars")) {
+ int i;
+ for (i = 0; local_repo_env[i]; i++)
+ printf("%s\n", local_repo_env[i]);
+ continue;
+ }
+ if (!strcmp(arg, "--resolve-git-dir")) {
+ const char *gitdir = argv[++i];
+ if (!gitdir)
+ die("--resolve-git-dir requires an argument");
+ gitdir = resolve_gitdir(gitdir);
+ if (!gitdir)
+ die("not a gitdir '%s'", argv[i]);
+ puts(gitdir);
+ continue;
+ }
}
/* The rest of the options require a git repository. */
@@ -645,41 +725,47 @@
did_repo_setup = 1;
}
- if (!strcmp(arg, "--git-path")) {
- if (!argv[i + 1])
- die("--git-path requires an argument");
- strbuf_reset(&buf);
- puts(relative_path(git_path("%s", argv[i + 1]),
- prefix, &buf));
- i++;
- continue;
- }
- if (as_is) {
- if (show_file(arg, output_prefix) && as_is < 2)
- verify_filename(prefix, arg, 0);
- continue;
- }
- if (!strcmp(arg,"-n")) {
- if (++i >= argc)
- die("-n requires an argument");
- if ((filter & DO_FLAGS) && (filter & DO_REVS)) {
- show(arg);
- show(argv[i]);
- }
- continue;
- }
- if (starts_with(arg, "-n")) {
- if ((filter & DO_FLAGS) && (filter & DO_REVS))
- show(arg);
+ if (!strcmp(arg, "--")) {
+ as_is = 2;
+ /* Pass on the "--" if we show anything but files.. */
+ if (filter & (DO_FLAGS | DO_REVS))
+ show_file(arg, 0);
continue;
}
- if (*arg == '-') {
- if (!strcmp(arg, "--")) {
- as_is = 2;
- /* Pass on the "--" if we show anything but files.. */
- if (filter & (DO_FLAGS | DO_REVS))
- show_file(arg, 0);
+ if (!seen_end_of_options && *arg == '-') {
+ if (!strcmp(arg, "--git-path")) {
+ if (!argv[i + 1])
+ die("--git-path requires an argument");
+ strbuf_reset(&buf);
+ print_path(git_path("%s", argv[i + 1]), prefix,
+ format,
+ DEFAULT_RELATIVE_IF_SHARED);
+ i++;
+ continue;
+ }
+ if (!strcmp(arg,"-n")) {
+ if (++i >= argc)
+ die("-n requires an argument");
+ if ((filter & DO_FLAGS) && (filter & DO_REVS)) {
+ show(arg);
+ show(argv[i]);
+ }
+ continue;
+ }
+ if (starts_with(arg, "-n")) {
+ if ((filter & DO_FLAGS) && (filter & DO_REVS))
+ show(arg);
+ continue;
+ }
+ if (opt_with_value(arg, "--path-format", &arg)) {
+ if (!strcmp(arg, "absolute")) {
+ format = FORMAT_CANONICAL;
+ } else if (!strcmp(arg, "relative")) {
+ format = FORMAT_RELATIVE;
+ } else {
+ die("unknown argument to --path-format: %s", arg);
+ }
continue;
}
if (!strcmp(arg, "--default")) {
@@ -802,15 +888,16 @@
if (!strcmp(arg, "--show-toplevel")) {
const char *work_tree = get_git_work_tree();
if (work_tree)
- puts(work_tree);
+ print_path(work_tree, prefix, format, DEFAULT_UNMODIFIED);
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))
+ print_path(superproject.buf, prefix, format, DEFAULT_UNMODIFIED);
+ strbuf_release(&superproject);
continue;
}
if (!strcmp(arg, "--show-prefix")) {
@@ -844,33 +931,38 @@
const char *gitdir = getenv(GIT_DIR_ENVIRONMENT);
char *cwd;
int len;
+ enum format_type wanted = format;
if (arg[2] == 'g') { /* --git-dir */
if (gitdir) {
- puts(gitdir);
+ print_path(gitdir, prefix, format, DEFAULT_UNMODIFIED);
continue;
}
if (!prefix) {
- puts(".git");
+ print_path(".git", prefix, format, DEFAULT_UNMODIFIED);
continue;
}
} else { /* --absolute-git-dir */
+ wanted = FORMAT_CANONICAL;
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;
}
}
cwd = xgetcwd();
len = strlen(cwd);
- printf("%s%s.git\n", cwd, len && cwd[len-1] != '/' ? "/" : "");
+ strbuf_reset(&buf);
+ strbuf_addf(&buf, "%s%s.git", cwd, len && cwd[len-1] != '/' ? "/" : "");
free(cwd);
+ print_path(buf.buf, prefix, wanted, DEFAULT_CANONICAL);
continue;
}
if (!strcmp(arg, "--git-common-dir")) {
- strbuf_reset(&buf);
- puts(relative_path(get_git_common_dir(),
- prefix, &buf));
+ print_path(get_git_common_dir(), prefix, format, DEFAULT_RELATIVE_IF_SHARED);
continue;
}
if (!strcmp(arg, "--is-inside-git-dir")) {
@@ -900,8 +992,7 @@
if (the_index.split_index) {
const struct object_id *oid = &the_index.split_index->base_oid;
const char *path = git_path("sharedindex.%s", oid_to_hex(oid));
- strbuf_reset(&buf);
- puts(relative_path(path, prefix, &buf));
+ print_path(path, prefix, format, DEFAULT_RELATIVE);
}
continue;
}
@@ -932,6 +1023,12 @@
puts(the_hash_algo->name);
continue;
}
+ if (!strcmp(arg, "--end-of-options")) {
+ seen_end_of_options = 1;
+ if (filter & (DO_FLAGS | DO_REVS))
+ show_file(arg, 0);
+ continue;
+ }
if (show_flag(arg) && verify)
die_no_single_rev(quiet);
continue;
diff --git a/builtin/revert.c b/builtin/revert.c
index f61cc5d..314a86c 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -107,7 +107,7 @@
OPT_BOOL('n', "no-commit", &opts->no_commit, N_("don't automatically commit")),
OPT_BOOL('e', "edit", &opts->edit, N_("edit the commit message")),
OPT_NOOP_NOARG('r', NULL),
- OPT_BOOL('s', "signoff", &opts->signoff, N_("add Signed-off-by:")),
+ OPT_BOOL('s', "signoff", &opts->signoff, N_("add a Signed-off-by trailer")),
OPT_CALLBACK('m', "mainline", opts, N_("parent-number"),
N_("select mainline parent"), option_parse_m),
OPT_RERERE_AUTOUPDATE(&opts->allow_rerere_auto),
@@ -172,6 +172,11 @@
NULL);
}
+ if (!opts->strategy && opts->default_strategy) {
+ opts->strategy = opts->default_strategy;
+ opts->default_strategy = NULL;
+ }
+
if (opts->allow_ff)
verify_opt_compatible(me, "--ff",
"--signoff", opts->signoff,
@@ -202,6 +207,8 @@
/* These option values will be free()d */
opts->gpg_sign = xstrdup_or_null(opts->gpg_sign);
opts->strategy = xstrdup_or_null(opts->strategy);
+ if (!opts->strategy && getenv("GIT_TEST_MERGE_ALGORITHM"))
+ opts->strategy = xstrdup(getenv("GIT_TEST_MERGE_ALGORITHM"));
if (cmd == 'q') {
int ret = sequencer_remove_state(opts);
diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index 098ebf2..a7e0166 100644
--- a/builtin/send-pack.c
+++ b/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 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:
@@ -69,6 +71,11 @@
msg = "stale info";
break;
+ case REF_STATUS_REJECT_REMOTE_UPDATED:
+ res = "error";
+ msg = "remote ref updated since checkout";
+ break;
+
case REF_STATUS_REJECT_ALREADY_EXISTS:
res = "error";
msg = "already exists";
@@ -94,6 +101,23 @@
}
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);
@@ -154,6 +178,7 @@
int progress = -1;
int from_stdin = 0;
struct push_cas_option cas = {0};
+ int force_if_includes = 0;
struct packet_reader reader;
struct option options[] = {
@@ -165,9 +190,8 @@
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 +201,11 @@
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_BOOL(0, TRANS_OPT_FORCE_IF_INCLUDES, &force_if_includes,
+ N_("require remote updates to be integrated locally")),
OPT_END()
};
@@ -282,6 +307,9 @@
if (!is_empty_cas(&cas))
apply_push_cas(&cas, remote, remote_refs);
+ if (!is_empty_cas(&cas) && force_if_includes)
+ cas.use_force_if_includes = 1;
+
set_ref_status_for_push(remote_refs, args.send_mirror,
args.force_update);
diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index 65cd413..3e7ab1c 100644
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -9,6 +9,8 @@
#include "mailmap.h"
#include "shortlog.h"
#include "parse-options.h"
+#include "trailer.h"
+#include "strmap.h"
static char const * const shortlog_usage[] = {
N_("git shortlog [<options>] [<revision-range>] [[--] <path>...]"),
@@ -49,18 +51,17 @@
}
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);
else {
- const char *dot3 = log->common_repo_prefix;
- char *buffer, *p;
+ char *buffer;
struct strbuf subject = STRBUF_INIT;
const char *eol;
@@ -80,25 +81,14 @@
format_subject(&subject, oneline, " ");
buffer = strbuf_detach(&subject, NULL);
- if (dot3) {
- int dot3len = strlen(dot3);
- if (dot3len > 5) {
- while ((p = strstr(buffer, dot3)) != NULL) {
- int taillen = strlen(p) - dot3len;
- memcpy(p, "/.../", 5);
- memmove(p + 5, p + dot3len, taillen + 1);
- }
- }
- }
-
if (item->util == NULL)
item->util = xcalloc(1, sizeof(struct string_list));
string_list_append(item->util, buffer);
}
}
-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 +112,33 @@
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 +147,64 @@
!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);
}
+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_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 +212,38 @@
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>";
- insert_one_record(log, author.buf, 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_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_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);
+ }
- strbuf_release(&author);
+ strset_clear(&dups);
+ strbuf_release(&ident);
strbuf_release(&oneline);
}
@@ -241,16 +304,40 @@
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));
- read_mailmap(&log->mailmap, &log->common_repo_prefix);
+ read_mailmap(&log->mailmap);
log->list.strdup_strings = 1;
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 +347,20 @@
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")),
+ 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>]]"),
- N_("Linewrap output"), PARSE_OPT_OPTARG,
- &parse_wrap_args },
+ N_("show the email address of each author")),
+ OPT_CALLBACK_F('w', NULL, &log, N_("<w>[,<i1>[,<i2>]]"),
+ N_("linewrap output"), PARSE_OPT_OPTARG,
+ &parse_wrap_args),
+ OPT_CALLBACK(0, "group", &log, N_("field"),
+ N_("group by field"), parse_group_option),
OPT_END(),
};
@@ -311,6 +401,10 @@
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/builtin/show-branch.c b/builtin/show-branch.c
index 8c90cbb..d6d2dab 100644
--- a/builtin/show-branch.c
+++ b/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 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
@@ -561,9 +561,9 @@
* 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 @@
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 @@
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 @@
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/builtin/show-index.c b/builtin/show-index.c
index 0826f6a..8106b03 100644
--- a/builtin/show-index.c
+++ b/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,10 +14,26 @@
unsigned nr;
unsigned int version;
static unsigned int top_index[256];
- const unsigned hashsz = the_hash_algo->rawsz;
+ 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()
+ };
- if (argc != 1)
- usage(show_index_usage);
+ 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 (fread(top_index, 2 * 4, 1, stdin) != 1)
die("unable to read header");
if (top_index[0] == htonl(PACK_IDX_SIGNATURE)) {
diff --git a/builtin/show-ref.c b/builtin/show-ref.c
index 6456da7..7f8a533 100644
--- a/builtin/show-ref.c
+++ b/builtin/show-ref.c
@@ -40,7 +40,7 @@
if (!deref_tags)
return;
- if (!peel_ref(refname, &peeled)) {
+ if (!peel_iterated_oid(oid, &peeled)) {
hex = find_unique_abbrev(&peeled, abbrev);
printf("%s %s^{}\n", hex, refname);
}
@@ -169,15 +169,15 @@
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/builtin/sparse-checkout.c b/builtin/sparse-checkout.c
index 740da4b..2306a9a 100644
--- a/builtin/sparse-checkout.c
+++ b/builtin/sparse-checkout.c
@@ -18,15 +18,10 @@
static const char *empty_base = "";
static char const * const builtin_sparse_checkout_usage[] = {
- N_("git sparse-checkout (init|list|set|add|disable) <options>"),
+ 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;
@@ -46,12 +41,24 @@
}
}
+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;
@@ -94,50 +101,41 @@
static int update_working_directory(struct pattern_list *pl)
{
- int result = 0;
+ enum update_sparsity_result result;
struct unpack_trees_options o;
struct lock_file lock_file = LOCK_INIT;
- struct object_id oid;
- struct tree *tree;
- struct tree_desc t;
struct repository *r = the_repository;
- if (repo_read_index_unmerged(r))
- die(_("you need to resolve your current index first"));
-
- if (get_oid("HEAD", &oid))
- return 0;
-
- tree = parse_tree_indirect(&oid);
- parse_tree(tree);
- init_tree_desc(&t, tree->buffer, tree->size);
+ /* 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.merge = 1;
o.update = 1;
- o.fn = oneway_merge;
o.head_idx = -1;
o.src_index = r->index;
o.dst_index = r->index;
o.skip_sparse_checkout = 0;
o.pl = pl;
- o.keep_pattern_list = !!pl;
- resolve_undo_clear_index(r->index);
setup_work_tree();
- cache_tree_free(&r->index->cache_tree);
-
repo_hold_locked_index(r, &lock_file, LOCK_DIE_ON_ERROR);
- core_apply_sparse_checkout = 1;
- result = unpack_trees(1, &t, &o);
+ setup_unpack_trees_porcelain(&o, "sparse-checkout");
+ result = update_sparsity(&o);
+ clear_unpack_trees_porcelain(&o);
- if (!result) {
- prime_cache_tree(r, r->index, tree);
+ 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
+ else
rollback_lock_file(&lock_file);
return result;
@@ -262,6 +260,8 @@
{
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;
@@ -304,8 +304,6 @@
};
repo_read_index(the_repository);
- require_clean_work_tree(the_repository,
- N_("initialize sparse-checkout"), NULL, 1, 0);
argc = parse_options(argc, argv, NULL,
builtin_sparse_checkout_init_options,
@@ -560,8 +558,6 @@
};
repo_read_index(the_repository);
- require_clean_work_tree(the_repository,
- N_("set sparse-checkout patterns"), NULL, 1, 0);
argc = parse_options(argc, argv, prefix,
builtin_sparse_checkout_set_options,
@@ -571,14 +567,43 @@
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);
- require_clean_work_tree(the_repository,
- N_("disable sparse-checkout"), NULL, 1, 0);
memset(&pl, 0, sizeof(pl));
hashmap_init(&pl.recursive_hashmap, pl_hashmap_cmp, NULL, 0);
@@ -622,6 +647,8 @@
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);
}
diff --git a/builtin/stash.c b/builtin/stash.c
index 78af6ce..ba774cc 100644
--- a/builtin/stash.c
+++ b/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"
@@ -87,7 +87,7 @@
NULL
};
-static const char *ref_stash = "refs/stash";
+static const char ref_stash[] = "refs/stash";
static struct strbuf stash_index_path = STRBUF_INIT;
/*
@@ -185,7 +185,7 @@
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 */
@@ -222,7 +222,7 @@
PARSE_OPT_STOP_AT_NON_OPTION);
if (argc)
- return error(_("git stash clear with parameters is "
+ return error(_("git stash clear with arguments is "
"unimplemented"));
return do_clear_stash();
@@ -277,8 +277,8 @@
* 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);
}
@@ -293,7 +293,7 @@
* 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);
}
@@ -306,7 +306,7 @@
* API for resetting.
*/
cp.git_cmd = 1;
- argv_array_push(&cp.args, "reset");
+ strvec_push(&cp.args, "reset");
return run_command(&cp);
}
@@ -325,35 +325,6 @@
}
}
-static int get_newly_staged(struct strbuf *out, struct object_id *c_tree)
-{
- struct child_process cp = CHILD_PROCESS_INIT;
- const char *c_tree_hex = oid_to_hex(c_tree);
-
- /*
- * diff-index is very similar to diff-tree above, and should be
- * 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);
- return pipe_command(&cp, NULL, 0, out, 0, NULL, 0);
-}
-
-static int update_index(struct strbuf *out)
-{
- struct child_process cp = CHILD_PROCESS_INIT;
-
- /*
- * Update-index is very complicated and may need to have a public
- * function exposed in order to remove this forking.
- */
- cp.git_cmd = 1;
- argv_array_pushl(&cp.args, "update-index", "--add", "--stdin", NULL);
- return pipe_command(&cp, out->buf, out->len, NULL, 0, NULL, 0);
-}
-
static int restore_untracked(struct object_id *u_tree)
{
int res;
@@ -365,10 +336,10 @@
* 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;
@@ -376,15 +347,130 @@
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);
return res;
}
+static void unstage_changes_unless_new(struct object_id *orig_tree)
+{
+ /*
+ * When we enter this function, there has been a clean merge of
+ * relevant trees, and the merge logic always stages whatever merges
+ * cleanly. We want to unstage those changes, unless it corresponds
+ * to a file that didn't exist as of orig_tree.
+ *
+ * However, if any SKIP_WORKTREE path is modified relative to
+ * orig_tree, then we want to clear the SKIP_WORKTREE bit and write
+ * it to the worktree before unstaging.
+ */
+
+ struct checkout state = CHECKOUT_INIT;
+ struct diff_options diff_opts;
+ struct lock_file lock = LOCK_INIT;
+ int i;
+
+ /* If any entries have skip_worktree set, we'll have to check 'em out */
+ state.force = 1;
+ state.quiet = 1;
+ state.refresh_cache = 1;
+ state.istate = &the_index;
+
+ /*
+ * Step 1: get a difference between orig_tree (which corresponding
+ * to the index before a merge was run) and the current index
+ * (reflecting the changes brought in by the merge).
+ */
+ diff_setup(&diff_opts);
+ diff_opts.flags.recursive = 1;
+ diff_opts.detect_rename = 0;
+ diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
+ diff_setup_done(&diff_opts);
+
+ do_diff_cache(orig_tree, &diff_opts);
+ diffcore_std(&diff_opts);
+
+ /* Iterate over the paths that changed due to the merge... */
+ for (i = 0; i < diff_queued_diff.nr; i++) {
+ struct diff_filepair *p;
+ struct cache_entry *ce;
+ int pos;
+
+ /* Look up the path's position in the current index. */
+ p = diff_queued_diff.queue[i];
+ pos = index_name_pos(&the_index, p->two->path,
+ strlen(p->two->path));
+
+ /*
+ * Step 2: Place changes in the working tree
+ *
+ * Stash is about restoring changes *to the working tree*.
+ * So if the merge successfully got a new version of some
+ * path, but left it out of the working tree, then clear the
+ * SKIP_WORKTREE bit and write it to the working tree.
+ */
+ if (pos >= 0 && ce_skip_worktree(active_cache[pos])) {
+ struct stat st;
+
+ ce = active_cache[pos];
+ if (!lstat(ce->name, &st)) {
+ /* Conflicting path present; relocate it */
+ struct strbuf new_path = STRBUF_INIT;
+ int fd;
+
+ strbuf_addf(&new_path,
+ "%s.stash.XXXXXX", ce->name);
+ fd = xmkstemp(new_path.buf);
+ close(fd);
+ printf(_("WARNING: Untracked file in way of "
+ "tracked file! Renaming\n "
+ " %s -> %s\n"
+ " to make room.\n"),
+ ce->name, new_path.buf);
+ if (rename(ce->name, new_path.buf))
+ die("Failed to move %s to %s\n",
+ ce->name, new_path.buf);
+ strbuf_release(&new_path);
+ }
+ checkout_entry(ce, &state, NULL, NULL);
+ ce->ce_flags &= ~CE_SKIP_WORKTREE;
+ }
+
+ /*
+ * Step 3: "unstage" changes, as long as they are still tracked
+ */
+ if (p->one->oid_valid) {
+ /*
+ * Path existed in orig_tree; restore index entry
+ * from that tree in order to "unstage" the changes.
+ */
+ int option = ADD_CACHE_OK_TO_REPLACE;
+ if (pos < 0)
+ option = ADD_CACHE_OK_TO_ADD;
+
+ ce = make_cache_entry(&the_index,
+ p->one->mode,
+ &p->one->oid,
+ p->one->path,
+ 0, 0);
+ add_index_entry(&the_index, ce, option);
+ }
+ }
+ diff_flush(&diff_opts);
+
+ /*
+ * Step 4: write the new index to disk
+ */
+ repo_hold_locked_index(the_repository, &lock, LOCK_DIE_ON_ERROR);
+ if (write_locked_index(&the_index, &lock,
+ COMMIT_LOCK | SKIP_IF_UNCHANGED))
+ die(_("Unable to write index."));
+}
+
static int do_apply_stash(const char *prefix, struct stash_info *info,
int index, int quiet)
{
@@ -419,7 +505,7 @@
ret = apply_cached(&out);
strbuf_release(&out);
if (ret)
- return error(_("conflicts in index."
+ return error(_("conflicts in index. "
"Try without --index."));
discard_cache();
@@ -467,26 +553,7 @@
if (reset_tree(&index_tree, 0, 0))
return -1;
} else {
- struct strbuf out = STRBUF_INIT;
-
- if (get_newly_staged(&out, &c_tree)) {
- strbuf_release(&out);
- return -1;
- }
-
- if (reset_tree(&c_tree, 0, 1)) {
- strbuf_release(&out);
- return -1;
- }
-
- ret = update_index(&out);
- strbuf_release(&out);
- if (ret)
- return -1;
-
- /* read back the result of update_index() back from the disk */
- discard_cache();
- read_cache();
+ unstage_changes_unless_new(&c_tree);
}
if (!quiet) {
@@ -499,11 +566,11 @@
*/
cp.git_cmd = 1;
cp.dir = prefix;
- argv_array_pushf(&cp.env_array, GIT_WORK_TREE_ENVIRONMENT"=%s",
- absolute_path(get_git_work_tree()));
- argv_array_pushf(&cp.env_array, GIT_DIR_ENVIRONMENT"=%s",
- absolute_path(get_git_dir()));
- argv_array_push(&cp.args, "status");
+ 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);
}
@@ -534,11 +601,22 @@
return ret;
}
+static int reject_reflog_ent(struct object_id *ooid, struct object_id *noid,
+ const char *email, timestamp_t timestamp, int tz,
+ const char *message, void *cb_data)
+{
+ return 1;
+}
+
+static int reflog_is_empty(const char *refname)
+{
+ return !for_each_reflog_ent(refname, reject_reflog_ent, NULL);
+}
+
static int do_drop_stash(struct stash_info *info, int quiet)
{
int ret;
struct child_process cp_reflog = CHILD_PROCESS_INIT;
- struct child_process cp = CHILD_PROCESS_INIT;
/*
* reflog does not provide a simple function for deleting refs. One will
@@ -546,9 +624,9 @@
*/
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)
@@ -559,19 +637,7 @@
info->revision.buf);
}
- /*
- * This could easily be replaced by get_oid, but currently it will throw
- * a fatal error when a reflog is empty, which we can not recover from.
- */
- 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);
- ret = run_command(&cp);
-
- /* do_clear_stash if we just dropped the last stash entry */
- if (ret)
+ if (reflog_is_empty(ref_stash))
do_clear_stash();
return 0;
@@ -663,9 +729,9 @@
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);
@@ -692,16 +758,17 @@
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)
{
@@ -713,7 +780,11 @@
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)
@@ -722,8 +793,8 @@
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()
};
@@ -732,16 +803,16 @@
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;
@@ -749,8 +820,7 @@
* 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;
@@ -763,7 +833,7 @@
}
}
- 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);
@@ -838,12 +908,12 @@
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);
}
/*
@@ -857,33 +927,23 @@
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;
}
@@ -963,9 +1023,9 @@
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);
@@ -1006,9 +1066,9 @@
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;
@@ -1037,8 +1097,8 @@
}
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;
@@ -1091,11 +1151,11 @@
}
cp_upd_index.git_cmd = 1;
- argv_array_pushl(&cp_upd_index.args, "update-index",
- "--ignore-skip-worktree-entries",
- "-z", "--add", "--remove", "--stdin", NULL);
- argv_array_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)) {
@@ -1345,10 +1405,10 @@
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;
@@ -1362,12 +1422,12 @@
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;
@@ -1375,9 +1435,9 @@
}
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;
@@ -1385,8 +1445,8 @@
}
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;
@@ -1395,8 +1455,8 @@
} else {
struct child_process cp = CHILD_PROCESS_INIT;
cp.git_cmd = 1;
- argv_array_pushl(&cp.args, "reset", "--hard", "-q",
- "--no-recurse-submodules", NULL);
+ strvec_pushl(&cp.args, "reset", "--hard", "-q",
+ "--no-recurse-submodules", NULL);
if (run_command(&cp)) {
ret = -1;
goto done;
@@ -1407,10 +1467,10 @@
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)) {
@@ -1423,7 +1483,7 @@
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)
@@ -1437,7 +1497,7 @@
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;
@@ -1559,54 +1619,22 @@
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)
{
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());
+ git_config(git_stash_config, NULL);
- 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_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);
@@ -1644,7 +1672,7 @@
git_stash_usage, options);
/* Assume 'stash push' */
- argv_array_push(&args, "push");
- argv_array_pushv(&args, argv);
- return !!push_stash(args.argc, args.argv, prefix, 1);
+ strvec_push(&args, "push");
+ strvec_pushv(&args, argv);
+ return !!push_stash(args.nr, args.v, prefix, 1);
}
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 86a608e..9d505a6 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -294,9 +294,9 @@
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");
@@ -444,19 +444,19 @@
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;
@@ -495,12 +495,12 @@
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
@@ -509,15 +509,15 @@
* 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)
@@ -534,16 +534,16 @@
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 "
@@ -557,14 +557,14 @@
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;
struct option module_foreach_options[] = {
- OPT__QUIET(&info.quiet, N_("Suppress output of entering each submodule command")),
+ OPT__QUIET(&info.quiet, N_("suppress output of entering each submodule command")),
OPT_BOOL(0, "recursive", &info.recursive,
- N_("Recurse into nested submodules")),
+ N_("recurse into nested submodules")),
OPT_END()
};
@@ -612,7 +612,6 @@
const char *prefix;
unsigned int flags;
};
-
#define INIT_CB_INIT { NULL, 0 }
static void init_submodule(const char *path, const char *prefix,
@@ -707,7 +706,7 @@
int quiet = 0;
struct option module_init_options[] = {
- OPT__QUIET(&quiet, N_("Suppress output for initializing a submodule")),
+ OPT__QUIET(&quiet, N_("suppress output for initializing a submodule")),
OPT_END()
};
@@ -742,7 +741,6 @@
const char *prefix;
unsigned int flags;
};
-
#define STATUS_CB_INIT { NULL, 0 }
static void print_status(unsigned int flags, char state, const char *path,
@@ -779,7 +777,7 @@
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;
@@ -809,17 +807,17 @@
}
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, 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)) {
@@ -849,23 +847,23 @@
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);
}
@@ -885,8 +883,8 @@
int quiet = 0;
struct option module_status_options[] = {
- OPT__QUIET(&quiet, N_("Suppress submodule status output")),
- OPT_BIT(0, "cached", &info.flags, N_("Use commit stored in the index instead of the one stored in the submodule HEAD"), OPT_CACHED),
+ OPT__QUIET(&quiet, N_("suppress submodule status output")),
+ OPT_BIT(0, "cached", &info.flags, N_("use commit stored in the index instead of the one stored in the submodule HEAD"), OPT_CACHED),
OPT_BIT(0, "recursive", &info.flags, N_("recurse into nested submodules"), OPT_RECURSIVE),
OPT_END()
};
@@ -929,11 +927,437 @@
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_prefix(diff_args.nr, diff_args.v, NULL);
+ 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,
@@ -995,8 +1419,8 @@
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))
@@ -1021,13 +1445,13 @@
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'"),
@@ -1058,9 +1482,9 @@
int recursive = 0;
struct option module_sync_options[] = {
- OPT__QUIET(&quiet, N_("Suppress output of synchronizing submodule url")),
+ OPT__QUIET(&quiet, N_("suppress output of synchronizing submodule url")),
OPT_BOOL(0, "recursive", &recursive,
- N_("Recurse into nested submodules")),
+ N_("recurse into nested submodules")),
OPT_END()
};
@@ -1127,8 +1551,8 @@
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 "
@@ -1156,8 +1580,8 @@
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) {
@@ -1196,9 +1620,9 @@
int all = 0;
struct option module_deinit_options[] = {
- OPT__QUIET(&quiet, N_("Suppress submodule status output")),
- OPT__FORCE(&force, N_("Remove submodule working trees even if they contain local changes"), 0),
- OPT_BOOL(0, "all", &all, N_("Unregister all submodules")),
+ OPT__QUIET(&quiet, N_("suppress submodule status output")),
+ OPT__FORCE(&force, N_("remove submodule working trees even if they contain local changes"), 0),
+ OPT_BOOL(0, "all", &all, N_("unregister all submodules")),
OPT_END()
};
@@ -1239,32 +1663,32 @@
{
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)
- argv_array_push(&cp.args, single_branch ?
+ 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);
@@ -1511,7 +1935,7 @@
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);
@@ -1667,7 +2091,7 @@
}
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;
@@ -1690,7 +2114,7 @@
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);
@@ -1717,38 +2141,38 @@
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");
+ strvec_push(&child->args, "--depth=1");
if (suc->require_init)
- argv_array_push(&child->args, "--require-init");
- argv_array_pushl(&child->args, "--path", sub->path, NULL);
- argv_array_pushl(&child->args, "--name", sub->name, NULL);
- argv_array_pushl(&child->args, "--url", url, NULL);
+ 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)
- argv_array_push(&child->args, suc->single_branch ?
+ 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);
@@ -1913,7 +2337,7 @@
OPT_BOOL(0, "dissociate", &suc.dissociate,
N_("use --reference only while cloning")),
OPT_STRING(0, "depth", &suc.depth, "<depth>",
- N_("Create a shallow clone truncated to the "
+ N_("create a shallow clone truncated to the "
"specified number of revisions")),
OPT_INTEGER('j', "jobs", &suc.max_jobs,
N_("parallel jobs")),
@@ -1976,12 +2400,12 @@
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);
@@ -2101,7 +2525,7 @@
{
const struct submodule *sub;
const char *path;
- char *cw;
+ const char *cw;
struct repository subrepo;
if (argc != 2)
@@ -2116,7 +2540,7 @@
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;
@@ -2246,6 +2670,80 @@
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 {
@@ -2270,12 +2768,15 @@
{"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/builtin/tag.c b/builtin/tag.c
index e0a4c25..d403417 100644
--- a/builtin/tag.c
+++ b/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 @@
"\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
};
@@ -72,10 +72,10 @@
}
typedef int (*each_tag_name_fn)(const char *name, const char *ref,
- const struct object_id *oid, const void *cb_data);
+ const struct object_id *oid, void *cb_data);
static int for_each_tag_name(const char **argv, each_tag_name_fn fn,
- const void *cb_data)
+ void *cb_data)
{
const char **p;
struct strbuf ref = STRBUF_INIT;
@@ -97,18 +97,42 @@
return had_error;
}
-static int delete_tag(const char *name, const char *ref,
- const struct object_id *oid, const void *cb_data)
+static int collect_tags(const char *name, const char *ref,
+ const struct object_id *oid, void *cb_data)
{
- if (delete_ref(NULL, ref, oid, 0))
- return 1;
- printf(_("Deleted tag '%s' (was %s)\n"), name,
- find_unique_abbrev(oid, DEFAULT_ABBREV));
+ struct string_list *ref_list = cb_data;
+
+ string_list_append(ref_list, ref);
+ ref_list->items[ref_list->nr - 1].util = oiddup(oid);
return 0;
}
+static int delete_tags(const char **argv)
+{
+ int result;
+ struct string_list refs_to_delete = STRING_LIST_INIT_DUP;
+ struct string_list_item *item;
+
+ result = for_each_tag_name(argv, collect_tags, (void *)&refs_to_delete);
+ if (delete_refs(NULL, &refs_to_delete, REF_NO_DEREF))
+ result = 1;
+
+ for_each_string_list_item(item, &refs_to_delete) {
+ const char *name = item->string;
+ struct object_id *oid = item->util;
+ if (!ref_exists(name))
+ printf(_("Deleted tag '%s' (was %s)\n"),
+ item->string + 10,
+ find_unique_abbrev(oid, DEFAULT_ABBREV));
+
+ free(oid);
+ }
+ string_list_clear(&refs_to_delete, 0);
+ return result;
+}
+
static int verify_tag(const char *name, const char *ref,
- const struct object_id *oid, const void *cb_data)
+ const struct object_id *oid, void *cb_data)
{
int flags;
const struct ref_format *format = cb_data;
@@ -174,11 +198,17 @@
{
unsigned long size;
enum object_type type;
- char *buf, *sp;
+ char *buf, *sp, *orig;
+ struct strbuf payload = STRBUF_INIT;
+ struct strbuf signature = STRBUF_INIT;
- buf = read_object_file(oid, &type, &size);
+ orig = buf = read_object_file(oid, &type, &size);
if (!buf)
return;
+ if (parse_signature(buf, size, &payload, &signature)) {
+ buf = payload.buf;
+ size = payload.len;
+ }
/* skip header */
sp = strstr(buf, "\n\n");
@@ -187,9 +217,11 @@
return;
}
sp += 2; /* skip the 2 LFs */
- write_or_die(fd, sp, parse_signature(sp, buf + size - sp));
+ write_or_die(fd, sp, buf + size - sp);
- free(buf);
+ free(orig);
+ strbuf_release(&payload);
+ strbuf_release(&signature);
}
static int build_tag_object(struct strbuf *buf, int sign, struct object_id *result)
@@ -231,8 +263,9 @@
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 +442,8 @@
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 +489,8 @@
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 +517,7 @@
}
if (!sorting)
sorting = ref_default_sorting();
- sorting->ignore_case = icase;
+ ref_sorting_set_sort_flags_all(sorting, REF_SORTING_ICASE, icase);
filter.ignore_case = icase;
if (cmdmode == 'l') {
int ret;
@@ -508,10 +541,10 @@
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);
+ return delete_tags(argv);
if (cmdmode == 'v') {
if (format.format && verify_ref_format(&format))
usage_with_options(git_tag_usage, options);
@@ -539,7 +572,7 @@
object_ref = argc == 2 ? argv[1] : "HEAD";
if (argc > 2)
- die(_("too many params"));
+ die(_("too many arguments"));
if (get_oid(object_ref, &object))
die(_("Failed to resolve '%s' as a valid ref."), object_ref);
diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c
index dd4a75e..a4ba2eb 100644
--- a/builtin/unpack-objects.c
+++ b/builtin/unpack-objects.c
@@ -46,7 +46,7 @@
static void add_object_buffer(struct object *object, char *buffer, unsigned long size)
{
struct obj_buffer *obj;
- obj = xcalloc(1, sizeof(struct obj_buffer));
+ CALLOC_ARRAY(obj, 1);
obj->buffer = buffer;
obj->size = size;
if (add_decoration(&obj_decorate, object, obj))
@@ -500,7 +500,7 @@
if (!quiet)
progress = start_progress(_("Unpacking objects"), nr_objects);
- obj_list = xcalloc(nr_objects, sizeof(*obj_list));
+ CALLOC_ARRAY(obj_list, nr_objects);
for (i = 0; i < nr_objects; i++) {
unpack_one(i);
display_progress(progress, i + 1);
diff --git a/builtin/update-index.c b/builtin/update-index.c
index d527b8f..79087bc 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -985,14 +985,14 @@
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"),
@@ -1000,10 +1000,10 @@
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},
@@ -1045,10 +1045,10 @@
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,
diff --git a/builtin/update-ref.c b/builtin/update-ref.c
index 2d8f7f0..6029a80 100644
--- a/builtin/update-ref.c
+++ b/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 @@
* 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 @@
* 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 @@
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 @@
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 @@
* 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 @@
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 @@
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 @@
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,192 @@
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)
{
- struct strbuf input = STRBUF_INIT;
- const char *next;
+ if (*next != line_termination)
+ die("start: extra input: %s", next);
+ puts("start: ok");
+}
- if (strbuf_read(&input, 0, 1000) < 0)
- die_errno("could not read from stdin");
- next = input.buf;
+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, 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);
+
/* Read each line dispatch its command */
- while (next < input.buf + input.len) {
- if (*next == 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);
+ while (!strbuf_getwholeline(&input, stdin, line_termination)) {
+ const struct parse_cmd *cmd = NULL;
- next++;
+ if (*input.buf == line_termination)
+ die("empty command in input");
+ 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:
+ if (state == UPDATE_REFS_STARTED && cmd->state == UPDATE_REFS_STARTED)
+ die("cannot restart ongoing transaction");
+ /* 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:
+ if (cmd->state != UPDATE_REFS_STARTED)
+ die("transaction is closed");
+
+ /*
+ * Open a new transaction if we're currently closed and
+ * get a "start".
+ */
+ state = cmd->state;
+ transaction = ref_transaction_begin(&err);
+ if (!transaction)
+ die("%s", err.buf);
+
+ 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 +520,11 @@
}
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/builtin/upload-archive.c b/builtin/upload-archive.c
index 0188797..24654b4 100644
--- a/builtin/upload-archive.c
+++ b/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 @@
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 @@
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/builtin/verify-pack.c b/builtin/verify-pack.c
index c2a1a5c..05c5213 100644
--- a/builtin/verify-pack.c
+++ b/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 @@
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 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 @@
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/builtin/worktree.c b/builtin/worktree.c
index 24f2280..1cd5c20 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -4,7 +4,7 @@
#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"
@@ -12,6 +12,7 @@
#include "submodule.h"
#include "utf8.h"
#include "worktree.h"
+#include "quote.h"
static const char * const worktree_usage[] = {
N_("git worktree add [<options>] <path> [<commit-ish>]"),
@@ -67,92 +68,75 @@
rmdir(git_path("worktrees")); /* ignore failed removal */
}
-static int prune_worktree(const char *id, struct strbuf *reason)
+static void prune_worktree(const char *id, const char *reason)
{
- struct stat st;
- char *path;
- int fd;
- size_t len;
- ssize_t read_result;
+ if (show_only || verbose)
+ printf_ln(_("Removing %s/%s: %s"), "worktrees", id, reason);
+ if (!show_only)
+ delete_git_dir(id);
+}
- if (!is_directory(git_path("worktrees/%s", id))) {
- strbuf_addf(reason, _("Removing worktrees/%s: not a valid directory"), id);
- 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);
- 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));
- return 1;
- }
- len = xsize_t(st.st_size);
- path = xmallocz(len);
+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;
- 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));
- close(fd);
- free(path);
+ 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;
- }
- close(fd);
+ /* paths same; sort by .git/worktrees/<id> */
+ return strcmp(x->util, y->util);
+}
- 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);
- free(path);
- return 1;
+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");
}
- while (len && (path[len - 1] == '\n' || path[len - 1] == '\r'))
- len--;
- if (!len) {
- strbuf_addf(reason, _("Removing worktrees/%s: invalid gitdir file"), id);
- 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);
- return 1;
- } else {
- return 0;
- }
- }
- free(path);
- return 0;
}
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, expire))
+ 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);
@@ -224,52 +208,55 @@
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);
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"), path, cmd);
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"), path, cmd);
}
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) &&
@@ -330,9 +317,11 @@
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
@@ -347,32 +336,32 @@
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", "--no-recurse-submodules", 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;
@@ -404,20 +393,21 @@
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;
}
@@ -493,7 +483,7 @@
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")),
@@ -557,15 +547,15 @@
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;
@@ -580,6 +570,8 @@
static void show_worktree_porcelain(struct worktree *wt)
{
+ const char *reason;
+
printf("worktree %s\n", wt->path);
if (wt->is_bare)
printf("bare\n");
@@ -590,6 +582,20 @@
else if (wt->head_ref)
printf("branch %s\n", wt->head_ref);
}
+
+ reason = worktree_lock_reason(wt);
+ if (reason && *reason) {
+ struct strbuf sb = STRBUF_INIT;
+ quote_c_style(reason, &sb, NULL, 0);
+ printf("locked %s\n", sb.buf);
+ strbuf_release(&sb);
+ } else if (reason)
+ printf("locked\n");
+
+ reason = worktree_prune_reason(wt, expire);
+ if (reason)
+ printf("prunable %s\n", reason);
+
printf("\n");
}
@@ -598,6 +604,7 @@
struct strbuf sb = STRBUF_INIT;
int cur_path_len = strlen(wt->path);
int path_adj = cur_path_len - utf8_strwidth(wt->path);
+ const char *reason;
strbuf_addf(&sb, "%-*s ", 1 + path_maxlen + path_adj, wt->path);
if (wt->is_bare)
@@ -614,8 +621,20 @@
} else
strbuf_addstr(&sb, "(error)");
}
- printf("%s\n", sb.buf);
+ reason = worktree_lock_reason(wt);
+ if (verbose && reason && *reason)
+ strbuf_addf(&sb, "\n\tlocked: %s", reason);
+ else if (reason)
+ strbuf_addstr(&sb, " locked");
+
+ reason = worktree_prune_reason(wt, expire);
+ if (verbose && reason)
+ strbuf_addf(&sb, "\n\tprunable: %s", reason);
+ else if (reason)
+ strbuf_addstr(&sb, " prunable");
+
+ printf("%s\n", sb.buf);
strbuf_release(&sb);
}
@@ -635,22 +654,48 @@
}
}
+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;
struct option options[] = {
OPT_BOOL(0, "porcelain", &porcelain, N_("machine-readable output")),
+ OPT__VERBOSE(&verbose, N_("show extended annotations and reasons, if available")),
+ OPT_EXPIRY_DATE(0, "expire", &expire,
+ N_("add 'prunable' annotation to worktrees older than <time>")),
OPT_END()
};
+ expire = TIME_MAX;
ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
if (ac)
usage_with_options(worktree_usage, options);
+ else if (verbose && porcelain)
+ die(_("--verbose and --porcelain are mutually exclusive"));
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);
@@ -679,7 +724,7 @@
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]);
@@ -712,7 +757,7 @@
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]);
@@ -786,7 +831,7 @@
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]);
@@ -801,8 +846,7 @@
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);
@@ -843,7 +887,6 @@
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;
@@ -854,15 +897,14 @@
*/
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;
@@ -913,7 +955,7 @@
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]);
@@ -949,6 +991,34 @@
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);
+ p = ac > 0 ? av : self;
+ for (; *p; p++)
+ repair_worktree_at_path(*p, report_repair, &rc);
+ repair_worktrees(report_repair, &rc);
+ return rc;
+}
+
int cmd_worktree(int ac, const char **av, const char *prefix)
{
struct option options[] = {
@@ -975,5 +1045,7 @@
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/bulk-checkin.c b/bulk-checkin.c
index 583aacb..6f3c97c 100644
--- a/bulk-checkin.c
+++ b/bulk-checkin.c
@@ -211,7 +211,7 @@
/* Note: idx is non-NULL when we are writing */
if ((flags & HASH_WRITE_OBJECT) != 0)
- idx = xcalloc(1, sizeof(*idx));
+ CALLOC_ARRAY(idx, 1);
already_hashed_to = 0;
diff --git a/bundle.c b/bundle.c
index 99439e0..693d619 100644
--- a/bundle.c
+++ b/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 @@
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 @@
/* 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 @@
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,16 +295,16 @@
/* Write the pack data to bundle_fd */
-static int write_pack_data(int bundle_fd, struct rev_info *revs, struct argv_array *pack_options)
+static int write_pack_data(int bundle_fd, struct rev_info *revs, struct strvec *pack_options)
{
struct child_process pack_objects = CHILD_PROCESS_INIT;
int i;
- argv_array_pushl(&pack_objects.args,
- "pack-objects",
- "--stdout", "--thin", "--delta-base-offset",
- NULL);
- argv_array_pushv(&pack_objects.args, pack_options->argv);
+ 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;
@@ -292,48 +338,6 @@
return 0;
}
-static int compute_and_write_prerequisites(int bundle_fd,
- struct rev_info *revs,
- int argc, const char **argv)
-{
- struct child_process rls = CHILD_PROCESS_INIT;
- struct strbuf buf = STRBUF_INIT;
- FILE *rls_fout;
- int i;
-
- argv_array_pushl(&rls.args,
- "rev-list", "--boundary", "--pretty=oneline",
- NULL);
- for (i = 1; i < argc; i++)
- argv_array_push(&rls.args, argv[i]);
- rls.out = -1;
- rls.git_cmd = 1;
- if (start_command(&rls))
- return -1;
- rls_fout = xfdopen(rls.out, "r");
- while (strbuf_getwholeline(&buf, rls_fout, '\n') != EOF) {
- struct object_id oid;
- if (buf.len > 0 && buf.buf[0] == '-') {
- write_or_die(bundle_fd, buf.buf, buf.len);
- if (!get_oid_hex(buf.buf + 1, &oid)) {
- struct object *object = parse_object_or_die(&oid,
- buf.buf);
- object->flags |= UNINTERESTING;
- add_pending_object(revs, object, buf.buf);
- }
- } else if (!get_oid_hex(buf.buf, &oid)) {
- struct object *object = parse_object_or_die(&oid,
- buf.buf);
- object->flags |= SHOWN;
- }
- }
- strbuf_release(&buf);
- fclose(rls_fout);
- if (finish_command(&rls))
- return error(_("rev-list died"));
- return 0;
-}
-
/*
* Write out bundle refs based on the tips already
* parsed into revs.pending. As a side effect, may
@@ -357,7 +361,7 @@
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;
@@ -428,14 +432,49 @@
return ref_count;
}
+struct bundle_prerequisites_info {
+ struct object_array *pending;
+ int fd;
+};
+
+static void write_bundle_prerequisites(struct commit *commit, void *data)
+{
+ struct bundle_prerequisites_info *bpi = data;
+ struct object *object;
+ struct pretty_print_context ctx = { 0 };
+ struct strbuf buf = STRBUF_INIT;
+
+ if (!(commit->object.flags & BOUNDARY))
+ return;
+ strbuf_addf(&buf, "-%s ", oid_to_hex(&commit->object.oid));
+ write_or_die(bpi->fd, buf.buf, buf.len);
+
+ ctx.fmt = CMIT_FMT_ONELINE;
+ ctx.output_encoding = get_log_output_encoding();
+ strbuf_reset(&buf);
+ pretty_print_commit(&ctx, commit, &buf);
+ strbuf_trim(&buf);
+
+ object = (struct object *)commit;
+ object->flags |= UNINTERESTING;
+ add_object_array_with_path(object, buf.buf, bpi->pending, S_IFINVALID,
+ NULL);
+ strbuf_addch(&buf, '\n');
+ write_or_die(bpi->fd, buf.buf, buf.len);
+ strbuf_release(&buf);
+}
+
int create_bundle(struct repository *r, const char *path,
- int argc, const char **argv, struct argv_array *pack_options)
+ int argc, const char **argv, struct 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;
+ struct rev_info revs, revs_copy;
+ int min_version = the_hash_algo == &hash_algos[GIT_HASH_SHA1] ? 2 : 3;
+ struct bundle_prerequisites_info bpi;
+ int i;
bundle_to_stdout = !strcmp(path, "-");
if (bundle_to_stdout)
@@ -444,17 +483,27 @@
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;
repo_init_revisions(r, &revs, NULL);
- /* write prerequisites */
- if (compute_and_write_prerequisites(bundle_fd, &revs, argc, argv))
- goto err;
-
argc = setup_revisions(argc, argv, &revs, NULL);
if (argc > 1) {
@@ -462,16 +511,37 @@
goto err;
}
- object_array_remove_duplicates(&revs.pending);
+ /* save revs.pending in revs_copy for later use */
+ memcpy(&revs_copy, &revs, sizeof(revs));
+ revs_copy.pending.nr = 0;
+ revs_copy.pending.alloc = 0;
+ revs_copy.pending.objects = NULL;
+ for (i = 0; i < revs.pending.nr; i++) {
+ struct object_array_entry *e = revs.pending.objects + i;
+ if (e)
+ add_object_array_with_path(e->item, e->name,
+ &revs_copy.pending,
+ e->mode, e->path);
+ }
- ref_count = write_bundle_refs(bundle_fd, &revs);
+ /* write prerequisites */
+ revs.boundary = 1;
+ if (prepare_revision_walk(&revs))
+ die("revision walk setup failed");
+ bpi.fd = bundle_fd;
+ bpi.pending = &revs_copy.pending;
+ traverse_commit_list(&revs, write_bundle_prerequisites, NULL, &bpi);
+ object_array_remove_duplicates(&revs_copy.pending);
+
+ /* write bundle refs */
+ ref_count = write_bundle_refs(bundle_fd, &revs_copy);
if (!ref_count)
die(_("Refusing to create empty bundle."));
else if (ref_count < 0)
goto err;
/* write pack */
- if (write_pack_data(bundle_fd, &revs, pack_options))
+ if (write_pack_data(bundle_fd, &revs_copy, pack_options))
goto err;
if (!bundle_to_stdout) {
diff --git a/bundle.h b/bundle.h
index ceab0c7..f9e2d1c 100644
--- a/bundle.h
+++ b/bundle.h
@@ -1,7 +1,7 @@
#ifndef BUNDLE_H
#define BUNDLE_H
-#include "argv-array.h"
+#include "strvec.h"
#include "cache.h"
struct ref_list {
@@ -13,14 +13,17 @@
};
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, struct argv_array *pack_options);
+ 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/cache-tree.c b/cache-tree.c
index a537a80..add1f07 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -45,7 +45,7 @@
return memcmp(one, two, onelen);
}
-static int subtree_pos(struct cache_tree *it, const char *path, int pathlen)
+int cache_tree_subtree_pos(struct cache_tree *it, const char *path, int pathlen)
{
struct cache_tree_sub **down = it->down;
int lo, hi;
@@ -72,7 +72,7 @@
int create)
{
struct cache_tree_sub *down;
- int pos = subtree_pos(it, path, pathlen);
+ int pos = cache_tree_subtree_pos(it, path, pathlen);
if (0 <= pos)
return it->down[pos];
if (!create)
@@ -123,7 +123,7 @@
it->entry_count = -1;
if (!*slash) {
int pos;
- pos = subtree_pos(it, path, namelen);
+ pos = cache_tree_subtree_pos(it, path, namelen);
if (0 <= pos) {
cache_tree_free(&it->down[pos]->cache_tree);
free(it->down[pos]);
@@ -151,16 +151,15 @@
istate->cache_changed |= CACHE_TREE_CHANGED;
}
-static int verify_cache(struct cache_entry **cache,
- int entries, int flags)
+static int verify_cache(struct index_state *istate, int flags)
{
- int i, funny;
+ unsigned i, funny;
int silent = flags & WRITE_TREE_SILENT;
/* Verify that the tree is merged */
funny = 0;
- for (i = 0; i < entries; i++) {
- const struct cache_entry *ce = cache[i];
+ for (i = 0; i < istate->cache_nr; i++) {
+ const struct cache_entry *ce = istate->cache[i];
if (ce_stage(ce)) {
if (silent)
return -1;
@@ -180,17 +179,19 @@
* stage 0 entries.
*/
funny = 0;
- for (i = 0; i < entries - 1; i++) {
+ for (i = 0; i + 1 < istate->cache_nr; i++) {
/* path/file always comes after path because of the way
* the cache is sorted. Also path can appear only once,
* which means conflicting one would immediately follow.
*/
- const char *this_name = cache[i]->name;
- const char *next_name = cache[i+1]->name;
- int this_len = strlen(this_name);
- if (this_len < strlen(next_name) &&
- strncmp(this_name, next_name, this_len) == 0 &&
- next_name[this_len] == '/') {
+ const struct cache_entry *this_ce = istate->cache[i];
+ const struct cache_entry *next_ce = istate->cache[i + 1];
+ const char *this_name = this_ce->name;
+ const char *next_name = next_ce->name;
+ int this_len = ce_namelen(this_ce);
+ if (this_len < ce_namelen(next_ce) &&
+ next_name[this_len] == '/' &&
+ strncmp(this_name, next_name, this_len) == 0) {
if (10 < ++funny) {
fprintf(stderr, "...\n");
break;
@@ -434,15 +435,21 @@
int cache_tree_update(struct index_state *istate, int flags)
{
- struct cache_tree *it = istate->cache_tree;
- struct cache_entry **cache = istate->cache;
- int entries = istate->cache_nr;
- int skip, i = verify_cache(cache, entries, flags);
+ int skip, i;
+
+ i = verify_cache(istate, flags);
if (i)
return i;
+
+ if (!istate->cache_tree)
+ istate->cache_tree = cache_tree();
+
trace_performance_enter();
- i = update_one(it, cache, entries, "", 0, &skip, flags);
+ trace2_region_enter("cache_tree", "update", the_repository);
+ i = update_one(istate->cache_tree, istate->cache, istate->cache_nr,
+ "", 0, &skip, flags);
+ trace2_region_leave("cache_tree", "update", the_repository);
trace_performance_leave("cache_tree_update");
if (i < 0)
return i;
@@ -492,7 +499,9 @@
void cache_tree_write(struct strbuf *sb, struct cache_tree *root)
{
+ trace2_region_enter("cache_tree", "write", the_repository);
write_one(sb, root, "", 0);
+ trace2_region_leave("cache_tree", "write", the_repository);
}
static struct cache_tree *read_one(const char **buffer, unsigned long *size_p)
@@ -555,7 +564,7 @@
* hence +2.
*/
it->subtree_alloc = subtree_nr + 2;
- it->down = xcalloc(it->subtree_alloc, sizeof(struct cache_tree_sub *));
+ CALLOC_ARRAY(it->down, it->subtree_alloc);
for (i = 0; i < subtree_nr; i++) {
/* read each subtree */
struct cache_tree *sub;
@@ -581,9 +590,16 @@
struct cache_tree *cache_tree_read(const char *buffer, unsigned long size)
{
+ struct cache_tree *result;
+
if (buffer[0])
return NULL; /* not the whole tree */
- return read_one(&buffer, &size);
+
+ trace2_region_enter("cache_tree", "read", the_repository);
+ result = read_one(&buffer, &size);
+ trace2_region_leave("cache_tree", "read", the_repository);
+
+ return result;
}
static struct cache_tree *cache_tree_find(struct cache_tree *it, const char *path)
@@ -622,9 +638,6 @@
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;
@@ -733,10 +746,13 @@
struct index_state *istate,
struct tree *tree)
{
+ trace2_region_enter("cache-tree", "prime_cache_tree", the_repository);
cache_tree_free(&istate->cache_tree);
istate->cache_tree = cache_tree();
+
prime_cache_tree_rec(r, istate->cache_tree, tree);
istate->cache_changed |= CACHE_TREE_CHANGED;
+ trace2_region_leave("cache-tree", "prime_cache_tree", the_repository);
}
/*
diff --git a/cache-tree.h b/cache-tree.h
index 639bfa5..8efecce 100644
--- a/cache-tree.h
+++ b/cache-tree.h
@@ -27,6 +27,8 @@
void cache_tree_invalidate_path(struct index_state *, const char *);
struct cache_tree_sub *cache_tree_sub(struct cache_tree *, const char *);
+int cache_tree_subtree_pos(struct cache_tree *it, const char *path, int pathlen);
+
void cache_tree_write(struct strbuf *, struct cache_tree *root);
struct cache_tree *cache_tree_read(const char *buffer, unsigned long size);
diff --git a/cache.h b/cache.h
index 37c899b..6fda809 100644
--- a/cache.h
+++ b/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"
@@ -328,6 +328,7 @@
struct ewah_bitmap *fsmonitor_dirty;
struct mem_pool *ce_mem_pool;
struct progress *progress;
+ struct repository *repo;
};
/* Name hashing */
@@ -472,6 +473,7 @@
#define TEMPLATE_DIR_ENVIRONMENT "GIT_TEMPLATE_DIR"
#define CONFIG_ENVIRONMENT "GIT_CONFIG"
#define CONFIG_DATA_ENVIRONMENT "GIT_CONFIG_PARAMETERS"
+#define CONFIG_COUNT_ENVIRONMENT "GIT_CONFIG_COUNT"
#define EXEC_PATH_ENVIRONMENT "GIT_EXEC_PATH"
#define CEILING_DIRECTORIES_ENVIRONMENT "GIT_CEILING_DIRECTORIES"
#define NO_REPLACE_OBJECTS_ENVIRONMENT "GIT_NO_REPLACE_OBJECTS"
@@ -543,7 +545,7 @@
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);
@@ -627,7 +629,9 @@
#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);
@@ -919,8 +923,8 @@
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;
@@ -1042,6 +1046,7 @@
int hash_algo;
char *work_tree;
struct string_list unknown_extensions;
+ struct string_list v1_only_extensions;
};
/*
@@ -1055,6 +1060,7 @@
.is_bare = -1, \
.hash_algo = GIT_HASH_SHA1, \
.unknown_extensions = STRING_LIST_INIT_DUP, \
+ .v1_only_extensions = STRING_LIST_INIT_DUP, \
}
/*
@@ -1086,8 +1092,10 @@
* 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
@@ -1117,100 +1125,6 @@
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 struct object_id null_oid;
-
-static inline int hashcmp(const unsigned char *sha1, const unsigned char *sha2)
-{
- /*
- * Teach the compiler that there are only two possibilities of hash size
- * here, so that it can optimize for this case as much as possible.
- */
- if (the_hash_algo->rawsz == GIT_MAX_RAWSZ)
- return memcmp(sha1, sha2, GIT_MAX_RAWSZ);
- return memcmp(sha1, sha2, GIT_SHA1_RAWSZ);
-}
-
-static inline int oidcmp(const struct object_id *oid1, const struct object_id *oid2)
-{
- return hashcmp(oid1->hash, oid2->hash);
-}
-
-static inline int hasheq(const unsigned char *sha1, const unsigned char *sha2)
-{
- /*
- * We write this here instead of deferring to hashcmp so that the
- * compiler can properly inline it and avoid calling memcmp.
- */
- if (the_hash_algo->rawsz == GIT_MAX_RAWSZ)
- return !memcmp(sha1, sha2, GIT_MAX_RAWSZ);
- return !memcmp(sha1, sha2, GIT_SHA1_RAWSZ);
-}
-
-static inline int oideq(const struct object_id *oid1, const struct object_id *oid2)
-{
- return hasheq(oid1->hash, oid2->hash);
-}
-
-static inline int is_null_oid(const struct object_id *oid)
-{
- return oideq(oid, &null_oid);
-}
-
-static inline void hashcpy(unsigned char *sha_dst, const unsigned char *sha_src)
-{
- memcpy(sha_dst, sha_src, the_hash_algo->rawsz);
-}
-
-static inline void oidcpy(struct object_id *dst, const struct object_id *src)
-{
- memcpy(dst->hash, src->hash, GIT_MAX_RAWSZ);
-}
-
-static inline struct object_id *oiddup(const struct object_id *src)
-{
- struct object_id *dst = xmalloc(sizeof(struct object_id));
- oidcpy(dst, src);
- return dst;
-}
-
-static inline void hashclr(unsigned char *hash)
-{
- memset(hash, 0, the_hash_algo->rawsz);
-}
-
-static inline void oidclr(struct object_id *oid)
-{
- memset(oid->hash, 0, GIT_MAX_RAWSZ);
-}
-
-static inline void oidread(struct object_id *oid, const unsigned char *hash)
-{
- memcpy(oid->hash, hash, the_hash_algo->rawsz);
-}
-
-static inline int is_empty_blob_sha1(const unsigned char *sha1)
-{
- return hasheq(sha1, the_hash_algo->empty_blob->hash);
-}
-
-static inline int is_empty_blob_oid(const struct object_id *oid)
-{
- return oideq(oid, the_hash_algo->empty_blob);
-}
-
-static inline int is_empty_tree_sha1(const unsigned char *sha1)
-{
- return hasheq(sha1, the_hash_algo->empty_tree->hash);
-}
-
-static inline int is_empty_tree_oid(const struct object_id *oid)
-{
- return oideq(oid, the_hash_algo->empty_tree);
-}
-
-const char *empty_tree_oid_hex(void);
-const char *empty_blob_oid_hex(void);
-
/* set default permissions by passing mode arguments to open(2) */
int git_mkstemps_mode(char *pattern, int suffix_len, int mode);
int git_mkstemp_mode(char *pattern, int mode);
@@ -1249,7 +1163,11 @@
* safe_create_leading_directories() temporarily changes path while it
* is working but restores it before returning.
* safe_create_leading_directories_const() doesn't modify path, even
- * temporarily.
+ * temporarily. Both these variants adjust the permissions of the
+ * created directories to honor core.sharedRepository, so they are best
+ * suited for files inside the git dir. For working tree files, use
+ * safe_create_leading_directories_no_share() instead, as it ignores
+ * the core.sharedRepository setting.
*/
enum scld_error {
SCLD_OK = 0,
@@ -1260,6 +1178,7 @@
};
enum scld_error safe_create_leading_directories(char *path);
enum scld_error safe_create_leading_directories_const(const char *path);
+enum scld_error safe_create_leading_directories_no_share(char *path);
/*
* Callback function for raceproof_create_file(). This function is
@@ -1314,8 +1233,8 @@
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 *strbuf_realpath_forgiving(struct strbuf *resolved, const char *path,
+ int die_on_error);
char *real_pathdup(const char *path, int die_on_error);
const char *absolute_path(const char *path);
char *absolute_pathdup(const char *path);
@@ -1481,6 +1400,9 @@
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
@@ -1516,6 +1438,20 @@
*/
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
@@ -1536,21 +1472,32 @@
*
* 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);
@@ -1679,6 +1626,7 @@
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,
@@ -1713,6 +1661,7 @@
int threaded_has_symlink_leading_path(struct cache_def *, const char *, int);
int check_leading_path(const char *name, int len);
int has_dirs_only_path(const char *name, int len, int prefix_len);
+void invalidate_lstat_cache(void);
void schedule_dir_for_removal(const char *name, int len);
void remove_scheduled_dirs(void);
@@ -1927,7 +1876,6 @@
void stat_validity_update(struct stat_validity *sv, int fd);
int versioncmp(const char *s1, const char *s2);
-void sleep_millisec(int millisec);
/*
* Create a directory and (if share is nonzero) adjust its permissions
diff --git a/checkout.c b/checkout.c
index c72e9f9..6586e30 100644
--- a/checkout.c
+++ b/checkout.c
@@ -47,7 +47,7 @@
{
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 @@
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/chunk-format.c b/chunk-format.c
new file mode 100644
index 0000000..da191e5
--- /dev/null
+++ b/chunk-format.c
@@ -0,0 +1,179 @@
+#include "cache.h"
+#include "chunk-format.h"
+#include "csum-file.h"
+
+/*
+ * When writing a chunk-based file format, collect the chunks in
+ * an array of chunk_info structs. The size stores the _expected_
+ * amount of data that will be written by write_fn.
+ */
+struct chunk_info {
+ uint32_t id;
+ uint64_t size;
+ chunk_write_fn write_fn;
+
+ const void *start;
+};
+
+struct chunkfile {
+ struct hashfile *f;
+
+ struct chunk_info *chunks;
+ size_t chunks_nr;
+ size_t chunks_alloc;
+};
+
+struct chunkfile *init_chunkfile(struct hashfile *f)
+{
+ struct chunkfile *cf = xcalloc(1, sizeof(*cf));
+ cf->f = f;
+ return cf;
+}
+
+void free_chunkfile(struct chunkfile *cf)
+{
+ if (!cf)
+ return;
+ free(cf->chunks);
+ free(cf);
+}
+
+int get_num_chunks(struct chunkfile *cf)
+{
+ return cf->chunks_nr;
+}
+
+void add_chunk(struct chunkfile *cf,
+ uint32_t id,
+ size_t size,
+ chunk_write_fn fn)
+{
+ ALLOC_GROW(cf->chunks, cf->chunks_nr + 1, cf->chunks_alloc);
+
+ cf->chunks[cf->chunks_nr].id = id;
+ cf->chunks[cf->chunks_nr].write_fn = fn;
+ cf->chunks[cf->chunks_nr].size = size;
+ cf->chunks_nr++;
+}
+
+int write_chunkfile(struct chunkfile *cf, void *data)
+{
+ int i;
+ uint64_t cur_offset = hashfile_total(cf->f);
+
+ /* Add the table of contents to the current offset */
+ cur_offset += (cf->chunks_nr + 1) * CHUNK_TOC_ENTRY_SIZE;
+
+ for (i = 0; i < cf->chunks_nr; i++) {
+ hashwrite_be32(cf->f, cf->chunks[i].id);
+ hashwrite_be64(cf->f, cur_offset);
+
+ cur_offset += cf->chunks[i].size;
+ }
+
+ /* Trailing entry marks the end of the chunks */
+ hashwrite_be32(cf->f, 0);
+ hashwrite_be64(cf->f, cur_offset);
+
+ for (i = 0; i < cf->chunks_nr; i++) {
+ off_t start_offset = hashfile_total(cf->f);
+ int result = cf->chunks[i].write_fn(cf->f, data);
+
+ if (result)
+ return result;
+
+ if (hashfile_total(cf->f) - start_offset != cf->chunks[i].size)
+ BUG("expected to write %"PRId64" bytes to chunk %"PRIx32", but wrote %"PRId64" instead",
+ cf->chunks[i].size, cf->chunks[i].id,
+ hashfile_total(cf->f) - start_offset);
+ }
+
+ return 0;
+}
+
+int read_table_of_contents(struct chunkfile *cf,
+ const unsigned char *mfile,
+ size_t mfile_size,
+ uint64_t toc_offset,
+ int toc_length)
+{
+ int i;
+ uint32_t chunk_id;
+ const unsigned char *table_of_contents = mfile + toc_offset;
+
+ ALLOC_GROW(cf->chunks, toc_length, cf->chunks_alloc);
+
+ while (toc_length--) {
+ uint64_t chunk_offset, next_chunk_offset;
+
+ chunk_id = get_be32(table_of_contents);
+ chunk_offset = get_be64(table_of_contents + 4);
+
+ if (!chunk_id) {
+ error(_("terminating chunk id appears earlier than expected"));
+ return 1;
+ }
+
+ table_of_contents += CHUNK_TOC_ENTRY_SIZE;
+ next_chunk_offset = get_be64(table_of_contents + 4);
+
+ if (next_chunk_offset < chunk_offset ||
+ next_chunk_offset > mfile_size - the_hash_algo->rawsz) {
+ error(_("improper chunk offset(s) %"PRIx64" and %"PRIx64""),
+ chunk_offset, next_chunk_offset);
+ return -1;
+ }
+
+ for (i = 0; i < cf->chunks_nr; i++) {
+ if (cf->chunks[i].id == chunk_id) {
+ error(_("duplicate chunk ID %"PRIx32" found"),
+ chunk_id);
+ return -1;
+ }
+ }
+
+ cf->chunks[cf->chunks_nr].id = chunk_id;
+ cf->chunks[cf->chunks_nr].start = mfile + chunk_offset;
+ cf->chunks[cf->chunks_nr].size = next_chunk_offset - chunk_offset;
+ cf->chunks_nr++;
+ }
+
+ chunk_id = get_be32(table_of_contents);
+ if (chunk_id) {
+ error(_("final chunk has non-zero id %"PRIx32""), chunk_id);
+ return -1;
+ }
+
+ return 0;
+}
+
+static int pair_chunk_fn(const unsigned char *chunk_start,
+ size_t chunk_size,
+ void *data)
+{
+ const unsigned char **p = data;
+ *p = chunk_start;
+ return 0;
+}
+
+int pair_chunk(struct chunkfile *cf,
+ uint32_t chunk_id,
+ const unsigned char **p)
+{
+ return read_chunk(cf, chunk_id, pair_chunk_fn, p);
+}
+
+int read_chunk(struct chunkfile *cf,
+ uint32_t chunk_id,
+ chunk_read_fn fn,
+ void *data)
+{
+ int i;
+
+ for (i = 0; i < cf->chunks_nr; i++) {
+ if (cf->chunks[i].id == chunk_id)
+ return fn(cf->chunks[i].start, cf->chunks[i].size, data);
+ }
+
+ return CHUNK_NOT_FOUND;
+}
diff --git a/chunk-format.h b/chunk-format.h
new file mode 100644
index 0000000..9ccbe00
--- /dev/null
+++ b/chunk-format.h
@@ -0,0 +1,68 @@
+#ifndef CHUNK_FORMAT_H
+#define CHUNK_FORMAT_H
+
+#include "git-compat-util.h"
+
+struct hashfile;
+struct chunkfile;
+
+#define CHUNK_TOC_ENTRY_SIZE (sizeof(uint32_t) + sizeof(uint64_t))
+
+/*
+ * Initialize a 'struct chunkfile' for writing _or_ reading a file
+ * with the chunk format.
+ *
+ * If writing a file, supply a non-NULL 'struct hashfile *' that will
+ * be used to write.
+ *
+ * If reading a file, use a NULL 'struct hashfile *' and then call
+ * read_table_of_contents(). Supply the memory-mapped data to the
+ * pair_chunk() or read_chunk() methods, as appropriate.
+ *
+ * DO NOT MIX THESE MODES. Use different 'struct chunkfile' instances
+ * for reading and writing.
+ */
+struct chunkfile *init_chunkfile(struct hashfile *f);
+void free_chunkfile(struct chunkfile *cf);
+int get_num_chunks(struct chunkfile *cf);
+typedef int (*chunk_write_fn)(struct hashfile *f, void *data);
+void add_chunk(struct chunkfile *cf,
+ uint32_t id,
+ size_t size,
+ chunk_write_fn fn);
+int write_chunkfile(struct chunkfile *cf, void *data);
+
+int read_table_of_contents(struct chunkfile *cf,
+ const unsigned char *mfile,
+ size_t mfile_size,
+ uint64_t toc_offset,
+ int toc_length);
+
+#define CHUNK_NOT_FOUND (-2)
+
+/*
+ * Find 'chunk_id' in the given chunkfile and assign the
+ * given pointer to the position in the mmap'd file where
+ * that chunk begins.
+ *
+ * Returns CHUNK_NOT_FOUND if the chunk does not exist.
+ */
+int pair_chunk(struct chunkfile *cf,
+ uint32_t chunk_id,
+ const unsigned char **p);
+
+typedef int (*chunk_read_fn)(const unsigned char *chunk_start,
+ size_t chunk_size, void *data);
+/*
+ * Find 'chunk_id' in the given chunkfile and call the
+ * given chunk_read_fn method with the information for
+ * that chunk.
+ *
+ * Returns CHUNK_NOT_FOUND if the chunk does not exist.
+ */
+int read_chunk(struct chunkfile *cf,
+ uint32_t chunk_id,
+ chunk_read_fn fn,
+ void *data);
+
+#endif
diff --git a/ci/config/allow-ref.sample b/ci/config/allow-ref.sample
new file mode 100755
index 0000000..af0e076
--- /dev/null
+++ b/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/ci/install-dependencies.sh b/ci/install-dependencies.sh
index 497fd32..67852d0 100755
--- a/ci/install-dependencies.sh
+++ b/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,13 +44,13 @@
test -z "$BREW_INSTALL_PACKAGES" ||
brew install $BREW_INSTALL_PACKAGES
brew link --force gettext
- brew cask install --no-quarantine perforce || {
+ brew install --cask --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
+ git -C "$cask_repo" pull --no-stat --ff-only &&
+ brew install --cask --no-quarantine perforce
} ||
- brew install caskroom/cask/perforce
+ brew install homebrew/cask/perforce
case "$jobname" in
osx-gcc)
brew install gcc@9
@@ -59,14 +63,18 @@
StaticAnalysis)
sudo apt-get -q update
sudo apt-get -q -y install coccinelle libcurl4-openssl-dev libssl-dev \
- libexpat-dev gettext
+ libexpat-dev gettext make
;;
Documentation)
sudo apt-get -q update
- sudo apt-get -q -y install asciidoc xmlto docbook-xsl-ns
+ sudo apt-get -q -y install asciidoc xmlto 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-default|linux-gcc-4.8)
+ sudo apt-get -q update
+ sudo apt-get -q -y install $UBUNTU_COMMON_PKGS
;;
esac
diff --git a/ci/install-docker-dependencies.sh b/ci/install-docker-dependencies.sh
new file mode 100755
index 0000000..26a6689
--- /dev/null
+++ b/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/ci/lib.sh b/ci/lib.sh
index a90d0dc..d848c03 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -34,7 +34,7 @@
# successfully before (e.g. because the branch got rebased, changing only
# the commit messages).
skip_good_tree () {
- if test "$TRAVIS_DEBUG_MODE" = true
+ if test "$TRAVIS_DEBUG_MODE" = true || test true = "$GITHUB_ACTIONS"
then
return
fi
@@ -79,6 +79,9 @@
}
}
+# 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=
@@ -136,8 +139,28 @@
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
@@ -145,6 +168,7 @@
mkdir -p "$cache_dir"
+test -n "${DONT_SKIP_TAGS-}" ||
skip_branch_tip_with_tag
skip_good_tree
@@ -156,12 +180,16 @@
export DEVELOPER=1
export DEFAULT_TEST_TARGET=prove
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=true
@@ -182,6 +210,9 @@
if [ "$jobname" = osx-gcc ]
then
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
@@ -189,8 +220,15 @@
# Travis CI OS X
export GIT_SKIP_TESTS="t9810 t9816"
;;
-GIT_TEST_GETTEXT_POISON)
- export GIT_TEST_GETTEXT_POISON=true
+linux-gcc-default)
+ ;;
+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
diff --git a/ci/print-test-failures.sh b/ci/print-test-failures.sh
index e688a26..c70d6cd 100755
--- a/ci/print-test-failures.sh
+++ b/ci/print-test-failures.sh
@@ -46,6 +46,13 @@
mv "$trash_dir" failed-test-artifacts
continue
;;
+ github-actions)
+ mkdir -p failed-test-artifacts
+ echo "FAILED_TEST_ARTIFACTS=t/failed-test-artifacts" >>$GITHUB_ENV
+ 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/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
index 4df54c4..a66b5e8 100755
--- a/ci/run-build-and-tests.sh
+++ b/ci/run-build-and-tests.sh
@@ -13,14 +13,24 @@
make
case "$jobname" in
linux-gcc)
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
make test
export GIT_TEST_SPLIT_INDEX=yes
export GIT_TEST_FULL_IN_PACK_ARRAY=true
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
+ export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+ export GIT_TEST_WRITE_REV_INDEX=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/ci/run-linux32-build.sh b/ci/run-docker-build.sh
similarity index 63%
rename from ci/run-linux32-build.sh
rename to ci/run-docker-build.sh
index e3a193a..8d47a5f 100755
--- a/ci/run-linux32-build.sh
+++ b/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 @@
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/ci/run-docker.sh b/ci/run-docker.sh
new file mode 100755
index 0000000..37fa372
--- /dev/null
+++ b/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/ci/run-linux32-docker.sh b/ci/run-linux32-docker.sh
deleted file mode 100755
index 751acfc..0000000
--- a/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/column.c b/column.c
index 4a38eed..1261e18 100644
--- a/column.c
+++ b/column.c
@@ -107,7 +107,7 @@
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)
{
@@ -358,7 +358,7 @@
int run_column_filter(int colopts, const struct column_options *opts)
{
- struct argv_array *argv;
+ struct strvec *argv;
if (fd_out != -1)
return -1;
@@ -366,14 +366,14 @@
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/combine-diff.c b/combine-diff.c
index d5c4d83..06635f9 100644
--- a/combine-diff.c
+++ b/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,
@@ -214,11 +214,11 @@
* - Else if we have NEW, insert newend lline into base and
* consume newend
*/
- lcs = xcalloc(st_add(origbaselen, 1), sizeof(int*));
- directions = xcalloc(st_add(origbaselen, 1), sizeof(enum coalesce_direction*));
+ CALLOC_ARRAY(lcs, st_add(origbaselen, 1));
+ CALLOC_ARRAY(directions, st_add(origbaselen, 1));
for (i = 0; i < origbaselen + 1; i++) {
- lcs[i] = xcalloc(st_add(lennew, 1), sizeof(int));
- directions[i] = xcalloc(st_add(lennew, 1), sizeof(enum coalesce_direction));
+ CALLOC_ARRAY(lcs[i], st_add(lennew, 1));
+ CALLOC_ARRAY(directions[i], st_add(lennew, 1));
directions[i][0] = BASE;
}
for (j = 1; j < lennew + 1; j++)
@@ -398,8 +398,8 @@
state->lost_bucket = &state->sline[state->nb-1];
}
if (!state->sline[state->nb-1].p_lno)
- state->sline[state->nb-1].p_lno =
- xcalloc(state->num_parent, sizeof(unsigned long));
+ CALLOC_ARRAY(state->sline[state->nb - 1].p_lno,
+ state->num_parent);
state->sline[state->nb-1].p_lno[state->n] = state->ob;
}
@@ -923,7 +923,6 @@
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,
@@ -939,6 +938,7 @@
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_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 @@
}
}
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);
@@ -1159,7 +1159,7 @@
if (result_size && result[result_size-1] != '\n')
cnt++; /* incomplete line */
- sline = xcalloc(st_add(cnt, 2), sizeof(*sline));
+ CALLOC_ARRAY(sline, st_add(cnt, 2));
sline[0].bol = result;
for (lno = 0, cp = result; cp < result + result_size; cp++) {
if (*cp == '\n') {
@@ -1178,7 +1178,7 @@
/* Even p_lno[cnt+1] is valid -- that is for the end line number
* for deletion hunk at the end.
*/
- sline[0].p_lno = xcalloc(st_mult(st_add(cnt, 2), num_parent), sizeof(unsigned long));
+ CALLOC_ARRAY(sline[0].p_lno, st_mult(st_add(cnt, 2), num_parent));
for (lno = 0; lno <= cnt; lno++)
sline[lno+1].p_lno = sline[lno].p_lno + num_parent;
@@ -1200,10 +1200,10 @@
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 @@
*/
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 @@
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)
@@ -1320,7 +1319,7 @@
struct diff_filespec *pool;
pair = xmalloc(sizeof(*pair));
- pool = xcalloc(st_add(num_parent, 1), sizeof(struct diff_filespec));
+ CALLOC_ARRAY(pool, st_add(num_parent, 1));
pair->one = pool + 1;
pair->two = pool;
@@ -1349,7 +1348,7 @@
struct diff_queue_struct q;
int i;
- q.queue = xcalloc(num_paths, sizeof(struct diff_filepair *));
+ CALLOC_ARRAY(q.queue, num_paths);
q.alloc = num_paths;
q.nr = num_paths;
for (i = 0, p = paths; p; p = p->next)
@@ -1451,10 +1450,45 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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/command-list.txt b/command-list.txt
index 2087894..a289f09 100644
--- a/command-list.txt
+++ b/command-list.txt
@@ -54,6 +54,7 @@
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
@@ -93,6 +94,7 @@
git-filter-branch ancillarymanipulators
git-fmt-merge-msg purehelpers
git-for-each-ref plumbinginterrogators
+git-for-each-repo plumbinginterrogators
git-format-patch mainporcelain
git-fsck ancillaryinterrogators complete
git-gc mainporcelain
@@ -116,6 +118,7 @@
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
@@ -133,9 +136,8 @@
git-pack-objects plumbingmanipulators
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
@@ -194,14 +196,18 @@
gitattributes guide
gitcli guide
gitcore-tutorial guide
+gitcredentials guide
gitcvs-migration guide
gitdiffcore guide
giteveryday guide
+gitfaq guide
gitglossary guide
githooks guide
gitignore guide
+gitmailmap guide
gitmodules guide
gitnamespaces guide
+gitremote-helpers guide
gitrepository-layout guide
gitrevisions guide
gitsubmodules guide
diff --git a/commit-graph.c b/commit-graph.c
index f013a84..e21eeea 100644
--- a/commit-graph.c
+++ b/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"
@@ -9,19 +7,43 @@
#include "object.h"
#include "refs.h"
#include "revision.h"
-#include "sha1-lookup.h"
+#include "hash-lookup.h"
#include "commit-graph.h"
#include "object-store.h"
#include "alloc.h"
#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"
+#include "chunk-format.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_GENERATION_DATA 0x47444154 /* "GDAT" */
+#define GRAPH_CHUNKID_GENERATION_DATA_OVERFLOW 0x47444f56 /* "GDOV" */
#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 GRAPH_DATA_WIDTH (the_hash_algo->rawsz + 16)
@@ -37,16 +59,119 @@
#define GRAPH_HEADER_SIZE 8
#define GRAPH_FANOUT_SIZE (4 * 256)
-#define GRAPH_CHUNKLOOKUP_WIDTH 12
-#define GRAPH_MIN_SIZE (GRAPH_HEADER_SIZE + 4 * GRAPH_CHUNKLOOKUP_WIDTH \
+#define GRAPH_MIN_SIZE (GRAPH_HEADER_SIZE + 4 * CHUNK_TOC_ENTRY_SIZE \
+ GRAPH_FANOUT_SIZE + the_hash_algo->rawsz)
+#define CORRECTED_COMMIT_DATE_OFFSET_OVERFLOW (1ULL << 31)
+
/* Remember to update object flag allocation in object.h */
#define REACHABLE (1u<<15)
-char *get_commit_graph_filename(struct object_directory *odb)
+define_commit_slab(topo_level_slab, uint32_t);
+
+/* 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)
{
- return xstrfmt("%s/info/commit-graph", odb->path);
+ 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)
+{
+ 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);
+}
+
+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;
+}
+
+timestamp_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;
+}
+
+/*
+ * Should be used only while writing commit-graph as it compares
+ * generation value of commits by directly accessing commit-slab.
+ */
+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;
+
+ const timestamp_t generation_a = commit_graph_data_at(a)->generation;
+ const timestamp_t generation_b = commit_graph_data_at(b)->generation;
+ /* 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,
@@ -56,20 +181,26 @@
oid_hex);
}
-static char *get_chain_filename(struct object_directory *odb)
+char *get_commit_graph_chain_filename(struct object_directory *odb)
{
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;
}
@@ -88,7 +219,8 @@
}
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;
@@ -108,7 +240,8 @@
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;
@@ -123,14 +256,13 @@
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)
ret->odb = odb;
- else {
+ else
munmap(graph_map, graph_size);
- close(fd);
- }
return ret;
}
@@ -165,16 +297,43 @@
return 0;
}
-struct commit_graph *parse_commit_graph(void *graph_map, int fd,
- size_t graph_size)
+static int graph_read_oid_lookup(const unsigned char *chunk_start,
+ size_t chunk_size, void *data)
{
- const unsigned char *data, *chunk_lookup;
- uint32_t i;
+ struct commit_graph *g = data;
+ g->chunk_oid_lookup = chunk_start;
+ g->num_commits = chunk_size / g->hash_len;
+ return 0;
+}
+
+static int graph_read_bloom_data(const unsigned char *chunk_start,
+ size_t chunk_size, void *data)
+{
+ struct commit_graph *g = data;
+ uint32_t hash_version;
+ g->chunk_bloom_data = chunk_start;
+ hash_version = get_be32(chunk_start);
+
+ if (hash_version != 1)
+ return 0;
+
+ g->bloom_filter_settings = xmalloc(sizeof(struct bloom_filter_settings));
+ g->bloom_filter_settings->hash_version = hash_version;
+ g->bloom_filter_settings->num_hashes = get_be32(chunk_start + 4);
+ g->bloom_filter_settings->bits_per_entry = get_be32(chunk_start + 8);
+ g->bloom_filter_settings->max_changed_paths = DEFAULT_BLOOM_MAX_CHANGES;
+
+ return 0;
+}
+
+struct commit_graph *parse_commit_graph(struct repository *r,
+ void *graph_map, size_t graph_size)
+{
+ const unsigned char *data;
struct commit_graph *graph;
- uint64_t last_chunk_offset;
- uint32_t last_chunk_id;
uint32_t graph_signature;
unsigned char graph_version, hash_version;
+ struct chunkfile *cf = NULL;
if (!graph_map)
return NULL;
@@ -205,104 +364,74 @@
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;
- chunk_lookup = data + 8;
- for (i = 0; i < graph->num_chunks; i++) {
- uint32_t chunk_id;
- uint64_t 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;
-
- 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;
- }
-
- switch (chunk_id) {
- case GRAPH_CHUNKID_OIDFANOUT:
- if (graph->chunk_oid_fanout)
- chunk_repeated = 1;
- else
- graph->chunk_oid_fanout = (uint32_t*)(data + chunk_offset);
- break;
-
- case GRAPH_CHUNKID_OIDLOOKUP:
- if (graph->chunk_oid_lookup)
- chunk_repeated = 1;
- else
- graph->chunk_oid_lookup = data + chunk_offset;
- break;
-
- case GRAPH_CHUNKID_DATA:
- if (graph->chunk_commit_data)
- chunk_repeated = 1;
- else
- graph->chunk_commit_data = data + chunk_offset;
- break;
-
- case GRAPH_CHUNKID_EXTRAEDGES:
- if (graph->chunk_extra_edges)
- chunk_repeated = 1;
- else
- graph->chunk_extra_edges = data + chunk_offset;
- break;
-
- case GRAPH_CHUNKID_BASE:
- if (graph->chunk_base_graphs)
- chunk_repeated = 1;
- else
- graph->chunk_base_graphs = data + chunk_offset;
- }
-
- 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;
- }
-
- last_chunk_id = chunk_id;
- last_chunk_offset = chunk_offset;
- }
-
- hashcpy(graph->oid.hash, graph->data + graph->data_len - graph->hash_len);
-
- if (verify_commit_graph_lite(graph)) {
+ if (graph_size < GRAPH_HEADER_SIZE +
+ (graph->num_chunks + 1) * CHUNK_TOC_ENTRY_SIZE +
+ 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;
}
+ cf = init_chunkfile(NULL);
+
+ if (read_table_of_contents(cf, graph->data, graph_size,
+ GRAPH_HEADER_SIZE, graph->num_chunks))
+ goto free_and_return;
+
+ pair_chunk(cf, GRAPH_CHUNKID_OIDFANOUT,
+ (const unsigned char **)&graph->chunk_oid_fanout);
+ read_chunk(cf, GRAPH_CHUNKID_OIDLOOKUP, graph_read_oid_lookup, graph);
+ pair_chunk(cf, GRAPH_CHUNKID_DATA, &graph->chunk_commit_data);
+ pair_chunk(cf, GRAPH_CHUNKID_EXTRAEDGES, &graph->chunk_extra_edges);
+ pair_chunk(cf, GRAPH_CHUNKID_BASE, &graph->chunk_base_graphs);
+ pair_chunk(cf, GRAPH_CHUNKID_GENERATION_DATA,
+ &graph->chunk_generation_data);
+ pair_chunk(cf, GRAPH_CHUNKID_GENERATION_DATA_OVERFLOW,
+ &graph->chunk_generation_data_overflow);
+
+ if (r->settings.commit_graph_read_changed_paths) {
+ pair_chunk(cf, GRAPH_CHUNKID_BLOOMINDEXES,
+ &graph->chunk_bloom_indexes);
+ read_chunk(cf, GRAPH_CHUNKID_BLOOMDATA,
+ graph_read_bloom_data, graph);
+ }
+
+ 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))
+ goto free_and_return;
+
+ free_chunkfile(cf);
return graph;
+
+free_and_return:
+ free_chunkfile(cf);
+ 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)
{
@@ -314,7 +443,7 @@
if (!open_ok)
return NULL;
- g = load_commit_graph_one_fd_st(fd, &st, odb);
+ g = load_commit_graph_one_fd_st(r, fd, &st, odb);
if (g)
g->filename = xstrdup(graph_file);
@@ -326,7 +455,7 @@
struct object_directory *odb)
{
char *graph_name = get_commit_graph_filename(odb);
- struct commit_graph *g = load_commit_graph_one(graph_name, odb);
+ struct commit_graph *g = load_commit_graph_one(r, graph_name, odb);
free(graph_name);
return g;
@@ -373,7 +502,7 @@
struct stat st;
struct object_id *oids;
int i = 0, valid = 1, count;
- char *chain_name = get_chain_filename(odb);
+ char *chain_name = get_commit_graph_chain_filename(odb);
FILE *fp;
int stat_res;
@@ -387,7 +516,7 @@
return NULL;
count = st.st_size / (the_hash_algo->hexsz + 1);
- oids = xcalloc(count, sizeof(struct object_id));
+ CALLOC_ARRAY(oids, count);
prepare_alt_odb(r);
@@ -407,7 +536,7 @@
valid = 0;
for (odb = r->objects->odb; odb; odb = odb->next) {
char *graph_name = get_split_graph_filename(odb, line.buf);
- struct commit_graph *g = load_commit_graph_one(graph_name, odb);
+ struct commit_graph *g = load_commit_graph_one(r, graph_name, odb);
free(graph_name);
@@ -434,6 +563,31 @@
return graph_chain;
}
+/*
+ * returns 1 if and only if all graphs in the chain have
+ * corrected commit dates stored in the generation_data chunk.
+ */
+static int validate_mixed_generation_chain(struct commit_graph *g)
+{
+ int read_generation_data = 1;
+ struct commit_graph *p = g;
+
+ while (read_generation_data && p) {
+ read_generation_data = p->read_generation_data;
+ p = p->base_graph;
+ }
+
+ if (read_generation_data)
+ return 1;
+
+ while (g) {
+ g->read_generation_data = 0;
+ g = g->base_graph;
+ }
+
+ return 0;
+}
+
struct commit_graph *read_commit_graph_one(struct repository *r,
struct object_directory *odb)
{
@@ -442,6 +596,8 @@
if (!g)
g = load_commit_graph_chain(r, odb);
+ validate_mixed_generation_chain(g);
+
return g;
}
@@ -476,10 +632,6 @@
return !!r->objects->commit_graph;
r->objects->commit_graph_attempted = 1;
- if (git_env_bool(GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD, 0))
- die("dying as requested by the '%s' variable on commit-graph load!",
- GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD);
-
prepare_repo_settings(r);
if (!git_env_bool(GIT_TEST_COMMIT_GRAPH, 0) &&
@@ -521,6 +673,31 @@
return !!first_generation;
}
+int corrected_commit_dates_enabled(struct repository *r)
+{
+ struct commit_graph *g;
+ if (!prepare_commit_graph(r))
+ return 0;
+
+ g = r->objects->commit_graph;
+
+ if (!g->num_commits)
+ return 0;
+
+ return g->read_generation_data;
+}
+
+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)
@@ -577,22 +754,49 @@
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;
- uint32_t lex_index;
+ struct commit_graph_data *graph_data;
+ uint32_t lex_index, offset_pos;
+ uint64_t date_high, date_low, offset;
while (pos < g->num_commits_in_base)
g = g->base_graph;
+ if (pos >= g->num_commits + g->num_commits_in_base)
+ die(_("invalid commit position. commit-graph is likely corrupt"));
+
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;
+
+ date_high = get_be32(commit_data + g->hash_len + 8) & 0x3;
+ date_low = get_be32(commit_data + g->hash_len + 12);
+ item->date = (timestamp_t)((date_high << 32) | date_low);
+
+ if (g->read_generation_data) {
+ offset = (timestamp_t)get_be32(g->chunk_generation_data + sizeof(uint32_t) * lex_index);
+
+ if (offset & CORRECTED_COMMIT_DATE_OFFSET_OVERFLOW) {
+ if (!g->chunk_generation_data_overflow)
+ die(_("commit-graph requires overflow generation data but has none"));
+
+ offset_pos = offset ^ CORRECTED_COMMIT_DATE_OFFSET_OVERFLOW;
+ graph_data->generation = get_be64(g->chunk_generation_data_overflow + 8 * offset_pos);
+ } else
+ graph_data->generation = item->date + offset;
+ } else
+ graph_data->generation = get_be32(commit_data + g->hash_len + 8) >> 2;
+
+ if (g->topo_levels)
+ *topo_level_slab_at(g->topo_levels, item) = get_be32(commit_data + g->hash_len + 8) >> 2;
}
static inline void set_commit_tree(struct commit *c, struct tree *t)
@@ -606,7 +810,6 @@
{
uint32_t edge_value;
uint32_t *parent_data_ptr;
- uint64_t date_low, date_high;
struct commit_list **pptr;
const unsigned char *commit_data;
uint32_t lex_index;
@@ -614,28 +817,15 @@
while (pos < g->num_commits_in_base)
g = g->base_graph;
- if (pos >= g->num_commits + g->num_commits_in_base)
- die(_("invalid commit position. commit-graph is likely corrupt"));
+ fill_commit_graph_info(item, g, pos);
- /*
- * Store the "full" position, but then use the
- * "local" position for the rest of the calculation.
- */
- item->graph_pos = pos;
lex_index = pos - g->num_commits_in_base;
-
commit_data = g->chunk_commit_data + (g->hash_len + 16) * lex_index;
item->object.parsed = 1;
set_commit_tree(item, NULL);
- date_high = get_be32(commit_data + g->hash_len + 8) & 0x3;
- 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;
-
pptr = &item->parents;
edge_value = get_be32(commit_data + g->hash_len);
@@ -666,8 +856,9 @@
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;
@@ -702,6 +893,14 @@
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);
@@ -722,12 +921,13 @@
{
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));
@@ -741,7 +941,7 @@
{
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);
@@ -754,23 +954,18 @@
struct packed_commit_list {
struct commit **list;
- int nr;
- int alloc;
-};
-
-struct packed_oid_list {
- struct object_id *list;
- int nr;
- int alloc;
+ size_t nr;
+ size_t alloc;
};
struct write_commit_graph_context {
struct repository *r;
struct object_directory *odb;
char *graph_name;
- struct packed_oid_list oids;
+ struct oid_array oids;
struct packed_commit_list commits;
int num_extra_edges;
+ int num_generation_data_overflows;
unsigned long approx_nr_objects;
struct progress *progress;
int progress_done;
@@ -788,14 +983,26 @@
unsigned append:1,
report_progress:1,
split:1,
- check_oids:1;
+ changed_paths:1,
+ order_by_pack:1,
+ write_generation_data:1,
+ trust_generation_numbers:1;
- const struct split_commit_graph_opts *split_opts;
+ struct topo_level_slab *topo_levels;
+ 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,
+ void *data)
{
+ struct write_commit_graph_context *ctx = data;
int i, count = 0;
struct commit **list = ctx->commits.list;
@@ -815,28 +1022,34 @@
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,
+ void *data)
{
+ struct write_commit_graph_context *ctx = data;
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)
+static const struct object_id *commit_to_oid(size_t index, const void *table)
{
- struct commit **commits = table;
- return commits[index]->object.oid.hash;
+ const struct commit * const *commits = table;
+ return &commits[index]->object.oid;
}
-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,
+ void *data)
{
+ struct write_commit_graph_context *ctx = data;
struct commit **list = ctx->commits.list;
struct commit **last = ctx->commits.list + ctx->commits.nr;
uint32_t num_extra_edges = 0;
@@ -848,25 +1061,25 @@
uint32_t packedDate[2];
display_progress(ctx->progress, ++ctx->progress_cnt);
- if (parse_commit_no_graph(*list))
+ if (repo_parse_commit_no_graph(ctx->r, *list))
die(_("unable to parse commit %s"),
oid_to_hex(&(*list)->object.oid));
tree = get_commit_tree_oid(*list);
- hashwrite(f, tree->hash, hash_len);
+ hashwrite(f, tree->hash, the_hash_algo->rawsz);
parent = (*list)->parents;
if (!parent)
edge_value = GRAPH_PARENT_NONE;
else {
- edge_value = sha1_pos(parent->item->object.oid.hash,
- ctx->commits.list,
- ctx->commits.nr,
- commit_to_sha1);
+ edge_value = oid_pos(&parent->item->object.oid,
+ ctx->commits.list,
+ ctx->commits.nr,
+ commit_to_oid);
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,
@@ -890,14 +1103,14 @@
else if (parent->next)
edge_value = GRAPH_EXTRA_EDGES_NEEDED | num_extra_edges;
else {
- edge_value = sha1_pos(parent->item->object.oid.hash,
- ctx->commits.list,
- ctx->commits.nr,
- commit_to_sha1);
+ edge_value = oid_pos(&parent->item->object.oid,
+ ctx->commits.list,
+ ctx->commits.nr,
+ commit_to_oid);
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,
@@ -925,18 +1138,64 @@
else
packedDate[0] = 0;
- packedDate[0] |= htonl((*list)->generation << 2);
+ packedDate[0] |= htonl(*topo_level_slab_at(ctx->topo_levels, *list) << 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_generation_data(struct hashfile *f,
+ void *data)
{
+ struct write_commit_graph_context *ctx = data;
+ int i, num_generation_data_overflows = 0;
+
+ for (i = 0; i < ctx->commits.nr; i++) {
+ struct commit *c = ctx->commits.list[i];
+ timestamp_t offset;
+ repo_parse_commit(ctx->r, c);
+ offset = commit_graph_data_at(c)->generation - c->date;
+ display_progress(ctx->progress, ++ctx->progress_cnt);
+
+ if (offset > GENERATION_NUMBER_V2_OFFSET_MAX) {
+ offset = CORRECTED_COMMIT_DATE_OFFSET_OVERFLOW | num_generation_data_overflows;
+ num_generation_data_overflows++;
+ }
+
+ hashwrite_be32(f, offset);
+ }
+
+ return 0;
+}
+
+static int write_graph_chunk_generation_data_overflow(struct hashfile *f,
+ void *data)
+{
+ struct write_commit_graph_context *ctx = data;
+ int i;
+ for (i = 0; i < ctx->commits.nr; i++) {
+ struct commit *c = ctx->commits.list[i];
+ timestamp_t offset = commit_graph_data_at(c)->generation - c->date;
+ display_progress(ctx->progress, ++ctx->progress_cnt);
+
+ if (offset > GENERATION_NUMBER_V2_OFFSET_MAX) {
+ hashwrite_be32(f, offset >> 32);
+ hashwrite_be32(f, (uint32_t) offset);
+ }
+ }
+
+ return 0;
+}
+
+static int write_graph_chunk_extra_edges(struct hashfile *f,
+ void *data)
+{
+ struct write_commit_graph_context *ctx = data;
struct commit **list = ctx->commits.list;
struct commit **last = ctx->commits.list + ctx->commits.nr;
struct commit_list *parent;
@@ -957,14 +1216,14 @@
/* Since num_parents > 2, this initializer is safe. */
for (parent = (*list)->parents->next; parent; parent = parent->next) {
- int edge_value = sha1_pos(parent->item->object.oid.hash,
- ctx->commits.list,
- ctx->commits.nr,
- commit_to_sha1);
+ int edge_value = oid_pos(&parent->item->object.oid,
+ ctx->commits.list,
+ ctx->commits.nr,
+ commit_to_oid);
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,
@@ -984,13 +1243,70 @@
list++;
}
+
+ return 0;
}
-static int oid_compare(const void *_a, const void *_b)
+static int write_graph_chunk_bloom_indexes(struct hashfile *f,
+ void *data)
{
- const struct object_id *a = (const struct object_id *)_a;
- const struct object_id *b = (const struct object_id *)_b;
- return oidcmp(a, b);
+ struct write_commit_graph_context *ctx = data;
+ 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,
+ void *data)
+{
+ struct write_commit_graph_context *ctx = data;
+ 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 add_packed_commits(const struct object_id *oid,
@@ -1013,9 +1329,8 @@
if (type != OBJ_COMMIT)
return 0;
- ALLOC_GROW(ctx->oids.list, ctx->oids.nr + 1, ctx->oids.alloc);
- oidcpy(&(ctx->oids.list[ctx->oids.nr]), oid);
- ctx->oids.nr++;
+ oid_array_append(&ctx->oids, oid);
+ set_commit_pos(ctx->r, oid);
return 0;
}
@@ -1025,9 +1340,7 @@
struct commit_list *parent;
for (parent = commit->parents; parent; parent = parent->next) {
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++;
+ oid_array_append(&ctx->oids, &parent->item->object.oid);
parent->item->object.flags |= REACHABLE;
}
}
@@ -1037,6 +1350,8 @@
{
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(
@@ -1044,7 +1359,7 @@
ctx->oids.nr);
for (i = 0; i < ctx->oids.nr; i++) {
display_progress(ctx->progress, i + 1);
- commit = lookup_commit(ctx->r, &ctx->oids.list[i]);
+ commit = lookup_commit(ctx->r, &ctx->oids.oid[i]);
if (commit)
commit->object.flags |= REACHABLE;
}
@@ -1061,15 +1376,16 @@
0);
for (i = 0; i < ctx->oids.nr; i++) {
display_progress(ctx->progress, i + 1);
- commit = lookup_commit(ctx->r, &ctx->oids.list[i]);
+ commit = lookup_commit(ctx->r, &ctx->oids.oid[i]);
if (!commit)
continue;
if (ctx->split) {
- if (!parse_commit(commit) &&
- commit->graph_pos == COMMIT_NOT_FROM_GRAPH)
+ if ((!repo_parse_commit(ctx->r, 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))
+ } else if (!repo_parse_commit_no_graph(ctx->r, commit))
add_missing_parents(ctx, commit);
}
stop_progress(&ctx->progress);
@@ -1080,7 +1396,7 @@
ctx->oids.nr);
for (i = 0; i < ctx->oids.nr; i++) {
display_progress(ctx->progress, i + 1);
- commit = lookup_commit(ctx->r, &ctx->oids.list[i]);
+ commit = lookup_commit(ctx->r, &ctx->oids.oid[i]);
if (commit)
commit->object.flags &= ~REACHABLE;
@@ -1088,6 +1404,59 @@
stop_progress(&ctx->progress);
}
+static void compute_topological_levels(struct write_commit_graph_context *ctx)
+{
+ int i;
+ struct commit_list *list = NULL;
+
+ if (ctx->report_progress)
+ ctx->progress = start_delayed_progress(
+ _("Computing commit graph topological levels"),
+ ctx->commits.nr);
+ for (i = 0; i < ctx->commits.nr; i++) {
+ struct commit *c = ctx->commits.list[i];
+ uint32_t level;
+
+ repo_parse_commit(ctx->r, c);
+ level = *topo_level_slab_at(ctx->topo_levels, c);
+
+ display_progress(ctx->progress, i + 1);
+ if (level != GENERATION_NUMBER_ZERO)
+ continue;
+
+ commit_list_insert(c, &list);
+ while (list) {
+ struct commit *current = list->item;
+ struct commit_list *parent;
+ int all_parents_computed = 1;
+ uint32_t max_level = 0;
+
+ for (parent = current->parents; parent; parent = parent->next) {
+ repo_parse_commit(ctx->r, parent->item);
+ level = *topo_level_slab_at(ctx->topo_levels, parent->item);
+
+ if (level == GENERATION_NUMBER_ZERO) {
+ all_parents_computed = 0;
+ commit_list_insert(parent->item, &list);
+ break;
+ }
+
+ if (level > max_level)
+ max_level = level;
+ }
+
+ if (all_parents_computed) {
+ pop_commit(&list);
+
+ if (max_level > GENERATION_NUMBER_V1_MAX - 1)
+ max_level = GENERATION_NUMBER_V1_MAX - 1;
+ *topo_level_slab_at(ctx->topo_levels, current) = max_level + 1;
+ }
+ }
+ }
+ stop_progress(&ctx->progress);
+}
+
static void compute_generation_numbers(struct write_commit_graph_context *ctx)
{
int i;
@@ -1097,64 +1466,172 @@
ctx->progress = start_delayed_progress(
_("Computing commit graph generation numbers"),
ctx->commits.nr);
+
+ if (!ctx->trust_generation_numbers) {
+ for (i = 0; i < ctx->commits.nr; i++) {
+ struct commit *c = ctx->commits.list[i];
+ repo_parse_commit(ctx->r, c);
+ commit_graph_data_at(c)->generation = GENERATION_NUMBER_ZERO;
+ }
+ }
+
for (i = 0; i < ctx->commits.nr; i++) {
+ struct commit *c = ctx->commits.list[i];
+ timestamp_t corrected_commit_date;
+
+ repo_parse_commit(ctx->r, c);
+ corrected_commit_date = commit_graph_data_at(c)->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 (corrected_commit_date != GENERATION_NUMBER_ZERO)
continue;
- commit_list_insert(ctx->commits.list[i], &list);
+ commit_list_insert(c, &list);
while (list) {
struct commit *current = list->item;
struct commit_list *parent;
int all_parents_computed = 1;
- uint32_t max_generation = 0;
+ timestamp_t max_corrected_commit_date = 0;
for (parent = current->parents; parent; parent = parent->next) {
- if (parent->item->generation == GENERATION_NUMBER_INFINITY ||
- parent->item->generation == GENERATION_NUMBER_ZERO) {
+ repo_parse_commit(ctx->r, parent->item);
+ corrected_commit_date = commit_graph_data_at(parent->item)->generation;
+
+ if (corrected_commit_date == 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;
}
+
+ if (corrected_commit_date > max_corrected_commit_date)
+ max_corrected_commit_date = corrected_commit_date;
}
if (all_parents_computed) {
- current->generation = max_generation + 1;
pop_commit(&list);
- if (current->generation > GENERATION_NUMBER_MAX)
- current->generation = GENERATION_NUMBER_MAX;
+ if (current->date && current->date > max_corrected_commit_date)
+ max_corrected_commit_date = current->date - 1;
+ commit_graph_data_at(current)->generation = max_corrected_commit_date + 1;
+
+ if (commit_graph_data_at(current)->generation - current->date > GENERATION_NUMBER_V2_OFFSET_MAX)
+ ctx->num_generation_data_overflows++;
}
}
}
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)
{
- struct string_list *list = (struct string_list *)cb_data;
+ 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);
+}
- string_list_append(list, oid_to_hex(oid));
+static void compute_bloom_filters(struct write_commit_graph_context *ctx)
+{
+ 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_iterated_oid(oid, &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));
+
return 0;
}
int write_commit_graph_reachable(struct object_directory *odb,
enum commit_graph_write_flags flags,
- const struct split_commit_graph_opts *split_opts)
+ 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(odb, 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;
}
@@ -1203,41 +1680,19 @@
return 0;
}
-static int 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;
+ struct oidset_iter iter;
+ struct object_id *oid;
- 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;
+ if (!oidset_size(commits))
+ return 0;
- display_progress(ctx->progress, i + 1);
- if (!parse_oid_hex(commit_hex->items[i].string, &oid, &end) &&
- (result = lookup_commit_reference_gently(ctx->r, &oid, 1))) {
- ALLOC_GROW(ctx->oids.list, ctx->oids.nr + 1, ctx->oids.alloc);
- oidcpy(&ctx->oids.list[ctx->oids.nr], &(result->object.oid));
- ctx->oids.nr++;
- } else if (ctx->check_oids) {
- error(_("invalid commit object id: %s"),
- commit_hex->items[i].string);
- return -1;
- }
+ oidset_iter_init(commits, &iter);
+ while ((oid = oidset_iter_next(&iter))) {
+ oid_array_append(&ctx->oids, oid);
}
- stop_progress(&ctx->progress);
- strbuf_release(&progress_title);
return 0;
}
@@ -1255,59 +1710,34 @@
stop_progress(&ctx->progress);
}
-static uint32_t count_distinct_commits(struct write_commit_graph_context *ctx)
-{
- uint32_t i, count_distinct = 1;
-
- if (ctx->report_progress)
- ctx->progress = start_delayed_progress(
- _("Counting distinct commits in commit graph"),
- ctx->oids.nr);
- display_progress(ctx->progress, 0); /* TODO: Measure QSORT() progress */
- QSORT(ctx->oids.list, ctx->oids.nr, oid_compare);
-
- for (i = 1; i < ctx->oids.nr; i++) {
- display_progress(ctx->progress, i + 1);
- if (!oideq(&ctx->oids.list[i - 1], &ctx->oids.list[i])) {
- if (ctx->split) {
- struct commit *c = lookup_commit(ctx->r, &ctx->oids.list[i]);
-
- if (!c || c->graph_pos != COMMIT_NOT_FROM_GRAPH)
- continue;
- }
-
- count_distinct++;
- }
- }
- stop_progress(&ctx->progress);
-
- return count_distinct;
-}
-
static void copy_oids_to_commits(struct write_commit_graph_context *ctx)
{
uint32_t i;
+ 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)
ctx->progress = start_delayed_progress(
_("Finding extra edges in commit graph"),
ctx->oids.nr);
- for (i = 0; i < ctx->oids.nr; i++) {
+ oid_array_sort(&ctx->oids);
+ for (i = 0; i < ctx->oids.nr; i = oid_array_next_unique(&ctx->oids, i)) {
unsigned int num_parents;
display_progress(ctx->progress, i + 1);
- if (i > 0 && oideq(&ctx->oids.list[i - 1], &ctx->oids.list[i]))
- continue;
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]);
+ ctx->commits.list[ctx->commits.nr] = lookup_commit(ctx->r, &ctx->oids.oid[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]);
+ if (ctx->split && flags == COMMIT_GRAPH_SPLIT_REPLACE)
+ repo_parse_commit(ctx->r, ctx->commits.list[ctx->commits.nr]);
+ else
+ repo_parse_commit_no_graph(ctx->r, ctx->commits.list[ctx->commits.nr]);
num_parents = commit_list_count(ctx->commits.list[ctx->commits.nr]->parents);
if (num_parents > 2)
@@ -1332,8 +1762,9 @@
}
static int write_graph_chunk_base(struct hashfile *f,
- struct write_commit_graph_context *ctx)
+ void *data)
{
+ struct write_commit_graph_context *ctx = data;
int num = write_graph_chunk_base_1(f, ctx->new_base_graph);
if (num != ctx->num_commit_graphs_after - 1) {
@@ -1350,12 +1781,10 @@
int fd;
struct hashfile *f;
struct lock_file lk = LOCK_INIT;
- uint32_t chunk_ids[6];
- uint64_t chunk_offsets[6];
const unsigned hashsz = the_hash_algo->rawsz;
struct strbuf progress_title = STRBUF_INIT;
- int num_chunks = 3;
struct object_id file_hash;
+ struct chunkfile *cf;
if (ctx->split) {
struct strbuf tmp_file = STRBUF_INIT;
@@ -1376,89 +1805,88 @@
}
if (ctx->split) {
- char *lock_name = get_chain_filename(ctx->odb);
+ 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);
- fd = lk.tempfile->fd;
- f = hashfd(lk.tempfile->fd, lk.tempfile->filename.buf);
+ hold_lock_file_for_update_mode(&lk, ctx->graph_name,
+ LOCK_DIE_ON_ERROR, 0444);
+ fd = get_lock_file_fd(&lk);
+ f = hashfd(fd, get_lock_file_path(&lk));
}
- chunk_ids[0] = GRAPH_CHUNKID_OIDFANOUT;
- chunk_ids[1] = GRAPH_CHUNKID_OIDLOOKUP;
- chunk_ids[2] = GRAPH_CHUNKID_DATA;
- if (ctx->num_extra_edges) {
- chunk_ids[num_chunks] = GRAPH_CHUNKID_EXTRAEDGES;
- num_chunks++;
- }
- if (ctx->num_commit_graphs_after > 1) {
- chunk_ids[num_chunks] = GRAPH_CHUNKID_BASE;
- num_chunks++;
- }
+ cf = init_chunkfile(f);
- chunk_ids[num_chunks] = 0;
+ add_chunk(cf, GRAPH_CHUNKID_OIDFANOUT, GRAPH_FANOUT_SIZE,
+ write_graph_chunk_fanout);
+ add_chunk(cf, GRAPH_CHUNKID_OIDLOOKUP, hashsz * ctx->commits.nr,
+ write_graph_chunk_oids);
+ add_chunk(cf, GRAPH_CHUNKID_DATA, (hashsz + 16) * ctx->commits.nr,
+ write_graph_chunk_data);
- 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;
- num_chunks++;
+ if (git_env_bool(GIT_TEST_COMMIT_GRAPH_NO_GDAT, 0))
+ ctx->write_generation_data = 0;
+ if (ctx->write_generation_data)
+ add_chunk(cf, GRAPH_CHUNKID_GENERATION_DATA,
+ sizeof(uint32_t) * ctx->commits.nr,
+ write_graph_chunk_generation_data);
+ if (ctx->num_generation_data_overflows)
+ add_chunk(cf, GRAPH_CHUNKID_GENERATION_DATA_OVERFLOW,
+ sizeof(timestamp_t) * ctx->num_generation_data_overflows,
+ write_graph_chunk_generation_data_overflow);
+ if (ctx->num_extra_edges)
+ add_chunk(cf, GRAPH_CHUNKID_EXTRAEDGES,
+ 4 * ctx->num_extra_edges,
+ write_graph_chunk_extra_edges);
+ if (ctx->changed_paths) {
+ add_chunk(cf, GRAPH_CHUNKID_BLOOMINDEXES,
+ sizeof(uint32_t) * ctx->commits.nr,
+ write_graph_chunk_bloom_indexes);
+ add_chunk(cf, GRAPH_CHUNKID_BLOOMDATA,
+ sizeof(uint32_t) * 3
+ + ctx->total_bloom_filter_data_size,
+ write_graph_chunk_bloom_data);
}
- if (ctx->num_commit_graphs_after > 1) {
- chunk_offsets[num_chunks + 1] = chunk_offsets[num_chunks] +
- hashsz * (ctx->num_commit_graphs_after - 1);
- num_chunks++;
- }
+ if (ctx->num_commit_graphs_after > 1)
+ add_chunk(cf, GRAPH_CHUNKID_BASE,
+ hashsz * (ctx->num_commit_graphs_after - 1),
+ write_graph_chunk_base);
hashwrite_be32(f, GRAPH_SIGNATURE);
hashwrite_u8(f, GRAPH_VERSION);
hashwrite_u8(f, oid_version());
- hashwrite_u8(f, num_chunks);
+ hashwrite_u8(f, get_num_chunks(cf));
hashwrite_u8(f, ctx->num_commit_graphs_after - 1);
- 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);
- hashwrite(f, chunk_write, 12);
- }
-
if (ctx->report_progress) {
strbuf_addf(&progress_title,
Q_("Writing out commit graph in %d pass",
"Writing out commit graph in %d passes",
- num_chunks),
- num_chunks);
+ get_num_chunks(cf)),
+ get_num_chunks(cf));
ctx->progress = start_delayed_progress(
progress_title.buf,
- num_chunks * ctx->commits.nr);
+ get_num_chunks(cf) * 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;
- }
+
+ write_chunkfile(cf, ctx);
+
stop_progress(&ctx->progress);
strbuf_release(&progress_title);
@@ -1474,6 +1902,7 @@
close_commit_graph(ctx->r->objects);
finalize_hashfile(f, file_hash.hash, CSUM_HASH_IN_STREAM | CSUM_FSYNC);
+ free_chunkfile(cf);
if (ctx->split) {
FILE *chainf = fdopen_lock_file(&lk, "w");
@@ -1488,8 +1917,12 @@
}
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);
@@ -1512,7 +1945,7 @@
result = rename(ctx->graph_name, final_graph_name);
for (i = 0; i < ctx->num_commit_graphs_after; i++)
- fprintf(lk.tempfile->fp, "%s\n", ctx->commit_graph_hash_after[i]);
+ fprintf(get_lock_file_fp(&lk), "%s\n", ctx->commit_graph_hash_after[i]);
if (result) {
error(_("failed to rename temporary commit-graph file"));
@@ -1529,34 +1962,47 @@
{
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;
+ if (ctx->opts) {
+ max_commits = ctx->opts->max_commits;
- if (ctx->split_opts->size_multiple)
- size_mult = ctx->split_opts->size_multiple;
+ if (ctx->opts->size_multiple)
+ size_mult = ctx->opts->size_multiple;
+
+ flags = ctx->opts->split_flags;
}
g = ctx->r->objects->commit_graph;
num_commits = ctx->commits.nr;
- ctx->num_commit_graphs_after = ctx->num_commit_graphs_before + 1;
+ if (flags == COMMIT_GRAPH_SPLIT_REPLACE)
+ ctx->num_commit_graphs_after = 1;
+ else
+ ctx->num_commit_graphs_after = ctx->num_commit_graphs_before + 1;
- while (g && (g->num_commits <= size_mult * num_commits ||
- (max_commits && num_commits > max_commits))) {
- if (g->odb != ctx->odb)
- break;
+ 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->odb);
@@ -1570,8 +2016,8 @@
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++)
@@ -1584,6 +2030,13 @@
if (i < ctx->num_commit_graphs_after)
ctx->commit_graph_hash_after[i] = xstrdup(oid_to_hex(&g->oid));
+ /*
+ * If the topmost remaining layer has generation data chunk, the
+ * resultant layer also has generation data chunk.
+ */
+ if (i == ctx->num_commit_graphs_after - 2)
+ ctx->write_generation_data = !!g->chunk_generation_data;
+
i--;
g = g->base_graph;
}
@@ -1624,7 +2077,7 @@
static void sort_and_scan_merged_commits(struct write_commit_graph_context *ctx)
{
- uint32_t i;
+ uint32_t i, dedup_i = 0;
if (ctx->report_progress)
ctx->progress = start_delayed_progress(
@@ -1639,17 +2092,27 @@
if (i && oideq(&ctx->commits.list[i - 1]->object.oid,
&ctx->commits.list[i]->object.oid)) {
- die(_("unexpected duplicate commit id %s"),
- oid_to_hex(&ctx->commits.list[i]->object.oid));
+ /*
+ * Silently ignore duplicates. These were likely
+ * created due to a commit appearing in multiple
+ * layers of the chain, which is unexpected but
+ * not invalid. We should make sure there is a
+ * unique copy in the new layer.
+ */
} else {
unsigned int num_parents;
+ ctx->commits.list[dedup_i] = ctx->commits.list[i];
+ dedup_i++;
+
num_parents = commit_list_count(ctx->commits.list[i]->parents);
if (num_parents > 2)
ctx->num_extra_edges += num_parents - 1;
}
}
+ ctx->commits.nr = dedup_i;
+
stop_progress(&ctx->progress);
}
@@ -1706,10 +2169,10 @@
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->odb);
+ 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;
@@ -1756,32 +2219,74 @@
int write_commit_graph(struct object_directory *odb,
struct string_list *pack_indexes,
- struct string_list *commit_hex,
+ struct oidset *commits,
enum commit_graph_write_flags flags,
- const struct split_commit_graph_opts *split_opts)
+ const struct commit_graph_opts *opts)
{
struct write_commit_graph_context *ctx;
- uint32_t i, count_distinct = 0;
+ uint32_t i;
int res = 0;
+ int replace = 0;
+ struct bloom_filter_settings bloom_settings = DEFAULT_BLOOM_FILTER_SETTINGS;
+ struct topo_level_slab topo_levels;
+ prepare_repo_settings(the_repository);
+ if (!the_repository->settings.core_commit_graph) {
+ warning(_("attempting to write a commit-graph, but 'core.commitGraph' is disabled"));
+ return 0;
+ }
if (!commit_graph_compatible(the_repository))
return 0;
- ctx = xcalloc(1, sizeof(struct write_commit_graph_context));
+ CALLOC_ARRAY(ctx, 1);
ctx->r = the_repository;
ctx->odb = odb;
ctx->append = flags & COMMIT_GRAPH_WRITE_APPEND ? 1 : 0;
ctx->report_progress = flags & COMMIT_GRAPH_WRITE_PROGRESS ? 1 : 0;
ctx->split = flags & COMMIT_GRAPH_WRITE_SPLIT ? 1 : 0;
- ctx->check_oids = flags & COMMIT_GRAPH_WRITE_CHECK_OIDS ? 1 : 0;
- ctx->split_opts = split_opts;
+ ctx->opts = opts;
+ ctx->total_bloom_filter_data_size = 0;
+ ctx->write_generation_data = 1;
+ ctx->num_generation_data_overflows = 0;
- if (ctx->split) {
+ 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;
+
+ init_topo_level_slab(&topo_levels);
+ ctx->topo_levels = &topo_levels;
+
+ prepare_commit_graph(ctx->r);
+ if (ctx->r->objects->commit_graph) {
+ struct commit_graph *g = ctx->r->objects->commit_graph;
+
+ while (g) {
+ g->topo_levels = &topo_levels;
+ g = g->base_graph;
+ }
+ }
+
+ 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(ctx->r);
g = ctx->r->objects->commit_graph;
+ /* 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 = ctx->r->objects->commit_graph;
+
while (g) {
ctx->num_commit_graphs_before++;
g = g->base_graph;
@@ -1797,57 +2302,39 @@
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->append) {
- prepare_commit_graph_one(ctx->r, ctx->odb);
- if (ctx->r->objects->commit_graph)
- ctx->oids.alloc += ctx->r->objects->commit_graph->num_commits;
- }
-
- if (ctx->oids.alloc < 1024)
- ctx->oids.alloc = 1024;
- ALLOC_ARRAY(ctx->oids.list, ctx->oids.alloc);
if (ctx->append && ctx->r->objects->commit_graph) {
struct commit_graph *g = ctx->r->objects->commit_graph;
for (i = 0; i < g->num_commits; i++) {
- const unsigned char *hash = g->chunk_oid_lookup + g->hash_len * i;
- hashcpy(ctx->oids.list[ctx->oids.nr++].hash, hash);
+ struct object_id oid;
+ hashcpy(oid.hash, g->chunk_oid_lookup + g->hash_len * i);
+ oid_array_append(&ctx->oids, &oid);
}
}
if (pack_indexes) {
+ ctx->order_by_pack = 1;
if ((res = fill_oids_from_packs(ctx, pack_indexes)))
goto cleanup;
}
- if (commit_hex) {
- if ((res = 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);
-
- count_distinct = count_distinct_commits(ctx);
-
- if (count_distinct >= GRAPH_EDGE_LAST_MASK) {
- error(_("the commit graph format cannot write %d commits"), count_distinct);
- res = -1;
- goto cleanup;
}
- ctx->commits.alloc = count_distinct;
- ALLOC_ARRAY(ctx->commits.list, ctx->commits.alloc);
+ close_reachable(ctx);
copy_oids_to_commits(ctx);
@@ -1857,17 +2344,25 @@
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);
+ ctx->trust_generation_numbers = validate_mixed_generation_chain(ctx->r->objects->commit_graph);
+
+ compute_topological_levels(ctx);
+ if (ctx->write_generation_data)
+ compute_generation_numbers(ctx);
+
+ if (ctx->changed_paths)
+ compute_bloom_filters(ctx);
res = write_commit_graph_file(ctx);
@@ -1879,7 +2374,8 @@
cleanup:
free(ctx->graph_name);
free(ctx->commits.list);
- free(ctx->oids.list);
+ oid_array_clear(&ctx->oids);
+ clear_topo_level_slab(&topo_levels);
if (ctx->commit_graph_filenames_after) {
for (i = 0; i < ctx->num_commit_graphs_after; i++) {
@@ -1992,7 +2488,8 @@
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;
+ timestamp_t max_generation = 0;
+ timestamp_t generation;
display_progress(progress, i + 1);
hashcpy(cur_oid.hash, g->chunk_oid_lookup + g->hash_len * i);
@@ -2031,8 +2528,9 @@
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;
@@ -2042,7 +2540,7 @@
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));
@@ -2055,17 +2553,19 @@
continue;
/*
- * If one of our parents has generation GENERATION_NUMBER_MAX, then
- * our generation is also GENERATION_NUMBER_MAX. Decrement to avoid
- * extra logic in the following condition.
+ * If we are using topological level and one of our parents has
+ * generation GENERATION_NUMBER_V1_MAX, then our generation is
+ * also GENERATION_NUMBER_V1_MAX. Decrement to avoid extra logic
+ * in the following condition.
*/
- if (max_generation == GENERATION_NUMBER_MAX)
+ if (!g->read_generation_data && max_generation == GENERATION_NUMBER_V1_MAX)
max_generation--;
- if (graph_commit->generation != max_generation + 1)
- graph_report(_("commit-graph generation for commit %s is %u != %u"),
+ generation = commit_graph_generation(graph_commit);
+ if (generation < max_generation + 1)
+ graph_report(_("commit-graph generation for commit %s is %"PRItime" < %"PRItime),
oid_to_hex(&cur_oid),
- graph_commit->generation,
+ generation,
max_generation + 1);
if (graph_commit->date != odb_commit->date)
@@ -2088,12 +2588,12 @@
{
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);
}
diff --git a/commit-graph.h b/commit-graph.h
index e87a6f6..97f3497 100644
--- a/commit-graph.h
+++ b/commit-graph.h
@@ -2,17 +2,31 @@
#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_NO_GDAT "GIT_TEST_COMMIT_GRAPH_NO_GDAT"
+#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(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);
/*
@@ -39,8 +53,6 @@
const struct commit *c);
struct commit_graph {
- int graph_fd;
-
const unsigned char *data;
size_t data_len;
@@ -52,21 +64,30 @@
struct object_directory *odb;
uint32_t num_commits_in_base;
+ unsigned int read_generation_data;
struct commit_graph *base_graph;
const uint32_t *chunk_oid_fanout;
const unsigned char *chunk_oid_lookup;
const unsigned char *chunk_commit_data;
+ const unsigned char *chunk_generation_data;
+ const unsigned char *chunk_generation_data_overflow;
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 topo_level_slab *topo_levels;
+ struct bloom_filter_settings *bloom_filter_settings;
};
-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);
struct commit_graph *read_commit_graph_one(struct repository *r,
struct object_directory *odb);
-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);
/*
* Return 1 if and only if the repository has a commit-graph
@@ -74,18 +95,34 @@
*/
int generation_numbers_enabled(struct repository *r);
+/*
+ * Return 1 if and only if the repository has a commit-graph
+ * file and generation data chunk has been written for the file.
+ */
+int corrected_commit_dates_enabled(struct repository *r);
+
+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),
- /* Make sure that each OID in the input is a valid commit OID. */
- COMMIT_GRAPH_WRITE_CHECK_OIDS = (1 << 3)
+ COMMIT_GRAPH_WRITE_BLOOM_FILTERS = (1 << 3),
+ COMMIT_GRAPH_NO_WRITE_BLOOM_FILTERS = (1 << 4),
};
-struct split_commit_graph_opts {
+enum commit_graph_split_flags {
+ COMMIT_GRAPH_SPLIT_UNSPECIFIED = 0,
+ COMMIT_GRAPH_SPLIT_MERGE_PROHIBITED = 1,
+ COMMIT_GRAPH_SPLIT_REPLACE = 2
+};
+
+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;
};
/*
@@ -96,12 +133,12 @@
*/
int write_commit_graph_reachable(struct object_directory *odb,
enum commit_graph_write_flags flags,
- const struct split_commit_graph_opts *split_opts);
+ const struct commit_graph_opts *opts);
int write_commit_graph(struct object_directory *odb,
struct string_list *pack_indexes,
- struct string_list *commit_hex,
+ struct oidset *commits,
enum commit_graph_write_flags flags,
- const struct split_commit_graph_opts *split_opts);
+ const struct commit_graph_opts *opts);
#define COMMIT_GRAPH_VERIFY_SHALLOW (1 << 0)
@@ -116,4 +153,14 @@
*/
void disable_commit_graph(struct repository *r);
+struct commit_graph_data {
+ uint32_t graph_pos;
+ timestamp_t generation;
+};
+
+/*
+ * Commits should be parsed before accessing generation, graph positions.
+ */
+timestamp_t commit_graph_generation(const struct commit *);
+uint32_t commit_graph_position(const struct commit *);
#endif
diff --git a/commit-reach.c b/commit-reach.c
index 4ca7e70..c226ee3 100644
--- a/commit-reach.c
+++ b/commit-reach.c
@@ -17,6 +17,25 @@
static const unsigned all_flags = (PARENT1 | PARENT2 | STALE | RESULT);
+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;
+
+ timestamp_t generation_a = commit_graph_generation(a);
+ timestamp_t generation_b = commit_graph_generation(b);
+
+ if (generation_a < generation_b)
+ return -1;
+ if (generation_a > generation_b)
+ return 1;
+ if (a->date < b->date)
+ return -1;
+ if (a->date > b->date)
+ return 1;
+ return 0;
+}
+
static int queue_has_nonstale(struct prio_queue *queue)
{
int i;
@@ -32,14 +51,14 @@
static struct commit_list *paint_down_to_common(struct repository *r,
struct commit *one, int n,
struct commit **twos,
- int min_generation)
+ timestamp_t min_generation)
{
struct prio_queue queue = { compare_commits_by_gen_then_commit_date };
struct commit_list *result = NULL;
int i;
- uint32_t last_gen = GENERATION_NUMBER_INFINITY;
+ timestamp_t last_gen = GENERATION_NUMBER_INFINITY;
- if (!min_generation)
+ if (!min_generation && !corrected_commit_dates_enabled(r))
queue.compare = compare_commits_by_commit_date;
one->object.flags |= PARENT1;
@@ -58,14 +77,15 @@
struct commit *commit = prio_queue_get(&queue);
struct commit_list *parents;
int flags;
+ timestamp_t generation = commit_graph_generation(commit);
- if (min_generation && commit->generation > last_gen)
- BUG("bad generation skip %8x > %8x at %s",
- commit->generation, last_gen,
+ if (min_generation && generation > last_gen)
+ BUG("bad generation skip %"PRItime" > %"PRItime" at %s",
+ 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);
@@ -155,20 +175,15 @@
return ret;
}
-static int remove_redundant(struct repository *r, struct commit **array, int cnt)
+static int remove_redundant_no_gen(struct repository *r,
+ struct commit **array, int cnt)
{
- /*
- * Some commit in the array may be an ancestor of
- * another commit. Move such commit to the end of
- * the array, and return the number of commits that
- * are independent from each other.
- */
struct commit **work;
unsigned char *redundant;
int *filled_index;
int i, j, filled;
- work = xcalloc(cnt, sizeof(*work));
+ CALLOC_ARRAY(work, cnt);
redundant = xcalloc(cnt, 1);
ALLOC_ARRAY(filled_index, cnt - 1);
@@ -176,18 +191,20 @@
repo_parse_commit(r, array[i]);
for (i = 0; i < cnt; i++) {
struct commit_list *common;
- uint32_t min_generation = array[i]->generation;
+ timestamp_t min_generation = commit_graph_generation(array[i]);
if (redundant[i])
continue;
for (j = filled = 0; j < cnt; j++) {
+ timestamp_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);
@@ -206,15 +223,156 @@
for (i = filled = 0; i < cnt; i++)
if (!redundant[i])
array[filled++] = work[i];
- for (j = filled, i = 0; i < cnt; i++)
- if (redundant[i])
- array[j++] = work[i];
free(work);
free(redundant);
free(filled_index);
return filled;
}
+static int remove_redundant_with_gen(struct repository *r,
+ struct commit **array, int cnt)
+{
+ int i, count_non_stale = 0, count_still_independent = cnt;
+ timestamp_t min_generation = GENERATION_NUMBER_INFINITY;
+ struct commit **walk_start, **sorted;
+ size_t walk_start_nr = 0, walk_start_alloc = cnt;
+ int min_gen_pos = 0;
+
+ /*
+ * Sort the input by generation number, ascending. This allows
+ * us to increase the "min_generation" limit when we discover
+ * the commit with lowest generation is STALE. The index
+ * min_gen_pos points to the current position within 'array'
+ * that is not yet known to be STALE.
+ */
+ ALLOC_ARRAY(sorted, cnt);
+ COPY_ARRAY(sorted, array, cnt);
+ QSORT(sorted, cnt, compare_commits_by_gen);
+ min_generation = commit_graph_generation(sorted[0]);
+
+ ALLOC_ARRAY(walk_start, walk_start_alloc);
+
+ /* Mark all parents of the input as STALE */
+ for (i = 0; i < cnt; i++) {
+ struct commit_list *parents;
+
+ repo_parse_commit(r, array[i]);
+ array[i]->object.flags |= RESULT;
+ parents = array[i]->parents;
+
+ while (parents) {
+ repo_parse_commit(r, parents->item);
+ if (!(parents->item->object.flags & STALE)) {
+ parents->item->object.flags |= STALE;
+ ALLOC_GROW(walk_start, walk_start_nr + 1, walk_start_alloc);
+ walk_start[walk_start_nr++] = parents->item;
+ }
+ parents = parents->next;
+ }
+ }
+
+ QSORT(walk_start, walk_start_nr, compare_commits_by_gen);
+
+ /* remove STALE bit for now to allow walking through parents */
+ for (i = 0; i < walk_start_nr; i++)
+ walk_start[i]->object.flags &= ~STALE;
+
+ /*
+ * Start walking from the highest generation. Hopefully, it will
+ * find all other items during the first-parent walk, and we can
+ * terminate early. Otherwise, we will do the same amount of work
+ * as before.
+ */
+ for (i = walk_start_nr - 1; i >= 0 && count_still_independent > 1; i--) {
+ /* push the STALE bits up to min generation */
+ struct commit_list *stack = NULL;
+
+ commit_list_insert(walk_start[i], &stack);
+ walk_start[i]->object.flags |= STALE;
+
+ while (stack) {
+ struct commit_list *parents;
+ struct commit *c = stack->item;
+
+ repo_parse_commit(r, c);
+
+ if (c->object.flags & RESULT) {
+ c->object.flags &= ~RESULT;
+ if (--count_still_independent <= 1)
+ break;
+ if (oideq(&c->object.oid, &sorted[min_gen_pos]->object.oid)) {
+ while (min_gen_pos < cnt - 1 &&
+ (sorted[min_gen_pos]->object.flags & STALE))
+ min_gen_pos++;
+ min_generation = commit_graph_generation(sorted[min_gen_pos]);
+ }
+ }
+
+ if (commit_graph_generation(c) < min_generation) {
+ pop_commit(&stack);
+ continue;
+ }
+
+ parents = c->parents;
+ while (parents) {
+ if (!(parents->item->object.flags & STALE)) {
+ parents->item->object.flags |= STALE;
+ commit_list_insert(parents->item, &stack);
+ break;
+ }
+ parents = parents->next;
+ }
+
+ /* pop if all parents have been visited already */
+ if (!parents)
+ pop_commit(&stack);
+ }
+ free_commit_list(stack);
+ }
+ free(sorted);
+
+ /* clear result */
+ for (i = 0; i < cnt; i++)
+ array[i]->object.flags &= ~RESULT;
+
+ /* rearrange array */
+ for (i = count_non_stale = 0; i < cnt; i++) {
+ if (!(array[i]->object.flags & STALE))
+ array[count_non_stale++] = array[i];
+ }
+
+ /* clear marks */
+ clear_commit_marks_many(walk_start_nr, walk_start, STALE);
+ free(walk_start);
+
+ return count_non_stale;
+}
+
+static int remove_redundant(struct repository *r, struct commit **array, int cnt)
+{
+ /*
+ * Some commit in the array may be an ancestor of
+ * another commit. Move the independent commits to the
+ * beginning of 'array' and return their number. Callers
+ * should not rely upon the contents of 'array' after
+ * that number.
+ */
+ if (generation_numbers_enabled(r)) {
+ int i;
+
+ /*
+ * If we have a single commit with finite generation
+ * number, then the _with_gen algorithm is preferred.
+ */
+ for (i = 0; i < cnt; i++) {
+ if (commit_graph_generation(array[i]) < GENERATION_NUMBER_INFINITY)
+ return remove_redundant_with_gen(r, array, cnt);
+ }
+ }
+
+ return remove_redundant_no_gen(r, array, cnt);
+}
+
static struct commit_list *get_merge_bases_many_0(struct repository *r,
struct commit *one,
int n,
@@ -241,7 +399,7 @@
/* There are more than one */
cnt = commit_list_count(result);
- rslt = xcalloc(cnt, sizeof(*rslt));
+ CALLOC_ARRAY(rslt, cnt);
for (list = result, i = 0; list; list = list->next)
rslt[i++] = list->item;
free_commit_list(result);
@@ -283,7 +441,9 @@
/*
* 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;
@@ -301,7 +461,7 @@
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;
@@ -316,23 +476,26 @@
{
struct commit_list *bases;
int ret = 0, i;
- uint32_t min_generation = GENERATION_NUMBER_INFINITY;
+ timestamp_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);
@@ -348,7 +511,15 @@
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)
@@ -370,7 +541,7 @@
p->item->object.flags |= STALE;
num_head++;
}
- array = xcalloc(num_head, sizeof(*array));
+ CALLOC_ARRAY(array, num_head);
for (p = heads, i = 0; p; p = p->next) {
if (p->item->object.flags & STALE) {
array[i++] = p->item;
@@ -396,6 +567,7 @@
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
@@ -417,7 +589,10 @@
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;
}
/*
@@ -450,7 +625,7 @@
static enum contains_result contains_test(struct commit *candidate,
const struct commit_list *want,
struct contains_cache *cache,
- uint32_t cutoff)
+ timestamp_t cutoff)
{
enum contains_result *cached = contains_cache_at(cache, candidate);
@@ -467,7 +642,7 @@
/* 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;
@@ -486,14 +661,16 @@
{
struct contains_stack contains_stack = { 0, 0, NULL };
enum contains_result result;
- uint32_t cutoff = GENERATION_NUMBER_INFINITY;
+ timestamp_t cutoff = GENERATION_NUMBER_INFINITY;
const struct commit_list *p;
for (p = want; p; p = p->next) {
+ timestamp_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);
@@ -536,26 +713,14 @@
{
if (filter->with_commit_tag_algo)
return contains_tag_algo(commit, list, cache) == CONTAINS_YES;
- return is_descendant_of(commit, list);
-}
-
-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)
- return -1;
- if (a->generation > b->generation)
- return 1;
- return 0;
+ return repo_is_descendant_of(the_repository, commit, list);
}
int can_all_from_reach_with_flag(struct object_array *from,
unsigned int with_flag,
unsigned int assign_flag,
time_t min_commit_date,
- uint32_t min_generation)
+ timestamp_t min_generation)
{
struct commit **list = NULL;
int i;
@@ -585,7 +750,7 @@
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;
}
@@ -621,7 +786,7 @@
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);
@@ -656,17 +821,19 @@
time_t min_commit_date = cutoff_by_min_date ? from->item->date : 0;
struct commit_list *from_iter = from, *to_iter = to;
int result;
- uint32_t min_generation = GENERATION_NUMBER_INFINITY;
+ timestamp_t min_generation = GENERATION_NUMBER_INFINITY;
while (from_iter) {
add_object_array(&from_iter->item->object, NULL, &from_objs);
if (!parse_commit(from_iter->item)) {
+ timestamp_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;
@@ -674,11 +841,13 @@
while (to_iter) {
if (!parse_commit(to_iter->item)) {
+ timestamp_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;
@@ -712,17 +881,19 @@
struct commit_list *found_commits = NULL;
struct commit **to_last = to + nr_to;
struct commit **from_last = from + nr_from;
- uint32_t min_generation = GENERATION_NUMBER_INFINITY;
+ timestamp_t min_generation = GENERATION_NUMBER_INFINITY;
int num_to_find = 0;
struct prio_queue queue = { compare_commits_by_gen_then_commit_date };
for (item = to; item < to_last; item++) {
+ timestamp_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;
@@ -755,7 +926,7 @@
parse_commit(p);
- if (p->generation < min_generation)
+ if (commit_graph_generation(p) < min_generation)
continue;
if (p->object.flags & PARENT2)
diff --git a/commit-reach.h b/commit-reach.h
index 99a43e8..148b56f 100644
--- a/commit-reach.h
+++ b/commit-reach.h
@@ -27,7 +27,9 @@
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);
@@ -85,7 +87,7 @@
unsigned int with_flag,
unsigned int assign_flag,
time_t min_commit_date,
- uint32_t min_generation);
+ timestamp_t min_generation);
int can_all_from_reach(struct commit_list *from, struct commit_list *to,
int commit_date_cutoff);
diff --git a/commit-slab-decl.h b/commit-slab-decl.h
index adc7b46..98de2c9 100644
--- a/commit-slab-decl.h
+++ b/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 @@
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 @@
declare_commit_slab(slabname, elemtype); \
declare_commit_slab_prototypes(slabname, elemtype)
-#endif /* COMMIT_SLAB_HDR_H */
+#endif /* COMMIT_SLAB_DECL_H */
diff --git a/commit-slab-impl.h b/commit-slab-impl.h
index 5c0eb91..557738d 100644
--- a/commit-slab-impl.h
+++ b/commit-slab-impl.h
@@ -38,6 +38,19 @@
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/commit-slab.h b/commit-slab.h
index 69bf0c8..8e72a30 100644
--- a/commit-slab.h
+++ b/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/commit.c b/commit.c
index a6cfa41..42f8117 100644
--- a/commit.c
+++ b/commit.c
@@ -14,12 +14,13 @@
#include "mergesort.h"
#include "commit-slab.h"
#include "prio-queue.h"
-#include "sha1-lookup.h"
+#include "hash-lookup.h"
#include "wt-status.h"
#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 **);
@@ -36,7 +37,7 @@
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)
@@ -61,7 +62,7 @@
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)
@@ -104,23 +105,23 @@
return parse_timestamp(dateptr, NULL, 10);
}
-static const unsigned char *commit_graft_sha1_access(size_t index, void *table)
+static const struct object_id *commit_graft_oid_access(size_t index, const void *table)
{
- struct commit_graft **commit_graft_table = table;
- return commit_graft_table[index]->oid.hash;
+ const struct commit_graft * const *commit_graft_table = table;
+ return &commit_graft_table[index]->oid;
}
-static int commit_graft_pos(struct repository *r, const unsigned char *sha1)
+int commit_graft_pos(struct repository *r, const struct object_id *oid)
{
- return sha1_pos(sha1, r->parsed_objects->grafts,
- r->parsed_objects->grafts_nr,
- commit_graft_sha1_access);
+ return oid_pos(oid, r->parsed_objects->grafts,
+ r->parsed_objects->grafts_nr,
+ commit_graft_oid_access);
}
int register_commit_graft(struct repository *r, struct commit_graft *graft,
int ignore_dups)
{
- int pos = commit_graft_pos(r, graft->oid.hash);
+ int pos = commit_graft_pos(r, &graft->oid);
if (0 <= pos) {
if (ignore_dups)
@@ -231,7 +232,7 @@
{
int pos;
prepare_commit_graft(r);
- pos = commit_graft_pos(r, oid->hash);
+ pos = commit_graft_pos(r, oid);
if (pos < 0)
return NULL;
return r->parsed_objects->grafts[pos];
@@ -245,19 +246,6 @@
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;
@@ -351,7 +339,7 @@
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;
@@ -435,6 +423,8 @@
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;
@@ -554,6 +544,17 @@
return new_list;
}
+int commit_list_contains(struct commit *item, struct commit_list *list)
+{
+ while (list) {
+ if (list->item == item)
+ return 1;
+ list = list->next;
+ }
+
+ return 0;
+}
+
unsigned commit_list_count(const struct commit_list *l)
{
unsigned c = 0;
@@ -573,6 +574,17 @@
return head;
}
+struct commit_list *reverse_commit_list(struct commit_list *list)
+{
+ struct commit_list *next = NULL, *current, *backup;
+ for (current = list; current; current = backup) {
+ backup = current->next;
+ current->next = next;
+ next = current;
+ }
+ return next;
+}
+
void free_commit_list(struct commit_list *list)
{
while (list)
@@ -741,11 +753,13 @@
int compare_commits_by_gen_then_commit_date(const void *a_, const void *b_, void *unused)
{
const struct commit *a = a_, *b = b_;
+ const timestamp_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 */
@@ -927,12 +941,22 @@
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++)
@@ -958,17 +982,26 @@
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)
+int sign_with_header(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");
@@ -1002,19 +1035,32 @@
return 0;
}
-int parse_signed_commit(const struct commit *commit,
- struct strbuf *payload, struct strbuf *signature)
-{
+
+int parse_signed_commit(const struct commit *commit,
+ struct strbuf *payload, struct strbuf *signature,
+ const struct git_hash_algo *algop)
+{
unsigned long size;
const char *buffer = get_commit_buffer(commit, &size);
- int in_signature, saw_signature = -1;
- const char *line, *tail;
+ int ret = parse_buffer_signed_by_header(buffer, size, payload, signature, algop);
+
+ unuse_commit_buffer(commit, buffer);
+ return ret;
+}
+
+int parse_buffer_signed_by_header(const char *buffer,
+ unsigned long size,
+ struct strbuf *payload,
+ struct strbuf *signature,
+ const struct git_hash_algo *algop)
+{
+ int in_signature = 0, saw_signature = 0, other_signature = 0;
+ const char *line, *tail, *p;
+ const char *gpg_sig_header = gpg_sig_headers[hash_algo_by_ptr(algop)];
line = buffer;
tail = buffer + size;
- in_signature = 0;
- saw_signature = 0;
while (line < tail) {
const char *sig = NULL;
const char *next = memchr(line, '\n', tail - line);
@@ -1022,9 +1068,15 @@
next = next ? next + 1 : tail;
if (in_signature && line[0] == ' ')
sig = line + 1;
- else if (starts_with(line, gpg_sig_header) &&
- line[gpg_sig_header_len] == ' ')
- sig = line + gpg_sig_header_len + 1;
+ else if (skip_prefix(line, gpg_sig_header, &p) &&
+ *p == ' ') {
+ sig = line + strlen(gpg_sig_header) + 1;
+ other_signature = 0;
+ }
+ else if (starts_with(line, "gpgsig"))
+ other_signature = 1;
+ else if (other_signature && line[0] != ' ')
+ other_signature = 0;
if (sig) {
strbuf_add(signature, sig, next - sig);
saw_signature = 1;
@@ -1033,12 +1085,12 @@
if (*line == '\n')
/* dump the whole remainder of the buffer */
next = tail;
- strbuf_add(payload, line, next - line);
+ if (!other_signature)
+ strbuf_add(payload, line, next - line);
in_signature = 0;
}
line = next;
}
- unuse_commit_buffer(commit, buffer);
return saw_signature;
}
@@ -1047,33 +1099,48 @@
const char *line = buf->buf;
const char *tail = buf->buf + buf->len;
int in_signature = 0;
- const char *sig_start = NULL;
- const char *sig_end = NULL;
+ struct sigbuf {
+ const char *start;
+ const char *end;
+ } sigs[2], *sigp = &sigs[0];
+ int i;
+ const char *orig_buf = buf->buf;
+
+ memset(sigs, 0, sizeof(sigs));
while (line < tail) {
const char *next = memchr(line, '\n', tail - line);
next = next ? next + 1 : tail;
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;
+ sigp->end = next;
+ 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 == ' ') {
+ sigp->start = line;
+ sigp->end = next;
+ in_signature = 1;
+ }
+ }
} else {
if (*line == '\n')
/* dump the whole remainder of the buffer */
next = tail;
+ if (in_signature && sigp - sigs != ARRAY_SIZE(sigs))
+ sigp++;
in_signature = 0;
}
line = next;
}
- if (sig_start)
- strbuf_remove(buf, sig_start - buf->buf, sig_end - sig_start);
+ for (i = ARRAY_SIZE(sigs) - 1; i >= 0; i--)
+ if (sigs[i].start)
+ strbuf_remove(buf, sigs[i].start - orig_buf, sigs[i].end - sigs[i].start);
- return sig_start != NULL;
+ return sigs[0].start != NULL;
}
static void handle_signed_tag(struct commit *parent, struct commit_extra_header ***tail)
@@ -1081,8 +1148,10 @@
struct merge_remote_desc *desc;
struct commit_extra_header *mergetag;
char *buf;
- unsigned long size, len;
+ unsigned long size;
enum object_type type;
+ struct strbuf payload = STRBUF_INIT;
+ struct strbuf signature = STRBUF_INIT;
desc = merge_remote_util(parent);
if (!desc || !desc->obj)
@@ -1090,8 +1159,7 @@
buf = read_object_file(&desc->obj->oid, &type, &size);
if (!buf || type != OBJ_TAG)
goto free_return;
- len = parse_signature(buf, size);
- if (size == len)
+ if (!parse_signature(buf, size, &payload, &signature))
goto free_return;
/*
* We could verify this signature and either omit the tag when
@@ -1103,13 +1171,15 @@
* if (verify_signed_buffer(buf, len, buf + len, size - len, ...))
* warn("warning: signed tag unverified.");
*/
- mergetag = xcalloc(1, sizeof(*mergetag));
+ CALLOC_ARRAY(mergetag, 1);
mergetag->key = xstrdup("mergetag");
mergetag->value = buf;
mergetag->len = size;
**tail = mergetag;
*tail = &mergetag->next;
+ strbuf_release(&payload);
+ strbuf_release(&signature);
return;
free_return:
@@ -1124,7 +1194,7 @@
sigc->result = 'N';
- if (parse_signed_commit(commit, &payload, &signature) <= 0)
+ if (parse_signed_commit(commit, &payload, &signature, the_hash_algo) <= 0)
goto out;
ret = check_signature(payload.buf, payload.len, signature.buf,
signature.len, sigc);
@@ -1266,7 +1336,7 @@
excluded_header_field(line, eof - line, exclude))
continue;
- it = xcalloc(1, sizeof(*it));
+ CALLOC_ARRAY(it, 1);
it->key = xmemdupz(line, eof-line);
*tail = it;
tail = &it->next;
@@ -1297,8 +1367,8 @@
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;
}
@@ -1421,7 +1491,8 @@
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;
@@ -1454,7 +1525,9 @@
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);
@@ -1471,7 +1544,7 @@
if (encoding_is_utf8 && !verify_utf8(&buffer))
fprintf(stderr, _(commit_utf8_warn));
- if (sign_commit && do_sign_commit(&buffer, sign_commit)) {
+ if (sign_commit && sign_with_header(&buffer, sign_commit)) {
result = -1;
goto out;
}
@@ -1564,7 +1637,7 @@
/*
* Inspect the given string and determine the true "end" of the log message, in
- * order to find where to put a new Signed-off-by: line. Ignored are
+ * order to find where to put a new Signed-off-by trailer. Ignored are
* trailing comment lines and blank lines. To support "git commit -s
* --amend" on an existing commit, we also ignore "Conflicts:". To
* support "git commit -v", we truncate at cut lines.
@@ -1611,22 +1684,22 @@
int run_commit_hook(int editor_is_used, const char *index_file,
const char *name, ...)
{
- struct argv_array hook_env = ARGV_ARRAY_INIT;
+ struct strvec hook_env = STRVEC_INIT;
va_list args;
int ret;
- argv_array_pushf(&hook_env, "GIT_INDEX_FILE=%s", index_file);
+ strvec_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=:");
+ strvec_push(&hook_env, "GIT_EDITOR=:");
va_start(args, name);
- ret = run_hook_ve(hook_env.argv,name, args);
+ ret = run_hook_ve(hook_env.v, name, args);
va_end(args);
- argv_array_clear(&hook_env);
+ strvec_clear(&hook_env);
return ret;
}
diff --git a/commit.h b/commit.h
index 008a0fa..49c0f50 100644
--- a/commit.h
+++ b/commit.h
@@ -11,9 +11,10 @@
#include "commit-slab.h"
#define COMMIT_NOT_FROM_GRAPH 0xFFFFFFFF
-#define GENERATION_NUMBER_INFINITY 0xFFFFFFFF
-#define GENERATION_NUMBER_MAX 0x3FFFFFFF
+#define GENERATION_NUMBER_INFINITY ((1ULL << 63) - 1)
+#define GENERATION_NUMBER_V1_MAX 0x3FFFFFFF
#define GENERATION_NUMBER_ZERO 0
+#define GENERATION_NUMBER_V2_OFFSET_MAX ((1ULL << 31) - 1)
struct commit_list {
struct commit *item;
@@ -36,8 +37,6 @@
* or get_commit_tree_oid().
*/
struct tree *maybe_tree;
- uint32_t graph_pos;
- uint32_t generation;
unsigned int index;
};
@@ -90,14 +89,14 @@
return repo_parse_commit_gently(r, item, 0);
}
-static inline int parse_commit_no_graph(struct commit *commit)
+static inline int repo_parse_commit_no_graph(struct repository *r,
+ struct commit *commit)
{
- return repo_parse_commit_internal(the_repository, commit, 0, 0);
+ return repo_parse_commit_internal(r, commit, 0, 0);
}
#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
@@ -170,6 +169,8 @@
struct commit_list *commit_list_insert(struct commit *item,
struct commit_list **list);
+int commit_list_contains(struct commit *item,
+ struct commit_list *list);
struct commit_list **commit_list_append(struct commit *commit,
struct commit_list **next);
unsigned commit_list_count(const struct commit_list *l);
@@ -180,6 +181,9 @@
/* Shallow copy of the input list */
struct commit_list *copy_commit_list(struct commit_list *list);
+/* Modify list in-place to reverse it, returning new head; list will be tail */
+struct commit_list *reverse_commit_list(struct commit_list *list);
+
void free_commit_list(struct commit_list *list);
struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
@@ -236,6 +240,8 @@
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 struct object_id *oid);
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 +253,9 @@
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 +276,9 @@
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 **);
@@ -360,7 +319,8 @@
struct commit *get_merge_parent(const char *name);
int parse_signed_commit(const struct commit *commit,
- struct strbuf *message, struct strbuf *signature);
+ struct strbuf *message, struct strbuf *signature,
+ const struct git_hash_algo *algop);
int remove_signature(struct strbuf *buf);
/*
@@ -402,4 +362,13 @@
LAST_ARG_MUST_BE_NULL
int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...);
+/* Sign a commit or tag buffer, storing the result in a header. */
+int sign_with_header(struct strbuf *buf, const char *keyid);
+/* Parse the signature out of a header. */
+int parse_buffer_signed_by_header(const char *buffer,
+ unsigned long size,
+ struct strbuf *payload,
+ struct strbuf *signature,
+ const struct git_hash_algo *algop);
+
#endif /* COMMIT_H */
diff --git a/compat/bswap.h b/compat/bswap.h
index e4e2573..512f6f4 100644
--- a/compat/bswap.h
+++ b/compat/bswap.h
@@ -74,7 +74,7 @@
}
#endif
-#elif defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))
+#elif defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64) || defined(_M_ARM64))
#include <stdlib.h>
@@ -145,28 +145,6 @@
#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 @@
p[7] = value >> 0;
}
-#endif
-
#endif /* COMPAT_BSWAP_H */
diff --git a/compat/compiler.h b/compat/compiler.h
new file mode 100644
index 0000000..10dbb65
--- /dev/null
+++ b/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/compat/gmtime.c b/compat/gmtime.c
deleted file mode 100644
index e8362dd..0000000
--- a/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/compat/mingw.c b/compat/mingw.c
index d14065d..a435998 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -18,8 +18,8 @@
static struct child_process cp = CHILD_PROCESS_INIT;
extern char *_pgmptr;
- argv_array_pushl(&cp.args, "mintty", "gdb", NULL);
- argv_array_pushf(&cp.args, "--pid=%d", getpid());
+ 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");
@@ -290,6 +290,9 @@
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)) {
@@ -364,6 +367,8 @@
ask_yes_no_if_possible("Deletion of directory '%s' failed. "
"Should I try again?", pathname))
ret = _wrmdir(wpathname);
+ if (!ret)
+ invalidate_lstat_cache();
return ret;
}
@@ -460,8 +465,21 @@
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
@@ -964,7 +982,16 @@
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);
@@ -1479,6 +1506,7 @@
const char *(*quote_arg)(const char *arg) =
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;
@@ -1562,6 +1590,31 @@
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);
@@ -2581,12 +2634,14 @@
continue;
}
break;
- case 'c': case 'C': /* COM<N>, CON, CONIN$, CONOUT$ */
+ 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') { /* COM<N> */
- if (!isdigit(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];
diff --git a/compat/mingw.h b/compat/mingw.h
index e6fe810..c9a52ad 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -227,6 +227,7 @@
int mingw_open (const char *filename, int oflags, ...);
#define open mingw_open
+#undef OPEN_RETURNS_EINTR
int mingw_fgetc(FILE *stream);
#define fgetc mingw_fgetc
@@ -606,7 +607,7 @@
* Call this function to open a new MinTTY (this assumes you are in Git for
* Windows' SDK) with a GDB that attaches to the current process right away.
*/
-extern void open_in_gdb(void);
+void open_in_gdb(void);
/*
* Used by Pthread API implementation for Windows
diff --git a/compat/open.c b/compat/open.c
new file mode 100644
index 0000000..eb3754a
--- /dev/null
+++ b/compat/open.c
@@ -0,0 +1,25 @@
+#include "git-compat-util.h"
+
+#undef open
+int git_open_with_retry(const char *path, int flags, ...)
+{
+ mode_t mode = 0;
+ int ret;
+
+ /*
+ * Also O_TMPFILE would take a mode, but it isn't defined everywhere.
+ * And anyway, we don't use it in our code base.
+ */
+ if (flags & O_CREAT) {
+ va_list ap;
+ va_start(ap, flags);
+ mode = va_arg(ap, int);
+ va_end(ap);
+ }
+
+ do {
+ ret = open(path, flags, mode);
+ } while (ret < 0 && errno == EINTR);
+
+ return ret;
+}
diff --git a/compat/precompose_utf8.c b/compat/precompose_utf8.c
index 136250f..ec56056 100644
--- a/compat/precompose_utf8.c
+++ b/compat/precompose_utf8.c
@@ -60,32 +60,46 @@
strbuf_release(&path);
}
+static inline const char *precompose_string_if_needed(const char *in)
+{
+ size_t inlen;
+ size_t outlen;
+ if (has_non_ascii(in, (size_t)-1, &inlen)) {
+ iconv_t ic_prec;
+ char *out;
+ if (precomposed_unicode < 0)
+ git_config_get_bool("core.precomposeunicode", &precomposed_unicode);
+ if (precomposed_unicode != 1)
+ return in;
+ ic_prec = iconv_open(repo_encoding, path_encoding);
+ if (ic_prec == (iconv_t) -1)
+ return in;
-void precompose_argv(int argc, const char **argv)
+ out = reencode_string_iconv(in, inlen, ic_prec, 0, &outlen);
+ if (out) {
+ if (outlen == inlen && !memcmp(in, out, outlen))
+ free(out); /* no need to return indentical */
+ else
+ in = out;
+ }
+ iconv_close(ic_prec);
+
+ }
+ return in;
+}
+
+const char *precompose_argv_prefix(int argc, const char **argv, const char *prefix)
{
int i = 0;
- const char *oldarg;
- char *newarg;
- iconv_t ic_precompose;
-
- if (precomposed_unicode != 1)
- return;
-
- ic_precompose = iconv_open(repo_encoding, path_encoding);
- if (ic_precompose == (iconv_t) -1)
- return;
while (i < argc) {
- size_t namelen;
- oldarg = argv[i];
- if (has_non_ascii(oldarg, (size_t)-1, &namelen)) {
- newarg = reencode_string_iconv(oldarg, namelen, ic_precompose, 0, NULL);
- if (newarg)
- argv[i] = newarg;
- }
+ argv[i] = precompose_string_if_needed(argv[i]);
i++;
}
- iconv_close(ic_precompose);
+ if (prefix) {
+ prefix = precompose_string_if_needed(prefix);
+ }
+ return prefix;
}
diff --git a/compat/precompose_utf8.h b/compat/precompose_utf8.h
index 6f843d3..d70b846 100644
--- a/compat/precompose_utf8.h
+++ b/compat/precompose_utf8.h
@@ -28,7 +28,7 @@
struct dirent_prec_psx *dirent_nfc;
} PREC_DIR;
-void precompose_argv(int argc, const char **argv);
+const char *precompose_argv_prefix(int argc, const char **argv, const char *prefix);
void probe_utf8_pathname_composition(void);
PREC_DIR *precompose_utf8_opendir(const char *dirname);
diff --git a/compat/regex/regex.c b/compat/regex/regex.c
index f3e03a9..e6f4a5d 100644
--- a/compat/regex/regex.c
+++ b/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/compat/regex/regex_internal.h b/compat/regex/regex_internal.h
index 3ee8aae..0bad8b8 100644
--- a/compat/regex/regex_internal.h
+++ b/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/compat/terminal.c b/compat/terminal.c
index 35bca03..43b73dd 100644
--- a/compat/terminal.c
+++ b/compat/terminal.c
@@ -86,9 +86,9 @@
if (stty_restore.nr == 0)
return;
- argv_array_push(&cp.args, "stty");
+ strvec_push(&cp.args, "stty");
for (i = 0; i < stty_restore.nr; i++)
- argv_array_push(&cp.args, stty_restore.items[i].string);
+ strvec_push(&cp.args, stty_restore.items[i].string);
run_command(&cp);
string_list_clear(&stty_restore, 0);
return;
@@ -107,25 +107,25 @@
if (use_stty) {
struct child_process cp = CHILD_PROCESS_INIT;
- argv_array_push(&cp.args, "stty");
+ strvec_push(&cp.args, "stty");
if (bits & ENABLE_LINE_INPUT) {
string_list_append(&stty_restore, "icanon");
- argv_array_push(&cp.args, "-icanon");
+ strvec_push(&cp.args, "-icanon");
}
if (bits & ENABLE_ECHO_INPUT) {
string_list_append(&stty_restore, "echo");
- argv_array_push(&cp.args, "-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");
- argv_array_push(&cp.args, "ignbrk");
- argv_array_push(&cp.args, "intr");
- argv_array_push(&cp.args, "");
+ strvec_push(&cp.args, "ignbrk");
+ strvec_push(&cp.args, "intr");
+ strvec_push(&cp.args, "");
}
if (run_command(&cp) == 0)
@@ -273,7 +273,7 @@
hashmap_init(&sequences, (hashmap_cmp_fn)sequence_entry_cmp,
NULL, 0);
- argv_array_pushl(&cp.args, "infocmp", "-L", "-1", NULL);
+ strvec_pushl(&cp.args, "infocmp", "-L", "-1", NULL);
if (pipe_command(&cp, NULL, 0, &buf, 0, NULL, 0))
strbuf_setlen(&buf, 0);
diff --git a/compat/vcbuild/README b/compat/vcbuild/README
index 1b6dabf..51fb083 100644
--- a/compat/vcbuild/README
+++ b/compat/vcbuild/README
@@ -26,8 +26,8 @@
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 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/compat/vcbuild/scripts/clink.pl b/compat/vcbuild/scripts/clink.pl
index d9f71b7..3bd8241 100755
--- a/compat/vcbuild/scripts/clink.pl
+++ b/compat/vcbuild/scripts/clink.pl
@@ -23,7 +23,9 @@
# 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;
@@ -43,7 +45,7 @@
push(@args, "zlib.lib");
}
} elsif ("$arg" eq "-liconv") {
- push(@args, "libiconv.lib");
+ push(@args, "iconv.lib");
} elsif ("$arg" eq "-lcrypto") {
push(@args, "libcrypto.lib");
} elsif ("$arg" eq "-lssl") {
@@ -64,7 +66,7 @@
}
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);
diff --git a/compat/win32/path-utils.h b/compat/win32/path-utils.h
index f2e7087..bba2b64 100644
--- a/compat/win32/path-utils.h
+++ b/compat/win32/path-utils.h
@@ -20,6 +20,17 @@
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
diff --git a/config.c b/config.c
index d17d2bd..6428393 100644
--- a/config.c
+++ b/config.c
@@ -8,6 +8,7 @@
#include "cache.h"
#include "branch.h"
#include "config.h"
+#include "environment.h"
#include "repository.h"
#include "lockfile.h"
#include "exec-cmd.h"
@@ -37,6 +38,7 @@
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;
@@ -309,7 +311,7 @@
{
struct config_include_data *inc = data;
const char *cond, *key;
- int cond_len;
+ size_t cond_len;
int ret;
/*
@@ -331,7 +333,7 @@
return ret;
}
-void git_config_push_parameter(const char *text)
+static void git_config_push_split_parameter(const char *key, const char *value)
{
struct strbuf env = STRBUF_INIT;
const char *old = getenv(CONFIG_DATA_ENVIRONMENT);
@@ -339,11 +341,74 @@
strbuf_addstr(&env, old);
strbuf_addch(&env, ' ');
}
- sq_quote_buf(&env, text);
+ sq_quote_buf(&env, key);
+ strbuf_addch(&env, '=');
+ if (value)
+ sq_quote_buf(&env, value);
setenv(CONFIG_DATA_ENVIRONMENT, env.buf, 1);
strbuf_release(&env);
}
+void git_config_push_parameter(const char *text)
+{
+ const char *value;
+
+ /*
+ * When we see:
+ *
+ * section.subsection=with=equals.key=value
+ *
+ * we cannot tell if it means:
+ *
+ * [section "subsection=with=equals"]
+ * key = value
+ *
+ * or:
+ *
+ * [section]
+ * subsection = with=equals.key=value
+ *
+ * We parse left-to-right for the first "=", meaning we'll prefer to
+ * keep the value intact over the subsection. This is historical, but
+ * also sensible since values are more likely to contain odd or
+ * untrusted input than a section name.
+ *
+ * A missing equals is explicitly allowed (as a bool-only entry).
+ */
+ value = strchr(text, '=');
+ if (value) {
+ char *key = xmemdupz(text, value - text);
+ git_config_push_split_parameter(key, value + 1);
+ free(key);
+ } else {
+ git_config_push_split_parameter(text, NULL);
+ }
+}
+
+void git_config_push_env(const char *spec)
+{
+ char *key;
+ const char *env_name;
+ const char *env_value;
+
+ env_name = strrchr(spec, '=');
+ if (!env_name)
+ die(_("invalid config format: %s"), spec);
+ key = xmemdupz(spec, env_name - spec);
+ env_name++;
+ if (!*env_name)
+ die(_("missing environment variable name for configuration '%.*s'"),
+ (int)(env_name - spec - 1), spec);
+
+ env_value = getenv(env_name);
+ if (!env_value)
+ die(_("missing environment variable '%s' for configuration '%.*s'"),
+ env_name, (int)(env_name - spec - 1), spec);
+
+ git_config_push_split_parameter(key, env_value);
+ free(key);
+}
+
static inline int iskeychar(int c)
{
return isalnum(c) || c == '-';
@@ -358,12 +423,13 @@
*
* 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 +491,7 @@
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);
}
@@ -435,11 +501,26 @@
return !git_config_parse_key_1(key, NULL, NULL, 1);
}
+static int config_parse_pair(const char *key, const char *value,
+ config_fn_t fn, void *data)
+{
+ char *canonical_name;
+ int ret;
+
+ if (!strlen(key))
+ return error(_("empty config key"));
+ if (git_config_parse_key(key, &canonical_name, NULL))
+ return -1;
+
+ ret = (fn(canonical_name, value, data) < 0) ? -1 : 0;
+ free(canonical_name);
+ return ret;
+}
+
int git_config_parse_parameter(const char *text,
config_fn_t fn, void *data)
{
const char *value;
- char *canonical_name;
struct strbuf **pair;
int ret;
@@ -460,51 +541,131 @@
return error(_("bogus config parameter: %s"), text);
}
- if (git_config_parse_key(pair[0]->buf, &canonical_name, NULL)) {
- ret = -1;
- } else {
- ret = (fn(canonical_name, value, data) < 0) ? -1 : 0;
- free(canonical_name);
- }
+ ret = config_parse_pair(pair[0]->buf, value, fn, data);
strbuf_list_free(pair);
return ret;
}
+static int parse_config_env_list(char *env, config_fn_t fn, void *data)
+{
+ char *cur = env;
+ while (cur && *cur) {
+ const char *key = sq_dequote_step(cur, &cur);
+ if (!key)
+ return error(_("bogus format in %s"),
+ CONFIG_DATA_ENVIRONMENT);
+
+ if (!cur || isspace(*cur)) {
+ /* old-style 'key=value' */
+ if (git_config_parse_parameter(key, fn, data) < 0)
+ return -1;
+ }
+ else if (*cur == '=') {
+ /* new-style 'key'='value' */
+ const char *value;
+
+ cur++;
+ if (*cur == '\'') {
+ /* quoted value */
+ value = sq_dequote_step(cur, &cur);
+ if (!value || (cur && !isspace(*cur))) {
+ return error(_("bogus format in %s"),
+ CONFIG_DATA_ENVIRONMENT);
+ }
+ } else if (!*cur || isspace(*cur)) {
+ /* implicit bool: 'key'= */
+ value = NULL;
+ } else {
+ return error(_("bogus format in %s"),
+ CONFIG_DATA_ENVIRONMENT);
+ }
+
+ if (config_parse_pair(key, value, fn, data) < 0)
+ return -1;
+ }
+ else {
+ /* unknown format */
+ return error(_("bogus format in %s"),
+ CONFIG_DATA_ENVIRONMENT);
+ }
+
+ if (cur) {
+ while (isspace(*cur))
+ cur++;
+ }
+ }
+ return 0;
+}
+
int git_config_from_parameters(config_fn_t fn, void *data)
{
- const char *env = getenv(CONFIG_DATA_ENVIRONMENT);
+ const char *env;
+ struct strbuf envvar = STRBUF_INIT;
+ struct strvec to_free = STRVEC_INIT;
int ret = 0;
- char *envw;
- const char **argv = NULL;
- int nr = 0, alloc = 0;
- int i;
+ char *envw = NULL;
struct config_source source;
- if (!env)
- return 0;
-
memset(&source, 0, sizeof(source));
source.prev = cf;
source.origin_type = CONFIG_ORIGIN_CMDLINE;
cf = &source;
- /* sq_dequote will write over it */
- envw = xstrdup(env);
+ env = getenv(CONFIG_COUNT_ENVIRONMENT);
+ if (env) {
+ unsigned long count;
+ char *endp;
+ int i;
- if (sq_dequote_to_argv(envw, &argv, &nr, &alloc) < 0) {
- ret = error(_("bogus format in %s"), CONFIG_DATA_ENVIRONMENT);
- goto out;
+ count = strtoul(env, &endp, 10);
+ if (*endp) {
+ ret = error(_("bogus count in %s"), CONFIG_COUNT_ENVIRONMENT);
+ goto out;
+ }
+ if (count > INT_MAX) {
+ ret = error(_("too many entries in %s"), CONFIG_COUNT_ENVIRONMENT);
+ goto out;
+ }
+
+ for (i = 0; i < count; i++) {
+ const char *key, *value;
+
+ strbuf_addf(&envvar, "GIT_CONFIG_KEY_%d", i);
+ key = getenv_safe(&to_free, envvar.buf);
+ if (!key) {
+ ret = error(_("missing config key %s"), envvar.buf);
+ goto out;
+ }
+ strbuf_reset(&envvar);
+
+ strbuf_addf(&envvar, "GIT_CONFIG_VALUE_%d", i);
+ value = getenv_safe(&to_free, envvar.buf);
+ if (!value) {
+ ret = error(_("missing config value %s"), envvar.buf);
+ goto out;
+ }
+ strbuf_reset(&envvar);
+
+ if (config_parse_pair(key, value, fn, data) < 0) {
+ ret = -1;
+ goto out;
+ }
+ }
}
- for (i = 0; i < nr; i++) {
- if (git_config_parse_parameter(argv[i], fn, data) < 0) {
+ env = getenv(CONFIG_DATA_ENVIRONMENT);
+ if (env) {
+ /* sq_dequote will write over it */
+ envw = xstrdup(env);
+ if (parse_config_env_list(envw, fn, data) < 0) {
ret = -1;
goto out;
}
}
out:
- free(argv);
+ strbuf_release(&envvar);
+ strvec_clear(&to_free);
free(envw);
cf = source.prev;
return ret;
@@ -523,6 +684,19 @@
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 +902,7 @@
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;
@@ -981,15 +1155,6 @@
if (!value)
value = "";
- if (!strcmp(name, "GIT_TEST_GETTEXT_POISON"))
- /*
- * We explicitly *don't* use _() here since it would
- * cause an infinite loop with _() needing to call
- * use_gettext_poison(). This is why marked up
- * translations with N_() above.
- */
- die(bad_numeric, value, name, error_type);
-
if (!(cf && cf->name))
die(_(bad_numeric), value, name, _(error_type));
@@ -1015,6 +1180,20 @@
}
}
+NORETURN
+static void die_bad_bool(const char *name, const char *value)
+{
+ if (!strcmp(name, "GIT_TEST_GETTEXT_POISON"))
+ /*
+ * We explicitly *don't* use _() here since it would
+ * cause an infinite loop with _() needing to call
+ * use_gettext_poison().
+ */
+ die("bad boolean config value '%s' for '%s'", value, name);
+ else
+ die(_("bad boolean config value '%s' for '%s'"), value, name);
+}
+
int git_config_int(const char *name, const char *value)
{
int ret;
@@ -1087,8 +1266,10 @@
int git_config_bool(const char *name, const char *value)
{
- int discard;
- return !!git_config_bool_or_int(name, value, &discard);
+ int v = git_parse_maybe_bool(value);
+ if (v < 0)
+ die_bad_bool(name, value);
+ return v;
}
int git_config_string(const char **dest, const char *var, const char *value)
@@ -1202,6 +1383,8 @@
return config_error_nonbool(var);
if (!strcasecmp(value, "auto"))
default_abbrev = -1;
+ else if (!git_parse_maybe_bool_text(value))
+ default_abbrev = the_hash_algo->hexsz;
else {
int abbrev = git_config_int(var, value);
if (abbrev < minimum_abbrev || abbrev > the_hash_algo->hexsz)
@@ -1539,6 +1722,7 @@
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;
@@ -1947,7 +2131,7 @@
free(entry->key);
string_list_clear(&entry->value_list, 1);
}
- hashmap_free_entries(&cs->config_hash, struct config_set_element, ent);
+ hashmap_clear_and_free(&cs->config_hash, struct config_set_element, ent);
cs->hash_initialized = 0;
free(cs->list.items);
cs->list.nr = 0;
@@ -1990,18 +2174,27 @@
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)
@@ -2076,7 +2269,7 @@
opts.git_dir = repo->gitdir;
if (!repo->config)
- repo->config = xcalloc(1, sizeof(struct config_set));
+ CALLOC_ARRAY(repo->config, 1);
else
git_configset_clear(repo->config);
@@ -2131,22 +2324,26 @@
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,
@@ -2216,16 +2413,16 @@
return repo_config_get_value_multi(the_repository, key);
}
-int git_config_get_string_const(const char *key, const char **dest)
-{
- return repo_config_get_string_const(the_repository, key, dest);
-}
-
int git_config_get_string(const char *key, char **dest)
{
return repo_config_get_string(the_repository, key, dest);
}
+int git_config_get_string_tmp(const char *key, const char **dest)
+{
+ return repo_config_get_string_tmp(the_repository, key, dest);
+}
+
int git_config_get_int(const char *key, int *dest)
{
return repo_config_get_int(the_repository, key, dest);
@@ -2258,7 +2455,7 @@
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")) {
@@ -2271,11 +2468,11 @@
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))) {
@@ -2383,10 +2580,11 @@
*/
struct config_store_data {
- int baselen;
+ size_t baselen;
char *key;
int do_not_match;
- regex_t *value_regex;
+ const char *fixed_value;
+ regex_t *value_pattern;
int multi_replace;
struct {
size_t begin, end;
@@ -2400,10 +2598,10 @@
static void config_store_data_clear(struct config_store_data *store)
{
free(store->key);
- if (store->value_regex != NULL &&
- store->value_regex != CONFIG_REGEX_NONE) {
- regfree(store->value_regex);
- free(store->value_regex);
+ if (store->value_pattern != NULL &&
+ store->value_pattern != CONFIG_REGEX_NONE) {
+ regfree(store->value_pattern);
+ free(store->value_pattern);
}
free(store->parsed);
free(store->seen);
@@ -2415,13 +2613,15 @@
{
if (strcmp(key, store->key))
return 0; /* not ours */
- if (!store->value_regex)
+ if (store->fixed_value)
+ return !strcmp(store->fixed_value, value);
+ if (!store->value_pattern)
return 1; /* always matches */
- if (store->value_regex == CONFIG_REGEX_NONE)
+ if (store->value_pattern == CONFIG_REGEX_NONE)
return 0; /* never matches */
return store->do_not_match ^
- (value && !regexec(store->value_regex, value, 0, NULL, 0));
+ (value && !regexec(store->value_pattern, value, 0, NULL, 0));
}
static int store_aux_event(enum config_event_t type,
@@ -2509,7 +2709,7 @@
const struct config_store_data *store)
{
const char *dot;
- int i;
+ size_t i;
struct strbuf sb = STRBUF_INIT;
dot = memchr(key, '.', store->baselen);
@@ -2522,7 +2722,9 @@
}
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;
@@ -2545,7 +2747,6 @@
{
int i;
ssize_t ret;
- int length = strlen(key + store->baselen + 1);
const char *quote = "";
struct strbuf sb = STRBUF_INIT;
@@ -2564,8 +2765,7 @@
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]) {
@@ -2697,12 +2897,12 @@
/*
* If value==NULL, unset in (remove from) config,
- * if value_regex!=NULL, disregard key/value pairs where value does not match.
- * if value_regex==CONFIG_REGEX_NONE, do not match any existing values
+ * if value_pattern!=NULL, disregard key/value pairs where value does not match.
+ * if value_pattern==CONFIG_REGEX_NONE, do not match any existing values
* (only add a new one)
- * if multi_replace==0, 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.
+ * if flags contains the CONFIG_FLAGS_MULTI_REPLACE flag, all matching
+ * key/values are removed before a single new pair is written. If the
+ * flag is not present, then replace only the first match.
*
* Returns 0 on success.
*
@@ -2722,8 +2922,8 @@
*/
int git_config_set_multivar_in_file_gently(const char *config_filename,
const char *key, const char *value,
- const char *value_regex,
- int multi_replace)
+ const char *value_pattern,
+ unsigned flags)
{
int fd = -1, in_fd = -1;
int ret;
@@ -2740,7 +2940,7 @@
if (ret)
goto out_free;
- store.multi_replace = multi_replace;
+ store.multi_replace = (flags & CONFIG_FLAGS_MULTI_REPLACE) != 0;
if (!config_filename)
config_filename = filename_buf = git_pathdup("config");
@@ -2783,22 +2983,24 @@
int i, new_line = 0;
struct config_options opts;
- if (value_regex == NULL)
- store.value_regex = NULL;
- else if (value_regex == CONFIG_REGEX_NONE)
- store.value_regex = CONFIG_REGEX_NONE;
+ if (value_pattern == NULL)
+ store.value_pattern = NULL;
+ else if (value_pattern == CONFIG_REGEX_NONE)
+ store.value_pattern = CONFIG_REGEX_NONE;
+ else if (flags & CONFIG_FLAGS_FIXED_VALUE)
+ store.fixed_value = value_pattern;
else {
- if (value_regex[0] == '!') {
+ if (value_pattern[0] == '!') {
store.do_not_match = 1;
- value_regex++;
+ value_pattern++;
} else
store.do_not_match = 0;
- store.value_regex = (regex_t*)xmalloc(sizeof(regex_t));
- if (regcomp(store.value_regex, value_regex,
+ store.value_pattern = (regex_t*)xmalloc(sizeof(regex_t));
+ if (regcomp(store.value_pattern, value_pattern,
REG_EXTENDED)) {
- error(_("invalid pattern: %s"), value_regex);
- FREE_AND_NULL(store.value_regex);
+ error(_("invalid pattern: %s"), value_pattern);
+ FREE_AND_NULL(store.value_pattern);
ret = CONFIG_INVALID_PATTERN;
goto out_free;
}
@@ -2829,7 +3031,7 @@
/* if nothing to unset, or too many matches, error out */
if ((store.seen_nr == 0 && value == NULL) ||
- (store.seen_nr > 1 && multi_replace == 0)) {
+ (store.seen_nr > 1 && !store.multi_replace)) {
ret = CONFIG_NOTHING_SET;
goto out_free;
}
@@ -2968,10 +3170,10 @@
void git_config_set_multivar_in_file(const char *config_filename,
const char *key, const char *value,
- const char *value_regex, int multi_replace)
+ const char *value_pattern, unsigned flags)
{
if (!git_config_set_multivar_in_file_gently(config_filename, key, value,
- value_regex, multi_replace))
+ value_pattern, flags))
return;
if (value)
die(_("could not set '%s' to '%s'"), key, value);
@@ -2980,17 +3182,17 @@
}
int git_config_set_multivar_gently(const char *key, const char *value,
- const char *value_regex, int multi_replace)
+ const char *value_pattern, unsigned flags)
{
- return git_config_set_multivar_in_file_gently(NULL, key, value, value_regex,
- multi_replace);
+ return git_config_set_multivar_in_file_gently(NULL, key, value, value_pattern,
+ flags);
}
void git_config_set_multivar(const char *key, const char *value,
- const char *value_regex, int multi_replace)
+ const char *value_pattern, unsigned flags)
{
- git_config_set_multivar_in_file(NULL, key, value, value_regex,
- multi_replace);
+ git_config_set_multivar_in_file(NULL, key, value, value_pattern,
+ flags);
}
static int section_name_match (const char *buf, const char *name)
@@ -3099,7 +3301,7 @@
}
while (fgets(buf, sizeof(buf), config_file)) {
- int i;
+ unsigned i;
int length;
int is_section = 0;
char *output = buf;
@@ -3238,7 +3440,7 @@
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;
diff --git a/config.h b/config.h
index 9b3773f..19a9adb 100644
--- a/config.h
+++ b/config.h
@@ -138,6 +138,7 @@
int git_config_from_blob_oid(config_fn_t fn, const char *name,
const struct object_id *oid, void *data);
void git_config_push_parameter(const char *text);
+void git_config_push_env(const char *spec);
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);
@@ -254,11 +255,31 @@
*/
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);
+
+/*
+ * The following macros specify flag bits that alter the behavior
+ * of the git_config_set_multivar*() methods.
+ */
+
+/*
+ * When CONFIG_FLAGS_MULTI_REPLACE is specified, all matching key/values
+ * are removed before a single new pair is written. If the flag is not
+ * present, then set operations replace only the first match.
+ */
+#define CONFIG_FLAGS_MULTI_REPLACE (1 << 0)
+
+/*
+ * When CONFIG_FLAGS_FIXED_VALUE is specified, match key/value pairs
+ * by string comparison (not regex match) to the provided value_pattern
+ * parameter.
+ */
+#define CONFIG_FLAGS_FIXED_VALUE (1 << 1)
+
+int git_config_set_multivar_gently(const char *, const char *, const char *, unsigned);
+void git_config_set_multivar(const char *, const char *, const char *, unsigned);
+int git_config_set_multivar_in_file_gently(const char *, const char *, const char *, const char *, unsigned);
/**
* takes four parameters:
@@ -276,13 +297,15 @@
* - 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.
+ * - a flags value with bits corresponding to the CONFIG_FLAG_* macros.
*
* It returns 0 on success.
*/
-void git_config_set_multivar_in_file(const char *, const char *, const char *, const char *, int);
+void git_config_set_multivar_in_file(const char *config_filename,
+ const char *key,
+ const char *value,
+ const char *value_pattern,
+ unsigned flags);
/**
* rename or remove sections in the config file
@@ -359,7 +382,7 @@
*/
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);
/**
@@ -458,8 +481,8 @@
*/
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);
@@ -474,10 +497,10 @@
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,
@@ -529,13 +552,14 @@
* error message and returns -1. When the configuration variable `key` is
* not found, returns 1 without touching `dest`.
*/
-int git_config_get_string_const(const char *key, const char **dest);
+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.
+ * 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(const char *key, char **dest);
+int git_config_get_string_tmp(const char *key, const char **dest);
/**
* Finds and parses the value to an integer for the configuration variable
diff --git a/config.mak.dev b/config.mak.dev
index 89b218d..022fb58 100644
--- a/config.mak.dev
+++ b/config.mak.dev
@@ -1,5 +1,6 @@
ifeq ($(filter no-error,$(DEVOPTS)),)
DEVELOPER_CFLAGS += -Werror
+SPARSE_FLAGS += -Wsparse-error
endif
ifneq ($(filter pedantic,$(DEVOPTS)),)
DEVELOPER_CFLAGS += -pedantic
@@ -15,6 +16,7 @@
DEVELOPER_CFLAGS += -Wstrict-prototypes
DEVELOPER_CFLAGS += -Wunused
DEVELOPER_CFLAGS += -Wvla
+DEVELOPER_CFLAGS += -fno-common
ifndef COMPILER_FEATURES
COMPILER_FEATURES := $(shell ./detect-compiler $(CC))
@@ -45,3 +47,5 @@
DEVELOPER_CFLAGS += -Wno-uninitialized
endif
endif
+
+GIT_TEST_PERL_FATAL_WARNINGS = YesPlease
diff --git a/config.mak.uname b/config.mak.uname
index 0ab8e00..d204c20 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -124,6 +124,9 @@
ifeq ($(shell test "`expr "$(uname_R)" : '\([0-9][0-9]*\)\.'`" -ge 11 && echo 1),1)
HAVE_GETDELIM = YesPlease
endif
+ ifeq ($(shell test "`expr "$(uname_R)" : '\([0-9][0-9]*\)\.'`" -ge 20 && echo 1),1)
+ OPEN_RETURNS_EINTR = UnfortunatelyYes
+ endif
NO_MEMMEM = YesPlease
USE_ST_TIMESPEC = YesPlease
HAVE_DEV_TTY = YesPlease
@@ -133,8 +136,17 @@
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 +249,6 @@
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 +319,7 @@
NO_STRLCPY = YesPlease
HAVE_PATHS_H = YesPlease
LIBC_CONTAINS_LIBINTL = YesPlease
+ FREAD_READS_DIRECTORIES = UnfortunatelyYes
endif
ifeq ($(uname_S),IRIX)
NO_SETENV = YesPlease
@@ -532,11 +544,6 @@
# removing the directory at OS releases J06.21 and L17.02.
# Default to the older rm until those two releases are deprecated.
RM = /bin/rm -f
- # As detected by './configure'.
- # Missdetected, hence commented out, see below.
- #NO_CURL = YesPlease
- # Added manually, see above.
- NEEDS_SSL_WITH_CURL = YesPlease
NEEDS_CRYPTO_WITH_SSL = YesPlease
HAVE_DEV_TTY = YesPlease
HAVE_LIBCHARSET_H = YesPlease
@@ -570,10 +577,6 @@
NO_MMAP = YesPlease
NO_POLL = YesPlease
NO_INTPTR_T = UnfortunatelyYes
- # Bug report 10-120822-4477 submitted to HP NonStop development.
- MKDIR_WO_TRAILING_SLASH = YesPlease
- # RFE 10-120912-4693 submitted to HP NonStop development.
- NO_SETITIMER = UnfortunatelyYes
SANE_TOOL_PATH = /usr/coreutils/bin:/usr/local/bin
SHELL_PATH = /usr/coreutils/bin/bash
endif
@@ -627,7 +630,6 @@
prefix =
INSTALL = /bin/install
EXTLIBS += /mingw/lib/libz.a
- NO_R_TO_GCC_LINKER = YesPlease
INTERNAL_QSORT = YesPlease
HAVE_LIBCHARSET_H = YesPlease
NO_GETTEXT = YesPlease
@@ -660,13 +662,11 @@
-fstack-protector-strong
EXTLIBS += -lntdll
INSTALL = /bin/install
- NO_R_TO_GCC_LINKER = YesPlease
INTERNAL_QSORT = YesPlease
HAVE_LIBCHARSET_H = YesPlease
NO_GETTEXT =
USE_GETTEXT_SCHEME = fallthrough
USE_LIBPCRE= YesPlease
- NO_LIBPCRE1_JIT = UnfortunatelyYes
NO_CURL =
USE_NED_ALLOCATOR = YesPlease
else
@@ -686,7 +686,6 @@
NO_MKDTEMP = YesPlease
NO_NSEC = YesPlease
NO_PTHREADS = YesPlease
- NO_R_TO_GCC_LINKER = YesPlease
NO_STRCASESTR = YesPlease
NO_STRLCPY = YesPlease
endif
@@ -721,9 +720,9 @@
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
diff --git a/configure.ac b/configure.ac
index 66aedb9..031e8d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -252,16 +252,17 @@
# Define USE_LIBPCRE if you have and want to use libpcre. Various
# commands such as log and grep offer runtime options to use
# Perl-compatible regular expressions instead of standard or extended
-# POSIX regular expressions.
-#
-# USE_LIBPCRE is a synonym for USE_LIBPCRE2, define USE_LIBPCRE1
-# instead if you'd like to use the legacy version 1 of the PCRE
-# library. Support for version 1 will likely be removed in some future
-# release of Git, as upstream has all but abandoned it.
+# POSIX regular expressions. Only libpcre version 2 is supported.
#
# Define LIBPCREDIR=/foo/bar if your PCRE header and library files are in
# /foo/bar/include and /foo/bar/lib directories.
#
+
+AC_ARG_WITH(libpcre1,
+AS_HELP_STRING([--with-libpcre1],[DEPRECATED]),
+ AC_MSG_ERROR([support for --with-libpcre1 has been removed. Use --with-libpcre2!])
+ )
+
AC_ARG_WITH(libpcre,
AS_HELP_STRING([--with-libpcre],[synonym for --with-libpcre2]),
if test "$withval" = "no"; then
@@ -277,22 +278,6 @@
GIT_CONF_SUBST([LIBPCREDIR])
fi)
-AC_ARG_WITH(libpcre1,
-AS_HELP_STRING([--with-libpcre1],[support Perl-compatible regexes via libpcre1 (default is NO)])
-AS_HELP_STRING([], [ARG can be also prefix for libpcre library and headers]),
- if test "$withval" = "no"; then
- USE_LIBPCRE1=
- elif test "$withval" = "yes"; then
- USE_LIBPCRE1=YesPlease
- else
- USE_LIBPCRE1=YesPlease
- LIBPCREDIR=$withval
- AC_MSG_NOTICE([Setting LIBPCREDIR to $LIBPCREDIR])
- dnl USE_LIBPCRE1 can still be modified below, so don't substitute
- dnl it yet.
- GIT_CONF_SUBST([LIBPCREDIR])
- fi)
-
AC_ARG_WITH(libpcre2,
AS_HELP_STRING([--with-libpcre2],[support Perl-compatible regexes via libpcre2 (default is NO)])
AS_HELP_STRING([], [ARG can be also prefix for libpcre library and headers]),
@@ -300,10 +285,6 @@
AC_MSG_ERROR([Only supply one of --with-libpcre or its synonym --with-libpcre2!])
fi
- if test -n "$USE_LIBPCRE1"; then
- AC_MSG_ERROR([Only supply one of --with-libpcre1 or --with-libpcre2!])
- fi
-
if test "$withval" = "no"; then
USE_LIBPCRE2=
elif test "$withval" = "yes"; then
@@ -554,25 +535,9 @@
GIT_CONF_SUBST([NO_OPENSSL])
#
-# Handle the USE_LIBPCRE1 and USE_LIBPCRE2 options potentially set
-# above.
+# Handle the USE_LIBPCRE options potentially set above.
#
-if test -n "$USE_LIBPCRE1"; then
-
-GIT_STASH_FLAGS($LIBPCREDIR)
-
-AC_CHECK_LIB([pcre], [pcre_version],
-[USE_LIBPCRE1=YesPlease],
-[USE_LIBPCRE1=])
-
-GIT_UNSTASH_FLAGS($LIBPCREDIR)
-
-GIT_CONF_SUBST([USE_LIBPCRE1])
-
-fi
-
-
if test -n "$USE_LIBPCRE2"; then
GIT_STASH_FLAGS($LIBPCREDIR)
diff --git a/connect.c b/connect.c
index b6451ab..40b5c15 100644
--- a/connect.c
+++ b/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 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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,8 @@
}
/* 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,
+ char **unborn_head_target)
{
int ret = 1;
int i = 0;
@@ -350,6 +385,7 @@
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 +398,26 @@
goto out;
}
- if (parse_oid_hex(line_sections.items[i++].string, &old_oid, &end) ||
+ if (!strcmp("unborn", line_sections.items[i].string)) {
+ i++;
+ if (unborn_head_target &&
+ !strcmp("HEAD", line_sections.items[i++].string)) {
+ /*
+ * Look for the symref target (if any). If found,
+ * return it to the caller.
+ */
+ for (; i < line_sections.nr; i++) {
+ const char *arg = line_sections.items[i].string;
+
+ if (skip_prefix(arg, "symref-target:", &arg)) {
+ *unborn_head_target = xstrdup(arg);
+ break;
+ }
+ }
+ }
+ goto out;
+ }
+ if (parse_oid_hex_algop(line_sections.items[i++].string, &old_oid, &end, reader->hash_algo) ||
*end) {
ret = 0;
goto out;
@@ -370,7 +425,7 @@
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 +438,8 @@
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 +447,8 @@
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 +461,28 @@
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)
+ struct transport_ls_refs_options *transport_options,
+ const struct string_list *server_options,
+ int stateless_rpc)
{
int i;
+ const char *hash_name;
+ struct strvec *ref_prefixes = transport_options ?
+ &transport_options->ref_prefixes : NULL;
+ char **unborn_head_target = transport_options ?
+ &transport_options->unborn_head_target : NULL;
*list = NULL;
if (server_supports_v2("ls-refs", 1))
@@ -418,6 +491,16 @@
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 +512,30 @@
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++) {
+ if (server_supports_feature("ls-refs", "unborn", 0))
+ packet_write_fmt(fd_out, "unborn\n");
+ 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, unborn_head_target))
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 +543,8 @@
return NULL;
len = strlen(feature);
+ if (offset)
+ feature_list += *offset;
while (*feature_list) {
const char *found = strstr(feature_list, feature);
if (!found)
@@ -469,9 +559,14 @@
}
/* 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 +579,41 @@
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)
@@ -848,9 +970,9 @@
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))
@@ -956,7 +1078,7 @@
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;
@@ -975,7 +1097,7 @@
{
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"))
@@ -1064,6 +1186,8 @@
target_host = xstrdup(hostandport);
transport_check_allowed("git");
+ if (strchr(target_host, '\n') || strchr(path, '\n'))
+ die(_("newline is forbidden in git:// hosts and repo paths"));
/*
* These underlying connection commands die() if they
@@ -1103,16 +1227,16 @@
* 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) {
@@ -1125,7 +1249,7 @@
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) {
@@ -1137,12 +1261,12 @@
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) {
@@ -1151,15 +1275,15 @@
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);
}
}
@@ -1197,18 +1321,18 @@
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);
}
/*
@@ -1269,7 +1393,7 @@
/* 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;
@@ -1301,11 +1425,12 @@
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/connect.h b/connect.h
index 5f2382e..c53586e 100644
--- a/connect.h
+++ b/connect.h
@@ -18,8 +18,15 @@
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/connected.c b/connected.c
index 7e9bd1b..b18299f 100644
--- a/connected.c
+++ b/connected.c
@@ -22,14 +22,13 @@
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;
struct transport *transport;
size_t base_len;
- const unsigned hexsz = the_hash_algo->hexsz;
if (!opt)
opt = &defaults;
@@ -43,16 +42,18 @@
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_are_promisor_objects_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
@@ -61,7 +62,11 @@
* object is a promisor object. Instead, just make sure we
* 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 {
struct packed_git *p;
@@ -71,31 +76,36 @@
if (find_pack_entry_one(oid.hash, p))
goto promisor_pack_found;
}
- return 1;
+ /*
+ * 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");
+ strvec_push(&rev_list.args,"rev-list");
+ strvec_push(&rev_list.args, "--objects");
+ strvec_push(&rev_list.args, "--stdin");
if (has_promisor_remote())
- argv_array_push(&rev_list.args, "--exclude-promisor-objects");
+ 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;
@@ -111,7 +121,8 @@
sigchain_push(SIGPIPE, SIG_IGN);
- commit[hexsz] = '\n';
+ rev_list_in = xfdopen(rev_list.in, "w");
+
do {
/*
* If index-pack already checked that:
@@ -124,16 +135,17 @@
if (new_pack && find_pack_entry_one(oid.hash, new_pack))
continue;
- memcpy(commit, oid_to_hex(&oid), hexsz);
- if (write_in_full(rev_list.in, commit, hexsz + 1) < 0) {
- 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/connected.h b/connected.h
index eba5c26..8d5a6b3 100644
--- a/connected.h
+++ b/connected.h
@@ -46,15 +46,6 @@
* during a fetch.
*/
unsigned is_deepening_fetch : 1;
-
- /*
- * If non-zero, only check that the top-level objects referenced by the
- * wanted refs (passed in as cb_data) are promisor objects. This is
- * useful for partial clones, where enumerating and excluding all
- * promisor objects is very slow and the commit-walk itself becomes a
- * no-op.
- */
- unsigned check_refs_are_promisor_objects_only : 1;
};
#define CHECK_CONNECTED_INIT { 0 }
diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
new file mode 100644
index 0000000..ac3dbc0
--- /dev/null
+++ b/contrib/buildsystems/CMakeLists.txt
@@ -0,0 +1,991 @@
+#
+# 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()
+
+macro(parse_makefile_for_executables list_var regex)
+ file(STRINGS ${CMAKE_SOURCE_DIR}/Makefile ${list_var} REGEX "^${regex} \\+= git-(.*)")
+ string(REPLACE "${regex} +=" "" ${list_var} ${${list_var}})
+ string(STRIP ${${list_var}} ${list_var}) #remove trailing/leading whitespaces
+ string(REPLACE "git-" "" ${list_var} ${${list_var}}) #strip `git-` prefix
+ string(REPLACE "\$X" ";" ${list_var} ${${list_var}}) #strip $X, ; 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()
+
+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()
+
+parse_makefile_for_executables(git_builtin_extra "BUILT_INS")
+
+#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_LIBPCRE2 )
+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 "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/contrib/buildsystems/Generators/Vcxproj.pm b/contrib/buildsystems/Generators/Vcxproj.pm
index 5c666f9..d258445 100644
--- a/contrib/buildsystems/Generators/Vcxproj.pm
+++ b/contrib/buildsystems/Generators/Vcxproj.pm
@@ -80,6 +80,7 @@
$libs_release = join(";", sort(grep /^(?!libgit\.lib|xdiff\/lib\.lib|vcs-svn\/lib\.lib)/, @{$$build_structure{"$prefix${name}_LIBS"}}));
$libs_debug = $libs_release;
$libs_debug =~ s/zlib\.lib/zlibd\.lib/g;
+ $libs_debug =~ s/libexpat\.lib/libexpatd\.lib/g;
$libs_debug =~ s/libcurl\.lib/libcurl-d\.lib/g;
}
diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl
index 0709785..ed6c459 100755
--- a/contrib/buildsystems/engine.pl
+++ b/contrib/buildsystems/engine.pl
@@ -349,9 +349,9 @@
} 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");
+ push(@libs, "iconv.lib");
} elsif ($part =~ /^[-\/]/) {
push(@lflags, $part);
} elsif ($part =~ /\.(a|lib)$/) {
diff --git a/contrib/coccinelle/array.cocci b/contrib/coccinelle/array.cocci
index 46b8d2e..9a4f00c 100644
--- a/contrib/coccinelle/array.cocci
+++ b/contrib/coccinelle/array.cocci
@@ -88,3 +88,11 @@
@@
- ptr = xmalloc((n) * sizeof(T));
+ ALLOC_ARRAY(ptr, n);
+
+@@
+type T;
+T *ptr;
+expression n != 1;
+@@
+- ptr = xcalloc(n, \( sizeof(*ptr) \| sizeof(T) \) )
++ CALLOC_ARRAY(ptr, n)
diff --git a/contrib/coccinelle/commit.cocci b/contrib/coccinelle/commit.cocci
index 778e470..af6dd4c 100644
--- a/contrib/coccinelle/commit.cocci
+++ b/contrib/coccinelle/commit.cocci
@@ -32,3 +32,21 @@
- 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/contrib/coccinelle/xcalloc.cocci b/contrib/coccinelle/xcalloc.cocci
new file mode 100644
index 0000000..c291011
--- /dev/null
+++ b/contrib/coccinelle/xcalloc.cocci
@@ -0,0 +1,10 @@
+@@
+type T;
+T *ptr;
+expression n;
+@@
+ xcalloc(
++ n,
+ \( sizeof(T) \| sizeof(*ptr) \)
+- , n
+ )
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index c21786f..7dc6cd8 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -29,6 +29,15 @@
# tell the completion to use commit completion. This also works with aliases
# of form "!sh -c '...'". For example, "!sh -c ': git commit ; ... '".
#
+# If you have a command that is not part of git, but you would still
+# like completion, you can use __git_complete:
+#
+# __git_complete gl git_log
+#
+# Or if it's a main command (i.e. git or gitk):
+#
+# __git_complete gk gitk
+#
# Compatible with bash 3.2.57.
#
# You can set the following environment variables to influence the behavior of
@@ -39,6 +48,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 +64,7 @@
# 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 +315,19 @@
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[@]}
@@ -373,7 +400,7 @@
# 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 +418,23 @@
# 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-}"
if [ -z "$options" ]; then
+ local completion_helper
+ if [ "$GIT_COMPLETION_SHOW_ALL" = "1" ]; then
+ completion_helper="--git-completion-helper-all"
+ else
+ completion_helper="--git-completion-helper"
+ fi
# 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 +537,7 @@
{
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
}
@@ -611,6 +644,19 @@
"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 +667,26 @@
"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 +762,7 @@
__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 +809,51 @@
# 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)
@@ -1047,26 +1129,44 @@
# __git_aliased_command requires 1 argument
__git_aliased_command ()
{
- local word cmdline=$(__git config --get "alias.$1")
- for word in $cmdline; do
- case "$word" in
- \!gitk|gitk)
- echo "gitk"
+ local cur=$1 last list word cmdline
+
+ while [[ -n "$cur" ]]; do
+ if [[ "$list" == *" $cur "* ]]; then
+ # loop detected
return
- ;;
- \!*) : shell command alias ;;
- -*) : option ;;
- *=*) : setting env ;;
- git) : git itself ;;
- \(\)) : skip parens of shell function definition ;;
- {) : skip start of shell helper function ;;
- :) : skip null command ;;
- \'*) : skip opening quote after sh -c ;;
- *)
- echo "$word"
- return
- esac
+ fi
+
+ cmdline=$(__git config --get "alias.$cur")
+ list=" $cur $list"
+ last=$cur
+ cur=
+
+ for word in $cmdline; do
+ case "$word" in
+ \!gitk|gitk)
+ cur="gitk"
+ break
+ ;;
+ \!*) : shell command alias ;;
+ -*) : option ;;
+ *=*) : setting env ;;
+ git) : git itself ;;
+ \(\)) : skip parens of shell function definition ;;
+ {) : skip start of shell helper function ;;
+ :) : skip null command ;;
+ \'*) : skip opening quote after sh -c ;;
+ *)
+ cur="$word"
+ break
+ esac
+ done
done
+
+ cur=$last
+ if [[ "$cur" != "$1" ]]; then
+ echo "$cur"
+ fi
}
# Check whether one of the given words is present on the command line,
@@ -1090,7 +1190,7 @@
while [ $c -lt $cword ]; do
for word in $wordlist; do
if [ "$word" = "${words[c]}" ]; then
- if [ -n "$show_idx" ]; then
+ if [ -n "${show_idx-}" ]; then
echo "$c $word"
else
echo "$word"
@@ -1102,6 +1202,40 @@
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
@@ -1313,8 +1447,10 @@
while [ $c -lt $cword ]; do
i="${words[c]}"
case "$i" in
- -d|--delete|-m|--move) only_local_ref="y" ;;
- -r|--remotes) has_r="y" ;;
+ -d|-D|--delete|-m|-M|--move|-c|-C|--copy)
+ only_local_ref="y" ;;
+ -r|--remotes)
+ has_r="y" ;;
esac
((c++))
done
@@ -1356,10 +1492,73 @@
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 decreasing priority order:
+# - the last provided of "--guess" or "--no-guess" explicitly enable or
+# disable completion of DWIM logic respectively.
+# - If checkout.guess is false, disable completion of DWIM logic.
+# - If the --no-track option is provided, take this as a hint to disable the
+# DWIM completion logic
+# - If GIT_COMPLETION_CHECKOUT_NO_GUESS is set, disable the DWIM completion
+# logic, as requested by the user.
+# - 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/checkout.guess
+ if [ -n "$(__git_find_on_cmdline "--no-track")" ]; then
+ dwim_opt=""
+ fi
+
+ # checkout.guess = false disables DWIM, but with lower priority than
+ # --guess/--no-guess
+ if [ "$(__git config --type=bool checkout.guess)" = "false" ]; 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=}"
@@ -1368,14 +1567,21 @@
__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
}
@@ -1517,8 +1723,13 @@
--submodule --submodule= --ignore-submodules
--indent-heuristic --no-indent-heuristic
--textconv --no-textconv
+ --patch --no-patch
"
+__git_diff_difftool_options="--cached --staged --pickaxe-all --pickaxe-regex
+ --base --ours --theirs --no-index --relative --merge-base
+ $__git_diff_common_options"
+
_git_diff ()
{
__git_has_doubledash && return
@@ -1541,10 +1752,7 @@
return
;;
--*)
- __gitcomp "--cached --staged --pickaxe-all --pickaxe-regex
- --base --ours --theirs --no-index
- $__git_diff_common_options
- "
+ __gitcomp "$__git_diff_difftool_options"
return
;;
esac
@@ -1552,8 +1760,8 @@
}
__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 ()
@@ -1566,11 +1774,7 @@
return
;;
--*)
- __gitcomp_builtin difftool "$__git_diff_common_options
- --base --cached --ours --theirs
- --pickaxe-all --pickaxe-regex
- --relative --staged
- "
+ __gitcomp_builtin difftool "$__git_diff_difftool_options"
return
;;
esac
@@ -1612,6 +1816,10 @@
" "" "${cur##--thread=}"
return
;;
+ --base=*|--interdiff=*|--range-diff=*)
+ __git_complete_refs --cur="${cur#--*=}"
+ return
+ ;;
--*)
__gitcomp_builtin format-patch "$__git_format_patch_extra_options"
return
@@ -1632,7 +1840,7 @@
_git_gitk ()
{
- _gitk
+ __gitk_main
}
# Lists matching symbol names from a tag (as in ctags) file.
@@ -1856,7 +2064,6 @@
--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
@@ -2215,6 +2422,22 @@
_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=}"
@@ -2223,29 +2446,26 @@
__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=''
+ # 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
- # 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
+
+ # 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
- # --guess --detach is invalid combination, no
- # dwim will be done when --detach is specified
- track_opt=
- fi
- if [ $only_local_ref = y -a -z "$track_opt" ]; then
- __gitcomp_direct "$(__git_heads "" "$cur" " ")"
- else
- __git_complete_refs $track_opt
+ __git_complete_refs $dwim_opt --mode="heads"
fi
;;
esac
@@ -2652,6 +2872,13 @@
_git_restore ()
{
+ case "$prev" in
+ -s)
+ __git_complete_refs
+ return
+ ;;
+ esac
+
case "$cur" in
--conflict=*)
__gitcomp "diff3 merge" "" "${cur##--conflict=}"
@@ -2732,9 +2959,17 @@
__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 --no-abbrev-commit
- --oneline --show-signature --patch
+ --oneline --show-signature
--expand-tabs --expand-tabs= --no-expand-tabs
$__git_diff_common_options
"
@@ -2781,7 +3016,7 @@
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
@@ -2817,7 +3052,10 @@
list,--*)
__gitcomp "--name-status --oneline --patch-with-stat"
;;
- show,--*|branch,--*)
+ show,--*)
+ __gitcomp "$__git_diff_common_options"
+ ;;
+ branch,--*)
;;
branch,*)
if [ $cword -eq 3 ]; then
@@ -3131,15 +3369,19 @@
esac
}
+__git_have_func () {
+ declare -f -- "$1" >/dev/null 2>&1
+}
+
__git_complete_command () {
local command="$1"
local completion_func="_git_${command//-/_}"
- if ! declare -f $completion_func >/dev/null 2>/dev/null &&
- declare -f _completion_loader >/dev/null 2>/dev/null
+ if ! __git_have_func $completion_func &&
+ __git_have_func _completion_loader
then
_completion_loader "git-$command"
fi
- if declare -f $completion_func >/dev/null 2>/dev/null
+ if __git_have_func $completion_func
then
$completion_func
return 0
@@ -3175,7 +3417,7 @@
((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
@@ -3210,7 +3452,7 @@
"
;;
*)
- if test -n "$GIT_TESTING_PORCELAIN_COMMAND_LIST"
+ if test -n "${GIT_TESTING_PORCELAIN_COMMAND_LIST-}"
then
__gitcomp "$GIT_TESTING_PORCELAIN_COMMAND_LIST"
else
@@ -3254,88 +3496,8 @@
__git_complete_revlist
}
-if [[ -n ${ZSH_VERSION-} ]] &&
- # Don't define these functions when sourced from 'git-completion.zsh',
- # it has its own implementations.
- [[ -z ${GIT_SOURCING_ZSH_COMPLETION-} ]]; then
- echo "WARNING: this script is deprecated, please see git-completion.zsh" 1>&2
-
- autoload -U +X compinit && compinit
-
- __gitcomp ()
- {
- emulate -L zsh
-
- local cur_="${3-$cur}"
-
- case "$cur_" in
- --*=)
- ;;
- *)
- local c IFS=$' \t\n'
- local -a array
- for c in ${=1}; do
- c="$c${4-}"
- case $c in
- --*=*|*.) ;;
- *) c="$c " ;;
- esac
- array[${#array[@]}+1]="$c"
- done
- compset -P '*[=:]'
- compadd -Q -S '' -p "${2-}" -a -- array && _ret=0
- ;;
- esac
- }
-
- __gitcomp_direct ()
- {
- emulate -L zsh
-
- local IFS=$'\n'
- compset -P '*[=:]'
- compadd -Q -- ${=1} && _ret=0
- }
-
- __gitcomp_nl ()
- {
- emulate -L zsh
-
- local IFS=$'\n'
- compset -P '*[=:]'
- compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
- }
-
- __gitcomp_file_direct ()
- {
- emulate -L zsh
-
- local IFS=$'\n'
- compset -P '*[=:]'
- compadd -f -- ${=1} && _ret=0
- }
-
- __gitcomp_file ()
- {
- emulate -L zsh
-
- local IFS=$'\n'
- compset -P '*[=:]'
- compadd -p "${2-}" -f -- ${=1} && _ret=0
- }
-
- _git ()
- {
- local _ret=1 cur cword prev
- cur=${words[CURRENT]}
- prev=${words[CURRENT-1]}
- let cword=CURRENT-1
- emulate ksh -c __${service}_main
- let _ret && _default && _ret=0
- return _ret
- }
-
- compdef _git git gitk
+if [[ -n ${ZSH_VERSION-} && -z ${GIT_SOURCING_ZSH_COMPLETION-} ]]; then
+ echo "ERROR: this script is obsolete, please see git-completion.zsh" 1>&2
return
fi
@@ -3346,10 +3508,7 @@
$1
}
-# Setup completion for certain functions defined above by setting common
-# variables and workarounds.
-# This is NOT a public function; use at your own risk.
-__git_complete ()
+___git_complete ()
{
local wrapper="__git_wrap${2}"
eval "$wrapper () { __git_func_wrap $2 ; }"
@@ -3357,25 +3516,33 @@
|| complete -o default -o nospace -F $wrapper $1
}
-# wrapper for backwards compatibility
-_git ()
+# Setup the completion for git commands
+# 1: command or alias
+# 2: function to call (e.g. `git`, `gitk`, `git_fetch`)
+__git_complete ()
{
- __git_wrap__git_main
+ local func
+
+ if __git_have_func $2; then
+ func=$2
+ elif __git_have_func __$2_main; then
+ func=__$2_main
+ elif __git_have_func _$2; then
+ func=_$2
+ else
+ echo "ERROR: could not find function '$2'" 1>&2
+ return 1
+ fi
+ ___git_complete $1 $func
}
-# wrapper for backwards compatibility
-_gitk ()
-{
- __git_wrap__gitk_main
-}
-
-__git_complete git __git_main
-__git_complete gitk __gitk_main
+___git_complete git __git_main
+___git_complete gitk __gitk_main
# The following are necessary only for Cygwin, and only are needed
# when the user has tab-completed the executable name and consequently
# included the '.exe' suffix.
#
-if [ Cygwin = "$(uname -o 2>/dev/null)" ]; then
-__git_complete git.exe __git_main
+if [ "$OSTYPE" = cygwin ]; then
+ ___git_complete git.exe __git_main
fi
diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh
index eef4eff..6c56296 100644
--- a/contrib/completion/git-completion.zsh
+++ b/contrib/completion/git-completion.zsh
@@ -2,26 +2,24 @@
# zsh completion wrapper for git
#
-# Copyright (c) 2012-2013 Felipe Contreras <felipe.contreras@gmail.com>
+# Copyright (c) 2012-2020 Felipe Contreras <felipe.contreras@gmail.com>
#
-# You need git's bash completion script installed somewhere, by default it
-# would be the location bash-completion uses.
+# The recommended way to install this script is to make a copy of it as a
+# file named '_git' inside any directory in your fpath.
#
-# If your script is somewhere else, you can configure it on your ~/.zshrc:
-#
-# zstyle ':completion:*:*:git:*' script ~/.git-completion.zsh
-#
-# The recommended way to install this script is to make a copy of it in
-# ~/.zsh/ directory as ~/.zsh/git-completion.zsh and then add the following
-# to your ~/.zshrc file:
+# For example, create a directory '~/.zsh/', copy this file to '~/.zsh/_git',
+# and then add the following to your ~/.zshrc file:
#
# fpath=(~/.zsh $fpath)
-
-complete ()
-{
- # do nothing
- return 0
-}
+#
+# You need git's bash completion script installed. By default bash-completion's
+# location will be used (e.g. pkg-config --variable=completionsdir bash-completion).
+#
+# If your bash completion script is somewhere else, you can specify the
+# location in your ~/.zshrc:
+#
+# zstyle ':completion:*:*:git:*' script ~/.git-completion.bash
+#
zstyle -T ':completion:*:*:git:*' tag-order && \
zstyle ':completion:*:*:git:*' tag-order 'common-commands'
@@ -29,18 +27,26 @@
zstyle -s ":completion:*:*:git:*" script script
if [ -z "$script" ]; then
local -a locations
- local e
+ local e bash_completion
+
+ bash_completion=$(pkg-config --variable=completionsdir bash-completion 2>/dev/null) ||
+ bash_completion='/usr/share/bash-completion/completions/'
+
locations=(
- $(dirname ${funcsourcetrace[1]%:*})/git-completion.bash
- '/etc/bash_completion.d/git' # fedora, old debian
- '/usr/share/bash-completion/completions/git' # arch, ubuntu, new debian
- '/usr/share/bash-completion/git' # gentoo
+ "$(dirname ${funcsourcetrace[1]%:*})"/git-completion.bash
+ "$HOME/.local/share/bash-completion/completions/git"
+ "$bash_completion/git"
+ '/etc/bash_completion.d/git' # old debian
)
for e in $locations; do
test -f $e && script="$e" && break
done
fi
+
+local old_complete="$functions[complete]"
+functions[complete]=:
GIT_SOURCING_ZSH_COMPLETION=y . "$script"
+functions[complete]="$old_complete"
__gitcomp ()
{
@@ -51,13 +57,35 @@
case "$cur_" in
--*=)
;;
+ --no-*)
+ local c IFS=$' \t\n'
+ local -a array
+ for c in ${=1}; do
+ if [[ $c == "--" ]]; then
+ continue
+ fi
+ c="$c${4-}"
+ case $c in
+ --*=|*.) ;;
+ *) c="$c " ;;
+ esac
+ array+=("$c")
+ done
+ compset -P '*[=:]'
+ compadd -Q -S '' -p "${2-}" -a -- array && _ret=0
+ ;;
*)
local c IFS=$' \t\n'
local -a array
for c in ${=1}; do
+ if [[ $c == "--" ]]; then
+ c="--no-...${4-}"
+ array+=("$c ")
+ break
+ fi
c="$c${4-}"
case $c in
- --*=*|*.) ;;
+ --*=|*.) ;;
*) c="$c " ;;
esac
array+=("$c")
@@ -72,44 +100,58 @@
{
emulate -L zsh
- local IFS=$'\n'
compset -P '*[=:]'
- compadd -Q -- ${=1} && _ret=0
+ compadd -Q -S '' -- ${(f)1} && _ret=0
}
__gitcomp_nl ()
{
emulate -L zsh
- local IFS=$'\n'
compset -P '*[=:]'
- compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
-}
-
-__gitcomp_nl_append ()
-{
- emulate -L zsh
-
- local IFS=$'\n'
- compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
-}
-
-__gitcomp_file_direct ()
-{
- emulate -L zsh
-
- local IFS=$'\n'
- compset -P '*[=:]'
- compadd -f -- ${=1} && _ret=0
+ compadd -Q -S "${4- }" -p "${2-}" -- ${(f)1} && _ret=0
}
__gitcomp_file ()
{
emulate -L zsh
- local IFS=$'\n'
compset -P '*[=:]'
- compadd -p "${2-}" -f -- ${=1} && _ret=0
+ compadd -f -p "${2-}" -- ${(f)1} && _ret=0
+}
+
+__gitcomp_direct_append ()
+{
+ __gitcomp_direct "$@"
+}
+
+__gitcomp_nl_append ()
+{
+ __gitcomp_nl "$@"
+}
+
+__gitcomp_file_direct ()
+{
+ __gitcomp_file "$1" ""
+}
+
+_git_zsh ()
+{
+ __gitcomp "v1.1"
+}
+
+__git_complete_command ()
+{
+ emulate -L zsh
+
+ local command="$1"
+ local completion_func="_git_${command//-/_}"
+ if (( $+functions[$completion_func] )); then
+ emulate ksh -c $completion_func
+ return 0
+ else
+ return 1
+ fi
}
__git_zsh_bash_func ()
@@ -118,14 +160,12 @@
local command=$1
- local completion_func="_git_${command//-/_}"
- declare -f $completion_func >/dev/null && $completion_func && return
+ __git_complete_command "$command" && return
local expansion=$(__git_aliased_command "$command")
if [ -n "$expansion" ]; then
words[1]=$expansion
- completion_func="_git_${expansion//-/_}"
- declare -f $completion_func >/dev/null && $completion_func
+ __git_complete_command "$expansion"
fi
}
@@ -150,9 +190,11 @@
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
}
@@ -160,8 +202,9 @@
__git_zsh_cmd_alias ()
{
local -a list
- list=(${${${(0)"$(git config -z --get-regexp '^alias\.')"}#alias.}%$'\n'*})
- _describe -t alias-commands 'aliases' list $* && _ret=0
+ list=(${${(0)"$(git config -z --get-regexp '^alias\.*')"}#alias.})
+ list=(${(f)"$(printf "%s:alias for '%s'\n" ${(f@)list})"})
+ _describe -t alias-commands 'aliases' list && _ret=0
}
__git_zsh_cmd_all ()
@@ -199,10 +242,13 @@
case $state in
(command)
- _alternative \
- 'alias-commands:alias:__git_zsh_cmd_alias' \
- 'common-commands:common:__git_zsh_cmd_common' \
- 'all-commands:all:__git_zsh_cmd_all' && _ret=0
+ _tags common-commands alias-commands all-commands
+ while _tags; do
+ _requested common-commands && __git_zsh_cmd_common
+ _requested alias-commands && __git_zsh_cmd_alias
+ _requested all-commands && __git_zsh_cmd_all
+ let _ret || break
+ done
;;
(arg)
local command="${words[1]}" __git_dir
@@ -233,8 +279,12 @@
if (( $+functions[__${service}_zsh_main] )); then
__${service}_zsh_main
- else
+ elif (( $+functions[__${service}_main] )); then
emulate ksh -c __${service}_main
+ elif (( $+functions[_${service}] )); then
+ emulate ksh -c _${service}
+ elif (( $+functions[_${service//-/_}] )); then
+ emulate ksh -c _${service//-/_}
fi
let _ret && _default && _ret=0
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index 014cd7c..4640a15 100644
--- a/contrib/completion/git-prompt.sh
+++ b/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
@@ -88,7 +97,8 @@
# If you would like a colored hint about the current dirty state, set
# GIT_PS1_SHOWCOLORHINTS to a nonempty value. The colors are based on
# the colored output of "git status -sb" and are available only when
-# using __git_ps1 for PROMPT_COMMAND or precmd.
+# using __git_ps1 for PROMPT_COMMAND or precmd in Bash,
+# but always available in Zsh.
#
# If you would like __git_ps1 to do nothing in the case when the current
# directory is set up to be ignored by git, then set
@@ -128,6 +138,7 @@
done <<< "$output"
# parse configuration values
+ local option
for option in ${GIT_PS1_SHOWUPSTREAM}; do
case "$option" in
git|svn) upstream="$option" ;;
@@ -421,6 +432,13 @@
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=""
@@ -492,6 +510,7 @@
local i=""
local s=""
local u=""
+ local h=""
local c=""
local p=""
@@ -524,6 +543,11 @@
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
@@ -531,9 +555,11 @@
local z="${GIT_PS1_STATESEPARATOR-" "}"
- # NO color option unless in PROMPT_COMMAND mode
- if [ $pcmode = yes ] && [ -n "${GIT_PS1_SHOWCOLORHINTS-}" ]; then
- __git_ps1_colorize_gitstring
+ # NO color option unless in PROMPT_COMMAND mode or it's Zsh
+ if [ -n "${GIT_PS1_SHOWCOLORHINTS-}" ]; then
+ if [ $pcmode = yes ] || [ -n "${ZSH_VERSION-}" ]; then
+ __git_ps1_colorize_gitstring
+ fi
fi
b=${b##refs/heads/}
@@ -542,8 +568,8 @@
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/contrib/diff-highlight/DiffHighlight.pm b/contrib/diff-highlight/DiffHighlight.pm
index e258992..376f577 100644
--- a/contrib/diff-highlight/DiffHighlight.pm
+++ b/contrib/diff-highlight/DiffHighlight.pm
@@ -112,7 +112,7 @@
# 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/contrib/fast-import/import-tars.perl b/contrib/fast-import/import-tars.perl
index e800d9f..d50ce26 100755
--- a/contrib/fast-import/import-tars.perl
+++ b/contrib/fast-import/import-tars.perl
@@ -139,6 +139,8 @@
print FI "\n";
}
+ next if ($typeflag eq 'g'); # ignore global header
+
my $path;
if ($prefix) {
$path = "$prefix/$name";
diff --git a/contrib/git-resurrect.sh b/contrib/git-resurrect.sh
index 8c171dd..d843df3 100755
--- a/contrib/git-resurrect.sh
+++ b/contrib/git-resurrect.sh
@@ -27,7 +27,7 @@
search_reflog () {
sed -ne 's~^\([^ ]*\) .* checkout: moving from '"$1"' .*~\1~p' \
- < "$GIT_DIR"/logs/HEAD
+ < "$GIT_DIR"/logs/HEAD
}
search_reflog_merges () {
@@ -37,19 +37,18 @@
)
}
-_x40="[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]"
-_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
+oid_pattern=$(git hash-object --stdin </dev/null | sed -e 's/./[0-9a-f]/g')
search_merges () {
- git rev-list --all --grep="Merge branch '$1'" \
- --pretty=tformat:"%P %s" |
- sed -ne "/^$_x40 \($_x40\) Merge .*/ {s//\1/p;$early_exit}"
+ git rev-list --all --grep="Merge branch '$1'" \
+ --pretty=tformat:"%P %s" |
+ sed -ne "/^$oid_pattern \($oid_pattern\) Merge .*/ {s//\1/p;$early_exit}"
}
search_merge_targets () {
git rev-list --all --grep="Merge branch '[^']*' into $branch\$" \
--pretty=tformat:"%H %s" --all |
- sed -ne "/^\($_x40\) Merge .*/ {s//\1/p;$early_exit} "
+ sed -ne "/^\($oid_pattern\) Merge .*/ {s//\1/p;$early_exit} "
}
dry_run=
diff --git a/contrib/mw-to-git/git-mw.perl b/contrib/mw-to-git/git-mw.perl
index 28df3ee..eb52a53 100755
--- a/contrib/mw-to-git/git-mw.perl
+++ b/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/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl
index d8ff2e6..a562441 100755
--- a/contrib/mw-to-git/git-remote-mediawiki.perl
+++ b/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 @@
# 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");
+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("config --get remote.${remotename}.mwPassword");
-my $wiki_domain = run_git("config --get remote.${remotename}.mwDomain");
+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 @@
# 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 @@
# 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 @@
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 @@
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 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 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 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 @@
}
} 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 @@
# 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 @@
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 @@
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 @@
# 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 @@
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 @@
}
}
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 @@
# 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 @@
# 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/contrib/mw-to-git/git-remote-mediawiki.txt b/contrib/mw-to-git/git-remote-mediawiki.txt
index 23b7ef9..5da825f 100644
--- a/contrib/mw-to-git/git-remote-mediawiki.txt
+++ b/contrib/mw-to-git/git-remote-mediawiki.txt
@@ -4,4 +4,4 @@
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/contrib/mw-to-git/t/.gitignore b/contrib/mw-to-git/t/.gitignore
index a7a40b4..2b8dc30 100644
--- a/contrib/mw-to-git/t/.gitignore
+++ b/contrib/mw-to-git/t/.gitignore
@@ -1,4 +1,4 @@
WEB/
-wiki/
+mediawiki/
trash directory.t*/
test-results/
diff --git a/contrib/mw-to-git/t/README b/contrib/mw-to-git/t/README
index 2ee34be..72c4889 100644
--- a/contrib/mw-to-git/t/README
+++ b/contrib/mw-to-git/t/README
@@ -14,11 +14,11 @@
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/contrib/mw-to-git/t/install-wiki/.gitignore b/contrib/mw-to-git/t/install-wiki/.gitignore
deleted file mode 100644
index b5a2a44..0000000
--- a/contrib/mw-to-git/t/install-wiki/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-wikidb.sqlite
diff --git a/contrib/mw-to-git/t/install-wiki/LocalSettings.php b/contrib/mw-to-git/t/install-wiki/LocalSettings.php
deleted file mode 100644
index 745e47e..0000000
--- a/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/contrib/mw-to-git/t/install-wiki/db_install.php b/contrib/mw-to-git/t/install-wiki/db_install.php
deleted file mode 100644
index b033849..0000000
--- a/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_");
-/*
- * Fetches 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/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh b/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh
index 9106833..4c39bda 100755
--- a/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh
+++ b/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh
@@ -28,7 +28,7 @@
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 @@
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 @@
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
'
diff --git a/contrib/mw-to-git/t/t9363-mw-to-git-export-import.sh b/contrib/mw-to-git/t/t9363-mw-to-git-export-import.sh
index 3ff3a09..6187ec6 100755
--- a/contrib/mw-to-git/t/t9363-mw-to-git-export-import.sh
+++ b/contrib/mw-to-git/t/t9363-mw-to-git-export-import.sh
@@ -27,12 +27,12 @@
# 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 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/contrib/mw-to-git/t/test-gitmw-lib.sh b/contrib/mw-to-git/t/test-gitmw-lib.sh
index 3948a00..64e46c1 100755
--- a/contrib/mw-to-git/t/test-gitmw-lib.sh
+++ b/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 @@
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
@@ -291,27 +292,59 @@
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"
+wiki_delete_db () {
+ rm -rf \
+ "$FILES_FOLDER_DB"/* || error "Couldn't delete $FILES_FOLDER_DB/"
+}
- 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"
+wiki_delete_db_backup () {
+ rm -rf \
+ "$FILES_FOLDER_POST_INSTALL_DB"/* || error "Couldn't delete $FILES_FOLDER_POST_INSTALL_DB/"
+}
- if [ ! -f "$TMP/$DB_FILE" ] ; then
- error "Can't create database file $TMP/$DB_FILE. Try to run ./install-wiki.sh delete first."
+# 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 @@
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 @@
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 @@
# 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
- 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"
+ if ! test -d "../$FILES_FOLDER_POST_INSTALL_DB"
+ then
+ error "No wiki backup database at ../$FILES_FOLDER_POST_INSTALL_DB, failed installation?"
+ fi
+ 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 @@
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/contrib/mw-to-git/t/test-gitmw.pl b/contrib/mw-to-git/t/test-gitmw.pl
index 0ff7625..c5d687f 100755
--- a/contrib/mw-to-git/t/test-gitmw.pl
+++ b/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 @@
# 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 @@
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 @@
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 @@
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/contrib/mw-to-git/t/test.config b/contrib/mw-to-git/t/test.config
index 5ba0684..ed10b3e 100644
--- a/contrib/mw-to-git/t/test.config
+++ b/contrib/mw-to-git/t/test.config
@@ -3,15 +3,11 @@
# 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_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/contrib/subtree/Makefile b/contrib/subtree/Makefile
index 6906aae..6fa7496 100644
--- a/contrib/subtree/Makefile
+++ b/contrib/subtree/Makefile
@@ -25,14 +25,16 @@
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) -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/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt
index 352deda..0db02fe 100644
--- a/contrib/subtree/git-subtree.txt
+++ b/contrib/subtree/git-subtree.txt
@@ -139,12 +139,12 @@
-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/contrib/svn-fe/.gitignore b/contrib/svn-fe/.gitignore
deleted file mode 100644
index 02a7791..0000000
--- a/contrib/svn-fe/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/*.xml
-/*.1
-/*.html
-/svn-fe
diff --git a/contrib/svn-fe/Makefile b/contrib/svn-fe/Makefile
deleted file mode 100644
index e8651aa..0000000
--- a/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/contrib/svn-fe/svn-fe.c b/contrib/svn-fe/svn-fe.c
deleted file mode 100644
index f363505..0000000
--- a/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/contrib/svn-fe/svn-fe.txt b/contrib/svn-fe/svn-fe.txt
deleted file mode 100644
index 19333fc..0000000
--- a/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-repo --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-repo(1), git-fast-import(1),
-https://svn.apache.org/repos/asf/subversion/trunk/notes/dump-load-format.txt
diff --git a/contrib/svn-fe/svnrdump_sim.py b/contrib/svn-fe/svnrdump_sim.py
deleted file mode 100755
index 8a3cee6..0000000
--- a/contrib/svn-fe/svnrdump_sim.py
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/usr/bin/env 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 supported.')
- 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/convert.c b/convert.c
index 5ead3ce..9ecc1c6 100644
--- a/convert.c
+++ b/convert.c
@@ -195,7 +195,7 @@
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)
{
@@ -547,7 +547,7 @@
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;
@@ -638,7 +638,6 @@
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;
@@ -656,9 +655,7 @@
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;
@@ -797,6 +794,7 @@
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;
@@ -855,6 +853,24 @@
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;
@@ -971,6 +987,7 @@
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;
@@ -990,7 +1007,7 @@
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;
}
@@ -998,7 +1015,7 @@
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;
/*
@@ -1011,7 +1028,7 @@
if (!strncmp(drv->name, name, namelen) && !drv->name[namelen])
break;
if (!drv) {
- drv = xcalloc(1, sizeof(struct convert_driver));
+ CALLOC_ARRAY(drv, 1);
drv->name = xmemdupz(name, namelen);
*user_convert_tail = drv;
user_convert_tail = &(drv->next);
@@ -1368,7 +1385,7 @@
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)
@@ -1406,7 +1423,7 @@
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);
@@ -1441,7 +1458,7 @@
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);
@@ -1452,7 +1469,9 @@
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;
@@ -1484,7 +1503,7 @@
}
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);
@@ -1494,22 +1513,24 @@
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;
@@ -1982,3 +2003,25 @@
{
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/convert.h b/convert.h
index 3710969..e29d102 100644
--- a/convert.h
+++ b/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 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 @@
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);
@@ -95,6 +103,23 @@
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.
*/
diff --git a/credential.c b/credential.c
index 108d9e1..e5202fb 100644
--- a/credential.c
+++ b/credential.c
@@ -37,6 +37,10 @@
#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)
{
@@ -82,6 +86,22 @@
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;
@@ -101,6 +121,7 @@
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);
@@ -136,14 +157,14 @@
return;
strbuf_addf(out, "%s://", c->protocol);
if (c->username && *c->username) {
- strbuf_add_percentencode(out, 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);
+ strbuf_add_percentencode(out, c->path, 0);
}
}
@@ -181,7 +202,7 @@
{
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, '=');
@@ -253,11 +274,9 @@
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)
@@ -377,8 +396,31 @@
return -1;
}
-int credential_from_url_gently(struct credential *c, const char *url,
- int quiet)
+/*
+ * 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;
@@ -391,15 +433,22 @@
* (3) proto://<user>:<pass>@<host>/...
*/
proto_end = strstr(url, "://");
- if (!proto_end || proto_end == url) {
+ if (!allow_partial_url && (!proto_end || proto_end == url)) {
if (!quiet)
warning(_("url has no scheme: %s"), url);
return -1;
}
- cp = proto_end + 3;
+ 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) */
@@ -420,8 +469,10 @@
host = at + 1;
}
- c->protocol = xmemdupz(url, proto_end - url);
- c->host = url_decode_mem(host, slash - host);
+ if (proto_end && proto_end - url > 0)
+ c->protocol = xmemdupz(url, proto_end - url);
+ if (!allow_partial_url || slash - host > 0)
+ c->host = url_decode_mem(host, slash - host);
/* Trim leading and trailing slashes from path */
while (*slash == '/')
slash++;
@@ -443,6 +494,17 @@
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)
diff --git a/credential.h b/credential.h
index d99ec42..c0e17e3 100644
--- a/credential.h
+++ b/credential.h
@@ -177,8 +177,8 @@
* Parse a url into a credential struct, replacing any existing contents.
*
* If the url can't be parsed (e.g., a missing "proto://" component), the
- * resulting credential will be empty but we'll still return success from the
- * "gently" form.
+ * 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
@@ -189,7 +189,7 @@
void credential_from_url(struct credential *, const char *url);
int credential_from_url_gently(struct credential *, const char *url, int quiet);
-int credential_match(const struct credential *have,
- const struct credential *want);
+int credential_match(const struct credential *want,
+ const struct credential *have);
#endif /* CREDENTIAL_H */
diff --git a/csum-file.c b/csum-file.c
index 53ce37f..0f35fa5 100644
--- a/csum-file.c
+++ b/csum-file.c
@@ -157,7 +157,7 @@
{
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/csum-file.h b/csum-file.h
index f9cbd31..e54d53d 100644
--- a/csum-file.h
+++ b/csum-file.h
@@ -62,4 +62,11 @@
hashwrite(f, &data, sizeof(data));
}
+static inline size_t hashwrite_be64(struct hashfile *f, uint64_t data)
+{
+ data = htonll(data);
+ hashwrite(f, &data, sizeof(data));
+ return sizeof(data);
+}
+
#endif
diff --git a/daemon.c b/daemon.c
index fd669ed..3435319 100644
--- a/daemon.c
+++ b/daemon.c
@@ -296,7 +296,7 @@
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 @@
}
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 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 @@
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);
}
@@ -633,7 +633,7 @@
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;
@@ -664,8 +664,8 @@
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 @@
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 @@
*/
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;
}
@@ -840,7 +840,7 @@
{
struct child *newborn, **cradle;
- newborn = xcalloc(1, sizeof(*newborn));
+ CALLOC_ARRAY(newborn, 1);
live_children++;
memcpy(&newborn->cld, cld, sizeof(*cld));
memcpy(&newborn->address, addr, addrlen);
@@ -893,7 +893,7 @@
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 @@
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);
@@ -1148,7 +1148,7 @@
struct pollfd *pfd;
int i;
- pfd = xcalloc(socklist->nr, sizeof(struct pollfd));
+ CALLOC_ARRAY(pfd, socklist->nr);
for (i = 0; i < socklist->nr; i++) {
pfd[i].fd = socklist->list[i];
@@ -1476,10 +1476,10 @@
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/date.c b/date.c
index b0d9a84..f9ea807 100644
--- a/date.c
+++ b/date.c
@@ -497,7 +497,7 @@
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;
@@ -518,9 +518,9 @@
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);
@@ -529,14 +529,33 @@
* 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,
@@ -556,10 +575,14 @@
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;
@@ -575,10 +598,10 @@
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]
@@ -586,14 +609,14 @@
* 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;
}
@@ -664,6 +687,20 @@
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) {
diff --git a/decorate.c b/decorate.c
index a605b1b..2036d15 100644
--- a/decorate.c
+++ b/decorate.c
@@ -39,7 +39,7 @@
struct decoration_entry *old_entries = n->entries;
n->size = (old_size + 1000) * 3 / 2;
- n->entries = xcalloc(n->size, sizeof(struct decoration_entry));
+ CALLOC_ARRAY(n->entries, n->size);
n->nr = 0;
for (i = 0; i < old_size; i++) {
diff --git a/delta-islands.c b/delta-islands.c
index 09dbd3c..aa98b2e 100644
--- a/delta-islands.c
+++ b/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/diff-lib.c b/diff-lib.c
index 61812f4..b73cc18 100644
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -13,6 +13,7 @@
#include "submodule.h"
#include "dir.h"
#include "fsmonitor.h"
+#include "commit-reach.h"
/*
* diff-files
@@ -97,6 +98,8 @@
diff_set_mnemonic_prefix(&revs->diffopt, "i/", "w/");
+ refresh_fsmonitor(istate);
+
if (diff_unmerged_stage < 0)
diff_unmerged_stage = 2;
entries = istate->cache_nr;
@@ -177,9 +180,7 @@
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;
}
@@ -199,8 +200,17 @@
if (ce_uptodate(ce) || ce_skip_worktree(ce))
continue;
- /* If CE_VALID is set, don't look at workdir for file removal */
- if (ce->ce_flags & CE_VALID) {
+ /*
+ * When CE_VALID is set (via "update-index --assume-unchanged"
+ * or via adding paths while core.ignorestat is set to true),
+ * the user has promised that the working tree file for that
+ * path will not be modified. When CE_FSMONITOR_VALID is true,
+ * the fsmonitor knows that the path hasn't been modified since
+ * we refreshed the cached stat information. In either case,
+ * we do not have to stat to see if the path has been removed
+ * or modified.
+ */
+ if (ce->ce_flags & (CE_VALID | CE_FSMONITOR_VALID)) {
changed = 0;
newmode = ce->ce_mode;
} else {
@@ -219,9 +229,9 @@
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 +371,7 @@
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 +415,8 @@
/* 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;
@@ -518,16 +522,74 @@
return unpack_trees(1, &t, &opts);
}
-int run_diff_index(struct rev_info *revs, int cached)
+void diff_get_merge_base(const struct rev_info *revs, struct object_id *mb)
+{
+ int i;
+ struct commit *mb_child[2] = {0};
+ struct commit_list *merge_bases;
+
+ for (i = 0; i < revs->pending.nr; i++) {
+ struct object *obj = revs->pending.objects[i].item;
+ if (obj->flags)
+ die(_("--merge-base does not work with ranges"));
+ if (obj->type != OBJ_COMMIT)
+ die(_("--merge-base only works with commits"));
+ }
+
+ /*
+ * This check must go after the for loop above because A...B
+ * ranges produce three pending commits, resulting in a
+ * misleading error message.
+ */
+ if (revs->pending.nr < 1 || revs->pending.nr > 2)
+ BUG("unexpected revs->pending.nr: %d", revs->pending.nr);
+
+ for (i = 0; i < revs->pending.nr; i++)
+ mb_child[i] = lookup_commit_reference(the_repository, &revs->pending.objects[i].item->oid);
+ if (revs->pending.nr == 1) {
+ struct object_id oid;
+
+ if (get_oid("HEAD", &oid))
+ die(_("unable to get HEAD"));
+
+ mb_child[1] = lookup_commit_reference(the_repository, &oid);
+ }
+
+ merge_bases = repo_get_merge_bases(the_repository, mb_child[0], mb_child[1]);
+ if (!merge_bases)
+ die(_("no merge base found"));
+ if (merge_bases->next)
+ die(_("multiple merge bases found"));
+
+ oidcpy(mb, &merge_bases->item->object.oid);
+
+ free_commit_list(merge_bases);
+}
+
+int run_diff_index(struct rev_info *revs, unsigned int option)
{
struct object_array_entry *ent;
+ int cached = !!(option & DIFF_INDEX_CACHED);
+ int merge_base = !!(option & DIFF_INDEX_MERGE_BASE);
+ struct object_id oid;
+ const char *name;
+ char merge_base_hex[GIT_MAX_HEXSZ + 1];
if (revs->pending.nr != 1)
BUG("run_diff_index must be passed exactly one tree");
trace_performance_enter();
ent = revs->pending.objects;
- if (diff_cache(revs, &ent->item->oid, ent->name, cached))
+
+ if (merge_base) {
+ diff_get_merge_base(revs, &oid);
+ name = oid_to_hex_r(merge_base_hex, &oid);
+ } else {
+ oidcpy(&oid, &ent->item->oid);
+ name = ent->name;
+ }
+
+ if (diff_cache(revs, &oid, name, cached))
exit(128);
diff_set_mnemonic_prefix(&revs->diffopt, "c/", cached ? "i/" : "w/");
@@ -544,10 +606,12 @@
repo_init_revisions(opt->repo, &revs, NULL);
copy_pathspec(&revs.prune_data, &opt->pathspec);
+ diff_setup_done(&revs.diffopt);
revs.diffopt = *opt;
if (diff_cache(&revs, tree_oid, NULL, 1))
exit(128);
+ clear_pathspec(&revs.prune_data);
return 0;
}
@@ -571,3 +635,28 @@
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/diff-merges.c b/diff-merges.c
new file mode 100644
index 0000000..146bb50
--- /dev/null
+++ b/diff-merges.c
@@ -0,0 +1,146 @@
+#include "diff-merges.h"
+
+#include "revision.h"
+
+static void suppress(struct rev_info *revs)
+{
+ revs->separate_merges = 0;
+ revs->first_parent_merges = 0;
+ revs->combine_merges = 0;
+ revs->dense_combined_merges = 0;
+ revs->combined_all_paths = 0;
+ revs->combined_imply_patch = 0;
+ revs->merges_need_diff = 0;
+}
+
+static void set_separate(struct rev_info *revs)
+{
+ suppress(revs);
+ revs->separate_merges = 1;
+}
+
+static void set_first_parent(struct rev_info *revs)
+{
+ set_separate(revs);
+ revs->first_parent_merges = 1;
+}
+
+static void set_m(struct rev_info *revs)
+{
+ /*
+ * 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.
+ */
+ set_separate(revs);
+ revs->match_missing = 1;
+}
+
+static void set_combined(struct rev_info *revs)
+{
+ suppress(revs);
+ revs->combine_merges = 1;
+ revs->dense_combined_merges = 0;
+}
+
+static void set_dense_combined(struct rev_info *revs)
+{
+ suppress(revs);
+ revs->combine_merges = 1;
+ revs->dense_combined_merges = 1;
+}
+
+static void set_diff_merges(struct rev_info *revs, const char *optarg)
+{
+ if (!strcmp(optarg, "off") || !strcmp(optarg, "none")) {
+ suppress(revs);
+ /* Return early to leave revs->merges_need_diff unset */
+ return;
+ }
+
+ if (!strcmp(optarg, "1") || !strcmp(optarg, "first-parent"))
+ set_first_parent(revs);
+ else if (!strcmp(optarg, "m") || !strcmp(optarg, "separate"))
+ set_separate(revs);
+ else if (!strcmp(optarg, "c") || !strcmp(optarg, "combined"))
+ set_combined(revs);
+ else if (!strcmp(optarg, "cc") || !strcmp(optarg, "dense-combined"))
+ set_dense_combined(revs);
+ else
+ die(_("unknown value for --diff-merges: %s"), optarg);
+
+ /* The flag is cleared by set_xxx() functions, so don't move this up */
+ revs->merges_need_diff = 1;
+}
+
+/*
+ * Public functions. They are in the order they are called.
+ */
+
+int diff_merges_parse_opts(struct rev_info *revs, const char **argv)
+{
+ int argcount = 1;
+ const char *optarg;
+ const char *arg = argv[0];
+
+ if (!strcmp(arg, "-m")) {
+ set_m(revs);
+ } else if (!strcmp(arg, "-c")) {
+ set_combined(revs);
+ revs->combined_imply_patch = 1;
+ } else if (!strcmp(arg, "--cc")) {
+ set_dense_combined(revs);
+ revs->combined_imply_patch = 1;
+ } else if (!strcmp(arg, "--no-diff-merges")) {
+ suppress(revs);
+ } else if (!strcmp(arg, "--combined-all-paths")) {
+ revs->combined_all_paths = 1;
+ } else if ((argcount = parse_long_opt("diff-merges", argv, &optarg))) {
+ set_diff_merges(revs, optarg);
+ } else
+ return 0;
+
+ revs->explicit_diff_merges = 1;
+ return argcount;
+}
+
+void diff_merges_suppress(struct rev_info *revs)
+{
+ suppress(revs);
+}
+
+void diff_merges_default_to_first_parent(struct rev_info *revs)
+{
+ if (!revs->explicit_diff_merges)
+ revs->separate_merges = 1;
+ if (revs->separate_merges)
+ revs->first_parent_merges = 1;
+}
+
+void diff_merges_default_to_dense_combined(struct rev_info *revs)
+{
+ if (!revs->explicit_diff_merges)
+ set_dense_combined(revs);
+}
+
+void diff_merges_set_dense_combined_if_unset(struct rev_info *revs)
+{
+ if (!revs->combine_merges)
+ set_dense_combined(revs);
+}
+
+void diff_merges_setup_revs(struct rev_info *revs)
+{
+ if (revs->combine_merges == 0)
+ revs->dense_combined_merges = 0;
+ if (revs->separate_merges == 0)
+ revs->first_parent_merges = 0;
+ if (revs->combined_all_paths && !revs->combine_merges)
+ die("--combined-all-paths makes no sense without -c or --cc");
+ if (revs->combined_imply_patch)
+ revs->diff = 1;
+ if (revs->combined_imply_patch || revs->merges_need_diff) {
+ if (!revs->diffopt.output_format)
+ revs->diffopt.output_format = DIFF_FORMAT_PATCH;
+ }
+}
diff --git a/diff-merges.h b/diff-merges.h
new file mode 100644
index 0000000..659467c
--- /dev/null
+++ b/diff-merges.h
@@ -0,0 +1,24 @@
+#ifndef DIFF_MERGES_H
+#define DIFF_MERGES_H
+
+/*
+ * diff-merges - utility module to handle command-line options for
+ * selection of particular diff format of merge commits
+ * representation.
+ */
+
+struct rev_info;
+
+int diff_merges_parse_opts(struct rev_info *revs, const char **argv);
+
+void diff_merges_suppress(struct rev_info *revs);
+
+void diff_merges_default_to_first_parent(struct rev_info *revs);
+
+void diff_merges_default_to_dense_combined(struct rev_info *revs);
+
+void diff_merges_set_dense_combined_if_unset(struct rev_info *revs);
+
+void diff_merges_setup_revs(struct rev_info *revs);
+
+#endif
diff --git a/diff.c b/diff.c
index f2cfbf2..4acccd9 100644
--- a/diff.c
+++ b/diff.c
@@ -20,7 +20,7 @@
#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"
@@ -48,6 +48,7 @@
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 @@
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;
@@ -477,14 +482,14 @@
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 @@
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 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;
}
@@ -2224,14 +2233,12 @@
struct diff_options *o = xmalloc(sizeof(struct diff_options));
memcpy(o, orig_opts, sizeof(struct diff_options));
- ecbdata->diff_words =
- xcalloc(1, sizeof(struct diff_words_data));
+ CALLOC_ARRAY(ecbdata->diff_words, 1);
ecbdata->diff_words->type = o->word_diff;
ecbdata->diff_words->opt = o;
if (orig_opts->emitted_symbols)
- o->emitted_symbols =
- xcalloc(1, sizeof(struct emitted_diff_symbols));
+ CALLOC_ARRAY(o->emitted_symbols, 1);
if (!o->word_regex)
o->word_regex = userdiff_word_regex(one, o->repo->index);
@@ -2500,7 +2507,7 @@
const char *name_b)
{
struct diffstat_file *x;
- x = xcalloc(1, sizeof(*x));
+ CALLOC_ARRAY(x, 1);
ALLOC_GROW(diffstat->files, diffstat->nr + 1, diffstat->alloc);
diffstat->files[diffstat->nr++] = x;
if (name_b) {
@@ -3020,6 +3027,9 @@
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;
@@ -3047,19 +3057,19 @@
}
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);
@@ -3141,16 +3151,19 @@
gather_dirstat(options, &dir, changed, "", 0);
}
+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);
}
@@ -3339,13 +3352,17 @@
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);
@@ -3413,7 +3430,7 @@
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;
@@ -3568,6 +3585,8 @@
if (header.len && !o->flags.suppress_diff_headers)
ecbdata.header = &header;
xpp.flags = o->xdl_opts;
+ xpp.ignore_regex = o->ignore_regex;
+ xpp.ignore_regex_nr = o->ignore_regex_nr;
xpp.anchors = o->anchors;
xpp.anchors_nr = o->anchors_nr;
xecfg.ctxlen = o->context;
@@ -3644,7 +3663,7 @@
{
mmfile_t mf1, mf2;
struct diffstat_file *data;
- int same_contents;
+ int may_differ;
int complete_rewrite = 0;
if (!DIFF_PAIR_UNMERGED(p)) {
@@ -3662,12 +3681,14 @@
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 {
@@ -3677,13 +3698,13 @@
}
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;
@@ -3695,6 +3716,8 @@
memset(&xpp, 0, sizeof(xpp));
memset(&xecfg, 0, sizeof(xecfg));
xpp.flags = o->xdl_opts;
+ xpp.ignore_regex = o->ignore_regex;
+ xpp.ignore_regex_nr = o->ignore_regex_nr;
xpp.anchors = o->anchors;
xpp.anchors_nr = o->anchors_nr;
xecfg.ctxlen = o->context;
@@ -3702,6 +3725,27 @@
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);
@@ -3914,9 +3958,10 @@
*/
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;
/*
@@ -3986,7 +4031,7 @@
* 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;
@@ -4011,12 +4056,30 @@
}
}
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) {
@@ -4024,9 +4087,12 @@
return 0;
}
}
- s->data = repo_read_object_file(r, &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;
@@ -4047,6 +4113,9 @@
void diff_free_filespec_data(struct diff_filespec *s)
{
+ if (!s)
+ return;
+
diff_free_filespec_blob(s);
FREE_AND_NULL(s->cnt_data);
}
@@ -4062,6 +4131,9 @@
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_");
@@ -4071,7 +4143,7 @@
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;
}
@@ -4141,7 +4213,7 @@
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,
@@ -4151,14 +4223,14 @@
}
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:
@@ -4175,12 +4247,12 @@
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);
@@ -4188,22 +4260,22 @@
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)
@@ -4278,7 +4350,10 @@
}
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;
@@ -4502,6 +4577,7 @@
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 */
@@ -4515,6 +4591,9 @@
options->orderfile = diff_order_file_cfg;
+ if (!options->flags.ignore_submodule_set)
+ options->flags.ignore_untracked_in_submodules = 1;
+
if (diff_no_prefix) {
options->a_prefix = options->b_prefix = "";
} else if (!diff_mnemonic_prefix) {
@@ -4556,7 +4635,8 @@
* inside contents.
*/
- if ((options->xdl_opts & XDF_WHITESPACE_FLAGS))
+ if ((options->xdl_opts & XDF_WHITESPACE_FLAGS) ||
+ options->ignore_regex_nr)
options->flags.diff_from_contents = 1;
else
options->flags.diff_from_contents = 0;
@@ -4836,7 +4916,7 @@
return error(_("unable to resolve '%s'"), arg);
if (!opt->objfind)
- opt->objfind = xcalloc(1, sizeof(*opt->objfind));
+ CALLOC_ARRAY(opt->objfind, 1);
opt->pickaxe_opts |= DIFF_PICKAXE_KIND_OBJFIND;
opt->flags.recursive = 1;
@@ -5132,6 +5212,22 @@
return 0;
}
+static int diff_opt_ignore_regex(const struct option *opt,
+ const char *arg, int unset)
+{
+ struct diff_options *options = opt->value;
+ regex_t *regex;
+
+ BUG_ON_OPT_NEG(unset);
+ regex = xmalloc(sizeof(*regex));
+ if (regcomp(regex, arg, REG_EXTENDED | REG_NEWLINE))
+ return error(_("invalid regex given to -I: '%s'"), arg);
+ ALLOC_GROW(options->ignore_regex, options->ignore_regex_nr + 1,
+ options->ignore_regex_alloc);
+ options->ignore_regex[options->ignore_regex_nr++] = regex;
+ return 0;
+}
+
static int diff_opt_pickaxe_regex(const struct option *opt,
const char *arg, int unset)
{
@@ -5159,8 +5255,7 @@
{
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;
@@ -5251,6 +5346,19 @@
return 0;
}
+static int diff_opt_rotate_to(const struct option *opt, const char *arg, int unset)
+{
+ struct diff_options *options = opt->value;
+
+ BUG_ON_OPT_NEG(unset);
+ if (!strcmp(opt->long_name, "skip-to"))
+ options->skip_instead_of_rotate = 1;
+ else
+ options->skip_instead_of_rotate = 0;
+ options->rotate_to = arg;
+ return 0;
+}
+
static void prep_parse_options(struct diff_options *options)
{
struct option parseopts[] = {
@@ -5421,6 +5529,9 @@
OPT_BIT_F(0, "ignore-blank-lines", &options->xdl_opts,
N_("ignore changes whose lines are all blank"),
XDF_IGNORE_BLANK_LINES, PARSE_OPT_NONEG),
+ OPT_CALLBACK_F('I', "ignore-matching-lines", options, N_("<regex>"),
+ N_("ignore changes whose all lines match <regex>"),
+ 0, diff_opt_ignore_regex),
OPT_BIT(0, "indent-heuristic", &options->xdl_opts,
N_("heuristic to shift diff hunk boundaries for easy reading"),
XDF_INDENT_HEURISTIC),
@@ -5456,7 +5567,7 @@
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")),
@@ -5499,6 +5610,12 @@
DIFF_PICKAXE_REGEX, PARSE_OPT_NONEG),
OPT_FILENAME('O', NULL, &options->orderfile,
N_("control the order in which files appear in the output")),
+ OPT_CALLBACK_F(0, "rotate-to", options, N_("<path>"),
+ N_("show the change in the specified path first"),
+ PARSE_OPT_NONEG, diff_opt_rotate_to),
+ OPT_CALLBACK_F(0, "skip-to", options, N_("<path>"),
+ N_("skip the output to the specified path"),
+ PARSE_OPT_NONEG, diff_opt_rotate_to),
OPT_CALLBACK_F(0, "find-object", options, N_("<object-id>"),
N_("look for differences that change the number of occurrences of the specified object"),
PARSE_OPT_NONEG, diff_opt_find_object),
@@ -6003,6 +6120,8 @@
struct patch_id_t *data = priv;
int new_len;
+ if (len > 12 && starts_with(line, "\\ "))
+ return;
new_len = remove_space(line, len);
the_hash_algo->update_fn(data->ctx, line, new_len);
@@ -6217,9 +6336,9 @@
if (o->color_moved == COLOR_MOVED_ZEBRA_DIM)
dim_moved_lines(o);
- hashmap_free_entries(&add_lines, struct moved_entry,
+ hashmap_clear_and_free(&add_lines, struct moved_entry,
ent);
- hashmap_free_entries(&del_lines, struct moved_entry,
+ hashmap_clear_and_free(&del_lines, struct moved_entry,
ent);
}
@@ -6234,6 +6353,32 @@
}
}
+static void diff_free_file(struct diff_options *options)
+{
+ if (options->close_file)
+ fclose(options->file);
+}
+
+static void diff_free_ignore_regex(struct diff_options *options)
+{
+ int i;
+
+ for (i = 0; i < options->ignore_regex_nr; i++) {
+ regfree(options->ignore_regex[i]);
+ free(options->ignore_regex[i]);
+ }
+ free(options->ignore_regex);
+}
+
+void diff_free(struct diff_options *options)
+{
+ if (options->no_free)
+ return;
+
+ diff_free_file(options);
+ diff_free_ignore_regex(options);
+}
+
void diff_flush(struct diff_options *options)
{
struct diff_queue_struct *q = &diff_queued_diff;
@@ -6297,8 +6442,7 @@
* options->file to /dev/null should be safe, because we
* aren't supposed to produce any output anyway.
*/
- if (options->close_file)
- fclose(options->file);
+ diff_free_file(options);
options->file = xfopen("/dev/null", "w");
options->close_file = 1;
options->color_moved = 0;
@@ -6331,8 +6475,7 @@
free_queue:
free(q->queue);
DIFF_QUEUE_CLEAR(q);
- if (options->close_file)
- fclose(options->file);
+ diff_free(options);
/*
* Report the content-level differences with HAS_CHANGES;
@@ -6407,9 +6550,9 @@
{
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);
}
@@ -6417,6 +6560,12 @@
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;
@@ -6439,8 +6588,8 @@
!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;
@@ -6491,9 +6640,9 @@
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) &&
@@ -6502,29 +6651,47 @@
oid_array_append(to_fetch, &filespec->oid);
}
+void diff_queued_diff_prefetch(void *repository)
+{
+ 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];
+ 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)
{
- if (options->repo == the_repository && has_promisor_remote()) {
- /*
- * 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;
+ int output_formats_to_prefetch = DIFF_FORMAT_DIFFSTAT |
+ DIFF_FORMAT_NUMSTAT |
+ DIFF_FORMAT_PATCH |
+ DIFF_FORMAT_SHORTSTAT |
+ DIFF_FORMAT_DIRSTAT;
- 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.
- */
- promisor_remote_get_direct(options->repo,
- to_fetch.oid, to_fetch.nr);
- oid_array_clear(&to_fetch);
- }
+ /*
+ * 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)
@@ -6543,6 +6710,8 @@
diffcore_pickaxe(options);
if (options->orderfile)
diffcore_order(options->orderfile);
+ if (options->rotate_to)
+ diffcore_rotate(options);
if (!options->found_follow)
/* See try_to_follow_renames() in tree-diff.c */
diff_resolve_rename_copy();
@@ -6698,8 +6867,11 @@
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;
}
@@ -6771,7 +6943,7 @@
*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/diff.h b/diff.h
index 6febe7e..c8f3fae 100644
--- a/diff.h
+++ b/diff.h
@@ -49,7 +49,17 @@
* - 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.
+ * - Calling `diff_flush()` will produce the output, it will call
+ * `diff_free()` to free any resources, e.g. those allocated in
+ * `diff_opt_parse()`.
+ *
+ * - Set `.no_free = 1` before calling `diff_flush()` to defer the
+ * freeing of allocated memory in diff_options. This is useful when
+ * `diff_flush()` is being called in a loop, rather than as a
+ * one-off. When setting `.no_free = 1` you must ensure that
+ * `diff_free()` is called at the end, either by flipping the flag
+ * before the last `diff_flush()` call, or by flipping it before
+ * calling `diff_free()` yourself.
*/
struct combine_diff_path;
@@ -178,6 +188,7 @@
unsigned diff_from_contents;
unsigned dirty_submodules;
unsigned ignore_untracked_in_submodules;
+ unsigned ignore_submodule_set;
unsigned ignore_dirty_submodules;
unsigned override_submodule_config;
unsigned dirstat_by_line;
@@ -226,6 +237,27 @@
struct diff_options {
const char *orderfile;
+ /*
+ * "--rotate-to=<file>" would start showing at <file> and when
+ * the output reaches the end, wrap around by default.
+ * Setting skip_instead_of_rotate to true stops the output at the
+ * end, effectively discarding the earlier part of the output
+ * before <file>'s diff (this is used to implement the
+ * "--skip-to=<file>" option).
+ *
+ * When rotate_to_strict is set, it is an error if there is no
+ * <file> in the diff. Otherwise, the output starts at the
+ * path that is the same as, or first path that sorts after,
+ * <file>. Because it is unreasonable to require the exact
+ * match for "git log -p --rotate-to=<file>" (i.e. not all
+ * commit would touch that single <file>), "git log" sets it
+ * to false. "git diff" sets it to true to detect an error
+ * in the command line option.
+ */
+ const char *rotate_to;
+ int skip_instead_of_rotate;
+ int rotate_to_strict;
+
/**
* 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
@@ -234,6 +266,10 @@
*/
const char *pickaxe;
+ /* -I<regex> */
+ regex_t **ignore_regex;
+ size_t ignore_regex_nr, ignore_regex_alloc;
+
const char *single_follow;
const char *a_prefix, *b_prefix;
const char *line_prefix;
@@ -285,6 +321,9 @@
/* 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)
@@ -357,6 +396,8 @@
struct repository *repo;
struct option *parseopts;
+
+ int no_free;
};
unsigned diff_filter_bit(char status);
@@ -426,11 +467,11 @@
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;
@@ -449,11 +490,11 @@
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);
@@ -551,6 +592,7 @@
int diff_queue_is_empty(void);
void diff_flush(struct diff_options*);
+void diff_free(struct diff_options*);
void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc);
/* diff-raw status letters */
@@ -575,12 +617,17 @@
*/
const char *diff_aligned_abbrev(const struct object_id *sha1, int);
+void diff_get_merge_base(const struct rev_info *revs, struct object_id *mb);
+
/* do not report anything on removed paths */
#define DIFF_SILENT_ON_REMOVED 01
/* report racily-clean paths as modified */
#define DIFF_RACY_IS_MODIFIED 02
int run_diff_files(struct rev_info *revs, unsigned int option);
-int run_diff_index(struct rev_info *revs, int cached);
+
+#define DIFF_INDEX_CACHED 01
+#define DIFF_INDEX_MERGE_BASE 02
+int run_diff_index(struct rev_info *revs, unsigned int option);
int do_diff_cache(const struct object_id *, struct diff_options *);
int diff_flush_patch_id(struct diff_options *, struct object_id *, int, int);
@@ -596,6 +643,13 @@
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/diffcore-break.c b/diffcore-break.c
index 9d20a6a..0d4a149 100644
--- a/diffcore-break.c
+++ b/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 @@
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 @@
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);
diff --git a/diffcore-rename.c b/diffcore-rename.c
index e189f40..9c1478c 100644
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -1,4 +1,5 @@
/*
+ *
* Copyright (C) 2005 Junio C Hamano
*/
#include "cache.h"
@@ -7,63 +8,37 @@
#include "object-store.h"
#include "hashmap.h"
#include "progress.h"
+#include "promisor-remote.h"
+#include "strmap.h"
/* Table of rename/copy destinations */
static struct diff_rename_dst {
- struct diff_filespec *two;
- struct diff_filepair *pair;
+ struct diff_filepair *p;
+ struct diff_filespec *filespec_to_free;
+ int is_rename; /* false -> just a create; true -> rename or copy */
} *rename_dst;
static int rename_dst_nr, rename_dst_alloc;
+/* Mapping from break source pathname to break destination index */
+static struct strintmap *break_idx = NULL;
-static int find_rename_dst(struct diff_filespec *two)
+static struct diff_rename_dst *locate_rename_dst(struct diff_filepair *p)
{
- int first, last;
-
- first = 0;
- last = rename_dst_nr;
- while (last > first) {
- int next = first + ((last - first) >> 1);
- struct diff_rename_dst *dst = &(rename_dst[next]);
- int cmp = strcmp(two->path, dst->two->path);
- if (!cmp)
- return next;
- if (cmp < 0) {
- last = next;
- continue;
- }
- first = next+1;
- }
- return -first - 1;
-}
-
-static struct diff_rename_dst *locate_rename_dst(struct diff_filespec *two)
-{
- int ofs = find_rename_dst(two);
- return ofs < 0 ? NULL : &rename_dst[ofs];
+ /* Lookup by p->ONE->path */
+ int idx = break_idx ? strintmap_get(break_idx, p->one->path) : -1;
+ return (idx == -1) ? NULL : &rename_dst[idx];
}
/*
* Returns 0 on success, -1 if we found a duplicate.
*/
-static int add_rename_dst(struct diff_filespec *two)
+static int add_rename_dst(struct diff_filepair *p)
{
- int first = find_rename_dst(two);
-
- if (first >= 0)
- return -1;
- first = -first - 1;
-
- /* insert to make it at "first" */
ALLOC_GROW(rename_dst, rename_dst_nr + 1, rename_dst_alloc);
+ rename_dst[rename_dst_nr].p = p;
+ rename_dst[rename_dst_nr].filespec_to_free = NULL;
+ rename_dst[rename_dst_nr].is_rename = 0;
rename_dst_nr++;
- if (first < rename_dst_nr)
- MOVE_ARRAY(rename_dst + first + 1, rename_dst + first,
- rename_dst_nr - first - 1);
- rename_dst[first].two = alloc_filespec(two->path);
- fill_filespec(rename_dst[first].two, &two->oid, two->oid_valid,
- two->mode);
- rename_dst[first].pair = NULL;
return 0;
}
@@ -74,36 +49,20 @@
} *rename_src;
static int rename_src_nr, rename_src_alloc;
-static struct diff_rename_src *register_rename_src(struct diff_filepair *p)
+static void register_rename_src(struct diff_filepair *p)
{
- int first, last;
- struct diff_filespec *one = p->one;
- unsigned short score = p->score;
-
- first = 0;
- last = rename_src_nr;
- while (last > first) {
- int next = first + ((last - first) >> 1);
- struct diff_rename_src *src = &(rename_src[next]);
- int cmp = strcmp(one->path, src->p->one->path);
- if (!cmp)
- return src;
- if (cmp < 0) {
- last = next;
- continue;
+ if (p->broken_pair) {
+ if (!break_idx) {
+ break_idx = xmalloc(sizeof(*break_idx));
+ strintmap_init(break_idx, -1);
}
- first = next+1;
+ strintmap_set(break_idx, p->one->path, rename_dst_nr);
}
- /* insert to make it at "first" */
ALLOC_GROW(rename_src, rename_src_nr + 1, rename_src_alloc);
+ rename_src[rename_src_nr].p = p;
+ rename_src[rename_src_nr].score = p->score;
rename_src_nr++;
- if (first < rename_src_nr)
- MOVE_ARRAY(rename_src + first + 1, rename_src + first,
- rename_src_nr - first - 1);
- rename_src[first].p = p;
- rename_src[first].score = score;
- return &(rename_src[first]);
}
static int basename_same(struct diff_filespec *src, struct diff_filespec *dst)
@@ -128,10 +87,46 @@
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].p->renamed_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].p->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 +143,15 @@
*/
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 +170,10 @@
* 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 +191,11 @@
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,
@@ -209,26 +215,24 @@
static void record_rename_pair(int dst_index, int src_index, int score)
{
- struct diff_filespec *src, *dst;
- struct diff_filepair *dp;
+ struct diff_filepair *src = rename_src[src_index].p;
+ struct diff_filepair *dst = rename_dst[dst_index].p;
- if (rename_dst[dst_index].pair)
+ if (dst->renamed_pair)
die("internal error: dst already matched.");
- src = rename_src[src_index].p->one;
- src->rename_used++;
- src->count++;
+ src->one->rename_used++;
+ src->one->count++;
- dst = rename_dst[dst_index].two;
- dst->count++;
+ rename_dst[dst_index].filespec_to_free = dst->one;
+ rename_dst[dst_index].is_rename = 1;
- dp = diff_queue(NULL, src, dst);
- dp->renamed_pair = 1;
- if (!strcmp(src->path, dst->path))
- dp->score = rename_src[src_index].score;
+ dst->one = src->one;
+ dst->renamed_pair = 1;
+ if (!strcmp(dst->one->path, dst->two->path))
+ dst->score = rename_src[src_index].score;
else
- dp->score = score;
- rename_dst[dst_index].pair = dp;
+ dst->score = score;
}
/*
@@ -261,7 +265,7 @@
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(r->hash_algo, filespec->data, filespec->size,
"blob", &filespec->oid);
@@ -274,7 +278,7 @@
struct diff_options *options)
{
int renames = 0;
- struct diff_filespec *target = rename_dst[dst_index].two;
+ struct diff_filespec *target = rename_dst[dst_index].p->two;
struct file_similarity *p, *best = NULL;
int i = 100, best_score = -1;
unsigned int hash = hash_filespec(options->repo, target);
@@ -358,7 +362,145 @@
renames += find_identical_files(&file_table, i, options);
/* Free the hash data structure and entries */
- hashmap_free_entries(&file_table, struct file_similarity, entry);
+ hashmap_clear_and_free(&file_table, struct file_similarity, entry);
+
+ return renames;
+}
+
+static const char *get_basename(const char *filename)
+{
+ /*
+ * gitbasename() has to worry about special drives, multiple
+ * directory separator characters, trailing slashes, NULL or
+ * empty strings, etc. We only work on filenames as stored in
+ * git, and thus get to ignore all those complications.
+ */
+ const char *base = strrchr(filename, '/');
+ return base ? base + 1 : filename;
+}
+
+static int find_basename_matches(struct diff_options *options,
+ int minimum_score)
+{
+ /*
+ * When I checked in early 2020, over 76% of file renames in linux
+ * just moved files to a different directory but kept the same
+ * basename. gcc did that with over 64% of renames, gecko did it
+ * with over 79%, and WebKit did it with over 89%.
+ *
+ * Therefore we can bypass the normal exhaustive NxM matrix
+ * comparison of similarities between all potential rename sources
+ * and destinations by instead using file basename as a hint (i.e.
+ * the portion of the filename after the last '/'), checking for
+ * similarity between files with the same basename, and if we find
+ * a pair that are sufficiently similar, record the rename pair and
+ * exclude those two from the NxM matrix.
+ *
+ * This *might* cause us to find a less than optimal pairing (if
+ * there is another file that we are even more similar to but has a
+ * different basename). Given the huge performance advantage
+ * basename matching provides, and given the frequency with which
+ * people use the same basename in real world projects, that's a
+ * trade-off we are willing to accept when doing just rename
+ * detection.
+ *
+ * If someone wants copy detection that implies they are willing to
+ * spend more cycles to find similarities between files, so it may
+ * be less likely that this heuristic is wanted. If someone is
+ * doing break detection, that means they do not want filename
+ * similarity to imply any form of content similiarity, and thus
+ * this heuristic would definitely be incompatible.
+ */
+
+ int i, renames = 0;
+ struct strintmap sources;
+ struct strintmap dests;
+ struct hashmap_iter iter;
+ struct strmap_entry *entry;
+
+ /*
+ * The prefeteching stuff wants to know if it can skip prefetching
+ * blobs that are unmodified...and will then do a little extra work
+ * to verify that the oids are indeed different before prefetching.
+ * Unmodified blobs are only relevant when doing copy detection;
+ * when limiting to rename detection, diffcore_rename[_extended]()
+ * will never be called with unmodified source paths fed to us, so
+ * the extra work necessary to check if rename_src entries are
+ * unmodified would be a small waste.
+ */
+ int skip_unmodified = 0;
+
+ /*
+ * Create maps of basename -> fullname(s) for remaining sources and
+ * dests.
+ */
+ strintmap_init_with_options(&sources, -1, NULL, 0);
+ strintmap_init_with_options(&dests, -1, NULL, 0);
+ for (i = 0; i < rename_src_nr; ++i) {
+ char *filename = rename_src[i].p->one->path;
+ const char *base;
+
+ /* exact renames removed in remove_unneeded_paths_from_src() */
+ assert(!rename_src[i].p->one->rename_used);
+
+ /* Record index within rename_src (i) if basename is unique */
+ base = get_basename(filename);
+ if (strintmap_contains(&sources, base))
+ strintmap_set(&sources, base, -1);
+ else
+ strintmap_set(&sources, base, i);
+ }
+ for (i = 0; i < rename_dst_nr; ++i) {
+ char *filename = rename_dst[i].p->two->path;
+ const char *base;
+
+ if (rename_dst[i].is_rename)
+ continue; /* involved in exact match already. */
+
+ /* Record index within rename_dst (i) if basename is unique */
+ base = get_basename(filename);
+ if (strintmap_contains(&dests, base))
+ strintmap_set(&dests, base, -1);
+ else
+ strintmap_set(&dests, base, i);
+ }
+
+ /* Now look for basename matchups and do similarity estimation */
+ strintmap_for_each_entry(&sources, &iter, entry) {
+ const char *base = entry->key;
+ intptr_t src_index = (intptr_t)entry->value;
+ intptr_t dst_index;
+ if (src_index == -1)
+ continue;
+
+ if (0 <= (dst_index = strintmap_get(&dests, base))) {
+ struct diff_filespec *one, *two;
+ int score;
+
+ /* Estimate the similarity */
+ one = rename_src[src_index].p->one;
+ two = rename_dst[dst_index].p->two;
+ score = estimate_similarity(options->repo, one, two,
+ minimum_score, skip_unmodified);
+
+ /* If sufficiently similar, record as rename pair */
+ if (score < minimum_score)
+ continue;
+ record_rename_pair(dst_index, src_index, score);
+ renames++;
+
+ /*
+ * Found a rename so don't need text anymore; if we
+ * didn't find a rename, the filespec_blob would get
+ * re-used when doing the matrix of comparisons.
+ */
+ diff_free_filespec_blob(one);
+ diff_free_filespec_blob(two);
+ }
+ }
+
+ strintmap_clear(&sources);
+ strintmap_clear(&dests);
return renames;
}
@@ -385,12 +527,11 @@
* 1 if we need to disable inexact rename detection;
* 2 if we would be under the limit if we were given -C instead of -C -C.
*/
-static int too_many_rename_candidates(int num_create,
+static int too_many_rename_candidates(int num_destinations, int num_sources,
struct diff_options *options)
{
int rename_limit = options->rename_limit;
- int num_src = rename_src_nr;
- int i;
+ int i, limited_sources;
options->needed_rename_limit = 0;
@@ -398,31 +539,34 @@
* This basically does a test for the rename matrix not
* growing larger than a "rename_limit" square matrix, ie:
*
- * num_create * num_src > rename_limit * rename_limit
+ * num_destinations * num_sources > rename_limit * rename_limit
+ *
+ * We use st_mult() to check overflow conditions; in the
+ * exceptional circumstance that size_t isn't large enough to hold
+ * the multiplication, the system won't be able to allocate enough
+ * memory for the matrix anyway.
*/
if (rename_limit <= 0)
rename_limit = 32767;
- if ((num_create <= rename_limit || num_src <= rename_limit) &&
- ((uint64_t)num_create * (uint64_t)num_src
- <= (uint64_t)rename_limit * (uint64_t)rename_limit))
+ if (st_mult(num_destinations, num_sources)
+ <= st_mult(rename_limit, rename_limit))
return 0;
options->needed_rename_limit =
- num_src > num_create ? num_src : num_create;
+ num_sources > num_destinations ? num_sources : num_destinations;
/* Are we running under -C -C? */
if (!options->flags.find_copies_harder)
return 1;
/* Would we bust the limit if we were running under -C? */
- for (num_src = i = 0; i < rename_src_nr; i++) {
+ for (limited_sources = i = 0; i < num_sources; i++) {
if (diff_unmodified_pair(rename_src[i].p))
continue;
- num_src++;
+ limited_sources++;
}
- if ((num_create <= rename_limit || num_src <= rename_limit) &&
- ((uint64_t)num_create * (uint64_t)num_src
- <= (uint64_t)rename_limit * (uint64_t)rename_limit))
+ if (st_mult(num_destinations, limited_sources)
+ <= st_mult(rename_limit, rename_limit))
return 2;
return 1;
}
@@ -438,7 +582,7 @@
(mx[i].score < minimum_score))
break; /* there is no more usable pair. */
dst = &rename_dst[mx[i].dst];
- if (dst->pair)
+ if (dst->is_rename)
continue; /* already done, either exact or fuzzy. */
if (!copies && rename_src[mx[i].src].p->one->rename_used)
continue;
@@ -448,6 +592,54 @@
return count;
}
+static void remove_unneeded_paths_from_src(int detecting_copies)
+{
+ int i, new_num_src;
+
+ if (detecting_copies)
+ return; /* nothing to remove */
+ if (break_idx)
+ return; /* culling incompatible with break detection */
+
+ /*
+ * Note on reasons why we cull unneeded sources but not destinations:
+ * 1) Pairings are stored in rename_dst (not rename_src), which we
+ * need to keep around. So, we just can't cull rename_dst even
+ * if we wanted to. But doing so wouldn't help because...
+ *
+ * 2) There is a matrix pairwise comparison that follows the
+ * "Performing inexact rename detection" progress message.
+ * Iterating over the destinations is done in the outer loop,
+ * hence we only iterate over each of those once and we can
+ * easily skip the outer loop early if the destination isn't
+ * relevant. That's only one check per destination path to
+ * skip.
+ *
+ * By contrast, the sources are iterated in the inner loop; if
+ * we check whether a source can be skipped, then we'll be
+ * checking it N separate times, once for each destination.
+ * We don't want to have to iterate over known-not-needed
+ * sources N times each, so avoid that by removing the sources
+ * from rename_src here.
+ */
+ for (i = 0, new_num_src = 0; i < rename_src_nr; i++) {
+ /*
+ * renames are stored in rename_dst, so if a rename has
+ * already been detected using this source, we can just
+ * remove the source knowing rename_dst has its info.
+ */
+ if (rename_src[i].p->one->rename_used)
+ continue;
+
+ if (new_num_src < i)
+ memcpy(&rename_src[new_num_src], &rename_src[i],
+ sizeof(struct diff_rename_src));
+ new_num_src++;
+ }
+
+ rename_src_nr = new_num_src;
+}
+
void diffcore_rename(struct diff_options *options)
{
int detect_rename = options->detect_rename;
@@ -456,9 +648,12 @@
struct diff_queue_struct outq;
struct diff_score *mx;
int i, j, rename_count, skip_unmodified = 0;
- int num_create, dst_cnt;
+ int num_destinations, dst_cnt;
+ int num_sources, want_copies;
struct progress *progress = NULL;
+ trace2_region_enter("diff", "setup", options->repo);
+ want_copies = (detect_rename == DIFF_DETECT_COPY);
if (!minimum_score)
minimum_score = DEFAULT_RENAME_SCORE;
@@ -473,7 +668,7 @@
else if (!options->flags.rename_empty &&
is_empty_blob_oid(&p->two->oid))
continue;
- else if (add_rename_dst(p->two) < 0) {
+ else if (add_rename_dst(p) < 0) {
warning("skipping rename detection, detected"
" duplicate destination '%s'",
p->two->path);
@@ -495,7 +690,7 @@
p->one->rename_used++;
register_rename_src(p);
}
- else if (detect_rename == DIFF_DETECT_COPY) {
+ else if (want_copies) {
/*
* Increment the "rename_used" score by
* one, to indicate ourselves as a user.
@@ -504,30 +699,77 @@
register_rename_src(p);
}
}
+ trace2_region_leave("diff", "setup", options->repo);
if (rename_dst_nr == 0 || rename_src_nr == 0)
goto cleanup; /* nothing to do */
+ trace2_region_enter("diff", "exact renames", options->repo);
/*
* We really want to cull the candidates list early
* with cheap tests in order to avoid doing deltas.
*/
rename_count = find_exact_renames(options);
+ trace2_region_leave("diff", "exact renames", options->repo);
/* Did we only want exact renames? */
if (minimum_score == MAX_SCORE)
goto cleanup;
- /*
- * Calculate how many renames are left (but all the source
- * files still remain as options for rename/copies!)
- */
- num_create = (rename_dst_nr - rename_count);
+ num_sources = rename_src_nr;
+
+ if (want_copies || break_idx) {
+ /*
+ * Cull sources:
+ * - remove ones corresponding to exact renames
+ */
+ trace2_region_enter("diff", "cull after exact", options->repo);
+ remove_unneeded_paths_from_src(want_copies);
+ trace2_region_leave("diff", "cull after exact", options->repo);
+ } else {
+ /* Determine minimum score to match basenames */
+ double factor = 0.5;
+ char *basename_factor = getenv("GIT_BASENAME_FACTOR");
+ int min_basename_score;
+
+ if (basename_factor)
+ factor = strtol(basename_factor, NULL, 10)/100.0;
+ assert(factor >= 0.0 && factor <= 1.0);
+ min_basename_score = minimum_score +
+ (int)(factor * (MAX_SCORE - minimum_score));
+
+ /*
+ * Cull sources:
+ * - remove ones involved in renames (found via exact match)
+ */
+ trace2_region_enter("diff", "cull after exact", options->repo);
+ remove_unneeded_paths_from_src(want_copies);
+ trace2_region_leave("diff", "cull after exact", options->repo);
+
+ /* Utilize file basenames to quickly find renames. */
+ trace2_region_enter("diff", "basename matches", options->repo);
+ rename_count += find_basename_matches(options,
+ min_basename_score);
+ trace2_region_leave("diff", "basename matches", options->repo);
+
+ /*
+ * Cull sources, again:
+ * - remove ones involved in renames (found via basenames)
+ */
+ trace2_region_enter("diff", "cull basename", options->repo);
+ remove_unneeded_paths_from_src(want_copies);
+ trace2_region_leave("diff", "cull basename", options->repo);
+ }
+
+ /* Calculate how many rename destinations are left */
+ num_destinations = (rename_dst_nr - rename_count);
+ num_sources = rename_src_nr; /* rename_src_nr reflects lower number */
/* All done? */
- if (!num_create)
+ if (!num_destinations || !num_sources)
goto cleanup;
- switch (too_many_rename_candidates(num_create, options)) {
+ switch (too_many_rename_candidates(num_destinations, num_sources,
+ options)) {
case 1:
goto cleanup;
case 2:
@@ -538,19 +780,20 @@
break;
}
+ trace2_region_enter("diff", "inexact renames", options->repo);
if (options->show_rename_progress) {
progress = start_delayed_progress(
_("Performing inexact rename detection"),
- (uint64_t)rename_dst_nr * (uint64_t)rename_src_nr);
+ (uint64_t)num_destinations * (uint64_t)num_sources);
}
- mx = xcalloc(st_mult(NUM_CANDIDATE_PER_DST, num_create), sizeof(*mx));
+ CALLOC_ARRAY(mx, st_mult(NUM_CANDIDATE_PER_DST, num_destinations));
for (dst_cnt = i = 0; i < rename_dst_nr; i++) {
- struct diff_filespec *two = rename_dst[i].two;
+ struct diff_filespec *two = rename_dst[i].p->two;
struct diff_score *m;
- if (rename_dst[i].pair)
- continue; /* dealt with exact match already. */
+ if (rename_dst[i].is_rename)
+ continue; /* exact or basename match already handled */
m = &mx[dst_cnt * NUM_CANDIDATE_PER_DST];
for (j = 0; j < NUM_CANDIDATE_PER_DST; j++)
@@ -560,13 +803,16 @@
struct diff_filespec *one = rename_src[j].p->one;
struct diff_score this_src;
+ assert(!one->rename_used || want_copies || break_idx);
+
if (skip_unmodified &&
diff_unmodified_pair(rename_src[j].p))
continue;
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;
@@ -579,7 +825,8 @@
diff_free_filespec_blob(two);
}
dst_cnt++;
- display_progress(progress, (uint64_t)(i+1)*(uint64_t)rename_src_nr);
+ display_progress(progress,
+ (uint64_t)dst_cnt * (uint64_t)num_sources);
}
stop_progress(&progress);
@@ -587,14 +834,16 @@
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)
+ if (want_copies)
rename_count += find_renames(mx, dst_cnt, minimum_score, 1);
free(mx);
+ trace2_region_leave("diff", "inexact renames", options->repo);
cleanup:
/* At this point, we have found some renames and copies and they
* are recorded in rename_dst. The original list is still in *q.
*/
+ trace2_region_enter("diff", "write back to queue", options->repo);
DIFF_QUEUE_CLEAR(&outq);
for (i = 0; i < q->nr; i++) {
struct diff_filepair *p = q->queue[i];
@@ -604,22 +853,8 @@
diff_q(&outq, p);
}
else if (!DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
- /*
- * Creation
- *
- * We would output this create record if it has
- * not been turned into a rename/copy already.
- */
- struct diff_rename_dst *dst = locate_rename_dst(p->two);
- if (dst && dst->pair) {
- diff_q(&outq, dst->pair);
- pair_to_free = p;
- }
- else
- /* no matching rename/copy source, so
- * record this as a creation.
- */
- diff_q(&outq, p);
+ /* Creation */
+ diff_q(&outq, p);
}
else if (DIFF_FILE_VALID(p->one) && !DIFF_FILE_VALID(p->two)) {
/*
@@ -640,8 +875,10 @@
*/
if (DIFF_PAIR_BROKEN(p)) {
/* broken delete */
- struct diff_rename_dst *dst = locate_rename_dst(p->one);
- if (dst && dst->pair)
+ struct diff_rename_dst *dst = locate_rename_dst(p);
+ if (!dst)
+ BUG("tracking failed somehow; failed to find associated dst for broken pair");
+ if (dst->is_rename)
/* counterpart is now rename/copy */
pair_to_free = p;
}
@@ -651,16 +888,14 @@
pair_to_free = p;
}
- if (pair_to_free)
- ;
- else
+ if (!pair_to_free)
diff_q(&outq, p);
}
else if (!diff_unmodified_pair(p))
/* all the usual ones need to be kept */
diff_q(&outq, p);
else
- /* no need to keep unmodified pairs */
+ /* no need to keep unmodified pairs; FIXME: remove earlier? */
pair_to_free = p;
if (pair_to_free)
@@ -673,11 +908,17 @@
diff_debug_queue("done collapsing", q);
for (i = 0; i < rename_dst_nr; i++)
- free_filespec(rename_dst[i].two);
+ if (rename_dst[i].filespec_to_free)
+ free_filespec(rename_dst[i].filespec_to_free);
FREE_AND_NULL(rename_dst);
rename_dst_nr = rename_dst_alloc = 0;
FREE_AND_NULL(rename_src);
rename_src_nr = rename_src_alloc = 0;
+ if (break_idx) {
+ strintmap_clear(break_idx);
+ FREE_AND_NULL(break_idx);
+ }
+ trace2_region_leave("diff", "write back to queue", options->repo);
return;
}
diff --git a/diffcore-rotate.c b/diffcore-rotate.c
new file mode 100644
index 0000000..445f060
--- /dev/null
+++ b/diffcore-rotate.c
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2021, Google LLC.
+ * Based on diffcore-order.c, which is Copyright (C) 2005, Junio C Hamano
+ */
+#include "cache.h"
+#include "diff.h"
+#include "diffcore.h"
+
+void diffcore_rotate(struct diff_options *opt)
+{
+ struct diff_queue_struct *q = &diff_queued_diff;
+ struct diff_queue_struct outq;
+ int rotate_to, i;
+
+ if (!q->nr)
+ return;
+
+ for (i = 0; i < q->nr; i++) {
+ int cmp = strcmp(opt->rotate_to, q->queue[i]->two->path);
+ if (!cmp)
+ break; /* exact match */
+ if (!opt->rotate_to_strict && cmp < 0)
+ break; /* q->queue[i] is now past the target pathname */
+ }
+
+ if (q->nr <= i) {
+ /* we did not find the specified path */
+ if (opt->rotate_to_strict)
+ die(_("No such path '%s' in the diff"), opt->rotate_to);
+ return;
+ }
+
+ DIFF_QUEUE_CLEAR(&outq);
+ rotate_to = i;
+
+ for (i = rotate_to; i < q->nr; i++)
+ diff_q(&outq, q->queue[i]);
+ for (i = 0; i < rotate_to; i++) {
+ if (opt->skip_instead_of_rotate)
+ diff_free_filepair(q->queue[i]);
+ else
+ diff_q(&outq, q->queue[i]);
+ }
+ free(q->queue);
+ *q = outq;
+}
diff --git a/diffcore.h b/diffcore.h
index 7c07347..c1592bc 100644
--- a/diffcore.h
+++ b/diffcore.h
@@ -65,9 +65,25 @@
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 *);
@@ -148,6 +164,7 @@
void diffcore_merge_broken(void);
void diffcore_pickaxe(struct diff_options *);
void diffcore_order(const char *orderfile);
+void diffcore_rotate(struct diff_options *);
/* low-level interface to diffcore_order */
struct obj_order {
@@ -182,4 +199,12 @@
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/dir.c b/dir.c
index 0ffb1b3..19c2fa2 100644
--- a/dir.c
+++ b/dir.c
@@ -54,6 +54,11 @@
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)
{
int cnt = 0;
@@ -193,6 +198,10 @@
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
@@ -364,7 +373,8 @@
return MATCHED_FNMATCH;
/* Perform checks to see if "name" is a leading string of the pathspec */
- if (flags & DO_MATCH_LEADING_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) &&
@@ -401,6 +411,10 @@
}
/*
+ * 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.
@@ -486,13 +500,12 @@
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)
@@ -503,6 +516,16 @@
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
*/
@@ -511,11 +534,11 @@
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_LEADING_PATHSPEC);
+ int matched = match_pathspec_with_flags(istate, ps, submodule_name,
+ strlen(submodule_name),
+ 0, seen,
+ DO_MATCH_DIRECTORY |
+ DO_MATCH_LEADING_PATHSPEC);
return matched;
}
@@ -794,8 +817,8 @@
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);
+ hashmap_clear_and_free(&pl->parent_hashmap, struct pattern_entry, ent);
+ hashmap_clear_and_free(&pl->recursive_hashmap, struct pattern_entry, ent);
pl->use_cone_patterns = 0;
}
@@ -898,6 +921,8 @@
free(pl->patterns[i]);
free(pl->patterns);
free(pl->filebuf);
+ hashmap_clear_and_free(&pl->recursive_hashmap, struct pattern_entry, ent);
+ hashmap_clear_and_free(&pl->parent_hashmap, struct pattern_entry, ent);
memset(pl, 0, sizeof(*pl));
}
@@ -1015,9 +1040,9 @@
* an index if 'istate' is non-null), parse it and store the
* exclude rules in "pl".
*
- * If "ss" is not NULL, compute SHA-1 of the exclude file and fill
+ * If "oid_stat" is not NULL, compute oid of the exclude file and fill
* stat data from disk (only valid if add_patterns returns zero). If
- * ss_valid is non-zero, "ss" must contain good value as input.
+ * oid_stat.valid is non-zero, "oid_stat" must contain good value as input.
*/
static int add_patterns(const char *fname, const char *base, int baselen,
struct pattern_list *pl, struct index_state *istate,
@@ -1065,7 +1090,7 @@
int pos;
if (oid_stat->valid &&
!match_stat_data_racy(istate, &oid_stat->stat, &st))
- ; /* no content change, ss->sha1 still good */
+ ; /* no content change, oid_stat->oid still good */
else if (istate &&
(pos = index_name_pos(istate, fname, strlen(fname))) >= 0 &&
!ce_stage(istate->cache[pos]) &&
@@ -1463,7 +1488,7 @@
const char *cp;
struct oid_stat oid_stat;
- stk = xcalloc(1, sizeof(*stk));
+ CALLOC_ARRAY(stk, 1);
if (current < 0) {
cp = base;
current = 0;
@@ -1727,36 +1752,64 @@
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)
{
- int nested_repo = 0;
-
+ /*
+ * 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:
+ enum exist_status status = directory_exists_in_index(istate, dirname, len-1);
+
+ if (status == index_directory)
return path_recurse;
-
- case index_gitdir:
+ 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:
+ /*
+ * 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) ||
- !(dir->flags & DIR_NO_GITLINKS)) {
- struct strbuf sb = STRBUF_INIT;
- strbuf_addstr(&sb, dirname);
- nested_repo = is_nonbare_repository_dir(&sb);
- strbuf_release(&sb);
- }
- if (nested_repo)
- return ((dir->flags & DIR_SKIP_NESTED_GIT) ? path_none :
- (exclude ? path_excluded : path_untracked));
+ (matches_how == MATCHED_RECURSIVELY_LEADING_PATHSPEC))
+ return path_none;
+ return excluded ? path_excluded : path_untracked;
+ }
- if (dir->flags & DIR_SHOW_OTHER_DIRECTORIES)
- break;
- if (exclude &&
- (dir->flags & DIR_SHOW_IGNORED_TOO) &&
- (dir->flags & DIR_SHOW_IGNORED_TOO_MODE_MATCHING)) {
+ 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
@@ -1783,18 +1836,135 @@
/* This is the "show_other_directories" case */
- if (!(dir->flags & DIR_HIDE_EMPTY_DIRECTORIES))
- return exclude ? path_excluded : path_untracked;
-
- untracked = lookup_untracked(dir->untracked, untracked,
- dirname + baselen, len - baselen);
+ /*
+ * 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;
/*
- * If this is an excluded directory, then we only need to check if
- * the directory contains any files.
+ * 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)
*/
- return read_directory_recursive(dir, istate, dirname, len,
- untracked, 1, exclude, pathspec);
+ 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;
+ }
+ }
+
+ /*
+ * We may need to ignore some of the untracked paths we found while
+ * traversing subdirectories.
+ */
+ 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;
}
/*
@@ -1934,93 +2104,18 @@
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)
-{
- int exclude;
- int has_path_in_index = !!index_file_exists(istate, path->buf, path->len, ignore_case);
- enum path_treatment path_treatment;
-
- dtype = resolve_dtype(dtype, istate, path->buf, path->len);
-
- /* Always exclude indexed files */
- if (dtype != DT_DIR && has_path_in_index)
- return path_none;
-
- /*
- * When we are looking at a directory P in the working tree,
- * there are three cases:
- *
- * (1) P exists in the index. Everything inside the directory P in
- * the working tree needs to go when P is checked out from the
- * index.
- *
- * (2) P does not exist in the index, but there is P/Q in the index.
- * We know P will stay a directory when we check out the contents
- * of the index, but we do not know yet if there is a directory
- * P/Q in the working tree to be killed, so we need to recurse.
- *
- * (3) P does not exist in the index, and there is no P/Q in the index
- * to require P to be a directory, either. Only in this case, we
- * know that everything inside P will not be killed without
- * recursing.
- */
- if ((dir->flags & DIR_COLLECT_KILLED_ONLY) &&
- (dtype == DT_DIR) &&
- !has_path_in_index &&
- (directory_exists_in_index(istate, path->buf, path->len) == index_nonexistent))
- return path_none;
-
- exclude = 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)))
- 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).
- */
- 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;
- 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)
{
+ /*
+ * 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);
@@ -2054,8 +2149,10 @@
int baselen,
const struct pathspec *pathspec)
{
+ int has_path_in_index, dtype, excluded;
+
if (!cdir->d_name)
- return treat_path_fast(dir, untracked, cdir, istate, path,
+ 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;
@@ -2064,8 +2161,72 @@
if (simplify_away(path->buf, path->len, pathspec))
return path_none;
- return treat_one_path(dir, untracked, istate, path, baselen, pathspec,
- cdir->d_type);
+ dtype = 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;
+
+ /*
+ * When we are looking at a directory P in the working tree,
+ * there are three cases:
+ *
+ * (1) P exists in the index. Everything inside the directory P in
+ * the working tree needs to go when P is checked out from the
+ * index.
+ *
+ * (2) P does not exist in the index, but there is P/Q in the index.
+ * We know P will stay a directory when we check out the contents
+ * of the index, but we do not know yet if there is a directory
+ * P/Q in the working tree to be killed, so we need to recurse.
+ *
+ * (3) P does not exist in the index, and there is no P/Q in the index
+ * to require P to be a directory, either. Only in this case, we
+ * know that everything inside P will not be killed without
+ * recursing.
+ */
+ if ((dir->flags & DIR_COLLECT_KILLED_ONLY) &&
+ (dtype == DT_DIR) &&
+ !has_path_in_index &&
+ (directory_exists_in_index(istate, path->buf, path->len) == index_nonexistent))
+ return path_none;
+
+ excluded = is_excluded(dir, istate, path->buf, &dtype);
+
+ /*
+ * Excluded? If we don't explicitly want to show
+ * ignored files, ignore it
+ */
+ if (excluded && !(dir->flags & (DIR_SHOW_IGNORED|DIR_SHOW_IGNORED_TOO)))
+ return path_excluded;
+
+ switch (dtype) {
+ default:
+ return path_none;
+ case DT_DIR:
+ /*
+ * 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.
+ */
+ strbuf_addch(path, '/');
+ return treat_directory(dir, istate, untracked,
+ path->buf, path->len,
+ baselen, excluded, pathspec);
+ case DT_REG:
+ case DT_LNK:
+ 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;
+ }
}
static void add_untracked(struct untracked_cache_dir *dir, const char *name)
@@ -2245,7 +2406,7 @@
* 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
@@ -2258,14 +2419,10 @@
int stop_at_first_file, const struct pathspec *pathspec)
{
/*
- * WARNING WARNING WARNING:
- *
- * Any updates to the traversal logic here may need corresponding
- * updates in treat_leading_path(). See the commit message for the
- * commit adding this warning as well as the commit preceding it
- * for details.
+ * 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;
@@ -2287,13 +2444,7 @@
dir_state = state;
/* recurse into subdir if instructed by treat_path */
- if ((state == path_recurse) ||
- ((state == path_untracked) &&
- (resolve_dtype(cdir.d_type, istate, path.buf, path.len) == DT_DIR) &&
- ((dir->flags & DIR_SHOW_IGNORED_TOO) ||
- (pathspec &&
- do_match_pathspec(istate, pathspec, path.buf, path.len,
- baselen, NULL, DO_MATCH_LEADING_PATHSPEC) == MATCHED_RECURSIVELY_LEADING_PATHSPEC)))) {
+ if (state == path_recurse) {
struct untracked_cache_dir *ud;
ud = lookup_untracked(dir->untracked, untracked,
path.buf + baselen,
@@ -2341,7 +2492,7 @@
add_untracked(untracked, path.buf + baselen);
break;
}
- /* skip the dir_add_* part */
+ /* skip the add_path_to_appropriate_result_list() */
continue;
}
@@ -2377,15 +2528,6 @@
const char *path, int len,
const struct pathspec *pathspec)
{
- /*
- * WARNING WARNING WARNING:
- *
- * Any updates to the traversal logic here may need corresponding
- * updates in read_directory_recursive(). See 777b420347 (dir:
- * synchronize treat_leading_path() and read_directory_recursive(),
- * 2019-12-19) and its parent commit for details.
- */
-
struct strbuf sb = STRBUF_INIT;
struct strbuf subdir = STRBUF_INIT;
int prevlen, baselen;
@@ -2436,23 +2578,7 @@
strbuf_reset(&subdir);
strbuf_add(&subdir, path+prevlen, baselen-prevlen);
cdir.d_name = subdir.buf;
- state = treat_path(dir, NULL, &cdir, istate, &sb, prevlen,
- pathspec);
- if (state == path_untracked &&
- resolve_dtype(cdir.d_type, istate, sb.buf, sb.len) == DT_DIR &&
- (dir->flags & DIR_SHOW_IGNORED_TOO ||
- do_match_pathspec(istate, pathspec, sb.buf, sb.len,
- baselen, NULL, DO_MATCH_LEADING_PATHSPEC) == MATCHED_RECURSIVELY_LEADING_PATHSPEC)) {
- if (!match_pathspec(istate, pathspec, sb.buf, sb.len,
- 0 /* prefix */, NULL,
- 0 /* do NOT special case dirs */))
- state = path_none;
- add_path_to_appropriate_result_list(dir, NULL, &cdir,
- istate,
- &sb, baselen,
- pathspec, state);
- state = path_recurse;
- }
+ state = treat_path(dir, NULL, &cdir, istate, &sb, prevlen, pathspec);
if (state != path_recurse)
break; /* do not recurse into it */
@@ -2604,11 +2730,8 @@
return NULL;
}
- if (!dir->untracked->root) {
- const int len = sizeof(*dir->untracked->root);
- dir->untracked->root = xmalloc(len);
- memset(dir->untracked->root, 0, len);
- }
+ if (!dir->untracked->root)
+ FLEX_ALLOC_STR(dir->untracked->root, name, "");
/* Validate $GIT_DIR/info/exclude and core.excludesfile */
root = dir->untracked->root;
@@ -2652,28 +2775,6 @@
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;
@@ -2894,6 +2995,23 @@
}
}
+char *get_sparse_checkout_filename(void)
+{
+ return git_pathdup("info/sparse-checkout");
+}
+
+int get_sparse_checkout_patterns(struct pattern_list *pl)
+{
+ int res;
+ char *sparse_filename = get_sparse_checkout_filename();
+
+ pl->use_cone_patterns = core_sparse_checkout_cone;
+ res = add_patterns_from_file_to_list(sparse_filename, "", 0, pl, NULL);
+
+ free(sparse_filename);
+ return res;
+}
+
int remove_path(const char *name)
{
char *slash;
@@ -2914,10 +3032,10 @@
}
/*
- * 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;
@@ -2935,6 +3053,13 @@
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;
@@ -2942,6 +3067,8 @@
stk = prev;
}
strbuf_release(&dir->basebuf);
+
+ dir_init(dir);
}
struct ondisk_untracked_cache {
@@ -3035,7 +3162,7 @@
int varint_len;
const unsigned hashsz = the_hash_algo->rawsz;
- ouc = xcalloc(1, sizeof(*ouc));
+ CALLOC_ARRAY(ouc, 1);
stat_data_to_disk(&ouc->info_exclude_stat, &untracked->ss_info_exclude.stat);
stat_data_to_disk(&ouc->excludes_file_stat, &untracked->ss_excludes_file.stat);
ouc->dir_flags = htonl(untracked->dir_flags);
@@ -3246,7 +3373,7 @@
if (next + exclude_per_dir_offset + 1 > end)
return NULL;
- uc = xcalloc(1, sizeof(*uc));
+ CALLOC_ARRAY(uc, 1);
strbuf_init(&uc->ident, ident_len);
strbuf_add(&uc->ident, ident, ident_len);
load_oid_stat(&uc->ss_info_exclude,
diff --git a/dir.h b/dir.h
index 5855c06..facfae4 100644
--- a/dir.h
+++ b/dir.h
@@ -19,24 +19,23 @@
* CE_SKIP_WORKTREE marked. If you want to exclude files, make sure you have
* loaded the index first.
*
- * - Prepare `struct dir_struct dir` and clear it with `memset(&dir, 0,
- * sizeof(dir))`.
+ * - 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.
+ * `add_patterns_from_file()` , and/or set `dir.exclude_per_dir`.
*
- * - Set options described in the Data Structure section above.
+ * - 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 `read_directory()`.
+ * - Call `fill_directory()`.
*
- * - Use `dir.entries[]`.
+ * - Use `dir.entries[]` and `dir.ignored[]`.
*
- * - Call `clear_directory()` when none of the contained elements are no longer in use.
+ * - Call `dir_clear()` when the contained elements are no longer in use.
*
*/
@@ -362,6 +361,8 @@
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);
@@ -428,7 +429,7 @@
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 clear_directory(struct dir_struct *dir);
+void dir_clear(struct dir_struct *dir);
int repo_file_exists(struct repository *repo, const char *path);
int file_exists(const char *);
@@ -447,6 +448,8 @@
void setup_standard_excludes(struct dir_struct *dir);
+char *get_sparse_checkout_filename(void);
+int get_sparse_checkout_patterns(struct pattern_list *pl);
/* Constants for remove_dir_recursively: */
diff --git a/editor.c b/editor.c
index f079abb..6303ae0 100644
--- a/editor.c
+++ b/editor.c
@@ -40,7 +40,7 @@
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 @@
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 @@
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/entry.c b/entry.c
index 53380bb..7b9f437 100644
--- a/entry.c
+++ b/entry.c
@@ -113,8 +113,7 @@
/* 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 @@
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,
@@ -280,7 +282,7 @@
new_blob = read_blob_entry(ce, &size);
if (!new_blob)
return error("unable to read sha1 file of %s (%s)",
- path, oid_to_hex(&ce->oid));
+ ce->name, oid_to_hex(&ce->oid));
/*
* We can't make a real symlink; write out a regular file entry
@@ -307,7 +309,7 @@
new_blob = read_blob_entry(ce, &size);
if (!new_blob)
return error("unable to read sha1 file of %s (%s)",
- path, oid_to_hex(&ce->oid));
+ ce->name, oid_to_hex(&ce->oid));
}
/*
@@ -315,13 +317,13 @@
*/
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);
@@ -352,7 +354,7 @@
case S_IFGITLINK:
if (to_tempfile)
- return error("cannot create temporary submodule %s", path);
+ return error("cannot create temporary submodule %s", ce->name);
if (mkdir(path, 0777) < 0)
return error("cannot create submodule directory %s", path);
sub = submodule_from_ce(ce);
@@ -363,7 +365,7 @@
break;
default:
- return error("unknown file mode for %s in index", path);
+ return error("unknown file mode for %s in index", ce->name);
}
finish:
@@ -508,8 +510,6 @@
/* 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/environment.c b/environment.c
index e72a02d..2f27008 100644
--- a/environment.c
+++ b/environment.c
@@ -9,14 +9,16 @@
*/
#include "cache.h"
#include "branch.h"
+#include "environment.h"
#include "repository.h"
#include "config.h"
#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;
@@ -34,8 +36,8 @@
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;
@@ -115,6 +117,7 @@
ALTERNATE_DB_ENVIRONMENT,
CONFIG_ENVIRONMENT,
CONFIG_DATA_ENVIRONMENT,
+ CONFIG_COUNT_ENVIRONMENT,
DB_ENVIRONMENT,
GIT_DIR_ENVIRONMENT,
GIT_WORK_TREE_ENVIRONMENT,
@@ -151,19 +154,15 @@
return strbuf_detach(&buf, NULL);
}
-/*
- * 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)
+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)
@@ -171,7 +170,7 @@
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);
@@ -179,7 +178,7 @@
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;
@@ -254,8 +253,11 @@
*/
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",
@@ -264,6 +266,8 @@
}
git_work_tree_initialized = 1;
repo_set_worktree(the_repository, new_work_tree);
+
+ strbuf_release(&realpath);
}
const char *get_git_work_tree(void)
@@ -345,11 +349,20 @@
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/environment.h b/environment.h
new file mode 100644
index 0000000..d438b5c
--- /dev/null
+++ b/environment.h
@@ -0,0 +1,12 @@
+#ifndef ENVIRONMENT_H
+#define ENVIRONMENT_H
+
+#include "strvec.h"
+
+/*
+ * Wrapper of getenv() that returns a strdup value. This value is kept
+ * in argv to be freed later.
+ */
+const char *getenv_safe(struct strvec *argv, const char *name);
+
+#endif
diff --git a/ewah/bitmap.c b/ewah/bitmap.c
index d8cec58..38a47c4 100644
--- a/ewah/bitmap.c
+++ b/ewah/bitmap.c
@@ -25,7 +25,7 @@
struct bitmap *bitmap_word_alloc(size_t word_alloc)
{
struct bitmap *bitmap = xmalloc(sizeof(struct bitmap));
- bitmap->words = xcalloc(word_alloc, sizeof(eword_t));
+ CALLOC_ARRAY(bitmap->words, word_alloc);
bitmap->word_alloc = word_alloc;
return bitmap;
}
@@ -35,18 +35,26 @@
return bitmap_word_alloc(32);
}
+struct bitmap *bitmap_dup(const struct bitmap *src)
+{
+ struct bitmap *dst = bitmap_word_alloc(src->word_alloc);
+ COPY_ARRAY(dst->words, src->words, src->word_alloc);
+ return dst;
+}
+
+static void bitmap_grow(struct bitmap *self, size_t word_alloc)
+{
+ size_t old_size = self->word_alloc;
+ ALLOC_GROW(self->words, word_alloc, self->word_alloc);
+ memset(self->words + old_size, 0x0,
+ (self->word_alloc - old_size) * sizeof(eword_t));
+}
+
void bitmap_set(struct bitmap *self, size_t pos)
{
size_t block = EWAH_BLOCK(pos);
- if (block >= self->word_alloc) {
- size_t old_size = self->word_alloc;
- self->word_alloc = block ? block * 2 : 1;
- REALLOC_ARRAY(self->words, self->word_alloc);
- memset(self->words + old_size, 0x0,
- (self->word_alloc - old_size) * sizeof(eword_t));
- }
-
+ bitmap_grow(self, block + 1);
self->words[block] |= EWAH_MASK(pos);
}
@@ -121,6 +129,15 @@
self->words[i] &= ~other->words[i];
}
+void bitmap_or(struct bitmap *self, const struct bitmap *other)
+{
+ size_t i;
+
+ bitmap_grow(self, other->word_alloc);
+ for (i = 0; i < other->word_alloc; i++)
+ self->words[i] |= other->words[i];
+}
+
void bitmap_or_ewah(struct bitmap *self, struct ewah_bitmap *other)
{
size_t original_size = self->word_alloc;
@@ -178,6 +195,27 @@
return 1;
}
+int bitmap_is_subset(struct bitmap *self, struct bitmap *other)
+{
+ size_t common_size, i;
+
+ if (self->word_alloc < other->word_alloc)
+ common_size = self->word_alloc;
+ else {
+ common_size = other->word_alloc;
+ for (i = common_size; i < self->word_alloc; i++) {
+ if (self->words[i])
+ return 1;
+ }
+ }
+
+ for (i = 0; i < common_size; i++) {
+ if (self->words[i] & ~other->words[i])
+ return 1;
+ }
+ return 0;
+}
+
void bitmap_reset(struct bitmap *bitmap)
{
memset(bitmap->words, 0x0, bitmap->word_alloc * sizeof(eword_t));
diff --git a/ewah/ewah_bitmap.c b/ewah/ewah_bitmap.c
index d59b1af..2a8c7c5 100644
--- a/ewah/ewah_bitmap.c
+++ b/ewah/ewah_bitmap.c
@@ -19,6 +19,7 @@
#include "git-compat-util.h"
#include "ewok.h"
#include "ewok_rlw.h"
+#include "cache.h"
static inline size_t min_size(size_t a, size_t b)
{
@@ -33,20 +34,13 @@
static inline void buffer_grow(struct ewah_bitmap *self, size_t new_size)
{
size_t rlw_offset = (uint8_t *)self->rlw - (uint8_t *)self->buffer;
-
- if (self->alloc_size >= new_size)
- return;
-
- self->alloc_size = new_size;
- REALLOC_ARRAY(self->buffer, self->alloc_size);
+ ALLOC_GROW(self->buffer, new_size, self->alloc_size);
self->rlw = self->buffer + (rlw_offset / sizeof(eword_t));
}
static inline void buffer_push(struct ewah_bitmap *self, eword_t value)
{
- if (self->buffer_size + 1 >= self->alloc_size)
- buffer_grow(self, self->buffer_size * 3 / 2);
-
+ buffer_grow(self, self->buffer_size + 1);
self->buffer[self->buffer_size++] = value;
}
@@ -137,8 +131,7 @@
rlw_set_literal_words(self->rlw, literals + can_add);
- if (self->buffer_size + can_add >= self->alloc_size)
- buffer_grow(self, (self->buffer_size + can_add) * 3 / 2);
+ buffer_grow(self, self->buffer_size + can_add);
if (negate) {
size_t i;
diff --git a/ewah/ewok.h b/ewah/ewok.h
index 011852b..6692096 100644
--- a/ewah/ewok.h
+++ b/ewah/ewok.h
@@ -173,13 +173,14 @@
struct bitmap *bitmap_new(void);
struct bitmap *bitmap_word_alloc(size_t word_alloc);
+struct bitmap *bitmap_dup(const struct bitmap *src);
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);
int bitmap_equals(struct bitmap *self, struct bitmap *other);
-int bitmap_is_subset(struct bitmap *self, struct bitmap *super);
+int bitmap_is_subset(struct bitmap *self, struct bitmap *other);
struct ewah_bitmap * bitmap_to_ewah(struct bitmap *bitmap);
struct bitmap *ewah_to_bitmap(struct ewah_bitmap *ewah);
diff --git a/exec-cmd.c b/exec-cmd.c
index 7deeab3..eeb2ee5 100644
--- a/exec-cmd.c
+++ b/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 @@
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/exec-cmd.h b/exec-cmd.h
index 8cd1df2..330b41d 100644
--- a/exec-cmd.h
+++ b/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/fetch-negotiator.c b/fetch-negotiator.c
index 0a1357d..57ed578 100644
--- a/fetch-negotiator.c
+++ b/fetch-negotiator.c
@@ -2,6 +2,7 @@
#include "fetch-negotiator.h"
#include "negotiator/default.h"
#include "negotiator/skipping.h"
+#include "negotiator/noop.h"
#include "repository.h"
void fetch_negotiator_init(struct repository *r,
@@ -13,6 +14,10 @@
skipping_negotiator_init(negotiator);
return;
+ case FETCH_NEGOTIATION_NOOP:
+ noop_negotiator_init(negotiator);
+ return;
+
case FETCH_NEGOTIATION_DEFAULT:
default:
default_negotiator_init(negotiator);
diff --git a/fetch-pack.c b/fetch-pack.c
index 1734a57..fb04a76 100644
--- a/fetch-pack.c
+++ b/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,9 +35,11 @@
static int transfer_fsck_objects = -1;
static int agent_supported;
static int server_supports_filtering;
-static struct lock_file shallow_lock;
+static int advertise_sid;
+static struct shallow_lock shallow_lock;
static const char *alternate_shallow_file;
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)
@@ -106,24 +109,48 @@
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);
+ struct commit *c = deref_without_lazy_fetch(oid, 0);
- if (o && o->type == OBJ_COMMIT)
- negotiator->add_tip(negotiator, (struct commit *)o);
-
+ 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 {
@@ -199,7 +226,7 @@
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
@@ -228,13 +255,12 @@
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;
}
@@ -260,10 +286,8 @@
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) {
@@ -280,12 +304,8 @@
* 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;
}
@@ -307,6 +327,8 @@
if (deepen_not_ok) strbuf_addstr(&c, " deepen-not");
if (agent_supported) strbuf_addf(&c, " agent=%s",
git_user_agent_sanitized());
+ if (advertise_sid)
+ strbuf_addf(&c, " session-id=%s", trace2_session_id());
if (args->filter_options.choice)
strbuf_addstr(&c, " filter");
packet_buf_write(&req_buf, "want %s%s\n", remote_hex, c.buf);
@@ -385,8 +407,6 @@
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));
@@ -501,21 +521,11 @@
static int mark_complete(const struct object_id *oid)
{
- struct object *o = parse_object(the_repository, oid);
+ struct commit *commit = deref_without_lazy_fetch(oid, 1);
- 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);
- }
+ if (commit && !(commit->object.flags & COMPLETE)) {
+ commit->object.flags |= COMPLETE;
+ commit_list_insert(commit, &complete);
}
return 0;
}
@@ -651,9 +661,7 @@
/*
* 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
@@ -700,7 +708,7 @@
*/
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)
@@ -714,16 +722,12 @@
*/
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);
@@ -768,13 +772,11 @@
return ret;
}
-static void write_promisor_file(const char *keep_name,
- struct ref **sought, int nr_sought)
+static void create_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");
@@ -783,18 +785,41 @@
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);
+ write_promisor_file(promisor_name.buf, sought, nr_sought);
strbuf_release(&promisor_name);
}
+static void parse_gitmodules_oids(int fd, struct oidset *gitmodules_oids)
+{
+ int len = the_hash_algo->hexsz + 1; /* hash + NL */
+
+ do {
+ char hex_hash[GIT_MAX_HEXSZ + 1];
+ int read_len = read_in_full(fd, hex_hash, len);
+ struct object_id oid;
+ const char *end;
+
+ if (!read_len)
+ return;
+ if (read_len != len)
+ die("invalid length read %d", read_len);
+ if (parse_oid_hex(hex_hash, &oid, &end) || *end != '\n')
+ die("invalid hash");
+ oidset_insert(gitmodules_oids, &oid);
+ } while (1);
+}
+
+/*
+ * If packfile URIs were provided, pass a non-NULL pointer to index_pack_args.
+ * The strings to pass as the --index-pack-arg arguments to http-fetch will be
+ * stored there. (It must be freed by the caller.)
+ */
static int get_pack(struct fetch_pack_args *args,
- int xd[2], char **pack_lockfile,
- struct ref **sought, int nr_sought)
+ int xd[2], struct string_list *pack_lockfiles,
+ struct strvec *index_pack_args,
+ struct ref **sought, int nr_sought,
+ struct oidset *gitmodules_oids)
{
struct async demux;
int do_keep = args->keep_pack;
@@ -802,6 +827,7 @@
struct pack_header header;
int pass_header = 0;
struct child_process cmd = CHILD_PROCESS_INIT;
+ int fsck_objects = 0;
int ret;
memset(&demux, 0, sizeof(demux));
@@ -820,7 +846,7 @@
else
demux.out = xd[0];
- if (!args->keep_pack && unpack_limit) {
+ if (!args->keep_pack && unpack_limit && !index_pack_args) {
if (read_pack_header(demux.out, &header))
die(_("protocol error: bad pack header"));
@@ -832,74 +858,101 @@
}
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)
- cmd.out = -1;
- cmd_name = "index-pack";
- argv_array_push(&cmd.args, cmd_name);
- argv_array_push(&cmd.args, "--stdin");
- if (!args->quiet && !args->no_progress)
- argv_array_push(&cmd.args, "-v");
- if (args->use_thin_pack)
- argv_array_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);
- }
- if (args->check_self_contained_and_connected)
- argv_array_push(&cmd.args, "--check-self-contained-and-connected");
- /*
- * If we're obtaining the filename of a lockfile, we'll use
- * that filename to write a .promisor file with more
- * information below. If not, we need index-pack to do it for
- * us.
- */
- if (!(do_keep && pack_lockfile) && args->from_promisor)
- argv_array_push(&cmd.args, "--promisor");
- }
- else {
- cmd_name = "unpack-objects";
- argv_array_push(&cmd.args, cmd_name);
- if (args->quiet || args->no_progress)
- argv_array_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),
- ntohl(header.hdr_entries));
if (fetch_fsck_objects >= 0
? fetch_fsck_objects
: transfer_fsck_objects >= 0
? transfer_fsck_objects
- : 0) {
+ : 0)
+ fsck_objects = 1;
+
+ if (do_keep || args->from_promisor || index_pack_args || fsck_objects) {
+ if (pack_lockfiles || fsck_objects)
+ cmd.out = -1;
+ cmd_name = "index-pack";
+ strvec_push(&cmd.args, cmd_name);
+ strvec_push(&cmd.args, "--stdin");
+ if (!args->quiet && !args->no_progress)
+ strvec_push(&cmd.args, "-v");
+ if (args->use_thin_pack)
+ strvec_push(&cmd.args, "--fix-thin");
+ if ((do_keep || index_pack_args) && (args->lock_pack || unpack_limit)) {
+ char hostname[HOST_NAME_MAX + 1];
+ if (xgethostname(hostname, sizeof(hostname)))
+ xsnprintf(hostname, sizeof(hostname), "localhost");
+ strvec_pushf(&cmd.args,
+ "--keep=fetch-pack %"PRIuMAX " on %s",
+ (uintmax_t)getpid(), hostname);
+ }
+ if (!index_pack_args && 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)
/*
+ * create_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";
+ strvec_push(&cmd.args, cmd_name);
+ if (args->quiet || args->no_progress)
+ strvec_push(&cmd.args, "-q");
+ args->check_self_contained_and_connected = 0;
+ }
+
+ if (pass_header)
+ strvec_pushf(&cmd.args, "--pack_header=%"PRIu32",%"PRIu32,
+ ntohl(header.hdr_version),
+ ntohl(header.hdr_entries));
+ if (fsck_objects) {
+ if (args->from_promisor || index_pack_args)
+ /*
* 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);
+ }
+
+ if (index_pack_args) {
+ int i;
+
+ for (i = 0; i < cmd.args.nr; i++)
+ strvec_push(index_pack_args, cmd.args.v[i]);
}
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 || fsck_objects)) {
+ int is_well_formed;
+ char *pack_lockfile = index_pack_lockfile(cmd.out, &is_well_formed);
+
+ if (!is_well_formed)
+ die(_("fetch-pack: invalid index-pack output"));
+ if (pack_lockfile)
+ string_list_append_nodup(pack_lockfiles, pack_lockfile);
+ parse_gitmodules_oids(cmd.out, gitmodules_oids);
close(cmd.out);
}
@@ -921,8 +974,8 @@
* Now that index-pack has succeeded, write the promisor file using the
* obtained .keep filename if necessary
*/
- if (do_keep && pack_lockfile && args->from_promisor)
- write_promisor_file(*pack_lockfile, sought, nr_sought);
+ if (do_keep && pack_lockfiles && pack_lockfiles->nr && args->from_promisor)
+ create_promisor_file(pack_lockfiles->items[0].string, sought, nr_sought);
return 0;
}
@@ -934,12 +987,28 @@
return strcmp(a->name, b->name);
}
+static void fsck_gitmodules_oids(struct oidset *gitmodules_oids)
+{
+ struct oidset_iter iter;
+ const struct object_id *oid;
+ struct fsck_options fo = FSCK_OPTIONS_STRICT;
+
+ if (!oidset_size(gitmodules_oids))
+ return;
+
+ oidset_iter_init(gitmodules_oids, &iter);
+ while ((oid = oidset_iter_next(&iter)))
+ register_found_gitmodules(oid);
+ if (fsck_finish(&fo))
+ die("fsck failed");
+}
+
static struct ref *do_fetch_pack(struct fetch_pack_args *args,
int fd[2],
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);
@@ -948,13 +1017,10 @@
int agent_len;
struct fetch_negotiator negotiator_alloc;
struct fetch_negotiator *negotiator;
+ struct oidset gitmodules_oids = OIDSET_INIT;
- if (args->no_dependents) {
- negotiator = NULL;
- } else {
- negotiator = &negotiator_alloc;
- fetch_negotiator_init(r, negotiator);
- }
+ negotiator = &negotiator_alloc;
+ fetch_negotiator_init(r, negotiator);
sort_ref_list(&ref, ref_compare_name);
QSORT(sought, nr_sought, cmp_ref_by_name);
@@ -966,6 +1032,9 @@
agent_len, agent_feature);
}
+ if (!server_supports("session-id"))
+ advertise_sid = 0;
+
if (server_supports("shallow"))
print_verbose(args, _("Server supports %s"), "shallow");
else if (args->depth > 0 || is_repository_shallow(r))
@@ -1039,16 +1108,14 @@
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 (!args->keep_pack)
@@ -1066,8 +1133,10 @@
alternate_shallow_file = setup_temporary_shallow(si->shallow);
else
alternate_shallow_file = NULL;
- if (get_pack(args, fd, pack_lockfile, sought, nr_sought))
+ if (get_pack(args, fd, pack_lockfiles, NULL, sought, nr_sought,
+ &gitmodules_oids))
die(_("git fetch-pack: fetch failed."));
+ fsck_gitmodules_oids(&gitmodules_oids);
all_done:
if (negotiator)
@@ -1097,7 +1166,7 @@
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);
@@ -1114,12 +1183,8 @@
* 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;
}
@@ -1143,6 +1208,7 @@
}
static int add_haves(struct fetch_negotiator *negotiator,
+ int seen_ack,
struct strbuf *req_buf,
int *haves_to_send, int *in_vain)
{
@@ -1157,7 +1223,7 @@
}
*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;
@@ -1173,15 +1239,18 @@
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))
packet_buf_write(&req_buf, "command=fetch");
if (server_supports_v2("agent", 0))
packet_buf_write(&req_buf, "agent=%s", git_user_agent_sanitized());
+ if (advertise_sid && server_supports_v2("session-id", 0))
+ packet_buf_write(&req_buf, "session-id=%s", trace2_session_id());
if (args->server_options && args->server_options->nr &&
server_supports_v2("server-option", 1)) {
int i;
@@ -1190,6 +1259,17 @@
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");
@@ -1219,20 +1299,36 @@
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)
@@ -1268,9 +1364,29 @@
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;
@@ -1285,6 +1401,7 @@
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);
@@ -1319,8 +1436,8 @@
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,
@@ -1419,6 +1536,21 @@
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,
@@ -1427,13 +1559,20 @@
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);
@@ -1444,13 +1583,14 @@
int haves_to_send = INITIAL_FLUSH;
struct fetch_negotiator negotiator_alloc;
struct fetch_negotiator *negotiator;
+ int seen_ack = 0;
+ struct string_list packfile_uris = STRING_LIST_INIT_DUP;
+ int i;
+ struct strvec index_pack_args = STRVEC_INIT;
+ struct oidset gitmodules_oids = OIDSET_INIT;
- if (args->no_dependents) {
- negotiator = NULL;
- } else {
- negotiator = &negotiator_alloc;
- fetch_negotiator_init(r, negotiator);
- }
+ negotiator = &negotiator_alloc;
+ fetch_negotiator_init(r, negotiator);
packet_reader_init(&reader, fd[0], NULL, 0,
PACKET_READ_CHOMP_NEWLINE |
@@ -1474,21 +1614,16 @@
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 (!negotiation_started) {
@@ -1500,7 +1635,8 @@
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;
@@ -1508,13 +1644,19 @@
case FETCH_PROCESS_ACKS:
/* Process ACKs/NAKs */
switch (process_acks(negotiator, &reader, &common)) {
- case 2:
+ 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;
}
@@ -1530,10 +1672,15 @@
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, sought, nr_sought))
+ if (get_pack(args, fd, pack_lockfiles,
+ packfile_uris.nr ? &index_pack_args : NULL,
+ sought, nr_sought, &gitmodules_oids))
die(_("git fetch-pack: fetch failed."));
+ do_check_stateless_delimiter(args, &reader);
state = FETCH_DONE;
break;
@@ -1542,8 +1689,64 @@
}
}
+ for (i = 0; i < packfile_uris.nr; i++) {
+ int j;
+ 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);
+ for (j = 0; j < index_pack_args.nr; j++)
+ strvec_pushf(&cmd.args, "--index-pack-arg=%s",
+ index_pack_args.v[j]);
+ 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';
+
+ parse_gitmodules_oids(cmd.out, &gitmodules_oids);
+
+ 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);
+ strvec_clear(&index_pack_args);
+
+ fsck_gitmodules_oids(&gitmodules_oids);
+
if (negotiator)
negotiator->release(negotiator);
+
oidset_clear(&common);
return ref;
}
@@ -1580,6 +1783,15 @@
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_bool("transfer.advertisesid", &advertise_sid);
+ 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);
}
@@ -1629,9 +1841,9 @@
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;
}
@@ -1655,7 +1867,7 @@
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);
@@ -1693,7 +1905,7 @@
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;
@@ -1704,7 +1916,7 @@
* remote is also shallow, check what ref is safe to update
* without updating .git/shallow
*/
- status = xcalloc(nr_sought, sizeof(*status));
+ CALLOC_ARRAY(status, nr_sought);
assign_shallow_commits_to_refs(si, NULL, status);
if (si->nr_ours || si->nr_theirs) {
for (i = 0; i < nr_sought; i++)
@@ -1732,7 +1944,7 @@
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;
@@ -1743,20 +1955,6 @@
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"));
@@ -1767,11 +1965,11 @@
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);
@@ -1785,7 +1983,7 @@
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/fetch-pack.h b/fetch-pack.h
index 67f6842..736a3da 100644
--- a/fetch-pack.h
+++ b/fetch-pack.h
@@ -40,21 +40,15 @@
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 **sought,
int nr_sought,
struct oid_array *shallow,
- char **pack_lockfile,
+ struct string_list *pack_lockfiles,
enum protocol_version version);
/*
diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c
new file mode 100644
index 0000000..0f66818
--- /dev/null
+++ b/fmt-merge-msg.c
@@ -0,0 +1,696 @@
+#include "config.h"
+#include "refs.h"
+#include "object-store.h"
+#include "diff.h"
+#include "diff-merges.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 */
+
+ CALLOC_ARRAY(origin_data, 1);
+ 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;
+ char *buf = read_object_file(oid, &type, &size);
+ char *origbuf = buf;
+ unsigned long len = size;
+ struct signature_check sigc = { NULL };
+ struct strbuf payload = STRBUF_INIT, sig = STRBUF_INIT;
+
+ if (!buf || type != OBJ_TAG)
+ goto next;
+
+ if (!parse_signature(buf, size, &payload, &sig))
+ ;/* merely annotated */
+ else {
+ buf = payload.buf;
+ len = payload.len;
+ if (check_signature(payload.buf, payload.len, sig.buf,
+ sig.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(&payload);
+ strbuf_release(&sig);
+ next:
+ free(origbuf);
+ }
+ 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, "main");
+ 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;
+ diff_merges_suppress(&rev);
+ 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/fmt-merge-msg.h b/fmt-merge-msg.h
index 01e3aa8..f2ab0e0 100644
--- a/fmt-merge-msg.h
+++ b/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/fsck.c b/fsck.c
index 73f3077..e3030f3 100644
--- a/fsck.c
+++ b/fsck.c
@@ -80,7 +80,9 @@
/* infos (reported as warnings, but ignored by default) */ \
FUNC(GITMODULES_PARSE, INFO) \
FUNC(BAD_TAG_NAME, INFO) \
- FUNC(MISSING_TAGGER_ENTRY, INFO)
+ FUNC(MISSING_TAGGER_ENTRY, INFO) \
+ /* ignored (elevated when requested) */ \
+ FUNC(EXTRA_HEADER_ENTRY, IGNORE)
#define MSG_ID(id, msg_type) FSCK_MSG_##id,
enum fsck_msg_id {
@@ -461,6 +463,11 @@
generation += power * (name[--len] - '0');
if (power > 1 && len && name[len - 1] == '~')
name_prefix_len = len - 1;
+ else {
+ /* Maybe a non-first parent, e.g. HEAD^2 */
+ generation = 0;
+ name_prefix_len = len;
+ }
}
}
@@ -523,6 +530,28 @@
}
}
+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
@@ -534,7 +563,14 @@
#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);
@@ -566,6 +602,41 @@
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;
}
@@ -587,6 +658,7 @@
struct tree_desc desc;
unsigned o_mode;
const char *o_name;
+ struct name_stack df_dup_candidates = { NULL };
if (init_tree_desc_gently(&desc, buffer, size)) {
retval += report(options, oid, OBJ_TREE, FSCK_MSG_BAD_TREE, "cannot be parsed as a tree");
@@ -666,7 +738,8 @@
}
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;
@@ -682,6 +755,8 @@
o_name = name;
}
+ name_stack_clear(&df_dup_candidates);
+
if (has_null_sha1)
retval += report(options, oid, OBJ_TREE, FSCK_MSG_NULL_SHA1, "contains entries pointing to null sha1");
if (has_full_path)
@@ -843,6 +918,16 @@
unsigned long size, struct fsck_options *options)
{
struct object_id tagged_oid;
+ int tagged_type;
+ return fsck_tag_standalone(oid, buffer, size, options, &tagged_oid,
+ &tagged_type);
+}
+
+int fsck_tag_standalone(const struct object_id *oid, const char *buffer,
+ unsigned long size, struct fsck_options *options,
+ struct object_id *tagged_oid,
+ int *tagged_type)
+{
int ret = 0;
char *eol;
struct strbuf sb = STRBUF_INIT;
@@ -856,7 +941,7 @@
ret = report(options, oid, OBJ_TAG, FSCK_MSG_MISSING_OBJECT, "invalid format - expected 'object' line");
goto done;
}
- if (parse_oid_hex(buffer, &tagged_oid, &p) || *p != '\n') {
+ 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;
@@ -872,7 +957,8 @@
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)
+ *tagged_type = type_from_string_gently(buffer, eol - buffer, 1);
+ if (*tagged_type < 0)
ret = report(options, oid, OBJ_TAG, FSCK_MSG_BAD_TYPE, "invalid 'type' value");
if (ret)
goto done;
@@ -906,6 +992,21 @@
}
else
ret = fsck_ident(&buffer, oid, OBJ_TAG, options);
+ if (!*buffer)
+ goto done;
+
+ if (!starts_with(buffer, "\n")) {
+ /*
+ * The verify_headers() check will allow
+ * e.g. "[...]tagger <tagger>\nsome
+ * garbage\n\nmessage" to pass, thinking "some
+ * garbage" could be a custom header. E.g. "mktag"
+ * doesn't want any unknown headers.
+ */
+ ret = report(options, oid, OBJ_TAG, FSCK_MSG_EXTRA_HEADER_ENTRY, "invalid format - extra header(s) after 'tagger'");
+ if (ret)
+ goto done;
+ }
done:
strbuf_release(&sb);
@@ -1014,7 +1115,7 @@
if (looks_like_command_line_option(url))
return -1;
- if (submodule_url_is_relative(url)) {
+ if (submodule_url_is_relative(url) || starts_with(url, "git://")) {
char *decoded;
const char *next;
int has_nl;
@@ -1065,7 +1166,7 @@
{
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 ||
@@ -1175,6 +1276,11 @@
return 1;
}
+void register_found_gitmodules(const struct object_id *oid)
+{
+ oidset_insert(&gitmodules_found, oid);
+}
+
int fsck_finish(struct fsck_options *options)
{
int ret = 0;
@@ -1216,3 +1322,27 @@
oidset_clear(&gitmodules_done);
return ret;
}
+
+int fsck_config_internal(const char *var, const char *value, void *cb,
+ struct fsck_options *options)
+{
+ if (strcmp(var, "fsck.skiplist") == 0) {
+ const char *path;
+ struct strbuf sb = STRBUF_INIT;
+
+ if (git_config_pathname(&path, var, value))
+ return 1;
+ strbuf_addf(&sb, "skiplist=%s", path);
+ free((char *)path);
+ fsck_set_msg_types(options, sb.buf);
+ strbuf_release(&sb);
+ return 0;
+ }
+
+ if (skip_prefix(var, "fsck.", &var)) {
+ fsck_set_msg_type(options, var, value);
+ return 0;
+ }
+
+ return git_default_config(var, value, cb);
+}
diff --git a/fsck.h b/fsck.h
index 69cf715..733378f 100644
--- a/fsck.h
+++ b/fsck.h
@@ -62,6 +62,17 @@
int fsck_object(struct object *obj, void *data, unsigned long size,
struct fsck_options *options);
+void register_found_gitmodules(const struct object_id *oid);
+
+/*
+ * fsck a tag, and pass info about it back to the caller. This is
+ * exposed fsck_object() internals for git-mktag(1).
+ */
+int fsck_tag_standalone(const struct object_id *oid, const char *buffer,
+ unsigned long size, struct fsck_options *options,
+ struct object_id *tagged_oid,
+ int *tag_type);
+
/*
* Some fsck checks are context-dependent, and may end up queued; run this
* after completing all fsck_object() calls in order to resolve any remaining
@@ -94,4 +105,11 @@
const char *fsck_describe_object(struct fsck_options *options,
const struct object_id *oid);
+/*
+ * git_config() callback for use by fsck-y tools that want to support
+ * fsck.<msg> fsck.skipList etc.
+ */
+int fsck_config_internal(const char *var, const char *value, void *cb,
+ struct fsck_options *options);
+
#endif
diff --git a/fsmonitor.c b/fsmonitor.c
index 932bd90..ab9bfc6 100644
--- a/fsmonitor.c
+++ b/fsmonitor.c
@@ -13,14 +13,19 @@
struct trace_key trace_fsmonitor = TRACE_KEY_INIT(FSMONITOR);
+static void assert_index_minimum(struct index_state *istate, size_t pos)
+{
+ if (pos > istate->cache_nr)
+ BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" > %u)",
+ (uintmax_t)pos, istate->cache_nr);
+}
+
static void fsmonitor_ewah_callback(size_t pos, void *is)
{
struct index_state *istate = (struct index_state *)is;
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);
+ assert_index_minimum(istate, pos + 1);
ce = istate->cache[pos];
ce->ce_flags &= ~CE_FSMONITOR_VALID;
@@ -82,12 +87,14 @@
}
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);
+ if (!istate->split_index)
+ assert_index_minimum(istate, istate->fsmonitor_dirty->bit_size);
- trace_printf_key(&trace_fsmonitor, "read fsmonitor extension successful");
+ trace2_data_string("index", NULL, "extension/fsmn/read/token",
+ istate->fsmonitor_last_update);
+ trace_printf_key(&trace_fsmonitor,
+ "read fsmonitor extension successful '%s'",
+ istate->fsmonitor_last_update);
return 0;
}
@@ -110,10 +117,8 @@
uint32_t ewah_size = 0;
int fixup = 0;
- if (!istate->split_index &&
- istate->fsmonitor_dirty->bit_size > istate->cache_nr)
- BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" > %u)",
- (uintmax_t)istate->fsmonitor_dirty->bit_size, istate->cache_nr);
+ if (!istate->split_index)
+ assert_index_minimum(istate, istate->fsmonitor_dirty->bit_size);
put_be32(&hdr_version, INDEX_EXTENSION_VERSION2);
strbuf_add(sb, &hdr_version, sizeof(uint32_t));
@@ -133,7 +138,11 @@
put_be32(&ewah_size, sb->len - ewah_start);
memcpy(sb->buf + fixup, &ewah_size, sizeof(uint32_t));
- trace_printf_key(&trace_fsmonitor, "write fsmonitor extension successful");
+ trace2_data_string("index", NULL, "extension/fsmn/write/token",
+ istate->fsmonitor_last_update);
+ trace_printf_key(&trace_fsmonitor,
+ "write fsmonitor extension successful '%s'",
+ istate->fsmonitor_last_update);
}
/*
@@ -142,26 +151,74 @@
static int query_fsmonitor(int version, const char *last_update, struct strbuf *query_result)
{
struct child_process cp = CHILD_PROCESS_INIT;
+ int result;
if (!core_fsmonitor)
return -1;
- argv_array_push(&cp.args, core_fsmonitor);
- argv_array_pushf(&cp.args, "%d", version);
- argv_array_pushf(&cp.args, "%s", 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();
- return capture_command(&cp, query_result, 1024);
+ trace2_region_enter("fsm_hook", "query", NULL);
+
+ result = capture_command(&cp, query_result, 1024);
+
+ if (result)
+ trace2_data_intmax("fsm_hook", NULL, "query/failed", result);
+ else {
+ trace2_data_intmax("fsm_hook", NULL, "query/response-length",
+ query_result->len);
+
+ if (fsmonitor_is_trivial_response(query_result))
+ trace2_data_intmax("fsm_hook", NULL,
+ "query/trivial-response", 1);
+ }
+
+ trace2_region_leave("fsm_hook", "query", NULL);
+
+ return result;
}
-static void fsmonitor_refresh_callback(struct index_state *istate, const char *name)
+int fsmonitor_is_trivial_response(const struct strbuf *query_result)
{
- int pos = index_name_pos(istate, name, strlen(name));
+ static char trivial_response[3] = { '\0', '/', '\0' };
- if (pos >= 0) {
- struct cache_entry *ce = istate->cache[pos];
- ce->ce_flags &= ~CE_FSMONITOR_VALID;
+ return query_result->len >= 3 &&
+ !memcmp(trivial_response,
+ &query_result->buf[query_result->len - 3], 3);
+}
+
+static void fsmonitor_refresh_callback(struct index_state *istate, char *name)
+{
+ int i, len = strlen(name);
+ if (name[len - 1] == '/') {
+
+ /*
+ * TODO We should binary search to find the first path with
+ * TODO this directory prefix. Then linearly update entries
+ * TODO while the prefix matches. Taking care to search without
+ * TODO the trailing slash -- because '/' sorts after a few
+ * TODO interesting special chars, like '.' and ' '.
+ */
+
+ /* Mark all entries for the folder invalid */
+ for (i = 0; i < istate->cache_nr; i++) {
+ if (istate->cache[i]->ce_flags & CE_FSMONITOR_VALID &&
+ starts_with(istate->cache[i]->name, name))
+ istate->cache[i]->ce_flags &= ~CE_FSMONITOR_VALID;
+ }
+ /* Need to remove the / from the path for the untracked cache */
+ name[len - 1] = '\0';
+ } else {
+ int pos = index_name_pos(istate, name, strlen(name));
+
+ if (pos >= 0) {
+ struct cache_entry *ce = istate->cache[pos];
+ ce->ce_flags &= ~CE_FSMONITOR_VALID;
+ }
}
/*
@@ -217,7 +274,7 @@
* Need to use a char * variable because static
* analysis was suggesting to use strbuf_addbuf
* but we don't want to copy the entire strbuf
- * only the the chars up to the first NUL
+ * only the chars up to the first NUL
*/
buf = query_result.buf;
strbuf_addstr(&last_update_token, buf);
@@ -287,16 +344,45 @@
istate->fsmonitor_last_update = strbuf_detach(&last_update_token, NULL);
}
+/*
+ * The caller wants to turn on FSMonitor. And when the caller writes
+ * the index to disk, a FSMonitor extension should be included. This
+ * requires that `istate->fsmonitor_last_update` not be NULL. But we
+ * have not actually talked to a FSMonitor process yet, so we don't
+ * have an initial value for this field.
+ *
+ * For a protocol V1 FSMonitor process, this field is a formatted
+ * "nanoseconds since epoch" field. However, for a protocol V2
+ * FSMonitor process, this field is an opaque token.
+ *
+ * Historically, `add_fsmonitor()` has initialized this field to the
+ * current time for protocol V1 processes. There are lots of race
+ * conditions here, but that code has shipped...
+ *
+ * The only true solution is to use a V2 FSMonitor and get a current
+ * or default token value (that it understands), but we cannot do that
+ * until we have actually talked to an instance of the FSMonitor process
+ * (but the protocol requires that we send a token first...).
+ *
+ * For simplicity, just initialize like we have a V1 process and require
+ * that V2 processes adapt.
+ */
+static void initialize_fsmonitor_last_update(struct index_state *istate)
+{
+ struct strbuf last_update = STRBUF_INIT;
+
+ strbuf_addf(&last_update, "%"PRIu64"", getnanotime());
+ istate->fsmonitor_last_update = strbuf_detach(&last_update, 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;
- strbuf_addf(&last_update, "%"PRIu64"", getnanotime());
- istate->fsmonitor_last_update = strbuf_detach(&last_update, NULL);
+ initialize_fsmonitor_last_update(istate);
/* reset the fsmonitor state */
for (i = 0; i < istate->cache_nr; i++)
@@ -335,9 +421,7 @@
}
/* 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);
+ assert_index_minimum(istate, istate->fsmonitor_dirty->bit_size);
ewah_each_bit(istate->fsmonitor_dirty, fsmonitor_ewah_callback, istate);
refresh_fsmonitor(istate);
diff --git a/fsmonitor.h b/fsmonitor.h
index 739318a..7f1794b 100644
--- a/fsmonitor.h
+++ b/fsmonitor.h
@@ -45,6 +45,11 @@
void refresh_fsmonitor(struct index_state *istate);
/*
+ * Does the received result contain the "trivial" response?
+ */
+int fsmonitor_is_trivial_response(const struct strbuf *query_result);
+
+/*
* Set the given cache entries CE_FSMONITOR_VALID bit. This should be
* called any time the cache entry has been updated to reflect the
* current state of the file on disk.
diff --git a/fuzz-commit-graph.c b/fuzz-commit-graph.c
index 0157acb..e7cf6d5 100644
--- a/fuzz-commit-graph.c
+++ b/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 @@
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/generate-cmdlist.sh b/generate-cmdlist.sh
index 71158f7..9dbbb08 100755
--- a/generate-cmdlist.sh
+++ b/generate-cmdlist.sh
@@ -10,7 +10,7 @@
}
get_categories () {
- tr ' ' '\n'|
+ tr ' ' '\012'|
grep -v '^$' |
sort |
uniq
@@ -76,23 +76,6 @@
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 @@
define_category_names "$1"
echo
print_command_list "$1"
-echo
-print_config_list
diff --git a/generate-configlist.sh b/generate-configlist.sh
new file mode 100755
index 0000000..8692fe5
--- /dev/null
+++ b/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/gettext.c b/gettext.c
index 35d2c12..af2413b 100644
--- a/gettext.c
+++ b/gettext.c
@@ -65,14 +65,6 @@
return NULL;
}
-int use_gettext_poison(void)
-{
- static int poison_requested = -1;
- if (poison_requested == -1)
- poison_requested = git_env_bool("GIT_TEST_GETTEXT_POISON", 0);
- return poison_requested;
-}
-
#ifndef NO_GETTEXT
static int test_vsnprintf(const char *fmt, ...)
{
@@ -87,88 +79,24 @@
static void init_gettext_charset(const char *domain)
{
- /*
- This trick arranges for messages to be emitted in the user's
- requested encoding, but avoids setting LC_CTYPE from the
- environment for the whole program.
-
- This primarily done to avoid a bug in vsnprintf in the GNU C
- Library [1]. which triggered a "your vsnprintf is broken" error
- on Git's own repository when inspecting v0.99.6~1 under a UTF-8
- locale.
-
- That commit contains a ISO-8859-1 encoded author name, which
- the locale aware vsnprintf(3) won't interpolate in the format
- argument, due to mismatch between the data encoding and the
- locale.
-
- Even if it wasn't for that bug we wouldn't want to use LC_CTYPE at
- this point, because it'd require auditing all the code that uses C
- functions whose semantics are modified by LC_CTYPE.
-
- But only setting LC_MESSAGES as we do creates a problem, since
- we declare the encoding of our PO files[2] the gettext
- implementation will try to recode it to the user's locale, but
- without LC_CTYPE it'll emit something like this on 'git init'
- under the Icelandic locale:
-
- Bj? til t?ma Git lind ? /hlagh/.git/
-
- Gettext knows about the encoding of our PO file, but we haven't
- told it about the user's encoding, so all the non-US-ASCII
- characters get encoded to question marks.
-
- But we're in luck! We can set LC_CTYPE from the environment
- only while we call nl_langinfo and
- bind_textdomain_codeset. That suffices to tell gettext what
- encoding it should emit in, so it'll now say:
-
- Bjó til tóma Git lind í /hlagh/.git/
-
- And the equivalent ISO-8859-1 string will be emitted under a
- ISO-8859-1 locale.
-
- With this change way we get the advantages of setting LC_CTYPE
- (talk to the user in his language/encoding), without the major
- drawbacks (changed semantics for C functions we rely on).
-
- However foreign functions using other message catalogs that
- aren't using our neat trick will still have a problem, e.g. if
- we have to call perror(3):
-
- #include <stdio.h>
- #include <locale.h>
- #include <errno.h>
-
- int main(void)
- {
- setlocale(LC_MESSAGES, "");
- setlocale(LC_CTYPE, "C");
- errno = ENODEV;
- perror("test");
- return 0;
- }
-
- Running that will give you a message with question marks:
-
- $ LANGUAGE= LANG=de_DE.utf8 ./test
- test: Kein passendes Ger?t gefunden
-
- The vsnprintf bug has been fixed since glibc 2.17.
-
- Then we could simply set LC_CTYPE from the environment, which would
- make things like the external perror(3) messages work.
-
- See t/t0203-gettext-setlocale-sanity.sh's "gettext.c" tests for
- regression tests.
-
- 1. http://sourceware.org/bugzilla/show_bug.cgi?id=6530
- 2. E.g. "Content-Type: text/plain; charset=UTF-8\n" in po/is.po
- */
setlocale(LC_CTYPE, "");
charset = locale_charset();
bind_textdomain_codeset(domain, charset);
- /* the string is taken from v0.99.6~1 */
+
+ /*
+ * Work around an old bug fixed in glibc 2.17 (released on
+ * 2012-12-24), at the cost of potentially making translated
+ * messages from external functions like perror() emitted in
+ * the wrong encoding.
+ *
+ * The bug affected e.g. git.git's own 7eb93c89651 ([PATCH]
+ * Simplify git script, 2005-09-07), which is the origin of
+ * the "David_K\345gedal" test string.
+ *
+ * See a much longer comment added to this file in 5e9637c6297
+ * (i18n: add infrastructure for translating Git with gettext,
+ * 2011-11-18) for more details.
+ */
if (test_vsnprintf("%.*s", 13, "David_K\345gedal") < 0)
setlocale(LC_CTYPE, "C");
}
@@ -181,8 +109,6 @@
if (!podir)
podir = p = system_path(GIT_LOCALE_PATH);
- use_gettext_poison(); /* getenv() reentrancy paranoia */
-
if (!is_directory(podir)) {
free(p);
return;
diff --git a/gettext.h b/gettext.h
index bee52eb..c8b34fd 100644
--- a/gettext.h
+++ b/gettext.h
@@ -28,15 +28,12 @@
#define FORMAT_PRESERVING(n) __attribute__((format_arg(n)))
-int use_gettext_poison(void);
-
#ifndef NO_GETTEXT
void git_setup_gettext(void);
int gettext_width(const char *s);
#else
static inline void git_setup_gettext(void)
{
- use_gettext_poison(); /* getenv() reentrancy paranoia */
}
static inline int gettext_width(const char *s)
{
@@ -48,14 +45,12 @@
{
if (!*msgid)
return "";
- return use_gettext_poison() ? "# GETTEXT POISON #" : gettext(msgid);
+ return gettext(msgid);
}
static inline FORMAT_PRESERVING(1) FORMAT_PRESERVING(2)
const char *Q_(const char *msgid, const char *plu, unsigned long n)
{
- if (use_gettext_poison())
- return "# GETTEXT POISON #";
return ngettext(msgid, plu, n);
}
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 10fd30a..bc3a1e8 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -30,9 +30,9 @@
$diff_use_color ? (
$repo->get_color('color.diff.frag', 'cyan'),
) : ();
-my ($diff_plain_color) =
+my ($diff_context_color) =
$diff_use_color ? (
- $repo->get_color('color.diff.plain', ''),
+ $repo->get_color($repo->config('color.diff.context') ? 'color.diff.context' : 'color.diff.plain', ''),
) : ();
my ($diff_old_color) =
$diff_use_color ? (
@@ -483,10 +483,8 @@
my $last_lf = 0;
if ($opts->{HEADER}) {
- if (!$opts->{LIST_FLAT}) {
- print " ";
- }
- print colored $header_color, "$opts->{HEADER}\n";
+ my $indent = $opts->{LIST_FLAT} ? "" : " ";
+ print colored $header_color, "$indent$opts->{HEADER}\n";
}
for ($i = 0; $i < @stuff; $i++) {
my $chosen = $chosen[$i] ? '*' : ' ';
@@ -714,7 +712,7 @@
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);
@@ -754,8 +752,13 @@
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 :
@@ -763,7 +766,7 @@
push @{$dest->{TEXT}}, $src->{TEXT}->[$i];
push @{$dest->{DISPLAY}}, $src->{DISPLAY}->[$i];
}
- return ($head, $mode, $deletion);
+ return ($head, $mode, $deletion, $addition);
}
sub hunk_splittable {
@@ -1043,7 +1046,7 @@
colored((/^@/ ? $fraginfo_color :
/^\+/ ? $diff_new_color :
/^-/ ? $diff_old_color :
- $diff_plain_color),
+ $diff_context_color),
$_);
} @_;
}
@@ -1427,46 +1430,55 @@
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,?]? "),
},
);
@@ -1476,7 +1488,7 @@
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;
}
@@ -1499,6 +1511,7 @@
my ($prev, $next, $other, $undecided, $i);
$other = '';
+ last if ($ix and !$num);
if ($num <= $ix) {
$ix = 0;
}
@@ -1531,35 +1544,51 @@
last;
}
}
- last if (!$undecided);
+ last if (!$undecided && ($num || !$addition));
- if ($hunk[$ix]{TYPE} eq 'hunk' &&
- hunk_splittable($hunk[$ix]{TEXT})) {
- $other .= ',s';
+ 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;
+ }
}
- if ($hunk[$ix]{TYPE} eq 'hunk') {
- $other .= ',e';
- }
- for (@{$hunk[$ix]{DISPLAY}}) {
- print;
- }
- print colored $prompt_color, "(", ($ix+1), "/$num) ",
- 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;
@@ -1596,19 +1625,28 @@
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;
@@ -1726,7 +1764,7 @@
}
}
- @hunk = coalesce_overlapping_hunks(@hunk);
+ @hunk = coalesce_overlapping_hunks(@hunk) if ($num);
my $n_lofs = 0;
my @result = ();
@@ -1736,7 +1774,7 @@
}
}
- if (@result) {
+ if (@result or $head->{USE}) {
my @patch = reassemble_patch($head->{TEXT}, @result);
my $apply_routine = $patch_mode_flavour{APPLY};
&$apply_routine(@patch);
@@ -1790,6 +1828,13 @@
$arg = shift @ARGV or die __("missing --");
if ($arg ne '--') {
$patch_mode_revision = $arg;
+
+ # NEEDSWORK: Instead of comparing to the literal "HEAD",
+ # compare the commit objects instead so that other ways of
+ # saying the same thing (such as "@") are also handled
+ # appropriately.
+ #
+ # This applies to the cases below too.
$patch_mode = ($arg eq 'HEAD' ?
'reset_head' : 'reset_nothead');
$arg = shift @ARGV or die __("missing --");
diff --git a/git-bisect.sh b/git-bisect.sh
index efee12b..6a7afae 100755
--- a/git-bisect.sh
+++ b/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/
@@ -39,148 +39,6 @@
TERM_BAD=bad
TERM_GOOD=good
-bisect_head()
-{
- if test -f "$GIT_DIR/BISECT_HEAD"
- then
- echo BISECT_HEAD
- else
- echo 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
-
- #
- # Change state.
- # In case of mistaken revs or checkout error, or signals received,
- # "bisect_auto_next" below may exit or misbehave.
- # We have to trap this to be able to clean up using
- # "bisect_clean_state".
- #
- trap 'git bisect--helper --bisect-clean-state' 0
- trap 'exit 255' 1 2 3 15
-
- #
- # Check if we can proceed to the next bisect state.
- #
- get_terms
- bisect_auto_next
-
- trap '-' 0
-}
-
-bisect_skip() {
- all=''
- for arg in "$@"
- do
- case "$arg" in
- *..*)
- revs=$(git rev-list "$arg") || die "$(eval_gettext "Bad rev input: \$arg")" ;;
- *)
- revs=$(git rev-parse --sq-quote "$arg") ;;
- esac
- all="$all $revs"
- done
- eval bisect_state 'skip' $all
-}
-
-bisect_state() {
- bisect_autostart
- state=$1
- git bisect--helper --check-and-set-terms $state $TERM_GOOD $TERM_BAD || exit
- get_terms
- case "$#,$state" in
- 0,*)
- die "Please call 'bisect_state' with at least one argument." ;;
- 1,"$TERM_BAD"|1,"$TERM_GOOD"|1,skip)
- bisected_head=$(bisect_head)
- rev=$(git rev-parse --verify "$bisected_head") ||
- die "$(eval_gettext "Bad rev input: \$bisected_head")"
- git bisect--helper --bisect-write "$state" "$rev" "$TERM_GOOD" "$TERM_BAD" || exit
- git bisect--helper --check-expected-revs "$rev" ;;
- 2,"$TERM_BAD"|*,"$TERM_GOOD"|*,skip)
- shift
- hash_list=''
- for rev in "$@"
- do
- sha=$(git rev-parse --verify "$rev^{commit}") ||
- die "$(eval_gettext "Bad rev input: \$rev")"
- hash_list="$hash_list $sha"
- done
- for rev in $hash_list
- do
- git bisect--helper --bisect-write "$state" "$rev" "$TERM_GOOD" "$TERM_BAD" || exit
- done
- git bisect--helper --check-expected-revs $hash_list ;;
- *,"$TERM_BAD")
- die "$(eval_gettext "'git bisect \$TERM_BAD' can take only one argument.")" ;;
- *)
- 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
-}
-
bisect_visualize() {
git bisect--helper --bisect-next-check $TERM_GOOD $TERM_BAD fail || exit
@@ -204,37 +62,6 @@
eval '"$@"' --bisect -- $(cat "$GIT_DIR/BISECT_NAMES")
}
-bisect_replay () {
- file="$1"
- 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
- do
- test "$git $bisect" = "git bisect" || test "$git" = "git-bisect" || continue
- if test "$git" = "git-bisect"
- then
- rev="$command"
- command="$bisect"
- fi
- get_terms
- git bisect--helper --check-and-set-terms "$command" "$TERM_GOOD" "$TERM_BAD" || exit
- get_terms
- case "$command" in
- start)
- cmd="bisect_start $rev"
- eval "$cmd" ;;
- "$TERM_GOOD"|"$TERM_BAD"|skip)
- git bisect--helper --bisect-write "$command" "$rev" "$TERM_GOOD" "$TERM_BAD" || exit;;
- terms)
- git bisect--helper --bisect-terms $rev || exit;;
- *)
- die "$(gettext "?? what are you talking about?")" ;;
- esac
- done <"$file"
- bisect_auto_next
-}
-
bisect_run () {
git bisect--helper --bisect-next-check $TERM_GOOD $TERM_BAD fail || exit
@@ -267,8 +94,7 @@
state="$TERM_GOOD"
fi
- # We have to use a subshell because "bisect_state" can exit.
- ( bisect_state $state >"$GIT_DIR/BISECT_RUN" )
+ git bisect--helper --bisect-state $state >"$GIT_DIR/BISECT_RUN"
res=$?
cat "$GIT_DIR/BISECT_RUN"
@@ -283,7 +109,7 @@
if [ $res -ne 0 ]
then
eval_gettextln "bisect run failed:
-'bisect_state \$state' exited with error code \$res" >&2
+'bisect-state \$state' exited with error code \$res" >&2
exit $res
fi
@@ -296,11 +122,6 @@
done
}
-bisect_log () {
- test -s "$GIT_DIR/BISECT_LOG" || die "$(gettext "We are not bisecting.")"
- cat "$GIT_DIR/BISECT_LOG"
-}
-
get_terms () {
if test -s "$GIT_DIR/BISECT_TERMS"
then
@@ -322,22 +143,22 @@
help)
git bisect -h ;;
start)
- bisect_start "$@" ;;
+ git bisect--helper --bisect-start "$@" ;;
bad|good|new|old|"$TERM_BAD"|"$TERM_GOOD")
- bisect_state "$cmd" "$@" ;;
+ git bisect--helper --bisect-state "$cmd" "$@" ;;
skip)
- bisect_skip "$@" ;;
+ git bisect--helper --bisect-skip "$@" || exit;;
next)
# Not sure we want "next" at the UI level anymore.
- bisect_next "$@" ;;
+ git bisect--helper --bisect-next "$@" || exit ;;
visualize|view)
bisect_visualize "$@" ;;
reset)
git bisect--helper --bisect-reset "$@" ;;
replay)
- bisect_replay "$@" ;;
+ git bisect--helper --bisect-replay "$@" || exit;;
log)
- bisect_log ;;
+ git bisect--helper --bisect-log || exit ;;
run)
bisect_run "$@" ;;
terms)
diff --git a/git-compat-util.h b/git-compat-util.h
index aed0b5d..dcc786e 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -252,8 +252,10 @@
#ifdef PRECOMPOSE_UNICODE
#include "compat/precompose_utf8.h"
#else
-#define precompose_str(in,i_nfd2nfc)
-#define precompose_argv(c,v)
+static inline const char *precompose_argv_prefix(int argc, const char **argv, const char *prefix)
+{
+ return prefix;
+}
#define probe_utf8_pathname_composition()
#endif
@@ -270,7 +272,9 @@
#endif
#ifdef NO_SETITIMER
-#define setitimer(which,value,ovalue)
+static inline int setitimer(int which, const struct itimerval *value, struct itimerval *newvalue) {
+ return 0; /* pretend success */
+}
#endif
#ifndef NO_LIBGEN_H
@@ -345,6 +349,11 @@
#define platform_core_config noop_core_config
#endif
+int lstat_cache_aware_rmdir(const char *path);
+#if !defined(__MINGW32__) && !defined(_MSC_VER)
+#define rmdir lstat_cache_aware_rmdir
+#endif
+
#ifndef has_dos_drive_prefix
static inline int git_has_dos_drive_prefix(const char *path)
{
@@ -389,6 +398,14 @@
#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
@@ -477,11 +494,13 @@
#define error_errno(...) (error_errno(__VA_ARGS__), const_error())
#endif
-void set_die_routine(NORETURN_PTR void (*routine)(const char *err, va_list params));
-void set_error_routine(void (*routine)(const char *err, va_list params));
-extern void (*get_error_routine(void))(const char *err, va_list params);
-void set_warn_routine(void (*routine)(const char *warn, va_list params));
-extern void (*get_warn_routine(void))(const char *warn, va_list params);
+typedef void (*report_fn)(const char *, va_list params);
+
+void set_die_routine(NORETURN_PTR report_fn routine);
+void set_error_routine(report_fn routine);
+report_fn get_error_routine(void);
+void set_warn_routine(report_fn routine);
+report_fn get_warn_routine(void);
void set_die_is_recursing_routine(int (*routine)(void));
int starts_with(const char *str, const char *prefix);
@@ -774,6 +793,12 @@
const char *format, va_list ap);
#endif
+#ifdef OPEN_RETURNS_EINTR
+#undef open
+#define open git_open_with_retry
+int git_open_with_retry(const char *path, int flag, ...);
+#endif
+
#ifdef __GLIBC_PREREQ
#if __GLIBC_PREREQ(2, 1)
#define HAVE_STRCHRNUL
@@ -861,13 +886,19 @@
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++.
*/
#define FREE_AND_NULL(p) do { free(p); (p) = NULL; } while (0)
#define ALLOC_ARRAY(x, alloc) (x) = xmalloc(st_mult(sizeof(*(x)), (alloc)))
-#define CALLOC_ARRAY(x, alloc) (x) = xcalloc((alloc), sizeof(*(x)));
+#define CALLOC_ARRAY(x, alloc) (x) = xcalloc((alloc), sizeof(*(x)))
#define REALLOC_ARRAY(x, alloc) (x) = xrealloc((x), st_mult(sizeof(*(x)), (alloc)))
#define COPY_ARRAY(dst, src, n) copy_array((dst), (src), (n), sizeof(*(dst)) + \
@@ -1156,9 +1187,12 @@
#endif
#endif
-#if defined(__GNUC__) || (_MSC_VER >= 1400) || defined(__C99_MACRO_WITH_VA_ARGS)
+/*
+ * This is always defined as a first step towards making the use of variadic
+ * macros unconditional. If it causes compilation problems on your platform,
+ * please report it to the Git mailing list at git@vger.kernel.org.
+ */
#define HAVE_VARIADIC_MACROS 1
-#endif
/* usage.c: only to be used for testing BUG() implementation (see test-tool) */
extern int BUG_exit_code;
@@ -1208,13 +1242,6 @@
/* 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
@@ -1224,8 +1251,14 @@
#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
@@ -1335,4 +1368,6 @@
((uintptr_t)&(ptr)->member - (uintptr_t)(ptr))
#endif /* !__GNUC__ */
+void sleep_millisec(int millisec);
+
#endif
diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl
index fc00d59..289d4bc 100755
--- a/git-cvsexportcommit.perl
+++ b/git-cvsexportcommit.perl
@@ -22,11 +22,15 @@
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 @@
# 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 @@
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 @@
}
# 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 @@
}
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 @@
}
}
-my $noparent = "0000000000000000000000000000000000000000";
+my $noparent = "0" x $hexsz;
if ($parent) {
my $found;
# double check that it's a valid parent
@@ -158,9 +162,9 @@
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 @@
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 @@
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 @@
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/git-cvsimport.perl b/git-cvsimport.perl
index 1057f38..7bf3c12 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -637,9 +637,9 @@
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 @@
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 @@
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/git-cvsserver.perl b/git-cvsserver.perl
index ae10442..f6f3fc1 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -365,7 +365,7 @@
}
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 @@
$log->nofile();
}
+ $state->{rawsz} = ($cfg->{'extensions'}{'objectformat'} || 'sha1') eq 'sha256' ? 32 : 20;
+ $state->{hexsz} = $state->{rawsz} * 2;
+
return 1;
}
@@ -1581,7 +1584,7 @@
$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 @@
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 @@
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 @@
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 @@
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 @@
}
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 @@
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 @@
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 @@
$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 @@
$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 @@
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 @@
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 @@
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 @@
$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 @@
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/git-difftool--helper.sh b/git-difftool--helper.sh
index 46af3e6..992124c 100755
--- a/git-difftool--helper.sh
+++ b/git-difftool--helper.sh
@@ -61,6 +61,9 @@
export BASE
eval $GIT_DIFFTOOL_EXTCMD '"$LOCAL"' '"$REMOTE"'
else
+ initialize_merge_tool "$merge_tool"
+ # ignore the error from the above --- run_merge_tool
+ # will diagnose unusable tool by itself
run_merge_tool "$merge_tool"
fi
}
@@ -79,6 +82,9 @@
then
LOCAL="$1"
REMOTE="$2"
+ initialize_merge_tool "$merge_tool"
+ # ignore the error from the above --- run_merge_tool
+ # will diagnose unusable tool by itself
run_merge_tool "$merge_tool" false
else
# Launch the merge tool on each path provided by 'git diff'
diff --git a/git-gui/Makefile b/git-gui/Makefile
index f10caed..56c85a8 100644
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
@@ -9,7 +9,9 @@
GIT-VERSION-FILE: FORCE
@$(SHELL_PATH) ./GIT-VERSION-GEN
+ifneq ($(MAKECMDGOALS),clean)
-include GIT-VERSION-FILE
+endif
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')
diff --git a/git-gui/git-gui--askpass b/git-gui/git-gui--askpass
index 1c99ee8..71a536d 100755
--- a/git-gui/git-gui--askpass
+++ b/git-gui/git-gui--askpass
@@ -26,8 +26,21 @@
entry .e -textvariable answer -width 50
pack .e -side top -fill x -padx 10 -pady 10
+proc on_show_input_changed {args} {
+ global show_input
+ if {$show_input} {
+ .e configure -show ""
+ } else {
+ .e configure -show "*"
+ }
+}
+trace add variable show_input write "on_show_input_changed"
+
+set show_input 0
+
if {!$yesno} {
- .e configure -show "*"
+ checkbutton .cb_show -text "Show input" -variable show_input
+ pack .cb_show -side top -anchor nw
}
frame .b
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
index 4610e4c..201524c 100755
--- a/git-gui/git-gui.sh
+++ b/git-gui/git-gui.sh
@@ -720,7 +720,6 @@
-background [$text cget -background] \
-foreground [$text cget -foreground] \
-borderwidth 0
- $text tag conf in_sel -background lightgray
bind $text <Motion> break
return $text
}
@@ -863,6 +862,7 @@
set NS ttk
bind [winfo class .] <<ThemeChanged>> [list InitTheme]
pave_toplevel .
+ color::sync_with_theme
}
}
}
@@ -947,15 +947,15 @@
}
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]
@@ -967,7 +967,7 @@
-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'.
@@ -1479,6 +1479,7 @@
} elseif {[run_prepare_commit_msg_hook]} {
} elseif {[load_message MERGE_MSG]} {
} elseif {[load_message SQUASH_MSG]} {
+ } elseif {[load_message [get_config commit.template]]} {
}
$ui_comm edit reset
$ui_comm edit modified false
@@ -1613,6 +1614,12 @@
fconfigure $fd_sm -encoding utf-8
puts -nonewline $fd_pcm [read $fd_sm]
close $fd_sm
+ } elseif {[file isfile [get_config commit.template]]} {
+ set pcm_source "template"
+ set fd_sm [open [get_config commit.template] r]
+ fconfigure $fd_sm -encoding utf-8
+ puts -nonewline $fd_pcm [read $fd_sm]
+ close $fd_sm
} else {
set pcm_source ""
}
@@ -1653,7 +1660,7 @@
set pch_error {}
catch {file delete [gitdir PREPARE_COMMIT_MSG]}
return
- }
+ }
fconfigure $fd_ph -blocking 0
catch {file delete [gitdir PREPARE_COMMIT_MSG]}
}
@@ -2001,72 +2008,72 @@
#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
@@ -2302,11 +2309,10 @@
if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} {
file rename -force [gitdir GITGUI_BCK] $save
set GITGUI_BCK_exists 0
- } else {
+ } elseif {[$ui_comm edit modified]} {
set msg [string trim [$ui_comm get 0.0 end]]
regsub -all -line {[ \r\t]+$} $msg {} msg
- if {(![string match amend* $commit_type]
- || [$ui_comm edit modified])
+ if {![string match amend* $commit_type]
&& $msg ne {}} {
catch {
set fd [open $save w]
@@ -2600,12 +2606,12 @@
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
@@ -3272,7 +3278,7 @@
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 \
@@ -3294,7 +3300,7 @@
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 \
@@ -3319,9 +3325,20 @@
.vpane.files paneconfigure .vpane.files.index -sticky news
}
+proc set_selection_colors {w has_focus} {
+ foreach tag [list in_diff in_sel] {
+ $w tag conf $tag \
+ -background [expr {$has_focus ? $color::select_bg : $color::inactive_select_bg}] \
+ -foreground [expr {$has_focus ? $color::select_fg : $color::inactive_select_fg}]
+ }
+}
+
foreach i [list $ui_index $ui_workdir] {
rmsel_tag $i
- $i tag conf in_diff -background [$i tag cget in_sel -background]
+
+ set_selection_colors $i 0
+ bind $i <FocusIn> { set_selection_colors %W 1 }
+ bind $i <FocusOut> { set_selection_colors %W 0 }
}
unset i
@@ -3429,7 +3446,7 @@
}
textframe .vpane.lower.commarea.buffer.frame
-ttext $ui_comm -background white -foreground black \
+ttext $ui_comm \
-borderwidth 1 \
-undo true \
-maxundo 20 \
@@ -3558,7 +3575,7 @@
#
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 \
@@ -3878,18 +3895,18 @@
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]
}
@@ -3928,6 +3945,8 @@
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}
diff --git a/git-gui/lib/blame.tcl b/git-gui/lib/blame.tcl
index 62ec083..8441e10 100644
--- a/git-gui/lib/blame.tcl
+++ b/git-gui/lib/blame.tcl
@@ -328,6 +328,7 @@
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
diff --git a/git-gui/lib/choose_repository.tcl b/git-gui/lib/choose_repository.tcl
index e54f3e6..af1fee7 100644
--- a/git-gui/lib/choose_repository.tcl
+++ b/git-gui/lib/choose_repository.tcl
@@ -357,31 +357,10 @@
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 {[catch {set outdir [git rev-parse --resolve-git-dir $path]}]} {
+ return 0
}
-
- 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
- }
- }
- return 0
+ return 1
}
proc _objdir {path} {
diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl
index b516aa2..11379f8 100644
--- a/git-gui/lib/commit.tcl
+++ b/git-gui/lib/commit.tcl
@@ -456,6 +456,7 @@
}
$ui_comm delete 0.0 end
+ load_message [get_config commit.template]
$ui_comm edit reset
$ui_comm edit modified false
if {$::GITGUI_BCK_exists} {
diff --git a/git-gui/lib/index.tcl b/git-gui/lib/index.tcl
index 1fc5b42..d2ec24b 100644
--- a/git-gui/lib/index.tcl
+++ b/git-gui/lib/index.tcl
@@ -60,7 +60,7 @@
$::main_status stop_all
unlock_index
- rescan [concat $after [list ui_ready]] 0
+ rescan [concat $after {ui_ready;}] 0
}
proc update_indexinfo {msg path_list after} {
@@ -314,7 +314,7 @@
update_indexinfo \
$txt \
$path_list \
- [concat $after [list ui_ready]]
+ [concat $after {ui_ready;}]
}
}
@@ -366,7 +366,7 @@
update_index \
$txt \
$path_list \
- [concat $after {ui_status [mc "Ready to commit."]}]
+ [concat $after {ui_status [mc "Ready to commit."];}]
}
}
diff --git a/git-gui/lib/mergetool.tcl b/git-gui/lib/mergetool.tcl
index 120bc40..e688b01 100644
--- a/git-gui/lib/mergetool.tcl
+++ b/git-gui/lib/mergetool.tcl
@@ -59,7 +59,7 @@
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/git-gui/lib/themed.tcl b/git-gui/lib/themed.tcl
index 88b3119..f43d84e 100644
--- a/git-gui/lib/themed.tcl
+++ b/git-gui/lib/themed.tcl
@@ -1,6 +1,61 @@
# 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
+ variable inactive_select_bg lightgray
+ variable inactive_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 inactive_select_bg [convert_rgb_to_gray $select_bg]
+ set inactive_select_fg $select_fg
+
+ set color::select_bg $select_bg
+ set color::select_fg $select_fg
+ set color::inactive_select_bg $inactive_select_bg
+ set color::inactive_select_fg $inactive_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.selectBackground $select_bg
+ add_option *Text.selectForeground $select_fg
+ add_option *Text.inactiveSelectBackground $inactive_select_bg
+ add_option *Text.inactiveSelectForeground $inactive_select_fg
+ }
+}
+
+proc convert_rgb_to_gray {rgb} {
+ # Simply take the average of red, green and blue. This wouldn't be good
+ # enough for, say, converting a photo to grayscale, but for this simple
+ # purpose of approximating the brightness of a color it's good enough.
+ lassign [winfo rgb . $rgb] r g b
+ set gray [expr {($r / 256 + $g / 256 + $b / 256) / 3}]
+ return [format "#%2.2X%2.2X%2.2X" $gray $gray $gray]
+}
+
proc ttk_get_current_theme {} {
# Handle either current Tk or older versions of 8.5
if {[catch {set theme [ttk::style theme use]}]} {
@@ -136,7 +191,7 @@
proc gold_frame {w args} {
global use_ttk
- if {$use_ttk} {
+ if {$use_ttk && ![is_MacOSX]} {
eval [linsert $args 0 ttk::frame $w -style Gold.TFrame]
} else {
eval [linsert $args 0 frame $w -background gold]
@@ -145,7 +200,7 @@
proc tlabel {w args} {
global use_ttk
- if {$use_ttk} {
+ if {$use_ttk && ![is_MacOSX]} {
set cmd [list ttk::label $w -style Color.TLabel]
foreach {k v} $args {
switch -glob -- $k {
diff --git a/git-gui/po/ru.po b/git-gui/po/ru.po
index 9f5305c..7aebaf8 100644
--- a/git-gui/po/ru.po
+++ b/git-gui/po/ru.po
@@ -2,14 +2,14 @@
# Copyright (C) 2007 Shawn Pearce
# This file is distributed under the same license as the git-gui package.
# Translators:
-# Dimitriy Ryazantcev <DJm00n@mail.ru>, 2015-2016
+# Dimitriy Ryazantcev <DJm00n@mail.ru>, 2015-2016,2020
# Irina Riesen <irina.riesen@gmail.com>, 2007
msgid ""
msgstr ""
"Project-Id-Version: Git Russian Localization Project\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-26 15:47-0800\n"
-"PO-Revision-Date: 2016-06-30 12:39+0000\n"
+"POT-Creation-Date: 2020-02-08 22:54+0100\n"
+"PO-Revision-Date: 2020-11-05 11:20+0000\n"
"Last-Translator: Dimitriy Ryazantcev <DJm00n@mail.ru>\n"
"Language-Team: Russian (http://www.transifex.com/djm00n/git-po-ru/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -18,33 +18,33 @@
"Language: ru\n"
"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\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: критическая ошибка"
-
-#: git-gui.sh:743
+#: git-gui.sh:847
#, tcl-format
msgid "Invalid font specified in %s:"
msgstr "В %s установлен неверный шрифт:"
-#: 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 "Шрифт консоли и изменений (diff)"
-#: 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: критическая ошибка"
+
+#: git-gui.sh:918
msgid "Cannot find git in PATH."
msgstr "git не найден в PATH."
-#: git-gui.sh:821
+#: git-gui.sh:945
msgid "Cannot parse Git version string:"
msgstr "Невозможно распознать строку версии Git: "
-#: git-gui.sh:839
+#: git-gui.sh:970
#, tcl-format
msgid ""
"Git version cannot be determined.\n"
@@ -56,473 +56,519 @@
"Assume '%s' is version 1.5.0?\n"
msgstr "Невозможно определить версию Git\n\n%s указывает на версию «%s».\n\nдля %s требуется версия Git, начиная с 1.5.0\n\nПредположить, что «%s» и есть версия 1.5.0?\n"
-#: git-gui.sh:1128
+#: git-gui.sh:1267
msgid "Git directory not found:"
msgstr "Каталог Git не найден:"
-#: 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 "Вызов перехватчика prepare-commit-msg…"
-#: git-gui.sh:1471
+#: git-gui.sh:1646
msgid "Commit declined by prepare-commit-msg hook."
msgstr "Коммит прерван перехватчиком prepare-commit-msg."
-#: 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."
-msgstr "Показано %s из %s файлов."
+msgid ""
+"Display limit (gui.maxfilesdisplayed = %s) reached, not showing all %s "
+"files."
+msgstr "Лимит отображаемых файлов достигнут (gui.maxfilesdisplayed = %s), не все %s файлы показаны."
-#: 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..."
-msgstr "Запускается gitk… Подождите, пожалуйста…"
-
-#: git-gui.sh:1984
+#: git-gui.sh:2164
msgid "Couldn't find gitk in PATH"
msgstr "gitk не найден в PATH."
-#: git-gui.sh:2043
+#: git-gui.sh:2210 git-gui.sh:2245
+#, tcl-format
+msgid "Starting %s... please wait..."
+msgstr "Запускается %s… Подождите, пожалуйста…"
+
+#: git-gui.sh:2224
msgid "Couldn't find git gui in PATH"
msgstr "git gui не найден в PATH."
-#: 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 "Редактировать"
+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 Bash"
+
+#: 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 "Показать файлы ветки %s"
-#: git-gui.sh:2505
+#: git-gui.sh:2794
#, tcl-format
msgid "Visualize %s's History"
msgstr "Показать историю ветки %s"
-#: 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 "Выделить все"
+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 "Убрать из издекса"
+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 "Вставить Signed-off-by"
-#: 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 "Помощь"
+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 "О %s"
-#: 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 "Показать ключ SSH"
-#: 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 "критическая ошибка: %s: нет такого файла или каталога"
-#: git-gui.sh:2926
+#: git-gui.sh:3246
msgid "Current Branch:"
msgstr "Текущая ветка:"
-#: git-gui.sh:2947
-msgid "Staged Changes (Will Commit)"
-msgstr "Изменения в индексе (будут закоммичены)"
-
-#: git-gui.sh:2967
+#: git-gui.sh:3271
msgid "Unstaged Changes"
msgstr "Изменено (не будет сохранено)"
-#: git-gui.sh:3017
+#: git-gui.sh:3293
+msgid "Staged Changes (Will Commit)"
+msgstr "Изменения в индексе (будут закоммичены)"
+
+#: 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 в подмодуле"
-#: 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"
@@ -533,14 +579,14 @@
"\n"
msgstr "Возможны ошибки в переменных окружения.\n\nПеременные окружения, которые возможно\nбудут проигнорированы командами Git,\nзапущенными из %s\n\n"
-#: 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 "\nЭто известная проблема с Tcl,\nраспространяемым Cygwin."
-#: git-gui.sh:3575
+#: git-gui.sh:4051
#, tcl-format
msgid ""
"\n"
@@ -551,309 +597,148 @@
"~/.gitconfig file.\n"
msgstr "\n\nВместо использования %s можно\nсохранить значения user.name и\nuser.email в Вашем персональном\nфайле ~/.gitconfig.\n"
-#: lib/about.tcl:26
-msgid "git-gui - a graphical user interface for Git."
-msgstr "git-gui - графический пользовательский интерфейс к Git."
+#: lib/spellcheck.tcl:57
+msgid "Unsupported spell checker"
+msgstr "Неподдерживаемая программа проверки правописания"
-#: lib/blame.tcl:72
-msgid "File Viewer"
-msgstr "Просмотр файла"
+#: lib/spellcheck.tcl:65
+msgid "Spell checking is unavailable"
+msgstr "Проверка правописания не доступна"
-#: lib/blame.tcl:78
-msgid "Commit:"
-msgstr "Коммит:"
+#: lib/spellcheck.tcl:68
+msgid "Invalid spell checking configuration"
+msgstr "Неправильная конфигурация программы проверки правописания"
-#: lib/blame.tcl:271
-msgid "Copy Commit"
-msgstr "Копировать SHA-1"
-
-#: lib/blame.tcl:275
-msgid "Find Text..."
-msgstr "Найти текст…"
-
-#: lib/blame.tcl:284
-msgid "Do Full Copy Detection"
-msgstr "Провести полный поиск копий"
-
-#: lib/blame.tcl:288
-msgid "Show History Context"
-msgstr "Показать исторический контекст"
-
-#: lib/blame.tcl:291
-msgid "Blame Parent Commit"
-msgstr "Авторы родительского коммита"
-
-#: lib/blame.tcl:450
+#: lib/spellcheck.tcl:70
#, tcl-format
-msgid "Reading %s..."
-msgstr "Чтение %s…"
+msgid "Reverting dictionary to %s."
+msgstr "Словарь вернут к %s."
-#: lib/blame.tcl:557
-msgid "Loading copy/move tracking annotations..."
-msgstr "Загрузка аннотации копирований/переименований…"
+#: lib/spellcheck.tcl:73
+msgid "Spell checker silently failed on startup"
+msgstr "Программа проверки правописания не смогла запуститься"
-#: lib/blame.tcl:577
-msgid "lines annotated"
-msgstr "строк прокомментировано"
+#: lib/spellcheck.tcl:80
+msgid "Unrecognized spell checker"
+msgstr "Нераспознанная программа проверки правописания"
-#: lib/blame.tcl:769
-msgid "Loading original location annotations..."
-msgstr "Загрузка аннотаций первоначального положения объекта…"
+#: lib/spellcheck.tcl:186
+msgid "No Suggestions"
+msgstr "Исправлений не найдено"
-#: lib/blame.tcl:772
-msgid "Annotation complete."
-msgstr "Аннотация завершена."
+#: lib/spellcheck.tcl:388
+msgid "Unexpected EOF from spell checker"
+msgstr "Программа проверки правописания прервала передачу данных"
-#: lib/blame.tcl:802
-msgid "Busy"
-msgstr "Занят"
+#: lib/spellcheck.tcl:392
+msgid "Spell Checker Failed"
+msgstr "Ошибка проверки правописания"
-#: lib/blame.tcl:803
-msgid "Annotation process is already running."
-msgstr "Аннотация уже запущена"
+#: lib/transport.tcl:6 lib/remote_add.tcl:132
+#, tcl-format
+msgid "fetch %s"
+msgstr "извлечение %s"
-#: lib/blame.tcl:842
-msgid "Running thorough copy detection..."
-msgstr "Выполнение полного поиска копий…"
+#: lib/transport.tcl:7
+#, tcl-format
+msgid "Fetching new changes from %s"
+msgstr "Извлечение изменений из %s "
-#: lib/blame.tcl:910
-msgid "Loading annotation..."
-msgstr "Загрузка аннотации…"
+#: lib/transport.tcl:18
+#, tcl-format
+msgid "remote prune %s"
+msgstr "чистка внешнего %s"
-#: lib/blame.tcl:963
-msgid "Author:"
-msgstr "Автор:"
+#: lib/transport.tcl:19
+#, tcl-format
+msgid "Pruning tracking branches deleted from %s"
+msgstr "Чистка отслеживаемых веток, удалённых из %s"
-#: lib/blame.tcl:967
-msgid "Committer:"
-msgstr "Коммитер:"
+#: lib/transport.tcl:25
+msgid "fetch all remotes"
+msgstr "извлечь со всех внешних репозиториев"
-#: lib/blame.tcl:972
-msgid "Original File:"
-msgstr "Исходный файл:"
+#: lib/transport.tcl:26
+msgid "Fetching new changes from all remotes"
+msgstr "Получение изменений со всех внешних репозиториев"
-#: lib/blame.tcl:1020
-msgid "Cannot find HEAD commit:"
-msgstr "Не удалось найти текущее состояние:"
+#: lib/transport.tcl:40
+msgid "remote prune all remotes"
+msgstr "чистка всех внешних репозиториев"
-#: lib/blame.tcl:1075
-msgid "Cannot find parent commit:"
-msgstr "Не удалось найти родительское состояние:"
+#: lib/transport.tcl:41
+msgid "Pruning tracking branches deleted from all remotes"
+msgstr "Чистка отслеживаемых веток, удалённых со всех внешних репозиториев"
-#: lib/blame.tcl:1090
-msgid "Unable to display parent"
-msgstr "Не могу показать предка"
+#: lib/transport.tcl:54 lib/transport.tcl:92 lib/transport.tcl:110
+#: lib/remote_add.tcl:162
+#, tcl-format
+msgid "push %s"
+msgstr "отправить %s"
-#: lib/blame.tcl:1091 lib/diff.tcl:320
-msgid "Error loading diff:"
-msgstr "Ошибка загрузки изменений:"
+#: lib/transport.tcl:55
+#, tcl-format
+msgid "Pushing changes to %s"
+msgstr "Отправка изменений в %s "
-#: lib/blame.tcl:1231
-msgid "Originally By:"
-msgstr "Источник:"
+#: lib/transport.tcl:93
+#, tcl-format
+msgid "Mirroring to %s"
+msgstr "Точное копирование в %s"
-#: lib/blame.tcl:1237
-msgid "In File:"
-msgstr "Файл:"
+#: lib/transport.tcl:111
+#, tcl-format
+msgid "Pushing %s %s to %s"
+msgstr "Отправка %s %s в %s"
-#: lib/blame.tcl:1242
-msgid "Copied Or Moved Here By:"
-msgstr "Скопировано/перемещено в:"
+#: lib/transport.tcl:132
+msgid "Push Branches"
+msgstr "Отправить ветки"
-#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
-msgid "Checkout Branch"
-msgstr "Перейти на ветку"
-
-#: lib/branch_checkout.tcl:23
-msgid "Checkout"
-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
+#: 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/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328
-msgid "Revision"
-msgstr "Версия"
+#: lib/transport.tcl:147
+msgid "Source Branches"
+msgstr "Исходные ветки"
-#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280
-msgid "Options"
-msgstr "Настройки"
+#: lib/transport.tcl:162
+msgid "Destination Repository"
+msgstr "Репозиторий назначения"
-#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92
-msgid "Fetch Tracking Branch"
-msgstr "Извлечь изменения из внешней ветки"
+#: lib/transport.tcl:165 lib/remote_branch_delete.tcl:51
+msgid "Remote:"
+msgstr "внешний:"
-#: lib/branch_checkout.tcl:44
-msgid "Detach From Local Branch"
-msgstr "Отсоединить от локальной ветки"
+#: lib/transport.tcl:187 lib/remote_branch_delete.tcl:72
+msgid "Arbitrary Location:"
+msgstr "Указанное положение:"
-#: lib/branch_create.tcl:22
-msgid "Create Branch"
-msgstr "Создать ветку"
+#: lib/transport.tcl:205
+msgid "Transfer Options"
+msgstr "Настройки отправки"
-#: lib/branch_create.tcl:27
-msgid "Create New Branch"
-msgstr "Создать новую ветку"
+#: lib/transport.tcl:207
+msgid "Force overwrite existing branch (may discard changes)"
+msgstr "Принудительно перезаписать существующую ветку (возможна потеря изменений)"
-#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381
-msgid "Create"
-msgstr "Создать"
+#: lib/transport.tcl:211
+msgid "Use thin pack (for slow network connections)"
+msgstr "Использовать thin pack (для медленных сетевых подключений)"
-#: lib/branch_create.tcl:40
-msgid "Branch Name"
-msgstr "Имя ветки"
+#: lib/transport.tcl:215
+msgid "Include tags"
+msgstr "Передать метки"
-#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50
-msgid "Name:"
-msgstr "Название:"
-
-#: lib/branch_create.tcl:58
-msgid "Match Tracking Branch Name"
-msgstr "Соответствовать имени отслеживаемой ветки"
-
-#: lib/branch_create.tcl:66
-msgid "Starting Revision"
-msgstr "Начальная версия"
-
-#: lib/branch_create.tcl:72
-msgid "Update Existing Branch:"
-msgstr "Обновить имеющуюся ветку:"
-
-#: lib/branch_create.tcl:75
-msgid "No"
-msgstr "Нет"
-
-#: lib/branch_create.tcl:80
-msgid "Fast Forward Only"
-msgstr "Только Fast Forward"
-
-#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571
-msgid "Reset"
-msgstr "Сброс"
-
-#: lib/branch_create.tcl:97
-msgid "Checkout After Creation"
-msgstr "После создания сделать текущей"
-
-#: lib/branch_create.tcl:131
-msgid "Please select a tracking branch."
-msgstr "Укажите отлеживаемую ветку."
-
-#: lib/branch_create.tcl:140
+#: lib/transport.tcl:229
#, tcl-format
-msgid "Tracking branch %s is not a branch in the remote repository."
-msgstr "Отслеживаемая ветка %s не является веткой на внешнем репозитории."
-
-#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86
-msgid "Please supply a branch name."
-msgstr "Укажите имя ветки."
-
-#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106
-#, tcl-format
-msgid "'%s' is not an acceptable branch name."
-msgstr "Недопустимое имя ветки «%s»."
-
-#: lib/branch_delete.tcl:15
-msgid "Delete Branch"
-msgstr "Удаление ветки"
-
-#: lib/branch_delete.tcl:20
-msgid "Delete Local Branch"
-msgstr "Удалить локальную ветку"
-
-#: lib/branch_delete.tcl:37
-msgid "Local Branches"
-msgstr "Локальные ветки"
-
-#: lib/branch_delete.tcl:52
-msgid "Delete Only If Merged Into"
-msgstr "Удалить только в случае, если было слияние с"
-
-#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119
-msgid "Always (Do not perform merge checks)"
-msgstr "Всегда (не выполнять проверку на слияние)"
-
-#: lib/branch_delete.tcl:103
-#, tcl-format
-msgid "The following branches are not completely merged into %s:"
-msgstr "Ветки, которые не полностью сливаются с %s:"
-
-#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217
-msgid ""
-"Recovering deleted branches is difficult.\n"
-"\n"
-"Delete the selected branches?"
-msgstr "Восстановить удаленные ветки сложно.\n\nПродолжить?"
-
-#: lib/branch_delete.tcl:141
-#, tcl-format
-msgid ""
-"Failed to delete branches:\n"
-"%s"
-msgstr "Не удалось удалить ветки:\n%s"
-
-#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22
-msgid "Rename Branch"
-msgstr "Переименование ветки"
-
-#: lib/branch_rename.tcl:26
-msgid "Rename"
-msgstr "Переименовать"
-
-#: lib/branch_rename.tcl:36
-msgid "Branch:"
-msgstr "Ветка:"
-
-#: lib/branch_rename.tcl:39
-msgid "New Name:"
-msgstr "Новое название:"
-
-#: lib/branch_rename.tcl:75
-msgid "Please select a branch to rename."
-msgstr "Укажите ветку для переименования."
-
-#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202
-#, tcl-format
-msgid "Branch '%s' already exists."
-msgstr "Ветка «%s» уже существует."
-
-#: lib/branch_rename.tcl:117
-#, tcl-format
-msgid "Failed to rename '%s'."
-msgstr "Не удалось переименовать «%s». "
-
-#: lib/browser.tcl:17
-msgid "Starting..."
-msgstr "Запуск…"
-
-#: lib/browser.tcl:26
-msgid "File Browser"
-msgstr "Просмотр списка файлов"
-
-#: lib/browser.tcl:126 lib/browser.tcl:143
-#, tcl-format
-msgid "Loading %s..."
-msgstr "Загрузка %s…"
-
-#: lib/browser.tcl:187
-msgid "[Up To Parent]"
-msgstr "[На уровень выше]"
-
-#: lib/browser.tcl:267 lib/browser.tcl:273
-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
-msgid "Browse"
-msgstr "Показать"
+msgid "%s (%s): Push"
+msgstr "%s (%s): Отправка"
#: lib/checkout_op.tcl:85
#, tcl-format
@@ -865,8 +750,8 @@
msgid "fatal: Cannot resolve %s"
msgstr "критическая ошибка: невозможно разрешить %s"
-#: 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 "Закрыть"
@@ -880,6 +765,11 @@
msgid "Failed to configure simplified git-pull for '%s'."
msgstr "Ошибка создания упрощённой конфигурации git pull для «%s»."
+#: lib/checkout_op.tcl:202 lib/branch_rename.tcl:102
+#, tcl-format
+msgid "Branch '%s' already exists."
+msgstr "Ветка «%s» уже существует."
+
#: lib/checkout_op.tcl:229
#, tcl-format
msgid ""
@@ -921,51 +811,55 @@
msgid "files checked out"
msgstr "файлы извлечены"
-#: lib/checkout_op.tcl:376
+#: lib/checkout_op.tcl:377
#, tcl-format
msgid "Aborted checkout of '%s' (file level merging is required)."
msgstr "Прерван переход на «%s» (требуется слияние содержимого файлов)"
-#: lib/checkout_op.tcl:377
+#: lib/checkout_op.tcl:378
msgid "File level merge required."
msgstr "Требуется слияние содержания файлов."
-#: lib/checkout_op.tcl:381
+#: lib/checkout_op.tcl:382
#, tcl-format
msgid "Staying on branch '%s'."
msgstr "Ветка «%s» остаётся текущей."
-#: 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 "Вы более не находитесь на локальной ветке.\n\nЕсли вы хотите снова вернуться к какой-нибудь ветке, создайте её сейчас, начиная с «Текущего отсоединенного состояния»."
-#: 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 "Выполнен переход на «%s»."
-#: lib/checkout_op.tcl:535
+#: lib/checkout_op.tcl:536
#, tcl-format
msgid "Resetting '%s' to '%s' will lose the following commits:"
msgstr "Сброс «%s» на «%s» приведет к потере следующих коммитов:"
-#: lib/checkout_op.tcl:557
+#: lib/checkout_op.tcl:558
msgid "Recovering lost commits may not be easy."
msgstr "Восстановить потерянные коммиты будет сложно."
-#: lib/checkout_op.tcl:562
+#: lib/checkout_op.tcl:563
#, tcl-format
msgid "Reset '%s'?"
msgstr "Сбросить «%s»?"
-#: 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 "Наглядно"
-#: lib/checkout_op.tcl:635
+#: lib/checkout_op.tcl:572 lib/branch_create.tcl:85
+msgid "Reset"
+msgstr "Сброс"
+
+#: lib/checkout_op.tcl:636
#, tcl-format
msgid ""
"Failed to set current branch.\n"
@@ -975,576 +869,498 @@
"This should not have occurred. %s will now close and give up."
msgstr "Не удалось установить текущую ветку.\n\nВаш рабочий каталог обновлён только частично. Были обновлены все файлы кроме служебных файлов Git. \n\nЭтого не должно было произойти. %s завершается."
-#: lib/choose_font.tcl:39
+#: lib/remote_add.tcl:20
+#, tcl-format
+msgid "%s (%s): Add Remote"
+msgstr "%s (%s): Добавление внешнего репозитория"
+
+#: lib/remote_add.tcl:25
+msgid "Add New Remote"
+msgstr "Добавить внешний репозиторий"
+
+#: lib/remote_add.tcl:30 lib/tools_dlg.tcl:37
+msgid "Add"
+msgstr "Добавить"
+
+#: lib/remote_add.tcl:39
+msgid "Remote Details"
+msgstr "Информация о внешнем репозитории"
+
+#: lib/remote_add.tcl:41 lib/tools_dlg.tcl:51 lib/branch_create.tcl:44
+msgid "Name:"
+msgstr "Название:"
+
+#: lib/remote_add.tcl:50
+msgid "Location:"
+msgstr "Положение:"
+
+#: lib/remote_add.tcl:60
+msgid "Further Action"
+msgstr "Следующая операция"
+
+#: lib/remote_add.tcl:63
+msgid "Fetch Immediately"
+msgstr "Сразу извлечь изменения"
+
+#: lib/remote_add.tcl:69
+msgid "Initialize Remote Repository and Push"
+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 "'%s' is not an acceptable remote name."
+msgstr "«%s» не является допустимым именем внешнего репозитория."
+
+#: lib/remote_add.tcl:124
+#, tcl-format
+msgid "Failed to add remote '%s' of location '%s'."
+msgstr "Не удалось добавить «%s» из «%s». "
+
+#: lib/remote_add.tcl:133
+#, tcl-format
+msgid "Fetching the %s"
+msgstr "Извлечение %s"
+
+#: lib/remote_add.tcl:156
+#, tcl-format
+msgid "Do not know how to initialize repository at location '%s'."
+msgstr "Невозможно инициализировать репозиторий в «%s»."
+
+#: lib/remote_add.tcl:163
+#, tcl-format
+msgid "Setting up the %s (at %s)"
+msgstr "Настройка %s (в %s)"
+
+#: lib/browser.tcl:17
+msgid "Starting..."
+msgstr "Запуск…"
+
+#: lib/browser.tcl:27
+#, tcl-format
+msgid "%s (%s): File Browser"
+msgstr "%s (%s): Просмотр списка файлов"
+
+#: lib/browser.tcl:132 lib/browser.tcl:149
+#, tcl-format
+msgid "Loading %s..."
+msgstr "Загрузка %s…"
+
+#: lib/browser.tcl:193
+msgid "[Up To Parent]"
+msgstr "[На уровень выше]"
+
+#: lib/browser.tcl:275
+#, tcl-format
+msgid "%s (%s): Browse Branch Files"
+msgstr "%s (%s): Просмотр файлов ветки"
+
+#: lib/browser.tcl:282
+msgid "Browse Branch Files"
+msgstr "Показать файлы ветки"
+
+#: lib/browser.tcl:288 lib/choose_repository.tcl:437
+#: lib/choose_repository.tcl:524 lib/choose_repository.tcl:533
+#: lib/choose_repository.tcl:1115
+msgid "Browse"
+msgstr "Показать"
+
+#: lib/browser.tcl:297 lib/branch_checkout.tcl:35 lib/tools_dlg.tcl:321
+msgid "Revision"
+msgstr "Версия"
+
+#: lib/index.tcl:6
+msgid "Unable to unlock the index."
+msgstr "Не удалось разблокировать индекс"
+
+#: lib/index.tcl:30
+msgid "Index Error"
+msgstr "Ошибка в индексе"
+
+#: lib/index.tcl:32
+msgid ""
+"Updating the Git index failed. A rescan will be automatically started to "
+"resynchronize git-gui."
+msgstr "Не удалось обновить индекс Git. Состояние репозитория будет перечитано автоматически."
+
+#: 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 "Unstaging %s from commit"
+msgstr "Удаление %s из индекса"
+
+#: 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 "Adding %s"
+msgstr "Добавление %s…"
+
+#: lib/index.tcl:412
+#, tcl-format
+msgid "Stage %d untracked files?"
+msgstr "Проиндексировать %d неотслеживаемые файла?"
+
+#: lib/index.tcl:420
+msgid "Adding all changed files"
+msgstr "Добавление всех измененных файлов"
+
+#: lib/index.tcl:503
+#, tcl-format
+msgid "Revert changes in file %s?"
+msgstr "Обратить изменения в файле %s?"
+
+#: lib/index.tcl:508
+#, tcl-format
+msgid "Revert changes in these %i files?"
+msgstr "Обратить изменения в %i файле(-ах)?"
+
+#: lib/index.tcl:517
+msgid "Any unstaged changes will be permanently lost by the revert."
+msgstr "Любые непроиндексированные изменения, будут потеряны при обращении изменений."
+
+#: lib/index.tcl:520 lib/index.tcl:563
+msgid "Do Nothing"
+msgstr "Ничего не делать"
+
+#: lib/index.tcl:545
+#, tcl-format
+msgid "Delete untracked file %s?"
+msgstr "Удалить неотслеживаемый файл %s?"
+
+#: lib/index.tcl:550
+#, tcl-format
+msgid "Delete these %i untracked files?"
+msgstr "Удалить %i неотслеживаемые файла?"
+
+#: lib/index.tcl:560
+msgid "Files will be permanently deleted."
+msgstr "Файлы будут удалены навсегда."
+
+#: lib/index.tcl:564
+msgid "Delete Files"
+msgstr "Удалить файлы"
+
+#: lib/index.tcl:586
+msgid "Deleting"
+msgstr "Удаление"
+
+#: lib/index.tcl:665
+msgid "Encountered errors deleting files:\n"
+msgstr "Возникшие ошибки при удалении файлов:\n"
+
+#: lib/index.tcl:674
+#, tcl-format
+msgid "None of the %d selected files could be deleted."
+msgstr "Не удалось удалить ни один из выбранных %d файлов."
+
+#: lib/index.tcl:679
+#, tcl-format
+msgid "%d of the %d selected files could not be deleted."
+msgstr "Не удалось удалить %d из выбранных %d файлов."
+
+#: lib/index.tcl:726
+msgid "Reverting selected files"
+msgstr "Обращение изменений в выбранных файлах"
+
+#: lib/index.tcl:730
+#, tcl-format
+msgid "Reverting %s"
+msgstr "Обращение изменений в %s"
+
+#: lib/branch_checkout.tcl:16
+#, tcl-format
+msgid "%s (%s): Checkout Branch"
+msgstr "%s (%s): Переход на ветку"
+
+#: lib/branch_checkout.tcl:21
+msgid "Checkout Branch"
+msgstr "Перейти на ветку"
+
+#: lib/branch_checkout.tcl:26
+msgid "Checkout"
+msgstr "Перейти"
+
+#: lib/branch_checkout.tcl:39 lib/option.tcl:310 lib/branch_create.tcl:69
+msgid "Options"
+msgstr "Настройки"
+
+#: lib/branch_checkout.tcl:42 lib/branch_create.tcl:92
+msgid "Fetch Tracking Branch"
+msgstr "Извлечь изменения из внешней ветки"
+
+#: lib/branch_checkout.tcl:47
+msgid "Detach From Local Branch"
+msgstr "Отсоединить от локальной ветки"
+
+#: lib/status_bar.tcl:263
+#, tcl-format
+msgid "%s ... %*i of %*i %s (%3i%%)"
+msgstr "%s … %*i из %*i %s (%3i%%)"
+
+#: lib/remote.tcl:200
+msgid "Push to"
+msgstr "Отправить"
+
+#: lib/remote.tcl:218
+msgid "Remove Remote"
+msgstr "Удалить ссылку на внешний репозиторий"
+
+#: lib/remote.tcl:223
+msgid "Prune from"
+msgstr "Чистка"
+
+#: lib/remote.tcl:228
+msgid "Fetch from"
+msgstr "Извлечение из"
+
+#: lib/remote.tcl:249 lib/remote.tcl:253 lib/remote.tcl:258 lib/remote.tcl:264
+msgid "All"
+msgstr "Все"
+
+#: lib/branch_rename.tcl:15
+#, tcl-format
+msgid "%s (%s): Rename Branch"
+msgstr "%s (%s): Переименовать ветку"
+
+#: lib/branch_rename.tcl:23
+msgid "Rename Branch"
+msgstr "Переименование ветки"
+
+#: lib/branch_rename.tcl:28
+msgid "Rename"
+msgstr "Переименовать"
+
+#: lib/branch_rename.tcl:38
+msgid "Branch:"
+msgstr "Ветка:"
+
+#: lib/branch_rename.tcl:46
+msgid "New Name:"
+msgstr "Новое название:"
+
+#: lib/branch_rename.tcl:81
+msgid "Please select a branch to rename."
+msgstr "Укажите ветку для переименования."
+
+#: lib/branch_rename.tcl:92 lib/branch_create.tcl:154
+msgid "Please supply a branch name."
+msgstr "Укажите имя ветки."
+
+#: lib/branch_rename.tcl:112 lib/branch_create.tcl:165
+#, tcl-format
+msgid "'%s' is not an acceptable branch name."
+msgstr "Недопустимое имя ветки «%s»."
+
+#: lib/branch_rename.tcl:123
+#, tcl-format
+msgid "Failed to rename '%s'."
+msgstr "Не удалось переименовать «%s». "
+
+#: lib/choose_font.tcl:41
msgid "Select"
msgstr "Выбрать"
-#: lib/choose_font.tcl:53
+#: lib/choose_font.tcl:55
msgid "Font Family"
msgstr "Шрифт"
-#: lib/choose_font.tcl:74
+#: lib/choose_font.tcl:76
msgid "Font Size"
msgstr "Размер шрифта"
-#: lib/choose_font.tcl:91
+#: lib/choose_font.tcl:93
msgid "Font Example"
msgstr "Пример текста"
-#: 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."
msgstr "Это пример текста.\nЕсли Вам нравится этот текст, это может быть Ваш шрифт."
-#: lib/choose_repository.tcl:28
-msgid "Git Gui"
-msgstr "Git Gui"
-
-#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386
-msgid "Create New Repository"
-msgstr "Создать новый репозиторий"
-
-#: lib/choose_repository.tcl:93
-msgid "New..."
-msgstr "Новый…"
-
-#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471
-msgid "Clone Existing Repository"
-msgstr "Склонировать существующий репозиторий"
-
-#: lib/choose_repository.tcl:106
-msgid "Clone..."
-msgstr "Клонировать…"
-
-#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016
-msgid "Open Existing Repository"
-msgstr "Выбрать существующий репозиторий"
-
-#: lib/choose_repository.tcl:119
-msgid "Open..."
-msgstr "Открыть…"
-
-#: lib/choose_repository.tcl:132
-msgid "Recent Repositories"
-msgstr "Недавние репозитории"
-
-#: lib/choose_repository.tcl:138
-msgid "Open Recent Repository:"
-msgstr "Открыть последний репозиторий"
-
-#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313
-#: lib/choose_repository.tcl:320
+#: lib/option.tcl:11
#, tcl-format
-msgid "Failed to create repository %s:"
-msgstr "Не удалось создать репозиторий %s:"
+msgid "Invalid global encoding '%s'"
+msgstr "Неверная глобальная кодировка «%s»"
-#: lib/choose_repository.tcl:391
-msgid "Directory:"
-msgstr "Каталог:"
-
-#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550
-#: lib/choose_repository.tcl:1052
-msgid "Git Repository"
-msgstr "Репозиторий"
-
-#: lib/choose_repository.tcl:448
+#: lib/option.tcl:19
#, tcl-format
-msgid "Directory %s already exists."
-msgstr "Каталог '%s' уже существует."
+msgid "Invalid repo encoding '%s'"
+msgstr "Неверная кодировка репозитория «%s»"
-#: lib/choose_repository.tcl:452
+#: lib/option.tcl:119
+msgid "Restore Defaults"
+msgstr "Восстановить настройки по умолчанию"
+
+#: lib/option.tcl:123
+msgid "Save"
+msgstr "Сохранить"
+
+#: lib/option.tcl:133
#, tcl-format
-msgid "File %s already exists."
-msgstr "Файл '%s' уже существует."
+msgid "%s Repository"
+msgstr "Для репозитория %s"
-#: lib/choose_repository.tcl:466
-msgid "Clone"
-msgstr "Склонировать"
+#: lib/option.tcl:134
+msgid "Global (All Repositories)"
+msgstr "Общие (для всех репозиториев)"
-#: lib/choose_repository.tcl:479
-msgid "Source Location:"
-msgstr "Исходное положение:"
+#: lib/option.tcl:140
+msgid "User Name"
+msgstr "Имя пользователя"
-#: lib/choose_repository.tcl:490
-msgid "Target Directory:"
-msgstr "Каталог назначения:"
+#: lib/option.tcl:141
+msgid "Email Address"
+msgstr "Адрес электронной почты"
-#: lib/choose_repository.tcl:502
-msgid "Clone Type:"
-msgstr "Тип клона:"
+#: lib/option.tcl:143
+msgid "Summarize Merge Commits"
+msgstr "Суммарное сообщение при слиянии"
-#: lib/choose_repository.tcl:508
-msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
-msgstr "Стандартный (Быстрый, полуизбыточный, «жесткие» ссылки)"
+#: lib/option.tcl:144
+msgid "Merge Verbosity"
+msgstr "Уровень детальности сообщений при слиянии"
-#: lib/choose_repository.tcl:514
-msgid "Full Copy (Slower, Redundant Backup)"
-msgstr "Полная копия (Медленный, создает резервную копию)"
+#: lib/option.tcl:145
+msgid "Show Diffstat After Merge"
+msgstr "Показать отчет об изменениях после слияния"
-#: lib/choose_repository.tcl:520
-msgid "Shared (Fastest, Not Recommended, No Backup)"
-msgstr "Общий (Самый быстрый, не рекомендуется, без резервной копии)"
+#: lib/option.tcl:146
+msgid "Use Merge Tool"
+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:148
+msgid "Trust File Modification Timestamps"
+msgstr "Доверять времени модификации файла"
+
+#: lib/option.tcl:149
+msgid "Prune Tracking Branches During Fetch"
+msgstr "Чистка отслеживаемых веток при извлечении изменений"
+
+#: lib/option.tcl:150
+msgid "Match Tracking Branches"
+msgstr "Такое же имя, как и у отслеживаемой ветки"
+
+#: lib/option.tcl:151
+msgid "Use Textconv For Diffs and Blames"
+msgstr "Использовать Textconv для просмотра различий и авторства"
+
+#: lib/option.tcl:152
+msgid "Blame Copy Only On Changed Files"
+msgstr "Поиск копий только в изменённых файлах"
+
+#: lib/option.tcl:153
+msgid "Maximum Length of Recent Repositories List"
+msgstr "Максимальная длинна списка недавних репозиториев"
+
+#: lib/option.tcl:154
+msgid "Minimum Letters To Blame Copy On"
+msgstr "Минимальное количество символов для поиска копий"
+
+#: lib/option.tcl:155
+msgid "Blame History Context Radius (days)"
+msgstr "Радиус исторического контекста (в днях)"
+
+#: lib/option.tcl:156
+msgid "Number of Diff Context Lines"
+msgstr "Число строк в контексте diff"
+
+#: lib/option.tcl:157
+msgid "Additional Diff Parameters"
+msgstr "Дополнительные параметры для diff"
+
+#: lib/option.tcl:158
+msgid "Commit Message Text Width"
+msgstr "Ширина текста сообщения коммита"
+
+#: lib/option.tcl:159
+msgid "New Branch Name Template"
+msgstr "Шаблон для имени новой ветки"
+
+#: lib/option.tcl:160
+msgid "Default File Contents Encoding"
+msgstr "Кодировка содержания файла по умолчанию"
+
+#: lib/option.tcl:161
+msgid "Warn before committing to a detached head"
+msgstr "Предупреждать перед коммитом в отделённый HEAD"
+
+#: lib/option.tcl:162
+msgid "Staging of untracked files"
+msgstr "Индексирование неотслеживаемых файлов"
+
+#: lib/option.tcl:163
+msgid "Show untracked files"
+msgstr "Показать неотслеживаемые файлы"
+
+#: 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 "Not a Git repository: %s"
-msgstr "Каталог не является репозиторием: %s"
+msgid "%s:"
+msgstr "%s:"
-#: lib/choose_repository.tcl:592
-msgid "Standard only available for local repository."
-msgstr "Стандартный клон возможен только для локального репозитория."
+#: lib/option.tcl:210
+msgid "Change"
+msgstr "Изменить"
-#: lib/choose_repository.tcl:596
-msgid "Shared only available for local repository."
-msgstr "Общий клон возможен только для локального репозитория."
+#: lib/option.tcl:254
+msgid "Spelling Dictionary:"
+msgstr "Словарь для проверки правописания:"
-#: lib/choose_repository.tcl:617
+#: lib/option.tcl:284
+msgid "Change Font"
+msgstr "Изменить"
+
+#: lib/option.tcl:288
#, tcl-format
-msgid "Location %s already exists."
-msgstr "Путь '%s' уже существует."
+msgid "Choose %s"
+msgstr "Выберите %s"
-#: lib/choose_repository.tcl:628
-msgid "Failed to configure origin"
-msgstr "Не могу сконфигурировать исходный репозиторий."
+#: lib/option.tcl:294
+msgid "pt."
+msgstr "п."
-#: lib/choose_repository.tcl:640
-msgid "Counting objects"
-msgstr "Считаю объекты"
+#: lib/option.tcl:308
+msgid "Preferences"
+msgstr "Настройки"
-#: lib/choose_repository.tcl:641
-msgid "buckets"
-msgstr "блоки"
-
-#: lib/choose_repository.tcl:665
-#, tcl-format
-msgid "Unable to copy objects/info/alternates: %s"
-msgstr "Не могу скопировать objects/info/alternates: %s"
-
-#: lib/choose_repository.tcl:701
-#, tcl-format
-msgid "Nothing to clone from %s."
-msgstr "Нечего клонировать с %s."
-
-#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917
-#: lib/choose_repository.tcl:929
-msgid "The 'master' branch has not been initialized."
-msgstr "Не инициализирована ветвь «master»."
-
-#: lib/choose_repository.tcl:716
-msgid "Hardlinks are unavailable. Falling back to copying."
-msgstr "«Жесткие ссылки» недоступны. Будет использовано копирование."
-
-#: lib/choose_repository.tcl:728
-#, tcl-format
-msgid "Cloning from %s"
-msgstr "Клонирование %s"
-
-#: lib/choose_repository.tcl:759
-msgid "Copying objects"
-msgstr "Копирование objects"
-
-#: lib/choose_repository.tcl:760
-msgid "KiB"
-msgstr "КБ"
-
-#: lib/choose_repository.tcl:784
-#, tcl-format
-msgid "Unable to copy object: %s"
-msgstr "Не могу скопировать объект: %s"
-
-#: lib/choose_repository.tcl:794
-msgid "Linking objects"
-msgstr "Создание ссылок на objects"
-
-#: lib/choose_repository.tcl:795
-msgid "objects"
-msgstr "объекты"
-
-#: lib/choose_repository.tcl:803
-#, tcl-format
-msgid "Unable to hardlink object: %s"
-msgstr "Не могу создать «жесткую ссылку» на объект: %s"
-
-#: lib/choose_repository.tcl:858
-msgid "Cannot fetch branches and objects. See console output for details."
-msgstr "Не удалось извлечь ветки и объекты. Дополнительная информация на консоли."
-
-#: lib/choose_repository.tcl:869
-msgid "Cannot fetch tags. See console output for details."
-msgstr "Не удалось извлечь метки. Дополнительная информация на консоли."
-
-#: lib/choose_repository.tcl:893
-msgid "Cannot determine HEAD. See console output for details."
-msgstr "Не могу определить HEAD. Дополнительная информация на консоли."
-
-#: lib/choose_repository.tcl:902
-#, tcl-format
-msgid "Unable to cleanup %s"
-msgstr "Не могу очистить %s"
-
-#: lib/choose_repository.tcl:908
-msgid "Clone failed."
-msgstr "Клонирование не удалось."
-
-#: lib/choose_repository.tcl:915
-msgid "No default branch obtained."
-msgstr "Ветка по умолчанию не была получена."
-
-#: lib/choose_repository.tcl:926
-#, tcl-format
-msgid "Cannot resolve %s as a commit."
-msgstr "Не могу распознать %s как коммит."
-
-#: lib/choose_repository.tcl:938
-msgid "Creating working directory"
-msgstr "Создаю рабочий каталог"
-
-#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130
-#: lib/index.tcl:198
-msgid "files"
-msgstr "файлов"
-
-#: lib/choose_repository.tcl:968
-msgid "Initial file checkout failed."
-msgstr "Не удалось получить начальное состояние файлов репозитория."
-
-#: lib/choose_repository.tcl:1011
-msgid "Open"
-msgstr "Открыть"
-
-#: lib/choose_repository.tcl:1021
-msgid "Repository:"
-msgstr "Репозиторий:"
-
-#: lib/choose_repository.tcl:1072
-#, tcl-format
-msgid "Failed to open repository %s:"
-msgstr "Не удалось открыть репозиторий %s:"
-
-#: lib/choose_rev.tcl:53
-msgid "This Detached Checkout"
-msgstr "Текущее отсоединенное состояние"
-
-#: lib/choose_rev.tcl:60
-msgid "Revision Expression:"
-msgstr "Выражение для определения версии:"
-
-#: lib/choose_rev.tcl:74
-msgid "Local Branch"
-msgstr "Локальная ветка:"
-
-#: lib/choose_rev.tcl:79
-msgid "Tracking Branch"
-msgstr "Отслеживаемая ветка"
-
-#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538
-msgid "Tag"
-msgstr "Метка"
-
-#: lib/choose_rev.tcl:317
-#, tcl-format
-msgid "Invalid revision: %s"
-msgstr "Неверная версия: %s"
-
-#: lib/choose_rev.tcl:338
-msgid "No revision selected."
-msgstr "Версия не указана."
-
-#: lib/choose_rev.tcl:346
-msgid "Revision expression is empty."
-msgstr "Пустое выражение для определения версии."
-
-#: lib/choose_rev.tcl:531
-msgid "Updated"
-msgstr "Обновлено"
-
-#: lib/choose_rev.tcl:559
-msgid "URL"
-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"
-msgstr "Отсутствует коммиты для исправления.\n\nВы создаете начальный коммит, здесь еще нечего исправлять.\n"
-
-#: 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 "Невозможно исправить коммит во время слияния.\n\nТекущее слияние не завершено. Невозможно исправить предыдуий коммит, не прерывая эту операцию.\n"
-
-#: lib/commit.tcl:48
-msgid "Error loading commit data for amend:"
-msgstr "Ошибка при загрузке данных для исправления коммита:"
-
-#: lib/commit.tcl:75
-msgid "Unable to obtain your identity:"
-msgstr "Невозможно получить информацию об авторстве:"
-
-#: lib/commit.tcl:80
-msgid "Invalid GIT_COMMITTER_IDENT:"
-msgstr "Недопустимый GIT_COMMITTER_IDENT:"
-
-#: lib/commit.tcl:129
-#, tcl-format
-msgid "warning: Tcl does not support encoding '%s'."
-msgstr "предупреждение: Tcl не поддерживает кодировку «%s»."
-
-#: 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"
-msgstr "Последнее прочитанное состояние репозитория не соответствует текущему.\n\nС момента последней проверки репозиторий был изменен другой программой Git. Необходимо перечитать репозиторий, прежде чем изменять текущую ветвь. \n\nЭто будет сделано сейчас автоматически.\n"
-
-#: lib/commit.tcl:172
-#, 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 "Нельзя выполнить коммит с незавершённой операцией слияния.\n\nДля файла %s возник конфликт слияния. Разрешите конфликт и добавьте их в индекс перед выполнением коммита.\n"
-
-#: lib/commit.tcl:180
-#, tcl-format
-msgid ""
-"Unknown file state %s detected.\n"
-"\n"
-"File %s cannot be committed by this program.\n"
-msgstr "Обнаружено неизвестное состояние файла %s.\n\nФайл %s не может быть закоммичен этой программой.\n"
-
-#: lib/commit.tcl:188
-msgid ""
-"No changes to commit.\n"
-"\n"
-"You must stage at least 1 file before you can commit.\n"
-msgstr "Отсутствуют изменения для сохранения.\n\nДобавьте в индекс хотя бы один файл перед выполнением коммита.\n"
-
-#: lib/commit.tcl:203
-msgid ""
-"Please supply a commit message.\n"
-"\n"
-"A good commit message has the following format:\n"
-"\n"
-"- First line: Describe in one sentence what you did.\n"
-"- Second line: Blank\n"
-"- Remaining lines: Describe why this change is good.\n"
-msgstr "Укажите сообщение коммита.\n\nРекомендуется следующий формат сообщения:\n\n- в первой строке краткое описание сделанных изменений\n- вторая строка пустая\n- в оставшихся строках опишите, что дают ваши изменения\n"
-
-#: lib/commit.tcl:234
-msgid "Calling pre-commit hook..."
-msgstr "Вызов перехватчика pre-commit…"
-
-#: lib/commit.tcl:249
-msgid "Commit declined by pre-commit hook."
-msgstr "Коммит прерван переватчиком pre-commit."
-
-#: lib/commit.tcl:272
-msgid "Calling commit-msg hook..."
-msgstr "Вызов перехватчика commit-msg…"
-
-#: lib/commit.tcl:287
-msgid "Commit declined by commit-msg hook."
-msgstr "Коммит прерван переватчиком commit-msg"
-
-#: lib/commit.tcl:300
-msgid "Committing changes..."
-msgstr "Коммит изменений…"
-
-#: lib/commit.tcl:316
-msgid "write-tree failed:"
-msgstr "Программа write-tree завершилась с ошибкой:"
-
-#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382
-msgid "Commit failed."
-msgstr "Не удалось закоммитить изменения."
-
-#: lib/commit.tcl:334
-#, tcl-format
-msgid "Commit %s appears to be corrupt"
-msgstr "Коммит %s похоже поврежден"
-
-#: 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"
-msgstr "Нет изменения для коммита.\n\nНи один файл не был изменен и не было слияния.\n\nСейчас автоматически запустится перечитывание репозитория.\n"
-
-#: lib/commit.tcl:346
-msgid "No changes to commit."
-msgstr "Нет изменения для коммита."
-
-#: lib/commit.tcl:360
-msgid "commit-tree failed:"
-msgstr "Программа commit-tree завершилась с ошибкой:"
-
-#: lib/commit.tcl:381
-msgid "update-ref failed:"
-msgstr "Программа update-ref завершилась с ошибкой:"
-
-#: lib/commit.tcl:469
-#, tcl-format
-msgid "Created commit %s: %s"
-msgstr "Создан коммит %s: %s "
-
-#: lib/console.tcl:59
-msgid "Working... please wait..."
-msgstr "В процессе… пожалуйста, ждите…"
-
-#: lib/console.tcl:186
-msgid "Success"
-msgstr "Процесс успешно завершен"
-
-#: lib/console.tcl:200
-msgid "Error: Command Failed"
-msgstr "Ошибка: не удалось выполнить команду"
-
-#: lib/database.tcl:43
-msgid "Number of loose objects"
-msgstr "Количество несвязанных объектов"
-
-#: lib/database.tcl:44
-msgid "Disk space used by loose objects"
-msgstr "Объем дискового пространства, занятый несвязанными объектами"
-
-#: lib/database.tcl:45
-msgid "Number of packed objects"
-msgstr "Количество упакованных объектов"
-
-#: lib/database.tcl:46
-msgid "Number of packs"
-msgstr "Количество pack-файлов"
-
-#: lib/database.tcl:47
-msgid "Disk space used by packed objects"
-msgstr "Объем дискового пространства, занятый упакованными объектами"
-
-#: lib/database.tcl:48
-msgid "Packed objects waiting for pruning"
-msgstr "Несвязанные объекты, которые можно удалить"
-
-#: lib/database.tcl:49
-msgid "Garbage files"
-msgstr "Мусор"
-
-#: lib/database.tcl:72
-msgid "Compressing the object database"
-msgstr "Сжатие базы объектов"
-
-#: lib/database.tcl:83
-msgid "Verifying the object database with fsck-objects"
-msgstr "Проверка базы объектов при помощи fsck"
-
-#: 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 "Этот репозиторий сейчас содержит примерно %i свободных объектов\n\nДля лучшей производительности рекомендуется сжать базу данных.\n\nСжать базу данных сейчас?"
-
-#: lib/date.tcl:25
-#, tcl-format
-msgid "Invalid date from Git: %s"
-msgstr "Неправильная дата в репозитории: %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 "Изменений не обнаружено.\n\nв %s отсутствуют изменения.\n\nДата изменения файла была обновлена другой программой, но содержимое файла осталось прежним.\n\nСейчас будет запущено перечитывание репозитория, чтобы найти подобные файлы."
-
-#: lib/diff.tcl:104
-#, tcl-format
-msgid "Loading diff of %s..."
-msgstr "Загрузка изменений %s…"
-
-#: lib/diff.tcl:125
-msgid ""
-"LOCAL: deleted\n"
-"REMOTE:\n"
-msgstr "ЛОКАЛЬНО: удалён\nВНЕШНИЙ:\n"
-
-#: lib/diff.tcl:130
-msgid ""
-"REMOTE: deleted\n"
-"LOCAL:\n"
-msgstr "ВНЕШНИЙ: удалён\nЛОКАЛЬНО:\n"
-
-#: lib/diff.tcl:137
-msgid "LOCAL:\n"
-msgstr "ЛОКАЛЬНО:\n"
-
-#: lib/diff.tcl:140
-msgid "REMOTE:\n"
-msgstr "ВНЕШНИЙ:\n"
-
-#: lib/diff.tcl:202 lib/diff.tcl:319
-#, tcl-format
-msgid "Unable to display %s"
-msgstr "Не могу показать %s"
-
-#: lib/diff.tcl:203
-msgid "Error loading file:"
-msgstr "Ошибка загрузки файла:"
-
-#: lib/diff.tcl:210
-msgid "Git Repository (subproject)"
-msgstr "Репозиторий Git (подпроект)"
-
-#: lib/diff.tcl:222
-msgid "* Binary file (not showing content)."
-msgstr "* Двоичный файл (содержимое не показано)"
-
-#: lib/diff.tcl:227
-#, tcl-format
-msgid ""
-"* Untracked file is %d bytes.\n"
-"* Showing only first %d bytes.\n"
-msgstr "* Размер неотслеживаемого файла %d байт.\n* Показано первых %d байт.\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* Неотслеживаемый файл обрезан: %s.\n* Чтобы увидеть весь файл, используйте внешний редактор.\n"
-
-#: lib/diff.tcl:482
-msgid "Failed to unstage selected hunk."
-msgstr "Не удалось исключить выбранную часть."
-
-#: lib/diff.tcl:489
-msgid "Failed to stage selected hunk."
-msgstr "Не удалось проиндексировать выбранный блок изменений."
-
-#: lib/diff.tcl:568
-msgid "Failed to unstage selected line."
-msgstr "Не удалось исключить выбранную строку."
-
-#: lib/diff.tcl:576
-msgid "Failed to stage selected line."
-msgstr "Не удалось проиндексировать выбранную строку."
+#: lib/option.tcl:345
+msgid "Failed to completely save options:"
+msgstr "Не удалось полностью сохранить настройки:"
#: lib/encoding.tcl:443
msgid "Default"
@@ -1559,184 +1375,40 @@
msgid "Other"
msgstr "Другая"
-#: lib/error.tcl:20 lib/error.tcl:114
-msgid "error"
-msgstr "ошибка"
-
-#: lib/error.tcl:36
-msgid "warning"
-msgstr "предупреждение"
-
-#: lib/error.tcl:94
-msgid "You must correct the above errors before committing."
-msgstr "Перед коммитом, исправьте вышеуказанные ошибки."
-
-#: lib/index.tcl:6
-msgid "Unable to unlock the index."
-msgstr "Не удалось разблокировать индекс"
-
-#: lib/index.tcl:15
-msgid "Index Error"
-msgstr "Ошибка в индексе"
-
-#: lib/index.tcl:17
-msgid ""
-"Updating the Git index failed. A rescan will be automatically started to "
-"resynchronize git-gui."
-msgstr "Не удалось обновить индекс Git. Состояние репозитория будет перечитано автоматически."
-
-#: lib/index.tcl:28
-msgid "Continue"
-msgstr "Продолжить"
-
-#: lib/index.tcl:31
-msgid "Unlock Index"
-msgstr "Разблокировать индекс"
-
-#: lib/index.tcl:289
+#: lib/tools.tcl:76
#, tcl-format
-msgid "Unstaging %s from commit"
-msgstr "Удаление %s из индекса"
+msgid "Running %s requires a selected file."
+msgstr "Запуск %s требует выбранного файла."
-#: lib/index.tcl:328
-msgid "Ready to commit."
-msgstr "Готов для коммита."
-
-#: lib/index.tcl:341
+#: lib/tools.tcl:92
#, tcl-format
-msgid "Adding %s"
-msgstr "Добавление %s…"
+msgid "Are you sure you want to run %1$s on file \"%2$s\"?"
+msgstr "Вы действительно хотите выполнить %1$s на «%2$s»?"
-#: lib/index.tcl:398
+#: lib/tools.tcl:96
#, tcl-format
-msgid "Revert changes in file %s?"
-msgstr "Обратить изменения в файле %s?"
+msgid "Are you sure you want to run %s?"
+msgstr "Действительно запустить %s?"
-#: lib/index.tcl:400
+#: lib/tools.tcl:118
#, tcl-format
-msgid "Revert changes in these %i files?"
-msgstr "Обратить изменения в %i файле(-ах)?"
+msgid "Tool: %s"
+msgstr "Вспомогательная операция: %s"
-#: lib/index.tcl:408
-msgid "Any unstaged changes will be permanently lost by the revert."
-msgstr "Любые непроиндексированные изменения, будут потеряны при обращении изменений."
-
-#: lib/index.tcl:411
-msgid "Do Nothing"
-msgstr "Ничего не делать"
-
-#: lib/index.tcl:429
-msgid "Reverting selected files"
-msgstr "Обращение изменений в выбранных файлах"
-
-#: lib/index.tcl:433
+#: lib/tools.tcl:119
#, tcl-format
-msgid "Reverting %s"
-msgstr "Обращение изменений в %s"
+msgid "Running: %s"
+msgstr "Выполнение: %s"
-#: 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 "Невозможно выполнить слияние во время исправления.\n\nЗавершите исправление данного коммита перед выполнением операции слияния.\n"
-
-#: 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 "Последнее прочитанное состояние репозитория не соответствует текущему.\n\nС момента последней проверки репозиторий был изменен другой программой Git. Необходимо перечитать репозиторий, прежде чем слияние может быть сделано.\n\nЭто будет сделано сейчас автоматически.\n"
-
-#: lib/merge.tcl:45
+#: lib/tools.tcl:158
#, 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"
-msgstr "Предыдущее слияние не завершено из-за конфликта.\n\nДля файла %s возник конфликт слияния.\n\nРазрешите конфликт, добавьте файл в индекс и закоммитьте. Только после этого можно начать следующее слияние.\n"
+msgid "Tool completed successfully: %s"
+msgstr "Программа %s завершилась успешно."
-#: lib/merge.tcl:55
+#: lib/tools.tcl:160
#, 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 "Вы находитесь в процессе изменений.\n\nФайл %s изменён.\n\nВы должны завершить текущий коммит перед началом слияния. В случае необходимости, это позволит прервать операцию слияния.\n"
-
-#: lib/merge.tcl:107
-#, tcl-format
-msgid "%s of %s"
-msgstr "%s из %s"
-
-#: lib/merge.tcl:120
-#, tcl-format
-msgid "Merging %s and %s..."
-msgstr "Слияние %s и %s…"
-
-#: lib/merge.tcl:131
-msgid "Merge completed successfully."
-msgstr "Слияние успешно завершено."
-
-#: lib/merge.tcl:133
-msgid "Merge failed. Conflict resolution is required."
-msgstr "Не удалось завершить слияние. Требуется разрешение конфликта."
-
-#: lib/merge.tcl:158
-#, tcl-format
-msgid "Merge Into %s"
-msgstr "Слияние с %s"
-
-#: lib/merge.tcl:177
-msgid "Revision To Merge"
-msgstr "Версия, с которой провести слияние"
-
-#: lib/merge.tcl:212
-msgid ""
-"Cannot abort while amending.\n"
-"\n"
-"You must finish amending this commit.\n"
-msgstr "Невозможно прервать исправление.\n\nЗавершите текущее исправление коммита.\n"
-
-#: lib/merge.tcl:222
-msgid ""
-"Abort merge?\n"
-"\n"
-"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n"
-"\n"
-"Continue with aborting the current merge?"
-msgstr "Прервать операцию слияния?\n\nПрерывание текущего слияния приведет к потере *ВСЕХ* несохраненных изменений.\n\nПродолжить?"
-
-#: lib/merge.tcl:228
-msgid ""
-"Reset changes?\n"
-"\n"
-"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n"
-"\n"
-"Continue with resetting the current changes?"
-msgstr "Сбросить изменения?\n\nСброс изменений приведет к потере *ВСЕХ* несохраненных изменений.\n\nПродолжить?"
-
-#: lib/merge.tcl:239
-msgid "Aborting"
-msgstr "Прерываю"
-
-#: lib/merge.tcl:239
-msgid "files reset"
-msgstr "изменения в файлах отменены"
-
-#: lib/merge.tcl:267
-msgid "Abort failed."
-msgstr "Прервать не удалось."
-
-#: lib/merge.tcl:269
-msgid "Abort completed. Ready."
-msgstr "Прервано."
+msgid "Tool failed: %s"
+msgstr "Ошибка выполнения программы: %s"
#: lib/mergetool.tcl:8
msgid "Force resolution to the base version?"
@@ -1778,28 +1450,28 @@
msgid "Conflict file does not exist"
msgstr "Конфликтующий файл не существует"
-#: lib/mergetool.tcl:264
+#: lib/mergetool.tcl:246
#, tcl-format
msgid "Not a GUI merge tool: '%s'"
msgstr "«%s» не является программой слияния"
-#: lib/mergetool.tcl:268
+#: lib/mergetool.tcl:275
#, tcl-format
msgid "Unsupported merge tool '%s'"
msgstr "Неподдерживаемая программа слияния «%s»"
-#: lib/mergetool.tcl:303
+#: lib/mergetool.tcl:310
msgid "Merge tool is already running, terminate it?"
msgstr "Программа слияния уже работает. Прервать?"
-#: lib/mergetool.tcl:323
+#: lib/mergetool.tcl:330
#, tcl-format
msgid ""
"Error retrieving versions:\n"
"%s"
msgstr "Ошибка получения версий:\n%s"
-#: lib/mergetool.tcl:343
+#: lib/mergetool.tcl:350
#, tcl-format
msgid ""
"Could not start the merge tool:\n"
@@ -1807,259 +1479,177 @@
"%s"
msgstr "Ошибка запуска программы слияния:\n\n%s"
-#: lib/mergetool.tcl:347
+#: lib/mergetool.tcl:354
msgid "Running merge tool..."
msgstr "Запуск программы слияния…"
-#: lib/mergetool.tcl:375 lib/mergetool.tcl:383
+#: lib/mergetool.tcl:382 lib/mergetool.tcl:390
msgid "Merge tool failed."
msgstr "Ошибка выполнения программы слияния."
-#: lib/option.tcl:11
+#: lib/tools_dlg.tcl:22
#, tcl-format
-msgid "Invalid global encoding '%s'"
-msgstr "Неверная глобальная кодировка «%s»"
+msgid "%s (%s): Add Tool"
+msgstr "%s (%s): Добавить инструмент"
-#: lib/option.tcl:19
+#: lib/tools_dlg.tcl:28
+msgid "Add New Tool Command"
+msgstr "Новая вспомогательная операция"
+
+#: lib/tools_dlg.tcl:34
+msgid "Add globally"
+msgstr "Добавить для всех репозиториев"
+
+#: lib/tools_dlg.tcl:46
+msgid "Tool Details"
+msgstr "Описание вспомогательной операции"
+
+#: lib/tools_dlg.tcl:49
+msgid "Use '/' separators to create a submenu tree:"
+msgstr "Используйте «/» для создания подменю"
+
+#: lib/tools_dlg.tcl:60
+msgid "Command:"
+msgstr "Команда:"
+
+#: lib/tools_dlg.tcl:71
+msgid "Show a dialog before running"
+msgstr "Показать диалог перед запуском"
+
+#: lib/tools_dlg.tcl:77
+msgid "Ask the user to select a revision (sets $REVISION)"
+msgstr "Запрос на выбор версии (устанавливает $REVISION)"
+
+#: lib/tools_dlg.tcl:82
+msgid "Ask the user for additional arguments (sets $ARGS)"
+msgstr "Запрос дополнительных аргументов (устанавливает $ARGS)"
+
+#: lib/tools_dlg.tcl:89
+msgid "Don't show the command output window"
+msgstr "Не показывать окно вывода команды"
+
+#: lib/tools_dlg.tcl:94
+msgid "Run only if a diff is selected ($FILENAME not empty)"
+msgstr "Запуск только если показан список изменений ($FILENAME не пусто)"
+
+#: lib/tools_dlg.tcl:118
+msgid "Please supply a name for the tool."
+msgstr "Укажите название вспомогательной операции."
+
+#: lib/tools_dlg.tcl:126
#, tcl-format
-msgid "Invalid repo encoding '%s'"
-msgstr "Неверная кодировка репозитория «%s»"
+msgid "Tool '%s' already exists."
+msgstr "Вспомогательная операция «%s» уже существует."
-#: lib/option.tcl:117
-msgid "Restore Defaults"
-msgstr "Восстановить настройки по умолчанию"
-
-#: lib/option.tcl:121
-msgid "Save"
-msgstr "Сохранить"
-
-#: lib/option.tcl:131
+#: lib/tools_dlg.tcl:148
#, tcl-format
-msgid "%s Repository"
-msgstr "Для репозитория %s"
+msgid ""
+"Could not add tool:\n"
+"%s"
+msgstr "Ошибка добавления программы:\n%s"
-#: lib/option.tcl:132
-msgid "Global (All Repositories)"
-msgstr "Общие (для всех репозиториев)"
-
-#: lib/option.tcl:138
-msgid "User Name"
-msgstr "Имя пользователя"
-
-#: lib/option.tcl:139
-msgid "Email Address"
-msgstr "Адрес электронной почты"
-
-#: lib/option.tcl:141
-msgid "Summarize Merge Commits"
-msgstr "Суммарное сообщение при слиянии"
-
-#: lib/option.tcl:142
-msgid "Merge Verbosity"
-msgstr "Уровень детальности сообщений при слиянии"
-
-#: lib/option.tcl:143
-msgid "Show Diffstat After Merge"
-msgstr "Показать отчет об изменениях после слияния"
-
-#: lib/option.tcl:144
-msgid "Use Merge Tool"
-msgstr "Использовать для слияния программу"
-
-#: lib/option.tcl:146
-msgid "Trust File Modification Timestamps"
-msgstr "Доверять времени модификации файла"
-
-#: lib/option.tcl:147
-msgid "Prune Tracking Branches During Fetch"
-msgstr "Чистка отслеживаемых веток при извлечении изменений"
-
-#: lib/option.tcl:148
-msgid "Match Tracking Branches"
-msgstr "Такое же имя, как и у отслеживаемой ветки"
-
-#: lib/option.tcl:149
-msgid "Blame Copy Only On Changed Files"
-msgstr "Поиск копий только в изменённых файлах"
-
-#: lib/option.tcl:150
-msgid "Minimum Letters To Blame Copy On"
-msgstr "Минимальное количество символов для поиска копий"
-
-#: lib/option.tcl:151
-msgid "Blame History Context Radius (days)"
-msgstr "Радиус исторического контекста (в днях)"
-
-#: lib/option.tcl:152
-msgid "Number of Diff Context Lines"
-msgstr "Число строк в контексте diff"
-
-#: lib/option.tcl:153
-msgid "Commit Message Text Width"
-msgstr "Ширина текста сообщения коммита"
-
-#: lib/option.tcl:154
-msgid "New Branch Name Template"
-msgstr "Шаблон для имени новой ветки"
-
-#: lib/option.tcl:155
-msgid "Default File Contents Encoding"
-msgstr "Кодировка содержания файла по умолчанию"
-
-#: lib/option.tcl:203
-msgid "Change"
-msgstr "Изменить"
-
-#: lib/option.tcl:230
-msgid "Spelling Dictionary:"
-msgstr "Словарь для проверки правописания:"
-
-#: lib/option.tcl:254
-msgid "Change Font"
-msgstr "Изменить"
-
-#: lib/option.tcl:258
+#: lib/tools_dlg.tcl:187
#, tcl-format
-msgid "Choose %s"
-msgstr "Выберите %s"
+msgid "%s (%s): Remove Tool"
+msgstr "%s (%s): Удалить инструмент"
-#: lib/option.tcl:264
-msgid "pt."
-msgstr "pt."
+#: lib/tools_dlg.tcl:193
+msgid "Remove Tool Commands"
+msgstr "Удалить команды программы"
-#: lib/option.tcl:278
-msgid "Preferences"
-msgstr "Настройки"
+#: lib/tools_dlg.tcl:198
+msgid "Remove"
+msgstr "Удалить"
-#: lib/option.tcl:314
-msgid "Failed to completely save options:"
-msgstr "Не удалось полностью сохранить настройки:"
+#: lib/tools_dlg.tcl:231
+msgid "(Blue denotes repository-local tools)"
+msgstr "(Синим выделены программы локальные репозиторию)"
-#: lib/remote.tcl:163
-msgid "Remove Remote"
-msgstr "Удалить ссылку на внешний репозиторий"
-
-#: lib/remote.tcl:168
-msgid "Prune from"
-msgstr "Чистка"
-
-#: lib/remote.tcl:173
-msgid "Fetch from"
-msgstr "Извлечение из"
-
-#: lib/remote.tcl:215
-msgid "Push to"
-msgstr "Отправить"
-
-#: lib/remote_add.tcl:19
-msgid "Add Remote"
-msgstr "Зарегистрировать внешний репозиторий"
-
-#: lib/remote_add.tcl:24
-msgid "Add New Remote"
-msgstr "Добавить внешний репозиторий"
-
-#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36
-msgid "Add"
-msgstr "Добавить"
-
-#: lib/remote_add.tcl:37
-msgid "Remote Details"
-msgstr "Информация о внешнем репозитории"
-
-#: lib/remote_add.tcl:50
-msgid "Location:"
-msgstr "Положение:"
-
-#: lib/remote_add.tcl:62
-msgid "Further Action"
-msgstr "Следующая операция"
-
-#: lib/remote_add.tcl:65
-msgid "Fetch Immediately"
-msgstr "Сразу извлечь изменения"
-
-#: lib/remote_add.tcl:71
-msgid "Initialize Remote Repository and Push"
-msgstr "Инициализировать внешний репозиторий и отправить"
-
-#: lib/remote_add.tcl:77
-msgid "Do Nothing Else Now"
-msgstr "Больше ничего не делать"
-
-#: lib/remote_add.tcl:101
-msgid "Please supply a remote name."
-msgstr "Укажите название внешнего репозитория."
-
-#: lib/remote_add.tcl:114
+#: lib/tools_dlg.tcl:283
#, tcl-format
-msgid "'%s' is not an acceptable remote name."
-msgstr "«%s» не является допустимым именем внешнего репозитория."
+msgid "%s (%s):"
+msgstr "%s (%s):"
-#: lib/remote_add.tcl:125
+#: lib/tools_dlg.tcl:292
#, tcl-format
-msgid "Failed to add remote '%s' of location '%s'."
-msgstr "Не удалось добавить «%s» из «%s». "
+msgid "Run Command: %s"
+msgstr "Запуск команды: %s"
-#: lib/remote_add.tcl:133 lib/transport.tcl:6
+#: lib/tools_dlg.tcl:306
+msgid "Arguments"
+msgstr "Аргументы"
+
+#: lib/tools_dlg.tcl:341
+msgid "OK"
+msgstr "OK"
+
+#: lib/search.tcl:48
+msgid "Find:"
+msgstr "Поиск:"
+
+#: lib/search.tcl:50
+msgid "Next"
+msgstr "Дальше"
+
+#: lib/search.tcl:51
+msgid "Prev"
+msgstr "Обратно"
+
+#: lib/search.tcl:52
+msgid "RegExp"
+msgstr "Регулярные выражения"
+
+#: lib/search.tcl:54
+msgid "Case"
+msgstr "Учёт регистра"
+
+#: lib/shortcut.tcl:8 lib/shortcut.tcl:43 lib/shortcut.tcl:75
#, tcl-format
-msgid "fetch %s"
-msgstr "извлечение %s"
+msgid "%s (%s): Create Desktop Icon"
+msgstr "%s (%s): Создать ярлык на рабочем столе"
-#: lib/remote_add.tcl:134
+#: lib/shortcut.tcl:24 lib/shortcut.tcl:65
+msgid "Cannot write shortcut:"
+msgstr "Невозможно записать ссылку:"
+
+#: lib/shortcut.tcl:140
+msgid "Cannot write icon:"
+msgstr "Невозможно записать значок:"
+
+#: lib/remote_branch_delete.tcl:29
#, tcl-format
-msgid "Fetching the %s"
-msgstr "Извлечение %s"
+msgid "%s (%s): Delete Branch Remotely"
+msgstr "%s (%s): Удаление внешней ветки"
-#: lib/remote_add.tcl:157
-#, tcl-format
-msgid "Do not know how to initialize repository at location '%s'."
-msgstr "Невозможно инициализировать репозиторий в «%s»."
-
-#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63
-#: lib/transport.tcl:81
-#, tcl-format
-msgid "push %s"
-msgstr "отправить %s"
-
-#: lib/remote_add.tcl:164
-#, tcl-format
-msgid "Setting up the %s (at %s)"
-msgstr "Настройка %s (в %s)"
-
-#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
+#: lib/remote_branch_delete.tcl:34
msgid "Delete Branch Remotely"
msgstr "Удаление ветки во внешнем репозитории"
-#: lib/remote_branch_delete.tcl:47
+#: lib/remote_branch_delete.tcl:48
msgid "From Repository"
msgstr "Из репозитория"
-#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134
-msgid "Remote:"
-msgstr "внешний:"
-
-#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149
-msgid "Arbitrary Location:"
-msgstr "Указанное положение:"
-
-#: lib/remote_branch_delete.tcl:84
+#: lib/remote_branch_delete.tcl:88
msgid "Branches"
msgstr "Ветки"
-#: lib/remote_branch_delete.tcl:109
+#: lib/remote_branch_delete.tcl:110
msgid "Delete Only If"
msgstr "Удалить только в случае, если"
-#: lib/remote_branch_delete.tcl:111
+#: lib/remote_branch_delete.tcl:112
msgid "Merged Into:"
msgstr "Слияние с:"
-#: lib/remote_branch_delete.tcl:152
+#: lib/remote_branch_delete.tcl:120 lib/branch_delete.tcl:53
+msgid "Always (Do not perform merge checks)"
+msgstr "Всегда (не выполнять проверку на слияние)"
+
+#: lib/remote_branch_delete.tcl:153
msgid "A branch is required for 'Merged Into'."
msgstr "Для операции «Слияние с» требуется указать ветку."
-#: lib/remote_branch_delete.tcl:184
+#: lib/remote_branch_delete.tcl:185
#, tcl-format
msgid ""
"The following branches are not completely merged into %s:\n"
@@ -2067,118 +1657,509 @@
" - %s"
msgstr "Следующие ветки могут быть объединены с %s при помощи операции слияния:\n\n - %s"
-#: lib/remote_branch_delete.tcl:189
+#: 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 "Некоторые тесты на слияние не прошли, потому что вы не извлекли необходимые коммиты. Попытайтесь извлечь их из %s."
-#: lib/remote_branch_delete.tcl:207
+#: lib/remote_branch_delete.tcl:208
msgid "Please select one or more branches to delete."
msgstr "Укажите одну или несколько веток для удаления."
-#: lib/remote_branch_delete.tcl:226
+#: lib/remote_branch_delete.tcl:218 lib/branch_delete.tcl:115
+msgid ""
+"Recovering deleted branches is difficult.\n"
+"\n"
+"Delete the selected branches?"
+msgstr "Восстановить удаленные ветки сложно.\n\nПродолжить?"
+
+#: lib/remote_branch_delete.tcl:227
#, tcl-format
msgid "Deleting branches from %s"
msgstr "Удаление веток из %s"
-#: lib/remote_branch_delete.tcl:292
+#: lib/remote_branch_delete.tcl:300
msgid "No repository selected."
msgstr "Не указан репозиторий."
-#: lib/remote_branch_delete.tcl:297
+#: lib/remote_branch_delete.tcl:305
#, tcl-format
msgid "Scanning %s..."
msgstr "Перечитывание %s…"
-#: lib/search.tcl:21
-msgid "Find:"
-msgstr "Поиск:"
+#: lib/choose_repository.tcl:45
+msgid "Git Gui"
+msgstr "Git Gui"
-#: lib/search.tcl:23
-msgid "Next"
-msgstr "Дальше"
+#: lib/choose_repository.tcl:104 lib/choose_repository.tcl:427
+msgid "Create New Repository"
+msgstr "Создать новый репозиторий"
-#: lib/search.tcl:24
-msgid "Prev"
-msgstr "Обратно"
+#: lib/choose_repository.tcl:110
+msgid "New..."
+msgstr "Новый…"
-#: lib/search.tcl:25
-msgid "Case-Sensitive"
-msgstr "Игн. большие/маленькие"
+#: lib/choose_repository.tcl:117 lib/choose_repository.tcl:511
+msgid "Clone Existing Repository"
+msgstr "Склонировать существующий репозиторий"
-#: lib/shortcut.tcl:21 lib/shortcut.tcl:62
-msgid "Cannot write shortcut:"
-msgstr "Невозможно записать ссылку:"
+#: lib/choose_repository.tcl:128
+msgid "Clone..."
+msgstr "Клонировать…"
-#: lib/shortcut.tcl:137
-msgid "Cannot write icon:"
-msgstr "Невозможно записать значок:"
+#: lib/choose_repository.tcl:135 lib/choose_repository.tcl:1105
+msgid "Open Existing Repository"
+msgstr "Выбрать существующий репозиторий"
-#: lib/spellcheck.tcl:57
-msgid "Unsupported spell checker"
-msgstr "Неподдерживаемая программа проверки правописания"
+#: lib/choose_repository.tcl:141
+msgid "Open..."
+msgstr "Открыть…"
-#: lib/spellcheck.tcl:65
-msgid "Spell checking is unavailable"
-msgstr "Проверка правописания не доступна"
+#: lib/choose_repository.tcl:154
+msgid "Recent Repositories"
+msgstr "Недавние репозитории"
-#: lib/spellcheck.tcl:68
-msgid "Invalid spell checking configuration"
-msgstr "Неправильная конфигурация программы проверки правописания"
+#: lib/choose_repository.tcl:164
+msgid "Open Recent Repository:"
+msgstr "Открыть последний репозиторий"
-#: lib/spellcheck.tcl:70
+#: lib/choose_repository.tcl:331 lib/choose_repository.tcl:338
+#: lib/choose_repository.tcl:345
#, tcl-format
-msgid "Reverting dictionary to %s."
-msgstr "Словарь вернут к %s."
+msgid "Failed to create repository %s:"
+msgstr "Не удалось создать репозиторий %s:"
-#: lib/spellcheck.tcl:73
-msgid "Spell checker silently failed on startup"
-msgstr "Программа проверки правописания не смогла запуститься"
+#: lib/choose_repository.tcl:422 lib/branch_create.tcl:33
+msgid "Create"
+msgstr "Создать"
-#: lib/spellcheck.tcl:80
-msgid "Unrecognized spell checker"
-msgstr "Нераспознанная программа проверки правописания"
+#: lib/choose_repository.tcl:432
+msgid "Directory:"
+msgstr "Каталог:"
-#: lib/spellcheck.tcl:186
-msgid "No Suggestions"
-msgstr "Исправлений не найдено"
+#: lib/choose_repository.tcl:462 lib/choose_repository.tcl:588
+#: lib/choose_repository.tcl:1139
+msgid "Git Repository"
+msgstr "Репозиторий"
-#: lib/spellcheck.tcl:388
-msgid "Unexpected EOF from spell checker"
-msgstr "Программа проверки правописания прервала передачу данных"
+#: lib/choose_repository.tcl:487
+#, tcl-format
+msgid "Directory %s already exists."
+msgstr "Каталог '%s' уже существует."
-#: lib/spellcheck.tcl:392
-msgid "Spell Checker Failed"
-msgstr "Ошибка проверки правописания"
+#: lib/choose_repository.tcl:491
+#, tcl-format
+msgid "File %s already exists."
+msgstr "Файл '%s' уже существует."
-#: lib/sshkey.tcl:31
+#: lib/choose_repository.tcl:506
+msgid "Clone"
+msgstr "Склонировать"
+
+#: lib/choose_repository.tcl:519
+msgid "Source Location:"
+msgstr "Исходное положение:"
+
+#: lib/choose_repository.tcl:528
+msgid "Target Directory:"
+msgstr "Каталог назначения:"
+
+#: lib/choose_repository.tcl:538
+msgid "Clone Type:"
+msgstr "Тип клона:"
+
+#: lib/choose_repository.tcl:543
+msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
+msgstr "Стандартный (Быстрый, полуизбыточный, «жесткие» ссылки)"
+
+#: lib/choose_repository.tcl:548
+msgid "Full Copy (Slower, Redundant Backup)"
+msgstr "Полная копия (Медленный, создает резервную копию)"
+
+#: 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 "Not a Git repository: %s"
+msgstr "Каталог не является репозиторием Git: %s"
+
+#: 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 "Location %s already exists."
+msgstr "Путь %s уже существует."
+
+#: 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/choose_repository.tcl:703
+#, tcl-format
+msgid "Unable to copy objects/info/alternates: %s"
+msgstr "Не удалось скопировать objects/info/alternates: %s"
+
+#: lib/choose_repository.tcl:740
+#, tcl-format
+msgid "Nothing to clone from %s."
+msgstr "Нечего клонировать с %s."
+
+#: lib/choose_repository.tcl:742 lib/choose_repository.tcl:962
+#: lib/choose_repository.tcl:974
+msgid "The 'master' branch has not been initialized."
+msgstr "Не инициализирована ветка «master»."
+
+#: lib/choose_repository.tcl:755
+msgid "Hardlinks are unavailable. Falling back to copying."
+msgstr "Жесткие ссылки недоступны. Будет использовано копирование."
+
+#: lib/choose_repository.tcl:769
+#, tcl-format
+msgid "Cloning from %s"
+msgstr "Клонирование из %s"
+
+#: lib/choose_repository.tcl:800
+msgid "Copying objects"
+msgstr "Копирование объектов"
+
+#: lib/choose_repository.tcl:801
+msgid "KiB"
+msgstr "КБ"
+
+#: lib/choose_repository.tcl:825
+#, tcl-format
+msgid "Unable to copy object: %s"
+msgstr "Не могу скопировать объект: %s"
+
+#: lib/choose_repository.tcl:837
+msgid "Linking objects"
+msgstr "Создание ссылок на objects"
+
+#: lib/choose_repository.tcl:838
+msgid "objects"
+msgstr "объекты"
+
+#: lib/choose_repository.tcl:846
+#, tcl-format
+msgid "Unable to hardlink object: %s"
+msgstr "Не могу создать «жесткую ссылку» на объект: %s"
+
+#: lib/choose_repository.tcl:903
+msgid "Cannot fetch branches and objects. See console output for details."
+msgstr "Не удалось извлечь ветки и объекты. Дополнительная информация на консоли."
+
+#: lib/choose_repository.tcl:914
+msgid "Cannot fetch tags. See console output for details."
+msgstr "Не удалось извлечь метки. Дополнительная информация на консоли."
+
+#: lib/choose_repository.tcl:938
+msgid "Cannot determine HEAD. See console output for details."
+msgstr "Не могу определить HEAD. Дополнительная информация на консоли."
+
+#: lib/choose_repository.tcl:947
+#, tcl-format
+msgid "Unable to cleanup %s"
+msgstr "Не могу очистить %s"
+
+#: lib/choose_repository.tcl:953
+msgid "Clone failed."
+msgstr "Клонирование не удалось."
+
+#: lib/choose_repository.tcl:960
+msgid "No default branch obtained."
+msgstr "Ветка по умолчанию не была получена."
+
+#: lib/choose_repository.tcl:971
+#, tcl-format
+msgid "Cannot resolve %s as a commit."
+msgstr "Не могу распознать %s как коммит."
+
+#: lib/choose_repository.tcl:998
+msgid "Creating working directory"
+msgstr "Создаю рабочий каталог"
+
+#: lib/choose_repository.tcl:1028
+msgid "Initial file checkout failed."
+msgstr "Не удалось получить начальное состояние файлов репозитория."
+
+#: lib/choose_repository.tcl:1072
+msgid "Cloning submodules"
+msgstr "Клонирование подмодулей"
+
+#: lib/choose_repository.tcl:1087
+msgid "Cannot clone submodules."
+msgstr "Не удалось клонировать подмодули."
+
+#: lib/choose_repository.tcl:1110
+msgid "Repository:"
+msgstr "Репозиторий:"
+
+#: lib/choose_repository.tcl:1159
+#, tcl-format
+msgid "Failed to open repository %s:"
+msgstr "Не удалось открыть репозиторий %s:"
+
+#: lib/about.tcl:26
+msgid "git-gui - a graphical user interface for Git."
+msgstr "git-gui - графический пользовательский интерфейс к Git."
+
+#: lib/blame.tcl:74
+#, tcl-format
+msgid "%s (%s): File Viewer"
+msgstr "%s (%s): Просмотр файла"
+
+#: lib/blame.tcl:80
+msgid "Commit:"
+msgstr "Коммит:"
+
+#: lib/blame.tcl:282
+msgid "Copy Commit"
+msgstr "Копировать SHA-1"
+
+#: lib/blame.tcl:286
+msgid "Find Text..."
+msgstr "Найти текст…"
+
+#: lib/blame.tcl:290
+msgid "Goto Line..."
+msgstr "Перейти на строку…"
+
+#: lib/blame.tcl:299
+msgid "Do Full Copy Detection"
+msgstr "Провести полный поиск копий"
+
+#: lib/blame.tcl:303
+msgid "Show History Context"
+msgstr "Показать исторический контекст"
+
+#: lib/blame.tcl:306
+msgid "Blame Parent Commit"
+msgstr "Авторы родительского коммита"
+
+#: lib/blame.tcl:468
+#, tcl-format
+msgid "Reading %s..."
+msgstr "Чтение %s…"
+
+#: lib/blame.tcl:596
+msgid "Loading copy/move tracking annotations..."
+msgstr "Загрузка аннотации копирований/переименований…"
+
+#: lib/blame.tcl:613
+msgid "lines annotated"
+msgstr "строк прокомментировано"
+
+#: lib/blame.tcl:815
+msgid "Loading original location annotations..."
+msgstr "Загрузка аннотаций первоначального положения объекта…"
+
+#: lib/blame.tcl:818
+msgid "Annotation complete."
+msgstr "Аннотация завершена."
+
+#: lib/blame.tcl:849
+msgid "Busy"
+msgstr "Занят"
+
+#: lib/blame.tcl:850
+msgid "Annotation process is already running."
+msgstr "Аннотация уже запущена"
+
+#: lib/blame.tcl:889
+msgid "Running thorough copy detection..."
+msgstr "Выполнение полного поиска копий…"
+
+#: lib/blame.tcl:957
+msgid "Loading annotation..."
+msgstr "Загрузка аннотации…"
+
+#: lib/blame.tcl:1010
+msgid "Author:"
+msgstr "Автор:"
+
+#: lib/blame.tcl:1014
+msgid "Committer:"
+msgstr "Коммитер:"
+
+#: lib/blame.tcl:1019
+msgid "Original File:"
+msgstr "Исходный файл:"
+
+#: lib/blame.tcl:1067
+msgid "Cannot find HEAD commit:"
+msgstr "Не удалось найти текущее состояние:"
+
+#: lib/blame.tcl:1122
+msgid "Cannot find parent commit:"
+msgstr "Не удалось найти родительское состояние:"
+
+#: lib/blame.tcl:1137
+msgid "Unable to display parent"
+msgstr "Не могу показать предка"
+
+#: lib/blame.tcl:1138 lib/diff.tcl:345
+msgid "Error loading diff:"
+msgstr "Ошибка загрузки изменений:"
+
+#: lib/blame.tcl:1279
+msgid "Originally By:"
+msgstr "Источник:"
+
+#: lib/blame.tcl:1285
+msgid "In File:"
+msgstr "Файл:"
+
+#: lib/blame.tcl:1290
+msgid "Copied Or Moved Here By:"
+msgstr "Скопировано/перемещено в:"
+
+#: lib/diff.tcl:77
+#, tcl-format
+msgid ""
+"No differences detected.\n"
+"\n"
+"%s has no changes.\n"
+"\n"
+"The modification date of this file was updated by another application, but the content within the file was not changed.\n"
+"\n"
+"A rescan will be automatically started to find other files which may have the same state."
+msgstr "Изменений не обнаружено.\n\nв %s отсутствуют изменения.\n\nДата изменения файла была обновлена другой программой, но содержимое файла осталось прежним.\n\nСейчас будет запущено перечитывание репозитория, чтобы найти подобные файлы."
+
+#: lib/diff.tcl:117
+#, tcl-format
+msgid "Loading diff of %s..."
+msgstr "Загрузка изменений %s…"
+
+#: lib/diff.tcl:143
+msgid ""
+"LOCAL: deleted\n"
+"REMOTE:\n"
+msgstr "ЛОКАЛЬНО: удалён\nВНЕШНИЙ:\n"
+
+#: lib/diff.tcl:148
+msgid ""
+"REMOTE: deleted\n"
+"LOCAL:\n"
+msgstr "ВНЕШНИЙ: удалён\nЛОКАЛЬНО:\n"
+
+#: lib/diff.tcl:155
+msgid "LOCAL:\n"
+msgstr "ЛОКАЛЬНО:\n"
+
+#: lib/diff.tcl:158
+msgid "REMOTE:\n"
+msgstr "ВНЕШНИЙ:\n"
+
+#: lib/diff.tcl:220 lib/diff.tcl:344
+#, tcl-format
+msgid "Unable to display %s"
+msgstr "Не могу показать %s"
+
+#: lib/diff.tcl:221
+msgid "Error loading file:"
+msgstr "Ошибка загрузки файла:"
+
+#: lib/diff.tcl:227
+msgid "Git Repository (subproject)"
+msgstr "Репозиторий Git (подпроект)"
+
+#: lib/diff.tcl:239
+msgid "* Binary file (not showing content)."
+msgstr "* Двоичный файл (содержимое не показано)"
+
+#: lib/diff.tcl:244
+#, tcl-format
+msgid ""
+"* Untracked file is %d bytes.\n"
+"* Showing only first %d bytes.\n"
+msgstr "* Размер неотслеживаемого файла %d байт.\n* Показано первых %d байт.\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* Неотслеживаемый файл обрезан: %s.\n* Чтобы увидеть весь файл, используйте внешний редактор.\n"
+
+#: lib/diff.tcl:583
+msgid "Failed to unstage selected hunk."
+msgstr "Не удалось исключить выбранную часть."
+
+#: lib/diff.tcl:591
+msgid "Failed to revert selected hunk."
+msgstr "Не удалось обратить изменения выбранного блока."
+
+#: lib/diff.tcl:594
+msgid "Failed to stage selected hunk."
+msgstr "Не удалось проиндексировать выбранный блок изменений."
+
+#: lib/diff.tcl:687
+msgid "Failed to unstage selected line."
+msgstr "Не удалось исключить выбранную строку."
+
+#: lib/diff.tcl:696
+msgid "Failed to revert selected line."
+msgstr "Не удалось обратить изменения выбраной строки."
+
+#: lib/diff.tcl:700
+msgid "Failed to stage selected line."
+msgstr "Не удалось проиндексировать выбранную строку."
+
+#: lib/diff.tcl:889
+msgid "Failed to undo last revert."
+msgstr "Не удалось отменить посленднее обращение изменений."
+
+#: lib/sshkey.tcl:34
msgid "No keys found."
msgstr "Ключ не найден"
-#: lib/sshkey.tcl:34
+#: lib/sshkey.tcl:37
#, tcl-format
msgid "Found a public key in: %s"
msgstr "Публичный ключ из %s"
-#: lib/sshkey.tcl:40
+#: lib/sshkey.tcl:43
msgid "Generate Key"
msgstr "Создать ключ"
-#: lib/sshkey.tcl:56
+#: lib/sshkey.tcl:61
msgid "Copy To Clipboard"
msgstr "Скопировать в буфер обмена"
-#: lib/sshkey.tcl:70
+#: lib/sshkey.tcl:75
msgid "Your OpenSSH Public Key"
msgstr "Ваш публичный ключ OpenSSH"
-#: lib/sshkey.tcl:78
+#: lib/sshkey.tcl:83
msgid "Generating..."
msgstr "Создание…"
-#: lib/sshkey.tcl:84
+#: lib/sshkey.tcl:89
#, tcl-format
msgid ""
"Could not start ssh-keygen:\n"
@@ -2186,197 +2167,485 @@
"%s"
msgstr "Ошибка запуска ssh-keygen:\n\n%s"
-#: lib/sshkey.tcl:111
+#: lib/sshkey.tcl:116
msgid "Generation failed."
msgstr "Ключ не создан."
-#: lib/sshkey.tcl:118
+#: lib/sshkey.tcl:123
msgid "Generation succeeded, but no keys found."
msgstr "Создание ключа завершилось, но результат не был найден"
-#: lib/sshkey.tcl:121
+#: lib/sshkey.tcl:126
#, tcl-format
msgid "Your key is in: %s"
msgstr "Ваш ключ находится в: %s"
-#: lib/status_bar.tcl:83
+#: lib/branch_create.tcl:23
#, tcl-format
-msgid "%s ... %*i of %*i %s (%3i%%)"
-msgstr "%s … %*i из %*i %s (%3i%%)"
+msgid "%s (%s): Create Branch"
+msgstr "%s (%s): Создание ветки"
-#: lib/tools.tcl:75
+#: lib/branch_create.tcl:28
+msgid "Create New Branch"
+msgstr "Создать новую ветку"
+
+#: lib/branch_create.tcl:42
+msgid "Branch Name"
+msgstr "Имя ветки"
+
+#: lib/branch_create.tcl:57
+msgid "Match Tracking Branch Name"
+msgstr "Соответствовать имени отслеживаемой ветки"
+
+#: lib/branch_create.tcl:66
+msgid "Starting Revision"
+msgstr "Начальная версия"
+
+#: lib/branch_create.tcl:72
+msgid "Update Existing Branch:"
+msgstr "Обновить имеющуюся ветку:"
+
+#: lib/branch_create.tcl:75
+msgid "No"
+msgstr "Нет"
+
+#: lib/branch_create.tcl:80
+msgid "Fast Forward Only"
+msgstr "Только Fast Forward"
+
+#: lib/branch_create.tcl:97
+msgid "Checkout After Creation"
+msgstr "После создания сделать текущей"
+
+#: lib/branch_create.tcl:132
+msgid "Please select a tracking branch."
+msgstr "Укажите отлеживаемую ветку."
+
+#: lib/branch_create.tcl:141
#, tcl-format
-msgid "Running %s requires a selected file."
-msgstr "Запуск %s требует выбранного файла."
+msgid "Tracking branch %s is not a branch in the remote repository."
+msgstr "Отслеживаемая ветка %s не является веткой на внешнем репозитории."
-#: lib/tools.tcl:90
+#: lib/console.tcl:59
+msgid "Working... please wait..."
+msgstr "В процессе… пожалуйста, ждите…"
+
+#: lib/console.tcl:186
+msgid "Success"
+msgstr "Процесс успешно завершен"
+
+#: 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/choose_rev.tcl:321
#, tcl-format
-msgid "Are you sure you want to run %s?"
-msgstr "Действительно запустить %s?"
+msgid "Invalid revision: %s"
+msgstr "Неверная версия: %s"
-#: lib/tools.tcl:110
+#: lib/choose_rev.tcl:342
+msgid "No revision selected."
+msgstr "Версия не указана."
+
+#: lib/choose_rev.tcl:350
+msgid "Revision expression is empty."
+msgstr "Пустое выражение для определения версии."
+
+#: lib/choose_rev.tcl:537
+msgid "Updated"
+msgstr "Обновлено"
+
+#: lib/choose_rev.tcl:565
+msgid "URL"
+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"
+msgstr "Отсутствует коммиты для исправления.\n\nВы создаете начальный коммит, здесь еще нечего исправлять.\n"
+
+#: 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 "Невозможно исправить коммит во время слияния.\n\nТекущее слияние не завершено. Невозможно исправить предыдуий коммит, не прерывая эту операцию.\n"
+
+#: lib/commit.tcl:56
+msgid "Error loading commit data for amend:"
+msgstr "Ошибка при загрузке данных для исправления коммита:"
+
+#: lib/commit.tcl:83
+msgid "Unable to obtain your identity:"
+msgstr "Невозможно получить информацию об авторстве:"
+
+#: lib/commit.tcl:88
+msgid "Invalid GIT_COMMITTER_IDENT:"
+msgstr "Недопустимый GIT_COMMITTER_IDENT:"
+
+#: lib/commit.tcl:138
#, tcl-format
-msgid "Tool: %s"
-msgstr "Вспомогательная операция: %s"
+msgid "warning: Tcl does not support encoding '%s'."
+msgstr "предупреждение: Tcl не поддерживает кодировку «%s»."
-#: lib/tools.tcl:111
-#, tcl-format
-msgid "Running: %s"
-msgstr "Выполнение: %s"
+#: 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 "Последнее прочитанное состояние репозитория не соответствует текущему.\n\nС момента последней проверки репозиторий был изменен другой программой Git. Необходимо перечитать репозиторий, прежде чем изменять текущую ветвь. \n\nЭто будет сделано сейчас автоматически.\n"
-#: lib/tools.tcl:149
-#, tcl-format
-msgid "Tool completed successfully: %s"
-msgstr "Программа %s завершилась успешно."
-
-#: lib/tools.tcl:151
-#, tcl-format
-msgid "Tool failed: %s"
-msgstr "Ошибка выполнения программы: %s"
-
-#: lib/tools_dlg.tcl:22
-msgid "Add Tool"
-msgstr "Добавить вспомогательную операцию"
-
-#: lib/tools_dlg.tcl:28
-msgid "Add New Tool Command"
-msgstr "Новая вспомогательная операция"
-
-#: lib/tools_dlg.tcl:33
-msgid "Add globally"
-msgstr "Добавить для всех репозиториев"
-
-#: lib/tools_dlg.tcl:45
-msgid "Tool Details"
-msgstr "Описание вспомогательной операции"
-
-#: lib/tools_dlg.tcl:48
-msgid "Use '/' separators to create a submenu tree:"
-msgstr "Используйте «/» для создания подменю"
-
-#: lib/tools_dlg.tcl:61
-msgid "Command:"
-msgstr "Команда:"
-
-#: lib/tools_dlg.tcl:74
-msgid "Show a dialog before running"
-msgstr "Показать диалог перед запуском"
-
-#: lib/tools_dlg.tcl:80
-msgid "Ask the user to select a revision (sets $REVISION)"
-msgstr "Запрос на выбор версии (устанавливает $REVISION)"
-
-#: lib/tools_dlg.tcl:85
-msgid "Ask the user for additional arguments (sets $ARGS)"
-msgstr "Запрос дополнительных аргументов (устанавливает $ARGS)"
-
-#: lib/tools_dlg.tcl:92
-msgid "Don't show the command output window"
-msgstr "Не показывать окно вывода команды"
-
-#: lib/tools_dlg.tcl:97
-msgid "Run only if a diff is selected ($FILENAME not empty)"
-msgstr "Запуск только если показан список изменений ($FILENAME не пусто)"
-
-#: lib/tools_dlg.tcl:121
-msgid "Please supply a name for the tool."
-msgstr "Укажите название вспомогательной операции."
-
-#: lib/tools_dlg.tcl:129
-#, tcl-format
-msgid "Tool '%s' already exists."
-msgstr "Вспомогательная операция «%s» уже существует."
-
-#: lib/tools_dlg.tcl:151
+#: lib/commit.tcl:182
#, tcl-format
msgid ""
-"Could not add tool:\n"
+"Unmerged files cannot be committed.\n"
+"\n"
+"File %s has merge conflicts. You must resolve them and stage the file before committing.\n"
+msgstr "Нельзя выполнить коммит с незавершённой операцией слияния.\n\nДля файла %s возник конфликт слияния. Разрешите конфликт и добавьте их в индекс перед выполнением коммита.\n"
+
+#: lib/commit.tcl:190
+#, tcl-format
+msgid ""
+"Unknown file state %s detected.\n"
+"\n"
+"File %s cannot be committed by this program.\n"
+msgstr "Обнаружено неизвестное состояние файла %s.\n\nФайл %s не может быть закоммичен этой программой.\n"
+
+#: lib/commit.tcl:198
+msgid ""
+"No changes to commit.\n"
+"\n"
+"You must stage at least 1 file before you can commit.\n"
+msgstr "Отсутствуют изменения для сохранения.\n\nДобавьте в индекс хотя бы один файл перед выполнением коммита.\n"
+
+#: 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 "Укажите сообщение коммита.\n\nРекомендуется следующий формат сообщения:\n\n- в первой строке краткое описание сделанных изменений\n- вторая строка пустая\n- в оставшихся строках опишите, что дают ваши изменения\n"
+
+#: lib/commit.tcl:244
+msgid "Calling pre-commit hook..."
+msgstr "Вызов перехватчика pre-commit…"
+
+#: lib/commit.tcl:259
+msgid "Commit declined by pre-commit hook."
+msgstr "Коммит прерван переватчиком pre-commit."
+
+#: 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 "Вы собираетесь сделать коммит в отделённый HEAD. Это действие потенциально опасно, так как если вы переключитесь на другую ветку после этого, то вы потеряете свои изменения и их сложно будет потом найти с помощью журнала ссылок (reflog). Вам скорее всего следует отменить этот коммит и создать новую ветку до продолжения.\n \n Вы действительно хотите продолжить и создать коммит?"
+
+#: lib/commit.tcl:299
+msgid "Calling commit-msg hook..."
+msgstr "Вызов перехватчика commit-msg…"
+
+#: lib/commit.tcl:314
+msgid "Commit declined by commit-msg hook."
+msgstr "Коммит прерван переватчиком commit-msg"
+
+#: lib/commit.tcl:327
+msgid "Committing changes..."
+msgstr "Коммит изменений…"
+
+#: lib/commit.tcl:344
+msgid "write-tree failed:"
+msgstr "Программа write-tree завершилась с ошибкой:"
+
+#: lib/commit.tcl:345 lib/commit.tcl:395 lib/commit.tcl:422
+msgid "Commit failed."
+msgstr "Не удалось закоммитить изменения."
+
+#: lib/commit.tcl:362
+#, tcl-format
+msgid "Commit %s appears to be corrupt"
+msgstr "Коммит %s похоже поврежден"
+
+#: lib/commit.tcl:367
+msgid ""
+"No changes to commit.\n"
+"\n"
+"No files were modified by this commit and it was not a merge commit.\n"
+"\n"
+"A rescan will be automatically started now.\n"
+msgstr "Нет изменения для коммита.\n\nНи один файл не был изменен и не было слияния.\n\nСейчас автоматически запустится перечитывание репозитория.\n"
+
+#: lib/commit.tcl:374
+msgid "No changes to commit."
+msgstr "Нет изменения для коммита."
+
+#: lib/commit.tcl:394
+msgid "commit-tree failed:"
+msgstr "Программа commit-tree завершилась с ошибкой:"
+
+#: lib/commit.tcl:421
+msgid "update-ref failed:"
+msgstr "Программа update-ref завершилась с ошибкой:"
+
+#: lib/commit.tcl:514
+#, tcl-format
+msgid "Created commit %s: %s"
+msgstr "Создан коммит %s: %s "
+
+#: lib/branch_delete.tcl:16
+#, tcl-format
+msgid "%s (%s): Delete Branch"
+msgstr "%s (%s): Удаление ветки"
+
+#: lib/branch_delete.tcl:21
+msgid "Delete Local Branch"
+msgstr "Удалить локальную ветку"
+
+#: lib/branch_delete.tcl:39
+msgid "Local Branches"
+msgstr "Локальные ветки"
+
+#: lib/branch_delete.tcl:51
+msgid "Delete Only If Merged Into"
+msgstr "Удалить только в случае, если было слияние с"
+
+#: lib/branch_delete.tcl:103
+#, tcl-format
+msgid "The following branches are not completely merged into %s:"
+msgstr "Ветки, которые не полностью сливаются с %s:"
+
+#: 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 "Ошибка добавления программы:\n%s"
+msgstr "Не удалось удалить ветки:\n%s"
-#: lib/tools_dlg.tcl:190
-msgid "Remove Tool"
-msgstr "Удалить программу"
-
-#: lib/tools_dlg.tcl:196
-msgid "Remove Tool Commands"
-msgstr "Удалить команды программы"
-
-#: lib/tools_dlg.tcl:200
-msgid "Remove"
-msgstr "Удалить"
-
-#: lib/tools_dlg.tcl:236
-msgid "(Blue denotes repository-local tools)"
-msgstr "(Синим выделены программы локальные репозиторию)"
-
-#: lib/tools_dlg.tcl:297
+#: lib/date.tcl:25
#, tcl-format
-msgid "Run Command: %s"
-msgstr "Запуск команды: %s"
+msgid "Invalid date from Git: %s"
+msgstr "Неправильная дата в репозитории: %s"
-#: lib/tools_dlg.tcl:311
-msgid "Arguments"
-msgstr "Аргументы"
+#: lib/database.tcl:42
+msgid "Number of loose objects"
+msgstr "Количество несвязанных объектов"
-#: lib/tools_dlg.tcl:348
-msgid "OK"
-msgstr "OK"
+#: lib/database.tcl:43
+msgid "Disk space used by loose objects"
+msgstr "Объем дискового пространства, занятый несвязанными объектами"
-#: lib/transport.tcl:7
+#: lib/database.tcl:44
+msgid "Number of packed objects"
+msgstr "Количество упакованных объектов"
+
+#: lib/database.tcl:45
+msgid "Number of packs"
+msgstr "Количество pack-файлов"
+
+#: lib/database.tcl:46
+msgid "Disk space used by packed objects"
+msgstr "Объем дискового пространства, занятый упакованными объектами"
+
+#: lib/database.tcl:47
+msgid "Packed objects waiting for pruning"
+msgstr "Несвязанные объекты, которые можно удалить"
+
+#: lib/database.tcl:48
+msgid "Garbage files"
+msgstr "Мусор"
+
+#: lib/database.tcl:66
#, tcl-format
-msgid "Fetching new changes from %s"
-msgstr "Извлечение изменений из %s "
+msgid "%s (%s): Database Statistics"
+msgstr "%s (%s): Статистика базы данных"
-#: lib/transport.tcl:18
+#: lib/database.tcl:72
+msgid "Compressing the object database"
+msgstr "Сжатие базы объектов"
+
+#: lib/database.tcl:83
+msgid "Verifying the object database with fsck-objects"
+msgstr "Проверка базы объектов при помощи fsck"
+
+#: lib/database.tcl:107
#, tcl-format
-msgid "remote prune %s"
-msgstr "чистка внешнего %s"
+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 "Этот репозиторий сейчас содержит примерно %i свободных объектов\n\nДля лучшей производительности рекомендуется сжать базу данных.\n\nСжать базу данных сейчас?"
-#: lib/transport.tcl:19
+#: lib/error.tcl:20
#, tcl-format
-msgid "Pruning tracking branches deleted from %s"
-msgstr "Чистка отслеживаемых веток, удалённых из %s"
+msgid "%s: error"
+msgstr "%s: ошибка"
-#: lib/transport.tcl:26
+#: lib/error.tcl:36
#, tcl-format
-msgid "Pushing changes to %s"
-msgstr "Отправка изменений в %s "
+msgid "%s: warning"
+msgstr "%s: предупреждение"
-#: lib/transport.tcl:64
+#: lib/error.tcl:80
#, tcl-format
-msgid "Mirroring to %s"
-msgstr "Точное копирование в %s"
+msgid "%s hook failed:"
+msgstr "ошибка перехватчика %s:"
-#: lib/transport.tcl:82
+#: lib/error.tcl:96
+msgid "You must correct the above errors before committing."
+msgstr "Перед коммитом, исправьте вышеуказанные ошибки."
+
+#: lib/error.tcl:116
#, tcl-format
-msgid "Pushing %s %s to %s"
-msgstr "Отправка %s %s в %s"
+msgid "%s (%s): error"
+msgstr "%s (%s): ошибка"
-#: lib/transport.tcl:100
-msgid "Push Branches"
-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"
+msgstr "Невозможно выполнить слияние во время исправления.\n\nЗавершите исправление данного коммита перед выполнением операции слияния.\n"
-#: lib/transport.tcl:114
-msgid "Source Branches"
-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"
+msgstr "Последнее прочитанное состояние репозитория не соответствует текущему.\n\nС момента последней проверки репозиторий был изменен другой программой Git. Необходимо перечитать репозиторий, прежде чем слияние может быть сделано.\n\nЭто будет сделано сейчас автоматически.\n"
-#: lib/transport.tcl:131
-msgid "Destination Repository"
-msgstr "Репозиторий назначения"
+#: lib/merge.tcl:45
+#, 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"
+msgstr "Предыдущее слияние не завершено из-за конфликта.\n\nДля файла %s возник конфликт слияния.\n\nРазрешите конфликт, добавьте файл в индекс и закоммитьте. Только после этого можно начать следующее слияние.\n"
-#: lib/transport.tcl:169
-msgid "Transfer Options"
-msgstr "Настройки отправки"
+#: lib/merge.tcl:55
+#, tcl-format
+msgid ""
+"You are in the middle of a change.\n"
+"\n"
+"File %s is modified.\n"
+"\n"
+"You should complete the current commit before starting a merge. Doing so will help you abort a failed merge, should the need arise.\n"
+msgstr "Вы находитесь в процессе изменений.\n\nФайл %s изменён.\n\nВы должны завершить текущий коммит перед началом слияния. В случае необходимости, это позволит прервать операцию слияния.\n"
-#: lib/transport.tcl:171
-msgid "Force overwrite existing branch (may discard changes)"
-msgstr "Принудительно перезаписать существующую ветку (возможна потеря изменений)"
+#: lib/merge.tcl:108
+#, tcl-format
+msgid "%s of %s"
+msgstr "%s из %s"
-#: lib/transport.tcl:175
-msgid "Use thin pack (for slow network connections)"
-msgstr "Использовать thin pack (для медленных сетевых подключений)"
+#: lib/merge.tcl:126
+#, tcl-format
+msgid "Merging %s and %s..."
+msgstr "Слияние %s и %s…"
-#: lib/transport.tcl:179
-msgid "Include tags"
-msgstr "Передать метки"
+#: lib/merge.tcl:137
+msgid "Merge completed successfully."
+msgstr "Слияние успешно завершено."
+
+#: lib/merge.tcl:139
+msgid "Merge failed. Conflict resolution is required."
+msgstr "Не удалось завершить слияние. Требуется разрешение конфликта."
+
+#: lib/merge.tcl:156
+#, tcl-format
+msgid "%s (%s): Merge"
+msgstr "%s (%s): Слияние"
+
+#: lib/merge.tcl:164
+#, tcl-format
+msgid "Merge Into %s"
+msgstr "Слияние с %s"
+
+#: lib/merge.tcl:183
+msgid "Revision To Merge"
+msgstr "Версия, с которой провести слияние"
+
+#: lib/merge.tcl:218
+msgid ""
+"Cannot abort while amending.\n"
+"\n"
+"You must finish amending this commit.\n"
+msgstr "Невозможно прервать исправление.\n\nЗавершите текущее исправление коммита.\n"
+
+#: 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 "Прервать операцию слияния?\n\nПрерывание текущего слияния приведет к потере *ВСЕХ* несохраненных изменений.\n\nПродолжить?"
+
+#: 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 "Сбросить изменения?\n\nСброс изменений приведет к потере *ВСЕХ* несохраненных изменений.\n\nПродолжить?"
+
+#: lib/merge.tcl:246
+msgid "Aborting"
+msgstr "Прерываю"
+
+#: lib/merge.tcl:247
+msgid "files reset"
+msgstr "изменения в файлах отменены"
+
+#: lib/merge.tcl:277
+msgid "Abort failed."
+msgstr "Прервать не удалось."
+
+#: lib/merge.tcl:279
+msgid "Abort completed. Ready."
+msgstr "Прервано."
diff --git a/git-legacy-stash.sh b/git-legacy-stash.sh
deleted file mode 100755
index 4d4ebb4..0000000
--- a/git-legacy-stash.sh
+++ /dev/null
@@ -1,798 +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 --ignore-skip-worktree-entries \
- -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 --legacy-stash-p -- "$@" &&
-
- # 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 --no-recurse-submodules
- 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/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 204a5ac..542a6a7 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -43,7 +43,16 @@
shown_any=
( cd "$MERGE_TOOLS_DIR" && ls ) | {
- while read toolname
+ while read scriptname
+ do
+ setup_tool "$scriptname" 2>/dev/null
+ # We need an actual line feed here
+ variants="$variants
+$(list_tool_variants)"
+ done
+ variants="$(echo "$variants" | sort -u)"
+
+ for toolname in $variants
do
if setup_tool "$toolname" 2>/dev/null &&
(eval "$condition" "$toolname")
@@ -131,6 +140,10 @@
merge_cmd () {
( eval $merge_tool_cmd )
}
+
+ list_tool_variants () {
+ echo "$tool"
+ }
}
setup_tool () {
@@ -153,10 +166,18 @@
return 1
}
+ hide_resolved_enabled () {
+ return 0
+ }
+
translate_merge_tool_path () {
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 +199,26 @@
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
@@ -226,6 +254,10 @@
fi
}
+initialize_merge_tool () {
+ # Bring tool-specific functions into scope
+ setup_tool "$1" || return 1
+}
# Entry point for running tools
run_merge_tool () {
@@ -237,9 +269,6 @@
merge_tool_path=$(get_merge_tool_path "$1") || exit
base_present="$2"
- # Bring tool-specific functions into scope
- setup_tool "$1" || return 1
-
if merge_mode
then
run_merge_cmd "$1"
@@ -286,11 +315,14 @@
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/git-mergetool.sh b/git-mergetool.sh
index e3f6d54..f751d9c 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -239,6 +239,13 @@
fi
}
+hide_resolved () {
+ git merge-file --ours -q -p "$LOCAL" "$BASE" "$REMOTE" >"$LCONFL"
+ git merge-file --theirs -q -p "$LOCAL" "$BASE" "$REMOTE" >"$RCONFL"
+ mv -- "$LCONFL" "$LOCAL"
+ mv -- "$RCONFL" "$REMOTE"
+}
+
merge_file () {
MERGED="$1"
@@ -265,6 +272,8 @@
ext=
esac
+ initialize_merge_tool "$merge_tool" || return
+
mergetool_tmpdir_init
if test "$MERGETOOL_TMPDIR" != "."
@@ -276,7 +285,9 @@
BACKUP="$MERGETOOL_TMPDIR/${BASE}_BACKUP_$$$ext"
LOCAL="$MERGETOOL_TMPDIR/${BASE}_LOCAL_$$$ext"
+ LCONFL="$MERGETOOL_TMPDIR/${BASE}_LOCAL_LCONFL_$$$ext"
REMOTE="$MERGETOOL_TMPDIR/${BASE}_REMOTE_$$$ext"
+ RCONFL="$MERGETOOL_TMPDIR/${BASE}_REMOTE_RCONFL_$$$ext"
BASE="$MERGETOOL_TMPDIR/${BASE}_BASE_$$$ext"
base_mode= local_mode= remote_mode=
@@ -322,6 +333,40 @@
checkout_staged_file 2 "$MERGED" "$LOCAL"
checkout_staged_file 3 "$MERGED" "$REMOTE"
+ # hideResolved preferences hierarchy.
+ global_config="mergetool.hideResolved"
+ tool_config="mergetool.${merge_tool}.hideResolved"
+
+ if enabled=$(git config --type=bool "$tool_config")
+ then
+ # The user has a specific preference for a specific tool and no
+ # other preferences should override that.
+ : ;
+ elif enabled=$(git config --type=bool "$global_config")
+ then
+ # The user has a general preference for all tools.
+ #
+ # 'true' means the user likes the feature so we should use it
+ # where possible but tool authors can still override.
+ #
+ # 'false' means the user doesn't like the feature so we should
+ # not use it anywhere.
+ if test "$enabled" = true && hide_resolved_enabled
+ then
+ enabled=true
+ else
+ enabled=false
+ fi
+ else
+ # The user does not have a preference. Default to disabled.
+ enabled=false
+ fi
+
+ if test "$enabled" = true
+ then
+ hide_resolved
+ fi
+
if test -z "$local_mode" || test -z "$remote_mode"
then
echo "Deleted merge conflict for '$MERGED':"
diff --git a/git-p4.py b/git-p4.py
index 9a71a66..09c9e93 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -16,12 +16,12 @@
# 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
@@ -34,37 +34,17 @@
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
@@ -113,7 +93,7 @@
# 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
@@ -186,18 +166,118 @@
"""
choices = set(m.group(1) for m in re.finditer(r"\[(.)\]", prompt_text))
while True:
- response = raw_input(prompt_text).strip().lower()
+ 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)
@@ -209,6 +289,8 @@
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):
@@ -219,15 +301,17 @@
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:
@@ -235,6 +319,8 @@
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):
@@ -245,23 +331,22 @@
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):
@@ -289,6 +374,7 @@
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
@@ -298,7 +384,7 @@
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)
@@ -310,7 +396,7 @@
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)
@@ -548,7 +634,7 @@
# 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]):
@@ -565,12 +651,7 @@
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.
@@ -591,7 +672,11 @@
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),
@@ -643,7 +728,7 @@
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:
@@ -660,11 +745,12 @@
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)
@@ -677,6 +763,20 @@
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
@@ -727,7 +827,8 @@
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:
@@ -742,11 +843,11 @@
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]
@@ -894,6 +995,7 @@
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
@@ -1171,7 +1273,7 @@
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
@@ -1278,7 +1380,7 @@
['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?')
@@ -1414,14 +1516,14 @@
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:
@@ -1536,13 +1638,39 @@
"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.
+ 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."""
+ 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
+ occurred 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 = ""
@@ -1560,6 +1688,7 @@
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.")
@@ -1698,7 +1827,8 @@
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:
@@ -1762,7 +1892,7 @@
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']
@@ -1946,6 +2076,9 @@
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
@@ -1985,6 +2118,7 @@
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:
@@ -2042,58 +2176,76 @@
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)
@@ -2116,20 +2268,23 @@
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
@@ -2353,13 +2508,17 @@
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
@@ -2378,11 +2537,12 @@
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:
# prompt for what to do, or use the option/variable
if self.conflict_behavior == "ask":
@@ -2509,7 +2669,7 @@
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):]
@@ -2518,7 +2678,7 @@
""" 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
@@ -2533,16 +2693,18 @@
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
@@ -2647,6 +2809,7 @@
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)
@@ -2660,7 +2823,7 @@
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
@@ -2669,7 +2832,7 @@
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
@@ -2703,7 +2866,7 @@
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 + "/"):
@@ -2737,14 +2900,15 @@
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]
@@ -2753,7 +2917,7 @@
# 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)
@@ -2769,7 +2933,7 @@
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)
@@ -2791,14 +2955,15 @@
# - 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"])
@@ -2810,13 +2975,13 @@
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]]
@@ -2835,7 +3000,7 @@
# 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'
@@ -2843,7 +3008,7 @@
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":
@@ -2864,9 +3029,9 @@
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 ]
+ contents = [ encode_text_stream(text) ]
if self.largeFileSystem:
(git_mode, contents) = self.largeFileSystem.processContent(git_mode, relPath, contents)
@@ -2874,12 +3039,11 @@
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)
@@ -2979,9 +3143,9 @@
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)
@@ -3051,6 +3215,42 @@
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"]
@@ -3059,11 +3259,14 @@
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
@@ -3635,6 +3838,15 @@
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
@@ -3974,7 +4186,7 @@
# create a master branch and check out a work tree
if gitBranchExists(self.branch):
- system([ "git", "branch", "master", self.branch ])
+ system([ "git", "branch", currentGitBranch(), self.branch ])
if not self.cloneBare:
system([ "git", "checkout", "-f" ])
else:
@@ -4025,7 +4237,7 @@
"""
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
@@ -4160,7 +4372,6 @@
"unshelve" : P4Unshelve,
}
-
def main():
if len(sys.argv[1:]) == 0:
printUsage(commands.keys())
diff --git a/git-parse-remote.sh b/git-parse-remote.sh
deleted file mode 100644
index d3c3998..0000000
--- a/git-parse-remote.sh
+++ /dev/null
@@ -1,101 +0,0 @@
-# This is a shell library to calculate the remote repository and
-# upstream branch that should be pulled by "git pull" from the current
-# branch.
-
-# git-ls-remote could be called from outside a git managed repository;
-# this would fail in that case and would issue an error message.
-GIT_DIR=$(git rev-parse -q --git-dir) || :;
-
-get_default_remote () {
- curr_branch=$(git symbolic-ref -q HEAD)
- curr_branch="${curr_branch#refs/heads/}"
- origin=$(git config --get "branch.$curr_branch.remote")
- echo ${origin:-origin}
-}
-
-get_remote_merge_branch () {
- case "$#" in
- 0|1)
- origin="$1"
- default=$(get_default_remote)
- test -z "$origin" && origin=$default
- curr_branch=$(git symbolic-ref -q HEAD) &&
- [ "$origin" = "$default" ] &&
- echo $(git for-each-ref --format='%(upstream)' $curr_branch)
- ;;
- *)
- repo=$1
- shift
- ref=$1
- # FIXME: It should return the tracking branch
- # Currently only works with the default mapping
- case "$ref" in
- +*)
- ref=$(expr "z$ref" : 'z+\(.*\)')
- ;;
- esac
- expr "z$ref" : 'z.*:' >/dev/null || ref="${ref}:"
- remote=$(expr "z$ref" : 'z\([^:]*\):')
- case "$remote" in
- '' | HEAD ) remote=HEAD ;;
- heads/*) remote=${remote#heads/} ;;
- refs/heads/*) remote=${remote#refs/heads/} ;;
- refs/* | tags/* | remotes/* ) remote=
- esac
- [ -n "$remote" ] && case "$repo" in
- .)
- echo "refs/heads/$remote"
- ;;
- *)
- echo "refs/remotes/$repo/$remote"
- ;;
- esac
- esac
-}
-
-error_on_missing_default_upstream () {
- cmd="$1"
- op_type="$2"
- op_prep="$3" # FIXME: op_prep is no longer used
- example="$4"
- branch_name=$(git symbolic-ref -q HEAD)
- display_branch_name="${branch_name#refs/heads/}"
- # If there's only one remote, use that in the suggestion
- remote="$(gettext "<remote>")"
- branch="$(gettext "<branch>")"
- if test $(git remote | wc -l) = 1
- then
- remote=$(git remote)
- fi
-
- if test -z "$branch_name"
- then
- gettextln "You are not currently on a branch."
- else
- gettextln "There is no tracking information for the current branch."
- fi
- case "$op_type" in
- rebase)
- gettextln "Please specify which branch you want to rebase against."
- ;;
- merge)
- gettextln "Please specify which branch you want to merge with."
- ;;
- *)
- echo >&2 "BUG: unknown operation type: $op_type"
- exit 1
- ;;
- esac
- eval_gettextln "See git-\${cmd}(1) for details."
- echo
- echo " $example"
- echo
- if test -n "$branch_name"
- then
- gettextln "If you wish to set tracking information for this branch you can do so with:"
- echo
- echo " git branch --set-upstream-to=$remote/$branch $display_branch_name"
- echo
- fi
- exit 1
-}
diff --git a/git-rebase--preserve-merges.sh b/git-rebase--preserve-merges.sh
index dec90e9..b9c71d2 100644
--- a/git-rebase--preserve-merges.sh
+++ b/git-rebase--preserve-merges.sh
@@ -193,16 +193,6 @@
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/git-send-email.perl b/git-send-email.perl
index dc95656..1f425c0 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -250,6 +250,7 @@
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 @@
"multiedit" => \$multiedit,
"annotate" => \$annotate,
"xmailer" => \$use_xmailer,
+ "forbidsendmailvariables" => \$forbid_sendmail_variables,
);
my %config_settings = (
@@ -478,6 +480,12 @@
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;
@@ -1699,10 +1707,14 @@
$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/git-sh-i18n.sh b/git-sh-i18n.sh
index 8eef60b..e3d9f48 100644
--- a/git-sh-i18n.sh
+++ b/git-sh-i18n.sh
@@ -17,12 +17,7 @@
# First decide what scheme to use...
GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough
-if test -n "$GIT_TEST_GETTEXT_POISON" &&
- git env--helper --type=bool --default=0 --exit-code \
- GIT_TEST_GETTEXT_POISON
-then
- GIT_INTERNAL_GETTEXT_SH_SCHEME=poison
-elif test -n "@@USE_GETTEXT_SCHEME@@"
+if test -n "@@USE_GETTEXT_SCHEME@@"
then
GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@"
elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
@@ -63,21 +58,6 @@
)
}
;;
-poison)
- # Emit garbage so that tests that incorrectly rely on translatable
- # strings will fail.
- gettext () {
- printf "%s" "# GETTEXT POISON #"
- }
-
- eval_gettext () {
- printf "%s" "# GETTEXT POISON #"
- }
-
- eval_ngettext () {
- printf "%s" "# GETTEXT POISON #"
- }
- ;;
*)
gettext () {
printf "%s" "$1"
diff --git a/git-submodule.sh b/git-submodule.sh
index 89f915c..eb90f18 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -20,7 +20,6 @@
OPTIONS_SPEC=
SUBDIRECTORY_OK=Yes
. git-sh-setup
-. git-parse-remote
require_work_tree
wt_prefix=$(git rev-parse --show-prefix)
cd_to_toplevel
@@ -48,6 +47,8 @@
progress=
dissociate=
single_branch=
+jobs=
+recommend_shallow=
die_if_unmatched ()
{
@@ -57,31 +58,6 @@
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"
@@ -436,16 +412,18 @@
test -z "$rev"
)
+# usage: fetch_in_submodule <module_path> [<depth>] [<sha1>]
+# Because arguments are positional, use an empty string to omit <depth>
+# but include <sha1>.
fetch_in_submodule () (
sanitize_submodule_env &&
cd "$1" &&
- case "$2" in
- '')
- git fetch ;;
- *)
- shift
- git fetch $(get_default_remote) "$@" ;;
- esac
+ if test $# -eq 3
+ then
+ echo "$3" | git fetch --stdin ${2:+"$2"}
+ else
+ git fetch ${2:+"$2"}
+ fi
)
#
@@ -463,7 +441,7 @@
GIT_QUIET=1
;;
-v)
- GIT_QUIET=0
+ unset GIT_QUIET
;;
--progress)
progress=1
@@ -599,7 +577,7 @@
fetch_in_submodule "$sm_path" $depth ||
die "$(eval_gettext "Unable to fetch in submodule path '\$sm_path'")"
fi
- remote_name=$(sanitize_submodule_env; cd "$sm_path" && get_default_remote)
+ remote_name=$(sanitize_submodule_env; cd "$sm_path" && git submodule--helper print-default-remote)
sha1=$(sanitize_submodule_env; cd "$sm_path" &&
git rev-parse --verify "${remote_name}/${branch}") ||
die "$(eval_gettext "Unable to find current \${remote_name}/\${branch} revision in submodule path '\$sm_path'")"
@@ -625,7 +603,7 @@
# Now we tried the usual fetch, but $sha1 may
# not be reachable from any of the refs
is_tip_reachable "$sm_path" "$sha1" ||
- fetch_in_submodule "$sm_path" $depth "$sha1" ||
+ fetch_in_submodule "$sm_path" "$depth" "$sha1" ||
die "$(eval_gettext "Fetched in submodule path '\$displaypath', but it did not contain \$sha1. Direct fetching of that commit failed.")"
fi
@@ -637,13 +615,13 @@
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
@@ -717,7 +695,7 @@
# $@ = requested path
#
cmd_set_branch() {
- unset_branch=false
+ default=
branch=
while test $# -ne 0
@@ -727,7 +705,7 @@
# 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
@@ -748,33 +726,7 @@
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=$?
-
- if test $((!$has_branch != !$has_unset_branch)) -eq 0
- then
- usage
- fi
-
- 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-branch ${GIT_QUIET:+--quiet} ${branch:+--branch "$branch"} ${default:+--default} -- "$@"
}
#
@@ -803,27 +755,7 @@
shift
done
- if test $# -ne 2
- then
- usage
- fi
-
- # we can't use `git submodule--helper name` here because internally, it
- # hashes the path so a trailing slash could lead to an unintentional no match
- name="$(git submodule--helper list "$1" | cut -f2)"
- if test -z "$name"
- then
- exit 1
- fi
-
- url="$2"
- if test -z "$url"
- then
- exit 1
- fi
-
- git submodule--helper config submodule."$name".url "$url"
- git submodule--helper sync ${GIT_QUIET:+--quiet} "$name"
+ git ${wt_prefix:+-C "$wt_prefix"} ${prefix:+--super-prefix "$prefix"} submodule--helper set-url ${GIT_QUIET:+--quiet} -- "$@"
}
#
@@ -875,166 +807,7 @@
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:
diff --git a/git-svn.perl b/git-svn.perl
index 4aa208f..70cb5e2 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -2,10 +2,11 @@
# Copyright (C) 2006, Eric Wong <normalperson@yhbt.net>
# License: GPL v2 or later
use 5.008;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
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,8 +104,9 @@
}
}
-$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,
@@ -498,6 +500,7 @@
command_noisy('config', "$pfx.preserve-empty-dirs", 'true');
command_noisy('config', "$pfx.placeholder-filename", $$fname);
}
+ load_object_format();
}
sub init_subdir {
@@ -582,7 +585,7 @@
print "Reading from stdin...\n";
@commits = ();
while (<STDIN>) {
- if (/\b($sha1_short)\b/o) {
+ if (/\b($oid_short)\b/o) {
unshift @commits, $1;
}
}
@@ -1831,7 +1834,7 @@
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;
@@ -1975,9 +1978,15 @@
}
}
}
+ 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+)
@@ -2006,10 +2015,10 @@
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;
@@ -2036,7 +2045,7 @@
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/git.c b/git.c
index 7be7ad3..9bc077a 100644
--- a/git.c
+++ b/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)
@@ -28,6 +29,7 @@
" [--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"
+ " [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
" <command> [<args>]");
const char git_more_info_string[] =
@@ -253,6 +255,8 @@
git_config_push_parameter((*argv)[1]);
(*argv)++;
(*argc)--;
+ } else if (skip_prefix(cmd, "--config-env=", &cmd)) {
+ git_config_push_env(cmd);
} else if (!strcmp(cmd, "--literal-pathspecs")) {
setenv(GIT_LITERAL_PATHSPECS_ENVIRONMENT, "1", 1);
if (envchanged)
@@ -345,12 +349,15 @@
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);
@@ -388,6 +395,7 @@
trace2_cmd_alias(alias_command, new_argv);
trace2_cmd_list_config();
+ trace2_cmd_list_env_vars();
*argv = new_argv;
*argcp += count - 1;
@@ -415,7 +423,7 @@
int nongit_ok;
prefix = setup_git_directory_gently(&nongit_ok);
}
-
+ prefix = precompose_argv_prefix(argc, argv, prefix);
if (use_pager == -1 && p->option & (RUN_SETUP | RUN_SETUP_GENTLY) &&
!(p->option & DELAY_PAGER_CONFIG))
use_pager = check_pager_config(p->cmd);
@@ -439,6 +447,7 @@
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);
@@ -473,6 +482,7 @@
{ "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 },
@@ -493,6 +503,9 @@
{ "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 },
@@ -501,10 +514,12 @@
{ "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 },
{ "for-each-ref", cmd_for_each_ref, RUN_SETUP },
+ { "for-each-repo", cmd_for_each_repo, RUN_SETUP_GENTLY },
{ "format-patch", cmd_format_patch, RUN_SETUP },
{ "fsck", cmd_fsck, RUN_SETUP },
{ "fsck-objects", cmd_fsck, RUN_SETUP },
@@ -523,6 +538,7 @@
{ "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 | 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 },
@@ -570,16 +586,11 @@
{ "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 +642,25 @@
}
}
+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 +675,7 @@
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 +690,19 @@
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 +717,8 @@
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 +730,7 @@
* 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 +770,7 @@
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 +787,18 @@
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/gitk-git/gitk b/gitk-git/gitk
index abe4805..23d9dd1 100755
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -11,14 +11,14 @@
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 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 @@
# 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 @@
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 @@
fileevent $fd readable {}
if {$runq eq {} && ![info exists currunq]} {
- after idle dorunq
+ after idle dorunq
}
lappend runq [list $fd $script]
}
@@ -78,11 +77,11 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
global commfd
foreach inst [array names commfd] {
- stop_instance $inst
+ stop_instance $inst
}
}
@@ -470,7 +469,7 @@
global viewinstances
foreach inst $viewinstances($view) {
- stop_instance $inst
+ stop_instance $inst
}
set viewinstances($view) {}
}
@@ -479,11 +478,11 @@
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 @@
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 @@
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 @@
reset_pending_select {}
nowbusy $view [mc "Reading"]
if {$showneartags} {
- getallcommits
+ getallcommits
}
}
@@ -592,11 +591,11 @@
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 @@
readrefs
changedrefs
if {$showneartags} {
- getallcommits
+ getallcommits
}
clear_display
unset -nocomplain commitinfo
@@ -622,11 +621,11 @@
# 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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
+ 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
+ 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
- }
- }
- }
+ 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 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 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 scripts [check_interest $id $scripts]
+ set gotsome 1
}
if {$gotsome} {
- global numcommits hlview
+ 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
- }
+ 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 @@
layoutmore
if {$viewcomplete($curview)} {
- global commitidx varctok
- global numcommits startmsecs
+ global commitidx varctok
+ global numcommits startmsecs
- if {[info exists pending_select]} {
- update
- reset_pending_select {}
+ 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
+ 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 @@
# 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 @@
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 @@
# 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 @@
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 @@
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 @@
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 @@
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 @@
# 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 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 @@
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 @@
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 @@
# 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 @@
${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 @@
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 @@
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 @@
${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 @@
${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 @@
${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 @@
${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 @@
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 @@
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 @@
# 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 @@
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 @@
$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 @@
$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 @@
# 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 @@
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 @@
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 @@
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 @@
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 @@
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 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 @@
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 click {w} {
global ctext entries
foreach e [concat $entries $ctext] {
- if {$w == $e} return
+ if {$w == $e} return
}
focus .
}
@@ -2779,8 +2790,8 @@
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 @@
$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 @@
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 @@
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 @@
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 @@
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]
- }
- }
+ 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]"
+ 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
+ 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 @@
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 @@
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 @@
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 @@
[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 @@
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 @@
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 @@
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 @@
$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 @@
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 @@
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 @@
$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 @@
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
+ }
}
}
@@ -3415,11 +3433,11 @@
$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 {}
@@ -3429,9 +3447,9 @@
global highlight_paths
foreach p $highlight_paths {
- if {[string match $p $f]} {
- return "bold"
- }
+ if {[string match $p $f]} {
+ return "bold"
+ }
}
return {}
}
@@ -3441,15 +3459,15 @@
$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
}
@@ -3467,8 +3485,8 @@
$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
}
@@ -3483,9 +3501,9 @@
$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
}
@@ -3498,15 +3516,15 @@
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
@@ -3535,7 +3553,7 @@
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]
@@ -3550,9 +3568,9 @@
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:"]
}
@@ -3561,29 +3579,29 @@
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
}
@@ -3592,11 +3610,11 @@
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
}
@@ -3607,10 +3625,10 @@
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]"]
@@ -3618,7 +3636,7 @@
}
set difffile [file join $diffdir "\[$diffid\] [file tail $filename]"]
return [save_file_from_commit $diffid:$filename $difffile \
- "revision $diffid"]
+ "revision $diffid"]
}
proc external_diff {} {
@@ -3675,18 +3693,18 @@
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
@@ -3697,38 +3715,38 @@
# 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]
@@ -3741,17 +3759,17 @@
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
@@ -3762,12 +3780,12 @@
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 {}
@@ -3776,7 +3794,7 @@
# 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]]
@@ -3784,12 +3802,12 @@
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]
@@ -3801,19 +3819,19 @@
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
@@ -3821,7 +3839,7 @@
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"
}
}
@@ -3832,61 +3850,61 @@
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
@@ -3900,9 +3918,9 @@
global blameinst
if {[info exists blameinst]} {
- stop_instance $blameinst
- unset blameinst
- notbusy blaming
+ stop_instance $blameinst
+ unset blameinst
+ notbusy blaming
}
}
@@ -3910,18 +3928,18 @@
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 {}
@@ -3929,30 +3947,30 @@
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
}
@@ -3961,11 +3979,11 @@
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
}
@@ -3974,13 +3992,13 @@
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]\""
}
@@ -3988,10 +4006,10 @@
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
}
@@ -4000,52 +4018,52 @@
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]
}
@@ -4053,13 +4071,13 @@
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
}
@@ -4068,11 +4086,11 @@
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"
}
@@ -4086,8 +4104,8 @@
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"
@@ -4136,29 +4154,29 @@
set rargs [list]
foreach opt $known_view_options {
- set patterns [lindex $opt 3]
- if {$patterns eq {}} continue
- set pattern [lindex $patterns 0]
+ 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
- }
- }
+ 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)]]
@@ -4169,59 +4187,59 @@
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]
@@ -4231,9 +4249,9 @@
global curview
if {$curview > 0} {
- editview
+ editview
} else {
- newview 0
+ newview 0
}
}
@@ -4244,8 +4262,8 @@
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)
@@ -4275,66 +4293,66 @@
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
+ 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 "*"}]
+ 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
- }
+ 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"} {
+ 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
@@ -4355,10 +4373,10 @@
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
+ }
}
}
@@ -4375,53 +4393,53 @@
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}
@@ -4432,8 +4450,8 @@
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
@@ -4445,7 +4463,7 @@
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
}
@@ -4470,22 +4488,22 @@
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
@@ -4498,8 +4516,8 @@
run refill_reflist
if {![info exists viewcomplete($n)]} {
- getcommits $selid
- return
+ getcommits $selid
+ return
}
set displayorder {}
@@ -4519,39 +4537,39 @@
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
}
@@ -4562,16 +4580,16 @@
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
}
@@ -4584,14 +4602,14 @@
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
}
}
@@ -4602,11 +4620,11 @@
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
}
}
@@ -4615,11 +4633,11 @@
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
}
@@ -4628,15 +4646,15 @@
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
}
}
@@ -4657,16 +4675,16 @@
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
@@ -4676,12 +4694,12 @@
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
}
}
@@ -4690,18 +4708,18 @@
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
}
}
@@ -4710,21 +4728,21 @@
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
}
@@ -4734,12 +4752,12 @@
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
}
@@ -4751,33 +4769,33 @@
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
}
@@ -4787,26 +4805,26 @@
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+]
@@ -4821,9 +4839,9 @@
global filehighlight fhl_list
if {[info exists filehighlight]} {
- lappend fhl_list {}
- puts $filehighlight ""
- flush $filehighlight
+ lappend fhl_list {}
+ puts $filehighlight ""
+ flush $filehighlight
}
}
@@ -4840,34 +4858,34 @@
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
}
@@ -4876,11 +4894,11 @@
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]
}
}
@@ -4890,32 +4908,32 @@
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
}
@@ -4928,18 +4946,18 @@
$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
+ }
}
}
@@ -4948,7 +4966,7 @@
rhighlight_none
if {$highlight_related ne [mc "None"]} {
- run drawvisible
+ run drawvisible
}
}
@@ -4962,8 +4980,8 @@
unset -nocomplain ancestor
set anc_todo [list $a]
if {$highlight_related ne [mc "None"]} {
- rhighlight_none
- run drawvisible
+ rhighlight_none
+ run drawvisible
}
}
@@ -4983,24 +5001,24 @@
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
@@ -5015,24 +5033,24 @@
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
@@ -5045,26 +5063,26 @@
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
}
@@ -5074,13 +5092,13 @@
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
}
@@ -5089,10 +5107,10 @@
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
}
@@ -5102,41 +5120,41 @@
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
@@ -5147,19 +5165,19 @@
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
}
@@ -5204,12 +5222,12 @@
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]
}
@@ -5220,13 +5238,13 @@
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
}
@@ -5238,13 +5256,13 @@
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) {}
}
}
@@ -5254,21 +5272,21 @@
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
}
@@ -5278,9 +5296,9 @@
if {$viewmainheadid($curview) eq {}} return
if {[commitinview $viewmainheadid($curview) $curview]} {
- dodiffindex
+ dodiffindex
} else {
- interestedin $viewmainheadid($curview) dodiffindex
+ interestedin $viewmainheadid($curview) dodiffindex
}
}
@@ -5288,10 +5306,10 @@
global nullid nullid2 lserial curview
if {[commitinview $nullid $curview]} {
- removefakerow $nullid
+ removefakerow $nullid
}
if {[commitinview $nullid2 $curview]} {
- removefakerow $nullid2
+ removefakerow $nullid2
}
incr lserial
}
@@ -5304,12 +5322,12 @@
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
@@ -5323,22 +5341,22 @@
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
@@ -5346,19 +5364,19 @@
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
}
@@ -5369,31 +5387,31 @@
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
}
@@ -5402,17 +5420,17 @@
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
}
@@ -5422,12 +5440,12 @@
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
}
@@ -5438,70 +5456,70 @@
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}]
}
@@ -5510,20 +5528,20 @@
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
+ }
}
}
@@ -5536,100 +5554,100 @@
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
}
@@ -5639,17 +5657,17 @@
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
}
}
@@ -5662,7 +5680,7 @@
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
@@ -5672,123 +5690,123 @@
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
+ }
+ }
}
}
@@ -5807,7 +5825,7 @@
set wid $lthickness
if {[info exists thickerline] && $id eq $thickerline} {
- set wid [expr {2 * $lthickness}]
+ set wid [expr {2 * $lthickness}]
}
return $wid
}
@@ -5818,52 +5836,52 @@
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
}
@@ -5876,158 +5894,158 @@
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
@@ -6052,54 +6070,54 @@
# 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
}
}
@@ -6122,35 +6140,35 @@
# 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
@@ -6158,23 +6176,23 @@
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]
@@ -6184,30 +6202,30 @@
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
}
}
@@ -6223,33 +6241,33 @@
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
}
}
@@ -6258,78 +6276,78 @@
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 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 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]
+ }
+ }
}
}
@@ -6339,15 +6357,15 @@
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
}
}
@@ -6364,44 +6382,44 @@
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
}
@@ -6433,31 +6451,31 @@
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]
}
@@ -6469,58 +6487,58 @@
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
}
@@ -6538,9 +6556,9 @@
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]
}
@@ -6548,7 +6566,7 @@
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
}
@@ -6572,29 +6590,29 @@
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}]
@@ -6603,66 +6621,66 @@
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
}
@@ -6672,8 +6690,8 @@
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
}
@@ -6683,9 +6701,9 @@
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
}
@@ -6696,7 +6714,7 @@
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,
@@ -6705,7 +6723,7 @@
global ctext curtextcursor
if {[$ctext cget -cursor] == $curtextcursor} {
- $ctext config -cursor $c
+ $ctext config -cursor $c
}
set curtextcursor $c
}
@@ -6714,13 +6732,13 @@
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
}
}
@@ -6728,35 +6746,35 @@
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
}
@@ -6766,21 +6784,21 @@
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
@@ -6791,11 +6809,11 @@
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
}
@@ -6807,41 +6825,41 @@
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
@@ -6851,81 +6869,81 @@
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
@@ -6939,15 +6957,15 @@
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
}
@@ -6961,18 +6979,18 @@
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
+ }
}
}
@@ -6993,12 +7011,12 @@
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
@@ -7007,11 +7025,11 @@
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"
}
@@ -7026,26 +7044,26 @@
$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]
+ {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
+ 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
}
}
@@ -7059,23 +7077,23 @@
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}
}
}
@@ -7107,7 +7125,7 @@
if {![info exists pendinglinks($id)]} return
foreach lk $pendinglinks($id) {
- setlink $id $lk
+ setlink $id $lk
}
unset pendinglinks($id)
}
@@ -7116,12 +7134,12 @@
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
+ }
}
}
@@ -7131,7 +7149,7 @@
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"
+ error_popup "[mc "Error starting web browser:"] $err"
}
}
@@ -7144,9 +7162,9 @@
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}]
}
@@ -7157,15 +7175,15 @@
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 {}
@@ -7173,44 +7191,44 @@
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
@@ -7224,11 +7242,11 @@
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
}
}
@@ -7237,33 +7255,33 @@
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
}
}
@@ -7273,15 +7291,15 @@
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
}
@@ -7291,7 +7309,7 @@
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
}
@@ -7318,7 +7336,7 @@
set selectedline $l
set currentid $id
if {$lastscrollrows < $numcommits} {
- setcanvscroll
+ setcanvscroll
}
if {$cmitmode ne "patch" && $switch_to_patch} {
@@ -7335,42 +7353,42 @@
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
@@ -7378,7 +7396,7 @@
clear_ctext
set linknum 0
if {![info exists commitinfo($id)]} {
- getcommit $id
+ getcommit $id
}
set info $commitinfo($id)
set date [formatdate [lindex $info 2]]
@@ -7386,59 +7404,59 @@
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}
@@ -7449,13 +7467,13 @@
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
}
}
@@ -7485,14 +7503,14 @@
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]
}
@@ -7513,7 +7531,7 @@
global selectedline
if {$selectedline ne {}} {
- selectline $selectedline 0
+ selectline $selectedline 0
}
}
@@ -7524,20 +7542,20 @@
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
}
@@ -7550,7 +7568,7 @@
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]
}
}
@@ -7558,11 +7576,11 @@
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
}
}
@@ -7573,12 +7591,12 @@
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
@@ -7589,13 +7607,13 @@
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
}
}
@@ -7604,14 +7622,14 @@
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
}
}
@@ -7619,7 +7637,7 @@
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]]
}
}
@@ -7630,25 +7648,25 @@
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
}
}
@@ -7657,36 +7675,36 @@
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
}
@@ -7698,20 +7716,20 @@
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]
@@ -7730,28 +7748,28 @@
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
+ 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
+ # 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}]
@@ -7786,13 +7804,13 @@
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
}
}
@@ -7809,13 +7827,13 @@
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
@@ -7823,7 +7841,7 @@
$ctext conf -state normal
foreach line $difflines {
- parseblobdiffline $ids $line
+ parseblobdiffline $ids $line
}
maybe_scroll_ctext 1
$ctext conf -state disabled
@@ -7834,11 +7852,11 @@
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
}
@@ -7856,42 +7874,42 @@
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
}
@@ -7901,7 +7919,7 @@
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
@@ -7919,44 +7937,44 @@
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
}
@@ -7970,10 +7988,10 @@
global diffcontextstring diffcontext
if {[string is integer -strict $diffcontextstring]} {
- if {$diffcontextstring >= 0} {
- set diffcontext $diffcontextstring
- reselectline
- }
+ if {$diffcontextstring >= 0} {
+ set diffcontext $diffcontextstring
+ reselectline
+ }
}
}
@@ -8007,25 +8025,25 @@
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
@@ -8037,7 +8055,7 @@
global ctext cmitmode
if {$cmitmode eq "tree"} {
- return {}
+ return {}
}
return [list target_scrollpos [$ctext index @0,0]]
}
@@ -8053,9 +8071,9 @@
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
@@ -8065,12 +8083,12 @@
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
}
}
@@ -8082,7 +8100,7 @@
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}]
@@ -8090,7 +8108,7 @@
$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
}
@@ -8098,7 +8116,7 @@
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
}
@@ -8110,22 +8128,22 @@
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}]
}
@@ -8139,199 +8157,199 @@
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 {![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 ""
- 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]
- }
+ $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
- } 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 {$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
- }
+ # 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 $currdiffsubmod ""
- set line [encoding convertfrom $diffencoding $line]
- $ctext insert end "$line\n" dresult
+ set line [encoding convertfrom $diffencoding $line]
+ $ctext insert end "$line\n" dresult
} elseif {$currdiffsubmod != "" && ![string compare -length 3 " <" $line]} {
- set $currdiffsubmod ""
- set line [encoding convertfrom $diffencoding $line]
- $ctext insert end "$line\n" d0
+ 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
+ }
}
}
@@ -8361,9 +8379,9 @@
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}]
}
}
@@ -8374,11 +8392,11 @@
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
}
@@ -8389,10 +8407,10 @@
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
+ }
}
}
@@ -8403,14 +8421,14 @@
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 {}
@@ -8420,16 +8438,16 @@
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 {}
}
}
@@ -8437,26 +8455,26 @@
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
}
@@ -8468,25 +8486,25 @@
$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
}
}
@@ -8497,25 +8515,25 @@
$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
}
}
@@ -8526,7 +8544,7 @@
$ctext tag remove currentsearchhit 1.0 end
if {$searchstring ne {}} {
- searchmarkvisible 1
+ searchmarkvisible 1
}
}
@@ -8537,14 +8555,14 @@
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
+ }
}
}
@@ -8554,19 +8572,19 @@
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
+ }
}
}
@@ -8582,15 +8600,15 @@
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
}
}
@@ -8619,8 +8637,8 @@
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]
}
}
@@ -8630,20 +8648,20 @@
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}
+ }
}
}
@@ -8651,8 +8669,8 @@
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} {
@@ -8660,10 +8678,10 @@
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
}
@@ -8676,7 +8694,7 @@
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
@@ -8685,7 +8703,7 @@
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
@@ -8699,23 +8717,23 @@
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:"] "
}
}
@@ -8723,37 +8741,37 @@
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
}
@@ -8767,7 +8785,7 @@
set hovery $y
set hoverid $id
if {[info exists hovertimer]} {
- after cancel $hovertimer
+ after cancel $hovertimer
}
set hovertimer [after 500 linehover]
$canv delete hover
@@ -8777,12 +8795,12 @@
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]
}
}
@@ -8790,12 +8808,12 @@
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
}
}
@@ -8817,11 +8835,11 @@
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
}
@@ -8832,10 +8850,10 @@
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 {}
}
@@ -8853,7 +8871,7 @@
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
}
@@ -8870,19 +8888,19 @@
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
@@ -8898,20 +8916,20 @@
$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
@@ -8921,23 +8939,23 @@
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}]]
}
@@ -8949,27 +8967,27 @@
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
@@ -8990,7 +9008,7 @@
global markedid
if {[info exists markedid]} {
- selbyid $markedid
+ selbyid $markedid
}
}
@@ -9000,7 +9018,7 @@
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]
}
@@ -9010,23 +9028,23 @@
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"
@@ -9045,15 +9063,15 @@
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)
}
@@ -9065,75 +9083,75 @@
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
}
@@ -9145,17 +9163,17 @@
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
@@ -9169,11 +9187,11 @@
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
@@ -9184,11 +9202,11 @@
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
@@ -9277,11 +9295,11 @@
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
}
}
@@ -9296,7 +9314,7 @@
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
@@ -9355,22 +9373,22 @@
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
@@ -9391,9 +9409,9 @@
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
@@ -9403,14 +9421,14 @@
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
}
}
@@ -9426,7 +9444,7 @@
mktagcan
}
-proc copysummary {} {
+proc copyreference {} {
global rowmenuid autosellen
set format "%h (\"%s\", %ad)"
@@ -9434,10 +9452,10 @@
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 {} {
@@ -9485,7 +9503,7 @@
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
@@ -9572,41 +9590,41 @@
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
}
}
@@ -9617,36 +9635,36 @@
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
}
}
@@ -9656,18 +9674,18 @@
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 &
@@ -9684,57 +9702,57 @@
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
}
@@ -9809,18 +9827,18 @@
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"
@@ -9832,13 +9850,13 @@
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
}
}
@@ -9846,29 +9864,29 @@
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
}
@@ -9882,17 +9900,17 @@
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
}
@@ -9905,32 +9923,32 @@
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]
}
}
@@ -9939,24 +9957,24 @@
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
@@ -9965,7 +9983,7 @@
redrawtags $newheadid
selbyid $newheadid
if {$showlocalchanges} {
- dodiffindex
+ dodiffindex
}
}
@@ -9977,21 +9995,21 @@
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
@@ -10009,22 +10027,22 @@
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
@@ -10058,10 +10076,10 @@
set ref [lindex $reflist [expr {$l-1}]]
set n [lindex $ref 0]
switch -- [lindex $ref 1] {
- "H" {selbyid $headids($n)}
- "R" {selbyid $headids($n)}
- "T" {selbyid $tagids($n)}
- "o" {selbyid $otherrefids($n)}
+ "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"
}
@@ -10087,35 +10105,35 @@
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]} {
- if {[string match "remotes/*" $n]} {
- lappend refs [list $n R]
- } else {
- 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
@@ -10127,37 +10145,37 @@
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
@@ -10172,54 +10190,54 @@
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
}
}
@@ -10245,103 +10263,103 @@
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 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 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
@@ -10353,12 +10371,12 @@
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
@@ -10370,22 +10388,22 @@
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]
@@ -10394,26 +10412,26 @@
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) {}
}
}
@@ -10437,7 +10455,7 @@
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]
@@ -10454,78 +10472,78 @@
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
}
@@ -10534,16 +10552,16 @@
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
}
@@ -10553,9 +10571,9 @@
#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
@@ -10571,27 +10589,27 @@
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
}
@@ -10603,9 +10621,9 @@
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
}
}
@@ -10615,92 +10633,92 @@
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
@@ -10723,90 +10741,90 @@
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
}
@@ -10817,11 +10835,11 @@
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
}
@@ -10832,11 +10850,11 @@
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
}
@@ -10848,33 +10866,33 @@
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
@@ -10882,111 +10900,111 @@
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
}
@@ -10996,33 +11014,33 @@
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
@@ -11031,114 +11049,114 @@
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
}
@@ -11150,49 +11168,49 @@
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
@@ -11204,7 +11222,7 @@
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
@@ -11215,7 +11233,7 @@
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
}
@@ -11231,7 +11249,7 @@
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
}
@@ -11241,13 +11259,13 @@
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
@@ -11259,26 +11277,26 @@
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
}
@@ -11288,15 +11306,15 @@
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]
}
@@ -11305,15 +11323,15 @@
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 {}
}
@@ -11322,7 +11340,7 @@
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
@@ -11338,7 +11356,7 @@
global idtags ctext linknum
if {$isnew} {
- addtohistory [list showtags $id 0] savectextpos
+ addtohistory [list showtags $id 0] savectextpos
}
$ctext conf -state normal
clear_ctext
@@ -11346,9 +11364,9 @@
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
@@ -11364,7 +11382,7 @@
destroy .
if {[info exists gitktmpdir]} {
- catch {file delete -force $gitktmpdir}
+ catch {file delete -force $gitktmpdir}
}
}
@@ -11373,9 +11391,9 @@
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
}
@@ -11392,58 +11410,58 @@
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
}
}
@@ -11457,10 +11475,10 @@
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)
@@ -11472,10 +11490,10 @@
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
}
}
@@ -11483,21 +11501,21 @@
# 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
}
}
@@ -11506,7 +11524,7 @@
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]
}
}
@@ -11521,9 +11539,9 @@
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
}
}
@@ -11545,14 +11563,14 @@
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"]
@@ -11561,16 +11579,16 @@
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
@@ -11591,11 +11609,11 @@
${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
@@ -11603,6 +11621,7 @@
proc prefspage_colors {notebook} {
global NS uicolor bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
+ global diffbgcolors
set page [create_prefs_page $notebook.colors]
@@ -11614,37 +11633,49 @@
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
}
@@ -11670,21 +11701,21 @@
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"]
@@ -11692,21 +11723,21 @@
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
@@ -11731,7 +11762,7 @@
set prog [tk_getOpenFile -title [mc "External diff tool"] -multiple false]
if {$prog ne {}} {
- set extdifftool $prog
+ set extdifftool $prog
}
}
@@ -11739,7 +11770,7 @@
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
@@ -11749,12 +11780,12 @@
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
}
@@ -11768,7 +11799,7 @@
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
}
@@ -11777,9 +11808,9 @@
global bglist
foreach w $bglist {
- if {[winfo exists $w]} {
- $w conf -background $c
- }
+ if {[winfo exists $w]} {
+ $w conf -background $c
+ }
}
}
@@ -11787,9 +11818,9 @@
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
@@ -11800,9 +11831,9 @@
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
@@ -11821,76 +11852,76 @@
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
}
@@ -12136,38 +12167,38 @@
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
@@ -12176,16 +12207,16 @@
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
}
@@ -12194,28 +12225,28 @@
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
+ }
+ }
+ }
}
}
@@ -12223,10 +12254,10 @@
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
}
@@ -12253,7 +12284,7 @@
# 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
}
@@ -12293,12 +12324,12 @@
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"
+ }
}
}
@@ -12368,12 +12399,13 @@
set fgcolor black
set selectbgcolor gray85
if {[tk windowingsystem] eq "aqua"} {
- set web_browser "open"
+ set web_browser "open"
} else {
- set web_browser "xdg-open"
+ 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
@@ -12413,22 +12445,22 @@
# 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
}
@@ -12444,7 +12476,7 @@
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 {
@@ -12482,20 +12514,20 @@
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
}
@@ -12507,29 +12539,29 @@
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
}
}
@@ -12599,7 +12631,7 @@
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 {
@@ -12650,15 +12682,15 @@
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/gitweb/Makefile b/gitweb/Makefile
index cd194d0..f13e23c 100644
--- a/gitweb/Makefile
+++ b/gitweb/Makefile
@@ -48,7 +48,9 @@
../GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
$(QUIET_SUBDIR0)../ $(QUIET_SUBDIR1) GIT-VERSION-FILE
+ifneq ($(MAKECMDGOALS),clean)
-include ../GIT-VERSION-FILE
+endif
### Build rules
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 65a3a9e..0959a78 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -1291,9 +1291,23 @@
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
@@ -4627,7 +4641,7 @@
# 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;
@@ -7079,6 +7093,7 @@
($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
@@ -7417,6 +7432,7 @@
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
diff --git a/gpg-interface.c b/gpg-interface.c
index 165274d..127aecf 100644
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -1,4 +1,5 @@
#include "cache.h"
+#include "commit.h"
#include "config.h"
#include "run-command.h"
#include "strbuf.h"
@@ -256,6 +257,55 @@
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)
{
@@ -296,7 +346,7 @@
fputs(output, stderr);
}
-size_t parse_signature(const char *buf, size_t size)
+size_t parse_signed_buffer(const char *buf, size_t size)
{
size_t len = 0;
size_t match = size;
@@ -312,6 +362,18 @@
return match;
}
+int parse_signature(const char *buf, size_t size, struct strbuf *payload, struct strbuf *signature)
+{
+ size_t match = parse_signed_buffer(buf, size);
+ if (match != size) {
+ strbuf_add(payload, buf, match);
+ remove_signature(payload);
+ strbuf_add(signature, buf + match, size - match);
+ return 1;
+ }
+ return 0;
+}
+
void set_signing_key(const char *key)
{
free(configured_signing_key);
@@ -385,11 +447,11 @@
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;
@@ -418,51 +480,3 @@
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/gpg-interface.h b/gpg-interface.h
index 796571e..80567e4 100644
--- a/gpg-interface.h
+++ b/gpg-interface.h
@@ -38,12 +38,19 @@
void signature_check_clear(struct signature_check *sigc);
/*
+ * Look at a GPG signed tag object. If such a signature exists, store it in
+ * signature and the signed content in payload. Return 1 if a signature was
+ * found, and 0 otherwise.
+ */
+int parse_signature(const char *buf, size_t size, struct strbuf *payload, struct strbuf *signature);
+
+/*
* Look at GPG signed content (e.g. a signed tag object), whose
* payload is followed by a detached signature on it. Return the
* offset where the embedded detached signature begins, or the end of
* the data when there is no such signature.
*/
-size_t parse_signature(const char *buf, size_t size);
+size_t parse_signed_buffer(const char *buf, size_t size);
/*
* Create a detached signature for the contents of "buffer" and append
@@ -54,15 +61,6 @@
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/graph.c b/graph.c
index 4fb25ad..c128ad0 100644
--- a/graph.c
+++ b/graph.c
@@ -4,7 +4,7 @@
#include "color.h"
#include "graph.h"
#include "revision.h"
-#include "argv-array.h"
+#include "strvec.h"
/* Internal API */
@@ -82,7 +82,7 @@
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;
@@ -93,13 +93,13 @@
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)
@@ -350,13 +350,13 @@
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);
}
}
@@ -1055,7 +1055,7 @@
graph_update_state(graph, GRAPH_COLLAPSING);
}
-const char merge_chars[] = {'/', '|', '\\'};
+static const char merge_chars[] = {'/', '|', '\\'};
static void graph_output_post_merge_line(struct git_graph *graph, struct graph_line *line)
{
diff --git a/grep.c b/grep.c
index 13232a9..2230353 100644
--- a/grep.c
+++ b/grep.c
@@ -14,7 +14,31 @@
static int grep_source_is_binary(struct grep_source *gs,
struct index_state *istate);
-static struct grep_opt grep_defaults;
+static void std_output(struct grep_opt *opt, const void *buf, size_t size)
+{
+ fwrite(buf, size, 1, stdout);
+}
+
+static struct grep_opt grep_defaults = {
+ .relative = 1,
+ .pathname = 1,
+ .max_depth = -1,
+ .pattern_type_option = GREP_PATTERN_TYPE_UNSPECIFIED,
+ .colors = {
+ [GREP_COLOR_CONTEXT] = "",
+ [GREP_COLOR_FILENAME] = "",
+ [GREP_COLOR_FUNCTION] = "",
+ [GREP_COLOR_LINENO] = "",
+ [GREP_COLOR_COLUMNNO] = "",
+ [GREP_COLOR_MATCH_CONTEXT] = GIT_COLOR_BOLD_RED,
+ [GREP_COLOR_MATCH_SELECTED] = GIT_COLOR_BOLD_RED,
+ [GREP_COLOR_SELECTED] = "",
+ [GREP_COLOR_SEP] = GIT_COLOR_CYAN,
+ },
+ .only_matching = 0,
+ .color = -1,
+ .output = std_output,
+};
#ifdef USE_LIBPCRE2
static pcre2_general_context *pcre2_global_context;
@@ -42,50 +66,6 @@
[GREP_COLOR_SEP] = "separator",
};
-static void std_output(struct grep_opt *opt, const void *buf, size_t size)
-{
- fwrite(buf, size, 1, stdout);
-}
-
-static void color_set(char *dst, const char *color_bytes)
-{
- xsnprintf(dst, COLOR_MAXLEN, "%s", color_bytes);
-}
-
-/*
- * Initialize the grep_defaults template with hardcoded defaults.
- * We could let the compiler do this, but without C99 initializers
- * the code gets unwieldy and unreadable, so...
- */
-void init_grep_defaults(struct repository *repo)
-{
- struct grep_opt *opt = &grep_defaults;
- static int run_once;
-
- if (run_once)
- return;
- run_once++;
-
- memset(opt, 0, sizeof(*opt));
- opt->repo = repo;
- opt->relative = 1;
- opt->pathname = 1;
- opt->max_depth = -1;
- opt->pattern_type_option = GREP_PATTERN_TYPE_UNSPECIFIED;
- color_set(opt->colors[GREP_COLOR_CONTEXT], "");
- color_set(opt->colors[GREP_COLOR_FILENAME], "");
- color_set(opt->colors[GREP_COLOR_FUNCTION], "");
- color_set(opt->colors[GREP_COLOR_LINENO], "");
- color_set(opt->colors[GREP_COLOR_COLUMNNO], "");
- color_set(opt->colors[GREP_COLOR_MATCH_CONTEXT], GIT_COLOR_BOLD_RED);
- color_set(opt->colors[GREP_COLOR_MATCH_SELECTED], GIT_COLOR_BOLD_RED);
- color_set(opt->colors[GREP_COLOR_SELECTED], "");
- color_set(opt->colors[GREP_COLOR_SEP], GIT_COLOR_CYAN);
- opt->only_matching = 0;
- opt->color = -1;
- opt->output = std_output;
-}
-
static int parse_pattern_type_arg(const char *opt, const char *arg)
{
if (!strcmp(arg, "default"))
@@ -115,6 +95,14 @@
if (userdiff_config(var, value) < 0)
return -1;
+ /*
+ * The instance of grep_opt that we set up here is copied by
+ * grep_init() to be used by each individual invocation.
+ * When populating a new field of this structure here, be
+ * sure to think about ownership -- e.g., you might need to
+ * override the shallow copy in grep_init() with a deep copy.
+ */
+
if (!strcmp(var, "grep.extendedregexp")) {
opt->extended_regexp_option = git_config_bool(var, value);
return 0;
@@ -172,40 +160,19 @@
*/
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
+ *opt = grep_defaults;
- memset(opt, 0, sizeof(*opt));
opt->repo = repo;
opt->prefix = prefix;
opt->prefix_length = (prefix && *prefix) ? strlen(prefix) : 0;
opt->pattern_tail = &opt->pattern_list;
opt->header_tail = &opt->header_list;
-
- opt->only_matching = def->only_matching;
- opt->color = def->color;
- opt->extended_regexp_option = def->extended_regexp_option;
- opt->pattern_type_option = def->pattern_type_option;
- opt->linenum = def->linenum;
- opt->columnnum = def->columnnum;
- opt->max_depth = def->max_depth;
- opt->pathname = def->pathname;
- opt->relative = def->relative;
- opt->output = def->output;
-
- for (i = 0; i < NR_GREP_COLORS; i++)
- color_set(opt->colors[i], def->colors[i]);
}
void grep_destroy(void)
@@ -251,17 +218,7 @@
break;
case GREP_PATTERN_TYPE_PCRE:
-#ifdef USE_LIBPCRE2
opt->pcre2 = 1;
-#else
- /*
- * It's important that pcre1 always be assigned to
- * even when there's no USE_LIBPCRE* defined. We still
- * call the PCRE stub function, it just dies with
- * "cannot use Perl-compatible regexes[...]".
- */
- opt->pcre1 = 1;
-#endif
break;
}
}
@@ -405,92 +362,6 @@
return 1;
}
-#ifdef USE_LIBPCRE1
-static void compile_pcre1_regexp(struct grep_pat *p, const struct grep_opt *opt)
-{
- const char *error;
- int erroffset;
- int options = PCRE_MULTILINE;
- int study_options = 0;
-
- if (opt->ignore_case) {
- if (!opt->ignore_locale && has_non_ascii(p->pattern))
- p->pcre1_tables = pcre_maketables();
- options |= PCRE_CASELESS;
- }
- 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,
- p->pcre1_tables);
- if (!p->pcre1_regexp)
- compile_regexp_failed(p, error);
-
-#if defined(PCRE_CONFIG_JIT) && !defined(NO_LIBPCRE1_JIT)
- pcre_config(PCRE_CONFIG_JIT, &p->pcre1_jit_on);
- if (opt->debug)
- fprintf(stderr, "pcre1_jit_on=%d\n", p->pcre1_jit_on);
-
- if (p->pcre1_jit_on)
- study_options = PCRE_STUDY_JIT_COMPILE;
-#endif
-
- p->pcre1_extra_info = pcre_study(p->pcre1_regexp, study_options, &error);
- 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 = PCRE_NO_UTF8_CHECK;
-
- if (eflags & REG_NOTBOL)
- flags |= PCRE_NOTBOL;
-
- ret = pcre_exec(p->pcre1_regexp, p->pcre1_extra_info, line,
- eol - line, 0, flags, ovector,
- ARRAY_SIZE(ovector));
-
- if (ret < 0 && ret != PCRE_ERROR_NOMATCH)
- die("pcre_exec failed with error code %d", ret);
- if (ret > 0) {
- ret = 0;
- match->rm_so = ovector[0];
- match->rm_eo = ovector[1];
- }
-
- return ret;
-}
-
-static void free_pcre1_regexp(struct grep_pat *p)
-{
- pcre_free(p->pcre1_regexp);
-#ifdef PCRE_CONFIG_JIT
- if (p->pcre1_jit_on)
- pcre_free_study(p->pcre1_extra_info);
- else
-#endif
- pcre_free(p->pcre1_extra_info);
- pcre_free((void *)p->pcre1_tables);
-}
-#else /* !USE_LIBPCRE1 */
-static void compile_pcre1_regexp(struct grep_pat *p, const struct grep_opt *opt)
-{
- die("cannot use Perl-compatible regexes when not compiled with USE_LIBPCRE");
-}
-
-static int pcre1match(struct grep_pat *p, const char *line, const char *eol,
- regmatch_t *match, int eflags)
-{
- return 1;
-}
-
-static void free_pcre1_regexp(struct grep_pat *p)
-{
-}
-#endif /* !USE_LIBPCRE1 */
-
#ifdef USE_LIBPCRE2
static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt)
{
@@ -520,7 +391,23 @@
}
if (!opt->ignore_locale && is_utf8_locale() && has_non_ascii(p->pattern) &&
!(!opt->ignore_case && (p->fixed || p->is_fixed)))
- options |= PCRE2_UTF;
+ options |= (PCRE2_UTF | PCRE2_MATCH_INVALID_UTF);
+
+ /* Work around https://bugs.exim.org/show_bug.cgi?id=2642 fixed in 10.36 */
+ if (PCRE2_MATCH_INVALID_UTF && options & (PCRE2_UTF | PCRE2_CASELESS)) {
+ struct strbuf buf;
+ int len;
+ int err;
+
+ if ((len = pcre2_config(PCRE2_CONFIG_VERSION, NULL)) < 0)
+ BUG("pcre2_config(..., NULL) failed: %d", len);
+ strbuf_init(&buf, len + 1);
+ if ((err = pcre2_config(PCRE2_CONFIG_VERSION, buf.buf)) < 0)
+ BUG("pcre2_config(..., buf.buf) failed: %d", err);
+ if (versioncmp(buf.buf, "10.36") < 0)
+ options |= PCRE2_NO_START_OPTIMIZE;
+ strbuf_release(&buf);
+ }
p->pcre2_pattern = pcre2_compile((PCRE2_SPTR)p->pattern,
p->patternlen, options, &error, &erroffset,
@@ -536,8 +423,6 @@
}
pcre2_config(PCRE2_CONFIG_JIT, &p->pcre2_jit_on);
- if (opt->debug)
- fprintf(stderr, "pcre2_jit_on=%d\n", p->pcre2_jit_on);
if (p->pcre2_jit_on) {
jitret = pcre2_jit_compile(p->pcre2_pattern, PCRE2_JIT_COMPLETE);
if (jitret)
@@ -563,9 +448,6 @@
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;
}
}
@@ -616,11 +498,6 @@
#else /* !USE_LIBPCRE2 */
static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt)
{
- /*
- * Unreachable until USE_LIBPCRE2 becomes synonymous with
- * USE_LIBPCRE. See the sibling comment in
- * grep_set_pattern_type_option().
- */
die("cannot use Perl-compatible regexes when not compiled with USE_LIBPCRE");
}
@@ -644,8 +521,6 @@
if (opt->ignore_case)
regflags |= REG_ICASE;
err = regcomp(&p->regexp, sb.buf, regflags);
- if (opt->debug)
- fprintf(stderr, "fixed %s\n", sb.buf);
strbuf_release(&sb);
if (err) {
char errbuf[1024];
@@ -721,11 +596,6 @@
return;
}
- if (opt->pcre1) {
- compile_pcre1_regexp(p, opt);
- return;
- }
-
if (p->ignore_case)
regflags |= REG_ICASE;
if (opt->extended_regexp_option)
@@ -751,7 +621,7 @@
case GREP_PATTERN: /* atom */
case GREP_PATTERN_HEAD:
case GREP_PATTERN_BODY:
- x = xcalloc(1, sizeof (struct grep_expr));
+ CALLOC_ARRAY(x, 1);
x->node = GREP_NODE_ATOM;
x->u.atom = p;
*list = p->next;
@@ -781,7 +651,7 @@
if (!p->next)
die("--not not followed by pattern expression");
*list = p->next;
- x = xcalloc(1, sizeof (struct grep_expr));
+ CALLOC_ARRAY(x, 1);
x->node = GREP_NODE_NOT;
x->u.unary = compile_pattern_not(list);
if (!x->u.unary)
@@ -806,7 +676,7 @@
y = compile_pattern_and(list);
if (!y)
die("--and not followed by pattern expression");
- z = xcalloc(1, sizeof (struct grep_expr));
+ CALLOC_ARRAY(z, 1);
z->node = GREP_NODE_AND;
z->u.binary.left = x;
z->u.binary.right = y;
@@ -826,7 +696,7 @@
y = compile_pattern_or(list);
if (!y)
die("not a pattern expression %s", p->pattern);
- z = xcalloc(1, sizeof (struct grep_expr));
+ CALLOC_ARRAY(z, 1);
z->node = GREP_NODE_OR;
z->u.binary.left = x;
z->u.binary.right = y;
@@ -840,87 +710,6 @@
return compile_pattern_or(list);
}
-static void indent(int in)
-{
- while (in-- > 0)
- fputc(' ', stderr);
-}
-
-static void dump_grep_pat(struct grep_pat *p)
-{
- switch (p->token) {
- case GREP_AND: fprintf(stderr, "*and*"); break;
- case GREP_OPEN_PAREN: fprintf(stderr, "*(*"); break;
- case GREP_CLOSE_PAREN: fprintf(stderr, "*)*"); break;
- case GREP_NOT: fprintf(stderr, "*not*"); break;
- case GREP_OR: fprintf(stderr, "*or*"); break;
-
- case GREP_PATTERN: fprintf(stderr, "pattern"); break;
- case GREP_PATTERN_HEAD: fprintf(stderr, "pattern_head"); break;
- case GREP_PATTERN_BODY: fprintf(stderr, "pattern_body"); break;
- }
-
- switch (p->token) {
- default: break;
- case GREP_PATTERN_HEAD:
- fprintf(stderr, "<head %d>", p->field); break;
- case GREP_PATTERN_BODY:
- fprintf(stderr, "<body>"); break;
- }
- switch (p->token) {
- default: break;
- case GREP_PATTERN_HEAD:
- case GREP_PATTERN_BODY:
- case GREP_PATTERN:
- fprintf(stderr, "%.*s", (int)p->patternlen, p->pattern);
- break;
- }
- fputc('\n', stderr);
-}
-
-static void dump_grep_expression_1(struct grep_expr *x, int in)
-{
- indent(in);
- switch (x->node) {
- case GREP_NODE_TRUE:
- fprintf(stderr, "true\n");
- break;
- case GREP_NODE_ATOM:
- dump_grep_pat(x->u.atom);
- break;
- case GREP_NODE_NOT:
- fprintf(stderr, "(not\n");
- dump_grep_expression_1(x->u.unary, in+1);
- indent(in);
- fprintf(stderr, ")\n");
- break;
- case GREP_NODE_AND:
- fprintf(stderr, "(and\n");
- dump_grep_expression_1(x->u.binary.left, in+1);
- dump_grep_expression_1(x->u.binary.right, in+1);
- indent(in);
- fprintf(stderr, ")\n");
- break;
- case GREP_NODE_OR:
- fprintf(stderr, "(or\n");
- dump_grep_expression_1(x->u.binary.left, in+1);
- dump_grep_expression_1(x->u.binary.right, in+1);
- indent(in);
- fprintf(stderr, ")\n");
- break;
- }
-}
-
-static void dump_grep_expression(struct grep_opt *opt)
-{
- struct grep_expr *x = opt->pattern_expression;
-
- if (opt->all_match)
- fprintf(stderr, "[all-match]\n");
- dump_grep_expression_1(x, 0);
- fflush(NULL);
-}
-
static struct grep_expr *grep_true_expr(void)
{
struct grep_expr *z = xcalloc(1, sizeof(*z));
@@ -1001,7 +790,7 @@
return z;
}
-static void compile_grep_patterns_real(struct grep_opt *opt)
+void compile_grep_patterns(struct grep_opt *opt)
{
struct grep_pat *p;
struct grep_expr *header_expr = prep_header_patterns(opt);
@@ -1021,7 +810,7 @@
if (opt->all_match || header_expr)
opt->extended = 1;
- else if (!opt->extended && !opt->debug)
+ else if (!opt->extended)
return;
p = opt->pattern_list;
@@ -1044,13 +833,6 @@
opt->all_match = 1;
}
-void compile_grep_patterns(struct grep_opt *opt)
-{
- compile_grep_patterns_real(opt);
- if (opt->debug)
- dump_grep_expression(opt);
-}
-
static void free_pattern_expr(struct grep_expr *x)
{
switch (x->node) {
@@ -1079,9 +861,7 @@
case GREP_PATTERN: /* atom */
case GREP_PATTERN_HEAD:
case GREP_PATTERN_BODY:
- if (p->pcre1_regexp)
- free_pcre1_regexp(p);
- else if (p->pcre2_pattern)
+ if (p->pcre2_pattern)
free_pcre2_pattern(p);
else
regfree(&p->regexp);
@@ -1144,9 +924,7 @@
{
int hit;
- if (p->pcre1_regexp)
- hit = !pcre1match(p, line, eol, match, eflags);
- else if (p->pcre2_pattern)
+ if (p->pcre2_pattern)
hit = !pcre2match(p, line, eol, match, eflags);
else
hit = !regexec_buf(&p->regexp, line, eol - line, 1, match,
@@ -1817,7 +1595,7 @@
* We might set up the shared textconv cache data here, which
* is not thread-safe. Also, get_oid_with_context() and
* parse_object() might be internally called. As they are not
- * currenty thread-safe and might be racy with object reading,
+ * currently thread-safe and might be racy with object reading,
* obj_read_lock() must be called.
*/
grep_attr_lock();
diff --git a/grep.h b/grep.h
index 9115db8..ae89d62 100644
--- a/grep.h
+++ b/grep.h
@@ -1,15 +1,6 @@
#ifndef GREP_H
#define GREP_H
#include "color.h"
-#ifdef USE_LIBPCRE1
-#include <pcre.h>
-#ifndef PCRE_NO_UTF8_CHECK
-#define PCRE_NO_UTF8_CHECK 0
-#endif
-#else
-typedef int pcre;
-typedef int pcre_extra;
-#endif
#ifdef USE_LIBPCRE2
#define PCRE2_CODE_UNIT_WIDTH 8
#include <pcre2.h>
@@ -18,6 +9,10 @@
typedef int pcre2_match_data;
typedef int pcre2_compile_context;
#endif
+#ifndef PCRE2_MATCH_INVALID_UTF
+/* PCRE2_MATCH_* dummy also with !USE_LIBPCRE2, for test-pcre2-config.c */
+#define PCRE2_MATCH_INVALID_UTF 0
+#endif
#include "thread-utils.h"
#include "userdiff.h"
@@ -71,10 +66,6 @@
size_t patternlen;
enum grep_header_field field;
regex_t regexp;
- pcre *pcre1_regexp;
- pcre_extra *pcre1_extra_info;
- 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;
@@ -136,7 +127,6 @@
int word_regexp;
int fixed;
int all_match;
- int debug;
#define GREP_BINARY_DEFAULT 0
#define GREP_BINARY_NOMATCH 1
#define GREP_BINARY_TEXT 2
@@ -144,7 +134,6 @@
int allow_textconv;
int extended;
int use_reflog_filter;
- int pcre1;
int pcre2;
int relative;
int pathname;
@@ -170,7 +159,6 @@
void *output_priv;
};
-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);
diff --git a/sha1-lookup.c b/hash-lookup.c
similarity index 79%
rename from sha1-lookup.c
rename to hash-lookup.c
index 2918584..b98ed5e 100644
--- a/sha1-lookup.c
+++ b/hash-lookup.c
@@ -1,9 +1,9 @@
#include "cache.h"
-#include "sha1-lookup.h"
+#include "hash-lookup.h"
-static uint32_t take2(const unsigned char *sha1)
+static uint32_t take2(const struct object_id *oid, size_t ofs)
{
- return ((sha1[0] << 8) | sha1[1]);
+ return ((oid->hash[ofs] << 8) | oid->hash[ofs + 1]);
}
/*
@@ -47,11 +47,11 @@
*/
/*
* The table should contain "nr" elements.
- * The sha1 of element i (between 0 and nr - 1) should be returned
+ * The oid of element i (between 0 and nr - 1) should be returned
* by "fn(i, table)".
*/
-int sha1_pos(const unsigned char *hash, void *table, size_t nr,
- sha1_access_fn fn)
+int oid_pos(const struct object_id *oid, const void *table, size_t nr,
+ oid_access_fn fn)
{
size_t hi = nr;
size_t lo = 0;
@@ -64,9 +64,9 @@
size_t lov, hiv, miv, ofs;
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(hash + ofs);
+ lov = take2(fn(0, table), ofs);
+ hiv = take2(fn(nr - 1, table), ofs);
+ miv = take2(oid, ofs);
if (miv < lov)
return -1;
if (hiv < miv)
@@ -74,7 +74,7 @@
if (lov != hiv) {
/*
* At this point miv could be equal
- * to hiv (but sha1 could still be higher);
+ * to hiv (but hash could still be higher);
* the invariant of (mi < hi) should be
* kept.
*/
@@ -88,7 +88,7 @@
do {
int cmp;
- cmp = hashcmp(fn(mi, table), hash);
+ cmp = oidcmp(fn(mi, table), oid);
if (!cmp)
return mi;
if (cmp > 0)
@@ -100,17 +100,17 @@
return index_pos_to_insert_pos(lo);
}
-int bsearch_hash(const unsigned char *sha1, const uint32_t *fanout_nbo,
+int bsearch_hash(const unsigned char *hash, const uint32_t *fanout_nbo,
const unsigned char *table, size_t stride, uint32_t *result)
{
uint32_t hi, lo;
- hi = ntohl(fanout_nbo[*sha1]);
- lo = ((*sha1 == 0x0) ? 0 : ntohl(fanout_nbo[*sha1 - 1]));
+ hi = ntohl(fanout_nbo[*hash]);
+ lo = ((*hash == 0x0) ? 0 : ntohl(fanout_nbo[*hash - 1]));
while (lo < hi) {
unsigned mi = lo + (hi - lo) / 2;
- int cmp = hashcmp(table + mi * stride, sha1);
+ int cmp = hashcmp(table + mi * stride, hash);
if (!cmp) {
if (result)
diff --git a/sha1-lookup.h b/hash-lookup.h
similarity index 64%
rename from sha1-lookup.h
rename to hash-lookup.h
index 5afcd01..dbd71eb 100644
--- a/sha1-lookup.h
+++ b/hash-lookup.h
@@ -1,20 +1,20 @@
-#ifndef SHA1_LOOKUP_H
-#define SHA1_LOOKUP_H
+#ifndef HASH_LOOKUP_H
+#define HASH_LOOKUP_H
-typedef const unsigned char *sha1_access_fn(size_t index, void *table);
+typedef const struct object_id *oid_access_fn(size_t index, const void *table);
-int sha1_pos(const unsigned char *sha1,
- void *table,
- size_t nr,
- sha1_access_fn fn);
+int oid_pos(const struct object_id *oid,
+ const void *table,
+ size_t nr,
+ oid_access_fn fn);
/*
- * Searches for sha1 in table, using the given fanout table to determine the
+ * Searches for hash in table, using the given fanout table to determine the
* interval to search, then using binary search. Returns 1 if found, 0 if not.
*
* Takes the following parameters:
*
- * - sha1: the hash to search for
+ * - hash: the hash to search for
* - fanout_nbo: a 256-element array of NETWORK-order 32-bit integers; the
* integer at position i represents the number of elements in table whose
* first byte is less than or equal to i
@@ -23,10 +23,10 @@
* GIT_MAX_RAWSZ or greater)
* - result: if not NULL, this function stores the element index of the
* position found (if the search is successful) or the index of the least
- * element that is greater than sha1 (if the search is not successful)
+ * element that is greater than hash (if the search is not successful)
*
* This function does not verify the validity of the fanout table.
*/
-int bsearch_hash(const unsigned char *sha1, const uint32_t *fanout_nbo,
+int bsearch_hash(const unsigned char *hash, const uint32_t *fanout_nbo,
const unsigned char *table, size_t stride, uint32_t *result);
#endif
diff --git a/hash.h b/hash.h
index 52a4f1a..3fb0c3d 100644
--- a/hash.h
+++ b/hash.h
@@ -2,6 +2,7 @@
#define HASH_H
#include "git-compat-util.h"
+#include "repository.h"
#if defined(SHA1_PPC)
#include "ppc/sha1.h"
@@ -16,6 +17,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 +56,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 +103,7 @@
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 +129,9 @@
/* 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;
@@ -163,4 +185,98 @@
#define the_hash_algo the_repository->hash_algo
+extern const struct object_id null_oid;
+
+static inline int hashcmp(const unsigned char *sha1, const unsigned char *sha2)
+{
+ /*
+ * Teach the compiler that there are only two possibilities of hash size
+ * here, so that it can optimize for this case as much as possible.
+ */
+ if (the_hash_algo->rawsz == GIT_MAX_RAWSZ)
+ return memcmp(sha1, sha2, GIT_MAX_RAWSZ);
+ return memcmp(sha1, sha2, GIT_SHA1_RAWSZ);
+}
+
+static inline int oidcmp(const struct object_id *oid1, const struct object_id *oid2)
+{
+ return hashcmp(oid1->hash, oid2->hash);
+}
+
+static inline int hasheq(const unsigned char *sha1, const unsigned char *sha2)
+{
+ /*
+ * We write this here instead of deferring to hashcmp so that the
+ * compiler can properly inline it and avoid calling memcmp.
+ */
+ if (the_hash_algo->rawsz == GIT_MAX_RAWSZ)
+ return !memcmp(sha1, sha2, GIT_MAX_RAWSZ);
+ return !memcmp(sha1, sha2, GIT_SHA1_RAWSZ);
+}
+
+static inline int oideq(const struct object_id *oid1, const struct object_id *oid2)
+{
+ return hasheq(oid1->hash, oid2->hash);
+}
+
+static inline int is_null_oid(const struct object_id *oid)
+{
+ return oideq(oid, &null_oid);
+}
+
+static inline void hashcpy(unsigned char *sha_dst, const unsigned char *sha_src)
+{
+ memcpy(sha_dst, sha_src, the_hash_algo->rawsz);
+}
+
+static inline void oidcpy(struct object_id *dst, const struct object_id *src)
+{
+ memcpy(dst->hash, src->hash, GIT_MAX_RAWSZ);
+}
+
+static inline struct object_id *oiddup(const struct object_id *src)
+{
+ struct object_id *dst = xmalloc(sizeof(struct object_id));
+ oidcpy(dst, src);
+ return dst;
+}
+
+static inline void hashclr(unsigned char *hash)
+{
+ memset(hash, 0, the_hash_algo->rawsz);
+}
+
+static inline void oidclr(struct object_id *oid)
+{
+ memset(oid->hash, 0, GIT_MAX_RAWSZ);
+}
+
+static inline void oidread(struct object_id *oid, const unsigned char *hash)
+{
+ memcpy(oid->hash, hash, the_hash_algo->rawsz);
+}
+
+static inline int is_empty_blob_sha1(const unsigned char *sha1)
+{
+ return hasheq(sha1, the_hash_algo->empty_blob->hash);
+}
+
+static inline int is_empty_blob_oid(const struct object_id *oid)
+{
+ return oideq(oid, the_hash_algo->empty_blob);
+}
+
+static inline int is_empty_tree_sha1(const unsigned char *sha1)
+{
+ return hasheq(sha1, the_hash_algo->empty_tree->hash);
+}
+
+static inline int is_empty_tree_oid(const struct object_id *oid)
+{
+ return oideq(oid, the_hash_algo->empty_tree);
+}
+
+const char *empty_tree_oid_hex(void);
+const char *empty_blob_oid_hex(void);
+
#endif
diff --git a/hashmap.c b/hashmap.c
index 09813e1..134d2ee 100644
--- a/hashmap.c
+++ b/hashmap.c
@@ -76,7 +76,7 @@
static void alloc_table(struct hashmap *map, unsigned int size)
{
map->tablesize = size;
- map->table = xcalloc(size, sizeof(struct hashmap_entry *));
+ CALLOC_ARRAY(map->table, size);
/* calculate resize thresholds for new size */
map->grow_at = (unsigned int) ((uint64_t) size * HASHMAP_LOAD_FACTOR / 100);
@@ -92,8 +92,9 @@
}
static inline int entry_equals(const struct hashmap *map,
- const struct hashmap_entry *e1, const struct hashmap_entry *e2,
- const void *keydata)
+ const struct hashmap_entry *e1,
+ const struct hashmap_entry *e2,
+ const void *keydata)
{
return (e1 == e2) ||
(e1->hash == e2->hash &&
@@ -101,7 +102,7 @@
}
static inline unsigned int bucket(const struct hashmap *map,
- const struct hashmap_entry *key)
+ const struct hashmap_entry *key)
{
return key->hash & (map->tablesize - 1);
}
@@ -113,6 +114,7 @@
static void rehash(struct hashmap *map, unsigned int newsize)
{
+ /* map->table MUST NOT be NULL when this function is called */
unsigned int i, oldsize = map->tablesize;
struct hashmap_entry **oldtable = map->table;
@@ -133,6 +135,7 @@
static inline struct hashmap_entry **find_entry_ptr(const struct hashmap *map,
const struct hashmap_entry *key, const void *keydata)
{
+ /* map->table MUST NOT be NULL when this function is called */
struct hashmap_entry **e = &map->table[bucket(map, key)];
while (*e && !entry_equals(map, *e, key, keydata))
e = &(*e)->next;
@@ -148,7 +151,7 @@
}
void hashmap_init(struct hashmap *map, hashmap_cmp_fn equals_function,
- const void *cmpfn_data, size_t initial_size)
+ const void *cmpfn_data, size_t initial_size)
{
unsigned int size = HASHMAP_INITIAL_SIZE;
@@ -171,22 +174,37 @@
map->do_count_items = 1;
}
-void hashmap_free_(struct hashmap *map, ssize_t entry_offset)
+static void free_individual_entries(struct hashmap *map, ssize_t entry_offset)
+{
+ struct hashmap_iter iter;
+ struct hashmap_entry *e;
+
+ hashmap_iter_init(map, &iter);
+ while ((e = hashmap_iter_next(&iter)))
+ /*
+ * like container_of, but using caller-calculated
+ * offset (caller being hashmap_clear_and_free)
+ */
+ free((char *)e - entry_offset);
+}
+
+void hashmap_partial_clear_(struct hashmap *map, ssize_t entry_offset)
{
if (!map || !map->table)
return;
- if (entry_offset >= 0) { /* called by hashmap_free_entries */
- struct hashmap_iter iter;
- struct hashmap_entry *e;
+ if (entry_offset >= 0) /* called by hashmap_clear_entries */
+ free_individual_entries(map, entry_offset);
+ memset(map->table, 0, map->tablesize * sizeof(struct hashmap_entry *));
+ map->shrink_at = 0;
+ map->private_size = 0;
+}
- hashmap_iter_init(map, &iter);
- while ((e = hashmap_iter_next(&iter)))
- /*
- * like container_of, but using caller-calculated
- * offset (caller being hashmap_free_entries)
- */
- free((char *)e - entry_offset);
- }
+void hashmap_clear_(struct hashmap *map, ssize_t entry_offset)
+{
+ if (!map || !map->table)
+ return;
+ if (entry_offset >= 0) /* called by hashmap_clear_and_free */
+ free_individual_entries(map, entry_offset);
free(map->table);
memset(map, 0, sizeof(*map));
}
@@ -195,11 +213,13 @@
const struct hashmap_entry *key,
const void *keydata)
{
+ if (!map->table)
+ return NULL;
return *find_entry_ptr(map, key, keydata);
}
struct hashmap_entry *hashmap_get_next(const struct hashmap *map,
- const struct hashmap_entry *entry)
+ const struct hashmap_entry *entry)
{
struct hashmap_entry *e = entry->next;
for (; e; e = e->next)
@@ -210,8 +230,12 @@
void hashmap_add(struct hashmap *map, struct hashmap_entry *entry)
{
- unsigned int b = bucket(map, entry);
+ unsigned int b;
+ if (!map->table)
+ alloc_table(map, HASHMAP_INITIAL_SIZE);
+
+ b = bucket(map, entry);
/* add entry */
entry->next = map->table[b];
map->table[b] = entry;
@@ -225,11 +249,15 @@
}
struct hashmap_entry *hashmap_remove(struct hashmap *map,
- const struct hashmap_entry *key,
- const void *keydata)
+ const struct hashmap_entry *key,
+ const void *keydata)
{
struct hashmap_entry *old;
- struct hashmap_entry **e = find_entry_ptr(map, key, keydata);
+ struct hashmap_entry **e;
+
+ if (!map->table)
+ return NULL;
+ e = find_entry_ptr(map, key, keydata);
if (!*e)
return NULL;
@@ -249,7 +277,7 @@
}
struct hashmap_entry *hashmap_put(struct hashmap *map,
- struct hashmap_entry *entry)
+ struct hashmap_entry *entry)
{
struct hashmap_entry *old = hashmap_remove(map, entry, NULL);
hashmap_add(map, entry);
diff --git a/hashmap.h b/hashmap.h
index 79ae9f8..7251687 100644
--- a/hashmap.h
+++ b/hashmap.h
@@ -96,7 +96,7 @@
* }
*
* if (!strcmp("end", action)) {
- * hashmap_free_entries(&map, struct long2string, ent);
+ * hashmap_clear_and_free(&map, struct long2string, ent);
* break;
* }
* }
@@ -168,7 +168,7 @@
* 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.
@@ -210,6 +210,9 @@
/* hashmap functions */
+#define HASHMAP_INIT(fn, data) { .cmpfn = fn, .cmpfn_data = data, \
+ .do_count_items = 1 }
+
/*
* Initializes a hashmap structure.
*
@@ -228,24 +231,72 @@
* prevent expensive resizing. If 0, the table is dynamically resized.
*/
void hashmap_init(struct hashmap *map,
- hashmap_cmp_fn equals_function,
- const void *equals_function_data,
- size_t initial_size);
+ hashmap_cmp_fn equals_function,
+ const void *equals_function_data,
+ size_t initial_size);
-/* internal function for freeing hashmap */
-void hashmap_free_(struct hashmap *map, ssize_t offset);
+/* internal functions for clearing or freeing hashmap */
+void hashmap_partial_clear_(struct hashmap *map, ssize_t offset);
+void hashmap_clear_(struct hashmap *map, ssize_t offset);
/*
- * Frees a hashmap structure and allocated memory, leaves entries undisturbed
+ * Frees a hashmap structure and allocated memory for the table, but does not
+ * free the entries nor anything they point to.
+ *
+ * Usage note:
+ *
+ * Many callers will need to iterate over all entries and free the data each
+ * entry points to; in such a case, they can free the entry itself while at it.
+ * Thus, you might see:
+ *
+ * hashmap_for_each_entry(map, hashmap_iter, e, hashmap_entry_name) {
+ * free(e->somefield);
+ * free(e);
+ * }
+ * hashmap_clear(map);
+ *
+ * instead of
+ *
+ * hashmap_for_each_entry(map, hashmap_iter, e, hashmap_entry_name) {
+ * free(e->somefield);
+ * }
+ * hashmap_clear_and_free(map, struct my_entry_struct, hashmap_entry_name);
+ *
+ * to avoid the implicit extra loop over the entries. However, if there are
+ * no special fields in your entry that need to be freed beyond the entry
+ * itself, it is probably simpler to avoid the explicit loop and just call
+ * hashmap_clear_and_free().
*/
-#define hashmap_free(map) hashmap_free_(map, -1)
+#define hashmap_clear(map) hashmap_clear_(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
+ * Similar to hashmap_clear(), except that the table is no deallocated; it
+ * is merely zeroed out but left the same size as before. If the hashmap
+ * will be reused, this avoids the overhead of deallocating and
+ * reallocating map->table. As with hashmap_clear(), you may need to free
+ * the entries yourself before calling this function.
*/
-#define hashmap_free_entries(map, type, member) \
- hashmap_free_(map, offsetof(type, member));
+#define hashmap_partial_clear(map) hashmap_partial_clear_(map, -1)
+
+/*
+ * Similar to hashmap_clear() but also frees all entries. @type is the
+ * struct type of the entry where @member is the hashmap_entry struct used
+ * to associate with @map.
+ *
+ * See usage note above hashmap_clear().
+ */
+#define hashmap_clear_and_free(map, type, member) \
+ hashmap_clear_(map, offsetof(type, member))
+
+/*
+ * Similar to hashmap_partial_clear() but also frees all entries. @type is
+ * the struct type of the entry where @member is the hashmap_entry struct
+ * used to associate with @map.
+ *
+ * See usage note above hashmap_clear().
+ */
+#define hashmap_partial_clear_and_free(map, type, member) \
+ hashmap_partial_clear_(map, offsetof(type, member))
/* hashmap_entry functions */
@@ -261,7 +312,7 @@
* and if it is on stack, you can just let it go out of scope).
*/
static inline void hashmap_entry_init(struct hashmap_entry *e,
- unsigned int hash)
+ unsigned int hash)
{
e->hash = hash;
e->next = NULL;
@@ -303,8 +354,8 @@
* to `hashmap_cmp_fn` to decide whether the entry matches the key.
*/
struct hashmap_entry *hashmap_get(const struct hashmap *map,
- const struct hashmap_entry *key,
- const void *keydata);
+ const struct hashmap_entry *key,
+ const void *keydata);
/*
* Returns the hashmap entry for the specified hash code and key data,
@@ -337,7 +388,7 @@
* call to `hashmap_get` or `hashmap_get_next`.
*/
struct hashmap_entry *hashmap_get_next(const struct hashmap *map,
- const struct hashmap_entry *entry);
+ const struct hashmap_entry *entry);
/*
* Adds a hashmap entry. This allows to add duplicate entries (i.e.
@@ -357,7 +408,7 @@
* Returns the replaced entry, or NULL if not found (i.e. the entry was added).
*/
struct hashmap_entry *hashmap_put(struct hashmap *map,
- struct hashmap_entry *entry);
+ struct hashmap_entry *entry);
/*
* Adds or replaces a hashmap entry contained within @keyvar,
@@ -379,8 +430,8 @@
* Argument explanation is the same as in `hashmap_get`.
*/
struct hashmap_entry *hashmap_remove(struct hashmap *map,
- const struct hashmap_entry *key,
- const void *keydata);
+ const struct hashmap_entry *key,
+ const void *keydata);
/*
* Removes a hashmap entry contained within @keyvar,
@@ -422,7 +473,7 @@
/* Initializes the iterator and returns the first entry, if any. */
static inline struct hashmap_entry *hashmap_iter_first(struct hashmap *map,
- struct hashmap_iter *iter)
+ struct hashmap_iter *iter)
{
hashmap_iter_init(map, iter);
return hashmap_iter_next(iter);
@@ -449,7 +500,8 @@
* containing a @member which is a "struct hashmap_entry"
*/
#define hashmap_for_each_entry(map, iter, var, member) \
- for (var = hashmap_iter_first_entry_offset(map, iter, \
+ 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, \
diff --git a/help.c b/help.c
index cf67624..3c3bdec 100644
--- a/help.c
+++ b/help.c
@@ -263,6 +263,8 @@
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 @@
{
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_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;
@@ -555,12 +472,26 @@
static int autocorrect;
static struct cmdnames aliases;
+#define AUTOCORRECT_NEVER (-2)
+#define AUTOCORRECT_IMMEDIATELY (-1)
+
static int git_unknown_cmd_config(const char *var, const char *value, void *cb)
{
const char *p;
- if (!strcmp(var, "help.autocorrect"))
- autocorrect = git_config_int(var,value);
+ if (!strcmp(var, "help.autocorrect")) {
+ if (!value)
+ return config_error_nonbool(var);
+ if (!strcmp(value, "never")) {
+ autocorrect = AUTOCORRECT_NEVER;
+ } else if (!strcmp(value, "immediate")) {
+ autocorrect = AUTOCORRECT_IMMEDIATELY;
+ } else {
+ int v = git_config_int(var, value);
+ autocorrect = (v < 0)
+ ? AUTOCORRECT_IMMEDIATELY : v;
+ }
+ }
/* Also use aliases for command lookup */
if (skip_prefix(var, "alias.", &p))
add_cmdname(&aliases, p, strlen(p));
@@ -608,6 +539,11 @@
read_early_config(git_unknown_cmd_config, NULL);
+ if (autocorrect == AUTOCORRECT_NEVER) {
+ fprintf_ln(stderr, _("git: '%s' is not a git command. See 'git --help'."), cmd);
+ exit(1);
+ }
+
load_command_list("git-", &main_cmds, &other_cmds);
add_cmd_list(&main_cmds, &aliases);
@@ -677,7 +613,7 @@
_("WARNING: You called a Git command named '%s', "
"which does not exist."),
cmd);
- if (autocorrect < 0)
+ if (autocorrect == AUTOCORRECT_IMMEDIATELY)
fprintf_ln(stderr,
_("Continuing under the assumption that "
"you meant '%s'."),
@@ -707,8 +643,33 @@
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 +683,11 @@
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);
- 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? */
- }
+ strbuf_release(&buf);
+
return 0;
}
diff --git a/help.h b/help.h
index 7a455be..5871e93 100644
--- a/help.h
+++ b/help.h
@@ -21,8 +21,7 @@
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,11 +32,13 @@
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
diff --git a/hex.c b/hex.c
index fd7f00c..da51e64 100644
--- a/hex.c
+++ b/hex.c
@@ -47,30 +47,71 @@
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_algop(const char *hex, struct object_id *oid,
+ const char **end,
+ const struct git_hash_algo *algop)
+{
+ int ret = get_hash_hex_algop(hex, oid->hash, algop);
+ if (!ret)
+ *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)
{
- int ret = get_oid_hex(hex, oid);
- if (!ret)
- *end = hex + the_hash_algo->hexsz;
- return ret;
+ return parse_oid_hex_algop(hex, oid, end, the_hash_algo);
}
char *hash_to_hex_algop_r(char *buffer, const unsigned char *hash,
diff --git a/http-backend.c b/http-backend.c
index ec3144b..b329bf6 100644
--- a/http-backend.c
+++ b/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"
@@ -39,7 +39,7 @@
if (!query_params) {
const char *query = getenv("QUERY_STRING");
- query_params = xcalloc(1, sizeof(*query_params));
+ CALLOC_ARRAY(query_params, 1);
while (query && *query) {
char *name = url_decode_parameter_name(&query);
char *value = url_decode_parameter_value(&query);
@@ -477,10 +477,10 @@
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/http-fetch.c b/http-fetch.c
index a32ac11..fa64246 100644
--- a/http-fetch.c
+++ b/http-fetch.c
@@ -3,61 +3,27 @@
#include "exec-cmd.h"
#include "http.h"
#include "walker.h"
+#include "strvec.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)
{
- struct walker *walker;
- 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;
+ struct walker *walker;
+ int rc;
- while (arg < argc && argv[arg][0] == '-') {
- if (argv[arg][1] == 't') {
- } else if (argv[arg][1] == 'c') {
- } else if (argv[arg][1] == 'a') {
- } else if (argv[arg][1] == 'v') {
- get_verbosely = 1;
- } else if (argv[arg][1] == 'w') {
- write_ref = &argv[arg + 1];
- arg++;
- } else if (argv[arg][1] == 'h') {
- usage(http_fetch_usage);
- } else if (!strcmp(argv[arg], "--recover")) {
- get_recover = 1;
- } else if (!strcmp(argv[arg], "--stdin")) {
- commits_on_stdin = 1;
- }
- arg++;
- }
- if (argc != arg + 2 - commits_on_stdin)
- 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();
-
- git_config(git_default_config, NULL);
+ 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);
@@ -73,8 +39,116 @@
walker_free(walker);
http_cleanup();
-
free(url);
return rc;
}
+
+static void fetch_single_packfile(struct object_id *packfile_hash,
+ const char *url,
+ const char **index_pack_args) {
+ 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->index_pack_args = index_pack_args;
+ preq->preserve_index_pack_stdout = 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;
+ int arg = 1;
+ int get_verbosely = 0;
+ int get_recover = 0;
+ int packfile = 0;
+ int nongit;
+ struct object_id packfile_hash;
+ struct strvec index_pack_args = STRVEC_INIT;
+
+ 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') {
+ } else if (argv[arg][1] == 'v') {
+ get_verbosely = 1;
+ } else if (argv[arg][1] == 'w') {
+ write_ref = &argv[arg + 1];
+ arg++;
+ } else if (argv[arg][1] == 'h') {
+ usage(http_fetch_usage);
+ } else if (!strcmp(argv[arg], "--recover")) {
+ 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);
+ } else if (skip_prefix(argv[arg], "--index-pack-arg=", &p)) {
+ strvec_push(&index_pack_args, p);
+ }
+ arg++;
+ }
+ if (argc != arg + 2 - (commits_on_stdin || packfile))
+ usage(http_fetch_usage);
+
+ if (nongit)
+ die(_("not a git repository"));
+
+ git_config(git_default_config, NULL);
+
+ if (packfile) {
+ if (!index_pack_args.nr)
+ die(_("--packfile requires --index-pack-args"));
+
+ fetch_single_packfile(&packfile_hash, argv[arg],
+ index_pack_args.v);
+
+ return 0;
+ }
+
+ if (index_pack_args.nr)
+ die(_("--index-pack-args can only be used with --packfile"));
+
+ 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/http-push.c b/http-push.c
index 822f326..b60d5fc 100644
--- a/http-push.c
+++ b/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 @@
#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 @@
struct transfer_request {
struct object *obj;
+ struct packed_git *target;
char *url;
char *dest;
struct remote_lock *lock;
@@ -314,17 +315,18 @@
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) {
@@ -597,6 +599,8 @@
}
if (fail)
repo->can_update_info_refs = 0;
+ else
+ http_install_packfile(request->target, &repo->packs);
release_request(request);
}
}
@@ -892,7 +896,7 @@
curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, dav_headers);
curl_easy_setopt(slot->curl, CURLOPT_FILE, &in_buffer);
- lock = xcalloc(1, sizeof(*lock));
+ CALLOC_ARRAY(lock, 1);
lock->timeout = -1;
if (start_active_slot(slot)) {
@@ -1709,7 +1713,7 @@
int new_refs;
struct ref *ref, *local_refs;
- repo = xcalloc(1, sizeof(*repo));
+ CALLOC_ARRAY(repo, 1);
argv++;
for (i = 1; i < argc; i++, argv++) {
@@ -1842,7 +1846,7 @@
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 @@
}
/* 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 @@
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/http-walker.c b/http-walker.c
index fe15e32..4fb1235 100644
--- a/http-walker.c
+++ b/http-walker.c
@@ -439,6 +439,7 @@
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 @@
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 @@
release_http_pack_request(preq);
if (ret)
return ret;
+ http_install_packfile(target, &repo->packs);
return 0;
diff --git a/http.c b/http.c
index 5f71263..0e31fc2 100644
--- a/http.c
+++ b/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 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;
@@ -365,6 +372,20 @@
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)) {
@@ -566,6 +587,22 @@
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)
{
@@ -605,8 +642,9 @@
{
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++;
@@ -615,20 +653,15 @@
/* 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;
@@ -641,14 +674,8 @@
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
@@ -767,6 +794,12 @@
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))
@@ -925,8 +958,14 @@
#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,
@@ -950,15 +989,12 @@
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());
@@ -1019,9 +1055,18 @@
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);
@@ -1161,6 +1206,13 @@
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;
@@ -1231,6 +1283,12 @@
}
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);
}
@@ -2201,72 +2259,77 @@
free(preq);
}
+static const char *default_index_pack_args[] =
+ {"index-pack", "--stdin", NULL};
+
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;
+ tmpfile_fd = xopen(preq->tmpfile.buf, O_RDONLY);
+
+ ip.git_cmd = 1;
+ ip.in = tmpfile_fd;
+ ip.argv = preq->index_pack_args ? preq->index_pack_args
+ : default_index_pack_args;
+
+ if (preq->preserve_index_pack_stdout)
+ ip.out = 0;
+ else
+ ip.no_stdout = 1;
+
+ if (run_command(&ip)) {
+ ret = -1;
+ goto cleanup;
+ }
+
+cleanup:
+ close(tmpfile_fd);
+ unlink(preq->tmpfile.buf);
+ return ret;
+}
+
+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;
- 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);
-
- argv_array_push(&ip.args, "index-pack");
- argv_array_pushl(&ip.args, "-o", tmp_idx, NULL);
- argv_array_push(&ip.args, preq->tmpfile.buf);
- ip.git_cmd = 1;
- ip.no_stdin = 1;
- ip.no_stdout = 1;
-
- if (run_command(&ip)) {
- unlink(preq->tmpfile.buf);
- unlink(tmp_idx);
- free(tmp_idx);
- return -1;
- }
-
- unlink(sha1_pack_index_name(p->hash));
-
- 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;
- }
-
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)
-{
- off_t prev_posn = 0;
- struct strbuf buf = STRBUF_INIT;
- struct http_pack_request *preq;
+ const unsigned char *packed_git_hash, const char *base_url) {
- preq = xcalloc(1, sizeof(*preq));
- strbuf_init(&preq->tmpfile, 0);
- preq->target = target;
+ struct strbuf buf = STRBUF_INIT;
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);
+ hash_to_hex(packed_git_hash));
+ return new_direct_http_pack_request(packed_git_hash,
+ strbuf_detach(&buf, NULL));
+}
- strbuf_addf(&preq->tmpfile, "%s.temp", sha1_pack_name(target->hash));
+struct http_pack_request *new_direct_http_pack_request(
+ const unsigned char *packed_git_hash, char *url)
+{
+ off_t prev_posn = 0;
+ struct http_pack_request *preq;
+
+ CALLOC_ARRAY(preq, 1);
+ strbuf_init(&preq->tmpfile, 0);
+
+ preq->url = url;
+
+ 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",
@@ -2290,7 +2353,7 @@
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);
}
@@ -2356,7 +2419,7 @@
off_t prev_posn = 0;
struct http_object_request *freq;
- freq = xcalloc(1, sizeof(*freq));
+ CALLOC_ARRAY(freq, 1);
strbuf_init(&freq->tmpfile, 0);
oidcpy(&freq->oid, oid);
freq->localfile = -1;
diff --git a/http.h b/http.h
index 5e0ad72..bf3d127 100644
--- a/http.h
+++ b/http.h
@@ -216,18 +216,36 @@
struct http_pack_request {
char *url;
- struct packed_git *target;
- struct packed_git **lst;
+
+ /*
+ * index-pack command to run. Must be terminated by NULL.
+ *
+ * If NULL, defaults to {"index-pack", "--stdin", NULL}.
+ */
+ const char **index_pack_args;
+ unsigned preserve_index_pack_stdout : 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;
@@ -252,6 +270,13 @@
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/ident.c b/ident.c
index e666ee4..6aba4b5 100644
--- a/ident.c
+++ b/ident.c
@@ -345,27 +345,45 @@
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 @@
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 @@
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 @@
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 @@
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/imap-send.c b/imap-send.c
index 6c54d8c..bb085d6 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -84,17 +84,17 @@
}
struct imap_server_conf {
- char *name;
- char *tunnel;
- char *host;
+ const char *name;
+ const char *tunnel;
+ const char *host;
int port;
- char *folder;
- char *user;
- char *pass;
+ const char *folder;
+ const char *user;
+ const char *pass;
int use_ssl;
int ssl_verify;
int use_html;
- char *auth_method;
+ const char *auth_method;
};
static struct imap_server_conf server = {
@@ -955,7 +955,7 @@
srvc->pass = xstrdup(cred->password);
}
-static struct imap_store *imap_open_store(struct imap_server_conf *srvc, char *folder)
+static struct imap_store *imap_open_store(struct imap_server_conf *srvc, const char *folder)
{
struct credential cred = CREDENTIAL_INIT;
struct imap_store *ctx;
@@ -963,9 +963,9 @@
char *arg, *rsp;
int s = -1, preauth;
- ctx = xcalloc(1, sizeof(*ctx));
+ CALLOC_ARRAY(ctx, 1);
- ctx->imap = imap = xcalloc(1, sizeof(*imap));
+ ctx->imap = CALLOC_ARRAY(imap, 1);
imap->buf.sock.fd[0] = imap->buf.sock.fd[1] = -1;
imap->in_progress_append = &imap->in_progress;
@@ -976,7 +976,7 @@
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;
@@ -1338,15 +1338,26 @@
return 1;
}
-static void git_imap_config(void)
+static int git_imap_config(const char *var, const char *val, void *cb)
{
- const char *val = NULL;
- git_config_get_bool("imap.sslverify", &server.ssl_verify);
- git_config_get_bool("imap.preformattedhtml", &server.use_html);
- git_config_get_string("imap.folder", &server.folder);
-
- if (!git_config_get_value("imap.host", &val)) {
+ if (!strcmp("imap.sslverify", var))
+ server.ssl_verify = git_config_bool(var, val);
+ else if (!strcmp("imap.preformattedhtml", var))
+ server.use_html = git_config_bool(var, val);
+ else if (!strcmp("imap.folder", var))
+ return git_config_string(&server.folder, var, val);
+ else if (!strcmp("imap.user", var))
+ return git_config_string(&server.user, var, val);
+ else if (!strcmp("imap.pass", var))
+ return git_config_string(&server.pass, var, val);
+ else if (!strcmp("imap.tunnel", var))
+ return git_config_string(&server.tunnel, var, val);
+ else if (!strcmp("imap.authmethod", var))
+ return git_config_string(&server.auth_method, var, val);
+ else if (!strcmp("imap.port", var))
+ server.port = git_config_int(var, val);
+ else if (!strcmp("imap.host", var)) {
if (!val) {
git_die_config("imap.host", "Missing value for 'imap.host'");
} else {
@@ -1360,13 +1371,10 @@
val += 2;
server.host = xstrdup(val);
}
- }
+ } else
+ return git_default_config(var, val, cb);
- git_config_get_string("imap.user", &server.user);
- git_config_get_string("imap.pass", &server.pass);
- git_config_get_int("imap.port", &server.port);
- git_config_get_string("imap.tunnel", &server.tunnel);
- git_config_get_string("imap.authmethod", &server.auth_method);
+ return 0;
}
static int append_msgs_to_imap(struct imap_server_conf *server,
@@ -1464,7 +1472,7 @@
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;
@@ -1539,7 +1547,7 @@
int nongit_ok;
setup_git_directory_gently(&nongit_ok);
- git_imap_config();
+ git_config(git_imap_config, NULL);
argc = parse_options(argc, (const char **)argv, "", imap_send_options, imap_send_usage, 0);
diff --git a/interdiff.c b/interdiff.c
deleted file mode 100644
index c81d680..0000000
--- a/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/interdiff.h b/interdiff.h
deleted file mode 100644
index 01c730a..0000000
--- a/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/line-log.c b/line-log.c
index 9010e00..51d9331 100644
--- a/line-log.c
+++ b/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)
{
@@ -295,7 +296,7 @@
return;
}
- p = xcalloc(1, sizeof(struct line_log_data));
+ CALLOC_ARRAY(p, 1);
p->path = path;
range_set_append(&p->ranges, begin, end);
if (ip) {
@@ -480,7 +481,7 @@
if (obj->flags & UNINTERESTING)
continue;
obj = deref_tag(revs->repo, obj, NULL, 0);
- if (obj->type != OBJ_COMMIT)
+ if (!obj || obj->type != OBJ_COMMIT)
die("Non commit %s?", revs->pending.objects[i].name);
if (commit)
die("More than one commit to dig from: %s and %s?",
@@ -519,7 +520,7 @@
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);
@@ -757,12 +758,12 @@
struct line_log_data *range)
{
struct line_log_data *r;
- struct argv_array array = ARGV_ARRAY_INIT;
+ struct strvec array = STRVEC_INIT;
const char **paths;
for (r = range; r; r = r->next)
- argv_array_push(&array, r->path);
- paths = argv_array_detach(&array);
+ strvec_push(&array, r->path);
+ paths = strvec_detach(&array);
parse_pathspec(pathspec, 0, PATHSPEC_PREFER_FULL, "", paths);
/* strings are now owned by pathspec */
@@ -1045,12 +1046,12 @@
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 {
@@ -1146,6 +1147,37 @@
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)
{
@@ -1159,6 +1191,7 @@
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);
@@ -1227,13 +1260,17 @@
/* 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);
@@ -1270,7 +1307,7 @@
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/line-log.h b/line-log.h
index 8ee7a2b..82ae8d9 100644
--- a/line-log.h
+++ b/line-log.h
@@ -46,10 +46,7 @@
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 @@
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/line-range.c b/line-range.c
index 9b50583..955a8a9 100644
--- a/line-range.c
+++ b/line-range.c
@@ -202,7 +202,7 @@
drv = userdiff_find_by_path(istate, path);
if (drv && drv->funcname.pattern) {
const struct userdiff_funcname *pe = &drv->funcname;
- xecfg = xcalloc(1, sizeof(*xecfg));
+ CALLOC_ARRAY(xecfg, 1);
xdiff_set_find_func(xecfg, pe->pattern, pe->cflags);
}
diff --git a/list-objects-filter-options.c b/list-objects-filter-options.c
index 256bcfb..d2d1c81 100644
--- a/list-objects-filter-options.c
+++ b/list-objects-filter-options.c
@@ -2,7 +2,7 @@
#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"
@@ -15,6 +15,29 @@
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_config_name: invalid argument '%d'", c);
+}
+
/*
* Parse value of the argument to the "filter" keyword.
* On the command line this looks like:
@@ -321,12 +344,21 @@
const char *remote,
struct list_objects_filter_options *filter_options)
{
+ struct promisor_remote *promisor_remote;
char *cfg_name;
char *filter_name;
/* Check if it is already registered */
- if (!promisor_remote_find(remote)) {
- git_config_set("core.repositoryformatversion", "1");
+ 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"));
/* Add promisor config for the remote */
cfg_name = xstrfmt("remote.%s.promisor", remote);
diff --git a/list-objects-filter-options.h b/list-objects-filter-options.h
index 2ffb392..01767c3 100644
--- a/list-objects-filter-options.h
+++ b/list-objects-filter-options.h
@@ -17,6 +17,12 @@
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
@@ -82,9 +88,9 @@
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
diff --git a/list-objects-filter.c b/list-objects-filter.c
index 1e8d4e7..39e2f15 100644
--- a/list-objects-filter.c
+++ b/list-objects-filter.c
@@ -21,7 +21,7 @@
* in the traversal (until we mark it SEEN). This is a way to
* let us silently de-dup calls to show() in the caller. This
* is subtly different from the "revision.h:SHOWN" and the
- * "sha1-name.c:ONELINE_SEEN" bits. And also different from
+ * "object-name.c:ONELINE_SEEN" bits. And also different from
* the non-de-dup usage in pack-bitmap.c
*/
#define FILTER_SHOWN_BUT_REVISIT (1<<21)
@@ -186,7 +186,7 @@
seen_info = oidmap_get(
&filter_data->seen_at_depth, &obj->oid);
if (!seen_info) {
- seen_info = xcalloc(1, sizeof(*seen_info));
+ CALLOC_ARRAY(seen_info, 1);
oidcpy(&seen_info->base.oid, &obj->oid);
seen_info->depth = filter_data->current_depth;
oidmap_put(&filter_data->seen_at_depth, seen_info);
@@ -626,7 +626,7 @@
size_t sub;
d->nr = filter_options->sub_nr;
- d->sub = xcalloc(d->nr, sizeof(*d->sub));
+ CALLOC_ARRAY(d->sub, d->nr);
for (sub = 0; sub < d->nr; sub++)
d->sub[sub].filter = list_objects_filter__init(
filter->omits ? &d->sub[sub].omits : NULL,
@@ -663,6 +663,9 @@
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);
@@ -671,7 +674,7 @@
if (!init_fn)
return NULL;
- filter = xcalloc(1, sizeof(*filter));
+ CALLOC_ARRAY(filter, 1);
filter->omits = omitted;
init_fn(filter_options, filter);
return filter;
diff --git a/ll-merge.c b/ll-merge.c
index d65a897..9a8a2c3 100644
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -247,7 +247,7 @@
{
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);
@@ -268,7 +268,7 @@
if (!strncmp(fn->name, name, namelen) && !fn->name[namelen])
break;
if (!fn) {
- fn = xcalloc(1, sizeof(struct ll_merge_driver));
+ CALLOC_ARRAY(fn, 1);
fn->name = xmemdupz(name, namelen);
fn->fn = ll_ext_merge;
*ll_user_merge_tail = fn;
diff --git a/lockfile.c b/lockfile.c
index 8e8ab4f..cc9a4b8 100644
--- a/lockfile.c
+++ b/lockfile.c
@@ -70,7 +70,8 @@
}
/* 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 @@
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 @@
* 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 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 @@
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 @@
}
/* 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/lockfile.h b/lockfile.h
index 9843053..db93e6b 100644
--- a/lockfile.h
+++ b/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 @@
* 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 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)
+{
+ 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 @@
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/log-tree.c b/log-tree.c
index 5212742..4531ceb 100644
--- a/log-tree.c
+++ b/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" };
@@ -81,6 +80,56 @@
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)
{
@@ -88,9 +137,7 @@
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)) {
@@ -155,6 +202,9 @@
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;
@@ -317,7 +367,7 @@
const char *suffix = info->patch_suffix;
int nr = info->nr;
int start_len = filename->len;
- int max_len = start_len + FORMAT_PATCH_NAME_MAX - (strlen(suffix) + 1);
+ int max_len = start_len + info->patch_name_max - (strlen(suffix) + 1);
if (0 < info->reroll_count)
strbuf_addf(filename, "v%d-", info->reroll_count);
@@ -449,22 +499,21 @@
{
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)
+ if (parse_signed_commit(commit, &payload, &signature, the_hash_algo) <= 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);
}
@@ -497,8 +546,10 @@
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;
+ struct strbuf payload = STRBUF_INIT;
+ struct strbuf signature = STRBUF_INIT;
hash_object_file(the_hash_algo, extra->value, extra->len,
type_name(OBJ_TAG), &oid);
@@ -520,24 +571,24 @@
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) {
+ if (parse_signature(extra->value, extra->len, &payload, &signature)) {
/* 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(payload.buf, payload.len,
+ signature.buf, signature.len, &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 */
}
show_sig_lines(opt, status, verify_message.buf);
strbuf_release(&verify_message);
+ strbuf_release(&payload);
+ strbuf_release(&signature);
return 0;
}
@@ -693,6 +744,7 @@
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 +800,8 @@
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));
}
@@ -756,6 +809,11 @@
if (cmit_fmt_is_mail(ctx.fmt) && opt->rdiff1) {
struct diff_queue_struct dq;
struct diff_options opts;
+ struct range_diff_options range_diff_opts = {
+ .creation_factor = opt->creation_factor,
+ .dual_color = 1,
+ .diffopt = &opts
+ };
memcpy(&dq, &diff_queued_diff, sizeof(diff_queued_diff));
DIFF_QUEUE_CLEAR(&diff_queued_diff);
@@ -770,8 +828,7 @@
opts.file = opt->diffopt.file;
opts.use_color = opt->diffopt.use_color;
diff_setup_done(&opts);
- show_range_diff(opt->rdiff1, opt->rdiff2,
- opt->creation_factor, 1, &opts, NULL);
+ show_range_diff(opt->rdiff1, opt->rdiff2, &range_diff_opts);
memcpy(&diff_queued_diff, &dq, sizeof(diff_queued_diff));
}
@@ -833,7 +890,7 @@
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;
}
@@ -847,15 +904,21 @@
int showed_log;
struct commit_list *parents;
struct object_id *oid;
+ int is_merge;
+ int all_need_diff = opt->diff || opt->diffopt.flags.exit_with_status;
- if (!opt->diff && !opt->diffopt.flags.exit_with_status)
+ if (!all_need_diff && !opt->merges_need_diff)
return 0;
parse_commit_or_die(commit);
oid = get_commit_tree_oid(commit);
- /* Root commit? */
parents = get_saved_parents(opt, commit);
+ is_merge = parents && parents->next;
+ if (!is_merge && !all_need_diff)
+ return 0;
+
+ /* Root commit? */
if (!parents) {
if (opt->show_root_diff) {
diff_root_tree_oid(oid, "", &opt->diffopt);
@@ -864,27 +927,16 @@
return !opt->loginfo;
}
- /* More than one parent? */
- if (parents && parents->next) {
- if (opt->ignore_merges)
- return 0;
- else if (opt->combine_merges)
+ if (is_merge) {
+ 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;
- }
-
- /* If we show individual diffs, show the parent info */
- log->parent = parents->item;
+ if (opt->separate_merges) {
+ if (!opt->first_parent_merges) {
+ /* Show parent info for multiple diffs */
+ log->parent = parents->item;
+ }
+ } else
+ return 0;
}
showed_log = 0;
@@ -900,7 +952,7 @@
/* Set up the log info for the next parent, if any.. */
parents = parents->next;
- if (!parents)
+ if (!parents || opt->first_parent_merges)
break;
log->parent = parents->item;
opt->loginfo = log;
@@ -911,12 +963,14 @@
int log_tree_commit(struct rev_info *opt, struct commit *commit)
{
struct log_info log;
- int shown, close_file = opt->diffopt.close_file;
+ int shown;
+ /* maybe called by e.g. cmd_log_walk(), maybe stand-alone */
+ int no_free = opt->diffopt.no_free;
log.commit = commit;
log.parent = NULL;
opt->loginfo = &log;
- opt->diffopt.close_file = 0;
+ opt->diffopt.no_free = 1;
if (opt->line_level_traverse)
return line_log_print(opt, commit);
@@ -933,7 +987,7 @@
fprintf(opt->diffopt.file, "\n%s\n", opt->break_bar);
opt->loginfo = NULL;
maybe_flush_or_die(opt->diffopt.file, "stdout");
- if (close_file)
- fclose(opt->diffopt.file);
+ opt->diffopt.no_free = no_free;
+ diff_free(&opt->diffopt);
return shown;
}
diff --git a/log-tree.h b/log-tree.h
index e668628..1e8c91d 100644
--- a/log-tree.h
+++ b/log-tree.h
@@ -8,7 +8,9 @@
};
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);
@@ -31,7 +33,6 @@
int maybe_multipart);
void load_ref_decorations(struct decoration_filter *filter, int flags);
-#define FORMAT_PATCH_NAME_MAX 64
void fmt_output_commit(struct strbuf *, struct commit *, struct rev_info *);
void fmt_output_subject(struct strbuf *, const char *subject, struct rev_info *);
void fmt_output_email_subject(struct strbuf *, struct rev_info *);
diff --git a/ls-refs.c b/ls-refs.c
index 818aef7..88f6c3f 100644
--- a/ls-refs.c
+++ b/ls-refs.c
@@ -2,24 +2,57 @@
#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"
+static int config_read;
+static int advertise_unborn;
+static int allow_unborn;
+
+static void ensure_config_read(void)
+{
+ const char *str = NULL;
+
+ if (config_read)
+ return;
+
+ if (repo_config_get_string_tmp(the_repository, "lsrefs.unborn", &str)) {
+ /*
+ * If there is no such config, advertise and allow it by
+ * default.
+ */
+ advertise_unborn = 1;
+ allow_unborn = 1;
+ } else {
+ if (!strcmp(str, "advertise")) {
+ advertise_unborn = 1;
+ allow_unborn = 1;
+ } else if (!strcmp(str, "allow")) {
+ allow_unborn = 1;
+ } else if (!strcmp(str, "ignore")) {
+ /* do nothing */
+ } else {
+ die(_("invalid value '%s' for lsrefs.unborn"), str);
+ }
+ }
+ config_read = 1;
+}
+
/*
* 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 +64,8 @@
struct ls_refs_data {
unsigned peel;
unsigned symrefs;
- struct argv_array prefixes;
+ struct strvec prefixes;
+ unsigned unborn : 1;
};
static int send_ref(const char *refname, const struct object_id *oid,
@@ -47,7 +81,10 @@
if (!ref_match(&data->prefixes, refname_nons))
return 0;
- strbuf_addf(&refline, "%s %s", oid_to_hex(oid), refname_nons);
+ if (oid)
+ strbuf_addf(&refline, "%s %s", oid_to_hex(oid), refname_nons);
+ else
+ strbuf_addf(&refline, "unborn %s", refname_nons);
if (data->symrefs && flag & REF_ISSYMREF) {
struct object_id unused;
const char *symref_target = resolve_ref_unsafe(refname, 0,
@@ -61,9 +98,9 @@
strip_namespace(symref_target));
}
- if (data->peel) {
+ if (data->peel && oid) {
struct object_id peeled;
- if (!peel_ref(refname, &peeled))
+ if (!peel_iterated_oid(oid, &peeled))
strbuf_addf(&refline, " peeled:%s", oid_to_hex(&peeled));
}
@@ -74,6 +111,23 @@
return 0;
}
+static void send_possibly_unborn_head(struct ls_refs_data *data)
+{
+ struct strbuf namespaced = STRBUF_INIT;
+ struct object_id oid;
+ int flag;
+ int oid_is_null;
+
+ strbuf_addf(&namespaced, "%sHEAD", get_git_namespace());
+ if (!resolve_ref_unsafe(namespaced.buf, 0, &oid, &flag))
+ return; /* bad ref */
+ oid_is_null = is_null_oid(&oid);
+ if (!oid_is_null ||
+ (data->unborn && data->symrefs && (flag & REF_ISSYMREF)))
+ send_ref(namespaced.buf, oid_is_null ? NULL : &oid, flag, data);
+ strbuf_release(&namespaced);
+}
+
static int ls_refs_config(const char *var, const char *value, void *data)
{
/*
@@ -84,16 +138,18 @@
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;
memset(&data, 0, sizeof(data));
+ strvec_init(&data.prefixes);
+ ensure_config_read();
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 +158,31 @@
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);
+ else if (!strcmp("unborn", arg))
+ data.unborn = allow_unborn;
}
- head_ref_namespaced(send_ref, &data);
- for_each_namespaced_ref(send_ref, &data);
+ if (request->status != PACKET_READ_FLUSH)
+ die(_("expected flush after ls-refs arguments"));
+
+ send_possibly_unborn_head(&data);
+ if (!data.prefixes.nr)
+ strvec_push(&data.prefixes, "");
+ for_each_fullref_in_prefixes(get_git_namespace(), data.prefixes.v,
+ send_ref, &data, 0);
packet_flush(1);
- argv_array_clear(&data.prefixes);
+ strvec_clear(&data.prefixes);
return 0;
}
+
+int ls_refs_advertise(struct repository *r, struct strbuf *value)
+{
+ if (value) {
+ ensure_config_read();
+ if (advertise_unborn)
+ strbuf_addstr(value, "unborn");
+ }
+
+ return 1;
+}
diff --git a/ls-refs.h b/ls-refs.h
index 7e5646f..a99e4be 100644
--- a/ls-refs.h
+++ b/ls-refs.h
@@ -2,9 +2,10 @@
#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);
+int ls_refs_advertise(struct repository *r, struct strbuf *value);
#endif /* LS_REFS_H */
diff --git a/mailinfo.c b/mailinfo.c
index 742fa37..5681d91 100644
--- a/mailinfo.c
+++ b/mailinfo.c
@@ -447,19 +447,21 @@
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;
}
@@ -1136,6 +1138,11 @@
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/mailmap.c b/mailmap.c
index 962fd86..183a2f6 100644
--- a/mailmap.c
+++ b/mailmap.c
@@ -83,7 +83,7 @@
if (item->util) {
me = (struct mailmap_entry *)item->util;
} else {
- me = xcalloc(1, sizeof(struct mailmap_entry));
+ CALLOC_ARRAY(me, 1);
me->namemap.strdup_strings = 1;
me->namemap.cmp = namemap_cmp;
item->util = me;
@@ -143,31 +143,13 @@
return (*right == '\0' ? NULL : right);
}
-static void read_mailmap_line(struct string_list *map, char *buffer,
- char **repo_abbrev)
+static void read_mailmap_line(struct string_list *map, char *buffer)
{
char *name1 = NULL, *email1 = NULL, *name2 = NULL, *email2 = NULL;
- if (buffer[0] == '#') {
- static const char abbrev[] = "# repo-abbrev:";
- int abblen = sizeof(abbrev) - 1;
- int len = strlen(buffer);
- if (!repo_abbrev)
- return;
-
- if (len && buffer[len - 1] == '\n')
- buffer[--len] = 0;
- if (!strncmp(buffer, abbrev, abblen)) {
- char *cp;
-
- free(*repo_abbrev);
-
- for (cp = buffer + abblen; isspace(*cp); cp++)
- ; /* nothing */
- *repo_abbrev = xstrdup(cp);
- }
+ if (buffer[0] == '#')
return;
- }
+
if ((name2 = parse_name_and_email(buffer, &name1, &email1, 0)) != NULL)
parse_name_and_email(name2, &name2, &email2, 1);
@@ -175,8 +157,7 @@
add_mapping(map, name1, email1, name2, email2);
}
-static int read_mailmap_file(struct string_list *map, const char *filename,
- char **repo_abbrev)
+static int read_mailmap_file(struct string_list *map, const char *filename)
{
char buffer[1024];
FILE *f;
@@ -192,13 +173,12 @@
}
while (fgets(buffer, sizeof(buffer), f) != NULL)
- read_mailmap_line(map, buffer, repo_abbrev);
+ read_mailmap_line(map, buffer);
fclose(f);
return 0;
}
-static void read_mailmap_string(struct string_list *map, char *buf,
- char **repo_abbrev)
+static void read_mailmap_string(struct string_list *map, char *buf)
{
while (*buf) {
char *end = strchrnul(buf, '\n');
@@ -206,14 +186,12 @@
if (*end)
*end++ = '\0';
- read_mailmap_line(map, buf, repo_abbrev);
+ read_mailmap_line(map, buf);
buf = end;
}
}
-static int read_mailmap_blob(struct string_list *map,
- const char *name,
- char **repo_abbrev)
+static int read_mailmap_blob(struct string_list *map, const char *name)
{
struct object_id oid;
char *buf;
@@ -231,13 +209,13 @@
if (type != OBJ_BLOB)
return error("mailmap is not a blob: %s", name);
- read_mailmap_string(map, buf, repo_abbrev);
+ read_mailmap_string(map, buf);
free(buf);
return 0;
}
-int read_mailmap(struct string_list *map, char **repo_abbrev)
+int read_mailmap(struct string_list *map)
{
int err = 0;
@@ -247,10 +225,11 @@
if (!git_mailmap_blob && is_bare_repository())
git_mailmap_blob = "HEAD:.mailmap";
- err |= read_mailmap_file(map, ".mailmap", repo_abbrev);
+ if (!startup_info->have_repository || !is_bare_repository())
+ err |= read_mailmap_file(map, ".mailmap");
if (startup_info->have_repository)
- err |= read_mailmap_blob(map, git_mailmap_blob, repo_abbrev);
- err |= read_mailmap_file(map, git_mailmap_file, repo_abbrev);
+ err |= read_mailmap_blob(map, git_mailmap_blob);
+ err |= read_mailmap_file(map, git_mailmap_file);
return err;
}
diff --git a/mailmap.h b/mailmap.h
index d0e6564..7e99fcc 100644
--- a/mailmap.h
+++ b/mailmap.h
@@ -3,7 +3,7 @@
struct string_list;
-int read_mailmap(struct string_list *map, char **repo_abbrev);
+int read_mailmap(struct string_list *map);
void clear_mailmap(struct string_list *map);
int map_user(struct string_list *map,
diff --git a/mem-pool.c b/mem-pool.c
index a2841a4..ccdcad2 100644
--- a/mem-pool.c
+++ b/mem-pool.c
@@ -5,18 +5,20 @@
#include "cache.h"
#include "mem-pool.h"
-#define BLOCK_GROWTH_SIZE 1024*1024 - sizeof(struct mp_block);
+#define BLOCK_GROWTH_SIZE (1024 * 1024 - sizeof(struct mp_block))
/*
* Allocate a new mp_block and insert it after the block specified in
* `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 @@
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 @@
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 @@
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 @@
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/mem-pool.h b/mem-pool.h
index 999d3c3..fe7507f 100644
--- a/mem-pool.h
+++ b/mem-pool.h
@@ -24,12 +24,12 @@
/*
* 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_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 @@
* 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/merge-ort-wrappers.c b/merge-ort-wrappers.c
new file mode 100644
index 0000000..7eec25f
--- /dev/null
+++ b/merge-ort-wrappers.c
@@ -0,0 +1,62 @@
+#include "cache.h"
+#include "merge-ort.h"
+#include "merge-ort-wrappers.h"
+
+#include "commit.h"
+
+static int unclean(struct merge_options *opt, struct tree *head)
+{
+ /* Sanity check on repo state; index must match head */
+ struct strbuf sb = STRBUF_INIT;
+
+ if (head && repo_index_has_changes(opt->repo, head, &sb)) {
+ fprintf(stderr, _("Your local changes to the following files would be overwritten by merge:\n %s"),
+ sb.buf);
+ strbuf_release(&sb);
+ return -1;
+ }
+
+ return 0;
+}
+
+int merge_ort_nonrecursive(struct merge_options *opt,
+ struct tree *head,
+ struct tree *merge,
+ struct tree *merge_base)
+{
+ struct merge_result result;
+
+ if (unclean(opt, head))
+ return -1;
+
+ if (oideq(&merge_base->object.oid, &merge->object.oid)) {
+ printf(_("Already up to date!"));
+ return 1;
+ }
+
+ memset(&result, 0, sizeof(result));
+ merge_incore_nonrecursive(opt, merge_base, head, merge, &result);
+ merge_switch_to_result(opt, head, &result, 1, 1);
+
+ return result.clean;
+}
+
+int merge_ort_recursive(struct merge_options *opt,
+ struct commit *side1,
+ struct commit *side2,
+ struct commit_list *merge_bases,
+ struct commit **result)
+{
+ struct tree *head = repo_get_commit_tree(opt->repo, side1);
+ struct merge_result tmp;
+
+ if (unclean(opt, head))
+ return -1;
+
+ memset(&tmp, 0, sizeof(tmp));
+ merge_incore_recursive(opt, merge_bases, side1, side2, &tmp);
+ merge_switch_to_result(opt, head, &tmp, 1, 1);
+ *result = NULL;
+
+ return tmp.clean;
+}
diff --git a/merge-ort-wrappers.h b/merge-ort-wrappers.h
new file mode 100644
index 0000000..0c4c57a
--- /dev/null
+++ b/merge-ort-wrappers.h
@@ -0,0 +1,25 @@
+#ifndef MERGE_ORT_WRAPPERS_H
+#define MERGE_ORT_WRAPPERS_H
+
+#include "merge-recursive.h"
+
+/*
+ * rename-detecting three-way merge, no recursion.
+ * Wrapper mimicking the old merge_trees() function.
+ */
+int merge_ort_nonrecursive(struct merge_options *opt,
+ struct tree *head,
+ struct tree *merge,
+ struct tree *common);
+
+/*
+ * rename-detecting three-way merge with recursive ancestor consolidation.
+ * Wrapper mimicking the old merge_recursive() function.
+ */
+int merge_ort_recursive(struct merge_options *opt,
+ struct commit *h1,
+ struct commit *h2,
+ struct commit_list *ancestors,
+ struct commit **result);
+
+#endif
diff --git a/merge-ort.c b/merge-ort.c
new file mode 100644
index 0000000..92dea35
--- /dev/null
+++ b/merge-ort.c
@@ -0,0 +1,3550 @@
+/*
+ * "Ostensibly Recursive's Twin" merge strategy, or "ort" for short. Meant
+ * as a drop-in replacement for the "recursive" merge strategy, allowing one
+ * to replace
+ *
+ * git merge [-s recursive]
+ *
+ * with
+ *
+ * git merge -s ort
+ *
+ * Note: git's parser allows the space between '-s' and its argument to be
+ * missing. (Should I have backronymed "ham", "alsa", "kip", "nap, "alvo",
+ * "cale", "peedy", or "ins" instead of "ort"?)
+ */
+
+#include "cache.h"
+#include "merge-ort.h"
+
+#include "alloc.h"
+#include "blob.h"
+#include "cache-tree.h"
+#include "commit.h"
+#include "commit-reach.h"
+#include "diff.h"
+#include "diffcore.h"
+#include "dir.h"
+#include "ll-merge.h"
+#include "object-store.h"
+#include "revision.h"
+#include "strmap.h"
+#include "submodule.h"
+#include "tree.h"
+#include "unpack-trees.h"
+#include "xdiff-interface.h"
+
+/*
+ * We have many arrays of size 3. Whenever we have such an array, the
+ * indices refer to one of the sides of the three-way merge. This is so
+ * pervasive that the constants 0, 1, and 2 are used in many places in the
+ * code (especially in arithmetic operations to find the other side's index
+ * or to compute a relevant mask), but sometimes these enum names are used
+ * to aid code clarity.
+ *
+ * See also 'filemask' and 'dirmask' in struct conflict_info; the "ith side"
+ * referred to there is one of these three sides.
+ */
+enum merge_side {
+ MERGE_BASE = 0,
+ MERGE_SIDE1 = 1,
+ MERGE_SIDE2 = 2
+};
+
+struct rename_info {
+ /*
+ * All variables that are arrays of size 3 correspond to data tracked
+ * for the sides in enum merge_side. Index 0 is almost always unused
+ * because we often only need to track information for MERGE_SIDE1 and
+ * MERGE_SIDE2 (MERGE_BASE can't have rename information since renames
+ * are determined relative to what changed since the MERGE_BASE).
+ */
+
+ /*
+ * pairs: pairing of filenames from diffcore_rename()
+ */
+ struct diff_queue_struct pairs[3];
+
+ /*
+ * dirs_removed: directories removed on a given side of history.
+ */
+ struct strset dirs_removed[3];
+
+ /*
+ * dir_rename_count: tracking where parts of a directory were renamed to
+ *
+ * When files in a directory are renamed, they may not all go to the
+ * same location. Each strmap here tracks:
+ * old_dir => {new_dir => int}
+ * That is, dir_rename_count[side] is a strmap to a strintmap.
+ */
+ struct strmap dir_rename_count[3];
+
+ /*
+ * dir_renames: computed directory renames
+ *
+ * This is a map of old_dir => new_dir and is derived in part from
+ * dir_rename_count.
+ */
+ struct strmap dir_renames[3];
+
+ /*
+ * needed_limit: value needed for inexact rename detection to run
+ *
+ * If the current rename limit wasn't high enough for inexact
+ * rename detection to run, this records the limit needed. Otherwise,
+ * this value remains 0.
+ */
+ int needed_limit;
+};
+
+struct merge_options_internal {
+ /*
+ * paths: primary data structure in all of merge ort.
+ *
+ * The keys of paths:
+ * * are full relative paths from the toplevel of the repository
+ * (e.g. "drivers/firmware/raspberrypi.c").
+ * * store all relevant paths in the repo, both directories and
+ * files (e.g. drivers, drivers/firmware would also be included)
+ * * these keys serve to intern all the path strings, which allows
+ * us to do pointer comparison on directory names instead of
+ * strcmp; we just have to be careful to use the interned strings.
+ * (Technically paths_to_free may track some strings that were
+ * removed from froms paths.)
+ *
+ * The values of paths:
+ * * either a pointer to a merged_info, or a conflict_info struct
+ * * merged_info contains all relevant information for a
+ * non-conflicted entry.
+ * * conflict_info contains a merged_info, plus any additional
+ * information about a conflict such as the higher orders stages
+ * involved and the names of the paths those came from (handy
+ * once renames get involved).
+ * * a path may start "conflicted" (i.e. point to a conflict_info)
+ * and then a later step (e.g. three-way content merge) determines
+ * it can be cleanly merged, at which point it'll be marked clean
+ * and the algorithm will ignore any data outside the contained
+ * merged_info for that entry
+ * * If an entry remains conflicted, the merged_info portion of a
+ * conflict_info will later be filled with whatever version of
+ * the file should be placed in the working directory (e.g. an
+ * as-merged-as-possible variation that contains conflict markers).
+ */
+ struct strmap paths;
+
+ /*
+ * conflicted: a subset of keys->values from "paths"
+ *
+ * conflicted is basically an optimization between process_entries()
+ * and record_conflicted_index_entries(); the latter could loop over
+ * ALL the entries in paths AGAIN and look for the ones that are
+ * still conflicted, but since process_entries() has to loop over
+ * all of them, it saves the ones it couldn't resolve in this strmap
+ * so that record_conflicted_index_entries() can iterate just the
+ * relevant entries.
+ */
+ struct strmap conflicted;
+
+ /*
+ * paths_to_free: additional list of strings to free
+ *
+ * If keys are removed from "paths", they are added to paths_to_free
+ * to ensure they are later freed. We avoid free'ing immediately since
+ * other places (e.g. conflict_info.pathnames[]) may still be
+ * referencing these paths.
+ */
+ struct string_list paths_to_free;
+
+ /*
+ * output: special messages and conflict notices for various paths
+ *
+ * This is a map of pathnames (a subset of the keys in "paths" above)
+ * to strbufs. It gathers various warning/conflict/notice messages
+ * for later processing.
+ */
+ struct strmap output;
+
+ /*
+ * renames: various data relating to rename detection
+ */
+ struct rename_info renames;
+
+ /*
+ * current_dir_name, toplevel_dir: temporary vars
+ *
+ * These are used in collect_merge_info_callback(), and will set the
+ * various merged_info.directory_name for the various paths we get;
+ * see documentation for that variable and the requirements placed on
+ * that field.
+ */
+ const char *current_dir_name;
+ const char *toplevel_dir;
+
+ /* call_depth: recursion level counter for merging merge bases */
+ int call_depth;
+};
+
+struct version_info {
+ struct object_id oid;
+ unsigned short mode;
+};
+
+struct merged_info {
+ /* if is_null, ignore result. otherwise result has oid & mode */
+ struct version_info result;
+ unsigned is_null:1;
+
+ /*
+ * clean: whether the path in question is cleanly merged.
+ *
+ * see conflict_info.merged for more details.
+ */
+ unsigned clean:1;
+
+ /*
+ * basename_offset: offset of basename of path.
+ *
+ * perf optimization to avoid recomputing offset of final '/'
+ * character in pathname (0 if no '/' in pathname).
+ */
+ size_t basename_offset;
+
+ /*
+ * directory_name: containing directory name.
+ *
+ * Note that we assume directory_name is constructed such that
+ * strcmp(dir1_name, dir2_name) == 0 iff dir1_name == dir2_name,
+ * i.e. string equality is equivalent to pointer equality. For this
+ * to hold, we have to be careful setting directory_name.
+ */
+ const char *directory_name;
+};
+
+struct conflict_info {
+ /*
+ * merged: the version of the path that will be written to working tree
+ *
+ * WARNING: It is critical to check merged.clean and ensure it is 0
+ * before reading any conflict_info fields outside of merged.
+ * Allocated merge_info structs will always have clean set to 1.
+ * Allocated conflict_info structs will have merged.clean set to 0
+ * initially. The merged.clean field is how we know if it is safe
+ * to access other parts of conflict_info besides merged; if a
+ * conflict_info's merged.clean is changed to 1, the rest of the
+ * algorithm is not allowed to look at anything outside of the
+ * merged member anymore.
+ */
+ struct merged_info merged;
+
+ /* oids & modes from each of the three trees for this path */
+ struct version_info stages[3];
+
+ /* pathnames for each stage; may differ due to rename detection */
+ const char *pathnames[3];
+
+ /* Whether this path is/was involved in a directory/file conflict */
+ unsigned df_conflict:1;
+
+ /*
+ * Whether this path is/was involved in a non-content conflict other
+ * than a directory/file conflict (e.g. rename/rename, rename/delete,
+ * file location based on possible directory rename).
+ */
+ unsigned path_conflict:1;
+
+ /*
+ * For filemask and dirmask, the ith bit corresponds to whether the
+ * ith entry is a file (filemask) or a directory (dirmask). Thus,
+ * filemask & dirmask is always zero, and filemask | dirmask is at
+ * most 7 but can be less when a path does not appear as either a
+ * file or a directory on at least one side of history.
+ *
+ * Note that these masks are related to enum merge_side, as the ith
+ * entry corresponds to side i.
+ *
+ * These values come from a traverse_trees() call; more info may be
+ * found looking at tree-walk.h's struct traverse_info,
+ * particularly the documentation above the "fn" member (note that
+ * filemask = mask & ~dirmask from that documentation).
+ */
+ unsigned filemask:3;
+ unsigned dirmask:3;
+
+ /*
+ * Optimization to track which stages match, to avoid the need to
+ * recompute it in multiple steps. Either 0 or at least 2 bits are
+ * set; if at least 2 bits are set, their corresponding stages match.
+ */
+ unsigned match_mask:3;
+};
+
+/*** Function Grouping: various utility functions ***/
+
+/*
+ * For the next three macros, see warning for conflict_info.merged.
+ *
+ * In each of the below, mi is a struct merged_info*, and ci was defined
+ * as a struct conflict_info* (but we need to verify ci isn't actually
+ * pointed at a struct merged_info*).
+ *
+ * INITIALIZE_CI: Assign ci to mi but only if it's safe; set to NULL otherwise.
+ * VERIFY_CI: Ensure that something we assigned to a conflict_info* is one.
+ * ASSIGN_AND_VERIFY_CI: Similar to VERIFY_CI but do assignment first.
+ */
+#define INITIALIZE_CI(ci, mi) do { \
+ (ci) = (!(mi) || (mi)->clean) ? NULL : (struct conflict_info *)(mi); \
+} while (0)
+#define VERIFY_CI(ci) assert(ci && !ci->merged.clean);
+#define ASSIGN_AND_VERIFY_CI(ci, mi) do { \
+ (ci) = (struct conflict_info *)(mi); \
+ assert((ci) && !(mi)->clean); \
+} while (0)
+
+static void free_strmap_strings(struct strmap *map)
+{
+ struct hashmap_iter iter;
+ struct strmap_entry *entry;
+
+ strmap_for_each_entry(map, &iter, entry) {
+ free((char*)entry->key);
+ }
+}
+
+static void clear_or_reinit_internal_opts(struct merge_options_internal *opti,
+ int reinitialize)
+{
+ struct rename_info *renames = &opti->renames;
+ int i;
+ void (*strmap_func)(struct strmap *, int) =
+ reinitialize ? strmap_partial_clear : strmap_clear;
+ void (*strset_func)(struct strset *) =
+ reinitialize ? strset_partial_clear : strset_clear;
+
+ /*
+ * We marked opti->paths with strdup_strings = 0, so that we
+ * wouldn't have to make another copy of the fullpath created by
+ * make_traverse_path from setup_path_info(). But, now that we've
+ * used it and have no other references to these strings, it is time
+ * to deallocate them.
+ */
+ free_strmap_strings(&opti->paths);
+ strmap_func(&opti->paths, 1);
+
+ /*
+ * All keys and values in opti->conflicted are a subset of those in
+ * opti->paths. We don't want to deallocate anything twice, so we
+ * don't free the keys and we pass 0 for free_values.
+ */
+ strmap_func(&opti->conflicted, 0);
+
+ /*
+ * opti->paths_to_free is similar to opti->paths; we created it with
+ * strdup_strings = 0 to avoid making _another_ copy of the fullpath
+ * but now that we've used it and have no other references to these
+ * strings, it is time to deallocate them. We do so by temporarily
+ * setting strdup_strings to 1.
+ */
+ opti->paths_to_free.strdup_strings = 1;
+ string_list_clear(&opti->paths_to_free, 0);
+ opti->paths_to_free.strdup_strings = 0;
+
+ /* Free memory used by various renames maps */
+ for (i = MERGE_SIDE1; i <= MERGE_SIDE2; ++i) {
+ struct hashmap_iter iter;
+ struct strmap_entry *entry;
+
+ strset_func(&renames->dirs_removed[i]);
+
+ strmap_for_each_entry(&renames->dir_rename_count[i],
+ &iter, entry) {
+ struct strintmap *counts = entry->value;
+ strintmap_clear(counts);
+ }
+ strmap_func(&renames->dir_rename_count[i], 1);
+
+ strmap_func(&renames->dir_renames[i], 0);
+ }
+
+ if (!reinitialize) {
+ struct hashmap_iter iter;
+ struct strmap_entry *e;
+
+ /* Release and free each strbuf found in output */
+ strmap_for_each_entry(&opti->output, &iter, e) {
+ struct strbuf *sb = e->value;
+ strbuf_release(sb);
+ /*
+ * While strictly speaking we don't need to free(sb)
+ * here because we could pass free_values=1 when
+ * calling strmap_clear() on opti->output, that would
+ * require strmap_clear to do another
+ * strmap_for_each_entry() loop, so we just free it
+ * while we're iterating anyway.
+ */
+ free(sb);
+ }
+ strmap_clear(&opti->output, 0);
+ }
+}
+
+static int err(struct merge_options *opt, const char *err, ...)
+{
+ va_list params;
+ struct strbuf sb = STRBUF_INIT;
+
+ strbuf_addstr(&sb, "error: ");
+ va_start(params, err);
+ strbuf_vaddf(&sb, err, params);
+ va_end(params);
+
+ error("%s", sb.buf);
+ strbuf_release(&sb);
+
+ return -1;
+}
+
+static void format_commit(struct strbuf *sb,
+ int indent,
+ struct commit *commit)
+{
+ struct merge_remote_desc *desc;
+ struct pretty_print_context ctx = {0};
+ ctx.abbrev = DEFAULT_ABBREV;
+
+ strbuf_addchars(sb, ' ', indent);
+ desc = merge_remote_util(commit);
+ if (desc) {
+ strbuf_addf(sb, "virtual %s\n", desc->name);
+ return;
+ }
+
+ format_commit_message(commit, "%h %s", sb, &ctx);
+ strbuf_addch(sb, '\n');
+}
+
+__attribute__((format (printf, 4, 5)))
+static void path_msg(struct merge_options *opt,
+ const char *path,
+ int omittable_hint, /* skippable under --remerge-diff */
+ const char *fmt, ...)
+{
+ va_list ap;
+ struct strbuf *sb = strmap_get(&opt->priv->output, path);
+ if (!sb) {
+ sb = xmalloc(sizeof(*sb));
+ strbuf_init(sb, 0);
+ strmap_put(&opt->priv->output, path, sb);
+ }
+
+ va_start(ap, fmt);
+ strbuf_vaddf(sb, fmt, ap);
+ va_end(ap);
+
+ strbuf_addch(sb, '\n');
+}
+
+/* add a string to a strbuf, but converting "/" to "_" */
+static void add_flattened_path(struct strbuf *out, const char *s)
+{
+ size_t i = out->len;
+ strbuf_addstr(out, s);
+ for (; i < out->len; i++)
+ if (out->buf[i] == '/')
+ out->buf[i] = '_';
+}
+
+static char *unique_path(struct strmap *existing_paths,
+ const char *path,
+ const char *branch)
+{
+ struct strbuf newpath = STRBUF_INIT;
+ int suffix = 0;
+ size_t base_len;
+
+ strbuf_addf(&newpath, "%s~", path);
+ add_flattened_path(&newpath, branch);
+
+ base_len = newpath.len;
+ while (strmap_contains(existing_paths, newpath.buf)) {
+ strbuf_setlen(&newpath, base_len);
+ strbuf_addf(&newpath, "_%d", suffix++);
+ }
+
+ return strbuf_detach(&newpath, NULL);
+}
+
+/*** Function Grouping: functions related to collect_merge_info() ***/
+
+static void setup_path_info(struct merge_options *opt,
+ struct string_list_item *result,
+ const char *current_dir_name,
+ int current_dir_name_len,
+ char *fullpath, /* we'll take over ownership */
+ struct name_entry *names,
+ struct name_entry *merged_version,
+ unsigned is_null, /* boolean */
+ unsigned df_conflict, /* boolean */
+ unsigned filemask,
+ unsigned dirmask,
+ int resolved /* boolean */)
+{
+ /* result->util is void*, so mi is a convenience typed variable */
+ struct merged_info *mi;
+
+ assert(!is_null || resolved);
+ assert(!df_conflict || !resolved); /* df_conflict implies !resolved */
+ assert(resolved == (merged_version != NULL));
+
+ mi = xcalloc(1, resolved ? sizeof(struct merged_info) :
+ sizeof(struct conflict_info));
+ mi->directory_name = current_dir_name;
+ mi->basename_offset = current_dir_name_len;
+ mi->clean = !!resolved;
+ if (resolved) {
+ mi->result.mode = merged_version->mode;
+ oidcpy(&mi->result.oid, &merged_version->oid);
+ mi->is_null = !!is_null;
+ } else {
+ int i;
+ struct conflict_info *ci;
+
+ ASSIGN_AND_VERIFY_CI(ci, mi);
+ for (i = MERGE_BASE; i <= MERGE_SIDE2; i++) {
+ ci->pathnames[i] = fullpath;
+ ci->stages[i].mode = names[i].mode;
+ oidcpy(&ci->stages[i].oid, &names[i].oid);
+ }
+ ci->filemask = filemask;
+ ci->dirmask = dirmask;
+ ci->df_conflict = !!df_conflict;
+ if (dirmask)
+ /*
+ * Assume is_null for now, but if we have entries
+ * under the directory then when it is complete in
+ * write_completed_directory() it'll update this.
+ * Also, for D/F conflicts, we have to handle the
+ * directory first, then clear this bit and process
+ * the file to see how it is handled -- that occurs
+ * near the top of process_entry().
+ */
+ mi->is_null = 1;
+ }
+ strmap_put(&opt->priv->paths, fullpath, mi);
+ result->string = fullpath;
+ result->util = mi;
+}
+
+static void add_pair(struct merge_options *opt,
+ struct name_entry *names,
+ const char *pathname,
+ unsigned side,
+ unsigned is_add /* if false, is_delete */)
+{
+ struct diff_filespec *one, *two;
+ struct rename_info *renames = &opt->priv->renames;
+ int names_idx = is_add ? side : 0;
+
+ one = alloc_filespec(pathname);
+ two = alloc_filespec(pathname);
+ fill_filespec(is_add ? two : one,
+ &names[names_idx].oid, 1, names[names_idx].mode);
+ diff_queue(&renames->pairs[side], one, two);
+}
+
+static void collect_rename_info(struct merge_options *opt,
+ struct name_entry *names,
+ const char *dirname,
+ const char *fullname,
+ unsigned filemask,
+ unsigned dirmask,
+ unsigned match_mask)
+{
+ struct rename_info *renames = &opt->priv->renames;
+ unsigned side;
+
+ /* Update dirs_removed, as needed */
+ if (dirmask == 1 || dirmask == 3 || dirmask == 5) {
+ /* absent_mask = 0x07 - dirmask; sides = absent_mask/2 */
+ unsigned sides = (0x07 - dirmask)/2;
+ if (sides & 1)
+ strset_add(&renames->dirs_removed[1], fullname);
+ if (sides & 2)
+ strset_add(&renames->dirs_removed[2], fullname);
+ }
+
+ if (filemask == 0 || filemask == 7)
+ return;
+
+ for (side = MERGE_SIDE1; side <= MERGE_SIDE2; ++side) {
+ unsigned side_mask = (1 << side);
+
+ /* Check for deletion on side */
+ if ((filemask & 1) && !(filemask & side_mask))
+ add_pair(opt, names, fullname, side, 0 /* delete */);
+
+ /* Check for addition on side */
+ if (!(filemask & 1) && (filemask & side_mask))
+ add_pair(opt, names, fullname, side, 1 /* add */);
+ }
+}
+
+static int collect_merge_info_callback(int n,
+ unsigned long mask,
+ unsigned long dirmask,
+ struct name_entry *names,
+ struct traverse_info *info)
+{
+ /*
+ * n is 3. Always.
+ * common ancestor (mbase) has mask 1, and stored in index 0 of names
+ * head of side 1 (side1) has mask 2, and stored in index 1 of names
+ * head of side 2 (side2) has mask 4, and stored in index 2 of names
+ */
+ struct merge_options *opt = info->data;
+ struct merge_options_internal *opti = opt->priv;
+ struct string_list_item pi; /* Path Info */
+ struct conflict_info *ci; /* typed alias to pi.util (which is void*) */
+ struct name_entry *p;
+ size_t len;
+ char *fullpath;
+ const char *dirname = opti->current_dir_name;
+ unsigned filemask = mask & ~dirmask;
+ unsigned match_mask = 0; /* will be updated below */
+ unsigned mbase_null = !(mask & 1);
+ unsigned side1_null = !(mask & 2);
+ unsigned side2_null = !(mask & 4);
+ unsigned side1_matches_mbase = (!side1_null && !mbase_null &&
+ names[0].mode == names[1].mode &&
+ oideq(&names[0].oid, &names[1].oid));
+ unsigned side2_matches_mbase = (!side2_null && !mbase_null &&
+ names[0].mode == names[2].mode &&
+ oideq(&names[0].oid, &names[2].oid));
+ unsigned sides_match = (!side1_null && !side2_null &&
+ names[1].mode == names[2].mode &&
+ oideq(&names[1].oid, &names[2].oid));
+
+ /*
+ * Note: When a path is a file on one side of history and a directory
+ * in another, we have a directory/file conflict. In such cases, if
+ * the conflict doesn't resolve from renames and deletions, then we
+ * always leave directories where they are and move files out of the
+ * way. Thus, while struct conflict_info has a df_conflict field to
+ * track such conflicts, we ignore that field for any directories at
+ * a path and only pay attention to it for files at the given path.
+ * The fact that we leave directories were they are also means that
+ * we do not need to worry about getting additional df_conflict
+ * information propagated from parent directories down to children
+ * (unlike, say traverse_trees_recursive() in unpack-trees.c, which
+ * sets a newinfo.df_conflicts field specifically to propagate it).
+ */
+ unsigned df_conflict = (filemask != 0) && (dirmask != 0);
+
+ /* n = 3 is a fundamental assumption. */
+ if (n != 3)
+ BUG("Called collect_merge_info_callback wrong");
+
+ /*
+ * A bunch of sanity checks verifying that traverse_trees() calls
+ * us the way I expect. Could just remove these at some point,
+ * though maybe they are helpful to future code readers.
+ */
+ assert(mbase_null == is_null_oid(&names[0].oid));
+ assert(side1_null == is_null_oid(&names[1].oid));
+ assert(side2_null == is_null_oid(&names[2].oid));
+ assert(!mbase_null || !side1_null || !side2_null);
+ assert(mask > 0 && mask < 8);
+
+ /* Determine match_mask */
+ if (side1_matches_mbase)
+ match_mask = (side2_matches_mbase ? 7 : 3);
+ else if (side2_matches_mbase)
+ match_mask = 5;
+ else if (sides_match)
+ match_mask = 6;
+
+ /*
+ * Get the name of the relevant filepath, which we'll pass to
+ * setup_path_info() for tracking.
+ */
+ p = names;
+ while (!p->mode)
+ p++;
+ len = traverse_path_len(info, p->pathlen);
+
+ /* +1 in both of the following lines to include the NUL byte */
+ fullpath = xmalloc(len + 1);
+ make_traverse_path(fullpath, len + 1, info, p->path, p->pathlen);
+
+ /*
+ * If mbase, side1, and side2 all match, we can resolve early. Even
+ * if these are trees, there will be no renames or anything
+ * underneath.
+ */
+ if (side1_matches_mbase && side2_matches_mbase) {
+ /* mbase, side1, & side2 all match; use mbase as resolution */
+ setup_path_info(opt, &pi, dirname, info->pathlen, fullpath,
+ names, names+0, mbase_null, 0,
+ filemask, dirmask, 1);
+ return mask;
+ }
+
+ /*
+ * Gather additional information used in rename detection.
+ */
+ collect_rename_info(opt, names, dirname, fullpath,
+ filemask, dirmask, match_mask);
+
+ /*
+ * Record information about the path so we can resolve later in
+ * process_entries.
+ */
+ setup_path_info(opt, &pi, dirname, info->pathlen, fullpath,
+ names, NULL, 0, df_conflict, filemask, dirmask, 0);
+
+ ci = pi.util;
+ VERIFY_CI(ci);
+ ci->match_mask = match_mask;
+
+ /* If dirmask, recurse into subdirectories */
+ if (dirmask) {
+ struct traverse_info newinfo;
+ struct tree_desc t[3];
+ void *buf[3] = {NULL, NULL, NULL};
+ const char *original_dir_name;
+ int i, ret;
+
+ ci->match_mask &= filemask;
+ newinfo = *info;
+ newinfo.prev = info;
+ newinfo.name = p->path;
+ newinfo.namelen = p->pathlen;
+ newinfo.pathlen = st_add3(newinfo.pathlen, p->pathlen, 1);
+ /*
+ * If this directory we are about to recurse into cared about
+ * its parent directory (the current directory) having a D/F
+ * conflict, then we'd propagate the masks in this way:
+ * newinfo.df_conflicts |= (mask & ~dirmask);
+ * But we don't worry about propagating D/F conflicts. (See
+ * comment near setting of local df_conflict variable near
+ * the beginning of this function).
+ */
+
+ for (i = MERGE_BASE; i <= MERGE_SIDE2; i++) {
+ if (i == 1 && side1_matches_mbase)
+ t[1] = t[0];
+ else if (i == 2 && side2_matches_mbase)
+ t[2] = t[0];
+ else if (i == 2 && sides_match)
+ t[2] = t[1];
+ else {
+ const struct object_id *oid = NULL;
+ if (dirmask & 1)
+ oid = &names[i].oid;
+ buf[i] = fill_tree_descriptor(opt->repo,
+ t + i, oid);
+ }
+ dirmask >>= 1;
+ }
+
+ original_dir_name = opti->current_dir_name;
+ opti->current_dir_name = pi.string;
+ ret = traverse_trees(NULL, 3, t, &newinfo);
+ opti->current_dir_name = original_dir_name;
+
+ for (i = MERGE_BASE; i <= MERGE_SIDE2; i++)
+ free(buf[i]);
+
+ if (ret < 0)
+ return -1;
+ }
+
+ return mask;
+}
+
+static int collect_merge_info(struct merge_options *opt,
+ struct tree *merge_base,
+ struct tree *side1,
+ struct tree *side2)
+{
+ int ret;
+ struct tree_desc t[3];
+ struct traverse_info info;
+
+ opt->priv->toplevel_dir = "";
+ opt->priv->current_dir_name = opt->priv->toplevel_dir;
+ setup_traverse_info(&info, opt->priv->toplevel_dir);
+ info.fn = collect_merge_info_callback;
+ info.data = opt;
+ info.show_all_errors = 1;
+
+ parse_tree(merge_base);
+ parse_tree(side1);
+ parse_tree(side2);
+ init_tree_desc(t + 0, merge_base->buffer, merge_base->size);
+ init_tree_desc(t + 1, side1->buffer, side1->size);
+ init_tree_desc(t + 2, side2->buffer, side2->size);
+
+ trace2_region_enter("merge", "traverse_trees", opt->repo);
+ ret = traverse_trees(NULL, 3, t, &info);
+ trace2_region_leave("merge", "traverse_trees", opt->repo);
+
+ return ret;
+}
+
+/*** Function Grouping: functions related to threeway content merges ***/
+
+static int find_first_merges(struct repository *repo,
+ const char *path,
+ struct commit *a,
+ struct commit *b,
+ struct object_array *result)
+{
+ int i, j;
+ struct object_array merges = OBJECT_ARRAY_INIT;
+ struct commit *commit;
+ int contains_another;
+
+ char merged_revision[GIT_MAX_HEXSZ + 2];
+ const char *rev_args[] = { "rev-list", "--merges", "--ancestry-path",
+ "--all", merged_revision, NULL };
+ struct rev_info revs;
+ struct setup_revision_opt rev_opts;
+
+ memset(result, 0, sizeof(struct object_array));
+ memset(&rev_opts, 0, sizeof(rev_opts));
+
+ /* get all revisions that merge commit a */
+ xsnprintf(merged_revision, sizeof(merged_revision), "^%s",
+ oid_to_hex(&a->object.oid));
+ repo_init_revisions(repo, &revs, NULL);
+ rev_opts.submodule = path;
+ /* FIXME: can't handle linked worktrees in submodules yet */
+ revs.single_worktree = path != NULL;
+ setup_revisions(ARRAY_SIZE(rev_args)-1, rev_args, &revs, &rev_opts);
+
+ /* save all revisions from the above list that contain b */
+ if (prepare_revision_walk(&revs))
+ die("revision walk setup failed");
+ while ((commit = get_revision(&revs)) != NULL) {
+ struct object *o = &(commit->object);
+ if (in_merge_bases(b, commit))
+ add_object_array(o, NULL, &merges);
+ }
+ reset_revision_walk();
+
+ /* Now we've got all merges that contain a and b. Prune all
+ * merges that contain another found merge and save them in
+ * result.
+ */
+ for (i = 0; i < merges.nr; i++) {
+ struct commit *m1 = (struct commit *) merges.objects[i].item;
+
+ contains_another = 0;
+ for (j = 0; j < merges.nr; j++) {
+ struct commit *m2 = (struct commit *) merges.objects[j].item;
+ if (i != j && in_merge_bases(m2, m1)) {
+ contains_another = 1;
+ break;
+ }
+ }
+
+ if (!contains_another)
+ add_object_array(merges.objects[i].item, NULL, result);
+ }
+
+ object_array_clear(&merges);
+ return result->nr;
+}
+
+static int merge_submodule(struct merge_options *opt,
+ const char *path,
+ const struct object_id *o,
+ const struct object_id *a,
+ const struct object_id *b,
+ struct object_id *result)
+{
+ struct commit *commit_o, *commit_a, *commit_b;
+ int parent_count;
+ struct object_array merges;
+ struct strbuf sb = STRBUF_INIT;
+
+ int i;
+ int search = !opt->priv->call_depth;
+
+ /* store fallback answer in result in case we fail */
+ oidcpy(result, opt->priv->call_depth ? o : a);
+
+ /* we can not handle deletion conflicts */
+ if (is_null_oid(o))
+ return 0;
+ if (is_null_oid(a))
+ return 0;
+ if (is_null_oid(b))
+ return 0;
+
+ if (add_submodule_odb(path)) {
+ path_msg(opt, path, 0,
+ _("Failed to merge submodule %s (not checked out)"),
+ path);
+ return 0;
+ }
+
+ if (!(commit_o = lookup_commit_reference(opt->repo, o)) ||
+ !(commit_a = lookup_commit_reference(opt->repo, a)) ||
+ !(commit_b = lookup_commit_reference(opt->repo, b))) {
+ path_msg(opt, path, 0,
+ _("Failed to merge submodule %s (commits not present)"),
+ path);
+ return 0;
+ }
+
+ /* check whether both changes are forward */
+ if (!in_merge_bases(commit_o, commit_a) ||
+ !in_merge_bases(commit_o, commit_b)) {
+ path_msg(opt, path, 0,
+ _("Failed to merge submodule %s "
+ "(commits don't follow merge-base)"),
+ path);
+ return 0;
+ }
+
+ /* Case #1: a is contained in b or vice versa */
+ if (in_merge_bases(commit_a, commit_b)) {
+ oidcpy(result, b);
+ path_msg(opt, path, 1,
+ _("Note: Fast-forwarding submodule %s to %s"),
+ path, oid_to_hex(b));
+ return 1;
+ }
+ if (in_merge_bases(commit_b, commit_a)) {
+ oidcpy(result, a);
+ path_msg(opt, path, 1,
+ _("Note: Fast-forwarding submodule %s to %s"),
+ path, oid_to_hex(a));
+ return 1;
+ }
+
+ /*
+ * Case #2: There are one or more merges that contain a and b in
+ * the submodule. If there is only one, then present it as a
+ * suggestion to the user, but leave it marked unmerged so the
+ * user needs to confirm the resolution.
+ */
+
+ /* Skip the search if makes no sense to the calling context. */
+ if (!search)
+ return 0;
+
+ /* find commit which merges them */
+ parent_count = find_first_merges(opt->repo, path, commit_a, commit_b,
+ &merges);
+ switch (parent_count) {
+ case 0:
+ path_msg(opt, path, 0, _("Failed to merge submodule %s"), path);
+ break;
+
+ case 1:
+ format_commit(&sb, 4,
+ (struct commit *)merges.objects[0].item);
+ path_msg(opt, path, 0,
+ _("Failed to merge submodule %s, but a possible merge "
+ "resolution exists:\n%s\n"),
+ path, sb.buf);
+ path_msg(opt, path, 1,
+ _("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"),
+ oid_to_hex(&merges.objects[0].item->oid), path);
+ strbuf_release(&sb);
+ break;
+ default:
+ for (i = 0; i < merges.nr; i++)
+ format_commit(&sb, 4,
+ (struct commit *)merges.objects[i].item);
+ path_msg(opt, path, 0,
+ _("Failed to merge submodule %s, but multiple "
+ "possible merges exist:\n%s"), path, sb.buf);
+ strbuf_release(&sb);
+ }
+
+ object_array_clear(&merges);
+ return 0;
+}
+
+static int merge_3way(struct merge_options *opt,
+ const char *path,
+ const struct object_id *o,
+ const struct object_id *a,
+ const struct object_id *b,
+ const char *pathnames[3],
+ const int extra_marker_size,
+ mmbuffer_t *result_buf)
+{
+ mmfile_t orig, src1, src2;
+ struct ll_merge_options ll_opts = {0};
+ 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->priv->call_depth) {
+ ll_opts.virtual_ancestor = 1;
+ ll_opts.variant = 0;
+ } else {
+ switch (opt->recursive_variant) {
+ case MERGE_VARIANT_OURS:
+ ll_opts.variant = XDL_MERGE_FAVOR_OURS;
+ break;
+ case MERGE_VARIANT_THEIRS:
+ ll_opts.variant = XDL_MERGE_FAVOR_THEIRS;
+ break;
+ default:
+ ll_opts.variant = 0;
+ break;
+ }
+ }
+
+ assert(pathnames[0] && pathnames[1] && pathnames[2] && opt->ancestor);
+ if (pathnames[0] == pathnames[1] && pathnames[1] == pathnames[2]) {
+ base = mkpathdup("%s", opt->ancestor);
+ name1 = mkpathdup("%s", opt->branch1);
+ name2 = mkpathdup("%s", opt->branch2);
+ } else {
+ base = mkpathdup("%s:%s", opt->ancestor, pathnames[0]);
+ name1 = mkpathdup("%s:%s", opt->branch1, pathnames[1]);
+ name2 = mkpathdup("%s:%s", opt->branch2, pathnames[2]);
+ }
+
+ read_mmblob(&orig, o);
+ read_mmblob(&src1, a);
+ read_mmblob(&src2, b);
+
+ merge_status = ll_merge(result_buf, path, &orig, base,
+ &src1, name1, &src2, name2,
+ opt->repo->index, &ll_opts);
+
+ free(base);
+ free(name1);
+ free(name2);
+ free(orig.ptr);
+ free(src1.ptr);
+ free(src2.ptr);
+ return merge_status;
+}
+
+static int handle_content_merge(struct merge_options *opt,
+ const char *path,
+ const struct version_info *o,
+ const struct version_info *a,
+ const struct version_info *b,
+ const char *pathnames[3],
+ const int extra_marker_size,
+ struct version_info *result)
+{
+ /*
+ * path is the target location where we want to put the file, and
+ * is used to determine any normalization rules in ll_merge.
+ *
+ * The normal case is that path and all entries in pathnames are
+ * identical, though renames can affect which path we got one of
+ * the three blobs to merge on various sides of history.
+ *
+ * extra_marker_size is the amount to extend conflict markers in
+ * ll_merge; this is neeed if we have content merges of content
+ * merges, which happens for example with rename/rename(2to1) and
+ * rename/add conflicts.
+ */
+ unsigned clean = 1;
+
+ /*
+ * handle_content_merge() needs both files to be of the same type, i.e.
+ * both files OR both submodules OR both symlinks. Conflicting types
+ * needs to be handled elsewhere.
+ */
+ assert((S_IFMT & a->mode) == (S_IFMT & b->mode));
+
+ /* Merge modes */
+ if (a->mode == b->mode || a->mode == o->mode)
+ result->mode = b->mode;
+ else {
+ /* must be the 100644/100755 case */
+ assert(S_ISREG(a->mode));
+ result->mode = a->mode;
+ clean = (b->mode == o->mode);
+ /*
+ * FIXME: If opt->priv->call_depth && !clean, then we really
+ * should not make result->mode match either a->mode or
+ * b->mode; that causes t6036 "check conflicting mode for
+ * regular file" to fail. It would be best to use some other
+ * mode, but we'll confuse all kinds of stuff if we use one
+ * where S_ISREG(result->mode) isn't true, and if we use
+ * something like 0100666, then tree-walk.c's calls to
+ * canon_mode() will just normalize that to 100644 for us and
+ * thus not solve anything.
+ *
+ * Figure out if there's some kind of way we can work around
+ * this...
+ */
+ }
+
+ /*
+ * Trivial oid merge.
+ *
+ * Note: While one might assume that the next four lines would
+ * be unnecessary due to the fact that match_mask is often
+ * setup and already handled, renames don't always take care
+ * of that.
+ */
+ if (oideq(&a->oid, &b->oid) || oideq(&a->oid, &o->oid))
+ oidcpy(&result->oid, &b->oid);
+ else if (oideq(&b->oid, &o->oid))
+ oidcpy(&result->oid, &a->oid);
+
+ /* Remaining rules depend on file vs. submodule vs. symlink. */
+ else if (S_ISREG(a->mode)) {
+ mmbuffer_t result_buf;
+ int ret = 0, merge_status;
+ int two_way;
+
+ /*
+ * If 'o' is different type, treat it as null so we do a
+ * two-way merge.
+ */
+ two_way = ((S_IFMT & o->mode) != (S_IFMT & a->mode));
+
+ merge_status = merge_3way(opt, path,
+ two_way ? &null_oid : &o->oid,
+ &a->oid, &b->oid,
+ pathnames, extra_marker_size,
+ &result_buf);
+
+ if ((merge_status < 0) || !result_buf.ptr)
+ ret = err(opt, _("Failed to execute internal merge"));
+
+ if (!ret &&
+ write_object_file(result_buf.ptr, result_buf.size,
+ blob_type, &result->oid))
+ ret = err(opt, _("Unable to add %s to database"),
+ path);
+
+ free(result_buf.ptr);
+ if (ret)
+ return -1;
+ clean &= (merge_status == 0);
+ path_msg(opt, path, 1, _("Auto-merging %s"), path);
+ } else if (S_ISGITLINK(a->mode)) {
+ int two_way = ((S_IFMT & o->mode) != (S_IFMT & a->mode));
+ clean = merge_submodule(opt, pathnames[0],
+ two_way ? &null_oid : &o->oid,
+ &a->oid, &b->oid, &result->oid);
+ if (opt->priv->call_depth && two_way && !clean) {
+ result->mode = o->mode;
+ oidcpy(&result->oid, &o->oid);
+ }
+ } else if (S_ISLNK(a->mode)) {
+ if (opt->priv->call_depth) {
+ clean = 0;
+ result->mode = o->mode;
+ oidcpy(&result->oid, &o->oid);
+ } else {
+ switch (opt->recursive_variant) {
+ case MERGE_VARIANT_NORMAL:
+ clean = 0;
+ oidcpy(&result->oid, &a->oid);
+ break;
+ case MERGE_VARIANT_OURS:
+ oidcpy(&result->oid, &a->oid);
+ break;
+ case MERGE_VARIANT_THEIRS:
+ oidcpy(&result->oid, &b->oid);
+ break;
+ }
+ }
+ } else
+ BUG("unsupported object type in the tree: %06o for %s",
+ a->mode, path);
+
+ return clean;
+}
+
+/*** Function Grouping: functions related to detect_and_process_renames(), ***
+ *** which are split into directory and regular rename detection sections. ***/
+
+/*** Function Grouping: functions related to directory rename detection ***/
+
+struct collision_info {
+ struct string_list source_files;
+ unsigned reported_already:1;
+};
+
+/*
+ * Return a new string that replaces the beginning portion (which matches
+ * rename_info->key), with rename_info->util.new_dir. In perl-speak:
+ * new_path_name = (old_path =~ s/rename_info->key/rename_info->value/);
+ * NOTE:
+ * Caller must ensure that old_path starts with rename_info->key + '/'.
+ */
+static char *apply_dir_rename(struct strmap_entry *rename_info,
+ const char *old_path)
+{
+ struct strbuf new_path = STRBUF_INIT;
+ const char *old_dir = rename_info->key;
+ const char *new_dir = rename_info->value;
+ int oldlen, newlen, new_dir_len;
+
+ oldlen = strlen(old_dir);
+ if (*new_dir == '\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++;
+ new_dir_len = strlen(new_dir);
+ newlen = new_dir_len + (strlen(old_path) - oldlen) + 1;
+ strbuf_grow(&new_path, newlen);
+ strbuf_add(&new_path, new_dir, new_dir_len);
+ strbuf_addstr(&new_path, &old_path[oldlen]);
+
+ return strbuf_detach(&new_path, NULL);
+}
+
+static int path_in_way(struct strmap *paths, const char *path, unsigned side_mask)
+{
+ struct merged_info *mi = strmap_get(paths, path);
+ struct conflict_info *ci;
+ if (!mi)
+ return 0;
+ INITIALIZE_CI(ci, mi);
+ return mi->clean || (side_mask & (ci->filemask | ci->dirmask));
+}
+
+/*
+ * See if there is a directory rename for path, and if there are any file
+ * level conflicts on the given side for the renamed location. If there is
+ * a rename and there are no conflicts, return the new name. Otherwise,
+ * return NULL.
+ */
+static char *handle_path_level_conflicts(struct merge_options *opt,
+ const char *path,
+ unsigned side_index,
+ struct strmap_entry *rename_info,
+ struct strmap *collisions)
+{
+ char *new_path = NULL;
+ struct collision_info *c_info;
+ int clean = 1;
+ struct strbuf collision_paths = STRBUF_INIT;
+
+ /*
+ * entry has the mapping of old directory name to new directory name
+ * that we want to apply to path.
+ */
+ new_path = apply_dir_rename(rename_info, path);
+ if (!new_path)
+ BUG("Failed to apply directory rename!");
+
+ /*
+ * The caller needs to have ensured that it has pre-populated
+ * collisions with all paths that map to new_path. Do a quick check
+ * to ensure that's the case.
+ */
+ c_info = strmap_get(collisions, new_path);
+ if (c_info == NULL)
+ BUG("c_info is NULL");
+
+ /*
+ * Check for one-sided add/add/.../add conflicts, i.e.
+ * where implicit renames from the other side doing
+ * directory rename(s) can affect this side of history
+ * to put multiple paths into the same location. Warn
+ * and bail on directory renames for such paths.
+ */
+ if (c_info->reported_already) {
+ clean = 0;
+ } else if (path_in_way(&opt->priv->paths, new_path, 1 << side_index)) {
+ c_info->reported_already = 1;
+ strbuf_add_separated_string_list(&collision_paths, ", ",
+ &c_info->source_files);
+ path_msg(opt, new_path, 0,
+ _("CONFLICT (implicit dir rename): Existing file/dir "
+ "at %s in the way of implicit directory rename(s) "
+ "putting the following path(s) there: %s."),
+ new_path, collision_paths.buf);
+ clean = 0;
+ } else if (c_info->source_files.nr > 1) {
+ c_info->reported_already = 1;
+ strbuf_add_separated_string_list(&collision_paths, ", ",
+ &c_info->source_files);
+ path_msg(opt, new_path, 0,
+ _("CONFLICT (implicit dir rename): Cannot map more "
+ "than one path to %s; implicit directory renames "
+ "tried to put these paths there: %s"),
+ new_path, collision_paths.buf);
+ clean = 0;
+ }
+
+ /* Free memory we no longer need */
+ strbuf_release(&collision_paths);
+ if (!clean && new_path) {
+ free(new_path);
+ return NULL;
+ }
+
+ return new_path;
+}
+
+static void dirname_munge(char *filename)
+{
+ char *slash = strrchr(filename, '/');
+ if (!slash)
+ slash = filename;
+ *slash = '\0';
+}
+
+static void increment_count(struct strmap *dir_rename_count,
+ char *old_dir,
+ char *new_dir)
+{
+ struct strintmap *counts;
+ struct strmap_entry *e;
+
+ /* Get the {new_dirs -> counts} mapping using old_dir */
+ e = strmap_get_entry(dir_rename_count, old_dir);
+ if (e) {
+ counts = e->value;
+ } else {
+ counts = xmalloc(sizeof(*counts));
+ strintmap_init_with_options(counts, 0, NULL, 1);
+ strmap_put(dir_rename_count, old_dir, counts);
+ }
+
+ /* Increment the count for new_dir */
+ strintmap_incr(counts, new_dir, 1);
+}
+
+static void update_dir_rename_counts(struct strmap *dir_rename_count,
+ struct strset *dirs_removed,
+ const char *oldname,
+ const char *newname)
+{
+ char *old_dir = xstrdup(oldname);
+ char *new_dir = xstrdup(newname);
+ char new_dir_first_char = new_dir[0];
+ int first_time_in_loop = 1;
+
+ while (1) {
+ dirname_munge(old_dir);
+ dirname_munge(new_dir);
+
+ /*
+ * When renaming
+ * "a/b/c/d/e/foo.c" -> "a/b/some/thing/else/e/foo.c"
+ * then this suggests that both
+ * a/b/c/d/e/ => a/b/some/thing/else/e/
+ * a/b/c/d/ => a/b/some/thing/else/
+ * so we want to increment counters for both. We do NOT,
+ * however, also want to suggest that there was the following
+ * rename:
+ * a/b/c/ => a/b/some/thing/
+ * so we need to quit at that point.
+ *
+ * Note the when first_time_in_loop, we only strip off the
+ * basename, and we don't care if that's different.
+ */
+ if (!first_time_in_loop) {
+ char *old_sub_dir = strchr(old_dir, '\0')+1;
+ char *new_sub_dir = strchr(new_dir, '\0')+1;
+ if (!*new_dir) {
+ /*
+ * Special case when renaming to root directory,
+ * i.e. when new_dir == "". In this case, we had
+ * something like
+ * a/b/subdir => subdir
+ * and so dirname_munge() sets things up so that
+ * old_dir = "a/b\0subdir\0"
+ * new_dir = "\0ubdir\0"
+ * We didn't have a '/' to overwrite a '\0' onto
+ * in new_dir, so we have to compare differently.
+ */
+ if (new_dir_first_char != old_sub_dir[0] ||
+ strcmp(old_sub_dir+1, new_sub_dir))
+ break;
+ } else {
+ if (strcmp(old_sub_dir, new_sub_dir))
+ break;
+ }
+ }
+
+ if (strset_contains(dirs_removed, old_dir))
+ increment_count(dir_rename_count, old_dir, new_dir);
+ else
+ break;
+
+ /* If we hit toplevel directory ("") for old or new dir, quit */
+ if (!*old_dir || !*new_dir)
+ break;
+
+ first_time_in_loop = 0;
+ }
+
+ /* Free resources we don't need anymore */
+ free(old_dir);
+ free(new_dir);
+}
+
+static void compute_rename_counts(struct diff_queue_struct *pairs,
+ struct strmap *dir_rename_count,
+ struct strset *dirs_removed)
+{
+ int i;
+
+ for (i = 0; i < pairs->nr; ++i) {
+ struct diff_filepair *pair = pairs->queue[i];
+
+ /* File not part of directory rename if it wasn't renamed */
+ if (pair->status != 'R')
+ continue;
+
+ /*
+ * Make dir_rename_count contain a map of a map:
+ * old_directory -> {new_directory -> count}
+ * In other words, for every pair look at the directories for
+ * the old filename and the new filename and count how many
+ * times that pairing occurs.
+ */
+ update_dir_rename_counts(dir_rename_count, dirs_removed,
+ pair->one->path,
+ pair->two->path);
+ }
+}
+
+static void get_provisional_directory_renames(struct merge_options *opt,
+ unsigned side,
+ int *clean)
+{
+ struct hashmap_iter iter;
+ struct strmap_entry *entry;
+ struct rename_info *renames = &opt->priv->renames;
+
+ compute_rename_counts(&renames->pairs[side],
+ &renames->dir_rename_count[side],
+ &renames->dirs_removed[side]);
+ /*
+ * Collapse
+ * dir_rename_count: old_directory -> {new_directory -> count}
+ * down to
+ * dir_renames: old_directory -> best_new_directory
+ * where best_new_directory is the one with the unique highest count.
+ */
+ strmap_for_each_entry(&renames->dir_rename_count[side], &iter, entry) {
+ const char *source_dir = entry->key;
+ struct strintmap *counts = entry->value;
+ struct hashmap_iter count_iter;
+ struct strmap_entry *count_entry;
+ int max = 0;
+ int bad_max = 0;
+ const char *best = NULL;
+
+ strintmap_for_each_entry(counts, &count_iter, count_entry) {
+ const char *target_dir = count_entry->key;
+ intptr_t count = (intptr_t)count_entry->value;
+
+ if (count == max)
+ bad_max = max;
+ else if (count > max) {
+ max = count;
+ best = target_dir;
+ }
+ }
+
+ if (bad_max == max) {
+ path_msg(opt, source_dir, 0,
+ _("CONFLICT (directory rename split): "
+ "Unclear where to rename %s to; it was "
+ "renamed to multiple other directories, with "
+ "no destination getting a majority of the "
+ "files."),
+ source_dir);
+ /*
+ * We should mark this as unclean IF something attempts
+ * to use this rename. We do not yet have the logic
+ * in place to detect if this directory rename is being
+ * used, and optimizations that reduce the number of
+ * renames cause this to falsely trigger. For now,
+ * just disable it, causing t6423 testcase 2a to break.
+ * We'll later fix the detection, and when we do we
+ * will re-enable setting *clean to 0 (and thereby fix
+ * t6423 testcase 2a).
+ */
+ /* *clean = 0; */
+ } else {
+ strmap_put(&renames->dir_renames[side],
+ source_dir, (void*)best);
+ }
+ }
+}
+
+static void handle_directory_level_conflicts(struct merge_options *opt)
+{
+ struct hashmap_iter iter;
+ struct strmap_entry *entry;
+ struct string_list duplicated = STRING_LIST_INIT_NODUP;
+ struct rename_info *renames = &opt->priv->renames;
+ struct strmap *side1_dir_renames = &renames->dir_renames[MERGE_SIDE1];
+ struct strmap *side2_dir_renames = &renames->dir_renames[MERGE_SIDE2];
+ int i;
+
+ strmap_for_each_entry(side1_dir_renames, &iter, entry) {
+ if (strmap_contains(side2_dir_renames, entry->key))
+ string_list_append(&duplicated, entry->key);
+ }
+
+ for (i = 0; i < duplicated.nr; i++) {
+ strmap_remove(side1_dir_renames, duplicated.items[i].string, 0);
+ strmap_remove(side2_dir_renames, duplicated.items[i].string, 0);
+ }
+ string_list_clear(&duplicated, 0);
+}
+
+static struct strmap_entry *check_dir_renamed(const char *path,
+ struct strmap *dir_renames)
+{
+ char *temp = xstrdup(path);
+ char *end;
+ struct strmap_entry *e = NULL;
+
+ while ((end = strrchr(temp, '/'))) {
+ *end = '\0';
+ e = strmap_get_entry(dir_renames, temp);
+ if (e)
+ break;
+ }
+ free(temp);
+ return e;
+}
+
+static void compute_collisions(struct strmap *collisions,
+ struct strmap *dir_renames,
+ struct diff_queue_struct *pairs)
+{
+ int i;
+
+ strmap_init_with_options(collisions, NULL, 0);
+ if (strmap_empty(dir_renames))
+ return;
+
+ /*
+ * Multiple files can be mapped to the same path due to directory
+ * renames done by the other side of history. Since that other
+ * side of history could have merged multiple directories into one,
+ * if our side of history added the same file basename to each of
+ * those directories, then all N of them would get implicitly
+ * renamed by the directory rename detection into the same path,
+ * and we'd get an add/add/.../add conflict, and all those adds
+ * from *this* side of history. This is not representable in the
+ * index, and users aren't going to easily be able to make sense of
+ * it. So we need to provide a good warning about what's
+ * happening, and fall back to no-directory-rename detection
+ * behavior for those paths.
+ *
+ * See testcases 9e and all of section 5 from t6043 for examples.
+ */
+ for (i = 0; i < pairs->nr; ++i) {
+ struct strmap_entry *rename_info;
+ struct collision_info *collision_info;
+ char *new_path;
+ struct diff_filepair *pair = pairs->queue[i];
+
+ if (pair->status != 'A' && pair->status != 'R')
+ continue;
+ rename_info = check_dir_renamed(pair->two->path, dir_renames);
+ if (!rename_info)
+ continue;
+
+ new_path = apply_dir_rename(rename_info, pair->two->path);
+ assert(new_path);
+ collision_info = strmap_get(collisions, new_path);
+ if (collision_info) {
+ free(new_path);
+ } else {
+ CALLOC_ARRAY(collision_info, 1);
+ string_list_init(&collision_info->source_files, 0);
+ strmap_put(collisions, new_path, collision_info);
+ }
+ string_list_insert(&collision_info->source_files,
+ pair->two->path);
+ }
+}
+
+static char *check_for_directory_rename(struct merge_options *opt,
+ const char *path,
+ unsigned side_index,
+ struct strmap *dir_renames,
+ struct strmap *dir_rename_exclusions,
+ struct strmap *collisions,
+ int *clean_merge)
+{
+ char *new_path = NULL;
+ struct strmap_entry *rename_info;
+ struct strmap_entry *otherinfo = NULL;
+ const char *new_dir;
+
+ if (strmap_empty(dir_renames))
+ return new_path;
+ rename_info = check_dir_renamed(path, dir_renames);
+ if (!rename_info)
+ return new_path;
+ /* old_dir = rename_info->key; */
+ new_dir = rename_info->value;
+
+ /*
+ * This next part is a little weird. We do not want to do an
+ * implicit rename into a directory we renamed on our side, because
+ * that will result in a spurious rename/rename(1to2) conflict. An
+ * example:
+ * Base commit: dumbdir/afile, otherdir/bfile
+ * Side 1: smrtdir/afile, otherdir/bfile
+ * Side 2: dumbdir/afile, dumbdir/bfile
+ * Here, while working on Side 1, we could notice that otherdir was
+ * renamed/merged to dumbdir, and change the diff_filepair for
+ * otherdir/bfile into a rename into dumbdir/bfile. However, Side
+ * 2 will notice the rename from dumbdir to smrtdir, and do the
+ * transitive rename to move it from dumbdir/bfile to
+ * smrtdir/bfile. That gives us bfile in dumbdir vs being in
+ * smrtdir, a rename/rename(1to2) conflict. We really just want
+ * the file to end up in smrtdir. And the way to achieve that is
+ * to not let Side1 do the rename to dumbdir, since we know that is
+ * the source of one of our directory renames.
+ *
+ * That's why otherinfo and dir_rename_exclusions is here.
+ *
+ * As it turns out, this also prevents N-way transient rename
+ * confusion; See testcases 9c and 9d of t6043.
+ */
+ otherinfo = strmap_get_entry(dir_rename_exclusions, new_dir);
+ if (otherinfo) {
+ path_msg(opt, rename_info->key, 1,
+ _("WARNING: Avoiding applying %s -> %s rename "
+ "to %s, because %s itself was renamed."),
+ rename_info->key, new_dir, path, new_dir);
+ return NULL;
+ }
+
+ new_path = handle_path_level_conflicts(opt, path, side_index,
+ rename_info, collisions);
+ *clean_merge &= (new_path != NULL);
+
+ return new_path;
+}
+
+static void apply_directory_rename_modifications(struct merge_options *opt,
+ struct diff_filepair *pair,
+ char *new_path)
+{
+ /*
+ * The basic idea is to get the conflict_info from opt->priv->paths
+ * at old path, and insert it into new_path; basically just this:
+ * ci = strmap_get(&opt->priv->paths, old_path);
+ * strmap_remove(&opt->priv->paths, old_path, 0);
+ * strmap_put(&opt->priv->paths, new_path, ci);
+ * However, there are some factors complicating this:
+ * - opt->priv->paths may already have an entry at new_path
+ * - Each ci tracks its containing directory, so we need to
+ * update that
+ * - If another ci has the same containing directory, then
+ * the two char*'s MUST point to the same location. See the
+ * comment in struct merged_info. strcmp equality is not
+ * enough; we need pointer equality.
+ * - opt->priv->paths must hold the parent directories of any
+ * entries that are added. So, if this directory rename
+ * causes entirely new directories, we must recursively add
+ * parent directories.
+ * - For each parent directory added to opt->priv->paths, we
+ * also need to get its parent directory stored in its
+ * conflict_info->merged.directory_name with all the same
+ * requirements about pointer equality.
+ */
+ struct string_list dirs_to_insert = STRING_LIST_INIT_NODUP;
+ struct conflict_info *ci, *new_ci;
+ struct strmap_entry *entry;
+ const char *branch_with_new_path, *branch_with_dir_rename;
+ const char *old_path = pair->two->path;
+ const char *parent_name;
+ const char *cur_path;
+ int i, len;
+
+ entry = strmap_get_entry(&opt->priv->paths, old_path);
+ old_path = entry->key;
+ ci = entry->value;
+ VERIFY_CI(ci);
+
+ /* Find parent directories missing from opt->priv->paths */
+ cur_path = new_path;
+ while (1) {
+ /* Find the parent directory of cur_path */
+ char *last_slash = strrchr(cur_path, '/');
+ if (last_slash) {
+ parent_name = xstrndup(cur_path, last_slash - cur_path);
+ } else {
+ parent_name = opt->priv->toplevel_dir;
+ break;
+ }
+
+ /* Look it up in opt->priv->paths */
+ entry = strmap_get_entry(&opt->priv->paths, parent_name);
+ if (entry) {
+ free((char*)parent_name);
+ parent_name = entry->key; /* reuse known pointer */
+ break;
+ }
+
+ /* Record this is one of the directories we need to insert */
+ string_list_append(&dirs_to_insert, parent_name);
+ cur_path = parent_name;
+ }
+
+ /* Traverse dirs_to_insert and insert them into opt->priv->paths */
+ for (i = dirs_to_insert.nr-1; i >= 0; --i) {
+ struct conflict_info *dir_ci;
+ char *cur_dir = dirs_to_insert.items[i].string;
+
+ CALLOC_ARRAY(dir_ci, 1);
+
+ dir_ci->merged.directory_name = parent_name;
+ len = strlen(parent_name);
+ /* len+1 because of trailing '/' character */
+ dir_ci->merged.basename_offset = (len > 0 ? len+1 : len);
+ dir_ci->dirmask = ci->filemask;
+ strmap_put(&opt->priv->paths, cur_dir, dir_ci);
+
+ parent_name = cur_dir;
+ }
+
+ /*
+ * We are removing old_path from opt->priv->paths. old_path also will
+ * eventually need to be freed, but it may still be used by e.g.
+ * ci->pathnames. So, store it in another string-list for now.
+ */
+ string_list_append(&opt->priv->paths_to_free, old_path);
+
+ assert(ci->filemask == 2 || ci->filemask == 4);
+ assert(ci->dirmask == 0);
+ strmap_remove(&opt->priv->paths, old_path, 0);
+
+ branch_with_new_path = (ci->filemask == 2) ? opt->branch1 : opt->branch2;
+ branch_with_dir_rename = (ci->filemask == 2) ? opt->branch2 : opt->branch1;
+
+ /* Now, finally update ci and stick it into opt->priv->paths */
+ ci->merged.directory_name = parent_name;
+ len = strlen(parent_name);
+ ci->merged.basename_offset = (len > 0 ? len+1 : len);
+ new_ci = strmap_get(&opt->priv->paths, new_path);
+ if (!new_ci) {
+ /* Place ci back into opt->priv->paths, but at new_path */
+ strmap_put(&opt->priv->paths, new_path, ci);
+ } else {
+ int index;
+
+ /* A few sanity checks */
+ VERIFY_CI(new_ci);
+ assert(ci->filemask == 2 || ci->filemask == 4);
+ assert((new_ci->filemask & ci->filemask) == 0);
+ assert(!new_ci->merged.clean);
+
+ /* Copy stuff from ci into new_ci */
+ new_ci->filemask |= ci->filemask;
+ if (new_ci->dirmask)
+ new_ci->df_conflict = 1;
+ index = (ci->filemask >> 1);
+ new_ci->pathnames[index] = ci->pathnames[index];
+ new_ci->stages[index].mode = ci->stages[index].mode;
+ oidcpy(&new_ci->stages[index].oid, &ci->stages[index].oid);
+
+ free(ci);
+ ci = new_ci;
+ }
+
+ if (opt->detect_directory_renames == MERGE_DIRECTORY_RENAMES_TRUE) {
+ /* Notify user of updated path */
+ if (pair->status == 'A')
+ path_msg(opt, new_path, 1,
+ _("Path updated: %s added in %s inside a "
+ "directory that was renamed in %s; moving "
+ "it to %s."),
+ old_path, branch_with_new_path,
+ branch_with_dir_rename, new_path);
+ else
+ path_msg(opt, new_path, 1,
+ _("Path updated: %s renamed to %s in %s, "
+ "inside a directory that was renamed in %s; "
+ "moving it to %s."),
+ pair->one->path, old_path, branch_with_new_path,
+ branch_with_dir_rename, new_path);
+ } else {
+ /*
+ * opt->detect_directory_renames has the value
+ * MERGE_DIRECTORY_RENAMES_CONFLICT, so mark these as conflicts.
+ */
+ ci->path_conflict = 1;
+ if (pair->status == 'A')
+ path_msg(opt, new_path, 0,
+ _("CONFLICT (file location): %s added in %s "
+ "inside a directory that was renamed in %s, "
+ "suggesting it should perhaps be moved to "
+ "%s."),
+ old_path, branch_with_new_path,
+ branch_with_dir_rename, new_path);
+ else
+ path_msg(opt, new_path, 0,
+ _("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."),
+ pair->one->path, old_path, branch_with_new_path,
+ branch_with_dir_rename, new_path);
+ }
+
+ /*
+ * Finally, record the new location.
+ */
+ pair->two->path = new_path;
+}
+
+/*** Function Grouping: functions related to regular rename detection ***/
+
+static int process_renames(struct merge_options *opt,
+ struct diff_queue_struct *renames)
+{
+ int clean_merge = 1, i;
+
+ for (i = 0; i < renames->nr; ++i) {
+ const char *oldpath = NULL, *newpath;
+ struct diff_filepair *pair = renames->queue[i];
+ struct conflict_info *oldinfo = NULL, *newinfo = NULL;
+ struct strmap_entry *old_ent, *new_ent;
+ unsigned int old_sidemask;
+ int target_index, other_source_index;
+ int source_deleted, collision, type_changed;
+ const char *rename_branch = NULL, *delete_branch = NULL;
+
+ old_ent = strmap_get_entry(&opt->priv->paths, pair->one->path);
+ new_ent = strmap_get_entry(&opt->priv->paths, pair->two->path);
+ if (old_ent) {
+ oldpath = old_ent->key;
+ oldinfo = old_ent->value;
+ }
+ newpath = pair->two->path;
+ if (new_ent) {
+ newpath = new_ent->key;
+ newinfo = new_ent->value;
+ }
+
+ /*
+ * If pair->one->path isn't in opt->priv->paths, that means
+ * that either directory rename detection removed that
+ * path, or a parent directory of oldpath was resolved and
+ * we don't even need the rename; in either case, we can
+ * skip it. If oldinfo->merged.clean, then the other side
+ * of history had no changes to oldpath and we don't need
+ * the rename and can skip it.
+ */
+ if (!oldinfo || oldinfo->merged.clean)
+ continue;
+
+ /*
+ * diff_filepairs have copies of pathnames, thus we have to
+ * use standard 'strcmp()' (negated) instead of '=='.
+ */
+ if (i + 1 < renames->nr &&
+ !strcmp(oldpath, renames->queue[i+1]->one->path)) {
+ /* Handle rename/rename(1to2) or rename/rename(1to1) */
+ const char *pathnames[3];
+ struct version_info merged;
+ struct conflict_info *base, *side1, *side2;
+ unsigned was_binary_blob = 0;
+
+ pathnames[0] = oldpath;
+ pathnames[1] = newpath;
+ pathnames[2] = renames->queue[i+1]->two->path;
+
+ base = strmap_get(&opt->priv->paths, pathnames[0]);
+ side1 = strmap_get(&opt->priv->paths, pathnames[1]);
+ side2 = strmap_get(&opt->priv->paths, pathnames[2]);
+
+ VERIFY_CI(base);
+ VERIFY_CI(side1);
+ VERIFY_CI(side2);
+
+ if (!strcmp(pathnames[1], pathnames[2])) {
+ /* Both sides renamed the same way */
+ assert(side1 == side2);
+ memcpy(&side1->stages[0], &base->stages[0],
+ sizeof(merged));
+ side1->filemask |= (1 << MERGE_BASE);
+ /* Mark base as resolved by removal */
+ base->merged.is_null = 1;
+ base->merged.clean = 1;
+
+ /* We handled both renames, i.e. i+1 handled */
+ i++;
+ /* Move to next rename */
+ continue;
+ }
+
+ /* This is a rename/rename(1to2) */
+ clean_merge = handle_content_merge(opt,
+ pair->one->path,
+ &base->stages[0],
+ &side1->stages[1],
+ &side2->stages[2],
+ pathnames,
+ 1 + 2 * opt->priv->call_depth,
+ &merged);
+ if (!clean_merge &&
+ merged.mode == side1->stages[1].mode &&
+ oideq(&merged.oid, &side1->stages[1].oid))
+ was_binary_blob = 1;
+ memcpy(&side1->stages[1], &merged, sizeof(merged));
+ if (was_binary_blob) {
+ /*
+ * Getting here means we were attempting to
+ * merge a binary blob.
+ *
+ * Since we can't merge binaries,
+ * handle_content_merge() just takes one
+ * side. But we don't want to copy the
+ * contents of one side to both paths. We
+ * used the contents of side1 above for
+ * side1->stages, let's use the contents of
+ * side2 for side2->stages below.
+ */
+ oidcpy(&merged.oid, &side2->stages[2].oid);
+ merged.mode = side2->stages[2].mode;
+ }
+ memcpy(&side2->stages[2], &merged, sizeof(merged));
+
+ side1->path_conflict = 1;
+ side2->path_conflict = 1;
+ /*
+ * TODO: For renames we normally remove the path at the
+ * old name. It would thus seem consistent to do the
+ * same for rename/rename(1to2) cases, but we haven't
+ * done so traditionally and a number of the regression
+ * tests now encode an expectation that the file is
+ * left there at stage 1. If we ever decide to change
+ * this, add the following two lines here:
+ * base->merged.is_null = 1;
+ * base->merged.clean = 1;
+ * and remove the setting of base->path_conflict to 1.
+ */
+ base->path_conflict = 1;
+ path_msg(opt, oldpath, 0,
+ _("CONFLICT (rename/rename): %s renamed to "
+ "%s in %s and to %s in %s."),
+ pathnames[0],
+ pathnames[1], opt->branch1,
+ pathnames[2], opt->branch2);
+
+ i++; /* We handled both renames, i.e. i+1 handled */
+ continue;
+ }
+
+ VERIFY_CI(oldinfo);
+ VERIFY_CI(newinfo);
+ target_index = pair->score; /* from collect_renames() */
+ assert(target_index == 1 || target_index == 2);
+ other_source_index = 3 - target_index;
+ old_sidemask = (1 << other_source_index); /* 2 or 4 */
+ source_deleted = (oldinfo->filemask == 1);
+ collision = ((newinfo->filemask & old_sidemask) != 0);
+ type_changed = !source_deleted &&
+ (S_ISREG(oldinfo->stages[other_source_index].mode) !=
+ S_ISREG(newinfo->stages[target_index].mode));
+ if (type_changed && collision) {
+ /*
+ * special handling so later blocks can handle this...
+ *
+ * if type_changed && collision are both true, then this
+ * was really a double rename, but one side wasn't
+ * detected due to lack of break detection. I.e.
+ * something like
+ * orig: has normal file 'foo'
+ * side1: renames 'foo' to 'bar', adds 'foo' symlink
+ * side2: renames 'foo' to 'bar'
+ * In this case, the foo->bar rename on side1 won't be
+ * detected because the new symlink named 'foo' is
+ * there and we don't do break detection. But we detect
+ * this here because we don't want to merge the content
+ * of the foo symlink with the foo->bar file, so we
+ * have some logic to handle this special case. The
+ * easiest way to do that is make 'bar' on side1 not
+ * be considered a colliding file but the other part
+ * of a normal rename. If the file is very different,
+ * well we're going to get content merge conflicts
+ * anyway so it doesn't hurt. And if the colliding
+ * file also has a different type, that'll be handled
+ * by the content merge logic in process_entry() too.
+ *
+ * See also t6430, 'rename vs. rename/symlink'
+ */
+ collision = 0;
+ }
+ if (source_deleted) {
+ if (target_index == 1) {
+ rename_branch = opt->branch1;
+ delete_branch = opt->branch2;
+ } else {
+ rename_branch = opt->branch2;
+ delete_branch = opt->branch1;
+ }
+ }
+
+ assert(source_deleted || oldinfo->filemask & old_sidemask);
+
+ /* Need to check for special types of rename conflicts... */
+ if (collision && !source_deleted) {
+ /* collision: rename/add or rename/rename(2to1) */
+ const char *pathnames[3];
+ struct version_info merged;
+
+ struct conflict_info *base, *side1, *side2;
+ unsigned clean;
+
+ pathnames[0] = oldpath;
+ pathnames[other_source_index] = oldpath;
+ pathnames[target_index] = newpath;
+
+ base = strmap_get(&opt->priv->paths, pathnames[0]);
+ side1 = strmap_get(&opt->priv->paths, pathnames[1]);
+ side2 = strmap_get(&opt->priv->paths, pathnames[2]);
+
+ VERIFY_CI(base);
+ VERIFY_CI(side1);
+ VERIFY_CI(side2);
+
+ clean = handle_content_merge(opt, pair->one->path,
+ &base->stages[0],
+ &side1->stages[1],
+ &side2->stages[2],
+ pathnames,
+ 1 + 2 * opt->priv->call_depth,
+ &merged);
+
+ memcpy(&newinfo->stages[target_index], &merged,
+ sizeof(merged));
+ if (!clean) {
+ path_msg(opt, newpath, 0,
+ _("CONFLICT (rename involved in "
+ "collision): rename of %s -> %s has "
+ "content conflicts AND collides "
+ "with another path; this may result "
+ "in nested conflict markers."),
+ oldpath, newpath);
+ }
+ } else if (collision && source_deleted) {
+ /*
+ * rename/add/delete or rename/rename(2to1)/delete:
+ * since oldpath was deleted on the side that didn't
+ * do the rename, there's not much of a content merge
+ * we can do for the rename. oldinfo->merged.is_null
+ * was already set, so we just leave things as-is so
+ * they look like an add/add conflict.
+ */
+
+ newinfo->path_conflict = 1;
+ path_msg(opt, newpath, 0,
+ _("CONFLICT (rename/delete): %s renamed "
+ "to %s in %s, but deleted in %s."),
+ oldpath, newpath, rename_branch, delete_branch);
+ } else {
+ /*
+ * a few different cases...start by copying the
+ * existing stage(s) from oldinfo over the newinfo
+ * and update the pathname(s).
+ */
+ memcpy(&newinfo->stages[0], &oldinfo->stages[0],
+ sizeof(newinfo->stages[0]));
+ newinfo->filemask |= (1 << MERGE_BASE);
+ newinfo->pathnames[0] = oldpath;
+ if (type_changed) {
+ /* rename vs. typechange */
+ /* Mark the original as resolved by removal */
+ memcpy(&oldinfo->stages[0].oid, &null_oid,
+ sizeof(oldinfo->stages[0].oid));
+ oldinfo->stages[0].mode = 0;
+ oldinfo->filemask &= 0x06;
+ } else if (source_deleted) {
+ /* rename/delete */
+ newinfo->path_conflict = 1;
+ path_msg(opt, newpath, 0,
+ _("CONFLICT (rename/delete): %s renamed"
+ " to %s in %s, but deleted in %s."),
+ oldpath, newpath,
+ rename_branch, delete_branch);
+ } else {
+ /* normal rename */
+ memcpy(&newinfo->stages[other_source_index],
+ &oldinfo->stages[other_source_index],
+ sizeof(newinfo->stages[0]));
+ newinfo->filemask |= (1 << other_source_index);
+ newinfo->pathnames[other_source_index] = oldpath;
+ }
+ }
+
+ if (!type_changed) {
+ /* Mark the original as resolved by removal */
+ oldinfo->merged.is_null = 1;
+ oldinfo->merged.clean = 1;
+ }
+
+ }
+
+ return clean_merge;
+}
+
+static void resolve_diffpair_statuses(struct diff_queue_struct *q)
+{
+ /*
+ * A simplified version of diff_resolve_rename_copy(); would probably
+ * just use that function but it's static...
+ */
+ int i;
+ struct diff_filepair *p;
+
+ for (i = 0; i < q->nr; ++i) {
+ p = q->queue[i];
+ p->status = 0; /* undecided */
+ if (!DIFF_FILE_VALID(p->one))
+ p->status = DIFF_STATUS_ADDED;
+ else if (!DIFF_FILE_VALID(p->two))
+ p->status = DIFF_STATUS_DELETED;
+ else if (DIFF_PAIR_RENAME(p))
+ p->status = DIFF_STATUS_RENAMED;
+ }
+}
+
+static int compare_pairs(const void *a_, const void *b_)
+{
+ const struct diff_filepair *a = *((const struct diff_filepair **)a_);
+ const struct diff_filepair *b = *((const struct diff_filepair **)b_);
+
+ return strcmp(a->one->path, b->one->path);
+}
+
+/* Call diffcore_rename() to compute which files have changed on given side */
+static void detect_regular_renames(struct merge_options *opt,
+ unsigned side_index)
+{
+ struct diff_options diff_opts;
+ struct rename_info *renames = &opt->priv->renames;
+
+ repo_diff_setup(opt->repo, &diff_opts);
+ diff_opts.flags.recursive = 1;
+ diff_opts.flags.rename_empty = 0;
+ diff_opts.detect_rename = DIFF_DETECT_RENAME;
+ diff_opts.rename_limit = opt->rename_limit;
+ if (opt->rename_limit <= 0)
+ diff_opts.rename_limit = 1000;
+ diff_opts.rename_score = opt->rename_score;
+ diff_opts.show_rename_progress = opt->show_rename_progress;
+ diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
+ diff_setup_done(&diff_opts);
+
+ diff_queued_diff = renames->pairs[side_index];
+ trace2_region_enter("diff", "diffcore_rename", opt->repo);
+ diffcore_rename(&diff_opts);
+ trace2_region_leave("diff", "diffcore_rename", opt->repo);
+ resolve_diffpair_statuses(&diff_queued_diff);
+
+ if (diff_opts.needed_rename_limit > renames->needed_limit)
+ renames->needed_limit = diff_opts.needed_rename_limit;
+
+ renames->pairs[side_index] = diff_queued_diff;
+
+ diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
+ diff_queued_diff.nr = 0;
+ diff_queued_diff.queue = NULL;
+ diff_flush(&diff_opts);
+}
+
+/*
+ * Get information of all renames which occurred in 'side_pairs', discarding
+ * non-renames.
+ */
+static int collect_renames(struct merge_options *opt,
+ struct diff_queue_struct *result,
+ unsigned side_index,
+ struct strmap *dir_renames_for_side,
+ struct strmap *rename_exclusions)
+{
+ int i, clean = 1;
+ struct strmap collisions;
+ struct diff_queue_struct *side_pairs;
+ struct hashmap_iter iter;
+ struct strmap_entry *entry;
+ struct rename_info *renames = &opt->priv->renames;
+
+ side_pairs = &renames->pairs[side_index];
+ compute_collisions(&collisions, dir_renames_for_side, side_pairs);
+
+ for (i = 0; i < side_pairs->nr; ++i) {
+ struct diff_filepair *p = side_pairs->queue[i];
+ char *new_path; /* non-NULL only with directory renames */
+
+ if (p->status != 'A' && p->status != 'R') {
+ diff_free_filepair(p);
+ continue;
+ }
+
+ new_path = check_for_directory_rename(opt, p->two->path,
+ side_index,
+ dir_renames_for_side,
+ rename_exclusions,
+ &collisions,
+ &clean);
+
+ if (p->status != 'R' && !new_path) {
+ diff_free_filepair(p);
+ continue;
+ }
+
+ if (new_path)
+ apply_directory_rename_modifications(opt, p, new_path);
+
+ /*
+ * p->score comes back from diffcore_rename_extended() with
+ * the similarity of the renamed file. The similarity is
+ * was used to determine that the two files were related
+ * and are a rename, which we have already used, but beyond
+ * that we have no use for the similarity. So p->score is
+ * now irrelevant. However, process_renames() will need to
+ * know which side of the merge this rename was associated
+ * with, so overwrite p->score with that value.
+ */
+ p->score = side_index;
+ result->queue[result->nr++] = p;
+ }
+
+ /* Free each value in the collisions map */
+ strmap_for_each_entry(&collisions, &iter, entry) {
+ struct collision_info *info = entry->value;
+ string_list_clear(&info->source_files, 0);
+ }
+ /*
+ * In compute_collisions(), we set collisions.strdup_strings to 0
+ * so that we wouldn't have to make another copy of the new_path
+ * allocated by apply_dir_rename(). But now that we've used them
+ * and have no other references to these strings, it is time to
+ * deallocate them.
+ */
+ free_strmap_strings(&collisions);
+ strmap_clear(&collisions, 1);
+ return clean;
+}
+
+static int detect_and_process_renames(struct merge_options *opt,
+ struct tree *merge_base,
+ struct tree *side1,
+ struct tree *side2)
+{
+ struct diff_queue_struct combined;
+ struct rename_info *renames = &opt->priv->renames;
+ int need_dir_renames, s, clean = 1;
+
+ memset(&combined, 0, sizeof(combined));
+
+ trace2_region_enter("merge", "regular renames", opt->repo);
+ detect_regular_renames(opt, MERGE_SIDE1);
+ detect_regular_renames(opt, MERGE_SIDE2);
+ trace2_region_leave("merge", "regular renames", opt->repo);
+
+ trace2_region_enter("merge", "directory renames", opt->repo);
+ need_dir_renames =
+ !opt->priv->call_depth &&
+ (opt->detect_directory_renames == MERGE_DIRECTORY_RENAMES_TRUE ||
+ opt->detect_directory_renames == MERGE_DIRECTORY_RENAMES_CONFLICT);
+
+ if (need_dir_renames) {
+ get_provisional_directory_renames(opt, MERGE_SIDE1, &clean);
+ get_provisional_directory_renames(opt, MERGE_SIDE2, &clean);
+ handle_directory_level_conflicts(opt);
+ }
+
+ ALLOC_GROW(combined.queue,
+ renames->pairs[1].nr + renames->pairs[2].nr,
+ combined.alloc);
+ clean &= collect_renames(opt, &combined, MERGE_SIDE1,
+ &renames->dir_renames[2],
+ &renames->dir_renames[1]);
+ clean &= collect_renames(opt, &combined, MERGE_SIDE2,
+ &renames->dir_renames[1],
+ &renames->dir_renames[2]);
+ QSORT(combined.queue, combined.nr, compare_pairs);
+ trace2_region_leave("merge", "directory renames", opt->repo);
+
+ trace2_region_enter("merge", "process renames", opt->repo);
+ clean &= process_renames(opt, &combined);
+ trace2_region_leave("merge", "process renames", opt->repo);
+
+ /* Free memory for renames->pairs[] and combined */
+ for (s = MERGE_SIDE1; s <= MERGE_SIDE2; s++) {
+ free(renames->pairs[s].queue);
+ DIFF_QUEUE_CLEAR(&renames->pairs[s]);
+ }
+ if (combined.nr) {
+ int i;
+ for (i = 0; i < combined.nr; i++)
+ diff_free_filepair(combined.queue[i]);
+ free(combined.queue);
+ }
+
+ return clean;
+}
+
+/*** Function Grouping: functions related to process_entries() ***/
+
+static int string_list_df_name_compare(const char *one, const char *two)
+{
+ int onelen = strlen(one);
+ int twolen = strlen(two);
+ /*
+ * Here we only care that entries for D/F conflicts are
+ * adjacent, in particular with the file of the D/F conflict
+ * appearing before files below the corresponding directory.
+ * The order of the rest of the list is irrelevant for us.
+ *
+ * To achieve this, we sort with df_name_compare and provide
+ * the mode S_IFDIR so that D/F conflicts will sort correctly.
+ * We use the mode S_IFDIR for everything else for simplicity,
+ * since in other cases any changes in their order due to
+ * sorting cause no problems for us.
+ */
+ int cmp = df_name_compare(one, onelen, S_IFDIR,
+ two, twolen, S_IFDIR);
+ /*
+ * Now that 'foo' and 'foo/bar' compare equal, we have to make sure
+ * that 'foo' comes before 'foo/bar'.
+ */
+ if (cmp)
+ return cmp;
+ return onelen - twolen;
+}
+
+struct directory_versions {
+ /*
+ * versions: list of (basename -> version_info)
+ *
+ * The basenames are in reverse lexicographic order of full pathnames,
+ * as processed in process_entries(). This puts all entries within
+ * a directory together, and covers the directory itself after
+ * everything within it, allowing us to write subtrees before needing
+ * to record information for the tree itself.
+ */
+ struct string_list versions;
+
+ /*
+ * offsets: list of (full relative path directories -> integer offsets)
+ *
+ * Since versions contains basenames from files in multiple different
+ * directories, we need to know which entries in versions correspond
+ * to which directories. Values of e.g.
+ * "" 0
+ * src 2
+ * src/moduleA 5
+ * Would mean that entries 0-1 of versions are files in the toplevel
+ * directory, entries 2-4 are files under src/, and the remaining
+ * entries starting at index 5 are files under src/moduleA/.
+ */
+ struct string_list offsets;
+
+ /*
+ * last_directory: directory that previously processed file found in
+ *
+ * last_directory starts NULL, but records the directory in which the
+ * previous file was found within. As soon as
+ * directory(current_file) != last_directory
+ * then we need to start updating accounting in versions & offsets.
+ * Note that last_directory is always the last path in "offsets" (or
+ * NULL if "offsets" is empty) so this exists just for quick access.
+ */
+ const char *last_directory;
+
+ /* last_directory_len: cached computation of strlen(last_directory) */
+ unsigned last_directory_len;
+};
+
+static int tree_entry_order(const void *a_, const void *b_)
+{
+ const struct string_list_item *a = a_;
+ const struct string_list_item *b = b_;
+
+ const struct merged_info *ami = a->util;
+ const struct merged_info *bmi = b->util;
+ return base_name_compare(a->string, strlen(a->string), ami->result.mode,
+ b->string, strlen(b->string), bmi->result.mode);
+}
+
+static void write_tree(struct object_id *result_oid,
+ struct string_list *versions,
+ unsigned int offset,
+ size_t hash_size)
+{
+ size_t maxlen = 0, extra;
+ unsigned int nr = versions->nr - offset;
+ struct strbuf buf = STRBUF_INIT;
+ struct string_list relevant_entries = STRING_LIST_INIT_NODUP;
+ int i;
+
+ /*
+ * We want to sort the last (versions->nr-offset) entries in versions.
+ * Do so by abusing the string_list API a bit: make another string_list
+ * that contains just those entries and then sort them.
+ *
+ * We won't use relevant_entries again and will let it just pop off the
+ * stack, so there won't be allocation worries or anything.
+ */
+ relevant_entries.items = versions->items + offset;
+ relevant_entries.nr = versions->nr - offset;
+ QSORT(relevant_entries.items, relevant_entries.nr, tree_entry_order);
+
+ /* Pre-allocate some space in buf */
+ extra = hash_size + 8; /* 8: 6 for mode, 1 for space, 1 for NUL char */
+ for (i = 0; i < nr; i++) {
+ maxlen += strlen(versions->items[offset+i].string) + extra;
+ }
+ strbuf_grow(&buf, maxlen);
+
+ /* Write each entry out to buf */
+ for (i = 0; i < nr; i++) {
+ struct merged_info *mi = versions->items[offset+i].util;
+ struct version_info *ri = &mi->result;
+ strbuf_addf(&buf, "%o %s%c",
+ ri->mode,
+ versions->items[offset+i].string, '\0');
+ strbuf_add(&buf, ri->oid.hash, hash_size);
+ }
+
+ /* Write this object file out, and record in result_oid */
+ write_object_file(buf.buf, buf.len, tree_type, result_oid);
+ strbuf_release(&buf);
+}
+
+static void record_entry_for_tree(struct directory_versions *dir_metadata,
+ const char *path,
+ struct merged_info *mi)
+{
+ const char *basename;
+
+ if (mi->is_null)
+ /* nothing to record */
+ return;
+
+ basename = path + mi->basename_offset;
+ assert(strchr(basename, '/') == NULL);
+ string_list_append(&dir_metadata->versions,
+ basename)->util = &mi->result;
+}
+
+static void write_completed_directory(struct merge_options *opt,
+ const char *new_directory_name,
+ struct directory_versions *info)
+{
+ const char *prev_dir;
+ struct merged_info *dir_info = NULL;
+ unsigned int offset;
+
+ /*
+ * Some explanation of info->versions and info->offsets...
+ *
+ * process_entries() iterates over all relevant files AND
+ * directories in reverse lexicographic order, and calls this
+ * function. Thus, an example of the paths that process_entries()
+ * could operate on (along with the directories for those paths
+ * being shown) is:
+ *
+ * xtract.c ""
+ * tokens.txt ""
+ * src/moduleB/umm.c src/moduleB
+ * src/moduleB/stuff.h src/moduleB
+ * src/moduleB/baz.c src/moduleB
+ * src/moduleB src
+ * src/moduleA/foo.c src/moduleA
+ * src/moduleA/bar.c src/moduleA
+ * src/moduleA src
+ * src ""
+ * Makefile ""
+ *
+ * info->versions:
+ *
+ * always contains the unprocessed entries and their
+ * version_info information. For example, after the first five
+ * entries above, info->versions would be:
+ *
+ * xtract.c <xtract.c's version_info>
+ * token.txt <token.txt's version_info>
+ * umm.c <src/moduleB/umm.c's version_info>
+ * stuff.h <src/moduleB/stuff.h's version_info>
+ * baz.c <src/moduleB/baz.c's version_info>
+ *
+ * Once a subdirectory is completed we remove the entries in
+ * that subdirectory from info->versions, writing it as a tree
+ * (write_tree()). Thus, as soon as we get to src/moduleB,
+ * info->versions would be updated to
+ *
+ * xtract.c <xtract.c's version_info>
+ * token.txt <token.txt's version_info>
+ * moduleB <src/moduleB's version_info>
+ *
+ * info->offsets:
+ *
+ * helps us track which entries in info->versions correspond to
+ * which directories. When we are N directories deep (e.g. 4
+ * for src/modA/submod/subdir/), we have up to N+1 unprocessed
+ * directories (+1 because of toplevel dir). Corresponding to
+ * the info->versions example above, after processing five entries
+ * info->offsets will be:
+ *
+ * "" 0
+ * src/moduleB 2
+ *
+ * which is used to know that xtract.c & token.txt are from the
+ * toplevel dirctory, while umm.c & stuff.h & baz.c are from the
+ * src/moduleB directory. Again, following the example above,
+ * once we need to process src/moduleB, then info->offsets is
+ * updated to
+ *
+ * "" 0
+ * src 2
+ *
+ * which says that moduleB (and only moduleB so far) is in the
+ * src directory.
+ *
+ * One unique thing to note about info->offsets here is that
+ * "src" was not added to info->offsets until there was a path
+ * (a file OR directory) immediately below src/ that got
+ * processed.
+ *
+ * Since process_entry() just appends new entries to info->versions,
+ * write_completed_directory() only needs to do work if the next path
+ * is in a directory that is different than the last directory found
+ * in info->offsets.
+ */
+
+ /*
+ * If we are working with the same directory as the last entry, there
+ * is no work to do. (See comments above the directory_name member of
+ * struct merged_info for why we can use pointer comparison instead of
+ * strcmp here.)
+ */
+ if (new_directory_name == info->last_directory)
+ return;
+
+ /*
+ * If we are just starting (last_directory is NULL), or last_directory
+ * is a prefix of the current directory, then we can just update
+ * info->offsets to record the offset where we started this directory
+ * and update last_directory to have quick access to it.
+ */
+ if (info->last_directory == NULL ||
+ !strncmp(new_directory_name, info->last_directory,
+ info->last_directory_len)) {
+ uintptr_t offset = info->versions.nr;
+
+ info->last_directory = new_directory_name;
+ info->last_directory_len = strlen(info->last_directory);
+ /*
+ * Record the offset into info->versions where we will
+ * start recording basenames of paths found within
+ * new_directory_name.
+ */
+ string_list_append(&info->offsets,
+ info->last_directory)->util = (void*)offset;
+ return;
+ }
+
+ /*
+ * The next entry that will be processed will be within
+ * new_directory_name. Since at this point we know that
+ * new_directory_name is within a different directory than
+ * info->last_directory, we have all entries for info->last_directory
+ * in info->versions and we need to create a tree object for them.
+ */
+ dir_info = strmap_get(&opt->priv->paths, info->last_directory);
+ assert(dir_info);
+ offset = (uintptr_t)info->offsets.items[info->offsets.nr-1].util;
+ if (offset == info->versions.nr) {
+ /*
+ * Actually, we don't need to create a tree object in this
+ * case. Whenever all files within a directory disappear
+ * during the merge (e.g. unmodified on one side and
+ * deleted on the other, or files were renamed elsewhere),
+ * then we get here and the directory itself needs to be
+ * omitted from its parent tree as well.
+ */
+ dir_info->is_null = 1;
+ } else {
+ /*
+ * Write out the tree to the git object directory, and also
+ * record the mode and oid in dir_info->result.
+ */
+ dir_info->is_null = 0;
+ dir_info->result.mode = S_IFDIR;
+ write_tree(&dir_info->result.oid, &info->versions, offset,
+ opt->repo->hash_algo->rawsz);
+ }
+
+ /*
+ * We've now used several entries from info->versions and one entry
+ * from info->offsets, so we get rid of those values.
+ */
+ info->offsets.nr--;
+ info->versions.nr = offset;
+
+ /*
+ * Now we've taken care of the completed directory, but we need to
+ * prepare things since future entries will be in
+ * new_directory_name. (In particular, process_entry() will be
+ * appending new entries to info->versions.) So, we need to make
+ * sure new_directory_name is the last entry in info->offsets.
+ */
+ prev_dir = info->offsets.nr == 0 ? NULL :
+ info->offsets.items[info->offsets.nr-1].string;
+ if (new_directory_name != prev_dir) {
+ uintptr_t c = info->versions.nr;
+ string_list_append(&info->offsets,
+ new_directory_name)->util = (void*)c;
+ }
+
+ /* And, of course, we need to update last_directory to match. */
+ info->last_directory = new_directory_name;
+ info->last_directory_len = strlen(info->last_directory);
+}
+
+/* Per entry merge function */
+static void process_entry(struct merge_options *opt,
+ const char *path,
+ struct conflict_info *ci,
+ struct directory_versions *dir_metadata)
+{
+ int df_file_index = 0;
+
+ VERIFY_CI(ci);
+ assert(ci->filemask >= 0 && ci->filemask <= 7);
+ /* ci->match_mask == 7 was handled in collect_merge_info_callback() */
+ assert(ci->match_mask == 0 || ci->match_mask == 3 ||
+ ci->match_mask == 5 || ci->match_mask == 6);
+
+ if (ci->dirmask) {
+ record_entry_for_tree(dir_metadata, path, &ci->merged);
+ if (ci->filemask == 0)
+ /* nothing else to handle */
+ return;
+ assert(ci->df_conflict);
+ }
+
+ if (ci->df_conflict && ci->merged.result.mode == 0) {
+ int i;
+
+ /*
+ * directory no longer in the way, but we do have a file we
+ * need to place here so we need to clean away the "directory
+ * merges to nothing" result.
+ */
+ ci->df_conflict = 0;
+ assert(ci->filemask != 0);
+ ci->merged.clean = 0;
+ ci->merged.is_null = 0;
+ /* and we want to zero out any directory-related entries */
+ ci->match_mask = (ci->match_mask & ~ci->dirmask);
+ ci->dirmask = 0;
+ for (i = MERGE_BASE; i <= MERGE_SIDE2; i++) {
+ if (ci->filemask & (1 << i))
+ continue;
+ ci->stages[i].mode = 0;
+ oidcpy(&ci->stages[i].oid, &null_oid);
+ }
+ } else if (ci->df_conflict && ci->merged.result.mode != 0) {
+ /*
+ * This started out as a D/F conflict, and the entries in
+ * the competing directory were not removed by the merge as
+ * evidenced by write_completed_directory() writing a value
+ * to ci->merged.result.mode.
+ */
+ struct conflict_info *new_ci;
+ const char *branch;
+ const char *old_path = path;
+ int i;
+
+ assert(ci->merged.result.mode == S_IFDIR);
+
+ /*
+ * If filemask is 1, we can just ignore the file as having
+ * been deleted on both sides. We do not want to overwrite
+ * ci->merged.result, since it stores the tree for all the
+ * files under it.
+ */
+ if (ci->filemask == 1) {
+ ci->filemask = 0;
+ return;
+ }
+
+ /*
+ * This file still exists on at least one side, and we want
+ * the directory to remain here, so we need to move this
+ * path to some new location.
+ */
+ CALLOC_ARRAY(new_ci, 1);
+ /* We don't really want new_ci->merged.result copied, but it'll
+ * be overwritten below so it doesn't matter. We also don't
+ * want any directory mode/oid values copied, but we'll zero
+ * those out immediately. We do want the rest of ci copied.
+ */
+ memcpy(new_ci, ci, sizeof(*ci));
+ new_ci->match_mask = (new_ci->match_mask & ~new_ci->dirmask);
+ new_ci->dirmask = 0;
+ for (i = MERGE_BASE; i <= MERGE_SIDE2; i++) {
+ if (new_ci->filemask & (1 << i))
+ continue;
+ /* zero out any entries related to directories */
+ new_ci->stages[i].mode = 0;
+ oidcpy(&new_ci->stages[i].oid, &null_oid);
+ }
+
+ /*
+ * Find out which side this file came from; note that we
+ * cannot just use ci->filemask, because renames could cause
+ * the filemask to go back to 7. So we use dirmask, then
+ * pick the opposite side's index.
+ */
+ df_file_index = (ci->dirmask & (1 << 1)) ? 2 : 1;
+ branch = (df_file_index == 1) ? opt->branch1 : opt->branch2;
+ path = unique_path(&opt->priv->paths, path, branch);
+ strmap_put(&opt->priv->paths, path, new_ci);
+
+ path_msg(opt, path, 0,
+ _("CONFLICT (file/directory): directory in the way "
+ "of %s from %s; moving it to %s instead."),
+ old_path, branch, path);
+
+ /*
+ * Zero out the filemask for the old ci. At this point, ci
+ * was just an entry for a directory, so we don't need to
+ * do anything more with it.
+ */
+ ci->filemask = 0;
+
+ /*
+ * Now note that we're working on the new entry (path was
+ * updated above.
+ */
+ ci = new_ci;
+ }
+
+ /*
+ * NOTE: Below there is a long switch-like if-elseif-elseif... block
+ * which the code goes through even for the df_conflict cases
+ * above.
+ */
+ if (ci->match_mask) {
+ ci->merged.clean = 1;
+ if (ci->match_mask == 6) {
+ /* stages[1] == stages[2] */
+ ci->merged.result.mode = ci->stages[1].mode;
+ oidcpy(&ci->merged.result.oid, &ci->stages[1].oid);
+ } else {
+ /* determine the mask of the side that didn't match */
+ unsigned int othermask = 7 & ~ci->match_mask;
+ int side = (othermask == 4) ? 2 : 1;
+
+ ci->merged.result.mode = ci->stages[side].mode;
+ ci->merged.is_null = !ci->merged.result.mode;
+ oidcpy(&ci->merged.result.oid, &ci->stages[side].oid);
+
+ assert(othermask == 2 || othermask == 4);
+ assert(ci->merged.is_null ==
+ (ci->filemask == ci->match_mask));
+ }
+ } else if (ci->filemask >= 6 &&
+ (S_IFMT & ci->stages[1].mode) !=
+ (S_IFMT & ci->stages[2].mode)) {
+ /* Two different items from (file/submodule/symlink) */
+ if (opt->priv->call_depth) {
+ /* Just use the version from the merge base */
+ ci->merged.clean = 0;
+ oidcpy(&ci->merged.result.oid, &ci->stages[0].oid);
+ ci->merged.result.mode = ci->stages[0].mode;
+ ci->merged.is_null = (ci->merged.result.mode == 0);
+ } else {
+ /* Handle by renaming one or both to separate paths. */
+ unsigned o_mode = ci->stages[0].mode;
+ unsigned a_mode = ci->stages[1].mode;
+ unsigned b_mode = ci->stages[2].mode;
+ struct conflict_info *new_ci;
+ const char *a_path = NULL, *b_path = NULL;
+ int rename_a = 0, rename_b = 0;
+
+ new_ci = xmalloc(sizeof(*new_ci));
+
+ if (S_ISREG(a_mode))
+ rename_a = 1;
+ else if (S_ISREG(b_mode))
+ rename_b = 1;
+ else {
+ rename_a = 1;
+ rename_b = 1;
+ }
+
+ path_msg(opt, path, 0,
+ _("CONFLICT (distinct types): %s had different "
+ "types on each side; renamed %s of them so "
+ "each can be recorded somewhere."),
+ path,
+ (rename_a && rename_b) ? _("both") : _("one"));
+
+ ci->merged.clean = 0;
+ memcpy(new_ci, ci, sizeof(*new_ci));
+
+ /* Put b into new_ci, removing a from stages */
+ new_ci->merged.result.mode = ci->stages[2].mode;
+ oidcpy(&new_ci->merged.result.oid, &ci->stages[2].oid);
+ new_ci->stages[1].mode = 0;
+ oidcpy(&new_ci->stages[1].oid, &null_oid);
+ new_ci->filemask = 5;
+ if ((S_IFMT & b_mode) != (S_IFMT & o_mode)) {
+ new_ci->stages[0].mode = 0;
+ oidcpy(&new_ci->stages[0].oid, &null_oid);
+ new_ci->filemask = 4;
+ }
+
+ /* Leave only a in ci, fixing stages. */
+ ci->merged.result.mode = ci->stages[1].mode;
+ oidcpy(&ci->merged.result.oid, &ci->stages[1].oid);
+ ci->stages[2].mode = 0;
+ oidcpy(&ci->stages[2].oid, &null_oid);
+ ci->filemask = 3;
+ if ((S_IFMT & a_mode) != (S_IFMT & o_mode)) {
+ ci->stages[0].mode = 0;
+ oidcpy(&ci->stages[0].oid, &null_oid);
+ ci->filemask = 2;
+ }
+
+ /* Insert entries into opt->priv_paths */
+ assert(rename_a || rename_b);
+ if (rename_a) {
+ a_path = unique_path(&opt->priv->paths,
+ path, opt->branch1);
+ strmap_put(&opt->priv->paths, a_path, ci);
+ }
+
+ if (rename_b)
+ b_path = unique_path(&opt->priv->paths,
+ path, opt->branch2);
+ else
+ b_path = path;
+ strmap_put(&opt->priv->paths, b_path, new_ci);
+
+ if (rename_a && rename_b) {
+ strmap_remove(&opt->priv->paths, path, 0);
+ /*
+ * We removed path from opt->priv->paths. path
+ * will also eventually need to be freed, but
+ * it may still be used by e.g. ci->pathnames.
+ * So, store it in another string-list for now.
+ */
+ string_list_append(&opt->priv->paths_to_free,
+ path);
+ }
+
+ /*
+ * Do special handling for b_path since process_entry()
+ * won't be called on it specially.
+ */
+ strmap_put(&opt->priv->conflicted, b_path, new_ci);
+ record_entry_for_tree(dir_metadata, b_path,
+ &new_ci->merged);
+
+ /*
+ * Remaining code for processing this entry should
+ * think in terms of processing a_path.
+ */
+ if (a_path)
+ path = a_path;
+ }
+ } else if (ci->filemask >= 6) {
+ /* Need a two-way or three-way content merge */
+ struct version_info merged_file;
+ unsigned clean_merge;
+ struct version_info *o = &ci->stages[0];
+ struct version_info *a = &ci->stages[1];
+ struct version_info *b = &ci->stages[2];
+
+ clean_merge = handle_content_merge(opt, path, o, a, b,
+ ci->pathnames,
+ opt->priv->call_depth * 2,
+ &merged_file);
+ ci->merged.clean = clean_merge &&
+ !ci->df_conflict && !ci->path_conflict;
+ ci->merged.result.mode = merged_file.mode;
+ ci->merged.is_null = (merged_file.mode == 0);
+ oidcpy(&ci->merged.result.oid, &merged_file.oid);
+ if (clean_merge && ci->df_conflict) {
+ assert(df_file_index == 1 || df_file_index == 2);
+ ci->filemask = 1 << df_file_index;
+ ci->stages[df_file_index].mode = merged_file.mode;
+ oidcpy(&ci->stages[df_file_index].oid, &merged_file.oid);
+ }
+ if (!clean_merge) {
+ const char *reason = _("content");
+ if (ci->filemask == 6)
+ reason = _("add/add");
+ if (S_ISGITLINK(merged_file.mode))
+ reason = _("submodule");
+ path_msg(opt, path, 0,
+ _("CONFLICT (%s): Merge conflict in %s"),
+ reason, path);
+ }
+ } else if (ci->filemask == 3 || ci->filemask == 5) {
+ /* Modify/delete */
+ const char *modify_branch, *delete_branch;
+ int side = (ci->filemask == 5) ? 2 : 1;
+ int index = opt->priv->call_depth ? 0 : side;
+
+ ci->merged.result.mode = ci->stages[index].mode;
+ oidcpy(&ci->merged.result.oid, &ci->stages[index].oid);
+ ci->merged.clean = 0;
+
+ modify_branch = (side == 1) ? opt->branch1 : opt->branch2;
+ delete_branch = (side == 1) ? opt->branch2 : opt->branch1;
+
+ if (ci->path_conflict &&
+ oideq(&ci->stages[0].oid, &ci->stages[side].oid)) {
+ /*
+ * This came from a rename/delete; no action to take,
+ * but avoid printing "modify/delete" conflict notice
+ * since the contents were not modified.
+ */
+ } else {
+ path_msg(opt, path, 0,
+ _("CONFLICT (modify/delete): %s deleted in %s "
+ "and modified in %s. Version %s of %s left "
+ "in tree."),
+ path, delete_branch, modify_branch,
+ modify_branch, path);
+ }
+ } else if (ci->filemask == 2 || ci->filemask == 4) {
+ /* Added on one side */
+ int side = (ci->filemask == 4) ? 2 : 1;
+ ci->merged.result.mode = ci->stages[side].mode;
+ oidcpy(&ci->merged.result.oid, &ci->stages[side].oid);
+ ci->merged.clean = !ci->df_conflict && !ci->path_conflict;
+ } else if (ci->filemask == 1) {
+ /* Deleted on both sides */
+ ci->merged.is_null = 1;
+ ci->merged.result.mode = 0;
+ oidcpy(&ci->merged.result.oid, &null_oid);
+ ci->merged.clean = !ci->path_conflict;
+ }
+
+ /*
+ * If still conflicted, record it separately. This allows us to later
+ * iterate over just conflicted entries when updating the index instead
+ * of iterating over all entries.
+ */
+ if (!ci->merged.clean)
+ strmap_put(&opt->priv->conflicted, path, ci);
+ record_entry_for_tree(dir_metadata, path, &ci->merged);
+}
+
+static void process_entries(struct merge_options *opt,
+ struct object_id *result_oid)
+{
+ struct hashmap_iter iter;
+ struct strmap_entry *e;
+ struct string_list plist = STRING_LIST_INIT_NODUP;
+ struct string_list_item *entry;
+ struct directory_versions dir_metadata = { STRING_LIST_INIT_NODUP,
+ STRING_LIST_INIT_NODUP,
+ NULL, 0 };
+
+ trace2_region_enter("merge", "process_entries setup", opt->repo);
+ if (strmap_empty(&opt->priv->paths)) {
+ oidcpy(result_oid, opt->repo->hash_algo->empty_tree);
+ return;
+ }
+
+ /* Hack to pre-allocate plist to the desired size */
+ trace2_region_enter("merge", "plist grow", opt->repo);
+ ALLOC_GROW(plist.items, strmap_get_size(&opt->priv->paths), plist.alloc);
+ trace2_region_leave("merge", "plist grow", opt->repo);
+
+ /* Put every entry from paths into plist, then sort */
+ trace2_region_enter("merge", "plist copy", opt->repo);
+ strmap_for_each_entry(&opt->priv->paths, &iter, e) {
+ string_list_append(&plist, e->key)->util = e->value;
+ }
+ trace2_region_leave("merge", "plist copy", opt->repo);
+
+ trace2_region_enter("merge", "plist special sort", opt->repo);
+ plist.cmp = string_list_df_name_compare;
+ string_list_sort(&plist);
+ trace2_region_leave("merge", "plist special sort", opt->repo);
+
+ trace2_region_leave("merge", "process_entries setup", opt->repo);
+
+ /*
+ * Iterate over the items in reverse order, so we can handle paths
+ * below a directory before needing to handle the directory itself.
+ *
+ * This allows us to write subtrees before we need to write trees,
+ * and it also enables sane handling of directory/file conflicts
+ * (because it allows us to know whether the directory is still in
+ * the way when it is time to process the file at the same path).
+ */
+ trace2_region_enter("merge", "processing", opt->repo);
+ for (entry = &plist.items[plist.nr-1]; entry >= plist.items; --entry) {
+ char *path = entry->string;
+ /*
+ * NOTE: mi may actually be a pointer to a conflict_info, but
+ * we have to check mi->clean first to see if it's safe to
+ * reassign to such a pointer type.
+ */
+ struct merged_info *mi = entry->util;
+
+ write_completed_directory(opt, mi->directory_name,
+ &dir_metadata);
+ if (mi->clean)
+ record_entry_for_tree(&dir_metadata, path, mi);
+ else {
+ struct conflict_info *ci = (struct conflict_info *)mi;
+ process_entry(opt, path, ci, &dir_metadata);
+ }
+ }
+ trace2_region_leave("merge", "processing", opt->repo);
+
+ trace2_region_enter("merge", "process_entries cleanup", opt->repo);
+ if (dir_metadata.offsets.nr != 1 ||
+ (uintptr_t)dir_metadata.offsets.items[0].util != 0) {
+ printf("dir_metadata.offsets.nr = %d (should be 1)\n",
+ dir_metadata.offsets.nr);
+ printf("dir_metadata.offsets.items[0].util = %u (should be 0)\n",
+ (unsigned)(uintptr_t)dir_metadata.offsets.items[0].util);
+ fflush(stdout);
+ BUG("dir_metadata accounting completely off; shouldn't happen");
+ }
+ write_tree(result_oid, &dir_metadata.versions, 0,
+ opt->repo->hash_algo->rawsz);
+ string_list_clear(&plist, 0);
+ string_list_clear(&dir_metadata.versions, 0);
+ string_list_clear(&dir_metadata.offsets, 0);
+ trace2_region_leave("merge", "process_entries cleanup", opt->repo);
+}
+
+/*** Function Grouping: functions related to merge_switch_to_result() ***/
+
+static int checkout(struct merge_options *opt,
+ struct tree *prev,
+ struct tree *next)
+{
+ /* Switch the index/working copy from old to new */
+ int ret;
+ struct tree_desc trees[2];
+ struct unpack_trees_options unpack_opts;
+
+ memset(&unpack_opts, 0, sizeof(unpack_opts));
+ unpack_opts.head_idx = -1;
+ unpack_opts.src_index = opt->repo->index;
+ unpack_opts.dst_index = opt->repo->index;
+
+ setup_unpack_trees_porcelain(&unpack_opts, "merge");
+
+ /*
+ * NOTE: if this were just "git checkout" code, we would probably
+ * read or refresh the cache and check for a conflicted index, but
+ * builtin/merge.c or sequencer.c really needs to read the index
+ * and check for conflicted entries before starting merging for a
+ * good user experience (no sense waiting for merges/rebases before
+ * erroring out), so there's no reason to duplicate that work here.
+ */
+
+ /* 2-way merge to the new branch */
+ unpack_opts.update = 1;
+ unpack_opts.merge = 1;
+ unpack_opts.quiet = 0; /* FIXME: sequencer might want quiet? */
+ unpack_opts.verbose_update = (opt->verbosity > 2);
+ unpack_opts.fn = twoway_merge;
+ if (1/* FIXME: opts->overwrite_ignore*/) {
+ CALLOC_ARRAY(unpack_opts.dir, 1);
+ unpack_opts.dir->flags |= DIR_SHOW_IGNORED;
+ setup_standard_excludes(unpack_opts.dir);
+ }
+ parse_tree(prev);
+ init_tree_desc(&trees[0], prev->buffer, prev->size);
+ parse_tree(next);
+ init_tree_desc(&trees[1], next->buffer, next->size);
+
+ ret = unpack_trees(2, trees, &unpack_opts);
+ clear_unpack_trees_porcelain(&unpack_opts);
+ dir_clear(unpack_opts.dir);
+ FREE_AND_NULL(unpack_opts.dir);
+ return ret;
+}
+
+static int record_conflicted_index_entries(struct merge_options *opt,
+ struct index_state *index,
+ struct strmap *paths,
+ struct strmap *conflicted)
+{
+ struct hashmap_iter iter;
+ struct strmap_entry *e;
+ int errs = 0;
+ int original_cache_nr;
+
+ if (strmap_empty(conflicted))
+ return 0;
+
+ original_cache_nr = index->cache_nr;
+
+ /* Put every entry from paths into plist, then sort */
+ strmap_for_each_entry(conflicted, &iter, e) {
+ const char *path = e->key;
+ struct conflict_info *ci = e->value;
+ int pos;
+ struct cache_entry *ce;
+ int i;
+
+ VERIFY_CI(ci);
+
+ /*
+ * The index will already have a stage=0 entry for this path,
+ * because we created an as-merged-as-possible version of the
+ * file and checkout() moved the working copy and index over
+ * to that version.
+ *
+ * However, previous iterations through this loop will have
+ * added unstaged entries to the end of the cache which
+ * ignore the standard alphabetical ordering of cache
+ * entries and break invariants needed for index_name_pos()
+ * to work. However, we know the entry we want is before
+ * those appended cache entries, so do a temporary swap on
+ * cache_nr to only look through entries of interest.
+ */
+ SWAP(index->cache_nr, original_cache_nr);
+ pos = index_name_pos(index, path, strlen(path));
+ SWAP(index->cache_nr, original_cache_nr);
+ if (pos < 0) {
+ if (ci->filemask != 1)
+ BUG("Conflicted %s but nothing in basic working tree or index; this shouldn't happen", path);
+ cache_tree_invalidate_path(index, path);
+ } else {
+ ce = index->cache[pos];
+
+ /*
+ * Clean paths with CE_SKIP_WORKTREE set will not be
+ * written to the working tree by the unpack_trees()
+ * call in checkout(). Our conflicted entries would
+ * have appeared clean to that code since we ignored
+ * the higher order stages. Thus, we need override
+ * the CE_SKIP_WORKTREE bit and manually write those
+ * files to the working disk here.
+ *
+ * TODO: Implement this CE_SKIP_WORKTREE fixup.
+ */
+
+ /*
+ * Mark this cache entry for removal and instead add
+ * new stage>0 entries corresponding to the
+ * conflicts. If there are many conflicted entries, we
+ * want to avoid memmove'ing O(NM) entries by
+ * inserting the new entries one at a time. So,
+ * instead, we just add the new cache entries to the
+ * end (ignoring normal index requirements on sort
+ * order) and sort the index once we're all done.
+ */
+ ce->ce_flags |= CE_REMOVE;
+ }
+
+ for (i = MERGE_BASE; i <= MERGE_SIDE2; i++) {
+ struct version_info *vi;
+ if (!(ci->filemask & (1ul << i)))
+ continue;
+ vi = &ci->stages[i];
+ ce = make_cache_entry(index, vi->mode, &vi->oid,
+ path, i+1, 0);
+ add_index_entry(index, ce, ADD_CACHE_JUST_APPEND);
+ }
+ }
+
+ /*
+ * Remove the unused cache entries (and invalidate the relevant
+ * cache-trees), then sort the index entries to get the conflicted
+ * entries we added to the end into their right locations.
+ */
+ remove_marked_cache_entries(index, 1);
+ QSORT(index->cache, index->cache_nr, cmp_cache_name_compare);
+
+ return errs;
+}
+
+void merge_switch_to_result(struct merge_options *opt,
+ struct tree *head,
+ struct merge_result *result,
+ int update_worktree_and_index,
+ int display_update_msgs)
+{
+ assert(opt->priv == NULL);
+ if (result->clean >= 0 && update_worktree_and_index) {
+ struct merge_options_internal *opti = result->priv;
+
+ trace2_region_enter("merge", "checkout", opt->repo);
+ if (checkout(opt, head, result->tree)) {
+ /* failure to function */
+ result->clean = -1;
+ return;
+ }
+ trace2_region_leave("merge", "checkout", opt->repo);
+
+ trace2_region_enter("merge", "record_conflicted", opt->repo);
+ if (record_conflicted_index_entries(opt, opt->repo->index,
+ &opti->paths,
+ &opti->conflicted)) {
+ /* failure to function */
+ result->clean = -1;
+ return;
+ }
+ trace2_region_leave("merge", "record_conflicted", opt->repo);
+ }
+
+ if (display_update_msgs) {
+ struct merge_options_internal *opti = result->priv;
+ struct hashmap_iter iter;
+ struct strmap_entry *e;
+ struct string_list olist = STRING_LIST_INIT_NODUP;
+ int i;
+
+ trace2_region_enter("merge", "display messages", opt->repo);
+
+ /* Hack to pre-allocate olist to the desired size */
+ ALLOC_GROW(olist.items, strmap_get_size(&opti->output),
+ olist.alloc);
+
+ /* Put every entry from output into olist, then sort */
+ strmap_for_each_entry(&opti->output, &iter, e) {
+ string_list_append(&olist, e->key)->util = e->value;
+ }
+ string_list_sort(&olist);
+
+ /* Iterate over the items, printing them */
+ for (i = 0; i < olist.nr; ++i) {
+ struct strbuf *sb = olist.items[i].util;
+
+ printf("%s", sb->buf);
+ }
+ string_list_clear(&olist, 0);
+
+ /* Also include needed rename limit adjustment now */
+ diff_warn_rename_limit("merge.renamelimit",
+ opti->renames.needed_limit, 0);
+
+ trace2_region_leave("merge", "display messages", opt->repo);
+ }
+
+ merge_finalize(opt, result);
+}
+
+void merge_finalize(struct merge_options *opt,
+ struct merge_result *result)
+{
+ struct merge_options_internal *opti = result->priv;
+
+ assert(opt->priv == NULL);
+
+ clear_or_reinit_internal_opts(opti, 0);
+ FREE_AND_NULL(opti);
+}
+
+/*** Function Grouping: helper functions for merge_incore_*() ***/
+
+static inline void set_commit_tree(struct commit *c, struct tree *t)
+{
+ c->maybe_tree = t;
+}
+
+static struct commit *make_virtual_commit(struct repository *repo,
+ struct tree *tree,
+ const char *comment)
+{
+ struct commit *commit = alloc_commit_node(repo);
+
+ set_merge_remote_desc(commit, comment, (struct object *)commit);
+ set_commit_tree(commit, tree);
+ commit->object.parsed = 1;
+ return commit;
+}
+
+static void merge_start(struct merge_options *opt, struct merge_result *result)
+{
+ struct rename_info *renames;
+ int i;
+
+ /* Sanity checks on opt */
+ trace2_region_enter("merge", "sanity checks", opt->repo);
+ assert(opt->repo);
+
+ assert(opt->branch1 && opt->branch2);
+
+ 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);
+
+ /*
+ * detect_renames, verbosity, buffer_output, and obuf are ignored
+ * fields that were used by "recursive" rather than "ort" -- but
+ * sanity check them anyway.
+ */
+ assert(opt->detect_renames >= -1 &&
+ opt->detect_renames <= DIFF_DETECT_COPY);
+ assert(opt->verbosity >= 0 && opt->verbosity <= 5);
+ assert(opt->buffer_output <= 2);
+ assert(opt->obuf.len == 0);
+
+ assert(opt->priv == NULL);
+ if (result->priv) {
+ opt->priv = result->priv;
+ result->priv = NULL;
+ /*
+ * opt->priv non-NULL means we had results from a previous
+ * run; do a few sanity checks that user didn't mess with
+ * it in an obvious fashion.
+ */
+ assert(opt->priv->call_depth == 0);
+ assert(!opt->priv->toplevel_dir ||
+ 0 == strlen(opt->priv->toplevel_dir));
+ }
+ trace2_region_leave("merge", "sanity checks", opt->repo);
+
+ /* Default to histogram diff. Actually, just hardcode it...for now. */
+ opt->xdl_opts = DIFF_WITH_ALG(opt, HISTOGRAM_DIFF);
+
+ /* Initialization of opt->priv, our internal merge data */
+ trace2_region_enter("merge", "allocate/init", opt->repo);
+ if (opt->priv) {
+ clear_or_reinit_internal_opts(opt->priv, 1);
+ trace2_region_leave("merge", "allocate/init", opt->repo);
+ return;
+ }
+ opt->priv = xcalloc(1, sizeof(*opt->priv));
+
+ /* Initialization of various renames fields */
+ renames = &opt->priv->renames;
+ for (i = MERGE_SIDE1; i <= MERGE_SIDE2; i++) {
+ strset_init_with_options(&renames->dirs_removed[i],
+ NULL, 0);
+ strmap_init_with_options(&renames->dir_rename_count[i],
+ NULL, 1);
+ strmap_init_with_options(&renames->dir_renames[i],
+ NULL, 0);
+ }
+
+ /*
+ * Although we initialize opt->priv->paths with strdup_strings=0,
+ * that's just to avoid making yet another copy of an allocated
+ * string. Putting the entry into paths means we are taking
+ * ownership, so we will later free it. paths_to_free is similar.
+ *
+ * In contrast, conflicted just has a subset of keys from paths, so
+ * we don't want to free those (it'd be a duplicate free).
+ */
+ strmap_init_with_options(&opt->priv->paths, NULL, 0);
+ strmap_init_with_options(&opt->priv->conflicted, NULL, 0);
+ string_list_init(&opt->priv->paths_to_free, 0);
+
+ /*
+ * keys & strbufs in output will sometimes need to outlive "paths",
+ * so it will have a copy of relevant keys. It's probably a small
+ * subset of the overall paths that have special output.
+ */
+ strmap_init(&opt->priv->output);
+
+ trace2_region_leave("merge", "allocate/init", opt->repo);
+}
+
+/*** Function Grouping: merge_incore_*() and their internal variants ***/
+
+/*
+ * Originally from merge_trees_internal(); heavily adapted, though.
+ */
+static void merge_ort_nonrecursive_internal(struct merge_options *opt,
+ struct tree *merge_base,
+ struct tree *side1,
+ struct tree *side2,
+ struct merge_result *result)
+{
+ struct object_id working_tree_oid;
+
+ trace2_region_enter("merge", "collect_merge_info", opt->repo);
+ if (collect_merge_info(opt, merge_base, side1, side2) != 0) {
+ /*
+ * TRANSLATORS: The %s arguments are: 1) tree hash of a merge
+ * base, and 2-3) the trees for the two trees we're merging.
+ */
+ err(opt, _("collecting merge info failed for trees %s, %s, %s"),
+ oid_to_hex(&merge_base->object.oid),
+ oid_to_hex(&side1->object.oid),
+ oid_to_hex(&side2->object.oid));
+ result->clean = -1;
+ return;
+ }
+ trace2_region_leave("merge", "collect_merge_info", opt->repo);
+
+ trace2_region_enter("merge", "renames", opt->repo);
+ result->clean = detect_and_process_renames(opt, merge_base,
+ side1, side2);
+ trace2_region_leave("merge", "renames", opt->repo);
+
+ trace2_region_enter("merge", "process_entries", opt->repo);
+ process_entries(opt, &working_tree_oid);
+ trace2_region_leave("merge", "process_entries", opt->repo);
+
+ /* Set return values */
+ result->tree = parse_tree_indirect(&working_tree_oid);
+ /* existence of conflicted entries implies unclean */
+ result->clean &= strmap_empty(&opt->priv->conflicted);
+ if (!opt->priv->call_depth) {
+ result->priv = opt->priv;
+ opt->priv = NULL;
+ }
+}
+
+/*
+ * Originally from merge_recursive_internal(); somewhat adapted, though.
+ */
+static void merge_ort_internal(struct merge_options *opt,
+ struct commit_list *merge_bases,
+ struct commit *h1,
+ struct commit *h2,
+ struct merge_result *result)
+{
+ struct commit_list *iter;
+ struct commit *merged_merge_bases;
+ const char *ancestor_name;
+ struct strbuf merge_base_abbrev = STRBUF_INIT;
+
+ if (!merge_bases) {
+ merge_bases = get_merge_bases(h1, h2);
+ /* See merge-ort.h:merge_incore_recursive() declaration NOTE */
+ merge_bases = reverse_commit_list(merge_bases);
+ }
+
+ 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_merge_bases = make_virtual_commit(opt->repo, tree,
+ "ancestor");
+ ancestor_name = "empty tree";
+ } 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 = merge_bases; iter; iter = iter->next) {
+ const char *saved_b1, *saved_b2;
+ struct commit *prev = merged_merge_bases;
+
+ opt->priv->call_depth++;
+ /*
+ * When the merge fails, the result contains files
+ * with conflict markers. The cleanness flag is
+ * ignored (unless indicating an error), it was never
+ * actually used, as result of merge_trees has always
+ * overwritten it: the committed "conflicts" were
+ * already resolved.
+ */
+ saved_b1 = opt->branch1;
+ saved_b2 = opt->branch2;
+ opt->branch1 = "Temporary merge branch 1";
+ opt->branch2 = "Temporary merge branch 2";
+ merge_ort_internal(opt, NULL, prev, iter->item, result);
+ if (result->clean < 0)
+ return;
+ opt->branch1 = saved_b1;
+ opt->branch2 = saved_b2;
+ opt->priv->call_depth--;
+
+ merged_merge_bases = make_virtual_commit(opt->repo,
+ result->tree,
+ "merged tree");
+ commit_list_insert(prev, &merged_merge_bases->parents);
+ commit_list_insert(iter->item,
+ &merged_merge_bases->parents->next);
+
+ clear_or_reinit_internal_opts(opt->priv, 1);
+ }
+
+ opt->ancestor = ancestor_name;
+ merge_ort_nonrecursive_internal(opt,
+ repo_get_commit_tree(opt->repo,
+ merged_merge_bases),
+ repo_get_commit_tree(opt->repo, h1),
+ repo_get_commit_tree(opt->repo, h2),
+ result);
+ strbuf_release(&merge_base_abbrev);
+ opt->ancestor = NULL; /* avoid accidental re-use of opt->ancestor */
+}
+
+void merge_incore_nonrecursive(struct merge_options *opt,
+ struct tree *merge_base,
+ struct tree *side1,
+ struct tree *side2,
+ struct merge_result *result)
+{
+ trace2_region_enter("merge", "incore_nonrecursive", opt->repo);
+
+ trace2_region_enter("merge", "merge_start", opt->repo);
+ assert(opt->ancestor != NULL);
+ merge_start(opt, result);
+ trace2_region_leave("merge", "merge_start", opt->repo);
+
+ merge_ort_nonrecursive_internal(opt, merge_base, side1, side2, result);
+ trace2_region_leave("merge", "incore_nonrecursive", opt->repo);
+}
+
+void merge_incore_recursive(struct merge_options *opt,
+ struct commit_list *merge_bases,
+ struct commit *side1,
+ struct commit *side2,
+ struct merge_result *result)
+{
+ trace2_region_enter("merge", "incore_recursive", opt->repo);
+
+ /* We set the ancestor label based on the merge_bases */
+ assert(opt->ancestor == NULL);
+
+ trace2_region_enter("merge", "merge_start", opt->repo);
+ merge_start(opt, result);
+ trace2_region_leave("merge", "merge_start", opt->repo);
+
+ merge_ort_internal(opt, merge_bases, side1, side2, result);
+ trace2_region_leave("merge", "incore_recursive", opt->repo);
+}
diff --git a/merge-ort.h b/merge-ort.h
new file mode 100644
index 0000000..d53a0a3
--- /dev/null
+++ b/merge-ort.h
@@ -0,0 +1,75 @@
+#ifndef MERGE_ORT_H
+#define MERGE_ORT_H
+
+#include "merge-recursive.h"
+
+struct commit;
+struct tree;
+
+struct merge_result {
+ /*
+ * Whether the merge is clean; possible values:
+ * 1: clean
+ * 0: not clean (merge conflicts)
+ * <0: operation aborted prematurely. (object database
+ * unreadable, disk full, etc.) Worktree may be left in an
+ * inconsistent state if operation failed near the end.
+ */
+ int clean;
+
+ /*
+ * Result of merge. If !clean, represents what would go in worktree
+ * (thus possibly including files containing conflict markers).
+ */
+ struct tree *tree;
+
+ /*
+ * Additional metadata used by merge_switch_to_result() or future calls
+ * to merge_incore_*(). Includes data needed to update the index (if
+ * !clean) and to print "CONFLICT" messages. Not for external use.
+ */
+ void *priv;
+};
+
+/*
+ * rename-detecting three-way merge with recursive ancestor consolidation.
+ * working tree and index are untouched.
+ *
+ * merge_bases will be consumed (emptied) so make a copy if you need it.
+ *
+ * NOTE: empirically, the recursive algorithm will perform better if you
+ * pass the merge_bases in the order of oldest commit to the
+ * newest[1][2].
+ *
+ * [1] https://lore.kernel.org/git/nycvar.QRO.7.76.6.1907252055500.21907@tvgsbejvaqbjf.bet/
+ * [2] commit 8918b0c9c2 ("merge-recur: try to merge older merge bases
+ * first", 2006-08-09)
+ */
+void merge_incore_recursive(struct merge_options *opt,
+ struct commit_list *merge_bases,
+ struct commit *side1,
+ struct commit *side2,
+ struct merge_result *result);
+
+/*
+ * rename-detecting three-way merge, no recursion.
+ * working tree and index are untouched.
+ */
+void merge_incore_nonrecursive(struct merge_options *opt,
+ struct tree *merge_base,
+ struct tree *side1,
+ struct tree *side2,
+ struct merge_result *result);
+
+/* Update the working tree and index from head to result after incore merge */
+void merge_switch_to_result(struct merge_options *opt,
+ struct tree *head,
+ struct merge_result *result,
+ int update_worktree_and_index,
+ int display_update_msgs);
+
+/* Do needed cleanup when not calling merge_switch_to_result() */
+void merge_finalize(struct merge_options *opt,
+ struct merge_result *result);
+
+#endif
diff --git a/merge-recursive.c b/merge-recursive.c
index 7a4e6f2..b69e694 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -303,7 +303,7 @@
return;
}
- ci = xcalloc(1, sizeof(struct rename_conflict_info));
+ CALLOC_ARRAY(ci, 1);
ci->rename_type = rename_type;
ci->ren1 = ren1;
ci->ren2 = ren2;
@@ -958,7 +958,7 @@
if (S_ISREG(contents->mode)) {
struct strbuf strbuf = STRBUF_INIT;
if (convert_to_working_tree(opt->repo->index,
- path, buf, size, &strbuf)) {
+ path, buf, size, &strbuf, NULL)) {
free(buf);
size = strbuf.len;
buf = strbuf_detach(&strbuf, NULL);
@@ -1750,6 +1750,18 @@
return -1;
}
+ if (!mfi.clean && mfi.blob.mode == a->mode &&
+ oideq(&mfi.blob.oid, &a->oid)) {
+ /*
+ * 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.
+ */
+ 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;
@@ -2377,8 +2389,7 @@
continue;
collision_ent = collision_find_entry(collisions, new_path);
if (!collision_ent) {
- collision_ent = xcalloc(1,
- sizeof(struct collision_entry));
+ CALLOC_ARRAY(collision_ent, 1);
hashmap_entry_init(&collision_ent->ent,
strhash(new_path));
hashmap_put(collisions, &collision_ent->ent);
@@ -2582,7 +2593,7 @@
struct string_list *renames;
compute_collisions(&collisions, dir_renames, pairs);
- renames = xcalloc(1, sizeof(struct string_list));
+ CALLOC_ARRAY(renames, 1);
for (i = 0; i < pairs->nr; ++i) {
struct string_list_item *item;
@@ -2639,7 +2650,7 @@
free(e->target_file);
string_list_clear(&e->source_files, 0);
}
- hashmap_free_entries(&collisions, struct collision_entry, ent);
+ hashmap_clear_and_free(&collisions, struct collision_entry, ent);
return renames;
}
@@ -2858,7 +2869,7 @@
strbuf_release(&e->new_dir);
/* possible_new_dirs already cleared in get_directory_renames */
}
- hashmap_free_entries(dir_renames, struct dir_rename_entry, ent);
+ hashmap_clear_and_free(dir_renames, struct dir_rename_entry, ent);
free(dir_renames);
free(pairs->queue);
@@ -3485,7 +3496,7 @@
string_list_clear(entries, 1);
free(entries);
- hashmap_free_entries(&opt->priv->current_file_dir_set,
+ hashmap_clear_and_free(&opt->priv->current_file_dir_set,
struct path_hashmap_entry, e);
if (clean < 0) {
@@ -3505,20 +3516,10 @@
return clean;
}
-static struct commit_list *reverse_commit_list(struct commit_list *list)
-{
- struct commit_list *next = NULL, *current, *backup;
- for (current = list; current; current = backup) {
- backup = current->next;
- current->next = next;
- next = current;
- }
- return next;
-}
-
/*
- * 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.
*/
static int merge_recursive_internal(struct merge_options *opt,
struct commit *h1,
@@ -3662,7 +3663,7 @@
return -1;
}
- opt->priv = xcalloc(1, sizeof(*opt->priv));
+ CALLOC_ARRAY(opt->priv, 1);
string_list_init(&opt->priv->df_conflict_file_set, 1);
return 0;
}
@@ -3779,9 +3780,12 @@
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->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->detect_renames = git_config_rename("diff.renames", value);
free(value);
diff --git a/merge-recursive.h b/merge-recursive.h
index 978847e..0795a1d 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -69,9 +69,8 @@
*
* Outputs:
* - See RETURN VALUES above
- * - No commit is created
* - opt->repo->index has the new index
- * - $GIT_INDEX_FILE is not updated
+ * - new index NOT written to disk
* - The working tree is updated with results of the merge
*/
int merge_trees(struct merge_options *opt,
@@ -81,7 +80,7 @@
/*
* merge_recursive is like merge_trees() but with recursive ancestor
- * consolidation and, if the commit is clean, creation of a commit.
+ * consolidation.
*
* NOTE: empirically, about a decade ago it was determined that with more
* than two merge bases, optimal behavior was found when the
@@ -91,9 +90,9 @@
*
* Outputs:
* - See RETURN VALUES above
- * - If merge is clean, a commit is created and its address written to *result
+ * - *result is treated as scratch space for temporary recursive merges
* - opt->repo->index has the new index
- * - $GIT_INDEX_FILE is not updated
+ * - new index NOT written to disk
* - The working tree is updated with results of the merge
*/
int merge_recursive(struct merge_options *opt,
@@ -109,9 +108,9 @@
*
* Outputs:
* - See RETURN VALUES above
- * - If merge is clean, a commit is created and its address written to *result
+ * - *result is treated as scratch space for temporary recursive merges
* - opt->repo->index has the new index
- * - $GIT_INDEX_FILE is updated
+ * - 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 *opt,
diff --git a/merge.c b/merge.c
index 7c1d756..5fb88af 100644
--- a/merge.c
+++ b/merge.c
@@ -19,22 +19,22 @@
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 @@
}
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 @@
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 @@
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/mergetools/bc b/mergetools/bc
index 3a69e60..26c19d4 100644
--- a/mergetools/bc
+++ b/mergetools/bc
@@ -21,3 +21,9 @@
echo bcompare
fi
}
+
+list_tool_variants () {
+ echo bc
+ echo bc3
+ echo bc4
+}
diff --git a/mergetools/bc3 b/mergetools/bc3
deleted file mode 100644
index 5d8dd48..0000000
--- a/mergetools/bc3
+++ /dev/null
@@ -1 +0,0 @@
-. "$MERGE_TOOLS_DIR/bc"
diff --git a/mergetools/gvimdiff3 b/mergetools/gvimdiff3
deleted file mode 100644
index 04a5bb0..0000000
--- a/mergetools/gvimdiff3
+++ /dev/null
@@ -1 +0,0 @@
-. "$MERGE_TOOLS_DIR/vimdiff"
diff --git a/mergetools/meld b/mergetools/meld
index 7a08470..aab4ebb 100644
--- a/mergetools/meld
+++ b/mergetools/meld
@@ -3,34 +3,87 @@
}
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/mergetools/gvimdiff2 b/mergetools/nvimdiff
similarity index 100%
rename from mergetools/gvimdiff2
rename to mergetools/nvimdiff
diff --git a/mergetools/vimdiff b/mergetools/vimdiff
index 10d86f3..96f6209 100644
--- a/mergetools/vimdiff
+++ b/mergetools/vimdiff
@@ -5,7 +5,7 @@
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,22 @@
"$LOCAL" "$MERGED" "$REMOTE"
fi
;;
- gvimdiff2|vimdiff2)
+ *vimdiff1)
+ "$merge_tool_path" -f -d \
+ -c 'echon "Resolve conflicts leftward then save. Use :cq to abort."' \
+ "$LOCAL" "$REMOTE"
+ ret="$?"
+ if test "$ret" -eq 0
+ then
+ cp -- "$LOCAL" "$MERGED"
+ fi
+ return "$ret"
+ ;;
+ *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 +45,13 @@
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 +60,11 @@
exit_code_trustable () {
true
}
+
+list_tool_variants () {
+ for prefix in '' g n; do
+ for suffix in '' 1 2 3; do
+ echo "${prefix}vimdiff${suffix}"
+ done
+ done
+}
diff --git a/mergetools/vimdiff2 b/mergetools/vimdiff2
deleted file mode 100644
index 04a5bb0..0000000
--- a/mergetools/vimdiff2
+++ /dev/null
@@ -1 +0,0 @@
-. "$MERGE_TOOLS_DIR/vimdiff"
diff --git a/mergetools/vimdiff3 b/mergetools/vimdiff3
deleted file mode 100644
index 04a5bb0..0000000
--- a/mergetools/vimdiff3
+++ /dev/null
@@ -1 +0,0 @@
-. "$MERGE_TOOLS_DIR/vimdiff"
diff --git a/midx.c b/midx.c
index 1527e46..becfafe 100644
--- a/midx.c
+++ b/midx.c
@@ -5,11 +5,13 @@
#include "lockfile.h"
#include "packfile.h"
#include "object-store.h"
-#include "sha1-lookup.h"
+#include "hash-lookup.h"
#include "midx.h"
#include "progress.h"
#include "trace2.h"
#include "run-command.h"
+#include "repository.h"
+#include "chunk-format.h"
#define MIDX_SIGNATURE 0x4d494458 /* "MIDX" */
#define MIDX_VERSION 1
@@ -17,18 +19,15 @@
#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_MIN_SIZE (MIDX_HEADER_SIZE + the_hash_algo->rawsz)
-#define MIDX_MAX_CHUNKS 5
#define MIDX_CHUNK_ALIGNMENT 4
#define MIDX_CHUNKID_PACKNAMES 0x504e414d /* "PNAM" */
#define MIDX_CHUNKID_OIDFANOUT 0x4f494446 /* "OIDF" */
#define MIDX_CHUNKID_OIDLOOKUP 0x4f49444c /* "OIDL" */
#define MIDX_CHUNKID_OBJECTOFFSETS 0x4f4f4646 /* "OOFF" */
#define MIDX_CHUNKID_LARGEOFFSETS 0x4c4f4646 /* "LOFF" */
-#define MIDX_CHUNKLOOKUP_WIDTH (sizeof(uint32_t) + sizeof(uint64_t))
#define MIDX_CHUNK_FANOUT_SIZE (sizeof(uint32_t) * 256)
#define MIDX_CHUNK_OFFSET_WIDTH (2 * sizeof(uint32_t))
#define MIDX_CHUNK_LARGE_OFFSET_WIDTH (sizeof(uint64_t))
@@ -36,11 +35,36 @@
#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);
}
+static int midx_read_oid_fanout(const unsigned char *chunk_start,
+ size_t chunk_size, void *data)
+{
+ struct multi_pack_index *m = data;
+ m->chunk_oid_fanout = (uint32_t *)chunk_start;
+
+ if (chunk_size != 4 * 256) {
+ error(_("multi-pack-index OID fanout is of the wrong size"));
+ return 1;
+ }
+ return 0;
+}
+
struct multi_pack_index *load_multi_pack_index(const char *object_dir, int local)
{
struct multi_pack_index *m = NULL;
@@ -52,6 +76,7 @@
char *midx_name = get_midx_filename(object_dir);
uint32_t i;
const char *cur_pack_name;
+ struct chunkfile *cf = NULL;
fd = git_open(midx_name);
@@ -72,9 +97,9 @@
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;
@@ -90,70 +115,38 @@
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);
+ 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];
m->num_packs = get_be32(m->data + MIDX_BYTE_NUM_PACKS);
- for (i = 0; i < m->num_chunks; i++) {
- uint32_t chunk_id = get_be32(m->data + MIDX_HEADER_SIZE +
- MIDX_CHUNKLOOKUP_WIDTH * i);
- uint64_t chunk_offset = get_be64(m->data + MIDX_HEADER_SIZE + 4 +
- MIDX_CHUNKLOOKUP_WIDTH * i);
+ cf = init_chunkfile(NULL);
- if (chunk_offset >= m->data_len)
- die(_("invalid chunk offset (too large)"));
+ if (read_table_of_contents(cf, m->data, midx_size,
+ MIDX_HEADER_SIZE, m->num_chunks))
+ goto cleanup_fail;
- switch (chunk_id) {
- case MIDX_CHUNKID_PACKNAMES:
- m->chunk_pack_names = m->data + chunk_offset;
- break;
-
- case MIDX_CHUNKID_OIDFANOUT:
- m->chunk_oid_fanout = (uint32_t *)(m->data + chunk_offset);
- break;
-
- case MIDX_CHUNKID_OIDLOOKUP:
- m->chunk_oid_lookup = m->data + chunk_offset;
- break;
-
- case MIDX_CHUNKID_OBJECTOFFSETS:
- m->chunk_object_offsets = m->data + chunk_offset;
- break;
-
- case MIDX_CHUNKID_LARGEOFFSETS:
- m->chunk_large_offsets = m->data + chunk_offset;
- break;
-
- case 0:
- die(_("terminating multi-pack-index chunk id appears earlier than expected"));
- break;
-
- default:
- /*
- * Do nothing on unrecognized chunks, allowing future
- * extensions to add optional chunks.
- */
- break;
- }
- }
-
- if (!m->chunk_pack_names)
+ if (pair_chunk(cf, MIDX_CHUNKID_PACKNAMES, &m->chunk_pack_names) == CHUNK_NOT_FOUND)
die(_("multi-pack-index missing required pack-name chunk"));
- if (!m->chunk_oid_fanout)
+ if (read_chunk(cf, MIDX_CHUNKID_OIDFANOUT, midx_read_oid_fanout, m) == CHUNK_NOT_FOUND)
die(_("multi-pack-index missing required OID fanout chunk"));
- if (!m->chunk_oid_lookup)
+ if (pair_chunk(cf, MIDX_CHUNKID_OIDLOOKUP, &m->chunk_oid_lookup) == CHUNK_NOT_FOUND)
die(_("multi-pack-index missing required OID lookup chunk"));
- if (!m->chunk_object_offsets)
+ if (pair_chunk(cf, MIDX_CHUNKID_OBJECTOFFSETS, &m->chunk_object_offsets) == CHUNK_NOT_FOUND)
die(_("multi-pack-index missing required object offsets chunk"));
+ pair_chunk(cf, MIDX_CHUNKID_LARGEOFFSETS, &m->chunk_large_offsets);
+
m->num_objects = ntohl(m->chunk_oid_fanout[255]);
- m->pack_names = xcalloc(m->num_packs, sizeof(*m->pack_names));
- m->packs = xcalloc(m->num_packs, sizeof(*m->packs));
+ CALLOC_ARRAY(m->pack_names, m->num_packs);
+ CALLOC_ARRAY(m->packs, m->num_packs);
cur_pack_name = (const char *)m->chunk_pack_names;
for (i = 0; i < m->num_packs; i++) {
@@ -175,6 +168,7 @@
cleanup_fail:
free(m);
free(midx_name);
+ free(cf);
if (midx_map)
munmap(midx_map, midx_size);
if (0 <= fd)
@@ -190,8 +184,6 @@
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])
@@ -252,7 +244,7 @@
const unsigned char *offset_data;
uint32_t offset32;
- offset_data = m->chunk_object_offsets + pos * MIDX_CHUNK_OFFSET_WIDTH;
+ offset_data = m->chunk_object_offsets + (off_t)pos * MIDX_CHUNK_OFFSET_WIDTH;
offset32 = get_be32(offset_data + sizeof(uint32_t));
if (m->chunk_large_offsets && offset32 & MIDX_LARGE_OFFSET_NEEDED) {
@@ -268,7 +260,8 @@
static uint32_t nth_midxed_pack_int_id(struct multi_pack_index *m, uint32_t pos)
{
- return get_be32(m->chunk_object_offsets + pos * MIDX_CHUNK_OFFSET_WIDTH);
+ return get_be32(m->chunk_object_offsets +
+ (off_t)pos * MIDX_CHUNK_OFFSET_WIDTH);
}
static int nth_midxed_pack_entry(struct repository *r,
@@ -285,7 +278,7 @@
pack_int_id = nth_midxed_pack_int_id(m, pos);
if (prepare_midx_pack(r, m, pack_int_id))
- die(_("error preparing packfile from multi-pack-index"));
+ return 0;
p = m->packs[pack_int_id];
/*
@@ -386,15 +379,9 @@
{
struct multi_pack_index *m;
struct multi_pack_index *m_search;
- int config_value;
- static int env_value = -1;
- if (env_value < 0)
- env_value = git_env_bool(GIT_TEST_MULTI_PACK_INDEX, 0);
-
- if (!env_value &&
- (repo_config_get_bool(r, "core.multipackindex", &config_value) ||
- !config_value))
+ prepare_repo_settings(r);
+ if (!r->settings.core_multi_pack_index)
return 0;
for (m_search = r->objects->multi_pack_index; m_search; m_search = m_search->next)
@@ -404,8 +391,12 @@
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;
}
@@ -416,14 +407,11 @@
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;
@@ -443,49 +431,56 @@
return strcmp(a->pack_name, b->pack_name);
}
-struct pack_list {
+struct write_midx_context {
struct pack_info *info;
uint32_t nr;
uint32_t alloc;
struct multi_pack_index *m;
struct progress *progress;
unsigned pack_paths_checked;
+
+ struct pack_midx_entry *entries;
+ uint32_t entries_nr;
+
+ uint32_t *pack_perm;
+ unsigned large_offsets_needed:1;
+ uint32_t num_large_offsets;
};
static void add_pack_to_midx(const char *full_path, size_t full_path_len,
const char *file_name, void *data)
{
- struct pack_list *packs = (struct pack_list *)data;
+ struct write_midx_context *ctx = 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))
+ display_progress(ctx->progress, ++ctx->pack_paths_checked);
+ if (ctx->m && midx_contains_pack(ctx->m, file_name))
return;
- ALLOC_GROW(packs->info, packs->nr + 1, packs->alloc);
+ ALLOC_GROW(ctx->info, ctx->nr + 1, ctx->alloc);
- packs->info[packs->nr].p = add_packed_git(full_path,
- full_path_len,
- 0);
+ ctx->info[ctx->nr].p = add_packed_git(full_path,
+ full_path_len,
+ 0);
- if (!packs->info[packs->nr].p) {
+ if (!ctx->info[ctx->nr].p) {
warning(_("failed to add packfile '%s'"),
full_path);
return;
}
- if (open_pack_index(packs->info[packs->nr].p)) {
+ if (open_pack_index(ctx->info[ctx->nr].p)) {
warning(_("failed to open pack-index '%s'"),
full_path);
- close_pack(packs->info[packs->nr].p);
- FREE_AND_NULL(packs->info[packs->nr].p);
+ close_pack(ctx->info[ctx->nr].p);
+ FREE_AND_NULL(ctx->info[ctx->nr].p);
return;
}
- packs->info[packs->nr].pack_name = xstrdup(file_name);
- packs->info[packs->nr].orig_pack_int_id = packs->nr;
- packs->info[packs->nr].expired = 0;
- packs->nr++;
+ ctx->info[ctx->nr].pack_name = xstrdup(file_name);
+ ctx->info[ctx->nr].orig_pack_int_id = ctx->nr;
+ ctx->info[ctx->nr].expired = 0;
+ ctx->nr++;
}
}
@@ -635,27 +630,26 @@
return deduplicated_entries;
}
-static size_t write_midx_pack_names(struct hashfile *f,
- struct pack_info *info,
- uint32_t num_packs)
+static int write_midx_pack_names(struct hashfile *f, void *data)
{
+ struct write_midx_context *ctx = data;
uint32_t i;
unsigned char padding[MIDX_CHUNK_ALIGNMENT];
size_t written = 0;
- for (i = 0; i < num_packs; i++) {
+ for (i = 0; i < ctx->nr; i++) {
size_t writelen;
- if (info[i].expired)
+ if (ctx->info[i].expired)
continue;
- if (i && strcmp(info[i].pack_name, info[i - 1].pack_name) <= 0)
+ if (i && strcmp(ctx->info[i].pack_name, ctx->info[i - 1].pack_name) <= 0)
BUG("incorrect pack-file order: %s before %s",
- info[i - 1].pack_name,
- info[i].pack_name);
+ ctx->info[i - 1].pack_name,
+ ctx->info[i].pack_name);
- writelen = strlen(info[i].pack_name) + 1;
- hashwrite(f, info[i].pack_name, writelen);
+ writelen = strlen(ctx->info[i].pack_name) + 1;
+ hashwrite(f, ctx->info[i].pack_name, writelen);
written += writelen;
}
@@ -664,18 +658,17 @@
if (i < MIDX_CHUNK_ALIGNMENT) {
memset(padding, 0, sizeof(padding));
hashwrite(f, padding, i);
- written += i;
}
- return written;
+ return 0;
}
-static size_t write_midx_oid_fanout(struct hashfile *f,
- struct pack_midx_entry *objects,
- uint32_t nr_objects)
+static int write_midx_oid_fanout(struct hashfile *f,
+ void *data)
{
- struct pack_midx_entry *list = objects;
- struct pack_midx_entry *last = objects + nr_objects;
+ struct write_midx_context *ctx = data;
+ struct pack_midx_entry *list = ctx->entries;
+ struct pack_midx_entry *last = ctx->entries + ctx->entries_nr;
uint32_t count = 0;
uint32_t i;
@@ -696,21 +689,21 @@
list = next;
}
- return MIDX_CHUNK_FANOUT_SIZE;
+ return 0;
}
-static size_t write_midx_oid_lookup(struct hashfile *f, unsigned char hash_len,
- struct pack_midx_entry *objects,
- uint32_t nr_objects)
+static int write_midx_oid_lookup(struct hashfile *f,
+ void *data)
{
- struct pack_midx_entry *list = objects;
+ struct write_midx_context *ctx = data;
+ unsigned char hash_len = the_hash_algo->rawsz;
+ struct pack_midx_entry *list = ctx->entries;
uint32_t i;
- size_t written = 0;
- for (i = 0; i < nr_objects; i++) {
+ for (i = 0; i < ctx->entries_nr; i++) {
struct pack_midx_entry *obj = list++;
- if (i < nr_objects - 1) {
+ if (i < ctx->entries_nr - 1) {
struct pack_midx_entry *next = list;
if (oidcmp(&obj->oid, &next->oid) >= 0)
BUG("OIDs not in order: %s >= %s",
@@ -719,50 +712,48 @@
}
hashwrite(f, obj->oid.hash, (int)hash_len);
- written += hash_len;
}
- return written;
+ return 0;
}
-static size_t write_midx_object_offsets(struct hashfile *f, int large_offset_needed,
- uint32_t *perm,
- struct pack_midx_entry *objects, uint32_t nr_objects)
+static int write_midx_object_offsets(struct hashfile *f,
+ void *data)
{
- struct pack_midx_entry *list = objects;
+ struct write_midx_context *ctx = data;
+ struct pack_midx_entry *list = ctx->entries;
uint32_t i, nr_large_offset = 0;
- size_t written = 0;
- for (i = 0; i < nr_objects; i++) {
+ for (i = 0; i < ctx->entries_nr; i++) {
struct pack_midx_entry *obj = list++;
- if (perm[obj->pack_int_id] == PACK_EXPIRED)
+ if (ctx->pack_perm[obj->pack_int_id] == PACK_EXPIRED)
BUG("object %s is in an expired pack with int-id %d",
oid_to_hex(&obj->oid),
obj->pack_int_id);
- hashwrite_be32(f, perm[obj->pack_int_id]);
+ hashwrite_be32(f, ctx->pack_perm[obj->pack_int_id]);
- if (large_offset_needed && obj->offset >> 31)
+ if (ctx->large_offsets_needed && obj->offset >> 31)
hashwrite_be32(f, MIDX_LARGE_OFFSET_NEEDED | nr_large_offset++);
- else if (!large_offset_needed && obj->offset >> 32)
+ else if (!ctx->large_offsets_needed && obj->offset >> 32)
BUG("object %s requires a large offset (%"PRIx64") but the MIDX is not writing large offsets!",
oid_to_hex(&obj->oid),
obj->offset);
else
hashwrite_be32(f, (uint32_t)obj->offset);
-
- written += MIDX_CHUNK_OFFSET_WIDTH;
}
- return written;
+ return 0;
}
-static size_t write_midx_large_offsets(struct hashfile *f, uint32_t nr_large_offset,
- struct pack_midx_entry *objects, uint32_t nr_objects)
+static int write_midx_large_offsets(struct hashfile *f,
+ void *data)
{
- struct pack_midx_entry *list = objects, *end = objects + nr_objects;
- size_t written = 0;
+ struct write_midx_context *ctx = data;
+ struct pack_midx_entry *list = ctx->entries;
+ struct pack_midx_entry *end = ctx->entries + ctx->entries_nr;
+ uint32_t nr_large_offset = ctx->num_large_offsets;
while (nr_large_offset) {
struct pack_midx_entry *obj;
@@ -777,100 +768,89 @@
if (!(offset >> 31))
continue;
- hashwrite_be32(f, offset >> 32);
- hashwrite_be32(f, offset & 0xffffffffUL);
- written += 2 * sizeof(uint32_t);
+ hashwrite_be64(f, offset);
nr_large_offset--;
}
- return written;
+ return 0;
}
static int write_midx_internal(const char *object_dir, struct multi_pack_index *m,
struct string_list *packs_to_drop, unsigned flags)
{
- unsigned char cur_chunk, num_chunks = 0;
char *midx_name;
uint32_t i;
struct hashfile *f = NULL;
struct lock_file lk;
- struct pack_list packs;
- uint32_t *pack_perm = NULL;
- uint64_t written = 0;
- uint32_t chunk_ids[MIDX_MAX_CHUNKS + 1];
- 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;
+ struct write_midx_context ctx = { 0 };
int pack_name_concat_len = 0;
int dropped_packs = 0;
int result = 0;
+ struct chunkfile *cf;
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;
+ ctx.m = m;
else
- packs.m = load_multi_pack_index(object_dir, 1);
+ ctx.m = load_multi_pack_index(object_dir, 1);
- packs.nr = 0;
- packs.alloc = packs.m ? packs.m->num_packs : 16;
- packs.info = NULL;
- ALLOC_ARRAY(packs.info, packs.alloc);
+ ctx.nr = 0;
+ ctx.alloc = ctx.m ? ctx.m->num_packs : 16;
+ ctx.info = NULL;
+ ALLOC_ARRAY(ctx.info, ctx.alloc);
- if (packs.m) {
- for (i = 0; i < packs.m->num_packs; i++) {
- ALLOC_GROW(packs.info, packs.nr + 1, packs.alloc);
+ if (ctx.m) {
+ for (i = 0; i < ctx.m->num_packs; i++) {
+ ALLOC_GROW(ctx.info, ctx.nr + 1, ctx.alloc);
- packs.info[packs.nr].orig_pack_int_id = i;
- packs.info[packs.nr].pack_name = xstrdup(packs.m->pack_names[i]);
- packs.info[packs.nr].p = NULL;
- packs.info[packs.nr].expired = 0;
- packs.nr++;
+ ctx.info[ctx.nr].orig_pack_int_id = i;
+ ctx.info[ctx.nr].pack_name = xstrdup(ctx.m->pack_names[i]);
+ ctx.info[ctx.nr].p = NULL;
+ ctx.info[ctx.nr].expired = 0;
+ ctx.nr++;
}
}
- packs.pack_paths_checked = 0;
+ ctx.pack_paths_checked = 0;
if (flags & MIDX_PROGRESS)
- packs.progress = start_progress(_("Adding packfiles to multi-pack-index"), 0);
+ ctx.progress = start_delayed_progress(_("Adding packfiles to multi-pack-index"), 0);
else
- packs.progress = NULL;
+ ctx.progress = NULL;
- for_each_file_in_pack_dir(object_dir, add_pack_to_midx, &packs);
- stop_progress(&packs.progress);
+ for_each_file_in_pack_dir(object_dir, add_pack_to_midx, &ctx);
+ stop_progress(&ctx.progress);
- if (packs.m && packs.nr == packs.m->num_packs && !packs_to_drop)
+ if (ctx.m && ctx.nr == ctx.m->num_packs && !packs_to_drop)
goto cleanup;
- entries = get_sorted_entries(packs.m, packs.info, packs.nr, &nr_entries);
+ ctx.entries = get_sorted_entries(ctx.m, ctx.info, ctx.nr, &ctx.entries_nr);
- for (i = 0; i < nr_entries; i++) {
- if (entries[i].offset > 0x7fffffff)
- num_large_offsets++;
- if (entries[i].offset > 0xffffffff)
- large_offsets_needed = 1;
+ ctx.large_offsets_needed = 0;
+ for (i = 0; i < ctx.entries_nr; i++) {
+ if (ctx.entries[i].offset > 0x7fffffff)
+ ctx.num_large_offsets++;
+ if (ctx.entries[i].offset > 0xffffffff)
+ ctx.large_offsets_needed = 1;
}
- QSORT(packs.info, packs.nr, pack_info_compare);
+ QSORT(ctx.info, ctx.nr, pack_info_compare);
if (packs_to_drop && packs_to_drop->nr) {
int drop_index = 0;
int missing_drops = 0;
- for (i = 0; i < packs.nr && drop_index < packs_to_drop->nr; i++) {
- int cmp = strcmp(packs.info[i].pack_name,
+ for (i = 0; i < ctx.nr && drop_index < packs_to_drop->nr; i++) {
+ int cmp = strcmp(ctx.info[i].pack_name,
packs_to_drop->items[drop_index].string);
if (!cmp) {
drop_index++;
- packs.info[i].expired = 1;
+ ctx.info[i].expired = 1;
} else if (cmp > 0) {
error(_("did not see pack-file %s to drop"),
packs_to_drop->items[drop_index].string);
@@ -878,7 +858,7 @@
missing_drops++;
i--;
} else {
- packs.info[i].expired = 0;
+ ctx.info[i].expired = 0;
}
}
@@ -894,19 +874,19 @@
*
* pack_perm[old_id] = new_id
*/
- ALLOC_ARRAY(pack_perm, packs.nr);
- for (i = 0; i < packs.nr; i++) {
- if (packs.info[i].expired) {
+ ALLOC_ARRAY(ctx.pack_perm, ctx.nr);
+ for (i = 0; i < ctx.nr; i++) {
+ if (ctx.info[i].expired) {
dropped_packs++;
- pack_perm[packs.info[i].orig_pack_int_id] = PACK_EXPIRED;
+ ctx.pack_perm[ctx.info[i].orig_pack_int_id] = PACK_EXPIRED;
} else {
- pack_perm[packs.info[i].orig_pack_int_id] = i - dropped_packs;
+ ctx.pack_perm[ctx.info[i].orig_pack_int_id] = i - dropped_packs;
}
}
- for (i = 0; i < packs.nr; i++) {
- if (!packs.info[i].expired)
- pack_name_concat_len += strlen(packs.info[i].pack_name) + 1;
+ for (i = 0; i < ctx.nr; i++) {
+ if (!ctx.info[i].expired)
+ pack_name_concat_len += strlen(ctx.info[i].pack_name) + 1;
}
if (pack_name_concat_len % MIDX_CHUNK_ALIGNMENT)
@@ -914,121 +894,55 @@
(pack_name_concat_len % MIDX_CHUNK_ALIGNMENT);
hold_lock_file_for_update(&lk, midx_name, LOCK_DIE_ON_ERROR);
- f = hashfd(lk.tempfile->fd, lk.tempfile->filename.buf);
+ f = hashfd(get_lock_file_fd(&lk), get_lock_file_path(&lk));
FREE_AND_NULL(midx_name);
- if (packs.m)
- close_midx(packs.m);
+ if (ctx.m)
+ close_midx(ctx.m);
- cur_chunk = 0;
- num_chunks = large_offsets_needed ? 5 : 4;
-
- written = write_midx_header(f, num_chunks, packs.nr - dropped_packs);
-
- chunk_ids[cur_chunk] = MIDX_CHUNKID_PACKNAMES;
- chunk_offsets[cur_chunk] = written + (num_chunks + 1) * MIDX_CHUNKLOOKUP_WIDTH;
-
- cur_chunk++;
- chunk_ids[cur_chunk] = MIDX_CHUNKID_OIDFANOUT;
- chunk_offsets[cur_chunk] = chunk_offsets[cur_chunk - 1] + pack_name_concat_len;
-
- cur_chunk++;
- chunk_ids[cur_chunk] = MIDX_CHUNKID_OIDLOOKUP;
- chunk_offsets[cur_chunk] = chunk_offsets[cur_chunk - 1] + MIDX_CHUNK_FANOUT_SIZE;
-
- cur_chunk++;
- chunk_ids[cur_chunk] = MIDX_CHUNKID_OBJECTOFFSETS;
- 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;
- if (large_offsets_needed) {
- chunk_ids[cur_chunk] = MIDX_CHUNKID_LARGEOFFSETS;
-
- cur_chunk++;
- chunk_offsets[cur_chunk] = chunk_offsets[cur_chunk - 1] +
- num_large_offsets * MIDX_CHUNK_LARGE_OFFSET_WIDTH;
+ if (ctx.nr - dropped_packs == 0) {
+ error(_("no pack files to index."));
+ result = 1;
+ goto cleanup;
}
- chunk_ids[cur_chunk] = 0;
+ cf = init_chunkfile(f);
- for (i = 0; i <= num_chunks; i++) {
- if (i && chunk_offsets[i] < chunk_offsets[i - 1])
- BUG("incorrect chunk offsets: %"PRIu64" before %"PRIu64,
- chunk_offsets[i - 1],
- chunk_offsets[i]);
+ add_chunk(cf, MIDX_CHUNKID_PACKNAMES, pack_name_concat_len,
+ write_midx_pack_names);
+ add_chunk(cf, MIDX_CHUNKID_OIDFANOUT, MIDX_CHUNK_FANOUT_SIZE,
+ write_midx_oid_fanout);
+ add_chunk(cf, MIDX_CHUNKID_OIDLOOKUP,
+ (size_t)ctx.entries_nr * the_hash_algo->rawsz,
+ write_midx_oid_lookup);
+ add_chunk(cf, MIDX_CHUNKID_OBJECTOFFSETS,
+ (size_t)ctx.entries_nr * MIDX_CHUNK_OFFSET_WIDTH,
+ write_midx_object_offsets);
- if (chunk_offsets[i] % MIDX_CHUNK_ALIGNMENT)
- BUG("chunk offset %"PRIu64" is not properly aligned",
- chunk_offsets[i]);
+ if (ctx.large_offsets_needed)
+ add_chunk(cf, MIDX_CHUNKID_LARGEOFFSETS,
+ (size_t)ctx.num_large_offsets * MIDX_CHUNK_LARGE_OFFSET_WIDTH,
+ write_midx_large_offsets);
- hashwrite_be32(f, chunk_ids[i]);
- hashwrite_be32(f, chunk_offsets[i] >> 32);
- hashwrite_be32(f, chunk_offsets[i]);
-
- 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,
- chunk_offsets[i],
- written,
- chunk_ids[i]);
-
- switch (chunk_ids[i]) {
- case MIDX_CHUNKID_PACKNAMES:
- written += write_midx_pack_names(f, packs.info, packs.nr);
- break;
-
- case MIDX_CHUNKID_OIDFANOUT:
- written += write_midx_oid_fanout(f, entries, nr_entries);
- break;
-
- case MIDX_CHUNKID_OIDLOOKUP:
- written += write_midx_oid_lookup(f, the_hash_algo->rawsz, entries, nr_entries);
- break;
-
- case MIDX_CHUNKID_OBJECTOFFSETS:
- written += write_midx_object_offsets(f, large_offsets_needed, pack_perm, entries, nr_entries);
- break;
-
- case MIDX_CHUNKID_LARGEOFFSETS:
- written += write_midx_large_offsets(f, num_large_offsets, entries, nr_entries);
- break;
-
- default:
- 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,
- written,
- chunk_offsets[num_chunks]);
+ write_midx_header(f, get_num_chunks(cf), ctx.nr - dropped_packs);
+ write_chunkfile(cf, &ctx);
finalize_hashfile(f, NULL, CSUM_FSYNC | CSUM_HASH_IN_STREAM);
+ free_chunkfile(cf);
commit_lock_file(&lk);
cleanup:
- for (i = 0; i < packs.nr; i++) {
- if (packs.info[i].p) {
- close_pack(packs.info[i].p);
- free(packs.info[i].p);
+ for (i = 0; i < ctx.nr; i++) {
+ if (ctx.info[i].p) {
+ close_pack(ctx.info[i].p);
+ free(ctx.info[i].p);
}
- free(packs.info[i].pack_name);
+ free(ctx.info[i].pack_name);
}
- free(packs.info);
- free(entries);
- free(pack_perm);
+ free(ctx.info);
+ free(ctx.entries);
+ free(ctx.pack_perm);
free(midx_name);
return result;
}
@@ -1047,10 +961,8 @@
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);
}
@@ -1101,11 +1013,20 @@
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;
+ }
if (flags & MIDX_PROGRESS)
- progress = start_progress(_("Looking for referenced packfiles"),
+ progress = start_delayed_progress(_("Looking for referenced packfiles"),
m->num_packs);
for (i = 0; i < m->num_packs; i++) {
if (prepare_midx_pack(r, m, i))
@@ -1124,6 +1045,15 @@
i, oid_fanout1, oid_fanout2, i + 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);
@@ -1214,10 +1144,10 @@
if (!m)
return 0;
- count = xcalloc(m->num_packs, sizeof(uint32_t));
+ CALLOC_ARRAY(count, m->num_packs);
if (flags & MIDX_PROGRESS)
- progress = start_progress(_("Counting referenced objects"),
+ progress = start_delayed_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);
@@ -1227,7 +1157,7 @@
stop_progress(&progress);
if (flags & MIDX_PROGRESS)
- progress = start_progress(_("Finding and deleting unreferenced packfiles"),
+ progress = start_delayed_progress(_("Finding and deleting unreferenced packfiles"),
m->num_packs);
for (i = 0; i < m->num_packs; i++) {
char *pack_name;
@@ -1280,15 +1210,26 @@
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;
- for (i = 0; i < m->num_packs; i++)
+ 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;
+
include_pack[i] = 1;
+ count++;
+ }
- return m->num_packs < 2;
+ return count < 2;
}
static int fill_included_packs_batch(struct repository *r,
@@ -1299,6 +1240,9 @@
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;
@@ -1325,6 +1269,8 @@
if (!p)
continue;
+ if (!pack_kept_objects && p->pack_keep)
+ continue;
if (open_pack_index(p) || !p->num_objects)
continue;
@@ -1342,7 +1288,7 @@
free(pack_info);
- if (total_size < batch_size || packs_to_repack < 2)
+ if (packs_to_repack < 2)
return 1;
return 0;
@@ -1354,30 +1300,47 @@
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;
- include_pack = xcalloc(m->num_packs, sizeof(unsigned char));
+ CALLOC_ARRAY(include_pack, m->num_packs);
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)
- argv_array_push(&cmd.args, "--progress");
+ strvec_push(&cmd.args, "--progress");
else
- argv_array_push(&cmd.args, "-q");
+ strvec_push(&cmd.args, "-q");
strbuf_release(&base_name);
@@ -1390,6 +1353,8 @@
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);
@@ -1398,10 +1363,9 @@
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"));
diff --git a/midx.h b/midx.h
index e6fa356..b18cf53 100644
--- a/midx.h
+++ b/midx.h
@@ -12,8 +12,6 @@
struct multi_pack_index {
struct multi_pack_index *next;
- int fd;
-
const unsigned char *data;
size_t data_len;
diff --git a/name-hash.c b/name-hash.c
index fb526a3..ce28f3f 100644
--- a/name-hash.c
+++ b/name-hash.c
@@ -7,6 +7,7 @@
*/
#include "cache.h"
#include "thread-utils.h"
+#include "trace2.h"
struct dir_entry {
struct hashmap_entry ent;
@@ -224,7 +225,7 @@
{
int j;
- lazy_dir_mutex_array = xcalloc(LAZY_MAX_MUTEX, sizeof(pthread_mutex_t));
+ CALLOC_ARRAY(lazy_dir_mutex_array, LAZY_MAX_MUTEX);
for (j = 0; j < LAZY_MAX_MUTEX; j++)
init_recursive_mutex(&lazy_dir_mutex_array[j]);
@@ -513,9 +514,9 @@
k_start = 0;
nr_each = DIV_ROUND_UP(istate->cache_nr, lazy_nr_dir_threads);
- lazy_entries = xcalloc(istate->cache_nr, sizeof(struct lazy_entry));
- td_dir = xcalloc(lazy_nr_dir_threads, sizeof(struct lazy_dir_thread_data));
- td_name = xcalloc(1, sizeof(struct lazy_name_thread_data));
+ CALLOC_ARRAY(lazy_entries, istate->cache_nr);
+ CALLOC_ARRAY(td_dir, lazy_nr_dir_threads);
+ CALLOC_ARRAY(td_name, 1);
init_dir_mutex();
@@ -577,6 +578,7 @@
if (istate->name_hash_initialized)
return;
trace_performance_enter();
+ trace2_region_enter("index", "name-hash-init", istate->repo);
hashmap_init(&istate->name_hash, cache_entry_cmp, NULL, istate->cache_nr);
hashmap_init(&istate->dir_hash, dir_entry_cmp, NULL, istate->cache_nr);
@@ -597,6 +599,7 @@
}
istate->name_hash_initialized = 1;
+ trace2_region_leave("index", "name-hash-init", istate->repo);
trace_performance_leave("initialize name hash");
}
@@ -726,6 +729,6 @@
return;
istate->name_hash_initialized = 0;
- hashmap_free(&istate->name_hash);
- hashmap_free_entries(&istate->dir_hash, struct dir_entry, ent);
+ hashmap_clear(&istate->name_hash);
+ hashmap_clear_and_free(&istate->dir_hash, struct dir_entry, ent);
}
diff --git a/negotiator/default.c b/negotiator/default.c
index 4b78f6b..434189a 100644
--- a/negotiator/default.c
+++ b/negotiator/default.c
@@ -167,7 +167,7 @@
negotiator->next = next;
negotiator->ack = ack;
negotiator->release = release;
- negotiator->data = ns = xcalloc(1, sizeof(*ns));
+ negotiator->data = CALLOC_ARRAY(ns, 1);
ns->rev_list.compare = compare_commits_by_commit_date;
if (marked)
diff --git a/negotiator/noop.c b/negotiator/noop.c
new file mode 100644
index 0000000..60569b8
--- /dev/null
+++ b/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/negotiator/noop.h b/negotiator/noop.h
new file mode 100644
index 0000000..2b4ec5d
--- /dev/null
+++ b/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/negotiator/skipping.c b/negotiator/skipping.c
index dffbc76..1236e79 100644
--- a/negotiator/skipping.c
+++ b/negotiator/skipping.c
@@ -62,7 +62,7 @@
struct entry *entry;
commit->object.flags |= mark | SEEN;
- entry = xcalloc(1, sizeof(*entry));
+ CALLOC_ARRAY(entry, 1);
entry->commit = commit;
prio_queue_put(&data->rev_list, entry);
@@ -241,7 +241,7 @@
negotiator->next = next;
negotiator->ack = ack;
negotiator->release = release;
- negotiator->data = data = xcalloc(1, sizeof(*data));
+ negotiator->data = CALLOC_ARRAY(data, 1);
data->rev_list.compare = compare;
if (marked)
diff --git a/notes-merge.c b/notes-merge.c
index 2fe724f..d2771fa 100644
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -136,7 +136,7 @@
diff_tree_oid(base, remote, "", &opt);
diffcore_std(&opt);
- changes = xcalloc(diff_queued_diff.nr, sizeof(struct notes_merge_pair));
+ CALLOC_ARRAY(changes, diff_queued_diff.nr);
for (i = 0; i < diff_queued_diff.nr; i++) {
struct diff_filepair *p = diff_queued_diff.queue[i];
diff --git a/notes-utils.c b/notes-utils.c
index 4bf4888..d7d18e3 100644
--- a/notes-utils.c
+++ b/notes-utils.c
@@ -129,7 +129,7 @@
c->cmd = cmd;
c->enabled = 1;
c->combine = combine_notes_concatenate;
- c->refs = xcalloc(1, sizeof(struct string_list));
+ CALLOC_ARRAY(c->refs, 1);
c->refs->strdup_strings = 1;
c->refs_from_env = 0;
c->mode_from_env = 0;
diff --git a/notes.c b/notes.c
index 564baac..a19e4ad 100644
--- a/notes.c
+++ b/notes.c
@@ -452,7 +452,7 @@
goto handle_non_note;
}
- l = xcalloc(1, sizeof(*l));
+ CALLOC_ARRAY(l, 1);
oidcpy(&l->key_oid, &object_oid);
oidcpy(&l->val_oid, &entry.oid);
if (note_tree_insert(t, node, n, l, type,
@@ -970,7 +970,7 @@
if (*load_refs && !strcmp(k, "notes.displayref")) {
if (!v)
- config_error_nonbool(k);
+ return config_error_nonbool(k);
string_list_add_refs_by_glob(&display_notes_refs, v);
}
diff --git a/sha1-file.c b/object-file.c
similarity index 96%
rename from sha1-file.c
rename to object-file.c
index 6168867..624af40 100644
--- a/sha1-file.c
+++ b/object-file.c
@@ -3,7 +3,7 @@
*
* Copyright (C) Linus Torvalds, 2005
*
- * This handles basic git sha1 object files - packing, unpacking,
+ * This handles basic git object files - packing, unpacking,
* creation etc.
*/
#include "cache.h"
@@ -20,7 +20,7 @@
#include "tree-walk.h"
#include "refs.h"
#include "pack-revindex.h"
-#include "sha1-lookup.h"
+#include "hash-lookup.h"
#include "bulk-checkin.h"
#include "repository.h"
#include "replace-object.h"
@@ -74,6 +74,11 @@
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);
@@ -90,6 +95,11 @@
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);
@@ -105,6 +115,11 @@
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");
@@ -123,6 +138,7 @@
0,
0,
git_hash_unknown_init,
+ git_hash_unknown_clone,
git_hash_unknown_update,
git_hash_unknown_final,
NULL,
@@ -136,6 +152,7 @@
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,
@@ -149,6 +166,7 @@
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,
@@ -273,7 +291,7 @@
return adjust_shared_perm(path);
}
-enum scld_error safe_create_leading_directories(char *path)
+static enum scld_error safe_create_leading_directories_1(char *path, int share)
{
char *next_component = path + offset_1st_component(path);
enum scld_error ret = SCLD_OK;
@@ -319,7 +337,7 @@
ret = SCLD_VANISHED;
else
ret = SCLD_FAILED;
- } else if (adjust_shared_perm(path)) {
+ } else if (share && adjust_shared_perm(path)) {
ret = SCLD_PERMS;
}
*slash = slash_character;
@@ -327,6 +345,16 @@
return ret;
}
+enum scld_error safe_create_leading_directories(char *path)
+{
+ return safe_create_leading_directories_1(path, 1);
+}
+
+enum scld_error safe_create_leading_directories_no_share(char *path)
+{
+ return safe_create_leading_directories_1(path, 0);
+}
+
enum scld_error safe_create_leading_directories_const(const char *path)
{
int save_errno;
@@ -480,9 +508,9 @@
* LF separated. Its base points at a statically allocated buffer that
* contains "/the/directory/corresponding/to/.git/objects/...", while
* its name points just after the slash at the end of ".git/objects/"
- * in the example above, and has enough space to hold 40-byte hex
- * SHA1, an extra slash for the first level indirection, and the
- * terminating NUL.
+ * in the example above, and has enough space to hold all hex characters
+ * of the object ID, an extra slash for the first level indirection, and
+ * the terminating NUL.
*/
static void read_info_alternates(struct repository *r,
const char *relative_base,
@@ -518,7 +546,7 @@
return -1;
}
- ent = xcalloc(1, sizeof(*ent));
+ CALLOC_ARRAY(ent, 1);
ent->path = xstrdup(pathbuf.buf);
/* add the alternate entry */
@@ -676,20 +704,15 @@
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)
@@ -750,18 +773,18 @@
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);
}
}
@@ -868,9 +891,7 @@
/* 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);
}
/*
@@ -1589,7 +1610,8 @@
struct cached_object *co;
hash_object_file(the_hash_algo, buf, len, type_name(type), oid);
- if (has_object_file(oid) || find_cached_object(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++];
@@ -1977,6 +1999,18 @@
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)
{
diff --git a/sha1-name.c b/object-name.c
similarity index 96%
rename from sha1-name.c
rename to object-name.c
index 5bb006e..64202de 100644
--- a/sha1-name.c
+++ b/object-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"
@@ -85,7 +85,7 @@
/* otherwise, current can be discarded and candidate is still good */
}
-static int match_sha(unsigned, const unsigned char *, const unsigned char *);
+static int match_hash(unsigned, const unsigned char *, const unsigned char *);
static void find_short_object_filename(struct disambiguate_state *ds)
{
@@ -102,7 +102,7 @@
while (!ds->ambiguous && pos < loose_objects->nr) {
const struct object_id *oid;
oid = loose_objects->oid + pos;
- if (!match_sha(ds->len, ds->bin_pfx.hash, oid->hash))
+ if (!match_hash(ds->len, ds->bin_pfx.hash, oid->hash))
break;
update_candidates(ds, oid);
pos++;
@@ -110,7 +110,7 @@
}
}
-static int match_sha(unsigned len, const unsigned char *a, const unsigned char *b)
+static int match_hash(unsigned len, const unsigned char *a, const unsigned char *b)
{
do {
if (*a != *b)
@@ -145,7 +145,7 @@
for (i = first; i < num && !ds->ambiguous; i++) {
struct object_id oid;
current = nth_midxed_object_oid(&oid, m, i);
- if (!match_sha(ds->len, ds->bin_pfx.hash, current->hash))
+ if (!match_hash(ds->len, ds->bin_pfx.hash, current->hash))
break;
update_candidates(ds, current);
}
@@ -173,7 +173,7 @@
for (i = first; i < num && !ds->ambiguous; i++) {
struct object_id oid;
nth_packed_object_id(&oid, p, i);
- if (!match_sha(ds->len, ds->bin_pfx.hash, oid.hash))
+ if (!match_hash(ds->len, ds->bin_pfx.hash, oid.hash))
break;
update_candidates(ds, &oid);
}
@@ -483,7 +483,7 @@
if (!quietly && (status == SHORT_NAME_AMBIGUOUS)) {
struct oid_array collect = OID_ARRAY_INIT;
- error(_("short SHA1 %s is ambiguous"), ds.hex_pfx);
+ error(_("short object ID %s is ambiguous"), ds.hex_pfx);
/*
* We may still have ambiguity if we simply saw a series of
@@ -809,7 +809,7 @@
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)
@@ -860,11 +860,11 @@
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;
@@ -1427,9 +1427,12 @@
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);
@@ -1471,7 +1474,7 @@
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;
@@ -1493,10 +1496,16 @@
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);
@@ -1506,7 +1515,7 @@
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;
@@ -1515,7 +1524,7 @@
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 */
@@ -1523,7 +1532,8 @@
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);
}
}
@@ -1531,22 +1541,22 @@
(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;
}
@@ -1557,7 +1567,10 @@
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;
@@ -1798,7 +1811,7 @@
if (!ret)
return ret;
/*
- * sha1:path --> object name of path in ent sha1
+ * tree:path --> object name of path in tree
* :path -> object name of absolute path in index
* :./path -> object name of path relative to cwd in index
* :[0-3]:path -> object name of path in index at stage
@@ -1815,8 +1828,8 @@
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);
}
@@ -1936,6 +1949,6 @@
struct object_context *oc)
{
if (flags & GET_OID_FOLLOW_SYMLINKS && flags & GET_OID_ONLY_TO_DIE)
- BUG("incompatible flags for get_sha1_with_context");
+ BUG("incompatible flags for get_oid_with_context");
return get_oid_with_context_1(repo, str, flags, NULL, oid, oc);
}
diff --git a/object-store.h b/object-store.h
index be72fee..541dab0 100644
--- a/object-store.h
+++ b/object-store.h
@@ -4,7 +4,7 @@
#include "cache.h"
#include "oidmap.h"
#include "list.h"
-#include "sha1-array.h"
+#include "oid-array.h"
#include "strbuf.h"
#include "thread-utils.h"
@@ -70,6 +70,7 @@
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;
@@ -84,6 +85,9 @@
multi_pack_index:1;
unsigned char hash[GIT_MAX_RAWSZ];
struct revindex_entry *revindex;
+ const uint32_t *revindex_data;
+ const uint32_t *revindex_map;
+ size_t revindex_size;
/* something like ".git/objects/pack/xxxxx.pack" */
char pack_name[FLEX_ARRAY]; /* more */
};
@@ -238,12 +242,33 @@
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);
diff --git a/object.c b/object.c
index 794c866..7834378 100644
--- a/object.c
+++ b/object.c
@@ -127,7 +127,7 @@
int new_hash_size = r->parsed_objects->obj_hash_size < 32 ? 32 : 2 * r->parsed_objects->obj_hash_size;
struct object **new_hash;
- new_hash = xcalloc(new_hash_size, sizeof(struct object *));
+ CALLOC_ARRAY(new_hash, new_hash_size);
for (i = 0; i < r->parsed_objects->obj_hash_size; i++) {
struct object *obj = r->parsed_objects->obj_hash[i];
@@ -157,13 +157,13 @@
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;
@@ -412,15 +412,16 @@
}
/*
- * Return true iff array already contains an entry with name.
+ * Return true if array already contains an entry.
*/
-static int contains_name(struct object_array *array, const char *name)
+static int contains_object(struct object_array *array,
+ const struct object *item, const char *name)
{
unsigned nr = array->nr, i;
struct object_array_entry *object = array->objects;
for (i = 0; i < nr; i++, object++)
- if (!strcmp(object->name, name))
+ if (item == object->item && !strcmp(object->name, name))
return 1;
return 0;
}
@@ -432,7 +433,8 @@
array->nr = 0;
for (src = 0; src < nr; src++) {
- if (!contains_name(array, objects[src].name)) {
+ if (!contains_object(array, objects[src].item,
+ objects[src].name)) {
if (src != array->nr)
objects[array->nr] = objects[src];
array->nr++;
@@ -453,12 +455,12 @@
}
}
-void clear_commit_marks_all(unsigned int flags)
+void repo_clear_commit_marks(struct repository *r, unsigned int flags)
{
int i;
- for (i = 0; i < the_repository->parsed_objects->obj_hash_size; i++) {
- struct object *obj = the_repository->parsed_objects->obj_hash[i];
+ for (i = 0; i < r->parsed_objects->obj_hash_size; i++) {
+ struct object *obj = r->parsed_objects->obj_hash[i];
if (obj && obj->type == OBJ_COMMIT)
obj->flags &= ~flags;
}
@@ -476,7 +478,7 @@
o->object_state = allocate_alloc_state();
o->is_shallow = -1;
- o->shallow_stat = xcalloc(1, sizeof(*o->shallow_stat));
+ CALLOC_ARRAY(o->shallow_stat, 1);
o->buffer_slab = allocate_commit_buffer_slab();
@@ -532,7 +534,7 @@
close_object_store(o);
o->packed_git = NULL;
- hashmap_free(&o->pack_map);
+ hashmap_clear(&o->pack_map);
}
void parsed_object_pool_clear(struct parsed_object_pool *o)
diff --git a/object.h b/object.h
index 2dbabfc..59daadc 100644
--- a/object.h
+++ b/object.h
@@ -15,7 +15,6 @@
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 @@
char *alternate_shallow_file;
int commit_graft_prepared;
+ int substituted_parent;
struct buffer_slab *buffer_slab;
};
@@ -59,7 +59,7 @@
/*
* 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,19 +67,20 @@
* builtin/blame.c: 12-13
* bisect.c: 16
* bundle.c: 16
- * http-push.c: 16-----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.
@@ -121,7 +122,7 @@
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.
@@ -190,8 +191,9 @@
void clear_object_flags(unsigned flags);
/*
- * Clear the specified object flags from all in-core commit objects.
+ * Clear the specified object flags from all in-core commit objects from
+ * the specified repository.
*/
-void clear_commit_marks_all(unsigned int flags);
+void repo_clear_commit_marks(struct repository *r, unsigned int flags);
#endif /* OBJECT_H */
diff --git a/sha1-array.c b/oid-array.c
similarity index 66%
rename from sha1-array.c
rename to oid-array.c
index 3eeadfe..73ba76e 100644
--- a/sha1-array.c
+++ b/oid-array.c
@@ -1,6 +1,6 @@
#include "cache.h"
-#include "sha1-array.h"
-#include "sha1-lookup.h"
+#include "oid-array.h"
+#include "hash-lookup.h"
void oid_array_append(struct oid_array *array, const struct object_id *oid)
{
@@ -14,23 +14,24 @@
return oidcmp(a, b);
}
-static void oid_array_sort(struct oid_array *array)
+void oid_array_sort(struct oid_array *array)
{
+ if (array->sorted)
+ return;
QSORT(array->oid, array->nr, void_hashcmp);
array->sorted = 1;
}
-static const unsigned char *sha1_access(size_t index, void *table)
+static const struct object_id *oid_access(size_t index, const void *table)
{
- struct object_id *array = table;
- return array[index].hash;
+ const struct object_id *array = table;
+ return &array[index];
}
int oid_array_lookup(struct oid_array *array, const struct object_id *oid)
{
- if (!array->sorted)
- oid_array_sort(array);
- return sha1_pos(oid->hash, array->oid, array->nr, sha1_access);
+ oid_array_sort(array);
+ return oid_pos(oid, array->oid, array->nr, oid_access);
}
void oid_array_clear(struct oid_array *array)
@@ -46,9 +47,9 @@
for_each_oid_fn fn,
void *data)
{
- int i;
+ size_t i;
- /* No oid_array_sort() here! See sha1-array.h */
+ /* No oid_array_sort() here! See oid-array.h */
for (i = 0; i < array->nr; i++) {
int ret = fn(array->oid + i, data);
@@ -62,16 +63,12 @@
for_each_oid_fn fn,
void *data)
{
- int i;
+ size_t i;
- if (!array->sorted)
- oid_array_sort(array);
+ oid_array_sort(array);
- for (i = 0; i < array->nr; i++) {
- int ret;
- if (i > 0 && oideq(array->oid + i, array->oid + i - 1))
- continue;
- ret = fn(array->oid + i, data);
+ for (i = 0; i < array->nr; i = oid_array_next_unique(array, i)) {
+ int ret = fn(array->oid + i, data);
if (ret)
return ret;
}
@@ -82,7 +79,7 @@
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/sha1-array.h b/oid-array.h
similarity index 80%
rename from sha1-array.h
rename to oid-array.h
index dc1bca9..72bca78 100644
--- a/sha1-array.h
+++ b/oid-array.h
@@ -1,5 +1,7 @@
-#ifndef SHA1_ARRAY_H
-#define SHA1_ARRAY_H
+#ifndef OID_ARRAY_H
+#define OID_ARRAY_H
+
+#include "hash.h"
/**
* The API provides storage and manipulation of sets of object identifiers.
@@ -19,7 +21,7 @@
*
* void some_func(void)
* {
- * struct sha1_array hashes = OID_ARRAY_INIT;
+ * struct oid_array hashes = OID_ARRAY_INIT;
* struct object_id oid;
*
* // Read objects into our set
@@ -49,8 +51,8 @@
*/
struct oid_array {
struct object_id *oid;
- int nr;
- int alloc;
+ size_t nr;
+ size_t alloc;
int sorted;
};
@@ -106,4 +108,30 @@
for_each_oid_fn want,
void *cbdata);
-#endif /* SHA1_ARRAY_H */
+/**
+ * Sort the array in order of ascending object id.
+ */
+void oid_array_sort(struct oid_array *array);
+
+/**
+ * Find the next unique oid in the array after position "cur".
+ * The array must be sorted for this to work. You can iterate
+ * over unique elements like this:
+ *
+ * size_t i;
+ * oid_array_sort(array);
+ * for (i = 0; i < array->nr; i = oid_array_next_unique(array, i))
+ * printf("%s", oid_to_hex(array->oids[i]);
+ *
+ * Non-unique iteration can just increment with "i++" to visit each element.
+ */
+static inline size_t oid_array_next_unique(struct oid_array *array, size_t cur)
+{
+ do {
+ cur++;
+ } while (cur < array->nr &&
+ oideq(array->oid + cur, array->oid + cur - 1));
+ return cur;
+}
+
+#endif /* OID_ARRAY_H */
diff --git a/oidmap.c b/oidmap.c
index 423aa01..286a04a 100644
--- a/oidmap.c
+++ b/oidmap.c
@@ -27,7 +27,7 @@
return;
/* TODO: make oidmap itself not depend on struct layouts */
- hashmap_free_(&map->map, free_entries ? 0 : -1);
+ hashmap_clear_(&map->map, free_entries ? 0 : -1);
}
void *oidmap_get(const struct oidmap *map, const struct object_id *key)
diff --git a/oidset.c b/oidset.c
index f63ce81..5aac633 100644
--- a/oidset.c
+++ b/oidset.c
@@ -36,8 +36,19 @@
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;
@@ -63,6 +74,8 @@
if (parse_oid_hex(sb.buf, &oid, &p) || *p != '\0')
die("invalid object name: %s", sb.buf);
+ if (fn && fn(&oid, cbdata))
+ continue;
oidset_insert(set, &oid);
}
if (ferror(fp))
diff --git a/oidset.h b/oidset.h
index 5346563..01f6560 100644
--- a/oidset.h
+++ b/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_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_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/pack-bitmap-write.c b/pack-bitmap-write.c
index a7a4964..88d9e69 100644
--- a/pack-bitmap-write.c
+++ b/pack-bitmap-write.c
@@ -9,9 +9,10 @@
#include "pack-revindex.h"
#include "pack.h"
#include "pack-bitmap.h"
-#include "sha1-lookup.h"
+#include "hash-lookup.h"
#include "pack-objects.h"
#include "commit-reach.h"
+#include "prio-queue.h"
struct bitmapped_commit {
struct commit *commit;
@@ -29,7 +30,6 @@
struct ewah_bitmap *tags;
kh_oid_map_t *bitmaps;
- kh_oid_map_t *reused;
struct packing_data *to_pack;
struct bitmapped_commit *selected;
@@ -110,10 +110,8 @@
/**
* Compute the actual bitmaps
*/
-static struct object **seen_objects;
-static unsigned int seen_objects_nr, seen_objects_alloc;
-static inline void push_bitmapped_commit(struct commit *commit, struct ewah_bitmap *reused)
+static inline void push_bitmapped_commit(struct commit *commit)
{
if (writer.selected_nr >= writer.selected_alloc) {
writer.selected_alloc = (writer.selected_alloc + 32) * 2;
@@ -121,27 +119,12 @@
}
writer.selected[writer.selected_nr].commit = commit;
- writer.selected[writer.selected_nr].bitmap = reused;
+ writer.selected[writer.selected_nr].bitmap = NULL;
writer.selected[writer.selected_nr].flags = 0;
writer.selected_nr++;
}
-static inline void mark_as_seen(struct object *object)
-{
- ALLOC_GROW(seen_objects, seen_objects_nr + 1, seen_objects_alloc);
- seen_objects[seen_objects_nr++] = object;
-}
-
-static inline void reset_all_seen(void)
-{
- unsigned int i;
- for (i = 0; i < seen_objects_nr; ++i) {
- seen_objects[i]->flags &= ~(SEEN | ADDED | SHOWN);
- }
- seen_objects_nr = 0;
-}
-
static uint32_t find_object_pos(const struct object_id *oid)
{
struct object_entry *entry = packlist_find(writer.to_pack, oid);
@@ -154,60 +137,6 @@
return oe_in_pack_pos(writer.to_pack, entry);
}
-static void show_object(struct object *object, const char *name, void *data)
-{
- struct bitmap *base = data;
- bitmap_set(base, find_object_pos(&object->oid));
- mark_as_seen(object);
-}
-
-static void show_commit(struct commit *commit, void *data)
-{
- mark_as_seen((struct object *)commit);
-}
-
-static int
-add_to_include_set(struct bitmap *base, struct commit *commit)
-{
- khiter_t hash_pos;
- uint32_t bitmap_pos = find_object_pos(&commit->object.oid);
-
- if (bitmap_get(base, bitmap_pos))
- return 0;
-
- hash_pos = kh_get_oid_map(writer.bitmaps, commit->object.oid);
- if (hash_pos < kh_end(writer.bitmaps)) {
- struct bitmapped_commit *bc = kh_value(writer.bitmaps, hash_pos);
- bitmap_or_ewah(base, bc->bitmap);
- return 0;
- }
-
- bitmap_set(base, bitmap_pos);
- return 1;
-}
-
-static int
-should_include(struct commit *commit, void *_data)
-{
- struct bitmap *base = _data;
-
- if (!add_to_include_set(base, commit)) {
- struct commit_list *parent = commit->parents;
-
- mark_as_seen((struct object *)commit);
-
- while (parent) {
- parent->item->object.flags |= SEEN;
- mark_as_seen((struct object *)parent->item);
- parent = parent->next;
- }
-
- return 0;
- }
-
- return 1;
-}
-
static void compute_xor_offsets(void)
{
static const int MAX_XOR_OFFSET_SEARCH = 10;
@@ -248,79 +177,326 @@
}
}
+struct bb_commit {
+ struct commit_list *reverse_edges;
+ struct bitmap *commit_mask;
+ struct bitmap *bitmap;
+ unsigned selected:1,
+ maximal:1;
+ unsigned idx; /* within selected array */
+};
+
+define_commit_slab(bb_data, struct bb_commit);
+
+struct bitmap_builder {
+ struct bb_data data;
+ struct commit **commits;
+ size_t commits_nr, commits_alloc;
+};
+
+static void bitmap_builder_init(struct bitmap_builder *bb,
+ struct bitmap_writer *writer,
+ struct bitmap_index *old_bitmap)
+{
+ struct rev_info revs;
+ struct commit *commit;
+ struct commit_list *reusable = NULL;
+ struct commit_list *r;
+ unsigned int i, num_maximal = 0;
+
+ memset(bb, 0, sizeof(*bb));
+ init_bb_data(&bb->data);
+
+ reset_revision_walk();
+ repo_init_revisions(writer->to_pack->repo, &revs, NULL);
+ revs.topo_order = 1;
+ revs.first_parent_only = 1;
+
+ for (i = 0; i < writer->selected_nr; i++) {
+ struct commit *c = writer->selected[i].commit;
+ struct bb_commit *ent = bb_data_at(&bb->data, c);
+
+ ent->selected = 1;
+ ent->maximal = 1;
+ ent->idx = i;
+
+ ent->commit_mask = bitmap_new();
+ bitmap_set(ent->commit_mask, i);
+
+ add_pending_object(&revs, &c->object, "");
+ }
+
+ if (prepare_revision_walk(&revs))
+ die("revision walk setup failed");
+
+ while ((commit = get_revision(&revs))) {
+ struct commit_list *p = commit->parents;
+ struct bb_commit *c_ent;
+
+ parse_commit_or_die(commit);
+
+ c_ent = bb_data_at(&bb->data, commit);
+
+ /*
+ * If there is no commit_mask, there is no reason to iterate
+ * over this commit; it is not selected (if it were, it would
+ * not have a blank commit mask) and all its children have
+ * existing bitmaps (see the comment starting with "This commit
+ * has an existing bitmap" below), so it does not contribute
+ * anything to the final bitmap file or its descendants.
+ */
+ if (!c_ent->commit_mask)
+ continue;
+
+ if (old_bitmap && bitmap_for_commit(old_bitmap, commit)) {
+ /*
+ * This commit has an existing bitmap, so we can
+ * get its bits immediately without an object
+ * walk. That is, it is reusable as-is and there is no
+ * need to continue walking beyond it.
+ *
+ * Mark it as such and add it to bb->commits separately
+ * to avoid allocating a position in the commit mask.
+ */
+ commit_list_insert(commit, &reusable);
+ goto next;
+ }
+
+ if (c_ent->maximal) {
+ num_maximal++;
+ ALLOC_GROW(bb->commits, bb->commits_nr + 1, bb->commits_alloc);
+ bb->commits[bb->commits_nr++] = commit;
+ }
+
+ if (p) {
+ struct bb_commit *p_ent = bb_data_at(&bb->data, p->item);
+ int c_not_p, p_not_c;
+
+ if (!p_ent->commit_mask) {
+ p_ent->commit_mask = bitmap_new();
+ c_not_p = 1;
+ p_not_c = 0;
+ } else {
+ c_not_p = bitmap_is_subset(c_ent->commit_mask, p_ent->commit_mask);
+ p_not_c = bitmap_is_subset(p_ent->commit_mask, c_ent->commit_mask);
+ }
+
+ if (!c_not_p)
+ continue;
+
+ bitmap_or(p_ent->commit_mask, c_ent->commit_mask);
+
+ if (p_not_c)
+ p_ent->maximal = 1;
+ else {
+ p_ent->maximal = 0;
+ free_commit_list(p_ent->reverse_edges);
+ p_ent->reverse_edges = NULL;
+ }
+
+ if (c_ent->maximal) {
+ commit_list_insert(commit, &p_ent->reverse_edges);
+ } else {
+ struct commit_list *cc = c_ent->reverse_edges;
+
+ for (; cc; cc = cc->next) {
+ if (!commit_list_contains(cc->item, p_ent->reverse_edges))
+ commit_list_insert(cc->item, &p_ent->reverse_edges);
+ }
+ }
+ }
+
+next:
+ bitmap_free(c_ent->commit_mask);
+ c_ent->commit_mask = NULL;
+ }
+
+ for (r = reusable; r; r = r->next) {
+ ALLOC_GROW(bb->commits, bb->commits_nr + 1, bb->commits_alloc);
+ bb->commits[bb->commits_nr++] = r->item;
+ }
+
+ trace2_data_intmax("pack-bitmap-write", the_repository,
+ "num_selected_commits", writer->selected_nr);
+ trace2_data_intmax("pack-bitmap-write", the_repository,
+ "num_maximal_commits", num_maximal);
+
+ free_commit_list(reusable);
+}
+
+static void bitmap_builder_clear(struct bitmap_builder *bb)
+{
+ clear_bb_data(&bb->data);
+ free(bb->commits);
+ bb->commits_nr = bb->commits_alloc = 0;
+}
+
+static void fill_bitmap_tree(struct bitmap *bitmap,
+ struct tree *tree)
+{
+ uint32_t pos;
+ struct tree_desc desc;
+ struct name_entry entry;
+
+ /*
+ * If our bit is already set, then there is nothing to do. Both this
+ * tree and all of its children will be set.
+ */
+ pos = find_object_pos(&tree->object.oid);
+ if (bitmap_get(bitmap, pos))
+ return;
+ bitmap_set(bitmap, pos);
+
+ if (parse_tree(tree) < 0)
+ die("unable to load tree object %s",
+ oid_to_hex(&tree->object.oid));
+ init_tree_desc(&desc, tree->buffer, tree->size);
+
+ while (tree_entry(&desc, &entry)) {
+ switch (object_type(entry.mode)) {
+ case OBJ_TREE:
+ fill_bitmap_tree(bitmap,
+ lookup_tree(the_repository, &entry.oid));
+ break;
+ case OBJ_BLOB:
+ bitmap_set(bitmap, find_object_pos(&entry.oid));
+ break;
+ default:
+ /* Gitlink, etc; not reachable */
+ break;
+ }
+ }
+
+ free_tree_buffer(tree);
+}
+
+static void fill_bitmap_commit(struct bb_commit *ent,
+ struct commit *commit,
+ struct prio_queue *queue,
+ struct prio_queue *tree_queue,
+ struct bitmap_index *old_bitmap,
+ const uint32_t *mapping)
+{
+ if (!ent->bitmap)
+ ent->bitmap = bitmap_new();
+
+ prio_queue_put(queue, commit);
+
+ while (queue->nr) {
+ struct commit_list *p;
+ struct commit *c = prio_queue_get(queue);
+
+ if (old_bitmap && mapping) {
+ struct ewah_bitmap *old = bitmap_for_commit(old_bitmap, c);
+ /*
+ * If this commit has an old bitmap, then translate that
+ * bitmap and add its bits to this one. No need to walk
+ * parents or the tree for this commit.
+ */
+ if (old && !rebuild_bitmap(mapping, old, ent->bitmap))
+ continue;
+ }
+
+ /*
+ * Mark ourselves and queue our tree. The commit
+ * walk ensures we cover all parents.
+ */
+ bitmap_set(ent->bitmap, find_object_pos(&c->object.oid));
+ prio_queue_put(tree_queue, get_commit_tree(c));
+
+ for (p = c->parents; p; p = p->next) {
+ int pos = find_object_pos(&p->item->object.oid);
+ if (!bitmap_get(ent->bitmap, pos)) {
+ bitmap_set(ent->bitmap, pos);
+ prio_queue_put(queue, p->item);
+ }
+ }
+ }
+
+ while (tree_queue->nr)
+ fill_bitmap_tree(ent->bitmap, prio_queue_get(tree_queue));
+}
+
+static void store_selected(struct bb_commit *ent, struct commit *commit)
+{
+ struct bitmapped_commit *stored = &writer.selected[ent->idx];
+ khiter_t hash_pos;
+ int hash_ret;
+
+ stored->bitmap = bitmap_to_ewah(ent->bitmap);
+
+ hash_pos = kh_put_oid_map(writer.bitmaps, commit->object.oid, &hash_ret);
+ if (hash_ret == 0)
+ die("Duplicate entry when writing index: %s",
+ oid_to_hex(&commit->object.oid));
+ kh_value(writer.bitmaps, hash_pos) = stored;
+}
+
void bitmap_writer_build(struct packing_data *to_pack)
{
- static const double REUSE_BITMAP_THRESHOLD = 0.2;
-
- int i, reuse_after, need_reset;
- struct bitmap *base = bitmap_new();
- struct rev_info revs;
+ struct bitmap_builder bb;
+ size_t i;
+ int nr_stored = 0; /* for progress */
+ struct prio_queue queue = { compare_commits_by_gen_then_commit_date };
+ struct prio_queue tree_queue = { NULL };
+ struct bitmap_index *old_bitmap;
+ uint32_t *mapping;
writer.bitmaps = kh_init_oid_map();
writer.to_pack = to_pack;
if (writer.show_progress)
writer.progress = start_progress("Building bitmaps", writer.selected_nr);
+ trace2_region_enter("pack-bitmap-write", "building_bitmaps_total",
+ the_repository);
- repo_init_revisions(to_pack->repo, &revs, NULL);
- revs.tag_objects = 1;
- revs.tree_objects = 1;
- revs.blob_objects = 1;
- revs.no_walk = 0;
+ old_bitmap = prepare_bitmap_git(to_pack->repo);
+ if (old_bitmap)
+ mapping = create_bitmap_mapping(old_bitmap, to_pack);
+ else
+ mapping = NULL;
- revs.include_check = should_include;
- reset_revision_walk();
+ bitmap_builder_init(&bb, &writer, old_bitmap);
+ for (i = bb.commits_nr; i > 0; i--) {
+ struct commit *commit = bb.commits[i-1];
+ struct bb_commit *ent = bb_data_at(&bb.data, commit);
+ struct commit *child;
+ int reused = 0;
- reuse_after = writer.selected_nr * REUSE_BITMAP_THRESHOLD;
- need_reset = 0;
+ fill_bitmap_commit(ent, commit, &queue, &tree_queue,
+ old_bitmap, mapping);
- for (i = writer.selected_nr - 1; i >= 0; --i) {
- struct bitmapped_commit *stored;
- struct object *object;
+ if (ent->selected) {
+ store_selected(ent, commit);
+ nr_stored++;
+ display_progress(writer.progress, nr_stored);
+ }
- khiter_t hash_pos;
- int hash_ret;
+ while ((child = pop_commit(&ent->reverse_edges))) {
+ struct bb_commit *child_ent =
+ bb_data_at(&bb.data, child);
- stored = &writer.selected[i];
- object = (struct object *)stored->commit;
-
- if (stored->bitmap == NULL) {
- if (i < writer.selected_nr - 1 &&
- (need_reset ||
- !in_merge_bases(writer.selected[i + 1].commit,
- stored->commit))) {
- bitmap_reset(base);
- reset_all_seen();
+ if (child_ent->bitmap)
+ bitmap_or(child_ent->bitmap, ent->bitmap);
+ else if (reused)
+ child_ent->bitmap = bitmap_dup(ent->bitmap);
+ else {
+ child_ent->bitmap = ent->bitmap;
+ reused = 1;
}
-
- add_pending_object(&revs, object, "");
- revs.include_check_data = base;
-
- if (prepare_revision_walk(&revs))
- die("revision walk setup failed");
-
- traverse_commit_list(&revs, show_commit, show_object, base);
-
- object_array_clear(&revs.pending);
-
- stored->bitmap = bitmap_to_ewah(base);
- need_reset = 0;
- } else
- need_reset = 1;
-
- if (i >= reuse_after)
- stored->flags |= BITMAP_FLAG_REUSE;
-
- hash_pos = kh_put_oid_map(writer.bitmaps, object->oid, &hash_ret);
- if (hash_ret == 0)
- die("Duplicate entry when writing index: %s",
- oid_to_hex(&object->oid));
-
- kh_value(writer.bitmaps, hash_pos) = stored;
- display_progress(writer.progress, writer.selected_nr - i);
+ }
+ if (!reused)
+ bitmap_free(ent->bitmap);
+ ent->bitmap = NULL;
}
+ clear_prio_queue(&queue);
+ clear_prio_queue(&tree_queue);
+ bitmap_builder_clear(&bb);
+ free(mapping);
- bitmap_free(base);
+ trace2_region_leave("pack-bitmap-write", "building_bitmaps_total",
+ the_repository);
+
stop_progress(&writer.progress);
compute_xor_offsets();
@@ -360,35 +536,6 @@
return (long)b->date - (long)a->date;
}
-void bitmap_writer_reuse_bitmaps(struct packing_data *to_pack)
-{
- struct bitmap_index *bitmap_git;
- if (!(bitmap_git = prepare_bitmap_git(to_pack->repo)))
- return;
-
- writer.reused = kh_init_oid_map();
- rebuild_existing_bitmaps(bitmap_git, to_pack, writer.reused,
- writer.show_progress);
- /*
- * NEEDSWORK: rebuild_existing_bitmaps() makes writer.reused reference
- * some bitmaps in bitmap_git, so we can't free the latter.
- */
-}
-
-static struct ewah_bitmap *find_reused_bitmap(const struct object_id *oid)
-{
- khiter_t hash_pos;
-
- if (!writer.reused)
- return NULL;
-
- hash_pos = kh_get_oid_map(writer.reused, *oid);
- if (hash_pos >= kh_end(writer.reused))
- return NULL;
-
- return kh_value(writer.reused, hash_pos);
-}
-
void bitmap_writer_select_commits(struct commit **indexed_commits,
unsigned int indexed_commits_nr,
int max_bitmaps)
@@ -402,12 +549,11 @@
if (indexed_commits_nr < 100) {
for (i = 0; i < indexed_commits_nr; ++i)
- push_bitmapped_commit(indexed_commits[i], NULL);
+ push_bitmapped_commit(indexed_commits[i]);
return;
}
for (;;) {
- struct ewah_bitmap *reused_bitmap = NULL;
struct commit *chosen = NULL;
next = next_commit_index(i);
@@ -422,15 +568,13 @@
if (next == 0) {
chosen = indexed_commits[i];
- reused_bitmap = find_reused_bitmap(&chosen->object.oid);
} else {
chosen = indexed_commits[i + next];
for (j = 0; j <= next; ++j) {
struct commit *cm = indexed_commits[i + j];
- reused_bitmap = find_reused_bitmap(&cm->object.oid);
- if (reused_bitmap || (cm->object.flags & NEEDS_BITMAP) != 0) {
+ if ((cm->object.flags & NEEDS_BITMAP) != 0) {
chosen = cm;
break;
}
@@ -440,7 +584,7 @@
}
}
- push_bitmapped_commit(chosen, reused_bitmap);
+ push_bitmapped_commit(chosen);
i += next + 1;
display_progress(writer.progress, i);
@@ -466,10 +610,10 @@
die("Failed to write bitmap index");
}
-static const unsigned char *sha1_access(size_t pos, void *table)
+static const struct object_id *oid_access(size_t pos, const void *table)
{
- struct pack_idx_entry **index = table;
- return index[pos]->oid.hash;
+ const struct pack_idx_entry * const *index = table;
+ return &index[pos]->oid;
}
static void write_selected_commits_v1(struct hashfile *f,
@@ -482,7 +626,7 @@
struct bitmapped_commit *stored = &writer.selected[i];
int commit_pos =
- sha1_pos(stored->commit->object.oid.hash, index, index_nr, sha1_access);
+ oid_pos(&stored->commit->object.oid, index, index_nr, oid_access);
if (commit_pos < 0)
BUG("trying to write commit not in index");
@@ -503,8 +647,7 @@
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/pack-bitmap.c b/pack-bitmap.c
index 49a8d10..1ebe0c8 100644
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -138,9 +138,10 @@
static int load_bitmap_header(struct bitmap_index *index)
{
struct bitmap_disk_header *header = (void *)index->map;
+ size_t header_size = sizeof(*header) - GIT_MAX_RAWSZ + the_hash_algo->rawsz;
- if (index->map_size < sizeof(*header) + the_hash_algo->rawsz)
- return error("Corrupted bitmap index (missing header data)");
+ if (index->map_size < header_size + the_hash_algo->rawsz)
+ return error("Corrupted bitmap index (too small)");
if (memcmp(header->magic, BITMAP_IDX_SIGNATURE, sizeof(BITMAP_IDX_SIGNATURE)) != 0)
return error("Corrupted bitmap index file (wrong header)");
@@ -152,19 +153,23 @@
/* Parse known bitmap format options */
{
uint32_t flags = ntohs(header->options);
+ size_t cache_size = st_mult(index->pack->num_objects, sizeof(uint32_t));
+ unsigned char *index_end = index->map + index->map_size - the_hash_algo->rawsz;
if ((flags & BITMAP_OPT_FULL_DAG) == 0)
return error("Unsupported options for bitmap index file "
"(Git requires BITMAP_OPT_FULL_DAG)");
if (flags & BITMAP_OPT_HASH_CACHE) {
- unsigned char *end = index->map + index->map_size - the_hash_algo->rawsz;
- index->hashes = ((uint32_t *)end) - index->pack->num_objects;
+ if (cache_size > index_end - index->map - header_size)
+ return error("corrupted bitmap index file (too short to fit hash cache)");
+ index->hashes = (void *)(index_end - cache_size);
+ index_end -= cache_size;
}
}
index->entry_count = ntohl(header->entry_count);
- index->map_pos += sizeof(*header) - GIT_MAX_RAWSZ + the_hash_algo->rawsz;
+ index->map_pos += header_size;
return 0;
}
@@ -224,11 +229,16 @@
uint32_t commit_idx_pos;
struct object_id oid;
+ if (index->map_size - index->map_pos < 6)
+ return error("corrupt ewah bitmap: truncated header for entry %d", i);
+
commit_idx_pos = read_be32(index->map, &index->map_pos);
xor_offset = read_u8(index->map, &index->map_pos);
flags = read_u8(index->map, &index->map_pos);
- nth_packed_object_id(&oid, index->pack, commit_idx_pos);
+ if (nth_packed_object_id(&oid, index->pack, commit_idx_pos) < 0)
+ return error("corrupt ewah bitmap: commit index %u out of range",
+ (unsigned)commit_idx_pos);
bitmap = read_bitmap_1(index);
if (!bitmap)
@@ -370,6 +380,16 @@
struct bitmap *seen;
};
+struct ewah_bitmap *bitmap_for_commit(struct bitmap_index *bitmap_git,
+ struct commit *commit)
+{
+ khiter_t hash_pos = kh_get_oid_map(bitmap_git->bitmaps,
+ commit->object.oid);
+ if (hash_pos >= kh_end(bitmap_git->bitmaps))
+ return NULL;
+ return lookup_stored_bitmap(kh_value(bitmap_git->bitmaps, hash_pos));
+}
+
static inline int bitmap_position_extended(struct bitmap_index *bitmap_git,
const struct object_id *oid)
{
@@ -387,11 +407,14 @@
static inline int bitmap_position_packfile(struct bitmap_index *bitmap_git,
const struct object_id *oid)
{
+ uint32_t pos;
off_t offset = find_pack_entry_one(oid->hash, bitmap_git->pack);
if (!offset)
return -1;
- return find_revindex_position(bitmap_git->pack, offset);
+ if (offset_to_pack_pos(bitmap_git->pack, offset, &pos) < 0)
+ return -1;
+ return pos;
}
static int bitmap_position(struct bitmap_index *bitmap_git,
@@ -455,10 +478,10 @@
static int add_to_include_set(struct bitmap_index *bitmap_git,
struct include_data *data,
- const struct object_id *oid,
+ struct commit *commit,
int bitmap_pos)
{
- khiter_t hash_pos;
+ struct ewah_bitmap *partial;
if (data->seen && bitmap_get(data->seen, bitmap_pos))
return 0;
@@ -466,10 +489,9 @@
if (bitmap_get(data->base, bitmap_pos))
return 0;
- hash_pos = kh_get_oid_map(bitmap_git->bitmaps, *oid);
- if (hash_pos < kh_end(bitmap_git->bitmaps)) {
- struct stored_bitmap *st = kh_value(bitmap_git->bitmaps, hash_pos);
- bitmap_or_ewah(data->base, lookup_stored_bitmap(st));
+ partial = bitmap_for_commit(bitmap_git, commit);
+ if (partial) {
+ bitmap_or_ewah(data->base, partial);
return 0;
}
@@ -488,8 +510,7 @@
(struct object *)commit,
NULL);
- if (!add_to_include_set(data->bitmap_git, data, &commit->object.oid,
- bitmap_pos)) {
+ if (!add_to_include_set(data->bitmap_git, data, commit, bitmap_pos)) {
struct commit_list *parent = commit->parents;
while (parent) {
@@ -503,10 +524,28 @@
return 1;
}
+static int add_commit_to_bitmap(struct bitmap_index *bitmap_git,
+ struct bitmap **base,
+ struct commit *commit)
+{
+ struct ewah_bitmap *or_with = bitmap_for_commit(bitmap_git, commit);
+
+ if (!or_with)
+ return 0;
+
+ if (*base == NULL)
+ *base = ewah_to_bitmap(or_with);
+ else
+ bitmap_or_ewah(*base, or_with);
+
+ return 1;
+}
+
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;
@@ -525,21 +564,10 @@
struct object *object = roots->item;
roots = roots->next;
- if (object->type == OBJ_COMMIT) {
- khiter_t pos = kh_get_oid_map(bitmap_git->bitmaps, object->oid);
-
- if (pos < kh_end(bitmap_git->bitmaps)) {
- struct stored_bitmap *st = kh_value(bitmap_git->bitmaps, pos);
- struct ewah_bitmap *or_with = lookup_stored_bitmap(st);
-
- if (base == NULL)
- base = ewah_to_bitmap(or_with);
- else
- bitmap_or_ewah(base, or_with);
-
- object->flags |= SEEN;
- continue;
- }
+ if (object->type == OBJ_COMMIT &&
+ add_commit_to_bitmap(bitmap_git, &base, (struct commit *)object)) {
+ object->flags |= SEEN;
+ continue;
}
object_list_insert(object, ¬_mapped);
@@ -599,8 +627,9 @@
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;
@@ -682,21 +711,22 @@
for (offset = 0; offset < BITS_IN_EWORD; ++offset) {
struct object_id oid;
- struct revindex_entry *entry;
- uint32_t hash = 0;
+ uint32_t hash = 0, index_pos;
+ off_t ofs;
if ((word >> offset) == 0)
break;
offset += ewah_bit_ctz64(word >> offset);
- entry = &bitmap_git->pack->revindex[pos + offset];
- nth_packed_object_id(&oid, bitmap_git->pack, entry->nr);
+ index_pos = pack_pos_to_index(bitmap_git->pack, pos + offset);
+ ofs = pack_pos_to_offset(bitmap_git->pack, pos + offset);
+ nth_packed_object_id(&oid, bitmap_git->pack, index_pos);
if (bitmap_git->hashes)
- hash = get_be32(bitmap_git->hashes + entry->nr);
+ hash = get_be32(bitmap_git->hashes + index_pos);
- show_reach(&oid, object_type, 0, hash, bitmap_git->pack, entry->offset);
+ show_reach(&oid, object_type, 0, hash, bitmap_git->pack, ofs);
}
}
}
@@ -715,8 +745,9 @@
return 0;
}
-static struct bitmap *find_tip_blobs(struct bitmap_index *bitmap_git,
- struct object_list *tip_objects)
+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;
@@ -724,7 +755,7 @@
for (p = tip_objects; p; p = p->next) {
int pos;
- if (p->item->type != OBJ_BLOB)
+ if (p->item->type != type)
continue;
pos = bitmap_position(bitmap_git, &p->item->oid);
@@ -737,9 +768,10 @@
return result;
}
-static void filter_bitmap_blob_none(struct bitmap_index *bitmap_git,
- struct object_list *tip_objects,
- struct bitmap *to_filter)
+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;
@@ -747,18 +779,21 @@
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
- * blobs which the other side specifically asked for,
+ * objects which the other side specifically asked for,
* so we must match that behavior.
*/
- tips = find_tip_blobs(bitmap_git, tip_objects);
+ 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, OBJ_BLOB);
+ 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)
@@ -773,7 +808,7 @@
*/
for (i = 0; i < eindex->count; i++) {
uint32_t pos = i + bitmap_git->pack->num_objects;
- if (eindex->objects[i]->type == OBJ_BLOB &&
+ if (eindex->objects[i]->type == type &&
bitmap_get(to_filter, pos) &&
!bitmap_get(tips, pos))
bitmap_unset(to_filter, pos);
@@ -782,6 +817,14 @@
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)
{
@@ -792,11 +835,11 @@
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) {
+ off_t ofs = pack_pos_to_offset(pack, pos);
+ if (packed_object_info(the_repository, pack, ofs, &oi) < 0) {
struct object_id oid;
- nth_packed_object_id(&oid, pack, entry->nr);
+ nth_packed_object_id(&oid, pack,
+ pack_pos_to_index(pack, pos));
die(_("unable to get size of %s"), oid_to_hex(&oid));
}
} else {
@@ -820,7 +863,7 @@
eword_t mask;
uint32_t i;
- tips = find_tip_blobs(bitmap_git, tip_objects);
+ 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);
@@ -854,6 +897,20 @@
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,
@@ -877,6 +934,15 @@
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;
}
@@ -912,7 +978,7 @@
/* 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));
+ CALLOC_ARRAY(bitmap_git, 1);
if (open_pack_bitmap(revs->repo, bitmap_git) < 0)
goto cleanup;
@@ -963,7 +1029,8 @@
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;
@@ -971,7 +1038,8 @@
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");
@@ -1001,23 +1069,21 @@
struct bitmap *reuse,
struct pack_window **w_curs)
{
- struct revindex_entry *revidx;
- off_t offset;
+ off_t offset, header;
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;
+ offset = header = pack_pos_to_offset(bitmap_git->pack, pos);
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;
+ uint32_t base_pos;
/*
* Find the position of the base object so we can look it up
@@ -1028,11 +1094,10 @@
* more detail.
*/
base_offset = get_delta_base(bitmap_git->pack, w_curs,
- &offset, type, revidx->offset);
+ &offset, type, header);
if (!base_offset)
return;
- base_pos = find_revindex_position(bitmap_git->pack, base_offset);
- if (base_pos < 0)
+ if (offset_to_pack_pos(bitmap_git->pack, base_offset, &base_pos) < 0)
return;
/*
@@ -1232,10 +1297,10 @@
{
struct object *root;
struct bitmap *result = NULL;
- khiter_t pos;
size_t result_popcnt;
struct bitmap_test_data tdata;
struct bitmap_index *bitmap_git;
+ struct ewah_bitmap *bm;
if (!(bitmap_git = prepare_bitmap_git(revs->repo)))
die("failed to load bitmap indexes");
@@ -1247,12 +1312,9 @@
bitmap_git->version, bitmap_git->entry_count);
root = revs->pending.objects[0].item;
- pos = kh_get_oid_map(bitmap_git->bitmaps, root->oid);
+ bm = bitmap_for_commit(bitmap_git, (struct commit *)root);
- if (pos < kh_end(bitmap_git->bitmaps)) {
- struct stored_bitmap *st = kh_value(bitmap_git->bitmaps, pos);
- struct ewah_bitmap *bm = lookup_stored_bitmap(st);
-
+ if (bm) {
fprintf(stderr, "Found bitmap for %s. %d bits / %08x checksum\n",
oid_to_hex(&root->oid), (int)bm->bit_size, ewah_checksum(bm));
@@ -1283,14 +1345,14 @@
if (bitmap_equals(result, tdata.base))
fprintf(stderr, "OK!\n");
else
- fprintf(stderr, "Mismatch!\n");
+ die("mismatch in bitmap results");
free_bitmap_index(bitmap_git);
}
-static int rebuild_bitmap(uint32_t *reposition,
- struct ewah_bitmap *source,
- struct bitmap *dest)
+int rebuild_bitmap(const uint32_t *reposition,
+ struct ewah_bitmap *source,
+ struct bitmap *dest)
{
uint32_t pos = 0;
struct ewah_iterator it;
@@ -1319,63 +1381,28 @@
return 0;
}
-int rebuild_existing_bitmaps(struct bitmap_index *bitmap_git,
- struct packing_data *mapping,
- kh_oid_map_t *reused_bitmaps,
- int show_progress)
+uint32_t *create_bitmap_mapping(struct bitmap_index *bitmap_git,
+ struct packing_data *mapping)
{
uint32_t i, num_objects;
uint32_t *reposition;
- struct bitmap *rebuild;
- struct stored_bitmap *stored;
- struct progress *progress = NULL;
-
- khiter_t hash_pos;
- int hash_ret;
num_objects = bitmap_git->pack->num_objects;
- reposition = xcalloc(num_objects, sizeof(uint32_t));
+ CALLOC_ARRAY(reposition, num_objects);
for (i = 0; i < num_objects; ++i) {
struct object_id oid;
- struct revindex_entry *entry;
struct object_entry *oe;
- entry = &bitmap_git->pack->revindex[i];
- nth_packed_object_id(&oid, bitmap_git->pack, entry->nr);
+ nth_packed_object_id(&oid, bitmap_git->pack,
+ pack_pos_to_index(bitmap_git->pack, i));
oe = packlist_find(mapping, &oid);
if (oe)
reposition[i] = oe_in_pack_pos(mapping, oe) + 1;
}
- rebuild = bitmap_new();
- i = 0;
-
- if (show_progress)
- progress = start_progress("Reusing bitmaps", 0);
-
- kh_foreach_value(bitmap_git->bitmaps, stored, {
- if (stored->flags & BITMAP_FLAG_REUSE) {
- if (!rebuild_bitmap(reposition,
- lookup_stored_bitmap(stored),
- rebuild)) {
- hash_pos = kh_put_oid_map(reused_bitmaps,
- stored->oid,
- &hash_ret);
- kh_value(reused_bitmaps, hash_pos) =
- bitmap_to_ewah(rebuild);
- }
- bitmap_reset(rebuild);
- display_progress(progress, ++i);
- }
- });
-
- stop_progress(&progress);
-
- free(reposition);
- bitmap_free(rebuild);
- return 0;
+ return reposition;
}
void free_bitmap_index(struct bitmap_index *b)
@@ -1403,3 +1430,84 @@
return bitmap_git &&
bitmap_walk_contains(bitmap_git, bitmap_git->haves, oid);
}
+
+static off_t get_disk_usage_for_type(struct bitmap_index *bitmap_git,
+ enum object_type object_type)
+{
+ struct bitmap *result = bitmap_git->result;
+ struct packed_git *pack = bitmap_git->pack;
+ off_t total = 0;
+ struct ewah_iterator it;
+ eword_t filter;
+ size_t i;
+
+ init_type_iterator(&it, bitmap_git, object_type);
+ for (i = 0; i < result->word_alloc &&
+ ewah_iterator_next(&filter, &it); i++) {
+ eword_t word = result->words[i] & filter;
+ size_t base = (i * BITS_IN_EWORD);
+ unsigned offset;
+
+ if (!word)
+ continue;
+
+ for (offset = 0; offset < BITS_IN_EWORD; offset++) {
+ size_t pos;
+
+ if ((word >> offset) == 0)
+ break;
+
+ offset += ewah_bit_ctz64(word >> offset);
+ pos = base + offset;
+ total += pack_pos_to_offset(pack, pos + 1) -
+ pack_pos_to_offset(pack, pos);
+ }
+ }
+
+ return total;
+}
+
+static off_t get_disk_usage_for_extended(struct bitmap_index *bitmap_git)
+{
+ struct bitmap *result = bitmap_git->result;
+ struct packed_git *pack = bitmap_git->pack;
+ struct eindex *eindex = &bitmap_git->ext_index;
+ off_t total = 0;
+ struct object_info oi = OBJECT_INFO_INIT;
+ off_t object_size;
+ size_t i;
+
+ oi.disk_sizep = &object_size;
+
+ for (i = 0; i < eindex->count; i++) {
+ struct object *obj = eindex->objects[i];
+
+ if (!bitmap_get(result, pack->num_objects + i))
+ continue;
+
+ if (oid_object_info_extended(the_repository, &obj->oid, &oi, 0) < 0)
+ die(_("unable to get disk usage of %s"),
+ oid_to_hex(&obj->oid));
+
+ total += object_size;
+ }
+ return total;
+}
+
+off_t get_disk_usage_from_bitmap(struct bitmap_index *bitmap_git,
+ struct rev_info *revs)
+{
+ off_t total = 0;
+
+ total += get_disk_usage_for_type(bitmap_git, OBJ_COMMIT);
+ if (revs->tree_objects)
+ total += get_disk_usage_for_type(bitmap_git, OBJ_TREE);
+ if (revs->blob_objects)
+ total += get_disk_usage_for_type(bitmap_git, OBJ_BLOB);
+ if (revs->tag_objects)
+ total += get_disk_usage_for_type(bitmap_git, OBJ_TAG);
+
+ total += get_disk_usage_for_extended(bitmap_git);
+
+ return total;
+}
diff --git a/pack-bitmap.h b/pack-bitmap.h
index 1203120..36d9993 100644
--- a/pack-bitmap.h
+++ b/pack-bitmap.h
@@ -68,12 +68,20 @@
*/
int bitmap_has_oid_in_uninteresting(struct bitmap_index *, const struct object_id *oid);
+off_t get_disk_usage_from_bitmap(struct bitmap_index *, struct rev_info *);
+
void bitmap_writer_show_progress(int show);
void bitmap_writer_set_checksum(unsigned char *sha1);
void bitmap_writer_build_type_index(struct packing_data *to_pack,
struct pack_idx_entry **index,
uint32_t index_nr);
-void bitmap_writer_reuse_bitmaps(struct packing_data *to_pack);
+uint32_t *create_bitmap_mapping(struct bitmap_index *bitmap_git,
+ struct packing_data *mapping);
+int rebuild_bitmap(const uint32_t *reposition,
+ struct ewah_bitmap *source,
+ struct bitmap *dest);
+struct ewah_bitmap *bitmap_for_commit(struct bitmap_index *bitmap_git,
+ struct commit *commit);
void bitmap_writer_select_commits(struct commit **indexed_commits,
unsigned int indexed_commits_nr, int max_bitmaps);
void bitmap_writer_build(struct packing_data *to_pack);
diff --git a/pack-check.c b/pack-check.c
index dad6d8a..4b089fe 100644
--- a/pack-check.c
+++ b/pack-check.c
@@ -39,7 +39,7 @@
} while (len);
index_crc = p->index_data;
- index_crc += 2 + 256 + p->num_objects * (the_hash_algo->rawsz/4) + nr;
+ index_crc += 2 + 256 + (size_t)p->num_objects * (the_hash_algo->rawsz/4) + nr;
return data_crc != ntohl(*index_crc);
}
@@ -164,7 +164,7 @@
int verify_pack_index(struct packed_git *p)
{
- off_t index_size;
+ size_t len;
const unsigned char *index_base;
git_hash_ctx ctx;
unsigned char hash[GIT_MAX_RAWSZ];
@@ -172,14 +172,14 @@
if (open_pack_index(p))
return error("packfile %s index not opened", p->pack_name);
- index_size = p->index_size;
index_base = p->index_data;
+ len = p->index_size - the_hash_algo->rawsz;
/* Verify SHA1 sum of the index file */
the_hash_algo->init_fn(&ctx);
- the_hash_algo->update_fn(&ctx, index_base, (unsigned int)(index_size - the_hash_algo->rawsz));
+ the_hash_algo->update_fn(&ctx, index_base, len);
the_hash_algo->final_fn(hash, &ctx);
- if (!hasheq(hash, index_base + index_size - the_hash_algo->rawsz))
+ if (!hasheq(hash, index_base + len))
err = error("Packfile index for %s hash mismatch",
p->pack_name);
return err;
diff --git a/pack-objects.c b/pack-objects.c
index f2a4338..fe2a4ea 100644
--- a/pack-objects.c
+++ b/pack-objects.c
@@ -49,7 +49,7 @@
pdata->index_size = 1024;
free(pdata->index);
- pdata->index = xcalloc(pdata->index_size, sizeof(*pdata->index));
+ CALLOC_ARRAY(pdata->index, pdata->index_size);
entry = pdata->objects;
diff --git a/pack-revindex.c b/pack-revindex.c
index d28a7e4..4262530 100644
--- a/pack-revindex.c
+++ b/pack-revindex.c
@@ -2,6 +2,12 @@
#include "pack-revindex.h"
#include "object-store.h"
#include "packfile.h"
+#include "config.h"
+
+struct revindex_entry {
+ off_t offset;
+ unsigned int nr;
+};
/*
* Pack index for existing packs give us easy access to the offsets into
@@ -130,7 +136,7 @@
if (p->index_version > 1) {
const uint32_t *off_32 =
- (uint32_t *)(index + 8 + p->num_objects * (hashsz + 4));
+ (uint32_t *)(index + 8 + (size_t)p->num_objects * (hashsz + 4));
const uint32_t *off_64 = off_32 + p->num_objects;
for (i = 0; i < num_ent; i++) {
const uint32_t off = ntohl(*off_32++);
@@ -159,27 +165,152 @@
sort_revindex(p->revindex, num_ent, p->pack_size);
}
-int load_pack_revindex(struct packed_git *p)
+static int create_pack_revindex_in_memory(struct packed_git *p)
{
- if (!p->revindex) {
- if (open_pack_index(p))
- return -1;
- create_pack_revindex(p);
- }
+ if (git_env_bool(GIT_TEST_REV_INDEX_DIE_IN_MEMORY, 0))
+ die("dying as requested by '%s'",
+ GIT_TEST_REV_INDEX_DIE_IN_MEMORY);
+ if (open_pack_index(p))
+ return -1;
+ create_pack_revindex(p);
return 0;
}
-int find_revindex_position(struct packed_git *p, off_t ofs)
+static char *pack_revindex_filename(struct packed_git *p)
{
- int lo = 0;
- int hi = p->num_objects + 1;
- const struct revindex_entry *revindex = p->revindex;
+ size_t len;
+ if (!strip_suffix(p->pack_name, ".pack", &len))
+ BUG("pack_name does not end in .pack");
+ return xstrfmt("%.*s.rev", (int)len, p->pack_name);
+}
+
+#define RIDX_HEADER_SIZE (12)
+#define RIDX_MIN_SIZE (RIDX_HEADER_SIZE + (2 * the_hash_algo->rawsz))
+
+struct revindex_header {
+ uint32_t signature;
+ uint32_t version;
+ uint32_t hash_id;
+};
+
+static int load_revindex_from_disk(char *revindex_name,
+ uint32_t num_objects,
+ const uint32_t **data_p, size_t *len_p)
+{
+ int fd, ret = 0;
+ struct stat st;
+ void *data = NULL;
+ size_t revindex_size;
+ struct revindex_header *hdr;
+
+ fd = git_open(revindex_name);
+
+ if (fd < 0) {
+ ret = -1;
+ goto cleanup;
+ }
+ if (fstat(fd, &st)) {
+ ret = error_errno(_("failed to read %s"), revindex_name);
+ goto cleanup;
+ }
+
+ revindex_size = xsize_t(st.st_size);
+
+ if (revindex_size < RIDX_MIN_SIZE) {
+ ret = error(_("reverse-index file %s is too small"), revindex_name);
+ goto cleanup;
+ }
+
+ if (revindex_size - RIDX_MIN_SIZE != st_mult(sizeof(uint32_t), num_objects)) {
+ ret = error(_("reverse-index file %s is corrupt"), revindex_name);
+ goto cleanup;
+ }
+
+ data = xmmap(NULL, revindex_size, PROT_READ, MAP_PRIVATE, fd, 0);
+ hdr = data;
+
+ if (ntohl(hdr->signature) != RIDX_SIGNATURE) {
+ ret = error(_("reverse-index file %s has unknown signature"), revindex_name);
+ goto cleanup;
+ }
+ if (ntohl(hdr->version) != 1) {
+ ret = error(_("reverse-index file %s has unsupported version %"PRIu32),
+ revindex_name, ntohl(hdr->version));
+ goto cleanup;
+ }
+ if (!(ntohl(hdr->hash_id) == 1 || ntohl(hdr->hash_id) == 2)) {
+ ret = error(_("reverse-index file %s has unsupported hash id %"PRIu32),
+ revindex_name, ntohl(hdr->hash_id));
+ goto cleanup;
+ }
+
+cleanup:
+ if (ret) {
+ if (data)
+ munmap(data, revindex_size);
+ } else {
+ *len_p = revindex_size;
+ *data_p = (const uint32_t *)data;
+ }
+
+ if (fd >= 0)
+ close(fd);
+ return ret;
+}
+
+static int load_pack_revindex_from_disk(struct packed_git *p)
+{
+ char *revindex_name;
+ int ret;
+ if (open_pack_index(p))
+ return -1;
+
+ revindex_name = pack_revindex_filename(p);
+
+ ret = load_revindex_from_disk(revindex_name,
+ p->num_objects,
+ &p->revindex_map,
+ &p->revindex_size);
+ if (ret)
+ goto cleanup;
+
+ p->revindex_data = (const uint32_t *)((const char *)p->revindex_map + RIDX_HEADER_SIZE);
+
+cleanup:
+ free(revindex_name);
+ return ret;
+}
+
+int load_pack_revindex(struct packed_git *p)
+{
+ if (p->revindex || p->revindex_data)
+ return 0;
+
+ if (!load_pack_revindex_from_disk(p))
+ return 0;
+ else if (!create_pack_revindex_in_memory(p))
+ return 0;
+ return -1;
+}
+
+int offset_to_pack_pos(struct packed_git *p, off_t ofs, uint32_t *pos)
+{
+ unsigned lo, hi;
+
+ if (load_pack_revindex(p) < 0)
+ return -1;
+
+ lo = 0;
+ hi = p->num_objects + 1;
do {
const unsigned mi = lo + (hi - lo) / 2;
- if (revindex[mi].offset == ofs) {
- return mi;
- } else if (ofs < revindex[mi].offset)
+ off_t got = pack_pos_to_offset(p, mi);
+
+ if (got == ofs) {
+ *pos = mi;
+ return 0;
+ } else if (ofs < got)
hi = mi;
else
lo = mi + 1;
@@ -189,17 +320,30 @@
return -1;
}
-struct revindex_entry *find_pack_revindex(struct packed_git *p, off_t ofs)
+uint32_t pack_pos_to_index(struct packed_git *p, uint32_t pos)
{
- int pos;
+ if (!(p->revindex || p->revindex_data))
+ BUG("pack_pos_to_index: reverse index not yet loaded");
+ if (p->num_objects <= pos)
+ BUG("pack_pos_to_index: out-of-bounds object at %"PRIu32, pos);
- if (load_pack_revindex(p))
- return NULL;
+ if (p->revindex)
+ return p->revindex[pos].nr;
+ else
+ return get_be32(p->revindex_data + pos);
+}
- pos = find_revindex_position(p, ofs);
+off_t pack_pos_to_offset(struct packed_git *p, uint32_t pos)
+{
+ if (!(p->revindex || p->revindex_data))
+ BUG("pack_pos_to_index: reverse index not yet loaded");
+ if (p->num_objects < pos)
+ BUG("pack_pos_to_offset: out-of-bounds object at %"PRIu32, pos);
- if (pos < 0)
- return NULL;
-
- return p->revindex + pos;
+ if (p->revindex)
+ return p->revindex[pos].offset;
+ else if (pos == p->num_objects)
+ return p->pack_size - the_hash_algo->rawsz;
+ else
+ return nth_packed_object_offset(p, pack_pos_to_index(p, pos));
}
diff --git a/pack-revindex.h b/pack-revindex.h
index 848331d..ba7c82c 100644
--- a/pack-revindex.h
+++ b/pack-revindex.h
@@ -1,16 +1,74 @@
#ifndef PACK_REVINDEX_H
#define PACK_REVINDEX_H
+/**
+ * A revindex allows converting efficiently between three properties
+ * of an object within a pack:
+ *
+ * - index position: the numeric position within the list of sorted object ids
+ * found in the .idx file
+ *
+ * - pack position: the numeric position within the list of objects in their
+ * order within the actual .pack file (i.e., 0 is the first object in the
+ * .pack, 1 is the second, and so on)
+ *
+ * - offset: the byte offset within the .pack file at which the object contents
+ * can be found
+ */
+
+
+#define RIDX_SIGNATURE 0x52494458 /* "RIDX" */
+#define RIDX_VERSION 1
+
+#define GIT_TEST_WRITE_REV_INDEX "GIT_TEST_WRITE_REV_INDEX"
+#define GIT_TEST_REV_INDEX_DIE_IN_MEMORY "GIT_TEST_REV_INDEX_DIE_IN_MEMORY"
+
struct packed_git;
-struct revindex_entry {
- off_t offset;
- unsigned int nr;
-};
-
+/*
+ * load_pack_revindex populates the revindex's internal data-structures for the
+ * given pack, returning zero on success and a negative value otherwise.
+ *
+ * If a '.rev' file is present it is mmap'd, and pointers are assigned into it
+ * (instead of using the in-memory variant).
+ */
int load_pack_revindex(struct packed_git *p);
-int find_revindex_position(struct packed_git *p, off_t ofs);
-struct revindex_entry *find_pack_revindex(struct packed_git *p, off_t ofs);
+/*
+ * offset_to_pack_pos converts an object offset to a pack position. This
+ * function returns zero on success, and a negative number otherwise. The
+ * parameter 'pos' is usable only on success.
+ *
+ * If the reverse index has not yet been loaded, this function loads it lazily,
+ * and returns an negative number if an error was encountered.
+ *
+ * This function runs in time O(log N) with the number of objects in the pack.
+ */
+int offset_to_pack_pos(struct packed_git *p, off_t ofs, uint32_t *pos);
+
+/*
+ * pack_pos_to_index converts the given pack-relative position 'pos' by
+ * returning an index-relative position.
+ *
+ * If the reverse index has not yet been loaded, or the position is out of
+ * bounds, this function aborts.
+ *
+ * This function runs in constant time.
+ */
+uint32_t pack_pos_to_index(struct packed_git *p, uint32_t pos);
+
+/*
+ * pack_pos_to_offset converts the given pack-relative position 'pos' into a
+ * pack offset. For a pack with 'N' objects, asking for position 'N' will return
+ * the total size (in bytes) of the pack.
+ *
+ * If the reverse index has not yet been loaded, or the position is out of
+ * bounds, this function aborts.
+ *
+ * This function runs in constant time under both in-memory and on-disk reverse
+ * indexes, but an additional step is taken to consult the corresponding .idx
+ * file when using the on-disk format.
+ */
+off_t pack_pos_to_offset(struct packed_git *p, uint32_t pos);
#endif
diff --git a/pack-write.c b/pack-write.c
index f0017be..2ca85a9 100644
--- a/pack-write.c
+++ b/pack-write.c
@@ -1,6 +1,7 @@
#include "cache.h"
#include "pack.h"
#include "csum-file.h"
+#include "remote.h"
void reset_pack_idx_option(struct pack_idx_option *opts)
{
@@ -38,9 +39,8 @@
}
/*
- * 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,
@@ -49,7 +49,6 @@
struct hashfile *f;
struct pack_idx_entry **sorted_by_sha, **list, **last;
off_t last_obj_offset = 0;
- uint32_t array[256];
int i, fd;
uint32_t index_version;
@@ -107,10 +106,9 @@
break;
next++;
}
- array[i] = htonl(next - sorted_by_sha);
+ hashwrite_be32(f, next - sorted_by_sha);
list = next;
}
- hashwrite(f, array, 256 * 4);
/*
* Write the actual SHA1 entries..
@@ -118,10 +116,8 @@
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 +132,7 @@
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 +144,7 @@
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 */
@@ -158,13 +152,10 @@
while (nr_large_offset) {
struct pack_idx_entry *obj = *list++;
uint64_t offset = obj->offset;
- uint32_t split[2];
if (!need_large_offset(offset, opts))
continue;
- split[0] = htonl(offset >> 32);
- split[1] = htonl(offset & 0xffffffff);
- hashwrite(f, split, 8);
+ hashwrite_be64(f, offset);
nr_large_offset--;
}
}
@@ -176,6 +167,113 @@
return index_name;
}
+static int pack_order_cmp(const void *va, const void *vb, void *ctx)
+{
+ struct pack_idx_entry **objects = ctx;
+
+ off_t oa = objects[*(uint32_t*)va]->offset;
+ off_t ob = objects[*(uint32_t*)vb]->offset;
+
+ if (oa < ob)
+ return -1;
+ if (oa > ob)
+ return 1;
+ return 0;
+}
+
+static void write_rev_header(struct hashfile *f)
+{
+ uint32_t oid_version;
+ switch (hash_algo_by_ptr(the_hash_algo)) {
+ case GIT_HASH_SHA1:
+ oid_version = 1;
+ break;
+ case GIT_HASH_SHA256:
+ oid_version = 2;
+ break;
+ default:
+ die("write_rev_header: unknown hash version");
+ }
+
+ hashwrite_be32(f, RIDX_SIGNATURE);
+ hashwrite_be32(f, RIDX_VERSION);
+ hashwrite_be32(f, oid_version);
+}
+
+static void write_rev_index_positions(struct hashfile *f,
+ struct pack_idx_entry **objects,
+ uint32_t nr_objects)
+{
+ uint32_t *pack_order;
+ uint32_t i;
+
+ ALLOC_ARRAY(pack_order, nr_objects);
+ for (i = 0; i < nr_objects; i++)
+ pack_order[i] = i;
+ QSORT_S(pack_order, nr_objects, pack_order_cmp, objects);
+
+ for (i = 0; i < nr_objects; i++)
+ hashwrite_be32(f, pack_order[i]);
+
+ free(pack_order);
+}
+
+static void write_rev_trailer(struct hashfile *f, const unsigned char *hash)
+{
+ hashwrite(f, hash, the_hash_algo->rawsz);
+}
+
+const char *write_rev_file(const char *rev_name,
+ struct pack_idx_entry **objects,
+ uint32_t nr_objects,
+ const unsigned char *hash,
+ unsigned flags)
+{
+ struct hashfile *f;
+ int fd;
+
+ if ((flags & WRITE_REV) && (flags & WRITE_REV_VERIFY))
+ die(_("cannot both write and verify reverse index"));
+
+ if (flags & WRITE_REV) {
+ if (!rev_name) {
+ struct strbuf tmp_file = STRBUF_INIT;
+ fd = odb_mkstemp(&tmp_file, "pack/tmp_rev_XXXXXX");
+ rev_name = strbuf_detach(&tmp_file, NULL);
+ } else {
+ unlink(rev_name);
+ fd = open(rev_name, O_CREAT|O_EXCL|O_WRONLY, 0600);
+ if (fd < 0)
+ die_errno("unable to create '%s'", rev_name);
+ }
+ f = hashfd(fd, rev_name);
+ } else if (flags & WRITE_REV_VERIFY) {
+ struct stat statbuf;
+ if (stat(rev_name, &statbuf)) {
+ if (errno == ENOENT) {
+ /* .rev files are optional */
+ return NULL;
+ } else
+ die_errno(_("could not stat: %s"), rev_name);
+ }
+ f = hashfd_check(rev_name);
+ } else
+ return NULL;
+
+ write_rev_header(f);
+
+ write_rev_index_positions(f, objects, nr_objects);
+ write_rev_trailer(f, hash);
+
+ if (rev_name && adjust_shared_perm(rev_name) < 0)
+ die(_("failed to make %s readable"), rev_name);
+
+ finalize_hashfile(f, NULL, CSUM_HASH_IN_STREAM | CSUM_CLOSE |
+ ((flags & WRITE_IDX_VERIFY) ? 0 : CSUM_FSYNC));
+
+ return rev_name;
+}
+
off_t write_pack_header(struct hashfile *f, uint32_t nr_entries)
{
struct pack_header hdr;
@@ -282,7 +380,7 @@
fsync_or_die(pack_fd, pack_name);
}
-char *index_pack_lockfile(int ip_out)
+char *index_pack_lockfile(int ip_out, int *is_well_formed)
{
char packname[GIT_MAX_HEXSZ + 6];
const int len = the_hash_algo->hexsz + 6;
@@ -296,11 +394,17 @@
*/
if (read_in_full(ip_out, packname, len) == len && packname[len-1] == '\n') {
const char *name;
+
+ if (is_well_formed)
+ *is_well_formed = 1;
packname[len-1] = 0;
if (skip_prefix(packname, "keep\t", &name))
return xstrfmt("%s/pack/pack-%s.keep",
get_object_directory(), name);
+ return NULL;
}
+ if (is_well_formed)
+ *is_well_formed = 0;
return NULL;
}
@@ -351,7 +455,7 @@
struct pack_idx_option *pack_idx_opts,
unsigned char hash[])
{
- const char *idx_tmp_name;
+ const char *idx_tmp_name, *rev_tmp_name = NULL;
int basename_len = name_buffer->len;
if (adjust_shared_perm(pack_tmp_name))
@@ -362,6 +466,9 @@
if (adjust_shared_perm(idx_tmp_name))
die_errno("unable to make temporary index file readable");
+ rev_tmp_name = write_rev_file(NULL, written_list, nr_written, hash,
+ pack_idx_opts->flags);
+
strbuf_addf(name_buffer, "%s.pack", hash_to_hex(hash));
if (rename(pack_tmp_name, name_buffer->buf))
@@ -375,5 +482,28 @@
strbuf_setlen(name_buffer, basename_len);
+ if (rev_tmp_name) {
+ strbuf_addf(name_buffer, "%s.rev", hash_to_hex(hash));
+ if (rename(rev_tmp_name, name_buffer->buf))
+ die_errno("unable to rename temporary reverse-index file");
+ }
+
+ strbuf_setlen(name_buffer, basename_len);
+
free((void *)idx_tmp_name);
}
+
+void write_promisor_file(const char *promisor_name, struct ref **sought, int nr_sought)
+{
+ int i, err;
+ FILE *output = xfopen(promisor_name, "w");
+
+ for (i = 0; i < nr_sought; i++)
+ fprintf(output, "%s %s\n", oid_to_hex(&sought[i]->old_oid),
+ sought[i]->name);
+
+ err = ferror(output);
+ err |= fclose(output);
+ if (err)
+ die(_("could not write '%s' promisor file"), promisor_name);
+}
diff --git a/pack.h b/pack.h
index 9fc0945..857cbd5 100644
--- a/pack.h
+++ b/pack.h
@@ -42,6 +42,8 @@
/* flag bits */
#define WRITE_IDX_VERIFY 01 /* verify only, do not write the idx file */
#define WRITE_IDX_STRICT 02
+#define WRITE_REV 04
+#define WRITE_REV_VERIFY 010
uint32_t version;
uint32_t off32_limit;
@@ -85,7 +87,13 @@
int verify_pack(struct repository *, struct packed_git *, verify_fn fn, struct progress *, uint32_t);
off_t write_pack_header(struct hashfile *f, uint32_t);
void fixup_pack_header_footer(int, unsigned char *, const char *, uint32_t, unsigned char *, off_t);
-char *index_pack_lockfile(int fd);
+char *index_pack_lockfile(int fd, int *is_well_formed);
+
+struct ref;
+
+void write_promisor_file(const char *promisor_name, struct ref **sought, int nr_sought);
+
+const char *write_rev_file(const char *rev_name, struct pack_idx_entry **objects, uint32_t nr_objects, const unsigned char *hash, unsigned flags);
/*
* The "hdr" output buffer should be at least this big, which will handle sizes
diff --git a/packfile.c b/packfile.c
index f4e7529..ea29f4b 100644
--- a/packfile.c
+++ b/packfile.c
@@ -7,7 +7,7 @@
#include "packfile.h"
#include "delta.h"
#include "streaming.h"
-#include "sha1-lookup.h"
+#include "hash-lookup.h"
#include "commit.h"
#include "object.h"
#include "tag.h"
@@ -148,7 +148,7 @@
* - hash of the packfile
* - file checksum
*/
- if (idx_size != 4 * 256 + nr * (hashsz + 4) + hashsz + hashsz)
+ if (idx_size != st_add(4 * 256 + hashsz + hashsz, st_mult(nr, hashsz + 4)))
return error("wrong index v1 file size in %s", path);
} else if (version == 2) {
/*
@@ -164,10 +164,10 @@
* variable sized table containing 8-byte entries
* for offsets larger than 2^31.
*/
- unsigned long min_size = 8 + 4*256 + nr*(hashsz + 4 + 4) + hashsz + hashsz;
- unsigned long max_size = min_size;
+ size_t min_size = st_add(8 + 4*256 + hashsz + hashsz, st_mult(nr, hashsz + 4 + 4));
+ size_t max_size = min_size;
if (nr)
- max_size += (nr - 1)*8;
+ max_size = st_add(max_size, st_mult(nr - 1, 8));
if (idx_size < min_size || idx_size > max_size)
return error("wrong index v2 file size in %s", path);
if (idx_size != min_size &&
@@ -178,6 +178,7 @@
*/
(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;
@@ -323,11 +324,21 @@
}
}
+void close_pack_revindex(struct packed_git *p) {
+ if (!p->revindex_map)
+ return;
+
+ munmap((void *)p->revindex_map, p->revindex_size);
+ p->revindex_map = NULL;
+ p->revindex_data = NULL;
+}
+
void close_pack(struct packed_git *p)
{
close_pack_windows(p);
close_pack_fd(p);
close_pack_index(p);
+ close_pack_revindex(p);
}
void close_object_store(struct raw_object_store *o)
@@ -350,7 +361,7 @@
void unlink_pack_path(const char *pack_name, int force_delete)
{
- static const char *exts[] = {".pack", ".idx", ".keep", ".bitmap", ".promisor"};
+ static const char *exts[] = {".pack", ".idx", ".rev", ".keep", ".bitmap", ".promisor"};
int i;
struct strbuf buf = STRBUF_INIT;
size_t plen;
@@ -513,19 +524,8 @@
ssize_t read_result;
const unsigned hashsz = the_hash_algo->rawsz;
- if (!p->index_data) {
- struct multi_pack_index *m;
- const char *pack_name = pack_basename(p);
-
- for (m = the_repository->objects->multi_pack_index;
- m; m = m->next) {
- if (midx_contains_pack(m, pack_name))
- break;
- }
-
- if (!m && open_pack_index(p))
- return error("packfile %s index unavailable", p->pack_name);
- }
+ if (open_pack_index(p))
+ return error("packfile %s index unavailable", p->pack_name);
if (!pack_max_fds) {
unsigned int max_fds = get_max_fd_limit();
@@ -566,10 +566,6 @@
" supported (try upgrading GIT to a newer version)",
p->pack_name, ntohl(hdr.hdr_version));
- /* Skip index checking if in multi-pack-index */
- if (!p->index_data)
- return 0;
-
/* Verify the pack matches its index. */
if (p->num_objects != ntohl(hdr.hdr_entries))
return error("packfile %s claims to have %"PRIu32" objects"
@@ -642,7 +638,7 @@
if (p->pack_fd == -1 && open_packed_git(p))
die("packfile %s cannot be accessed", p->pack_name);
- win = xcalloc(1, sizeof(*win));
+ CALLOC_ARRAY(win, 1);
win->offset = (offset / window_align) * window_align;
len = p->pack_size - win->offset;
if (len > packed_git_window_size)
@@ -867,6 +863,7 @@
if (!strcmp(file_name, "multi-pack-index"))
return;
if (ends_with(file_name, ".idx") ||
+ ends_with(file_name, ".rev") ||
ends_with(file_name, ".pack") ||
ends_with(file_name, ".bitmap") ||
ends_with(file_name, ".keep") ||
@@ -922,6 +919,7 @@
count += p->num_objects;
}
r->objects->approximate_object_count = count;
+ r->objects->approximate_object_count_valid = 1;
}
return r->objects->approximate_object_count;
}
@@ -1026,6 +1024,17 @@
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;
@@ -1237,18 +1246,18 @@
oidread(oid, base);
return 0;
} else if (type == OBJ_OFS_DELTA) {
- struct revindex_entry *revidx;
+ uint32_t base_pos;
off_t base_offset = get_delta_base(p, w_curs, &curpos,
type, delta_obj_offset);
if (!base_offset)
return -1;
- revidx = find_pack_revindex(p, base_offset);
- if (!revidx)
+ if (offset_to_pack_pos(p, base_offset, &base_pos) < 0)
return -1;
- return nth_packed_object_id(oid, p, revidx->nr);
+ return nth_packed_object_id(oid, p,
+ pack_pos_to_index(p, base_pos));
} else
return -1;
}
@@ -1258,12 +1267,11 @@
off_t obj_offset)
{
int type;
- struct revindex_entry *revidx;
+ uint32_t pos;
struct object_id oid;
- revidx = find_pack_revindex(p, obj_offset);
- if (!revidx)
+ if (offset_to_pack_pos(p, obj_offset, &pos) < 0)
return OBJ_BAD;
- nth_packed_object_id(&oid, p, revidx->nr);
+ nth_packed_object_id(&oid, p, pack_pos_to_index(p, pos));
mark_bad_packed_object(p, oid.hash);
type = oid_object_info(r, &oid, NULL);
if (type <= OBJ_NONE)
@@ -1462,7 +1470,7 @@
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;
/*
@@ -1470,8 +1478,10 @@
* 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))
+ if (in_delta_base_cache(p, base_offset)) {
+ free(base);
return;
+ }
delta_base_cached += base_size;
@@ -1483,6 +1493,7 @@
release_delta_base_cache(f);
}
+ ent = xmalloc(sizeof(*ent));
ent->key.p = p;
ent->key.base_offset = base_offset;
ent->type = type;
@@ -1537,8 +1548,15 @@
}
if (oi->disk_sizep) {
- struct revindex_entry *revidx = find_pack_revindex(p, obj_offset);
- *oi->disk_sizep = revidx[1].offset - obj_offset;
+ uint32_t pos;
+ if (offset_to_pack_pos(p, obj_offset, &pos) < 0) {
+ error("could not find object at offset %"PRIuMAX" "
+ "in pack %s", (uintmax_t)obj_offset, p->pack_name);
+ type = OBJ_BAD;
+ goto out;
+ }
+
+ *oi->disk_sizep = pack_pos_to_offset(p, pos + 1) - obj_offset;
}
if (oi->typep || oi->type_name) {
@@ -1687,11 +1705,21 @@
}
if (do_check_packed_object_crc && p->index_version > 1) {
- struct revindex_entry *revidx = find_pack_revindex(p, obj_offset);
- off_t len = revidx[1].offset - obj_offset;
- if (check_pack_crc(p, &w_curs, obj_offset, len, revidx->nr)) {
+ uint32_t pack_pos, index_pos;
+ off_t len;
+
+ if (offset_to_pack_pos(p, obj_offset, &pack_pos) < 0) {
+ error("could not find object at offset %"PRIuMAX" in pack %s",
+ (uintmax_t)obj_offset, p->pack_name);
+ data = NULL;
+ goto out;
+ }
+
+ len = pack_pos_to_offset(p, pack_pos + 1) - obj_offset;
+ index_pos = pack_pos_to_index(p, pack_pos);
+ if (check_pack_crc(p, &w_curs, obj_offset, len, index_pos)) {
struct object_id oid;
- nth_packed_object_id(&oid, p, revidx->nr);
+ nth_packed_object_id(&oid, p, index_pos);
error("bad packed object CRC for %s",
oid_to_hex(&oid));
mark_bad_packed_object(p, oid.hash);
@@ -1763,12 +1791,10 @@
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
@@ -1776,11 +1802,11 @@
* This is costly but should happen only in the presence
* of a corrupted pack, and is better than failing outright.
*/
- struct revindex_entry *revidx;
+ uint32_t pos;
struct object_id base_oid;
- revidx = find_pack_revindex(p, obj_offset);
- if (revidx) {
- nth_packed_object_id(&base_oid, p, revidx->nr);
+ if (!(offset_to_pack_pos(p, obj_offset, &pos))) {
+ nth_packed_object_id(&base_oid, p,
+ pack_pos_to_index(p, pos));
error("failed to read delta base object %s"
" at offset %"PRIuMAX" from %s",
oid_to_hex(&base_oid), (uintmax_t)obj_offset,
@@ -1806,24 +1832,33 @@
"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);
+
+ /*
+ * 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");
}
- 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.
+ * 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);
@@ -1910,14 +1945,14 @@
const unsigned int hashsz = the_hash_algo->rawsz;
index += 4 * 256;
if (p->index_version == 1) {
- return ntohl(*((uint32_t *)(index + (hashsz + 4) * n)));
+ return ntohl(*((uint32_t *)(index + (hashsz + 4) * (size_t)n)));
} else {
uint32_t off;
- index += 8 + p->num_objects * (hashsz + 4);
+ index += 8 + (size_t)p->num_objects * (hashsz + 4);
off = ntohl(*((uint32_t *)(index + 4 * n)));
if (!(off & 0x80000000))
return off;
- index += p->num_objects * 4 + (off & 0x7fffffff) * 8;
+ index += (size_t)p->num_objects * 4 + (off & 0x7fffffff) * 8;
check_pack_index_ptr(p, index);
return get_be64(index);
}
@@ -2058,19 +2093,31 @@
}
for (i = 0; i < p->num_objects; i++) {
- uint32_t pos;
+ uint32_t index_pos;
struct object_id oid;
+ /*
+ * We are iterating "i" from 0 up to num_objects, but its
+ * meaning may be different, depending on the requested output
+ * order:
+ *
+ * - in object-name order, it is the same as the index order
+ * used by nth_packed_object_id(), so we can pass it
+ * directly
+ *
+ * - in pack-order, it is pack position, which we must
+ * convert to an index position in order to get the oid.
+ */
if (flags & FOR_EACH_OBJECT_PACK_ORDER)
- pos = p->revindex[i].nr;
+ index_pos = pack_pos_to_index(p, i);
else
- pos = i;
+ index_pos = i;
- if (nth_packed_object_id(&oid, p, pos) < 0)
+ if (nth_packed_object_id(&oid, p, index_pos) < 0)
return error("unable to get sha1 of object %u in %s",
- pos, p->pack_name);
+ index_pos, p->pack_name);
- r = cb(&oid, p, pos, data);
+ r = cb(&oid, p, index_pos, data);
if (r)
break;
}
diff --git a/packfile.h b/packfile.h
index 240aa73..4cfec9e 100644
--- a/packfile.h
+++ b/packfile.h
@@ -57,6 +57,7 @@
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);
/*
@@ -89,6 +90,7 @@
unsigned char *use_pack(struct packed_git *, struct pack_window **, off_t, unsigned long *);
void close_pack_windows(struct packed_git *);
+void close_pack_revindex(struct packed_git *);
void close_pack(struct packed_git *);
void close_object_store(struct raw_object_store *o);
void unuse_pack(struct pack_window **);
diff --git a/pager.c b/pager.c
index 41446d4..3d37dd7 100644
--- a/pager.c
+++ b/pager.c
@@ -11,29 +11,25 @@
static struct child_process pager_process = CHILD_PROCESS_INIT;
static const char *pager_program;
-static void wait_for_pager(int in_signal)
+static void close_pager_fds(void)
{
- if (!in_signal) {
- fflush(stdout);
- fflush(stderr);
- }
/* signal EOF to pager */
close(1);
close(2);
- if (in_signal)
- finish_command_in_signal(&pager_process);
- else
- finish_command(&pager_process);
}
static void wait_for_pager_atexit(void)
{
- wait_for_pager(0);
+ fflush(stdout);
+ fflush(stderr);
+ close_pager_fds();
+ finish_command(&pager_process);
}
static void wait_for_pager_signal(int signo)
{
- wait_for_pager(1);
+ close_pager_fds();
+ finish_command_in_signal(&pager_process);
sigchain_pop(signo);
raise(signo);
}
@@ -68,7 +64,7 @@
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 +84,7 @@
*cp = '\0';
if (!getenv(argv[i])) {
*cp = '=';
- argv_array_push(env, argv[i]);
+ strvec_push(env, argv[i]);
}
}
free(pager_env);
@@ -97,7 +93,7 @@
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 +122,7 @@
/* 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/parse-options-cb.c b/parse-options-cb.c
index a28b55b..4542d4d 100644
--- a/parse-options-cb.c
+++ b/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 @@
struct commit *commit;
struct commit **target = opt->value;
+ BUG_ON_OPT_NEG(unset);
+
if (!arg)
return -1;
if (get_oid(arg, &oid))
@@ -275,19 +277,19 @@
/**
* 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/parse-options.c b/parse-options.c
index 63d6bab..fbea16e 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -525,7 +525,8 @@
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;
@@ -535,7 +536,8 @@
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;
@@ -572,7 +574,7 @@
}
}
-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;
@@ -582,7 +584,8 @@
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) {
@@ -610,8 +613,8 @@
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;
}
@@ -648,6 +651,7 @@
int short_name;
const char *long_name;
const char *source;
+ struct strbuf help = STRBUF_INIT;
int j;
if (newopt[i].type != OPTION_ALIAS)
@@ -659,6 +663,7 @@
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;
@@ -669,15 +674,10 @@
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;
}
@@ -726,9 +726,14 @@
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;
@@ -864,7 +869,7 @@
usage_with_options(usagestr, options);
}
- precompose_argv(argc, argv);
+ precompose_argv_prefix(argc, argv, NULL);
free(real_options);
free(ctx.alias_groups);
return parse_options_end(&ctx);
diff --git a/parse-options.h b/parse-options.h
index fece5ba..ff6506a 100644
--- a/parse-options.h
+++ b/parse-options.h
@@ -82,9 +82,9 @@
* stores pointers to the values to be filled.
*
* `argh`::
- * token to explain the kind of argument this option wants. Keep it
- * homogeneous across the repository. Should be wrapped by N_() for
- * translation.
+ * token to explain the kind of argument this option wants. Does not
+ * begin in capital letter, and does not end with a full stop.
+ * Should be wrapped by N_() for translation.
*
* `help`::
* the short help associated to what the option does.
@@ -314,7 +314,7 @@
#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))
@@ -336,5 +336,6 @@
#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/patch-ids.c b/patch-ids.c
index 12aa6d4..8bf4255 100644
--- a/patch-ids.c
+++ b/patch-ids.c
@@ -1,7 +1,7 @@
#include "cache.h"
#include "diff.h"
#include "commit.h"
-#include "sha1-lookup.h"
+#include "hash-lookup.h"
#include "patch-ids.h"
static int patch_id_defined(struct commit *commit)
@@ -71,7 +71,7 @@
int free_patch_ids(struct patch_ids *ids)
{
- hashmap_free_entries(&ids->patches, struct patch_id, ent);
+ hashmap_clear_and_free(&ids->patches, struct patch_id, ent);
return 0;
}
@@ -89,7 +89,7 @@
return 0;
}
-struct patch_id *has_commit_patch_id(struct commit *commit,
+struct patch_id *patch_id_iter_first(struct commit *commit,
struct patch_ids *ids)
{
struct patch_id patch;
@@ -104,6 +104,18 @@
return hashmap_get_entry(&ids->patches, &patch, ent, NULL);
}
+struct patch_id *patch_id_iter_next(struct patch_id *cur,
+ struct patch_ids *ids)
+{
+ return hashmap_get_next_entry(&ids->patches, cur, ent);
+}
+
+int has_commit_patch_id(struct commit *commit,
+ struct patch_ids *ids)
+{
+ return !!patch_id_iter_first(commit, ids);
+}
+
struct patch_id *add_commit_patch_id(struct commit *commit,
struct patch_ids *ids)
{
@@ -112,7 +124,7 @@
if (!patch_id_defined(commit))
return NULL;
- key = xcalloc(1, sizeof(*key));
+ CALLOC_ARRAY(key, 1);
if (init_patch_id_entry(key, commit, ids)) {
free(key);
return NULL;
diff --git a/patch-ids.h b/patch-ids.h
index 03bb04e..ab6c6a6 100644
--- a/patch-ids.h
+++ b/patch-ids.h
@@ -23,7 +23,25 @@
struct object_id *oid, int, int);
int init_patch_ids(struct repository *, struct patch_ids *);
int free_patch_ids(struct patch_ids *);
+
+/* Add a patch_id for a single commit to the set. */
struct patch_id *add_commit_patch_id(struct commit *, struct patch_ids *);
-struct patch_id *has_commit_patch_id(struct commit *, struct patch_ids *);
+
+/* Returns true if the patch-id of "commit" is present in the set. */
+int has_commit_patch_id(struct commit *commit, struct patch_ids *);
+
+/*
+ * Iterate over all commits in the set whose patch id matches that of
+ * "commit", like:
+ *
+ * struct patch_id *cur;
+ * for (cur = patch_id_iter_first(commit, ids);
+ * cur;
+ * cur = patch_id_iter_next(cur, ids) {
+ * ... look at cur->commit
+ * }
+ */
+struct patch_id *patch_id_iter_first(struct commit *commit, struct patch_ids *);
+struct patch_id *patch_id_iter_next(struct patch_id *cur, struct patch_ids *);
#endif /* PATCH_IDS_H */
diff --git a/path.c b/path.c
index 88cf593..7b385e5 100644
--- a/path.c
+++ b/path.c
@@ -723,7 +723,7 @@
* 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)
{
@@ -850,8 +850,8 @@
}
if (is_git_directory(".")) {
- set_git_dir(".");
- check_repository_format();
+ set_git_dir(".", 0);
+ check_repository_format(NULL);
return path;
}
@@ -1528,12 +1528,11 @@
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/path.h b/path.h
index 14d6dca..e7e77da 100644
--- a/path.h
+++ b/path.h
@@ -170,26 +170,27 @@
}
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);
diff --git a/pathspec.c b/pathspec.c
index 8243e06..18b3be3 100644
--- a/pathspec.c
+++ b/pathspec.c
@@ -3,7 +3,7 @@
#include "dir.h"
#include "pathspec.h"
#include "attr.h"
-#include "argv-array.h"
+#include "strvec.h"
#include "quote.h"
/*
@@ -154,7 +154,7 @@
string_list_remove_empty_items(&list, 0);
item->attr_check = attr_check_alloc();
- item->attr_match = xcalloc(list.nr, sizeof(struct attr_match));
+ CALLOC_ARRAY(item->attr_match, list.nr);
for_each_string_list_item(si, &list) {
size_t attr_len;
@@ -561,7 +561,7 @@
if (!(flags & PATHSPEC_PREFER_CWD))
BUG("PATHSPEC_PREFER_CWD requires arguments");
- pathspec->items = item = xcalloc(1, sizeof(*item));
+ pathspec->items = CALLOC_ARRAY(item, 1);
item->match = xstrdup(prefix);
item->original = xstrdup(prefix);
item->nowildcard_len = item->len = strlen(prefix);
@@ -624,7 +624,7 @@
unsigned flags, const char *prefix,
const char *file, int nul_term_line)
{
- struct argv_array parsed_file = ARGV_ARRAY_INIT;
+ struct strvec parsed_file = STRVEC_INIT;
strbuf_getline_fn getline_fn = nul_term_line ? strbuf_getline_nul :
strbuf_getline;
struct strbuf buf = STRBUF_INIT;
@@ -643,7 +643,7 @@
die(_("line is badly quoted: %s"), buf.buf);
strbuf_swap(&buf, &unquoted);
}
- argv_array_push(&parsed_file, buf.buf);
+ strvec_push(&parsed_file, buf.buf);
strbuf_reset(&buf);
}
@@ -652,8 +652,8 @@
if (in != stdin)
fclose(in);
- parse_pathspec(pathspec, magic_mask, flags, prefix, parsed_file.argv);
- argv_array_clear(&parsed_file);
+ parse_pathspec(pathspec, magic_mask, flags, prefix, parsed_file.v);
+ strvec_clear(&parsed_file);
}
void copy_pathspec(struct pathspec *dst, const struct pathspec *src)
diff --git a/perl/FromCPAN/Error.pm b/perl/FromCPAN/Error.pm
index 8b95e2d..d82b713 100644
--- a/perl/FromCPAN/Error.pm
+++ b/perl/FromCPAN/Error.pm
@@ -12,7 +12,7 @@
package Error;
use strict;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
use vars qw($VERSION);
use 5.004;
diff --git a/perl/Git.pm b/perl/Git.pm
index 54c9ed0..02eacef 100644
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@ -9,7 +9,7 @@
use 5.008;
use strict;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
use File::Temp ();
use File::Spec ();
@@ -723,6 +723,32 @@
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/perl/Git/I18N.pm b/perl/Git/I18N.pm
index bfb4fb6..2037f38 100644
--- a/perl/Git/I18N.pm
+++ b/perl/Git/I18N.pm
@@ -1,7 +1,7 @@
package Git::I18N;
use 5.008;
use strict;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
BEGIN {
require Exporter;
if ($] < 5.008003) {
diff --git a/perl/Git/IndexInfo.pm b/perl/Git/IndexInfo.pm
index a43108c..9ee054f 100644
--- a/perl/Git/IndexInfo.pm
+++ b/perl/Git/IndexInfo.pm
@@ -1,17 +1,19 @@
package Git::IndexInfo;
use strict;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
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/perl/Git/LoadCPAN.pm b/perl/Git/LoadCPAN.pm
index e5585e7..0c360bc 100644
--- a/perl/Git/LoadCPAN.pm
+++ b/perl/Git/LoadCPAN.pm
@@ -1,7 +1,7 @@
package Git::LoadCPAN;
use 5.008;
use strict;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
=head1 NAME
diff --git a/perl/Git/LoadCPAN/Error.pm b/perl/Git/LoadCPAN/Error.pm
index c6d2c45..5d84c20 100644
--- a/perl/Git/LoadCPAN/Error.pm
+++ b/perl/Git/LoadCPAN/Error.pm
@@ -1,7 +1,7 @@
package Git::LoadCPAN::Error;
use 5.008;
use strict;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
use Git::LoadCPAN (
module => 'Error',
import => 1,
diff --git a/perl/Git/LoadCPAN/Mail/Address.pm b/perl/Git/LoadCPAN/Mail/Address.pm
index f70a4f0..340e88a 100644
--- a/perl/Git/LoadCPAN/Mail/Address.pm
+++ b/perl/Git/LoadCPAN/Mail/Address.pm
@@ -1,7 +1,7 @@
package Git::LoadCPAN::Mail::Address;
use 5.008;
use strict;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
use Git::LoadCPAN (
module => 'Mail::Address',
import => 0,
diff --git a/perl/Git/Packet.pm b/perl/Git/Packet.pm
index b75738b..d144f51 100644
--- a/perl/Git/Packet.pm
+++ b/perl/Git/Packet.pm
@@ -1,7 +1,7 @@
package Git::Packet;
use 5.008;
use strict;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
BEGIN {
require Exporter;
if ($] < 5.008003) {
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index 4b28b87..f6f1dc0 100644
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -1,8 +1,8 @@
package Git::SVN;
use strict;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
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 @@
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 @@
$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 @@
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);
@@ -2087,10 +2087,10 @@
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";
}
@@ -2150,7 +2150,7 @@
my $svn_uuid = $self->rewrite_uuid || $self->ra_uuid;
my $c;
while (<$log>) {
- if ( m{^commit ($::sha1)$} ) {
+ if ( m{^commit ($::oid)$} ) {
$c = $1;
next;
}
@@ -2196,9 +2196,9 @@
# (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
@@ -2207,7 +2207,7 @@
# - 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
#
@@ -2215,38 +2215,39 @@
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: $!";
}
@@ -2271,7 +2272,7 @@
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;
@@ -2344,29 +2345,30 @@
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";
}
}
@@ -2387,30 +2389,31 @@
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/perl/Git/SVN/Editor.pm b/perl/Git/SVN/Editor.pm
index 0df16ed..47fd048 100644
--- a/perl/Git/SVN/Editor.pm
+++ b/perl/Git/SVN/Editor.pm
@@ -1,7 +1,7 @@
package Git::SVN::Editor;
use vars qw/@ISA $_rmdir $_cp_similarity $_find_copies_harder $_rename_limit/;
use strict;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
use SVN::Core;
use SVN::Delta;
use Carp qw/croak/;
@@ -63,7 +63,7 @@
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 @@
($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 @@
$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/perl/Git/SVN/Fetcher.pm b/perl/Git/SVN/Fetcher.pm
index 64e900a..968309e 100644
--- a/perl/Git/SVN/Fetcher.pm
+++ b/perl/Git/SVN/Fetcher.pm
@@ -3,7 +3,7 @@
$_placeholder_filename @deleted_gpath %added_placeholder
$repo_id/;
use strict;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
use SVN::Delta;
use Carp qw/croak/;
use File::Basename qw/dirname/;
@@ -173,7 +173,7 @@
# 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 @@
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 @@
$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/perl/Git/SVN/GlobSpec.pm b/perl/Git/SVN/GlobSpec.pm
index a0a8d17..f2c1e1f 100644
--- a/perl/Git/SVN/GlobSpec.pm
+++ b/perl/Git/SVN/GlobSpec.pm
@@ -1,6 +1,6 @@
package Git::SVN::GlobSpec;
use strict;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
sub new {
my ($class, $glob, $pattern_ok) = @_;
diff --git a/perl/Git/SVN/Log.pm b/perl/Git/SVN/Log.pm
index 6641053..cc8b484 100644
--- a/perl/Git/SVN/Log.pm
+++ b/perl/Git/SVN/Log.pm
@@ -1,6 +1,6 @@
package Git::SVN::Log;
use strict;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
use Git::SVN::Utils qw(fatal);
use Git qw(command
command_oneline
@@ -285,7 +285,7 @@
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};
@@ -298,7 +298,7 @@
get_author_info($c, $1, $2, $3);
} elsif (/^${esc_color}(?:tree|parent|committer) /o) {
# ignore
- } elsif (/^${esc_color}:\d{6} \d{6} $::sha1_short/o) {
+ } elsif (/^${esc_color}:\d{6} \d{6} $::oid_short/o) {
push @{$c->{raw}}, $_;
} elsif (/^${esc_color}[ACRMDT]\t/) {
# we could add $SVN->{svn_path} here, but that requires
diff --git a/perl/Git/SVN/Memoize/YAML.pm b/perl/Git/SVN/Memoize/YAML.pm
index 9676b8f..8fcf664 100644
--- a/perl/Git/SVN/Memoize/YAML.pm
+++ b/perl/Git/SVN/Memoize/YAML.pm
@@ -1,5 +1,5 @@
package Git::SVN::Memoize::YAML;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
use strict;
use YAML::Any ();
diff --git a/perl/Git/SVN/Migration.pm b/perl/Git/SVN/Migration.pm
index dc90f6a..ed96ac5 100644
--- a/perl/Git/SVN/Migration.pm
+++ b/perl/Git/SVN/Migration.pm
@@ -33,7 +33,7 @@
# possible if noMetadata or useSvmProps are set; but should
# be no problem for users that use the (sensible) defaults.
use strict;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
use Carp qw/croak/;
use File::Path qw/mkpath/;
use File::Basename qw/dirname basename/;
diff --git a/perl/Git/SVN/Prompt.pm b/perl/Git/SVN/Prompt.pm
index e940b08..de158e8 100644
--- a/perl/Git/SVN/Prompt.pm
+++ b/perl/Git/SVN/Prompt.pm
@@ -1,6 +1,6 @@
package Git::SVN::Prompt;
use strict;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
require SVN::Core;
use vars qw/$_no_auth_cache $_username/;
diff --git a/perl/Git/SVN/Ra.pm b/perl/Git/SVN/Ra.pm
index 56ad987..912e035 100644
--- a/perl/Git/SVN/Ra.pm
+++ b/perl/Git/SVN/Ra.pm
@@ -1,7 +1,7 @@
package Git::SVN::Ra;
use vars qw/@ISA $config_dir $_ignore_refs_regex $_log_window_size/;
use strict;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
use Memoize;
use Git::SVN::Utils qw(
canonicalize_url
@@ -486,11 +486,11 @@
$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/perl/Git/SVN/Utils.pm b/perl/Git/SVN/Utils.pm
index 3d1a093..5ca09ab 100644
--- a/perl/Git/SVN/Utils.pm
+++ b/perl/Git/SVN/Utils.pm
@@ -1,7 +1,7 @@
package Git::SVN::Utils;
use strict;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
use SVN::Core;
diff --git a/pkt-line.c b/pkt-line.c
index a0e87b1..d633005 100644
--- a/pkt-line.c
+++ b/pkt-line.c
@@ -99,6 +99,13 @@
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 @@
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 @@
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);
}
@@ -450,9 +461,11 @@
enum sideband_type sideband_type;
while (1) {
- len = packet_read(in_stream, NULL, NULL, buf, LARGE_PACKET_MAX,
- 0);
- if (!demultiplex_sideband(me, buf, len, 0, &scratch,
+ int status = packet_read_with_status(in_stream, NULL, NULL,
+ buf, LARGE_PACKET_MAX,
+ &len,
+ PACKET_READ_GENTLE_ON_EOF);
+ if (!demultiplex_sideband(me, status, buf, len, 0, &scratch,
&sideband_type))
continue;
switch (sideband_type) {
@@ -460,6 +473,9 @@
write_or_die(out, buf + 1, len - 1);
break;
default: /* errors: message already written */
+ if (scratch.len > 0)
+ BUG("unhandled incomplete sideband: '%s'",
+ scratch.buf);
return sideband_type;
}
}
@@ -479,6 +495,7 @@
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)
@@ -505,9 +522,9 @@
reader->options);
if (!reader->use_sideband)
break;
- if (demultiplex_sideband(reader->me, reader->buffer,
- reader->pktlen, 1, &scratch,
- &sideband_type))
+ if (demultiplex_sideband(reader->me, reader->status,
+ reader->buffer, reader->pktlen, 1,
+ &scratch, &sideband_type))
break;
}
diff --git a/pkt-line.h b/pkt-line.h
index fef3a0d..8c90daa 100644
--- a/pkt-line.h
+++ b/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,6 +76,15 @@
*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 assigned to *pktlen if the status of the
@@ -85,6 +95,7 @@
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 @@
unsigned use_sideband : 1;
const char *me;
+
+ /* hash algorithm in use */
+ const struct git_hash_algo *hash_algo;
};
/*
diff --git a/po/README b/po/README
index 07595d3..efd5baa 100644
--- a/po/README
+++ b/po/README
@@ -284,23 +284,5 @@
Testing marked strings
----------------------
-Even if you've correctly marked porcelain strings for translation
-something in the test suite might still depend on the US English
-version of the strings, e.g. to grep some error message or other
-output.
-
-To smoke out issues like these, Git tested with a translation mode that
-emits gibberish on every call to gettext. To use it run the test suite
-with it, e.g.:
-
- cd t && GIT_TEST_GETTEXT_POISON=true prove -j 9 ./t[0-9]*.sh
-
-If tests break with it you should inspect them manually and see if
-what you're translating is sane, i.e. that you're not translating
-plumbing output.
-
-If not you should replace calls to grep with test_i18ngrep, or
-test_cmp calls with test_i18ncmp. If that's not enough you can skip
-the whole test by making it depend on the C_LOCALE_OUTPUT
-prerequisite. See existing test files with this prerequisite for
-examples.
+Git's tests are run under LANG=C LC_ALL=C. So the tests do not need be
+changed to account for translations as they're added.
diff --git a/po/TEAMS b/po/TEAMS
index dbcce4b..a32beb6 100644
--- a/po/TEAMS
+++ b/po/TEAMS
@@ -29,6 +29,10 @@
Leader: Jean-Noël Avila <jn.avila@free.fr>
Members: Sébastien Helleu <flashcode@flashtux.org>
+Language: id (Indonesian)
+Repository: https://github.com/bagasme/git-po
+Leader: Bagas Sanjaya <bagasdotme@gmail.com>
+
Language: is (Icelandic)
Leader: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
@@ -42,10 +46,13 @@
Members: Changwoo Ryu <cwryu@debian.org>
Sihyeon Jang <uneedsihyeon@gmail.com>
+Language: pl (Polish)
+Repository: https://github.com/Arusekk/git-po
+Leader: Arusekk <arek_koz@o2.pl>
+
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/
diff --git a/po/bg.po b/po/bg.po
index 7990313..529ea97 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,7 +1,7 @@
# Bulgarian translation of git po-file.
-# Copyright (C) 2014, 2015, 2016, 2017, 2018, 2019, 2020 Alexander Shopov <ash@kambanaria.org>.
+# Copyright (C) 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Alexander Shopov <ash@kambanaria.org>.
# This file is distributed under the same license as the git package.
-# Alexander Shopov <ash@kambanaria.org>, 2014, 2015, 2016, 2017, 2018, 2019, 2020.
+# Alexander Shopov <ash@kambanaria.org>, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021.
#
# ========================
# DICTIONARY TO MERGE IN GIT GUI
@@ -38,6 +38,7 @@
# graft присадка
# grafted repository хранилище с присаждане
# replace refs заместващи указатели
+# replace objects заместващи обекти
# embedded repository вградено/вътрешно хранилище (добавянето му е грешка)
# thin pack съкратен пакет
# pack file пакетен файл
@@ -133,7 +134,7 @@
# 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) раздробен (граф с подавания)
@@ -143,6 +144,14 @@
# cone pattern matching пътеводно напасване
# negative pattern отрицателен шаблон
# colored hunk/diff оцветено парче/разлика
+# up to date обновен, освен като самостотелва дума - актуален или completely up to date - напълно актуален
+# stateless без запазване на състоянието
+# end packet пакет за край
+# identity самоличност, информация за
+# boundary commit гранично подаване
+# integrate (changes) внасяне (на промени)
+# overflow data данни за отместването
+# reverse index обратен индекс (а не обърнат, за да не се бърка с reverse key index)
# ------------------------
# „$var“ - може да не сработва за shell има gettext и eval_gettext - проверка - намират се лесно по „$
# ------------------------
@@ -159,10 +168,10 @@
# for i in `sort -u FILES`; do cnt=`grep $i FILES | wc -l`; echo $cnt $i ;done | sort -n
msgid ""
msgstr ""
-"Project-Id-Version: git 2.25\n"
+"Project-Id-Version: git 2.31\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2020-03-11 15:26+0800\n"
-"PO-Revision-Date: 2020-03-12 00:03+0100\n"
+"POT-Creation-Date: 2021-03-04 22:41+0800\n"
+"PO-Revision-Date: 2021-03-05 12:11+0100\n"
"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
"Language: bg\n"
@@ -171,233 +180,238 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: add-interactive.c:368
+#: add-interactive.c:376
#, c-format
msgid "Huh (%s)?"
msgstr "Неуспешен анализ — „%s“."
-#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124
-#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687
-#: builtin/rebase.c:2086 builtin/rebase.c:2130
+#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292
+#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538
+#: builtin/rebase.c:1963
msgid "could not read index"
msgstr "индексът не може да бъде прочетен"
-#: add-interactive.c:576 git-add--interactive.perl:269
+#: add-interactive.c:584 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "двоично"
-#: add-interactive.c:634 git-add--interactive.perl:278
+#: add-interactive.c:642 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "нищо"
-#: add-interactive.c:635 git-add--interactive.perl:314
+#: add-interactive.c:643 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "няма промени"
-#: add-interactive.c:672 git-add--interactive.perl:643
+#: add-interactive.c:680 git-add--interactive.perl:641
msgid "Update"
msgstr "Обновяване"
-#: add-interactive.c:689 add-interactive.c:877
+#: add-interactive.c:697 add-interactive.c:885
#, c-format
msgid "could not stage '%s'"
msgstr "неуспешно добавяне в индекса на „%s“"
-#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317
-#: builtin/rebase.c:899
+#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486
msgid "could not write index"
msgstr "индексът не може да бъде записан"
-#: add-interactive.c:698 git-add--interactive.perl:628
+#: add-interactive.c:706 git-add--interactive.perl:626
#, 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
+#: add-interactive.c:724 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "БЕЛЕЖКА: „%s“ вече не се следи.\n"
-#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281
-#: builtin/reset.c:144
+#: add-interactive.c:729 apply.c:4125 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
+#: add-interactive.c:759 git-add--interactive.perl:653
msgid "Revert"
msgstr "Отмяна"
-#: add-interactive.c:767
+#: add-interactive.c:775
msgid "Could not parse HEAD^{tree}"
msgstr "Указателят „HEAD^{tree}“ не може да бъде анализиран"
-#: add-interactive.c:805 git-add--interactive.perl:631
+#: add-interactive.c:813 git-add--interactive.perl:629
#, 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
+#: add-interactive.c:864 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr "Няма неследени файлове.\n"
-#: add-interactive.c:860 git-add--interactive.perl:689
+#: add-interactive.c:868 git-add--interactive.perl:687
msgid "Add untracked"
msgstr "Добавяне на неследени"
-#: add-interactive.c:887 git-add--interactive.perl:625
+#: add-interactive.c:895 git-add--interactive.perl:623
#, 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
+#: add-interactive.c:925
#, c-format
msgid "ignoring unmerged: %s"
msgstr "пренебрегване на неслятото: „%s“"
-#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366
+#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369
#, c-format
msgid "Only binary files changed.\n"
msgstr "Само двоични файлове са променени.\n"
-#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368
+#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371
#, c-format
msgid "No changes.\n"
msgstr "Няма промени.\n"
-#: add-interactive.c:935 git-add--interactive.perl:1376
+#: add-interactive.c:943 git-add--interactive.perl:1379
msgid "Patch update"
msgstr "Обновяване на кръпка"
-#: add-interactive.c:974 git-add--interactive.perl:1754
+#: add-interactive.c:982 git-add--interactive.perl:1792
msgid "Review diff"
msgstr "Преглед на разликата"
-#: add-interactive.c:1002
+#: add-interactive.c:1010
msgid "show paths with changes"
msgstr "извеждане на пътищата с промени"
-#: add-interactive.c:1004
+#: add-interactive.c:1012
msgid "add working tree state to the staged set of changes"
msgstr "добавяне на състоянието на работното дърво към промените в индекса"
-#: add-interactive.c:1006
+#: add-interactive.c:1014
msgid "revert staged set of changes back to the HEAD version"
msgstr "връщане на състоянието на индекса към соченото от „HEAD“"
-#: add-interactive.c:1008
+#: add-interactive.c:1016
msgid "pick hunks and update selectively"
msgstr "интерактивни избор и промяна на парчета код"
-#: add-interactive.c:1010
+#: add-interactive.c:1018
msgid "view diff between HEAD and index"
msgstr "разлика между соченото от „HEAD“ и индекса"
-#: add-interactive.c:1012
+#: add-interactive.c:1020
msgid "add contents of untracked files to the staged set of changes"
msgstr "добавяне на съдържанието на неследените файлове към индекса"
-#: add-interactive.c:1020 add-interactive.c:1069
+#: add-interactive.c:1028 add-interactive.c:1077
msgid "Prompt help:"
msgstr "Помощ:"
-#: add-interactive.c:1022
+#: add-interactive.c:1030
msgid "select a single item"
msgstr "избор на eдин елемент"
-#: add-interactive.c:1024
+#: add-interactive.c:1032
msgid "select a range of items"
msgstr "избор на поредица от елементи"
-#: add-interactive.c:1026
+#: add-interactive.c:1034
msgid "select multiple ranges"
msgstr "избор на няколко поредици от елементи"
-#: add-interactive.c:1028 add-interactive.c:1073
+#: add-interactive.c:1036 add-interactive.c:1081
msgid "select item based on unique prefix"
msgstr "избор на базата на уникален префикс"
-#: add-interactive.c:1030
+#: add-interactive.c:1038
msgid "unselect specified items"
msgstr "изваждане на указаното от избора"
-#: add-interactive.c:1032
+#: add-interactive.c:1040
msgid "choose all items"
msgstr "избор на всички елементи"
-#: add-interactive.c:1034
+#: add-interactive.c:1042
msgid "(empty) finish selecting"
msgstr "(празно) приключване на избирането"
-#: add-interactive.c:1071
+#: add-interactive.c:1079
msgid "select a numbered item"
msgstr "избор на номериран елемент"
-#: add-interactive.c:1075
+#: add-interactive.c:1083
msgid "(empty) select nothing"
msgstr "(празно) без избор на нищо"
-#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851
+#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
msgid "*** Commands ***"
msgstr "●●● Команди ●●●"
-#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848
+#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
msgid "What now"
msgstr "Избор на следващо действие"
-#: add-interactive.c:1136 git-add--interactive.perl:213
+#: add-interactive.c:1144 git-add--interactive.perl:213
msgid "staged"
msgstr "в индекса"
-#: add-interactive.c:1136 git-add--interactive.perl:213
+#: add-interactive.c:1144 git-add--interactive.perl:213
msgid "unstaged"
msgstr "извън индекса"
-#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251
-#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144
-#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409
-#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
-#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
-#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
+#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257
+#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124
+#: builtin/fetch.c:150 builtin/merge.c:285 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
+#: add-interactive.c:1151
msgid "could not refresh index"
msgstr "индексът не може да бъде обновен"
#
-#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765
+#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803
#, c-format
msgid "Bye.\n"
msgstr "Изход.\n"
-#: add-patch.c:33 git-add--interactive.perl:1428
+#: add-patch.c:34 git-add--interactive.perl:1431
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Добавяне на промяната на правата за достъп [y,n,q,a,d%s,?]? "
-#: add-patch.c:34 git-add--interactive.perl:1429
+#: add-patch.c:35 git-add--interactive.perl:1432
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Добавяне на изтриването [y,n,q,a,d%s,?]? "
-#: add-patch.c:35 git-add--interactive.perl:1430
+#: add-patch.c:36 git-add--interactive.perl:1433
+#, 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:1434
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "Добавяне на това парче [y,n,q,a,d%s,?]? "
-#: add-patch.c:37
+#: add-patch.c:39
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"staging."
@@ -405,7 +419,7 @@
"Ако кръпката може да се приложи чисто, редактираното парче ще бъде незабавно "
"добавено към индекса."
-#: add-patch.c:40
+#: add-patch.c:42
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -419,22 +433,27 @@
"a — добавяне на това и всички следващи парчета от файла в индекса\n"
"d — без добавяне на това и всички следващи парчета от файла в индекса\n"
-#: add-patch.c:54 git-add--interactive.perl:1433
+#: add-patch.c:56 git-add--interactive.perl:1437
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Скатаване на промяната на правата за достъп [y,n,q,a,d%s,?]? "
-#: add-patch.c:55 git-add--interactive.perl:1434
+#: add-patch.c:57 git-add--interactive.perl:1438
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Скатаване на изтриването [y,n,q,a,d%s,?]? "
-#: add-patch.c:56 git-add--interactive.perl:1435
+#: add-patch.c:58 git-add--interactive.perl:1439
+#, 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:1440
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "Скатаване на това парче [y,n,q,a,d%s,?]? "
-#: add-patch.c:58
+#: add-patch.c:61
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"stashing."
@@ -442,7 +461,7 @@
"Ако кръпката може да се приложи чисто, редактираното парче ще бъде незабавно "
"скътано."
-#: add-patch.c:61
+#: add-patch.c:64
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -456,22 +475,27 @@
"a — скатаване на това и всички следващи парчета от файла\n"
"d — без скатаване на това и всички следващи парчета от файла\n"
-#: add-patch.c:77 git-add--interactive.perl:1438
+#: add-patch.c:80 git-add--interactive.perl:1443
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Изваждане на промяната на правата за достъп [y,n,q,a,d%s,?]? "
-#: add-patch.c:78 git-add--interactive.perl:1439
+#: add-patch.c:81 git-add--interactive.perl:1444
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Изваждане на изтриването [y,n,q,a,d%s,?]? "
-#: add-patch.c:79 git-add--interactive.perl:1440
+#: add-patch.c:82 git-add--interactive.perl:1445
+#, 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:1446
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "Изваждане на това парче [y,n,q,a,d%s,?]? "
-#: add-patch.c:81
+#: add-patch.c:85
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"unstaging."
@@ -479,7 +503,7 @@
"Ако кръпката може да се приложи чисто, редактираното парче ще бъде незабавно "
"извадено от индекса."
-#: add-patch.c:84
+#: add-patch.c:88
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -493,23 +517,28 @@
"a — изваждане на това и всички следващи парчета от файла от индекса\n"
"d — без изваждане на това и всички следващи парчета от файла от индекса\n"
-#: add-patch.c:99 git-add--interactive.perl:1443
+#: add-patch.c:103 git-add--interactive.perl:1449
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr ""
"Прилагане на промяната на правата за достъп към индекса [y,n,q,a,d%s,?]? "
-#: add-patch.c:100 git-add--interactive.perl:1444
+#: add-patch.c:104 git-add--interactive.perl:1450
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Прилагане на изтриването към индекса [y,n,q,a,d%s,?]? "
-#: add-patch.c:101 git-add--interactive.perl:1445
+#: add-patch.c:105 git-add--interactive.perl:1451
+#, 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:1452
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "Прилагане на това парче към индекса [y,n,q,a,d%s,?]? "
-#: add-patch.c:103 add-patch.c:168 add-patch.c:211
+#: 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."
@@ -517,7 +546,7 @@
"Ако кръпката може да се приложи чисто, редактираното парче ще бъде незабавно "
"набелязано за прилагане."
-#: add-patch.c:106
+#: add-patch.c:111
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -531,27 +560,33 @@
"a — прилагане на това и всички следващи парчета от файла към индекса\n"
"d — без прилагане на това и всички следващи парчета от файла към индекса\n"
-#: add-patch.c:121 git-add--interactive.perl:1448
-#: git-add--interactive.perl:1463
+#: add-patch.c:126 git-add--interactive.perl:1455
+#: git-add--interactive.perl:1473
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Премахване на промяната в правата за достъп от работното дърво [y,n,q,a,d"
"%s,?]? "
-#: add-patch.c:122 git-add--interactive.perl:1449
-#: git-add--interactive.perl:1464
+#: add-patch.c:127 git-add--interactive.perl:1456
+#: git-add--interactive.perl:1474
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Премахване на изтриването от работното дърво [y,n,q,a,d%s,?]? "
-#: add-patch.c:123 git-add--interactive.perl:1450
-#: git-add--interactive.perl:1465
+#: add-patch.c:128 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
+#, 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:1458
+#: git-add--interactive.perl:1476
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "Премахване на парчето от работното дърво [y,n,q,a,d%s,?]? "
-#: add-patch.c:125 add-patch.c:147 add-patch.c:190
+#: 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."
@@ -559,7 +594,7 @@
"Ако кръпката може да се приложи чисто, редактираното парче ще бъде незабавно "
"набелязано за зануляване."
-#: add-patch.c:128 add-patch.c:193
+#: 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"
@@ -576,25 +611,31 @@
"d — без премахване на това и всички следващи парчета от файла от работното "
"дърво\n"
-#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Премахване на промяната в правата за достъп от индекса и работното дърво [y,"
"n,q,a,d%s,?]? "
-#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Премахване на изтриването от индекса и работното дърво [y,n,q,a,d%s,?]? "
-#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#, 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:1464
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Премахване на парчето от индекса и работното дърво [y,n,q,a,d%s,?]? "
-#: add-patch.c:150
+#: 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"
@@ -611,25 +652,30 @@
"d — без премахване на това и всички следващи парчета от файла от индекса и "
"работното дърво\n"
-#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Прилагане на промяната в правата за достъп от индекса и работното дърво [y,n,"
"q,a,d%s,?]? "
-#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Прилагане на изтриването от индекса и работното дърво [y,n,q,a,d%s,?]? "
-#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#, 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:1470
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Прилагане на парчето от индекса и работното дърво [y,n,q,a,d%s,?]? "
-#: add-patch.c:171
+#: 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"
@@ -646,7 +692,7 @@
"d — без прилагане на това и всички следващи парчета от файла от индекса и "
"работното дърво\n"
-#: add-patch.c:214
+#: add-patch.c:224
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -660,34 +706,34 @@
"a — прилагане на това и всички следващи парчета от файла\n"
"d — без прилагане на това и всички следващи парчета от файла\n"
-#: add-patch.c:318
+#: add-patch.c:342
#, c-format
msgid "could not parse hunk header '%.*s'"
msgstr "заглавната част на парчето „%.*s“ не може да се анализира"
-#: add-patch.c:337 add-patch.c:341
+#: add-patch.c:361 add-patch.c:365
#, c-format
msgid "could not parse colored hunk header '%.*s'"
msgstr "заглавната част на оцветеното парче „%.*s“ не може да се анализира"
-#: add-patch.c:395
+#: add-patch.c:419
msgid "could not parse diff"
msgstr "разликата не може да се анализира"
-#: add-patch.c:414
+#: add-patch.c:438
msgid "could not parse colored diff"
msgstr "оцветената разлика не може да се анализира"
-#: add-patch.c:428
+#: add-patch.c:452
#, c-format
msgid "failed to run '%s'"
msgstr "неуспешно изпълнение на „%s“"
-#: add-patch.c:587
+#: add-patch.c:611
msgid "mismatched output from interactive.diffFilter"
msgstr "изходът от „interactive.diffFilter“ не напасва"
-#: add-patch.c:588
+#: add-patch.c:612
msgid ""
"Your filter must maintain a one-to-one correspondence\n"
"between its input and output lines."
@@ -695,7 +741,7 @@
"Обработените редове на изхода на ползвания филтър, трябва\n"
"да се отнасят едно към едно спрямо редовете на входа."
-#: add-patch.c:761
+#: add-patch.c:790
#, c-format
msgid ""
"expected context line #%d in\n"
@@ -704,7 +750,7 @@
"очаква се ред №%d от контекста в\n"
"%.*s"
-#: add-patch.c:776
+#: add-patch.c:805
#, c-format
msgid ""
"hunks do not overlap:\n"
@@ -717,11 +763,11 @@
" не завършва с:\n"
"%.*s"
-#: add-patch.c:1052 git-add--interactive.perl:1112
+#: add-patch.c:1081 git-add--interactive.perl:1115
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "Ръчно редактиране на парчета код — отдолу има подсказка.\n"
-#: add-patch.c:1056
+#: add-patch.c:1085
#, c-format
msgid ""
"---\n"
@@ -736,7 +782,7 @@
"Редовете, които започват с „%c“ ще бъдат пропуснати.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1070 git-add--interactive.perl:1126
+#: add-patch.c:1099 git-add--interactive.perl:1129
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"
@@ -746,11 +792,11 @@
"изтриете всички редове от парчето код, то ще бъде оставено непроменено, а\n"
"редактирането — отказано.\n"
-#: add-patch.c:1103
+#: add-patch.c:1132
msgid "could not parse hunk header"
msgstr "заглавната част парчето не може да се анализира"
-#: add-patch.c:1148
+#: add-patch.c:1177
msgid "'git apply --cached' failed"
msgstr "неуспешно изпълнение на „git apply --cached“"
@@ -766,7 +812,7 @@
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1218 git-add--interactive.perl:1239
+#: add-patch.c:1246 git-add--interactive.perl:1242
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
@@ -774,19 +820,19 @@
"редактирането? (текущите редакции ще се отменят при отказ!): „y“ (да)/ "
"„n“ (не)? "
-#: add-patch.c:1261
+#: add-patch.c:1289
msgid "The selected hunks do not apply to the index!"
msgstr "Избраните парчета не могат да се добавят в индекса!"
-#: add-patch.c:1262 git-add--interactive.perl:1343
+#: add-patch.c:1290 git-add--interactive.perl:1346
msgid "Apply them to the worktree anyway? "
msgstr "Да се приложат ли към работното дърво? "
-#: add-patch.c:1269 git-add--interactive.perl:1346
+#: add-patch.c:1297 git-add--interactive.perl:1349
msgid "Nothing was applied.\n"
msgstr "Нищо не е приложено.\n"
-#: add-patch.c:1326
+#: add-patch.c:1354
msgid ""
"j - leave this hunk undecided, see next undecided hunk\n"
"J - leave this hunk undecided, see next hunk\n"
@@ -808,103 +854,113 @@
"e — ръчно редактиране на текущото парче\n"
"? — извеждане не помощта\n"
-#: add-patch.c:1447 add-patch.c:1457
+#: add-patch.c:1516 add-patch.c:1526
msgid "No previous hunk"
msgstr "Няма друго парче преди това"
-#: add-patch.c:1452 add-patch.c:1462
+#: add-patch.c:1521 add-patch.c:1531
msgid "No next hunk"
msgstr "Няма друго парче след това"
-#: add-patch.c:1468
+#: add-patch.c:1537
msgid "No other hunks to goto"
msgstr "Няма други парчета"
-#: add-patch.c:1479 git-add--interactive.perl:1577
+#: add-patch.c:1548 git-add--interactive.perl:1606
msgid "go to which hunk (<ret> to see more)? "
msgstr "към кое парче да се придвижи (за повече варианти натиснете „enter“)? "
-#: add-patch.c:1480 git-add--interactive.perl:1579
+#: add-patch.c:1549 git-add--interactive.perl:1608
msgid "go to which hunk? "
msgstr "към кое парче да се придвижи? "
-#: add-patch.c:1491
+#: add-patch.c:1560
#, c-format
msgid "Invalid number: '%s'"
msgstr "Неправилен номер: „%s“"
-#: add-patch.c:1496
+#: add-patch.c:1565
#, c-format
msgid "Sorry, only %d hunk available."
msgid_plural "Sorry, only %d hunks available."
msgstr[0] "Има само %d парче."
msgstr[1] "Има само %d парчета."
-#: add-patch.c:1505
+#: add-patch.c:1574
msgid "No other hunks to search"
msgstr "Няма други парчета за търсене"
-#: add-patch.c:1511 git-add--interactive.perl:1623
+#: add-patch.c:1580 git-add--interactive.perl:1661
msgid "search for regex? "
msgstr "да се търси с регулярен израз? "
-#: add-patch.c:1526
+#: add-patch.c:1595
#, c-format
msgid "Malformed search regexp %s: %s"
msgstr "Сгрешен регулярен израз „%s“: %s"
-#: add-patch.c:1543
+#: add-patch.c:1612
msgid "No hunk matches the given pattern"
msgstr "Никое парче не напасва на регулярния израз"
-#: add-patch.c:1550
+#: add-patch.c:1619
msgid "Sorry, cannot split this hunk"
msgstr "Това парче не може да бъде разделено"
-#: add-patch.c:1554
+#: add-patch.c:1623
#, c-format
msgid "Split into %d hunks."
msgstr "Разделяне на %d парчета."
-#: add-patch.c:1558
+#: add-patch.c:1627
msgid "Sorry, cannot edit this hunk"
msgstr "Това парче не може да бъде редактирано"
-#: add-patch.c:1609
+#: add-patch.c:1679
msgid "'git apply' failed"
msgstr "неуспешно изпълнение на „git apply“"
-#: advice.c:115
+#: advice.c:143
+#, c-format
+msgid ""
+"\n"
+"Disable this message with \"git config advice.%s false\""
+msgstr ""
+"\n"
+"За да изключите това предупреждение, изпълнете:\n"
+" git config advice.%s false"
+
+#: advice.c:159
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sподсказка: %.*s%s\n"
-#: advice.c:168
+#: advice.c:250
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "Отбирането на подавания е блокирано от неслети файлове."
-#: advice.c:170
+#: advice.c:252
msgid "Committing is not possible because you have unmerged files."
msgstr "Подаването е блокирано от неслети файлове."
-#: advice.c:172
+#: advice.c:254
msgid "Merging is not possible because you have unmerged files."
msgstr "Сливането е блокирано от неслети файлове."
-#: advice.c:174
+#: advice.c:256
msgid "Pulling is not possible because you have unmerged files."
msgstr "Издърпването е блокирано от неслети файлове."
-#: advice.c:176
+#: advice.c:258
msgid "Reverting is not possible because you have unmerged files."
msgstr "Отмяната е блокирана от неслети файлове."
-#: advice.c:178
+#: advice.c:260
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "Действието „%s“ е блокирано от неслети файлове."
-#: advice.c:186
+#: advice.c:268
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
@@ -912,23 +968,23 @@
"Редактирайте ги в работното дърво, и тогава ползвайте „git add/rm ФАЙЛ“,\n"
"за да отбележите коригирането им. След това извършете подаването."
-#: advice.c:194
+#: advice.c:276
msgid "Exiting because of an unresolved conflict."
msgstr "Изход от програмата заради некоригиран конфликт."
-#: advice.c:199 builtin/merge.c:1335
+#: advice.c:281 builtin/merge.c:1370
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува)."
-#: advice.c:201
+#: advice.c:283
msgid "Please, commit your changes before merging."
msgstr "Промените трябва да се подадат преди сливане."
-#: advice.c:202
+#: advice.c:284
msgid "Exiting because of unfinished merge."
msgstr "Изход от програмата заради незавършено сливане."
-#: advice.c:208
+#: advice.c:290
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -969,7 +1025,7 @@
"\n"
"Може да спрете това съобщение със задаване на настройката „advice."
"detachedHead“\n"
-"да е „false“.\n"
+"да е „false“ (лъжа̀).\n"
#: alias.c:50
msgid "cmdline ends with \\"
@@ -1232,7 +1288,8 @@
msgid "cannot checkout %s"
msgstr "„%s“ не може да се изтегли"
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:86 pack-revindex.c:213
+#: setup.c:308
#, c-format
msgid "failed to read %s"
msgstr "файлът „%s“ не може да бъде прочетен"
@@ -1252,7 +1309,7 @@
msgid "%s: does not exist in index"
msgstr "„%s“ не съществува в индекса"
-#: apply.c:3537 apply.c:3708
+#: apply.c:3537 apply.c:3708 apply.c:3952
#, c-format
msgid "%s: does not match index"
msgstr "„%s“ не съответства на индекса"
@@ -1302,185 +1359,185 @@
msgid "%s has type %o, expected %o"
msgstr "„%s“ е от вид „%o“, а се очакваше „%o“"
-#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856
-#: read-cache.c:1325
+#: apply.c: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:3936
+#: apply.c:3950
#, c-format
msgid "%s: already exists in index"
msgstr "„%s“: вече съществува в индекса"
-#: apply.c:3939
+#: apply.c:3954
#, c-format
msgid "%s: already exists in working directory"
msgstr "„%s“: вече съществува в работното дърво"
-#: apply.c:3959
+#: apply.c:3974
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "новите права за достъп (%o) на „%s“ не съвпадат със старите (%o)"
-#: apply.c:3964
+#: apply.c:3979
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
"новите права за достъп (%o) на „%s“ не съвпадат със старите (%o) на „%s“"
-#: apply.c:3984
+#: apply.c:3999
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "засегнатият файл „%s“ е след символна връзка"
-#: apply.c:3988
+#: apply.c:4003
#, c-format
msgid "%s: patch does not apply"
msgstr "Кръпката „%s“ не може да бъде приложена"
-#: apply.c:4003
+#: apply.c:4018
#, c-format
msgid "Checking patch %s..."
msgstr "Проверяване на кръпката „%s“…"
-#: apply.c:4095
+#: apply.c:4110
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
"информацията за сумата по SHA1 за подмодула липсва или не е достатъчна (%s)."
-#: apply.c:4102
+#: apply.c:4117
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "смяна на режима на достъпа на „%s“, който не е в текущия връх „HEAD“"
-#: apply.c:4105
+#: apply.c:4120
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "информацията за сумата по SHA1 липсва или не е достатъчна (%s)."
-#: apply.c:4114
+#: apply.c:4129
#, c-format
msgid "could not add %s to temporary index"
msgstr "„%s“ не може да се добави към временния индекс"
-#: apply.c:4124
+#: apply.c:4139
#, c-format
msgid "could not write temporary index to %s"
msgstr "временният индекс не може да се запази в „%s“"
-#: apply.c:4262
+#: apply.c:4277
#, c-format
msgid "unable to remove %s from index"
msgstr "„%s“ не може да се извади от индекса"
-#: apply.c:4296
+#: apply.c:4311
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "повредена кръпка за модула „%s“"
-#: apply.c:4302
+#: apply.c:4317
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
"не може да се получи информация чрез „stat“ за новосъздадения файл „%s“"
-#: apply.c:4310
+#: apply.c:4325
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
"не може да се за създаде мястото за съхранение на новосъздадения файл „%s“"
-#: apply.c:4316 apply.c:4461
+#: apply.c:4331 apply.c:4476
#, c-format
msgid "unable to add cache entry for %s"
msgstr "не може да се добави запис в кеша за „%s“"
-#: apply.c:4359
+#: apply.c:4374 builtin/bisect--helper.c:523
#, c-format
msgid "failed to write to '%s'"
msgstr "в „%s“ не може да се пише"
-#: apply.c:4363
+#: apply.c:4378
#, c-format
msgid "closing file '%s'"
msgstr "затваряне на файла „%s“"
-#: apply.c:4433
+#: apply.c:4448
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "файлът „%s“ не може да се запише с режим на достъп „%o“"
-#: apply.c:4531
+#: apply.c:4546
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Кръпката „%s“ бе приложена чисто."
-#: apply.c:4539
+#: apply.c:4554
msgid "internal error"
msgstr "вътрешна грешка"
-#: apply.c:4542
+#: apply.c:4557
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Прилагане на кръпката „%%s“ с %d отхвърлено парче…"
msgstr[1] "Прилагане на кръпката „%%s“ с %d отхвърлени парчета…"
-#: apply.c:4553
+#: apply.c:4568
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "съкращаване на името на файла с отхвърлените парчета на „ %.*s.rej“"
-#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201
+#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334
#, c-format
msgid "cannot open %s"
msgstr "„%s“ не може да бъде отворен"
-#: apply.c:4575
+#: apply.c:4590
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "%d-то парче бе успешно приложено."
-#: apply.c:4579
+#: apply.c:4594
#, c-format
msgid "Rejected hunk #%d."
msgstr "%d-то парче бе отхвърлено."
-#: apply.c:4698
+#: apply.c:4718
#, c-format
msgid "Skipped patch '%s'."
msgstr "Пропусната кръпка: „%s“"
-#: apply.c:4706
+#: apply.c:4726
msgid "unrecognized input"
msgstr "непознат вход"
-#: apply.c:4726
+#: apply.c:4746
msgid "unable to read index file"
msgstr "индексът не може да бъде записан"
-#: apply.c:4883
+#: apply.c:4903
#, c-format
msgid "can't open patch '%s': %s"
msgstr "кръпката „%s“ не може да бъде отворена: %s"
-#: apply.c:4910
+#: apply.c:4930
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "пренебрегната е %d грешка в знаците за интервали"
msgstr[1] "пренебрегнати са %d грешки в знаците за интервали"
-#: apply.c:4916 apply.c:4931
+#: apply.c:4936 apply.c:4951
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d ред добавя грешки в знаците за интервали."
msgstr[1] "%d реда добавят грешки в знаците за интервали."
-#: apply.c:4924
+#: apply.c:4944
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
@@ -1489,138 +1546,182 @@
msgstr[1] ""
"Добавени са %d реда след корекцията на грешките в знаците за интервали."
-#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406
+#: apply.c:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406
msgid "Unable to write new index file"
msgstr "Новият индекс не може да бъде записан"
-#: apply.c:4968
+#: apply.c:4988
msgid "don't apply changes matching the given path"
msgstr "без прилагане на промените напасващи на дадения път"
-#: apply.c:4971
+#: apply.c:4991
msgid "apply changes matching the given path"
msgstr "прилагане на промените напасващи на дадения път"
-#: apply.c:4973 builtin/am.c:2260
+#: apply.c:4993 builtin/am.c:2266
msgid "num"
msgstr "БРОЙ"
-#: apply.c:4974
+#: apply.c:4994
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "премахване на този БРОЙ водещи елементи от пътищата в разликата"
-#: apply.c:4977
+#: apply.c:4997
msgid "ignore additions made by the patch"
msgstr "игнориране на редовете добавени от тази кръпка"
-#: apply.c:4979
+#: apply.c:4999
msgid "instead of applying the patch, output diffstat for the input"
msgstr "извеждане на статистика на промените без прилагане на кръпката"
-#: apply.c:4983
+#: apply.c:5003
msgid "show number of added and deleted lines in decimal notation"
msgstr "извеждане на броя на добавените и изтритите редове"
-#: apply.c:4985
+#: apply.c:5005
msgid "instead of applying the patch, output a summary for the input"
msgstr "извеждане на статистика на входните данни без прилагане на кръпката"
-#: apply.c:4987
+#: apply.c:5007
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "проверка дали кръпката може да се приложи, без действително прилагане"
-#: apply.c:4989
+#: apply.c:5009
msgid "make sure the patch is applicable to the current index"
msgstr "проверка дали кръпката може да бъде приложена към текущия индекс"
-#: apply.c:4991
+#: apply.c:5011
msgid "mark new files with `git add --intent-to-add`"
msgstr "отбелязване на новите файлове с „git add --intent-to-add“"
-#: apply.c:4993
+#: apply.c:5013
msgid "apply a patch without touching the working tree"
msgstr "прилагане на кръпката без промяна на работното дърво"
-#: apply.c:4995
+#: apply.c:5015
msgid "accept a patch that touches outside the working area"
msgstr "прилагане на кръпка, която променя и файлове извън работното дърво"
-#: apply.c:4998
+#: apply.c:5018
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
"кръпката да бъде приложена. Опцията се комбинира с „--check“/„--stat“/„--"
"summary“"
-#: apply.c:5000
+#: apply.c:5020
msgid "attempt three-way merge if a patch does not apply"
msgstr "пробване с тройно сливане, ако кръпката не може да се приложи директно"
-#: apply.c:5002
+#: apply.c:5022
msgid "build a temporary index based on embedded index information"
msgstr ""
"създаване на временен индекс на база на включената информация за индекса"
-#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540
msgid "paths are separated with NUL character"
msgstr "разделяне на пътищата с нулевия знак „NUL“"
-#: apply.c:5007
+#: apply.c:5027
msgid "ensure at least <n> lines of context match"
msgstr "да се осигури контекст от поне такъв БРОЙ съвпадащи редове"
-#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98
+#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98
#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3457 builtin/rebase.c:1508
+#: builtin/pack-objects.c:3577 builtin/rebase.c:1352
msgid "action"
msgstr "действие"
-#: apply.c:5009
+#: apply.c:5029
msgid "detect new or modified lines that have whitespace errors"
msgstr "засичане на нови или променени редове с грешки в знаците за интервали"
-#: apply.c:5012 apply.c:5015
+#: apply.c:5032 apply.c:5035
msgid "ignore changes in whitespace when finding context"
msgstr ""
"игнориране на промените в знаците за интервали при откриване на контекста"
-#: apply.c:5018
+#: apply.c:5038
msgid "apply the patch in reverse"
msgstr "прилагане на кръпката в обратна посока"
-#: apply.c:5020
+#: apply.c:5040
msgid "don't expect at least one line of context"
msgstr "без изискване на дори и един ред контекст"
-#: apply.c:5022
+#: apply.c:5042
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "оставяне на отхвърлените парчета във файлове с разширение „.rej“"
-#: apply.c:5024
+#: apply.c:5044
msgid "allow overlapping hunks"
msgstr "позволяване на застъпващи се парчета"
-#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22
-#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774
-#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22
+#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757
+#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "повече подробности"
-#: apply.c:5027
+#: apply.c:5047
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "пренебрегване на неправилно липсващ знак за нов ред в края на файл"
-#: apply.c:5030
+#: apply.c:5050
msgid "do not trust the line counts in the hunk headers"
msgstr "без доверяване на номерата на редовете в заглавните части на парчетата"
-#: apply.c:5032 builtin/am.c:2248
+#: apply.c:5052 builtin/am.c:2254
msgid "root"
msgstr "НАЧАЛНА_ДИРЕКТОРИЯ"
-#: apply.c:5033
+#: apply.c:5053
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:450
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr "филтърът „%s“ не може да бъде стартиран"
+
+#: archive-tar.c:453
+msgid "unable to redirect descriptor"
+msgstr "дескрипторът не може да бъде пренасочен"
+
+#: archive-tar.c:460
+#, 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 [ОПЦИЯ…] УКАЗАТЕЛ_КЪМ_ДЪРВО [ПЪТ…]"
@@ -1640,183 +1741,156 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote ХРАНИЛИЩЕ [--exec КОМАНДА] --list"
-#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
-#, c-format
-msgid "pathspec '%s' did not match any files"
-msgstr "пътят „%s“ не съвпада с никой файл"
-
-#: archive.c:396
-#, c-format
-msgid "no such ref: %.*s"
-msgstr "такъв указател няма: %.*s"
-
-#: archive.c:401
-#, c-format
-msgid "not a valid object name: %s"
-msgstr "неправилно име на обект: „%s“"
-
-#: archive.c:414
-#, c-format
-msgid "not a tree object: %s"
-msgstr "не е обект-дърво: %s"
-
-#: archive.c:426
-msgid "current working directory is untracked"
-msgstr "текущата работна директория не е следена"
-
-#: archive.c:457
-msgid "fmt"
-msgstr "ФОРМАТ"
-
-#: archive.c:457
-msgid "archive format"
-msgstr "ФОРМАТ на архива"
-
-#: archive.c:458 builtin/log.c:1653
-msgid "prefix"
-msgstr "ПРЕФИКС"
-
-#: archive.c:459
-msgid "prepend prefix to each pathname in the archive"
-msgstr "добавяне на този ПРЕФИКС към всеки път в архива"
-
-#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
-#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
-#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887
-#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
-#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
-#: parse-options.h:190
-msgid "file"
-msgstr "ФАЙЛ"
-
-#: archive.c:461 builtin/archive.c:90
-msgid "write the archive to this file"
-msgstr "запазване на архива в този ФАЙЛ"
-
-#: archive.c:463
-msgid "read .gitattributes in working directory"
-msgstr "изчитане на „.gitattributes“ в работната директория"
-
-#: archive.c:464
-msgid "report archived files on stderr"
-msgstr "извеждане на архивираните файлове на стандартната грешка"
-
-#: archive.c:465
-msgid "store only"
-msgstr "съхранение без компресиране"
-
-#: archive.c:466
-msgid "compress faster"
-msgstr "бързо компресиране"
-
-#: archive.c:474
-msgid "compress better"
-msgstr "добро компресиране"
-
-#: archive.c:477
-msgid "list supported archive formats"
-msgstr "извеждане на списъка с поддържаните формати"
-
-#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
-#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
-msgid "repo"
-msgstr "хранилище"
-
-#: archive.c:480 builtin/archive.c:92
-msgid "retrieve the archive from remote repository <repo>"
-msgstr "изтегляне на архива от отдалеченото ХРАНИЛИЩЕ"
-
-#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
-#: builtin/notes.c:498
-msgid "command"
-msgstr "команда"
-
-#: archive.c:482 builtin/archive.c:94
-msgid "path to the remote git-upload-archive command"
-msgstr "път към отдалечената команда „git-upload-archive“"
-
-#: archive.c:489
-msgid "Unexpected option --remote"
-msgstr "Неочаквана опция „--remote“"
-
-#: archive.c:491
-msgid "Option --exec can only be used together with --remote"
-msgstr "Опцията „--exec“ изисква „--remote“"
-
-#: archive.c:493
-msgid "Unexpected option --output"
-msgstr "Неочаквана опция „--output“"
-
-#: archive.c:515
-#, c-format
-msgid "Unknown archive format '%s'"
-msgstr "Непознат формат на архив: „%s“"
-
-#: archive.c:522
-#, c-format
-msgid "Argument not supported for format '%s': -%d"
-msgstr "Аргументът не се поддържа за форма̀та „%s“: -%d"
-
-#: archive-tar.c:125 archive-zip.c:351
-#, c-format
-msgid "cannot stream blob %s"
-msgstr "обектът-BLOB „%s“ не може да бъде обработен"
-
-#: archive-tar.c:266 archive-zip.c:369
-#, c-format
-msgid "unsupported file mode: 0%o (SHA1: %s)"
-msgstr "неподдържани права за достъп до файл: 0%o (SHA1: %s)"
-
-#: archive-tar.c:293 archive-zip.c:359
+#: archive.c:192
#, c-format
msgid "cannot read %s"
msgstr "обектът „%s“ не може да бъде прочетен"
-#: archive-tar.c:465
+#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894
+#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786
+#: builtin/merge.c:1139
#, c-format
-msgid "unable to start '%s' filter"
-msgstr "филтърът „%s“ не може да бъде стартиран"
+msgid "could not read '%s'"
+msgstr "файлът „%s“ не може да бъде прочетен"
-#: archive-tar.c:468
-msgid "unable to redirect descriptor"
-msgstr "дескрипторът не може да бъде пренасочен"
-
-#: archive-tar.c:475
+#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315
#, c-format
-msgid "'%s' filter reported error"
-msgstr "филтърът „%s“ върна грешка"
+msgid "pathspec '%s' did not match any files"
+msgstr "пътят „%s“ не съвпада с никой файл"
-#: archive-zip.c:319
+#: archive.c:454
#, c-format
-msgid "path is not valid UTF-8: %s"
-msgstr "пътят не е правилно кодиран в UTF-8: %s"
+msgid "no such ref: %.*s"
+msgstr "такъв указател няма: %.*s"
-#: archive-zip.c:323
+#: archive.c:460
#, c-format
-msgid "path too long (%d chars, SHA1: %s): %s"
-msgstr "твърде дълъг път (%d знака, SHA1: %s): %s"
+msgid "not a valid object name: %s"
+msgstr "неправилно име на обект: „%s“"
-#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
+#: archive.c:473
#, c-format
-msgid "deflate error (%d)"
-msgstr "грешка при декомпресиране с „deflate“ (%d)"
+msgid "not a tree object: %s"
+msgstr "не е обект-дърво: %s"
-#: archive-zip.c:615
+#: archive.c:485
+msgid "current working directory is untracked"
+msgstr "текущата работна директория не е следена"
+
+#: archive.c:526
#, c-format
-msgid "timestamp too large for this system: %<PRIuMAX>"
-msgstr "времевата стойност е твърде голяма за тази система: %<PRIuMAX>"
+msgid "File not found: %s"
+msgstr "Файлът „%s“ липсва"
-#: attr.c:212
+#: archive.c:528
+#, c-format
+msgid "Not a regular file: %s"
+msgstr "„%s“ не е обикновен файл"
+
+#: archive.c:555
+msgid "fmt"
+msgstr "ФОРМАТ"
+
+#: archive.c:555
+msgid "archive format"
+msgstr "ФОРМАТ на архива"
+
+#: archive.c:556 builtin/log.c:1764
+msgid "prefix"
+msgstr "ПРЕФИКС"
+
+#: archive.c:557
+msgid "prepend prefix to each pathname in the archive"
+msgstr "добавяне на този ПРЕФИКС към всеки път в архива"
+
+#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888
+#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
+#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
+#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105
+#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412
+#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190
+msgid "file"
+msgstr "ФАЙЛ"
+
+#: archive.c:559
+msgid "add untracked file to archive"
+msgstr "добавяне на неследените файлове към архива"
+
+#: archive.c:562 builtin/archive.c:90
+msgid "write the archive to this file"
+msgstr "запазване на архива в този ФАЙЛ"
+
+#: archive.c:564
+msgid "read .gitattributes in working directory"
+msgstr "изчитане на „.gitattributes“ в работната директория"
+
+#: archive.c:565
+msgid "report archived files on stderr"
+msgstr "извеждане на архивираните файлове на стандартната грешка"
+
+#: archive.c:567
+msgid "set compression level"
+msgstr "задаване на нивото на компресиране"
+
+#: archive.c:570
+msgid "list supported archive formats"
+msgstr "извеждане на списъка с поддържаните формати"
+
+#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117
+#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
+msgid "repo"
+msgstr "хранилище"
+
+#: archive.c:573 builtin/archive.c:92
+msgid "retrieve the archive from remote repository <repo>"
+msgstr "получаване на архива от отдалеченото ХРАНИЛИЩЕ"
+
+#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714
+#: builtin/notes.c:498
+msgid "command"
+msgstr "команда"
+
+#: archive.c:575 builtin/archive.c:94
+msgid "path to the remote git-upload-archive command"
+msgstr "път към отдалечената команда „git-upload-archive“"
+
+#: archive.c:582
+msgid "Unexpected option --remote"
+msgstr "Неочаквана опция „--remote“"
+
+#: archive.c:584
+msgid "Option --exec can only be used together with --remote"
+msgstr "Опцията „--exec“ изисква „--remote“"
+
+#: archive.c:586
+msgid "Unexpected option --output"
+msgstr "Неочаквана опция „--output“"
+
+#: archive.c:588
+msgid "Options --add-file and --remote cannot be used together"
+msgstr "Опциите „--add-file“ и „--remote“ са несъвместими"
+
+#: archive.c:610
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "Непознат формат на архив: „%s“"
+
+#: archive.c:619
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "Аргументът не се поддържа за форма̀та „%s“: -%d"
+
+#: attr.c:202
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "„%.*s“ е неправилно име за атрибут"
-#: attr.c:369
+#: attr.c:359
#, c-format
msgid "%s not allowed: %s:%d"
msgstr "%s: командата не е позволена: „%s:%d“"
-#: attr.c:409
+#: attr.c:399
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -1824,22 +1898,22 @@
"Отрицателните шаблони се игнорират в атрибутите на git.\n"
"Ако ви трябва начална удивителна, ползвайте „\\!“."
-#: bisect.c:468
+#: bisect.c:489
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Неправилно цитирано съдържание във файла „%s“: %s"
-#: bisect.c:678
+#: bisect.c:699
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Повече не може да се търси двоично!\n"
-#: bisect.c:745
+#: bisect.c:766
#, c-format
msgid "Not a valid commit name %s"
msgstr "Неправилно име на подаване „%s“"
-#: bisect.c:770
+#: bisect.c:791
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1848,7 +1922,7 @@
"Неправилна база за сливане: %s.\n"
"Следователно грешката е коригирана между „%s“ и [%s].\n"
-#: bisect.c:775
+#: bisect.c:796
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1857,7 +1931,7 @@
"Нова база за сливане: %s.\n"
"Свойството е променено между „%s“ и [%s].\n"
-#: bisect.c:780
+#: bisect.c:801
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1866,7 +1940,7 @@
"Базата за сливане „%s“ е %s.\n"
"Следователно първото %s подаване е между „%s“ и [%s].\n"
-#: bisect.c:788
+#: bisect.c:809
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1877,7 +1951,7 @@
"Двоичното търсене с git bisect няма да работи правилно.\n"
"Дали не сте объркали указателите „%s“ и „%s“?\n"
-#: bisect.c:801
+#: bisect.c:822
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1888,45 +1962,45 @@
"Не може да сме сигурни, че първото %s подаване е между „%s“ и „%s“.\n"
"Двоичното търсене продължава."
-#: bisect.c:840
+#: bisect.c:861
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Двоично търсене: трябва да се провери база за сливане\n"
-#: bisect.c:890
+#: bisect.c:911
#, c-format
msgid "a %s revision is needed"
msgstr "необходима е версия „%s“"
-#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287
#, c-format
msgid "could not create file '%s'"
msgstr "файлът „%s“ не може да бъде създаден"
-#: bisect.c:966 builtin/merge.c:149
+#: bisect.c:987 builtin/merge.c:153
#, c-format
msgid "could not read file '%s'"
msgstr "файлът „%s“ не може да бъде прочетен"
-#: bisect.c:997
+#: bisect.c:1027
msgid "reading bisect refs failed"
msgstr "неуспешно прочитане на указателите за двоично търсене"
-#: bisect.c:1019
+#: bisect.c:1057
#, c-format
msgid "%s was both %s and %s\n"
msgstr "„%s“ e както „%s“, така и „%s“\n"
-#: bisect.c:1028
+#: bisect.c:1066
#, c-format
msgid ""
"No testable commit found.\n"
-"Maybe you started with bad path parameters?\n"
+"Maybe you started with bad path arguments?\n"
msgstr ""
"Липсва подходящо за тестване подаване.\n"
"Проверете параметрите за пътищата.\n"
-#: bisect.c:1057
+#: bisect.c:1095
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1936,48 +2010,48 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1063
+#: bisect.c:1101
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[0] "Двоично търсене: остава %d версия след тази %s\n"
msgstr[1] "Двоично търсене: остават %d версии след тази %s\n"
-#: blame.c:2700
+#: blame.c:2777
msgid "--contents and --reverse do not blend well."
msgstr "Опциите „--contents“ и „--reverse“ са несъвместими"
-#: blame.c:2714
+#: blame.c:2791
msgid "cannot use --contents with final commit object name"
msgstr "Опцията „--contents“ е несъвместима с име на обект от крайно подаване"
-#: blame.c:2735
+#: blame.c:2812
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
"Едновременното задаване на опциите „--reverse“ и „--first-parent“ изисква "
"указването на крайно подаване"
-#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006
-#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388
-#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215
-#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290
-#: builtin/shortlog.c:192
+#: blame.c:2821 bundle.c:213 ref-filter.c:2206 remote.c:2041 sequencer.c:2146
+#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411
+#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335
+#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410
+#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr "неуспешно настройване на обхождането на версиите"
-#: blame.c:2762
+#: blame.c:2839
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
"Едновременното задаване на опциите „--reverse“ и „--first-parent“ изисква "
"указването на диапазон по веригата на първите наследници"
-#: blame.c:2773
+#: blame.c:2850
#, c-format
msgid "no such path %s in %s"
msgstr "няма път на име „%s“ в „%s“"
-#: blame.c:2784
+#: blame.c:2861
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "обектът-BLOB „%s“ в пътя %s не може да бъде прочетен"
@@ -2110,115 +2184,416 @@
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:2258 sequencer.c:3016
-#: builtin/commit.c:815
+#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184
+#: 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:273
+#: bundle.c:319
msgid "unable to dup bundle descriptor"
msgstr "неуспешно дублиране на дескриптора на пратката с „dup“"
-#: bundle.c:280
+#: bundle.c:326
msgid "Could not spawn pack-objects"
msgstr "Командата „git pack-objects“ не може да бъде стартирана"
-#: bundle.c:291
+#: bundle.c:337
msgid "pack-objects died"
msgstr "Командата „git pack-objects“ не завърши успешно"
-#: bundle.c:333
-msgid "rev-list died"
-msgstr "Командата „git rev-list“ не завърши успешно"
-
-#: bundle.c:382
+#: bundle.c:386
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
"указателят „%s“ не е бил включен поради опциите зададени на „git rev-list“"
-#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306
+#: bundle.c:490
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr "неподдържана версия на индекса %d"
+
+#: bundle.c:492
+#, c-format
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr "пратка %d не може да се запише с алгоритъм %s"
+
+#: bundle.c:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396
#, c-format
msgid "unrecognized argument: %s"
msgstr "непознат аргумент: %s"
-#: bundle.c:469
+#: bundle.c:539
msgid "Refusing to create empty bundle."
msgstr "Създаването на празна пратка е невъзможно."
-#: bundle.c:479
+#: bundle.c:549
#, c-format
msgid "cannot create '%s'"
-msgstr "Файлът „%s“ не може да бъде създаден"
+msgstr "файлът „%s“ не може да бъде създаден"
-#: bundle.c:504
+#: bundle.c:574
msgid "index-pack died"
-msgstr "Командата „git index-pack“ не завърши успешно"
+msgstr "командата „git index-pack“ не завърши успешно"
+
+#: chunk-format.c:113
+msgid "terminating chunk id appears earlier than expected"
+msgstr "идентификаторът за краен откъс се явява по-рано от очакваното"
+
+#: chunk-format.c:122
+#, c-format
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr "неправилно отместване на откъс/и %<PRIx64> и %<PRIx64>"
+
+#: chunk-format.c:129
+#, c-format
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr "повтарящ се идентификатор на откъс %<PRIx32>"
+
+#: chunk-format.c:143
+#, c-format
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr "ненулев идентификатор за краен откъс %<PRIx32>"
#: color.c:329
#, c-format
msgid "invalid color value: %.*s"
msgstr "неправилна стойност за цвят: %.*s"
-#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403
-#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457
+#: commit-graph.c:197 midx.c:46
+msgid "invalid hash version"
+msgstr "неправилна версия на контролна сума"
+
+#: commit-graph.c:255
+msgid "commit-graph file is too small"
+msgstr "файлът за гра̀фа с подаванията е твърде малък"
+
+#: commit-graph.c:348
+#, c-format
+msgid "commit-graph signature %X does not match signature %X"
+msgstr "отпечатъкът на гра̀фа с подаванията %X не съвпада с %X"
+
+#: commit-graph.c:355
+#, c-format
+msgid "commit-graph version %X does not match version %X"
+msgstr "версията на гра̀фа с подаванията %X не съвпада с %X"
+
+#: commit-graph.c:362
+#, c-format
+msgid "commit-graph hash version %X does not match version %X"
+msgstr "версията на контролната сума на гра̀фа с подаванията %X не съвпада с %X"
+
+#: commit-graph.c:379
+#, c-format
+msgid "commit-graph file is too small to hold %u chunks"
+msgstr "файлът с гра̀фа на подаванията е твърде малък, за да съдържа %u откъси"
+
+#: commit-graph.c:472
+msgid "commit-graph has no base graphs chunk"
+msgstr "базовият откъс липсва в гра̀фа с подаванията"
+
+#: commit-graph.c:482
+msgid "commit-graph chain does not match"
+msgstr "веригата на гра̀фа с подаванията не съвпада"
+
+#: commit-graph.c:530
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr ""
+"грешка във веригата на гра̀фа с подаванията: ред „%s“ не е контролна сума"
+
+#: commit-graph.c:554
+msgid "unable to find all commit-graph files"
+msgstr "някои файлове на гра̀фа с подаванията не могат да бъдат открити"
+
+#: commit-graph.c:735 commit-graph.c:772
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr ""
+"неправилна позиция на подаването. Вероятно графът с подаванията е повреден"
+
+#: commit-graph.c:756
+#, c-format
+msgid "could not find commit %s"
+msgstr "подаването „%s“ не може да бъде открито"
+
+#: commit-graph.c:789
+msgid "commit-graph requires overflow generation data but has none"
+msgstr ""
+"графът с подаванията изисква генериране на данни за отместването, но такива "
+"липсват"
+
+#: commit-graph.c:1065 builtin/am.c:1292
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "подаването не може да бъде анализирано: %s"
+
+#: commit-graph.c:1327 builtin/pack-objects.c:2872
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "видът на обекта „%s“ не може да бъде определен"
+
+#: commit-graph.c:1358
+msgid "Loading known commits in commit graph"
+msgstr "Зареждане на познатите подавания в гра̀фа с подаванията"
+
+#: commit-graph.c:1375
+msgid "Expanding reachable commits in commit graph"
+msgstr "Разширяване на достижимите подавания в гра̀фа"
+
+#: commit-graph.c:1395
+msgid "Clearing commit marks in commit graph"
+msgstr "Изчистване на отбелязванията на подаванията в гра̀фа с подаванията"
+
+#: commit-graph.c:1414
+msgid "Computing commit graph topological levels"
+msgstr "Изчисляване на топологичните нива в гра̀фа с подаванията"
+
+#: commit-graph.c:1467
+msgid "Computing commit graph generation numbers"
+msgstr "Изчисляване на номерата на поколенията в гра̀фа с подаванията"
+
+#: commit-graph.c:1548
+msgid "Computing commit changed paths Bloom filters"
+msgstr "Изчисляване на филтрите на Блум на пътищата с промяна при подаването"
+
+#: commit-graph.c:1625
+msgid "Collecting referenced commits"
+msgstr "Събиране на свързаните подавания"
+
+#: commit-graph.c:1650
+#, 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:1663
+#, c-format
+msgid "error adding pack %s"
+msgstr "грешка при добавяне на пакетен файл „%s“"
+
+#: commit-graph.c:1667
+#, c-format
+msgid "error opening index for %s"
+msgstr "грешка при отваряне на индекса на „%s“"
+
+#: commit-graph.c:1704
+msgid "Finding commits for commit graph among packed objects"
+msgstr "Откриване на подаванията в гра̀фа измежду пакетираните обекти"
+
+#: commit-graph.c:1722
+msgid "Finding extra edges in commit graph"
+msgstr "Откриване на още върхове в гра̀фа с подаванията"
+
+#: commit-graph.c:1771
+msgid "failed to write correct number of base graph ids"
+msgstr "правилният брой на базовите идентификатори не може да се запише"
+
+#: commit-graph.c:1802 midx.c:794
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr "родителските директории на „%s“ не могат да бъдат създадени"
+
+#: commit-graph.c:1815
+msgid "unable to create temporary graph layer"
+msgstr "не може да бъде създаден временен слой за гра̀фа с подаванията"
+
+#: commit-graph.c:1820
+#, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "правата за споделен достъп до „%s“ не могат да бъдат зададени"
+
+#: commit-graph.c:1879
+#, 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:1915
+msgid "unable to open commit-graph chain file"
+msgstr "файлът с веригата на гра̀фа с подаванията не може да се отвори"
+
+#: commit-graph.c:1931
+msgid "failed to rename base commit-graph file"
+msgstr "основният файл на гра̀фа с подаванията не може да бъде преименуван"
+
+#: commit-graph.c:1951
+msgid "failed to rename temporary commit-graph file"
+msgstr "временният файл на гра̀фа с подаванията не може да бъде преименуван"
+
+#: commit-graph.c:2084
+msgid "Scanning merged commits"
+msgstr "Търсене на подаванията със сливания"
+
+#: commit-graph.c:2128
+msgid "Merging commit-graph"
+msgstr "Сливане на гра̀фа с подаванията"
+
+#: commit-graph.c:2235
+msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
+msgstr ""
+"опит за запис на гра̀фа с подаванията, но настройката „core.commitGraph“ е "
+"изключена"
+
+#: commit-graph.c:2342
+msgid "too many commits to write graph"
+msgstr "прекалено много подавания за записване на гра̀фа"
+
+#: commit-graph.c:2440
+msgid "the commit-graph file has incorrect checksum and is likely corrupt"
+msgstr "графът с подаванията е с грешна сума за проверка — вероятно е повреден"
+
+#: commit-graph.c:2450
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr ""
+"неправилна подредба на обектите по идентификатор в гра̀фа с подаванията: „%s“ "
+"е преди „%s“, а не трябва"
+
+#: commit-graph.c:2460 commit-graph.c:2475
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr ""
+"неправилна стойност за откъс в гра̀фа с подаванията: fanout[%d] = %u, а "
+"трябва да е %u"
+
+#: commit-graph.c:2467
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "подаване „%s“ в гра̀фа с подаванията не може да се анализира"
+
+#: commit-graph.c:2485
+msgid "Verifying commits in commit graph"
+msgstr "Проверка на подаванията в гра̀фа"
+
+#: commit-graph.c:2500
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr ""
+"подаване „%s“ в базата от данни към гра̀фа с подаванията не може да се "
+"анализира"
+
+#: commit-graph.c:2507
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr ""
+"идентификаторът на обект за кореновото дърво за подаване „%s“ в гра̀фа с "
+"подаванията е „%s“, а трябва да е „%s“"
+
+#: commit-graph.c:2517
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr "списъкът с родители на „%s“ в гра̀фа с подаванията е прекалено дълъг"
+
+#: commit-graph.c:2526
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr "родителят на „%s“ в гра̀фа с подаванията е „%s“, а трябва да е „%s“"
+
+#: commit-graph.c:2540
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr "списъкът с родители на „%s“ в гра̀фа с подаванията е прекалено къс"
+
+#: commit-graph.c:2545
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr ""
+"номерът на поколението на подаване „%s“ в гра̀фа с подаванията е 0, а другаде "
+"не е"
+
+#: commit-graph.c:2549
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr ""
+"номерът на поколението на подаване „%s“ в гра̀фа с подаванията не е 0, а "
+"другаде е"
+
+#: commit-graph.c:2566
+#, c-format
+msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
+msgstr ""
+"номерът на поколението на подаване „%s“ в гра̀фа с подаванията е %<PRIuMAX> < "
+"%<PRIuMAX>"
+
+#: commit-graph.c:2572
+#, c-format
+msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
+msgstr ""
+"датата на подаване на „%s“ в гра̀фа с подаванията е %<PRIuMAX>, а трябва да е "
+"%<PRIuMAX>"
+
+#: commit.c:52 sequencer.c:2887 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr "„%s“ не може да се анализира"
-#: commit.c:53
+#: commit.c:54
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s не е подаване!"
-#: commit.c:193
+#: commit.c:194
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -2241,29 +2616,29 @@
"\n"
" git config advice.graftFileDeprecated false"
-#: commit.c:1153
+#: commit.c:1223
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"Подаването „%s“ е с недоверен подпис от GPG, който твърди, че е на „%s“."
-#: commit.c:1157
+#: commit.c:1227
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
"Подаването „%s“ е с неправилен подпис от GPG, който твърди, че е на „%s“."
-#: commit.c:1160
+#: commit.c:1230
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Подаването „%s“ е без подпис от GPG."
-#: commit.c:1163
+#: commit.c:1233
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Подаването „%s“ е с коректен подпис от GPG на „%s“.\n"
-#: commit.c:1417
+#: commit.c:1487
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
@@ -2273,281 +2648,11 @@
"Може да поправите подаването заедно със съобщението или може да\n"
"зададете ползваното кодиране в настройката „i18n.commitencoding“.\n"
-#: commit-graph.c:122
-msgid "commit-graph file is too small"
-msgstr "файлът с гра̀фа на подаванията е твърде малък"
-
-#: commit-graph.c:189
-#, c-format
-msgid "commit-graph signature %X does not match signature %X"
-msgstr "отпечатъкът на гра̀фа с подаванията %X не съвпада с %X"
-
-#: commit-graph.c:196
-#, c-format
-msgid "commit-graph version %X does not match version %X"
-msgstr "версията на гра̀фа с подаванията %X не съвпада с %X"
-
-#: commit-graph.c:203
-#, c-format
-msgid "commit-graph hash version %X does not match version %X"
-msgstr "версията на контролната сума на гра̀фа с подаванията %X не съвпада с %X"
-
-#: commit-graph.c:226
-msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
-msgstr ""
-"записът в таблицата за откъси липсва, файлът за гра̀фа може да е непълен"
-
-#: commit-graph.c:237
-#, c-format
-msgid "commit-graph improper chunk offset %08x%08x"
-msgstr "неправилно отместване на откъс: %08x%08x"
-
-#: commit-graph.c:280
-#, c-format
-msgid "commit-graph chunk id %08x appears multiple times"
-msgstr "откъсът %08x се явява многократно"
-
-#: commit-graph.c:343
-msgid "commit-graph has no base graphs chunk"
-msgstr "базовият откъс липсва в гра̀фа с подаванията"
-
-#: commit-graph.c:353
-msgid "commit-graph chain does not match"
-msgstr "веригата на гра̀фа с подаванията не съвпада"
-
-#: commit-graph.c:401
-#, c-format
-msgid "invalid commit-graph chain: line '%s' not a hash"
-msgstr ""
-"грешка във веригата на гра̀фа с подаванията: ред „%s“ не е контролна сума"
-
-#: commit-graph.c:425
-msgid "unable to find all commit-graph files"
-msgstr "някои файлове на гра̀фа с подаванията не могат да бъдат открити"
-
-#: commit-graph.c:558 commit-graph.c:618
-msgid "invalid commit position. commit-graph is likely corrupt"
-msgstr ""
-"неправилна позиция на подаването. Вероятно графът с подаванията е повреден"
-
-#: commit-graph.c:579
-#, c-format
-msgid "could not find commit %s"
-msgstr "подаването „%s“ не може да бъде открито"
-
-#: commit-graph.c:852 builtin/am.c:1292
-#, c-format
-msgid "unable to parse commit %s"
-msgstr "подаването не може да бъде анализирано: %s"
-
-#: commit-graph.c:1011 builtin/pack-objects.c:2782
-#, c-format
-msgid "unable to get type of object %s"
-msgstr "видът на обекта „%s“ не може да бъде определен"
-
-#: commit-graph.c:1043
-msgid "Loading known commits in commit graph"
-msgstr "Зареждане на познатите подавания в гра̀фа с подаванията"
-
-#: commit-graph.c:1060
-msgid "Expanding reachable commits in commit graph"
-msgstr "Разширяване на достижимите подавания в гра̀фа"
-
-#: commit-graph.c:1079
-msgid "Clearing commit marks in commit graph"
-msgstr "Изчистване на отбелязванията на подаванията в гра̀фа с подаванията"
-
-#: commit-graph.c:1098
-msgid "Computing commit graph generation numbers"
-msgstr "Изчисляване на номерата на поколенията в гра̀фа с подаванията"
-
-#: commit-graph.c:1173
-#, c-format
-msgid "Finding commits for commit graph in %d pack"
-msgid_plural "Finding commits for commit graph in %d packs"
-msgstr[0] "Откриване на подаванията в гра̀фа в %d пакетен файл"
-msgstr[1] "Откриване на подаванията в гра̀фа в %d пакетни файла"
-
-#: commit-graph.c:1186
-#, c-format
-msgid "error adding pack %s"
-msgstr "грешка при добавяне на пакетен файл „%s“"
-
-#: commit-graph.c:1190
-#, c-format
-msgid "error opening index for %s"
-msgstr "грешка при отваряне на индекса на „%s“"
-
-#: commit-graph.c:1214
-#, c-format
-msgid "Finding commits for commit graph from %d ref"
-msgid_plural "Finding commits for commit graph from %d refs"
-msgstr[0] "Откриване на подаванията в гра̀фа измежду %d указател"
-msgstr[1] "Откриване на подаванията в гра̀фа измежду %d указатели"
-
-#: commit-graph.c:1234
-#, c-format
-msgid "invalid commit object id: %s"
-msgstr "неправилен идентификатор на обект-подаване: „%s“"
-
-#: commit-graph.c:1249
-msgid "Finding commits for commit graph among packed objects"
-msgstr "Откриване на подаванията в гра̀фа измежду пакетираните обекти"
-
-#: commit-graph.c:1264
-msgid "Counting distinct commits in commit graph"
-msgstr "Преброяване на различните подавания в гра̀фа"
-
-#: commit-graph.c:1294
-msgid "Finding extra edges in commit graph"
-msgstr "Откриване на още върхове в гра̀фа с подаванията"
-
-#: commit-graph.c:1340
-msgid "failed to write correct number of base graph ids"
-msgstr "правилният брой на базовите идентификатори не може да се запише"
-
-#: commit-graph.c:1373 midx.c:814
-#, c-format
-msgid "unable to create leading directories of %s"
-msgstr "родителските директории на „%s“ не могат да бъдат създадени"
-
-#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248
-#, c-format
-msgid "unable to create '%s'"
-msgstr "пакетният файл „%s“ не може да бъде създаден"
-
-#: commit-graph.c:1445
-#, c-format
-msgid "Writing out commit graph in %d pass"
-msgid_plural "Writing out commit graph in %d passes"
-msgstr[0] "Запазване на гра̀фа с подаванията в %d пас"
-msgstr[1] "Запазване на гра̀фа с подаванията в %d паса"
-
-#: commit-graph.c:1486
-msgid "unable to open commit-graph chain file"
-msgstr "файлът с веригата на гра̀фа с подаванията не може да се отвори"
-
-#: commit-graph.c:1498
-msgid "failed to rename base commit-graph file"
-msgstr "основният файл на гра̀фа с подаванията не може да бъде преименуван"
-
-#: commit-graph.c:1518
-msgid "failed to rename temporary commit-graph file"
-msgstr "временният файл на гра̀фа с подаванията не може да бъде преименуван"
-
-#: commit-graph.c:1631
-msgid "Scanning merged commits"
-msgstr "Търсене на подаванията със сливания"
-
-#: commit-graph.c:1642
-#, c-format
-msgid "unexpected duplicate commit id %s"
-msgstr "неочакван, повтарящ се идентификатор на подаване: %s"
-
-#: commit-graph.c:1665
-msgid "Merging commit-graph"
-msgstr "Сливане на гра̀фа с подаванията"
-
-#: commit-graph.c:1844
-#, c-format
-msgid "the commit graph format cannot write %d commits"
-msgstr "форматът на гра̀фа с подаванията не може да запише %d подавания"
-
-#: commit-graph.c:1855
-msgid "too many commits to write graph"
-msgstr "прекалено много подавания за записване на гра̀фа"
-
-#: commit-graph.c:1944
-msgid "the commit-graph file has incorrect checksum and is likely corrupt"
-msgstr "графът с подаванията е с грешна сума за проверка — вероятно е повреден"
-
-#: commit-graph.c:1954
-#, c-format
-msgid "commit-graph has incorrect OID order: %s then %s"
-msgstr ""
-"неправилна подредба на обектите по идентификатор в гра̀фа с подаванията: „%s“ "
-"е преди „%s“, а не трябва"
-
-#: commit-graph.c:1964 commit-graph.c:1979
-#, c-format
-msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
-msgstr ""
-"неправилна стойност за откъс в гра̀фа с подаванията: fanout[%d] = %u, а "
-"трябва да е %u"
-
-#: commit-graph.c:1971
-#, c-format
-msgid "failed to parse commit %s from commit-graph"
-msgstr "подаване „%s“ в гра̀фа с подаванията не може да се анализира"
-
-#: commit-graph.c:1989
-msgid "Verifying commits in commit graph"
-msgstr "Проверка на подаванията в гра̀фа"
-
-#: commit-graph.c:2003
-#, c-format
-msgid "failed to parse commit %s from object database for commit-graph"
-msgstr ""
-"подаване „%s“ в базата от данни към гра̀фа с подаванията не може да се "
-"анализира"
-
-#: commit-graph.c:2010
-#, c-format
-msgid "root tree OID for commit %s in commit-graph is %s != %s"
-msgstr ""
-"идентификаторът на обект за кореновото дърво за подаване „%s“ в гра̀фа с "
-"подаванията е „%s“, а трябва да е „%s“"
-
-#: commit-graph.c:2020
-#, c-format
-msgid "commit-graph parent list for commit %s is too long"
-msgstr "списъкът с родители на „%s“ в гра̀фа с подаванията е прекалено дълъг"
-
-#: commit-graph.c:2029
-#, c-format
-msgid "commit-graph parent for %s is %s != %s"
-msgstr "родителят на „%s“ в гра̀фа с подаванията е „%s“, а трябва да е „%s“"
-
-#: commit-graph.c:2042
-#, c-format
-msgid "commit-graph parent list for commit %s terminates early"
-msgstr "списъкът с родители на „%s“ в гра̀фа с подаванията е прекалено къс"
-
-#: commit-graph.c:2047
-#, c-format
-msgid ""
-"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
-msgstr ""
-"номерът на поколението на подаване „%s“ в гра̀фа с подаванията е 0, а другаде "
-"не е"
-
-#: commit-graph.c:2051
-#, c-format
-msgid ""
-"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
-msgstr ""
-"номерът на поколението на подаване „%s“ в гра̀фа с подаванията не е 0, а "
-"другаде е"
-
-#: commit-graph.c:2066
-#, c-format
-msgid "commit-graph generation for commit %s is %u != %u"
-msgstr ""
-"номерът на поколението на подаване „%s“ в гра̀фа с подаванията е %u, а "
-"другаде е %u"
-
-#: commit-graph.c:2072
-#, c-format
-msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
-msgstr ""
-"датата на подаване на „%s“ в гра̀фа с подаванията е %<PRIuMAX>, а трябва да е "
-"%<PRIuMAX>"
-
#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "паметта свърши"
-#: config.c:124
+#: config.c:126
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2562,162 +2667,206 @@
" %s\n"
"Това може да се дължи на зацикляне при вмъкването."
-#: config.c:140
+#: config.c:142
#, c-format
msgid "could not expand include path '%s'"
msgstr "пътят за вмъкване „%s“не може да бъде разширен"
-#: config.c:151
+#: config.c:153
msgid "relative config includes must come from files"
msgstr "относителните вмъквания на конфигурации трябва да идват от файлове"
-#: config.c:197
+#: config.c:199
msgid "relative config include conditionals must come from files"
msgstr "относителните условни изрази за вмъкване трябва да идват от файлове"
-#: config.c:376
+#: config.c:396
+#, c-format
+msgid "invalid config format: %s"
+msgstr "неправилен формат на настройка: %s"
+
+#: config.c:400
+#, c-format
+msgid "missing environment variable name for configuration '%.*s'"
+msgstr "липсва име на променлива на средата за настройката „%.*s“"
+
+#: config.c:405
+#, c-format
+msgid "missing environment variable '%s' for configuration '%.*s'"
+msgstr "липсва променлива на средата „%s“ за настройката „%.*s“"
+
+#: config.c:442
#, c-format
msgid "key does not contain a section: %s"
msgstr "ключът не съдържа раздел: „%s“"
-#: config.c:382
+#: config.c:448
#, c-format
msgid "key does not contain variable name: %s"
msgstr "ключът не съдържа име на променлива: „%s“"
-#: config.c:406 sequencer.c:2444
+#: config.c:472 sequencer.c:2588
#, c-format
msgid "invalid key: %s"
msgstr "неправилен ключ: „%s“"
-#: config.c:412
+#: config.c:478
#, c-format
msgid "invalid key (newline): %s"
msgstr "неправилен ключ (нов ред): „%s“"
-#: config.c:448 config.c:460
+#: config.c:511
+msgid "empty config key"
+msgstr "празен ключ за настройка"
+
+#: config.c:529 config.c:541
#, c-format
msgid "bogus config parameter: %s"
msgstr "неправилен конфигурационен параметър: „%s“"
-#: config.c:495
+#: config.c:555 config.c:572 config.c:579 config.c:588
#, c-format
msgid "bogus format in %s"
msgstr "неправилен формат в „%s“"
-#: config.c:821
+#: config.c:622
+#, c-format
+msgid "bogus count in %s"
+msgstr "неправилен брой в „%s“"
+
+#: config.c:626
+#, c-format
+msgid "too many entries in %s"
+msgstr "прекалено много записи в „%s“"
+
+#: config.c:636
+#, c-format
+msgid "missing config key %s"
+msgstr "ключът за настройка „%s“ липсва"
+
+#: config.c:644
+#, c-format
+msgid "missing config value %s"
+msgstr "стойността за настройка „%s“ липсва"
+
+#: config.c:995
#, c-format
msgid "bad config line %d in blob %s"
msgstr "неправилен ред за настройки %d в BLOB „%s“"
-#: config.c:825
+#: config.c:999
#, c-format
msgid "bad config line %d in file %s"
msgstr "неправилен ред за настройки %d във файла „%s“"
-#: config.c:829
+#: config.c:1003
#, c-format
msgid "bad config line %d in standard input"
msgstr "неправилен ред за настройки %d на стандартния вход"
-#: config.c:833
+#: config.c:1007
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "неправилен ред за настройки %d в BLOB за подмодул „%s“"
-#: config.c:837
+#: config.c:1011
#, c-format
msgid "bad config line %d in command line %s"
msgstr "неправилен ред за настройки %d на командния ред „%s“"
-#: config.c:841
+#: config.c:1015
#, c-format
msgid "bad config line %d in %s"
msgstr "неправилен ред за настройки %d в „%s“"
-#: config.c:978
+#: config.c:1152
msgid "out of range"
msgstr "извън диапазона"
-#: config.c:978
+#: config.c:1152
msgid "invalid unit"
msgstr "неправилна мерна единица"
-#: config.c:979
+#: config.c:1153
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "неправилна числова стойност „%s“ за „%s“: %s"
-#: config.c:998
+#: config.c:1163
#, 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:1166
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ във файла „%s“: %s"
-#: config.c:1004
+#: config.c:1169
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ на стандартния вход: %s"
-#: config.c:1007
+#: config.c:1172
#, 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:1175
#, 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:1178
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "неправилна числова стойност „%s“ за „%s“ в %s: %s"
-#: config.c:1108
+#: config.c:1194
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr "неправилна булева стойност „%s“ за „%s“"
+
+#: config.c:1289
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "домашната папка на потребителя не може да бъде открита: „%s“"
-#: config.c:1117
+#: config.c:1298
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "„%s“ не е правилна стойност за време за „%s“"
-#: config.c:1208
+#: config.c:1391
#, c-format
msgid "abbrev length out of range: %d"
msgstr "дължината на съкращаване е извън интервала ([4; 40]): %d"
-#: config.c:1222 config.c:1233
+#: config.c:1405 config.c:1416
#, c-format
msgid "bad zlib compression level %d"
msgstr "неправилно ниво на компресиране: %d"
-#: config.c:1325
+#: config.c:1508
msgid "core.commentChar should only be one character"
msgstr "настройката „core.commentChar“ трябва да е само един знак"
-#: config.c:1358
+#: config.c:1541
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "неправилен режим за създаването на обекти: %s"
-#: config.c:1430
+#: config.c:1613
#, c-format
msgid "malformed value for %s"
msgstr "неправилна стойност за „%s“"
-#: config.c:1456
+#: config.c:1639
#, c-format
msgid "malformed value for %s: %s"
msgstr "неправилна стойност за „%s“: „%s“"
-#: config.c:1457
+#: config.c:1640
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
"трябва да е една от следните стойности: „nothing“ (без изтласкване при липса "
@@ -2725,132 +2874,132 @@
"„simple“ (клонът със същото име, от който се издърпва), „upstream“ (клонът, "
"от който се издърпва) или „current“ (клонът със същото име)"
-#: config.c:1518 builtin/pack-objects.c:3541
+#: config.c:1701 builtin/pack-objects.c:3666
#, c-format
msgid "bad pack compression level %d"
msgstr "неправилно ниво на компресиране при пакетиране: %d"
-#: config.c:1639
+#: config.c:1823
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "обектът-BLOB „%s“ с конфигурации не може да се зареди"
-#: config.c:1642
+#: config.c:1826
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "указателят „%s“ не сочи към обект-BLOB"
-#: config.c:1659
+#: config.c:1843
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "обектът-BLOB „%s“ с конфигурации не може да бъде открит"
-#: config.c:1689
+#: config.c:1873
#, c-format
msgid "failed to parse %s"
msgstr "„%s“ не може да бъде анализиран"
-#: config.c:1743
+#: config.c:1927
msgid "unable to parse command-line config"
msgstr "неправилни настройки от командния ред"
-#: config.c:2097
+#: config.c:2290
msgid "unknown error occurred while reading the configuration files"
msgstr "неочаквана грешка при изчитането на конфигурационните файлове"
-#: config.c:2267
+#: config.c:2464
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Неправилен %s: „%s“"
-#: config.c:2312
+#: config.c:2509
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
"стойността на „splitIndex.maxPercentChange“ трябва да е между 1 и 100, а не "
"%d"
-#: config.c:2358
+#: config.c:2555
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "неразпозната стойност „%s“ от командния ред"
-#: config.c:2360
+#: config.c:2557
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "неправилна настройка „%s“ във файла „%s“ на ред №%d"
-#: config.c:2441
+#: config.c:2641
#, c-format
msgid "invalid section name '%s'"
msgstr "неправилно име на раздел: „%s“"
-#: config.c:2473
+#: config.c:2673
#, c-format
msgid "%s has multiple values"
msgstr "зададени са няколко стойности за „%s“"
-#: config.c:2502
+#: config.c:2702
#, c-format
msgid "failed to write new configuration file %s"
msgstr "новият конфигурационен файл „%s“ не може да бъде запазен"
-#: config.c:2754 config.c:3078
+#: config.c:2954 config.c:3280
#, c-format
msgid "could not lock config file %s"
msgstr "конфигурационният файл „%s“ не може да бъде заключен"
-#: config.c:2765
+#: config.c:2965
#, c-format
msgid "opening %s"
msgstr "отваряне на „%s“"
-#: config.c:2800 builtin/config.c:344
+#: config.c:3002 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "неправилен шаблон: %s"
-#: config.c:2825
+#: config.c:3027
#, c-format
msgid "invalid config file %s"
msgstr "неправилен конфигурационен файл: „%s“"
-#: config.c:2838 config.c:3091
+#: config.c:3040 config.c:3293
#, c-format
msgid "fstat on %s failed"
msgstr "неуспешно изпълнение на „fstat“ върху „%s“"
-#: config.c:2849
+#: config.c:3051
#, c-format
msgid "unable to mmap '%s'"
msgstr "неуспешно изпълнение на „mmap“ върху „%s“"
-#: config.c:2858 config.c:3096
+#: config.c:3060 config.c:3298
#, c-format
msgid "chmod on %s failed"
msgstr "неуспешна смяна на права с „chmod“ върху „%s“"
-#: config.c:2943 config.c:3193
+#: config.c:3145 config.c:3395
#, c-format
msgid "could not write config file %s"
msgstr "конфигурационният файл „%s“ не може да бъде записан"
-#: config.c:2977
+#: config.c:3179
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "„%s“ не може да се зададе да е „%s“"
-#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
+#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
#, c-format
msgid "could not unset '%s'"
msgstr "„%s“ не може да се премахне"
-#: config.c:3069
+#: config.c:3271
#, c-format
msgid "invalid section name: %s"
msgstr "неправилно име на раздел: %s"
-#: config.c:3236
+#: config.c:3438
#, c-format
msgid "missing value for '%s'"
msgstr "липсва стойност за „%s“"
@@ -2876,73 +3025,82 @@
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:497
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr "сървърът указа непознат формат на обект: „%s“"
+
+#: connect.c:526
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "неправилен отговор на „ls-refs“: „%s“"
-#: connect.c:445
+#: connect.c:530
msgid "expected flush after ref listing"
-msgstr "очакваше се изчистване на буферите след изброяването на указателите"
+msgstr "след изброяването на указателите се очаква изчистване на буферите"
-#: connect.c:544
+#: connect.c:533
+msgid "expected response end packet after ref listing"
+msgstr "след изброяването на указателите се очаква пакет за край"
+
+#: connect.c:666
#, c-format
msgid "protocol '%s' is not supported"
msgstr "протокол „%s“ не се поддържа"
-#: connect.c:595
+#: connect.c:717
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "неуспешно задаване на „SO_KEEPALIVE“ на гнездо"
-#: connect.c:635 connect.c:698
+#: connect.c:757 connect.c:820
#, c-format
msgid "Looking up %s ... "
msgstr "Търсене на „%s“… "
-#: connect.c:639
+#: connect.c:761
#, 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:765 connect.c:836
#, c-format
msgid ""
"done.\n"
@@ -2951,7 +3109,7 @@
"готово.\n"
"Свързване към „%s“ (порт %s)…"
-#: connect.c:665 connect.c:742
+#: connect.c:787 connect.c:864
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -2961,77 +3119,83 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:671 connect.c:748
+#: connect.c:793 connect.c:870
msgid "done."
msgstr "действието завърши."
-#: connect.c:702
+#: connect.c:824
#, c-format
msgid "unable to look up %s (%s)"
msgstr "„%s“ не може да се открие (%s)"
-#: connect.c:708
+#: connect.c:830
#, c-format
msgid "unknown port %s"
msgstr "непознат порт „%s“"
-#: connect.c:845 connect.c:1175
+#: connect.c:967 connect.c:1299
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "необичайното име на хост „%s“ е блокирано"
-#: connect.c:847
+#: connect.c:969
#, c-format
msgid "strange port '%s' blocked"
msgstr "необичайният порт „%s“ е блокиран"
-#: connect.c:857
+#: connect.c:979
#, c-format
msgid "cannot start proxy %s"
msgstr "посредникът „%s“ не може да се стартира"
-#: connect.c:928
+#: connect.c:1050
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
"не е указан път. Проверете синтаксиса с командата:\n"
"\n"
" git help pull"
-#: connect.c:1123
+#: connect.c:1190
+msgid "newline is forbidden in git:// hosts and repo paths"
+msgstr ""
+"знакът за нов ред не е позволен в адресите и в пътищата до хранилищата "
+"„git://“"
+
+#: connect.c:1247
msgid "ssh variant 'simple' does not support -4"
msgstr "вариантът за „ssh“ — „simple“ (опростен), не поддържа опцията „-4“"
-#: connect.c:1135
+#: connect.c:1259
msgid "ssh variant 'simple' does not support -6"
msgstr "вариантът за „ssh“ — „simple“ (опростен), не поддържа опцията „-6“"
-#: connect.c:1152
+#: connect.c:1276
msgid "ssh variant 'simple' does not support setting port"
msgstr ""
"вариантът за „ssh“ — „simple“ (опростен), не поддържа задаването на порт"
-#: connect.c:1264
+#: connect.c:1388
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "необичайният път „%s“ е блокиран"
-#: connect.c:1311
+#: connect.c:1436
msgid "unable to fork"
msgstr "неуспешно създаване на процес"
-#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43
+#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45
msgid "Checking connectivity"
msgstr "Проверка на свързаността"
-#: connected.c:110
+#: connected.c:120
msgid "Could not run 'git rev-list'"
msgstr "Командата „git rev-list“ не може да бъде изпълнена."
-#: connected.c:130
+#: connected.c:144
msgid "failed write to rev-list"
msgstr "неуспешен запис на списъка с версиите"
-#: connected.c:137
+#: connected.c:149
msgid "failed to close rev-list's stdin"
msgstr "стандартният вход на списъка с версиите не може да бъде затворен"
@@ -3115,40 +3279,40 @@
msgid "encoding '%s' from %s to %s and back is not the same"
msgstr "Прекодирането на „%s“ от „%s“ към „%s“ и обратно променя файла"
-#: convert.c:668
+#: convert.c:665
#, c-format
msgid "cannot fork to run external filter '%s'"
msgstr "неуспешно създаване на процес за външен филтър „%s“"
-#: convert.c:688
+#: convert.c:685
#, c-format
msgid "cannot feed the input to external filter '%s'"
msgstr "входът не може да бъде подаден на външния филтър „%s“"
-#: convert.c:695
+#: convert.c:692
#, c-format
msgid "external filter '%s' failed %d"
msgstr "неуспешно изпълнение на външния филтър „%s“: %d"
-#: convert.c:730 convert.c:733
+#: convert.c:727 convert.c:730
#, c-format
msgid "read from external filter '%s' failed"
msgstr "неуспешно четене от външния филтър „%s“"
-#: convert.c:736 convert.c:791
+#: convert.c:733 convert.c:788
#, c-format
msgid "external filter '%s' failed"
msgstr "неуспешно изпълнение на външния филтър „%s“"
-#: convert.c:839
+#: convert.c:837
msgid "unexpected filter type"
msgstr "неочакван вид филтър"
-#: convert.c:850
+#: convert.c:848
msgid "path name too long for external filter"
msgstr "пътят е прекалено дълъг за външен филтър"
-#: convert.c:924
+#: convert.c:940
#, c-format
msgid ""
"external filter '%s' is not available anymore although not all paths have "
@@ -3157,20 +3321,49 @@
"външният филтър „%s“ вече не е наличен, въпреки че не всички пътища са "
"филтрирани"
-#: convert.c:1223
+#: convert.c:1240
msgid "true/false are no valid working-tree-encodings"
-msgstr "„true“/„false“ не може да са кодирания на работното дърво"
+msgstr ""
+"„true“/„false“ (истина/лъжа̀) не може да са кодирания на работното дърво"
-#: convert.c:1411 convert.c:1445
+#: convert.c:1428 convert.c:1462
#, c-format
msgid "%s: clean filter '%s' failed"
msgstr "%s: неуспешно изпълнение на декодиращ филтър „%s“"
-#: convert.c:1489
+#: convert.c:1508
#, c-format
msgid "%s: smudge filter %s failed"
msgstr "%s: неуспешно изпълнение на кодиращ филтър „%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 "адресът съдържа нов ред в частта за %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 "в бъдещето"
@@ -3265,14 +3458,30 @@
msgid "Marked %d islands, done.\n"
msgstr "Отбелязани са %d групи, работата приключи.\n"
-#: diffcore-order.c:24
+#: diff-merges.c:70
#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "файлът с подредбата на съответствията „%s“ не може да бъде прочетен"
+msgid "unknown value for --diff-merges: %s"
+msgstr "непозната стойност за опцията „--diff-merges“: „%s“"
-#: diffcore-rename.c:543
-msgid "Performing inexact rename detection"
-msgstr "Търсене на преименувания на обекти съчетани с промени"
+#: diff-lib.c:534
+msgid "--merge-base does not work with ranges"
+msgstr "опцията „--merge-base“ не работи с диапазони"
+
+#: diff-lib.c:536
+msgid "--merge-base only works with commits"
+msgstr "опцията „--merge-base“ работи само с подавания"
+
+#: diff-lib.c:553
+msgid "unable to get HEAD"
+msgstr "Указателят „HEAD“ не може да бъде получен"
+
+#: diff-lib.c:560
+msgid "no merge base found"
+msgstr "липсва база за сливане"
+
+#: diff-lib.c:562
+msgid "multiple merge bases found"
+msgstr "много бази за сливане"
#: diff-no-index.c:238
msgid "git diff --no-index [<options>] <path> <path>"
@@ -3286,19 +3495,19 @@
"Не е хранилище на 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'"
@@ -3307,7 +3516,7 @@
"„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', "
@@ -3320,7 +3529,7 @@
"„allow-indentation-change“ (позволяване на промените в празните знаци за "
"форматиране)"
-#: diff.c:332
+#: diff.c:333
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
@@ -3328,12 +3537,12 @@
"„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"
@@ -3342,38 +3551,38 @@
"Грешки в настройката „diff.dirstat“:\n"
"%s"
-#: diff.c:4202
+#: diff.c:4276
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
"външната програма за разлики завърши неуспешно. Спиране на работата при „%s“"
-#: diff.c:4547
+#: diff.c:4628
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
"Опциите „--name-only“, „--name-status“, „--check“ и „-s“ са несъвместими "
"една с друга"
-#: diff.c:4550
+#: diff.c:4631
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "Опциите „-G“, „-S“ и „--find-object“ са несъвместими една с друга"
-#: diff.c:4628
+#: diff.c:4710
msgid "--follow requires exactly one pathspec"
msgstr "Опцията „--follow“ изисква точно един път"
-#: diff.c:4676
+#: diff.c:4758
#, c-format
msgid "invalid --stat value: %s"
msgstr "неправилна стойност за „--stat“: %s"
-#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
-#: parse-options.c:197 parse-options.c:201
+#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306
+#: 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:4713
+#: diff.c:4795
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3382,44 +3591,44 @@
"Неразпознат параметър към опцията „--dirstat/-X“:\n"
"%s"
-#: diff.c:4798
+#: diff.c:4880
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "непознат вид промяна: „%c“ в „--diff-filter=%s“"
-#: diff.c:4822
+#: diff.c:4904
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "непозната стойност след „ws-error-highlight=%.*s“"
-#: diff.c:4836
+#: diff.c:4918
#, c-format
msgid "unable to resolve '%s'"
msgstr "„%s“ не може да се открие"
-#: diff.c:4886 diff.c:4892
+#: diff.c:4968 diff.c:4974
#, c-format
msgid "%s expects <n>/<m> form"
msgstr ""
"опцията „%s“ изисква стойности за МИНИМАЛЕН_%%_ПРОМЯНА_ЗА_ИЗТОЧНИК_/"
"МАКСИМАЛЕН_%%_ПРОМЯНА_ЗА_ЗАМЯНА от"
-#: diff.c:4904
+#: diff.c:4986
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "опцията „%s“ изисква знак, а не: „%s“"
-#: diff.c:4925
+#: diff.c:5007
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "неправилен аргумент за „--color-moved“: „%s“"
-#: diff.c:4944
+#: diff.c:5026
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "неправилен режим „%s“ за „ --color-moved-ws“"
-#: diff.c:4984
+#: diff.c:5066
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
@@ -3428,153 +3637,158 @@
"Майерс), „minimal“ (минимизиране на разликите), „patience“ (пасианс) и "
"„histogram“ (хистограмен)"
-#: diff.c:5020 diff.c:5040
+#: diff.c:5102 diff.c:5122
#, c-format
msgid "invalid argument to %s"
msgstr "неправилен аргумент към „%s“"
-#: diff.c:5178
+#: diff.c:5226
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr "неправилен регулярен израз подаден към „-I“: „%s“"
+
+#: diff.c:5275
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "неразпознат параметър към опцията „--submodule“: „%s“"
-#: diff.c:5234
+#: diff.c:5331
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "неправилен аргумент към „--word-diff“: „%s“"
-#: diff.c:5257
+#: diff.c:5367
msgid "Diff output format options"
msgstr "Формат на изхода за разликите"
-#: diff.c:5259 diff.c:5265
+#: diff.c:5369 diff.c:5375
msgid "generate patch"
msgstr "създаване на кръпки"
-#: diff.c:5262 builtin/log.c:173
+#: diff.c:5372 builtin/log.c:179
msgid "suppress diff output"
msgstr "без извеждане на разликите"
-#: diff.c:5267 diff.c:5381 diff.c:5388
+#: diff.c:5377 diff.c:5491 diff.c:5498
msgid "<n>"
msgstr "БРОЙ"
-#: diff.c:5268 diff.c:5271
+#: diff.c:5378 diff.c:5381
msgid "generate diffs with <n> lines context"
msgstr "файловете с разлики да са с контекст с такъв БРОЙ редове"
-#: diff.c:5273
+#: diff.c:5383
msgid "generate the diff in raw format"
msgstr "файловете с разлики да са в суров формат"
-#: diff.c:5276
+#: diff.c:5386
msgid "synonym for '-p --raw'"
msgstr "псевдоним на „-p --stat“"
-#: diff.c:5280
+#: diff.c:5390
msgid "synonym for '-p --stat'"
msgstr "псевдоним на „-p --stat“"
-#: diff.c:5284
+#: diff.c:5394
msgid "machine friendly --stat"
msgstr "„--stat“ във формат за четене от програма"
-#: diff.c:5287
+#: diff.c:5397
msgid "output only the last line of --stat"
msgstr "извеждане само на последния ред на „--stat“"
-#: diff.c:5289 diff.c:5297
+#: diff.c:5399 diff.c:5407
msgid "<param1,param2>..."
msgstr "ПАРАМЕТЪР_1, ПАРАМЕТЪР_2, …"
-#: diff.c:5290
+#: diff.c:5400
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr "извеждане на разпределението на промените за всяка поддиректория"
-#: diff.c:5294
+#: diff.c:5404
msgid "synonym for --dirstat=cumulative"
msgstr "псевдоним на „--dirstat=cumulative“"
-#: diff.c:5298
+#: diff.c:5408
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "псевдоним на „--dirstat=ФАЙЛОВЕ,ПАРАМЕТЪР_1,ПАРАМЕТЪР_2,…“"
-#: diff.c:5302
+#: diff.c:5412
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
"предупреждаване, ако промените водят до маркери за конфликт или грешки в "
"празните знаци"
-#: diff.c:5305
+#: diff.c:5415
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
"съкратено резюме на създадените, преименуваните и файловете с промяна на "
"режима на достъп"
-#: diff.c:5308
+#: diff.c:5418
msgid "show only names of changed files"
msgstr "извеждане само на имената на променените файлове"
-#: diff.c:5311
+#: diff.c:5421
msgid "show only names and status of changed files"
msgstr "извеждане само на имената и статистиката за променените файлове"
-#: diff.c:5313
+#: diff.c:5423
msgid "<width>[,<name-width>[,<count>]]"
msgstr "ШИРОЧИНА[,ИМЕ-ШИРОЧИНА[,БРОЙ]]"
-#: diff.c:5314
+#: diff.c:5424
msgid "generate diffstat"
msgstr "извеждане на статистика за промените"
-#: diff.c:5316 diff.c:5319 diff.c:5322
+#: diff.c:5426 diff.c:5429 diff.c:5432
msgid "<width>"
msgstr "ШИРОЧИНА"
-#: diff.c:5317
+#: diff.c:5427
msgid "generate diffstat with a given width"
msgstr "статистика с такава ШИРОЧИНА за промените"
-#: diff.c:5320
+#: diff.c:5430
msgid "generate diffstat with a given name width"
msgstr "статистика за промените с такава ШИРОЧИНА на имената"
-#: diff.c:5323
+#: diff.c:5433
msgid "generate diffstat with a given graph width"
msgstr "статистика за промените с такава ШИРОЧИНА на гра̀фа"
-#: diff.c:5325
+#: diff.c:5435
msgid "<count>"
msgstr "БРОЙ"
-#: diff.c:5326
+#: diff.c:5436
msgid "generate diffstat with limited lines"
msgstr "ограничаване на БРОя на редовете в статистиката за промените"
-#: diff.c:5329
+#: diff.c:5439
msgid "generate compact summary in diffstat"
msgstr "кратко резюме в статистиката за промените"
-#: diff.c:5332
+#: diff.c:5442
msgid "output a binary diff that can be applied"
msgstr "извеждане на двоична разлика във вид за прилагане"
-#: diff.c:5335
+#: diff.c:5445
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
"показване на пълните имена на обекти в редовете за индекса при вариантите "
"преди и след промяната"
-#: diff.c:5337
+#: diff.c:5447
msgid "show colored diff"
msgstr "разлики в цвят"
-#: diff.c:5338
+#: diff.c:5448
msgid "<kind>"
msgstr "ВИД"
-#: diff.c:5339
+#: diff.c:5449
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
@@ -3582,7 +3796,7 @@
"грешките в празните знаци да се указват в редовете за контекста, вариантите "
"преди и след разликата,"
-#: diff.c:5342
+#: diff.c:5452
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3590,257 +3804,261 @@
"без преименуване на пътищата. Да се използват нулеви байтове за разделители "
"на полета в изхода при ползване на опцията „--raw“ или „--numstat“"
-#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457
+#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570
msgid "<prefix>"
msgstr "ПРЕФИКС"
-#: diff.c:5346
+#: diff.c:5456
msgid "show the given source prefix instead of \"a/\""
msgstr "префикс вместо „a/“ за източник"
-#: diff.c:5349
+#: diff.c:5459
msgid "show the given destination prefix instead of \"b/\""
msgstr "префикс вместо „b/“ за цел"
-#: diff.c:5352
+#: diff.c:5462
msgid "prepend an additional prefix to every line of output"
msgstr "добавяне на допълнителен префикс за всеки ред на изхода"
-#: diff.c:5355
+#: diff.c:5465
msgid "do not show any source or destination prefix"
msgstr "без префикс за източника и целта"
-#: diff.c:5358
+#: diff.c:5468
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
"извеждане на контекст между последователните парчета с разлики от указания "
"БРОЙ редове"
-#: diff.c:5362 diff.c:5367 diff.c:5372
+#: diff.c:5472 diff.c:5477 diff.c:5482
msgid "<char>"
msgstr "ЗНАК"
-#: diff.c:5363
+#: diff.c:5473
msgid "specify the character to indicate a new line instead of '+'"
msgstr "знак вместо „+“ за нов вариант на ред"
-#: diff.c:5368
+#: diff.c:5478
msgid "specify the character to indicate an old line instead of '-'"
msgstr "знак вместо „-“ за стар вариант на ред"
-#: diff.c:5373
+#: diff.c:5483
msgid "specify the character to indicate a context instead of ' '"
msgstr "знак вместо „ “ за контекст"
-#: diff.c:5376
+#: diff.c:5486
msgid "Diff rename options"
msgstr "Настройки за разлики с преименуване"
-#: diff.c:5377
+#: diff.c:5487
msgid "<n>[/<m>]"
msgstr "МИНИМАЛЕН_%_ПРОМЯНА_ЗА_ИЗТОЧНИК[/МАКСИМАЛEН_%_ПРОМЯНА_ЗА_ЗАМЯНА]"
-#: diff.c:5378
+#: diff.c:5488
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
"заместване на пълните промени с последователност от изтриване и създаване"
-#: diff.c:5382
+#: diff.c:5492
msgid "detect renames"
msgstr "засичане на преименуванията"
-#: diff.c:5386
+#: diff.c:5496
msgid "omit the preimage for deletes"
msgstr "без предварителен вариант при изтриване"
-#: diff.c:5389
+#: diff.c:5499
msgid "detect copies"
msgstr "засичане на копиранията"
-#: diff.c:5393
+#: diff.c:5503
msgid "use unmodified files as source to find copies"
msgstr "търсене на копирано и от непроменените файлове"
-#: diff.c:5395
+#: diff.c:5505
msgid "disable rename detection"
msgstr "без търсене на преименувания"
-#: diff.c:5398
+#: diff.c:5508
msgid "use empty blobs as rename source"
msgstr "празни обекти като източник при преименувания"
-#: diff.c:5400
+#: diff.c:5510
msgid "continue listing the history of a file beyond renames"
msgstr ""
"продължаване на извеждането на историята — без отрязването при преименувания "
"на файл"
-#: diff.c:5403
+#: diff.c:5513
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr ""
"без засичане на преименувания/копирания, ако броят им надвишава тази стойност"
-#: diff.c:5405
+#: diff.c:5515
msgid "Diff algorithm options"
msgstr "Опции към алгоритъма за разлики"
-#: diff.c:5407
+#: diff.c:5517
msgid "produce the smallest possible diff"
msgstr "търсене на възможно най-малка разлика"
-#: diff.c:5410
+#: diff.c:5520
msgid "ignore whitespace when comparing lines"
msgstr "без промени в празните знаци при сравняване на редове"
-#: diff.c:5413
+#: diff.c:5523
msgid "ignore changes in amount of whitespace"
msgstr "без промени в празните знаци"
-#: diff.c:5416
+#: diff.c:5526
msgid "ignore changes in whitespace at EOL"
msgstr "без промени в празните знаци в края на редовете"
-#: diff.c:5419
+#: diff.c:5529
msgid "ignore carrier-return at the end of line"
msgstr "без промени в знаците за край на ред"
-#: diff.c:5422
+#: diff.c:5532
msgid "ignore changes whose lines are all blank"
msgstr "без промени в редовете, които са изцяло от празни знаци"
-#: diff.c:5425
+#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604
+msgid "<regex>"
+msgstr "РЕГУЛЯРЕН_ИЗРАЗ"
+
+#: diff.c:5535
+msgid "ignore changes whose all lines match <regex>"
+msgstr "без промени в редовете, които напасват РЕГУЛЯРНия_ИЗРАЗ"
+
+#: diff.c:5538
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
"евристика за преместване на границите на парчетата за улесняване на четенето"
-#: diff.c:5428
+#: diff.c:5541
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "разлика чрез алгоритъм за подредба като пасианс"
-#: diff.c:5432
+#: diff.c:5545
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "разлика по хистограмния алгоритъм"
-#: diff.c:5434
+#: diff.c:5547
msgid "<algorithm>"
msgstr "АЛГОРИТЪМ"
-#: diff.c:5435
+#: diff.c:5548
msgid "choose a diff algorithm"
msgstr "избор на АЛГОРИТЪМа за разлики"
-#: diff.c:5437
+#: diff.c:5550
msgid "<text>"
msgstr "ТЕКСТ"
-#: diff.c:5438
+#: diff.c:5551
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "разлика чрез алгоритъма със закотвяне"
-#: diff.c:5440 diff.c:5449 diff.c:5452
+#: diff.c:5553 diff.c:5562 diff.c:5565
msgid "<mode>"
msgstr "РЕЖИМ"
-#: diff.c:5441
+#: diff.c:5554
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
"разлика по думи, като се ползва този РЕЖИМ за отделянето на променените думи"
-#: diff.c:5443 diff.c:5446 diff.c:5491
-msgid "<regex>"
-msgstr "РЕГУЛЯРЕН_ИЗРАЗ"
-
-#: diff.c:5444
+#: diff.c:5557
msgid "use <regex> to decide what a word is"
msgstr "РЕГУЛЯРЕН_ИЗРАЗ за разделяне по думи"
-#: diff.c:5447
+#: diff.c:5560
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "псевдоним на „--word-diff=color --word-diff-regex=РЕГУЛЯРЕН_ИЗРАЗ“"
-#: diff.c:5450
+#: diff.c:5563
msgid "moved lines of code are colored differently"
msgstr "различен цвят за извеждане на преместените редове"
-#: diff.c:5453
+#: diff.c:5566
msgid "how white spaces are ignored in --color-moved"
msgstr ""
"режим за прескачането на празните знаци при задаването на „--color-moved“"
-#: diff.c:5456
+#: diff.c:5569
msgid "Other diff options"
msgstr "Други опции за разлики"
-#: diff.c:5458
+#: diff.c:5571
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
"при изпълнение от поддиректория да се пренебрегват разликите извън нея и да "
"се ползват относителни пътища"
-#: diff.c:5462
+#: diff.c:5575
msgid "treat all files as text"
msgstr "обработка на всички файлове като текстови"
-#: diff.c:5464
+#: diff.c:5577
msgid "swap two inputs, reverse the diff"
msgstr "размяна на двата входа — обръщане на разликата"
-#: diff.c:5466
+#: diff.c:5579
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr ""
"завършване с код за състояние 1 при наличието на разлики, а в противен "
"случай — с 0"
-#: diff.c:5468
+#: diff.c:5581
msgid "disable all output of the program"
msgstr "без всякакъв изход от програмата"
-#: diff.c:5470
+#: diff.c:5583
msgid "allow an external diff helper to be executed"
msgstr "позволяване на изпълнение на външна помощна програма за разлики"
-#: diff.c:5472
+#: diff.c:5585
msgid "run external text conversion filters when comparing binary files"
msgstr ""
"изпълнение на външни програми-филтри при сравнението на двоични файлове"
-#: diff.c:5474
+#: diff.c:5587
msgid "<when>"
msgstr "КОГА"
-#: diff.c:5475
+#: diff.c:5588
msgid "ignore changes to submodules in the diff generation"
msgstr "игнориране на промените в подмодулите при извеждането на разликите"
-#: diff.c:5478
+#: diff.c:5591
msgid "<format>"
msgstr "ФОРМАТ"
-#: diff.c:5479
+#: diff.c:5592
msgid "specify how differences in submodules are shown"
msgstr "начин за извеждане на промените в подмодулите"
-#: diff.c:5483
+#: diff.c:5596
msgid "hide 'git add -N' entries from the index"
msgstr "без включване в индекса на записите, добавени с „git add -N“"
-#: diff.c:5486
+#: diff.c:5599
msgid "treat 'git add -N' entries as real in the index"
msgstr "включване в индекса на записите, добавени с „git add -N“"
-#: diff.c:5488
+#: diff.c:5601
msgid "<string>"
msgstr "НИЗ"
-#: diff.c:5489
+#: diff.c:5602
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr "търсене на разлики, които променят броя на поява на указаните низове"
-#: diff.c:5492
+#: diff.c:5605
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
@@ -3848,142 +4066,168 @@
"търсене на разлики, които променят броя на поява на низовете, които напасват "
"на регулярния израз"
-#: diff.c:5495
+#: diff.c:5608
msgid "show all changes in the changeset with -S or -G"
msgstr "извеждане на всички промени с „-G“/„-S“"
-#: diff.c:5498
+#: diff.c:5611
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "НИЗът към „-S“ да се тълкува като разширен регулярен израз по POSIX"
-#: diff.c:5501
+#: diff.c:5614
msgid "control the order in which files appear in the output"
msgstr "управление на подредбата на файловете в изхода"
-#: diff.c:5502
+#: diff.c:5615 diff.c:5618
+msgid "<path>"
+msgstr "ПЪТ"
+
+#: diff.c:5616
+msgid "show the change in the specified path first"
+msgstr "първо извеждане на промяната в указания път"
+
+#: diff.c:5619
+msgid "skip the output to the specified path"
+msgstr "прескачане на изхода към указания път"
+
+#: diff.c:5621
msgid "<object-id>"
msgstr "ИДЕНТИФИКАТОР_НА_ОБЕКТ"
-#: diff.c:5503
+#: diff.c:5622
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr "търсене на разлики, които променят броя на поява на указания обект"
-#: diff.c:5505
+#: diff.c:5624
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)…[*]]"
-#: diff.c:5506
+#: diff.c:5625
msgid "select files by diff type"
msgstr "избор на файловете по вид разлика"
-#: diff.c:5508
+#: diff.c:5627
msgid "<file>"
msgstr "ФАЙЛ"
-#: diff.c:5509
+#: diff.c:5628
msgid "Output to a specific file"
msgstr "Изход към указания файл"
-#: diff.c:6164
+#: diff.c:6285
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
"търсенето на преименувания на обекти съчетани с промени се прескача поради "
"многото файлове."
-#: diff.c:6167
+#: diff.c:6288
msgid "only found copies from modified paths due to too many files."
msgstr ""
"установени са само точните копия на променените пътища поради многото "
"файлове."
-#: diff.c:6170
+#: diff.c:6291
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr "задайте променливата „%s“ да е поне %d и отново изпълнете командата."
-#: dir.c:555
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "файлът с подредбата на съответствията „%s“ не може да бъде прочетен"
+
+#: diffcore-rename.c:786
+msgid "Performing inexact rename detection"
+msgstr "Търсене на преименувания на обекти съчетани с промени"
+
+#: diffcore-rotate.c:29
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr "Няма път на име „%s“ в разликата"
+
+#: dir.c:578
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
msgstr "пътят „%s“ не съвпада с никой файл в git"
-#: dir.c:695 dir.c:724 dir.c:737
+#: dir.c:718 dir.c:747 dir.c:760
#, c-format
msgid "unrecognized pattern: '%s'"
msgstr "непознат шаблон: „%s“"
-#: dir.c:754 dir.c:768
+#: dir.c:777 dir.c:791
#, c-format
msgid "unrecognized negative pattern: '%s'"
msgstr "непознат отрицателен шаблон: „%s“"
-#: dir.c:786
+#: dir.c:809
#, c-format
msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
msgstr ""
"файлът определящ частичността на изтегленото хранилище може да има проблем: "
"шаблонът „%s“ се повтаря"
-#: dir.c:796
+#: dir.c:819
msgid "disabling cone pattern matching"
msgstr "изключване на пътеводното напасване"
-#: dir.c:1173
+#: dir.c:1198
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "„%s“ не може да се ползва за игнорираните файлове (като gitignore)"
-#: dir.c:2144
+#: dir.c:2305
#, c-format
msgid "could not open directory '%s'"
msgstr "директорията „%s“ не може да бъде отворена"
-#: dir.c:2479
+#: dir.c:2605
msgid "failed to get kernel name and information"
msgstr "името и версията на ядрото не бяха получени"
-#: dir.c:2603
+#: dir.c:2729
msgid "untracked cache is disabled on this system or location"
msgstr ""
"кешът за неследените файлове е изключен на тази система или местоположение"
-#: dir.c:3407
+#: dir.c:3534
#, c-format
msgid "index file corrupt in repo %s"
msgstr "файлът с индекса е повреден в хранилището „%s“"
-#: dir.c:3452 dir.c:3457
+#: dir.c:3579 dir.c:3584
#, c-format
msgid "could not create directories for %s"
msgstr "директориите за „%s“ не може да бъдат създадени"
-#: dir.c:3486
+#: dir.c:3613
#, 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“"
-#: environment.c:149
+#: environment.c:152
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "неправилен път към пространства от имена „%s“"
-#: environment.c:331
+#: environment.c:335
#, c-format
msgid "could not set GIT_DIR to '%s'"
msgstr "GIT_DIR не може да се зададе да е „%s“"
@@ -3993,254 +4237,276 @@
msgid "too many args to run %s"
msgstr "прекалено много аргументи за изпълнение „%s“"
-#: fetch-pack.c:150
+#: fetch-pack.c:177
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: очаква се плитък списък"
-#: fetch-pack.c:153
+#: fetch-pack.c:180
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr "git fetch-pack: след плитък списък се очаква изчистващ пакет „flush“"
-#: fetch-pack.c:164
+#: fetch-pack.c:191
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr ""
"git fetch-pack: очаква се „ACK“/„NAK“, а бе получен изчистващ пакет „flush“"
-#: fetch-pack.c:184
+#: fetch-pack.c:211
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: очаква се „ACK“/„NAK“, а бе получено „%s“"
-#: fetch-pack.c:195
+#: fetch-pack.c:222
msgid "unable to write to remote"
msgstr "невъзможно писане към отдалечено хранилище"
-#: fetch-pack.c:257
+#: fetch-pack.c:283
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "опцията „--stateless-rpc“ изисква „multi_ack_detailed“"
-#: fetch-pack.c:356 fetch-pack.c:1340
+#: fetch-pack.c:378 fetch-pack.c:1457
#, c-format
msgid "invalid shallow line: %s"
msgstr "неправилен плитък ред: „%s“"
-#: fetch-pack.c:362 fetch-pack.c:1346
+#: fetch-pack.c:384 fetch-pack.c:1463
#, c-format
msgid "invalid unshallow line: %s"
msgstr "неправилен неплитък ред: „%s“"
-#: fetch-pack.c:364 fetch-pack.c:1348
+#: fetch-pack.c:386 fetch-pack.c:1465
#, c-format
msgid "object not found: %s"
msgstr "обектът „%s“ липсва"
-#: fetch-pack.c:367 fetch-pack.c:1351
+#: fetch-pack.c:389 fetch-pack.c:1468
#, c-format
msgid "error in object: %s"
msgstr "грешка в обекта: „%s“"
-#: fetch-pack.c:369 fetch-pack.c:1353
+#: fetch-pack.c:391 fetch-pack.c:1470
#, c-format
msgid "no shallow found: %s"
msgstr "не е открит плитък обект: %s"
-#: fetch-pack.c:372 fetch-pack.c:1357
+#: fetch-pack.c:394 fetch-pack.c:1474
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "очаква се плитък или не обект, а бе получено: „%s“"
-#: fetch-pack.c:414
+#: fetch-pack.c:434
#, c-format
msgid "got %s %d %s"
msgstr "получено бе %s %d %s"
-#: fetch-pack.c:431
+#: fetch-pack.c:451
#, c-format
msgid "invalid commit %s"
msgstr "неправилно подаване: „%s“"
-#: fetch-pack.c:462
+#: fetch-pack.c:482
msgid "giving up"
msgstr "преустановяване"
-#: fetch-pack.c:475 progress.c:323
+#: fetch-pack.c:495 progress.c:339
msgid "done"
msgstr "действието завърши"
-#: fetch-pack.c:487
+#: fetch-pack.c:507
#, c-format
msgid "got %s (%d) %s"
msgstr "получено бе %s (%d) %s"
-#: fetch-pack.c:533
+#: fetch-pack.c:543
#, c-format
msgid "Marking %s as complete"
msgstr "Отбелязване на „%s“ като пълно"
-#: fetch-pack.c:754
+#: fetch-pack.c:758
#, c-format
msgid "already have %s (%s)"
msgstr "вече има „%s“ (%s)"
-#: fetch-pack.c:818
+#: fetch-pack.c:844
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: не може да се създаде процес за демултиплексора"
-#: fetch-pack.c:826
+#: fetch-pack.c:852
msgid "protocol error: bad pack header"
msgstr "протоколна грешка: неправилна заглавна част на пакет"
-#: fetch-pack.c:900
+#: fetch-pack.c:946
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: не може да се създаде процес за „%s“"
-#: fetch-pack.c:916
+#: fetch-pack.c:952
+msgid "fetch-pack: invalid index-pack output"
+msgstr "fetch-pack: неправилен изход от командата „index-pack“"
+
+#: fetch-pack.c:969
#, c-format
msgid "%s failed"
msgstr "неуспешно изпълнение на „%s“"
-#: fetch-pack.c:918
+#: fetch-pack.c:971
msgid "error in sideband demultiplexer"
msgstr "грешка в демултиплексора"
-#: fetch-pack.c:965
+#: fetch-pack.c:1031
#, c-format
msgid "Server version is %.*s"
msgstr "Версията на сървъра е: %.*s"
-#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985
-#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001
-#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017
-#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039
+#: fetch-pack.c:1039 fetch-pack.c:1045 fetch-pack.c:1048 fetch-pack.c:1054
+#: fetch-pack.c:1058 fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070
+#: fetch-pack.c:1074 fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086
+#: fetch-pack.c:1092 fetch-pack.c:1098 fetch-pack.c:1103 fetch-pack.c:1108
#, c-format
msgid "Server supports %s"
msgstr "Сървърът поддържа „%s“"
-#: fetch-pack.c:972
+#: fetch-pack.c:1041
msgid "Server does not support shallow clients"
msgstr "Сървърът не поддържа плитки клиенти"
-#: fetch-pack.c:1032
+#: fetch-pack.c:1101
msgid "Server does not support --shallow-since"
msgstr "Сървърът не поддържа опцията „--shallow-since“"
-#: fetch-pack.c:1037
+#: fetch-pack.c:1106
msgid "Server does not support --shallow-exclude"
msgstr "Сървърът не поддържа опцията „--shallow-exclude“"
-#: fetch-pack.c:1041
+#: fetch-pack.c:1110
msgid "Server does not support --deepen"
msgstr "Сървърът не поддържа опцията „--deepen“"
-#: fetch-pack.c:1058
+#: fetch-pack.c:1112
+msgid "Server does not support this repository's object format"
+msgstr "Сървърът не поддържа форма̀та на обектите на това хранилище"
+
+#: fetch-pack.c:1125
msgid "no common commits"
msgstr "няма общи подавания"
-#: fetch-pack.c:1070 fetch-pack.c:1536
+#: fetch-pack.c:1138 fetch-pack.c:1682
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: неуспешно доставяне."
-#: fetch-pack.c:1209
+#: fetch-pack.c:1265
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "различни алгоритми — на клиента: „%s“, на сървъра: „%s“"
+
+#: fetch-pack.c:1269
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "сървърът не поддържа алгоритъм „%s“"
+
+#: fetch-pack.c:1289
msgid "Server does not support shallow requests"
msgstr "Сървърът не поддържа плитки заявки"
-#: fetch-pack.c:1216
+#: fetch-pack.c:1296
msgid "Server supports filter"
msgstr "Сървърът поддържа филтри"
-#: fetch-pack.c:1239
+#: fetch-pack.c:1335
msgid "unable to write request to remote"
msgstr "невъзможно писане към отдалечено хранилище"
-#: fetch-pack.c:1257
+#: fetch-pack.c:1353
#, c-format
msgid "error reading section header '%s'"
msgstr "грешка при прочитане на заглавната част на раздел „%s“"
-#: fetch-pack.c:1263
+#: fetch-pack.c:1359
#, c-format
msgid "expected '%s', received '%s'"
msgstr "очаква се „%s“, а бе получено „%s“"
-#: fetch-pack.c:1303
+#: fetch-pack.c:1420
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "неочакван ред за потвърждение: „%s“"
-#: fetch-pack.c:1308
+#: fetch-pack.c:1425
#, c-format
msgid "error processing acks: %d"
msgstr "грешка при обработка на потвържденията: %d"
-#: fetch-pack.c:1318
+#: fetch-pack.c:1435
msgid "expected packfile to be sent after 'ready'"
msgstr ""
"очакваше се пакетният файл да бъде изпратен след отговор за готовност (ready)"
-#: fetch-pack.c:1320
+#: fetch-pack.c:1437
msgid "expected no other sections to be sent after no 'ready'"
msgstr ""
"очакваше се след липса на отговор за готовност (ready) да не се се пращат "
"други раздели"
-#: fetch-pack.c:1362
+#: fetch-pack.c:1479
#, c-format
msgid "error processing shallow info: %d"
msgstr "грешка при обработка на информация за дълбочината/плиткостта: %d"
-#: fetch-pack.c:1409
+#: fetch-pack.c:1526
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "очаква се искан указател, а бе получено: „%s“"
-#: fetch-pack.c:1414
+#: fetch-pack.c:1531
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "неочакван искан указател: „%s“"
-#: fetch-pack.c:1419
+#: fetch-pack.c:1536
#, c-format
msgid "error processing wanted refs: %d"
msgstr "грешка при обработката на исканите указатели: %d"
-#: fetch-pack.c:1762
+#: fetch-pack.c:1566
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack: очаква се пакет за край на отговора"
+
+#: fetch-pack.c:1960
msgid "no matching remote head"
msgstr "не може да бъде открит подходящ връх от отдалеченото хранилище"
-#: fetch-pack.c:1785 builtin/clone.c:689
+#: fetch-pack.c:1983 builtin/clone.c:693
msgid "remote did not send all necessary objects"
msgstr "отдалеченото хранилище не изпрати всички необходими обекти."
-#: fetch-pack.c:1812
+#: fetch-pack.c:2010
#, c-format
msgid "no such remote ref %s"
msgstr "такъв отдалечен указател няма: %s"
-#: fetch-pack.c:1815
+#: fetch-pack.c:2013
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Сървърът не позволява заявка за необявен обект „%s“"
-#: gpg-interface.c:408
-msgid "gpg failed to sign the data"
-msgstr "Програмата „gpg“ не подписа данните."
-
-#: gpg-interface.c:434
+#: gpg-interface.c:273
msgid "could not create temporary file"
msgstr "не може да се създаде временен файл"
-#: gpg-interface.c:437
+#: gpg-interface.c:276
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "Програмата не успя да запише самостоятелния подпис в „%s“"
+#: gpg-interface.c:470
+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:668
+#: grep.c:543
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
@@ -4248,18 +4514,18 @@
"зададеният шаблон съдържа нулев знак (идва от -f „ФАЙЛ“). Това се поддържа "
"в комбинация с „-P“ само при ползването на „PCRE v2“"
-#: grep.c:2128
+#: grep.c:1906
#, c-format
msgid "'%s': unable to read %s"
msgstr "„%s“: файлът сочен от „%s“ не може да бъде прочетен"
-#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82
+#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr "не може да бъде получена информация чрез „stat“ за „%s“"
-#: grep.c:2156
+#: grep.c:1934
#, c-format
msgid "'%s': short read"
msgstr "„%s“: изчитането върна по-малко байтове от очакваното"
@@ -4316,41 +4582,41 @@
msgid "Low-level Commands / Internal Helpers"
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:100
#, 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:527
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4359,36 +4625,36 @@
"Изглежда, че „%s“ е команда на git, но тя не може да\n"
"бъде изпълнена. Вероятно пакетът „git-%s“ е повреден."
-#: help.c:655
+#: help.c:543 help.c:631
+#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr "git: „%s“ не е команда на git. Погледнете изхода от „git --help“."
+
+#: help.c:591
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Странно, изглежда, че на системата ви няма нито една команда на git."
-#: help.c:677
+#: help.c:613
#, c-format
msgid "WARNING: You called a Git command named '%s', which does not exist."
msgstr ""
"ПРЕДУПРЕЖДЕНИЕ: Пробвахте да изпълните команда на Git на име „%s“, а такава "
"не съществува."
-#: help.c:682
+#: help.c:618
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
msgstr ""
"Изпълнението автоматично продължава, като се счита, че имате предвид „%s“."
-#: help.c:687
+#: help.c:623
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
msgstr ""
"Изпълнението автоматично ще продължи след %0.1f сек., като се счита, че "
"имате предвид „%s“."
-#: help.c:695
-#, c-format
-msgid "git: '%s' is not a git command. See 'git --help'."
-msgstr "git: „%s“ не е команда на git. Погледнете изхода от „git --help“."
-
-#: help.c:699
+#: help.c:635
msgid ""
"\n"
"The most similar command is"
@@ -4402,16 +4668,16 @@
"\n"
"Най-близките команди са"
-#: help.c:714
+#: help.c:675
msgid "git version [<options>]"
msgstr "git version [ОПЦИЯ…]"
-#: help.c:783
+#: help.c:730
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s — %s"
-#: help.c:787
+#: help.c:734
msgid ""
"\n"
"Did you mean this?"
@@ -4425,7 +4691,15 @@
"\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"
@@ -4452,41 +4726,84 @@
"хранилище.\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:635
+#: 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 "знак за екраниране в подфилтър: „%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 "няма достъп до частично изтегления обект-BLOB в „%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"
@@ -4502,44 +4819,7 @@
msgid "unable to load root tree for commit %s"
msgstr "кореновото дърво за подаване „%s“ не може да се зареди"
-#: list-objects-filter.c:492
-#, c-format
-msgid "unable to access sparse blob in '%s'"
-msgstr "няма достъп до частично изтегления обект-BLOB в „%s“"
-
-#: list-objects-filter.c:495
-#, c-format
-msgid "unable to parse sparse filter data in %s"
-msgstr ""
-"данните от филтъра за частични изтегляния в „%s“ не може да бъдат анализирани"
-
-#: list-objects-filter-options.c:58
-msgid "expected 'tree:<depth>'"
-msgstr "очаква се „tree:ДЪЛБОЧИНА“"
-
-#: list-objects-filter-options.c:73
-msgid "sparse:path filters support has been dropped"
-msgstr "поддръжката на филтри със „sparse:path“ е премахната"
-
-#: list-objects-filter-options.c:86
-#, c-format
-msgid "invalid filter-spec '%s'"
-msgstr "неправилен филтър: „%s“"
-
-#: list-objects-filter-options.c:102
-#, c-format
-msgid "must escape char in sub-filter-spec: '%c'"
-msgstr "знак за екраниране в подфилтър: „%c“"
-
-#: list-objects-filter-options.c:144
-msgid "expected something after combine:"
-msgstr "добавете нещо след комбинирането:"
-
-#: list-objects-filter-options.c:226
-msgid "multiple filter-specs cannot be combined"
-msgstr "не може да комбинирате множество филтри"
-
-#: lockfile.c:151
+#: lockfile.c:152
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
@@ -4558,20 +4838,269 @@
"причина е, че някой процес на 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 "кешът не може да бъде прочетен"
+#: ls-refs.c:37
+#, c-format
+msgid "invalid value '%s' for lsrefs.unborn"
+msgstr "неправилна стойност „%s“ за „lsrefs.unborn“"
-#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913
-#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810
-#: builtin/stash.c:265
-msgid "unable to write new index file"
-msgstr "неуспешно записване на новия индекс"
+#: ls-refs.c:167
+msgid "expected flush after ls-refs arguments"
+msgstr "след аргументите към „ls-refs“ се очаква изчистване на буферите"
+
+#: merge-ort.c:888 merge-recursive.c:1191
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr "Неуспешно сливане на подмодула „%s“ (не е изтеглен)"
+
+#: merge-ort.c:897 merge-recursive.c:1198
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr "Неуспешно сливане на подмодула „%s“ (няма подавания)"
+
+#: merge-ort.c:906 merge-recursive.c:1205
+#, c-format
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
+msgstr ""
+"Подмодулът „%s“ не може да бъде слят (базата за сливане не предшества "
+"подаванията)"
+
+#: merge-ort.c:916 merge-ort.c:923
+#, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr "Бележка: Превъртане на подмодула „%s“ към „%s“"
+
+#: merge-ort.c:944
+#, c-format
+msgid "Failed to merge submodule %s"
+msgstr "Неуспешно сливане на подмодула „%s“"
+
+#: merge-ort.c:951
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but a possible merge resolution exists:\n"
+"%s\n"
+msgstr ""
+"Неуспешно сливане на подмодула „%s“, но е открито възможно решение:\n"
+"%s\n"
+
+#: merge-ort.c:955 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-ort.c:968
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but multiple possible merges exist:\n"
+"%s"
+msgstr ""
+"Неуспешно сливане на подмодула „%s“, но са открити множество решения:\n"
+"%s"
+
+#: merge-ort.c:1127 merge-recursive.c:1341
+msgid "Failed to execute internal merge"
+msgstr "Неуспешно вътрешно сливане"
+
+#: merge-ort.c:1132 merge-recursive.c:1346
+#, c-format
+msgid "Unable to add %s to database"
+msgstr "„%s“ не може да се добави в базата с данни"
+
+#: merge-ort.c:1139 merge-recursive.c:1378
+#, c-format
+msgid "Auto-merging %s"
+msgstr "Автоматично сливане на „%s“"
+
+#: merge-ort.c:1278 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-ort.c:1288 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-ort.c:1471
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
+"renamed to multiple other directories, with no destination getting a "
+"majority of the files."
+msgstr ""
+"КОНФЛИКТ (раздвояване при преименуване на директория): Не е ясно как и къде "
+"да се преименува „%s“, защото е преместен в няколко нови директории, без "
+"никоя от тях да е по-честа цел."
+
+#: merge-ort.c:1637 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-ort.c:1781 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-ort.c:1788 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 ""
+"Обновен път: „%s“ е преименуван на „%s“ в „%s“ в директория, която е "
+"преименувана в „%s“. Обектът се мести в „%s“."
+
+#: merge-ort.c:1801 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-ort.c:1809 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 ""
+"КОНФЛИКТ (места на файлове): „%s“ е преименуван на „%s“ в „%s“ в директория, "
+"която е преименувана в „%s“. Предложението е да преместите обекта в „%s“."
+
+#: merge-ort.c:1952
+#, c-format
+msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
+msgstr ""
+"КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон „%s“ "
+"и на „%s“ в „%s“."
+
+#: merge-ort.c:2047
+#, c-format
+msgid ""
+"CONFLICT (rename involved in collision): rename of %s -> %s has content "
+"conflicts AND collides with another path; this may result in nested conflict "
+"markers."
+msgstr ""
+"КОНФЛИКТ (има и преименуване в промените): „%s“ е преименуван на „%s“, но "
+"има и промени в съдържанието, а и има съвпадение на пътя. Може да се "
+"получат вложени маркери за конфликт."
+
+#: merge-ort.c:2066 merge-ort.c:2090
+#, c-format
+msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
+msgstr ""
+"КОНФЛИКТ (преименуване/добавяне): „%s“ е преименуван на „%s“ в клон „%s“, а "
+"е изтрит в „%s“."
+
+#: merge-ort.c:2735
+#, c-format
+msgid ""
+"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
+"%s instead."
+msgstr ""
+"КОНФЛИКТ (файл/директория): директория на мястото на „%s“ от „%s“, вместо "
+"това се извършва преместване в „%s“."
+
+#: merge-ort.c:2808
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed %s "
+"of them so each can be recorded somewhere."
+msgstr ""
+"КОНФЛИКТ (различни обекти): „%s“ е различен вид обект в двата варианта, "
+"затова се извършва преименуване на %s, за да може и двата варианта да са "
+"отразени."
+
+#: merge-ort.c:2812
+msgid "both"
+msgstr "двата"
+
+#: merge-ort.c:2812
+msgid "one"
+msgstr "единия"
+
+#: merge-ort.c:2907 merge-recursive.c:3052
+msgid "content"
+msgstr "съдържание"
+
+#: merge-ort.c:2909 merge-recursive.c:3056
+msgid "add/add"
+msgstr "добавяне/добавяне"
+
+#: merge-ort.c:2911 merge-recursive.c:3101
+msgid "submodule"
+msgstr "ПОДМОДУЛ"
+
+#: merge-ort.c:2913 merge-recursive.c:3102
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "КОНФЛИКТ (%s): Конфликт при сливане на „%s“"
+
+#: merge-ort.c:2938
+#, c-format
+msgid ""
+"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
+"of %s left in tree."
+msgstr ""
+"КОНФЛИКТ (промяна/изтриване): „%s“ е изтрит в %s, а е променен в %s. Версия "
+"%s на „%s“ е оставена в дървото."
+
+#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
+#. base, and 2-3) the trees for the two trees we're merging.
+#.
+#: merge-ort.c:3406
+#, c-format
+msgid "collecting merge info failed for trees %s, %s, %s"
+msgstr "неуспешно събиране на информацията за сливането на „%s“, „%s“ и „%s“"
+
+#: merge-ort-wrappers.c:13 merge-recursive.c:3661
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+" %s"
+msgstr ""
+"Сливането ще презапише локалните промени на тези файлове:\n"
+" %s"
+
+#: merge-ort-wrappers.c:33 merge-recursive.c:3436
+#, c-format
+msgid "Already up to date!"
+msgstr "Вече е обновено!"
#: merge-recursive.c:356
msgid "(bad commit)\n"
@@ -4637,23 +5166,6 @@
msgstr ""
"не е ясно какво да се прави с обекта „%2$s“ (%3$s) с права за достъп „%1$06o“"
-#: 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:"
@@ -4682,41 +5194,11 @@
"Открито е сливане, което може да решава проблема със сливането на "
"подмодула:\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."
@@ -4766,7 +5248,7 @@
msgid "renamed"
msgstr "преименуван"
-#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117
+#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "Преустановяване на действието, за да не се изгуби промененият „%s“"
@@ -4809,14 +5291,14 @@
msgid " (left unresolved)"
msgstr " (некоригиран конфликт)"
-#: merge-recursive.c:1793
+#: 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:2056
+#: merge-recursive.c:2068
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -4827,26 +5309,7 @@
"постави „%s“, защото няколко нови директории поделят съдържанието на "
"директория „%s“, като никоя не съдържа мнозинство от файловете ѝ."
-#: merge-recursive.c:2088
-#, c-format
-msgid ""
-"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
-"implicit directory rename(s) putting the following path(s) there: %s."
-msgstr ""
-"КОНФЛИКТ (косвено преименуване на директория): следният файл или директория "
-"„%s“ не позволяват косвеното преименуване на следния път/ища: %s."
-
-#: merge-recursive.c:2098
-#, c-format
-msgid ""
-"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
-"implicit directory renames tried to put these paths there: %s"
-msgstr ""
-"КОНФЛИКТ (косвено преименуване на директория): повече от един път "
-"съответства на „%s“. Косвено преименуване на директория води до поставянето "
-"на тези пътища там: %s."
-
-#: merge-recursive.c:2190
+#: merge-recursive.c:2202
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -4855,277 +5318,207 @@
"КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон "
"„%s“, а „%s“ е преименуван на „%s“ в „%s“"
-#: merge-recursive.c:2435
-#, c-format
-msgid ""
-"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
-"renamed."
-msgstr ""
-"ПРЕДУПРЕЖДЕНИЕ: прескачане на преименуването на „%s“ на „%s“ в „%s“, защото "
-"„%s“ също е с променено име."
-
-#: merge-recursive.c:2961
+#: merge-recursive.c:2973
#, c-format
msgid "cannot read object %s"
msgstr "обектът „%s“ не може да се прочете"
-#: merge-recursive.c:2964
+#: merge-recursive.c:2976
#, c-format
msgid "object %s is not a blob"
msgstr "обектът „%s“ не е BLOB"
-#: merge-recursive.c:3028
+#: merge-recursive.c:3040
msgid "modify"
msgstr "промяна"
-#: merge-recursive.c:3028
+#: merge-recursive.c:3040
msgid "modified"
msgstr "променен"
-#: merge-recursive.c:3040
-msgid "content"
-msgstr "съдържание"
-
-#: merge-recursive.c:3044
-msgid "add/add"
-msgstr "добавяне/добавяне"
-
-#: merge-recursive.c:3067
+#: merge-recursive.c:3079
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Прескачане на „%s“ (слетият резултат е идентичен със сегашния)"
-#: merge-recursive.c:3089 git-submodule.sh:1003
-msgid "submodule"
-msgstr "ПОДМОДУЛ"
-
-#: merge-recursive.c:3090
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "КОНФЛИКТ (%s): Конфликт при сливане на „%s“"
-
-#: merge-recursive.c:3120
+#: merge-recursive.c:3132
#, c-format
msgid "Adding as %s instead"
msgstr "Добавяне като „%s“"
-#: merge-recursive.c:3203
-#, c-format
-msgid ""
-"Path updated: %s added in %s inside a directory that was renamed in %s; "
-"moving it to %s."
-msgstr ""
-"Обновен път: „%s“ е добавен в „%s“ в директория, която е преименувана в "
-"„%s“. Обектът се мести в „%s“."
-
-#: merge-recursive.c:3206
-#, c-format
-msgid ""
-"CONFLICT (file location): %s added in %s inside a directory that was renamed "
-"in %s, suggesting it should perhaps be moved to %s."
-msgstr ""
-"КОНФЛИКТ (места на файлове): „%s“ е добавен в „%s“ в директория, която е "
-"преименувана в „%s“. Предложението е да преместите обекта в „%s“."
-
-#: merge-recursive.c:3210
-#, c-format
-msgid ""
-"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
-"%s; moving it to %s."
-msgstr ""
-"Обновен път: „%s“ е преименуван на „%s“ в „%s“ в директория, която е "
-"преименувана в „%s“. Обектът се мести в „%s“."
-
-#: merge-recursive.c:3213
-#, c-format
-msgid ""
-"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
-"was renamed in %s, suggesting it should perhaps be moved to %s."
-msgstr ""
-"КОНФЛИКТ (места на файлове): „%s“ е преименуван на „%s“ в „%s“ в директория, "
-"която е преименувана в „%s“. Предложението е да преместите обекта в „%s“."
-
-#: merge-recursive.c:3327
+#: merge-recursive.c:3339
#, c-format
msgid "Removing %s"
msgstr "Изтриване на „%s“"
-#: merge-recursive.c:3350
+#: merge-recursive.c:3362
msgid "file/directory"
msgstr "файл/директория"
-#: merge-recursive.c:3355
+#: merge-recursive.c:3367
msgid "directory/file"
msgstr "директория/файл"
-#: merge-recursive.c:3362
+#: 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:3371
+#: merge-recursive.c:3383
#, c-format
msgid "Adding %s"
msgstr "Добавяне на „%s“"
-#: merge-recursive.c:3380
+#: merge-recursive.c:3392
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "КОНФЛИКТ (добавяне/добавяне): Конфликт при сливане на „%s“"
-#: merge-recursive.c:3424
-msgid "Already up to date!"
-msgstr "Вече е обновено!"
-
-#: merge-recursive.c:3433
+#: merge-recursive.c:3445
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "неуспешно сливане на дърветата „%s“ и „%s“"
-#: merge-recursive.c:3537
+#: merge-recursive.c:3539
msgid "Merging:"
msgstr "Сливане:"
-#: merge-recursive.c:3550
+#: merge-recursive.c:3552
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "открит е %u общ предшественик:"
msgstr[1] "открити са %u общи предшественици:"
-#: merge-recursive.c:3600
+#: merge-recursive.c:3602
msgid "merge returned no commit"
msgstr "сливането не върна подаване"
-#: merge-recursive.c:3659
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-" %s"
-msgstr ""
-"Сливането ще презапише локалните промени на тези файлове:\n"
-" %s"
-
-#: merge-recursive.c:3756
+#: merge-recursive.c:3758
#, c-format
msgid "Could not parse object '%s'"
msgstr "Неуспешен анализ на обекта „%s“"
-#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877
+#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896
+#: builtin/stash.c:471
msgid "Unable to write index."
msgstr "Индексът не може да бъде прочетен"
-#: midx.c:68
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "кешът не може да бъде прочетен"
+
+#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917
+#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817
+#: builtin/stash.c:265
+msgid "unable to write new index file"
+msgstr "неуспешно записване на новия индекс"
+
+#: midx.c:62
+msgid "multi-pack-index OID fanout is of the wrong size"
+msgstr "неправилен размер на откъс (OID fanout) на индекса за множество пакети"
+
+#: midx.c:93
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "файлът с индекса за множество пакети „%s“ е твърде малък"
-#: midx.c:84
+#: midx.c:109
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "отпечатъкът на индекса за множество пакети 0x%08x не съвпада с 0x%08x"
-#: midx.c:89
+#: midx.c:114
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "непозната версия на индекс за множество пакети — %d"
-#: midx.c:94
+#: midx.c:119
#, c-format
-msgid "hash version %u does not match"
-msgstr "версията на отпечатъка %u не съвпада"
-
-#: midx.c:108
-msgid "invalid chunk offset (too large)"
-msgstr "неправилно (прекалено голямо) отместване на откъс"
-
-#: midx.c:132
-msgid "terminating multi-pack-index chunk id appears earlier than expected"
+msgid "multi-pack-index hash version %u does not match version %u"
msgstr ""
-"идентификаторът за краен откъс на индекс за множество пакети се явява по-"
-"рано от очакваното"
+"версията на контролната сума на индекса за множество пакети %u не съвпада с "
+"%u"
-#: midx.c:145
+#: midx.c:136
msgid "multi-pack-index missing required pack-name chunk"
msgstr "липсва откъс (pack-name) от индекс за множество пакети"
-#: midx.c:147
+#: midx.c:138
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "липсва откъс (OID fanout) от индекс за множество пакети"
-#: midx.c:149
+#: midx.c:140
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "липсва откъс (OID lookup) от индекс за множество пакети"
-#: midx.c:151
+#: midx.c:142
msgid "multi-pack-index missing required object offsets chunk"
msgstr "липсва откъс за отместванията на обекти от индекс за множество пакети"
-#: midx.c:165
+#: midx.c:158
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
"неправилна подредба на имената в индекс за множество пакети: „%s“ се появи "
"преди „%s“"
-#: midx.c:210
+#: midx.c:202
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr ""
"неправилен идентификатор на пакет (pack-int-id): %u (от общо %u пакети)"
-#: midx.c:260
+#: midx.c:252
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
"индексът за множество пакети съдържа 64-битови отмествания, но размерът на "
"„off_t“ е недостатъчен"
-#: midx.c:288
-msgid "error preparing packfile from multi-pack-index"
-msgstr ""
-"грешка при създаването на пакетен файл на базата на индекс за множество "
-"пакети"
-
-#: midx.c:472
+#: midx.c:467
#, c-format
msgid "failed to add packfile '%s'"
msgstr "пакетният файл „%s“ не може да бъде добавен"
-#: midx.c:478
+#: midx.c:473
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "индексът за пакети „%s“ не може да бъде отворен"
-#: midx.c:538
+#: midx.c:533
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "обект %d в пакетния файл липсва"
-#: midx.c:842
+#: midx.c:821
msgid "Adding packfiles to multi-pack-index"
msgstr "Добавяне на пакетни файлове към индекс за множество пакети"
-#: midx.c:875
+#: midx.c:855
#, c-format
msgid "did not see pack-file %s to drop"
msgstr "пакетният файл за триене „%s“ не може да се открие"
-#: midx.c:973
-msgid "Writing chunks to multi-pack-index"
-msgstr "Запис на откъси към индекс за множество пакети"
+#: midx.c:904
+msgid "no pack files to index."
+msgstr "няма пакетни файлове за индексиране"
-#: midx.c:1052
+#: midx.c:965
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "индексът за множество пакети не може да бъде изчистен при „%s“"
-#: midx.c:1108
+#: midx.c:1021
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr "файлът с индекса за множество пакети, но не може да бъде анализиран"
+
+#: midx.c:1029
msgid "Looking for referenced packfiles"
msgstr "Търсене на указаните пакетни файлове"
-#: midx.c:1123
+#: midx.c:1044
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
@@ -5133,68 +5526,72 @@
"неправилна подредба на откъси (OID fanout): fanout[%d] = %<PRIx32> > "
"%<PRIx32> = fanout[%d]"
-#: midx.c:1128
+#: midx.c:1049
+msgid "the midx contains no oid"
+msgstr "във файла с индекса за множество пакети няма идентификатори на обекти"
+
+#: midx.c:1058
msgid "Verifying OID order in multi-pack-index"
msgstr ""
"Проверка на подредбата на идентификатори на обекти във файл с индекс към "
"множество пакетни файлове"
-#: midx.c:1137
+#: midx.c:1067
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr ""
"неправилна подредба на откъси (OID lookup): oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1157
+#: midx.c:1087
msgid "Sorting objects by packfile"
msgstr "Подредба на обектите по пакетни файлове"
-#: midx.c:1164
+#: midx.c:1094
msgid "Verifying object offsets"
msgstr "Проверка на отместването на обекти"
-#: midx.c:1180
+#: midx.c:1110
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "записът в пакета за обекта oid[%d] = %s не може да бъде зареден"
-#: midx.c:1186
+#: midx.c:1116
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "индексът на пакета „%s“ не може да бъде зареден"
-#: midx.c:1195
+#: midx.c:1125
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "неправилно отместване на обект за oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-#: midx.c:1220
+#: midx.c:1150
msgid "Counting referenced objects"
msgstr "Преброяване на свързаните обекти"
-#: midx.c:1230
+#: midx.c:1160
msgid "Finding and deleting unreferenced packfiles"
msgstr "Търсене и изтриване на несвързаните пакетни файлове"
-#: midx.c:1388
+#: midx.c:1351
msgid "could not start pack-objects"
msgstr "командата „pack-objects“ не може да бъде стартирана"
-#: midx.c:1407
+#: midx.c:1371
msgid "could not finish pack-objects"
msgstr "командата „pack-objects“ не може да бъде завършена"
-#: name-hash.c:537
+#: name-hash.c:538
#, c-format
msgid "unable to create lazy_dir thread: %s"
msgstr "не може да се създаде нишка за директории: %s"
-#: name-hash.c:559
+#: name-hash.c:560
#, c-format
msgid "unable to create lazy_name thread: %s"
msgstr "не може да се създаде нишка за имена: %s"
-#: name-hash.c:565
+#: name-hash.c:566
#, c-format
msgid "unable to join lazy_name thread: %s"
msgstr "не може да се изчака нишка за имена: %s"
@@ -5247,6 +5644,368 @@
msgid "Bad %s value: '%s'"
msgstr "Зададена е лоша стойност на променливата „%s“: „%s“"
+#: object-file.c:480
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr ""
+"директорията за обекти „%s“ не съществува, проверете „.git/objects/info/"
+"alternates“"
+
+#: object-file.c:531
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "алтернативният път към обекти не може да бъде нормализиран: „%s“"
+
+#: object-file.c:603
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr ""
+"%s: алтернативните хранилища за обекти се пренебрегват поради прекалено "
+"дълбоко влагане"
+
+#: object-file.c:610
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "директорията за обекти „%s“ не може да бъде нормализирана"
+
+#: object-file.c:653
+msgid "unable to fdopen alternates lockfile"
+msgstr "заключващият файл за алтернативите не може да се отвори с „fdopen“"
+
+#: object-file.c:671
+msgid "unable to read alternates file"
+msgstr "файлът с алтернативите не може да бъде прочетен"
+
+#: object-file.c:678
+msgid "unable to move new alternates file into place"
+msgstr "новият файл с алтернативите не може да бъде преместен на мястото му"
+
+#: object-file.c:713
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "пътят „%s“ не съществува."
+
+#: object-file.c:734
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr "все още не се поддържа еталонно хранилище „%s“ като свързано."
+
+#: object-file.c:740
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "еталонното хранилище „%s“ не е локално"
+
+#: object-file.c:746
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "еталонното хранилище „%s“ е плитко"
+
+#: object-file.c:754
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "еталонното хранилище „%s“ е с присаждане"
+
+#: object-file.c:814
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "неправилен ред при анализа на алтернативните указатели: „%s“"
+
+#: object-file.c:964
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr ""
+"неуспешен опит за „mmap“ %<PRIuMAX>, което е над позволеното %<PRIuMAX>"
+
+#: object-file.c:985
+msgid "mmap failed"
+msgstr "неуспешно изпълнение на „mmap“"
+
+#: object-file.c:1149
+#, c-format
+msgid "object file %s is empty"
+msgstr "файлът с обектите „%s“ е празен"
+
+#: object-file.c:1284 object-file.c:2477
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "непакетираният обект „%s“ е повреден"
+
+#: object-file.c:1286 object-file.c:2481
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "грешни данни в края на непакетирания обект „%s“"
+
+#: object-file.c:1328
+msgid "invalid object type"
+msgstr "неправилен вид обект"
+
+#: object-file.c:1412
+#, c-format
+msgid "unable to unpack %s header with --allow-unknown-type"
+msgstr ""
+"заглавната част „%s“ не може да се разпакетира с опцията „--allow-unknown-"
+"type“"
+
+#: object-file.c:1415
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "заглавната част на „%s“ не може да бъде разпакетирана"
+
+#: object-file.c:1421
+#, c-format
+msgid "unable to parse %s header with --allow-unknown-type"
+msgstr ""
+"заглавната част „%s“ не може да се анализира с опцията „--allow-unknown-type“"
+
+#: object-file.c:1424
+#, c-format
+msgid "unable to parse %s header"
+msgstr "заглавната част на „%s“ не може да бъде анализирана"
+
+#: object-file.c:1651
+#, c-format
+msgid "failed to read object %s"
+msgstr "обектът „%s“ не може да бъде прочетен"
+
+#: object-file.c:1655
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "заместителят „%s“ на „%s“ не може да бъде открит"
+
+#: object-file.c:1659
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "непакетираният обект „%s“ (в „%s“) е повреден"
+
+#: object-file.c:1663
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "пакетираният обект „%s“ (в „%s“) е повреден"
+
+#: object-file.c:1768
+#, c-format
+msgid "unable to write file %s"
+msgstr "файлът „%s“ не може да бъде записан"
+
+#: object-file.c:1775
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "правата за достъп до „%s“ не могат да бъдат зададени"
+
+#: object-file.c:1782
+msgid "file write error"
+msgstr "грешка при запис на файл"
+
+#: object-file.c:1802
+msgid "error when closing loose object file"
+msgstr "грешка при затварянето на файла с непакетиран обект"
+
+#: object-file.c:1867
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
+msgstr ""
+"няма права за добавяне на обект към базата от данни на хранилището „%s“"
+
+#: object-file.c:1869
+msgid "unable to create temporary file"
+msgstr "не може да бъде създаден временен файл"
+
+#: object-file.c:1893
+msgid "unable to write loose object file"
+msgstr "грешка при записа на файла с непакетиран обект"
+
+#: object-file.c:1899
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "новият обект „%s“ не може да се компресира с „deflate“: %d"
+
+#: object-file.c:1903
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "неуспешно приключване на „deflate“ върху „%s“: %d"
+
+#: object-file.c:1907
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "грешка поради нестабилния източник данни за обектите „%s“"
+
+#: object-file.c:1917 builtin/pack-objects.c:1097
+#, c-format
+msgid "failed utime() on %s"
+msgstr "неуспешно задаване на време на достъп/създаване чрез „utime“ на „%s“"
+
+#: object-file.c:1994
+#, c-format
+msgid "cannot read object for %s"
+msgstr "обектът за „%s“ не може да се прочете"
+
+#: object-file.c:2045
+msgid "corrupt commit"
+msgstr "повредено подаване"
+
+#: object-file.c:2053
+msgid "corrupt tag"
+msgstr "повреден етикет"
+
+#: object-file.c:2153
+#, c-format
+msgid "read error while indexing %s"
+msgstr "грешка при четене по време на индексиране на „%s“"
+
+#: object-file.c:2156
+#, c-format
+msgid "short read while indexing %s"
+msgstr "непълно прочитане по време на индексиране на „%s“"
+
+#: object-file.c:2229 object-file.c:2239
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr "„%s“ не може да се вмъкне в базата от данни"
+
+#: object-file.c:2245
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "неподдържан вид файл: „%s“"
+
+#: object-file.c:2269
+#, c-format
+msgid "%s is not a valid object"
+msgstr "„%s“ е неправилен обект"
+
+#: object-file.c:2271
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "„%s“ е неправилен обект от вид „%s“"
+
+#: object-file.c:2298 builtin/index-pack.c:192
+#, c-format
+msgid "unable to open %s"
+msgstr "обектът „%s“ не може да бъде отворен"
+
+#: object-file.c:2488 object-file.c:2541
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "неправилна контролна сума за „%s“ (трябва да е %s)"
+
+#: object-file.c:2512
+#, c-format
+msgid "unable to mmap %s"
+msgstr "неуспешно изпълнение на „mmap“ върху „%s“"
+
+#: object-file.c:2517
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "заглавната част на „%s“ не може да бъде разпакетирана"
+
+#: object-file.c:2523
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "заглавната част на „%s“ не може да бъде анализирана"
+
+#: object-file.c:2534
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "съдържанието на „%s“ не може да бъде разпакетирано"
+
+#: object-name.c:486
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr "късият идентификатор на обект „%s“ не е еднозначен"
+
+#: object-name.c:497
+msgid "The candidates are:"
+msgstr "Възможностите са:"
+
+#: object-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 никога не създава указатели, които завършват\n"
+"с 40 шестнадесетични знака, защото стандартно те ще бъдат прескачани.\n"
+"Възможно е такива указатели да са създадени случайно. Например:\n"
+"\n"
+" git switch -c $BRANCH $(git rev-parse …)\n"
+"\n"
+"където стойността на променливата на средата BRANCH е празна, при което\n"
+"се създава подобен указател. Прегледайте тези указатели и ги изтрийте.\n"
+"За да изключите това съобщение, изпълнете:\n"
+"\n"
+" git config advice.objectNameWarning false"
+
+#: object-name.c:916
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "журналът за „%.*s“ стига само до „%s“"
+
+#: object-name.c:924
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "журналът за „%.*s“ съдържа само %d записа"
+
+#: object-name.c:1702
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr "пътят „%s“ съществува на диска, но не и в „%.*s“"
+
+#: object-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“."
+
+#: object-name.c:1717
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "пътят „%s“ не съществува в „%.*s“"
+
+#: object-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“."
+
+#: object-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“."
+
+#: object-name.c:1769
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr "пътят „%s“ съществува на диска, но не е в индекса"
+
+#: object-name.c:1771
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr "пътят „%s“ не съществува нито на диска, нито в индекса"
+
+#: object-name.c:1784
+msgid "relative path syntax can't be used outside working tree"
+msgstr "относителен път не може да се ползва извън работното дърво"
+
+#: object-name.c:1922
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "неправилно име на обект: „%.*s“"
+
#: object.c:53
#, c-format
msgid "invalid object type \"%s\""
@@ -5272,29 +6031,102 @@
msgid "hash mismatch %s"
msgstr "разлика в контролната сума: „%s“"
-#: packfile.c:629
+#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226
+#, c-format
+msgid "unable to get size of %s"
+msgstr "размерът на „%s“ не може да бъде получен"
+
+#: pack-bitmap.c:1489 builtin/rev-list.c:92
+#, c-format
+msgid "unable to get disk usage of %s"
+msgstr "използваното място за „%s“ не може да бъде получено"
+
+#: pack-revindex.c:220
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr "файлът с обратния индекс „%s“ е твърде малък"
+
+#: pack-revindex.c:225
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr "файлът с обратния индекс „%s“ е повреден"
+
+#: pack-revindex.c:233
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr "непознат подпис за файла на обратния индекс „%s“"
+
+#: pack-revindex.c:237
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr "версия %2$<PRIu32> на файла с обратен индекс „%1$s“ не се поддържа"
+
+#: pack-revindex.c:242
+#, c-format
+msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
+msgstr ""
+"идентификатор на контролна сума %2$<PRIu32> на файла с обратен индекс „%1$s“ "
+"не се поддържа"
+
+#: pack-write.c:236
+msgid "cannot both write and verify reverse index"
+msgstr "обратният индекс не може едновременно да се записва и да се проверява"
+
+#: pack-write.c:257
+#, c-format
+msgid "could not stat: %s"
+msgstr "не може да се получи информация чрез „stat“ за „%s“"
+
+#: pack-write.c:269
+#, c-format
+msgid "failed to make %s readable"
+msgstr "не може да се дадат права за четене на „%s“"
+
+#: pack-write.c:508
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr "гарантиращият файл „%s“ не може да се запише"
+
+#: packfile.c:625
msgid "offset before end of packfile (broken .idx?)"
msgstr ""
"отместване преди края на пакетния файл (възможно е индексът да е повреден)"
-#: packfile.c:1899
+#: packfile.c:1934
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
"отместване преди началото на индекса на пакетния файл „%s“ (възможно е "
"индексът да е повреден)"
-#: packfile.c:1903
+#: packfile.c:1938
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
"отместване преди края на индекса на пакетния файл „%s“ (възможно е индексът "
"да е отрязан)"
-#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134
+#: parse-options-cb.c:20 parse-options-cb.c:24
#, c-format
-msgid "unable to get size of %s"
-msgstr "размерът на „%s“ не може да бъде получен"
+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
@@ -5337,26 +6169,31 @@
msgid "did you mean `--%s` (with two dashes)?"
msgstr "„--%s“ (с 2 тирета) ли имахте предвид?"
-#: parse-options.c:857
+#: 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:859
+#: parse-options.c:864
#, c-format
msgid "unknown switch `%c'"
msgstr "непознат флаг „%c“"
-#: parse-options.c:861
+#: parse-options.c:866
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "непозната стойност извън „ascii“ в низа: „%s“"
-#: parse-options.c:885
+#: parse-options.c:890
msgid "..."
msgstr "…"
-#: parse-options.c:904
+#: parse-options.c:909
#, c-format
msgid "usage: %s"
msgstr "употреба: %s"
@@ -5364,47 +6201,20 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:910
+#: parse-options.c:915
#, c-format
msgid " or: %s"
msgstr " или: %s"
-#: parse-options.c:913
+#: parse-options.c:918
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:952
+#: parse-options.c:957
msgid "-NUM"
msgstr "-ЧИСЛО"
-#: parse-options.c:966
-#, c-format
-msgid "alias of --%s"
-msgstr "псевдоним на „--%s“"
-
-#: parse-options-cb.c:20 parse-options-cb.c:24
-#, c-format
-msgid "option `%s' expects a numerical value"
-msgstr "опцията „%s“ очаква число за аргумент"
-
-#: parse-options-cb.c:41
-#, c-format
-msgid "malformed expiration date '%s'"
-msgstr "неправилна дата на срок: „%s“"
-
-#: parse-options-cb.c:54
-#, c-format
-msgid "option `%s' expects \"always\", \"auto\", or \"never\""
-msgstr ""
-"опцията „%s“ изисква някоя от стойностите: „always“ (винаги), "
-"„auto“ (автоматично) или „never“ (никога)"
-
-#: parse-options-cb.c:130 parse-options-cb.c:147
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "неправилно име на обект „%s“"
-
#: path.c:915
#, c-format
msgid "Could not make %s writable by group"
@@ -5464,27 +6274,27 @@
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: опциите „literal“ и „glob“ са несъвместими"
-#: pathspec.c:442
+#: pathspec.c:445
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr "%s: „%s“ е извън хранилището при „%s“"
-#: pathspec.c:517
+#: pathspec.c:521
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "„%s“ (клавиш: „%c“)"
-#: pathspec.c:527
+#: pathspec.c:531
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s: магическите пътища не се поддържат от командата „%s“"
-#: pathspec.c:594
+#: pathspec.c:598
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "пътят „%s“ е след символна връзка"
-#: pathspec.c:639
+#: pathspec.c:643
#, c-format
msgid "line is badly quoted: %s"
msgstr "неправилно цитиран ред: %s"
@@ -5498,148 +6308,179 @@
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:165
#, c-format
msgid "remote error: %s"
msgstr "отдалечена грешка: %s"
-#: preload-index.c:119
+#: preload-index.c:125
msgid "Refreshing index"
msgstr "Обновяване на индекса"
-#: preload-index.c:138
+#: preload-index.c:144
#, c-format
msgid "unable to create threaded lstat: %s"
msgstr "не може да се създаде нишка за изпълнението на „lstat“: %s"
-#: pretty.c:981
+#: pretty.c:984
msgid "unable to parse --pretty format"
msgstr "аргументът към опцията „--pretty“ не може да се анализира"
-#: promisor-remote.c:23
-msgid "Remote with no URL"
-msgstr "Липсва адрес за отдалеченото хранилище"
+#: promisor-remote.c:30
+msgid "promisor-remote: unable to fork off fetch subprocess"
+msgstr "хранилище-гарант: неуспешно създаване на процес за доставяне"
-#: promisor-remote.c:58
+#: 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"
-#: range-diff.c:75
+#: prune-packed.c:35
+msgid "Removing duplicate objects"
+msgstr "Изтриване на повтарящите се обекти"
+
+#: range-diff.c:78
msgid "could not start `log`"
msgstr "командата за журнала с подавания „log“ не може да се стартира"
-#: range-diff.c:77
+#: range-diff.c:80
msgid "could not read `log` output"
msgstr ""
"изходът от командата за журнала с подавания „log“ не може да се прочете"
-#: range-diff.c:96 sequencer.c:5020
+#: range-diff.c:101 sequencer.c:5318
#, c-format
msgid "could not parse commit '%s'"
msgstr "подаването „%s“ не може да бъде анализирано"
-#: range-diff.c:122
+#: range-diff.c:115
+#, c-format
+msgid ""
+"could not parse first line of `log` output: did not start with 'commit ': "
+"'%s'"
+msgstr ""
+"първият ред от изхода на командата „log“ не може да се анализира, защото не "
+"започва с „commit “: „%s“"
+
+#: range-diff.c:140
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "заглавната част на git „%.*s“ не може да се анализира"
-#: range-diff.c:285
+#: range-diff.c:306
msgid "failed to generate diff"
msgstr "неуспешно търсене на разлика"
-#: range-diff.c:518 range-diff.c:520
+#: range-diff.c:558
+msgid "--left-only and --right-only are mutually exclusive"
+msgstr "опциите „--left-only“ и „--right-only“ са несъвместими"
+
+#: range-diff.c:561 range-diff.c:563
#, 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:1330
+#: read-cache.c:1318
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "„%s“ съществува и като файл, и като директория"
-#: read-cache.c:1536
+#: read-cache.c:1532
msgid "Refresh index"
msgstr "Обновяване на индекса"
-#: read-cache.c:1651
+#: read-cache.c:1657
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -5648,7 +6489,7 @@
"Зададена е неправилна стойност на настройката „index.version“.\n"
"Ще се ползва версия %i"
-#: read-cache.c:1661
+#: read-cache.c:1667
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -5658,142 +6499,142 @@
"„GIT_INDEX_VERSION“.\n"
"Ще се ползва версия %i"
-#: read-cache.c:1717
+#: read-cache.c:1723
#, c-format
msgid "bad signature 0x%08x"
msgstr "неправилен подпис: „0x%08x“"
-#: read-cache.c:1720
+#: read-cache.c:1726
#, c-format
msgid "bad index version %d"
msgstr "неправилна версия на индекса %d"
-#: read-cache.c:1729
+#: read-cache.c:1735
msgid "bad index file sha1 signature"
msgstr "неправилен подпис за контролна сума по SHA1 на файла на индекса"
-#: read-cache.c:1759
+#: read-cache.c:1765
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr ""
"индексът ползва разширение „%.4s“, което не се поддържа от тази версия на git"
-#: read-cache.c:1761
+#: read-cache.c:1767
#, c-format
msgid "ignoring %.4s extension"
msgstr "игнориране на разширението „%.4s“"
-#: read-cache.c:1798
+#: read-cache.c:1804
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "непознат формат на запис в индекса: „0x%08x“"
-#: read-cache.c:1814
+#: read-cache.c:1820
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "неправилно име на поле в индекса близо до пътя „%s“"
-#: read-cache.c:1871
+#: read-cache.c:1877
msgid "unordered stage entries in index"
msgstr "неподредени записи в индекса"
-#: read-cache.c:1874
+#: read-cache.c:1880
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "множество записи за слетия файл „%s“"
-#: read-cache.c:1877
+#: read-cache.c:1883
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "неподредени записи за „%s“"
-#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
-#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
-#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
-#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
-#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
+#: read-cache.c:1989 read-cache.c:2280 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181
+#: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991
+#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505
+#: 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:2124
+#: read-cache.c:2133
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "не може да се създаде нишка за зареждане на обектите от кеша: %s"
-#: read-cache.c:2137
+#: read-cache.c:2146
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "не може да се изчака нишка за зареждане на обектите от кеша: %s"
-#: read-cache.c:2170
+#: read-cache.c:2179
#, c-format
msgid "%s: index file open failed"
msgstr "%s: неуспешно отваряне на файла на индекса"
-#: read-cache.c:2174
+#: read-cache.c:2183
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s: не може да се получи информация за отворения индекс със „stat“"
-#: read-cache.c:2178
+#: read-cache.c:2187
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s: файлът на индекса е по-малък от очакваното"
-#: read-cache.c:2182
+#: read-cache.c:2191
#, c-format
msgid "%s: unable to map index file"
msgstr "%s: неуспешно заделяне на съответстваща памет чрез „mmap“ на индекса"
-#: read-cache.c:2224
+#: read-cache.c:2233
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr ""
"не може да се създаде нишка за зареждане на разширенията на индекса: %s"
-#: read-cache.c:2251
+#: read-cache.c:2260
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr ""
"не може да се създаде нишка за зареждане на разширенията на индекса: %s"
-#: read-cache.c:2283
+#: read-cache.c:2292
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "споделеният индекс „%s“ не може да се обнови"
-#: read-cache.c:2330
+#: read-cache.c:2339
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "грешки в индекса — в „%2$s“ се очаква „%1$s“, а бе получено „%3$s“"
-#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122
+#: read-cache.c:3035 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141
#, c-format
msgid "could not close '%s'"
msgstr "„%s“ не може да се затвори"
-#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959
+#: read-cache.c:3138 sequencer.c:2487 sequencer.c:4239
#, c-format
msgid "could not stat '%s'"
msgstr "неуспешно изпълнение на „stat“ върху „%s“"
-#: read-cache.c:3142
+#: read-cache.c:3151
#, c-format
msgid "unable to open git dir: %s"
msgstr "не може да се отвори директорията на git: %s"
-#: read-cache.c:3154
+#: read-cache.c:3163
#, c-format
msgid "unable to unlink: %s"
msgstr "неуспешно изтриване на „%s“"
-#: read-cache.c:3179
+#: read-cache.c:3188
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "правата за достъп до „%s“ не могат да бъдат поправени"
-#: read-cache.c:3328
+#: read-cache.c:3337
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s: не може да се премине към етап №0"
@@ -5870,7 +6711,7 @@
msgstr[0] "Пребазиране на „%s“ върху „%s“ (%d команди)"
msgstr[1] "Пребазиране на „%s“ върху „%s“ (%d команда)"
-#: rebase-interactive.c:72 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"
@@ -5879,7 +6720,7 @@
"Не изтривайте редове. Подаванията могат да се прескачат с командата "
"„drop“.\n"
-#: rebase-interactive.c:75 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"
@@ -5887,7 +6728,7 @@
"\n"
"Ако изтриете ред, съответстващото му подаване ще бъде ИЗТРИТО.\n"
-#: rebase-interactive.c:81 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"
@@ -5902,7 +6743,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:86 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"
@@ -5912,14 +6753,14 @@
"Ако изтриете всичко, пребазирането ще бъде преустановено.\n"
"\n"
-#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444
-#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252
+#: rebase-interactive.c:110 rerere.c:469 rerere.c:676 sequencer.c:3615
+#: sequencer.c:3641 sequencer.c:5424 builtin/fsck.c:329 builtin/rebase.c:272
#, c-format
msgid "could not write '%s'"
msgstr "„%s“ не може да се запише"
-#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210
-#: builtin/rebase.c:234
+#: rebase-interactive.c:116 builtin/rebase.c:204 builtin/rebase.c:230
+#: builtin/rebase.c:254
#, c-format
msgid "could not write '%s'."
msgstr "„%s“ не може да се запише."
@@ -5950,132 +6791,14 @@
"предупреждение)\n"
"или „error“ (считане за грешка).\n"
-#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262
-#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221
-#: builtin/rebase.c:246
+#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2402
+#: builtin/rebase.c:190 builtin/rebase.c:215 builtin/rebase.c:241
+#: builtin/rebase.c:266
#, c-format
msgid "could not read '%s'."
msgstr "от „%s“ не може да се чете."
-#: refs.c:262
-#, c-format
-msgid "%s does not point to a valid object!"
-msgstr "„%s“ не сочи към позволен обект!"
-
-#: refs.c:667
-#, c-format
-msgid "ignoring dangling symref %s"
-msgstr "игнориране на указател на обект извън клон „%s“"
-
-#: refs.c:669 ref-filter.c:2098
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr "игнориране на повредения указател „%s“"
-
-#: refs.c:804
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "„%s“ не може да бъде отворен за запис: %s"
-
-#: refs.c:814 refs.c:865
-#, c-format
-msgid "could not read ref '%s'"
-msgstr "указателят „%s“ не може да се прочете"
-
-#: refs.c:820
-#, c-format
-msgid "ref '%s' already exists"
-msgstr "указателят „%s“ вече съществува"
-
-#: refs.c:825
-#, c-format
-msgid "unexpected object ID when writing '%s'"
-msgstr "неочакван идентификатор на обект при записването на „%s“"
-
-#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905
-#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157
-#: wrapper.c:620
-#, c-format
-msgid "could not write to '%s'"
-msgstr "в „%s“ не може да се пише"
-
-#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719
-#: builtin/rebase.c:1029
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "„%s“ не може да бъде отворен за запис"
-
-#: refs.c:867
-#, c-format
-msgid "unexpected object ID when deleting '%s'"
-msgstr "неочакван идентификатор на обект при изтриването на „%s“"
-
-#: 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:2023
-#, c-format
-msgid "multiple updates for ref '%s' not allowed"
-msgstr "не са позволени повече от една промени на указателя „%s“"
-
-#: refs.c:2055
-msgid "ref updates forbidden inside quarantine environment"
-msgstr "обновяванията на указатели са забранени в среди под карантина"
-
-#: refs.c:2151 refs.c:2181
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr "„%s“ съществува, не може да се създаде „%s“"
-
-#: refs.c:2157 refs.c:2192
-#, c-format
-msgid "cannot process '%s' and '%s' at the same time"
-msgstr "невъзможно е едновременно да се обработват „%s“ и „%s“"
-
-#: refs/files-backend.c:1233
-#, c-format
-msgid "could not remove reference %s"
-msgstr "Указателят „%s“ не може да бъде изтрит"
-
-#: refs/files-backend.c:1247 refs/packed-backend.c:1541
-#: refs/packed-backend.c:1551
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "Указателят „%s“ не може да бъде изтрит: %s"
-
-#: refs/files-backend.c:1250 refs/packed-backend.c:1554
-#, c-format
-msgid "could not delete references: %s"
-msgstr "Указателите не може да бъдат изтрити: %s"
-
-#: refspec.c:137
-#, c-format
-msgid "invalid refspec '%s'"
-msgstr "неправилен указател: „%s“"
-
-#: ref-filter.c:42 wt-status.c:1938
+#: ref-filter.c:42 wt-status.c:1975
msgid "gone"
msgstr "изтрит"
@@ -6094,281 +6817,410 @@
msgid "ahead %d, behind %d"
msgstr "напред с %d, назад с %d"
-#: ref-filter.c:165
+#: ref-filter.c:175
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "очакван формат: %%(color:ЦВЯТ)"
-#: ref-filter.c:167
+#: ref-filter.c:177
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "непознат цвят: %%(color:%s)"
-#: ref-filter.c:189
+#: ref-filter.c:199
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "очаква се цяло число за „refname:lstrip=%s“"
-#: ref-filter.c:193
+#: ref-filter.c:203
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "очаква се цяло число за „refname:rstrip=%s“"
-#: ref-filter.c:195
+#: ref-filter.c:205
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "непознат аргумент за „%%(%s)“: %s"
-#: ref-filter.c:250
+#: ref-filter.c:260
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) не приема аргументи"
-#: ref-filter.c:272
+#: ref-filter.c:282
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr "непознат аргумент за %%(objectsize): %s"
-#: ref-filter.c:280
+#: ref-filter.c:290
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) не приема аргументи"
-#: ref-filter.c:292
+#: ref-filter.c:302
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) не приема аргументи"
-#: ref-filter.c:301
+#: ref-filter.c:315
#, c-format
-msgid "%%(subject) does not take arguments"
-msgstr "%%(subject) не приема аргументи"
+msgid "unrecognized %%(subject) argument: %s"
+msgstr "непознат аргумент за %%(subject): %s"
-#: ref-filter.c:323
+#: ref-filter.c:334
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr "очаква се %%(trailers:КЛЮЧ=СТОЙНОСТ)"
+
+#: ref-filter.c:336
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "непознат аргумент „%%(trailers)“: %s"
-#: ref-filter.c:352
+#: ref-filter.c:367
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "очаква се положителна стойност за „contents:lines=%s“"
-#: ref-filter.c:354
+#: ref-filter.c:369
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "непознат аргумент за %%(contents): %s"
-#: ref-filter.c:369
+#: ref-filter.c:384
#, 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:373
+#: ref-filter.c:388
#, c-format
-msgid "unrecognized %%(objectname) argument: %s"
-msgstr "непознат аргумент за %%(objectname): %s"
+msgid "unrecognized argument '%s' in %%(%s)"
+msgstr "непознат аргумент „%s“ в %%(%s)"
-#: ref-filter.c:403
+#: ref-filter.c:402
+#, c-format
+msgid "unrecognized email option: %s"
+msgstr "непозната опция за е-поща: %s"
+
+#: ref-filter.c:432
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "очакван формат: %%(align:ШИРОЧИНА,ПОЗИЦИЯ)"
-#: ref-filter.c:415
+#: ref-filter.c:444
#, c-format
msgid "unrecognized position:%s"
msgstr "непозната позиция: %s"
-#: ref-filter.c:422
+#: ref-filter.c:451
#, c-format
msgid "unrecognized width:%s"
msgstr "непозната широчина: %s"
-#: ref-filter.c:431
+#: ref-filter.c:460
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "непознат аргумент за %%(align): %s"
-#: ref-filter.c:439
+#: ref-filter.c:468
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "очаква се положителна широчина с лексемата „%%(align)“"
-#: ref-filter.c:457
+#: ref-filter.c:486
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "непознат аргумент за „%%(if)“: %s"
-#: ref-filter.c:559
+#: ref-filter.c:588
#, c-format
msgid "malformed field name: %.*s"
msgstr "неправилно име на обект: „%.*s“"
-#: ref-filter.c:586
+#: ref-filter.c:615
#, c-format
msgid "unknown field name: %.*s"
msgstr "непознато име на обект: „%.*s“"
-#: ref-filter.c:590
+#: ref-filter.c:619
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr "не е хранилище на git, а полето „%.*s“ изисква достъп данни на обектни"
-#: ref-filter.c:714
+#: ref-filter.c:743
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "формат: лексемата %%(if) е използвана без съответната ѝ %%(then)"
-#: ref-filter.c:777
+#: ref-filter.c:806
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "формат: лексемата %%(then) е използвана без съответната ѝ %%(if)"
-#: ref-filter.c:779
+#: ref-filter.c:808
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "формат: лексемата %%(then) е използвана повече от един път"
-#: ref-filter.c:781
+#: ref-filter.c:810
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "формат: лексемата %%(then) е използвана след %%(else)"
-#: ref-filter.c:809
+#: ref-filter.c:838
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "формат: лексемата %%(else) е използвана без съответната ѝ %%(if)"
-#: ref-filter.c:811
+#: ref-filter.c:840
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "формат: лексемата %%(else) е използвана без съответната ѝ %%(then)"
-#: ref-filter.c:813
+#: ref-filter.c:842
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "формат: лексемата %%(else) е използвана повече от един път"
-#: ref-filter.c:828
+#: ref-filter.c:857
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "формат: лексемата %%(end) е използвана без съответната ѝ"
-#: ref-filter.c:885
+#: ref-filter.c:914
#, c-format
msgid "malformed format string %s"
msgstr "неправилен форматиращ низ „%s“"
-#: ref-filter.c:1488
+#: ref-filter.c:1555
#, c-format
-msgid "no branch, rebasing %s"
-msgstr "извън клон, пребазиране на „%s“"
+msgid "(no branch, rebasing %s)"
+msgstr "(извън клон, пребазиране на „%s“)"
-#: ref-filter.c:1491
+#: ref-filter.c:1558
#, c-format
-msgid "no branch, rebasing detached HEAD %s"
-msgstr "извън клон, пребазиране на несвързан указател „HEAD“ при „%s“"
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "(извън клон, пребазиране на несвързан указател „HEAD“ при „%s“)"
-#: ref-filter.c:1494
+#: ref-filter.c:1561
#, c-format
-msgid "no branch, bisect started on %s"
-msgstr "извън клон, двоично търсене от „%s“"
+msgid "(no branch, bisect started on %s)"
+msgstr "(извън клон, двоично търсене от „%s“)"
-#: ref-filter.c:1504
-msgid "no branch"
-msgstr "извън клон"
+#: ref-filter.c:1565
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "(указателят „HEAD“ не е свързан и е при „%s“)"
-#: ref-filter.c:1540 ref-filter.c:1749
+#: ref-filter.c:1568
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "(указателят „HEAD“ не е свързан и е отделѐн от „%s“)"
+
+#: ref-filter.c:1571
+msgid "(no branch)"
+msgstr "(извън клон)"
+
+#: ref-filter.c:1603 ref-filter.c:1812
#, c-format
msgid "missing object %s for %s"
msgstr "обектът „%s“ липсва за „%s“"
-#: ref-filter.c:1550
+#: ref-filter.c:1613
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "неуспешно анализиране чрез „parse_object_buffer“ на „%s“ за „%s“"
-#: ref-filter.c:2004
+#: ref-filter.c:1996
#, c-format
msgid "malformed object at '%s'"
msgstr "обект със сгрешен формат при „%s“"
-#: ref-filter.c:2093
+#: ref-filter.c:2085
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "игнориране на указателя с грешно име „%s“"
-#: ref-filter.c:2389
+#: ref-filter.c:2090 refs.c:676
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "игнориране на повредения указател „%s“"
+
+#: ref-filter.c:2430
#, c-format
msgid "format: %%(end) atom missing"
msgstr "грешка във форма̀та: липсва лексемата %%(end)"
-#: ref-filter.c:2489
-#, c-format
-msgid "option `%s' is incompatible with --merged"
-msgstr "опциите „%s“ и „--merged“ са несъвместими"
-
-#: ref-filter.c:2492
-#, c-format
-msgid "option `%s' is incompatible with --no-merged"
-msgstr "опциите „%s“ и „--no-merged“ са несъвместими"
-
-#: ref-filter.c:2502
+#: ref-filter.c:2529
#, c-format
msgid "malformed object name %s"
msgstr "неправилно име на обект „%s“"
-#: ref-filter.c:2507
+#: ref-filter.c:2534
#, c-format
msgid "option `%s' must point to a commit"
msgstr "опцията „%s“ не сочи към подаване"
-#: remote.c:366
+#: refs.c:264
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr "„%s“ не сочи към позволен обект!"
+
+#: refs.c:566
+#, c-format
+msgid ""
+"Using '%s' as the name for the initial branch. This default branch name\n"
+"is subject to change. To configure the initial branch name to use in all\n"
+"of your new repositories, which will suppress this warning, call:\n"
+"\n"
+"\tgit config --global init.defaultBranch <name>\n"
+"\n"
+"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"'development'. The just-created branch can be renamed via this command:\n"
+"\n"
+"\tgit branch -m <name>\n"
+msgstr ""
+"Първоначалният клон ще се казва „%s“. Това може да се промени. Можете да "
+"зададете\n"
+"настройката и да спрете това съобщение. За това изпълнете:\n"
+"\n"
+" git config --global init.defaultBranch ИМЕ\n"
+"\n"
+"Често ползвани варианти вместо „master“ са „main“, „trunk“ и „development“.\n"
+"За да преименувата току що създаден клон, изпълнете:\n"
+"\n"
+" git branch -m ИМЕ\n"
+
+#: refs.c:588
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "„%s“ не може да бъде получен"
+
+#: refs.c:598
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "неправилно име на клон: „%s = %s“"
+
+#: refs.c:674
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "игнориране на указател на обект извън клон „%s“"
+
+#: refs.c:922
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr "има пропуски в журнала с подаванията за указателя „%s“ след „%s“"
+
+#: refs.c:929
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr "журналът с подаванията за указателя „%s“ свършва неочаквано след „%s“"
+
+#: refs.c:994
+#, c-format
+msgid "log for %s is empty"
+msgstr "журналът с подаванията за указателя „%s“ е празен"
+
+#: refs.c:1086
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "указател не може да се обнови с грешно име „%s“"
+
+#: refs.c:1157
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "неуспешно обновяване на указателя „%s“: %s"
+
+#: refs.c:2051
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "не са позволени повече от една промени на указателя „%s“"
+
+#: refs.c:2131
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "обновяванията на указатели са забранени в среди под карантина"
+
+#: refs.c:2142
+msgid "ref updates aborted by hook"
+msgstr "обновяванията на указатели са преустановени от кука"
+
+#: refs.c:2242 refs.c:2272
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "„%s“ съществува, не може да се създаде „%s“"
+
+#: refs.c:2248 refs.c:2283
+#, 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:170
+#, 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:414
+#: remote.c:399
msgid "more than one receivepack given, using the first"
msgstr "зададен е повече от един пакет за получаване, ще се ползва първият"
-#: remote.c:422
+#: remote.c:407
msgid "more than one uploadpack given, using the first"
msgstr "зададен е повече от един пакет за изпращане, ще се ползва първият"
-#: remote.c:612
+#: remote.c:590
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "Невъзможно е да се доставят едновременно и „%s“, и „%s“ към „%s“"
-#: remote.c:616
+#: remote.c:594
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "„%s“ обикновено следи „%s“, а не „%s“"
-#: remote.c:620
+#: remote.c:598
#, c-format
msgid "%s tracks both %s and %s"
msgstr "„%s“ следи както „%s“, така и „%s“"
-#: remote.c:688
+#: remote.c:666
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr "ключ „%s“ на шаблона не съдържа „*“"
-#: remote.c:698
+#: remote.c:676
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr "стойност „%s“ на шаблона не съдържа „*“"
-#: remote.c:1004
+#: remote.c:1083
#, c-format
msgid "src refspec %s does not match any"
msgstr "указателят на версия-източник „%s“ не съвпада с никой обект"
-#: remote.c:1009
+#: remote.c:1088
#, c-format
msgid "src refspec %s matches more than one"
msgstr "указателят на версия-източник „%s“ съвпада с повече от един обект"
@@ -6377,7 +7229,7 @@
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1024
+#: remote.c:1103
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
@@ -6401,7 +7253,7 @@
"Никой от вариантите не сработи. Трябва сами да укажете пълното име на\n"
"указателя."
-#: remote.c:1044
+#: remote.c:1123
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
@@ -6412,7 +7264,7 @@
"като\n"
"изтласкате към „%s:refs/heads/%s“?"
-#: remote.c:1049
+#: remote.c:1128
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
@@ -6423,7 +7275,7 @@
"като\n"
"изтласкате към „%s:refs/tags/%s“?"
-#: remote.c:1054
+#: remote.c:1133
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
@@ -6433,7 +7285,7 @@
"ИЗТОЧНИКът е обект-дърво. Не целите ли всъщност да създадете нов клон като\n"
"изтласкате към „%s:refs/tags/%s“?"
-#: remote.c:1059
+#: remote.c:1138
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
@@ -6443,118 +7295,118 @@
"ИЗТОЧНИКът е обект-BLOB. Не целите ли всъщност да създадете нов клон като\n"
"изтласкате към „%s:refs/tags/%s“?"
-#: remote.c:1095
+#: remote.c:1174
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "не е открит клон съответстващ на „%s“"
-#: remote.c:1106
+#: remote.c:1185
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "„%s“ не може да се изтрие: отдалечения указател не съществува"
-#: remote.c:1118
+#: remote.c:1197
#, c-format
msgid "dst refspec %s matches more than one"
msgstr "указателят на версия-цел „%s“ съвпада с повече от един обект"
-#: remote.c:1125
+#: remote.c:1204
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr ""
"указателят на версия-цел „%s“ съответства и ще получава от повече от един "
"източник"
-#: remote.c:1628 remote.c:1729
+#: remote.c:1724 remote.c:1825
msgid "HEAD does not point to a branch"
msgstr "Указателят „HEAD“ не сочи към клон"
-#: remote.c:1637
+#: remote.c:1733
#, c-format
msgid "no such branch: '%s'"
msgstr "няма клон на име „%s“"
-#: remote.c:1640
+#: remote.c:1736
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "не е зададен клон-източник за клона „%s“"
-#: remote.c:1646
+#: remote.c:1742
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "клонът-източник „%s“ не е съхранен като следящ клон"
-#: remote.c:1661
+#: remote.c:1757
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
"липсва локален следящ клон за местоположението за изтласкване „%s“ в "
"хранилището „%s“"
-#: remote.c:1673
+#: remote.c:1769
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "няма информация клонът „%s“ да следи някой друг"
-#: remote.c:1683
+#: remote.c:1779
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "указателят за изтласкване на „%s“ не включва „%s“"
-#: remote.c:1696
+#: remote.c:1792
msgid "push has no destination (push.default is 'nothing')"
msgstr "указателят за изтласкване не включва цел („push.default“ е „nothing“)"
-#: remote.c:1718
+#: remote.c:1814
msgid "cannot resolve 'simple' push to a single destination"
msgstr "простото (simple) изтласкване не съответства на една цел"
-#: remote.c:1844
+#: remote.c:1943
#, c-format
msgid "couldn't find remote ref %s"
msgstr "отдалеченият указател „%s“ не може да бъде открит"
-#: remote.c:1857
+#: remote.c:1956
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "• прескачане на неочаквания локален указател „%s“"
-#: remote.c:2020
+#: remote.c:2119
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "Този клон следи „%s“, но следеният клон е изтрит.\n"
-#: remote.c:2024
+#: remote.c:2123
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (за да коригирате това, използвайте „git branch --unset-upstream“)\n"
-#: remote.c:2027
+#: remote.c:2126
#, c-format
msgid "Your branch is up to date with '%s'.\n"
-msgstr "Клонът е актуализиран към „%s“.\n"
+msgstr "Клонът е обновен към „%s“.\n"
-#: remote.c:2031
+#: remote.c:2130
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "Клонът ви и „%s“ сочат към различни подавания.\n"
-#: remote.c:2034
+#: remote.c:2133
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (за повече информация ползвайте „%s“)\n"
-#: remote.c:2038
+#: remote.c:2137
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "Клонът ви е с %2$d подаване пред „%1$s“.\n"
msgstr[1] "Клонът ви е с %2$d подавания пред „%1$s“.\n"
-#: remote.c:2044
+#: remote.c:2143
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (публикувайте локалните си промени чрез „git push“)\n"
-#: remote.c:2047
+#: remote.c:2146
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -6562,11 +7414,11 @@
msgstr[0] "Клонът ви е с %2$d подаване зад „%1$s“ и може да бъде превъртян.\n"
msgstr[1] "Клонът ви е с %2$d подавания зад „%1$s“ и може да бъде превъртян.\n"
-#: remote.c:2055
+#: remote.c:2154
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (обновете локалния си клон чрез „git pull“)\n"
-#: remote.c:2058
+#: remote.c:2157
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -6581,11 +7433,11 @@
"Текущият клон се е отделил от „%s“,\n"
"двата имат съответно по %d и %d несъвпадащи подавания.\n"
-#: remote.c:2068
+#: remote.c:2167
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (слейте отдалечения клон в локалния чрез „git pull“)\n"
-#: remote.c:2251
+#: remote.c:2359
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "очакваното име на обект „%s“ не може да бъде анализирано"
@@ -6605,131 +7457,140 @@
msgid "replace depth too high for object %s"
msgstr "дълбочината на замяна е прекалено голяма за обекта: „%s“"
-#: rerere.c:217 rerere.c:226 rerere.c:229
+#: rerere.c:201 rerere.c:210 rerere.c:213
msgid "corrupt MERGE_RR"
msgstr "повреден „MERGE_RR“ (запис за коригиране на конфликт)"
-#: rerere.c:264 rerere.c:269
+#: rerere.c:248 rerere.c:253
msgid "unable to write rerere record"
msgstr "приложеното коригиране на конфликт не може да бъде записано"
-#: rerere.c:495
+#: rerere.c:479
#, c-format
msgid "there were errors while writing '%s' (%s)"
msgstr "грешки при записването на „%s“ (%s)"
-#: rerere.c:498
+#: rerere.c:482
#, c-format
msgid "failed to flush '%s'"
msgstr "грешка при изчистването на буферите при записването на „%s“"
-#: rerere.c:503 rerere.c:1039
+#: rerere.c:487 rerere.c:1023
#, c-format
msgid "could not parse conflict hunks in '%s'"
msgstr "парчетата с конфликти в „%s“ не може да се анализират"
-#: rerere.c:684
+#: rerere.c:668
#, c-format
msgid "failed utime() on '%s'"
msgstr "неуспешно задаване на време на достъп/създаване чрез „utime“ на „%s“"
-#: rerere.c:694
+#: rerere.c:678
#, c-format
msgid "writing '%s' failed"
msgstr "неуспешен запис на „%s“"
-#: rerere.c:714
+#: rerere.c:698
#, c-format
msgid "Staged '%s' using previous resolution."
msgstr ""
"„%s“ е добавен към индекса с преизползване на запазена корекция при сливане"
-#: rerere.c:753
+#: rerere.c:737
#, c-format
msgid "Recorded resolution for '%s'."
msgstr "Корекцията на конфликта при сливане на „%s“ е запазена."
-#: rerere.c:788
+#: rerere.c:772
#, c-format
msgid "Resolved '%s' using previous resolution."
msgstr ""
"Конфликтът при сливане на „%s“ е коригиран с преизползване на предишна "
"корекция."
-#: rerere.c:803
+#: rerere.c:787
#, c-format
msgid "cannot unlink stray '%s'"
msgstr "излишният обект „%s“ не може да се изтрие"
-#: rerere.c:807
+#: rerere.c:791
#, c-format
msgid "Recorded preimage for '%s'"
msgstr "Предварителният вариант на „%s“ е запазен"
-#: rerere.c:881 submodule.c:2078 builtin/log.c:1871
-#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
+#: rerere.c:865 submodule.c:2088 builtin/log.c:1991
+#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890
#, c-format
msgid "could not create directory '%s'"
msgstr "Директорията „%s“ не може да бъде създадена"
-#: rerere.c:1057
+#: rerere.c:1041
#, c-format
msgid "failed to update conflicted state in '%s'"
msgstr "конфликтът в „%s“ не може да се обнови"
-#: rerere.c:1068 rerere.c:1075
+#: rerere.c:1052 rerere.c:1059
#, c-format
msgid "no remembered resolution for '%s'"
msgstr "липсва запазена корекция на конфликт при „%s“"
-#: rerere.c:1077
+#: rerere.c:1061
#, c-format
msgid "cannot unlink '%s'"
msgstr "„%s“ не може да се изтрие"
-#: rerere.c:1087
+#: rerere.c:1071
#, c-format
msgid "Updated preimage for '%s'"
msgstr "Предварителният вариант на „%s“ е обновен"
-#: rerere.c:1096
+#: rerere.c:1080
#, c-format
msgid "Forgot resolution for '%s'\n"
msgstr "Запазената корекция на конфликт при „%s“ е премахната\n"
-#: rerere.c:1199
+#: rerere.c:1191
msgid "unable to open rr-cache directory"
msgstr "директорията „rr-cache“ не може да се отвори"
-#: revision.c:2497
+#: reset.c:42
+msgid "could not determine HEAD revision"
+msgstr "не може да се определи към какво да сочи указателят „HEAD“"
+
+#: reset.c:70 reset.c:76 sequencer.c:3468
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "дървото, сочено от „%s“, не може да бъде открито"
+
+#: revision.c:2338
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "опцията „--unpacked=ПАКЕТЕН_ФАЙЛ“ вече не се поддържа"
+
+#: revision.c:2668
msgid "your current branch appears to be broken"
msgstr "Текущият клон е повреден"
-#: revision.c:2500
+#: revision.c:2671
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "Текущият клон „%s“ е без подавания "
-#: revision.c:2708
-msgid "--first-parent is incompatible with --bisect"
-msgstr "опциите „--first-parent“ и „--bisect“ са несъвместими"
-
-#: revision.c:2712
+#: revision.c:2877
msgid "-L does not yet support diff formats besides -p and -s"
msgstr ""
"опцията „-L“ поддържа единствено форматирането на разликите според опциите „-"
"p“ и „-s“"
-#: run-command.c:763
+#: run-command.c:767
msgid "open /dev/null failed"
msgstr "неуспешно отваряне на „/dev/null“"
-#: run-command.c:1269
+#: run-command.c:1274
#, c-format
msgid "cannot create async thread: %s"
msgstr "не може да се създаде асинхронна нишка: %s"
-#: run-command.c:1333
+#: run-command.c:1338
#, c-format
msgid ""
"The '%s' hook was ignored because it's not set as executable.\n"
@@ -6739,32 +7600,37 @@
"За да изключите това предупреждение, изпълнете:\n"
" git config advice.ignoredHook false"
-#: send-pack.c:144
+#: send-pack.c:146
msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
"неочакван изчистващ пакет „flush“ при изчитане на състоянието от "
"отдалеченото разпакетиране"
-#: send-pack.c:146
+#: send-pack.c:148
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr ""
"състоянието от отдалеченото разпакетиране не може да бъде анализирано: %s"
-#: send-pack.c:148
+#: send-pack.c:150
#, c-format
msgid "remote unpack failed: %s"
msgstr "неуспешно отдалечено разпакетиране: %s"
-#: send-pack.c:309
+#: send-pack.c:374
msgid "failed to sign the push certificate"
msgstr "сертификатът за изтласкване не може да бъде подписан"
-#: send-pack.c:423
+#: send-pack.c:467
+msgid "the receiving end does not support this repository's hash algorithm"
+msgstr ""
+"отсрещната страна не поддържа алгоритъма за контролни суми на това хранилище"
+
+#: send-pack.c:476
msgid "the receiving end does not support --signed push"
msgstr "отсрещната страна не поддържа изтласкване с опцията „--signed“"
-#: send-pack.c:425
+#: send-pack.c:478
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -6772,47 +7638,47 @@
"отсрещната страна не поддържа изтласкване с опцията „--signed“, затова не се "
"използва сертификат"
-#: send-pack.c:437
+#: send-pack.c:490
msgid "the receiving end does not support --atomic push"
msgstr "получаващата страна не поддържа изтласкване с опцията „--atomic“"
-#: send-pack.c:442
+#: send-pack.c:495
msgid "the receiving end does not support push options"
msgstr "отсрещната страна не поддържа опции при изтласкване"
-#: sequencer.c:191
+#: sequencer.c:195
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "несъществуващ режим на изчистване „%s“ на съобщение при подаване"
-#: sequencer.c:296
+#: sequencer.c:323
#, c-format
msgid "could not delete '%s'"
msgstr "„%s“ не може да бъде изтрит"
-#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385
+#: sequencer.c:343 builtin/rebase.c:757 builtin/rebase.c:1602 builtin/rm.c:385
#, c-format
msgid "could not remove '%s'"
msgstr "„%s“ не може да бъде изтрит"
-#: sequencer.c:325
+#: sequencer.c:353
msgid "revert"
msgstr "отмяна"
-#: sequencer.c:327
+#: sequencer.c:355
msgid "cherry-pick"
msgstr "отбиране"
-#: sequencer.c:329
+#: sequencer.c:357
msgid "rebase"
msgstr "пребазиране"
-#: sequencer.c:331
+#: sequencer.c:359
#, c-format
msgid "unknown action: %d"
msgstr "неизвестно действие: %d"
-#: sequencer.c:389
+#: sequencer.c:418
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -6820,7 +7686,7 @@
"след коригирането на конфликтите, отбележете съответните\n"
"пътища с „git add ПЪТ…“ или „git rm ПЪТ…“."
-#: sequencer.c:392
+#: sequencer.c:421
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -6830,44 +7696,43 @@
"пътища с „git add ПЪТ…“ или „git rm ПЪТ…“, след което\n"
"подайте резултата с командата „git commit'“."
-#: sequencer.c:405 sequencer.c:2901
+#: sequencer.c:434 sequencer.c:3070
#, c-format
msgid "could not lock '%s'"
msgstr "„%s“ не може да се заключи"
-#: sequencer.c:412
+#: sequencer.c:436 sequencer.c:2869 sequencer.c:3074 sequencer.c:3088
+#: sequencer.c:3345 sequencer.c:5334 strbuf.c:1168 wrapper.c:631
+#, c-format
+msgid "could not write to '%s'"
+msgstr "в „%s“ не може да се пише"
+
+#: sequencer.c:441
#, c-format
msgid "could not write eol to '%s'"
msgstr "краят на ред не може да се запише в „%s“"
-#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921
-#: sequencer.c:3185
+#: sequencer.c:446 sequencer.c:2874 sequencer.c:3076 sequencer.c:3090
+#: sequencer.c:3353
#, c-format
msgid "failed to finalize '%s'"
msgstr "„%s“ не може да се завърши"
-#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
-#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
-#: builtin/rebase.c:593
-#, c-format
-msgid "could not read '%s'"
-msgstr "файлът „%s“ не може да бъде прочетен"
-
-#: sequencer.c:466
+#: sequencer.c:485
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "локалните ви промени ще бъдат презаписани при %s."
-#: sequencer.c:470
+#: sequencer.c:489
msgid "commit your changes or stash them to proceed."
msgstr "подайте или скатайте промените, за да продължите"
-#: sequencer.c:502
+#: sequencer.c:521
#, c-format
msgid "%s: fast-forward"
msgstr "%s: превъртане"
-#: sequencer.c:541 builtin/tag.c:565
+#: sequencer.c:560 builtin/tag.c:598
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Несъществуващ режим на изчистване „%s“"
@@ -6875,65 +7740,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:635
+#: sequencer.c:670
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: новият индекс не може да бъде запазен"
-#: sequencer.c:652
+#: sequencer.c:684
msgid "unable to update cache tree"
msgstr "дървото на кеша не може да бъде обновено"
-#: sequencer.c:666
+#: sequencer.c:698
msgid "could not resolve HEAD commit"
msgstr "подаването, сочено от указателя „HEAD“, не може да бъде открито"
-#: sequencer.c:746
+#: sequencer.c:778
#, c-format
msgid "no key present in '%.*s'"
msgstr "в „%.*s“ няма ключове"
-#: sequencer.c:757
+#: sequencer.c:789
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "цитирането на стойността на „%s“ не може да бъде изчистено"
-#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710
-#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072
+#: sequencer.c:826 wrapper.c:201 wrapper.c:371 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1136 builtin/rebase.c:910
#, c-format
msgid "could not open '%s' for reading"
msgstr "файлът не може да бъде прочетен: „%s“"
-#: sequencer.c:804
+#: sequencer.c:836
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "настройката за автор „GIT_AUTHOR_NAME“ вече е зададена"
-#: sequencer.c:809
+#: sequencer.c:841
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "настройката за е-поща „GIT_AUTHOR_EMAIL“ вече е зададена"
-#: sequencer.c:814
+#: sequencer.c:846
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "настройката за дата „GIT_AUTHOR_DATE“ вече е зададена"
-#: sequencer.c:818
+#: sequencer.c:850
#, c-format
msgid "unknown variable '%s'"
msgstr "непозната променлива „%s“"
-#: sequencer.c:823
+#: sequencer.c:855
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "настройката за автор „GIT_AUTHOR_NAME“ липсва"
-#: sequencer.c:825
+#: sequencer.c:857
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "настройката за е-поща „GIT_AUTHOR_EMAIL“ липсва"
-#: sequencer.c:827
+#: sequencer.c:859
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "настройката за дата „GIT_AUTHOR_DATE“ липсва"
-#: sequencer.c:876
+#: sequencer.c:924
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -6962,13 +7827,13 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:1148
+#: sequencer.c:1211
msgid "'prepare-commit-msg' hook failed"
msgstr ""
"неуспешно изпълнение на куката при промяна на съобщението при подаване "
"(prepare-commit-msg)"
-#: sequencer.c:1154
+#: sequencer.c:1217
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6997,7 +7862,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1167
+#: sequencer.c:1230
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -7023,337 +7888,351 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1209
+#: sequencer.c:1272
msgid "couldn't look up newly created commit"
msgstr "току що създаденото подаване не може да бъде открито"
-#: sequencer.c:1211
+#: sequencer.c:1274
msgid "could not parse newly created commit"
msgstr "току що създаденото подаване не може да бъде анализирано"
-#: sequencer.c:1257
+#: sequencer.c:1320
msgid "unable to resolve HEAD after creating commit"
msgstr ""
"състоянието сочено от указателя „HEAD“ не може да бъде открито след "
"подаването"
-#: sequencer.c:1259
+#: sequencer.c:1322
msgid "detached HEAD"
msgstr "несвързан връх „HEAD“"
-#: sequencer.c:1263
+#: sequencer.c:1326
msgid " (root-commit)"
msgstr " (начално подаване)"
-#: sequencer.c:1284
+#: sequencer.c:1347
msgid "could not parse HEAD"
msgstr "указателят „HEAD“ не може да бъде анализиран"
-#: sequencer.c:1286
+#: sequencer.c:1349
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "указателят „HEAD“ „%s“ сочи към нещо, което не е подаване!"
-#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574
+#: sequencer.c:1353 sequencer.c:1431 builtin/commit.c:1577
msgid "could not parse HEAD commit"
msgstr "върховото подаване „HEAD“ не може да бъде прочетено"
-#: sequencer.c:1342 sequencer.c:1968
+#: sequencer.c:1409 sequencer.c:2108
msgid "unable to parse commit author"
msgstr "авторът на подаването не може да бъде анализиран"
-#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687
+#: sequencer.c:1420 builtin/am.c:1566 builtin/merge.c:702
msgid "git write-tree failed to write a tree"
msgstr "Командата „git write-tree“ не успя да запише обект-дърво"
-#: sequencer.c:1386 sequencer.c:1447
+#: sequencer.c:1453 sequencer.c:1573
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "съобщението за подаване не може да бъде прочетено от „%s“"
-#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886
-#: builtin/merge.c:911
+#: sequencer.c:1484 sequencer.c:1516
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr "неправилна самоличност за автор: „%s“"
+
+#: sequencer.c:1490
+msgid "corrupt author: missing date information"
+msgstr "повредена информация за автор: липсва дата"
+
+#: sequencer.c:1529 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:905
+#: builtin/merge.c:930 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "обектът за подаването не може да бъде записан"
-#: sequencer.c:1474
+#: sequencer.c:1556 sequencer.c:4291 t/helper/test-fast-rebase.c:198
+#, c-format
+msgid "could not update %s"
+msgstr "„%s“ не може да се обнови"
+
+#: sequencer.c:1605
#, c-format
msgid "could not parse commit %s"
msgstr "подаването „%s“ не може да бъде анализирано"
-#: sequencer.c:1479
+#: sequencer.c:1610
#, c-format
msgid "could not parse parent commit %s"
msgstr "родителското подаване „%s“ не може да бъде анализирано"
-#: sequencer.c:1562 sequencer.c:1673
+#: sequencer.c:1693 sequencer.c:1804
#, c-format
msgid "unknown command: %d"
msgstr "непозната команда: %d"
-#: sequencer.c:1620 sequencer.c:1645
+#: sequencer.c:1751 sequencer.c:1776
#, c-format
msgid "This is a combination of %d commits."
msgstr "Това е обединение от %d подавания"
-#: sequencer.c:1630
+#: sequencer.c:1761
msgid "need a HEAD to fixup"
msgstr "За вкарване в предходното подаване ви трябва указател „HEAD“"
-#: sequencer.c:1632 sequencer.c:3212
+#: sequencer.c:1763 sequencer.c:3380
msgid "could not read HEAD"
msgstr "указателят „HEAD“ не може да се прочете"
-#: sequencer.c:1634
+#: sequencer.c:1765
msgid "could not read HEAD's commit message"
msgstr ""
"съобщението за подаване към указателя „HEAD“ не може да бъде прочетено: %s"
-#: sequencer.c:1640
+#: sequencer.c:1771
#, c-format
msgid "cannot write '%s'"
msgstr "„%s“ не може да се запази"
-#: sequencer.c:1647 git-rebase--preserve-merges.sh:496
+#: sequencer.c:1778 git-rebase--preserve-merges.sh:486
msgid "This is the 1st commit message:"
msgstr "Това е 1-то съобщение при подаване:"
-#: sequencer.c:1655
+#: sequencer.c:1786
#, c-format
msgid "could not read commit message of %s"
msgstr "съобщението за подаване към „%s“ не може да бъде прочетено"
-#: sequencer.c:1662
+#: sequencer.c:1793
#, c-format
msgid "This is the commit message #%d:"
msgstr "Това е съобщение при подаване №%d:"
-#: sequencer.c:1668
+#: sequencer.c:1799
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Съобщение при подаване №%d ще бъде прескочено:"
-#: sequencer.c:1756
+#: sequencer.c:1887
msgid "your index file is unmerged."
msgstr "индексът не е слят."
-#: sequencer.c:1763
+#: sequencer.c:1894
msgid "cannot fixup root commit"
msgstr "началното подаване не може да се вкара в предходното му"
-#: sequencer.c:1782
+#: sequencer.c:1913
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "подаването „%s“ е сливане, но не е дадена опцията „-m“"
-#: sequencer.c:1790 sequencer.c:1798
+#: sequencer.c:1921 sequencer.c:1929
#, c-format
msgid "commit %s does not have parent %d"
msgstr "подаването „%s“ няма родител %d"
-#: sequencer.c:1804
+#: sequencer.c:1935
#, c-format
msgid "cannot get commit message for %s"
msgstr "неуспешно извличане на съобщението за подаване на „%s“"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1823
+#: sequencer.c:1954
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: неразпозната стойност за родителското подаване „%s“"
-#: sequencer.c:1888
+#: sequencer.c:2019
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "„%s“ не може да се преименува на „%s“"
-#: sequencer.c:1943
+#: sequencer.c:2079
#, c-format
msgid "could not revert %s... %s"
msgstr "подаването „%s“… не може да бъде отменено: „%s“"
-#: sequencer.c:1944
+#: sequencer.c:2080
#, c-format
msgid "could not apply %s... %s"
msgstr "подаването „%s“… не може да бъде приложено: „%s“"
-#: sequencer.c:1961
+#: sequencer.c:2100
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "прескачане на %s %s — кръпката вече е приложена\n"
-#: sequencer.c:2018
+#: sequencer.c:2158
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: неуспешно изчитане на индекса"
-#: sequencer.c:2025
+#: sequencer.c:2165
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: неуспешно обновяване на индекса"
-#: sequencer.c:2102
+#: sequencer.c:2242
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "„%s“ не приема аргументи: „%s“"
-#: sequencer.c:2111
+#: sequencer.c:2251
#, c-format
msgid "missing arguments for %s"
msgstr "„%s“ изисква аргументи"
-#: sequencer.c:2142
+#: sequencer.c:2282
#, c-format
msgid "could not parse '%s'"
msgstr "„%s“ не може да се анализира"
-#: sequencer.c:2203
+#: sequencer.c:2343
#, c-format
msgid "invalid line %d: %.*s"
msgstr "неправилен ред %d: %.*s"
-#: sequencer.c:2214
+#: sequencer.c:2354
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "Без предишно подаване не може да се изпълни „%s“"
-#: sequencer.c:2298
+#: sequencer.c:2440
msgid "cancelling a cherry picking in progress"
msgstr "преустановяване на извършваното в момента отбиране на подавания"
-#: sequencer.c:2305
+#: sequencer.c:2449
msgid "cancelling a revert in progress"
msgstr "преустановяване на извършваното в момента отмяна на подаване"
-#: sequencer.c:2349
+#: sequencer.c:2493
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "коригирайте това чрез „git rebase --edit-todo“."
-#: sequencer.c:2351
+#: sequencer.c:2495
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "неизползваем файл с описание на предстоящите действия: „%s“"
-#: sequencer.c:2356
+#: sequencer.c:2500
msgid "no commits parsed."
msgstr "никое от подаванията не може да се разпознае."
-#: sequencer.c:2367
+#: sequencer.c:2511
msgid "cannot cherry-pick during a revert."
msgstr ""
"по време на отмяна на подаване не може да се извърши отбиране на подаване."
-#: sequencer.c:2369
+#: sequencer.c:2513
msgid "cannot revert during a cherry-pick."
msgstr "по време на отбиране не може да се извърши отмяна на подаване."
-#: sequencer.c:2447
+#: sequencer.c:2591
#, c-format
msgid "invalid value for %s: %s"
msgstr "неправилна стойност за „%s“: „%s“"
-#: sequencer.c:2540
+#: sequencer.c:2698
msgid "unusable squash-onto"
msgstr "подаването, в което другите да се вкарат, не може да се използва"
-#: sequencer.c:2556
+#: sequencer.c:2718
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "неправилен файл с опции: „%s“"
-#: sequencer.c:2644 sequencer.c:4361
+#: sequencer.c:2811 sequencer.c:4644
msgid "empty commit set passed"
msgstr "зададено е празно множество от подавания"
-#: sequencer.c:2660
+#: sequencer.c:2828
msgid "revert is already in progress"
msgstr "в момента вече се извършва отмяна на подавания"
-#: sequencer.c:2662
+#: sequencer.c:2830
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "използвайте „git cherry-pick (--continue | %s--abort | --quit)“"
-#: sequencer.c:2665
+#: sequencer.c:2833
msgid "cherry-pick is already in progress"
msgstr "в момента вече се извършва отбиране на подавания"
-#: sequencer.c:2667
+#: sequencer.c:2835
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "използвайте „git cherry-pick (--continue | %s--abort | --quit)“"
-#: sequencer.c:2681
+#: sequencer.c:2849
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr ""
"директорията за определянето на последователността „%s“ не може да бъде "
"създадена"
-#: sequencer.c:2696
+#: sequencer.c:2864
msgid "could not lock HEAD"
msgstr "указателят „HEAD“ не може да се заключи"
-#: sequencer.c:2756 sequencer.c:4099
+#: sequencer.c:2924 sequencer.c:4379
msgid "no cherry-pick or revert in progress"
msgstr ""
"в момента не се извършва отбиране на подавания или пребазиране на клона"
-#: sequencer.c:2758 sequencer.c:2769
+#: sequencer.c:2926 sequencer.c:2937
msgid "cannot resolve HEAD"
msgstr "Подаването сочено от указателя „HEAD“ не може да бъде открито"
-#: sequencer.c:2760 sequencer.c:2804
+#: sequencer.c:2928 sequencer.c:2972
msgid "cannot abort from a branch yet to be born"
msgstr ""
"действието не може да бъде преустановено, когато сте на клон, който тепърва "
"предстои да бъде създаден"
-#: sequencer.c:2790 builtin/grep.c:724
+#: sequencer.c:2958 builtin/grep.c:757
#, c-format
msgid "cannot open '%s'"
msgstr "„%s“ не може да бъде отворен"
-#: sequencer.c:2792
+#: sequencer.c:2960
#, c-format
msgid "cannot read '%s': %s"
msgstr "„%s“ не може да бъде прочетен: %s"
-#: sequencer.c:2793
+#: sequencer.c:2961
msgid "unexpected end of file"
msgstr "неочакван край на файл"
-#: sequencer.c:2799
+#: sequencer.c:2967
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
"запазеният преди започването на отбирането файл за указателя „HEAD“ — „%s“ е "
"повреден"
-#: sequencer.c:2810
+#: sequencer.c:2978
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Изглежда указателят „HEAD“ е променен. Проверете към какво сочи.\n"
"Не се правят промени."
-#: sequencer.c:2851
+#: sequencer.c:3019
msgid "no revert in progress"
msgstr "в момента не тече пребазиране"
-#: sequencer.c:2859
+#: sequencer.c:3028
msgid "no cherry-pick in progress"
msgstr "в момента не се извършва отбиране на подавания"
-#: sequencer.c:2869
+#: sequencer.c:3038
msgid "failed to skip the commit"
msgstr "неуспешно прескачане на подаването"
-#: sequencer.c:2876
+#: sequencer.c:3045
msgid "there is nothing to skip"
msgstr "няма какво да се прескочи"
-#: sequencer.c:2879
+#: sequencer.c:3048
#, c-format
msgid ""
"have you committed already?\n"
@@ -7363,21 +8242,16 @@
"\n"
" git %s --continue"
-#: sequencer.c:3003 sequencer.c:4011
-#, c-format
-msgid "could not update %s"
-msgstr "„%s“ не може да се обнови"
-
-#: sequencer.c:3042 sequencer.c:3991
+#: sequencer.c:3210 sequencer.c:4271
msgid "cannot read HEAD"
msgstr "указателят „HEAD“ не може да бъде прочетен"
-#: sequencer.c:3059
+#: sequencer.c:3227
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "„%s“ не може да се копира като „%s“"
-#: sequencer.c:3067
+#: sequencer.c:3235
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -7396,22 +8270,27 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:3077
+#: sequencer.c:3245
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "Подаването „%s“… не може да бъде приложено: „%.*s“"
-#: sequencer.c:3084
+#: sequencer.c:3252
#, c-format
msgid "Could not merge %.*s"
msgstr "Невъзможно сливане на „%.*s“"
-#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641
+#: sequencer.c:3266 sequencer.c:3270 builtin/difftool.c:640
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "„%s“ не може да се копира като „%s“"
-#: sequencer.c:3129
+#: sequencer.c:3282
+#, c-format
+msgid "Executing: %s\n"
+msgstr "В момента се изпълнява: %s\n"
+
+#: sequencer.c:3297
#, c-format
msgid ""
"execution failed: %s\n"
@@ -7426,11 +8305,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3135
+#: sequencer.c:3303
msgid "and made changes to the index and/or the working tree\n"
msgstr "и променѝ индекса и/или работното дърво\n"
-#: sequencer.c:3141
+#: sequencer.c:3309
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -7447,102 +8326,124 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3202
+#: sequencer.c:3370
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "неправилно име на етикет: „%.*s“"
-#: sequencer.c:3256
+#: sequencer.c:3424
msgid "writing fake root commit"
msgstr "запазване на фалшиво начално подаване"
-#: sequencer.c:3261
+#: sequencer.c:3429
msgid "writing squash-onto"
msgstr "запазване на подаването, в което другите да се вкарат"
-#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886
-#, c-format
-msgid "failed to find tree of %s"
-msgstr "дървото, сочено от „%s“, не може да бъде открито"
-
-#: sequencer.c:3344
+#: sequencer.c:3513
#, c-format
msgid "could not resolve '%s'"
msgstr "„%s“ не може да бъде открит"
-#: sequencer.c:3375
+#: sequencer.c:3546
msgid "cannot merge without a current revision"
msgstr "без текущо подаване не може да се слива"
-#: sequencer.c:3397
+#: sequencer.c:3568
#, c-format
msgid "unable to parse '%.*s'"
msgstr "„%.*s“ не може да се анализира"
-#: sequencer.c:3406
+#: sequencer.c:3577
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "няма нищо за сливане: „%.*s“"
-#: sequencer.c:3418
+#: sequencer.c:3589
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "върху начално подаване не може да се извърши множествено сливане"
-#: sequencer.c:3434
+#: sequencer.c:3605
#, c-format
msgid "could not get commit message of '%s'"
msgstr "съобщението за подаване към „%s“ не може да бъде получено"
-#: sequencer.c:3594
+#: sequencer.c:3788
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "сливането на „%.*s“ не може даже да започне"
-#: sequencer.c:3610
+#: sequencer.c:3804
msgid "merge: Unable to write new index file"
msgstr "сливане: новият индекс не може да бъде запазен"
-#: sequencer.c:3679 builtin/rebase.c:737
+#: sequencer.c:3878
+msgid "Cannot autostash"
+msgstr "Не може да се скатае автоматично"
+
+#: sequencer.c:3881
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "Неочакван резултат при скатаване: „%s“"
+
+#: sequencer.c:3887
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "Директорията за „%s“ не може да бъде създадена"
+
+#: sequencer.c:3890
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "Автоматично скатано: „%s“\n"
+
+#: sequencer.c:3894
+msgid "could not reset --hard"
+msgstr "неуспешно изпълнение на „git reset --hard“"
+
+#: sequencer.c:3919
#, c-format
msgid "Applied autostash.\n"
msgstr "Автоматично скатаното е приложено.\n"
-#: sequencer.c:3691
+#: sequencer.c:3931
#, c-format
msgid "cannot store %s"
msgstr "„%s“ не може да бъде запазен"
-#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113
+#: sequencer.c:3934
#, 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:3755
-#, c-format
-msgid "%s: not a valid OID"
-msgstr "„%s“ е неправилен идентификатор на обект"
+#: sequencer.c:3939
+msgid "Applying autostash resulted in conflicts."
+msgstr "Конфликти при прилагането на автоматично скатаното."
-#: sequencer.c:3760 git-rebase--preserve-merges.sh:779
+#: sequencer.c:3940
+msgid "Autostash exists; creating a new stash entry."
+msgstr "Вече има запис за автоматично скатано, затова се създава нов запис."
+
+#: sequencer.c:4033 git-rebase--preserve-merges.sh:769
msgid "could not detach HEAD"
msgstr "указателят „HEAD“ не може да се отдели"
-#: sequencer.c:3775
+#: sequencer.c:4048
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Бе спряно при „HEAD“\n"
-#: sequencer.c:3777
+#: sequencer.c:4050
#, c-format
msgid "Stopped at %s\n"
msgstr "Бе спряно при „%s“\n"
-#: sequencer.c:3785
+#: sequencer.c:4058
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -7565,48 +8466,58 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:3869
+#: sequencer.c:4104
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "Пребазиране (%d/%d)%s"
+
+#: sequencer.c:4149
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Спиране при „%s“… %.*s\n"
-#: sequencer.c:3940
+#: sequencer.c:4220
#, c-format
msgid "unknown command %d"
msgstr "непозната команда %d"
-#: sequencer.c:3999
+#: sequencer.c:4279
msgid "could not read orig-head"
msgstr "указателят за „orig-head“ не може да се прочете"
-#: sequencer.c:4004
+#: sequencer.c:4284
msgid "could not read 'onto'"
msgstr "указателят за „onto“ не може да се прочете"
-#: sequencer.c:4018
+#: sequencer.c:4298
#, c-format
msgid "could not update HEAD to %s"
msgstr "„HEAD“ не може да бъде обновен до „%s“"
-#: sequencer.c:4111
+#: sequencer.c:4358
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "Успешно пребазиране и обновяване на „%s“.\n"
+
+#: sequencer.c:4391
msgid "cannot rebase: You have unstaged changes."
msgstr "не може да пребазирате, защото има промени, които не са в индекса."
-#: sequencer.c:4120
+#: sequencer.c:4400
msgid "cannot amend non-existing commit"
msgstr "несъществуващо подаване не може да се поправи"
-#: sequencer.c:4122
+#: sequencer.c:4402
#, c-format
msgid "invalid file: '%s'"
msgstr "неправилен файл: „%s“"
-#: sequencer.c:4124
+#: sequencer.c:4404
#, c-format
msgid "invalid contents: '%s'"
msgstr "неправилно съдържание: „%s“"
-#: sequencer.c:4127
+#: sequencer.c:4407
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -7616,59 +8527,59 @@
"В работното дърво има неподадени промени. Първо ги подайте, а след това\n"
"отново изпълнете „git rebase --continue“."
-#: sequencer.c:4163 sequencer.c:4202
+#: sequencer.c:4443 sequencer.c:4482
#, c-format
msgid "could not write file: '%s'"
msgstr "файлът „%s“ не може да бъде записан"
-#: sequencer.c:4217
+#: sequencer.c:4498
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "указателят „CHERRY_PICK_HEAD“ не може да бъде изтрит"
-#: sequencer.c:4224
+#: sequencer.c:4505
msgid "could not commit staged changes."
msgstr "промените в индекса не могат да бъдат подадени."
-#: sequencer.c:4338
+#: sequencer.c:4621
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: не може да се отбере „%s“"
-#: sequencer.c:4342
+#: sequencer.c:4625
#, c-format
msgid "%s: bad revision"
msgstr "%s: неправилна версия"
-#: sequencer.c:4377
+#: sequencer.c:4660
msgid "can't revert as initial commit"
msgstr "първоначалното подаване не може да бъде отменено"
-#: sequencer.c:4846
+#: sequencer.c:5137
msgid "make_script: unhandled options"
msgstr "make_script: неподдържани опции"
-#: sequencer.c:4849
+#: sequencer.c:5140
msgid "make_script: error preparing revisions"
msgstr "make_script: грешка при подготовката на версии"
-#: sequencer.c:5083 sequencer.c:5100
+#: sequencer.c:5382 sequencer.c:5399
msgid "nothing to do"
msgstr "няма какво да се прави"
-#: sequencer.c:5119
+#: sequencer.c:5418
msgid "could not skip unnecessary pick commands"
msgstr "излишните команди за отбиране не бяха прескочени"
-#: sequencer.c:5213
+#: sequencer.c:5512
msgid "the script was already rearranged."
msgstr "скриптът вече е преподреден."
-#: setup.c:124
+#: setup.c:133
#, c-format
msgid "'%s' is outside repository at '%s'"
msgstr "„%s“ е извън хранилището при „%s“"
-#: setup.c:175
+#: setup.c:185
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
@@ -7679,7 +8590,7 @@
"\n"
" git КОМАНДА -- ПЪТ…"
-#: setup.c:188
+#: setup.c:198
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -7692,12 +8603,12 @@
"\n"
" git КОМАНДА [ВЕРСИЯ…] -- [ФАЙЛ…]"
-#: setup.c:254
+#: setup.c:264
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr "опцията „%s“ трябва да е преди първия аргумент, който не е опция"
-#: setup.c:273
+#: setup.c:283
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -7709,95 +8620,99 @@
"\n"
" git КОМАНДА [ВЕРСИЯ…] -- [ФАЙЛ…]"
-#: setup.c:409
+#: setup.c:419
msgid "unable to set up work tree using invalid config"
msgstr ""
"не може да се зададе текуща работна директория при неправилни настройки"
-#: setup.c:413
+#: setup.c:423
msgid "this operation must be run in a work tree"
msgstr "тази команда трябва да се изпълни в работно дърво"
-#: setup.c:559
+#: setup.c:661
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Очаква се версия на хранилището на git <= %d, а не %d"
-#: setup.c:567
+#: setup.c:669
msgid "unknown repository extensions found:"
msgstr "открити са непознати разширения в хранилището:"
-#: setup.c:586
+#: 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:588
+#: setup.c:702
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "прекалено голям файл „.git“: „%s“"
-#: setup.c:590
+#: setup.c:704
#, c-format
msgid "error reading %s"
msgstr "грешка при прочитане на „%s“"
-#: setup.c:592
+#: setup.c:706
#, c-format
msgid "invalid gitfile format: %s"
msgstr "неправилен формат на gitfile: %s"
-#: setup.c:594
+#: setup.c:708
#, c-format
msgid "no path in gitfile: %s"
msgstr "липсва път в gitfile: „%s“"
-#: setup.c:596
+#: setup.c:710
#, c-format
msgid "not a git repository: %s"
msgstr "не е хранилище на Git: %s"
-#: setup.c:695
+#: setup.c:812
#, c-format
msgid "'$%s' too big"
msgstr "„%s“ е прекалено голям"
-#: setup.c:709
+#: setup.c:826
#, c-format
msgid "not a git repository: '%s'"
msgstr "не е хранилище на git: „%s“"
-#: setup.c:738 setup.c:740 setup.c:771
+#: setup.c:855 setup.c:857 setup.c:888
#, c-format
msgid "cannot chdir to '%s'"
msgstr "не може да се влезе в директорията „%s“"
-#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856
+#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973
msgid "cannot come back to cwd"
msgstr "процесът не може да се върне към предишната работна директория"
-#: setup.c:870
+#: setup.c:987
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "не може да бъде получена информация чрез „stat“ за „%*s%s%s“"
-#: setup.c:1108
+#: setup.c:1225
msgid "Unable to read current working directory"
msgstr "Текущата работна директория не може да бъде прочетена"
-#: setup.c:1117 setup.c:1123
+#: setup.c:1234 setup.c:1240
#, c-format
msgid "cannot change to '%s'"
msgstr "не може да се влезе в директорията „%s“"
-#: setup.c:1128
+#: setup.c:1245
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr ""
"нито тази, нито която и да е от по-горните директории, не е хранилище на "
"git: %s"
-#: setup.c:1134
+#: setup.c:1251
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
@@ -7808,7 +8723,7 @@
"Git работи в рамките на една файлова система, защото променливата на средата "
"„GIT_DISCOVERY_ACROSS_FILESYSTEM“ не е зададена."
-#: setup.c:1245
+#: setup.c:1362
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -7818,418 +8733,56 @@
"(0%.3o).\n"
"Собственикът на файла трябва да има права за писане и четене."
-#: setup.c:1289
+#: setup.c:1409
msgid "open /dev/null or dup failed"
msgstr "неуспешно изпълнение на „open“ или „dup“ върху „/dev/null“"
-#: setup.c:1304
+#: setup.c:1424
msgid "fork failed"
msgstr "неуспешно създаване на процес чрез „fork“"
-#: setup.c:1309
+#: setup.c:1429
msgid "setsid failed"
msgstr "неуспешно изпълнение на „setsid“"
-#: sha1-file.c:452
-#, c-format
-msgid "object directory %s does not exist; check .git/objects/info/alternates"
-msgstr ""
-"директорията за обекти „%s“ не съществува, проверете „.git/objects/info/"
-"alternates“"
-
-#: sha1-file.c:503
-#, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr "алтернативният път към обекти не може да бъде нормализиран: „%s“"
-
-#: sha1-file.c:575
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr ""
-"%s: алтернативните хранилища за обекти се пренебрегват поради прекалено "
-"дълбоко влагане"
-
-#: sha1-file.c:582
-#, c-format
-msgid "unable to normalize object directory: %s"
-msgstr "директорията за обекти „%s“ не може да бъде нормализирана"
-
-#: sha1-file.c:625
-msgid "unable to fdopen alternates lockfile"
-msgstr "заключващият файл за алтернативите не може да се отвори с „fdopen“"
-
-#: sha1-file.c:643
-msgid "unable to read alternates file"
-msgstr "файлът с алтернативите не може да бъде прочетен"
-
-#: sha1-file.c:650
-msgid "unable to move new alternates file into place"
-msgstr "новият файл с алтернативите не може да бъде преместен на мястото му"
-
-#: sha1-file.c:685
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "пътят „%s“ не съществува."
-
-#: sha1-file.c:711
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr "все още не се поддържа еталонно хранилище „%s“ като свързано."
-
-#: sha1-file.c:717
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "еталонното хранилище „%s“ не е локално"
-
-#: sha1-file.c:723
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "еталонното хранилище „%s“ е плитко"
-
-#: sha1-file.c:731
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "еталонното хранилище „%s“ е с присаждане"
-
-#: sha1-file.c:791
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "неправилен ред при анализа на алтернативните указатели: „%s“"
-
-#: sha1-file.c:943
-#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
-msgstr ""
-"неуспешен опит за „mmap“ %<PRIuMAX>, което е над позволеното %<PRIuMAX>"
-
-#: sha1-file.c:964
-msgid "mmap failed"
-msgstr "неуспешно изпълнение на „mmap“"
-
-#: sha1-file.c:1128
-#, c-format
-msgid "object file %s is empty"
-msgstr "файлът с обектите „%s“ е празен"
-
-#: sha1-file.c:1263 sha1-file.c:2443
-#, c-format
-msgid "corrupt loose object '%s'"
-msgstr "непакетираният обект „%s“ е повреден"
-
-#: sha1-file.c:1265 sha1-file.c:2447
-#, c-format
-msgid "garbage at end of loose object '%s'"
-msgstr "грешни данни в края на непакетирания обект „%s“"
-
-#: sha1-file.c:1307
-msgid "invalid object type"
-msgstr "неправилен вид обект"
-
-#: sha1-file.c:1391
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr ""
-"заглавната част „%s“ не може да се разпакетира с опцията „--allow-unknown-"
-"type“"
-
-#: sha1-file.c:1394
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "заглавната част на „%s“ не може да бъде разпакетирана"
-
-#: sha1-file.c:1400
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr ""
-"заглавната част „%s“ не може да се анализира с опцията „--allow-unknown-type“"
-
-#: sha1-file.c:1403
-#, c-format
-msgid "unable to parse %s header"
-msgstr "заглавната част на „%s“ не може да бъде анализирана"
-
-#: sha1-file.c:1629
-#, c-format
-msgid "failed to read object %s"
-msgstr "обектът „%s“ не може да бъде прочетен"
-
-#: sha1-file.c:1633
-#, c-format
-msgid "replacement %s not found for %s"
-msgstr "заместителят „%s“ на „%s“ не може да бъде открит"
-
-#: sha1-file.c:1637
-#, c-format
-msgid "loose object %s (stored in %s) is corrupt"
-msgstr "непакетираният обект „%s“ (в „%s“) е повреден"
-
-#: sha1-file.c:1641
-#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "пакетираният обект „%s“ (в „%s“) е повреден"
-
-#: sha1-file.c:1746
-#, c-format
-msgid "unable to write file %s"
-msgstr "файлът „%s“ не може да бъде записан"
-
-#: sha1-file.c:1753
-#, c-format
-msgid "unable to set permission to '%s'"
-msgstr "правата за достъп до „%s“ не могат да бъдат зададени"
-
-#: sha1-file.c:1760
-msgid "file write error"
-msgstr "грешка при запис на файл"
-
-#: sha1-file.c:1780
-msgid "error when closing loose object file"
-msgstr "грешка при затварянето на файла с непакетиран обект"
-
-#: sha1-file.c:1845
-#, c-format
-msgid "insufficient permission for adding an object to repository database %s"
-msgstr ""
-"няма права за добавяне на обект към базата от данни на хранилището „%s“"
-
-#: sha1-file.c:1847
-msgid "unable to create temporary file"
-msgstr "не може да бъде създаден временен файл"
-
-#: sha1-file.c:1871
-msgid "unable to write loose object file"
-msgstr "грешка при записа на файла с непакетиран обект"
-
-#: sha1-file.c:1877
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr "новият обект „%s“ не може да се компресира с „deflate“: %d"
-
-#: sha1-file.c:1881
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr "неуспешно приключване на „deflate“ върху „%s“: %d"
-
-#: sha1-file.c:1885
-#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr "грешка поради нестабилния източник данни за обектите „%s“"
-
-#: sha1-file.c:1895 builtin/pack-objects.c:1054
-#, c-format
-msgid "failed utime() on %s"
-msgstr "неуспешно задаване на време на достъп/създаване чрез „utime“ на „%s“"
-
-#: sha1-file.c:1972
-#, c-format
-msgid "cannot read object for %s"
-msgstr "обектът за „%s“ не може да се прочете"
-
-#: sha1-file.c:2011
-msgid "corrupt commit"
-msgstr "повредено подаване"
-
-#: sha1-file.c:2019
-msgid "corrupt tag"
-msgstr "повреден етикет"
-
-#: sha1-file.c:2119
-#, c-format
-msgid "read error while indexing %s"
-msgstr "грешка при четене по време на индексиране на „%s“"
-
-#: sha1-file.c:2122
-#, c-format
-msgid "short read while indexing %s"
-msgstr "непълно прочитане по време на индексиране на „%s“"
-
-#: sha1-file.c:2195 sha1-file.c:2205
-#, c-format
-msgid "%s: failed to insert into database"
-msgstr "„%s“ не може да се вмъкне в базата от данни"
-
-#: sha1-file.c:2211
-#, c-format
-msgid "%s: unsupported file type"
-msgstr "неподдържан вид файл: „%s“"
-
-#: sha1-file.c:2235
-#, c-format
-msgid "%s is not a valid object"
-msgstr "„%s“ е неправилен обект"
-
-#: sha1-file.c:2237
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "„%s“ е неправилен обект от вид „%s“"
-
-#: sha1-file.c:2264 builtin/index-pack.c:155
-#, c-format
-msgid "unable to open %s"
-msgstr "обектът „%s“ не може да бъде отворен"
-
-#: sha1-file.c:2454 sha1-file.c:2507
-#, c-format
-msgid "hash mismatch for %s (expected %s)"
-msgstr "неправилна контролна сума за „%s“ (трябва да е %s)"
-
-#: sha1-file.c:2478
-#, c-format
-msgid "unable to mmap %s"
-msgstr "неуспешно изпълнение на „mmap“ върху „%s“"
-
-#: sha1-file.c:2483
-#, c-format
-msgid "unable to unpack header of %s"
-msgstr "заглавната част на „%s“ не може да бъде разпакетирана"
-
-#: sha1-file.c:2489
-#, c-format
-msgid "unable to parse header of %s"
-msgstr "заглавната част на „%s“ не може да бъде анализирана"
-
-#: sha1-file.c:2500
-#, c-format
-msgid "unable to unpack contents of %s"
-msgstr "съдържанието на „%s“ не може да бъде разпакетирано"
-
-#: sha1-name.c:486
-#, c-format
-msgid "short SHA1 %s is ambiguous"
-msgstr "късият SHA1 „%s“ не е еднозначен"
-
-#: sha1-name.c:497
-msgid "The candidates are:"
-msgstr "Възможностите са:"
-
-#: sha1-name.c:796
-msgid ""
-"Git normally never creates a ref that ends with 40 hex characters\n"
-"because it will be ignored when you just specify 40-hex. These refs\n"
-"may be created by mistake. For example,\n"
-"\n"
-" git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
-"examine these refs and maybe delete them. Turn this message off by\n"
-"running \"git config advice.objectNameWarning false\""
-msgstr ""
-"При нормална работа Git никога не създава указатели, които завършват\n"
-"с 40 шестнадесетични знака, защото стандартно те ще бъдат прескачани.\n"
-"Възможно е такива указатели да са създадени случайно. Например:\n"
-"\n"
-" git switch -c $BRANCH $(git rev-parse …)\n"
-"\n"
-"където стойността на променливата на средата BRANCH е празна, при което\n"
-"се създава подобен указател. Прегледайте тези указатели и ги изтрийте.\n"
-"За да изключите това съобщение, изпълнете:\n"
-"\n"
-" git config advice.objectNameWarning false"
-
-#: sha1-name.c:916
-#, c-format
-msgid "log for '%.*s' only goes back to %s"
-msgstr "журналът за „%.*s“ стига само до „%s“"
-
-#: sha1-name.c:924
-#, c-format
-msgid "log for '%.*s' only has %d entries"
-msgstr "журналът за „%.*s“ съдържа само %d записа"
-
-#: sha1-name.c:1689
-#, c-format
-msgid "path '%s' exists on disk, but not in '%.*s'"
-msgstr "пътят „%s“ съществува на диска, но не и в „%.*s“"
-
-#: sha1-name.c:1695
-#, c-format
-msgid ""
-"path '%s' exists, but not '%s'\n"
-"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
-msgstr ""
-"пътят „%s“ съществува на диска, но не е в „%s“\n"
-"Пробвайте с „%.*s:%s“, което е същото като „%.*s:./%s“."
-
-#: sha1-name.c:1704
-#, c-format
-msgid "path '%s' does not exist in '%.*s'"
-msgstr "пътят „%s“ не съществува в „%.*s“"
-
-#: sha1-name.c:1732
-#, c-format
-msgid ""
-"path '%s' is in the index, but not at stage %d\n"
-"hint: Did you mean ':%d:%s'?"
-msgstr ""
-"пътят „%s“ е в индекса, но не версия %d\n"
-"Пробвайте с „%d:%s“."
-
-#: sha1-name.c:1748
-#, c-format
-msgid ""
-"path '%s' is in the index, but not '%s'\n"
-"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
-msgstr ""
-"пътят „%s“ е в индекса, но не в „%s“\n"
-"Пробвайте с „%d:%s“, което е същото като „%d:./%s“."
-
-#: sha1-name.c:1756
-#, c-format
-msgid "path '%s' exists on disk, but not in the index"
-msgstr "пътят „%s“ съществува на диска, но не е в индекса"
-
-#: sha1-name.c:1758
-#, c-format
-msgid "path '%s' does not exist (neither on disk nor in the index)"
-msgstr "пътят „%s“ не съществува нито на диска, нито в индекса"
-
-#: sha1-name.c:1771
-msgid "relative path syntax can't be used outside working tree"
-msgstr "относителен път не може да се ползва извън работното дърво"
-
-#: sha1-name.c:1909
-#, c-format
-msgid "invalid object name '%.*s'."
-msgstr "неправилно име на обект: „%.*s“"
-
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:837
+#: strbuf.c:848
#, c-format
msgid "%u.%2.2u GiB"
msgstr "%u.%2.2u GiB"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:839
+#: 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:847
+#: strbuf.c:858
#, c-format
msgid "%u.%2.2u MiB"
msgstr "%u.%2.2u MiB"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:849
+#: 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:856
+#: strbuf.c:867
#, c-format
msgid "%u.%2.2u KiB"
msgstr "%u.%2.2u KiB"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:858
+#: 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:864
+#: strbuf.c:875
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
@@ -8237,18 +8790,50 @@
msgstr[1] "%u байта"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:866
+#: strbuf.c:877
#, c-format
msgid "%u byte/s"
msgid_plural "%u bytes/s"
msgstr[0] "%u байт/сек."
msgstr[1] "%u байта/сек."
-#: strbuf.c:1164
+#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719
+#: builtin/rebase.c:866
+#, 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 ""
@@ -8279,12 +8864,12 @@
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Пътят „%s“ е в подмодула „%.*s“"
-#: submodule.c:434
+#: submodule.c:435
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr "неправилен аргумент за „--ignore-submodules“: „%s“"
-#: submodule.c:815
+#: submodule.c:817
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
@@ -8293,12 +8878,12 @@
"Подмодулът при подаване %s на пътя „%s“ е различен от другия модул със "
"същото име, затова първият се прескача."
-#: submodule.c:910
+#: submodule.c:920
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "записът за подмодула „%s“ (%s) е %s, а не подаване!"
-#: submodule.c:995
+#: submodule.c:1005
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
@@ -8307,36 +8892,36 @@
"Командата „git rev-list ПОДАВАНИЯ --not --remotes -n 1“ не може да се "
"изпълни в подмодула „%s“"
-#: submodule.c:1118
+#: submodule.c:1128
#, c-format
msgid "process for submodule '%s' failed"
msgstr "процесът за подмодула „%s“ завърши неуспешно"
-#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045
+#: submodule.c:1157 builtin/branch.c:689 builtin/submodule--helper.c:2469
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Не може да се открие към какво сочи указателят „HEAD“"
-#: submodule.c:1158
+#: submodule.c:1168
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr "Изтласкване на подмодула „%s“\n"
-#: submodule.c:1161
+#: submodule.c:1171
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "Подмодулът „%s“ не може да бъде изтласкан\n"
-#: submodule.c:1453
+#: submodule.c:1463
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr "Доставяне на подмодула „%s%s“\n"
-#: submodule.c:1483
+#: submodule.c:1497
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr "Подмодулът „%s“ не може да бъде достъпен\n"
-#: submodule.c:1637
+#: submodule.c:1652
#, c-format
msgid ""
"Errors during submodule fetch:\n"
@@ -8345,63 +8930,63 @@
"Грешки при доставяне на подмодул:\n"
"%s"
-#: submodule.c:1662
+#: submodule.c:1677
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "„%s“ не е хранилище на git"
-#: submodule.c:1679
+#: submodule.c:1694
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr ""
"Командата „git status --porcelain=2“ не може да се изпълни в подмодула „%s“"
-#: submodule.c:1720
+#: submodule.c:1735
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr ""
"командата „git status --porcelain=2“ не може да се изпълни в подмодула „%s“"
-#: submodule.c:1800
+#: submodule.c:1810
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "командата „git status“ не може да се изпълни в подмодула „%s“"
-#: submodule.c:1813
+#: submodule.c:1823
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "командата „git status“ не може да се изпълни в подмодула „%s“"
-#: submodule.c:1828
+#: submodule.c:1838
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "Настройката „core.worktree“ не може да се изтрие в подмодула „%s“"
-#: submodule.c:1855 submodule.c:2165
+#: submodule.c:1865 submodule.c:2175
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "неуспешна обработка на поддиректориите в подмодула „%s“"
-#: submodule.c:1876
+#: submodule.c:1886
msgid "could not reset submodule index"
msgstr "неуспешно зануляване на индекса на подмодула"
-#: submodule.c:1918
+#: submodule.c:1928
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "индексът на подмодула „%s“ не е чист"
-#: submodule.c:1970
+#: submodule.c:1980
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "Подмодулът „%s“ не може да се обнови."
-#: submodule.c:2038
+#: submodule.c:2048
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr "„%s“ (директория на подмодул) е в директорията на git: „%.*s“"
-#: submodule.c:2059
+#: submodule.c:2069
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -8409,17 +8994,17 @@
"не се поддържа „relocate_gitdir“ за подмодула „%s“, който има повече от едно "
"работно дърво"
-#: submodule.c:2071 submodule.c:2130
+#: submodule.c:2081 submodule.c:2140
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "името на подмодула „%s“ не може да бъде намерено"
-#: submodule.c:2075
+#: submodule.c:2085
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr "„%s“ не може да се премести в съществуваща директория на git"
-#: submodule.c:2082
+#: submodule.c:2092
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -8430,95 +9015,268 @@
"„%s“ към\n"
"„%s“\n"
-#: submodule.c:2209
+#: submodule.c:2220
msgid "could not start ls-files in .."
msgstr "„ls-stat“ не може да се стартира в „..“"
-#: submodule.c:2248
+#: submodule.c:2260
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "„ls-tree“ завърши с неочакван изходен код: %d"
-#: submodule-config.c:236
-#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "игнориране на подозрително име на подмодул: „%s“"
-
-#: submodule-config.c:303
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "настройката „submodule.fetchjobs“ не приема отрицателни стойности"
-
-#: submodule-config.c:401
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr ""
-"„%s“ се прескача, защото е възможно да се тълкува като опция за командния "
-"ред: %s"
-
-#: submodule-config.c:498
-#, c-format
-msgid "invalid value for %s"
-msgstr "Неправилна стойност за „%s“"
-
-#: submodule-config.c:765
-#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr "Записът „%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:298 builtin/remote.c:323
+#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324
#, 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 builtin/mktag.c:91
msgid "could not read from stdin"
msgstr "от стандартния вход не може да се чете"
-#: trailer.c:1011 wrapper.c:665
+#: 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-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 ""
+"файловият дескриптор от насрещната помощна програма не може да се дублира с "
+"„dup“"
+
+#: 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 ""
+"насрещната помощна програма трябва да поддържа способност за изброяване на "
+"указатели"
+
+#: 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 "неуспешно изпълнение на бързо внасяне"
+
+#: transport-helper.c:520
+msgid "error while running fast-import"
+msgstr "грешка при изпълнението на бързо внасяне"
+
+#: transport-helper.c:549 transport-helper.c:1237
+#, 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:1447
+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 "опция без съответстваща директива за успех или грешка"
+
+#: transport-helper.c:788
+#, c-format
+msgid "expected ok/error, helper said '%s'"
+msgstr ""
+"очаква се или успех, или грешка, но насрещната помощна програма върна „%s“"
+
+#: transport-helper.c:845
+#, c-format
+msgid "helper reported unexpected status of %s"
+msgstr "насрещната помощна програма завърши с неочакван изходен код: „%s“"
+
+#: transport-helper.c:928
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr "насрещната помощна програма „%s“ не поддържа проби „dry-run“"
+
+#: transport-helper.c:931
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr "насрещната помощна програма „%s“ не поддържа опцията „--signed“"
+
+#: transport-helper.c:934
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr ""
+"насрещната помощна програма „%s“ не поддържа опцията „--signed=if-asked“"
+
+#: transport-helper.c:939
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr "насрещната помощна програма „%s“ не поддържа опцията „--atomic“"
+
+#: transport-helper.c:943
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr "насрещната помощна програма „%s“ не поддържа опцията „%s“"
+
+#: transport-helper.c:950
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr "насрещната помощна програма „%s“ не поддържа опции за изтласкване"
+
+#: transport-helper.c:1050
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr ""
+"насрещната помощна програма не поддържа изтласкване. Необходимо е "
+"изброяване на указателите"
+
+#: transport-helper.c:1055
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr ""
+"насрещната помощна програма не поддържа „%s“ поддържа опцията „--force“"
+
+#: transport-helper.c:1102
+msgid "couldn't run fast-export"
+msgstr "не може да се извърши бързо изнасяне"
+
+#: transport-helper.c:1107
+msgid "error while running fast-export"
+msgstr "грешка при изпълнението на командата за бързо изнасяне"
+
+#: transport-helper.c:1132
+#, 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:1214
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr "обект с неподдържан формат „%s“"
+
+#: transport-helper.c:1223
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr "неправилен отговор в списъка с указатели: „%s“"
+
+#: transport-helper.c:1375
+#, c-format
+msgid "read(%s) failed"
+msgstr "неуспешно четене на „%s“"
+
+#: transport-helper.c:1402
+#, c-format
+msgid "write(%s) failed"
+msgstr "неуспешен запис в „%s“"
+
+#: transport-helper.c:1451
+#, c-format
+msgid "%s thread failed"
+msgstr "неуспешно изпълнение на нишката „%s“"
+
+#: transport-helper.c:1455
+#, c-format
+msgid "%s thread failed to join: %s"
+msgstr "завършването на нишката „%s“ не може да се изчака: „%s“"
+
+#: transport-helper.c:1474 transport-helper.c:1478
+#, c-format
+msgid "can't start thread for copying data: %s"
+msgstr "неуспешно стартиране на нишка за копиране на данните: „%s“"
+
+#: transport-helper.c:1515
+#, c-format
+msgid "%s process failed to wait"
+msgstr "процесът на „%s“ не успя да изчака чрез „waitpid“"
+
+#: transport-helper.c:1519
+#, c-format
+msgid "%s process failed"
+msgstr "неуспешно изпълнение на „%s“"
+
+#: transport-helper.c:1537 transport-helper.c:1546
+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"
@@ -8529,43 +9287,43 @@
msgid "could not read bundle '%s'"
msgstr "пратката на git „%s“ не може да бъде прочетена"
-#: transport.c:214
+#: transport.c:220
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "transport: неправилна опция за дълбочина: %s"
-#: transport.c:266
+#: transport.c:269
msgid "see protocol.version in 'git help config' for more details"
msgstr ""
"За повече информация вижте раздела „protocol.version“ в „git help config“"
-#: transport.c:267
+#: transport.c:270
msgid "server options require protocol version 2 or later"
msgstr "опциите на сървъра изискват поне версия 2 на протокола"
-#: transport.c:632
+#: transport.c:727
msgid "could not parse transport.color.* config"
msgstr "стойността на настройката „transport.color.*“ не може да се разпознае"
-#: transport.c:705
+#: transport.c:802
msgid "support for protocol v2 not implemented yet"
msgstr "протокол версия 2 все още не се поддържа"
-#: transport.c:831
+#: transport.c:936
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "непозната стойност за настройката „%s“: „%s“"
-#: transport.c:897
+#: transport.c:1002
#, c-format
msgid "transport '%s' not allowed"
msgstr "преносът по „%s“ не е позволен"
-#: transport.c:949
+#: transport.c:1055
msgid "git-over-rsync is no longer supported"
msgstr "командата „git-over-rsync“ вече не се поддържа"
-#: transport.c:1044
+#: transport.c:1157
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -8574,7 +9332,7 @@
"Следните пътища за подмодули съдържат промени,\n"
"които липсват от всички отдалечени хранилища:\n"
-#: transport.c:1048
+#: transport.c:1161
#, c-format
msgid ""
"\n"
@@ -8599,216 +9357,31 @@
" git push\n"
"\n"
-#: transport.c:1056
+#: transport.c:1169
msgid "Aborting."
msgstr "Преустановяване на действието."
-#: transport.c:1201
+#: transport.c:1316
msgid "failed to push all needed submodules"
msgstr "неуспешно изтласкване на всички необходими подмодули"
-#: transport.c:1345 transport-helper.c:657
-msgid "operation not supported by protocol"
-msgstr "опцията не се поддържа от протокола"
-
-#: transport-helper.c:61 transport-helper.c:90
-msgid "full write to remote helper failed"
-msgstr "неуспешен пълен запис към насрещната помощна програма"
-
-#: transport-helper.c:144
-#, c-format
-msgid "unable to find remote helper for '%s'"
-msgstr "насрещната помощна програма за „%s“ не може да бъде открита"
-
-#: transport-helper.c:160 transport-helper.c:571
-msgid "can't dup helper output fd"
-msgstr ""
-"файловият дескриптор от насрещната помощна програма не може да се дублира с "
-"„dup“"
-
-#: transport-helper.c:211
-#, c-format
-msgid ""
-"unknown mandatory capability %s; this remote helper probably needs newer "
-"version of Git"
-msgstr ""
-"непозната задължителна способност „%s“. Насрещната помощна програма "
-"вероятно изисква нова версия на Git"
-
-#: transport-helper.c:217
-msgid "this remote helper should implement refspec capability"
-msgstr ""
-"насрещната помощна програма трябва да поддържа способност за изброяване на "
-"указатели"
-
-#: transport-helper.c:284 transport-helper.c:425
-#, c-format
-msgid "%s unexpectedly said: '%s'"
-msgstr "„%s“ неочаквано върна: „%s“"
-
-#: transport-helper.c:414
-#, c-format
-msgid "%s also locked %s"
-msgstr "„%s“ заключи и „%s“"
-
-#: transport-helper.c:493
-msgid "couldn't run fast-import"
-msgstr "неуспешно изпълнение на бързо внасяне"
-
-#: transport-helper.c:516
-msgid "error while running fast-import"
-msgstr "грешка при изпълнението на бързо внасяне"
-
-#: transport-helper.c:545 transport-helper.c:1134
-#, c-format
-msgid "could not read ref %s"
-msgstr "указателят „%s“ не може да се прочете"
-
-#: transport-helper.c:590
-#, c-format
-msgid "unknown response to connect: %s"
-msgstr "неочакван отговор при свързване: „%s“"
-
-#: transport-helper.c:612
-msgid "setting remote service path not supported by protocol"
-msgstr "протоколът не поддържа задаването на път на отдалечената услуга"
-
-#: transport-helper.c:614
-msgid "invalid remote service path"
-msgstr "неправилен път на отдалечената услуга"
-
-#: transport-helper.c:660
-#, c-format
-msgid "can't connect to subservice %s"
-msgstr "неуспешно свързване към подуслугата „%s“"
-
-#: transport-helper.c:736
-#, c-format
-msgid "expected ok/error, helper said '%s'"
-msgstr ""
-"очаква се или успех, или грешка, но насрещната помощна програма върна „%s“"
-
-#: transport-helper.c:789
-#, c-format
-msgid "helper reported unexpected status of %s"
-msgstr "насрещната помощна програма завърши с неочакван изходен код: „%s“"
-
-#: transport-helper.c:850
-#, c-format
-msgid "helper %s does not support dry-run"
-msgstr "насрещната помощна програма „%s“ не поддържа проби „dry-run“"
-
-#: transport-helper.c:853
-#, c-format
-msgid "helper %s does not support --signed"
-msgstr "насрещната помощна програма „%s“ не поддържа опцията „--signed“"
-
-#: transport-helper.c:856
-#, c-format
-msgid "helper %s does not support --signed=if-asked"
-msgstr ""
-"насрещната помощна програма „%s“ не поддържа опцията „--signed=if-asked“"
-
-#: transport-helper.c:861
-#, c-format
-msgid "helper %s does not support --atomic"
-msgstr "насрещната помощна програма „%s“ не поддържа опцията „--atomic“"
-
-#: transport-helper.c:867
-#, c-format
-msgid "helper %s does not support 'push-option'"
-msgstr "насрещната помощна програма „%s“ не поддържа опции за изтласкване"
-
-#: transport-helper.c:965
-msgid "remote-helper doesn't support push; refspec needed"
-msgstr ""
-"насрещната помощна програма не поддържа изтласкване. Необходимо е "
-"изброяване на указателите"
-
-#: transport-helper.c:970
-#, c-format
-msgid "helper %s does not support 'force'"
-msgstr ""
-"насрещната помощна програма не поддържа „%s“ поддържа опцията „--force“"
-
-#: transport-helper.c:1017
-msgid "couldn't run fast-export"
-msgstr "не може да се извърши бързо изнасяне"
-
-#: transport-helper.c:1022
-msgid "error while running fast-export"
-msgstr "грешка при изпълнението на командата за бързо изнасяне"
-
-#: transport-helper.c:1047
-#, c-format
-msgid ""
-"No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch such as 'master'.\n"
-msgstr ""
-"Няма общи указатели, не са указани никакви указатели — нищо няма да бъде\n"
-"направено. Пробвайте да укажете клон, напр. “master“.\n"
-
-#: transport-helper.c:1120
-#, c-format
-msgid "malformed response in ref list: %s"
-msgstr "неправилен отговор в списъка с указатели: „%s“"
-
-#: transport-helper.c:1272
-#, c-format
-msgid "read(%s) failed"
-msgstr "неуспешно четене на „%s“"
-
-#: transport-helper.c:1299
-#, c-format
-msgid "write(%s) failed"
-msgstr "неуспешен запис в „%s“"
-
-#: transport-helper.c:1348
-#, c-format
-msgid "%s thread failed"
-msgstr "неуспешно изпълнение на нишката „%s“"
-
-#: transport-helper.c:1352
-#, c-format
-msgid "%s thread failed to join: %s"
-msgstr "завършването на нишката „%s“ не може да се изчака: „%s“"
-
-#: transport-helper.c:1371 transport-helper.c:1375
-#, c-format
-msgid "can't start thread for copying data: %s"
-msgstr "неуспешно стартиране на нишка за копиране на данните: „%s“"
-
-#: transport-helper.c:1412
-#, c-format
-msgid "%s process failed to wait"
-msgstr "процесът на „%s“ не успя да изчака чрез „waitpid“"
-
-#: transport-helper.c:1416
-#, c-format
-msgid "%s process failed"
-msgstr "неуспешно изпълнение на „%s“"
-
-#: transport-helper.c:1434 transport-helper.c:1443
-msgid "can't start thread for copying data"
-msgstr "неуспешно стартиране на нишка за копиране на данните"
-
-#: tree-walk.c:32
+#: tree-walk.c:33
msgid "too-short tree object"
msgstr "прекалено кратък обект-дърво"
-#: tree-walk.c:38
+#: tree-walk.c:39
msgid "malformed mode in tree entry"
msgstr "неправилни права за достъп в запис в дърво"
-#: tree-walk.c:42
+#: tree-walk.c:43
msgid "empty filename in tree entry"
msgstr "празно име на файл в запис в дърво"
-#: tree-walk.c:117
+#: tree-walk.c:118
msgid "too-short tree file"
msgstr "прекалено кратък файл-дърво"
-#: unpack-trees.c:110
+#: unpack-trees.c:113
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -8817,7 +9390,7 @@
"Изтеглянето ще презапише локалните промени на тези файлове:\n"
"%%sПодайте или скатайте промените, за да преминете към нов клон."
-#: unpack-trees.c:112
+#: unpack-trees.c:115
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -8826,7 +9399,7 @@
"Изтеглянето ще презапише локалните промени на тези файлове:\n"
"%%s"
-#: unpack-trees.c:115
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -8835,7 +9408,7 @@
"Сливането ще презапише локалните промени на тези файлове:\n"
"%%sПодайте или скатайте промените, за да слеете."
-#: unpack-trees.c:117
+#: unpack-trees.c:120
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -8844,7 +9417,7 @@
"Сливането ще презапише локалните промени на тези файлове:\n"
"%%s"
-#: unpack-trees.c:120
+#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -8853,7 +9426,7 @@
"„%s“ ще презапише локалните промени на тези файлове:\n"
"%%sПодайте или скатайте промените, за да извършите „%s“."
-#: unpack-trees.c:122
+#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -8862,7 +9435,7 @@
"„%s“ ще презапише локалните промени на тези файлове:\n"
"%%s"
-#: unpack-trees.c:127
+#: unpack-trees.c:130
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -8871,7 +9444,7 @@
"Обновяването на следните директории ще изтрие неследените файлове в тях:\n"
"%s"
-#: unpack-trees.c:131
+#: unpack-trees.c:134
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -8880,7 +9453,7 @@
"Изтеглянето ще изтрие тези неследени файлове в работното дърво:\n"
"%%sПреместете ги или ги изтрийте, за да преминете на друг клон."
-#: unpack-trees.c:133
+#: unpack-trees.c:136
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -8889,7 +9462,7 @@
"Изтеглянето ще изтрие тези неследени файлове в работното дърво:\n"
"%%s"
-#: unpack-trees.c:136
+#: unpack-trees.c:139
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -8898,7 +9471,7 @@
"Сливането ще изтрие тези неследени файлове в работното дърво:\n"
"%%sПреместете ги или ги изтрийте, за да слеете."
-#: unpack-trees.c:138
+#: unpack-trees.c:141
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -8907,7 +9480,7 @@
"Сливането ще изтрие тези неследени файлове в работното дърво:\n"
"%%s"
-#: unpack-trees.c:141
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -8916,7 +9489,7 @@
"„%s“ ще изтрие тези неследени файлове в работното дърво:\n"
"%%sПреместете ги или ги изтрийте, за да извършите „%s“."
-#: unpack-trees.c:143
+#: unpack-trees.c:146
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -8925,7 +9498,7 @@
"„%s“ ще изтрие тези неследени файлове в работното дърво:\n"
"%%s"
-#: unpack-trees.c:149
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -8935,7 +9508,7 @@
"Изтеглянето ще презапише тези неследени файлове в работното дърво:\n"
"%%sПреместете ги или ги изтрийте, за да смените клон."
-#: unpack-trees.c:151
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -8945,7 +9518,7 @@
"Изтеглянето ще презапише тези неследени файлове в работното дърво:\n"
"%%s"
-#: unpack-trees.c:154
+#: unpack-trees.c:157
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -8954,7 +9527,7 @@
"Сливането ще презапише тези неследени файлове в работното дърво:\n"
"%%sПреместете ги или ги изтрийте, за да слеете."
-#: unpack-trees.c:156
+#: unpack-trees.c:159
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -8963,7 +9536,7 @@
"Сливането ще презапише тези неследени файлове в работното дърво:\n"
"%%s"
-#: unpack-trees.c:159
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -8972,7 +9545,7 @@
"„%s“ ще презапише тези неследени файлове в работното дърво:\n"
"%%sПреместете ги или ги изтрийте, за да извършите „%s“."
-#: unpack-trees.c:161
+#: unpack-trees.c:164
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -8981,44 +9554,12 @@
"„%s“ ще презапише тези неследени файлове в работното дърво:\n"
"%%s"
-#: unpack-trees.c:169
+#: unpack-trees.c:172
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "Записът за „%s“ съвпада с този за „%s“. Не може да се присвои."
-#: unpack-trees.c:172
-#, c-format
-msgid ""
-"Cannot update sparse checkout: the following entries are not up to date:\n"
-"%s"
-msgstr ""
-"Частичното изтегляне не може да бъде обновено: следните записи не са "
-"актуални:\n"
-"%s"
-
-#: unpack-trees.c:174
-#, c-format
-msgid ""
-"The following working tree files would be overwritten by sparse checkout "
-"update:\n"
-"%s"
-msgstr ""
-"Обновяването на частичното изтегляне ще презапише тези файлове в работното "
-"дърво:\n"
-"%s"
-
-#: unpack-trees.c:176
-#, c-format
-msgid ""
-"The following working tree files would be removed by sparse checkout "
-"update:\n"
-"%s"
-msgstr ""
-"Обновяването на частичното изтегляне ще изтрие тези файлове в работното "
-"дърво:\n"
-"%s"
-
-#: unpack-trees.c:178
+#: unpack-trees.c:175
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -9027,16 +9568,59 @@
"Подмодулът не може да бъде обновен:\n"
"„%s“"
-#: unpack-trees.c:255
+#: 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:317
+#: 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:349
+#: 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"
@@ -9046,10 +9630,14 @@
"във файлови системи, които не различават главни от малки букви)\n"
"и само един от участниците в конфликта е в работното дърво:\n"
-#: unpack-trees.c:1445
+#: unpack-trees.c:1498
msgid "Updating index flags"
msgstr "Обновяване на флаговете на индекса"
+#: upload-pack.c:1543
+msgid "expected flush after fetch arguments"
+msgstr "след аргументите на „fetch“ се очаква изчистване на буферите"
+
#: urlmatch.c:163
msgid "invalid URL scheme name or missing '://' suffix"
msgstr "неправилна схема за адрес или суфиксът „://“ липсва"
@@ -9083,28 +9671,28 @@
msgid "Fetching objects"
msgstr "Доставяне на обектите"
-#: worktree.c:259 builtin/am.c:2099
+#: worktree.c:238 builtin/am.c:2103
#, c-format
msgid "failed to read '%s'"
msgstr "„%s“ не може да бъде прочетен"
-#: worktree.c:305
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "„%s“ в основното работно дърво не е директорията на хранилището"
-#: worktree.c:316
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
"файлът „%s“ не съдържа абсолютния път към местоположението на работното дърво"
-#: worktree.c:328
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "„%s“ не съществува."
-#: worktree.c:334
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "„%s“ не е файл на .git, код за грешка: %d"
@@ -9114,17 +9702,85 @@
msgid "'%s' does not point back to '%s'"
msgstr "„%s“ не сочи към обратно към „%s“"
-#: wrapper.c:186 wrapper.c:356
+#: worktree.c:608
+msgid "not a directory"
+msgstr "не е директория"
+
+#: worktree.c:617
+msgid ".git is not a file"
+msgstr "„.git“ не е файл"
+
+#: worktree.c:619
+msgid ".git file broken"
+msgstr "„.git“ е повреден"
+
+#: worktree.c:621
+msgid ".git file incorrect"
+msgstr "„.git“ е неправилен"
+
+#: worktree.c:727
+msgid "not a valid path"
+msgstr "неправилен път"
+
+#: worktree.c:733
+msgid "unable to locate repository; .git is not a file"
+msgstr "не може да се открие хранилище: „.git“ не е файл"
+
+#: worktree.c:737
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr "не може да се открие хранилище: файлът „.git“ не сочи към хранилище"
+
+#: worktree.c:741
+msgid "unable to locate repository; .git file broken"
+msgstr "не може да се открие хранилище: „.git“ е повреден"
+
+#: worktree.c:747
+msgid "gitdir unreadable"
+msgstr "директорията „gitdir“ не може да се прочете"
+
+#: worktree.c:751
+msgid "gitdir incorrect"
+msgstr "неправилна директория „gitdir“"
+
+#: worktree.c:776
+msgid "not a valid directory"
+msgstr "не е валидна директория"
+
+#: worktree.c:782
+msgid "gitdir file does not exist"
+msgstr "файлът „gitdir“ не съществува"
+
+#: worktree.c:787 worktree.c:796
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "файлът „gitdir“ не може да бъде прочетен (%s)"
+
+#: worktree.c:806
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr ""
+"изчитането върна по-малко байтове от очакваното (очаквани: %<PRIuMAX> байта, "
+"получени: %<PRIuMAX>)"
+
+#: worktree.c:814
+msgid "invalid gitdir file"
+msgstr "неправилен файл „gitdir“"
+
+#: worktree.c:822
+msgid "gitdir file points to non-existent location"
+msgstr "файлът „gitdir“ сочи несъществуващо местоположение"
+
+#: wrapper.c:197 wrapper.c:367
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "„%s“ не може да бъде отворен и за четене, и за запис"
-#: wrapper.c:387 wrapper.c:588
+#: wrapper.c:398 wrapper.c:599
#, c-format
msgid "unable to access '%s'"
msgstr "няма достъп до „%s“"
-#: wrapper.c:596
+#: wrapper.c:607
msgid "unable to get current working directory"
msgstr "текущата работна директория е недостъпна"
@@ -9165,11 +9821,11 @@
msgstr ""
" (използвайте „git rm ФАЙЛ…“, за да укажете разрешаването на конфликта)"
-#: wt-status.c:211 wt-status.c:1074
+#: wt-status.c:211 wt-status.c:1072
msgid "Changes to be committed:"
msgstr "Промени, които ще бъдат подадени:"
-#: wt-status.c:234 wt-status.c:1083
+#: wt-status.c:234 wt-status.c:1081
msgid "Changes not staged for commit:"
msgstr "Промени, които не са в индекса за подаване:"
@@ -9202,94 +9858,94 @@
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:905
#, 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:936
msgid "Submodules changed but not updated:"
msgstr "Подмодулите са променени, но не са обновени:"
-#: wt-status.c:940
+#: wt-status.c:938
msgid "Submodule changes to be committed:"
msgstr "Промени в подмодулите за подаване:"
-#: wt-status.c:1022
+#: wt-status.c:1020
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
@@ -9297,7 +9953,7 @@
"Не променяйте и не изтривайте горния ред.\n"
"Всичко отдолу ще бъде изтрито."
-#: wt-status.c:1114
+#: wt-status.c:1112
#, c-format
msgid ""
"\n"
@@ -9308,257 +9964,271 @@
"Изчисляването на броя различаващи се подавания отне %.2f сек.\n"
"За да избегнете това, ползвайте „--no-ahead-behind“.\n"
-#: wt-status.c:1144
+#: wt-status.c:1142
msgid "You have unmerged paths."
msgstr "Някои пътища не са слети."
-#: wt-status.c:1147
+#: wt-status.c:1145
msgid " (fix conflicts and run \"git commit\")"
msgstr " (коригирайте конфликтите и изпълнете „git commit“)"
-#: wt-status.c:1149
+#: wt-status.c:1147
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (използвайте „git merge --abort“, за да преустановите сливането)"
-#: wt-status.c:1153
+#: wt-status.c:1151
msgid "All conflicts fixed but you are still merging."
msgstr "Всички конфликти са решени, но продължавате сливането."
-#: wt-status.c:1156
+#: wt-status.c:1154
msgid " (use \"git commit\" to conclude merge)"
msgstr " (използвайте „git commit“, за да завършите сливането)"
-#: wt-status.c:1165
+#: wt-status.c:1163
msgid "You are in the middle of an am session."
msgstr "В момента прилагате поредица от кръпки чрез „git am“."
-#: wt-status.c:1168
+#: wt-status.c:1166
msgid "The current patch is empty."
msgstr "Текущата кръпка е празна."
-#: wt-status.c:1172
+#: wt-status.c:1170
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (коригирайте конфликтите и изпълнете „git am --continue“)"
-#: wt-status.c:1174
+#: wt-status.c:1172
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (използвайте „git am --skip“, за да пропуснете тази кръпка)"
-#: wt-status.c:1176
+#: wt-status.c:1174
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
" (използвайте „git am --abort“, за да възстановите първоначалния клон)"
-#: wt-status.c:1309
+#: wt-status.c:1307
msgid "git-rebase-todo is missing."
msgstr "„git-rebase-todo“ липсва."
-#: wt-status.c:1311
+#: wt-status.c:1309
msgid "No commands done."
msgstr "Не са изпълнени команди."
-#: 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] "Последно изпълнена команда (изпълнена е общо %d команда):"
msgstr[1] "Последно изпълнени команди (изпълнени са общо %d команди):"
-#: wt-status.c:1325
+#: wt-status.c:1323
#, c-format
msgid " (see more in file %s)"
msgstr " (повече информация има във файла „%s“)"
-#: wt-status.c:1330
+#: wt-status.c:1328
msgid "No commands remaining."
msgstr "Не остават повече команди."
-#: 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] "Следваща команда за изпълнение (остава още %d команда):"
msgstr[1] "Следващи команди за изпълнение (остават още %d команди):"
-#: wt-status.c:1341
+#: wt-status.c:1339
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr ""
" (използвайте „git rebase --edit-todo“, за да разгледате и редактирате)"
-#: wt-status.c:1353
+#: wt-status.c:1351
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "В момента пребазирате клона „%s“ върху „%s“."
-#: wt-status.c:1358
+#: wt-status.c:1356
msgid "You are currently rebasing."
msgstr "В момента пребазирате."
-#: wt-status.c:1371
+#: wt-status.c:1369
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (коригирайте конфликтите и използвайте „git rebase --continue“)"
-#: wt-status.c:1373
+#: wt-status.c:1371
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (използвайте „git rebase --skip“, за да пропуснете тази кръпка)"
-#: wt-status.c:1375
+#: wt-status.c:1373
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
" (използвайте „git rebase --abort“, за да възстановите първоначалния клон)"
-#: wt-status.c:1382
+#: wt-status.c:1380
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (всички конфликти са коригирани: изпълнете „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'."
msgstr "В момента разделяте подаване докато пребазирате клона „%s“ върху „%s“."
-#: wt-status.c:1391
+#: wt-status.c:1389
msgid "You are currently splitting a commit during a rebase."
msgstr "В момента разделяте подаване докато пребазирате."
-#: wt-status.c:1394
+#: wt-status.c:1392
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (След като работното ви дърво стане чисто, използвайте „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 ""
"В момента редактирате подаване докато пребазирате клона „%s“ върху „%s“."
-#: wt-status.c:1403
+#: wt-status.c:1401
msgid "You are currently editing a commit during a rebase."
msgstr "В момента редактирате подаване докато пребазирате."
-#: wt-status.c:1406
+#: wt-status.c:1404
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
" (използвайте „git commit --amend“, за да редактирате текущото подаване)"
-#: wt-status.c:1408
+#: wt-status.c:1406
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (използвайте „git rebase --continue“, след като завършите промените си)"
-#: wt-status.c:1419
+#: wt-status.c:1417
msgid "Cherry-pick currently in progress."
msgstr "В момента се извършва отбиране на подавания."
-#: wt-status.c:1422
+#: wt-status.c:1420
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "В момента отбирате подаването „%s“."
-#: wt-status.c:1429
+#: wt-status.c:1427
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (коригирайте конфликтите и изпълнете „git cherry-pick --continue“)"
-#: wt-status.c:1432
+#: wt-status.c:1430
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (за да продължите, изпълнете „git cherry-pick --continue“)"
-#: wt-status.c:1435
+#: wt-status.c:1433
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (всички конфликти са коригирани, изпълнете „git cherry-pick --continue“)"
-#: wt-status.c:1437
+#: wt-status.c:1435
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
msgstr " (използвайте „git cherry-pick --skip“, за да пропуснете тази кръпка)"
-#: wt-status.c:1439
+#: wt-status.c:1437
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (използвайте „git cherry-pick --abort“, за да отмените всички действия с "
"отбиране)"
-#: wt-status.c:1449
+#: wt-status.c:1447
msgid "Revert currently in progress."
msgstr "В момента тече отмяна на подаване."
-#: wt-status.c:1452
+#: wt-status.c:1450
#, c-format
msgid "You are currently reverting commit %s."
msgstr "В момента отменяте подаване „%s“."
-#: wt-status.c:1458
+#: wt-status.c:1456
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (коригирайте конфликтите и изпълнете „git revert --continue“)"
-#: wt-status.c:1461
+#: wt-status.c:1459
msgid " (run \"git revert --continue\" to continue)"
msgstr " (за да продължите, изпълнете „git revert --continue“)"
-#: wt-status.c:1464
+#: wt-status.c:1462
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (всички конфликти са коригирани, изпълнете „git revert --continue“)"
-#: wt-status.c:1466
+#: wt-status.c:1464
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr " (използвайте „git revert --skip“, за да пропуснете тази кръпка)"
-#: wt-status.c:1468
+#: wt-status.c:1466
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
" (използвайте „git revert --abort“, за да преустановите отмяната на "
"подаване)"
-#: wt-status.c:1478
+#: wt-status.c:1476
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "В момента търсите двоично, като сте стартирали от клон „%s“."
-#: wt-status.c:1482
+#: wt-status.c:1480
msgid "You are currently bisecting."
msgstr "В момента търсите двоично."
-#: wt-status.c:1485
+#: wt-status.c:1483
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
" (използвайте „git bisect reset“, за да се върнете към първоначалното "
"състояние и клон)"
-#: wt-status.c:1694
+#: wt-status.c:1494
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr ""
+"Намирате се в частично изтеглено хранилище с %d%% налични, следени файла."
+
+#: wt-status.c:1733
msgid "On branch "
msgstr "На клон "
-#: wt-status.c:1701
+#: wt-status.c:1740
msgid "interactive rebase in progress; onto "
msgstr "извършвате интерактивно пребазиране върху "
-#: wt-status.c:1703
+#: wt-status.c:1742
msgid "rebase in progress; onto "
msgstr "извършвате пребазиране върху "
-#: wt-status.c:1713
+#: wt-status.c:1747
+msgid "HEAD detached at "
+msgstr "Указателят „HEAD“ не е свързан и е при "
+
+#: wt-status.c:1749
+msgid "HEAD detached from "
+msgstr "Указателят „HEAD“ не е свързан и е отделѐн от "
+
+#: wt-status.c:1752
msgid "Not currently on any branch."
msgstr "Извън всички клони."
-#: wt-status.c:1730
+#: wt-status.c:1769
msgid "Initial commit"
msgstr "Първоначално подаване"
-#: wt-status.c:1731
+#: wt-status.c:1770
msgid "No commits yet"
msgstr "Все още липсват подавания"
-#: wt-status.c:1745
+#: wt-status.c:1784
msgid "Untracked files"
msgstr "Неследени файлове"
-#: wt-status.c:1747
+#: wt-status.c:1786
msgid "Ignored files"
msgstr "Игнорирани файлове"
-#: wt-status.c:1751
+#: wt-status.c:1790
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -9566,36 +10236,36 @@
"new files yourself (see 'git help status')."
msgstr ""
"Бяха необходими %.2f секунди за изброяването на неследените файлове.\n"
-"Добавянето на опцията „-uno“ към командата „git status“, ще ускори\n"
+"Добавянето на опцията „-uno“ към командата „git status“ ще ускори\n"
"изпълнението, но ще трябва да добавяте новите файлове ръчно.\n"
"За повече подробности погледнете „git status help“."
-#: wt-status.c:1757
+#: wt-status.c:1796
#, c-format
msgid "Untracked files not listed%s"
msgstr "Неследените файлове не са изведени%s"
-#: wt-status.c:1759
+#: wt-status.c:1798
msgid " (use -u option to show untracked files)"
msgstr " (използвайте опцията „-u“, за да изведете неследените файлове)"
-#: wt-status.c:1765
+#: wt-status.c:1804
msgid "No changes"
msgstr "Няма промени"
-#: wt-status.c:1770
+#: wt-status.c:1809
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"към индекса за подаване не са добавени промени (използвайте „git add“ и/или "
"„git commit -a“)\n"
-#: wt-status.c:1773
+#: wt-status.c:1813
#, c-format
msgid "no changes added to commit\n"
msgstr "към индекса за подаване не са добавени промени\n"
-#: wt-status.c:1776
+#: wt-status.c:1817
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -9604,71 +10274,71 @@
"към индекса за подаване не са добавени промени, но има нови файлове "
"(използвайте „git add“, за да започне тяхното следене)\n"
-#: wt-status.c:1779
+#: wt-status.c:1821
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "към индекса за подаване не са добавени промени, но има нови файлове\n"
-#: wt-status.c:1782
+#: wt-status.c:1825
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"липсват каквито и да е промени (създайте или копирайте файлове и използвайте "
"„git add“, за да започне тяхното следене)\n"
-#: wt-status.c:1785 wt-status.c:1790
+#: wt-status.c:1829 wt-status.c:1835
#, c-format
msgid "nothing to commit\n"
msgstr "липсват каквито и да е промени\n"
-#: wt-status.c:1788
+#: wt-status.c:1832
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"липсват каквито и да е промени (използвайте опцията „-u“, за да се изведат и "
"неследените файлове)\n"
-#: wt-status.c:1792
+#: wt-status.c:1837
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "липсват каквито и да е промени, работното дърво е чисто\n"
-#: wt-status.c:1905
+#: wt-status.c:1942
msgid "No commits yet on "
msgstr "Все още липсват подавания в "
-#: wt-status.c:1909
+#: wt-status.c:1946
msgid "HEAD (no branch)"
msgstr "HEAD (извън клон)"
-#: wt-status.c:1940
+#: wt-status.c:1977
msgid "different"
msgstr "различен"
-#: wt-status.c:1942 wt-status.c:1950
+#: wt-status.c:1979 wt-status.c:1987
msgid "behind "
msgstr "назад с "
-#: wt-status.c:1945 wt-status.c:1948
+#: wt-status.c:1982 wt-status.c:1985
msgid "ahead "
msgstr "напред с "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2470
+#: wt-status.c:2507
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "не може да извършите „%s“, защото има промени, които не са в индекса."
-#: wt-status.c:2476
+#: wt-status.c:2513
msgid "additionally, your index contains uncommitted changes."
msgstr "освен това в индекса има неподадени промени."
-#: wt-status.c:2478
+#: wt-status.c:2515
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "не може да извършите „%s“, защото в индекса има неподадени промени."
-#: compat/precompose_utf8.c:58 builtin/clone.c:455
+#: compat/precompose_utf8.c:58 builtin/clone.c:457
#, c-format
msgid "failed to unlink '%s'"
msgstr "неуспешно изтриване на „%s“"
@@ -9677,132 +10347,137 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [ОПЦИЯ…] [--] ПЪТ…"
-#: builtin/add.c:88
+#: builtin/add.c:58
+#, c-format
+msgid "cannot chmod %cx '%s'"
+msgstr "правата на „%2$s“ не може да се зададат да са %1$cx"
+
+#: builtin/add.c:96
#, c-format
msgid "unexpected diff status %c"
msgstr "неочакван изходен код при генериране на разлика: %c"
-#: builtin/add.c:93 builtin/commit.c:288
+#: builtin/add.c:101 builtin/commit.c:285
msgid "updating files failed"
msgstr "неуспешно обновяване на файловете"
-#: builtin/add.c:103
+#: builtin/add.c:111
#, c-format
msgid "remove '%s'\n"
msgstr "изтриване на „%s“\n"
-#: builtin/add.c:178
+#: builtin/add.c:186
msgid "Unstaged changes after refreshing the index:"
msgstr "Промени, които и след обновяването на индекса не са добавени към него:"
-#: builtin/add.c:266 builtin/rev-parse.c:899
+#: builtin/add.c:280 builtin/rev-parse.c:991
msgid "Could not read the index"
msgstr "Индексът не може да бъде прочетен"
-#: builtin/add.c:277
+#: builtin/add.c:291
#, c-format
msgid "Could not open '%s' for writing."
msgstr "Файлът „%s“ не може да бъде отворен за запис."
-#: builtin/add.c:281
+#: builtin/add.c:295
msgid "Could not write patch"
msgstr "Кръпката не може да бъде записана"
-#: builtin/add.c:284
+#: builtin/add.c:298
msgid "editing patch failed"
msgstr "неуспешно редактиране на кръпка"
-#: builtin/add.c:287
+#: builtin/add.c:301
#, c-format
msgid "Could not stat '%s'"
msgstr "Не може да се получи информация чрез „stat“ за файла „%s“"
-#: builtin/add.c:289
+#: builtin/add.c:303
msgid "Empty patch. Aborted."
msgstr "Празна кръпка, преустановяване на действието."
-#: builtin/add.c:294
+#: builtin/add.c:308
#, c-format
msgid "Could not apply '%s'"
msgstr "Кръпката „%s“ не може да бъде приложена"
-#: builtin/add.c:302
+#: builtin/add.c:316
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Следните пътища ще бъдат игнорирани според някой от файловете „.gitignore“:\n"
-#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548
-#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
+#: builtin/add.c:336 builtin/clean.c:904 builtin/fetch.c:169 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559
+#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190
msgid "dry run"
msgstr "пробно изпълнение"
-#: builtin/add.c:325
+#: builtin/add.c:339
msgid "interactive picking"
msgstr "интерактивно отбиране на промени"
-#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307
+#: builtin/add.c:340 builtin/checkout.c:1546 builtin/reset.c:308
msgid "select hunks interactively"
msgstr "интерактивен избор на парчета код"
-#: builtin/add.c:327
+#: builtin/add.c:341
msgid "edit current diff and apply"
msgstr "редактиране на текущата разлика и прилагане"
-#: builtin/add.c:328
+#: builtin/add.c:342
msgid "allow adding otherwise ignored files"
msgstr "добавяне и на иначе игнорираните файлове"
-#: builtin/add.c:329
+#: builtin/add.c:343
msgid "update tracked files"
msgstr "обновяване на следените файлове"
-#: builtin/add.c:330
+#: builtin/add.c:344
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "уеднаквяване на знаците за край на файл (включва опцията „-u“)"
-#: builtin/add.c:331
+#: builtin/add.c:345
msgid "record only the fact that the path will be added later"
msgstr "отбелязване само на факта, че пътят ще бъде добавен по-късно"
-#: builtin/add.c:332
+#: builtin/add.c:346
msgid "add changes from all tracked and untracked files"
msgstr "добавяне на всички промени в следените и неследените файлове"
-#: builtin/add.c:335
+#: builtin/add.c:349
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
"игнориране на пътищата, които са изтрити от работното дърво (същото като „--"
"no-all“)"
-#: builtin/add.c:337
+#: builtin/add.c:351
msgid "don't add, only refresh the index"
msgstr "без добавяне на нови файлове, само обновяване на индекса"
-#: builtin/add.c:338
+#: builtin/add.c:352
msgid "just skip files which cannot be added because of errors"
msgstr ""
"прескачане на файловете, които не могат да бъдат добавени поради грешки"
-#: builtin/add.c:339
+#: builtin/add.c:353
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
"проверка, че при пробно изпълнение всички файлове, дори и изтритите, се "
"игнорират"
-#: builtin/add.c:341 builtin/update-index.c:1004
+#: builtin/add.c:355 builtin/update-index.c:1004
msgid "override the executable bit of the listed files"
msgstr "изрично задаване на стойността на флага дали файлът е изпълним"
-#: builtin/add.c:343
+#: builtin/add.c:357
msgid "warn when adding an embedded repository"
msgstr "предупреждаване при добавяне на вградено хранилище"
-#: builtin/add.c:345
+#: builtin/add.c:359
msgid "backend for `git stash -p`"
msgstr "реализация на „git stash -p“"
-#: builtin/add.c:363
+#: builtin/add.c:377
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -9833,12 +10508,12 @@
"\n"
"За повече информация погледнете „git help submodule“."
-#: builtin/add.c:391
+#: builtin/add.c:405
#, c-format
msgid "adding embedded git repository: %s"
msgstr "добавяне на вградено хранилище: %s"
-#: builtin/add.c:410
+#: builtin/add.c:424
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
@@ -9849,50 +10524,50 @@
"\n"
" git config advice.addIgnoredFile false"
-#: builtin/add.c:419
+#: builtin/add.c:433
msgid "adding files failed"
msgstr "неуспешно добавяне на файлове"
-#: builtin/add.c:447 builtin/commit.c:348
+#: builtin/add.c:461 builtin/commit.c:345
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
msgstr ""
"опцията „--pathspec-from-file“ е несъвместима с всяка от опциите „--"
"interactive“/„--patch“"
-#: builtin/add.c:464
+#: builtin/add.c:478
msgid "--pathspec-from-file is incompatible with --edit"
msgstr "опциите „--pathspec-from-file“ и „--edit“ са несъвместими"
-#: builtin/add.c:476
+#: builtin/add.c:490
msgid "-A and -u are mutually incompatible"
msgstr "опциите „-A“ и „-u“ са несъвместими"
-#: builtin/add.c:479
+#: builtin/add.c:493
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "Опцията „--ignore-missing“ изисква „--dry-run“"
-#: builtin/add.c:483
+#: builtin/add.c:497
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "параметърът към „--chmod“ — „%s“ може да е или „-x“, или „+x“"
-#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354
-#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509
+#: builtin/add.c:515 builtin/checkout.c:1714 builtin/commit.c:351
+#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1569
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr ""
"опцията „--pathspec-from-file“ е несъвместима с аргументи, указващи пътища"
-#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360
-#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515
+#: builtin/add.c:522 builtin/checkout.c:1726 builtin/commit.c:357
+#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1575
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr "опцията „--pathspec-file-nul“ изисква опция „--pathspec-from-file“"
-#: builtin/add.c:512
+#: builtin/add.c:526
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Нищо не е зададено и нищо не е добавено.\n"
-#: builtin/add.c:514
+#: builtin/add.c:528
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
@@ -9952,7 +10627,7 @@
msgid "Patch format detection failed."
msgstr "Форматът на кръпката не може да бъде определен."
-#: builtin/am.c:953 builtin/clone.c:409
+#: builtin/am.c:953 builtin/clone.c:410
#, c-format
msgid "failed to create directory '%s'"
msgstr "директорията „%s“ не може да бъде създадена"
@@ -10026,12 +10701,12 @@
msgid "applying to an empty history"
msgstr "прилагане върху празна история"
-#: builtin/am.c:1621 builtin/am.c:1625
+#: builtin/am.c:1626 builtin/am.c:1630
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "не може да се продължи — „%s“ не съществува."
-#: builtin/am.c:1643
+#: builtin/am.c:1648
msgid "Commit Body is:"
msgstr "Тялото на кръпката за прилагане е:"
@@ -10039,45 +10714,45 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1653
+#: builtin/am.c:1658
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
"Прилагане? „y“ — да/„n“ — не/„e“ — редактиране/„v“ — преглед/„a“ — приемане "
"на всичко:"
-#: builtin/am.c:1700 builtin/commit.c:398
+#: builtin/am.c:1704 builtin/commit.c:395
msgid "unable to write index file"
msgstr "индексът не може да бъде записан"
-#: builtin/am.c:1704
+#: builtin/am.c:1708
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
"Индексът не е чист: кръпките не могат да бъдат приложени (замърсени са: %s)"
-#: builtin/am.c:1744 builtin/am.c:1812
+#: builtin/am.c:1748 builtin/am.c:1816
#, c-format
msgid "Applying: %.*s"
msgstr "Прилагане: %.*s"
-#: builtin/am.c:1761
+#: builtin/am.c:1765
msgid "No changes -- Patch already applied."
msgstr "Без промени — кръпката вече е приложена."
-#: builtin/am.c:1767
+#: builtin/am.c:1771
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Неуспешно прилагане на кръпка при %s %.*s“"
-#: builtin/am.c:1771
+#: builtin/am.c:1775
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr ""
"За да видите неуспешно приложени кръпки, използвайте:\n"
"\n"
" git am --show-current-patch=diff"
-#: builtin/am.c:1815
+#: builtin/am.c:1819
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -10087,7 +10762,7 @@
"Ако няма друга промяна за включване в индекса, най-вероятно някоя друга\n"
"кръпка е довела до същите промени и в такъв случай просто пропуснете тази."
-#: builtin/am.c:1822
+#: builtin/am.c:1826
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -10098,17 +10773,17 @@
"След корекция на конфликтите изпълнете „git add“ върху поправените файлове.\n"
"За да приемете „изтрити от тях“, изпълнете „git rm“ върху изтритите файлове."
-#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346
-#: builtin/reset.c:354
+#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 builtin/reset.c:347
+#: builtin/reset.c:355
#, c-format
msgid "Could not parse object '%s'."
msgstr "„%s“ не е разпознат като обект."
-#: builtin/am.c:1981
+#: builtin/am.c:1985
msgid "failed to clean index"
msgstr "индексът не може да бъде изчистен"
-#: builtin/am.c:2025
+#: builtin/am.c:2029
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -10119,160 +10794,162 @@
"сочи към\n"
"„ORIG_HEAD“"
-#: builtin/am.c:2132
+#: builtin/am.c:2136
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Неправилна стойност за „--patch-format“: „%s“"
-#: builtin/am.c:2172
+#: builtin/am.c:2178
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr "Неправилна стойност за „--show-current-patch“: „%s“"
-#: builtin/am.c:2176
+#: builtin/am.c:2182
#, c-format
msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
msgstr ""
"опциите „--show-current-patch=%s“ и „--show-current-patch=%s“ са несъвместими"
-#: builtin/am.c:2207
+#: builtin/am.c:2213
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [ОПЦИЯ…] [(ФАЙЛ_С_ПОЩА|ДИРЕКТОРИЯ_С_ПОЩА)…]"
-#: builtin/am.c:2208
+#: builtin/am.c:2214
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [ОПЦИЯ…] (--continue | --quit | --abort)"
-#: builtin/am.c:2214
+#: builtin/am.c:2220
msgid "run interactively"
msgstr "интерактивна работа"
-#: builtin/am.c:2216
+#: builtin/am.c:2222
msgid "historical option -- no-op"
msgstr "изоставена опция, съществува по исторически причини, нищо не прави"
-#: builtin/am.c:2218
+#: builtin/am.c:2224
msgid "allow fall back on 3way merging if needed"
msgstr "да се преминава към тройно сливане при нужда."
-#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:304 builtin/stash.c:812
+#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16
+#: builtin/repack.c:334 builtin/stash.c:882
msgid "be quiet"
msgstr "без извеждане на информация"
-#: builtin/am.c:2221
-msgid "add a Signed-off-by line to the commit message"
-msgstr "добавяне на ред за подпис „Signed-off-by“ в съобщението за подаване"
+#: builtin/am.c:2227
+msgid "add a Signed-off-by trailer to the commit message"
+msgstr "добавяне на епилог за подпис „Signed-off-by“ в съобщението за подаване"
-#: builtin/am.c:2224
+#: builtin/am.c:2230
msgid "recode into utf8 (default)"
msgstr "прекодиране в UTF-8 (стандартно)"
-#: builtin/am.c:2226
+#: builtin/am.c:2232
msgid "pass -k flag to git-mailinfo"
msgstr "подаване на опцията „-k“ на командата „git-mailinfo“"
-#: builtin/am.c:2228
+#: builtin/am.c:2234
msgid "pass -b flag to git-mailinfo"
msgstr "подаване на опцията „-b“ на командата „git-mailinfo“"
-#: builtin/am.c:2230
+#: builtin/am.c:2236
msgid "pass -m flag to git-mailinfo"
msgstr "подаване на опцията „-m“ на командата „git-mailinfo“"
-#: builtin/am.c:2232
+#: builtin/am.c:2238
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
"подаване на опцията „--keep-cr“ на командата „git-mailsplit“ за формат „mbox“"
-#: builtin/am.c:2235
+#: builtin/am.c:2241
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"без подаване на опцията „--keep-cr“ на командата „git-mailsplit“ независимо "
"от „am.keepcr“"
-#: builtin/am.c:2238
+#: builtin/am.c:2244
msgid "strip everything before a scissors line"
msgstr "пропускане на всичко преди реда за отрязване"
-#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249
-#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261
-#: builtin/am.c:2267
+#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
+#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
+#: builtin/am.c:2273
msgid "pass it through git-apply"
msgstr "прекарване през „git-apply“"
-#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670
-#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250
-#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505
-#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321
-#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:154 parse-options.h:175 parse-options.h:316
+#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:904 builtin/merge.c:261
+#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
+#: builtin/rebase.c:1347 builtin/repack.c:345 builtin/repack.c:349
+#: builtin/repack.c:351 builtin/show-branch.c:650 builtin/show-ref.c:172
+#: builtin/tag.c:436 parse-options.h:154 parse-options.h:175
+#: parse-options.h:316
msgid "n"
msgstr "БРОЙ"
-#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38
+#: builtin/am.c:2269 builtin/branch.c:670 builtin/bugreport.c:136
+#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:470
+#: builtin/verify-tag.c:38
msgid "format"
msgstr "ФОРМАТ"
-#: builtin/am.c:2264
+#: builtin/am.c:2270
msgid "format the patch(es) are in"
msgstr "формат на кръпките"
-#: builtin/am.c:2270
+#: builtin/am.c:2276
msgid "override error message when patch failure occurs"
msgstr "избрано от вас съобщение за грешка при прилагане на кръпки"
-#: builtin/am.c:2272
+#: builtin/am.c:2278
msgid "continue applying patches after resolving a conflict"
msgstr "продължаване на прилагането на кръпки след коригирането на конфликт"
-#: builtin/am.c:2275
+#: builtin/am.c:2281
msgid "synonyms for --continue"
msgstr "псевдоними на „--continue“"
-#: builtin/am.c:2278
+#: builtin/am.c:2284
msgid "skip the current patch"
msgstr "прескачане на текущата кръпка"
-#: builtin/am.c:2281
-msgid "restore the original branch and abort the patching operation."
+#: builtin/am.c:2287
+msgid "restore the original branch and abort the patching operation"
msgstr ""
"възстановяване на първоначалното състояние на клона и преустановяване на "
-"прилагането на кръпката."
+"прилагането на кръпката"
-#: builtin/am.c:2284
-msgid "abort the patching operation but keep HEAD where it is."
+#: builtin/am.c:2290
+msgid "abort the patching operation but keep HEAD where it is"
msgstr ""
-"преустановяване на прилагането на кръпката без промяна към кое сочи „HEAD“."
+"преустановяване на прилагането на кръпката без промяна към кое сочи „HEAD“"
-#: builtin/am.c:2288
+#: builtin/am.c:2294
msgid "show the patch being applied"
msgstr "показване на прилаганата кръпка"
-#: builtin/am.c:2293
+#: builtin/am.c:2299
msgid "lie about committer date"
msgstr "дата за подаване различна от първоначалната"
-#: builtin/am.c:2295
+#: builtin/am.c:2301
msgid "use current timestamp for author date"
msgstr "използване на текущото време като това за автор"
-#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512
-#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517
-#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418
+#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515
+#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:538
+#: builtin/rebase.c:1400 builtin/revert.c:117 builtin/tag.c:451
msgid "key-id"
msgstr "ИДЕНТИФИКАТОР_НА_КЛЮЧ"
-#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
+#: builtin/am.c:2304 builtin/rebase.c:539 builtin/rebase.c:1401
msgid "GPG-sign commits"
msgstr "подписване на подаванията с GPG"
-#: builtin/am.c:2301
+#: builtin/am.c:2307
msgid "(internal use for git-rebase)"
msgstr "(ползва се вътрешно за „git-rebase“)"
-#: builtin/am.c:2319
+#: builtin/am.c:2325
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
@@ -10280,18 +10957,18 @@
"Опциите „-b“/„--binary“ отдавна не правят нищо и\n"
"ще бъдат премахнати в бъдеще. Не ги ползвайте."
-#: builtin/am.c:2326
+#: builtin/am.c:2332
msgid "failed to read the index"
msgstr "неуспешно изчитане на индекса"
-#: builtin/am.c:2341
+#: builtin/am.c:2347
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
"предишната директория за пребазиране „%s“ все още съществува, а е зададен "
"файл „mbox“."
-#: builtin/am.c:2365
+#: builtin/am.c:2371
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -10300,11 +10977,11 @@
"Открита е излишна директория „%s“.\n"
"Можете да я изтриете с командата „git am --abort“."
-#: builtin/am.c:2371
+#: builtin/am.c:2377
msgid "Resolve operation not in progress, we are not resuming."
msgstr "В момента не тече операция по коригиране и няма как да се продължи."
-#: builtin/am.c:2381
+#: builtin/am.c:2387
msgid "interactive mode requires patches on the command line"
msgstr "интерактивният режим изисква кръпки на командния ред"
@@ -10343,40 +11020,15 @@
msgid "git archive: expected a flush"
msgstr "git archive: очакваше се изчистване на буферите чрез „flush“"
-#: builtin/bisect--helper.c:22
-msgid "git bisect--helper --next-all [--no-checkout]"
-msgstr "git bisect--helper --next-all [--no-checkout]"
-
#: builtin/bisect--helper.c:23
-msgid "git bisect--helper --write-terms <bad_term> <good_term>"
-msgstr "git bisect--helper --write-terms ЛОШО ДОБРО"
-
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-clean-state"
-msgstr "git bisect--helper --bisect-clean-state"
-
-#: builtin/bisect--helper.c:25
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --bisect-reset [ПОДАВАНЕ]"
-#: builtin/bisect--helper.c:26
-msgid ""
-"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
-"<bad_term>"
-msgstr ""
-"git bisect--helper --bisect-write [--no-log] СЪСТОЯНИЕ ВЕРСИЯ ДОБРО ЛОШО"
-
-#: builtin/bisect--helper.c:27
-msgid ""
-"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
-"<bad_term>"
-msgstr "git bisect--helper --bisect-check-and-set-terms КОМАНДА ДОБРО"
-
-#: builtin/bisect--helper.c:28
+#: builtin/bisect--helper.c:24
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:25
msgid ""
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
"term-new]"
@@ -10384,48 +11036,75 @@
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
"term-new]"
+#: builtin/bisect--helper.c:26
+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:28
+msgid "git bisect--helper --bisect-next"
+msgstr "git bisect--helper --bisect-next"
+
+#: builtin/bisect--helper.c:29
+msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
+msgstr "git bisect--helper --bisect-reset (ЛОШО) [ВЕРСИЯ]"
+
#: builtin/bisect--helper.c:30
-msgid ""
-"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
-"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
-msgstr ""
-"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
-"=<term>][--no-checkout] [ЛОШО [ДОБРО…]] [--] [ПЪТ…]"
+msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
+msgstr "git bisect--helper --bisect-reset (ДОБРО) [ВЕРСИЯ…]"
-#: builtin/bisect--helper.c:86
+#: builtin/bisect--helper.c:31
+msgid "git bisect--helper --bisect-replay <filename>"
+msgstr "git bisect--helper --bisect-next ИМЕ_НА_ФАЙЛ"
+
+#: builtin/bisect--helper.c:32
+msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
+msgstr "git bisect--helper --bisect-reset [(ВЕРСИЯ|ДИАПАЗОН)…]"
+
+#: builtin/bisect--helper.c:107
+#, c-format
+msgid "cannot open file '%s' in mode '%s'"
+msgstr "файлът „%s“ не може да се отвори в режим „%s“"
+
+#: builtin/bisect--helper.c:114
+#, c-format
+msgid "could not write to file '%s'"
+msgstr "във файла „%s“ не може да се пише"
+
+#: builtin/bisect--helper.c:153
#, c-format
msgid "'%s' is not a valid term"
msgstr "„%s“ е неправилна управляваща дума"
-#: builtin/bisect--helper.c:90
+#: builtin/bisect--helper.c:157
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "„%s“ е вградена команда и не може да се използва като управляваща дума"
-#: builtin/bisect--helper.c:100
+#: builtin/bisect--helper.c:167
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "не може да смените значението на управляващата дума „%s“"
-#: builtin/bisect--helper.c:111
+#: builtin/bisect--helper.c:177
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:193
#, c-format
msgid "We are not bisecting.\n"
msgstr "В момента не се извършва двоично търсене.\n"
-#: builtin/bisect--helper.c:163
+#: builtin/bisect--helper.c:201
#, c-format
msgid "'%s' is not a valid commit"
msgstr "„%s“ не е подаване"
-#: builtin/bisect--helper.c:172
+#: builtin/bisect--helper.c:210
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -10433,27 +11112,27 @@
"първоначално указаното „%s“ в указателя „HEAD“ не може да бъде\n"
"изтеглено. Пробвайте да изпълните командата „git bisect reset ПОДАВАНЕ“."
-#: builtin/bisect--helper.c:216
+#: builtin/bisect--helper.c:254
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr "Неправилен аргумент на функцията „bisect_write“: „%s“"
-#: builtin/bisect--helper.c:221
+#: builtin/bisect--helper.c:259
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "идентификаторът на обект на версия „%s“ не може да бъде получен"
-#: builtin/bisect--helper.c:233
+#: builtin/bisect--helper.c:271
#, c-format
msgid "couldn't open the file '%s'"
msgstr "файлът „%s“ не може да бъде отворен"
-#: builtin/bisect--helper.c:259
+#: builtin/bisect--helper.c:297
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr "Неправилна команда: в момента се изпълнява двоично търсене по %s/%s."
-#: builtin/bisect--helper.c:286
+#: builtin/bisect--helper.c:324
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
@@ -10462,7 +11141,7 @@
"Трябва да зададете поне една „%s“ и една „%s“ версия. (Това може да се\n"
"направи съответно и чрез командите „git bisect %s“ и „git bisect %s“.)"
-#: builtin/bisect--helper.c:290
+#: builtin/bisect--helper.c:328
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -10473,7 +11152,7 @@
"Трябва да зададете поне една „%s“ и една „%s“ версия. (Това може да се\n"
"направи съответно и чрез командите „git bisect %s“ и „git bisect %s“.)"
-#: builtin/bisect--helper.c:310
+#: builtin/bisect--helper.c:348
#, c-format
msgid "bisecting only with a %s commit"
msgstr "двоично търсене само по „%s“ подаване."
@@ -10482,15 +11161,15 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:318
+#: builtin/bisect--helper.c:356
msgid "Are you sure [Y/n]? "
msgstr "Да се продължи ли? „Y“ — ДА, „n“ — не"
-#: builtin/bisect--helper.c:379
+#: builtin/bisect--helper.c:417
msgid "no terms defined"
msgstr "не са указани управляващи думи"
-#: builtin/bisect--helper.c:382
+#: builtin/bisect--helper.c:420
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
@@ -10499,7 +11178,7 @@
"Текущите управляващи думи са: %s за старото състояние\n"
"и %s за новото състояние.\n"
-#: builtin/bisect--helper.c:392
+#: builtin/bisect--helper.c:430
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
@@ -10508,287 +11187,332 @@
"на „git bisect terms“ е подаден неправилен аргумент „%s“\n"
"Поддържат се опциите „--term-good“/„--term-old“ и „--term-bad„/„--term-new“."
-#: builtin/bisect--helper.c:478
+#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1014
+msgid "revision walk setup failed\n"
+msgstr "неуспешно настройване на обхождането на версиите\n"
+
+#: builtin/bisect--helper.c:519
+#, c-format
+msgid "could not open '%s' for appending"
+msgstr "файлът „%s“ не може да се отвори за добавяне"
+
+#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651
+msgid "'' is not a valid term"
+msgstr "„“ е неправилна управляваща дума"
+
+#: builtin/bisect--helper.c:661
#, c-format
msgid "unrecognized option: '%s'"
msgstr "непозната опция: %s"
-#: builtin/bisect--helper.c:482
+#: builtin/bisect--helper.c:665
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "„%s“ не изглежда като указател към версия"
-#: builtin/bisect--helper.c:514
+#: builtin/bisect--helper.c:696
msgid "bad HEAD - I need a HEAD"
msgstr "Неправилен указател „HEAD“"
-#: builtin/bisect--helper.c:529
+#: builtin/bisect--helper.c:711
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr ""
"Неуспешно преминаване към „%s“. Изпълнете командата „git bisect start "
"СЪЩЕСТВУВАЩ_КЛОН“."
-#: builtin/bisect--helper.c:550
+#: builtin/bisect--helper.c:732
msgid "won't bisect on cg-seek'ed tree"
msgstr ""
"не може да се търси двоично, когато е изпълнена командата „cg-seek“ от "
"„cogito“"
-#: builtin/bisect--helper.c:553
+#: builtin/bisect--helper.c:735
msgid "bad HEAD - strange symbolic ref"
msgstr "Неправилен указател „HEAD“ — необичаен символен указател"
-#: builtin/bisect--helper.c:577
+#: builtin/bisect--helper.c:755
#, c-format
msgid "invalid ref: '%s'"
msgstr "неправилен указател: „%s“"
-#: builtin/bisect--helper.c:633
-msgid "perform 'git bisect next'"
-msgstr "извършване на „git bisect next“"
+#: builtin/bisect--helper.c:813
+msgid "You need to start by \"git bisect start\"\n"
+msgstr "Започнете като изпълните командата „git bisect start“\n"
-#: builtin/bisect--helper.c:635
-msgid "write the terms to .git/BISECT_TERMS"
-msgstr "запазване на управляващите думи в „“.git/BISECT_TERMS„“"
+#. 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:824
+msgid "Do you want me to do it for you [Y/n]? "
+msgstr "Да се извърши ли автоматично? „Y“ — ДА, „n“ — не"
-#: builtin/bisect--helper.c:637
-msgid "cleanup the bisection state"
-msgstr "изчистване на състоянието на двоичното търсене"
+#: builtin/bisect--helper.c:842
+msgid "Please call `--bisect-state` with at least one argument"
+msgstr "Опцията „--bisect-state“ изисква поне един аргумент"
-#: builtin/bisect--helper.c:639
-msgid "check for expected revs"
-msgstr "проверка за очакваните версии"
+#: builtin/bisect--helper.c:855
+#, c-format
+msgid "'git bisect %s' can take only one argument."
+msgstr "Командата „git bisect %s“ приема само един аргумент."
-#: builtin/bisect--helper.c:641
+#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:878
+#, c-format
+msgid "Bad rev input: %s"
+msgstr "Неправилна версия: „%s“"
+
+#: builtin/bisect--helper.c:912
+msgid "We are not bisecting."
+msgstr "В момента не се извършва двоично търсене."
+
+#: builtin/bisect--helper.c:962
+#, c-format
+msgid "'%s'?? what are you talking about?"
+msgstr ""
+"Непозната команда „%s“. Възможностите са: „start“, „skip“, „good“, „bad“ (и "
+"вариантите им)"
+
+#: builtin/bisect--helper.c:974
+#, c-format
+msgid "cannot read file '%s' for replaying"
+msgstr ""
+"файлът „%s“ не може да бъде прочетен, за да се изпълнят командите от него "
+"наново"
+
+#: builtin/bisect--helper.c:1047
msgid "reset the bisection state"
msgstr "изчистване на състоянието на двоичното търсене"
-#: builtin/bisect--helper.c:643
-msgid "write out the bisection state in BISECT_LOG"
-msgstr "запис на състоянието на двоичното търсене в „BISECT_LOG“"
-
-#: builtin/bisect--helper.c:645
-msgid "check and set terms in a bisection state"
-msgstr ""
-"проверка и задаване на управляващи думи към състоянието на двоичното търсене"
-
-#: builtin/bisect--helper.c:647
+#: builtin/bisect--helper.c:1049
msgid "check whether bad or good terms exist"
msgstr "проверка дали съществуват одобряващи/отхвърлящи управляващи думи"
-#: builtin/bisect--helper.c:649
+#: builtin/bisect--helper.c:1051
msgid "print out the bisect terms"
msgstr "извеждане на управляващите думи"
-#: builtin/bisect--helper.c:651
+#: builtin/bisect--helper.c:1053
msgid "start the bisect session"
msgstr "начало на двоично търсене"
-#: builtin/bisect--helper.c:653
-msgid "update BISECT_HEAD instead of checking out the current commit"
-msgstr ""
-"обновяване на указателя „BISECT_HEAD“ вместо да се използва текущото подаване"
+#: builtin/bisect--helper.c:1055
+msgid "find the next bisection commit"
+msgstr "откриване на следващото подаване при двоично търсене"
-#: builtin/bisect--helper.c:655
+#: builtin/bisect--helper.c:1057
+msgid "mark the state of ref (or refs)"
+msgstr "задаване на състоянието на указателя/ите"
+
+#: builtin/bisect--helper.c:1059
+msgid "list the bisection steps so far"
+msgstr "извеждане на стъпките на двоичното търсене досега"
+
+#: builtin/bisect--helper.c:1061
+msgid "replay the bisection process from the given file"
+msgstr "наново изпълнение на двоичното търсене чрез дадения файл"
+
+#: builtin/bisect--helper.c:1063
+msgid "skip some commits for checkout"
+msgstr "прескачане на някои подавания при изтегляне"
+
+#: builtin/bisect--helper.c:1065
msgid "no log for BISECT_WRITE"
msgstr "липсва запис за „BISECT_WRITE“"
-#: builtin/bisect--helper.c:673
-msgid "--write-terms requires two arguments"
-msgstr "опцията „--write-terms“ изисква точно 2 аргумента"
-
-#: builtin/bisect--helper.c:677
-msgid "--bisect-clean-state requires no arguments"
-msgstr "опцията „--bisect-clean-state“ не приема аргументи"
-
-#: builtin/bisect--helper.c:684
+#: builtin/bisect--helper.c:1080
msgid "--bisect-reset requires either no argument or a commit"
msgstr "опцията „--bisect-reset“ изисква или 0 аргументи, или 1 — подаване"
-#: builtin/bisect--helper.c:688
-msgid "--bisect-write requires either 4 or 5 arguments"
-msgstr "опцията „--bisect-write“ изисква 4 или 5 аргумента"
-
-#: builtin/bisect--helper.c:694
-msgid "--check-and-set-terms requires 3 arguments"
-msgstr "опцията „--check-and-set-terms“ изисква 3 аргумента"
-
-#: builtin/bisect--helper.c:700
+#: builtin/bisect--helper.c:1085
msgid "--bisect-next-check requires 2 or 3 arguments"
msgstr "опцията „--bisect-next-check“ изисква 2 или 3 аргумента"
-#: builtin/bisect--helper.c:706
+#: builtin/bisect--helper.c:1091
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "опцията „--bisect-terms“ изисква 0 или 1 аргумента"
-#: builtin/blame.c:31
+#: builtin/bisect--helper.c:1100
+msgid "--bisect-next requires 0 arguments"
+msgstr "опцията „--bisect-next“ не приема аргументи"
+
+#: builtin/bisect--helper.c:1111
+msgid "--bisect-log requires 0 arguments"
+msgstr "опцията „--bisect-log“ не приема аргументи"
+
+#: builtin/bisect--helper.c:1116
+msgid "no logfile given"
+msgstr "не е зададен журнален файл"
+
+#: builtin/blame.c:32
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr "git blame [ОПЦИЯ…] [ОПЦИЯ_ЗА_ВЕРСИЯТА…] [ВЕРСИЯ] [--] ФАЙЛ"
-#: builtin/blame.c:36
+#: builtin/blame.c:37
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "ОПЦИИте_ЗА_ВЕРСИЯТА са документирани в ръководството git-rev-list(1)"
-#: builtin/blame.c:409
+#: builtin/blame.c:410
#, c-format
msgid "expecting a color: %s"
msgstr "трябва да е цвят: %s"
-#: builtin/blame.c:416
+#: builtin/blame.c:417
msgid "must end with a color"
msgstr "трябва да завършва с цвят"
-#: builtin/blame.c:729
+#: builtin/blame.c:728
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "неправилен цвят „%s“ в „color.blame.repeatedLines“"
-#: builtin/blame.c:747
+#: builtin/blame.c:746
msgid "invalid value for blame.coloring"
msgstr "неправилна стойност за „blame.coloring“"
-#: builtin/blame.c:822
+#: builtin/blame.c:845
#, c-format
msgid "cannot find revision %s to ignore"
msgstr "версията за прескачане „%s“ не може да бъде открита"
-#: builtin/blame.c:844
-msgid "Show blame entries as we find them, incrementally"
-msgstr "Извеждане на авторството с намирането му, последователно"
+#: builtin/blame.c:867
+msgid "show blame entries as we find them, incrementally"
+msgstr "извеждане на авторството с намирането му, последователно"
-#: builtin/blame.c:845
-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:846
-msgid "Do not treat root commits as boundaries (Default: off)"
+#: builtin/blame.c:869
+msgid "do not treat root commits as boundaries (Default: off)"
msgstr ""
-"Началните подавания да не се считат за гранични (стандартно опцията е "
+"началните подавания да не се считат за гранични (стандартно опцията е "
"изключена)"
-#: builtin/blame.c:847
-msgid "Show work cost statistics"
-msgstr "Извеждане на статистика за извършените действия"
+#: builtin/blame.c:870
+msgid "show work cost statistics"
+msgstr "извеждане на статистика за извършените действия"
-#: builtin/blame.c:848
-msgid "Force progress reporting"
-msgstr "Принудително извеждане на напредъка"
+#: builtin/blame.c:871 builtin/checkout.c:1503 builtin/clone.c:92
+#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:175
+#: builtin/merge.c:297 builtin/multi-pack-index.c:27 builtin/pull.c:119
+#: builtin/push.c:575 builtin/send-pack.c:198
+msgid "force progress reporting"
+msgstr "извеждане на напредъка"
-#: builtin/blame.c:849
-msgid "Show output score for blame entries"
-msgstr "Извеждане на допълнителна информация за определянето на авторството"
+#: builtin/blame.c:872
+msgid "show output score for blame entries"
+msgstr "извеждане на допълнителна информация за определянето на авторството"
-#: builtin/blame.c:850
-msgid "Show original filename (Default: auto)"
+#: builtin/blame.c:873
+msgid "show original filename (Default: auto)"
msgstr ""
-"Извеждане на първоначалното име на файл (стандартно това е автоматично)"
+"извеждане на първоначалното име на файл (стандартно това е автоматично)"
-#: builtin/blame.c:851
-msgid "Show original linenumber (Default: off)"
+#: builtin/blame.c:874
+msgid "show original linenumber (Default: off)"
msgstr ""
-"Извеждане на първоначалният номер на ред (стандартно опцията е изключена)"
+"извеждане на първоначалния номер на ред (стандартно опцията е изключена)"
-#: builtin/blame.c:852
-msgid "Show in a format designed for machine consumption"
-msgstr "Извеждане във формат за по-нататъшна обработка"
+#: builtin/blame.c:875
+msgid "show in a format designed for machine consumption"
+msgstr "извеждане във формат за по-нататъшна обработка"
-#: builtin/blame.c:853
-msgid "Show porcelain format with per-line commit information"
+#: builtin/blame.c:876
+msgid "show porcelain format with per-line commit information"
msgstr ""
-"Извеждане във формат за команди от потребителско ниво с информация на всеки "
+"извеждане във формат за команди от потребителско ниво с информация на всеки "
"ред"
-#: builtin/blame.c:854
-msgid "Use the same output mode as git-annotate (Default: off)"
+#: builtin/blame.c:877
+msgid "use the same output mode as git-annotate (Default: off)"
msgstr ""
-"Използване на същия формат като „git-annotate“ (стандартно опцията е "
+"използване на същия формат като „git-annotate“ (стандартно опцията е "
"изключена)"
-#: builtin/blame.c:855
-msgid "Show raw timestamp (Default: off)"
-msgstr "Извеждане на неформатирани времена (стандартно опцията е изключена)"
+#: builtin/blame.c:878
+msgid "show raw timestamp (Default: off)"
+msgstr "извеждане на неформатирани времена (стандартно опцията е изключена)"
-#: builtin/blame.c:856
-msgid "Show long commit SHA1 (Default: off)"
-msgstr "Извеждане на пълните суми по SHA1 (стандартно опцията е изключена)"
+#: builtin/blame.c:879
+msgid "show long commit SHA1 (Default: off)"
+msgstr "извеждане на пълните суми по SHA1 (стандартно опцията е изключена)"
-#: builtin/blame.c:857
-msgid "Suppress author name and timestamp (Default: off)"
-msgstr "Без име на автор и време на промяна (стандартно опцията е изключена)"
+#: builtin/blame.c:880
+msgid "suppress author name and timestamp (Default: off)"
+msgstr "без име на автор и време на промяна (стандартно опцията е изключена)"
-#: builtin/blame.c:858
-msgid "Show author email instead of name (Default: off)"
+#: builtin/blame.c:881
+msgid "show author email instead of name (Default: off)"
msgstr ""
-"Извеждане на е-пощата на автора, а не името му (стандартно опцията е "
+"извеждане на е-пощата на автора, а не името му (стандартно опцията е "
"изключена)"
-#: builtin/blame.c:859
-msgid "Ignore whitespace differences"
-msgstr "Без разлики в знаците за интервали"
+#: builtin/blame.c:882
+msgid "ignore whitespace differences"
+msgstr "без разлики в знаците за интервали"
-#: builtin/blame.c:860 builtin/log.c:1702
+#: builtin/blame.c:883 builtin/log.c:1812
msgid "rev"
msgstr "ВЕРС"
-#: builtin/blame.c:860
-msgid "Ignore <rev> when blaming"
-msgstr "Прескачане на ВЕРСията при извеждане на авторството"
+#: builtin/blame.c:883
+msgid "ignore <rev> when blaming"
+msgstr "прескачане на ВЕРСията при извеждане на авторството"
-#: builtin/blame.c:861
-msgid "Ignore revisions from <file>"
-msgstr "Прескачане на версиите указани във ФАЙЛа при извеждане на авторството"
+#: builtin/blame.c:884
+msgid "ignore revisions from <file>"
+msgstr "прескачане на версиите указани във ФАЙЛа"
-#: builtin/blame.c:862
+#: builtin/blame.c:885
msgid "color redundant metadata from previous line differently"
msgstr ""
"оцветяване на повтарящите се метаданни от предишния ред в различен цвят"
-#: builtin/blame.c:863
+#: builtin/blame.c:886
msgid "color lines by age"
msgstr "оцветяване на редовете по възраст"
-#: builtin/blame.c:864
-msgid "Spend extra cycles to find better match"
-msgstr "Допълнителни изчисления за по-добри резултати"
+#: builtin/blame.c:887
+msgid "spend extra cycles to find better match"
+msgstr "допълнителни изчисления за по-добри резултати"
-#: builtin/blame.c:865
-msgid "Use revisions from <file> instead of calling git-rev-list"
-msgstr "Изчитане на версиите от ФАЙЛ, а не чрез изпълнение на „git-rev-list“"
+#: builtin/blame.c:888
+msgid "use revisions from <file> instead of calling git-rev-list"
+msgstr "изчитане на версиите от ФАЙЛа, а не чрез изпълнение на „git-rev-list“"
-#: builtin/blame.c:866
-msgid "Use <file>'s contents as the final image"
-msgstr "Използване на съдържанието на ФАЙЛа като крайно положение"
+#: builtin/blame.c:889
+msgid "use <file>'s contents as the final image"
+msgstr "използване на съдържанието на ФАЙЛа като крайно положение"
-#: builtin/blame.c:867 builtin/blame.c:868
+#: builtin/blame.c:890 builtin/blame.c:891
msgid "score"
msgstr "напасване на редовете"
-#: builtin/blame.c:867
-msgid "Find line copies within and across files"
+#: builtin/blame.c:890
+msgid "find line copies within and across files"
msgstr ""
-"Търсене на копирани редове както в рамките на един файл, така и от един файл "
+"търсене на копирани редове както в рамките на един файл, така и от един файл "
"към друг"
-#: builtin/blame.c:868
-msgid "Find line movements within and across files"
+#: builtin/blame.c:891
+msgid "find line movements within and across files"
msgstr ""
-"Търсене на преместени редове както в рамките на един файл, така и от един "
+"търсене на преместени редове както в рамките на един файл, така и от един "
"файл към друг"
-#: builtin/blame.c:869
-msgid "n,m"
-msgstr "n,m"
+#: builtin/blame.c:892
+msgid "range"
+msgstr "диапазон"
-#: builtin/blame.c:869
-msgid "Process only line range n,m, counting from 1"
+#: builtin/blame.c:893
+msgid "process only line range <start>,<end> or function :<funcname>"
msgstr ""
-"Информация само за редовете в диапазона от n до m включително. Броенето "
-"започва от 1"
+"информация само за редовете в диапазона НАЧАЛО,КРАЙ или само на :ФУНКЦИЯта"
-#: builtin/blame.c:921
+#: builtin/blame.c:945
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"опцията „--progress“ е несъвместима с „--incremental“ и форма̀та на командите "
@@ -10802,24 +11526,24 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:972
+#: builtin/blame.c:996
msgid "4 years, 11 months ago"
msgstr "преди 4 години и 11 месеца"
-#: builtin/blame.c:1079
+#: builtin/blame.c:1112
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "има само %2$lu ред във файла „%1$s“"
msgstr[1] "има само %2$lu реда във файла „%1$s“"
-#: builtin/blame.c:1125
+#: builtin/blame.c:1157
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>]"
@@ -10881,118 +11605,108 @@
msgid "Update of config-file failed"
msgstr "Неуспешно обновяване на конфигурационния файл"
-#: builtin/branch.c:220
+#: builtin/branch.c:223
msgid "cannot use -a with -d"
msgstr "Опцията „-a“ е несъвместима с опцията „-d“"
-#: builtin/branch.c:226
+#: builtin/branch.c:230
msgid "Couldn't look up commit object for HEAD"
msgstr "Обектът-подаване, сочен от указателя „HEAD“, не може да бъде открит"
-#: builtin/branch.c:240
+#: builtin/branch.c:244
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Не можете да изтриете клона „%s“, който е изтеглен в пътя „%s“"
-#: builtin/branch.c:255
+#: builtin/branch.c:259
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "следящият клон „%s“ не може да бъде открит."
-#: builtin/branch.c:256
+#: builtin/branch.c:260
#, 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
+#: builtin/branch.c:291
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Изтрит следящ клон „%s“ (той сочеше към „%s“).\n"
-#: builtin/branch.c:280
+#: builtin/branch.c:292
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Изтрит клон „%s“ (той сочеше към „%s“).\n"
-#: builtin/branch.c:429 builtin/tag.c:61
+#: builtin/branch.c:438 builtin/tag.c:61
msgid "unable to parse format string"
msgstr "форматиращият низ не може да бъде анализиран: %s"
-#: builtin/branch.c:460
+#: builtin/branch.c:469
msgid "could not resolve HEAD"
msgstr "подаването, сочено от указателя „HEAD“, не може да се установи"
-#: builtin/branch.c:466
+#: builtin/branch.c:475
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "„HEAD“ (%s) сочи извън директорията „refs/heads“"
-#: builtin/branch.c:481
+#: builtin/branch.c:490
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Клонът „%s“ се пребазира върху „%s“"
-#: builtin/branch.c:485
+#: builtin/branch.c:494
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Търси се двоично в клона „%s“ при „%s“"
-#: builtin/branch.c:502
+#: builtin/branch.c:511
msgid "cannot copy the current branch while not on any."
msgstr "не можете да копирате текущия клон, защото сте извън който и да е клон"
-#: builtin/branch.c:504
+#: builtin/branch.c:513
msgid "cannot rename the current branch while not on any."
msgstr ""
"не можете да преименувате текущия клон, защото сте извън който и да е клон"
-#: builtin/branch.c:515
+#: builtin/branch.c:524
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Неправилно име на клон: „%s“"
-#: builtin/branch.c:542
+#: builtin/branch.c:553
msgid "Branch rename failed"
msgstr "Неуспешно преименуване на клон"
-#: builtin/branch.c:544
+#: builtin/branch.c:555
msgid "Branch copy failed"
msgstr "Неуспешно копиране на клон"
-#: builtin/branch.c:548
+#: builtin/branch.c:559
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Клонът с неправилно име „%s“ е копиран"
-#: builtin/branch.c:551
+#: builtin/branch.c:562
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Клонът с неправилно име „%s“ е преименуван"
-#: builtin/branch.c:557
+#: builtin/branch.c:568
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Клонът е преименуван на „%s“, но указателят „HEAD“ не е обновен"
-#: builtin/branch.c:566
+#: builtin/branch.c:577
msgid "Branch is renamed, but update of config-file failed"
msgstr "Клонът е преименуван, но конфигурационният файл не е обновен"
-#: builtin/branch.c:568
+#: builtin/branch.c:579
msgid "Branch is copied, but update of config-file failed"
msgstr "Клонът е копиран, но конфигурационният файл не е обновен"
-#: builtin/branch.c:584
+#: builtin/branch.c:595
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -11003,183 +11717,183 @@
" %s\n"
"Редовете, които започват с „%c“, ще бъдат пропуснати.\n"
-#: builtin/branch.c:618
+#: builtin/branch.c:629
msgid "Generic options"
msgstr "Общи настройки"
-#: builtin/branch.c:620
+#: builtin/branch.c:631
msgid "show hash and subject, give twice for upstream branch"
msgstr ""
"извеждане на контролната сума и темата. Повтарянето на опцията прибавя "
"отдалечените клони"
-#: builtin/branch.c:621
+#: builtin/branch.c:632
msgid "suppress informational messages"
msgstr "без информационни съобщения"
-#: builtin/branch.c:622
+#: builtin/branch.c:633
msgid "set up tracking mode (see git-pull(1))"
msgstr "задаване на режима на следене (виж git-pull(1))"
-#: builtin/branch.c:624
+#: builtin/branch.c:635
msgid "do not use"
msgstr "да не се ползва"
-#: builtin/branch.c:626 builtin/rebase.c:513
+#: builtin/branch.c:637 builtin/rebase.c:534
msgid "upstream"
msgstr "клон-източник"
-#: builtin/branch.c:626
+#: builtin/branch.c:637
msgid "change the upstream info"
msgstr "смяна на клона-източник"
-#: builtin/branch.c:627
+#: builtin/branch.c:638
msgid "unset the upstream info"
msgstr "изчистване на информацията за клон-източник"
-#: builtin/branch.c:628
+#: builtin/branch.c:639
msgid "use colored output"
msgstr "цветен изход"
-#: builtin/branch.c:629
+#: builtin/branch.c:640
msgid "act on remote-tracking branches"
msgstr "действие върху следящите клони"
-#: builtin/branch.c:631 builtin/branch.c:633
+#: builtin/branch.c:642 builtin/branch.c:644
msgid "print only branches that contain the commit"
msgstr "извеждане само на клоните, които съдържат това ПОДАВАНЕ"
-#: builtin/branch.c:632 builtin/branch.c:634
+#: builtin/branch.c:643 builtin/branch.c:645
msgid "print only branches that don't contain the commit"
msgstr "извеждане само на клоните, които не съдържат това ПОДАВАНЕ"
-#: builtin/branch.c:637
+#: builtin/branch.c:648
msgid "Specific git-branch actions:"
msgstr "Специални действия на „git-branch“:"
-#: builtin/branch.c:638
+#: builtin/branch.c:649
msgid "list both remote-tracking and local branches"
msgstr "извеждане както на следящите, така и на локалните клони"
-#: builtin/branch.c:640
+#: builtin/branch.c:651
msgid "delete fully merged branch"
msgstr "изтриване на клони, които са напълно слети"
-#: builtin/branch.c:641
+#: builtin/branch.c:652
msgid "delete branch (even if not merged)"
msgstr "изтриване и на клони, които не са напълно слети"
-#: builtin/branch.c:642
+#: builtin/branch.c:653
msgid "move/rename a branch and its reflog"
msgstr ""
"преместване/преименуване на клон и принадлежащият му журнал на указателите"
-#: builtin/branch.c:643
+#: builtin/branch.c:654
msgid "move/rename a branch, even if target exists"
msgstr "преместване/преименуване на клон, дори ако има вече клон с такова име"
-#: builtin/branch.c:644
+#: builtin/branch.c:655
msgid "copy a branch and its reflog"
msgstr "копиране на клон и принадлежащия му журнал на указателите"
-#: builtin/branch.c:645
+#: builtin/branch.c:656
msgid "copy a branch, even if target exists"
msgstr "копиране на клон, дори ако има вече клон с такова име"
-#: builtin/branch.c:646
+#: builtin/branch.c:657
msgid "list branch names"
msgstr "извеждане на имената на клоните"
-#: builtin/branch.c:647
+#: builtin/branch.c:658
msgid "show current branch name"
msgstr "извеждане на името на текущия клон"
-#: builtin/branch.c:648
+#: builtin/branch.c:659
msgid "create the branch's reflog"
msgstr "създаване на журнала на указателите на клона"
-#: builtin/branch.c:650
+#: builtin/branch.c:661
msgid "edit the description for the branch"
msgstr "редактиране на описанието на клона"
-#: builtin/branch.c:651
+#: builtin/branch.c:662
msgid "force creation, move/rename, deletion"
msgstr "принудително създаване, преместване, преименуване, изтриване"
-#: builtin/branch.c:652
+#: builtin/branch.c:663
msgid "print only branches that are merged"
msgstr "извеждане само на слетите клони"
-#: builtin/branch.c:653
+#: builtin/branch.c:664
msgid "print only branches that are not merged"
msgstr "извеждане само на неслетите клони"
-#: builtin/branch.c:654
+#: builtin/branch.c:665
msgid "list branches in columns"
msgstr "извеждане по колони"
-#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415
+#: builtin/branch.c:667 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:466
msgid "object"
msgstr "ОБЕКТ"
-#: builtin/branch.c:658
+#: builtin/branch.c:668
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:669 builtin/for-each-ref.c:48 builtin/tag.c:473
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:670 builtin/for-each-ref.c:38 builtin/tag.c:471
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "ФОРМАТ за изхода"
-#: builtin/branch.c:684 builtin/clone.c:785
+#: builtin/branch.c:693 builtin/clone.c:790
msgid "HEAD not found below refs/heads!"
msgstr "В директорията „refs/heads“ липсва файл „HEAD“"
-#: builtin/branch.c:708
+#: builtin/branch.c:717
msgid "--column and --verbose are incompatible"
msgstr "Опциите „--column“ и „--verbose“ са несъвместими"
-#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
+#: builtin/branch.c:732 builtin/branch.c:788 builtin/branch.c:797
msgid "branch name required"
msgstr "Необходимо е име на клон"
-#: builtin/branch.c:753
+#: builtin/branch.c:764
msgid "Cannot give description to detached HEAD"
msgstr "Не може да зададете описание на несвързан „HEAD“"
-#: builtin/branch.c:758
+#: builtin/branch.c:769
msgid "cannot edit description of more than one branch"
msgstr "Не може да редактирате описанието на повече от един клон едновременно"
-#: builtin/branch.c:765
+#: builtin/branch.c:776
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "В клона „%s“ все още няма подавания."
-#: builtin/branch.c:768
+#: builtin/branch.c:779
#, c-format
msgid "No branch named '%s'."
msgstr "Липсва клон на име „%s“."
-#: builtin/branch.c:783
+#: builtin/branch.c:794
msgid "too many branches for a copy operation"
msgstr "прекалено много клони за копиране"
-#: builtin/branch.c:792
+#: builtin/branch.c:803
msgid "too many arguments for a rename operation"
msgstr "прекалено много аргументи към командата за преименуване"
-#: builtin/branch.c:797
+#: builtin/branch.c:808
msgid "too many arguments to set new upstream"
msgstr "прекалено много аргументи към командата за следене"
-#: builtin/branch.c:801
+#: builtin/branch.c:812
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -11187,31 +11901,31 @@
"Следеното от „HEAD“ не може да се зададе да е „%s“, защото то не сочи към "
"никой клон."
-#: builtin/branch.c:804 builtin/branch.c:827
+#: builtin/branch.c:815 builtin/branch.c:838
#, c-format
msgid "no such branch '%s'"
msgstr "Няма клон на име „%s“."
-#: builtin/branch.c:808
+#: builtin/branch.c:819
#, c-format
msgid "branch '%s' does not exist"
msgstr "Не съществува клон на име „%s“."
-#: builtin/branch.c:821
+#: builtin/branch.c:832
msgid "too many arguments to unset upstream"
msgstr "прекалено много аргументи към командата за спиране на следене"
-#: builtin/branch.c:825
+#: builtin/branch.c:836
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"Следеното от „HEAD“ не може да махне, защото то не сочи към никой клон."
-#: builtin/branch.c:831
+#: builtin/branch.c:842
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Няма информация клонът „%s“ да следи някой друг"
-#: builtin/branch.c:841
+#: builtin/branch.c:852
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>?"
@@ -11219,7 +11933,7 @@
"Опциите „-a“ и „-r“ на „git branch“ са несъвместими с име на клон.\n"
"Пробвайте с: „-a|-r --list ШАБЛОН“"
-#: builtin/branch.c:845
+#: builtin/branch.c:856
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -11227,6 +11941,103 @@
"Опцията „--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 "библиотека на 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/bugreport.c:135
+msgid "specify a destination for the bugreport file"
+msgstr "укажете файла, в който да се запази докладът за грешка"
+
+#: builtin/bugreport.c:137
+msgid "specify a strftime format suffix for the filename"
+msgstr "укажете суфикса на файла във формат за „strftime“"
+
+#: builtin/bugreport.c:159
+#, c-format
+msgid "could not create leading directories for '%s'"
+msgstr "родителските директории на „%s“ не могат да бъдат създадени"
+
+#: builtin/bugreport.c:166
+msgid "System Info"
+msgstr "Информация за системата"
+
+#: builtin/bugreport.c:169
+msgid "Enabled Hooks"
+msgstr "Включени куки"
+
+#: builtin/bugreport.c:176
+#, c-format
+msgid "couldn't create a new file at '%s'"
+msgstr "новият файл „%s“ не може да бъде създаден"
+
+#: builtin/bugreport.c:179
+#, c-format
+msgid "unable to write to %s"
+msgstr "в „%s“ не може да се пише"
+
+#: builtin/bugreport.c:189
+#, 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…"
@@ -11243,50 +12054,54 @@
msgid "git bundle unbundle <file> [<refname>...]"
msgstr "git bundle unbundle ФАЙЛ [ИМЕ_НА_УКАЗАТЕЛ…]"
-#: builtin/bundle.c:66 builtin/pack-objects.c:3375
+#: builtin/bundle.c:67 builtin/pack-objects.c:3495
msgid "do not show progress meter"
msgstr "без извеждане на напредъка"
-#: builtin/bundle.c:68 builtin/pack-objects.c:3377
+#: builtin/bundle.c:69 builtin/pack-objects.c:3497
msgid "show progress meter"
msgstr "извеждане на напредъка"
-#: builtin/bundle.c:70 builtin/pack-objects.c:3379
+#: builtin/bundle.c:71 builtin/pack-objects.c:3499
msgid "show progress meter during object writing phase"
msgstr "извеждане на напредъка във фазата на запазване на обектите"
-#: builtin/bundle.c:73 builtin/pack-objects.c:3382
+#: builtin/bundle.c:74 builtin/pack-objects.c:3502
msgid "similar to --all-progress when progress meter is shown"
msgstr ""
"същото действие като опцията „--all-progress“ при извеждането на напредъка"
-#: builtin/bundle.c:93
+#: 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:104
+#: builtin/bundle.c:107
msgid "do not show bundle details"
msgstr "без подробна информация за пратките"
-#: builtin/bundle.c:119
+#: builtin/bundle.c:122
#, c-format
msgid "%s is okay\n"
msgstr "Пратката „%s“ е наред\n"
-#: builtin/bundle.c:160
+#: builtin/bundle.c:163
msgid "Need a repository to unbundle."
msgstr "За приемането на пратка е необходимо хранилище."
-#: builtin/bundle.c:168 builtin/remote.c:1686
+#: builtin/bundle.c:171 builtin/remote.c:1700
msgid "be verbose; must be placed before a subcommand"
msgstr "повече подробности. Поставя се пред подкоманда"
-#: builtin/bundle.c:190 builtin/remote.c:1717
+#: builtin/bundle.c:193 builtin/remote.c:1731
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Непозната подкоманда: %s"
-#: builtin/cat-file.c:595
+#: 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>"
@@ -11294,87 +12109,87 @@
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | ВИД | --textconv --filters) [--path=ПЪТ] ОБЕКТ"
-#: builtin/cat-file.c:596
+#: builtin/cat-file.c: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:617
+#: builtin/cat-file.c:620
msgid "only one batch option may be specified"
msgstr "може да укажете само една пакетна опция"
-#: builtin/cat-file.c:635
+#: 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:636
+#: builtin/cat-file.c:639
msgid "show object type"
msgstr "извеждане на вида на обект"
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:640
msgid "show object size"
msgstr "извеждане на размера на обект"
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:642
msgid "exit with zero when there's no error"
msgstr "изход с 0, когато няма грешка"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:643
msgid "pretty-print object's content"
msgstr "форматирано извеждане на съдържанието на обекта"
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:645
msgid "for blob objects, run textconv on object's content"
msgstr ""
"да се стартира програмата зададена в настройката „textconv“ за преобразуване "
"на съдържанието на обекта-BLOB"
-#: builtin/cat-file.c:644
+#: builtin/cat-file.c:647
msgid "for blob objects, run filters on object's content"
msgstr ""
"да се стартират програмите за преобразуване на съдържанието на обектите-BLOB"
-#: builtin/cat-file.c:645 git-submodule.sh:1002
+#: builtin/cat-file.c:648
msgid "blob"
msgstr "обект-BLOB"
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:649
msgid "use a specific path for --textconv/--filters"
msgstr "опциите „--textconv“/„--filters“ изискват път"
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:651
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "позволяване на опциите „-s“ и „-t“ да работят с повредени обекти"
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:652
msgid "buffer --batch output"
msgstr "буфериране на изхода от „--batch“"
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:654
msgid "show info and content of objects fed from the standard input"
msgstr ""
"извеждане на информация и съдържание на обектите подадени на стандартния вход"
-#: builtin/cat-file.c:655
+#: builtin/cat-file.c:658
msgid "show info about objects fed from the standard input"
msgstr "извеждане на информация за обектите подадени на стандартния вход"
-#: builtin/cat-file.c:659
+#: builtin/cat-file.c:662
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"следване на символните връзки сочещи в дървото (ползва се с „--batch“ или „--"
"batch-check“)"
-#: builtin/cat-file.c:661
+#: builtin/cat-file.c:664
msgid "show all objects with --batch or --batch-check"
msgstr "извеждане на всички обекти с „--batch“ или „--batch-check“"
-#: builtin/cat-file.c:663
+#: builtin/cat-file.c:666
msgid "do not order --batch-all-objects output"
msgstr "без подреждане на изхода от „--batch-all-objects“"
@@ -11402,8 +12217,8 @@
msgid "terminate input and output records by a NUL character"
msgstr "разделяне на входните и изходните записи с нулевия знак „NUL“"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537
-#: builtin/worktree.c:499
+#: builtin/check-ignore.c:21 builtin/checkout.c:1499 builtin/gc.c:549
+#: builtin/worktree.c:489
msgid "suppress progress reporting"
msgstr "без показване на напредъка"
@@ -11456,54 +12271,54 @@
msgid "no contacts specified"
msgstr "не са указани контакти"
-#: builtin/checkout-index.c:131
+#: builtin/checkout-index.c:152
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [ОПЦИЯ…] [--] [ФАЙЛ…]"
-#: builtin/checkout-index.c:148
+#: builtin/checkout-index.c:169
msgid "stage should be between 1 and 3 or all"
msgstr "етапът трябва да е „1“, „2“, „3“ или „all“ (всички)"
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:186
msgid "check out all files in the index"
msgstr "изтегляне на всички файлове в индекса"
-#: builtin/checkout-index.c:165
+#: builtin/checkout-index.c:187
msgid "force overwrite of existing files"
msgstr "презаписване на файловете, дори и да съществуват"
-#: builtin/checkout-index.c:167
+#: builtin/checkout-index.c:189
msgid "no warning for existing files and files not in index"
msgstr "без предупреждения при липсващи файлове и файлове не в индекса"
-#: builtin/checkout-index.c:169
+#: builtin/checkout-index.c:191
msgid "don't checkout new files"
msgstr "без изтегляне на нови файлове"
-#: builtin/checkout-index.c:171
+#: builtin/checkout-index.c:193
msgid "update stat information in the index file"
msgstr "обновяване на информацията получена чрез „stat“ за файловете в индекса"
-#: builtin/checkout-index.c:175
+#: builtin/checkout-index.c:197
msgid "read list of paths from the standard input"
msgstr "изчитане на пътищата от стандартния вход"
-#: builtin/checkout-index.c:177
+#: builtin/checkout-index.c:199
msgid "write the content to temporary files"
msgstr "записване на съдържанието във временни файлове"
-#: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403
-#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909
-#: builtin/worktree.c:672
+#: builtin/checkout-index.c:200 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:717
msgid "string"
msgstr "НИЗ"
-#: builtin/checkout-index.c:179
+#: builtin/checkout-index.c:201
msgid "when creating files, prepend <string>"
msgstr "при създаването на нови файлове да се добавя префикса НИЗ"
-#: builtin/checkout-index.c:181
+#: builtin/checkout-index.c:203
msgid "copy out the files from named stage"
msgstr "копиране на файловете от това състояние на сливане"
@@ -11523,99 +12338,99 @@
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git restore [ОПЦИЯ…] [--source=КЛОН] ФАЙЛ…"
-#: builtin/checkout.c:175 builtin/checkout.c:214
+#: builtin/checkout.c:188 builtin/checkout.c:227
#, c-format
msgid "path '%s' does not have our version"
msgstr "вашата версия липсва в пътя „%s“"
-#: builtin/checkout.c:177 builtin/checkout.c:216
+#: builtin/checkout.c:190 builtin/checkout.c:229
#, c-format
msgid "path '%s' does not have their version"
msgstr "чуждата версия липсва в пътя „%s“"
-#: builtin/checkout.c:193
+#: builtin/checkout.c:206
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "някоя от необходимите версии липсва в пътя „%s“"
-#: builtin/checkout.c:243
+#: builtin/checkout.c:258
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "някоя от необходимите версии липсва в пътя „%s“"
-#: builtin/checkout.c:261
+#: builtin/checkout.c:275
#, c-format
msgid "path '%s': cannot merge"
msgstr "пътят „%s“ не може да бъде слян"
-#: builtin/checkout.c:277
+#: builtin/checkout.c:291
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Резултатът за „%s“ не може да бъде слян"
-#: builtin/checkout.c:377
+#: 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:382
+#: 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:389
+#: 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:412 builtin/checkout.c:415 builtin/checkout.c:418
-#: builtin/checkout.c:422
+#: 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:425 builtin/checkout.c:428
+#: builtin/checkout.c:444 builtin/checkout.c:447
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "опцията „%s“ е несъвместима с „%s“"
-#: builtin/checkout.c:432
+#: builtin/checkout.c:451
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Невъзможно е едновременно да обновявате пътища и да преминете към клона „%s“."
-#: builtin/checkout.c:436
+#: builtin/checkout.c:455
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "не е указано нито „%s“, нито „%s“"
-#: builtin/checkout.c:440
+#: builtin/checkout.c:459
#, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr "опцията „%s“ е задължителна, когато „%s“ не е зададена"
-#: builtin/checkout.c:445 builtin/checkout.c:450
+#: builtin/checkout.c: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:509 builtin/checkout.c:516
+#: builtin/checkout.c:543 builtin/checkout.c:550
#, c-format
msgid "path '%s' is unmerged"
msgstr "пътят „%s“ не е слят"
-#: builtin/checkout.c:684 builtin/sparse-checkout.c:106
+#: builtin/checkout.c:718
msgid "you need to resolve your current index first"
msgstr "първо трябва да коригирате индекса си"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:772
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -11625,50 +12440,50 @@
"индекса:\n"
"%s"
-#: builtin/checkout.c:837
+#: builtin/checkout.c:865
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Журналът на указателите за „%s“ не може да се проследи: %s\n"
-#: builtin/checkout.c:879
+#: builtin/checkout.c:907
msgid "HEAD is now at"
msgstr "Указателят „HEAD“ в момента сочи към"
-#: builtin/checkout.c:883 builtin/clone.c:717
+#: builtin/checkout.c:911 builtin/clone.c:721 t/helper/test-fast-rebase.c:202
msgid "unable to update HEAD"
msgstr "Указателят „HEAD“ не може да бъде обновен"
-#: builtin/checkout.c:887
+#: builtin/checkout.c:915
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Зануляване на клона „%s“\n"
-#: builtin/checkout.c:890
+#: builtin/checkout.c:918
#, c-format
msgid "Already on '%s'\n"
msgstr "Вече сте на „%s“\n"
-#: builtin/checkout.c:894
+#: builtin/checkout.c:922
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Преминаване към клона „%s“ и зануляване на промените\n"
-#: builtin/checkout.c:896 builtin/checkout.c:1320
+#: builtin/checkout.c:924 builtin/checkout.c:1355
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Преминахте към новия клон „%s“\n"
-#: builtin/checkout.c:898
+#: builtin/checkout.c:926
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Преминахте към клона „%s“\n"
-#: builtin/checkout.c:949
+#: builtin/checkout.c:977
#, c-format
msgid " ... and %d more.\n"
msgstr "… и още %d.\n"
-#: builtin/checkout.c:955
+#: builtin/checkout.c:983
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -11690,7 +12505,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:974
+#: builtin/checkout.c:1002
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -11717,19 +12532,19 @@
" git branch ИМЕ_НА_НОВИЯ_КЛОН %s\n"
"\n"
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1037
msgid "internal error in revision walk"
msgstr "вътрешна грешка при обхождането на версиите"
-#: builtin/checkout.c:1013
+#: builtin/checkout.c:1041
msgid "Previous HEAD position was"
msgstr "Преди това „HEAD“ сочеше към"
-#: builtin/checkout.c:1053 builtin/checkout.c:1315
+#: builtin/checkout.c:1081 builtin/checkout.c:1350
msgid "You are on a branch yet to be born"
msgstr "В момента сте на клон, който все още не е създаден"
-#: builtin/checkout.c:1128
+#: builtin/checkout.c:1163
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -11738,7 +12553,7 @@
"„%s“ може да е както локален файл, така и следящ клон. За уточняване\n"
"ползвайте разделителя „--“ (и евентуално опцията „--no-guess“)"
-#: builtin/checkout.c:1135
+#: builtin/checkout.c:1170
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"
@@ -11760,51 +12575,51 @@
"\n"
" checkout.defaultRemote=origin"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1180
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "„%s“ напасва с множество (%d) отдалечени клони"
-#: builtin/checkout.c:1211
+#: builtin/checkout.c:1246
msgid "only one reference expected"
msgstr "очаква се само един указател"
-#: builtin/checkout.c:1228
+#: builtin/checkout.c:1263
#, c-format
msgid "only one reference expected, %d given."
msgstr "очаква се един указател, а сте подали %d."
-#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448
+#: builtin/checkout.c:1309 builtin/worktree.c:270 builtin/worktree.c:438
#, c-format
msgid "invalid reference: %s"
msgstr "неправилен указател: %s"
-#: builtin/checkout.c:1287 builtin/checkout.c:1649
+#: builtin/checkout.c:1322 builtin/checkout.c:1688
#, c-format
msgid "reference is not a tree: %s"
msgstr "указателят не сочи към обект-дърво: %s"
-#: builtin/checkout.c:1334
+#: builtin/checkout.c:1369
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "очаква се клон, а не етикет — „%s“"
-#: builtin/checkout.c:1336
+#: builtin/checkout.c:1371
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "очаква се локален, а не отдалечен клон — „%s“"
-#: builtin/checkout.c:1337 builtin/checkout.c:1345
+#: builtin/checkout.c:1372 builtin/checkout.c:1380
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "очаква се клон, а не „%s“"
-#: builtin/checkout.c:1340
+#: builtin/checkout.c:1375
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "очаква се клон, а не подаване — „%s“"
-#: builtin/checkout.c:1356
+#: builtin/checkout.c:1391
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -11812,7 +12627,7 @@
"по време на сливане не може да преминете към друг клон.\n"
"Пробвайте с „git merge --quit“ или „git worktree add“."
-#: builtin/checkout.c:1360
+#: builtin/checkout.c:1395
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -11821,7 +12636,7 @@
"клон.\n"
"Пробвайте с „git am --quit“ или „git worktree add“."
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1399
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -11829,7 +12644,7 @@
"по време на пребазиране не може да преминете към друг клон.\n"
"Пробвайте с „git rebase --quit“ или „git worktree add“."
-#: builtin/checkout.c:1368
+#: builtin/checkout.c:1403
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -11837,7 +12652,7 @@
"по време на отбиране на подавания не може да преминете към друг клон.\n"
"Пробвайте с „git cherry-pick --quit“ или „git worktree add“."
-#: builtin/checkout.c:1372
+#: builtin/checkout.c:1407
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -11845,144 +12660,139 @@
"по време на отмяна на подавания не може да преминете към друг клон.\n"
"Пробвайте с „git revert --quit“ или „git worktree add“."
-#: builtin/checkout.c:1376
+#: builtin/checkout.c:1411
msgid "you are switching branch while bisecting"
msgstr "преминаване към друг клон по време на двоично търсене"
-#: builtin/checkout.c:1383
+#: builtin/checkout.c:1418
msgid "paths cannot be used with switching branches"
msgstr "задаването на път е несъвместимо с преминаването от един клон към друг"
-#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394
+#: builtin/checkout.c:1421 builtin/checkout.c:1425 builtin/checkout.c:1429
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "опцията „%s“ е несъвместима с преминаването от един клон към друг"
-#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404
-#: builtin/checkout.c:1409 builtin/checkout.c:1414
+#: builtin/checkout.c:1433 builtin/checkout.c:1436 builtin/checkout.c:1439
+#: builtin/checkout.c:1444 builtin/checkout.c:1449
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "опцията „%s“ е несъвместима с „%s“"
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1446
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "опцията „%s“ е несъвместима със задаването на НАЧАЛО"
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1454
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
"За да преминете към клон, подайте указател, който сочи към подаване. „%s“ "
"не е такъв"
-#: builtin/checkout.c:1426
+#: builtin/checkout.c:1461
msgid "missing branch or commit argument"
msgstr "липсва аргумент — клон или подаване"
-#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72
-#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286
-#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563
-#: builtin/send-pack.c:174
-msgid "force progress reporting"
-msgstr "извеждане на напредъка"
-
-#: builtin/checkout.c:1469
+#: builtin/checkout.c:1504
msgid "perform a 3-way merge with the new branch"
msgstr "извършване на тройно сливане с новия клон"
-#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322
+#: builtin/checkout.c:1505 builtin/log.c:1799 parse-options.h:322
msgid "style"
msgstr "СТИЛ"
-#: builtin/checkout.c:1471
+#: builtin/checkout.c:1506
msgid "conflict style (merge or diff3)"
msgstr "действие при конфликт (сливане или тройна разлика)"
-#: builtin/checkout.c:1483 builtin/worktree.c:496
+#: builtin/checkout.c:1518 builtin/worktree.c:486
msgid "detach HEAD at named commit"
msgstr "отделяне на указателя „HEAD“ към указаното подаване"
-#: builtin/checkout.c:1484
+#: builtin/checkout.c:1519
msgid "set upstream info for new branch"
msgstr "задаване на кой клон бива следен при създаването на новия клон"
-#: builtin/checkout.c:1486
+#: builtin/checkout.c:1521
msgid "force checkout (throw away local modifications)"
msgstr "принудително изтегляне (вашите промени ще бъдат занулени)"
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1523
msgid "new-branch"
msgstr "НОВ_КЛОН"
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1523
msgid "new unparented branch"
msgstr "нов клон без родител"
-#: builtin/checkout.c:1490 builtin/merge.c:289
+#: builtin/checkout.c:1525 builtin/merge.c:301
msgid "update ignored files (default)"
msgstr "обновяване на игнорираните файлове (стандартно)"
-#: builtin/checkout.c:1493
+#: builtin/checkout.c:1528
msgid "do not check if another worktree is holding the given ref"
msgstr "без проверка дали друго работно дърво държи указателя"
-#: builtin/checkout.c:1506
+#: builtin/checkout.c:1541
msgid "checkout our version for unmerged files"
msgstr "изтегляне на вашата версия на неслетите файлове"
-#: builtin/checkout.c:1509
+#: builtin/checkout.c:1544
msgid "checkout their version for unmerged files"
msgstr "изтегляне на чуждата версия на неслетите файлове"
-#: builtin/checkout.c:1513
+#: builtin/checkout.c:1548
msgid "do not limit pathspecs to sparse entries only"
msgstr "без ограничаване на изброените пътища само до частично изтеглените"
-#: builtin/checkout.c:1565
-msgid "-b, -B and --orphan are mutually exclusive"
-msgstr "Опциите „-b“, „-B“ и „--orphan“ са несъвместими една с друга"
+#: builtin/checkout.c:1603
+#, c-format
+msgid "-%c, -%c and --orphan are mutually exclusive"
+msgstr "Опциите „-%c“, „-%c“ и „--orphan“ са несъвместими една с друга"
-#: builtin/checkout.c:1568
+#: builtin/checkout.c:1607
msgid "-p and --overlay are mutually exclusive"
msgstr "опциите „-p“ и „--overlay“ са несъвместими"
-#: builtin/checkout.c:1605
+#: builtin/checkout.c:1644
msgid "--track needs a branch name"
msgstr "опцията „--track“ изисква име на клон"
-#: builtin/checkout.c:1610
-msgid "missing branch name; try -b"
-msgstr "липсва име на клон, използвайте опцията „-b“"
+#: builtin/checkout.c:1649
+#, c-format
+msgid "missing branch name; try -%c"
+msgstr "липсва име на клон, използвайте опцията „-%c“"
-#: builtin/checkout.c:1642
+#: builtin/checkout.c:1681
#, c-format
msgid "could not resolve %s"
msgstr "„%s“ не може да бъде открит"
-#: builtin/checkout.c:1658
+#: builtin/checkout.c:1697
msgid "invalid path specification"
msgstr "указан е неправилен път"
-#: builtin/checkout.c:1665
+#: builtin/checkout.c:1704
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "„%s“ не е подаване, затова от него не може да се създаде клон „%s“"
-#: builtin/checkout.c:1669
+#: builtin/checkout.c:1708
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: опцията „--detach“ не приема аргумент-път „%s“"
-#: builtin/checkout.c:1678
+#: builtin/checkout.c:1717
msgid "--pathspec-from-file is incompatible with --detach"
msgstr "опциите „--pathspec-from-file“ и „--detach“ са несъвместими"
-#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506
+#: builtin/checkout.c:1720 builtin/reset.c:325 builtin/stash.c:1566
msgid "--pathspec-from-file is incompatible with --patch"
msgstr "опциите „--pathspec-from-file“ и „--patch“ са несъвместими"
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1733
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -11990,112 +12800,113 @@
"git checkout: опциите „--ours“/„--theirs“, „--force“ и „--merge“\n"
"са несъвместими с изтегляне от индекса."
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1738
msgid "you must specify path(s) to restore"
msgstr "трябва да укажете поне един път за възстановяване"
-#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774
-#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494
+#: builtin/checkout.c:1764 builtin/checkout.c:1766 builtin/checkout.c:1815
+#: builtin/checkout.c:1817 builtin/clone.c:122 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:482
+#: builtin/worktree.c:484
msgid "branch"
msgstr "клон"
-#: builtin/checkout.c:1724
+#: builtin/checkout.c:1765
msgid "create and checkout a new branch"
msgstr "създаване и преминаване към нов клон"
-#: builtin/checkout.c:1726
+#: builtin/checkout.c:1767
msgid "create/reset and checkout a branch"
msgstr "създаване/зануляване на клон и преминаване към него"
-#: builtin/checkout.c:1727
+#: builtin/checkout.c:1768
msgid "create reflog for new branch"
msgstr "създаване на журнал на указателите за нов клон"
-#: builtin/checkout.c:1729
+#: builtin/checkout.c:1770
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr ""
"опит за отгатване на име на клон след неуспешен опит с „git checkout "
"НЕСЪЩЕСТВУВАЩ_КЛОН“ (стандартно)"
-#: builtin/checkout.c:1730
+#: builtin/checkout.c:1771
msgid "use overlay mode (default)"
msgstr "използване на припокриващ режим (стандартно)"
-#: builtin/checkout.c:1775
+#: builtin/checkout.c:1816
msgid "create and switch to a new branch"
msgstr "създаване и преминаване към нов клон"
-#: builtin/checkout.c:1777
+#: builtin/checkout.c:1818
msgid "create/reset and switch to a branch"
msgstr "създаване/зануляване на клон и преминаване към него"
-#: builtin/checkout.c:1779
+#: builtin/checkout.c:1820
msgid "second guess 'git switch <no-such-branch>'"
msgstr ""
"опит за отгатване на име на клон след неуспешен опит с „git switch "
"НЕСЪЩЕСТВУВАЩ_КЛОН“"
-#: builtin/checkout.c:1781
+#: builtin/checkout.c:1822
msgid "throw away local modifications"
msgstr "зануляване на локалните промени"
-#: builtin/checkout.c:1813
+#: builtin/checkout.c:1856
msgid "which tree-ish to checkout from"
msgstr "към кой указател към дърво да се премине"
-#: builtin/checkout.c:1815
+#: builtin/checkout.c:1858
msgid "restore the index"
msgstr "възстановяване на индекса"
-#: builtin/checkout.c:1817
+#: builtin/checkout.c:1860
msgid "restore the working tree (default)"
msgstr "възстановяване на работното дърво (стандартно)"
-#: builtin/checkout.c:1819
+#: builtin/checkout.c:1862
msgid "ignore unmerged entries"
msgstr "пренебрегване на неслетите елементи"
-#: builtin/checkout.c:1820
+#: builtin/checkout.c:1863
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:301 git-add--interactive.perl:595
+#: builtin/clean.c:302 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -12108,7 +12919,7 @@
"ПРЕФИКС — избор на единствен обект по този уникален префикс\n"
" — (празно) нищо да не се избира\n"
-#: builtin/clean.c:305 git-add--interactive.perl:604
+#: builtin/clean.c:306 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -12129,33 +12940,33 @@
"* — избиране на всички обекти\n"
" — (празно) завършване на избирането\n"
-#: builtin/clean.c:521 git-add--interactive.perl:570
-#: git-add--interactive.perl:575
+#: builtin/clean.c:521 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Неправилен избор (%s).\n"
-#: builtin/clean.c:663
+#: builtin/clean.c:661
#, c-format
msgid "Input ignore patterns>> "
msgstr "Шаблони за игнорирани елементи≫ "
-#: builtin/clean.c:700
+#: builtin/clean.c:696
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "ПРЕДУПРЕЖДЕНИЕ: Никой обект не напасва на „%s“"
-#: builtin/clean.c:721
+#: builtin/clean.c:717
msgid "Select items to delete"
msgstr "Избиране на обекти за изтриване"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:762
+#: builtin/clean.c:758
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Да се изтрие ли „%s“? „y“ — да, „N“ — НЕ"
-#: builtin/clean.c:795
+#: builtin/clean.c:789
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -12173,56 +12984,52 @@
"help — този край\n"
"? — подсказка за шаблоните"
-#: builtin/clean.c:831
+#: builtin/clean.c:825
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Следният обект ще бъде изтрит:"
msgstr[1] "Следните обекти ще бъдат изтрити:"
-#: builtin/clean.c:847
+#: builtin/clean.c:841
msgid "No more files to clean, exiting."
msgstr "Файловете за изчистване свършиха. Изход от програмата."
-#: builtin/clean.c:909
+#: builtin/clean.c:903
msgid "do not print names of files removed"
msgstr "без извеждане на имената на файловете, които ще бъдат изтрити"
-#: builtin/clean.c:911
+#: builtin/clean.c:905
msgid "force"
msgstr "принудително изтриване"
-#: builtin/clean.c:912
+#: builtin/clean.c:906
msgid "interactive cleaning"
msgstr "интерактивно изтриване"
-#: builtin/clean.c:914
+#: builtin/clean.c:908
msgid "remove whole directories"
msgstr "изтриване на цели директории"
-#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564
-#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179
-#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/grep.c:922 builtin/log.c:184 builtin/log.c:186
+#: builtin/ls-files.c:573 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "ШАБЛОН"
-#: builtin/clean.c:916
+#: builtin/clean.c:910
msgid "add <pattern> to ignore rules"
msgstr "добавяне на ШАБЛОН от файлове, които да не се трият"
-#: builtin/clean.c:917
+#: builtin/clean.c:911
msgid "remove ignored files, too"
msgstr "изтриване и на игнорираните файлове"
-#: builtin/clean.c:919
+#: builtin/clean.c:913
msgid "remove only ignored files"
msgstr "изтриване само на игнорирани файлове"
-#: builtin/clean.c:937
-msgid "-x and -X cannot be used together"
-msgstr "опциите „-x“ и „-X“ са несъвместими"
-
-#: builtin/clean.c:941
+#: builtin/clean.c:929
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -12230,7 +13037,7 @@
"Настройката „clean.requireForce“ е зададена като истина, което изисква някоя "
"от опциите „-i“, „-n“ или „-f“. Няма да се извърши изчистване"
-#: builtin/clean.c:944
+#: builtin/clean.c:932
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -12239,32 +13046,36 @@
"което изисква някоя от опциите „-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
+#: builtin/clone.c:94
msgid "don't create a checkout"
msgstr "без създаване на работно дърво"
-#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
+#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:555
msgid "create a bare repository"
msgstr "създаване на голо хранилище"
-#: builtin/clone.c:98
+#: builtin/clone.c:99
msgid "create a mirror repository (implies bare)"
msgstr ""
"създаване на хранилище-огледало (включва опцията „--bare“ за голо хранилище)"
-#: builtin/clone.c:100
+#: builtin/clone.c:101
msgid "to clone from a local repository"
msgstr "клониране от локално хранилище"
-#: builtin/clone.c:102
+#: builtin/clone.c:103
msgid "don't use local hardlinks, always copy"
msgstr "без твърди връзки, файловете винаги да се копират"
-#: builtin/clone.c:104
+#: builtin/clone.c:105
msgid "setup as shared repository"
msgstr "настройване за споделено хранилище"
@@ -12276,134 +13087,135 @@
msgid "initialize submodules in the clone"
msgstr "инициализиране на подмодулите при това клониране"
-#: builtin/clone.c:110
+#: builtin/clone.c:111
msgid "number of submodules cloned in parallel"
msgstr "брой подмодули, клонирани паралелно"
-#: builtin/clone.c:111 builtin/init-db.c:486
+#: builtin/clone.c:112 builtin/init-db.c:552
msgid "template-directory"
msgstr "директория с шаблони"
-#: builtin/clone.c:112 builtin/init-db.c:487
+#: builtin/clone.c:113 builtin/init-db.c:553
msgid "directory from which templates will be used"
msgstr "директория, която съдържа шаблоните, които да се ползват"
-#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407
-#: builtin/submodule--helper.c:1912
+#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831
+#: builtin/submodule--helper.c:2336
msgid "reference repository"
msgstr "еталонно хранилище"
-#: builtin/clone.c:118 builtin/submodule--helper.c:1409
-#: builtin/submodule--helper.c:1914
+#: builtin/clone.c:119 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:3441 builtin/repack.c:327
+#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3561 builtin/repack.c:357
msgid "name"
msgstr "ИМЕ"
-#: builtin/clone.c:120
+#: builtin/clone.c:121
msgid "use <name> instead of 'origin' to track upstream"
msgstr "използване на това ИМЕ вместо „origin“ при проследяване на клони"
-#: builtin/clone.c:122
+#: builtin/clone.c:123
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "изтегляне на този КЛОН, а не соченият от отдалечения указател „HEAD“"
-#: builtin/clone.c:124
+#: builtin/clone.c:125
msgid "path to git-upload-pack on the remote"
msgstr "път към командата „git-upload-pack“ на отдалеченото хранилище"
-#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828
-#: builtin/pull.c:207
+#: builtin/clone.c:126 builtin/fetch.c:176 builtin/grep.c:861
+#: builtin/pull.c:208
msgid "depth"
msgstr "ДЪЛБОЧИНА"
-#: builtin/clone.c:126
+#: builtin/clone.c:127
msgid "create a shallow clone of that depth"
msgstr "плитко клониране до тази ДЪЛБОЧИНА"
-#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430
+#: builtin/clone.c:128 builtin/fetch.c:178 builtin/pack-objects.c:3550
+#: builtin/pull.c:211
msgid "time"
msgstr "ВРЕМЕ"
-#: builtin/clone.c:128
+#: builtin/clone.c:129
msgid "create a shallow clone since a specific time"
msgstr "плитко клониране до момент във времето"
-#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195
-#: builtin/rebase.c:1480
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/fetch.c:203
+#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1323
msgid "revision"
msgstr "ВЕРСИЯ"
-#: builtin/clone.c:130 builtin/fetch.c:173
+#: builtin/clone.c:131 builtin/fetch.c:181 builtin/pull.c:215
msgid "deepen history of shallow clone, excluding rev"
msgstr "задълбочаване на историята на плитко хранилище до изключващ указател"
-#: builtin/clone.c:132 builtin/submodule--helper.c:1419
-#: builtin/submodule--helper.c:1928
+#: builtin/clone.c:133 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
+#: builtin/clone.c:135
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
"без клониране на етикети, като последващите доставяния няма да ги следят"
-#: builtin/clone.c:136
+#: builtin/clone.c:137
msgid "any cloned submodules will be shallow"
msgstr "всички клонирани подмодули ще са плитки"
-#: builtin/clone.c:137 builtin/init-db.c:495
+#: builtin/clone.c:138 builtin/init-db.c:561
msgid "gitdir"
msgstr "СЛУЖЕБНА_ДИРЕКТОРИЯ"
-#: builtin/clone.c:138 builtin/init-db.c:496
+#: builtin/clone.c:139 builtin/init-db.c:562
msgid "separate git dir from working tree"
msgstr "отделна СЛУЖЕБНА_ДИРЕКТОРИЯ за git извън работното дърво"
-#: builtin/clone.c:139
+#: builtin/clone.c:140
msgid "key=value"
msgstr "КЛЮЧ=СТОЙНОСТ"
-#: builtin/clone.c:140
+#: builtin/clone.c:141
msgid "set config inside the new repository"
msgstr "задаване на настройките на новото хранилище"
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
-#: builtin/push.c:573 builtin/send-pack.c:172
+#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77
+#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
msgid "server-specific"
msgstr "специфични за сървъра"
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
-#: builtin/push.c:573 builtin/send-pack.c:173
+#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77
+#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
msgid "option to transmit"
msgstr "опция за пренос"
-#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220
-#: builtin/push.c:574
+#: builtin/clone.c:144 builtin/fetch.c:199 builtin/pull.c:234
+#: builtin/push.c:585
msgid "use IPv4 addresses only"
msgstr "само адреси IPv4"
-#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223
-#: builtin/push.c:576
+#: builtin/clone.c:146 builtin/fetch.c:201 builtin/pull.c:237
+#: builtin/push.c:587
msgid "use IPv6 addresses only"
msgstr "само адреси IPv6"
-#: builtin/clone.c:149
+#: builtin/clone.c:150
msgid "any cloned submodules will use their remote-tracking branch"
msgstr "всички клонирани подмодули ще ползват следящите си клони"
-#: builtin/clone.c:151
+#: builtin/clone.c:152
msgid "initialize sparse-checkout file to include only files at root"
msgstr ""
"инициализиране на файла за частично изтегляне („.git/info/sparse-checkout“) "
"да съдържа само файловете в основната директория"
-#: builtin/clone.c:287
+#: builtin/clone.c:288
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -12411,43 +13223,43 @@
"Името на директорията не може да бъде отгатнато.\n"
"Задайте директорията изрично на командния ред"
-#: builtin/clone.c:340
+#: builtin/clone.c:341
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr ""
"ПРЕДУПРЕЖДЕНИЕ: не може да се добави алтернативен източник на „%s“: %s\n"
-#: builtin/clone.c:413
+#: builtin/clone.c:414
#, c-format
msgid "%s exists and is not a directory"
msgstr "„%s“ съществува и не е директория"
-#: builtin/clone.c:430
+#: builtin/clone.c:432
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "неуспешно итериране по „%s“"
-#: builtin/clone.c:460
+#: builtin/clone.c:463
#, c-format
msgid "failed to create link '%s'"
msgstr "връзката „%s“ не може да бъде създадена"
-#: builtin/clone.c:464
+#: builtin/clone.c:467
#, c-format
msgid "failed to copy file to '%s'"
msgstr "файлът не може да бъде копиран като „%s“"
-#: builtin/clone.c:469
+#: builtin/clone.c:472
#, c-format
msgid "failed to iterate over '%s'"
msgstr "неуспешно итериране по „%s“"
-#: builtin/clone.c:494
+#: builtin/clone.c:499
#, c-format
msgid "done.\n"
msgstr "действието завърши.\n"
-#: builtin/clone.c:508
+#: builtin/clone.c:513
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -12460,103 +13272,108 @@
"\n"
" git restore --source=HEAD :/\n"
-#: builtin/clone.c:585
+#: builtin/clone.c:590
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr ""
"Клонът „%s“ от отдалеченото хранилище, което клонирате,\n"
"и който следва да бъде изтеглен, не съществува."
-#: builtin/clone.c:705
+#: builtin/clone.c:709
#, c-format
msgid "unable to update %s"
msgstr "обектът „%s“ не може да бъде обновен"
-#: builtin/clone.c:753
+#: builtin/clone.c:757
msgid "failed to initialize sparse-checkout"
msgstr "частичното изтегляне не може да се инициализира"
-#: builtin/clone.c:776
+#: builtin/clone.c:780
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"указателят „HEAD“ от отдалеченото хранилище сочи към нещо,\n"
"което не съществува. Не може да се изтегли определен клон.\n"
-#: builtin/clone.c:807
+#: builtin/clone.c:812
msgid "unable to checkout working tree"
msgstr "работното дърво не може да бъде подготвено"
-#: builtin/clone.c:862
+#: builtin/clone.c:887
msgid "unable to write parameters to config file"
msgstr "настройките не могат да бъдат записани в конфигурационния файл"
-#: builtin/clone.c:925
+#: builtin/clone.c:950
msgid "cannot repack to clean up"
msgstr "не може да се извърши пакетиране за изчистване на файловете"
-#: builtin/clone.c:927
+#: builtin/clone.c:952
msgid "cannot unlink temporary alternates file"
msgstr "временният файл за алтернативни обекти не може да бъде изтрит"
-#: builtin/clone.c:965 builtin/receive-pack.c:1950
+#: builtin/clone.c:993 builtin/receive-pack.c:2493
msgid "Too many arguments."
msgstr "Прекалено много аргументи."
-#: builtin/clone.c:969
+#: builtin/clone.c:997
msgid "You must specify a repository to clone."
msgstr "Трябва да укажете кое хранилище искате да клонирате."
-#: builtin/clone.c:982
+#: builtin/clone.c:1010
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "опциите „--bare“ и „--origin %s“ са несъвместими."
-#: builtin/clone.c:985
+#: builtin/clone.c:1013
msgid "--bare and --separate-git-dir are incompatible."
msgstr "опциите „--bare“ и „--separate-git-dir“ са несъвместими."
-#: builtin/clone.c:998
+#: builtin/clone.c:1026
#, c-format
msgid "repository '%s' does not exist"
msgstr "не съществува хранилище „%s“"
-#: builtin/clone.c:1004 builtin/fetch.c:1796
+#: builtin/clone.c:1030 builtin/fetch.c:1951
#, c-format
msgid "depth %s is not a positive number"
msgstr "дълбочината трябва да е положително цяло число, а не „%s“"
-#: builtin/clone.c:1014
+#: builtin/clone.c:1040
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "целевият път „%s“ съществува и не е празна директория."
-#: builtin/clone.c:1024
+#: builtin/clone.c:1046
+#, c-format
+msgid "repository path '%s' already exists and is not an empty directory."
+msgstr "пътят в хранилището „%s“ съществува и не е празна директория."
+
+#: builtin/clone.c:1060
#, c-format
msgid "working tree '%s' already exists."
msgstr "в „%s“ вече съществува работно дърво."
-#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271
-#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327
+#: builtin/clone.c:1075 builtin/clone.c:1096 builtin/difftool.c:271
+#: builtin/log.c:1986 builtin/worktree.c:282 builtin/worktree.c:314
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "родителските директории на „%s“ не могат да бъдат създадени"
-#: builtin/clone.c:1044
+#: builtin/clone.c:1080
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "работното дърво в „%s“ не може да бъде създадено."
-#: builtin/clone.c:1064
+#: builtin/clone.c:1100
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Клониране и създаване на голо хранилище в „%s“…\n"
-#: builtin/clone.c:1066
+#: builtin/clone.c:1102
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Клониране и създаване на хранилище в „%s“…\n"
-#: builtin/clone.c:1090
+#: builtin/clone.c:1126
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -12564,44 +13381,49 @@
"Опцията „--recursive“ е несъвместима с опциите „--reference“ и „--reference-"
"if-able“"
-#: builtin/clone.c:1154
+#: builtin/clone.c:1170 builtin/remote.c:200 builtin/remote.c:705
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr "„%s“ е неправилно име за отдалечено хранилище"
+
+#: builtin/clone.c:1211
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
"При локално клониране опцията „--depth“ се прескача. Ползвайте схемата "
"„file://“."
-#: builtin/clone.c:1156
+#: builtin/clone.c:1213
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
"При локално клониране опцията „--shallow-since“ се прескача. Ползвайте "
"схемата „file://“."
-#: builtin/clone.c:1158
+#: builtin/clone.c:1215
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"При локално клониране опцията „--shallow-exclude“ се прескача. Ползвайте "
"схемата „file://“."
-#: builtin/clone.c:1160
+#: builtin/clone.c:1217
msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
"При локално клониране опцията „--filter“ се прескача. Ползвайте схемата "
"„file://“."
-#: builtin/clone.c:1163
+#: builtin/clone.c:1220
msgid "source repository is shallow, ignoring --local"
msgstr "клонираното хранилище е плитко, затова опцията „--local“ се прескача"
-#: builtin/clone.c:1168
+#: builtin/clone.c:1225
msgid "--local is ignored"
msgstr "опцията „--local“ се прескача"
-#: builtin/clone.c:1243 builtin/clone.c:1251
+#: builtin/clone.c:1315 builtin/clone.c:1323
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Отдалеченият клон „%s“ липсва в клонираното хранилище „%s“"
-#: builtin/clone.c:1254
+#: builtin/clone.c:1326
msgid "You appear to have cloned an empty repository."
msgstr "Изглежда клонирахте празно хранилище."
@@ -12637,6 +13459,116 @@
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:187 builtin/log.c:1768
+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 "
@@ -12650,7 +13582,7 @@
msgid "duplicate parent %s ignored"
msgstr "прескачане на повтарящ се родител: „%s“"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:557
#, c-format
msgid "not a valid object name %s"
msgstr "неправилно име на обект: „%s“"
@@ -12678,13 +13610,13 @@
msgid "id of a parent commit object"
msgstr "ИДЕНТИФИКАТОР на обекта за подаването-родител"
-#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477
-#: builtin/tag.c:412
+#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:282
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1537
+#: builtin/tag.c:445
msgid "message"
msgstr "СЪОБЩЕНИЕ"
-#: builtin/commit-tree.c:115 builtin/commit.c:1501
+#: builtin/commit-tree.c:115 builtin/commit.c:1504
msgid "commit message"
msgstr "СЪОБЩЕНИЕ при подаване"
@@ -12692,8 +13624,8 @@
msgid "read commit log message from file"
msgstr "изчитане на съобщението за подаване от ФАЙЛ"
-#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288
-#: builtin/pull.c:175 builtin/revert.c:118
+#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:299
+#: builtin/pull.c:176 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "подписване на подаването с GPG"
@@ -12741,13 +13673,20 @@
"\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"
@@ -12769,69 +13708,73 @@
" 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:351
+#: builtin/commit.c:348
msgid "--pathspec-from-file with -a does not make sense"
msgstr "опциите „-a“ и „--pathspec-from-file“ са несъвместими"
-#: builtin/commit.c:364
+#: builtin/commit.c:361
msgid "No paths with --include/--only does not make sense."
msgstr "Опциите „--include“ и „--only“ изискват аргументи."
-#: builtin/commit.c:376
+#: builtin/commit.c:373
msgid "unable to create temporary index"
msgstr "временният индекс не може да бъде създаден"
-#: builtin/commit.c:385
+#: builtin/commit.c:382
msgid "interactive add failed"
msgstr "неуспешно интерактивно добавяне"
-#: builtin/commit.c:400
+#: builtin/commit.c:397
msgid "unable to update temporary index"
msgstr "временният индекс не може да бъде обновен"
-#: builtin/commit.c:402
+#: builtin/commit.c:399
msgid "Failed to update main cache tree"
msgstr "Дървото на основния кеш не може да бъде обновено"
-#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496
+#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495
msgid "unable to write new_index file"
msgstr "новият индекс не може да бъде записан"
-#: builtin/commit.c:479
+#: builtin/commit.c:476
msgid "cannot do a partial commit during a merge."
msgstr "по време на сливане не може да се извърши частично подаване."
-#: builtin/commit.c:481
+#: builtin/commit.c:478
msgid "cannot do a partial commit during a cherry-pick."
msgstr "по време на отбиране не може да се извърши частично подаване."
-#: builtin/commit.c:489
+#: 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:508
+#: builtin/commit.c:507
msgid "unable to write temporary index file"
msgstr "временният индекс не може да бъде записан"
-#: builtin/commit.c:606
+#: builtin/commit.c:605
#, c-format
msgid "commit '%s' lacks author header"
msgstr "заглавната част за автор в подаването „%s“ липсва"
-#: builtin/commit.c:608
+#: builtin/commit.c:607
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "заглавната част за автор в подаването „%s“ е неправилна"
-#: builtin/commit.c:627
+#: builtin/commit.c:626
msgid "malformed --author parameter"
msgstr "неправилен параметър към опцията „--author“"
-#: builtin/commit.c:680
+#: builtin/commit.c:679
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -12839,69 +13782,68 @@
"не може да се избере знак за коментар — в текущото съобщение за подаване са "
"използвани всички подобни знаци"
-#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097
+#: 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:730 builtin/shortlog.c:319
+#: builtin/commit.c:729 builtin/shortlog.c:413
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(изчитане на съобщението за подаване от стандартния вход)\n"
-#: builtin/commit.c:732
+#: builtin/commit.c:731
msgid "could not read log from standard input"
msgstr "съобщението за подаване не бе прочетено стандартния вход"
-#: builtin/commit.c:736
+#: builtin/commit.c:735
#, c-format
msgid "could not read log file '%s'"
msgstr "файлът със съобщението за подаване „%s“ не може да бъде прочетен"
-#: builtin/commit.c:767 builtin/commit.c:783
+#: builtin/commit.c:766 builtin/commit.c:782
msgid "could not read SQUASH_MSG"
msgstr "съобщението за вкарване SQUASH_MSG не може да бъде прочетено"
-#: builtin/commit.c:774
+#: builtin/commit.c:773
msgid "could not read MERGE_MSG"
msgstr "съобщението за сливане MERGE_MSG не може да бъде прочетено"
-#: builtin/commit.c:834
+#: builtin/commit.c:833
msgid "could not write commit template"
msgstr "шаблонът за подаване не може да бъде запазен"
#: builtin/commit.c:853
-#, c-format
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
+"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:858
-#, c-format
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
+"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:871
+#: builtin/commit.c:868
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -12910,7 +13852,7 @@
"Въведете съобщението за подаване на промените. Редовете, които започват\n"
"с „%c“, ще бъдат пропуснати, а празно съобщение преустановява подаването.\n"
-#: builtin/commit.c:879
+#: builtin/commit.c:876
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -12921,22 +13863,22 @@
"с „%c“, също ще бъдат включени — може да ги изтриете вие. Празно \n"
"съобщение преустановява подаването.\n"
-#: builtin/commit.c:896
+#: builtin/commit.c:893
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sАвтор: %.*s <%.*s>"
-#: builtin/commit.c:904
+#: builtin/commit.c:901
#, c-format
msgid "%sDate: %s"
msgstr "%sДата: %s"
-#: builtin/commit.c:911
+#: builtin/commit.c:908
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sПодаващ: %.*s <%.*s>"
-#: builtin/commit.c:929
+#: builtin/commit.c:926
msgid "Cannot read index"
msgstr "Индексът не може да бъде прочетен"
@@ -12944,7 +13886,7 @@
msgid "Error building trees"
msgstr "Грешка при изграждане на дърветата"
-#: builtin/commit.c:1011 builtin/tag.c:275
+#: builtin/commit.c:1011 builtin/tag.c:308
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Подайте съобщението с някоя от опциите „-m“ или „-F“.\n"
@@ -12961,7 +13903,7 @@
msgid "Invalid ignored mode '%s'"
msgstr "Неправилен режим за игнорираните файлове: „%s“"
-#: builtin/commit.c:1087 builtin/commit.c:1327
+#: builtin/commit.c:1087 builtin/commit.c:1331
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Неправилен режим за неследените файлове: „%s“"
@@ -12986,82 +13928,86 @@
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "В момента се извършва отбиране на подаване, не можете да поправяте."
-#: builtin/commit.c:1188
+#: 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:1198
+#: builtin/commit.c:1200
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Опциите „-c“, „-C“, „-F“ и „--fixup““ са несъвместими."
-#: builtin/commit.c:1200
+#: builtin/commit.c:1202
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "Опцията „-m“ е несъвместима с „-c“, „-C“ и „-F“."
-#: builtin/commit.c:1208
+#: 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:1225
+#: 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:1231
+#: builtin/commit.c:1235
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "опцията „-a“ е несъвместима със задаването на пътища: „%s…“"
-#: builtin/commit.c:1362 builtin/commit.c:1524
+#: builtin/commit.c:1366 builtin/commit.c:1527
msgid "show status concisely"
msgstr "кратка информация за състоянието"
-#: builtin/commit.c:1364 builtin/commit.c:1526
+#: builtin/commit.c:1368 builtin/commit.c:1529
msgid "show branch information"
msgstr "информация за клоните"
-#: builtin/commit.c:1366
+#: builtin/commit.c:1370
msgid "show stash information"
msgstr "информация за скатаното"
-#: builtin/commit.c:1368 builtin/commit.c:1528
+#: builtin/commit.c:1372 builtin/commit.c:1531
msgid "compute full ahead/behind values"
msgstr "изчисляване на точните стойности напред/назад"
-#: builtin/commit.c:1370
+#: builtin/commit.c:1374
msgid "version"
msgstr "версия"
-#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549
-#: builtin/worktree.c:643
+#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560
+#: builtin/worktree.c:679
msgid "machine-readable output"
msgstr "формат на изхода за четене от програма"
-#: builtin/commit.c:1373 builtin/commit.c:1532
+#: builtin/commit.c:1377 builtin/commit.c:1535
msgid "show status in long format (default)"
msgstr "подробна информация за състоянието (стандартно)"
-#: builtin/commit.c:1376 builtin/commit.c:1535
+#: builtin/commit.c:1380 builtin/commit.c:1538
msgid "terminate entries with NUL"
msgstr "разделяне на елементите с нулевия знак „NUL“"
-#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538
-#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
-#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336
+#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541
+#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
+#: builtin/fast-export.c:1204 builtin/rebase.c:1412 parse-options.h:336
msgid "mode"
msgstr "РЕЖИМ"
-#: builtin/commit.c:1379 builtin/commit.c:1538
+#: 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:1383
+#: builtin/commit.c:1387
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -13070,11 +14016,11 @@
"„traditional“ (традиционен), „matching“ (напасващи), „no“ (без игнорираните "
"файлове). Стандартният РЕЖИМ е: „traditional“."
-#: builtin/commit.c:1385 parse-options.h:192
+#: builtin/commit.c:1389 parse-options.h:192
msgid "when"
msgstr "КОГА"
-#: builtin/commit.c:1386
+#: builtin/commit.c:1390
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -13083,176 +14029,176 @@
"една от „all“ (всички), „dirty“ (тези с неподадени промени), "
"„untracked“ (неследени)"
-#: builtin/commit.c:1388
+#: builtin/commit.c:1392
msgid "list untracked files in columns"
msgstr "извеждане на неследените файлове в колони"
-#: builtin/commit.c:1389
+#: builtin/commit.c:1393
msgid "do not detect renames"
msgstr "без засичане на преименуванията"
-#: builtin/commit.c:1391
+#: builtin/commit.c:1395
msgid "detect renames, optionally set similarity index"
msgstr "засичане на преименуванията, може да се зададе коефициент на прилика"
-#: builtin/commit.c:1411
+#: builtin/commit.c:1415
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr "Неподдържана комбинация от аргументи за игнорирани и неследени файлове"
-#: builtin/commit.c:1494
+#: builtin/commit.c:1497
msgid "suppress summary after successful commit"
msgstr "без информация след успешно подаване"
-#: builtin/commit.c:1495
+#: builtin/commit.c:1498
msgid "show diff in commit message template"
msgstr "добавяне на разликата към шаблона за съобщението при подаване"
-#: builtin/commit.c:1497
+#: builtin/commit.c:1500
msgid "Commit message options"
msgstr "Опции за съобщението при подаване"
-#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414
+#: builtin/commit.c:1501 builtin/merge.c:286 builtin/tag.c:447
msgid "read message from file"
msgstr "взимане на съобщението от ФАЙЛ"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1502
msgid "author"
msgstr "АВТОР"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1502
msgid "override author for commit"
msgstr "задаване на АВТОР за подаването"
-#: builtin/commit.c:1500 builtin/gc.c:538
+#: builtin/commit.c:1503 builtin/gc.c:550
msgid "date"
msgstr "ДАТА"
-#: builtin/commit.c:1500
+#: builtin/commit.c:1503
msgid "override date for commit"
msgstr "задаване на ДАТА за подаването"
-#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504
-#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92
+#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507
+#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:90
msgid "commit"
msgstr "ПОДАВАНЕ"
-#: builtin/commit.c:1502
+#: builtin/commit.c:1505
msgid "reuse and edit message from specified commit"
msgstr "преизползване и редактиране на съобщението от указаното ПОДАВАНЕ"
-#: builtin/commit.c:1503
+#: builtin/commit.c:1506
msgid "reuse message from specified commit"
msgstr "преизползване на съобщението от указаното ПОДАВАНЕ"
-#: builtin/commit.c:1504
+#: builtin/commit.c:1507
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"използване на автоматичното съобщение за вкарване на указаното ПОДАВАНЕ в "
"предходното без следа"
-#: builtin/commit.c:1505
+#: builtin/commit.c:1508
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"използване на автоматичното съобщение за вкарване на указаното ПОДАВАНЕ в "
"предното"
-#: builtin/commit.c:1506
+#: builtin/commit.c:1509
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
"смяна на автора да съвпада с подаващия (използва се с „-C“/„-c“/„--amend“)"
-#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290
-#: builtin/pull.c:144 builtin/revert.c:110
-msgid "add Signed-off-by:"
-msgstr "добавяне на поле за подпис — „Signed-off-by:“"
+#: builtin/commit.c:1510 builtin/log.c:1743 builtin/merge.c:302
+#: builtin/pull.c:145 builtin/revert.c:110
+msgid "add a Signed-off-by trailer"
+msgstr "добавяне на епилог за подпис „Signed-off-by“"
-#: builtin/commit.c:1508
+#: builtin/commit.c:1511
msgid "use specified template file"
msgstr "използване на указания шаблонен ФАЙЛ"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1512
msgid "force edit of commit"
msgstr "редактиране на подаване"
-#: builtin/commit.c:1511
+#: builtin/commit.c:1514
msgid "include status in commit message template"
msgstr "вмъкване на състоянието в шаблона за съобщението при подаване"
-#: builtin/commit.c:1516
+#: builtin/commit.c:1519
msgid "Commit contents options"
msgstr "Опции за избор на файлове при подаване"
-#: builtin/commit.c:1517
+#: builtin/commit.c:1520
msgid "commit all changed files"
msgstr "подаване на всички променени файлове"
-#: builtin/commit.c:1518
+#: builtin/commit.c:1521
msgid "add specified files to index for commit"
msgstr "добавяне на указаните файлове към индекса за подаване"
-#: builtin/commit.c:1519
+#: builtin/commit.c:1522
msgid "interactively add files"
msgstr "интерактивно добавяне на файлове"
-#: builtin/commit.c:1520
+#: builtin/commit.c:1523
msgid "interactively add changes"
msgstr "интерактивно добавяне на промени"
-#: builtin/commit.c:1521
+#: builtin/commit.c:1524
msgid "commit only specified files"
msgstr "подаване само на указаните файлове"
-#: builtin/commit.c:1522
+#: builtin/commit.c:1525
msgid "bypass pre-commit and commit-msg hooks"
msgstr ""
"без изпълнение на куките преди подаване и при промяна на съобщението за "
"подаване (pre-commit и commit-msg)"
-#: builtin/commit.c:1523
+#: builtin/commit.c:1526
msgid "show what would be committed"
msgstr "отпечатване на това, което би било подадено"
-#: builtin/commit.c:1536
+#: builtin/commit.c:1539
msgid "amend previous commit"
msgstr "поправяне на предишното подаване"
-#: builtin/commit.c:1537
+#: builtin/commit.c:1540
msgid "bypass post-rewrite hook"
msgstr "без изпълнение на куката след презаписване (post-rewrite)"
-#: builtin/commit.c:1544
+#: builtin/commit.c:1547
msgid "ok to record an empty change"
msgstr "позволяване на празни подавания"
-#: builtin/commit.c:1546
+#: builtin/commit.c:1549
msgid "ok to record a change with an empty message"
msgstr "позволяване на подавания с празни съобщения"
-#: builtin/commit.c:1619
+#: builtin/commit.c:1622
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Повреден файл за върха за сливането „MERGE_HEAD“ (%s)"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1629
msgid "could not read MERGE_MODE"
msgstr "режимът на сливане „MERGE_MODE“ не може да бъде прочетен"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1650
#, c-format
msgid "could not read commit message: %s"
msgstr "съобщението за подаване не може да бъде прочетено: %s"
-#: builtin/commit.c:1652
+#: builtin/commit.c:1657
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Неизвършване на подаване поради празно съобщение.\n"
-#: builtin/commit.c:1657
+#: builtin/commit.c:1662
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Неизвършване на подаване поради нередактирано съобщение.\n"
-#: builtin/commit.c:1691
+#: 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"
@@ -13264,300 +14210,230 @@
"\n"
" git restore --staged :/"
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:17
-msgid ""
-"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
-msgstr ""
-"git commit-graph verify [--object-dir ДИР_ОБЕКТИ] [--shallow] [--"
-"[no-]progress]"
-
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:22
-msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
-msgstr ""
-"git commit-graph write [--object-dir ДИР_ОБЕКТИ] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] ОПЦИИ_ЗА_РАЗДЕЛЯНЕ"
-
-#: builtin/commit-graph.c:52
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "директорията с обекти, която отговаря на „%s“, не може да бъде открита"
-
-#: builtin/commit-graph.c:68 builtin/commit-graph.c:125
-#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657
-msgid "dir"
-msgstr "директория"
-
-#: builtin/commit-graph.c:69 builtin/commit-graph.c:126
-#: builtin/commit-graph.c:211
-msgid "The object directory to store the graph"
-msgstr "ДИРекторията_с_ОБЕКТИ за запазване на гра̀фа"
-
-#: builtin/commit-graph.c:71
-msgid "if the commit-graph is split, only verify the tip file"
-msgstr ""
-"ако гра̀фа с подаванията е раздробен, да се проверява само файлът на върха"
-
-#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23
-#, c-format
-msgid "Could not open commit-graph '%s'"
-msgstr "Графът с подаванията не може да се отвори: „%s“"
-
-#: builtin/commit-graph.c:128
-msgid "start walk at all refs"
-msgstr "обхождането да започне от всички указатели"
-
-#: builtin/commit-graph.c:130
-msgid "scan pack-indexes listed by stdin for commits"
-msgstr ""
-"проверка на подаванията за индексите на пакетите изброени на командния ред"
-
-#: builtin/commit-graph.c:132
-msgid "start walk at commits listed by stdin"
-msgstr "започване на обхождането при подаванията подадени на стандартния вход"
-
-#: builtin/commit-graph.c:134
-msgid "include all commits already in the commit-graph file"
-msgstr ""
-"включване на всички подавания, които вече са във файла с гра̀фа на подаванията"
-
-#: builtin/commit-graph.c:137
-msgid "allow writing an incremental commit-graph file"
-msgstr "позволяване на запис на нарастващ файл с гра̀фа на подаванията"
-
-#: builtin/commit-graph.c:139 builtin/commit-graph.c:143
-msgid "maximum number of commits in a non-base split commit-graph"
-msgstr "максимален брой подавания в небазово ниво на раздробен граф"
-
-#: builtin/commit-graph.c:141
-msgid "maximum ratio between two levels of a split commit-graph"
-msgstr ""
-"максимално отношение на броя подавания в две последователни нива в раздробен "
-"граф"
-
-#: builtin/commit-graph.c:159
-msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
-msgstr ""
-"опциите „--reachable“, „--stdin-commits“ и „--stdin-packs“ са несъвместими"
-
#: builtin/config.c:11
msgid "git config [<options>]"
msgstr "git config [ОПЦИЯ…]"
-#: builtin/config.c:104 builtin/env--helper.c:23
+#: builtin/config.c:109 builtin/env--helper.c:27
#, c-format
msgid "unrecognized --type argument, %s"
-msgstr "непознат аргумент „--type“: %s"
+msgstr "непознат аргумент към „--type“: %s"
-#: builtin/config.c:116
+#: builtin/config.c:121
msgid "only one type at a time"
msgstr "само по един вид"
-#: builtin/config.c:125
+#: builtin/config.c:130
msgid "Config file location"
msgstr "Местоположение на конфигурационния файл"
-#: builtin/config.c:126
+#: builtin/config.c:131
msgid "use global config file"
msgstr "използване на глобалния конфигурационен файл"
-#: builtin/config.c:127
+#: builtin/config.c:132
msgid "use system config file"
msgstr "използване на системния конфигурационен файл"
-#: builtin/config.c:128
+#: builtin/config.c:133
msgid "use repository config file"
msgstr "използване на конфигурационния файл на хранилището"
-#: builtin/config.c:129
+#: builtin/config.c:134
msgid "use per-worktree config file"
msgstr "използване на конфигурационния файл на работното копие"
-#: builtin/config.c:130
+#: builtin/config.c:135
msgid "use given config file"
msgstr "използване на зададения конфигурационен ФАЙЛ"
-#: builtin/config.c:131
+#: builtin/config.c:136
msgid "blob-id"
msgstr "ИДЕНТИФИКАТОР"
-#: builtin/config.c:131
+#: builtin/config.c:136
msgid "read config from given blob object"
msgstr ""
"изчитане на конфигурацията от BLOB с този ИДЕНТИФИКАТОР на съдържанието"
-#: builtin/config.c:132
+#: builtin/config.c:137
msgid "Action"
msgstr "Действие"
-#: builtin/config.c:133
-msgid "get value: name [value-regex]"
-msgstr "извеждане на стойност: ИМЕ [РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]"
+#: builtin/config.c:138
+msgid "get value: name [value-pattern]"
+msgstr "извеждане на стойност: ИМЕ [ШАБЛОН_ЗА_СТОЙНОСТТА]"
-#: builtin/config.c:134
-msgid "get all values: key [value-regex]"
-msgstr "извеждане на всички стойности: ключ [РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]"
+#: builtin/config.c:139
+msgid "get all values: key [value-pattern]"
+msgstr "извеждане на всички стойности: ключ [ШАБЛОН_ЗА_СТОЙНОСТТА]"
-#: builtin/config.c:135
-msgid "get values for regexp: name-regex [value-regex]"
+#: builtin/config.c:140
+msgid "get values for regexp: name-regex [value-pattern]"
msgstr ""
"извеждане на стойностите за РЕГУЛЯРНия_ИЗРАЗ: РЕГУЛЯРЕН_ИЗРАЗ_ЗА_ИМЕТО "
-"[РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]"
+"[ШАБЛОН_ЗА_СТОЙНОСТТА]"
-#: builtin/config.c:136
+#: builtin/config.c:141
msgid "get value specific for the URL: section[.var] URL"
msgstr "извеждане на стойността за указания адрес: РАЗДЕЛ[.ПРОМЕНЛИВА] АДРЕС"
-#: builtin/config.c:137
-msgid "replace all matching variables: name value [value_regex]"
+#: builtin/config.c:142
+msgid "replace all matching variables: name value [value-pattern]"
msgstr ""
-"замяна на всички съвпадащи променливи: ИМЕ СТОЙНОСТ "
-"[РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]"
+"замяна на всички съвпадащи променливи: ИМЕ СТОЙНОСТ [ШАБЛОН_ЗА_СТОЙНОСТТА]"
-#: builtin/config.c:138
+#: builtin/config.c:143
msgid "add a new variable: name value"
msgstr "добавяне на нова променлива: ИМЕ СТОЙНОСТ"
-#: builtin/config.c:139
-msgid "remove a variable: name [value-regex]"
-msgstr "изтриване на променлива: ИМЕ [РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]"
+#: builtin/config.c:144
+msgid "remove a variable: name [value-pattern]"
+msgstr "изтриване на променлива: ИМЕ [ШАБЛОН_ЗА_СТОЙНОСТТА]"
-#: builtin/config.c:140
-msgid "remove all matches: name [value-regex]"
-msgstr "изтриване на всички съвпадащи: ИМЕ [РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]"
+#: builtin/config.c:145
+msgid "remove all matches: name [value-pattern]"
+msgstr "изтриване на всички съвпадащи: ИМЕ [ШАБЛОН_ЗА_СТОЙНОСТТА]"
-#: builtin/config.c:141
+#: builtin/config.c:146
msgid "rename section: old-name new-name"
msgstr "преименуване на раздел: СТАРО_ИМЕ НОВО_ИМЕ"
-#: builtin/config.c:142
+#: builtin/config.c:147
msgid "remove a section: name"
msgstr "изтриване на раздел: ИМЕ"
-#: builtin/config.c:143
+#: builtin/config.c:148
msgid "list all"
msgstr "изброяване на всички"
-#: builtin/config.c:144
+#: builtin/config.c:149
+msgid "use string equality when comparing values to 'value-pattern'"
+msgstr "дословно равенство при сравняване със ШАБЛОН_ЗА_СТОЙНОСТ"
+
+#: builtin/config.c:150
msgid "open an editor"
msgstr "отваряне на редактор"
-#: builtin/config.c:145
+#: builtin/config.c:151
msgid "find the color configured: slot [default]"
msgstr "извеждане на зададения цвят: номер [стандартно]"
-#: builtin/config.c:146
+#: builtin/config.c:152
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "извеждане на зададения цвят: номер (стандартният изход е терминал)"
-#: builtin/config.c:147
+#: builtin/config.c:153
msgid "Type"
msgstr "Вид"
-#: builtin/config.c:148 builtin/env--helper.c:38
+#: builtin/config.c:154 builtin/env--helper.c:43
msgid "value is given this type"
msgstr "стойността е от този вид"
-#: builtin/config.c:149
+#: builtin/config.c:155
msgid "value is \"true\" or \"false\""
-msgstr "СТОЙНОСТТА е „true“ (истина) или „false“ (лъжа)"
+msgstr "СТОЙНОСТТА е „true“ (истина) или „false“ (лъжа̀)"
-#: builtin/config.c:150
+#: builtin/config.c:156
msgid "value is decimal number"
msgstr "СТОЙНОСТТА е цяло, десетично число"
-#: builtin/config.c:151
+#: builtin/config.c:157
msgid "value is --bool or --int"
msgstr "СТОЙНОСТТА е „--bool“ (булева) или „--int“ (десетично цяло число)"
-#: builtin/config.c:152
+#: builtin/config.c:158
+msgid "value is --bool or string"
+msgstr "СТОЙНОСТТА е „--bool“ (булева) или низ"
+
+#: builtin/config.c:159
msgid "value is a path (file or directory name)"
msgstr "СТОЙНОСТТА е път (до файл или директория)"
-#: builtin/config.c:153
+#: builtin/config.c:160
msgid "value is an expiry date"
msgstr "стойността е период на валидност/запазване"
-#: builtin/config.c:154
+#: builtin/config.c:161
msgid "Other"
msgstr "Други"
-#: builtin/config.c:155
+#: builtin/config.c:162
msgid "terminate values with NUL byte"
msgstr "разделяне на стойностите с нулевия знак „NUL“"
-#: builtin/config.c:156
+#: builtin/config.c:163
msgid "show variable names only"
msgstr "извеждане на имената на променливите"
-#: builtin/config.c:157
+#: builtin/config.c:164
msgid "respect include directives on lookup"
msgstr "при търсене да се уважат и директивите за включване"
-#: builtin/config.c:158
+#: builtin/config.c:165
msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
"извеждане на мястото на задаване на настройката (файл, стандартен вход, "
"обект-BLOB, команден ред)"
-#: builtin/config.c:159
+#: builtin/config.c:166
msgid "show scope of config (worktree, local, global, system, command)"
msgstr ""
"извеждане на обхвата на настройката „worktree“ (работно дърво), "
"„local“ (хранилище), „global“ (потребител), „system“ (система), "
"„command“ (команда)"
-#: builtin/config.c:160 builtin/env--helper.c:40
+#: builtin/config.c:167 builtin/env--helper.c:45
msgid "value"
msgstr "СТОЙНОСТ"
-#: builtin/config.c:160
+#: builtin/config.c:167
msgid "with --get, use default value when missing entry"
msgstr "с „--get“ се използва стандартна СТОЙНОСТ при липсваща"
-#: builtin/config.c:174
+#: builtin/config.c:181
#, c-format
msgid "wrong number of arguments, should be %d"
msgstr "неправилен брой аргументи, трябва да е точно %d"
-#: builtin/config.c:176
+#: builtin/config.c:183
#, c-format
msgid "wrong number of arguments, should be from %d to %d"
msgstr "неправилен брой аргументи, трябва да е от %d до %d включително"
-#: builtin/config.c:324
+#: builtin/config.c:339
#, c-format
msgid "invalid key pattern: %s"
msgstr "неправилен шаблон за ключ: „%s“"
-#: builtin/config.c:360
+#: builtin/config.c:377
#, c-format
msgid "failed to format default config value: %s"
msgstr "неуспешно форматиране на стандартната стойност на настройка: %s"
-#: builtin/config.c:417
+#: builtin/config.c:441
#, c-format
msgid "cannot parse color '%s'"
msgstr "„%s“ не може да се анализира като цвят"
-#: builtin/config.c:459
+#: builtin/config.c:483
msgid "unable to parse default color value"
msgstr "неразпозната стойност на стандартния цвят"
-#: builtin/config.c:512 builtin/config.c:768
+#: builtin/config.c:536 builtin/config.c:833
msgid "not in a git directory"
msgstr "не е в директория под Git"
-#: builtin/config.c:515
+#: builtin/config.c:539
msgid "writing to stdin is not supported"
msgstr "не се поддържа записване в стандартния вход"
-#: builtin/config.c:518
+#: builtin/config.c:542
msgid "writing config blobs is not supported"
msgstr "обекти-BLOB в настройките не се поддържат"
-#: builtin/config.c:603
+#: builtin/config.c:627
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -13572,23 +14448,27 @@
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:627
+#: builtin/config.c:652
msgid "only one config file at a time"
msgstr "само по един конфигурационен файл"
-#: builtin/config.c:632
+#: builtin/config.c:658
msgid "--local can only be used inside a git repository"
msgstr "„--local“ може да се използва само в хранилище"
-#: builtin/config.c:635
+#: builtin/config.c:660
msgid "--blob can only be used inside a git repository"
msgstr "„--blob“ може да се използва само в хранилище"
-#: builtin/config.c:655
+#: builtin/config.c:662
+msgid "--worktree can only be used inside a git repository"
+msgstr "„--worktree“ може да се използва само в хранилище"
+
+#: builtin/config.c:684
msgid "$HOME not set"
msgstr "променливата „HOME“ не е зададена"
-#: builtin/config.c:679
+#: builtin/config.c:708
msgid ""
"--worktree cannot be used with multiple working trees unless the config\n"
"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -13599,20 +14479,20 @@
"повече информация вижте раздела „CONFIGURATION FILE“ в\n"
"„git help worktree“"
-#: builtin/config.c:714
+#: builtin/config.c:743
msgid "--get-color and variable type are incoherent"
msgstr "опцията „--get-color“ не съответства на вида на променливата"
-#: builtin/config.c:719
+#: builtin/config.c:748
msgid "only one action at a time"
msgstr "само по едно действие"
-#: builtin/config.c:732
+#: builtin/config.c:761
msgid "--name-only is only applicable to --list or --get-regexp"
msgstr ""
"опцията „--name-only“ е приложима само към опциите „--list“ и „--get-regexp“"
-#: builtin/config.c:738
+#: builtin/config.c:767
msgid ""
"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
"list"
@@ -13620,33 +14500,37 @@
"опцията „--show-origin“ е приложима само към опциите „--get“, „--get-all“, "
"„--get-regexp“ и „--list“"
-#: builtin/config.c:744
+#: builtin/config.c:773
msgid "--default is only applicable to --get"
msgstr "опцията „--default“ е приложима само към опцията „--get“"
-#: builtin/config.c:757
+#: builtin/config.c:806
+msgid "--fixed-value only applies with 'value-pattern'"
+msgstr "опцията „--fixed-value“ е приложима само със ШАБЛОН_ЗА_СТОЙНОСТ"
+
+#: builtin/config.c:822
#, c-format
msgid "unable to read config file '%s'"
msgstr "конфигурационният файл „%s“ не може да бъде прочетен"
-#: builtin/config.c:760
+#: builtin/config.c:825
msgid "error processing config file(s)"
msgstr "грешка при обработката на конфигурационен файл"
-#: builtin/config.c:770
+#: builtin/config.c:835
msgid "editing stdin is not supported"
msgstr "не се поддържа редактиране на стандартния вход"
-#: builtin/config.c:772
+#: builtin/config.c:837
msgid "editing blobs is not supported"
msgstr "не се поддържа редактиране на обекти-BLOB"
-#: builtin/config.c:786
+#: builtin/config.c:851
#, c-format
msgid "cannot create configuration file %s"
msgstr "конфигурационният файл „%s“ не може да бъде създаден"
-#: builtin/config.c:799
+#: builtin/config.c:864
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -13656,7 +14540,7 @@
"За да промените „%s“, ползвайте регулярен израз или опциите „--add“ и „--"
"replace-all“."
-#: builtin/config.c:873 builtin/config.c:884
+#: builtin/config.c:943 builtin/config.c:954
#, c-format
msgid "no such section: %s"
msgstr "такъв раззел няма: %s"
@@ -13669,6 +14553,43 @@
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 ""
+"Правата за достъп до директорията за програмните гнезда са прекалено "
+"свободни —\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/credential-store.c:66
+#, c-format
+msgid "unable to get credential storage lock in %d ms"
+msgstr ""
+"ключалката на хранилището на идентификациите не бе получена в рамките на %d "
+"ms"
+
#: builtin/describe.c:26
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [ОПЦИЯ…] [УКАЗАТЕЛ_КЪМ_ПОДАВАНЕ…]"
@@ -13677,49 +14598,44 @@
msgid "git describe [<options>] --dirty"
msgstr "git describe [ОПЦИЯ…] --dirty"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "head"
msgstr "основно"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "lightweight"
msgstr "кратко"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "annotated"
msgstr "анотирано"
-#: builtin/describe.c:275
+#: builtin/describe.c:277
#, c-format
msgid "annotated tag %s not available"
msgstr "не съществува анотиран етикет „%s“"
-#: builtin/describe.c:279
-#, c-format
-msgid "annotated tag %s has no embedded name"
-msgstr "в анотирания етикет „%s“ липсва вградено име"
-
#: builtin/describe.c:281
#, c-format
-msgid "tag '%s' is really '%s' here"
-msgstr "етикетът „%s“ тук е всъщност „%s“"
+msgid "tag '%s' is externally known as '%s'"
+msgstr "етикетът „%s“ е известен другаде като „%s“"
-#: builtin/describe.c:325
+#: builtin/describe.c:328
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "никой етикет не напасва точно „%s“"
-#: builtin/describe.c:327
+#: builtin/describe.c:330
#, c-format
msgid "No exact match on refs or tags, searching to describe\n"
msgstr "Никоя версия и етикет не напасват точно. Търси се по описание\n"
-#: builtin/describe.c:394
+#: builtin/describe.c:397
#, c-format
msgid "finished search at %s\n"
msgstr "търсенето приключи при „%s“\n"
-#: builtin/describe.c:421
+#: builtin/describe.c:424
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -13728,7 +14644,7 @@
"Никой анотиран етикет не описва „%s“.\n"
"Съществуват и неанотирани етикети. Пробвайте с опцията „--tags“."
-#: builtin/describe.c:425
+#: builtin/describe.c:428
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -13737,12 +14653,12 @@
"Никой етикет не описва „%s“.\n"
"Пробвайте с опцията „--always“ или създайте етикети."
-#: builtin/describe.c:455
+#: builtin/describe.c:458
#, c-format
msgid "traversed %lu commits\n"
msgstr "претърсени са %lu подавания\n"
-#: builtin/describe.c:458
+#: builtin/describe.c:461
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -13751,125 +14667,143 @@
"открити са над %i етикета, изведени са последните %i,\n"
"търсенето бе прекратено при „%s“.\n"
-#: builtin/describe.c:526
+#: builtin/describe.c:529
#, c-format
msgid "describe %s\n"
msgstr "описание на „%s“\n"
-#: builtin/describe.c:529
+#: builtin/describe.c:532
#, c-format
msgid "Not a valid object name %s"
msgstr "Неправилно име на обект „%s“"
-#: builtin/describe.c:537
+#: builtin/describe.c:540
#, c-format
msgid "%s is neither a commit nor blob"
msgstr "„%s“ не е нито подаване, нито обект-BLOB"
-#: builtin/describe.c:551
+#: builtin/describe.c:554
msgid "find the tag that comes after the commit"
msgstr "откриване на етикета, който следва подаване"
-#: builtin/describe.c:552
+#: builtin/describe.c:555
msgid "debug search strategy on stderr"
msgstr ""
"извеждане на информация за трасиране на стратегията за търсене на "
"стандартната грешка"
-#: builtin/describe.c:553
+#: builtin/describe.c:556
msgid "use any ref"
msgstr "използване на произволен указател"
-#: builtin/describe.c:554
+#: builtin/describe.c:557
msgid "use any tag, even unannotated"
msgstr "използване на всеки етикет — включително и неанотираните"
-#: builtin/describe.c:555
+#: builtin/describe.c:558
msgid "always use long format"
msgstr "винаги да се ползва дългият формат"
-#: builtin/describe.c:556
+#: builtin/describe.c:559
msgid "only follow first parent"
msgstr "проследяване само на първия родител"
-#: builtin/describe.c:559
+#: builtin/describe.c:562
msgid "only output exact matches"
msgstr "извеждане само на точните съвпадения"
-#: builtin/describe.c:561
+#: builtin/describe.c:564
msgid "consider <n> most recent tags (default: 10)"
msgstr "да се търси само в този БРОЙ последни етикети (стандартно: 10)"
-#: builtin/describe.c:563
+#: builtin/describe.c:566
msgid "only consider tags matching <pattern>"
msgstr "да се търси само измежду етикетите напасващи този ШАБЛОН"
-#: builtin/describe.c:565
+#: builtin/describe.c:568
msgid "do not consider tags matching <pattern>"
msgstr "да не се търси измежду етикетите напасващи този ШАБЛОН"
-#: builtin/describe.c:567 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:535
msgid "show abbreviated commit object as fallback"
msgstr "извеждане на съкратено име на обект като резервен вариант"
-#: builtin/describe.c:568 builtin/describe.c:571
+#: builtin/describe.c:571 builtin/describe.c:574
msgid "mark"
msgstr "МАРКЕР"
-#: builtin/describe.c:569
+#: builtin/describe.c:572
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "добавяне на такъв МАРКЕР на работното дърво (стандартно е „-dirty“)"
-#: builtin/describe.c:572
+#: builtin/describe.c:575
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr ""
"добавяне на такъв МАРКЕР на счупеното работно дърво (стандартно е „-broken“)"
-#: builtin/describe.c:590
+#: builtin/describe.c:593
msgid "--long is incompatible with --abbrev=0"
msgstr "Опциите „--long“ и „--abbrev=0“ са несъвместими"
-#: builtin/describe.c:619
+#: builtin/describe.c:622
msgid "No names found, cannot describe anything."
msgstr "Не са открити имена — нищо не може да бъде описано."
-#: builtin/describe.c:670
+#: builtin/describe.c:673
msgid "--dirty is incompatible with commit-ishes"
msgstr "опцията „--dirty“ е несъвместима с указател към подаване"
-#: builtin/describe.c:672
+#: builtin/describe.c:675
msgid "--broken is incompatible with commit-ishes"
msgstr "опцията „--broken“ е несъвместима с указател към подаване"
-#: builtin/diff.c:84
+#: builtin/diff-tree.c:155
+msgid "--stdin and --merge-base are mutually exclusive"
+msgstr "опциите „-stdin“ и „--merge-base“ са несъвместими"
+
+#: builtin/diff-tree.c:157
+msgid "--merge-base only works with two commits"
+msgstr "опцията „--merge-base“ изисква точно две подавания"
+
+#: builtin/diff.c:92
#, c-format
msgid "'%s': not a regular file or symlink"
msgstr "„%s“: не е нито обикновен файл, нито символна връзка"
-#: builtin/diff.c:235
+#: builtin/diff.c:259
#, c-format
msgid "invalid option: %s"
msgstr "неправилна опция: %s"
-#: builtin/diff.c:350
+#: builtin/diff.c:376
+#, c-format
+msgid "%s...%s: no merge base"
+msgstr "„%s..%s“: липсва база за сливане"
+
+#: builtin/diff.c:486
msgid "Not a git repository"
msgstr "Не е хранилище на Git"
-#: builtin/diff.c:394
+#: builtin/diff.c:532 builtin/grep.c:682
#, c-format
msgid "invalid object '%s' given."
msgstr "зададен е неправилен обект „%s“."
-#: builtin/diff.c:403
+#: builtin/diff.c:543
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "зададени са повече от 2 обекта-BLOB: „%s“"
-#: builtin/diff.c:408
+#: builtin/diff.c:548
#, c-format
msgid "unhandled object '%s' given."
msgstr "зададен е неподдържан обект „%s“."
+#: builtin/diff.c:582
+#, 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 [ОПЦИЯ…] [ПОДАВАНЕ [ПОДАВАНЕ]] [[--] ПЪТ…]"
@@ -13894,7 +14828,7 @@
msgid "could not read object %s for symlink %s"
msgstr "обектът „%s“ за символната връзка „%s“ не може да бъде прочетен"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:412
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
@@ -13902,55 +14836,55 @@
"комбинираните формати на разликите („-c“ и „--cc“) не се поддържат\n"
"в режима за разлики върху директории („-d“ и „--dir-diff“)."
-#: builtin/difftool.c:634
+#: builtin/difftool.c:633
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "и двата файла са променени: „%s“ и „%s“."
-#: builtin/difftool.c:636
+#: builtin/difftool.c:635
msgid "working tree file has been left."
msgstr "работното дърво е изоставено."
-#: builtin/difftool.c:647
+#: builtin/difftool.c:646
#, c-format
msgid "temporary files exist in '%s'."
msgstr "в „%s“ има временни файлове."
-#: builtin/difftool.c:648
+#: builtin/difftool.c:647
msgid "you may want to cleanup or recover these."
msgstr "възможно е да ги изчистите или възстановите"
-#: builtin/difftool.c:697
+#: builtin/difftool.c:696
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "използвайте „diff.guitool“ вместо „diff.tool“"
-#: builtin/difftool.c:699
+#: builtin/difftool.c:698
msgid "perform a full-directory diff"
msgstr "разлика по директории"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:700
msgid "do not prompt before launching a diff tool"
msgstr "стартиране на ПРОГРАМАта за разлики без предупреждение"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:705
msgid "use symlinks in dir-diff mode"
msgstr "следване на символните връзки при разлика по директории"
-#: builtin/difftool.c:707
+#: builtin/difftool.c:706
msgid "tool"
msgstr "ПРОГРАМА"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:707
msgid "use the specified diff tool"
msgstr "използване на указаната ПРОГРАМА"
-#: builtin/difftool.c:710
+#: builtin/difftool.c:709
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
"извеждане на списък с всички ПРОГРАМи, които може да се ползват с опцията „--"
"tool“"
-#: builtin/difftool.c:713
+#: builtin/difftool.c:712
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
@@ -13958,31 +14892,31 @@
"„git-difftool“ да спре работа, когато стартираната ПРОГРАМА завърши с "
"ненулев код"
-#: builtin/difftool.c:716
+#: builtin/difftool.c:715
msgid "specify a custom command for viewing diffs"
msgstr "команда за разглеждане на разлики"
-#: builtin/difftool.c:717
+#: builtin/difftool.c:716
msgid "passed to `diff`"
msgstr "подава се към „diff“"
-#: builtin/difftool.c:732
+#: builtin/difftool.c:731
msgid "difftool requires worktree or --no-index"
msgstr "„git-difftool“ изисква работно дърво или опцията „--no-index“"
-#: builtin/difftool.c:739
+#: builtin/difftool.c:738
msgid "--dir-diff is incompatible with --no-index"
msgstr "опциите „--dir-diff“ и „--no-index“ са несъвместими"
-#: builtin/difftool.c:742
+#: builtin/difftool.c:741
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr "опциите „--gui“, „--tool“ и „--extcmd“ са несъвместими една с друга"
-#: builtin/difftool.c:750
+#: builtin/difftool.c:749
msgid "no <tool> given for --tool=<tool>"
msgstr "не е зададена програма за „--tool=ПРОГРАМА“"
-#: builtin/difftool.c:757
+#: builtin/difftool.c:756
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "не е зададена команда за „--extcmd=КОМАНДА“"
@@ -13990,26 +14924,26 @@
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 `"
@@ -14022,185 +14956,244 @@
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [ОПЦИИ_ЗА_СПИСЪКА_С_ВЕРСИИ]"
-#: builtin/fast-export.c:853
+#: builtin/fast-export.c:868
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr ""
"Грешка: непреките етикети не се изнасят, освен ако не зададете „--mark-tags“."
-#: builtin/fast-export.c:1152
+#: builtin/fast-export.c:1177
+msgid "--anonymize-map token cannot be empty"
+msgstr "опцията „--anonymize-map“ изисква аргумент"
+
+#: builtin/fast-export.c:1197
msgid "show progress after <n> objects"
msgstr "Съобщение за напредъка на всеки такъв БРОЙ обекта"
-#: builtin/fast-export.c:1154
+#: builtin/fast-export.c:1199
msgid "select handling of signed tags"
msgstr "Как да се обработват подписаните етикети"
-#: builtin/fast-export.c:1157
+#: builtin/fast-export.c:1202
msgid "select handling of tags that tag filtered objects"
msgstr "Как да се обработват етикетите на филтрираните обекти"
-#: builtin/fast-export.c:1160
+#: builtin/fast-export.c:1205
msgid "select handling of commit messages in an alternate encoding"
msgstr ""
"как да се обработват съобщенията за подаване, които са в друго кодиране"
-#: builtin/fast-export.c:1163
-msgid "Dump marks to this file"
-msgstr "Запазване на маркерите в този ФАЙЛ"
+#: builtin/fast-export.c:1208
+msgid "dump marks to this file"
+msgstr "запазване на маркерите в този ФАЙЛ"
-#: builtin/fast-export.c:1165
-msgid "Import marks from this file"
-msgstr "Внасяне на маркерите от този ФАЙЛ"
+#: builtin/fast-export.c:1210
+msgid "import marks from this file"
+msgstr "внасяне на маркерите от този ФАЙЛ"
-#: builtin/fast-export.c:1169
-msgid "Import marks from this file if it exists"
-msgstr "Внасяне на маркерите от този ФАЙЛ, ако съществува"
+#: builtin/fast-export.c:1214
+msgid "import marks from this file if it exists"
+msgstr "внасяне на маркерите от този ФАЙЛ, ако съществува"
-#: builtin/fast-export.c:1171
-msgid "Fake a tagger when tags lack one"
-msgstr "Да се използва изкуствено име на човек при липса на задаващ етикета"
+#: builtin/fast-export.c:1216
+msgid "fake a tagger when tags lack one"
+msgstr "да се използва изкуствено име на човек при липса на създател на етикета"
-#: builtin/fast-export.c:1173
-msgid "Output full tree for each commit"
-msgstr "Извеждане на цялото дърво за всяко подаване"
+#: builtin/fast-export.c:1218
+msgid "output full tree for each commit"
+msgstr "извеждане на цялото дърво за всяко подаване"
-#: builtin/fast-export.c:1175
-msgid "Use the done feature to terminate the stream"
-msgstr "Използване на маркер за завършване на потока"
+#: builtin/fast-export.c:1220
+msgid "use the done feature to terminate the stream"
+msgstr "използване на маркер за завършване на потока"
-#: builtin/fast-export.c:1176
-msgid "Skip output of blob data"
-msgstr "Без извеждане на съдържанието на обектите-BLOB"
+#: builtin/fast-export.c:1221
+msgid "skip output of blob data"
+msgstr "без извеждане на съдържанието на обектите-BLOB"
-#: builtin/fast-export.c:1177 builtin/log.c:1705
+#: builtin/fast-export.c:1222 builtin/log.c:1815
msgid "refspec"
msgstr "УКАЗАТЕЛ_НА_ВЕРСИЯ"
-#: builtin/fast-export.c:1178
-msgid "Apply refspec to exported refs"
-msgstr "Прилагане на УКАЗАТЕЛя_НА_ВЕРСИЯ към изнесените указатели"
+#: builtin/fast-export.c:1223
+msgid "apply refspec to exported refs"
+msgstr "прилагане на УКАЗАТЕЛя_НА_ВЕРСИЯ към изнесените указатели"
-#: builtin/fast-export.c:1179
+#: builtin/fast-export.c:1224
msgid "anonymize output"
msgstr "анонимизиране на извежданата информация"
-#: builtin/fast-export.c:1181
-msgid "Reference parents which are not in fast-export stream by object id"
+#: builtin/fast-export.c:1225
+msgid "from:to"
+msgstr "ОТ:КЪМ"
+
+#: builtin/fast-export.c:1226
+msgid "convert <from> to <to> in anonymized output"
+msgstr "заместване ОТ със КЪМ в анонимизирания изход"
+
+#: builtin/fast-export.c:1229
+msgid "reference parents which are not in fast-export stream by object id"
msgstr ""
-"Указване на родителите, които не са в потока на бързо изнасяне, с "
+"указване на родителите, които не са в потока на бързо изнасяне, с "
"идентификатор на обект"
-#: builtin/fast-export.c:1183
-msgid "Show original object ids of blobs/commits"
-msgstr "Извеждане на първоначалните идентификатори на обектите BLOB/подавяния"
+#: builtin/fast-export.c:1231
+msgid "show original object ids of blobs/commits"
+msgstr "извеждане на първоначалните идентификатори на обектите BLOB/подавяния"
-#: builtin/fast-export.c:1185
-msgid "Label tags with mark ids"
-msgstr "Задаване на идентификатори на маркери на етикетите"
+#: builtin/fast-export.c:1233
+msgid "label tags with mark ids"
+msgstr "задаване на идентификатори на маркери на етикетите"
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1256
+msgid "--anonymize-map without --anonymize does not make sense"
+msgstr "опцията „--anonymize-map“ изисква „--anonymize“"
+
+#: builtin/fast-export.c:1271
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
msgstr "опциите „--import-marks“ и „--import-marks-if-exists“ са несъвместими"
-#: builtin/fetch.c:34
+#: builtin/fast-import.c:3088
+#, c-format
+msgid "Missing from marks for submodule '%s'"
+msgstr "Липсват маркери „от“ за подмодула „%s“"
+
+#: builtin/fast-import.c:3090
+#, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr "Липсват маркери „до“ за подмодула „%s“"
+
+#: builtin/fast-import.c:3225
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr "Очаква се команда „mark“, а бе получена: „%s“"
+
+#: builtin/fast-import.c:3230
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr "Очаква се команда „to“, а бе получена: „%s“"
+
+#: builtin/fast-import.c:3322
+msgid "Expected format name:filename for submodule rewrite option"
+msgstr "Опцията за презапис на подмодул изисква формат: име:име_на_файл"
+
+#: builtin/fast-import.c:3377
+#, c-format
+msgid "feature '%s' forbidden in input without --allow-unsafe-features"
+msgstr "„%s“ изисква изричното задаване на опцията „--allow-unsafe-features“"
+
+#: builtin/fetch-pack.c:242
+#, 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:35
+#: builtin/fetch.c:36
msgid "git fetch [<options>] <group>"
msgstr "git fetch [ОПЦИЯ…] ГРУПА"
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [ОПЦИЯ…] [(ХРАНИЛИЩЕ | ГРУПА)…]"
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [ОПЦИЯ…]"
-#: builtin/fetch.c:116
+#: builtin/fetch.c:120
msgid "fetch.parallel cannot be negative"
msgstr "опцията „fetch.parallel“ трябва да е неотрицателна"
-#: builtin/fetch.c:139 builtin/pull.c:184
+#: builtin/fetch.c:143 builtin/pull.c:185
msgid "fetch from all remotes"
msgstr "доставяне от всички отдалечени хранилища"
-#: builtin/fetch.c:141 builtin/pull.c:228
+#: builtin/fetch.c:145 builtin/pull.c:245
msgid "set upstream for git pull/fetch"
msgstr "задаване на клон за следене за издърпване/доставяне"
-#: builtin/fetch.c:143 builtin/pull.c:187
+#: builtin/fetch.c:147 builtin/pull.c:188
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "добавяне към „.git/FETCH_HEAD“ вместо замяна"
-#: builtin/fetch.c:145 builtin/pull.c:190
+#: builtin/fetch.c:149
+msgid "use atomic transaction to update references"
+msgstr "изискване на атомарни операции за обновяване на указателите"
+
+#: builtin/fetch.c:151 builtin/pull.c:191
msgid "path to upload pack on remote end"
msgstr "отдалечен път, където да се качи пакетът"
-#: builtin/fetch.c:146
+#: builtin/fetch.c:152
msgid "force overwrite of local reference"
msgstr "принудително презаписване на локален указател"
-#: builtin/fetch.c:148
+#: builtin/fetch.c:154
msgid "fetch from multiple remotes"
msgstr "доставяне от множество отдалечени хранилища"
-#: builtin/fetch.c:150 builtin/pull.c:194
+#: builtin/fetch.c:156 builtin/pull.c:195
msgid "fetch all tags and associated objects"
msgstr "доставяне на всички етикети и принадлежащи обекти"
-#: builtin/fetch.c:152
+#: builtin/fetch.c:158
msgid "do not fetch all tags (--no-tags)"
msgstr "без доставянето на всички етикети „--no-tags“"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:160
msgid "number of submodules fetched in parallel"
msgstr "брой подмодули доставени паралелно"
-#: builtin/fetch.c:156 builtin/pull.c:197
+#: builtin/fetch.c:162 builtin/pull.c:198
msgid "prune remote-tracking branches no longer on remote"
msgstr "окастряне на клоните следящи вече несъществуващи отдалечени клони"
-#: builtin/fetch.c:158
+#: builtin/fetch.c:164
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
"окастряне на локалните етикети, които вече не съществуват в отдалеченото "
"хранилище и презаписване на променените"
-#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121
+#: builtin/fetch.c:165 builtin/fetch.c:190 builtin/pull.c:122
msgid "on-demand"
msgstr "ПРИ НУЖДА"
-#: builtin/fetch.c:160
+#: builtin/fetch.c:166
msgid "control recursive fetching of submodules"
msgstr "управление на рекурсивното доставяне на подмодулите"
-#: builtin/fetch.c:164 builtin/pull.c:205
+#: builtin/fetch.c:171
+msgid "write fetched references to the FETCH_HEAD file"
+msgstr "запазване на доставените указатели във файла „FETCH_HEAD“"
+
+#: builtin/fetch.c:172 builtin/pull.c:206
msgid "keep downloaded pack"
msgstr "запазване на изтеглените пакети с обекти"
-#: builtin/fetch.c:166
+#: builtin/fetch.c:174
msgid "allow updating of HEAD ref"
msgstr "позволяване на обновяването на указателя „HEAD“"
-#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208
+#: builtin/fetch.c:177 builtin/fetch.c:183 builtin/pull.c:209
+#: builtin/pull.c:218
msgid "deepen history of shallow clone"
msgstr "задълбочаване на историята на плитко хранилище"
-#: builtin/fetch.c:171
+#: builtin/fetch.c:179 builtin/pull.c:212
msgid "deepen history of shallow repository based on time"
msgstr "задълбочаване на историята на плитко хранилище до определено време"
-#: builtin/fetch.c:177 builtin/pull.c:211
+#: builtin/fetch.c:185 builtin/pull.c:221
msgid "convert to a complete repository"
msgstr "превръщане в пълно хранилище"
-#: builtin/fetch.c:180
+#: builtin/fetch.c:188
msgid "prepend this to submodule path output"
msgstr "добавяне на това пред пътя на подмодула"
-#: builtin/fetch.c:183
+#: builtin/fetch.c:191
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
@@ -14208,94 +15201,98 @@
"стандартно рекурсивно изтегляне на подмодулите (файловете с настройки са с "
"приоритет)"
-#: builtin/fetch.c:187 builtin/pull.c:214
+#: builtin/fetch.c:195 builtin/pull.c:224
msgid "accept refs that update .git/shallow"
msgstr "приемане на указатели, които обновяват „.git/shallow“"
-#: builtin/fetch.c:188 builtin/pull.c:216
+#: builtin/fetch.c:196 builtin/pull.c:226
msgid "refmap"
msgstr "КАРТА_С_УКАЗАТЕЛИ"
-#: builtin/fetch.c:189 builtin/pull.c:217
+#: builtin/fetch.c:197 builtin/pull.c:227
msgid "specify fetch refmap"
msgstr "указване на КАРТАта_С_УКАЗАТЕЛИ за доставяне"
-#: builtin/fetch.c:196
+#: builtin/fetch.c:204 builtin/pull.c:240
msgid "report that we have only objects reachable from this object"
msgstr "докладване, че всички обекти могат са достижими при започване от този"
-#: builtin/fetch.c:199
-msgid "run 'gc --auto' after fetching"
-msgstr "изпълняване на „gc --auto“ след доставяне"
+#: builtin/fetch.c:207 builtin/fetch.c:209
+msgid "run 'maintenance --auto' after fetching"
+msgstr "изпълняване на „maintenance --auto“ след доставяне"
-#: builtin/fetch.c:201 builtin/pull.c:226
+#: builtin/fetch.c:211 builtin/pull.c:243
msgid "check for forced-updates on all updated branches"
msgstr "проверка за принудителни обновявания на всички клони"
-#: builtin/fetch.c:203
+#: builtin/fetch.c:213
msgid "write the commit-graph after fetching"
msgstr "запазване на гра̀фа с подаванията след доставяне"
-#: builtin/fetch.c:513
+#: builtin/fetch.c:215
+msgid "accept refspecs from stdin"
+msgstr "четене на указателите от стандартния вход"
+
+#: builtin/fetch.c:526
msgid "Couldn't find remote ref HEAD"
msgstr "Указателят „HEAD“ в отдалеченото хранилище не може да бъде открит"
-#: builtin/fetch.c:653
+#: builtin/fetch.c:697
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "настройката „fetch.output“ е с неправилна стойност „%s“"
-#: builtin/fetch.c:751
+#: builtin/fetch.c:796
#, c-format
msgid "object %s not found"
msgstr "обектът „%s“ липсва"
-#: builtin/fetch.c:755
+#: builtin/fetch.c:800
msgid "[up to date]"
-msgstr "[актуализиран]"
+msgstr "[актуален]"
-#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
+#: builtin/fetch.c:813 builtin/fetch.c:829 builtin/fetch.c:901
msgid "[rejected]"
msgstr "[отхвърлен]"
-#: builtin/fetch.c:769
+#: builtin/fetch.c:814
msgid "can't fetch in current branch"
msgstr "в текущия клон не може да се доставя"
-#: builtin/fetch.c:779
+#: builtin/fetch.c:824
msgid "[tag update]"
msgstr "[обновяване на етикетите]"
-#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839
-#: builtin/fetch.c:851
+#: builtin/fetch.c:825 builtin/fetch.c:862 builtin/fetch.c:884
+#: builtin/fetch.c:896
msgid "unable to update local ref"
msgstr "локален указател не може да бъде обновен"
-#: builtin/fetch.c:784
+#: builtin/fetch.c:829
msgid "would clobber existing tag"
msgstr "съществуващ етикет ще бъде презаписан"
-#: builtin/fetch.c:806
+#: builtin/fetch.c:851
msgid "[new tag]"
msgstr "[нов етикет]"
-#: builtin/fetch.c:809
+#: builtin/fetch.c:854
msgid "[new branch]"
msgstr "[нов клон]"
-#: builtin/fetch.c:812
+#: builtin/fetch.c:857
msgid "[new ref]"
msgstr "[нов указател]"
-#: builtin/fetch.c:851
+#: builtin/fetch.c:896
msgid "forced update"
msgstr "принудително обновяване"
-#: builtin/fetch.c:856
+#: builtin/fetch.c:901
msgid "non-fast-forward"
msgstr "същинско сливане"
-#: builtin/fetch.c:877
+#: builtin/fetch.c:1005
msgid ""
"Fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
@@ -14306,7 +15303,7 @@
"\n"
" git config fetch.showForcedUpdates true"
-#: builtin/fetch.c:881
+#: builtin/fetch.c:1009
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
@@ -14320,24 +15317,24 @@
"\n"
" git config fetch.showForcedUpdates false\n"
-#: builtin/fetch.c:920
+#: builtin/fetch.c:1041
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "хранилището „%s“ не изпрати всички необходими обекти\n"
-#: builtin/fetch.c:941
+#: builtin/fetch.c:1069
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
"отхвърляне на върха „%s“, защото плитките хранилища не могат да бъдат "
"обновявани"
-#: builtin/fetch.c:1026 builtin/fetch.c:1164
+#: builtin/fetch.c:1146 builtin/fetch.c:1297
#, c-format
msgid "From %.*s\n"
msgstr "От %.*s\n"
-#: builtin/fetch.c:1037
+#: builtin/fetch.c:1168
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -14347,57 +15344,57 @@
"„git remote prune %s“, за да премахнете остарелите клони, които\n"
"предизвикват конфликта"
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1267
#, c-format
msgid " (%s will become dangling)"
msgstr " (обектът „%s“ ще се окаже извън клон)"
-#: builtin/fetch.c:1135
+#: builtin/fetch.c:1268
#, c-format
msgid " (%s has become dangling)"
msgstr " (обектът „%s“ вече е извън клон)"
-#: builtin/fetch.c:1167
+#: builtin/fetch.c:1300
msgid "[deleted]"
msgstr "[изтрит]"
-#: builtin/fetch.c:1168 builtin/remote.c:1112
+#: builtin/fetch.c:1301 builtin/remote.c:1118
msgid "(none)"
msgstr "(нищо)"
-#: builtin/fetch.c:1191
+#: builtin/fetch.c:1324
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Не може да доставите в текущия клон „%s“ на хранилище, което не е голо"
-#: builtin/fetch.c:1210
+#: builtin/fetch.c:1343
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Стойността „%2$s“ за опцията „%1$s“ не е съвместима с „%3$s“"
-#: builtin/fetch.c:1213
+#: builtin/fetch.c:1346
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Опцията „%s“ се прескача при „%s“\n"
-#: builtin/fetch.c:1421
+#: builtin/fetch.c:1558
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr ""
"засечени са множество клони, това е несъвместимо с опцията „--set-upstream“"
-#: builtin/fetch.c:1436
+#: builtin/fetch.c:1573
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "не може да указвате клон за следене на отдалечен етикет"
-#: builtin/fetch.c:1438
+#: builtin/fetch.c:1575
msgid "not setting upstream for a remote tag"
msgstr "не може да указвате клон за следене на отдалечен етикет"
-#: builtin/fetch.c:1440
+#: builtin/fetch.c:1577
msgid "unknown branch type"
msgstr "непознат вид клон"
-#: builtin/fetch.c:1442
+#: builtin/fetch.c:1579
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
@@ -14405,22 +15402,22 @@
"не е открит клон за следене.\n"
"Трябва изрично да зададете един клон с опцията „--set-upstream option“."
-#: builtin/fetch.c:1568 builtin/fetch.c:1631
+#: builtin/fetch.c:1708 builtin/fetch.c:1771
#, c-format
msgid "Fetching %s\n"
msgstr "Доставяне на „%s“\n"
-#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101
+#: builtin/fetch.c:1718 builtin/fetch.c:1773 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr "„%s“ не може да се достави"
-#: builtin/fetch.c:1590
+#: builtin/fetch.c:1730
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "„%s“ не може да се достави (изходният код е: %d)\n"
-#: builtin/fetch.c:1693
+#: builtin/fetch.c:1834
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -14428,45 +15425,45 @@
"Не сте указали отдалечено хранилище. Задайте или адрес, или име\n"
"на отдалечено хранилище, откъдето да се доставят новите версии."
-#: builtin/fetch.c:1730
+#: builtin/fetch.c:1870
msgid "You need to specify a tag name."
msgstr "Трябва да укажете име на етикет."
-#: builtin/fetch.c:1780
+#: builtin/fetch.c:1935
msgid "Negative depth in --deepen is not supported"
msgstr "Отрицателна дълбочина като аргумент на „--deepen“ не се поддържа"
-#: builtin/fetch.c:1782
+#: builtin/fetch.c:1937
msgid "--deepen and --depth are mutually exclusive"
msgstr "опциите „--deepen“ и „--depth“ са несъвместими"
-#: builtin/fetch.c:1787
+#: builtin/fetch.c:1942
msgid "--depth and --unshallow cannot be used together"
msgstr "опциите „--depth“ и „--unshallow“ са несъвместими"
-#: builtin/fetch.c:1789
+#: builtin/fetch.c:1944
msgid "--unshallow on a complete repository does not make sense"
msgstr "не можете да използвате опцията „--unshallow“ върху пълно хранилище"
-#: builtin/fetch.c:1805
+#: builtin/fetch.c:1961
msgid "fetch --all does not take a repository argument"
msgstr "към „git fetch --all“ не можете да добавите аргумент — хранилище"
-#: builtin/fetch.c:1807
+#: builtin/fetch.c:1963
msgid "fetch --all does not make sense with refspecs"
msgstr ""
"към „git fetch --all“ не можете да добавите аргумент — указател на версия"
-#: builtin/fetch.c:1816
+#: builtin/fetch.c:1972
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Няма нито отдалечено хранилище, нито група от хранилища на име „%s“"
-#: builtin/fetch.c:1823
+#: builtin/fetch.c:1979
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Указването на група и указването на версия са несъвместими"
-#: builtin/fetch.c:1841
+#: builtin/fetch.c:1997
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
@@ -14474,31 +15471,40 @@
"опцията „--filter“ може да се ползва само с отдалеченото хранилище указано в "
"настройката „extensions.partialClone“"
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fetch.c:2001
+msgid "--atomic can only be used when fetching from one remote"
+msgstr ""
+"опцията „--atomic“ поддържа доставяне само от едно отдалечено хранилище"
+
+#: builtin/fetch.c:2005
+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:671
+#: builtin/fmt-merge-msg.c:18
msgid "populate log with at most <n> entries from shortlog"
msgstr ""
"вмъкване на журнал състоящ се от не повече от БРОЙ записа от съкратения "
"журнал"
-#: builtin/fmt-merge-msg.c:674
+#: builtin/fmt-merge-msg.c:21
msgid "alias for --log (deprecated)"
msgstr "псевдоним на „--log“ (ОСТАРЯЛО)"
-#: builtin/fmt-merge-msg.c:677
+#: builtin/fmt-merge-msg.c:24
msgid "text"
msgstr "ТЕКСТ"
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:25
msgid "use <text> as start of message"
msgstr "за начало на съобщението да се ползва ТЕКСТ"
-#: builtin/fmt-merge-msg.c:679
+#: builtin/fmt-merge-msg.c:26
msgid "file to read from"
msgstr "файл, от който да се чете"
@@ -14511,8 +15517,8 @@
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>]]"
@@ -14538,7 +15544,7 @@
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:472
msgid "respect format colors"
msgstr "спазване на цветовете на форма̀та"
@@ -14562,32 +15568,48 @@
msgid "print only refs which don't contain the commit"
msgstr "извеждане само на указателите, които не съдържат това ПОДАВАНЕ"
-#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148
+#: builtin/for-each-repo.c:9
+msgid "git for-each-repo --config=<config> <command-args>"
+msgstr "git for-each-repo --config=НАСТРОЙКА АРГУМЕНТ…"
+
+#: builtin/for-each-repo.c:37
+msgid "config"
+msgstr "настройка"
+
+#: builtin/for-each-repo.c:38
+msgid "config key storing a list of repository paths"
+msgstr "настройка, която съдържа списък с пътища към хранилища"
+
+#: builtin/for-each-repo.c:46
+msgid "missing --config=<config>"
+msgstr "липсва --config=НАСТРОЙКА"
+
+#: builtin/fsck.c:69 builtin/fsck.c:130 builtin/fsck.c:131
msgid "unknown"
msgstr "непознат"
#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:100 builtin/fsck.c:120
+#: builtin/fsck.c:83 builtin/fsck.c:103
#, c-format
msgid "error in %s %s: %s"
msgstr "грешка в %s „%s“: %s"
#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:114
+#: builtin/fsck.c:97
#, c-format
msgid "warning in %s %s: %s"
msgstr "предупреждение за %s „%s“: %s"
-#: builtin/fsck.c:143 builtin/fsck.c:146
+#: builtin/fsck.c:126 builtin/fsck.c:129
#, c-format
msgid "broken link from %7s %s"
msgstr "скъсана връзка от %7s %s"
-#: builtin/fsck.c:155
+#: builtin/fsck.c:138
msgid "wrong object type in link"
msgstr "неправилен вид обект във връзката"
-#: builtin/fsck.c:171
+#: builtin/fsck.c:154
#, c-format
msgid ""
"broken link from %7s %s\n"
@@ -14596,241 +15618,241 @@
"скъсана връзка от %7s %s\n"
" към %7s %s"
-#: builtin/fsck.c:282
+#: builtin/fsck.c:265
#, c-format
msgid "missing %s %s"
msgstr "липсващ обект: %s „%s“"
-#: builtin/fsck.c:309
+#: builtin/fsck.c:292
#, c-format
msgid "unreachable %s %s"
msgstr "недостижим обект: %s „%s“"
-#: builtin/fsck.c:329
+#: builtin/fsck.c:312
#, c-format
msgid "dangling %s %s"
msgstr "извън клон: %s „%s“"
-#: builtin/fsck.c:339
+#: builtin/fsck.c:322
msgid "could not create lost-found"
msgstr "„lost-found“ не може да се създаде"
-#: builtin/fsck.c:350
+#: builtin/fsck.c:333
#, c-format
msgid "could not finish '%s'"
msgstr "„%s“ не може да се завърши"
-#: builtin/fsck.c:367
+#: builtin/fsck.c:350
#, c-format
msgid "Checking %s"
msgstr "Проверка на „%s“"
-#: builtin/fsck.c:405
+#: builtin/fsck.c:388
#, c-format
msgid "Checking connectivity (%d objects)"
msgstr "Проверка на свързаността (%d обекта)"
-#: builtin/fsck.c:424
+#: builtin/fsck.c:407
#, c-format
msgid "Checking %s %s"
msgstr "Проверяване на %s „%s“"
-#: builtin/fsck.c:429
+#: builtin/fsck.c:412
msgid "broken links"
msgstr "скъсани връзки"
-#: builtin/fsck.c:438
+#: builtin/fsck.c:421
#, c-format
msgid "root %s"
msgstr "начална директория „%s“"
-#: builtin/fsck.c:446
+#: builtin/fsck.c:429
#, c-format
msgid "tagged %s %s (%s) in %s"
msgstr "приложен етикет „%s“ върху „%s“ (%s) в „%s“"
-#: builtin/fsck.c:475
+#: builtin/fsck.c:458
#, c-format
msgid "%s: object corrupt or missing"
msgstr "%s: липсващ или повреден обект"
-#: builtin/fsck.c:500
+#: builtin/fsck.c:483
#, c-format
msgid "%s: invalid reflog entry %s"
msgstr "%s: неправилен запис в журнала за указатели „%s“"
-#: builtin/fsck.c:514
+#: builtin/fsck.c:497
#, c-format
msgid "Checking reflog %s->%s"
msgstr "Проверка на журнала на указателите: „%s“ до „%s“"
-#: builtin/fsck.c:548
+#: builtin/fsck.c:531
#, c-format
msgid "%s: invalid sha1 pointer %s"
msgstr "„%s“: неправилен указател за SHA1: „%s“"
-#: builtin/fsck.c:555
+#: builtin/fsck.c:538
#, c-format
msgid "%s: not a commit"
msgstr "%s: не е подаване!"
-#: builtin/fsck.c:609
+#: builtin/fsck.c:592
msgid "notice: No default references"
msgstr "внимание: няма указатели по подразбиране"
-#: builtin/fsck.c:624
+#: builtin/fsck.c:607
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "„%s“: липсващ обект: „%s“"
-#: builtin/fsck.c:637
+#: builtin/fsck.c:620
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "„%s“: не може да се анализира: „%s“"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:640
#, c-format
msgid "bad sha1 file: %s"
msgstr "неправилен ред с контролна сума по SHA1: „%s“"
-#: builtin/fsck.c:672
+#: builtin/fsck.c:655
msgid "Checking object directory"
msgstr "Проверка на директория с обекти"
-#: builtin/fsck.c:675
+#: builtin/fsck.c:658
msgid "Checking object directories"
msgstr "Проверка на директориите с обекти"
-#: builtin/fsck.c:690
+#: builtin/fsck.c:673
#, c-format
msgid "Checking %s link"
msgstr "Проверка на връзките на „%s“"
#
-#: builtin/fsck.c:695 builtin/index-pack.c:843
+#: builtin/fsck.c:678 builtin/index-pack.c:865
#, c-format
msgid "invalid %s"
msgstr "неправилен указател „%s“"
-#: builtin/fsck.c:702
+#: builtin/fsck.c:685
#, c-format
msgid "%s points to something strange (%s)"
msgstr "„%s“ сочи към нещо необичайно (%s)"
-#: builtin/fsck.c:708
+#: builtin/fsck.c:691
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s: несвързаният връх „HEAD“ не сочи към нищо"
-#: builtin/fsck.c:712
+#: builtin/fsck.c:695
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "предупреждение: „%s“ сочи към все още несъществуващ клон (%s)"
-#: builtin/fsck.c:724
+#: builtin/fsck.c:707
msgid "Checking cache tree"
msgstr "Проверка на дървото на кеша"
-#: builtin/fsck.c:729
+#: builtin/fsck.c:712
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "„%s“: неправилен указател за SHA1 в дървото на кеша"
-#: builtin/fsck.c:738
+#: builtin/fsck.c:721
msgid "non-tree in cache-tree"
msgstr "в дървото на кеша има нещо, което не е дърво"
-#: builtin/fsck.c:769
+#: builtin/fsck.c:752
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [ОПЦИЯ…] [ОБЕКТ…]"
-#: builtin/fsck.c:775
+#: builtin/fsck.c:758
msgid "show unreachable objects"
msgstr "показване на недостижимите обекти"
-#: builtin/fsck.c:776
+#: builtin/fsck.c:759
msgid "show dangling objects"
msgstr "показване на обектите извън клоните"
-#: builtin/fsck.c:777
+#: builtin/fsck.c:760
msgid "report tags"
msgstr "показване на етикетите"
-#: builtin/fsck.c:778
+#: builtin/fsck.c:761
msgid "report root nodes"
msgstr "показване на кореновите възли"
-#: builtin/fsck.c:779
+#: builtin/fsck.c:762
msgid "make index objects head nodes"
msgstr "задаване на обекти от индекса да са коренови"
-#: builtin/fsck.c:780
+#: builtin/fsck.c:763
msgid "make reflogs head nodes (default)"
msgstr "проследяване и на указателите от журнала с указателите (стандартно)"
-#: builtin/fsck.c:781
+#: builtin/fsck.c:764
msgid "also consider packs and alternate objects"
msgstr "допълнително да се проверяват пакетите и алтернативните обекти"
-#: builtin/fsck.c:782
+#: builtin/fsck.c:765
msgid "check only connectivity"
msgstr "проверка само на връзката"
-#: builtin/fsck.c:783
+#: builtin/fsck.c:766 builtin/mktag.c:78
msgid "enable more strict checking"
msgstr "по-строги проверки"
-#: builtin/fsck.c:785
+#: builtin/fsck.c:768
msgid "write dangling objects in .git/lost-found"
msgstr "запазване на обектите извън клоните в директорията „.git/lost-found“"
-#: builtin/fsck.c:786 builtin/prune.c:132
+#: builtin/fsck.c:769 builtin/prune.c:134
msgid "show progress"
msgstr "показване на напредъка"
-#: builtin/fsck.c:787
+#: builtin/fsck.c:770
msgid "show verbose names for reachable objects"
msgstr "показване на подробни имена на достижимите обекти"
-#: builtin/fsck.c:846 builtin/index-pack.c:225
+#: builtin/fsck.c:829 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "Проверка на обектите"
-#: builtin/fsck.c:874
+#: builtin/fsck.c:857
#, c-format
msgid "%s: object missing"
msgstr "„%s“: липсващ обект"
-#: builtin/fsck.c:885
+#: builtin/fsck.c:868
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "неправилен параметър: очаква се SHA1, а бе получено: „%s“"
-#: builtin/gc.c:35
+#: builtin/gc.c:39
msgid "git gc [<options>]"
msgstr "git gc [ОПЦИЯ…]"
-#: builtin/gc.c:90
+#: builtin/gc.c:93
#, c-format
msgid "Failed to fstat %s: %s"
msgstr "Неуспешно изпълнение на „fstat“ върху „%s“: %s"
-#: builtin/gc.c:126
+#: builtin/gc.c:129
#, c-format
msgid "failed to parse '%s' value '%s'"
msgstr "стойността на „%s“ — „%s“ не може да се анализира"
-#: builtin/gc.c:475 builtin/init-db.c:55
+#: builtin/gc.c:487 builtin/init-db.c:58
#, c-format
msgid "cannot stat '%s'"
msgstr "не може да се получи информация чрез „stat“ за директорията „%s“"
-#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
+#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:562
#, c-format
msgid "cannot read '%s'"
msgstr "файлът „%s“ не може да бъде прочетен"
-#: builtin/gc.c:491
+#: builtin/gc.c:503
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -14847,58 +15869,58 @@
"\n"
"%s"
-#: builtin/gc.c:539
+#: builtin/gc.c:551
msgid "prune unreferenced objects"
msgstr "окастряне на обектите, към които нищо не сочи"
-#: builtin/gc.c:541
+#: builtin/gc.c:553
msgid "be more thorough (increased runtime)"
msgstr "изчерпателно търсене на боклука (за сметка на повече време работа)"
-#: builtin/gc.c:542
+#: builtin/gc.c:554
msgid "enable auto-gc mode"
msgstr "включване на автоматичното събиране на боклука (auto-gc)"
-#: builtin/gc.c:545
+#: builtin/gc.c:557
msgid "force running gc even if there may be another gc running"
msgstr ""
"изрично стартиране на събирането на боклука, дори и ако вече работи друго "
"събиране"
-#: builtin/gc.c:548
+#: builtin/gc.c:560
msgid "repack all other packs except the largest pack"
msgstr "препакетиране на всичко без най-големия пакет"
-#: builtin/gc.c:565
+#: builtin/gc.c:576
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "неразпозната стойност на „gc.logexpiry“ %s"
-#: builtin/gc.c:576
+#: builtin/gc.c:587
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr "неразпозната стойност на периода за окастряне: %s"
-#: builtin/gc.c:596
+#: builtin/gc.c:607
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"Автоматично пакетиране на заден фон на хранилището за по-добра "
"производителност.\n"
-#: builtin/gc.c:598
+#: builtin/gc.c:609
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Автоматично пакетиране на хранилището за по-добра производителност.\n"
-#: builtin/gc.c:599
+#: builtin/gc.c:610
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr ""
"Погледнете ръководството за повече информация как да изпълните „git help "
"gc“.\n"
-#: builtin/gc.c:639
+#: builtin/gc.c:650
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -14907,23 +15929,189 @@
"процеса: %<PRIuMAX> (ако сте сигурни, че това не е вярно, това използвайте\n"
"опцията „--force“)"
-#: builtin/gc.c:694
+#: builtin/gc.c:705
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Има прекалено много недостижими, непакетирани обекти.\n"
"Използвайте „git prune“, за да ги окастрите."
+#: builtin/gc.c:715
+msgid ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
+msgstr ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=ЗАДАЧА] [--schedule]"
+
+#: builtin/gc.c:745
+msgid "--no-schedule is not allowed"
+msgstr "опцията „--no-schedule“ не е позволена"
+
+#: builtin/gc.c:750
+#, c-format
+msgid "unrecognized --schedule argument '%s'"
+msgstr "непознат аргумент към „--schedule“: %s"
+
+#: builtin/gc.c:869
+msgid "failed to write commit-graph"
+msgstr "графът с подаванията не може да бъде записан"
+
+#: builtin/gc.c:914
+msgid "failed to fill remotes"
+msgstr "неуспешно попълване на следящите клони"
+
+#: builtin/gc.c:1037
+msgid "failed to start 'git pack-objects' process"
+msgstr "процесът за командата „git pack-objects“ не може да бъде стартиран"
+
+#: builtin/gc.c:1054
+msgid "failed to finish 'git pack-objects' process"
+msgstr "процесът за командата „git pack-objects“ не може да завърши"
+
+#: builtin/gc.c:1106
+msgid "failed to write multi-pack-index"
+msgstr "индексът за множество пакети не може да бъде записан"
+
+#: builtin/gc.c:1124
+msgid "'git multi-pack-index expire' failed"
+msgstr "неуспешно изпълнение на „git multi-pack-index expire“"
+
+#: builtin/gc.c:1185
+msgid "'git multi-pack-index repack' failed"
+msgstr "неуспешно изпълнение на „git multi-pack-index repack“"
+
+#: builtin/gc.c:1194
+msgid ""
+"skipping incremental-repack task because core.multiPackIndex is disabled"
+msgstr ""
+"задачата „incremental-repack“ се прескача, защото настройката „core."
+"multiPackIndex“ е изключена"
+
+#: builtin/gc.c:1298
+#, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr "заключващият файл „%s“ съществува. Действието се прескача"
+
+#: builtin/gc.c:1328
+#, c-format
+msgid "task '%s' failed"
+msgstr "неуспешно изпълнение на задачата „%s“"
+
+#: builtin/gc.c:1410
+#, c-format
+msgid "'%s' is not a valid task"
+msgstr "„%s“ не е правилна задача"
+
+#: builtin/gc.c:1415
+#, c-format
+msgid "task '%s' cannot be selected multiple times"
+msgstr "задачата „%s“ не може да се избере повече от веднъж"
+
+#: builtin/gc.c:1430
+msgid "run tasks based on the state of the repository"
+msgstr "изпълняване на задачи според състоянието на хранилището"
+
+#: builtin/gc.c:1431
+msgid "frequency"
+msgstr "честота"
+
+#: builtin/gc.c:1432
+msgid "run tasks based on frequency"
+msgstr "изпълняване на задачи по график"
+
+#: builtin/gc.c:1435
+msgid "do not report progress or other information over stderr"
+msgstr "без извеждане на напредъка и друга информация на стандартния изход"
+
+#: builtin/gc.c:1436
+msgid "task"
+msgstr "задача"
+
+#: builtin/gc.c:1437
+msgid "run a specific task"
+msgstr "изпълнение на определена задача"
+
+#: builtin/gc.c:1454
+msgid "use at most one of --auto and --schedule=<frequency>"
+msgstr ""
+"може да се указва максимум една от опциите „--auto“ и „--schedule=ЧЕСТОТА“"
+
+#: builtin/gc.c:1497
+msgid "failed to run 'git config'"
+msgstr "неуспешно изпълнение на „git config“"
+
+#: builtin/gc.c:1562
+#, c-format
+msgid "failed to expand path '%s'"
+msgstr "грешка при заместването на пътя „%s“"
+
+#: builtin/gc.c:1591
+msgid "failed to start launchctl"
+msgstr "неуспешно стартиране на „launchctl“."
+
+#: builtin/gc.c:1628
+#, c-format
+msgid "failed to create directories for '%s'"
+msgstr "директориите за „%s“ не може да бъдат създадени"
+
+#: builtin/gc.c:1689
+#, c-format
+msgid "failed to bootstrap service %s"
+msgstr "услугата „%s“ не може се настрои първоначално"
+
+#: builtin/gc.c:1760
+msgid "failed to create temp xml file"
+msgstr "неуспешно създаване на временен файл за xml"
+
+#: builtin/gc.c:1850
+msgid "failed to start schtasks"
+msgstr "задачите за периодично изпълнение не може да се стартират"
+
+#: builtin/gc.c:1894
+msgid "failed to run 'crontab -l'; your system might not support 'cron'"
+msgstr ""
+"неуспешно изпълнение на „crontab -l“. Системата ви може да не поддържа "
+"„cron“"
+
+#: builtin/gc.c:1911
+msgid "failed to run 'crontab'; your system might not support 'cron'"
+msgstr ""
+"неуспешно изпълнение на „crontab“. Системата ви може да не поддържа „cron“"
+
+#: builtin/gc.c:1915
+msgid "failed to open stdin of 'crontab'"
+msgstr "стандартният вход на „crontab“ не може да се отвори"
+
+#: builtin/gc.c:1956
+msgid "'crontab' died"
+msgstr "процесът на „crontab“ умря"
+
+#: builtin/gc.c:1990
+msgid "another process is scheduling background maintenance"
+msgstr "друг процес задава поддръжката на заден фон"
+
+#: builtin/gc.c:2009
+msgid "failed to add repo to global config"
+msgstr "неуспешно добавяне на хранилище към файла с глобални настройки"
+
+#: builtin/gc.c:2019
+msgid "git maintenance <subcommand> [<options>]"
+msgstr "git maintenance ПОДКОМАНДА [ОПЦИЯ…]"
+
+#: builtin/gc.c:2038
+#, 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
+#: builtin/grep.c:223
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: неуспешно създаване на нишка: %s"
-#: builtin/grep.c:279
+#: builtin/grep.c:277
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "зададен е неправилен брой нишки (%d) за %s"
@@ -14932,271 +16120,271 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731
-#: builtin/pack-objects.c:2854
+#: builtin/grep.c:285 builtin/index-pack.c:1589 builtin/index-pack.c:1808
+#: builtin/pack-objects.c:2944
#, c-format
msgid "no threads support, ignoring %s"
msgstr "липсва поддръжка за нишки. „%s“ ще се пренебрегне"
-#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618
+#: builtin/grep.c:473 builtin/grep.c:601 builtin/grep.c:641
#, c-format
msgid "unable to read tree (%s)"
msgstr "дървото не може да бъде прочетено (%s)"
-#: builtin/grep.c:633
+#: builtin/grep.c:656
#, c-format
msgid "unable to grep from object of type %s"
msgstr "не може да се изпълни „grep“ от обект от вида %s"
-#: builtin/grep.c:704
+#: builtin/grep.c:737
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "опцията „%c“ очаква число за аргумент"
-#: builtin/grep.c:803
+#: builtin/grep.c:836
msgid "search in index instead of in the work tree"
msgstr "търсене в индекса, а не в работното дърво"
-#: builtin/grep.c:805
+#: builtin/grep.c:838
msgid "find in contents not managed by git"
msgstr "търсене и във файловете, които не са под управлението на git"
-#: builtin/grep.c:807
+#: builtin/grep.c:840
msgid "search in both tracked and untracked files"
msgstr "търсене и в следените, и в неследените файлове"
-#: builtin/grep.c:809
+#: builtin/grep.c:842
msgid "ignore files specified via '.gitignore'"
msgstr "игнориране на файловете указани в „.gitignore“"
-#: builtin/grep.c:811
+#: builtin/grep.c:844
msgid "recursively search in each submodule"
msgstr "рекурсивно търсене във всички подмодули"
-#: builtin/grep.c:814
+#: builtin/grep.c:847
msgid "show non-matching lines"
msgstr "извеждане на редовете, които не съвпадат"
-#: builtin/grep.c:816
+#: builtin/grep.c:849
msgid "case insensitive matching"
msgstr "без значение на регистъра на буквите (главни/малки)"
-#: builtin/grep.c:818
+#: builtin/grep.c:851
msgid "match patterns only at word boundaries"
msgstr "напасване на шаблоните само по границите на думите"
-#: builtin/grep.c:820
+#: builtin/grep.c:853
msgid "process binary files as text"
msgstr "обработване на двоичните файлове като текстови"
-#: builtin/grep.c:822
+#: builtin/grep.c:855
msgid "don't match patterns in binary files"
msgstr "прескачане на двоичните файлове"
-#: builtin/grep.c:825
+#: builtin/grep.c:858
msgid "process binary files with textconv filters"
msgstr ""
"обработване на двоичните файлове чрез филтри за преобразуване към текст"
-#: builtin/grep.c:827
+#: builtin/grep.c:860
msgid "search in subdirectories (default)"
msgstr "търсене в поддиректориите (стандартно)"
-#: builtin/grep.c:829
+#: builtin/grep.c:862
msgid "descend at most <depth> levels"
msgstr "навлизане максимално на тази ДЪЛБОЧИНА в дървото"
-#: builtin/grep.c:833
+#: builtin/grep.c:866
msgid "use extended POSIX regular expressions"
msgstr "разширени регулярни изрази по POSIX"
-#: builtin/grep.c:836
+#: builtin/grep.c:869
msgid "use basic POSIX regular expressions (default)"
msgstr "основни регулярни изрази по POSIX (стандартно)"
-#: builtin/grep.c:839
+#: builtin/grep.c:872
msgid "interpret patterns as fixed strings"
msgstr "шаблоните са дословни низове"
-#: builtin/grep.c:842
+#: builtin/grep.c:875
msgid "use Perl-compatible regular expressions"
msgstr "регулярни изрази на Perl"
-#: builtin/grep.c:845
+#: builtin/grep.c:878
msgid "show line numbers"
msgstr "извеждане на номерата на редовете"
-#: builtin/grep.c:846
+#: builtin/grep.c:879
msgid "show column number of first match"
msgstr "извеждане на номера на колоната на първото напасване"
-#: builtin/grep.c:847
+#: builtin/grep.c:880
msgid "don't show filenames"
msgstr "без извеждане на имената на файловете"
-#: builtin/grep.c:848
+#: builtin/grep.c:881
msgid "show filenames"
msgstr "извеждане на имената на файловете"
-#: builtin/grep.c:850
+#: builtin/grep.c:883
msgid "show filenames relative to top directory"
msgstr ""
"извеждане на относителните имена на файловете спрямо основната директория на "
"хранилището"
-#: builtin/grep.c:852
+#: builtin/grep.c:885
msgid "show only filenames instead of matching lines"
msgstr "извеждане само на имената на файловете без напасващите редове"
-#: builtin/grep.c:854
+#: builtin/grep.c:887
msgid "synonym for --files-with-matches"
msgstr "псевдоним на „--files-with-matches“"
-#: builtin/grep.c:857
+#: builtin/grep.c:890
msgid "show only the names of files without match"
msgstr ""
"извеждане само на имената на файловете, които не съдържат ред, напасващ на "
"шаблона"
-#: builtin/grep.c:859
+#: builtin/grep.c:892
msgid "print NUL after filenames"
msgstr "извеждане на нулевия знак „NUL“ след всяко име на файл"
-#: builtin/grep.c:862
+#: builtin/grep.c:895
msgid "show only matching parts of a line"
msgstr "извеждане само на частите на редовете, които съвпадат"
-#: builtin/grep.c:864
+#: builtin/grep.c:897
msgid "show the number of matches instead of matching lines"
msgstr "извеждане на броя на съвпаденията вместо напасващите редове"
-#: builtin/grep.c:865
+#: builtin/grep.c:898
msgid "highlight matches"
msgstr "оцветяване на напасванията"
-#: builtin/grep.c:867
+#: builtin/grep.c:900
msgid "print empty line between matches from different files"
msgstr "извеждане на празен ред между напасванията от различни файлове"
-#: builtin/grep.c:869
+#: builtin/grep.c:902
msgid "show filename only once above matches from same file"
msgstr ""
"извеждане на името на файла само веднъж за всички напасвания от този файл"
-#: builtin/grep.c:872
+#: builtin/grep.c:905
msgid "show <n> context lines before and after matches"
msgstr "извеждане на такъв БРОЙ редове преди и след напасванията"
-#: builtin/grep.c:875
+#: builtin/grep.c:908
msgid "show <n> context lines before matches"
msgstr "извеждане на такъв БРОЙ редове преди напасванията"
-#: builtin/grep.c:877
+#: builtin/grep.c:910
msgid "show <n> context lines after matches"
msgstr "извеждане на такъв БРОЙ редове след напасванията"
-#: builtin/grep.c:879
+#: builtin/grep.c:912
msgid "use <n> worker threads"
msgstr "използване на такъв БРОЙ работещи нишки"
-#: builtin/grep.c:880
+#: builtin/grep.c:913
msgid "shortcut for -C NUM"
msgstr "псевдоним на „-C БРОЙ“"
-#: builtin/grep.c:883
+#: builtin/grep.c:916
msgid "show a line with the function name before matches"
msgstr "извеждане на ред с името на функцията, в която е напаснат шаблона"
-#: builtin/grep.c:885
+#: builtin/grep.c:918
msgid "show the surrounding function"
msgstr "извеждане на обхващащата функция"
-#: builtin/grep.c:888
+#: builtin/grep.c:921
msgid "read patterns from file"
msgstr "изчитане на шаблоните от ФАЙЛ"
-#: builtin/grep.c:890
+#: builtin/grep.c:923
msgid "match <pattern>"
msgstr "напасване на ШАБЛОН"
-#: builtin/grep.c:892
+#: builtin/grep.c:925
msgid "combine patterns specified with -e"
msgstr "комбиниране на шаблоните указани с опцията „-e“"
-#: builtin/grep.c:904
+#: builtin/grep.c:937
msgid "indicate hit with exit status without output"
msgstr ""
"без извеждане на стандартния изход. Изходният код указва наличието на "
"напасване"
-#: builtin/grep.c:906
+#: builtin/grep.c:939
msgid "show only matches from files that match all patterns"
msgstr ""
"извеждане на редове само от файловете, които напасват на всички шаблони"
-#: builtin/grep.c:908
-msgid "show parse tree for grep expression"
-msgstr "извеждане на дървото за анализ на регулярния израз"
-
-#: builtin/grep.c:912
+#: builtin/grep.c:942
msgid "pager"
msgstr "програма за преглед по страници"
-#: builtin/grep.c:912
+#: builtin/grep.c:942
msgid "show matching files in the pager"
msgstr "извеждане на съвпадащите файлове в програма за преглед по страници"
-#: builtin/grep.c:916
+#: builtin/grep.c:946
msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
"позволяване на стартирането на grep(1) (текущият компилат пренебрегва тази "
"опция)"
-#: builtin/grep.c:983
+#: builtin/grep.c:1012
msgid "no pattern given"
msgstr "не сте задали шаблон"
-#: builtin/grep.c:1019
+#: builtin/grep.c:1048
msgid "--no-index or --untracked cannot be used with revs"
msgstr "опциите „--cached“ и „--untracked“ са несъвместими с версии."
-#: builtin/grep.c:1027
+#: builtin/grep.c:1056
#, c-format
msgid "unable to resolve revision: %s"
msgstr "версията „%s“ не може бъде открита"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1086
msgid "--untracked not supported with --recurse-submodules"
msgstr "опциите „--untracked“ и „--recurse-submodules“ са несъвместими"
-#: builtin/grep.c:1061
+#: builtin/grep.c:1090
msgid "invalid option combination, ignoring --threads"
msgstr "неправилна комбинация от опции, „--threads“ ще се пренебрегне"
-#: builtin/grep.c:1064 builtin/pack-objects.c:3547
+#: builtin/grep.c:1093 builtin/pack-objects.c:3672
msgid "no threads support, ignoring --threads"
msgstr "липсва поддръжка за нишки. „--threads“ ще се пренебрегне"
-#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851
+#: builtin/grep.c:1096 builtin/index-pack.c:1586 builtin/pack-objects.c:2941
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "зададен е неправилен брой нишки: %d"
-#: builtin/grep.c:1101
+#: builtin/grep.c:1130
msgid "--open-files-in-pager only works on the worktree"
msgstr "опцията „--open-files-in-pager“ изисква търсене в работното дърво"
-#: builtin/grep.c:1127
+#: builtin/grep.c:1156
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "опциите „--cached“ и „--untracked“ са несъвместими с „--no-index“"
-#: builtin/grep.c:1133
+#: builtin/grep.c:1159
+msgid "--untracked cannot be used with --cached"
+msgstr "опциите „--untracked“ и „--cached“ са несъвместими"
+
+#: builtin/grep.c:1165
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr ""
"опциите „--(no-)exclude-standard“ са несъвместими с търсене по следени "
"файлове"
-#: builtin/grep.c:1141
+#: builtin/grep.c:1173
msgid "both --cached and trees are given"
msgstr "опцията „--cached“ е несъвместима със задаване на дърво"
@@ -15239,66 +16427,66 @@
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"
@@ -15307,7 +16495,7 @@
"„%s“: път към неподдържана програма за преглед на\n"
" ръководството. Вместо нея пробвайте „man.<tool>.cmd“."
-#: builtin/help.c:233
+#: builtin/help.c:319
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -15316,408 +16504,442 @@
"„%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:340
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "„%s“ е псевдоним на „%s“"
-#: builtin/help.c:448 git.c:365
+#: builtin/help.c:534 git.c:372
#, 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:606
+#: builtin/index-pack.c:324 builtin/pack-objects.c:624
msgid "pack too large for current definition of off_t"
msgstr "пакетният файл е прекалено голям за текущата стойност на типа „off_t“"
-#: builtin/index-pack.c:291 builtin/unpack-objects.c:95
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
msgid "pack exceeds maximum allowed size"
msgstr "пакетният файл надвишава максималния възможен размер"
-#: builtin/index-pack.c:312
+#: builtin/index-pack.c:342
+#, 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:765
-#: builtin/index-pack.c:804 builtin/index-pack.c:813
+#: 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:158
-#: builtin/pack-objects.c:218 builtin/pack-objects.c:313
+#: 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:802
+#: builtin/index-pack.c:824
#, c-format
msgid "cannot read existing object info %s"
msgstr "съществуващият обект в „%s“ не може да бъде прочетен"
-#: builtin/index-pack.c:810
+#: builtin/index-pack.c:832
#, c-format
msgid "cannot read existing object %s"
msgstr "съществуващият обект „%s“ не може да бъде прочетен"
-#: builtin/index-pack.c:824
+#: builtin/index-pack.c:846
#, c-format
msgid "invalid blob object %s"
msgstr "неправилен обект-BLOB „%s“"
-#: builtin/index-pack.c:827 builtin/index-pack.c:846
+#: builtin/index-pack.c:849 builtin/index-pack.c:868
msgid "fsck error in packed object"
msgstr "грешка при проверката на пакетирани обекти"
-#: builtin/index-pack.c:848
+#: builtin/index-pack.c:870
#, c-format
msgid "Not all child objects of %s are reachable"
-msgstr "Някои обекти, наследници на „%s“, не могат да бъдат достигнати"
+msgstr "Някои обекти, наследници на „%s“, не може да бъдат достигнати"
-#: builtin/index-pack.c:920 builtin/index-pack.c:951
+#: builtin/index-pack.c:931 builtin/index-pack.c:978
msgid "failed to apply delta"
msgstr "разликата не може да бъде приложена"
-#: builtin/index-pack.c:1121
+#: builtin/index-pack.c:1161
msgid "Receiving objects"
msgstr "Получаване на обекти"
-#: builtin/index-pack.c:1121
+#: builtin/index-pack.c:1161
msgid "Indexing objects"
msgstr "Индексиране на обекти"
-#: builtin/index-pack.c:1155
+#: builtin/index-pack.c:1195
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "пакетният файл е повреден (нееднакви суми по SHA1)"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1200
msgid "cannot fstat packfile"
msgstr "не може да се получи информация за пакетния файл с „fstat“"
-#: builtin/index-pack.c:1163
+#: builtin/index-pack.c:1203
msgid "pack has junk at the end"
msgstr "в края на пакетния файл има повредени данни"
-#: builtin/index-pack.c:1175
+#: 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:1198
+#: builtin/index-pack.c:1238
msgid "Resolving deltas"
msgstr "Откриване на съответните разлики"
-#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615
+#: builtin/index-pack.c:1249 builtin/pack-objects.c:2707
#, c-format
msgid "unable to create thread: %s"
msgstr "не може да се създаде нишка: %s"
-#: builtin/index-pack.c:1249
+#: builtin/index-pack.c:1282
msgid "confusion beyond insanity"
msgstr ""
"фатална грешка във функцията „conclude_pack“. Това е грешка в Git, "
"докладвайте я на разработчиците, като пратите е-писмо на адрес: „git@vger."
"kernel.org“."
-#: builtin/index-pack.c:1255
+#: 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:1267
+#: builtin/index-pack.c:1300
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
"Неочаквана последваща сума за грешки за „%s“ (причината може да е грешка в "
"диска)"
-#: builtin/index-pack.c:1271
+#: 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:1295
+#: builtin/index-pack.c:1328
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "добавеният обект не може да се компресира с „deflate“: %d"
-#: builtin/index-pack.c:1392
+#: builtin/index-pack.c:1424
#, c-format
msgid "local object %s is corrupt"
msgstr "локалният обект „%s“ е повреден"
-#: builtin/index-pack.c:1406
+#: builtin/index-pack.c:1445
#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "името на пакетния файл „%s“ не завършва на „.pack“"
+msgid "packfile name '%s' does not end with '.%s'"
+msgstr "името на пакетния файл „%s“ не завършва с „%s“"
-#: builtin/index-pack.c:1431
+#: builtin/index-pack.c:1469
#, c-format
msgid "cannot write %s file '%s'"
msgstr "грешка при запис на файла „%s“ „%s“"
-#: builtin/index-pack.c:1439
+#: builtin/index-pack.c:1477
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "грешка при затварянето на записания файл „%s“ „%s“"
-#: builtin/index-pack.c:1463
+#: builtin/index-pack.c:1503
msgid "error while closing pack file"
msgstr "грешка при затварянето на пакетния файл"
-#: builtin/index-pack.c:1477
+#: builtin/index-pack.c:1517
msgid "cannot store pack file"
msgstr "пакетният файл не може да бъде запазен"
-#: builtin/index-pack.c:1485
+#: builtin/index-pack.c:1525
msgid "cannot store index file"
msgstr "файлът за индекса не може да бъде съхранен"
-#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862
+#: builtin/index-pack.c:1534
+msgid "cannot store reverse index file"
+msgstr "файлът за индекса не може да бъде съхранен"
+
+#: builtin/index-pack.c:1580 builtin/pack-objects.c:2952
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "зададена е неправилна версия пакетиране: „pack.indexversion=%<PRIu32>“"
-#: builtin/index-pack.c:1597
+#: builtin/index-pack.c:1650
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Съществуващият пакетен файл „%s“ не може да бъде отворен"
-#: builtin/index-pack.c:1599
+#: builtin/index-pack.c:1652
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Съществуващият индекс за пакетния файл „%s“ не може да бъде отворен"
-#: builtin/index-pack.c:1647
+#: builtin/index-pack.c:1700
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "%d обект не е разлика"
msgstr[1] "%d обекта не са разлика"
-#: builtin/index-pack.c:1654
+#: builtin/index-pack.c:1707
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "дължината на веригата е %d: %lu обект"
msgstr[1] "дължината на веригата е %d: %lu обекта"
-#: builtin/index-pack.c:1693
+#: builtin/index-pack.c:1765
msgid "Cannot come back to cwd"
msgstr "Процесът не може да се върне към предишната работна директория"
-#: builtin/index-pack.c:1742 builtin/index-pack.c:1745
-#: builtin/index-pack.c:1761 builtin/index-pack.c:1765
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1822
+#: builtin/index-pack.c:1838 builtin/index-pack.c:1842
#, c-format
msgid "bad %s"
msgstr "неправилна стойност „%s“"
-#: builtin/index-pack.c:1781
+#: builtin/index-pack.c:1848 builtin/init-db.c:392 builtin/init-db.c:625
+#, c-format
+msgid "unknown hash algorithm '%s'"
+msgstr "непознат алгоритъм за контролни суми „%s“"
+
+#: builtin/index-pack.c:1867
msgid "--fix-thin cannot be used without --stdin"
msgstr "опцията „--fix-thin“ изисква „--stdin“"
-#: builtin/index-pack.c:1783
+#: builtin/index-pack.c:1869
msgid "--stdin requires a git repository"
msgstr "„--stdin“ изисква хранилище на git"
-#: builtin/index-pack.c:1789
+#: builtin/index-pack.c:1871
+msgid "--object-format cannot be used with --stdin"
+msgstr "опцията „--object-format“ и „--stdin“ са несъвместими"
+
+#: builtin/index-pack.c:1886
msgid "--verify with no packfile name given"
msgstr "опцията „--verify“ изисква име на пакетен файл"
-#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582
+#: builtin/index-pack.c:1956 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:275
+#, c-format
+msgid "invalid initial branch name: '%s'"
+msgstr "неправилно име на първоначалния клон: „%s“"
+
+#: builtin/init-db.c:367
#, c-format
msgid "unable to handle file type %d"
msgstr "файлове от вид %d не се поддържат"
-#: builtin/init-db.c:337
+#: builtin/init-db.c:370
#, 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:386
+msgid "attempt to reinitialize repository with different hash"
+msgstr ""
+"опит за повторно задаване на първото подаване в хранилището с различна "
+"контролна сума"
+
+#: builtin/init-db.c:410 builtin/init-db.c:413
#, c-format
msgid "%s already exists"
msgstr "Директорията „%s“ вече съществува"
-#: builtin/init-db.c:413
+#: builtin/init-db.c:445
+#, c-format
+msgid "re-init: ignored --initial-branch=%s"
+msgstr "re-init: „--initial-branch=%s“ се пропуска"
+
+#: builtin/init-db.c:476
#, 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:477
#, 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:481
#, 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:482
#, 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:531
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -15725,27 +16947,43 @@
"git init [-q | --quiet] [--bare] [--template=ДИРЕКТОРИЯ_С_ШАБЛОНИ] [--"
"shared[=ПРАВА]] [ДИРЕКТОРИЯ]"
-#: builtin/init-db.c:491
+#: builtin/init-db.c:557
msgid "permissions"
msgstr "права"
-#: builtin/init-db.c:492
+#: builtin/init-db.c:558
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:564
+msgid "override the name of the initial branch"
+msgstr "задаване на името на първоначалния клон"
+
+#: builtin/init-db.c:565 builtin/verify-pack.c:74
+msgid "hash"
+msgstr "алгоритъм"
+
+#: builtin/init-db.c:566 builtin/show-index.c:22 builtin/verify-pack.c:75
+msgid "specify the hash algorithm to use"
+msgstr "указване на алгоритъм за контролна сума"
+
+#: builtin/init-db.c:573
+msgid "--separate-git-dir and --bare are mutually exclusive"
+msgstr "опциите „--separate-git-dir“ и „--bare“ са несъвместими"
+
+#: builtin/init-db.c:602 builtin/init-db.c:607
#, c-format
msgid "cannot mkdir %s"
msgstr "директорията „%s“ не може да бъде създадена"
-#: builtin/init-db.c:538
+#: builtin/init-db.c:611 builtin/init-db.c:666
#, c-format
msgid "cannot chdir to %s"
msgstr "не може да се влезе в директорията „%s“"
-#: builtin/init-db.c:559
+#: builtin/init-db.c:638
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -15754,11 +16992,15 @@
"%s (или --work-tree=ДИРЕКТОРИЯ) изисква указването на %s (или --git-"
"dir=ДИРЕКТОРИЯ)"
-#: builtin/init-db.c:587
+#: builtin/init-db.c:690
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Работното дърво в „%s“ е недостъпно"
+#: builtin/init-db.c:695
+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 "
@@ -15823,130 +17065,132 @@
msgid "no input file given for in-place editing"
msgstr "не е зададен входен файл за редактиране на място"
-#: builtin/log.c:56
+#: builtin/log.c:59
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [ОПЦИЯ…] [ДИАПАЗОН_НА_ВЕРСИИТЕ] [[--] ПЪТ…]"
-#: builtin/log.c:57
+#: builtin/log.c:60
msgid "git show [<options>] <object>..."
msgstr "git show [ОПЦИЯ…] ОБЕКТ…"
-#: builtin/log.c:110
+#: builtin/log.c:113
#, c-format
msgid "invalid --decorate option: %s"
msgstr "неправилна опция „--decorate“: %s"
-#: builtin/log.c:174
+#: builtin/log.c:180
msgid "show source"
msgstr "извеждане на изходния код"
-#: builtin/log.c:175
-msgid "Use mail map file"
+#: builtin/log.c:181
+msgid "use mail map file"
msgstr ""
-"Използване на файл за съответствията на имената и адресите на е-поща („."
+"използване на файл за съответствията на имената и адресите на е-поща („."
"mailmap“)"
-#: builtin/log.c:177
+#: builtin/log.c:184
msgid "only decorate refs that match <pattern>"
msgstr "специален формат само на указателите напасващи на ШАБЛОНа"
-#: builtin/log.c:179
+#: builtin/log.c:186
msgid "do not decorate refs that match <pattern>"
msgstr "без специален формат на указателите напасващи на ШАБЛОНа"
-#: builtin/log.c:180
+#: builtin/log.c:187
msgid "decorate options"
msgstr "настройки на форма̀та на извежданата информация"
-#: builtin/log.c:183
-msgid "Process line range n,m in file, counting from 1"
+#: builtin/log.c:190
+msgid ""
+"trace the evolution of line range <start>,<end> or function :<funcname> in "
+"<file>"
msgstr ""
-"Обработване само на редовете във файла в диапазона от n до m включително. "
-"Броенето започва от 1"
+"проследяване на еволюцията на диапазона от редове НАЧАЛО,КРАЙ или :ФУНКЦИЯта "
+"във ФАЙЛа"
-#: builtin/log.c:281
+#: builtin/log.c:213
+msgid "-L<range>:<file> cannot be used with pathspec"
+msgstr "опцията „-LДИАПАЗОН:ФАЙЛ“ не може да се ползва с път"
+
+#: builtin/log.c:303
#, c-format
msgid "Final output: %d %s\n"
msgstr "Резултат: %d %s\n"
-#: builtin/log.c:535
+#: builtin/log.c:566
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: повреден файл"
-#: builtin/log.c:550 builtin/log.c:645
+#: builtin/log.c:581 builtin/log.c:671
#, c-format
msgid "could not read object %s"
msgstr "обектът не може да бъде прочетен: %s"
-#: builtin/log.c:670
+#: builtin/log.c:696
#, c-format
msgid "unknown type: %d"
msgstr "неизвестен вид: %d"
-#: builtin/log.c:814
+#: builtin/log.c:841
#, c-format
msgid "%s: invalid cover from description mode"
msgstr "%s: неправилно придружаващо писмо от режима на описание"
-#: builtin/log.c:821
+#: builtin/log.c:848
msgid "format.headers without value"
msgstr "не е зададена стойност на „format.headers“"
-#: builtin/log.c:936
-msgid "name of output directory is too long"
-msgstr "прекалено дълго име на директорията за изходната информация"
-
-#: builtin/log.c:952
+#: builtin/log.c:977
#, c-format
msgid "cannot open patch file %s"
msgstr "файлът-кръпка „%s“ не може да бъде отворен"
-#: builtin/log.c:969
+#: builtin/log.c:994
msgid "need exactly one range"
msgstr "трябва да зададете точно един диапазон"
-#: builtin/log.c:979
+#: builtin/log.c:1004
msgid "not a range"
msgstr "не е диапазон"
-#: builtin/log.c:1143
+#: builtin/log.c:1168
msgid "cover letter needs email format"
msgstr "придружаващото писмо трябва да е форматирано като е-писмо"
-#: builtin/log.c:1149
+#: builtin/log.c:1174
msgid "failed to create cover-letter file"
msgstr "неуспешно създаване на придружаващо писмо"
-#: builtin/log.c:1228
+#: builtin/log.c:1261
#, c-format
msgid "insane in-reply-to: %s"
msgstr "неправилен формат на заглавната част за отговор „in-reply-to“: %s"
-#: builtin/log.c:1255
+#: builtin/log.c:1288
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [ОПЦИЯ…] [ОТ | ДИАПАЗОН_НА_ВЕРСИИТЕ]"
-#: builtin/log.c:1313
+#: builtin/log.c:1346
msgid "two output directories?"
msgstr "може да укажете максимум една директория за изход"
-#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211
+#: builtin/log.c:1497 builtin/log.c:2317 builtin/log.c:2319 builtin/log.c:2331
#, c-format
msgid "unknown commit %s"
msgstr "непознато подаване: „%s“"
-#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1508 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "„%s“ не е указател или не сочи към нищо"
-#: builtin/log.c:1439
+#: builtin/log.c:1517
msgid "could not find exact merge base"
msgstr "точната база за сливане не може да бъде открита"
-#: builtin/log.c:1443
+#: builtin/log.c:1527
msgid ""
"failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
@@ -15956,291 +17200,303 @@
"зададете, използвайте „git branch --set-upstream-to“.\n"
"Можете ръчно да зададете базово подаване чрез „--base=<base-commit-id>“."
-#: builtin/log.c:1463
+#: builtin/log.c:1550
msgid "failed to find exact merge base"
msgstr "точната база при сливане не може да бъде открита"
-#: builtin/log.c:1474
+#: builtin/log.c:1567
msgid "base commit should be the ancestor of revision list"
msgstr "базовото подаване трябва да е предшественикът на списъка с версиите"
-#: builtin/log.c:1478
+#: builtin/log.c:1577
msgid "base commit shouldn't be in revision list"
msgstr "базовото подаване не може да е в списъка с версиите"
-#: builtin/log.c:1531
+#: builtin/log.c:1635
msgid "cannot get patch id"
msgstr "идентификаторът на кръпката не може да бъде получен"
-#: builtin/log.c:1583
-msgid "failed to infer range-diff ranges"
-msgstr "неуспешно определяне на диапазоните за разлика"
+#: builtin/log.c:1692
+msgid "failed to infer range-diff origin of current series"
+msgstr ""
+"неуспешно определяне на началото на диапазонната разлика на текущата поредица"
-#: builtin/log.c:1629
+#: builtin/log.c:1694
+#, c-format
+msgid "using '%s' as range-diff origin of current series"
+msgstr ""
+"„%s“ се ползва като началото на диапазонната разлика на текущата поредица"
+
+#: builtin/log.c:1738
msgid "use [PATCH n/m] even with a single patch"
msgstr "номерация „[PATCH n/m]“ дори и при единствена кръпка"
-#: builtin/log.c:1632
+#: builtin/log.c:1741
msgid "use [PATCH] even with multiple patches"
msgstr "номерация „[PATCH]“ дори и при множество кръпки"
-#: builtin/log.c:1636
+#: builtin/log.c:1745
msgid "print patches to standard out"
msgstr "извеждане на кръпките на стандартния изход"
-#: builtin/log.c:1638
+#: builtin/log.c:1747
msgid "generate a cover letter"
msgstr "създаване на придружаващо писмо"
-#: builtin/log.c:1640
+#: builtin/log.c:1749
msgid "use simple number sequence for output file names"
msgstr "проста числова последователност за имената на файловете-кръпки"
-#: builtin/log.c:1641
+#: builtin/log.c:1750
msgid "sfx"
msgstr "ЗНАЦИ"
-#: builtin/log.c:1642
+#: builtin/log.c:1751
msgid "use <sfx> instead of '.patch'"
msgstr "използване на тези ЗНАЦИ за суфикс вместо „.patch“"
-#: builtin/log.c:1644
+#: builtin/log.c:1753
msgid "start numbering patches at <n> instead of 1"
msgstr "номерирането на кръпките да започва от този БРОЙ, а не с 1"
-#: builtin/log.c:1646
+#: builtin/log.c:1755
msgid "mark the series as Nth re-roll"
msgstr "отбелязване, че това е N-тата поредна редакция на поредицата от кръпки"
-#: builtin/log.c:1648
-msgid "Use [RFC PATCH] instead of [PATCH]"
-msgstr "Използване на „[RFC PATCH]“ вместо „[PATCH]“"
+#: builtin/log.c:1757
+msgid "max length of output filename"
+msgstr "максимална дължина на име на всеки пакетен файл"
-#: builtin/log.c:1651
+#: builtin/log.c:1759
+msgid "use [RFC PATCH] instead of [PATCH]"
+msgstr "използване на „[RFC PATCH]“ вместо „[PATCH]“"
+
+#: builtin/log.c:1762
msgid "cover-from-description-mode"
msgstr "режим-придружаващо-писмо-по-описание"
-#: builtin/log.c:1652
+#: builtin/log.c:1763
msgid "generate parts of a cover letter based on a branch's description"
msgstr ""
"генериране на частите на придружаващото писмо на базата на описанието на "
"клона"
-#: builtin/log.c:1654
-msgid "Use [<prefix>] instead of [PATCH]"
-msgstr "Използване на този „[ПРЕФИКС]“ вместо „[PATCH]“"
+#: builtin/log.c:1765
+msgid "use [<prefix>] instead of [PATCH]"
+msgstr "използване на този „[ПРЕФИКС]“ вместо „[PATCH]“"
-#: builtin/log.c:1657
+#: builtin/log.c:1768
msgid "store resulting files in <dir>"
msgstr "запазване на изходните файлове в тази ДИРЕКТОРИЯ"
-#: builtin/log.c:1660
+#: builtin/log.c:1771
msgid "don't strip/add [PATCH]"
msgstr "без добавяне/махане на префикса „[PATCH]“"
-#: builtin/log.c:1663
+#: builtin/log.c:1774
msgid "don't output binary diffs"
msgstr "без извеждане на разлики между двоични файлове"
-#: builtin/log.c:1665
+#: builtin/log.c:1776
msgid "output all-zero hash in From header"
msgstr "в заглавната част „From:“ (от) контролната сума да е само от нули"
-#: builtin/log.c:1667
+#: builtin/log.c:1778
msgid "don't include a patch matching a commit upstream"
msgstr "без кръпки, които присъстват в следения клон"
-#: builtin/log.c:1669
+#: builtin/log.c:1780
msgid "show patch format instead of default (patch + stat)"
msgstr ""
"извеждане във формат за кръпки, а на в стандартния (кръпка и статистика)"
-#: builtin/log.c:1671
+#: builtin/log.c:1782
msgid "Messaging"
msgstr "Опции при изпращане"
-#: builtin/log.c:1672
+#: builtin/log.c:1783
msgid "header"
msgstr "ЗАГЛАВНА_ЧАСТ"
-#: builtin/log.c:1673
+#: builtin/log.c:1784
msgid "add email header"
msgstr "добавяне на тази ЗАГЛАВНА_ЧАСТ"
-#: builtin/log.c:1674 builtin/log.c:1676
+#: builtin/log.c:1785 builtin/log.c:1786
msgid "email"
msgstr "Е-ПОЩА"
-#: builtin/log.c:1674
+#: builtin/log.c:1785
msgid "add To: header"
msgstr "добавяне на заглавна част „To:“ (до)"
-#: builtin/log.c:1676
+#: builtin/log.c:1786
msgid "add Cc: header"
msgstr "добавяне на заглавна част „Cc:“ (и до)"
-#: builtin/log.c:1678
+#: builtin/log.c:1787
msgid "ident"
msgstr "ИДЕНТИЧНОСТ"
-#: builtin/log.c:1679
+#: builtin/log.c:1788
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"задаване на адреса в заглавната част „From“ (от) да е тази ИДЕНТИЧНОСТ. Ако "
"не е зададена такава, се взима адреса на подаващия"
-#: builtin/log.c:1681
+#: builtin/log.c:1790
msgid "message-id"
msgstr "ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ"
-#: builtin/log.c:1682
+#: builtin/log.c:1791
msgid "make first mail a reply to <message-id>"
msgstr ""
"първото съобщение да е в отговор на е-писмото с този "
"ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ"
-#: builtin/log.c:1683 builtin/log.c:1686
+#: builtin/log.c:1792 builtin/log.c:1795
msgid "boundary"
msgstr "граница"
-#: builtin/log.c:1684
+#: builtin/log.c:1793
msgid "attach the patch"
msgstr "прикрепяне на кръпката"
-#: builtin/log.c:1687
+#: builtin/log.c:1796
msgid "inline the patch"
msgstr "включване на кръпката в текста на писмата"
-#: builtin/log.c:1691
+#: builtin/log.c:1800
msgid "enable message threading, styles: shallow, deep"
msgstr ""
"използване на нишки за съобщенията. СТИЛът е „shallow“ (плитък) или "
"„deep“ (дълбок)"
-#: builtin/log.c:1693
+#: builtin/log.c:1802
msgid "signature"
msgstr "подпис"
-#: builtin/log.c:1694
+#: builtin/log.c:1803
msgid "add a signature"
msgstr "добавяне на поле за подпис"
-#: builtin/log.c:1695
+#: builtin/log.c:1804
msgid "base-commit"
msgstr "БАЗОВО_ПОДАВАНЕ"
-#: builtin/log.c:1696
+#: builtin/log.c:1805
msgid "add prerequisite tree info to the patch series"
msgstr "добавяне на необходимото БАЗово дърво към поредицата от кръпки"
-#: builtin/log.c:1698
+#: builtin/log.c:1808
msgid "add a signature from a file"
msgstr "добавяне на подпис от файл"
-#: builtin/log.c:1699
+#: builtin/log.c:1809
msgid "don't print the patch filenames"
msgstr "без извеждане на имената на кръпките"
-#: builtin/log.c:1701
+#: builtin/log.c:1811
msgid "show progress while generating patches"
msgstr "извеждане на напредъка във фазата на създаване на кръпките"
-#: builtin/log.c:1703
+#: builtin/log.c:1813
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
"показване на промените спрямо ВЕРСията в придружаващото писмо или единствена "
"кръпка"
-#: builtin/log.c:1706
+#: builtin/log.c:1816
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
"показване на промените спрямо указателя на ВЕРСията в придружаващото писмо "
"или единствена кръпка"
-#: builtin/log.c:1708
+#: builtin/log.c:1818
msgid "percentage by which creation is weighted"
msgstr "процент за претегляне при оценка на създаването"
-#: builtin/log.c:1792
+#: builtin/log.c:1904
#, c-format
msgid "invalid ident line: %s"
msgstr "грешна идентичност: %s"
-#: builtin/log.c:1807
+#: builtin/log.c:1919
msgid "-n and -k are mutually exclusive"
msgstr "опциите „-n“ и „-k“ са несъвместими"
-#: builtin/log.c:1809
+#: builtin/log.c:1921
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "опциите „--subject-prefix“/„-rfc“ и „-k“ са несъвместими"
-#: builtin/log.c:1817
+#: builtin/log.c:1929
msgid "--name-only does not make sense"
msgstr "опцията „--name-only“ е несъвместима с генерирането на кръпки"
-#: builtin/log.c:1819
+#: builtin/log.c:1931
msgid "--name-status does not make sense"
msgstr "опцията „--name-status“ е несъвместима с генерирането на кръпки"
-#: builtin/log.c:1821
+#: builtin/log.c:1933
msgid "--check does not make sense"
msgstr "опцията „--check“ е несъвместима с генерирането на кръпки"
-#: builtin/log.c:1854
-msgid "standard output, or directory, which one?"
+#: builtin/log.c:1955
+msgid "--stdout, --output, and --output-directory are mutually exclusive"
msgstr ""
-"изходът може да или стандартният, или да е в директория, но не и двете."
+"Опциите „--stdout“, „--output“ и „--output-directory“ са несъвместими една с "
+"друга"
-#: builtin/log.c:1958
+#: builtin/log.c:2078
msgid "--interdiff requires --cover-letter or single patch"
msgstr ""
"опцията „--interdiff“ изисква опция „--cover-letter“ или единствена кръпка"
-#: builtin/log.c:1962
+#: builtin/log.c:2082
msgid "Interdiff:"
msgstr "Разлика в разликите:"
-#: builtin/log.c:1963
+#: builtin/log.c:2083
#, c-format
msgid "Interdiff against v%d:"
msgstr "Разлика в разликите спрямо v%d:"
-#: builtin/log.c:1969
+#: builtin/log.c:2089
msgid "--creation-factor requires --range-diff"
msgstr "опцията „--creation-factor“ изисква опция „--range-diff“"
-#: builtin/log.c:1973
+#: builtin/log.c:2093
msgid "--range-diff requires --cover-letter or single patch"
msgstr ""
"опцията „--range-diff“ изисква опция „--cover-letter“ или единствена кръпка"
-#: builtin/log.c:1981
+#: builtin/log.c:2101
msgid "Range-diff:"
msgstr "Диапазонна разлика:"
-#: builtin/log.c:1982
+#: builtin/log.c:2102
#, c-format
msgid "Range-diff against v%d:"
msgstr "Диапазонна разлика спрямо v%d:"
-#: builtin/log.c:1993
+#: builtin/log.c:2113
#, c-format
msgid "unable to read signature file '%s'"
msgstr "файлът „%s“ с подпис не може да бъде прочетен"
-#: builtin/log.c:2029
+#: builtin/log.c:2149
msgid "Generating patches"
msgstr "Създаване на кръпки"
-#: builtin/log.c:2073
+#: builtin/log.c:2193
msgid "failed to create output files"
msgstr "неуспешно създаване на изходни файлове"
-#: builtin/log.c:2132
+#: builtin/log.c:2252
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [ОТДАЛЕЧЕН_КЛОН [ВРЪХ [ПРЕДЕЛ]]]"
-#: builtin/log.c:2186
+#: builtin/log.c:2306
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -16248,112 +17504,116 @@
"Следеният отдалечен клон не бе открит, затова изрично задайте "
"ОТДАЛЕЧЕН_КЛОН.\n"
-#: builtin/ls-files.c:470
+#: builtin/ls-files.c:486
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [ОПЦИЯ…] [ФАЙЛ…]"
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:542
msgid "identify the file status with tags"
msgstr "извеждане на състоянието на файловете с еднобуквени флагове"
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:544
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "малки букви за файловете, които да се счетат за непроменени"
-#: builtin/ls-files.c:530
+#: builtin/ls-files.c:546
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "малки букви за файловете за командата „fsmonitor clean“"
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:548
msgid "show cached files in the output (default)"
msgstr "извеждане на кешираните файлове (стандартно)"
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:550
msgid "show deleted files in the output"
msgstr "извеждане на изтритите файлове"
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:552
msgid "show modified files in the output"
msgstr "извеждане на променените файлове"
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:554
msgid "show other files in the output"
msgstr "извеждане на другите файлове"
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:556
msgid "show ignored files in the output"
msgstr "извеждане на игнорираните файлове"
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:559
msgid "show staged contents' object name in the output"
msgstr "извеждане на името на обекта за съдържанието на индекса"
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:561
msgid "show files on the filesystem that need to be removed"
msgstr "извеждане на файловете, които трябва да бъдат изтрити"
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:563
msgid "show 'other' directories' names only"
msgstr "извеждане само на името на другите (неследените) директории"
-#: builtin/ls-files.c:549
+#: builtin/ls-files.c:565
msgid "show line endings of files"
msgstr "извеждане на знаците за край на ред във файловете"
-#: builtin/ls-files.c:551
+#: builtin/ls-files.c:567
msgid "don't show empty directories"
msgstr "без извеждане на празните директории"
-#: builtin/ls-files.c:554
+#: builtin/ls-files.c:570
msgid "show unmerged files in the output"
msgstr "извеждане на неслетите файлове"
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:572
msgid "show resolve-undo information"
msgstr "извеждане на информацията за отмяна на разрешените подавания"
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:574
msgid "skip files matching pattern"
msgstr "прескачане на файловете напасващи ШАБЛОНа"
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:577
msgid "exclude patterns are read from <file>"
msgstr "шаблоните за игнориране да се прочетат от този ФАЙЛ"
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:580
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
"изчитане на допълнителните шаблони за игнориране по директория от този ФАЙЛ"
-#: builtin/ls-files.c:566
+#: builtin/ls-files.c:582
msgid "add the standard git exclusions"
msgstr "добавяне на стандартно игнорираните от Git файлове"
-#: builtin/ls-files.c:570
+#: builtin/ls-files.c:586
msgid "make the output relative to the project top directory"
msgstr "пътищата да са относителни спрямо основната директория на проекта"
-#: builtin/ls-files.c:573
+#: builtin/ls-files.c:589
msgid "recurse through submodules"
msgstr "рекурсивно обхождане подмодулите"
-#: builtin/ls-files.c:575
+#: builtin/ls-files.c:591
msgid "if any <file> is not in the index, treat this as an error"
msgstr "грешка, ако някой от тези ФАЙЛове не е в индекса"
-#: builtin/ls-files.c:576
+#: builtin/ls-files.c:592
msgid "tree-ish"
msgstr "УКАЗАТЕЛ_КЪМ_ДЪРВО"
-#: builtin/ls-files.c:577
+#: builtin/ls-files.c:593
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"считане, че пътищата изтрити след УКАЗАТЕЛя_КЪМ_ДЪРВО все още съществуват"
-#: builtin/ls-files.c:579
+#: builtin/ls-files.c:595
msgid "show debugging data"
msgstr "извеждане на информацията за изчистване на грешки"
+#: builtin/ls-files.c:597
+msgid "suppress duplicate entries"
+msgstr "без повтаряне на записите"
+
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
@@ -16364,39 +17624,39 @@
" [-q | --quiet] [--exit-code] [--get-url]\n"
" [--symref] [ХРАНИЛИЩЕ [УКАЗАТЕЛ…]]"
-#: builtin/ls-remote.c:59
+#: builtin/ls-remote.c:60
msgid "do not print remote URL"
msgstr "без извеждане на адресите на отдалечените хранилища"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1404
msgid "exec"
msgstr "КОМАНДА"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
+#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
msgid "path of git-upload-pack on the remote host"
msgstr "път към командата „git-upload-pack“ на отдалечената машина"
-#: builtin/ls-remote.c:65
+#: builtin/ls-remote.c:66
msgid "limit to tags"
msgstr "само етикетите"
-#: builtin/ls-remote.c:66
+#: builtin/ls-remote.c:67
msgid "limit to heads"
msgstr "само върховете"
-#: builtin/ls-remote.c:67
+#: builtin/ls-remote.c:68
msgid "do not show peeled tags"
msgstr "без проследяване на непреките етикети"
-#: builtin/ls-remote.c:69
+#: builtin/ls-remote.c:70
msgid "take url.<base>.insteadOf into account"
msgstr "взимане предвид на „url.БАЗА.insteadOf“"
-#: builtin/ls-remote.c:72
+#: builtin/ls-remote.c:73
msgid "exit with exit code 2 if no matching refs are found"
msgstr "изход с код 2, ако не се открият съвпадащи указатели"
-#: builtin/ls-remote.c:75
+#: builtin/ls-remote.c:76
msgid "show underlying ref in addition to the object pointed by it"
msgstr "извеждане на указателя заедно с обекта сочен от него"
@@ -16443,405 +17703,6 @@
msgid "empty mbox: '%s'"
msgstr "празна пощенска кутия mbox: „%s“"
-#: builtin/merge.c:55
-msgid "git merge [<options>] [<commit>...]"
-msgstr "git merge [ОПЦИЯ…] [ПОДАВАНЕ…]"
-
-#: builtin/merge.c:56
-msgid "git merge --abort"
-msgstr "git merge --abort"
-
-#: builtin/merge.c:57
-msgid "git merge --continue"
-msgstr "git merge --continue"
-
-#: builtin/merge.c:119
-msgid "switch `m' requires a value"
-msgstr "опцията „-m“ изисква стойност"
-
-#: builtin/merge.c:142
-#, c-format
-msgid "option `%s' requires a value"
-msgstr "опцията „%s“ изисква стойност"
-
-#: builtin/merge.c:188
-#, c-format
-msgid "Could not find merge strategy '%s'.\n"
-msgstr "Няма такава стратегия за сливане: „%s“.\n"
-
-#: builtin/merge.c:189
-#, c-format
-msgid "Available strategies are:"
-msgstr "Наличните стратегии са:"
-
-#: builtin/merge.c:194
-#, c-format
-msgid "Available custom strategies are:"
-msgstr "Допълнителните стратегии са:"
-
-#: builtin/merge.c:245 builtin/pull.c:132
-msgid "do not show a diffstat at the end of the merge"
-msgstr "без извеждане на статистиката след завършване на сливане"
-
-#: builtin/merge.c:248 builtin/pull.c:135
-msgid "show a diffstat at the end of the merge"
-msgstr "извеждане на статистиката след завършване на сливане"
-
-#: builtin/merge.c:249 builtin/pull.c:138
-msgid "(synonym to --stat)"
-msgstr "(псевдоним на „--stat“)"
-
-#: builtin/merge.c:251 builtin/pull.c:141
-msgid "add (at most <n>) entries from shortlog to merge commit message"
-msgstr ""
-"добавяне (на максимум такъв БРОЙ) записи от съкратения журнал в съобщението "
-"за подаване"
-
-#: builtin/merge.c:254 builtin/pull.c:147
-msgid "create a single commit instead of doing a merge"
-msgstr "създаване на едно подаване вместо извършване на сливане"
-
-#: builtin/merge.c:256 builtin/pull.c:150
-msgid "perform a commit if the merge succeeds (default)"
-msgstr "извършване на подаване при успешно сливане (стандартно действие)"
-
-#: builtin/merge.c:258 builtin/pull.c:153
-msgid "edit message before committing"
-msgstr "редактиране на съобщението преди подаване"
-
-#: builtin/merge.c:260
-msgid "allow fast-forward (default)"
-msgstr "позволяване на превъртане (стандартно действие)"
-
-#: builtin/merge.c:262 builtin/pull.c:160
-msgid "abort if fast-forward is not possible"
-msgstr "преустановяване, ако превъртането е невъзможно"
-
-#: builtin/merge.c:266 builtin/pull.c:163
-msgid "verify that the named commit has a valid GPG signature"
-msgstr "проверка, че указаното подаване е с правилен подпис на GPG"
-
-#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167
-#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114
-msgid "strategy"
-msgstr "СТРАТЕГИЯ"
-
-#: builtin/merge.c:268 builtin/pull.c:168
-msgid "merge strategy to use"
-msgstr "СТРАТЕГИЯ за сливане, която да се ползва"
-
-#: builtin/merge.c:269 builtin/pull.c:171
-msgid "option=value"
-msgstr "ОПЦИЯ=СТОЙНОСТ"
-
-#: builtin/merge.c:270 builtin/pull.c:172
-msgid "option for selected merge strategy"
-msgstr "ОПЦИЯ за избраната стратегия за сливане"
-
-#: builtin/merge.c:272
-msgid "merge commit message (for a non-fast-forward merge)"
-msgstr "СЪОБЩЕНИЕ при подаването със сливане (при същински сливания)"
-
-#: builtin/merge.c:279
-msgid "abort the current in-progress merge"
-msgstr "преустановяване на текущото сливане"
-
-#: builtin/merge.c:281
-msgid "--abort but leave index and working tree alone"
-msgstr "преустановяване без промяна на индекса и работното дърво"
-
-#: builtin/merge.c:283
-msgid "continue the current in-progress merge"
-msgstr "продължаване на текущото сливане"
-
-#: builtin/merge.c:285 builtin/pull.c:179
-msgid "allow merging unrelated histories"
-msgstr "позволяване на сливане на независими истории"
-
-#: builtin/merge.c:291
-msgid "bypass pre-merge-commit and commit-msg hooks"
-msgstr ""
-"без изпълнение на куките преди подаване и сливане и при промяна на "
-"съобщението за подаване (pre-merge-commit и commit-msg)"
-
-#: builtin/merge.c:308
-msgid "could not run stash."
-msgstr "не може да се извърши скатаване"
-
-#: builtin/merge.c:313
-msgid "stash failed"
-msgstr "неуспешно скатаване"
-
-#: builtin/merge.c:318
-#, c-format
-msgid "not a valid object: %s"
-msgstr "неправилен обект: „%s“"
-
-#: builtin/merge.c:340 builtin/merge.c:357
-msgid "read-tree failed"
-msgstr "неуспешно прочитане на обект-дърво"
-
-#: builtin/merge.c:387
-msgid " (nothing to squash)"
-msgstr " (няма какво да се вкара)"
-
-#: builtin/merge.c:398
-#, c-format
-msgid "Squash commit -- not updating HEAD\n"
-msgstr "Вкарано подаване — указателят „HEAD“ няма да бъде обновен\n"
-
-#: builtin/merge.c:448
-#, c-format
-msgid "No merge message -- not updating HEAD\n"
-msgstr ""
-"Липсва съобщение при подаване — указателят „HEAD“ няма да бъде обновен\n"
-
-#: builtin/merge.c:499
-#, c-format
-msgid "'%s' does not point to a commit"
-msgstr "„%s“ не сочи към подаване"
-
-#: builtin/merge.c:586
-#, c-format
-msgid "Bad branch.%s.mergeoptions string: %s"
-msgstr "Неправилен низ за настройката „branch.%s.mergeoptions“: „%s“"
-
-#: builtin/merge.c:708
-msgid "Not handling anything other than two heads merge."
-msgstr "Поддържа се само сливане на точно две истории."
-
-#: builtin/merge.c:722
-#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Непозната опция за рекурсивното сливане „merge-recursive“: „-X%s“"
-
-#: builtin/merge.c:737
-#, c-format
-msgid "unable to write %s"
-msgstr "„%s“ не може да бъде записан"
-
-#: builtin/merge.c:789
-#, c-format
-msgid "Could not read from '%s'"
-msgstr "От „%s“ не може да се чете"
-
-#: builtin/merge.c:798
-#, c-format
-msgid "Not committing merge; use 'git commit' to complete the merge.\n"
-msgstr ""
-"Сливането няма да бъде подадено. За завършването му и подаването му "
-"използвайте командата „git commit“.\n"
-
-#: builtin/merge.c:804
-msgid ""
-"Please enter a commit message to explain why this merge is necessary,\n"
-"especially if it merges an updated upstream into a topic branch.\n"
-"\n"
-msgstr ""
-"В съобщението при подаване добавете информация за причината за\n"
-"сливането, особено ако сливате обновен отдалечен клон в тематичен клон.\n"
-
-#: builtin/merge.c:809
-msgid "An empty message aborts the commit.\n"
-msgstr "Празно съобщение предотвратява подаването.\n"
-
-#: builtin/merge.c:812
-#, c-format
-msgid ""
-"Lines starting with '%c' will be ignored, and an empty message aborts\n"
-"the commit.\n"
-msgstr ""
-"Редовете, които започват с „%c“, ще бъдат пропуснати, а празно\n"
-"съобщение преустановява подаването.\n"
-
-#: builtin/merge.c:865
-msgid "Empty commit message."
-msgstr "Празно съобщение при подаване."
-
-#: builtin/merge.c:880
-#, c-format
-msgid "Wonderful.\n"
-msgstr "Първият етап на сливането завърши.\n"
-
-#: builtin/merge.c:941
-#, c-format
-msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
-msgstr ""
-"Неуспешно автоматично сливане — коригирайте конфликтите и подайте "
-"резултата.\n"
-
-#: builtin/merge.c:980
-msgid "No current branch."
-msgstr "Няма текущ клон."
-
-#: builtin/merge.c:982
-msgid "No remote for the current branch."
-msgstr "Текущият клон не следи никой."
-
-#: builtin/merge.c:984
-msgid "No default upstream defined for the current branch."
-msgstr "Текущият клон не следи никой клон."
-
-#: builtin/merge.c:989
-#, c-format
-msgid "No remote-tracking branch for %s from %s"
-msgstr "Никой клон не следи клона „%s“ от хранилището „%s“"
-
-#: builtin/merge.c:1046
-#, c-format
-msgid "Bad value '%s' in environment '%s'"
-msgstr "Неправилна стойност „%s“ в средата „%s“"
-
-#: builtin/merge.c:1149
-#, c-format
-msgid "not something we can merge in %s: %s"
-msgstr "не може да се слее в „%s“: %s"
-
-#: builtin/merge.c:1183
-msgid "not something we can merge"
-msgstr "не може да се слее"
-
-#: builtin/merge.c:1286
-msgid "--abort expects no arguments"
-msgstr "опцията „--abort“ не приема аргументи"
-
-#: builtin/merge.c:1290
-msgid "There is no merge to abort (MERGE_HEAD missing)."
-msgstr ""
-"Не може да преустановите сливане, защото в момента не се извършва такова "
-"(липсва указател „MERGE_HEAD“)."
-
-#: builtin/merge.c:1299
-msgid "--quit expects no arguments"
-msgstr "опцията „--quit“ не приема аргументи"
-
-#: builtin/merge.c:1312
-msgid "--continue expects no arguments"
-msgstr "опцията „--continue“ не приема аргументи"
-
-#: builtin/merge.c:1316
-msgid "There is no merge in progress (MERGE_HEAD missing)."
-msgstr "В момента не се извършва сливане (липсва указател „MERGE_HEAD“)."
-
-#: builtin/merge.c:1332
-msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you merge."
-msgstr ""
-"Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува).\n"
-"Подайте промените си, преди да започнете ново сливане."
-
-#: builtin/merge.c:1339
-msgid ""
-"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
-"Please, commit your changes before you merge."
-msgstr ""
-"Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n"
-"съществува). Подайте промените си, преди да започнете ново сливане."
-
-#: builtin/merge.c:1342
-msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
-msgstr ""
-"Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n"
-"съществува)."
-
-#: builtin/merge.c:1356
-msgid "You cannot combine --squash with --no-ff."
-msgstr "Опцията „--squash“ е несъвместима с „--no-ff“."
-
-#: builtin/merge.c:1358
-msgid "You cannot combine --squash with --commit."
-msgstr "Опцията „--squash“ е несъвместима с „--commit“."
-
-#: builtin/merge.c:1374
-msgid "No commit specified and merge.defaultToUpstream not set."
-msgstr ""
-"Не е указано подаване и настройката „merge.defaultToUpstream“ не е зададена."
-
-#: builtin/merge.c:1391
-msgid "Squash commit into empty head not supported yet"
-msgstr "Вкарване на подаване във връх без история все още не се поддържа"
-
-#: builtin/merge.c:1393
-msgid "Non-fast-forward commit does not make sense into an empty head"
-msgstr ""
-"Понеже върхът е без история, всички сливания са превъртания, не може да се "
-"извърши същинско сливане изисквано от опцията „--no-ff“"
-
-#: builtin/merge.c:1398
-#, c-format
-msgid "%s - not something we can merge"
-msgstr "„%s“ — не е нещо, което може да се слее"
-
-#: builtin/merge.c:1400
-msgid "Can merge only exactly one commit into empty head"
-msgstr "Можете да слеете точно едно подаване във връх без история"
-
-#: builtin/merge.c:1481
-msgid "refusing to merge unrelated histories"
-msgstr "независими истории не може да се слеят"
-
-#: builtin/merge.c:1490
-msgid "Already up to date."
-msgstr "Вече е обновено."
-
-#: builtin/merge.c:1500
-#, c-format
-msgid "Updating %s..%s\n"
-msgstr "Обновяване „%s..%s“\n"
-
-#: builtin/merge.c:1542
-#, c-format
-msgid "Trying really trivial in-index merge...\n"
-msgstr "Проба със сливане в рамките на индекса…\n"
-
-#: builtin/merge.c:1549
-#, c-format
-msgid "Nope.\n"
-msgstr "Неуспешно сливане.\n"
-
-#: builtin/merge.c:1574
-msgid "Already up to date. Yeeah!"
-msgstr "Вече е обновено!"
-
-#: builtin/merge.c:1580
-msgid "Not possible to fast-forward, aborting."
-msgstr "Не може да се извърши превъртане, преустановяване на действието."
-
-#: builtin/merge.c:1603 builtin/merge.c:1668
-#, c-format
-msgid "Rewinding the tree to pristine...\n"
-msgstr "Привеждане на дървото към първоначалното…\n"
-
-#: builtin/merge.c:1607
-#, c-format
-msgid "Trying merge strategy %s...\n"
-msgstr "Пробване със стратегията за сливане „%s“…\n"
-
-#: builtin/merge.c:1659
-#, c-format
-msgid "No merge strategy handled the merge.\n"
-msgstr "Никоя стратегия за сливане не може да извърши сливането.\n"
-
-#: builtin/merge.c:1661
-#, c-format
-msgid "Merge with strategy %s failed.\n"
-msgstr "Неуспешно сливане със стратегия „%s“.\n"
-
-#: builtin/merge.c:1670
-#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
-msgstr ""
-"Ползва се стратегията „%s“, която ще подготви дървото за коригиране на "
-"ръка.\n"
-
-#: builtin/merge.c:1682
-#, c-format
-msgid "Automatic merge went well; stopped before committing as requested\n"
-msgstr ""
-"Автоматичното сливане завърши успешно. Самото подаване не е извършено, "
-"защото бе зададена опцията „--no-commit“.\n"
-
#: builtin/merge-base.c:32
msgid "git merge-base [-a | --all] <commit> <commit>..."
msgstr "git merge-base [-a | --all] ПОДАВАНЕ ПОДАВАНЕ…"
@@ -16862,24 +17723,24 @@
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point УКАЗАТЕЛ [ПОДАВАНЕ]"
-#: builtin/merge-base.c:153
+#: builtin/merge-base.c:143
msgid "output all common ancestors"
msgstr "извеждане на всички общи предшественици"
-#: builtin/merge-base.c:155
+#: builtin/merge-base.c:145
msgid "find ancestors for a single n-way merge"
msgstr ""
"откриване на предшествениците за еднократно сливане на множество истории"
-#: builtin/merge-base.c:157
+#: builtin/merge-base.c:147
msgid "list revs not reachable from others"
msgstr "извеждане на недостижимите от другите указатели"
-#: builtin/merge-base.c:159
+#: builtin/merge-base.c:149
msgid "is the first one ancestor of the other?"
msgstr "ПОДАВАНЕ_1 предшественик ли е на ПОДАВАНЕ_2?"
-#: builtin/merge-base.c:161
+#: builtin/merge-base.c:151
msgid "find where <commit> forked from reflog of <ref>"
msgstr "откриване къде ПОДАВАНЕто се е отклонило от историята на УКАЗАТЕЛя"
@@ -16954,6 +17815,446 @@
msgid "Merging %s with %s\n"
msgstr "Сливане на „%s“ с „%s“\n"
+#: builtin/merge.c:58
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [ОПЦИЯ…] [ПОДАВАНЕ…]"
+
+#: builtin/merge.c:59
+msgid "git merge --abort"
+msgstr "git merge --abort"
+
+#: builtin/merge.c:60
+msgid "git merge --continue"
+msgstr "git merge --continue"
+
+#: builtin/merge.c:123
+msgid "switch `m' requires a value"
+msgstr "опцията „-m“ изисква стойност"
+
+#: builtin/merge.c:146
+#, c-format
+msgid "option `%s' requires a value"
+msgstr "опцията „%s“ изисква стойност"
+
+#: builtin/merge.c:199
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr "Няма такава стратегия за сливане: „%s“.\n"
+
+#: builtin/merge.c:200
+#, c-format
+msgid "Available strategies are:"
+msgstr "Наличните стратегии са:"
+
+#: builtin/merge.c:205
+#, c-format
+msgid "Available custom strategies are:"
+msgstr "Допълнителните стратегии са:"
+
+#: builtin/merge.c:256 builtin/pull.c:133
+msgid "do not show a diffstat at the end of the merge"
+msgstr "без извеждане на статистиката след завършване на сливане"
+
+#: builtin/merge.c:259 builtin/pull.c:136
+msgid "show a diffstat at the end of the merge"
+msgstr "извеждане на статистиката след завършване на сливане"
+
+#: builtin/merge.c:260 builtin/pull.c:139
+msgid "(synonym to --stat)"
+msgstr "(псевдоним на „--stat“)"
+
+#: builtin/merge.c:262 builtin/pull.c:142
+msgid "add (at most <n>) entries from shortlog to merge commit message"
+msgstr ""
+"добавяне (на максимум такъв БРОЙ) записи от съкратения журнал в съобщението "
+"за подаване"
+
+#: builtin/merge.c:265 builtin/pull.c:148
+msgid "create a single commit instead of doing a merge"
+msgstr "създаване на едно подаване вместо извършване на сливане"
+
+#: builtin/merge.c:267 builtin/pull.c:151
+msgid "perform a commit if the merge succeeds (default)"
+msgstr "извършване на подаване при успешно сливане (стандартно действие)"
+
+#: builtin/merge.c:269 builtin/pull.c:154
+msgid "edit message before committing"
+msgstr "редактиране на съобщението преди подаване"
+
+#: builtin/merge.c:271
+msgid "allow fast-forward (default)"
+msgstr "позволяване на превъртане (стандартно действие)"
+
+#: builtin/merge.c:273 builtin/pull.c:161
+msgid "abort if fast-forward is not possible"
+msgstr "преустановяване, ако превъртането е невъзможно"
+
+#: builtin/merge.c:277 builtin/pull.c:164
+msgid "verify that the named commit has a valid GPG signature"
+msgstr "проверка, че указаното подаване е с правилен подпис на GPG"
+
+#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
+#: builtin/rebase.c:541 builtin/rebase.c:1418 builtin/revert.c:114
+msgid "strategy"
+msgstr "СТРАТЕГИЯ"
+
+#: builtin/merge.c:279 builtin/pull.c:169
+msgid "merge strategy to use"
+msgstr "СТРАТЕГИЯ за сливане, която да се ползва"
+
+#: builtin/merge.c:280 builtin/pull.c:172
+msgid "option=value"
+msgstr "ОПЦИЯ=СТОЙНОСТ"
+
+#: builtin/merge.c:281 builtin/pull.c:173
+msgid "option for selected merge strategy"
+msgstr "ОПЦИЯ за избраната стратегия за сливане"
+
+#: builtin/merge.c:283
+msgid "merge commit message (for a non-fast-forward merge)"
+msgstr "СЪОБЩЕНИЕ при подаването със сливане (при същински сливания)"
+
+#: builtin/merge.c:290
+msgid "abort the current in-progress merge"
+msgstr "преустановяване на текущото сливане"
+
+#: builtin/merge.c:292
+msgid "--abort but leave index and working tree alone"
+msgstr "преустановяване без промяна на индекса и работното дърво"
+
+#: builtin/merge.c:294
+msgid "continue the current in-progress merge"
+msgstr "продължаване на текущото сливане"
+
+#: builtin/merge.c:296 builtin/pull.c:180
+msgid "allow merging unrelated histories"
+msgstr "позволяване на сливане на независими истории"
+
+#: builtin/merge.c:303
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr ""
+"без изпълнение на куките преди подаване и сливане и при промяна на "
+"съобщението за подаване (pre-merge-commit и commit-msg)"
+
+#: builtin/merge.c:320
+msgid "could not run stash."
+msgstr "не може да се извърши скатаване"
+
+#: builtin/merge.c:325
+msgid "stash failed"
+msgstr "неуспешно скатаване"
+
+#: builtin/merge.c:330
+#, c-format
+msgid "not a valid object: %s"
+msgstr "неправилен обект: „%s“"
+
+#: builtin/merge.c:352 builtin/merge.c:369
+msgid "read-tree failed"
+msgstr "неуспешно прочитане на обект-дърво"
+
+#: builtin/merge.c:399
+msgid " (nothing to squash)"
+msgstr " (няма какво да се вкара)"
+
+#: builtin/merge.c:410
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr "Вкарано подаване — указателят „HEAD“ няма да бъде обновен\n"
+
+#: builtin/merge.c:460
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr ""
+"Липсва съобщение при подаване — указателят „HEAD“ няма да бъде обновен\n"
+
+#: builtin/merge.c:511
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr "„%s“ не сочи към подаване"
+
+#: builtin/merge.c:598
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr "Неправилен низ за настройката „branch.%s.mergeoptions“: „%s“"
+
+#: builtin/merge.c:724
+msgid "Not handling anything other than two heads merge."
+msgstr "Поддържа се само сливане на точно две истории."
+
+#: builtin/merge.c:737
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr "Непозната опция за рекурсивното сливане „merge-recursive“: „-X%s“"
+
+#: builtin/merge.c:756 t/helper/test-fast-rebase.c:209
+#, c-format
+msgid "unable to write %s"
+msgstr "„%s“ не може да бъде записан"
+
+#: builtin/merge.c:808
+#, c-format
+msgid "Could not read from '%s'"
+msgstr "От „%s“ не може да се чете"
+
+#: builtin/merge.c:817
+#, c-format
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+msgstr ""
+"Сливането няма да бъде подадено. За завършването му и подаването му "
+"използвайте командата „git commit“.\n"
+
+#: builtin/merge.c:823
+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"
+
+#: builtin/merge.c:828
+msgid "An empty message aborts the commit.\n"
+msgstr "Празно съобщение предотвратява подаването.\n"
+
+#: builtin/merge.c:831
+#, c-format
+msgid ""
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
+"Редовете, които започват с „%c“, ще бъдат пропуснати, а празно\n"
+"съобщение преустановява подаването.\n"
+
+#: builtin/merge.c:884
+msgid "Empty commit message."
+msgstr "Празно съобщение при подаване."
+
+#: builtin/merge.c:899
+#, c-format
+msgid "Wonderful.\n"
+msgstr "Първият етап на сливането завърши.\n"
+
+#: builtin/merge.c:960
+#, c-format
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgstr ""
+"Неуспешно автоматично сливане — коригирайте конфликтите и подайте "
+"резултата.\n"
+
+#: builtin/merge.c:999
+msgid "No current branch."
+msgstr "Няма текущ клон."
+
+#: builtin/merge.c:1001
+msgid "No remote for the current branch."
+msgstr "Текущият клон не следи никой."
+
+#: builtin/merge.c:1003
+msgid "No default upstream defined for the current branch."
+msgstr "Текущият клон не следи никой клон."
+
+#: builtin/merge.c:1008
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
+msgstr "Никой клон не следи клона „%s“ от хранилището „%s“"
+
+#: builtin/merge.c:1065
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "Неправилна стойност „%s“ в средата „%s“"
+
+#: builtin/merge.c:1168
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr "не може да се слее в „%s“: %s"
+
+#: builtin/merge.c:1202
+msgid "not something we can merge"
+msgstr "не може да се слее"
+
+#: builtin/merge.c:1312
+msgid "--abort expects no arguments"
+msgstr "опцията „--abort“ не приема аргументи"
+
+#: builtin/merge.c:1316
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr ""
+"Не може да преустановите сливане, защото в момента не се извършва такова "
+"(липсва указател „MERGE_HEAD“)."
+
+#: builtin/merge.c:1334
+msgid "--quit expects no arguments"
+msgstr "опцията „--quit“ не приема аргументи"
+
+#: builtin/merge.c:1347
+msgid "--continue expects no arguments"
+msgstr "опцията „--continue“ не приема аргументи"
+
+#: builtin/merge.c:1351
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr "В момента не се извършва сливане (липсва указател „MERGE_HEAD“)."
+
+#: builtin/merge.c:1367
+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:1374
+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:1377
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+msgstr ""
+"Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n"
+"съществува)."
+
+#: builtin/merge.c:1391
+msgid "You cannot combine --squash with --no-ff."
+msgstr "Опцията „--squash“ е несъвместима с „--no-ff“."
+
+#: builtin/merge.c:1393
+msgid "You cannot combine --squash with --commit."
+msgstr "Опцията „--squash“ е несъвместима с „--commit“."
+
+#: builtin/merge.c:1409
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr ""
+"Не е указано подаване и настройката „merge.defaultToUpstream“ не е зададена."
+
+#: builtin/merge.c:1426
+msgid "Squash commit into empty head not supported yet"
+msgstr "Вкарване на подаване във връх без история все още не се поддържа"
+
+#: builtin/merge.c:1428
+msgid "Non-fast-forward commit does not make sense into an empty head"
+msgstr ""
+"Понеже върхът е без история, всички сливания са превъртания, не може да се "
+"извърши същинско сливане изисквано от опцията „--no-ff“"
+
+#: builtin/merge.c:1433
+#, c-format
+msgid "%s - not something we can merge"
+msgstr "„%s“ — не е нещо, което може да се слее"
+
+#: builtin/merge.c:1435
+msgid "Can merge only exactly one commit into empty head"
+msgstr "Можете да слеете точно едно подаване във връх без история"
+
+#: builtin/merge.c:1516
+msgid "refusing to merge unrelated histories"
+msgstr "независими истории не може да се слеят"
+
+#: builtin/merge.c:1525
+msgid "Already up to date."
+msgstr "Вече е обновено."
+
+#: builtin/merge.c:1535
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr "Обновяване „%s..%s“\n"
+
+#: builtin/merge.c:1581
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr "Проба със сливане в рамките на индекса…\n"
+
+#: builtin/merge.c:1588
+#, c-format
+msgid "Nope.\n"
+msgstr "Неуспешно сливане.\n"
+
+#: builtin/merge.c:1613
+msgid "Already up to date. Yeeah!"
+msgstr "Вече е обновено!"
+
+#: builtin/merge.c:1619
+msgid "Not possible to fast-forward, aborting."
+msgstr "Не може да се извърши превъртане, преустановяване на действието."
+
+#: builtin/merge.c:1647 builtin/merge.c:1712
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr "Привеждане на дървото към първоначалното…\n"
+
+#: builtin/merge.c:1651
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr "Пробване със стратегията за сливане „%s“…\n"
+
+#: builtin/merge.c:1703
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr "Никоя стратегия за сливане не може да извърши сливането.\n"
+
+#: builtin/merge.c:1705
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr "Неуспешно сливане със стратегия „%s“.\n"
+
+#: builtin/merge.c:1714
+#, c-format
+msgid "Using the %s to prepare resolving by hand.\n"
+msgstr ""
+"Ползва се стратегията „%s“, която ще подготви дървото за коригиране на "
+"ръка.\n"
+
+#: builtin/merge.c:1728
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
+msgstr ""
+"Автоматичното сливане завърши успешно. Самото подаване не е извършено, "
+"защото бе зададена опцията „--no-commit“.\n"
+
+#: builtin/mktag.c:10
+msgid "git mktag"
+msgstr "git mktag"
+
+#: builtin/mktag.c:30
+#, c-format
+msgid "warning: tag input does not pass fsck: %s"
+msgstr "ПРЕДУПРЕЖДЕНИЕ: аргументът-етикет не минава проверка с „fsck“: %s"
+
+#: builtin/mktag.c:41
+#, c-format
+msgid "error: tag input does not pass fsck: %s"
+msgstr "ГРЕШКА: аргументът-етикет не минава проверка с „fsck“: %s"
+
+#: builtin/mktag.c:44
+#, c-format
+msgid "%d (FSCK_IGNORE?) should never trigger this callback"
+msgstr "%d (FSCK_IGNORE?) никога не трябва да задейства тази функция"
+
+#: builtin/mktag.c:59
+#, c-format
+msgid "could not read tagged object '%s'"
+msgstr "обектът с етикет не може да бъде прочетен: %s"
+
+#: builtin/mktag.c:62
+#, c-format
+msgid "object '%s' tagged as '%s', but is a '%s' type"
+msgstr "обектът „%s“ е с етикет за %s, но е %s"
+
+#: builtin/mktag.c:99
+msgid "tag on stdin did not pass our strict fsck check"
+msgstr "етикетът на стандартния вход не преминава строгата проверка с „fsck“"
+
+#: builtin/mktag.c:102
+msgid "tag on stdin did not refer to a valid object"
+msgstr "етикетът на стандартния вход не сочи към правилен обект"
+
+#: builtin/mktag.c:105 builtin/tag.c:232
+msgid "unable to write tag file"
+msgstr "файлът за етикета не може да бъде запазен"
+
#: builtin/mktree.c:66
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
@@ -16992,7 +18293,10 @@
"при препакетиране пакетните файлове, които са с по-малък от този размер, да "
"се обединяват в пакети с по-голям от този размер"
-#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67
+#: builtin/multi-pack-index.c:50 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 builtin/prune-packed.c:25 builtin/tag.c:575
msgid "too many arguments"
msgstr "прекалено много аргументи"
@@ -17033,68 +18337,72 @@
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:781 builtin/repack.c:518
+#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:483
#, c-format
msgid "renaming '%s' failed"
msgstr "неуспешно преименуване на „%s“"
@@ -17112,8 +18420,8 @@
msgstr "git name-rev [ОПЦИЯ…] --stdin"
#: builtin/name-rev.c:524
-msgid "print only names (no SHA-1)"
-msgstr "извеждане само на имената (без сумите по SHA1)"
+msgid "print only ref-based names (no object names)"
+msgstr "извеждане само на имена на базата на указатели (а не имена на обекти)"
#: builtin/name-rev.c:525
msgid "only use tags to name the commits"
@@ -17288,7 +18596,7 @@
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:565
#, c-format
msgid "could not open or read '%s'"
msgstr "файлът „%s“ не може да бъде отворен или прочетен"
@@ -17331,12 +18639,6 @@
"няма да се извърши „%s“ върху бележките в „%s“, защото са извън „refs/"
"notes/“."
-#: 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."
@@ -17396,8 +18698,8 @@
"опцията „--stdin“)"
#: builtin/notes.c:517
-msgid "too few parameters"
-msgstr "прекалено малко параметри"
+msgid "too few arguments"
+msgstr "прекалено малко аргументи"
#: builtin/notes.c:538
#, c-format
@@ -17529,7 +18831,7 @@
"резултата с „git notes merge --commit“ или преустановете сливането с "
"командата „git notes merge --abort“.\n"
-#: builtin/notes.c:897 builtin/tag.c:545
+#: builtin/notes.c:897 builtin/tag.c:578
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Не може да се открие към какво сочи „%s“."
@@ -17547,7 +18849,7 @@
msgid "read object names from the standard input"
msgstr "изчитане на имената на обектите от стандартния вход"
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148
msgid "do not remove, show only"
msgstr "само извеждане без действително окастряне"
@@ -17563,125 +18865,156 @@
msgid "use notes from <notes-ref>"
msgstr "да се използва бележката сочена от този УКАЗАТЕЛ_ЗА_БЕЛЕЖКА"
-#: builtin/notes.c:1034 builtin/stash.c:1643
+#: builtin/notes.c:1034 builtin/stash.c:1671
#, 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:430
+#: builtin/pack-objects.c:440
+#, c-format
+msgid ""
+"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
+"pack %s"
+msgstr ""
+"write_reuse_object: „%s“ не може да се открие, а се очакваше при отместване "
+"%<PRIuMAX> в пакетния файл „%s“"
+
+#: builtin/pack-objects.c:448
#, c-format
msgid "bad packed object CRC for %s"
msgstr "лоша контролна сума за пакетирания обект „%s“"
-#: builtin/pack-objects.c:441
+#: builtin/pack-objects.c:459
#, c-format
msgid "corrupt packed object for %s"
msgstr "пакетиран обект с грешки за „%s“"
-#: builtin/pack-objects.c:572
+#: builtin/pack-objects.c:590
#, c-format
msgid "recursive delta detected for object %s"
msgstr "рекурсивна разлика за обект „%s“"
-#: builtin/pack-objects.c:783
+#: builtin/pack-objects.c:801
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "подредени бяха %u обекта, а се очакваха %<PRIu32>"
-#: builtin/pack-objects.c:972
+#: builtin/pack-objects.c:896
+#, c-format
+msgid "expected object at offset %<PRIuMAX> in pack %s"
+msgstr "очаква се обект при отместване %<PRIuMAX> в пакетния файл „%s“"
+
+#: builtin/pack-objects.c:1015
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"изключване на записването на битовата маска, пакетите са разделени поради "
"стойността на „pack.packSizeLimit“"
-#: builtin/pack-objects.c:985
+#: builtin/pack-objects.c:1028
msgid "Writing objects"
msgstr "Записване на обектите"
-#: builtin/pack-objects.c:1046 builtin/update-index.c:90
+#: builtin/pack-objects.c:1089 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "не може да бъде получена информация чрез „stat“ за „%s“"
-#: builtin/pack-objects.c:1099
+#: builtin/pack-objects.c:1141
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "бяха записани %<PRIu32> обекти, а се очакваха %<PRIu32>"
-#: builtin/pack-objects.c:1297
+#: builtin/pack-objects.c:1358
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
"изключване на записването на битовата маска, защото някои обекти няма да се "
"пакетират"
-#: builtin/pack-objects.c:1724
+#: builtin/pack-objects.c:1806
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "прекалено далечно начало на отместването за обектите-разлика за „%s“"
-#: builtin/pack-objects.c:1733
+#: builtin/pack-objects.c:1815
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "недостижимо начало на отместването за обектите-разлика за „%s“"
-#: builtin/pack-objects.c:2004
+#: builtin/pack-objects.c:2096
msgid "Counting objects"
msgstr "Преброяване на обектите"
-#: builtin/pack-objects.c:2149
+#: builtin/pack-objects.c:2241
#, c-format
msgid "unable to parse object header of %s"
msgstr "заглавната част на „%s“ не може да бъде анализирана"
-#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235
-#: builtin/pack-objects.c:2245
+#: builtin/pack-objects.c:2311 builtin/pack-objects.c:2327
+#: builtin/pack-objects.c:2337
#, c-format
msgid "object %s cannot be read"
msgstr "обектът „%s“ не може да се прочете"
-#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249
+#: builtin/pack-objects.c:2314 builtin/pack-objects.c:2341
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr "обектът „%s“ е с неправилна дължина (%<PRIuMAX>, а не %<PRIuMAX>)"
-#: builtin/pack-objects.c:2259
+#: builtin/pack-objects.c:2351
msgid "suboptimal pack - out of memory"
msgstr "неоптимизиран пакет — паметта свърши"
-#: builtin/pack-objects.c:2574
+#: builtin/pack-objects.c:2666
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Делта компресията ще използва до %d нишки"
-#: builtin/pack-objects.c:2713
+#: builtin/pack-objects.c:2805
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr ""
"обектите, които могат да бъдат достигнати от етикета „%s“, не може да бъдат "
"пакетирани"
-#: builtin/pack-objects.c:2801
+#: builtin/pack-objects.c:2891
msgid "Compressing objects"
msgstr "Компресиране на обектите"
-#: builtin/pack-objects.c:2807
+#: builtin/pack-objects.c:2897
msgid "inconsistency with delta count"
msgstr "неправилен брой разлики"
-#: builtin/pack-objects.c:2888
+#: builtin/pack-objects.c:2976
+#, 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:2979
+#, c-format
+msgid ""
+"object already configured in another uploadpack.blobpackfileuri (got '%s')"
+msgstr ""
+"вече има настройка за обекта в друг ред „uploadpack."
+"blobpackfileuri“ (получена е „%s“)"
+
+#: builtin/pack-objects.c:3008
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -17690,7 +19023,7 @@
"очаква се идентификатор на краен обект, а не:\n"
" %s"
-#: builtin/pack-objects.c:2894
+#: builtin/pack-objects.c:3014
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -17699,245 +19032,253 @@
"очаква се идентификатор на обект, а не:\n"
" %s"
-#: builtin/pack-objects.c:2992
+#: builtin/pack-objects.c:3112
msgid "invalid value for --missing"
msgstr "неправилна стойност за „--missing“"
-#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159
+#: builtin/pack-objects.c:3171 builtin/pack-objects.c:3279
msgid "cannot open pack index"
msgstr "индексът на пакетния файл не може да бъде отворен"
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3202
#, c-format
msgid "loose object at %s could not be examined"
msgstr "непакетираният обект в „%s“ не може да бъде анализиран"
-#: builtin/pack-objects.c:3167
+#: builtin/pack-objects.c:3287
msgid "unable to force loose object"
msgstr "оставането на обекта непакетиран не може да бъде наложено"
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3380
#, c-format
msgid "not a rev '%s'"
msgstr "„%s“ не е версия"
-#: builtin/pack-objects.c:3263
+#: builtin/pack-objects.c:3383
#, c-format
msgid "bad revision '%s'"
msgstr "неправилна версия „%s“"
-#: builtin/pack-objects.c:3288
+#: builtin/pack-objects.c:3408
msgid "unable to add recent objects"
msgstr "скорошните обекти не могат да бъдат добавени"
-#: builtin/pack-objects.c:3341
+#: builtin/pack-objects.c:3461
#, c-format
msgid "unsupported index version %s"
msgstr "неподдържана версия на индекса „%s“"
-#: builtin/pack-objects.c:3345
+#: builtin/pack-objects.c:3465
#, c-format
msgid "bad index version '%s'"
msgstr "неправилна версия на индекса „%s“"
-#: builtin/pack-objects.c:3383
+#: builtin/pack-objects.c:3503
msgid "<version>[,<offset>]"
msgstr "ВЕРСИЯ[,ОТМЕСТВАНЕ]"
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3504
msgid "write the pack index file in the specified idx format version"
msgstr ""
"запазване на индекса на пакетните файлове във форма̀та с указаната версия"
-#: builtin/pack-objects.c:3387
+#: builtin/pack-objects.c:3507
msgid "maximum size of each output pack file"
msgstr "максимален размер на всеки пакетен файл"
-#: builtin/pack-objects.c:3389
+#: builtin/pack-objects.c:3509
msgid "ignore borrowed objects from alternate object store"
msgstr "игнориране на обектите заети от други хранилища на обекти"
-#: builtin/pack-objects.c:3391
+#: builtin/pack-objects.c:3511
msgid "ignore packed objects"
msgstr "игнориране на пакетираните обекти"
-#: builtin/pack-objects.c:3393
+#: builtin/pack-objects.c:3513
msgid "limit pack window by objects"
msgstr "ограничаване на прозореца за пакетиране по брой обекти"
-#: builtin/pack-objects.c:3395
+#: builtin/pack-objects.c:3515
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"ограничаване на прозореца за пакетиране и по памет освен по брой обекти"
-#: builtin/pack-objects.c:3397
+#: builtin/pack-objects.c:3517
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
"максимална дължина на веригата от разлики, която е позволена в пакетния файл"
-#: builtin/pack-objects.c:3399
+#: builtin/pack-objects.c:3519
msgid "reuse existing deltas"
msgstr "преизползване на съществуващите разлики"
-#: builtin/pack-objects.c:3401
+#: builtin/pack-objects.c:3521
msgid "reuse existing objects"
msgstr "преизползване на съществуващите обекти"
-#: builtin/pack-objects.c:3403
+#: builtin/pack-objects.c:3523
msgid "use OFS_DELTA objects"
msgstr "използване на обекти „OFS_DELTA“"
-#: builtin/pack-objects.c:3405
+#: builtin/pack-objects.c:3525
msgid "use threads when searching for best delta matches"
msgstr ""
"стартиране на нишки за претърсване на най-добрите съвпадения на разликите"
-#: builtin/pack-objects.c:3407
+#: builtin/pack-objects.c:3527
msgid "do not create an empty pack output"
msgstr "без създаване на празен пакетен файл"
-#: builtin/pack-objects.c:3409
+#: builtin/pack-objects.c:3529
msgid "read revision arguments from standard input"
msgstr "изчитане на версиите от стандартния вход"
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:3531
msgid "limit the objects to those that are not yet packed"
msgstr "ограничаване до все още непакетираните обекти"
-#: builtin/pack-objects.c:3414
+#: builtin/pack-objects.c:3534
msgid "include objects reachable from any reference"
msgstr ""
"включване на всички обекти, които могат да се достигнат от произволен "
"указател"
-#: builtin/pack-objects.c:3417
+#: builtin/pack-objects.c:3537
msgid "include objects referred by reflog entries"
msgstr "включване и на обектите сочени от записите в журнала на указателите"
-#: builtin/pack-objects.c:3420
+#: builtin/pack-objects.c:3540
msgid "include objects referred to by the index"
msgstr "включване и на обектите сочени от индекса"
-#: builtin/pack-objects.c:3423
+#: builtin/pack-objects.c:3543
msgid "output pack to stdout"
msgstr "извеждане на пакета на стандартния изход"
-#: builtin/pack-objects.c:3425
+#: builtin/pack-objects.c:3545
msgid "include tag objects that refer to objects to be packed"
msgstr ""
"включване и на обектите-етикети, които сочат към обектите, които ще бъдат "
"пакетирани"
-#: builtin/pack-objects.c:3427
+#: builtin/pack-objects.c:3547
msgid "keep unreachable objects"
msgstr "запазване на недостижимите обекти"
-#: builtin/pack-objects.c:3429
+#: builtin/pack-objects.c:3549
msgid "pack loose unreachable objects"
msgstr "пакетиране и на недостижимите обекти"
-#: builtin/pack-objects.c:3431
+#: builtin/pack-objects.c:3551
msgid "unpack unreachable objects newer than <time>"
msgstr "разпакетиране на недостижимите обекти, които са по-нови от това ВРЕМЕ"
-#: builtin/pack-objects.c:3434
+#: builtin/pack-objects.c:3554
msgid "use the sparse reachability algorithm"
msgstr "използване на алгоритъм за частична достижимост"
-#: builtin/pack-objects.c:3436
+#: builtin/pack-objects.c:3556
msgid "create thin packs"
msgstr "създаване на съкратени пакети"
-#: builtin/pack-objects.c:3438
+#: builtin/pack-objects.c:3558
msgid "create packs suitable for shallow fetches"
msgstr "пакетиране подходящо за плитко доставяне"
-#: builtin/pack-objects.c:3440
+#: builtin/pack-objects.c:3560
msgid "ignore packs that have companion .keep file"
msgstr "игнориране на пакетите, които са придружени от файл „.keep“"
-#: builtin/pack-objects.c:3442
+#: builtin/pack-objects.c:3562
msgid "ignore this pack"
msgstr "пропускане на този пакет"
-#: builtin/pack-objects.c:3444
+#: builtin/pack-objects.c:3564
msgid "pack compression level"
msgstr "ниво на компресиране при пакетиране"
-#: builtin/pack-objects.c:3446
+#: builtin/pack-objects.c:3566
msgid "do not hide commits by grafts"
msgstr ""
"извеждане на всички родители — дори и тези, които нормално са скрити при "
"присажданията"
-#: builtin/pack-objects.c:3448
+#: builtin/pack-objects.c:3568
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"използване на съществуващи индекси на база битови маски за ускоряване на "
"преброяването на обектите"
-#: builtin/pack-objects.c:3450
+#: builtin/pack-objects.c:3570
msgid "write a bitmap index together with the pack index"
msgstr ""
"запазване и на индекс на база побитова маска, заедно с индекса за пакета"
-#: builtin/pack-objects.c:3454
+#: builtin/pack-objects.c:3574
msgid "write a bitmap index if possible"
msgstr "записване на индекси на база битови маски при възможност"
-#: builtin/pack-objects.c:3458
+#: builtin/pack-objects.c:3578
msgid "handling for missing objects"
msgstr "как да се обработват липсващите обекти"
-#: builtin/pack-objects.c:3461
+#: builtin/pack-objects.c:3581
msgid "do not pack objects in promisor packfiles"
msgstr "без пакетиране на обекти в гарантиращи пакети"
-#: builtin/pack-objects.c:3463
+#: builtin/pack-objects.c:3583
msgid "respect islands during delta compression"
msgstr "без промяна на групите при делта компресия"
-#: builtin/pack-objects.c:3492
+#: builtin/pack-objects.c:3585
+msgid "protocol"
+msgstr "протокол"
+
+#: builtin/pack-objects.c:3586
+msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
+msgstr "без ползване на настройки „uploadpack.blobpackfileuri“ с този протокол"
+
+#: builtin/pack-objects.c:3617
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "веригата с разлики е прекалено дълбока — %d, ще се ползва %d"
-#: builtin/pack-objects.c:3497
+#: builtin/pack-objects.c:3622
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr ""
"Стойността на настройката „pack.deltaCacheLimit“ е прекалено голяма. Ще се "
"ползва %d"
-#: builtin/pack-objects.c:3551
+#: builtin/pack-objects.c:3676
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
"опцията „--max-pack-size“ не може да се използва за създаване на пакетни "
"файлове за пренос"
-#: builtin/pack-objects.c:3553
+#: builtin/pack-objects.c:3678
msgid "minimum pack size limit is 1 MiB"
msgstr "минималният размер на пакетите е 1 MiB"
-#: builtin/pack-objects.c:3558
+#: builtin/pack-objects.c:3683
msgid "--thin cannot be used to build an indexable pack"
msgstr ""
"опцията „--thin“не може да се използва за създаване на пакетни файлове с "
"индекс"
-#: builtin/pack-objects.c:3561
+#: builtin/pack-objects.c:3686
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "опциите „--keep-unreachable“ и „--unpack-unreachable“ са несъвместими"
-#: builtin/pack-objects.c:3567
+#: builtin/pack-objects.c:3692
msgid "cannot use --filter without --stdout"
msgstr "опцията „-filter“ изисква „-stdout“"
-#: builtin/pack-objects.c:3627
+#: builtin/pack-objects.c:3752
msgid "Enumerating objects"
msgstr "Изброяване на обектите"
-#: builtin/pack-objects.c:3657
+#: builtin/pack-objects.c:3783
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -17946,6 +19287,20 @@
"Общо: %<PRIu32> (разлики: %<PRIu32>), преизползвани: %<PRIu32> (разлики: "
"%<PRIu32>), преизползвани при пакетиране: %<PRIu32>"
+#: builtin/pack-redundant.c:601
+msgid ""
+"'git pack-redundant' is nominated for removal.\n"
+"If you still use this command, please add an extra\n"
+"option, '--i-still-use-this', on the command line\n"
+"and let us know you still use it by sending an e-mail\n"
+"to <git@vger.kernel.org>. Thanks.\n"
+msgstr ""
+"Командата „git pack-redundant“ е остаряла и предстои\n"
+"пълното ѝ премахване. Ако все още я ползвате, добавете\n"
+"опцията „--i-still-use-this“ на командния ред и молим да\n"
+"ни известите с е-писмо до пощенския списък:\n"
+"<git@vger.kernel.org>.\n"
+
#: builtin/pack-refs.c:8
msgid "git pack-refs [<options>]"
msgstr "git pack-refs [ОПЦИЯ…]"
@@ -17958,31 +19313,27 @@
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
-msgid "expire objects older than <time>"
-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 "ограничаване на обхождането до обекти извън гарантиращи пакети"
-#: builtin/prune.c:150
+#: builtin/prune.c:152
msgid "cannot prune in a precious-objects repo"
msgstr "хранилище с важни обекти не може да се окастря"
@@ -17995,44 +19346,44 @@
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git push [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ_НА_ВЕРСИЯ…]]"
-#: builtin/pull.c:122
+#: builtin/pull.c:123
msgid "control for recursive fetching of submodules"
msgstr "управление на рекурсивното доставяне на подмодулите"
-#: builtin/pull.c:126
+#: builtin/pull.c:127
msgid "Options related to merging"
msgstr "Опции при сливане"
-#: builtin/pull.c:129
+#: builtin/pull.c:130
msgid "incorporate changes by rebasing rather than merging"
msgstr "внасяне на промените чрез пребазиране, а не чрез сливане"
-#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126
+#: builtin/pull.c:158 builtin/rebase.c:492 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "позволяване на превъртания"
-#: builtin/pull.c:166
-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:182
+#: builtin/pull.c:183
msgid "Options related to fetching"
msgstr "Опции при доставяне"
-#: builtin/pull.c:192
+#: builtin/pull.c:193
msgid "force overwrite of local branch"
msgstr "принудително презаписване на локалния клон"
-#: builtin/pull.c:200
+#: builtin/pull.c:201
msgid "number of submodules pulled in parallel"
msgstr "брой подмодули издърпани паралелно"
-#: builtin/pull.c:300
+#: builtin/pull.c:317
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Неправилна стойност за „pull.ff“: „%s“"
-#: builtin/pull.c:426
+#: builtin/pull.c:445
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -18040,14 +19391,14 @@
"Между указателите, които току що доставихте, няма подходящ кандидат, върху "
"който да пребазирате."
-#: builtin/pull.c:428
+#: builtin/pull.c:447
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"Между указателите, които току що доставихте, няма подходящ кандидат, който "
"да слеете."
-#: builtin/pull.c:429
+#: builtin/pull.c:448
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -18055,7 +19406,7 @@
"Най вероятно сте подали шаблон за указатели, който не е напаснал с нищо в "
"отдалеченото хранилище."
-#: builtin/pull.c:432
+#: builtin/pull.c:451
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -18066,44 +19417,43 @@
"Понеже това не е хранилището по подразбиране на текущия клон, трябва\n"
"да укажете отдалечения клон на командния ред."
-#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73
+#: builtin/pull.c:456 builtin/rebase.c:1253
msgid "You are not currently on a branch."
msgstr "Извън всички клони."
-#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79
+#: builtin/pull.c:458 builtin/pull.c:473
msgid "Please specify which branch you want to rebase against."
msgstr "Укажете върху кой клон искате да пребазирате."
-#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82
+#: builtin/pull.c:460 builtin/pull.c:475
msgid "Please specify which branch you want to merge with."
msgstr "Укажете кой клон искате да слеете."
-#: builtin/pull.c:442 builtin/pull.c:457
+#: builtin/pull.c:461 builtin/pull.c:476
msgid "See git-pull(1) for details."
msgstr "За повече информация погледнете ръководството „git-pull(1)“"
-#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459
-#: builtin/rebase.c:1415 git-parse-remote.sh:64
+#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
+#: builtin/rebase.c:1259
msgid "<remote>"
msgstr "ОТДАЛЕЧЕНО_ХРАНИЛИЩЕ"
-#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464
-#: git-parse-remote.sh:65
+#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
msgid "<branch>"
msgstr "КЛОН"
-#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75
+#: builtin/pull.c:471 builtin/rebase.c:1251
msgid "There is no tracking information for the current branch."
msgstr "Текущият клон не следи никой."
-#: builtin/pull.c:461 git-parse-remote.sh:95
+#: builtin/pull.c:480
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Ако искате да зададете информация за следен клон, можете да направите това с "
"командата:"
-#: builtin/pull.c:466
+#: builtin/pull.c:485
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -18112,32 +19462,57 @@
"За сливане е указан отдалеченият указател „%s“,\n"
"но такъв не е доставен."
-#: builtin/pull.c:576
+#: builtin/pull.c:596
#, c-format
msgid "unable to access commit %s"
msgstr "недостъпно подаване: %s"
-#: builtin/pull.c:857
+#: builtin/pull.c:902
msgid "ignoring --verify-signatures for rebase"
msgstr "без „--verify-signatures“ при пребазиране"
-#: builtin/pull.c:912
-msgid "--[no-]autostash option is only valid with --rebase."
-msgstr "опцията „--[no-]autostash“ изисква „--rebase“"
+#: builtin/pull.c:930
+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:920
+#: builtin/pull.c:991
msgid "Updating an unborn branch with changes added to the index."
msgstr "Обновяване на все още несъздаден клон с промените от индекса"
-#: builtin/pull.c:924
+#: builtin/pull.c:995
msgid "pull with rebase"
msgstr "издърпване с пребазиране"
-#: builtin/pull.c:925
+#: builtin/pull.c:996
msgid "please commit or stash them."
msgstr "трябва да подадете или скатаете промените."
-#: builtin/pull.c:950
+#: builtin/pull.c:1021
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -18147,7 +19522,7 @@
"доставянето обнови върха на текущия клон. Работното\n"
"ви копие бе превъртяно от подаване „%s“."
-#: builtin/pull.c:956
+#: builtin/pull.c:1027
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -18164,15 +19539,15 @@
" git reset --hard\n"
"за връщане към нормално състояние."
-#: builtin/pull.c:971
+#: builtin/pull.c:1042
msgid "Cannot merge multiple branches into empty head."
msgstr "Не може да сливате множество клони в празен върхов указател."
-#: builtin/pull.c:975
+#: builtin/pull.c:1046
msgid "Cannot rebase onto multiple branches."
msgstr "Не може да пребазирате върху повече от един клон."
-#: builtin/pull.c:982
+#: builtin/pull.c:1067
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"пребазирането е невъзможно заради локално записаните промени по подмодулите"
@@ -18181,15 +19556,15 @@
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ_НА_ВЕРСИЯ…]]"
-#: builtin/push.c:112
+#: builtin/push.c:111
msgid "tag shorthand without <tag>"
msgstr "съкращение за етикет без ЕТИКЕТ"
-#: builtin/push.c:122
+#: builtin/push.c:119
msgid "--delete only accepts plain target ref names"
msgstr "опцията „--delete“ приема за цел само прости имена на указатели"
-#: builtin/push.c:168
+#: builtin/push.c:164
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -18198,7 +19573,7 @@
"За да включите тази опция за постоянно, погледнете документацията за "
"настройката „push.default“ в „git help config“."
-#: builtin/push.c:171
+#: builtin/push.c:167
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -18223,7 +19598,7 @@
" git push %s HEAD\n"
"%s"
-#: builtin/push.c:186
+#: builtin/push.c:182
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -18237,7 +19612,7 @@
"\n"
" git push %s HEAD:ИМЕ_НА_ОТДАЛЕЧЕНИЯ_КЛОН\n"
-#: builtin/push.c:200
+#: builtin/push.c:194
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -18251,14 +19626,14 @@
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:208
+#: builtin/push.c:202
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
"Текущият клон „%s“ следи няколко отдалечени клона, не можете просто да "
"изтласкате."
-#: builtin/push.c:211
+#: builtin/push.c:205
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -18270,14 +19645,14 @@
"Трябва да укажете коя версия да се изтласка, за обновяване на отдалечения "
"клон."
-#: builtin/push.c:270
+#: 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:277
+#: 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"
@@ -18291,7 +19666,7 @@
"преди отново да изтласкате промените. За повече информация вижте раздела\n"
"„Note about fast-forwards“ в страницата от ръководството „git push --help“."
-#: builtin/push.c:283
+#: 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"
@@ -18305,7 +19680,7 @@
"информация погледнете раздела „Note about fast-forwards“ в страницата от\n"
"ръководството „git push --help“."
-#: builtin/push.c:289
+#: 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"
@@ -18324,14 +19699,14 @@
"страницата\n"
"от ръководството „git push --help“."
-#: builtin/push.c:296
+#: builtin/push.c:286
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
"Изтласкването е отхвърлено, защото в отдалеченото хранилище съществува "
"етикет,\n"
"който ще припокриете с етикет от вашето хранилище."
-#: builtin/push.c:299
+#: 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"
@@ -18341,102 +19716,118 @@
"указател, който вече сочи към обект, който не е подаване, както и тепърва\n"
"да го промените да сочи към подобен обект.\n"
-#: builtin/push.c:360
+#: builtin/push.c:294
+msgid ""
+"Updates were rejected because the tip of the remote-tracking\n"
+"branch has been updated since the last checkout. You may want\n"
+"to integrate those changes locally (e.g., 'git pull ...')\n"
+"before forcing an update.\n"
+msgstr ""
+"Обновяването е отхвърлено, защото върхът на следящия клон е обновяван след\n"
+"последното изтегляне. Внесете отдалечените промени (напр. с командата\n"
+"„git pull…“), преди отново принудително да изтласкате промените.\n"
+
+#: builtin/push.c:364
#, c-format
msgid "Pushing to %s\n"
msgstr "Изтласкване към „%s“\n"
-#: builtin/push.c:367
+#: builtin/push.c:371
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "част от указателите не бяха изтласкани към „%s“"
-#: builtin/push.c:542
+#: builtin/push.c:553
msgid "repository"
msgstr "хранилище"
-#: builtin/push.c:543 builtin/send-pack.c:164
+#: builtin/push.c:554 builtin/send-pack.c:189
msgid "push all refs"
msgstr "изтласкване на всички указатели"
-#: builtin/push.c:544 builtin/send-pack.c:166
+#: builtin/push.c:555 builtin/send-pack.c:191
msgid "mirror all refs"
msgstr "огледално копие на всички указатели"
-#: builtin/push.c:546
+#: builtin/push.c:557
msgid "delete refs"
msgstr "изтриване на указателите"
-#: builtin/push.c:547
+#: builtin/push.c:558
msgid "push tags (can't be used with --all or --mirror)"
msgstr "изтласкване на етикетите (несъвместимо с опциите „--all“ и „--mirror“)"
-#: builtin/push.c:550 builtin/send-pack.c:167
+#: builtin/push.c:561 builtin/send-pack.c:192
msgid "force updates"
msgstr "принудително обновяване"
-#: builtin/push.c:552 builtin/send-pack.c:181
+#: builtin/push.c:562 builtin/send-pack.c:204
msgid "<refname>:<expect>"
msgstr "ИМЕ_НА_УКАЗАТЕЛ:ОЧАКВАНА_СТОЙНОСТ"
-#: builtin/push.c:553 builtin/send-pack.c:182
+#: builtin/push.c:563 builtin/send-pack.c:205
msgid "require old value of ref to be at this value"
msgstr "УКАЗАТЕЛят трябва първоначално да е с тази ОЧАКВАНА_СТОЙНОСТ"
-#: builtin/push.c:556
+#: builtin/push.c:566 builtin/send-pack.c:208
+msgid "require remote updates to be integrated locally"
+msgstr ""
+"изискване обновяванията в отдалечените хранилища да се внасят и в локалното"
+
+#: builtin/push.c:569
msgid "control recursive pushing of submodules"
msgstr "управление на рекурсивното изтласкване на подмодулите"
-#: builtin/push.c:558 builtin/send-pack.c:175
+#: builtin/push.c:570 builtin/send-pack.c:199
msgid "use thin pack"
msgstr "използване на съкратени пакети"
-#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161
-#: builtin/send-pack.c:162
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
+#: builtin/send-pack.c:187
msgid "receive pack program"
msgstr "програма за получаването на пакети"
-#: builtin/push.c:561
+#: builtin/push.c:573
msgid "set upstream for git pull/status"
msgstr "задаване на отдалеченото хранилище за командите „git pull/status“"
-#: builtin/push.c:564
+#: builtin/push.c:576
msgid "prune locally removed refs"
msgstr "окастряне на указателите, които са премахнати от локалното хранилище"
-#: builtin/push.c:566
+#: builtin/push.c:578
msgid "bypass pre-push hook"
msgstr "без изпълнение на куката преди изтласкване (pre-push)"
-#: builtin/push.c:567
+#: builtin/push.c:579
msgid "push missing but relevant tags"
msgstr ""
"изтласкване на липсващите в отдалеченото хранилище, но свързани с текущото "
"изтласкване, етикети"
-#: builtin/push.c:570 builtin/send-pack.c:169
+#: builtin/push.c:581 builtin/send-pack.c:193
msgid "GPG sign the push"
msgstr "подписване на изтласкването с GPG"
-#: builtin/push.c:572 builtin/send-pack.c:176
+#: builtin/push.c:583 builtin/send-pack.c:200
msgid "request atomic transaction on remote side"
msgstr "изискване на атомарни операции от отсрещната страна"
-#: builtin/push.c:590
+#: builtin/push.c:601
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr ""
"опцията „--delete“ е несъвместима с опциите „--all“, „--mirror“ и „--tags“"
-#: builtin/push.c:592
+#: builtin/push.c:603
msgid "--delete doesn't make sense without any refs"
msgstr "опцията „--delete“ изисква поне един указател на версия"
-#: builtin/push.c:612
+#: builtin/push.c:623
#, c-format
msgid "bad repository '%s'"
msgstr "неправилно указано хранилище „%s“"
-#: builtin/push.c:613
+#: builtin/push.c:624
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -18458,68 +19849,76 @@
"\n"
" git push ИМЕ\n"
-#: builtin/push.c:628
+#: builtin/push.c:639
msgid "--all and --tags are incompatible"
msgstr "опциите „--all“ и „--tags“ са несъвместими"
-#: builtin/push.c:630
+#: builtin/push.c:641
msgid "--all can't be combined with refspecs"
msgstr "опцията „--all“ е несъвместима с указването на версия"
-#: builtin/push.c:634
+#: builtin/push.c:645
msgid "--mirror and --tags are incompatible"
msgstr "опциите „--mirror“ и „--tags“ са несъвместими"
-#: builtin/push.c:636
+#: builtin/push.c:647
msgid "--mirror can't be combined with refspecs"
msgstr "опцията „--mirror“ е несъвместима с указването на версия"
-#: builtin/push.c:639
+#: builtin/push.c:650
msgid "--all and --mirror are incompatible"
msgstr "опциите „--all“ и „--mirror“ са несъвместими"
-#: builtin/push.c:643
+#: builtin/push.c:657
msgid "push options must not have new line characters"
msgstr "опциите за изтласкване не трябва да съдържат знак за нов ред"
-#: builtin/range-diff.c:8
+#: builtin/range-diff.c:9
msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
msgstr "git range-diff [ОПЦИЯ…] СТАРА_БАЗА..СТАР_ВРЪХ НОВА_БАЗА..НОВ_ВРЪХ"
-#: builtin/range-diff.c:9
+#: builtin/range-diff.c:10
msgid "git range-diff [<options>] <old-tip>...<new-tip>"
msgstr "git range-diff [ОПЦИЯ…] СТАР_ВРЪХ...НОВ_ВРЪХ"
-#: builtin/range-diff.c:10
+#: builtin/range-diff.c:11
msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
msgstr "git range-diff [ОПЦИЯ…] БАЗА СТАР_ВРЪХ НОВ_ВРЪХ"
-#: builtin/range-diff.c:22
+#: builtin/range-diff.c:28
msgid "Percentage by which creation is weighted"
msgstr "Процент за оценка на създаването"
-#: builtin/range-diff.c:24
+#: builtin/range-diff.c:30
msgid "use simple diff colors"
msgstr "използване на прости цветове за разликите"
-#: builtin/range-diff.c:26
+#: builtin/range-diff.c:32
msgid "notes"
msgstr "бележки"
-#: builtin/range-diff.c:26
+#: builtin/range-diff.c:32
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:35
+msgid "only emit output related to the first range"
+msgstr "извеждане само на информацията за първия диапазон"
-#: builtin/range-diff.c:64
+#: builtin/range-diff.c:37
+msgid "only emit output related to the second range"
+msgstr "извеждане само на информацията за втория диапазон"
+
+#: builtin/range-diff.c:60 builtin/range-diff.c:64
+#, c-format
+msgid "not a commit range: '%s'"
+msgstr "не е диапазон с подавания: „%s“"
+
+#: builtin/range-diff.c:74
msgid "single arg format must be symmetric range"
msgstr "вариантът с единствен аргумент изисква симетричен диапазон"
-#: builtin/range-diff.c:79
+#: builtin/range-diff.c:89
msgid "need two commit ranges"
msgstr "необходими са два диапазона с подавания"
@@ -18606,7 +20005,7 @@
msgid "You need to resolve your current index first"
msgstr "Първо трябва да коригирате индекса си"
-#: builtin/rebase.c:32
+#: builtin/rebase.c:35
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
"[<upstream> [<branch>]]"
@@ -18614,221 +20013,207 @@
"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:175 builtin/rebase.c:199 builtin/rebase.c:226
+#: builtin/rebase.c:195 builtin/rebase.c:219 builtin/rebase.c:246
#, c-format
msgid "unusable todo list: '%s'"
msgstr "неуспешно изтриване на списъка за изпълнение: „%s“"
-#: builtin/rebase.c:292
+#: builtin/rebase.c:312
#, c-format
msgid "could not create temporary %s"
msgstr "не може да се създаде временна директория „%s“"
-#: builtin/rebase.c:298
+#: builtin/rebase.c:318
msgid "could not mark as interactive"
msgstr "невъзможно задаване на интерактивна работа"
-#: builtin/rebase.c:352
+#: builtin/rebase.c:371
msgid "could not generate todo list"
msgstr "файлът с командите не може да се генерира"
-#: builtin/rebase.c:391
+#: builtin/rebase.c:413
msgid "a base commit must be provided with --upstream or --onto"
msgstr "опциите „--upstream“ и „--onto“ изискват базово подаване"
-#: builtin/rebase.c:461
+#: builtin/rebase.c:482
msgid "git rebase--interactive [<options>]"
msgstr "git rebase--interactive [ОПЦИЯ…]"
-#: builtin/rebase.c:474 builtin/rebase.c:1550
-msgid "(DEPRECATED) keep empty commits"
-msgstr "(ОСТАРЯЛО) запазване на празните подавания"
+#: builtin/rebase.c:495 builtin/rebase.c:1394
+msgid "keep commits which start empty"
+msgstr "запазванe на първоначално празните подавания"
-#: builtin/rebase.c:478 builtin/revert.c:128
+#: builtin/rebase.c:499 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr "позволяване на празни съобщения при подаване"
-#: builtin/rebase.c:480
+#: builtin/rebase.c:501
msgid "rebase merge commits"
msgstr "пребазиране на подаванията със сливания"
-#: builtin/rebase.c:482
+#: builtin/rebase.c:503
msgid "keep original branch points of cousins"
msgstr ""
"запазване на първоначалните точки на разклоняване на сестринските клони"
-#: builtin/rebase.c:484
+#: builtin/rebase.c:505
msgid "move commits that begin with squash!/fixup!"
msgstr "преместване на подаванията, които започват със „squash!“/“fixup!“"
-#: builtin/rebase.c:485
+#: builtin/rebase.c:506
msgid "sign commits"
msgstr "подписване на подаванията"
-#: builtin/rebase.c:487 builtin/rebase.c:1490
+#: builtin/rebase.c:508 builtin/rebase.c:1333
msgid "display a diffstat of what changed upstream"
msgstr "извеждане на статистика с промените в следения клон"
-#: builtin/rebase.c:489
+#: builtin/rebase.c:510
msgid "continue rebase"
msgstr "продължаване на пребазирането"
-#: builtin/rebase.c:491
+#: builtin/rebase.c:512
msgid "skip commit"
msgstr "прескачане на подаване"
-#: builtin/rebase.c:492
+#: builtin/rebase.c:513
msgid "edit the todo list"
msgstr "редактиране на списъка с команди за изпълнение"
-#: builtin/rebase.c:494
+#: builtin/rebase.c:515
msgid "show the current patch"
msgstr "извеждане на текущата кръпка"
-#: builtin/rebase.c:497
+#: builtin/rebase.c:518
msgid "shorten commit ids in the todo list"
msgstr "съкратени идентификатори в списъка за изпълнение"
-#: builtin/rebase.c:499
+#: builtin/rebase.c:520
msgid "expand commit ids in the todo list"
msgstr "пълни идентификатори в списъка за изпълнение"
-#: builtin/rebase.c:501
+#: builtin/rebase.c:522
msgid "check the todo list"
msgstr "проверка на списъка за изпълнение"
-#: builtin/rebase.c:503
+#: builtin/rebase.c:524
msgid "rearrange fixup/squash lines"
msgstr ""
"преподреждане на редовете за вкарване на подаванията подаванията в "
"предходните им със и без смени на съобщението"
-#: builtin/rebase.c:505
+#: builtin/rebase.c:526
msgid "insert exec commands in todo list"
msgstr "вмъкване на командите за изпълнение в списъка за изпълнение"
-#: builtin/rebase.c:506
+#: builtin/rebase.c:527
msgid "onto"
msgstr "върху"
-#: builtin/rebase.c:509
+#: builtin/rebase.c:530
msgid "restrict-revision"
msgstr "ограничена версия"
-#: builtin/rebase.c:509
+#: builtin/rebase.c:530
msgid "restrict revision"
msgstr "ограничена версия"
-#: builtin/rebase.c:511
+#: builtin/rebase.c:532
msgid "squash-onto"
msgstr "подаване, в което другите да се вкарат"
-#: builtin/rebase.c:512
+#: builtin/rebase.c:533
msgid "squash onto"
msgstr "подаване, в което другите да се вкарат"
-#: builtin/rebase.c:514
+#: builtin/rebase.c:535
msgid "the upstream commit"
msgstr "подаване на източника"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:537
msgid "head-name"
msgstr "име на върха"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:537
msgid "head name"
msgstr "име на върха"
-#: builtin/rebase.c:521
+#: builtin/rebase.c:542
msgid "rebase strategy"
msgstr "стратегия на пребазиране"
-#: builtin/rebase.c:522
+#: builtin/rebase.c:543
msgid "strategy-opts"
msgstr "опции на стратегията"
-#: builtin/rebase.c:523
+#: builtin/rebase.c:544
msgid "strategy options"
msgstr "опции на стратегията"
-#: builtin/rebase.c:524
+#: builtin/rebase.c:545
msgid "switch-to"
msgstr "преминаване към"
-#: builtin/rebase.c:525
+#: builtin/rebase.c:546
msgid "the branch or commit to checkout"
msgstr "клонът, към който да се премине"
-#: builtin/rebase.c:526
+#: builtin/rebase.c:547
msgid "onto-name"
msgstr "име на база"
-#: builtin/rebase.c:526
+#: builtin/rebase.c:547
msgid "onto name"
msgstr "име на база"
-#: builtin/rebase.c:527
+#: builtin/rebase.c:548
msgid "cmd"
msgstr "команда"
-#: builtin/rebase.c:527
+#: builtin/rebase.c:548
msgid "the command to run"
msgstr "команда за изпълнение"
-#: builtin/rebase.c:530 builtin/rebase.c:1584
+#: builtin/rebase.c:551 builtin/rebase.c:1427
msgid "automatically re-schedule any `exec` that fails"
msgstr ""
"автоматично подаване за повторно изпълнение на командите завършили с неуспех"
-#: builtin/rebase.c:546
+#: builtin/rebase.c:567
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr "опциите „--[no-]rebase-cousins“ изискват опцията „--rebase-merges“"
-#: builtin/rebase.c:562
+#: builtin/rebase.c:583
#, c-format
-msgid "%s requires an interactive rebase"
-msgstr "„%s“ изисква интерактивно пребазиране"
+msgid "%s requires the merge backend"
+msgstr "„%s“ изисква пребазиране"
-#: builtin/rebase.c:612
+#: builtin/rebase.c:626
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "не може да се премине към новата база, зададена с „onto“: „%s“"
-#: builtin/rebase.c:627
+#: builtin/rebase.c:643
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "неправилен указател към първоначален връх „orig-head“: „%s“"
-#: builtin/rebase.c:652
+#: builtin/rebase.c:668
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "неправилната стойност на „allow_rerere_autoupdate“ се прескача: „%s“"
-#: builtin/rebase.c:728
-#, c-format
-msgid "Could not read '%s'"
-msgstr "Пътят „%s“ не може да бъде прочетен"
-
-#: builtin/rebase.c:746
-#, c-format
-msgid "Cannot store %s"
-msgstr "„%s“ не може да бъде запазен"
-
-#: builtin/rebase.c:853
-msgid "could not determine HEAD revision"
-msgstr "не може да се определи към какво да сочи указателят „HEAD“"
-
-#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -18842,7 +20227,7 @@
"За да откажете пребазирането и да се върнете към първоначалното състояние,\n"
"изпълнете „git rebase --abort“."
-#: builtin/rebase.c:1058
+#: builtin/rebase.c:896
#, c-format
msgid ""
"\n"
@@ -18860,7 +20245,7 @@
"\n"
"В резултат те не могат да се пребазират."
-#: builtin/rebase.c:1383
+#: builtin/rebase.c:1227
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -18869,7 +20254,7 @@
"неправилна стойност „%s“: вариантите са „drop“ (прескачане), "
"„keep“ (запазване) и „ask“ (питане)"
-#: builtin/rebase.c:1401
+#: builtin/rebase.c:1245
#, c-format
msgid ""
"%s\n"
@@ -18886,7 +20271,7 @@
" git rebase КЛОН\n"
"\n"
-#: builtin/rebase.c:1417
+#: builtin/rebase.c:1261
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -18899,143 +20284,154 @@
"\n"
" git branch --set-upstream-to=%s/КЛОН %s\n"
-#: builtin/rebase.c:1447
+#: builtin/rebase.c:1291
msgid "exec commands cannot contain newlines"
msgstr "командите за изпълнение не може да съдържат нови редове"
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1295
msgid "empty exec command"
msgstr "празна команда за изпълнение"
-#: builtin/rebase.c:1481
+#: builtin/rebase.c:1324
msgid "rebase onto given branch instead of upstream"
msgstr "пребазиране върху зададения, а не следения клон"
-#: builtin/rebase.c:1483
+#: builtin/rebase.c:1326
msgid "use the merge-base of upstream and branch as the current base"
msgstr "за текуща база да се ползва базата за сливане на клона и следеното"
-#: builtin/rebase.c:1485
+#: builtin/rebase.c:1328
msgid "allow pre-rebase hook to run"
msgstr "позволяване на куката преди пребазиране да се изпълни"
-#: builtin/rebase.c:1487
+#: builtin/rebase.c:1330
msgid "be quiet. implies --no-stat"
msgstr "без извеждане на информация. Включва опцията „--no-stat“"
-#: builtin/rebase.c:1493
+#: builtin/rebase.c:1336
msgid "do not show diffstat of what changed upstream"
msgstr "без извеждане на статистика с промените в следения клон"
-#: builtin/rebase.c:1496
-msgid "add a Signed-off-by: line to each commit"
-msgstr ""
-"добавяне на ред за подпис „Signed-off-by“ в съобщението на всяко подаване"
+#: builtin/rebase.c:1339
+msgid "add a Signed-off-by trailer to each commit"
+msgstr "добавяне на епилог за подпис „Signed-off-by“ към всяко подаване"
-#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504
-msgid "passed to 'git am'"
-msgstr "подава се на командата „git am“"
+#: builtin/rebase.c:1342
+msgid "make committer date match author date"
+msgstr "датата на подаващия да отговаря на датата на автора"
-#: builtin/rebase.c:1506 builtin/rebase.c:1508
+#: builtin/rebase.c:1344
+msgid "ignore author date and use current date"
+msgstr "да се ползва днешна дата, а не тази на автора"
+
+#: builtin/rebase.c:1346
+msgid "synonym of --reset-author-date"
+msgstr "псевдоним на „--reset-author-date“"
+
+#: builtin/rebase.c:1348 builtin/rebase.c:1352
msgid "passed to 'git apply'"
msgstr "подава се на командата „git apply“"
-#: builtin/rebase.c:1510 builtin/rebase.c:1513
+#: builtin/rebase.c:1350
+msgid "ignore changes in whitespace"
+msgstr "без промени в празните знаци"
+
+#: builtin/rebase.c:1354 builtin/rebase.c:1357
msgid "cherry-pick all commits, even if unchanged"
msgstr "отбиране на всички подавания дори да няма промени"
-#: builtin/rebase.c:1515
+#: builtin/rebase.c:1359
msgid "continue"
msgstr "продължаване"
-#: builtin/rebase.c:1518
+#: builtin/rebase.c:1362
msgid "skip current patch and continue"
msgstr "прескачане на текущата кръпка и продължаване"
-#: builtin/rebase.c:1520
+#: builtin/rebase.c:1364
msgid "abort and check out the original branch"
msgstr "преустановяване и възстановяване на първоначалния клон"
-#: builtin/rebase.c:1523
+#: builtin/rebase.c:1367
msgid "abort but keep HEAD where it is"
msgstr "преустановяване без промяна към какво сочи „HEAD“"
-#: builtin/rebase.c:1524
+#: builtin/rebase.c:1368
msgid "edit the todo list during an interactive rebase"
msgstr "редактиране на файла с команди при интерактивно пребазиране"
-#: builtin/rebase.c:1527
+#: builtin/rebase.c:1371
msgid "show the patch file being applied or merged"
msgstr "показване на кръпката, която се прилага или слива"
-#: builtin/rebase.c:1530
+#: builtin/rebase.c:1374
msgid "use apply strategies to rebase"
msgstr "при пребазиране да се ползва стратегия с прилагане"
-#: builtin/rebase.c:1534
+#: builtin/rebase.c:1378
msgid "use merging strategies to rebase"
msgstr "при пребазиране да се ползва стратегия със сливане"
-#: builtin/rebase.c:1538
+#: builtin/rebase.c:1382
msgid "let the user edit the list of commits to rebase"
msgstr ""
"позволяване на потребителя да редактира списъка с подавания за пребазиране"
-#: builtin/rebase.c:1542
+#: builtin/rebase.c:1386
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "(ОСТАРЯЛО) пресъздаване на сливанията вместо да се прескачат"
-#: builtin/rebase.c:1547
+#: builtin/rebase.c:1391
msgid "how to handle commits that become empty"
msgstr "как да се обработват оказалите се празни подавания"
-#: builtin/rebase.c:1554
+#: builtin/rebase.c:1398
msgid "move commits that begin with squash!/fixup! under -i"
msgstr ""
"преместване на подаванията, които започват със „squash!“/“fixup!“ при „-i“"
-#: builtin/rebase.c:1560
-msgid "automatically stash/stash pop before and after"
-msgstr "автоматично скатаване/прилагане на скатаното преди и след пребазиране"
-
-#: builtin/rebase.c:1562
+#: builtin/rebase.c:1405
msgid "add exec lines after each commit of the editable list"
msgstr ""
"добавяне на редове с команди за изпълнение след всяко подаване в "
"редактирания списък"
-#: builtin/rebase.c:1566
+#: builtin/rebase.c:1409
msgid "allow rebasing commits with empty messages"
msgstr "позволяване на пребазиране на подавания с празни съобщения"
-#: builtin/rebase.c:1570
+#: builtin/rebase.c:1413
msgid "try to rebase merges instead of skipping them"
msgstr "опит за пребазиране на сливанията вместо те да се прескачат"
-#: builtin/rebase.c:1573
+#: builtin/rebase.c:1416
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr ""
"за доуточняването на следения клон, използвайте:\n"
"\n"
" git merge-base --fork-point"
-#: builtin/rebase.c:1575
+#: builtin/rebase.c:1418
msgid "use the given merge strategy"
msgstr "използване на зададената стратегията на сливане"
-#: builtin/rebase.c:1577 builtin/revert.c:115
+#: builtin/rebase.c:1420 builtin/revert.c:115
msgid "option"
msgstr "опция"
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1421
msgid "pass the argument through to the merge strategy"
msgstr "аргументът да се подаде на стратегията за сливане"
-#: builtin/rebase.c:1581
+#: builtin/rebase.c:1424
msgid "rebase all reachable commits up to the root(s)"
msgstr "пребазиране на всички достижими подавания до началното им подаване"
-#: builtin/rebase.c:1598
+#: builtin/rebase.c:1429
+msgid "apply all changes, even those already present upstream"
+msgstr "прилагане на всички промени, дори и наличните вече в следеното"
+
+#: builtin/rebase.c:1446
msgid ""
"the rebase.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
@@ -19043,41 +20439,45 @@
"поддръжката на „rebase.useBuiltin“ е премахната.\n"
"За повече информация вижте „git help config“."
-#: builtin/rebase.c:1604
+#: builtin/rebase.c:1452
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr ""
"Изглежда, че сега се прилагат кръпки чрез командата „git-am“. Не може да "
"пребазирате в момента."
-#: builtin/rebase.c:1645
+#: builtin/rebase.c:1493
msgid ""
"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr ""
"Опцията „--preserve-merges“ е остаряла. Ползвайте „--rebase-merges“ вместо "
"нея."
-#: builtin/rebase.c:1650
+#: builtin/rebase.c:1498
msgid "cannot combine '--keep-base' with '--onto'"
msgstr "опциите „--keep-base“ и „--onto“ са несъвместими"
-#: builtin/rebase.c:1652
+#: builtin/rebase.c:1500
msgid "cannot combine '--keep-base' with '--root'"
msgstr "опциите „--keep-base“ и „--root“ са несъвместими"
-#: builtin/rebase.c:1656
+#: builtin/rebase.c:1504
+msgid "cannot combine '--root' with '--fork-point'"
+msgstr "опциите „--root“ и „--fork-point“ са несъвместими"
+
+#: builtin/rebase.c:1507
msgid "No rebase in progress?"
msgstr "Изглежда в момента не тече пребазиране"
-#: builtin/rebase.c:1660
+#: builtin/rebase.c:1511
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"Опцията „--edit-todo“ е достъпна само по време на интерактивно пребазиране."
-#: builtin/rebase.c:1683
+#: builtin/rebase.c:1534 t/helper/test-fast-rebase.c:123
msgid "Cannot read HEAD"
msgstr "Указателят „HEAD“ не може да бъде прочетен"
-#: builtin/rebase.c:1695
+#: builtin/rebase.c:1546
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -19085,16 +20485,16 @@
"Трябва да редактирате всички конфликти при сливането. След това\n"
"отбележете коригирането им чрез командата „git add“"
-#: builtin/rebase.c:1714
+#: builtin/rebase.c:1565
msgid "could not discard worktree changes"
msgstr "промените в работното дърво не могат да бъдат занулени"
-#: builtin/rebase.c:1733
+#: builtin/rebase.c:1584
#, c-format
msgid "could not move back to %s"
msgstr "връщането към „%s“ е невъзможно"
-#: builtin/rebase.c:1778
+#: builtin/rebase.c:1630
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -19115,170 +20515,147 @@
"за\n"
"да не загубите случайно промени.\n"
-#: builtin/rebase.c:1806
+#: builtin/rebase.c:1658
msgid "switch `C' expects a numerical value"
msgstr "опцията „C“ очаква число за аргумент"
-#: builtin/rebase.c:1847
+#: builtin/rebase.c:1700
#, c-format
msgid "Unknown mode: %s"
msgstr "Неизвестна стратегия: „%s“"
-#: builtin/rebase.c:1869
+#: builtin/rebase.c:1739
msgid "--strategy requires --merge or --interactive"
msgstr ""
"опцията „--strategy“ изисква някоя от опциите „--merge“ или „--interactive“"
-#: builtin/rebase.c:1899
+#: builtin/rebase.c:1769
msgid "cannot combine apply options with merge options"
msgstr "опциите за „apply“ са несъвместими с опциите за сливане"
-#: builtin/rebase.c:1912
+#: builtin/rebase.c:1782
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "Непозната реализация на пребазиране: %s"
-#: builtin/rebase.c:1937
+#: builtin/rebase.c:1812
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr ""
"опцията „--reschedule-failed-exec“ изисква някоя от опциите „--exec“ или „--"
"interactive“"
-#: builtin/rebase.c:1957
+#: builtin/rebase.c:1832
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr "опциите „--preserve-merges“ и „--rebase-merges“ са несъвместими"
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1836
msgid ""
"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
"ГРЕШКА: опциите „--preserve-merges“ и „--reschedule-failed-exec“ са "
"несъвместими"
-#: builtin/rebase.c:1985
+#: builtin/rebase.c:1860
#, c-format
msgid "invalid upstream '%s'"
msgstr "неправилен следен клон: „%s“"
-#: builtin/rebase.c:1991
+#: builtin/rebase.c:1866
msgid "Could not create new root commit"
msgstr "Не може да се създаде ново начално подаване"
-#: builtin/rebase.c:2017
+#: builtin/rebase.c:1892
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "„%s“: изисква се точно една база за сливане с клона"
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1895
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "„%s“: изисква се точно една база за пребазиране"
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1903
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "Указателят „%s“ не сочи към подаване"
-#: builtin/rebase.c:2054
+#: builtin/rebase.c:1931
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "ФАТАЛНА ГРЕШКА: не съществува клон „%s“"
-#: builtin/rebase.c:2062 builtin/submodule--helper.c:40
-#: builtin/submodule--helper.c:1990
+#: builtin/rebase.c:1939 builtin/submodule--helper.c:40
+#: builtin/submodule--helper.c:2414
#, c-format
msgid "No such ref: %s"
msgstr "Такъв указател няма: %s"
-#: builtin/rebase.c:2073
+#: builtin/rebase.c:1950
msgid "Could not resolve HEAD to a revision"
msgstr "Подаването, сочено от указателя „HEAD“, не може да бъде открито"
-#: builtin/rebase.c:2111
-msgid "Cannot autostash"
-msgstr "Не може да се скатае автоматично"
-
-#: builtin/rebase.c:2114
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr "Неочакван резултат при скатаване: „%s“"
-
-#: builtin/rebase.c:2120
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr "Директорията за „%s“ не може да бъде създадена"
-
-#: builtin/rebase.c:2123
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr "Автоматично скатано: „%s“\n"
-
-#: builtin/rebase.c:2126
-msgid "could not reset --hard"
-msgstr "неуспешно изпълнение на „git reset --hard“"
-
-#: builtin/rebase.c:2135
+#: builtin/rebase.c:1971
msgid "Please commit or stash them."
msgstr "Промените трябва или да се подадат, или да се скатаят."
-#: builtin/rebase.c:2169
+#: builtin/rebase.c:2007
#, c-format
msgid "could not switch to %s"
msgstr "не може да се премине към „%s“"
-#: builtin/rebase.c:2180
+#: builtin/rebase.c:2018
msgid "HEAD is up to date."
msgstr "Указателят „HEAD“ е напълно актуален."
-#: builtin/rebase.c:2182
+#: builtin/rebase.c:2020
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "Текущият клон „%s“ е напълно актуален.\n"
-#: builtin/rebase.c:2190
+#: builtin/rebase.c:2028
msgid "HEAD is up to date, rebase forced."
msgstr "Указателят „HEAD“ е напълно актуален — принудително пребазиране"
-#: builtin/rebase.c:2192
+#: builtin/rebase.c:2030
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "Текущият клон „%s“ е напълно актуален — принудително пребазиране\n"
-#: builtin/rebase.c:2200
+#: builtin/rebase.c:2038
msgid "The pre-rebase hook refused to rebase."
msgstr "Куката за изпълнение преди пребазиране отхвърли пребазирането."
-#: builtin/rebase.c:2207
+#: builtin/rebase.c:2045
#, c-format
msgid "Changes to %s:\n"
msgstr "Промените в „%s“:\n"
-#: builtin/rebase.c:2210
+#: builtin/rebase.c:2048
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Промените от „%s“ към „%s“:\n"
-#: builtin/rebase.c:2235
+#: builtin/rebase.c:2073
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"Първо, указателят „HEAD“ започва да сочи към базата, върху която "
"пребазирате…\n"
-#: builtin/rebase.c:2244
+#: builtin/rebase.c:2082
msgid "Could not detach HEAD"
msgstr "Указателят „HEAD“ не може да се отделѝ"
-#: builtin/rebase.c:2253
+#: builtin/rebase.c:2091
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Превъртане на „%s“ към „%s“.\n"
-#: builtin/receive-pack.c:33
+#: builtin/receive-pack.c:34
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack ДИРЕКТОРИЯ_НА_GIT"
-#: builtin/receive-pack.c:821
+#: builtin/receive-pack.c:1276
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
@@ -19311,7 +20688,7 @@
"За да заглушите това съобщение, като запазите стандартното поведение,\n"
"задайте настройката „receive.denyCurrentBranch“ да е „refuse“ (отказ)."
-#: builtin/receive-pack.c:841
+#: builtin/receive-pack.c:1296
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"
@@ -19332,11 +20709,11 @@
"За да заглушите това съобщение, задайте настройката\n"
"„receive.denyDeleteCurrent“ да е „refuse“ (отказ)."
-#: builtin/receive-pack.c:1938
+#: builtin/receive-pack.c:2481
msgid "quiet"
msgstr "без извеждане на информация"
-#: builtin/receive-pack.c:1952
+#: builtin/receive-pack.c:2495
msgid "You must specify a directory."
msgstr "Трябва да укажете директория."
@@ -19366,36 +20743,36 @@
msgid "'%s' is not a valid timestamp"
msgstr "„%s“ не е правилна стойност за време"
-#: builtin/reflog.c:606
+#: builtin/reflog.c:609
#, c-format
msgid "Marking reachable objects..."
msgstr "Отбелязване на достижимите обекти…"
-#: builtin/reflog.c:644
+#: builtin/reflog.c:647
#, c-format
msgid "%s points nowhere!"
msgstr "„%s“ не сочи наникъде!"
-#: builtin/reflog.c:696
+#: builtin/reflog.c:699
msgid "no reflog specified to delete"
msgstr "не е указан журнал с подавания за изтриване"
-#: builtin/reflog.c:705
+#: builtin/reflog.c:708
#, c-format
msgid "not a reflog: %s"
msgstr "„%s“ не е журнал с подавания"
-#: builtin/reflog.c:710
+#: builtin/reflog.c:713
#, c-format
msgid "no reflog for '%s'"
msgstr "липсва журнал с подаванията за „%s“"
-#: builtin/reflog.c:756
+#: builtin/reflog.c:759
#, c-format
msgid "invalid ref format: %s"
msgstr "неправилен формат на указател: %s"
-#: builtin/reflog.c:765
+#: builtin/reflog.c:768
msgid "git reflog [ show | expire | delete | exists ]"
msgstr "git reflog [ show | expire | delete | exists ]"
@@ -19536,40 +20913,35 @@
"указването на следени клони е смислено само за отдалечени хранилища, от "
"които се доставя"
-#: builtin/remote.c:195 builtin/remote.c:696
+#: builtin/remote.c:195 builtin/remote.c:700
#, c-format
msgid "remote %s already exists."
msgstr "вече съществува отдалечено хранилище с име „%s“."
-#: builtin/remote.c:199 builtin/remote.c:700
-#, c-format
-msgid "'%s' is not a valid remote name"
-msgstr "„%s“ е неправилно име за отдалечено хранилище"
-
-#: builtin/remote.c:239
+#: builtin/remote.c:240
#, c-format
msgid "Could not setup master '%s'"
msgstr "Основният клон „%s“ не може да бъде настроен"
-#: builtin/remote.c:354
+#: builtin/remote.c:355
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "Обектите за доставяне за указателя „%s“ не могат да бъдат получени"
-#: builtin/remote.c:453 builtin/remote.c:461
+#: builtin/remote.c:454 builtin/remote.c:462
msgid "(matching)"
msgstr "(съвпадащи)"
-#: builtin/remote.c:465
+#: builtin/remote.c:466
msgid "(delete)"
msgstr "(за изтриване)"
-#: builtin/remote.c:653
+#: builtin/remote.c:655
#, c-format
msgid "could not set '%s'"
msgstr "„%s“ не може да се зададе"
-#: builtin/remote.c:658
+#: builtin/remote.c:660
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
@@ -19580,17 +20952,17 @@
" %s:%d\n"
"използва отдалечено хранилище, което вече не съществува: „%s“"
-#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940
+#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946
#, c-format
msgid "No such remote: '%s'"
msgstr "Няма отдалечено хранилище на име „%s“"
-#: builtin/remote.c:706
+#: builtin/remote.c:710
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Разделът „%s“ в настройките не може да бъде преименуван на „%s“"
-#: builtin/remote.c:726
+#: builtin/remote.c:730
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -19601,17 +20973,17 @@
" %s\n"
" Променете настройките ръчно, ако е необходимо."
-#: builtin/remote.c:766
+#: builtin/remote.c:770
#, c-format
msgid "deleting '%s' failed"
msgstr "неуспешно изтриване на „%s“"
-#: builtin/remote.c:800
+#: builtin/remote.c:804
#, c-format
msgid "creating '%s' failed"
msgstr "неуспешно създаване на „%s“"
-#: builtin/remote.c:876
+#: builtin/remote.c:882
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -19625,121 +20997,121 @@
"Бележка: Няколко клона извън йерархията „refs/remotes/“ не бяха изтрити.\n"
"Изтрийте ги чрез командата:"
-#: builtin/remote.c:890
+#: builtin/remote.c:896
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Разделът „%s“ в настройките не може да бъде изтрит"
-#: builtin/remote.c:993
+#: builtin/remote.c:999
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " нов (следващото доставяне ще го разположи в „remotes/%s“)"
-#: builtin/remote.c:996
+#: builtin/remote.c:1002
msgid " tracked"
msgstr " следен"
-#: builtin/remote.c:998
+#: builtin/remote.c:1004
msgid " stale (use 'git remote prune' to remove)"
msgstr " стар (изтрийте чрез „git remote prune“)"
-#: builtin/remote.c:1000
+#: builtin/remote.c:1006
msgid " ???"
msgstr " неясно състояние"
# CHECK
-#: builtin/remote.c:1041
+#: builtin/remote.c:1047
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr ""
"неправилен клон за сливане „%s“. Невъзможно е да пребазирате върху повече "
"от 1 клон"
-#: builtin/remote.c:1050
+#: builtin/remote.c:1056
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "интерактивно пребазиране върху отдалечения клон „%s“"
-#: builtin/remote.c:1052
+#: builtin/remote.c:1058
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr "интерактивно пребазиране (със сливания) върху отдалечения клон „%s“"
-#: builtin/remote.c:1055
+#: builtin/remote.c:1061
#, c-format
msgid "rebases onto remote %s"
msgstr "пребазиране върху отдалечения клон „%s“"
-#: builtin/remote.c:1059
+#: builtin/remote.c:1065
#, c-format
msgid " merges with remote %s"
msgstr " сливане с отдалечения клон „%s“"
-#: builtin/remote.c:1062
+#: builtin/remote.c:1068
#, c-format
msgid "merges with remote %s"
msgstr "сливане с отдалечения клон „%s“"
-#: builtin/remote.c:1065
+#: builtin/remote.c:1071
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s и с отдалечения клон „%s“\n"
-#: builtin/remote.c:1108
+#: builtin/remote.c:1114
msgid "create"
msgstr "създаден"
-#: builtin/remote.c:1111
+#: builtin/remote.c:1117
msgid "delete"
msgstr "изтрит"
-#: builtin/remote.c:1115
+#: builtin/remote.c:1121
msgid "up to date"
msgstr "актуален"
-#: builtin/remote.c:1118
+#: builtin/remote.c:1124
msgid "fast-forwardable"
msgstr "може да се превърти"
-#: builtin/remote.c:1121
+#: builtin/remote.c:1127
msgid "local out of date"
msgstr "локалният е изостанал"
-#: builtin/remote.c:1128
+#: builtin/remote.c:1134
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s принудително изтласква към %-*s (%s)"
-#: builtin/remote.c:1131
+#: builtin/remote.c:1137
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s изтласква към %-*s (%s)"
-#: builtin/remote.c:1135
+#: builtin/remote.c:1141
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s принудително изтласква към %s"
-#: builtin/remote.c:1138
+#: builtin/remote.c:1144
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s изтласква към %s"
-#: builtin/remote.c:1206
+#: builtin/remote.c:1212
msgid "do not query remotes"
msgstr "без заявки към отдалечените хранилища"
-#: builtin/remote.c:1233
+#: builtin/remote.c:1239
#, c-format
msgid "* remote %s"
msgstr "● отдалечено хранилище „%s“"
-#: builtin/remote.c:1234
+#: builtin/remote.c:1240
#, c-format
msgid " Fetch URL: %s"
msgstr " Адрес за доставяне: %s"
-#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390
+#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
msgid "(no URL)"
msgstr "(без адрес)"
@@ -19747,25 +21119,25 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1249 builtin/remote.c:1251
+#: builtin/remote.c:1255 builtin/remote.c:1257
#, c-format
msgid " Push URL: %s"
msgstr " Адрес за изтласкване: %s"
-#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
#, c-format
msgid " HEAD branch: %s"
msgstr " клон сочен от HEAD: %s"
-#: builtin/remote.c:1253
+#: builtin/remote.c:1259
msgid "(not queried)"
msgstr "(без проверка)"
-#: builtin/remote.c:1255
+#: builtin/remote.c:1261
msgid "(unknown)"
msgstr "(непознат)"
-#: builtin/remote.c:1259
+#: builtin/remote.c:1265
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -19774,161 +21146,161 @@
"хранилище\n"
" не е еднозначен и е някой от следните):\n"
-#: builtin/remote.c:1271
+#: builtin/remote.c:1277
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Отдалечен клон:%s"
msgstr[1] " Отдалечени клони:%s"
-#: builtin/remote.c:1274 builtin/remote.c:1300
+#: builtin/remote.c:1280 builtin/remote.c:1306
msgid " (status not queried)"
msgstr " (състоянието не бе проверено)"
-#: builtin/remote.c:1283
+#: builtin/remote.c:1289
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Локален клон настроен за издърпване чрез „git pull“:"
msgstr[1] " Локални клони настроени за издърпване чрез „git pull“:"
-#: builtin/remote.c:1291
+#: builtin/remote.c:1297
msgid " Local refs will be mirrored by 'git push'"
msgstr " Локалните указатели ще бъдат пренесени чрез „ push“"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1303
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Локалният указател, настроен за „git push“%s:"
msgstr[1] " Локалните указатели, настроени за „git push“%s:"
-#: builtin/remote.c:1318
+#: builtin/remote.c:1324
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "задаване на refs/remotes/ИМЕ/HEAD според отдалеченото хранилище"
-#: builtin/remote.c:1320
+#: builtin/remote.c:1326
msgid "delete refs/remotes/<name>/HEAD"
msgstr "изтриване на refs/remotes/ИМЕ/HEAD"
-#: builtin/remote.c:1335
+#: builtin/remote.c:1341
msgid "Cannot determine remote HEAD"
msgstr "Не може да се установи отдалеченият връх"
-#: builtin/remote.c:1337
+#: builtin/remote.c:1343
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
"Множество клони с върхове. Изберете изрично някой от тях чрез командата:"
-#: builtin/remote.c:1347
+#: builtin/remote.c:1353
#, c-format
msgid "Could not delete %s"
msgstr "„%s“ не може да бъде изтрит"
-#: builtin/remote.c:1355
+#: builtin/remote.c:1361
#, c-format
msgid "Not a valid ref: %s"
msgstr "Неправилен указател: %s"
-#: builtin/remote.c:1357
+#: builtin/remote.c:1363
#, c-format
msgid "Could not setup %s"
msgstr "„%s“ не може да се настрои"
-#: builtin/remote.c:1375
+#: builtin/remote.c:1381
#, c-format
msgid " %s will become dangling!"
msgstr "„%s“ ще се превърне в обект извън клоните!"
-#: builtin/remote.c:1376
+#: builtin/remote.c:1382
#, c-format
msgid " %s has become dangling!"
msgstr "„%s“ се превърна в обект извън клоните!"
-#: builtin/remote.c:1386
+#: builtin/remote.c:1392
#, c-format
msgid "Pruning %s"
msgstr "Окастряне на „%s“"
-#: builtin/remote.c:1387
+#: builtin/remote.c:1393
#, c-format
msgid "URL: %s"
msgstr "адрес: %s"
-#: builtin/remote.c:1403
+#: builtin/remote.c:1409
#, c-format
msgid " * [would prune] %s"
msgstr " ● [ще бъде окастрено] %s"
-#: builtin/remote.c:1406
+#: builtin/remote.c:1412
#, c-format
msgid " * [pruned] %s"
msgstr " ● [окастрено] %s"
-#: builtin/remote.c:1451
+#: builtin/remote.c:1457
msgid "prune remotes after fetching"
msgstr "окастряне на огледалата на отдалечените хранилища след доставяне"
-#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636
+#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
#, c-format
msgid "No such remote '%s'"
msgstr "Няма отдалечено хранилище на име „%s“"
-#: builtin/remote.c:1530
+#: builtin/remote.c:1539
msgid "add branch"
msgstr "добавяне на клон"
-#: builtin/remote.c:1537
+#: builtin/remote.c:1546
msgid "no remote specified"
msgstr "не е указано отдалечено хранилище"
-#: builtin/remote.c:1554
+#: builtin/remote.c:1563
msgid "query push URLs rather than fetch URLs"
msgstr "запитване към адресите за изтласкване, а не за доставяне"
-#: builtin/remote.c:1556
+#: builtin/remote.c:1565
msgid "return all URLs"
msgstr "извеждане на всички адреси"
-#: builtin/remote.c:1584
+#: builtin/remote.c:1595
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "не е зададен адрес за отдалеченото хранилище „%s“"
-#: builtin/remote.c:1610
+#: builtin/remote.c:1621
msgid "manipulate push URLs"
msgstr "промяна на адресите за изтласкване"
-#: builtin/remote.c:1612
+#: builtin/remote.c:1623
msgid "add URL"
msgstr "добавяне на адреси"
-#: builtin/remote.c:1614
+#: builtin/remote.c:1625
msgid "delete URLs"
msgstr "изтриване на адреси"
-#: builtin/remote.c:1621
+#: builtin/remote.c:1632
msgid "--add --delete doesn't make sense"
msgstr "опциите „--add“ и „--delete“ са несъвместими"
-#: builtin/remote.c:1660
+#: builtin/remote.c:1673
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Неправилен (стар) формат за адрес: %s"
-#: builtin/remote.c:1668
+#: builtin/remote.c:1681
#, c-format
msgid "No such URL found: %s"
msgstr "Такъв адрес не е открит: %s"
-#: builtin/remote.c:1670
+#: builtin/remote.c:1683
msgid "Will not delete all non-push URLs"
msgstr "Никой от адресите, които не са за изтласкване, няма да се изтрие"
-#: builtin/repack.c:23
+#: builtin/repack.c:26
msgid "git repack [<options>]"
msgstr "git repack [ОПЦИЯ…]"
-#: builtin/repack.c:28
+#: builtin/repack.c:31
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -19937,147 +21309,134 @@
"Ползвайте опцията --no-write-bitmap-index или изключете настройката\n"
"„pack.writebitmaps“."
-#: builtin/repack.c:191
+#: builtin/repack.c:198
msgid "could not start pack-objects to repack promisor objects"
msgstr ""
"командата „pack-objects“ не може да се стартира за препакетирането на "
"гарантиращите обекти"
-#: builtin/repack.c:230 builtin/repack.c:416
+#: builtin/repack.c:270 builtin/repack.c:446
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
"repack: от „pack-objects“ се изискват редове само с пълни шестнайсетични "
"указатели."
-#: builtin/repack.c:254
+#: builtin/repack.c:294
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
"командата „pack-objects“ не може да завърши за препакетирането на "
"гарантиращите обекти"
-#: builtin/repack.c:292
+#: builtin/repack.c:322
msgid "pack everything in a single pack"
msgstr "пакетиране на всичко в пакет"
-#: builtin/repack.c:294
+#: builtin/repack.c:324
msgid "same as -a, and turn unreachable objects loose"
msgstr ""
"същото като опцията „-a“. Допълнително — недостижимите обекти да станат "
"непакетирани"
-#: builtin/repack.c:297
+#: builtin/repack.c:327
msgid "remove redundant packs, and run git-prune-packed"
msgstr ""
"премахване на ненужните пакетирани файлове и изпълнение на командата „git-"
"prune-packed“"
-#: builtin/repack.c:299
+#: builtin/repack.c:329
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "подаване на опцията „--no-reuse-delta“ на командата „git-pack-objects“"
-#: builtin/repack.c:301
+#: builtin/repack.c:331
msgid "pass --no-reuse-object to git-pack-objects"
msgstr ""
"подаване на опцията „--no-reuse-object“ на командата „git-pack-objects“"
-#: builtin/repack.c:303
+#: builtin/repack.c:333
msgid "do not run git-update-server-info"
msgstr "без изпълнение на командата „git-update-server-info“"
-#: builtin/repack.c:306
+#: builtin/repack.c:336
msgid "pass --local to git-pack-objects"
msgstr "подаване на опцията „--local“ на командата „git-pack-objects“"
-#: builtin/repack.c:308
+#: builtin/repack.c:338
msgid "write bitmap index"
msgstr "създаване и записване на индекси на база битови маски"
-#: builtin/repack.c:310
+#: builtin/repack.c:340
msgid "pass --delta-islands to git-pack-objects"
msgstr "подаване на опцията „--delta-islands“ на командата „git-pack-objects“"
-#: builtin/repack.c:311
+#: builtin/repack.c:341
msgid "approxidate"
msgstr "евристична дата"
-#: builtin/repack.c:312
+#: builtin/repack.c:342
msgid "with -A, do not loosen objects older than this"
msgstr ""
"при комбинирането с опцията „-A“ — без разпакетиране на обектите по стари от "
"това"
-#: builtin/repack.c:314
+#: builtin/repack.c:344
msgid "with -a, repack unreachable objects"
msgstr "с „-a“ — препакетиране на недостижимите обекти"
-#: builtin/repack.c:316
+#: builtin/repack.c:346
msgid "size of the window used for delta compression"
msgstr "размер на прозореца за делта компресията"
-#: builtin/repack.c:317 builtin/repack.c:323
+#: builtin/repack.c:347 builtin/repack.c:353
msgid "bytes"
msgstr "байтове"
-#: builtin/repack.c:318
+#: builtin/repack.c:348
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
"същото като горната опция, но ограничението да е по размер на паметта, а не "
"по броя на обектите"
-#: builtin/repack.c:320
+#: builtin/repack.c:350
msgid "limits the maximum delta depth"
msgstr "ограничаване на максималната дълбочина на делтата"
-#: builtin/repack.c:322
+#: builtin/repack.c:352
msgid "limits the maximum number of threads"
msgstr "ограничаване на максималния брой нишки"
-#: builtin/repack.c:324
+#: builtin/repack.c:354
msgid "maximum size of each packfile"
msgstr "максимален размер на всеки пакет"
-#: builtin/repack.c:326
+#: builtin/repack.c:356
msgid "repack objects in packs marked with .keep"
msgstr "препакетиране на обектите в пакети белязани с „.keep“"
-#: builtin/repack.c:328
+#: builtin/repack.c:358
msgid "do not repack this pack"
msgstr "без препакетиране на този пакет"
-#: builtin/repack.c:338
+#: builtin/repack.c:368
msgid "cannot delete packs in a precious-objects repo"
msgstr "пакетите в хранилище с важни обекти не може да се трият"
-#: builtin/repack.c:342
+#: builtin/repack.c:372
msgid "--keep-unreachable and -A are incompatible"
msgstr "Опциите „--keep-unreachable“ и „-A“ са несъвместими"
-#: builtin/repack.c:425
+#: builtin/repack.c:455
msgid "Nothing new to pack."
msgstr "Нищо ново за пакетиране"
-#: builtin/repack.c:486
+#: builtin/repack.c:485
#, 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"
-"ПРЕДУПРЕЖДЕНИЕ: пакетни файлове бяха преименувани, като към\n"
-"ПРЕДУПРЕЖДЕНИЕ: имената им бе добавен префиксът „old-“.\n"
-"ПРЕДУПРЕЖДЕНИЕ: Тази операция бе неуспешна, както и обратната\n"
-"ПРЕДУПРЕЖДЕНИЕ: ѝ — за връщането на първоначалните имена.\n"
-"ПРЕДУПРЕЖДЕНИЕ: Преименувайте файловете в „%s“ ръчно:\n"
+msgid "missing required file: %s"
+msgstr "липсва задължителния файл „%s“"
-#: builtin/repack.c:534
+#: builtin/repack.c:487
#, c-format
-msgid "failed to remove '%s'"
-msgstr "директорията „%s“ не може да бъде изтрита"
+msgid "could not unlink: %s"
+msgstr "неуспешно изтриване на „%s“"
#: builtin/replace.c:22
msgid "git replace [-f] <object> <replacement>"
@@ -20385,96 +21744,96 @@
msgid "keep"
msgstr "запазващо (keep)"
-#: builtin/reset.c:82
+#: builtin/reset.c:83
msgid "You do not have a valid HEAD."
msgstr "Указателят „HEAD“ е повреден."
-#: builtin/reset.c:84
+#: builtin/reset.c:85
msgid "Failed to find tree of HEAD."
msgstr "Дървото, сочено от указателя „HEAD“, не може да бъде открито."
-#: builtin/reset.c:90
+#: builtin/reset.c:91
#, c-format
msgid "Failed to find tree of %s."
msgstr "Дървото, сочено от „%s“, не може да бъде открито."
-#: builtin/reset.c:115
+#: builtin/reset.c:116
#, c-format
msgid "HEAD is now at %s"
msgstr "Указателят „HEAD“ сочи към „%s“"
-#: builtin/reset.c:194
+#: builtin/reset.c:195
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Не може да се извърши %s зануляване по време на сливане."
-#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595
-#: builtin/stash.c:619
+#: builtin/reset.c:295 builtin/stash.c:587 builtin/stash.c:661
+#: builtin/stash.c:685
msgid "be quiet, only report errors"
msgstr "по-малко подробности, да се извеждат само грешките"
-#: builtin/reset.c:296
+#: builtin/reset.c:297
msgid "reset HEAD and index"
msgstr "индекса и указателя „HEAD“, без работното дърво"
-#: builtin/reset.c:297
+#: builtin/reset.c:298
msgid "reset only HEAD"
msgstr "само указателя „HEAD“, без индекса и работното дърво"
-#: builtin/reset.c:299 builtin/reset.c:301
+#: builtin/reset.c:300 builtin/reset.c:302
msgid "reset HEAD, index and working tree"
msgstr "указателя „HEAD“, индекса и работното дърво"
-#: builtin/reset.c:303
+#: builtin/reset.c:304
msgid "reset HEAD but keep local changes"
msgstr "зануляване на указателя „HEAD“, но запазване на локалните промени"
-#: builtin/reset.c:309
+#: builtin/reset.c:310
msgid "record only the fact that removed paths will be added later"
msgstr ""
"отбелязване само на факта, че изтритите пътища ще бъдат добавени по-късно"
-#: builtin/reset.c:343
+#: builtin/reset.c:344
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Стойността „%s“ не е разпозната като съществуваща версия."
-#: builtin/reset.c:351
+#: builtin/reset.c:352
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "„%s“ не е разпознат като дърво."
-#: builtin/reset.c:360
+#: builtin/reset.c:361
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr ""
"опцията „--patch“ е несъвместима с всяка от опциите „--hard“/„--mixed“/„--"
"soft“"
-#: builtin/reset.c:370
+#: builtin/reset.c:371
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"опцията „--mixed“ не бива да се използва заедно с пътища. Вместо това "
"изпълнете „git reset -- ПЪТ…“."
-#: builtin/reset.c:372
+#: builtin/reset.c:373
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Не може да извършите %s зануляване, когато сте задали ПЪТ."
-#: builtin/reset.c:387
+#: builtin/reset.c:388
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "В голо хранилище не може да извършите %s зануляване"
-#: builtin/reset.c:391
+#: builtin/reset.c:392
msgid "-N can only be used with --mixed"
msgstr "Опцията „-N“ изисква опцията „--mixed“"
-#: builtin/reset.c:412
+#: builtin/reset.c:413
msgid "Unstaged changes after reset:"
msgstr "Промени извън индекса след зануляването:"
-#: builtin/reset.c:415
+#: builtin/reset.c:416
#, c-format
msgid ""
"\n"
@@ -20487,48 +21846,48 @@
"Опцията „--quiet“ заглушава това съобщение еднократно. За постоянно\n"
"заглушаване задайте настройката „reset.quiet“ да е „true“ (истина).\n"
-#: builtin/reset.c:425
+#: builtin/reset.c:434
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Индексът не може да бъде занулен към версия „%s“."
-#: builtin/reset.c:429
+#: builtin/reset.c:439
msgid "Could not write new index file."
msgstr "Новият индекс не може да бъде записан."
-#: builtin/rev-list.c:499
+#: builtin/rev-list.c:534
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr "опциите „--exclude-promisor-objects“ и „--missing“ и са несъвместими"
-#: builtin/rev-list.c:560
+#: builtin/rev-list.c:595
msgid "object filtering requires --objects"
msgstr "филтрирането на обекти изисква опцията „--objects“"
-#: builtin/rev-list.c:610
+#: builtin/rev-list.c:651
msgid "rev-list does not support display of notes"
msgstr "командата „rev-list“ не поддържа извеждането на бележки"
-#: builtin/rev-list.c:615
+#: builtin/rev-list.c:656
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"
@@ -20621,11 +21980,11 @@
msgid "keep redundant, empty commits"
msgstr "запазване на излишните, празни подавания"
-#: builtin/revert.c:232
+#: builtin/revert.c:239
msgid "revert failed"
msgstr "неуспешна отмяна"
-#: builtin/revert.c:245
+#: builtin/revert.c:252
msgid "cherry-pick failed"
msgstr "неуспешно отбиране"
@@ -20731,57 +22090,76 @@
"pack=ПАКЕТ] [--verbose] [--thin] [--atomic] [ХОСТ:]ДИРЕКТОРИЯ [УКАЗАТЕЛ…]\n"
" опцията „--all“ и изричното посочване на УКАЗАТЕЛ са взаимно несъвместими."
-#: builtin/send-pack.c:163
+#: builtin/send-pack.c:188
msgid "remote name"
msgstr "име на отдалечено хранилище"
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:201
msgid "use stateless RPC protocol"
msgstr "използване на протокол без запазване на състоянието за RPC"
-#: builtin/send-pack.c:178
+#: builtin/send-pack.c:202
msgid "read refs from stdin"
msgstr "четене на указателите от стандартния вход"
-#: builtin/send-pack.c:179
+#: builtin/send-pack.c:203
msgid "print status from remote helper"
msgstr "извеждане на състоянието от отдалечената помощна функция"
-#: builtin/shortlog.c:14
+#: builtin/shortlog.c:16
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git shortlog [ОПЦИЯ…] [ДИАПАЗОН_НА_ВЕРСИИТЕ] [[--] [ПЪТ…]]"
-#: builtin/shortlog.c:15
+#: builtin/shortlog.c:17
msgid "git log --pretty=short | git shortlog [<options>]"
msgstr "git log --pretty=short | git shortlog [ОПЦИЯ…]"
-#: builtin/shortlog.c:264
-msgid "Group by committer rather than author"
-msgstr "Групиране по подаващ, а не по автор"
+#: builtin/shortlog.c:123
+msgid "using multiple --group options with stdin is not supported"
+msgstr "повече от една опции „--group“ са несъвместими със стандартния вход"
-#: builtin/shortlog.c:266
+#: builtin/shortlog.c:133
+msgid "using --group=trailer with stdin is not supported"
+msgstr "опцията „--group=trailer“ е несъвместима със стандартния вход"
+
+#: builtin/shortlog.c:323
+#, c-format
+msgid "unknown group type: %s"
+msgstr "неизвестен вид група: %s"
+
+#: builtin/shortlog.c:351
+msgid "group by committer rather than author"
+msgstr "групиране по подаващ, а не по автор"
+
+#: builtin/shortlog.c:354
msgid "sort output according to the number of commits per author"
msgstr "подредба на подаванията по броя подавания от автор"
-#: builtin/shortlog.c:268
-msgid "Suppress commit descriptions, only provides commit count"
-msgstr "Без описания на подаванията — да се показва само броя подавания"
+#: builtin/shortlog.c:356
+msgid "suppress commit descriptions, only provides commit count"
+msgstr "без описания на подаванията — да се показва само броя подавания"
-#: builtin/shortlog.c:270
-msgid "Show the email address of each author"
-msgstr "Извеждане на адреса на е-поща за всеки автор"
+#: builtin/shortlog.c:358
+msgid "show the email address of each author"
+msgstr "извеждане на адреса на е-поща за всеки автор"
-#: builtin/shortlog.c:271
+#: builtin/shortlog.c:359
msgid "<w>[,<i1>[,<i2>]]"
msgstr "<ШИРОЧИНА>[,<ОТСТЪП_1>[,<ОТСТЪП_2>]]"
-#: builtin/shortlog.c:272
-msgid "Linewrap output"
-msgstr ""
-"Пренасяне на редовете до тази обща ШИРОЧИНА (76), с ОТСТЪП_1 (6) за първия "
-"ред и ОТСТЪП_2 (9) за останалите"
+#: builtin/shortlog.c:360
+msgid "linewrap output"
+msgstr "пренасяне на редовете"
-#: builtin/shortlog.c:301
+#: builtin/shortlog.c:362
+msgid "field"
+msgstr "поле"
+
+#: builtin/shortlog.c:363
+msgid "group by field"
+msgstr "групиране по поле"
+
+#: builtin/shortlog.c:391
msgid "too many arguments given outside repository"
msgstr "прекалено много аргументи извън хранилище"
@@ -20923,6 +22301,14 @@
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 | --"
@@ -20972,18 +22358,28 @@
"локалното хранилище"
#: builtin/sparse-checkout.c:21
-msgid "git sparse-checkout (init|list|set|add|disable) <options>"
-msgstr "git sparse-checkout (init|list|set|add|disable) ОПЦИЯ…"
+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:64
+#: builtin/sparse-checkout.c:45
+msgid "git sparse-checkout list"
+msgstr "git sparse-checkout list"
+
+#: builtin/sparse-checkout.c:71
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr ""
"това не е частично работно дърво (вероятно липсва файл „sparse-checkout“)"
-#: builtin/sparse-checkout.c:225
+#: builtin/sparse-checkout.c:223
msgid "failed to create directory for sparse-checkout file"
msgstr "директорията за частично изтегляне „%s“ не може да бъде създадена"
+#: builtin/sparse-checkout.c:264
+msgid "unable to upgrade repository format to enable worktreeConfig"
+msgstr ""
+"настройката „worktreeConfig“ не може да се включи, защото форматът на "
+"хранилището не може да се обнови"
+
#: builtin/sparse-checkout.c:266
msgid "failed to set extensions.worktreeConfig setting"
msgstr "неуспешно задаване на настройката „extensions.worktreeConfig“"
@@ -20996,46 +22392,42 @@
msgid "initialize the sparse-checkout in cone mode"
msgstr "инициализиране на частичното изтегляне в пътеводен режим"
-#: builtin/sparse-checkout.c:308
-msgid "initialize sparse-checkout"
-msgstr "инициализиране на частичното изтегляне"
-
-#: builtin/sparse-checkout.c:341
+#: builtin/sparse-checkout.c:339
#, c-format
msgid "failed to open '%s'"
msgstr "„%s“ не може да се отвори"
-#: builtin/sparse-checkout.c:398
+#: builtin/sparse-checkout.c:396
#, c-format
msgid "could not normalize path %s"
msgstr "пътят „%s“ не може да се нормализира"
-#: builtin/sparse-checkout.c:410
+#: builtin/sparse-checkout.c:408
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
msgstr "git sparse-checkout (set|add) (--stdin | ШАБЛОН…)"
-#: builtin/sparse-checkout.c:435
+#: builtin/sparse-checkout.c:433
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "цитирането на низ, форматиран за C — „%s“ не може да бъде изчистено"
-#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513
+#: builtin/sparse-checkout.c:487 builtin/sparse-checkout.c:511
msgid "unable to load existing sparse-checkout patterns"
msgstr "шаблоните за частично изтегляне не могат да се заредят"
-#: builtin/sparse-checkout.c:558
+#: builtin/sparse-checkout.c:556
msgid "read patterns from standard in"
msgstr "изчитане на шаблоните от стандартния вход"
-#: builtin/sparse-checkout.c:564
-msgid "set sparse-checkout patterns"
-msgstr "задаване на шаблоните за частичното изтегляне"
+#: builtin/sparse-checkout.c:571
+msgid "git sparse-checkout reapply"
+msgstr "git sparse-checkout reapply"
-#: builtin/sparse-checkout.c:581
-msgid "disable sparse-checkout"
-msgstr "без използване на частично изтегляне"
+#: builtin/sparse-checkout.c:590
+msgid "git sparse-checkout disable"
+msgstr "git sparse-checkout disable"
-#: builtin/sparse-checkout.c:593
+#: builtin/sparse-checkout.c:618
msgid "error while refreshing working directory"
msgstr "грешка при обновяване на работната директория"
@@ -21115,7 +22507,7 @@
msgid "Too many revisions specified:%s"
msgstr "Указани са прекалено много версии:%s"
-#: builtin/stash.c:162 git-legacy-stash.sh:549
+#: builtin/stash.c:162
msgid "No stash entries found."
msgstr "Не е открито нищо скатано."
@@ -21124,160 +22516,173 @@
msgid "%s is not a valid reference"
msgstr "„%s“ е неправилно име за указател"
-#: builtin/stash.c:225 git-legacy-stash.sh:75
-msgid "git stash clear with parameters is unimplemented"
+#: builtin/stash.c:225
+msgid "git stash clear with arguments is unimplemented"
msgstr "командата „git stash clear“ не поддържа аргументи"
-#: builtin/stash.c:404
+#: builtin/stash.c:429
+#, c-format
+msgid ""
+"WARNING: Untracked file in way of tracked file! Renaming\n"
+" %s -> %s\n"
+" to make room.\n"
+msgstr ""
+"ПРЕДУПРЕЖДЕНИЕ: Неследен файл на мястото на следен! Преименуване\n"
+" „%s“ на „%s“\n"
+" за да се направи място.\n"
+
+#: builtin/stash.c:490
msgid "cannot apply a stash in the middle of a merge"
msgstr "по време на сливане не може да приложите нещо скатано"
-#: builtin/stash.c:415
+#: builtin/stash.c:501
#, c-format
msgid "could not generate diff %s^!."
msgstr "файлът с разликите „%s^!“ не може да се генерира"
-#: builtin/stash.c:422
-msgid "conflicts in index.Try without --index."
+#: builtin/stash.c:508
+msgid "conflicts in index. Try without --index."
msgstr ""
"в индекса има конфликти. Пробвайте да изпълните командата без опцията „--"
"index“."
-#: builtin/stash.c:428
+#: builtin/stash.c:514
msgid "could not save index tree"
msgstr "дървото сочено от индекса не може да бъде запазено"
-#: builtin/stash.c:437
+#: builtin/stash.c:523
msgid "could not restore untracked files from stash"
msgstr "неследени файлове не могат да се възстановят от скатаното"
-#: builtin/stash.c:451
+#: builtin/stash.c:537
#, c-format
msgid "Merging %s with %s"
msgstr "Сливане на „%s“ с „%s“"
-#: builtin/stash.c:461 git-legacy-stash.sh:681
+#: builtin/stash.c:547
msgid "Index was not unstashed."
msgstr "Индексът не е изваден от скатаното."
-#: builtin/stash.c:522 builtin/stash.c:621
+#: builtin/stash.c:589 builtin/stash.c:687
msgid "attempt to recreate the index"
msgstr "опит за повторно създаване на индекса"
-#: builtin/stash.c:555
+#: builtin/stash.c:633
#, c-format
msgid "Dropped %s (%s)"
msgstr "Изтрито: „%s“ (%s)"
-#: builtin/stash.c:558
+#: builtin/stash.c:636
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "Скатаното „%s“ не може да бъде изтрито"
-#: builtin/stash.c:583
+#: builtin/stash.c:649
#, c-format
msgid "'%s' is not a stash reference"
msgstr "„%s“ не е указател към нещо скатано"
-#: builtin/stash.c:633 git-legacy-stash.sh:695
+#: builtin/stash.c:699
msgid "The stash entry is kept in case you need it again."
msgstr "Скатаното е запазено в случай, че ви потрябва отново."
-#: builtin/stash.c:656 git-legacy-stash.sh:713
+#: builtin/stash.c:722
msgid "No branch name specified"
msgstr "Не е указано име на клон"
-#: builtin/stash.c:796 builtin/stash.c:833
+#: builtin/stash.c:866 builtin/stash.c:903
#, c-format
msgid "Cannot update %s with %s"
msgstr "Указателят „%s“ не може да бъде обновен да сочи към „%s“"
-#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
+#: builtin/stash.c:884 builtin/stash.c:1538 builtin/stash.c:1603
msgid "stash message"
msgstr "съобщение при скатаване"
-#: builtin/stash.c:824
+#: builtin/stash.c:894
msgid "\"git stash store\" requires one <commit> argument"
msgstr "командата „git stash store“ изисква точно един аргумент-ПОДАВАНЕ"
-#: builtin/stash.c:1049 git-legacy-stash.sh:218
+#: builtin/stash.c:1109
msgid "No changes selected"
msgstr "Не са избрани никакви промени"
-#: builtin/stash.c:1149 git-legacy-stash.sh:150
+#: builtin/stash.c:1209
msgid "You do not have the initial commit yet"
msgstr "Все още липсва първоначално подаване"
-#: builtin/stash.c:1176 git-legacy-stash.sh:165
+#: builtin/stash.c:1236
msgid "Cannot save the current index state"
msgstr "Състоянието на текущия индекс не може да бъде запазено"
-#: builtin/stash.c:1185 git-legacy-stash.sh:180
+#: builtin/stash.c:1245
msgid "Cannot save the untracked files"
msgstr "Неследените файлове не могат да се запазят"
-#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201
-#: git-legacy-stash.sh:214
+#: builtin/stash.c:1256 builtin/stash.c:1265
msgid "Cannot save the current worktree state"
msgstr "Състоянието на работното дърво не може да бъде запазено"
-#: builtin/stash.c:1233 git-legacy-stash.sh:234
+#: builtin/stash.c:1293
msgid "Cannot record working tree state"
msgstr "Състоянието на работното дърво не може да бъде запазено"
-#: builtin/stash.c:1282 git-legacy-stash.sh:338
+#: builtin/stash.c:1342
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "Опцията „--patch“ е несъвместима с „--include-untracked“ и „--all“"
-#: builtin/stash.c:1298
+#: builtin/stash.c:1358
msgid "Did you forget to 'git add'?"
msgstr "Пробвайте да използвате „git add“"
-#: builtin/stash.c:1313 git-legacy-stash.sh:346
+#: builtin/stash.c:1373
msgid "No local changes to save"
msgstr "Няма никакви локални промени за скатаване"
-#: builtin/stash.c:1320 git-legacy-stash.sh:351
+#: builtin/stash.c:1380
msgid "Cannot initialize stash"
msgstr "Скатаването не може да стартира"
-#: builtin/stash.c:1335 git-legacy-stash.sh:355
+#: builtin/stash.c:1395
msgid "Cannot save the current status"
msgstr "Текущото състояние не може да бъде запазено"
-#: builtin/stash.c:1340
+#: builtin/stash.c:1400
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Състоянието на работната директория и индекса e запазено: „%s“"
-#: builtin/stash.c:1430 git-legacy-stash.sh:385
+#: builtin/stash.c:1490
msgid "Cannot remove worktree changes"
msgstr "Промените в работното дърво не могат да бъдат занулени"
-#: builtin/stash.c:1469 builtin/stash.c:1534
+#: builtin/stash.c:1529 builtin/stash.c:1594
msgid "keep index"
msgstr "запазване на индекса"
-#: builtin/stash.c:1471 builtin/stash.c:1536
+#: builtin/stash.c:1531 builtin/stash.c:1596
msgid "stash in patch mode"
msgstr "скатаване в режим за кръпки"
-#: builtin/stash.c:1472 builtin/stash.c:1537
+#: builtin/stash.c:1532 builtin/stash.c:1597
msgid "quiet mode"
msgstr "без извеждане на информация"
-#: builtin/stash.c:1474 builtin/stash.c:1539
+#: builtin/stash.c:1534 builtin/stash.c:1599
msgid "include untracked files in stash"
msgstr "скатаване и на неследените файлове"
-#: builtin/stash.c:1476 builtin/stash.c:1541
+#: builtin/stash.c:1536 builtin/stash.c:1601
msgid "include ignore files"
msgstr "скатаване и на игнорираните файлове"
-#: builtin/stash.c:1600
-#, c-format
-msgid "could not exec %s"
-msgstr "„%s“ не може да се изпълни"
+#: builtin/stash.c:1636
+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]"
@@ -21295,7 +22700,7 @@
msgid "prepend comment character and space to each line"
msgstr "добавяне на „# “ в началото на всеки ред"
-#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999
+#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Очаква се пълно име на указател, а не „%s“"
@@ -21310,7 +22715,7 @@
msgid "cannot strip one component off url '%s'"
msgstr "не може да се махне компонент от адреса „%s“"
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819
msgid "alternative anchor for relative paths"
msgstr "директория за определянето на относителните пътища"
@@ -21318,8 +22723,8 @@
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=ПЪТ] [ПЪТ…]"
-#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c: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“"
@@ -21350,12 +22755,13 @@
"."
#: builtin/submodule--helper.c:565
-msgid "Suppress output of entering each submodule command"
-msgstr "Без извеждане на изход при въвеждането на всяка команда за подмодули"
+msgid "suppress output of entering each submodule command"
+msgstr "без извеждане на изход при въвеждането на всяка команда за подмодули"
-#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063
-msgid "Recurse into nested submodules"
-msgstr "Рекурсивно обхождане на подмодулите"
+#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888
+#: builtin/submodule--helper.c:1487
+msgid "recurse into nested submodules"
+msgstr "рекурсивно обхождане на подмодулите"
#: builtin/submodule--helper.c:572
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
@@ -21370,103 +22776,156 @@
"настройката „%s“ липсва. Приема се, че това хранилище е правилният източник "
"за себе си."
-#: builtin/submodule--helper.c:667
+#: builtin/submodule--helper.c:666
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Неуспешно регистриране на адрес за пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:671
+#: 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:681
+#: builtin/submodule--helper.c:680
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "ПРЕДУПРЕЖДЕНИЕ: препоръчва се режим на обновяване за подмодула „%s“\n"
-#: builtin/submodule--helper.c:688
+#: builtin/submodule--helper.c:687
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
"Неуспешно регистриране на режима на обновяване за пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:710
-msgid "Suppress output for initializing a submodule"
-msgstr "Без извеждане на информация при инициализирането на подмодул"
+#: builtin/submodule--helper.c:709
+msgid "suppress output for initializing a submodule"
+msgstr "без извеждане на информация при инициализирането на подмодул"
-#: builtin/submodule--helper.c:715
+#: builtin/submodule--helper.c:714
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [ОПЦИЯ…] [ПЪТ]"
-#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
+#: builtin/submodule--helper.c: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:837
+#: builtin/submodule--helper.c:835
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "указателят сочен от „HEAD“ в подмодула „%s“ не може да бъде открит"
-#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "неуспешно рекурсивно обхождане на подмодула „%s“"
-#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199
-msgid "Suppress submodule status output"
-msgstr "Заглушаване на изхода за състоянието на подмодула"
+#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623
+msgid "suppress submodule status output"
+msgstr "без изход за състоянието на подмодула"
-#: builtin/submodule--helper.c:889
+#: builtin/submodule--helper.c:887
msgid ""
-"Use commit stored in the index instead of the one stored in the submodule "
+"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr ""
-"Използване на подаването указано в индекса, а не това от указателя „HEAD“ на "
+"използване на подаването указано в индекса, а не това от указателя „HEAD“ на "
"подмодула"
-#: builtin/submodule--helper.c:890
-msgid "recurse into nested submodules"
-msgstr "рекурсивно обхождане на подмодулите"
-
-#: builtin/submodule--helper.c:895
+#: builtin/submodule--helper.c:893
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [ПЪТ…]"
-#: builtin/submodule--helper.c:919
+#: builtin/submodule--helper.c:917
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name ПЪТ"
-#: builtin/submodule--helper.c:983
+#: 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:989
+#: builtin/submodule--helper.c:1413
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "неуспешно регистриране на адрес за пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:1003
+#: builtin/submodule--helper.c:1427
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "отдалеченият адрес на подмодула „%s“ не може да бъде получен"
-#: builtin/submodule--helper.c:1014
+#: builtin/submodule--helper.c:1438
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "отдалеченият адрес на подмодула „%s“ не може да бъде променен"
-#: builtin/submodule--helper.c:1061
-msgid "Suppress output of synchronizing submodule url"
-msgstr "Без извеждане на информация при синхронизирането на подмодул"
+#: builtin/submodule--helper.c:1485
+msgid "suppress output of synchronizing submodule url"
+msgstr "без извеждане на информация при синхронизирането на подмодул"
-#: builtin/submodule--helper.c:1068
+#: builtin/submodule--helper.c:1492
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [ПЪТ]"
-#: builtin/submodule--helper.c:1122
+#: builtin/submodule--helper.c:1546
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -21475,7 +22934,7 @@
"Работното дърво на подмодул „%s“ съдържа директория „.git“.\n"
"(ако искате да ги изтриете заедно с цялата им история, използвайте „rm -rf“)"
-#: builtin/submodule--helper.c:1134
+#: builtin/submodule--helper.c:1558
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -21484,47 +22943,47 @@
"Работното дърво на подмодул „%s“ съдържа локални промени. Можете да ги "
"отхвърлите с опцията „-f“"
-#: builtin/submodule--helper.c:1142
+#: builtin/submodule--helper.c:1566
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Директорията „%s“ е изчистена\n"
-#: builtin/submodule--helper.c:1144
+#: builtin/submodule--helper.c:1568
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr ""
"Директорията към работното дърво на подмодула „%s“ не може да бъде изтрита\n"
-#: builtin/submodule--helper.c:1155
+#: builtin/submodule--helper.c:1579
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "празната директория за подмодула „%s“ не може да бъде създадена"
-#: builtin/submodule--helper.c:1171
+#: 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:1200
-msgid "Remove submodule working trees even if they contain local changes"
+#: builtin/submodule--helper.c:1624
+msgid "remove submodule working trees even if they contain local changes"
msgstr ""
-"Изтриване на работните дървета на подмодулите, дори когато те съдържат "
+"изтриване на работните дървета на подмодулите, дори когато те съдържат "
"локални промени"
-#: builtin/submodule--helper.c:1201
-msgid "Unregister all submodules"
-msgstr "Премахване на регистрациите на всички подмодули"
+#: builtin/submodule--helper.c:1625
+msgid "unregister all submodules"
+msgstr "премахване на регистрациите на всички подмодули"
-#: builtin/submodule--helper.c:1206
+#: 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:1220
+#: builtin/submodule--helper.c:1644
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Използвайте „--all“, за да премахнете всички подмодули"
-#: builtin/submodule--helper.c:1289
+#: 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"
@@ -21536,47 +22995,47 @@
"задайте настройката „submodule.alternateErrorStrategy“ да е „info“ или\n"
"при клониране ползвайте опцията „--reference-if-able“ вместо „--reference“."
-#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331
+#: 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:1367
+#: builtin/submodule--helper.c:1791
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
"Непозната стойност „%s“ за настройката „submodule.alternateErrorStrategy“"
-#: builtin/submodule--helper.c:1374
+#: builtin/submodule--helper.c:1798
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Непозната стойност „%s“ за настройката „submodule.alternateLocation“"
-#: builtin/submodule--helper.c:1398
+#: builtin/submodule--helper.c:1822
msgid "where the new submodule will be cloned to"
msgstr "къде да се клонира новият подмодул"
-#: builtin/submodule--helper.c:1401
+#: builtin/submodule--helper.c:1825
msgid "name of the new submodule"
msgstr "име на новия подмодул"
-#: builtin/submodule--helper.c:1404
+#: builtin/submodule--helper.c:1828
msgid "url where to clone the submodule from"
msgstr "адрес, от който да се клонира новият подмодул"
-#: builtin/submodule--helper.c:1412
+#: builtin/submodule--helper.c:1836
msgid "depth for shallow clones"
msgstr "дълбочина на плитките хранилища"
-#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924
+#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348
msgid "force cloning progress"
msgstr "извеждане на напредъка на клонирането"
-#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926
+#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350
msgid "disallow cloning into non-empty directory"
msgstr "предотвратяване на клониране в непразна история"
-#: builtin/submodule--helper.c:1424
+#: builtin/submodule--helper.c:1848
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -21585,108 +23044,108 @@
"git submodule--helper clone [--prefix=ПЪТ] [--quiet] [--reference ХРАНИЛИЩЕ] "
"[--name ИМЕ] [--depth ДЪЛБОЧИНА] [--single-branch] --url АДРЕС --path ПЪТ"
-#: builtin/submodule--helper.c:1449
+#: 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:1460
+#: builtin/submodule--helper.c:1884
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "Неуспешно клониране на адреса „%s“ в пътя „%s“ като подмодул"
-#: builtin/submodule--helper.c:1464
+#: builtin/submodule--helper.c:1888
#, c-format
msgid "directory not empty: '%s'"
msgstr "директорията не е празна: „%s“"
-#: builtin/submodule--helper.c:1476
+#: builtin/submodule--helper.c:1900
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "директорията на подмодула „%s“ не може да бъде получена"
-#: builtin/submodule--helper.c:1512
+#: builtin/submodule--helper.c:1936
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Неправилен режим на обновяване „%s“ за пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:1516
+#: builtin/submodule--helper.c:1940
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
"Настроен е неправилен режим на обновяване „%s“ за пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:1617
+#: builtin/submodule--helper.c:2041
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Пътят на подмодула „%s“ не е инициализиран"
-#: builtin/submodule--helper.c:1621
+#: builtin/submodule--helper.c:2045
msgid "Maybe you want to use 'update --init'?"
msgstr "Вероятно искахте да използвате „update --init“?"
-#: builtin/submodule--helper.c:1651
+#: builtin/submodule--helper.c:2075
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Прескачане на неслетия подмодул „%s“"
-#: builtin/submodule--helper.c:1680
+#: builtin/submodule--helper.c:2104
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Прескачане на подмодула „%s“"
-#: builtin/submodule--helper.c:1830
+#: builtin/submodule--helper.c:2254
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Неуспешен опит за клониране на „%s“. Насрочен е втори опит"
-#: builtin/submodule--helper.c:1841
+#: builtin/submodule--helper.c:2265
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr ""
"Втори неуспешен опит за клониране на „%s“. Действието се преустановява"
-#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149
+#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573
msgid "path into the working tree"
msgstr "път към работното дърво"
-#: builtin/submodule--helper.c:1906
+#: builtin/submodule--helper.c:2330
msgid "path into the working tree, across nested submodule boundaries"
msgstr "път към работното дърво, през границите на вложените подмодули"
-#: builtin/submodule--helper.c:1910
+#: builtin/submodule--helper.c:2334
msgid "rebase, merge, checkout or none"
msgstr ""
"„rebase“ (пребазиране), „merge“ (сливане), „checkout“ (изтегляне) или "
"„none“ (нищо да не се прави)"
-#: builtin/submodule--helper.c:1916
-msgid "Create a shallow clone truncated to the specified number of revisions"
-msgstr "Плитко клониране, отрязано до указания брой версии"
+#: builtin/submodule--helper.c:2340
+msgid "create a shallow clone truncated to the specified number of revisions"
+msgstr "извършване на плитко клониране, отрязано до указания брой версии"
-#: builtin/submodule--helper.c:1919
+#: builtin/submodule--helper.c:2343
msgid "parallel jobs"
msgstr "брой паралелни процеси"
-#: builtin/submodule--helper.c:1921
+#: builtin/submodule--helper.c:2345
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "дали първоначалното клониране да е плитко, както се препоръчва"
-#: builtin/submodule--helper.c:1922
+#: builtin/submodule--helper.c:2346
msgid "don't print cloning progress"
msgstr "без извеждане на напредъка на клонирането"
-#: builtin/submodule--helper.c:1933
+#: 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:1946
+#: builtin/submodule--helper.c:2370
msgid "bad value for update parameter"
msgstr "неправилен параметър към опцията „--update“"
-#: builtin/submodule--helper.c:1994
+#: builtin/submodule--helper.c:2418
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -21695,50 +23154,83 @@
"Клонът на подмодула „%s“ е настроен да наследява клона от обхващащия проект, "
"но той не е на никой клон"
-#: builtin/submodule--helper.c:2117
+#: builtin/submodule--helper.c:2541
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "не може да се получи връзка към хранилище за подмодула „%s“"
-#: builtin/submodule--helper.c:2150
+#: builtin/submodule--helper.c:2574
msgid "recurse into submodules"
msgstr "рекурсивно обхождане подмодулите"
-#: builtin/submodule--helper.c:2156
+#: 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:2212
+#: builtin/submodule--helper.c:2636
msgid "check if it is safe to write to the .gitmodules file"
msgstr "проверка дали писането във файла „.gitmodules“ е безопасно"
-#: builtin/submodule--helper.c:2215
+#: builtin/submodule--helper.c:2639
msgid "unset the config in the .gitmodules file"
msgstr "изтриване на настройка във файла „.gitmodules“"
-#: builtin/submodule--helper.c:2220
+#: builtin/submodule--helper.c:2644
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config ИМЕ [СТОЙНОСТ]"
-#: builtin/submodule--helper.c:2221
+#: builtin/submodule--helper.c:2645
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset ИМЕ"
-#: builtin/submodule--helper.c:2222
+#: builtin/submodule--helper.c:2646
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2241 git-submodule.sh:174
+#: builtin/submodule--helper.c:2665 git-submodule.sh:150
#, sh-format
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "файлът „.gitmodules“ трябва да е в работното дърво"
-#: builtin/submodule--helper.c:2291 git.c:433 git.c:684
+#: builtin/submodule--helper.c: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:441 git.c:714
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "„%s“ не поддържа опцията „--super-prefix“"
-#: builtin/submodule--helper.c:2297
+#: builtin/submodule--helper.c:2798
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "„%s“ не е подкоманда на „submodule--helper“"
@@ -21763,11 +23255,11 @@
msgid "shorten ref output"
msgstr "кратка информация за указателя"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
msgid "reason"
msgstr "причина"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
msgid "reason of the update"
msgstr "причина за обновяването"
@@ -21787,10 +23279,12 @@
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>..."
@@ -21801,12 +23295,12 @@
msgid "tag '%s' not found."
msgstr "етикетът „%s“ не е открит."
-#: builtin/tag.c:105
+#: builtin/tag.c:124
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Изтрит е етикетът „%s“ (бе „%s“)\n"
-#: builtin/tag.c:135
+#: builtin/tag.c:159
#, c-format
msgid ""
"\n"
@@ -21819,7 +23313,7 @@
" %s\n"
"Редовете, които започват с „%c“, ще бъдат пропуснати.\n"
-#: builtin/tag.c:139
+#: builtin/tag.c:163
#, c-format
msgid ""
"\n"
@@ -21834,15 +23328,11 @@
"Редовете, които започват с „%c“, също ще бъдат включени — може да ги "
"изтриете вие.\n"
-#: builtin/tag.c:198
+#: builtin/tag.c:230
msgid "unable to sign the tag"
msgstr "етикетът не може да бъде подписан"
-#: builtin/tag.c:200
-msgid "unable to write tag file"
-msgstr "файлът за етикета не може да бъде запазен"
-
-#: builtin/tag.c:216
+#: builtin/tag.c:248
#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
@@ -21856,138 +23346,134 @@
"\n"
" git tag -f %s %s^{}"
-#: builtin/tag.c:232
+#: builtin/tag.c:264
msgid "bad object type."
msgstr "неправилен вид обект."
-#: builtin/tag.c:284
+#: builtin/tag.c:317
msgid "no tag message?"
msgstr "липсва съобщение за етикета"
-#: builtin/tag.c:291
+#: builtin/tag.c:324
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Съобщението за етикета е запазено във файла „%s“\n"
-#: builtin/tag.c:402
+#: builtin/tag.c:435
msgid "list tag names"
msgstr "извеждане на имената на етикетите"
-#: builtin/tag.c:404
+#: builtin/tag.c:437
msgid "print <n> lines of each tag message"
msgstr "извеждане на този БРОЙ редове от всяко съобщение за етикет"
-#: builtin/tag.c:406
+#: builtin/tag.c:439
msgid "delete tags"
msgstr "изтриване на етикети"
-#: builtin/tag.c:407
+#: builtin/tag.c:440
msgid "verify tags"
msgstr "проверка на етикети"
-#: builtin/tag.c:409
+#: builtin/tag.c:442
msgid "Tag creation options"
msgstr "Опции при създаването на етикети"
-#: builtin/tag.c:411
+#: builtin/tag.c:444
msgid "annotated tag, needs a message"
msgstr "анотирането на етикети изисква съобщение"
-#: builtin/tag.c:413
+#: builtin/tag.c:446
msgid "tag message"
msgstr "СЪОБЩЕНИЕ за етикет"
-#: builtin/tag.c:415
+#: builtin/tag.c:448
msgid "force edit of tag message"
msgstr "принудително редактиране на съобщение за етикет"
-#: builtin/tag.c:416
+#: builtin/tag.c:449
msgid "annotated and GPG-signed tag"
msgstr "анотиран етикет с подпис по GPG"
-#: builtin/tag.c:419
+#: builtin/tag.c:452
msgid "use another key to sign the tag"
msgstr "използване на друг ключ за подписването на етикет"
-#: builtin/tag.c:420
+#: builtin/tag.c:453
msgid "replace the tag if exists"
msgstr "замяна на етикета, ако съществува"
-#: builtin/tag.c:421 builtin/update-ref.c:369
+#: builtin/tag.c:454 builtin/update-ref.c:505
msgid "create a reflog"
msgstr "създаване на журнал на указателите"
-#: builtin/tag.c:423
+#: builtin/tag.c:456
msgid "Tag listing options"
msgstr "Опции за извеждането на етикети"
-#: builtin/tag.c:424
+#: builtin/tag.c:457
msgid "show tag list in columns"
msgstr "извеждане на списъка на етикетите по колони"
-#: builtin/tag.c:425 builtin/tag.c:427
+#: builtin/tag.c:458 builtin/tag.c:460
msgid "print only tags that contain the commit"
msgstr "извеждане само на етикетите, които съдържат подаването"
-#: builtin/tag.c:426 builtin/tag.c:428
+#: builtin/tag.c:459 builtin/tag.c:461
msgid "print only tags that don't contain the commit"
msgstr "извеждане само на етикетите, които не съдържат подаването"
-#: builtin/tag.c:429
+#: builtin/tag.c:462
msgid "print only tags that are merged"
msgstr "извеждане само на слетите етикети"
-#: builtin/tag.c:430
+#: builtin/tag.c:463
msgid "print only tags that are not merged"
msgstr "извеждане само на неслетите етикети"
-#: builtin/tag.c:434
+#: builtin/tag.c:467
msgid "print only tags of the object"
msgstr "извеждане само на етикетите на ОБЕКТА"
-#: builtin/tag.c:482
+#: builtin/tag.c:515
msgid "--column and -n are incompatible"
msgstr "Опциите „--column“ и „-n“ са несъвместими"
-#: builtin/tag.c:504
+#: builtin/tag.c:537
msgid "-n option is only allowed in list mode"
msgstr "Опцията „-n“ изисква режим на списък."
-#: builtin/tag.c:506
+#: builtin/tag.c:539
msgid "--contains option is only allowed in list mode"
msgstr "Опцията „-contains“ изисква режим на списък."
-#: builtin/tag.c:508
+#: builtin/tag.c:541
msgid "--no-contains option is only allowed in list mode"
msgstr "Опцията „-contains“ изисква режим на списък."
-#: builtin/tag.c:510
+#: builtin/tag.c:543
msgid "--points-at option is only allowed in list mode"
msgstr "Опцията „-points-at“ изисква режим на списък."
-#: builtin/tag.c:512
+#: builtin/tag.c:545
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "Опциите „--merged“ и „--no-merged“ изискват режим на списък."
-#: builtin/tag.c:523
+#: builtin/tag.c:556
msgid "only one -F or -m option is allowed."
msgstr "Опциите „-F“ и „-m“ са несъвместими."
-#: builtin/tag.c:542
-msgid "too many params"
-msgstr "Прекалено много аргументи"
-
-#: builtin/tag.c:548
+#: builtin/tag.c:581
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "„%s“ е неправилно име за етикет."
-#: builtin/tag.c:553
+#: builtin/tag.c:586
#, c-format
msgid "tag '%s' already exists"
msgstr "етикетът „%s“ вече съществува"
-#: builtin/tag.c:584
+#: builtin/tag.c:617
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Обновен етикет „%s“ (бе „%s“)\n"
@@ -22216,7 +23702,7 @@
"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:1182
@@ -22244,7 +23730,7 @@
"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:1210
@@ -22285,21 +23771,21 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [ОПЦИЯ…] --stdin [-z]"
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:500
msgid "delete the reference"
msgstr "изтриване на указателя"
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:502
msgid "update <refname> not the one it points to"
msgstr "обновяване на ИМЕто_НА_УКАЗАТЕЛя, а не това, към което сочи"
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:503
msgid "stdin has NUL-terminated arguments"
msgstr ""
"някои от елементите подадени на стандартния вход завършват с нулевия знак "
"„NUL“"
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:504
msgid "read updates from stdin"
msgstr "изчитане на указателите от стандартния вход"
@@ -22344,15 +23830,15 @@
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 "извеждане само на статистиката"
@@ -22364,233 +23850,209 @@
msgid "print tag contents"
msgstr "извеждане на съдържанието на ЕТИКЕТи"
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [ОПЦИЯ…] ПЪТ [УКАЗАТЕЛ_КЪМ_ПОДАВАНЕ]"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree list [<options>]"
msgstr "git worktree list [ОПЦИЯ…]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [ОПЦИЯ…] [ПЪТ]"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move [ДЪРВО] [НОВ_ПЪТ]"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [ОПЦИЯ…]"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [ОПЦИЯ…] [ДЪРВО]"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree unlock <path>"
msgstr "git worktree unlock [ПЪТ]"
-#: builtin/worktree.c:60 builtin/worktree.c:891
+#: builtin/worktree.c:61 builtin/worktree.c:933
#, c-format
msgid "failed to delete '%s'"
msgstr "неуспешно изтриване на „%s“"
-#: builtin/worktree.c:79
+#: builtin/worktree.c:74
#, c-format
-msgid "Removing worktrees/%s: not a valid directory"
-msgstr "Изтриване на „worktrees/%s“: не е правилна поддиректория"
+msgid "Removing %s/%s: %s"
+msgstr "Изтриване на „%s/%s“: %s"
-#: builtin/worktree.c:85
-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
-msgstr "Изтриване на „worktrees/%s“: файлът „gitdir“ не съществува"
-
-#: builtin/worktree.c:90 builtin/worktree.c:99
-#, c-format
-msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
-msgstr ""
-"Изтриване на „worktrees/%s“: файлът „gitdir“ (%s) не може да бъде прочетен"
-
-#: builtin/worktree.c:109
-#, c-format
-msgid ""
-"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
-"%<PRIuMAX>)"
-msgstr ""
-"Изтриване на „worktrees/%s“: изчитането върна по-малко байтове от очакваното "
-"(очаквани: %<PRIuMAX> байта, получени: %<PRIuMAX>)"
-
-#: builtin/worktree.c:117
-#, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
-msgstr "Изтриване на „worktrees/%s“: неправилен файл „gitdir“"
-
-#: builtin/worktree.c:126
-#, c-format
-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
-msgstr ""
-"Изтриване на „worktrees/%s“: файлът „gitdir“ сочи несъществуващо "
-"местоположение"
-
-#: builtin/worktree.c:165
+#: builtin/worktree.c:149
msgid "report pruned working trees"
msgstr "докладване на окастрените работни дървета"
-#: builtin/worktree.c:167
+#: builtin/worktree.c:151
msgid "expire working trees older than <time>"
msgstr "обявяване на работните копия по-стари от това ВРЕМЕ за остарели"
-#: builtin/worktree.c:234
+#: builtin/worktree.c:221
#, c-format
msgid "'%s' already exists"
msgstr "„%s“ вече съществува"
-#: builtin/worktree.c:244
+#: builtin/worktree.c:230
#, c-format
-msgid "unable to re-add worktree '%s'"
-msgstr "дървото „%s“ не може да бъде добавено наново"
+msgid "unusable worktree destination '%s'"
+msgstr "целта не може да се ползва за работно дърво: „%s“"
-#: builtin/worktree.c:249
+#: builtin/worktree.c:235
#, 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:251
+#: builtin/worktree.c:237
#, 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:301
+#: builtin/worktree.c:288
#, c-format
msgid "could not create directory of '%s'"
msgstr "директорията „%s“ не може да бъде създадена"
-#: builtin/worktree.c:432 builtin/worktree.c:438
+#: builtin/worktree.c:422 builtin/worktree.c:428
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Приготвяне на работното дърво (нов клон „%s“)"
-#: builtin/worktree.c:434
+#: builtin/worktree.c:424
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
"Приготвяне на работното дърво (зануляване на клона „%s“, който сочеше към "
"„%s“)"
-#: builtin/worktree.c:443
+#: builtin/worktree.c:433
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Приготвяне на работното дърво (изтегляне на „%s“)"
-#: builtin/worktree.c:449
+#: builtin/worktree.c:439
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Подготвяне на работно дърво (указателят „HEAD“ не свързан: %s)"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:480
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "Изтегляне КЛОНа, дори и да е изтеглен в друго работно дърво"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:483
msgid "create a new branch"
msgstr "създаване на нов клон"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:485
msgid "create or reset a branch"
msgstr "създаване или зануляване на клони"
-#: builtin/worktree.c:497
+#: builtin/worktree.c:487
msgid "populate the new working tree"
msgstr "подготвяне на новото работно дърво"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:488
msgid "keep the new working tree locked"
msgstr "новото работно дърво да остане заключено"
-#: builtin/worktree.c:501
+#: builtin/worktree.c:491
msgid "set up tracking mode (see git-branch(1))"
msgstr "задаване на режима на следене (виж git-branch(1))"
-#: builtin/worktree.c:504
+#: builtin/worktree.c:494
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "опит за напасване на името на новия клон с това на следящ клон"
-#: builtin/worktree.c:512
+#: builtin/worktree.c:502
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "Опциите „-b“, „-B“ и „--detach“ са несъвместими една с друга"
-#: builtin/worktree.c:573
+#: builtin/worktree.c:563
msgid "--[no-]track can only be used if a new branch is created"
msgstr "„--[no-]track“ може да се използва само при създаването на нов клон"
-#: builtin/worktree.c:673
+#: builtin/worktree.c:680
+msgid "show extended annotations and reasons, if available"
+msgstr "извеждане на подробни анотации и обяснения, ако такива са налични"
+
+#: builtin/worktree.c:682
+msgid "add 'prunable' annotation to worktrees older than <time>"
+msgstr ""
+"добавяне на анотация за окастряне на работните копия по-стари от това ВРЕМЕ"
+
+#: builtin/worktree.c:691
+msgid "--verbose and --porcelain are mutually exclusive"
+msgstr "опциите „--verbose“ и „--porcelain“ са несъвместими"
+
+#: builtin/worktree.c:718
msgid "reason for locking"
msgstr "причина за заключване"
-#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
-#: builtin/worktree.c:919
+#: builtin/worktree.c:730 builtin/worktree.c:763 builtin/worktree.c:837
+#: builtin/worktree.c:961
#, c-format
msgid "'%s' is not a working tree"
msgstr "„%s“ не е работно дърво"
-#: builtin/worktree.c:687 builtin/worktree.c:720
+#: builtin/worktree.c:732 builtin/worktree.c:765
msgid "The main working tree cannot be locked or unlocked"
msgstr "Основното дърво не може да се отключи или заключи"
-#: builtin/worktree.c:692
+#: builtin/worktree.c:737
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "„%s“ вече е заключено, защото „%s“"
-#: builtin/worktree.c:694
+#: builtin/worktree.c:739
#, c-format
msgid "'%s' is already locked"
msgstr "„%s“ вече е заключено"
-#: builtin/worktree.c:722
+#: builtin/worktree.c:767
#, c-format
msgid "'%s' is not locked"
msgstr "„%s“ не е заключено"
-#: builtin/worktree.c:763
+#: builtin/worktree.c:808
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
"не може да местите или изтривате работни дървета, в които има подмодули"
-#: builtin/worktree.c:771
+#: builtin/worktree.c:816
msgid "force move even if worktree is dirty or locked"
msgstr ""
"принудително преместване, дори работното дърво да не е чисто или да е "
"заключено"
-#: builtin/worktree.c:794 builtin/worktree.c:921
+#: builtin/worktree.c:839 builtin/worktree.c:963
#, c-format
msgid "'%s' is a main working tree"
msgstr "„%s“ е основно работно дърво"
-#: builtin/worktree.c:799
+#: builtin/worktree.c:844
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "името на целта не може да се определи от „%s“"
-#: builtin/worktree.c:805
-#, c-format
-msgid "target '%s' already exists"
-msgstr "целта „%s“ вече съществува"
-
-#: builtin/worktree.c:813
+#: builtin/worktree.c:857
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -22599,7 +24061,7 @@
"не може да преместите заключено работно дърво, причина за заключването: %s\n"
"или го отключете, или го преместете принудително с „move -f -f“"
-#: builtin/worktree.c:815
+#: builtin/worktree.c:859
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -22607,41 +24069,41 @@
"не може да преместите заключено работно дърво:\n"
"или го отключете, или го преместете принудително с „move -f -f“"
-#: builtin/worktree.c:818
+#: builtin/worktree.c:862
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr ""
"проверките са неуспешни, работното дърво не може да бъде преместено: %s"
-#: builtin/worktree.c:823
+#: builtin/worktree.c:867
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "„%s“ не може да се премести в „%s“"
-#: builtin/worktree.c:871
+#: builtin/worktree.c:913
#, c-format
msgid "failed to run 'git status' on '%s'"
-msgstr "не може да изпълни „git status“ върху „%s“"
+msgstr "неуспешно изпълнение на „git status“ върху „%s“"
-#: builtin/worktree.c:875
+#: builtin/worktree.c:917
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
"„%s“ съдържа променени или нови файлове, за принудително изтриване е "
"необходима опцията „--force“"
-#: builtin/worktree.c:880
+#: builtin/worktree.c:922
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr ""
"командата „git status“ не може да се изпълни за „%s“, код за грешка: %d"
-#: builtin/worktree.c:903
+#: builtin/worktree.c:945
msgid "force removal even if worktree is dirty or locked"
msgstr ""
"принудително изтриване, дори работното дърво да не е чисто или да е заключено"
-#: builtin/worktree.c:926
+#: builtin/worktree.c:968
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -22650,7 +24112,7 @@
"не може да изтриете заключено работно дърво, причина за заключването: %s\n"
"или го отключете, или го изтрийте принудително с „remove -f -f“"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:970
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -22658,11 +24120,21 @@
"не може да изтриете заключено работно дърво:\n"
"или го отключете, или го изтрийте принудително с „remove -f -f“"
-#: builtin/worktree.c:931
+#: builtin/worktree.c:973
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "проверките са неуспешни, работното дърво не може да бъде изтрито: %s"
+#: builtin/worktree.c:997
+#, c-format
+msgid "repair: %s: %s"
+msgstr "поправяне: %s: „%s“"
+
+#: builtin/worktree.c:1000
+#, 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=ПРЕФИКС/]"
@@ -22679,46 +24151,37 @@
msgid "only useful for debugging"
msgstr "само за изчистване на грешки"
-#: fast-import.c:3125
+#: http-fetch.c:118
#, c-format
-msgid "Expected 'mark' command, got %s"
-msgstr "очаква се команда „mark“, а бе получена: „%s“"
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr "опцията „--packfile“ изисква валидна контролна сума (а не „%s“)"
-#: fast-import.c:3130
-#, c-format
-msgid "Expected 'to' command, got %s"
-msgstr "очаква се команда „to“, а бе получена: „%s“"
+#: http-fetch.c:128
+msgid "not a git repository"
+msgstr "не е хранилище на Git"
-#: fast-import.c:3254
-#, c-format
-msgid "feature '%s' forbidden in input without --allow-unsafe-features"
-msgstr "„%s“ изисква изричното задаване на опцията „--allow-unsafe-features“"
+#: http-fetch.c:134
+msgid "--packfile requires --index-pack-args"
+msgstr "опцията „--packfile“ изисква опция „--index-pack-args“"
-#: credential-cache--daemon.c:223
-#, c-format
-msgid ""
-"The permissions on your socket directory are too loose; other\n"
-"users may be able to read your cached credentials. Consider running:\n"
-"\n"
-"\tchmod 0700 %s"
-msgstr ""
-"Правата за достъп до директорията за програмните гнезда са прекалено "
-"свободни —\n"
-"другите потребители могат да получат достъп до кешираните ви пароли. За да\n"
-"коригирате това, изпълнете:\n"
-"\n"
-" chmod 0700 %s"
+#: http-fetch.c:143
+msgid "--index-pack-args can only be used with --packfile"
+msgstr "опцията „--index-pack-args“ изисква опция „--packfile“"
-#: credential-cache--daemon.c:272
-msgid "print debugging messages to stderr"
-msgstr "извеждане на съобщенията за трасиране на стандартната грешка"
+#: t/helper/test-fast-rebase.c:141
+msgid "unhandled options"
+msgstr "неподдържани опции"
-#: t/helper/test-reach.c:152
+#: t/helper/test-fast-rebase.c:146
+msgid "error preparing revisions"
+msgstr "грешка при подготовката на версии"
+
+#: 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 "прекалено много подавания са отбелязани като достижими"
@@ -22730,22 +24193,25 @@
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"
" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
"bare]\n"
" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
" <command> [<args>]"
msgstr ""
"git [--version] [--help] [-C ПЪТ] [-c ИМЕ=СТОЙНОСТ]\n"
" [--exec-path[=ПЪТ]] [--html-path] [--man-path] [--info-path]\n"
-" [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n"
+" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"
" [--git-dir=ПЪТ] [--work-tree=ПЪТ] [--namespace=ИМЕ]\n"
+" [--super-prefix=ПЪТ] [--config-env=ИМЕ=ПРОМЕНЛИВА_НА_СРЕДАТА]\n"
" КОМАНДА [АРГ…]"
-#: git.c:34
+#: git.c:36
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"
@@ -22759,47 +24225,47 @@
"някое определено ПОНЯТИЕ използвайте „git help ПОНЯТИЕ“. За преглед на\n"
"системата за помощ използвайте „git help git“."
-#: git.c:186
+#: git.c:188
#, c-format
msgid "no directory given for --git-dir\n"
msgstr "опцията „--git-dir“ изисква директория\n"
-#: git.c:200
+#: git.c:202
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "опцията „--namespace“ изисква име\n"
-#: git.c:214
+#: git.c:216
#, c-format
msgid "no directory given for --work-tree\n"
msgstr "опцията „--work-tree“ изисква директория\n"
-#: git.c:228
+#: git.c:230
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr "опцията „--super-prefix“ изисква префикс\n"
-#: git.c:250
+#: git.c:252
#, c-format
msgid "-c expects a configuration string\n"
msgstr "опцията „-c“ изисква низ за настройка\n"
-#: git.c:288
+#: git.c:292
#, c-format
msgid "no directory given for -C\n"
msgstr "опцията „-C“ изисква директория\n"
-#: git.c:314
+#: git.c:318
#, c-format
msgid "unknown option: %s\n"
msgstr "непозната опция: „%s“\n"
-#: git.c:360
+#: git.c:367
#, c-format
msgid "while expanding alias '%s': '%s'"
msgstr "при заместването на псевдоним „%s“: „%s“"
-#: git.c:369
+#: git.c:376
#, c-format
msgid ""
"alias '%s' changes environment variables.\n"
@@ -22808,39 +24274,39 @@
"псевдонимът „%s“ променя променливи на средата.\n"
"За това може да ползвате „!git“ в псевдонима"
-#: git.c:376
+#: git.c:383
#, c-format
msgid "empty alias for %s"
msgstr "празен псевдоним за „%s“"
-#: git.c:379
+#: git.c:386
#, c-format
msgid "recursive alias: %s"
msgstr "зациклен псевдоним: „%s“"
-#: git.c:459
+#: git.c:468
msgid "write failure on standard output"
msgstr "грешка при запис на стандартния изход"
-#: git.c:461
+#: git.c:470
msgid "unknown write failure on standard output"
msgstr "неизвестна грешка при запис на стандартния изход"
-#: git.c:463
+#: git.c:472
msgid "close failed on standard output"
msgstr "грешка при затваряне на стандартния изход"
-#: git.c:793
+#: git.c:823
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "зацикляне в псевдонимите: заместванията на „%s“ не приключват:%s"
-#: git.c:843
+#: git.c:873
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "„%s“ не може да се обработи като вградена команда"
-#: git.c:856
+#: git.c:886
#, c-format
msgid ""
"usage: %s\n"
@@ -22849,60 +24315,60 @@
"употреба: %s\n"
"\n"
-#: git.c:876
+#: git.c:906
#, 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:918
#, 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:1086
+#: http.c:1132
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "Неподдържана реализация на SSL „%s“. Поддържат се:"
-#: http.c:1093
+#: 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:1097
+#: http.c:1143
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr ""
"Реализацията на SSL не може да се зададе да е „%s“, защото вече е зададена "
"друга"
-#: http.c:1966
+#: http.c:2025
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -22913,129 +24379,160 @@
" ● заявен адрес: %s\n"
" ● пренасочване: %s"
-#: remote-curl.c:166
+#: remote-curl.c:183
#, c-format
msgid "invalid quoting in push-option value: '%s'"
msgstr ""
"неправилно екраниране или цитиране в стойността към опция за изтласкване: "
"„%s“"
-#: remote-curl.c:263
+#: remote-curl.c:307
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "„%sinfo/refs“ е неизползваемо, проверете дали е хранилище на git"
-#: remote-curl.c:364
+#: remote-curl.c:408
msgid "invalid server response; expected service, got flush packet"
msgstr ""
"неправилен отговор от сървъра: очакваше се услуга, а бе получен изчистващ "
"пакет „flush“"
-#: remote-curl.c:395
+#: remote-curl.c:439
#, c-format
msgid "invalid server response; got '%s'"
msgstr "неправилен отговор от сървъра, бе получено: „%s“"
-#: remote-curl.c:455
+#: remote-curl.c:499
#, c-format
msgid "repository '%s' not found"
msgstr "хранилището „%s“ липсва"
-#: remote-curl.c:459
+#: remote-curl.c:503
#, c-format
msgid "Authentication failed for '%s'"
msgstr "Неуспешна идентификация към „%s“"
-#: remote-curl.c:463
+#: remote-curl.c:507
#, c-format
msgid "unable to access '%s': %s"
msgstr "няма достъп до „%s“: %s"
-#: remote-curl.c:469
+#: remote-curl.c:513
#, c-format
msgid "redirecting to %s"
msgstr "пренасочване към „%s“"
-#: remote-curl.c:593
+#: remote-curl.c:642
msgid "shouldn't have EOF when not gentle on EOF"
msgstr "получен е EOF, в режим без поддръжка за това"
-#: remote-curl.c:673
+#: remote-curl.c:654
+msgid "remote server sent stateless separator"
+msgstr "отдалеченият сървър изпрати разделител без запазване на състоянието"
+
+#: remote-curl.c:724
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr ""
"данните за POST не могат да се прочетат наново, пробвайте да увеличите "
"настройката „http.postBuffer“"
-#: remote-curl.c:733
+#: remote-curl.c:754
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr "remote-curl: неправилeн знак за дължина на ред: %.4s"
+
+#: remote-curl.c:756
+msgid "remote-curl: unexpected response end packet"
+msgstr "remote-curl: неочакван пакет за край на отговор"
+
+#: remote-curl.c:832
#, c-format
msgid "RPC failed; %s"
msgstr "Неуспешно отдалечено извикване. %s"
-#: remote-curl.c:773
+#: remote-curl.c:872
msgid "cannot handle pushes this big"
msgstr "толкова големи изтласквания не може да се изпълнят"
-#: remote-curl.c:888
+#: remote-curl.c:987
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr ""
"заявката не може да бъде декомпресирана, грешка от „zlib“ при "
"декомпресиране: %d"
-#: remote-curl.c:892
+#: remote-curl.c:991
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr ""
"заявката не може да бъде декомпресирана; грешка от „zlib“ при завършване: %d<"
-#: remote-curl.c:1023
+#: remote-curl.c:1041
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr "получени са %d байта от заглавна част"
+
+#: remote-curl.c:1043
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr "очакват се още %d байта от тялото на отговора"
+
+#: remote-curl.c:1132
msgid "dumb http transport does not support shallow capabilities"
msgstr "опростеният транспорт по http не поддържа плитки клиенти"
-#: remote-curl.c:1038
+#: remote-curl.c:1147
msgid "fetch failed."
msgstr "неуспешно доставяне."
-#: remote-curl.c:1086
+#: remote-curl.c:1193
msgid "cannot fetch by sha1 over smart http"
msgstr "умният вариант на http не може да доставя по SHA1"
-#: remote-curl.c:1130 remote-curl.c:1136
+#: remote-curl.c:1237 remote-curl.c:1243
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "протоколна грешка: очаква се SHA1 или указател, а бе получено: „%s“"
-#: remote-curl.c:1148 remote-curl.c:1263
+#: remote-curl.c:1255 remote-curl.c:1373
#, c-format
msgid "http transport does not support %s"
msgstr "транспортът по http не поддържа „%s“"
-#: remote-curl.c:1184
+#: remote-curl.c:1291
msgid "git-http-push failed"
msgstr "неуспешно изпълнение на „git-http-push“"
-#: remote-curl.c:1369
+#: remote-curl.c:1479
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl: употреба: git remote-curl ХРАНИЛИЩЕ [АДРЕС]"
-#: remote-curl.c:1401
+#: remote-curl.c:1511
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl: грешка при изчитането на потока команди от git"
-#: remote-curl.c:1408
+#: remote-curl.c:1518
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl: опит за доставяне без локално хранилище"
-#: remote-curl.c:1448
+#: remote-curl.c:1559
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl: непозната команда „%s“ от git"
-#: list-objects-filter-options.h:85
+#: 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:86
+#: list-objects-filter-options.h:92
msgid "object filtering"
msgstr "филтриране по вид на обекта"
@@ -23056,8 +24553,8 @@
msgstr "по-малко подробности"
#: parse-options.h:317
-msgid "use <n> digits to display SHA-1s"
-msgstr "да се показват такъв БРОЙ цифри от сумите по SHA1"
+msgid "use <n> digits to display object names"
+msgstr "да се показват такъв БРОЙ цифри от имената на обектите"
#: parse-options.h:336
msgid "how to strip spaces and #comments from message"
@@ -23074,11 +24571,11 @@
"при ползването на „--pathspec-from-file“, пътищата са разделени с нулевия "
"знак „NUL“"
-#: ref-filter.h:101
+#: ref-filter.h:99
msgid "key"
msgstr "КЛЮЧ"
-#: ref-filter.h:101
+#: ref-filter.h:99
msgid "field name to sort on"
msgstr "име на полето, по което да е подредбата"
@@ -23088,14 +24585,6 @@
"при възможност преизползване на решението на конфликта за обновяване на "
"индекса"
-#: wt-status.h:67
-msgid "HEAD detached at "
-msgstr "Указателят „HEAD“ не е свързан и е при "
-
-#: wt-status.h:68
-msgid "HEAD detached from "
-msgstr "Указателят „HEAD“ не е свързан и е отделѐн от "
-
#: command-list.h:50
msgid "Add file contents to the index"
msgstr "Добавяне на съдържанието на файла към индекса"
@@ -23135,694 +24624,670 @@
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 "Run a Git command on a list of repositories"
+msgstr "Изпълняване на команда на git за всяко хранилище от списъка"
+
+#: command-list.h:100
msgid "Prepare patches for e-mail submission"
msgstr "Подготвяне на кръпки за изпращане по е-поща"
-#: command-list.h:99
+#: command-list.h:101
msgid "Verifies the connectivity and validity of the objects in the database"
msgstr "Проверка на обектите и връзките тях в базата от данни за обектите"
-#: command-list.h:100
+#: command-list.h:102
msgid "Cleanup unnecessary files and optimize the local repository"
msgstr "Изчистване на ненужните файлове и оптимизиране на локалното хранилище"
-#: command-list.h:101
+#: command-list.h:103
msgid "Extract commit ID from an archive created using git-archive"
msgstr "Извеждане на идентификатора на подаване от архив на „git-archive“"
-#: command-list.h:102
+#: command-list.h:104
msgid "Print lines matching a pattern"
msgstr "Извеждане на редовете напасващи на шаблон"
-#: command-list.h:103
+#: command-list.h:105
msgid "A portable graphical interface to Git"
msgstr "Графичен интерфейс към Git"
-#: command-list.h:104
+#: command-list.h:106
msgid "Compute object ID and optionally creates a blob from a file"
msgstr ""
"Изчисляване на идентификатор на обект и евентуално създаване на обект-BLOB "
"от файл"
-#: command-list.h:105
+#: command-list.h:107
msgid "Display help information about Git"
msgstr "Извеждане на помощта за Git"
-#: command-list.h:106
+#: command-list.h:108
msgid "Server side implementation of Git over HTTP"
msgstr "Сървърна реализация на Git по HTTP"
-#: command-list.h:107
+#: command-list.h:109
msgid "Download from a remote Git repository via HTTP"
msgstr "Изтегляне на отдалечено хранилище по HTTP"
-#: command-list.h:108
+#: command-list.h:110
msgid "Push objects over HTTP/DAV to another repository"
msgstr "Изтласкване на обекти по HTTP/DAV към друго хранилище"
-#: command-list.h:109
+#: command-list.h:111
msgid "Send a collection of patches from stdin to an IMAP folder"
msgstr "Изпращане на поредица от кръпки на стандартния вход към папка по IMAP"
-#: command-list.h:110
+#: command-list.h:112
msgid "Build pack index file for an existing packed archive"
msgstr "Създаване на пакетен индекс за съществуващ пакетиран архив"
-#: command-list.h:111
+#: command-list.h:113
msgid "Create an empty Git repository or reinitialize an existing one"
msgstr "Създаване на празно хранилище на Git или зануляване на съществуващо"
-#: command-list.h:112
+#: command-list.h:114
msgid "Instantly browse your working repository in gitweb"
msgstr "Незабавно разглеждане на работното ви хранилище чрез „gitweb“"
-#: command-list.h:113
+#: command-list.h:115
msgid "Add or parse structured information in commit messages"
msgstr ""
"Добавяне или обработка на структурирана информация в съобщенията при подаване"
-#: command-list.h:114
+#: command-list.h:116
msgid "The Git repository browser"
msgstr "Разглеждане на хранилище на Git"
-#: command-list.h:115
+#: command-list.h:117
msgid "Show commit logs"
msgstr "Извеждане на журнала с подаванията"
-#: command-list.h:116
+#: command-list.h:118
msgid "Show information about files in the index and the working tree"
msgstr "Извеждане на информация за файловете в индекса и работното дърво"
-#: command-list.h:117
+#: command-list.h:119
msgid "List references in a remote repository"
msgstr "Извеждане на указателите в отдалечено хранилище"
-#: command-list.h:118
+#: command-list.h:120
msgid "List the contents of a tree object"
msgstr "Извеждане на съдържанието на обект-дърво"
-#: command-list.h:119
+#: command-list.h:121
msgid "Extracts patch and authorship from a single e-mail message"
msgstr "Изваждане на кръпка и авторството от е-писмо"
-#: command-list.h:120
+#: command-list.h:122
msgid "Simple UNIX mbox splitter program"
msgstr "Проста програма за разделяне на файлове във формат UNIX mbox"
-#: command-list.h:121
+#: command-list.h:123
+msgid "Run tasks to optimize Git repository data"
+msgstr "Изпълнение на задачи за оптимизиране на хранилището на Git"
+
+#: command-list.h:124
msgid "Join two or more development histories together"
msgstr "Сливане на две или повече поредици/истории от промени"
-#: command-list.h:122
+#: command-list.h:125
msgid "Find as good common ancestors as possible for a merge"
msgstr "Откриване на най-подходящите общи предшественици за сливане"
-#: command-list.h:123
+#: command-list.h:126
msgid "Run a three-way file merge"
msgstr "Изпълнение на тройно сливане"
-#: command-list.h:124
+#: command-list.h:127
msgid "Run a merge for files needing merging"
msgstr "Сливане на файловете, които се нуждаят от това"
-#: command-list.h:125
+#: command-list.h:128
msgid "The standard helper program to use with git-merge-index"
msgstr "Стандартната помощна програма за „git-merge-index“"
-#: command-list.h:126
+#: command-list.h:129
msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr "Изпълнение на програмите за коригиране на конфликтите при сливане"
-#: command-list.h:127
+#: command-list.h:130
msgid "Show three-way merge without touching index"
msgstr "Извеждане на тройно сливане без промяна на индекса"
-#: command-list.h:128
+#: command-list.h:131
msgid "Write and verify multi-pack-indexes"
msgstr "Запис и проверка на индексите за множество пакети"
-#: command-list.h:129
-msgid "Creates a tag object"
-msgstr "Създаване на обект-етикет"
+#: command-list.h:132
+msgid "Creates a tag object with extra validation"
+msgstr "Създаване на обект-етикет с допълнителни проверки"
-#: command-list.h:130
+#: command-list.h:133
msgid "Build a tree-object from ls-tree formatted text"
msgstr "Създаване на обект-дърво от текст във формат „ls-tree“"
-#: command-list.h:131
+#: command-list.h:134
msgid "Move or rename a file, a directory, or a symlink"
msgstr "Преместване или преименуване на файл, директория или символна връзка"
-#: command-list.h:132
+#: command-list.h:135
msgid "Find symbolic names for given revs"
msgstr "Откриване на имената дадени на версия"
-#: command-list.h:133
+#: command-list.h:136
msgid "Add or inspect object notes"
msgstr "Добавяне или преглед на бележки към обект"
-#: command-list.h:134
+#: command-list.h:137
msgid "Import from and submit to Perforce repositories"
msgstr "Внасяне и подаване към хранилища на Perforce"
-#: command-list.h:135
+#: command-list.h:138
msgid "Create a packed archive of objects"
msgstr "Създаване на пакетиран архив от обекти"
-#: command-list.h:136
+#: command-list.h:139
msgid "Find redundant pack files"
msgstr "Намиране на повтарящи се пакетни файлове"
-#: command-list.h:137
+#: command-list.h:140
msgid "Pack heads and tags for efficient repository access"
msgstr "Пакетиране на върховете и етикетите за бърз достъп до хранилище"
-#: command-list.h:138
-msgid "Routines to help parsing remote repository access parameters"
-msgstr ""
-"Помощни програми за анализа на параметрите за достъп до отдалечено хранилище"
-
-#: command-list.h:139
+#: 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:172
+#: command-list.h:174
msgid "Stash the changes in a dirty working directory away"
msgstr "Скатаване на неподадените промени в работното дърво"
-#: command-list.h:173
+#: command-list.h:175
msgid "Add file contents to the staging area"
msgstr "Добавяне на съдържанието на файла към индекса"
-#: command-list.h:174
+#: command-list.h:176
msgid "Show the working tree status"
msgstr "Извеждане на състоянието на работното дърво"
-#: command-list.h:175
+#: command-list.h:177
msgid "Remove unnecessary whitespace"
msgstr "Премахване на излишните знаци за интервали"
-#: command-list.h:176
+#: command-list.h:178
msgid "Initialize, update or inspect submodules"
msgstr "Инициализиране, обновяване или разглеждане на подмодули"
-#: command-list.h:177
+#: command-list.h:179
msgid "Bidirectional operation between a Subversion repository and Git"
msgstr "Двупосочна работа между хранилища под Subversion и Git"
-#: command-list.h:178
+#: command-list.h:180
msgid "Switch branches"
msgstr "Преминаване към друг клон"
-#: command-list.h:179
+#: command-list.h:181
msgid "Read, modify and delete symbolic refs"
msgstr "Извеждане, промяна и изтриване на символни указатели"
-#: command-list.h:180
+#: command-list.h:182
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr "Извеждане, създаване, изтриване, проверка на етикети подписани с GPG"
-#: command-list.h:181
+#: command-list.h:183
msgid "Creates a temporary file with a blob's contents"
msgstr "Създаване на временен файл със същото съдържание като обектът-BLOB"
-#: command-list.h:182
+#: command-list.h:184
msgid "Unpack objects from a packed archive"
msgstr "Разпакетиране на обекти от пакетиран архив"
-#: command-list.h:183
+#: command-list.h:185
msgid "Register file contents in the working tree to the index"
msgstr "Регистриране на съдържанието на файловете от работното дърво в индекса"
-#: command-list.h:184
+#: command-list.h:186
msgid "Update the object name stored in a ref safely"
msgstr "Безопасно обновяване на името на обект в указател"
-#: command-list.h:185
+#: command-list.h:187
msgid "Update auxiliary info file to help dumb servers"
msgstr ""
"Обновяване на файла с допълнителна информация в помощ на опростените сървъри"
-#: command-list.h:186
+#: command-list.h:188
msgid "Send archive back to git-archive"
msgstr "Изпращане на архива обратно към „git-archive“"
-#: command-list.h:187
+#: command-list.h:189
msgid "Send objects packed back to git-fetch-pack"
msgstr "Изпращане на пакетираните обекти обратно към „git-fetch-pack“"
-#: command-list.h:188
+#: command-list.h:190
msgid "Show a Git logical variable"
msgstr "Извеждане на логическа променлива на Git"
-#: command-list.h:189
+#: command-list.h:191
msgid "Check the GPG signature of commits"
msgstr "Проверка на подписите GPG върху подаванията"
-#: command-list.h:190
+#: command-list.h:192
msgid "Validate packed Git archive files"
msgstr "Проверка на пакетираните архивни файлове на Git"
-#: command-list.h:191
+#: command-list.h:193
msgid "Check the GPG signature of tags"
msgstr "Проверка на подписите GPG върху етикетите"
-#: command-list.h:192
+#: command-list.h:194
msgid "Git web interface (web frontend to Git repositories)"
msgstr "Уеб интерфейс на Git"
-#: command-list.h:193
+#: command-list.h:195
msgid "Show logs with difference each commit introduces"
msgstr "Извеждане на журнал с разликите, въведени с всяко подаване"
-#: command-list.h:194
+#: command-list.h:196
msgid "Manage multiple working trees"
msgstr "Управление на множество работни дървета"
-#: command-list.h:195
+#: command-list.h:197
msgid "Create a tree object from the current index"
msgstr "Създаване на обект-дърво от текущия индекс"
-#: command-list.h:196
+#: command-list.h:198
msgid "Defining attributes per path"
msgstr "Указване на атрибути към път"
-#: command-list.h:197
+#: command-list.h:199
msgid "Git command-line interface and conventions"
msgstr "Команден ред и конвенции на Git"
-#: command-list.h:198
+#: command-list.h:200
msgid "A Git core tutorial for developers"
msgstr "Въвеждащ урок в Git за разработчици"
-#: command-list.h:199
+#: 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:200
+#: command-list.h:203
msgid "Tweaking diff output"
msgstr "Настройване на изгледа на разликите"
-#: command-list.h:201
+#: command-list.h:204
msgid "A useful minimum set of commands for Everyday Git"
msgstr "Полезен минимален набор от команди за ежедневната работа с Git"
-#: command-list.h:202
+#: 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:203
+#: command-list.h:207
msgid "Hooks used by Git"
msgstr "Куки на Git"
-#: command-list.h:204
+#: command-list.h:208
msgid "Specifies intentionally untracked files to ignore"
msgstr "Указване на неследени файлове, които да бъдат нарочно пренебрегвани"
-#: command-list.h:205
+#: command-list.h:209
+msgid "Map author/committer names and/or E-Mail addresses"
+msgstr "Съответствия на имена на автор/подаващ и/или адреси на е-поща"
+
+#: command-list.h:210
msgid "Defining submodule properties"
msgstr "Дефиниране на свойствата на подмодулите"
-#: command-list.h:206
+#: command-list.h:211
msgid "Git namespaces"
msgstr "Пространства от имена на Git"
-#: command-list.h:207
+#: command-list.h:212
+msgid "Helper programs to interact with remote repositories"
+msgstr "Помощни програми за работа с отдалечените хранилища"
+
+#: command-list.h:213
msgid "Git Repository Layout"
msgstr "Устройство на хранилището на Git"
-#: command-list.h:208
+#: command-list.h:214
msgid "Specifying revisions and ranges for Git"
msgstr "Указване на версии и диапазони в Git"
-#: command-list.h:209
+#: command-list.h:215
msgid "Mounting one repository inside another"
msgstr "Монтиране на едно хранилище в друго"
-#: command-list.h:210
+#: command-list.h:216
msgid "A tutorial introduction to Git: part two"
msgstr "Въвеждащ урок за Git: втора част"
-#: command-list.h:211
+#: command-list.h:217
msgid "A tutorial introduction to Git"
msgstr "Въвеждащ урок за Git"
-#: command-list.h:212
+#: command-list.h:218
msgid "An overview of recommended workflows with Git"
msgstr "Общ преглед на препоръчваните начини за работа с Git"
-#: git-bisect.sh:54
-msgid "You need to start by \"git bisect start\""
-msgstr "Започнете като изпълните командата „git bisect start“"
-
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:60
-msgid "Do you want me to do it for you [Y/n]? "
-msgstr "Да се извърши ли автоматично? „Y“ — ДА, „n“ — не"
-
-#: git-bisect.sh:101
-#, sh-format
-msgid "Bad rev input: $arg"
-msgstr "Неправилна версия: „${arg}“"
-
-#: git-bisect.sh:121
-#, sh-format
-msgid "Bad rev input: $bisected_head"
-msgstr "Неправилна версия: „$bisected_head“"
-
-#: git-bisect.sh:130
-#, sh-format
-msgid "Bad rev input: $rev"
-msgstr "Неправилна версия: „${rev}“"
-
-#: git-bisect.sh:139
-#, sh-format
-msgid "'git bisect $TERM_BAD' can take only one argument."
-msgstr "Командата „git bisect ${TERM_BAD}“ приема само един аргумент."
-
-#: git-bisect.sh:209
-msgid "No logfile given"
-msgstr "Не е зададен журнален файл"
-
-#: git-bisect.sh:210
-#, sh-format
-msgid "cannot read $file for replaying"
-msgstr ""
-"Журналният файл „${file}“ не може да бъде прочетен, за да се изпълнят "
-"командите от него наново"
-
-#: git-bisect.sh:232
-msgid "?? what are you talking about?"
-msgstr ""
-"Непозната команда. Възможните варианти са: „start“, „good“, „bad“, „skip“"
-
-#: git-bisect.sh:241
+#: git-bisect.sh:68
msgid "bisect run failed: no command provided."
msgstr "неуспешно двоично търсене, не е зададена команда."
-#: git-bisect.sh:246
+#: git-bisect.sh:73
#, sh-format
msgid "running $command"
msgstr "изпълнение на командата „${command}“"
-#: git-bisect.sh:253
+#: git-bisect.sh:80
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -23832,27 +25297,23 @@
"изходният код от командата „${command}“ е ${res} — това е извън интервала "
"[0, 128)"
-#: git-bisect.sh:279
+#: git-bisect.sh:105
msgid "bisect run cannot continue any more"
msgstr "двоичното търсене не може да продължи"
-#: git-bisect.sh:285
+#: git-bisect.sh:111
#, sh-format
msgid ""
"bisect run failed:\n"
-"'bisect_state $state' exited with error code $res"
+"'bisect-state $state' exited with error code $res"
msgstr ""
"неуспешно двоично търсене:\n"
-"функцията „bisect_state ${state}“ завърши с код за грешка ${res}"
+"функцията „bisect-state ${state}“ завърши с код за грешка ${res}"
-#: git-bisect.sh:292
+#: git-bisect.sh:118
msgid "bisect run success"
msgstr "успешно двоично търсене"
-#: git-bisect.sh:300
-msgid "We are not bisecting."
-msgstr "В момента не се извършва двоично търсене."
-
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
@@ -23891,138 +25352,52 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "Простото сливане не сработи, пробва се автоматично сливане."
-#: git-legacy-stash.sh:221
-msgid "Cannot remove temporary index (can't happen)"
-msgstr "Временният индекс не може да бъде изтрит"
-
-#: git-legacy-stash.sh:272
-#, sh-format
-msgid "Cannot update $ref_stash with $w_commit"
-msgstr ""
-"Указателят „${ref_stash}“ не може да бъде обновен да сочи към „${w_commit}“"
-
-#: git-legacy-stash.sh:324
-#, sh-format
-msgid "error: unknown option for 'stash push': $option"
-msgstr "ГРЕШКА: командата „stash push“ не приема опцията „$option“"
-
-#: git-legacy-stash.sh:356
-#, sh-format
-msgid "Saved working directory and index state $stash_msg"
-msgstr ""
-"Състоянието на работната директория и индекса са запазени: „$stash_msg“"
-
-#: git-legacy-stash.sh:536
-#, sh-format
-msgid "unknown option: $opt"
-msgstr "непозната опция: ${opt}"
-
-#: git-legacy-stash.sh:556
-#, sh-format
-msgid "Too many revisions specified: $REV"
-msgstr "Указани са прекалено много версии: „${REV}“"
-
-#: git-legacy-stash.sh:571
-#, sh-format
-msgid "$reference is not a valid reference"
-msgstr "Указателят „${reference}“ е грешен"
-
-#: git-legacy-stash.sh:599
-#, sh-format
-msgid "'$args' is not a stash-like commit"
-msgstr "„${args}“ не е подаване, приличащо на нещо скатано"
-
-#: git-legacy-stash.sh:610
-#, sh-format
-msgid "'$args' is not a stash reference"
-msgstr "„${args}“ не е указател към нещо скатано"
-
-#: git-legacy-stash.sh:618
-msgid "unable to refresh index"
-msgstr "индексът не може да бъде обновен"
-
-#: git-legacy-stash.sh:622
-msgid "Cannot apply a stash in the middle of a merge"
-msgstr "По време на сливане не може да приложите нещо скатано"
-
-#: git-legacy-stash.sh:630
-msgid "Conflicts in index. Try without --index."
-msgstr ""
-"В индекса има конфликти. Пробвайте да изпълните командата без опцията „--"
-"index“."
-
-#: git-legacy-stash.sh:632
-msgid "Could not save index tree"
-msgstr "Дървото сочено от индекса не може да бъде запазено"
-
-#: git-legacy-stash.sh:641
-msgid "Could not restore untracked files from stash entry"
-msgstr "Неследени файлове не могат да се възстановят от скатаното"
-
-#: git-legacy-stash.sh:666
-msgid "Cannot unstage modified files"
-msgstr "Променените файлове не могат да бъдат извадени от индекса"
-
-#: git-legacy-stash.sh:704
-#, sh-format
-msgid "Dropped ${REV} ($s)"
-msgstr "Изтрито е скатаното „${REV}“ ($s)"
-
-#: git-legacy-stash.sh:705
-#, sh-format
-msgid "${REV}: Could not drop stash entry"
-msgstr "Скатаното „${REV}“ не може да бъде изтрито"
-
-#: git-legacy-stash.sh:792
-msgid "(To restore them type \"git stash apply\")"
-msgstr "(За да ги възстановите, изпълнете командата „git stash apply“)"
-
-#: git-submodule.sh:203
+#: git-submodule.sh:179
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"Относителен път може да се ползва само от основната директория на работното "
"дърво"
-#: git-submodule.sh:213
+#: git-submodule.sh:189
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
"адрес на хранилище: „${repo}“ трябва или да е абсолютен, или да започва с "
"„./“ или „../“"
-#: git-submodule.sh:232
+#: git-submodule.sh:208
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "„${sm_path}“ вече съществува в индекса"
-#: git-submodule.sh:235
+#: git-submodule.sh:211
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr "„${sm_path}“ вече съществува в индекса и не е подмодул"
-#: git-submodule.sh:242
+#: git-submodule.sh:218
#, sh-format
msgid "'$sm_path' does not have a commit checked out"
msgstr "в „${sm_path}“ не е изтеглено подаване"
-#: git-submodule.sh:273
+#: git-submodule.sh:249
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Добавяне на съществуващото хранилище в „${sm_path}“ към индекса"
-#: git-submodule.sh:275
+#: git-submodule.sh:251
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "„${sm_path}“ съществува, а не е хранилище на Git"
-#: git-submodule.sh:283
+#: git-submodule.sh:259
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
"Открита е локална директория на Git — „${sm_name}“, която сочи към "
"отдалечените хранилища:"
-#: git-submodule.sh:285
+#: git-submodule.sh:261
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -24039,37 +25414,37 @@
"правилното хранилище или ако не знаете какво означава това, използвайте\n"
"друго име като аргумент към опцията „--name“."
-#: git-submodule.sh:291
+#: git-submodule.sh:267
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "Активиране на локалното хранилище за подмодула „${sm_name}“ наново."
-#: git-submodule.sh:303
+#: git-submodule.sh:279
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Подмодулът „${sm_path}“ не може да бъде изтеглен"
-#: git-submodule.sh:308
+#: git-submodule.sh:284
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Неуспешно добавяне на подмодула „${sm_path}“"
-#: git-submodule.sh:317
+#: git-submodule.sh:293
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Неуспешно регистриране на подмодула „${sm_path}“"
-#: git-submodule.sh:590
+#: git-submodule.sh:568
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "Текущата версия за подмодула в „${displaypath}“ липсва"
-#: git-submodule.sh:600
+#: git-submodule.sh:578
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Неуспешно доставяне в пътя към подмодул „${sm_path}“"
-#: git-submodule.sh:605
+#: git-submodule.sh:583
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -24078,7 +25453,7 @@
"Текущата версия „${remote_name}/${branch}“ в пътя към подмодул „${sm_path}“ "
"липсва"
-#: git-submodule.sh:623
+#: git-submodule.sh:601
#, sh-format
msgid ""
"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
@@ -24087,7 +25462,7 @@
"Неуспешно доставяне в пътя към подмодул „${displaypath}“, опит за директно "
"доставяне на „${sha1}“"
-#: git-submodule.sh:629
+#: git-submodule.sh:607
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -24096,91 +25471,58 @@
"Подмодулът в пътя „$displaypath“ е доставен, но не съдържа обекта със сума\n"
"„${sha1}“. Директното доставяне на това подаване е неуспешно."
-#: git-submodule.sh:636
+#: git-submodule.sh:614
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
"Неуспешно изтегляне на версия „${sha1}“ в пътя към подмодул „${displaypath}“'"
-#: git-submodule.sh:637
+#: git-submodule.sh:615
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Път към подмодул „${displaypath}“: изтеглена е версия „${sha1}“"
-#: git-submodule.sh:641
+#: git-submodule.sh:619
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
"Неуспешно пребазиране на версия „${sha1}“ в пътя към подмодул "
"„${displaypath}“"
-#: git-submodule.sh:642
+#: git-submodule.sh:620
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Път към подмодул „${displaypath}“: пребазиране върху версия „${sha1}“"
-#: git-submodule.sh:647
+#: git-submodule.sh:625
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
"Неуспешно сливане на версия „${sha1}“ в пътя към подмодул „${displaypath}“"
-#: git-submodule.sh:648
+#: git-submodule.sh:626
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Път към подмодул „${displaypath}“: сливане с версия „${sha1}“"
-#: git-submodule.sh:653
+#: git-submodule.sh:631
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"Неуспешно изпълнение на командата „${command} ${sha1}“ в пътя към подмодул "
"„${displaypath}“"
-#: git-submodule.sh:654
+#: git-submodule.sh:632
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Път към подмодул „${displaypath}“: „${command} ${sha1}“"
-#: git-submodule.sh:685
+#: git-submodule.sh:663
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
"Неуспешна обработка на поддиректориите в пътя към подмодул „${displaypath}“"
-#: git-submodule.sh:896
-msgid "The --cached option cannot be used with the --files option"
-msgstr "Опциите „--cached“ и „--files“ са несъвместими"
-
-#: git-submodule.sh:948
-#, sh-format
-msgid "unexpected mode $mod_dst"
-msgstr "неочакван режим „${mod_dst}“"
-
-#: git-submodule.sh:968
-#, sh-format
-msgid " Warn: $display_name doesn't contain commit $sha1_src"
-msgstr ""
-" ПРЕДУПРЕЖДЕНИЕ: „${display_name}“ не съдържа подаването „${sha1_src}“"
-
-#: git-submodule.sh:971
-#, sh-format
-msgid " Warn: $display_name doesn't contain commit $sha1_dst"
-msgstr ""
-" ПРЕДУПРЕЖДЕНИЕ: „${display_name}“ не съдържа подаването „${sha1_dst}“"
-
-#: git-submodule.sh:974
-#, sh-format
-msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
-msgstr ""
-" ПРЕДУПРЕЖДЕНИЕ: „${display_name}“ не съдържа никое от подаванията "
-"„${sha1_src}“ и „${sha1_dst}“"
-
-#: git-parse-remote.sh:89
-#, sh-format
-msgid "See git-${cmd}(1) for details."
-msgstr "За повече информация погледнете ръководството на „git-${cmd}(1)“"
-
#: git-rebase--preserve-merges.sh:109
msgid "Applied autostash."
msgstr "Автоматично скатаното е приложено."
@@ -24190,12 +25532,22 @@
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"
@@ -24239,7 +25591,7 @@
"Може да променяте последователността на редовете — те се изпълняват\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"
@@ -24258,84 +25610,84 @@
"\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"
@@ -24351,31 +25703,31 @@
"коригирате,\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"
@@ -24386,7 +25738,7 @@
" 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"
@@ -24401,25 +25753,25 @@
"\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"
@@ -24449,11 +25801,11 @@
"\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."
@@ -24461,33 +25813,33 @@
"В работното дърво има неподадени промени. Първо ги подайте, а след това\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)"
@@ -24496,11 +25848,11 @@
msgstr[1] ""
"Пребазиране на $shortrevisions върху $shortonto ($todocount команди)"
-#: git-rebase--preserve-merges.sh:955
+#: git-rebase--preserve-merges.sh:945
msgid "Note that empty commits are commented out"
msgstr "Празните подавания са коментирани"
-#: 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 "Списъкът с презаписаните подавания не може да бъде създаден"
@@ -24577,14 +25929,14 @@
msgid "%12s %12s %s"
msgstr "%14s %14s %s"
-#: git-add--interactive.perl:634
+#: git-add--interactive.perl:632
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] "%d файл засегнат\n"
msgstr[1] "%d файла засегнати\n"
-#: git-add--interactive.perl:1053
+#: git-add--interactive.perl:1056
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
@@ -24593,7 +25945,7 @@
"незабавно\n"
"добавено към индекса"
-#: git-add--interactive.perl:1056
+#: git-add--interactive.perl:1059
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
@@ -24602,7 +25954,7 @@
"незабавно\n"
"скътано"
-#: git-add--interactive.perl:1059
+#: git-add--interactive.perl:1062
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
@@ -24611,8 +25963,8 @@
"незабавно\n"
"извадено от индекса."
-#: git-add--interactive.perl:1062 git-add--interactive.perl:1071
-#: git-add--interactive.perl:1077
+#: git-add--interactive.perl:1065 git-add--interactive.perl:1074
+#: git-add--interactive.perl:1080
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
@@ -24621,8 +25973,8 @@
"незабавно\n"
"набелязано за прилагане."
-#: git-add--interactive.perl:1065 git-add--interactive.perl:1068
-#: git-add--interactive.perl:1074
+#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
+#: git-add--interactive.perl:1077
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
@@ -24631,12 +25983,12 @@
"незабавно\n"
"набелязано за зануляване."
-#: git-add--interactive.perl:1111
+#: git-add--interactive.perl:1114
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr "файлът за редактиране на парчето код не може да бъде отворен: „%s“"
-#: git-add--interactive.perl:1118
+#: git-add--interactive.perl:1121
#, perl-format
msgid ""
"---\n"
@@ -24650,13 +26002,13 @@
"За да пропуснете редовете започващи с „%s“ — изтрийте ги.\n"
"Редовете, които започват с „%s“ ще бъдат пропуснати.\n"
-#: git-add--interactive.perl:1140
+#: git-add--interactive.perl:1143
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr ""
"файлът за редактиране на парчето код не може да бъде отворен за четене: „%s“"
-#: git-add--interactive.perl:1248
+#: git-add--interactive.perl:1251
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -24670,7 +26022,7 @@
"a — добавяне на това и всички следващи парчета от файла в индекса\n"
"d — без добавяне на това и всички следващи парчета от файла в индекса"
-#: git-add--interactive.perl:1254
+#: git-add--interactive.perl:1257
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -24684,7 +26036,7 @@
"a — скатаване на това и всички следващи парчета от файла\n"
"d — без скатаване на това и всички следващи парчета от файла"
-#: git-add--interactive.perl:1260
+#: git-add--interactive.perl:1263
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -24698,7 +26050,7 @@
"a — изваждане на това и всички следващи парчета от файла от индекса\n"
"d — без изваждане на това и всички следващи парчета от файла от индекса"
-#: git-add--interactive.perl:1266
+#: git-add--interactive.perl:1269
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -24712,7 +26064,7 @@
"a — прилагане на това и всички следващи парчета от файла към индекса\n"
"d — без прилагане на това и всички следващи парчета от файла към индекса"
-#: git-add--interactive.perl:1272 git-add--interactive.perl:1290
+#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -24729,7 +26081,7 @@
"d — без премахване на това и всички следващи парчета от файла от работното "
"дърво"
-#: git-add--interactive.perl:1278
+#: git-add--interactive.perl:1281
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -24746,7 +26098,7 @@
"d — без премахване на това и всички следващи парчета от файла от индекса и "
"работното дърво"
-#: git-add--interactive.perl:1284
+#: git-add--interactive.perl:1287
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -24763,7 +26115,7 @@
"d — без прилагане на това и всички следващи парчета от файла от индекса и "
"работното дърво"
-#: git-add--interactive.perl:1296
+#: git-add--interactive.perl:1299
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -24777,7 +26129,7 @@
"a — прилагане на това и всички следващи парчета от файла\n"
"d — без прилагане на това и всички следващи парчета от файла"
-#: git-add--interactive.perl:1311
+#: git-add--interactive.perl:1314
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -24799,87 +26151,92 @@
"e — ръчно редактиране на текущото парче\n"
"? — извеждане не помощта\n"
-#: git-add--interactive.perl:1342
+#: git-add--interactive.perl:1345
msgid "The selected hunks do not apply to the index!\n"
msgstr "Избраните парчета не могат да се добавят в индекса!\n"
-#: git-add--interactive.perl:1357
+#: git-add--interactive.perl:1360
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "пренебрегване на неслятото: „%s“\n"
-#: git-add--interactive.perl:1468
+#: git-add--interactive.perl:1479
#, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Прилагане на промяната в правата за достъп към работното дърво [y,n,q,a,d"
"%s,?]? "
-#: git-add--interactive.perl:1469
+#: git-add--interactive.perl:1480
#, perl-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
msgstr "Прилагане на изтриването към работното дърво [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1470
+#: git-add--interactive.perl:1481
+#, perl-format
+msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
+msgstr "Прилагане на добавянето към работното дърво [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1482
#, perl-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr "Прилагане на парчето към работното дърво [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1570
+#: git-add--interactive.perl:1599
msgid "No other hunks to goto\n"
msgstr "Няма други парчета\n"
-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1617
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Неправилен номер: „%s“\n"
-#: git-add--interactive.perl:1593
+#: git-add--interactive.perl:1622
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "Има само %d парче.\n"
msgstr[1] "Има само %d парчета.\n"
-#: git-add--interactive.perl:1619
+#: git-add--interactive.perl:1657
msgid "No other hunks to search\n"
msgstr "Няма други парчета за търсене\n"
-#: git-add--interactive.perl:1636
+#: git-add--interactive.perl:1674
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Сгрешен регулярен израз „%s“: %s\n"
-#: git-add--interactive.perl:1646
+#: git-add--interactive.perl:1684
msgid "No hunk matches the given pattern\n"
msgstr "Никое парче не напасва на регулярния израз\n"
-#: git-add--interactive.perl:1658 git-add--interactive.perl:1680
+#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
msgid "No previous hunk\n"
msgstr "Няма друго парче преди това\n"
-#: git-add--interactive.perl:1667 git-add--interactive.perl:1686
+#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
msgid "No next hunk\n"
msgstr "Няма друго парче след това\n"
-#: git-add--interactive.perl:1692
+#: git-add--interactive.perl:1730
msgid "Sorry, cannot split this hunk\n"
msgstr "Това парче не може да бъде разделено\n"
-#: git-add--interactive.perl:1698
+#: git-add--interactive.perl:1736
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "Разделяне на %d парче.\n"
msgstr[1] "Разделяне на %d парчета.\n"
-#: git-add--interactive.perl:1708
+#: git-add--interactive.perl:1746
msgid "Sorry, cannot edit this hunk\n"
msgstr "Това парче не може да бъде редактирано\n"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1773
+#: git-add--interactive.perl:1811
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
@@ -24900,19 +26257,19 @@
" и индекса\n"
"add untracked — добавяне на неследените файлове към промените в индекса\n"
-#: git-add--interactive.perl:1790 git-add--interactive.perl:1795
-#: git-add--interactive.perl:1798 git-add--interactive.perl:1805
-#: git-add--interactive.perl:1808 git-add--interactive.perl:1815
-#: git-add--interactive.perl:1819 git-add--interactive.perl:1825
+#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
+#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
+#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
+#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
msgid "missing --"
msgstr "„--“ липсва"
-#: git-add--interactive.perl:1821
+#: git-add--interactive.perl:1866
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "неизвестна стратегия за прилагане на кръпка: „%s“"
-#: git-add--interactive.perl:1827 git-add--interactive.perl:1833
+#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "указан е неправилен аргумент „%s“, а се очаква „--“."
@@ -24932,26 +26289,37 @@
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"
@@ -24959,40 +26327,40 @@
"„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"
@@ -25007,12 +26375,12 @@
" ● укажете „./%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"
@@ -25021,7 +26389,7 @@
"ФАТАЛНА ГРЕШКА: %s: %s\n"
"ПРЕДУПРЕЖДЕНИЕ: не са пратени никакви кръпки\n"
-#: git-send-email.perl:705
+#: git-send-email.perl:713
msgid ""
"\n"
"No patch files specified!\n"
@@ -25031,17 +26399,17 @@
"Не са указани кръпки!\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"
@@ -25056,27 +26424,27 @@
"\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"
@@ -25084,11 +26452,11 @@
"Следните файлове са 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"
@@ -25101,22 +26469,22 @@
"все още е с шаблонното заглавие „*** 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"
@@ -25124,18 +26492,18 @@
#. 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"
@@ -25163,132 +26531,132 @@
#. 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/po/ca.po b/po/ca.po
index e324c80..cd60e5b 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -11,10 +11,12 @@
# amend | esmenar
# bundle | farcell
# broken | malmès
+# chunk | fragment
# delta | diferència
# deprecated | en desús
-# dry | simulació
+# dry-run | fer una prova
# fatal | fatal
+# flush | buidar / buidatge
# hook | lligam
# hunk | tros
# not supported | no està admès
@@ -49,8 +51,8 @@
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-12-30 08:48+0800\n"
-"PO-Revision-Date: 2020-01-09 10:10+0100\n"
+"POT-Creation-Date: 2020-12-15 16:27+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,252 +60,557 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 2.3.1\n"
-#: add-interactive.c:347
+#: add-interactive.c:376
#, c-format
msgid "Huh (%s)?"
msgstr "Perdó (%s)?"
-#: add-interactive.c:500 add-interactive.c:801 sequencer.c:3216
-#: sequencer.c:3656 builtin/rebase.c:871 builtin/rebase.c:1643
-#: builtin/rebase.c:2019 builtin/rebase.c:2063
+#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3284
+#: sequencer.c:3735 sequencer.c:3890 builtin/rebase.c:1532
+#: builtin/rebase.c:1955
msgid "could not read index"
msgstr "no s'ha pogut llegir l'índex"
-#: add-interactive.c:555 git-add--interactive.perl:269
+#: add-interactive.c:584 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "binari"
-#: add-interactive.c:613 git-add--interactive.perl:278
+#: add-interactive.c:642 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "res"
-#: add-interactive.c:614 git-add--interactive.perl:314
+#: add-interactive.c:643 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "sense canvis"
-#: add-interactive.c:651 git-add--interactive.perl:643
+#: add-interactive.c:680 git-add--interactive.perl:641
msgid "Update"
msgstr "Actualitza"
-#: add-interactive.c:668 add-interactive.c:856
+#: add-interactive.c:697 add-interactive.c:885
#, c-format
msgid "could not stage '%s'"
msgstr "no s'ha pogut fer «stage» «%s»"
-#: add-interactive.c:674 add-interactive.c:863 sequencer.c:3409
-#: builtin/rebase.c:895
+#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3478
msgid "could not write index"
msgstr "no s'ha pogut escriure l'índex"
-#: add-interactive.c:677 git-add--interactive.perl:628
+#: add-interactive.c:706 git-add--interactive.perl:626
#, c-format, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
msgstr[0] "actualitzat %d camí\n"
msgstr[1] "actualitzats %d camins\n"
-#: add-interactive.c:695 git-add--interactive.perl:678
+#: add-interactive.c:724 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "nota: %s està ara sense seguiment.\n"
-#: add-interactive.c:700 apply.c:4108 builtin/checkout.c:281
-#: builtin/reset.c:144
+#: add-interactive.c:729 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:730 git-add--interactive.perl:655
+#: add-interactive.c:759 git-add--interactive.perl:653
msgid "Revert"
msgstr "Reverteix"
-#: add-interactive.c:746
+#: add-interactive.c:775
msgid "Could not parse HEAD^{tree}"
msgstr "No s'ha pogut analitzar HEAD^{tree}"
-#: add-interactive.c:784 git-add--interactive.perl:631
+#: add-interactive.c:813 git-add--interactive.perl:629
#, c-format, perl-format
msgid "reverted %d path\n"
msgid_plural "reverted %d paths\n"
msgstr[0] "revertit %d camí\n"
msgstr[1] "revertits %d camins\n"
-#: add-interactive.c:835 git-add--interactive.perl:695
+#: add-interactive.c:864 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr "Sense fitxers no seguits.\n"
-#: add-interactive.c:839 git-add--interactive.perl:689
+#: add-interactive.c:868 git-add--interactive.perl:687
msgid "Add untracked"
msgstr "Afegeix sense seguiment"
-#: add-interactive.c:866 git-add--interactive.perl:625
+#: add-interactive.c:895 git-add--interactive.perl:623
#, c-format, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "afegit %d camí\n"
msgstr[1] "afegits %d camins\n"
-#: add-interactive.c:896
-#, c-format
+#: add-interactive.c:925
+#, c-format
msgid "ignoring unmerged: %s"
msgstr "s'està ignorant allò no fusionat: %s"
-#: add-interactive.c:908 add-patch.c:1331 git-add--interactive.perl:1366
+#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369
#, c-format
msgid "Only binary files changed.\n"
msgstr "Només s'han canviat els fitxers binaris.\n"
-#: add-interactive.c:910 add-patch.c:1329 git-add--interactive.perl:1368
+#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371
#, c-format
msgid "No changes.\n"
msgstr "Sense canvis.\n"
-#: add-interactive.c:914 git-add--interactive.perl:1376
+#: add-interactive.c:943 git-add--interactive.perl:1379
msgid "Patch update"
msgstr "Actualització del pedaç"
-#: add-interactive.c:953 git-add--interactive.perl:1754
+#: add-interactive.c:982 git-add--interactive.perl:1792
msgid "Review diff"
msgstr "Reviseu les diferències"
-#: add-interactive.c:981
+#: add-interactive.c:1010
msgid "show paths with changes"
msgstr "mostra els camins amb canvis"
-#: add-interactive.c:983
+#: add-interactive.c:1012
msgid "add working tree state to the staged set of changes"
-msgstr ""
+msgstr "afegeix l'estat de l'arbre de treball al conjunt de canvis «staged»"
-#: add-interactive.c:985
+#: add-interactive.c:1014
msgid "revert staged set of changes back to the HEAD version"
-msgstr ""
+msgstr "reverteix el conjunt de canvis «staged» a la versió HEAD"
-#: add-interactive.c:987
+#: add-interactive.c:1016
msgid "pick hunks and update selectively"
msgstr "selecciona els trossos i actualitza selectivament"
-#: add-interactive.c:989
+#: add-interactive.c:1018
msgid "view diff between HEAD and index"
msgstr "visualitza les diferències entre HEAD i l'índex"
-#: add-interactive.c:991
+#: add-interactive.c:1020
msgid "add contents of untracked files to the staged set of changes"
-msgstr ""
+msgstr "afegeix contingut de fitxers no seguits al conjunt de canvis «staged»"
-#: add-interactive.c:999 add-interactive.c:1048
+#: add-interactive.c:1028 add-interactive.c:1077
msgid "Prompt help:"
msgstr "Mostra ajuda:"
-#: add-interactive.c:1001
+#: add-interactive.c:1030
msgid "select a single item"
msgstr "seleccioneu un únic ítem"
-#: add-interactive.c:1003
+#: add-interactive.c:1032
msgid "select a range of items"
msgstr "seleccioneu un rang d'ítems"
-#: add-interactive.c:1005
+#: add-interactive.c:1034
msgid "select multiple ranges"
msgstr "seleccioneu rangs múltiples"
-#: add-interactive.c:1007 add-interactive.c:1052
+#: add-interactive.c:1036 add-interactive.c:1081
msgid "select item based on unique prefix"
msgstr "seleccioneu un ítem basant-se en un prefix únic"
-#: add-interactive.c:1009
+#: add-interactive.c:1038
msgid "unselect specified items"
msgstr "desselecciona els ítems especificats"
-#: add-interactive.c:1011
+#: add-interactive.c:1040
msgid "choose all items"
-msgstr "escolliu tots els ítems"
+msgstr "trieu tots els ítems"
-#: add-interactive.c:1013
+#: add-interactive.c:1042
msgid "(empty) finish selecting"
msgstr "(buit) finalitza la selecció"
-#: add-interactive.c:1050
+#: add-interactive.c:1079
msgid "select a numbered item"
msgstr "seleccioneu un ítem numerat"
-#: add-interactive.c:1054
+#: add-interactive.c:1083
msgid "(empty) select nothing"
msgstr "(buit) no seleccionis res"
-#: add-interactive.c:1062 builtin/clean.c:822 git-add--interactive.perl:1851
+#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
msgid "*** Commands ***"
msgstr "*** Ordres ***"
-#: add-interactive.c:1063 builtin/clean.c:823 git-add--interactive.perl:1848
+#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
msgid "What now"
msgstr "I ara què"
-#: add-interactive.c:1115 git-add--interactive.perl:213
+#: add-interactive.c:1144 git-add--interactive.perl:213
msgid "staged"
msgstr "staged"
-#: add-interactive.c:1115 git-add--interactive.perl:213
+#: add-interactive.c:1144 git-add--interactive.perl:213
msgid "unstaged"
msgstr "unstaged"
-#: add-interactive.c:1115 apply.c:4965 apply.c:4968 builtin/am.c:2197
-#: builtin/am.c:2200 builtin/clone.c:123 builtin/fetch.c:144
-#: builtin/merge.c:273 builtin/pull.c:209 builtin/submodule--helper.c:409
-#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1382
-#: builtin/submodule--helper.c:1875 builtin/submodule--helper.c:1878
-#: builtin/submodule--helper.c:2119 git-add--interactive.perl:213
+#: add-interactive.c:1144 apply.c:4989 apply.c:4992 builtin/am.c:2257
+#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124
+#: builtin/fetch.c:147 builtin/merge.c:284 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:1122
+#: add-interactive.c:1151
msgid "could not refresh index"
msgstr "no s'ha pogut actualitzar l'índex"
-#: add-interactive.c:1136 builtin/clean.c:787 git-add--interactive.perl:1765
+#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803
#, c-format
msgid "Bye.\n"
-msgstr "Adéu.\n"
+msgstr "Adeu.\n"
-#: add-patch.c:15
-#, c-format
-msgid "Stage mode change [y,n,a,q,d%s,?]? "
-msgstr "Canvia el mode de «stage» [y,n,a,q,d%s,?]? "
+#: add-patch.c:34 git-add--interactive.perl:1431
+#, 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:16
-#, c-format
-msgid "Stage deletion [y,n,a,q,d%s,?]? "
-msgstr "Suprimeix «stage» [y,n,a,q,d%s,?]? "
+#: add-patch.c:35 git-add--interactive.perl:1432
+#, 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:17
-#, c-format
-msgid "Stage this hunk [y,n,a,q,d%s,?]? "
-msgstr "Fer un «stage» d'aquest tros [y,n,a,q,d%s,?]? "
+#: add-patch.c:36 git-add--interactive.perl:1433
+#, c-format, perl-format
+msgid "Stage addition [y,n,q,a,d%s,?]? "
+msgstr "Afegeix a «stage» [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:37 git-add--interactive.perl:1434
+#, 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:1437
+#, 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:1438
+#, 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:1439
+#, c-format, perl-format
+msgid "Stash addition [y,n,q,a,d%s,?]? "
+msgstr "Afegeix a «stash» [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:59 git-add--interactive.perl:1440
+#, 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:1443
+#, 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:1444
+#, 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:1445
+#, c-format, perl-format
+msgid "Unstage addition [y,n,q,a,d%s,?]? "
+msgstr "Afegeix a «unstage» [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:83 git-add--interactive.perl:1446
+#, 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:1449
+#, 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:1450
+#, 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:1451
+#, c-format, perl-format
+msgid "Apply addition to index [y,n,q,a,d%s,?]? "
+msgstr "Aplica l'addició a l'índex [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:106 git-add--interactive.perl:1452
+#, 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:1455
+#: git-add--interactive.perl:1473
+#, 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:1456
+#: git-add--interactive.perl:1474
+#, 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:1457
+#: git-add--interactive.perl:1475
+#, c-format, perl-format
+msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
+msgstr "Descarta l'addició de l'arbre de treball [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:129 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
+#, 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:1461
+#, 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:1462
+#, 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:1463
+#, c-format, perl-format
+msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Descarta l'addició 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:1464
+#, 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:1467
+#, 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:1468
+#, 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:1469
+#, c-format, perl-format
+msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Aplica l'addició 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:1470
+#, 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:130 add-patch.c:134
+#: 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:176
+#: add-patch.c:419
msgid "could not parse diff"
msgstr "no s'ha pogut analitzar el diff"
-#: add-patch.c:194
+#: add-patch.c:438
msgid "could not parse colored diff"
msgstr "no s'ha pogut analitzar el diff acolorit"
-#: add-patch.c:508
+#: 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:790
#, c-format
msgid ""
"expected context line #%d in\n"
@@ -312,8 +619,7 @@
"s'esperava la línia amb contingut #%d a\n"
"%.*s"
-
-#: add-patch.c:523
+#: add-patch.c:805
#, c-format
msgid ""
"hunks do not overlap:\n"
@@ -321,13 +627,17 @@
"\tdoes not end with:\n"
"%.*s"
msgstr ""
+"els trossos no se superposen:\n"
+"%.*s\n"
+"\tno acaben amb:\n"
+"%.*s"
-#: add-patch.c:799 git-add--interactive.perl:1112
+#: add-patch.c:1081 git-add--interactive.perl:1115
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr ""
"Mode d'edició de trossos manual - vegeu més avall per una guia ràpida.\n"
-#: add-patch.c:803
+#: add-patch.c:1085
#, c-format
msgid ""
"---\n"
@@ -336,72 +646,61 @@
"Lines starting with %c will be removed.\n"
msgstr ""
"---\n"
-"Per suprimir «%c» línies, convertiu-les a ' ' (context).\n"
-"Per suprimir «%c» línies, suprimiu-les.\n"
-"Les línies que comencin per %c seran suprimides.\n"
-
-#: add-patch.c:810
-msgid ""
-"If the patch applies cleanly, the edited hunk will immediately be\n"
-"marked for staging.\n"
-msgstr ""
-"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
-"per «staging».\n"
+"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:818 git-add--interactive.perl:1126
+#: add-patch.c:1099 git-add--interactive.perl:1129
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"
+"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:851
+#: add-patch.c:1132
msgid "could not parse hunk header"
msgstr "no s'ha pogut analitzar la capçalera del tros"
-#: add-patch.c:895 add-patch.c:1294
+#: add-patch.c:1177
msgid "'git apply --cached' failed"
-msgstr ""
+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:952 git-add--interactive.perl:1239
+#: add-patch.c:1246 git-add--interactive.perl:1242
msgid ""
-"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+"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 "
+"El tros editat no s'aplica. Editeu-lo de nou (si responeu «no» es "
"descartarà) [y/n]? "
-#: add-patch.c:1009
-msgid ""
-"y - stage this hunk\n"
-"n - do not stage this hunk\n"
-"q - quit; do not stage this hunk or any of the remaining ones\n"
-"a - stage this and all the remaining hunks\n"
-"d - do not stage this hunk nor any of the remaining hunks\n"
-msgstr ""
-"y - fes «stage» d'aquest tros\n"
-"n - no facis «stage» d'aquest tros\n"
-"q - surt; no facis «stage» d'aquest tros o de cap altre restant\n"
-"a - fes «stage» d'aquest tros i de tota la resta de trossos del fitxer\n"
-"d - no facis «stage» d'aquest tros o de cap altre restant del fitxer\n"
+#: add-patch.c:1289
+msgid "The selected hunks do not apply to the index!"
+msgstr "Els trossos seleccionats no s'apliquen a l'índex!"
-#: add-patch.c:1016
+#: add-patch.c:1290 git-add--interactive.perl:1346
+msgid "Apply them to the worktree anyway? "
+msgstr "Voleu aplicar-los igualment a l'arbre de treball? "
+
+#: add-patch.c:1297 git-add--interactive.perl:1349
+msgid "Nothing was applied.\n"
+msgstr "No s'ha aplicat res.\n"
+
+#: add-patch.c:1354
msgid ""
"j - leave this hunk undecided, see next undecided hunk\n"
"J - leave this hunk undecided, see next hunk\n"
@@ -423,125 +722,138 @@
"e - edita manualment el tros actual\n"
"? - mostra l'ajuda\n"
-#: add-patch.c:1137 add-patch.c:1147
+#: add-patch.c:1516 add-patch.c:1526
msgid "No previous hunk"
msgstr "Sense tros previ"
-#: add-patch.c:1142 add-patch.c:1152
+#: add-patch.c:1521 add-patch.c:1531
msgid "No next hunk"
msgstr "No hi ha tros següent"
-#: add-patch.c:1158
+#: add-patch.c:1537
msgid "No other hunks to goto"
msgstr "No hi ha altres trossos on anar-hi"
-#: add-patch.c:1169 git-add--interactive.perl:1577
+#: add-patch.c:1548 git-add--interactive.perl:1606
msgid "go to which hunk (<ret> to see more)? "
-msgstr "vés a quin tros (<ret> per veure'n més)? "
+msgstr "ves a quin tros (<ret> per a veure'n més)? "
-#: add-patch.c:1170 git-add--interactive.perl:1579
+#: add-patch.c:1549 git-add--interactive.perl:1608
msgid "go to which hunk? "
-msgstr "vés a quin tros? "
+msgstr "ves a quin tros? "
-#: add-patch.c:1181
+#: add-patch.c:1560
#, c-format
msgid "Invalid number: '%s'"
msgstr "Número no vàlid: «%s»"
-#: add-patch.c:1186
+#: add-patch.c:1565
#, c-format
msgid "Sorry, only %d hunk available."
msgid_plural "Sorry, only %d hunks available."
msgstr[0] "Només %d tros disponible."
msgstr[1] "Només %d trossos disponibles."
-#: add-patch.c:1195
+#: add-patch.c:1574
msgid "No other hunks to search"
msgstr "No hi ha cap altre tros a cercar"
-#: add-patch.c:1201 git-add--interactive.perl:1623
+#: add-patch.c:1580 git-add--interactive.perl:1661
msgid "search for regex? "
msgstr "cerca per expressió regular? "
-#: add-patch.c:1216
+#: add-patch.c:1595
#, c-format
msgid "Malformed search regexp %s: %s"
msgstr "Expressió regular de cerca mal formada %s: %s"
-#: add-patch.c:1233
+#: add-patch.c:1612
msgid "No hunk matches the given pattern"
msgstr "No hi ha trossos que coincideixin amb el patró donat"
-#: add-patch.c:1240
+#: add-patch.c:1619
msgid "Sorry, cannot split this hunk"
msgstr "No es pot dividir aquest tros"
-#: add-patch.c:1244
+#: add-patch.c:1623
#, c-format
msgid "Split into %d hunks."
msgstr "Divideix en %d trossos."
-#: add-patch.c:1248
+#: add-patch.c:1627
msgid "Sorry, cannot edit this hunk"
msgstr "No es pot editar aquest tros"
-#: advice.c:111
+#: add-patch.c:1679
+msgid "'git apply' failed"
+msgstr "«git apply» ha fallat"
+
+#: advice.c:143
+#, c-format
+msgid ""
+"\n"
+"Disable this message with \"git config advice.%s false\""
+msgstr ""
+"\n"
+"Desactiva aquest missatge amb «git config advice.%s false»"
+
+#: advice.c:159
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%spista: %.*s%s\n"
-#: advice.c:164
+#: advice.c:250
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "Fer «cherry pick» no és possible perquè teniu fitxers sense fusionar."
-#: advice.c:166
+#: advice.c:252
msgid "Committing is not possible because you have unmerged files."
msgstr "Cometre no és possible perquè teniu fitxers sense fusionar."
-#: advice.c:168
+#: advice.c:254
msgid "Merging is not possible because you have unmerged files."
msgstr "Fusionar no és possible perquè teniu fitxers sense fusionar."
-#: advice.c:170
+#: advice.c:256
msgid "Pulling is not possible because you have unmerged files."
msgstr "Baixar no és possible perquè teniu fitxers sense fusionar."
-#: advice.c:172
+#: advice.c:258
msgid "Reverting is not possible because you have unmerged files."
msgstr "Revertir no és possible perquè teniu fitxers sense fusionar."
-#: advice.c:174
+#: advice.c:260
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "No és possible %s perquè teniu fitxers sense fusionar."
-#: advice.c:182
+#: advice.c:268
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:190
+#: advice.c:276
msgid "Exiting because of an unresolved conflict."
msgstr "S'està sortint a causa d'un conflicte no resolt."
-#: advice.c:195 builtin/merge.c:1332
+#: advice.c:281 builtin/merge.c:1369
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "No heu conclòs la vostra fusió (MERGE_HEAD existeix)."
-#: advice.c:197
+#: advice.c:283
msgid "Please, commit your changes before merging."
msgstr "Cometeu els vostres canvis abans de fusionar."
-#: advice.c:198
+#: advice.c:284
msgid "Exiting because of unfinished merge."
msgstr "S'està sortint a causa d'una fusió no terminada."
-#: advice.c:204
-#, fuzzy, c-format
+#: advice.c:290
+#, c-format
msgid ""
"Note: switching to '%s'.\n"
"\n"
@@ -558,21 +870,26 @@
"\n"
" git switch -\n"
"\n"
-"Turn off this advice by setting config variable advice.detachedHead to "
-"false\n"
+"Turn off this advice by setting config variable advice.detachedHead to false\n"
"\n"
msgstr ""
"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 checkout -b <nom-de-branca-nova>\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"
#: alias.c:50
msgid "cmdline ends with \\"
@@ -580,7 +897,7 @@
#: alias.c:51
msgid "unclosed quote"
-msgstr ""
+msgstr "cita no tancada"
#: apply.c:69
#, c-format
@@ -666,11 +983,11 @@
#: apply.c:1372
#, c-format
msgid ""
-"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"
+" component (line %d)"
msgid_plural ""
-"git diff header lacks filename information when removing %d leading pathname "
-"components (line %d)"
+"git diff header lacks filename information when removing %d leading pathname"
+" components (line %d)"
msgstr[0] ""
"a la capçalera de git diff li manca informació de nom de fitxer en eliminar "
"%d component de nom de camí inicial (línia %d)"
@@ -789,7 +1106,7 @@
msgstr ""
"no es pot aplicar un pedaç binari a «%s» sense la línia d'índex completa"
-#: apply.c:3162
+#: apply.c:3163
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
@@ -797,284 +1114,285 @@
"el pedaç s'aplica a «%s» (%s), el qual no coincideix amb els continguts "
"actuals."
-#: apply.c:3170
+#: 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:3188
+#: 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:3201
+#: apply.c:3202
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "el pedaç binari no s'aplica a «%s»"
-#: apply.c:3207
+#: 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:3228
+#: apply.c:3230
#, c-format
msgid "patch failed: %s:%ld"
msgstr "el pedaç ha fallat: %s:%ld"
-#: apply.c:3351
+#: apply.c:3353
#, c-format
msgid "cannot checkout %s"
msgstr "no es pot agafar %s"
-#: apply.c:3403 apply.c:3414 apply.c:3460 midx.c:61 setup.c:280
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 setup.c:308
#, c-format
msgid "failed to read %s"
msgstr "s'ha produït un error en llegir %s"
-#: apply.c:3411
+#: 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:3440 apply.c:3683
+#: 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:3526 apply.c:3698
+#: apply.c:3528 apply.c:3700
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: no existeix en l'índex"
-#: apply.c:3535 apply.c:3706
+#: 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:3570
+#: 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."
+"al dipòsit li manca el blob necessari per a retrocedir a una fusió de 3 "
+"vies."
-#: apply.c:3573
+#: 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:3589 apply.c:3593
+#: 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:3605
+#: 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:3619
+#: 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:3624
+#: apply.c:3626
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "S'ha aplicat el pedaç a «%s» netament.\n"
-#: apply.c:3650
+#: apply.c:3652
msgid "removal patch leaves file contents"
msgstr "el pedaç d'eliminació deixa els continguts dels fitxers"
-#: apply.c:3723
+#: apply.c:3725
#, c-format
msgid "%s: wrong type"
msgstr "%s: tipus erroni"
-#: apply.c:3725
+#: apply.c:3727
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s és del tipus %o, s'esperava %o"
-#: apply.c:3876 apply.c:3878 read-cache.c:830 read-cache.c:856
-#: read-cache.c:1320
+#: apply.c: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:3934
+#: apply.c:3950
#, c-format
msgid "%s: already exists in index"
msgstr "%s: ja existeix en l'índex"
-#: apply.c:3937
+#: apply.c:3956
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: ja existeix en el directori de treball"
-#: apply.c:3957
+#: 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:3962
+#: 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:3982
+#: 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:3986
+#: apply.c:4005
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: el pedaç no s'aplica"
-#: apply.c:4001
+#: apply.c:4020
#, c-format
msgid "Checking patch %s..."
msgstr "S'està comprovant el pedaç %s..."
-#: apply.c:4093
+#: 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:4100
+#: 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:4103
+#: apply.c:4122
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "falta informació sha1 o és inútil (%s)."
-#: apply.c:4112
+#: 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:4122
+#: 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:4260
+#: apply.c:4279
#, c-format
msgid "unable to remove %s from index"
msgstr "no s'ha pogut eliminar %s de l'índex"
-#: apply.c:4294
+#: apply.c:4313
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "pedaç malmès per al submòdul %s"
-#: apply.c:4300
+#: 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:4308
+#: 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:4314 apply.c:4459
+#: 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:4357
+#: apply.c:4376 builtin/bisect--helper.c:524
#, c-format
msgid "failed to write to '%s'"
msgstr "no s'ha pogut escriure a «%s»"
-#: apply.c:4361
+#: apply.c:4380
#, c-format
msgid "closing file '%s'"
msgstr "s'està tancant el fitxer «%s»"
-#: apply.c:4431
+#: 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:4529
+#: apply.c:4548
#, c-format
msgid "Applied patch %s cleanly."
msgstr "El pedaç %s s'ha aplicat netament."
-#: apply.c:4537
+#: apply.c:4556
msgid "internal error"
msgstr "error intern"
-#: apply.c:4540
+#: 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:4551
+#: 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:4559 builtin/fetch.c:901 builtin/fetch.c:1192
+#: 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:4573
+#: apply.c:4592
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "El tros #%d s'ha aplicat netament."
-#: apply.c:4577
+#: apply.c:4596
#, c-format
msgid "Rejected hunk #%d."
msgstr "S'ha rebutjat el tros #%d."
-#: apply.c:4696
+#: apply.c:4720
#, c-format
msgid "Skipped patch '%s'."
msgstr "S'ha omès el pedaç «%s»."
-#: apply.c:4704
+#: apply.c:4728
msgid "unrecognized input"
msgstr "entrada no reconeguda"
-#: apply.c:4724
+#: apply.c:4748
msgid "unable to read index file"
msgstr "no es pot llegir el fitxer d'índex"
-#: apply.c:4881
+#: apply.c:4905
#, c-format
msgid "can't open patch '%s': %s"
msgstr "no es pot obrir el pedaç «%s»: %s"
-#: apply.c:4908
+#: apply.c:4932
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "s'ha silenciat %d error d'espai en blanc"
msgstr[1] "s'han silenciat %d errors d'espai en blanc"
-#: apply.c:4914 apply.c:4929
+#: apply.c:4938 apply.c:4953
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d línia afegeix errors d'espai en blanc."
msgstr[1] "%d línies afegeixen errors d'espai en blanc."
-#: apply.c:4922
+#: apply.c:4946
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
@@ -1083,138 +1401,184 @@
msgstr[1] ""
"S'han aplicat %d línies després d'arreglar els errors d'espai en blanc."
-#: apply.c:4938 builtin/add.c:579 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4962 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:4966
+#: apply.c:4990
msgid "don't apply changes matching the given path"
msgstr "no apliquis els canvis que coincideixin amb el camí donat"
-#: apply.c:4969
+#: apply.c:4993
msgid "apply changes matching the given path"
msgstr "aplica els canvis que coincideixin amb el camí donat"
-#: apply.c:4971 builtin/am.c:2206
+#: apply.c:4995 builtin/am.c:2266
msgid "num"
msgstr "número"
-#: apply.c:4972
+#: apply.c:4996
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
"elimina <nombre> barres obliqües inicials dels camins de diferència "
"tradicionals"
-#: apply.c:4975
+#: apply.c:4999
msgid "ignore additions made by the patch"
msgstr "ignora afegiments fets pel pedaç"
-#: apply.c:4977
+#: apply.c:5001
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"
+"en lloc d'aplicar el pedaç, emet les estadístiques de diferència de "
+"l'entrada"
-#: apply.c:4981
+#: apply.c:5005
msgid "show number of added and deleted lines in decimal notation"
msgstr "mostra el nombre de línies afegides i suprimides en notació decimal"
-#: apply.c:4983
+#: apply.c:5007
msgid "instead of applying the patch, output a summary for the input"
msgstr "en lloc d'aplicar el pedaç, emet un resum de l'entrada"
-#: apply.c:4985
+#: apply.c:5009
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "en lloc d'aplicar el pedaç, veges si el pedaç és aplicable"
-#: apply.c:4987
+#: apply.c:5011
msgid "make sure the patch is applicable to the current index"
msgstr "assegura que el pedaç sigui aplicable a l'índex actual"
-#: apply.c:4989
+#: apply.c:5013
msgid "mark new files with `git add --intent-to-add`"
-msgstr ""
+msgstr "marca els fitxers nous amb «git add --intent-to-add»"
-#: apply.c:4991
+#: apply.c:5015
msgid "apply a patch without touching the working tree"
msgstr "aplica un pedaç sense tocar l'arbre de treball"
-#: apply.c:4993
+#: apply.c:5017
msgid "accept a patch that touches outside the working area"
msgstr "accepta un pedaç que toqui fora de l'àrea de treball"
-#: apply.c:4996
+#: apply.c:5020
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)"
-#: apply.c:4998
+#: apply.c:5022
msgid "attempt three-way merge if a patch does not apply"
msgstr "intenta una fusió de tres vies si el pedaç no s'aplica"
-#: apply.c:5000
+#: apply.c:5024
msgid "build a temporary index based on embedded index information"
-msgstr "construeix un índex temporal basat en la informació d'índex incrustada"
+msgstr ""
+"construeix un índex temporal basat en la informació d'índex incrustada"
-#: apply.c:5003 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5027 builtin/checkout-index.c:182 builtin/ls-files.c:525
msgid "paths are separated with NUL character"
msgstr "els camins se separen amb el caràcter NUL"
-#: apply.c:5005
+#: apply.c:5029
msgid "ensure at least <n> lines of context match"
msgstr "assegura't que almenys <n> línies de context coincideixin"
-#: apply.c:5006 builtin/am.c:2185 builtin/interpret-trailers.c:98
+#: apply.c:5030 builtin/am.c:2245 builtin/interpret-trailers.c:98
#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3310 builtin/rebase.c:1474
+#: builtin/pack-objects.c:3562 builtin/rebase.c:1346
msgid "action"
msgstr "acció"
-#: apply.c:5007
+#: apply.c:5031
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
"detecta les línies noves o modificades que tinguin errors d'espai en blanc"
-#: apply.c:5010 apply.c:5013
+#: apply.c:5034 apply.c:5037
msgid "ignore changes in whitespace when finding context"
msgstr "ignora els canvis d'espai en blanc en cercar context"
-#: apply.c:5016
+#: apply.c:5040
msgid "apply the patch in reverse"
msgstr "aplica el pedaç al revés"
-#: apply.c:5018
+#: apply.c:5042
msgid "don't expect at least one line of context"
msgstr "no esperis almenys una línia de context"
-#: apply.c:5020
+#: apply.c:5044
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "deixa els trossos rebutjats en fitxers *.rej corresponents"
-#: apply.c:5022
+#: apply.c:5046
msgid "allow overlapping hunks"
msgstr "permet trossos encavalcants"
-#: apply.c:5023 builtin/add.c:309 builtin/check-ignore.c:22
-#: builtin/commit.c:1355 builtin/count-objects.c:98 builtin/fsck.c:774
-#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5047 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:2287 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "sigues detallat"
-#: apply.c:5025
+#: apply.c:5049
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "tolera una línia nova incorrectament detectada al final del fitxer"
-#: apply.c:5028
+#: apply.c:5052
msgid "do not trust the line counts in the hunk headers"
msgstr "no confiïs en els recomptes de línia en les capçaleres dels trossos"
-#: apply.c:5030 builtin/am.c:2194
+#: apply.c:5054 builtin/am.c:2254
msgid "root"
msgstr "arrel"
-#: apply.c:5031
+#: apply.c:5055
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:450
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr "no s'ha pogut iniciar el filtre «%s»"
+
+#: archive-tar.c:453
+msgid "unable to redirect descriptor"
+msgstr "no s'ha pogut redirigir el descriptor"
+
+#: archive-tar.c:460
+#, 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í>...]"
@@ -1225,7 +1589,8 @@
#: archive.c:16
msgid ""
-"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
+"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> "
+"[<path>...]"
msgstr ""
"git archive --remote <dipòsit> [--exec <ordre>] [<opcions>] <arbre> "
"[<camí>...]"
@@ -1234,206 +1599,179 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <dipòsit> [--exec <ordre>] --list"
-#: archive.c:372 builtin/add.c:180 builtin/add.c:555 builtin/rm.c:299
-#, 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
-#, c-format
-msgid "no such ref: %.*s"
-msgstr "no existeix la referència: %.*s"
-
-#: archive.c:401
-#, c-format
-msgid "not a valid object name: %s"
-msgstr "no és un nom d'objecte vàlid: %s"
-
-#: archive.c:414
-#, c-format
-msgid "not a tree object: %s"
-msgstr "no és un objecte d'arbre: %s"
-
-#: archive.c:426
-msgid "current working directory is untracked"
-msgstr "no es segueix el directori de treball actual"
-
-#: archive.c:457
-msgid "fmt"
-msgstr "format"
-
-#: archive.c:457
-msgid "archive format"
-msgstr "format d'arxiu"
-
-#: archive.c:458 builtin/log.c:1653
-msgid "prefix"
-msgstr "prefix"
-
-#: archive.c:459
-msgid "prepend prefix to each pathname in the archive"
-msgstr "anteposa el prefix a cada nom de camí en l'arxiu"
-
-#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
-#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162
-#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899
-#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
-#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
-#: parse-options.h:190
-msgid "file"
-msgstr "fitxer"
-
-#: archive.c:461 builtin/archive.c:90
-msgid "write the archive to this file"
-msgstr "escriu l'arxiu a aquest fitxer"
-
-#: archive.c:463
-msgid "read .gitattributes in working directory"
-msgstr "llegeix .gitattributes en el directori de treball"
-
-#: archive.c:464
-msgid "report archived files on stderr"
-msgstr "informa de fitxers arxivats en stderr"
-
-#: archive.c:465
-msgid "store only"
-msgstr "només emmagatzema"
-
-#: archive.c:466
-msgid "compress faster"
-msgstr "comprimeix més ràpidament"
-
-#: archive.c:474
-msgid "compress better"
-msgstr "comprimeix millor"
-
-#: archive.c:477
-msgid "list supported archive formats"
-msgstr "llista els formats d'arxiu admesos"
-
-#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
-#: builtin/submodule--helper.c:1391 builtin/submodule--helper.c:1884
-msgid "repo"
-msgstr "dipòsit"
-
-#: archive.c:480 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:715
-#: builtin/notes.c:498
-msgid "command"
-msgstr "ordre"
-
-#: archive.c:482 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
-msgid "Unexpected option --remote"
-msgstr "Opció inesperada --remote"
-
-#: archive.c:491
-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
-msgid "Unexpected option --output"
-msgstr "Opció inesperada --output"
-
-#: archive.c:515
-#, c-format
-msgid "Unknown archive format '%s'"
-msgstr "Format d'arxiu desconegut «%s»"
-
-#: archive.c:522
-#, 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:350
-#, c-format
-msgid "cannot stream blob %s"
-msgstr "no es pot transmetre el blob %s"
-
-#: archive-tar.c:266 archive-zip.c:368
-#, c-format
-msgid "unsupported file mode: 0%o (SHA1: %s)"
-msgstr "mode de fitxer no compatible: 0%o (SHA1: %s)"
-
-#: archive-tar.c:293 archive-zip.c:358
+#: archive.c:192
#, c-format
msgid "cannot read %s"
msgstr "no es pot llegir «%s»"
-#: archive-tar.c:465
+#: archive.c:345 sequencer.c:459 sequencer.c:1736 sequencer.c:2886
+#: sequencer.c:3327 sequencer.c:3436 builtin/am.c:249 builtin/commit.c:786
+#: builtin/merge.c:1138
#, c-format
-msgid "unable to start '%s' filter"
-msgstr "no s'ha pogut iniciar el filtre «%s»"
+msgid "could not read '%s'"
+msgstr "no s'ha pogut llegir «%s»"
-#: archive-tar.c:468
-msgid "unable to redirect descriptor"
-msgstr "no s'ha pogut redirigir el descriptor"
-
-#: archive-tar.c:475
+#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315
#, c-format
-msgid "'%s' filter reported error"
-msgstr "«%s» error reportat pel filtre"
+msgid "pathspec '%s' did not match any files"
+msgstr "l'especificació de camí «%s» no ha coincidit amb cap fitxer"
-#: archive-zip.c:319
+#: archive.c:454
#, c-format
-msgid "path is not valid UTF-8: %s"
-msgstr "el camí no és vàlid en UTF-8: %s"
+msgid "no such ref: %.*s"
+msgstr "no existeix la referència: %.*s"
-#: archive-zip.c:323
+#: archive.c:460
#, c-format
-msgid "path too long (%d chars, SHA1: %s): %s"
-msgstr "el camí és massa llarg (%d caràcters, SHA1: %s): %s"
+msgid "not a valid object name: %s"
+msgstr "no és un nom d'objecte vàlid: %s"
-#: archive-zip.c:479 builtin/pack-objects.c:230 builtin/pack-objects.c:233
+#: archive.c:473
#, c-format
-msgid "deflate error (%d)"
-msgstr "error de deflació (%d)"
+msgid "not a tree object: %s"
+msgstr "no és un objecte d'arbre: %s"
-#: archive-zip.c:614
+#: archive.c:485
+msgid "current working directory is untracked"
+msgstr "no se segueix el directori de treball actual"
+
+#: archive.c:526
#, c-format
-msgid "timestamp too large for this system: %<PRIuMAX>"
-msgstr "marca de temps massa gran per a aquest sistema: %<PRIuMAX>"
+msgid "File not found: %s"
+msgstr "Fitxer no trobat: %s"
-#: attr.c:212
+#: archive.c:528
+#, c-format
+msgid "Not a regular file: %s"
+msgstr "No és un fitxer normal: %s"
+
+#: archive.c:555
+msgid "fmt"
+msgstr "format"
+
+#: archive.c:555
+msgid "archive format"
+msgstr "format d'arxiu"
+
+#: archive.c:556 builtin/log.c:1765
+msgid "prefix"
+msgstr "prefix"
+
+#: archive.c:557
+msgid "prepend prefix to each pathname in the archive"
+msgstr "anteposa el prefix a cada nom de camí en l'arxiu"
+
+#: archive.c:558 archive.c:561 builtin/blame.c:886 builtin/blame.c:890
+#: builtin/blame.c:891 builtin/commit-tree.c:117 builtin/config.c:135
+#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
+#: builtin/fast-export.c:1214 builtin/grep.c:919 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:559
+msgid "add untracked file to archive"
+msgstr "inclou els fitxers no seguits a l'arxiu"
+
+#: archive.c:562 builtin/archive.c:90
+msgid "write the archive to this file"
+msgstr "escriu l'arxiu a aquest fitxer"
+
+#: archive.c:564
+msgid "read .gitattributes in working directory"
+msgstr "llegeix .gitattributes en el directori de treball"
+
+#: archive.c:565
+msgid "report archived files on stderr"
+msgstr "informa de fitxers arxivats en stderr"
+
+#: archive.c:567
+msgid "set compression level"
+msgstr "estableix el nivell de compressió"
+
+#: archive.c:570
+msgid "list supported archive formats"
+msgstr "llista els formats d'arxiu admesos"
+
+#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117
+#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
+msgid "repo"
+msgstr "dipòsit"
+
+#: archive.c:573 builtin/archive.c:92
+msgid "retrieve the archive from remote repository <repo>"
+msgstr "recupera l'arxiu del dipòsit remot <dipòsit>"
+
+#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714
+#: builtin/notes.c:498
+msgid "command"
+msgstr "ordre"
+
+#: archive.c:575 builtin/archive.c:94
+msgid "path to the remote git-upload-archive command"
+msgstr "camí a l'ordre git-upload-archive remota"
+
+#: archive.c:582
+msgid "Unexpected option --remote"
+msgstr "Opció inesperada --remote"
+
+#: archive.c:584
+msgid "Option --exec can only be used together with --remote"
+msgstr "L'opció --exec només es pot usar juntament amb --remote"
+
+#: archive.c:586
+msgid "Unexpected option --output"
+msgstr "Opció inesperada --output"
+
+#: archive.c:588
+msgid "Options --add-file and --remote cannot be used together"
+msgstr "Les opcions --add-file i --remote no es poden usar juntes"
+
+#: archive.c:610
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "Format d'arxiu desconegut «%s»"
+
+#: archive.c:619
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "Argument no admès per al format «%s»: -%d"
+
+#: attr.c:202
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s no és un nom d'atribut vàlid"
-#: attr.c:369
+#: attr.c:359
#, c-format
msgid "%s not allowed: %s:%d"
msgstr "%s no està permès: %s:%d"
-#: attr.c:409
+#: attr.c:399
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:489
#, 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:699
#, c-format
msgid "We cannot bisect more!\n"
msgstr "No podem bisecar més!\n"
-#: bisect.c:733
+#: bisect.c:766
#, c-format
msgid "Not a valid commit name %s"
msgstr "No és un nom de comissió vàlid %s"
-#: bisect.c:758
+#: bisect.c:791
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1442,7 +1780,7 @@
"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:796
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1451,7 +1789,7 @@
"La base de fusió %s és nova.\n"
"La propietat s'ha canviat entre %s i [%s].\n"
-#: bisect.c:768
+#: bisect.c:801
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1460,7 +1798,7 @@
"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:809
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1471,7 +1809,7 @@
"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:822
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1479,40 +1817,39 @@
"We continue anyway."
msgstr ""
"s'ha d'ometre la base de fusió entre %s i [%s].\n"
-"Llavors, no podem estar segurs que la primera comissió %s sigui entre %s i "
-"%s.\n"
+"Llavors, no podem estar segurs que la primera comissió %s sigui entre %s i %s.\n"
"Continuem de totes maneres."
-#: bisect.c:822
+#: bisect.c:861
#, 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:911
#, 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:941 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:987 builtin/merge.c:152
#, c-format
msgid "could not read file '%s'"
msgstr "no s'ha pogut llegir el fitxer «%s»"
-#: bisect.c:958
+#: bisect.c:1027
msgid "reading bisect refs failed"
msgstr "la lectura de les referències de bisecció ha fallat"
-#: bisect.c:977
+#: bisect.c:1057
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s era ambdós %s i %s\n"
-#: bisect.c:985
+#: bisect.c:1066
#, c-format
msgid ""
"No testable commit found.\n"
@@ -1521,7 +1858,7 @@
"No s'ha trobat cap comissió comprovable.\n"
"Potser heu començat amb paràmetres de camí incorrectes?\n"
-#: bisect.c:1004
+#: bisect.c:1095
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1530,49 +1867,48 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
-#.
-#: bisect.c:1010
+#: bisect.c:1101
#, 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:2700
+#: blame.c:2777
msgid "--contents and --reverse do not blend well."
msgstr "--contents i --reverse no funcionen bé juntes."
-#: blame.c:2714
+#: blame.c:2791
msgid "cannot use --contents with final commit object name"
msgstr "no es pot usar --contents amb el nom d'objecte de la comissió final"
-#: blame.c:2735
+#: blame.c:2812
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
"--reverse i --first-parent-together requereixen una última comissió "
"especificada"
-#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:2093
-#: sequencer.c:4460 builtin/commit.c:1040 builtin/log.c:388 builtin/log.c:991
-#: builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 builtin/merge.c:411
-#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143
-#: builtin/shortlog.c:192
+#: blame.c:2821 bundle.c:213 ref-filter.c:2272 remote.c:2031 sequencer.c:2138
+#: sequencer.c:4633 submodule.c:855 builtin/commit.c:1045 builtin/log.c:409
+#: builtin/log.c:1023 builtin/log.c:1625 builtin/log.c:2046 builtin/log.c:2336
+#: builtin/merge.c:423 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395
+#: builtin/shortlog.c:267
msgid "revision walk setup failed"
msgstr "la configuració del passeig per revisions ha fallat"
-#: blame.c:2762
+#: blame.c:2839
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
"--reverse --first-parent junts requereixen un rang de la cadena de mares "
"primeres"
-#: blame.c:2773
+#: blame.c:2850
#, c-format
msgid "no such path %s in %s"
msgstr "no hi ha tal camí %s en %s"
-#: blame.c:2784
+#: blame.c:2861
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "no es pot llegir el blob %s per al camí %s"
@@ -1588,7 +1924,7 @@
"\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
@@ -1643,7 +1979,8 @@
#: branch.c:110
#, c-format
msgid "Branch '%s' set up to track local ref '%s'."
-msgstr "La branca «%s» està configurada per a seguir la referència local «%s»."
+msgstr ""
+"La branca «%s» està configurada per a seguir la referència local «%s»."
#: branch.c:119
msgid "Unable to write upstream branch configuration"
@@ -1670,7 +2007,8 @@
#: branch.c:233
#, c-format
-msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgid ""
+"Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
"No es pot configurar la informació de seguiment; el punt inicial «%s» no és "
"una branca."
@@ -1716,114 +2054,423 @@
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
+#: bundle.c:41
#, c-format
-msgid "'%s' does not look like a v2 bundle file"
-msgstr "«%s» no sembla un fitxer de farcell v2"
+msgid "unrecognized bundle hash algorithm: %s"
+msgstr "Algoritme de hash del farcell desconegut: %s"
-#: bundle.c:64
+#: bundle.c:45
+#, c-format
+msgid "unknown capability '%s'"
+msgstr "funcionalitat «%s» desconeguda"
+
+#: bundle.c:71
+#, c-format
+msgid "'%s' does not look like a v2 or v3 bundle file"
+msgstr "«%s» no sembla un fitxer de farcell v2 o v3"
+
+#: 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:2344 sequencer.c:3108
-#: builtin/commit.c:811
+#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2390 sequencer.c:3176
+#: 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 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:273
+#: bundle.c:319
msgid "unable to dup bundle descriptor"
msgstr "no s'ha pogut duplicar el descriptor del farcell"
-#: bundle.c:280
+#: 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:291
+#: bundle.c:337
msgid "pack-objects died"
msgstr "El pack-objects s'ha mort"
-#: bundle.c:333
+#: bundle.c:379
msgid "rev-list died"
msgstr "El rev-list s'ha mort"
-#: bundle.c:382
+#: 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:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306
+#: bundle.c:498
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr "versió del farcell no compatible %d"
+
+#: bundle.c:500
+#, c-format
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr "no es pot escriure la versió %d amb l'algorisme %s"
+
+#: bundle.c:522 builtin/log.c:209 builtin/log.c:1927 builtin/shortlog.c:408
#, c-format
msgid "unrecognized argument: %s"
-msgstr "paràmetre no reconegut: %s"
+msgstr "argument no reconegut: %s"
-#: bundle.c:469
+#: bundle.c:530
msgid "Refusing to create empty bundle."
msgstr "S'està refusant crear un farcell buit."
-#: bundle.c:479
+#: bundle.c:540
#, c-format
msgid "cannot create '%s'"
msgstr "no es pot crear «%s»"
-#: bundle.c:504
+#: 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:51 sequencer.c:2811 builtin/am.c:354 builtin/am.c:398
-#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456
+#: commit-graph.c:188 midx.c:47
+msgid "invalid hash version"
+msgstr "especificació de hash no vàlida"
+
+#: commit-graph.c:246
+msgid "commit-graph file is too small"
+msgstr "el fitxer del graf de comissions és massa petit"
+
+#: 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"
+
+#: 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: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:342
+#, c-format
+msgid "commit-graph file is too small to hold %u chunks"
+msgstr ""
+"el fitxer del graf de comissions és massa petit per guardar %u fragments"
+
+#: commit-graph.c:361
+#, c-format
+msgid "commit-graph improper chunk offset %08x%08x"
+msgstr "desplaçament %08x%08x del fragment del graf de comissions incorrecte"
+
+#: commit-graph.c:433
+#, c-format
+msgid "commit-graph chunk id %08x appears multiple times"
+msgstr ""
+"el fragment amb id %08x del graf de comissions apareix múltiples vegades"
+
+#: commit-graph.c:499
+msgid "commit-graph has no base graphs chunk"
+msgstr "el fragment del graf de comissions no té grafs de base"
+
+#: commit-graph.c:509
+msgid "commit-graph chain does not match"
+msgstr "la cadena del graf de comissions no coincideix"
+
+#: 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:581
+msgid "unable to find all commit-graph files"
+msgstr "no es poden trobar tots els fitxers del graf de comissions"
+
+#: 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"
+
+#: commit-graph.c:742
+#, c-format
+msgid "could not find commit %s"
+msgstr "no s'ha pogut trobar la comissió %s"
+
+#: commit-graph.c:1042 builtin/am.c:1292
+#, 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:1301
+msgid "Loading known commits in commit graph"
+msgstr "S'estan carregant comissions conegudes al graf de comissions"
+
+#: 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:1338
+msgid "Clearing commit marks in commit graph"
+msgstr "S'estan esborrant les marques de comissions al graf de comissions"
+
+#: 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: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
+msgid "Collecting referenced commits"
+msgstr "S'estan recollint 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:1539
+#, c-format
+msgid "error adding pack %s"
+msgstr "error en afegir paquet %s"
+
+#: 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:1582
+msgid "Finding commits for commit graph among packed objects"
+msgstr ""
+"S'estan cercant les comissions pel graf de comissions entre els objectes "
+"empaquetats"
+
+#: commit-graph.c:1597
+msgid "Counting distinct commits in commit graph"
+msgstr "S'estan comptant les comissions diferents al graf de comissions"
+
+#: 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: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"
+
+#: commit-graph.c:1720 midx.c:819
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr "no s'han pogut crear els directoris inicials de «%s»"
+
+#: 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 adjust shared permissions for '%s'"
+msgstr "no s'han pogut ajustar els permisos compartits per a «%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] "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: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: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:1889
+msgid "failed to rename temporary commit-graph file"
+msgstr ""
+"no s'ha pogut canviar el nom del fitxer temporal del graf de comissions"
+
+#: commit-graph.c:2015
+msgid "Scanning merged commits"
+msgstr "S'estan escanejant les comissions fusionades"
+
+#: commit-graph.c:2059
+msgid "Merging commit-graph"
+msgstr "S'està fusionant el graf de comissions"
+
+#: commit-graph.c:2165
+msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
+msgstr ""
+"s'està intentant escriure un graf de comissions, però «core.commitGraph» "
+"està desactivat"
+
+#: commit-graph.c:2274
+#, 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:2285
+msgid "too many commits to write graph"
+msgstr "massa comissions per escriure un graf"
+
+#: commit-graph.c:2378
+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:2388
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr "el gràfic de comissions té una ordre OID incorrecta; %s llavors %s"
+
+#: commit-graph.c:2398 commit-graph.c:2413
+#, 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:2405
+#, 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"
+
+#: commit-graph.c:2423
+msgid "Verifying commits in commit graph"
+msgstr "S'estan verificant les comissions al graf de comissions"
+
+#: commit-graph.c:2438
+#, 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:2445
+#, 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:2455
+#, 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:2464
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr "el pare pel graf de comissions %s és %s != %s"
+
+#: commit-graph.c:2478
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr "la llista pare del graf de comissions per %s acaba aviat"
+
+#: commit-graph.c:2483
+#, 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:2487
+#, 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:2503
+#, c-format
+msgid "commit-graph generation for commit %s is %u != %u"
+msgstr "La generació del graf de comissions per la comissió %s és %u != %u"
+
+#: commit-graph.c:2509
+#, 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:2879 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr "no s'ha pogut analitzar %s"
-#: commit.c:53
+#: commit.c:54
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s no és una comissió!"
-#: commit.c:193
+#: commit.c:194
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -1834,28 +2481,34 @@
"Turn this message off by running\n"
"\"git config advice.graftFileDeprecated false\""
msgstr ""
+"La compatibilitat amb <GIT_DIR>/info/grafts és obsoleta\n"
+"i s'eliminarà en una futura versió del Git.\n"
+"\n"
+"Si us plau useu «git replace --convert-graft-file»\n"
+"per convertir els grafs en substitució de referències. Desactiveu aquest missatge executant\n"
+"«git config advice.graftFileDeprecated false»"
-#: commit.c:1152
+#: 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:1155
+#: 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:1158
+#: commit.c:1179
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "La comissió %s no té signatura GPG."
-#: commit.c:1161
+#: 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:1415
+#: 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"
@@ -1866,275 +2519,11 @@
"la variable de configuració i18n.commitencoding a la codificació que\n"
"usi el vostre projecte.\n"
-#: commit-graph.c:130
-msgid "commit-graph file is too small"
-msgstr ""
-
-#: commit-graph.c:195
-#, 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"
-
-#: commit-graph.c:202
-#, c-format
-msgid "commit-graph version %X does not match version %X"
-msgstr "la versió del graf de comissions %X no coincideix amb la versió %X"
-
-#: commit-graph.c:209
-#, 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:232
-msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
-msgstr ""
-
-#: commit-graph.c:243
-#, c-format
-msgid "commit-graph improper chunk offset %08x%08x"
-msgstr ""
-
-#: commit-graph.c:286
-#, c-format
-msgid "commit-graph chunk id %08x appears multiple times"
-msgstr ""
-
-#: commit-graph.c:350
-msgid "commit-graph has no base graphs chunk"
-msgstr ""
-
-#: commit-graph.c:360
-msgid "commit-graph chain does not match"
-msgstr "la cadena del graf de comissions no coincideix"
-
-#: commit-graph.c:407
-#, c-format
-msgid "invalid commit-graph chain: line '%s' not a hash"
-msgstr ""
-
-#: commit-graph.c:433
-msgid "unable to find all commit-graph files"
-msgstr "no es poden trobar tots els fitxers del graf de comissions"
-
-#: commit-graph.c:564 commit-graph.c:624
-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"
-
-#: commit-graph.c:585
-#, c-format
-msgid "could not find commit %s"
-msgstr "no s'ha pogut trobar la comissió %s"
-
-#: commit-graph.c:858 builtin/am.c:1287
-#, c-format
-msgid "unable to parse commit %s"
-msgstr "no s'ha pogut analitzar la comissió %s"
-
-#: commit-graph.c:1017 builtin/pack-objects.c:2641
-#, c-format
-msgid "unable to get type of object %s"
-msgstr "no s'ha pogut obtenir el tipus de l'objecte: %s"
-
-#: commit-graph.c:1049
-msgid "Loading known commits in commit graph"
-msgstr "S'estan carregant comissions conegudes al graf de comissions"
-
-#: commit-graph.c:1066
-msgid "Expanding reachable commits in commit graph"
-msgstr "S'estan expandint les comissions abastables al graf de comissions"
-
-#: commit-graph.c:1085
-msgid "Clearing commit marks in commit graph"
-msgstr "S'estan netejant les marques de comissions al graf de comissions"
-
-#: commit-graph.c:1104
-msgid "Computing commit graph generation numbers"
-msgstr "S'estan calculant els nombres de generació del graf de comissions"
-
-#: commit-graph.c:1179
-#, c-format
-msgid "Finding commits for commit graph in %d pack"
-msgid_plural "Finding commits for commit graph in %d packs"
-msgstr[0] "S'estan cercant les comissions pel graf de comissions en %d paquet"
-msgstr[1] "S'estan cercant les comissions pel graf de comissions en %d paquets"
-
-#: commit-graph.c:1192
-#, c-format
-msgid "error adding pack %s"
-msgstr "error en afegir paquet %s"
-
-#: commit-graph.c:1196
-#, c-format
-msgid "error opening index for %s"
-msgstr "s'ha produït un error en obrir l'índex per «%s»"
-
-#: commit-graph.c:1220
-#, c-format
-msgid "Finding commits for commit graph from %d ref"
-msgid_plural "Finding commits for commit graph from %d refs"
-msgstr[0] ""
-"S'estan cercant les comissions pel graf de comissions des de %d referència"
-msgstr[1] ""
-"S'estan cercant les comissions pel graf de comissions des de %d referències"
-
-#: commit-graph.c:1240
-#, c-format
-msgid "invalid commit object id: %s"
-msgstr "identificador d'objecte de comissió no vàlid: %s"
-
-#: commit-graph.c:1255
-msgid "Finding commits for commit graph among packed objects"
-msgstr ""
-"S'estan cercant les comissions pel graf de comissions entre els objectes "
-"empaquetats"
-
-#: commit-graph.c:1270
-msgid "Counting distinct commits in commit graph"
-msgstr "S'estan comptant les comissions diferents al graf de comissions"
-
-#: commit-graph.c:1300
-msgid "Finding extra edges in commit graph"
-msgstr "S'estan cercant les vores addicionals al graf de comissions"
-
-#: commit-graph.c:1346
-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"
-
-#: commit-graph.c:1379 midx.c:814
-#, c-format
-msgid "unable to create leading directories of %s"
-msgstr "no s'han pogut crear els directoris inicials de «%s»"
-
-#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:248
-#, c-format
-msgid "unable to create '%s'"
-msgstr "no s'ha pogut crear «%s»"
-
-#: commit-graph.c:1451
-#, c-format
-msgid "Writing out commit graph in %d pass"
-msgid_plural "Writing out commit graph in %d passes"
-msgstr[0] "S'està escrivint el graf de comissions en %d pas"
-msgstr[1] "S'està escrivint el graf de comissions en %d passos"
-
-#: commit-graph.c:1492
-msgid "unable to open commit-graph chain file"
-msgstr "no s'ha pogut obrir el fitxer d'encadenament del graf de comissions"
-
-#: commit-graph.c:1504
-msgid "failed to rename base commit-graph file"
-msgstr "no s'ha pogut canviar el nom del fitxer base del graf de comissions"
-
-#: commit-graph.c:1524
-msgid "failed to rename temporary commit-graph file"
-msgstr ""
-"no s'ha pogut canviar el nom del fitxer temporal del graf de comissions"
-
-#: commit-graph.c:1635
-msgid "Scanning merged commits"
-msgstr "S'estan escanejant les comissions fusionades"
-
-#: commit-graph.c:1646
-#, c-format
-msgid "unexpected duplicate commit id %s"
-msgstr "id de comissió duplicat %s no esperat"
-
-#: commit-graph.c:1670
-msgid "Merging commit-graph"
-msgstr "S'està fusionant el graf de comissions"
-
-#: commit-graph.c:1860
-#, c-format
-msgid "the commit graph format cannot write %d commits"
-msgstr "el format del graf de comissions no pot escriure %d comissions"
-
-#: commit-graph.c:1871
-msgid "too many commits to write graph"
-msgstr "massa comissions per escriure un graf"
-
-#: commit-graph.c:1961
-msgid "the commit-graph file has incorrect checksum and is likely corrupt"
-msgstr ""
-"el fitxer commit-graph (graf de comissions) té una suma de verificació "
-"incorrecta i probablement és corrupte"
-
-#: commit-graph.c:1971
-#, c-format
-msgid "commit-graph has incorrect OID order: %s then %s"
-msgstr ""
-
-#: commit-graph.c:1981 commit-graph.c:1996
-#, c-format
-msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
-msgstr ""
-
-#: commit-graph.c:1988
-#, 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"
-
-#: commit-graph.c:2006
-msgid "Verifying commits in commit graph"
-msgstr "S'estan verificant les comissions al graf de comissions"
-
-#: commit-graph.c:2020
-#, c-format
-msgid "failed to parse commit %s from object database for commit-graph"
-msgstr ""
-
-#: commit-graph.c:2027
-#, c-format
-msgid "root tree OID for commit %s in commit-graph is %s != %s"
-msgstr ""
-
-#: commit-graph.c:2037
-#, c-format
-msgid "commit-graph parent list for commit %s is too long"
-msgstr ""
-
-#: commit-graph.c:2046
-#, c-format
-msgid "commit-graph parent for %s is %s != %s"
-msgstr ""
-
-#: commit-graph.c:2059
-#, c-format
-msgid "commit-graph parent list for commit %s terminates early"
-msgstr ""
-
-#: commit-graph.c:2064
-#, c-format
-msgid ""
-"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
-msgstr ""
-
-#: commit-graph.c:2068
-#, c-format
-msgid ""
-"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
-msgstr ""
-
-#: commit-graph.c:2083
-#, c-format
-msgid "commit-graph generation for commit %s is %u != %u"
-msgstr ""
-
-#: commit-graph.c:2089
-#, c-format
-msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
-msgstr ""
-
#: 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"
@@ -2143,296 +2532,307 @@
"\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:376
+#: config.c:378
#, c-format
msgid "key does not contain a section: %s"
msgstr "la clau no conté una secció: «%s»"
-#: config.c:382
+#: 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:406 sequencer.c:2530
+#: config.c:408 sequencer.c:2580
#, c-format
msgid "invalid key: %s"
msgstr "clau no vàlida: %s"
-#: config.c:412
+#: 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:448 config.c:460
+#: config.c:450 config.c:462
#, c-format
msgid "bogus config parameter: %s"
msgstr "paràmetre de configuració erroni: %s"
-#: config.c:495
+#: config.c:497
#, c-format
msgid "bogus format in %s"
msgstr "format erroni a %s"
-#: config.c:821
+#: 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:825
+#: 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:829
+#: 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:833
+#: 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:837
+#: 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:841
+#: config.c:856
#, c-format
msgid "bad config line %d in %s"
msgstr "línia de configuració %d errònia en %s"
-#: config.c:978
+#: config.c:993
msgid "out of range"
msgstr "fora de rang"
-#: config.c:978
+#: config.c:993
msgid "invalid unit"
msgstr "unitat no vàlida"
-#: config.c:979
+#: 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:998
+#: 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:1001
+#: 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"
+msgstr ""
+"valor de configuració numèric «%s» erroni per «%s» en el fitxer %s: %s"
-#: config.c:1004
+#: 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"
+"valor de configuració numèric «%s» erroni per «%s» en l'entrada estàndard: "
+"%s"
-#: config.c:1007
+#: 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:1010
+#: 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:1013
+#: 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:1108
+#: 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:1117
+#: 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:1208
+#: 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:1222 config.c:1233
+#: config.c:1237 config.c:1248
#, c-format
msgid "bad zlib compression level %d"
msgstr "nivell de compressió de zlib incorrecte %d"
-#: config.c:1325
+#: 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:1358
+#: config.c:1373
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "mode de creació d'objecte no vàlid: %s"
-#: config.c:1430
+#: config.c:1445
#, c-format
msgid "malformed value for %s"
msgstr "valor no vàlid per a %s"
-#: config.c:1456
+#: config.c:1471
#, c-format
msgid "malformed value for %s: %s"
msgstr "valor no vàlid per a %s: %s"
-#: config.c:1457
+#: config.c:1472
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
+"ha de ser un dels elements següents: nothing, matching, simple, upstream o "
+"current"
-#: config.c:1518 builtin/pack-objects.c:3394
+#: config.c:1533 builtin/pack-objects.c:3649
#, c-format
msgid "bad pack compression level %d"
-msgstr "nivell de compressió de paquet %d Erroni"
+msgstr "nivell de compressió de paquet %d erroni"
-#: config.c:1639
+#: 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:1642
+#: 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:1659
+#: 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:1689
+#: config.c:1705
#, c-format
msgid "failed to parse %s"
msgstr "s'ha produït un error en analitzar %s"
-#: config.c:1745
+#: 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:2096
+#: config.c:2122
msgid "unknown error occurred while reading the configuration files"
-msgstr "un error desconegut ha ocorregut en llegir els fitxers de configuració"
+msgstr ""
+"un error desconegut ha ocorregut en llegir els fitxers de configuració"
-#: config.c:2266
+#: config.c:2296
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s no vàlid: «%s»"
-#: config.c:2311
+#: 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:2357
+#: 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:2359
+#: 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:2440
+#: config.c:2473
#, c-format
msgid "invalid section name '%s'"
msgstr "nom de secció no vàlid «%s»"
-#: config.c:2472
+#: config.c:2505
#, c-format
msgid "%s has multiple values"
msgstr "%s té múltiples valors"
-#: config.c:2501
+#: config.c:2534
#, c-format
msgid "failed to write new configuration file %s"
msgstr "no es pot escriure un nou fitxer de configuració %s"
-#: config.c:2753 config.c:3077
+#: config.c:2786 config.c:3112
#, c-format
msgid "could not lock config file %s"
msgstr "no s'ha pogut blocar el fitxer de configuració %s"
-#: config.c:2764
+#: config.c:2797
#, c-format
msgid "opening %s"
msgstr "s'està obrint %s"
-#: config.c:2799 builtin/config.c:328
+#: config.c:2834 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "patró no vàlid: %s"
-#: config.c:2824
+#: config.c:2859
#, c-format
msgid "invalid config file %s"
msgstr "fitxer de configuració no vàlid %s"
-#: config.c:2837 config.c:3090
+#: config.c:2872 config.c:3125
#, c-format
msgid "fstat on %s failed"
msgstr "ha fallat «fstat» a %s"
-#: config.c:2848
+#: config.c:2883
#, c-format
msgid "unable to mmap '%s'"
msgstr "no s'ha pogut fer «mmap» «%s»"
-#: config.c:2857 config.c:3095
+#: config.c:2892 config.c:3130
#, c-format
msgid "chmod on %s failed"
msgstr "ha fallat chmod a %s"
-#: config.c:2942 config.c:3192
+#: config.c:2977 config.c:3227
#, c-format
msgid "could not write config file %s"
msgstr "no s'ha pogut escriure el fitxer de configuració «%s»"
-#: config.c:2976
+#: config.c:3011
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "no s'ha pogut establir «%s» a «%s»"
-#: config.c:2978 builtin/remote.c:781
+#: config.c:3013 builtin/remote.c:657 builtin/remote.c:855
+#: builtin/remote.c:863
#, c-format
msgid "could not unset '%s'"
msgstr "no s'ha pogut desassignar «%s»"
-#: config.c:3068
+#: config.c:3103
#, c-format
msgid "invalid section name: %s"
msgstr "nom de secció no vàlida: %s"
-#: config.c:3235
+#: config.c:3270
#, c-format
msgid "missing value for '%s'"
msgstr "falta el valor per «%s»"
@@ -2458,73 +2858,82 @@
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 "format d'objecte «%s» especificat pel servidor desconegut"
+
+#: 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
+msgid "expected response end packet after ref listing"
+msgstr "s'esperava un final de resposta 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"
@@ -2533,7 +2942,7 @@
"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"
@@ -2543,82 +2952,82 @@
"%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:1175
+#: 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:928
+#: 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 sintaxi vàlida per "
-"URL"
+"no s'ha especificat un camí; vegeu «git help pull» per la sintaxi vàlida per"
+" URL"
-#: connect.c:1123
+#: 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:1135
+#: 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:1152
+#: 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:1264
+#: connect.c:1360
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "s'ha bloquejat el nom de fitxer estrany «%s»"
-#: connect.c:1311
+#: connect.c:1408
msgid "unable to fork"
msgstr "no s'ha pogut bifurcar"
-#: connected.c:89 builtin/fsck.c:208 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:101
+#: 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:121
+#: connected.c:144
msgid "failed write to rev-list"
msgstr "escriptura fallada al rev-list"
-#: connected.c:128
+#: 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:194
#, c-format
msgid "illegal crlf_action %d"
-msgstr ""
+msgstr "crlf_action %d il·legal"
#: convert.c:207
#, c-format
@@ -2632,13 +3041,12 @@
"The file will have its original line endings in your working directory"
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"
+"El fitxer tindrà els seus terminadors de línia originals en el vostre directori de treball"
#: 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:219
#, c-format
@@ -2647,13 +3055,12 @@
"The file will have its original line endings in your working directory"
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"
+"El fitxer tindrà els seus terminadors de línia originals en el vostre directori de treball"
#: 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:291
#, c-format
@@ -2661,18 +3068,23 @@
"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
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."
+"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:419 convert.c:490
#, c-format
@@ -2684,59 +3096,91 @@
msgid "encoding '%s' from %s to %s and back is not the same"
msgstr "codificar «%s» des de %s a %s i cap enrere no és el mateix"
-#: convert.c:668
+#: convert.c: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:688
+#: 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:695
+#: convert.c:692
#, c-format
msgid "external filter '%s' failed %d"
msgstr "el filtre extern «%s» ha fallat %d"
-#: convert.c:730 convert.c:733
+#: 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:736 convert.c:791
+#: convert.c:733 convert.c:788
#, c-format
msgid "external filter '%s' failed"
msgstr "el filtre extern «%s» ha fallat"
-#: convert.c:839
+#: convert.c:837
msgid "unexpected filter type"
msgstr "tipus de filtre inesperat"
-#: convert.c:850
+#: 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:924
+#: 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:1223
+#: 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:1411 convert.c:1445
+#: 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:1489
-#, fuzzy, c-format
+#: convert.c:1508
+#, c-format
msgid "%s: smudge filter %s failed"
-msgstr "s'ha produït un error en actualitzar els fitxers"
+msgstr "%s: ha fallat el filtre smudge %s"
+
+#: credential.c:96
+#, c-format
+msgid "skipping credential lookup for key: credential.%s"
+msgstr "s'està ometent la cerca de credencials per una clau: credential.%s"
+
+#: credential.c:112
+msgid "refusing to work with credential missing host field"
+msgstr ""
+"s'ha rebutjat treballar amb credencials que no tenen el camp d'amfitrió"
+
+#: credential.c:114
+msgid "refusing to work with credential missing protocol field"
+msgstr ""
+"s'ha rebutjat treballar amb credencials que no tenen el camp de protocol"
+
+#: credential.c:394
+#, c-format
+msgid "url contains a newline in its %s component: %s"
+msgstr "url conté una línia nova en %s component: %s"
+
+#: 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"
@@ -2833,14 +3277,25 @@
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»"
+#: diff-lib.c:534
+msgid "--merge-base does not work with ranges"
+msgstr "--merge-base no funciona amb intervals"
-#: diffcore-rename.c:543
-msgid "Performing inexact rename detection"
-msgstr "S'està realitzant una detecció inexacta de canvis de nom"
+#: diff-lib.c:536
+msgid "--merge-base only works with commits"
+msgstr "--merge-base només funciona amb comissions"
+
+#: diff-lib.c:553
+msgid "unable to get HEAD"
+msgstr "no s'ha pogut obtenir HEAD"
+
+#: diff-lib.c:560
+msgid "no merge base found"
+msgstr "no s'ha trobat una base de fusió"
+
+#: diff-lib.c:562
+msgid "multiple merge bases found"
+msgstr "s'han trobat múltiples bases de fusió"
#: diff-no-index.c:238
msgid "git diff --no-index [<options>] <path> <path>"
@@ -2854,19 +3309,19 @@
"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'"
@@ -2874,63 +3329,68 @@
"el paràmetre de color en moviment ha de ser «no», «default», «blocks», "
"«zebra», «dimmed-zebra» o «plain»"
-#: 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'"
+"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 desconegut, els valor possibles són "
+"«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 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:4202
+#: diff.c:4276
#, c-format
msgid "external diff died, stopping at %s"
msgstr "el diff external s'ha mort, s'està aturant a %s"
-#: diff.c:4547
+#: diff.c:4625
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check i -s són mútuament excloents"
-#: diff.c:4550
+#: diff.c:4628
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G, -S and --find-object són mútuament excloents"
-#: diff.c:4628
+#: diff.c:4706
msgid "--follow requires exactly one pathspec"
msgstr "--follow requereix exactament una especificació de camí"
-#: diff.c:4676
+#: diff.c:4754
#, c-format
msgid "invalid --stat value: %s"
msgstr "valor --stat no vàlid: %s"
-#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
-#: parse-options.c:199 parse-options.c:203
+#: diff.c:4759 diff.c:4764 diff.c:4769 diff.c:4774 diff.c:5302
+#: 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:4713
+#: diff.c:4791
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -2939,584 +3399,626 @@
"S'ha produït un error en analitzar el paràmetre d'opció de --dirstat/-X:\n"
"%s"
-#: diff.c:4798
+#: diff.c:4876
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "classe de canvi «%c» desconeguda a --diff-filter=%s"
-#: diff.c:4822
+#: diff.c:4900
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "valor desconegut després de ws-error-highlight=%.*s"
-#: diff.c:4836
+#: diff.c:4914
#, c-format
msgid "unable to resolve '%s'"
msgstr "no s'ha pogut resoldre «%s»"
-#: diff.c:4886 diff.c:4892
+#: diff.c:4964 diff.c:4970
#, c-format
msgid "%s expects <n>/<m> form"
-msgstr ""
+msgstr "%s espera una forma <n>/<m>"
-#: diff.c:4904
+#: diff.c:4982
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s esperava un caràcter, s'ha rebut «%s»"
-#: diff.c:4925
+#: diff.c:5003
#, c-format
msgid "bad --color-moved argument: %s"
-msgstr "paràmetre --color-moved incorrecte: %s"
+msgstr "argument --color-moved incorrecte: %s"
-#: diff.c:4944
+#: diff.c:5022
#, 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:4984
-msgid ""
-"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
-"\"histogram\""
+#: diff.c:5062
+msgid "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and \"histogram\""
msgstr ""
"l'opció diff-algorithm accepta «myers», «minimal», «patience» i «histogram»"
-#: diff.c:5020 diff.c:5040
+#: diff.c:5098 diff.c:5118
#, c-format
msgid "invalid argument to %s"
msgstr "argument no vàlid a %s"
-#: diff.c:5178
+#: diff.c:5222
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr "expressió regular donada a -I: no vàlida: «%s»"
+
+#: diff.c:5271
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr ""
"s'ha produït un error en analitzar el paràmetre d'opció de --submodule: «%s»"
-#: diff.c:5234
+#: diff.c:5327
#, c-format
msgid "bad --word-diff argument: %s"
-msgstr "paràmetre --word-diff incorrecte: %s"
+msgstr "argument --word-diff incorrecte: %s"
-#: diff.c:5257
+#: diff.c:5350
msgid "Diff output format options"
msgstr "Opcions del format de sortida del diff"
-#: diff.c:5259 diff.c:5265
+#: diff.c:5352 diff.c:5358
msgid "generate patch"
msgstr "generant pedaç"
-#: diff.c:5262 builtin/log.c:173
+#: diff.c:5355 builtin/log.c:178
msgid "suppress diff output"
msgstr "omet la sortida de diferències"
-#: diff.c:5267 diff.c:5381 diff.c:5388
+#: diff.c:5360 diff.c:5474 diff.c:5481
msgid "<n>"
msgstr "<n>"
-#: diff.c:5268 diff.c:5271
+#: diff.c:5361 diff.c:5364
msgid "generate diffs with <n> lines context"
msgstr "genera diffs amb <n> línies de context"
-#: diff.c:5273
+#: diff.c:5366
msgid "generate the diff in raw format"
msgstr "genera el diff en format cru"
-#: diff.c:5276
+#: diff.c:5369
msgid "synonym for '-p --raw'"
-msgstr "sinònim de per a «-p --raw»"
+msgstr "sinònim de «-p --raw»"
-#: diff.c:5280
+#: diff.c:5373
msgid "synonym for '-p --stat'"
-msgstr "sinònim de per a «-p --stat»"
+msgstr "sinònim de «-p --stat»"
-#: diff.c:5284
+#: diff.c:5377
msgid "machine friendly --stat"
msgstr "llegible per màquina --stat"
-#: diff.c:5287
+#: diff.c:5380
msgid "output only the last line of --stat"
msgstr "mostra només l'última línia de --stat"
-#: diff.c:5289 diff.c:5297
+#: diff.c:5382 diff.c:5390
msgid "<param1,param2>..."
msgstr "<param1,param2>..."
-#: diff.c:5290
+#: diff.c:5383
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:5294
+#: diff.c:5387
msgid "synonym for --dirstat=cumulative"
-msgstr "sinònim per -dirstat=cumulative"
+msgstr "sinònim de --dirstat=cumulative"
-#: diff.c:5298
+#: diff.c:5391
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:5302
+#: diff.c:5395
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:5305
+#: diff.c:5398
msgid "condensed summary such as creations, renames and mode changes"
-msgstr ""
+msgstr "resum condensat com ara creacions, canvis de nom i mode"
-#: diff.c:5308
+#: diff.c:5401
msgid "show only names of changed files"
msgstr "mostra només els noms de fitxers canviats"
-#: diff.c:5311
+#: diff.c:5404
msgid "show only names and status of changed files"
msgstr "mostra només els noms i l'estat dels fitxers canviats"
-#: diff.c:5313
+#: diff.c:5406
msgid "<width>[,<name-width>[,<count>]]"
-msgstr ""
+msgstr "<amplada>[<amplada-nom>[,<recompte>]]"
-#: diff.c:5314
+#: diff.c:5407
msgid "generate diffstat"
msgstr "genera diffstat"
-#: diff.c:5316 diff.c:5319 diff.c:5322
+#: diff.c:5409 diff.c:5412 diff.c:5415
msgid "<width>"
msgstr "<amplada>"
-#: diff.c:5317
+#: diff.c:5410
msgid "generate diffstat with a given width"
msgstr "genera diffstat amb una amplada donada"
-#: diff.c:5320
+#: diff.c:5413
msgid "generate diffstat with a given name width"
msgstr "genera diffstat amb un nom d'amplada donat"
-#: diff.c:5323
+#: diff.c:5416
msgid "generate diffstat with a given graph width"
msgstr "genera diffstat amb una amplada de graf donada"
-#: diff.c:5325
+#: diff.c:5418
msgid "<count>"
msgstr "<comptador>"
-#: diff.c:5326
+#: diff.c:5419
msgid "generate diffstat with limited lines"
msgstr "genera diffstat amb línies limitades"
-#: diff.c:5329
+#: diff.c:5422
msgid "generate compact summary in diffstat"
msgstr "genera un resum compacte a diffstat"
-#: diff.c:5332
+#: diff.c:5425
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:5335
+#: diff.c:5428
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:5337
+#: diff.c:5430
msgid "show colored diff"
msgstr "mostra un diff amb colors"
-#: diff.c:5338
+#: diff.c:5431
msgid "<kind>"
-msgstr ""
+msgstr "<kind>"
-#: diff.c:5339
+#: diff.c:5432
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:5342
+#: diff.c:5435
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
msgstr ""
+"no consolidis els noms de camí i utilitza NULs com a terminadors de camp de "
+"sortida en --raw o --numstat"
-#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457
+#: diff.c:5438 diff.c:5441 diff.c:5444 diff.c:5553
msgid "<prefix>"
msgstr "<prefix>"
-#: diff.c:5346
+#: diff.c:5439
msgid "show the given source prefix instead of \"a/\""
-msgstr ""
+msgstr "mostra el prefix d'origen donat en lloc de «a/»"
-#: diff.c:5349
+#: diff.c:5442
msgid "show the given destination prefix instead of \"b/\""
-msgstr ""
+msgstr "mostra el prefix de destinació indicat en lloc de «b/»"
-#: diff.c:5352
+#: diff.c:5445
msgid "prepend an additional prefix to every line of output"
msgstr "afegir un prefix addicional per a cada línia de sortida"
-#: diff.c:5355
+#: diff.c:5448
msgid "do not show any source or destination prefix"
msgstr "no mostris cap prefix d'origen o destí"
-#: diff.c:5358
-#, fuzzy
+#: diff.c:5451
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:5362 diff.c:5367 diff.c:5372
+#: diff.c:5455 diff.c:5460 diff.c:5465
msgid "<char>"
msgstr "<char>"
-#: diff.c:5363
+#: diff.c:5456
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 «+»"
-#: diff.c:5368
+#: diff.c:5461
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 «-»"
-#: diff.c:5373
+#: diff.c:5466
msgid "specify the character to indicate a context instead of ' '"
msgstr "especifiqueu el caràcter per a indicar context en comptes de « »"
-#: diff.c:5376
+#: diff.c:5469
msgid "Diff rename options"
msgstr "Opcions de canvi de nom del diff"
-#: diff.c:5377
+#: diff.c:5470
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5378
+#: diff.c:5471
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
"divideix els canvis de reescriptura completa en parells de suprimir i crear"
-#: diff.c:5382
+#: diff.c:5475
msgid "detect renames"
msgstr "detecta els canvis de noms"
-#: diff.c:5386
+#: diff.c:5479
msgid "omit the preimage for deletes"
msgstr "omet les preimatges per les supressions"
-#: diff.c:5389
+#: diff.c:5482
msgid "detect copies"
msgstr "detecta còpies"
-#: diff.c:5393
+#: diff.c:5486
msgid "use unmodified files as source to find copies"
msgstr "usa els fitxers no modificats com a font per trobar còpies"
-#: diff.c:5395
+#: diff.c:5488
msgid "disable rename detection"
msgstr "inhabilita la detecció de canvis de nom"
-#: diff.c:5398
+#: diff.c:5491
msgid "use empty blobs as rename source"
msgstr "usa els blobs buits com a font de canvi de nom"
-#: diff.c:5400
+#: diff.c:5493
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:5403
+#: diff.c:5496
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:5405
+#: diff.c:5498
msgid "Diff algorithm options"
-msgstr "Opcions d'algorisme Diff"
+msgstr "Opcions de l'algorisme Diff"
-#: diff.c:5407
+#: diff.c:5500
msgid "produce the smallest possible diff"
msgstr "produeix el diff més petit possible"
-#: diff.c:5410
+#: diff.c:5503
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:5413
+#: diff.c:5506
msgid "ignore changes in amount of whitespace"
msgstr "ignora els canvis en la quantitat d'espai en blanc"
-#: diff.c:5416
+#: diff.c:5509
msgid "ignore changes in whitespace at EOL"
msgstr "ignora els canvis d'espai en blanc al final de la línia"
-#: diff.c:5419
+#: diff.c:5512
msgid "ignore carrier-return at the end of line"
msgstr "ignora els retorns de línia al final de la línia"
-#: diff.c:5422
+#: diff.c:5515
msgid "ignore changes whose lines are all blank"
msgstr "ignora els canvis en línies que estan en blanc"
-#: diff.c:5425
-msgid "heuristic to shift diff hunk boundaries for easy reading"
-msgstr ""
-
-#: diff.c:5428
-msgid "generate diff using the \"patience diff\" algorithm"
-msgstr "genera diff usant l'algorisme «patience diff»"
-
-#: diff.c:5432
-msgid "generate diff using the \"histogram diff\" algorithm"
-msgstr "genera diff usant l'algorisme «histogram diff»"
-
-#: diff.c:5434
-msgid "<algorithm>"
-msgstr "<algorisme>"
-
-#: diff.c:5435
-msgid "choose a diff algorithm"
-msgstr "escolliu un algorisme pel diff"
-
-#: diff.c:5437
-msgid "<text>"
-msgstr "<text>"
-
-#: diff.c:5438
-msgid "generate diff using the \"anchored diff\" algorithm"
-msgstr "genera diff usant l'algorisme «anchored diff»"
-
-#: diff.c:5440 diff.c:5449 diff.c:5452
-msgid "<mode>"
-msgstr "<mode>"
-
-#: diff.c:5441
-msgid "show word diff, using <mode> to delimit changed words"
-msgstr ""
-
-#: diff.c:5443 diff.c:5446 diff.c:5491
+#: diff.c:5517 diff.c:5539 diff.c:5542 diff.c:5587
msgid "<regex>"
msgstr "<regex>"
-#: diff.c:5444
-msgid "use <regex> to decide what a word is"
-msgstr ""
+#: diff.c:5518
+msgid "ignore changes whose all lines match <regex>"
+msgstr "ignora els canvis en les línies que coincideixen amb <regex>"
-#: diff.c:5447
+#: diff.c:5521
+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:5524
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr "genera diff usant l'algorisme «patience diff»"
+
+#: diff.c:5528
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr "genera diff usant l'algorisme «histogram diff»"
+
+#: diff.c:5530
+msgid "<algorithm>"
+msgstr "<algorisme>"
+
+#: diff.c:5531
+msgid "choose a diff algorithm"
+msgstr "trieu un algorisme per al diff"
+
+#: diff.c:5533
+msgid "<text>"
+msgstr "<text>"
+
+#: diff.c:5534
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr "genera diff usant l'algorisme «anchored diff»"
+
+#: diff.c:5536 diff.c:5545 diff.c:5548
+msgid "<mode>"
+msgstr "<mode>"
+
+#: diff.c:5537
+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:5540
+msgid "use <regex> to decide what a word is"
+msgstr "utilitza <regex> per a decidir què és una paraula"
+
+#: diff.c:5543
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "equivalent a --word-diff=color --word-diff-regex=<regex>"
-#: diff.c:5450
+#: diff.c:5546
msgid "moved lines of code are colored differently"
msgstr "les línies de codi que s'ha mogut s'acoloreixen diferent"
-#: diff.c:5453
+#: diff.c:5549
msgid "how white spaces are ignored in --color-moved"
msgstr "com s'ignoren els espais en blanc a --color-moved"
-#: diff.c:5456
+#: diff.c:5552
msgid "Other diff options"
msgstr "Altres opcions diff"
-#: diff.c:5458
+#: diff.c:5554
msgid "when run from subdir, exclude changes outside and show relative paths"
-msgstr "quan s'executa des d'un subdirectori, exclou els canvis de fora i mostra els camins relatius"
+msgstr ""
+"quan s'executa des d'un subdirectori, exclou els canvis de fora i mostra els"
+" camins relatius"
-#: diff.c:5462
+#: diff.c:5558
msgid "treat all files as text"
msgstr "tracta tots els fitxers com a text"
-#: diff.c:5464
+#: diff.c:5560
msgid "swap two inputs, reverse the diff"
msgstr "intercanvia les dues entrades, inverteix el diff"
-#: diff.c:5466
+#: diff.c:5562
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "surt amb 1 si hi ha diferències, 0 en cas contrari"
-#: diff.c:5468
+#: diff.c:5564
msgid "disable all output of the program"
msgstr "inhabilita totes les sortides del programa"
-#: diff.c:5470
+#: diff.c:5566
msgid "allow an external diff helper to be executed"
-msgstr ""
+msgstr "permet executar un ajudant de diff extern"
-#: diff.c:5472
+#: diff.c:5568
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:5474
+#: diff.c:5570
msgid "<when>"
msgstr "<quan>"
-#: diff.c:5475
+#: diff.c:5571
msgid "ignore changes to submodules in the diff generation"
msgstr "ignora els canvis als submòduls en la generació del diff"
-#: diff.c:5478
+#: diff.c:5574
msgid "<format>"
msgstr "<format>"
-#: diff.c:5479
+#: diff.c:5575
msgid "specify how differences in submodules are shown"
msgstr "especifiqueu com es mostren els canvis als submòduls"
-#: diff.c:5483
-#, fuzzy
+#: diff.c:5579
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:5486
+#: diff.c:5582
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:5488
+#: diff.c:5584
msgid "<string>"
msgstr "<cadena>"
-#: diff.c:5489
+#: diff.c:5585
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:5492
+#: diff.c:5588
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:5495
+#: diff.c:5591
msgid "show all changes in the changeset with -S or -G"
msgstr "mostra tots els canvis amb el conjunt de canvis amb -S o -G"
-#: diff.c:5498
+#: diff.c:5594
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "tracta <cadena> a -S com a expressió regular POSIX ampliada"
-#: diff.c:5501
+#: diff.c:5597
msgid "control the order in which files appear in the output"
msgstr "controla l'ordre amb el qual els fitxers apareixen en la sortida"
-#: diff.c:5502
+#: diff.c:5598
msgid "<object-id>"
msgstr "<id de l'objecte>"
-#: diff.c:5503
+#: diff.c:5599
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:5505
+#: diff.c:5601
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5506
+#: diff.c:5602
msgid "select files by diff type"
msgstr "seleccioneu els fitxers per tipus de diff"
-#: diff.c:5508
+#: diff.c:5604
msgid "<file>"
msgstr "<fitxer>"
-#: diff.c:5509
+#: diff.c:5605
msgid "Output to a specific file"
msgstr "Sortida a un fitxer específic"
-#: diff.c:6164
+#: diff.c:6262
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."
-#: diff.c:6167
+#: diff.c:6265
msgid "only found copies from modified paths due to too many files."
msgstr ""
"només s'han trobat còpies des de camins modificats a causa de massa fitxers."
-#: diff.c:6170
+#: diff.c:6268
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr ""
-"potser voleu establir la vostra variable %s a almenys %d i tornar a intentar "
-"l'ordre."
+"potser voleu establir la vostra variable %s a almenys %d i tornar a intentar"
+" l'ordre."
-#: dir.c:554
+#: 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:664
+#: dir.c:718 dir.c:747 dir.c:760
#, c-format
msgid "unrecognized pattern: '%s'"
msgstr "patró no reconegut: «%s»"
-#: dir.c:682 dir.c:696
+#: dir.c:777 dir.c:791
#, c-format
msgid "unrecognized negative pattern: '%s'"
msgstr "patró negatiu no reconegut: «%s»"
-#: dir.c:714
+#: 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:724
+#: dir.c:819
msgid "disabling cone pattern matching"
msgstr "inhabilita la coincidència de patrons «cone»"
-#: dir.c:1101
+#: dir.c:1198
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "no es pot usar %s com a fitxer d'exclusió"
-#: dir.c:2078
+#: dir.c:2305
#, c-format
msgid "could not open directory '%s'"
msgstr "no s'ha pogut obrir el directori «%s»"
-#: dir.c:2415
+#: 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:2539
+#: 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:3343
+#: 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:3388 dir.c:3393
+#: 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:3422
+#: 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»"
-#: environment.c:149
+#: environment.c:150
#, c-format
msgid "bad git namespace path \"%s\""
-msgstr ""
+msgstr "camí d'espai de noms git incorrecte «%s»"
-#: environment.c:331
+#: environment.c:337
#, c-format
msgid "could not set GIT_DIR to '%s'"
msgstr "no s'ha pogut establir GIT_DIR a «%s»"
@@ -3526,242 +4028,262 @@
msgid "too many args to run %s"
msgstr "hi ha massa arguments per a executar %s"
-#: fetch-pack.c:150
+#: fetch-pack.c:177
msgid "git fetch-pack: expected shallow list"
-msgstr "git fetch-pack: llista superficial esperada"
+msgstr "git fetch-pack: llista shallow esperada"
-#: fetch-pack.c:153
-#, fuzzy
+#: fetch-pack.c:180
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 "
+"shallow"
-#: fetch-pack.c:164
+#: fetch-pack.c:191
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:184
+#: fetch-pack.c:211
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: s'esperava ACK/NAK, s'ha rebut «%s»"
-#: fetch-pack.c:195
+#: fetch-pack.c:222
msgid "unable to write to remote"
msgstr "no s'ha pogut escriure al remot"
-#: fetch-pack.c:257
+#: fetch-pack.c:283
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc requereix multi_ack_detailed"
-#: fetch-pack.c:356 fetch-pack.c:1340
+#: fetch-pack.c:378 fetch-pack.c:1406
#, c-format
msgid "invalid shallow line: %s"
msgstr "línia de shallow no vàlida: %s"
-#: fetch-pack.c:362 fetch-pack.c:1346
+#: fetch-pack.c:384 fetch-pack.c:1412
#, c-format
msgid "invalid unshallow line: %s"
msgstr "línia d'unshallow no vàlida: %s"
-#: fetch-pack.c:364 fetch-pack.c:1348
+#: fetch-pack.c:386 fetch-pack.c:1414
#, c-format
msgid "object not found: %s"
msgstr "objecte no trobat: %s"
-#: fetch-pack.c:367 fetch-pack.c:1351
+#: fetch-pack.c:389 fetch-pack.c:1417
#, c-format
msgid "error in object: %s"
msgstr "error en objecte: %s"
-#: fetch-pack.c:369 fetch-pack.c:1353
+#: fetch-pack.c:391 fetch-pack.c:1419
#, c-format
msgid "no shallow found: %s"
msgstr "no s'ha trobat cap shallow: %s"
-#: fetch-pack.c:372 fetch-pack.c:1357
+#: fetch-pack.c:394 fetch-pack.c:1423
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "s'esperava shallow/unshallow, s'ha rebut %s"
-#: fetch-pack.c:414
+#: fetch-pack.c:434
#, c-format
msgid "got %s %d %s"
msgstr "s'ha rebut %s %d %s"
-#: fetch-pack.c:431
+#: fetch-pack.c:451
#, c-format
msgid "invalid commit %s"
msgstr "comissió no vàlida %s"
-#: fetch-pack.c:462
+#: fetch-pack.c:482
msgid "giving up"
msgstr "s'abandona"
-#: fetch-pack.c:475 progress.c:323
+#: fetch-pack.c:495 progress.c:339
msgid "done"
msgstr "fet"
-#: fetch-pack.c:487
+#: fetch-pack.c:507
#, c-format
msgid "got %s (%d) %s"
msgstr "s'ha rebut %s (%d) %s"
-#: fetch-pack.c:533
+#: fetch-pack.c:543
#, c-format
msgid "Marking %s as complete"
msgstr "S'està marcant %s com a complet"
-#: fetch-pack.c:754
+#: fetch-pack.c:758
#, c-format
msgid "already have %s (%s)"
msgstr "ja es té %s (%s)"
-#: fetch-pack.c:818
+#: fetch-pack.c:827
msgid "fetch-pack: unable to fork off sideband demultiplexer"
-msgstr "fetch-pack: no s'ha pogut bifurcar del desmultiplexor de banda lateral"
+msgstr ""
+"fetch-pack: no s'ha pogut bifurcar del desmultiplexor de banda lateral"
-#: fetch-pack.c:826
+#: fetch-pack.c:835
msgid "protocol error: bad pack header"
msgstr "error de protocol: capçalera de paquet errònia"
-#: fetch-pack.c:900
+#: fetch-pack.c:919
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: no es pot bifurcar de %s"
-#: fetch-pack.c:916
+#: fetch-pack.c:937
#, c-format
msgid "%s failed"
msgstr "%s ha fallat"
-#: fetch-pack.c:918
+#: fetch-pack.c:939
msgid "error in sideband demultiplexer"
msgstr "error en desmultiplexor de banda lateral"
-#: fetch-pack.c:965
+#: fetch-pack.c:982
#, c-format
msgid "Server version is %.*s"
msgstr "La versió del servidor és %.*s"
-#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985
-#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001
-#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017
-#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039
+#: fetch-pack.c:990 fetch-pack.c:996 fetch-pack.c:999 fetch-pack.c:1005
+#: fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 fetch-pack.c:1021
+#: fetch-pack.c:1025 fetch-pack.c:1029 fetch-pack.c:1033 fetch-pack.c:1037
+#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1054 fetch-pack.c:1059
#, c-format
msgid "Server supports %s"
msgstr "El servidor accepta %s"
-#: fetch-pack.c:972
+#: fetch-pack.c:992
msgid "Server does not support shallow clients"
msgstr "El servidor no permet clients superficials"
-#: fetch-pack.c:1032
+#: fetch-pack.c:1052
msgid "Server does not support --shallow-since"
msgstr "El servidor no admet --shallow-since"
-#: fetch-pack.c:1037
+#: fetch-pack.c:1057
msgid "Server does not support --shallow-exclude"
msgstr "El servidor no admet --shallow-exclude"
-#: fetch-pack.c:1041
+#: fetch-pack.c:1061
msgid "Server does not support --deepen"
msgstr "El servidor no admet --deepen"
-#: fetch-pack.c:1058
+#: fetch-pack.c:1063
+msgid "Server does not support this repository's object format"
+msgstr "El servidor no és compatible amb el format d'objecte d'aquest dipòsit"
+
+#: fetch-pack.c:1076
msgid "no common commits"
msgstr "cap comissió en comú"
-#: fetch-pack.c:1070 fetch-pack.c:1536
+#: fetch-pack.c:1088 fetch-pack.c:1628
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: l'obtenció ha fallat."
-#: fetch-pack.c:1209
-msgid "Server does not support shallow requests"
-msgstr "El servidor no permet peticions superficials"
+#: fetch-pack.c:1214
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "algoritmes no coincidents: client %s; servidor %s"
-#: fetch-pack.c:1216
+#: fetch-pack.c:1218
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "el servidor no és compatible amb l'algorisme «%s»"
+
+#: fetch-pack.c:1238
+msgid "Server does not support shallow requests"
+msgstr "El servidor no permet sol·licituds superficials"
+
+#: fetch-pack.c:1245
msgid "Server supports filter"
msgstr "El servidor accepta filtratge"
-#: fetch-pack.c:1239
+#: fetch-pack.c:1284
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:1257
+#: fetch-pack.c:1302
#, c-format
msgid "error reading section header '%s'"
msgstr "error en llegir la capçalera de la secció «%s»"
-#: fetch-pack.c:1263
+#: fetch-pack.c:1308
#, c-format
msgid "expected '%s', received '%s'"
msgstr "s'esperava «%s», s'ha rebut «%s»"
-#: fetch-pack.c:1303
+#: fetch-pack.c:1369
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "línia de confirmació inesperada: «%s»"
-#: fetch-pack.c:1308
+#: fetch-pack.c:1374
#, c-format
msgid "error processing acks: %d"
msgstr "s'ha produït un error en processar els acks: %d"
-#: fetch-pack.c:1318
+#: fetch-pack.c:1384
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:1320
+#: fetch-pack.c:1386
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:1362
+#: fetch-pack.c:1428
#, c-format
msgid "error processing shallow info: %d"
msgstr "s'ha produït un error en processar la informació superficial: %d"
-#: fetch-pack.c:1409
+#: fetch-pack.c:1475
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "s'esperava wanted-ref, s'ha rebut «%s»"
-#: fetch-pack.c:1414
+#: fetch-pack.c:1480
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "wanted-ref inesperat: «%s»"
-#: fetch-pack.c:1419
+#: fetch-pack.c:1485
#, c-format
msgid "error processing wanted refs: %d"
msgstr "s'ha produït un error en processar les referències desitjades: %d"
-#: fetch-pack.c:1762
+#: fetch-pack.c:1515
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack: s'esperava un paquet de final de resposta"
+
+#: fetch-pack.c:1897
msgid "no matching remote head"
msgstr "no hi ha cap HEAD remot coincident"
-#: fetch-pack.c:1785 builtin/clone.c:688
+#: fetch-pack.c:1920 builtin/clone.c:693
msgid "remote did not send all necessary objects"
msgstr "el remot no ha enviat tots els objectes necessaris"
-#: fetch-pack.c:1812
+#: fetch-pack.c:1947
#, c-format
msgid "no such remote ref %s"
msgstr "no existeix la referència remota %s"
-#: fetch-pack.c:1815
+#: fetch-pack.c:1950
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "El servidor no permet sol·licitar objectes no anunciats %s"
-#: gpg-interface.c:223
+#: gpg-interface.c:272
msgid "could not create temporary file"
msgstr "no s'ha pogut crear el fitxer temporal"
-#: gpg-interface.c:226
+#: 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»"
-#: gpg-interface.c:390
+#: gpg-interface.c:457
msgid "gpg failed to sign the data"
msgstr "gpg ha fallat en signar les dades"
@@ -3770,24 +4292,26 @@
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "ignora el color no vàlid «%.*s» en log.graphColors"
-#: grep.c:668
+#: grep.c:640
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:2124
+#: grep.c:2100
#, c-format
msgid "'%s': unable to read %s"
msgstr "«%s»: no s'ha pogut llegir %s"
-#: grep.c:2141 setup.c:165 builtin/clone.c:411 builtin/diff.c:82
+#: grep.c:2117 setup.c:176 builtin/clone.c:412 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:2152
+#: grep.c:2128
#, c-format
msgid "'%s': short read"
msgstr "«%s»: lectura curta"
@@ -3814,15 +4338,15 @@
#: 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"
@@ -3844,77 +4368,77 @@
msgid "Low-level Commands / Internal Helpers"
msgstr "Ordres de baix nivell / Ajudants interns"
-#: help.c:298
+#: help.c:300
#, c-format
msgid "available git commands in '%s'"
msgstr "ordres de git disponibles en «%s»"
-#: help.c:305
+#: help.c:307
msgid "git commands available from elsewhere on your $PATH"
msgstr "ordres de git disponibles d'altres llocs en el vostre $PATH"
-#: help.c:314
+#: help.c:316
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:365 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:"
-msgstr "Les guies de Git comunes són:"
+#: help.c:405
+msgid "The Git concept guides are:"
+msgstr "Les guies de Git de conceptes són:"
-#: help.c:512
+#: help.c:429
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:434
msgid "External commands"
msgstr "Ordres externes"
-#: help.c:532
+#: help.c:449
msgid "Command aliases"
msgstr "Àlies d'ordres"
-#: help.c:596
+#: help.c:527
#, 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:543 help.c:631
+#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr "git: «%s» no és una ordre de git. Vegeu «git --help»."
+
+#: help.c:591
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:613
#, 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:618
#, 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:623
#, 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
-#, 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»."
-
-#: help.c:699
+#: help.c:635
msgid ""
"\n"
"The most similar command is"
@@ -3928,16 +4452,16 @@
"\n"
"Les ordres més similars són"
-#: help.c:714
+#: help.c:675
msgid "git version [<options>]"
msgstr "git version [<opcions>]"
-#: help.c:783
+#: help.c:730
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:787
+#: help.c:734
msgid ""
"\n"
"Did you mean this?"
@@ -3951,7 +4475,15 @@
"\n"
"Volíeu dir un d'aquests?"
-#: ident.c:349
+#: ident.c:353
+msgid "Author identity unknown\n"
+msgstr "Identitat de l'autor desconeguda\n"
+
+#: ident.c:356
+msgid "Committer identity unknown\n"
+msgstr "Es desconeix la identitat del comitent\n"
+
+#: ident.c:362
msgid ""
"\n"
"*** Please tell me who you are.\n"
@@ -3976,44 +4508,86 @@
"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:631
+#: ident.c:454 builtin/commit.c:634
#, c-format
msgid "invalid date format: %s"
msgstr "format de data no vàlid: %s"
+#: list-objects-filter-options.c:81
+msgid "expected 'tree:<depth>'"
+msgstr "s'esperava «tree:<profunditat>»"
+
+#: list-objects-filter-options.c:96
+msgid "sparse:path filters support has been dropped"
+msgstr "sparse: s'ha eliminat la implementació de filtres de camí sparse"
+
+#: list-objects-filter-options.c:109
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "filtre d'especificació no vàlid: «%s»"
+
+#: list-objects-filter-options.c:125
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr "cal escapar el caràcter en el sub-filter-spec «%c»"
+
+#: list-objects-filter-options.c:167
+msgid "expected something after combine:"
+msgstr "s'esperava alguna cosa després de combinar:"
+
+#: 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:361
+msgid "unable to upgrade repository format to support partial clone"
+msgstr ""
+"no s'ha pogut actualitzar el format del dipòsit perquè sigui compatible amb "
+"un clonatge parcial"
+
+#: 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.c:495
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "no s'han pogut analitzar les dades disperses filtrades %s"
+
#: list-objects.c:127
#, c-format
msgid "entry '%s' in tree %s has tree mode, but is not a tree"
@@ -4029,43 +4603,7 @@
msgid "unable to load root tree for commit %s"
msgstr "no s'ha pogut carregar l'arrel de l'arbre per la comissió %s"
-#: list-objects-filter.c:492
-#, fuzzy, c-format
-msgid "unable to access sparse blob in '%s'"
-msgstr "no s'ha pogut accedir a «%s»"
-
-#: list-objects-filter.c:495
-#, fuzzy, c-format
-msgid "unable to parse sparse filter data in %s"
-msgstr "no s'ha pogut llegir %s"
-
-#: list-objects-filter-options.c:58
-msgid "expected 'tree:<depth>'"
-msgstr "s'esperava «tree:<profunditat>»"
-
-#: list-objects-filter-options.c:73
-msgid "sparse:path filters support has been dropped"
-msgstr ""
-
-#: list-objects-filter-options.c:86
-#, c-format
-msgid "invalid filter-spec '%s'"
-msgstr "filtre d'especificació no vàlid: «%s»"
-
-#: list-objects-filter-options.c:102
-#, c-format
-msgid "must escape char in sub-filter-spec: '%c'"
-msgstr ""
-
-#: list-objects-filter-options.c:144
-msgid "expected something after combine:"
-msgstr ""
-
-#: list-objects-filter-options.c:226
-msgid "multiple filter-specs cannot be combined"
-msgstr "no es poden combinar múltiples especificacions de filtratge"
-
-#: lockfile.c:151
+#: lockfile.c:152
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
@@ -4076,7 +4614,7 @@
"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"
@@ -4085,123 +4623,134 @@
"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"
+#: ls-refs.c:109
+msgid "expected flush after ls-refs arguments"
+msgstr "s'esperava una neteja després dels arguments ls-refs"
-#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908
-#: builtin/checkout.c:539 builtin/checkout.c:798 builtin/clone.c:809
-#: builtin/stash.c:264
-msgid "unable to write new index file"
-msgstr "no s'ha pogut escriure un fitxer d'índex nou"
+#: merge-ort-wrappers.c:13 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:367
+#: merge-ort-wrappers.c:33 merge-recursive.c:3436
+#, c-format
+msgid "Already up to date!"
+msgstr "Ja està al dia!"
+
+#: merge-recursive.c:356
msgid "(bad commit)\n"
msgstr "(comissió errònia)\n"
-#: merge-recursive.c:390
+#: 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:399
+#: 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:885
+#: 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:896
+#: 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:910 merge-recursive.c:929
+#: merge-recursive.c:899 merge-recursive.c:918
msgid ": perhaps a D/F conflict?"
msgstr ": potser un conflicte D/F?"
-#: merge-recursive.c:919
+#: 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:960 builtin/cat-file.c:41
+#: 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:965
+#: merge-recursive.c:954
#, c-format
msgid "blob expected for %s '%s'"
msgstr "blob esperat per a %s «%s»"
-#: merge-recursive.c:990
+#: 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:1001
+#: 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:1006
+#: 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:1199
+#: 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:1206
+#: 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)"
+msgstr ""
+"S'ha produït un error en fusionar el submòdul %s (no hi ha comissions)"
-#: merge-recursive.c:1213
+#: 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:1221 merge-recursive.c:1233
+#: 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:1224 merge-recursive.c:1236
+#: 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:1259
+#: 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:1263
+#: 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:1264
+#: 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:1267
+#: merge-recursive.c:1259
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -4211,36 +4760,42 @@
"\n"
"which will accept this suggestion.\n"
msgstr ""
+"Si això és correcte simplement afegiu-ho a l'índex per exemple\n"
+"utilitzant:\n"
+"\n"
+" git update-index --cacheinfo 160000 %s «%s»\n"
+"\n"
+"que acceptarà aquest suggeriment.\n"
-#: merge-recursive.c:1276
+#: 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:1349
+#: 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:1354
+#: 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:1386
+#: merge-recursive.c:1378
#, c-format
msgid "Auto-merging %s"
msgstr "S'està autofusionant %s"
-#: merge-recursive.c:1410
+#: 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."
-#: merge-recursive.c:1482
+#: merge-recursive.c:1474
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -4249,7 +4804,7 @@
"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s "
"s'ha deixat en l'arbre."
-#: merge-recursive.c:1487
+#: merge-recursive.c:1479
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -4258,7 +4813,7 @@
"CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s "
"de %s s'ha deixat en l'arbre."
-#: merge-recursive.c:1494
+#: merge-recursive.c:1486
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -4267,7 +4822,7 @@
"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s "
"s'ha deixat en l'arbre a %s."
-#: merge-recursive.c:1499
+#: merge-recursive.c:1491
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -4276,97 +4831,105 @@
"CONFLICTE: (%s/supressió): %s suprimit en %s i %s a %s en %s. La versió %s "
"de %s s'ha deixat en l'arbre a %s."
-#: merge-recursive.c:1534
+#: merge-recursive.c:1526
msgid "rename"
msgstr "canvi de nom"
-#: merge-recursive.c:1534
+#: merge-recursive.c:1526
msgid "renamed"
msgstr "canviat de nom"
-#: merge-recursive.c:1614 merge-recursive.c:2530 merge-recursive.c:3175
+#: 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:1624
+#: 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ó."
-#: merge-recursive.c:1682
+#: 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"
-#: merge-recursive.c:1713
+#: 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:1718
+#: 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:1737
+#: merge-recursive.c:1708
#, c-format
msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
-"\"->\"%s\" in \"%s\"%s"
+"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"
-#: merge-recursive.c:1742
+#: merge-recursive.c:1713
msgid " (left unresolved)"
msgstr " (deixat sense resolució)"
-#: merge-recursive.c:1851
+#: 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:2114
+#: 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 ""
+"CONFLICTE (divisió de canvi de nom de directori): no està clar on col·locar %s "
+"perquè el directori %s s'han canviat de nom a múltiples altres "
+"directoris, sense una destinació per a la majoria dels fitxers."
-#: merge-recursive.c:2146
+#: 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 ""
+"CONFLICTE (canvi del nom del directori implícit): el fitxer o directori existent a %s en forma de"
+" canvi del nom del directori implícit, posant-hi els camins següents a: %s."
-#: merge-recursive.c:2156
+#: 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 ""
+"CONFLICT (canvi del nom del directori implícit) no es pot assignar més d'un camí a "
+"%s; els canvis del nom del directori implícits han intentat posar aquests camins a: %s"
+" segons"
-#: merge-recursive.c:2248
+#: merge-recursive.c:2202
#, c-format
msgid ""
-"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
-">%s in %s"
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory "
+"%s->%s in %s"
msgstr ""
"CONFLICTE (canvi de nom/canvi de nom): canvi de nom %s->%s en %s. Canvi de "
"nom de directori %s->%s en %s"
-#: merge-recursive.c:2493
+#: merge-recursive.c:2447
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -4375,330 +4938,359 @@
"AVÍS: S'està evitant aplicar el canvi de nom %s -> %s a %s, perquè %s ell "
"mateix ja havia canviat de nom."
-#: merge-recursive.c:3019
+#: merge-recursive.c:2973
#, c-format
msgid "cannot read object %s"
msgstr "no es pot llegir l'objecte %s"
-#: merge-recursive.c:3022
+#: merge-recursive.c:2976
#, c-format
msgid "object %s is not a blob"
msgstr "l'objecte %s no és un blob"
-#: merge-recursive.c:3086
+#: merge-recursive.c:3040
msgid "modify"
msgstr "modificació"
-#: merge-recursive.c:3086
+#: merge-recursive.c:3040
msgid "modified"
msgstr "modificat"
-#: merge-recursive.c:3098
+#: merge-recursive.c:3052
msgid "content"
msgstr "contingut"
-#: merge-recursive.c:3102
+#: merge-recursive.c:3056
msgid "add/add"
msgstr "afegiment/afegiment"
-#: merge-recursive.c:3125
+#: 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:3147 git-submodule.sh:993
+#: merge-recursive.c:3101
msgid "submodule"
msgstr "submòdul"
-#: merge-recursive.c:3148
+#: merge-recursive.c:3102
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLICTE (%s): Conflicte de fusió en %s"
-#: merge-recursive.c:3178
+#: 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:3261
-#, 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:3264
-#, 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."
+"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:3268
-#, 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."
+"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:3271
-#, 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:3385
+#: merge-recursive.c:3339
#, c-format
msgid "Removing %s"
msgstr "S'està eliminant %s"
-#: merge-recursive.c:3408
+#: merge-recursive.c:3362
msgid "file/directory"
msgstr "fitxer/directori"
-#: merge-recursive.c:3413
+#: merge-recursive.c:3367
msgid "directory/file"
msgstr "directori/fitxer"
-#: merge-recursive.c:3420
+#: merge-recursive.c:3374
#, c-format
-msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
+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"
+"CONFLICTE (%s): Hi ha un directori amb nom %s en %s. S'està afegint %s com a"
+" %s"
-#: merge-recursive.c:3429
+#: merge-recursive.c:3383
#, c-format
msgid "Adding %s"
msgstr "S'està afegint %s"
-#: merge-recursive.c:3438
+#: 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:3482
-msgid "Already up to date!"
-msgstr "Ja està al dia!"
-
-#: merge-recursive.c:3491
+#: 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:3595
+#: merge-recursive.c:3550
msgid "Merging:"
msgstr "S'està fusionant:"
-#: merge-recursive.c:3608
+#: 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:3658
+#: merge-recursive.c:3613
msgid "merge returned no commit"
msgstr "la fusió no ha retornat cap comissió"
-#: merge-recursive.c:3717
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-" %s"
-msgstr ""
-"Els canvis locals als fitxers següents se sobreescriuran per la fusió:\n"
-" %s"
-
-#: merge-recursive.c:3814
+#: merge-recursive.c:3769
#, c-format
msgid "Could not parse object '%s'"
msgstr "No s'ha pogut analitzar l'objecte «%s»"
-#: merge-recursive.c:3832 builtin/merge.c:694 builtin/merge.c:874
+#: merge-recursive.c:3787 builtin/merge.c:711 builtin/merge.c:895
msgid "Unable to write index."
msgstr "No s'ha pogut escriure l'índex."
-#: midx.c:68
-#, c-format
-msgid "multi-pack-index file %s is too small"
-msgstr ""
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "s'ha produït un error en llegir la memòria cau"
-#: midx.c:84
-#, c-format
+#: merge.c:109 rerere.c:720 builtin/am.c:1883 builtin/am.c:1917
+#: builtin/checkout.c:573 builtin/checkout.c:829 builtin/clone.c:817
+#: builtin/stash.c:265
+msgid "unable to write new index file"
+msgstr "no s'ha pogut escriure un fitxer d'índex nou"
+
+#: midx.c:80
+#, fuzzy, c-format
+msgid "multi-pack-index file %s is too small"
+msgstr "l'índex múltiple és massa petit"
+
+#: midx.c:96
+#, 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:89
-#, c-format
-msgid "multi-pack-index version %d not recognized"
-msgstr ""
-
-#: midx.c:94
+#: midx.c:101
#, fuzzy, c-format
-msgid "hash version %u does not match"
-msgstr "el camí «%s» no té la seva versió"
+msgid "multi-pack-index version %d not recognized"
+msgstr "multi-index no reconegut"
-#: midx.c:108
+#: midx.c:106
+#, fuzzy, c-format
+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:123
msgid "invalid chunk offset (too large)"
-msgstr ""
-
-#: midx.c:132
-msgid "terminating multi-pack-index chunk id appears earlier than expected"
-msgstr ""
-
-#: midx.c:145
-msgid "multi-pack-index missing required pack-name chunk"
-msgstr ""
+msgstr "desplaçament del fragment no vàlid (massa gran)"
#: midx.c:147
+#, 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:160
+msgid "multi-pack-index missing required pack-name chunk"
+msgstr "Falta un fragment de nom de paquet necessari al multi-index"
+
+#: midx.c:162
msgid "multi-pack-index missing required OID fanout chunk"
-msgstr ""
+msgstr "falta un fragment «fanout» OID necessari al multi-pack-index"
-#: midx.c:149
+#: midx.c:164
msgid "multi-pack-index missing required OID lookup chunk"
-msgstr ""
+msgstr "falta un fragment de cerca «fanout» OID necessari al multi-pack-index"
-#: midx.c:151
+#: midx.c:166
msgid "multi-pack-index missing required object offsets chunk"
-msgstr ""
+msgstr "falta un fragment necessari dels desplaçaments al multi-pack-index"
-#: midx.c:165
-#, c-format
+#: midx.c:180
+#, 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:210
+#: midx.c:223
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
-msgstr ""
+msgstr "pack-int-id: %u incorrecte (%u paquets en total)"
-#: midx.c:260
+#: midx.c:273
+#, 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:288
-msgid "error preparing packfile from multi-pack-index"
-msgstr ""
-
-#: midx.c:472
-#, fuzzy, c-format
+#: midx.c:480
+#, 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:478
-#, fuzzy, c-format
+#: midx.c:486
+#, 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:538
-#, fuzzy, c-format
+#: midx.c:546
+#, 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 %d en el fitxer de paquet"
-#: midx.c:842
+#: midx.c:846
#, fuzzy
msgid "Adding packfiles to multi-pack-index"
-msgstr "s'ha produït un error en netejar l'índex"
+msgstr "Afegint fitxers de paquets a multi-index"
-#: midx.c:875
-#, c-format
+#: midx.c:879
+#, 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:973
+#: midx.c:931
+msgid "no pack files to index."
+msgstr "no hi ha fitxers empaquetats a indexar."
+
+#: midx.c:982
+#, fuzzy
msgid "Writing chunks to multi-pack-index"
-msgstr ""
+msgstr "Escrivint trossos a multi-index"
-#: midx.c:1052
+#: midx.c:1060
#, 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:1108
+#: midx.c:1116
+#, fuzzy
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr "l'índex múltiple és massa petit"
+
+#: midx.c:1124
msgid "Looking for referenced packfiles"
-msgstr "S'estan cercant fitxers de paquets referenciats"
+msgstr "S'estan cercant fitxers empaquetats referenciats"
-#: midx.c:1123
-#, c-format
+#: midx.c:1139
+#, 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:1128
+#: midx.c:1144
+#, fuzzy
+msgid "the midx contains no oid"
+msgstr "el midx no conté cap oide"
+
+#: midx.c:1153
+#, fuzzy
msgid "Verifying OID order in multi-pack-index"
-msgstr ""
+msgstr "Verificant l'ordre OID en multi-index"
-#: midx.c:1137
-#, c-format
+#: midx.c:1162
+#, 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:1157
+#: midx.c:1182
msgid "Sorting objects by packfile"
msgstr "S'estan ordenant els objectes per fitxer de paquet"
-#: midx.c:1164
+#: midx.c:1189
msgid "Verifying object offsets"
msgstr "S'estan verificant els desplaçaments dels objectes"
-#: midx.c:1180
+#: midx.c:1205
#, 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:1186
+#: midx.c:1211
#, fuzzy, c-format
msgid "failed to load pack-index for packfile %s"
-msgstr "s'ha produït un error en llegir el fitxer d'ordres «%s»"
-
-#: midx.c:1195
-#, c-format
-msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-msgstr ""
+msgstr "no s'ha pogut carregar l'índex del paquet per al fitxer de paquet %s"
#: midx.c:1220
+#, 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:1245
msgid "Counting referenced objects"
msgstr "S'estan comptant els objectes referenciats"
-#: midx.c:1230
+#: midx.c:1255
msgid "Finding and deleting unreferenced packfiles"
msgstr "S'estan cercant i suprimint els fitxers de paquets no referenciats"
-#: midx.c:1388
+#: midx.c:1446
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:1407
+#: midx.c:1466
msgid "could not finish pack-objects"
msgstr "no s'ha pogut finalitzar el pack-objects"
#: 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: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: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
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."
+"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 ""
"No heu acabat la vostra fusió de notes prèvia (%s existeix).\n"
-"Useu «git notes merge --commit» o «git notes merge --abort» per a cometre/"
-"avortar la fusió prèvia abans de començar una fusió de notes nova."
+"Useu «git notes merge --commit» o «git notes merge --abort» per a cometre/avortar la fusió prèvia abans de començar una fusió de notes nova."
#: notes-merge.c:284
#, c-format
@@ -4722,7 +5314,6 @@
#. 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'"
@@ -4748,113 +5339,32 @@
msgid "unable to parse object: %s"
msgstr "no s'ha pogut analitzar l'objecte: %s"
-#: object.c:266 object.c:277
+#: object.c:266 object.c:278
#, c-format
msgid "hash mismatch %s"
-msgstr ""
+msgstr "el resum no coincideix %s"
-#: packfile.c:641
+#: 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:615
msgid "offset before end of packfile (broken .idx?)"
msgstr "desplaçament abans de la fi del fitxer de paquet (.idx trencat?)"
-#: packfile.c:1888
+#: packfile.c:1907
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
"desplaçament abans d'inici d'índex de paquet per a %s (índex corromput?)"
-#: packfile.c:1892
+#: packfile.c:1911
#, 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.c:38
-#, c-format
-msgid "%s requires a value"
-msgstr "%s requereix un valor"
-
-#: parse-options.c:73
-#, c-format
-msgid "%s is incompatible with %s"
-msgstr "%s és incompatible amb %s"
-
-#: parse-options.c:78
-#, c-format
-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
-#, c-format
-msgid "%s takes no value"
-msgstr "%s no accepta cap valor"
-
-#: parse-options.c:94
-#, c-format
-msgid "%s isn't available"
-msgstr "%s no és disponible"
-
-#: parse-options.c:219
-#, c-format
-msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
-msgstr ""
-
-#: parse-options.c:389
-#, c-format
-msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
-msgstr ""
-
-#: parse-options.c:423 parse-options.c:431
-#, c-format
-msgid "did you mean `--%s` (with two dashes ?)"
-msgstr ""
-
-#: parse-options.c:860
-#, c-format
-msgid "unknown option `%s'"
-msgstr "opció desconeguda «%s»"
-
-#: parse-options.c:862
-#, c-format
-msgid "unknown switch `%c'"
-msgstr "«switch» «%c» desconegut"
-
-#: parse-options.c:864
-#, c-format
-msgid "unknown non-ascii option in string: `%s'"
-msgstr "opció no ascii desconeguda en la cadena: «%s»"
-
-#: parse-options.c:888
-msgid "..."
-msgstr "..."
-
-#: parse-options.c:907
-#, c-format
-msgid "usage: %s"
-msgstr "ús: %s"
-
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation.
-#.
-#: parse-options.c:913
-#, c-format
-msgid " or: %s"
-msgstr " o: %s"
-
-#: parse-options.c:916
-#, c-format
-msgid " %s"
-msgstr " %s"
-
-#: parse-options.c:955
-msgid "-NUM"
-msgstr "-NUM"
-
-#: parse-options.c:969
-#, 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"
@@ -4870,11 +5380,96 @@
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
+#: 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"
+msgstr "%s requereix un valor"
+
+#: parse-options.c:73
+#, c-format
+msgid "%s is incompatible with %s"
+msgstr "%s és incompatible amb %s"
+
+#: parse-options.c:78
+#, c-format
+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:317
+#, c-format
+msgid "%s takes no value"
+msgstr "%s no accepta cap valor"
+
+#: parse-options.c:94
+#, c-format
+msgid "%s isn't available"
+msgstr "%s no és disponible"
+
+#: 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 enter no negatiu amb un sufix opcional k/m/g"
+
+#: parse-options.c:386
+#, c-format
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
+msgstr "opció ambigua: %s (pot ser --%s%s o --%s%s)"
+
+#: parse-options.c:420 parse-options.c:428
+#, c-format
+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:862
+#, c-format
+msgid "unknown option `%s'"
+msgstr "opció desconeguda «%s»"
+
+#: parse-options.c:864
+#, c-format
+msgid "unknown switch `%c'"
+msgstr "«switch» «%c» desconegut"
+
+#: 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:890
+msgid "..."
+msgstr "..."
+
+#: parse-options.c:909
+#, c-format
+msgid "usage: %s"
+msgstr "ús: %s"
+
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
+#: parse-options.c:915
+#, c-format
+msgid " or: %s"
+msgstr " o: %s"
+
+#: parse-options.c:918
+#, c-format
+msgid " %s"
+msgstr " %s"
+
+#: parse-options.c:957
+msgid "-NUM"
+msgstr "-NUM"
+
#: path.c:915
#, c-format
msgid "Could not make %s writable by group"
@@ -4920,7 +5515,7 @@
#: 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:332
#, c-format
@@ -4937,31 +5532,31 @@
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: «literal» i «glob» són incompatibles"
-#: pathspec.c:442
+#: 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:516
+#: pathspec.c:521
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "«%s» (mnemònic: «%c»)"
-#: pathspec.c:526
+#: 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:593
+#: 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:638
+#: pathspec.c:643
#, c-format
msgid "line is badly quoted: %s"
-msgstr ""
+msgstr "la línia està mal citada: %s"
#: pkt-line.c:92
msgid "unable to write flush packet"
@@ -4972,46 +5567,51 @@
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:165
#, c-format
msgid "remote error: %s"
msgstr "error remot: %s"
@@ -5021,95 +5621,116 @@
msgstr "S'està actualitzant l'índex"
#: preload-index.c:138
-#, fuzzy, c-format
+#, c-format
msgid "unable to create threaded lstat: %s"
-msgstr "no s'ha pogut crear fil: %s"
+msgstr "no s'han pogut crear lstat amb fils %s"
-#: pretty.c:981
+#: pretty.c:983
msgid "unable to parse --pretty format"
msgstr "no s'ha pogut analitzar el format --pretty"
-#: promisor-remote.c:23
-msgid "Remote with no URL"
-msgstr "Remot sense URL"
+#: promisor-remote.c:30
+msgid "promisor-remote: unable to fork off fetch subprocess"
+msgstr "promisor-remote no es pot bifurcar obtenint el subprocés"
-#: promisor-remote.c:58
+#: promisor-remote.c:35 promisor-remote.c:37
+msgid "promisor-remote: could not write to fetch subprocess"
+msgstr "promisor-remote no s'ha pogut escriure per obtenir el subprocés"
+
+#: promisor-remote.c:41
+msgid "promisor-remote: could not close stdin to fetch subprocess"
+msgstr "promisor-remote no s'ha pogut tancar stdin per obtenir el subprocés"
+
+#: promisor-remote.c:53
#, c-format
msgid "promisor remote name cannot begin with '/': %s"
-msgstr ""
+msgstr "el nom remot «promisor» no pot començar amb «/»: %s"
-#: range-diff.c:75
+#: 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:77
+#: range-diff.c:79
msgid "could not read `log` output"
msgstr "no s'ha pogut llegir la sortida de «log»"
-#: range-diff.c:96 sequencer.c:5163
+#: range-diff.c:98 sequencer.c:5310
#, c-format
msgid "could not parse commit '%s'"
msgstr "no s'ha pogut analitzar la comissió «%s»"
-#: range-diff.c:122
+#: range-diff.c:112
+#, fuzzy, c-format
+msgid ""
+"could not parse first line of `log` output: did not start with 'commit ': "
+"'%s'"
+msgstr ""
+"no s'ha pogut analitzar la primera línia de la sortida `log` no s'ha iniciat"
+" amb 'commit '%s'"
+
+#: 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:285
+#: range-diff.c:299
msgid "failed to generate diff"
msgstr "s'ha produït un error en generar el diff"
-#: range-diff.c:518 range-diff.c:520
+#: range-diff.c:532 range-diff.c:534
#, c-format
msgid "could not parse log for '%s'"
-msgstr "no s'ha pogut llegir el fitxer de registre per «%s»"
+msgstr "no s'ha pogut llegir el fitxer de registre per a «%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 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
+#: read-cache.c:807
#, c-format
msgid "unable to stat '%s'"
msgstr "no s'ha pogut fer «stat» a «%s»"
-#: read-cache.c:1325
+#: read-cache.c:1318
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "«%s» apareix com a fitxer i com a directori"
-#: read-cache.c:1531
+#: read-cache.c:1524
msgid "Refresh index"
msgstr "Actualitza l'índex"
-#: read-cache.c:1646
+#: read-cache.c:1639
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -5118,7 +5739,7 @@
"index.version està establerta, però el valor no és vàlid.\n"
"S'està usant la versió %i"
-#: read-cache.c:1656
+#: read-cache.c:1649
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -5127,152 +5748,161 @@
"GIT_INDEX_VERSION està establerta, però el valor no és vàlid.\n"
"S'està usant la versió %i"
-#: read-cache.c:1712
+#: read-cache.c:1705
#, c-format
msgid "bad signature 0x%08x"
msgstr "signatura malmesa 0x%08x"
-#: read-cache.c:1715
+#: read-cache.c:1708
#, c-format
msgid "bad index version %d"
msgstr "versió d'índex incorrecta %d"
-#: read-cache.c:1724
+#: read-cache.c:1717
msgid "bad index file sha1 signature"
msgstr "signatura sha1 malmesa al fitxer d'índex"
-#: read-cache.c:1754
+#: 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:1756
+#: read-cache.c:1749
#, c-format
msgid "ignoring %.4s extension"
msgstr "s'està ignorant l'extensió %.4s"
-#: read-cache.c:1793
+#: read-cache.c:1786
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "format d'entrada d'índex desconeguda «0x%08x»"
-#: read-cache.c:1809
+#: 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»"
+msgstr "camp del nom mal formatat l'índex, camí a prop «%s»"
-#: read-cache.c:1866
+#: read-cache.c:1859
+#, fuzzy
msgid "unordered stage entries in index"
-msgstr ""
+msgstr "entrades d'escenari no ordenades en l'índex"
-#: read-cache.c:1869
+#: 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:1872
+#: read-cache.c:1865
#, fuzzy, c-format
msgid "unordered stage entries for '%s'"
-msgstr "no s'han pogut crear directoris per %s"
+msgstr "entrades d'etapa no ordenades per «%s»"
-#: read-cache.c:1978 read-cache.c:2266 rerere.c:565 rerere.c:599 rerere.c:1111
-#: builtin/add.c:499 builtin/check-ignore.c:178 builtin/checkout.c:470
-#: builtin/checkout.c:654 builtin/clean.c:967 builtin/commit.c:367
-#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
-#: builtin/reset.c:246 builtin/rm.c:271 builtin/submodule--helper.c:332
+#: 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:502 builtin/checkout.c:688 builtin/clean.c:991
+#: builtin/commit.c:364 builtin/diff-tree.c:122 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:2119
-#, fuzzy, c-format
+#: read-cache.c:2115
+#, 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 fil «load_cache_entries»: %s"
-#: read-cache.c:2132
-#, fuzzy, c-format
+#: read-cache.c:2128
+#, 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 al fil «load_cache_entries»: %s"
+
+#: read-cache.c:2161
+#, c-format
+msgid "%s: index file open failed"
+msgstr "%s: ha fallat l'obertura del fitxer d'índex"
#: read-cache.c:2165
-#, fuzzy, c-format
-msgid "%s: index file open failed"
-msgstr "%s: s'ha produït un error en actualitzar els fitxers"
+#, c-format
+msgid "%s: cannot stat the open index"
+msgstr "%s: no es pot fer «stat» a l'índex obert"
#: read-cache.c:2169
-#, fuzzy, c-format
-msgid "%s: cannot stat the open index"
-msgstr "no es pot llegir l'índex"
-
-#: read-cache.c:2173
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s: fitxer d'índex més petit que s'esperava"
-#: read-cache.c:2177
+#: read-cache.c:2173
#, c-format
msgid "%s: unable to map index file"
msgstr "%s: no es pot mapar el fitxer d'índex"
-#: read-cache.c:2219
+#: read-cache.c: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:2246
+#: 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:2278
+#: read-cache.c:2274
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "no s'ha pogut refrescar l'índex compartit «%s»"
-#: read-cache.c:2325
+#: 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:3021 strbuf.c:1145 wrapper.c:622 builtin/merge.c:1119
+#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1140
#, c-format
msgid "could not close '%s'"
msgstr "no s'ha pogut tancar «%s»"
-#: read-cache.c:3124 sequencer.c:2429 sequencer.c:4069
+#: read-cache.c:3120 sequencer.c:2479 sequencer.c:4231
#, c-format
msgid "could not stat '%s'"
msgstr "no s'ha pogut fer stat a «%s»"
-#: read-cache.c:3137
+#: 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:3149
+#: read-cache.c:3145
#, c-format
msgid "unable to unlink: %s"
msgstr "no s'ha pogut desenllaçar: %s"
-#: read-cache.c:3174
-#, 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:3323
+#: 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: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 ""
+"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: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
-#, fuzzy
+#: rebase-interactive.c:42
msgid ""
"\n"
"Commands:\n"
@@ -5295,35 +5925,39 @@
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-la\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 la comissió.\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, fuzzy
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] "Rebase %s en un 1% (ordre<unk>d)"
+msgstr[1] "Rebase de percentatges sobre els percentatges (ordres<unk>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"
msgstr ""
"\n"
-"No elimineu cap línia. Useu «drop» explícitament per a eliminar una "
-"comissió.\n"
+"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"
@@ -5331,7 +5965,7 @@
"\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"
@@ -5345,7 +5979,7 @@
" 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"
@@ -5355,167 +5989,49 @@
"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:3536
-#: sequencer.c:3562 sequencer.c:5263 builtin/fsck.c:346 builtin/rebase.c:254
+#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3607
+#: sequencer.c:3633 sequencer.c:5416 builtin/fsck.c:347 builtin/rebase.c:270
#, 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:202 builtin/rebase.c:228
+#: builtin/rebase.c:252
#, 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"
"Dropped commits (newer to older):\n"
msgstr ""
-"Advertència: pot ser que algunes comissions s'hagin descartat "
-"accidentalment.\n"
+"Advertència: pot ser que algunes comissions s'hagin descartat 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"
"\n"
-"Use 'git config rebase.missingCommitsCheck' to change the level of "
-"warnings.\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of warnings.\n"
"The possible behaviours are: ignore, warn, error.\n"
"\n"
msgstr ""
-"Per a evitar aquest missatge, useu \"drop\" per a eliminar explícitament una "
-"comissió.\n"
+"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 "
-"d'advertències.\n"
+"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
+#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2394
+#: builtin/rebase.c:188 builtin/rebase.c:213 builtin/rebase.c:239
+#: builtin/rebase.c:264
#, c-format
-msgid "%s does not point to a valid object!"
-msgstr "%s no apunta a un objecte vàlid"
+msgid "could not read '%s'."
+msgstr "no s'ha pogut llegir «%s»."
-#: 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:2098
-#, 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:405 sequencer.c:2793 sequencer.c:2997
-#: sequencer.c:3011 sequencer.c:3269 sequencer.c:5179 strbuf.c:1142
-#: wrapper.c:620
-#, c-format
-msgid "could not write to '%s'"
-msgstr "no s'ha pogut escriure a «%s»"
-
-#: refs.c:860 strbuf.c:1140 wrapper.c:188 wrapper.c:358 builtin/am.c:714
-#: builtin/rebase.c:1031
-#, 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
-#, 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:2023
-#, fuzzy, c-format
-msgid "multiple updates for ref '%s' not allowed"
-msgstr "nom d'identitat buit (per <%s>) no és permès"
-
-#: refs.c:2055
-msgid "ref updates forbidden inside quarantine environment"
-msgstr "no està permès actualitzar les referències en un entorn de quarantena"
-
-#: refs.c:2151 refs.c:2181
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr "«%s» existeix; no es pot crear «%s»"
-
-#: refs.c:2157 refs.c:2192
-#, 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:1541
-#: refs/packed-backend.c:1551
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "no s'ha pogut suprimir la referència %s: %s"
-
-#: refs/files-backend.c:1251 refs/packed-backend.c:1554
-#, c-format
-msgid "could not delete references: %s"
-msgstr "no s'han pogut suprimir les referències: %s"
-
-#: refspec.c:137
-#, c-format
-msgid "invalid refspec '%s'"
-msgstr "refspec no vàlida: «%s»"
-
-#: ref-filter.c:42 wt-status.c:1938
+#: ref-filter.c:42 wt-status.c:1973
msgid "gone"
msgstr "no hi és"
@@ -5534,290 +6050,381 @@
msgid "ahead %d, behind %d"
msgstr "davant per %d, darrere per %d"
-#: ref-filter.c:165
+#: ref-filter.c:169
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "format esperat: %%(color:<color>)"
-#: ref-filter.c:167
+#: ref-filter.c:171
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "color no reconegut: %%(color:%s)"
-#: ref-filter.c:189
+#: ref-filter.c:193
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Valor enter esperat pel nom de referència:lstrip=%s"
-#: ref-filter.c:193
+#: ref-filter.c:197
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Valor enter esperat pel nom de referència:rstrip=%s"
-#: ref-filter.c:195
+#: 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:250
+#: 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:272
+#: ref-filter.c:276
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "paràmetre %%(objectsize) no reconegut: %s"
+msgstr "argument %%(objectsize) no reconegut: %s"
-#: ref-filter.c:280
+#: ref-filter.c:284
#, c-format
msgid "%%(deltabase) does not take arguments"
-msgstr "%%(deltabase) no accepta paràmetres"
+msgstr "%%(deltabase) no accepta arguments"
-#: ref-filter.c:292
+#: 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:301
+#: ref-filter.c:309
#, c-format
-msgid "%%(subject) does not take arguments"
-msgstr "%%(subject) no accepta paràmetres"
+msgid "unrecognized %%(subject) argument: %s"
+msgstr "argument %%(subject) no reconegut: %s"
-#: ref-filter.c:323
+#: 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:352
+#: ref-filter.c:363
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "valor positiu esperat conté:lines=%s"
-#: ref-filter.c:354
+#: 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:369
+#: ref-filter.c:380
#, c-format
-msgid "positive value expected objectname:short=%s"
-msgstr "valor positiu esperat nom d'objecte:curt=%s"
+msgid "positive value expected '%s' in %%(%s)"
+msgstr "valor positiu esperat «%s» a %%(%s)"
-#: ref-filter.c:373
+#: ref-filter.c:384
#, c-format
-msgid "unrecognized %%(objectname) argument: %s"
-msgstr "paràmetre %%(objectname) no reconegut: %s"
+msgid "unrecognized argument '%s' in %%(%s)"
+msgstr "argument no reconegut «%s» a %%(%s)"
-#: ref-filter.c:403
+#: 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:415
+#: ref-filter.c:440
#, c-format
msgid "unrecognized position:%s"
msgstr "posició no reconeguda:%s"
-#: ref-filter.c:422
+#: ref-filter.c:447
#, c-format
msgid "unrecognized width:%s"
msgstr "amplada no reconeguda:%s"
-#: ref-filter.c:431
+#: 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:439
+#: 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:457
+#: 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:559
+#: ref-filter.c:584
#, c-format
msgid "malformed field name: %.*s"
msgstr "nom de camp mal format: %.*s"
-#: ref-filter.c:586
+#: ref-filter.c:611
#, c-format
msgid "unknown field name: %.*s"
msgstr "nom de camp desconegut: %.*s"
-#: ref-filter.c:590
+#: ref-filter.c:615
#, 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:714
+#: 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:777
+#: 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:779
+#: 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:781
+#: 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:809
+#: 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:811
+#: 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:813
+#: 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:828
+#: 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:885
+#: ref-filter.c:910
#, c-format
msgid "malformed format string %s"
msgstr "cadena de format mal format %s"
-#: ref-filter.c:1488
+#: ref-filter.c:1549
#, c-format
msgid "no branch, rebasing %s"
msgstr "sense branca, s'està fent «rebase» %s"
-#: ref-filter.c:1491
+#: ref-filter.c:1552
#, c-format
msgid "no branch, rebasing detached HEAD %s"
msgstr "sense branca, s'està fent «rebase» d'un «HEAD» %s no adjuntat"
-#: ref-filter.c:1494
+#: ref-filter.c:1555
#, c-format
msgid "no branch, bisect started on %s"
msgstr "(sense branca, bisecció començada en %s)"
-#: ref-filter.c:1504
+#: ref-filter.c:1565
msgid "no branch"
msgstr "sense branca"
-#: ref-filter.c:1540 ref-filter.c:1749
+#: ref-filter.c:1599 ref-filter.c:1808
#, c-format
msgid "missing object %s for %s"
msgstr "manca l'objecte %s per a %s"
-#: ref-filter.c:1550
+#: ref-filter.c:1609
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer ha fallat en %s per a %s"
-#: ref-filter.c:2004
+#: ref-filter.c:2062
#, c-format
msgid "malformed object at '%s'"
msgstr "objecte mal format a «%s»"
-#: ref-filter.c:2093
+#: ref-filter.c:2151
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "s'està ignorant la referència amb nom malmès %s"
-#: ref-filter.c:2389
+#: ref-filter.c:2156 refs.c:660
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "s'està ignorant la referència trencada %s"
+
+#: ref-filter.c:2472
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: manca l'àtom %%(end)"
-#: ref-filter.c:2489
-#, c-format
-msgid "option `%s' is incompatible with --merged"
-msgstr "l'opció «%s» és incompatible amb --merged"
-
-#: ref-filter.c:2492
-#, c-format
-msgid "option `%s' is incompatible with --no-merged"
-msgstr "l'opció «%s» és incompatible amb --no-merged"
-
-#: ref-filter.c:2502
+#: ref-filter.c:2571
#, c-format
msgid "malformed object name %s"
msgstr "nom d'objecte %s mal format"
-#: ref-filter.c:2507
+#: ref-filter.c:2576
#, c-format
msgid "option `%s' must point to a commit"
msgstr "l'opció «%s» ha d'apuntar a una comissió"
-#: remote.c:366
+#: refs.c:264
#, c-format
+msgid "%s does not point to a valid object!"
+msgstr "%s no apunta a un objecte vàlid"
+
+#: refs.c:575
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "no s'ha pogut recuperar «%s»"
+
+#: refs.c:582
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "nom de branca no vàlida: %s = %s"
+
+#: refs.c:658
+#, fuzzy, c-format
+msgid "ignoring dangling symref %s"
+msgstr "ignorant symref per sota"
+
+#: refs.c:895
+#, fuzzy, c-format
+msgid "log for ref %s has gap after %s"
+msgstr "registre per a ref %s have gap després de percentatges"
+
+#: refs.c:901
+#, 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:960
+#, c-format
+msgid "log for %s is empty"
+msgstr "el registre per a %s és buit"
+
+#: refs.c:1052
+#, 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:1123
+#, fuzzy, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "ha fallat updateref per al ref '%s'%s"
+
+#: refs.c:1947
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "no es permeten múltiples actualitzacions per a la referència «%s»"
+
+#: refs.c:2027
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "no està permès actualitzar les referències en un entorn de quarantena"
+
+#: refs.c:2038
+#, fuzzy
+msgid "ref updates aborted by hook"
+msgstr "les actualitzacions de referències s'han avortat per ganxo"
+
+#: refs.c:2138 refs.c:2168
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "«%s» existeix; no es pot crear «%s»"
+
+#: refs.c:2144 refs.c:2179
+#, 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:170
+#, 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 ""
+msgstr "config remote abreviation no pot començar amb «/» per cents"
-#: remote.c:413
+#: remote.c:399
msgid "more than one receivepack given, using the first"
-msgstr ""
+msgstr "més d'un paquet de recepció donat, usant el primer"
-#: remote.c:421
+#: remote.c:407
msgid "more than one uploadpack given, using the first"
-msgstr ""
+msgstr "més d'un paquet de càrrega donat, usant el primer"
-#: remote.c:611
+#: 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:615
+#: remote.c:594
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s generalment segueix %s, no %s"
-#: remote.c:619
+#: remote.c:598
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s segueix ambdós %s i %s"
-#: remote.c:687
+#: remote.c:666
#, c-format
msgid "key '%s' of pattern had no '*'"
-msgstr ""
+msgstr "la clau «%s» del patró no té «*»"
-#: remote.c:697
+#: remote.c:676
#, c-format
msgid "value '%s' of pattern has no '*'"
-msgstr ""
+msgstr "el valor «%s» del patró no té «*»"
-#: remote.c:1003
-#, 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:1008
+#: 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:1023
-#, 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"
@@ -5829,148 +6436,162 @@
"\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:1043
-#, 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:1048
-#, 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:1053
-#, 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:1058
-#, 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:1094
+#: remote.c:1164
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "«%s» no es pot resoldre a una branca"
-#: remote.c:1105
+#: 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:1117
-#, 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:1124
-#, 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:1627 remote.c:1728
+#: remote.c:1714 remote.c:1815
msgid "HEAD does not point to a branch"
msgstr "HEAD no assenyala cap branca"
-#: remote.c:1636
+#: remote.c:1723
#, c-format
msgid "no such branch: '%s'"
msgstr "no existeix la branca: «%s»"
-#: remote.c:1639
+#: remote.c:1726
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "cap font configurada per a la branca «%s»"
-#: remote.c:1645
+#: remote.c:1732
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "la branca font «%s» no s'emmagatzema com a branca amb seguiment remot"
-#: remote.c:1660
+#: remote.c:1747
#, 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"
+"el destí de pujada «%s» en el remot «%s» no té cap branca amb seguiment "
+"remot"
-#: remote.c:1672
+#: remote.c:1759
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "la branca «%s» no té cap remot al qual pujar"
-#: remote.c:1682
+#: remote.c:1769
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "les especificacions de referència de «%s» no inclouen «%s»"
-#: remote.c:1695
+#: remote.c:1782
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:1717
+#: remote.c:1804
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:1843
+#: remote.c:1933
#, c-format
msgid "couldn't find remote ref %s"
msgstr "no s'ha pogut trobar la referència remota %s"
-#: remote.c:1856
+#: remote.c:1946
#, c-format
msgid "* Ignoring funny ref '%s' locally"
-msgstr ""
+msgstr "* S'estan ignorant les referències «%s» localment"
-#: remote.c:2019
+#: remote.c:2109
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "La vostra branca està basada en «%s», però la font no hi és.\n"
-#: remote.c:2023
+#: remote.c:2113
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:2026
+#: remote.c:2116
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "La vostra branca està al dia amb «%s».\n"
-#: remote.c:2030
+#: remote.c:2120
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "La vostra branca i «%s» es refereixen a diferents comissions.\n"
-#: remote.c:2033
+#: remote.c:2123
#, c-format
msgid " (use \"%s\" for details)\n"
-msgstr ""
+msgstr " (useu «%s» per a detalls)\n"
-#: remote.c:2037
+#: remote.c:2127
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "La vostra branca està %2$d comissió per davant de «%1$s».\n"
msgstr[1] "La vostra branca està %2$d comissions per davant de «%1$s».\n"
-#: remote.c:2043
+#: remote.c:2133
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:2046
+#: remote.c:2136
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -5982,11 +6603,11 @@
"La vostra branca està %2$d comissions per darrere de «%1$s», i pot avançar-"
"se ràpidament.\n"
-#: remote.c:2054
+#: remote.c:2144
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (useu «git pull» per a actualitzar la vostra branca local)\n"
-#: remote.c:2057
+#: remote.c:2147
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -6001,11 +6622,11 @@
"La vostra branca i «%s» han divergit,\n"
"i tenen %d i %d comissions distintes cada una, respectivament.\n"
-#: remote.c:2067
+#: remote.c:2157
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (useu «git pull» per a fusionar la branca remota amb la vostra)\n"
-#: remote.c:2250
+#: remote.c:2348
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "no es pot analitzar el nom de l'objecte esperat «%s»"
@@ -6020,7 +6641,7 @@
msgid "duplicate replace ref: %s"
msgstr "duplica les referències reemplaçades: %s"
-#: replace-object.c:73
+#: replace-object.c:82
#, c-format
msgid "replace depth too high for object %s"
msgstr "la profunditat de reemplaçament és massa alta per l'objecte %s"
@@ -6039,12 +6660,12 @@
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
-#, c-format
+#, c-format
msgid "could not parse conflict hunks in '%s'"
msgstr "no s'han pogut analitzar els pedaços en conflicte a «%s»"
@@ -6059,9 +6680,9 @@
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
@@ -6076,28 +6697,28 @@
#: 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
+#, c-format
msgid "Recorded preimage for '%s'"
-msgstr "no s'ha pogut llegir el fitxer de registre «%s»"
+msgstr "Imatge prèvia registrada per a «%s»"
-#: rerere.c:881 submodule.c:2067 builtin/log.c:1871
-#: builtin/submodule--helper.c:1436 builtin/submodule--helper.c:1448
+#: rerere.c:881 submodule.c:2082 builtin/log.c:1992
+#: 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»"
#: rerere.c:1057
-#, fuzzy, c-format
+#, c-format
msgid "failed to update conflicted state in '%s'"
-msgstr "no s'ha pogut escriure a «%s»"
+msgstr "ha fallat en actualitzar l'estat en conflicte a «%s»"
#: rerere.c:1068 rerere.c:1075
-#, fuzzy, c-format
+#, 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 a «%s»"
#: rerere.c:1077
#, c-format
@@ -6105,250 +6726,265 @@
msgstr "no es pot fer «unlink» de «%s»"
#: rerere.c:1087
-#, fuzzy, c-format
+#, 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
+#, c-format
msgid "Forgot resolution for '%s'\n"
-msgstr "no s'ha pogut llegir el fitxer de registre «%s»"
+msgstr "S'ha oblidat la resolució per a «%s»\n"
#: rerere.c:1199
msgid "unable to open rr-cache directory"
msgstr "no s'ha pogut obrir el directori rr-cache"
-#: revision.c:2497
+#: 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:3460
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "s'ha produït un error en cercar l'arbre de %s"
+
+#: revision.c:2336
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "--unpacked=<packfile> ja no s'ha admet"
+
+#: revision.c:2356
+#, c-format
+msgid "unknown value for --diff-merges: %s"
+msgstr "valor desconegut per a --diff-merges: %s"
+
+#: revision.c:2694
msgid "your current branch appears to be broken"
msgstr "la vostra branca actual sembla malmesa"
-#: revision.c:2500
+#: revision.c:2697
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "la branca actual «%s» encara no té cap comissió"
-#: revision.c:2708
-msgid "--first-parent is incompatible with --bisect"
-msgstr "--first-parent és incompatible amb --bisect"
-
-#: revision.c:2712
+#: revision.c:2907
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L no és encara compatible amb formats que no siguin «-p» o «-s»"
-#: run-command.c:762
+#: run-command.c:764
msgid "open /dev/null failed"
msgstr "s'ha produït un error en obrir /dev/null"
-#: run-command.c:1268
-#, c-format
+#: run-command.c:1271
+#, c-format
msgid "cannot create async thread: %s"
msgstr "no s'ha pogut crear fil «async»: %s"
-#: run-command.c:1332
-#, c-format
+#: run-command.c:1335
+#, 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 ""
-
-#: send-pack.c:144
-msgid "unexpected flush packet while reading remote unpack status"
-msgstr ""
-"paquet de neteja no esperat quan estava llegint l'estat del desempaquetament "
-"remot"
+"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:146
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr ""
+"paquet de buidatge no esperat quan estava llegint l'estat del "
+"desempaquetament remot"
+
+#: send-pack.c:148
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "no s'ha pogut analitzar l'estat del desempaquetament remot: %s"
-#: send-pack.c:148
+#: send-pack.c:150
#, c-format
msgid "remote unpack failed: %s"
msgstr "s'ha produït un error en el desempaquetament remot: %s"
-#: send-pack.c:309
+#: send-pack.c:374
msgid "failed to sign the push certificate"
msgstr "s'ha produït un error en signar el certificat de pujada"
-#: send-pack.c:423
+#: send-pack.c:467
+#, 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:476
msgid "the receiving end does not support --signed push"
msgstr "el destí receptor no admet pujar --signed"
-#: send-pack.c:425
+#: send-pack.c:478
msgid ""
-"not sending a push certificate since the receiving end does not support --"
-"signed push"
+"not sending a push certificate since the receiving end does not support "
+"--signed push"
msgstr ""
"no s'està enviant una certificació de pujada perquè el destí receptor no "
"admet pujar --signed"
-#: send-pack.c:437
+#: send-pack.c:490
msgid "the receiving end does not support --atomic push"
msgstr "el destí receptor no admet pujar --atomic"
-#: send-pack.c:442
+#: send-pack.c:495
msgid "the receiving end does not support push options"
msgstr "el destí receptor no admet opcions de pujada"
-#: sequencer.c:189
+#: sequencer.c:195
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "mode de neteja «%s» no vàlid en la comissió del missatge"
-#: sequencer.c:294
+#: sequencer.c:323
#, c-format
msgid "could not delete '%s'"
msgstr "no s'ha pogut suprimir «%s»"
-#: sequencer.c:313 builtin/rebase.c:781 builtin/rebase.c:1706 builtin/rm.c:369
+#: sequencer.c:343 builtin/rebase.c:755 builtin/rebase.c:1596 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:323
+#: sequencer.c:353
msgid "revert"
msgstr "revertir"
-#: sequencer.c:325
+#: sequencer.c:355
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:327
-msgid "rebase -i"
-msgstr "rebase -i"
+#: sequencer.c:357
+msgid "rebase"
+msgstr "rebase"
-#: sequencer.c:329
+#: sequencer.c:359
#, c-format
msgid "unknown action: %d"
msgstr "acció desconeguda: %d"
-#: sequencer.c:387
+#: sequencer.c:418
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:390
+#: sequencer.c:421
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:403 sequencer.c:2993
+#: sequencer.c:434 sequencer.c:3062
#, c-format
msgid "could not lock '%s'"
msgstr "no s'ha pogut bloquejar «%s»"
-#: sequencer.c:410
+#: sequencer.c:436 sequencer.c:2861 sequencer.c:3066 sequencer.c:3080
+#: sequencer.c:3337 sequencer.c:5326 strbuf.c:1168 wrapper.c:631
+#, c-format
+msgid "could not write to '%s'"
+msgstr "no s'ha pogut escriure a «%s»"
+
+#: sequencer.c:441
#, c-format
msgid "could not write eol to '%s'"
msgstr "no s'ha pogut escriure el terminador de línia a «%s»"
-#: sequencer.c:415 sequencer.c:2798 sequencer.c:2999 sequencer.c:3013
-#: sequencer.c:3277
+#: sequencer.c:446 sequencer.c:2866 sequencer.c:3068 sequencer.c:3082
+#: sequencer.c:3345
#, c-format
msgid "failed to finalize '%s'"
msgstr "s'ha produït un error en finalitzar «%s»"
-#: sequencer.c:438 sequencer.c:1707 sequencer.c:2818 sequencer.c:3259
-#: sequencer.c:3368 builtin/am.c:244 builtin/commit.c:783 builtin/merge.c:1117
-#: builtin/rebase.c:589
-#, c-format
-msgid "could not read '%s'"
-msgstr "no s'ha pogut llegir «%s»"
-
-#: sequencer.c:464
+#: sequencer.c:485
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "els vostres canvis locals se sobreescriurien per %s."
-#: sequencer.c:468
+#: sequencer.c:489
msgid "commit your changes or stash them to proceed."
msgstr "cometeu els vostres canvis o feu un «stash» per a procedir."
-#: sequencer.c:500
+#: sequencer.c:521
#, c-format
msgid "%s: fast-forward"
msgstr "%s: avanç ràpid"
-#: sequencer.c:539 builtin/tag.c:565
+#: sequencer.c:560 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".
-#.
-#: sequencer.c:633
+#. "rebase".
+#: sequencer.c:670
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: No s'ha pogut escriure un fitxer d'índex nou"
-#: sequencer.c:650
+#: sequencer.c:687
msgid "unable to update cache tree"
msgstr "no s'ha pogut actualitzar l'arbre cau"
-#: sequencer.c:664
+#: sequencer.c:701
msgid "could not resolve HEAD commit"
msgstr "no s'ha pogut resoldre la comissió HEAD"
-#: sequencer.c:744
+#: sequencer.c:781
#, c-format
msgid "no key present in '%.*s'"
msgstr "no hi ha una clau a «%.*s»"
-#: sequencer.c:755
+#: sequencer.c:792
#, 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:792 wrapper.c:190 wrapper.c:360 builtin/am.c:705
-#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1074
+#: sequencer.c:829 wrapper.c:201 wrapper.c:371 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1135 builtin/rebase.c:908
#, c-format
msgid "could not open '%s' for reading"
msgstr "no s'ha pogut obrir «%s» per a lectura"
-#: sequencer.c:802
+#: sequencer.c:839
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "Ja s'ha donat «GIT_AUTHOR_NAME»"
-#: sequencer.c:807
+#: sequencer.c:844
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "Ja s'ha donat «GIT_AUTHOR_EMAIL»"
-#: sequencer.c:812
+#: sequencer.c:849
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "Ja s'ha donat «GIT_AUTHOR_DATE»"
-#: sequencer.c:816
+#: sequencer.c:853
#, c-format
msgid "unknown variable '%s'"
-msgstr "variable «%s» desconeguda"
+msgstr "variable «%s» desconeguda"
-#: sequencer.c:821
+#: sequencer.c:858
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "falta «GIT_AUTHOR_NAME»"
-#: sequencer.c:823
+#: sequencer.c:860
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "falta «GIT_AUTHOR_EMAIL»"
-#: sequencer.c:825
+#: sequencer.c:862
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "falta «GIT_AUTHOR_DATE»"
-#: sequencer.c:902 sequencer.c:1427
-msgid "malformed ident line"
-msgstr "línia d'identitat mal formada"
-
-#: sequencer.c:925
+#: sequencer.c:927
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -6365,8 +7001,7 @@
" git rebase --continue\n"
msgstr ""
"teniu canvis «staged» en el vostre arbre de treball\n"
-"Si aquests canvis estan pensats per fer «squash» a la comissió prèvia, "
-"executeu:\n"
+"Si aquests canvis estan pensats per fer «squash» a la comissió prèvia, executeu:\n"
"\n"
" git commit --amend %s\n"
"\n"
@@ -6378,11 +7013,11 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:1218
+#: sequencer.c:1208
msgid "'prepare-commit-msg' hook failed"
msgstr "el lligam «prepare-commit-msg» ha fallat"
-#: sequencer.c:1224
+#: sequencer.c:1214
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6409,7 +7044,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1237
+#: sequencer.c:1227
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6427,358 +7062,364 @@
"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:1279
+#: sequencer.c:1269
msgid "couldn't look up newly created commit"
msgstr "no s'ha pogut trobar la comissió novament creada"
-#: sequencer.c:1281
+#: sequencer.c:1271
msgid "could not parse newly created commit"
msgstr "no s'ha pogut analitzar la comissió novament creada"
-#: sequencer.c:1327
+#: sequencer.c:1317
msgid "unable to resolve HEAD after creating commit"
msgstr "no s'ha pogut resoldre HEAD després de crear la comissió"
-#: sequencer.c:1329
+#: sequencer.c:1319
msgid "detached HEAD"
msgstr "HEAD separat"
-#: sequencer.c:1333
+#: sequencer.c:1323
msgid " (root-commit)"
msgstr " (comissió arrel)"
-#: sequencer.c:1354
+#: sequencer.c:1344
msgid "could not parse HEAD"
msgstr "no s'ha pogut analitzar HEAD"
-#: sequencer.c:1356
+#: sequencer.c:1346
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s no és una comissió!"
-#: sequencer.c:1360 sequencer.c:1458 builtin/commit.c:1569
+#: sequencer.c:1350 sequencer.c:1425 builtin/commit.c:1577
msgid "could not parse HEAD commit"
msgstr "no s'ha pogut analitzar la comissió HEAD"
-#: sequencer.c:1411 sequencer.c:2055
+#: sequencer.c:1403 sequencer.c:2100
msgid "unable to parse commit author"
msgstr "no s'ha pogut analitzar l'autor de la comissió"
-#: sequencer.c:1431
-msgid "corrupted author without date information"
-msgstr "autor malmès sense informació de data"
-
-#: sequencer.c:1447 builtin/am.c:1561 builtin/merge.c:684
+#: sequencer.c:1414 builtin/am.c:1566 builtin/merge.c:701
msgid "git write-tree failed to write a tree"
msgstr "git write-tree ha fallat en escriure un arbre"
-#: sequencer.c:1480 sequencer.c:1550
+#: sequencer.c:1447 sequencer.c:1565
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "no s'ha pogut llegir el missatge de comissió des de «%s»"
-#: sequencer.c:1516 builtin/am.c:1583 builtin/commit.c:1668 builtin/merge.c:883
-#: builtin/merge.c:908
+#: sequencer.c:1476 sequencer.c:1508
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr "identitat d'autor no vàlida: «%s»"
+
+#: sequencer.c:1482
+msgid "corrupt author: missing date information"
+msgstr "autor malmès: falta la informació de la data"
+
+#: sequencer.c:1521 builtin/am.c:1593 builtin/commit.c:1678
+#: builtin/merge.c:904 builtin/merge.c:929 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "s'ha produït un error en escriure l'objecte de comissió"
-#: sequencer.c:1577
+#: sequencer.c:1548 sequencer.c:4283 t/helper/test-fast-rebase.c:198
+#, c-format
+msgid "could not update %s"
+msgstr "no s'ha pogut actualitzar %s"
+
+#: sequencer.c:1597
#, c-format
msgid "could not parse commit %s"
msgstr "no s'ha pogut analitzar la comissió %s"
-#: sequencer.c:1582
+#: sequencer.c:1602
#, c-format
msgid "could not parse parent commit %s"
msgstr "no s'ha pogut analitzar la comissió pare %s"
-#: sequencer.c:1656 sequencer.c:1767
+#: sequencer.c:1685 sequencer.c:1796
#, c-format
msgid "unknown command: %d"
msgstr "ordre desconeguda: %d"
-#: sequencer.c:1714 sequencer.c:1739
+#: sequencer.c:1743 sequencer.c:1768
#, c-format
msgid "This is a combination of %d commits."
msgstr "Això és una combinació de %d comissions."
-#: sequencer.c:1724
+#: sequencer.c:1753
msgid "need a HEAD to fixup"
msgstr "cal un HEAD per reparar-ho"
-#: sequencer.c:1726 sequencer.c:3304
+#: sequencer.c:1755 sequencer.c:3372
msgid "could not read HEAD"
msgstr "no s'ha pogut llegir HEAD"
-#: sequencer.c:1728
+#: sequencer.c:1757
msgid "could not read HEAD's commit message"
msgstr "no s'ha pogut llegir el missatge de comissió de HEAD"
-#: sequencer.c:1734
+#: sequencer.c:1763
#, c-format
msgid "cannot write '%s'"
msgstr "no es pot escriure «%s»"
-#: sequencer.c:1741 git-rebase--preserve-merges.sh:496
+#: sequencer.c:1770 git-rebase--preserve-merges.sh:486
msgid "This is the 1st commit message:"
msgstr "Aquest és el 1r missatge de comissió:"
-#: sequencer.c:1749
+#: sequencer.c:1778
#, c-format
msgid "could not read commit message of %s"
msgstr "no s'ha pogut llegir el missatge de comissió: %s"
-#: sequencer.c:1756
+#: sequencer.c:1785
#, c-format
msgid "This is the commit message #%d:"
msgstr "Aquest és el missatge de comissió #%d:"
-#: sequencer.c:1762
+#: sequencer.c:1791
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "El missatge de comissió núm. #%d s'ometrà:"
-#: sequencer.c:1850
+#: sequencer.c:1879
msgid "your index file is unmerged."
msgstr "el vostre fitxer d'índex està sense fusionar."
-#: sequencer.c:1857
+#: sequencer.c:1886
msgid "cannot fixup root commit"
msgstr "no es pot arreglar la comissió arrel"
-#: sequencer.c:1876
+#: sequencer.c:1905
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "la comissió %s és una fusió però no s'ha donat cap opció -m."
-#: sequencer.c:1884 sequencer.c:1892
+#: sequencer.c:1913 sequencer.c:1921
#, c-format
msgid "commit %s does not have parent %d"
msgstr "la comissió %s no té pare %d"
-#: sequencer.c:1898
+#: sequencer.c:1927
#, c-format
msgid "cannot get commit message for %s"
msgstr "no es pot obtenir el missatge de comissió de %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1917
+#: sequencer.c:1946
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: no es pot analitzar la comissió pare %s"
-#: sequencer.c:1982
+#: sequencer.c:2011
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "no s'ha pogut canviar el nom «%s» a «%s»"
-#: sequencer.c:2037
+#: sequencer.c:2071
#, c-format
msgid "could not revert %s... %s"
msgstr "no s'ha pogut revertir %s... %s"
-#: sequencer.c:2038
+#: sequencer.c:2072
#, c-format
msgid "could not apply %s... %s"
msgstr "no s'ha pogut aplicar %s... %s"
-#: sequencer.c:2105
+#: sequencer.c:2092
+#, 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:2150
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: s'ha produït un error en llegir l'índex"
-#: sequencer.c:2112
+#: sequencer.c:2157
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: s'ha produït un error en actualitzar l'índex"
-#: sequencer.c:2189
+#: sequencer.c:2234
#, c-format
msgid "%s does not accept arguments: '%s'"
-msgstr "%s no accepta paràmetres: «%s»"
+msgstr "%s no accepta arguments: «%s»"
-#: sequencer.c:2198
+#: sequencer.c:2243
#, c-format
msgid "missing arguments for %s"
-msgstr "falten els arguments per %s"
+msgstr "falten els arguments per a %s"
-#: sequencer.c:2235
+#: sequencer.c:2274
#, c-format
-msgid "could not parse '%.*s'"
-msgstr "no s'ha pogut analitzar «%.*s»"
+msgid "could not parse '%s'"
+msgstr "no s'ha pogut analitzar «%s»"
-#: sequencer.c:2289
+#: sequencer.c:2335
#, c-format
msgid "invalid line %d: %.*s"
msgstr "línia no vàlida %d: %.*s"
-#: sequencer.c:2300
+#: sequencer.c:2346
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "no es pot «%s» sense una comissió prèvia"
-#: sequencer.c:2348 builtin/rebase.c:172 builtin/rebase.c:197
-#: builtin/rebase.c:223 builtin/rebase.c:248
-#, c-format
-msgid "could not read '%s'."
-msgstr "no s'ha pogut llegir «%s»."
-
-#: sequencer.c:2384
+#: sequencer.c:2432
msgid "cancelling a cherry picking in progress"
msgstr "s'està cancel·lant un «cherry pick» en curs"
-#: sequencer.c:2391
+#: sequencer.c:2441
msgid "cancelling a revert in progress"
msgstr "s'està cancel·lant la reversió en curs"
-#: sequencer.c:2435
+#: sequencer.c:2485
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "corregiu-ho usant «git rebase --edit-todo»."
-#: sequencer.c:2437
+#: sequencer.c:2487
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "full d'instruccions inusable: «%s»"
-#: sequencer.c:2442
+#: sequencer.c:2492
msgid "no commits parsed."
msgstr "no s'ha analitzat cap comissió."
-#: sequencer.c:2453
+#: sequencer.c:2503
msgid "cannot cherry-pick during a revert."
msgstr "no es pot fer «cherry pick» durant una reversió."
-#: sequencer.c:2455
+#: sequencer.c:2505
msgid "cannot revert during a cherry-pick."
msgstr "no es pot revertir durant un «cherry pick»."
-#: sequencer.c:2533
+#: sequencer.c:2583
#, c-format
msgid "invalid value for %s: %s"
msgstr "valor no vàlid per a %s: %s"
-#: sequencer.c:2630
+#: sequencer.c:2690
msgid "unusable squash-onto"
msgstr "«squash-onto» no usable"
-#: sequencer.c:2646
+#: sequencer.c:2710
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "full d'opcions mal format: «%s»"
-#: sequencer.c:2736 sequencer.c:4463
+#: sequencer.c:2803 sequencer.c:4636
msgid "empty commit set passed"
msgstr "conjunt de comissions buit passat"
-#: sequencer.c:2752
+#: sequencer.c:2820
msgid "revert is already in progress"
msgstr "una reversió ja està en curs"
-#: sequencer.c:2754
+#: sequencer.c:2822
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "intenteu «git revert (--continue | %s--abort | --quit)»"
-#: sequencer.c:2757
+#: sequencer.c:2825
msgid "cherry-pick is already in progress"
msgstr "un «cherry pick» ja està en curs"
-#: sequencer.c:2759
+#: sequencer.c:2827
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "intenteu «git cherry-pick (--continue | %s--abort | --quit)»"
-#: sequencer.c:2773
+#: sequencer.c:2841
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "no s'ha pogut crear el directori de seqüenciador «%s»"
-#: sequencer.c:2788
+#: sequencer.c:2856
msgid "could not lock HEAD"
msgstr "no s'ha pogut bloquejar HEAD"
-#: sequencer.c:2848 sequencer.c:4209
+#: sequencer.c:2916 sequencer.c:4371
msgid "no cherry-pick or revert in progress"
msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs"
-#: sequencer.c:2850 sequencer.c:2861
+#: sequencer.c:2918 sequencer.c:2929
msgid "cannot resolve HEAD"
msgstr "no es pot resoldre HEAD"
-#: sequencer.c:2852 sequencer.c:2896
+#: sequencer.c:2920 sequencer.c:2964
msgid "cannot abort from a branch yet to be born"
msgstr "no es pot avortar des d'una branca que encara ha de nàixer"
-#: sequencer.c:2882 builtin/grep.c:736
+#: sequencer.c:2950 builtin/grep.c:756
#, c-format
msgid "cannot open '%s'"
msgstr "no es pot obrir «%s»"
-#: sequencer.c:2884
+#: sequencer.c:2952
#, c-format
msgid "cannot read '%s': %s"
msgstr "no es pot llegir «%s»: %s"
-#: sequencer.c:2885
+#: sequencer.c:2953
msgid "unexpected end of file"
msgstr "final de fitxer inesperat"
-#: sequencer.c:2891
+#: sequencer.c:2959
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "el fitxer HEAD emmagatzemat abans de fer «cherry pick» «%s» és malmès"
-#: sequencer.c:2902
+#: sequencer.c:2970
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "Sembla que heu mogut HEAD sense rebobinar, comproveu-ho HEAD"
-#: sequencer.c:2943
+#: sequencer.c:3011
msgid "no revert in progress"
msgstr "no hi ha cap reversió en curs"
-#: sequencer.c:2951
+#: sequencer.c:3020
msgid "no cherry-pick in progress"
msgstr "ni hi ha cap «cherry pick» en curs"
-#: sequencer.c:2961
+#: sequencer.c:3030
msgid "failed to skip the commit"
msgstr "s'ha produït un error en ometre la comissió"
-#: sequencer.c:2968
+#: sequencer.c:3037
msgid "there is nothing to skip"
msgstr "no hi ha res a ometre"
-#: sequencer.c:2971
+#: sequencer.c:3040
#, c-format
msgid ""
"have you committed already?\n"
"try \"git %s --continue\""
-msgstr ""
+msgstr "heu fet ja una comissió?\n"
+"proveu «git %s --continue»"
-#: sequencer.c:3095 sequencer.c:4121
-#, c-format
-msgid "could not update %s"
-msgstr "no s'ha pogut actualitzar %s"
-
-#: sequencer.c:3134 sequencer.c:4101
+#: sequencer.c:3202 sequencer.c:4263
msgid "cannot read HEAD"
msgstr "no es pot llegir HEAD"
-#: sequencer.c:3151
+#: sequencer.c:3219
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "no s'ha pogut copiar «%s» a «%s»"
-#: sequencer.c:3159
+#: sequencer.c:3227
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -6797,22 +7438,27 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:3169
+#: sequencer.c:3237
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "No s'ha pogut aplicar %s... %.*s"
-#: sequencer.c:3176
+#: sequencer.c:3244
#, c-format
msgid "Could not merge %.*s"
msgstr "No s'ha pogut fusionar %.*s"
-#: sequencer.c:3190 sequencer.c:3194 builtin/difftool.c:641
+#: sequencer.c:3258 sequencer.c:3262 builtin/difftool.c:640
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "no s'ha pogut copiar «%s» a «%s»"
-#: sequencer.c:3221
+#: sequencer.c:3274
+#, c-format
+msgid "Executing: %s\n"
+msgstr "S'està executant: %s\n"
+
+#: sequencer.c:3289
#, c-format
msgid ""
"execution failed: %s\n"
@@ -6827,11 +7473,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3227
+#: sequencer.c:3295
msgid "and made changes to the index and/or the working tree\n"
msgstr "i ha fet canvis a l'índex i/o l'arbre de treball\n"
-#: sequencer.c:3233
+#: sequencer.c:3301
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -6847,108 +7493,126 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:3294
+#: sequencer.c:3362
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "nom d'etiqueta no permès: «%.*s»"
-#: sequencer.c:3348
+#: sequencer.c:3416
msgid "writing fake root commit"
msgstr "s'està escrivint una comissió arrel falsa"
-#: sequencer.c:3353
+#: sequencer.c:3421
msgid "writing squash-onto"
msgstr "s'està escrivint «squash-onto»"
-#: sequencer.c:3391 builtin/rebase.c:876 builtin/rebase.c:882
-#, c-format
-msgid "failed to find tree of %s"
-msgstr "s'ha produït un error en cercar l'arbre de %s"
-
-#: sequencer.c:3436
+#: sequencer.c:3505
#, c-format
msgid "could not resolve '%s'"
msgstr "no s'ha pogut resoldre «%s»"
-#: sequencer.c:3467
+#: sequencer.c:3538
msgid "cannot merge without a current revision"
msgstr "no es pot fusionar sense una revisió actual"
-#: sequencer.c:3489
+#: sequencer.c:3560
#, c-format
msgid "unable to parse '%.*s'"
msgstr "no s'ha pogut analitzar «%.*s»"
-#: sequencer.c:3498
+#: sequencer.c:3569
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "no hi ha res per fusionar «%.*s»"
-#: sequencer.c:3510
+#: sequencer.c:3581
+#, 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:3526
+#: sequencer.c:3597
#, c-format
msgid "could not get commit message of '%s'"
msgstr "no s'ha pogut llegir el missatge de comissió de «%s»"
-#: sequencer.c:3688
+#: sequencer.c:3780
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "no s'ha pogut fusionar «%.*s»"
-#: sequencer.c:3704
+#: sequencer.c:3796
msgid "merge: Unable to write new index file"
msgstr "fusió: no s'ha pogut escriure un fitxer d'índex nou"
-#: sequencer.c:3773 builtin/rebase.c:733
+#: sequencer.c:3870
+msgid "Cannot autostash"
+msgstr "no es pot fer un «stash» automàticament"
+
+#: sequencer.c:3873
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "Resposta de «stash» inesperada: «%s»"
+
+#: sequencer.c:3879
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "No s'ha pogut crear el directori per a «%s»"
+
+#: sequencer.c:3882
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "S'ha creat un «stash» automàticament: %s\n"
+
+#: sequencer.c:3886
+msgid "could not reset --hard"
+msgstr "no s'ha pogut fer reset --hard"
+
+#: sequencer.c:3911
#, c-format
msgid "Applied autostash.\n"
msgstr "S'ha aplicat el «stash» automàticament.\n"
-#: sequencer.c:3785
+#: sequencer.c:3923
#, c-format
msgid "cannot store %s"
msgstr "no es pot emmagatzemar %s"
-#: sequencer.c:3788 builtin/rebase.c:749 git-rebase--preserve-merges.sh:113
+#: sequencer.c:3926
#, 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'aplicació del «stash» automàtic ha resultat en conflictes.\n"
+"%s\n"
"Els vostres canvis estan segurs en el «stash».\n"
-"Podeu executar \"git stash pop\" o \"git stash drop\" en qualsevol moment.\n"
+"Podeu executar «git stash pop» o «git stash drop» en qualsevol moment.\n"
-#: sequencer.c:3849
-#, c-format
-msgid "could not checkout %s"
-msgstr "no es pot agafar %s"
+#: sequencer.c:3931
+msgid "Applying autostash resulted in conflicts."
+msgstr "L'aplicació del «stash» automàticament ha donat conflictes."
-#: sequencer.c:3863
-#, c-format
-msgid "%s: not a valid OID"
-msgstr "%s: no és un OID vàlid"
+#: sequencer.c:3932
+msgid "Autostash exists; creating a new stash entry."
+msgstr "El «stash» automàtic ja existeix; s'està creant una entrada «stash» nova."
-#: sequencer.c:3868 git-rebase--preserve-merges.sh:779
+#: sequencer.c:4025 git-rebase--preserve-merges.sh:769
msgid "could not detach HEAD"
msgstr "no s'ha pogut separar HEAD"
-#: sequencer.c:3883
+#: sequencer.c:4040
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Aturat a HEAD\n"
-#: sequencer.c:3885
+#: sequencer.c:4042
#, c-format
msgid "Stopped at %s\n"
msgstr "Aturat a %s\n"
-#: sequencer.c:3893
-#, c-format
+#: sequencer.c:4050
+#, fuzzy, c-format
msgid ""
"Could not execute the todo command\n"
"\n"
@@ -6959,49 +7623,62 @@
" 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:3979
+#: sequencer.c:4096
+#, fuzzy, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "S'estan reubicant (%d/%d)%s"
+
+#: sequencer.c:4141
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Aturat a %s... %.*s\n"
-#: sequencer.c:4050
+#: sequencer.c:4212
#, c-format
msgid "unknown command %d"
msgstr "ordre %d desconeguda"
-#: sequencer.c:4109
+#: sequencer.c:4271
msgid "could not read orig-head"
msgstr "no s'ha pogut llegir orig-head"
-#: sequencer.c:4114
+#: sequencer.c:4276
msgid "could not read 'onto'"
-msgstr "no s'ha pogut llegir 'onto'"
+msgstr "no s'ha pogut llegir «onto»"
-#: sequencer.c:4128
+#: sequencer.c:4290
#, c-format
msgid "could not update HEAD to %s"
msgstr "no s'ha pogut actualitzar HEAD a %s"
-#: sequencer.c:4221
+#: sequencer.c:4350
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "S'ha fet «rebase» i actualitzat %s amb èxit.\n"
+
+#: sequencer.c:4383
msgid "cannot rebase: You have unstaged changes."
msgstr "No es pot fer «rebase»: teniu canvis «unstaged»."
-#: sequencer.c:4230
+#: sequencer.c:4392
msgid "cannot amend non-existing commit"
msgstr "no es pot esmenar una comissió no existent"
-#: sequencer.c:4232
+#: sequencer.c:4394
#, c-format
msgid "invalid file: '%s'"
msgstr "fitxer no vàlid: «%s»"
-#: sequencer.c:4234
+#: sequencer.c:4396
#, c-format
msgid "invalid contents: '%s'"
msgstr "contingut no vàlid: «%s»"
-#: sequencer.c:4237
+#: sequencer.c:4399
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -7011,495 +7688,489 @@
"Teniu canvis no comesos en el vostre arbre de treball. \n"
"Cometeu-los primer i després executeu «git rebase --continue» de nou."
-#: sequencer.c:4273 sequencer.c:4312
-#, c-format
+#: sequencer.c:4435 sequencer.c:4474
+#, c-format
msgid "could not write file: '%s'"
msgstr "no s'ha pogut escriure el fitxer: «%s»"
-#: sequencer.c:4327
+#: sequencer.c:4490
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD"
-#: sequencer.c:4334
+#: sequencer.c:4497
msgid "could not commit staged changes."
msgstr "no s'han pogut cometre els canvis «staged»."
-#: sequencer.c:4440
+#: sequencer.c:4613
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: no es pot fer «cherry pick» a %s"
-#: sequencer.c:4444
+#: sequencer.c:4617
#, c-format
msgid "%s: bad revision"
msgstr "%s: revisió incorrecta"
-#: sequencer.c:4479
+#: sequencer.c:4652
msgid "can't revert as initial commit"
msgstr "no es pot revertir com a comissió inicial"
-#: sequencer.c:4952
+#: sequencer.c:5129
msgid "make_script: unhandled options"
msgstr "make_script: opcions no gestionades"
-#: sequencer.c:4955
+#: sequencer.c:5132
msgid "make_script: error preparing revisions"
msgstr "make_script: s'ha produït un error en preparar les revisions"
-#: sequencer.c:5113
-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:5226 sequencer.c:5243
+#: sequencer.c:5374 sequencer.c:5391
msgid "nothing to do"
msgstr "res a fer"
-#: sequencer.c:5257
+#: sequencer.c:5410
msgid "could not skip unnecessary pick commands"
msgstr "no s'han pogut ometre les ordres «picks» no necessàries"
-#: sequencer.c:5351
+#: sequencer.c:5504
msgid "the script was already rearranged."
msgstr "l'script ja estava endreçat."
-#: setup.c:124
-#, 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:174
+#: 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: no hi ha tal camí en l'arbre de treball.\n"
-"Useu «git <ordre> -- <camí>...» per a especificar camins que no existeixin "
-"localment."
+"Useu «git <ordre> -- <camí>...» per a especificar camins que no existeixin localment."
-#: setup.c:187
+#: 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 "
-"treball.\n"
+"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:236
+#: 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:255
+#: 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:391
+#: 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:395
+#: 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:541
+#: 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:549
+#: setup.c:669
msgid "unknown repository extensions found:"
msgstr "s'han trobat extensions de dipòsit desconegudes:"
-#: setup.c:568
+#: 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:570
+#: 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:572
+#: setup.c:704
#, c-format
msgid "error reading %s"
msgstr "error en llegir %s"
-#: setup.c:574
+#: setup.c:706
#, c-format
msgid "invalid gitfile format: %s"
msgstr "format gitfile no vàlid: %s"
-#: setup.c:576
+#: setup.c:708
#, c-format
msgid "no path in gitfile: %s"
msgstr "sense camí al gitfile: %s"
-#: setup.c:578
+#: setup.c:710
#, c-format
msgid "not a git repository: %s"
msgstr "no és un dipòsit de git: %s"
-#: setup.c:677
+#: setup.c:812
#, c-format
msgid "'$%s' too big"
msgstr "«$%s» massa gran"
-#: setup.c:691
+#: setup.c:826
#, c-format
msgid "not a git repository: '%s'"
msgstr "no és un dipòsit de git: «%s»"
-#: setup.c:720 setup.c:722 setup.c:753
+#: setup.c: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:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838
+#: 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:852
+#: 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:1090
+#: setup.c:1225
msgid "Unable to read current working directory"
msgstr "No s'ha pogut llegir el directori de treball actual"
-#: setup.c:1099 setup.c:1105
+#: setup.c:1234 setup.c:1240
#, c-format
msgid "cannot change to '%s'"
msgstr "no es pot canviar a «%s»"
-#: setup.c:1110
+#: 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:1116
+#: 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 é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)."
+"S'atura a la frontera de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM no està establert)."
-#: setup.c:1227
+#: 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 ""
-"hi ha un problema amb el valor de mode de fitxer core.sharedRepository "
-"(0%.3o).\n"
-"El propietari dels fitxers sempre ha de tenir permisos de lectura i "
-"escriptura."
+"hi ha un problema amb el valor de mode de fitxer core.sharedRepository (0%.3o).\n"
+"El propietari dels fitxers sempre ha de tenir permisos de lectura i escriptura."
-#: setup.c:1271
+#: 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:1286
+#: setup.c:1424
msgid "fork failed"
msgstr "el «fork» ha fallat"
-#: setup.c:1291
+#: setup.c:1429
msgid "setsid failed"
-msgstr "l'«stash» ha fallat"
+msgstr "«setsid» ha fallat"
-#: sha1-file.c:452
+#: sha1-file.c:480
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
-msgstr "no existeix el directori d'objecte %s; comproveu .git/objects/info/alternates"
+msgstr ""
+"no existeix el directori d'objecte %s; comproveu "
+".git/objects/info/alternates"
-#: sha1-file.c:503
+#: sha1-file.c:531
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr "no s'ha pogut normalitzar el camí a l'objecte alternatiu: %s"
-#: sha1-file.c:575
-#, c-format
+#: sha1-file.c:603
+#, 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:582
+#: sha1-file.c:610
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "no s'ha pogut normalitzar el directori de l'objecte: %s"
-#: sha1-file.c:625
+#: sha1-file.c:653
#, 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:643
+#: sha1-file.c:671
msgid "unable to read alternates file"
msgstr "no es pot llegir el fitxer «alternates»"
-#: sha1-file.c:650
+#: sha1-file.c:678
msgid "unable to move new alternates file into place"
msgstr "no s'ha pogut moure el nou fitxer «alternates» al lloc"
-#: sha1-file.c:685
+#: sha1-file.c:713
#, c-format
msgid "path '%s' does not exist"
msgstr "el camí «%s» no existeix"
-#: sha1-file.c:711
+#: sha1-file.c:734
#, 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:717
+#: sha1-file.c:740
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "el dipòsit de referència «%s» no és un dipòsit local."
-#: sha1-file.c:723
+#: sha1-file.c:746
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "el dipòsit de referència «%s» és superficial"
-#: sha1-file.c:731
+#: sha1-file.c:754
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "el dipòsit de referència «%s» és empeltat"
-#: sha1-file.c:791
+#: sha1-file.c:814
#, 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
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr ""
+"línia no vàlida quan s'analitzaven les referències de l'«alternate»: %s"
#: sha1-file.c:964
+#, fuzzy, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr "intentar mmap %<PRIuMAX> més del límit <PRIuMAX>"
+
+#: sha1-file.c:985
msgid "mmap failed"
msgstr "mmap ha fallat"
-#: sha1-file.c:1128
+#: sha1-file.c:1149
#, c-format
msgid "object file %s is empty"
msgstr "el tipus d'objecte %s és buit"
-#: sha1-file.c:1252 sha1-file.c:2392
-#, fuzzy, c-format
+#: sha1-file.c:1284 sha1-file.c:2477
+#, c-format
msgid "corrupt loose object '%s'"
-msgstr "no s'ha pogut analitzar l'objecte «%s»"
+msgstr "objecte solt corrupte «%s»"
-#: sha1-file.c:1254 sha1-file.c:2396
-#, fuzzy, c-format
+#: sha1-file.c:1286 sha1-file.c:2481
+#, 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:1296
+#: sha1-file.c:1328
msgid "invalid object type"
msgstr "tipus d'objecte és incorrecte"
-#: sha1-file.c:1380
+#: sha1-file.c:1412
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr "no s'ha pogut desempaquetar la capçalera %s amb --allow-unknown-type"
-#: sha1-file.c:1383
+#: sha1-file.c:1415
#, c-format
msgid "unable to unpack %s header"
msgstr "no s'ha pogut desempaquetar la capçalera %s"
-#: sha1-file.c:1389
+#: sha1-file.c:1421
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr "no s'ha pogut analitzar la capçalera %s amb --allow-unknown-type"
-#: sha1-file.c:1392
+#: sha1-file.c:1424
#, c-format
msgid "unable to parse %s header"
msgstr "no s'ha pogut analitzar la capçalera %s"
-#: sha1-file.c:1584
+#: sha1-file.c:1651
#, c-format
msgid "failed to read object %s"
msgstr "s'ha produït un error en llegir l'objecte %s"
-#: sha1-file.c:1588
-#, fuzzy, c-format
+#: sha1-file.c:1655
+#, 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:1592
-#, fuzzy, c-format
+#: sha1-file.c:1659
+#, 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:1596
-#, fuzzy, c-format
+#: sha1-file.c:1663
+#, 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:1699
+#: sha1-file.c:1768
#, c-format
msgid "unable to write file %s"
msgstr "no s'ha pogut escriure al fitxer %s"
-#: sha1-file.c:1706
-#, fuzzy, c-format
+#: sha1-file.c:1775
+#, 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:1713
+#: sha1-file.c:1782
msgid "file write error"
msgstr "s'ha produït un error en escriure al fitxer"
-#: sha1-file.c:1732
-#, fuzzy
+#: sha1-file.c:1802
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:1797
+#: sha1-file.c:1867
#, 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:1799
+#: sha1-file.c:1869
msgid "unable to create temporary file"
msgstr "no s'ha pogut crear un fitxer temporal"
-#: sha1-file.c:1823
-#, fuzzy
+#: sha1-file.c:1893
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:1829
-#, fuzzy, c-format
+#: sha1-file.c:1899
+#, 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:1833
-#, fuzzy, c-format
+#: sha1-file.c:1903
+#, 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:1837
+#: sha1-file.c:1907
#, 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:1847 builtin/pack-objects.c:925
-#, fuzzy, c-format
+#: sha1-file.c:1917 builtin/pack-objects.c:1086
+#, c-format
msgid "failed utime() on %s"
-msgstr "s'ha produït un error en obrir «%s»"
+msgstr "ha fallat utime() a %s"
-#: sha1-file.c:1922
-#, fuzzy, c-format
+#: sha1-file.c:1994
+#, c-format
msgid "cannot read object for %s"
-msgstr "no es pot llegir l'objecte %s"
+msgstr "no es pot llegir l'objecte per a %s"
-#: sha1-file.c:1962
-#, fuzzy
+#: sha1-file.c:2045
msgid "corrupt commit"
-msgstr "autor corregit de la comissió"
+msgstr "comissió corrupta"
-#: sha1-file.c:1970
-#, fuzzy
+#: sha1-file.c:2053
msgid "corrupt tag"
-msgstr "informa de les etiquetes"
+msgstr "etiqueta corrupta"
-#: sha1-file.c:2069
-#, fuzzy, c-format
+#: sha1-file.c:2153
+#, c-format
msgid "read error while indexing %s"
-msgstr "error en llegir %s"
+msgstr "error de lectura mentre s'indexava %s"
-#: sha1-file.c:2072
-#, fuzzy, c-format
+#: sha1-file.c:2156
+#, c-format
msgid "short read while indexing %s"
-msgstr "no es pot llegir l'índex"
+msgstr "lectura curta mentre s'indexa %s"
-#: sha1-file.c:2145 sha1-file.c:2154
-#, fuzzy, c-format
+#: sha1-file.c:2229 sha1-file.c:2239
+#, c-format
msgid "%s: failed to insert into database"
-msgstr "gpg ha fallat en signar les dades"
+msgstr "%s: no s'han pogut inserir a la base de dades"
-#: sha1-file.c:2160
-#, fuzzy, c-format
+#: sha1-file.c:2245
+#, c-format
msgid "%s: unsupported file type"
-msgstr "versió d'índex no compatible %s"
+msgstr "%s: tipus de fitxer no suportat"
-#: sha1-file.c:2184
-#, fuzzy, c-format
+#: sha1-file.c:2269
+#, c-format
msgid "%s is not a valid object"
-msgstr "«%s» no és una terme vàlid"
+msgstr "%s no és un objecte vàlid"
-#: sha1-file.c:2186
-#, fuzzy, c-format
+#: sha1-file.c:2271
+#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s no és un objecte de «%s» vàlid"
-#: sha1-file.c:2213 builtin/index-pack.c:155
+#: sha1-file.c:2298 builtin/index-pack.c:192
#, c-format
msgid "unable to open %s"
msgstr "no s'ha pogut obrir %s"
-#: sha1-file.c:2403 sha1-file.c:2455
+#: sha1-file.c:2488 sha1-file.c:2541
#, c-format
msgid "hash mismatch for %s (expected %s)"
msgstr "no coincideix la suma per a %s (s'esperava %s)"
-#: sha1-file.c:2427
+#: sha1-file.c:2512
#, c-format
msgid "unable to mmap %s"
msgstr "no s'ha pogut fer «mmap» %s"
-#: sha1-file.c:2432
+#: sha1-file.c:2517
#, c-format
msgid "unable to unpack header of %s"
msgstr "no s'ha pogut desempaquetar la capçalera de %s"
-#: sha1-file.c:2438
+#: sha1-file.c:2523
#, c-format
msgid "unable to parse header of %s"
msgstr "no s'ha pogut analitzar la capçalera de %s"
-#: sha1-file.c:2449
+#: sha1-file.c:2534
#, c-format
msgid "unable to unpack contents of %s"
msgstr "no s'han pogut desempaquetar els continguts de %s"
-#: sha1-name.c:487
+#: sha1-name.c:486
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "l'SHA1 %s curt és ambigu"
-#: sha1-name.c:498
+#: sha1-name.c:497
msgid "The candidates are:"
msgstr "Els candidats són:"
-#: sha1-name.c:797
+#: 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"
@@ -7523,44 +8194,111 @@
"suprimiu-les. Desactiveu aquest missatge executant\n"
"«git config advice.objectNameWarning false»"
+#: sha1-name.c:916
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "registre per a «%.*s» només retorna a %s"
+
+#: sha1-name.c:924
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "registre per a «%.*s» només té %d entrades"
+
+#: 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:822
+#: strbuf.c:848
#, c-format
msgid "%u.%2.2u GiB"
msgstr "%u.%2.2u GiB"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:824
+#: 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:832
+#: strbuf.c:858
#, c-format
msgid "%u.%2.2u MiB"
msgstr "%u.%2.2u MiB"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:834
+#: 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:841
+#: strbuf.c:867
#, c-format
msgid "%u.%2.2u KiB"
msgstr "%u.%2.2u KiB"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:843
+#: 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:849
+#: strbuf.c:875
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
@@ -7568,18 +8306,50 @@
msgstr[1] "%u bytes"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:851
+#: 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:1149
+#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719
+#: builtin/rebase.c:864
+#, 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"
msgstr ""
@@ -7610,56 +8380,128 @@
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "L'especificació «%s» és en el submòdul «%.*s»"
-#: submodule.c:910
+#: submodule.c:434
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "argument incorrecte --ignore-submodules: %s"
+
+#: 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:2016
+#: 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
+#, 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
-#, c-format
-msgid "Could not access submodule '%s'"
-msgstr "no s'ha pogut accedir al submòdul «%s»"
+#: submodule.c:1167
+#, fuzzy, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "Subjecting submodule '%s'"
-#: submodule.c:1651
+#: 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: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:1907
+#: 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:1880
+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
+#: submodule.c:1974
#, c-format
msgid "Submodule '%s' could not be updated."
-msgstr "No s'ha pogut actualitzar el submòdul «%s»"
+msgstr "No s'ha pogut actualitzar el submòdul «%s»."
-#: submodule.c:2027
+#: submodule.c:2042
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
-msgstr ""
+msgstr "submodule git dir «%s» està dins git dir «%.*s»"
-#: submodule.c:2048
+#: submodule.c:2063
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -7667,17 +8509,17 @@
"no està admès relocate_gitdir per al submòdul «%s» amb més d'un arbre de "
"treball"
-#: submodule.c:2060 submodule.c:2119
+#: submodule.c: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:2064
+#: submodule.c:2079
#, c-format
msgid "refusing to move '%s' into an existing git dir"
-msgstr ""
+msgstr "s'ha refusat moure «%s» a un directori git existent"
-#: submodule.c:2071
+#: submodule.c:2086
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -7688,145 +8530,320 @@
"«%s» a\n"
"«%s»\n"
-#: submodule.c:2154
-#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr "s'ha produït un error en cercar recursivament al camí de submòdul «%s»"
-
-#: submodule.c:2198
+#: submodule.c:2214
msgid "could not start ls-files in .."
msgstr "no s'ha pogut iniciar ls-files a .."
-#: submodule.c:2237
+#: 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:236
-#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "s'està ignorant el nom de submòdul sospitòs %s"
-
-#: submodule-config.c:303
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "no es permeten els valors negatius a submodule.fetchjobs"
-
-#: submodule-config.c:401
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr ""
-
-#: submodule-config.c:498
-#, c-format
-msgid "invalid value for %s"
-msgstr "valor no vàlid per a %s"
-
-#: submodule-config.c:769
-#, 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:299 builtin/remote.c:324
#, 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:665
+#: 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-helper.c:62 transport-helper.c:91
+msgid "full write to remote helper failed"
+msgstr "l'escriptura completa a l'ajudant remot ha fallat"
+
+#: transport-helper.c:145
+#, c-format
+msgid "unable to find remote helper for '%s'"
+msgstr "no s'ha pogut trobar l'ajudant remot per a «%s»"
+
+#: transport-helper.c:161 transport-helper.c:575
+#, fuzzy
+msgid "can't dup helper output fd"
+msgstr "no es pot duplicar la sortida de l'ajudant «fd»"
+
+#: 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:220
+#, fuzzy
+msgid "this remote helper should implement refspec capability"
+msgstr "aquest ajudant remot ha d'implementar la capacitat de refspec"
+
+#: transport-helper.c:287 transport-helper.c:429
+#, fuzzy, c-format
+msgid "%s unexpectedly said: '%s'"
+msgstr "deien inesperadament \"%s\""
+
+#: transport-helper.c:417
+#, c-format
+msgid "%s also locked %s"
+msgstr "%s també està bloquejat %s"
+
+#: transport-helper.c:497
+msgid "couldn't run fast-import"
+msgstr "no s'ha pogut executar «fast-import»"
+
+#: transport-helper.c:520
+#, fuzzy
+msgid "error while running fast-import"
+msgstr "error en executar la importació ràpida"
+
+#: transport-helper.c:549 transport-helper.c:1236
+#, c-format
+msgid "could not read ref %s"
+msgstr "no s'ha pogut llegir la referència %s"
+
+#: transport-helper.c:594
+#, fuzzy, c-format
+msgid "unknown response to connect: %s"
+msgstr "resposta desconeguda per connectar els percentatges"
+
+#: transport-helper.c:616
+#, fuzzy
+msgid "setting remote service path not supported by protocol"
+msgstr "el protocol no permet establir el camí del servei remot"
+
+#: transport-helper.c:618
+#, fuzzy
+msgid "invalid remote service path"
+msgstr "el camí del servei remot no és vàlid"
+
+#: transport-helper.c:661 transport.c:1446
+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
+#, fuzzy
+msgid "'option' without a matching 'ok/error' directive"
+msgstr "'option' sense una directiva 'ok/error' coincident"
+
+#: transport-helper.c:788
+#, fuzzy, c-format
+msgid "expected ok/error, helper said '%s'"
+msgstr "s'esperava un ajudant d'error/OK ha dit \"%s\""
+
+#: transport-helper.c:845
+#, fuzzy, c-format
+msgid "helper reported unexpected status of %s"
+msgstr "l'ajudant ha informat d'un estat inesperat dels percentatges"
+
+#: transport-helper.c:928
+#, fuzzy, c-format
+msgid "helper %s does not support dry-run"
+msgstr "els ajudants no donen suport a l'execució seca"
+
+#: transport-helper.c:931
+#, fuzzy, c-format
+msgid "helper %s does not support --signed"
+msgstr "els ajudants per cents no són compatibles --signed"
+
+#: transport-helper.c:934
+#, fuzzy, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr "l'ajudant per cents no admet --signed=if-asked"
+
+#: transport-helper.c:939
+#, fuzzy, c-format
+msgid "helper %s does not support --atomic"
+msgstr "els ajudants no admeten --atomic"
+
+#: transport-helper.c:943
+#, fuzzy, c-format
+msgid "helper %s does not support --%s"
+msgstr "els ajudants per cents no són compatibles --signed"
+
+#: transport-helper.c:950
+#, fuzzy, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr "els ajudants no donen suport a «push-option»"
+
+#: transport-helper.c:1050
+#, 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:1055
+#, fuzzy, c-format
+msgid "helper %s does not support 'force'"
+msgstr "els ajudants no donen suport a «force»"
+
+#: transport-helper.c:1102
+#, fuzzy
+msgid "couldn't run fast-export"
+msgstr "no s'ha pogut executar «fast-export»"
+
+#: transport-helper.c:1107
+#, fuzzy
+msgid "error while running fast-export"
+msgstr "error en executar l'exportació ràpida"
+
+#: transport-helper.c:1132
+#, fuzzy, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\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:1213
+#, fuzzy, c-format
+msgid "unsupported object format '%s'"
+msgstr "objecte mal format a «%s»"
+
+#: transport-helper.c:1222
+#, fuzzy, c-format
+msgid "malformed response in ref list: %s"
+msgstr "resposta mal formada en la llista de referències"
+
+#: transport-helper.c:1374
+#, fuzzy, c-format
+msgid "read(%s) failed"
+msgstr "ha fallat read(%)"
+
+#: transport-helper.c:1401
+#, fuzzy, c-format
+msgid "write(%s) failed"
+msgstr "ha fallat write(%)"
+
+#: transport-helper.c:1450
+#, fuzzy, c-format
+msgid "%s thread failed"
+msgstr "ha fallat el fil per cents"
+
+#: transport-helper.c:1454
+#, fuzzy, c-format
+msgid "%s thread failed to join: %s"
+msgstr "el fil per cents no s'ha pogut unir als percentatges"
+
+#: transport-helper.c:1473 transport-helper.c:1477
+#, c-format
+msgid "can't start thread for copying data: %s"
+msgstr "no es pot iniciar el fil per copiar les dades: %s"
+
+#: transport-helper.c:1514
+#, c-format
+msgid "%s process failed to wait"
+msgstr "el procés %s no ha pogut esperar"
+
+#: transport-helper.c:1518
+#, c-format
+msgid "%s process failed"
+msgstr "el procés %s ha fallat"
+
+#: transport-helper.c:1536 transport-helper.c:1545
+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
+#, c-format
msgid "could not read bundle '%s'"
-msgstr "no s'ha pogut llegir el fitxer «%s»"
+msgstr "no s'ha pogut llegir el paquet «%s»"
-#: transport.c:214
+#: transport.c:220
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "transport: opció de profunditat no vàlida «%s»"
-#: transport.c:266
+#: transport.c:269
+#, fuzzy
msgid "see protocol.version in 'git help config' for more details"
-msgstr ""
+msgstr "vegeu protocol.version a «git help config» per a més detalls"
-#: transport.c:267
+#: transport.c:270
+#, fuzzy
msgid "server options require protocol version 2 or later"
-msgstr ""
+msgstr "les opcions del servidor requereixen el protocol versió 2 o posterior"
-#: transport.c:632
+#: transport.c:727
#, fuzzy
msgid "could not parse transport.color.* config"
-msgstr "no s'ha pogut analitzar l'script d'autor"
+msgstr "no s'ha pogut analitzar la configuració de transport.color.*"
-#: transport.c:705
+#: transport.c:802
+#, fuzzy
msgid "support for protocol v2 not implemented yet"
-msgstr ""
+msgstr "encara no s'ha implementat la implementació del protocol v2"
-#: transport.c:831
+#: transport.c:936
#, fuzzy, c-format
msgid "unknown value for config '%s': %s"
-msgstr "valor desconegut «%s» per a la clau «%s»"
+msgstr "valor desconegut per config «%s»%s"
-#: transport.c:897
+#: transport.c:1002
#, c-format
msgid "transport '%s' not allowed"
msgstr "no es permet el transport «%s»"
-#: transport.c:949
+#: transport.c:1055
+#, fuzzy
msgid "git-over-rsync is no longer supported"
-msgstr ""
+msgstr "git-over-rsync ja no és compatible"
-#: transport.c:1044
+#: transport.c:1157
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -7835,7 +8852,7 @@
"Els camins de submòdul següents contenen canvis que no\n"
"es poden trobar en cap remot:\n"
-#: transport.c:1048
+#: transport.c:1161
#, c-format
msgid ""
"\n"
@@ -7861,254 +8878,68 @@
"\n"
"per a pujar-los a un remot.\n"
-#: transport.c:1056
+#: transport.c:1169
msgid "Aborting."
msgstr "S'està avortant."
-#: transport.c:1201
+#: transport.c:1315
#, fuzzy
msgid "failed to push all needed submodules"
-msgstr "s'ha produït un error en cercar recursivament al submòdul «%s»"
+msgstr "no s'ha pogut prémer tots els submòduls necessaris"
-#: transport.c:1345 transport-helper.c:656
-msgid "operation not supported by protocol"
-msgstr "opció no admesa pel protocol"
-
-#: transport-helper.c:61 transport-helper.c:90
-#, fuzzy
-msgid "full write to remote helper failed"
-msgstr "imprimeix l'estat des de l'ajudant remot"
-
-#: transport-helper.c:144
-#, c-format
-msgid "unable to find remote helper for '%s'"
-msgstr "no s'ha pogut trobar l'ajudant remot per a «%s»"
-
-#: transport-helper.c:160 transport-helper.c:570
-msgid "can't dup helper output fd"
-msgstr ""
-
-#: transport-helper.c:211
-#, c-format
-msgid ""
-"unknown mandatory capability %s; this remote helper probably needs newer "
-"version of Git"
-msgstr ""
-
-#: transport-helper.c:217
-msgid "this remote helper should implement refspec capability"
-msgstr ""
-
-#: transport-helper.c:284 transport-helper.c:424
-#, fuzzy, c-format
-msgid "%s unexpectedly said: '%s'"
-msgstr "blob esperat per a %s «%s»"
-
-#: transport-helper.c:413
-#, c-format
-msgid "%s also locked %s"
-msgstr "%s també ha bloquejat %s"
-
-#: transport-helper.c:492
-msgid "couldn't run fast-import"
-msgstr "no s'ha pogut executar «fast-import»"
-
-#: transport-helper.c:515
-#, fuzzy
-msgid "error while running fast-import"
-msgstr "error en tancar el fitxer de paquet"
-
-#: transport-helper.c:544 transport-helper.c:1133
-#, c-format
-msgid "could not read ref %s"
-msgstr "no s'ha pogut llegir la referència %s"
-
-#: transport-helper.c:589
-#, fuzzy, c-format
-msgid "unknown response to connect: %s"
-msgstr "opció desconeguda: %s\n"
-
-#: transport-helper.c:611
-msgid "setting remote service path not supported by protocol"
-msgstr ""
-
-#: transport-helper.c:613
-#, fuzzy
-msgid "invalid remote service path"
-msgstr "referència no vàlida: %s"
-
-#: transport-helper.c:659
-#, c-format
-msgid "can't connect to subservice %s"
-msgstr "no es pot connectar al subservei %s"
-
-#: transport-helper.c:735
-#, fuzzy, c-format
-msgid "expected ok/error, helper said '%s'"
-msgstr "blob esperat per a %s «%s»"
-
-#: transport-helper.c:788
-#, fuzzy, c-format
-msgid "helper reported unexpected status of %s"
-msgstr "ls-tree ha retornat un codi de retorn %d no esperat"
-
-#: transport-helper.c:849
-#, fuzzy, c-format
-msgid "helper %s does not support dry-run"
-msgstr "El servidor no admet --deepen"
-
-#: transport-helper.c:852
-#, fuzzy, c-format
-msgid "helper %s does not support --signed"
-msgstr "El servidor no admet --shallow-since"
-
-#: transport-helper.c:855
-#, fuzzy, c-format
-msgid "helper %s does not support --signed=if-asked"
-msgstr "el destí receptor no admet pujar --signed"
-
-#: transport-helper.c:860
-#, fuzzy, c-format
-msgid "helper %s does not support --atomic"
-msgstr "El servidor no admet --shallow-since"
-
-#: transport-helper.c:866
-#, fuzzy, c-format
-msgid "helper %s does not support 'push-option'"
-msgstr "el destí receptor no admet opcions de pujada"
-
-#: transport-helper.c:964
-msgid "remote-helper doesn't support push; refspec needed"
-msgstr ""
-
-#: transport-helper.c:969
-#, fuzzy, c-format
-msgid "helper %s does not support 'force'"
-msgstr "El servidor no admet --deepen"
-
-#: transport-helper.c:1016
-#, fuzzy
-msgid "couldn't run fast-export"
-msgstr "no s'ha pogut executar «stash»."
-
-#: transport-helper.c:1021
-#, fuzzy
-msgid "error while running fast-export"
-msgstr "error en tancar el fitxer de paquet"
-
-#: transport-helper.c:1046
-#, c-format
-msgid ""
-"No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch such as 'master'.\n"
-msgstr ""
-
-#: transport-helper.c:1119
-#, fuzzy, c-format
-msgid "malformed response in ref list: %s"
-msgstr "full d'opcions mal format: «%s»"
-
-#: transport-helper.c:1271
-#, fuzzy, c-format
-msgid "read(%s) failed"
-msgstr "%s ha fallat"
-
-#: transport-helper.c:1298
-#, fuzzy, c-format
-msgid "write(%s) failed"
-msgstr "%s ha fallat"
-
-#: transport-helper.c:1347
-#, fuzzy, c-format
-msgid "%s thread failed"
-msgstr "%s ha fallat"
-
-#: transport-helper.c:1351
-#, fuzzy, c-format
-msgid "%s thread failed to join: %s"
-msgstr "s'ha produït un error en obrir «%s»"
-
-#: transport-helper.c:1370 transport-helper.c:1374
-#, c-format
-msgid "can't start thread for copying data: %s"
-msgstr ""
-
-#: transport-helper.c:1411
-#, c-format
-msgid "%s process failed to wait"
-msgstr ""
-
-#: transport-helper.c:1415
-#, fuzzy, c-format
-msgid "%s process failed"
-msgstr "%s ha fallat"
-
-#: transport-helper.c:1433 transport-helper.c:1442
-msgid "can't start thread for copying data"
-msgstr ""
-
-#: tree-walk.c:33
+#: 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:48
-#, c-format
-msgid "filename in tree entry contains backslash: '%s'"
-msgstr ""
-
-#: tree-walk.c:124
+#: tree-walk.c:117
msgid "too-short tree file"
msgstr "fitxer d'arbre massa curt"
-#: unpack-trees.c:110
+#: 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 ""
-"Els vostres canvis locals als fitxers següents se sobreescriurien per "
-"agafar:\n"
+"Els vostres canvis locals als fitxers següents se sobreescriurien per agafar:\n"
"%%sCometeu els vostres canvis o feu «stash» abans de canviar de branca."
-#: unpack-trees.c:112
+#: unpack-trees.c:115
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%s"
msgstr ""
-"Els vostres canvis locals als fitxers següents se sobreescriurien per "
-"agafar:\n"
+"Els vostres canvis locals als fitxers següents se sobreescriurien per agafar:\n"
"%%s"
-#: unpack-trees.c:115
+#: 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 ""
-"Els vostres canvis locals als fitxers següents se sobreescriurien per "
-"fusionar:\n"
+"Els vostres canvis locals als fitxers següents se sobreescriurien per fusionar:\n"
"%%sCometeu els vostres canvis o feu «stash» abans de fusionar."
-#: unpack-trees.c:117
+#: unpack-trees.c:120
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"%%s"
msgstr ""
-"Els vostres canvis locals als fitxers següents se sobreescriurien per "
-"fusionar:\n"
+"Els vostres canvis locals als fitxers següents se sobreescriurien per fusionar:\n"
"%%s"
-#: unpack-trees.c:120
+#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -8117,7 +8948,7 @@
"Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n"
"%%sCometeu els vostres canvis o feu «stash» abans de %s."
-#: unpack-trees.c:122
+#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -8126,7 +8957,7 @@
"Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n"
"%%s"
-#: unpack-trees.c:127
+#: unpack-trees.c:130
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -8135,56 +8966,52 @@
"En actualitzar els directoris següents perdria fitxers no seguits en el:\n"
"%s"
-#: unpack-trees.c:131
+#: 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 ""
-"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
-"agafar:\n"
+"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per agafar:\n"
"%%sMoveu-los o elimineu-los abans de canviar de branca."
-#: unpack-trees.c:133
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
-msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
-"agafar:\n"
-"%%s"
-
#: unpack-trees.c:136
#, c-format
msgid ""
-"The following untracked working tree files would be removed by merge:\n"
-"%%sPlease move or remove them before you merge."
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
-"fusionar:\n"
-"%%sMoveu-los o elimineu-los abans de fusionar."
+"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per agafar:\n"
+"%%s"
-#: unpack-trees.c:138
+#: unpack-trees.c:139
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
-"%%s"
+"%%sPlease move or remove them before you merge."
msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
-"fusionar:\n"
-"%%s"
+"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per fusionar:\n"
+"%%sMoveu-los o elimineu-los abans de fusionar."
#: unpack-trees.c:141
#, c-format
msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per fusionar:\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 ""
"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n"
"%%sMoveu-los o elimineu-los abans de %s."
-#: unpack-trees.c:143
+#: unpack-trees.c:146
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -8193,106 +9020,66 @@
"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n"
"%%s"
-#: unpack-trees.c:149
+#: unpack-trees.c:152
#, c-format
msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
+"The following untracked working tree files would be overwritten by checkout:\n"
"%%sPlease move or remove them before you switch branches."
msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
-"agafar:\n"
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per agafar:\n"
"%%sMoveu-los o elimineu-los abans de canviar de branca."
-#: unpack-trees.c:151
+#: unpack-trees.c:154
#, c-format
msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
+"The following untracked working tree files would be overwritten by checkout:\n"
"%%s"
msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
-"agafar:\n"
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per agafar:\n"
"%%s"
-#: unpack-trees.c:154
+#: 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 ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
-"fusionar:\n"
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per fusionar:\n"
"%%sMoveu-los o elimineu-los abans de fusionar."
-#: unpack-trees.c:156
+#: unpack-trees.c:159
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%s"
msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
-"fusionar:\n"
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per fusionar:\n"
"%%s"
-#: unpack-trees.c:159
+#: 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 ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
-"%s:\n"
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per %s:\n"
"%%sMoveu-los o elimineu-los abans de %s."
-#: unpack-trees.c:161
+#: unpack-trees.c:164
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%s"
msgstr ""
-"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
-"%s:\n"
+"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per %s:\n"
"%%s"
-#: unpack-trees.c:169
+#: 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:172
-#, c-format
-msgid ""
-"Cannot update sparse checkout: the following entries are not up to date:\n"
-"%s"
-msgstr ""
-"No es pot actualitzar l'agafament parcial: les entrades següents no estan al "
-"dia:\n"
-"%s"
-
-#: unpack-trees.c:174
-#, c-format
-msgid ""
-"The following working tree files would be overwritten by sparse checkout "
-"update:\n"
-"%s"
-msgstr ""
-"Els fitxers següents en l'arbre de treball se sobreescriurien per "
-"actualitzar l'agafament parcial:\n"
-"%s"
-
-#: unpack-trees.c:176
-#, c-format
-msgid ""
-"The following working tree files would be removed by sparse checkout "
-"update:\n"
-"%s"
-msgstr ""
-"Els fitxers següents en l'arbre de treball s'eliminarien per actualitzar "
-"l'agafament parcial:\n"
-"%s"
-
-#: unpack-trees.c:178
+#: unpack-trees.c:175
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -8301,30 +9088,74 @@
"No es pot actualitzar el submòdul:\n"
"%s"
-#: unpack-trees.c:255
+#: unpack-trees.c:178
+#, fuzzy, c-format
+msgid ""
+"The following paths are not up to date and were left despite sparse patterns:\n"
+"%s"
+msgstr ""
+"Els camins següents no estan actualitzats i es van deixar a pesar que s'han "
+"dispersat els percentatges"
+
+#: unpack-trees.c:180
+#, fuzzy, c-format
+msgid ""
+"The following paths are unmerged and were left despite sparse patterns:\n"
+"%s"
+msgstr "Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n"
+
+#: unpack-trees.c:182
+#, fuzzy, c-format
+msgid ""
+"The following paths were already present and thus not updated despite sparse patterns:\n"
+"%s"
+msgstr ""
+"Els camins següents ja estaven presents i, per tant, no s'han actualitzat "
+"malgrat els patrons escassos."
+
+#: unpack-trees.c:262
#, c-format
msgid "Aborting\n"
msgstr "S'està avortant\n"
-#: unpack-trees.c:317
+#: unpack-trees.c:289
+#, fuzzy, c-format
+msgid ""
+"After fixing the above paths, you may want to run `git sparse-checkout "
+"reapply`.\n"
+msgstr ""
+"Després de corregir els camins anteriors és possible que vulgueu executar "
+"`git sparse-checkout reapply`."
+
+#: unpack-trees.c:350
msgid "Updating files"
msgstr "S'estan actualitzant els fitxers"
-#: unpack-trees.c:349
+#: 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:1441
+#: unpack-trees.c:1498
#, fuzzy
msgid "Updating index flags"
-msgstr "S'estan actualitzant els fitxers"
+msgstr "Actualitzant els indicadors d’índex"
+
+#: upload-pack.c:1550
+#, 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
@@ -8333,11 +9164,11 @@
#: 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"
@@ -8349,49 +9180,91 @@
#: 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:2084
+#: walker.c:170
+msgid "Fetching objects"
+msgstr "S'estan obtenint objectes"
+
+#: worktree.c:236 builtin/am.c:2103
#, 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:186 wrapper.c:356
+#: worktree.c:587
+msgid "not a directory"
+msgstr "no és en un directori"
+
+#: worktree.c:596
+msgid ".git is not a file"
+msgstr ".git no és un fitxer"
+
+#: worktree.c:598
+msgid ".git file broken"
+msgstr "fitxer .git malmès"
+
+#: worktree.c:600
+msgid ".git file incorrect"
+msgstr "fitxer .git malmès"
+
+#: worktree.c:670
+#, fuzzy
+msgid "not a valid path"
+msgstr "no és un camí vàlid"
+
+#: worktree.c:676
+msgid "unable to locate repository; .git is not a file"
+msgstr "no s'ha pogut trobar el dipòsit; .git no és un fitxer"
+
+#: worktree.c:679
+msgid "unable to locate repository; .git file broken"
+msgstr "no s'ha pogut trobar el dipòsit; el fitxer .git està malmès"
+
+#: worktree.c:685
+msgid "gitdir unreadable"
+msgstr "gitdir illegible"
+
+#: worktree.c:689
+msgid "gitdir incorrect"
+msgstr "gitdir incorrecte"
+
+#: 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:387 wrapper.c:588
+#: wrapper.c:398 wrapper.c:599
#, c-format
msgid "unable to access '%s'"
msgstr "no s'ha pogut accedir a «%s»"
-#: wrapper.c:596
+#: wrapper.c:607
msgid "unable to get current working directory"
msgstr "no s'ha pogut obtenir el directori de treball actual"
@@ -8402,54 +9275,53 @@
#: 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)"
+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)"
@@ -8459,214 +9331,216 @@
#: 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:1145
+msgid " (use \"git merge --abort\" to abort the merge)"
+msgstr " (useu «git merge --abort» per a avortar la fusió)"
#: wt-status.c:1149
-msgid " (use \"git merge --abort\" to abort the merge)"
-msgstr " (useu \"git merge --abort\" per a avortar la fusió)"
-
-#: wt-status.c:1153
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»)"
-#: 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ç)"
-#: 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)"
-#: 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»)"
-#: wt-status.c:1386
+#: wt-status.c:1382
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -8674,257 +9548,258 @@
"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
-msgid ""
-" (use \"git rebase --continue\" once you are satisfied with your changes)"
+#: 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
+#: wt-status.c:1415
msgid "Cherry-pick currently in progress."
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»)"
-#: 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»)"
+msgstr ""
+" (tots els conflictes estan arreglats: executeu «git cherry-pick "
+"--continue»)"
-#: wt-status.c:1437
+#: 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:1439
+#: 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:1449
+#: wt-status.c:1445
msgid "Revert currently in progress."
msgstr "Una reversió està actualment en curs."
-#: wt-status.c:1452
+#: wt-status.c:1448
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Actualment esteu revertint la comissió %s."
-#: wt-status.c:1458
+#: 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:1461
-#, 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:1464
+#: 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:1466
-#, fuzzy
+#: wt-status.c:1462
msgid " (use \"git revert --skip\" to skip this patch)"
-msgstr " (useu \"git rebase --skip\" per a ometre aquest pedaç)"
+msgstr " (useu «git revert --skip» per a ometre aquest pedaç)"
-#: wt-status.c:1468
+#: wt-status.c:1464
msgid " (use \"git revert --abort\" to cancel the revert operation)"
-msgstr ""
-" (useu \"git revert --abort\" per a cancel·lar l'operació de reversió)"
+msgstr " (useu «git revert --abort» per a cancel·lar l'operació de reversió)"
-#: wt-status.c:1478
+#: wt-status.c:1474
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Actualment esteu bisecant, heu començat des de la branca «%s»."
-#: wt-status.c:1482
+#: wt-status.c:1478
msgid "You are currently bisecting."
msgstr "Actualment esteu bisecant."
-#: wt-status.c:1485
+#: wt-status.c:1481
msgid " (use \"git bisect reset\" to get back to the original branch)"
-msgstr " (useu \"git bisect reset\" per a tornar a la branca original)"
+msgstr " (useu «git bisect reset» per a tornar a la branca original)"
-#: wt-status.c:1694
+#: wt-status.c:1492
+#, fuzzy, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr ""
+"Esteu en una baixada del pagament amb un 1% d'arxius seguits presents."
+
+#: wt-status.c:1731
msgid "On branch "
msgstr "En la branca "
-#: wt-status.c:1701
+#: wt-status.c:1738
msgid "interactive rebase in progress; onto "
msgstr "«rebase» interactiu en curs; sobre "
-#: wt-status.c:1703
+#: wt-status.c:1740
msgid "rebase in progress; onto "
msgstr "«rebase» en curs; sobre "
-#: wt-status.c:1713
+#: wt-status.c:1750
msgid "Not currently on any branch."
msgstr "Actualment no s'és en cap branca."
-#: wt-status.c:1730
+#: wt-status.c:1767
msgid "Initial commit"
msgstr "Comissió inicial"
-#: wt-status.c:1731
+#: wt-status.c:1768
msgid "No commits yet"
msgstr "No s'ha fet cap comissió encara"
-#: wt-status.c:1745
+#: wt-status.c:1782
msgid "Untracked files"
msgstr "Fitxers no seguits"
-#: wt-status.c:1747
+#: wt-status.c:1784
msgid "Ignored files"
msgstr "Fitxers ignorats"
-#: wt-status.c:1751
+#: 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:1757
+#: wt-status.c:1794
#, c-format
msgid "Untracked files not listed%s"
msgstr "Els fitxers no seguits no estan llistats%s"
-#: wt-status.c:1759
+#: 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:1765
+#: wt-status.c:1802
msgid "No changes"
msgstr "Sense canvis"
-#: wt-status.c:1770
+#: 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:1773
+#: 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:1776
+#: 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:1779
+#: 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:1782
+#: 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:1785 wt-status.c:1790
+#: 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:1788
+#: 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"
+msgstr "no hi ha res a cometre (useu -u per a mostrar els fitxers no seguits)\n"
-#: wt-status.c:1792
+#: 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:1905
+#: wt-status.c:1940
msgid "No commits yet on "
msgstr "No s'ha fet cap comissió encara a "
-#: wt-status.c:1909
+#: wt-status.c:1944
msgid "HEAD (no branch)"
msgstr "HEAD (sense branca)"
-#: wt-status.c:1940
+#: wt-status.c:1975
msgid "different"
msgstr "diferent"
-#: wt-status.c:1942 wt-status.c:1950
+#: wt-status.c:1977 wt-status.c:1985
msgid "behind "
msgstr "darrere "
-#: wt-status.c:1945 wt-status.c:1948
+#: 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:2470
+#: wt-status.c:2505
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "no es pot %s: Teniu canvis «unstaged»."
-#: wt-status.c:2476
+#: wt-status.c:2511
msgid "additionally, your index contains uncommitted changes."
msgstr "addicionalment, el vostre índex conté canvis sense cometre."
-#: wt-status.c:2478
+#: 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."
-#: compat/precompose_utf8.c:58 builtin/clone.c:455
+#: compat/precompose_utf8.c:58 builtin/clone.c:457
#, c-format
msgid "failed to unlink '%s'"
msgstr "s'ha produït un error en desenllaçar «%s»"
@@ -8933,125 +9808,130 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<opcions>] [--] <especificació-de-camí>..."
-#: builtin/add.c:87
+#: builtin/add.c:88
#, c-format
msgid "unexpected diff status %c"
msgstr "estat de diff inesperat %c"
-#: builtin/add.c:92 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:102
+#: builtin/add.c:103
#, c-format
msgid "remove '%s'\n"
msgstr "elimina «%s»\n"
-#: builtin/add.c:177
+#: builtin/add.c:178
msgid "Unstaged changes after refreshing the index:"
msgstr "Canvis «unstaged» després d'actualitzar l'índex:"
-#: builtin/add.c:252 builtin/rev-parse.c:899
+#: builtin/add.c:272 builtin/rev-parse.c:908
msgid "Could not read the index"
msgstr "No s'ha pogut llegir l'índex"
-#: builtin/add.c:263
+#: 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:267
+#: builtin/add.c:287
msgid "Could not write patch"
msgstr "No s'ha pogut escriure el pedaç"
-#: builtin/add.c:270
+#: builtin/add.c:290
msgid "editing patch failed"
msgstr "l'edició del pedaç ha fallat"
-#: builtin/add.c:273
+#: builtin/add.c:293
#, c-format
msgid "Could not stat '%s'"
msgstr "No s'ha pogut fer stat a «%s»"
-#: builtin/add.c:275
+#: builtin/add.c:295
msgid "Empty patch. Aborted."
msgstr "El pedaç és buit. S'ha avortat."
-#: builtin/add.c:280
+#: builtin/add.c:300
#, c-format
msgid "Could not apply '%s'"
msgstr "No s'ha pogut aplicar «%s»"
-#: builtin/add.c:288
+#: 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"
+msgstr "Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n"
-#: builtin/add.c:308 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:548
-#: builtin/remote.c:1344 builtin/rm.c:241 builtin/send-pack.c:165
+#: builtin/add.c: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:559
+#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190
msgid "dry run"
-msgstr "marxa en sec"
+msgstr "fer una prova"
-#: builtin/add.c:311
+#: builtin/add.c:331
msgid "interactive picking"
msgstr "recull interactiu"
-#: builtin/add.c:312 builtin/checkout.c:1482 builtin/reset.c:307
+#: builtin/add.c:332 builtin/checkout.c:1547 builtin/reset.c:308
msgid "select hunks interactively"
msgstr "selecciona els trossos interactivament"
-#: builtin/add.c:313
+#: builtin/add.c:333
msgid "edit current diff and apply"
msgstr "edita la diferència actual i aplica-la"
-#: builtin/add.c:314
+#: builtin/add.c:334
msgid "allow adding otherwise ignored files"
msgstr "permet afegir fitxers que d'altra manera s'ignoren"
-#: builtin/add.c:315
+#: builtin/add.c:335
msgid "update tracked files"
msgstr "actualitza els fitxers seguits"
-#: builtin/add.c:316
+#: 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:317
+#: 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:318
+#: 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:321
+#: 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:323
+#: builtin/add.c:343
msgid "don't add, only refresh the index"
msgstr "no afegeixis, només actualitza l'índex"
-#: builtin/add.c:324
+#: 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:325
+#: 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"
+"comproveu si els fitxers, fins i tot els absents, s'ignoren en una fer una prova"
-#: builtin/add.c:327 builtin/update-index.c:1004
+#: 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:329
+#: builtin/add.c:349
msgid "warn when adding an embedded repository"
msgstr "avisa'm quan s'afegeixi un dipòsit incrustat"
-#: builtin/add.c:347
+#: 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"
@@ -9075,175 +9955,188 @@
"\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:375
+#: builtin/add.c:397
#, c-format
msgid "adding embedded git repository: %s"
msgstr "s'està afegint un dipòsit incrustat: %s"
-#: builtin/add.c:393
-#, 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:400
+#: builtin/add.c:425
msgid "adding files failed"
msgstr "l'afegiment de fitxers ha fallat"
-#: builtin/add.c:428 builtin/commit.c:348
+#: builtin/add.c:453 builtin/commit.c:345
#, fuzzy
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr "--first-parent és incompatible amb --bisect"
+msgstr "--pathspec-from-file és incompatible amb --interactive/-patch"
-#: builtin/add.c:434
+#: builtin/add.c:470
#, fuzzy
msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "--first-parent és incompatible amb --bisect"
+msgstr "--pathspec-from-file és incompatible amb --edit"
-#: builtin/add.c:446
+#: builtin/add.c:482
msgid "-A and -u are mutually incompatible"
msgstr "-A i -u són mútuament incompatibles"
-#: builtin/add.c:449
+#: 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:453
+#: 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:471 builtin/checkout.c:1648 builtin/commit.c:354
-#: builtin/reset.c:327
+#: builtin/add.c:507 builtin/checkout.c:1715 builtin/commit.c:351
+#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1502
#, fuzzy
msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr "--patch és incompatible amb --{hard,mixed,soft}"
+msgstr "--pathspec-from-file és incompatible amb els arguments de «pathspec»"
-#: builtin/add.c:478 builtin/checkout.c:1660 builtin/commit.c:360
-#: builtin/reset.c:333
+#: builtin/add.c:514 builtin/checkout.c:1727 builtin/commit.c:357
+#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1508
+#, fuzzy
msgid "--pathspec-file-nul requires --pathspec-from-file"
-msgstr ""
+msgstr "--pathspec-file-nul requereix --pathspec-from-file"
-#: builtin/add.c:482
+#: 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:483
-#, 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:347
+#: builtin/am.c:352
msgid "could not parse author script"
msgstr "no s'ha pogut analitzar l'script d'autor"
-#: builtin/am.c:431
+#: builtin/am.c:436
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "s'ha suprimit «%s» pel lligam applypatch-msg"
-#: builtin/am.c:473
+#: builtin/am.c:478
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Línia d'entrada mal formada: «%s»."
-#: builtin/am.c:511
+#: builtin/am.c:516
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "S'ha produït un error en copiar les notes de «%s» a «%s»"
-#: builtin/am.c:537
+#: builtin/am.c:542
msgid "fseek failed"
msgstr "fseek ha fallat"
-#: builtin/am.c:725
+#: builtin/am.c:730
#, c-format
msgid "could not parse patch '%s'"
msgstr "no s'ha pogut analitzar el pedaç «%s»"
-#: builtin/am.c:790
+#: builtin/am.c:795
msgid "Only one StGIT patch series can be applied at once"
msgstr "Només una sèrie de pedaços StGIT es pot aplicar a la vegada"
-#: builtin/am.c:838
+#: builtin/am.c:843
msgid "invalid timestamp"
msgstr "marca de temps no vàlida"
-#: builtin/am.c:843 builtin/am.c:855
+#: builtin/am.c:848 builtin/am.c:860
msgid "invalid Date line"
msgstr "línia Date no vàlida"
-#: builtin/am.c:850
+#: builtin/am.c:855
msgid "invalid timezone offset"
-msgstr "desplaçament de zona de temps no vàlid"
+msgstr "desplaçament del fus horari no vàlid"
-#: builtin/am.c:943
+#: builtin/am.c:948
msgid "Patch format detection failed."
msgstr "La detecció de format de pedaç ha fallat."
-#: builtin/am.c:948 builtin/clone.c:409
+#: builtin/am.c:953 builtin/clone.c:410
#, c-format
msgid "failed to create directory '%s'"
msgstr "s'ha produït un error en crear el directori «%s»"
-#: builtin/am.c:953
+#: builtin/am.c:958
msgid "Failed to split patches."
msgstr "S'ha produït un error en dividir els pedaços."
-#: builtin/am.c:1084
+#: builtin/am.c:1089
#, 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:1085
+#: builtin/am.c:1090
#, 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:1086
+#: builtin/am.c:1091
#, 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:1169
-msgid "Patch sent with format=flowed; space at the end of lines might be lost."
+#: builtin/am.c:1174
+#, 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:1197
+#: builtin/am.c:1202
msgid "Patch is empty."
msgstr "El pedaç està buit."
-#: builtin/am.c:1262
+#: builtin/am.c:1267
#, fuzzy, c-format
msgid "missing author line in commit %s"
-msgstr "Manca el nom de branca; proveu -b"
+msgstr "manca la línia d'autor a les comissions"
-#: builtin/am.c:1265
+#: builtin/am.c:1270
#, c-format
msgid "invalid ident line: %.*s"
msgstr "línia d'identitat no vàlida: %.*s"
-#: builtin/am.c:1484
+#: builtin/am.c:1489
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."
+"Al dipòsit li manquen els blobs necessaris per a retrocedir a una fusió de 3"
+" vies."
-#: builtin/am.c:1486
+#: builtin/am.c:1491
msgid "Using index info to reconstruct a base tree..."
msgstr "S'està usant la informació d'índex per a reconstruir un arbre base..."
-#: builtin/am.c:1505
+#: builtin/am.c:1510
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -9251,244 +10144,257 @@
"Heu editat el vostre pedaç a mà?\n"
"No s'aplica als blobs recordats en el seu índex."
-#: builtin/am.c:1511
+#: builtin/am.c:1516
msgid "Falling back to patching base and 3-way merge..."
msgstr "S'està retrocedint a apedaçar la base i una fusió de 3 vies..."
-#: builtin/am.c:1537
+#: builtin/am.c:1542
msgid "Failed to merge in the changes."
msgstr "S'ha produït un error en fusionar els canvis."
-#: builtin/am.c:1569
+#: builtin/am.c:1574
msgid "applying to an empty history"
msgstr "s'està aplicant a una història buida"
-#: builtin/am.c:1616 builtin/am.c:1620
+#: builtin/am.c:1626 builtin/am.c:1630
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "no es pot reprendre: %s no existeix."
-#: builtin/am.c:1638
+#: builtin/am.c:1648
msgid "Commit Body is:"
msgstr "El cos de la comissió és:"
#. 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:1648
+#: builtin/am.c:1658
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
"Voleu aplicar-lo? [y]es/[n]o/[e]dita/[v]isualitza el pedaç/[a]ccepta'ls "
"tots: "
-#: builtin/am.c:1695 builtin/commit.c:394
+#: builtin/am.c:1704 builtin/commit.c:395
msgid "unable to write index file"
msgstr "no s'ha pogut escriure el fitxer d'índex"
-#: builtin/am.c:1699
+#: builtin/am.c:1708
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Índex brut: no es poden aplicar pedaços (bruts: %s)"
-#: builtin/am.c:1739 builtin/am.c:1807
+#: builtin/am.c:1748 builtin/am.c:1816
#, c-format
msgid "Applying: %.*s"
msgstr "S'està aplicant: %.*s"
-#: builtin/am.c:1756
+#: builtin/am.c:1765
msgid "No changes -- Patch already applied."
msgstr "Sense canvis -- El pedaç ja s'ha aplicat."
-#: builtin/am.c:1762
+#: builtin/am.c:1771
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "El pedaç ha fallat a %s %.*s"
-#: builtin/am.c:1766
-msgid "Use 'git am --show-current-patch' to see the failed patch"
+#: builtin/am.c:1775
+#, 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:1810
+#: builtin/am.c:1819
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:1817
+#: builtin/am.c:1826
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 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 ""
"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 "
-"fitxer."
+"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:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:346
-#: builtin/reset.c:354
+#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 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:1976
+#: builtin/am.c:1985
msgid "failed to clean index"
msgstr "s'ha produït un error en netejar l'índex"
-#: builtin/am.c:2020
+#: builtin/am.c:2029
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:2117
+#: builtin/am.c:2136
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valor no vàlid per a --patch-format: %s"
-#: builtin/am.c:2153
+#: builtin/am.c:2178
+#, fuzzy, c-format
+msgid "Invalid value for --show-current-patch: %s"
+msgstr "Valor no vàlid per --show-current-patch%s"
+
+#: builtin/am.c:2182
+#, 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:2213
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<opcions>] [(<bústia> | <directori-de-correu>)...]"
-#: builtin/am.c:2154
+#: builtin/am.c:2214
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<opcions>] (--continue | --skip | --abort)"
-#: builtin/am.c:2160
+#: builtin/am.c:2220
msgid "run interactively"
msgstr "executa interactivament"
-#: builtin/am.c:2162
+#: builtin/am.c:2222
msgid "historical option -- no-op"
msgstr "opció històrica -- no-op"
-#: builtin/am.c:2164
+#: builtin/am.c:2224
msgid "allow fall back on 3way merging if needed"
msgstr "permet retrocedir a una fusió de 3 vies si és necessari"
-#: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:304 builtin/stash.c:811
+#: builtin/am.c:2225 builtin/init-db.c:558 builtin/prune-packed.c:16
+#: builtin/repack.c:335 builtin/stash.c:815
msgid "be quiet"
msgstr "silenciós"
-#: builtin/am.c:2167
-msgid "add a Signed-off-by line to the commit message"
+#: builtin/am.c:2227
+#, fuzzy
+msgid "add a Signed-off-by trailer to the commit message"
msgstr "afegeix una línia «Signed-off-by» al missatge de comissió"
-#: builtin/am.c:2170
+#: builtin/am.c:2230
msgid "recode into utf8 (default)"
msgstr "recodifica en utf8 (per defecte)"
-#: builtin/am.c:2172
+#: builtin/am.c:2232
msgid "pass -k flag to git-mailinfo"
msgstr "passa l'indicador -k a git-mailinfo"
-#: builtin/am.c:2174
+#: builtin/am.c:2234
msgid "pass -b flag to git-mailinfo"
msgstr "passa l'indicador -b a git-mailinfo"
-#: builtin/am.c:2176
+#: builtin/am.c:2236
msgid "pass -m flag to git-mailinfo"
msgstr "passa l'indicador -m a git-mailinfo"
-#: builtin/am.c:2178
+#: builtin/am.c:2238
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "passa l'indicador --keep-cr a git-mailsplit per al format mbox"
-#: builtin/am.c:2181
+#: builtin/am.c:2241
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"no passis l'indicador --keep-cr a git-mailsplit independent d'am.keepcr"
-#: builtin/am.c:2184
+#: builtin/am.c:2244
msgid "strip everything before a scissors line"
msgstr "elimina tot abans d'una línia de tisores"
-#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195
-#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207
-#: builtin/am.c:2213
+#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
+#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
+#: builtin/am.c:2273
msgid "pass it through git-apply"
msgstr "passa-ho a través de git-apply"
-#: builtin/am.c:2203 builtin/commit.c:1386 builtin/fmt-merge-msg.c:673
-#: builtin/fmt-merge-msg.c:676 builtin/grep.c:883 builtin/merge.c:249
-#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1469
-#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321
-#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:154 parse-options.h:175 parse-options.h:316
+#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:903 builtin/merge.c:260
+#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
+#: builtin/rebase.c:1341 builtin/repack.c:346 builtin/repack.c:350
+#: builtin/repack.c:352 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:2209 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:555 builtin/tag.c:437 builtin/verify-tag.c:38
+#: builtin/am.c:2269 builtin/branch.c:659 builtin/bugreport.c:136
+#: 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:2210
+#: builtin/am.c:2270
msgid "format the patch(es) are in"
msgstr "el format en el qual estan els pedaços"
-#: builtin/am.c:2216
+#: builtin/am.c:2276
msgid "override error message when patch failure occurs"
msgstr "passa per alt el missatge d'error si falla l'aplicació del pedaç"
-#: builtin/am.c:2218
+#: builtin/am.c:2278
msgid "continue applying patches after resolving a conflict"
msgstr "segueix aplicant pedaços després de resoldre un conflicte"
-#: builtin/am.c:2221
+#: builtin/am.c:2281
msgid "synonyms for --continue"
msgstr "sinònims de --continue"
-#: builtin/am.c:2224
+#: builtin/am.c:2284
msgid "skip the current patch"
msgstr "omet el pedaç actual"
-#: builtin/am.c:2227
+#: builtin/am.c:2287
msgid "restore the original branch and abort the patching operation."
msgstr "restaura la branca original i avorta l'operació d'apedaçament."
-#: builtin/am.c:2230
+#: builtin/am.c:2290
+#, 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:2233
-msgid "show the patch being applied."
-msgstr "mostra el pedaç que s'està aplicant."
+#: builtin/am.c:2294
+#, fuzzy
+msgid "show the patch being applied"
+msgstr "mostra el pedaç que s'està aplicant"
-#: builtin/am.c:2237
+#: builtin/am.c:2299
msgid "lie about committer date"
msgstr "menteix sobre la data del comitent"
-#: builtin/am.c:2239
+#: builtin/am.c:2301
msgid "use current timestamp for author date"
msgstr "usa el marc de temps actual per la data d'autor"
-#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1507
-#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:509
-#: builtin/rebase.c:1513 builtin/revert.c:117 builtin/tag.c:418
+#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515
+#: builtin/merge.c:297 builtin/pull.c:175 builtin/rebase.c:536
+#: builtin/rebase.c:1394 builtin/revert.c:117 builtin/tag.c:419
msgid "key-id"
msgstr "ID de clau"
-#: builtin/am.c:2242 builtin/rebase.c:510 builtin/rebase.c:1514
+#: builtin/am.c:2304 builtin/rebase.c:537 builtin/rebase.c:1395
msgid "GPG-sign commits"
msgstr "signa les comissions amb GPG"
-#: builtin/am.c:2245
+#: builtin/am.c:2307
msgid "(internal use for git-rebase)"
msgstr "(ús intern per a git-rebase)"
-#: builtin/am.c:2263
+#: builtin/am.c:2325
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
@@ -9496,33 +10402,34 @@
"Fa molt que l'opció -b/--binary no ha fet res, i\n"
"s'eliminarà. No l'useu més."
-#: builtin/am.c:2270
+#: builtin/am.c:2332
msgid "failed to read the index"
msgstr "S'ha produït un error en llegir l'índex"
-#: builtin/am.c:2285
+#: builtin/am.c:2347
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
"un directori de «rebase» anterior %s encara existeix però s'ha donat una "
"bústia."
-#: builtin/am.c:2309
+#: builtin/am.c:2371
#, 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:2315
+#: builtin/am.c:2377
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Una operació de resolució no està en curs; no reprenem."
-#: builtin/am.c:2325
+#: builtin/am.c:2387
+#, 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>...]"
@@ -9543,7 +10450,7 @@
#: 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
@@ -9558,139 +10465,159 @@
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]"
-msgstr "git bisect--helper --next-all [--no-checkout]"
-
#: builtin/bisect--helper.c:23
-msgid "git bisect--helper --write-terms <bad_term> <good_term>"
-msgstr "git bisect--helper --write-terms <mal_terme> <bon_terme>"
-
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-clean-state"
-msgstr "git bisect--helper --bisect-clean-state"
-
-#: builtin/bisect--helper.c:25
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --bisect-reset [<comissió>]"
-#: builtin/bisect--helper.c:26
+#: builtin/bisect--helper.c:24
#, 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:25
#, 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:26
+#, fuzzy
+msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+msgstr "git bisect--helper --bisect-next-check <goodterm> <badterm> [<term>]"
+
+#: builtin/bisect--helper.c:27
+#, fuzzy
+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-bad | --term-new]"
#: builtin/bisect--helper.c:28
#, fuzzy
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr "git bisect--helper --write-terms <mal_terme> <bon_terme>"
-
-#: builtin/bisect--helper.c:29
-#, fuzzy
msgid ""
-"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
-"term-new]"
+"git bisect--helper --bisect-start [--term-{new,bad}=<term> "
+"--term-{old,good}=<term>] [--no-checkout] [--first-parent] [<bad> "
+"[<good>...]] [--] [<paths>...]"
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-start [---term-{oldgood}=<term> "
+"--term-{newbad}=<term>][--no-checkout] [<bad> [<good>]] [-] [<paths>]"
#: builtin/bisect--helper.c:30
-msgid ""
-"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
-"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
-msgstr ""
+#, fuzzy
+msgid "git bisect--helper --bisect-next"
+msgstr "git bisect--helper --bisect-clean-state"
-#: builtin/bisect--helper.c:86
+#: builtin/bisect--helper.c:31
+#, fuzzy
+msgid "git bisect--helper --bisect-auto-next"
+msgstr "git bisect--helper --bisect-clean-state"
+
+#: builtin/bisect--helper.c:32
+#, fuzzy
+msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
+msgstr "git bisect--helper --bisect-reset [<comissió>]"
+
+#: builtin/bisect--helper.c:33
+#, fuzzy
+msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
+msgstr "git bisect--helper --bisect-reset [<comissió>]"
+
+#: builtin/bisect--helper.c:108
+#, fuzzy, c-format
+msgid "cannot open file '%s' in mode '%s'"
+msgstr "no es pot copiar «%s» a «%s»"
+
+#: builtin/bisect--helper.c:115
+#, fuzzy, c-format
+msgid "could not write to file '%s'"
+msgstr "no s'ha pogut escriure el fitxer: «%s»"
+
+#: builtin/bisect--helper.c:154
#, 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:158
#, 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:168
#, 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:178
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:194
#, fuzzy, c-format
msgid "We are not bisecting.\n"
msgstr "No estem bisecant."
-#: builtin/bisect--helper.c:163
+#: builtin/bisect--helper.c:202
#, c-format
msgid "'%s' is not a valid commit"
msgstr "«%s» no és una comissió vàlida"
-#: builtin/bisect--helper.c:172
+#: builtin/bisect--helper.c:211
#, 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:216
+#: builtin/bisect--helper.c:255
#, 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:221
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:260
+#, 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:233
+#: builtin/bisect--helper.c:272
#, 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:259
+#: builtin/bisect--helper.c:298
#, 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:286
+#: builtin/bisect--helper.c:325
#, 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:290
+#: builtin/bisect--helper.c:329
#, 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:322
+#: builtin/bisect--helper.c:349
#, c-format
msgid "bisecting only with a %s commit"
msgstr "bisecant amb només una comissió %s"
@@ -9698,308 +10625,352 @@
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#.
-#: builtin/bisect--helper.c:330
+#: builtin/bisect--helper.c:357
msgid "Are you sure [Y/n]? "
msgstr "N'esteu segur [Y/n]? "
-#: builtin/bisect--helper.c:377
+#: builtin/bisect--helper.c:418
msgid "no terms defined"
msgstr "cap terme definit"
-#: builtin/bisect--helper.c:380
-#, c-format
+#: builtin/bisect--helper.c:421
+#, 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:390
+#: builtin/bisect--helper.c:431
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
"Supported options are: --term-good|--term-old and --term-bad|--term-new."
msgstr ""
-"paràmetre no vàlid %s per a 'git bisect terms'.\n"
+"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:476
+#: builtin/bisect--helper.c:498
+#, fuzzy
+msgid "revision walk setup failed\n"
+msgstr "la configuració del passeig per revisions ha fallat"
+
+#: builtin/bisect--helper.c:520
+#, fuzzy, c-format
+msgid "could not open '%s' for appending"
+msgstr "no s'ha pogut obrir «%s» per a lectura"
+
+#: builtin/bisect--helper.c:639 builtin/bisect--helper.c:652
+#, fuzzy
+msgid "'' is not a valid term"
+msgstr "«%s» no és un terme vàlid"
+
+#: builtin/bisect--helper.c:662
#, c-format
msgid "unrecognized option: '%s'"
msgstr "opció no reconeguda: «%s»"
-#: builtin/bisect--helper.c:480
+#: builtin/bisect--helper.c:666
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "«%s» no sembla ser una revisió vàlida"
-#: builtin/bisect--helper.c:512
+#: builtin/bisect--helper.c:697
msgid "bad HEAD - I need a HEAD"
msgstr "HEAD incorrecte - Cal un HEAD"
-#: builtin/bisect--helper.c:527
+#: builtin/bisect--helper.c:712
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr ""
-"l'agafament de «%s» ha fallat. Proveu «git bisect start <branca-"
-"vàlida>»."
+"l'agafament de «%s» ha fallat. Proveu «git bisect start <branca-vàlida>»."
-#: builtin/bisect--helper.c:548
+#: builtin/bisect--helper.c:733
msgid "won't bisect on cg-seek'ed tree"
msgstr "no es bisecarà en un arbre en el qual s'ha fet cg-seek"
-#: builtin/bisect--helper.c:551
+#: builtin/bisect--helper.c:736
#, fuzzy
msgid "bad HEAD - strange symbolic ref"
msgstr "HEAD incorrecte - referència simbòlica estranya"
-#: builtin/bisect--helper.c:575
+#: builtin/bisect--helper.c:756
#, fuzzy, c-format
msgid "invalid ref: '%s'"
-msgstr "fitxer no vàlid: «%s»"
+msgstr "ref '%s' no és vàlid"
-#: builtin/bisect--helper.c:631
-msgid "perform 'git bisect next'"
-msgstr "realitza 'git bisect next'"
+#: builtin/bisect--helper.c:814
+#, fuzzy
+msgid "You need to start by \"git bisect start\"\n"
+msgstr "Cal començar per «git bisect start»"
-#: builtin/bisect--helper.c:633
-msgid "write the terms to .git/BISECT_TERMS"
-msgstr "escriu els termes a .git/BISECT_TERMS"
+#. 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:825
+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:635
-msgid "cleanup the bisection state"
-msgstr "neteja l'estat de la bisecció"
+#: builtin/bisect--helper.c:843
+#, fuzzy
+msgid "Please call `--bisect-state` with at least one argument"
+msgstr "Si us plau crideu `--bisect-state` amb almenys un argument"
-#: builtin/bisect--helper.c:637
-msgid "check for expected revs"
-msgstr "comprova les revisions esperades"
+#: builtin/bisect--helper.c:856
+#, fuzzy, c-format
+msgid "'git bisect %s' can take only one argument."
+msgstr "«git bisect $TERM_BAD» pot acceptar només un argument."
-#: builtin/bisect--helper.c:639
+#: builtin/bisect--helper.c:868 builtin/bisect--helper.c:879
+#, fuzzy, c-format
+msgid "Bad rev input: %s"
+msgstr "Introducció de revisió errònia: $arg"
+
+#: builtin/bisect--helper.c:924
#, fuzzy
msgid "reset the bisection state"
-msgstr "neteja l'estat de la bisecció"
+msgstr "restableix l'estat de la bisecció"
-#: builtin/bisect--helper.c:641
+#: builtin/bisect--helper.c:926
#, 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:643
+#: builtin/bisect--helper.c:928
#, 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:645
+#: builtin/bisect--helper.c:930
+#, fuzzy
msgid "check whether bad or good terms exist"
-msgstr ""
+msgstr "comprova si existeixen termes incorrectes o bons"
-#: builtin/bisect--helper.c:647
+#: builtin/bisect--helper.c:932
#, 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:649
+#: builtin/bisect--helper.c:934
+#, fuzzy
msgid "start the bisect session"
+msgstr "inicia la sessió bisect"
+
+#: builtin/bisect--helper.c:936
+#, fuzzy
+msgid "find the next bisection commit"
+msgstr "no es pot esmenar una comissió no existent"
+
+#: builtin/bisect--helper.c:938
+#, fuzzy
+msgid ""
+"verify the next bisection state then checkout the next bisection commit"
msgstr ""
+"Verifica el següent estat de bisecció després agafa la següent comissió de "
+"bisecció"
-#: builtin/bisect--helper.c:651
-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:940
+#, fuzzy
+msgid "mark the state of ref (or refs)"
+msgstr "marca l'estat de ref (o refs)"
-#: builtin/bisect--helper.c:653
+#: builtin/bisect--helper.c:942
msgid "no log for BISECT_WRITE"
-msgstr ""
+msgstr "no hi ha registre per a BISECT_WRITE"
-#: builtin/bisect--helper.c:670
-msgid "--write-terms requires two arguments"
-msgstr "--write-terms requereix dos paràmetres"
-
-#: builtin/bisect--helper.c:674
-msgid "--bisect-clean-state requires no arguments"
-msgstr "--bisect-clean-state no accepta paràmetres"
-
-#: builtin/bisect--helper.c:681
+#: builtin/bisect--helper.c:957
#, 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:685
+#: builtin/bisect--helper.c:961
#, 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:691
+#: builtin/bisect--helper.c:967
#, 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:697
+#: builtin/bisect--helper.c:973
#, 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:703
-#, fuzzy
+#: builtin/bisect--helper.c:979
msgid "--bisect-terms requires 0 or 1 argument"
-msgstr "--write-terms requereix dos paràmetres"
+msgstr "--bisect-terms requereix 0 o 1 argument"
-#: builtin/blame.c:31
+#: builtin/bisect--helper.c:988
+msgid "--bisect-next requires 0 arguments"
+msgstr "--bisect-next no requereix cap argument"
+
+#: builtin/bisect--helper.c:994
+msgid "--bisect-auto-next requires 0 arguments"
+msgstr "--bisect-auto-next no requereix cap argument"
+
+#: builtin/blame.c:32
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr "git blame [<opcions>] [<opcions-de-revisió>] [<revisió>] [--] fitxer"
-#: builtin/blame.c:36
+#: builtin/blame.c:37
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "es documenten les <opcions-de-revisió> en git-rev-list(1)"
-#: builtin/blame.c:409
-#, fuzzy, c-format
+#: builtin/blame.c:410
+#, c-format
msgid "expecting a color: %s"
-msgstr "respecta els colors del format"
+msgstr "s'esperava un color: %s"
-#: builtin/blame.c:416
+#: builtin/blame.c:417
msgid "must end with a color"
-msgstr ""
+msgstr "ha d'acabar amb un color"
-#: builtin/blame.c:729
-#, fuzzy, c-format
+#: builtin/blame.c:730
+#, 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.repeatedLines»"
-#: builtin/blame.c:747
-#, fuzzy
+#: builtin/blame.c:748
msgid "invalid value for blame.coloring"
-msgstr "valor no vàlid per a --missing"
+msgstr "valor no vàlid per a «blame.coloring»"
-#: builtin/blame.c:822
-#, fuzzy, c-format
+#: builtin/blame.c:847
+#, c-format
msgid "cannot find revision %s to ignore"
-msgstr "no s'ha pogut resoldre la revisió: %s"
+msgstr "no s'ha pogut trobar la revisió %s per ignorar"
-#: builtin/blame.c:844
+#: builtin/blame.c:869
msgid "Show blame entries as we find them, incrementally"
msgstr "Mostra les entrades «blame» mentre les trobem, incrementalment"
-#: builtin/blame.c:845
-msgid "Show blank SHA-1 for boundary commits (Default: off)"
+#: builtin/blame.c:870
+#, 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:846
+#: builtin/blame.c:871
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr ""
"No tractis les comissions d'arrel com a límits (Per defecte: desactivat)"
-#: builtin/blame.c:847
+#: builtin/blame.c:872
msgid "Show work cost statistics"
msgstr "Mostra les estadístiques de preu de treball"
-#: builtin/blame.c:848
+#: builtin/blame.c:873
msgid "Force progress reporting"
msgstr "Força l'informe de progrés"
-#: builtin/blame.c:849
+#: builtin/blame.c:874
msgid "Show output score for blame entries"
msgstr "Mostra la puntuació de sortida de les entrades «blame»"
-#: builtin/blame.c:850
+#: builtin/blame.c:875
msgid "Show original filename (Default: auto)"
msgstr "Mostra el nom de fitxer original (Per defecte: automàtic)"
-#: builtin/blame.c:851
+#: builtin/blame.c:876
msgid "Show original linenumber (Default: off)"
msgstr "Mostra el número de línia original (Per defecte: desactivat)"
-#: builtin/blame.c:852
+#: builtin/blame.c:877
msgid "Show in a format designed for machine consumption"
msgstr "Presenta en un format dissenyat per consumpció per màquina"
-#: builtin/blame.c:853
+#: builtin/blame.c:878
msgid "Show porcelain format with per-line commit information"
msgstr "Mostra el format de porcellana amb informació de comissió per línia"
-#: builtin/blame.c:854
+#: builtin/blame.c:879
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr ""
"Usa el mateix mode de sortida que git-annotate (Per defecte: desactivat)"
-#: builtin/blame.c:855
+#: builtin/blame.c:880
msgid "Show raw timestamp (Default: off)"
msgstr "Mostra la marca de temps crua (Per defecte: desactivat)"
-#: builtin/blame.c:856
+#: builtin/blame.c:881
msgid "Show long commit SHA1 (Default: off)"
msgstr "Mostra l'SHA1 de comissió llarg (Per defecte: desactivat)"
-#: builtin/blame.c:857
+#: builtin/blame.c:882
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Omet el nom d'autor i la marca de temps (Per defecte: desactivat)"
-#: builtin/blame.c:858
+#: builtin/blame.c:883
msgid "Show author email instead of name (Default: off)"
msgstr ""
"Mostra l'adreça electrònica de l'autor en lloc del nom (Per defecte: "
"desactivat)"
-#: builtin/blame.c:859
+#: builtin/blame.c:884
msgid "Ignore whitespace differences"
msgstr "Ignora les diferències d'espai en blanc"
-#: builtin/blame.c:860 builtin/log.c:1702
+#: builtin/blame.c:885 builtin/log.c:1813
msgid "rev"
msgstr "rev"
-#: builtin/blame.c:860
+#: builtin/blame.c:885
#, fuzzy
msgid "Ignore <rev> when blaming"
-msgstr "ignora l'índex en comprovar"
+msgstr "Ignora <rev> en culpar"
-#: builtin/blame.c:861
-#, fuzzy
+#: builtin/blame.c:886
msgid "Ignore revisions from <file>"
-msgstr "llegiu el missatge des d'un fitxer"
+msgstr "Ignora les revisions de <file>"
-#: builtin/blame.c:862
+#: builtin/blame.c:887
+#, fuzzy
msgid "color redundant metadata from previous line differently"
msgstr ""
+"color les metadades redundants de la línia anterior de manera diferent"
-#: builtin/blame.c:863
+#: builtin/blame.c:888
+#, fuzzy
msgid "color lines by age"
-msgstr ""
+msgstr "coloreja les línies per edat"
-#: builtin/blame.c:864
+#: builtin/blame.c:889
msgid "Spend extra cycles to find better match"
msgstr "Gasta cicles extres per a trobar una coincidència millor"
-#: builtin/blame.c:865
+#: builtin/blame.c:890
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Usa les revisions de <fitxer> en lloc d'invocar git-rev-list"
-#: builtin/blame.c:866
+#: builtin/blame.c:891
msgid "Use <file>'s contents as the final image"
msgstr "Usa els continguts de <fitxer> com a la imatge final"
-#: builtin/blame.c:867 builtin/blame.c:868
+#: builtin/blame.c:892 builtin/blame.c:893
msgid "score"
msgstr "puntuació"
-#: builtin/blame.c:867
+#: builtin/blame.c:892
msgid "Find line copies within and across files"
msgstr "Troba còpies de línia dins i a través dels fitxers"
-#: builtin/blame.c:868
+#: builtin/blame.c:893
msgid "Find line movements within and across files"
msgstr "Troba moviments de línia dins i a través dels fitxers"
-#: builtin/blame.c:869
-msgid "n,m"
-msgstr "n,m"
+#: builtin/blame.c:894
+msgid "range"
+msgstr "rang"
-#: builtin/blame.c:869
-msgid "Process only line range n,m, counting from 1"
+#: builtin/blame.c:895
+#, fuzzy
+msgid "Process only line range <start>,<end> or function :<funcname>"
msgstr "Processa només el rang de línies n,m, comptant des d'1"
-#: builtin/blame.c:921
+#: builtin/blame.c:947
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"no es pot usar --progress amb els formats --incremental o de porcellana"
@@ -10011,24 +10982,23 @@
#. among various forms of relative timestamps, but
#. your language may need more or fewer display
#. columns.
-#.
-#: builtin/blame.c:972
+#: builtin/blame.c:998
msgid "4 years, 11 months ago"
msgstr "fa 4 anys i 11 mesos"
-#: builtin/blame.c:1079
+#: builtin/blame.c:1114
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "el fitxer %s té només %lu línia"
msgstr[1] "el fitxer %s té només %lu línies"
-#: builtin/blame.c:1125
+#: builtin/blame.c:1159
msgid "Blaming lines"
msgstr "S'està fent un «blame»"
#: 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 [<opcions>] [-r | -a] [--merged | --no-merged]"
#: builtin/branch.c:30
@@ -10087,7 +11057,7 @@
"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"
@@ -10141,14 +11111,13 @@
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
+#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
-msgstr "HEAD no trobat sota refs/heads!"
+msgstr "HEAD (%s) apunta fora de refs/heads/"
#: builtin/branch.c:481
#, c-format
@@ -10239,7 +11208,7 @@
msgid "do not use"
msgstr "no usar"
-#: builtin/branch.c:626 builtin/rebase.c:505
+#: builtin/branch.c:626 builtin/rebase.c:532
msgid "upstream"
msgstr "font"
@@ -10250,7 +11219,7 @@
#: builtin/branch.c:627
#, fuzzy
msgid "unset the upstream info"
-msgstr "Desassigna la informació de font"
+msgstr "treu la informació de la font"
#: builtin/branch.c:628
msgid "use colored output"
@@ -10305,9 +11274,8 @@
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"
@@ -10333,262 +11301,366 @@
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/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:784
+#: builtin/branch.c:682 builtin/clone.c:790
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."
+"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/bugreport.c:15
+msgid "git version:\n"
+msgstr "versió de git:\n"
+
+#: builtin/bugreport.c:21
+#, c-format
+msgid "uname() failed with error '%s' (%d)\n"
+msgstr "uname() ha fallat amb l'error «%s» (%d)\n"
+
+#: builtin/bugreport.c:31
+msgid "compiler info: "
+msgstr "informació del compilador: "
+
+#: builtin/bugreport.c:34
+msgid "libc info: "
+msgstr "Informació de la libc: "
+
+#: 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 "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
+
+#: builtin/bugreport.c:97
+#, fuzzy
+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 ""
+"Gràcies per emplenar un informe d'error del Git! Responeu les següents "
+"preguntes per ajudar-nos a entendre el vostre problema. Què heu fet abans "
+"que passés l'error? (Pas per reproduir el vostre problema) Què espereu que "
+"passi? (Comportament explotat) Què ha passat? (Comportament real) Què és "
+"diferent entre el que s'esperava i què ha passat? Qualsevol altra cosa que "
+"vulgueu afegir Reviseu la resta de l'informe d'error de sota. Podeu eliminar"
+" qualsevol línia que vulgueu."
+
+#: builtin/bugreport.c:135
+msgid "specify a destination for the bugreport file"
+msgstr "especifiqueu una destinació per al fitxer d'informe d'error"
+
+#: builtin/bugreport.c:137
+#, fuzzy
+msgid "specify a strftime format suffix for the filename"
+msgstr "especifiqueu un sufix de format strftime per al nom de fitxer"
+
+#: builtin/bugreport.c:159
+#, 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:166
+msgid "System Info"
+msgstr "Informació del sistema"
+
+#: builtin/bugreport.c:169
+#, fuzzy
+msgid "Enabled Hooks"
+msgstr "no s'ha pogut bifurcar"
+
+#: builtin/bugreport.c:176
+#, fuzzy, c-format
+msgid "couldn't create a new file at '%s'"
+msgstr "no s'ha pogut crear el fitxer «%s»"
+
+#: builtin/bugreport.c:179
+#, c-format
+msgid "unable to write to %s"
+msgstr "no s'ha pogut escriure a %s"
+
+#: builtin/bugreport.c:189
+#, 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 remote add [<opcions>] <nom> <url>"
+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 rm [<opcions>] [--] <fitxer>..."
+msgstr "git pack verify [<opcions>] <file>"
#: builtin/bundle.c:17 builtin/bundle.c:33
+#, fuzzy
msgid "git bundle list-heads <file> [<refname>...]"
-msgstr ""
+msgstr "git pack list-heads <file> [<refname>]"
#: builtin/bundle.c:18 builtin/bundle.c:38
+#, fuzzy
msgid "git bundle unbundle <file> [<refname>...]"
-msgstr ""
+msgstr "git bundle <file> [<refname>]"
-#: builtin/bundle.c:66 builtin/pack-objects.c:3228
+#: 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:68 builtin/pack-objects.c:3230
+#: builtin/bundle.c:69 builtin/pack-objects.c:3482
msgid "show progress meter"
msgstr "mostra l'indicador de progrés"
-#: builtin/bundle.c:70 builtin/pack-objects.c:3232
+#: 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:73 builtin/pack-objects.c:3235
+#: 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:93
+#: builtin/bundle.c:76
+#, fuzzy
+msgid "specify bundle format version"
+msgstr "especifica la versió del format del paquet"
+
+#: 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:104
+#: builtin/bundle.c:107
#, fuzzy
msgid "do not show bundle details"
-msgstr "no mostris les etiquetes pelades"
+msgstr "no mostris els detalls del paquet"
-#: builtin/bundle.c:119
+#: builtin/bundle.c:122
#, c-format
msgid "%s is okay\n"
msgstr "%s està bé\n"
-#: builtin/bundle.c:160
+#: builtin/bundle.c:163
msgid "Need a repository to unbundle."
msgstr "Cal un dipòsit per a desfer un farcell."
-#: builtin/bundle.c:168 builtin/remote.c:1609
+#: builtin/bundle.c:171 builtin/remote.c:1700
msgid "be verbose; must be placed before a subcommand"
-msgstr "sigues detallat; s'ha de col·locar abans d'un subordre"
+msgstr "sigues detallat; s'ha de col·locar abans d'una subordre"
-#: builtin/bundle.c:190 builtin/remote.c:1640
+#: builtin/bundle.c:193 builtin/remote.c:1731
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Subordre desconeguda: %s"
-#: builtin/cat-file.c:595
+#: 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>"
+"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 | <tipus> | --textconv | --filters [--path=<camí>]) <objecte>"
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | "
+"-p | <tipus> | --textconv | --filters [--path=<camí>]) <objecte>"
-#: builtin/cat-file.c:596
+#: builtin/cat-file.c: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]"
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | "
+"--filters]"
-#: builtin/cat-file.c:617
+#: 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:635
+#: 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:636
+#: builtin/cat-file.c:639
msgid "show object type"
msgstr "mostra el tipus de l'objecte"
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:640
msgid "show object size"
msgstr "mostra la mida de l'objecte"
-#: builtin/cat-file.c:639
+#: 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:640
+#: builtin/cat-file.c:643
msgid "pretty-print object's content"
msgstr "imprimeix bellament el contingut de l'objecte"
-#: builtin/cat-file.c:642
+#: 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"
+msgstr ""
+"en els objectes de blob, executa textconv en el contingut de l'objecte"
-#: builtin/cat-file.c:644
+#: 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:645 git-submodule.sh:992
+#: builtin/cat-file.c:648
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:646
+#: 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:648
+#: 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:649
+#: builtin/cat-file.c:652
msgid "buffer --batch output"
msgstr "posa la sortida de --batch en memòria intermèdia"
-#: builtin/cat-file.c:651
+#: 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:655
+#: 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:659
+#: 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)"
+"segueix els enllaços simbòlics en l'arbre (s'usa amb --batch o --batch-"
+"check)"
-#: builtin/cat-file.c:661
+#: builtin/cat-file.c:664
msgid "show all objects with --batch or --batch-check"
msgstr "mostra tots els objectes amb --batch o --batch-check"
-#: builtin/cat-file.c:663
+#: builtin/cat-file.c: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>..."
@@ -10614,8 +11686,8 @@
msgid "terminate input and output records by a NUL character"
msgstr "acaba els registres d'entrada i de sortida amb un caràcter NUL"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1435 builtin/gc.c:537
-#: builtin/worktree.c:506
+#: builtin/check-ignore.c:21 builtin/checkout.c:1500 builtin/gc.c:541
+#: builtin/worktree.c:561
msgid "suppress progress reporting"
msgstr "omet els informes de progrés"
@@ -10627,27 +11699,27 @@
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"
@@ -10668,55 +11740,55 @@
msgid "no contacts specified"
msgstr "no hi ha contactes especificats"
-#: builtin/checkout-index.c:131
+#: builtin/checkout-index.c:139
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<opcions>] [--] [<fitxer>...]"
-#: builtin/checkout-index.c:148
+#: builtin/checkout-index.c:156
msgid "stage should be between 1 and 3 or all"
msgstr "«stage» ha de ser entre 1 i 3 o all"
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:173
msgid "check out all files in the index"
msgstr "agafa tots els fitxers en l'índex"
-#: builtin/checkout-index.c:165
+#: builtin/checkout-index.c:174
msgid "force overwrite of existing files"
msgstr "força la sobreescriptura de fitxers existents"
-#: builtin/checkout-index.c:167
+#: builtin/checkout-index.c:176
msgid "no warning for existing files and files not in index"
msgstr ""
"cap advertència per a fitxers existents i fitxers que no siguin a l'índex"
-#: builtin/checkout-index.c:169
+#: builtin/checkout-index.c:178
msgid "don't checkout new files"
msgstr "no agafis fitxers nous"
-#: builtin/checkout-index.c:171
+#: builtin/checkout-index.c:180
msgid "update stat information in the index file"
msgstr "actualitza la informació d'estadístiques en el fitxer d'índex"
-#: builtin/checkout-index.c:175
+#: builtin/checkout-index.c:184
msgid "read list of paths from the standard input"
msgstr "llegeix la llista de camins des de l'entrada estàndard"
-#: builtin/checkout-index.c:177
+#: builtin/checkout-index.c:186
msgid "write the content to temporary files"
msgstr "escriu el contingut a fitxers temporals"
-#: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1385 builtin/submodule--helper.c:1388
-#: builtin/submodule--helper.c:1396 builtin/submodule--helper.c:1882
-#: builtin/worktree.c:679
+#: builtin/checkout-index.c:187 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:757
msgid "string"
msgstr "cadena"
-#: builtin/checkout-index.c:179
+#: builtin/checkout-index.c:188
msgid "when creating files, prepend <string>"
msgstr "en crear fitxers, anteposa <cadena>"
-#: builtin/checkout-index.c:181
+#: builtin/checkout-index.c:190
msgid "copy out the files from named stage"
msgstr "copia els fitxers des de «stage» amb nom"
@@ -10729,158 +11801,158 @@
msgstr "git checkout [<opcions>] [<branca>] -- <fitxer>..."
#: builtin/checkout.c:37
-#, fuzzy
msgid "git switch [<options>] [<branch>]"
-msgstr "git checkout [<opcions>] <branca>"
+msgstr "git switch [<options>] [<branch>]"
#: builtin/checkout.c:42
-#, fuzzy
msgid "git restore [<options>] [--source=<branch>] <file>..."
-msgstr "git checkout [<opcions>] [<branca>] -- <fitxer>..."
+msgstr "git restore [<opcions>] [--source=<branca>] <fitxer>..."
-#: builtin/checkout.c:175 builtin/checkout.c:214
+#: 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:177 builtin/checkout.c:216
+#: 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:193
+#: 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:243
+#: 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:261
+#: builtin/checkout.c:275
#, c-format
msgid "path '%s': cannot merge"
msgstr "camí «%s»: no es pot fusionar"
-#: builtin/checkout.c:277
+#: 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:377
-#, fuzzy, c-format
+#: builtin/checkout.c:396
+#, c-format, fuzzy
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] "Conflicte de fusió recreat en un 1%"
+msgstr[1] "Conflictes de fusió recreats en un 1%"
-#: builtin/checkout.c:382
-#, fuzzy, c-format
+#: builtin/checkout.c:401
+#, c-format, fuzzy
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] "Camí actualitzat d'un 1% des d'un 1%"
+msgstr[1] "Camins actualitzats a un 1% des d'un 1%"
-#: builtin/checkout.c:389
+#: 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 actualitzat un camí des de l'índex"
msgstr[1] "S'ha actualitzat %d camins des de l'índex"
-#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418
-#: builtin/checkout.c:422
+#: 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:425 builtin/checkout.c:428
+#: 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:432
+#: 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:436
+#: builtin/checkout.c:455
#, c-format
msgid "neither '%s' or '%s' is specified"
-msgstr ""
+msgstr "no s'ha especificat ni «%s» ni «%s»"
-#: builtin/checkout.c:440
+#: 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:445 builtin/checkout.c:450
-#, fuzzy, c-format
+#: builtin/checkout.c:464 builtin/checkout.c:469
+#, 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 %s"
-#: builtin/checkout.c:509 builtin/checkout.c:516
+#: builtin/checkout.c:541 builtin/checkout.c:548
#, c-format
msgid "path '%s' is unmerged"
msgstr "el camí «%s» està sense fusionar"
-#: builtin/checkout.c:682 builtin/sparse-checkout.c:82
+#: builtin/checkout.c:716
msgid "you need to resolve your current index first"
msgstr "heu de primer resoldre el vostre índex actual"
-#: builtin/checkout.c:732
-#, c-format
+#: builtin/checkout.c:770
+#, 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:835
+#: builtin/checkout.c:866
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "No es pot fer reflog per a «%s»: %s\n"
-#: builtin/checkout.c:877
+#: builtin/checkout.c:908
msgid "HEAD is now at"
msgstr "HEAD ara és a"
-#: builtin/checkout.c:881 builtin/clone.c:716
+#: builtin/checkout.c:912 builtin/clone.c:721 t/helper/test-fast-rebase.c:202
msgid "unable to update HEAD"
msgstr "no s'ha pogut actualitzar HEAD"
-#: builtin/checkout.c:885
+#: builtin/checkout.c:916
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Restableix la branca «%s»\n"
-#: builtin/checkout.c:888
+#: builtin/checkout.c:919
#, c-format
msgid "Already on '%s'\n"
-msgstr "Ja en «%s»\n"
+msgstr "Ja esteu en «%s»\n"
-#: builtin/checkout.c:892
+#: builtin/checkout.c:923
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "S'ha canviat i restablert a la branca «%s»\n"
-#: builtin/checkout.c:894 builtin/checkout.c:1291
+#: builtin/checkout.c:925 builtin/checkout.c:1356
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "S'ha canviat a la branca nova «%s»\n"
-#: builtin/checkout.c:896
+#: builtin/checkout.c:927
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "S'ha canviat a la branca «%s»\n"
-#: builtin/checkout.c:947
+#: builtin/checkout.c:978
#, c-format
msgid " ... and %d more.\n"
msgstr " ... i %d més.\n"
-#: builtin/checkout.c:953
+#: builtin/checkout.c:984
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -10903,7 +11975,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:972
+#: builtin/checkout.c:1003
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -10930,259 +12002,30 @@
" git branch <nom-de-branca-nova> %s\n"
"\n"
-#: builtin/checkout.c:1007
+#: builtin/checkout.c:1038
msgid "internal error in revision walk"
msgstr "error intern en el passeig per revisions"
-#: builtin/checkout.c:1011
+#: builtin/checkout.c:1042
msgid "Previous HEAD position was"
msgstr "La posició de HEAD anterior era"
-#: builtin/checkout.c:1051 builtin/checkout.c:1286
+#: builtin/checkout.c:1082 builtin/checkout.c:1351
msgid "You are on a branch yet to be born"
msgstr "Sou en una branca que encara ha de néixer"
-#: builtin/checkout.c:1178
-#, fuzzy
-msgid "only one reference expected"
-msgstr "s'esperava només una referència, s'han donat %d."
-
-#: builtin/checkout.c:1195
-#, c-format
-msgid "only one reference expected, %d given."
-msgstr "s'esperava només una referència, s'han donat %d."
-
-#: builtin/checkout.c:1232
-#, c-format
+#: builtin/checkout.c:1164
+#, 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:1245 builtin/worktree.c:290 builtin/worktree.c:455
-#, c-format
-msgid "invalid reference: %s"
-msgstr "referència no vàlida: %s"
-
-#: builtin/checkout.c:1258 builtin/checkout.c:1622
-#, c-format
-msgid "reference is not a tree: %s"
-msgstr "la referència no és un arbre: %s"
-
-#: builtin/checkout.c:1305
-#, fuzzy, c-format
-msgid "a branch is expected, got tag '%s'"
-msgstr "no es pot llegir l'objecte %s «%s»"
-
-#: builtin/checkout.c:1307
-#, fuzzy, c-format
-msgid "a branch is expected, got remote branch '%s'"
-msgstr ""
-"La branca «%s» està configurada per a seguir la branca remota «%s» de «%s»."
-
-#: builtin/checkout.c:1308 builtin/checkout.c:1316
-#, fuzzy, c-format
-msgid "a branch is expected, got '%s'"
-msgstr "s'esperava shallow/unshallow, s'ha rebut %s"
-
-#: builtin/checkout.c:1311
-#, fuzzy, c-format
-msgid "a branch is expected, got commit '%s'"
-msgstr "La vostra branca està al dia amb «%s».\n"
-
-#: builtin/checkout.c:1327
-msgid ""
-"cannot switch branch while merging\n"
-"Consider \"git merge --quit\" or \"git worktree add\"."
-msgstr ""
-
-#: builtin/checkout.c:1331
-msgid ""
-"cannot switch branch in the middle of an am session\n"
-"Consider \"git am --quit\" or \"git worktree add\"."
-msgstr ""
-
-#: builtin/checkout.c:1335
-msgid ""
-"cannot switch branch while rebasing\n"
-"Consider \"git rebase --quit\" or \"git worktree add\"."
-msgstr ""
-
-#: builtin/checkout.c:1339
-msgid ""
-"cannot switch branch while cherry-picking\n"
-"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
-msgstr ""
-
-#: builtin/checkout.c:1343
-msgid ""
-"cannot switch branch while reverting\n"
-"Consider \"git revert --quit\" or \"git worktree add\"."
-msgstr ""
-
-#: builtin/checkout.c:1347
+#: builtin/checkout.c:1171
#, fuzzy
-msgid "you are switching branch while bisecting"
-msgstr "Actualment esteu bisecant."
-
-#: builtin/checkout.c:1354
-msgid "paths cannot be used with switching branches"
-msgstr "els camins no es poden usar amb canvi de branca"
-
-#: builtin/checkout.c:1357 builtin/checkout.c:1361 builtin/checkout.c:1365
-#, c-format
-msgid "'%s' cannot be used with switching branches"
-msgstr "«%s» no es pot usar amb canvi de branca"
-
-#: builtin/checkout.c:1369 builtin/checkout.c:1372 builtin/checkout.c:1375
-#: builtin/checkout.c:1380 builtin/checkout.c:1385
-#, c-format
-msgid "'%s' cannot be used with '%s'"
-msgstr "«%s» no es pot usar amb «%s»"
-
-#: builtin/checkout.c:1382
-#, fuzzy, c-format
-msgid "'%s' cannot take <start-point>"
-msgstr "«%s» no es pot usar amb actualització de camins"
-
-#: builtin/checkout.c:1390
-#, c-format
-msgid "Cannot switch branch to a non-commit '%s'"
-msgstr "No es pot canviar la branca a la no comissió «%s»"
-
-#: builtin/checkout.c:1397
-#, fuzzy
-msgid "missing branch or commit argument"
-msgstr "Manca el nom de branca; proveu -b"
-
-#: builtin/checkout.c:1439 builtin/clone.c:91 builtin/commit-graph.c:52
-#: builtin/commit-graph.c:113 builtin/fetch.c:167 builtin/merge.c:285
-#: builtin/multi-pack-index.c:27 builtin/pull.c:138 builtin/push.c:563
-#: builtin/send-pack.c:174
-msgid "force progress reporting"
-msgstr "força l'informe de progrés"
-
-#: builtin/checkout.c:1440
-msgid "perform a 3-way merge with the new branch"
-msgstr "realitza una fusió de 3 vies amb la branca nova"
-
-#: builtin/checkout.c:1441 builtin/log.c:1690 parse-options.h:322
-msgid "style"
-msgstr "estil"
-
-#: builtin/checkout.c:1442
-msgid "conflict style (merge or diff3)"
-msgstr "estil de conflicte (fusió o diff3)"
-
-#: builtin/checkout.c:1454 builtin/worktree.c:503
-msgid "detach HEAD at named commit"
-msgstr "separa HEAD a la comissió anomenada"
-
-#: builtin/checkout.c:1455
-msgid "set upstream info for new branch"
-msgstr "estableix la informació de font de la branca nova"
-
-#: builtin/checkout.c:1457
-msgid "force checkout (throw away local modifications)"
-msgstr "agafa a la força (descarta qualsevol modificació local)"
-
-#: builtin/checkout.c:1459
-msgid "new-branch"
-msgstr "branca-nova"
-
-#: builtin/checkout.c:1459
-msgid "new unparented branch"
-msgstr "branca òrfena nova"
-
-#: builtin/checkout.c:1461 builtin/merge.c:288
-msgid "update ignored files (default)"
-msgstr "actualitza els fitxers ignorats (per defecte)"
-
-#: builtin/checkout.c:1464
-msgid "do not check if another worktree is holding the given ref"
-msgstr "no comprovis si altre arbre de treball té la referència donada"
-
-#: builtin/checkout.c:1477
-msgid "checkout our version for unmerged files"
-msgstr "agafa la versió nostra dels fitxers sense fusionar"
-
-#: builtin/checkout.c:1480
-msgid "checkout their version for unmerged files"
-msgstr "agafa la versió seva dels fitxers sense fusionar"
-
-#: builtin/checkout.c:1484
-msgid "do not limit pathspecs to sparse entries only"
-msgstr "no limitis les especificacions de camí només a entrades disperses"
-
-#: builtin/checkout.c:1537
-msgid "-b, -B and --orphan are mutually exclusive"
-msgstr "-b, -B i --orphan són mútuament excloents"
-
-#: builtin/checkout.c:1540
-#, fuzzy
-msgid "-p and --overlay are mutually exclusive"
-msgstr "-n i -k són mútuament excloents."
-
-#: builtin/checkout.c:1577
-msgid "--track needs a branch name"
-msgstr "--track necessita un nom de branca"
-
-#: builtin/checkout.c:1582
-#, fuzzy
-msgid "missing branch name; try -b"
-msgstr "Manca el nom de branca; proveu -b"
-
-#: builtin/checkout.c:1615
-#, fuzzy, c-format
-msgid "could not resolve %s"
-msgstr "no s'ha pogut resoldre «%s»"
-
-#: builtin/checkout.c:1631
-msgid "invalid path specification"
-msgstr "especificació de camí no vàlida"
-
-#: builtin/checkout.c:1638
-#, 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
-#, 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»"
-
-#: builtin/checkout.c:1651
-#, fuzzy
-msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "--first-parent és incompatible amb --bisect"
-
-#: builtin/checkout.c:1654 builtin/reset.c:324
-#, fuzzy
-msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "--first-parent és incompatible amb --bisect"
-
-#: builtin/checkout.c:1665
msgid ""
-"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
-"checking out of the index."
-msgstr ""
-"git checkout: --ours/--theirs, --force i --merge són incompatibles en\n"
-"agafar de l'índex."
-
-#: builtin/checkout.c:1670
-#, fuzzy
-msgid "you must specify path(s) to restore"
-msgstr "Heu d'especificar un directori."
-
-#: builtin/checkout.c:1689
-#, 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"
@@ -11192,116 +12035,355 @@
"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:1714 builtin/checkout.c:1716 builtin/checkout.c:1765
-#: builtin/checkout.c:1767 builtin/clone.c:121 builtin/remote.c:169
-#: builtin/remote.c:171 builtin/worktree.c:499 builtin/worktree.c:501
+#: builtin/checkout.c:1181
+#, c-format
+msgid "'%s' matched multiple (%d) remote tracking branches"
+msgstr "«%s» coincideixen múltiples (%d) branques de seguiment remotes"
+
+#: builtin/checkout.c:1247
+msgid "only one reference expected"
+msgstr "només s'esperava una referència"
+
+#: builtin/checkout.c:1264
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "s'esperava només una referència, s'han donat %d."
+
+#: builtin/checkout.c:1310 builtin/worktree.c:342 builtin/worktree.c:510
+#, c-format
+msgid "invalid reference: %s"
+msgstr "referència no vàlida: %s"
+
+#: builtin/checkout.c:1323 builtin/checkout.c:1689
+#, c-format
+msgid "reference is not a tree: %s"
+msgstr "la referència no és un arbre: %s"
+
+#: builtin/checkout.c:1370
+#, c-format
+msgid "a branch is expected, got tag '%s'"
+msgstr "s'espera una branca, s'ha obtingut l'etiqueta «%s»"
+
+#: builtin/checkout.c:1372
+#, c-format
+msgid "a branch is expected, got remote branch '%s'"
+msgstr "s'espera una branca, s'ha obtingut la branca remota «%s»"
+
+#: builtin/checkout.c:1373 builtin/checkout.c:1381
+#, c-format
+msgid "a branch is expected, got '%s'"
+msgstr "s'espera una branca, s'ha obtingut «%s»"
+
+#: builtin/checkout.c:1376
+#, c-format
+msgid "a branch is expected, got commit '%s'"
+msgstr "s'espera una branca, s'ha obtingut la comissió «%s»"
+
+#: builtin/checkout.c:1392
+#, 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:1396
+#, 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:1400
+#, 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:1404
+#, 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:1408
+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\n"
+"Considereu «git revert --quit» o «git worktree add»."
+
+#: builtin/checkout.c:1412
+#, fuzzy
+msgid "you are switching branch while bisecting"
+msgstr "s'està canviant la branca mentre es bisect"
+
+#: builtin/checkout.c:1419
+msgid "paths cannot be used with switching branches"
+msgstr "els camins no es poden usar amb canvi de branca"
+
+#: builtin/checkout.c:1422 builtin/checkout.c:1426 builtin/checkout.c:1430
+#, c-format
+msgid "'%s' cannot be used with switching branches"
+msgstr "«%s» no es pot usar amb canvi de branca"
+
+#: builtin/checkout.c:1434 builtin/checkout.c:1437 builtin/checkout.c:1440
+#: builtin/checkout.c:1445 builtin/checkout.c:1450
+#, c-format
+msgid "'%s' cannot be used with '%s'"
+msgstr "«%s» no es pot usar amb «%s»"
+
+#: builtin/checkout.c:1447
+#, c-format
+msgid "'%s' cannot take <start-point>"
+msgstr "«%s» no pot prendre <start-point>"
+
+#: builtin/checkout.c:1455
+#, 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:1462
+msgid "missing branch or commit argument"
+msgstr "manca branca o argument de comissió"
+
+#: builtin/checkout.c:1504 builtin/clone.c:92 builtin/commit-graph.c:84
+#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:296
+#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:575
+#: builtin/send-pack.c:198
+msgid "force progress reporting"
+msgstr "força l'informe de progrés"
+
+#: builtin/checkout.c:1505
+msgid "perform a 3-way merge with the new branch"
+msgstr "realitza una fusió de 3 vies amb la branca nova"
+
+#: builtin/checkout.c:1506 builtin/log.c:1800 parse-options.h:322
+msgid "style"
+msgstr "estil"
+
+#: builtin/checkout.c:1507
+msgid "conflict style (merge or diff3)"
+msgstr "estil de conflicte (fusió o diff3)"
+
+#: builtin/checkout.c:1519 builtin/worktree.c:558
+msgid "detach HEAD at named commit"
+msgstr "separa HEAD a la comissió anomenada"
+
+#: builtin/checkout.c:1520
+msgid "set upstream info for new branch"
+msgstr "estableix la informació de font de la branca nova"
+
+#: builtin/checkout.c:1522
+msgid "force checkout (throw away local modifications)"
+msgstr "agafa a la força (descarta qualsevol modificació local)"
+
+#: builtin/checkout.c:1524
+msgid "new-branch"
+msgstr "branca-nova"
+
+#: builtin/checkout.c:1524
+msgid "new unparented branch"
+msgstr "branca òrfena nova"
+
+#: builtin/checkout.c:1526 builtin/merge.c:300
+msgid "update ignored files (default)"
+msgstr "actualitza els fitxers ignorats (per defecte)"
+
+#: builtin/checkout.c:1529
+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:1542
+msgid "checkout our version for unmerged files"
+msgstr "agafa la versió nostra dels fitxers sense fusionar"
+
+#: builtin/checkout.c:1545
+msgid "checkout their version for unmerged files"
+msgstr "agafa la versió seva dels fitxers sense fusionar"
+
+#: builtin/checkout.c:1549
+msgid "do not limit pathspecs to sparse entries only"
+msgstr "no limitis les especificacions de camí només a entrades disperses"
+
+#: builtin/checkout.c:1604
+#, c-format
+msgid "-%c, -%c and --orphan are mutually exclusive"
+msgstr "-%c, -%c i --orphan són mútuament excloents"
+
+#: builtin/checkout.c:1608
+msgid "-p and --overlay are mutually exclusive"
+msgstr "-p i --overlay són mútuament excloents"
+
+#: builtin/checkout.c:1645
+msgid "--track needs a branch name"
+msgstr "--track necessita un nom de branca"
+
+#: builtin/checkout.c:1650
+#, c-format
+msgid "missing branch name; try -%c"
+msgstr "falta el nom de la branca; proveu -%c"
+
+#: builtin/checkout.c:1682
+#, c-format
+msgid "could not resolve %s"
+msgstr "no es pot resoldre %s"
+
+#: builtin/checkout.c:1698
+msgid "invalid path specification"
+msgstr "especificació de camí no vàlida"
+
+#: builtin/checkout.c:1705
+#, 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:1709
+#, c-format
+msgid "git checkout: --detach does not take a path argument '%s'"
+msgstr "git checkout: --detach no accepta un argument de camí «%s»"
+
+#: builtin/checkout.c:1718
+msgid "--pathspec-from-file is incompatible with --detach"
+msgstr "--pathspec-from-file és incompatible amb --detach"
+
+#: builtin/checkout.c:1721 builtin/reset.c:325 builtin/stash.c:1499
+msgid "--pathspec-from-file is incompatible with --patch"
+msgstr "--pathspec-from-file és incompatible amb --patch"
+
+#: builtin/checkout.c:1734
+msgid ""
+"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
+"checking out of the index."
+msgstr ""
+"git checkout: --ours/--theirs, --force i --merge són incompatibles en\n"
+"agafar de l'índex."
+
+#: builtin/checkout.c:1739
+msgid "you must specify path(s) to restore"
+msgstr "heu d'especificar el camí o camins a restaurar"
+
+#: builtin/checkout.c:1765 builtin/checkout.c:1767 builtin/checkout.c:1816
+#: builtin/checkout.c:1818 builtin/clone.c:122 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:1715
+#: builtin/checkout.c:1766
msgid "create and checkout a new branch"
msgstr "crea i agafa una branca nova"
-#: builtin/checkout.c:1717
+#: builtin/checkout.c:1768
msgid "create/reset and checkout a branch"
msgstr "crea/restableix i agafa una branca"
-#: builtin/checkout.c:1718
+#: builtin/checkout.c:1769
msgid "create reflog for new branch"
msgstr "crea un registre de referència per a la branca nova"
-#: builtin/checkout.c:1720
+#: builtin/checkout.c:1771
#, fuzzy
msgid "second guess 'git checkout <no-such-branch>' (default)"
-msgstr "dubta 'git checkout <cap-branca-així>'"
-
-#: builtin/checkout.c:1721
-#, fuzzy
-msgid "use overlay mode (default)"
-msgstr "poda les referències soltes (per defecte)"
-
-#: builtin/checkout.c:1766
-#, fuzzy
-msgid "create and switch to a new branch"
-msgstr "crea i agafa una branca nova"
-
-#: builtin/checkout.c:1768
-#, fuzzy
-msgid "create/reset and switch to a branch"
-msgstr "crea/restableix i agafa una branca"
-
-#: builtin/checkout.c:1770
-#, fuzzy
-msgid "second guess 'git switch <no-such-branch>'"
-msgstr "dubta 'git checkout <cap-branca-així>'"
+msgstr "segon conjectura «git checkout <no-such-branch>» (per defecte)"
#: builtin/checkout.c:1772
-#, fuzzy
-msgid "throw away local modifications"
-msgstr "agafa a la força (descarta qualsevol modificació local)"
+msgid "use overlay mode (default)"
+msgstr "utilitza el mode de superposició (per defecte)"
-#: builtin/checkout.c:1804
+#: builtin/checkout.c:1817
+msgid "create and switch to a new branch"
+msgstr "crea i canvia a una branca nova"
+
+#: builtin/checkout.c:1819
+msgid "create/reset and switch to a branch"
+msgstr "crea/restableix i canvia a una branca"
+
+#: builtin/checkout.c:1821
+#, fuzzy
+msgid "second guess 'git switch <no-such-branch>'"
+msgstr "segon conjectura «git switch <no-such-branch>»"
+
+#: builtin/checkout.c:1823
+msgid "throw away local modifications"
+msgstr "descarta les modificacions locals"
+
+#: builtin/checkout.c:1857
#, fuzzy
msgid "which tree-ish to checkout from"
-msgstr "llegeix l'objecte des de stdin"
+msgstr "de quin arbre agafar"
-#: builtin/checkout.c:1806
-#, fuzzy
+#: builtin/checkout.c:1859
msgid "restore the index"
-msgstr "S'ha produït un error en llegir l'índex"
+msgstr "restaura l'índex"
-#: builtin/checkout.c:1808
-#, fuzzy
+#: builtin/checkout.c:1861
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:1810
-#, fuzzy
+#: builtin/checkout.c:1863
msgid "ignore unmerged entries"
-msgstr "s'està ignorant %s no fusionat\n"
+msgstr "ignora les entrades sense fusionar"
-#: builtin/checkout.c:1811
+#: builtin/checkout.c:1864
msgid "use overlay mode"
-msgstr ""
+msgstr "utilitza el mode de 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
-#, fuzzy, c-format
+#: builtin/clean.c:38
+#, c-format
msgid "could not lstat %s\n"
-msgstr "no s'ha pogut fer stat a %s"
+msgstr "no s'ha pogut fer lstat %s\n"
-#: builtin/clean.c:301 git-add--interactive.perl:595
+#: builtin/clean.c:302 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -11314,7 +12396,7 @@
"foo - selecciona un ítem basat en un prefix únic\n"
" - (buit) no seleccionis res\n"
-#: builtin/clean.c:305 git-add--interactive.perl:604
+#: builtin/clean.c:306 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -11335,33 +12417,33 @@
"* - tria tots els ítems\n"
" - (buit) finalitza la selecció\n"
-#: builtin/clean.c:521 git-add--interactive.perl:570
-#: git-add--interactive.perl:575
+#: builtin/clean.c:521 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Perdó (%s)?\n"
-#: builtin/clean.c:663
+#: builtin/clean.c:661
#, c-format
msgid "Input ignore patterns>> "
msgstr "Introduïu els patrons a ignorar>> "
-#: builtin/clean.c:700
+#: 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:721
+#: 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:762
+#: builtin/clean.c:758
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Voleu eliminar %s [y/N]? "
-#: builtin/clean.c:795
+#: builtin/clean.c:789
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -11372,71 +12454,67 @@
"? - 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:831
+#: 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:847
+#: 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:909
+#: builtin/clean.c:903
msgid "do not print names of files removed"
msgstr "no imprimeixis els noms dels fitxers eliminats"
-#: builtin/clean.c:911
+#: builtin/clean.c:905
msgid "force"
msgstr "força"
-#: builtin/clean.c:912
+#: builtin/clean.c:906
msgid "interactive cleaning"
msgstr "neteja interactiva"
-#: builtin/clean.c:914
+#: builtin/clean.c:908
msgid "remove whole directories"
msgstr "elimina directoris sencers"
-#: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550
-#: builtin/grep.c:901 builtin/log.c:177 builtin/log.c:179
-#: builtin/ls-files.c:557 builtin/name-rev.c:464 builtin/name-rev.c:466
+#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/grep.c:921 builtin/log.c:183 builtin/log.c:185
+#: 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:916
+#: builtin/clean.c:910
msgid "add <pattern> to ignore rules"
msgstr "afegiu <patró> per a ignorar les regles"
-#: builtin/clean.c:917
+#: builtin/clean.c:911
msgid "remove ignored files, too"
msgstr "elimina els fitxers ignorats, també"
-#: builtin/clean.c:919
+#: builtin/clean.c:913
msgid "remove only ignored files"
msgstr "elimina només els fitxers ignorats"
-#: builtin/clean.c:937
-msgid "-x and -X cannot be used together"
-msgstr "-x i -X no es poden usar junts"
-
-#: builtin/clean.c:941
+#: builtin/clean.c:929
msgid ""
-"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
-"clean"
+"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to"
+" clean"
msgstr ""
"clean.requireForce està establerta en cert i ni -i, -n ni -f s'han indicat; "
"refusant netejar"
-#: builtin/clean.c:944
+#: builtin/clean.c:932
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -11444,31 +12522,35 @@
"clean.requireForce és per defecte cert i ni -i, -n ni -f s'han indicat; "
"refusant netejar"
+#: 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>]"
-#: builtin/clone.c:93
+#: builtin/clone.c:94
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:95 builtin/clone.c:97 builtin/init-db.c:553
msgid "create a bare repository"
msgstr "crea un dipòsit nu"
-#: builtin/clone.c:98
+#: builtin/clone.c:99
msgid "create a mirror repository (implies bare)"
msgstr "crea un dipòsit mirall (implica bare)"
-#: builtin/clone.c:100
+#: builtin/clone.c:101
msgid "to clone from a local repository"
msgstr "per a clonar des d'un dipòsit local"
-#: builtin/clone.c:102
+#: builtin/clone.c:103
msgid "don't use local hardlinks, always copy"
msgstr "no usis enllaços durs locals, sempre copia"
-#: builtin/clone.c:104
+#: builtin/clone.c:105
msgid "setup as shared repository"
msgstr "configura com a dipòsit compartit"
@@ -11480,130 +12562,134 @@
msgid "initialize submodules in the clone"
msgstr "inicialitza els submòduls en el clon"
-#: builtin/clone.c:110
+#: builtin/clone.c:111
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:112 builtin/init-db.c:550
msgid "template-directory"
msgstr "directori-de-plantilla"
-#: builtin/clone.c:112 builtin/init-db.c:487
+#: builtin/clone.c:113 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:1392
-#: builtin/submodule--helper.c:1885
+#: builtin/clone.c:115 builtin/clone.c:117 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:1394
-#: builtin/submodule--helper.c:1887
+#: builtin/clone.c:119 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:3294 builtin/repack.c:327
+#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:561
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:358
msgid "name"
msgstr "nom"
-#: builtin/clone.c:120
+#: builtin/clone.c:121
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
+#: builtin/clone.c:123
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "agafa <branca> en lloc de la HEAD del remot"
-#: builtin/clone.c:124
+#: builtin/clone.c:125
msgid "path to git-upload-pack on the remote"
msgstr "camí a git-upload-pack en el remot"
-#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:840
-#: builtin/pull.c:227
+#: builtin/clone.c:126 builtin/fetch.c:173 builtin/grep.c:860
+#: builtin/pull.c:208
msgid "depth"
msgstr "profunditat"
-#: builtin/clone.c:126
+#: builtin/clone.c:127
msgid "create a shallow clone of that depth"
msgstr "crea un clon superficial de tal profunditat"
-#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3283
+#: builtin/clone.c:128 builtin/fetch.c:175 builtin/pack-objects.c:3535
+#: builtin/pull.c:211
msgid "time"
msgstr "hora"
-#: builtin/clone.c:128
+#: builtin/clone.c:129
msgid "create a shallow clone since a specific time"
msgstr "crea un clon superficial des d'una hora específica"
-#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195
-#: builtin/rebase.c:1445
+#: builtin/clone.c:130 builtin/fetch.c:177 builtin/fetch.c:200
+#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1317
msgid "revision"
msgstr "revisió"
-#: builtin/clone.c:130 builtin/fetch.c:173
+#: builtin/clone.c:131 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:133 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"
-#: builtin/clone.c:134
+#: builtin/clone.c:135
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
"no cloneu cap etiqueta, i feu que els «fetch» següents no els segueixen"
-#: builtin/clone.c:136
+#: builtin/clone.c:137
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:138 builtin/init-db.c:559
msgid "gitdir"
msgstr "directori de git"
-#: builtin/clone.c:138 builtin/init-db.c:496
+#: builtin/clone.c:139 builtin/init-db.c:560
msgid "separate git dir from working tree"
msgstr "separa el directori de git de l'arbre de treball"
-#: builtin/clone.c:139
+#: builtin/clone.c:140
msgid "key=value"
msgstr "clau=valor"
-#: builtin/clone.c:140
+#: builtin/clone.c:141
msgid "set config inside the new repository"
msgstr "estableix la configuració dins del dipòsit nou"
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
-#: builtin/push.c:573 builtin/send-pack.c:172
+#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76
+#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
msgid "server-specific"
msgstr "específic al servidor"
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
-#: builtin/push.c:573 builtin/send-pack.c:173
+#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76
+#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
msgid "option to transmit"
msgstr "opció a transmetre"
-#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:240
-#: builtin/push.c:574
+#: builtin/clone.c:144 builtin/fetch.c:196 builtin/pull.c:234
+#: builtin/push.c:585
msgid "use IPv4 addresses only"
msgstr "usa només adreces IPv4"
-#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:243
-#: builtin/push.c:576
+#: builtin/clone.c:146 builtin/fetch.c:198 builtin/pull.c:237
+#: builtin/push.c:587
msgid "use IPv6 addresses only"
msgstr "usa només adreces IPv6"
-#: builtin/clone.c:149
-#, fuzzy
+#: builtin/clone.c:150
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
+#: builtin/clone.c:152
msgid "initialize sparse-checkout file to include only files at root"
msgstr ""
+"inicialitza el fitxer «sparse-checkout» per a incloure només els fitxers a "
+"l'arrel"
-#: builtin/clone.c:287
+#: builtin/clone.c:288
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -11611,188 +12697,196 @@
"No s'ha pogut endevinar cap nom de directori.\n"
"Especifiqueu un directori en la línia d'ordres"
-#: builtin/clone.c:340
+#: builtin/clone.c:341
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: No s'ha pogut afegir un alternatiu per a «%s»: %s\n"
-#: builtin/clone.c:413
+#: builtin/clone.c:414
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existeix i no és directori"
-#: builtin/clone.c:430
+#: builtin/clone.c:432
#, fuzzy, c-format
msgid "failed to start iterator over '%s'"
-msgstr "no s'ha pogut escriure a «%s»"
+msgstr "no s'ha pogut iniciar l'iterador per sobre de «%s»"
-#: builtin/clone.c:460
+#: builtin/clone.c:463
#, c-format
msgid "failed to create link '%s'"
msgstr "s'ha produït un error en crear l'enllaç «%s»"
-#: builtin/clone.c:464
+#: builtin/clone.c:467
#, c-format
msgid "failed to copy file to '%s'"
msgstr "s'ha produït un error en copiar el fitxer a «%s»"
-#: builtin/clone.c:469
-#, fuzzy, c-format
+#: builtin/clone.c:472
+#, 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:494
+#: builtin/clone.c:499
#, c-format
msgid "done.\n"
msgstr "fet.\n"
-#: builtin/clone.c:508
+#: builtin/clone.c:513
#, 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:585
+#: builtin/clone.c:590
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "No s'ha pogut trobar la branca remota %s per a clonar."
-#: builtin/clone.c:704
+#: builtin/clone.c:709
#, c-format
msgid "unable to update %s"
msgstr "no s'ha pogut actualitzar %s"
-#: builtin/clone.c:752
-#, fuzzy
+#: builtin/clone.c:757
msgid "failed to initialize sparse-checkout"
-msgstr "s'ha produït un error en finalitzar «%s»"
+msgstr "no s'ha pogut inicialitzar «sparse-checkout»"
-#: builtin/clone.c:775
+#: builtin/clone.c:780
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"la HEAD remot es refereix a una referència que no existeix; no s'ha pogut "
"agafar.\n"
-#: builtin/clone.c:806
+#: builtin/clone.c:812
msgid "unable to checkout working tree"
msgstr "no s'ha pogut agafar l'arbre de treball"
-#: builtin/clone.c:856
+#: builtin/clone.c:887
msgid "unable to write parameters to config file"
msgstr "no s'han pogut escriure els paràmetres al fitxer de configuració"
-#: builtin/clone.c:919
+#: builtin/clone.c:950
msgid "cannot repack to clean up"
msgstr "no es pot reempaquetar per a netejar"
-#: builtin/clone.c:921
+#: builtin/clone.c:952
msgid "cannot unlink temporary alternates file"
msgstr "no es pot desenllaçar el fitxer d'alternatives temporal"
-#: builtin/clone.c:959 builtin/receive-pack.c:1948
+#: builtin/clone.c:992 builtin/receive-pack.c:2493
msgid "Too many arguments."
-msgstr "Hi ha massa paràmetres."
+msgstr "Hi ha massa arguments."
-#: builtin/clone.c:963
+#: builtin/clone.c:996
msgid "You must specify a repository to clone."
msgstr "Heu d'especificar un dipòsit per a clonar."
-#: builtin/clone.c:976
+#: builtin/clone.c:1009
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "les opcions --bare i --origin %s són incompatibles."
-#: builtin/clone.c:979
+#: builtin/clone.c:1012
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare i --separate-git-dir són incompatibles."
-#: builtin/clone.c:992
+#: builtin/clone.c:1025
#, c-format
msgid "repository '%s' does not exist"
msgstr "el dipòsit «%s» no existeix"
-#: builtin/clone.c:998 builtin/fetch.c:1787
+#: builtin/clone.c:1029 builtin/fetch.c:1841
#, c-format
msgid "depth %s is not a positive number"
msgstr "la profunditat %s no és un nombre positiu"
-#: builtin/clone.c:1008
+#: builtin/clone.c:1039
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "el camí destí «%s» ja existeix i no és un directori buit."
-#: builtin/clone.c:1018
+#: builtin/clone.c:1045
+#, 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:1059
#, c-format
msgid "working tree '%s' already exists."
msgstr "l'arbre de treball «%s» ja existeix."
-#: builtin/clone.c:1033 builtin/clone.c:1054 builtin/difftool.c:271
-#: builtin/log.c:1866 builtin/worktree.c:302 builtin/worktree.c:334
+#: builtin/clone.c:1074 builtin/clone.c:1095 builtin/difftool.c:271
+#: builtin/log.c:1987 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:1038
+#: builtin/clone.c:1079
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "no s'ha pogut crear el directori d'arbre de treball «%s»"
-#: builtin/clone.c:1058
+#: builtin/clone.c:1099
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "S'està clonant al dipòsit nu «%s»...\n"
-#: builtin/clone.c:1060
+#: builtin/clone.c:1101
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "S'està clonant a «%s»...\n"
-#: builtin/clone.c:1084
+#: builtin/clone.c:1125
msgid ""
-"clone --recursive is not compatible with both --reference and --reference-if-"
-"able"
+"clone --recursive is not compatible with both --reference and --reference-"
+"if-able"
msgstr ""
"clone --recursive no és compatible amb ambdós --reference i --reference-if-"
"able"
-#: builtin/clone.c:1148
+#: builtin/clone.c:1169 builtin/remote.c:200 builtin/remote.c:705
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr "«%s» no és un nom de remot vàlid"
+
+#: builtin/clone.c:1210
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth s'ignora en els clons locals; useu file:// en lloc d'això."
-#: builtin/clone.c:1150
+#: builtin/clone.c:1212
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-since s'ignora en els clons locals; useu file:// en lloc d'això."
-#: builtin/clone.c:1152
+#: builtin/clone.c:1214
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-exclude s'ignora en els clons locals; useu file:// en lloc d'això."
-#: builtin/clone.c:1154
+#: builtin/clone.c:1216
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter s'ignora en els clons locals; useu file:// en lloc d'això."
-#: builtin/clone.c:1157
+#: builtin/clone.c:1219
msgid "source repository is shallow, ignoring --local"
msgstr "el dipòsit font és superficial, s'està ignorant --local"
-#: builtin/clone.c:1162
+#: builtin/clone.c:1224
msgid "--local is ignored"
msgstr "--local s'ignora"
-#: builtin/clone.c:1237 builtin/clone.c:1245
+#: builtin/clone.c:1308 builtin/clone.c:1316
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "La branca remota %s no es troba en la font %s"
-#: builtin/clone.c:1248
+#: builtin/clone.c:1319
msgid "You appear to have cloned an empty repository."
msgstr "Sembla que heu clonat un dipòsit buit."
@@ -11826,78 +12920,190 @@
#: 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
+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 <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 "no s'ha pogut trobar el directori de l'objecte que coincideixi amb %s"
+
+#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
+#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1769
+msgid "dir"
+msgstr "directori"
+
+#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
+#: builtin/commit-graph.c:317
+msgid "The object directory to store the graph"
+msgstr "El directori d'objectes per a emmagatzemar el gràfic"
+
+#: builtin/commit-graph.c:83
+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
+#, 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
+#, c-format
+msgid "invalid object: %s"
+msgstr "no és un objecte vàlid: %s"
+
+#: builtin/commit-graph.c:213
+msgid "start walk at all refs"
+msgstr "comença a caminar en totes les referències"
+
+#: builtin/commit-graph.c:215
+msgid "scan pack-indexes listed by stdin for commits"
+msgstr "explora els índexs del paquet llistats per a stdin per a comissions"
+
+#: builtin/commit-graph.c:217
+#, fuzzy
+msgid "start walk at commits listed by stdin"
+msgstr "comença a caminar a les comissions llistades per a stdin"
+
+#: builtin/commit-graph.c:219
+msgid "include all commits already in the commit-graph file"
+msgstr "inclou ja totes les comissions al fitxer del graf de comissions"
+
+#: builtin/commit-graph.c:221
+msgid "enable computation for changed paths"
+msgstr "habilita la computació per als camins canviats"
+
+#: builtin/commit-graph.c:224
+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
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr "ràtio màxima entre dos nivells d'un graf de comissions dividit"
+
+#: builtin/commit-graph.c:232
+msgid "only expire files older than a given date-time"
+msgstr "fes caducar els objectes més antics que l'hora i data donades"
+
+#: 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 "S'estan recollint les comissions de l'entrada"
#: builtin/commit-tree.c:18
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
+#, c-format
msgid "duplicate parent %s ignored"
-msgstr "suprimeix les referències reemplaçades"
+msgstr "s'han ignorat el pare %s duplicat"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526
-#, fuzzy, c-format
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:555
+#, 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/commit-tree.c:93
-#, fuzzy, c-format
+#, 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
+#, 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
+#, 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
msgid "parent"
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:1496 builtin/merge.c:270
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1469
-#: builtin/tag.c:412
+#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:281
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1470
+#: builtin/tag.c:413
msgid "message"
msgstr "missatge"
-#: builtin/commit-tree.c:115 builtin/commit.c:1496
+#: 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 comissió des d'un fitxer"
-#: builtin/commit-tree.c:121 builtin/commit.c:1508 builtin/merge.c:287
-#: builtin/pull.c:195 builtin/revert.c:118
+#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:298
+#: 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>..."
@@ -11915,7 +13121,7 @@
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 ""
@@ -11925,19 +13131,22 @@
" 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"
@@ -11949,21 +13158,23 @@
" 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:351
-#, fuzzy
+#: builtin/commit.c:348
msgid "--pathspec-from-file with -a does not make sense"
-msgstr "-a no té sentit amb camins."
+msgstr "--pathspec-from-file amb -a no té sentit"
-#: builtin/commit.c:364
+#: 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:376
+#: builtin/commit.c:373
msgid "unable to create temporary index"
msgstr "no s'ha pogut crear un índex temporal"
@@ -11971,49 +13182,53 @@
msgid "interactive add failed"
msgstr "l'afegiment interactiu ha fallat"
-#: builtin/commit.c:396
+#: builtin/commit.c:397
msgid "unable to update temporary index"
msgstr "no s'ha pogut actualitzar l'índex temporal"
-#: builtin/commit.c:398
+#: 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:423 builtin/commit.c:446 builtin/commit.c:492
+#: 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:475
+#: 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:477
+#: 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:485
+#: builtin/commit.c:480
+msgid "cannot do a partial commit during a rebase."
+msgstr "no es pot fer una comissió parcial durant un «rebase»."
+
+#: builtin/commit.c:488
msgid "cannot read the index"
msgstr "no es pot llegir l'índex"
-#: builtin/commit.c:504
+#: 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:602
+#: 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:604
+#: 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:623
+#: builtin/commit.c:626
msgid "malformed --author parameter"
msgstr "paràmetre --author mal format"
-#: builtin/commit.c:676
+#: builtin/commit.c:679
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -12021,78 +13236,76 @@
"no es pot seleccionar un caràcter de comentari que\n"
"no sigui usat en el missatge de comissió actual"
-#: builtin/commit.c:714 builtin/commit.c:747 builtin/commit.c:1092
+#: builtin/commit.c: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:726 builtin/shortlog.c:319
+#: builtin/commit.c:729 builtin/shortlog.c:425
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(s'està llegint el missatge de registre des de l'entrada estàndard)\n"
-#: builtin/commit.c:728
+#: builtin/commit.c: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:732
+#: 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:763 builtin/commit.c:779
+#: 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:770
+#: builtin/commit.c:773
msgid "could not read MERGE_MSG"
msgstr "no s'ha pogut llegir MERGE_MSG"
-#: builtin/commit.c:830
+#: builtin/commit.c:833
msgid "could not write commit template"
msgstr "no s'ha pogut escriure la plantilla de comissió"
-#: builtin/commit.c:849
-#, 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"
"Sembla que podeu estar cometent una fusió.\n"
-"Si això no és correcte, elimineu el fitxer\n"
-"\t%s\n"
+"Si això no és correcte, executeu\n"
+"\tgit update-ref -d MERGE_HEAD\n"
"i intenteu-ho de nou.\n"
-#: builtin/commit.c:854
-#, 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"
"Sembla que podeu estar cometent un «cherry pick».\n"
-"Si això no és correcte, elimineu el fitxer\n"
-"\t%s\n"
+"Si això no és correcte, executeu\n"
+"\tgit update-ref -d CHERRY_PICK_HEAD\n"
"i intenteu-ho de nou.\n"
-#: builtin/commit.c:867
+#: 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 ""
"Introduïu el missatge de comissió dels vostres canvis.\n"
-"S'ignoraran les línies que comencin amb «%c», i un missatge de\n"
+"S'ignoraran les línies que comencin amb «%c». Un missatge de\n"
"comissió buit avorta la comissió.\n"
-#: builtin/commit.c:875
+#: builtin/commit.c:876
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -12100,146 +13313,150 @@
"An empty message aborts the commit.\n"
msgstr ""
"Introduïu el missatge de comissió dels vostres canvis.\n"
-"Es mantindran les línies que comencin amb «%c»; podeu eliminar-les "
-"vosaltres\n"
+"Es mantindran les línies que comencin amb «%c»; podeu eliminar-les vosaltres\n"
"mateixos si voleu. Un missatge buit avorta la comissió.\n"
-#: builtin/commit.c:892
+#: builtin/commit.c:893
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:900
+#: builtin/commit.c:901
#, c-format
msgid "%sDate: %s"
msgstr "%sData: %s"
-#: builtin/commit.c:907
+#: builtin/commit.c:908
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sComitent: %.*s <%.*s>"
-#: builtin/commit.c:925
+#: builtin/commit.c:926
msgid "Cannot read index"
msgstr "No es pot llegir l'índex"
-#: builtin/commit.c:992
+#: builtin/commit.c:997
msgid "Error building trees"
msgstr "Error en construir arbres"
-#: builtin/commit.c:1006 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:1050
+#: 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:1064
+#: 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:1082 builtin/commit.c:1322
+#: 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:1122
+#: builtin/commit.c:1127
msgid "--long and -z are incompatible"
msgstr "--long i -z són incompatibles"
-#: builtin/commit.c:1166
+#: 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:1175
+#: builtin/commit.c:1180
msgid "You have nothing to amend."
msgstr "No teniu res a esmenar."
-#: builtin/commit.c:1178
+#: 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:1180
+#: 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:1183
+#: 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:1193
+#: 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:1195
+#: 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:1203
+#: 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:1220
+#: 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:1226
-#, 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:1357 builtin/commit.c:1519
+#: builtin/commit.c:1366 builtin/commit.c:1527
msgid "show status concisely"
msgstr "mostra l'estat concisament"
-#: builtin/commit.c:1359 builtin/commit.c:1521
+#: builtin/commit.c:1368 builtin/commit.c:1529
msgid "show branch information"
msgstr "mostra la informació de branca"
-#: builtin/commit.c:1361
+#: builtin/commit.c:1370
msgid "show stash information"
msgstr "mostra la informació de «stash»"
-#: builtin/commit.c:1363 builtin/commit.c:1523
+#: 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:1365
+#: builtin/commit.c:1374
msgid "version"
msgstr "versió"
-#: builtin/commit.c:1365 builtin/commit.c:1525 builtin/push.c:549
-#: builtin/worktree.c:650
+#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560
+#: builtin/worktree.c:725
msgid "machine-readable output"
msgstr "sortida llegible per màquina"
-#: builtin/commit.c:1368 builtin/commit.c:1527
+#: 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:1371 builtin/commit.c:1530
+#: builtin/commit.c:1380 builtin/commit.c:1538
msgid "terminate entries with NUL"
msgstr "acaba les entrades amb NUL"
-#: builtin/commit.c:1373 builtin/commit.c:1377 builtin/commit.c:1533
-#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
-#: builtin/fast-export.c:1159 builtin/rebase.c:1525 parse-options.h:336
+#: builtin/commit.c: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:1406 parse-options.h:336
msgid "mode"
msgstr "mode"
-#: builtin/commit.c:1374 builtin/commit.c:1533
+#: 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:1378
+#: builtin/commit.c:1387
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -12247,11 +13464,11 @@
"mostra els fitxers ignorats, modes opcionals: traditional, matching, no. "
"(Per defecte: traditional, matching, no.)"
-#: builtin/commit.c:1380 parse-options.h:192
+#: builtin/commit.c:1389 parse-options.h:192
msgid "when"
msgstr "quan"
-#: builtin/commit.c:1381
+#: builtin/commit.c:1390
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -12259,455 +13476,410 @@
"ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per "
"defecte: all)"
-#: builtin/commit.c:1383
+#: builtin/commit.c:1392
msgid "list untracked files in columns"
msgstr "mostra els fitxers no seguits en columnes"
-#: builtin/commit.c:1384
+#: builtin/commit.c:1393
msgid "do not detect renames"
msgstr "no detectis canvis de noms"
-#: builtin/commit.c:1386
+#: 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:1406
-msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
+"detecta canvis de noms, i opcionalment estableix un índex de semblança"
-#: builtin/commit.c:1489
+#: builtin/commit.c:1415
+#, fuzzy
+msgid "Unsupported combination of ignored and untracked-files arguments"
+msgstr "Combinació d'arguments ignorats i no seguits"
+
+#: builtin/commit.c:1497
msgid "suppress summary after successful commit"
msgstr "omet el resum després d'una comissió reeixida"
-#: builtin/commit.c:1490
+#: 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:1492
+#: builtin/commit.c:1500
msgid "Commit message options"
msgstr "Opcions de missatge de comissió"
-#: builtin/commit.c:1493 builtin/merge.c:274 builtin/tag.c:414
+#: builtin/commit.c:1501 builtin/merge.c:285 builtin/tag.c:415
msgid "read message from file"
msgstr "llegiu el missatge des d'un fitxer"
-#: builtin/commit.c:1494
+#: builtin/commit.c:1502
msgid "author"
msgstr "autor"
-#: builtin/commit.c:1494
+#: builtin/commit.c:1502
msgid "override author for commit"
msgstr "autor corregit de la comissió"
-#: builtin/commit.c:1495 builtin/gc.c:538
+#: builtin/commit.c:1503 builtin/gc.c:542
msgid "date"
msgstr "data"
-#: builtin/commit.c:1495
+#: builtin/commit.c:1503
msgid "override date for commit"
msgstr "data corregida de la comissió"
-#: builtin/commit.c:1497 builtin/commit.c:1498 builtin/commit.c:1499
-#: builtin/commit.c:1500 parse-options.h:328 ref-filter.h:92
+#: builtin/commit.c: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:1497
+#: 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:1498
+#: builtin/commit.c:1506
msgid "reuse message from specified commit"
msgstr "reusa el missatge de la comissió especificada"
-#: builtin/commit.c:1499
+#: 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:1500
+#: 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:1501
+#: 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)"
+msgstr "l'autor de la comissió soc jo ara (s'usa amb -C/-c/--amend)"
-#: builtin/commit.c:1502 builtin/log.c:1634 builtin/merge.c:289
-#: builtin/pull.c:164 builtin/revert.c:110
-msgid "add Signed-off-by:"
+#: builtin/commit.c:1510 builtin/log.c:1744 builtin/merge.c:301
+#: builtin/pull.c:145 builtin/revert.c:110
+#, fuzzy
+msgid "add a Signed-off-by trailer"
msgstr "afegeix Signed-off-by:"
-#: builtin/commit.c:1503
+#: builtin/commit.c:1511
msgid "use specified template file"
msgstr "usa el fitxer de plantilla especificat"
-#: builtin/commit.c:1504
+#: builtin/commit.c:1512
msgid "force edit of commit"
msgstr "força l'edició de la comissió"
-#: builtin/commit.c:1506
+#: 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:1511
+#: builtin/commit.c:1519
msgid "Commit contents options"
msgstr "Opcions dels continguts de les comissions"
-#: builtin/commit.c:1512
+#: builtin/commit.c:1520
msgid "commit all changed files"
msgstr "comet tots els fitxers canviats"
-#: builtin/commit.c:1513
+#: 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:1514
+#: builtin/commit.c:1522
msgid "interactively add files"
msgstr "afegeix els fitxers interactivament"
-#: builtin/commit.c:1515
+#: builtin/commit.c:1523
msgid "interactively add changes"
msgstr "afegeix els canvis interactivament"
-#: builtin/commit.c:1516
+#: builtin/commit.c:1524
msgid "commit only specified files"
msgstr "comet només els fitxers especificats"
-#: builtin/commit.c:1517
+#: 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:1518
+#: builtin/commit.c:1526
msgid "show what would be committed"
msgstr "mostra què es cometria"
-#: builtin/commit.c:1531
+#: builtin/commit.c:1539
msgid "amend previous commit"
msgstr "esmena la comissió anterior"
-#: builtin/commit.c:1532
+#: builtin/commit.c:1540
msgid "bypass post-rewrite hook"
msgstr "evita el lligam de post escriptura"
-#: builtin/commit.c:1539
+#: builtin/commit.c:1547
msgid "ok to record an empty change"
msgstr "està bé registrar un canvi buit"
-#: builtin/commit.c:1541
+#: 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:1614
+#: builtin/commit.c:1622
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Fitxer MERGE_HEAD malmès (%s)"
-#: builtin/commit.c:1621
+#: builtin/commit.c:1629
msgid "could not read MERGE_MODE"
msgstr "no s'ha pogut llegir MERGE_MODE"
-#: builtin/commit.c:1640
+#: 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:1647
+#: 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:1652
+#: 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:1686
+#: 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 builtin/commit-graph.c:17
-msgid ""
-"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
-msgstr ""
-
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:22
-msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
-msgstr ""
-
-#: builtin/commit-graph.c:48 builtin/commit-graph.c:103
-#: builtin/commit-graph.c:187 builtin/fetch.c:179 builtin/log.c:1657
-msgid "dir"
-msgstr "directori"
-
-#: builtin/commit-graph.c:49 builtin/commit-graph.c:104
-#: builtin/commit-graph.c:188
-msgid "The object directory to store the graph"
-msgstr ""
-
-#: builtin/commit-graph.c:51
-msgid "if the commit-graph is split, only verify the tip file"
-msgstr ""
-
-#: builtin/commit-graph.c:73 t/helper/test-read-graph.c:23
-#, fuzzy, c-format
-msgid "Could not open commit-graph '%s'"
-msgstr "no s'ha pogut analitzar la comissió «%s»"
-
-#: builtin/commit-graph.c:106
-msgid "start walk at all refs"
-msgstr ""
-
-#: builtin/commit-graph.c:108
-msgid "scan pack-indexes listed by stdin for commits"
-msgstr ""
-
-#: builtin/commit-graph.c:110
-msgid "start walk at commits listed by stdin"
-msgstr ""
-
-#: builtin/commit-graph.c:112
-msgid "include all commits already in the commit-graph file"
-msgstr ""
-
-#: builtin/commit-graph.c:115
-#, fuzzy
-msgid "allow writing an incremental commit-graph file"
-msgstr "Escriu i verifica els fitxers commit-graph de Git"
-
-#: builtin/commit-graph.c:117 builtin/commit-graph.c:121
-msgid "maximum number of commits in a non-base split commit-graph"
-msgstr ""
-
-#: builtin/commit-graph.c:119
-msgid "maximum ratio between two levels of a split commit-graph"
-msgstr ""
-
-#: builtin/commit-graph.c:137
-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:109 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:121
msgid "only one type at a time"
msgstr "només un tipus cada cop"
-#: builtin/config.c:124
+#: builtin/config.c:130
msgid "Config file location"
msgstr "Ubicació del fitxer de configuració"
-#: builtin/config.c:125
+#: builtin/config.c:131
msgid "use global config file"
msgstr "usa el fitxer de configuració global"
-#: builtin/config.c:126
+#: builtin/config.c:132
msgid "use system config file"
msgstr "usa el fitxer de configuració del sistema"
-#: builtin/config.c:127
+#: builtin/config.c:133
msgid "use repository config file"
msgstr "usa el fitxer de configuració del dipòsit"
-#: builtin/config.c:128
+#: builtin/config.c:134
msgid "use per-worktree config file"
msgstr "usa un fitxer de configuració per dipòsit"
-#: builtin/config.c:129
+#: builtin/config.c:135
msgid "use given config file"
msgstr "usa el fitxer de configuració donat"
-#: builtin/config.c:130
+#: builtin/config.c:136
msgid "blob-id"
msgstr "ID de blob"
-#: builtin/config.c:130
+#: builtin/config.c:136
msgid "read config from given blob object"
msgstr "llegeix la configuració de l'objecte de blob donat"
-#: builtin/config.c:131
+#: builtin/config.c:137
msgid "Action"
msgstr "Acció"
-#: builtin/config.c:132
-msgid "get value: name [value-regex]"
-msgstr "obtén valor: nom [regex-de-valors]"
+#: builtin/config.c:138
+msgid "get value: name [value-pattern]"
+msgstr "obtén valor: nom [value-pattern]"
-#: builtin/config.c:133
-msgid "get all values: key [value-regex]"
-msgstr "obtén tots els valors: clau [regex-de-valors]"
+#: builtin/config.c:139
+msgid "get all values: key [value-pattern]"
+msgstr "obtén tots els valors: clau [value-pattern]"
-#: builtin/config.c:134
-msgid "get values for regexp: name-regex [value-regex]"
-msgstr "obtén valors de regexp: regex-de-noms [regex-de-valors]"
+#: builtin/config.c:140
+msgid "get values for regexp: name-regex [value-pattern]"
+msgstr "obtén valors de regexp: name-regex [value-pattern]"
-#: builtin/config.c:135
+#: builtin/config.c:141
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
-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:142
+msgid "replace all matching variables: name value [value-pattern]"
+msgstr "reemplaça totes les variables que coincideixen: nom valor [value-pattern]"
-#: builtin/config.c:137
+#: builtin/config.c:143
msgid "add a new variable: name value"
msgstr "afegeix una variable nova: nom valor"
-#: builtin/config.c:138
-msgid "remove a variable: name [value-regex]"
-msgstr "elimina una variable: nom [regex-de-valors]"
+#: builtin/config.c:144
+msgid "remove a variable: name [value-pattern]"
+msgstr "elimina una variable: nom [value-pattern]"
-#: builtin/config.c:139
-msgid "remove all matches: name [value-regex]"
-msgstr "elimina totes les coincidències: nom [regex-de-valors]"
+#: builtin/config.c:145
+msgid "remove all matches: name [value-pattern]"
+msgstr "elimina totes les coincidències: nom [value-pattern]"
-#: builtin/config.c:140
+#: builtin/config.c:146
msgid "rename section: old-name new-name"
msgstr "canvia el nom de secció: nom-antic nom-nou"
-#: builtin/config.c:141
+#: builtin/config.c:147
msgid "remove a section: name"
msgstr "elimina una secció: nom"
-#: builtin/config.c:142
+#: builtin/config.c:148
msgid "list all"
msgstr "llista tots"
-#: builtin/config.c:143
+#: builtin/config.c:149
+msgid "use string equality when comparing values to 'value-pattern'"
+msgstr "usa la igualtat de les cadenes quan es comparen els valors amb «value-pattern»"
+
+#: builtin/config.c:150
msgid "open an editor"
msgstr "obre un editor"
-#: builtin/config.c:144
+#: builtin/config.c:151
msgid "find the color configured: slot [default]"
msgstr "troba el color configurat: ranura [per defecte]"
-#: builtin/config.c:145
+#: builtin/config.c:152
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:153
msgid "Type"
msgstr "Tipus"
-#: builtin/config.c:147 builtin/env--helper.c:38
+#: builtin/config.c:154 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:155
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:156
msgid "value is decimal number"
msgstr "el valor és un nombre decimal"
-#: builtin/config.c:150
+#: builtin/config.c:157
msgid "value is --bool or --int"
msgstr "el valor és --bool o --int"
-#: builtin/config.c:151
+#: builtin/config.c:158
+msgid "value is --bool or string"
+msgstr "el valor és --bool o string"
+
+#: builtin/config.c:159
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:160
msgid "value is an expiry date"
msgstr "el valor és una data de venciment"
-#: builtin/config.c:153
+#: builtin/config.c:161
msgid "Other"
msgstr "Altre"
-#: builtin/config.c:154
+#: builtin/config.c:162
msgid "terminate values with NUL byte"
msgstr "acaba els valors amb un octet NUL"
-#: builtin/config.c:155
+#: builtin/config.c:163
msgid "show variable names only"
msgstr "mostra només els noms de variable"
-#: builtin/config.c:156
+#: builtin/config.c:164
msgid "respect include directives on lookup"
msgstr "respecta les directives d'inclusió en cercar"
-#: builtin/config.c:157
+#: builtin/config.c:165
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:166
+#, 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:167 builtin/env--helper.c:45
msgid "value"
msgstr "valor"
-#: builtin/config.c:158
+#: builtin/config.c:167
+#, 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:181
+#, 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:183
+#, 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:339
#, c-format
msgid "invalid key pattern: %s"
msgstr "patró de la clau no vàlid: %s"
-#: builtin/config.c:344
+#: builtin/config.c:377
#, 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"
+"s'ha produït un error en formatar el valor per defecte de la configuració: "
+"%s"
-#: builtin/config.c:401
+#: builtin/config.c:441
#, c-format
msgid "cannot parse color '%s'"
msgstr "no es pot analitzar el color «%s»"
-#: builtin/config.c:443
+#: builtin/config.c:483
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:536 builtin/config.c:833
msgid "not in a git directory"
msgstr "no és en un directori git"
-#: builtin/config.c:499
+#: builtin/config.c:539
msgid "writing to stdin is not supported"
msgstr "no s'admet escriure a stdin"
-#: builtin/config.c:502
+#: builtin/config.c:542
#, 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:627
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -12722,75 +13894,89 @@
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:611
+#: builtin/config.c:652
msgid "only one config file at a time"
msgstr "només un fitxer de configuració cada cop"
-#: builtin/config.c:616
+#: builtin/config.c:658
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:660
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:662
+#, 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:684
msgid "$HOME not set"
msgstr "$HOME no està establerta"
-#: builtin/config.c:658
+#: builtin/config.c:708
+#, 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:743
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:748
msgid "only one action at a time"
msgstr "només una acció cada cop"
-#: builtin/config.c:706
+#: builtin/config.c:761
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:767
msgid ""
-"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
-"list"
+"--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:773
msgid "--default is only applicable to --get"
msgstr "--default només és aplicable a --get"
-#: builtin/config.c:731
+#: builtin/config.c:806
+#, fuzzy
+msgid "--fixed-value only applies with 'value-pattern'"
+msgstr "--fixed-value només s'aplica amb 'value-pattern'"
+
+#: builtin/config.c:822
#, 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:825
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:835
msgid "editing stdin is not supported"
msgstr "no hi ha compatibilitat per a l'edició a stdin"
-#: builtin/config.c:746
+#: builtin/config.c:837
msgid "editing blobs is not supported"
msgstr "no hi ha compatibilitat per l'edició de blobs"
-#: builtin/config.c:760
+#: builtin/config.c:851
#, 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:864
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -12799,7 +13985,7 @@
"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:943 builtin/config.c:954
#, c-format
msgid "no such section: %s"
msgstr "no existeix la secció: %s"
@@ -12812,6 +13998,41 @@
msgid "print sizes in human readable format"
msgstr "imprimeix les mides en un format llegible pels humans"
+#: 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
+#, fuzzy
+msgid "credential-cache--daemon unavailable; no unix socket support"
+msgstr ""
+"credencial-cache-daemon no disponible; no hi ha compatibilitat amb sòcols "
+"unix"
+
+#: builtin/credential-cache.c:154
+msgid "credential-cache unavailable; no unix socket support"
+msgstr ""
+"credencial-cache no disponible; no hi ha compatibilitat amb els sòcols d'unix"
+
+#: builtin/credential-store.c:66
+#, fuzzy, c-format
+msgid "unable to get credential storage lock in %d ms"
+msgstr "no s'ha pogut obtenir el directori de treball actual"
+
#: builtin/describe.c:26
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<opcions>] [<comissió>...]"
@@ -12820,49 +14041,46 @@
msgid "git describe [<options>] --dirty"
msgstr "git describe [<opcions>] --dirty"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "head"
msgstr "davant per"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "lightweight"
msgstr "lleuger"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "annotated"
msgstr "anotat"
-#: builtin/describe.c:275
+#: builtin/describe.c:277
#, c-format
msgid "annotated tag %s not available"
msgstr "l'etiqueta anotada %s no és disponible"
-#: builtin/describe.c:279
-#, c-format
-msgid "annotated tag %s has no embedded name"
-msgstr "l'etiqueta anotada %s no té nom incrustat"
-
#: builtin/describe.c:281
#, c-format
-msgid "tag '%s' is really '%s' here"
-msgstr "l'etiqueta «%s» realment és «%s» aquí"
+msgid "tag '%s' is externally known as '%s'"
+msgstr "l'etiqueta «%s» es coneix externament com a «%s»"
-#: builtin/describe.c:325
+#: builtin/describe.c:328
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "cap etiqueta coincideix exactament amb «%s»"
-#: builtin/describe.c:327
+#: builtin/describe.c:330
#, 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 a "
+"descriure\n"
-#: builtin/describe.c:381
+#: builtin/describe.c:397
#, c-format
msgid "finished search at %s\n"
msgstr "s'ha finalitzat la cerca a %s\n"
-#: builtin/describe.c:407
+#: builtin/describe.c:424
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -12871,7 +14089,7 @@
"Cap etiqueta anotada pot descriure «%s».\n"
"No obstant, hi havia etiquetes no anotades: proveu --tags."
-#: builtin/describe.c:411
+#: builtin/describe.c:428
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -12880,12 +14098,12 @@
"Cap etiqueta pot descriure «%s».\n"
"Proveu --always, o creeu algunes etiquetes."
-#: builtin/describe.c:441
+#: builtin/describe.c:458
#, c-format
msgid "traversed %lu commits\n"
msgstr "%lu comissions travessades\n"
-#: builtin/describe.c:444
+#: builtin/describe.c:461
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -12894,122 +14112,142 @@
"s'han trobat més de %i etiquetes: s'han llistat les %i més recents\n"
"s'ha renunciat la cerca a %s\n"
-#: builtin/describe.c:512
+#: builtin/describe.c:529
#, c-format
msgid "describe %s\n"
msgstr "descriu %s\n"
-#: builtin/describe.c:515
+#: 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:523
+#: 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:537
+#: 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:538
+#: builtin/describe.c:555
msgid "debug search strategy on stderr"
msgstr "estratègia de cerca de depuració en stderr"
-#: builtin/describe.c:539
+#: builtin/describe.c:556
msgid "use any ref"
msgstr "usa qualsevol referència"
-#: builtin/describe.c:540
+#: builtin/describe.c:557
msgid "use any tag, even unannotated"
msgstr "usa qualsevol etiqueta, fins i tot aquelles sense anotar"
-#: builtin/describe.c:541
+#: builtin/describe.c:558
msgid "always use long format"
msgstr "sempre usa el format llarg"
-#: builtin/describe.c:542
+#: builtin/describe.c:559
msgid "only follow first parent"
msgstr "només segueix la primera mare"
-#: builtin/describe.c:545
+#: builtin/describe.c:562
msgid "only output exact matches"
msgstr "emet només coincidències exactes"
-#: builtin/describe.c:547
+#: 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:549
+#: builtin/describe.c:566
msgid "only consider tags matching <pattern>"
msgstr "només considera les etiquetes que coincideixen amb <patró>"
-#: builtin/describe.c:551
+#: builtin/describe.c:568
msgid "do not consider tags matching <pattern>"
msgstr "no consideris les etiquetes que no coincideixen amb <patró>"
-#: builtin/describe.c:553 builtin/name-rev.c:473
+#: builtin/describe.c: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:554 builtin/describe.c:557
+#: builtin/describe.c:571 builtin/describe.c:574
msgid "mark"
msgstr "marca"
-#: builtin/describe.c:555
+#: 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:558
+#: 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:576
+#: builtin/describe.c:593
msgid "--long is incompatible with --abbrev=0"
msgstr "--long és incompatible amb --abbrev=0"
-#: builtin/describe.c:605
+#: 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:656
+#: builtin/describe.c:673
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty és incompatible amb les comissions"
-#: builtin/describe.c:658
+#: builtin/describe.c:675
msgid "--broken is incompatible with commit-ishes"
msgstr "--broken és incompatible amb les comissions"
-#: builtin/diff.c:84
+#: builtin/diff-tree.c:155
+#, fuzzy
+msgid "--stdin and --merge-base are mutually exclusive"
+msgstr "-p i --overlay són mútuament excloents"
+
+#: builtin/diff-tree.c:157
+#, fuzzy
+msgid "--merge-base only works with two commits"
+msgstr "--merge-base només funciona amb dues comissions"
+
+#: 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:258
#, c-format
msgid "invalid option: %s"
msgstr "opció no vàlida: %s"
-#: builtin/diff.c:350
+#: builtin/diff.c:375
+#, c-format
+msgid "%s...%s: no merge base"
+msgstr "%s...%s: sense una base de fusió"
+
+#: builtin/diff.c:485
msgid "Not a git repository"
msgstr "No és un dipòsit de git"
-#: builtin/diff.c:394
+#: builtin/diff.c:530 builtin/grep.c:681
#, c-format
msgid "invalid object '%s' given."
msgstr "s'ha donat un objecte no vàlid «%s»."
-#: builtin/diff.c:403
+#: builtin/diff.c:541
#, 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:546
#, c-format
msgid "unhandled object '%s' given."
msgstr "s'ha donat l'objecte no gestionat «%s»."
+#: builtin/diff.c:580
+#, c-format
+msgid "%s...%s: multiple merge bases, using %s"
+msgstr "%s...%s: múltiples bases de fusió, utilitzant %s"
+
#: builtin/difftool.c:30
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<opcions>] [<commit> [<commit>]] [--] [<camí>...]"
@@ -13032,519 +14270,614 @@
#: 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:413
+#: builtin/difftool.c:412
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:634
+#: builtin/difftool.c:633
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "s'han modificat ambdós fitxers: «%s» i «%s»."
-#: builtin/difftool.c:636
+#: builtin/difftool.c:635
msgid "working tree file has been left."
msgstr "s'ha deixat un fitxer de l'arbre de treball."
-#: builtin/difftool.c:647
+#: builtin/difftool.c:646
#, c-format
msgid "temporary files exist in '%s'."
msgstr "existeix un fitxer temporal a «%s»."
-#: builtin/difftool.c:648
+#: builtin/difftool.c:647
msgid "you may want to cleanup or recover these."
msgstr "podeu netejar o recuperar-los."
-#: builtin/difftool.c:697
+#: builtin/difftool.c:696
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:699
+#: builtin/difftool.c:698
msgid "perform a full-directory diff"
msgstr "fes un diff de tot el directori"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:700
msgid "do not prompt before launching a diff tool"
msgstr "no preguntis abans d'executar l'eina diff"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:705
msgid "use symlinks in dir-diff mode"
msgstr "utilitza enllaços simbòlics en mode dir-diff"
-#: builtin/difftool.c:707
+#: builtin/difftool.c:706
msgid "tool"
msgstr "eina"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:707
msgid "use the specified diff tool"
msgstr "utilitza l'eina de diff especificada"
-#: builtin/difftool.c:710
+#: builtin/difftool.c:709
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:713
+#: builtin/difftool.c:712
msgid ""
-"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
-"code"
+"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:716
+#: builtin/difftool.c:715
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:717
+#: builtin/difftool.c:716
msgid "passed to `diff`"
msgstr "passa-ho a «diff»"
-#: builtin/difftool.c:732
+#: builtin/difftool.c:731
msgid "difftool requires worktree or --no-index"
msgstr "difftool requereix worktree o --no-index"
-#: builtin/difftool.c:739
+#: builtin/difftool.c:738
msgid "--dir-diff is incompatible with --no-index"
msgstr "--dir-diff és incompatible amb --no-index"
-#: builtin/difftool.c:742
+#: builtin/difftool.c:741
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr "--gui, --tool and --extcmd són mútuament excloents"
-#: builtin/difftool.c:750
+#: builtin/difftool.c:749
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:757
+#: builtin/difftool.c:756
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
-msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
-msgstr ""
-
-#: builtin/env--helper.c:77
-#, c-format
+#: builtin/env--helper.c:67
+#, fuzzy, c-format
msgid ""
-"option `--default' expects an unsigned long value with `--type=ulong`, not `"
-"%s`"
+"option `--default' expects a boolean value with `--type=bool`, not `%s`"
+msgstr "`--default' espera un valor booleà amb `-type=bool` no `%s`"
+
+#: 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:852
+#: 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:1152
+#: builtin/fast-export.c:1178
+#, fuzzy
+msgid "--anonymize-map token cannot be empty"
+msgstr "--anonymize-map token no pot estar buit"
+
+#: 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:1154
+#: builtin/fast-export.c:1200
msgid "select handling of signed tags"
msgstr "selecciona la gestió de les etiquetes signades"
-#: builtin/fast-export.c:1157
+#: 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:1160
+#: 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:1163
+#: builtin/fast-export.c:1209
msgid "Dump marks to this file"
msgstr "Bolca les marques a aquest fitxer"
-#: builtin/fast-export.c:1165
+#: builtin/fast-export.c:1211
msgid "Import marks from this file"
msgstr "Importa les marques d'aquest fitxer"
-#: builtin/fast-export.c:1169
-#, fuzzy
+#: builtin/fast-export.c:1215
msgid "Import marks from this file if it exists"
-msgstr "Importa les marques d'aquest fitxer"
+msgstr "Importa marques d'aquest fitxer si existeix"
-#: builtin/fast-export.c:1171
+#: 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:1173
+#: builtin/fast-export.c:1219
msgid "Output full tree for each commit"
msgstr "Imprimeix l'arbre complet de cada comissió"
-#: builtin/fast-export.c:1175
+#: 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:1176
+#: builtin/fast-export.c:1222
msgid "Skip output of blob data"
msgstr "Omet l'emissió de dades de blob"
-#: builtin/fast-export.c:1177 builtin/log.c:1705
+#: builtin/fast-export.c:1223 builtin/log.c:1816
msgid "refspec"
msgstr "especificació de referència"
-#: builtin/fast-export.c:1178
+#: 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:1179
+#: builtin/fast-export.c:1225
msgid "anonymize output"
msgstr "anonimitza la sortida"
-#: builtin/fast-export.c:1181
+#: builtin/fast-export.c:1226
+#, fuzzy
+msgid "from:to"
+msgstr "des de"
+
+#: builtin/fast-export.c:1227
+msgid "convert <from> to <to> in anonymized output"
+msgstr "converteix <from> a <to> en una sortida anònima"
+
+#: 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:1183
+#: builtin/fast-export.c:1232
+#, fuzzy
msgid "Show original object ids of blobs/commits"
-msgstr ""
+msgstr "Mostra els ID dels objectes originals dels blobs/commits"
-#: builtin/fast-export.c:1185
+#: builtin/fast-export.c:1234
+#, fuzzy
msgid "Label tags with mark ids"
-msgstr ""
+msgstr "Etiquetes amb els identificadors de marca"
-#: builtin/fast-export.c:1220
+#: 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 ""
+msgstr "No es poden passar tant --import-marks com --import-marks-if-exists"
-#: builtin/fetch.c:34
+#: builtin/fast-import.c:3088
+#, fuzzy, c-format
+msgid "Missing from marks for submodule '%s'"
+msgstr "Subjecting submodule '%s'"
+
+#: builtin/fast-import.c:3090
+#, 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:3225
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr "S'esperava l'ordre «mark», s'ha rebut %s"
+
+#: builtin/fast-import.c:3230
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr "S'esperava l'ordre «to», s'ha rebut «%s»"
+
+#: builtin/fast-import.c:3322
+#, fuzzy
+msgid "Expected format name:filename for submodule rewrite option"
+msgstr ""
+"S'esperava un nom de fitxer de format per a l'opció de reescriptura de "
+"submòdul"
+
+#: builtin/fast-import.c:3377
+#, 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:35
+#: builtin/fetch.c:36
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<opcions>] <grup>"
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<opcions>] [(<dipòsit> | <grup>)...]"
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<opcions>]"
-#: builtin/fetch.c:116
+#: builtin/fetch.c:119
msgid "fetch.parallel cannot be negative"
-msgstr ""
+msgstr "fetch.paral·lelisme no pot ser negatiu"
-#: builtin/fetch.c:139 builtin/pull.c:204
+#: builtin/fetch.c:142 builtin/pull.c:185
msgid "fetch from all remotes"
msgstr "obtén de tots els remots"
-#: builtin/fetch.c:141 builtin/pull.c:248
+#: builtin/fetch.c:144 builtin/pull.c:245
#, fuzzy
msgid "set upstream for git pull/fetch"
-msgstr "estableix la font per a git pull/status"
+msgstr "estableix la font per a git pull/fetch"
-#: builtin/fetch.c:143 builtin/pull.c:207
+#: 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:145 builtin/pull.c:210
+#: 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:146
+#: builtin/fetch.c:149
msgid "force overwrite of local reference"
msgstr "força la sobreescriptura de la referència local"
-#: builtin/fetch.c:148
+#: builtin/fetch.c:151
msgid "fetch from multiple remotes"
msgstr "obtén de múltiples remots"
-#: builtin/fetch.c:150 builtin/pull.c:214
+#: 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:152
+#: builtin/fetch.c:155
msgid "do not fetch all tags (--no-tags)"
msgstr "no obtinguis les etiquetes (--no-tags)"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:157
msgid "number of submodules fetched in parallel"
msgstr "nombre de submòduls obtinguts en paral·lel"
-#: builtin/fetch.c:156 builtin/pull.c:217
+#: builtin/fetch.c: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:158
+#: 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:159 builtin/fetch.c:182 builtin/pull.c:141
+#: builtin/fetch.c:162 builtin/fetch.c:187 builtin/pull.c:122
msgid "on-demand"
msgstr "sota demanda"
-#: builtin/fetch.c:160
+#: builtin/fetch.c:163
msgid "control recursive fetching of submodules"
msgstr "controla l'obtenció recursiva de submòduls"
-#: builtin/fetch.c:164 builtin/pull.c:225
+#: builtin/fetch.c: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:166
+#: builtin/fetch.c:171
msgid "allow updating of HEAD ref"
msgstr "permet l'actualització de la referència HEAD"
-#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:228
+#: builtin/fetch.c: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:171
+#: 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:177 builtin/pull.c:231
+#: builtin/fetch.c:182 builtin/pull.c:221
msgid "convert to a complete repository"
msgstr "converteix en un dipòsit complet"
-#: builtin/fetch.c:180
+#: 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:183
+#: builtin/fetch.c:188
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr ""
-"per defecte per a l'obtenció recursiva de submòduls (prioritat més baixa que "
-"els fitxers de configuració)"
+"per defecte per a l'obtenció recursiva de submòduls (prioritat més baixa que"
+" els fitxers de configuració)"
-#: builtin/fetch.c:187 builtin/pull.c:234
+#: builtin/fetch.c:192 builtin/pull.c:224
msgid "accept refs that update .git/shallow"
msgstr "accepta les referències que actualitzin .git/shallow"
-#: builtin/fetch.c:188 builtin/pull.c:236
+#: builtin/fetch.c:193 builtin/pull.c:226
msgid "refmap"
msgstr "mapa de referències"
-#: builtin/fetch.c:189 builtin/pull.c:237
+#: builtin/fetch.c:194 builtin/pull.c:227
msgid "specify fetch refmap"
msgstr "específica l'obtenció del mapa de referències"
-#: builtin/fetch.c:196
-msgid "report that we have only objects reachable from this object"
-msgstr ""
-
-#: builtin/fetch.c:199
+#: builtin/fetch.c:201 builtin/pull.c:240
#, fuzzy
-msgid "run 'gc --auto' after fetching"
-msgstr "poda els remots després d'obtenir-los"
+msgid "report that we have only objects reachable from this object"
+msgstr "informa que només hi ha objectes abastables des d'aquest objecte"
-#: builtin/fetch.c:201 builtin/pull.c:246
+#: builtin/fetch.c:204 builtin/fetch.c:206
+#, fuzzy
+msgid "run 'maintenance --auto' after fetching"
+msgstr "executa «gc --auto» després d'obtenir"
+
+#: 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:203
-#, fuzzy
+#: builtin/fetch.c:210
msgid "write the commit-graph after fetching"
-msgstr "poda els remots després d'obtenir-los"
+msgstr "escriu el graf de comissions després de recollir"
-#: builtin/fetch.c:513
+#: 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:653
+#: 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:751
+#: builtin/fetch.c:775
#, c-format
msgid "object %s not found"
msgstr "objecte %s no trobat"
-#: builtin/fetch.c:755
+#: builtin/fetch.c:779
msgid "[up to date]"
msgstr "[al dia]"
-#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
+#: builtin/fetch.c:792 builtin/fetch.c:808 builtin/fetch.c:880
msgid "[rejected]"
msgstr "[rebutjat]"
-#: builtin/fetch.c:769
+#: builtin/fetch.c:793
msgid "can't fetch in current branch"
msgstr "no es pot obtenir en la branca actual"
-#: builtin/fetch.c:779
+#: builtin/fetch.c:803
msgid "[tag update]"
msgstr "[actualització d'etiqueta]"
-#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839
-#: builtin/fetch.c:851
+#: builtin/fetch.c: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:784
+#: builtin/fetch.c:808
+#, fuzzy
msgid "would clobber existing tag"
-msgstr ""
+msgstr "es tancaria l'etiqueta existent"
-#: builtin/fetch.c:806
+#: builtin/fetch.c:830
msgid "[new tag]"
msgstr "[etiqueta nova]"
-#: builtin/fetch.c:809
+#: builtin/fetch.c:833
msgid "[new branch]"
msgstr "[branca nova]"
-#: builtin/fetch.c:812
+#: builtin/fetch.c:836
msgid "[new ref]"
msgstr "[referència nova]"
-#: builtin/fetch.c:851
+#: builtin/fetch.c:875
msgid "forced update"
msgstr "actualització forçada"
-#: builtin/fetch.c:856
+#: builtin/fetch.c:880
msgid "non-fast-forward"
msgstr "sense avanç ràpid"
-#: builtin/fetch.c:877
+#: 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:881
-#, c-format
+#: 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"
+"'--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:911
+#: 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:932
+#: 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:1017 builtin/fetch.c:1155
+#: builtin/fetch.c:1053 builtin/fetch.c:1191
#, c-format
msgid "From %.*s\n"
msgstr "De %.*s\n"
-#: builtin/fetch.c:1028
+#: 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:1125
+#: builtin/fetch.c:1161
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s es tornarà penjant)"
-#: builtin/fetch.c:1126
+#: builtin/fetch.c:1162
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s s'ha tornat penjant)"
-#: builtin/fetch.c:1158
+#: builtin/fetch.c:1194
msgid "[deleted]"
msgstr "[suprimit]"
-#: builtin/fetch.c:1159 builtin/remote.c:1035
+#: builtin/fetch.c:1195 builtin/remote.c:1118
msgid "(none)"
msgstr "(cap)"
-#: builtin/fetch.c:1182
+#: 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:1201
+#: 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:1204
+#: 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:1412
+#: builtin/fetch.c:1448
msgid "multiple branches detected, incompatible with --set-upstream"
-msgstr ""
+msgstr "s'han detectat múltiples branques, incompatible amb --set-upstream"
-#: builtin/fetch.c:1427
-#, fuzzy
+#: builtin/fetch.c:1463
msgid "not setting upstream for a remote remote-tracking branch"
-msgstr "la branca font «%s» no s'emmagatzema com a branca amb seguiment remot"
+msgstr ""
+"no s'està configurant la font per a una branca remota amb seguiment remot"
-#: builtin/fetch.c:1429
-#, fuzzy
+#: builtin/fetch.c:1465
msgid "not setting upstream for a remote tag"
-msgstr "estableix la font per a git pull/status"
+msgstr "no s'està configurant la font d'una etiqueta remota"
-#: builtin/fetch.c:1431
-#, fuzzy
+#: builtin/fetch.c:1467
msgid "unknown branch type"
-msgstr "tipus d'objecte desconegut %d"
+msgstr "tipus de branca desconegut"
-#: builtin/fetch.c:1433
+#: 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:1559 builtin/fetch.c:1622
+#: builtin/fetch.c:1598 builtin/fetch.c:1661
#, c-format
msgid "Fetching %s\n"
msgstr "S'està obtenint %s\n"
-#: builtin/fetch.c:1569 builtin/fetch.c:1624 builtin/remote.c:100
+#: builtin/fetch.c: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:1581
-#, fuzzy, c-format
+#: builtin/fetch.c:1620
+#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
-msgstr "no s'ha pogut establir «%s» a «%s»"
+msgstr "no s'ha pogut obtenir «%s» (codi de sortida: %d)\n"
-#: builtin/fetch.c:1684
+#: 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."
@@ -13552,72 +14885,79 @@
"Cap dipòsit remot especificat. Especifiqueu un URL o\n"
"un nom remot del qual es deuen obtenir les revisions noves."
-#: builtin/fetch.c:1721
+#: builtin/fetch.c:1760
msgid "You need to specify a tag name."
msgstr "Necessiteu especificar un nom d'etiqueta."
-#: builtin/fetch.c:1771
+#: builtin/fetch.c:1825
msgid "Negative depth in --deepen is not supported"
msgstr "No s'admet una profunditat negativa en --deepen"
-#: builtin/fetch.c:1773
+#: builtin/fetch.c:1827
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen i --depth són mútuament excloents"
-#: builtin/fetch.c:1778
+#: builtin/fetch.c:1832
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth i --unshallow no es poden usar junts"
-#: builtin/fetch.c:1780
+#: 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:1796
+#: 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:1798
+#: 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:1807
+#: 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:1814
+#: 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:1832
+#: builtin/fetch.c:1887
msgid ""
-"--filter can only be used with the remote configured in extensions."
-"partialclone"
+"--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:674
+#: 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:677
+#: builtin/fmt-merge-msg.c:21
msgid "alias for --log (deprecated)"
msgstr "àlies per --log (en desús)"
-#: builtin/fmt-merge-msg.c:680
+#: builtin/fmt-merge-msg.c:24
msgid "text"
msgstr "text"
-#: builtin/fmt-merge-msg.c:681
+#: 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:682
+#: builtin/fmt-merge-msg.c:26
msgid "file to read from"
msgstr "fitxer del qual llegir"
@@ -13630,7 +14970,8 @@
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
@@ -13659,7 +15000,7 @@
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"
@@ -13683,273 +15024,292 @@
msgid "print only refs which don't contain the commit"
msgstr "imprimeix només les referències que no continguin la comissió"
-#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148
+#: builtin/for-each-repo.c:9
+msgid "git for-each-repo --config=<config> <command-args>"
+msgstr "git for-each-repo --config=<config> <command-args>"
+
+#: builtin/for-each-repo.c:37
+msgid "config"
+msgstr "config"
+
+#: builtin/for-each-repo.c:38
+#, fuzzy
+msgid "config key storing a list of repository paths"
+msgstr "clau de configuració emmagatzemant una llista de camins de repositori"
+
+#: builtin/for-each-repo.c:46
+msgid "missing --config=<config>"
+msgstr "falta --config=<config>"
+
+#: 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:100 builtin/fsck.c:120
+#: 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:114
+#: builtin/fsck.c:115
#, c-format
msgid "warning in %s %s: %s"
-msgstr ""
+msgstr "avís en %s %s: %s"
-#: builtin/fsck.c:143 builtin/fsck.c:146
+#: 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:155
+#: builtin/fsck.c:156
msgid "wrong object type in link"
msgstr "tipus d'objecte incorrecte en l'enllaç"
-#: builtin/fsck.c:171
-#, 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:282
+#: builtin/fsck.c:283
#, c-format
msgid "missing %s %s"
msgstr "manca %s %s"
-#: builtin/fsck.c:309
+#: builtin/fsck.c:310
#, c-format
msgid "unreachable %s %s"
msgstr "inabastable %s %s"
-#: builtin/fsck.c:329
+#: builtin/fsck.c:330
#, fuzzy, c-format
msgid "dangling %s %s"
-msgstr "S'estan actualitzant %s..%s\n"
+msgstr "per cent"
-#: builtin/fsck.c:339
+#: 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:350
+#: builtin/fsck.c:351
#, c-format
msgid "could not finish '%s'"
msgstr "no s'ha pogut finalitzar «%s»"
-#: builtin/fsck.c:367
+#: builtin/fsck.c:368
#, c-format
msgid "Checking %s"
msgstr "S'està comprovant %s"
-#: builtin/fsck.c:405
+#: builtin/fsck.c:406
#, c-format
msgid "Checking connectivity (%d objects)"
msgstr "S'està comprovant la connectivitat (%d objectes)"
-#: builtin/fsck.c:424
+#: builtin/fsck.c:425
#, c-format
msgid "Checking %s %s"
msgstr "S'està comprovant %s %s"
-#: builtin/fsck.c:429
+#: builtin/fsck.c:430
msgid "broken links"
msgstr "enllaços trencats"
-#: builtin/fsck.c:438
+#: builtin/fsck.c:439
#, c-format
msgid "root %s"
msgstr "arrel %s"
-#: builtin/fsck.c:446
-#, c-format
+#: builtin/fsck.c:447
+#, fuzzy, c-format
msgid "tagged %s %s (%s) in %s"
-msgstr ""
+msgstr "percentatges marcats"
-#: builtin/fsck.c:475
+#: builtin/fsck.c:476
#, c-format
msgid "%s: object corrupt or missing"
msgstr "%s: objecte corrupte o no trobat"
-#: builtin/fsck.c:500
+#: 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:514
-#, 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:548
+#: 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:555
+#: builtin/fsck.c:556
#, c-format
msgid "%s: not a commit"
msgstr "%s: no és una comissió"
-#: builtin/fsck.c:609
+#: builtin/fsck.c:610
msgid "notice: No default references"
msgstr "avís: no hi ha referències per defecte"
-#: builtin/fsck.c:624
+#: builtin/fsck.c:625
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s: objecte corrupte o no trobat: %s"
-#: builtin/fsck.c:637
+#: 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:657
+#: builtin/fsck.c:658
#, c-format
msgid "bad sha1 file: %s"
msgstr "fitxer sha1 malmès: %s"
-#: builtin/fsck.c:672
+#: builtin/fsck.c:673
msgid "Checking object directory"
msgstr "S'està comprovant el directori d'objecte"
-#: builtin/fsck.c:675
+#: builtin/fsck.c:676
msgid "Checking object directories"
msgstr "S'estan comprovant els directoris d'objecte"
-#: builtin/fsck.c:690
+#: builtin/fsck.c:691
#, c-format
msgid "Checking %s link"
msgstr "S'està comprovant l'enllaç %s"
-#: builtin/fsck.c:695 builtin/index-pack.c:842
+#: builtin/fsck.c:696 builtin/index-pack.c:865
#, c-format
msgid "invalid %s"
msgstr "%s no vàlid"
-#: builtin/fsck.c:702
-#, 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:708
+#: 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:712
+#: 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:724
+#: builtin/fsck.c:725
msgid "Checking cache tree"
msgstr "S'està comprovant l'arbre de la memòria cau"
-#: builtin/fsck.c:729
+#: 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:738
+#: 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:769
+#: builtin/fsck.c:770
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<opcions>] [<objecte>...]"
-#: builtin/fsck.c:775
+#: builtin/fsck.c:776
msgid "show unreachable objects"
msgstr "mostra els objectes inabastables"
-#: builtin/fsck.c:776
+#: builtin/fsck.c:777
msgid "show dangling objects"
msgstr "mostra els objectes penjants"
-#: builtin/fsck.c:777
+#: builtin/fsck.c:778
msgid "report tags"
msgstr "informa de les etiquetes"
-#: builtin/fsck.c:778
+#: builtin/fsck.c:779
msgid "report root nodes"
msgstr "informa dels nodes d'arrel"
-#: builtin/fsck.c:779
+#: builtin/fsck.c:780
msgid "make index objects head nodes"
msgstr "fes els objectes d'índex nodes de cap"
-#: builtin/fsck.c:780
-msgid "make reflogs head nodes (default)"
-msgstr "fes que els registres de referències siguin nodes de cap (per defecte)"
-
#: 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:782
msgid "also consider packs and alternate objects"
msgstr "també considera els paquets i els objectes alternatius"
-#: builtin/fsck.c:782
+#: builtin/fsck.c:783
msgid "check only connectivity"
msgstr "comprova només la connectivitat"
-#: builtin/fsck.c:783
+#: builtin/fsck.c:784
msgid "enable more strict checking"
msgstr "habilita la comprovació més estricta"
-#: builtin/fsck.c:785
+#: builtin/fsck.c:786
msgid "write dangling objects in .git/lost-found"
msgstr "escriu objectes penjants a .git/lost-found"
-#: builtin/fsck.c:786 builtin/prune.c:132
+#: builtin/fsck.c:787 builtin/prune.c:134
msgid "show progress"
msgstr "mostra el progrés"
-#: builtin/fsck.c:787
+#: builtin/fsck.c:788
msgid "show verbose names for reachable objects"
msgstr "mostra els noms detallats dels objectes abastables"
-#: builtin/fsck.c:846 builtin/index-pack.c:225
+#: builtin/fsck.c:847 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "S'estan comprovant els objectes"
-#: builtin/fsck.c:874
-#, 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:885
-#, 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:35
+#: builtin/gc.c:39
msgid "git gc [<options>]"
msgstr "git gc [<opcions>]"
-#: builtin/gc.c:90
+#: builtin/gc.c:94
#, 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:130
+#, 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:475 builtin/init-db.c:55
+#: builtin/gc.c:479 builtin/init-db.c:58
#, c-format
msgid "cannot stat '%s'"
msgstr "no es pot fer stat en «%s»"
-#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
+#: builtin/gc.c:488 builtin/notes.c:240 builtin/tag.c:530
#, c-format
msgid "cannot read '%s'"
msgstr "no es pot llegir «%s»"
-#: builtin/gc.c:491
+#: builtin/gc.c:495
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -13964,69 +15324,227 @@
"\n"
"%s"
-#: builtin/gc.c:539
+#: builtin/gc.c:543
msgid "prune unreferenced objects"
msgstr "poda objectes sense referència"
-#: builtin/gc.c:541
+#: builtin/gc.c:545
msgid "be more thorough (increased runtime)"
msgstr "sigues més exhaustiu (el temps d'execució augmenta)"
-#: builtin/gc.c:542
+#: builtin/gc.c:546
msgid "enable auto-gc mode"
msgstr "habilita el mode de recollida d'escombraries automàtica"
-#: builtin/gc.c:545
+#: builtin/gc.c:549
msgid "force running gc even if there may be another gc running"
-msgstr "força l'execució de gc encara que hi pugui haver un altre gc executant"
-
-#: builtin/gc.c:548
-msgid "repack all other packs except the largest pack"
msgstr ""
+"força l'execució de gc encara que hi pugui haver un altre gc executant"
-#: builtin/gc.c:565
+#: builtin/gc.c:552
+#, fuzzy
+msgid "repack all other packs except the largest pack"
+msgstr "reempaqueta tots els altres paquets excepte el paquet més gran"
+
+#: builtin/gc.c:569
#, 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:576
+#: builtin/gc.c:580
#, 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:596
+#: builtin/gc.c:600
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"S'està empaquetant el dipòsit automàticament en el rerefons per a un "
"rendiment òptim.\n"
-#: builtin/gc.c:598
+#: builtin/gc.c:602
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr ""
"S'està empaquetant automàticament el dipòsit per a un rendiment òptim.\n"
-#: builtin/gc.c:599
+#: builtin/gc.c:603
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Vegeu «git help gc» per a neteja manual.\n"
-#: builtin/gc.c:639
+#: builtin/gc.c:643
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
-"gc ja s'està executant en la màquina «%s» pid %<PRIuMAX> (useu --force si no)"
+"gc ja s'està executant en la màquina «%s» pid %<PRIuMAX> (useu --force si "
+"no)"
-#: builtin/gc.c:694
+#: builtin/gc.c:698
msgid ""
-"There are too many unreachable loose objects; run 'git prune' to remove them."
+"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-"
-"los."
+"Hi ha massa objectes solts inabastables; executeu «git prune» per a "
+"eliminar-los."
-#: builtin/grep.c:29
+#: builtin/gc.c:708
+msgid ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
+msgstr ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
+
+#: builtin/gc.c:738
+msgid "--no-schedule is not allowed"
+msgstr "--no-schedule no està permès"
+
+#: builtin/gc.c:743
+#, c-format
+msgid "unrecognized --schedule argument '%s'"
+msgstr "argument --schedule no reconegut, «%s»"
+
+#: builtin/gc.c:862
+#, fuzzy
+msgid "failed to write commit-graph"
+msgstr "s'ha produït un error en escriure l'objecte de comissió"
+
+#: builtin/gc.c:901
+msgid "failed to fill remotes"
+msgstr "s'ha produït un error en omplir els remots"
+
+#: builtin/gc.c:1024
+#, fuzzy
+msgid "failed to start 'git pack-objects' process"
+msgstr "no s'ha pogut iniciar el pack-objects"
+
+#: builtin/gc.c:1041
+#, fuzzy
+msgid "failed to finish 'git pack-objects' process"
+msgstr "no s'ha pogut finalitzar el pack-objects"
+
+#: builtin/gc.c:1093
+#, fuzzy
+msgid "failed to write multi-pack-index"
+msgstr "no s'han pogut netejar els percentatges multi-paquet"
+
+#: builtin/gc.c:1111
+#, fuzzy
+msgid "'git multi-pack-index expire' failed"
+msgstr "l'índex múltiple és massa petit"
+
+#: builtin/gc.c:1172
+#, fuzzy
+msgid "'git multi-pack-index repack' failed"
+msgstr "no s'ha pogut carregar l'índex del paquet per al fitxer de paquet %s"
+
+#: builtin/gc.c:1181
+#, fuzzy
+msgid ""
+"skipping incremental-repack task because core.multiPackIndex is disabled"
+msgstr ""
+"s'està ometent la tasca de reempaquetar incremental perquè "
+"core.multiPackIndex està desactivat"
+
+#: builtin/gc.c:1279
+#, fuzzy, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr "el fitxer de bloqueig «%s» existeix s'omet el manteniment"
+
+#: builtin/gc.c:1309
+#, c-format
+msgid "task '%s' failed"
+msgstr "la tasca «%s» ha fallat"
+
+#: builtin/gc.c:1389
+#, fuzzy, c-format
+msgid "'%s' is not a valid task"
+msgstr "«%s» no és un terme vàlid"
+
+#: builtin/gc.c:1394
+#, fuzzy, c-format
+msgid "task '%s' cannot be selected multiple times"
+msgstr "«%s» no es pot usar amb %s"
+
+#: builtin/gc.c:1409
+#, fuzzy
+msgid "run tasks based on the state of the repository"
+msgstr "executa les tasques basades en l'estat del dipòsit"
+
+#: builtin/gc.c:1410
+msgid "frequency"
+msgstr "freqüència"
+
+#: builtin/gc.c:1411
+msgid "run tasks based on frequency"
+msgstr "executa les tasques basant-se en freqüència"
+
+#: builtin/gc.c:1414
+#, fuzzy
+msgid "do not report progress or other information over stderr"
+msgstr "no informeu sobre el progrés o altra informació sobre stderr"
+
+#: builtin/gc.c:1415
+msgid "task"
+msgstr "tasca"
+
+#: builtin/gc.c:1416
+msgid "run a specific task"
+msgstr "executa una tasca específica"
+
+#: builtin/gc.c:1433
+#, fuzzy
+msgid "use at most one of --auto and --schedule=<frequency>"
+msgstr "usa com a màxim un de --auto i --schedule=<frequency>"
+
+#: builtin/gc.c:1467
+#, fuzzy
+msgid "failed to run 'git config'"
+msgstr "no s'ha pogut executar «git status» a «%s»"
+
+#: builtin/gc.c:1512
+#, fuzzy
+msgid "another process is scheduling background maintenance"
+msgstr "un altre procés és planificar el manteniment en segon pla"
+
+#: builtin/gc.c:1525
+#, fuzzy
+msgid "failed to run 'crontab -l'; your system might not support 'cron'"
+msgstr ""
+"no s'ha pogut executar «crontab -l»; el vostre sistema podria no admetre "
+"«cron»"
+
+#: builtin/gc.c:1544
+#, fuzzy
+msgid "failed to run 'crontab'; your system might not support 'cron'"
+msgstr ""
+"no s'ha pogut executar «crontab»; el vostre sistema podria no admetre «cron»"
+
+#: builtin/gc.c:1550
+#, fuzzy
+msgid "failed to open stdin of 'crontab'"
+msgstr "s'ha produït un error en obrir «%s»"
+
+#: builtin/gc.c:1592
+msgid "'crontab' died"
+msgstr "«crontab» ha mort"
+
+#: builtin/gc.c:1605
+#, fuzzy
+msgid "failed to add repo to global config"
+msgstr "no s'ha pogut afegir el fitxer de paquet «%s»"
+
+#: builtin/gc.c:1615
+msgid "git maintenance <subcommand> [<options>]"
+msgstr "git maintenance <subcommand> [<options>]"
+
+#: builtin/gc.c:1634
+#, 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í>...]"
@@ -14043,275 +15561,275 @@
#. TRANSLATORS: %s is the configuration
#. 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:2708
+#: 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 "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:592 builtin/grep.c:635
+#: 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:650
+#: 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:716
+#: builtin/grep.c:736
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "l'opció «%c» espera un valor numèric"
-#: builtin/grep.c:815
+#: builtin/grep.c:835
msgid "search in index instead of in the work tree"
msgstr "cerca en l'índex en lloc de l'arbre de treball"
-#: builtin/grep.c:817
+#: builtin/grep.c:837
msgid "find in contents not managed by git"
msgstr "cerca en continguts no gestionats per git"
-#: builtin/grep.c:819
+#: builtin/grep.c:839
msgid "search in both tracked and untracked files"
msgstr "cerca tant en fitxers seguits com en no seguits"
-#: builtin/grep.c:821
+#: builtin/grep.c:841
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:823
+#: builtin/grep.c:843
msgid "recursively search in each submodule"
msgstr "cerca recursivament a cada submòdul"
-#: builtin/grep.c:826
+#: builtin/grep.c:846
msgid "show non-matching lines"
msgstr "mostra les línies no coincidents"
-#: builtin/grep.c:828
+#: builtin/grep.c:848
msgid "case insensitive matching"
msgstr "coincidència insensible a majúscula i minúscula"
-#: builtin/grep.c:830
+#: builtin/grep.c:850
msgid "match patterns only at word boundaries"
msgstr "coincideix amb els patrons només als límits de paraula"
-#: builtin/grep.c:832
+#: builtin/grep.c:852
msgid "process binary files as text"
msgstr "processa els fitxers binaris com a text"
-#: builtin/grep.c:834
+#: builtin/grep.c:854
msgid "don't match patterns in binary files"
msgstr "no coincideixis amb els patrons en els fitxers binaris"
-#: builtin/grep.c:837
+#: builtin/grep.c:857
msgid "process binary files with textconv filters"
msgstr "processa els fitxers binaris amb filtres de textconv"
-#: builtin/grep.c:839
+#: builtin/grep.c:859
msgid "search in subdirectories (default)"
-msgstr "cerca als subdirectories (per defecte)"
+msgstr "cerca als subdirectoris (per defecte)"
-#: builtin/grep.c:841
+#: builtin/grep.c:861
msgid "descend at most <depth> levels"
msgstr "descendeix com a màxim <profunditat> nivells"
-#: builtin/grep.c:845
+#: builtin/grep.c:865
msgid "use extended POSIX regular expressions"
msgstr "usa les expressions regulars POSIX ampliades"
-#: builtin/grep.c:848
+#: builtin/grep.c:868
msgid "use basic POSIX regular expressions (default)"
msgstr "usa les expressions regulars POSIX bàsiques (per defecte)"
-#: builtin/grep.c:851
+#: builtin/grep.c:871
msgid "interpret patterns as fixed strings"
msgstr "interpreta els patrons com a cadenes fixes"
-#: builtin/grep.c:854
+#: builtin/grep.c:874
msgid "use Perl-compatible regular expressions"
msgstr "usa les expressions regulars compatibles amb Perl"
-#: builtin/grep.c:857
+#: builtin/grep.c:877
msgid "show line numbers"
msgstr "mostra els números de línia"
-#: builtin/grep.c:858
+#: builtin/grep.c:878
msgid "show column number of first match"
msgstr "mostra el nombre de columna de la primera coincidència"
-#: builtin/grep.c:859
+#: builtin/grep.c:879
msgid "don't show filenames"
msgstr "no mostris els noms de fitxer"
-#: builtin/grep.c:860
+#: builtin/grep.c:880
msgid "show filenames"
msgstr "mostra els noms de fitxer"
-#: builtin/grep.c:862
+#: builtin/grep.c:882
msgid "show filenames relative to top directory"
msgstr "mostra els noms de fitxer relatius al directori superior"
-#: builtin/grep.c:864
+#: builtin/grep.c:884
msgid "show only filenames instead of matching lines"
msgstr "mostra només els noms de fitxer en lloc de les línies coincidents"
-#: builtin/grep.c:866
+#: builtin/grep.c:886
msgid "synonym for --files-with-matches"
msgstr "sinònim de --files-with-matches"
-#: builtin/grep.c:869
+#: builtin/grep.c:889
msgid "show only the names of files without match"
msgstr "mostra només els noms dels fitxers sense coincidència"
-#: builtin/grep.c:871
+#: builtin/grep.c:891
msgid "print NUL after filenames"
msgstr "imprimeix NUL després dels noms de fitxer"
-#: builtin/grep.c:874
+#: builtin/grep.c:894
msgid "show only matching parts of a line"
msgstr "mostra només les parts de coincidents de la línia"
-#: builtin/grep.c:876
+#: builtin/grep.c:896
msgid "show the number of matches instead of matching lines"
msgstr "mostra el nombre de coincidències en lloc de les línies coincidents"
-#: builtin/grep.c:877
+#: builtin/grep.c:897
msgid "highlight matches"
msgstr "ressalta les coincidències"
-#: builtin/grep.c:879
+#: builtin/grep.c:899
msgid "print empty line between matches from different files"
msgstr "imprimeix una línia buida entre coincidències de fitxers distints"
-#: builtin/grep.c:881
+#: builtin/grep.c:901
msgid "show filename only once above matches from same file"
msgstr ""
"mostra el nom de fitxer només una vegada a dalt de les coincidències del "
"mateix fitxer"
-#: builtin/grep.c:884
+#: builtin/grep.c:904
msgid "show <n> context lines before and after matches"
msgstr "mostra <n> línies de context abans i després d'una coincidència"
-#: builtin/grep.c:887
+#: builtin/grep.c:907
msgid "show <n> context lines before matches"
msgstr "mostra <n> línies de context abans d'una coincidència"
-#: builtin/grep.c:889
+#: builtin/grep.c:909
msgid "show <n> context lines after matches"
msgstr "mostra <n> línies de context després d'una coincidència"
-#: builtin/grep.c:891
+#: builtin/grep.c:911
msgid "use <n> worker threads"
msgstr "usa <n> fils de treball"
-#: builtin/grep.c:892
+#: builtin/grep.c:912
msgid "shortcut for -C NUM"
msgstr "drecera per -C NUM"
-#: builtin/grep.c:895
+#: builtin/grep.c:915
msgid "show a line with the function name before matches"
msgstr "mostra una línia amb el nom de funció abans de les coincidències"
-#: builtin/grep.c:897
+#: builtin/grep.c:917
msgid "show the surrounding function"
msgstr "mostra la funció circumdant"
-#: builtin/grep.c:900
+#: builtin/grep.c:920
msgid "read patterns from file"
msgstr "llegeix els patrons des d'un fitxer"
-#: builtin/grep.c:902
+#: builtin/grep.c:922
msgid "match <pattern>"
msgstr "coincideix amb <patró>"
-#: builtin/grep.c:904
+#: builtin/grep.c:924
msgid "combine patterns specified with -e"
msgstr "combina els patrons especificats amb -e"
-#: builtin/grep.c:916
+#: builtin/grep.c:936
msgid "indicate hit with exit status without output"
msgstr "indica coincidència amb estat de sortida sense sortida textual"
-#: builtin/grep.c:918
+#: builtin/grep.c:938
msgid "show only matches from files that match all patterns"
msgstr ""
"mostra només les coincidències dels fitxers que coincideixin amb tots els "
"patrons"
-#: builtin/grep.c:920
+#: builtin/grep.c:940
msgid "show parse tree for grep expression"
msgstr "mostra l'arbre d'anàlisi de l'expressió grep"
-#: builtin/grep.c:924
+#: builtin/grep.c:944
msgid "pager"
msgstr "paginador"
-#: builtin/grep.c:924
+#: builtin/grep.c:944
msgid "show matching files in the pager"
msgstr "mostra els fitxers coincidents en el paginador"
-#: builtin/grep.c:928
+#: builtin/grep.c:948
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permet la invocació de grep(1) (ignorat per aquesta compilació)"
-#: builtin/grep.c:992
+#: builtin/grep.c:1014
msgid "no pattern given"
msgstr "no s'ha donat cap patró"
-#: builtin/grep.c:1028
+#: builtin/grep.c:1050
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index o --untracked no es pot usar amb revisions"
-#: builtin/grep.c:1036
+#: builtin/grep.c:1058
#, c-format
msgid "unable to resolve revision: %s"
msgstr "no s'ha pogut resoldre la revisió: %s"
-#: builtin/grep.c:1067
+#: builtin/grep.c:1088
+msgid "--untracked not supported with --recurse-submodules"
+msgstr "--untracked no s'admet amb --recurse-submodules"
+
+#: builtin/grep.c:1092
msgid "invalid option combination, ignoring --threads"
msgstr "combinació d'opcions no vàlida, s'està ignorant --threads"
-#: builtin/grep.c:1070 builtin/pack-objects.c:3400
+#: builtin/grep.c:1095 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:1073 builtin/index-pack.c:1531 builtin/pack-objects.c:2705
+#: builtin/grep.c:1098 builtin/index-pack.c:1573 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:1096
+#: builtin/grep.c:1132
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager només funciona en l'arbre de treball"
-#: builtin/grep.c:1119
-msgid "option not supported with --recurse-submodules"
-msgstr "opció no admesa amb --recurse-submodules"
-
-#: builtin/grep.c:1125
+#: builtin/grep.c:1158
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:1131
+#: builtin/grep.c:1164
#, 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:1139
+#: builtin/grep.c:1172
#, 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 ""
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
"[--] <file>..."
msgstr ""
-"git hash-object [-t <tipus>] [-w] [--path=<fitxer> | --no-filters] [--stdin] "
-"[--] <fitxer>..."
+"git hash-object [-t <tipus>] [-w] [--path=<fitxer> | --no-filters] [--stdin]"
+" [--] <fitxer>..."
#: builtin/hash-object.c:86
msgid "git hash-object --stdin-paths"
@@ -14344,202 +15862,206 @@
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
-#, fuzzy
+#: builtin/help.c:50
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
-#, fuzzy
+#: builtin/help.c:57
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:221
#, 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:241
#, 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:244
#, 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:294
#, 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:304
msgid "early EOF"
msgstr "EOF prematur"
-#: builtin/index-pack.c:269
+#: builtin/index-pack.c:305
msgid "read error on input"
msgstr "error de lectura d'entrada"
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:317
msgid "used more bytes than were available"
msgstr "s'han usat més octets que hi havia disponibles"
-#: builtin/index-pack.c:288 builtin/pack-objects.c:604
+#: builtin/index-pack.c:324 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:95
+#: builtin/index-pack.c:327 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:342 builtin/repack.c:286
+#, c-format
+msgid "unable to create '%s'"
+msgstr "no s'ha pogut crear «%s»"
+
+#: builtin/index-pack.c:348
#, 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:362
msgid "pack signature mismatch"
msgstr "hi ha una discordança de signatura de paquet"
-#: builtin/index-pack.c:328
+#: builtin/index-pack.c:364
#, 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:382
#, 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:488
#, c-format
msgid "inflate returned %d"
msgstr "la inflació ha retornat %d"
-#: builtin/index-pack.c:515
+#: builtin/index-pack.c:537
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:545
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:553
#, c-format
msgid "unknown object type %d"
msgstr "tipus d'objecte desconegut %d"
-#: builtin/index-pack.c:562
+#: builtin/index-pack.c:584
msgid "cannot pread pack file"
msgstr "no es pot fer pread en el fitxer empaquetat"
-#: 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"
@@ -14547,302 +16069,341 @@
msgstr[1] ""
"el final del fitxer empaquetat és prematur, manquen %<PRIuMAX> octets"
-#: builtin/index-pack.c:590
+#: builtin/index-pack.c:612
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: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'HA TROBAT UNA COL·LISIÓ SHA1 AMB %s !"
-#: builtin/index-pack.c:738 builtin/pack-objects.c:157
-#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
+#: builtin/index-pack.c:760 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:824
#, 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:832
#, 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:846
#, 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
-#, fuzzy
+#: builtin/index-pack.c:849 builtin/index-pack.c:868
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:870
#, 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:931 builtin/index-pack.c:978
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:1161
msgid "Receiving objects"
msgstr "S'estan rebent objectes"
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1161
msgid "Indexing objects"
msgstr "S'estan indexant objectes"
-#: builtin/index-pack.c:1152
+#: builtin/index-pack.c:1195
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "el paquet és malmès (discordança SHA1)"
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1200
msgid "cannot fstat packfile"
msgstr "no es pot fer fstat en el fitxer de paquet"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1203
msgid "pack has junk at the end"
msgstr "el paquet té brossa al seu final"
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1215
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:1238
msgid "Resolving deltas"
msgstr "S'estan resolent les diferències"
-#: builtin/index-pack.c:1205 builtin/pack-objects.c:2481
+#: builtin/index-pack.c:1249 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:1282
msgid "confusion beyond insanity"
msgstr "confusió més enllà de la bogeria"
-#: 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] "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:1300
#, 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:1304
#, 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:1328
#, 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:1424
#, 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:1444
#, 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:1469
#, 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:1477
#, 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:1501
msgid "error while closing pack file"
msgstr "error en tancar el fitxer empaquetat"
-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1515
msgid "cannot store pack file"
msgstr "no es pot emmagatzemar el fitxer empaquetat"
-#: builtin/index-pack.c:1481
+#: builtin/index-pack.c:1523
msgid "cannot store index file"
msgstr "no es pot emmagatzemar el fitxer d'índex"
-#: builtin/index-pack.c:1525 builtin/pack-objects.c:2716
+#: builtin/index-pack.c:1567 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:1631
#, 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:1633
#, 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:1681
#, 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:1688
#, 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:1728
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:1777 builtin/index-pack.c:1780
+#: builtin/index-pack.c:1796 builtin/index-pack.c:1800
#, c-format
msgid "bad %s"
msgstr "%s incorrecte"
-#: 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 "algorisme hash desconegut «%s»"
+
+#: builtin/index-pack.c:1821
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:1823
msgid "--stdin requires a git repository"
msgstr "--stdin requereix un dipòsit git"
-#: builtin/index-pack.c:1785
+#: builtin/index-pack.c:1825
+msgid "--object-format cannot be used with --stdin"
+msgstr "--object-format no es pot usar sense --stdin"
+
+#: builtin/index-pack.c:1831
msgid "--verify with no packfile name given"
msgstr "s'ha donat --verify sense nom de fitxer de paquet"
-#: builtin/index-pack.c:1833 builtin/unpack-objects.c:581
-#, fuzzy
+#: builtin/index-pack.c:1892 builtin/unpack-objects.c:582
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
-#, fuzzy, c-format
+#: builtin/init-db.c:124
+#, c-format
msgid "templates not found in %s"
-msgstr "no s'han trobat les plantilles %s"
+msgstr "plantilles no trobades a %s"
-#: 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
+#, c-format
+msgid "invalid initial branch name: '%s'"
+msgstr "nom de branca inicial 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
+#, fuzzy
+msgid "attempt to reinitialize repository with different hash"
+msgstr "s'ha intentat reinicialitzar el dipòsit amb un hash diferent"
+
+#: 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
+#, fuzzy, c-format
+msgid "re-init: ignored --initial-branch=%s"
+msgstr "reinicialització ignorada --initial-branch=%"
+
+#: 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>]"
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] "
+"[--shared[=<permissions>]] [<directory>]"
msgstr ""
-"git init [-q | --quiet] [--bare] [--template=<directori-de-plantilla>] [--"
-"shared[=<permisos>]] [<directori>]"
+"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
+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 "especifiqueu l'algorisme de resum a usar"
+
+#: builtin/init-db.c:571
+msgid "--separate-git-dir and --bare are mutually exclusive"
+msgstr "--separate-git-dir i --bare 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-"
@@ -14851,11 +16412,16 @@
"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 "--separate-git-dir és incompatible amb --bisect"
+
#: builtin/interpret-trailers.c:16
msgid ""
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
@@ -14902,7 +16468,7 @@
#: builtin/interpret-trailers.c:110
msgid "do not treat --- specially"
-msgstr ""
+msgstr "no tractis --- especialment"
#: builtin/interpret-trailers.c:111
msgid "trailer"
@@ -14920,530 +16486,550 @@
msgid "no input file given for in-place editing"
msgstr "no s'ha donat cap fitxer d'entrada per a edició in situ"
-#: builtin/log.c:56
+#: builtin/log.c:58
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<opcions>] [<rang-de-revisions>] [[--] <camí>...]"
-#: builtin/log.c:57
+#: builtin/log.c:59
msgid "git show [<options>] <object>..."
msgstr "git show [<opcions>] <objecte>..."
-#: builtin/log.c:110
+#: builtin/log.c:112
#, c-format
msgid "invalid --decorate option: %s"
msgstr "opció --decorate no vàlida: %s"
-#: builtin/log.c:174
+#: builtin/log.c:179
msgid "show source"
msgstr "mostra la font"
-#: builtin/log.c:175
+#: builtin/log.c:180
msgid "Use mail map file"
msgstr "Usa el fitxer de mapa de correu"
-#: builtin/log.c:177
+#: builtin/log.c:183
msgid "only decorate refs that match <pattern>"
msgstr "només decora les referències que coincideixin amb <patró>"
-#: builtin/log.c:179
+#: builtin/log.c:185
msgid "do not decorate refs that match <pattern>"
msgstr "no decoris les referències que coincideixen amb <patró>"
-#: builtin/log.c:180
+#: builtin/log.c:186
msgid "decorate options"
msgstr "opcions de decoració"
-#: builtin/log.c:183
-msgid "Process line range n,m in file, counting from 1"
-msgstr "Processa el rang de línies n,m en el fitxer, comptant des d'1"
+#: builtin/log.c:189
+#, fuzzy
+msgid ""
+"Trace the evolution of line range <start>,<end> or function :<funcname> in "
+"<file>"
+msgstr ""
+"Traça l'evolució del rang de línia <start>,<end> or funcions :<funcname> in "
+"{8771193"
-#: builtin/log.c:281
+#: builtin/log.c:212
+#, fuzzy
+msgid "-L<range>:<file> cannot be used with pathspec"
+msgstr "%s: %s no es pot usar amb %s"
+
+#: builtin/log.c:302
#, c-format
msgid "Final output: %d %s\n"
msgstr "Sortida final: %d %s\n"
-#: builtin/log.c:535
+#: builtin/log.c:564
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: fitxer incorrecte"
-#: builtin/log.c:550 builtin/log.c:645
-#, fuzzy, c-format
+#: builtin/log.c:579 builtin/log.c:674
+#, c-format
msgid "could not read object %s"
-msgstr "No es pot llegir l'objecte %s"
+msgstr "no s'ha pogut llegir l'objecte %s"
-#: builtin/log.c:670
-#, fuzzy, c-format
+#: builtin/log.c:699
+#, c-format
msgid "unknown type: %d"
-msgstr "Tipus desconegut: %d"
+msgstr "tipus desconegut: %d"
-#: builtin/log.c:814
+#: builtin/log.c:848
#, c-format
msgid "%s: invalid cover from description mode"
-msgstr ""
+msgstr "%s: cobertura no vàlida des del mode descripció"
-#: builtin/log.c:821
+#: builtin/log.c:855
msgid "format.headers without value"
msgstr "format.headers sense valor"
-#: builtin/log.c:936
-msgid "name of output directory is too long"
-msgstr "el nom del directori de sortida és massa llarg"
-
-#: builtin/log.c:952
-#, fuzzy, c-format
+#: builtin/log.c:984
+#, c-format
msgid "cannot open patch file %s"
-msgstr "No es pot obrir el fitxer de pedaç %s"
+msgstr "no s'ha pogut obrir el fitxer de pedaç %s"
-#: builtin/log.c:969
-#, fuzzy
+#: builtin/log.c:1001
msgid "need exactly one range"
-msgstr "Cal exactament un rang."
+msgstr "necessita exactament un interval"
-#: builtin/log.c:979
-#, fuzzy
+#: builtin/log.c:1011
msgid "not a range"
-msgstr "No és un rang."
+msgstr "no és un interval"
-#: builtin/log.c:1143
+#: builtin/log.c:1175
#, 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:1149
+#: builtin/log.c:1181
#, 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:1228
+#: builtin/log.c:1262
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to boig: %s"
-#: builtin/log.c:1255
+#: builtin/log.c:1289
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<opcions>] [<des-de> | <rang-de-revisions>]"
-#: builtin/log.c:1313
-#, fuzzy
+#: builtin/log.c:1347
msgid "two output directories?"
-msgstr "Hi ha dos directoris de sortida?"
+msgstr "dos directoris de sortida?"
-#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211
-#, fuzzy, c-format
+#: builtin/log.c:1498 builtin/log.c:2318 builtin/log.c:2320 builtin/log.c:2332
+#, c-format
msgid "unknown commit %s"
-msgstr "Comissió desconeguda %s"
+msgstr "comissió desconeguda %s"
-#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1509 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "s'ha produït un error en resoldre «%s» com a referència vàlida"
-#: builtin/log.c:1439
-#, fuzzy
+#: builtin/log.c:1518
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:1443
+#: builtin/log.c:1528
#, 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:1463
-#, fuzzy
+#: builtin/log.c:1551
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:1474
+#: builtin/log.c:1568
msgid "base commit should be the ancestor of revision list"
msgstr "la comissió base ha de ser l'avantpassat de la llista de revisions"
-#: builtin/log.c:1478
+#: builtin/log.c:1578
msgid "base commit shouldn't be in revision list"
msgstr "la comissió base no ha de ser en la llista de revisions"
-#: builtin/log.c:1531
+#: builtin/log.c:1636
msgid "cannot get patch id"
msgstr "no es pot obtenir l'id del pedaç"
-#: builtin/log.c:1583
+#: builtin/log.c:1693
#, 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:1629
+#: builtin/log.c:1695
+#, fuzzy, c-format
+msgid "using '%s' as range-diff origin of current series"
+msgstr "utilitzant «%s» com a origen de rang-diferencia de la sèrie actual"
+
+#: builtin/log.c:1739
msgid "use [PATCH n/m] even with a single patch"
msgstr "usa [PATCH n/m] fins i tot amb un sol pedaç"
-#: builtin/log.c:1632
+#: builtin/log.c:1742
msgid "use [PATCH] even with multiple patches"
msgstr "usa [PATCH] fins i tot amb múltiples pedaços"
-#: builtin/log.c:1636
+#: builtin/log.c:1746
msgid "print patches to standard out"
msgstr "imprimeix els pedaços a la sortida estàndard"
-#: builtin/log.c:1638
+#: builtin/log.c:1748
msgid "generate a cover letter"
msgstr "genera una carta de presentació"
-#: builtin/log.c:1640
+#: builtin/log.c:1750
msgid "use simple number sequence for output file names"
msgstr "usa una seqüència de números per als noms dels fitxers de sortida"
-#: builtin/log.c:1641
+#: builtin/log.c:1751
msgid "sfx"
msgstr "sufix"
-#: builtin/log.c:1642
+#: builtin/log.c:1752
msgid "use <sfx> instead of '.patch'"
-msgstr "usa <sufix> en lloc de '.patch'"
+msgstr "usa <sufix> en lloc de «.patch»"
-#: builtin/log.c:1644
+#: builtin/log.c:1754
msgid "start numbering patches at <n> instead of 1"
msgstr "comença numerant els pedaços a <n> en lloc d'1"
-#: builtin/log.c:1646
+#: builtin/log.c:1756
msgid "mark the series as Nth re-roll"
msgstr "marca la sèrie com a l'enèsima llançada"
-#: builtin/log.c:1648
+#: builtin/log.c:1758
+#, fuzzy
+msgid "max length of output filename"
+msgstr "mida màxima de cada fitxer empaquetat de sortida"
+
+#: builtin/log.c:1760
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "Usa [RFC PATCH] en lloc de [PATCH]"
-#: builtin/log.c:1651
+#: builtin/log.c:1763
+#, fuzzy
msgid "cover-from-description-mode"
-msgstr ""
+msgstr "preferences-from-description-mode"
-#: builtin/log.c:1652
+#: builtin/log.c:1764
+#, 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:1654
+#: builtin/log.c:1766
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Usa [<prefix>] en lloc de [PATCH]"
-#: builtin/log.c:1657
+#: builtin/log.c:1769
msgid "store resulting files in <dir>"
msgstr "emmagatzema els fitxers resultants a <directori>"
-#: builtin/log.c:1660
+#: builtin/log.c:1772
msgid "don't strip/add [PATCH]"
msgstr "no despullis/afegeixis [PATCH]"
-#: builtin/log.c:1663
+#: builtin/log.c:1775
msgid "don't output binary diffs"
msgstr "no emetis diferències binàries"
-#: builtin/log.c:1665
+#: builtin/log.c:1777
msgid "output all-zero hash in From header"
msgstr "emet un hash de tots zeros en la capçalera From"
-#: builtin/log.c:1667
+#: builtin/log.c:1779
msgid "don't include a patch matching a commit upstream"
msgstr "no incloguis pedaços que coincideixin amb comissions a la font"
-#: builtin/log.c:1669
+#: builtin/log.c:1781
msgid "show patch format instead of default (patch + stat)"
msgstr ""
"mostra el format de pedaç en lloc del per defecte (pedaç + estadístiques)"
-#: builtin/log.c:1671
+#: builtin/log.c:1783
msgid "Messaging"
msgstr "Missatgeria"
-#: builtin/log.c:1672
+#: builtin/log.c:1784
msgid "header"
msgstr "capçalera"
-#: builtin/log.c:1673
+#: builtin/log.c:1785
msgid "add email header"
msgstr "afegeix una capçalera de correu electrònic"
-#: builtin/log.c:1674 builtin/log.c:1676
+#: builtin/log.c:1786 builtin/log.c:1787
msgid "email"
msgstr "correu electrònic"
-#: builtin/log.c:1674
+#: builtin/log.c:1786
msgid "add To: header"
msgstr "afegeix la capçalera To:"
-#: builtin/log.c:1676
+#: builtin/log.c:1787
msgid "add Cc: header"
msgstr "afegeix la capçalera Cc:"
-#: builtin/log.c:1678
+#: builtin/log.c:1788
msgid "ident"
msgstr "identitat"
-#: builtin/log.c:1679
+#: builtin/log.c:1789
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"estableix l'adreça From a <identitat> (o la identitat del comitent si manca)"
-#: builtin/log.c:1681
+#: builtin/log.c:1791
msgid "message-id"
msgstr "ID de missatge"
-#: builtin/log.c:1682
+#: builtin/log.c:1792
msgid "make first mail a reply to <message-id>"
msgstr "fes que el primer missatge sigui una resposta a <ID de missatge>"
-#: builtin/log.c:1683 builtin/log.c:1686
+#: builtin/log.c:1793 builtin/log.c:1796
msgid "boundary"
msgstr "límit"
-#: builtin/log.c:1684
+#: builtin/log.c:1794
msgid "attach the patch"
msgstr "adjunta el pedaç"
-#: builtin/log.c:1687
+#: builtin/log.c:1797
msgid "inline the patch"
msgstr "posa el pedaç en el cos"
-#: builtin/log.c:1691
+#: builtin/log.c:1801
msgid "enable message threading, styles: shallow, deep"
msgstr "habilita l'enfilada de missatges, estils: shallow, deep"
-#: builtin/log.c:1693
+#: builtin/log.c:1803
msgid "signature"
msgstr "signatura"
-#: builtin/log.c:1694
+#: builtin/log.c:1804
msgid "add a signature"
msgstr "afegeix una signatura"
-#: builtin/log.c:1695
+#: builtin/log.c:1805
msgid "base-commit"
msgstr "comissió base"
-#: builtin/log.c:1696
+#: builtin/log.c:1806
msgid "add prerequisite tree info to the patch series"
msgstr "afegeix la informació d'arbre requerida a la sèrie de pedaços"
-#: builtin/log.c:1698
+#: builtin/log.c:1809
msgid "add a signature from a file"
msgstr "afegeix una signatura des d'un fitxer"
-#: builtin/log.c:1699
+#: builtin/log.c:1810
msgid "don't print the patch filenames"
msgstr "no imprimeixis els noms de fitxer del pedaç"
-#: builtin/log.c:1701
+#: builtin/log.c:1812
msgid "show progress while generating patches"
msgstr "mostra el progrés durant la generació de pedaços"
-#: builtin/log.c:1703
+#: builtin/log.c:1814
+#, 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:1706
+#: builtin/log.c:1817
+#, 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:1708
+#: builtin/log.c:1819
+#, fuzzy
msgid "percentage by which creation is weighted"
-msgstr ""
+msgstr "percentatge pel qual la creació és ponderada"
-#: builtin/log.c:1792
+#: builtin/log.c:1905
#, c-format
msgid "invalid ident line: %s"
msgstr "línia d'identitat no vàlida: %s"
-#: builtin/log.c:1807
-#, fuzzy
+#: builtin/log.c:1920
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:1809
-#, fuzzy
+#: builtin/log.c:1922
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:1817
+#: builtin/log.c:1930
msgid "--name-only does not make sense"
msgstr "--name-only no té sentit"
-#: builtin/log.c:1819
+#: builtin/log.c:1932
msgid "--name-status does not make sense"
msgstr "--name-status no té sentit"
-#: builtin/log.c:1821
+#: builtin/log.c:1934
msgid "--check does not make sense"
msgstr "--check no té sentit"
-#: builtin/log.c:1854
-msgid "standard output, or directory, which one?"
-msgstr "sortida estàndard o directori, quin dels dos?"
+#: builtin/log.c:1956
+#, fuzzy
+msgid "--stdout, --output, and --output-directory are mutually exclusive"
+msgstr "-b, -B i --detach són mútuament excloents"
-#: builtin/log.c:1958
+#: builtin/log.c:2079
msgid "--interdiff requires --cover-letter or single patch"
-msgstr ""
+msgstr "--interdiff requereix --cover-letter o un sol pedaç"
-#: builtin/log.c:1962
+#: builtin/log.c:2083
msgid "Interdiff:"
-msgstr ""
+msgstr "Interdiff:"
-#: builtin/log.c:1963
+#: builtin/log.c:2084
#, c-format
msgid "Interdiff against v%d:"
-msgstr ""
+msgstr "Interdiff contra v%d:"
-#: builtin/log.c:1969
+#: builtin/log.c:2090
msgid "--creation-factor requires --range-diff"
-msgstr ""
+msgstr "--creation-factor requereix --range-diff"
-#: builtin/log.c:1973
+#: builtin/log.c:2094
msgid "--range-diff requires --cover-letter or single patch"
-msgstr ""
+msgstr "--range-diff requereix --cover-letter o un sol pedaç"
-#: builtin/log.c:1981
+#: builtin/log.c:2102
+#, fuzzy
msgid "Range-diff:"
-msgstr ""
+msgstr "Diferència-interval"
-#: builtin/log.c:1982
-#, c-format
+#: builtin/log.c:2103
+#, fuzzy, c-format
msgid "Range-diff against v%d:"
-msgstr ""
+msgstr "Diferència de l'interval contra el v%d"
-#: builtin/log.c:1993
+#: builtin/log.c:2114
#, c-format
msgid "unable to read signature file '%s'"
msgstr "no s'ha pogut llegir el fitxer de signatura «%s»"
-#: builtin/log.c:2029
+#: builtin/log.c:2150
msgid "Generating patches"
msgstr "S'estan generant els pedaços"
-#: builtin/log.c:2073
+#: builtin/log.c:2194
#, 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:2132
+#: builtin/log.c:2253
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<font> [<cap> [<límit>]]]"
-#: builtin/log.c:2186
+#: builtin/log.c:2307
#, c-format
msgid ""
-"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+"Could not find a tracked remote branch, please specify <upstream> "
+"manually.\n"
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ó"
@@ -15462,7 +17048,7 @@
msgid "do not print remote URL"
msgstr "no imprimeixis l'URL remot"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1518
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1398
msgid "exec"
msgstr "executable"
@@ -15492,7 +17078,7 @@
#: 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>...]"
@@ -15536,405 +17122,6 @@
msgid "empty mbox: '%s'"
msgstr "mbox buit: «%s»"
-#: builtin/merge.c:55
-msgid "git merge [<options>] [<commit>...]"
-msgstr "git merge [<opcions>] [<comissió>...]"
-
-#: builtin/merge.c:56
-msgid "git merge --abort"
-msgstr "git merge --abort"
-
-#: builtin/merge.c:57
-msgid "git merge --continue"
-msgstr "git merge --continue"
-
-#: builtin/merge.c:118
-msgid "switch `m' requires a value"
-msgstr "l'opció «m» requereix un valor"
-
-#: builtin/merge.c:141
-#, fuzzy, c-format
-msgid "option `%s' requires a value"
-msgstr "l'opció «%s» requereix un valor"
-
-#: builtin/merge.c:187
-#, 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
-#, c-format
-msgid "Available strategies are:"
-msgstr "Les estratègies disponibles són:"
-
-#: builtin/merge.c:193
-#, c-format
-msgid "Available custom strategies are:"
-msgstr "Les estratègies personalitzades disponibles són:"
-
-#: builtin/merge.c:244 builtin/pull.c:152
-msgid "do not show a diffstat at the end of the merge"
-msgstr "no mostris les estadístiques de diferència al final de la fusió"
-
-#: builtin/merge.c:247 builtin/pull.c:155
-msgid "show a diffstat at the end of the merge"
-msgstr "mostra les estadístiques de diferència al final de la fusió"
-
-#: builtin/merge.c:248 builtin/pull.c:158
-msgid "(synonym to --stat)"
-msgstr "(sinònim de --stat)"
-
-#: builtin/merge.c:250 builtin/pull.c:161
-msgid "add (at most <n>) entries from shortlog to merge commit message"
-msgstr ""
-"afegeix (com a màxim <n>) entrades del registre curt al missatge de comissió "
-"de fusió"
-
-#: builtin/merge.c:253 builtin/pull.c:167
-msgid "create a single commit instead of doing a merge"
-msgstr "crea una única comissió en lloc de fusionar"
-
-#: builtin/merge.c:255 builtin/pull.c:170
-msgid "perform a commit if the merge succeeds (default)"
-msgstr "realitza una comissió si la fusió té èxit (per defecte)"
-
-#: builtin/merge.c:257 builtin/pull.c:173
-msgid "edit message before committing"
-msgstr "edita el missatge abans de cometre"
-
-#: builtin/merge.c:259
-msgid "allow fast-forward (default)"
-msgstr "permet l'avanç ràpid (per defecte)"
-
-#: builtin/merge.c:261 builtin/pull.c:180
-msgid "abort if fast-forward is not possible"
-msgstr "avorta si l'avanç ràpid no és possible"
-
-#: builtin/merge.c:265 builtin/pull.c:183
-msgid "verify that the named commit has a valid GPG signature"
-msgstr "verifica que la comissió anomenada tingui una signatura GPG vàlida"
-
-#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:187
-#: builtin/rebase.c:512 builtin/rebase.c:1531 builtin/revert.c:114
-msgid "strategy"
-msgstr "estratègia"
-
-#: builtin/merge.c:267 builtin/pull.c:188
-msgid "merge strategy to use"
-msgstr "estratègia de fusió a usar"
-
-#: builtin/merge.c:268 builtin/pull.c:191
-msgid "option=value"
-msgstr "opció=valor"
-
-#: builtin/merge.c:269 builtin/pull.c:192
-msgid "option for selected merge strategy"
-msgstr "opció per a l'estratègia de fusió seleccionada"
-
-#: builtin/merge.c:271
-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
-msgid "abort the current in-progress merge"
-msgstr "avorta la fusió en curs actual"
-
-#: builtin/merge.c:280
-#, fuzzy
-msgid "--abort but leave index and working tree alone"
-msgstr "restableix HEAD, l'índex i l'arbre de treball"
-
-#: builtin/merge.c:282
-msgid "continue the current in-progress merge"
-msgstr "continua la fusió en curs actual"
-
-#: builtin/merge.c:284 builtin/pull.c:199
-msgid "allow merging unrelated histories"
-msgstr "permet fusionar històries no relacionades"
-
-#: builtin/merge.c:290
-#, fuzzy
-msgid "bypass pre-merge-commit and commit-msg hooks"
-msgstr "evita els lligams de precomissió i missatge de comissió"
-
-#: builtin/merge.c:307
-msgid "could not run stash."
-msgstr "no s'ha pogut executar «stash»."
-
-#: builtin/merge.c:312
-msgid "stash failed"
-msgstr "l'«stash» ha fallat"
-
-#: builtin/merge.c:317
-#, c-format
-msgid "not a valid object: %s"
-msgstr "no és un objecte vàlid: %s"
-
-#: builtin/merge.c:339 builtin/merge.c:356
-msgid "read-tree failed"
-msgstr "read-tree ha fallat"
-
-#: builtin/merge.c:386
-msgid " (nothing to squash)"
-msgstr " (res a fer «squash»)"
-
-#: builtin/merge.c:397
-#, c-format
-msgid "Squash commit -- not updating HEAD\n"
-msgstr "Comissió «squash» -- no s'està actualitzant HEAD\n"
-
-#: builtin/merge.c:447
-#, 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
-#, c-format
-msgid "'%s' does not point to a commit"
-msgstr "«%s» no assenyala una comissió"
-
-#: builtin/merge.c:585
-#, c-format
-msgid "Bad branch.%s.mergeoptions string: %s"
-msgstr "Cadena branch.%s.mergeoptions incorrecta: %s"
-
-#: builtin/merge.c:705
-msgid "Not handling anything other than two heads merge."
-msgstr "No s'està gestionant res a part de la fusió de dos caps."
-
-#: builtin/merge.c:719
-#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Opció desconeguda de merge-recursive: -X%s"
-
-#: builtin/merge.c:734
-#, c-format
-msgid "unable to write %s"
-msgstr "no s'ha pogut escriure %s"
-
-#: builtin/merge.c:786
-#, c-format
-msgid "Could not read from '%s'"
-msgstr "No s'ha pogut llegir de «%s»"
-
-#: builtin/merge.c:795
-#, c-format
-msgid "Not committing merge; use 'git commit' to complete the merge.\n"
-msgstr ""
-"No s'està cometent la fusió; useu 'git commit' per a completar la fusió.\n"
-
-#: builtin/merge.c:801
-#, 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"
-
-#: builtin/merge.c:806
-#, fuzzy
-msgid "An empty message aborts the commit.\n"
-msgstr "edita el missatge abans de cometre"
-
-#: builtin/merge.c:809
-#, 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"
-
-#: builtin/merge.c:862
-msgid "Empty commit message."
-msgstr "El missatge de comissió és buit."
-
-#: builtin/merge.c:877
-#, c-format
-msgid "Wonderful.\n"
-msgstr "Meravellós.\n"
-
-#: builtin/merge.c:938
-#, c-format
-msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
-msgstr ""
-"La fusió automàtica ha fallat; arregleu els conflictes i després cometeu el "
-"resultat.\n"
-
-#: builtin/merge.c:977
-msgid "No current branch."
-msgstr "No hi ha cap branca actual."
-
-#: builtin/merge.c:979
-msgid "No remote for the current branch."
-msgstr "No hi ha cap remot per a la branca actual."
-
-#: builtin/merge.c:981
-msgid "No default upstream defined for the current branch."
-msgstr "No hi ha cap font per defecte definida per a la branca actual."
-
-#: builtin/merge.c:986
-#, c-format
-msgid "No remote-tracking branch for %s from %s"
-msgstr "No hi ha cap branca amb seguiment remot per a %s de %s"
-
-#: builtin/merge.c:1043
-#, c-format
-msgid "Bad value '%s' in environment '%s'"
-msgstr "Valor incorrecte «%s» en l'entorn «%s»"
-
-#: builtin/merge.c:1146
-#, c-format
-msgid "not something we can merge in %s: %s"
-msgstr "no és quelcom que puguem fusionar en %s: %s"
-
-#: builtin/merge.c:1180
-msgid "not something we can merge"
-msgstr "no és quelcom que puguem fusionar"
-
-#: builtin/merge.c:1283
-msgid "--abort expects no arguments"
-msgstr "--abort no accepta paràmetres"
-
-#: builtin/merge.c:1287
-msgid "There is no merge to abort (MERGE_HEAD missing)."
-msgstr "No hi ha fusió a avortar (manca MERGE_HEAD)."
-
-#: builtin/merge.c:1296
-#, fuzzy
-msgid "--quit expects no arguments"
-msgstr "--abort no accepta paràmetres"
-
-#: builtin/merge.c:1309
-msgid "--continue expects no arguments"
-msgstr "--continue no accepta paràmetres"
-
-#: builtin/merge.c:1313
-msgid "There is no merge in progress (MERGE_HEAD missing)."
-msgstr "No hi ha cap fusió en curs (manca MERGE_HEAD)."
-
-#: builtin/merge.c:1329
-msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you merge."
-msgstr ""
-"No heu conclòs la vostra fusió (MERGE_HEAD existeix).\n"
-"Cometeu els vostres canvis abans de fusionar."
-
-#: builtin/merge.c:1336
-msgid ""
-"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
-"Please, commit your changes before you merge."
-msgstr ""
-"No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix).\n"
-"Cometeu els vostres canvis abans de fusionar."
-
-#: builtin/merge.c:1339
-msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
-msgstr "No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix)."
-
-#: builtin/merge.c:1353
-msgid "You cannot combine --squash with --no-ff."
-msgstr "No podeu combinar --squash amb --no-ff."
-
-#: builtin/merge.c:1355
-#, fuzzy
-msgid "You cannot combine --squash with --commit."
-msgstr "No podeu combinar --squash amb --no-ff."
-
-#: builtin/merge.c:1371
-msgid "No commit specified and merge.defaultToUpstream not set."
-msgstr ""
-"No hi ha una comissió especificada i merge.defaultToUpstream no està "
-"establert."
-
-#: builtin/merge.c:1388
-msgid "Squash commit into empty head not supported yet"
-msgstr "Una comissió «squash» a un HEAD buit encara no es permet"
-
-#: builtin/merge.c:1390
-msgid "Non-fast-forward commit does not make sense into an empty head"
-msgstr "Una comissió no d'avanç ràpid no té sentit a un HEAD buit"
-
-#: builtin/merge.c:1395
-#, c-format
-msgid "%s - not something we can merge"
-msgstr "%s - no és una cosa que puguem fusionar"
-
-#: builtin/merge.c:1397
-msgid "Can merge only exactly one commit into empty head"
-msgstr "Es pot fusionar només una comissió a un HEAD buit"
-
-#: builtin/merge.c:1476
-msgid "refusing to merge unrelated histories"
-msgstr "s'està refusant fusionar històries no relacionades"
-
-#: builtin/merge.c:1485
-msgid "Already up to date."
-msgstr "Ja està al dia."
-
-#: builtin/merge.c:1495
-#, c-format
-msgid "Updating %s..%s\n"
-msgstr "S'estan actualitzant %s..%s\n"
-
-#: builtin/merge.c:1537
-#, c-format
-msgid "Trying really trivial in-index merge...\n"
-msgstr "S'està intentant una fusió molt trivial en l'índex...\n"
-
-#: builtin/merge.c:1544
-#, c-format
-msgid "Nope.\n"
-msgstr "No.\n"
-
-#: builtin/merge.c:1569
-msgid "Already up to date. Yeeah!"
-msgstr "Ja està al dia. Estupend!"
-
-#: builtin/merge.c:1575
-msgid "Not possible to fast-forward, aborting."
-msgstr "No és possible avançar ràpidament, s'està avortant."
-
-#: builtin/merge.c:1598 builtin/merge.c:1663
-#, c-format
-msgid "Rewinding the tree to pristine...\n"
-msgstr "S'està rebobinant l'arbre a la pristina...\n"
-
-#: builtin/merge.c:1602
-#, c-format
-msgid "Trying merge strategy %s...\n"
-msgstr "S'està intentant l'estratègia de fusió %s...\n"
-
-#: builtin/merge.c:1654
-#, c-format
-msgid "No merge strategy handled the merge.\n"
-msgstr "Cap estratègia de fusió ha gestionat la fusió.\n"
-
-#: builtin/merge.c:1656
-#, c-format
-msgid "Merge with strategy %s failed.\n"
-msgstr "L'estratègia de fusió %s ha fallat.\n"
-
-#: builtin/merge.c:1665
-#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
-msgstr "S'està usant el %s per a preparar la resolució a mà.\n"
-
-#: builtin/merge.c:1677
-#, 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ó>..."
@@ -15955,34 +17142,35 @@
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <referència> [<comissió>]"
-#: builtin/merge-base.c:153
+#: builtin/merge-base.c:143
msgid "output all common ancestors"
msgstr "emet tots els avantpassats comuns"
-#: builtin/merge-base.c:155
+#: 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:157
+#: builtin/merge-base.c:147
msgid "list revs not reachable from others"
msgstr "llista les revisions no abastables d'altres"
-#: builtin/merge-base.c:159
+#: 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:161
+#: 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>"
+"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>"
+"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"
@@ -16047,6 +17235,397 @@
msgid "Merging %s with %s\n"
msgstr "S'està fusionant %s amb %s\n"
+#: builtin/merge.c:57
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<opcions>] [<comissió>...]"
+
+#: builtin/merge.c:58
+msgid "git merge --abort"
+msgstr "git merge --abort"
+
+#: builtin/merge.c:59
+msgid "git merge --continue"
+msgstr "git merge --continue"
+
+#: builtin/merge.c:122
+msgid "switch `m' requires a value"
+msgstr "l'opció «m» requereix un valor"
+
+#: builtin/merge.c:145
+#, c-format
+msgid "option `%s' requires a value"
+msgstr "l'opció «%s» requereix un valor"
+
+#: builtin/merge.c:198
+#, 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:199
+#, c-format
+msgid "Available strategies are:"
+msgstr "Les estratègies disponibles són:"
+
+#: builtin/merge.c:204
+#, c-format
+msgid "Available custom strategies are:"
+msgstr "Les estratègies personalitzades disponibles són:"
+
+#: builtin/merge.c:255 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:258 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:259 builtin/pull.c:139
+msgid "(synonym to --stat)"
+msgstr "(sinònim de --stat)"
+
+#: builtin/merge.c:261 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:264 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:266 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:268 builtin/pull.c:154
+msgid "edit message before committing"
+msgstr "edita el missatge abans de cometre"
+
+#: builtin/merge.c:270
+msgid "allow fast-forward (default)"
+msgstr "permet l'avanç ràpid (per defecte)"
+
+#: builtin/merge.c:272 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:276 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:277 builtin/notes.c:787 builtin/pull.c:168
+#: builtin/rebase.c:539 builtin/rebase.c:1412 builtin/revert.c:114
+msgid "strategy"
+msgstr "estratègia"
+
+#: builtin/merge.c:278 builtin/pull.c:169
+msgid "merge strategy to use"
+msgstr "estratègia de fusió a usar"
+
+#: builtin/merge.c:279 builtin/pull.c:172
+msgid "option=value"
+msgstr "opció=valor"
+
+#: builtin/merge.c:280 builtin/pull.c:173
+msgid "option for selected merge strategy"
+msgstr "opció per a l'estratègia de fusió seleccionada"
+
+#: builtin/merge.c:282
+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:289
+msgid "abort the current in-progress merge"
+msgstr "avorta la fusió en curs actual"
+
+#: builtin/merge.c:291
+msgid "--abort but leave index and working tree alone"
+msgstr "--abort però deixa l'índex i l'arbre de treball intactes"
+
+#: builtin/merge.c:293
+msgid "continue the current in-progress merge"
+msgstr "continua la fusió en curs actual"
+
+#: builtin/merge.c:295 builtin/pull.c:180
+msgid "allow merging unrelated histories"
+msgstr "permet fusionar històries no relacionades"
+
+#: builtin/merge.c:302
+#, fuzzy
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr "evita els ganxos pre-combinació i missatge de comissió"
+
+#: builtin/merge.c:319
+msgid "could not run stash."
+msgstr "no s'ha pogut executar «stash»."
+
+#: builtin/merge.c:324
+msgid "stash failed"
+msgstr "l'«stash» ha fallat"
+
+#: builtin/merge.c:329
+#, c-format
+msgid "not a valid object: %s"
+msgstr "no és un objecte vàlid: %s"
+
+#: builtin/merge.c:351 builtin/merge.c:368
+msgid "read-tree failed"
+msgstr "read-tree ha fallat"
+
+#: builtin/merge.c:398
+msgid " (nothing to squash)"
+msgstr " (res a fer «squash»)"
+
+#: builtin/merge.c:409
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr "Comissió «squash» -- no s'està actualitzant HEAD\n"
+
+#: builtin/merge.c:459
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr "Cap missatge de fusió -- no s'està actualitzant HEAD\n"
+
+#: builtin/merge.c:510
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr "«%s» no assenyala una comissió"
+
+#: builtin/merge.c:597
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr "Cadena branch.%s.mergeoptions incorrecta: %s"
+
+#: builtin/merge.c:723
+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:736
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr "Opció desconeguda de merge-recursive: -X%s"
+
+#: builtin/merge.c:755 t/helper/test-fast-rebase.c:209
+#, c-format
+msgid "unable to write %s"
+msgstr "no s'ha pogut escriure %s"
+
+#: builtin/merge.c:807
+#, c-format
+msgid "Could not read from '%s'"
+msgstr "No s'ha pogut llegir de «%s»"
+
+#: builtin/merge.c:816
+#, c-format
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+msgstr ""
+"No s'està cometent la fusió; useu «git commit» per a completar la fusió.\n"
+
+#: builtin/merge.c:822
+#, 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 explicar per què aquesta fusió és "
+"necessària especialment si fusiona una font actualitzada en una branca de "
+"tema."
+
+#: builtin/merge.c:827
+msgid "An empty message aborts the commit.\n"
+msgstr "Un missatge buit interromp la comissió.\n"
+
+#: builtin/merge.c:830
+#, c-format
+msgid ""
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
+"Les línies que comencen amb «%c» seran ignorades i un missatge buit "
+"interromp la comissió.\n"
+
+#: builtin/merge.c:883
+msgid "Empty commit message."
+msgstr "El missatge de comissió és buit."
+
+#: builtin/merge.c:898
+#, c-format
+msgid "Wonderful.\n"
+msgstr "Meravellós.\n"
+
+#: builtin/merge.c:959
+#, 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:998
+msgid "No current branch."
+msgstr "No hi ha cap branca actual."
+
+#: builtin/merge.c:1000
+msgid "No remote for the current branch."
+msgstr "No hi ha cap remot per a la branca actual."
+
+#: builtin/merge.c:1002
+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:1007
+#, 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:1064
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "Valor incorrecte «%s» en l'entorn «%s»"
+
+#: builtin/merge.c:1167
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr "no és quelcom que puguem fusionar en %s: %s"
+
+#: builtin/merge.c:1201
+msgid "not something we can merge"
+msgstr "no és quelcom que puguem fusionar"
+
+#: builtin/merge.c:1311
+msgid "--abort expects no arguments"
+msgstr "--abort no espera cap argument"
+
+#: builtin/merge.c:1315
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr "No hi ha fusió a avortar (manca MERGE_HEAD)."
+
+#: builtin/merge.c:1333
+msgid "--quit expects no arguments"
+msgstr "--quit no espera cap argument"
+
+#: builtin/merge.c:1346
+msgid "--continue expects no arguments"
+msgstr "--continue no espera cap argument"
+
+#: builtin/merge.c:1350
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr "No hi ha cap fusió en curs (manca MERGE_HEAD)."
+
+#: builtin/merge.c:1366
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+"No heu conclòs la vostra fusió (MERGE_HEAD existeix).\n"
+"Cometeu els vostres canvis abans de fusionar."
+
+#: builtin/merge.c:1373
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+"No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix).\n"
+"Cometeu els vostres canvis abans de fusionar."
+
+#: builtin/merge.c:1376
+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:1390
+msgid "You cannot combine --squash with --no-ff."
+msgstr "No podeu combinar --squash amb --no-ff."
+
+#: builtin/merge.c:1392
+msgid "You cannot combine --squash with --commit."
+msgstr "No podeu combinar --squash amb --commit."
+
+#: builtin/merge.c:1408
+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:1425
+msgid "Squash commit into empty head not supported yet"
+msgstr "Una comissió «squash» a un HEAD buit encara no es permet"
+
+#: builtin/merge.c:1427
+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:1432
+#, c-format
+msgid "%s - not something we can merge"
+msgstr "%s - no és una cosa que puguem fusionar"
+
+#: builtin/merge.c:1434
+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:1515
+msgid "refusing to merge unrelated histories"
+msgstr "s'està refusant fusionar històries no relacionades"
+
+#: builtin/merge.c:1524
+msgid "Already up to date."
+msgstr "Ja està al dia."
+
+#: builtin/merge.c:1534
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr "S'estan actualitzant %s..%s\n"
+
+#: builtin/merge.c:1580
+#, 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:1587
+#, c-format
+msgid "Nope.\n"
+msgstr "No.\n"
+
+#: builtin/merge.c:1612
+msgid "Already up to date. Yeeah!"
+msgstr "Ja està al dia. Estupend!"
+
+#: builtin/merge.c:1618
+msgid "Not possible to fast-forward, aborting."
+msgstr "No és possible avançar ràpidament, s'està avortant."
+
+#: builtin/merge.c:1646 builtin/merge.c:1711
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr "S'està rebobinant l'arbre a la pristina...\n"
+
+#: builtin/merge.c:1650
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr "S'està intentant l'estratègia de fusió %s...\n"
+
+#: builtin/merge.c:1702
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr "Cap estratègia de fusió ha gestionat la fusió.\n"
+
+#: builtin/merge.c:1704
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr "L'estratègia de fusió %s ha fallat.\n"
+
+#: builtin/merge.c:1713
+#, 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:1727
+#, 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/mktree.c:66
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
@@ -16068,29 +17647,36 @@
"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
"size=<size>)"
msgstr ""
+"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
+"size=<size>)"
#: 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: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:50 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: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: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>"
@@ -16120,113 +17706,118 @@
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 "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 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 "en conflicte"
+
+#: 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 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:716 builtin/repack.c:518
+#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:484
#, c-format
msgid "renaming '%s' failed"
msgstr "el canvi del nom de «%s» ha fallat"
-#: builtin/name-rev.c:403
+#: builtin/name-rev.c:465
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<opcions>] <comissió>..."
-#: builtin/name-rev.c:404
+#: builtin/name-rev.c:466
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<opcions>] --all"
-#: builtin/name-rev.c:405
+#: builtin/name-rev.c:467
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<opcions>] --stdin"
-#: builtin/name-rev.c:462
-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:463
+#: 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:465
+#: 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:467
+#: builtin/name-rev.c:529
msgid "ignore refs matching <pattern>"
msgstr "ignora les referències que coincideixin amb <patró>"
-#: builtin/name-rev.c:469
+#: 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:470
+#: builtin/name-rev.c:532
msgid "read from stdin"
msgstr "llegeix de stdin"
-#: builtin/name-rev.c:471
+#: 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:477
+#: builtin/name-rev.c:539
msgid "dereference tags in the input (internal use)"
msgstr "desreferencia les etiquetes en l'entrada (ús intern)"
@@ -16236,8 +17827,8 @@
#: builtin/notes.c:29
msgid ""
-"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
-"| (-c | -C) <object>] [<object>]"
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file>"
+" | (-c | -C) <object>] [<object>]"
msgstr ""
"git notes [--ref <referència-de-notes>] add [-f] [--allow-empty] [-m "
"<missatge> | -F <fitxer> | (-c | -C) <objecte>] [<objecte>]"
@@ -16249,8 +17840,8 @@
#: builtin/notes.c:31
msgid ""
-"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
-"(-c | -C) <object>] [<object>]"
+"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> |"
+" (-c | -C) <object>] [<object>]"
msgstr ""
"git notes [--ref <referència-de-notes>] append [--allow-empty] [-m "
"<missatge> | -F <fitxer> | (-c | -C) <objecte>] [<objecte>]"
@@ -16350,16 +17941,16 @@
#: 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"
@@ -16375,7 +17966,7 @@
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»"
@@ -16409,7 +18000,6 @@
#. 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/)"
@@ -16457,7 +18047,7 @@
"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
@@ -16485,11 +18075,11 @@
#: builtin/notes.c:538
#, c-format
msgid ""
-"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
-"existing notes"
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite"
+" 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
@@ -16502,7 +18092,7 @@
"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
@@ -16516,7 +18106,7 @@
#: 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"
@@ -16553,11 +18143,11 @@
#: builtin/notes.c:788
msgid ""
-"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
-"cat_sort_uniq)"
+"resolve notes conflicts using the given strategy "
+"(manual/ours/theirs/union/cat_sort_uniq)"
msgstr ""
-"resol els conflictes de nota usant l'estratègia donada (manual/ours/theirs/"
-"union/cat_sort_uniq)"
+"resol els conflictes de nota usant l'estratègia donada "
+"(manual/ours/theirs/union/cat_sort_uniq)"
#: builtin/notes.c:790
msgid "Committing unmerged notes"
@@ -16603,15 +18193,15 @@
#: 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"
+"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 ""
"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."
@@ -16629,7 +18219,7 @@
msgid "read object names from the standard input"
msgstr "llegeix els noms d'objecte des de l'entrada estàndard"
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220
msgid "do not remove, show only"
msgstr "no eliminis, només mostra"
@@ -16645,404 +18235,427 @@
msgid "use notes from <notes-ref>"
msgstr "usa les notes de <referència-de-notes>"
-#: builtin/notes.c:1034 builtin/stash.c:1607
+#: builtin/notes.c:1034 builtin/stash.c:1604
#, 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:428
+#: 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:439
+#: 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:570
+#: builtin/pack-objects.c:585
#, fuzzy, c-format
msgid "recursive delta detected for object %s"
-msgstr "no s'ha rebut l'objecte esperat %s"
+msgstr "delta recursiu detectat per a objectes percentuals"
-#: builtin/pack-objects.c:781
-#, c-format
+#: builtin/pack-objects.c:796
+#, fuzzy, c-format
msgid "ordered %u objects, expected %<PRIu32>"
-msgstr ""
+msgstr "s'esperava un objecte d'un 1% <PRIu32>"
-#: builtin/pack-objects.c:794
-#, fuzzy, c-format
-msgid "packfile is invalid: %s"
-msgstr "%s no vàlid"
-
-#: builtin/pack-objects.c:798
-#, fuzzy, c-format
-msgid "unable to open packfile for reuse: %s"
-msgstr "no s'ha pogut obrir o llegir %s"
-
-#: builtin/pack-objects.c:802
-#, fuzzy
-msgid "unable to seek in reused packfile"
-msgstr "no es pot llegir el fitxer d'índex"
-
-#: builtin/pack-objects.c:813
-#, fuzzy
-msgid "unable to read from reused packfile"
-msgstr "no es pot llegir el fitxer d'índex"
-
-#: builtin/pack-objects.c:841
+#: builtin/pack-objects.c: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"
+"s'està inhabilitant l'escriptura de mapes de bits, es divideixen els paquets"
+" a causa de pack.packSizeLimit"
-#: builtin/pack-objects.c:854
+#: builtin/pack-objects.c:1017
msgid "Writing objects"
msgstr "S'estan escrivint els objectes"
-#: builtin/pack-objects.c:917 builtin/update-index.c:90
+#: 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:970
-#, c-format
+#: builtin/pack-objects.c:1131
+#, fuzzy, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr ""
+"va escriure%<PRIu32> objectes mentre s'esperava un percentatge<PRIu32>"
-#: builtin/pack-objects.c:1164
+#: 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"
+"s'està inhabilitant l'escriptura de mapes de bits, perquè alguns objectes no"
+" s'empaqueten"
-#: builtin/pack-objects.c:1592
+#: 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:1601
+#: 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:1870
+#: builtin/pack-objects.c:2086
msgid "Counting objects"
msgstr "S'estan comptant els objectes"
-#: builtin/pack-objects.c:2000
-#, fuzzy, c-format
-msgid "unable to get size of %s"
-msgstr "no s'ha pogut moure %s a %s"
-
-#: builtin/pack-objects.c:2015
+#: builtin/pack-objects.c: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:2085 builtin/pack-objects.c:2101
-#: builtin/pack-objects.c:2111
+#: 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:2088 builtin/pack-objects.c:2115
-#, 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:2125
+#: builtin/pack-objects.c:2341
+#, fuzzy
msgid "suboptimal pack - out of memory"
-msgstr ""
+msgstr "paquet subòptim - sense memòria"
-#: builtin/pack-objects.c:2440
-#, 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:2572
+#: 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:2659
+#: builtin/pack-objects.c:2883
msgid "Compressing objects"
msgstr "S'estan comprimint els objectes"
-#: builtin/pack-objects.c:2665
+#: builtin/pack-objects.c:2889
+#, fuzzy
msgid "inconsistency with delta count"
-msgstr ""
+msgstr "inconsistència amb el comptador de diferències"
-#: builtin/pack-objects.c:2742
-#, c-format
+#: builtin/pack-objects.c:2961
+#, fuzzy, c-format
+msgid ""
+"value of uploadpack.blobpackfileuri must be of the form '<object-hash> "
+"<pack-hash> <uri>' (got '%s')"
+msgstr ""
+"el valor de uppack.blobpackfileuri ha de ser de la forma '<object-hash> "
+"<pack-hash> <uri>' (gotat '%s')"
+
+#: builtin/pack-objects.c:2964
+#, fuzzy, c-format
+msgid ""
+"object already configured in another uploadpack.blobpackfileuri (got '%s')"
+msgstr ""
+"l'objecte ja està configurat en un altre uploadpack.blobpackfileuri (gotat "
+"'%')"
+
+#: 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:2748
+#: builtin/pack-objects.c:2999
#, c-format
msgid ""
"expected object ID, got garbage:\n"
" %s"
-msgstr ""
+msgstr ""
+"s'esperava un ID d'objecte, s'ha rebut brossa:\n"
+" %s"
-#: builtin/pack-objects.c:2846
+#: builtin/pack-objects.c:3097
msgid "invalid value for --missing"
msgstr "valor no vàlid per a --missing"
-#: builtin/pack-objects.c:2905 builtin/pack-objects.c:3013
+#: builtin/pack-objects.c: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:2936
-#, 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:3021
+#: 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:3113
+#: 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:3116
+#: builtin/pack-objects.c:3368
#, c-format
msgid "bad revision '%s'"
msgstr "revisió incorrecte «%s»"
-#: builtin/pack-objects.c:3141
+#: builtin/pack-objects.c:3393
msgid "unable to add recent objects"
msgstr "no s'han pogut afegir els objectes recents"
-#: builtin/pack-objects.c:3194
+#: builtin/pack-objects.c:3446
#, c-format
msgid "unsupported index version %s"
msgstr "versió d'índex no compatible %s"
-#: builtin/pack-objects.c:3198
+#: builtin/pack-objects.c:3450
#, c-format
msgid "bad index version '%s'"
msgstr "versió d'índex incorrecta «%s»"
-#: builtin/pack-objects.c:3236
+#: builtin/pack-objects.c:3488
msgid "<version>[,<offset>]"
msgstr "<versió>[,<desplaçament>]"
-#: builtin/pack-objects.c:3237
+#: 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:3240
+#: 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:3242
+#: builtin/pack-objects.c:3494
msgid "ignore borrowed objects from alternate object store"
-msgstr "ignora els objectes prestats d'un emmagatzematge d'objectes alternatiu"
+msgstr ""
+"ignora els objectes prestats d'un emmagatzematge d'objectes alternatiu"
-#: builtin/pack-objects.c:3244
+#: builtin/pack-objects.c:3496
msgid "ignore packed objects"
msgstr "ignora els objectes empaquetats"
-#: builtin/pack-objects.c:3246
+#: builtin/pack-objects.c:3498
msgid "limit pack window by objects"
msgstr "limita la finestra d'empaquetament per objectes"
-#: builtin/pack-objects.c:3248
+#: 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:3250
+#: 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:3252
+#: builtin/pack-objects.c:3504
msgid "reuse existing deltas"
msgstr "reusa les diferències existents"
-#: builtin/pack-objects.c:3254
+#: builtin/pack-objects.c:3506
msgid "reuse existing objects"
msgstr "reusa els objectes existents"
-#: builtin/pack-objects.c:3256
+#: builtin/pack-objects.c:3508
msgid "use OFS_DELTA objects"
msgstr "usa objectes OFS_DELTA"
-#: builtin/pack-objects.c:3258
+#: 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:3260
+#: 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:3262
+#: 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:3264
+#: 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:3267
+#: 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:3270
+#: 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:3273
+#: 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:3276
+#: builtin/pack-objects.c:3528
msgid "output pack to stdout"
msgstr "emet el paquet a stdout"
-#: builtin/pack-objects.c:3278
+#: 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"
+"inclou els objectes d'etiqueta que facin referència als objectes a "
+"empaquetar"
-#: builtin/pack-objects.c:3280
+#: builtin/pack-objects.c:3532
msgid "keep unreachable objects"
msgstr "retén els objectes inabastables"
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3534
msgid "pack loose unreachable objects"
msgstr "empaqueta els objectes inabastables solts"
-#: builtin/pack-objects.c:3284
+#: 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:3287
+#: builtin/pack-objects.c:3539
+#, fuzzy
msgid "use the sparse reachability algorithm"
-msgstr ""
+msgstr "utilitza l'algorisme d'accessibilitat dispers"
-#: builtin/pack-objects.c:3289
+#: builtin/pack-objects.c:3541
msgid "create thin packs"
msgstr "crea paquets prims"
-#: builtin/pack-objects.c:3291
+#: 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:3293
+#: 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:3295
+#: builtin/pack-objects.c:3547
#, fuzzy
msgid "ignore this pack"
-msgstr "usa el paquet prim"
+msgstr "ignora aquest paquet"
-#: builtin/pack-objects.c:3297
+#: builtin/pack-objects.c:3549
msgid "pack compression level"
msgstr "nivell de compressió de paquet"
-#: builtin/pack-objects.c:3299
+#: builtin/pack-objects.c:3551
msgid "do not hide commits by grafts"
msgstr "no amaguis les comissions per empelt"
-#: builtin/pack-objects.c:3301
+#: 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:3303
+#: 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:3307
+#: builtin/pack-objects.c:3559
#, fuzzy
msgid "write a bitmap index if possible"
-msgstr "escriu índex de mapa de bits"
+msgstr "escriu un índex de mapa de bits si és possible"
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3563
msgid "handling for missing objects"
msgstr "gestió dels objectes absents"
-#: builtin/pack-objects.c:3314
+#: 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:3316
+#: 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:3345
-#, c-format
+#: builtin/pack-objects.c:3570
+#, fuzzy
+msgid "protocol"
+msgstr "protocol"
+
+#: builtin/pack-objects.c:3571
+#, fuzzy
+msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
+msgstr ""
+"exclou qualsevol uppack.blobpackfileuri configurat amb aquest protocol"
+
+#: 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:3350
-#, 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:3404
+#: 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:3406
+#: 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:3411
+#: 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:3414
+#: 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:3420
+#: 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:3481
+#: builtin/pack-objects.c:3735
msgid "Enumerating objects"
msgstr "S'estan enumerant els objectes"
-#: builtin/pack-objects.c:3511
-#, 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>]"
@@ -17056,82 +18669,107 @@
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:142
+#: builtin/pull.c:123
msgid "control for recursive fetching of submodules"
msgstr "controla l'obtenció recursiva de submòduls"
-#: builtin/pull.c:146
+#: builtin/pull.c:127
msgid "Options related to merging"
msgstr "Opcions relacionades amb fusionar"
-#: builtin/pull.c:149
+#: 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:177 builtin/rebase.c:467 builtin/revert.c:126
+#: builtin/pull.c:158 builtin/rebase.c:490 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "permet l'avanç ràpid"
-#: builtin/pull.c:186
-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:202
+#: builtin/pull.c:183
msgid "Options related to fetching"
msgstr "Opcions relacionades amb obtenir"
-#: builtin/pull.c:212
+#: builtin/pull.c:193
msgid "force overwrite of local branch"
msgstr "força la sobreescriptura de la branca local"
-#: builtin/pull.c:220
+#: builtin/pull.c:201
msgid "number of submodules pulled in parallel"
msgstr "nombre de submòduls baixats en paral·lel"
-#: builtin/pull.c:320
+#: 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:437
+#: 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 ""
+"Baixar sense especificar com conciliar branques divergents està\n"
+"desaconsellat. Podeu desactivar aquest missatge executant una de les\n"
+"següents ordres abans de la propera baixada:\n"
+"\n"
+" git config pull.rebase false # merge (estratègia per defecte)\n"
+" git config pull.rebase true # rebase\n"
+" git config pull.ff only # només fast-forward\n"
+"\n"
+"Podeu reemplaçar «git config» per «git config --global» per a establir una\n"
+"preferència per defecte per a tots els dipòsits. Podeu també usar --rebase,\n"
+"--no-rebase o --ff-only en la línia d'ordres per sobreescriure el valor\n"
+"per defecte configuració en aquesta execució.\n"
+
+#: builtin/pull.c:458
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -17139,13 +18777,14 @@
"No hi ha cap candidat sobre el qual fer «rebase» entre les referències que "
"acabeu d'obtenir."
-#: builtin/pull.c:439
+#: builtin/pull.c: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."
+"No hi ha candidats per a fusionar entre les referències que acabeu "
+"d'obtenir."
-#: builtin/pull.c:440
+#: builtin/pull.c:461
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -17153,7 +18792,7 @@
"Generalment això vol dir que heu proveït una especificació de\n"
"referència de comodí que no tenia cap coincidència en el costat remot."
-#: builtin/pull.c:443
+#: builtin/pull.c:464
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -17164,44 +18803,43 @@
"Perquè aquest no és el remot configurat per defecte per a la vostra\n"
"branca actual, heu d'especificar una branca en la línia d'ordres."
-#: builtin/pull.c:448 builtin/rebase.c:1375 git-parse-remote.sh:73
+#: builtin/pull.c:469 builtin/rebase.c:1246
msgid "You are not currently on a branch."
msgstr "Actualment no sou en cap branca."
-#: builtin/pull.c:450 builtin/pull.c:465 git-parse-remote.sh:79
+#: builtin/pull.c:471 builtin/pull.c:486
msgid "Please specify which branch you want to rebase against."
msgstr "Especifiqueu sobre quina branca voleu fer «rebase»."
-#: builtin/pull.c:452 builtin/pull.c:467 git-parse-remote.sh:82
+#: builtin/pull.c:473 builtin/pull.c:488
msgid "Please specify which branch you want to merge with."
msgstr "Especifiqueu amb quina branca voleu fusionar."
-#: builtin/pull.c:453 builtin/pull.c:468
+#: builtin/pull.c: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:455 builtin/pull.c:461 builtin/pull.c:470
-#: builtin/rebase.c:1381 git-parse-remote.sh:64
+#: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491
+#: builtin/rebase.c:1252
msgid "<remote>"
msgstr "<remot>"
-#: builtin/pull.c:455 builtin/pull.c:470 builtin/pull.c:475
-#: git-parse-remote.sh:65
+#: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496
msgid "<branch>"
msgstr "<branca>"
-#: builtin/pull.c:463 builtin/rebase.c:1373 git-parse-remote.sh:75
+#: builtin/pull.c:484 builtin/rebase.c:1244
msgid "There is no tracking information for the current branch."
msgstr "No hi ha cap informació de seguiment per a la branca actual."
-#: builtin/pull.c:472 git-parse-remote.sh:95
+#: builtin/pull.c:493
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:"
+"Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho"
+" amb:"
-#: builtin/pull.c:477
+#: builtin/pull.c:498
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -17210,33 +18848,29 @@
"La vostra configuració especifica fusionar amb la referència «%s»\n"
"del remot, però no s'ha obtingut tal referència."
-#: builtin/pull.c:587
+#: builtin/pull.c:609
#, c-format
msgid "unable to access commit %s"
msgstr "no s'ha pogut accedir a la comissió %s"
-#: builtin/pull.c:867
+#: builtin/pull.c:915
msgid "ignoring --verify-signatures for rebase"
msgstr "s'està ignorant --verify-signatures en fer «rebase»"
-#: builtin/pull.c:922
-msgid "--[no-]autostash option is only valid with --rebase."
-msgstr "l'opció --[no-]-autostash és vàlid només amb --rebase."
-
-#: builtin/pull.c:930
+#: builtin/pull.c:972
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
"S'està actualitzant una branca no nascuda amb canvis afegits a l'índex."
-#: builtin/pull.c:934
+#: builtin/pull.c:976
msgid "pull with rebase"
msgstr "baixar fent «rebase»"
-#: builtin/pull.c:935
+#: builtin/pull.c:977
msgid "please commit or stash them."
msgstr "cometeu-los o emmagatzemeu-los."
-#: builtin/pull.c:960
+#: builtin/pull.c:1002
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -17247,7 +18881,7 @@
"s'està avançant ràpidament el vostre arbre de treball des de\n"
"la comissió %s."
-#: builtin/pull.c:966
+#: builtin/pull.c:1008
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -17258,22 +18892,21 @@
"to recover."
msgstr ""
"No es pot avançar ràpidament el vostre arbre de treball.\n"
-"Després d'assegurar que hàgiu desat qualsevol cosa preciosa de la sortida "
-"de\n"
+"Després d'assegurar que hàgiu desat qualsevol cosa preciosa de la sortida de\n"
"$ git diff %s\n"
"executeu\n"
"$ git reset --hard\n"
"per a recuperar."
-#: builtin/pull.c:981
+#: builtin/pull.c:1023
msgid "Cannot merge multiple branches into empty head."
msgstr "No es poden fusionar múltiples branques a un HEAD buit."
-#: builtin/pull.c:985
+#: builtin/pull.c:1027
msgid "Cannot rebase onto multiple branches."
msgstr "No es pot fer «rebase» sobre múltiples branques."
-#: builtin/pull.c:992
+#: builtin/pull.c:1041
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"no es pot fer «rebase» amb modificacions als submòduls enregistrades "
@@ -17283,24 +18916,23 @@
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<opcions>] [<dipòsit> [<especificació-de-referència>...]]"
-#: builtin/push.c:112
+#: builtin/push.c:111
msgid "tag shorthand without <tag>"
msgstr "abreviatura d'etiqueta sense <tag>"
-#: builtin/push.c:122
+#: builtin/push.c:119
msgid "--delete only accepts plain target ref names"
msgstr "--delete només accepta noms de referència de destí senzills"
-#: builtin/push.c:168
+#: builtin/push.c: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:171
+#: builtin/push.c:167
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -17325,7 +18957,7 @@
" git push %s HEAD\n"
"%s"
-#: builtin/push.c:186
+#: builtin/push.c:182
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -17340,7 +18972,7 @@
"\n"
" git push %s HEAD:<nom-de-branca-remota>\n"
-#: builtin/push.c:200
+#: builtin/push.c:194
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -17353,13 +18985,14 @@
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:208
+#: builtin/push.c:202
#, c-format
-msgid "The current branch %s has multiple upstream branches, refusing to push."
+msgid ""
+"The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
"La branca actual %s té múltiples branques fonts, s'està refusant pujar."
-#: builtin/push.c:211
+#: builtin/push.c:205
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -17370,14 +19003,13 @@
"branca actual «%s», sense dir-me què pujar per a actualitzar\n"
"quina branca remota."
-#: builtin/push.c:270
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+#: 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:277
+#: 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"
@@ -17386,10 +19018,10 @@
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:283
+#: 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"
@@ -17398,11 +19030,11 @@
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:289
+#: 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"
@@ -17413,16 +19045,17 @@
"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:296
+#: 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."
+"S'han rebutjat les actualitzacions perquè l'etiqueta ja existeix en el "
+"remot."
-#: builtin/push.c:299
+#: 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"
@@ -17431,105 +19064,122 @@
"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:360
+#: builtin/push.c:294
+#, fuzzy
+msgid ""
+"Updates were rejected because the tip of the remote-tracking\n"
+"branch has been updated since the last checkout. You may want\n"
+"to integrate those changes locally (e.g., 'git pull ...')\n"
+"before forcing an update.\n"
+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 a més informació."
+
+#: builtin/push.c:364
#, c-format
msgid "Pushing to %s\n"
msgstr "S'està pujant a %s\n"
-#: builtin/push.c:367
+#: builtin/push.c:371
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "s'ha produït un error en pujar algunes referències a «%s»"
-#: builtin/push.c:542
+#: builtin/push.c:553
msgid "repository"
msgstr "dipòsit"
-#: builtin/push.c:543 builtin/send-pack.c:164
+#: builtin/push.c:554 builtin/send-pack.c:189
msgid "push all refs"
msgstr "puja totes les referències"
-#: builtin/push.c:544 builtin/send-pack.c:166
+#: builtin/push.c:555 builtin/send-pack.c:191
msgid "mirror all refs"
msgstr "reflecteix totes les referències"
-#: builtin/push.c:546
+#: builtin/push.c:557
msgid "delete refs"
msgstr "suprimeix les referències"
-#: builtin/push.c:547
+#: builtin/push.c:558
msgid "push tags (can't be used with --all or --mirror)"
msgstr "puja les etiquetes (no es pot usar amb --all o --mirror)"
-#: builtin/push.c:550 builtin/send-pack.c:167
+#: builtin/push.c:561 builtin/send-pack.c:192
msgid "force updates"
msgstr "força les actualitzacions"
-#: builtin/push.c:552 builtin/send-pack.c:181
+#: builtin/push.c:562 builtin/send-pack.c:204
msgid "<refname>:<expect>"
msgstr "<nom-de-referència>:<esperat>"
-#: builtin/push.c:553 builtin/send-pack.c:182
+#: builtin/push.c:563 builtin/send-pack.c:205
msgid "require old value of ref to be at this value"
msgstr "requereix que el valor antic de la referència sigui d'aquest valor"
-#: builtin/push.c:556
+#: builtin/push.c:566 builtin/send-pack.c:208
+#, fuzzy
+msgid "require remote updates to be integrated locally"
+msgstr "requereix que les actualitzacions remotes s'integrin localment"
+
+#: builtin/push.c:569
msgid "control recursive pushing of submodules"
msgstr "controla la pujada recursiva dels submòduls"
-#: builtin/push.c:558 builtin/send-pack.c:175
+#: builtin/push.c:570 builtin/send-pack.c:199
msgid "use thin pack"
msgstr "usa el paquet prim"
-#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161
-#: builtin/send-pack.c:162
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
+#: builtin/send-pack.c:187
msgid "receive pack program"
msgstr "programa que rep els paquets"
-#: builtin/push.c:561
+#: builtin/push.c:573
msgid "set upstream for git pull/status"
msgstr "estableix la font per a git pull/status"
-#: builtin/push.c:564
+#: builtin/push.c:576
msgid "prune locally removed refs"
msgstr "poda les referències eliminades localment"
-#: builtin/push.c:566
+#: builtin/push.c:578
msgid "bypass pre-push hook"
msgstr "evita el lligam de prepujada"
-#: builtin/push.c:567
+#: builtin/push.c:579
msgid "push missing but relevant tags"
msgstr "puja les etiquetes absents però rellevants"
-#: builtin/push.c:570 builtin/send-pack.c:169
+#: builtin/push.c:581 builtin/send-pack.c:193
msgid "GPG sign the push"
msgstr "signa la pujada amb GPG"
-#: builtin/push.c:572 builtin/send-pack.c:176
+#: builtin/push.c:583 builtin/send-pack.c:200
msgid "request atomic transaction on remote side"
msgstr "demana una transacció atòmica al costat remot"
-#: builtin/push.c:590
+#: builtin/push.c:601
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete és incompatible amb --all, --mirror i --tags"
-#: builtin/push.c:592
+#: builtin/push.c:603
msgid "--delete doesn't make sense without any refs"
msgstr "--delete no té sentit sense referències"
-#: builtin/push.c:612
+#: builtin/push.c:623
#, c-format
msgid "bad repository '%s'"
msgstr "dipòsit incorrecte «%s»"
-#: builtin/push.c:613
+#: builtin/push.c:624
msgid ""
"No configured push destination.\n"
-"Either specify the URL from the command-line or configure a remote "
-"repository using\n"
+"Either specify the URL from the command-line or configure a remote repository using\n"
"\n"
" git remote add <name> <url>\n"
"\n"
@@ -17538,8 +19188,7 @@
" 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"
+"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"
@@ -17547,47 +19196,51 @@
"\n"
" git push <nom>\n"
-#: builtin/push.c:628
+#: builtin/push.c:639
msgid "--all and --tags are incompatible"
msgstr "--all i --tags són incompatibles"
-#: builtin/push.c:630
+#: builtin/push.c:641
msgid "--all can't be combined with refspecs"
msgstr "--all no es pot combinar amb especificacions de referència"
-#: builtin/push.c:634
+#: builtin/push.c:645
msgid "--mirror and --tags are incompatible"
msgstr "--mirror i --tags són incompatibles"
-#: builtin/push.c:636
+#: builtin/push.c:647
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror no es pot combinar amb especificacions de referència"
-#: builtin/push.c:639
+#: builtin/push.c:650
msgid "--all and --mirror are incompatible"
msgstr "--all i --mirror són incompatibles"
-#: builtin/push.c:643
+#: builtin/push.c:657
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:22
+#, fuzzy
msgid "Percentage by which creation is weighted"
-msgstr ""
+msgstr "Percentatge pel qual es pondera la creació"
#: builtin/range-diff.c:24
msgid "use simple diff colors"
@@ -17601,7 +19254,7 @@
#: builtin/range-diff.c:26
#, fuzzy
msgid "passed to 'git log'"
-msgstr "passa-ho a «git am»"
+msgstr "passa a 'git log'"
#: builtin/range-diff.c:50 builtin/range-diff.c:54
#, c-format
@@ -17618,13 +19271,13 @@
#: 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>]])"
+"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=<prefix>) "
-"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
-"index-output=<fitxer>] (--empty | <arbre1> [<arbre2> [<arbre3>]])"
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>)"
+" [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] "
+"[--index-output=<fitxer>] (--empty | <arbre1> [<arbre2> [<arbre3>]])"
#: builtin/read-tree.c:124
msgid "write resulting index to <file>"
@@ -17693,268 +19346,258 @@
#: 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 "heu de primer resoldre el vostre índex actual"
+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> | --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>]"
+"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:177 builtin/rebase.c:201 builtin/rebase.c:228
+#: builtin/rebase.c:193 builtin/rebase.c:217 builtin/rebase.c:244
#, c-format
msgid "unusable todo list: '%s'"
msgstr "llista per a fer inestable: «%s»"
-#: builtin/rebase.c:186 builtin/rebase.c:212 builtin/rebase.c:236
-#, c-format
-msgid "could not write '%s'."
-msgstr "no s'ha pogut escriure a «%s»."
-
-#: builtin/rebase.c:271
-msgid "no HEAD?"
-msgstr "no hi ha cap HEAD?"
-
-#: builtin/rebase.c:298
+#: builtin/rebase.c:310
#, c-format
msgid "could not create temporary %s"
msgstr "no s'ha pogut crear el fitxer temporal %s"
-#: builtin/rebase.c:304
+#: builtin/rebase.c:316
msgid "could not mark as interactive"
msgstr "no s'ha pogut marcar com a interactiu"
-#: builtin/rebase.c:362
+#: builtin/rebase.c:369
msgid "could not generate todo list"
msgstr "no s'ha pogut generar la llista per a fer"
-#: builtin/rebase.c:402
+#: builtin/rebase.c:411
+#, 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:457
+#: builtin/rebase.c:480
msgid "git rebase--interactive [<options>]"
msgstr "git rebase--interactive [<opcions>]"
-#: builtin/rebase.c:469
-msgid "keep empty commits"
-msgstr "mantén les comissions buides"
+#: builtin/rebase.c:493 builtin/rebase.c:1388
+#, fuzzy
+msgid "keep commits which start empty"
+msgstr "manté les comissions que comencen en blanc"
-#: builtin/rebase.c:471 builtin/revert.c:128
+#: builtin/rebase.c:497 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr "permet les comissions amb missatges buits"
-#: builtin/rebase.c:472
+#: builtin/rebase.c:499
msgid "rebase merge commits"
msgstr "fes «rebase» de les comissions de fusió"
-#: builtin/rebase.c:474
+#: builtin/rebase.c:501
+#, fuzzy
msgid "keep original branch points of cousins"
-msgstr ""
+msgstr "mantén els punts de branca originals dels cosins"
-#: builtin/rebase.c:476
+#: builtin/rebase.c:503
+#, fuzzy
msgid "move commits that begin with squash!/fixup!"
-msgstr ""
+msgstr "mou les comissions que comencen amb squash!/fixup!"
-#: builtin/rebase.c:477
+#: builtin/rebase.c:504
msgid "sign commits"
msgstr "signa les comissions"
-#: builtin/rebase.c:479 builtin/rebase.c:1455
+#: builtin/rebase.c:506 builtin/rebase.c:1327
+#, fuzzy
msgid "display a diffstat of what changed upstream"
-msgstr ""
+msgstr "mostra un «diffstat» de la font que ha canviat"
-#: builtin/rebase.c:481
+#: builtin/rebase.c:508
msgid "continue rebase"
msgstr "continua el «rebase»"
-#: builtin/rebase.c:483
+#: builtin/rebase.c:510
msgid "skip commit"
msgstr "omet la comissió"
-#: builtin/rebase.c:484
+#: builtin/rebase.c:511
msgid "edit the todo list"
msgstr "edita la llista a fer"
-#: builtin/rebase.c:486
+#: builtin/rebase.c:513
msgid "show the current patch"
msgstr "mostra el pedaç actual"
-#: builtin/rebase.c:489
+#: builtin/rebase.c:516
msgid "shorten commit ids in the todo list"
msgstr "escurça els ids de les comissions en la llista per a fer"
-#: builtin/rebase.c:491
+#: builtin/rebase.c:518
msgid "expand commit ids in the todo list"
msgstr "expandeix els ids de les comissions en la llista per a fer"
-#: builtin/rebase.c:493
+#: builtin/rebase.c:520
msgid "check the todo list"
msgstr "comprova la llista a fer"
-#: builtin/rebase.c:495
+#: builtin/rebase.c:522
msgid "rearrange fixup/squash lines"
msgstr "reorganitza les línies «fixup/pick»"
-#: builtin/rebase.c:497
+#: builtin/rebase.c:524
msgid "insert exec commands in todo list"
msgstr "expandeix les ordres exec en la llista per a fer"
-#: builtin/rebase.c:498
+#: builtin/rebase.c:525
+#, fuzzy
msgid "onto"
-msgstr ""
+msgstr "sobre"
-#: builtin/rebase.c:501
+#: builtin/rebase.c:528
#, fuzzy
msgid "restrict-revision"
-msgstr "revisió"
+msgstr "revisió restringida"
-#: builtin/rebase.c:501
+#: builtin/rebase.c:528
#, fuzzy
msgid "restrict revision"
-msgstr "revisió"
+msgstr "restringeix la revisió"
-#: builtin/rebase.c:503
+#: builtin/rebase.c:530
+#, fuzzy
msgid "squash-onto"
-msgstr ""
+msgstr "squash-onto"
-#: builtin/rebase.c:504
+#: builtin/rebase.c:531
+#, fuzzy
msgid "squash onto"
-msgstr ""
+msgstr "carabassa a"
-#: builtin/rebase.c:506
+#: builtin/rebase.c:533
#, fuzzy
msgid "the upstream commit"
-msgstr "Desassigna la informació de font"
+msgstr "la comissió principal"
-#: builtin/rebase.c:508
+#: builtin/rebase.c:535
#, fuzzy
msgid "head-name"
-msgstr "canvi de nom"
+msgstr "nom-cap"
-#: builtin/rebase.c:508
+#: builtin/rebase.c:535
#, fuzzy
msgid "head name"
-msgstr "davant per "
+msgstr "nom del cap"
-#: builtin/rebase.c:513
+#: builtin/rebase.c:540
#, fuzzy
msgid "rebase strategy"
-msgstr "estratègia de fusió"
+msgstr "estratègia de rebase"
-#: builtin/rebase.c:514
+#: builtin/rebase.c:541
#, fuzzy
msgid "strategy-opts"
-msgstr "estratègia"
+msgstr "opcions estratègiques"
-#: builtin/rebase.c:515
+#: builtin/rebase.c:542
#, fuzzy
msgid "strategy options"
-msgstr "opcions de decoració"
+msgstr "opcions d'estratègia"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:543
+#, fuzzy
msgid "switch-to"
-msgstr ""
+msgstr "canvia a"
-#: builtin/rebase.c:517
+#: builtin/rebase.c:544
+#, fuzzy
msgid "the branch or commit to checkout"
-msgstr ""
+msgstr "la branca o entrega a agafar"
-#: builtin/rebase.c:518
+#: builtin/rebase.c:545
#, fuzzy
msgid "onto-name"
-msgstr "nom"
+msgstr "ont-name"
-#: builtin/rebase.c:518
+#: builtin/rebase.c:545
#, fuzzy
msgid "onto name"
-msgstr "nom del remot"
+msgstr "al nom"
-#: builtin/rebase.c:519
+#: builtin/rebase.c:546
#, fuzzy
msgid "cmd"
-msgstr "ordre"
+msgstr "cmd"
-#: builtin/rebase.c:519
+#: builtin/rebase.c:546
msgid "the command to run"
msgstr "l'ordre a executar"
-#: builtin/rebase.c:522 builtin/rebase.c:1540
+#: builtin/rebase.c:549 builtin/rebase.c:1421
+#, fuzzy
msgid "automatically re-schedule any `exec` that fails"
-msgstr ""
+msgstr "torna a planificar automàticament qualsevol `exec` que falli"
-#: builtin/rebase.c:540
+#: builtin/rebase.c:565
+#, 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:556
-#, c-format
-msgid "%s requires an interactive rebase"
+#: builtin/rebase.c:581
+#, fuzzy, c-format
+msgid "%s requires the merge backend"
msgstr "%s requereix un «rebase» interactiu"
-#: builtin/rebase.c:608
+#: builtin/rebase.c:624
#, 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:623
+#: builtin/rebase.c:641
#, 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:648
-#, c-format
+#: builtin/rebase.c:666
+#, fuzzy, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
-msgstr ""
+msgstr "s'ignorarà allowrerereautoupdate «%s» no vàlid"
-#: builtin/rebase.c:724
-#, c-format
-msgid "Could not read '%s'"
-msgstr "No s'ha pogut llegir «%s»"
-
-#: builtin/rebase.c:742
-#, c-format
-msgid "Cannot store %s"
-msgstr "No es pot emmagatzemar %s"
-
-#: builtin/rebase.c:849
-msgid "could not determine HEAD revision"
-msgstr "no s'ha pogut determinar la revisió de HEAD"
-
-#: builtin/rebase.c:972 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:811 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\"."
+"To abort and get back to the state before \"git rebase\", run \"git rebase --abort\"."
msgstr ""
"Resoleu tots els conflictes manualment, marqueu-los com a resolts amb\n"
-"«git add/rm <fitxers_amb_conflicte>», llavors executeu «git rebase --"
-"continue».\n"
+"«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»."
+"Per a avortar i tornar a l'estat anterior abans de l'ordre «git rebase», executeu «git rebase --abort»."
-#: builtin/rebase.c:1060
-#, c-format
+#: builtin/rebase.c:894
+#, fuzzy, c-format
msgid ""
"\n"
"git encountered an error while preparing the patches to replay\n"
@@ -17964,8 +19607,17 @@
"\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:1367
+#: builtin/rebase.c:1220
+#, 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:1238
#, c-format
msgid ""
"%s\n"
@@ -17976,13 +19628,13 @@
"\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:1383
+#: builtin/rebase.c:1254
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -17990,201 +19642,212 @@
" git branch --set-upstream-to=%s/<branch> %s\n"
"\n"
msgstr ""
-"Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho "
-"amb:\n"
+"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:1413
+#: builtin/rebase.c:1284
#, 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:1417
+#: builtin/rebase.c:1288
msgid "empty exec command"
-msgstr ""
+msgstr "ordre exec buida"
-#: builtin/rebase.c:1446
+#: builtin/rebase.c:1318
msgid "rebase onto given branch instead of upstream"
msgstr "fes un «rebase» en la branca donada en comptes de la font"
-#: builtin/rebase.c:1448
+#: builtin/rebase.c:1320
#, fuzzy
msgid "use the merge-base of upstream and branch as the current base"
-msgstr "la branca font demanada «%s» no existeix"
+msgstr "utilitza la base de fusió de la font i la branca com a base actual"
-#: builtin/rebase.c:1450
+#: builtin/rebase.c:1322
msgid "allow pre-rebase hook to run"
msgstr "permet al lligam pre-rebase executar-se"
-#: builtin/rebase.c:1452
+#: builtin/rebase.c:1324
msgid "be quiet. implies --no-stat"
msgstr "silenciós. Implica --no-stat"
-#: builtin/rebase.c:1458
+#: builtin/rebase.c:1330
#, 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:1461
+#: builtin/rebase.c:1333
#, fuzzy
-msgid "add a Signed-off-by: line to each commit"
-msgstr "afegeix una línia «Signed-off-by» al missatge de comissió"
+msgid "add a Signed-off-by trailer to each commit"
+msgstr "afegeix una línia signada per cada entrega"
-#: builtin/rebase.c:1464
+#: builtin/rebase.c:1336
#, fuzzy
msgid "make committer date match author date"
msgstr "Agrupa per «comitter» en comptes de per autor"
-#: builtin/rebase.c:1466
+#: builtin/rebase.c:1338
msgid "ignore author date and use current date"
-msgstr ""
+msgstr "ignora la data de l'autor i utilitza la data actual"
-#: builtin/rebase.c:1468
-#, fuzzy
+#: builtin/rebase.c:1340
msgid "synonym of --reset-author-date"
-msgstr "sinònim de --files-with-matches"
+msgstr "sinònim de --reset-author-date"
-#: builtin/rebase.c:1470 builtin/rebase.c:1474
+#: builtin/rebase.c:1342 builtin/rebase.c:1346
msgid "passed to 'git apply'"
msgstr "passa-ho a «git-apply»"
-#: builtin/rebase.c:1472
-#, fuzzy
+#: builtin/rebase.c:1344
msgid "ignore changes in whitespace"
-msgstr "ignora els canvis d'espai en blanc al final de la línia"
+msgstr "ignora els canvis d'espais en blanc"
-#: builtin/rebase.c:1476 builtin/rebase.c:1479
+#: builtin/rebase.c:1348 builtin/rebase.c:1351
msgid "cherry-pick all commits, even if unchanged"
msgstr "«cherry pick» totes les comissions, inclús les no canviades"
-#: builtin/rebase.c:1481
+#: builtin/rebase.c:1353
msgid "continue"
msgstr "continua"
-#: builtin/rebase.c:1484
+#: builtin/rebase.c:1356
msgid "skip current patch and continue"
msgstr "omet el pedaç actual i continua"
-#: builtin/rebase.c:1486
+#: builtin/rebase.c:1358
msgid "abort and check out the original branch"
msgstr "interromp i agafa la branca original"
-#: builtin/rebase.c:1489
+#: builtin/rebase.c:1361
msgid "abort but keep HEAD where it is"
msgstr "interromp però manté HEAD on és"
-#: builtin/rebase.c:1490
+#: builtin/rebase.c:1362
msgid "edit the todo list during an interactive rebase"
msgstr "edita la llista de coses a fer durant un «rebase» interactiu"
-#: builtin/rebase.c:1493
+#: builtin/rebase.c:1365
msgid "show the patch file being applied or merged"
msgstr "mostra el pedaç que s'està aplicant o fusionant"
-#: builtin/rebase.c:1496
-#, fuzzy
+#: builtin/rebase.c:1368
+msgid "use apply strategies to rebase"
+msgstr "utilitza estratègies d'aplicació per fer «rebase»"
+
+#: builtin/rebase.c:1372
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:1500
+#: builtin/rebase.c:1376
msgid "let the user edit the list of commits to rebase"
-msgstr ""
+msgstr "permet a l'usuari editar la llista de comissions a fer «rebase»"
-#: builtin/rebase.c:1504
-#, fuzzy
+#: builtin/rebase.c:1380
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
-msgstr "intenta recrear les "
+msgstr "(EN DESÚS) intenta recrear fusions en lloc d'ignorar-les"
-#: builtin/rebase.c:1509
+#: builtin/rebase.c:1385
+msgid "how to handle commits that become empty"
+msgstr "com gestionar les comissions que queden buides"
+
+#: builtin/rebase.c:1392
#, fuzzy
-msgid "preserve empty commits during rebase"
-msgstr "preserva les comissions inicialment buides"
-
-#: builtin/rebase.c:1511
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:1517
+#: builtin/rebase.c:1399
#, fuzzy
-msgid "automatically stash/stash pop before and after"
-msgstr ""
-"fes «stash» i «stash pop» automàticament abans i després de fer «rebase»"
-
-#: builtin/rebase.c:1519
msgid "add exec lines after each commit of the editable list"
msgstr ""
+"afegeix línies d'exec després de cada publicació de la llista editable"
-#: builtin/rebase.c:1523
+#: builtin/rebase.c:1403
#, 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:1526
+#: builtin/rebase.c:1407
+#, 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:1529
+#: builtin/rebase.c:1410
#, 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:1531
+#: builtin/rebase.c:1412
msgid "use the given merge strategy"
msgstr "utilitza l'estratègia de fusió donada"
-#: builtin/rebase.c:1533 builtin/revert.c:115
+#: builtin/rebase.c:1414 builtin/revert.c:115
msgid "option"
msgstr "opció"
-#: builtin/rebase.c:1534
+#: builtin/rebase.c:1415
msgid "pass the argument through to the merge strategy"
msgstr "passa l'argument a l'estratègia de fusió"
-#: builtin/rebase.c:1537
+#: builtin/rebase.c:1418
msgid "rebase all reachable commits up to the root(s)"
msgstr "fes «rebase» de totes les comissions accessibles fins a l'arrel"
-#: builtin/rebase.c:1554
+#: builtin/rebase.c:1423
+#, fuzzy
+msgid "apply all changes, even those already present upstream"
+msgstr ""
+"aplica tots els canvis fins i tot els que ja estan a la font principal"
+
+#: builtin/rebase.c:1440
+#, 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:1560
+#: builtin/rebase.c:1446
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "Sembla que «git am» està en curs. No es pot fer «rebase»."
-#: builtin/rebase.c:1601
-#, fuzzy
+#: builtin/rebase.c:1487
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:1606
+#: builtin/rebase.c:1492
#, fuzzy
msgid "cannot combine '--keep-base' with '--onto'"
-msgstr "error: no es pot combinar «--rebase-merges» amb «--strategy»"
+msgstr "no es pot combinar «--keep-base» amb «--onto»"
-#: builtin/rebase.c:1608
+#: builtin/rebase.c:1494
#, fuzzy
msgid "cannot combine '--keep-base' with '--root'"
-msgstr "error: no es pot combinar «--rebase-merges» amb «--strategy»"
+msgstr "no es pot combinar «--keep-base» amb «--root»"
-#: builtin/rebase.c:1612
+#: builtin/rebase.c:1498
+#, fuzzy
+msgid "cannot combine '--root' with '--fork-point'"
+msgstr "no es pot combinar «--keep-base» amb «--root»"
+
+#: builtin/rebase.c:1501
msgid "No rebase in progress?"
msgstr "No hi ha un «rebase» en curs?"
-#: builtin/rebase.c:1616
+#: builtin/rebase.c:1505
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "L'acció --edit-todo només es pot usar durant un «rebase» interactiu."
-#: builtin/rebase.c:1639
+#: builtin/rebase.c:1528 t/helper/test-fast-rebase.c:123
msgid "Cannot read HEAD"
msgstr "No es pot llegir HEAD"
-#: builtin/rebase.c:1651
+#: builtin/rebase.c:1540
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -18192,16 +19855,16 @@
"Heu d'editar tots els conflictes de fusió i després\n"
"marcar-los com a resolts fent servir git add"
-#: builtin/rebase.c:1670
+#: builtin/rebase.c:1559
msgid "could not discard worktree changes"
msgstr "no s'han pogut descartar els canvis de l'arbre de treball"
-#: builtin/rebase.c:1689
+#: builtin/rebase.c:1578
#, c-format
msgid "could not move back to %s"
msgstr "no s'ha pogut tornar a %s"
-#: builtin/rebase.c:1734
+#: builtin/rebase.c:1624
#, fuzzy, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -18213,179 +19876,152 @@
"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:1757
+#: builtin/rebase.c:1652
msgid "switch `C' expects a numerical value"
msgstr "«switch» «c» espera un valor numèric"
-#: builtin/rebase.c:1798
+#: builtin/rebase.c:1694
#, c-format
msgid "Unknown mode: %s"
msgstr "Mode desconegut: %s"
-#: builtin/rebase.c:1820
+#: builtin/rebase.c:1733
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy requereix --merge o --interactive"
-#: builtin/rebase.c:1860
+#: builtin/rebase.c:1763
+#, fuzzy
+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:1776
+#, fuzzy, c-format
+msgid "Unknown rebase backend: %s"
+msgstr "Rebase de system%s desconegut"
+
+#: builtin/rebase.c:1806
#, fuzzy
msgid "--reschedule-failed-exec requires --exec or --interactive"
-msgstr "--strategy requereix --merge o --interactive"
+msgstr "--reschedulo-failed-exec requereix --exec o --interactive"
-#: builtin/rebase.c:1872
-msgid "cannot combine am options with either interactive or merge options"
-msgstr ""
-
-#: builtin/rebase.c:1891
+#: builtin/rebase.c:1826
#, 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:1895
+#: builtin/rebase.c:1830
#, fuzzy
msgid ""
"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr "error: no es pot combinar «--preserve-merges» amb «--rebase-merges»"
+msgstr ""
+"error no es pot combinar «--preserve-merges» amb «--reschedule-failed-exec»"
-#: builtin/rebase.c:1919
+#: builtin/rebase.c:1854
#, c-format
msgid "invalid upstream '%s'"
msgstr "font no vàlida: «%s»"
-#: builtin/rebase.c:1925
+#: builtin/rebase.c:1860
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:1951
+#: builtin/rebase.c:1886
#, fuzzy, c-format
msgid "'%s': need exactly one merge base with branch"
-msgstr "Cal exactament un rang."
+msgstr "'%s' necessita exactament una base de fusió amb branca"
-#: builtin/rebase.c:1954
+#: builtin/rebase.c:1889
#, 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:1962
+#: builtin/rebase.c:1897
#, 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:1987
+#: builtin/rebase.c:1923
#, 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:1995 builtin/submodule--helper.c:40
-#: builtin/submodule--helper.c:1961
+#: builtin/rebase.c:1931 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:2006
+#: builtin/rebase.c:1942
#, fuzzy
msgid "Could not resolve HEAD to a revision"
-msgstr "no s'ha pogut resoldre la comissió HEAD"
+msgstr "No s'ha pogut resoldre HEAD a una revisió"
-#: builtin/rebase.c:2044
-msgid "Cannot autostash"
-msgstr "No es pot emmagatzemar automàticament"
-
-#: builtin/rebase.c:2047
-#, fuzzy, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr "final de fitxer inesperat"
-
-#: builtin/rebase.c:2053
-#, fuzzy, c-format
-msgid "Could not create directory for '%s'"
-msgstr "No s'ha pogut crear el directori «%s»"
-
-#: builtin/rebase.c:2056
-#, fuzzy, c-format
-msgid "Created autostash: %s\n"
-msgstr "S'ha creat un magatzem automàtic: $stash_abbrev"
-
-#: builtin/rebase.c:2059
-#, fuzzy
-msgid "could not reset --hard"
-msgstr "No s'ha pogut llegir orig-head"
-
-#: builtin/rebase.c:2068
+#: builtin/rebase.c:1963
msgid "Please commit or stash them."
msgstr "Cometeu-los o emmagatzemeu-los."
-#: builtin/rebase.c:2095
-#, c-format
-msgid "could not parse '%s'"
-msgstr "no s'ha pogut analitzar «%s»"
-
-#: builtin/rebase.c:2108
+#: builtin/rebase.c:1999
#, c-format
msgid "could not switch to %s"
msgstr "no s'ha pogut commutar a %s"
-#: builtin/rebase.c:2119
+#: builtin/rebase.c:2010
msgid "HEAD is up to date."
msgstr "HEAD està al dia."
-#: builtin/rebase.c:2121
+#: builtin/rebase.c:2012
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "La branca actual %s està al dia.\n"
-#: builtin/rebase.c:2129
+#: builtin/rebase.c:2020
msgid "HEAD is up to date, rebase forced."
msgstr "La branca actual està al dia, «rebase» forçat."
-#: builtin/rebase.c:2131
+#: builtin/rebase.c:2022
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "La branca actual %s està al dia; «rebase» forçat.\n"
-#: builtin/rebase.c:2139
+#: builtin/rebase.c:2030
msgid "The pre-rebase hook refused to rebase."
msgstr "El lligam pre-«rebase» ha refusat a fer «rebase»."
-#: builtin/rebase.c:2146
+#: builtin/rebase.c:2037
#, c-format
msgid "Changes to %s:\n"
-msgstr "Canvis a %s:\n"
+msgstr "Canvis a %s:\n"
-#: builtin/rebase.c:2149
+#: builtin/rebase.c:2040
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Canvis de %s a %s:\n"
-#: builtin/rebase.c:2174
+#: builtin/rebase.c:2065
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"Primer, s'està rebobinant HEAD per a reproduir el vostre treball al "
"damunt...\n"
-#: builtin/rebase.c:2183
+#: builtin/rebase.c:2074
msgid "Could not detach HEAD"
msgstr "No s'ha pogut separar HEAD"
-#: builtin/rebase.c:2192
+#: builtin/rebase.c:2083
#, 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:830
+#: builtin/receive-pack.c:1276
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"
@@ -18402,21 +20038,21 @@
"'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:850
+#: builtin/receive-pack.c:1296
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"
@@ -18428,168 +20064,173 @@
"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:1936
+#: builtin/receive-pack.c:2481
msgid "quiet"
msgstr "silenciós"
-#: builtin/receive-pack.c:1950
+#: builtin/receive-pack.c:2495
msgid "You must specify a directory."
msgstr "Heu d'especificar un directori."
#: builtin/reflog.c:17
msgid ""
-"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
-"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
-"<refs>..."
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] "
+"[--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
-msgid "Marking reachable objects..."
-msgstr "retén els objectes inabastables"
-
-#: builtin/reflog.c:643
+#: builtin/reflog.c:606
#, c-format
-msgid "%s points nowhere!"
-msgstr ""
+msgid "Marking reachable objects..."
+msgstr "S'estan marcant els objectes abastables..."
-#: builtin/reflog.c:695
+#: builtin/reflog.c:644
+#, fuzzy, c-format
+msgid "%s points nowhere!"
+msgstr "els percentatges no apunten enlloc!"
+
+#: 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>"
+"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] "
+"[--mirror=<fetch|push>] <name> <url>"
msgstr ""
-"git remote add [-t <branca>] [-m <mestra>] [-f] [--tags | --no-tags] [--"
-"mirror=<fetch|push>] <nom> <url>"
+"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"
@@ -18598,106 +20239,115 @@
"\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:700
#, c-format
msgid "remote %s already exists."
msgstr "el remot %s ja existeix."
-#: builtin/remote.c:198 builtin/remote.c:640
-#, 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:240
#, c-format
msgid "Could not setup master '%s'"
msgstr "No s'ha pogut configurar la mestra «%s»"
-#: builtin/remote.c:344
+#: builtin/remote.c:355
#, 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:454 builtin/remote.c:462
msgid "(matching)"
msgstr "(coincident)"
-#: builtin/remote.c:455
+#: builtin/remote.c:466
msgid "(delete)"
msgstr "(suprimir)"
-#: builtin/remote.c:629 builtin/remote.c:764 builtin/remote.c:863
+#: builtin/remote.c:655
+#, fuzzy, c-format
+msgid "could not set '%s'"
+msgstr "no s'ha pogut establir «%s»"
+
+#: builtin/remote.c:660
+#, 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:691 builtin/remote.c:836 builtin/remote.c:946
#, c-format
msgid "No such remote: '%s'"
msgstr "No existeix el remot «%s»"
-#: builtin/remote.c:646
+#: builtin/remote.c:710
#, 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:730
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
"\t%s\n"
"\tPlease update the configuration manually if necessary."
msgstr ""
-"No s'està actualitzant l'especificació de referències d'obtenció no per "
-"defecte\n"
+"No s'està actualitzant l'especificació de referències d'obtenció no per defecte\n"
"\t%s\n"
"\tActualitzeu la configuració manualment si és necessari."
-#: builtin/remote.c:701
+#: builtin/remote.c:770
#, c-format
msgid "deleting '%s' failed"
msgstr "la supressió de «%s» ha fallat"
-#: builtin/remote.c:735
+#: builtin/remote.c:804
#, c-format
msgid "creating '%s' failed"
msgstr "la creació de «%s» ha fallat"
-#: builtin/remote.c:801
+#: builtin/remote.c:882
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -18708,442 +20358,439 @@
"Nota: Una branca fora de la jerarquia refs/remotes/ no s'ha eliminat;\n"
"per a suprimir-la, useu:"
msgstr[1] ""
-"Nota: Algunes branques fora de la jerarquia refs/remotes/ no s'han "
-"eliminat;\n"
+"Nota: Algunes branques fora de la jerarquia refs/remotes/ no s'han eliminat;\n"
"per a suprimir-les, useu:"
-#: builtin/remote.c:815
+#: builtin/remote.c:896
#, c-format
msgid "Could not remove config section '%s'"
msgstr "No s'ha pogut eliminar la secció de configuració «%s»"
-#: builtin/remote.c:916
+#: builtin/remote.c:999
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " nou (la pròxima obtenció emmagatzemarà a remotes/%s)"
-#: builtin/remote.c:919
+#: builtin/remote.c:1002
msgid " tracked"
msgstr " seguit"
-#: builtin/remote.c:921
+#: builtin/remote.c:1004
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:923
+#: builtin/remote.c:1006
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:964
+#: builtin/remote.c:1047
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "branch.%s.merge no vàlid; no es pot fer «rebase» sobre > 1 branca"
-#: builtin/remote.c:973
+#: builtin/remote.c:1056
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "es fa «rebase» interactivament sobre el remot %s"
-#: builtin/remote.c:975
+#: builtin/remote.c:1058
#, 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:978
+#: builtin/remote.c:1061
#, c-format
msgid "rebases onto remote %s"
msgstr "es fa «rebase» sobre el remot %s"
-#: builtin/remote.c:982
+#: builtin/remote.c:1065
#, c-format
msgid " merges with remote %s"
-msgstr "es fusiona amb el remot %s"
+msgstr " es fusiona amb el remot %s"
-#: builtin/remote.c:985
+#: builtin/remote.c:1068
#, c-format
msgid "merges with remote %s"
msgstr "es fusiona amb el remot %s"
-#: builtin/remote.c:988
+#: builtin/remote.c:1071
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s i amb el remot %s\n"
-#: builtin/remote.c:1031
+#: builtin/remote.c:1114
msgid "create"
msgstr "crea"
-#: builtin/remote.c:1034
+#: builtin/remote.c:1117
msgid "delete"
msgstr "suprimeix"
-#: builtin/remote.c:1038
+#: builtin/remote.c:1121
msgid "up to date"
msgstr "al dia"
-#: builtin/remote.c:1041
+#: builtin/remote.c:1124
msgid "fast-forwardable"
msgstr "avanç ràpid possible"
-#: builtin/remote.c:1044
+#: builtin/remote.c:1127
msgid "local out of date"
msgstr "local no actualitzat"
-#: builtin/remote.c:1051
+#: builtin/remote.c:1134
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s força a %-*s (%s)"
-#: builtin/remote.c:1054
+#: builtin/remote.c:1137
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s puja a %-*s (%s)"
-#: builtin/remote.c:1058
+#: builtin/remote.c:1141
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s força a %s"
-#: builtin/remote.c:1061
+#: builtin/remote.c:1144
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s puja a %s"
-#: builtin/remote.c:1129
+#: builtin/remote.c:1212
msgid "do not query remotes"
msgstr "no consultis els remots"
-#: builtin/remote.c:1156
+#: builtin/remote.c:1239
#, c-format
msgid "* remote %s"
msgstr "* remot %s"
-#: builtin/remote.c:1157
+#: builtin/remote.c:1240
#, c-format
msgid " Fetch URL: %s"
msgstr " URL d'obtenció: %s"
-#: builtin/remote.c:1158 builtin/remote.c:1174 builtin/remote.c:1313
+#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
msgid "(no URL)"
msgstr "(sense URL)"
#. TRANSLATORS: the colon ':' should align
#. with the one in " Fetch URL: %s"
#. translation.
-#.
-#: builtin/remote.c:1172 builtin/remote.c:1174
+#: builtin/remote.c:1255 builtin/remote.c:1257
#, c-format
msgid " Push URL: %s"
msgstr " URL de pujada: %s"
-#: builtin/remote.c:1176 builtin/remote.c:1178 builtin/remote.c:1180
+#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
#, c-format
msgid " HEAD branch: %s"
msgstr " Branca de HEAD: %s"
-#: builtin/remote.c:1176
+#: builtin/remote.c:1259
msgid "(not queried)"
msgstr "(no consultat)"
-#: builtin/remote.c:1178
+#: builtin/remote.c:1261
msgid "(unknown)"
msgstr "(desconegut)"
-#: builtin/remote.c:1182
+#: builtin/remote.c:1265
#, c-format
-msgid ""
-" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+msgid " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
" Branca de HEAD (la HEAD remot és ambigua, pot ser un dels següents):\n"
-#: builtin/remote.c:1194
+#: builtin/remote.c:1277
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Branca remota:%s"
msgstr[1] " Branques remotes:%s"
-#: builtin/remote.c:1197 builtin/remote.c:1223
+#: builtin/remote.c:1280 builtin/remote.c:1306
msgid " (status not queried)"
msgstr " (estat no consultat)"
-#: builtin/remote.c:1206
+#: builtin/remote.c:1289
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Branca local configurada per a «git pull»:"
msgstr[1] " Branques locals configurades per a «git pull»:"
-#: builtin/remote.c:1214
+#: builtin/remote.c:1297
msgid " Local refs will be mirrored by 'git push'"
msgstr " «git push» reflectirà les referències locals"
-#: builtin/remote.c:1220
+#: builtin/remote.c:1303
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Referència local configurada per a «git push»%s:"
msgstr[1] " Referències locals configurades per a «git push»%s:"
-#: builtin/remote.c:1241
+#: builtin/remote.c:1324
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:1243
+#: builtin/remote.c:1326
msgid "delete refs/remotes/<name>/HEAD"
-msgstr "suprimeix refs/remotes/<name>/HEAD"
+msgstr "suprimeix refs/remotes/<nom>/HEAD"
-#: builtin/remote.c:1258
+#: builtin/remote.c:1341
msgid "Cannot determine remote HEAD"
msgstr "No es pot determinar la HEAD remota"
-#: builtin/remote.c:1260
+#: builtin/remote.c:1343
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "Múltiples branques de HEAD remotes. Trieu-ne una explícitament amb:"
-#: builtin/remote.c:1270
+#: builtin/remote.c:1353
#, c-format
msgid "Could not delete %s"
msgstr "No s'ha pogut suprimir %s"
-#: builtin/remote.c:1278
+#: builtin/remote.c:1361
#, c-format
msgid "Not a valid ref: %s"
msgstr "No és una referència vàlida: %s"
-#: builtin/remote.c:1280
+#: builtin/remote.c:1363
#, c-format
msgid "Could not setup %s"
msgstr "No s'ha pogut configurar %s"
-#: builtin/remote.c:1298
+#: builtin/remote.c:1381
#, c-format
msgid " %s will become dangling!"
msgstr " %s es tornarà penjant!"
-#: builtin/remote.c:1299
+#: builtin/remote.c:1382
#, c-format
msgid " %s has become dangling!"
msgstr " %s s'ha tornat penjant!"
-#: builtin/remote.c:1309
+#: builtin/remote.c:1392
#, c-format
msgid "Pruning %s"
msgstr "S'està podant %s"
-#: builtin/remote.c:1310
+#: builtin/remote.c:1393
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1326
+#: builtin/remote.c:1409
#, c-format
msgid " * [would prune] %s"
msgstr " * [podaria] %s"
-#: builtin/remote.c:1329
+#: builtin/remote.c:1412
#, c-format
msgid " * [pruned] %s"
msgstr " * [podat] %s"
-#: builtin/remote.c:1374
+#: builtin/remote.c:1457
msgid "prune remotes after fetching"
msgstr "poda els remots després d'obtenir-los"
-#: builtin/remote.c:1437 builtin/remote.c:1491 builtin/remote.c:1559
+#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
#, c-format
msgid "No such remote '%s'"
msgstr "No hi ha tal remot «%s»"
-#: builtin/remote.c:1453
+#: builtin/remote.c:1539
msgid "add branch"
msgstr "afegeix branca"
-#: builtin/remote.c:1460
+#: builtin/remote.c:1546
msgid "no remote specified"
msgstr "cap remot especificat"
-#: builtin/remote.c:1477
+#: builtin/remote.c:1563
msgid "query push URLs rather than fetch URLs"
msgstr "consulta els URL de pujada en lloc dels URL d'obtenció"
-#: builtin/remote.c:1479
+#: builtin/remote.c:1565
msgid "return all URLs"
msgstr "retorna tots els URL"
-#: builtin/remote.c:1507
+#: builtin/remote.c:1595
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "cap URL configurat per al remot «%s»"
-#: builtin/remote.c:1533
+#: builtin/remote.c:1621
msgid "manipulate push URLs"
msgstr "manipula els URL de pujada"
-#: builtin/remote.c:1535
+#: builtin/remote.c:1623
msgid "add URL"
msgstr "afegeix URL"
-#: builtin/remote.c:1537
+#: builtin/remote.c:1625
msgid "delete URLs"
msgstr "suprimeix els URL"
-#: builtin/remote.c:1544
+#: builtin/remote.c:1632
msgid "--add --delete doesn't make sense"
msgstr "--add --delete no té sentit"
-#: builtin/remote.c:1583
+#: builtin/remote.c:1673
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Patró d'URL antic no vàlid: %s"
-#: builtin/remote.c:1591
+#: builtin/remote.c:1681
#, c-format
msgid "No such URL found: %s"
msgstr "No s'ha trobat tal URL: %s"
-#: builtin/remote.c:1593
+#: builtin/remote.c:1683
msgid "Will not delete all non-push URLs"
msgstr "No se suprimiran tots els URL no de pujada"
-#: builtin/repack.c:23
+#: builtin/repack.c:25
msgid "git repack [<options>]"
msgstr "git repack [<opcions>]"
-#: builtin/repack.c:28
+#: 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"
-"--no-write-bitmap-index o inhabiliteu el paràmetre de configuració pack."
-"writebitmaps."
+"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:191
+#: 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:230 builtin/repack.c:416
+#: builtin/repack.c:268 builtin/repack.c:447
+#, 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:254
+#: builtin/repack.c:295
+#, 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:292
+#: builtin/repack.c:323
msgid "pack everything in a single pack"
msgstr "empaqueta-ho tot en un únic paquet"
-#: builtin/repack.c:294
+#: builtin/repack.c:325
msgid "same as -a, and turn unreachable objects loose"
msgstr "el mateix que -a, i solta els objectes inabastables"
-#: builtin/repack.c:297
+#: builtin/repack.c:328
msgid "remove redundant packs, and run git-prune-packed"
msgstr "elimina els paquets redundants, i executeu git-prune-packed"
-#: builtin/repack.c:299
+#: builtin/repack.c:330
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "passa --no-reuse-delta a git-pack-objects"
-#: builtin/repack.c:301
+#: builtin/repack.c:332
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "passa --no-reuse-object a git-pack-objects"
-#: builtin/repack.c:303
+#: builtin/repack.c:334
msgid "do not run git-update-server-info"
msgstr "no executis git-update-server-info"
-#: builtin/repack.c:306
+#: builtin/repack.c:337
msgid "pass --local to git-pack-objects"
msgstr "passa --local a git-pack-objects"
-#: builtin/repack.c:308
+#: builtin/repack.c:339
msgid "write bitmap index"
msgstr "escriu índex de mapa de bits"
-#: builtin/repack.c:310
+#: builtin/repack.c:341
#, 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:311
+#: builtin/repack.c:342
msgid "approxidate"
msgstr "data aproximada"
-#: builtin/repack.c:312
+#: builtin/repack.c:343
msgid "with -A, do not loosen objects older than this"
msgstr "amb -A, no soltis els objectes més vells que aquest"
-#: builtin/repack.c:314
+#: builtin/repack.c:345
msgid "with -a, repack unreachable objects"
msgstr "amb -a, reempaqueta els objectes inabastables"
-#: builtin/repack.c:316
+#: builtin/repack.c:347
msgid "size of the window used for delta compression"
msgstr "mida de la finestra que s'usa per a compressió de diferències"
-#: builtin/repack.c:317 builtin/repack.c:323
+#: builtin/repack.c:348 builtin/repack.c:354
msgid "bytes"
msgstr "octets"
-#: builtin/repack.c:318
+#: builtin/repack.c:349
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
"el mateix que l'anterior, però limita la mida de memòria en lloc del nombre "
"d'entrades"
-#: builtin/repack.c:320
+#: builtin/repack.c:351
msgid "limits the maximum delta depth"
msgstr "limita la profunditat màxima de les diferències"
-#: builtin/repack.c:322
+#: builtin/repack.c:353
msgid "limits the maximum number of threads"
msgstr "limita el nombre màxim de fils"
-#: builtin/repack.c:324
+#: builtin/repack.c:355
msgid "maximum size of each packfile"
msgstr "mida màxima de cada fitxer de paquet"
-#: builtin/repack.c:326
+#: builtin/repack.c:357
msgid "repack objects in packs marked with .keep"
msgstr "reempaqueta els objectes en paquets marcats amb .keep"
-#: builtin/repack.c:328
+#: builtin/repack.c:359
#, fuzzy
msgid "do not repack this pack"
-msgstr "crea paquets prims"
+msgstr "no reempaqueta aquest paquet"
-#: builtin/repack.c:338
+#: builtin/repack.c:369
msgid "cannot delete packs in a precious-objects repo"
msgstr "no es poden suprimir paquets en un dipòsit d'objectes preciosos"
-#: builtin/repack.c:342
+#: builtin/repack.c:373
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable i -A són incompatibles"
-#: builtin/repack.c:425
+#: builtin/repack.c:456
#, fuzzy
msgid "Nothing new to pack."
-msgstr "usa el paquet prim"
+msgstr "Res nou per empaquetar."
#: 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 ""
+#, fuzzy, c-format
+msgid "missing required file: %s"
+msgstr "falten els arguments per a %s"
-#: builtin/repack.c:534
-#, c-format
-msgid "failed to remove '%s'"
-msgstr "s'ha produït un error en eliminar «%s»"
+#: builtin/repack.c:488
+#, fuzzy, c-format
+msgid "could not unlink: %s"
+msgstr "no s'ha pogut bloquejar «%s»"
#: builtin/replace.c:22
msgid "git replace [-f] <object> <replacement>"
@@ -19170,121 +20817,127 @@
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:378 builtin/replace.c:423
-#: builtin/replace.c:453
+#: 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: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:415
+#: builtin/replace.c:416
#, c-format
msgid "bad mergetag in commit '%s'"
msgstr "etiqueta de fusió incorrecta en la comissió «%s»"
-#: builtin/replace.c:417
+#: 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:429
+#: builtin/replace.c:430
#, c-format
msgid ""
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -19293,119 +20946,122 @@
"la comissió original «%s» conté l'etiqueta de fusió «%s» que es descarta; "
"useu --edit en lloc de --graft"
-#: builtin/replace.c:468
+#: builtin/replace.c:469
#, c-format
msgid "the original commit '%s' has a gpg signature"
msgstr "la comissió original «%s» té una signatura gpg"
-#: builtin/replace.c:469
+#: builtin/replace.c: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:479
+#: 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:487
-#, c-format
+#: builtin/replace.c:488
+#, fuzzy, c-format
msgid "graft for '%s' unnecessary"
-msgstr ""
+msgstr "empelt per '%s' innecessari"
-#: builtin/replace.c:491
+#: 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:526
+#: 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:547
+#: builtin/replace.c:548
msgid "list replace refs"
msgstr "llista les referències reemplaçades"
-#: builtin/replace.c:548
+#: builtin/replace.c:549
msgid "delete replace refs"
msgstr "suprimeix les referències reemplaçades"
-#: builtin/replace.c:549
+#: builtin/replace.c:550
msgid "edit existing object"
msgstr "edita un objecte existent"
-#: builtin/replace.c:550
+#: builtin/replace.c:551
msgid "change a commit's parents"
msgstr "canvia les mares d'una comissió"
-#: builtin/replace.c:551
+#: 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:552
+#: builtin/replace.c:553
msgid "replace the ref if it exists"
msgstr "reemplaça la referència si existeix"
-#: builtin/replace.c:554
+#: builtin/replace.c:555
msgid "do not pretty-print contents for --edit"
msgstr "no imprimeixis bellament els continguts per a --edit"
-#: builtin/replace.c:555
+#: builtin/replace.c:556
msgid "use this format"
msgstr "usa aquest format"
-#: builtin/replace.c:568
+#: 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:576
+#: 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:580
+#: builtin/replace.c:581
msgid "--raw only makes sense with --edit"
msgstr "--raw només té sentit amb --edit"
-#: builtin/replace.c:586
+#: builtin/replace.c:587
+#, fuzzy
msgid "-d needs at least one argument"
-msgstr ""
+msgstr "-d necessita almenys un argument"
-#: builtin/replace.c:592
+#: builtin/replace.c:593
msgid "bad number of arguments"
msgstr "nombre incorrecte d'arguments"
-#: builtin/replace.c:598
+#: builtin/replace.c:599
msgid "-e needs exactly one argument"
msgstr "-e necessita exactament un argument"
-#: builtin/replace.c:604
+#: builtin/replace.c:605
msgid "-g needs at least one argument"
msgstr "-g necessita almenys un argument"
-#: builtin/replace.c:610
+#: builtin/replace.c:611
msgid "--convert-graft-file takes no argument"
msgstr "--convert-graft-file arguments"
-#: builtin/replace.c:616
+#: builtin/replace.c:617
msgid "only one pattern can be given with -l"
msgstr "només es pot especificar un patró amb -l"
#: builtin/rerere.c:13
msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
-msgstr "git rerere [clear | forget <camí>... | status | remaining | diff | gc]"
+msgstr ""
+"git rerere [clear | forget <camí>... | status | remaining | diff | gc]"
#: builtin/rerere.c:60
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
@@ -19421,17 +21077,19 @@
#: builtin/reset.c:33
#, fuzzy
msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
-msgstr "git reset [-q] [<arbre>] [--] <camins>..."
+msgstr "git reset [-q] [<tree-ish>] [--] <pathspec>"
#: builtin/reset.c:34
+#, 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:35
#, fuzzy
msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
-msgstr "git reset --patch [<arbre>] [--] [<camins>...]"
+msgstr "git reset --patch [<tree-ish>] [--] [<pathspec>]"
#: builtin/reset.c:41
msgid "mixed"
@@ -19453,143 +21111,147 @@
msgid "keep"
msgstr "reteniment"
-#: builtin/reset.c:82
+#: builtin/reset.c:83
msgid "You do not have a valid HEAD."
msgstr "No teniu un HEAD vàlid."
-#: builtin/reset.c:84
+#: 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:90
+#: 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:115
+#: builtin/reset.c:116
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD ara és a %s"
-#: builtin/reset.c:194
+#: 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:294 builtin/stash.c:519 builtin/stash.c:594
+#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:594
#: builtin/stash.c:618
msgid "be quiet, only report errors"
msgstr "sigues silenciós, només informa d'errors"
-#: builtin/reset.c:296
+#: builtin/reset.c:297
msgid "reset HEAD and index"
msgstr "restableix HEAD i l'índex"
-#: builtin/reset.c:297
+#: builtin/reset.c:298
msgid "reset only HEAD"
msgstr "restableix només HEAD"
-#: builtin/reset.c:299 builtin/reset.c:301
+#: 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:303
+#: builtin/reset.c:304
msgid "reset HEAD but keep local changes"
msgstr "restableix HEAD però retén els canvis locals"
-#: builtin/reset.c:309
+#: 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:343
+#: 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:351
+#: 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:360
+#: builtin/reset.c:361
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch és incompatible amb --{hard,mixed,soft}"
-#: builtin/reset.c:370
+#: 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:372
+#: 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:387
+#: 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:391
+#: builtin/reset.c:392
msgid "-N can only be used with --mixed"
msgstr "-N només es pot usar amb --mixed"
-#: builtin/reset.c:412
+#: builtin/reset.c:413
msgid "Unstaged changes after reset:"
msgstr "Canvis «unstaged» després del restabliment:"
-#: builtin/reset.c:415
-#, 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:425
+#: 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:429
+#: 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:411
+#: 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:472
+#: builtin/rev-list.c:560
msgid "object filtering requires --objects"
msgstr "el filtratge d'objectes requereix --objects"
-#: builtin/rev-list.c:522
+#: 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:525
-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"
@@ -19597,12 +21259,11 @@
"\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>..."
@@ -19682,11 +21343,11 @@
msgid "keep redundant, empty commits"
msgstr "retén les comissions redundants i buides"
-#: builtin/revert.c:232
+#: builtin/revert.c:239
msgid "revert failed"
msgstr "la reversió ha fallat"
-#: builtin/revert.c:245
+#: builtin/revert.c:252
msgid "cherry-pick failed"
msgstr "el «cherry pick» ha fallat"
@@ -19736,105 +21397,131 @@
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'ha suprimit «%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"
#: 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"
+"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=<paquet-del-git-receive>] [--verbose] [--thin] [--atomic] "
-"[<màquina>:]<directori> [<referència>...]\n"
+"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<paquet-del-git-receive>] [--verbose] [--thin] [--atomic] [<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:188
msgid "remote name"
msgstr "nom del remot"
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:201
msgid "use stateless RPC protocol"
msgstr "usa el protocol RPC sense estat"
-#: builtin/send-pack.c:178
+#: builtin/send-pack.c:202
msgid "read refs from stdin"
msgstr "llegeix les referències des de stdin"
-#: builtin/send-pack.c:179
+#: builtin/send-pack.c:203
msgid "print status from remote helper"
msgstr "imprimeix l'estat des de l'ajudant remot"
-#: builtin/shortlog.c:14
+#: builtin/shortlog.c:16
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git shortlog [<opcions>] [<rang-de-revisions>] [[--] <camí>...]"
-#: builtin/shortlog.c:15
+#: builtin/shortlog.c:17
msgid "git log --pretty=short | git shortlog [<options>]"
msgstr "git log --pretty=short | git shortlog [<opcions>]"
-#: builtin/shortlog.c:264
+#: builtin/shortlog.c:135
+#, fuzzy
+msgid "using multiple --group options with stdin is not supported"
+msgstr "no s'admet escriure a stdin"
+
+#: builtin/shortlog.c:145
+#, fuzzy
+msgid "using --group=trailer with stdin is not supported"
+msgstr "no s'admet escriure a stdin"
+
+#: builtin/shortlog.c:335
+#, fuzzy, c-format
+msgid "unknown group type: %s"
+msgstr "tipus desconegut"
+
+#: builtin/shortlog.c:363
msgid "Group by committer rather than author"
msgstr "Agrupa per «comitter» en comptes de per autor"
-#: builtin/shortlog.c:266
+#: builtin/shortlog.c:366
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:368
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:370
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:371
msgid "<w>[,<i1>[,<i2>]]"
msgstr "<w>[,<i1>[,<i2>]]"
-#: builtin/shortlog.c:272
+#: builtin/shortlog.c:372
msgid "Linewrap output"
msgstr "Ajusta les línies de la sortida"
-#: builtin/shortlog.c:301
+#: builtin/shortlog.c:374
+#, fuzzy
+msgid "field"
+msgstr "camp"
+
+#: builtin/shortlog.c:375
+#, fuzzy
+msgid "Group by field"
+msgstr "Agrupa per camp"
+
+#: builtin/shortlog.c:403
msgid "too many arguments given outside repository"
msgstr "hi ha massa arguments donats fora del dipòsit"
@@ -19852,7 +21539,8 @@
#: 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>]"
+msgstr ""
+"git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<referència>]"
#: builtin/show-branch.c:395
#, c-format
@@ -19876,7 +21564,7 @@
#: 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"
@@ -19932,7 +21620,8 @@
#: builtin/show-branch.c:711
msgid ""
-"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+"--reflog is incompatible with --all, --remotes, --independent or --merge-"
+"base"
msgstr ""
"--reflog és incompatible amb --all, --remotes, --independent o --merge-base"
@@ -19973,13 +21662,23 @@
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 | --"
-"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
+"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] [--] [<patró>...]"
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | "
+"--hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<patró>...]"
#: builtin/show-ref.c:13
msgid "git show-ref --exclude-existing[=<pattern>]"
@@ -20019,82 +21718,150 @@
msgid "show refs from stdin that aren't in local repository"
msgstr "mostra les referències de stdin que no siguin en el dipòsit local"
-#: builtin/sparse-checkout.c:20
-msgid "git sparse-checkout (init|list|set|disable) <options>"
-msgstr "git sparse-checkout (init|list|set|disable) <opcions>"
+#: builtin/sparse-checkout.c:21
+#, fuzzy
+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:61
+#: builtin/sparse-checkout.c:50
+#, fuzzy
+msgid "git sparse-checkout list"
+msgstr "git sparse-checkout init [--cone]"
+
+#: 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:220
-msgid "failed to set extensions.worktreeConfig setting"
+#: 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
+#, fuzzy
+msgid "unable to upgrade repository format to enable worktreeConfig"
msgstr ""
+"no s'ha pogut actualitzar el format del dipòsit per habilitar worktreeConfig"
-#: builtin/sparse-checkout.c:237
+#: 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:256
-msgid "initialize the sparse-checkout in cone mode"
-msgstr ""
-
-#: builtin/sparse-checkout.c:262
+#: builtin/sparse-checkout.c:307
#, fuzzy
-msgid "initialize sparse-checkout"
-msgstr "omet l'aplicació del filtre d'agafament parcial"
+msgid "initialize the sparse-checkout in cone mode"
+msgstr "inicialitza el «sparse-checkout» en mode con"
-#: builtin/sparse-checkout.c:295
+#: 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:361
-msgid "git sparse-checkout set (--stdin | <patterns>)"
-msgstr "git sparse-checkout set (--stdin | <patrons>)"
+#: 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:378
+#: 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:384
-#, msgid "set sparse-checkout patterns"
-msgid "set sparse-checkout patterns"
-msgstr "estableix els patrons «sparse-checkout»"
+#: builtin/sparse-checkout.c:576
+#, fuzzy
+msgid "git sparse-checkout reapply"
+msgstr "git sparse-checkout init [--cone]"
-#: builtin/sparse-checkout.c:447
-msgid "disable sparse-checkout"
-msgstr "inhabilita «sparse-checkout»"
+#: builtin/sparse-checkout.c:595
+#, fuzzy
+msgid "git sparse-checkout disable"
+msgstr "git sparse-checkout init [--cone]"
-#: builtin/sparse-checkout.c:459
+#: 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:37
+#: 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:42
+#: builtin/stash.c:23 builtin/stash.c:43
msgid "git stash show [<options>] [<stash>]"
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
+#: builtin/stash.c:26 builtin/stash.c:63
msgid "git stash branch <branchname> [<stash>]"
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 "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: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: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 <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"
@@ -20104,89 +21871,70 @@
" [-u|--include-untracked] [-a|--all] [-m|--message <missatge>]\n"
" [--] [<pathspec>...]]"
-#: builtin/stash.c:31 builtin/stash.c:84
-msgid ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
-" [-u|--include-untracked] [-a|--all] [<message>]"
-msgstr ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
-" [-u|--include-untracked] [-a|--all] [<missatge>]"
-
-#: builtin/stash.c:52
-msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
-msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
-
-#: builtin/stash.c:57
-msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
-msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
-
-#: builtin/stash.c:72
-msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
-msgstr "git stash store [-m|--message <missatge>] [-q|--quiet] <commit>"
-
-#: builtin/stash.c:127
+#: builtin/stash.c:128
#, c-format
msgid "'%s' is not a stash-like commit"
msgstr "«%s» no és una comissió de tipus «stash»"
-#: builtin/stash.c:147
+#: builtin/stash.c:148
#, c-format
msgid "Too many revisions specified:%s"
msgstr "S'han especificat massa revisions:%s"
-#: builtin/stash.c:161 git-legacy-stash.sh:549
+#: builtin/stash.c:162
msgid "No stash entries found."
msgstr "No s'ha trobat cap «stash»."
-#: builtin/stash.c:175
+#: builtin/stash.c:176
#, c-format
msgid "%s is not a valid reference"
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
+#: builtin/stash.c:404
msgid "cannot apply a stash in the middle of a merge"
msgstr "no es pot aplicar un «stash» enmig d'una fusió"
-#: builtin/stash.c:414
+#: builtin/stash.c:415
#, c-format
msgid "could not generate diff %s^!."
msgstr "no s'ha pogut generar diff %s^!."
-#: builtin/stash.c:421
-msgid "conflicts in index.Try without --index."
+#: builtin/stash.c:422
+#, fuzzy
+msgid "conflicts in index. Try without --index."
msgstr "hi ha conflictes en l'índex. Proveu-ho sense --index."
-#: builtin/stash.c:427
+#: builtin/stash.c:428
msgid "could not save index tree"
msgstr "no s'ha pogut desar l'arbre d'índex"
-#: builtin/stash.c:436
+#: 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»"
-#: builtin/stash.c:450
+#: builtin/stash.c:451
#, c-format
msgid "Merging %s with %s"
msgstr "S'està fusionant %s amb %s"
-#: builtin/stash.c:460 git-legacy-stash.sh:681
+#: builtin/stash.c:461
msgid "Index was not unstashed."
-msgstr "L'índex no estava «unstashed»"
+msgstr "L'índex no estava «unstashed»."
-#: builtin/stash.c:521 builtin/stash.c:620
+#: builtin/stash.c:522 builtin/stash.c:620
msgid "attempt to recreate the index"
msgstr "intenta tornar a crear l'índex"
-#: builtin/stash.c:554
+#: builtin/stash.c:566
#, c-format
msgid "Dropped %s (%s)"
msgstr "Descartat %s (%s)"
-#: builtin/stash.c:557
+#: builtin/stash.c:569
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s: no s'ha pogut descartar l'entrada «stash»"
@@ -20196,105 +21944,109 @@
msgid "'%s' is not a stash reference"
msgstr "«%s» no és una referència «stash»"
-#: builtin/stash.c:632 git-legacy-stash.sh:695
+#: builtin/stash.c:632
msgid "The stash entry is kept in case you need it again."
msgstr "Es conserva l'entrada «stash» en cas que la necessiteu altra vegada."
-#: builtin/stash.c:655 git-legacy-stash.sh:713
+#: builtin/stash.c:655
msgid "No branch name specified"
msgstr "Cap nom de branca especificat"
-#: builtin/stash.c:795 builtin/stash.c:832
+#: builtin/stash.c:799 builtin/stash.c:836
#, c-format
msgid "Cannot update %s with %s"
msgstr "No es pot actualitzar %s amb %s"
-#: builtin/stash.c:813 builtin/stash.c:1470 builtin/stash.c:1506
+#: builtin/stash.c:817 builtin/stash.c:1471 builtin/stash.c:1536
msgid "stash message"
msgstr "missatge «stash»"
-#: builtin/stash.c:823
+#: builtin/stash.c:827
msgid "\"git stash store\" requires one <commit> argument"
-msgstr "«git stash store» requereix un paràmetre <comissió>"
+msgstr "«git stash store» requereix un argument <comissió>"
-#: builtin/stash.c:1045 git-legacy-stash.sh:218
+#: builtin/stash.c:1042
msgid "No changes selected"
msgstr "No hi ha canvis seleccionats"
-#: builtin/stash.c:1145 git-legacy-stash.sh:150
+#: builtin/stash.c:1142
msgid "You do not have the initial commit yet"
msgstr "Encara no teniu la comissió inicial"
-#: builtin/stash.c:1172 git-legacy-stash.sh:165
+#: builtin/stash.c:1169
msgid "Cannot save the current index state"
msgstr "No es pot desar l'estat d'índex actual"
-#: builtin/stash.c:1181 git-legacy-stash.sh:180
+#: builtin/stash.c:1178
msgid "Cannot save the untracked files"
msgstr "No es poden desar els fitxers no seguits"
-#: builtin/stash.c:1192 builtin/stash.c:1201 git-legacy-stash.sh:201
-#: git-legacy-stash.sh:214
+#: builtin/stash.c:1189 builtin/stash.c:1198
msgid "Cannot save the current worktree state"
msgstr "No es pot desar l'estat d'arbre de treball actual"
-#: builtin/stash.c:1229 git-legacy-stash.sh:234
+#: builtin/stash.c:1226
msgid "Cannot record working tree state"
msgstr "No es pot registrar l'estat de l'arbre de treball"
-#: builtin/stash.c:1278 git-legacy-stash.sh:338
+#: builtin/stash.c:1275
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"
-#: builtin/stash.c:1294
+#: builtin/stash.c:1291
msgid "Did you forget to 'git add'?"
msgstr "Heu oblidat de fer «git add»?"
-#: builtin/stash.c:1309 git-legacy-stash.sh:346
+#: builtin/stash.c:1306
msgid "No local changes to save"
msgstr "No hi ha canvis locals a desar"
-#: builtin/stash.c:1316 git-legacy-stash.sh:351
+#: builtin/stash.c:1313
msgid "Cannot initialize stash"
msgstr "No es pot inicialitzar el magatzem"
-#: builtin/stash.c:1331 git-legacy-stash.sh:355
+#: builtin/stash.c:1328
msgid "Cannot save the current status"
msgstr "No es pot desar l'estat actual"
-#: builtin/stash.c:1336
+#: builtin/stash.c:1333
#, c-format
msgid "Saved working directory and index state %s"
msgstr "S'han desat el directori de treball i l'estat d'índex %s"
-#: builtin/stash.c:1426 git-legacy-stash.sh:385
+#: builtin/stash.c:1423
msgid "Cannot remove worktree changes"
msgstr "No es poden eliminar els canvis de l'arbre de treball"
-#: builtin/stash.c:1461 builtin/stash.c:1497
+#: builtin/stash.c:1462 builtin/stash.c:1527
msgid "keep index"
msgstr "mantén l'índex"
-#: builtin/stash.c:1463 builtin/stash.c:1499
+#: builtin/stash.c:1464 builtin/stash.c:1529
+#, fuzzy
msgid "stash in patch mode"
-msgstr ""
+msgstr "stash en mode pedaç"
-#: builtin/stash.c:1464 builtin/stash.c:1500
+#: builtin/stash.c:1465 builtin/stash.c:1530
msgid "quiet mode"
msgstr "mode silenciós"
-#: builtin/stash.c:1466 builtin/stash.c:1502
+#: builtin/stash.c:1467 builtin/stash.c:1532
msgid "include untracked files in stash"
msgstr "inclou els fitxers no seguits a «stash»"
-#: builtin/stash.c:1468 builtin/stash.c:1504
+#: builtin/stash.c:1469 builtin/stash.c:1534
msgid "include ignore files"
msgstr "inclou els fitxers ignorats"
-#: builtin/stash.c:1564
-#, c-format
-msgid "could not exec %s"
-msgstr "no s'ha pogut executar %s"
+#: builtin/stash.c:1569
+#, 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]"
@@ -20313,21 +22065,21 @@
msgid "prepend comment character and space to each line"
msgstr "anteposa el caràcter de comentari i un espai a cada línia"
-#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1970
+#: builtin/submodule--helper.c: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:64
msgid "submodule--helper print-default-remote takes no arguments"
-msgstr ""
+msgstr "submodule--helper print-default-remote no pren cap argument"
#: 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:410 builtin/submodule--helper.c:1380
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819
msgid "alternative anchor for relative paths"
msgstr "àncora alternativa per als camins relatius"
@@ -20335,8 +22087,8 @@
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<camí>] [<camí>...]"
-#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c: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"
@@ -20347,25 +22099,27 @@
msgstr "S'està entrant a «%s»\n"
#: builtin/submodule--helper.c:527
-#, c-format
+#, 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:549
-#, c-format
+#, fuzzy, c-format
msgid ""
-"run_command returned non-zero status while recursing in the nested "
-"submodules of %s\n"
+"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: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:567 builtin/submodule--helper.c:1053
+#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1487
msgid "Recurse into nested submodules"
msgstr "Inclou recursivament els submòduls imbricats"
@@ -20382,314 +22136,390 @@
"no s'ha pogut trobar la configuració «%s». S'assumeix que aquest dipòsit és "
"el seu dipòsit font autoritzat."
-#: builtin/submodule--helper.c:667
+#: builtin/submodule--helper.c: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:671
+#: 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:681
+#: 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:688
+#: 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:710
+#: 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:715
+#: builtin/submodule--helper.c:714
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<opcions>] [<camí>]"
-#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:914
+#: 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:827
+#: 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:854 builtin/submodule--helper.c:1023
+#: 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:878 builtin/submodule--helper.c:1189
+#: 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:879
+#: 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:880
+#: builtin/submodule--helper.c:888
msgid "recurse into nested submodules"
msgstr "inclou recursivament els submòduls imbricats"
-#: builtin/submodule--helper.c:885
+#: 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:909
+#: builtin/submodule--helper.c:917
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <camí>"
-#: builtin/submodule--helper.c:973
+#: builtin/submodule--helper.c:989
+#, fuzzy, c-format
+msgid "* %s %s(blob)->%s(submodule)"
+msgstr "* el %s(blob)->%s(submòdul)"
+
+#: builtin/submodule--helper.c:992
+#, fuzzy, c-format
+msgid "* %s %s(submodule)->%s(blob)"
+msgstr "* un %s per cents(submòdul)->%s(blob)"
+
+#: builtin/submodule--helper.c:1005
+#, fuzzy, c-format
+msgid "%s"
+msgstr "percentatges"
+
+#: 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
+#, fuzzy
+msgid "skip submodules with 'ignore_config' value set to 'all'"
+msgstr "omet els submòduls amb el valor «ignoreconfig» establert a «all»"
+
+#: 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:979
+#: 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»"
+msgstr ""
+"s'ha produït un error en registrar l'url per al camí del submòdul «%s»"
-#: builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c: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:1004
+#: 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:1051
+#: 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:1058
+#: 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:1112
+#: 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:1124
+#: 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:1132
+#: 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:1134
+#: 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:1145
+#: 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:1161
+#: 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:1190
+#: 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:1191
+#: builtin/submodule--helper.c:1625
msgid "Unregister all submodules"
msgstr "Desregistra recursivament tots els submòduls"
-#: builtin/submodule--helper.c:1196
+#: 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:1210
+#: 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:1275
+#: 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:1314 builtin/submodule--helper.c:1317
+#: 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:1353
+#: 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:1360
+#: 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:1383
+#: 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:1386
+#: builtin/submodule--helper.c:1825
msgid "name of the new submodule"
msgstr "nom del submòdul nou"
-#: builtin/submodule--helper.c:1389
+#: 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:1397
+#: builtin/submodule--helper.c:1836
msgid "depth for shallow clones"
msgstr "profunditat dels clons superficials"
-#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1897
+#: 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:1402 builtin/submodule--helper.c:1899
+#: 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:1407
+#: 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:1431
-#, c-format
+#: builtin/submodule--helper.c:1873
+#, fuzzy, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
-msgstr ""
+msgstr "refusant crear/usar '%s' en el directori git d'un altre submòdul"
-#: builtin/submodule--helper.c:1442
+#: 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:1446
+#: builtin/submodule--helper.c:1888
#, c-format
msgid "directory not empty: '%s'"
msgstr "directori no buit: «%s»"
-#: builtin/submodule--helper.c:1458
+#: 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:1494
+#: 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:1498
+#: 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:1594
+#: 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:1598
+#: 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:1628
+#: 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:1657
+#: builtin/submodule--helper.c:2104
#, c-format
msgid "Skipping submodule '%s'"
msgstr "S'està ometent el submòdul «%s»"
-#: builtin/submodule--helper.c:1803
+#: 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:1814
+#: 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:1876 builtin/submodule--helper.c:2120
+#: 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:1879
+#: 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:1883
+#: builtin/submodule--helper.c:2334
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout o none"
-#: builtin/submodule--helper.c:1889
+#: 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:1892
+#: builtin/submodule--helper.c:2343
msgid "parallel jobs"
msgstr "tasques paral·leles"
-#: builtin/submodule--helper.c:1894
+#: 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:1895
+#: builtin/submodule--helper.c:2346
msgid "don't print cloning progress"
msgstr "no imprimeixis el progrés del clonatge"
-#: builtin/submodule--helper.c:1904
+#: 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:1917
+#: builtin/submodule--helper.c:2370
msgid "bad value for update parameter"
msgstr "valor incorrecte per al paràmetre update"
-#: builtin/submodule--helper.c:1965
+#: builtin/submodule--helper.c:2418
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -20698,58 +22528,97 @@
"La branca de submòdul (%s) està configurada per a heretar la branca del "
"superprojecte, però el superprojecte no és en cap branca"
-#: builtin/submodule--helper.c:2088
+#: builtin/submodule--helper.c: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:2121
+#: builtin/submodule--helper.c:2574
msgid "recurse into submodules"
msgstr "inclou recursivament als submòduls"
-#: builtin/submodule--helper.c:2127
+#: builtin/submodule--helper.c:2580
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [<opcions>] [<camí>...]"
-#: builtin/submodule--helper.c:2183
+#: 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:2186
+#: 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:2191
+#: 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:2192
+#: 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:2193
+#: builtin/submodule--helper.c:2646
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2212 git-submodule.sh:173
+#: builtin/submodule--helper.c:2665 git-submodule.sh:150
#, 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:2262 git.c:433 git.c:684
+#: 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: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:711
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s no admet --super-prefix"
-#: builtin/submodule--helper.c:2268
+#: 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>]"
@@ -20771,11 +22640,11 @@
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:499
msgid "reason"
msgstr "raó"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
msgid "reason of the update"
msgstr "raó de l'actualització"
@@ -20785,21 +22654,20 @@
"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>...]"
+"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[<nombre>]] [--contains <comissió>] [--no-contains <comissió>] "
-"[--points-at <objecte>]\n"
+"git tag -l [-n[<nombre>]] [--contains <comissió>] [--no-contains <comissió>] [--points-at <objecte>]\n"
"\t\t[--format=<format>] [--[no-]merged [<comissió>]] [<patró>...]"
#: builtin/tag.c:30
@@ -20835,14 +22703,12 @@
"\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"
+"Lines starting with '%c' will be kept; you may remove them yourself if you want to.\n"
msgstr ""
"\n"
"Escriviu el missatge de l'etiqueta:\n"
" %s\n"
-"Les línies que comencin amb «%c» es retindran; podeu eliminar-les per vós "
-"mateix si voleu.\n"
+"Les línies que comencin amb «%c» es retindran; podeu eliminar-les per vós mateix si voleu.\n"
#: builtin/tag.c:198
msgid "unable to sign the tag"
@@ -20853,151 +22719,154 @@
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:505
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:501
+#: builtin/unpack-objects.c:502
msgid "Unpacking objects"
msgstr "S'estan desempaquetant els objectes"
@@ -21029,33 +22898,35 @@
#: 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: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: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: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: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: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:222
msgid " OK"
@@ -21108,23 +22979,24 @@
#: 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:1011
msgid "clear assumed-unchanged bit"
-msgstr "neteja el bit assumed-unchanged"
+msgstr "esborra el bit assumed-unchanged"
#: 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:1017
msgid "clear skip-worktree bit"
-msgstr "neteja el bit skip-worktree"
+msgstr "esborra el bit skip-worktree"
#: builtin/update-index.c:1020
+#, fuzzy
msgid "do not touch index-only entries"
-msgstr ""
+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"
@@ -21191,8 +23063,9 @@
msgstr "habilita la memòria cau no seguida sense provar el sistema de fitxers"
#: 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:1065
msgid "enable or disable file system monitor"
@@ -21204,23 +23077,23 @@
#: 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:1173
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
msgstr ""
-"core.splitIndex està establert a fals; elimineu-lo o canviar-lo, si realment "
-"voleu habilitar l'índex dividit"
+"core.splitIndex està establert a fals; elimineu-lo o canviar-lo, si realment"
+" voleu habilitar l'índex dividit"
#: 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 està establert a cert; elimineu-lo o canvieu-lo, si realment "
-"voleu inhabilitar l'índex dividit"
+"core.splitIndex està establert a cert; elimineu-lo o canvieu-lo, si realment"
+" voleu inhabilitar l'índex dividit"
#: builtin/update-index.c:1194
msgid ""
@@ -21236,8 +23109,8 @@
#: 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"
+"core.untrackedCache is set to false; remove or change it, if you really want"
+" to enable the untracked cache"
msgstr ""
"core.untrackedCache està establert a fals; elimineu-lo o canviar-lo, si "
"realment voleu habilitar el cau no seguit"
@@ -21275,25 +23148,26 @@
#: builtin/update-ref.c:11
msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
msgstr ""
-"git update-ref [<opcions>] <nom-de-referència> <valor-nou> [<valor-antic>]"
+"git update-ref [<opcions>] <nom-de-referència> <valor-nou> [<valor-"
+"antic>]"
#: builtin/update-ref.c:12
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<opcions>] --stdin [-z]"
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:500
msgid "delete the reference"
msgstr "suprimeix la referència"
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:502
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:503
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:504
msgid "read updates from stdin"
msgstr "llegeix les actualitzacions des de stdin"
@@ -21338,15 +23212,15 @@
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"
@@ -21360,7 +23234,7 @@
#: 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:18
msgid "git worktree list [<options>]"
@@ -21380,261 +23254,289 @@
#: 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:23
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <camí>"
-#: builtin/worktree.c:60 builtin/worktree.c:898
+#: builtin/worktree.c:60 builtin/worktree.c:973
#, c-format
msgid "failed to delete '%s'"
msgstr "s'ha produït un error en suprimir «%s»"
-#: builtin/worktree.c:79
-#, 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
-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
+#, fuzzy
+msgid "not a valid directory"
+msgstr "no és en un directori git"
+
+#: builtin/worktree.c:91
+#, fuzzy
+msgid "gitdir file does not exist"
msgstr "Eliminació de worktrees/%s: el fitxer gitdir no existeix"
-#: builtin/worktree.c:90 builtin/worktree.c:99
-#, 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:109
-#, 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:117
-#, 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:126
-#, 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:165
+#: 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:167
+#: 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:234
+#: builtin/worktree.c:293
#, c-format
msgid "'%s' already exists"
msgstr "«%s» ja existeix"
-#: builtin/worktree.c:251
-#, 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:256
-#, 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:258
-#, 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:308
+#: 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:439 builtin/worktree.c:445
+#: 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:441
-#, 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:450
+#: 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:456
+#: 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:497
+#: 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:500
+#: builtin/worktree.c:555
msgid "create a new branch"
msgstr "crea una branca nova"
-#: builtin/worktree.c:502
+#: builtin/worktree.c:557
msgid "create or reset a branch"
msgstr "crea o restableix una branca"
-#: builtin/worktree.c:504
+#: builtin/worktree.c:559
msgid "populate the new working tree"
msgstr "emplena l'arbre de treball nou"
-#: builtin/worktree.c:505
+#: builtin/worktree.c:560
msgid "keep the new working tree locked"
msgstr "mantén l'arbre de treball nou bloquejat"
-#: builtin/worktree.c:508
+#: 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:511
+#: 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"
+"prova de fer coincidir el nom de la branca nova amb una branca amb seguiment"
+" remot"
-#: builtin/worktree.c:519
+#: 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:580
+#: 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:680
+#: builtin/worktree.c:758
msgid "reason for locking"
msgstr "raó per bloquejar"
-#: builtin/worktree.c:692 builtin/worktree.c:725 builtin/worktree.c:799
-#: builtin/worktree.c:926
+#: builtin/worktree.c:770 builtin/worktree.c:803 builtin/worktree.c:877
+#: builtin/worktree.c:1001
#, c-format
msgid "'%s' is not a working tree"
msgstr "«%s» no és un arbre de treball"
-#: builtin/worktree.c:694 builtin/worktree.c:727
+#: builtin/worktree.c:772 builtin/worktree.c:805
msgid "The main working tree cannot be locked or unlocked"
msgstr "No es pot bloquejar ni desbloquejar l'arbre de treball principal"
-#: builtin/worktree.c:699
+#: builtin/worktree.c:777
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "«%s» ja està bloquejat, raó: «%s»"
-#: builtin/worktree.c:701
+#: builtin/worktree.c:779
#, c-format
msgid "'%s' is already locked"
msgstr "«%s» ja està bloquejat"
-#: builtin/worktree.c:729
+#: builtin/worktree.c:807
#, c-format
msgid "'%s' is not locked"
msgstr "«%s» no està bloquejat"
-#: builtin/worktree.c:770
+#: builtin/worktree.c:848
msgid "working trees containing submodules cannot be moved or removed"
-msgstr "els arbres de treball que contenen submòduls no es poden moure o suprimir"
+msgstr ""
+"els arbres de treball que contenen submòduls no es poden moure ni eliminar"
-#: builtin/worktree.c:778
+#: builtin/worktree.c:856
msgid "force move even if worktree is dirty or locked"
-msgstr "força el moviment encara que l'arbre de treball estigui brut o bloquejat"
+msgstr ""
+"força el moviment encara que l'arbre de treball estigui brut o bloquejat"
-#: builtin/worktree.c:801 builtin/worktree.c:928
+#: builtin/worktree.c:879 builtin/worktree.c:1003
#, c-format
msgid "'%s' is a main working tree"
msgstr "«%s» és un arbre de treball principal"
-#: builtin/worktree.c:806
+#: builtin/worktree.c:884
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "no s'ha pogut deduir el nom de destí des de «%s»"
-#: builtin/worktree.c:812
-#, c-format
-msgid "target '%s' already exists"
-msgstr "el destí «%s» ja existeix"
-
-#: builtin/worktree.c:820
+#: builtin/worktree.c:897
#, 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:822
+#: builtin/worktree.c:899
#, 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:825
+#: builtin/worktree.c:902
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "la validació ha fallat, no es pot moure l'arbre de treball: %s"
-#: builtin/worktree.c:830
+#: builtin/worktree.c:907
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "s'ha produït un error en moure «%s» a «%s»"
-#: builtin/worktree.c:878
+#: builtin/worktree.c:953
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "no s'ha pogut executar «git status» a «%s»"
-#: builtin/worktree.c:882
-#, c-format
+#: builtin/worktree.c:957
+#, 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:887
+#: builtin/worktree.c:962
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "no s'ha pogut executar «git status» a «%s», codi %d"
-#: builtin/worktree.c:910
+#: builtin/worktree.c:985
msgid "force removal even if worktree is dirty or locked"
-msgstr "força la supressió encara que l'arbre de treball estigui brut o bloquejat"
+msgstr ""
+"força l'eliminació encara que l'arbre de treball estigui brut o bloquejat"
-#: builtin/worktree.c:933
+#: builtin/worktree.c:1008
#, 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:935
+#: builtin/worktree.c:1010
#, 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:938
-#, c-format
+#: builtin/worktree.c:1013
+#, 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:1037
+#, fuzzy, c-format
+msgid "repair: %s: %s"
+msgstr "%s no vàlid: «%s»"
+
+#: builtin/worktree.c:1040
+#, 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>/]"
@@ -21652,47 +23554,34 @@
msgid "only useful for debugging"
msgstr "només útil per a la depuració"
-#: fast-import.c:3125
-#, c-format
-msgid "Expected 'mark' command, got %s"
-msgstr "S'esperava l'ordre «mark», s'ha rebut %s"
+#: http-fetch.c:114
+#, fuzzy, c-format
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr "l'argument a --packfile ha de ser un hash vàlid (té '%')"
-#: fast-import.c:3130
-#, c-format
-msgid "Expected 'to' command, got %s"
-msgstr "S'esperava l'ordre «to», s'ha rebut «%s»"
+#: http-fetch.c:122
+#, fuzzy
+msgid "not a git repository"
+msgstr "No és un dipòsit de git"
-#: fast-import.c:3254
-#, c-format
-msgid "feature '%s' forbidden in input without --allow-unsafe-features"
-msgstr ""
+#: t/helper/test-fast-rebase.c:141
+#, fuzzy
+msgid "unhandled options"
+msgstr "make_script: opcions no gestionades"
-#: credential-cache--daemon.c:223
-#, c-format
-msgid ""
-"The permissions on your socket directory are too loose; other\n"
-"users may be able to read your cached credentials. Consider running:\n"
-"\n"
-"\tchmod 0700 %s"
-msgstr ""
-"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"
+#: t/helper/test-fast-rebase.c:146
+#, fuzzy
+msgid "error preparing revisions"
+msgstr "make_script: s'ha produït un error en preparar les revisions"
-#: credential-cache--daemon.c:272
-msgid "print debugging messages to stderr"
-msgstr "imprimeix els missatges de depuració a stderr"
-
-#: 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
msgid "test-tool serve-v2 [<options>]"
@@ -21702,17 +23591,20 @@
msgid "exit immediately after advertising capabilities"
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"
-" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
-"bare]\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 <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"
@@ -21721,89 +23613,91 @@
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
+#: git.c:229
#, c-format
msgid "no prefix given for --super-prefix\n"
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:376
-#, c-format
+#: git.c:380
+#, fuzzy, c-format
msgid "empty alias for %s"
-msgstr ""
+msgstr "àlies buit per a percentatges"
-#: git.c:379
+#: git.c:383
#, c-format
msgid "recursive alias: %s"
msgstr "àlies recursiu: %s"
-#: git.c:459
+#: git.c:465
msgid "write failure on standard output"
msgstr "fallada d'escriptura en la sortida estàndard"
-#: git.c:461
+#: git.c:467
msgid "unknown write failure on standard output"
msgstr "fallada d'escriptura desconeguda en la sortida estàndard"
-#: git.c:463
+#: git.c:469
msgid "close failed on standard output"
msgstr "ha fallat el tancament en la sortida estàndard"
-#: git.c:793
-#, c-format
+#: git.c:820
+#, 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:843
+#: git.c:870
#, 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:856
+#: git.c:883
#, c-format
msgid ""
"usage: %s\n"
@@ -21812,55 +23706,57 @@
"ús: %s\n"
"\n"
-#: git.c:876
-#, c-format
+#: git.c:903
+#, 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:888
+#: git.c:915
#, 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:1086
-#, 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:1093
-#, 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:1097
+#: 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:1966
+#: http.c:2025
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -21871,126 +23767,169 @@
" petició: %s\n"
" redirecció: %s"
-#: remote-curl.c:166
+#: remote-curl.c:183
#, 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:263
+#: remote-curl.c:307
#, 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:364
+#: remote-curl.c:408
#, 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:395
+#: remote-curl.c:439
#, 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:455
+#: remote-curl.c:499
#, c-format
msgid "repository '%s' not found"
msgstr "no s'ha trobat el dipòsit «%s»"
-#: remote-curl.c:459
+#: remote-curl.c:503
#, c-format
msgid "Authentication failed for '%s'"
msgstr "S'ha produït un error en autenticar per «%s»"
-#: remote-curl.c:463
+#: remote-curl.c:507
#, c-format
msgid "unable to access '%s': %s"
msgstr "no s'ha pogut accedir a «%s»: %s"
-#: remote-curl.c:469
+#: remote-curl.c:513
#, c-format
msgid "redirecting to %s"
msgstr "s'està redirigint a %s"
-#: remote-curl.c:593
+#: remote-curl.c:642
+#, fuzzy
msgid "shouldn't have EOF when not gentle on EOF"
-msgstr ""
+msgstr "No hauria de tenir EOF quan no sigui suau al EOF"
-#: remote-curl.c:673
+#: remote-curl.c:654
+msgid "remote server sent stateless separator"
+msgstr "el servidor remot ha enviat un separador sense estat"
+
+#: remote-curl.c:724
+#, 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:733
+#: remote-curl.c:754
#, fuzzy, c-format
-msgid "RPC failed; %s"
-msgstr "STARTTLS ha fallat! %s"
+msgid "remote-curl: bad line length character: %.4s"
+msgstr "error de protocol: caràcter de longitud de línia erroni: %.4s"
-#: remote-curl.c:773
+#: remote-curl.c:756
+#, fuzzy
+msgid "remote-curl: unexpected response end packet"
+msgstr "paquet final de resposta inesperat del remot"
+
+#: remote-curl.c:832
+#, c-format
+msgid "RPC failed; %s"
+msgstr "RPC ha fallat; %s"
+
+#: remote-curl.c:872
#, 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:888
-#, c-format
+#: remote-curl.c:987
+#, fuzzy, c-format
msgid "cannot deflate request; zlib deflate error %d"
-msgstr ""
+msgstr "no es pot desinflar la sol·licitud; zlib deflate error%d"
-#: remote-curl.c:892
-#, c-format
+#: remote-curl.c:991
+#, fuzzy, c-format
msgid "cannot deflate request; zlib end error %d"
-msgstr ""
+msgstr "no es pot desinflar la sol·licitud; error final zlib percentatged"
-#: remote-curl.c:1023
+#: remote-curl.c:1041
+#, fuzzy, c-format
+msgid "%d bytes of length header were received"
+msgstr "s'han rebut bytes percentuals de la capçalera de longitud"
+
+#: remote-curl.c:1043
+#, fuzzy, c-format
+msgid "%d bytes of body are still expected"
+msgstr "encara s'esperen bytes de cos per cent"
+
+#: remote-curl.c:1132
#, 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:1037
+#: remote-curl.c:1147
#, fuzzy
msgid "fetch failed."
-msgstr "l'«stash» ha fallat"
+msgstr "el fetch ha fallat."
-#: remote-curl.c:1085
+#: remote-curl.c:1193
+#, 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:1129 remote-curl.c:1135
+#: remote-curl.c:1237 remote-curl.c:1243
#, 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:1147 remote-curl.c:1261
+#: remote-curl.c:1255 remote-curl.c:1373
#, 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:1183
+#: remote-curl.c:1291
#, fuzzy
msgid "git-http-push failed"
-msgstr "l'«stash» ha fallat"
+msgstr "git-http-push ha fallat"
-#: remote-curl.c:1367
+#: remote-curl.c:1479
+#, fuzzy
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
-msgstr ""
+msgstr "ús remot de curl git remote-curl <remote> [<url>]"
-#: remote-curl.c:1399
+#: remote-curl.c:1511
+#, 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:1406
+#: remote-curl.c:1518
+#, 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:1446
-#, c-format
+#: remote-curl.c:1559
+#, fuzzy, c-format
msgid "remote-curl: unknown command '%s' from git"
-msgstr ""
+msgstr "comandament desconegut «%s» del git"
-#: list-objects-filter-options.h:85
+#: compat/compiler.h:26
+#, fuzzy
+msgid "no compiler information available\n"
+msgstr "no hi ha informació disponible del compilador"
+
+#: 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:86
+#: list-objects-filter-options.h:92
msgid "object filtering"
msgstr "filtratge d'objecte"
@@ -22011,7 +23950,8 @@
msgstr "sigues més discret"
#: parse-options.h:317
-msgid "use <n> digits to display SHA-1s"
+#, fuzzy
+msgid "use <n> digits to display object names"
msgstr "usa <n> xifres per presentar els SHA-1"
#: parse-options.h:336
@@ -22021,32 +23961,35 @@
#: parse-options.h:337
#, fuzzy
msgid "read pathspec from file"
-msgstr "llegeix els patrons des d'un fitxer"
+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 "els camins se separen amb el caràcter NUL"
+"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:101
+#: 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:67
+#: wt-status.h:80
msgid "HEAD detached at "
msgstr "HEAD separat a "
-#: wt-status.h:68
+#: wt-status.h:81
msgid "HEAD detached from "
msgstr "HEAD separat de "
@@ -22089,724 +24032,748 @@
msgstr "Llista, crea o suprimeix branques"
#: command-list.h:59
-msgid "Move objects and refs by archive"
-msgstr ""
+#, fuzzy
+msgid "Collect information for user to file a bug report"
+msgstr "Recopila la informació per a l'usuari per enviar un informe d'error"
#: command-list.h:60
-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"
+#, 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: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
-msgid "Remove untracked files from the working tree"
-msgstr "Suprimeix els fitxers no seguits de l'arbre de treball"
-
#: command-list.h:71
+msgid "Remove untracked files from the working tree"
+msgstr "Elimina els fitxers no seguits de l'arbre de treball"
+
+#: 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
-msgid "Count unpacked number of objects and their disk consumption"
-msgstr ""
-
#: command-list.h:78
-msgid "Retrieve and store user credentials"
-msgstr ""
+#, fuzzy
+msgid "Count unpacked number of objects and their disk consumption"
+msgstr "Compta el nombre d'objectes desempaquetats i el seu consum de disc"
#: command-list.h:79
-msgid "Helper to temporarily store passwords in memory"
-msgstr ""
+#, fuzzy
+msgid "Retrieve and store user credentials"
+msgstr "Recupera i desa les credencials d'usuari"
#: command-list.h:80
+#, fuzzy
+msgid "Helper to temporarily store passwords in memory"
+msgstr "Ajudant per emmagatzemar temporalment les contrasenyes a la memòria"
+
+#: command-list.h:81
msgid "Helper to store credentials on disk"
msgstr "Ajudant per a emmagatzemar credencials a disc"
-#: command-list.h:81
-msgid "Export a single commit to a CVS checkout"
-msgstr ""
-
#: command-list.h:82
-msgid "Salvage your data out of another SCM people love to hate"
-msgstr ""
+#, fuzzy
+msgid "Export a single commit to a CVS checkout"
+msgstr "Exporta una sola entrega a una versió de CVS"
#: command-list.h:83
+#, fuzzy
+msgid "Salvage your data out of another SCM people love to hate"
+msgstr "Estalvia les teves dades d'una altra gent de SCM que li agrada odiar"
+
+#: 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"
+"Dona 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"
-#: 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
+#, fuzzy
+msgid "Run a Git command on a list of repositories"
+msgstr "executa les tasques basades en l'estat del dipòsit"
+
+#: command-list.h:100
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:101
msgid "Verifies the connectivity and validity of the objects in the database"
msgstr "Verifica la connectivitat i validesa dels objectes a la base de dades"
-#: command-list.h:100
+#: command-list.h:102
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:103
+#, 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:104
msgid "Print lines matching a pattern"
msgstr "Imprimeix les línies coincidents amb un patró"
-#: command-list.h:103
+#: command-list.h:105
msgid "A portable graphical interface to Git"
msgstr "Una interfície gràfic portable per al Git"
-#: command-list.h:104
+#: command-list.h:106
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:107
msgid "Display help information about Git"
msgstr "Mostra informació d'ajuda del Git"
-#: command-list.h:106
+#: command-list.h:108
msgid "Server side implementation of Git over HTTP"
-msgstr ""
+msgstr "Implementació al servidor del Git sobre HTTP"
-#: command-list.h:107
+#: command-list.h:109
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:110
#, fuzzy
msgid "Push objects over HTTP/DAV to another repository"
-msgstr "Baixa objectes i referències d'un altre dipòsit"
-
-#: command-list.h:109
-msgid "Send a collection of patches from stdin to an IMAP folder"
-msgstr ""
-
-#: command-list.h:110
-msgid "Build pack index file for an existing packed archive"
-msgstr ""
+msgstr "Empeny objectes sobre HTTP/DAV a un altre dipòsit"
#: command-list.h:111
+#, 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:112
+#, 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:113
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
-msgid "Instantly browse your working repository in gitweb"
-msgstr ""
-
-#: command-list.h:113
-msgid "Add or parse structured information in commit messages"
-msgstr ""
-
#: command-list.h:114
+#, fuzzy
+msgid "Instantly browse your working repository in gitweb"
+msgstr "Navegueu instantàniament pel vostre dipòsit de treball a gitweb"
+
+#: command-list.h:115
+#, fuzzy
+msgid "Add or parse structured information in commit messages"
+msgstr "Afegir o analitzar informació estructurada en missatges de publicació"
+
+#: command-list.h:116
msgid "The Git repository browser"
msgstr "El navegador de dipòsits Git"
-#: command-list.h:115
+#: command-list.h:117
msgid "Show commit logs"
msgstr "Mostra els registres de comissió"
-#: command-list.h:116
+#: command-list.h:118
msgid "Show information about files in the index and the working tree"
msgstr "Mostra informació sobre els fitxers a l'índex i a l'arbre de treball"
-#: command-list.h:117
+#: command-list.h:119
msgid "List references in a remote repository"
msgstr "Mostra les referències d'un dipòsit remot"
-#: command-list.h:118
+#: command-list.h:120
msgid "List the contents of a tree object"
msgstr "Mostra els continguts d'un objecte de l'arbre"
-#: command-list.h:119
-msgid "Extracts patch and authorship from a single e-mail message"
-msgstr ""
-
-#: command-list.h:120
-msgid "Simple UNIX mbox splitter program"
-msgstr ""
-
#: command-list.h:121
-msgid "Join two or more development histories together"
-msgstr "Uneix dues o més històries de desenvolupament"
+#, fuzzy
+msgid "Extracts patch and authorship from a single e-mail message"
+msgstr "Extreu pedaç i autoria d'un sol missatge de correu electrònic"
#: command-list.h:122
#, fuzzy
-msgid "Find as good common ancestors as possible for a merge"
-msgstr "troba els avantpassats per a una sola fusió d'n vies"
+msgid "Simple UNIX mbox splitter program"
+msgstr "Programa de divisor mbox simple per a UNIX"
#: command-list.h:123
#, fuzzy
-msgid "Run a three-way file merge"
-msgstr "S'està retrocedint a una fusió de 3 vies...\n"
+msgid "Run tasks to optimize Git repository data"
+msgstr "Executa les tasques per optimitzar les dades del dipòsit Git"
#: command-list.h:124
-#, fuzzy
-msgid "Run a merge for files needing merging"
-msgstr "fusió de 3 vies si no cal fusió a nivell de fitxers"
+msgid "Join two or more development histories together"
+msgstr "Uneix dues o més històries de desenvolupament"
#: command-list.h:125
-msgid "The standard helper program to use with git-merge-index"
-msgstr ""
+#, fuzzy
+msgid "Find as good common ancestors as possible for a merge"
+msgstr "Troba els millors avantpassats comuns possibles per a una fusió"
#: command-list.h:126
-msgid "Run merge conflict resolution tools to resolve merge conflicts"
-msgstr ""
-"Executa eines de resolució de conflictes per a resoldre conflictes de fussió"
+#, fuzzy
+msgid "Run a three-way file merge"
+msgstr "Executa una fusió de fitxers de tres vies"
#: command-list.h:127
-msgid "Show three-way merge without touching index"
-msgstr ""
+#, fuzzy
+msgid "Run a merge for files needing merging"
+msgstr "Executa una fusió per als fitxers que cal fusionar"
#: command-list.h:128
-msgid "Write and verify multi-pack-indexes"
-msgstr ""
+#, fuzzy
+msgid "The standard helper program to use with git-merge-index"
+msgstr "El programa d'ajuda estàndard a utilitzar amb git-merge-index"
#: command-list.h:129
+msgid "Run merge conflict resolution tools to resolve merge conflicts"
+msgstr ""
+"Executa eines de resolució de conflictes per a resoldre conflictes de fusió"
+
+#: command-list.h:130
+#, fuzzy
+msgid "Show three-way merge without touching index"
+msgstr "Mostra la fusió de tres vies sense l'índex tàctil"
+
+#: command-list.h:131
+#, fuzzy
+msgid "Write and verify multi-pack-indexes"
+msgstr "Escriu i verifica els multi-índexs"
+
+#: command-list.h:132
msgid "Creates a tag object"
msgstr "Crea un objecte etiqueta"
-#: command-list.h:130
+#: command-list.h:133
+#, 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:134
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:135
+#, 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:136
msgid "Add or inspect object notes"
msgstr "Afegeix o inspecciona notes de l'objecte"
-#: command-list.h:134
+#: command-list.h:137
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:138
msgid "Create a packed archive of objects"
msgstr "Crea un arxiu empaquetat d'objectes"
-#: command-list.h:136
+#: command-list.h:139
msgid "Find redundant pack files"
msgstr "Troba fitxers empaquetats redundants"
-#: command-list.h:137
+#: command-list.h:140
+#, 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
-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 "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
-#, fuzzy
-msgid "Applies a quilt patchset onto the current branch"
-msgstr "No hi ha cap font per defecte definida per a la branca actual."
-
-#: command-list.h:145
-msgid "Compare two commit ranges (e.g. two versions of a branch)"
-msgstr ""
-
#: command-list.h:146
#, fuzzy
-msgid "Reads tree information into the index"
-msgstr "actualitza la informació d'estadístiques en el fitxer d'índex"
+msgid "Applies a quilt patchset onto the current branch"
+msgstr "Aplica un conjunt de pedaços cobert a la branca actual"
#: 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:148
+msgid "Reads tree information into the index"
+msgstr "Llegeix la informació de l'arbre a l'índex"
+
+#: 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
-#, fuzzy
-msgid "Receive what is pushed into the repository"
-msgstr "Registra els canvis al dipòsit"
-
-#: command-list.h:149
-#, fuzzy
-msgid "Manage reflog information"
-msgstr "mostra la informació de resolució de desfet"
-
#: command-list.h:150
#, fuzzy
-msgid "Manage set of tracked repositories"
-msgstr "Registra els canvis al dipòsit"
+msgid "Receive what is pushed into the repository"
+msgstr "Rep el que s'envia al repositori"
#: command-list.h:151
-#, fuzzy
-msgid "Pack unpacked objects in a repository"
-msgstr "--cached fora d'un dipòsit"
+msgid "Manage reflog information"
+msgstr "Gestiona la informació del registre de referències"
#: command-list.h:152
-#, fuzzy
-msgid "Create, list, delete refs to replace objects"
-msgstr ""
-"Crea, llista, suprimeix o verifica un objecte d'etiqueta signat amb GPG"
+msgid "Manage set of tracked repositories"
+msgstr "Gestiona el conjunt de dipòsits seguits"
#: command-list.h:153
-msgid "Generates a summary of pending changes"
-msgstr ""
+msgid "Pack unpacked objects in a repository"
+msgstr "Empaqueta els objectes desempaquetats en un dipòsit"
#: command-list.h:154
-msgid "Reuse recorded resolution of conflicted merges"
-msgstr ""
+#, fuzzy
+msgid "Create, list, delete refs to replace objects"
+msgstr "Crea una llista suprimeix les referències per substituir els objectes"
#: command-list.h:155
+msgid "Generates a summary of pending changes"
+msgstr "Genera un resum dels canvis pendents"
+
+#: command-list.h:156
+msgid "Reuse recorded resolution of conflicted merges"
+msgstr "Reutilitza la resolució registrada dels conflictes de fusió"
+
+#: 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·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
-msgid "Restricted login shell for Git-only SSH access"
-msgstr ""
-
-#: command-list.h:164
-msgid "Summarize 'git log' output"
-msgstr ""
-
#: command-list.h:165
+msgid "Restricted login shell for Git-only SSH access"
+msgstr "Intèrpret d'ordres d'entrada restringit només per a accés SSH al Git"
+
+#: command-list.h:166
+msgid "Summarize 'git log' output"
+msgstr "Resumeix la sortida «git log»"
+
+#: 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
-msgid "Initialize and modify the sparse-checkout"
-msgstr ""
-
-#: command-list.h:172
-#, fuzzy
-msgid "Stash the changes in a dirty working directory away"
-msgstr "%s: ja existeix en el directori de treball"
-
#: command-list.h:173
#, fuzzy
-msgid "Add file contents to the staging area"
-msgstr "Afegeix els continguts dels fitxers a l'índex"
+msgid "Initialize and modify the sparse-checkout"
+msgstr "Inicialitza i modifica la comprovació «sparse»"
#: 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 el contingut del fitxer a l'àrea de «staging»"
+
+#: command-list.h:176
msgid "Show the working tree status"
msgstr "Mostra l'estat de l'arbre de treball"
-#: command-list.h:175
+#: 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:176
+#: command-list.h:178
msgid "Initialize, update or inspect submodules"
msgstr "Inicialitza, actualitza o inspecciona submòduls"
-#: command-list.h:177
+#: 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:178
+#: command-list.h:180
msgid "Switch branches"
msgstr "Commuta branques"
-#: command-list.h:179
+#: command-list.h:181
msgid "Read, modify and delete symbolic refs"
msgstr "Llegeix, modifica i suprimeix referències simbòliques"
-#: command-list.h:180
+#: 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:181
+#: 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:182
+#: command-list.h:184
msgid "Unpack objects from a packed archive"
msgstr "Desempaqueta objectes d'un arxiu empaquetat"
-#: command-list.h:183
+#: 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:184
+#: 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:185
+#: 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:186
+#: command-list.h:188
msgid "Send archive back to git-archive"
msgstr "Envia l'arxiu de tornada al git-archive"
-#: command-list.h:187
+#: 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:188
+#: command-list.h:190
msgid "Show a Git logical variable"
msgstr "Mostra una variable lògica del Git"
-#: command-list.h:189
+#: command-list.h:191
msgid "Check the GPG signature of commits"
msgstr "Verifica la signatura GPG de les comissions"
-#: command-list.h:190
+#: command-list.h:192
msgid "Validate packed Git archive files"
msgstr "Valida els fitxers d'arxius Git empaquetats"
-#: command-list.h:191
+#: command-list.h:193
msgid "Check the GPG signature of tags"
msgstr "Verifica la signatura GPG de les etiquetes"
-#: command-list.h:192
+#: 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:193
+#: 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:194
+#: command-list.h:196
msgid "Manage multiple working trees"
msgstr "Gestiona múltiples arbres de treball"
-#: command-list.h:195
+#: 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:196
+#: command-list.h:198
msgid "Defining attributes per path"
msgstr "La definició d'atributs per camí"
-#: command-list.h:197
+#: 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:198
+#: command-list.h:200
msgid "A Git core tutorial for developers"
msgstr "Un tutorial bàsic del Git per a desenvolupadors"
-#: command-list.h:199
+#: command-list.h:201
+msgid "Providing usernames and passwords to Git"
+msgstr "Proporcionar noms d'usuari i contrasenyes a Git"
+
+#: command-list.h:202
msgid "Git for CVS users"
msgstr "Git per a usuaris del CVS"
-#: command-list.h:200
-#, 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:201
+#: 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:202
+#: command-list.h:205
+msgid "Frequently asked questions about using Git"
+msgstr "Preguntes freqüents sobre l'ús del Git"
+
+#: command-list.h:206
msgid "A Git Glossary"
msgstr "Un glossari de Git"
-#: command-list.h:203
+#: command-list.h:207
msgid "Hooks used by Git"
msgstr "Lligams utilitzats pel Git"
-#: command-list.h:204
+#: command-list.h:208
msgid "Specifies intentionally untracked files to ignore"
msgstr "Especifica els fitxers intencionalment no seguits a ignorar"
-#: command-list.h:205
+#: command-list.h:209
msgid "Defining submodule properties"
msgstr "La definició de les propietats de submòduls"
-#: command-list.h:206
+#: command-list.h:210
msgid "Git namespaces"
msgstr "Espais de noms del Git"
-#: command-list.h:207
+#: command-list.h:211
+msgid "Helper programs to interact with remote repositories"
+msgstr "Programes d'ajuda per a interactuar amb dipòsits remots"
+
+#: command-list.h:212
msgid "Git Repository Layout"
msgstr "Disposició del dipòsit del Git"
-#: command-list.h:208
+#: command-list.h:213
msgid "Specifying revisions and ranges for Git"
msgstr "L'especificació de revisions i rangs per al Git"
-#: command-list.h:209
+#: command-list.h:214
msgid "Mounting one repository inside another"
-msgstr ""
+msgstr "Muntant un dipòsit dins un altre"
-#: command-list.h:210
+#: command-list.h:215
msgid "A tutorial introduction to Git: part two"
msgstr "Un tutorial d'introducció al Git: segona part"
-#: command-list.h:211
+#: command-list.h:216
msgid "A tutorial introduction to Git"
msgstr "Un tutorial d'introducció al Git"
-#: command-list.h:212
+#: 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:48
#, sh-format
msgid "Bad rev input: $arg"
msgstr "Introducció de revisió errònia: $arg"
-#: git-bisect.sh:121
-#, sh-format
-msgid "Bad rev input: $bisected_head"
-msgstr "Entrada de revisió errònia: $bisected_head"
-
-#: git-bisect.sh:130
-#, sh-format
-msgid "Bad rev input: $rev"
-msgstr "Introducció de revisió errònia: $rev"
-
-#: git-bisect.sh:139
-#, sh-format
-msgid "'git bisect $TERM_BAD' can take only one argument."
-msgstr "'git bisect $TERM_BAD' pot acceptar només un paràmetre."
-
-#: git-bisect.sh:209
+#: git-bisect.sh:82
msgid "No logfile given"
msgstr "Cap fitxer de registre donat"
-#: git-bisect.sh:210
+#: git-bisect.sh:83
#, sh-format
msgid "cannot read $file for replaying"
msgstr "no es pot llegir $file per a reproducció"
-#: git-bisect.sh:232
+#: git-bisect.sh:105
msgid "?? what are you talking about?"
msgstr "?? de què parleu?"
-#: git-bisect.sh:241
+#: git-bisect.sh:115
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:120
#, sh-format
msgid "running $command"
msgstr "s'està executant $command"
-#: git-bisect.sh:253
+#: git-bisect.sh:127
#, 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:152
msgid "bisect run cannot continue any more"
msgstr "el pas de bisecció no pot continuar més"
-#: git-bisect.sh:285
-#, sh-format
+#: git-bisect.sh:158
+#, fuzzy, sh-format
msgid ""
"bisect run failed:\n"
-"'bisect_state $state' exited with error code $res"
+"'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:165
msgid "bisect run success"
msgstr "pas de bisecció reeixit"
-#: git-bisect.sh:300
+#: git-bisect.sh:173
msgid "We are not bisecting."
msgstr "No estem bisecant."
@@ -22815,8 +24782,8 @@
"Error: Your local changes to the following files would be overwritten by "
"merge"
msgstr ""
-"Error: Els vostres canvis locals als fitxers següents se sobreescriurien per "
-"fusionar"
+"Error: Els vostres canvis locals als fitxers següents se sobreescriurien per"
+" fusionar"
#: git-merge-octopus.sh:61
msgid "Automated merge did not work."
@@ -22851,200 +24818,103 @@
msgstr ""
"La fusió simple no ha funcionat, s'està intentant una fusió automàtica."
-#: git-legacy-stash.sh:221
-msgid "Cannot remove temporary index (can't happen)"
-msgstr "No es pot eliminar l'índex temporal (això no pot passar)"
-
-#: git-legacy-stash.sh:272
-#, sh-format
-msgid "Cannot update $ref_stash with $w_commit"
-msgstr "No es pot actualitzar $ref_stash amb $w_commit"
-
-#: git-legacy-stash.sh:324
-#, sh-format
-msgid "error: unknown option for 'stash push': $option"
-msgstr ""
-
-#: git-legacy-stash.sh:356
-#, sh-format
-msgid "Saved working directory and index state $stash_msg"
-msgstr "S'han desat el directori de treball i l'estat d'índex $stash_msg"
-
-#: git-legacy-stash.sh:536
-#, sh-format
-msgid "unknown option: $opt"
-msgstr "opció desconeguda: $opt"
-
-#: git-legacy-stash.sh:556
-#, sh-format
-msgid "Too many revisions specified: $REV"
-msgstr "S'han especificat massa revisions: $REV"
-
-#: git-legacy-stash.sh:571
-#, sh-format
-msgid "$reference is not a valid reference"
-msgstr "$reference no és una referència vàlida"
-
-#: git-legacy-stash.sh:599
-#, sh-format
-msgid "'$args' is not a stash-like commit"
-msgstr "'$args' no és una comissió de tipus magatzem"
-
-#: git-legacy-stash.sh:610
-#, sh-format
-msgid "'$args' is not a stash reference"
-msgstr "'$args' no és una referència de magatzem"
-
-#: git-legacy-stash.sh:618
-msgid "unable to refresh index"
-msgstr "no s'ha pogut actualitzar l'índex"
-
-#: git-legacy-stash.sh:622
-msgid "Cannot apply a stash in the middle of a merge"
-msgstr "No es pot aplicar un magatzem enmig d'una fusió"
-
-#: git-legacy-stash.sh:630
-msgid "Conflicts in index. Try without --index."
-msgstr "Hi ha conflictes en l'índex. Proveu-ho sense --index."
-
-#: git-legacy-stash.sh:632
-msgid "Could not save index tree"
-msgstr "No s'ha pogut desar l'arbre d'índex"
-
-#: git-legacy-stash.sh:641
-msgid "Could not restore untracked files from stash entry"
-msgstr "No s'han pogut restaurar els fitxers no seguits des del «stash»"
-
-#: git-legacy-stash.sh:666
-msgid "Cannot unstage modified files"
-msgstr "No es pot fer «unstage» dels fitxers modificats"
-
-#: git-legacy-stash.sh:704
-#, sh-format
-msgid "Dropped ${REV} ($s)"
-msgstr "${REV} ($s) descartada"
-
-#: git-legacy-stash.sh:705
-#, sh-format
-msgid "${REV}: Could not drop stash entry"
-msgstr "${REV}: No s'ha pogut descartar l'entrada de magatzem"
-
-#: git-legacy-stash.sh:792
-msgid "(To restore them type \"git stash apply\")"
-msgstr "(Per restaurar-les teclegeu \"git stash apply\")"
-
-#: git-submodule.sh:202
+#: git-submodule.sh:179
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"El camí relatiu només es pot usar des del nivell superior de l'arbre de "
"treball"
-#: git-submodule.sh:212
+#: git-submodule.sh:189
#, 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:231
+#: git-submodule.sh:208
#, 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:234
+#: git-submodule.sh:211
#, 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"
+msgstr "«$sm_path» ja existeix en l'índex i no és submòdul"
-#: git-submodule.sh:241
-#, fuzzy, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr "el camí «%s» no té la seva versió"
-
-#: git-submodule.sh:247
+#: git-submodule.sh: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 ""
-"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:270
+#: git-submodule.sh:249
#, 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:272
+#: git-submodule.sh:251
#, 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:280
+#: git-submodule.sh:259
#, 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:282
+#: git-submodule.sh:261
#, 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."
+"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 ""
"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 "
-"correcte\n"
-"o no esteu segur de què vol dir això, trieu un altre nom amb l'opció '--"
-"name'."
+"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»."
-#: git-submodule.sh:288
+#: git-submodule.sh:267
#, 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:300
+#: git-submodule.sh:279
#, 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:305
+#: git-submodule.sh:284
#, 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:314
+#: git-submodule.sh:293
#, 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:580
+#: git-submodule.sh:568
#, 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:590
+#: git-submodule.sh:578
#, 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:595
+#: git-submodule.sh:583
#, 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:613
+#: git-submodule.sh:601
#, sh-format
msgid ""
"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
@@ -23053,94 +24923,65 @@
"No s'ha pogut obtenir en el camí de submòdul «$displaypath»; s'està "
"intentant obtenir directament $sha1:"
-#: git-submodule.sh:619
+#: git-submodule.sh:607
#, 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. "
-"L'obtenció directa d'aquella comissió ha fallat."
+"S'ha obtingut en el camí de submòdul «$displaypath», però no contenia $sha1."
+" L'obtenció directa d'aquella comissió ha fallat."
-#: git-submodule.sh:626
+#: git-submodule.sh:614
#, 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»"
-#: git-submodule.sh:627
+#: git-submodule.sh:615
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Camí de submòdul «$displaypath»: s'ha agafat «$sha1»"
-#: git-submodule.sh:631
+#: git-submodule.sh:619
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
-"No s'ha pogut fer «rebase» «$sha1»' en el camí de submòdul «$displaypath»"
+"No s'ha pogut fer «rebase» «$sha1» en el camí de submòdul «$displaypath»"
-#: git-submodule.sh:632
+#: git-submodule.sh:620
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Camí de submòdul «$displaypath»: s'ha fet «rebase» en «$sha1»"
-#: git-submodule.sh:637
+#: git-submodule.sh:625
#, 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»"
-#: git-submodule.sh:638
+#: git-submodule.sh:626
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Camí de submòdul «$displaypath»: s'ha fusionat en «$sha1»"
-#: git-submodule.sh:643
+#: git-submodule.sh:631
#, 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»"
-#: git-submodule.sh:644
+#: git-submodule.sh:632
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Camí de submòdul «$displaypath»: «$command $sha1»"
-#: git-submodule.sh:675
+#: git-submodule.sh:663
#, 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 "
+"S'ha produït un error en recórrer recursivament dins del camí de submòdul "
"«$displaypath»"
-#: git-submodule.sh:886
-msgid "The --cached option cannot be used with the --files option"
-msgstr "L'opció --cached no es pot usar amb l'opció --files"
-
-#: git-submodule.sh:938
-#, sh-format
-msgid "unexpected mode $mod_dst"
-msgstr "mode inesperat $mod_dst"
-
-#: git-submodule.sh:958
-#, sh-format
-msgid " Warn: $display_name doesn't contain commit $sha1_src"
-msgstr " Avís: $display_name no conté la comissió $sha1_src"
-
-#: git-submodule.sh:961
-#, sh-format
-msgid " Warn: $display_name doesn't contain commit $sha1_dst"
-msgstr " Avís: $display_name no conté la comissió $sha1_dst"
-
-#: git-submodule.sh:964
-#, 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"
-
-#: git-parse-remote.sh:89
-#, sh-format
-msgid "See git-${cmd}(1) for details."
-msgstr "Vegeu git-${cmd}(1) per detalls."
-
#: git-rebase--preserve-merges.sh:109
msgid "Applied autostash."
msgstr "S'ha aplicat l'«autostash»."
@@ -23150,13 +24991,22 @@
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"
@@ -23181,16 +25031,20 @@
" p, pick <comissió> = usa la comissió\n"
" r, reword <comissió> = usa la comissió, però edita el missatge de comissió\n"
" e, edit <comissió> = usa la comissió, però atura't per a esmenar\n"
-" s, squash <comissió> = usa la comissió, però fusiona'l a la comissió prèvia\n"
-" f, fixup <comissió> = com \"squash\", però descarta el missatge de registre d'aquesta "
-"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"
+" 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"
@@ -23209,123 +25063,121 @@
"\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"
"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"
+"failed. If the pre-commit hook failed, you may need to resolve the issue before\n"
"you are able to reword the commit."
msgstr ""
-"No s'ha pogut esmenar la comissió després d'escollir amb èxit $sha1... "
-"$rest\n"
+"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"
@@ -23336,7 +25188,7 @@
"\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"
@@ -23351,25 +25203,25 @@
"\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"
@@ -23400,13 +25252,13 @@
"\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."
@@ -23414,40 +25266,44 @@
"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] "Fes «rebase» $shortrevisions sobre $shortonto ($todocount ordre)"
msgstr[1] "Fes «rebase» $shortrevisions sobre $shortonto ($todocount ordres)"
-#: 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 "Tingueu en compte que les comissions buides estan comentades"
+
+#: 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"
@@ -23518,14 +25374,14 @@
msgid "%12s %12s %s"
msgstr "%12s %12s %s"
-#: git-add--interactive.perl:634
+#: git-add--interactive.perl:632
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] "modificat %d camí\n"
msgstr[1] "modificat %d camins\n"
-#: git-add--interactive.perl:1053
+#: git-add--interactive.perl:1056
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
@@ -23533,7 +25389,7 @@
"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
"per «staging»."
-#: git-add--interactive.perl:1056
+#: git-add--interactive.perl:1059
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
@@ -23541,7 +25397,7 @@
"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
"per «stashing»."
-#: git-add--interactive.perl:1059
+#: git-add--interactive.perl:1062
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
@@ -23549,8 +25405,8 @@
"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
"per «unstaging»."
-#: git-add--interactive.perl:1062 git-add--interactive.perl:1071
-#: git-add--interactive.perl:1077
+#: git-add--interactive.perl:1065 git-add--interactive.perl:1074
+#: git-add--interactive.perl:1080
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
@@ -23558,8 +25414,8 @@
"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
"per aplicar-se."
-#: git-add--interactive.perl:1065 git-add--interactive.perl:1068
-#: git-add--interactive.perl:1074
+#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
+#: git-add--interactive.perl:1077
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
@@ -23567,12 +25423,12 @@
"Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
"per descartar-se."
-#: git-add--interactive.perl:1111
+#: git-add--interactive.perl:1114
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr "s'ha produït un error en escriure al fitxer d'edició del tros: %s"
-#: git-add--interactive.perl:1118
+#: git-add--interactive.perl:1121
#, perl-format
msgid ""
"---\n"
@@ -23581,16 +25437,16 @@
"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"
+"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:1140
+#: git-add--interactive.perl:1143
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr "s'ha produït un error en llegir al fitxer d'edició del tros: %s"
-#: git-add--interactive.perl:1248
+#: git-add--interactive.perl:1251
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -23604,7 +25460,7 @@
"a - fes «stage» d'aquest tros i tota la resta de trossos del fitxer\n"
"d - no facis «stage» d'aquest tros o de cap altre restant del fitxer"
-#: git-add--interactive.perl:1254
+#: git-add--interactive.perl:1257
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -23618,7 +25474,7 @@
"a - fes «stash» d'aquest tros i tota la resta de trossos del fitxer\n"
"d - no facis «stash» d'aquest tros o de cap altre restant del fitxer"
-#: git-add--interactive.perl:1260
+#: git-add--interactive.perl:1263
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -23632,7 +25488,7 @@
"a - fes «unstage» d'aquest tros i tota la resta de trossos del fitxer\n"
"d - no facis «unstage» d'aquest tros o de cap altre restant del fitxer"
-#: git-add--interactive.perl:1266
+#: git-add--interactive.perl:1269
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -23646,7 +25502,7 @@
"a - aplica aquest tros i tots els trossos posteriors en el fitxer\n"
"d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer"
-#: git-add--interactive.perl:1272 git-add--interactive.perl:1290
+#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -23660,7 +25516,7 @@
"a - descarta aquest tros i tots els trossos posteriors en el fitxer\n"
"d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer"
-#: git-add--interactive.perl:1278
+#: git-add--interactive.perl:1281
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -23674,7 +25530,7 @@
"a - descarta aquest tros i tots els trossos posteriors en el fitxer\n"
"d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer"
-#: git-add--interactive.perl:1284
+#: git-add--interactive.perl:1287
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -23688,7 +25544,7 @@
"a - aplica aquest tros i tots els trossos posteriors en el fitxer\n"
"d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer"
-#: git-add--interactive.perl:1296
+#: git-add--interactive.perl:1299
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -23702,7 +25558,7 @@
"a - aplica aquest tros i tots els trossos posteriors en el fitxer\n"
"d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer"
-#: git-add--interactive.perl:1311
+#: git-add--interactive.perl:1314
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -23724,234 +25580,118 @@
"e - edita manualment el tros actual\n"
"? - mostra l'ajuda\n"
-#: git-add--interactive.perl:1342
+#: git-add--interactive.perl:1345
msgid "The selected hunks do not apply to the index!\n"
msgstr "Els trossos seleccionats no apliquen a l'índex\n"
-#: git-add--interactive.perl:1343
-msgid "Apply them to the worktree anyway? "
-msgstr "Voleu aplicar-los igualment a l'arbre de treball? "
-
-#: git-add--interactive.perl:1346
-msgid "Nothing was applied.\n"
-msgstr "No s'ha aplicat res.\n"
-
-#: git-add--interactive.perl:1357
+#: git-add--interactive.perl:1360
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "s'està ignorant %s no fusionat\n"
-#: git-add--interactive.perl:1428
-#, perl-format
-msgid "Stage mode change [y,n,q,a,d%s,?]? "
-msgstr "Canvia el mode de «stage» [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1429
-#, perl-format
-msgid "Stage deletion [y,n,q,a,d%s,?]? "
-msgstr "Suprimeix «stage» [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1430
-#, perl-format
-msgid "Stage this hunk [y,n,q,a,d%s,?]? "
-msgstr "Fer un «stage» d'aquest tros [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1433
-#, perl-format
-msgid "Stash mode change [y,n,q,a,d%s,?]? "
-msgstr "Canvia el mode de «stash» [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1434
-#, perl-format
-msgid "Stash deletion [y,n,q,a,d%s,?]? "
-msgstr "Suprimeix «stash» [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1435
-#, perl-format
-msgid "Stash this hunk [y,n,q,a,d%s,?]? "
-msgstr "Fer un «stash» d'aquest tros [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1438
-#, perl-format
-msgid "Unstage mode change [y,n,q,a,d%s,?]? "
-msgstr "Canvia el mode de «unstage» [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1439
-#, perl-format
-msgid "Unstage deletion [y,n,q,a,d%s,?]? "
-msgstr "Suprimeix «Unstage» [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1440
-#, perl-format
-msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
-msgstr "Fer un «unstage» d'aquest tros [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1443
-#, perl-format
-msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
-msgstr "Aplica el canvi de mode a l'índex [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1444
-#, perl-format
-msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
-msgstr "Aplica l'esborrat a l'índex [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1445
-#, perl-format
-msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
-msgstr "Aplica aquest tros a l'índex [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
-#, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
-msgstr "Descarta el canvi de mode des de l'arbre de treball [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1449 git-add--interactive.perl:1464
-#, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
-msgstr "Descarta l'esborrat des de l'arbre de treball [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1450 git-add--interactive.perl:1465
-#, perl-format
-msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
-msgstr "Descarta aquest tros des de l'arbre de treball [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1453
-#, perl-format
-msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Descarta el canvi de mode des de l'índex i l'arbre de treball [y,n,q,a,d"
-"%s,?]? "
-
-#: git-add--interactive.perl:1454
-#, perl-format
-msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Descarta la supressió des de l'índex i l'arbre de treball [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1455
-#, perl-format
-msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Descarta aquest tros des de l'índex i l'arbre de treball [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1458
-#, perl-format
-msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Aplica el canvi de mode a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1459
-#, perl-format
-msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Aplica la supressió a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1460
-#, perl-format
-msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Aplica aquest tros a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1468
+#: git-add--interactive.perl:1479
#, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr "Aplica el canvi de mode a l'arbre de treball [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1469
+#: git-add--interactive.perl:1480
#, perl-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
msgstr "Aplica la supressió a l'arbre de treball [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1470
+#: git-add--interactive.perl:1481
+#, perl-format
+msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
+msgstr "Aplica l'addició a l'arbre de treball [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1482
#, perl-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr "Aplica aquest tros a l'arbre de treball [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1570
+#: git-add--interactive.perl:1599
msgid "No other hunks to goto\n"
msgstr "No hi ha altres trossos on anar-hi\n"
-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1617
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Número no vàlid: «%s»\n"
-#: git-add--interactive.perl:1593
+#: git-add--interactive.perl:1622
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "Només %d tros disponible.\n"
msgstr[1] "Només %d trossos disponibles.\n"
-#: git-add--interactive.perl:1619
+#: git-add--interactive.perl:1657
msgid "No other hunks to search\n"
msgstr "No hi ha cap altre tros a cercar\n"
-#: git-add--interactive.perl:1636
+#: git-add--interactive.perl:1674
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Expressió regular de cerca mal formada %s: %s\n"
-#: git-add--interactive.perl:1646
+#: git-add--interactive.perl:1684
msgid "No hunk matches the given pattern\n"
msgstr "No hi ha trossos que coincideixin amb el patró donat\n"
-#: git-add--interactive.perl:1658 git-add--interactive.perl:1680
+#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
msgid "No previous hunk\n"
msgstr "Sense tros previ\n"
-#: git-add--interactive.perl:1667 git-add--interactive.perl:1686
+#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
msgid "No next hunk\n"
msgstr "No hi ha tros següent\n"
-#: git-add--interactive.perl:1692
+#: git-add--interactive.perl:1730
msgid "Sorry, cannot split this hunk\n"
msgstr "No es pot dividir aquest tros\n"
-#: git-add--interactive.perl:1698
+#: git-add--interactive.perl:1736
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "Divideix en %d tros.\n"
msgstr[1] "Divideix en %d trossos.\n"
-#: git-add--interactive.perl:1708
+#: git-add--interactive.perl:1746
msgid "Sorry, cannot edit this hunk\n"
msgstr "No es pot editar aquest tros\n"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1773
+#: git-add--interactive.perl:1811
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"
+"add untracked - add contents of untracked files to the staged set of changes\n"
msgstr ""
"status - mostra els camins amb canvis\n"
-"update - afegeix l'estat de l'arbre de treball al conjunt de canvis "
-"«staged»\n"
+"update - afegeix l'estat de l'arbre de treball al conjunt de canvis «staged»\n"
"revert - reverteix el conjunt de canvis de «staged» a la versió HEAD\n"
"patch - selecciona trossos i actualitza'ls selectivament\n"
"diff - mostra la diferència entre HEAD i l'índex\n"
-"add untracked - afegeix el contingut dels fitxers no seguits al conjunt de "
-"canvis «staged»\n"
+"add untracked - afegeix el contingut dels fitxers no seguits al conjunt de canvis «staged»\n"
-#: git-add--interactive.perl:1790 git-add--interactive.perl:1795
-#: git-add--interactive.perl:1798 git-add--interactive.perl:1805
-#: git-add--interactive.perl:1808 git-add--interactive.perl:1815
-#: git-add--interactive.perl:1819 git-add--interactive.perl:1825
+#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
+#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
+#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
+#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
msgid "missing --"
msgstr "manca --"
-#: git-add--interactive.perl:1821
+#: git-add--interactive.perl:1866
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "desconegut --patch mode: %s"
-#: git-add--interactive.perl:1827 git-add--interactive.perl:1833
+#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "argument %s no vàlid, s'esperava --"
@@ -23968,62 +25708,76 @@
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"
+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
+#, fuzzy
+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 s'han trobat les opcions de configuració per a git-send-email es "
+"configura amb les opcions sendemail.* -noteu la 'e'. Establiu "
+"sendemail.forbidSendmailVariables a false per desactivar aquesta "
+"comprovació."
+
+#: 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"
@@ -24032,18 +25786,18 @@
" * 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"
@@ -24052,7 +25806,7 @@
"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"
@@ -24062,17 +25816,17 @@
"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"
@@ -24080,33 +25834,33 @@
"\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"
@@ -24114,40 +25868,38 @@
"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"
"\t%s\n"
-"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
-"want to send.\n"
+"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really want to send.\n"
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"
@@ -24155,16 +25907,16 @@
#. 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"
@@ -24183,139 +25935,139 @@
" 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."
+"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]: "
diff --git a/po/de.po b/po/de.po
index cfe50c1..aff78ea 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,8 +8,8 @@
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2020-03-11 15:26+0800\n"
-"PO-Revision-Date: 2020-03-14 22:34+0100\n"
+"POT-Creation-Date: 2021-03-04 22:41+0800\n"
+"PO-Revision-Date: 2021-03-03 20:13+0100\n"
"Last-Translator: Matthias Rüster <matthias.ruester@gmail.com>\n"
"Language-Team: Matthias Rüster <matthias.ruester@gmail.com>\n"
"Language: de\n"
@@ -17,241 +17,247 @@
"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.4.2\n"
-#: add-interactive.c:368
+#: add-interactive.c:376
#, c-format
msgid "Huh (%s)?"
msgstr "Wie bitte (%s)?"
-#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124
-#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687
-#: builtin/rebase.c:2086 builtin/rebase.c:2130
+#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292
+#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538
+#: builtin/rebase.c:1963
msgid "could not read index"
msgstr "Index konnte nicht gelesen werden"
-#: add-interactive.c:576 git-add--interactive.perl:269
+#: add-interactive.c:584 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "Binär"
-#: add-interactive.c:634 git-add--interactive.perl:278
+#: add-interactive.c:642 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "Nichts"
-#: add-interactive.c:635 git-add--interactive.perl:314
+#: add-interactive.c:643 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "unverändert"
-#: add-interactive.c:672 git-add--interactive.perl:643
+#: add-interactive.c:680 git-add--interactive.perl:641
msgid "Update"
msgstr "Aktualisieren"
-#: add-interactive.c:689 add-interactive.c:877
+#: add-interactive.c:697 add-interactive.c:885
#, c-format
msgid "could not stage '%s'"
msgstr "Konnte '%s' nicht zum Commit vormerken."
-#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317
-#: builtin/rebase.c:899
+#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486
msgid "could not write index"
-msgstr "Konnte Index nicht schreiben."
+msgstr "konnte Index nicht schreiben"
-#: add-interactive.c:698 git-add--interactive.perl:628
+#: add-interactive.c:706 git-add--interactive.perl:626
#, 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
+#: add-interactive.c:724 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "Hinweis: %s ist nun unversioniert.\n"
-#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281
-#: builtin/reset.c:144
+#: add-interactive.c:729 apply.c:4125 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
+#: add-interactive.c:759 git-add--interactive.perl:653
msgid "Revert"
msgstr "Revert"
-#: add-interactive.c:767
+#: add-interactive.c:775
msgid "Could not parse HEAD^{tree}"
msgstr "Konnte HEAD^{tree} nicht parsen."
-#: add-interactive.c:805 git-add--interactive.perl:631
+#: add-interactive.c:813 git-add--interactive.perl:629
#, 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
+#: add-interactive.c:864 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr "Keine unversionierten Dateien.\n"
-#: add-interactive.c:860 git-add--interactive.perl:689
+#: add-interactive.c:868 git-add--interactive.perl:687
msgid "Add untracked"
-msgstr "unversionierte Dateien hinzufügen"
+msgstr "Unversionierte Dateien hinzufügen"
-#: add-interactive.c:887 git-add--interactive.perl:625
+#: add-interactive.c:895 git-add--interactive.perl:623
#, 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
+#: add-interactive.c:925
#, c-format
msgid "ignoring unmerged: %s"
msgstr "Ignoriere nicht zusammengeführte Datei: %s"
-#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366
+#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369
#, c-format
msgid "Only binary files changed.\n"
msgstr "Nur Binärdateien geändert.\n"
-#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368
+#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371
#, c-format
msgid "No changes.\n"
msgstr "Keine Änderungen.\n"
-#: add-interactive.c:935 git-add--interactive.perl:1376
+#: add-interactive.c:943 git-add--interactive.perl:1379
msgid "Patch update"
msgstr "Patch Aktualisierung"
-#: add-interactive.c:974 git-add--interactive.perl:1754
+#: add-interactive.c:982 git-add--interactive.perl:1792
msgid "Review diff"
msgstr "Diff überprüfen"
-#: add-interactive.c:1002
+#: add-interactive.c:1010
msgid "show paths with changes"
msgstr "Zeige Pfade mit Änderungen"
-#: add-interactive.c:1004
+#: add-interactive.c:1012
msgid "add working tree state to the staged set of changes"
msgstr "Zustand des Arbeitsverzeichnisses zum Commit vormerken"
-#: add-interactive.c:1006
+#: add-interactive.c:1014
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
+#: add-interactive.c:1016
msgid "pick hunks and update selectively"
msgstr "Blöcke und Änderung gezielt auswählen"
-#: add-interactive.c:1010
+#: add-interactive.c:1018
msgid "view diff between HEAD and index"
msgstr "Differenz zwischen HEAD und Index ansehen"
-#: add-interactive.c:1012
+#: add-interactive.c:1020
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
+#: add-interactive.c:1028 add-interactive.c:1077
msgid "Prompt help:"
msgstr "Hilfe für Eingaben:"
-#: add-interactive.c:1022
+#: add-interactive.c:1030
msgid "select a single item"
msgstr "Ein einzelnes Element auswählen"
-#: add-interactive.c:1024
+#: add-interactive.c:1032
msgid "select a range of items"
msgstr "Eine Reihe von Elementen auswählen"
-#: add-interactive.c:1026
+#: add-interactive.c:1034
msgid "select multiple ranges"
msgstr "Mehrere Reihen auswählen"
-#: add-interactive.c:1028 add-interactive.c:1073
+#: add-interactive.c:1036 add-interactive.c:1081
msgid "select item based on unique prefix"
msgstr "Element basierend auf eindeutigen Präfix auswählen"
-#: add-interactive.c:1030
+#: add-interactive.c:1038
msgid "unselect specified items"
msgstr "Angegebene Elemente abwählen"
-#: add-interactive.c:1032
+#: add-interactive.c:1040
msgid "choose all items"
msgstr "Alle Elemente auswählen"
-#: add-interactive.c:1034
+#: add-interactive.c:1042
msgid "(empty) finish selecting"
msgstr "(leer) Auswählen beenden"
-#: add-interactive.c:1071
+#: add-interactive.c:1079
msgid "select a numbered item"
msgstr "Ein nummeriertes Element auswählen"
-#: add-interactive.c:1075
+#: add-interactive.c:1083
msgid "(empty) select nothing"
msgstr "(leer) nichts auswählen"
-#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851
+#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
msgid "*** Commands ***"
msgstr "*** Befehle ***"
-#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848
+#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
msgid "What now"
msgstr "Was nun"
-#: add-interactive.c:1136 git-add--interactive.perl:213
+#: add-interactive.c:1144 git-add--interactive.perl:213
msgid "staged"
msgstr "zur Staging-Area hinzugefügt"
-#: add-interactive.c:1136 git-add--interactive.perl:213
+#: add-interactive.c:1144 git-add--interactive.perl:213
msgid "unstaged"
msgstr "aus Staging-Area entfernt"
-#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251
-#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144
-#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409
-#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
-#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
-#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
+#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257
+#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124
+#: builtin/fetch.c:150 builtin/merge.c:285 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
+#: add-interactive.c:1151
msgid "could not refresh index"
msgstr "Index konnte nicht aktualisiert werden"
-#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765
+#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803
#, c-format
msgid "Bye.\n"
msgstr "Tschüss.\n"
-#: add-patch.c:33 git-add--interactive.perl:1428
+#: add-patch.c:34 git-add--interactive.perl:1431
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Modusänderung der Staging-Area hinzufügen [y,n,q,a,d%s,?]? "
-#: add-patch.c:34 git-add--interactive.perl:1429
+#: add-patch.c:35 git-add--interactive.perl:1432
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Löschung der Staging-Area hinzufügen [y,n,q,a,d%s,?]? "
-#: add-patch.c:35 git-add--interactive.perl:1430
+#: add-patch.c:36 git-add--interactive.perl:1433
+#, 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:1434
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "Diesen Patch-Block der Staging-Area hinzufügen [y,n,q,a,d%s,?]? "
-#: add-patch.c:37
+#: 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."
+"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
+"Block direkt für die Staging-Area markiert."
-#: add-patch.c:40
+#: add-patch.c:42
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -267,30 +273,35 @@
"d - diesen oder alle weiteren Patch-Blöcke in dieser Datei nicht zum Commit "
"vormerken\n"
-#: add-patch.c:54 git-add--interactive.perl:1433
+#: add-patch.c:56 git-add--interactive.perl:1437
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Modusänderung stashen [y,n,q,a,d%s,?]? "
-#: add-patch.c:55 git-add--interactive.perl:1434
+#: add-patch.c:57 git-add--interactive.perl:1438
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Löschung stashen [y,n,q,a,d%s,?]? "
-#: add-patch.c:56 git-add--interactive.perl:1435
+#: add-patch.c:58 git-add--interactive.perl:1439
+#, 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:1440
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "Diesen Patch-Block stashen [y,n,q,a,d%s,?]? "
-#: add-patch.c:58
+#: 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."
+"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
+"Block direkt zum Stashen markiert."
-#: add-patch.c:61
+#: add-patch.c:64
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -304,30 +315,35 @@
"a - diesen und alle weiteren Patch-Blöcke dieser Datei stashen\n"
"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht stashen\n"
-#: add-patch.c:77 git-add--interactive.perl:1438
+#: add-patch.c:80 git-add--interactive.perl:1443
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Modusänderung aus der Staging-Area entfernen [y,n,q,a,d%s,?]? "
-#: add-patch.c:78 git-add--interactive.perl:1439
+#: add-patch.c:81 git-add--interactive.perl:1444
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Löschung aus der Staging-Area entfernen [y,n,q,a,d%s,?]? "
-#: add-patch.c:79 git-add--interactive.perl:1440
+#: add-patch.c:82 git-add--interactive.perl:1445
+#, 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:1446
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "Diesen Patch-Block aus der Staging-Area entfernen [y,n,q,a,d%s,?]? "
-#: add-patch.c:81
+#: 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."
+"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
+"Block direkt zum Entfernen aus der Staging-Area markiert."
-#: add-patch.c:84
+#: add-patch.c:88
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -344,29 +360,35 @@
"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht aus Staging-"
"Area entfernen\n"
-#: add-patch.c:99 git-add--interactive.perl:1443
+#: add-patch.c:103 git-add--interactive.perl:1449
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "Modusänderung auf Index anwenden [y,n,q,a,d%s,?]? "
-#: add-patch.c:100 git-add--interactive.perl:1444
+#: add-patch.c:104 git-add--interactive.perl:1450
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Löschung auf Index anwenden [y,n,q,a,d%s,?]? "
-#: add-patch.c:101 git-add--interactive.perl:1445
+#: add-patch.c:105 git-add--interactive.perl:1451
+#, 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:1452
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "Diesen Patch-Block auf Index anwenden [y,n,q,a,d%s,?]? "
-#: add-patch.c:103 add-patch.c:168 add-patch.c:211
+#: 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."
+msgstr ""
+"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
+"Block direkt zum Anwenden markiert."
-#: add-patch.c:106
+#: add-patch.c:111
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -383,33 +405,39 @@
"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht auf den Index "
"anwenden\n"
-#: add-patch.c:121 git-add--interactive.perl:1448
-#: git-add--interactive.perl:1463
+#: add-patch.c:126 git-add--interactive.perl:1455
+#: git-add--interactive.perl:1473
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "Modusänderung im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
-#: add-patch.c:122 git-add--interactive.perl:1449
-#: git-add--interactive.perl:1464
+#: add-patch.c:127 git-add--interactive.perl:1456
+#: git-add--interactive.perl:1474
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Löschung im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
-#: add-patch.c:123 git-add--interactive.perl:1450
-#: git-add--interactive.perl:1465
+#: add-patch.c:128 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
+#, 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:1458
+#: git-add--interactive.perl:1476
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "Diesen Patch-Block im Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
-#: add-patch.c:125 add-patch.c:147 add-patch.c:190
+#: 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."
+"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
+"Block direkt zum Verwerfen markiert."
-#: add-patch.c:128 add-patch.c:193
+#: 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"
@@ -426,25 +454,30 @@
"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht im "
"Arbeitsverzeichnis verwerfen\n"
-#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Modusänderung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
-#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Löschung vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d%s,?]? "
-#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#, 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:1464
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Diesen Patch-Block vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d"
"%s,?]? "
-#: add-patch.c:150
+#: 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"
@@ -458,25 +491,30 @@
"a - diesen und alle weiteren Patch-Blöcke in der Datei verwerfen\n"
"d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht verwerfen\n"
-#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Modusänderung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
-#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Löschung auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
-#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#, 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:1470
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Diesen Patch-Block auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d"
"%s,?]? "
-#: add-patch.c:171
+#: 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"
@@ -491,7 +529,7 @@
"a - diesen und alle weiteren Patch-Blöcke in der Datei anwenden\n"
"d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht anwenden\n"
-#: add-patch.c:214
+#: add-patch.c:224
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -505,34 +543,34 @@
"a - diesen und alle weiteren Patch-Blöcke in der Datei anwenden\n"
"d - diesen und alle weiteren Patch-Blöcke in der Datei nicht anwenden\n"
-#: add-patch.c:318
+#: add-patch.c:342
#, c-format
msgid "could not parse hunk header '%.*s'"
msgstr "Konnte Block-Header '%.*s' nicht parsen."
-#: add-patch.c:337 add-patch.c:341
+#: 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:395
+#: add-patch.c:419
msgid "could not parse diff"
msgstr "Konnte Differenz nicht parsen."
-#: add-patch.c:414
+#: add-patch.c:438
msgid "could not parse colored diff"
msgstr "Konnte farbige Differenz nicht parsen."
-#: add-patch.c:428
+#: add-patch.c:452
#, c-format
msgid "failed to run '%s'"
msgstr "'%s' konnte nicht ausgeführt werden"
-#: add-patch.c:587
+#: add-patch.c:611
msgid "mismatched output from interactive.diffFilter"
msgstr "nicht übereinstimmende Ausgabe von interactive.diffFilter"
-#: add-patch.c:588
+#: add-patch.c:612
msgid ""
"Your filter must maintain a one-to-one correspondence\n"
"between its input and output lines."
@@ -540,7 +578,7 @@
"Der Filter muss eine Eins-zu-Eins-Beziehung\n"
"zwischen den Ein- und Ausgabe-Zeilen einhalten."
-#: add-patch.c:761
+#: add-patch.c:790
#, c-format
msgid ""
"expected context line #%d in\n"
@@ -549,7 +587,7 @@
"Erwartete Kontextzeile #%d in\n"
"%.*s"
-#: add-patch.c:776
+#: add-patch.c:805
#, c-format
msgid ""
"hunks do not overlap:\n"
@@ -562,13 +600,13 @@
"\tendet nicht mit:\n"
"%.*s"
-#: add-patch.c:1052 git-add--interactive.perl:1112
+#: add-patch.c:1081 git-add--interactive.perl:1115
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr ""
"Manueller Editiermodus für Patch-Blöcke -- siehe nach unten für eine\n"
"Kurzanleitung.\n"
-#: add-patch.c:1056
+#: add-patch.c:1085
#, c-format
msgid ""
"---\n"
@@ -582,7 +620,7 @@
"Zeilen, die mit %c beginnen, werden entfernt.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1070 git-add--interactive.perl:1126
+#: add-patch.c:1099 git-add--interactive.perl:1129
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"
@@ -593,11 +631,11 @@
"werden,\n"
"wird die Bearbeitung abgebrochen und der Patch-Block bleibt unverändert.\n"
-#: add-patch.c:1103
+#: add-patch.c:1132
msgid "could not parse hunk header"
msgstr "Konnte Block-Header nicht parsen."
-#: add-patch.c:1148
+#: add-patch.c:1177
msgid "'git apply --cached' failed"
msgstr "'git apply --cached' schlug fehl."
@@ -613,27 +651,27 @@
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1218 git-add--interactive.perl:1239
+#: add-patch.c:1246 git-add--interactive.perl:1242
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
"Ihr bearbeiteter Patch-Block kann nicht angewendet werden.\n"
"Erneut bearbeiten? (\"n\" verwirft Bearbeitung!) [y/n]?"
-#: add-patch.c:1261
+#: add-patch.c:1289
msgid "The selected hunks do not apply to the index!"
msgstr ""
"Die ausgewählten Patch-Blöcke können nicht auf den Index angewendet werden!"
-#: add-patch.c:1262 git-add--interactive.perl:1343
+#: add-patch.c:1290 git-add--interactive.perl:1346
msgid "Apply them to the worktree anyway? "
msgstr "Trotzdem auf Arbeitsverzeichnis anwenden? "
-#: add-patch.c:1269 git-add--interactive.perl:1346
+#: add-patch.c:1297 git-add--interactive.perl:1349
msgid "Nothing was applied.\n"
msgstr "Nichts angewendet.\n"
-#: add-patch.c:1326
+#: add-patch.c:1354
msgid ""
"j - leave this hunk undecided, see next undecided hunk\n"
"J - leave this hunk undecided, see next hunk\n"
@@ -657,109 +695,118 @@
"e - aktuellen Patch-Block manuell editieren\n"
"? - Hilfe anzeigen\n"
-#: add-patch.c:1447 add-patch.c:1457
+#: add-patch.c:1516 add-patch.c:1526
msgid "No previous hunk"
msgstr "Kein vorheriger Patch-Block"
-#: add-patch.c:1452 add-patch.c:1462
+#: add-patch.c:1521 add-patch.c:1531
msgid "No next hunk"
msgstr "Kein folgender Patch-Block"
-#: add-patch.c:1468
+#: add-patch.c:1537
msgid "No other hunks to goto"
msgstr "Keine anderen Patch-Blöcke verbleibend"
-#: add-patch.c:1479 git-add--interactive.perl:1577
+#: add-patch.c:1548 git-add--interactive.perl:1606
msgid "go to which hunk (<ret> to see more)? "
msgstr "zu welchem Patch-Block springen (<Enter> für mehr Informationen)? "
-#: add-patch.c:1480 git-add--interactive.perl:1579
+#: add-patch.c:1549 git-add--interactive.perl:1608
msgid "go to which hunk? "
msgstr "zu welchem Patch-Block springen? "
-#: add-patch.c:1491
+#: add-patch.c:1560
#, c-format
msgid "Invalid number: '%s'"
msgstr "Ungültige Nummer: '%s'"
-#: add-patch.c:1496
+#: add-patch.c:1565
#, c-format
msgid "Sorry, only %d hunk available."
msgid_plural "Sorry, only %d hunks available."
msgstr[0] "Entschuldigung, nur %d Patch-Block verfügbar."
msgstr[1] "Entschuldigung, nur %d Patch-Blöcke verfügbar."
-#: add-patch.c:1505
+#: add-patch.c:1574
msgid "No other hunks to search"
msgstr "Keine anderen Patch-Blöcke zum Durchsuchen"
-#: add-patch.c:1511 git-add--interactive.perl:1623
+#: add-patch.c:1580 git-add--interactive.perl:1661
msgid "search for regex? "
msgstr "Suche nach regulärem Ausdruck? "
-#: add-patch.c:1526
+#: add-patch.c:1595
#, c-format
msgid "Malformed search regexp %s: %s"
msgstr "Fehlerhafter regulärer Ausdruck für Suche %s: %s"
-#: add-patch.c:1543
+#: add-patch.c:1612
msgid "No hunk matches the given pattern"
msgstr "Kein Patch-Block entspricht dem angegebenen Muster"
-#: add-patch.c:1550
+#: add-patch.c:1619
msgid "Sorry, cannot split this hunk"
msgstr "Entschuldigung, kann diesen Patch-Block nicht aufteilen"
-#: add-patch.c:1554
+#: add-patch.c:1623
#, c-format
msgid "Split into %d hunks."
msgstr "In %d Patch-Block aufgeteilt."
-#: add-patch.c:1558
+#: add-patch.c:1627
msgid "Sorry, cannot edit this hunk"
msgstr "Entschuldigung, kann diesen Patch-Block nicht bearbeiten"
-#: add-patch.c:1609
+#: add-patch.c:1679
msgid "'git apply' failed"
msgstr "'git apply' schlug fehl"
-#: advice.c:115
+#: advice.c:143
+#, 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:159
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sHinweis: %.*s%s\n"
-#: advice.c:168
+#: advice.c:250
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
"Cherry-Picken ist nicht möglich, weil Sie nicht zusammengeführte Dateien "
"haben."
-#: advice.c:170
+#: advice.c:252
msgid "Committing is not possible because you have unmerged files."
msgstr ""
"Committen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
-#: advice.c:172
+#: advice.c:254
msgid "Merging is not possible because you have unmerged files."
msgstr ""
"Mergen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
-#: advice.c:174
+#: advice.c:256
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
"Pullen ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
-#: advice.c:176
+#: advice.c:258
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
"Reverten ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
-#: advice.c:178
+#: advice.c:260
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "%s ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben."
-#: advice.c:186
+#: advice.c:268
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
@@ -768,23 +815,23 @@
"dann 'git add/rm <Datei>', um die Auflösung entsprechend zu markieren\n"
"und zu committen."
-#: advice.c:194
+#: advice.c:276
msgid "Exiting because of an unresolved conflict."
msgstr "Beende wegen unaufgelöstem Konflikt."
-#: advice.c:199 builtin/merge.c:1335
+#: advice.c:281 builtin/merge.c:1370
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert)."
-#: advice.c:201
+#: advice.c:283
msgid "Please, commit your changes before merging."
msgstr "Bitte committen Sie Ihre Änderungen, bevor Sie mergen."
-#: advice.c:202
+#: advice.c:284
msgid "Exiting because of unfinished merge."
msgstr "Beende wegen nicht abgeschlossenem Merge."
-#: advice.c:208
+#: advice.c:290
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -855,18 +902,15 @@
#: apply.c:140
msgid "--3way outside a repository"
-msgstr ""
-"Die Option --3way kann nicht außerhalb eines Repositories verwendet werden."
+msgstr "--3way kann nicht außerhalb eines Repositories verwendet werden"
#: apply.c:151
msgid "--index outside a repository"
-msgstr ""
-"Die Option --index kann nicht außerhalb eines Repositories verwendet werden."
+msgstr "--index kann nicht außerhalb eines Repositories verwendet werden"
#: apply.c:154
msgid "--cached outside a repository"
-msgstr ""
-"Die Option --cached kann nicht außerhalb eines Repositories verwendet werden."
+msgstr "--cached kann nicht außerhalb eines Repositories verwendet werden"
#: apply.c:801
#, c-format
@@ -881,7 +925,7 @@
#: apply.c:884
#, c-format
msgid "unable to find filename in patch at line %d"
-msgstr "Konnte keinen Dateinamen in Zeile %d des Patches finden."
+msgstr "konnte keinen Dateinamen in Zeile %d des Patches finden"
#: apply.c:922
#, c-format
@@ -1086,7 +1130,8 @@
msgid "cannot checkout %s"
msgstr "kann %s nicht auschecken"
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:86 pack-revindex.c:213
+#: setup.c:308
#, c-format
msgid "failed to read %s"
msgstr "Fehler beim Lesen von %s"
@@ -1106,7 +1151,7 @@
msgid "%s: does not exist in index"
msgstr "%s ist nicht im Index"
-#: apply.c:3537 apply.c:3708
+#: apply.c:3537 apply.c:3708 apply.c:3952
#, c-format
msgid "%s: does not match index"
msgstr "%s entspricht nicht der Version im Index"
@@ -1156,329 +1201,371 @@
msgid "%s has type %o, expected %o"
msgstr "%s ist vom Typ %o, erwartete %o"
-#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856
-#: read-cache.c:1325
+#: apply.c: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:3936
+#: apply.c:3950
#, c-format
msgid "%s: already exists in index"
msgstr "%s ist bereits bereitgestellt"
-#: apply.c:3939
+#: apply.c:3954
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s existiert bereits im Arbeitsverzeichnis"
-#: apply.c:3959
+#: apply.c:3974
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o)"
-#: apply.c:3964
+#: apply.c:3979
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "neuer Modus (%o) von %s entspricht nicht dem alten Modus (%o) von %s"
-#: apply.c:3984
+#: apply.c:3999
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "betroffene Datei '%s' ist hinter einer symbolischen Verknüpfung"
-#: apply.c:3988
+#: apply.c:4003
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: Patch konnte nicht angewendet werden"
-#: apply.c:4003
+#: apply.c:4018
#, c-format
msgid "Checking patch %s..."
msgstr "Prüfe Patch %s ..."
-#: apply.c:4095
+#: apply.c:4110
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "SHA-1 Information fehlt oder ist unbrauchbar für Submodul %s"
-#: apply.c:4102
+#: apply.c:4117
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "Modusänderung für %s, was sich nicht im aktuellen HEAD befindet"
-#: apply.c:4105
+#: apply.c:4120
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "SHA-1 Information fehlt oder ist unbrauchbar (%s)."
-#: apply.c:4114
+#: apply.c:4129
#, c-format
msgid "could not add %s to temporary index"
msgstr "konnte %s nicht zum temporären Index hinzufügen"
-#: apply.c:4124
+#: apply.c:4139
#, c-format
msgid "could not write temporary index to %s"
msgstr "konnte temporären Index nicht nach %s schreiben"
-#: apply.c:4262
+#: apply.c:4277
#, c-format
msgid "unable to remove %s from index"
msgstr "konnte %s nicht aus dem Index entfernen"
-#: apply.c:4296
+#: apply.c:4311
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "fehlerhafter Patch für Submodul %s"
-#: apply.c:4302
+#: apply.c:4317
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "konnte neu erstellte Datei '%s' nicht lesen"
-#: apply.c:4310
+#: apply.c:4325
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "kann internen Speicher für eben erstellte Datei %s nicht erzeugen"
-#: apply.c:4316 apply.c:4461
+#: apply.c:4331 apply.c:4476
#, c-format
msgid "unable to add cache entry for %s"
msgstr "kann für %s keinen Eintrag in den Zwischenspeicher hinzufügen"
-#: apply.c:4359
+#: apply.c:4374 builtin/bisect--helper.c:523
#, c-format
msgid "failed to write to '%s'"
msgstr "Fehler beim Schreiben nach '%s'"
-#: apply.c:4363
+#: apply.c:4378
#, c-format
msgid "closing file '%s'"
msgstr "schließe Datei '%s'"
-#: apply.c:4433
+#: apply.c:4448
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "konnte Datei '%s' mit Modus %o nicht schreiben"
-#: apply.c:4531
+#: apply.c:4546
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Patch %s sauber angewendet"
-#: apply.c:4539
+#: apply.c:4554
msgid "internal error"
msgstr "interner Fehler"
-#: apply.c:4542
+#: apply.c:4557
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Wende Patch %%s mit %d Zurückweisung an..."
msgstr[1] "Wende Patch %%s mit %d Zurückweisungen an..."
-#: apply.c:4553
+#: apply.c:4568
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "Verkürze Name von .rej Datei zu %.*s.rej"
-#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201
+#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334
#, c-format
msgid "cannot open %s"
msgstr "kann '%s' nicht öffnen"
-#: apply.c:4575
+#: apply.c:4590
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Patch-Bereich #%d sauber angewendet."
-#: apply.c:4579
+#: apply.c:4594
#, c-format
msgid "Rejected hunk #%d."
msgstr "Patch-Block #%d zurückgewiesen."
-#: apply.c:4698
+#: apply.c:4718
#, c-format
msgid "Skipped patch '%s'."
msgstr "Patch '%s' ausgelassen."
-#: apply.c:4706
+#: apply.c:4726
msgid "unrecognized input"
msgstr "nicht erkannte Eingabe"
-#: apply.c:4726
+#: apply.c:4746
msgid "unable to read index file"
msgstr "Konnte Index-Datei nicht lesen"
-#: apply.c:4883
+#: apply.c:4903
#, c-format
msgid "can't open patch '%s': %s"
msgstr "kann Patch '%s' nicht öffnen: %s"
-#: apply.c:4910
+#: apply.c:4930
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "unterdrückte %d Whitespace-Fehler"
msgstr[1] "unterdrückte %d Whitespace-Fehler"
-#: apply.c:4916 apply.c:4931
+#: apply.c:4936 apply.c:4951
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d Zeile fügt Whitespace-Fehler hinzu."
msgstr[1] "%d Zeilen fügen Whitespace-Fehler hinzu."
-#: apply.c:4924
+#: apply.c:4944
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "%d Zeile nach Behebung von Whitespace-Fehlern angewendet."
msgstr[1] "%d Zeilen nach Behebung von Whitespace-Fehlern angewendet."
-#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406
+#: apply.c:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406
msgid "Unable to write new index file"
msgstr "Konnte neue Index-Datei nicht schreiben."
-#: apply.c:4968
+#: apply.c:4988
msgid "don't apply changes matching the given path"
msgstr "keine Änderungen im angegebenen Pfad anwenden"
-#: apply.c:4971
+#: apply.c:4991
msgid "apply changes matching the given path"
msgstr "Änderungen nur im angegebenen Pfad anwenden"
-#: apply.c:4973 builtin/am.c:2260
+#: apply.c:4993 builtin/am.c:2266
msgid "num"
msgstr "Anzahl"
-#: apply.c:4974
+#: apply.c:4994
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
"<Anzahl> vorangestellte Schrägstriche von herkömmlichen Differenzpfaden "
"entfernen"
-#: apply.c:4977
+#: apply.c:4997
msgid "ignore additions made by the patch"
msgstr "hinzugefügte Zeilen des Patches ignorieren"
-#: apply.c:4979
+#: apply.c:4999
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
-"anstatt der Anwendung des Patches, den \"diffstat\" für die Eingabe "
-"ausgegeben"
+"statt den Patch anzuwenden, den \"diffstat\" für die Eingabe ausgegeben"
-#: apply.c:4983
+#: apply.c:5003
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
"die Anzahl von hinzugefügten/entfernten Zeilen in Dezimalnotation anzeigen"
-#: apply.c:4985
+#: apply.c:5005
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"
+"statt den Patch anzuwenden, eine Zusammenfassung für die Eingabe ausgeben"
-#: apply.c:4987
+#: apply.c:5007
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
-"anstatt der Anwendung des Patches, zeige ob Patch angewendet werden kann"
+"statt den Patch anzuwenden, anzeigen ob der Patch angewendet werden kann"
-#: apply.c:4989
+#: apply.c:5009
msgid "make sure the patch is applicable to the current index"
msgstr ""
"sicherstellen, dass der Patch mit dem aktuellen Index angewendet werden kann"
-#: apply.c:4991
+#: apply.c:5011
msgid "mark new files with `git add --intent-to-add`"
msgstr "neue Dateien mit `git add --intent-to-add` markieren"
-#: apply.c:4993
+#: apply.c:5013
msgid "apply a patch without touching the working tree"
msgstr "Patch anwenden, ohne Änderungen im Arbeitsverzeichnis vorzunehmen"
-#: apply.c:4995
+#: apply.c:5015
msgid "accept a patch that touches outside the working area"
msgstr ""
"Patch anwenden, der Änderungen außerhalb des Arbeitsverzeichnisses vornimmt"
-#: apply.c:4998
+#: apply.c:5018
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "Patch anwenden (Benutzung mit --stat/--summary/--check)"
-#: apply.c:5000
+#: apply.c:5020
msgid "attempt three-way merge if a patch does not apply"
msgstr "versuche 3-Wege-Merge, wenn der Patch nicht angewendet werden konnte"
-#: apply.c:5002
+#: apply.c:5022
msgid "build a temporary index based on embedded index information"
msgstr ""
"einen temporären Index, basierend auf den integrierten Index-Informationen, "
"erstellen"
-#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540
msgid "paths are separated with NUL character"
msgstr "Pfade sind getrennt durch NUL Zeichen"
-#: apply.c:5007
+#: apply.c:5027
msgid "ensure at least <n> lines of context match"
msgstr ""
"sicher stellen, dass mindestens <n> Zeilen des Kontextes übereinstimmen"
-#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98
+#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98
#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3457 builtin/rebase.c:1508
+#: builtin/pack-objects.c:3577 builtin/rebase.c:1352
msgid "action"
msgstr "Aktion"
-#: apply.c:5009
+#: apply.c:5029
msgid "detect new or modified lines that have whitespace errors"
msgstr "neue oder geänderte Zeilen, die Whitespace-Fehler haben, ermitteln"
-#: apply.c:5012 apply.c:5015
+#: apply.c:5032 apply.c:5035
msgid "ignore changes in whitespace when finding context"
msgstr "Änderungen im Whitespace bei der Suche des Kontextes ignorieren"
-#: apply.c:5018
+#: apply.c:5038
msgid "apply the patch in reverse"
msgstr "den Patch in umgekehrter Reihenfolge anwenden"
-#: apply.c:5020
+#: apply.c:5040
msgid "don't expect at least one line of context"
msgstr "keinen Kontext erwarten"
-#: apply.c:5022
+#: apply.c:5042
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
"zurückgewiesene Patch-Blöcke in entsprechenden *.rej Dateien hinterlassen"
-#: apply.c:5024
+#: apply.c:5044
msgid "allow overlapping hunks"
msgstr "sich überlappende Patch-Blöcke erlauben"
-#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22
-#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774
-#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22
+#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757
+#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "erweiterte Ausgaben"
-#: apply.c:5027
+#: apply.c:5047
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende tolerieren"
-#: apply.c:5030
+#: apply.c:5050
msgid "do not trust the line counts in the hunk headers"
msgstr "den Zeilennummern im Kopf des Patch-Blocks nicht vertrauen"
-#: apply.c:5032 builtin/am.c:2248
+#: apply.c:5052 builtin/am.c:2254
msgid "root"
msgstr "Wurzelverzeichnis"
-#: apply.c:5033
+#: apply.c:5053
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:450
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr "Konnte '%s' Filter nicht starten."
+
+#: archive-tar.c:453
+msgid "unable to redirect descriptor"
+msgstr "Konnte Descriptor nicht umleiten."
+
+#: archive-tar.c:460
+#, 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>...]"
@@ -1498,183 +1585,157 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <Repository> [--exec <Programm>] --list"
-#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
-#, c-format
-msgid "pathspec '%s' did not match any files"
-msgstr "Pfadspezifikation '%s' stimmt mit keinen Dateien überein"
-
-#: archive.c:396
-#, c-format
-msgid "no such ref: %.*s"
-msgstr "Keine solche Referenz: %.*s"
-
-#: archive.c:401
-#, c-format
-msgid "not a valid object name: %s"
-msgstr "Kein gültiger Objektname: %s"
-
-#: archive.c:414
-#, c-format
-msgid "not a tree object: %s"
-msgstr "Kein Tree-Objekt: %s"
-
-#: archive.c:426
-msgid "current working directory is untracked"
-msgstr "Aktuelles Arbeitsverzeichnis ist unversioniert."
-
-#: archive.c:457
-msgid "fmt"
-msgstr "Format"
-
-#: archive.c:457
-msgid "archive format"
-msgstr "Archivformat"
-
-#: archive.c:458 builtin/log.c:1653
-msgid "prefix"
-msgstr "Präfix"
-
-#: archive.c:459
-msgid "prepend prefix to each pathname in the archive"
-msgstr "einen Präfix vor jeden Pfadnamen in dem Archiv stellen"
-
-#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
-#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
-#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887
-#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
-#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
-#: parse-options.h:190
-msgid "file"
-msgstr "Datei"
-
-#: archive.c:461 builtin/archive.c:90
-msgid "write the archive to this file"
-msgstr "das Archiv in diese Datei schreiben"
-
-#: archive.c:463
-msgid "read .gitattributes in working directory"
-msgstr ".gitattributes aus dem Arbeitsverzeichnis lesen"
-
-#: archive.c:464
-msgid "report archived files on stderr"
-msgstr "archivierte Dateien in der Standard-Fehlerausgabe ausgeben"
-
-#: archive.c:465
-msgid "store only"
-msgstr "nur speichern"
-
-#: archive.c:466
-msgid "compress faster"
-msgstr "schneller komprimieren"
-
-#: archive.c:474
-msgid "compress better"
-msgstr "besser komprimieren"
-
-#: archive.c:477
-msgid "list supported archive formats"
-msgstr "unterstützte Archivformate auflisten"
-
-#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
-#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
-msgid "repo"
-msgstr "Repository"
-
-#: archive.c:480 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:715
-#: builtin/notes.c:498
-msgid "command"
-msgstr "Programm"
-
-#: archive.c:482 builtin/archive.c:94
-msgid "path to the remote git-upload-archive command"
-msgstr "Pfad zum externen \"git-upload-archive\"-Programm"
-
-#: archive.c:489
-msgid "Unexpected option --remote"
-msgstr "Unerwartete Option --remote"
-
-#: archive.c:491
-msgid "Option --exec can only be used together with --remote"
-msgstr "Die Option --exec kann nur zusammen mit --remote verwendet werden."
-
-#: archive.c:493
-msgid "Unexpected option --output"
-msgstr "Unerwartete Option --output"
-
-#: archive.c:515
-#, c-format
-msgid "Unknown archive format '%s'"
-msgstr "Unbekanntes Archivformat '%s'"
-
-#: archive.c:522
-#, 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:351
-#, c-format
-msgid "cannot stream blob %s"
-msgstr "Kann Blob %s nicht streamen."
-
-#: archive-tar.c:266 archive-zip.c:369
-#, c-format
-msgid "unsupported file mode: 0%o (SHA1: %s)"
-msgstr "Nicht unterstützter Dateimodus: 0%o (SHA1: %s)"
-
-#: archive-tar.c:293 archive-zip.c:359
+#: archive.c:192
#, c-format
msgid "cannot read %s"
msgstr "Kann %s nicht lesen."
-#: archive-tar.c:465
+#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894
+#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786
+#: builtin/merge.c:1139
#, c-format
-msgid "unable to start '%s' filter"
-msgstr "Konnte '%s' Filter nicht starten."
+msgid "could not read '%s'"
+msgstr "Konnte '%s' nicht lesen"
-#: archive-tar.c:468
-msgid "unable to redirect descriptor"
-msgstr "Konnte Descriptor nicht umleiten."
-
-#: archive-tar.c:475
+#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315
#, c-format
-msgid "'%s' filter reported error"
-msgstr "'%s' Filter meldete Fehler."
+msgid "pathspec '%s' did not match any files"
+msgstr "Pfadspezifikation '%s' stimmt mit keinen Dateien überein"
-#: archive-zip.c:319
+#: archive.c:454
#, c-format
-msgid "path is not valid UTF-8: %s"
-msgstr "Pfad ist kein gültiges UTF-8: %s"
+msgid "no such ref: %.*s"
+msgstr "Referenz nicht gefunden: %.*s"
-#: archive-zip.c:323
+#: archive.c:460
#, c-format
-msgid "path too long (%d chars, SHA1: %s): %s"
-msgstr "Pfad zu lang (%d Zeichen, SHA1: %s): %s"
+msgid "not a valid object name: %s"
+msgstr "Kein gültiger Objektname: %s"
-#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
+#: archive.c:473
#, c-format
-msgid "deflate error (%d)"
-msgstr "Fehler beim Komprimieren (%d)"
+msgid "not a tree object: %s"
+msgstr "Kein Tree-Objekt: %s"
-#: archive-zip.c:615
+#: archive.c:485
+msgid "current working directory is untracked"
+msgstr "Aktuelles Arbeitsverzeichnis ist unversioniert."
+
+#: archive.c:526
#, c-format
-msgid "timestamp too large for this system: %<PRIuMAX>"
-msgstr "Timestamp zu groß für dieses System: %<PRIuMAX>"
+msgid "File not found: %s"
+msgstr "Datei nicht gefunden: %s"
-#: attr.c:212
+#: archive.c:528
+#, c-format
+msgid "Not a regular file: %s"
+msgstr "Keine reguläre Datei: %s"
+
+#: archive.c:555
+msgid "fmt"
+msgstr "Format"
+
+#: archive.c:555
+msgid "archive format"
+msgstr "Archivformat"
+
+#: archive.c:556 builtin/log.c:1764
+msgid "prefix"
+msgstr "Präfix"
+
+#: archive.c:557
+msgid "prepend prefix to each pathname in the archive"
+msgstr "einen Präfix vor jeden Pfadnamen in dem Archiv stellen"
+
+#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888
+#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
+#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
+#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105
+#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412
+#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190
+msgid "file"
+msgstr "Datei"
+
+#: archive.c:559
+msgid "add untracked file to archive"
+msgstr "unversionierte Datei zum Archiv hinzufügen"
+
+#: archive.c:562 builtin/archive.c:90
+msgid "write the archive to this file"
+msgstr "das Archiv in diese Datei schreiben"
+
+#: archive.c:564
+msgid "read .gitattributes in working directory"
+msgstr ".gitattributes aus dem Arbeitsverzeichnis lesen"
+
+#: archive.c:565
+msgid "report archived files on stderr"
+msgstr "archivierte Dateien in der Standard-Fehlerausgabe ausgeben"
+
+#: archive.c:567
+msgid "set compression level"
+msgstr "Komprimierungsgrad setzen"
+
+#: archive.c:570
+msgid "list supported archive formats"
+msgstr "unterstützte Archivformate auflisten"
+
+#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117
+#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
+msgid "repo"
+msgstr "Repository"
+
+#: archive.c:573 builtin/archive.c:92
+msgid "retrieve the archive from remote repository <repo>"
+msgstr "Archiv vom Remote-Repository <Repository> abrufen"
+
+#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714
+#: builtin/notes.c:498
+msgid "command"
+msgstr "Programm"
+
+#: archive.c:575 builtin/archive.c:94
+msgid "path to the remote git-upload-archive command"
+msgstr "Pfad zum externen \"git-upload-archive\"-Programm"
+
+#: archive.c:582
+msgid "Unexpected option --remote"
+msgstr "Unerwartete Option --remote"
+
+#: archive.c:584
+msgid "Option --exec can only be used together with --remote"
+msgstr "Die Option --exec kann nur zusammen mit --remote verwendet werden"
+
+#: archive.c:586
+msgid "Unexpected option --output"
+msgstr "Unerwartete Option --output"
+
+#: archive.c:588
+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:610
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "Unbekanntes Archivformat '%s'"
+
+#: archive.c:619
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "Argument für Format '%s' nicht unterstützt: -%d"
+
+#: attr.c:202
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s ist kein gültiger Attributname"
-#: attr.c:369
+#: attr.c:359
#, c-format
msgid "%s not allowed: %s:%d"
msgstr "%s nicht erlaubt: %s:%d"
-#: attr.c:409
+#: attr.c:399
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -1682,22 +1743,22 @@
"Verneinende Muster werden in Git-Attributen ignoriert.\n"
"Benutzen Sie '\\!' für führende Ausrufezeichen."
-#: bisect.c:468
+#: bisect.c:489
#, 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:699
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Keine binäre Suche mehr möglich!\n"
-#: bisect.c:745
+#: bisect.c:766
#, c-format
msgid "Not a valid commit name %s"
msgstr "%s ist kein gültiger Commit-Name"
-#: bisect.c:770
+#: bisect.c:791
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1706,7 +1767,7 @@
"Die Merge-Basis %s ist fehlerhaft.\n"
"Das bedeutet, der Fehler wurde zwischen %s und [%s] behoben.\n"
-#: bisect.c:775
+#: bisect.c:796
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1715,7 +1776,7 @@
"Die Merge-Basis %s ist neu.\n"
"Das bedeutet, die Eigenschaft hat sich zwischen %s und [%s] geändert.\n"
-#: bisect.c:780
+#: bisect.c:801
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1724,7 +1785,7 @@
"Die Merge-Basis %s ist %s.\n"
"Das bedeutet, der erste '%s' Commit befindet sich zwischen %s und [%s].\n"
-#: bisect.c:788
+#: bisect.c:809
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1735,7 +1796,7 @@
"git bisect kann in diesem Fall nicht richtig arbeiten.\n"
"Vielleicht verwechselten Sie %s und %s Commits?\n"
-#: bisect.c:801
+#: bisect.c:822
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1747,45 +1808,45 @@
"erste %s Commit zwischen %s und %s befindet.\n"
"Es wird dennoch fortgesetzt."
-#: bisect.c:840
+#: bisect.c:861
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "binäre Suche: eine Merge-Basis muss geprüft werden\n"
-#: bisect.c:890
+#: bisect.c:911
#, c-format
msgid "a %s revision is needed"
msgstr "ein %s Commit wird benötigt"
-#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287
#, c-format
msgid "could not create file '%s'"
msgstr "konnte Datei '%s' nicht erstellen"
-#: bisect.c:966 builtin/merge.c:149
+#: bisect.c:987 builtin/merge.c:153
#, c-format
msgid "could not read file '%s'"
msgstr "Konnte Datei '%s' nicht lesen"
-#: bisect.c:997
+#: bisect.c:1027
msgid "reading bisect refs failed"
msgstr "Lesen von Referenzen für binäre Suche fehlgeschlagen"
-#: bisect.c:1019
+#: bisect.c:1057
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s war sowohl %s als auch %s\n"
-#: bisect.c:1028
+#: bisect.c:1066
#, c-format
msgid ""
"No testable commit found.\n"
-"Maybe you started with bad path parameters?\n"
+"Maybe you started with bad path arguments?\n"
msgstr ""
"Kein testbarer Commit gefunden.\n"
-"Vielleicht starteten Sie mit falschen Pfad-Parametern?\n"
+"Vielleicht starteten Sie mit schlechten Pfad-Argumenten?\n"
-#: bisect.c:1057
+#: bisect.c:1095
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1795,50 +1856,50 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1063
+#: bisect.c:1101
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[0] "binäre Suche: danach noch %d Commit zum Testen übrig %s\n"
msgstr[1] "binäre Suche: danach noch %d Commits zum Testen übrig %s\n"
-#: blame.c:2700
+#: blame.c:2777
msgid "--contents and --reverse do not blend well."
msgstr "--contents und --reverse funktionieren gemeinsam nicht."
-#: blame.c:2714
+#: blame.c:2791
msgid "cannot use --contents with final commit object name"
msgstr ""
"kann --contents nicht mit endgültigem Namen des Commit-Objektes benutzen"
-#: blame.c:2735
+#: blame.c:2812
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
"--reverse und --first-parent zusammen erfordern die Angabe eines "
"endgültigen\n"
"Commits"
-#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006
-#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388
-#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215
-#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290
-#: builtin/shortlog.c:192
+#: blame.c:2821 bundle.c:213 ref-filter.c:2206 remote.c:2041 sequencer.c:2146
+#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411
+#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335
+#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410
+#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr "Einrichtung des Revisionsgangs fehlgeschlagen"
-#: blame.c:2762
+#: blame.c:2839
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
"--reverse und --first-parent zusammen erfordern einen Bereich entlang der\n"
"\"first-parent\"-Kette"
-#: blame.c:2773
+#: blame.c:2850
#, c-format
msgid "no such path %s in %s"
-msgstr "Pfad %s nicht in %s"
+msgstr "Pfad %s nicht in %s gefunden"
-#: blame.c:2784
+#: blame.c:2861
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "kann Blob %s für Pfad '%s' nicht lesen"
@@ -1975,114 +2036,404 @@
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 "'%s' does not look like a v2 bundle file"
-msgstr "'%s' sieht nicht wie eine v2 Paketdatei aus"
+msgid "unrecognized bundle hash algorithm: %s"
+msgstr "unbekannter Paket-Hash-Algorithmus: %s"
-#: bundle.c:64
+#: bundle.c:45
+#, c-format
+msgid "unknown capability '%s'"
+msgstr "unbekannte Fähigkeit '%s'"
+
+#: 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:2258 sequencer.c:3016
-#: builtin/commit.c:815
+#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184
+#: 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:273
+#: bundle.c:319
msgid "unable to dup bundle descriptor"
msgstr "Konnte dup für Descriptor des Pakets nicht ausführen."
-#: bundle.c:280
+#: bundle.c:326
msgid "Could not spawn pack-objects"
msgstr "Konnte Paketobjekte nicht erstellen"
-#: bundle.c:291
+#: bundle.c:337
msgid "pack-objects died"
msgstr "Erstellung der Paketobjekte abgebrochen"
-#: bundle.c:333
-msgid "rev-list died"
-msgstr "\"rev-list\" abgebrochen"
-
-#: bundle.c:382
+#: bundle.c:386
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "Referenz '%s' wird durch \"rev-list\" Optionen ausgeschlossen"
-#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306
+#: bundle.c:490
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr "nicht unterstützte Paket-Version %d"
+
+#: bundle.c:492
+#, c-format
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr "kann Paket-Version %d nicht mit Algorithmus %s schreiben"
+
+#: bundle.c:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396
#, c-format
msgid "unrecognized argument: %s"
msgstr "nicht erkanntes Argument: %s"
-#: bundle.c:469
+#: bundle.c:539
msgid "Refusing to create empty bundle."
msgstr "Erstellung eines leeren Pakets zurückgewiesen."
-#: bundle.c:479
+#: bundle.c:549
#, c-format
msgid "cannot create '%s'"
msgstr "kann '%s' nicht erstellen"
-#: bundle.c:504
+#: bundle.c:574
msgid "index-pack died"
msgstr "Erstellung der Paketindexdatei abgebrochen"
+#: chunk-format.c:113
+msgid "terminating chunk id appears earlier than expected"
+msgstr "abschließende Chunk-ID erscheint eher als erwartet"
+
+#: chunk-format.c:122
+#, c-format
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr "unzulässige(r) Chunk-Offset(s) %<PRIx64> und %<PRIx64>"
+
+#: chunk-format.c:129
+#, c-format
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr "doppelte Chunk-ID %<PRIx32> gefunden"
+
+#: chunk-format.c:143
+#, c-format
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr "letzter Chunk hat nicht-Null ID %<PRIx32>"
+
#: color.c:329
#, c-format
msgid "invalid color value: %.*s"
msgstr "Ungültiger Farbwert: %.*s"
-#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403
-#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457
+#: commit-graph.c:197 midx.c:46
+msgid "invalid hash version"
+msgstr "ungültige Hash-Version"
+
+#: commit-graph.c:255
+msgid "commit-graph file is too small"
+msgstr "Commit-Graph-Datei ist zu klein"
+
+#: commit-graph.c:348
+#, 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:355
+#, 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:362
+#, 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:379
+#, 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:472
+msgid "commit-graph has no base graphs chunk"
+msgstr "Commit-Graph hat keinen Basis-Graph-Chunk"
+
+#: commit-graph.c:482
+msgid "commit-graph chain does not match"
+msgstr "Commit-Graph Verkettung stimmt nicht überein."
+
+#: commit-graph.c:530
+#, 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:554
+msgid "unable to find all commit-graph files"
+msgstr "Konnte nicht alle Commit-Graph-Dateien finden."
+
+#: commit-graph.c:735 commit-graph.c:772
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr "Ungültige Commit-Position. Commit-Graph ist wahrscheinlich beschädigt."
+
+#: commit-graph.c:756
+#, c-format
+msgid "could not find commit %s"
+msgstr "Konnte Commit %s nicht finden."
+
+#: commit-graph.c:789
+msgid "commit-graph requires overflow generation data but has none"
+msgstr "Commit-Graph erfordert Überlaufgenerierungsdaten, aber hat keine"
+
+#: commit-graph.c:1065 builtin/am.c:1292
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "Konnte Commit '%s' nicht parsen."
+
+#: commit-graph.c:1327 builtin/pack-objects.c:2872
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "Konnte Art von Objekt '%s' nicht bestimmen."
+
+#: commit-graph.c:1358
+msgid "Loading known commits in commit graph"
+msgstr "Lade bekannte Commits in Commit-Graph"
+
+#: commit-graph.c:1375
+msgid "Expanding reachable commits in commit graph"
+msgstr "Erweitere erreichbare Commits in Commit-Graph"
+
+#: commit-graph.c:1395
+msgid "Clearing commit marks in commit graph"
+msgstr "Lösche Commit-Markierungen in Commit-Graph"
+
+#: commit-graph.c:1414
+msgid "Computing commit graph topological levels"
+msgstr "Topologische Ebenen des Commit-Graph werden berechnet"
+
+#: commit-graph.c:1467
+msgid "Computing commit graph generation numbers"
+msgstr "Commit-Graph Generationsnummern berechnen"
+
+#: commit-graph.c:1548
+msgid "Computing commit changed paths Bloom filters"
+msgstr "Berechnung der Bloom-Filter für veränderte Pfade des Commits"
+
+#: commit-graph.c:1625
+msgid "Collecting referenced commits"
+msgstr "Sammle referenzierte Commits"
+
+#: commit-graph.c:1650
+#, 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:1663
+#, c-format
+msgid "error adding pack %s"
+msgstr "Fehler beim Hinzufügen von Paket %s."
+
+#: commit-graph.c:1667
+#, c-format
+msgid "error opening index for %s"
+msgstr "Fehler beim Öffnen des Index für %s."
+
+#: commit-graph.c:1704
+msgid "Finding commits for commit graph among packed objects"
+msgstr "Suche Commits für Commit-Graph in gepackten Objekten"
+
+#: commit-graph.c:1722
+msgid "Finding extra edges in commit graph"
+msgstr "Suche zusätzliche Ränder in Commit-Graph"
+
+#: commit-graph.c:1771
+msgid "failed to write correct number of base graph ids"
+msgstr "Fehler beim Schreiben der korrekten Anzahl von Basis-Graph-IDs."
+
+#: commit-graph.c:1802 midx.c:794
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen."
+
+#: commit-graph.c:1815
+msgid "unable to create temporary graph layer"
+msgstr "konnte temporäre Graphen-Schicht nicht erstellen"
+
+#: commit-graph.c:1820
+#, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "konnte geteilte Zugriffsberechtigungen für '%s' nicht ändern"
+
+#: commit-graph.c:1879
+#, 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:1915
+msgid "unable to open commit-graph chain file"
+msgstr "konnte Commit-Graph Chain-Datei nicht öffnen"
+
+#: commit-graph.c:1931
+msgid "failed to rename base commit-graph file"
+msgstr "konnte Basis-Commit-Graph-Datei nicht umbenennen"
+
+#: commit-graph.c:1951
+msgid "failed to rename temporary commit-graph file"
+msgstr "konnte temporäre Commit-Graph-Datei nicht umbenennen"
+
+#: commit-graph.c:2084
+msgid "Scanning merged commits"
+msgstr "Durchsuche zusammengeführte Commits"
+
+#: commit-graph.c:2128
+msgid "Merging commit-graph"
+msgstr "Zusammenführen von Commit-Graph"
+
+#: commit-graph.c:2235
+msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
+msgstr ""
+"versuche einen Commit-Graph zu schreiben, aber 'core.commitGraph' ist "
+"deaktiviert"
+
+#: commit-graph.c:2342
+msgid "too many commits to write graph"
+msgstr "zu viele Commits zum Schreiben des Graphen"
+
+#: commit-graph.c:2440
+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:2450
+#, 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:2460 commit-graph.c:2475
+#, 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:2467
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "konnte Commit %s von Commit-Graph nicht parsen"
+
+#: commit-graph.c:2485
+msgid "Verifying commits in commit graph"
+msgstr "Commit in Commit-Graph überprüfen"
+
+#: commit-graph.c:2500
+#, 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:2507
+#, 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:2517
+#, 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:2526
+#, 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:2540
+#, 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:2545
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr ""
+"Commit-Graph hat Generationsnummer null für Commit %s, aber sonst ungleich "
+"null"
+
+#: commit-graph.c:2549
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr ""
+"Commit-Graph hat Generationsnummer ungleich null für Commit %s, aber sonst "
+"null"
+
+#: commit-graph.c:2566
+#, c-format
+msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
+msgstr "Commit-Graph Erstellung für Commit %s ist %<PRIuMAX> < %<PRIuMAX>"
+
+#: commit-graph.c:2572
+#, 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:2887 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr "konnte %s nicht parsen"
-#: commit.c:53
+#: commit.c:54
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s ist kein Commit!"
-#: commit.c:193
+#: commit.c:194
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -2103,28 +2454,28 @@
"Sie können diese Meldung unterdrücken, indem Sie\n"
"\"git config advice.graftFileDeprecated false\" ausführen."
-#: commit.c:1153
+#: commit.c:1223
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"Commit %s hat eine nicht vertrauenswürdige GPG-Signatur, angeblich von %s."
-#: commit.c:1157
+#: commit.c:1227
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "Commit %s hat eine ungültige GPG-Signatur, angeblich von %s."
-#: commit.c:1160
+#: commit.c:1230
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Commit %s hat keine GPG-Signatur."
-#: commit.c:1163
+#: commit.c:1233
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Commit %s hat eine gültige GPG-Signatur von %s\n"
-#: commit.c:1417
+#: commit.c:1487
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
@@ -2136,273 +2487,11 @@
"Encoding,\n"
"welches von ihrem Projekt verwendet wird.\n"
-#: commit-graph.c:122
-msgid "commit-graph file is too small"
-msgstr "Commit-Graph-Datei ist zu klein."
-
-#: commit-graph.c:189
-#, c-format
-msgid "commit-graph signature %X does not match signature %X"
-msgstr "Commit-Graph-Signatur %X stimmt nicht mit Signatur %X überein."
-
-#: commit-graph.c:196
-#, c-format
-msgid "commit-graph version %X does not match version %X"
-msgstr "Commit-Graph-Version %X stimmt nicht mit Version %X überein."
-
-#: commit-graph.c:203
-#, c-format
-msgid "commit-graph hash version %X does not match version %X"
-msgstr "Hash-Version des Commit-Graph %X stimmt nicht mit Version %X überein."
-
-#: commit-graph.c:226
-msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
-msgstr ""
-"fehlender Tabelleneintrag für Commit-Graph Chunk-Lookup; Datei "
-"möglicherweise unvollständig"
-
-#: commit-graph.c:237
-#, c-format
-msgid "commit-graph improper chunk offset %08x%08x"
-msgstr "Unzulässiger Commit-Graph Chunk-Offset %08x%08x"
-
-#: commit-graph.c:280
-#, c-format
-msgid "commit-graph chunk id %08x appears multiple times"
-msgstr "Commit-Graph Chunk-Id %08x kommt mehrfach vor."
-
-#: commit-graph.c:343
-msgid "commit-graph has no base graphs chunk"
-msgstr "Commit-Graph hat keinen Basis-Graph-Chunk"
-
-#: commit-graph.c:353
-msgid "commit-graph chain does not match"
-msgstr "Commit-Graph Verkettung stimmt nicht überein."
-
-#: commit-graph.c:401
-#, c-format
-msgid "invalid commit-graph chain: line '%s' not a hash"
-msgstr "Ungültige Commit-Graph Verkettung: Zeile '%s' ist kein Hash"
-
-#: commit-graph.c:425
-msgid "unable to find all commit-graph files"
-msgstr "Konnte nicht alle Commit-Graph-Dateien finden."
-
-#: commit-graph.c:558 commit-graph.c:618
-msgid "invalid commit position. commit-graph is likely corrupt"
-msgstr "Ungültige Commit-Position. Commit-Graph ist wahrscheinlich beschädigt."
-
-#: commit-graph.c:579
-#, c-format
-msgid "could not find commit %s"
-msgstr "Konnte Commit %s nicht finden."
-
-#: commit-graph.c:852 builtin/am.c:1292
-#, c-format
-msgid "unable to parse commit %s"
-msgstr "Konnte Commit '%s' nicht parsen."
-
-#: commit-graph.c:1011 builtin/pack-objects.c:2782
-#, c-format
-msgid "unable to get type of object %s"
-msgstr "Konnte Art von Objekt '%s' nicht bestimmen."
-
-#: commit-graph.c:1043
-msgid "Loading known commits in commit graph"
-msgstr "Lade bekannte Commits in Commit-Graph"
-
-#: commit-graph.c:1060
-msgid "Expanding reachable commits in commit graph"
-msgstr "Erweitere erreichbare Commits in Commit-Graph"
-
-#: commit-graph.c:1079
-msgid "Clearing commit marks in commit graph"
-msgstr "Lösche Commit-Markierungen in Commit-Graph"
-
-#: commit-graph.c:1098
-msgid "Computing commit graph generation numbers"
-msgstr "Commit-Graph Generationsnummern berechnen"
-
-#: commit-graph.c:1173
-#, c-format
-msgid "Finding commits for commit graph in %d pack"
-msgid_plural "Finding commits for commit graph in %d packs"
-msgstr[0] "Suche Commits für Commit-Graph in %d Paket"
-msgstr[1] "Suche Commits für Commit-Graph in %d Paketen"
-
-#: commit-graph.c:1186
-#, c-format
-msgid "error adding pack %s"
-msgstr "Fehler beim Hinzufügen von Paket %s."
-
-#: commit-graph.c:1190
-#, c-format
-msgid "error opening index for %s"
-msgstr "Fehler beim Öffnen des Index für %s."
-
-#: commit-graph.c:1214
-#, c-format
-msgid "Finding commits for commit graph from %d ref"
-msgid_plural "Finding commits for commit graph from %d refs"
-msgstr[0] "Suche Commits für Commit-Graph in %d Referenz"
-msgstr[1] "Suche Commits für Commit-Graph in %d Referenzen"
-
-#: commit-graph.c:1234
-#, c-format
-msgid "invalid commit object id: %s"
-msgstr "ungültige Commit-Objekt-ID: %s"
-
-#: commit-graph.c:1249
-msgid "Finding commits for commit graph among packed objects"
-msgstr "Suche Commits für Commit-Graph in gepackten Objekten"
-
-#: commit-graph.c:1264
-msgid "Counting distinct commits in commit graph"
-msgstr "Zähle Commits in Commit-Graph"
-
-#: commit-graph.c:1294
-msgid "Finding extra edges in commit graph"
-msgstr "Suche zusätzliche Ränder in Commit-Graph"
-
-#: commit-graph.c:1340
-msgid "failed to write correct number of base graph ids"
-msgstr "Fehler beim Schreiben der korrekten Anzahl von Basis-Graph-IDs."
-
-#: commit-graph.c:1373 midx.c:814
-#, c-format
-msgid "unable to create leading directories of %s"
-msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen."
-
-#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248
-#, c-format
-msgid "unable to create '%s'"
-msgstr "konnte '%s' nicht erstellen"
-
-#: commit-graph.c:1445
-#, c-format
-msgid "Writing out commit graph in %d pass"
-msgid_plural "Writing out commit graph in %d passes"
-msgstr[0] "Schreibe Commit-Graph in %d Durchgang"
-msgstr[1] "Schreibe Commit-Graph in %d Durchgängen"
-
-#: commit-graph.c:1486
-msgid "unable to open commit-graph chain file"
-msgstr "Konnte Commit-Graph Chain-Datei nicht öffnen."
-
-#: commit-graph.c:1498
-msgid "failed to rename base commit-graph file"
-msgstr "Konnte Basis-Commit-Graph-Datei nicht umbenennen."
-
-#: commit-graph.c:1518
-msgid "failed to rename temporary commit-graph file"
-msgstr "Konnte temporäre Commit-Graph-Datei nicht umbenennen."
-
-#: commit-graph.c:1631
-msgid "Scanning merged commits"
-msgstr "Durchsuche zusammengeführte Commits"
-
-#: commit-graph.c:1642
-#, c-format
-msgid "unexpected duplicate commit id %s"
-msgstr "Unerwartete doppelte Commit-ID %s"
-
-#: commit-graph.c:1665
-msgid "Merging commit-graph"
-msgstr "Zusammenführen von Commit-Graph"
-
-#: commit-graph.c:1844
-#, 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
-msgid "too many commits to write graph"
-msgstr "Zu viele Commits zum Schreiben des Graphen."
-
-#: commit-graph.c:1944
-msgid "the commit-graph file has incorrect checksum and is likely corrupt"
-msgstr ""
-"Die Commit-Graph-Datei hat eine falsche Prüfsumme und ist wahrscheinlich "
-"beschädigt."
-
-#: commit-graph.c:1954
-#, c-format
-msgid "commit-graph has incorrect OID order: %s then %s"
-msgstr "Commit-Graph hat fehlerhafte OID-Reihenfolge: %s dann %s"
-
-#: commit-graph.c:1964 commit-graph.c:1979
-#, c-format
-msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
-msgstr "Commit-Graph hat fehlerhaften Fanout-Wert: fanout[%d] = %u != %u"
-
-#: commit-graph.c:1971
-#, c-format
-msgid "failed to parse commit %s from commit-graph"
-msgstr "Konnte Commit %s von Commit-Graph nicht parsen."
-
-#: commit-graph.c:1989
-msgid "Verifying commits in commit graph"
-msgstr "Commit in Commit-Graph überprüfen"
-
-#: commit-graph.c:2003
-#, c-format
-msgid "failed to parse commit %s from object database for commit-graph"
-msgstr ""
-"Fehler beim Parsen des Commits %s von Objekt-Datenbank für Commit-Graph"
-
-#: commit-graph.c:2010
-#, c-format
-msgid "root tree OID for commit %s in commit-graph is %s != %s"
-msgstr ""
-"OID des Wurzelverzeichnisses für Commit %s in Commit-Graph ist %s != %s"
-
-#: commit-graph.c:2020
-#, c-format
-msgid "commit-graph parent list for commit %s is too long"
-msgstr "Commit-Graph Vorgänger-Liste für Commit %s ist zu lang"
-
-#: commit-graph.c:2029
-#, c-format
-msgid "commit-graph parent for %s is %s != %s"
-msgstr "Commit-Graph-Vorgänger für %s ist %s != %s"
-
-#: commit-graph.c:2042
-#, c-format
-msgid "commit-graph parent list for commit %s terminates early"
-msgstr "Commit-Graph Vorgänger-Liste für Commit %s endet zu früh"
-
-#: commit-graph.c:2047
-#, c-format
-msgid ""
-"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
-msgstr ""
-"Commit-Graph hat Generationsnummer null für Commit %s, aber sonst ungleich "
-"null"
-
-#: commit-graph.c:2051
-#, c-format
-msgid ""
-"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
-msgstr ""
-"Commit-Graph hat Generationsnummer ungleich null für Commit %s, aber sonst "
-"null"
-
-#: commit-graph.c:2066
-#, c-format
-msgid "commit-graph generation for commit %s is %u != %u"
-msgstr "Commit-Graph Erstellung für Commit %s ist %u != %u"
-
-#: commit-graph.c:2072
-#, 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>"
-
#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "Speicher verbraucht"
-#: config.c:124
+#: config.c:126
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2418,306 +2507,350 @@
"überschritten.\n"
"Das könnte durch zirkulare Includes entstanden sein."
-#: config.c:140
+#: config.c:142
#, c-format
msgid "could not expand include path '%s'"
msgstr "Konnte Include-Pfad '%s' nicht erweitern."
-#: config.c:151
+#: config.c:153
msgid "relative config includes must come from files"
msgstr "Relative Includes von Konfigurationen müssen aus Dateien kommen."
-#: config.c:197
+#: config.c:199
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:396
+#, c-format
+msgid "invalid config format: %s"
+msgstr "ungültiges Konfigurationsformat: %s"
+
+#: config.c:400
+#, c-format
+msgid "missing environment variable name for configuration '%.*s'"
+msgstr "fehlender Name der Umgebungsvariable für Konfiguration '%.*s'"
+
+#: config.c:405
+#, c-format
+msgid "missing environment variable '%s' for configuration '%.*s'"
+msgstr "fehlende Umgebungsvariable '%s' für Konfiguration '%.*s'"
+
+#: config.c:442
#, c-format
msgid "key does not contain a section: %s"
msgstr "Schlüssel enthält keine Sektion: %s"
-#: config.c:382
+#: config.c:448
#, c-format
msgid "key does not contain variable name: %s"
msgstr "Schlüssel enthält keinen Variablennamen: %s"
-#: config.c:406 sequencer.c:2444
+#: config.c:472 sequencer.c:2588
#, c-format
msgid "invalid key: %s"
msgstr "Ungültiger Schlüssel: %s"
-#: config.c:412
+#: config.c:478
#, c-format
msgid "invalid key (newline): %s"
msgstr "Ungültiger Schlüssel (neue Zeile): %s"
-#: config.c:448 config.c:460
+#: config.c:511
+msgid "empty config key"
+msgstr "leerer Konfigurationsschlüssel"
+
+#: config.c:529 config.c:541
#, c-format
msgid "bogus config parameter: %s"
msgstr "Fehlerhafter Konfigurationsparameter: %s"
-#: config.c:495
+#: config.c:555 config.c:572 config.c:579 config.c:588
#, c-format
msgid "bogus format in %s"
msgstr "Fehlerhaftes Format in %s"
-#: config.c:821
+#: config.c:622
+#, c-format
+msgid "bogus count in %s"
+msgstr "falsche Zählung in %s"
+
+#: config.c:626
+#, c-format
+msgid "too many entries in %s"
+msgstr "zu viele Einträge in %s"
+
+#: config.c:636
+#, c-format
+msgid "missing config key %s"
+msgstr "fehlender Konfigurationsschlüssel %s"
+
+#: config.c:644
+#, c-format
+msgid "missing config value %s"
+msgstr "fehlender Konfigurationswert %s"
+
+#: config.c:995
#, c-format
msgid "bad config line %d in blob %s"
msgstr "Ungültige Konfigurationszeile %d in Blob %s"
-#: config.c:825
+#: config.c:999
#, c-format
msgid "bad config line %d in file %s"
msgstr "Ungültige Konfigurationszeile %d in Datei %s"
-#: config.c:829
+#: config.c:1003
#, c-format
msgid "bad config line %d in standard input"
msgstr "Ungültige Konfigurationszeile %d in Standard-Eingabe"
-#: config.c:833
+#: config.c:1007
#, 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:1011
#, c-format
msgid "bad config line %d in command line %s"
msgstr "Ungültige Konfigurationszeile %d in Kommandozeile %s"
-#: config.c:841
+#: config.c:1015
#, c-format
msgid "bad config line %d in %s"
msgstr "Ungültige Konfigurationszeile %d in %s"
-#: config.c:978
+#: config.c:1152
msgid "out of range"
msgstr "Außerhalb des Bereichs"
-#: config.c:978
+#: config.c:1152
msgid "invalid unit"
msgstr "Ungültige Einheit"
-#: config.c:979
+#: config.c:1153
#, 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:1163
#, 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:1166
#, 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:1169
#, 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:1172
#, 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:1175
#, 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:1178
#, 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:1194
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr "ungültiger boolescher Konfigurationswert '%s' für '%s'"
+
+#: config.c:1289
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "Fehler beim Erweitern des Nutzerverzeichnisses in: '%s'"
-#: config.c:1117
+#: config.c:1298
#, 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:1391
#, 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:1405 config.c:1416
#, c-format
msgid "bad zlib compression level %d"
msgstr "ungültiger zlib Komprimierungsgrad %d"
-#: config.c:1325
+#: config.c:1508
msgid "core.commentChar should only be one character"
msgstr "core.commentChar sollte nur ein Zeichen sein"
-#: config.c:1358
+#: config.c:1541
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "Ungültiger Modus für Objekterstellung: %s"
-#: config.c:1430
+#: config.c:1613
#, c-format
msgid "malformed value for %s"
msgstr "Ungültiger Wert für %s."
-#: config.c:1456
+#: config.c:1639
#, c-format
msgid "malformed value for %s: %s"
msgstr "Ungültiger Wert für %s: %s"
-#: config.c:1457
+#: config.c:1640
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
"Muss einer von diesen sein: nothing, matching, simple, upstream, current"
-#: config.c:1518 builtin/pack-objects.c:3541
+#: config.c:1701 builtin/pack-objects.c:3666
#, c-format
msgid "bad pack compression level %d"
msgstr "ungültiger Komprimierungsgrad (%d) für Paketierung"
-#: config.c:1639
+#: config.c:1823
#, 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:1826
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "Referenz '%s' zeigt auf keinen Blob."
-#: config.c:1659
+#: config.c:1843
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "Konnte Blob '%s' für Konfiguration nicht auflösen."
-#: config.c:1689
+#: config.c:1873
#, c-format
msgid "failed to parse %s"
msgstr "Fehler beim Parsen von %s."
-#: config.c:1743
+#: config.c:1927
msgid "unable to parse command-line config"
msgstr ""
"Konnte die über die Befehlszeile angegebene Konfiguration nicht parsen."
-#: config.c:2097
+#: config.c:2290
msgid "unknown error occurred while reading the configuration files"
msgstr ""
"Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf."
-#: config.c:2267
+#: config.c:2464
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Ungültiger %s: '%s'"
-#: config.c:2312
+#: config.c:2509
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
"Der Wert '%d' von splitIndex.maxPercentChange sollte zwischen 0 und 100 "
"liegen."
-#: config.c:2358
+#: config.c:2555
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr ""
"Konnte Wert '%s' aus der über die Befehlszeile angegebenen Konfiguration\n"
"nicht parsen."
-#: config.c:2360
+#: config.c:2557
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "ungültige Konfigurationsvariable '%s' in Datei '%s' bei Zeile %d"
-#: config.c:2441
+#: config.c:2641
#, c-format
msgid "invalid section name '%s'"
msgstr "Ungültiger Sektionsname '%s'"
-#: config.c:2473
+#: config.c:2673
#, c-format
msgid "%s has multiple values"
msgstr "%s hat mehrere Werte"
-#: config.c:2502
+#: config.c:2702
#, c-format
msgid "failed to write new configuration file %s"
msgstr "Konnte neue Konfigurationsdatei '%s' nicht schreiben."
-#: config.c:2754 config.c:3078
+#: config.c:2954 config.c:3280
#, c-format
msgid "could not lock config file %s"
msgstr "Konnte Konfigurationsdatei '%s' nicht sperren."
-#: config.c:2765
+#: config.c:2965
#, c-format
msgid "opening %s"
msgstr "Öffne %s"
-#: config.c:2800 builtin/config.c:344
+#: config.c:3002 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "Ungültiges Muster: %s"
-#: config.c:2825
+#: config.c:3027
#, c-format
msgid "invalid config file %s"
msgstr "Ungültige Konfigurationsdatei %s"
-#: config.c:2838 config.c:3091
+#: config.c:3040 config.c:3293
#, c-format
msgid "fstat on %s failed"
msgstr "fstat auf %s fehlgeschlagen"
-#: config.c:2849
+#: config.c:3051
#, c-format
msgid "unable to mmap '%s'"
msgstr "mmap für '%s' fehlgeschlagen"
-#: config.c:2858 config.c:3096
+#: config.c:3060 config.c:3298
#, c-format
msgid "chmod on %s failed"
msgstr "chmod auf %s fehlgeschlagen"
-#: config.c:2943 config.c:3193
+#: config.c:3145 config.c:3395
#, c-format
msgid "could not write config file %s"
msgstr "Konnte Konfigurationsdatei %s nicht schreiben."
-#: config.c:2977
+#: config.c:3179
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "Konnte '%s' nicht zu '%s' setzen."
-#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
+#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
#, c-format
msgid "could not unset '%s'"
msgstr "Konnte '%s' nicht aufheben."
-#: config.c:3069
+#: config.c:3271
#, c-format
msgid "invalid section name: %s"
msgstr "Ungültiger Sektionsname: %s"
-#: config.c:3236
+#: config.c:3438
#, c-format
msgid "missing value for '%s'"
msgstr "Fehlender Wert für '%s'"
@@ -2744,74 +2877,83 @@
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:497
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr "unbekanntes Objekt-Format '%s' vom Server angegeben"
+
+#: connect.c:526
#, 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:530
msgid "expected flush after ref listing"
-msgstr "Erwartete Flush nach Auflistung der Referenzen."
+msgstr "Flush nach Auflistung der Referenzen erwartet"
-#: connect.c:544
+#: connect.c:533
+msgid "expected response end packet after ref listing"
+msgstr "Antwort-Endpaket nach Auflistung der Referenzen erwartet"
+
+#: connect.c:666
#, 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:717
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:757 connect.c:820
#, c-format
msgid "Looking up %s ... "
msgstr "Suche nach %s ..."
-#: connect.c:639
+#: connect.c:761
#, 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:765 connect.c:836
#, c-format
msgid ""
"done.\n"
@@ -2820,7 +2962,7 @@
"Fertig.\n"
"Verbinde nach %s (Port %s) ... "
-#: connect.c:665 connect.c:742
+#: connect.c:787 connect.c:864
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -2830,76 +2972,79 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:671 connect.c:748
+#: connect.c:793 connect.c:870
msgid "done."
msgstr "Fertig."
-#: connect.c:702
+#: connect.c:824
#, c-format
msgid "unable to look up %s (%s)"
msgstr "Fehler bei der Suche nach %s (%s)"
-#: connect.c:708
+#: connect.c:830
#, c-format
msgid "unknown port %s"
msgstr "Unbekannter Port %s"
-#: connect.c:845 connect.c:1175
+#: connect.c:967 connect.c:1299
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "Merkwürdigen Hostnamen '%s' blockiert."
-#: connect.c:847
+#: connect.c:969
#, c-format
msgid "strange port '%s' blocked"
msgstr "Merkwürdigen Port '%s' blockiert."
-#: connect.c:857
+#: connect.c:979
#, c-format
msgid "cannot start proxy %s"
msgstr "Kann Proxy %s nicht starten."
-#: connect.c:928
+#: connect.c:1050
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."
+msgstr "kein Pfad angegeben; siehe 'git help pull' für eine gültige URL-Syntax"
-#: connect.c:1123
+#: connect.c:1190
+msgid "newline is forbidden in git:// hosts and repo paths"
+msgstr "Zeilenumbruch ist in git:// Hosts und Repository-Pfaden verboten"
+
+#: connect.c:1247
msgid "ssh variant 'simple' does not support -4"
-msgstr "SSH-Variante 'simple' unterstützt kein -4."
+msgstr "SSH-Variante 'simple' unterstützt kein -4"
-#: connect.c:1135
+#: connect.c:1259
msgid "ssh variant 'simple' does not support -6"
-msgstr "SSH-Variante 'simple' unterstützt kein -6."
+msgstr "SSH-Variante 'simple' unterstützt kein -6"
-#: connect.c:1152
+#: connect.c:1276
msgid "ssh variant 'simple' does not support setting port"
-msgstr "SSH-Variante 'simple' unterstützt nicht das Setzen eines Ports."
+msgstr "SSH-Variante 'simple' unterstützt nicht das Setzen eines Ports"
-#: connect.c:1264
+#: connect.c:1388
#, c-format
msgid "strange pathname '%s' blocked"
-msgstr "Merkwürdigen Pfadnamen '%s' blockiert."
+msgstr "Merkwürdigen Pfadnamen '%s' blockiert"
-#: connect.c:1311
+#: connect.c:1436
msgid "unable to fork"
-msgstr "Kann Prozess nicht starten."
+msgstr "kann Prozess nicht starten"
-#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43
+#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45
msgid "Checking connectivity"
msgstr "Prüfe Konnektivität"
-#: connected.c:110
+#: connected.c:120
msgid "Could not run 'git rev-list'"
msgstr "Konnte 'git rev-list' nicht ausführen"
-#: connected.c:130
+#: connected.c:144
msgid "failed write to rev-list"
msgstr "Fehler beim Schreiben nach rev-list"
-#: connected.c:137
+#: 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:194
#, c-format
@@ -2909,7 +3054,7 @@
#: convert.c:207
#, c-format
msgid "CRLF would be replaced by LF in %s"
-msgstr "CRLF würde in %s durch LF ersetzt werden."
+msgstr "CRLF würde in %s durch LF ersetzt werden"
#: convert.c:209
#, c-format
@@ -2924,7 +3069,7 @@
#: convert.c:217
#, c-format
msgid "LF would be replaced by CRLF in %s"
-msgstr "LF würde in %s durch CRLF ersetzt werden."
+msgstr "LF würde in %s durch CRLF ersetzt werden"
#: convert.c:219
#, c-format
@@ -2939,7 +3084,7 @@
#: 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."
+msgstr "BOM ist in '%s' unzulässig, wenn als %s codiert"
#: convert.c:291
#, c-format
@@ -2953,7 +3098,7 @@
#: convert.c:304
#, c-format
msgid "BOM is required in '%s' if encoded as %s"
-msgstr "BOM ist erforderlich in '%s', wenn als %s codiert."
+msgstr "BOM ist erforderlich in '%s', wenn als %s codiert"
#: convert.c:306
#, c-format
@@ -2968,67 +3113,96 @@
#: 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."
+msgstr "Fehler beim Codieren von '%s' von %s nach %s"
#: 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."
+msgstr "Codierung von '%s' von %s nach %s und zurück ist nicht dasselbe"
-#: convert.c:668
+#: convert.c:665
#, c-format
msgid "cannot fork to run external filter '%s'"
-msgstr "Kann externen Filter '%s' nicht starten."
+msgstr "kann externen Filter '%s' nicht starten"
-#: convert.c:688
+#: convert.c:685
#, c-format
msgid "cannot feed the input to external filter '%s'"
-msgstr "Kann Eingaben nicht an externen Filter '%s' übergeben."
+msgstr "kann Eingaben nicht an externen Filter '%s' übergeben"
-#: convert.c:695
+#: convert.c:692
#, c-format
msgid "external filter '%s' failed %d"
-msgstr "Externer Filter '%s' fehlgeschlagen %d"
+msgstr "externer Filter '%s' fehlgeschlagen %d"
-#: convert.c:730 convert.c:733
+#: convert.c:727 convert.c:730
#, c-format
msgid "read from external filter '%s' failed"
-msgstr "Lesen von externem Filter '%s' fehlgeschlagen."
+msgstr "Lesen von externem Filter '%s' fehlgeschlagen"
-#: convert.c:736 convert.c:791
+#: convert.c:733 convert.c:788
#, c-format
msgid "external filter '%s' failed"
-msgstr "Externer Filter '%s' fehlgeschlagen."
+msgstr "externer Filter '%s' fehlgeschlagen"
-#: convert.c:839
+#: convert.c:837
msgid "unexpected filter type"
-msgstr "Unerwartete Filterart."
+msgstr "unerwartete Filterart"
-#: convert.c:850
+#: convert.c:848
msgid "path name too long for external filter"
-msgstr "Pfadname zu lang für externen Filter."
+msgstr "Pfadname zu lang für externen Filter"
-#: convert.c:924
+#: convert.c:940
#, c-format
msgid ""
"external filter '%s' is not available anymore although not all paths have "
"been filtered"
msgstr ""
-"Externer Filter '%s' nicht mehr verfügbar. Nicht alle Pfade wurden gefiltert."
+"externer Filter '%s' nicht mehr verfügbar, obwohl nicht alle Pfade gefiltert "
+"wurden"
-#: convert.c:1223
+#: convert.c:1240
msgid "true/false are no valid working-tree-encodings"
-msgstr "true/false sind keine gültigen Codierungen im Arbeitsverzeichnis."
+msgstr "true/false sind keine gültigen Codierungen im Arbeitsverzeichnis"
-#: convert.c:1411 convert.c:1445
+#: convert.c:1428 convert.c:1462
#, c-format
msgid "%s: clean filter '%s' failed"
-msgstr "%s: clean-Filter '%s' fehlgeschlagen."
+msgstr "%s: clean-Filter '%s' fehlgeschlagen"
-#: convert.c:1489
+#: convert.c:1508
#, c-format
msgid "%s: smudge filter %s failed"
-msgstr "%s: smudge-Filter '%s' fehlgeschlagen."
+msgstr "%s: smudge-Filter '%s' fehlgeschlagen"
+
+#: 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"
@@ -3117,22 +3291,38 @@
#, c-format
msgid "island regex from config has too many capture groups (max=%d)"
msgstr ""
-"Regulärer Ausdruck des Delta-Island aus Konfiguration hat zu\n"
-"viele Capture-Gruppen (maximal %d)."
+"regulärer Ausdruck des Delta-Island aus Konfiguration hat zu\n"
+"viele Capture-Gruppen (maximal %d)"
#: delta-islands.c:467
#, c-format
msgid "Marked %d islands, done.\n"
msgstr "%d Delta-Islands markiert, fertig.\n"
-#: diffcore-order.c:24
+#: diff-merges.c:70
#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "Fehler beim Lesen der Reihenfolgedatei '%s'."
+msgid "unknown value for --diff-merges: %s"
+msgstr "unbekannter Wert für --diff-merges: %s"
-#: diffcore-rename.c:543
-msgid "Performing inexact rename detection"
-msgstr "Führe Erkennung für ungenaue Umbenennung aus"
+#: diff-lib.c:534
+msgid "--merge-base does not work with ranges"
+msgstr "--merge-base funktioniert nicht mit Bereichen"
+
+#: diff-lib.c:536
+msgid "--merge-base only works with commits"
+msgstr "--merge-base funktioniert nur mit Commits"
+
+#: diff-lib.c:553
+msgid "unable to get HEAD"
+msgstr "konnte HEAD nicht bekommen"
+
+#: diff-lib.c:560
+msgid "no merge base found"
+msgstr "keine Merge-Basis gefunden"
+
+#: diff-lib.c:562
+msgid "multiple merge bases found"
+msgstr "mehrere Merge-Basen gefunden"
#: diff-no-index.c:238
msgid "git diff --no-index [<options>] <path> <path>"
@@ -3146,18 +3336,18 @@
"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'"
@@ -3165,7 +3355,7 @@
"\"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', "
@@ -3174,7 +3364,7 @@
"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"
@@ -3182,12 +3372,12 @@
"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"
@@ -3196,36 +3386,36 @@
"Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n"
"%s"
-#: diff.c:4202
+#: diff.c:4276
#, c-format
msgid "external diff died, stopping at %s"
msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s"
-#: diff.c:4547
+#: diff.c:4628
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
"--name-only, --name-status, --check und -s schließen sich gegenseitig aus"
-#: diff.c:4550
+#: diff.c:4631
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G, -S und --find-object schließen sich gegenseitig aus"
-#: diff.c:4628
+#: diff.c:4710
msgid "--follow requires exactly one pathspec"
msgstr "--follow erfordert genau eine Pfadspezifikation"
-#: diff.c:4676
+#: diff.c:4758
#, c-format
msgid "invalid --stat value: %s"
msgstr "Ungültiger --stat Wert: %s"
-#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
-#: parse-options.c:197 parse-options.c:201
+#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306
+#: 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:4713
+#: diff.c:4795
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3234,42 +3424,42 @@
"Fehler beim Parsen des --dirstat/-X Optionsparameters:\n"
"%s"
-#: diff.c:4798
+#: diff.c:4880
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
-msgstr "Unbekannte Änderungsklasse '%c' in --diff-filter=%s"
+msgstr "unbekannte Änderungsklasse '%c' in --diff-filter=%s"
-#: diff.c:4822
+#: diff.c:4904
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
-msgstr "Unbekannter Wert nach ws-error-highlight=%.*s"
+msgstr "unbekannter Wert nach ws-error-highlight=%.*s"
-#: diff.c:4836
+#: diff.c:4918
#, c-format
msgid "unable to resolve '%s'"
msgstr "konnte '%s' nicht auflösen"
-#: diff.c:4886 diff.c:4892
+#: diff.c:4968 diff.c:4974
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s erwartet die Form <n>/<m>"
-#: diff.c:4904
+#: diff.c:4986
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s erwartet ein Zeichen, '%s' bekommen"
-#: diff.c:4925
+#: diff.c:5007
#, c-format
msgid "bad --color-moved argument: %s"
-msgstr "Ungültiges --color-moved Argument: %s"
+msgstr "ungültiges --color-moved Argument: %s"
-#: diff.c:4944
+#: diff.c:5026
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
-msgstr "Ungültiger Modus '%s' in --color-moved-ws"
+msgstr "ungültiger Modus '%s' in --color-moved-ws"
-#: diff.c:4984
+#: diff.c:5066
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
@@ -3277,480 +3467,502 @@
"Option diff-algorithm akzeptiert: \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
-#: diff.c:5020 diff.c:5040
+#: diff.c:5102 diff.c:5122
#, c-format
msgid "invalid argument to %s"
-msgstr "Ungültiges Argument für %s"
+msgstr "ungültiges Argument für %s"
-#: diff.c:5178
+#: diff.c:5226
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr "ungültiger regulärer Ausdruck für -I gegeben: '%s'"
+
+#: diff.c:5275
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'"
-#: diff.c:5234
+#: diff.c:5331
#, c-format
msgid "bad --word-diff argument: %s"
-msgstr "Ungültiges --word-diff Argument: %s"
+msgstr "ungültiges --word-diff Argument: %s"
-#: diff.c:5257
+#: diff.c:5367
msgid "Diff output format options"
msgstr "Diff-Optionen zu Ausgabeformaten"
-#: diff.c:5259 diff.c:5265
+#: diff.c:5369 diff.c:5375
msgid "generate patch"
-msgstr "Erzeuge Patch"
+msgstr "Patch erzeugen"
-#: diff.c:5262 builtin/log.c:173
+#: diff.c:5372 builtin/log.c:179
msgid "suppress diff output"
msgstr "Ausgabe der Unterschiede unterdrücken"
-#: diff.c:5267 diff.c:5381 diff.c:5388
+#: diff.c:5377 diff.c:5491 diff.c:5498
msgid "<n>"
msgstr "<n>"
-#: diff.c:5268 diff.c:5271
+#: diff.c:5378 diff.c:5381
msgid "generate diffs with <n> lines context"
-msgstr "Erstelle Unterschiede mit <n> Zeilen des Kontextes"
+msgstr "Unterschiede mit <n> Zeilen des Kontextes erstellen"
-#: diff.c:5273
+#: diff.c:5383
msgid "generate the diff in raw format"
-msgstr "Erstelle Unterschiede im Rohformat"
+msgstr "Unterschiede im Rohformat erstellen"
-#: diff.c:5276
+#: diff.c:5386
msgid "synonym for '-p --raw'"
msgstr "Synonym für '-p --raw'"
-#: diff.c:5280
+#: diff.c:5390
msgid "synonym for '-p --stat'"
msgstr "Synonym für '-p --stat'"
-#: diff.c:5284
+#: diff.c:5394
msgid "machine friendly --stat"
msgstr "maschinenlesbare Ausgabe von --stat"
-#: diff.c:5287
+#: diff.c:5397
msgid "output only the last line of --stat"
msgstr "nur die letzte Zeile von --stat ausgeben"
-#: diff.c:5289 diff.c:5297
+#: diff.c:5399 diff.c:5407
msgid "<param1,param2>..."
msgstr "<Parameter1,Parameter2>..."
-#: diff.c:5290
+#: diff.c:5400
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"
+"die Verteilung des relativen Umfangs der Änderungen für jedes "
+"Unterverzeichnis ausgeben"
-#: diff.c:5294
+#: diff.c:5404
msgid "synonym for --dirstat=cumulative"
msgstr "Synonym für --dirstat=cumulative"
-#: diff.c:5298
+#: diff.c:5408
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "Synonym für --dirstat=files,Parameter1,Parameter2..."
-#: diff.c:5302
+#: diff.c:5412
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
-"Warnen, wenn Änderungen Konfliktmarker oder Whitespace-Fehler einbringen"
+"warnen, wenn Änderungen Konfliktmarker oder Whitespace-Fehler einbringen"
-#: diff.c:5305
+#: diff.c:5415
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
-"Gekürzte Zusammenfassung, wie z.B. Erstellungen, Umbenennungen und "
+"gekürzte Zusammenfassung, wie z.B. Erstellungen, Umbenennungen und "
"Änderungen der Datei-Rechte"
-#: diff.c:5308
+#: diff.c:5418
msgid "show only names of changed files"
msgstr "nur Dateinamen der geänderten Dateien anzeigen"
-#: diff.c:5311
+#: diff.c:5421
msgid "show only names and status of changed files"
msgstr "nur Dateinamen und Status der geänderten Dateien anzeigen"
-#: diff.c:5313
+#: diff.c:5423
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<Breite>[,<Namens-Breite>[,<Anzahl>]]"
-#: diff.c:5314
+#: diff.c:5424
msgid "generate diffstat"
-msgstr "Generiere Zusammenfassung der Unterschiede"
+msgstr "Zusammenfassung der Unterschiede erzeugen"
-#: diff.c:5316 diff.c:5319 diff.c:5322
+#: diff.c:5426 diff.c:5429 diff.c:5432
msgid "<width>"
msgstr "<Breite>"
-#: diff.c:5317
+#: diff.c:5427
msgid "generate diffstat with a given width"
-msgstr "Erzeuge Zusammenfassung der Unterschiede mit gegebener Breite"
+msgstr "Zusammenfassung der Unterschiede mit gegebener Breite erzeugen"
-#: diff.c:5320
+#: diff.c:5430
msgid "generate diffstat with a given name width"
-msgstr "Erzeuge Zusammenfassung der Unterschiede mit gegebener Namens-Breite"
+msgstr "Zusammenfassung der Unterschiede mit gegebener Namens-Breite erzeugen"
-#: diff.c:5323
+#: diff.c:5433
msgid "generate diffstat with a given graph width"
-msgstr "Erzeuge Zusammenfassung der Unterschiede mit gegebener Graph-Breite"
+msgstr "Zusammenfassung der Unterschiede mit gegebener Graph-Breite erzeugen"
-#: diff.c:5325
+#: diff.c:5435
msgid "<count>"
msgstr "<Anzahl>"
-#: diff.c:5326
+#: diff.c:5436
msgid "generate diffstat with limited lines"
-msgstr "Erzeuge Zusammenfassung der Unterschiede mit begrenzten Zeilen"
+msgstr "Zusammenfassung der Unterschiede mit begrenzten Zeilen erzeugen"
-#: diff.c:5329
+#: diff.c:5439
msgid "generate compact summary in diffstat"
-msgstr "Erzeuge kompakte Zusammenstellung in Zusammenfassung der Unterschiede"
+msgstr "kompakte Zusammenstellung in Zusammenfassung der Unterschiede erzeugen"
-#: diff.c:5332
+#: diff.c:5442
msgid "output a binary diff that can be applied"
-msgstr "Gebe eine binäre Differenz aus, dass angewendet werden kann"
+msgstr "eine binäre Differenz ausgeben, dass angewendet werden kann"
-#: diff.c:5335
+#: diff.c:5445
msgid "show full pre- and post-image object names on the \"index\" lines"
-msgstr "Zeige vollständige Objekt-Namen in den \"index\"-Zeilen"
+msgstr "vollständige Objekt-Namen in den \"index\"-Zeilen anzeigen"
-#: diff.c:5337
+#: diff.c:5447
msgid "show colored diff"
-msgstr "Zeige farbige Unterschiede"
+msgstr "farbige Unterschiede anzeigen"
-#: diff.c:5338
+#: diff.c:5448
msgid "<kind>"
msgstr "<Art>"
-#: diff.c:5339
+#: diff.c:5449
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgstr ""
-"Hebe Whitespace-Fehler in den Zeilen 'context', 'old' oder 'new' bei den "
-"Unterschieden hervor"
+"Whitespace-Fehler in den Zeilen 'context', 'old' oder 'new' bei den "
+"Unterschieden hervorheben"
-#: diff.c:5342
+#: diff.c:5452
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
msgstr ""
-"Verschleiere nicht die Pfadnamen und nutze NUL-Zeichen als Schlusszeichen in "
-"Ausgabefeldern bei --raw oder --numstat"
+"die Pfadnamen nicht verschleiern und NUL-Zeichen als Schlusszeichen in "
+"Ausgabefeldern bei --raw oder --numstat nutzen"
-#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457
+#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570
msgid "<prefix>"
msgstr "<Präfix>"
-#: diff.c:5346
+#: diff.c:5456
msgid "show the given source prefix instead of \"a/\""
-msgstr "Zeige den gegebenen Quell-Präfix statt \"a/\""
+msgstr "den gegebenen Quell-Präfix statt \"a/\" anzeigen"
-#: diff.c:5349
+#: diff.c:5459
msgid "show the given destination prefix instead of \"b/\""
-msgstr "Zeige den gegebenen Ziel-Präfix statt \"b/\""
+msgstr "den gegebenen Ziel-Präfix statt \"b/\" anzeigen"
-#: diff.c:5352
+#: diff.c:5462
msgid "prepend an additional prefix to every line of output"
-msgstr "Stelle einen zusätzlichen Präfix bei jeder Ausgabezeile voran"
+msgstr "einen zusätzlichen Präfix bei jeder Ausgabezeile voranstellen"
-#: diff.c:5355
+#: diff.c:5465
msgid "do not show any source or destination prefix"
-msgstr "Zeige keine Quell- oder Ziel-Präfixe an"
+msgstr "keine Quell- oder Ziel-Präfixe anzeigen"
-#: diff.c:5358
+#: diff.c:5468
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."
+"Kontext zwischen Unterschied-Blöcken bis zur angegebenen Anzahl von Zeilen "
+"anzeigen"
-#: diff.c:5362 diff.c:5367 diff.c:5372
+#: diff.c:5472 diff.c:5477 diff.c:5482
msgid "<char>"
msgstr "<Zeichen>"
-#: diff.c:5363
+#: diff.c:5473
msgid "specify the character to indicate a new line instead of '+'"
-msgstr "Das Zeichen festlegen, das eine neue Zeile kennzeichnet (statt '+')"
+msgstr "das Zeichen festlegen, das eine neue Zeile kennzeichnet (statt '+')"
-#: diff.c:5368
+#: diff.c:5478
msgid "specify the character to indicate an old line instead of '-'"
-msgstr "Das Zeichen festlegen, das eine alte Zeile kennzeichnet (statt '-')"
+msgstr "das Zeichen festlegen, das eine alte Zeile kennzeichnet (statt '-')"
-#: diff.c:5373
+#: diff.c:5483
msgid "specify the character to indicate a context instead of ' '"
-msgstr "Das Zeichen festlegen, das den Kontext kennzeichnet (statt ' ')"
+msgstr "das Zeichen festlegen, das den Kontext kennzeichnet (statt ' ')"
-#: diff.c:5376
+#: diff.c:5486
msgid "Diff rename options"
msgstr "Diff-Optionen zur Umbenennung"
-#: diff.c:5377
+#: diff.c:5487
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5378
+#: diff.c:5488
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
-"Teile komplette Rewrite-Änderungen in Änderungen mit \"löschen\" und "
+"teile komplette Rewrite-Änderungen in Änderungen mit \"löschen\" und "
"\"erstellen\""
-#: diff.c:5382
+#: diff.c:5492
msgid "detect renames"
msgstr "Umbenennungen erkennen"
-#: diff.c:5386
+#: diff.c:5496
msgid "omit the preimage for deletes"
-msgstr "Preimage für Löschungen weglassen."
+msgstr "Preimage für Löschungen weglassen"
-#: diff.c:5389
+#: diff.c:5499
msgid "detect copies"
msgstr "Kopien erkennen"
-#: diff.c:5393
+#: diff.c:5503
msgid "use unmodified files as source to find copies"
-msgstr "Nutze ungeänderte Dateien als Quelle zum Finden von Kopien"
+msgstr "ungeänderte Dateien als Quelle zum Finden von Kopien nutzen"
-#: diff.c:5395
+#: diff.c:5505
msgid "disable rename detection"
msgstr "Erkennung von Umbenennungen deaktivieren"
-#: diff.c:5398
+#: diff.c:5508
msgid "use empty blobs as rename source"
-msgstr "Nutze leere Blobs als Quelle von Umbennungen"
+msgstr "leere Blobs als Quelle von Umbenennungen nutzen"
-#: diff.c:5400
+#: diff.c:5510
msgid "continue listing the history of a file beyond renames"
-msgstr "Fortführen der Auflistung der Historie einer Datei nach Umbennung"
+msgstr "Auflistung der Historie einer Datei nach Umbenennung fortführen"
-#: diff.c:5403
+#: diff.c:5513
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr ""
-"Verhindere die Erkennung von Umbennungen und Kopien, wenn die Anzahl der "
-"Ziele für Umbennungen und Kopien das gegebene Limit überschreitet"
+"Erkennung von Umbenennungen und Kopien verhindern, wenn die Anzahl der Ziele "
+"für Umbenennungen und Kopien das gegebene Limit überschreitet"
-#: diff.c:5405
+#: diff.c:5515
msgid "Diff algorithm options"
msgstr "Diff Algorithmus-Optionen"
-#: diff.c:5407
+#: diff.c:5517
msgid "produce the smallest possible diff"
-msgstr "Erzeuge die kleinstmöglichen Änderungen"
+msgstr "die kleinstmöglichen Änderungen erzeugen"
-#: diff.c:5410
+#: diff.c:5520
msgid "ignore whitespace when comparing lines"
msgstr "Whitespace-Änderungen beim Vergleich von Zeilen ignorieren"
-#: diff.c:5413
+#: diff.c:5523
msgid "ignore changes in amount of whitespace"
msgstr "Änderungen bei der Anzahl von Whitespace ignorieren"
-#: diff.c:5416
+#: diff.c:5526
msgid "ignore changes in whitespace at EOL"
msgstr "Whitespace-Änderungen am Zeilenende ignorieren"
-#: diff.c:5419
+#: diff.c:5529
msgid "ignore carrier-return at the end of line"
-msgstr "Ignoriere den Zeilenumbruch am Ende der Zeile"
+msgstr "den Zeilenumbruch am Ende der Zeile ignorieren"
-#: diff.c:5422
+#: diff.c:5532
msgid "ignore changes whose lines are all blank"
-msgstr "Ignoriere Änderungen in leeren Zeilen"
+msgstr "Änderungen in leeren Zeilen ignorieren"
-#: diff.c:5425
+#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604
+msgid "<regex>"
+msgstr "<Regex>"
+
+#: diff.c:5535
+msgid "ignore changes whose all lines match <regex>"
+msgstr ""
+"Änderungen ignorieren, bei denen alle Zeilen mit <Regex> übereinstimmen"
+
+#: diff.c:5538
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
"Heuristik, um Grenzen der Änderungsblöcke für bessere Lesbarkeit zu "
"verschieben"
-#: diff.c:5428
+#: diff.c:5541
msgid "generate diff using the \"patience diff\" algorithm"
-msgstr "Erzeuge Änderungen durch Nutzung des Algorithmus \"Patience Diff\""
+msgstr "Änderungen durch Nutzung des Algorithmus \"Patience Diff\" erzeugen"
-#: diff.c:5432
+#: diff.c:5545
msgid "generate diff using the \"histogram diff\" algorithm"
-msgstr "Erzeuge Änderungen durch Nutzung des Algorithmus \"Histogram Diff\""
+msgstr "Änderungen durch Nutzung des Algorithmus \"Histogram Diff\" erzeugen"
-#: diff.c:5434
+#: diff.c:5547
msgid "<algorithm>"
msgstr "<Algorithmus>"
-#: diff.c:5435
+#: diff.c:5548
msgid "choose a diff algorithm"
-msgstr "Ein Algorithmus für Änderungen wählen"
+msgstr "einen Algorithmus für Änderungen wählen"
-#: diff.c:5437
+#: diff.c:5550
msgid "<text>"
msgstr "<Text>"
-#: diff.c:5438
+#: diff.c:5551
msgid "generate diff using the \"anchored diff\" algorithm"
-msgstr "Erzeuge Änderungen durch Nutzung des Algorithmus \"Anchored Diff\""
+msgstr "Änderungen durch Nutzung des Algorithmus \"Anchored Diff\" erzeugen"
-#: diff.c:5440 diff.c:5449 diff.c:5452
+#: diff.c:5553 diff.c:5562 diff.c:5565
msgid "<mode>"
msgstr "<Modus>"
-#: diff.c:5441
+#: diff.c:5554
msgid "show word diff, using <mode> to delimit changed words"
-msgstr "Zeige Wort-Änderungen, nutze <Modus>, um Wörter abzugrenzen"
+msgstr "Wort-Änderungen zeigen, nutze <Modus>, um Wörter abzugrenzen"
-#: diff.c:5443 diff.c:5446 diff.c:5491
-msgid "<regex>"
-msgstr "<Regex>"
-
-#: diff.c:5444
+#: diff.c:5557
msgid "use <regex> to decide what a word is"
-msgstr "Nutze <Regex>, um zu entscheiden, was ein Wort ist"
+msgstr "<Regex> nutzen, um zu entscheiden, was ein Wort ist"
-#: diff.c:5447
+#: diff.c:5560
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
-msgstr "Entsprechend wie --word-diff=color --word-diff-regex=<Regex>"
+msgstr "entsprechend wie --word-diff=color --word-diff-regex=<Regex>"
-#: diff.c:5450
+#: diff.c:5563
msgid "moved lines of code are colored differently"
-msgstr "Verschobene Codezeilen sind andersfarbig"
+msgstr "verschobene Codezeilen sind andersfarbig"
-#: diff.c:5453
+#: diff.c:5566
msgid "how white spaces are ignored in --color-moved"
-msgstr "Wie Whitespaces in --color-moved ignoriert werden"
+msgstr "wie Whitespaces in --color-moved ignoriert werden"
-#: diff.c:5456
+#: diff.c:5569
msgid "Other diff options"
msgstr "Andere Diff-Optionen"
-#: diff.c:5458
+#: diff.c:5571
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
-"Wenn vom Unterverzeichnis aufgerufen, schließe Änderungen außerhalb aus und "
+"wenn vom Unterverzeichnis aufgerufen, schließe Änderungen außerhalb aus und "
"zeige relative Pfade an"
-#: diff.c:5462
+#: diff.c:5575
msgid "treat all files as text"
msgstr "alle Dateien als Text behandeln"
-#: diff.c:5464
+#: diff.c:5577
msgid "swap two inputs, reverse the diff"
-msgstr "Vertausche die beiden Eingaben und drehe die Änderungen um"
+msgstr "die beiden Eingaben vertauschen und die Änderungen umkehren"
-#: diff.c:5466
+#: diff.c:5579
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr ""
-"Beende mit Exit-Status 1, wenn Änderungen vorhanden sind, andernfalls mit 0"
+"mit Exit-Status 1 beenden, wenn Änderungen vorhanden sind, andernfalls mit 0"
-#: diff.c:5468
+#: diff.c:5581
msgid "disable all output of the program"
-msgstr "Keine Ausgaben vom Programm"
+msgstr "alle Ausgaben vom Programm deaktivieren"
-#: diff.c:5470
+#: diff.c:5583
msgid "allow an external diff helper to be executed"
-msgstr "Erlaube die Ausführung eines externes Programms für Änderungen"
+msgstr "erlaube die Ausführung eines externes Programms für Änderungen"
-#: diff.c:5472
+#: diff.c:5585
msgid "run external text conversion filters when comparing binary files"
msgstr ""
"Führe externe Text-Konvertierungsfilter aus, wenn binäre Dateien vergleicht "
"werden"
-#: diff.c:5474
+#: diff.c:5587
msgid "<when>"
msgstr "<wann>"
-#: diff.c:5475
+#: diff.c:5588
msgid "ignore changes to submodules in the diff generation"
msgstr ""
"Änderungen in Submodulen während der Erstellung der Unterschiede ignorieren"
-#: diff.c:5478
+#: diff.c:5591
msgid "<format>"
msgstr "<Format>"
-#: diff.c:5479
+#: diff.c:5592
msgid "specify how differences in submodules are shown"
-msgstr "Angeben, wie Unterschiede in Submodulen gezeigt werden"
+msgstr "angeben, wie Unterschiede in Submodulen gezeigt werden"
-#: diff.c:5483
+#: diff.c:5596
msgid "hide 'git add -N' entries from the index"
-msgstr "verstecke 'git add -N' Einträge vom Index"
+msgstr "'git add -N' Einträge vom Index verstecken"
-#: diff.c:5486
+#: diff.c:5599
msgid "treat 'git add -N' entries as real in the index"
-msgstr "Behandle 'git add -N' Einträge im Index als echt"
+msgstr "'git add -N' Einträge im Index als echt behandeln"
-#: diff.c:5488
+#: diff.c:5601
msgid "<string>"
msgstr "<Zeichenkette>"
-#: diff.c:5489
+#: diff.c:5602
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr ""
-"Suche nach Unterschieden, welche die Anzahl des Vorkommens der angegebenen "
+"nach Unterschieden suchen, welche die Anzahl des Vorkommens der angegebenen "
"Zeichenkette verändern"
-#: diff.c:5492
+#: diff.c:5605
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr ""
-"Suche nach Unterschieden, welche die Anzahl des Vorkommens des angegebenen "
+"nach Unterschieden suchen, welche die Anzahl des Vorkommens des angegebenen "
"regulären Ausdrucks verändern"
-#: diff.c:5495
+#: diff.c:5608
msgid "show all changes in the changeset with -S or -G"
-msgstr "zeige alle Änderungen im Changeset mit -S oder -G"
+msgstr "alle Änderungen im Changeset mit -S oder -G anzeigen"
-#: diff.c:5498
+#: diff.c:5611
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr ""
-"behandle <Zeichenkette> bei -S als erweiterten POSIX regulären Ausdruck"
+"<Zeichenkette> bei -S als erweiterten POSIX regulären Ausdruck behandeln"
-#: diff.c:5501
+#: diff.c:5614
msgid "control the order in which files appear in the output"
msgstr ""
-"kontrolliere die Reihenfolge, in der die Dateien in der Ausgabe erscheinen"
+"die Reihenfolge kontrollieren, in der die Dateien in der Ausgabe erscheinen"
-#: diff.c:5502
+#: diff.c:5615 diff.c:5618
+msgid "<path>"
+msgstr "<Pfad>"
+
+#: diff.c:5616
+msgid "show the change in the specified path first"
+msgstr "die Änderung des angegebenen Pfades zuerst anzeigen"
+
+#: diff.c:5619
+msgid "skip the output to the specified path"
+msgstr "überspringe die Ausgabe bis zum angegebenen Pfad"
+
+#: diff.c:5621
msgid "<object-id>"
msgstr "<Objekt-ID>"
-#: diff.c:5503
+#: diff.c:5622
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr ""
-"Suche nach Unterschieden, welche die Anzahl des Vorkommens des angegebenen "
+"nach Unterschieden suchen, welche die Anzahl des Vorkommens des angegebenen "
"Objektes verändern"
-#: diff.c:5505
+#: diff.c:5624
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5506
+#: diff.c:5625
msgid "select files by diff type"
-msgstr "Wähle Dateien anhand der Art der Änderung"
+msgstr "Dateien anhand der Art der Änderung wählen"
-#: diff.c:5508
+#: diff.c:5627
msgid "<file>"
msgstr "<Datei>"
-#: diff.c:5509
+#: diff.c:5628
msgid "Output to a specific file"
msgstr "Ausgabe zu einer bestimmten Datei"
-#: diff.c:6164
+#: diff.c:6285
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
-"Ungenaue Erkennung für Umbenennungen wurde aufgrund zu vieler Dateien\n"
+"ungenaue Erkennung für Umbenennungen wurde aufgrund zu vieler Dateien\n"
"übersprungen."
-#: diff.c:6167
+#: diff.c:6288
msgid "only found copies from modified paths due to too many files."
msgstr "nur Kopien von geänderten Pfaden, aufgrund zu vieler Dateien, gefunden"
-#: diff.c:6170
+#: diff.c:6291
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -3758,341 +3970,376 @@
"Sie könnten die Variable %s auf mindestens %d setzen und den Befehl\n"
"erneut versuchen."
-#: dir.c:555
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "Fehler beim Lesen der Reihenfolgedatei '%s'"
+
+#: diffcore-rename.c:786
+msgid "Performing inexact rename detection"
+msgstr "Führe Erkennung für ungenaue Umbenennung aus"
+
+#: diffcore-rotate.c:29
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr "Pfad '%s' nicht im Diff gefunden"
+
+#: 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."
+msgstr "Pfadspezifikation '%s' stimmt mit keinen git-bekannten Dateien überein"
-#: dir.c:695 dir.c:724 dir.c:737
+#: dir.c:718 dir.c:747 dir.c:760
#, c-format
msgid "unrecognized pattern: '%s'"
-msgstr "Unbekanntes Muster: '%s'"
+msgstr "unbekanntes Muster: '%s'"
-#: dir.c:754 dir.c:768
+#: dir.c:777 dir.c:791
#, c-format
msgid "unrecognized negative pattern: '%s'"
-msgstr "Unbekanntes verneinendes Muster: '%s'"
+msgstr "unbekanntes verneinendes Muster: '%s'"
-#: dir.c:786
+#: 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:796
+#: dir.c:819
msgid "disabling cone pattern matching"
-msgstr "Deaktiviere Cone-Muster-Übereinstimmung"
+msgstr "deaktiviere Cone-Muster-Übereinstimmung"
-#: dir.c:1173
+#: dir.c:1198
#, c-format
msgid "cannot use %s as an exclude file"
-msgstr "Kann %s nicht als exclude-Filter benutzen."
+msgstr "kann %s nicht als exclude-Filter benutzen"
-#: dir.c:2144
+#: dir.c:2305
#, c-format
msgid "could not open directory '%s'"
-msgstr "Konnte Verzeichnis '%s' nicht öffnen."
+msgstr "konnte Verzeichnis '%s' nicht öffnen"
-#: dir.c:2479
+#: dir.c:2605
msgid "failed to get kernel name and information"
msgstr "Fehler beim Sammeln von Namen und Informationen zum Kernel"
-#: dir.c:2603
+#: 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."
+"für dieses Verzeichnis deaktiviert"
-#: dir.c:3407
+#: dir.c:3534
#, c-format
msgid "index file corrupt in repo %s"
-msgstr "Index-Datei in Repository %s beschädigt."
+msgstr "Index-Datei in Repository %s beschädigt"
-#: dir.c:3452 dir.c:3457
+#: dir.c:3579 dir.c:3584
#, c-format
msgid "could not create directories for %s"
-msgstr "Konnte Verzeichnisse für '%s' nicht erstellen."
+msgstr "Konnte Verzeichnisse für '%s' nicht erstellen"
-#: dir.c:3486
+#: dir.c:3613
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
-msgstr "Konnte Git-Verzeichnis nicht von '%s' nach '%s' migrieren."
+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."
+msgstr "konnte Datei '%s' nicht lesen"
-#: environment.c:149
+#: environment.c:152
#, c-format
msgid "bad git namespace path \"%s\""
-msgstr "Ungültiger Git-Namespace-Pfad \"%s\""
+msgstr "ungültiger Git-Namespace-Pfad \"%s\""
-#: environment.c:331
+#: environment.c:335
#, c-format
msgid "could not set GIT_DIR to '%s'"
-msgstr "Konnte GIT_DIR nicht zu '%s' setzen."
+msgstr "konnte GIT_DIR nicht zu '%s' setzen"
#: exec-cmd.c:363
#, c-format
msgid "too many args to run %s"
-msgstr "Zu viele Argumente angegeben, um %s auszuführen."
+msgstr "zu viele Argumente angegeben, um %s auszuführen"
-#: fetch-pack.c:150
+#: fetch-pack.c:177
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: erwartete shallow-Liste"
-#: fetch-pack.c:153
+#: fetch-pack.c:180
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr "git fetch-pack: erwartete ein Flush-Paket nach der shallow-Liste"
-#: fetch-pack.c:164
+#: fetch-pack.c:191
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack: ACK/NAK erwartet, Flush-Paket bekommen"
-#: fetch-pack.c:184
+#: fetch-pack.c:211
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: ACK/NAK erwartet, '%s' bekommen"
-#: fetch-pack.c:195
+#: fetch-pack.c:222
msgid "unable to write to remote"
msgstr "konnte nicht zum Remote schreiben"
-#: fetch-pack.c:257
+#: fetch-pack.c:283
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc benötigt multi_ack_detailed"
-#: fetch-pack.c:356 fetch-pack.c:1340
+#: fetch-pack.c:378 fetch-pack.c:1457
#, c-format
msgid "invalid shallow line: %s"
-msgstr "Ungültige shallow-Zeile: %s"
+msgstr "ungültige shallow-Zeile: %s"
-#: fetch-pack.c:362 fetch-pack.c:1346
+#: fetch-pack.c:384 fetch-pack.c:1463
#, c-format
msgid "invalid unshallow line: %s"
-msgstr "Ungültige unshallow-Zeile: %s"
+msgstr "ungültige unshallow-Zeile: %s"
-#: fetch-pack.c:364 fetch-pack.c:1348
+#: fetch-pack.c:386 fetch-pack.c:1465
#, c-format
msgid "object not found: %s"
msgstr "Objekt nicht gefunden: %s"
-#: fetch-pack.c:367 fetch-pack.c:1351
+#: fetch-pack.c:389 fetch-pack.c:1468
#, c-format
msgid "error in object: %s"
msgstr "Fehler in Objekt: %s"
-#: fetch-pack.c:369 fetch-pack.c:1353
+#: fetch-pack.c:391 fetch-pack.c:1470
#, c-format
msgid "no shallow found: %s"
-msgstr "Kein shallow-Objekt gefunden: %s"
+msgstr "kein shallow-Objekt gefunden: %s"
-#: fetch-pack.c:372 fetch-pack.c:1357
+#: fetch-pack.c:394 fetch-pack.c:1474
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "shallow/unshallow erwartet, %s bekommen"
-#: fetch-pack.c:414
+#: fetch-pack.c:434
#, c-format
msgid "got %s %d %s"
msgstr "%s %d %s bekommen"
-#: fetch-pack.c:431
+#: fetch-pack.c:451
#, c-format
msgid "invalid commit %s"
-msgstr "Ungültiger Commit %s"
+msgstr "ungültiger Commit %s"
-#: fetch-pack.c:462
+#: fetch-pack.c:482
msgid "giving up"
-msgstr "Gebe auf"
+msgstr "gebe auf"
-#: fetch-pack.c:475 progress.c:323
+#: fetch-pack.c:495 progress.c:339
msgid "done"
-msgstr "Fertig"
+msgstr "fertig"
-#: fetch-pack.c:487
+#: fetch-pack.c:507
#, c-format
msgid "got %s (%d) %s"
msgstr "%s (%d) %s bekommen"
-#: fetch-pack.c:533
+#: fetch-pack.c:543
#, c-format
msgid "Marking %s as complete"
msgstr "Markiere %s als vollständig"
-#: fetch-pack.c:754
+#: fetch-pack.c:758
#, c-format
msgid "already have %s (%s)"
msgstr "habe %s (%s) bereits"
-#: fetch-pack.c:818
+#: fetch-pack.c:844
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: Fehler beim Starten des sideband demultiplexer"
-#: fetch-pack.c:826
+#: fetch-pack.c:852
msgid "protocol error: bad pack header"
msgstr "Protokollfehler: ungültiger Pack-Header"
-#: fetch-pack.c:900
+#: fetch-pack.c:946
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: konnte %s nicht starten"
-#: fetch-pack.c:916
+#: fetch-pack.c:952
+msgid "fetch-pack: invalid index-pack output"
+msgstr "fetch-pack: ungültige index-pack Ausgabe"
+
+#: fetch-pack.c:969
#, c-format
msgid "%s failed"
msgstr "%s fehlgeschlagen"
-#: fetch-pack.c:918
+#: fetch-pack.c:971
msgid "error in sideband demultiplexer"
msgstr "Fehler in sideband demultiplexer"
-#: fetch-pack.c:965
+#: fetch-pack.c:1031
#, c-format
msgid "Server version is %.*s"
msgstr "Server-Version ist %.*s"
-#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985
-#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001
-#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017
-#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039
+#: fetch-pack.c:1039 fetch-pack.c:1045 fetch-pack.c:1048 fetch-pack.c:1054
+#: fetch-pack.c:1058 fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070
+#: fetch-pack.c:1074 fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086
+#: fetch-pack.c:1092 fetch-pack.c:1098 fetch-pack.c:1103 fetch-pack.c:1108
#, c-format
msgid "Server supports %s"
msgstr "Server unterstützt %s"
-#: fetch-pack.c:972
+#: fetch-pack.c:1041
msgid "Server does not support shallow clients"
msgstr "Server unterstützt keine shallow-Clients"
-#: fetch-pack.c:1032
+#: fetch-pack.c:1101
msgid "Server does not support --shallow-since"
msgstr "Server unterstützt kein --shallow-since"
-#: fetch-pack.c:1037
+#: fetch-pack.c:1106
msgid "Server does not support --shallow-exclude"
msgstr "Server unterstützt kein --shallow-exclude"
-#: fetch-pack.c:1041
+#: fetch-pack.c:1110
msgid "Server does not support --deepen"
msgstr "Server unterstützt kein --deepen"
-#: fetch-pack.c:1058
+#: fetch-pack.c:1112
+msgid "Server does not support this repository's object format"
+msgstr "Server unterstützt das Objekt-Format dieses Repositories nicht"
+
+#: fetch-pack.c:1125
msgid "no common commits"
msgstr "keine gemeinsamen Commits"
-#: fetch-pack.c:1070 fetch-pack.c:1536
+#: fetch-pack.c:1138 fetch-pack.c:1682
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: Abholen fehlgeschlagen."
-#: fetch-pack.c:1209
-msgid "Server does not support shallow requests"
-msgstr "Server unterstützt keine shallow-Anfragen."
+#: fetch-pack.c:1265
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "Algorithmen stimmen nicht überein: Client %s; Server %s"
-#: fetch-pack.c:1216
+#: fetch-pack.c:1269
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "der Server unterstützt Algorithmus '%s' nicht"
+
+#: fetch-pack.c:1289
+msgid "Server does not support shallow requests"
+msgstr "Server unterstützt keine shallow-Anfragen"
+
+#: fetch-pack.c:1296
msgid "Server supports filter"
msgstr "Server unterstützt Filter"
-#: fetch-pack.c:1239
+#: fetch-pack.c:1335
msgid "unable to write request to remote"
msgstr "konnte Anfrage nicht zum Remote schreiben"
-#: fetch-pack.c:1257
+#: fetch-pack.c:1353
#, c-format
msgid "error reading section header '%s'"
msgstr "Fehler beim Lesen von Sektionskopf '%s'."
-#: fetch-pack.c:1263
+#: fetch-pack.c:1359
#, c-format
msgid "expected '%s', received '%s'"
msgstr "'%s' erwartet, '%s' empfangen"
-#: fetch-pack.c:1303
+#: fetch-pack.c:1420
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "Unerwartete Acknowledgment-Zeile: '%s'"
-#: fetch-pack.c:1308
+#: fetch-pack.c:1425
#, c-format
msgid "error processing acks: %d"
msgstr "Fehler beim Verarbeiten von ACKS: %d"
-#: fetch-pack.c:1318
+#: fetch-pack.c:1435
msgid "expected packfile to be sent after 'ready'"
msgstr "Erwartete Versand einer Packdatei nach 'ready'."
-#: fetch-pack.c:1320
+#: fetch-pack.c:1437
msgid "expected no other sections to be sent after no 'ready'"
msgstr "Erwartete keinen Versand einer anderen Sektion ohne 'ready'."
-#: fetch-pack.c:1362
+#: fetch-pack.c:1479
#, c-format
msgid "error processing shallow info: %d"
msgstr "Fehler beim Verarbeiten von Shallow-Informationen: %d"
-#: fetch-pack.c:1409
+#: fetch-pack.c:1526
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "wanted-ref erwartet, '%s' bekommen"
-#: fetch-pack.c:1414
+#: fetch-pack.c:1531
#, c-format
msgid "unexpected wanted-ref: '%s'"
-msgstr "Unerwartetes wanted-ref: '%s'"
+msgstr "unerwartetes wanted-ref: '%s'"
-#: fetch-pack.c:1419
+#: fetch-pack.c:1536
#, c-format
msgid "error processing wanted refs: %d"
msgstr "Fehler beim Verarbeiten von wanted-refs: %d"
-#: fetch-pack.c:1762
+#: fetch-pack.c:1566
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack: Antwort-Endpaket erwartet"
+
+#: fetch-pack.c:1960
msgid "no matching remote head"
msgstr "kein übereinstimmender Remote-Branch"
-#: fetch-pack.c:1785 builtin/clone.c:689
+#: fetch-pack.c:1983 builtin/clone.c:693
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:1812
+#: fetch-pack.c:2010
#, c-format
msgid "no such remote ref %s"
-msgstr "keine solche Remote-Referenz %s"
+msgstr "Remote-Referenz %s nicht gefunden"
-#: fetch-pack.c:1815
+#: fetch-pack.c:2013
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Der Server lehnt Anfrage nach nicht angebotenem Objekt %s ab."
-#: gpg-interface.c:408
-msgid "gpg failed to sign the data"
-msgstr "gpg beim Signieren der Daten fehlgeschlagen"
-
-#: gpg-interface.c:434
+#: gpg-interface.c:273
msgid "could not create temporary file"
msgstr "konnte temporäre Datei nicht erstellen"
-#: gpg-interface.c:437
+#: gpg-interface.c:276
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "Fehler beim Schreiben der losgelösten Signatur nach '%s'"
+#: gpg-interface.c:470
+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:668
+#: grep.c:543
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
@@ -4100,18 +4347,18 @@
"Angegebenes Muster enthält NULL Byte (über -f <Datei>). Das wird nur mit -"
"Punter PCRE v2 unterstützt."
-#: grep.c:2128
+#: grep.c:1906
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': konnte %s nicht lesen"
-#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82
+#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr "Konnte '%s' nicht lesen"
-#: grep.c:2156
+#: grep.c:1934
#, c-format
msgid "'%s': short read"
msgstr "'%s': read() zu kurz"
@@ -4168,43 +4415,43 @@
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:100
#, 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:527
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4213,32 +4460,32 @@
"'%s' scheint ein git-Befehl zu sein, konnte aber\n"
"nicht ausgeführt werden. Vielleicht ist git-%s fehlerhaft?"
-#: help.c:655
+#: help.c:543 help.c:631
+#, 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:591
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:613
#, 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:618
#, 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:623
#, 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
-#, 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:635
msgid ""
"\n"
"The most similar command is"
@@ -4252,16 +4499,16 @@
"\n"
"Die ähnlichsten Befehle sind"
-#: help.c:714
+#: help.c:675
msgid "git version [<options>]"
msgstr "git version [<Optionen>]"
-#: help.c:783
+#: help.c:730
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:787
+#: help.c:734
msgid ""
"\n"
"Did you mean this?"
@@ -4275,7 +4522,15 @@
"\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"
@@ -4301,39 +4556,81 @@
"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:635
+#: ident.c:454 builtin/commit.c:634
#, c-format
msgid "invalid date format: %s"
msgstr "Ungültiges Datumsformat: %s"
+#: 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"
@@ -4350,43 +4647,7 @@
msgid "unable to load root tree for commit %s"
msgstr "Konnte Root-Tree-Objekt für Commit %s nicht laden."
-#: list-objects-filter.c:492
-#, c-format
-msgid "unable to access sparse blob in '%s'"
-msgstr "konnte nicht auf partiellen Blob '%s' zugreifen"
-
-#: list-objects-filter.c:495
-#, c-format
-msgid "unable to parse sparse filter data in %s"
-msgstr "Konnte partielle Filter-Daten in %s nicht parsen."
-
-#: list-objects-filter-options.c:58
-msgid "expected 'tree:<depth>'"
-msgstr "'tree:<Tiefe>' erwartet"
-
-#: list-objects-filter-options.c:73
-msgid "sparse:path filters support has been dropped"
-msgstr "Keine Unterstützung für sparse:path Filter mehr"
-
-#: list-objects-filter-options.c:86
-#, c-format
-msgid "invalid filter-spec '%s'"
-msgstr "Ungültige filter-spec '%s'"
-
-#: list-objects-filter-options.c:102
-#, c-format
-msgid "must escape char in sub-filter-spec: '%c'"
-msgstr "Zeichen in sub-filter-spec muss maskiert werden: '%c'"
-
-#: list-objects-filter-options.c:144
-msgid "expected something after combine:"
-msgstr "erwartete etwas nach 'combine:'"
-
-#: list-objects-filter-options.c:226
-msgid "multiple filter-specs cannot be combined"
-msgstr "Mehrere filter-specs können nicht kombiniert werden."
-
-#: lockfile.c:151
+#: lockfile.c:152
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
@@ -4406,20 +4667,273 @@
"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"
+#: ls-refs.c:37
+#, c-format
+msgid "invalid value '%s' for lsrefs.unborn"
+msgstr "ungültiger Wert '%s' für lsrefs.unborn"
-#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913
-#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810
-#: builtin/stash.c:265
-msgid "unable to write new index file"
-msgstr "Konnte neue Index-Datei nicht schreiben."
+#: ls-refs.c:167
+msgid "expected flush after ls-refs arguments"
+msgstr "erwartete Flush nach Argumenten für die Auflistung der Referenzen"
+
+#: merge-ort.c:888 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-ort.c:897 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-ort.c:906 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-ort.c:916 merge-ort.c:923
+#, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr "Hinweis: Spule Submodul %s vor zu %s"
+
+#: merge-ort.c:944
+#, c-format
+msgid "Failed to merge submodule %s"
+msgstr "Fehler beim Zusammenführen von Submodul %s"
+
+#: merge-ort.c:951
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but a possible merge resolution exists:\n"
+"%s\n"
+msgstr ""
+"Fehler beim Zusammenführen von Submodul %s, aber es ist eine mögliche "
+"Auflösung des Merges vorhanden:\n"
+"%s\n"
+
+#: merge-ort.c:955 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 ""
+"Falls das korrekt ist, fügen Sie es einfach der Staging-Area, zum Beispiel "
+"mit:\n"
+"\n"
+" git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"hinzu, um diesen Vorschlag zu akzeptieren.\n"
+
+#: merge-ort.c:968
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but multiple possible merges exist:\n"
+"%s"
+msgstr ""
+"Fehler beim Zusammenführen von Submodul %s, aber mehrere mögliche Merges "
+"sind vorhanden:\n"
+"%s"
+
+#: merge-ort.c:1127 merge-recursive.c:1341
+msgid "Failed to execute internal merge"
+msgstr "Fehler bei Ausführung des internen Merges"
+
+#: merge-ort.c:1132 merge-recursive.c:1346
+#, c-format
+msgid "Unable to add %s to database"
+msgstr "Konnte %s nicht zur Datenbank hinzufügen"
+
+#: merge-ort.c:1139 merge-recursive.c:1378
+#, c-format
+msgid "Auto-merging %s"
+msgstr "automatischer Merge von %s"
+
+#: merge-ort.c:1278 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 ""
+"KONFLIKT (implizite Verzeichnisumbenennung): Existierende Datei/Pfad bei %s "
+"im\n"
+"Weg von impliziter Verzeichnisumbenennung, die versucht, einen oder mehrere\n"
+"Pfade dahin zu setzen: %s."
+
+#: merge-ort.c:1288 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 ""
+"KONFLIKT (implizite Verzeichnisumbenennung): Kann nicht mehr als ein Pfad "
+"zu\n"
+"%s mappen; implizite Verzeichnisumbenennungen versuchten diese Pfade dahin\n"
+"zu setzen: %s"
+
+#: merge-ort.c:1471
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
+"renamed to multiple other directories, with no destination getting a "
+"majority of the files."
+msgstr ""
+"KONFLIKT (Aufteilung Verzeichnisumbenennung): Unklar, wo %s zu platzieren "
+"ist; es wurde zu mehreren anderen Verzeichnissen umbenannt, ohne dass ein "
+"Ziel die Mehrheit der Dateien erhält."
+
+#: merge-ort.c:1637 merge-recursive.c:2447
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr ""
+"WARNUNG: Vermeide Umbenennung %s -> %s von %s, weil %s selbst umbenannt "
+"wurde."
+
+#: merge-ort.c:1781 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 ""
+"Pfad aktualisiert: %s hinzugefügt in %s innerhalb eines Verzeichnisses, das "
+"umbenannt wurde in %s; Verschiebe es nach %s."
+
+#: merge-ort.c:1788 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 ""
+"Pfad aktualisiert: %s umbenannt nach %s in %s, innerhalb eines "
+"Verzeichnisses, das umbenannt wurde in %s; Verschiebe es nach %s."
+
+#: merge-ort.c:1801 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 ""
+"KONFLIKT (Speicherort): %s hinzugefügt in %s innerhalb eines Verzeichnisses, "
+"das umbenannt wurde in %s, es sollte vielleicht nach %s verschoben werden."
+
+#: merge-ort.c:1809 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 ""
+"KONFLIKT (Speicherort): %s umbenannt nach %s in %s, innerhalb eines "
+"Verzeichnisses, das umbenannt wurde in %s, es sollte vielleicht nach %s "
+"verschoben werden."
+
+#: merge-ort.c:1952
+#, c-format
+msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
+msgstr ""
+"KONFLIKT (umbenennen/umbenennen): %s zu %s in %s umbenannt und zu %s in %s."
+
+#: merge-ort.c:2047
+#, c-format
+msgid ""
+"CONFLICT (rename involved in collision): rename of %s -> %s has content "
+"conflicts AND collides with another path; this may result in nested conflict "
+"markers."
+msgstr ""
+"KONFLIKT (Umbenennung in Kollision beteiligt): Umbenennung von %s -> %s hat "
+"Inhaltskonflikte UND kollidiert mit einem anderen Pfad; dies kann zu "
+"verschachtelten Konfliktmarkierungen führen."
+
+#: merge-ort.c:2066 merge-ort.c:2090
+#, c-format
+msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
+msgstr ""
+"KONFLIKT (umbenennen/löschen): %s zu %s in %s umbenannt, aber in %s gelöscht."
+
+#: merge-ort.c:2735
+#, c-format
+msgid ""
+"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
+"%s instead."
+msgstr ""
+"KONFLIKT (Datei/Verzeichnis): Verzeichnis im Weg von %s aus %s; stattdessen "
+"nach %s verschieben."
+
+#: merge-ort.c:2808
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed %s "
+"of them so each can be recorded somewhere."
+msgstr ""
+"KONFLIKT (verschiedene Typen): %s hatte unterschiedliche Typen auf jeder "
+"Seite; %s wurde(n) umbenannt, damit jeder irgendwo aufgezeichnet werden kann."
+
+#: merge-ort.c:2812
+msgid "both"
+msgstr "beide"
+
+#: merge-ort.c:2812
+msgid "one"
+msgstr "einer"
+
+#: merge-ort.c:2907 merge-recursive.c:3052
+msgid "content"
+msgstr "Inhalt"
+
+#: merge-ort.c:2909 merge-recursive.c:3056
+msgid "add/add"
+msgstr "hinzufügen/hinzufügen"
+
+#: merge-ort.c:2911 merge-recursive.c:3101
+msgid "submodule"
+msgstr "Submodul"
+
+#: merge-ort.c:2913 merge-recursive.c:3102
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "KONFLIKT (%s): Merge-Konflikt in %s"
+
+#: merge-ort.c:2938
+#, c-format
+msgid ""
+"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
+"of %s left in tree."
+msgstr ""
+"KONFLIKT (ändern/löschen): %s gelöscht in %s und geändert in %s. Stand %s "
+"von %s wurde im Arbeitsbereich gelassen."
+
+#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
+#. base, and 2-3) the trees for the two trees we're merging.
+#.
+#: merge-ort.c:3406
+#, c-format
+msgid "collecting merge info failed for trees %s, %s, %s"
+msgstr ""
+"Sammeln von Merge-Informationen für die Referenzen %s, %s, %s fehlgeschlagen"
+
+#: merge-ort-wrappers.c:13 merge-recursive.c:3661
+#, 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-ort-wrappers.c:33 merge-recursive.c:3436
+#, c-format
+msgid "Already up to date!"
+msgstr "Bereits aktuell!"
#: merge-recursive.c:356
msgid "(bad commit)\n"
@@ -4481,21 +4995,6 @@
msgid "do not know what to do with %06o %s '%s'"
msgstr "weiß nicht was mit %06o %s '%s' zu machen ist"
-#: merge-recursive.c:1191
-#, c-format
-msgid "Failed to merge submodule %s (not checked out)"
-msgstr "Fehler beim Merge von Submodul %s (nicht ausgecheckt)."
-
-#: 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: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:1213 merge-recursive.c:1225
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
@@ -4522,42 +5021,11 @@
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "Mögliche Auflösung des Merges für Submodul gefunden:\n"
-#: merge-recursive.c:1259
-#, 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 ""
-"Falls das korrekt ist, fügen Sie es einfach der Staging-Area, zum Beispiel "
-"mit:\n"
-"\n"
-" git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"hinzu, um diesen Vorschlag zu akzeptieren.\n"
-
#: 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:1341
-msgid "Failed to execute internal merge"
-msgstr "Fehler bei Ausführung des internen Merges"
-
-#: merge-recursive.c:1346
-#, c-format
-msgid "Unable to add %s to database"
-msgstr "Konnte %s nicht zur Datenbank hinzufügen"
-
-#: merge-recursive.c:1378
-#, c-format
-msgid "Auto-merging %s"
-msgstr "automatischer Merge von %s"
-
#: merge-recursive.c:1402
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
@@ -4609,7 +5077,7 @@
msgid "renamed"
msgstr "umbenannt"
-#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117
+#: 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."
@@ -4653,14 +5121,14 @@
msgid " (left unresolved)"
msgstr " (bleibt unaufgelöst)"
-#: merge-recursive.c:1793
+#: 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:2056
+#: merge-recursive.c:2068
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -4673,29 +5141,7 @@
"wobei\n"
"keines dieser Ziele die Mehrheit der Dateien erhielt."
-#: merge-recursive.c:2088
-#, c-format
-msgid ""
-"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
-"implicit directory rename(s) putting the following path(s) there: %s."
-msgstr ""
-"KONFLIKT (implizite Verzeichnisumbenennung): Existierende Datei/Pfad bei %s "
-"im\n"
-"Weg von impliziter Verzeichnisumbenennung, die versucht, einen oder mehrere\n"
-"Pfade dahin zu setzen: %s."
-
-#: merge-recursive.c:2098
-#, c-format
-msgid ""
-"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
-"implicit directory renames tried to put these paths there: %s"
-msgstr ""
-"KONFLIKT (implizite Verzeichnisumbenennung): Kann nicht mehr als ein Pfad "
-"zu\n"
-"%s mappen; implizite Verzeichnisumbenennungen versuchten diese Pfade dahin\n"
-"zu setzen: %s"
-
-#: merge-recursive.c:2190
+#: merge-recursive.c:2202
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -4704,272 +5150,202 @@
"KONFLIKT (umbenennen/umbenennen): Benenne Verzeichnis um %s->%s in %s.\n"
"Benenne Verzeichnis um %s->%s in %s"
-#: merge-recursive.c:2435
-#, c-format
-msgid ""
-"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
-"renamed."
-msgstr ""
-"WARNUNG: Vermeide Umbenennung %s -> %s von %s, weil %s selbst umbenannt "
-"wurde."
-
-#: merge-recursive.c:2961
+#: merge-recursive.c:2973
#, c-format
msgid "cannot read object %s"
msgstr "kann Objekt %s nicht lesen"
-#: merge-recursive.c:2964
+#: merge-recursive.c:2976
#, c-format
msgid "object %s is not a blob"
msgstr "Objekt %s ist kein Blob"
-#: merge-recursive.c:3028
+#: merge-recursive.c:3040
msgid "modify"
msgstr "ändern"
-#: merge-recursive.c:3028
+#: merge-recursive.c:3040
msgid "modified"
msgstr "geändert"
-#: merge-recursive.c:3040
-msgid "content"
-msgstr "Inhalt"
-
-#: merge-recursive.c:3044
-msgid "add/add"
-msgstr "hinzufügen/hinzufügen"
-
-#: merge-recursive.c:3067
+#: merge-recursive.c:3079
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)"
-#: merge-recursive.c:3089 git-submodule.sh:1003
-msgid "submodule"
-msgstr "Submodul"
-
-#: merge-recursive.c:3090
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "KONFLIKT (%s): Merge-Konflikt in %s"
-
-#: merge-recursive.c:3120
+#: merge-recursive.c:3132
#, c-format
msgid "Adding as %s instead"
msgstr "Füge stattdessen als %s hinzu"
-#: merge-recursive.c:3203
-#, c-format
-msgid ""
-"Path updated: %s added in %s inside a directory that was renamed in %s; "
-"moving it to %s."
-msgstr ""
-"Pfad aktualisiert: %s hinzugefügt in %s innerhalb eines Verzeichnisses, das "
-"umbenannt wurde in %s; Verschiebe es nach %s."
-
-#: merge-recursive.c:3206
-#, c-format
-msgid ""
-"CONFLICT (file location): %s added in %s inside a directory that was renamed "
-"in %s, suggesting it should perhaps be moved to %s."
-msgstr ""
-"KONFLIKT (Speicherort): %s hinzugefügt in %s innerhalb eines Verzeichnisses, "
-"das umbenannt wurde in %s, es sollte vielleicht nach %s verschoben werden."
-
-#: merge-recursive.c:3210
-#, c-format
-msgid ""
-"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
-"%s; moving it to %s."
-msgstr ""
-"Pfad aktualisiert: %s umbenannt nach %s in %s, innerhalb eines "
-"Verzeichnisses, das umbenannt wurde in %s; Verschiebe es nach %s."
-
-#: merge-recursive.c:3213
-#, 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 ""
-"KONFLIKT (Speicherort): %s umbenannt nach %s in %s, innerhalb eines "
-"Verzeichnisses, das umbenannt wurde in %s, es sollte vielleicht nach %s "
-"verschoben werden."
-
-#: merge-recursive.c:3327
+#: merge-recursive.c:3339
#, c-format
msgid "Removing %s"
msgstr "Entferne %s"
-#: merge-recursive.c:3350
+#: merge-recursive.c:3362
msgid "file/directory"
msgstr "Datei/Verzeichnis"
-#: merge-recursive.c:3355
+#: merge-recursive.c:3367
msgid "directory/file"
msgstr "Verzeichnis/Datei"
-#: merge-recursive.c:3362
+#: 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:3371
+#: merge-recursive.c:3383
#, c-format
msgid "Adding %s"
msgstr "Füge %s hinzu"
-#: merge-recursive.c:3380
+#: 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:3424
-msgid "Already up to date!"
-msgstr "Bereits aktuell!"
-
-#: merge-recursive.c:3433
+#: 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:3537
+#: merge-recursive.c:3539
msgid "Merging:"
msgstr "Merge:"
-#: merge-recursive.c:3550
+#: merge-recursive.c:3552
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "%u gemeinsamen Vorgänger-Commit gefunden"
msgstr[1] "%u gemeinsame Vorgänger-Commits gefunden"
-#: merge-recursive.c:3600
+#: merge-recursive.c:3602
msgid "merge returned no commit"
msgstr "Merge hat keinen Commit zurückgegeben"
-#: merge-recursive.c:3659
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-" %s"
-msgstr ""
-"Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge\n"
-"überschrieben werden:\n"
-" %s"
-
-#: merge-recursive.c:3756
+#: merge-recursive.c:3758
#, c-format
msgid "Could not parse object '%s'"
msgstr "Konnte Objekt '%s' nicht parsen."
-#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877
+#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896
+#: builtin/stash.c:471
msgid "Unable to write index."
msgstr "Konnte Index nicht schreiben."
-#: midx.c:68
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "Lesen des Zwischenspeichers fehlgeschlagen"
+
+#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917
+#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817
+#: builtin/stash.c:265
+msgid "unable to write new index file"
+msgstr "Konnte neue Index-Datei nicht schreiben."
+
+#: midx.c:62
+msgid "multi-pack-index OID fanout is of the wrong size"
+msgstr "multi-pack-index OID fanout hat die falsche Größe"
+
+#: midx.c:93
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "multi-pack-index-Datei %s ist zu klein."
-#: midx.c:84
+#: midx.c:109
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
"multi-pack-index-Signatur 0x%08x stimmt nicht mit Signatur 0x%08x überein."
-#: midx.c:89
+#: midx.c:114
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "multi-pack-index-Version %d nicht erkannt."
-#: midx.c:94
+#: midx.c:119
#, 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:108
-msgid "invalid chunk offset (too large)"
-msgstr "Ungültiger Chunk-Offset (zu groß)"
-
-#: midx.c:132
-msgid "terminating multi-pack-index chunk id appears earlier than expected"
-msgstr "Abschließende multi-pack-index Chunk-Id erscheint eher als erwartet."
-
-#: midx.c:145
+#: midx.c:136
msgid "multi-pack-index missing required pack-name chunk"
-msgstr "multi-pack-index fehlt erforderlicher pack-name Chunk."
+msgstr "multi-pack-index fehlt erforderlicher Pack-Namen Chunk"
-#: midx.c:147
+#: midx.c:138
msgid "multi-pack-index missing required OID fanout chunk"
-msgstr "multi-pack-index fehlt erforderlicher OID fanout Chunk."
+msgstr "multi-pack-index fehlt erforderlicher OID fanout Chunk"
-#: midx.c:149
+#: midx.c:140
msgid "multi-pack-index missing required OID lookup chunk"
-msgstr "multi-pack-index fehlt erforderlicher OID lookup Chunk."
+msgstr "multi-pack-index fehlt erforderlicher OID lookup Chunk"
-#: midx.c:151
+#: midx.c:142
msgid "multi-pack-index missing required object offsets chunk"
-msgstr "multi-pack-index fehlt erforderlicher object offset Chunk."
+msgstr "multi-pack-index fehlt erforderlicher Objekt offset Chunk"
-#: midx.c:165
+#: midx.c:158
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "Falsche Reihenfolge bei multi-pack-index Pack-Namen: '%s' vor '%s'"
-#: midx.c:210
+#: midx.c:202
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "Ungültige pack-int-id: %u (%u Pakete insgesamt)"
-#: midx.c:260
+#: midx.c:252
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."
+"multi-pack-index speichert einen 64-Bit Offset, aber off_t ist zu klein"
-#: midx.c:288
-msgid "error preparing packfile from multi-pack-index"
-msgstr "Fehler bei Vorbereitung der Packdatei aus multi-pack-index."
-
-#: midx.c:472
+#: midx.c:467
#, c-format
msgid "failed to add packfile '%s'"
-msgstr "Fehler beim Hinzufügen von Packdatei '%s'."
+msgstr "Fehler beim Hinzufügen von Packdatei '%s'"
-#: midx.c:478
+#: midx.c:473
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "Fehler beim Öffnen von pack-index '%s'"
-#: midx.c:538
+#: midx.c:533
#, c-format
msgid "failed to locate object %d in packfile"
-msgstr "Fehler beim Lokalisieren von Objekt %d in Packdatei."
+msgstr "Fehler beim Lokalisieren von Objekt %d in Packdatei"
-#: midx.c:842
+#: midx.c:821
msgid "Adding packfiles to multi-pack-index"
msgstr "Packdateien zum multi-pack-index hinzufügen"
-#: midx.c:875
+#: midx.c:855
#, c-format
msgid "did not see pack-file %s to drop"
msgstr "Pack-Datei %s zum Weglassen nicht gefunden"
-#: midx.c:973
-msgid "Writing chunks to multi-pack-index"
-msgstr "Chunks zum multi-pack-index schreiben"
+#: midx.c:904
+msgid "no pack files to index."
+msgstr "keine Packdateien zum Indizieren."
-#: midx.c:1052
+#: midx.c:965
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "Fehler beim Löschen des multi-pack-index bei %s"
-#: midx.c:1108
+#: midx.c:1021
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr "multi-pack-index-Datei existiert, aber das Parsen schlug fehl"
+
+#: midx.c:1029
msgid "Looking for referenced packfiles"
msgstr "Suche nach referenzierten Pack-Dateien"
-#: midx.c:1123
+#: midx.c:1044
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
@@ -4977,65 +5353,69 @@
"Ungültige oid fanout Reihenfolge: fanout[%d] = %<PRIx32> > %<PRIx32> = "
"fanout[%d]"
-#: midx.c:1128
+#: midx.c:1049
+msgid "the midx contains no oid"
+msgstr "das midx enthält keine oid"
+
+#: midx.c:1058
msgid "Verifying OID order in multi-pack-index"
msgstr "Verifiziere OID-Reihenfolge im multi-pack-index"
-#: midx.c:1137
+#: midx.c:1067
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "Ungültige oid lookup Reihenfolge: oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1157
+#: midx.c:1087
msgid "Sorting objects by packfile"
msgstr "Sortiere Objekte nach Pack-Datei"
-#: midx.c:1164
+#: midx.c:1094
msgid "Verifying object offsets"
msgstr "Überprüfe Objekt-Offsets"
-#: midx.c:1180
+#: midx.c:1110
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "Fehler beim Laden des Pack-Eintrags für oid[%d] = %s"
-#: midx.c:1186
+#: midx.c:1116
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "Fehler beim Laden des Pack-Index für Packdatei %s"
-#: midx.c:1195
+#: midx.c:1125
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "Falscher Objekt-Offset für oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-#: midx.c:1220
+#: midx.c:1150
msgid "Counting referenced objects"
msgstr "Referenzierte Objekte zählen"
-#: midx.c:1230
+#: midx.c:1160
msgid "Finding and deleting unreferenced packfiles"
msgstr "Suchen und Löschen von unreferenzierten Pack-Dateien"
-#: midx.c:1388
+#: midx.c:1351
msgid "could not start pack-objects"
msgstr "Konnte 'pack-objects' nicht ausführen"
-#: midx.c:1407
+#: midx.c:1371
msgid "could not finish pack-objects"
msgstr "Konnte 'pack-objects' nicht beenden"
-#: name-hash.c:537
+#: name-hash.c:538
#, c-format
msgid "unable to create lazy_dir thread: %s"
msgstr "Kann lazy_dir Thread nicht erzeugen: %s"
-#: name-hash.c:559
+#: name-hash.c:560
#, c-format
msgid "unable to create lazy_name thread: %s"
msgstr "Kann lazy_name Thread nicht erzeugen: %s"
-#: name-hash.c:565
+#: name-hash.c:566
#, c-format
msgid "unable to join lazy_name thread: %s"
msgstr "Kann lazy_name Thread nicht beitreten: %s"
@@ -5085,6 +5465,370 @@
msgid "Bad %s value: '%s'"
msgstr "Ungültiger %s Wert: '%s'"
+#: object-file.c:480
+#, 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"
+
+#: object-file.c:531
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "Konnte alternativen Objektpfad '%s' nicht normalisieren."
+
+#: object-file.c:603
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr "%s: ignoriere alternative Objektspeicher - Verschachtelung zu tief"
+
+#: object-file.c:610
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "Konnte Objektverzeichnis '%s' nicht normalisieren."
+
+#: object-file.c:653
+msgid "unable to fdopen alternates lockfile"
+msgstr "Konnte fdopen nicht auf Lock-Datei für \"alternates\" aufrufen."
+
+#: object-file.c:671
+msgid "unable to read alternates file"
+msgstr "Konnte \"alternates\"-Datei nicht lesen."
+
+#: object-file.c:678
+msgid "unable to move new alternates file into place"
+msgstr "Konnte neue \"alternates\"-Datei nicht übernehmen."
+
+#: object-file.c:713
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "Pfad '%s' existiert nicht"
+
+#: object-file.c:734
+#, 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."
+
+#: object-file.c:740
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "Referenziertes Repository '%s' ist kein lokales Repository."
+
+#: object-file.c:746
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr ""
+"Referenziertes Repository '%s' hat eine unvollständige Historie (shallow)."
+
+#: object-file.c:754
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr ""
+"Referenziertes Repository '%s' ist mit künstlichen Vorgängern (\"grafts\") "
+"eingehängt."
+
+#: object-file.c:814
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "Ungültige Zeile beim Parsen alternativer Referenzen: %s"
+
+#: object-file.c:964
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr "Versuche mmap %<PRIuMAX> über Limit %<PRIuMAX>."
+
+#: object-file.c:985
+msgid "mmap failed"
+msgstr "mmap fehlgeschlagen"
+
+#: object-file.c:1149
+#, c-format
+msgid "object file %s is empty"
+msgstr "Objektdatei %s ist leer."
+
+#: object-file.c:1284 object-file.c:2477
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "Fehlerhaftes loses Objekt '%s'."
+
+#: object-file.c:1286 object-file.c:2481
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "Nutzlose Daten am Ende von losem Objekt '%s'."
+
+#: object-file.c:1328
+msgid "invalid object type"
+msgstr "ungültiger Objekt-Typ"
+
+#: object-file.c:1412
+#, c-format
+msgid "unable to unpack %s header with --allow-unknown-type"
+msgstr "Konnte %s Kopfbereich nicht mit --allow-unknown-type entpacken."
+
+#: object-file.c:1415
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "Konnte %s Kopfbereich nicht entpacken."
+
+#: object-file.c:1421
+#, c-format
+msgid "unable to parse %s header with --allow-unknown-type"
+msgstr "Konnte %s Kopfbereich mit --allow-unknown-type nicht parsen."
+
+#: object-file.c:1424
+#, c-format
+msgid "unable to parse %s header"
+msgstr "Konnte %s Kopfbereich nicht parsen."
+
+#: object-file.c:1651
+#, c-format
+msgid "failed to read object %s"
+msgstr "Konnte Objekt %s nicht lesen."
+
+#: object-file.c:1655
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "Ersetzung %s für %s nicht gefunden."
+
+#: object-file.c:1659
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "Loses Objekt %s (gespeichert in %s) ist beschädigt."
+
+#: object-file.c:1663
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "Gepacktes Objekt %s (gespeichert in %s) ist beschädigt."
+
+#: object-file.c:1768
+#, c-format
+msgid "unable to write file %s"
+msgstr "Konnte Datei %s nicht schreiben."
+
+#: object-file.c:1775
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen."
+
+#: object-file.c:1782
+msgid "file write error"
+msgstr "Fehler beim Schreiben einer Datei."
+
+#: object-file.c:1802
+msgid "error when closing loose object file"
+msgstr "Fehler beim Schließen der Datei für lose Objekte."
+
+#: object-file.c:1867
+#, 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"
+
+#: object-file.c:1869
+msgid "unable to create temporary file"
+msgstr "Konnte temporäre Datei nicht erstellen."
+
+#: object-file.c:1893
+msgid "unable to write loose object file"
+msgstr "Fehler beim Schreiben der Datei für lose Objekte."
+
+#: object-file.c:1899
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "Konnte neues Objekt %s (%d) nicht komprimieren."
+
+#: object-file.c:1903
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "deflateEnd auf Objekt %s fehlgeschlagen (%d)"
+
+#: object-file.c:1907
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "Fehler wegen instabilen Objektquelldaten für %s"
+
+#: object-file.c:1917 builtin/pack-objects.c:1097
+#, c-format
+msgid "failed utime() on %s"
+msgstr "Fehler beim Aufruf von utime() auf '%s'."
+
+#: object-file.c:1994
+#, c-format
+msgid "cannot read object for %s"
+msgstr "Kann Objekt für %s nicht lesen."
+
+#: object-file.c:2045
+msgid "corrupt commit"
+msgstr "fehlerhafter Commit"
+
+#: object-file.c:2053
+msgid "corrupt tag"
+msgstr "fehlerhaftes Tag"
+
+#: object-file.c:2153
+#, c-format
+msgid "read error while indexing %s"
+msgstr "Lesefehler beim Indizieren von '%s'."
+
+#: object-file.c:2156
+#, c-format
+msgid "short read while indexing %s"
+msgstr "read() zu kurz beim Indizieren von '%s'."
+
+#: object-file.c:2229 object-file.c:2239
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr "%s: Fehler beim Einfügen in die Datenbank"
+
+#: object-file.c:2245
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s: nicht unterstützte Dateiart"
+
+#: object-file.c:2269
+#, c-format
+msgid "%s is not a valid object"
+msgstr "%s ist kein gültiges Objekt"
+
+#: object-file.c:2271
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s ist kein gültiges '%s' Objekt"
+
+#: object-file.c:2298 builtin/index-pack.c:192
+#, c-format
+msgid "unable to open %s"
+msgstr "kann %s nicht öffnen"
+
+#: object-file.c:2488 object-file.c:2541
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "Hash für %s stimmt nicht überein (%s erwartet)."
+
+#: object-file.c:2512
+#, c-format
+msgid "unable to mmap %s"
+msgstr "Konnte mmap nicht auf %s ausführen."
+
+#: object-file.c:2517
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "Konnte Kopfbereich von %s nicht entpacken."
+
+#: object-file.c:2523
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "Konnte Kopfbereich von %s nicht parsen."
+
+#: object-file.c:2534
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "Konnte Inhalt von %s nicht entpacken."
+
+#: object-name.c:486
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr "kurze Objekt-ID %s ist mehrdeutig"
+
+#: object-name.c:497
+msgid "The candidates are:"
+msgstr "Die Kandidaten sind:"
+
+#: object-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 erzeugt normalerweise keine Referenzen die mit\n"
+"40 Hex-Zeichen enden, da diese ignoriert werden wenn\n"
+"Sie diese angeben. Diese Referenzen könnten aus Versehen\n"
+"erzeugt worden sein. Zum Beispiel,\n"
+"\n"
+" git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"wobei \"$br\" leer ist und eine 40-Hex-Referenz erzeugt\n"
+"wurde. Bitte prüfen Sie diese Referenzen und löschen\n"
+"Sie sie gegebenenfalls. Unterdrücken Sie diese Meldung\n"
+"indem Sie \"git config advice.objectNameWarning false\"\n"
+"ausführen."
+
+#: object-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"
+
+#: object-name.c:924
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "Log für '%.*s' hat nur %d Einträge"
+
+#: object-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'"
+
+#: object-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'?"
+
+#: object-name.c:1717
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "Pfad '%s' existiert nicht in '%.*s'"
+
+#: object-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'?"
+
+#: object-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'?"
+
+#: object-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"
+
+#: object-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)"
+
+#: object-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."
+
+#: object-name.c:1922
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "ungültiger Objektname '%.*s'."
+
#: object.c:53
#, c-format
msgid "invalid object type \"%s\""
@@ -5110,24 +5854,94 @@
msgid "hash mismatch %s"
msgstr "Hash stimmt nicht mit %s überein."
-#: packfile.c:629
+#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226
+#, c-format
+msgid "unable to get size of %s"
+msgstr "Konnte Größe von %s nicht bestimmen."
+
+#: pack-bitmap.c:1489 builtin/rev-list.c:92
+#, c-format
+msgid "unable to get disk usage of %s"
+msgstr "konnte Festplattennutzung von %s nicht bekommen"
+
+#: pack-revindex.c:220
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr "Reverse-Index-Datei %s ist zu klein"
+
+#: pack-revindex.c:225
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr "Reverse-Index-Datei %s ist beschädigt"
+
+#: pack-revindex.c:233
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr "Reverse-Index-Datei %s hat eine unbekannte Signatur"
+
+#: pack-revindex.c:237
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr "Reverse-Index-Datei %s hat nicht unterstützte Version %<PRIu32>"
+
+#: pack-revindex.c:242
+#, c-format
+msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
+msgstr "Reverse-Index-Datei %s hat nicht unterstützte Hash-ID %<PRIu32>"
+
+#: pack-write.c:236
+msgid "cannot both write and verify reverse index"
+msgstr ""
+"Reverse-Index kann nicht gleichzeitig geschrieben und verifiziert werden"
+
+#: pack-write.c:257
+#, c-format
+msgid "could not stat: %s"
+msgstr "konnte nicht lesen: %s"
+
+#: pack-write.c:269
+#, c-format
+msgid "failed to make %s readable"
+msgstr "Fehler beim lesbar machen von %s"
+
+#: pack-write.c:508
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr "konnte Promisor-Datei '%s' nicht schreiben"
+
+#: packfile.c:625
msgid "offset before end of packfile (broken .idx?)"
msgstr "Offset vor Ende der Packdatei (fehlerhafte Indexdatei?)"
-#: packfile.c:1899
+#: packfile.c:1934
#, 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:1938
#, 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?)"
-#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134
+#: parse-options-cb.c:20 parse-options-cb.c:24
#, c-format
-msgid "unable to get size of %s"
-msgstr "Konnte Größe von %s nicht bestimmen."
+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
@@ -5171,26 +5985,31 @@
msgid "did you mean `--%s` (with two dashes)?"
msgstr "Meinten Sie `--%s` (mit zwei Strichen)?"
-#: parse-options.c:857
+#: 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:859
+#: parse-options.c:864
#, c-format
msgid "unknown switch `%c'"
msgstr "Unbekannter Schalter `%c'"
-#: parse-options.c:861
+#: 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:885
+#: parse-options.c:890
msgid "..."
msgstr "..."
-#: parse-options.c:904
+#: parse-options.c:909
#, c-format
msgid "usage: %s"
msgstr "Verwendung: %s"
@@ -5198,45 +6017,20 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:910
+#: parse-options.c:915
#, c-format
msgid " or: %s"
msgstr " oder: %s"
-#: parse-options.c:913
+#: parse-options.c:918
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:952
+#: parse-options.c:957
msgid "-NUM"
msgstr "-NUM"
-#: parse-options.c:966
-#, 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:915
#, c-format
msgid "Could not make %s writable by group"
@@ -5297,180 +6091,211 @@
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: 'literal' und 'glob' sind inkompatibel"
-#: pathspec.c:442
+#: pathspec.c:445
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr "%s: '%s' liegt außerhalb des Repositories von '%s'"
-#: pathspec.c:517
+#: pathspec.c:521
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s' (Kürzel: '%c')"
-#: pathspec.c:527
+#: 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:594
+#: pathspec.c:598
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "Pfadspezifikation '%s' ist hinter einer symbolischen Verknüpfung"
-#: pathspec.c:639
+#: 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:165
#, c-format
msgid "remote error: %s"
msgstr "Fehler am anderen Ende: %s"
-#: preload-index.c:119
+#: preload-index.c:125
msgid "Refreshing index"
msgstr "Aktualisiere Index"
-#: preload-index.c:138
+#: preload-index.c:144
#, c-format
msgid "unable to create threaded lstat: %s"
msgstr "Kann Thread für lstat nicht erzeugen: %s"
-#: pretty.c:981
+#: pretty.c:984
msgid "unable to parse --pretty format"
msgstr "Konnte --pretty Format nicht parsen."
-#: promisor-remote.c:23
-msgid "Remote with no URL"
-msgstr "Remote-Repository ohne URL"
+#: promisor-remote.c:30
+msgid "promisor-remote: unable to fork off fetch subprocess"
+msgstr "Promisor-Remote: konnte Fetch-Subprozess nicht abspalten"
-#: promisor-remote.c:58
+#: 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"
-#: range-diff.c:75
+#: prune-packed.c:35
+msgid "Removing duplicate objects"
+msgstr "Lösche doppelte Objekte"
+
+#: range-diff.c:78
msgid "could not start `log`"
msgstr "Konnte `log` nicht starten."
-#: range-diff.c:77
+#: range-diff.c:80
msgid "could not read `log` output"
msgstr "Konnte Ausgabe von `log` nicht lesen."
-#: range-diff.c:96 sequencer.c:5020
+#: range-diff.c:101 sequencer.c:5318
#, c-format
msgid "could not parse commit '%s'"
msgstr "Konnte Commit '%s' nicht parsen."
-#: range-diff.c:122
+#: range-diff.c:115
+#, 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:140
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "Konnte Git-Header '%.*s' nicht parsen."
-#: range-diff.c:285
+#: range-diff.c:306
msgid "failed to generate diff"
msgstr "Fehler beim Generieren des Diffs."
-#: range-diff.c:518 range-diff.c:520
+#: range-diff.c:558
+msgid "--left-only and --right-only are mutually exclusive"
+msgstr "--left-only und --right-only schließen sich gegenseitig aus"
+
+#: range-diff.c:561 range-diff.c:563
#, 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."
+msgstr "konnte '%s' nicht lesen"
-#: read-cache.c:1330
+#: 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."
+msgstr "'%s' scheint eine Datei und ein Verzeichnis zu sein"
-#: read-cache.c:1536
+#: read-cache.c:1532
msgid "Refresh index"
msgstr "Aktualisiere Index"
-#: read-cache.c:1651
+#: read-cache.c:1657
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -5479,7 +6304,7 @@
"index.version gesetzt, aber Wert ungültig.\n"
"Verwende Version %i"
-#: read-cache.c:1661
+#: read-cache.c:1667
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -5488,139 +6313,139 @@
"GIT_INDEX_VERSION gesetzt, aber Wert ungültig.\n"
"Verwende Version %i"
-#: read-cache.c:1717
+#: read-cache.c:1723
#, c-format
msgid "bad signature 0x%08x"
msgstr "Ungültige Signatur 0x%08x"
-#: read-cache.c:1720
+#: read-cache.c:1726
#, c-format
msgid "bad index version %d"
msgstr "Ungültige Index-Version %d"
-#: read-cache.c:1729
+#: read-cache.c:1735
msgid "bad index file sha1 signature"
msgstr "Ungültige SHA1-Signatur der Index-Datei."
-#: read-cache.c:1759
+#: read-cache.c:1765
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "Index verwendet Erweiterung %.4s, welche wir nicht unterstützen."
-#: read-cache.c:1761
+#: read-cache.c:1767
#, c-format
msgid "ignoring %.4s extension"
msgstr "Ignoriere Erweiterung %.4s"
-#: read-cache.c:1798
+#: read-cache.c:1804
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "Unbekanntes Format für Index-Eintrag 0x%08x"
-#: read-cache.c:1814
+#: read-cache.c:1820
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "Ungültiges Namensfeld im Index, in der Nähe von Pfad '%s'."
-#: read-cache.c:1871
+#: read-cache.c:1877
msgid "unordered stage entries in index"
msgstr "Ungeordnete Stage-Einträge im Index."
-#: read-cache.c:1874
+#: read-cache.c:1880
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "Mehrere Stage-Einträge für zusammengeführte Datei '%s'."
-#: read-cache.c:1877
+#: read-cache.c:1883
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "Ungeordnete Stage-Einträge für '%s'."
-#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
-#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
-#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
-#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
-#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
+#: read-cache.c:1989 read-cache.c:2280 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181
+#: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991
+#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505
+#: 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:2124
+#: read-cache.c:2133
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "Kann Thread für load_cache_entries nicht erzeugen: %s"
-#: read-cache.c:2137
+#: read-cache.c:2146
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "Kann Thread für load_cache_entries nicht erzeugen: %s"
-#: read-cache.c:2170
+#: read-cache.c:2179
#, c-format
msgid "%s: index file open failed"
msgstr "%s: Öffnen der Index-Datei fehlgeschlagen."
-#: read-cache.c:2174
+#: read-cache.c:2183
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s: Kann geöffneten Index nicht lesen."
-#: read-cache.c:2178
+#: read-cache.c:2187
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s: Index-Datei ist kleiner als erwartet."
-#: read-cache.c:2182
+#: read-cache.c:2191
#, c-format
msgid "%s: unable to map index file"
msgstr "%s: Konnte Index-Datei nicht einlesen."
-#: read-cache.c:2224
+#: read-cache.c:2233
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "Kann Thread für load_index_extensions nicht erzeugen: %s"
-#: read-cache.c:2251
+#: read-cache.c:2260
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "Kann Thread für load_index_extensions nicht beitreten: %s"
-#: read-cache.c:2283
+#: read-cache.c:2292
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "Konnte geteilten Index '%s' nicht aktualisieren."
-#: read-cache.c:2330
+#: read-cache.c:2339
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "Fehlerhafter Index. Erwartete %s in %s, erhielt %s."
-#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122
+#: read-cache.c:3035 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141
#, c-format
msgid "could not close '%s'"
msgstr "Konnte '%s' nicht schließen."
-#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959
+#: read-cache.c:3138 sequencer.c:2487 sequencer.c:4239
#, c-format
msgid "could not stat '%s'"
msgstr "Konnte '%s' nicht lesen."
-#: read-cache.c:3142
+#: read-cache.c:3151
#, c-format
msgid "unable to open git dir: %s"
msgstr "konnte Git-Verzeichnis nicht öffnen: %s"
-#: read-cache.c:3154
+#: read-cache.c:3163
#, c-format
msgid "unable to unlink: %s"
msgstr "Konnte '%s' nicht entfernen."
-#: read-cache.c:3179
+#: read-cache.c:3188
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen."
-#: read-cache.c:3328
+#: read-cache.c:3337
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s: Kann nicht auf Stufe #0 wechseln."
@@ -5695,7 +6520,7 @@
msgstr[0] "Rebase von %s auf %s (%d Kommando)"
msgstr[1] "Rebase von %s auf %s (%d Kommandos)"
-#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228
+#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -5704,7 +6529,7 @@
"Keine Zeile entfernen. Benutzen Sie 'drop', um explizit einen Commit zu\n"
"entfernen.\n"
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232
+#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -5712,7 +6537,7 @@
"\n"
"Wenn Sie hier eine Zeile entfernen, wird DIESER COMMIT VERLOREN GEHEN.\n"
-#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871
+#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -5726,7 +6551,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:86 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"
@@ -5736,14 +6561,14 @@
"Wenn Sie jedoch alles löschen, wird der Rebase abgebrochen.\n"
"\n"
-#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444
-#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252
+#: rebase-interactive.c:110 rerere.c:469 rerere.c:676 sequencer.c:3615
+#: sequencer.c:3641 sequencer.c:5424 builtin/fsck.c:329 builtin/rebase.c:272
#, c-format
msgid "could not write '%s'"
msgstr "Konnte '%s' nicht schreiben."
-#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210
-#: builtin/rebase.c:234
+#: rebase-interactive.c:116 builtin/rebase.c:204 builtin/rebase.c:230
+#: builtin/rebase.c:254
#, c-format
msgid "could not write '%s'."
msgstr "Konnte '%s' nicht schreiben."
@@ -5774,134 +6599,14 @@
"Warnungen zu ändern.\n"
"Die möglichen Verhaltensweisen sind: ignore, warn, error.\n"
-#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262
-#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221
-#: builtin/rebase.c:246
+#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2402
+#: builtin/rebase.c:190 builtin/rebase.c:215 builtin/rebase.c:241
+#: builtin/rebase.c:266
#, c-format
msgid "could not read '%s'."
msgstr "Konnte '%s' nicht lesen."
-#: refs.c:262
-#, c-format
-msgid "%s does not point to a valid object!"
-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:2098
-#, 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:407 sequencer.c:2701 sequencer.c:2905
-#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157
-#: wrapper.c:620
-#, c-format
-msgid "could not write to '%s'"
-msgstr "Konnte nicht nach '%s' schreiben."
-
-#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719
-#: builtin/rebase.c:1029
-#, 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:2023
-#, c-format
-msgid "multiple updates for ref '%s' not allowed"
-msgstr "Mehrere Aktualisierungen für Referenz '%s' nicht erlaubt."
-
-#: refs.c:2055
-msgid "ref updates forbidden inside quarantine environment"
-msgstr ""
-"Aktualisierungen von Referenzen ist innerhalb der Quarantäne-Umgebung "
-"verboten."
-
-#: refs.c:2151 refs.c:2181
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr "'%s' existiert; kann '%s' nicht erstellen"
-
-#: refs.c:2157 refs.c:2192
-#, c-format
-msgid "cannot process '%s' and '%s' at the same time"
-msgstr "Kann '%s' und '%s' nicht zur selben Zeit verarbeiten."
-
-#: refs/files-backend.c:1233
-#, c-format
-msgid "could not remove reference %s"
-msgstr "Konnte Referenz %s nicht löschen"
-
-#: refs/files-backend.c:1247 refs/packed-backend.c:1541
-#: refs/packed-backend.c:1551
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "Konnte Referenz %s nicht entfernen: %s"
-
-#: refs/files-backend.c:1250 refs/packed-backend.c:1554
-#, 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'"
-
-#: ref-filter.c:42 wt-status.c:1938
+#: ref-filter.c:42 wt-status.c:1975
msgid "gone"
msgstr "entfernt"
@@ -5920,283 +6625,416 @@
msgid "ahead %d, behind %d"
msgstr "%d voraus, %d hinterher"
-#: ref-filter.c:165
+#: ref-filter.c:175
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "Erwartetes Format: %%(color:<Farbe>)"
-#: ref-filter.c:167
+#: ref-filter.c:177
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "nicht erkannte Farbe: %%(color:%s)"
-#: ref-filter.c:189
+#: ref-filter.c:199
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Positiver Wert erwartet refname:lstrip=%s"
-#: ref-filter.c:193
+#: ref-filter.c:203
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Positiver Wert erwartet refname:rstrip=%s"
-#: ref-filter.c:195
+#: ref-filter.c:205
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "nicht erkanntes %%(%s) Argument: %s"
-#: ref-filter.c:250
+#: ref-filter.c:260
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) akzeptiert keine Argumente"
-#: ref-filter.c:272
+#: ref-filter.c:282
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr "nicht erkanntes %%(objectsize) Argument: %s"
-#: ref-filter.c:280
+#: ref-filter.c:290
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) akzeptiert keine Argumente"
-#: ref-filter.c:292
+#: ref-filter.c:302
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) akzeptiert keine Argumente"
-#: ref-filter.c:301
+#: ref-filter.c:315
#, 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:323
+#: ref-filter.c:334
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr "%%(trailers:key=<Wert>) erwartet"
+
+#: ref-filter.c:336
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "unbekanntes %%(trailers) Argument: %s"
-#: ref-filter.c:352
+#: ref-filter.c:367
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "Positiver Wert erwartet contents:lines=%s"
-#: ref-filter.c:354
+#: ref-filter.c:369
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "nicht erkanntes %%(contents) Argument: %s"
-#: ref-filter.c:369
+#: ref-filter.c:384
#, 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:373
+#: ref-filter.c:388
#, 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:403
+#: ref-filter.c:402
+#, c-format
+msgid "unrecognized email option: %s"
+msgstr "nicht erkannte E-Mail Option: %s"
+
+#: ref-filter.c:432
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
-msgstr "Erwartetes Format: %%(align:<Breite>,<Position>)"
+msgstr "erwartetes Format: %%(align:<Breite>,<Position>)"
-#: ref-filter.c:415
+#: ref-filter.c:444
#, c-format
msgid "unrecognized position:%s"
msgstr "nicht erkannte Position:%s"
-#: ref-filter.c:422
+#: ref-filter.c:451
#, c-format
msgid "unrecognized width:%s"
msgstr "nicht erkannte Breite:%s"
-#: ref-filter.c:431
+#: ref-filter.c:460
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "nicht erkanntes %%(align) Argument: %s"
-#: ref-filter.c:439
+#: ref-filter.c:468
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "Positive Breitenangabe für %%(align) erwartet"
-#: ref-filter.c:457
+#: ref-filter.c:486
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "nicht erkanntes %%(if) Argument: %s"
-#: ref-filter.c:559
+#: ref-filter.c:588
#, c-format
msgid "malformed field name: %.*s"
msgstr "Fehlerhafter Feldname: %.*s"
-#: ref-filter.c:586
+#: ref-filter.c:615
#, c-format
msgid "unknown field name: %.*s"
msgstr "Unbekannter Feldname: %.*s"
-#: ref-filter.c:590
+#: ref-filter.c:619
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
"Kein Git-Repository, aber das Feld '%.*s' erfordert Zugriff auf Objektdaten."
-#: ref-filter.c:714
+#: ref-filter.c:743
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "format: %%(if) Atom ohne ein %%(then) Atom verwendet"
-#: ref-filter.c:777
+#: ref-filter.c:806
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "format: %%(then) Atom ohne ein %%(if) Atom verwendet"
-#: ref-filter.c:779
+#: ref-filter.c:808
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "format: %%(then) Atom mehr als einmal verwendet"
-#: ref-filter.c:781
+#: ref-filter.c:810
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "format: %%(then) Atom nach %%(else) verwendet"
-#: ref-filter.c:809
+#: ref-filter.c:838
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "format: %%(else) Atom ohne ein %%(if) Atom verwendet"
-#: ref-filter.c:811
+#: ref-filter.c:840
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "Format: %%(else) Atom ohne ein %%(then) Atom verwendet"
-#: ref-filter.c:813
+#: ref-filter.c:842
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "Format: %%(end) Atom mehr als einmal verwendet"
-#: ref-filter.c:828
+#: ref-filter.c:857
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "Format: %%(end) Atom ohne zugehöriges Atom verwendet"
-#: ref-filter.c:885
+#: ref-filter.c:914
#, c-format
msgid "malformed format string %s"
msgstr "Fehlerhafter Formatierungsstring %s"
-#: ref-filter.c:1488
+#: ref-filter.c:1555
#, c-format
-msgid "no branch, rebasing %s"
-msgstr "kein Branch, Rebase von %s"
+msgid "(no branch, rebasing %s)"
+msgstr "(kein Branch, Rebase von %s)"
-#: ref-filter.c:1491
+#: ref-filter.c:1558
#, c-format
-msgid "no branch, rebasing detached HEAD %s"
-msgstr "kein Branch, Rebase von losgelöstem HEAD %s"
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "(kein Branch, Rebase von losgelöstem HEAD %s)"
-#: ref-filter.c:1494
+#: ref-filter.c:1561
#, c-format
-msgid "no branch, bisect started on %s"
-msgstr "kein Branch, binäre Suche begonnen bei %s"
+msgid "(no branch, bisect started on %s)"
+msgstr "(kein Branch, binäre Suche begonnen bei %s)"
-#: ref-filter.c:1504
-msgid "no branch"
-msgstr "kein Branch"
+#: ref-filter.c:1565
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD losgelöst bei %s)"
-#: ref-filter.c:1540 ref-filter.c:1749
+#: ref-filter.c:1568
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD losgelöst von %s)"
+
+#: ref-filter.c:1571
+msgid "(no branch)"
+msgstr "(kein Branch)"
+
+#: ref-filter.c:1603 ref-filter.c:1812
#, c-format
msgid "missing object %s for %s"
msgstr "Objekt %s fehlt für %s"
-#: ref-filter.c:1550
+#: ref-filter.c:1613
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer bei %s für %s fehlgeschlagen"
-#: ref-filter.c:2004
+#: ref-filter.c:1996
#, c-format
msgid "malformed object at '%s'"
msgstr "fehlerhaftes Objekt bei '%s'"
-#: ref-filter.c:2093
+#: ref-filter.c:2085
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "Ignoriere Referenz mit fehlerhaftem Namen %s"
-#: ref-filter.c:2389
+#: ref-filter.c:2090 refs.c:676
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "Ignoriere fehlerhafte Referenz %s"
+
+#: ref-filter.c:2430
#, c-format
msgid "format: %%(end) atom missing"
msgstr "Format: %%(end) Atom fehlt"
-#: ref-filter.c:2489
-#, c-format
-msgid "option `%s' is incompatible with --merged"
-msgstr "Die Option `%s' ist inkompatibel mit --merged."
-
-#: ref-filter.c:2492
-#, c-format
-msgid "option `%s' is incompatible with --no-merged"
-msgstr "Die Option `%s' ist inkompatibel mit --no-merged."
-
-#: ref-filter.c:2502
+#: ref-filter.c:2529
#, c-format
msgid "malformed object name %s"
-msgstr "Missgebildeter Objektname %s"
+msgstr "missgebildeter Objektname %s"
-#: ref-filter.c:2507
+#: ref-filter.c:2534
#, c-format
msgid "option `%s' must point to a commit"
-msgstr "Die Option `%s' muss auf einen Commit zeigen."
+msgstr "die Option `%s' muss auf einen Commit zeigen"
-#: remote.c:366
+#: refs.c:264
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr "%s zeigt auf kein gültiges Objekt!"
+
+#: refs.c:566
+#, c-format
+msgid ""
+"Using '%s' as the name for the initial branch. This default branch name\n"
+"is subject to change. To configure the initial branch name to use in all\n"
+"of your new repositories, which will suppress this warning, call:\n"
+"\n"
+"\tgit config --global init.defaultBranch <name>\n"
+"\n"
+"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"'development'. The just-created branch can be renamed via this command:\n"
+"\n"
+"\tgit branch -m <name>\n"
+msgstr ""
+"Als Name für den initialen Branch wurde '%s' benutzt. Dieser\n"
+"Standard-Branchname kann sich ändern. Um den Namen des initialen Branches\n"
+"zu konfigurieren, der in allen neuen Repositories verwendet werden soll und\n"
+"um diese Warnung zu unterdrücken, führen Sie aus:\n"
+"\n"
+"\tgit config --global init.defaultBranch <Name>\n"
+"\n"
+"Häufig gewählte Namen statt 'master' sind 'main', 'trunk' und\n"
+"'development'. Der gerade erstellte Branch kann mit diesem Befehl\n"
+"umbenannt werden:\n"
+"\n"
+"\tgit branch -m <Name>\n"
+
+#: refs.c:588
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "konnte `%s` nicht abrufen"
+
+#: refs.c:598
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "ungültiger Branchname: %s = %s"
+
+#: refs.c:674
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "Ignoriere unreferenzierte symbolische Referenz %s"
+
+#: refs.c:922
+#, 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:929
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr "Log für Referenz %s unerwartet bei %s beendet."
+
+#: refs.c:994
+#, c-format
+msgid "log for %s is empty"
+msgstr "Log für %s ist leer."
+
+#: refs.c:1086
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "verweigere Aktualisierung einer Referenz mit fehlerhaftem Namen '%s'"
+
+#: refs.c:1157
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "update_ref für Referenz '%s' fehlgeschlagen: %s"
+
+#: refs.c:2051
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "mehrere Aktualisierungen für Referenz '%s' nicht erlaubt"
+
+#: refs.c:2131
+msgid "ref updates forbidden inside quarantine environment"
+msgstr ""
+"Aktualisierungen von Referenzen ist innerhalb der Quarantäne-Umgebung "
+"verboten"
+
+#: refs.c:2142
+msgid "ref updates aborted by hook"
+msgstr "Aktualisierungen von Referenzen durch Hook abgebrochen"
+
+#: refs.c:2242 refs.c:2272
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "'%s' existiert; kann '%s' nicht erstellen"
+
+#: refs.c:2248 refs.c:2283
+#, 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: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:170
+#, 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:414
+#: remote.c:399
msgid "more than one receivepack given, using the first"
msgstr "Mehr als ein receivepack-Befehl angegeben, benutze den ersten."
-#: remote.c:422
+#: remote.c:407
msgid "more than one uploadpack given, using the first"
msgstr "Mehr als ein uploadpack-Befehl angegeben, benutze den ersten."
-#: remote.c:612
+#: 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:616
+#: remote.c:594
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s folgt üblicherweise %s, nicht %s"
-#: remote.c:620
+#: remote.c:598
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s folgt sowohl %s als auch %s"
-#: remote.c:688
+#: remote.c:666
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr "Schlüssel '%s' des Musters hatte kein '*'."
-#: remote.c:698
+#: remote.c:676
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr "Wert '%s' des Musters hat kein '*'."
-#: remote.c:1004
+#: remote.c:1083
#, c-format
msgid "src refspec %s does not match any"
msgstr "Src-Refspec %s entspricht keiner Referenz."
-#: remote.c:1009
+#: remote.c:1088
#, c-format
msgid "src refspec %s matches more than one"
msgstr "Src-Refspec %s entspricht mehr als einer Referenz."
@@ -6205,7 +7043,7 @@
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1024
+#: remote.c:1103
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
@@ -6232,7 +7070,7 @@
"Keines hat funktioniert, sodass wir aufgegeben haben. Sie müssen die\n"
"Referenz mit vollqualifizierten Namen angeben."
-#: remote.c:1044
+#: remote.c:1123
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
@@ -6243,7 +7081,7 @@
"Meinten Sie, einen neuen Branch mittels Push nach\n"
"'%s:refs/heads/%s' zu erstellen?"
-#: remote.c:1049
+#: remote.c:1128
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
@@ -6254,7 +7092,7 @@
"Meinten Sie, einen neuen Tag mittels Push nach\n"
"'%s:refs/tags/%s' zu erstellen?"
-#: remote.c:1054
+#: remote.c:1133
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
@@ -6265,7 +7103,7 @@
"Meinten Sie, einen Tag für ein neues Tree-Objekt\n"
"mittels Push nach '%s:refs/tags/'%s' zu erstellen?"
-#: remote.c:1059
+#: remote.c:1138
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
@@ -6276,117 +7114,117 @@
"Meinten Sie, einen Tag für ein neues Blob-Objekt\n"
"mittels Push nach '%s:refs/tags/%s' zu erstellen?"
-#: remote.c:1095
+#: remote.c:1174
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "%s kann nicht zu Branch aufgelöst werden."
-#: remote.c:1106
+#: remote.c:1185
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "Konnte '%s' nicht löschen: Remote-Referenz existiert nicht."
-#: remote.c:1118
+#: remote.c:1197
#, c-format
msgid "dst refspec %s matches more than one"
msgstr "Dst-Refspec %s entspricht mehr als einer Referenz."
-#: remote.c:1125
+#: remote.c:1204
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr "Dst-Referenz %s empfängt von mehr als einer Quelle"
-#: remote.c:1628 remote.c:1729
+#: remote.c:1724 remote.c:1825
msgid "HEAD does not point to a branch"
msgstr "HEAD zeigt auf keinen Branch"
-#: remote.c:1637
+#: remote.c:1733
#, c-format
msgid "no such branch: '%s'"
-msgstr "Kein solcher Branch: '%s'"
+msgstr "Branch nicht gefunden: '%s'"
-#: remote.c:1640
+#: remote.c:1736
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "Kein Upstream-Branch für Branch '%s' konfiguriert."
-#: remote.c:1646
+#: remote.c:1742
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "Upstream-Branch '%s' nicht als Remote-Tracking-Branch gespeichert"
-#: remote.c:1661
+#: remote.c:1757
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
"Ziel für \"push\" '%s' auf Remote-Repository '%s' hat keinen lokal gefolgten "
"Branch"
-#: remote.c:1673
+#: remote.c:1769
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
-#: remote.c:1683
+#: remote.c:1779
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "Push-Refspecs für '%s' beinhalten nicht '%s'"
-#: remote.c:1696
+#: remote.c:1792
msgid "push has no destination (push.default is 'nothing')"
msgstr "kein Ziel für \"push\" (push.default ist 'nothing')"
-#: remote.c:1718
+#: remote.c:1814
msgid "cannot resolve 'simple' push to a single destination"
msgstr "kann einzelnes Ziel für \"push\" im Modus 'simple' nicht auflösen"
-#: remote.c:1844
+#: remote.c:1943
#, c-format
msgid "couldn't find remote ref %s"
msgstr "Konnte Remote-Referenz %s nicht finden."
-#: remote.c:1857
+#: remote.c:1956
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "* Ignoriere sonderbare Referenz '%s' lokal"
-#: remote.c:2020
+#: remote.c:2119
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
"Ihr Branch basiert auf '%s', aber der Upstream-Branch wurde entfernt.\n"
-#: remote.c:2024
+#: remote.c:2123
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (benutzen Sie \"git branch --unset-upstream\" zum Beheben)\n"
-#: remote.c:2027
+#: remote.c:2126
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "Ihr Branch ist auf demselben Stand wie '%s'.\n"
-#: remote.c:2031
+#: remote.c:2130
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "Ihr Branch und '%s' zeigen auf unterschiedliche Commits.\n"
-#: remote.c:2034
+#: remote.c:2133
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (benutzen Sie \"%s\" für Details)\n"
-#: remote.c:2038
+#: remote.c:2137
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "Ihr Branch ist %2$d Commit vor '%1$s'.\n"
msgstr[1] "Ihr Branch ist %2$d Commits vor '%1$s'.\n"
-#: remote.c:2044
+#: remote.c:2143
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (benutzen Sie \"git push\", um lokale Commits zu publizieren)\n"
-#: remote.c:2047
+#: remote.c:2146
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -6396,12 +7234,12 @@
msgstr[1] ""
"Ihr Branch ist %2$d Commits hinter '%1$s', und kann vorgespult werden.\n"
-#: remote.c:2055
+#: remote.c:2154
msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
" (benutzen Sie \"git pull\", um Ihren lokalen Branch zu aktualisieren)\n"
-#: remote.c:2058
+#: remote.c:2157
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -6416,13 +7254,13 @@
"Ihr Branch und '%s' sind divergiert,\n"
"und haben jeweils %d und %d unterschiedliche Commits.\n"
-#: remote.c:2068
+#: remote.c:2167
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
" (benutzen Sie \"git pull\", um Ihren Branch mit dem Remote-Branch "
"zusammenzuführen)\n"
-#: remote.c:2251
+#: remote.c:2359
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "Kann erwarteten Objektnamen '%s' nicht parsen."
@@ -6442,126 +7280,135 @@
msgid "replace depth too high for object %s"
msgstr "Ersetzungstiefe zu hoch für Objekt %s"
-#: rerere.c:217 rerere.c:226 rerere.c:229
+#: rerere.c:201 rerere.c:210 rerere.c:213
msgid "corrupt MERGE_RR"
msgstr "Fehlerhaftes MERGE_RR"
-#: rerere.c:264 rerere.c:269
+#: rerere.c:248 rerere.c:253
msgid "unable to write rerere record"
msgstr "Konnte Rerere-Eintrag nicht schreiben."
-#: rerere.c:495
+#: rerere.c:479
#, c-format
msgid "there were errors while writing '%s' (%s)"
msgstr "Fehler beim Schreiben von '%s' (%s)."
-#: rerere.c:498
+#: rerere.c:482
#, c-format
msgid "failed to flush '%s'"
msgstr "Flush bei '%s' fehlgeschlagen."
-#: rerere.c:503 rerere.c:1039
+#: rerere.c:487 rerere.c:1023
#, c-format
msgid "could not parse conflict hunks in '%s'"
msgstr "Konnte Konflikt-Blöcke in '%s' nicht parsen."
-#: rerere.c:684
+#: rerere.c:668
#, c-format
msgid "failed utime() on '%s'"
msgstr "Fehler beim Aufruf von utime() auf '%s'."
-#: rerere.c:694
+#: rerere.c:678
#, c-format
msgid "writing '%s' failed"
msgstr "Schreiben von '%s' fehlgeschlagen."
-#: rerere.c:714
+#: rerere.c:698
#, c-format
msgid "Staged '%s' using previous resolution."
msgstr "'%s' mit vorheriger Konfliktauflösung zum Commit vorgemerkt."
-#: rerere.c:753
+#: rerere.c:737
#, c-format
msgid "Recorded resolution for '%s'."
msgstr "Konfliktauflösung für '%s' aufgezeichnet."
-#: rerere.c:788
+#: rerere.c:772
#, c-format
msgid "Resolved '%s' using previous resolution."
msgstr "Konflikte in '%s' mit vorheriger Konfliktauflösung beseitigt."
-#: rerere.c:803
+#: rerere.c:787
#, c-format
msgid "cannot unlink stray '%s'"
msgstr "Kann '%s' nicht löschen."
-#: rerere.c:807
+#: rerere.c:791
#, c-format
msgid "Recorded preimage for '%s'"
msgstr "Preimage für '%s' aufgezeichnet."
-#: rerere.c:881 submodule.c:2078 builtin/log.c:1871
-#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
+#: rerere.c:865 submodule.c:2088 builtin/log.c:1991
+#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890
#, c-format
msgid "could not create directory '%s'"
msgstr "Konnte Verzeichnis '%s' nicht erstellen."
-#: rerere.c:1057
+#: rerere.c:1041
#, c-format
msgid "failed to update conflicted state in '%s'"
msgstr "Fehler beim Aktualisieren des Konflikt-Status in '%s'."
-#: rerere.c:1068 rerere.c:1075
+#: rerere.c:1052 rerere.c:1059
#, c-format
msgid "no remembered resolution for '%s'"
msgstr "Keine aufgezeichnete Konfliktauflösung für '%s'."
-#: rerere.c:1077
+#: rerere.c:1061
#, c-format
msgid "cannot unlink '%s'"
msgstr "Kann '%s' nicht löschen."
-#: rerere.c:1087
+#: rerere.c:1071
#, c-format
msgid "Updated preimage for '%s'"
msgstr "Preimage für '%s' aktualisiert."
-#: rerere.c:1096
+#: rerere.c:1080
#, c-format
msgid "Forgot resolution for '%s'\n"
msgstr "Aufgezeichnete Konfliktauflösung für '%s' gelöscht.\n"
-#: rerere.c:1199
+#: rerere.c:1191
msgid "unable to open rr-cache directory"
msgstr "Konnte rr-cache Verzeichnis nicht öffnen."
-#: revision.c:2497
+#: reset.c:42
+msgid "could not determine HEAD revision"
+msgstr "Konnte HEAD-Commit nicht bestimmen."
+
+#: reset.c:70 reset.c:76 sequencer.c:3468
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s."
+
+#: revision.c:2338
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "--unpacked=<Pack-Datei> wird nicht länger unterstützt"
+
+#: revision.c:2668
msgid "your current branch appears to be broken"
msgstr "Ihr aktueller Branch scheint fehlerhaft zu sein."
-#: revision.c:2500
+#: revision.c:2671
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "Ihr aktueller Branch '%s' hat noch keine Commits."
-#: revision.c:2708
-msgid "--first-parent is incompatible with --bisect"
-msgstr "Die Optionen --first-parent und --bisect sind inkompatibel."
-
-#: revision.c:2712
+#: revision.c:2877
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"
-#: run-command.c:763
+#: run-command.c:767
msgid "open /dev/null failed"
msgstr "Öffnen von /dev/null fehlgeschlagen"
-#: run-command.c:1269
+#: run-command.c:1274
#, c-format
msgid "cannot create async thread: %s"
msgstr "Konnte Thread für async nicht erzeugen: %s"
-#: run-command.c:1333
+#: run-command.c:1338
#, c-format
msgid ""
"The '%s' hook was ignored because it's not set as executable.\n"
@@ -6571,30 +7418,35 @@
"Sie können diese Warnung mit `git config advice.ignoredHook false` "
"deaktivieren."
-#: send-pack.c:144
+#: send-pack.c:146
msgid "unexpected flush packet while reading remote unpack status"
msgstr "Unerwartetes Flush-Paket beim Lesen des Remote-Unpack-Status."
-#: send-pack.c:146
+#: send-pack.c:148
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "Konnte Status des Entpackens der Gegenseite nicht parsen: %s"
-#: send-pack.c:148
+#: send-pack.c:150
#, c-format
msgid "remote unpack failed: %s"
msgstr "Entpacken auf der Gegenseite fehlgeschlagen: %s"
-#: send-pack.c:309
+#: send-pack.c:374
msgid "failed to sign the push certificate"
msgstr "Fehler beim Signieren des \"push\"-Zertifikates"
-#: send-pack.c:423
+#: send-pack.c:467
+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:476
msgid "the receiving end does not support --signed push"
msgstr ""
"die Gegenseite unterstützt keinen signierten Versand (\"--signed push\")"
-#: send-pack.c:425
+#: send-pack.c:478
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -6602,47 +7454,47 @@
"kein Versand des \"push\"-Zertifikates, da die Gegenseite keinen signierten\n"
"Versand (\"--signed push\") unterstützt"
-#: send-pack.c:437
+#: send-pack.c:490
msgid "the receiving end does not support --atomic push"
msgstr "die Gegenseite unterstützt keinen atomaren Versand (\"--atomic push\")"
-#: send-pack.c:442
+#: send-pack.c:495
msgid "the receiving end does not support push options"
msgstr "die Gegenseite unterstützt keine Push-Optionen"
-#: sequencer.c:191
+#: sequencer.c:195
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "Ungültiger \"cleanup\"-Modus '%s' für Commit-Beschreibungen."
-#: sequencer.c:296
+#: sequencer.c:323
#, c-format
msgid "could not delete '%s'"
msgstr "Konnte '%s' nicht löschen."
-#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385
+#: sequencer.c:343 builtin/rebase.c:757 builtin/rebase.c:1602 builtin/rm.c:385
#, c-format
msgid "could not remove '%s'"
msgstr "Konnte '%s' nicht löschen"
-#: sequencer.c:325
+#: sequencer.c:353
msgid "revert"
msgstr "Revert"
-#: sequencer.c:327
+#: sequencer.c:355
msgid "cherry-pick"
msgstr "Cherry-Pick"
-#: sequencer.c:329
+#: sequencer.c:357
msgid "rebase"
msgstr "Rebase"
-#: sequencer.c:331
+#: sequencer.c:359
#, c-format
msgid "unknown action: %d"
msgstr "Unbekannte Aktion: %d"
-#: sequencer.c:389
+#: sequencer.c:418
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -6650,7 +7502,7 @@
"nach Auflösung der Konflikte markieren Sie die korrigierten Pfade\n"
"mit 'git add <Pfade>' oder 'git rm <Pfade>'"
-#: sequencer.c:392
+#: sequencer.c:421
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -6660,45 +7512,44 @@
"mit 'git add <Pfade>' oder 'git rm <Pfade>' und tragen Sie das Ergebnis mit\n"
"'git commit' ein"
-#: sequencer.c:405 sequencer.c:2901
+#: sequencer.c:434 sequencer.c:3070
#, c-format
msgid "could not lock '%s'"
msgstr "Konnte '%s' nicht sperren"
-#: sequencer.c:412
+#: sequencer.c:436 sequencer.c:2869 sequencer.c:3074 sequencer.c:3088
+#: sequencer.c:3345 sequencer.c:5334 strbuf.c:1168 wrapper.c:631
+#, c-format
+msgid "could not write to '%s'"
+msgstr "Konnte nicht nach '%s' schreiben."
+
+#: sequencer.c:441
#, c-format
msgid "could not write eol to '%s'"
msgstr "Konnte EOL nicht nach '%s' schreiben."
-#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921
-#: sequencer.c:3185
+#: sequencer.c:446 sequencer.c:2874 sequencer.c:3076 sequencer.c:3090
+#: sequencer.c:3353
#, c-format
msgid "failed to finalize '%s'"
msgstr "Fehler beim Fertigstellen von '%s'."
-#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
-#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
-#: builtin/rebase.c:593
-#, c-format
-msgid "could not read '%s'"
-msgstr "Konnte '%s' nicht lesen"
-
-#: sequencer.c:466
+#: sequencer.c:485
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "Ihre lokalen Änderungen würden durch den %s überschrieben werden."
-#: sequencer.c:470
+#: sequencer.c:489
msgid "commit your changes or stash them to proceed."
msgstr ""
"Committen Sie Ihre Änderungen oder benutzen Sie \"stash\", um fortzufahren."
-#: sequencer.c:502
+#: sequencer.c:521
#, c-format
msgid "%s: fast-forward"
msgstr "%s: Vorspulen"
-#: sequencer.c:541 builtin/tag.c:565
+#: sequencer.c:560 builtin/tag.c:598
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Ungültiger \"cleanup\" Modus %s"
@@ -6706,65 +7557,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:635
+#: sequencer.c:670
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Konnte neue Index-Datei nicht schreiben"
-#: sequencer.c:652
+#: sequencer.c:684
msgid "unable to update cache tree"
msgstr "Konnte Cache-Verzeichnis nicht aktualisieren."
-#: sequencer.c:666
+#: sequencer.c:698
msgid "could not resolve HEAD commit"
msgstr "Konnte HEAD-Commit nicht auflösen."
-#: sequencer.c:746
+#: sequencer.c:778
#, c-format
msgid "no key present in '%.*s'"
msgstr "Kein Schlüssel in '%.*s' vorhanden."
-#: sequencer.c:757
+#: sequencer.c:789
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "Konnte Anführungszeichen von '%s' nicht entfernen."
-#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710
-#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072
+#: sequencer.c:826 wrapper.c:201 wrapper.c:371 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1136 builtin/rebase.c:910
#, c-format
msgid "could not open '%s' for reading"
msgstr "Konnte '%s' nicht zum Lesen öffnen."
-#: sequencer.c:804
+#: sequencer.c:836
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "'GIT_AUTHOR_NAME' bereits angegeben."
-#: sequencer.c:809
+#: sequencer.c:841
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "'GIT_AUTHOR_EMAIL' bereits angegeben."
-#: sequencer.c:814
+#: sequencer.c:846
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "'GIT_AUTHOR_DATE' bereits angegeben."
-#: sequencer.c:818
+#: sequencer.c:850
#, c-format
msgid "unknown variable '%s'"
msgstr "Unbekannte Variable '%s'"
-#: sequencer.c:823
+#: sequencer.c:855
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "'GIT_AUTHOR_NAME' fehlt."
-#: sequencer.c:825
+#: sequencer.c:857
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "'GIT_AUTHOR_EMAIL' fehlt."
-#: sequencer.c:827
+#: sequencer.c:859
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "'GIT_AUTHOR_DATE' fehlt."
-#: sequencer.c:876
+#: sequencer.c:924
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -6795,11 +7646,11 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:1148
+#: sequencer.c:1211
msgid "'prepare-commit-msg' hook failed"
msgstr "'prepare-commit-msg' Hook fehlgeschlagen."
-#: sequencer.c:1154
+#: sequencer.c:1217
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6827,7 +7678,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1167
+#: sequencer.c:1230
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6853,326 +7704,340 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1209
+#: sequencer.c:1272
msgid "couldn't look up newly created commit"
msgstr "Konnte neu erstellten Commit nicht nachschlagen."
-#: sequencer.c:1211
+#: sequencer.c:1274
msgid "could not parse newly created commit"
msgstr "Konnte neu erstellten Commit nicht analysieren."
-#: sequencer.c:1257
+#: sequencer.c:1320
msgid "unable to resolve HEAD after creating commit"
msgstr "Konnte HEAD nicht auflösen, nachdem der Commit erstellt wurde."
-#: sequencer.c:1259
+#: sequencer.c:1322
msgid "detached HEAD"
msgstr "losgelöster HEAD"
-#: sequencer.c:1263
+#: sequencer.c:1326
msgid " (root-commit)"
msgstr " (Root-Commit)"
-#: sequencer.c:1284
+#: sequencer.c:1347
msgid "could not parse HEAD"
msgstr "Konnte HEAD nicht parsen."
-#: sequencer.c:1286
+#: sequencer.c:1349
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s ist kein Commit!"
-#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574
+#: sequencer.c:1353 sequencer.c:1431 builtin/commit.c:1577
msgid "could not parse HEAD commit"
msgstr "Konnte Commit von HEAD nicht analysieren."
-#: sequencer.c:1342 sequencer.c:1968
+#: sequencer.c:1409 sequencer.c:2108
msgid "unable to parse commit author"
msgstr "Konnte Commit-Autor nicht parsen."
-#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687
+#: sequencer.c:1420 builtin/am.c:1566 builtin/merge.c:702
msgid "git write-tree failed to write a tree"
msgstr "\"git write-tree\" schlug beim Schreiben eines \"Tree\"-Objektes fehl"
-#: sequencer.c:1386 sequencer.c:1447
+#: sequencer.c:1453 sequencer.c:1573
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "Konnte Commit-Beschreibung von '%s' nicht lesen."
-#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886
-#: builtin/merge.c:911
+#: sequencer.c:1484 sequencer.c:1516
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr "ungültige Autor-Identität '%s'"
+
+#: sequencer.c:1490
+msgid "corrupt author: missing date information"
+msgstr "unbrauchbarer Autor: Datumsinformationen fehlen"
+
+#: sequencer.c:1529 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:905
+#: builtin/merge.c:930 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "Fehler beim Schreiben des Commit-Objektes."
-#: sequencer.c:1474
+#: sequencer.c:1556 sequencer.c:4291 t/helper/test-fast-rebase.c:198
+#, c-format
+msgid "could not update %s"
+msgstr "Konnte %s nicht aktualisieren."
+
+#: sequencer.c:1605
#, c-format
msgid "could not parse commit %s"
msgstr "Konnte Commit %s nicht parsen."
-#: sequencer.c:1479
+#: sequencer.c:1610
#, c-format
msgid "could not parse parent commit %s"
msgstr "Konnte Eltern-Commit %s nicht parsen."
-#: sequencer.c:1562 sequencer.c:1673
+#: sequencer.c:1693 sequencer.c:1804
#, c-format
msgid "unknown command: %d"
msgstr "Unbekannter Befehl: %d"
-#: sequencer.c:1620 sequencer.c:1645
+#: sequencer.c:1751 sequencer.c:1776
#, c-format
msgid "This is a combination of %d commits."
msgstr "Das ist eine Kombination aus %d Commits."
-#: sequencer.c:1630
+#: sequencer.c:1761
msgid "need a HEAD to fixup"
msgstr "benötige HEAD für fixup"
-#: sequencer.c:1632 sequencer.c:3212
+#: sequencer.c:1763 sequencer.c:3380
msgid "could not read HEAD"
msgstr "Konnte HEAD nicht lesen"
-#: sequencer.c:1634
+#: sequencer.c:1765
msgid "could not read HEAD's commit message"
msgstr "Konnte Commit-Beschreibung von HEAD nicht lesen"
-#: sequencer.c:1640
+#: sequencer.c:1771
#, c-format
msgid "cannot write '%s'"
msgstr "kann '%s' nicht schreiben"
-#: sequencer.c:1647 git-rebase--preserve-merges.sh:496
+#: sequencer.c:1778 git-rebase--preserve-merges.sh:486
msgid "This is the 1st commit message:"
msgstr "Das ist die erste Commit-Beschreibung:"
-#: sequencer.c:1655
+#: sequencer.c:1786
#, c-format
msgid "could not read commit message of %s"
msgstr "Konnte Commit-Beschreibung von %s nicht lesen."
-#: sequencer.c:1662
+#: sequencer.c:1793
#, c-format
msgid "This is the commit message #%d:"
msgstr "Das ist Commit-Beschreibung #%d:"
-#: sequencer.c:1668
+#: sequencer.c:1799
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Die Commit-Beschreibung #%d wird ausgelassen:"
-#: sequencer.c:1756
+#: sequencer.c:1887
msgid "your index file is unmerged."
msgstr "Ihre Index-Datei ist nicht zusammengeführt."
-#: sequencer.c:1763
+#: sequencer.c:1894
msgid "cannot fixup root commit"
msgstr "kann fixup nicht auf Root-Commit anwenden"
-#: sequencer.c:1782
+#: sequencer.c:1913
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "Commit %s ist ein Merge, aber die Option -m wurde nicht angegeben."
-#: sequencer.c:1790 sequencer.c:1798
+#: sequencer.c:1921 sequencer.c:1929
#, c-format
msgid "commit %s does not have parent %d"
msgstr "Commit %s hat keinen Eltern-Commit %d"
-#: sequencer.c:1804
+#: sequencer.c:1935
#, c-format
msgid "cannot get commit message for %s"
msgstr "Kann keine Commit-Beschreibung für %s bekommen."
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1823
+#: sequencer.c:1954
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: kann Eltern-Commit %s nicht parsen"
-#: sequencer.c:1888
+#: sequencer.c:2019
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "Konnte '%s' nicht zu '%s' umbenennen."
-#: sequencer.c:1943
+#: sequencer.c:2079
#, c-format
msgid "could not revert %s... %s"
msgstr "Konnte \"revert\" nicht auf %s... (%s) ausführen"
-#: sequencer.c:1944
+#: sequencer.c:2080
#, c-format
msgid "could not apply %s... %s"
msgstr "Konnte %s... (%s) nicht anwenden"
-#: sequencer.c:1961
+#: sequencer.c:2100
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "Weglassen von %s %s -- Patch-Inhalte sind bereits im Upstream-Branch\n"
-#: sequencer.c:2018
+#: sequencer.c:2158
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: Fehler beim Lesen des Index"
-#: sequencer.c:2025
+#: sequencer.c:2165
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: Fehler beim Aktualisieren des Index"
-#: sequencer.c:2102
+#: sequencer.c:2242
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s akzeptiert keine Argumente: '%s'"
-#: sequencer.c:2111
+#: sequencer.c:2251
#, c-format
msgid "missing arguments for %s"
msgstr "Fehlende Argumente für %s."
-#: sequencer.c:2142
+#: sequencer.c:2282
#, c-format
msgid "could not parse '%s'"
msgstr "Konnte '%s' nicht parsen."
-#: sequencer.c:2203
+#: sequencer.c:2343
#, c-format
msgid "invalid line %d: %.*s"
msgstr "Ungültige Zeile %d: %.*s"
-#: sequencer.c:2214
+#: sequencer.c:2354
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "Kann '%s' nicht ohne vorherigen Commit ausführen"
-#: sequencer.c:2298
+#: sequencer.c:2440
msgid "cancelling a cherry picking in progress"
msgstr "Abbrechen eines laufenden \"cherry-pick\""
-#: sequencer.c:2305
+#: sequencer.c:2449
msgid "cancelling a revert in progress"
msgstr "Abbrechen eines laufenden \"revert\""
-#: sequencer.c:2349
+#: sequencer.c:2493
msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
"Bitte beheben Sie dieses, indem Sie 'git rebase --edit-todo' ausführen."
-#: sequencer.c:2351
+#: sequencer.c:2495
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "Unbenutzbares Instruktionsblatt: '%s'"
-#: sequencer.c:2356
+#: sequencer.c:2500
msgid "no commits parsed."
msgstr "Keine Commits geparst."
-#: sequencer.c:2367
+#: sequencer.c:2511
msgid "cannot cherry-pick during a revert."
msgstr "Kann Cherry-Pick nicht während eines Reverts ausführen."
-#: sequencer.c:2369
+#: sequencer.c:2513
msgid "cannot revert during a cherry-pick."
msgstr "Kann Revert nicht während eines Cherry-Picks ausführen."
-#: sequencer.c:2447
+#: sequencer.c:2591
#, c-format
msgid "invalid value for %s: %s"
msgstr "Ungültiger Wert für %s: %s"
-#: sequencer.c:2540
+#: sequencer.c:2698
msgid "unusable squash-onto"
msgstr "Unbenutzbares squash-onto."
-#: sequencer.c:2556
+#: sequencer.c:2718
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "Fehlerhaftes Optionsblatt: '%s'"
-#: sequencer.c:2644 sequencer.c:4361
+#: sequencer.c:2811 sequencer.c:4644
msgid "empty commit set passed"
msgstr "leere Menge von Commits übergeben"
-#: sequencer.c:2660
+#: sequencer.c:2828
msgid "revert is already in progress"
msgstr "\"revert\" ist bereits im Gange"
-#: sequencer.c:2662
+#: sequencer.c:2830
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "Versuchen Sie \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:2665
+#: sequencer.c:2833
msgid "cherry-pick is already in progress"
msgstr "\"cherry-pick\" wird bereits durchgeführt"
-#: sequencer.c:2667
+#: sequencer.c:2835
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "Versuchen Sie \"git cherry-pick (--continue | %s--abort | --quit)\""
-#: sequencer.c:2681
+#: sequencer.c:2849
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "Konnte \"sequencer\"-Verzeichnis '%s' nicht erstellen."
-#: sequencer.c:2696
+#: sequencer.c:2864
msgid "could not lock HEAD"
msgstr "Konnte HEAD nicht sperren"
-#: sequencer.c:2756 sequencer.c:4099
+#: sequencer.c:2924 sequencer.c:4379
msgid "no cherry-pick or revert in progress"
msgstr "kein \"cherry-pick\" oder \"revert\" im Gange"
-#: sequencer.c:2758 sequencer.c:2769
+#: sequencer.c:2926 sequencer.c:2937
msgid "cannot resolve HEAD"
msgstr "kann HEAD nicht auflösen"
-#: sequencer.c:2760 sequencer.c:2804
+#: sequencer.c:2928 sequencer.c:2972
msgid "cannot abort from a branch yet to be born"
msgstr "kann nicht abbrechen: bin auf einem Branch, der noch nicht geboren ist"
-#: sequencer.c:2790 builtin/grep.c:724
+#: sequencer.c:2958 builtin/grep.c:757
#, c-format
msgid "cannot open '%s'"
msgstr "kann '%s' nicht öffnen"
-#: sequencer.c:2792
+#: sequencer.c:2960
#, c-format
msgid "cannot read '%s': %s"
msgstr "Kann '%s' nicht lesen: %s"
-#: sequencer.c:2793
+#: sequencer.c:2961
msgid "unexpected end of file"
msgstr "Unerwartetes Dateiende"
-#: sequencer.c:2799
+#: sequencer.c:2967
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "gespeicherte \"pre-cherry-pick\" HEAD Datei '%s' ist beschädigt"
-#: sequencer.c:2810
+#: sequencer.c:2978
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Sie scheinen HEAD verändert zu haben. Keine Rückspulung, prüfen Sie HEAD."
-#: sequencer.c:2851
+#: sequencer.c:3019
msgid "no revert in progress"
msgstr "Kein Revert im Gange"
-#: sequencer.c:2859
+#: sequencer.c:3028
msgid "no cherry-pick in progress"
msgstr "kein \"cherry-pick\" im Gange"
-#: sequencer.c:2869
+#: sequencer.c:3038
msgid "failed to skip the commit"
msgstr "Überspringen des Commits fehlgeschlagen"
-#: sequencer.c:2876
+#: sequencer.c:3045
msgid "there is nothing to skip"
msgstr "Nichts zum Überspringen vorhanden"
-#: sequencer.c:2879
+#: sequencer.c:3048
#, c-format
msgid ""
"have you committed already?\n"
@@ -7181,21 +8046,16 @@
"Haben Sie bereits committet?\n"
"Versuchen Sie \"git %s --continue\""
-#: sequencer.c:3003 sequencer.c:4011
-#, c-format
-msgid "could not update %s"
-msgstr "Konnte %s nicht aktualisieren."
-
-#: sequencer.c:3042 sequencer.c:3991
+#: sequencer.c:3210 sequencer.c:4271
msgid "cannot read HEAD"
msgstr "Kann HEAD nicht lesen"
-#: sequencer.c:3059
+#: sequencer.c:3227
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "Konnte '%s' nicht nach '%s' kopieren."
-#: sequencer.c:3067
+#: sequencer.c:3235
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -7214,22 +8074,27 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:3077
+#: sequencer.c:3245
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "Konnte %s... (%.*s) nicht anwenden"
-#: sequencer.c:3084
+#: sequencer.c:3252
#, c-format
msgid "Could not merge %.*s"
msgstr "Konnte \"%.*s\" nicht zusammenführen."
-#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641
+#: sequencer.c:3266 sequencer.c:3270 builtin/difftool.c:640
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "Konnte '%s' nicht nach '%s' kopieren."
-#: sequencer.c:3129
+#: sequencer.c:3282
+#, c-format
+msgid "Executing: %s\n"
+msgstr "Führe aus: %s\n"
+
+#: sequencer.c:3297
#, c-format
msgid ""
"execution failed: %s\n"
@@ -7245,11 +8110,11 @@
"\n"
"ausführen.\n"
-#: sequencer.c:3135
+#: sequencer.c:3303
msgid "and made changes to the index and/or the working tree\n"
msgstr "Der Index und/oder das Arbeitsverzeichnis wurde geändert.\n"
-#: sequencer.c:3141
+#: sequencer.c:3309
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -7267,103 +8132,124 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3202
+#: sequencer.c:3370
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "Unerlaubter Beschriftungsname: '%.*s'"
-#: sequencer.c:3256
+#: sequencer.c:3424
msgid "writing fake root commit"
msgstr "unechten Root-Commit schreiben"
-#: sequencer.c:3261
+#: sequencer.c:3429
msgid "writing squash-onto"
msgstr "squash-onto schreiben"
-#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886
-#, c-format
-msgid "failed to find tree of %s"
-msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s."
-
-#: sequencer.c:3344
+#: sequencer.c:3513
#, c-format
msgid "could not resolve '%s'"
msgstr "Konnte '%s' nicht auflösen."
-#: sequencer.c:3375
+#: sequencer.c:3546
msgid "cannot merge without a current revision"
msgstr "Kann nicht ohne einen aktuellen Commit mergen."
-#: sequencer.c:3397
+#: sequencer.c:3568
#, c-format
msgid "unable to parse '%.*s'"
msgstr "Konnte '%.*s' nicht parsen."
-#: sequencer.c:3406
+#: sequencer.c:3577
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "Nichts zum Zusammenführen: '%.*s'"
-#: sequencer.c:3418
+#: sequencer.c:3589
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:3434
+#: sequencer.c:3605
#, c-format
msgid "could not get commit message of '%s'"
msgstr "Konnte keine Commit-Beschreibung von '%s' bekommen."
-#: sequencer.c:3594
+#: sequencer.c:3788
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "Konnte nicht einmal versuchen '%.*s' zu mergen."
-#: sequencer.c:3610
+#: sequencer.c:3804
msgid "merge: Unable to write new index file"
msgstr "merge: Konnte neue Index-Datei nicht schreiben."
-#: sequencer.c:3679 builtin/rebase.c:737
+#: sequencer.c:3878
+msgid "Cannot autostash"
+msgstr "Kann automatischen Stash nicht erzeugen."
+
+#: sequencer.c:3881
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "Unerwartete 'stash'-Antwort: '%s'"
+
+#: sequencer.c:3887
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "Konnte Verzeichnis für '%s' nicht erstellen."
+
+#: sequencer.c:3890
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "Automatischen Stash erzeugt: %s\n"
+
+#: sequencer.c:3894
+msgid "could not reset --hard"
+msgstr "Konnte 'reset --hard' nicht ausführen."
+
+#: sequencer.c:3919
#, c-format
msgid "Applied autostash.\n"
msgstr "Automatischen Stash angewendet.\n"
-#: sequencer.c:3691
+#: sequencer.c:3931
#, c-format
msgid "cannot store %s"
msgstr "kann %s nicht speichern"
-#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113
+#: sequencer.c:3934
#, 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:3755
-#, c-format
-msgid "%s: not a valid OID"
-msgstr "%s: keine gültige OID"
+#: sequencer.c:3939
+msgid "Applying autostash resulted in conflicts."
+msgstr "Beim Anwenden des automatischen Stash traten Konflikte auf."
-#: sequencer.c:3760 git-rebase--preserve-merges.sh:779
+#: sequencer.c:3940
+msgid "Autostash exists; creating a new stash entry."
+msgstr "Automatischer Stash existiert; ein neuer Stash-Eintrag wird erstellt."
+
+#: sequencer.c:4033 git-rebase--preserve-merges.sh:769
msgid "could not detach HEAD"
msgstr "Konnte HEAD nicht loslösen"
-#: sequencer.c:3775
+#: sequencer.c:4048
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Angehalten bei HEAD\n"
-#: sequencer.c:3777
+#: sequencer.c:4050
#, c-format
msgid "Stopped at %s\n"
msgstr "Angehalten bei %s\n"
-#: sequencer.c:3785
+#: sequencer.c:4058
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -7385,50 +8271,60 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:3869
+#: sequencer.c:4104
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "Rebase (%d/%d)%s"
+
+#: sequencer.c:4149
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Angehalten bei %s... %.*s\n"
-#: sequencer.c:3940
+#: sequencer.c:4220
#, c-format
msgid "unknown command %d"
msgstr "Unbekannter Befehl %d"
-#: sequencer.c:3999
+#: sequencer.c:4279
msgid "could not read orig-head"
msgstr "Konnte orig-head nicht lesen."
-#: sequencer.c:4004
+#: sequencer.c:4284
msgid "could not read 'onto'"
msgstr "Konnte 'onto' nicht lesen."
-#: sequencer.c:4018
+#: sequencer.c:4298
#, c-format
msgid "could not update HEAD to %s"
msgstr "Konnte HEAD nicht auf %s aktualisieren."
-#: sequencer.c:4111
+#: sequencer.c:4358
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "Erfolgreich Rebase ausgeführt und %s aktualisiert.\n"
+
+#: sequencer.c:4391
msgid "cannot rebase: You have unstaged changes."
msgstr ""
"Rebase nicht möglich: Sie haben Änderungen, die nicht zum Commit\n"
"vorgemerkt sind."
-#: sequencer.c:4120
+#: sequencer.c:4400
msgid "cannot amend non-existing commit"
msgstr "Kann nicht existierenden Commit nicht nachbessern."
-#: sequencer.c:4122
+#: sequencer.c:4402
#, c-format
msgid "invalid file: '%s'"
msgstr "Ungültige Datei: '%s'"
-#: sequencer.c:4124
+#: sequencer.c:4404
#, c-format
msgid "invalid contents: '%s'"
msgstr "Ungültige Inhalte: '%s'"
-#: sequencer.c:4127
+#: sequencer.c:4407
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -7439,69 +8335,69 @@
"committen Sie diese zuerst und führen Sie dann 'git rebase --continue'\n"
"erneut aus."
-#: sequencer.c:4163 sequencer.c:4202
+#: sequencer.c:4443 sequencer.c:4482
#, c-format
msgid "could not write file: '%s'"
msgstr "Konnte Datei nicht schreiben: '%s'"
-#: sequencer.c:4217
+#: sequencer.c:4498
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "Konnte CHERRY_PICK_HEAD nicht löschen."
-#: sequencer.c:4224
+#: sequencer.c:4505
msgid "could not commit staged changes."
msgstr "Konnte Änderungen aus der Staging-Area nicht committen."
-#: sequencer.c:4338
+#: sequencer.c:4621
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: %s kann nicht in \"cherry-pick\" benutzt werden"
-#: sequencer.c:4342
+#: sequencer.c:4625
#, c-format
msgid "%s: bad revision"
msgstr "%s: ungültiger Commit"
-#: sequencer.c:4377
+#: sequencer.c:4660
msgid "can't revert as initial commit"
msgstr "Kann nicht als allerersten Commit einen Revert ausführen."
-#: sequencer.c:4846
+#: sequencer.c:5137
msgid "make_script: unhandled options"
msgstr "make_script: unbehandelte Optionen"
-#: sequencer.c:4849
+#: sequencer.c:5140
msgid "make_script: error preparing revisions"
msgstr "make_script: Fehler beim Vorbereiten der Commits"
-#: sequencer.c:5083 sequencer.c:5100
+#: sequencer.c:5382 sequencer.c:5399
msgid "nothing to do"
msgstr "Nichts zu tun."
-#: sequencer.c:5119
+#: sequencer.c:5418
msgid "could not skip unnecessary pick commands"
msgstr "Konnte unnötige \"pick\"-Befehle nicht auslassen."
-#: sequencer.c:5213
+#: sequencer.c:5512
msgid "the script was already rearranged."
msgstr "Das Script wurde bereits umgeordnet."
-#: setup.c:124
+#: setup.c:133
#, c-format
msgid "'%s' is outside repository at '%s'"
msgstr "'%s' liegt außerhalb des Repositories von '%s'"
-#: setup.c:175
+#: 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: kein solcher Pfad im Arbeitsverzeichnis.\n"
+"%s: Pfad nicht im Arbeitsverzeichnis gefunden.\n"
"Benutzen Sie 'git <Befehl> -- <Pfad>...' zur Angabe von Pfaden, die lokal\n"
"nicht existieren."
-#: setup.c:188
+#: setup.c:198
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -7513,13 +8409,13 @@
"Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\n"
"'git <Befehl> [<Commit>...] -- [<Datei>...]'"
-#: setup.c:254
+#: 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:273
+#: setup.c:283
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -7530,93 +8426,97 @@
"Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\n"
"'git <Befehl> [<Commit>...] -- [<Datei>...]'"
-#: setup.c:409
+#: setup.c:419
msgid "unable to set up work tree using invalid config"
msgstr ""
"Konnte Arbeitsverzeichnis mit ungültiger Konfiguration nicht einrichten."
-#: setup.c:413
+#: 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:559
+#: setup.c:661
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Erwartete Git-Repository-Version <= %d, %d gefunden"
-#: setup.c:567
+#: setup.c:669
msgid "unknown repository extensions found:"
msgstr "Unbekannte Repository-Erweiterungen gefunden:"
-#: setup.c:586
+#: 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:588
+#: 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:590
+#: setup.c:704
#, c-format
msgid "error reading %s"
msgstr "Fehler beim Lesen von '%s'."
-#: setup.c:592
+#: setup.c:706
#, c-format
msgid "invalid gitfile format: %s"
msgstr "Ungültiges gitfile-Format: %s"
-#: setup.c:594
+#: setup.c:708
#, c-format
msgid "no path in gitfile: %s"
msgstr "Kein Pfad in gitfile: %s"
-#: setup.c:596
+#: setup.c:710
#, c-format
msgid "not a git repository: %s"
msgstr "Kein Git-Repository: %s"
-#: setup.c:695
+#: setup.c:812
#, c-format
msgid "'$%s' too big"
msgstr "'$%s' zu groß"
-#: setup.c:709
+#: setup.c:826
#, c-format
msgid "not a git repository: '%s'"
msgstr "Kein Git-Repository: '%s'"
-#: setup.c:738 setup.c:740 setup.c:771
+#: 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:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856
+#: 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:870
+#: setup.c:987
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "Konnte '%*s%s%s' nicht lesen."
-#: setup.c:1108
+#: setup.c:1225
msgid "Unable to read current working directory"
msgstr "Konnte aktuelles Arbeitsverzeichnis nicht lesen."
-#: setup.c:1117 setup.c:1123
+#: setup.c:1234 setup.c:1240
#, c-format
msgid "cannot change to '%s'"
msgstr "Kann nicht nach '%s' wechseln."
-#: setup.c:1128
+#: 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:1134
+#: setup.c:1251
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
@@ -7626,7 +8526,7 @@
"%s)\n"
"Stoppe bei Dateisystemgrenze (GIT_DISCOVERY_ACROSS_FILESYSTEM nicht gesetzt)."
-#: setup.c:1245
+#: setup.c:1362
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -7635,420 +8535,56 @@
"Problem mit Wert für Dateimodus (0%.3o) von core.sharedRepository.\n"
"Der Besitzer der Dateien muss immer Lese- und Schreibrechte haben."
-#: setup.c:1289
+#: setup.c:1409
msgid "open /dev/null or dup failed"
msgstr "Öffnen von /dev/null oder dup fehlgeschlagen."
-#: setup.c:1304
+#: setup.c:1424
msgid "fork failed"
msgstr "fork fehlgeschlagen"
-#: setup.c:1309
+#: setup.c:1429
msgid "setsid failed"
msgstr "setsid fehlgeschlagen"
-#: sha1-file.c:452
-#, c-format
-msgid "object directory %s does not exist; check .git/objects/info/alternates"
-msgstr ""
-"Objektverzeichnis %s existiert nicht; prüfe .git/objects/info/alternates"
-
-#: sha1-file.c:503
-#, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr "Konnte alternativen Objektpfad '%s' nicht normalisieren."
-
-#: sha1-file.c:575
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr "%s: ignoriere alternative Objektspeicher - Verschachtelung zu tief"
-
-#: sha1-file.c:582
-#, c-format
-msgid "unable to normalize object directory: %s"
-msgstr "Konnte Objektverzeichnis '%s' nicht normalisieren."
-
-#: sha1-file.c:625
-msgid "unable to fdopen alternates lockfile"
-msgstr "Konnte fdopen nicht auf Lock-Datei für \"alternates\" aufrufen."
-
-#: sha1-file.c:643
-msgid "unable to read alternates file"
-msgstr "Konnte \"alternates\"-Datei nicht lesen."
-
-#: sha1-file.c:650
-msgid "unable to move new alternates file into place"
-msgstr "Konnte neue \"alternates\"-Datei nicht übernehmen."
-
-#: sha1-file.c:685
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "Pfad '%s' existiert nicht"
-
-#: sha1-file.c:711
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr ""
-"Referenziertes Repository '%s' wird noch nicht als verknüpftes\n"
-"Arbeitsverzeichnis unterstützt."
-
-#: sha1-file.c:717
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "Referenziertes Repository '%s' ist kein lokales Repository."
-
-#: sha1-file.c:723
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr ""
-"Referenziertes Repository '%s' hat eine unvollständige Historie (shallow)."
-
-#: sha1-file.c:731
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr ""
-"Referenziertes Repository '%s' ist mit künstlichen Vorgängern (\"grafts\") "
-"eingehängt."
-
-#: sha1-file.c:791
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "Ungültige Zeile beim Parsen alternativer Referenzen: %s"
-
-#: sha1-file.c:943
-#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
-msgstr "Versuche mmap %<PRIuMAX> über Limit %<PRIuMAX>."
-
-#: sha1-file.c:964
-msgid "mmap failed"
-msgstr "mmap fehlgeschlagen"
-
-#: sha1-file.c:1128
-#, c-format
-msgid "object file %s is empty"
-msgstr "Objektdatei %s ist leer."
-
-#: sha1-file.c:1263 sha1-file.c:2443
-#, c-format
-msgid "corrupt loose object '%s'"
-msgstr "Fehlerhaftes loses Objekt '%s'."
-
-#: sha1-file.c:1265 sha1-file.c:2447
-#, c-format
-msgid "garbage at end of loose object '%s'"
-msgstr "Nutzlose Daten am Ende von losem Objekt '%s'."
-
-#: sha1-file.c:1307
-msgid "invalid object type"
-msgstr "ungültiger Objekt-Typ"
-
-#: sha1-file.c:1391
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "Konnte %s Kopfbereich nicht mit --allow-unknown-type entpacken."
-
-#: sha1-file.c:1394
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "Konnte %s Kopfbereich nicht entpacken."
-
-#: sha1-file.c:1400
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "Konnte %s Kopfbereich mit --allow-unknown-type nicht parsen."
-
-#: sha1-file.c:1403
-#, c-format
-msgid "unable to parse %s header"
-msgstr "Konnte %s Kopfbereich nicht parsen."
-
-#: sha1-file.c:1629
-#, c-format
-msgid "failed to read object %s"
-msgstr "Konnte Objekt %s nicht lesen."
-
-#: sha1-file.c:1633
-#, c-format
-msgid "replacement %s not found for %s"
-msgstr "Ersetzung %s für %s nicht gefunden."
-
-#: sha1-file.c:1637
-#, c-format
-msgid "loose object %s (stored in %s) is corrupt"
-msgstr "Loses Objekt %s (gespeichert in %s) ist beschädigt."
-
-#: sha1-file.c:1641
-#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "Gepacktes Objekt %s (gespeichert in %s) ist beschädigt."
-
-#: sha1-file.c:1746
-#, c-format
-msgid "unable to write file %s"
-msgstr "Konnte Datei %s nicht schreiben."
-
-#: sha1-file.c:1753
-#, c-format
-msgid "unable to set permission to '%s'"
-msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen."
-
-#: sha1-file.c:1760
-msgid "file write error"
-msgstr "Fehler beim Schreiben einer Datei."
-
-#: sha1-file.c:1780
-msgid "error when closing loose object file"
-msgstr "Fehler beim Schließen der Datei für lose Objekte."
-
-#: sha1-file.c:1845
-#, c-format
-msgid "insufficient permission for adding an object to repository database %s"
-msgstr ""
-"Unzureichende Berechtigung zum Hinzufügen eines Objektes zur Repository-"
-"Datenbank %s"
-
-#: sha1-file.c:1847
-msgid "unable to create temporary file"
-msgstr "Konnte temporäre Datei nicht erstellen."
-
-#: sha1-file.c:1871
-msgid "unable to write loose object file"
-msgstr "Fehler beim Schreiben der Datei für lose Objekte."
-
-#: sha1-file.c:1877
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr "Konnte neues Objekt %s (%d) nicht komprimieren."
-
-#: sha1-file.c:1881
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr "deflateEnd auf Objekt %s fehlgeschlagen (%d)"
-
-#: sha1-file.c:1885
-#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr "Fehler wegen instabilen Objektquelldaten für %s"
-
-#: sha1-file.c:1895 builtin/pack-objects.c:1054
-#, c-format
-msgid "failed utime() on %s"
-msgstr "Fehler beim Aufruf von utime() auf '%s'."
-
-#: sha1-file.c:1972
-#, c-format
-msgid "cannot read object for %s"
-msgstr "Kann Objekt für %s nicht lesen."
-
-#: sha1-file.c:2011
-msgid "corrupt commit"
-msgstr "fehlerhafter Commit"
-
-#: sha1-file.c:2019
-msgid "corrupt tag"
-msgstr "fehlerhaftes Tag"
-
-#: sha1-file.c:2119
-#, c-format
-msgid "read error while indexing %s"
-msgstr "Lesefehler beim Indizieren von '%s'."
-
-#: sha1-file.c:2122
-#, c-format
-msgid "short read while indexing %s"
-msgstr "read() zu kurz beim Indizieren von '%s'."
-
-#: sha1-file.c:2195 sha1-file.c:2205
-#, c-format
-msgid "%s: failed to insert into database"
-msgstr "%s: Fehler beim Einfügen in die Datenbank"
-
-#: sha1-file.c:2211
-#, c-format
-msgid "%s: unsupported file type"
-msgstr "%s: nicht unterstützte Dateiart"
-
-#: sha1-file.c:2235
-#, c-format
-msgid "%s is not a valid object"
-msgstr "%s ist kein gültiges Objekt"
-
-#: sha1-file.c:2237
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s ist kein gültiges '%s' Objekt"
-
-#: sha1-file.c:2264 builtin/index-pack.c:155
-#, c-format
-msgid "unable to open %s"
-msgstr "kann %s nicht öffnen"
-
-#: sha1-file.c:2454 sha1-file.c:2507
-#, c-format
-msgid "hash mismatch for %s (expected %s)"
-msgstr "Hash für %s stimmt nicht überein (%s erwartet)."
-
-#: sha1-file.c:2478
-#, c-format
-msgid "unable to mmap %s"
-msgstr "Konnte mmap nicht auf %s ausführen."
-
-#: sha1-file.c:2483
-#, c-format
-msgid "unable to unpack header of %s"
-msgstr "Konnte Kopfbereich von %s nicht entpacken."
-
-#: sha1-file.c:2489
-#, c-format
-msgid "unable to parse header of %s"
-msgstr "Konnte Kopfbereich von %s nicht parsen."
-
-#: sha1-file.c:2500
-#, c-format
-msgid "unable to unpack contents of %s"
-msgstr "Konnte Inhalt von %s nicht entpacken."
-
-#: sha1-name.c:486
-#, c-format
-msgid "short SHA1 %s is ambiguous"
-msgstr "Kurzer SHA-1 %s ist mehrdeutig."
-
-#: sha1-name.c:497
-msgid "The candidates are:"
-msgstr "Die Kandidaten sind:"
-
-#: 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 erzeugt normalerweise keine Referenzen die mit\n"
-"40 Hex-Zeichen enden, da diese ignoriert werden wenn\n"
-"Sie diese angeben. Diese Referenzen könnten aus Versehen\n"
-"erzeugt worden sein. Zum Beispiel,\n"
-"\n"
-" git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"wobei \"$br\" leer ist und eine 40-Hex-Referenz erzeugt\n"
-"wurde. Bitte prüfen Sie diese Referenzen und löschen\n"
-"Sie sie gegebenenfalls. Unterdrücken Sie diese Meldung\n"
-"indem Sie \"git config advice.objectNameWarning false\"\n"
-"ausführen."
-
-#: sha1-name.c:916
-#, c-format
-msgid "log for '%.*s' only goes back to %s"
-msgstr "Log für '%.*s' geht nur bis %s zurück"
-
-#: sha1-name.c:924
-#, c-format
-msgid "log for '%.*s' only has %d entries"
-msgstr "Log für '%.*s' hat nur %d Einträge"
-
-#: sha1-name.c:1689
-#, c-format
-msgid "path '%s' exists on disk, but not in '%.*s'"
-msgstr "Pfad '%s' befindet sich im Dateisystem, aber nicht in '%.*s'"
-
-#: sha1-name.c:1695
-#, c-format
-msgid ""
-"path '%s' exists, but not '%s'\n"
-"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
-msgstr ""
-"Pfad '%s' existiert, aber nicht '%s'\n"
-"Hinweis: Meinten Sie '%.*s:%s' auch bekannt als '%.*s:./%s'?"
-
-#: sha1-name.c:1704
-#, c-format
-msgid "path '%s' does not exist in '%.*s'"
-msgstr "Pfad '%s' existiert nicht in '%.*s'"
-
-#: sha1-name.c:1732
-#, c-format
-msgid ""
-"path '%s' is in the index, but not at stage %d\n"
-"hint: Did you mean ':%d:%s'?"
-msgstr ""
-"Pfad '%s' ist im Index, aber nicht in Stufe %d\n"
-"Hinweis: Meinten Sie ':%d:%s'?"
-
-#: sha1-name.c:1748
-#, c-format
-msgid ""
-"path '%s' is in the index, but not '%s'\n"
-"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
-msgstr ""
-"Pfad '%s' ist im Index, aber nicht '%s'\n"
-"Hinweis: Meinten Sie ':%d:%s' auch bekannt als ':%d:./%s'?"
-
-#: sha1-name.c:1756
-#, c-format
-msgid "path '%s' exists on disk, but not in the index"
-msgstr "Pfad '%s' existiert im Dateisystem, aber nicht im Index"
-
-#: sha1-name.c:1758
-#, c-format
-msgid "path '%s' does not exist (neither on disk nor in the index)"
-msgstr "Pfad '%s' existiert nicht (weder im Dateisystem noch im Index)"
-
-#: sha1-name.c:1771
-msgid "relative path syntax can't be used outside working tree"
-msgstr ""
-"Die Syntax für relative Pfade kann nicht außerhalb des Arbeitsverzeichnisses "
-"benutzt werden."
-
-#: sha1-name.c:1909
-#, c-format
-msgid "invalid object name '%.*s'."
-msgstr "ungültiger Objektname '%.*s'."
-
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:837
+#: strbuf.c:848
#, c-format
msgid "%u.%2.2u GiB"
msgstr "%u.%2.2u GiB"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:839
+#: 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:847
+#: strbuf.c:858
#, c-format
msgid "%u.%2.2u MiB"
msgstr "%u.%2.2u MiB"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:849
+#: 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:856
+#: strbuf.c:867
#, c-format
msgid "%u.%2.2u KiB"
msgstr "%u.%2.2u KiB"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:858
+#: 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:864
+#: strbuf.c:875
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
@@ -8056,18 +8592,50 @@
msgstr[1] "%u Bytes"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:866
+#: 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:1164
+#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719
+#: builtin/rebase.c:866
+#, 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 ""
@@ -8098,12 +8666,12 @@
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Pfadspezifikation '%s' befindet sich in Submodul '%.*s'"
-#: submodule.c:434
+#: submodule.c:435
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr "ungültiges --ignore-submodules Argument: %s"
-#: submodule.c:815
+#: submodule.c:817
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
@@ -8112,12 +8680,12 @@
"Submodul in Commit %s beim Pfad: '%s' hat den gleichen Namen wie ein "
"Submodul. Wird übersprungen."
-#: submodule.c:910
+#: submodule.c:920
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "Submodul-Eintrag '%s' (%s) ist ein %s, kein Commit."
-#: submodule.c:995
+#: submodule.c:1005
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
@@ -8126,36 +8694,36 @@
"Konnte 'git rev-list <Commits> --not --remotes -n 1' nicht in Submodul '%s' "
"ausführen."
-#: submodule.c:1118
+#: submodule.c:1128
#, c-format
msgid "process for submodule '%s' failed"
msgstr "Prozess für Submodul '%s' fehlgeschlagen"
-#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045
+#: submodule.c:1157 builtin/branch.c:689 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:1158
+#: submodule.c:1168
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr "Pushe Submodul '%s'\n"
-#: submodule.c:1161
+#: submodule.c:1171
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "Kann Push für Submodul '%s' nicht ausführen\n"
-#: submodule.c:1453
+#: submodule.c:1463
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr "Anfordern des Submoduls %s%s\n"
-#: submodule.c:1483
+#: submodule.c:1497
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr "Konnte nicht auf Submodul '%s' zugreifen\n"
-#: submodule.c:1637
+#: submodule.c:1652
#, c-format
msgid ""
"Errors during submodule fetch:\n"
@@ -8164,62 +8732,62 @@
"Fehler während des Anforderns der Submodule:\n"
"%s"
-#: submodule.c:1662
+#: submodule.c:1677
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "'%s' nicht als Git-Repository erkannt"
-#: submodule.c:1679
+#: submodule.c:1694
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr "Konnte 'git status --porcelain=2' nicht in Submodul %s ausführen"
-#: submodule.c:1720
+#: submodule.c:1735
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr "'git status --porcelain=2' ist in Submodul %s fehlgeschlagen"
-#: submodule.c:1800
+#: submodule.c:1810
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "Konnte 'git status' in Submodul '%s' nicht starten."
-#: submodule.c:1813
+#: submodule.c:1823
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "Konnte 'git status' in Submodul '%s' nicht ausführen."
-#: submodule.c:1828
+#: submodule.c:1838
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "Konnte core.worktree Einstellung in Submodul '%s' nicht aufheben."
-#: submodule.c:1855 submodule.c:2165
+#: submodule.c:1865 submodule.c:2175
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "Fehler bei Rekursion in Submodul-Pfad '%s'"
-#: submodule.c:1876
+#: submodule.c:1886
msgid "could not reset submodule index"
msgstr "konnte Index des Submoduls nicht zurücksetzen"
-#: submodule.c:1918
+#: submodule.c:1928
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "Submodul '%s' hat einen geänderten Index."
-#: submodule.c:1970
+#: submodule.c:1980
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "Submodule '%s' konnte nicht aktualisiert werden."
-#: submodule.c:2038
+#: submodule.c:2048
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr ""
"Git-Verzeichnis des Submoduls '%s' ist im Git-Verzeichnis '%.*s' enthalten."
-#: submodule.c:2059
+#: submodule.c:2069
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -8227,17 +8795,17 @@
"relocate_gitdir für Submodul '%s' mit mehr als einem Arbeitsverzeichnis\n"
"wird nicht unterstützt"
-#: submodule.c:2071 submodule.c:2130
+#: submodule.c:2081 submodule.c:2140
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "Konnte Name für Submodul '%s' nicht nachschlagen."
-#: submodule.c:2075
+#: submodule.c:2085
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr "Verschieben von '%s' in ein existierendes Git-Verzeichnis verweigert."
-#: submodule.c:2082
+#: submodule.c:2092
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -8248,95 +8816,262 @@
"'%s' nach\n"
"'%s'\n"
-#: submodule.c:2209
+#: submodule.c:2220
msgid "could not start ls-files in .."
msgstr "Konnte 'ls-files' nicht in .. starten"
-#: submodule.c:2248
+#: submodule.c:2260
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree mit unerwartetem Rückgabewert %d beendet"
-#: submodule-config.c:236
-#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "Ignoriere verdächtigen Submodulnamen: %s"
-
-#: submodule-config.c:303
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "Negative Werte für submodule.fetchjobs nicht erlaubt."
-
-#: submodule-config.c:401
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr ""
-"Ignoriere '%s', was als eine Befehlszeilenoption '%s' interpretiert werden "
-"würde."
-
-#: submodule-config.c:498
-#, c-format
-msgid "invalid value for %s"
-msgstr "Ungültiger Wert für %s"
-
-#: submodule-config.c:765
-#, 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:298 builtin/remote.c:323
+#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324
#, 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 builtin/mktag.c:91
msgid "could not read from stdin"
msgstr "konnte nicht von der Standard-Eingabe lesen"
-#: trailer.c:1011 wrapper.c:665
+#: 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-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:145
+#, c-format
+msgid "unable to find remote helper for '%s'"
+msgstr "Konnte Remote-Helper für '%s' nicht finden."
+
+#: 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:214
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
+msgstr ""
+"Unbekannte erforderliche Fähigkeit %s; dieser Remote-Helper benötigt\n"
+"wahrscheinlich eine neuere Version von Git."
+
+#: 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:287 transport-helper.c:429
+#, c-format
+msgid "%s unexpectedly said: '%s'"
+msgstr "unerwartete Ausgabe von %s: '%s'"
+
+#: transport-helper.c:417
+#, c-format
+msgid "%s also locked %s"
+msgstr "%s sperrte auch %s"
+
+#: transport-helper.c:497
+msgid "couldn't run fast-import"
+msgstr "konnte \"fast-import\" nicht ausführen"
+
+#: transport-helper.c:520
+msgid "error while running fast-import"
+msgstr "Fehler beim Ausführen von 'fast-import'."
+
+#: transport-helper.c:549 transport-helper.c:1237
+#, c-format
+msgid "could not read ref %s"
+msgstr "konnte Referenz %s nicht lesen"
+
+#: transport-helper.c:594
+#, c-format
+msgid "unknown response to connect: %s"
+msgstr "unbekannte Antwort auf 'connect': %s"
+
+#: 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:618
+msgid "invalid remote service path"
+msgstr "ungültiger Remote-Service Pfad."
+
+#: transport-helper.c:661 transport.c:1447
+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: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:845
+#, c-format
+msgid "helper reported unexpected status of %s"
+msgstr "Remote-Helper meldete unerwarteten Status von %s"
+
+#: transport-helper.c:928
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr "Remote-Helper %s unterstützt kein Trockenlauf"
+
+#: transport-helper.c:931
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr "Remote-Helper %s unterstützt kein --signed"
+
+#: transport-helper.c:934
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr "Remote-Helper %s unterstützt kein --signed=if-asked"
+
+#: transport-helper.c:939
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr "Remote-Helper %s unterstützt kein --atomic"
+
+#: transport-helper.c:943
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr "Remote-Helper %s unterstützt kein --%s"
+
+#: transport-helper.c:950
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr "Remote-Helper %s unterstützt nicht 'push-option'"
+
+#: transport-helper.c:1050
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr "Remote-Helper unterstützt kein Push; Refspec benötigt"
+
+#: transport-helper.c:1055
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr "Remote-Helper %s unterstützt kein 'force'."
+
+#: transport-helper.c:1102
+msgid "couldn't run fast-export"
+msgstr "Konnte \"fast-export\" nicht ausführen."
+
+#: transport-helper.c:1107
+msgid "error while running fast-export"
+msgstr "Fehler beim Ausführen von \"fast-export\"."
+
+#: transport-helper.c:1132
+#, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch.\n"
+msgstr ""
+"Keine gemeinsamen Referenzen und nichts spezifiziert; keine Ausführung.\n"
+"Vielleicht sollten Sie einen Branch angeben.\n"
+
+#: transport-helper.c:1214
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr "nicht unterstütztes Objekt-Format '%s'"
+
+#: transport-helper.c:1223
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr "Ungültige Antwort in Referenzliste: %s"
+
+#: transport-helper.c:1375
+#, c-format
+msgid "read(%s) failed"
+msgstr "Lesen von %s fehlgeschlagen."
+
+#: transport-helper.c:1402
+#, c-format
+msgid "write(%s) failed"
+msgstr "Schreiben von %s fehlgeschlagen."
+
+#: transport-helper.c:1451
+#, c-format
+msgid "%s thread failed"
+msgstr "Thread %s fehlgeschlagen."
+
+#: transport-helper.c:1455
+#, c-format
+msgid "%s thread failed to join: %s"
+msgstr "Fehler beim Beitreten zu Thread %s: %s"
+
+#: transport-helper.c:1474 transport-helper.c:1478
+#, c-format
+msgid "can't start thread for copying data: %s"
+msgstr "Kann Thread zum Kopieren von Daten nicht starten: %s"
+
+#: transport-helper.c:1515
+#, c-format
+msgid "%s process failed to wait"
+msgstr "Fehler beim Warten von Prozess %s."
+
+#: transport-helper.c:1519
+#, c-format
+msgid "%s process failed"
+msgstr "Prozess %s fehlgeschlagen"
+
+#: transport-helper.c:1537 transport-helper.c:1546
+msgid "can't start thread for copying data"
+msgstr "Kann Thread zum Kopieren von Daten nicht starten."
+
#: transport.c:116
#, c-format
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
@@ -8347,42 +9082,42 @@
msgid "could not read bundle '%s'"
msgstr "Konnte Paket '%s' nicht lesen."
-#: transport.c:214
+#: transport.c:220
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "transport: ungültige --depth Option '%s'"
-#: transport.c:266
+#: 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:267
+#: 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:632
+#: transport.c:727
msgid "could not parse transport.color.* config"
msgstr "Konnte transport.color.* Konfiguration nicht parsen."
-#: transport.c:705
+#: transport.c:802
msgid "support for protocol v2 not implemented yet"
msgstr "Unterstützung für Protokoll v2 noch nicht implementiert."
-#: transport.c:831
+#: transport.c:936
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "Unbekannter Wert für Konfiguration '%s': %s"
-#: transport.c:897
+#: transport.c:1002
#, c-format
msgid "transport '%s' not allowed"
msgstr "Übertragungsart '%s' nicht erlaubt."
-#: transport.c:949
+#: transport.c:1055
msgid "git-over-rsync is no longer supported"
msgstr "git-over-rsync wird nicht länger unterstützt."
-#: transport.c:1044
+#: transport.c:1157
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -8391,7 +9126,7 @@
"Die folgenden Submodul-Pfade enthalten Änderungen, die in keinem\n"
"Remote-Repository gefunden wurden:\n"
-#: transport.c:1048
+#: transport.c:1161
#, c-format
msgid ""
"\n"
@@ -8418,210 +9153,31 @@
"zum Versenden zu einem Remote-Repository.\n"
"\n"
-#: transport.c:1056
+#: transport.c:1169
msgid "Aborting."
msgstr "Abbruch."
-#: transport.c:1201
+#: transport.c:1316
msgid "failed to push all needed submodules"
msgstr "Fehler beim Versand aller erforderlichen Submodule."
-#: transport.c:1345 transport-helper.c:657
-msgid "operation not supported by protocol"
-msgstr "Die Operation wird von dem Protokoll nicht unterstützt."
-
-#: transport-helper.c:61 transport-helper.c:90
-msgid "full write to remote helper failed"
-msgstr "Vollständiges Schreiben zu Remote-Helper fehlgeschlagen."
-
-#: transport-helper.c:144
-#, c-format
-msgid "unable to find remote helper for '%s'"
-msgstr "Konnte Remote-Helper für '%s' nicht finden."
-
-#: transport-helper.c:160 transport-helper.c:571
-msgid "can't dup helper output fd"
-msgstr ""
-"Konnte dup() auf Dateideskriptor für Ausgaben des Remote-Helpers nicht "
-"ausführen."
-
-#: transport-helper.c:211
-#, c-format
-msgid ""
-"unknown mandatory capability %s; this remote helper probably needs newer "
-"version of Git"
-msgstr ""
-"Unbekannte erforderliche Fähigkeit %s; dieser Remote-Helper benötigt\n"
-"wahrscheinlich eine neuere Version von Git."
-
-#: transport-helper.c:217
-msgid "this remote helper should implement refspec capability"
-msgstr "Dieser Remote-Helper sollte die \"refspec\"-Fähigkeit implementieren."
-
-#: transport-helper.c:284 transport-helper.c:425
-#, c-format
-msgid "%s unexpectedly said: '%s'"
-msgstr "unerwartete Ausgabe von %s: '%s'"
-
-#: transport-helper.c:414
-#, c-format
-msgid "%s also locked %s"
-msgstr "%s sperrte auch %s"
-
-#: transport-helper.c:493
-msgid "couldn't run fast-import"
-msgstr "Konnte \"fast-import\" nicht ausführen."
-
-#: transport-helper.c:516
-msgid "error while running fast-import"
-msgstr "Fehler beim Ausführen von 'fast-import'."
-
-#: transport-helper.c:545 transport-helper.c:1134
-#, c-format
-msgid "could not read ref %s"
-msgstr "Konnte Referenz %s nicht lesen."
-
-#: transport-helper.c:590
-#, c-format
-msgid "unknown response to connect: %s"
-msgstr "Unbekannte Antwort auf 'connect': %s"
-
-#: transport-helper.c:612
-msgid "setting remote service path not supported by protocol"
-msgstr ""
-"Setzen des Remote-Service Pfads wird von dem Protokoll nicht unterstützt."
-
-#: transport-helper.c:614
-msgid "invalid remote service path"
-msgstr "Ungültiger Remote-Service Pfad."
-
-#: transport-helper.c:660
-#, c-format
-msgid "can't connect to subservice %s"
-msgstr "Kann keine Verbindung zu Subservice %s herstellen."
-
-#: transport-helper.c:736
-#, c-format
-msgid "expected ok/error, helper said '%s'"
-msgstr "Erwartete ok/error, Remote-Helper gab '%s' aus."
-
-#: transport-helper.c:789
-#, c-format
-msgid "helper reported unexpected status of %s"
-msgstr "Remote-Helper meldete unerwarteten Status von %s."
-
-#: transport-helper.c:850
-#, c-format
-msgid "helper %s does not support dry-run"
-msgstr "Remote-Helper %s unterstützt kein Trockenlauf."
-
-#: transport-helper.c:853
-#, c-format
-msgid "helper %s does not support --signed"
-msgstr "Remote-Helper %s unterstützt kein --signed."
-
-#: transport-helper.c:856
-#, c-format
-msgid "helper %s does not support --signed=if-asked"
-msgstr "Remote-Helper %s unterstützt kein --signed=if-asked."
-
-#: transport-helper.c:861
-#, c-format
-msgid "helper %s does not support --atomic"
-msgstr "Remote-Helper %s unterstützt kein --atomic."
-
-#: transport-helper.c:867
-#, c-format
-msgid "helper %s does not support 'push-option'"
-msgstr "Remote-Helper %s unterstützt nicht 'push-option'."
-
-#: transport-helper.c:965
-msgid "remote-helper doesn't support push; refspec needed"
-msgstr "Remote-Helper unterstützt kein Push; Refspec benötigt"
-
-#: transport-helper.c:970
-#, c-format
-msgid "helper %s does not support 'force'"
-msgstr "Remote-Helper %s unterstützt kein 'force'."
-
-#: transport-helper.c:1017
-msgid "couldn't run fast-export"
-msgstr "Konnte \"fast-export\" nicht ausführen."
-
-#: transport-helper.c:1022
-msgid "error while running fast-export"
-msgstr "Fehler beim Ausführen von \"fast-export\"."
-
-#: transport-helper.c:1047
-#, c-format
-msgid ""
-"No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch such as 'master'.\n"
-msgstr ""
-"Keine gemeinsamen Referenzen und nichts spezifiziert; keine Ausführung.\n"
-"Vielleicht sollten Sie einen Branch wie 'master' angeben.\n"
-
-#: transport-helper.c:1120
-#, c-format
-msgid "malformed response in ref list: %s"
-msgstr "Ungültige Antwort in Referenzliste: %s"
-
-#: transport-helper.c:1272
-#, c-format
-msgid "read(%s) failed"
-msgstr "Lesen von %s fehlgeschlagen."
-
-#: transport-helper.c:1299
-#, c-format
-msgid "write(%s) failed"
-msgstr "Schreiben von %s fehlgeschlagen."
-
-#: transport-helper.c:1348
-#, c-format
-msgid "%s thread failed"
-msgstr "Thread %s fehlgeschlagen."
-
-#: transport-helper.c:1352
-#, c-format
-msgid "%s thread failed to join: %s"
-msgstr "Fehler beim Beitreten zu Thread %s: %s"
-
-#: transport-helper.c:1371 transport-helper.c:1375
-#, c-format
-msgid "can't start thread for copying data: %s"
-msgstr "Kann Thread zum Kopieren von Daten nicht starten: %s"
-
-#: transport-helper.c:1412
-#, c-format
-msgid "%s process failed to wait"
-msgstr "Fehler beim Warten von Prozess %s."
-
-#: transport-helper.c:1416
-#, c-format
-msgid "%s process failed"
-msgstr "Prozess %s fehlgeschlagen"
-
-#: transport-helper.c:1434 transport-helper.c:1443
-msgid "can't start thread for copying data"
-msgstr "Kann Thread zum Kopieren von Daten nicht starten."
-
-#: tree-walk.c:32
+#: tree-walk.c:33
msgid "too-short tree object"
msgstr "zu kurzes Tree-Objekt"
-#: tree-walk.c:38
+#: tree-walk.c:39
msgid "malformed mode in tree entry"
msgstr "fehlerhafter Modus in Tree-Eintrag"
-#: tree-walk.c:42
+#: tree-walk.c:43
msgid "empty filename in tree entry"
msgstr "leerer Dateiname in Tree-Eintrag"
-#: tree-walk.c:117
+#: tree-walk.c:118
msgid "too-short tree file"
msgstr "zu kurze Tree-Datei"
-#: unpack-trees.c:110
+#: unpack-trees.c:113
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -8632,7 +9188,7 @@
"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie Branches\n"
"wechseln."
-#: unpack-trees.c:112
+#: unpack-trees.c:115
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -8642,7 +9198,7 @@
"überschrieben werden:\n"
"%%s"
-#: unpack-trees.c:115
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -8652,7 +9208,7 @@
"überschrieben werden:\n"
"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie mergen."
-#: unpack-trees.c:117
+#: unpack-trees.c:120
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -8662,7 +9218,7 @@
"überschrieben werden:\n"
"%%s"
-#: unpack-trees.c:120
+#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -8672,7 +9228,7 @@
"überschrieben werden:\n"
"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie %s ausführen."
-#: unpack-trees.c:122
+#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -8681,7 +9237,7 @@
"Ihre lokalen Änderungen würden durch %s überschrieben werden.\n"
"%%s"
-#: unpack-trees.c:127
+#: unpack-trees.c:130
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -8691,7 +9247,7 @@
"Dateien in diesen Verzeichnissen verloren gehen:\n"
"%s"
-#: unpack-trees.c:131
+#: unpack-trees.c:134
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -8701,7 +9257,7 @@
"den Checkout entfernt werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln."
-#: unpack-trees.c:133
+#: unpack-trees.c:136
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -8712,7 +9268,7 @@
"Checkout entfernt werden:\n"
"%%s"
-#: unpack-trees.c:136
+#: unpack-trees.c:139
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -8722,7 +9278,7 @@
"den Merge entfernt werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor sie mergen."
-#: unpack-trees.c:138
+#: unpack-trees.c:141
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -8733,7 +9289,7 @@
"Merge entfernt werden:\n"
"%%s"
-#: unpack-trees.c:141
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -8743,7 +9299,7 @@
"den %s entfernt werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen."
-#: unpack-trees.c:143
+#: unpack-trees.c:146
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -8753,7 +9309,7 @@
"den %s entfernt werden:\n"
"%%s"
-#: unpack-trees.c:149
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -8764,7 +9320,7 @@
"den Checkout überschrieben werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln."
-#: unpack-trees.c:151
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -8776,7 +9332,7 @@
"Checkout überschrieben werden:\n"
"%%s"
-#: unpack-trees.c:154
+#: unpack-trees.c:157
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -8786,7 +9342,7 @@
"den Merge überschrieben werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor Sie mergen."
-#: unpack-trees.c:156
+#: unpack-trees.c:159
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -8796,7 +9352,7 @@
"den Merge überschrieben werden:\n"
"%%s"
-#: unpack-trees.c:159
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -8806,7 +9362,7 @@
"den %s überschrieben werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen."
-#: unpack-trees.c:161
+#: unpack-trees.c:164
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -8817,44 +9373,12 @@
"%s überschrieben werden:\n"
"%%s"
-#: unpack-trees.c:169
+#: 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:172
-#, c-format
-msgid ""
-"Cannot update sparse checkout: the following entries are not up to date:\n"
-"%s"
-msgstr ""
-"Kann partiellen Checkout nicht aktualisieren: die folgenden Einträge\n"
-"sind nicht aktuell:\n"
-"%s"
-
-#: unpack-trees.c:174
-#, c-format
-msgid ""
-"The following working tree files would be overwritten by sparse checkout "
-"update:\n"
-"%s"
-msgstr ""
-"Die folgenden Dateien im Arbeitsverzeichnis würden durch die Aktualisierung\n"
-"über einen partiellen Checkout überschrieben werden:\n"
-"%s"
-
-#: unpack-trees.c:176
-#, c-format
-msgid ""
-"The following working tree files would be removed by sparse checkout "
-"update:\n"
-"%s"
-msgstr ""
-"Die folgenden Dateien im Arbeitsverzeichnis würden durch die Aktualisierung\n"
-"über einen partiellen Checkout entfernt werden:\n"
-"%s"
-
-#: unpack-trees.c:178
+#: unpack-trees.c:175
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -8863,16 +9387,57 @@
"Kann Submodul nicht aktualisieren:\n"
"%s"
-#: unpack-trees.c:255
+#: unpack-trees.c:178
+#, c-format
+msgid ""
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+"Die folgenden Pfade sind nicht aktuell und wurden trotz partieller Muster\n"
+"übrig gelassen:\n"
+"%s"
+
+#: unpack-trees.c:180
+#, c-format
+msgid ""
+"The following paths are unmerged and were left despite sparse patterns:\n"
+"%s"
+msgstr ""
+"Die folgenden Pfade sind nicht zusammengeführt und wurden trotz\n"
+"partieller Muster übrig gelassen:\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 ""
+"Die folgenden Pfade waren bereits vorhanden und wurden deshalb trotz\n"
+"partieller Muster nicht aktualisiert:\n"
+"%s"
+
+#: unpack-trees.c:262
#, c-format
msgid "Aborting\n"
msgstr "Abbruch\n"
-#: unpack-trees.c:317
+#: 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:349
+#: 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"
@@ -8882,10 +9447,14 @@
"auf einem case-insensitiven Dateisystem) und nur einer von der\n"
"selben Kollissionsgruppe ist im Arbeitsverzeichnis:\n"
-#: unpack-trees.c:1445
+#: unpack-trees.c:1498
msgid "Updating index flags"
msgstr "Aktualisiere Index-Markierungen"
+#: upload-pack.c:1543
+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"
@@ -8919,27 +9488,27 @@
msgid "Fetching objects"
msgstr "Anfordern der Objekte"
-#: worktree.c:259 builtin/am.c:2099
+#: worktree.c:238 builtin/am.c:2103
#, c-format
msgid "failed to read '%s'"
msgstr "Fehler beim Lesen von '%s'"
-#: worktree.c:305
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "'%s' im Hauptarbeitsverzeichnis ist nicht das Repository-Verzeichnis."
-#: worktree.c:316
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr "'%s' Datei enthält nicht den absoluten Pfad zum Arbeitsverzeichnis."
-#: worktree.c:328
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' existiert nicht."
-#: worktree.c:334
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "'%s' ist keine .git-Datei, Fehlercode %d"
@@ -8949,19 +9518,86 @@
msgid "'%s' does not point back to '%s'"
msgstr "'%s' zeigt nicht zurück auf '%s'"
-#: wrapper.c:186 wrapper.c:356
+#: worktree.c:608
+msgid "not a directory"
+msgstr "kein Verzeichnis"
+
+#: worktree.c:617
+msgid ".git is not a file"
+msgstr ".git ist keine Datei"
+
+#: worktree.c:619
+msgid ".git file broken"
+msgstr ".git-Datei kaputt"
+
+#: worktree.c:621
+msgid ".git file incorrect"
+msgstr ".git-Datei fehlerhaft"
+
+#: worktree.c:727
+msgid "not a valid path"
+msgstr "kein gültiger Pfad"
+
+#: worktree.c:733
+msgid "unable to locate repository; .git is not a file"
+msgstr "Konnte Repository nicht finden; .git ist keine Datei"
+
+#: worktree.c:737
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr ""
+"konnte Repository nicht finden; .git-Datei referenziert kein Repository"
+
+#: worktree.c:741
+msgid "unable to locate repository; .git file broken"
+msgstr "Konnte Repository nicht finden; .git-Datei ist kaputt"
+
+#: worktree.c:747
+msgid "gitdir unreadable"
+msgstr "gitdir nicht lesbar"
+
+#: worktree.c:751
+msgid "gitdir incorrect"
+msgstr "gitdir fehlerhaft"
+
+#: worktree.c:776
+msgid "not a valid directory"
+msgstr "kein gültiges Verzeichnis"
+
+#: worktree.c:782
+msgid "gitdir file does not exist"
+msgstr "gitdir-Datei existiert nicht"
+
+#: worktree.c:787 worktree.c:796
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "konnte gitdir-Datei nicht lesen (%s)"
+
+#: worktree.c:806
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr "read() zu kurz (%<PRIuMAX> Bytes erwartet, %<PRIuMAX> gelesen)"
+
+#: worktree.c:814
+msgid "invalid gitdir file"
+msgstr "ungültige gitdir-Datei"
+
+#: worktree.c:822
+msgid "gitdir file points to non-existent location"
+msgstr "gitdir-Datei verweist auf nicht existierenden Ort"
+
+#: 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:387 wrapper.c:588
+#: wrapper.c:398 wrapper.c:599
#, c-format
msgid "unable to access '%s'"
msgstr "konnte nicht auf '%s' zugreifen"
-#: wrapper.c:596
+#: 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:"
@@ -9002,11 +9638,11 @@
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:1072
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:1081
msgid "Changes not staged for commit:"
msgstr "Änderungen, die nicht zum Commit vorgemerkt sind:"
@@ -9042,94 +9678,94 @@
" (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:905
#, 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:936
msgid "Submodules changed but not updated:"
msgstr "Submodule geändert, aber nicht aktualisiert:"
-#: wt-status.c:940
+#: wt-status.c:938
msgid "Submodule changes to be committed:"
msgstr "Änderungen in Submodul zum Committen:"
-#: wt-status.c:1022
+#: wt-status.c:1020
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
@@ -9137,7 +9773,7 @@
"Ändern oder entfernen Sie nicht die obige Zeile.\n"
"Alles unterhalb von ihr wird ignoriert."
-#: wt-status.c:1114
+#: wt-status.c:1112
#, c-format
msgid ""
"\n"
@@ -9149,114 +9785,114 @@
"berechnen.\n"
"Sie können '--no-ahead-behind' benutzen, um das zu verhindern.\n"
-#: wt-status.c:1144
+#: wt-status.c:1142
msgid "You have unmerged paths."
msgstr "Sie haben nicht zusammengeführte Pfade."
-#: wt-status.c:1147
+#: wt-status.c:1145
msgid " (fix conflicts and run \"git commit\")"
msgstr " (beheben Sie die Konflikte und führen Sie \"git commit\" aus)"
-#: wt-status.c:1149
+#: wt-status.c:1147
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:1151
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:1154
msgid " (use \"git commit\" to conclude merge)"
msgstr " (benutzen Sie \"git commit\", um den Merge abzuschließen)"
-#: wt-status.c:1165
+#: wt-status.c:1163
msgid "You are in the middle of an am session."
msgstr "Eine \"am\"-Sitzung ist im Gange."
-#: wt-status.c:1168
+#: wt-status.c:1166
msgid "The current patch is empty."
msgstr "Der aktuelle Patch ist leer."
-#: wt-status.c:1172
+#: wt-status.c:1170
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:1172
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:1174
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:1307
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo fehlt."
-#: wt-status.c:1311
+#: wt-status.c:1309
msgid "No commands done."
msgstr "Keine Befehle ausgeführt."
-#: 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] "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:1323
#, c-format
msgid " (see more in file %s)"
msgstr " (mehr Informationen in Datei %s)"
-#: wt-status.c:1330
+#: wt-status.c:1328
msgid "No commands remaining."
msgstr "Keine Befehle verbleibend."
-#: 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] "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:1339
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:1351
#, 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:1356
msgid "You are currently rebasing."
msgstr "Sie sind gerade beim Rebase."
-#: wt-status.c:1371
+#: wt-status.c:1369
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:1371
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:1373
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:1380
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:1384
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -9264,155 +9900,170 @@
"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:1389
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:1392
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:1396
#, 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:1401
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:1404
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:1406
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:1417
msgid "Cherry-pick currently in progress."
msgstr "Cherry-pick zurzeit im Gange."
-#: wt-status.c:1422
+#: wt-status.c:1420
#, 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:1427
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:1430
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:1433
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:1435
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
msgstr ""
" (benutzen Sie \"git cherry-pick --skip\", um diesen Patch auszulassen)"
-#: wt-status.c:1439
+#: wt-status.c:1437
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (benutzen Sie \"git cherry-pick --abort\", um die Cherry-Pick-Operation "
"abzubrechen)"
-#: wt-status.c:1449
+#: wt-status.c:1447
msgid "Revert currently in progress."
msgstr "Revert zurzeit im Gange."
-#: wt-status.c:1452
+#: wt-status.c:1450
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Sie sind gerade beim Revert von Commit '%s'."
-#: wt-status.c:1458
+#: wt-status.c:1456
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr ""
" (beheben Sie die Konflikte und führen Sie dann \"git revert --continue\" "
"aus)"
-#: wt-status.c:1461
+#: wt-status.c:1459
msgid " (run \"git revert --continue\" to continue)"
msgstr " (Führen Sie \"git revert --continue\", um weiterzumachen)"
-#: wt-status.c:1464
+#: wt-status.c:1462
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (alle Konflikte behoben: führen Sie \"git revert --continue\" aus)"
-#: wt-status.c:1466
+#: wt-status.c:1464
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr " (benutzen Sie \"git revert --skip\", um diesen Patch auszulassen)"
-#: wt-status.c:1468
+#: wt-status.c:1466
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
" (benutzen Sie \"git revert --abort\", um die Revert-Operation abzubrechen)"
-#: wt-status.c:1478
+#: wt-status.c:1476
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Sie sind gerade bei einer binären Suche, gestartet von Branch '%s'."
-#: wt-status.c:1482
+#: wt-status.c:1480
msgid "You are currently bisecting."
msgstr "Sie sind gerade bei einer binären Suche."
-#: wt-status.c:1485
+#: wt-status.c:1483
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
" (benutzen Sie \"git bisect reset\", um zum ursprünglichen Branch "
"zurückzukehren)"
-#: wt-status.c:1694
+#: wt-status.c:1494
+#, 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:1733
msgid "On branch "
msgstr "Auf Branch "
-#: wt-status.c:1701
+#: wt-status.c:1740
msgid "interactive rebase in progress; onto "
msgstr "interaktives Rebase im Gange; auf "
-#: wt-status.c:1703
+#: wt-status.c:1742
msgid "rebase in progress; onto "
msgstr "Rebase im Gange; auf "
-#: wt-status.c:1713
+#: wt-status.c:1747
+msgid "HEAD detached at "
+msgstr "HEAD losgelöst bei "
+
+#: wt-status.c:1749
+msgid "HEAD detached from "
+msgstr "HEAD losgelöst von "
+
+#: wt-status.c:1752
msgid "Not currently on any branch."
msgstr "Im Moment auf keinem Branch."
-#: wt-status.c:1730
+#: wt-status.c:1769
msgid "Initial commit"
msgstr "Initialer Commit"
-#: wt-status.c:1731
+#: wt-status.c:1770
msgid "No commits yet"
msgstr "Noch keine Commits"
-#: wt-status.c:1745
+#: wt-status.c:1784
msgid "Untracked files"
msgstr "Unversionierte Dateien"
-#: wt-status.c:1747
+#: wt-status.c:1786
msgid "Ignored files"
msgstr "Ignorierte Dateien"
-#: wt-status.c:1751
+#: wt-status.c:1790
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -9423,32 +10074,32 @@
"'status -uno' könnte das beschleunigen, aber Sie müssen darauf achten,\n"
"neue Dateien selbstständig hinzuzufügen (siehe 'git help status')."
-#: wt-status.c:1757
+#: wt-status.c:1796
#, c-format
msgid "Untracked files not listed%s"
msgstr "Unversionierte Dateien nicht aufgelistet%s"
-#: wt-status.c:1759
+#: wt-status.c:1798
msgid " (use -u option to show untracked files)"
msgstr " (benutzen Sie die Option -u, um unversionierte Dateien anzuzeigen)"
-#: wt-status.c:1765
+#: wt-status.c:1804
msgid "No changes"
msgstr "Keine Änderungen"
-#: wt-status.c:1770
+#: wt-status.c:1809
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"keine Änderungen zum Commit vorgemerkt (benutzen Sie \"git add\" und/oder "
"\"git commit -a\")\n"
-#: wt-status.c:1773
+#: wt-status.c:1813
#, c-format
msgid "no changes added to commit\n"
msgstr "keine Änderungen zum Commit vorgemerkt\n"
-#: wt-status.c:1776
+#: wt-status.c:1817
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -9457,73 +10108,73 @@
"nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n"
"(benutzen Sie \"git add\" zum Versionieren)\n"
-#: wt-status.c:1779
+#: wt-status.c:1821
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n"
-#: wt-status.c:1782
+#: wt-status.c:1825
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"nichts zu committen (erstellen/kopieren Sie Dateien und benutzen\n"
"Sie \"git add\" zum Versionieren)\n"
-#: wt-status.c:1785 wt-status.c:1790
+#: wt-status.c:1829 wt-status.c:1835
#, c-format
msgid "nothing to commit\n"
msgstr "nichts zu committen\n"
-#: wt-status.c:1788
+#: wt-status.c:1832
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"nichts zu committen (benutzen Sie die Option -u, um unversionierte Dateien "
"anzuzeigen)\n"
-#: wt-status.c:1792
+#: wt-status.c:1837
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "nichts zu committen, Arbeitsverzeichnis unverändert\n"
-#: wt-status.c:1905
+#: wt-status.c:1942
msgid "No commits yet on "
msgstr "Noch keine Commits in "
-#: wt-status.c:1909
+#: wt-status.c:1946
msgid "HEAD (no branch)"
msgstr "HEAD (kein Branch)"
-#: wt-status.c:1940
+#: wt-status.c:1977
msgid "different"
msgstr "unterschiedlich"
-#: wt-status.c:1942 wt-status.c:1950
+#: wt-status.c:1979 wt-status.c:1987
msgid "behind "
msgstr "hinterher "
-#: wt-status.c:1945 wt-status.c:1948
+#: wt-status.c:1982 wt-status.c:1985
msgid "ahead "
msgstr "voraus "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2470
+#: wt-status.c:2507
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr ""
"%s nicht möglich: Sie haben Änderungen, die nicht zum Commit vorgemerkt sind."
-#: wt-status.c:2476
+#: wt-status.c:2513
msgid "additionally, your index contains uncommitted changes."
msgstr "Zusätzlich enthält die Staging-Area nicht committete Änderungen."
-#: wt-status.c:2478
+#: wt-status.c:2515
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
"%s nicht möglich: Die Staging-Area enthält nicht committete Änderungen."
-#: compat/precompose_utf8.c:58 builtin/clone.c:455
+#: compat/precompose_utf8.c:58 builtin/clone.c:457
#, c-format
msgid "failed to unlink '%s'"
msgstr "Konnte '%s' nicht entfernen."
@@ -9532,134 +10183,139 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<Optionen>] [--] <Pfadspezifikation>..."
-#: builtin/add.c:88
+#: builtin/add.c:58
+#, c-format
+msgid "cannot chmod %cx '%s'"
+msgstr "kann chmod %cx '%s' nicht ausführen"
+
+#: builtin/add.c:96
#, c-format
msgid "unexpected diff status %c"
msgstr "unerwarteter Differenz-Status %c"
-#: builtin/add.c:93 builtin/commit.c:288
+#: builtin/add.c:101 builtin/commit.c:285
msgid "updating files failed"
msgstr "Aktualisierung der Dateien fehlgeschlagen"
-#: builtin/add.c:103
+#: builtin/add.c:111
#, c-format
msgid "remove '%s'\n"
msgstr "lösche '%s'\n"
-#: builtin/add.c:178
+#: builtin/add.c:186
msgid "Unstaged changes after refreshing the index:"
msgstr ""
"Nicht zum Commit vorgemerkte Änderungen nach Aktualisierung der Staging-Area:"
-#: builtin/add.c:266 builtin/rev-parse.c:899
+#: builtin/add.c:280 builtin/rev-parse.c:991
msgid "Could not read the index"
msgstr "Konnte den Index nicht lesen"
-#: builtin/add.c:277
+#: builtin/add.c:291
#, c-format
msgid "Could not open '%s' for writing."
msgstr "Konnte '%s' nicht zum Schreiben öffnen."
-#: builtin/add.c:281
+#: builtin/add.c:295
msgid "Could not write patch"
msgstr "Konnte Patch nicht schreiben"
-#: builtin/add.c:284
+#: builtin/add.c:298
msgid "editing patch failed"
msgstr "Bearbeitung des Patches fehlgeschlagen"
-#: builtin/add.c:287
+#: builtin/add.c:301
#, c-format
msgid "Could not stat '%s'"
msgstr "Konnte Verzeichnis '%s' nicht lesen"
-#: builtin/add.c:289
+#: builtin/add.c:303
msgid "Empty patch. Aborted."
msgstr "Leerer Patch. Abgebrochen."
-#: builtin/add.c:294
+#: builtin/add.c:308
#, c-format
msgid "Could not apply '%s'"
msgstr "Konnte '%s' nicht anwenden."
-#: builtin/add.c:302
+#: builtin/add.c:316
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Die folgenden Pfade werden durch eine Ihrer \".gitignore\" Dateien "
"ignoriert:\n"
-#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548
-#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
+#: builtin/add.c:336 builtin/clean.c:904 builtin/fetch.c:169 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559
+#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190
msgid "dry run"
msgstr "Probelauf"
-#: builtin/add.c:325
+#: builtin/add.c:339
msgid "interactive picking"
msgstr "interaktives Auswählen"
-#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307
+#: builtin/add.c:340 builtin/checkout.c:1546 builtin/reset.c:308
msgid "select hunks interactively"
msgstr "Blöcke interaktiv auswählen"
-#: builtin/add.c:327
+#: builtin/add.c:341
msgid "edit current diff and apply"
msgstr "aktuelle Unterschiede editieren und anwenden"
-#: builtin/add.c:328
+#: builtin/add.c:342
msgid "allow adding otherwise ignored files"
msgstr "das Hinzufügen andernfalls ignorierter Dateien erlauben"
-#: builtin/add.c:329
+#: builtin/add.c:343
msgid "update tracked files"
msgstr "versionierte Dateien aktualisieren"
-#: builtin/add.c:330
+#: builtin/add.c:344
msgid "renormalize EOL of tracked files (implies -u)"
msgstr ""
"erneutes Normalisieren der Zeilenenden von versionierten Dateien (impliziert "
"-u)"
-#: builtin/add.c:331
+#: builtin/add.c:345
msgid "record only the fact that the path will be added later"
msgstr "nur speichern, dass der Pfad später hinzugefügt werden soll"
-#: builtin/add.c:332
+#: builtin/add.c:346
msgid "add changes from all tracked and untracked files"
msgstr ""
"Änderungen von allen versionierten und unversionierten Dateien hinzufügen"
-#: builtin/add.c:335
+#: builtin/add.c:349
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "gelöschte Pfade im Arbeitsverzeichnis ignorieren (genau wie --no-all)"
-#: builtin/add.c:337
+#: builtin/add.c:351
msgid "don't add, only refresh the index"
msgstr "nichts hinzufügen, nur den Index aktualisieren"
-#: builtin/add.c:338
+#: builtin/add.c:352
msgid "just skip files which cannot be added because of errors"
msgstr ""
"Dateien überspringen, die aufgrund von Fehlern nicht hinzugefügt werden "
"konnten"
-#: builtin/add.c:339
+#: builtin/add.c:353
msgid "check if - even missing - files are ignored in dry run"
msgstr "prüfen ob - auch fehlende - Dateien im Probelauf ignoriert werden"
-#: builtin/add.c:341 builtin/update-index.c:1004
+#: builtin/add.c:355 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:343
+#: builtin/add.c:357
msgid "warn when adding an embedded repository"
msgstr "warnen wenn eingebettetes Repository hinzugefügt wird"
-#: builtin/add.c:345
+#: builtin/add.c:359
msgid "backend for `git stash -p`"
msgstr "Backend für `git stash -p`"
-#: builtin/add.c:363
+#: builtin/add.c:377
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -9693,12 +10349,12 @@
"\n"
"Siehe \"git help submodule\" für weitere Informationen."
-#: builtin/add.c:391
+#: builtin/add.c:405
#, c-format
msgid "adding embedded git repository: %s"
msgstr "Füge eingebettetes Repository hinzu: %s"
-#: builtin/add.c:410
+#: builtin/add.c:424
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
@@ -9708,52 +10364,48 @@
"Um diese Meldung abzuschalten, führen Sie folgenden Befehl aus:\n"
"\"git config advice.addIgnoredFile false\""
-#: builtin/add.c:419
+#: builtin/add.c:433
msgid "adding files failed"
msgstr "Hinzufügen von Dateien fehlgeschlagen"
-#: builtin/add.c:447 builtin/commit.c:348
+#: builtin/add.c:461 builtin/commit.c:345
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
-msgstr ""
-"Die Optionen --pathspec-from-file und --interactive/--patch sind "
-"inkompatibel."
+msgstr "--pathspec-from-file und --interactive/--patch sind inkompatibel"
-#: builtin/add.c:464
+#: builtin/add.c:478
msgid "--pathspec-from-file is incompatible with --edit"
-msgstr "Die Optionen --pathspec-from-file und --edit sind inkompatibel."
+msgstr "--pathspec-from-file und --edit sind inkompatibel"
-#: builtin/add.c:476
+#: builtin/add.c:490
msgid "-A and -u are mutually incompatible"
-msgstr "Die Optionen -A und -u sind zueinander inkompatibel."
+msgstr "-A und -u sind zueinander inkompatibel"
-#: builtin/add.c:479
+#: builtin/add.c:493
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."
+"Die Option --ignore-missing kann nur zusammen mit --dry-run verwendet werden"
-#: builtin/add.c:483
+#: builtin/add.c:497
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "--chmod Parameter '%s' muss entweder -x oder +x sein"
-#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354
-#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509
+#: builtin/add.c:515 builtin/checkout.c:1714 builtin/commit.c:351
+#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1569
msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr ""
-"Die Option --pathspec-from-file ist inkompatibel mit\n"
-"Pfadspezifikation-Argumenten."
+msgstr "--pathspec-from-file ist inkompatibel mit Pfadspezifikation-Argumenten"
-#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360
-#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515
+#: builtin/add.c:522 builtin/checkout.c:1726 builtin/commit.c:357
+#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1575
msgid "--pathspec-file-nul requires --pathspec-from-file"
-msgstr "Die Option --pathspec-file-nul benötigt --pathspec-from-file"
+msgstr "--pathspec-file-nul benötigt --pathspec-from-file"
-#: builtin/add.c:512
+#: builtin/add.c:526
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Nichts spezifiziert, nichts hinzugefügt.\n"
-#: builtin/add.c:514
+#: builtin/add.c:528
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
@@ -9811,7 +10463,7 @@
msgid "Patch format detection failed."
msgstr "Patch-Formaterkennung fehlgeschlagen."
-#: builtin/am.c:953 builtin/clone.c:409
+#: builtin/am.c:953 builtin/clone.c:410
#, c-format
msgid "failed to create directory '%s'"
msgstr "Fehler beim Erstellen von Verzeichnis '%s'"
@@ -9892,12 +10544,12 @@
msgid "applying to an empty history"
msgstr "auf leere Historie anwenden"
-#: builtin/am.c:1621 builtin/am.c:1625
+#: builtin/am.c:1626 builtin/am.c:1630
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "Kann nicht fortsetzen: %s existiert nicht"
-#: builtin/am.c:1643
+#: builtin/am.c:1648
msgid "Commit Body is:"
msgstr "Commit-Beschreibung ist:"
@@ -9905,41 +10557,41 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1653
+#: builtin/am.c:1658
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "Anwenden? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
-#: builtin/am.c:1700 builtin/commit.c:398
+#: builtin/am.c:1704 builtin/commit.c:395
msgid "unable to write index file"
msgstr "Konnte Index-Datei nicht schreiben."
-#: builtin/am.c:1704
+#: builtin/am.c:1708
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Geänderter Index: kann Patches nicht anwenden (geändert: %s)"
-#: builtin/am.c:1744 builtin/am.c:1812
+#: builtin/am.c:1748 builtin/am.c:1816
#, c-format
msgid "Applying: %.*s"
msgstr "Wende an: %.*s"
-#: builtin/am.c:1761
+#: builtin/am.c:1765
msgid "No changes -- Patch already applied."
msgstr "Keine Änderungen -- Patches bereits angewendet."
-#: builtin/am.c:1767
+#: builtin/am.c:1771
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Anwendung des Patches fehlgeschlagen bei %s %.*s"
-#: builtin/am.c:1771
+#: builtin/am.c:1775
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr ""
"Benutzen Sie 'git am --show-current-patch=diff', um den\n"
"fehlgeschlagenen Patch zu sehen"
-#: builtin/am.c:1815
+#: builtin/am.c:1819
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -9950,7 +10602,7 @@
"diese bereits anderweitig eingefügt worden sein; Sie könnten diesen Patch\n"
"auslassen."
-#: builtin/am.c:1822
+#: builtin/am.c:1826
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -9963,17 +10615,17 @@
"Sie können 'git rm' auf Dateien ausführen, um \"von denen gelöscht\" für\n"
"diese zu akzeptieren."
-#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346
-#: builtin/reset.c:354
+#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 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:1981
+#: builtin/am.c:1985
msgid "failed to clean index"
msgstr "Fehler beim Bereinigen des Index"
-#: builtin/am.c:2025
+#: builtin/am.c:2029
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -9981,155 +10633,156 @@
"Sie scheinen seit dem letzten gescheiterten 'am' HEAD geändert zu haben.\n"
"Keine Zurücksetzung zu ORIG_HEAD."
-#: builtin/am.c:2132
+#: builtin/am.c:2136
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Ungültiger Wert für --patch-format: %s"
-#: builtin/am.c:2172
+#: builtin/am.c:2178
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr "Ungültiger Wert für --show-current-patch: %s"
-#: builtin/am.c:2176
+#: builtin/am.c:2182
#, 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"
+msgstr "--show-current-patch=%s ist inkombatibel mit --show-current-patch=%s"
-#: builtin/am.c:2207
+#: builtin/am.c:2213
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<Optionen>] [(<mbox> | <E-Mail-Verzeichnis>)...]"
-#: builtin/am.c:2208
+#: builtin/am.c:2214
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<Optionen>] (--continue | --skip | --abort)"
-#: builtin/am.c:2214
+#: builtin/am.c:2220
msgid "run interactively"
msgstr "interaktiv ausführen"
-#: builtin/am.c:2216
+#: builtin/am.c:2222
msgid "historical option -- no-op"
msgstr "historische Option -- kein Effekt"
-#: builtin/am.c:2218
+#: builtin/am.c:2224
msgid "allow fall back on 3way merging if needed"
msgstr "erlaube, falls notwendig, das Zurückfallen auf einen 3-Wege-Merge"
-#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:304 builtin/stash.c:812
+#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16
+#: builtin/repack.c:334 builtin/stash.c:882
msgid "be quiet"
msgstr "weniger Ausgaben"
-#: builtin/am.c:2221
-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:2227
+msgid "add a Signed-off-by trailer to the commit message"
+msgstr "eine Signed-off-by Zeile der Commit-Beschreibung hinzufügen"
-#: builtin/am.c:2224
+#: builtin/am.c:2230
msgid "recode into utf8 (default)"
msgstr "nach UTF-8 umkodieren (Standard)"
-#: builtin/am.c:2226
+#: builtin/am.c:2232
msgid "pass -k flag to git-mailinfo"
msgstr "-k an git-mailinfo übergeben"
-#: builtin/am.c:2228
+#: builtin/am.c:2234
msgid "pass -b flag to git-mailinfo"
msgstr "-b an git-mailinfo übergeben"
-#: builtin/am.c:2230
+#: builtin/am.c:2236
msgid "pass -m flag to git-mailinfo"
msgstr "-m an git-mailinfo übergeben"
-#: builtin/am.c:2232
+#: builtin/am.c:2238
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "--keep-cr an git-mailsplit für mbox-Format übergeben"
-#: builtin/am.c:2235
+#: builtin/am.c:2241
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "kein --keep-cr an git-mailsplit übergeben, unabhängig von am.keepcr"
-#: builtin/am.c:2238
+#: builtin/am.c:2244
msgid "strip everything before a scissors line"
msgstr "alles vor einer Scheren-Zeile entfernen"
-#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249
-#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261
-#: builtin/am.c:2267
+#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
+#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
+#: builtin/am.c:2273
msgid "pass it through git-apply"
msgstr "an git-apply übergeben"
-#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670
-#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250
-#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505
-#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321
-#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:154 parse-options.h:175 parse-options.h:316
+#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:904 builtin/merge.c:261
+#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
+#: builtin/rebase.c:1347 builtin/repack.c:345 builtin/repack.c:349
+#: builtin/repack.c:351 builtin/show-branch.c:650 builtin/show-ref.c:172
+#: builtin/tag.c:436 parse-options.h:154 parse-options.h:175
+#: parse-options.h:316
msgid "n"
msgstr "Anzahl"
-#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38
+#: builtin/am.c:2269 builtin/branch.c:670 builtin/bugreport.c:136
+#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:470
+#: builtin/verify-tag.c:38
msgid "format"
msgstr "Format"
-#: builtin/am.c:2264
+#: builtin/am.c:2270
msgid "format the patch(es) are in"
msgstr "Patch-Format"
-#: builtin/am.c:2270
+#: builtin/am.c:2276
msgid "override error message when patch failure occurs"
msgstr "Meldung bei fehlerhafter Patch-Anwendung überschreiben"
-#: builtin/am.c:2272
+#: builtin/am.c:2278
msgid "continue applying patches after resolving a conflict"
msgstr "Anwendung der Patches nach Auflösung eines Konfliktes fortsetzen"
-#: builtin/am.c:2275
+#: builtin/am.c:2281
msgid "synonyms for --continue"
msgstr "Synonyme für --continue"
-#: builtin/am.c:2278
+#: builtin/am.c:2284
msgid "skip the current patch"
msgstr "den aktuellen Patch auslassen"
-#: builtin/am.c:2281
-msgid "restore the original branch and abort the patching operation."
+#: builtin/am.c:2287
+msgid "restore the original branch and abort the patching operation"
msgstr ""
"ursprünglichen Branch wiederherstellen und Anwendung der Patches abbrechen"
-#: builtin/am.c:2284
-msgid "abort the patching operation but keep HEAD where it is."
+#: builtin/am.c:2290
+msgid "abort the patching operation but keep HEAD where it is"
msgstr "Patch-Operation abbrechen, aber HEAD an aktueller Stelle belassen"
-#: builtin/am.c:2288
+#: builtin/am.c:2294
msgid "show the patch being applied"
msgstr "den Patch, der gerade angewendet wird, anzeigen"
-#: builtin/am.c:2293
+#: builtin/am.c:2299
msgid "lie about committer date"
msgstr "Autor-Datum als Commit-Datum verwenden"
-#: builtin/am.c:2295
+#: builtin/am.c:2301
msgid "use current timestamp for author date"
msgstr "aktuellen Zeitstempel als Autor-Datum verwenden"
-#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512
-#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517
-#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418
+#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515
+#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:538
+#: builtin/rebase.c:1400 builtin/revert.c:117 builtin/tag.c:451
msgid "key-id"
msgstr "GPG-Schlüsselkennung"
-#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
+#: builtin/am.c:2304 builtin/rebase.c:539 builtin/rebase.c:1401
msgid "GPG-sign commits"
msgstr "Commits mit GPG signieren"
-#: builtin/am.c:2301
+#: builtin/am.c:2307
msgid "(internal use for git-rebase)"
msgstr "(intern für git-rebase verwendet)"
-#: builtin/am.c:2319
+#: builtin/am.c:2325
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
@@ -10137,16 +10790,16 @@
"Die -b/--binary Option hat seit Langem keinen Effekt und wird\n"
"entfernt. Bitte verwenden Sie diese nicht mehr."
-#: builtin/am.c:2326
+#: builtin/am.c:2332
msgid "failed to read the index"
msgstr "Fehler beim Lesen des Index"
-#: builtin/am.c:2341
+#: builtin/am.c:2347
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "Vorheriges Rebase-Verzeichnis %s existiert noch, aber mbox gegeben."
-#: builtin/am.c:2365
+#: builtin/am.c:2371
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -10155,11 +10808,11 @@
"Stray %s Verzeichnis gefunden.\n"
"Benutzen Sie \"git am --abort\", um es zu entfernen."
-#: builtin/am.c:2371
+#: builtin/am.c:2377
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Es ist keine Auflösung im Gange, es wird nicht fortgesetzt."
-#: builtin/am.c:2381
+#: builtin/am.c:2387
msgid "interactive mode requires patches on the command line"
msgstr "Interaktiver Modus benötigt Patches über die Kommandozeile"
@@ -10197,45 +10850,17 @@
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 --write-terms <bad_term> <good_term>"
-msgstr "git bisect--helper --write-terms <bad_term> <good_term>"
-
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-clean-state"
-msgstr "git bisect--helper --bisect-clean-state"
-
-#: builtin/bisect--helper.c:25
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --bisect-reset [<Commit>]"
-#: builtin/bisect--helper.c:26
-msgid ""
-"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
-"<bad_term>"
-msgstr ""
-"git bisect--helper --bisect-write [--no-log] <Zustand> <Revision> "
-"<Begriff_gut> <Begriff_schlecht>"
-
-#: builtin/bisect--helper.c:27
-msgid ""
-"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
-"<bad_term>"
-msgstr ""
-"git bisect--helper --bisect-check-and-set-terms <Befehl> <Begriff_gut> "
-"<Begriff_schlecht>"
-
-#: builtin/bisect--helper.c:28
+#: builtin/bisect--helper.c:24
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:25
msgid ""
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
"term-new]"
@@ -10243,48 +10868,76 @@
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
"term-new]"
+#: builtin/bisect--helper.c:26
+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}=<Begriff> --term-{old,"
+"good}=<Begriff>] [--no-checkout] [--first-parent] [<schlecht> [<gut>...]] "
+"[--] [<Pfade>...]"
+
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next"
+msgstr "git bisect--helper --bisect-next"
+
+#: builtin/bisect--helper.c:29
+msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
+msgstr "git bisect--helper --bisect-state (bad|new) [<Commit>]"
+
#: builtin/bisect--helper.c:30
-msgid ""
-"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
-"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
-msgstr ""
-"git bisect--helper --bisect-start [--term-{old,good}=<Begriff> --term-{new,"
-"bad}=<Begriff>][--no-checkout] [<schlecht> [<gut>...]] [--] [<Pfade>...]"
+msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
+msgstr "git bisect--helper --bisect-state (good|old) [<Commit>...]"
-#: builtin/bisect--helper.c:86
+#: builtin/bisect--helper.c:31
+msgid "git bisect--helper --bisect-replay <filename>"
+msgstr "git bisect--helper --bisect-replay <Dateiname>"
+
+#: builtin/bisect--helper.c:32
+msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
+msgstr "git bisect--helper --bisect-skip [(<Commit>|<Bereich>)...]"
+
+#: builtin/bisect--helper.c:107
+#, c-format
+msgid "cannot open file '%s' in mode '%s'"
+msgstr "kann Datei '%s' nicht im Modus '%s' öffnen"
+
+#: builtin/bisect--helper.c:114
+#, c-format
+msgid "could not write to file '%s'"
+msgstr "konnte nicht in Datei '%s' schreiben"
+
+#: builtin/bisect--helper.c:153
#, 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:157
#, 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:167
#, 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:177
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:193
#, 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:201
#, 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:172
+#: builtin/bisect--helper.c:210
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -10292,27 +10945,27 @@
"Konnte den ursprünglichen HEAD '%s' nicht auschecken.\n"
"Versuchen Sie 'git bisect reset <Commit>'."
-#: builtin/bisect--helper.c:216
+#: builtin/bisect--helper.c:254
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr "Ungültiges \"bisect_write\" Argument: %s"
-#: builtin/bisect--helper.c:221
-#, c-format
-msgid "couldn't get the oid of the rev '%s'"
-msgstr "Konnte die OID der Revision '%s' nicht erhalten."
-
-#: builtin/bisect--helper.c:233
-#, c-format
-msgid "couldn't open the file '%s'"
-msgstr "Konnte die Datei '%s' nicht öffnen."
-
#: builtin/bisect--helper.c:259
#, 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."
+msgid "couldn't get the oid of the rev '%s'"
+msgstr "konnte die OID der Revision '%s' nicht erhalten"
-#: builtin/bisect--helper.c:286
+#: builtin/bisect--helper.c:271
+#, c-format
+msgid "couldn't open the file '%s'"
+msgstr "konnte die Datei '%s' nicht öffnen"
+
+#: builtin/bisect--helper.c:297
+#, c-format
+msgid "Invalid command: you're currently in a %s/%s bisect"
+msgstr "Ungültiger Befehl: Sie sind gerade innerhalb einer binären %s/%s Suche"
+
+#: builtin/bisect--helper.c:324
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
@@ -10321,7 +10974,7 @@
"Sie müssen mindestens einen \"%s\" und einen \"%s\" Commit angeben.\n"
"Sie können dafür \"git bisect %s\" und \"git bisect %s\" benutzen."
-#: builtin/bisect--helper.c:290
+#: builtin/bisect--helper.c:328
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -10332,24 +10985,24 @@
"Danach müssen Sie mindestens einen \"%s\" und einen \"%s\" Commit angeben.\n"
"Sie können dafür \"git bisect %s\" und \"git bisect %s\" benutzen."
-#: builtin/bisect--helper.c:310
+#: builtin/bisect--helper.c:348
#, c-format
msgid "bisecting only with a %s commit"
-msgstr "Binäre Suche nur mit einem %s Commit."
+msgstr "binäre Suche nur mit einem %s Commit"
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:318
+#: builtin/bisect--helper.c:356
msgid "Are you sure [Y/n]? "
msgstr "Sind Sie sicher [Y/n]? "
-#: builtin/bisect--helper.c:379
+#: builtin/bisect--helper.c:417
msgid "no terms defined"
-msgstr "Keine Begriffe definiert."
+msgstr "keine Begriffe definiert"
-#: builtin/bisect--helper.c:382
+#: builtin/bisect--helper.c:420
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
@@ -10358,7 +11011,7 @@
"Ihre aktuellen Begriffe sind %s für den alten Zustand\n"
"und %s für den neuen Zustand.\n"
-#: builtin/bisect--helper.c:392
+#: builtin/bisect--helper.c:430
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
@@ -10367,268 +11020,315 @@
"Ungültiges Argument %s für 'git bisect terms'.\n"
"Unterstützte Optionen sind: --term-good|--term-old und --term-bad|--term-new."
-#: builtin/bisect--helper.c:478
+#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1014
+msgid "revision walk setup failed\n"
+msgstr "Einrichtung des Revisionsgangs fehlgeschlagen\n"
+
+#: builtin/bisect--helper.c:519
+#, c-format
+msgid "could not open '%s' for appending"
+msgstr "konnte '%s' nicht zum Anhängen öffnen"
+
+#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651
+msgid "'' is not a valid term"
+msgstr "'' ist kein gültiger Begriff"
+
+#: builtin/bisect--helper.c:661
#, c-format
msgid "unrecognized option: '%s'"
-msgstr "Nicht erkannte Position: '%s'"
+msgstr "nicht erkannte Option: '%s'"
-#: builtin/bisect--helper.c:482
+#: builtin/bisect--helper.c:665
#, 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:514
+#: builtin/bisect--helper.c:696
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:529
+#: builtin/bisect--helper.c:711
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr ""
"Auschecken von '%s' fehlgeschlagen. Versuchen Sie 'git bisect start "
"<gültiger-Branch>'."
-#: builtin/bisect--helper.c:550
+#: builtin/bisect--helper.c:732
msgid "won't bisect on cg-seek'ed tree"
msgstr ""
"binäre Suche auf einem durch 'cg-seek' geändertem Verzeichnis nicht möglich"
-#: builtin/bisect--helper.c:553
+#: builtin/bisect--helper.c:735
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:577
+#: builtin/bisect--helper.c:755
#, c-format
msgid "invalid ref: '%s'"
-msgstr "Ungültige Referenz: '%s'"
+msgstr "ungültige Referenz: '%s'"
-#: builtin/bisect--helper.c:633
-msgid "perform 'git bisect next'"
-msgstr "'git bisect next' ausführen"
+#: builtin/bisect--helper.c:813
+msgid "You need to start by \"git bisect start\"\n"
+msgstr "Sie müssen mit \"git bisect start\" beginnen\n"
-#: builtin/bisect--helper.c:635
-msgid "write the terms to .git/BISECT_TERMS"
-msgstr "die Begriffe nach .git/BISECT_TERMS schreiben"
+#. 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:824
+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:637
-msgid "cleanup the bisection state"
-msgstr "den Zustand der binären Suche aufräumen"
+#: builtin/bisect--helper.c:842
+msgid "Please call `--bisect-state` with at least one argument"
+msgstr "Bitte führen Sie `--bisect-state` mit mindestens einem Argument aus"
-#: builtin/bisect--helper.c:639
-msgid "check for expected revs"
-msgstr "auf erwartete Commits prüfen"
+#: builtin/bisect--helper.c:855
+#, c-format
+msgid "'git bisect %s' can take only one argument."
+msgstr "'git bisect %s' kann nur ein Argument entgegennehmen."
-#: builtin/bisect--helper.c:641
+#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:878
+#, c-format
+msgid "Bad rev input: %s"
+msgstr "Ungültige Referenz-Eingabe: %s"
+
+#: builtin/bisect--helper.c:912
+msgid "We are not bisecting."
+msgstr "Keine binäre Suche im Gange."
+
+#: builtin/bisect--helper.c:962
+#, c-format
+msgid "'%s'?? what are you talking about?"
+msgstr "'%s'?? Was reden Sie da?"
+
+#: builtin/bisect--helper.c:974
+#, c-format
+msgid "cannot read file '%s' for replaying"
+msgstr "kann Datei '%s' nicht für die Wiederholung lesen"
+
+#: builtin/bisect--helper.c:1047
msgid "reset the bisection state"
msgstr "den Zustand der binären Suche zurücksetzen"
-#: builtin/bisect--helper.c:643
-msgid "write out the bisection state in BISECT_LOG"
-msgstr "den Zustand der binären Suche nach BISECT_LOG schreiben"
-
-#: builtin/bisect--helper.c:645
-msgid "check and set terms in a bisection state"
-msgstr "Begriffe innerhalb einer binären Suche prüfen und setzen"
-
-#: builtin/bisect--helper.c:647
+#: builtin/bisect--helper.c:1049
msgid "check whether bad or good terms exist"
msgstr "prüfen, ob Begriffe für gute und schlechte Commits existieren"
-#: builtin/bisect--helper.c:649
+#: builtin/bisect--helper.c:1051
msgid "print out the bisect terms"
msgstr "die Begriffe für die binäre Suche ausgeben"
-#: builtin/bisect--helper.c:651
+#: builtin/bisect--helper.c:1053
msgid "start the bisect session"
msgstr "Sitzung für binäre Suche starten"
-#: builtin/bisect--helper.c:653
-msgid "update BISECT_HEAD instead of checking out the current commit"
-msgstr "BISECT_HEAD aktualisieren, anstatt den aktuellen Commit auszuchecken"
+#: builtin/bisect--helper.c:1055
+msgid "find the next bisection commit"
+msgstr "nächsten Commit für die binäre Suche finden"
-#: builtin/bisect--helper.c:655
+#: builtin/bisect--helper.c:1057
+msgid "mark the state of ref (or refs)"
+msgstr "den Status der Referenz(en) markieren"
+
+#: builtin/bisect--helper.c:1059
+msgid "list the bisection steps so far"
+msgstr "die bisherigen Schritte der binären Suche auflisten"
+
+#: builtin/bisect--helper.c:1061
+msgid "replay the bisection process from the given file"
+msgstr "binäre Suche aus der angegebenen Datei wiederholen"
+
+#: builtin/bisect--helper.c:1063
+msgid "skip some commits for checkout"
+msgstr "einige Commits für das Auschecken überspringen"
+
+#: builtin/bisect--helper.c:1065
msgid "no log for BISECT_WRITE"
msgstr "kein Log für BISECT_WRITE"
-#: builtin/bisect--helper.c:673
-msgid "--write-terms requires two arguments"
-msgstr "--write-terms benötigt zwei Argumente."
-
-#: builtin/bisect--helper.c:677
-msgid "--bisect-clean-state requires no arguments"
-msgstr "--bisect-clean-state erwartet keine Argumente."
-
-#: builtin/bisect--helper.c:684
+#: builtin/bisect--helper.c:1080
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:688
-msgid "--bisect-write requires either 4 or 5 arguments"
-msgstr "--bisect-write benötigt entweder 4 oder 5 Argumente."
-
-#: builtin/bisect--helper.c:694
-msgid "--check-and-set-terms requires 3 arguments"
-msgstr "--check-and-set-terms benötigt 3 Argumente."
-
-#: builtin/bisect--helper.c:700
+#: builtin/bisect--helper.c:1085
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:706
+#: builtin/bisect--helper.c:1091
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/blame.c:31
+#: builtin/bisect--helper.c:1100
+msgid "--bisect-next requires 0 arguments"
+msgstr "--bisect-next benötigt 0 Argumente"
+
+#: builtin/bisect--helper.c:1111
+msgid "--bisect-log requires 0 arguments"
+msgstr "--bisect-log benötigt 0 Argumente"
+
+#: builtin/bisect--helper.c:1116
+msgid "no logfile given"
+msgstr "keine Log-Datei angegeben"
+
+#: builtin/blame.c:32
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr "git blame [<Optionen>] [<rev-opts>] [<Commit>] [--] <Datei>"
-#: builtin/blame.c:36
+#: builtin/blame.c:37
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<rev-opts> sind dokumentiert in git-rev-list(1)"
-#: builtin/blame.c:409
+#: builtin/blame.c:410
#, c-format
msgid "expecting a color: %s"
-msgstr "Erwarte eine Farbe: %s"
+msgstr "erwarte eine Farbe: %s"
-#: builtin/blame.c:416
+#: builtin/blame.c:417
msgid "must end with a color"
-msgstr "Muss mit einer Farbe enden."
+msgstr "muss mit einer Farbe enden"
-#: builtin/blame.c:729
+#: builtin/blame.c:728
#, 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:747
+#: builtin/blame.c:746
msgid "invalid value for blame.coloring"
-msgstr "Ungültiger Wert für blame.coloring."
-
-#: builtin/blame.c:822
-#, c-format
-msgid "cannot find revision %s to ignore"
-msgstr "Konnte Commit %s zum Ignorieren nicht finden"
-
-#: builtin/blame.c:844
-msgid "Show blame entries as we find them, incrementally"
-msgstr "\"blame\"-Einträge schrittweise anzeigen, während wir sie generieren"
+msgstr "ungültiger Wert für blame.coloring"
#: builtin/blame.c:845
-msgid "Show blank SHA-1 for boundary commits (Default: off)"
-msgstr "leere SHA-1 für Grenz-Commits anzeigen (Standard: aus)"
+#, c-format
+msgid "cannot find revision %s to ignore"
+msgstr "konnte Commit %s zum Ignorieren nicht finden"
-#: builtin/blame.c:846
-msgid "Do not treat root commits as boundaries (Default: off)"
+#: builtin/blame.c:867
+msgid "show blame entries as we find them, incrementally"
+msgstr "\"blame\"-Einträge schrittweise anzeigen, während wir sie finden"
+
+#: builtin/blame.c:868
+msgid "do not show object names of boundary commits (Default: off)"
+msgstr "keine Objektnamen für Grenz-Commits anzeigen (Standard: aus)"
+
+#: 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:847
-msgid "Show work cost statistics"
+#: builtin/blame.c:870
+msgid "show work cost statistics"
msgstr "Statistiken zum Arbeitsaufwand anzeigen"
-#: builtin/blame.c:848
-msgid "Force progress reporting"
+#: builtin/blame.c:871 builtin/checkout.c:1503 builtin/clone.c:92
+#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:175
+#: builtin/merge.c:297 builtin/multi-pack-index.c:27 builtin/pull.c:119
+#: builtin/push.c:575 builtin/send-pack.c:198
+msgid "force progress reporting"
msgstr "Fortschrittsanzeige erzwingen"
-#: builtin/blame.c:849
-msgid "Show output score for blame entries"
+#: builtin/blame.c:872
+msgid "show output score for blame entries"
msgstr "Ausgabebewertung für \"blame\"-Einträge anzeigen"
-#: builtin/blame.c:850
-msgid "Show original filename (Default: auto)"
+#: builtin/blame.c:873
+msgid "show original filename (Default: auto)"
msgstr "ursprünglichen Dateinamen anzeigen (Standard: auto)"
-#: builtin/blame.c:851
-msgid "Show original linenumber (Default: off)"
+#: builtin/blame.c:874
+msgid "show original linenumber (Default: off)"
msgstr "ursprüngliche Zeilennummer anzeigen (Standard: aus)"
-#: builtin/blame.c:852
-msgid "Show in a format designed for machine consumption"
+#: 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:853
-msgid "Show porcelain format with per-line commit information"
+#: 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:854
-msgid "Use the same output mode as git-annotate (Default: off)"
+#: 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)"
+"den gleichen Ausgabemodus benutzen wie \"git-annotate\" (Standard: aus)"
-#: builtin/blame.c:855
-msgid "Show raw timestamp (Default: off)"
-msgstr "Unbearbeiteten Zeitstempel anzeigen (Standard: aus)"
+#: builtin/blame.c:878
+msgid "show raw timestamp (Default: off)"
+msgstr "unbearbeiteten Zeitstempel anzeigen (Standard: aus)"
-#: builtin/blame.c:856
-msgid "Show long commit SHA1 (Default: off)"
-msgstr "Langen Commit-SHA1 anzeigen (Standard: aus)"
+#: builtin/blame.c:879
+msgid "show long commit SHA1 (Default: off)"
+msgstr "langen Commit-SHA1 anzeigen (Standard: aus)"
-#: builtin/blame.c:857
-msgid "Suppress author name and timestamp (Default: off)"
-msgstr "Den Namen des Autors und den Zeitstempel unterdrücken (Standard: aus)"
+#: 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:858
-msgid "Show author email instead of name (Default: off)"
+#: 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)"
+"statt des Namens die E-Mail-Adresse des Autors anzeigen (Standard: aus)"
-#: builtin/blame.c:859
-msgid "Ignore whitespace differences"
-msgstr "Unterschiede im Whitespace ignorieren"
+#: builtin/blame.c:882
+msgid "ignore whitespace differences"
+msgstr "Whitespace-Unterschiede ignorieren"
-#: builtin/blame.c:860 builtin/log.c:1702
+#: builtin/blame.c:883 builtin/log.c:1812
msgid "rev"
msgstr "Commit"
-#: builtin/blame.c:860
-msgid "Ignore <rev> when blaming"
-msgstr "Ignoriere <rev> beim Ausführen von 'blame'"
+#: builtin/blame.c:883
+msgid "ignore <rev> when blaming"
+msgstr "ignoriere <Commit> beim Ausführen von 'blame'"
-#: builtin/blame.c:861
-msgid "Ignore revisions from <file>"
-msgstr "Ignoriere Commits aus <Datei>"
+#: builtin/blame.c:884
+msgid "ignore revisions from <file>"
+msgstr "ignoriere Commits aus <Datei>"
-#: builtin/blame.c:862
+#: builtin/blame.c:885
msgid "color redundant metadata from previous line differently"
msgstr "redundante Metadaten der vorherigen Zeile unterschiedlich einfärben"
-#: builtin/blame.c:863
+#: builtin/blame.c:886
msgid "color lines by age"
msgstr "Zeilen nach Alter einfärben"
-#: builtin/blame.c:864
-msgid "Spend extra cycles to find better match"
-msgstr "Länger arbeiten, um bessere Übereinstimmungen zu finden"
+#: builtin/blame.c:887
+msgid "spend extra cycles to find better match"
+msgstr ""
+"mehr Arbeitsschritte ausführen, um eine bessere Übereinstimmung zu finden"
-#: builtin/blame.c:865
-msgid "Use revisions from <file> instead of calling git-rev-list"
-msgstr "Commits von <Datei> benutzen, anstatt \"git-rev-list\" aufzurufen"
+#: builtin/blame.c:888
+msgid "use revisions from <file> instead of calling git-rev-list"
+msgstr "Commits von <Datei> benutzen, statt \"git-rev-list\" aufzurufen"
-#: builtin/blame.c:866
-msgid "Use <file>'s contents as the final image"
+#: 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:867 builtin/blame.c:868
+#: builtin/blame.c:890 builtin/blame.c:891
msgid "score"
msgstr "Bewertung"
-#: builtin/blame.c:867
-msgid "Find line copies within and across files"
+#: builtin/blame.c:890
+msgid "find line copies within and across files"
msgstr "kopierte Zeilen innerhalb oder zwischen Dateien finden"
-#: builtin/blame.c:868
-msgid "Find line movements within and across files"
+#: builtin/blame.c:891
+msgid "find line movements within and across files"
msgstr "verschobene Zeilen innerhalb oder zwischen Dateien finden"
-#: builtin/blame.c:869
-msgid "n,m"
-msgstr "n,m"
+#: builtin/blame.c:892
+msgid "range"
+msgstr "Bereich"
-#: builtin/blame.c:869
-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:893
+msgid "process only line range <start>,<end> or function :<funcname>"
+msgstr ""
+"nur Zeilen im Bereich <Start>,<Ende> oder Funktion :<Funktionsname> "
+"verarbeiten"
-#: builtin/blame.c:921
+#: builtin/blame.c:945
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"--progress kann nicht mit --incremental oder Formaten für Fremdprogramme\n"
@@ -10642,24 +11342,24 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:972
+#: builtin/blame.c:996
msgid "4 years, 11 months ago"
msgstr "vor 4 Jahren und 11 Monaten"
-#: builtin/blame.c:1079
+#: builtin/blame.c:1112
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "Datei %s hat nur %lu Zeile"
msgstr[1] "Datei %s hat nur %lu Zeilen"
-#: builtin/blame.c:1125
+#: builtin/blame.c:1157
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>]"
@@ -10722,124 +11422,114 @@
msgid "Update of config-file failed"
msgstr "Aktualisierung der Konfigurationsdatei fehlgeschlagen."
-#: builtin/branch.c:220
+#: builtin/branch.c:223
msgid "cannot use -a with -d"
msgstr "kann -a nicht mit -d benutzen"
-#: builtin/branch.c:226
+#: builtin/branch.c:230
msgid "Couldn't look up commit object for HEAD"
msgstr "Konnte Commit-Objekt für HEAD nicht nachschlagen."
-#: builtin/branch.c:240
+#: builtin/branch.c:244
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Kann Branch '%s' nicht entfernen, ausgecheckt in '%s'."
-#: builtin/branch.c:255
+#: builtin/branch.c:259
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "Remote-Tracking-Branch '%s' nicht gefunden"
-#: builtin/branch.c:256
+#: builtin/branch.c:260
#, c-format
msgid "branch '%s' not found."
msgstr "Branch '%s' nicht gefunden."
-#: builtin/branch.c:271
-#, c-format
-msgid "Error deleting remote-tracking branch '%s'"
-msgstr "Fehler beim Entfernen des Remote-Tracking-Branches '%s'"
-
-#: builtin/branch.c:272
-#, c-format
-msgid "Error deleting branch '%s'"
-msgstr "Fehler beim Entfernen des Branches '%s'"
-
-#: builtin/branch.c:279
+#: builtin/branch.c:291
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Remote-Tracking-Branch %s entfernt (war %s).\n"
-#: builtin/branch.c:280
+#: builtin/branch.c:292
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Branch %s entfernt (war %s).\n"
-#: builtin/branch.c:429 builtin/tag.c:61
+#: builtin/branch.c:438 builtin/tag.c:61
msgid "unable to parse format string"
msgstr "Konnte Formatierungsstring nicht parsen."
-#: builtin/branch.c:460
+#: builtin/branch.c:469
msgid "could not resolve HEAD"
msgstr "Konnte HEAD-Commit nicht auflösen."
-#: builtin/branch.c:466
+#: builtin/branch.c:475
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) wurde nicht unter \"refs/heads/\" gefunden!"
-#: builtin/branch.c:481
+#: builtin/branch.c:490
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Branch %s wird auf %s umgesetzt"
-#: builtin/branch.c:485
+#: builtin/branch.c:494
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Binäre Suche von Branch %s zu %s im Gange"
-#: builtin/branch.c:502
+#: builtin/branch.c:511
msgid "cannot copy the current branch while not on any."
msgstr ""
"Kann den aktuellen Branch nicht kopieren, solange Sie sich auf keinem "
"befinden."
-#: builtin/branch.c:504
+#: builtin/branch.c:513
msgid "cannot rename the current branch while not on any."
msgstr ""
"Kann aktuellen Branch nicht umbenennen, solange Sie sich auf keinem befinden."
-#: builtin/branch.c:515
+#: builtin/branch.c:524
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Ungültiger Branchname: '%s'"
-#: builtin/branch.c:542
+#: builtin/branch.c:553
msgid "Branch rename failed"
msgstr "Umbenennung des Branches fehlgeschlagen"
-#: builtin/branch.c:544
+#: builtin/branch.c:555
msgid "Branch copy failed"
msgstr "Kopie des Branches fehlgeschlagen"
-#: builtin/branch.c:548
+#: builtin/branch.c:559
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Kopie eines falsch benannten Branches '%s' erstellt."
-#: builtin/branch.c:551
+#: builtin/branch.c:562
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "falsch benannten Branch '%s' umbenannt"
-#: builtin/branch.c:557
+#: builtin/branch.c:568
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Branch umbenannt zu %s, aber HEAD ist nicht aktualisiert!"
-#: builtin/branch.c:566
+#: builtin/branch.c:577
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"Branch ist umbenannt, aber die Aktualisierung der Konfigurationsdatei ist "
"fehlgeschlagen."
-#: builtin/branch.c:568
+#: builtin/branch.c:579
msgid "Branch is copied, but update of config-file failed"
msgstr ""
"Branch wurde kopiert, aber die Aktualisierung der Konfigurationsdatei ist\n"
"fehlgeschlagen."
-#: builtin/branch.c:584
+#: builtin/branch.c:595
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -10850,181 +11540,181 @@
" %s\n"
"Zeilen, die mit '%c' beginnen, werden entfernt.\n"
-#: builtin/branch.c:618
+#: builtin/branch.c:629
msgid "Generic options"
msgstr "Allgemeine Optionen"
-#: builtin/branch.c:620
+#: builtin/branch.c:631
msgid "show hash and subject, give twice for upstream branch"
msgstr "Hash und Betreff anzeigen; -vv: zusätzlich Upstream-Branch"
-#: builtin/branch.c:621
+#: builtin/branch.c:632
msgid "suppress informational messages"
msgstr "Informationsmeldungen unterdrücken"
-#: builtin/branch.c:622
+#: builtin/branch.c:633
msgid "set up tracking mode (see git-pull(1))"
msgstr "Modus zum Folgen von Branches einstellen (siehe git-pull(1))"
-#: builtin/branch.c:624
+#: builtin/branch.c:635
msgid "do not use"
msgstr "nicht verwenden"
-#: builtin/branch.c:626 builtin/rebase.c:513
+#: builtin/branch.c:637 builtin/rebase.c:534
msgid "upstream"
msgstr "Upstream"
-#: builtin/branch.c:626
+#: builtin/branch.c:637
msgid "change the upstream info"
msgstr "Informationen zum Upstream-Branch ändern"
-#: builtin/branch.c:627
+#: builtin/branch.c:638
msgid "unset the upstream info"
msgstr "Informationen zum Upstream-Branch entfernen"
-#: builtin/branch.c:628
+#: builtin/branch.c:639
msgid "use colored output"
msgstr "farbige Ausgaben verwenden"
-#: builtin/branch.c:629
+#: builtin/branch.c:640
msgid "act on remote-tracking branches"
msgstr "auf Remote-Tracking-Branches wirken"
-#: builtin/branch.c:631 builtin/branch.c:633
+#: builtin/branch.c:642 builtin/branch.c:644
msgid "print only branches that contain the commit"
msgstr "nur Branches ausgeben, die diesen Commit enthalten"
-#: builtin/branch.c:632 builtin/branch.c:634
+#: builtin/branch.c:643 builtin/branch.c:645
msgid "print only branches that don't contain the commit"
msgstr "nur Branches ausgeben, die diesen Commit nicht enthalten"
-#: builtin/branch.c:637
+#: builtin/branch.c:648
msgid "Specific git-branch actions:"
msgstr "spezifische Aktionen für \"git-branch\":"
-#: builtin/branch.c:638
+#: builtin/branch.c:649
msgid "list both remote-tracking and local branches"
msgstr "Remote-Tracking und lokale Branches auflisten"
-#: builtin/branch.c:640
+#: builtin/branch.c:651
msgid "delete fully merged branch"
msgstr "vollständig zusammengeführten Branch entfernen"
-#: builtin/branch.c:641
+#: builtin/branch.c:652
msgid "delete branch (even if not merged)"
msgstr "Branch löschen (auch wenn nicht zusammengeführt)"
-#: builtin/branch.c:642
+#: builtin/branch.c:653
msgid "move/rename a branch and its reflog"
msgstr "einen Branch und dessen Reflog verschieben/umbenennen"
-#: builtin/branch.c:643
+#: builtin/branch.c:654
msgid "move/rename a branch, even if target exists"
msgstr ""
"einen Branch verschieben/umbenennen, auch wenn das Ziel bereits existiert"
-#: builtin/branch.c:644
+#: builtin/branch.c:655
msgid "copy a branch and its reflog"
msgstr "einen Branch und dessen Reflog kopieren"
-#: builtin/branch.c:645
+#: builtin/branch.c:656
msgid "copy a branch, even if target exists"
msgstr "einen Branch kopieren, auch wenn das Ziel bereits existiert"
-#: builtin/branch.c:646
+#: builtin/branch.c:657
msgid "list branch names"
msgstr "Branchnamen auflisten"
-#: builtin/branch.c:647
+#: builtin/branch.c:658
msgid "show current branch name"
msgstr "Zeige aktuellen Branch-Namen."
-#: builtin/branch.c:648
+#: builtin/branch.c:659
msgid "create the branch's reflog"
msgstr "das Reflog des Branches erzeugen"
-#: builtin/branch.c:650
+#: builtin/branch.c:661
msgid "edit the description for the branch"
msgstr "die Beschreibung für den Branch bearbeiten"
-#: builtin/branch.c:651
+#: builtin/branch.c:662
msgid "force creation, move/rename, deletion"
msgstr "Erstellung, Verschiebung/Umbenennung oder Löschung erzwingen"
-#: builtin/branch.c:652
+#: builtin/branch.c:663
msgid "print only branches that are merged"
msgstr "nur zusammengeführte Branches ausgeben"
-#: builtin/branch.c:653
+#: builtin/branch.c:664
msgid "print only branches that are not merged"
msgstr "nur nicht zusammengeführte Branches ausgeben"
-#: builtin/branch.c:654
+#: builtin/branch.c:665
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:667 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:466
msgid "object"
msgstr "Objekt"
-#: builtin/branch.c:658
+#: builtin/branch.c:668
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:669 builtin/for-each-ref.c:48 builtin/tag.c:473
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:670 builtin/for-each-ref.c:38 builtin/tag.c:471
#: 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:785
+#: builtin/branch.c:693 builtin/clone.c:790
msgid "HEAD not found below refs/heads!"
msgstr "HEAD wurde nicht unter \"refs/heads\" gefunden!"
-#: builtin/branch.c:708
+#: builtin/branch.c:717
msgid "--column and --verbose are incompatible"
-msgstr "Die Optionen --column und --verbose sind inkompatibel."
+msgstr "--column und --verbose sind inkompatibel"
-#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
+#: builtin/branch.c:732 builtin/branch.c:788 builtin/branch.c:797
msgid "branch name required"
msgstr "Branchname erforderlich"
-#: builtin/branch.c:753
+#: builtin/branch.c:764
msgid "Cannot give description to detached HEAD"
msgstr "zu losgelöstem HEAD kann keine Beschreibung hinterlegt werden"
-#: builtin/branch.c:758
+#: builtin/branch.c:769
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:776
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Noch kein Commit in Branch '%s'."
-#: builtin/branch.c:768
+#: builtin/branch.c:779
#, c-format
msgid "No branch named '%s'."
msgstr "Branch '%s' nicht vorhanden."
-#: builtin/branch.c:783
+#: builtin/branch.c:794
msgid "too many branches for a copy operation"
msgstr "zu viele Branches für eine Kopieroperation angegeben"
-#: builtin/branch.c:792
+#: builtin/branch.c:803
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:808
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:812
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -11032,34 +11722,34 @@
"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:815 builtin/branch.c:838
#, c-format
msgid "no such branch '%s'"
-msgstr "Kein solcher Branch '%s'"
+msgstr "Branch '%s' nicht gefunden"
-#: builtin/branch.c:808
+#: builtin/branch.c:819
#, c-format
msgid "branch '%s' does not exist"
msgstr "Branch '%s' existiert nicht"
-#: builtin/branch.c:821
+#: builtin/branch.c:832
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:836
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:842
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
-#: builtin/branch.c:841
+#: builtin/branch.c:852
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>?"
@@ -11068,7 +11758,7 @@
"verwendet werden.\n"
"Wollten Sie -a|-r --list <Muster> benutzen?"
-#: builtin/branch.c:845
+#: builtin/branch.c:856
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -11076,6 +11766,104 @@
"Die '--set-upstream' Option wird nicht länger unterstützt.\n"
"Bitte benutzen Sie stattdessen '--track' oder '--set-upstream-to'."
+#: builtin/bugreport.c:15
+msgid "git version:\n"
+msgstr "git Version:\n"
+
+#: builtin/bugreport.c:21
+#, c-format
+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:135
+msgid "specify a destination for the bugreport file"
+msgstr "Speicherort für die Datei des Fehlerberichts angeben"
+
+#: builtin/bugreport.c:137
+msgid "specify a strftime format suffix for the filename"
+msgstr "Dateiendung im strftime-Format für den Dateinamen angeben"
+
+#: builtin/bugreport.c:159
+#, c-format
+msgid "could not create leading directories for '%s'"
+msgstr "konnte vorangehende Verzeichnisse für '%s' nicht erstellen"
+
+#: builtin/bugreport.c:166
+msgid "System Info"
+msgstr "System Info"
+
+#: builtin/bugreport.c:169
+msgid "Enabled Hooks"
+msgstr "Aktivierte Hooks"
+
+#: builtin/bugreport.c:176
+#, c-format
+msgid "couldn't create a new file at '%s'"
+msgstr "konnte keine neue Datei unter '%s' erstellen"
+
+#: builtin/bugreport.c:179
+#, c-format
+msgid "unable to write to %s"
+msgstr "konnte nicht nach %s schreiben"
+
+#: builtin/bugreport.c:189
+#, 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>"
@@ -11092,49 +11880,53 @@
msgid "git bundle unbundle <file> [<refname>...]"
msgstr "git bundle unbundle <Datei> [<Referenzname>...]"
-#: builtin/bundle.c:66 builtin/pack-objects.c:3375
+#: builtin/bundle.c:67 builtin/pack-objects.c:3495
msgid "do not show progress meter"
msgstr "keine Fortschrittsanzeige anzeigen"
-#: builtin/bundle.c:68 builtin/pack-objects.c:3377
+#: builtin/bundle.c:69 builtin/pack-objects.c:3497
msgid "show progress meter"
msgstr "Fortschrittsanzeige anzeigen"
-#: builtin/bundle.c:70 builtin/pack-objects.c:3379
+#: builtin/bundle.c:71 builtin/pack-objects.c:3499
msgid "show progress meter during object writing phase"
msgstr "Forschrittsanzeige während des Schreibens von Objekten anzeigen"
-#: builtin/bundle.c:73 builtin/pack-objects.c:3382
+#: builtin/bundle.c:74 builtin/pack-objects.c:3502
msgid "similar to --all-progress when progress meter is shown"
msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird"
-#: builtin/bundle.c:93
+#: 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:104
+#: builtin/bundle.c:107
msgid "do not show bundle details"
msgstr "Keine Bundle-Details anzeigen"
-#: builtin/bundle.c:119
+#: builtin/bundle.c:122
#, c-format
msgid "%s is okay\n"
msgstr "%s ist in Ordnung\n"
-#: builtin/bundle.c:160
+#: builtin/bundle.c:163
msgid "Need a repository to unbundle."
msgstr "Zum Entpacken wird ein Repository benötigt."
-#: builtin/bundle.c:168 builtin/remote.c:1686
+#: builtin/bundle.c:171 builtin/remote.c:1700
msgid "be verbose; must be placed before a subcommand"
msgstr "erweiterte Ausgaben; muss vor einem Unterbefehl angegeben werden"
-#: builtin/bundle.c:190 builtin/remote.c:1717
+#: builtin/bundle.c:193 builtin/remote.c:1731
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Unbekannter Unterbefehl: %s"
-#: builtin/cat-file.c:595
+#: 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>"
@@ -11142,84 +11934,84 @@
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <Art> | --textconv | --filters) [--path=<Pfad>] <Objekt>"
-#: builtin/cat-file.c:596
+#: builtin/cat-file.c: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:617
+#: builtin/cat-file.c:620
msgid "only one batch option may be specified"
msgstr "Nur eine Batch-Option erlaubt."
-#: builtin/cat-file.c:635
+#: 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:636
+#: builtin/cat-file.c:639
msgid "show object type"
msgstr "Objektart anzeigen"
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:640
msgid "show object size"
msgstr "Objektgröße anzeigen"
-#: builtin/cat-file.c:639
+#: 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:640
+#: builtin/cat-file.c:643
msgid "pretty-print object's content"
msgstr "ansprechende Anzeige des Objektinhaltes"
-#: builtin/cat-file.c:642
+#: 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:644
+#: 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:645 git-submodule.sh:1002
+#: builtin/cat-file.c:648
msgid "blob"
msgstr "Blob"
-#: builtin/cat-file.c:646
+#: 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:648
+#: 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:649
+#: builtin/cat-file.c:652
msgid "buffer --batch output"
msgstr "Ausgabe von --batch puffern"
-#: builtin/cat-file.c:651
+#: 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:655
+#: 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:659
+#: 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:661
+#: 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:663
+#: builtin/cat-file.c:666
msgid "do not order --batch-all-objects output"
msgstr "Ausgabe von --batch-all-objects nicht ordnen"
@@ -11247,8 +12039,8 @@
msgid "terminate input and output records by a NUL character"
msgstr "Einträge von Ein- und Ausgabe mit NUL-Zeichen abschließen"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537
-#: builtin/worktree.c:499
+#: builtin/check-ignore.c:21 builtin/checkout.c:1499 builtin/gc.c:549
+#: builtin/worktree.c:489
msgid "suppress progress reporting"
msgstr "Fortschrittsanzeige unterdrücken"
@@ -11266,7 +12058,7 @@
#: builtin/check-ignore.c:166
msgid "-z only makes sense with --stdin"
-msgstr "Die Option -z kann nur mit --stdin verwendet werden."
+msgstr "-z kann nur mit --stdin verwendet werden"
#: builtin/check-ignore.c:168
msgid "no path specified"
@@ -11274,12 +12066,11 @@
#: 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."
+msgstr "--quiet ist nur mit einem einzelnen Pfadnamen gültig"
#: builtin/check-ignore.c:174
msgid "cannot have both --quiet and --verbose"
-msgstr ""
-"Die Optionen --quiet und --verbose können nicht gemeinsam verwendet werden."
+msgstr "--quiet und --verbose können nicht gemeinsam verwendet werden"
#: builtin/check-ignore.c:177
msgid "--non-matching is only valid with --verbose"
@@ -11302,57 +12093,57 @@
msgid "no contacts specified"
msgstr "keine Kontakte angegeben"
-#: builtin/checkout-index.c:131
+#: builtin/checkout-index.c:152
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<Optionen>] [--] [<Datei>...]"
-#: builtin/checkout-index.c:148
+#: builtin/checkout-index.c:169
msgid "stage should be between 1 and 3 or all"
msgstr "--stage sollte zwischen 1 und 3 oder 'all' sein"
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:186
msgid "check out all files in the index"
msgstr "alle Dateien im Index auschecken"
-#: builtin/checkout-index.c:165
+#: builtin/checkout-index.c:187
msgid "force overwrite of existing files"
msgstr "das Überschreiben bereits existierender Dateien erzwingen"
-#: builtin/checkout-index.c:167
+#: builtin/checkout-index.c:189
msgid "no warning for existing files and files not in index"
msgstr ""
"keine Warnung für existierende Dateien, und Dateien, die sich nicht im Index "
"befinden"
-#: builtin/checkout-index.c:169
+#: builtin/checkout-index.c:191
msgid "don't checkout new files"
msgstr "keine neuen Dateien auschecken"
-#: builtin/checkout-index.c:171
+#: builtin/checkout-index.c:193
msgid "update stat information in the index file"
msgstr "Dateiinformationen in der Index-Datei aktualisieren"
-#: builtin/checkout-index.c:175
+#: builtin/checkout-index.c:197
msgid "read list of paths from the standard input"
msgstr "eine Liste von Pfaden von der Standard-Eingabe lesen"
-#: builtin/checkout-index.c:177
+#: builtin/checkout-index.c:199
msgid "write the content to temporary files"
msgstr "den Inhalt in temporäre Dateien schreiben"
-#: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403
-#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909
-#: builtin/worktree.c:672
+#: builtin/checkout-index.c:200 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:717
msgid "string"
msgstr "Zeichenkette"
-#: builtin/checkout-index.c:179
+#: builtin/checkout-index.c:201
msgid "when creating files, prepend <string>"
msgstr ""
"wenn Dateien erzeugt werden, stelle <Zeichenkette> dem Dateinamen voran"
-#: builtin/checkout-index.c:181
+#: builtin/checkout-index.c:203
msgid "copy out the files from named stage"
msgstr "Dateien von dem benannten Stand kopieren"
@@ -11372,99 +12163,99 @@
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git restore [<Optionen>] [--source=<Branch>] <Datei>..."
-#: builtin/checkout.c:175 builtin/checkout.c:214
+#: builtin/checkout.c: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:177 builtin/checkout.c:216
+#: 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:193
+#: 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:243
+#: 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:261
+#: builtin/checkout.c:275
#, c-format
msgid "path '%s': cannot merge"
msgstr "Pfad '%s': kann nicht zusammenführen"
-#: builtin/checkout.c:277
+#: 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:377
+#: 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:382
+#: 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:389
+#: 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:412 builtin/checkout.c:415 builtin/checkout.c:418
-#: builtin/checkout.c:422
+#: 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:425 builtin/checkout.c:428
+#: 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:432
+#: 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:436
+#: builtin/checkout.c:455
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "Weder '%s' noch '%s' ist angegeben"
-#: builtin/checkout.c:440
+#: 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:445 builtin/checkout.c:450
+#: 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:509 builtin/checkout.c:516
+#: builtin/checkout.c:543 builtin/checkout.c:550
#, c-format
msgid "path '%s' is unmerged"
msgstr "Pfad '%s' ist nicht zusammengeführt."
-#: builtin/checkout.c:684 builtin/sparse-checkout.c:106
+#: builtin/checkout.c:718
msgid "you need to resolve your current index first"
msgstr "Sie müssen zuerst die Konflikte in Ihrem aktuellen Index auflösen."
-#: builtin/checkout.c:734
+#: builtin/checkout.c:772
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -11473,50 +12264,50 @@
"Kann nicht mit vorgemerkten Änderungen in folgenden Dateien fortsetzen:\n"
"%s"
-#: builtin/checkout.c:837
+#: builtin/checkout.c:865
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Kann \"reflog\" für '%s' nicht durchführen: %s\n"
-#: builtin/checkout.c:879
+#: builtin/checkout.c:907
msgid "HEAD is now at"
msgstr "HEAD ist jetzt bei"
-#: builtin/checkout.c:883 builtin/clone.c:717
+#: builtin/checkout.c:911 builtin/clone.c:721 t/helper/test-fast-rebase.c:202
msgid "unable to update HEAD"
msgstr "Konnte HEAD nicht aktualisieren."
-#: builtin/checkout.c:887
+#: builtin/checkout.c:915
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Setze Branch '%s' neu\n"
-#: builtin/checkout.c:890
+#: builtin/checkout.c:918
#, c-format
msgid "Already on '%s'\n"
msgstr "Bereits auf '%s'\n"
-#: builtin/checkout.c:894
+#: builtin/checkout.c:922
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Zu umgesetztem Branch '%s' gewechselt\n"
-#: builtin/checkout.c:896 builtin/checkout.c:1320
+#: builtin/checkout.c:924 builtin/checkout.c:1355
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Zu neuem Branch '%s' gewechselt\n"
-#: builtin/checkout.c:898
+#: builtin/checkout.c:926
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Zu Branch '%s' gewechselt\n"
-#: builtin/checkout.c:949
+#: builtin/checkout.c:977
#, c-format
msgid " ... and %d more.\n"
msgstr " ... und %d weitere.\n"
-#: builtin/checkout.c:955
+#: builtin/checkout.c:983
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -11539,7 +12330,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:974
+#: builtin/checkout.c:1002
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -11566,19 +12357,19 @@
" git branch <neuer-Branchname> %s\n"
"\n"
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1037
msgid "internal error in revision walk"
msgstr "interner Fehler im Revisionsgang"
-#: builtin/checkout.c:1013
+#: builtin/checkout.c:1041
msgid "Previous HEAD position was"
msgstr "Vorherige Position von HEAD war"
-#: builtin/checkout.c:1053 builtin/checkout.c:1315
+#: builtin/checkout.c:1081 builtin/checkout.c:1350
msgid "You are on a branch yet to be born"
msgstr "Sie sind auf einem Branch, der noch nicht geboren ist"
-#: builtin/checkout.c:1128
+#: builtin/checkout.c:1163
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -11588,7 +12379,7 @@
"Bitte benutzen Sie -- (und optional --no-guess), um diese\n"
"eindeutig voneinander zu unterscheiden."
-#: builtin/checkout.c:1135
+#: builtin/checkout.c:1170
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"
@@ -11611,51 +12402,51 @@
"bevorzugen möchten, z.B. 'origin', können Sie die Einstellung\n"
"checkout.defaultRemote=origin in Ihrer Konfiguration setzen."
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1180
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "'%s' entspricht mehreren (%d) Remote-Tracking-Branches"
-#: builtin/checkout.c:1211
+#: builtin/checkout.c:1246
msgid "only one reference expected"
msgstr "nur eine Referenz erwartet"
-#: builtin/checkout.c:1228
+#: builtin/checkout.c:1263
#, c-format
msgid "only one reference expected, %d given."
msgstr "nur eine Referenz erwartet, %d gegeben."
-#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448
+#: builtin/checkout.c:1309 builtin/worktree.c:270 builtin/worktree.c:438
#, c-format
msgid "invalid reference: %s"
msgstr "Ungültige Referenz: %s"
-#: builtin/checkout.c:1287 builtin/checkout.c:1649
+#: builtin/checkout.c:1322 builtin/checkout.c:1688
#, c-format
msgid "reference is not a tree: %s"
msgstr "Referenz ist kein \"Tree\"-Objekt: %s"
-#: builtin/checkout.c:1334
+#: builtin/checkout.c:1369
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "Ein Branch wird erwartet, Tag '%s' bekommen"
-#: builtin/checkout.c:1336
+#: builtin/checkout.c:1371
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "Ein Branch wird erwartet, Remote-Branch '%s' bekommen"
-#: builtin/checkout.c:1337 builtin/checkout.c:1345
+#: builtin/checkout.c:1372 builtin/checkout.c:1380
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "Ein Branch wird erwartet, '%s' bekommen"
-#: builtin/checkout.c:1340
+#: builtin/checkout.c:1375
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "Ein Branch wird erwartet, Commit '%s' bekommen"
-#: builtin/checkout.c:1356
+#: builtin/checkout.c:1391
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -11663,7 +12454,7 @@
"Der Branch kann nicht während eines Merges gewechselt werden.\n"
"Ziehen Sie \"git merge --quit\" oder \"git worktree add\" in Betracht."
-#: builtin/checkout.c:1360
+#: builtin/checkout.c:1395
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -11672,7 +12463,7 @@
"werden.\n"
"Ziehen Sie \"git am --quit\" oder \"git worktree add\" in Betracht."
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1399
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -11681,7 +12472,7 @@
"werden.\n"
"Ziehen Sie \"git rebase --quit\" oder \"git worktree add\" in Betracht."
-#: builtin/checkout.c:1368
+#: builtin/checkout.c:1403
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -11690,7 +12481,7 @@
"gewechselt werden.\n"
"Ziehen Sie \"git cherry-pick --quit\" oder \"git worktree add\" in Betracht."
-#: builtin/checkout.c:1372
+#: builtin/checkout.c:1407
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -11699,145 +12490,140 @@
"werden.\n"
"Ziehen Sie \"git revert --quit\" oder \"git worktree add\" in Betracht."
-#: builtin/checkout.c:1376
+#: builtin/checkout.c:1411
msgid "you are switching branch while bisecting"
msgstr "Sie wechseln den Branch während einer binären Suche"
-#: builtin/checkout.c:1383
+#: builtin/checkout.c:1418
msgid "paths cannot be used with switching branches"
msgstr "Pfade können nicht beim Wechseln von Branches verwendet werden"
-#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394
+#: builtin/checkout.c:1421 builtin/checkout.c:1425 builtin/checkout.c:1429
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' kann nicht beim Wechseln von Branches verwendet werden"
-#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404
-#: builtin/checkout.c:1409 builtin/checkout.c:1414
+#: builtin/checkout.c:1433 builtin/checkout.c:1436 builtin/checkout.c:1439
+#: builtin/checkout.c:1444 builtin/checkout.c:1449
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' kann nicht mit '%s' verwendet werden"
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1446
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s' kann nicht <Startpunkt> bekommen"
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1454
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Kann Branch nicht zu Nicht-Commit '%s' wechseln"
-#: builtin/checkout.c:1426
+#: builtin/checkout.c:1461
msgid "missing branch or commit argument"
msgstr "Branch- oder Commit-Argument fehlt"
-#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72
-#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286
-#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563
-#: builtin/send-pack.c:174
-msgid "force progress reporting"
-msgstr "Fortschrittsanzeige erzwingen"
-
-#: builtin/checkout.c:1469
+#: builtin/checkout.c:1504
msgid "perform a 3-way merge with the new branch"
msgstr "einen 3-Wege-Merge mit dem neuen Branch ausführen"
-#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322
+#: builtin/checkout.c:1505 builtin/log.c:1799 parse-options.h:322
msgid "style"
msgstr "Stil"
-#: builtin/checkout.c:1471
+#: builtin/checkout.c:1506
msgid "conflict style (merge or diff3)"
msgstr "Konfliktstil (merge oder diff3)"
-#: builtin/checkout.c:1483 builtin/worktree.c:496
+#: builtin/checkout.c:1518 builtin/worktree.c:486
msgid "detach HEAD at named commit"
msgstr "HEAD bei benanntem Commit loslösen"
-#: builtin/checkout.c:1484
+#: builtin/checkout.c:1519
msgid "set upstream info for new branch"
msgstr "Informationen zum Upstream-Branch für den neuen Branch setzen"
-#: builtin/checkout.c:1486
+#: builtin/checkout.c:1521
msgid "force checkout (throw away local modifications)"
msgstr "Auschecken erzwingen (verwirft lokale Änderungen)"
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1523
msgid "new-branch"
msgstr "neuer Branch"
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1523
msgid "new unparented branch"
msgstr "neuer Branch ohne Eltern-Commit"
-#: builtin/checkout.c:1490 builtin/merge.c:289
+#: builtin/checkout.c:1525 builtin/merge.c:301
msgid "update ignored files (default)"
msgstr "ignorierte Dateien aktualisieren (Standard)"
-#: builtin/checkout.c:1493
+#: builtin/checkout.c:1528
msgid "do not check if another worktree is holding the given ref"
msgstr ""
"Prüfung, ob die Referenz bereits in einem anderen Arbeitsverzeichnis "
"ausgecheckt wurde, deaktivieren"
-#: builtin/checkout.c:1506
+#: builtin/checkout.c:1541
msgid "checkout our version for unmerged files"
msgstr "unsere Variante für nicht zusammengeführte Dateien auschecken"
-#: builtin/checkout.c:1509
+#: builtin/checkout.c:1544
msgid "checkout their version for unmerged files"
msgstr "ihre Variante für nicht zusammengeführte Dateien auschecken"
-#: builtin/checkout.c:1513
+#: builtin/checkout.c:1548
msgid "do not limit pathspecs to sparse entries only"
msgstr "keine Einschränkung bei Pfadspezifikationen zum partiellen Auschecken"
-#: builtin/checkout.c:1565
-msgid "-b, -B and --orphan are mutually exclusive"
-msgstr "Die Optionen -b, -B und --orphan schließen sich gegenseitig aus."
+#: builtin/checkout.c:1603
+#, c-format
+msgid "-%c, -%c and --orphan are mutually exclusive"
+msgstr "-%c, -%c und --orphan schließen sich gegenseitig aus"
-#: builtin/checkout.c:1568
+#: builtin/checkout.c:1607
msgid "-p and --overlay are mutually exclusive"
-msgstr "-p und --overlay schließen sich gegenseitig aus."
+msgstr "-p und --overlay schließen sich gegenseitig aus"
-#: builtin/checkout.c:1605
+#: builtin/checkout.c:1644
msgid "--track needs a branch name"
-msgstr "Bei der Option --track muss ein Branchname angegeben werden."
+msgstr "--track benötigt ein Branchname"
-#: builtin/checkout.c:1610
-msgid "missing branch name; try -b"
-msgstr "Kein Branchname; versuchen Sie -b."
+#: builtin/checkout.c:1649
+#, c-format
+msgid "missing branch name; try -%c"
+msgstr "kein Branchname; versuchen Sie -%c"
-#: builtin/checkout.c:1642
+#: builtin/checkout.c:1681
#, c-format
msgid "could not resolve %s"
-msgstr "Konnte %s nicht auflösen."
+msgstr "konnte %s nicht auflösen"
-#: builtin/checkout.c:1658
+#: builtin/checkout.c:1697
msgid "invalid path specification"
msgstr "ungültige Pfadspezifikation"
-#: builtin/checkout.c:1665
+#: builtin/checkout.c:1704
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
"'%s' ist kein Commit und es kann kein Branch '%s' aus diesem erstellt werden."
-#: builtin/checkout.c:1669
+#: builtin/checkout.c:1708
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach nimmt kein Pfad-Argument '%s'"
-#: builtin/checkout.c:1678
+#: builtin/checkout.c:1717
msgid "--pathspec-from-file is incompatible with --detach"
-msgstr "Die Optionen --pathspec-from-file und --detach sind inkompatibel."
+msgstr "--pathspec-from-file und --detach sind inkompatibel"
-#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506
+#: builtin/checkout.c:1720 builtin/reset.c:325 builtin/stash.c:1566
msgid "--pathspec-from-file is incompatible with --patch"
-msgstr "Die Optionen --pathspec-from-file und --patch sind inkompatibel."
+msgstr "--pathspec-from-file und --patch sind inkompatibel"
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1733
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -11845,109 +12631,110 @@
"git checkout: --ours/--theirs, --force und --merge sind inkompatibel wenn\n"
"Sie aus dem Index auschecken."
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1738
msgid "you must specify path(s) to restore"
msgstr "Sie müssen Pfad(e) zur Wiederherstellung angeben."
-#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774
-#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494
+#: builtin/checkout.c:1764 builtin/checkout.c:1766 builtin/checkout.c:1815
+#: builtin/checkout.c:1817 builtin/clone.c:122 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:482
+#: builtin/worktree.c:484
msgid "branch"
msgstr "Branch"
-#: builtin/checkout.c:1724
+#: builtin/checkout.c:1765
msgid "create and checkout a new branch"
msgstr "einen neuen Branch erzeugen und auschecken"
-#: builtin/checkout.c:1726
+#: builtin/checkout.c:1767
msgid "create/reset and checkout a branch"
msgstr "einen Branch erstellen/umsetzen und auschecken"
-#: builtin/checkout.c:1727
+#: builtin/checkout.c:1768
msgid "create reflog for new branch"
msgstr "das Reflog für den neuen Branch erzeugen"
-#: builtin/checkout.c:1729
+#: builtin/checkout.c:1770
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "Zweite Vermutung 'git checkout <kein-solcher-Branch>' (Standard)"
-#: builtin/checkout.c:1730
+#: builtin/checkout.c:1771
msgid "use overlay mode (default)"
msgstr "benutze Overlay-Modus (Standard)"
-#: builtin/checkout.c:1775
+#: builtin/checkout.c:1816
msgid "create and switch to a new branch"
msgstr "einen neuen Branch erzeugen und dahin wechseln"
-#: builtin/checkout.c:1777
+#: builtin/checkout.c:1818
msgid "create/reset and switch to a branch"
msgstr "einen Branch erstellen/umsetzen und dahin wechseln"
-#: builtin/checkout.c:1779
+#: builtin/checkout.c:1820
msgid "second guess 'git switch <no-such-branch>'"
msgstr "Zweite Vermutung 'git switch <kein-solcher-Branch>'"
-#: builtin/checkout.c:1781
+#: builtin/checkout.c:1822
msgid "throw away local modifications"
msgstr "lokale Änderungen verwerfen"
-#: builtin/checkout.c:1813
+#: builtin/checkout.c:1856
msgid "which tree-ish to checkout from"
msgstr "Von welcher Commit-Referenz ausgecheckt werden soll"
-#: builtin/checkout.c:1815
+#: builtin/checkout.c:1858
msgid "restore the index"
msgstr "Index wiederherstellen"
-#: builtin/checkout.c:1817
+#: builtin/checkout.c:1860
msgid "restore the working tree (default)"
msgstr "das Arbeitsverzeichnis wiederherstellen (Standard)"
-#: builtin/checkout.c:1819
+#: builtin/checkout.c:1862
msgid "ignore unmerged entries"
msgstr "ignoriere nicht zusammengeführte Einträge"
-#: builtin/checkout.c:1820
+#: builtin/checkout.c:1863
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:301 git-add--interactive.perl:595
+#: builtin/clean.c:302 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -11960,7 +12747,7 @@
"foo - Element anhand eines eindeutigen Präfix auswählen\n"
" - (leer) nichts auswählen\n"
-#: builtin/clean.c:305 git-add--interactive.perl:604
+#: builtin/clean.c:306 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -11981,33 +12768,33 @@
"* - alle Elemente auswählen\n"
" - (leer) Auswahl beenden\n"
-#: builtin/clean.c:521 git-add--interactive.perl:570
-#: git-add--interactive.perl:575
+#: builtin/clean.c:521 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Wie bitte (%s)?\n"
-#: builtin/clean.c:663
+#: builtin/clean.c:661
#, c-format
msgid "Input ignore patterns>> "
msgstr "Ignorier-Muster eingeben>> "
-#: builtin/clean.c:700
+#: 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:721
+#: 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:762
+#: builtin/clean.c:758
#, c-format
msgid "Remove %s [y/N]? "
msgstr "'%s' löschen [y/N]? "
-#: builtin/clean.c:795
+#: builtin/clean.c:789
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -12025,56 +12812,52 @@
"help - diese Meldung anzeigen\n"
"? - Hilfe zur Auswahl mittels Eingabe anzeigen"
-#: builtin/clean.c:831
+#: 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:847
+#: builtin/clean.c:841
msgid "No more files to clean, exiting."
msgstr "Keine Dateien mehr zum Löschen, beende."
-#: builtin/clean.c:909
+#: builtin/clean.c:903
msgid "do not print names of files removed"
msgstr "keine Namen von gelöschten Dateien ausgeben"
-#: builtin/clean.c:911
+#: builtin/clean.c:905
msgid "force"
msgstr "Aktion erzwingen"
-#: builtin/clean.c:912
+#: builtin/clean.c:906
msgid "interactive cleaning"
msgstr "interaktives Clean"
-#: builtin/clean.c:914
+#: builtin/clean.c:908
msgid "remove whole directories"
msgstr "ganze Verzeichnisse löschen"
-#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564
-#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179
-#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/grep.c:922 builtin/log.c:184 builtin/log.c:186
+#: builtin/ls-files.c:573 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "Muster"
-#: builtin/clean.c:916
+#: builtin/clean.c:910
msgid "add <pattern> to ignore rules"
msgstr "<Muster> zu den Regeln für ignorierte Pfade hinzufügen"
-#: builtin/clean.c:917
+#: builtin/clean.c:911
msgid "remove ignored files, too"
msgstr "auch ignorierte Dateien löschen"
-#: builtin/clean.c:919
+#: builtin/clean.c:913
msgid "remove only ignored files"
msgstr "nur ignorierte Dateien löschen"
-#: builtin/clean.c:937
-msgid "-x and -X cannot be used together"
-msgstr "Die Optionen -x und -X können nicht gemeinsam verwendet werden."
-
-#: builtin/clean.c:941
+#: builtin/clean.c:929
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -12082,7 +12865,7 @@
"clean.requireForce auf \"true\" gesetzt und weder -i, -n noch -f gegeben; "
"\"clean\" verweigert"
-#: builtin/clean.c:944
+#: builtin/clean.c:932
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -12090,31 +12873,35 @@
"clean.requireForce standardmäßig auf \"true\" gesetzt und weder -i, -n noch -"
"f gegeben; \"clean\" verweigert"
+#: builtin/clean.c:944
+msgid "-x and -X cannot be used together"
+msgstr "-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>]"
-#: builtin/clone.c:93
+#: builtin/clone.c:94
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:95 builtin/clone.c:97 builtin/init-db.c:555
msgid "create a bare repository"
msgstr "ein Bare-Repository erstellen"
-#: builtin/clone.c:98
+#: builtin/clone.c:99
msgid "create a mirror repository (implies bare)"
msgstr "ein Spiegelarchiv erstellen (impliziert --bare)"
-#: builtin/clone.c:100
+#: builtin/clone.c:101
msgid "to clone from a local repository"
msgstr "von einem lokalen Repository klonen"
-#: builtin/clone.c:102
+#: builtin/clone.c:103
msgid "don't use local hardlinks, always copy"
msgstr "lokal keine harten Verweise verwenden, immer Kopien"
-#: builtin/clone.c:104
+#: builtin/clone.c:105
msgid "setup as shared repository"
msgstr "als verteiltes Repository einrichten"
@@ -12126,137 +12913,138 @@
msgid "initialize submodules in the clone"
msgstr "Submodule im Klon initialisieren"
-#: builtin/clone.c:110
+#: builtin/clone.c:111
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:112 builtin/init-db.c:552
msgid "template-directory"
msgstr "Vorlagenverzeichnis"
-#: builtin/clone.c:112 builtin/init-db.c:487
+#: builtin/clone.c:113 builtin/init-db.c:553
msgid "directory from which templates will be used"
msgstr "Verzeichnis, von welchem die Vorlagen verwendet werden"
-#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407
-#: builtin/submodule--helper.c:1912
+#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831
+#: builtin/submodule--helper.c:2336
msgid "reference repository"
msgstr "Repository referenzieren"
-#: builtin/clone.c:118 builtin/submodule--helper.c:1409
-#: builtin/submodule--helper.c:1914
+#: builtin/clone.c:119 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:3441 builtin/repack.c:327
+#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3561 builtin/repack.c:357
msgid "name"
msgstr "Name"
-#: builtin/clone.c:120
+#: builtin/clone.c:121
msgid "use <name> instead of 'origin' to track upstream"
msgstr "<Name> statt 'origin' für Upstream-Repository verwenden"
-#: builtin/clone.c:122
+#: builtin/clone.c:123
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "<Branch> auschecken, anstatt HEAD des Remote-Repositories"
-#: builtin/clone.c:124
+#: builtin/clone.c:125
msgid "path to git-upload-pack on the remote"
msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite"
-#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828
-#: builtin/pull.c:207
+#: builtin/clone.c:126 builtin/fetch.c:176 builtin/grep.c:861
+#: builtin/pull.c:208
msgid "depth"
msgstr "Tiefe"
-#: builtin/clone.c:126
+#: builtin/clone.c:127
msgid "create a shallow clone of that depth"
msgstr ""
"einen Klon mit unvollständiger Historie (shallow) in dieser Tiefe erstellen"
-#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430
+#: builtin/clone.c:128 builtin/fetch.c:178 builtin/pack-objects.c:3550
+#: builtin/pull.c:211
msgid "time"
msgstr "Zeit"
-#: builtin/clone.c:128
+#: builtin/clone.c:129
msgid "create a shallow clone since a specific time"
msgstr ""
"einen Klon mit unvollständiger Historie (shallow) seit einer bestimmten "
"Zeit\n"
"erstellen"
-#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195
-#: builtin/rebase.c:1480
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/fetch.c:203
+#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1323
msgid "revision"
msgstr "Commit"
-#: builtin/clone.c:130 builtin/fetch.c:173
+#: builtin/clone.c:131 builtin/fetch.c:181 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/submodule--helper.c:1419
-#: builtin/submodule--helper.c:1928
+#: builtin/clone.c:133 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"
-#: builtin/clone.c:134
+#: builtin/clone.c:135
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr "keine Tags klonen, und auch bei späteren Abrufen nicht beachten"
-#: builtin/clone.c:136
+#: builtin/clone.c:137
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:138 builtin/init-db.c:561
msgid "gitdir"
msgstr ".git-Verzeichnis"
-#: builtin/clone.c:138 builtin/init-db.c:496
+#: builtin/clone.c:139 builtin/init-db.c:562
msgid "separate git dir from working tree"
msgstr "Git-Verzeichnis vom Arbeitsverzeichnis separieren"
-#: builtin/clone.c:139
+#: builtin/clone.c:140
msgid "key=value"
msgstr "Schlüssel=Wert"
-#: builtin/clone.c:140
+#: builtin/clone.c:141
msgid "set config inside the new repository"
msgstr "Konfiguration innerhalb des neuen Repositories setzen"
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
-#: builtin/push.c:573 builtin/send-pack.c:172
+#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77
+#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
msgid "server-specific"
msgstr "serverspezifisch"
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
-#: builtin/push.c:573 builtin/send-pack.c:173
+#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77
+#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
msgid "option to transmit"
msgstr "Option übertragen"
-#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220
-#: builtin/push.c:574
+#: builtin/clone.c:144 builtin/fetch.c:199 builtin/pull.c:234
+#: builtin/push.c:585
msgid "use IPv4 addresses only"
msgstr "nur IPv4-Adressen benutzen"
-#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223
-#: builtin/push.c:576
+#: builtin/clone.c:146 builtin/fetch.c:201 builtin/pull.c:237
+#: builtin/push.c:587
msgid "use IPv6 addresses only"
msgstr "nur IPv6-Adressen benutzen"
-#: builtin/clone.c:149
+#: builtin/clone.c:150
msgid "any cloned submodules will use their remote-tracking branch"
msgstr "jedes geklonte Submodul nutzt seinen Remote-Tracking-Branch"
-#: builtin/clone.c:151
+#: builtin/clone.c:152
msgid "initialize sparse-checkout file to include only files at root"
msgstr ""
"Initialisiere Datei für partiellen Checkout, um nur Dateien im\n"
"Root-Verzeichnis einzubeziehen"
-#: builtin/clone.c:287
+#: builtin/clone.c:288
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -12264,42 +13052,42 @@
"Konnte keinen Verzeichnisnamen erraten.\n"
"Bitte geben Sie ein Verzeichnis auf der Befehlszeile an."
-#: builtin/clone.c:340
+#: builtin/clone.c:341
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: Konnte Alternative für '%s' nicht hinzufügen: %s\n"
-#: builtin/clone.c:413
+#: builtin/clone.c:414
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existiert und ist kein Verzeichnis"
-#: builtin/clone.c:430
+#: builtin/clone.c:432
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "Fehler beim Starten der Iteration über '%s'"
-#: builtin/clone.c:460
+#: builtin/clone.c:463
#, c-format
msgid "failed to create link '%s'"
msgstr "Konnte Verweis '%s' nicht erstellen"
-#: builtin/clone.c:464
+#: builtin/clone.c:467
#, c-format
msgid "failed to copy file to '%s'"
msgstr "Konnte Datei nicht nach '%s' kopieren"
-#: builtin/clone.c:469
+#: builtin/clone.c:472
#, c-format
msgid "failed to iterate over '%s'"
msgstr "Fehler beim Iterieren über '%s'"
-#: builtin/clone.c:494
+#: builtin/clone.c:499
#, c-format
msgid "done.\n"
msgstr "Fertig.\n"
-#: builtin/clone.c:508
+#: builtin/clone.c:513
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -12309,101 +13097,107 @@
"Sie können mit 'git status' prüfen, was ausgecheckt worden ist\n"
"und das Auschecken mit 'git restore --source=HEAD :/' erneut versuchen.\n"
-#: builtin/clone.c:585
+#: builtin/clone.c:590
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Konnte zu klonenden Remote-Branch %s nicht finden."
-#: builtin/clone.c:705
+#: builtin/clone.c:709
#, c-format
msgid "unable to update %s"
msgstr "kann %s nicht aktualisieren"
-#: builtin/clone.c:753
+#: builtin/clone.c:757
msgid "failed to initialize sparse-checkout"
msgstr "Fehler beim Initialisieren vom partiellen Checkout."
-#: builtin/clone.c:776
+#: builtin/clone.c:780
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"Externer HEAD bezieht sich auf eine nicht existierende Referenz und kann "
"nicht ausgecheckt werden.\n"
-#: builtin/clone.c:807
+#: builtin/clone.c:812
msgid "unable to checkout working tree"
msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden"
-#: builtin/clone.c:862
+#: builtin/clone.c:887
msgid "unable to write parameters to config file"
msgstr "konnte Parameter nicht in Konfigurationsdatei schreiben"
-#: builtin/clone.c:925
+#: builtin/clone.c:950
msgid "cannot repack to clean up"
msgstr "Kann \"repack\" zum Aufräumen nicht aufrufen"
-#: builtin/clone.c:927
+#: builtin/clone.c:952
msgid "cannot unlink temporary alternates file"
msgstr "Kann temporäre \"alternates\"-Datei nicht entfernen"
-#: builtin/clone.c:965 builtin/receive-pack.c:1950
+#: builtin/clone.c:993 builtin/receive-pack.c:2493
msgid "Too many arguments."
msgstr "Zu viele Argumente."
-#: builtin/clone.c:969
+#: builtin/clone.c:997
msgid "You must specify a repository to clone."
msgstr "Sie müssen ein Repository zum Klonen angeben."
-#: builtin/clone.c:982
+#: builtin/clone.c:1010
#, c-format
msgid "--bare and --origin %s options are incompatible."
-msgstr "Die Optionen --bare und --origin %s sind inkompatibel."
+msgstr "--bare und --origin %s sind inkompatibel."
-#: builtin/clone.c:985
+#: builtin/clone.c:1013
msgid "--bare and --separate-git-dir are incompatible."
-msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel."
+msgstr "--bare und --separate-git-dir sind inkompatibel."
-#: builtin/clone.c:998
+#: builtin/clone.c:1026
#, c-format
msgid "repository '%s' does not exist"
-msgstr "Repository '%s' existiert nicht."
+msgstr "Repository '%s' existiert nicht"
-#: builtin/clone.c:1004 builtin/fetch.c:1796
+#: builtin/clone.c:1030 builtin/fetch.c:1951
#, c-format
msgid "depth %s is not a positive number"
msgstr "Tiefe %s ist keine positive Zahl"
-#: builtin/clone.c:1014
+#: builtin/clone.c:1040
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "Zielpfad '%s' existiert bereits und ist kein leeres Verzeichnis."
-#: builtin/clone.c:1024
+#: builtin/clone.c:1046
+#, 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:1060
#, c-format
msgid "working tree '%s' already exists."
msgstr "Arbeitsverzeichnis '%s' existiert bereits."
-#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271
-#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327
+#: builtin/clone.c:1075 builtin/clone.c:1096 builtin/difftool.c:271
+#: builtin/log.c:1986 builtin/worktree.c:282 builtin/worktree.c:314
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen."
-#: builtin/clone.c:1044
+#: builtin/clone.c:1080
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen"
-#: builtin/clone.c:1064
+#: builtin/clone.c:1100
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Klone in Bare-Repository '%s' ...\n"
-#: builtin/clone.c:1066
+#: builtin/clone.c:1102
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Klone nach '%s' ...\n"
-#: builtin/clone.c:1090
+#: builtin/clone.c:1126
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -12411,45 +13205,51 @@
"'clone --recursive' ist nicht kompatibel mit --reference und --reference-if-"
"able"
-#: builtin/clone.c:1154
+#: builtin/clone.c:1170 builtin/remote.c:200 builtin/remote.c:705
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr "'%s' ist kein gültiger Name für ein Remote-Repository"
+
+#: builtin/clone.c:1211
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
-"Die Option --depth wird in lokalen Klonen ignoriert; benutzen Sie "
-"stattdessen file://"
+"--depth wird in lokalen Klonen ignoriert; benutzen Sie stattdessen \"file://"
+"\"."
-#: builtin/clone.c:1156
+#: builtin/clone.c:1213
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-since wird in lokalen Klonen ignoriert; benutzen Sie stattdessen "
-"file://"
+"\"file://\"."
-#: builtin/clone.c:1158
+#: builtin/clone.c:1215
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-exclude wird in lokalen Klonen ignoriert; benutzen Sie stattdessen "
-"file://"
+"\"file://\"."
-#: builtin/clone.c:1160
+#: builtin/clone.c:1217
msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
-"--filter wird in lokalen Klonen ignoriert; benutzen Sie stattdessen file://"
+"--filter wird in lokalen Klonen ignoriert; benutzen Sie stattdessen \"file://"
+"\"."
-#: builtin/clone.c:1163
+#: builtin/clone.c:1220
msgid "source repository is shallow, ignoring --local"
msgstr ""
"Quelle ist ein Repository mit unvollständiger Historie (shallow),\n"
"ignoriere --local"
-#: builtin/clone.c:1168
+#: builtin/clone.c:1225
msgid "--local is ignored"
msgstr "--local wird ignoriert"
-#: builtin/clone.c:1243 builtin/clone.c:1251
+#: builtin/clone.c:1315 builtin/clone.c:1323
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden"
-#: builtin/clone.c:1254
+#: builtin/clone.c:1326
msgid "You appear to have cloned an empty repository."
msgstr "Sie scheinen ein leeres Repository geklont zu haben."
@@ -12483,7 +13283,118 @@
#: builtin/column.c:51
msgid "--command must be the first argument"
-msgstr "Die Option --command muss an erster Stelle stehen."
+msgstr "--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:187 builtin/log.c:1768
+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 ""
@@ -12498,7 +13409,7 @@
msgid "duplicate parent %s ignored"
msgstr "doppelter Vorgänger %s ignoriert"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:557
#, c-format
msgid "not a valid object name %s"
msgstr "Kein gültiger Objektname: %s"
@@ -12526,13 +13437,13 @@
msgid "id of a parent commit object"
msgstr "ID eines Eltern-Commit-Objektes."
-#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477
-#: builtin/tag.c:412
+#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:282
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1537
+#: builtin/tag.c:445
msgid "message"
msgstr "Beschreibung"
-#: builtin/commit-tree.c:115 builtin/commit.c:1501
+#: builtin/commit-tree.c:115 builtin/commit.c:1504
msgid "commit message"
msgstr "Commit-Beschreibung"
@@ -12540,8 +13451,8 @@
msgid "read commit log message from file"
msgstr "Commit-Beschreibung von Datei lesen"
-#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288
-#: builtin/pull.c:175 builtin/revert.c:118
+#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:299
+#: builtin/pull.c:176 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "Commit mit GPG signieren"
@@ -12587,10 +13498,14 @@
"\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"
@@ -12612,70 +13527,74 @@
" 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:351
+#: 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:364
+#: 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:376
+#: builtin/commit.c:373
msgid "unable to create temporary index"
msgstr "Konnte temporären Index nicht erstellen."
-#: builtin/commit.c:385
+#: builtin/commit.c:382
msgid "interactive add failed"
msgstr "interaktives Hinzufügen fehlgeschlagen"
-#: builtin/commit.c:400
+#: builtin/commit.c:397
msgid "unable to update temporary index"
msgstr "Konnte temporären Index nicht aktualisieren."
-#: builtin/commit.c:402
+#: builtin/commit.c:399
msgid "Failed to update main cache tree"
msgstr "Konnte Haupt-Cache-Verzeichnis nicht aktualisieren"
-#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496
+#: builtin/commit.c: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:479
+#: 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:481
+#: 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:489
+#: 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:508
+#: builtin/commit.c:507
msgid "unable to write temporary index file"
msgstr "Konnte temporäre Index-Datei nicht schreiben."
-#: builtin/commit.c:606
+#: builtin/commit.c:605
#, c-format
msgid "commit '%s' lacks author header"
msgstr "Commit '%s' fehlt Autor-Kopfbereich"
-#: builtin/commit.c:608
+#: builtin/commit.c:607
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "Commit '%s' hat fehlerhafte Autor-Zeile"
-#: builtin/commit.c:627
+#: builtin/commit.c:626
msgid "malformed --author parameter"
msgstr "Fehlerhafter --author Parameter"
-#: builtin/commit.c:680
+#: builtin/commit.c:679
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -12683,68 +13602,66 @@
"Konnte kein Kommentar-Zeichen auswählen, das nicht in\n"
"der aktuellen Commit-Beschreibung verwendet wird."
-#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097
+#: builtin/commit.c: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:730 builtin/shortlog.c:319
+#: builtin/commit.c:729 builtin/shortlog.c:413
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(lese Log-Nachricht von Standard-Eingabe)\n"
-#: builtin/commit.c:732
+#: builtin/commit.c:731
msgid "could not read log from standard input"
msgstr "Konnte Log nicht von Standard-Eingabe lesen."
-#: builtin/commit.c:736
+#: builtin/commit.c:735
#, c-format
msgid "could not read log file '%s'"
msgstr "Konnte Log-Datei '%s' nicht lesen"
-#: builtin/commit.c:767 builtin/commit.c:783
+#: builtin/commit.c:766 builtin/commit.c:782
msgid "could not read SQUASH_MSG"
msgstr "Konnte SQUASH_MSG nicht lesen"
-#: builtin/commit.c:774
+#: builtin/commit.c:773
msgid "could not read MERGE_MSG"
msgstr "Konnte MERGE_MSG nicht lesen"
-#: builtin/commit.c:834
+#: builtin/commit.c:833
msgid "could not write commit template"
msgstr "Konnte Commit-Vorlage nicht schreiben"
#: builtin/commit.c:853
-#, c-format
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
+"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:858
-#, c-format
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
+"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:871
+#: builtin/commit.c:868
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -12754,7 +13671,7 @@
"die mit '%c' beginnen, werden ignoriert, und eine leere Beschreibung\n"
"bricht den Commit ab.\n"
-#: builtin/commit.c:879
+#: builtin/commit.c:876
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -12767,22 +13684,22 @@
"entfernen.\n"
"Eine leere Beschreibung bricht den Commit ab.\n"
-#: builtin/commit.c:896
+#: builtin/commit.c:893
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:904
+#: builtin/commit.c:901
#, c-format
msgid "%sDate: %s"
msgstr "%sDatum: %s"
-#: builtin/commit.c:911
+#: builtin/commit.c:908
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sCommit-Ersteller: %.*s <%.*s>"
-#: builtin/commit.c:929
+#: builtin/commit.c:926
msgid "Cannot read index"
msgstr "Kann Index nicht lesen"
@@ -12790,7 +13707,7 @@
msgid "Error building trees"
msgstr "Fehler beim Erzeugen der \"Tree\"-Objekte"
-#: builtin/commit.c:1011 builtin/tag.c:275
+#: builtin/commit.c:1011 builtin/tag.c:308
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
@@ -12808,20 +13725,18 @@
msgid "Invalid ignored mode '%s'"
msgstr "Ungültiger ignored-Modus '%s'."
-#: builtin/commit.c:1087 builtin/commit.c:1327
+#: 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:1127
msgid "--long and -z are incompatible"
-msgstr "Die Optionen --long und -z sind inkompatibel."
+msgstr "--long und -z sind inkompatibel"
#: 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."
+msgstr "--reset-author und --author können nicht gemeinsam verwendet werden"
#: builtin/commit.c:1180
msgid "You have nothing to amend."
@@ -12835,81 +13750,84 @@
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "\"cherry-pick\" ist im Gange -- kann \"--amend\" nicht ausführen."
-#: builtin/commit.c:1188
+#: builtin/commit.c: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."
+"Die Optionen --squash und --fixup können nicht gemeinsam verwendet werden"
-#: builtin/commit.c:1198
+#: 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:1200
+#: 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:1208
+#: 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."
+msgstr "--reset--author kann nur mit -C, -c oder --amend verwendet werden"
-#: builtin/commit.c:1225
+#: 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:1231
+#: 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:1362 builtin/commit.c:1524
+#: builtin/commit.c:1366 builtin/commit.c:1527
msgid "show status concisely"
msgstr "Status im Kurzformat anzeigen"
-#: builtin/commit.c:1364 builtin/commit.c:1526
+#: builtin/commit.c:1368 builtin/commit.c:1529
msgid "show branch information"
msgstr "Branchinformationen anzeigen"
-#: builtin/commit.c:1366
+#: builtin/commit.c:1370
msgid "show stash information"
msgstr "Stashinformationen anzeigen"
-#: builtin/commit.c:1368 builtin/commit.c:1528
+#: builtin/commit.c:1372 builtin/commit.c:1531
msgid "compute full ahead/behind values"
msgstr "voraus/hinterher-Werte berechnen"
-#: builtin/commit.c:1370
+#: builtin/commit.c:1374
msgid "version"
msgstr "Version"
-#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549
-#: builtin/worktree.c:643
+#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560
+#: builtin/worktree.c:679
msgid "machine-readable output"
msgstr "maschinenlesbare Ausgabe"
-#: builtin/commit.c:1373 builtin/commit.c:1532
+#: builtin/commit.c:1377 builtin/commit.c:1535
msgid "show status in long format (default)"
msgstr "Status im Langformat anzeigen (Standard)"
-#: builtin/commit.c:1376 builtin/commit.c:1535
+#: builtin/commit.c:1380 builtin/commit.c:1538
msgid "terminate entries with NUL"
msgstr "Einträge mit NUL-Zeichen abschließen"
-#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538
-#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
-#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336
+#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541
+#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
+#: builtin/fast-export.c:1204 builtin/rebase.c:1412 parse-options.h:336
msgid "mode"
msgstr "Modus"
-#: builtin/commit.c:1379 builtin/commit.c:1538
+#: 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:1383
+#: builtin/commit.c:1387
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -12917,11 +13835,11 @@
"ignorierte Dateien anzeigen, optionale Modi: traditional, matching, no. "
"(Standard: traditional)"
-#: builtin/commit.c:1385 parse-options.h:192
+#: builtin/commit.c:1389 parse-options.h:192
msgid "when"
msgstr "wann"
-#: builtin/commit.c:1386
+#: builtin/commit.c:1390
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -12929,174 +13847,174 @@
"Änderungen in Submodulen ignorieren, optional wenn: all, dirty, untracked. "
"(Standard: all)"
-#: builtin/commit.c:1388
+#: builtin/commit.c:1392
msgid "list untracked files in columns"
msgstr "unversionierte Dateien in Spalten auflisten"
-#: builtin/commit.c:1389
+#: builtin/commit.c:1393
msgid "do not detect renames"
msgstr "keine Umbenennungen ermitteln"
-#: builtin/commit.c:1391
+#: builtin/commit.c:1395
msgid "detect renames, optionally set similarity index"
msgstr "Umbenennungen erkennen, optional Index für Gleichheit setzen"
-#: builtin/commit.c:1411
+#: 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:1494
+#: builtin/commit.c:1497
msgid "suppress summary after successful commit"
msgstr "Zusammenfassung nach erfolgreichem Commit unterdrücken"
-#: builtin/commit.c:1495
+#: builtin/commit.c:1498
msgid "show diff in commit message template"
msgstr "Unterschiede in Commit-Beschreibungsvorlage anzeigen"
-#: builtin/commit.c:1497
+#: builtin/commit.c:1500
msgid "Commit message options"
msgstr "Optionen für Commit-Beschreibung"
-#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414
+#: builtin/commit.c:1501 builtin/merge.c:286 builtin/tag.c:447
msgid "read message from file"
msgstr "Beschreibung von Datei lesen"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1502
msgid "author"
msgstr "Autor"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1502
msgid "override author for commit"
msgstr "Autor eines Commits überschreiben"
-#: builtin/commit.c:1500 builtin/gc.c:538
+#: builtin/commit.c:1503 builtin/gc.c:550
msgid "date"
msgstr "Datum"
-#: builtin/commit.c:1500
+#: builtin/commit.c:1503
msgid "override date for commit"
msgstr "Datum eines Commits überschreiben"
-#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504
-#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92
+#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507
+#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:90
msgid "commit"
msgstr "Commit"
-#: builtin/commit.c:1502
+#: builtin/commit.c:1505
msgid "reuse and edit message from specified commit"
msgstr "Beschreibung des angegebenen Commits wiederverwenden und editieren"
-#: builtin/commit.c:1503
+#: builtin/commit.c:1506
msgid "reuse message from specified commit"
msgstr "Beschreibung des angegebenen Commits wiederverwenden"
-#: builtin/commit.c:1504
+#: 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:1505
+#: 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:1506
+#: 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:1507 builtin/log.c:1634 builtin/merge.c:290
-#: builtin/pull.c:144 builtin/revert.c:110
-msgid "add Signed-off-by:"
-msgstr "'Signed-off-by:'-Zeile hinzufügen"
+#: builtin/commit.c:1510 builtin/log.c:1743 builtin/merge.c:302
+#: builtin/pull.c:145 builtin/revert.c:110
+msgid "add a Signed-off-by trailer"
+msgstr "eine Signed-off-by Zeile hinzufügen"
-#: builtin/commit.c:1508
+#: builtin/commit.c:1511
msgid "use specified template file"
msgstr "angegebene Vorlagendatei verwenden"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1512
msgid "force edit of commit"
msgstr "Bearbeitung des Commits erzwingen"
-#: builtin/commit.c:1511
+#: builtin/commit.c:1514
msgid "include status in commit message template"
msgstr "Status in die Commit-Beschreibungsvorlage einfügen"
-#: builtin/commit.c:1516
+#: builtin/commit.c:1519
msgid "Commit contents options"
msgstr "Optionen für Commit-Inhalt"
-#: builtin/commit.c:1517
+#: builtin/commit.c:1520
msgid "commit all changed files"
msgstr "alle geänderten Dateien committen"
-#: builtin/commit.c:1518
+#: builtin/commit.c:1521
msgid "add specified files to index for commit"
msgstr "die angegebenen Dateien zusätzlich zum Commit vormerken"
-#: builtin/commit.c:1519
+#: builtin/commit.c:1522
msgid "interactively add files"
msgstr "interaktives Hinzufügen von Dateien"
-#: builtin/commit.c:1520
+#: builtin/commit.c:1523
msgid "interactively add changes"
msgstr "interaktives Hinzufügen von Änderungen"
-#: builtin/commit.c:1521
+#: builtin/commit.c:1524
msgid "commit only specified files"
msgstr "nur die angegebenen Dateien committen"
-#: builtin/commit.c:1522
+#: builtin/commit.c:1525
msgid "bypass pre-commit and commit-msg hooks"
msgstr "Hooks pre-commit und commit-msg umgehen"
-#: builtin/commit.c:1523
+#: builtin/commit.c:1526
msgid "show what would be committed"
msgstr "anzeigen, was committet werden würde"
-#: builtin/commit.c:1536
+#: builtin/commit.c:1539
msgid "amend previous commit"
msgstr "vorherigen Commit ändern"
-#: builtin/commit.c:1537
+#: builtin/commit.c:1540
msgid "bypass post-rewrite hook"
msgstr "\"post-rewrite hook\" umgehen"
-#: builtin/commit.c:1544
+#: builtin/commit.c:1547
msgid "ok to record an empty change"
msgstr "Aufzeichnung einer leeren Änderung erlauben"
-#: builtin/commit.c:1546
+#: 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:1619
+#: builtin/commit.c:1622
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Beschädigte MERGE_HEAD-Datei (%s)"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1629
msgid "could not read MERGE_MODE"
msgstr "Konnte MERGE_MODE nicht lesen"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1650
#, c-format
msgid "could not read commit message: %s"
msgstr "Konnte Commit-Beschreibung nicht lesen: %s"
-#: builtin/commit.c:1652
+#: 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:1657
+#: 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:1691
+#: 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"
@@ -13107,297 +14025,227 @@
"voll und Ihr Kontingent nicht aufgebraucht ist und führen Sie\n"
"anschließend \"git restore HEAD --staged :/\" zur Wiederherstellung aus."
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:17
-msgid ""
-"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
-msgstr ""
-"git commit-graph verify [--object-dir <Objektverzeichnis>] [--shallow] [--"
-"[no-]progress]"
-
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:22
-msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
-msgstr ""
-"git commit-graph write [--object-dir <Objektverzeichnis>] [--append|split] "
-"[--reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <Split-"
-"Optionen>"
-
-#: builtin/commit-graph.c:52
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "konnte Objekt-Verzeichnis nicht finden, dass '%s' entsprechen soll"
-
-#: builtin/commit-graph.c:68 builtin/commit-graph.c:125
-#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657
-msgid "dir"
-msgstr "Verzeichnis"
-
-#: builtin/commit-graph.c:69 builtin/commit-graph.c:126
-#: builtin/commit-graph.c:211
-msgid "The object directory to store the graph"
-msgstr "Das Objektverzeichnis zum Speichern des Graphen."
-
-#: builtin/commit-graph.c:71
-msgid "if the commit-graph is split, only verify the tip file"
-msgstr ""
-"Wenn der Commit-Graph aufgeteilt ist, nur die Datei an der Spitze überprüfen"
-
-#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23
-#, c-format
-msgid "Could not open commit-graph '%s'"
-msgstr "Konnte Commit-Graph '%s' nicht öffnen."
-
-#: builtin/commit-graph.c:128
-msgid "start walk at all refs"
-msgstr "Durchlauf auf allen Referenzen beginnen"
-
-#: builtin/commit-graph.c:130
-msgid "scan pack-indexes listed by stdin for commits"
-msgstr "durch Standard-Eingabe gelistete Pack-Indexe nach Commits scannen"
-
-#: builtin/commit-graph.c:132
-msgid "start walk at commits listed by stdin"
-msgstr "Lauf bei Commits beginnen, die über die Standard-Eingabe gelistet sind"
-
-#: builtin/commit-graph.c:134
-msgid "include all commits already in the commit-graph file"
-msgstr ""
-"alle Commits einschließen, die sich bereits in der Commit-Graph-Datei "
-"befinden"
-
-#: builtin/commit-graph.c:137
-msgid "allow writing an incremental commit-graph file"
-msgstr "Erlaube das Schreiben einer inkrementellen Commit-Graph-Datei"
-
-#: builtin/commit-graph.c:139 builtin/commit-graph.c:143
-msgid "maximum number of commits in a non-base split commit-graph"
-msgstr ""
-"Maximale Anzahl von Commits in einem aufgeteilten Commit-Graph ohne Basis"
-
-#: builtin/commit-graph.c:141
-msgid "maximum ratio between two levels of a split commit-graph"
-msgstr ""
-"Maximales Verhältnis zwischen zwei Ebenen eines aufgeteilten Commit-Graph"
-
-#: builtin/commit-graph.c:159
-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:104 builtin/env--helper.c:23
+#: builtin/config.c:109 builtin/env--helper.c:27
#, c-format
msgid "unrecognized --type argument, %s"
msgstr "nicht erkanntes --type Argument, %s"
-#: builtin/config.c:116
+#: builtin/config.c:121
msgid "only one type at a time"
msgstr "nur ein Typ erlaubt"
-#: builtin/config.c:125
+#: builtin/config.c:130
msgid "Config file location"
msgstr "Ort der Konfigurationsdatei"
-#: builtin/config.c:126
+#: builtin/config.c:131
msgid "use global config file"
msgstr "globale Konfigurationsdatei verwenden"
-#: builtin/config.c:127
+#: builtin/config.c:132
msgid "use system config file"
msgstr "systemweite Konfigurationsdatei verwenden"
-#: builtin/config.c:128
+#: builtin/config.c:133
msgid "use repository config file"
msgstr "Konfigurationsdatei des Repositories verwenden"
-#: builtin/config.c:129
+#: builtin/config.c:134
msgid "use per-worktree config file"
msgstr "Konfigurationsdatei pro Arbeitsverzeichnis verwenden"
-#: builtin/config.c:130
+#: builtin/config.c:135
msgid "use given config file"
msgstr "die angegebene Konfigurationsdatei verwenden"
-#: builtin/config.c:131
+#: builtin/config.c:136
msgid "blob-id"
msgstr "Blob-Id"
-#: builtin/config.c:131
+#: builtin/config.c:136
msgid "read config from given blob object"
msgstr "Konfiguration von angegebenem Blob-Objekt lesen"
-#: builtin/config.c:132
+#: builtin/config.c:137
msgid "Action"
msgstr "Aktion"
-#: builtin/config.c:133
-msgid "get value: name [value-regex]"
-msgstr "Wert zurückgeben: Name [Wert-regex]"
+#: builtin/config.c:138
+msgid "get value: name [value-pattern]"
+msgstr "Wert zurückgeben: Name [Wert-Muster]"
-#: builtin/config.c:134
-msgid "get all values: key [value-regex]"
-msgstr "alle Werte zurückgeben: Schlüssel [Wert-regex]"
+#: builtin/config.c:139
+msgid "get all values: key [value-pattern]"
+msgstr "alle Werte zurückgeben: Schlüssel [Wert-Muster]"
-#: builtin/config.c:135
-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:140
+msgid "get values for regexp: name-regex [value-pattern]"
+msgstr "Werte für den regulären Ausdruck zurückgeben: Name-Regex [Wert-Muster]"
-#: builtin/config.c:136
+#: builtin/config.c:141
msgid "get value specific for the URL: section[.var] URL"
msgstr "Wert spezifisch für eine URL zurückgeben: section[.var] URL"
-#: builtin/config.c:137
-msgid "replace all matching variables: name value [value_regex]"
-msgstr "alle passenden Variablen ersetzen: Name Wert [Wert-regex] "
+#: builtin/config.c:142
+msgid "replace all matching variables: name value [value-pattern]"
+msgstr "alle passenden Variablen ersetzen: Name Wert [Wert-Muster] "
-#: builtin/config.c:138
+#: builtin/config.c:143
msgid "add a new variable: name value"
msgstr "neue Variable hinzufügen: Name Wert"
-#: builtin/config.c:139
-msgid "remove a variable: name [value-regex]"
-msgstr "eine Variable entfernen: Name [Wert-regex]"
+#: builtin/config.c:144
+msgid "remove a variable: name [value-pattern]"
+msgstr "eine Variable entfernen: Name [Wert-Muster]"
-#: builtin/config.c:140
-msgid "remove all matches: name [value-regex]"
-msgstr "alle Übereinstimmungen entfernen: Name [Wert-regex]"
+#: builtin/config.c:145
+msgid "remove all matches: name [value-pattern]"
+msgstr "alle Übereinstimmungen entfernen: Name [Wert-Muster]"
-#: builtin/config.c:141
+#: builtin/config.c:146
msgid "rename section: old-name new-name"
msgstr "eine Sektion umbenennen: alter-Name neuer-Name"
-#: builtin/config.c:142
+#: builtin/config.c:147
msgid "remove a section: name"
msgstr "eine Sektion entfernen: Name"
-#: builtin/config.c:143
+#: builtin/config.c:148
msgid "list all"
msgstr "alles auflisten"
-#: builtin/config.c:144
+#: builtin/config.c:149
+msgid "use string equality when comparing values to 'value-pattern'"
+msgstr ""
+"nutze String-Gleichheit beim Vergleich von Werten mit dem 'Wert-Muster'"
+
+#: builtin/config.c:150
msgid "open an editor"
msgstr "einen Editor öffnen"
-#: builtin/config.c:145
+#: builtin/config.c:151
msgid "find the color configured: slot [default]"
msgstr "die konfigurierte Farbe finden: Slot [Standard]"
-#: builtin/config.c:146
+#: builtin/config.c:152
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "die Farbeinstellung finden: Slot [Standard-Ausgabe-ist-Terminal]"
-#: builtin/config.c:147
+#: builtin/config.c:153
msgid "Type"
msgstr "Typ"
-#: builtin/config.c:148 builtin/env--helper.c:38
+#: builtin/config.c:154 builtin/env--helper.c:43
msgid "value is given this type"
msgstr "Wert ist mit diesem Typ angegeben"
-#: builtin/config.c:149
+#: builtin/config.c:155
msgid "value is \"true\" or \"false\""
msgstr "Wert ist \"true\" oder \"false\""
-#: builtin/config.c:150
+#: builtin/config.c:156
msgid "value is decimal number"
msgstr "Wert ist eine Dezimalzahl"
-#: builtin/config.c:151
+#: builtin/config.c:157
msgid "value is --bool or --int"
msgstr "Wert ist --bool oder --int"
-#: builtin/config.c:152
+#: builtin/config.c:158
+msgid "value is --bool or string"
+msgstr "Wert ist --bool oder string"
+
+#: builtin/config.c:159
msgid "value is a path (file or directory name)"
msgstr "Wert ist ein Pfad (Datei oder Verzeichnisname)"
-#: builtin/config.c:153
+#: builtin/config.c:160
msgid "value is an expiry date"
msgstr "Wert ist ein Verfallsdatum"
-#: builtin/config.c:154
+#: builtin/config.c:161
msgid "Other"
msgstr "Sonstiges"
-#: builtin/config.c:155
+#: builtin/config.c:162
msgid "terminate values with NUL byte"
msgstr "schließt Werte mit NUL-Byte ab"
-#: builtin/config.c:156
+#: builtin/config.c:163
msgid "show variable names only"
msgstr "nur Variablennamen anzeigen"
-#: builtin/config.c:157
+#: builtin/config.c:164
msgid "respect include directives on lookup"
msgstr "beachtet \"include\"-Direktiven beim Nachschlagen"
-#: builtin/config.c:158
+#: builtin/config.c:165
msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
"Ursprung der Konfiguration anzeigen (Datei, Standard-Eingabe, Blob, "
"Befehlszeile)"
-#: builtin/config.c:159
+#: builtin/config.c:166
msgid "show scope of config (worktree, local, global, system, command)"
msgstr ""
"Zeige Geltungsbereich der Konfiguration (Arbeitsverzeichnis, lokal, global, "
"systemweit, Befehl)"
-#: builtin/config.c:160 builtin/env--helper.c:40
+#: builtin/config.c:167 builtin/env--helper.c:45
msgid "value"
msgstr "Wert"
-#: builtin/config.c:160
+#: builtin/config.c:167
msgid "with --get, use default value when missing entry"
msgstr "mit --get, benutze den Standardwert, wenn der Eintrag fehlt"
-#: builtin/config.c:174
+#: builtin/config.c:181
#, c-format
msgid "wrong number of arguments, should be %d"
msgstr "Falsche Anzahl von Argumenten - sollte %d sein."
-#: builtin/config.c:176
+#: builtin/config.c:183
#, 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:324
+#: builtin/config.c:339
#, c-format
msgid "invalid key pattern: %s"
msgstr "Ungültiges Schlüsselmuster: %s"
-#: builtin/config.c:360
+#: builtin/config.c:377
#, c-format
msgid "failed to format default config value: %s"
msgstr "Fehler beim Formatieren des Standardkonfigurationswertes: %s"
-#: builtin/config.c:417
+#: builtin/config.c:441
#, c-format
msgid "cannot parse color '%s'"
-msgstr "Kann Farbe '%s' nicht parsen."
+msgstr "kann Farbe '%s' nicht parsen"
-#: builtin/config.c:459
+#: builtin/config.c:483
msgid "unable to parse default color value"
msgstr "konnte Standard-Farbwert nicht parsen"
-#: builtin/config.c:512 builtin/config.c:768
+#: builtin/config.c:536 builtin/config.c:833
msgid "not in a git directory"
-msgstr "Nicht in einem Git-Repository."
+msgstr "nicht in einem Git-Repository"
-#: builtin/config.c:515
+#: builtin/config.c:539
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:518
+#: builtin/config.c:542
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:603
+#: builtin/config.c:627
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -13406,29 +14254,33 @@
"#\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:627
+#: builtin/config.c:652
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:632
+#: builtin/config.c:658
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:635
+#: builtin/config.c:660
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:655
+#: builtin/config.c:662
+msgid "--worktree can only be used inside a git repository"
+msgstr "--worktree kann nur innerhalb eines Git-Repositories verwendet werden"
+
+#: builtin/config.c:684
msgid "$HOME not set"
-msgstr "$HOME nicht gesetzt."
+msgstr "$HOME nicht gesetzt"
-#: builtin/config.c:679
+#: builtin/config.c:708
msgid ""
"--worktree cannot be used with multiple working trees unless the config\n"
"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -13439,52 +14291,56 @@
"lesen Sie die Sektion \"CONFIGURATION_FILE\" in \"git help worktree\" für "
"Details"
-#: builtin/config.c:714
+#: builtin/config.c:743
msgid "--get-color and variable type are incoherent"
msgstr "Angabe von --get-color und Variablentyp sind ungültig."
-#: builtin/config.c:719
+#: builtin/config.c:748
msgid "only one action at a time"
msgstr "Nur eine Aktion erlaubt."
-#: builtin/config.c:732
+#: builtin/config.c:761
msgid "--name-only is only applicable to --list or --get-regexp"
msgstr "--name-only ist nur anwendbar auf --list oder --get-regexp"
-#: builtin/config.c:738
+#: builtin/config.c:767
msgid ""
"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
"list"
msgstr ""
"--show-origin ist nur anwendbar auf --get, --get-all, --get-regexp und --list"
-#: builtin/config.c:744
+#: builtin/config.c:773
msgid "--default is only applicable to --get"
msgstr "--default ist nur anwendbar auf --get"
-#: builtin/config.c:757
+#: builtin/config.c:806
+msgid "--fixed-value only applies with 'value-pattern'"
+msgstr "--fixed-value wird nur zusammen mit 'Wert-Muster' angewendet"
+
+#: builtin/config.c:822
#, c-format
msgid "unable to read config file '%s'"
msgstr "Konnte Konfigurationsdatei '%s' nicht lesen."
-#: builtin/config.c:760
+#: builtin/config.c:825
msgid "error processing config file(s)"
msgstr "Fehler beim Verarbeiten der Konfigurationsdatei(en)."
-#: builtin/config.c:770
+#: builtin/config.c:835
msgid "editing stdin is not supported"
msgstr "Das Bearbeiten der Standard-Eingabe wird nicht unterstützt."
-#: builtin/config.c:772
+#: builtin/config.c:837
msgid "editing blobs is not supported"
msgstr "Das Bearbeiten von Blobs wird nicht unterstützt."
-#: builtin/config.c:786
+#: builtin/config.c:851
#, c-format
msgid "cannot create configuration file %s"
msgstr "Konnte Konfigurationsdatei '%s' nicht erstellen."
-#: builtin/config.c:799
+#: builtin/config.c:864
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -13494,10 +14350,10 @@
" Benutzen Sie einen regulären Ausdruck, --add oder --replace, um %s\n"
" zu ändern."
-#: builtin/config.c:873 builtin/config.c:884
+#: builtin/config.c:943 builtin/config.c:954
#, c-format
msgid "no such section: %s"
-msgstr "Keine solche Sektion: %s"
+msgstr "Sektion nicht gefunden: %s"
#: builtin/count-objects.c:90
msgid "git count-objects [-v] [-H | --human-readable]"
@@ -13507,6 +14363,40 @@
msgid "print sizes in human readable format"
msgstr "gibt Größenangaben in menschenlesbaren Format aus"
+#: 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/credential-store.c:66
+#, c-format
+msgid "unable to get credential storage lock in %d ms"
+msgstr "konnte Sperre für Zugangsdatenspeicher nicht in %d ms bekommen"
+
#: builtin/describe.c:26
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<Optionen>] [<Commit-Angabe>...]"
@@ -13515,51 +14405,46 @@
msgid "git describe [<options>] --dirty"
msgstr "git describe [<Optionen>] --dirty"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "head"
msgstr "Branch"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "lightweight"
msgstr "nicht-annotiert"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "annotated"
msgstr "annotiert"
-#: builtin/describe.c:275
+#: builtin/describe.c:277
#, c-format
msgid "annotated tag %s not available"
msgstr "annotiertes Tag %s ist nicht verfügbar"
-#: builtin/describe.c:279
-#, c-format
-msgid "annotated tag %s has no embedded name"
-msgstr "annotiertes Tag %s hat keinen eingebetteten Namen"
-
#: builtin/describe.c:281
#, c-format
-msgid "tag '%s' is really '%s' here"
-msgstr "Tag '%s' ist eigentlich '%s' hier"
+msgid "tag '%s' is externally known as '%s'"
+msgstr "Tag '%s' ist extern bekannt als '%s'"
-#: builtin/describe.c:325
+#: builtin/describe.c:328
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "kein Tag entspricht exakt '%s'"
-#: builtin/describe.c:327
+#: 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:394
+#: builtin/describe.c:397
#, c-format
msgid "finished search at %s\n"
msgstr "beendete Suche bei %s\n"
-#: builtin/describe.c:421
+#: builtin/describe.c:424
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -13568,7 +14453,7 @@
"Keine annotierten Tags können '%s' beschreiben.\n"
"Jedoch gab es nicht-annotierte Tags: versuchen Sie --tags."
-#: builtin/describe.c:425
+#: builtin/describe.c:428
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -13577,12 +14462,12 @@
"Keine Tags können '%s' beschreiben.\n"
"Versuchen Sie --always oder erstellen Sie einige Tags."
-#: builtin/describe.c:455
+#: builtin/describe.c:458
#, c-format
msgid "traversed %lu commits\n"
msgstr "%lu Commits durchlaufen\n"
-#: builtin/describe.c:458
+#: builtin/describe.c:461
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -13591,125 +14476,143 @@
"mehr als %i Tags gefunden; führe die ersten %i auf\n"
"Suche bei %s aufgegeben\n"
-#: builtin/describe.c:526
+#: builtin/describe.c:529
#, c-format
msgid "describe %s\n"
msgstr "Beschreibe %s\n"
-#: builtin/describe.c:529
+#: builtin/describe.c:532
#, c-format
msgid "Not a valid object name %s"
msgstr "%s ist kein gültiger Objekt-Name"
-#: builtin/describe.c:537
+#: 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:551
+#: 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:552
+#: builtin/describe.c:555
msgid "debug search strategy on stderr"
msgstr "die Suchstrategie in der Standard-Fehlerausgabe protokollieren"
-#: builtin/describe.c:553
+#: builtin/describe.c:556
msgid "use any ref"
msgstr "alle Referenzen verwenden"
-#: builtin/describe.c:554
+#: builtin/describe.c:557
msgid "use any tag, even unannotated"
msgstr "jedes Tag verwenden, auch nicht-annotierte"
-#: builtin/describe.c:555
+#: builtin/describe.c:558
msgid "always use long format"
msgstr "immer langes Format verwenden"
-#: builtin/describe.c:556
+#: builtin/describe.c:559
msgid "only follow first parent"
msgstr "nur erstem Elternteil folgen"
-#: builtin/describe.c:559
+#: builtin/describe.c:562
msgid "only output exact matches"
msgstr "nur exakte Übereinstimmungen ausgeben"
-#: builtin/describe.c:561
+#: builtin/describe.c:564
msgid "consider <n> most recent tags (default: 10)"
msgstr "die jüngsten <n> Tags betrachten (Standard: 10)"
-#: builtin/describe.c:563
+#: builtin/describe.c:566
msgid "only consider tags matching <pattern>"
msgstr "nur Tags, die <Muster> entsprechen, betrachten"
-#: builtin/describe.c:565
+#: builtin/describe.c:568
msgid "do not consider tags matching <pattern>"
msgstr "keine Tags betrachten, die <Muster> entsprechen"
-#: builtin/describe.c:567 builtin/name-rev.c:535
+#: builtin/describe.c: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:568 builtin/describe.c:571
+#: builtin/describe.c:571 builtin/describe.c:574
msgid "mark"
msgstr "Markierung"
-#: builtin/describe.c:569
+#: builtin/describe.c:572
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr ""
"<Markierung> bei geändertem Arbeitsverzeichnis anhängen (Standard: \"-dirty"
"\")"
-#: builtin/describe.c:572
+#: builtin/describe.c:575
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr ""
"<Markierung> bei defektem Arbeitsverzeichnis anhängen (Standard: \"-broken\")"
-#: builtin/describe.c:590
+#: builtin/describe.c:593
msgid "--long is incompatible with --abbrev=0"
-msgstr "Die Optionen --long und --abbrev=0 sind inkompatibel."
+msgstr "--long und --abbrev=0 sind inkompatibel"
-#: builtin/describe.c:619
+#: builtin/describe.c:622
msgid "No names found, cannot describe anything."
msgstr "Keine Namen gefunden, kann nichts beschreiben."
-#: builtin/describe.c:670
+#: builtin/describe.c:673
msgid "--dirty is incompatible with commit-ishes"
-msgstr "Die Option --dirty kann nicht mit Commits verwendet werden."
+msgstr "--dirty kann nicht mit Commits verwendet werden"
-#: builtin/describe.c:672
+#: builtin/describe.c:675
msgid "--broken is incompatible with commit-ishes"
-msgstr "Die Option --broken kann nicht mit Commits verwendet werden."
+msgstr "--broken kann nicht mit Commits verwendet werden"
-#: builtin/diff.c:84
+#: builtin/diff-tree.c:155
+msgid "--stdin and --merge-base are mutually exclusive"
+msgstr "--stdin und --merge-base schließen sich gegenseitig aus"
+
+#: builtin/diff-tree.c:157
+msgid "--merge-base only works with two commits"
+msgstr "--merge-base funktioniert nur mit zwei Commits"
+
+#: builtin/diff.c:92
#, 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:259
#, c-format
msgid "invalid option: %s"
msgstr "Ungültige Option: %s"
-#: builtin/diff.c:350
+#: builtin/diff.c:376
+#, c-format
+msgid "%s...%s: no merge base"
+msgstr "%s...%s: keine Merge-Basis"
+
+#: builtin/diff.c:486
msgid "Not a git repository"
msgstr "Kein Git-Repository"
-#: builtin/diff.c:394
+#: builtin/diff.c:532 builtin/grep.c:682
#, c-format
msgid "invalid object '%s' given."
msgstr "Objekt '%s' ist ungültig."
-#: builtin/diff.c:403
+#: builtin/diff.c:543
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "Mehr als zwei Blobs angegeben: '%s'"
-#: builtin/diff.c:408
+#: builtin/diff.c:548
#, c-format
msgid "unhandled object '%s' given."
msgstr "unbehandeltes Objekt '%s' angegeben"
+#: builtin/diff.c:582
+#, 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>...]"
@@ -13734,7 +14637,7 @@
msgid "could not read object %s for symlink %s"
msgstr "Konnte Objekt '%s' für symbolische Verknüpfung '%s' nicht lesen."
-#: builtin/difftool.c:413
+#: builtin/difftool.c:412
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
@@ -13742,54 +14645,54 @@
"Kombinierte Diff-Formate('-c' und '--cc') werden im Verzeichnis-\n"
"Diff-Modus('-d' und '--dir-diff') nicht unterstützt."
-#: builtin/difftool.c:634
+#: builtin/difftool.c:633
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "beide Dateien geändert: '%s' und '%s'."
-#: builtin/difftool.c:636
+#: builtin/difftool.c:635
msgid "working tree file has been left."
msgstr "Datei im Arbeitsverzeichnis belassen."
-#: builtin/difftool.c:647
+#: builtin/difftool.c:646
#, c-format
msgid "temporary files exist in '%s'."
msgstr "Es existieren temporäre Dateien in '%s'."
-#: builtin/difftool.c:648
+#: builtin/difftool.c:647
msgid "you may want to cleanup or recover these."
msgstr "Sie könnten diese aufräumen oder wiederherstellen."
-#: builtin/difftool.c:697
+#: builtin/difftool.c:696
msgid "use `diff.guitool` instead of `diff.tool`"
-msgstr "`diff.guitool` anstatt `diff.tool` benutzen"
+msgstr "`diff.guitool` statt `diff.tool` benutzen"
-#: builtin/difftool.c:699
+#: builtin/difftool.c:698
msgid "perform a full-directory diff"
msgstr "Diff über ganzes Verzeichnis ausführen"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:700
msgid "do not prompt before launching a diff tool"
msgstr "keine Eingabeaufforderung vor Ausführung eines Diff-Tools"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:705
msgid "use symlinks in dir-diff mode"
msgstr "symbolische Verknüpfungen im dir-diff Modus verwenden"
-#: builtin/difftool.c:707
+#: builtin/difftool.c:706
msgid "tool"
msgstr "Tool"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:707
msgid "use the specified diff tool"
msgstr "das angegebene Diff-Tool benutzen"
-#: builtin/difftool.c:710
+#: builtin/difftool.c:709
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
"eine Liste mit Diff-Tools darstellen, die mit `--tool` benutzt werden können"
-#: builtin/difftool.c:713
+#: builtin/difftool.c:712
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
@@ -13798,31 +14701,31 @@
"Rückkehrwert\n"
"verschieden 0 ausgeführt wurde"
-#: builtin/difftool.c:716
+#: builtin/difftool.c:715
msgid "specify a custom command for viewing diffs"
msgstr "eigenen Befehl zur Anzeige von Unterschieden angeben"
-#: builtin/difftool.c:717
+#: builtin/difftool.c:716
msgid "passed to `diff`"
msgstr "an 'diff' übergeben"
-#: builtin/difftool.c:732
+#: builtin/difftool.c:731
msgid "difftool requires worktree or --no-index"
msgstr "difftool benötigt Arbeitsverzeichnis oder --no-index"
-#: builtin/difftool.c:739
+#: builtin/difftool.c:738
msgid "--dir-diff is incompatible with --no-index"
msgstr "--dir-diff kann nicht mit --no-index verwendet werden"
-#: builtin/difftool.c:742
+#: builtin/difftool.c:741
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr "--gui, --tool und --extcmd schließen sich gegenseitig aus"
-#: builtin/difftool.c:750
+#: builtin/difftool.c:749
msgid "no <tool> given for --tool=<tool>"
msgstr "kein <Tool> für --tool=<Tool> angegeben"
-#: builtin/difftool.c:757
+#: builtin/difftool.c:756
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "kein <Programm> für --extcmd=<Programm> angegeben"
@@ -13830,26 +14733,26 @@
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 `"
@@ -13862,194 +14765,253 @@
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-opts]"
-#: builtin/fast-export.c:853
+#: 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:1152
+#: builtin/fast-export.c:1177
+msgid "--anonymize-map token cannot be empty"
+msgstr "Token für --anonymize-map kann nicht leer sein"
+
+#: builtin/fast-export.c:1197
msgid "show progress after <n> objects"
msgstr "Fortschritt nach <n> Objekten anzeigen"
-#: builtin/fast-export.c:1154
+#: builtin/fast-export.c:1199
msgid "select handling of signed tags"
msgstr "Behandlung von signierten Tags wählen"
-#: builtin/fast-export.c:1157
+#: builtin/fast-export.c:1202
msgid "select handling of tags that tag filtered objects"
msgstr "Behandlung von Tags wählen, die gefilterte Objekte markieren"
-#: builtin/fast-export.c:1160
+#: builtin/fast-export.c:1205
msgid "select handling of commit messages in an alternate encoding"
msgstr ""
"Auswählen der Behandlung von Commit-Beschreibungen bei wechselndem Encoding"
-#: builtin/fast-export.c:1163
-msgid "Dump marks to this file"
+#: builtin/fast-export.c:1208
+msgid "dump marks to this file"
msgstr "Markierungen in diese Datei schreiben"
-#: builtin/fast-export.c:1165
-msgid "Import marks from this file"
+#: builtin/fast-export.c:1210
+msgid "import marks from this file"
msgstr "Markierungen von dieser Datei importieren"
-#: builtin/fast-export.c:1169
-msgid "Import marks from this file if it exists"
+#: builtin/fast-export.c:1214
+msgid "import marks from this file if it exists"
msgstr "Markierungen von dieser Datei importieren, wenn diese existiert"
-#: builtin/fast-export.c:1171
-msgid "Fake a tagger when tags lack one"
-msgstr "künstlich einen Tag-Ersteller erzeugen, wenn das Tag keinen hat"
+#: builtin/fast-export.c:1216
+msgid "fake a tagger when tags lack one"
+msgstr "einen Tag-Ersteller vortäuschen, wenn das Tag keinen hat"
-#: builtin/fast-export.c:1173
-msgid "Output full tree for each commit"
+#: builtin/fast-export.c:1218
+msgid "output full tree for each commit"
msgstr "für jeden Commit das gesamte Verzeichnis ausgeben"
-#: builtin/fast-export.c:1175
-msgid "Use the done feature to terminate the stream"
+#: builtin/fast-export.c:1220
+msgid "use the done feature to terminate the stream"
msgstr "die \"done\"-Funktion benutzen, um den Datenstrom abzuschließen"
-#: builtin/fast-export.c:1176
-msgid "Skip output of blob data"
+#: builtin/fast-export.c:1221
+msgid "skip output of blob data"
msgstr "Ausgabe von Blob-Daten überspringen"
-#: builtin/fast-export.c:1177 builtin/log.c:1705
+#: builtin/fast-export.c:1222 builtin/log.c:1815
msgid "refspec"
msgstr "Refspec"
-#: builtin/fast-export.c:1178
-msgid "Apply refspec to exported refs"
+#: builtin/fast-export.c:1223
+msgid "apply refspec to exported refs"
msgstr "Refspec auf exportierte Referenzen anwenden"
-#: builtin/fast-export.c:1179
+#: builtin/fast-export.c:1224
msgid "anonymize output"
msgstr "Ausgabe anonymisieren"
-#: builtin/fast-export.c:1181
-msgid "Reference parents which are not in fast-export stream by object id"
+#: builtin/fast-export.c:1225
+msgid "from:to"
+msgstr "von:nach"
+
+#: builtin/fast-export.c:1226
+msgid "convert <from> to <to> in anonymized output"
+msgstr "konvertiere <von> zu <nach> in anonymisierter Ausgabe"
+
+#: builtin/fast-export.c:1229
+msgid "reference parents which are not in fast-export stream by object id"
msgstr ""
"Eltern, die nicht im Fast-Export-Stream sind, anhand ihrer Objekt-ID "
"referenzieren"
-#: builtin/fast-export.c:1183
-msgid "Show original object ids of blobs/commits"
+#: builtin/fast-export.c:1231
+msgid "show original object ids of blobs/commits"
msgstr "originale Objekt-IDs von Blobs/Commits anzeigen"
-#: builtin/fast-export.c:1185
-msgid "Label tags with mark ids"
+#: builtin/fast-export.c:1233
+msgid "label tags with mark ids"
msgstr "Tags mit Markierungs-IDs beschriften"
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1256
+msgid "--anonymize-map without --anonymize does not make sense"
+msgstr "--anonymize-map ohne --anonymize ist nicht sinnvoll"
+
+#: builtin/fast-export.c:1271
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
msgstr ""
"--import-marks und --import-marks-if-exists können nicht zusammen "
"weitergegeben werden"
-#: builtin/fetch.c:34
+#: builtin/fast-import.c:3088
+#, c-format
+msgid "Missing from marks for submodule '%s'"
+msgstr "Fehlende 'from'-Markierungen für Submodul '%s'"
+
+#: builtin/fast-import.c:3090
+#, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr "Fehlende 'to'-Markierungen für Submodul '%s'"
+
+#: builtin/fast-import.c:3225
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr "'mark' Befehl erwartet, '%s' bekommen"
+
+#: builtin/fast-import.c:3230
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr "'to' Befehl erwartet, '%s' bekommen"
+
+#: builtin/fast-import.c:3322
+msgid "Expected format name:filename for submodule rewrite option"
+msgstr "Format 'Name:Dateiname' für Submodul-Rewrite-Option erwartet"
+
+#: builtin/fast-import.c:3377
+#, 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:242
+#, 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:35
+#: builtin/fetch.c:36
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<Optionen>] <Gruppe>"
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<Optionen>] [(<Repository> | <Gruppe>)...]"
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<Optionen>]"
-#: builtin/fetch.c:116
+#: builtin/fetch.c:120
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel kann nicht negativ sein"
-#: builtin/fetch.c:139 builtin/pull.c:184
+#: builtin/fetch.c:143 builtin/pull.c:185
msgid "fetch from all remotes"
msgstr "fordert von allen Remote-Repositories an"
-#: builtin/fetch.c:141 builtin/pull.c:228
+#: builtin/fetch.c:145 builtin/pull.c:245
msgid "set upstream for git pull/fetch"
msgstr "Upstream für \"git pull/fetch\" setzen"
-#: builtin/fetch.c:143 builtin/pull.c:187
+#: builtin/fetch.c:147 builtin/pull.c:188
msgid "append to .git/FETCH_HEAD instead of overwriting"
-msgstr "an .git/FETCH_HEAD anhängen, anstatt zu überschreiben"
+msgstr "an .git/FETCH_HEAD anhängen statt zu überschreiben"
-#: builtin/fetch.c:145 builtin/pull.c:190
+#: builtin/fetch.c:149
+msgid "use atomic transaction to update references"
+msgstr "atomare Transaktionen nutzen, um Referenzen zu aktualisieren"
+
+#: builtin/fetch.c:151 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:146
+#: builtin/fetch.c:152
msgid "force overwrite of local reference"
msgstr "das Überschreiben einer lokalen Referenz erzwingen"
-#: builtin/fetch.c:148
+#: builtin/fetch.c:154
msgid "fetch from multiple remotes"
msgstr "von mehreren Remote-Repositories anfordern"
-#: builtin/fetch.c:150 builtin/pull.c:194
+#: builtin/fetch.c:156 builtin/pull.c:195
msgid "fetch all tags and associated objects"
msgstr "alle Tags und verbundene Objekte anfordern"
-#: builtin/fetch.c:152
+#: builtin/fetch.c:158
msgid "do not fetch all tags (--no-tags)"
msgstr "nicht alle Tags anfordern (--no-tags)"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:160
msgid "number of submodules fetched in parallel"
msgstr "Anzahl der parallel anzufordernden Submodule"
-#: builtin/fetch.c:156 builtin/pull.c:197
+#: builtin/fetch.c:162 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:158
+#: builtin/fetch.c:164
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
"lokale Tags entfernen, die sich nicht mehr im Remote-Repository befinden, "
"und geänderte Tags aktualisieren"
-#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121
+#: builtin/fetch.c:165 builtin/fetch.c:190 builtin/pull.c:122
msgid "on-demand"
msgstr "bei-Bedarf"
-#: builtin/fetch.c:160
+#: builtin/fetch.c:166
msgid "control recursive fetching of submodules"
msgstr "rekursive Anforderungen von Submodulen kontrollieren"
-#: builtin/fetch.c:164 builtin/pull.c:205
+#: builtin/fetch.c:171
+msgid "write fetched references to the FETCH_HEAD file"
+msgstr "schreibe angeforderte Referenzen in die FETCH_HEAD-Datei"
+
+#: builtin/fetch.c:172 builtin/pull.c:206
msgid "keep downloaded pack"
msgstr "heruntergeladenes Paket behalten"
-#: builtin/fetch.c:166
+#: builtin/fetch.c:174
msgid "allow updating of HEAD ref"
msgstr "Aktualisierung der \"HEAD\"-Referenz erlauben"
-#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208
+#: builtin/fetch.c:177 builtin/fetch.c:183 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:171
+#: builtin/fetch.c:179 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:177 builtin/pull.c:211
+#: builtin/fetch.c:185 builtin/pull.c:221
msgid "convert to a complete repository"
msgstr "zu einem vollständigen Repository konvertieren"
-#: builtin/fetch.c:180
+#: builtin/fetch.c:188
msgid "prepend this to submodule path output"
msgstr "dies an die Ausgabe der Submodul-Pfade voranstellen"
-#: builtin/fetch.c:183
+#: builtin/fetch.c:191
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
@@ -14057,96 +15019,100 @@
"Standard für die rekursive Anforderung von Submodulen (geringere Priorität\n"
"als Konfigurationsdateien)"
-#: builtin/fetch.c:187 builtin/pull.c:214
+#: builtin/fetch.c:195 builtin/pull.c:224
msgid "accept refs that update .git/shallow"
msgstr "Referenzen, die .git/shallow aktualisieren, akzeptieren"
-#: builtin/fetch.c:188 builtin/pull.c:216
+#: builtin/fetch.c:196 builtin/pull.c:226
msgid "refmap"
msgstr "Refmap"
-#: builtin/fetch.c:189 builtin/pull.c:217
+#: builtin/fetch.c:197 builtin/pull.c:227
msgid "specify fetch refmap"
msgstr "Refmap für 'fetch' angeben"
-#: builtin/fetch.c:196
+#: builtin/fetch.c:204 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:199
-msgid "run 'gc --auto' after fetching"
-msgstr "Führe 'gc --auto' nach \"fetch\" aus"
+#: builtin/fetch.c:207 builtin/fetch.c:209
+msgid "run 'maintenance --auto' after fetching"
+msgstr "führe 'maintenance --auto' nach \"fetch\" aus"
-#: builtin/fetch.c:201 builtin/pull.c:226
+#: builtin/fetch.c:211 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:203
+#: builtin/fetch.c:213
msgid "write the commit-graph after fetching"
msgstr "Schreibe den Commit-Graph nach \"fetch\""
-#: builtin/fetch.c:513
+#: builtin/fetch.c:215
+msgid "accept refspecs from stdin"
+msgstr "akzeptiere Refspecs von der Standard-Eingabe"
+
+#: builtin/fetch.c:526
msgid "Couldn't find remote ref HEAD"
msgstr "Konnte Remote-Referenz von HEAD nicht finden."
-#: builtin/fetch.c:653
+#: builtin/fetch.c:697
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "Konfiguration fetch.output enthält ungültigen Wert %s"
-#: builtin/fetch.c:751
+#: builtin/fetch.c:796
#, c-format
msgid "object %s not found"
msgstr "Objekt %s nicht gefunden"
-#: builtin/fetch.c:755
+#: builtin/fetch.c:800
msgid "[up to date]"
msgstr "[aktuell]"
-#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
+#: builtin/fetch.c:813 builtin/fetch.c:829 builtin/fetch.c:901
msgid "[rejected]"
msgstr "[zurückgewiesen]"
-#: builtin/fetch.c:769
+#: builtin/fetch.c:814
msgid "can't fetch in current branch"
msgstr "kann \"fetch\" im aktuellen Branch nicht ausführen"
-#: builtin/fetch.c:779
+#: builtin/fetch.c:824
msgid "[tag update]"
msgstr "[Tag Aktualisierung]"
-#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839
-#: builtin/fetch.c:851
+#: builtin/fetch.c:825 builtin/fetch.c:862 builtin/fetch.c:884
+#: builtin/fetch.c:896
msgid "unable to update local ref"
msgstr "kann lokale Referenz nicht aktualisieren"
-#: builtin/fetch.c:784
+#: builtin/fetch.c:829
msgid "would clobber existing tag"
msgstr "würde bestehende Tags verändern"
-#: builtin/fetch.c:806
+#: builtin/fetch.c:851
msgid "[new tag]"
msgstr "[neues Tag]"
-#: builtin/fetch.c:809
+#: builtin/fetch.c:854
msgid "[new branch]"
msgstr "[neuer Branch]"
-#: builtin/fetch.c:812
+#: builtin/fetch.c:857
msgid "[new ref]"
msgstr "[neue Referenz]"
-#: builtin/fetch.c:851
+#: builtin/fetch.c:896
msgid "forced update"
msgstr "Aktualisierung erzwungen"
-#: builtin/fetch.c:856
+#: builtin/fetch.c:901
msgid "non-fast-forward"
msgstr "kein Vorspulen"
-#: builtin/fetch.c:877
+#: builtin/fetch.c:1005
msgid ""
"Fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
@@ -14157,7 +15123,7 @@
"aktivieren, nutzen Sie die Option '--show-forced-updated' oder führen\n"
"Sie 'git config fetch.showForcedUpdates true' aus."
-#: builtin/fetch.c:881
+#: builtin/fetch.c:1009
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
@@ -14170,12 +15136,12 @@
"'git config fetch.showForcedUpdates false' ausführen, um diese Überprüfung\n"
"zu umgehen.\n"
-#: builtin/fetch.c:920
+#: builtin/fetch.c:1041
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s hat nicht alle erforderlichen Objekte gesendet\n"
-#: builtin/fetch.c:941
+#: builtin/fetch.c:1069
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
@@ -14183,12 +15149,12 @@
"unvollständiger\n"
"Historie (shallow) nicht aktualisiert werden dürfen."
-#: builtin/fetch.c:1026 builtin/fetch.c:1164
+#: builtin/fetch.c:1146 builtin/fetch.c:1297
#, c-format
msgid "From %.*s\n"
msgstr "Von %.*s\n"
-#: builtin/fetch.c:1037
+#: builtin/fetch.c:1168
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -14197,58 +15163,58 @@
"Einige lokale Referenzen konnten nicht aktualisiert werden; versuchen Sie\n"
"'git remote prune %s', um jeden älteren, widersprüchlichen Branch zu löschen."
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1267
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s wird unreferenziert)"
-#: builtin/fetch.c:1135
+#: builtin/fetch.c:1268
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s wurde unreferenziert)"
-#: builtin/fetch.c:1167
+#: builtin/fetch.c:1300
msgid "[deleted]"
msgstr "[gelöscht]"
-#: builtin/fetch.c:1168 builtin/remote.c:1112
+#: builtin/fetch.c:1301 builtin/remote.c:1118
msgid "(none)"
msgstr "(nichts)"
-#: builtin/fetch.c:1191
+#: builtin/fetch.c:1324
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
"Der \"fetch\" in den aktuellen Branch %s von einem Nicht-Bare-Repository "
"wurde verweigert."
-#: builtin/fetch.c:1210
+#: builtin/fetch.c:1343
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Option \"%s\" Wert \"%s\" ist nicht gültig für %s"
-#: builtin/fetch.c:1213
+#: builtin/fetch.c:1346
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Option \"%s\" wird ignoriert für %s\n"
-#: builtin/fetch.c:1421
+#: builtin/fetch.c:1558
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "Mehrere Branches erkannt, inkompatibel mit --set-upstream"
-#: builtin/fetch.c:1436
+#: builtin/fetch.c:1573
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "Setze keinen Upstream für einen entfernten Remote-Tracking-Branch."
-#: builtin/fetch.c:1438
+#: builtin/fetch.c:1575
msgid "not setting upstream for a remote tag"
msgstr "Setze keinen Upstream für einen Tag eines Remote-Repositories."
-#: builtin/fetch.c:1440
+#: builtin/fetch.c:1577
msgid "unknown branch type"
msgstr "Unbekannter Branch-Typ"
-#: builtin/fetch.c:1442
+#: builtin/fetch.c:1579
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
@@ -14256,22 +15222,22 @@
"Keinen Quell-Branch gefunden.\n"
"Sie müssen bei der Option --set-upstream genau einen Branch angeben."
-#: builtin/fetch.c:1568 builtin/fetch.c:1631
+#: builtin/fetch.c:1708 builtin/fetch.c:1771
#, c-format
msgid "Fetching %s\n"
msgstr "Fordere an von %s\n"
-#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101
+#: builtin/fetch.c:1718 builtin/fetch.c:1773 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr "Konnte nicht von %s anfordern"
-#: builtin/fetch.c:1590
+#: builtin/fetch.c:1730
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "Konnte '%s' nicht anfordern (Exit-Code: %d)\n"
-#: builtin/fetch.c:1693
+#: builtin/fetch.c:1834
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -14280,80 +15246,91 @@
"oder den Namen des Remote-Repositories an, von welchem neue\n"
"Commits angefordert werden sollen."
-#: builtin/fetch.c:1730
+#: builtin/fetch.c:1870
msgid "You need to specify a tag name."
msgstr "Sie müssen den Namen des Tags angeben."
-#: builtin/fetch.c:1780
+#: builtin/fetch.c:1935
msgid "Negative depth in --deepen is not supported"
msgstr "Negative Tiefe wird von --deepen nicht unterstützt."
-#: builtin/fetch.c:1782
+#: builtin/fetch.c:1937
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen und --depth schließen sich gegenseitig aus"
-#: builtin/fetch.c:1787
+#: builtin/fetch.c:1942
msgid "--depth and --unshallow cannot be used together"
-msgstr ""
-"Die Optionen --depth und --unshallow können nicht gemeinsam verwendet werden."
+msgstr "--depth und --unshallow können nicht gemeinsam verwendet werden"
-#: builtin/fetch.c:1789
+#: builtin/fetch.c:1944
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."
+"--unshallow kann nicht in einem Repository mit vollständiger Historie "
+"verwendet werden"
-#: builtin/fetch.c:1805
+#: builtin/fetch.c:1961
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all akzeptiert kein Repository als Argument"
-#: builtin/fetch.c:1807
+#: builtin/fetch.c:1963
msgid "fetch --all does not make sense with refspecs"
-msgstr "fetch --all kann nicht mit Refspecs verwendet werden."
+msgstr "fetch --all kann nicht mit Refspecs verwendet werden"
-#: builtin/fetch.c:1816
+#: builtin/fetch.c:1972
#, c-format
msgid "No such remote or remote group: %s"
-msgstr "Kein Remote-Repository (einzeln oder Gruppe): %s"
+msgstr "Remote-Repository (einzeln oder Gruppe) nicht gefunden: %s"
-#: builtin/fetch.c:1823
+#: builtin/fetch.c:1979
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
"Das Abholen einer Gruppe von Remote-Repositories kann nicht mit der Angabe\n"
"von Refspecs verwendet werden."
-#: builtin/fetch.c:1841
+#: builtin/fetch.c:1997
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:2001
+msgid "--atomic can only be used when fetching from one remote"
+msgstr ""
+"--atomic kann nur verwendet werden, wenn nur von einem Remote-Repository "
+"abgefragt wird"
+
+#: builtin/fetch.c:2005
+msgid "--stdin can only be used when fetching from one remote"
+msgstr ""
+"--stdin kann nur verwendet werden, wenn nur von einem Remote-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:671
+#: 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:674
+#: builtin/fmt-merge-msg.c:21
msgid "alias for --log (deprecated)"
msgstr "Alias für --log (veraltet)"
-#: builtin/fmt-merge-msg.c:677
+#: builtin/fmt-merge-msg.c:24
msgid "text"
msgstr "Text"
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:25
msgid "use <text> as start of message"
msgstr "<Text> als Beschreibungsanfang verwenden"
-#: builtin/fmt-merge-msg.c:679
+#: builtin/fmt-merge-msg.c:26
msgid "file to read from"
msgstr "Datei zum Einlesen"
@@ -14366,8 +15343,8 @@
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>]]"
@@ -14393,7 +15370,7 @@
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:472
msgid "respect format colors"
msgstr "Formatfarben beachten"
@@ -14417,274 +15394,290 @@
msgid "print only refs which don't contain the commit"
msgstr "nur Referenzen ausgeben, die diesen Commit nicht enthalten"
-#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148
+#: builtin/for-each-repo.c:9
+msgid "git for-each-repo --config=<config> <command-args>"
+msgstr "git for-each-repo --config=<Konfiguration> <Befehlsargumente>"
+
+#: builtin/for-each-repo.c:37
+msgid "config"
+msgstr "Konfiguration"
+
+#: builtin/for-each-repo.c:38
+msgid "config key storing a list of repository paths"
+msgstr "Konfigurationsschlüssel für eine Liste von Repository-Pfaden"
+
+#: builtin/for-each-repo.c:46
+msgid "missing --config=<config>"
+msgstr "Option --config=<Konfiguration> fehlt"
+
+#: builtin/fsck.c:69 builtin/fsck.c:130 builtin/fsck.c:131
msgid "unknown"
msgstr "unbekannt"
#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:100 builtin/fsck.c:120
+#: builtin/fsck.c:83 builtin/fsck.c:103
#, c-format
msgid "error in %s %s: %s"
msgstr "Fehler in %s %s: %s"
#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:114
+#: builtin/fsck.c:97
#, c-format
msgid "warning in %s %s: %s"
msgstr "Warnung in %s %s: %s"
-#: builtin/fsck.c:143 builtin/fsck.c:146
+#: builtin/fsck.c:126 builtin/fsck.c:129
#, c-format
msgid "broken link from %7s %s"
-msgstr "Fehlerhafte Verknüpfung von %7s %s"
+msgstr "fehlerhafte Verknüpfung von %7s %s"
-#: builtin/fsck.c:155
+#: builtin/fsck.c:138
msgid "wrong object type in link"
-msgstr "Falscher Objekttyp in Verknüpfung."
+msgstr "falscher Objekttyp in Verknüpfung"
-#: builtin/fsck.c:171
+#: builtin/fsck.c:154
#, c-format
msgid ""
"broken link from %7s %s\n"
" to %7s %s"
msgstr ""
-"Fehlerhafte Verknüpfung von %7s %s\n"
+"fehlerhafte Verknüpfung von %7s %s\n"
" nach %7s %s"
-#: builtin/fsck.c:282
+#: builtin/fsck.c:265
#, c-format
msgid "missing %s %s"
msgstr "%s %s fehlt"
-#: builtin/fsck.c:309
+#: builtin/fsck.c:292
#, c-format
msgid "unreachable %s %s"
msgstr "%s %s nicht erreichbar"
-#: builtin/fsck.c:329
+#: builtin/fsck.c:312
#, c-format
msgid "dangling %s %s"
msgstr "%s %s unreferenziert"
-#: builtin/fsck.c:339
+#: builtin/fsck.c:322
msgid "could not create lost-found"
msgstr "Konnte lost-found nicht erstellen."
-#: builtin/fsck.c:350
+#: builtin/fsck.c:333
#, c-format
msgid "could not finish '%s'"
msgstr "Konnte '%s' nicht abschließen."
-#: builtin/fsck.c:367
+#: builtin/fsck.c:350
#, c-format
msgid "Checking %s"
msgstr "Prüfe %s"
-#: builtin/fsck.c:405
+#: builtin/fsck.c:388
#, c-format
msgid "Checking connectivity (%d objects)"
msgstr "Prüfe Konnektivität (%d Objekte)"
-#: builtin/fsck.c:424
+#: builtin/fsck.c:407
#, c-format
msgid "Checking %s %s"
msgstr "Prüfe %s %s"
-#: builtin/fsck.c:429
+#: builtin/fsck.c:412
msgid "broken links"
msgstr "Fehlerhafte Verknüpfungen"
-#: builtin/fsck.c:438
+#: builtin/fsck.c:421
#, c-format
msgid "root %s"
msgstr "Wurzel %s"
-#: builtin/fsck.c:446
+#: builtin/fsck.c:429
#, c-format
msgid "tagged %s %s (%s) in %s"
msgstr "%s %s (%s) in %s getaggt"
-#: builtin/fsck.c:475
+#: builtin/fsck.c:458
#, c-format
msgid "%s: object corrupt or missing"
msgstr "%s: Objekt fehlerhaft oder nicht vorhanden"
-#: builtin/fsck.c:500
+#: builtin/fsck.c:483
#, c-format
msgid "%s: invalid reflog entry %s"
msgstr "%s: Ungültiger Reflog-Eintrag %s"
-#: builtin/fsck.c:514
+#: builtin/fsck.c:497
#, c-format
msgid "Checking reflog %s->%s"
msgstr "Prüfe Reflog %s->%s"
-#: builtin/fsck.c:548
+#: builtin/fsck.c:531
#, c-format
msgid "%s: invalid sha1 pointer %s"
msgstr "%s: Ungültiger SHA1-Zeiger %s"
-#: builtin/fsck.c:555
+#: builtin/fsck.c:538
#, c-format
msgid "%s: not a commit"
msgstr "%s: kein Commit"
-#: builtin/fsck.c:609
+#: builtin/fsck.c:592
msgid "notice: No default references"
msgstr "Notiz: Keine Standardreferenzen"
-#: builtin/fsck.c:624
+#: builtin/fsck.c:607
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s: Objekt fehlerhaft oder nicht vorhanden: %s"
-#: builtin/fsck.c:637
+#: builtin/fsck.c:620
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s: Objekt konnte nicht geparst werden: %s"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:640
#, c-format
msgid "bad sha1 file: %s"
msgstr "Ungültige SHA1-Datei: %s"
-#: builtin/fsck.c:672
+#: builtin/fsck.c:655
msgid "Checking object directory"
msgstr "Prüfe Objekt-Verzeichnis"
-#: builtin/fsck.c:675
+#: builtin/fsck.c:658
msgid "Checking object directories"
msgstr "Prüfe Objekt-Verzeichnisse"
-#: builtin/fsck.c:690
+#: builtin/fsck.c:673
#, c-format
msgid "Checking %s link"
msgstr "Prüfe %s Verknüpfung"
-#: builtin/fsck.c:695 builtin/index-pack.c:843
+#: builtin/fsck.c:678 builtin/index-pack.c:865
#, c-format
msgid "invalid %s"
msgstr "Ungültiger Objekt-Typ %s"
-#: builtin/fsck.c:702
+#: builtin/fsck.c:685
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s zeigt auf etwas seltsames (%s)"
-#: builtin/fsck.c:708
+#: builtin/fsck.c:691
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s: losgelöster HEAD zeigt auf nichts"
-#: builtin/fsck.c:712
+#: builtin/fsck.c:695
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "Notiz: %s zeigt auf einen ungeborenen Branch (%s)"
-#: builtin/fsck.c:724
+#: builtin/fsck.c:707
msgid "Checking cache tree"
msgstr "Prüfe Cache-Verzeichnis"
-#: builtin/fsck.c:729
+#: builtin/fsck.c:712
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "%s: Ungültiger SHA1-Zeiger in Cache-Verzeichnis"
-#: builtin/fsck.c:738
+#: builtin/fsck.c:721
msgid "non-tree in cache-tree"
msgstr "non-tree in Cache-Verzeichnis"
-#: builtin/fsck.c:769
+#: builtin/fsck.c:752
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<Optionen>] [<Objekt>...]"
-#: builtin/fsck.c:775
+#: builtin/fsck.c:758
msgid "show unreachable objects"
msgstr "unerreichbare Objekte anzeigen"
-#: builtin/fsck.c:776
+#: builtin/fsck.c:759
msgid "show dangling objects"
msgstr "unreferenzierte Objekte anzeigen"
-#: builtin/fsck.c:777
+#: builtin/fsck.c:760
msgid "report tags"
msgstr "Tags melden"
-#: builtin/fsck.c:778
+#: builtin/fsck.c:761
msgid "report root nodes"
msgstr "Hauptwurzeln melden"
-#: builtin/fsck.c:779
+#: builtin/fsck.c:762
msgid "make index objects head nodes"
msgstr "Index-Objekte in Erreichbarkeitsprüfung einbeziehen"
-#: builtin/fsck.c:780
+#: builtin/fsck.c:763
msgid "make reflogs head nodes (default)"
msgstr "Reflogs in Erreichbarkeitsprüfung einbeziehen (Standard)"
-#: builtin/fsck.c:781
+#: builtin/fsck.c:764
msgid "also consider packs and alternate objects"
msgstr "ebenso Pakete und alternative Objekte betrachten"
-#: builtin/fsck.c:782
+#: builtin/fsck.c:765
msgid "check only connectivity"
msgstr "nur Konnektivität prüfen"
-#: builtin/fsck.c:783
+#: builtin/fsck.c:766 builtin/mktag.c:78
msgid "enable more strict checking"
msgstr "genauere Prüfung aktivieren"
-#: builtin/fsck.c:785
+#: builtin/fsck.c:768
msgid "write dangling objects in .git/lost-found"
msgstr "unreferenzierte Objekte nach .git/lost-found schreiben"
-#: builtin/fsck.c:786 builtin/prune.c:132
+#: builtin/fsck.c:769 builtin/prune.c:134
msgid "show progress"
msgstr "Fortschrittsanzeige anzeigen"
-#: builtin/fsck.c:787
+#: builtin/fsck.c:770
msgid "show verbose names for reachable objects"
msgstr "ausführliche Namen für erreichbare Objekte anzeigen"
-#: builtin/fsck.c:846 builtin/index-pack.c:225
+#: builtin/fsck.c:829 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "Prüfe Objekte"
-#: builtin/fsck.c:874
+#: builtin/fsck.c:857
#, c-format
msgid "%s: object missing"
msgstr "%s: Objekt nicht vorhanden"
-#: builtin/fsck.c:885
+#: builtin/fsck.c:868
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "Ungültiger Parameter: SHA-1 erwartet, '%s' bekommen"
-#: builtin/gc.c:35
+#: builtin/gc.c:39
msgid "git gc [<options>]"
msgstr "git gc [<Optionen>]"
-#: builtin/gc.c:90
+#: builtin/gc.c:93
#, c-format
msgid "Failed to fstat %s: %s"
msgstr "Konnte '%s' nicht lesen: %s"
-#: builtin/gc.c:126
+#: builtin/gc.c:129
#, c-format
msgid "failed to parse '%s' value '%s'"
msgstr "Fehler beim Parsen von '%s' mit dem Wert '%s'"
-#: builtin/gc.c:475 builtin/init-db.c:55
+#: builtin/gc.c:487 builtin/init-db.c:58
#, c-format
msgid "cannot stat '%s'"
msgstr "Kann '%s' nicht lesen"
-#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
+#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:562
#, c-format
msgid "cannot read '%s'"
msgstr "kann '%s' nicht lesen"
-#: builtin/gc.c:491
+#: builtin/gc.c:503
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -14700,58 +15693,58 @@
"\n"
"%s"
-#: builtin/gc.c:539
+#: builtin/gc.c:551
msgid "prune unreferenced objects"
msgstr "unreferenzierte Objekte entfernen"
-#: builtin/gc.c:541
+#: builtin/gc.c:553
msgid "be more thorough (increased runtime)"
msgstr "mehr Gründlichkeit (erhöht Laufzeit)"
-#: builtin/gc.c:542
+#: builtin/gc.c:554
msgid "enable auto-gc mode"
msgstr "\"auto-gc\" Modus aktivieren"
-#: builtin/gc.c:545
+#: builtin/gc.c:557
msgid "force running gc even if there may be another gc running"
msgstr ""
"Ausführung von \"git gc\" erzwingen, selbst wenn ein anderes\n"
"\"git gc\" bereits ausgeführt wird"
-#: builtin/gc.c:548
+#: builtin/gc.c:560
msgid "repack all other packs except the largest pack"
msgstr "alle anderen Pakete, außer das größte Paket, neu packen"
-#: builtin/gc.c:565
+#: builtin/gc.c:576
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "Fehler beim Parsen des Wertes '%s' von gc.logexpiry."
-#: builtin/gc.c:576
+#: builtin/gc.c:587
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr "Fehler beim Parsen des \"prune expiry\" Wertes %s"
-#: builtin/gc.c:596
+#: builtin/gc.c:607
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"Die Datenbank des Repositories wird für eine optimale Performance im\n"
"Hintergrund komprimiert.\n"
-#: builtin/gc.c:598
+#: builtin/gc.c:609
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr ""
"Die Datenbank des Projektarchivs wird für eine optimale Performance "
"komprimiert.\n"
-#: builtin/gc.c:599
+#: builtin/gc.c:610
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Siehe \"git help gc\" für manuelles Aufräumen.\n"
-#: builtin/gc.c:639
+#: builtin/gc.c:650
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -14759,23 +15752,190 @@
"\"git gc\" wird bereits auf Maschine '%s' pid %<PRIuMAX> ausgeführt\n"
"(benutzen Sie --force falls nicht)"
-#: builtin/gc.c:694
+#: builtin/gc.c:705
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Es gibt zu viele unerreichbare lose Objekte; führen Sie 'git prune' aus, um "
"diese zu löschen."
+#: builtin/gc.c:715
+msgid ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
+msgstr ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<Aufgabe>] [--schedule]"
+
+#: builtin/gc.c:745
+msgid "--no-schedule is not allowed"
+msgstr "--no-schedule ist nicht erlaubt"
+
+#: builtin/gc.c:750
+#, c-format
+msgid "unrecognized --schedule argument '%s'"
+msgstr "nicht erkanntes --schedule Argument '%s'"
+
+#: builtin/gc.c:869
+msgid "failed to write commit-graph"
+msgstr "Fehler beim Schreiben des Commit-Graph"
+
+#: builtin/gc.c:914
+msgid "failed to fill remotes"
+msgstr "Fehler beim Eintragen der Remote-Repositories"
+
+#: builtin/gc.c:1037
+msgid "failed to start 'git pack-objects' process"
+msgstr "konnte 'git pack-objects' Prozess nicht starten"
+
+#: builtin/gc.c:1054
+msgid "failed to finish 'git pack-objects' process"
+msgstr "konnte 'git pack-objects' Prozess nicht beenden"
+
+#: builtin/gc.c:1106
+msgid "failed to write multi-pack-index"
+msgstr "Fehler beim Schreiben des multi-pack-index"
+
+#: builtin/gc.c:1124
+msgid "'git multi-pack-index expire' failed"
+msgstr "Fehler beim Ausführen von 'git multi-pack-index expire'"
+
+#: builtin/gc.c:1185
+msgid "'git multi-pack-index repack' failed"
+msgstr "Fehler beim Ausführen von 'git multi-pack-index repack'"
+
+#: builtin/gc.c:1194
+msgid ""
+"skipping incremental-repack task because core.multiPackIndex is disabled"
+msgstr ""
+"Überspringen der Aufgabe 'incremental-repack', weil core.multiPackIndex "
+"deaktiviert ist"
+
+#: builtin/gc.c:1298
+#, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr "Sperrdatei '%s' existiert, Wartung wird übersprungen"
+
+#: builtin/gc.c:1328
+#, c-format
+msgid "task '%s' failed"
+msgstr "Aufgabe '%s' fehlgeschlagen"
+
+#: builtin/gc.c:1410
+#, c-format
+msgid "'%s' is not a valid task"
+msgstr "'%s' ist keine gültige Aufgabe"
+
+#: builtin/gc.c:1415
+#, c-format
+msgid "task '%s' cannot be selected multiple times"
+msgstr "Aufgabe '%s' kann nicht mehrfach ausgewählt werden"
+
+#: builtin/gc.c:1430
+msgid "run tasks based on the state of the repository"
+msgstr "Aufgaben abhängig vom Zustand des Repositories ausführen"
+
+#: builtin/gc.c:1431
+msgid "frequency"
+msgstr "Häufigkeit"
+
+#: builtin/gc.c:1432
+msgid "run tasks based on frequency"
+msgstr "Aufgaben abhängig von der Häufigkeit ausführen"
+
+#: builtin/gc.c:1435
+msgid "do not report progress or other information over stderr"
+msgstr "zeige keinen Fortschritt oder andere Informationen über stderr"
+
+#: builtin/gc.c:1436
+msgid "task"
+msgstr "Aufgabe"
+
+#: builtin/gc.c:1437
+msgid "run a specific task"
+msgstr "eine bestimmte Aufgabe ausführen"
+
+#: builtin/gc.c:1454
+msgid "use at most one of --auto and --schedule=<frequency>"
+msgstr ""
+"nutzen Sie höchstens eine der Optionen --auto oder --schedule=<Häufigkeit>"
+
+#: builtin/gc.c:1497
+msgid "failed to run 'git config'"
+msgstr "Fehler beim Ausführen von 'git config'"
+
+#: builtin/gc.c:1562
+#, c-format
+msgid "failed to expand path '%s'"
+msgstr "Fehler beim Erweitern des Pfades '%s'"
+
+#: builtin/gc.c:1591
+msgid "failed to start launchctl"
+msgstr "konnte launchctl nicht starten"
+
+#: builtin/gc.c:1628
+#, c-format
+msgid "failed to create directories for '%s'"
+msgstr "Fehler beim Erstellen von Verzeichnissen für '%s'"
+
+#: builtin/gc.c:1689
+#, c-format
+msgid "failed to bootstrap service %s"
+msgstr "Fehler beim Laden des Services %s"
+
+#: builtin/gc.c:1760
+msgid "failed to create temp xml file"
+msgstr "Fehler beim Erstellen der temporären XML-Datei"
+
+#: builtin/gc.c:1850
+msgid "failed to start schtasks"
+msgstr "Fehler beim Starten von schtasks"
+
+#: builtin/gc.c:1894
+msgid "failed to run 'crontab -l'; your system might not support 'cron'"
+msgstr ""
+"Fehler beim Ausführen von 'crontab -l'; Ihr System unterstützt eventuell "
+"'cron' nicht"
+
+#: builtin/gc.c:1911
+msgid "failed to run 'crontab'; your system might not support 'cron'"
+msgstr ""
+"Fehler beim Ausführen von 'crontab'; Ihr System unterstützt eventuell 'cron' "
+"nicht"
+
+#: builtin/gc.c:1915
+msgid "failed to open stdin of 'crontab'"
+msgstr "Fehler beim Öffnen der Standard-Eingabe von 'crontab'"
+
+#: builtin/gc.c:1956
+msgid "'crontab' died"
+msgstr "'crontab' abgebrochen"
+
+#: builtin/gc.c:1990
+msgid "another process is scheduling background maintenance"
+msgstr "ein anderer Prozess plant die Hintergrundwartung"
+
+#: builtin/gc.c:2009
+msgid "failed to add repo to global config"
+msgstr "Repository konnte nicht zur globalen Konfiguration hinzugefügt werden"
+
+#: builtin/gc.c:2019
+msgid "git maintenance <subcommand> [<options>]"
+msgstr "git maintenance <Unterbefehl> [<Optionen>]"
+
+#: builtin/gc.c:2038
+#, 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>...]"
-#: builtin/grep.c:225
+#: builtin/grep.c:223
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: Fehler beim Erzeugen eines Thread: %s"
-#: builtin/grep.c:279
+#: builtin/grep.c:277
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "ungültige Anzahl von Threads (%d) für %s angegeben"
@@ -14784,266 +15944,266 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731
-#: builtin/pack-objects.c:2854
+#: builtin/grep.c:285 builtin/index-pack.c:1589 builtin/index-pack.c:1808
+#: builtin/pack-objects.c:2944
#, c-format
msgid "no threads support, ignoring %s"
msgstr "keine Unterstützung von Threads, '%s' wird ignoriert"
-#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618
+#: builtin/grep.c:473 builtin/grep.c:601 builtin/grep.c:641
#, c-format
msgid "unable to read tree (%s)"
msgstr "konnte \"Tree\"-Objekt (%s) nicht lesen"
-#: builtin/grep.c:633
+#: builtin/grep.c:656
#, c-format
msgid "unable to grep from object of type %s"
msgstr "kann \"grep\" nicht mit Objekten des Typs %s durchführen"
-#: builtin/grep.c:704
+#: builtin/grep.c:737
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "Schalter '%c' erwartet einen numerischen Wert"
-#: builtin/grep.c:803
+#: builtin/grep.c:836
msgid "search in index instead of in the work tree"
-msgstr "im Index anstatt im Arbeitsverzeichnis suchen"
+msgstr "im Index statt im Arbeitsverzeichnis suchen"
-#: builtin/grep.c:805
+#: builtin/grep.c:838
msgid "find in contents not managed by git"
msgstr "auch in Inhalten finden, die nicht von Git verwaltet werden"
-#: builtin/grep.c:807
+#: builtin/grep.c:840
msgid "search in both tracked and untracked files"
msgstr "in versionierten und unversionierten Dateien suchen"
-#: builtin/grep.c:809
+#: builtin/grep.c:842
msgid "ignore files specified via '.gitignore'"
msgstr "Dateien, die über '.gitignore' angegeben sind, ignorieren"
-#: builtin/grep.c:811
+#: builtin/grep.c:844
msgid "recursively search in each submodule"
msgstr "rekursive Suche in jedem Submodul"
-#: builtin/grep.c:814
+#: builtin/grep.c:847
msgid "show non-matching lines"
msgstr "Zeilen ohne Übereinstimmungen anzeigen"
-#: builtin/grep.c:816
+#: builtin/grep.c:849
msgid "case insensitive matching"
msgstr "Übereinstimmungen unabhängig von Groß- und Kleinschreibung finden"
-#: builtin/grep.c:818
+#: builtin/grep.c:851
msgid "match patterns only at word boundaries"
msgstr "nur ganze Wörter suchen"
-#: builtin/grep.c:820
+#: builtin/grep.c:853
msgid "process binary files as text"
msgstr "binäre Dateien als Text verarbeiten"
-#: builtin/grep.c:822
+#: builtin/grep.c:855
msgid "don't match patterns in binary files"
msgstr "keine Muster in Binärdateien finden"
-#: builtin/grep.c:825
+#: builtin/grep.c:858
msgid "process binary files with textconv filters"
msgstr "binäre Dateien mit \"textconv\"-Filtern verarbeiten"
-#: builtin/grep.c:827
+#: builtin/grep.c:860
msgid "search in subdirectories (default)"
msgstr "in Unterverzeichnissen suchen (Standard)"
-#: builtin/grep.c:829
+#: builtin/grep.c:862
msgid "descend at most <depth> levels"
msgstr "höchstens <Tiefe> Ebenen durchlaufen"
-#: builtin/grep.c:833
+#: builtin/grep.c:866
msgid "use extended POSIX regular expressions"
msgstr "erweiterte reguläre Ausdrücke aus POSIX verwenden"
-#: builtin/grep.c:836
+#: builtin/grep.c:869
msgid "use basic POSIX regular expressions (default)"
msgstr "grundlegende reguläre Ausdrücke aus POSIX verwenden (Standard)"
-#: builtin/grep.c:839
+#: builtin/grep.c:872
msgid "interpret patterns as fixed strings"
msgstr "Muster als feste Zeichenketten interpretieren"
-#: builtin/grep.c:842
+#: builtin/grep.c:875
msgid "use Perl-compatible regular expressions"
msgstr "Perl-kompatible reguläre Ausdrücke verwenden"
-#: builtin/grep.c:845
+#: builtin/grep.c:878
msgid "show line numbers"
msgstr "Zeilennummern anzeigen"
-#: builtin/grep.c:846
+#: builtin/grep.c:879
msgid "show column number of first match"
msgstr "Nummer der Spalte des ersten Treffers anzeigen"
-#: builtin/grep.c:847
+#: builtin/grep.c:880
msgid "don't show filenames"
msgstr "keine Dateinamen anzeigen"
-#: builtin/grep.c:848
+#: builtin/grep.c:881
msgid "show filenames"
msgstr "Dateinamen anzeigen"
-#: builtin/grep.c:850
+#: builtin/grep.c:883
msgid "show filenames relative to top directory"
msgstr "Dateinamen relativ zum Projektverzeichnis anzeigen"
-#: builtin/grep.c:852
+#: builtin/grep.c:885
msgid "show only filenames instead of matching lines"
msgstr "nur Dateinamen anzeigen anstatt übereinstimmende Zeilen"
-#: builtin/grep.c:854
+#: builtin/grep.c:887
msgid "synonym for --files-with-matches"
msgstr "Synonym für --files-with-matches"
-#: builtin/grep.c:857
+#: builtin/grep.c:890
msgid "show only the names of files without match"
msgstr "nur die Dateinamen ohne Übereinstimmungen anzeigen"
-#: builtin/grep.c:859
+#: builtin/grep.c:892
msgid "print NUL after filenames"
msgstr "NUL-Zeichen nach Dateinamen ausgeben"
-#: builtin/grep.c:862
+#: builtin/grep.c:895
msgid "show only matching parts of a line"
msgstr "nur übereinstimmende Teile der Zeile anzeigen"
-#: builtin/grep.c:864
+#: builtin/grep.c:897
msgid "show the number of matches instead of matching lines"
msgstr "anstatt der Zeilen, die Anzahl der übereinstimmenden Zeilen anzeigen"
-#: builtin/grep.c:865
+#: builtin/grep.c:898
msgid "highlight matches"
msgstr "Übereinstimmungen hervorheben"
-#: builtin/grep.c:867
+#: builtin/grep.c:900
msgid "print empty line between matches from different files"
msgstr ""
"eine Leerzeile zwischen Übereinstimmungen in verschiedenen Dateien ausgeben"
-#: builtin/grep.c:869
+#: builtin/grep.c:902
msgid "show filename only once above matches from same file"
msgstr ""
"den Dateinamen nur einmal oberhalb der Übereinstimmungen aus dieser Datei "
"anzeigen"
-#: builtin/grep.c:872
+#: builtin/grep.c:905
msgid "show <n> context lines before and after matches"
msgstr "<n> Zeilen vor und nach den Übereinstimmungen anzeigen"
-#: builtin/grep.c:875
+#: builtin/grep.c:908
msgid "show <n> context lines before matches"
msgstr "<n> Zeilen vor den Übereinstimmungen anzeigen"
-#: builtin/grep.c:877
+#: builtin/grep.c:910
msgid "show <n> context lines after matches"
msgstr "<n> Zeilen nach den Übereinstimmungen anzeigen"
-#: builtin/grep.c:879
+#: builtin/grep.c:912
msgid "use <n> worker threads"
msgstr "<n> Threads benutzen"
-#: builtin/grep.c:880
+#: builtin/grep.c:913
msgid "shortcut for -C NUM"
msgstr "Kurzform für -C NUM"
-#: builtin/grep.c:883
+#: builtin/grep.c:916
msgid "show a line with the function name before matches"
msgstr "eine Zeile mit dem Funktionsnamen vor Übereinstimmungen anzeigen"
-#: builtin/grep.c:885
+#: builtin/grep.c:918
msgid "show the surrounding function"
msgstr "die umgebende Funktion anzeigen"
-#: builtin/grep.c:888
+#: builtin/grep.c:921
msgid "read patterns from file"
msgstr "Muster von einer Datei lesen"
-#: builtin/grep.c:890
+#: builtin/grep.c:923
msgid "match <pattern>"
msgstr "<Muster> finden"
-#: builtin/grep.c:892
+#: builtin/grep.c:925
msgid "combine patterns specified with -e"
msgstr "Muster kombinieren, die mit -e angegeben wurden"
-#: builtin/grep.c:904
+#: builtin/grep.c:937
msgid "indicate hit with exit status without output"
msgstr "Übereinstimmungen nur durch Beendigungsstatus anzeigen"
-#: builtin/grep.c:906
+#: builtin/grep.c:939
msgid "show only matches from files that match all patterns"
msgstr ""
"nur Übereinstimmungen von Dateien anzeigen, die allen Mustern entsprechen"
-#: builtin/grep.c:908
-msgid "show parse tree for grep expression"
-msgstr "geparstes Verzeichnis für \"grep\"-Ausdruck anzeigen"
-
-#: builtin/grep.c:912
+#: builtin/grep.c:942
msgid "pager"
msgstr "Anzeigeprogramm"
-#: builtin/grep.c:912
+#: builtin/grep.c:942
msgid "show matching files in the pager"
msgstr "Dateien mit Übereinstimmungen im Anzeigeprogramm anzeigen"
-#: builtin/grep.c:916
+#: builtin/grep.c:946
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "den Aufruf von grep(1) erlauben (von dieser Programmversion ignoriert)"
-#: builtin/grep.c:983
+#: builtin/grep.c:1012
msgid "no pattern given"
msgstr "Kein Muster angegeben."
-#: builtin/grep.c:1019
+#: builtin/grep.c:1048
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index oder --untracked können nicht mit Commits verwendet werden"
-#: builtin/grep.c:1027
+#: builtin/grep.c:1056
#, c-format
msgid "unable to resolve revision: %s"
msgstr "Konnte Commit nicht auflösen: %s"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1086
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked zusammen mit --recurse-submodules wird nicht unterstützt"
-#: builtin/grep.c:1061
+#: builtin/grep.c:1090
msgid "invalid option combination, ignoring --threads"
msgstr "Ungültige Kombination von Optionen, --threads wird ignoriert."
-#: builtin/grep.c:1064 builtin/pack-objects.c:3547
+#: builtin/grep.c:1093 builtin/pack-objects.c:3672
msgid "no threads support, ignoring --threads"
msgstr "Keine Unterstützung für Threads, --threads wird ignoriert."
-#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851
+#: builtin/grep.c:1096 builtin/index-pack.c:1586 builtin/pack-objects.c:2941
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "ungültige Anzahl von Threads angegeben (%d)"
-#: builtin/grep.c:1101
+#: builtin/grep.c:1130
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
-"Die Option --open-files-in-pager kann nur innerhalb des "
-"Arbeitsverzeichnisses verwendet werden."
+"--open-files-in-pager kann nur innerhalb des Arbeitsverzeichnisses verwendet "
+"werden"
-#: builtin/grep.c:1127
+#: builtin/grep.c:1156
msgid "--cached or --untracked cannot be used with --no-index"
-msgstr "--cached und --untracked können nicht mit --no-index verwendet werden."
+msgstr "--cached und --untracked können nicht mit --no-index verwendet werden"
-#: builtin/grep.c:1133
+#: builtin/grep.c:1159
+msgid "--untracked cannot be used with --cached"
+msgstr "--untracked kann nicht mit --cached verwendet werden"
+
+#: builtin/grep.c:1165
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr ""
"--[no-]exclude-standard kann nicht mit versionierten Inhalten verwendet "
-"werden."
+"werden"
-#: builtin/grep.c:1141
+#: builtin/grep.c:1173
msgid "both --cached and trees are given"
msgstr "--cached und \"Tree\"-Objekte angegeben"
@@ -15086,66 +16246,66 @@
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"
@@ -15154,7 +16314,7 @@
"'%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"
@@ -15163,397 +16323,429 @@
"'%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:340
#, 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:372
#, 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:606
+#: builtin/index-pack.c:324 builtin/pack-objects.c:624
msgid "pack too large for current definition of off_t"
msgstr "Paket ist zu groß für die aktuelle Definition von off_t"
-#: builtin/index-pack.c:291 builtin/unpack-objects.c:95
+#: builtin/index-pack.c: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
+#, 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:765
-#: builtin/index-pack.c:804 builtin/index-pack.c:813
+#: 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:158
-#: builtin/pack-objects.c:218 builtin/pack-objects.c:313
+#: 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:802
+#: 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:810
+#: builtin/index-pack.c:832
#, c-format
msgid "cannot read existing object %s"
msgstr "Kann existierendes Objekt %s nicht lesen."
-#: builtin/index-pack.c:824
+#: builtin/index-pack.c:846
#, c-format
msgid "invalid blob object %s"
msgstr "ungültiges Blob-Objekt %s"
-#: builtin/index-pack.c:827 builtin/index-pack.c:846
+#: builtin/index-pack.c:849 builtin/index-pack.c:868
msgid "fsck error in packed object"
msgstr "fsck Fehler in gepacktem Objekt"
-#: builtin/index-pack.c:848
+#: 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:920 builtin/index-pack.c:951
+#: builtin/index-pack.c:931 builtin/index-pack.c:978
msgid "failed to apply delta"
msgstr "Konnte Dateiunterschied nicht anwenden"
-#: builtin/index-pack.c:1121
+#: builtin/index-pack.c:1161
msgid "Receiving objects"
msgstr "Empfange Objekte"
-#: builtin/index-pack.c:1121
+#: builtin/index-pack.c:1161
msgid "Indexing objects"
msgstr "Indiziere Objekte"
-#: builtin/index-pack.c:1155
+#: builtin/index-pack.c:1195
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "Paket ist beschädigt (SHA1 unterschiedlich)"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1200
msgid "cannot fstat packfile"
msgstr "kann Paketdatei nicht lesen"
-#: builtin/index-pack.c:1163
+#: builtin/index-pack.c:1203
msgid "pack has junk at the end"
msgstr "Paketende enthält nicht verwendbaren Inhalt"
-#: builtin/index-pack.c:1175
+#: 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:1198
+#: builtin/index-pack.c:1238
msgid "Resolving deltas"
msgstr "Löse Unterschiede auf"
-#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615
+#: builtin/index-pack.c:1249 builtin/pack-objects.c:2707
#, c-format
msgid "unable to create thread: %s"
msgstr "kann Thread nicht erzeugen: %s"
-#: builtin/index-pack.c:1249
+#: builtin/index-pack.c:1282
msgid "confusion beyond insanity"
msgstr "Fehler beim Auflösen der Unterschiede"
-#: builtin/index-pack.c:1255
+#: 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:1267
+#: builtin/index-pack.c:1300
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
-msgstr "Unerwartete Prüfsumme für %s (Festplattenfehler?)"
+msgstr "unerwartete Prüfsumme für %s (Festplattenfehler?)"
-#: builtin/index-pack.c:1271
+#: 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:1295
+#: 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:1392
+#: builtin/index-pack.c:1424
#, c-format
msgid "local object %s is corrupt"
msgstr "lokales Objekt %s ist beschädigt"
-#: builtin/index-pack.c:1406
+#: builtin/index-pack.c:1445
#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'"
+msgid "packfile name '%s' does not end with '.%s'"
+msgstr "Name der Paketdatei '%s' endet nicht mit '.%s'"
-#: builtin/index-pack.c:1431
+#: builtin/index-pack.c:1469
#, c-format
msgid "cannot write %s file '%s'"
msgstr "Kann %s Datei '%s' nicht schreiben."
-#: builtin/index-pack.c:1439
+#: 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:1463
+#: builtin/index-pack.c:1503
msgid "error while closing pack file"
msgstr "Fehler beim Schließen der Paketdatei"
-#: builtin/index-pack.c:1477
+#: builtin/index-pack.c:1517
msgid "cannot store pack file"
msgstr "Kann Paketdatei nicht speichern"
-#: builtin/index-pack.c:1485
+#: builtin/index-pack.c:1525
msgid "cannot store index file"
msgstr "Kann Indexdatei nicht speichern"
-#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862
+#: builtin/index-pack.c:1534
+msgid "cannot store reverse index file"
+msgstr "kann Reverse-Index-Datei nicht speichern"
+
+#: builtin/index-pack.c:1580 builtin/pack-objects.c:2952
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "\"pack.indexversion=%<PRIu32>\" ist ungültig"
-#: builtin/index-pack.c:1597
+#: builtin/index-pack.c:1650
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Kann existierende Paketdatei '%s' nicht öffnen"
-#: builtin/index-pack.c:1599
+#: builtin/index-pack.c:1652
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Kann existierende Indexdatei für Paket '%s' nicht öffnen"
-#: builtin/index-pack.c:1647
+#: builtin/index-pack.c:1700
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "kein Unterschied: %d Objekt"
msgstr[1] "kein Unterschied: %d Objekte"
-#: builtin/index-pack.c:1654
+#: builtin/index-pack.c:1707
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "Länge der Objekt-Liste = %d: %lu Objekt"
msgstr[1] "Länge der Objekt-Liste = %d: %lu Objekte"
-#: builtin/index-pack.c:1693
+#: builtin/index-pack.c:1765
msgid "Cannot come back to cwd"
msgstr "Kann nicht zurück zum Arbeitsverzeichnis wechseln"
-#: builtin/index-pack.c:1742 builtin/index-pack.c:1745
-#: builtin/index-pack.c:1761 builtin/index-pack.c:1765
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1822
+#: builtin/index-pack.c:1838 builtin/index-pack.c:1842
#, c-format
msgid "bad %s"
msgstr "%s ist ungültig"
-#: builtin/index-pack.c:1781
-msgid "--fix-thin cannot be used without --stdin"
-msgstr "Die Option --fix-thin kann nicht ohne --stdin verwendet werden."
+#: builtin/index-pack.c:1848 builtin/init-db.c:392 builtin/init-db.c:625
+#, c-format
+msgid "unknown hash algorithm '%s'"
+msgstr "unbekannter Hash-Algorithmus '%s'"
-#: builtin/index-pack.c:1783
+#: builtin/index-pack.c:1867
+msgid "--fix-thin cannot be used without --stdin"
+msgstr "--fix-thin kann nicht ohne --stdin verwendet werden"
+
+#: builtin/index-pack.c:1869
msgid "--stdin requires a git repository"
msgstr "--stdin erfordert ein Git-Repository"
-#: builtin/index-pack.c:1789
-msgid "--verify with no packfile name given"
-msgstr "Die Option --verify wurde ohne Namen der Paketdatei angegeben."
+#: builtin/index-pack.c:1871
+msgid "--object-format cannot be used with --stdin"
+msgstr "--object-format kann nicht mit --stdin verwendet werden"
-#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582
+#: builtin/index-pack.c:1886
+msgid "--verify with no packfile name given"
+msgstr "--verify wurde ohne Namen der Paketdatei angegeben"
+
+#: builtin/index-pack.c:1956 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:275
+#, c-format
+msgid "invalid initial branch name: '%s'"
+msgstr "ungültiger initialer Branchname: '%s'"
+
+#: builtin/init-db.c:367
#, 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:370
#, 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:386
+msgid "attempt to reinitialize repository with different hash"
+msgstr "Versuch, das Repository mit einem anderen Hash zu reinitialisieren"
+
+#: builtin/init-db.c:410 builtin/init-db.c:413
#, c-format
msgid "%s already exists"
msgstr "%s existiert bereits"
-#: builtin/init-db.c:413
+#: builtin/init-db.c:445
+#, c-format
+msgid "re-init: ignored --initial-branch=%s"
+msgstr "Neu-Initialisierung: --initial-branch=%s ignoriert"
+
+#: builtin/init-db.c:476
#, 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:477
#, 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:481
#, 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:482
#, 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:531
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -15561,25 +16753,41 @@
"git init [-q | --quiet] [--bare] [--template=<Vorlagenverzeichnis>] [--"
"shared[=<Berechtigungen>]] [<Verzeichnis>]"
-#: builtin/init-db.c:491
+#: builtin/init-db.c:557
msgid "permissions"
msgstr "Berechtigungen"
-#: builtin/init-db.c:492
+#: builtin/init-db.c:558
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:564
+msgid "override the name of the initial branch"
+msgstr "den Namen des initialen Branches überschreiben"
+
+#: builtin/init-db.c:565 builtin/verify-pack.c:74
+msgid "hash"
+msgstr "Hash"
+
+#: builtin/init-db.c:566 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:573
+msgid "--separate-git-dir and --bare are mutually exclusive"
+msgstr "--separate-git-dir und --bare schließen sich gegenseitig aus"
+
+#: builtin/init-db.c:602 builtin/init-db.c:607
#, c-format
msgid "cannot mkdir %s"
msgstr "kann Verzeichnis %s nicht erstellen"
-#: builtin/init-db.c:538
+#: builtin/init-db.c:611 builtin/init-db.c:666
#, c-format
msgid "cannot chdir to %s"
msgstr "kann nicht in Verzeichnis %s wechseln"
-#: builtin/init-db.c:559
+#: builtin/init-db.c:638
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -15588,11 +16796,15 @@
"%s (oder --work-tree=<Verzeichnis>) nicht erlaubt ohne Spezifizierung von %s "
"(oder --git-dir=<Verzeichnis>)"
-#: builtin/init-db.c:587
+#: builtin/init-db.c:690
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Kann nicht auf Arbeitsverzeichnis '%s' zugreifen."
+#: builtin/init-db.c:695
+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 "
@@ -15651,135 +16863,137 @@
#: builtin/interpret-trailers.c:123
msgid "--trailer with --only-input does not make sense"
-msgstr ""
-"Die Optionen --trailer und --only-input können nicht gemeinsam verwendet "
-"werden."
+msgstr "--trailer und --only-input können nicht gemeinsam verwendet werden"
#: builtin/interpret-trailers.c:133
msgid "no input file given for in-place editing"
msgstr "keine Datei zur direkten Bearbeitung angegeben"
-#: builtin/log.c:56
+#: builtin/log.c:59
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<Optionen>] [<Commitbereich>] [[--] <Pfad>...]"
-#: builtin/log.c:57
+#: builtin/log.c:60
msgid "git show [<options>] <object>..."
msgstr "git show [<Optionen>] <Objekt>..."
-#: builtin/log.c:110
+#: builtin/log.c:113
#, c-format
msgid "invalid --decorate option: %s"
msgstr "Ungültige Option für --decorate: %s"
-#: builtin/log.c:174
+#: builtin/log.c:180
msgid "show source"
msgstr "Quelle anzeigen"
-#: builtin/log.c:175
-msgid "Use mail map file"
+#: builtin/log.c:181
+msgid "use mail map file"
msgstr "\"mailmap\"-Datei verwenden"
-#: builtin/log.c:177
+#: builtin/log.c:184
msgid "only decorate refs that match <pattern>"
msgstr "\"decorate\" nur bei Referenzen anwenden, die <Muster> entsprechen"
-#: builtin/log.c:179
+#: builtin/log.c:186
msgid "do not decorate refs that match <pattern>"
msgstr "\"decorate\" nicht bei Referenzen anwenden, die <Muster> entsprechen"
-#: builtin/log.c:180
+#: builtin/log.c:187
msgid "decorate options"
msgstr "decorate-Optionen"
-#: builtin/log.c:183
-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:190
+msgid ""
+"trace the evolution of line range <start>,<end> or function :<funcname> in "
+"<file>"
+msgstr ""
+"Entwicklung der Zeilen vom Bereich <Start>,<Ende> oder Funktion :"
+"<Funktionsname> in <Datei> verfolgen"
-#: builtin/log.c:281
+#: builtin/log.c:213
+msgid "-L<range>:<file> cannot be used with pathspec"
+msgstr "-L<Bereich>:<Datei> kann nicht mit Pfadspezifikation verwendet werden"
+
+#: builtin/log.c:303
#, c-format
msgid "Final output: %d %s\n"
msgstr "letzte Ausgabe: %d %s\n"
-#: builtin/log.c:535
+#: builtin/log.c:566
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: ungültige Datei"
-#: builtin/log.c:550 builtin/log.c:645
+#: builtin/log.c:581 builtin/log.c:671
#, c-format
msgid "could not read object %s"
msgstr "Konnte Objekt %s nicht lesen."
-#: builtin/log.c:670
+#: builtin/log.c:696
#, c-format
msgid "unknown type: %d"
msgstr "Unbekannter Typ: %d"
-#: builtin/log.c:814
+#: builtin/log.c:841
#, c-format
msgid "%s: invalid cover from description mode"
msgstr ""
"%s: Ungültiger Modus für Erstellung des Deckblattes aus der Beschreibung"
-#: builtin/log.c:821
+#: builtin/log.c:848
msgid "format.headers without value"
msgstr "format.headers ohne Wert"
-#: builtin/log.c:936
-msgid "name of output directory is too long"
-msgstr "Name des Ausgabeverzeichnisses ist zu lang."
-
-#: builtin/log.c:952
+#: builtin/log.c:977
#, c-format
msgid "cannot open patch file %s"
msgstr "Kann Patch-Datei %s nicht öffnen"
-#: builtin/log.c:969
+#: builtin/log.c:994
msgid "need exactly one range"
msgstr "Brauche genau einen Commit-Bereich."
-#: builtin/log.c:979
+#: builtin/log.c:1004
msgid "not a range"
msgstr "Kein Commit-Bereich."
-#: builtin/log.c:1143
+#: builtin/log.c:1168
msgid "cover letter needs email format"
msgstr "Anschreiben benötigt E-Mail-Format"
-#: builtin/log.c:1149
+#: builtin/log.c:1174
msgid "failed to create cover-letter file"
msgstr "Fehler beim Erstellen der Datei für das Anschreiben."
-#: builtin/log.c:1228
+#: builtin/log.c:1261
#, c-format
msgid "insane in-reply-to: %s"
msgstr "ungültiges in-reply-to: %s"
-#: builtin/log.c:1255
+#: builtin/log.c:1288
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<Optionen>] [<seit> | <Commitbereich>]"
-#: builtin/log.c:1313
+#: builtin/log.c:1346
msgid "two output directories?"
msgstr "Zwei Ausgabeverzeichnisse?"
-#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211
+#: builtin/log.c:1497 builtin/log.c:2317 builtin/log.c:2319 builtin/log.c:2331
#, c-format
msgid "unknown commit %s"
msgstr "Unbekannter Commit %s"
-#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1508 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
-#: builtin/log.c:1439
+#: builtin/log.c:1517
msgid "could not find exact merge base"
msgstr "Konnte keine exakte Merge-Basis finden."
-#: builtin/log.c:1443
+#: builtin/log.c:1527
msgid ""
"failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
@@ -15790,281 +17004,291 @@
"'git branch --set-upstream-to', um einem Remote-Branch zu folgen.\n"
"Oder geben Sie den Basis-Commit mit '--base=<Basis-Commit-Id>' manuell an."
-#: builtin/log.c:1463
+#: builtin/log.c:1550
msgid "failed to find exact merge base"
msgstr "Fehler beim Finden einer exakten Merge-Basis."
-#: builtin/log.c:1474
+#: builtin/log.c:1567
msgid "base commit should be the ancestor of revision list"
msgstr "Basis-Commit sollte der Vorgänger der Revisionsliste sein."
-#: builtin/log.c:1478
+#: builtin/log.c:1577
msgid "base commit shouldn't be in revision list"
msgstr "Basis-Commit sollte nicht in der Revisionsliste enthalten sein."
-#: builtin/log.c:1531
+#: builtin/log.c:1635
msgid "cannot get patch id"
msgstr "kann Patch-Id nicht lesen"
-#: builtin/log.c:1583
-msgid "failed to infer range-diff ranges"
-msgstr "Fehler beim Ableiten des range-diff-Bereichs."
+#: builtin/log.c:1692
+msgid "failed to infer range-diff origin of current series"
+msgstr "Fehler beim Ableiten des range-diff Ursprungs der aktuellen Serie"
-#: builtin/log.c:1629
+#: builtin/log.c:1694
+#, 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:1738
msgid "use [PATCH n/m] even with a single patch"
msgstr "[PATCH n/m] auch mit einzelnem Patch verwenden"
-#: builtin/log.c:1632
+#: builtin/log.c:1741
msgid "use [PATCH] even with multiple patches"
msgstr "[PATCH] auch mit mehreren Patches verwenden"
-#: builtin/log.c:1636
+#: builtin/log.c:1745
msgid "print patches to standard out"
msgstr "Ausgabe der Patches in Standard-Ausgabe"
-#: builtin/log.c:1638
+#: builtin/log.c:1747
msgid "generate a cover letter"
msgstr "ein Deckblatt erzeugen"
-#: builtin/log.c:1640
+#: builtin/log.c:1749
msgid "use simple number sequence for output file names"
msgstr "einfache Nummernfolge für die Namen der Ausgabedateien verwenden"
-#: builtin/log.c:1641
+#: builtin/log.c:1750
msgid "sfx"
msgstr "Dateiendung"
-#: builtin/log.c:1642
+#: builtin/log.c:1751
msgid "use <sfx> instead of '.patch'"
-msgstr "<Dateiendung> anstatt '.patch' verwenden"
+msgstr "<Dateiendung> statt '.patch' verwenden"
-#: builtin/log.c:1644
+#: builtin/log.c:1753
msgid "start numbering patches at <n> instead of 1"
-msgstr "die Nummerierung der Patches bei <n> anstatt bei 1 beginnen"
+msgstr "die Nummerierung der Patches bei <n> statt bei 1 beginnen"
-#: builtin/log.c:1646
+#: builtin/log.c:1755
msgid "mark the series as Nth re-roll"
msgstr "die Serie als n-te Fassung kennzeichnen"
-#: builtin/log.c:1648
-msgid "Use [RFC PATCH] instead of [PATCH]"
-msgstr "[RFC PATCH] anstatt [PATCH] verwenden"
+#: builtin/log.c:1757
+msgid "max length of output filename"
+msgstr "maximale Länge des Dateinamens für die Ausgabe"
-#: builtin/log.c:1651
+#: builtin/log.c:1759
+msgid "use [RFC PATCH] instead of [PATCH]"
+msgstr "[RFC PATCH] statt [PATCH] verwenden"
+
+#: builtin/log.c:1762
msgid "cover-from-description-mode"
msgstr "Modus für Erstellung des Deckblattes aus der Beschreibung"
-#: builtin/log.c:1652
+#: builtin/log.c:1763
msgid "generate parts of a cover letter based on a branch's description"
msgstr ""
"Erzeuge Teile des Deckblattes basierend auf der Beschreibung des Branches"
-#: builtin/log.c:1654
-msgid "Use [<prefix>] instead of [PATCH]"
-msgstr "Nutze [<Präfix>] statt [PATCH]"
+#: builtin/log.c:1765
+msgid "use [<prefix>] instead of [PATCH]"
+msgstr "nutze [<Präfix>] statt [PATCH]"
-#: builtin/log.c:1657
+#: builtin/log.c:1768
msgid "store resulting files in <dir>"
msgstr "erzeugte Dateien in <Verzeichnis> speichern"
-#: builtin/log.c:1660
+#: builtin/log.c:1771
msgid "don't strip/add [PATCH]"
msgstr "[PATCH] nicht entfernen/hinzufügen"
-#: builtin/log.c:1663
+#: builtin/log.c:1774
msgid "don't output binary diffs"
msgstr "keine binären Unterschiede ausgeben"
-#: builtin/log.c:1665
+#: builtin/log.c:1776
msgid "output all-zero hash in From header"
msgstr "Hash mit Nullen in \"From\"-Header ausgeben"
-#: builtin/log.c:1667
+#: builtin/log.c:1778
msgid "don't include a patch matching a commit upstream"
msgstr ""
"keine Patches einschließen, die einem Commit im Upstream-Branch entsprechen"
-#: builtin/log.c:1669
+#: builtin/log.c:1780
msgid "show patch format instead of default (patch + stat)"
msgstr "Patchformat anstatt des Standards anzeigen (Patch + Zusammenfassung)"
-#: builtin/log.c:1671
+#: builtin/log.c:1782
msgid "Messaging"
msgstr "E-Mail-Einstellungen"
-#: builtin/log.c:1672
+#: builtin/log.c:1783
msgid "header"
msgstr "Header"
-#: builtin/log.c:1673
+#: builtin/log.c:1784
msgid "add email header"
msgstr "E-Mail-Header hinzufügen"
-#: builtin/log.c:1674 builtin/log.c:1676
+#: builtin/log.c:1785 builtin/log.c:1786
msgid "email"
msgstr "E-Mail"
-#: builtin/log.c:1674
+#: builtin/log.c:1785
msgid "add To: header"
msgstr "\"To:\"-Header hinzufügen"
-#: builtin/log.c:1676
+#: builtin/log.c:1786
msgid "add Cc: header"
msgstr "\"Cc:\"-Header hinzufügen"
-#: builtin/log.c:1678
+#: builtin/log.c:1787
msgid "ident"
msgstr "Ident"
-#: builtin/log.c:1679
+#: builtin/log.c:1788
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"\"From\"-Adresse auf <Ident> setzen (oder Ident des Commit-Erstellers, wenn "
"fehlend)"
-#: builtin/log.c:1681
+#: builtin/log.c:1790
msgid "message-id"
msgstr "message-id"
-#: builtin/log.c:1682
+#: builtin/log.c:1791
msgid "make first mail a reply to <message-id>"
msgstr "aus erster E-Mail eine Antwort zu <message-id> machen"
-#: builtin/log.c:1683 builtin/log.c:1686
+#: builtin/log.c:1792 builtin/log.c:1795
msgid "boundary"
msgstr "Grenze"
-#: builtin/log.c:1684
+#: builtin/log.c:1793
msgid "attach the patch"
msgstr "den Patch anhängen"
-#: builtin/log.c:1687
+#: builtin/log.c:1796
msgid "inline the patch"
msgstr "den Patch direkt in die Nachricht einfügen"
-#: builtin/log.c:1691
+#: builtin/log.c:1800
msgid "enable message threading, styles: shallow, deep"
msgstr "Nachrichtenverkettung aktivieren, Stile: shallow, deep"
-#: builtin/log.c:1693
+#: builtin/log.c:1802
msgid "signature"
msgstr "Signatur"
-#: builtin/log.c:1694
+#: builtin/log.c:1803
msgid "add a signature"
msgstr "eine Signatur hinzufügen"
-#: builtin/log.c:1695
+#: builtin/log.c:1804
msgid "base-commit"
msgstr "Basis-Commit"
-#: builtin/log.c:1696
+#: builtin/log.c:1805
msgid "add prerequisite tree info to the patch series"
msgstr "erforderliche Revisions-Informationen der Patch-Serie hinzufügen"
-#: builtin/log.c:1698
+#: builtin/log.c:1808
msgid "add a signature from a file"
msgstr "eine Signatur aus einer Datei hinzufügen"
-#: builtin/log.c:1699
+#: builtin/log.c:1809
msgid "don't print the patch filenames"
msgstr "keine Dateinamen der Patches anzeigen"
-#: builtin/log.c:1701
+#: builtin/log.c:1811
msgid "show progress while generating patches"
msgstr "Forschrittsanzeige während der Erzeugung der Patches"
-#: builtin/log.c:1703
+#: builtin/log.c:1813
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
"Änderungen gegenüber <Commit> im Deckblatt oder einzelnem Patch anzeigen"
-#: builtin/log.c:1706
+#: builtin/log.c:1816
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
"Änderungen gegenüber <Refspec> im Deckblatt oder einzelnem Patch anzeigen"
-#: builtin/log.c:1708
+#: builtin/log.c:1818
msgid "percentage by which creation is weighted"
msgstr "Prozentsatz mit welchem Erzeugung gewichtet wird"
-#: builtin/log.c:1792
+#: builtin/log.c:1904
#, c-format
msgid "invalid ident line: %s"
msgstr "Ungültige Identifikationszeile: %s"
-#: builtin/log.c:1807
+#: builtin/log.c:1919
msgid "-n and -k are mutually exclusive"
-msgstr "-n und -k schließen sich gegenseitig aus."
+msgstr "-n und -k schließen sich gegenseitig aus"
-#: builtin/log.c:1809
+#: builtin/log.c:1921
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc und -k schließen sich gegenseitig aus."
+msgstr "--subject-prefix/--rfc und -k schließen sich gegenseitig aus"
-#: builtin/log.c:1817
+#: builtin/log.c:1929
msgid "--name-only does not make sense"
-msgstr "Die Option --name-only kann nicht verwendet werden."
+msgstr "--name-only kann nicht verwendet werden"
-#: builtin/log.c:1819
+#: builtin/log.c:1931
msgid "--name-status does not make sense"
-msgstr "Die Option --name-status kann nicht verwendet werden."
+msgstr "--name-status kann nicht verwendet werden"
-#: builtin/log.c:1821
+#: builtin/log.c:1933
msgid "--check does not make sense"
-msgstr "Die Option --check kann nicht verwendet werden."
+msgstr "--check kann nicht verwendet werden"
-#: builtin/log.c:1854
-msgid "standard output, or directory, which one?"
-msgstr "Standard-Ausgabe oder Verzeichnis, welches von beidem?"
+#: builtin/log.c:1955
+msgid "--stdout, --output, and --output-directory are mutually exclusive"
+msgstr ""
+"--stdout, --output und --output-directory schließen sich gegenseitig aus"
-#: builtin/log.c:1958
+#: builtin/log.c:2078
msgid "--interdiff requires --cover-letter or single patch"
-msgstr "--interdiff erfordert --cover-letter oder einzelnen Patch."
+msgstr "--interdiff erfordert --cover-letter oder einzelnen Patch"
-#: builtin/log.c:1962
+#: builtin/log.c:2082
msgid "Interdiff:"
msgstr "Interdiff:"
-#: builtin/log.c:1963
+#: builtin/log.c:2083
#, c-format
msgid "Interdiff against v%d:"
msgstr "Interdiff gegen v%d:"
-#: builtin/log.c:1969
+#: builtin/log.c:2089
msgid "--creation-factor requires --range-diff"
msgstr "--creation-factor erfordert --range-diff"
-#: builtin/log.c:1973
+#: builtin/log.c:2093
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff erfordert --cover-letter oder einzelnen Patch."
-#: builtin/log.c:1981
+#: builtin/log.c:2101
msgid "Range-diff:"
msgstr "Range-Diff:"
-#: builtin/log.c:1982
+#: builtin/log.c:2102
#, c-format
msgid "Range-diff against v%d:"
msgstr "Range-Diff gegen v%d:"
-#: builtin/log.c:1993
+#: builtin/log.c:2113
#, c-format
msgid "unable to read signature file '%s'"
msgstr "Konnte Signatur-Datei '%s' nicht lesen"
-#: builtin/log.c:2029
+#: builtin/log.c:2149
msgid "Generating patches"
msgstr "Erzeuge Patches"
-#: builtin/log.c:2073
+#: builtin/log.c:2193
msgid "failed to create output files"
msgstr "Fehler beim Erstellen der Ausgabedateien."
-#: builtin/log.c:2132
+#: builtin/log.c:2252
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<Upstream> [<Branch> [<Limit>]]]"
-#: builtin/log.c:2186
+#: builtin/log.c:2306
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -16072,115 +17296,119 @@
"Konnte gefolgten Remote-Branch nicht finden, bitte geben Sie <Upstream> "
"manuell an.\n"
-#: builtin/ls-files.c:470
+#: builtin/ls-files.c:486
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<Optionen>] [<Datei>...]"
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:542
msgid "identify the file status with tags"
msgstr "den Dateistatus mit Tags anzeigen"
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:544
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:546
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:548
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:550
msgid "show deleted files in the output"
msgstr "entfernte Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:552
msgid "show modified files in the output"
msgstr "geänderte Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:554
msgid "show other files in the output"
msgstr "sonstige Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:556
msgid "show ignored files in the output"
msgstr "ignorierte Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:559
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:561
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:563
msgid "show 'other' directories' names only"
msgstr "nur Namen von 'sonstigen' Verzeichnissen anzeigen"
-#: builtin/ls-files.c:549
+#: builtin/ls-files.c:565
msgid "show line endings of files"
msgstr "Zeilenenden von Dateien anzeigen"
-#: builtin/ls-files.c:551
+#: builtin/ls-files.c:567
msgid "don't show empty directories"
msgstr "keine leeren Verzeichnisse anzeigen"
-#: builtin/ls-files.c:554
+#: builtin/ls-files.c:570
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:572
msgid "show resolve-undo information"
msgstr "'resolve-undo' Informationen anzeigen"
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:574
msgid "skip files matching pattern"
msgstr "Dateien auslassen, die einem Muster entsprechen"
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:577
msgid "exclude patterns are read from <file>"
msgstr "Muster, gelesen von <Datei>, ausschließen"
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:580
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:582
msgid "add the standard git exclusions"
msgstr "die standardmäßigen Git-Ausschlüsse hinzufügen"
-#: builtin/ls-files.c:570
+#: builtin/ls-files.c:586
msgid "make the output relative to the project top directory"
msgstr "Ausgabe relativ zum Projektverzeichnis"
-#: builtin/ls-files.c:573
+#: builtin/ls-files.c:589
msgid "recurse through submodules"
msgstr "Rekursion in Submodulen durchführen"
-#: builtin/ls-files.c:575
+#: builtin/ls-files.c:591
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:592
msgid "tree-ish"
msgstr "Commit-Referenz"
-#: builtin/ls-files.c:577
+#: builtin/ls-files.c:593
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:595
msgid "show debugging data"
msgstr "Ausgaben zur Fehlersuche anzeigen"
+#: builtin/ls-files.c:597
+msgid "suppress duplicate entries"
+msgstr "doppelte Einträge unterdrücken"
+
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
@@ -16191,41 +17419,41 @@
" [-q | --quiet] [--exit-code] [--get-url]\n"
" [--symref] [<Repository> [<Referenzen>...]]"
-#: builtin/ls-remote.c:59
+#: builtin/ls-remote.c:60
msgid "do not print remote URL"
msgstr "URL des Remote-Repositories nicht ausgeben"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1404
msgid "exec"
msgstr "Programm"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
+#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
msgid "path of git-upload-pack on the remote host"
msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite"
-#: builtin/ls-remote.c:65
+#: builtin/ls-remote.c:66
msgid "limit to tags"
msgstr "auf Tags einschränken"
-#: builtin/ls-remote.c:66
+#: builtin/ls-remote.c:67
msgid "limit to heads"
msgstr "auf Branches einschränken"
-#: builtin/ls-remote.c:67
+#: builtin/ls-remote.c:68
msgid "do not show peeled tags"
msgstr "keine Tags anzeigen, die andere Tags enthalten"
-#: builtin/ls-remote.c:69
+#: builtin/ls-remote.c:70
msgid "take url.<base>.insteadOf into account"
msgstr "url.<Basis>.insteadOf berücksichtigen"
-#: builtin/ls-remote.c:72
+#: builtin/ls-remote.c:73
msgid "exit with exit code 2 if no matching refs are found"
msgstr ""
"mit Exit-Code 2 beenden, wenn keine übereinstimmenden Referenzen\n"
"gefunden wurden"
-#: builtin/ls-remote.c:75
+#: builtin/ls-remote.c:76
msgid "show underlying ref in addition to the object pointed by it"
msgstr "zusätzlich zum Objekt die darauf verweisenden Referenzen anzeigen"
@@ -16272,400 +17500,6 @@
msgid "empty mbox: '%s'"
msgstr "Leere mbox: '%s'"
-#: builtin/merge.c:55
-msgid "git merge [<options>] [<commit>...]"
-msgstr "git merge [<Optionen>] [<Commit>...]"
-
-#: builtin/merge.c:56
-msgid "git merge --abort"
-msgstr "git merge --abort"
-
-#: builtin/merge.c:57
-msgid "git merge --continue"
-msgstr "git merge --continue"
-
-#: builtin/merge.c:119
-msgid "switch `m' requires a value"
-msgstr "Schalter 'm' erfordert einen Wert."
-
-#: builtin/merge.c:142
-#, c-format
-msgid "option `%s' requires a value"
-msgstr "Option `%s' erfordert einen Wert."
-
-#: builtin/merge.c:188
-#, c-format
-msgid "Could not find merge strategy '%s'.\n"
-msgstr "Konnte Merge-Strategie '%s' nicht finden.\n"
-
-#: builtin/merge.c:189
-#, c-format
-msgid "Available strategies are:"
-msgstr "Verfügbare Strategien sind:"
-
-#: builtin/merge.c:194
-#, c-format
-msgid "Available custom strategies are:"
-msgstr "Verfügbare benutzerdefinierte Strategien sind:"
-
-#: builtin/merge.c:245 builtin/pull.c:132
-msgid "do not show a diffstat at the end of the merge"
-msgstr "keine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen"
-
-#: builtin/merge.c:248 builtin/pull.c:135
-msgid "show a diffstat at the end of the merge"
-msgstr "eine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen"
-
-#: builtin/merge.c:249 builtin/pull.c:138
-msgid "(synonym to --stat)"
-msgstr "(Synonym für --stat)"
-
-#: builtin/merge.c:251 builtin/pull.c:141
-msgid "add (at most <n>) entries from shortlog to merge commit message"
-msgstr ""
-"(höchstens <n>) Einträge von \"shortlog\" zur Beschreibung des Merge-Commits "
-"hinzufügen"
-
-#: builtin/merge.c:254 builtin/pull.c:147
-msgid "create a single commit instead of doing a merge"
-msgstr "einen einzelnen Commit anstatt eines Merges erzeugen"
-
-#: builtin/merge.c:256 builtin/pull.c:150
-msgid "perform a commit if the merge succeeds (default)"
-msgstr "einen Commit durchführen, wenn der Merge erfolgreich war (Standard)"
-
-#: builtin/merge.c:258 builtin/pull.c:153
-msgid "edit message before committing"
-msgstr "Bearbeitung der Beschreibung vor dem Commit"
-
-#: builtin/merge.c:260
-msgid "allow fast-forward (default)"
-msgstr "Vorspulen erlauben (Standard)"
-
-#: builtin/merge.c:262 builtin/pull.c:160
-msgid "abort if fast-forward is not possible"
-msgstr "abbrechen, wenn kein Vorspulen möglich ist"
-
-#: builtin/merge.c:266 builtin/pull.c:163
-msgid "verify that the named commit has a valid GPG signature"
-msgstr "den genannten Commit auf eine gültige GPG-Signatur überprüfen"
-
-#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167
-#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114
-msgid "strategy"
-msgstr "Strategie"
-
-#: builtin/merge.c:268 builtin/pull.c:168
-msgid "merge strategy to use"
-msgstr "zu verwendende Merge-Strategie"
-
-#: builtin/merge.c:269 builtin/pull.c:171
-msgid "option=value"
-msgstr "Option=Wert"
-
-#: builtin/merge.c:270 builtin/pull.c:172
-msgid "option for selected merge strategy"
-msgstr "Option für ausgewählte Merge-Strategie"
-
-#: builtin/merge.c:272
-msgid "merge commit message (for a non-fast-forward merge)"
-msgstr ""
-"Commit-Beschreibung zusammenführen (für einen Merge, der kein Vorspulen war)"
-
-#: builtin/merge.c:279
-msgid "abort the current in-progress merge"
-msgstr "den sich im Gange befindlichen Merge abbrechen"
-
-#: builtin/merge.c:281
-msgid "--abort but leave index and working tree alone"
-msgstr "--abort, aber Index und Arbeitsverzeichnis unverändert lassen"
-
-#: builtin/merge.c:283
-msgid "continue the current in-progress merge"
-msgstr "den sich im Gange befindlichen Merge fortsetzen"
-
-#: builtin/merge.c:285 builtin/pull.c:179
-msgid "allow merging unrelated histories"
-msgstr "erlaube das Zusammenführen von nicht zusammenhängenden Historien"
-
-#: builtin/merge.c:291
-msgid "bypass pre-merge-commit and commit-msg hooks"
-msgstr "Hooks pre-merge-commit und commit-msg umgehen"
-
-#: builtin/merge.c:308
-msgid "could not run stash."
-msgstr "Konnte \"stash\" nicht ausführen."
-
-#: builtin/merge.c:313
-msgid "stash failed"
-msgstr "\"stash\" fehlgeschlagen"
-
-#: builtin/merge.c:318
-#, c-format
-msgid "not a valid object: %s"
-msgstr "kein gültiges Objekt: %s"
-
-#: builtin/merge.c:340 builtin/merge.c:357
-msgid "read-tree failed"
-msgstr "read-tree fehlgeschlagen"
-
-#: builtin/merge.c:387
-msgid " (nothing to squash)"
-msgstr " (nichts zu quetschen)"
-
-#: builtin/merge.c:398
-#, c-format
-msgid "Squash commit -- not updating HEAD\n"
-msgstr "Quetsche Commit -- HEAD wird nicht aktualisiert\n"
-
-#: builtin/merge.c:448
-#, c-format
-msgid "No merge message -- not updating HEAD\n"
-msgstr "Keine Merge-Commit-Beschreibung -- HEAD wird nicht aktualisiert\n"
-
-#: builtin/merge.c:499
-#, c-format
-msgid "'%s' does not point to a commit"
-msgstr "'%s' zeigt auf keinen Commit"
-
-#: builtin/merge.c:586
-#, c-format
-msgid "Bad branch.%s.mergeoptions string: %s"
-msgstr "Ungültiger branch.%s.mergeoptions String: %s"
-
-#: builtin/merge.c:708
-msgid "Not handling anything other than two heads merge."
-msgstr "Es wird nur der Merge von zwei Branches behandelt."
-
-#: builtin/merge.c:722
-#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Unbekannte Option für merge-recursive: -X%s"
-
-#: builtin/merge.c:737
-#, c-format
-msgid "unable to write %s"
-msgstr "konnte %s nicht schreiben"
-
-#: builtin/merge.c:789
-#, c-format
-msgid "Could not read from '%s'"
-msgstr "konnte nicht von '%s' lesen"
-
-#: builtin/merge.c:798
-#, 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
-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 ""
-"Bitte geben Sie eine Commit-Beschreibung ein, um zu erklären, warum dieser\n"
-"Merge erforderlich ist, insbesondere wenn es einen aktualisierten\n"
-"Upstream-Branch mit einem Thema-Branch zusammenführt.\n"
-"\n"
-
-#: builtin/merge.c:809
-msgid "An empty message aborts the commit.\n"
-msgstr "Eine leere Commit-Beschreibung bricht den Commit ab.\n"
-
-#: builtin/merge.c:812
-#, c-format
-msgid ""
-"Lines starting with '%c' will be ignored, and an empty message aborts\n"
-"the commit.\n"
-msgstr ""
-"Zeilen, die mit '%c' beginnen, werden ignoriert,\n"
-"und eine leere Beschreibung bricht den Commit ab.\n"
-
-#: builtin/merge.c:865
-msgid "Empty commit message."
-msgstr "Leere Commit-Beschreibung"
-
-#: builtin/merge.c:880
-#, c-format
-msgid "Wonderful.\n"
-msgstr "Wunderbar.\n"
-
-#: builtin/merge.c:941
-#, c-format
-msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
-msgstr ""
-"Automatischer Merge fehlgeschlagen; beheben Sie die Konflikte und committen "
-"Sie dann das Ergebnis.\n"
-
-#: builtin/merge.c:980
-msgid "No current branch."
-msgstr "Sie befinden sich auf keinem Branch."
-
-#: builtin/merge.c:982
-msgid "No remote for the current branch."
-msgstr "Kein Remote-Repository für den aktuellen Branch."
-
-#: builtin/merge.c:984
-msgid "No default upstream defined for the current branch."
-msgstr ""
-"Es ist kein Standard-Upstream-Branch für den aktuellen Branch definiert."
-
-#: builtin/merge.c:989
-#, c-format
-msgid "No remote-tracking branch for %s from %s"
-msgstr "Kein Remote-Tracking-Branch für %s von %s"
-
-#: builtin/merge.c:1046
-#, c-format
-msgid "Bad value '%s' in environment '%s'"
-msgstr "Fehlerhafter Wert '%s' in Umgebungsvariable '%s'"
-
-#: builtin/merge.c:1149
-#, c-format
-msgid "not something we can merge in %s: %s"
-msgstr "nichts was wir in %s zusammenführen können: %s"
-
-#: builtin/merge.c:1183
-msgid "not something we can merge"
-msgstr "nichts was wir zusammenführen können"
-
-#: builtin/merge.c:1286
-msgid "--abort expects no arguments"
-msgstr "--abort akzeptiert keine Argumente"
-
-#: builtin/merge.c:1290
-msgid "There is no merge to abort (MERGE_HEAD missing)."
-msgstr "Es gibt keinen Merge abzubrechen (MERGE_HEAD fehlt)"
-
-#: builtin/merge.c:1299
-msgid "--quit expects no arguments"
-msgstr "--quit erwartet keine Argumente"
-
-#: builtin/merge.c:1312
-msgid "--continue expects no arguments"
-msgstr "--continue erwartet keine Argumente"
-
-#: builtin/merge.c:1316
-msgid "There is no merge in progress (MERGE_HEAD missing)."
-msgstr "Es ist kein Merge im Gange (MERGE_HEAD fehlt)."
-
-#: builtin/merge.c:1332
-msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you merge."
-msgstr ""
-"Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert).\n"
-"Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen."
-
-#: builtin/merge.c:1339
-msgid ""
-"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
-"Please, commit your changes before you merge."
-msgstr ""
-"Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert).\n"
-"Bitte committen Sie Ihre Änderungen, bevor Sie den Merge ausführen."
-
-#: builtin/merge.c:1342
-msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
-msgstr ""
-"Sie haben \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert)."
-
-#: builtin/merge.c:1356
-msgid "You cannot combine --squash with --no-ff."
-msgstr "Sie können --squash nicht mit --no-ff kombinieren."
-
-#: builtin/merge.c:1358
-msgid "You cannot combine --squash with --commit."
-msgstr "Sie können --squash nicht mit --commit kombinieren."
-
-#: builtin/merge.c:1374
-msgid "No commit specified and merge.defaultToUpstream not set."
-msgstr "Kein Commit angegeben und merge.defaultToUpstream ist nicht gesetzt."
-
-#: builtin/merge.c:1391
-msgid "Squash commit into empty head not supported yet"
-msgstr ""
-"Bin auf einem Commit, der noch geboren wird; kann \"squash\" nicht ausführen."
-
-#: builtin/merge.c:1393
-msgid "Non-fast-forward commit does not make sense into an empty head"
-msgstr ""
-"Nicht vorzuspulender Commit kann nicht in einem leeren Branch verwendet "
-"werden."
-
-#: builtin/merge.c:1398
-#, c-format
-msgid "%s - not something we can merge"
-msgstr "%s - nichts was wir zusammenführen können"
-
-#: builtin/merge.c:1400
-msgid "Can merge only exactly one commit into empty head"
-msgstr "Kann nur exakt einen Commit in einem leeren Branch zusammenführen."
-
-#: builtin/merge.c:1481
-msgid "refusing to merge unrelated histories"
-msgstr "Verweigere den Merge von nicht zusammenhängenden Historien."
-
-#: builtin/merge.c:1490
-msgid "Already up to date."
-msgstr "Bereits aktuell."
-
-#: builtin/merge.c:1500
-#, c-format
-msgid "Updating %s..%s\n"
-msgstr "Aktualisiere %s..%s\n"
-
-#: builtin/merge.c:1542
-#, c-format
-msgid "Trying really trivial in-index merge...\n"
-msgstr "Probiere wirklich trivialen \"in-index\"-Merge ...\n"
-
-#: builtin/merge.c:1549
-#, c-format
-msgid "Nope.\n"
-msgstr "Nein.\n"
-
-#: builtin/merge.c:1574
-msgid "Already up to date. Yeeah!"
-msgstr "Bereits aktuell."
-
-#: builtin/merge.c:1580
-msgid "Not possible to fast-forward, aborting."
-msgstr "Vorspulen nicht möglich, breche ab."
-
-#: builtin/merge.c:1603 builtin/merge.c:1668
-#, c-format
-msgid "Rewinding the tree to pristine...\n"
-msgstr "Rücklauf des Verzeichnisses bis zum Ursprung ...\n"
-
-#: builtin/merge.c:1607
-#, c-format
-msgid "Trying merge strategy %s...\n"
-msgstr "Probiere Merge-Strategie %s ...\n"
-
-#: builtin/merge.c:1659
-#, c-format
-msgid "No merge strategy handled the merge.\n"
-msgstr "Keine Merge-Strategie behandelt diesen Merge.\n"
-
-#: builtin/merge.c:1661
-#, c-format
-msgid "Merge with strategy %s failed.\n"
-msgstr "Merge mit Strategie %s fehlgeschlagen.\n"
-
-#: builtin/merge.c:1670
-#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
-msgstr "Benutzen Sie \"%s\", um die Auflösung per Hand vorzubereiten.\n"
-
-#: builtin/merge.c:1682
-#, 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>..."
@@ -16686,23 +17520,23 @@
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <Referenz> [<Commit>]"
-#: builtin/merge-base.c:153
+#: builtin/merge-base.c:143
msgid "output all common ancestors"
msgstr "Ausgabe aller gemeinsamen Vorgänger-Commits"
-#: builtin/merge-base.c:155
+#: 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:157
+#: 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:159
+#: 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:161
+#: builtin/merge-base.c:151
msgid "find where <commit> forked from reflog of <ref>"
msgstr "<Commit> finden, von wo Reflog von <Referenz> abgespalten wurde"
@@ -16777,6 +17611,442 @@
msgid "Merging %s with %s\n"
msgstr "Führe %s mit %s zusammen\n"
+#: builtin/merge.c:58
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<Optionen>] [<Commit>...]"
+
+#: builtin/merge.c:59
+msgid "git merge --abort"
+msgstr "git merge --abort"
+
+#: builtin/merge.c:60
+msgid "git merge --continue"
+msgstr "git merge --continue"
+
+#: builtin/merge.c:123
+msgid "switch `m' requires a value"
+msgstr "Schalter 'm' erfordert einen Wert."
+
+#: builtin/merge.c:146
+#, c-format
+msgid "option `%s' requires a value"
+msgstr "Option `%s' erfordert einen Wert."
+
+#: builtin/merge.c:199
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr "Konnte Merge-Strategie '%s' nicht finden.\n"
+
+#: builtin/merge.c:200
+#, c-format
+msgid "Available strategies are:"
+msgstr "Verfügbare Strategien sind:"
+
+#: builtin/merge.c:205
+#, c-format
+msgid "Available custom strategies are:"
+msgstr "Verfügbare benutzerdefinierte Strategien sind:"
+
+#: builtin/merge.c:256 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:259 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:260 builtin/pull.c:139
+msgid "(synonym to --stat)"
+msgstr "(Synonym für --stat)"
+
+#: builtin/merge.c:262 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:265 builtin/pull.c:148
+msgid "create a single commit instead of doing a merge"
+msgstr "einen einzelnen Commit erzeugen statt einen Merge durchzuführen"
+
+#: builtin/merge.c:267 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:269 builtin/pull.c:154
+msgid "edit message before committing"
+msgstr "Bearbeitung der Beschreibung vor dem Commit"
+
+#: builtin/merge.c:271
+msgid "allow fast-forward (default)"
+msgstr "Vorspulen erlauben (Standard)"
+
+#: builtin/merge.c:273 builtin/pull.c:161
+msgid "abort if fast-forward is not possible"
+msgstr "abbrechen, wenn kein Vorspulen möglich ist"
+
+#: builtin/merge.c:277 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:278 builtin/notes.c:787 builtin/pull.c:168
+#: builtin/rebase.c:541 builtin/rebase.c:1418 builtin/revert.c:114
+msgid "strategy"
+msgstr "Strategie"
+
+#: builtin/merge.c:279 builtin/pull.c:169
+msgid "merge strategy to use"
+msgstr "zu verwendende Merge-Strategie"
+
+#: builtin/merge.c:280 builtin/pull.c:172
+msgid "option=value"
+msgstr "Option=Wert"
+
+#: builtin/merge.c:281 builtin/pull.c:173
+msgid "option for selected merge strategy"
+msgstr "Option für ausgewählte Merge-Strategie"
+
+#: builtin/merge.c:283
+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:290
+msgid "abort the current in-progress merge"
+msgstr "den sich im Gange befindlichen Merge abbrechen"
+
+#: builtin/merge.c:292
+msgid "--abort but leave index and working tree alone"
+msgstr "--abort, aber Index und Arbeitsverzeichnis unverändert lassen"
+
+#: builtin/merge.c:294
+msgid "continue the current in-progress merge"
+msgstr "den sich im Gange befindlichen Merge fortsetzen"
+
+#: builtin/merge.c:296 builtin/pull.c:180
+msgid "allow merging unrelated histories"
+msgstr "erlaube das Zusammenführen von nicht zusammenhängenden Historien"
+
+#: builtin/merge.c:303
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr "Hooks pre-merge-commit und commit-msg umgehen"
+
+#: builtin/merge.c:320
+msgid "could not run stash."
+msgstr "Konnte \"stash\" nicht ausführen."
+
+#: builtin/merge.c:325
+msgid "stash failed"
+msgstr "\"stash\" fehlgeschlagen"
+
+#: builtin/merge.c:330
+#, c-format
+msgid "not a valid object: %s"
+msgstr "kein gültiges Objekt: %s"
+
+#: builtin/merge.c:352 builtin/merge.c:369
+msgid "read-tree failed"
+msgstr "read-tree fehlgeschlagen"
+
+#: builtin/merge.c:399
+msgid " (nothing to squash)"
+msgstr " (nichts zu quetschen)"
+
+#: builtin/merge.c:410
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr "Quetsche Commit -- HEAD wird nicht aktualisiert\n"
+
+#: builtin/merge.c:460
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr "Keine Merge-Commit-Beschreibung -- HEAD wird nicht aktualisiert\n"
+
+#: builtin/merge.c:511
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr "'%s' zeigt auf keinen Commit"
+
+#: builtin/merge.c:598
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr "Ungültiger branch.%s.mergeoptions String: %s"
+
+#: builtin/merge.c:724
+msgid "Not handling anything other than two heads merge."
+msgstr "Es wird nur der Merge von zwei Branches behandelt."
+
+#: builtin/merge.c:737
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr "Unbekannte Option für merge-recursive: -X%s"
+
+#: builtin/merge.c:756 t/helper/test-fast-rebase.c:209
+#, c-format
+msgid "unable to write %s"
+msgstr "konnte %s nicht schreiben"
+
+#: builtin/merge.c:808
+#, c-format
+msgid "Could not read from '%s'"
+msgstr "konnte nicht von '%s' lesen"
+
+#: builtin/merge.c:817
+#, 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:823
+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 ""
+"Bitte geben Sie eine Commit-Beschreibung ein, um zu erklären, warum dieser\n"
+"Merge erforderlich ist, insbesondere wenn es einen aktualisierten\n"
+"Upstream-Branch mit einem Thema-Branch zusammenführt.\n"
+"\n"
+
+#: builtin/merge.c:828
+msgid "An empty message aborts the commit.\n"
+msgstr "Eine leere Commit-Beschreibung bricht den Commit ab.\n"
+
+#: builtin/merge.c:831
+#, c-format
+msgid ""
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
+"Zeilen, die mit '%c' beginnen, werden ignoriert,\n"
+"und eine leere Beschreibung bricht den Commit ab.\n"
+
+#: builtin/merge.c:884
+msgid "Empty commit message."
+msgstr "Leere Commit-Beschreibung"
+
+#: builtin/merge.c:899
+#, c-format
+msgid "Wonderful.\n"
+msgstr "Wunderbar.\n"
+
+#: builtin/merge.c:960
+#, 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:999
+msgid "No current branch."
+msgstr "Sie befinden sich auf keinem Branch."
+
+#: builtin/merge.c:1001
+msgid "No remote for the current branch."
+msgstr "Kein Remote-Repository für den aktuellen Branch."
+
+#: builtin/merge.c:1003
+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:1008
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
+msgstr "Kein Remote-Tracking-Branch für %s von %s"
+
+#: builtin/merge.c:1065
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "Fehlerhafter Wert '%s' in Umgebungsvariable '%s'"
+
+#: builtin/merge.c:1168
+#, 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:1202
+msgid "not something we can merge"
+msgstr "nichts was wir zusammenführen können"
+
+#: builtin/merge.c:1312
+msgid "--abort expects no arguments"
+msgstr "--abort akzeptiert keine Argumente"
+
+#: builtin/merge.c:1316
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr "Es gibt keinen Merge abzubrechen (MERGE_HEAD fehlt)"
+
+#: builtin/merge.c:1334
+msgid "--quit expects no arguments"
+msgstr "--quit erwartet keine Argumente"
+
+#: builtin/merge.c:1347
+msgid "--continue expects no arguments"
+msgstr "--continue erwartet keine Argumente"
+
+#: builtin/merge.c:1351
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr "Es ist kein Merge im Gange (MERGE_HEAD fehlt)."
+
+#: builtin/merge.c:1367
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
+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:1374
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
+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:1377
+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:1391
+msgid "You cannot combine --squash with --no-ff."
+msgstr "Sie können --squash nicht mit --no-ff kombinieren."
+
+#: builtin/merge.c:1393
+msgid "You cannot combine --squash with --commit."
+msgstr "Sie können --squash nicht mit --commit kombinieren."
+
+#: builtin/merge.c:1409
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr "Kein Commit angegeben und merge.defaultToUpstream ist nicht gesetzt."
+
+#: builtin/merge.c:1426
+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:1428
+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:1433
+#, c-format
+msgid "%s - not something we can merge"
+msgstr "%s - nichts was wir zusammenführen können"
+
+#: builtin/merge.c:1435
+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:1516
+msgid "refusing to merge unrelated histories"
+msgstr "Verweigere den Merge von nicht zusammenhängenden Historien."
+
+#: builtin/merge.c:1525
+msgid "Already up to date."
+msgstr "Bereits aktuell."
+
+#: builtin/merge.c:1535
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr "Aktualisiere %s..%s\n"
+
+#: builtin/merge.c:1581
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr "Probiere wirklich trivialen \"in-index\"-Merge ...\n"
+
+#: builtin/merge.c:1588
+#, c-format
+msgid "Nope.\n"
+msgstr "Nein.\n"
+
+#: builtin/merge.c:1613
+msgid "Already up to date. Yeeah!"
+msgstr "Bereits aktuell."
+
+#: builtin/merge.c:1619
+msgid "Not possible to fast-forward, aborting."
+msgstr "Vorspulen nicht möglich, breche ab."
+
+#: builtin/merge.c:1647 builtin/merge.c:1712
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr "Rücklauf des Verzeichnisses bis zum Ursprung ...\n"
+
+#: builtin/merge.c:1651
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr "Probiere Merge-Strategie %s ...\n"
+
+#: builtin/merge.c:1703
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr "Keine Merge-Strategie behandelt diesen Merge.\n"
+
+#: builtin/merge.c:1705
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr "Merge mit Strategie %s fehlgeschlagen.\n"
+
+#: builtin/merge.c:1714
+#, 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:1728
+#, 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/mktag.c:10
+msgid "git mktag"
+msgstr "git mktag"
+
+#: builtin/mktag.c:30
+#, c-format
+msgid "warning: tag input does not pass fsck: %s"
+msgstr "Warnung: Tag-Eingabe ungültig für fsck: %s"
+
+#: builtin/mktag.c:41
+#, c-format
+msgid "error: tag input does not pass fsck: %s"
+msgstr "Fehler: Tag-Eingabe ungültig für fsck: %s"
+
+#: builtin/mktag.c:44
+#, c-format
+msgid "%d (FSCK_IGNORE?) should never trigger this callback"
+msgstr "%d (FSCK_IGNORE?) sollte diesen Aufruf niemals auslösen"
+
+#: builtin/mktag.c:59
+#, c-format
+msgid "could not read tagged object '%s'"
+msgstr "konnte getaggtes Objekt '%s' nicht lesen"
+
+#: builtin/mktag.c:62
+#, c-format
+msgid "object '%s' tagged as '%s', but is a '%s' type"
+msgstr "Objekt '%s' als '%s' getaggt, aber ist ein '%s' Typ"
+
+#: builtin/mktag.c:99
+msgid "tag on stdin did not pass our strict fsck check"
+msgstr ""
+"Tag von der Standardeingabe für unsere strenge Überprüfung bei fsck ungültig"
+
+#: builtin/mktag.c:102
+msgid "tag on stdin did not refer to a valid object"
+msgstr "Tag von der Standard-Eingabe verweiste nicht auf gültiges Objekt"
+
+#: builtin/mktag.c:105 builtin/tag.c:232
+msgid "unable to write tag file"
+msgstr "konnte Tag-Datei nicht schreiben"
+
#: builtin/mktree.c:66
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
@@ -16814,7 +18084,10 @@
"Während des Umpackens, sammle Paket-Dateien von geringerer Größe in "
"einenStapel, welcher größer ist als diese Größe"
-#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67
+#: builtin/multi-pack-index.c:50 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 builtin/prune-packed.c:25 builtin/tag.c:575
msgid "too many arguments"
msgstr "Zu viele Argumente."
@@ -16856,68 +18129,72 @@
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:781 builtin/repack.c:518
+#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:483
#, c-format
msgid "renaming '%s' failed"
msgstr "Umbenennung von '%s' fehlgeschlagen"
@@ -16935,8 +18212,8 @@
msgstr "git name-rev [<Optionen>] --stdin"
#: builtin/name-rev.c:524
-msgid "print only names (no SHA-1)"
-msgstr "nur Namen anzeigen (keine SHA-1)"
+msgid "print only ref-based names (no object names)"
+msgstr "nur Referenzen-basierte Namen ausgeben (keine Objektnamen)"
#: builtin/name-rev.c:525
msgid "only use tags to name the commits"
@@ -17110,7 +18387,7 @@
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:565
#, c-format
msgid "could not open or read '%s'"
msgstr "konnte '%s' nicht öffnen oder lesen"
@@ -17152,12 +18429,6 @@
"Ausführung von %s auf Notizen in %s (außerhalb von refs/notes/) "
"zurückgewiesen"
-#: 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 "zu viele Parameter"
-
#: builtin/notes.c:389 builtin/notes.c:678
#, c-format
msgid "no note found for object %s."
@@ -17217,8 +18488,8 @@
"stdin)"
#: builtin/notes.c:517
-msgid "too few parameters"
-msgstr "zu wenig Parameter"
+msgid "too few arguments"
+msgstr "zu wenige Argumente"
#: builtin/notes.c:538
#, c-format
@@ -17350,7 +18621,7 @@
"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:578
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
@@ -17368,7 +18639,7 @@
msgid "read object names from the standard input"
msgstr "Objektnamen von der Standard-Eingabe lesen"
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148
msgid "do not remove, show only"
msgstr "nicht löschen, nur anzeigen"
@@ -17384,376 +18655,417 @@
msgid "use notes from <notes-ref>"
msgstr "Notizen von <Notiz-Referenz> verwenden"
-#: builtin/notes.c:1034 builtin/stash.c:1643
+#: builtin/notes.c:1034 builtin/stash.c:1671
#, 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:430
+#: builtin/pack-objects.c:440
+#, c-format
+msgid ""
+"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
+"pack %s"
+msgstr ""
+"write_reuse_object: konnte %s nicht finden, erwartet bei Offset %<PRIuMAX> "
+"in Paket %s"
+
+#: builtin/pack-objects.c:448
#, c-format
msgid "bad packed object CRC for %s"
msgstr "Ungültiges CRC für gepacktes Objekt %s."
-#: builtin/pack-objects.c:441
+#: builtin/pack-objects.c:459
#, c-format
msgid "corrupt packed object for %s"
msgstr "Fehlerhaftes gepacktes Objekt für %s."
-#: builtin/pack-objects.c:572
+#: builtin/pack-objects.c:590
#, c-format
msgid "recursive delta detected for object %s"
msgstr "Rekursiver Unterschied für Objekt %s festgestellt."
-#: builtin/pack-objects.c:783
+#: builtin/pack-objects.c:801
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "%u Objekte geordnet, %<PRIu32> erwartet."
-#: builtin/pack-objects.c:972
+#: builtin/pack-objects.c:896
+#, c-format
+msgid "expected object at offset %<PRIuMAX> in pack %s"
+msgstr "Objekt beim Offset %<PRIuMAX> in Paket %s erwartet"
+
+#: builtin/pack-objects.c:1015
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"Deaktiviere Schreiben der Bitmap, Pakete wurden durch pack.packSizeLimit\n"
"aufgetrennt."
-#: builtin/pack-objects.c:985
+#: builtin/pack-objects.c:1028
msgid "Writing objects"
msgstr "Schreibe Objekte"
-#: builtin/pack-objects.c:1046 builtin/update-index.c:90
+#: builtin/pack-objects.c:1089 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "Konnte '%s' nicht lesen"
-#: builtin/pack-objects.c:1099
+#: builtin/pack-objects.c:1141
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "Schrieb %<PRIu32> Objekte während %<PRIu32> erwartet waren."
-#: builtin/pack-objects.c:1297
+#: builtin/pack-objects.c:1358
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
"Deaktiviere Schreiben der Bitmap, da einige Objekte nicht in eine Pack-"
"Datei\n"
"geschrieben wurden."
-#: builtin/pack-objects.c:1724
+#: builtin/pack-objects.c:1806
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "\"delta base offset\" Überlauf in Paket für %s"
-#: builtin/pack-objects.c:1733
+#: builtin/pack-objects.c:1815
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "\"delta base offset\" liegt außerhalb des gültigen Bereichs für %s"
-#: builtin/pack-objects.c:2004
+#: builtin/pack-objects.c:2096
msgid "Counting objects"
msgstr "Zähle Objekte"
-#: builtin/pack-objects.c:2149
+#: builtin/pack-objects.c:2241
#, c-format
msgid "unable to parse object header of %s"
msgstr "Konnte Kopfbereich von Objekt '%s' nicht parsen."
-#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235
-#: builtin/pack-objects.c:2245
+#: builtin/pack-objects.c:2311 builtin/pack-objects.c:2327
+#: builtin/pack-objects.c:2337
#, c-format
msgid "object %s cannot be read"
msgstr "Objekt %s kann nicht gelesen werden."
-#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249
+#: builtin/pack-objects.c:2314 builtin/pack-objects.c:2341
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr "Inkonsistente Objektlänge bei Objekt %s (%<PRIuMAX> vs %<PRIuMAX>)"
-#: builtin/pack-objects.c:2259
+#: builtin/pack-objects.c:2351
msgid "suboptimal pack - out of memory"
msgstr "ungünstiges Packet - Speicher voll"
-#: builtin/pack-objects.c:2574
+#: builtin/pack-objects.c:2666
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Delta-Kompression verwendet bis zu %d Threads."
-#: builtin/pack-objects.c:2713
+#: builtin/pack-objects.c:2805
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "Konnte keine Objekte packen, die von Tag %s erreichbar sind."
-#: builtin/pack-objects.c:2801
+#: builtin/pack-objects.c:2891
msgid "Compressing objects"
msgstr "Komprimiere Objekte"
-#: builtin/pack-objects.c:2807
+#: builtin/pack-objects.c:2897
msgid "inconsistency with delta count"
msgstr "Inkonsistenz mit der Anzahl von Deltas"
-#: builtin/pack-objects.c:2888
+#: builtin/pack-objects.c:2976
+#, 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:2979
+#, 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:3008
#, 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:2894
+#: builtin/pack-objects.c:3014
#, 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:2992
+#: builtin/pack-objects.c:3112
msgid "invalid value for --missing"
-msgstr "Ungültiger Wert für --missing."
+msgstr "ungültiger Wert für --missing"
-#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159
+#: builtin/pack-objects.c:3171 builtin/pack-objects.c:3279
msgid "cannot open pack index"
-msgstr "Kann Paketindex nicht öffnen."
+msgstr "kann Paketindex nicht öffnen"
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3202
#, 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:3167
+#: builtin/pack-objects.c:3287
msgid "unable to force loose object"
-msgstr "Konnte loses Objekt nicht erzwingen."
+msgstr "konnte loses Objekt nicht erzwingen"
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3380
#, c-format
msgid "not a rev '%s'"
-msgstr "'%s' ist kein Commit."
-
-#: builtin/pack-objects.c:3263
-#, c-format
-msgid "bad revision '%s'"
-msgstr "Ungültiger Commit '%s'."
-
-#: builtin/pack-objects.c:3288
-msgid "unable to add recent objects"
-msgstr "Konnte jüngste Objekte nicht hinzufügen."
-
-#: builtin/pack-objects.c:3341
-#, c-format
-msgid "unsupported index version %s"
-msgstr "Nicht unterstützte Index-Version %s"
-
-#: builtin/pack-objects.c:3345
-#, c-format
-msgid "bad index version '%s'"
-msgstr "Ungültige Index-Version '%s'"
+msgstr "'%s' ist kein Commit"
#: builtin/pack-objects.c:3383
+#, c-format
+msgid "bad revision '%s'"
+msgstr "ungültiger Commit '%s'"
+
+#: builtin/pack-objects.c:3408
+msgid "unable to add recent objects"
+msgstr "konnte neuere Objekte nicht hinzufügen"
+
+#: builtin/pack-objects.c:3461
+#, c-format
+msgid "unsupported index version %s"
+msgstr "nicht unterstützte Index-Version %s"
+
+#: builtin/pack-objects.c:3465
+#, c-format
+msgid "bad index version '%s'"
+msgstr "ungültige Index-Version '%s'"
+
+#: builtin/pack-objects.c:3503
msgid "<version>[,<offset>]"
msgstr "<Version>[,<Offset>]"
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3504
msgid "write the pack index file in the specified idx format version"
msgstr ""
"die Index-Datei des Paketes in der angegebenen Indexformat-Version schreiben"
-#: builtin/pack-objects.c:3387
+#: builtin/pack-objects.c:3507
msgid "maximum size of each output pack file"
msgstr "maximale Größe für jede ausgegebene Paketdatei"
-#: builtin/pack-objects.c:3389
+#: builtin/pack-objects.c:3509
msgid "ignore borrowed objects from alternate object store"
msgstr "geliehene Objekte von alternativem Objektspeicher ignorieren"
-#: builtin/pack-objects.c:3391
+#: builtin/pack-objects.c:3511
msgid "ignore packed objects"
msgstr "gepackte Objekte ignorieren"
-#: builtin/pack-objects.c:3393
+#: builtin/pack-objects.c:3513
msgid "limit pack window by objects"
msgstr "Paketfenster durch Objekte begrenzen"
-#: builtin/pack-objects.c:3395
+#: builtin/pack-objects.c:3515
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"Paketfenster, zusätzlich zur Objektbegrenzung, durch Speicher begrenzen"
-#: builtin/pack-objects.c:3397
+#: builtin/pack-objects.c:3517
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
"maximale Länge der erlaubten Differenzverkettung im resultierenden Paket"
-#: builtin/pack-objects.c:3399
+#: builtin/pack-objects.c:3519
msgid "reuse existing deltas"
msgstr "existierende Unterschiede wiederverwenden"
-#: builtin/pack-objects.c:3401
+#: builtin/pack-objects.c:3521
msgid "reuse existing objects"
msgstr "existierende Objekte wiederverwenden"
-#: builtin/pack-objects.c:3403
+#: builtin/pack-objects.c:3523
msgid "use OFS_DELTA objects"
msgstr "OFS_DELTA Objekte verwenden"
-#: builtin/pack-objects.c:3405
+#: builtin/pack-objects.c:3525
msgid "use threads when searching for best delta matches"
msgstr ""
"Threads bei der Suche nach den besten Übereinstimmungen bei Unterschieden "
"verwenden"
-#: builtin/pack-objects.c:3407
+#: builtin/pack-objects.c:3527
msgid "do not create an empty pack output"
msgstr "keine leeren Pakete erzeugen"
-#: builtin/pack-objects.c:3409
+#: builtin/pack-objects.c:3529
msgid "read revision arguments from standard input"
msgstr "Argumente bezüglich Commits von der Standard-Eingabe lesen"
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:3531
msgid "limit the objects to those that are not yet packed"
msgstr "die Objekte zu solchen, die noch nicht gepackt wurden, begrenzen"
-#: builtin/pack-objects.c:3414
+#: builtin/pack-objects.c:3534
msgid "include objects reachable from any reference"
msgstr "Objekte einschließen, die von jeder Referenz erreichbar sind"
-#: builtin/pack-objects.c:3417
+#: builtin/pack-objects.c:3537
msgid "include objects referred by reflog entries"
msgstr ""
"Objekte einschließen, die von Einträgen des Reflogs referenziert werden"
-#: builtin/pack-objects.c:3420
+#: builtin/pack-objects.c:3540
msgid "include objects referred to by the index"
msgstr "Objekte einschließen, die vom Index referenziert werden"
-#: builtin/pack-objects.c:3423
+#: builtin/pack-objects.c:3543
msgid "output pack to stdout"
msgstr "Paket in die Standard-Ausgabe schreiben"
-#: builtin/pack-objects.c:3425
+#: builtin/pack-objects.c:3545
msgid "include tag objects that refer to objects to be packed"
msgstr "Tag-Objekte einschließen, die auf gepackte Objekte referenzieren"
-#: builtin/pack-objects.c:3427
+#: builtin/pack-objects.c:3547
msgid "keep unreachable objects"
msgstr "nicht erreichbare Objekte behalten"
-#: builtin/pack-objects.c:3429
+#: builtin/pack-objects.c:3549
msgid "pack loose unreachable objects"
msgstr "nicht erreichbare lose Objekte packen"
-#: builtin/pack-objects.c:3431
+#: builtin/pack-objects.c:3551
msgid "unpack unreachable objects newer than <time>"
msgstr "nicht erreichbare Objekte entpacken, die neuer als <Zeit> sind"
-#: builtin/pack-objects.c:3434
+#: builtin/pack-objects.c:3554
msgid "use the sparse reachability algorithm"
msgstr "den \"sparse\" Algorithmus zur Bestimmung der Erreichbarkeit benutzen"
-#: builtin/pack-objects.c:3436
+#: builtin/pack-objects.c:3556
msgid "create thin packs"
msgstr "dünnere Pakete erzeugen"
-#: builtin/pack-objects.c:3438
+#: builtin/pack-objects.c:3558
msgid "create packs suitable for shallow fetches"
msgstr ""
"Pakete geeignet für Abholung mit unvollständiger Historie (shallow) erzeugen"
-#: builtin/pack-objects.c:3440
+#: builtin/pack-objects.c:3560
msgid "ignore packs that have companion .keep file"
msgstr "Pakete ignorieren, die .keep Dateien haben"
-#: builtin/pack-objects.c:3442
+#: builtin/pack-objects.c:3562
msgid "ignore this pack"
msgstr "dieses Paket ignorieren"
-#: builtin/pack-objects.c:3444
+#: builtin/pack-objects.c:3564
msgid "pack compression level"
msgstr "Komprimierungsgrad für Paketierung"
-#: builtin/pack-objects.c:3446
+#: builtin/pack-objects.c:3566
msgid "do not hide commits by grafts"
msgstr "keine künstlichen Vorgänger-Commits (\"grafts\") verbergen"
-#: builtin/pack-objects.c:3448
+#: builtin/pack-objects.c:3568
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"Bitmap-Index (falls verfügbar) zur Optimierung der Objektzählung benutzen"
-#: builtin/pack-objects.c:3450
+#: builtin/pack-objects.c:3570
msgid "write a bitmap index together with the pack index"
msgstr "Bitmap-Index zusammen mit Pack-Index schreiben"
-#: builtin/pack-objects.c:3454
+#: builtin/pack-objects.c:3574
msgid "write a bitmap index if possible"
msgstr "Bitmap-Index schreiben, wenn möglich"
-#: builtin/pack-objects.c:3458
+#: builtin/pack-objects.c:3578
msgid "handling for missing objects"
msgstr "Behandlung für fehlende Objekte"
-#: builtin/pack-objects.c:3461
+#: builtin/pack-objects.c:3581
msgid "do not pack objects in promisor packfiles"
msgstr ""
"keine Objekte aus Packdateien von partiell geklonten Remote-Repositories "
"packen"
-#: builtin/pack-objects.c:3463
+#: builtin/pack-objects.c:3583
msgid "respect islands during delta compression"
msgstr "Delta-Islands bei Delta-Kompression beachten"
-#: builtin/pack-objects.c:3492
+#: builtin/pack-objects.c:3585
+msgid "protocol"
+msgstr "Protokoll"
+
+#: builtin/pack-objects.c:3586
+msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
+msgstr ""
+"jegliche konfigurierte uploadpack.blobpackfileuri für dieses Protkoll "
+"ausschließen"
+
+#: builtin/pack-objects.c:3617
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "Tiefe für Verkettung von Unterschieden %d ist zu tief, erzwinge %d"
-#: builtin/pack-objects.c:3497
+#: builtin/pack-objects.c:3622
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "pack.deltaCacheLimit ist zu hoch, erzwinge %d"
-#: builtin/pack-objects.c:3551
+#: builtin/pack-objects.c:3676
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
"--max-pack-size kann nicht für die Erstellung eines Pakets für eine "
"Übertragung\n"
"benutzt werden."
-#: builtin/pack-objects.c:3553
+#: builtin/pack-objects.c:3678
msgid "minimum pack size limit is 1 MiB"
msgstr "Minimales Limit für die Paketgröße ist 1 MiB."
-#: builtin/pack-objects.c:3558
+#: builtin/pack-objects.c:3683
msgid "--thin cannot be used to build an indexable pack"
msgstr ""
"--thin kann nicht benutzt werden, um ein indizierbares Paket zu erstellen."
-#: builtin/pack-objects.c:3561
+#: builtin/pack-objects.c:3686
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable und --unpack-unreachable sind inkompatibel"
-#: builtin/pack-objects.c:3567
+#: builtin/pack-objects.c:3692
msgid "cannot use --filter without --stdout"
msgstr "Kann --filter nicht ohne --stdout benutzen."
-#: builtin/pack-objects.c:3627
+#: builtin/pack-objects.c:3752
msgid "Enumerating objects"
msgstr "Objekte aufzählen"
-#: builtin/pack-objects.c:3657
+#: builtin/pack-objects.c:3783
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -17762,6 +19074,21 @@
"Gesamt %<PRIu32> (Delta %<PRIu32>), Wiederverwendet %<PRIu32> (Delta "
"%<PRIu32>), Pack wiederverwendet %<PRIu32>"
+#: builtin/pack-redundant.c:601
+msgid ""
+"'git pack-redundant' is nominated for removal.\n"
+"If you still use this command, please add an extra\n"
+"option, '--i-still-use-this', on the command line\n"
+"and let us know you still use it by sending an e-mail\n"
+"to <git@vger.kernel.org>. Thanks.\n"
+msgstr ""
+"'git pack-redundant' ist für die Entfernung vorgesehen.\n"
+"Wenn Sie diesen Befehl weiterhin verwenden, fügen Sie\n"
+"bitte eine zusätzliche Option '--i-still-use-this' in\n"
+"der Befehlszeile hinzu und lassen Sie uns wissen, dass\n"
+"Sie es immer noch verwenden, indem Sie eine E-Mail an\n"
+"<git@vger.kernel.org> senden. Danke.\n"
+
#: builtin/pack-refs.c:8
msgid "git pack-refs [<options>]"
msgstr "git pack-refs [<Optionen>]"
@@ -17774,33 +19101,29 @@
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"
@@ -17813,44 +19136,44 @@
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<Optionen>] [<Repository> [<Refspec>...]]"
-#: builtin/pull.c:122
+#: builtin/pull.c:123
msgid "control for recursive fetching of submodules"
msgstr "rekursive Anforderungen von Submodulen kontrollieren"
-#: builtin/pull.c:126
+#: builtin/pull.c:127
msgid "Options related to merging"
msgstr "Optionen bezogen auf Merge"
-#: builtin/pull.c:129
+#: builtin/pull.c:130
msgid "incorporate changes by rebasing rather than merging"
msgstr "Integration von Änderungen durch Rebase statt Merge"
-#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126
+#: builtin/pull.c:158 builtin/rebase.c:492 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "Vorspulen erlauben"
-#: builtin/pull.c:166
-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:182
+#: builtin/pull.c:183
msgid "Options related to fetching"
msgstr "Optionen bezogen auf Fetch"
-#: builtin/pull.c:192
+#: builtin/pull.c:193
msgid "force overwrite of local branch"
msgstr "das Überschreiben von lokalen Branches erzwingen"
-#: builtin/pull.c:200
+#: builtin/pull.c:201
msgid "number of submodules pulled in parallel"
msgstr "Anzahl der parallel mit 'pull' zu verarbeitenden Submodule"
-#: builtin/pull.c:300
+#: 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:426
+#: builtin/pull.c:445
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -17858,14 +19181,14 @@
"Es gibt keinen Kandidaten für Rebase innerhalb der Referenzen, die eben "
"angefordert wurden."
-#: builtin/pull.c:428
+#: builtin/pull.c:447
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"Es gibt keine Kandidaten für Merge innerhalb der Referenzen, die eben "
"angefordert wurden."
-#: builtin/pull.c:429
+#: builtin/pull.c:448
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -17873,7 +19196,7 @@
"Im Allgemeinen bedeutet das, dass Sie einen Refspec mit Wildcards angegeben\n"
"haben, der auf der Gegenseite mit keinen Referenzen übereinstimmt."
-#: builtin/pull.c:432
+#: builtin/pull.c:451
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -17885,39 +19208,38 @@
"Repository für den aktuellen Branch ist, müssen Sie einen Branch auf\n"
"der Befehlszeile angeben."
-#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73
+#: builtin/pull.c:456 builtin/rebase.c:1253
msgid "You are not currently on a branch."
msgstr "Im Moment auf keinem Branch."
-#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79
+#: builtin/pull.c:458 builtin/pull.c:473
msgid "Please specify which branch you want to rebase against."
msgstr ""
"Bitte geben Sie den Branch an, gegen welchen Sie \"rebase\" ausführen "
"möchten."
-#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82
+#: builtin/pull.c:460 builtin/pull.c:475
msgid "Please specify which branch you want to merge with."
msgstr "Bitte geben Sie den Branch an, welchen Sie zusammenführen möchten."
-#: builtin/pull.c:442 builtin/pull.c:457
+#: builtin/pull.c:461 builtin/pull.c:476
msgid "See git-pull(1) for details."
msgstr "Siehe git-pull(1) für weitere Details."
-#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459
-#: builtin/rebase.c:1415 git-parse-remote.sh:64
+#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
+#: builtin/rebase.c:1259
msgid "<remote>"
msgstr "<Remote-Repository>"
-#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464
-#: git-parse-remote.sh:65
+#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
msgid "<branch>"
msgstr "<Branch>"
-#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75
+#: builtin/pull.c:471 builtin/rebase.c:1251
msgid "There is no tracking information for the current branch."
msgstr "Es gibt keine Tracking-Informationen für den aktuellen Branch."
-#: builtin/pull.c:461 git-parse-remote.sh:95
+#: builtin/pull.c:480
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
@@ -17925,7 +19247,7 @@
"Sie\n"
"dies tun mit:"
-#: builtin/pull.c:466
+#: builtin/pull.c:485
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -17935,34 +19257,60 @@
"des Remote-Repositories durchzuführen, aber diese Referenz\n"
"wurde nicht angefordert."
-#: builtin/pull.c:576
+#: builtin/pull.c:596
#, c-format
msgid "unable to access commit %s"
msgstr "Konnte nicht auf Commit '%s' zugreifen."
-#: builtin/pull.c:857
+#: builtin/pull.c:902
msgid "ignoring --verify-signatures for rebase"
msgstr "Ignoriere --verify-signatures für Rebase"
-#: builtin/pull.c:912
-msgid "--[no-]autostash option is only valid with --rebase."
-msgstr "--[no-]autostash ist nur mit --rebase zulässig."
+#: builtin/pull.c:930
+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:920
+#: builtin/pull.c:991
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
"Aktualisiere einen ungeborenen Branch mit Änderungen, die zum Commit "
"vorgemerkt sind."
-#: builtin/pull.c:924
+#: builtin/pull.c:995
msgid "pull with rebase"
msgstr "Pull mit Rebase"
-#: builtin/pull.c:925
+#: builtin/pull.c:996
msgid "please commit or stash them."
msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"."
-#: builtin/pull.c:950
+#: builtin/pull.c:1021
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -17972,7 +19320,7 @@
"\"fetch\" aktualisierte die Spitze des aktuellen Branches.\n"
"Spule Ihr Arbeitsverzeichnis von Commit %s vor."
-#: builtin/pull.c:956
+#: builtin/pull.c:1027
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -17989,15 +19337,15 @@
"$ git reset --hard\n"
"zur Wiederherstellung aus."
-#: builtin/pull.c:971
+#: builtin/pull.c:1042
msgid "Cannot merge multiple branches into empty head."
msgstr "Kann nicht mehrere Branches in einen leeren Branch zusammenführen."
-#: builtin/pull.c:975
+#: builtin/pull.c:1046
msgid "Cannot rebase onto multiple branches."
msgstr "Kann Rebase nicht auf mehrere Branches ausführen."
-#: builtin/pull.c:982
+#: builtin/pull.c:1067
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"Kann Rebase nicht mit lokal aufgezeichneten Änderungen in Submodulen "
@@ -18007,15 +19355,15 @@
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<Optionen>] [<Repository> [<Refspec>...]]"
-#: builtin/push.c:112
+#: builtin/push.c:111
msgid "tag shorthand without <tag>"
msgstr "Kurzschrift für Tag ohne <Tag>"
-#: builtin/push.c:122
+#: builtin/push.c:119
msgid "--delete only accepts plain target ref names"
-msgstr "Die Option --delete akzeptiert nur reine Referenznamen als Ziel."
+msgstr "--delete akzeptiert nur reine Referenznamen als Ziel"
-#: builtin/push.c:168
+#: builtin/push.c:164
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -18024,7 +19372,7 @@
"Um eine Variante permanent zu verwenden, siehe push.default in 'git help "
"config'."
-#: builtin/push.c:171
+#: builtin/push.c:167
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -18050,7 +19398,7 @@
" git push %s HEAD\n"
"%s"
-#: builtin/push.c:186
+#: builtin/push.c:182
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -18065,7 +19413,7 @@
"\n"
" git push %s HEAD:<Name-des-Remote-Branches>\n"
-#: builtin/push.c:200
+#: builtin/push.c:194
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -18079,13 +19427,13 @@
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:208
+#: 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:211
+#: builtin/push.c:205
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -18096,14 +19444,14 @@
"Branches '%s' ist, ohne anzugeben, was versendet werden soll, um welchen\n"
"Remote-Branch zu aktualisieren."
-#: builtin/push.c:270
+#: 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:277
+#: 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"
@@ -18117,7 +19465,7 @@
"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
"für weitere Details."
-#: builtin/push.c:283
+#: 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"
@@ -18131,7 +19479,7 @@
"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
"für weitere Details."
-#: builtin/push.c:289
+#: 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"
@@ -18150,13 +19498,13 @@
"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
"für weitere Details."
-#: builtin/push.c:296
+#: 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:299
+#: 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"
@@ -18166,99 +19514,115 @@
"das kein Commit ist, oder es auf ein solches Objekt zeigen lassen, ohne\n"
"die Option '--force' zu verwenden.\n"
-#: builtin/push.c:360
+#: builtin/push.c:294
+msgid ""
+"Updates were rejected because the tip of the remote-tracking\n"
+"branch has been updated since the last checkout. You may want\n"
+"to integrate those changes locally (e.g., 'git pull ...')\n"
+"before forcing an update.\n"
+msgstr ""
+"Aktualisierungen wurden zurückgewiesen, weil die Spitze des Remote-\n"
+"Tracking-Branches seit dem letzen Checkout aktualisiert wurde. Sie möchten\n"
+"diese Änderungen vielleicht lokal integrieren (z. B. 'git pull ...') bevor\n"
+"Sie die Änderungen erzwingen.\n"
+
+#: builtin/push.c:364
#, c-format
msgid "Pushing to %s\n"
msgstr "Push nach %s\n"
-#: builtin/push.c:367
+#: builtin/push.c:371
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "Fehler beim Versenden einiger Referenzen nach '%s'"
-#: builtin/push.c:542
+#: builtin/push.c:553
msgid "repository"
msgstr "Repository"
-#: builtin/push.c:543 builtin/send-pack.c:164
+#: builtin/push.c:554 builtin/send-pack.c:189
msgid "push all refs"
msgstr "alle Referenzen versenden"
-#: builtin/push.c:544 builtin/send-pack.c:166
+#: builtin/push.c:555 builtin/send-pack.c:191
msgid "mirror all refs"
msgstr "alle Referenzen spiegeln"
-#: builtin/push.c:546
+#: builtin/push.c:557
msgid "delete refs"
msgstr "Referenzen löschen"
-#: builtin/push.c:547
+#: builtin/push.c:558
msgid "push tags (can't be used with --all or --mirror)"
msgstr "Tags versenden (kann nicht mit --all oder --mirror verwendet werden)"
-#: builtin/push.c:550 builtin/send-pack.c:167
+#: builtin/push.c:561 builtin/send-pack.c:192
msgid "force updates"
msgstr "Aktualisierung erzwingen"
-#: builtin/push.c:552 builtin/send-pack.c:181
+#: builtin/push.c:562 builtin/send-pack.c:204
msgid "<refname>:<expect>"
msgstr "<Referenzname>:<Erwartungswert>"
-#: builtin/push.c:553 builtin/send-pack.c:182
+#: builtin/push.c:563 builtin/send-pack.c:205
msgid "require old value of ref to be at this value"
msgstr "Referenz muss sich auf dem angegebenen Wert befinden"
-#: builtin/push.c:556
+#: builtin/push.c:566 builtin/send-pack.c:208
+msgid "require remote updates to be integrated locally"
+msgstr "Aktualisierungen des Remote müssen lokal integriert werden"
+
+#: builtin/push.c:569
msgid "control recursive pushing of submodules"
msgstr "rekursiven \"push\" von Submodulen steuern"
-#: builtin/push.c:558 builtin/send-pack.c:175
+#: builtin/push.c:570 builtin/send-pack.c:199
msgid "use thin pack"
msgstr "kleinere Pakete verwenden"
-#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161
-#: builtin/send-pack.c:162
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
+#: builtin/send-pack.c:187
msgid "receive pack program"
msgstr "'receive pack' Programm"
-#: builtin/push.c:561
+#: builtin/push.c:573
msgid "set upstream for git pull/status"
msgstr "Upstream für \"git pull/status\" setzen"
-#: builtin/push.c:564
+#: builtin/push.c:576
msgid "prune locally removed refs"
msgstr "lokal gelöschte Referenzen entfernen"
-#: builtin/push.c:566
+#: builtin/push.c:578
msgid "bypass pre-push hook"
msgstr "\"pre-push hook\" umgehen"
-#: builtin/push.c:567
+#: builtin/push.c:579
msgid "push missing but relevant tags"
msgstr "fehlende, aber relevante Tags versenden"
-#: builtin/push.c:570 builtin/send-pack.c:169
+#: builtin/push.c:581 builtin/send-pack.c:193
msgid "GPG sign the push"
msgstr "signiert \"push\" mit GPG"
-#: builtin/push.c:572 builtin/send-pack.c:176
+#: builtin/push.c:583 builtin/send-pack.c:200
msgid "request atomic transaction on remote side"
msgstr "Referenzen atomar versenden"
-#: builtin/push.c:590
+#: builtin/push.c:601
msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "Die Option --delete ist inkompatibel mit --all, --mirror und --tags."
+msgstr "--delete ist inkompatibel mit --all, --mirror und --tags"
-#: builtin/push.c:592
+#: builtin/push.c:603
msgid "--delete doesn't make sense without any refs"
-msgstr "Die Option --delete kann nur mit Referenzen verwendet werden."
+msgstr "--delete kann nur mit Referenzen verwendet werden"
-#: builtin/push.c:612
+#: builtin/push.c:623
#, c-format
msgid "bad repository '%s'"
msgstr "ungültiges Repository '%s'"
-#: builtin/push.c:613
+#: builtin/push.c:624
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -18280,70 +19644,78 @@
"\n"
" git push <Name>\n"
-#: builtin/push.c:628
-msgid "--all and --tags are incompatible"
-msgstr "Die Optionen --all und --tags sind inkompatibel."
-
-#: builtin/push.c:630
-msgid "--all can't be combined with refspecs"
-msgstr "Die Option --all kann nicht mit Refspecs kombiniert werden."
-
-#: builtin/push.c:634
-msgid "--mirror and --tags are incompatible"
-msgstr "Die Optionen --mirror und --tags sind inkompatibel."
-
-#: builtin/push.c:636
-msgid "--mirror can't be combined with refspecs"
-msgstr "Die Option --mirror kann nicht mit Refspecs kombiniert werden."
-
#: builtin/push.c:639
-msgid "--all and --mirror are incompatible"
-msgstr "Die Optionen --all und --mirror sind inkompatibel."
+msgid "--all and --tags are incompatible"
+msgstr "--all und --tags sind inkompatibel"
-#: builtin/push.c:643
+#: builtin/push.c:641
+msgid "--all can't be combined with refspecs"
+msgstr "--all kann nicht mit Refspecs kombiniert werden"
+
+#: builtin/push.c:645
+msgid "--mirror and --tags are incompatible"
+msgstr "--mirror und --tags sind inkompatibel"
+
+#: builtin/push.c:647
+msgid "--mirror can't be combined with refspecs"
+msgstr "--mirror kann nicht mit Refspecs kombiniert werden"
+
+#: builtin/push.c:650
+msgid "--all and --mirror are incompatible"
+msgstr "--all und --mirror sind inkompatibel"
+
+#: builtin/push.c:657
msgid "push options must not have new line characters"
msgstr "Push-Optionen dürfen keine Zeilenvorschubzeichen haben"
-#: builtin/range-diff.c:8
+#: builtin/range-diff.c:9
msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
msgstr ""
"git range-diff [<Optionen>] <alte-Basis>..<alte-Spitze> <neue-Basis>..<neue-"
"Spitze>"
-#: builtin/range-diff.c:9
+#: builtin/range-diff.c:10
msgid "git range-diff [<options>] <old-tip>...<new-tip>"
msgstr "git range-diff [<Optionen>] <alte-Spitze>...<neue-Spitze>"
-#: builtin/range-diff.c:10
+#: builtin/range-diff.c:11
msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
msgstr "git range-diff [<Optionen>] <Basis> <alte-Spitze> <neue-Spitze>"
-#: builtin/range-diff.c:22
+#: builtin/range-diff.c:28
msgid "Percentage by which creation is weighted"
msgstr "Prozentsatz mit welchem Erzeugung gewichtet wird"
-#: builtin/range-diff.c:24
+#: builtin/range-diff.c:30
msgid "use simple diff colors"
msgstr "einfache Diff-Farben benutzen"
-#: builtin/range-diff.c:26
+#: builtin/range-diff.c:32
msgid "notes"
msgstr "Notizen"
-#: builtin/range-diff.c:26
+#: builtin/range-diff.c:32
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:35
+msgid "only emit output related to the first range"
+msgstr "nur Ausgaben anzeigen, die sich auf den ersten Bereich beziehen"
-#: builtin/range-diff.c:64
+#: builtin/range-diff.c:37
+msgid "only emit output related to the second range"
+msgstr "nur Ausgaben anzeigen, die sich auf den zweiten Bereich beziehen"
+
+#: builtin/range-diff.c:60 builtin/range-diff.c:64
+#, c-format
+msgid "not a commit range: '%s'"
+msgstr "kein Commit-Bereich: '%s'"
+
+#: builtin/range-diff.c:74
msgid "single arg format must be symmetric range"
msgstr "Format mit einfachem Argument muss symmetrischer Bereich sein."
-#: builtin/range-diff.c:79
+#: builtin/range-diff.c:89
msgid "need two commit ranges"
msgstr "Benötige zwei Commit-Bereiche."
@@ -18430,7 +19802,7 @@
msgid "You need to resolve your current index first"
msgstr "Sie müssen zuerst die Konflikte in Ihrem aktuellen Index auflösen."
-#: builtin/rebase.c:32
+#: builtin/rebase.c:35
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
"[<upstream> [<branch>]]"
@@ -18438,219 +19810,205 @@
"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:175 builtin/rebase.c:199 builtin/rebase.c:226
+#: builtin/rebase.c:195 builtin/rebase.c:219 builtin/rebase.c:246
#, c-format
msgid "unusable todo list: '%s'"
msgstr "Unbenutzbare TODO-Liste: '%s'"
-#: builtin/rebase.c:292
+#: builtin/rebase.c:312
#, c-format
msgid "could not create temporary %s"
msgstr "Konnte temporäres Verzeichnis '%s' nicht erstellen."
-#: builtin/rebase.c:298
+#: builtin/rebase.c:318
msgid "could not mark as interactive"
msgstr "Markierung auf interaktiven Rebase fehlgeschlagen."
-#: builtin/rebase.c:352
+#: builtin/rebase.c:371
msgid "could not generate todo list"
msgstr "Konnte TODO-Liste nicht erzeugen."
-#: builtin/rebase.c:391
+#: builtin/rebase.c:413
msgid "a base commit must be provided with --upstream or --onto"
msgstr "Ein Basis-Commit muss mit --upstream oder --onto angegeben werden."
-#: builtin/rebase.c:461
+#: builtin/rebase.c:482
msgid "git rebase--interactive [<options>]"
msgstr "git rebase--interactive [<Optionen>]"
-#: builtin/rebase.c:474 builtin/rebase.c:1550
-msgid "(DEPRECATED) keep empty commits"
-msgstr "(VERALTET) leere Commits behalten"
+#: builtin/rebase.c:495 builtin/rebase.c:1394
+msgid "keep commits which start empty"
+msgstr "behalte Commits, die leer beginnen"
-#: builtin/rebase.c:478 builtin/revert.c:128
+#: builtin/rebase.c:499 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr "Commits mit leerer Beschreibung erlauben"
-#: builtin/rebase.c:480
+#: builtin/rebase.c:501
msgid "rebase merge commits"
msgstr "Rebase auf Merge-Commits ausführen"
-#: builtin/rebase.c:482
+#: builtin/rebase.c:503
msgid "keep original branch points of cousins"
msgstr "originale Branch-Punkte der Cousins behalten"
-#: builtin/rebase.c:484
+#: builtin/rebase.c:505
msgid "move commits that begin with squash!/fixup!"
msgstr "Commits verschieben, die mit squash!/fixup! beginnen"
-#: builtin/rebase.c:485
+#: builtin/rebase.c:506
msgid "sign commits"
msgstr "Commits signieren"
-#: builtin/rebase.c:487 builtin/rebase.c:1490
+#: builtin/rebase.c:508 builtin/rebase.c:1333
msgid "display a diffstat of what changed upstream"
msgstr ""
"Zusammenfassung der Unterschiede gegenüber dem Upstream-Branch anzeigen"
-#: builtin/rebase.c:489
+#: builtin/rebase.c:510
msgid "continue rebase"
msgstr "Rebase fortsetzen"
-#: builtin/rebase.c:491
+#: builtin/rebase.c:512
msgid "skip commit"
msgstr "Commit auslassen"
-#: builtin/rebase.c:492
+#: builtin/rebase.c:513
msgid "edit the todo list"
msgstr "die TODO-Liste bearbeiten"
-#: builtin/rebase.c:494
+#: builtin/rebase.c:515
msgid "show the current patch"
msgstr "den aktuellen Patch anzeigen"
-#: builtin/rebase.c:497
+#: builtin/rebase.c:518
msgid "shorten commit ids in the todo list"
msgstr "Commit-IDs in der TODO-Liste verkürzen"
-#: builtin/rebase.c:499
+#: builtin/rebase.c:520
msgid "expand commit ids in the todo list"
msgstr "Commit-IDs in der TODO-Liste erweitern"
-#: builtin/rebase.c:501
+#: builtin/rebase.c:522
msgid "check the todo list"
msgstr "die TODO-Liste prüfen"
-#: builtin/rebase.c:503
+#: builtin/rebase.c:524
msgid "rearrange fixup/squash lines"
msgstr "fixup/squash-Zeilen umordnen"
-#: builtin/rebase.c:505
+#: builtin/rebase.c:526
msgid "insert exec commands in todo list"
msgstr "\"exec\"-Befehle in TODO-Liste einfügen"
-#: builtin/rebase.c:506
+#: builtin/rebase.c:527
msgid "onto"
msgstr "auf"
-#: builtin/rebase.c:509
+#: builtin/rebase.c:530
msgid "restrict-revision"
msgstr "Begrenzungscommit"
-#: builtin/rebase.c:509
+#: builtin/rebase.c:530
msgid "restrict revision"
msgstr "Begrenzungscommit"
-#: builtin/rebase.c:511
+#: builtin/rebase.c:532
msgid "squash-onto"
msgstr "squash-onto"
-#: builtin/rebase.c:512
+#: builtin/rebase.c:533
msgid "squash onto"
msgstr "squash onto"
-#: builtin/rebase.c:514
+#: builtin/rebase.c:535
msgid "the upstream commit"
msgstr "der Upstream-Commit"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:537
msgid "head-name"
msgstr "head-Name"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:537
msgid "head name"
msgstr "head-Name"
-#: builtin/rebase.c:521
+#: builtin/rebase.c:542
msgid "rebase strategy"
msgstr "Rebase-Strategie"
-#: builtin/rebase.c:522
+#: builtin/rebase.c:543
msgid "strategy-opts"
msgstr "Strategie-Optionen"
-#: builtin/rebase.c:523
+#: builtin/rebase.c:544
msgid "strategy options"
msgstr "Strategie-Optionen"
-#: builtin/rebase.c:524
+#: builtin/rebase.c:545
msgid "switch-to"
msgstr "wechseln zu"
-#: builtin/rebase.c:525
+#: builtin/rebase.c:546
msgid "the branch or commit to checkout"
msgstr "der Branch oder Commit zum Auschecken"
-#: builtin/rebase.c:526
+#: builtin/rebase.c:547
msgid "onto-name"
msgstr "onto-Name"
-#: builtin/rebase.c:526
+#: builtin/rebase.c:547
msgid "onto name"
msgstr "onto-Name"
-#: builtin/rebase.c:527
+#: builtin/rebase.c:548
msgid "cmd"
msgstr "Befehl"
-#: builtin/rebase.c:527
+#: builtin/rebase.c:548
msgid "the command to run"
msgstr "auszuführender Befehl"
-#: builtin/rebase.c:530 builtin/rebase.c:1584
+#: builtin/rebase.c:551 builtin/rebase.c:1427
msgid "automatically re-schedule any `exec` that fails"
msgstr "jeden fehlgeschlagenen `exec`-Befehl neu ansetzen"
-#: builtin/rebase.c:546
+#: builtin/rebase.c:567
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr "--[no-]rebase-cousins hat ohne --rebase-merges keine Auswirkung"
-#: builtin/rebase.c:562
+#: builtin/rebase.c:583
#, 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:612
+#: builtin/rebase.c:626
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "Konnte 'onto' nicht bestimmen: '%s'"
-#: builtin/rebase.c:627
+#: builtin/rebase.c:643
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "Ungültiges orig-head: '%s'"
-#: builtin/rebase.c:652
+#: builtin/rebase.c:668
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "Ignoriere ungültiges allow_rerere_autoupdate: '%s'"
-#: builtin/rebase.c:728
-#, c-format
-msgid "Could not read '%s'"
-msgstr "Konnte '%s' nicht lesen."
-
-#: builtin/rebase.c:746
-#, c-format
-msgid "Cannot store %s"
-msgstr "Kann %s nicht speichern."
-
-#: builtin/rebase.c:853
-msgid "could not determine HEAD revision"
-msgstr "Konnte HEAD-Commit nicht bestimmen."
-
-#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -18666,7 +20024,7 @@
"Um abzubrechen und zurück zum Zustand vor \"git rebase\" zu gelangen,\n"
"führen Sie \"git rebase --abort\" aus."
-#: builtin/rebase.c:1058
+#: builtin/rebase.c:896
#, c-format
msgid ""
"\n"
@@ -18686,7 +20044,7 @@
"Infolge dessen kann Git auf diesen Revisionen Rebase nicht\n"
"ausführen."
-#: builtin/rebase.c:1383
+#: builtin/rebase.c:1227
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -18695,7 +20053,7 @@
"nicht erkannter leerer Typ '%s'; Gültige Werte sind \"drop\", \"keep\", und "
"\"ask\"."
-#: builtin/rebase.c:1401
+#: builtin/rebase.c:1245
#, c-format
msgid ""
"%s\n"
@@ -18713,7 +20071,7 @@
" git rebase '<Branch>'\n"
"\n"
-#: builtin/rebase.c:1417
+#: builtin/rebase.c:1261
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -18727,140 +20085,152 @@
" git branch --set-upstream-to=%s/<Branch> %s\n"
"\n"
-#: builtin/rebase.c:1447
+#: builtin/rebase.c:1291
msgid "exec commands cannot contain newlines"
msgstr "\"exec\"-Befehle können keine neuen Zeilen enthalten"
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1295
msgid "empty exec command"
msgstr "Leerer \"exec\"-Befehl."
-#: builtin/rebase.c:1481
+#: builtin/rebase.c:1324
msgid "rebase onto given branch instead of upstream"
msgstr "Rebase auf angegebenen Branch anstelle des Upstream-Branches ausführen"
-#: builtin/rebase.c:1483
+#: builtin/rebase.c:1326
msgid "use the merge-base of upstream and branch as the current base"
msgstr "Nutze die Merge-Basis von Upstream und Branch als die aktuelle Basis"
-#: builtin/rebase.c:1485
+#: builtin/rebase.c:1328
msgid "allow pre-rebase hook to run"
msgstr "Ausführung des pre-rebase-Hooks erlauben"
-#: builtin/rebase.c:1487
+#: builtin/rebase.c:1330
msgid "be quiet. implies --no-stat"
msgstr "weniger Ausgaben (impliziert --no-stat)"
-#: builtin/rebase.c:1493
+#: builtin/rebase.c:1336
msgid "do not show diffstat of what changed upstream"
msgstr ""
"Zusammenfassung der Unterschiede gegenüber dem Upstream-Branch verbergen"
-#: builtin/rebase.c:1496
-msgid "add a Signed-off-by: line to each commit"
-msgstr "eine \"Signed-off-by:\"-Zeile zu jedem Commit hinzufügen"
+#: builtin/rebase.c:1339
+msgid "add a Signed-off-by trailer to each commit"
+msgstr "eine Signed-off-by Zeile zu jedem Commit hinzufügen"
-#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504
-msgid "passed to 'git am'"
-msgstr "an 'git am' übergeben"
+#: builtin/rebase.c:1342
+msgid "make committer date match author date"
+msgstr "Datum des Commit-Erstellers soll mit Datum des Autors übereinstimmen"
-#: builtin/rebase.c:1506 builtin/rebase.c:1508
+#: builtin/rebase.c:1344
+msgid "ignore author date and use current date"
+msgstr "ignoriere Autor-Datum und nutze aktuelles Datum"
+
+#: builtin/rebase.c:1346
+msgid "synonym of --reset-author-date"
+msgstr "Synonym für --reset-author-date"
+
+#: builtin/rebase.c:1348 builtin/rebase.c:1352
msgid "passed to 'git apply'"
msgstr "an 'git apply' übergeben"
-#: builtin/rebase.c:1510 builtin/rebase.c:1513
+#: builtin/rebase.c:1350
+msgid "ignore changes in whitespace"
+msgstr "Whitespace-Änderungen ignorieren"
+
+#: builtin/rebase.c:1354 builtin/rebase.c:1357
msgid "cherry-pick all commits, even if unchanged"
msgstr ""
"Cherry-Pick auf alle Commits ausführen, auch wenn diese unverändert sind"
-#: builtin/rebase.c:1515
+#: builtin/rebase.c:1359
msgid "continue"
msgstr "fortsetzen"
-#: builtin/rebase.c:1518
+#: builtin/rebase.c:1362
msgid "skip current patch and continue"
msgstr "den aktuellen Patch auslassen und fortfahren"
-#: builtin/rebase.c:1520
+#: builtin/rebase.c:1364
msgid "abort and check out the original branch"
msgstr "abbrechen und den ursprünglichen Branch auschecken"
-#: builtin/rebase.c:1523
+#: builtin/rebase.c:1367
msgid "abort but keep HEAD where it is"
msgstr "abbrechen, aber HEAD an aktueller Stelle belassen"
-#: builtin/rebase.c:1524
+#: builtin/rebase.c:1368
msgid "edit the todo list during an interactive rebase"
msgstr "TODO-Liste während eines interaktiven Rebase bearbeiten"
-#: builtin/rebase.c:1527
+#: builtin/rebase.c:1371
msgid "show the patch file being applied or merged"
msgstr "den Patch, der gerade angewendet oder zusammengeführt wird, anzeigen"
-#: builtin/rebase.c:1530
+#: builtin/rebase.c:1374
msgid "use apply strategies to rebase"
msgstr "Strategien von 'git am' bei Rebase verwenden"
-#: builtin/rebase.c:1534
+#: builtin/rebase.c:1378
msgid "use merging strategies to rebase"
msgstr "Merge-Strategien beim Rebase verwenden"
-#: builtin/rebase.c:1538
+#: builtin/rebase.c:1382
msgid "let the user edit the list of commits to rebase"
msgstr "den Benutzer die Liste der Commits für den Rebase bearbeiten lassen"
-#: builtin/rebase.c:1542
+#: builtin/rebase.c:1386
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
-msgstr ""
-"(VERALTET) Versuche, Merges wiederherzustellen anstatt sie zu ignorieren"
+msgstr "(VERALTET) Versuche, Merges wiederherzustellen statt sie zu ignorieren"
-#: builtin/rebase.c:1547
+#: builtin/rebase.c:1391
msgid "how to handle commits that become empty"
msgstr "wie sollen Commits behandelt werden, die leer werden"
-#: builtin/rebase.c:1554
+#: builtin/rebase.c:1398
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "bei -i Commits verschieben, die mit squash!/fixup! beginnen"
-#: builtin/rebase.c:1560
-msgid "automatically stash/stash pop before and after"
-msgstr "automatischer Stash/Stash-Pop davor und danach"
-
-#: builtin/rebase.c:1562
+#: builtin/rebase.c:1405
msgid "add exec lines after each commit of the editable list"
msgstr "exec-Zeilen nach jedem Commit der editierbaren Liste hinzufügen"
-#: builtin/rebase.c:1566
+#: builtin/rebase.c:1409
msgid "allow rebasing commits with empty messages"
msgstr "Rebase von Commits mit leerer Beschreibung erlauben"
-#: builtin/rebase.c:1570
+#: builtin/rebase.c:1413
msgid "try to rebase merges instead of skipping them"
-msgstr ""
-"versuchen, Rebase mit Merges auszuführen, anstatt diese zu überspringen"
+msgstr "versuchen, Rebase mit Merges auszuführen, statt diese zu überspringen"
-#: builtin/rebase.c:1573
+#: builtin/rebase.c:1416
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr ""
"'git merge-base --fork-point' benutzen, um Upstream-Branch zu bestimmen"
-#: builtin/rebase.c:1575
+#: builtin/rebase.c:1418
msgid "use the given merge strategy"
msgstr "angegebene Merge-Strategie verwenden"
-#: builtin/rebase.c:1577 builtin/revert.c:115
+#: builtin/rebase.c:1420 builtin/revert.c:115
msgid "option"
msgstr "Option"
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1421
msgid "pass the argument through to the merge strategy"
msgstr "Argument zur Merge-Strategie durchreichen"
-#: builtin/rebase.c:1581
+#: builtin/rebase.c:1424
msgid "rebase all reachable commits up to the root(s)"
msgstr "Rebase auf alle erreichbaren Commits bis zum Root-Commit ausführen"
-#: builtin/rebase.c:1598
+#: builtin/rebase.c:1429
+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:1446
msgid ""
"the rebase.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
@@ -18868,40 +20238,44 @@
"Die Unterstützung für rebase.useBuiltin wurde entfernt!\n"
"Siehe dessen Eintrag in 'git help config' für Details."
-#: builtin/rebase.c:1604
+#: builtin/rebase.c:1452
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "'git-am' scheint im Gange zu sein. Kann Rebase nicht durchführen."
-#: builtin/rebase.c:1645
+#: builtin/rebase.c:1493
msgid ""
"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr ""
"'git rebase --preserve-merges' ist veraltet. Benutzen Sie stattdessen '--"
"rebase-merges'."
-#: builtin/rebase.c:1650
+#: builtin/rebase.c:1498
msgid "cannot combine '--keep-base' with '--onto'"
msgstr "'--keep-base' kann nicht mit '--onto' kombiniert werden"
-#: builtin/rebase.c:1652
+#: builtin/rebase.c:1500
msgid "cannot combine '--keep-base' with '--root'"
msgstr "'--keep-base' kann nicht mit '--root' kombiniert werden"
-#: builtin/rebase.c:1656
+#: builtin/rebase.c:1504
+msgid "cannot combine '--root' with '--fork-point'"
+msgstr "'--root' kann nicht mit '--fork-point' kombiniert werden"
+
+#: builtin/rebase.c:1507
msgid "No rebase in progress?"
msgstr "Kein Rebase im Gange?"
-#: builtin/rebase.c:1660
+#: builtin/rebase.c:1511
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"Die --edit-todo Aktion kann nur während eines interaktiven Rebase verwendet "
"werden."
-#: builtin/rebase.c:1683
+#: builtin/rebase.c:1534 t/helper/test-fast-rebase.c:123
msgid "Cannot read HEAD"
msgstr "Kann HEAD nicht lesen"
-#: builtin/rebase.c:1695
+#: builtin/rebase.c:1546
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -18909,16 +20283,16 @@
"Sie müssen alle Merge-Konflikte editieren und diese dann\n"
"mittels \"git add\" als aufgelöst markieren"
-#: builtin/rebase.c:1714
+#: builtin/rebase.c:1565
msgid "could not discard worktree changes"
msgstr "Konnte Änderungen im Arbeitsverzeichnis nicht verwerfen."
-#: builtin/rebase.c:1733
+#: builtin/rebase.c:1584
#, c-format
msgid "could not move back to %s"
msgstr "Konnte nicht zu %s zurückgehen."
-#: builtin/rebase.c:1778
+#: builtin/rebase.c:1630
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -18939,170 +20313,147 @@
"und führen Sie diesen Befehl nochmal aus. Es wird angehalten, falls noch\n"
"etwas Schützenswertes vorhanden ist.\n"
-#: builtin/rebase.c:1806
+#: builtin/rebase.c:1658
msgid "switch `C' expects a numerical value"
msgstr "Schalter `C' erwartet einen numerischen Wert."
-#: builtin/rebase.c:1847
+#: builtin/rebase.c:1700
#, c-format
msgid "Unknown mode: %s"
msgstr "Unbekannter Modus: %s"
-#: builtin/rebase.c:1869
+#: builtin/rebase.c:1739
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy erfordert --merge oder --interactive"
-#: builtin/rebase.c:1899
+#: builtin/rebase.c:1769
msgid "cannot combine apply options with merge options"
msgstr ""
"Optionen für \"am\" können nicht mit Optionen für \"merge\" kombiniert "
"werden."
-#: builtin/rebase.c:1912
+#: builtin/rebase.c:1782
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "Unbekanntes Rebase-Backend: %s"
-#: builtin/rebase.c:1937
+#: builtin/rebase.c:1812
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec erfordert --exec oder --interactive"
-#: builtin/rebase.c:1957
+#: builtin/rebase.c:1832
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr ""
"'--preserve-merges' kann nicht mit '--rebase-merges' kombiniert werden."
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1836
msgid ""
"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
"Fehler: '--preserve-merges' kann nicht mit '--reschedule-failed-exec' "
"kombiniert werden."
-#: builtin/rebase.c:1985
+#: builtin/rebase.c:1860
#, c-format
msgid "invalid upstream '%s'"
msgstr "Ungültiger Upstream '%s'"
-#: builtin/rebase.c:1991
+#: builtin/rebase.c:1866
msgid "Could not create new root commit"
msgstr "Konnte neuen Root-Commit nicht erstellen."
-#: builtin/rebase.c:2017
+#: builtin/rebase.c:1892
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "'%s': benötige genau eine Merge-Basis mit dem Branch"
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1895
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s': benötige genau eine Merge-Basis"
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1903
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "'%s' zeigt auf keinen gültigen Commit."
-#: builtin/rebase.c:2054
+#: builtin/rebase.c:1931
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "fatal: Branch/Commit '%s' nicht gefunden"
-#: builtin/rebase.c:2062 builtin/submodule--helper.c:40
-#: builtin/submodule--helper.c:1990
+#: builtin/rebase.c:1939 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:2073
+#: builtin/rebase.c:1950
msgid "Could not resolve HEAD to a revision"
msgstr "Konnte HEAD zu keinem Commit auflösen."
-#: builtin/rebase.c:2111
-msgid "Cannot autostash"
-msgstr "Kann automatischen Stash nicht erzeugen."
-
-#: builtin/rebase.c:2114
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr "Unerwartete 'stash'-Antwort: '%s'"
-
-#: builtin/rebase.c:2120
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr "Konnte Verzeichnis für '%s' nicht erstellen."
-
-#: builtin/rebase.c:2123
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr "Automatischen Stash erzeugt: %s\n"
-
-#: builtin/rebase.c:2126
-msgid "could not reset --hard"
-msgstr "Konnte 'reset --hard' nicht ausführen."
-
-#: builtin/rebase.c:2135
+#: builtin/rebase.c:1971
msgid "Please commit or stash them."
msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"."
-#: builtin/rebase.c:2169
+#: builtin/rebase.c:2007
#, c-format
msgid "could not switch to %s"
msgstr "Konnte nicht zu %s wechseln."
-#: builtin/rebase.c:2180
+#: builtin/rebase.c:2018
msgid "HEAD is up to date."
msgstr "HEAD ist aktuell."
-#: builtin/rebase.c:2182
+#: builtin/rebase.c:2020
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "Aktueller Branch %s ist auf dem neuesten Stand.\n"
-#: builtin/rebase.c:2190
+#: builtin/rebase.c:2028
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD ist aktuell, Rebase erzwungen."
-#: builtin/rebase.c:2192
+#: builtin/rebase.c:2030
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "Aktueller Branch %s ist auf dem neuesten Stand, Rebase erzwungen.\n"
-#: builtin/rebase.c:2200
+#: builtin/rebase.c:2038
msgid "The pre-rebase hook refused to rebase."
msgstr "Der \"pre-rebase hook\" hat den Rebase zurückgewiesen."
-#: builtin/rebase.c:2207
+#: builtin/rebase.c:2045
#, c-format
msgid "Changes to %s:\n"
msgstr "Änderungen zu %s:\n"
-#: builtin/rebase.c:2210
+#: builtin/rebase.c:2048
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Änderungen von %s zu %s:\n"
-#: builtin/rebase.c:2235
+#: builtin/rebase.c:2073
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"Zunächst wird der Branch zurückgespult, um Ihre Änderungen darauf neu "
"anzuwenden...\n"
-#: builtin/rebase.c:2244
+#: builtin/rebase.c:2082
msgid "Could not detach HEAD"
msgstr "Konnte HEAD nicht loslösen."
-#: builtin/rebase.c:2253
+#: builtin/rebase.c:2091
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Spule %s vor zu %s.\n"
-#: builtin/receive-pack.c:33
+#: builtin/receive-pack.c:34
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <Git-Verzeichnis>"
-#: builtin/receive-pack.c:821
+#: builtin/receive-pack.c:1276
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
@@ -19134,7 +20485,7 @@
"setzen Sie die Konfigurationsvariable 'receive.denyCurrentBranch' auf\n"
"'refuse'."
-#: builtin/receive-pack.c:841
+#: builtin/receive-pack.c:1296
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"
@@ -19155,11 +20506,11 @@
"\n"
"Um diese Meldung zu unterdrücken, setzen Sie die Variable auf 'refuse'."
-#: builtin/receive-pack.c:1938
+#: builtin/receive-pack.c:2481
msgid "quiet"
msgstr "weniger Ausgaben"
-#: builtin/receive-pack.c:1952
+#: builtin/receive-pack.c:2495
msgid "You must specify a directory."
msgstr "Sie müssen ein Repository angeben."
@@ -19190,36 +20541,36 @@
msgid "'%s' is not a valid timestamp"
msgstr "'%s' ist kein gültiger Zeitstempel"
-#: builtin/reflog.c:606
+#: builtin/reflog.c:609
#, c-format
msgid "Marking reachable objects..."
msgstr "Markiere nicht erreichbare Objekte..."
-#: builtin/reflog.c:644
+#: builtin/reflog.c:647
#, c-format
msgid "%s points nowhere!"
msgstr "%s zeigt auf nichts!"
-#: builtin/reflog.c:696
+#: builtin/reflog.c:699
msgid "no reflog specified to delete"
msgstr "Kein Reflog zum Löschen angegeben."
-#: builtin/reflog.c:705
+#: builtin/reflog.c:708
#, c-format
msgid "not a reflog: %s"
msgstr "Kein Reflog: %s"
-#: builtin/reflog.c:710
+#: builtin/reflog.c:713
#, c-format
msgid "no reflog for '%s'"
msgstr "Kein Reflog für '%s'."
-#: builtin/reflog.c:756
+#: builtin/reflog.c:759
#, c-format
msgid "invalid ref format: %s"
msgstr "Ungültiges Format für Referenzen: %s"
-#: builtin/reflog.c:765
+#: builtin/reflog.c:768
msgid "git reflog [ show | expire | delete | exists ]"
msgstr "git reflog [ show | expire | delete | exists ]"
@@ -19352,49 +20703,43 @@
#: 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."
+"--mirror kann nicht mit der Angabe eines Hauptbranches verwendet werden"
#: 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."
+"die Angabe von zu folgenden Branches kann nur mit dem Anfordern von "
+"Spiegelarchiven verwendet werden"
-#: builtin/remote.c:195 builtin/remote.c:696
+#: builtin/remote.c:195 builtin/remote.c:700
#, c-format
msgid "remote %s already exists."
-msgstr "externes Repository %s existiert bereits"
+msgstr "externes Repository %s existiert bereits."
-#: builtin/remote.c:199 builtin/remote.c:700
-#, c-format
-msgid "'%s' is not a valid remote name"
-msgstr "'%s' ist kein gültiger Name für ein Remote-Repository"
-
-#: builtin/remote.c:239
+#: builtin/remote.c:240
#, c-format
msgid "Could not setup master '%s'"
msgstr "Konnte symbolische Referenz für Hauptbranch von '%s' nicht einrichten"
-#: builtin/remote.c:354
+#: builtin/remote.c:355
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "Konnte Fetch-Map für Refspec %s nicht bekommen"
-#: builtin/remote.c:453 builtin/remote.c:461
+#: builtin/remote.c:454 builtin/remote.c:462
msgid "(matching)"
msgstr "(übereinstimmend)"
-#: builtin/remote.c:465
+#: builtin/remote.c:466
msgid "(delete)"
msgstr "(lösche)"
-#: builtin/remote.c:653
+#: builtin/remote.c:655
#, c-format
msgid "could not set '%s'"
msgstr "konnte '%s' nicht setzen"
-#: builtin/remote.c:658
+#: builtin/remote.c:660
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
@@ -19405,17 +20750,17 @@
"\t%s:%d\n"
"benennt jetzt das nicht existierende Remote-Repository '%s'"
-#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940
+#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946
#, c-format
msgid "No such remote: '%s'"
-msgstr "Kein solches Remote-Repository: '%s'"
+msgstr "Remote-Repository nicht gefunden: '%s'"
-#: builtin/remote.c:706
+#: builtin/remote.c:710
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Konnte Sektion '%s' in Konfiguration nicht nach '%s' umbenennen"
-#: builtin/remote.c:726
+#: builtin/remote.c:730
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -19426,17 +20771,17 @@
"\t%s\n"
"\tBitte aktualisieren Sie, falls notwendig, die Konfiguration manuell."
-#: builtin/remote.c:766
+#: builtin/remote.c:770
#, c-format
msgid "deleting '%s' failed"
msgstr "Konnte '%s' nicht löschen"
-#: builtin/remote.c:800
+#: builtin/remote.c:804
#, c-format
msgid "creating '%s' failed"
msgstr "Konnte '%s' nicht erstellen"
-#: builtin/remote.c:876
+#: builtin/remote.c:882
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -19452,118 +20797,118 @@
"entfernt;\n"
"um diese zu entfernen, benutzen Sie:"
-#: builtin/remote.c:890
+#: builtin/remote.c:896
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Konnte Sektion '%s' nicht aus Konfiguration entfernen"
-#: builtin/remote.c:993
+#: builtin/remote.c:999
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " neu (wird bei nächstem \"fetch\" in remotes/%s gespeichert)"
-#: builtin/remote.c:996
+#: builtin/remote.c:1002
msgid " tracked"
msgstr " gefolgt"
-#: builtin/remote.c:998
+#: builtin/remote.c:1004
msgid " stale (use 'git remote prune' to remove)"
msgstr " veraltet (benutzen Sie 'git remote prune' zum Löschen)"
-#: builtin/remote.c:1000
+#: builtin/remote.c:1006
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:1041
+#: builtin/remote.c:1047
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "ungültiges branch.%s.merge; kann Rebase nicht auf > 1 Branch ausführen"
-#: builtin/remote.c:1050
+#: builtin/remote.c:1056
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "interaktiver Rebase auf Remote-Branch %s"
-#: builtin/remote.c:1052
+#: builtin/remote.c:1058
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr "interaktiver Rebase (mit Merges) auf Remote-Branch %s"
-#: builtin/remote.c:1055
+#: builtin/remote.c:1061
#, c-format
msgid "rebases onto remote %s"
msgstr "Rebase auf Remote-Branch %s"
-#: builtin/remote.c:1059
+#: builtin/remote.c:1065
#, c-format
msgid " merges with remote %s"
msgstr " führt mit Remote-Branch %s zusammen"
-#: builtin/remote.c:1062
+#: builtin/remote.c:1068
#, c-format
msgid "merges with remote %s"
msgstr "führt mit Remote-Branch %s zusammen"
-#: builtin/remote.c:1065
+#: builtin/remote.c:1071
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s und mit Remote-Branch %s\n"
-#: builtin/remote.c:1108
+#: builtin/remote.c:1114
msgid "create"
msgstr "erstellt"
-#: builtin/remote.c:1111
+#: builtin/remote.c:1117
msgid "delete"
msgstr "gelöscht"
-#: builtin/remote.c:1115
+#: builtin/remote.c:1121
msgid "up to date"
msgstr "aktuell"
-#: builtin/remote.c:1118
+#: builtin/remote.c:1124
msgid "fast-forwardable"
msgstr "vorspulbar"
-#: builtin/remote.c:1121
+#: builtin/remote.c:1127
msgid "local out of date"
msgstr "lokal nicht aktuell"
-#: builtin/remote.c:1128
+#: builtin/remote.c:1134
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s erzwingt Versandt nach %-*s (%s)"
-#: builtin/remote.c:1131
+#: builtin/remote.c:1137
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s versendet nach %-*s (%s)"
-#: builtin/remote.c:1135
+#: builtin/remote.c:1141
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s erzwingt Versand nach %s"
-#: builtin/remote.c:1138
+#: builtin/remote.c:1144
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s versendet nach %s"
-#: builtin/remote.c:1206
+#: builtin/remote.c:1212
msgid "do not query remotes"
msgstr "keine Abfrage von Remote-Repositories"
-#: builtin/remote.c:1233
+#: builtin/remote.c:1239
#, c-format
msgid "* remote %s"
msgstr "* Remote-Repository %s"
-#: builtin/remote.c:1234
+#: builtin/remote.c:1240
#, c-format
msgid " Fetch URL: %s"
msgstr " URL zum Abholen: %s"
-#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390
+#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
msgid "(no URL)"
msgstr "(keine URL)"
@@ -19571,25 +20916,25 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1249 builtin/remote.c:1251
+#: builtin/remote.c:1255 builtin/remote.c:1257
#, c-format
msgid " Push URL: %s"
msgstr " URL zum Versenden: %s"
-#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
#, c-format
msgid " HEAD branch: %s"
msgstr " Hauptbranch: %s"
-#: builtin/remote.c:1253
+#: builtin/remote.c:1259
msgid "(not queried)"
msgstr "(nicht abgefragt)"
-#: builtin/remote.c:1255
+#: builtin/remote.c:1261
msgid "(unknown)"
msgstr "(unbekannt)"
-#: builtin/remote.c:1259
+#: builtin/remote.c:1265
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -19597,163 +20942,162 @@
" Hauptbranch (externer HEAD ist mehrdeutig, könnte einer der folgenden "
"sein):\n"
-#: builtin/remote.c:1271
+#: builtin/remote.c:1277
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Remote-Branch:%s"
msgstr[1] " Remote-Branches:%s"
-#: builtin/remote.c:1274 builtin/remote.c:1300
+#: builtin/remote.c:1280 builtin/remote.c:1306
msgid " (status not queried)"
msgstr " (Zustand nicht abgefragt)"
-#: builtin/remote.c:1283
+#: builtin/remote.c:1289
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Lokaler Branch konfiguriert für 'git pull':"
msgstr[1] " Lokale Branches konfiguriert für 'git pull':"
-#: builtin/remote.c:1291
+#: builtin/remote.c:1297
msgid " Local refs will be mirrored by 'git push'"
msgstr " Lokale Referenzen werden von 'git push' gespiegelt"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1303
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Lokale Referenz konfiguriert für 'git push'%s:"
msgstr[1] " Lokale Referenzen konfiguriert für 'git push'%s:"
-#: builtin/remote.c:1318
+#: builtin/remote.c:1324
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "setzt refs/remotes/<Name>/HEAD gemäß dem Remote-Repository"
-#: builtin/remote.c:1320
+#: builtin/remote.c:1326
msgid "delete refs/remotes/<name>/HEAD"
msgstr "entfernt refs/remotes/<Name>/HEAD"
-#: builtin/remote.c:1335
+#: builtin/remote.c:1341
msgid "Cannot determine remote HEAD"
msgstr "Kann HEAD des Remote-Repositories nicht bestimmen"
-#: builtin/remote.c:1337
+#: builtin/remote.c:1343
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
"Mehrere Hauptbranches im Remote-Repository. Bitte wählen Sie explizit einen "
"aus mit:"
-#: builtin/remote.c:1347
+#: builtin/remote.c:1353
#, c-format
msgid "Could not delete %s"
msgstr "Konnte %s nicht entfernen"
-#: builtin/remote.c:1355
+#: builtin/remote.c:1361
#, c-format
msgid "Not a valid ref: %s"
msgstr "keine gültige Referenz: %s"
-#: builtin/remote.c:1357
+#: builtin/remote.c:1363
#, c-format
msgid "Could not setup %s"
msgstr "Konnte %s nicht einrichten"
-#: builtin/remote.c:1375
+#: builtin/remote.c:1381
#, c-format
msgid " %s will become dangling!"
msgstr " %s wird unreferenziert!"
-#: builtin/remote.c:1376
+#: builtin/remote.c:1382
#, c-format
msgid " %s has become dangling!"
msgstr " %s wurde unreferenziert!"
-#: builtin/remote.c:1386
+#: builtin/remote.c:1392
#, c-format
msgid "Pruning %s"
msgstr "entferne veraltete Branches von %s"
-#: builtin/remote.c:1387
+#: builtin/remote.c:1393
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1403
+#: builtin/remote.c:1409
#, c-format
msgid " * [would prune] %s"
msgstr " * [würde veralteten Branch entfernen] %s"
-#: builtin/remote.c:1406
+#: builtin/remote.c:1412
#, c-format
msgid " * [pruned] %s"
msgstr "* [veralteten Branch entfernt] %s"
-#: builtin/remote.c:1451
+#: builtin/remote.c:1457
msgid "prune remotes after fetching"
msgstr "entferne veraltete Branches im Remote-Repository nach \"fetch\""
-#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636
+#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
#, c-format
msgid "No such remote '%s'"
-msgstr "Kein solches Remote-Repository '%s'"
+msgstr "Remote-Repository '%s' nicht gefunden"
-#: builtin/remote.c:1530
+#: builtin/remote.c:1539
msgid "add branch"
msgstr "Branch hinzufügen"
-#: builtin/remote.c:1537
+#: builtin/remote.c:1546
msgid "no remote specified"
msgstr "kein Remote-Repository angegeben"
-#: builtin/remote.c:1554
+#: builtin/remote.c:1563
msgid "query push URLs rather than fetch URLs"
msgstr "nur URLs für Push ausgeben"
-#: builtin/remote.c:1556
+#: builtin/remote.c:1565
msgid "return all URLs"
msgstr "alle URLs ausgeben"
-#: builtin/remote.c:1584
+#: builtin/remote.c:1595
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "Keine URLs für Remote-Repository '%s' konfiguriert."
-#: builtin/remote.c:1610
+#: builtin/remote.c:1621
msgid "manipulate push URLs"
msgstr "URLs für \"push\" manipulieren"
-#: builtin/remote.c:1612
+#: builtin/remote.c:1623
msgid "add URL"
msgstr "URL hinzufügen"
-#: builtin/remote.c:1614
+#: builtin/remote.c:1625
msgid "delete URLs"
msgstr "URLs löschen"
-#: builtin/remote.c:1621
+#: builtin/remote.c:1632
msgid "--add --delete doesn't make sense"
-msgstr ""
-"Die Optionen --add und --delete können nicht gemeinsam verwendet werden."
+msgstr "--add und --delete können nicht gemeinsam verwendet werden"
-#: builtin/remote.c:1660
+#: builtin/remote.c:1673
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "ungültiges altes URL Format: %s"
-#: builtin/remote.c:1668
+#: builtin/remote.c:1681
#, c-format
msgid "No such URL found: %s"
-msgstr "Keine solche URL gefunden: %s"
+msgstr "URL nicht gefunden: %s"
-#: builtin/remote.c:1670
+#: builtin/remote.c:1683
msgid "Will not delete all non-push URLs"
msgstr "Werde keine URLs entfernen, die nicht für \"push\" bestimmt sind"
-#: builtin/repack.c:23
+#: builtin/repack.c:26
msgid "git repack [<options>]"
msgstr "git repack [<Optionen>]"
-#: builtin/repack.c:28
+#: builtin/repack.c:31
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -19762,141 +21106,127 @@
"--no-write-bitmap-index oder deaktivieren Sie die pack.writebitmaps\n"
"Konfiguration."
-#: builtin/repack.c:191
+#: builtin/repack.c:198
msgid "could not start pack-objects to repack promisor objects"
msgstr ""
"Konnte 'pack-objects' für das Neupacken von Objekten aus partiell geklonten\n"
"Remote-Repositories nicht starten."
-#: builtin/repack.c:230 builtin/repack.c:416
+#: builtin/repack.c:270 builtin/repack.c:446
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
"repack: Erwarte Zeilen mit vollständiger Hex-Objekt-ID nur von pack-objects."
-#: builtin/repack.c:254
+#: builtin/repack.c:294
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
"Konnte 'pack-objects' für das Neupacken von Objekten aus partiell geklonten\n"
"Remote-Repositories nicht abschließen."
-#: builtin/repack.c:292
+#: builtin/repack.c:322
msgid "pack everything in a single pack"
msgstr "alles in eine einzige Pack-Datei packen"
-#: builtin/repack.c:294
+#: builtin/repack.c:324
msgid "same as -a, and turn unreachable objects loose"
msgstr "genau wie -a, unerreichbare Objekte werden aber nicht gelöscht"
-#: builtin/repack.c:297
+#: builtin/repack.c:327
msgid "remove redundant packs, and run git-prune-packed"
msgstr "redundante Pakete entfernen und \"git-prune-packed\" ausführen"
-#: builtin/repack.c:299
+#: builtin/repack.c:329
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "--no-reuse-delta an git-pack-objects übergeben"
-#: builtin/repack.c:301
+#: builtin/repack.c:331
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "--no-reuse-object an git-pack-objects übergeben"
-#: builtin/repack.c:303
+#: builtin/repack.c:333
msgid "do not run git-update-server-info"
msgstr "git-update-server-info nicht ausführen"
-#: builtin/repack.c:306
+#: builtin/repack.c:336
msgid "pass --local to git-pack-objects"
msgstr "--local an git-pack-objects übergeben"
-#: builtin/repack.c:308
+#: builtin/repack.c:338
msgid "write bitmap index"
msgstr "Bitmap-Index schreiben"
-#: builtin/repack.c:310
+#: builtin/repack.c:340
msgid "pass --delta-islands to git-pack-objects"
msgstr "--delta-islands an git-pack-objects übergeben"
-#: builtin/repack.c:311
+#: builtin/repack.c:341
msgid "approxidate"
msgstr "Datumsangabe"
-#: builtin/repack.c:312
+#: builtin/repack.c:342
msgid "with -A, do not loosen objects older than this"
msgstr "mit -A, keine Objekte älter als dieses Datum löschen"
-#: builtin/repack.c:314
+#: builtin/repack.c:344
msgid "with -a, repack unreachable objects"
msgstr "mit -a, nicht erreichbare Objekte neu packen"
-#: builtin/repack.c:316
+#: builtin/repack.c:346
msgid "size of the window used for delta compression"
msgstr "Größe des Fensters für die Delta-Kompression"
-#: builtin/repack.c:317 builtin/repack.c:323
+#: builtin/repack.c:347 builtin/repack.c:353
msgid "bytes"
msgstr "Bytes"
-#: builtin/repack.c:318
+#: builtin/repack.c:348
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"
+"gleiches wie oben, aber die Speichergröße statt der Anzahl der Einträge "
+"limitieren"
-#: builtin/repack.c:320
+#: builtin/repack.c:350
msgid "limits the maximum delta depth"
msgstr "die maximale Delta-Tiefe limitieren"
-#: builtin/repack.c:322
+#: builtin/repack.c:352
msgid "limits the maximum number of threads"
msgstr "maximale Anzahl von Threads limitieren"
-#: builtin/repack.c:324
+#: builtin/repack.c:354
msgid "maximum size of each packfile"
msgstr "maximale Größe für jede Paketdatei"
-#: builtin/repack.c:326
+#: builtin/repack.c:356
msgid "repack objects in packs marked with .keep"
msgstr ""
"Objekte umpacken, die sich in mit .keep markierten Pack-Dateien befinden"
-#: builtin/repack.c:328
+#: builtin/repack.c:358
msgid "do not repack this pack"
msgstr "dieses Paket nicht neu packen"
-#: builtin/repack.c:338
+#: builtin/repack.c:368
msgid "cannot delete packs in a precious-objects repo"
msgstr "kann Pack-Dateien in precious-objects Repository nicht löschen"
-#: builtin/repack.c:342
+#: builtin/repack.c:372
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable und -A sind inkompatibel"
-#: builtin/repack.c:425
+#: builtin/repack.c:455
msgid "Nothing new to pack."
msgstr "Nichts Neues zum Packen."
-#: builtin/repack.c:486
+#: builtin/repack.c:485
#, 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 ""
-"WARNUNG: Einige in Verwendung befindliche Pakete wurden\n"
-"WARNUNG: umbenannt, indem 'old-' an deren Namen vorrangestellt\n"
-"WARNUNG: wurde, um diese mit der neuen Dateiversion zu ersetzen.\n"
-"WARNUNG: Diese Operation ist fehlgeschlagen. Der Versuch, die\n"
-"WARNUNG: Datei zu ihrem ursprünglichen Namen umzubenennen, schlug\n"
-"WARNUNG: ebenfalls fehl.\n"
-"WARNUNG: Bitte benennen Sie diese manuell nach %s um:\n"
+msgid "missing required file: %s"
+msgstr "benötigte Datei fehlt: %s"
-#: builtin/repack.c:534
+#: builtin/repack.c:487
#, c-format
-msgid "failed to remove '%s'"
-msgstr "Fehler beim Löschen von '%s'"
+msgid "could not unlink: %s"
+msgstr "konnte nicht löschen: %s"
#: builtin/replace.c:22
msgid "git replace [-f] <object> <replacement>"
@@ -20044,7 +21374,7 @@
"instead of --graft"
msgstr ""
"Der ursprüngliche Commit '%s' enthält Merge-Tag '%s', der verworfen\n"
-"wird; benutzen Sie --edit anstatt --graft"
+"wird; benutzen Sie --edit statt --graft"
#: builtin/replace.c:469
#, c-format
@@ -20205,93 +21535,93 @@
msgid "keep"
msgstr "keep"
-#: builtin/reset.c:82
+#: builtin/reset.c:83
msgid "You do not have a valid HEAD."
msgstr "Sie haben keinen gültigen HEAD."
-#: builtin/reset.c:84
+#: builtin/reset.c:85
msgid "Failed to find tree of HEAD."
msgstr "Fehler beim Finden des \"Tree\"-Objektes von HEAD."
-#: builtin/reset.c:90
+#: 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:115
+#: builtin/reset.c:116
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD ist jetzt bei %s"
-#: builtin/reset.c:194
+#: 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:294 builtin/stash.c:520 builtin/stash.c:595
-#: builtin/stash.c:619
+#: builtin/reset.c:295 builtin/stash.c:587 builtin/stash.c:661
+#: builtin/stash.c:685
msgid "be quiet, only report errors"
msgstr "weniger Ausgaben, nur Fehler melden"
-#: builtin/reset.c:296
+#: builtin/reset.c:297
msgid "reset HEAD and index"
msgstr "HEAD und Index umsetzen"
-#: builtin/reset.c:297
+#: builtin/reset.c:298
msgid "reset only HEAD"
msgstr "nur HEAD umsetzen"
-#: builtin/reset.c:299 builtin/reset.c:301
+#: builtin/reset.c:300 builtin/reset.c:302
msgid "reset HEAD, index and working tree"
msgstr "HEAD, Index und Arbeitsverzeichnis umsetzen"
-#: builtin/reset.c:303
+#: builtin/reset.c:304
msgid "reset HEAD but keep local changes"
msgstr "HEAD umsetzen, aber lokale Änderungen behalten"
-#: builtin/reset.c:309
+#: 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:343
+#: 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:351
+#: 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:360
+#: builtin/reset.c:361
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch ist inkompatibel mit --{hard,mixed,soft}"
-#: builtin/reset.c:370
+#: 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:372
+#: 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:387
+#: 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:391
+#: builtin/reset.c:392
msgid "-N can only be used with --mixed"
msgstr "-N kann nur mit -mixed benutzt werden"
-#: builtin/reset.c:412
+#: builtin/reset.c:413
msgid "Unstaged changes after reset:"
msgstr "Nicht zum Commit vorgemerkte Änderungen nach Zurücksetzung:"
-#: builtin/reset.c:415
+#: builtin/reset.c:416
#, c-format
msgid ""
"\n"
@@ -20305,50 +21635,50 @@
"das zu verhindern. Setzen Sie die Konfigurationseinstellung reset.quiet\n"
"auf \"true\", um das zum Standard zu machen.\n"
-#: builtin/reset.c:425
+#: builtin/reset.c:434
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Konnte Index-Datei nicht zu Commit '%s' setzen."
-#: builtin/reset.c:429
+#: builtin/reset.c:439
msgid "Could not write new index file."
msgstr "Konnte neue Index-Datei nicht schreiben."
-#: builtin/rev-list.c:499
+#: builtin/rev-list.c:534
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr ""
"--exclude-promisor-objects und --missing können nicht kombiniert werden."
-#: builtin/rev-list.c:560
+#: builtin/rev-list.c:595
msgid "object filtering requires --objects"
msgstr "Das Filtern von Objekten erfordert --objects."
-#: builtin/rev-list.c:610
+#: builtin/rev-list.c:651
msgid "rev-list does not support display of notes"
msgstr "rev-list unterstützt keine Anzeige von Notizen"
-#: builtin/rev-list.c:615
+#: builtin/rev-list.c:656
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"
@@ -20441,11 +21771,11 @@
msgid "keep redundant, empty commits"
msgstr "redundante, leere Commits behalten"
-#: builtin/revert.c:232
+#: builtin/revert.c:239
msgid "revert failed"
msgstr "\"revert\" fehlgeschlagen"
-#: builtin/revert.c:245
+#: builtin/revert.c:252
msgid "cherry-pick failed"
msgstr "\"cherry-pick\" fehlgeschlagen"
@@ -20552,55 +21882,77 @@
" --all und die explizite Angabe einer <Referenz> schließen sich gegenseitig "
"aus."
-#: builtin/send-pack.c:163
+#: builtin/send-pack.c:188
msgid "remote name"
msgstr "Name des Remote-Repositories"
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:201
msgid "use stateless RPC protocol"
msgstr "zustandsloses RPC-Protokoll verwenden"
-#: builtin/send-pack.c:178
+#: builtin/send-pack.c:202
msgid "read refs from stdin"
msgstr "Referenzen von der Standard-Eingabe lesen"
-#: builtin/send-pack.c:179
+#: builtin/send-pack.c:203
msgid "print status from remote helper"
msgstr "Status des Remote-Helpers ausgeben"
-#: builtin/shortlog.c:14
+#: builtin/shortlog.c:16
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git shortlog [<Optionen>] [<Commitbereich>] [[--] <Pfad>...]"
-#: builtin/shortlog.c:15
+#: builtin/shortlog.c:17
msgid "git log --pretty=short | git shortlog [<options>]"
msgstr "git log --pretty=short | git shortlog [<Optionen>]"
-#: builtin/shortlog.c:264
-msgid "Group by committer rather than author"
-msgstr "über Commit-Ersteller anstatt Autor gruppieren"
+#: builtin/shortlog.c:123
+msgid "using multiple --group options with stdin is not supported"
+msgstr "mehrere Optionen --group mit Standard-Eingabe wird nicht unterstützt"
-#: builtin/shortlog.c:266
+#: builtin/shortlog.c:133
+msgid "using --group=trailer with stdin is not supported"
+msgstr ""
+"Nutzung von --group=trailer mit Standard-Eingabe wird nicht unterstützt"
+
+#: builtin/shortlog.c:323
+#, c-format
+msgid "unknown group type: %s"
+msgstr "unbekannter Gruppen-Typ: %s"
+
+#: builtin/shortlog.c:351
+msgid "group by committer rather than author"
+msgstr "nach Commit-Ersteller statt Autor gruppieren"
+
+#: builtin/shortlog.c:354
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
-msgid "Suppress commit descriptions, only provides commit count"
+#: builtin/shortlog.c:356
+msgid "suppress commit descriptions, only provides commit count"
msgstr "Commit-Beschreibungen unterdrücken, nur Anzahl der Commits liefern"
-#: builtin/shortlog.c:270
-msgid "Show the email address of each author"
-msgstr "die E-Mail-Adresse von jedem Autor anzeigen"
+#: builtin/shortlog.c:358
+msgid "show the email address of each author"
+msgstr "die E-Mail-Adresse jedes Autors anzeigen"
-#: builtin/shortlog.c:271
+#: builtin/shortlog.c:359
msgid "<w>[,<i1>[,<i2>]]"
msgstr "<w>[,<i1>[,<i2>]]"
-#: builtin/shortlog.c:272
-msgid "Linewrap output"
+#: builtin/shortlog.c:360
+msgid "linewrap output"
msgstr "Ausgabe mit Zeilenumbrüchen"
-#: builtin/shortlog.c:301
+#: builtin/shortlog.c:362
+msgid "field"
+msgstr "Feld"
+
+#: builtin/shortlog.c:363
+msgid "group by field"
+msgstr "Gruppieren nach Feld"
+
+#: builtin/shortlog.c:391
msgid "too many arguments given outside repository"
msgstr "zu viele Argumente außerhalb des Repositories angegeben"
@@ -20710,14 +22062,14 @@
#: builtin/show-branch.c:738
msgid "--reflog option needs one branch name"
-msgstr "Die Option --reflog benötigt einen Branchnamen."
+msgstr "die Option --reflog benötigt einen Branchnamen"
#: 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] "nur %d Eintrag kann zur selben Zeit angezeigt werden"
-msgstr[1] "nur %d Einträge können zur selben Zeit angezeigt werden"
+msgstr[0] "nur %d Eintrag kann zur selben Zeit angezeigt werden."
+msgstr[1] "nur %d Einträge können zur selben Zeit angezeigt werden."
#: builtin/show-branch.c:745
#, c-format
@@ -20741,6 +22093,14 @@
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 | --"
@@ -20790,20 +22150,31 @@
"Repository befinden"
#: builtin/sparse-checkout.c:21
-msgid "git sparse-checkout (init|list|set|add|disable) <options>"
-msgstr "git sparse-checkout (init|list|set|add|disable) <Optionen>"
+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:64
+#: builtin/sparse-checkout.c:45
+msgid "git sparse-checkout list"
+msgstr "git sparse-checkout list"
+
+#: builtin/sparse-checkout.c:71
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)."
+"dieses Arbeitsverzeichnis ist nicht partiell (Datei für partieller Checkout "
+"existiert eventuell nicht)"
-#: builtin/sparse-checkout.c:225
+#: builtin/sparse-checkout.c:223
msgid "failed to create directory for sparse-checkout file"
-msgstr "Fehler beim Erstellen eines Verzeichnisses für Datei eines partiellen "
+msgstr ""
+"Fehler beim Erstellen eines Verzeichnisses für Datei eines partiellen "
"Checkouts"
+#: builtin/sparse-checkout.c:264
+msgid "unable to upgrade repository format to enable worktreeConfig"
+msgstr ""
+"Repository-Format konnte nicht erweitert werden, um worktreeConfig zu "
+"aktivieren"
+
#: builtin/sparse-checkout.c:266
msgid "failed to set extensions.worktreeConfig setting"
msgstr "Einstellung für extensions.worktreeConfig konnte nicht gesetzt werden"
@@ -20814,48 +22185,44 @@
#: builtin/sparse-checkout.c:302
msgid "initialize the sparse-checkout in cone mode"
-msgstr "Initialisiere den partiellen Checkout im Cone-Modus"
+msgstr "initialisiere den partiellen Checkout im Cone-Modus"
-#: builtin/sparse-checkout.c:308
-msgid "initialize sparse-checkout"
-msgstr "Partiellen Checkout initialisieren"
-
-#: builtin/sparse-checkout.c:341
+#: builtin/sparse-checkout.c:339
#, c-format
msgid "failed to open '%s'"
msgstr "Fehler beim Öffnen von '%s'"
-#: builtin/sparse-checkout.c:398
+#: builtin/sparse-checkout.c:396
#, c-format
msgid "could not normalize path %s"
msgstr "konnte Pfad '%s' nicht normalisieren"
-#: builtin/sparse-checkout.c:410
+#: builtin/sparse-checkout.c:408
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
msgstr "git sparse-checkout (set|add) (--stdin | <Muster>)"
-#: builtin/sparse-checkout.c:435
+#: builtin/sparse-checkout.c:433
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "konnte Anführungszeichen von C-Style Zeichenkette '%s' nicht entfernen"
-#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513
+#: builtin/sparse-checkout.c:487 builtin/sparse-checkout.c:511
msgid "unable to load existing sparse-checkout patterns"
msgstr "konnte die existierenden Muster des partiellen Checkouts nicht laden"
-#: builtin/sparse-checkout.c:558
+#: builtin/sparse-checkout.c:556
msgid "read patterns from standard in"
msgstr "Muster von der Standard-Eingabe lesen"
-#: builtin/sparse-checkout.c:564
-msgid "set sparse-checkout patterns"
-msgstr "setze Muster für partiellen Checkout"
+#: builtin/sparse-checkout.c:571
+msgid "git sparse-checkout reapply"
+msgstr "git sparse-checkout reapply"
-#: builtin/sparse-checkout.c:581
-msgid "disable sparse-checkout"
-msgstr "Partiellen Checkout deaktivieren"
+#: builtin/sparse-checkout.c:590
+msgid "git sparse-checkout disable"
+msgstr "git sparse-checkout disable"
-#: builtin/sparse-checkout.c:593
+#: builtin/sparse-checkout.c:618
msgid "error while refreshing working directory"
msgstr "Fehler während der Aktualisierung des Arbeitsverzeichnisses."
@@ -20935,7 +22302,7 @@
msgid "Too many revisions specified:%s"
msgstr "Zu viele Commits angegeben:%s"
-#: builtin/stash.c:162 git-legacy-stash.sh:549
+#: builtin/stash.c:162
msgid "No stash entries found."
msgstr "Keine Stash-Einträge gefunden."
@@ -20944,161 +22311,175 @@
msgid "%s is not a valid reference"
msgstr "'%s' ist kein gültiger Referenzname."
-#: builtin/stash.c:225 git-legacy-stash.sh:75
-msgid "git stash clear with parameters is unimplemented"
+#: builtin/stash.c:225
+msgid "git stash clear with arguments is unimplemented"
msgstr "git stash clear mit Parametern ist nicht implementiert"
-#: builtin/stash.c:404
+#: builtin/stash.c:429
+#, c-format
+msgid ""
+"WARNING: Untracked file in way of tracked file! Renaming\n"
+" %s -> %s\n"
+" to make room.\n"
+msgstr ""
+"WARNUNG: Nicht versionierte Datei im Weg von versionierter Datei! "
+"Umbenennung\n"
+" %s -> %s\n"
+" um Platz zu schaffen.\n"
+
+#: builtin/stash.c:490
msgid "cannot apply a stash in the middle of a merge"
msgstr "Kann Stash nicht anwenden, solange ein Merge im Gange ist"
-#: builtin/stash.c:415
+#: builtin/stash.c:501
#, c-format
msgid "could not generate diff %s^!."
msgstr "Konnte keinen Diff erzeugen %s^!."
-#: builtin/stash.c:422
-msgid "conflicts in index.Try without --index."
+#: builtin/stash.c:508
+msgid "conflicts in index. Try without --index."
msgstr "Konflikte im Index. Versuchen Sie es ohne --index."
-#: builtin/stash.c:428
+#: builtin/stash.c:514
msgid "could not save index tree"
msgstr "Konnte Index-Verzeichnis nicht speichern"
-#: builtin/stash.c:437
+#: builtin/stash.c:523
msgid "could not restore untracked files from stash"
msgstr "Konnte unversionierte Dateien vom Stash nicht wiederherstellen."
-#: builtin/stash.c:451
+#: builtin/stash.c:537
#, c-format
msgid "Merging %s with %s"
msgstr "Führe %s mit %s zusammen"
-#: builtin/stash.c:461 git-legacy-stash.sh:681
+#: builtin/stash.c:547
msgid "Index was not unstashed."
msgstr "Index wurde nicht aus dem Stash zurückgeladen."
-#: builtin/stash.c:522 builtin/stash.c:621
+#: builtin/stash.c:589 builtin/stash.c:687
msgid "attempt to recreate the index"
msgstr "Versuche Index wiederherzustellen."
-#: builtin/stash.c:555
+#: builtin/stash.c:633
#, c-format
msgid "Dropped %s (%s)"
msgstr "%s (%s) gelöscht"
-#: builtin/stash.c:558
+#: builtin/stash.c:636
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s: Konnte Stash-Eintrag nicht löschen"
-#: builtin/stash.c:583
+#: builtin/stash.c:649
#, c-format
msgid "'%s' is not a stash reference"
msgstr "'%s' ist keine Stash-Referenz"
-#: builtin/stash.c:633 git-legacy-stash.sh:695
+#: builtin/stash.c:699
msgid "The stash entry is kept in case you need it again."
msgstr ""
"Der Stash-Eintrag wird für den Fall behalten, dass Sie diesen nochmal "
"benötigen."
-#: builtin/stash.c:656 git-legacy-stash.sh:713
+#: builtin/stash.c:722
msgid "No branch name specified"
msgstr "Kein Branchname spezifiziert"
-#: builtin/stash.c:796 builtin/stash.c:833
+#: builtin/stash.c:866 builtin/stash.c:903
#, c-format
msgid "Cannot update %s with %s"
msgstr "Kann nicht %s mit %s aktualisieren."
-#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
+#: builtin/stash.c:884 builtin/stash.c:1538 builtin/stash.c:1603
msgid "stash message"
msgstr "Stash-Beschreibung"
-#: builtin/stash.c:824
+#: builtin/stash.c:894
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" erwartet ein Argument <Commit>"
-#: builtin/stash.c:1049 git-legacy-stash.sh:218
+#: builtin/stash.c:1109
msgid "No changes selected"
msgstr "Keine Änderungen ausgewählt"
-#: builtin/stash.c:1149 git-legacy-stash.sh:150
+#: builtin/stash.c:1209
msgid "You do not have the initial commit yet"
msgstr "Sie haben bisher noch keinen initialen Commit"
-#: builtin/stash.c:1176 git-legacy-stash.sh:165
+#: builtin/stash.c:1236
msgid "Cannot save the current index state"
msgstr "Kann den aktuellen Zustand des Index nicht speichern"
-#: builtin/stash.c:1185 git-legacy-stash.sh:180
+#: builtin/stash.c:1245
msgid "Cannot save the untracked files"
msgstr "Kann die unversionierten Dateien nicht speichern"
-#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201
-#: git-legacy-stash.sh:214
+#: builtin/stash.c:1256 builtin/stash.c:1265
msgid "Cannot save the current worktree state"
msgstr "Kann den aktuellen Zustand des Arbeitsverzeichnisses nicht speichern"
-#: builtin/stash.c:1233 git-legacy-stash.sh:234
+#: builtin/stash.c:1293
msgid "Cannot record working tree state"
msgstr "Kann Zustand des Arbeitsverzeichnisses nicht aufzeichnen"
-#: builtin/stash.c:1282 git-legacy-stash.sh:338
+#: builtin/stash.c:1342
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr ""
"Kann nicht gleichzeitig --patch und --include-untracked oder --all verwenden"
-#: builtin/stash.c:1298
+#: builtin/stash.c:1358
msgid "Did you forget to 'git add'?"
msgstr "Haben Sie vielleicht 'git add' vergessen?"
-#: builtin/stash.c:1313 git-legacy-stash.sh:346
+#: builtin/stash.c:1373
msgid "No local changes to save"
msgstr "Keine lokalen Änderungen zum Speichern"
-#: builtin/stash.c:1320 git-legacy-stash.sh:351
+#: builtin/stash.c:1380
msgid "Cannot initialize stash"
msgstr "Kann \"stash\" nicht initialisieren"
-#: builtin/stash.c:1335 git-legacy-stash.sh:355
+#: builtin/stash.c:1395
msgid "Cannot save the current status"
msgstr "Kann den aktuellen Status nicht speichern"
-#: builtin/stash.c:1340
+#: builtin/stash.c:1400
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Arbeitsverzeichnis und Index-Status %s gespeichert."
-#: builtin/stash.c:1430 git-legacy-stash.sh:385
+#: builtin/stash.c:1490
msgid "Cannot remove worktree changes"
msgstr "Kann Änderungen im Arbeitsverzeichnis nicht löschen"
-#: builtin/stash.c:1469 builtin/stash.c:1534
+#: builtin/stash.c:1529 builtin/stash.c:1594
msgid "keep index"
msgstr "behalte Index"
-#: builtin/stash.c:1471 builtin/stash.c:1536
+#: builtin/stash.c:1531 builtin/stash.c:1596
msgid "stash in patch mode"
msgstr "Stash in Patch-Modus"
-#: builtin/stash.c:1472 builtin/stash.c:1537
+#: builtin/stash.c:1532 builtin/stash.c:1597
msgid "quiet mode"
msgstr "weniger Ausgaben"
-#: builtin/stash.c:1474 builtin/stash.c:1539
+#: builtin/stash.c:1534 builtin/stash.c:1599
msgid "include untracked files in stash"
msgstr "unversionierte Dateien in Stash einbeziehen"
-#: builtin/stash.c:1476 builtin/stash.c:1541
+#: builtin/stash.c:1536 builtin/stash.c:1601
msgid "include ignore files"
msgstr "ignorierte Dateien einbeziehen"
-#: builtin/stash.c:1600
-#, c-format
-msgid "could not exec %s"
-msgstr "Konnte 'exec %s' nicht ausführen."
+#: builtin/stash.c:1636
+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]"
@@ -21118,7 +22499,7 @@
msgid "prepend comment character and space to each line"
msgstr "Kommentarzeichen mit Leerzeichen an jede Zeile voranstellen"
-#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999
+#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Vollständiger Referenzname erwartet, %s erhalten"
@@ -21132,7 +22513,7 @@
msgid "cannot strip one component off url '%s'"
msgstr "Kann eine Komponente von URL '%s' nicht extrahieren"
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819
msgid "alternative anchor for relative paths"
msgstr "Alternativer Anker für relative Pfade"
@@ -21140,8 +22521,8 @@
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<Pfad>] [<Pfad>...]"
-#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c: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"
@@ -21173,13 +22554,12 @@
"."
#: 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"
+msgid "suppress output of entering each submodule command"
+msgstr "Ausgaben beim Betreten eines Submodul-Befehls unterdrücken"
-#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063
-msgid "Recurse into nested submodules"
+#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888
+#: builtin/submodule--helper.c:1487
+msgid "recurse into nested submodules"
msgstr "Rekursion in verschachtelte Submodule durchführen"
#: builtin/submodule--helper.c:572
@@ -21195,104 +22575,155 @@
"Konnte Konfiguration '%s' nicht nachschlagen. Nehme an, dass dieses\n"
"Repository sein eigenes verbindliches Upstream-Repository ist."
-#: builtin/submodule--helper.c:667
+#: builtin/submodule--helper.c: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:671
+#: 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:681
+#: 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:688
+#: 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:710
-msgid "Suppress output for initializing a submodule"
+#: builtin/submodule--helper.c:709
+msgid "suppress output for initializing a submodule"
msgstr "Ausgaben bei Initialisierung eines Submoduls unterdrücken"
-#: builtin/submodule--helper.c:715
+#: builtin/submodule--helper.c:714
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<Optionen>] [<Pfad>]"
-#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
+#: builtin/submodule--helper.c: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:837
+#: 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:864 builtin/submodule--helper.c:1033
+#: 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:888 builtin/submodule--helper.c:1199
-msgid "Suppress submodule status output"
-msgstr "Ausgabe über Submodul-Status unterdrücken"
+#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623
+msgid "suppress submodule status output"
+msgstr "Ausgabe des Submodul-Status unterdrücken"
-#: builtin/submodule--helper.c:889
+#: builtin/submodule--helper.c:887
msgid ""
-"Use commit stored in the index instead of the one stored in the submodule "
+"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"
+"den Commit benutzen, der im Index gespeichert ist, statt den im Submodul HEAD"
-#: builtin/submodule--helper.c:890
-msgid "recurse into nested submodules"
-msgstr "Rekursion in verschachtelte Submodule durchführen"
-
-#: builtin/submodule--helper.c:895
+#: 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:919
+#: builtin/submodule--helper.c:917
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <Pfad>"
-#: builtin/submodule--helper.c:983
+#: 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:989
+#: 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:1003
+#: 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:1014
+#: 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:1061
-msgid "Suppress output of synchronizing submodule url"
+#: 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:1068
+#: 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:1122
+#: builtin/submodule--helper.c:1546
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -21302,7 +22733,7 @@
"(benutzen Sie 'rm -rf', wenn Sie dieses wirklich mitsamt seiner Historie\n"
"löschen möchten)"
-#: builtin/submodule--helper.c:1134
+#: builtin/submodule--helper.c:1558
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -21311,49 +22742,49 @@
"Arbeitsverzeichnis von Submodul in '%s' enthält lokale Änderungen;\n"
"verwenden Sie '-f', um diese zu verwerfen."
-#: builtin/submodule--helper.c:1142
+#: builtin/submodule--helper.c:1566
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Verzeichnis '%s' bereinigt.\n"
-#: builtin/submodule--helper.c:1144
+#: 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:1155
+#: 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:1171
+#: 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:1200
-msgid "Remove submodule working trees even if they contain local changes"
+#: 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:1201
-msgid "Unregister all submodules"
+#: builtin/submodule--helper.c:1625
+msgid "unregister all submodules"
msgstr "alle Submodule austragen"
-#: builtin/submodule--helper.c:1206
+#: 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:1220
+#: 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:1289
+#: 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"
@@ -21366,46 +22797,46 @@
"submodule.alternateErrorStrategy auf 'info' oder klone mit der Option\n"
"'--reference-if-able' statt '--reference'."
-#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331
+#: builtin/submodule--helper.c: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:1367
+#: 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:1374
+#: 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:1398
+#: builtin/submodule--helper.c:1822
msgid "where the new submodule will be cloned to"
msgstr "Pfad für neues Submodul"
-#: builtin/submodule--helper.c:1401
+#: builtin/submodule--helper.c:1825
msgid "name of the new submodule"
msgstr "Name des neuen Submoduls"
-#: builtin/submodule--helper.c:1404
+#: 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:1412
+#: builtin/submodule--helper.c:1836
msgid "depth for shallow clones"
msgstr "Tiefe des Klons mit unvollständiger Historie (shallow)"
-#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924
+#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348
msgid "force cloning progress"
msgstr "Fortschrittsanzeige beim Klonen erzwingen"
-#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926
+#: 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:1424
+#: builtin/submodule--helper.c:1848
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -21415,111 +22846,110 @@
"<Repository>] [--name <Name>] [--depth <Tiefe>] [--single-branch] --url "
"<URL> --path <Pfad>"
-#: builtin/submodule--helper.c:1449
+#: 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:1460
+#: 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."
-#: builtin/submodule--helper.c:1464
+#: builtin/submodule--helper.c:1888
#, c-format
msgid "directory not empty: '%s'"
msgstr "Verzeichnis ist nicht leer: '%s'"
-#: builtin/submodule--helper.c:1476
+#: 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:1512
+#: 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:1516
+#: 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:1617
+#: builtin/submodule--helper.c:2041
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Submodul-Pfad '%s' nicht initialisiert"
-#: builtin/submodule--helper.c:1621
+#: builtin/submodule--helper.c:2045
msgid "Maybe you want to use 'update --init'?"
msgstr "Meinten Sie vielleicht 'update --init'?"
-#: builtin/submodule--helper.c:1651
+#: builtin/submodule--helper.c:2075
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Überspringe nicht zusammengeführtes Submodul %s"
-#: builtin/submodule--helper.c:1680
+#: builtin/submodule--helper.c:2104
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Überspringe Submodul '%s'"
-#: builtin/submodule--helper.c:1830
+#: 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:1841
+#: 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:1903 builtin/submodule--helper.c:2149
+#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573
msgid "path into the working tree"
msgstr "Pfad zum Arbeitsverzeichnis"
-#: builtin/submodule--helper.c:1906
+#: 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:1910
+#: builtin/submodule--helper.c:2334
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout oder none"
-#: builtin/submodule--helper.c:1916
-msgid "Create a shallow clone truncated to the specified number of revisions"
+#: 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."
+"einen Klon mit unvollständiger Historie (shallow) erstellen, abgeschnitten "
+"bei der angegebenen Anzahl von Commits"
-#: builtin/submodule--helper.c:1919
+#: builtin/submodule--helper.c:2343
msgid "parallel jobs"
msgstr "Parallele Ausführungen"
-#: builtin/submodule--helper.c:1921
+#: 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:1922
+#: builtin/submodule--helper.c:2346
msgid "don't print cloning progress"
msgstr "keine Fortschrittsanzeige beim Klonen"
-#: builtin/submodule--helper.c:1933
+#: 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:1946
+#: builtin/submodule--helper.c:2370
msgid "bad value for update parameter"
msgstr "Fehlerhafter Wert für --update Parameter"
-#: builtin/submodule--helper.c:1994
+#: builtin/submodule--helper.c:2418
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -21528,52 +22958,86 @@
"Branch von Submodul (%s) ist konfiguriert, den Branch des Hauptprojektes\n"
"zu erben, aber das Hauptprojekt befindet sich auf keinem Branch."
-#: builtin/submodule--helper.c:2117
+#: builtin/submodule--helper.c: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:2150
+#: builtin/submodule--helper.c:2574
msgid "recurse into submodules"
msgstr "Rekursion in Submodule durchführen"
-#: builtin/submodule--helper.c:2156
+#: 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:2212
+#: 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:2215
+#: builtin/submodule--helper.c:2639
msgid "unset the config in the .gitmodules file"
msgstr "Konfiguration in der .gitmodules-Datei entfernen"
-#: builtin/submodule--helper.c:2220
+#: builtin/submodule--helper.c:2644
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config <name> [<Wert>]"
-#: builtin/submodule--helper.c:2221
+#: builtin/submodule--helper.c:2645
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <Name>"
-#: builtin/submodule--helper.c:2222
+#: builtin/submodule--helper.c:2646
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2241 git-submodule.sh:174
+#: builtin/submodule--helper.c:2665 git-submodule.sh:150
#, sh-format
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr ""
"Bitte stellen Sie sicher, dass sich die Datei .gitmodules im "
"Arbeitsverzeichnis befindet."
-#: builtin/submodule--helper.c:2291 git.c:433 git.c:684
+#: builtin/submodule--helper.c: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:441 git.c:714
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s unterstützt kein --super-prefix"
-#: builtin/submodule--helper.c:2297
+#: builtin/submodule--helper.c:2798
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' ist kein gültiger Unterbefehl von submodule--helper"
@@ -21599,11 +23063,11 @@
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:499
msgid "reason"
msgstr "Grund"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
msgid "reason of the update"
msgstr "Grund für die Aktualisierung"
@@ -21623,11 +23087,13 @@
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>..."
@@ -21638,12 +23104,12 @@
msgid "tag '%s' not found."
msgstr "Tag '%s' nicht gefunden."
-#: builtin/tag.c:105
+#: builtin/tag.c:124
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Tag '%s' gelöscht (war %s)\n"
-#: builtin/tag.c:135
+#: builtin/tag.c:159
#, c-format
msgid ""
"\n"
@@ -21656,7 +23122,7 @@
" %s\n"
"ein. Zeilen, die mit '%c' beginnen, werden ignoriert.\n"
-#: builtin/tag.c:139
+#: builtin/tag.c:163
#, c-format
msgid ""
"\n"
@@ -21671,15 +23137,11 @@
"ein. Zeilen, die mit '%c' beginnen, werden behalten; Sie dürfen diese\n"
"selbst entfernen wenn Sie möchten.\n"
-#: builtin/tag.c:198
+#: builtin/tag.c:230
msgid "unable to sign the tag"
msgstr "konnte Tag nicht signieren"
-#: builtin/tag.c:200
-msgid "unable to write tag file"
-msgstr "konnte Tag-Datei nicht schreiben"
-
-#: builtin/tag.c:216
+#: builtin/tag.c:248
#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
@@ -21693,138 +23155,134 @@
"\n"
"\tgit tag -f %s %s^{}"
-#: builtin/tag.c:232
+#: builtin/tag.c:264
msgid "bad object type."
msgstr "ungültiger Objekt-Typ"
-#: builtin/tag.c:284
+#: builtin/tag.c:317
msgid "no tag message?"
msgstr "keine Tag-Beschreibung?"
-#: builtin/tag.c:291
+#: builtin/tag.c:324
#, 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:435
msgid "list tag names"
msgstr "Tagnamen auflisten"
-#: builtin/tag.c:404
+#: builtin/tag.c:437
msgid "print <n> lines of each tag message"
msgstr "<n> Zeilen jeder Tag-Beschreibung anzeigen"
-#: builtin/tag.c:406
+#: builtin/tag.c:439
msgid "delete tags"
msgstr "Tags löschen"
-#: builtin/tag.c:407
+#: builtin/tag.c:440
msgid "verify tags"
msgstr "Tags überprüfen"
-#: builtin/tag.c:409
+#: builtin/tag.c:442
msgid "Tag creation options"
msgstr "Optionen für Erstellung von Tags"
-#: builtin/tag.c:411
+#: builtin/tag.c:444
msgid "annotated tag, needs a message"
msgstr "annotiertes Tag, benötigt eine Beschreibung"
-#: builtin/tag.c:413
+#: builtin/tag.c:446
msgid "tag message"
msgstr "Tag-Beschreibung"
-#: builtin/tag.c:415
+#: builtin/tag.c:448
msgid "force edit of tag message"
msgstr "Bearbeitung der Tag-Beschreibung erzwingen"
-#: builtin/tag.c:416
+#: builtin/tag.c:449
msgid "annotated and GPG-signed tag"
msgstr "annotiertes und GPG-signiertes Tag"
-#: builtin/tag.c:419
+#: builtin/tag.c:452
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:453
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:454 builtin/update-ref.c:505
msgid "create a reflog"
msgstr "Reflog erstellen"
-#: builtin/tag.c:423
+#: builtin/tag.c:456
msgid "Tag listing options"
msgstr "Optionen für Auflistung der Tags"
-#: builtin/tag.c:424
+#: builtin/tag.c:457
msgid "show tag list in columns"
msgstr "Liste der Tags in Spalten anzeigen"
-#: builtin/tag.c:425 builtin/tag.c:427
+#: builtin/tag.c:458 builtin/tag.c:460
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:459 builtin/tag.c:461
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:462
msgid "print only tags that are merged"
msgstr "nur Tags ausgeben, die gemerged wurden"
-#: builtin/tag.c:430
+#: builtin/tag.c:463
msgid "print only tags that are not merged"
msgstr "nur Tags ausgeben, die nicht gemerged wurden"
-#: builtin/tag.c:434
+#: builtin/tag.c:467
msgid "print only tags of the object"
msgstr "nur Tags von dem Objekt ausgeben"
-#: builtin/tag.c:482
+#: builtin/tag.c:515
msgid "--column and -n are incompatible"
msgstr "--column und -n sind inkompatibel"
-#: builtin/tag.c:504
+#: builtin/tag.c:537
msgid "-n option is only allowed in list mode"
-msgstr "Die Option -n ist nur im Listenmodus erlaubt."
+msgstr "die Option -n ist nur im Listenmodus erlaubt"
-#: builtin/tag.c:506
+#: builtin/tag.c:539
msgid "--contains option is only allowed in list mode"
-msgstr "Die Option --contains ist nur im Listenmodus erlaubt."
+msgstr "--contains ist nur im Listenmodus erlaubt"
-#: builtin/tag.c:508
+#: builtin/tag.c:541
msgid "--no-contains option is only allowed in list mode"
-msgstr "Die Option --no-contains ist nur im Listenmodus erlaubt."
+msgstr "--no-contains ist nur im Listenmodus erlaubt"
-#: builtin/tag.c:510
+#: builtin/tag.c:543
msgid "--points-at option is only allowed in list mode"
-msgstr "Die Option --points-at ist nur im Listenmodus erlaubt."
+msgstr "--points-at ist nur im Listenmodus erlaubt"
-#: builtin/tag.c:512
+#: builtin/tag.c:545
msgid "--merged and --no-merged options are only allowed in list mode"
-msgstr "Die Optionen --merged und --no-merged sind nur im Listenmodus erlaubt."
+msgstr "--merged und --no-merged sind nur im Listenmodus erlaubt"
-#: builtin/tag.c:523
+#: builtin/tag.c:556
msgid "only one -F or -m option is allowed."
msgstr "nur eine -F oder -m Option ist erlaubt."
-#: builtin/tag.c:542
-msgid "too many params"
-msgstr "zu viele Parameter"
-
-#: builtin/tag.c:548
+#: builtin/tag.c:581
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' ist kein gültiger Tagname."
-#: builtin/tag.c:553
+#: builtin/tag.c:586
#, c-format
msgid "tag '%s' already exists"
msgstr "Tag '%s' existiert bereits"
-#: builtin/tag.c:584
+#: builtin/tag.c:617
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Tag '%s' aktualisiert (war %s)\n"
@@ -22050,24 +23508,24 @@
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
msgstr ""
-"core.splitIndex ist auf 'false' gesetzt. Entfernen oder ändern Sie dies,\n"
-"wenn sie wirklich das Splitting des Index aktivieren möchten."
+"core.splitIndex ist auf 'false' gesetzt; entfernen oder ändern Sie dies,\n"
+"wenn sie wirklich das Splitting des Index aktivieren möchten"
#: builtin/update-index.c:1182
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
msgstr ""
-"core.splitIndex ist auf 'true' gesetzt. Entfernen oder ändern Sie dies,\n"
-"wenn Sie wirklich das Splitting des Index deaktivieren möchten."
+"core.splitIndex ist auf 'true' gesetzt; entfernen oder ändern Sie dies,\n"
+"wenn Sie wirklich das Splitting des Index deaktivieren möchten"
#: builtin/update-index.c:1194
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
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."
+"core.untrackedCache ist auf 'true' gesetzt; entfernen oder ändern Sie dies,\n"
+"wenn Sie wirklich den Cache für unversionierte Dateien deaktivieren möchten"
#: builtin/update-index.c:1198
msgid "Untracked cache disabled"
@@ -22078,9 +23536,9 @@
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
msgstr ""
-"core.untrackedCache ist auf 'false' gesetzt. Entfernen oder ändern Sie "
+"core.untrackedCache ist auf 'false' gesetzt; entfernen oder ändern Sie "
"dies,\n"
-"wenn sie wirklich den Cache für unversionierte Dateien aktivieren möchten."
+"wenn sie wirklich den Cache für unversionierte Dateien aktivieren möchten"
#: builtin/update-index.c:1210
#, c-format
@@ -22090,9 +23548,9 @@
#: 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-"
+"core.fsmonitor nicht gesetzt; setzen Sie es, wenn Sie den Dateisystem-"
"Monitor\n"
-"wirklich aktivieren möchten."
+"wirklich aktivieren möchten"
#: builtin/update-index.c:1222
msgid "fsmonitor enabled"
@@ -22102,7 +23560,7 @@
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
msgstr ""
-"core.fsmonitor ist gesetzt. Löschen Sie es, wenn Sie den Dateisystem-"
+"core.fsmonitor ist gesetzt; löschen Sie es, wenn Sie den Dateisystem-"
"Monitor\n"
"wirklich deaktivieren möchten."
@@ -22123,19 +23581,19 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<Optionen>] --stdin [-z]"
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:500
msgid "delete the reference"
msgstr "diese Referenz löschen"
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:502
msgid "update <refname> not the one it points to"
msgstr "<Referenzname> aktualisieren, nicht den Verweis"
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:503
msgid "stdin has NUL-terminated arguments"
msgstr "Standard-Eingabe hat durch NUL-Zeichen abgeschlossene Argumente"
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:504
msgid "read updates from stdin"
msgstr "Aktualisierungen von der Standard-Eingabe lesen"
@@ -22181,15 +23639,15 @@
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"
@@ -22201,234 +23659,213 @@
msgid "print tag contents"
msgstr "Tag-Inhalte ausgeben"
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<Optionen>] <Pfad> [<Commit-Angabe>]"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree list [<options>]"
msgstr "git worktree list [<Optionen>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<Optionen>] <Pfad>"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <Arbeitsverzeichnis> <neuer-Pfad>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<Optionen>]"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<Optionen>] <Arbeitsverzeichnis>"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <Pfad>"
-#: builtin/worktree.c:60 builtin/worktree.c:891
+#: builtin/worktree.c:61 builtin/worktree.c:933
#, c-format
msgid "failed to delete '%s'"
msgstr "Fehler beim Löschen von '%s'"
-#: builtin/worktree.c:79
+#: builtin/worktree.c:74
#, c-format
-msgid "Removing worktrees/%s: not a valid directory"
-msgstr "Lösche worktrees/%s: kein gültiges Verzeichnis"
+msgid "Removing %s/%s: %s"
+msgstr "Entferne %s/%s: %s"
-#: builtin/worktree.c:85
-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
-msgstr "Lösche worktrees/%s: gitdir-Datei existiert nicht"
-
-#: builtin/worktree.c:90 builtin/worktree.c:99
-#, c-format
-msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
-msgstr "Lösche worktrees/%s: konnte gitdir-Datei (%s) nicht lesen"
-
-#: builtin/worktree.c:109
-#, 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)"
-
-#: builtin/worktree.c:117
-#, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
-msgstr "Lösche worktrees/%s: ungültige gitdir-Datei"
-
-#: builtin/worktree.c:126
-#, c-format
-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
-msgstr "Lösche worktrees/%s: gitdir-Datei verweist auf nicht existierenden Ort"
-
-#: builtin/worktree.c:165
+#: builtin/worktree.c:149
msgid "report pruned working trees"
msgstr "entfernte Arbeitsverzeichnisse ausgeben"
-#: builtin/worktree.c:167
+#: builtin/worktree.c:151
msgid "expire working trees older than <time>"
msgstr "Arbeitsverzeichnisse älter als <Zeit> verfallen lassen"
-#: builtin/worktree.c:234
+#: builtin/worktree.c:221
#, c-format
msgid "'%s' already exists"
msgstr "'%s' existiert bereits"
-#: builtin/worktree.c:244
+#: builtin/worktree.c:230
#, 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:249
+#: builtin/worktree.c:235
#, 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:251
+#: builtin/worktree.c:237
#, 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:301
+#: builtin/worktree.c:288
#, c-format
msgid "could not create directory of '%s'"
msgstr "Konnte Verzeichnis '%s' nicht erstellen."
-#: builtin/worktree.c:432 builtin/worktree.c:438
+#: builtin/worktree.c:422 builtin/worktree.c:428
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Bereite Arbeitsverzeichnis vor (neuer Branch '%s')"
-#: builtin/worktree.c:434
+#: builtin/worktree.c:424
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "Bereite Arbeitsverzeichnis vor (setze Branch '%s' um; war bei %s)"
-#: builtin/worktree.c:443
+#: builtin/worktree.c:433
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Bereite Arbeitsverzeichnis vor (checke '%s' aus)"
-#: builtin/worktree.c:449
+#: builtin/worktree.c:439
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Bereite Arbeitsverzeichnis vor (losgelöster HEAD %s)"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:480
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
"<Branch> auschecken, auch wenn dieser bereits in einem anderen "
"Arbeitsverzeichnis ausgecheckt ist"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:483
msgid "create a new branch"
msgstr "neuen Branch erstellen"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:485
msgid "create or reset a branch"
msgstr "Branch erstellen oder umsetzen"
-#: builtin/worktree.c:497
+#: builtin/worktree.c:487
msgid "populate the new working tree"
msgstr "das neue Arbeitsverzeichnis auschecken"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:488
msgid "keep the new working tree locked"
msgstr "das neue Arbeitsverzeichnis gesperrt lassen"
-#: builtin/worktree.c:501
+#: builtin/worktree.c:491
msgid "set up tracking mode (see git-branch(1))"
msgstr "Modus zum Folgen von Branches einstellen (siehe git-branch(1))"
-#: builtin/worktree.c:504
+#: builtin/worktree.c:494
msgid "try to match the new branch name with a remote-tracking branch"
msgstr ""
"versuchen, eine Übereinstimmung des Branch-Namens mit einem\n"
"Remote-Tracking-Branch herzustellen"
-#: builtin/worktree.c:512
+#: builtin/worktree.c:502
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B und --detach schließen sich gegenseitig aus"
-#: builtin/worktree.c:573
+#: builtin/worktree.c:563
msgid "--[no-]track can only be used if a new branch is created"
msgstr ""
"--[no]-track kann nur verwendet werden, wenn ein neuer Branch erstellt wird."
-#: builtin/worktree.c:673
+#: builtin/worktree.c:680
+msgid "show extended annotations and reasons, if available"
+msgstr "erweiterte Anmerkungen und Gründe anzeigen, falls vorhanden"
+
+#: builtin/worktree.c:682
+msgid "add 'prunable' annotation to worktrees older than <time>"
+msgstr ""
+"'prunable'-Anmerkung zu Arbeitsverzeichnissen älter als <Zeit> hinzufügen"
+
+#: builtin/worktree.c:691
+msgid "--verbose and --porcelain are mutually exclusive"
+msgstr "--verbose und --porcelain schließen sich gegenseitig aus"
+
+#: builtin/worktree.c:718
msgid "reason for locking"
msgstr "Sperrgrund"
-#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
-#: builtin/worktree.c:919
+#: builtin/worktree.c:730 builtin/worktree.c:763 builtin/worktree.c:837
+#: builtin/worktree.c:961
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' ist kein Arbeitsverzeichnis"
-#: builtin/worktree.c:687 builtin/worktree.c:720
+#: builtin/worktree.c:732 builtin/worktree.c:765
msgid "The main working tree cannot be locked or unlocked"
msgstr "Das Hauptarbeitsverzeichnis kann nicht gesperrt oder entsperrt werden."
-#: builtin/worktree.c:692
+#: builtin/worktree.c:737
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' ist bereits gesperrt, Grund: %s"
-#: builtin/worktree.c:694
+#: builtin/worktree.c:739
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' ist bereits gesperrt"
-#: builtin/worktree.c:722
+#: builtin/worktree.c:767
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' ist nicht gesperrt"
-#: builtin/worktree.c:763
+#: builtin/worktree.c:808
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
"Arbeitsverzeichnisse, die Submodule enthalten, können nicht verschoben oder\n"
"entfernt werden."
-#: builtin/worktree.c:771
+#: builtin/worktree.c:816
msgid "force move even if worktree is dirty or locked"
msgstr ""
"Verschieben erzwingen, auch wenn das Arbeitsverzeichnis geändert oder "
"gesperrt ist"
-#: builtin/worktree.c:794 builtin/worktree.c:921
+#: builtin/worktree.c:839 builtin/worktree.c:963
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' ist ein Hauptarbeitsverzeichnis"
-#: builtin/worktree.c:799
+#: builtin/worktree.c:844
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "Konnte Zielname aus '%s' nicht bestimmen."
-#: builtin/worktree.c:805
-#, c-format
-msgid "target '%s' already exists"
-msgstr "Ziel '%s' existiert bereits."
-
-#: builtin/worktree.c:813
+#: builtin/worktree.c:857
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -22438,7 +23875,7 @@
"Benutzen Sie 'move -f -f' zum Überschreiben oder entsperren Sie zuerst\n"
"das Arbeitsverzeichnis."
-#: builtin/worktree.c:815
+#: builtin/worktree.c:859
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -22447,40 +23884,40 @@
"Benutzen Sie 'move -f -f' zum Überschreiben oder entsperren Sie zuerst\n"
"das Arbeitsverzeichnis."
-#: builtin/worktree.c:818
+#: builtin/worktree.c:862
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "Validierung fehlgeschlagen, kann Arbeitszeichnis nicht verschieben: %s"
-#: builtin/worktree.c:823
+#: builtin/worktree.c:867
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "Fehler beim Verschieben von '%s' nach '%s'"
-#: builtin/worktree.c:871
+#: builtin/worktree.c:913
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "Fehler beim Ausführen von 'git status' auf '%s'"
-#: builtin/worktree.c:875
+#: builtin/worktree.c:917
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
"'%s' enthält geänderte oder nicht versionierte Dateien, benutzen Sie --force "
"zum Löschen"
-#: builtin/worktree.c:880
+#: builtin/worktree.c:922
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "Fehler beim Ausführen von 'git status' auf '%s'. Code: %d"
-#: builtin/worktree.c:903
+#: builtin/worktree.c:945
msgid "force removal even if worktree is dirty or locked"
msgstr ""
"Löschen erzwingen, auch wenn das Arbeitsverzeichnis geändert oder gesperrt "
"ist"
-#: builtin/worktree.c:926
+#: builtin/worktree.c:968
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -22490,7 +23927,7 @@
"Benutzen Sie 'remove -f -f' zum Überschreiben oder entsperren Sie zuerst\n"
"das Arbeitsverzeichnis."
-#: builtin/worktree.c:928
+#: builtin/worktree.c:970
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -22499,11 +23936,21 @@
"Benutzen Sie 'remove -f -f' zum Überschreiben oder entsperren Sie zuerst\n"
"das Arbeitsverzeichnis."
-#: builtin/worktree.c:931
+#: builtin/worktree.c:973
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "Validierung fehlgeschlagen, kann Arbeitsverzeichnis nicht löschen: %s"
+#: builtin/worktree.c:997
+#, c-format
+msgid "repair: %s: %s"
+msgstr "repariere: %s: %s"
+
+#: builtin/worktree.c:1000
+#, 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>/]"
@@ -22520,47 +23967,37 @@
msgid "only useful for debugging"
msgstr "nur nützlich für Fehlersuche"
-#: fast-import.c:3125
+#: http-fetch.c:118
#, c-format
-msgid "Expected 'mark' command, got %s"
-msgstr "'mark' Befehl erwartet, '%s' bekommen"
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr "Argument für --packfile muss ein gültiger Hash sein ('%s' erhalten)"
-#: fast-import.c:3130
-#, c-format
-msgid "Expected 'to' command, got %s"
-msgstr "'to' Befehl erwartet, '%s' bekommen"
+#: http-fetch.c:128
+msgid "not a git repository"
+msgstr "kein Git-Repository"
-#: fast-import.c:3254
-#, c-format
-msgid "feature '%s' forbidden in input without --allow-unsafe-features"
-msgstr "Feature '%s' verboten in Eingabe ohne Option --allow-unsafe-features"
+#: http-fetch.c:134
+msgid "--packfile requires --index-pack-args"
+msgstr "--packfile benötigt --index-pack-args"
-#: credential-cache--daemon.c:223
-#, c-format
-msgid ""
-"The permissions on your socket directory are too loose; other\n"
-"users may be able to read your cached credentials. Consider running:\n"
-"\n"
-"\tchmod 0700 %s"
-msgstr ""
-"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."
+#: http-fetch.c:143
+msgid "--index-pack-args can only be used with --packfile"
+msgstr "--index-pack-args kann nur mit --packfile benutzt werden"
-#: credential-cache--daemon.c:272
-msgid "print debugging messages to stderr"
-msgstr "Meldungen zur Fehlersuche in Standard-Fehlerausgabe ausgeben"
+#: t/helper/test-fast-rebase.c:141
+msgid "unhandled options"
+msgstr "unbehandelte Optionen"
-#: t/helper/test-reach.c:152
+#: t/helper/test-fast-rebase.c:146
+msgid "error preparing revisions"
+msgstr "Fehler beim Vorbereiten der Commits"
+
+#: 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."
@@ -22572,13 +24009,14 @@
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"
" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
"bare]\n"
" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
" <command> [<args>]"
msgstr ""
"git [--version] [--help] [-C <Pfad>] [-c <Name>=<Wert>]\n"
@@ -22586,9 +24024,10 @@
" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
"bare]\n"
" [--git-dir=<Pfad>] [--work-tree=<Pfad>] [--namespace=<Name>]\n"
+" [--super-prefix=<Pfad>] [--config-env=<Name>=<Variable>]\n"
" <Befehl> [<Argumente>]"
-#: git.c:34
+#: git.c:36
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"
@@ -22601,47 +24040,47 @@
"Konzept zu erfahren.\n"
"Benutzen Sie 'git help git' für einen Überblick des Systems."
-#: git.c:186
+#: git.c:188
#, c-format
msgid "no directory given for --git-dir\n"
msgstr "Kein Verzeichnis für --git-dir angegeben.\n"
-#: git.c:200
+#: git.c:202
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "Kein Namespace für --namespace angegeben.\n"
-#: git.c:214
+#: git.c:216
#, c-format
msgid "no directory given for --work-tree\n"
msgstr "Kein Verzeichnis für --work-tree angegeben.\n"
-#: git.c:228
+#: git.c:230
#, 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:252
#, c-format
msgid "-c expects a configuration string\n"
msgstr "-c erwartet einen Konfigurationsstring.\n"
-#: git.c:288
+#: git.c:292
#, c-format
msgid "no directory given for -C\n"
msgstr "Kein Verzeichnis für -C angegeben.\n"
-#: git.c:314
+#: git.c:318
#, c-format
msgid "unknown option: %s\n"
msgstr "Unbekannte Option: %s\n"
-#: git.c:360
+#: git.c:367
#, c-format
msgid "while expanding alias '%s': '%s'"
msgstr "beim Erweitern von Alias '%s': '%s'"
-#: git.c:369
+#: git.c:376
#, c-format
msgid ""
"alias '%s' changes environment variables.\n"
@@ -22650,39 +24089,39 @@
"Alias '%s' ändert Umgebungsvariablen.\n"
"Sie können '!git' im Alias benutzen, um dies zu tun."
-#: git.c:376
+#: git.c:383
#, c-format
msgid "empty alias for %s"
msgstr "leerer Alias für %s"
-#: git.c:379
+#: git.c:386
#, c-format
msgid "recursive alias: %s"
msgstr "rekursiver Alias: %s"
-#: git.c:459
+#: git.c:468
msgid "write failure on standard output"
msgstr "Fehler beim Schreiben in die Standard-Ausgabe."
-#: git.c:461
+#: git.c:470
msgid "unknown write failure on standard output"
msgstr "Unbekannter Fehler beim Schreiben in die Standard-Ausgabe."
-#: git.c:463
+#: git.c:472
msgid "close failed on standard output"
msgstr "Fehler beim Schließen der Standard-Ausgabe."
-#: git.c:793
+#: git.c:823
#, 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:873
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "Kann %s nicht als eingebauten Befehl behandeln."
-#: git.c:856
+#: git.c:886
#, c-format
msgid ""
"usage: %s\n"
@@ -22691,56 +24130,56 @@
"Verwendung: %s\n"
"\n"
-#: git.c:876
+#: git.c:906
#, 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"
+msgstr "Erweiterung von Alias '%s' fehlgeschlagen; '%s' ist kein Git-Befehl\n"
-#: git.c:888
+#: git.c:918
#, 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:1086
+#: 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:1093
+#: 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:1097
+#: 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:1966
+#: http.c:2025
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -22751,122 +24190,153 @@
" gefragt nach: %s\n"
" umgeleitet: %s"
-#: remote-curl.c:166
+#: remote-curl.c:183
#, c-format
msgid "invalid quoting in push-option value: '%s'"
msgstr "Ungültiges Quoting beim \"push-option\"-Wert: '%s'"
-#: remote-curl.c:263
+#: remote-curl.c:307
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "%sinfo/refs nicht gültig: Ist das ein Git-Repository?"
-#: remote-curl.c:364
+#: remote-curl.c:408
msgid "invalid server response; expected service, got flush packet"
-msgstr "Ungültige Antwort des Servers. Service erwartet, Flush-Paket bekommen"
+msgstr "ungültige Antwort des Servers; Service erwartet, Flush-Paket bekommen"
-#: remote-curl.c:395
+#: remote-curl.c:439
#, c-format
msgid "invalid server response; got '%s'"
-msgstr "Ungültige Serverantwort; '%s' bekommen"
+msgstr "ungültige Serverantwort; '%s' bekommen"
-#: remote-curl.c:455
+#: remote-curl.c:499
#, c-format
msgid "repository '%s' not found"
-msgstr "Repository '%s' nicht gefunden."
+msgstr "Repository '%s' nicht gefunden"
-#: remote-curl.c:459
+#: remote-curl.c:503
#, c-format
msgid "Authentication failed for '%s'"
msgstr "Authentifizierung fehlgeschlagen für '%s'"
-#: remote-curl.c:463
+#: remote-curl.c:507
#, c-format
msgid "unable to access '%s': %s"
msgstr "konnte nicht auf '%s' zugreifen: %s"
-#: remote-curl.c:469
+#: remote-curl.c:513
#, c-format
msgid "redirecting to %s"
-msgstr "Leite nach %s um"
+msgstr "Umleitung nach %s"
-#: remote-curl.c:593
+#: remote-curl.c:642
msgid "shouldn't have EOF when not gentle on EOF"
msgstr "sollte kein EOF haben, wenn nicht behutsam mit EOF"
-#: remote-curl.c:673
+#: remote-curl.c:654
+msgid "remote server sent stateless separator"
+msgstr "Server sendete zustandslosen Separator"
+
+#: remote-curl.c:724
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:733
+#: remote-curl.c:754
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr "remote-curl: ungültiges Zeichen für Zeilenlänge: %.4s"
+
+#: remote-curl.c:756
+msgid "remote-curl: unexpected response end packet"
+msgstr "remote-curl: unerwartetes Antwort-Endpaket"
+
+#: remote-curl.c:832
#, c-format
msgid "RPC failed; %s"
msgstr "RPC fehlgeschlagen; %s"
-#: remote-curl.c:773
+#: remote-curl.c:872
msgid "cannot handle pushes this big"
msgstr "Kann solche großen Übertragungen nicht verarbeiten."
-#: remote-curl.c:888
+#: remote-curl.c:987
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr "Kann Request nicht komprimieren; \"zlib deflate\"-Fehler %d"
-#: remote-curl.c:892
+#: remote-curl.c:991
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr "Kann Request nicht komprimieren; \"zlib end\"-Fehler %d"
-#: remote-curl.c:1023
+#: remote-curl.c:1041
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr "%d Bytes des Längen-Headers wurden empfangen"
+
+#: remote-curl.c:1043
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr "%d Bytes des Bodys werden noch erwartet"
+
+#: remote-curl.c:1132
msgid "dumb http transport does not support shallow capabilities"
msgstr "Dumb HTTP-Transport unterstützt keine shallow-Funktionen"
-#: remote-curl.c:1038
+#: remote-curl.c:1147
msgid "fetch failed."
msgstr "\"fetch\" fehlgeschlagen."
-#: remote-curl.c:1086
+#: remote-curl.c:1193
msgid "cannot fetch by sha1 over smart http"
msgstr "Kann SHA-1 nicht über Smart-HTTP anfordern"
-#: remote-curl.c:1130 remote-curl.c:1136
+#: remote-curl.c:1237 remote-curl.c:1243
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "Protokollfehler: SHA-1/Referenz erwartet, '%s' bekommen"
-#: remote-curl.c:1148 remote-curl.c:1263
+#: remote-curl.c:1255 remote-curl.c:1373
#, c-format
msgid "http transport does not support %s"
msgstr "HTTP-Transport unterstützt nicht %s"
-#: remote-curl.c:1184
+#: remote-curl.c:1291
msgid "git-http-push failed"
msgstr "\"git-http-push\" fehlgeschlagen"
-#: remote-curl.c:1369
+#: remote-curl.c:1479
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl: Verwendung: git remote-curl <Remote-Repository> [<URL>]"
-#: remote-curl.c:1401
+#: remote-curl.c:1511
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl: Fehler beim Lesen des Kommando-Streams von Git"
-#: remote-curl.c:1408
+#: remote-curl.c:1518
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl: \"fetch\" ohne lokales Repository versucht"
-#: remote-curl.c:1448
+#: remote-curl.c:1559
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl: Unbekannter Befehl '%s' von Git"
-#: list-objects-filter-options.h:85
+#: 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:86
+#: list-objects-filter-options.h:92
msgid "object filtering"
msgstr "Filtern nach Objekten"
@@ -22887,8 +24357,8 @@
msgstr "weniger Ausgaben"
#: parse-options.h:317
-msgid "use <n> digits to display SHA-1s"
-msgstr "benutze <n> Ziffern zur Anzeige von SHA-1s"
+msgid "use <n> digits to display object names"
+msgstr "benutze <Anzahl> Ziffern zur Anzeige von Objektnamen"
#: parse-options.h:336
msgid "how to strip spaces and #comments from message"
@@ -22905,11 +24375,11 @@
msgstr ""
"Mit der Option --pathspec-from-file sind Pfade durch NUL-Zeichen getrennt"
-#: ref-filter.h:101
+#: ref-filter.h:99
msgid "key"
msgstr "Schüssel"
-#: ref-filter.h:101
+#: ref-filter.h:99
msgid "field name to sort on"
msgstr "sortiere nach diesem Feld"
@@ -22918,14 +24388,6 @@
msgstr ""
"Index, wenn möglich, mit wiederverwendeter Konfliktauflösung aktualisieren"
-#: wt-status.h:67
-msgid "HEAD detached at "
-msgstr "HEAD losgelöst bei "
-
-#: wt-status.h:68
-msgid "HEAD detached from "
-msgstr "HEAD losgelöst von "
-
#: command-list.h:50
msgid "Add file contents to the index"
msgstr "Dateiinhalte zum Commit vormerken"
@@ -22967,704 +24429,684 @@
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 "Run a Git command on a list of repositories"
+msgstr "Einen Git-Befehl für mehrere Repositories ausführen"
+
+#: command-list.h:100
msgid "Prepare patches for e-mail submission"
msgstr "Patches für E-Mail-Versand vorbereiten"
-#: command-list.h:99
+#: command-list.h:101
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:102
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:103
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:104
msgid "Print lines matching a pattern"
msgstr "Zeilen darstellen, die einem Muster entsprechen"
-#: command-list.h:103
+#: command-list.h:105
msgid "A portable graphical interface to Git"
msgstr "eine portable grafische Schnittstelle zu Git"
-#: command-list.h:104
+#: command-list.h:106
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:107
msgid "Display help information about Git"
msgstr "Hilfsinformationen über Git anzeigen"
-#: command-list.h:106
+#: command-list.h:108
msgid "Server side implementation of Git over HTTP"
msgstr "serverseitige Implementierung von Git über HTTP"
-#: command-list.h:107
+#: command-list.h:109
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:110
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:111
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:112
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:113
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:114
msgid "Instantly browse your working repository in gitweb"
msgstr "Ihr aktuelles Repository sofort in gitweb betrachten"
-#: command-list.h:113
+#: command-list.h:115
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:116
msgid "The Git repository browser"
msgstr "der Git-Repository-Browser"
-#: command-list.h:115
+#: command-list.h:117
msgid "Show commit logs"
msgstr "Commit-Historie anzeigen"
-#: command-list.h:116
+#: command-list.h:118
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:119
msgid "List references in a remote repository"
msgstr "Referenzen in einem Remote-Repository auflisten"
-#: command-list.h:118
+#: command-list.h:120
msgid "List the contents of a tree object"
msgstr "Inhalte eines Tree-Objektes auflisten"
-#: command-list.h:119
+#: command-list.h:121
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:122
msgid "Simple UNIX mbox splitter program"
msgstr "einfaches UNIX mbox Splitter-Programm"
-#: command-list.h:121
+#: command-list.h:123
+msgid "Run tasks to optimize Git repository data"
+msgstr "Aufgaben ausführen, um Git-Repository-Daten zu optimieren"
+
+#: command-list.h:124
msgid "Join two or more development histories together"
msgstr "zwei oder mehr Entwicklungszweige zusammenführen"
-#: command-list.h:122
+#: command-list.h:125
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:126
msgid "Run a three-way file merge"
msgstr "einen 3-Wege-Datei-Merge ausführen"
-#: command-list.h:124
+#: command-list.h:127
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:128
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:129
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:130
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:131
msgid "Write and verify multi-pack-indexes"
msgstr "multi-pack-indexes schreiben und überprüfen"
-#: command-list.h:129
-msgid "Creates a tag object"
-msgstr "ein Tag-Objekt erstellen"
+#: command-list.h:132
+msgid "Creates a tag object with extra validation"
+msgstr "Erstellt ein Tag-Objekt mit zusätzlicher Validierung"
-#: command-list.h:130
+#: command-list.h:133
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:134
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:135
msgid "Find symbolic names for given revs"
msgstr "symbolische Namen für die gegebenen Commits finden"
-#: command-list.h:133
+#: command-list.h:136
msgid "Add or inspect object notes"
msgstr "Objekt-Notizen hinzufügen oder überprüfen"
-#: command-list.h:134
+#: command-list.h:137
msgid "Import from and submit to Perforce repositories"
msgstr "von Perforce Repositories importieren und nach diese senden"
-#: command-list.h:135
+#: command-list.h:138
msgid "Create a packed archive of objects"
msgstr "ein gepacktes Archiv von Objekten erstellen"
-#: command-list.h:136
+#: command-list.h:139
msgid "Find redundant pack files"
msgstr "redundante Paketdateien finden"
-#: command-list.h:137
+#: command-list.h:140
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
-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:172
+#: command-list.h:174
msgid "Stash the changes in a dirty working directory away"
msgstr "Änderungen in einem Arbeitsverzeichnis aufbewahren"
-#: command-list.h:173
+#: command-list.h:175
msgid "Add file contents to the staging area"
msgstr "Dateiinhalte der Staging-Area hinzufügen"
-#: command-list.h:174
+#: command-list.h:176
msgid "Show the working tree status"
msgstr "den Zustand des Arbeitsverzeichnisses anzeigen"
-#: command-list.h:175
+#: command-list.h:177
msgid "Remove unnecessary whitespace"
msgstr "nicht erforderlichen Whitespace entfernen"
-#: command-list.h:176
+#: command-list.h:178
msgid "Initialize, update or inspect submodules"
msgstr "Submodule initialisieren, aktualisieren oder inspizieren"
-#: command-list.h:177
+#: 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:178
+#: command-list.h:180
msgid "Switch branches"
msgstr "Branches wechseln"
-#: command-list.h:179
+#: command-list.h:181
msgid "Read, modify and delete symbolic refs"
msgstr "symbolische Referenzen lesen, ändern und löschen"
-#: command-list.h:180
+#: 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:181
+#: 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:182
+#: command-list.h:184
msgid "Unpack objects from a packed archive"
msgstr "Objekte von einem gepackten Archiv entpacken"
-#: command-list.h:183
+#: 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:184
+#: 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:185
+#: command-list.h:187
msgid "Update auxiliary info file to help dumb servers"
msgstr "Hilfsinformationsdatei zur Hilfe von einfachen Servern aktualisieren"
-#: command-list.h:186
+#: command-list.h:188
msgid "Send archive back to git-archive"
msgstr "Archiv zurück zu git-archive senden"
-#: command-list.h:187
+#: 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:188
+#: command-list.h:190
msgid "Show a Git logical variable"
msgstr "eine logische Variable von Git anzeigen"
-#: command-list.h:189
+#: command-list.h:191
msgid "Check the GPG signature of commits"
msgstr "die GPG-Signatur von Commits prüfen"
-#: command-list.h:190
+#: command-list.h:192
msgid "Validate packed Git archive files"
msgstr "gepackte Git-Archivdateien validieren"
-#: command-list.h:191
+#: command-list.h:193
msgid "Check the GPG signature of tags"
msgstr "die GPG-Signatur von Tags prüfen"
-#: command-list.h:192
+#: 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:193
+#: 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:194
+#: command-list.h:196
msgid "Manage multiple working trees"
msgstr "mehrere Arbeitsverzeichnisse verwalten"
-#: command-list.h:195
+#: command-list.h:197
msgid "Create a tree object from the current index"
msgstr "Tree-Objekt vom aktuellen Index erstellen"
-#: command-list.h:196
+#: command-list.h:198
msgid "Defining attributes per path"
msgstr "Definition von Attributen pro Pfad"
-#: command-list.h:197
+#: command-list.h:199
msgid "Git command-line interface and conventions"
msgstr "Git Kommandozeilenschnittstelle und Konventionen"
-#: command-list.h:198
+#: command-list.h:200
msgid "A Git core tutorial for developers"
msgstr "eine Git Anleitung für Entwickler"
-#: command-list.h:199
+#: 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:200
+#: command-list.h:203
msgid "Tweaking diff output"
msgstr "Diff-Ausgabe optimieren"
-#: command-list.h:201
+#: 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:202
+#: 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:203
+#: command-list.h:207
msgid "Hooks used by Git"
msgstr "von Git verwendete Hooks"
-#: command-list.h:204
+#: command-list.h:208
msgid "Specifies intentionally untracked files to ignore"
msgstr "Spezifikation von bewusst ignorierten, unversionierten Dateien"
-#: command-list.h:205
+#: command-list.h:209
+msgid "Map author/committer names and/or E-Mail addresses"
+msgstr "Autor/Commit-Ersteller und/oder E-Mail-Adressen zuordnen"
+
+#: command-list.h:210
msgid "Defining submodule properties"
msgstr "Definition von Submodul-Eigenschaften"
-#: command-list.h:206
+#: command-list.h:211
msgid "Git namespaces"
msgstr "Git Namensbereiche"
-#: command-list.h:207
+#: command-list.h:212
+msgid "Helper programs to interact with remote repositories"
+msgstr "Hilfsprogramme zur Interaktion mit Remote-Repositories"
+
+#: command-list.h:213
msgid "Git Repository Layout"
msgstr "Git Repository Aufbau"
-#: command-list.h:208
+#: command-list.h:214
msgid "Specifying revisions and ranges for Git"
msgstr "Spezifikation von Commits und Bereichen für Git"
-#: command-list.h:209
+#: command-list.h:215
msgid "Mounting one repository inside another"
msgstr "Einbinden eines Repositories in ein anderes"
-#: command-list.h:210
+#: command-list.h:216
msgid "A tutorial introduction to Git: part two"
msgstr "eine einführende Anleitung zu Git: Teil zwei"
-#: command-list.h:211
+#: command-list.h:217
msgid "A tutorial introduction to Git"
msgstr "eine einführende Anleitung zu Git"
-#: command-list.h:212
+#: command-list.h:218
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
-#, sh-format
-msgid "Bad rev input: $arg"
-msgstr "Ungültige Referenz-Eingabe: $arg"
-
-#: git-bisect.sh:121
-#, sh-format
-msgid "Bad rev input: $bisected_head"
-msgstr "Ungültige Referenz-Eingabe: $bisected_head"
-
-#: git-bisect.sh:130
-#, sh-format
-msgid "Bad rev input: $rev"
-msgstr "Ungültige Referenz-Eingabe: $rev"
-
-#: git-bisect.sh:139
-#, 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
-msgid "No logfile given"
-msgstr "Keine Log-Datei gegeben"
-
-#: git-bisect.sh:210
-#, sh-format
-msgid "cannot read $file for replaying"
-msgstr "kann $file nicht für das Abspielen lesen"
-
-#: git-bisect.sh:232
-msgid "?? what are you talking about?"
-msgstr "?? Was reden Sie da?"
-
-#: git-bisect.sh:241
+#: git-bisect.sh:68
msgid "bisect run failed: no command provided."
msgstr "'bisect run' fehlgeschlagen: kein Befehl angegeben."
-#: git-bisect.sh:246
+#: git-bisect.sh:73
#, sh-format
msgid "running $command"
msgstr "führe $command aus"
-#: git-bisect.sh:253
+#: git-bisect.sh:80
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -23673,27 +25115,23 @@
"'bisect run' fehlgeschlagen:\n"
"Exit-Code $res von '$command' ist < 0 oder >= 128"
-#: git-bisect.sh:279
+#: git-bisect.sh:105
msgid "bisect run cannot continue any more"
msgstr "'bisect run' kann nicht mehr fortgesetzt werden"
-#: git-bisect.sh:285
+#: git-bisect.sh:111
#, sh-format
msgid ""
"bisect run failed:\n"
-"'bisect_state $state' exited with error code $res"
+"'bisect-state $state' exited with error code $res"
msgstr ""
"'bisect run' fehlgeschlagen:\n"
-"'bisect_state $state' wurde mit Fehlerwert $res beendet"
+"'bisect-state $state' wurde mit Fehlerwert $res beendet"
-#: git-bisect.sh:292
+#: git-bisect.sh:118
msgid "bisect run success"
msgstr "'bisect run' erfolgreich ausgeführt"
-#: git-bisect.sh:300
-msgid "We are not bisecting."
-msgstr "keine binäre Suche im Gange"
-
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
@@ -23709,7 +25147,7 @@
#: 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
@@ -23735,133 +25173,50 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "Einfacher Merge hat nicht funktioniert, versuche automatischen Merge."
-#: git-legacy-stash.sh:221
-msgid "Cannot remove temporary index (can't happen)"
-msgstr "Kann temporären Index nicht löschen (kann nicht passieren)"
-
-#: git-legacy-stash.sh:272
-#, sh-format
-msgid "Cannot update $ref_stash with $w_commit"
-msgstr "Kann $ref_stash nicht mit $w_commit aktualisieren."
-
-#: git-legacy-stash.sh:324
-#, sh-format
-msgid "error: unknown option for 'stash push': $option"
-msgstr "Fehler: unbekannte Option für 'stash push': $option"
-
-#: git-legacy-stash.sh:356
-#, sh-format
-msgid "Saved working directory and index state $stash_msg"
-msgstr "Speicherte Arbeitsverzeichnis und Index-Status $stash_msg"
-
-#: git-legacy-stash.sh:536
-#, sh-format
-msgid "unknown option: $opt"
-msgstr "unbekannte Option: $opt"
-
-#: git-legacy-stash.sh:556
-#, sh-format
-msgid "Too many revisions specified: $REV"
-msgstr "Zu viele Commits angegeben: $REV"
-
-#: git-legacy-stash.sh:571
-#, sh-format
-msgid "$reference is not a valid reference"
-msgstr "$reference ist keine gültige Referenz"
-
-#: git-legacy-stash.sh:599
-#, sh-format
-msgid "'$args' is not a stash-like commit"
-msgstr "'$args' ist kein \"stash\"-artiger Commit"
-
-#: git-legacy-stash.sh:610
-#, sh-format
-msgid "'$args' is not a stash reference"
-msgstr "'$args' ist keine \"stash\"-Referenz"
-
-#: git-legacy-stash.sh:618
-msgid "unable to refresh index"
-msgstr "Konnte den Index nicht aktualisieren."
-
-#: git-legacy-stash.sh:622
-msgid "Cannot apply a stash in the middle of a merge"
-msgstr "Kann \"stash\" nicht anwenden, solange ein Merge im Gange ist"
-
-#: git-legacy-stash.sh:630
-msgid "Conflicts in index. Try without --index."
-msgstr "Konflikte im Index. Versuchen Sie es ohne --index."
-
-#: git-legacy-stash.sh:632
-msgid "Could not save index tree"
-msgstr "Konnte Index-Verzeichnis nicht speichern"
-
-#: git-legacy-stash.sh:641
-msgid "Could not restore untracked files from stash entry"
-msgstr ""
-"Konnte unversionierte Dateien vom Stash-Eintrag nicht wiederherstellen."
-
-#: git-legacy-stash.sh:666
-msgid "Cannot unstage modified files"
-msgstr "Kann geänderte Dateien nicht aus dem Index entfernen"
-
-#: git-legacy-stash.sh:704
-#, sh-format
-msgid "Dropped ${REV} ($s)"
-msgstr "${REV} ($s) gelöscht"
-
-#: git-legacy-stash.sh:705
-#, sh-format
-msgid "${REV}: Could not drop stash entry"
-msgstr "${REV}: Konnte \"stash\"-Eintrag nicht löschen"
-
-#: git-legacy-stash.sh:792
-msgid "(To restore them type \"git stash apply\")"
-msgstr "(Zur Wiederherstellung geben Sie \"git stash apply\" ein)"
-
-#: git-submodule.sh:203
+#: git-submodule.sh:179
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"Relative Pfade können nur von der obersten Ebene des Arbeitsverzeichnisses "
"benutzt werden."
-#: git-submodule.sh:213
+#: git-submodule.sh:189
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "repo URL: '$repo' muss absolut sein oder mit ./|../ beginnen"
-#: git-submodule.sh:232
+#: git-submodule.sh:208
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' ist bereits zum Commit vorgemerkt"
-#: git-submodule.sh:235
+#: git-submodule.sh:211
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr "'$sm_path' ist bereits zum Commit vorgemerkt und ist kein Submodul"
-#: git-submodule.sh:242
+#: git-submodule.sh:218
#, sh-format
msgid "'$sm_path' does not have a commit checked out"
msgstr "'$sm_path' hat keinen Commit ausgecheckt"
-#: git-submodule.sh:273
+#: git-submodule.sh:249
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Füge existierendes Repository in '$sm_path' dem Index hinzu."
-#: git-submodule.sh:275
+#: git-submodule.sh:251
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' existiert bereits und ist kein gültiges Git-Repository"
-#: git-submodule.sh:283
+#: git-submodule.sh:259
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
"Ein Git-Verzeichnis für '$sm_name' wurde lokal gefunden mit den Remote-"
"Repositories:"
-#: git-submodule.sh:285
+#: git-submodule.sh:261
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -23879,37 +25234,37 @@
"nicht das korrekte Repository ist oder Sie unsicher sind, was das bedeutet,\n"
"wählen Sie einen anderen Namen mit der Option '--name'."
-#: git-submodule.sh:291
+#: git-submodule.sh:267
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "Reaktiviere lokales Git-Verzeichnis für Submodul '$sm_name'."
-#: git-submodule.sh:303
+#: git-submodule.sh:279
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Kann Submodul '$sm_path' nicht auschecken"
-#: git-submodule.sh:308
+#: git-submodule.sh:284
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Hinzufügen von Submodul '$sm_path' fehlgeschlagen"
-#: git-submodule.sh:317
+#: git-submodule.sh:293
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Fehler beim Eintragen von Submodul '$sm_path' in die Konfiguration."
-#: git-submodule.sh:590
+#: git-submodule.sh:568
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "Konnte aktuellen Commit in Submodul-Pfad '$displaypath' nicht finden."
-#: git-submodule.sh:600
+#: git-submodule.sh:578
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Konnte \"fetch\" in Submodul-Pfad '$sm_path' nicht ausführen"
-#: git-submodule.sh:605
+#: git-submodule.sh:583
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -23918,7 +25273,7 @@
"Konnte aktuellen Commit von ${remote_name}/${branch} in Submodul-Pfad\n"
"'$sm_path' nicht finden."
-#: git-submodule.sh:623
+#: git-submodule.sh:601
#, sh-format
msgid ""
"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
@@ -23927,7 +25282,7 @@
"Konnte \"fetch\" in Submodul-Pfad '$displaypath' nicht ausführen. Versuche "
"$sha1 direkt anzufordern:"
-#: git-submodule.sh:629
+#: git-submodule.sh:607
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -23936,84 +25291,53 @@
"\"fetch\" in Submodul-Pfad '$displaypath' ausgeführt, aber $sha1 nicht\n"
"enthalten. Direktes Anfordern dieses Commits ist fehlgeschlagen."
-#: git-submodule.sh:636
+#: git-submodule.sh:614
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "Konnte '$sha1' in Submodul-Pfad '$displaypath' nicht auschecken."
-#: git-submodule.sh:637
+#: git-submodule.sh:615
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Submodul-Pfad: '$displaypath': '$sha1' ausgecheckt"
-#: git-submodule.sh:641
+#: git-submodule.sh:619
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "Rebase auf '$sha1' in Submodul-Pfad '$displaypath' nicht möglich"
-#: git-submodule.sh:642
+#: git-submodule.sh:620
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Submodul-Pfad '$displaypath': Rebase auf '$sha1'"
-#: git-submodule.sh:647
+#: git-submodule.sh:625
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "Merge von '$sha1' in Submodul-Pfad '$displaypath' fehlgeschlagen"
-#: git-submodule.sh:648
+#: git-submodule.sh:626
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Submodul-Pfad '$displaypath': zusammengeführt in '$sha1'"
-#: git-submodule.sh:653
+#: git-submodule.sh:631
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"Ausführung von '$command $sha1' in Submodul-Pfad '$displaypath' "
"fehlgeschlagen"
-#: git-submodule.sh:654
+#: git-submodule.sh:632
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Submodul-Pfad '$displaypath': '$command $sha1'"
-#: git-submodule.sh:685
+#: git-submodule.sh:663
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Fehler bei Rekursion in Submodul-Pfad '$displaypath'"
-#: git-submodule.sh:896
-msgid "The --cached option cannot be used with the --files option"
-msgstr ""
-"Die Optionen --cached und --files können nicht gemeinsam verwendet werden."
-
-#: git-submodule.sh:948
-#, sh-format
-msgid "unexpected mode $mod_dst"
-msgstr "unerwarteter Modus $mod_dst"
-
-#: git-submodule.sh:968
-#, sh-format
-msgid " Warn: $display_name doesn't contain commit $sha1_src"
-msgstr " Warnung: $display_name beinhaltet nicht Commit $sha1_src"
-
-#: git-submodule.sh:971
-#, sh-format
-msgid " Warn: $display_name doesn't contain commit $sha1_dst"
-msgstr " Warnung: $display_name beinhaltet nicht Commit $sha1_dst"
-
-#: git-submodule.sh:974
-#, 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."
-msgstr "Siehe git-${cmd}(1) für weitere Details."
-
#: git-rebase--preserve-merges.sh:109
msgid "Applied autostash."
msgstr "Automatischen Stash angewendet."
@@ -24023,12 +25347,22 @@
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"
@@ -24070,7 +25404,7 @@
"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"
@@ -24089,83 +25423,83 @@
"\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"
@@ -24182,31 +25516,31 @@
"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"
@@ -24219,7 +25553,7 @@
"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"
@@ -24235,25 +25569,25 @@
"\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"
@@ -24285,13 +25619,13 @@
"\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."
@@ -24301,44 +25635,44 @@
"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:955
+#: git-rebase--preserve-merges.sh:945
msgid "Note that empty commits are commented out"
msgstr "Leere Commits sind auskommentiert."
-#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
+#: 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."
@@ -24425,14 +25759,14 @@
msgid "%12s %12s %s"
msgstr "%28s %25s %s"
-#: git-add--interactive.perl:634
+#: git-add--interactive.perl:632
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] "%d Pfad angefasst\n"
msgstr[1] "%d Pfade angefasst\n"
-#: git-add--interactive.perl:1053
+#: git-add--interactive.perl:1056
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
@@ -24440,7 +25774,7 @@
"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:1056
+#: git-add--interactive.perl:1059
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
@@ -24448,7 +25782,7 @@
"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n"
"Patch-Block direkt zum Hinzufügen zum Stash markiert."
-#: git-add--interactive.perl:1059
+#: git-add--interactive.perl:1062
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
@@ -24456,8 +25790,8 @@
"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:1062 git-add--interactive.perl:1071
-#: git-add--interactive.perl:1077
+#: git-add--interactive.perl:1065 git-add--interactive.perl:1074
+#: git-add--interactive.perl:1080
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
@@ -24465,8 +25799,8 @@
"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n"
"Patch-Block direkt zum Anwenden markiert."
-#: git-add--interactive.perl:1065 git-add--interactive.perl:1068
-#: git-add--interactive.perl:1074
+#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
+#: git-add--interactive.perl:1077
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
@@ -24474,13 +25808,13 @@
"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n"
"Patch-Block direkt zum Verwerfen markiert."
-#: git-add--interactive.perl:1111
+#: git-add--interactive.perl:1114
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr ""
"Fehler beim Öffnen von Editier-Datei eines Patch-Blocks zum Schreiben: %s"
-#: git-add--interactive.perl:1118
+#: git-add--interactive.perl:1121
#, perl-format
msgid ""
"---\n"
@@ -24493,12 +25827,12 @@
"Um '%s' Zeilen zu entfernen, löschen Sie diese.\n"
"Zeilen, die mit %s beginnen, werden entfernt.\n"
-#: git-add--interactive.perl:1140
+#: git-add--interactive.perl:1143
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr "Fehler beim Öffnen von Editier-Datei eines Patch-Blocks zum Lesen: %s"
-#: git-add--interactive.perl:1248
+#: git-add--interactive.perl:1251
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -24514,7 +25848,7 @@
"d - diesen oder alle weiteren Patch-Blöcke in dieser Datei nicht zum Commit "
"vormerken"
-#: git-add--interactive.perl:1254
+#: git-add--interactive.perl:1257
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -24528,7 +25862,7 @@
"a - diesen und alle weiteren Patch-Blöcke dieser Datei stashen\n"
"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht stashen"
-#: git-add--interactive.perl:1260
+#: git-add--interactive.perl:1263
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -24542,7 +25876,7 @@
"a - diesen und alle weiteren Patch-Blöcke dieser Datei unstashen\n"
"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht unstashen"
-#: git-add--interactive.perl:1266
+#: git-add--interactive.perl:1269
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -24559,7 +25893,7 @@
"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht auf den Index "
"anwenden"
-#: git-add--interactive.perl:1272 git-add--interactive.perl:1290
+#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -24576,7 +25910,7 @@
"d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht im "
"Arbeitsverzeichnis verwerfen"
-#: git-add--interactive.perl:1278
+#: git-add--interactive.perl:1281
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -24591,7 +25925,7 @@
"a - diesen und alle weiteren Patch-Blöcke in der Datei verwerfen\n"
"d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht verwerfen"
-#: git-add--interactive.perl:1284
+#: git-add--interactive.perl:1287
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -24605,7 +25939,7 @@
"a - diesen und alle weiteren Patch-Blöcke in der Datei anwenden\n"
"d - diesen oder alle weiteren Patch-Blöcke in der Datei nicht anwenden"
-#: git-add--interactive.perl:1296
+#: git-add--interactive.perl:1299
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -24619,7 +25953,7 @@
"a - diesen und alle weiteren Patch-Blöcke in der Datei anwenden\n"
"d - diesen und alle weiteren Patch-Blöcke in der Datei nicht anwenden"
-#: git-add--interactive.perl:1311
+#: git-add--interactive.perl:1314
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -24643,87 +25977,92 @@
"e - aktuellen Patch-Block manuell editieren\n"
"? - Hilfe anzeigen\n"
-#: git-add--interactive.perl:1342
+#: git-add--interactive.perl:1345
msgid "The selected hunks do not apply to the index!\n"
msgstr ""
"Die ausgewählten Patch-Blöcke können nicht auf den Index angewendet werden!\n"
-#: git-add--interactive.perl:1357
+#: git-add--interactive.perl:1360
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "ignoriere nicht zusammengeführte Datei: %s\n"
-#: git-add--interactive.perl:1468
+#: git-add--interactive.perl:1479
#, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr "Modusänderung auf Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1469
+#: git-add--interactive.perl:1480
#, perl-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
msgstr "Löschung auf Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1470
+#: git-add--interactive.perl:1481
+#, 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:1482
#, perl-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Diesen Patch-Block auf das Arbeitsverzeichnis anwenden [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1570
+#: git-add--interactive.perl:1599
msgid "No other hunks to goto\n"
msgstr "Keine anderen Patch-Blöcke verbleibend\n"
-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1617
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Ungültige Nummer: '%s'\n"
-#: git-add--interactive.perl:1593
+#: git-add--interactive.perl:1622
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "Entschuldigung, nur %d Patch-Block verfügbar.\n"
msgstr[1] "Entschuldigung, nur %d Patch-Blöcke verfügbar.\n"
-#: git-add--interactive.perl:1619
+#: git-add--interactive.perl:1657
msgid "No other hunks to search\n"
msgstr "Keine anderen Patch-Blöcke zum Durchsuchen\n"
-#: git-add--interactive.perl:1636
+#: git-add--interactive.perl:1674
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Fehlerhafter regulärer Ausdruck für Suche %s: %s\n"
-#: git-add--interactive.perl:1646
+#: git-add--interactive.perl:1684
msgid "No hunk matches the given pattern\n"
msgstr "Kein Patch-Block entspricht dem angegebenen Muster\n"
-#: git-add--interactive.perl:1658 git-add--interactive.perl:1680
+#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
msgid "No previous hunk\n"
msgstr "Kein vorheriger Patch-Block\n"
-#: git-add--interactive.perl:1667 git-add--interactive.perl:1686
+#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
msgid "No next hunk\n"
msgstr "Kein folgender Patch-Block\n"
-#: git-add--interactive.perl:1692
+#: git-add--interactive.perl:1730
msgid "Sorry, cannot split this hunk\n"
msgstr "Entschuldigung, kann diesen Patch-Block nicht aufteilen.\n"
-#: git-add--interactive.perl:1698
+#: git-add--interactive.perl:1736
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "In %d Patch-Block aufgeteilt.\n"
msgstr[1] "In %d Patch-Blöcke aufgeteilt.\n"
-#: git-add--interactive.perl:1708
+#: git-add--interactive.perl:1746
msgid "Sorry, cannot edit this hunk\n"
msgstr "Entschuldigung, kann diesen Patch-Block nicht bearbeiten.\n"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1773
+#: git-add--interactive.perl:1811
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
@@ -24742,19 +26081,19 @@
"diff - Unterschiede zwischen HEAD und Index anzeigen\n"
"add untracked - Inhalte von unversionierten Dateien zum Commit vormerken\n"
-#: git-add--interactive.perl:1790 git-add--interactive.perl:1795
-#: git-add--interactive.perl:1798 git-add--interactive.perl:1805
-#: git-add--interactive.perl:1808 git-add--interactive.perl:1815
-#: git-add--interactive.perl:1819 git-add--interactive.perl:1825
+#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
+#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
+#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
+#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
msgid "missing --"
msgstr "-- fehlt"
-#: git-add--interactive.perl:1821
+#: git-add--interactive.perl:1866
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "Unbekannter --patch Modus: %s"
-#: git-add--interactive.perl:1827 git-add--interactive.perl:1833
+#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "ungültiges Argument %s, erwarte --"
@@ -24772,28 +26111,40 @@
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"
@@ -24802,38 +26153,38 @@
"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"
@@ -24848,43 +26199,43 @@
"\n"
" * \"./%s\" angeben, wenn Sie eine Datei meinen, oder\n"
" * die Option --format-patch angeben, wenn Sie einen Commit-Bereich "
-"meinen\n"
+"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"
"warning: no patches were sent\n"
msgstr ""
"fatal: %s: %s\n"
-"Warnung: Es wurden keine Patches versendet.\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"
"\n"
msgstr ""
"\n"
-"keine Patch-Dateien angegeben!\n"
+"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"
@@ -24899,27 +26250,27 @@
"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"
@@ -24927,11 +26278,11 @@
"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"
@@ -24945,22 +26296,22 @@
"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"
@@ -24968,18 +26319,18 @@
#. 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"
@@ -25008,133 +26359,133 @@
#. 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]: "
diff --git a/po/es.po b/po/es.po
index 4a94ee9..dc895bf 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2020-03-11 15:26+0800\n"
-"PO-Revision-Date: 2020-03-11 23:18-0500\n"
+"POT-Creation-Date: 2021-03-04 22:41+0800\n"
+"PO-Revision-Date: 2021-03-07 18:29-0500\n"
"Last-Translator: christopher.diaz.riv@gmail.com\n"
"Language-Team: CodeLabora <codelabora@gmail.com>\n"
"Language: es\n"
@@ -16,235 +16,240 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.3\n"
+"X-Generator: Poedit 2.4.1\n"
-#: add-interactive.c:368
+#: add-interactive.c:376
#, c-format
msgid "Huh (%s)?"
msgstr "¿Ahh (%s)?"
-#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124
-#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687
-#: builtin/rebase.c:2086 builtin/rebase.c:2130
+#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292
+#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538
+#: builtin/rebase.c:1963
msgid "could not read index"
msgstr "no se pudo leer índice"
-#: add-interactive.c:576 git-add--interactive.perl:269
+#: add-interactive.c:584 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "binario"
-#: add-interactive.c:634 git-add--interactive.perl:278
+#: add-interactive.c:642 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "nada"
-#: add-interactive.c:635 git-add--interactive.perl:314
+#: add-interactive.c:643 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "sin cambios"
-#: add-interactive.c:672 git-add--interactive.perl:643
+#: add-interactive.c:680 git-add--interactive.perl:641
msgid "Update"
msgstr "Actualizar"
-#: add-interactive.c:689 add-interactive.c:877
+#: add-interactive.c:697 add-interactive.c:885
#, c-format
msgid "could not stage '%s'"
msgstr "no se pudo poner en stage '%s'"
-#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317
-#: builtin/rebase.c:899
+#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486
msgid "could not write index"
msgstr "no se pudo escribir índice"
-#: add-interactive.c:698 git-add--interactive.perl:628
+#: add-interactive.c:706 git-add--interactive.perl:626
#, 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
+#: add-interactive.c:724 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "nota: %s no es rastreado ahora.\n"
-#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281
-#: builtin/reset.c:144
+#: add-interactive.c:729 apply.c:4125 builtin/checkout.c:295
+#: 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
+#: add-interactive.c:759 git-add--interactive.perl:653
msgid "Revert"
msgstr "Revertir"
-#: add-interactive.c:767
+#: add-interactive.c:775
msgid "Could not parse HEAD^{tree}"
-msgstr "no se pudo analizar HEAD^{tree}"
+msgstr "No se pudo analizar HEAD^{tree}"
-#: add-interactive.c:805 git-add--interactive.perl:631
+#: add-interactive.c:813 git-add--interactive.perl:629
#, 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
+#: add-interactive.c:864 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr "No hay archivos sin rastrear.\n"
-#: add-interactive.c:860 git-add--interactive.perl:689
+#: add-interactive.c:868 git-add--interactive.perl:687
msgid "Add untracked"
msgstr "Agregar no rastreados"
-#: add-interactive.c:887 git-add--interactive.perl:625
+#: add-interactive.c:895 git-add--interactive.perl:623
#, 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
+#: add-interactive.c:925
#, c-format
msgid "ignoring unmerged: %s"
msgstr "ignorando lo no fusionado: %s"
-#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366
+#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369
#, c-format
msgid "Only binary files changed.\n"
msgstr "Solo cambiaron archivos binarios.\n"
-#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368
+#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371
#, c-format
msgid "No changes.\n"
msgstr "Sin cambios.\n"
-#: add-interactive.c:935 git-add--interactive.perl:1376
+#: add-interactive.c:943 git-add--interactive.perl:1379
msgid "Patch update"
msgstr "Actualización del parche"
-#: add-interactive.c:974 git-add--interactive.perl:1754
+#: add-interactive.c:982 git-add--interactive.perl:1792
msgid "Review diff"
msgstr "Revisión de diff"
-#: add-interactive.c:1002
+#: add-interactive.c:1010
msgid "show paths with changes"
msgstr "mostrar rutas con cambios"
-#: add-interactive.c:1004
+#: add-interactive.c:1012
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
+#: add-interactive.c:1014
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
+#: add-interactive.c:1016
msgid "pick hunks and update selectively"
msgstr "elegir hunks y actualizar de forma selectiva"
-#: add-interactive.c:1010
+#: add-interactive.c:1018
msgid "view diff between HEAD and index"
msgstr "ver diff entre HEAD e index"
-#: add-interactive.c:1012
+#: add-interactive.c:1020
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
+#: add-interactive.c:1028 add-interactive.c:1077
msgid "Prompt help:"
msgstr "Mostrar ayuda:"
-#: add-interactive.c:1022
+#: add-interactive.c:1030
msgid "select a single item"
msgstr "selecciona un único objeto"
-#: add-interactive.c:1024
+#: add-interactive.c:1032
msgid "select a range of items"
msgstr "selecciona un rango de objetos"
-#: add-interactive.c:1026
+#: add-interactive.c:1034
msgid "select multiple ranges"
msgstr "selecciona multiples rangos"
-#: add-interactive.c:1028 add-interactive.c:1073
+#: add-interactive.c:1036 add-interactive.c:1081
msgid "select item based on unique prefix"
msgstr "seleccionar objeto basado en prefijo único"
-#: add-interactive.c:1030
+#: add-interactive.c:1038
msgid "unselect specified items"
msgstr "quitar objetos especificados"
-#: add-interactive.c:1032
+#: add-interactive.c:1040
msgid "choose all items"
msgstr "escoger todos los objetos"
-#: add-interactive.c:1034
+#: add-interactive.c:1042
msgid "(empty) finish selecting"
msgstr "(vacío) finalizar selección"
-#: add-interactive.c:1071
+#: add-interactive.c:1079
msgid "select a numbered item"
msgstr "selecciona un objeto numerado"
-#: add-interactive.c:1075
+#: add-interactive.c:1083
msgid "(empty) select nothing"
msgstr "(vacío) selecciona nada"
-#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851
+#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
msgid "*** Commands ***"
msgstr "*** Comandos ***"
-#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848
+#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
msgid "What now"
msgstr "Ahora que"
-#: add-interactive.c:1136 git-add--interactive.perl:213
+#: add-interactive.c:1144 git-add--interactive.perl:213
msgid "staged"
msgstr "rastreado"
-#: add-interactive.c:1136 git-add--interactive.perl:213
+#: add-interactive.c:1144 git-add--interactive.perl:213
msgid "unstaged"
msgstr "no rastreado"
-#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251
-#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144
-#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409
-#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
-#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
-#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
+#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257
+#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124
+#: builtin/fetch.c:150 builtin/merge.c:285 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 "ruta"
-#: add-interactive.c:1143
+#: add-interactive.c:1151
msgid "could not refresh index"
msgstr "no se pudo refrescar el index"
-#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765
+#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803
#, c-format
msgid "Bye.\n"
msgstr "Adiós.\n"
-#: add-patch.c:33 git-add--interactive.perl:1428
+#: add-patch.c:34 git-add--interactive.perl:1431
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "¿Cambio de modo de stage [y,n,q,a,d%s,?]? "
-#: add-patch.c:34 git-add--interactive.perl:1429
+#: add-patch.c:35 git-add--interactive.perl:1432
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "¿Aplicar stage al borrado [y,n,q,a,d%s,?]? "
-#: add-patch.c:35 git-add--interactive.perl:1430
+#: add-patch.c:36 git-add--interactive.perl:1433
+#, 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:1434
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "¿Aplicar stage a este hunk [y,n,q,a,d%s,?]? "
-#: add-patch.c:37
+#: add-patch.c:39
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"staging."
@@ -252,7 +257,7 @@
"Si el parche aplica limpiamente, el hunk editado sera marcado inmediatamente "
"para el área de stage."
-#: add-patch.c:40
+#: add-patch.c:42
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -267,22 +272,27 @@
"d - no aplicar stage a este hunk o a ninguno de los posteriores en este "
"archivo\n"
-#: add-patch.c:54 git-add--interactive.perl:1433
+#: add-patch.c:56 git-add--interactive.perl:1437
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "¿Aplicar stash al cambio de modo [y,n,q,a,d%s,?]? "
-#: add-patch.c:55 git-add--interactive.perl:1434
+#: add-patch.c:57 git-add--interactive.perl:1438
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "¿Aplicar stash al borrado [y,n,q,a,d%s,?]? "
-#: add-patch.c:56 git-add--interactive.perl:1435
+#: add-patch.c:58 git-add--interactive.perl:1439
+#, 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:1440
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "¿Aplicar stash a este hunk [y,n,q,a,d%s,?]? "
-#: add-patch.c:58
+#: add-patch.c:61
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"stashing."
@@ -290,7 +300,7 @@
"Si el parche aplica limpiamente, el hunk editado sera marcado inmediatamente "
"para aplicar stash."
-#: add-patch.c:61
+#: add-patch.c:64
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -304,22 +314,27 @@
"a - aplicar stash a este hunk y a todos los posteriores en el archivo\n"
"d - no aplicar stash a este hunk o ninguno de los posteriores en el archivo\n"
-#: add-patch.c:77 git-add--interactive.perl:1438
+#: add-patch.c:80 git-add--interactive.perl:1443
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "¿Sacar cambio de modo del stage [y,n,q,a,d%s,?]? "
-#: add-patch.c:78 git-add--interactive.perl:1439
+#: add-patch.c:81 git-add--interactive.perl:1444
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "¿Sacar borrado del stage [y,n,q,a,d%s,?]? "
-#: add-patch.c:79 git-add--interactive.perl:1440
+#: add-patch.c:82 git-add--interactive.perl:1445
+#, 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:1446
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "¿Sacar este hunk del stage [y,n,q,a,d%s,?]? "
-#: add-patch.c:81
+#: add-patch.c:85
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"unstaging."
@@ -327,7 +342,7 @@
"Si el parche aplica limpiamente, el hunk editado sera marcado inmediatamente "
"para sacar del área de stage."
-#: add-patch.c:84
+#: add-patch.c:88
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -342,22 +357,27 @@
"d - no sacar del area de stage este hunk o ninguno de los posteriores en el "
"archivo\n"
-#: add-patch.c:99 git-add--interactive.perl:1443
+#: add-patch.c:103 git-add--interactive.perl:1449
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "¿Aplicar cambio de modo al índice [y,n,q,a,d%s,?]? "
-#: add-patch.c:100 git-add--interactive.perl:1444
+#: add-patch.c:104 git-add--interactive.perl:1450
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "¿Aplicar borrado al índice [y,n,q,a,d%s,?]? "
-#: add-patch.c:101 git-add--interactive.perl:1445
+#: add-patch.c:105 git-add--interactive.perl:1451
+#, 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:1452
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "¿Aplicar este hunk al índice [y,n,q,a,d%s,?]? "
-#: add-patch.c:103 add-patch.c:168 add-patch.c:211
+#: 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."
@@ -365,7 +385,7 @@
"Si el parche aplica de forma limpia, el hunk editado sera marcado "
"inmediatamente para aplicar."
-#: add-patch.c:106
+#: add-patch.c:111
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -379,25 +399,31 @@
"a - aplicar este hunk y todos los posteriores en el archivo\n"
"d - no aplicar este hunko ninguno de los posteriores en el archivo\n"
-#: add-patch.c:121 git-add--interactive.perl:1448
-#: git-add--interactive.perl:1463
+#: add-patch.c:126 git-add--interactive.perl:1455
+#: git-add--interactive.perl:1473
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "¿Descartar cambio de modo del árbol de trabajo [y,n,q,a,d%s,?]? "
-#: add-patch.c:122 git-add--interactive.perl:1449
-#: git-add--interactive.perl:1464
+#: add-patch.c:127 git-add--interactive.perl:1456
+#: git-add--interactive.perl:1474
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "¿Descartar borrado del árbol de trabajo [y,n,q,a,d%s,?]? "
-#: add-patch.c:123 git-add--interactive.perl:1450
-#: git-add--interactive.perl:1465
+#: add-patch.c:128 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
+#, 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:1458
+#: git-add--interactive.perl:1476
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "¿Descartar este hunk del árbol de trabajo [y,n,q,a,d%s,?]? "
-#: add-patch.c:125 add-patch.c:147 add-patch.c:190
+#: 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."
@@ -405,7 +431,7 @@
"Si el parche aplica de forma limpia, el hunk editado sera marcado "
"inmediatamente para descarte."
-#: add-patch.c:128 add-patch.c:193
+#: 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"
@@ -419,24 +445,29 @@
"a - descartar este hunk y todos los posteriores en este archivo\n"
"d - no descartar este hunk o ninguno de los posteriores en el archivo\n"
-#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"¿Descartar cambio de modo del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
-#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "¿Descartar borrado del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
-#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#, 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:1464
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"¿Descartar este hunk del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
-#: add-patch.c:150
+#: 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"
@@ -450,24 +481,29 @@
"a - descartar este hunk y todos los posteriores en este archivo\n"
"d - no descartar este hunk o ninguno posterior en el archivo\n"
-#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"¿Aplicar cambio de modo para el índice y el árbol de trabajo [y,n,q,a,d"
"%s,?]? "
-#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr "¿Aplicar borrado al índice y al árbol de trabajo [y,n,q,a,d%s,?]? "
-#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#, 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:1470
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr "¿Aplicar este hunk al índice y árbol de trabajo [y,n,q,a,d,/%s,?]? "
-#: add-patch.c:171
+#: 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"
@@ -481,7 +517,7 @@
"a - aplicar este hunk y todos los posteriores en el archivo\n"
"d - no aplicar este hunk o ninguno de los siguientes en este archivo\n"
-#: add-patch.c:214
+#: add-patch.c:224
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -495,34 +531,34 @@
"a - aplicar este hunk y todos los posteriores en el archivo\n"
"d - no aplicar este hunk o ninguno de los siguientes en este archivo\n"
-#: add-patch.c:318
+#: add-patch.c:342
#, c-format
msgid "could not parse hunk header '%.*s'"
msgstr "no se puede analizar hunk header '%.*s'"
-#: add-patch.c:337 add-patch.c:341
+#: add-patch.c:361 add-patch.c:365
#, c-format
msgid "could not parse colored hunk header '%.*s'"
msgstr "no se puede analizar hunk header '%.*s'"
-#: add-patch.c:395
+#: add-patch.c:419
msgid "could not parse diff"
msgstr "no se puede analizar diff"
-#: add-patch.c:414
+#: add-patch.c:438
msgid "could not parse colored diff"
msgstr "no se pudo analizar diff a colores"
-#: add-patch.c:428
+#: add-patch.c:452
#, c-format
msgid "failed to run '%s'"
msgstr "falló al ejecutar '%s'"
-#: add-patch.c:587
+#: add-patch.c:611
msgid "mismatched output from interactive.diffFilter"
msgstr "output de interactive.diffFilter no concuerda"
-#: add-patch.c:588
+#: add-patch.c:612
msgid ""
"Your filter must maintain a one-to-one correspondence\n"
"between its input and output lines."
@@ -530,7 +566,7 @@
"Tu filtro tiene que mantener correspondencia de uno a uno\n"
"entre las líneas de entrada y salida."
-#: add-patch.c:761
+#: add-patch.c:790
#, c-format
msgid ""
"expected context line #%d in\n"
@@ -539,7 +575,7 @@
"se esperaba línea de contexto #%d en\n"
"%.*s"
-#: add-patch.c:776
+#: add-patch.c:805
#, c-format
msgid ""
"hunks do not overlap:\n"
@@ -552,11 +588,11 @@
"\tno acaba con:\n"
"%.*s"
-#: add-patch.c:1052 git-add--interactive.perl:1112
+#: add-patch.c:1081 git-add--interactive.perl:1115
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "Modo de edición manual de hunk -- vea abajo para una guía rápida.\n"
-#: add-patch.c:1056
+#: add-patch.c:1085
#, c-format
msgid ""
"---\n"
@@ -570,7 +606,7 @@
"Lineas comenzando con %c serán eliminadas.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1070 git-add--interactive.perl:1126
+#: add-patch.c:1099 git-add--interactive.perl:1129
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"
@@ -580,11 +616,11 @@
"editar nuevamente. Si todas las líneas del hunk son eliminadas, entonces \n"
"la edición es abortada y el hunk queda sin cambios.\n"
-#: add-patch.c:1103
+#: add-patch.c:1132
msgid "could not parse hunk header"
msgstr "no se puede analizar hunk header"
-#: add-patch.c:1148
+#: add-patch.c:1177
msgid "'git apply --cached' failed"
msgstr "falló 'git apply --cached'"
@@ -600,26 +636,26 @@
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1218 git-add--interactive.perl:1239
+#: add-patch.c:1246 git-add--interactive.perl:1242
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
"Tu hunk editado no aplica. ¿Editar nuevamente (¡decir \"no\" descarta!) [y/"
"n]? "
-#: add-patch.c:1261
+#: add-patch.c:1289
msgid "The selected hunks do not apply to the index!"
msgstr "¡Los hunks seleccionados no aplican al índice!"
-#: add-patch.c:1262 git-add--interactive.perl:1343
+#: add-patch.c:1290 git-add--interactive.perl:1346
msgid "Apply them to the worktree anyway? "
msgstr "¿Aplicarlos al árbol de trabajo de todas maneras? "
-#: add-patch.c:1269 git-add--interactive.perl:1346
+#: add-patch.c:1297 git-add--interactive.perl:1349
msgid "Nothing was applied.\n"
msgstr "Nada fue aplicado.\n"
-#: add-patch.c:1326
+#: add-patch.c:1354
msgid ""
"j - leave this hunk undecided, see next undecided hunk\n"
"J - leave this hunk undecided, see next hunk\n"
@@ -641,104 +677,113 @@
"e - editar manualmente el hunk actual\n"
"? - imprimir ayuda\n"
-#: add-patch.c:1447 add-patch.c:1457
+#: add-patch.c:1516 add-patch.c:1526
msgid "No previous hunk"
msgstr "No el anterior hunk"
-#: add-patch.c:1452 add-patch.c:1462
+#: add-patch.c:1521 add-patch.c:1531
msgid "No next hunk"
msgstr "No el siguiente hunk"
-#: add-patch.c:1468
+#: add-patch.c:1537
msgid "No other hunks to goto"
msgstr "No hay más pedazos para el ir"
-#: add-patch.c:1479 git-add--interactive.perl:1577
+#: add-patch.c:1548 git-add--interactive.perl:1606
msgid "go to which hunk (<ret> to see more)? "
msgstr "¿a que hunk ir (<enter> para ver más)? "
-#: add-patch.c:1480 git-add--interactive.perl:1579
+#: add-patch.c:1549 git-add--interactive.perl:1608
msgid "go to which hunk? "
msgstr "¿a que hunk ir? "
-#: add-patch.c:1491
+#: add-patch.c:1560
#, c-format
msgid "Invalid number: '%s'"
msgstr "Numero inválido: '%s'"
-#: add-patch.c:1496
+#: add-patch.c:1565
#, c-format
msgid "Sorry, only %d hunk available."
msgid_plural "Sorry, only %d hunks available."
msgstr[0] "Lo siento, solo %d hunk disponible."
msgstr[1] "Lo siento, solo %d hunks disponibles."
-#: add-patch.c:1505
+#: add-patch.c:1574
msgid "No other hunks to search"
msgstr "No hay más pedazos para buscar"
-#: add-patch.c:1511 git-add--interactive.perl:1623
+#: add-patch.c:1580 git-add--interactive.perl:1661
msgid "search for regex? "
msgstr "¿buscar para regexp? "
-#: add-patch.c:1526
+#: add-patch.c:1595
#, c-format
msgid "Malformed search regexp %s: %s"
msgstr "Regexp para la búsqueda mal formado %s: %s"
-#: add-patch.c:1543
+#: add-patch.c:1612
msgid "No hunk matches the given pattern"
-msgstr "No hay hunks que concuerden con el patrón entregado."
+msgstr "No hay hunks que concuerden con el patrón entregado"
-#: add-patch.c:1550
+#: add-patch.c:1619
msgid "Sorry, cannot split this hunk"
msgstr "Perdón, no se puede dividir este pedazo"
-#: add-patch.c:1554
+#: add-patch.c:1623
#, c-format
msgid "Split into %d hunks."
msgstr "Cortar en %d hunk."
-#: add-patch.c:1558
+#: add-patch.c:1627
msgid "Sorry, cannot edit this hunk"
msgstr "Perdón, no se puede editar este pedazo"
-#: add-patch.c:1609
+#: add-patch.c:1679
msgid "'git apply' failed"
msgstr "falló 'git apply'"
-#: advice.c:115
+#: advice.c:143
+#, 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:159
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sayuda: %.*s%s\n"
-#: advice.c:168
+#: advice.c:250
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
"No es posible ejecutar cherry-picking porque tienes archivos sin fusionar."
-#: advice.c:170
+#: advice.c:252
msgid "Committing is not possible because you have unmerged files."
msgstr "No es posible realizar un commit porque tienes archivos sin fusionar."
-#: advice.c:172
+#: advice.c:254
msgid "Merging is not possible because you have unmerged files."
msgstr "No es posible hacer merge porque tienes archivos sin fusionar."
-#: advice.c:174
+#: advice.c:256
msgid "Pulling is not possible because you have unmerged files."
msgstr "No es posible hacer pull porque tienes archivos sin fusionar."
-#: advice.c:176
+#: advice.c:258
msgid "Reverting is not possible because you have unmerged files."
msgstr "No es posible revertir porque tienes archivos sin fusionar."
-#: advice.c:178
+#: advice.c:260
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "No es posible %s porque tienes archivos sin fusionar."
-#: advice.c:186
+#: advice.c:268
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
@@ -746,23 +791,23 @@
"Corrígelos en el árbol de trabajo y entonces usa 'git add/rm <archivo>',\n"
"como sea apropiado, para marcar la resolución y realizar un commit."
-#: advice.c:194
+#: advice.c:276
msgid "Exiting because of an unresolved conflict."
msgstr "Saliendo porque existe un conflicto sin resolver."
-#: advice.c:199 builtin/merge.c:1335
+#: advice.c:281 builtin/merge.c:1370
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "No has concluido tu fusión (MERGE_HEAD existe)."
-#: advice.c:201
+#: advice.c:283
msgid "Please, commit your changes before merging."
msgstr "Por favor, realiza un commit antes de fusionar."
-#: advice.c:202
+#: advice.c:284
msgid "Exiting because of unfinished merge."
msgstr "Saliendo por una fusión inconclusa."
-#: advice.c:208
+#: advice.c:290
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -1062,7 +1107,8 @@
msgid "cannot checkout %s"
msgstr "no se puede hacer checkout a %s"
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:86 pack-revindex.c:213
+#: setup.c:308
#, c-format
msgid "failed to read %s"
msgstr "no se pudo leer %s"
@@ -1082,7 +1128,7 @@
msgid "%s: does not exist in index"
msgstr "%s: no existe en el índice"
-#: apply.c:3537 apply.c:3708
+#: apply.c:3537 apply.c:3708 apply.c:3952
#, c-format
msgid "%s: does not match index"
msgstr "%s: no concuerda con el índice"
@@ -1132,182 +1178,182 @@
msgid "%s has type %o, expected %o"
msgstr "%s tiene tipo %o, se esperaba %o"
-#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856
-#: read-cache.c:1325
+#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858
+#: read-cache.c:1313
#, c-format
msgid "invalid path '%s'"
msgstr "ruta inválida '%s'"
-#: apply.c:3936
+#: apply.c:3950
#, c-format
msgid "%s: already exists in index"
msgstr "%s: ya existe en el índice"
-#: apply.c:3939
+#: apply.c:3954
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: ya existe en el directorio de trabajo"
-#: apply.c:3959
+#: apply.c:3974
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o)"
-#: apply.c:3964
+#: apply.c:3979
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "nuevo modo (%o) de %s no concuerda con el viejo modo (%o) de %s"
-#: apply.c:3984
+#: apply.c:3999
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "archivo afectado '%s' está tras un enlace simbólico"
-#: apply.c:3988
+#: apply.c:4003
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: el parche no aplica"
-#: apply.c:4003
+#: apply.c:4018
#, c-format
msgid "Checking patch %s..."
msgstr "Revisando el parche %s..."
-#: apply.c:4095
+#: apply.c:4110
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "falta información del sha1 o es inútil para el submódulo %s"
-#: apply.c:4102
+#: apply.c:4117
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "modo cambiado para %s, el cual no se encuentra en el HEAD actual"
-#: apply.c:4105
+#: apply.c:4120
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "falta información sha1 o es inútil (%s)."
-#: apply.c:4114
+#: apply.c:4129
#, c-format
msgid "could not add %s to temporary index"
msgstr "no se pudo añadir %s al índice temporal"
-#: apply.c:4124
+#: apply.c:4139
#, c-format
msgid "could not write temporary index to %s"
msgstr "no se pudo escribir un índice temporal para %s"
-#: apply.c:4262
+#: apply.c:4277
#, c-format
msgid "unable to remove %s from index"
msgstr "no se puede eliminar %s del índice"
-#: apply.c:4296
+#: apply.c:4311
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "parche corrupto para el submódulo %s"
-#: apply.c:4302
+#: apply.c:4317
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "no es posible establecer el archivo recién creado '%s'"
-#: apply.c:4310
+#: apply.c:4325
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
"no es posible crear una copia de seguridad para el archivo recién creado %s"
-#: apply.c:4316 apply.c:4461
+#: apply.c:4331 apply.c:4476
#, c-format
msgid "unable to add cache entry for %s"
msgstr "no es posible agregar una entrada en el cache para %s"
-#: apply.c:4359
+#: apply.c:4374 builtin/bisect--helper.c:523
#, c-format
msgid "failed to write to '%s'"
msgstr "falló escribir para '%s'"
-#: apply.c:4363
+#: apply.c:4378
#, c-format
msgid "closing file '%s'"
msgstr "cerrando archivo '%s'"
-#: apply.c:4433
+#: apply.c:4448
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "no es posible escribir el archivo '%s' modo %o"
-#: apply.c:4531
+#: apply.c:4546
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Parche %s aplicado limpiamente."
-#: apply.c:4539
+#: apply.c:4554
msgid "internal error"
msgstr "error interno"
-#: apply.c:4542
+#: apply.c:4557
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Aplicando parche %%s con %d rechazo..."
msgstr[1] "Aplicando parche %%s con %d rechazos..."
-#: apply.c:4553
+#: apply.c:4568
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "truncando el nombre de archivo .rej a %.*s.rej"
-#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201
+#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334
#, c-format
msgid "cannot open %s"
msgstr "no se puede abrir %s"
-#: apply.c:4575
+#: apply.c:4590
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Hunk #%d aplicado limpiamente."
-#: apply.c:4579
+#: apply.c:4594
#, c-format
msgid "Rejected hunk #%d."
msgstr "Hunk #%d rechazado."
-#: apply.c:4698
+#: apply.c:4718
#, c-format
msgid "Skipped patch '%s'."
msgstr "Parche '%s' saltado."
-#: apply.c:4706
+#: apply.c:4726
msgid "unrecognized input"
msgstr "input no reconocido"
-#: apply.c:4726
+#: apply.c:4746
msgid "unable to read index file"
msgstr "no es posible leer el archivo índice"
-#: apply.c:4883
+#: apply.c:4903
#, c-format
msgid "can't open patch '%s': %s"
msgstr "no se puede abrir el parche '%s': %s"
-#: apply.c:4910
+#: apply.c:4930
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "%d error de espacios en blanco aplastado"
msgstr[1] "%d errores de espacios en blanco aplastados"
-#: apply.c:4916 apply.c:4931
+#: apply.c:4936 apply.c:4951
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d línea agrega errores de espacios en blanco."
msgstr[1] "%d líneas agregan errores de espacios en blanco."
-#: apply.c:4924
+#: apply.c:4944
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
@@ -1316,140 +1362,184 @@
msgstr[1] ""
"%d líneas aplicadas después de arreglar los errores de espacios en blanco."
-#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406
+#: apply.c:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406
msgid "Unable to write new index file"
msgstr "No es posible escribir el archivo índice"
-#: apply.c:4968
+#: apply.c:4988
msgid "don't apply changes matching the given path"
msgstr "no aplicar cambios que concuerden con la ruta suministrada"
-#: apply.c:4971
+#: apply.c:4991
msgid "apply changes matching the given path"
msgstr "aplicar cambios que concuerden con la ruta suministrada"
-#: apply.c:4973 builtin/am.c:2260
+#: apply.c:4993 builtin/am.c:2266
msgid "num"
msgstr "num"
-#: apply.c:4974
+#: apply.c:4994
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "eliminar <num> slashes iniciales de las rutas diff tradicionales"
-#: apply.c:4977
+#: apply.c:4997
msgid "ignore additions made by the patch"
msgstr "ignorar adiciones hechas por el parche"
-#: apply.c:4979
+#: apply.c:4999
msgid "instead of applying the patch, output diffstat for the input"
msgstr "en lugar de aplicar el parche, mostrar diffstat para la entrada"
-#: apply.c:4983
+#: apply.c:5003
msgid "show number of added and deleted lines in decimal notation"
msgstr "mostrar el numero de líneas agregadas y eliminadas en notación decimal"
-#: apply.c:4985
+#: apply.c:5005
msgid "instead of applying the patch, output a summary for the input"
msgstr "en lugar de aplicar el parche, mostrar un resumen para la entrada"
-#: apply.c:4987
+#: apply.c:5007
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "en lugar de aplicar el parche, ver si el parche es aplicable"
-#: apply.c:4989
+#: apply.c:5009
msgid "make sure the patch is applicable to the current index"
msgstr "asegurar que el parche es aplicable al índice actual"
-#: apply.c:4991
+#: apply.c:5011
msgid "mark new files with `git add --intent-to-add`"
msgstr "marca los nuevos archivos con `git add --intent-to-add`"
-#: apply.c:4993
+#: apply.c:5013
msgid "apply a patch without touching the working tree"
msgstr "aplicar un parche sin tocar el árbol de trabajo"
-#: apply.c:4995
+#: apply.c:5015
msgid "accept a patch that touches outside the working area"
msgstr "aceptar un parche que toca fuera del área de trabajo"
-#: apply.c:4998
+#: apply.c:5018
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "también aplicar el parche ( usar con --stat/--summary/--check"
-#: apply.c:5000
+#: apply.c:5020
msgid "attempt three-way merge if a patch does not apply"
msgstr "intentar merge de tres-vías si el parche no aplica"
-#: apply.c:5002
+#: apply.c:5022
msgid "build a temporary index based on embedded index information"
msgstr ""
"construir un índice temporal basado en la información del índice incrustado"
-#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540
msgid "paths are separated with NUL character"
msgstr "rutas están separadas con un carácter NULL"
-#: apply.c:5007
+#: apply.c:5027
msgid "ensure at least <n> lines of context match"
msgstr "asegurar que al menos concuerden <n> líneas del contexto concuerden"
-#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98
+#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98
#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3457 builtin/rebase.c:1508
+#: builtin/pack-objects.c:3577 builtin/rebase.c:1352
msgid "action"
msgstr "acción"
-#: apply.c:5009
+#: apply.c:5029
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
"detectar líneas nuevas o modificadas que contienen errores de espacios en "
"blanco"
-#: apply.c:5012 apply.c:5015
+#: apply.c:5032 apply.c:5035
msgid "ignore changes in whitespace when finding context"
msgstr ""
"ignorar cambios en los espacios en blanco cuando se encuentra el contexto"
-#: apply.c:5018
+#: apply.c:5038
msgid "apply the patch in reverse"
msgstr "aplicar el parche en reversa"
-#: apply.c:5020
+#: apply.c:5040
msgid "don't expect at least one line of context"
msgstr "no espera al menos una línea del contexto"
-#: apply.c:5022
+#: apply.c:5042
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "dejar los hunks rechazados en los archivos *.rej correspontientes"
-#: apply.c:5024
+#: apply.c:5044
msgid "allow overlapping hunks"
msgstr "permitir solapamiento de hunks"
-#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22
-#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774
-#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22
+#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757
+#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "ser verboso"
-#: apply.c:5027
+#: apply.c:5047
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
"tolerar nuevas líneas faltantes detectadas incorrectamente al final del "
"archivo"
-#: apply.c:5030
+#: apply.c:5050
msgid "do not trust the line counts in the hunk headers"
msgstr "no confiar en el conteo de líneas en los headers del hunk"
-#: apply.c:5032 builtin/am.c:2248
+#: apply.c:5052 builtin/am.c:2254
msgid "root"
msgstr "raíz"
-#: apply.c:5033
+#: apply.c:5053
msgid "prepend <root> to all filenames"
msgstr "anteponer <root> a todos los nombres de archivos"
+#: 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:265 archive-zip.c:358
+#, c-format
+msgid "unsupported file mode: 0%o (SHA1: %s)"
+msgstr "modo de archivo no soportado: 0%o (SHA1: %s)"
+
+#: archive-tar.c:450
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr "no se puede comenzar filtro '%s'"
+
+#: archive-tar.c:453
+msgid "unable to redirect descriptor"
+msgstr "incapaz de redirigir descriptor"
+
+#: archive-tar.c:460
+#, c-format
+msgid "'%s' filter reported error"
+msgstr "filtro '%s' reportó un error"
+
+#: archive-zip.c:318
+#, c-format
+msgid "path is not valid UTF-8: %s"
+msgstr "ruta no válida UTF-8: %s"
+
+#: archive-zip.c:322
+#, c-format
+msgid "path too long (%d chars, SHA1: %s): %s"
+msgstr "ruta muy larga (%d chars, 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 al desinflar (%d)"
+
+#: archive-zip.c:603
+#, 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>...]"
@@ -1469,183 +1559,156 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <repo> [--exec <comando>] --list"
-#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
-#, c-format
-msgid "pathspec '%s' did not match any files"
-msgstr "ruta especificada '%s' no concordó con ninguna carpeta"
-
-#: archive.c:396
-#, c-format
-msgid "no such ref: %.*s"
-msgstr "no existe el ref: %.*s"
-
-#: archive.c:401
-#, c-format
-msgid "not a valid object name: %s"
-msgstr "nombre de objeto no válido: %s"
-
-#: archive.c:414
-#, c-format
-msgid "not a tree object: %s"
-msgstr "no es un objeto tree: %s"
-
-#: archive.c:426
-msgid "current working directory is untracked"
-msgstr "directorio de trabajo actual no rastreado"
-
-#: archive.c:457
-msgid "fmt"
-msgstr "fmt"
-
-#: archive.c:457
-msgid "archive format"
-msgstr "formato del archivo"
-
-#: archive.c:458 builtin/log.c:1653
-msgid "prefix"
-msgstr "prefijo"
-
-#: archive.c:459
-msgid "prepend prefix to each pathname in the archive"
-msgstr "anteponer prefijo a cada ruta en el archivo"
-
-#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
-#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
-#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887
-#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
-#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
-#: parse-options.h:190
-msgid "file"
-msgstr "carpeta"
-
-#: archive.c:461 builtin/archive.c:90
-msgid "write the archive to this file"
-msgstr "escribe el archivo en esta carpeta"
-
-#: archive.c:463
-msgid "read .gitattributes in working directory"
-msgstr "leer .gitattributes en el directorio de trabajo"
-
-#: archive.c:464
-msgid "report archived files on stderr"
-msgstr "reportar archivos archivados por stderr"
-
-#: archive.c:465
-msgid "store only"
-msgstr "solo guardar"
-
-#: archive.c:466
-msgid "compress faster"
-msgstr "comprimir más rápido"
-
-#: archive.c:474
-msgid "compress better"
-msgstr "comprimir mejor"
-
-#: archive.c:477
-msgid "list supported archive formats"
-msgstr "listar los formatos de carpeta soportados"
-
-#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
-#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
-msgid "repo"
-msgstr "repo"
-
-#: archive.c:480 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:715
-#: builtin/notes.c:498
-msgid "command"
-msgstr "comando"
-
-#: archive.c:482 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
-msgid "Unexpected option --remote"
-msgstr "Opción inesperada --remote"
-
-#: archive.c:491
-msgid "Option --exec can only be used together with --remote"
-msgstr "Opción --exec solo puede ser utilizada con --remote"
-
-#: archive.c:493
-msgid "Unexpected option --output"
-msgstr "Opción inesperada --output"
-
-#: archive.c:515
-#, c-format
-msgid "Unknown archive format '%s'"
-msgstr "Formato de carpeta desconocido '%s'"
-
-#: archive.c:522
-#, 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: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
+#: archive.c:192
#, c-format
msgid "cannot read %s"
msgstr "no se puede leer %s"
-#: archive-tar.c:465
+#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894
+#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786
+#: builtin/merge.c:1139
#, c-format
-msgid "unable to start '%s' filter"
-msgstr "no se puede comenzar filtro '%s'"
+msgid "could not read '%s'"
+msgstr "no se pudo leer '%s'"
-#: archive-tar.c:468
-msgid "unable to redirect descriptor"
-msgstr "incapaz de redirigir descriptor"
-
-#: archive-tar.c:475
+#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315
#, c-format
-msgid "'%s' filter reported error"
-msgstr "filtro '%s' reportó un error"
+msgid "pathspec '%s' did not match any files"
+msgstr "ruta especificada '%s' no concordó con ninguna carpeta"
-#: archive-zip.c:319
+#: archive.c:454
#, c-format
-msgid "path is not valid UTF-8: %s"
-msgstr "ruta no válida UTF-8: %s"
+msgid "no such ref: %.*s"
+msgstr "no existe el ref: %.*s"
-#: archive-zip.c:323
+#: archive.c:460
#, c-format
-msgid "path too long (%d chars, SHA1: %s): %s"
-msgstr "ruta muy larga (%d chars, SHA1: %s): %s"
+msgid "not a valid object name: %s"
+msgstr "nombre de objeto no válido: %s"
-#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
+#: archive.c:473
#, c-format
-msgid "deflate error (%d)"
-msgstr "error al desinflar (%d)"
+msgid "not a tree object: %s"
+msgstr "no es un objeto tree: %s"
-#: archive-zip.c:615
+#: archive.c:485
+msgid "current working directory is untracked"
+msgstr "directorio de trabajo actual no rastreado"
+
+#: archive.c:526
#, c-format
-msgid "timestamp too large for this system: %<PRIuMAX>"
-msgstr "timestamp muy largo para este sistema: %<PRIuMAX>"
+msgid "File not found: %s"
+msgstr "Archivo no encontrado: %s"
-#: attr.c:212
+#: archive.c:528
+#, c-format
+msgid "Not a regular file: %s"
+msgstr "No es un archivo regular: %s"
+
+#: archive.c:555
+msgid "fmt"
+msgstr "fmt"
+
+#: archive.c:555
+msgid "archive format"
+msgstr "formato del archivo"
+
+#: archive.c:556 builtin/log.c:1764
+msgid "prefix"
+msgstr "prefijo"
+
+#: archive.c:557
+msgid "prepend prefix to each pathname in the archive"
+msgstr "anteponer prefijo a cada ruta en el archivo"
+
+#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888
+#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
+#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
+#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105
+#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412
+#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190
+msgid "file"
+msgstr "carpeta"
+
+#: archive.c:559
+msgid "add untracked file to archive"
+msgstr "incluir archivos sin seguimiento al archivo"
+
+#: archive.c:562 builtin/archive.c:90
+msgid "write the archive to this file"
+msgstr "escribe el archivo en esta carpeta"
+
+#: archive.c:564
+msgid "read .gitattributes in working directory"
+msgstr "leer .gitattributes en el directorio de trabajo"
+
+#: archive.c:565
+msgid "report archived files on stderr"
+msgstr "reportar archivos archivados por stderr"
+
+#: archive.c:567
+msgid "set compression level"
+msgstr "configurar nivel de compresión"
+
+#: archive.c:570
+msgid "list supported archive formats"
+msgstr "listar los formatos de carpeta soportados"
+
+#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117
+#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
+msgid "repo"
+msgstr "repo"
+
+#: archive.c:573 builtin/archive.c:92
+msgid "retrieve the archive from remote repository <repo>"
+msgstr "obtener la carpeta del repositorio remoto <repo>"
+
+#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714
+#: builtin/notes.c:498
+msgid "command"
+msgstr "comando"
+
+#: archive.c:575 builtin/archive.c:94
+msgid "path to the remote git-upload-archive command"
+msgstr "ruta para el comando git-upload-archivo remoto"
+
+#: archive.c:582
+msgid "Unexpected option --remote"
+msgstr "Opción inesperada --remote"
+
+#: archive.c:584
+msgid "Option --exec can only be used together with --remote"
+msgstr "Opción --exec solo puede ser utilizada con --remote"
+
+#: archive.c:586
+msgid "Unexpected option --output"
+msgstr "Opción inesperada --output"
+
+#: archive.c:588
+msgid "Options --add-file and --remote cannot be used together"
+msgstr "Opciones --add-file y --remote no pueden ser usadas juntas"
+
+#: archive.c:610
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "Formato de carpeta desconocido '%s'"
+
+#: archive.c:619
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "Argumento no soportado para formato '%s': -%d"
+
+#: attr.c:202
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s no es un nombre de atributo válido"
-#: attr.c:369
+#: attr.c:359
#, c-format
msgid "%s not allowed: %s:%d"
msgstr "%s no permitido: %s:%d"
-#: attr.c:409
+#: attr.c:399
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -1653,22 +1716,22 @@
"Los patrones negativos son ignorados en los atributos de git\n"
"Usa '\\!' para comenzar literalmente con exclamación."
-#: bisect.c:468
+#: bisect.c:489
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Revisa las comillas en el archivo '%s': %s"
-#: bisect.c:678
+#: bisect.c:699
#, c-format
msgid "We cannot bisect more!\n"
msgstr "¡No podemos biseccionar más!\n"
-#: bisect.c:745
+#: bisect.c:766
#, c-format
msgid "Not a valid commit name %s"
msgstr "No es un nombre de commit válido %s"
-#: bisect.c:770
+#: bisect.c:791
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1677,7 +1740,7 @@
"La base de fisión %s está mal.\n"
"Esto quiere decir que el bug ha sido arreglado entre %s y [%s].\n"
-#: bisect.c:775
+#: bisect.c:796
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1686,7 +1749,7 @@
"La base de fisión %s es nueva.\n"
"Esta propiedad ha cambiado entre %s y [%s].\n"
-#: bisect.c:780
+#: bisect.c:801
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1695,7 +1758,7 @@
"La base de fisión %s es %s.\n"
"Esto quiere decir que el primer '%s' commit está entre %s y [%s].\n"
-#: bisect.c:788
+#: bisect.c:809
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1706,7 +1769,7 @@
"git bisect no puede trabajar bien en este caso.\n"
"¿Tal vez confundiste la revisión %s y %s?\n"
-#: bisect.c:801
+#: bisect.c:822
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1717,45 +1780,45 @@
"Así que no podemos estar seguros que el primer %s commit está entre%s y %s.\n"
"Vamos a continuar de todas maneras."
-#: bisect.c:840
+#: bisect.c:861
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Biseccionando: una base de fisión debe ser probada\n"
-#: bisect.c:890
+#: bisect.c:911
#, c-format
msgid "a %s revision is needed"
msgstr "una %s revisión es necesaria"
-#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287
#, c-format
msgid "could not create file '%s'"
msgstr "no se pudo crear el archivo '%s'"
-#: bisect.c:966 builtin/merge.c:149
+#: bisect.c:987 builtin/merge.c:153
#, c-format
msgid "could not read file '%s'"
msgstr "no se pudo leer el archivo '%s'"
-#: bisect.c:997
+#: bisect.c:1027
msgid "reading bisect refs failed"
msgstr "falló leer las refs de bisect"
-#: bisect.c:1019
+#: bisect.c:1057
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s fue tanto %s como %s\n"
-#: bisect.c:1028
+#: bisect.c:1066
#, c-format
msgid ""
"No testable commit found.\n"
-"Maybe you started with bad path parameters?\n"
+"Maybe you started with bad path arguments?\n"
msgstr ""
"No se encontró commit que se pueda probar.\n"
"¿Quizás iniciaste con parámetros de rutas incorrectos?\n"
-#: bisect.c:1057
+#: bisect.c:1095
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1765,47 +1828,47 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1063
+#: bisect.c:1101
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[0] "Biseccionando: falta %d revisión por probar después de esto %s\n"
msgstr[1] "Biseccionando: faltan %d revisiones por probar después de esto %s\n"
-#: blame.c:2700
+#: blame.c:2777
msgid "--contents and --reverse do not blend well."
msgstr "--contents y --reverse no se mezclan bien."
-#: blame.c:2714
+#: 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:2735
+#: 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:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006
-#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388
-#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215
-#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290
-#: builtin/shortlog.c:192
+#: blame.c:2821 bundle.c:213 ref-filter.c:2206 remote.c:2041 sequencer.c:2146
+#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411
+#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335
+#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410
+#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr "falló la configuración del camino de revisión"
-#: blame.c:2762
+#: 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:2773
+#: blame.c:2850
#, c-format
msgid "no such path %s in %s"
msgstr "no hay una ruta %s en %s"
-#: blame.c:2784
+#: 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"
@@ -1949,114 +2012,404 @@
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:41
#, c-format
-msgid "'%s' does not look like a v2 bundle file"
-msgstr "'%s' no se ve como un archivo bundle v2"
+msgid "unrecognized bundle hash algorithm: %s"
+msgstr "algoritmo bundle hash desconocido %s"
-#: bundle.c:64
+#: bundle.c:45
+#, c-format
+msgid "unknown capability '%s'"
+msgstr "capacidad desconocida '%s'"
+
+#: bundle.c:71
+#, c-format
+msgid "'%s' does not look like a v2 or v3 bundle file"
+msgstr "'%s' no se ve como un archivo bundle v2 o v3"
+
+#: bundle.c:110
#, 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:2258 sequencer.c:3016
-#: builtin/commit.c:815
+#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184
+#: builtin/commit.c:814
#, c-format
msgid "could not open '%s'"
msgstr "no se pudo abrir '%s'"
-#: bundle.c:143
+#: bundle.c:189
msgid "Repository lacks these prerequisite commits:"
msgstr "Al repositorio le falta estos commits prerrequisito:"
-#: bundle.c:146
+#: bundle.c:192
msgid "need a repository to verify a bundle"
msgstr "se necesita un repositorio para verificar 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] "El bundle contiene esta referencia:"
msgstr[1] "El bundle contiene estas %d referencias:"
-#: bundle.c:204
+#: bundle.c:250
msgid "The bundle records a complete history."
msgstr "El bundle registra una historia 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 bundle requiere esta referencia:"
msgstr[1] "El bundle requiere estas %d referencias:"
-#: bundle.c:273
+#: bundle.c:319
msgid "unable to dup bundle descriptor"
msgstr "incapaz de duplicar bundle descriptor"
-#: bundle.c:280
+#: bundle.c:326
msgid "Could not spawn pack-objects"
msgstr "No se pudo crear los pack-objetcts"
-#: bundle.c:291
+#: bundle.c:337
msgid "pack-objects died"
msgstr "pack-objects murió"
-#: bundle.c:333
-msgid "rev-list died"
-msgstr "rev-list murió"
-
-#: bundle.c:382
+#: bundle.c:386
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "referencia '%s' es excluida por las opciones de rev-list"
-#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306
+#: bundle.c:490
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr "versión de bundle no soportada %d"
+
+#: bundle.c:492
+#, c-format
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr "no se puede escribir la versión de paquete %d con el algoritmo %s"
+
+#: bundle.c:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396
#, c-format
msgid "unrecognized argument: %s"
msgstr "argumento no reconocido: %s"
-#: bundle.c:469
+#: bundle.c:539
msgid "Refusing to create empty bundle."
msgstr "Rechazando crear un bundle vacío."
-#: bundle.c:479
+#: bundle.c:549
#, c-format
msgid "cannot create '%s'"
msgstr "no se puede crear '%s'"
-#: bundle.c:504
+#: bundle.c:574
msgid "index-pack died"
msgstr "index-pack murió"
+#: chunk-format.c:113
+msgid "terminating chunk id appears earlier than expected"
+msgstr "terminando porque el id del chunk aparece antes de lo esperado"
+
+#: chunk-format.c:122
+#, c-format
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr "offset para chunk incorrecto %<PRIx64> y %<PRIx64>"
+
+#: chunk-format.c:129
+#, c-format
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr "se encontró ID de chuck %<PRIx32> duplicado"
+
+#: chunk-format.c:143
+#, c-format
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr "chunk final tiene un id distinto de cero %<PRIx32>"
+
#: color.c:329
#, c-format
msgid "invalid color value: %.*s"
msgstr "color inválido: %.*s"
-#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403
-#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457
+#: commit-graph.c:197 midx.c:46
+msgid "invalid hash version"
+msgstr "versión de hash inválida"
+
+#: commit-graph.c:255
+msgid "commit-graph file is too small"
+msgstr "archivo commit-graph es muy pequeño"
+
+#: commit-graph.c:348
+#, 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:355
+#, 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:362
+#, 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:379
+#, c-format
+msgid "commit-graph file is too small to hold %u chunks"
+msgstr "commit-graph file es demasiado pequeño para almacenar %u chunks"
+
+#: commit-graph.c:472
+msgid "commit-graph has no base graphs chunk"
+msgstr "commit-graph no tiene una chunk base de graphs"
+
+#: commit-graph.c:482
+msgid "commit-graph chain does not match"
+msgstr "cadena commit-graph no concuerda"
+
+#: commit-graph.c:530
+#, 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:554
+msgid "unable to find all commit-graph files"
+msgstr "no es posible encontrar los archivos commit-graph"
+
+#: commit-graph.c:735 commit-graph.c:772
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr "posición de commit inválida. commit-graph está probablemente corrupto"
+
+#: commit-graph.c:756
+#, c-format
+msgid "could not find commit %s"
+msgstr "no se pudo encontrar commit %s"
+
+#: commit-graph.c:789
+msgid "commit-graph requires overflow generation data but has none"
+msgstr ""
+"commit-graph requiere datos de generación de desbordamiento pero no tiene "
+"ninguno"
+
+#: commit-graph.c:1065 builtin/am.c:1292
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "no es posible analizar el commit %s"
+
+#: commit-graph.c:1327 builtin/pack-objects.c:2872
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "incapaz de obtener el tipo de objeto: %s"
+
+#: commit-graph.c:1358
+msgid "Loading known commits in commit graph"
+msgstr "Cargando commits conocidos en commit graph"
+
+#: commit-graph.c:1375
+msgid "Expanding reachable commits in commit graph"
+msgstr "Expandiendo commits alcanzables en commit graph"
+
+#: commit-graph.c:1395
+msgid "Clearing commit marks in commit graph"
+msgstr "Limpiando marcas de commits en commit graph"
+
+#: commit-graph.c:1414
+msgid "Computing commit graph topological levels"
+msgstr "Calculando niveles topológicos de commit graph"
+
+#: commit-graph.c:1467
+msgid "Computing commit graph generation numbers"
+msgstr "Calculando números de generación de commit graph"
+
+#: commit-graph.c:1548
+msgid "Computing commit changed paths Bloom filters"
+msgstr "Calculando números de generación de commit graph"
+
+#: commit-graph.c:1625
+msgid "Collecting referenced commits"
+msgstr "Recolectando commits referenciados"
+
+#: commit-graph.c:1650
+#, 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:1663
+#, c-format
+msgid "error adding pack %s"
+msgstr "error agregando pack %s"
+
+#: commit-graph.c:1667
+#, c-format
+msgid "error opening index for %s"
+msgstr "error abriendo index para %s"
+
+#: commit-graph.c:1704
+msgid "Finding commits for commit graph among packed objects"
+msgstr "Encontrando commits para commit graph entre los objetos empaquetados"
+
+#: commit-graph.c:1722
+msgid "Finding extra edges in commit graph"
+msgstr "Encontrando esquinas extra en commit graph"
+
+#: commit-graph.c:1771
+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:1802 midx.c:794
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr "no se pudo crear directorios principales para %s"
+
+#: commit-graph.c:1815
+msgid "unable to create temporary graph layer"
+msgstr "no es posible crear un una capa de gráfico temporal"
+
+#: commit-graph.c:1820
+#, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "no se pudo poner permisos a '%s'"
+
+#: commit-graph.c:1879
+#, 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:1915
+msgid "unable to open commit-graph chain file"
+msgstr "no se pudo abrir la cadena de archivos commit-graph"
+
+#: commit-graph.c:1931
+msgid "failed to rename base commit-graph file"
+msgstr "no se pudo renombrar el archivo base commit-graph"
+
+#: commit-graph.c:1951
+msgid "failed to rename temporary commit-graph file"
+msgstr "falló al renombrar el archivo temporal commit-graph"
+
+#: commit-graph.c:2084
+msgid "Scanning merged commits"
+msgstr "Escaneando commits fusionados"
+
+#: commit-graph.c:2128
+msgid "Merging commit-graph"
+msgstr "Fusionando commit-graph"
+
+#: commit-graph.c:2235
+msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
+msgstr ""
+"intentando escribir un commit-graph, pero 'core.commitGraph' está "
+"deshabilitado"
+
+#: commit-graph.c:2342
+msgid "too many commits to write graph"
+msgstr "demasiados commits para escribir el gráfico"
+
+#: commit-graph.c:2440
+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:2450
+#, 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:2460 commit-graph.c:2475
+#, 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:2467
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "falló al analizar commit %s para commit-graph"
+
+#: commit-graph.c:2485
+msgid "Verifying commits in commit graph"
+msgstr "Verificando commits en commit graph"
+
+#: commit-graph.c:2500
+#, 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:2507
+#, 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:2517
+#, 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:2526
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr "padre de commit-graph para %s es %s != %s"
+
+#: commit-graph.c:2540
+#, 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:2545
+#, 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:2549
+#, 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:2566
+#, c-format
+msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
+msgstr "generación commit-graph para commit %s es %<PRIuMAX> < %<PRIuMAX>"
+
+#: commit-graph.c:2572
+#, 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:2887 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr "no se puede analizar %s"
-#: commit.c:53
+#: commit.c:54
#, c-format
msgid "%s %s is not a commit!"
msgstr "¡%s %s no es un commit!"
-#: commit.c:193
+#: commit.c:194
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -2076,27 +2429,27 @@
"Apapa este mensaje ejecutando\n"
"\"git config advice.graftFileDeprecated false\""
-#: commit.c:1153
+#: commit.c:1223
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "Commit %s tiene una firma GPG no confiable, pretendidamente por %s."
-#: commit.c:1157
+#: commit.c:1227
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "Commit %s tiene una mala firma GPG pretendidamente por %s."
-#: commit.c:1160
+#: commit.c:1230
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Commit %s no tiene una firma GPG."
-#: commit.c:1163
+#: commit.c:1233
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "El Commit %s tiene una buena firma GPG por %s\n"
-#: commit.c:1417
+#: commit.c:1487
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
@@ -2107,271 +2460,11 @@
"variable de configuración i18n.commitencoding para la codificación que usa "
"tu proyecto.\n"
-#: commit-graph.c:122
-msgid "commit-graph file is too small"
-msgstr "archivo commit-graph es muy pequeño"
-
-#: commit-graph.c:189
-#, c-format
-msgid "commit-graph signature %X does not match signature %X"
-msgstr "firma %X en commit-graph no concuerda con firma %X"
-
-#: commit-graph.c:196
-#, c-format
-msgid "commit-graph version %X does not match version %X"
-msgstr "versión de commit-graph %X no concuerda con versión %X"
-
-#: commit-graph.c:203
-#, c-format
-msgid "commit-graph hash version %X does not match version %X"
-msgstr "versión de hash de commit-graph %X no concuerda con versión %X"
-
-#: commit-graph.c:226
-msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
-msgstr ""
-"falta tabla de lookup del chunk en commit-graph; el archivo puede estar "
-"incompleto"
-
-#: commit-graph.c:237
-#, c-format
-msgid "commit-graph improper chunk offset %08x%08x"
-msgstr "offset del chunk de commit-graph inapropiado %08x%08x"
-
-#: commit-graph.c:280
-#, c-format
-msgid "commit-graph chunk id %08x appears multiple times"
-msgstr "id de chunk de commit-graph %08x parece tener múltiples tiempos"
-
-#: commit-graph.c:343
-msgid "commit-graph has no base graphs chunk"
-msgstr "commit-graph no tiene una chunk base de graphs"
-
-#: commit-graph.c:353
-msgid "commit-graph chain does not match"
-msgstr "cadena commit-graph no concuerda"
-
-#: commit-graph.c:401
-#, c-format
-msgid "invalid commit-graph chain: line '%s' not a hash"
-msgstr "cadena de commit-graph inválida: línea '%s' no es un hash"
-
-#: commit-graph.c:425
-msgid "unable to find all commit-graph files"
-msgstr "no es posible encontrar los archivos commit-graph"
-
-#: commit-graph.c:558 commit-graph.c:618
-msgid "invalid commit position. commit-graph is likely corrupt"
-msgstr "posición de commit inválida. commit-graph está probablemente corrupto"
-
-#: commit-graph.c:579
-#, c-format
-msgid "could not find commit %s"
-msgstr "no se pudo encontrar commit %s"
-
-#: commit-graph.c:852 builtin/am.c:1292
-#, c-format
-msgid "unable to parse commit %s"
-msgstr "no es posible analizar el commit %s"
-
-#: commit-graph.c:1011 builtin/pack-objects.c:2782
-#, c-format
-msgid "unable to get type of object %s"
-msgstr "incapaz de obtener el tipo de objeto: %s"
-
-#: commit-graph.c:1043
-msgid "Loading known commits in commit graph"
-msgstr "Cargando commits conocidos en commit graph"
-
-#: commit-graph.c:1060
-msgid "Expanding reachable commits in commit graph"
-msgstr "Expandiendo commits alcanzables en commit graph"
-
-#: commit-graph.c:1079
-msgid "Clearing commit marks in commit graph"
-msgstr "Limpiando marcas de commits en commit graph"
-
-#: commit-graph.c:1098
-msgid "Computing commit graph generation numbers"
-msgstr "Calculando números de generación de commit graph"
-
-#: commit-graph.c:1173
-#, c-format
-msgid "Finding commits for commit graph in %d pack"
-msgid_plural "Finding commits for commit graph in %d packs"
-msgstr[0] "Encontrando commits para commit graph en %d pack"
-msgstr[1] "Encontrando commits para commit graph en %d packs"
-
-#: commit-graph.c:1186
-#, c-format
-msgid "error adding pack %s"
-msgstr "error agregando pack %s"
-
-#: commit-graph.c:1190
-#, c-format
-msgid "error opening index for %s"
-msgstr "error abriendo index para %s"
-
-#: commit-graph.c:1214
-#, c-format
-msgid "Finding commits for commit graph from %d ref"
-msgid_plural "Finding commits for commit graph from %d refs"
-msgstr[0] "Encontrando commits para commit graph de %d ref"
-msgstr[1] "Encontrando commits para commit graph de %d refs"
-
-#: commit-graph.c:1234
-#, c-format
-msgid "invalid commit object id: %s"
-msgstr "id de objeto commit: %s inválido"
-
-#: commit-graph.c:1249
-msgid "Finding commits for commit graph among packed objects"
-msgstr "Encontrando commits para commit graph entre los objetos empaquetados"
-
-#: commit-graph.c:1264
-msgid "Counting distinct commits in commit graph"
-msgstr "Contando commits distintos en commit graph"
-
-#: commit-graph.c:1294
-msgid "Finding extra edges in commit graph"
-msgstr "Encontrando esquinas extra en commit graph"
-
-#: commit-graph.c:1340
-msgid "failed to write correct number of base graph ids"
-msgstr "falló al escribir el número correcto de ids de base graph"
-
-#: commit-graph.c:1373 midx.c:814
-#, c-format
-msgid "unable to create leading directories of %s"
-msgstr "no se pudo crear directorios principales para %s"
-
-#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248
-#, c-format
-msgid "unable to create '%s'"
-msgstr "no se puede crear '%s'"
-
-#: commit-graph.c:1445
-#, c-format
-msgid "Writing out commit graph in %d pass"
-msgid_plural "Writing out commit graph in %d passes"
-msgstr[0] "Escribiendo commit graph en %d paso"
-msgstr[1] "Escribiendo commit graph en %d pasos"
-
-#: commit-graph.c:1486
-msgid "unable to open commit-graph chain file"
-msgstr "no se pudo abrir la cadena de archivos commit-graph"
-
-#: commit-graph.c:1498
-msgid "failed to rename base commit-graph file"
-msgstr "no se pudo renombrar el archivo base commit-graph"
-
-#: commit-graph.c:1518
-msgid "failed to rename temporary commit-graph file"
-msgstr "falló al renombrar el archivo temporal commit-graph"
-
-#: commit-graph.c:1631
-msgid "Scanning merged commits"
-msgstr "Escaneando commits fusionados"
-
-#: commit-graph.c:1642
-#, c-format
-msgid "unexpected duplicate commit id %s"
-msgstr "id de commit duplicado inesperado %s"
-
-#: commit-graph.c:1665
-msgid "Merging commit-graph"
-msgstr "Fusionando commit-graph"
-
-#: commit-graph.c:1844
-#, 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
-msgid "too many commits to write graph"
-msgstr "demasiados commits para escribir el gráfico"
-
-#: commit-graph.c:1944
-msgid "the commit-graph file has incorrect checksum and is likely corrupt"
-msgstr ""
-"el archivo de commit-graph tiene checksums incorrectos y probablemente está "
-"corrupto"
-
-#: commit-graph.c:1954
-#, c-format
-msgid "commit-graph has incorrect OID order: %s then %s"
-msgstr "commit-graph tiene un orden de OID incorrecto: %s luego %s"
-
-#: commit-graph.c:1964 commit-graph.c:1979
-#, c-format
-msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
-msgstr "commit-graph tiene un valor fanout incorrecto: fanout[%d] = %u != %u"
-
-#: commit-graph.c:1971
-#, c-format
-msgid "failed to parse commit %s from commit-graph"
-msgstr "falló al analizar commit %s para commit-graph"
-
-#: commit-graph.c:1989
-msgid "Verifying commits in commit graph"
-msgstr "Verificando commits en commit graph"
-
-#: commit-graph.c:2003
-#, c-format
-msgid "failed to parse commit %s from object database for commit-graph"
-msgstr ""
-"falló al analizar el commit %s de la base de datos de objetos para commit-"
-"graph"
-
-#: commit-graph.c:2010
-#, c-format
-msgid "root tree OID for commit %s in commit-graph is %s != %s"
-msgstr "árbol raíz OID para commit %s en commit-graph es %s != %s"
-
-#: commit-graph.c:2020
-#, c-format
-msgid "commit-graph parent list for commit %s is too long"
-msgstr "lista padre de commit-graph para commit %s es muy larga"
-
-#: commit-graph.c:2029
-#, c-format
-msgid "commit-graph parent for %s is %s != %s"
-msgstr "padre de commit-graph para %s es %s != %s"
-
-#: commit-graph.c:2042
-#, c-format
-msgid "commit-graph parent list for commit %s terminates early"
-msgstr "lista padre de commit-graph para commit %s termina antes"
-
-#: commit-graph.c:2047
-#, c-format
-msgid ""
-"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
-msgstr ""
-"commit-graph ha generado número cero para %s, pero no-cero para los demás"
-
-#: commit-graph.c:2051
-#, c-format
-msgid ""
-"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
-msgstr ""
-"commit-graph tiene generación no-cero para %s, pero cero para los demás"
-
-#: commit-graph.c:2066
-#, c-format
-msgid "commit-graph generation for commit %s is %u != %u"
-msgstr "generación commit-graph para commit %s es %u != %u"
-
-#: commit-graph.c:2072
-#, 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>"
-
#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "memoria agotada"
-#: config.c:124
+#: config.c:126
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2386,293 +2479,337 @@
"\t%s\n"
"Esto puede ser causado por inclusiones circulares."
-#: config.c:140
+#: config.c:142
#, c-format
msgid "could not expand include path '%s'"
msgstr "no se pudo expandir rutas de inclusión '%s'"
-#: config.c:151
+#: config.c:153
msgid "relative config includes must come from files"
msgstr "inclusiones de configuración relativas tienen que venir de archivos"
-#: config.c:197
+#: config.c:199
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:396
+#, c-format
+msgid "invalid config format: %s"
+msgstr "formato config inválido: %s"
+
+#: config.c:400
+#, c-format
+msgid "missing environment variable name for configuration '%.*s'"
+msgstr "falta el nombre de la variable de entorno para la configuración '%.*s'"
+
+#: config.c:405
+#, c-format
+msgid "missing environment variable '%s' for configuration '%.*s'"
+msgstr "Falta la variable de entorno '%s' para la configuración '%.*s'"
+
+#: config.c:442
#, c-format
msgid "key does not contain a section: %s"
msgstr "llave no contiene una sección: %s"
-#: config.c:382
+#: config.c:448
#, c-format
msgid "key does not contain variable name: %s"
msgstr "llave no contiene el nombre de variable: %s"
-#: config.c:406 sequencer.c:2444
+#: config.c:472 sequencer.c:2588
#, c-format
msgid "invalid key: %s"
msgstr "llave inválida: %s"
-#: config.c:412
+#: config.c:478
#, c-format
msgid "invalid key (newline): %s"
msgstr "llave inválida (nueva línea): %s"
-#: config.c:448 config.c:460
+#: config.c:511
+msgid "empty config key"
+msgstr "clave de config vacía"
+
+#: config.c:529 config.c:541
#, c-format
msgid "bogus config parameter: %s"
msgstr "parámetro de configuración malogrado: %s"
-#: config.c:495
+#: config.c:555 config.c:572 config.c:579 config.c:588
#, c-format
msgid "bogus format in %s"
msgstr "formato malogrado en %s"
-#: config.c:821
+#: config.c:622
+#, c-format
+msgid "bogus count in %s"
+msgstr "conteo malogrado en %s"
+
+#: config.c:626
+#, c-format
+msgid "too many entries in %s"
+msgstr "demasiadas entradas en %s"
+
+#: config.c:636
+#, c-format
+msgid "missing config key %s"
+msgstr "llave de configuración faltante %s"
+
+#: config.c:644
+#, c-format
+msgid "missing config value %s"
+msgstr "valor de config faltante para %s"
+
+#: config.c:995
#, 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:999
#, 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:1003
#, 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:1007
#, 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:1011
#, 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:1015
#, c-format
msgid "bad config line %d in %s"
msgstr "mala línea de config %d en %s"
-#: config.c:978
+#: config.c:1152
msgid "out of range"
msgstr "fuera de rango"
-#: config.c:978
+#: config.c:1152
msgid "invalid unit"
msgstr "unidad inválida"
-#: config.c:979
+#: config.c:1153
#, 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:1163
#, 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:1166
#, 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:1169
#, 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:1172
#, 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:1175
#, 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:1178
#, 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:1194
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr "mal valor de config booleana '%s' para '%s'"
+
+#: config.c:1289
#, 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:1298
#, 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:1391
#, 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:1405 config.c:1416
#, c-format
msgid "bad zlib compression level %d"
msgstr "nivel de compresión de zlib erróneo %d"
-#: config.c:1325
+#: config.c:1508
msgid "core.commentChar should only be one character"
msgstr "core.commentChar debería tener solo un caracter"
-#: config.c:1358
+#: config.c:1541
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "modo inválido de creación de objetos: %s"
-#: config.c:1430
+#: config.c:1613
#, c-format
msgid "malformed value for %s"
msgstr "valor malformado para %s"
-#: config.c:1456
+#: config.c:1639
#, c-format
msgid "malformed value for %s: %s"
msgstr "valor malformado para %s: %s"
-#: config.c:1457
+#: config.c:1640
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "debe ser uno de nothing, matching, simple, upstream o current"
-#: config.c:1518 builtin/pack-objects.c:3541
+#: config.c:1701 builtin/pack-objects.c:3666
#, c-format
msgid "bad pack compression level %d"
msgstr "nivel de compresión de pack erróneo %d"
-#: config.c:1639
+#: config.c:1823
#, 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:1826
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "referencia '%s' no apunta a un blob"
-#: config.c:1659
+#: config.c:1843
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "no se posible resolver configuración de blob '%s'"
-#: config.c:1689
+#: config.c:1873
#, c-format
msgid "failed to parse %s"
msgstr "no se pudo analizar %s"
-#: config.c:1743
+#: config.c:1927
msgid "unable to parse command-line config"
msgstr "no es posible analizar la configuración de la línea de comando"
-#: config.c:2097
+#: config.c:2290
msgid "unknown error occurred while reading the configuration files"
msgstr ""
"error desconocido ocurrió mientras se leían los archivos de configuración"
-#: config.c:2267
+#: config.c:2464
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Inválido %s: '%s'"
-#: config.c:2312
+#: config.c:2509
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "valor splitIndex.maxPercentChange '%d' debe estar entre 0 y 100"
-#: config.c:2358
+#: config.c:2555
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "no es posible analizar '%s' de la configuración de la línea de comando"
-#: config.c:2360
+#: config.c:2557
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "mala variable de config '%s' en el archivo '%s' en la línea %d"
-#: config.c:2441
+#: config.c:2641
#, c-format
msgid "invalid section name '%s'"
msgstr "nombre de sección inválido '%s'"
-#: config.c:2473
+#: config.c:2673
#, c-format
msgid "%s has multiple values"
msgstr "%s tiene múltiples valores"
-#: config.c:2502
+#: config.c:2702
#, c-format
msgid "failed to write new configuration file %s"
msgstr "falló al escribir nuevo archivo de configuración %s"
-#: config.c:2754 config.c:3078
+#: config.c:2954 config.c:3280
#, c-format
msgid "could not lock config file %s"
msgstr "no se pudo bloquear archivo de configuración %s"
-#: config.c:2765
+#: config.c:2965
#, c-format
msgid "opening %s"
msgstr "abriendo %s"
-#: config.c:2800 builtin/config.c:344
+#: config.c:3002 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "patrón inválido: %s"
-#: config.c:2825
+#: config.c:3027
#, c-format
msgid "invalid config file %s"
msgstr "archivo de configuración inválido: %s"
-#: config.c:2838 config.c:3091
+#: config.c:3040 config.c:3293
#, c-format
msgid "fstat on %s failed"
msgstr "fstat en %s falló"
-#: config.c:2849
+#: config.c:3051
#, c-format
msgid "unable to mmap '%s'"
msgstr "no es posible hacer mmap '%s'"
-#: config.c:2858 config.c:3096
+#: config.c:3060 config.c:3298
#, c-format
msgid "chmod on %s failed"
msgstr "chmod en %s falló"
-#: config.c:2943 config.c:3193
+#: config.c:3145 config.c:3395
#, c-format
msgid "could not write config file %s"
msgstr "no se pudo escribir el archivo de configuración %s"
-#: config.c:2977
+#: config.c:3179
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "no se pudo configurar '%s' a '%s'"
-#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
+#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
#, c-format
msgid "could not unset '%s'"
msgstr "no se pudo desactivar '%s'"
-#: config.c:3069
+#: config.c:3271
#, c-format
msgid "invalid section name: %s"
msgstr "sección de nombre inválida: %s"
-#: config.c:3236
+#: config.c:3438
#, c-format
msgid "missing value for '%s'"
msgstr "valor faltante para '%s'"
@@ -2698,72 +2835,81 @@
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:497
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr "formato de objeto desconocido '%s' ha sido provisto por el servidor"
+
+#: connect.c:526
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "respuesta de referencias ls-refs inválida: %s"
-#: connect.c:445
+#: connect.c:530
msgid "expected flush after ref listing"
msgstr "flush esperado tras listado de refs"
-#: connect.c:544
+#: connect.c:533
+msgid "expected response end packet after ref listing"
+msgstr "se esperaba un paquete final luego del ref listing"
+
+#: connect.c:666
#, c-format
msgid "protocol '%s' is not supported"
msgstr "protocolo '%s' no es soportado"
-#: connect.c:595
+#: connect.c:717
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:757 connect.c:820
#, c-format
msgid "Looking up %s ... "
msgstr "Revisando %s... "
-#: connect.c:639
+#: connect.c:761
#, 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:765 connect.c:836
#, c-format
msgid ""
"done.\n"
@@ -2772,7 +2918,7 @@
"hecho.\n"
"Conectando a %s (puerto %s) ... "
-#: connect.c:665 connect.c:742
+#: connect.c:787 connect.c:864
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -2782,74 +2928,78 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:671 connect.c:748
+#: connect.c:793 connect.c:870
msgid "done."
msgstr "hecho."
-#: connect.c:702
+#: connect.c:824
#, c-format
msgid "unable to look up %s (%s)"
msgstr "no es posible revisar %s (%s)"
-#: connect.c:708
+#: connect.c:830
#, c-format
msgid "unknown port %s"
msgstr "puerto desconocido %s"
-#: connect.c:845 connect.c:1175
+#: connect.c:967 connect.c:1299
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "hostname extraño '%s' bloqueado"
-#: connect.c:847
+#: connect.c:969
#, c-format
msgid "strange port '%s' blocked"
msgstr "puerto extraño '%s' bloqueado"
-#: connect.c:857
+#: connect.c:979
#, c-format
msgid "cannot start proxy %s"
msgstr "no se puede comenzar proxy %s"
-#: connect.c:928
+#: connect.c:1050
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
"no hay ruta especificada; vea 'git help pull' para sintaxis de url válidas"
-#: connect.c:1123
+#: connect.c:1190
+msgid "newline is forbidden in git:// hosts and repo paths"
+msgstr "la nueva línea está prohibida en git://hosts y rutas de repositorio"
+
+#: connect.c:1247
msgid "ssh variant 'simple' does not support -4"
msgstr "variante 'simple' de ssh no soporta -4"
-#: connect.c:1135
+#: connect.c:1259
msgid "ssh variant 'simple' does not support -6"
msgstr "variante 'simple' de ssh no soporta -6"
-#: connect.c:1152
+#: connect.c:1276
msgid "ssh variant 'simple' does not support setting port"
msgstr "variante ssh 'simple' no soporta configurar puerto"
-#: connect.c:1264
+#: connect.c:1388
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "ruta extraña '%s' bloqueada"
-#: connect.c:1311
+#: connect.c:1436
msgid "unable to fork"
msgstr "no es posible hacer fork"
-#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43
+#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45
msgid "Checking connectivity"
msgstr "Verificando conectividad"
-#: connected.c:110
+#: connected.c:120
msgid "Could not run 'git rev-list'"
msgstr "No se pudo correr 'git rev-list'"
-#: connected.c:130
+#: connected.c:144
msgid "failed write to rev-list"
msgstr "falló escribir a rev-list"
-#: connected.c:137
+#: connected.c:149
msgid "failed to close rev-list's stdin"
msgstr "falló al cerrar la entrada standard de rev-list"
@@ -2924,40 +3074,40 @@
msgid "encoding '%s' from %s to %s and back is not the same"
msgstr "codificación '%s' de %s a %s y de vuelta no son iguales"
-#: convert.c:668
+#: convert.c:665
#, c-format
msgid "cannot fork to run external filter '%s'"
msgstr "no se puede hacer fork para ejecutar filtros externos '%s'"
-#: convert.c:688
+#: convert.c:685
#, c-format
msgid "cannot feed the input to external filter '%s'"
msgstr "no se pueden alimentar de input a los filtros externos '%s'"
-#: convert.c:695
+#: convert.c:692
#, c-format
msgid "external filter '%s' failed %d"
msgstr "filtro externo '%s' falló %d"
-#: convert.c:730 convert.c:733
+#: convert.c:727 convert.c:730
#, c-format
msgid "read from external filter '%s' failed"
msgstr "lectura de filtro externo '%s' falló"
-#: convert.c:736 convert.c:791
+#: convert.c:733 convert.c:788
#, c-format
msgid "external filter '%s' failed"
msgstr "filtro externo '%s' falló"
-#: convert.c:839
+#: convert.c:837
msgid "unexpected filter type"
msgstr "tipo de filtro inesperado"
-#: convert.c:850
+#: convert.c:848
msgid "path name too long for external filter"
msgstr "nombre de ruta muy largo para filtro externo"
-#: convert.c:924
+#: convert.c:940
#, c-format
msgid ""
"external filter '%s' is not available anymore although not all paths have "
@@ -2966,20 +3116,48 @@
"filtro externo '%s' ya no está disponible aunque no todas las rutas han sido "
"filtradas"
-#: convert.c:1223
+#: convert.c:1240
msgid "true/false are no valid working-tree-encodings"
msgstr "true/false no son working-tree-encodings válidos"
-#: convert.c:1411 convert.c:1445
+#: convert.c:1428 convert.c:1462
#, c-format
msgid "%s: clean filter '%s' failed"
msgstr "%s: falló al limpiar filtro '%s'"
-#: convert.c:1489
+#: convert.c:1508
#, c-format
msgid "%s: smudge filter %s failed"
msgstr "%s: filtro smudge %s falló"
+#: 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:394
+#, 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:438
+#, c-format
+msgid "url has no scheme: %s"
+msgstr "url no tiene scheme: %s"
+
+#: credential.c:511
+#, 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"
@@ -3072,14 +3250,30 @@
msgid "Marked %d islands, done.\n"
msgstr "%d islas marcadas, listo.\n"
-#: diffcore-order.c:24
+#: diff-merges.c:70
#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "falló al leer orden de archivos '%s'"
+msgid "unknown value for --diff-merges: %s"
+msgstr "valor desconocido para --diff-merges: %s"
-#: diffcore-rename.c:543
-msgid "Performing inexact rename detection"
-msgstr "Realizando una detección de cambios de nombre inexacta"
+#: diff-lib.c:534
+msgid "--merge-base does not work with ranges"
+msgstr "--merge-base no funciona con rangos"
+
+#: diff-lib.c:536
+msgid "--merge-base only works with commits"
+msgstr "--merge-base solo funciona con confirmaciones"
+
+#: diff-lib.c:553
+msgid "unable to get HEAD"
+msgstr "no es posible obtener HEAD"
+
+#: diff-lib.c:560
+msgid "no merge base found"
+msgstr "no se encontró base de fusión"
+
+#: diff-lib.c:562
+msgid "multiple merge bases found"
+msgstr "múltiples bases de fusión encontradas"
#: diff-no-index.c:238
msgid "git diff --no-index [<options>] <path> <path>"
@@ -3093,17 +3287,17 @@
"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'"
@@ -3111,7 +3305,7 @@
"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', "
@@ -3121,7 +3315,7 @@
"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"
@@ -3129,13 +3323,13 @@
"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"
@@ -3144,35 +3338,35 @@
"Errores en la variable de config 'diff.dirstat' encontrados:\n"
"%s"
-#: diff.c:4202
+#: diff.c:4276
#, c-format
msgid "external diff died, stopping at %s"
msgstr "diff externo murió, deteniendo en %s"
-#: diff.c:4547
+#: diff.c:4628
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check y -s son mutuamente exclusivas"
-#: diff.c:4550
+#: diff.c:4631
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G, -S y --find-object son mutuamente exclusivas"
-#: diff.c:4628
+#: diff.c:4710
msgid "--follow requires exactly one pathspec"
msgstr "--follow requiere exactamente un pathspec"
-#: diff.c:4676
+#: diff.c:4758
#, c-format
msgid "invalid --stat value: %s"
msgstr "valor --stat inválido: %s"
-#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
-#: parse-options.c:197 parse-options.c:201
+#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306
+#: 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érico"
-#: diff.c:4713
+#: diff.c:4795
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3181,42 +3375,42 @@
"Falló al analizar parámetro de opción --dirstat/-X:\n"
"%s"
-#: diff.c:4798
+#: diff.c:4880
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "cambio de clase desconocido '%c' en --diff-filter=%s"
-#: diff.c:4822
+#: diff.c:4904
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "valor desconocido luego de ws-error-highlight=%.*s"
-#: diff.c:4836
+#: diff.c:4918
#, c-format
msgid "unable to resolve '%s'"
msgstr "no se puede resolver '%s'"
-#: diff.c:4886 diff.c:4892
+#: diff.c:4968 diff.c:4974
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s espera forma <n>/<m>"
-#: diff.c:4904
+#: diff.c:4986
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s esperaba un char, se obtuvo '%s'"
-#: diff.c:4925
+#: diff.c:5007
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "mal argumento --color-moved: %s"
-#: diff.c:4944
+#: diff.c:5026
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "modo inválido '%s' en --color-moved-ws"
-#: diff.c:4984
+#: diff.c:5066
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
@@ -3224,154 +3418,159 @@
"opción diff-algorithm acepta \"myers\", \"minimal\", \"patience\" e "
"\"histogram\""
-#: diff.c:5020 diff.c:5040
+#: diff.c:5102 diff.c:5122
#, c-format
msgid "invalid argument to %s"
msgstr "argumento inválido para %s"
-#: diff.c:5178
+#: diff.c:5226
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr "regex inválido para -I: '%s'"
+
+#: diff.c:5275
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "falló al analizar parámetro de opción --submodule: '%s'"
-#: diff.c:5234
+#: diff.c:5331
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "mal argumento --word-diff: %s"
-#: diff.c:5257
+#: diff.c:5367
msgid "Diff output format options"
msgstr "Opciones de formato de salida para diff"
-#: diff.c:5259 diff.c:5265
+#: diff.c:5369 diff.c:5375
msgid "generate patch"
msgstr "generar parche"
-#: diff.c:5262 builtin/log.c:173
+#: diff.c:5372 builtin/log.c:179
msgid "suppress diff output"
msgstr "suprimir salida de diff"
-#: diff.c:5267 diff.c:5381 diff.c:5388
+#: diff.c:5377 diff.c:5491 diff.c:5498
msgid "<n>"
msgstr "<n>"
-#: diff.c:5268 diff.c:5271
+#: diff.c:5378 diff.c:5381
msgid "generate diffs with <n> lines context"
msgstr "genera diffs con <n> líneas de contexto"
-#: diff.c:5273
+#: diff.c:5383
msgid "generate the diff in raw format"
msgstr "genera el diff en formato raw"
-#: diff.c:5276
+#: diff.c:5386
msgid "synonym for '-p --raw'"
msgstr "sinónimo para '-p --stat'"
-#: diff.c:5280
+#: diff.c:5390
msgid "synonym for '-p --stat'"
msgstr "sinónimo para '-p --stat'"
-#: diff.c:5284
+#: diff.c:5394
msgid "machine friendly --stat"
msgstr "--stat amigable para máquina"
-#: diff.c:5287
+#: diff.c:5397
msgid "output only the last line of --stat"
msgstr "mostrar solo la última línea para --stat"
-#: diff.c:5289 diff.c:5297
+#: diff.c:5399 diff.c:5407
msgid "<param1,param2>..."
msgstr "<param1,param2>..."
-#: diff.c:5290
+#: diff.c:5400
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
"muestra la distribución de cantidades de cambios relativa para cada "
"subdirectorio"
-#: diff.c:5294
+#: diff.c:5404
msgid "synonym for --dirstat=cumulative"
msgstr "sinónimo para --dirstat=cumulative"
-#: diff.c:5298
+#: diff.c:5408
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "sinonimo para --dirstat=archivos,param1,param2..."
-#: diff.c:5302
+#: diff.c:5412
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
"advierte si cambios introducen conflictos de markers o errores de espacios "
"en blanco"
-#: diff.c:5305
+#: diff.c:5415
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
"resumen condensado de creaciones, cambios de nombres y cambios de modos"
-#: diff.c:5308
+#: diff.c:5418
msgid "show only names of changed files"
msgstr "mostrar solo nombres de archivos cambiados"
-#: diff.c:5311
+#: diff.c:5421
msgid "show only names and status of changed files"
msgstr "mostrar solo nombres y estados de archivos cambiados"
-#: diff.c:5313
+#: diff.c:5423
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<ancho>[,<nombre-ancho>[,<cantidad>]]"
-#: diff.c:5314
+#: diff.c:5424
msgid "generate diffstat"
msgstr "generar diffstat"
-#: diff.c:5316 diff.c:5319 diff.c:5322
+#: diff.c:5426 diff.c:5429 diff.c:5432
msgid "<width>"
msgstr "<ancho>"
-#: diff.c:5317
+#: diff.c:5427
msgid "generate diffstat with a given width"
msgstr "genera diffstat con un ancho dado"
-#: diff.c:5320
+#: diff.c:5430
msgid "generate diffstat with a given name width"
msgstr "genera diffstat con un nombre de ancho dado"
-#: diff.c:5323
+#: diff.c:5433
msgid "generate diffstat with a given graph width"
msgstr "genera diffstat con un ancho de graph dado"
-#: diff.c:5325
+#: diff.c:5435
msgid "<count>"
msgstr "<cantidad>"
-#: diff.c:5326
+#: diff.c:5436
msgid "generate diffstat with limited lines"
msgstr "genera diffstat con líneas limitadas"
-#: diff.c:5329
+#: diff.c:5439
msgid "generate compact summary in diffstat"
msgstr "genera un resumen compacto de diffstat"
-#: diff.c:5332
+#: diff.c:5442
msgid "output a binary diff that can be applied"
msgstr "muestra un diff binario que puede ser aplicado"
-#: diff.c:5335
+#: diff.c:5445
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
"mostrar todo un pre- y post-image de nombres de objetos en las líneas \"index"
"\""
-#: diff.c:5337
+#: diff.c:5447
msgid "show colored diff"
msgstr "mostrar diff colorido"
-#: diff.c:5338
+#: diff.c:5448
msgid "<kind>"
msgstr "<tipo>"
-#: diff.c:5339
+#: diff.c:5449
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
@@ -3379,7 +3578,7 @@
"resaltar errores de espacios en blanco en las líneas 'context', 'old' o "
"'new' del diff"
-#: diff.c:5342
+#: diff.c:5452
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3387,89 +3586,89 @@
"no consolidar los pathnames y usar NULs como terminadores de campos en --raw "
"o --numstat"
-#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457
+#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570
msgid "<prefix>"
msgstr "<prefijo>"
-#: diff.c:5346
+#: diff.c:5456
msgid "show the given source prefix instead of \"a/\""
msgstr "mostrar el prefijo de fuente dado en lugar de \"a/\""
-#: diff.c:5349
+#: diff.c:5459
msgid "show the given destination prefix instead of \"b/\""
msgstr "mostrar el prefijo de destino en lugar de \"b/\""
-#: diff.c:5352
+#: diff.c:5462
msgid "prepend an additional prefix to every line of output"
msgstr "anteponer un prefijo adicional a cada línea mostrada"
-#: diff.c:5355
+#: diff.c:5465
msgid "do not show any source or destination prefix"
msgstr "no mostrar ningún prefijo de fuente o destino"
-#: diff.c:5358
+#: diff.c:5468
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
"muestra el contexto entre hunks de diff hasta el número especificado de "
"líneas"
-#: diff.c:5362 diff.c:5367 diff.c:5372
+#: diff.c:5472 diff.c:5477 diff.c:5482
msgid "<char>"
msgstr "<char>"
-#: diff.c:5363
+#: diff.c:5473
msgid "specify the character to indicate a new line instead of '+'"
msgstr "especifica el char para indicar una nueva línea en lugar de '+'"
-#: diff.c:5368
+#: diff.c:5478
msgid "specify the character to indicate an old line instead of '-'"
msgstr "especifica el char para indicar una línea vieja en lugar de '-'"
-#: diff.c:5373
+#: diff.c:5483
msgid "specify the character to indicate a context instead of ' '"
msgstr "especifica el char para indicar un contexto en lugar de ' '"
-#: diff.c:5376
+#: diff.c:5486
msgid "Diff rename options"
msgstr "Opciones de diff rename"
-#: diff.c:5377
+#: diff.c:5487
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5378
+#: diff.c:5488
msgid "break complete rewrite changes into pairs of delete and create"
msgstr "descomponer los cambios de reescritura en pares de borrar y crear"
-#: diff.c:5382
+#: diff.c:5492
msgid "detect renames"
msgstr "detectar renombrados"
-#: diff.c:5386
+#: diff.c:5496
msgid "omit the preimage for deletes"
msgstr "omite la preimage para borrados"
-#: diff.c:5389
+#: diff.c:5499
msgid "detect copies"
msgstr "detectar copias"
-#: diff.c:5393
+#: diff.c:5503
msgid "use unmodified files as source to find copies"
msgstr "usa archivos no modificados como fuente para encontrar copias"
-#: diff.c:5395
+#: diff.c:5505
msgid "disable rename detection"
msgstr "deshabilita detección de renombres"
-#: diff.c:5398
+#: diff.c:5508
msgid "use empty blobs as rename source"
msgstr "usa blobs vacíos como fuente de renombre"
-#: diff.c:5400
+#: diff.c:5510
msgid "continue listing the history of a file beyond renames"
msgstr "continua listando el historial de un archivo más allá de renombres"
-#: diff.c:5403
+#: diff.c:5513
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
@@ -3477,155 +3676,159 @@
"previene detección de renombre/copias si el número de objetivos para "
"renombres/copias excede el límite dado"
-#: diff.c:5405
+#: diff.c:5515
msgid "Diff algorithm options"
msgstr "Opciones de algoritmos de diff"
-#: diff.c:5407
+#: diff.c:5517
msgid "produce the smallest possible diff"
msgstr "produce el diff más pequeño posible"
-#: diff.c:5410
+#: diff.c:5520
msgid "ignore whitespace when comparing lines"
msgstr "ignorar espacios en blanco cuando comparando líneas"
-#: diff.c:5413
+#: diff.c:5523
msgid "ignore changes in amount of whitespace"
msgstr "ignorar cambios en la cantidad de líneas en blanco"
-#: diff.c:5416
+#: diff.c:5526
msgid "ignore changes in whitespace at EOL"
msgstr "ignorar cambios en espacios en blanco en EOL"
-#: diff.c:5419
+#: diff.c:5529
msgid "ignore carrier-return at the end of line"
msgstr "ignora carrier-return al final de la línea"
-#: diff.c:5422
+#: diff.c:5532
msgid "ignore changes whose lines are all blank"
msgstr "ignora cambios cuyas líneas son todas en blanco"
-#: diff.c:5425
+#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604
+msgid "<regex>"
+msgstr "<regex>"
+
+#: diff.c:5535
+msgid "ignore changes whose all lines match <regex>"
+msgstr "ignora cambios cuyas líneas concuerdan con <regex>"
+
+#: diff.c:5538
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr "heurística para cambiar los límites de hunk para una fácil lectura"
-#: diff.c:5428
+#: diff.c:5541
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "genera un diff usando algoritmo \"patience diff\""
-#: diff.c:5432
+#: diff.c:5545
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "genera un diff usando algoritmo \"histogram diff\""
-#: diff.c:5434
+#: diff.c:5547
msgid "<algorithm>"
msgstr "<algoritmo>"
-#: diff.c:5435
+#: diff.c:5548
msgid "choose a diff algorithm"
msgstr "escoge un algoritmo para diff"
-#: diff.c:5437
+#: diff.c:5550
msgid "<text>"
msgstr "<texto>"
-#: diff.c:5438
+#: diff.c:5551
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "genera un diff usando algoritmo \"anchored diff\""
-#: diff.c:5440 diff.c:5449 diff.c:5452
+#: diff.c:5553 diff.c:5562 diff.c:5565
msgid "<mode>"
msgstr "<modo>"
-#: diff.c:5441
+#: diff.c:5554
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
"muestra diff por palabras usando <modo> para delimitar las palabras cambiadas"
-#: diff.c:5443 diff.c:5446 diff.c:5491
-msgid "<regex>"
-msgstr "<regex>"
-
-#: diff.c:5444
+#: diff.c:5557
msgid "use <regex> to decide what a word is"
msgstr "usa <regex> para decidir que palabra es"
-#: diff.c:5447
+#: diff.c:5560
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "equivalente a --word-diff=color --word-diff-regex=<regex>"
-#: diff.c:5450
+#: diff.c:5563
msgid "moved lines of code are colored differently"
msgstr "líneas movidas de código están coloreadas diferente"
-#: diff.c:5453
+#: diff.c:5566
msgid "how white spaces are ignored in --color-moved"
msgstr "como espacios en blanco son ignorados en --color-moved"
-#: diff.c:5456
+#: diff.c:5569
msgid "Other diff options"
msgstr "Otras opciones de diff"
-#: diff.c:5458
+#: diff.c:5571
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
"cuando ejecutado desde un subdir, excluye cambios del exterior y muestra "
"paths relativos"
-#: diff.c:5462
+#: diff.c:5575
msgid "treat all files as text"
msgstr "tratar todos los archivos como texto"
-#: diff.c:5464
+#: diff.c:5577
msgid "swap two inputs, reverse the diff"
msgstr "cambia dos inputs, invierte el diff"
-#: diff.c:5466
+#: diff.c:5579
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "termina con 1 si hubieron diferencias, de lo contrario con 0"
-#: diff.c:5468
+#: diff.c:5581
msgid "disable all output of the program"
msgstr "deshabilita todo el output del programa"
-#: diff.c:5470
+#: diff.c:5583
msgid "allow an external diff helper to be executed"
msgstr "permite la ejecución de un diff helper externo"
-#: diff.c:5472
+#: diff.c:5585
msgid "run external text conversion filters when comparing binary files"
msgstr ""
"ejecuta filtros de conversión de texto externos cuando comparando binarios"
-#: diff.c:5474
+#: diff.c:5587
msgid "<when>"
msgstr "<cuando>"
-#: diff.c:5475
+#: diff.c:5588
msgid "ignore changes to submodules in the diff generation"
msgstr "ignorar cambios a submódulos en la generación de diff"
-#: diff.c:5478
+#: diff.c:5591
msgid "<format>"
msgstr "<formato>"
-#: diff.c:5479
+#: diff.c:5592
msgid "specify how differences in submodules are shown"
msgstr "especifica como son mostradas las diferencias en submódulos"
-#: diff.c:5483
+#: diff.c:5596
msgid "hide 'git add -N' entries from the index"
msgstr "ocultar entradas 'git add -N' del index"
-#: diff.c:5486
+#: diff.c:5599
msgid "treat 'git add -N' entries as real in the index"
msgstr "trata entradas 'git add -N' como reales en el index"
-#: diff.c:5488
+#: diff.c:5601
msgid "<string>"
msgstr "<string>"
-#: diff.c:5489
+#: diff.c:5602
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
@@ -3633,7 +3836,7 @@
"busca por diferencias que cambien el número de ocurrencias para el string "
"especificado"
-#: diff.c:5492
+#: diff.c:5605
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
@@ -3641,23 +3844,35 @@
"busca por diferencias que cambien el número de ocurrencias para el regex "
"especificado"
-#: diff.c:5495
+#: diff.c:5608
msgid "show all changes in the changeset with -S or -G"
msgstr "mostrar todos los cambios en el changeset con -S o -G"
-#: diff.c:5498
+#: diff.c:5611
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "tratar <string> en -S como una expresión regular extendida de POSIX"
-#: diff.c:5501
+#: diff.c:5614
msgid "control the order in which files appear in the output"
msgstr "controlar el orden en el que los archivos aparecen en la salida"
-#: diff.c:5502
+#: diff.c:5615 diff.c:5618
+msgid "<path>"
+msgstr "<ruta>"
+
+#: diff.c:5616
+msgid "show the change in the specified path first"
+msgstr "mostrar el cambio en la ruta especificada primero"
+
+#: diff.c:5619
+msgid "skip the output to the specified path"
+msgstr "saltar el output de la ruta especificada"
+
+#: diff.c:5621
msgid "<object-id>"
msgstr "<id-objeto>"
-#: diff.c:5503
+#: diff.c:5622
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
@@ -3665,33 +3880,33 @@
"busca por diferencias que cambien el número de ocurrencias para el objeto "
"especificado"
-#: diff.c:5505
+#: diff.c:5624
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5506
+#: diff.c:5625
msgid "select files by diff type"
msgstr "selecciona archivos por tipo de diff"
-#: diff.c:5508
+#: diff.c:5627
msgid "<file>"
msgstr "<archivo>"
-#: diff.c:5509
+#: diff.c:5628
msgid "Output to a specific file"
msgstr "Output a un archivo específico"
-#: diff.c:6164
+#: diff.c:6285
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
"detección de cambio de nombre inexacta fue saltada por haber muchos archivos."
-#: diff.c:6167
+#: diff.c:6288
msgid "only found copies from modified paths due to too many files."
msgstr ""
"solo se encontraron copias de rutas modificadas por haber muchos archivos."
-#: diff.c:6170
+#: diff.c:6291
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -3699,85 +3914,99 @@
"tal vez quieras configurar la variable %s para por lo menos %d y volver a "
"intentar el comando."
-#: dir.c:555
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "falló al leer orden de archivos '%s'"
+
+#: diffcore-rename.c:786
+msgid "Performing inexact rename detection"
+msgstr "Realizando una detección de cambios de nombre inexacta"
+
+#: diffcore-rotate.c:29
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr "No hay ruta '%s' en el diff"
+
+#: dir.c:578
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
msgstr ""
"ruta especificada '%s' no concordó con ningún archivo(s) conocido por git"
-#: dir.c:695 dir.c:724 dir.c:737
+#: dir.c:718 dir.c:747 dir.c:760
#, c-format
msgid "unrecognized pattern: '%s'"
msgstr "patrón desconocido: '%s'"
-#: dir.c:754 dir.c:768
+#: dir.c:777 dir.c:791
#, c-format
msgid "unrecognized negative pattern: '%s'"
msgstr "patrón negativo no reconocido: '%s'"
-#: dir.c:786
+#: dir.c:809
#, c-format
msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
msgstr ""
"tu archivo sparse-checkout tal vez tenga errores: patrón '%s' está repetido"
-#: dir.c:796
+#: dir.c:819
msgid "disabling cone pattern matching"
msgstr "deshabilitar coincidencia de patrónes cono"
-#: dir.c:1173
+#: dir.c:1198
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "no se puede usar %s como archivo de exclusión"
-#: dir.c:2144
+#: dir.c:2305
#, c-format
msgid "could not open directory '%s'"
msgstr "no se pudo abrir el directorio '%s'"
-#: dir.c:2479
+#: dir.c:2605
msgid "failed to get kernel name and information"
msgstr "falló al conseguir la información y nombre del kernel"
-#: dir.c:2603
+#: dir.c:2729
msgid "untracked cache is disabled on this system or location"
msgstr "untracked cache está desactivado en este sistema o ubicación"
-#: dir.c:3407
+#: dir.c:3534
#, c-format
msgid "index file corrupt in repo %s"
msgstr "archivo índice corrompido en repositorio %s"
-#: dir.c:3452 dir.c:3457
+#: dir.c:3579 dir.c:3584
#, c-format
msgid "could not create directories for %s"
msgstr "no se pudo crear directorios para %s"
-#: dir.c:3486
+#: dir.c:3613
#, 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'"
-#: environment.c:149
+#: environment.c:152
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "ruta de namespace de git mala \"%s\""
-#: environment.c:331
+#: environment.c:335
#, c-format
msgid "could not set GIT_DIR to '%s'"
msgstr "no se pudo configurar GIT_DIR a '%s'"
@@ -3787,251 +4016,273 @@
msgid "too many args to run %s"
msgstr "demasiados argumentos para correr %s"
-#: fetch-pack.c:150
+#: fetch-pack.c:177
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: lista poco profunda esperada"
-#: fetch-pack.c:153
+#: fetch-pack.c:180
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr ""
"git fetch-pack: se esperaba un flush packet luego de la lista superficial"
-#: fetch-pack.c:164
+#: fetch-pack.c:191
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo un flush packet"
-#: fetch-pack.c:184
+#: fetch-pack.c:211
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: se esperaba ACK/NAK, se obtuvo '%s'"
-#: fetch-pack.c:195
+#: fetch-pack.c:222
msgid "unable to write to remote"
msgstr "no se puede escribir al remoto"
-#: fetch-pack.c:257
+#: fetch-pack.c:283
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc requiere multi_ack_detailed"
-#: fetch-pack.c:356 fetch-pack.c:1340
+#: fetch-pack.c:378 fetch-pack.c:1457
#, c-format
msgid "invalid shallow line: %s"
msgstr "línea poco profunda inválida: %s"
-#: fetch-pack.c:362 fetch-pack.c:1346
+#: fetch-pack.c:384 fetch-pack.c:1463
#, c-format
msgid "invalid unshallow line: %s"
msgstr "línea superficial inválida: %s"
-#: fetch-pack.c:364 fetch-pack.c:1348
+#: fetch-pack.c:386 fetch-pack.c:1465
#, c-format
msgid "object not found: %s"
msgstr "objeto no encontrado: %s"
-#: fetch-pack.c:367 fetch-pack.c:1351
+#: fetch-pack.c:389 fetch-pack.c:1468
#, c-format
msgid "error in object: %s"
msgstr "error en objeto: %s"
-#: fetch-pack.c:369 fetch-pack.c:1353
+#: fetch-pack.c:391 fetch-pack.c:1470
#, c-format
msgid "no shallow found: %s"
msgstr "superficie no encontrada: %s"
-#: fetch-pack.c:372 fetch-pack.c:1357
+#: fetch-pack.c:394 fetch-pack.c:1474
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "se esperaba shallow/unshallow, se obtuvo %s"
-#: fetch-pack.c:414
+#: fetch-pack.c:434
#, c-format
msgid "got %s %d %s"
msgstr "se obtuvo %s %d %s"
-#: fetch-pack.c:431
+#: fetch-pack.c:451
#, c-format
msgid "invalid commit %s"
msgstr "commit inválido %s"
-#: fetch-pack.c:462
+#: fetch-pack.c:482
msgid "giving up"
msgstr "rindiéndose"
-#: fetch-pack.c:475 progress.c:323
+#: fetch-pack.c:495 progress.c:339
msgid "done"
msgstr "listo"
-#: fetch-pack.c:487
+#: fetch-pack.c:507
#, c-format
msgid "got %s (%d) %s"
msgstr "se obtuvo %s (%d) %s"
-#: fetch-pack.c:533
+#: fetch-pack.c:543
#, c-format
msgid "Marking %s as complete"
msgstr "Marcando %s como completa"
-#: fetch-pack.c:754
+#: fetch-pack.c:758
#, c-format
msgid "already have %s (%s)"
msgstr "ya se tiene %s (%s)"
-#: fetch-pack.c:818
+#: fetch-pack.c:844
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: no se puede extraer un demultiplexor de banda lateral"
-#: fetch-pack.c:826
+#: fetch-pack.c:852
msgid "protocol error: bad pack header"
msgstr "error de protocolo: paquete de header erróneo"
-#: fetch-pack.c:900
+#: fetch-pack.c:946
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: no se puede quitar %s"
-#: fetch-pack.c:916
+#: fetch-pack.c:952
+msgid "fetch-pack: invalid index-pack output"
+msgstr "fetch-pack: salida de paquete de índice no válida"
+
+#: fetch-pack.c:969
#, c-format
msgid "%s failed"
msgstr "%s falló"
-#: fetch-pack.c:918
+#: fetch-pack.c:971
msgid "error in sideband demultiplexer"
msgstr "error en demultiplexor de banda lateral"
-#: fetch-pack.c:965
+#: fetch-pack.c:1031
#, c-format
msgid "Server version is %.*s"
msgstr "Versión de servidor es %.*s"
-#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985
-#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001
-#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017
-#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039
+#: fetch-pack.c:1039 fetch-pack.c:1045 fetch-pack.c:1048 fetch-pack.c:1054
+#: fetch-pack.c:1058 fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070
+#: fetch-pack.c:1074 fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086
+#: fetch-pack.c:1092 fetch-pack.c:1098 fetch-pack.c:1103 fetch-pack.c:1108
#, c-format
msgid "Server supports %s"
msgstr "El servidor soporta %s"
-#: fetch-pack.c:972
+#: fetch-pack.c:1041
msgid "Server does not support shallow clients"
msgstr "El servidor no soporta clientes superficiales"
-#: fetch-pack.c:1032
+#: fetch-pack.c:1101
msgid "Server does not support --shallow-since"
msgstr "El servidor no soporta --shalow-since"
-#: fetch-pack.c:1037
+#: fetch-pack.c:1106
msgid "Server does not support --shallow-exclude"
msgstr "El servidor no soporta --shalow-exclude"
-#: fetch-pack.c:1041
+#: fetch-pack.c:1110
msgid "Server does not support --deepen"
msgstr "El servidor no soporta --deepen"
-#: fetch-pack.c:1058
+#: fetch-pack.c:1112
+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:1125
msgid "no common commits"
msgstr "no hay commits comunes"
-#: fetch-pack.c:1070 fetch-pack.c:1536
+#: fetch-pack.c:1138 fetch-pack.c:1682
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: fetch falló."
-#: fetch-pack.c:1209
+#: fetch-pack.c:1265
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "algoritmos no compatibles: cliente %s; servidor %s"
+
+#: fetch-pack.c:1269
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "servidor no soporta el algoritmo '%s'"
+
+#: fetch-pack.c:1289
msgid "Server does not support shallow requests"
msgstr "El servidor no soporta peticiones superficiales"
-#: fetch-pack.c:1216
+#: fetch-pack.c:1296
msgid "Server supports filter"
msgstr "El servidor soporta filtro"
-#: fetch-pack.c:1239
+#: fetch-pack.c:1335
msgid "unable to write request to remote"
msgstr "no se puede escribir request al remoto"
-#: fetch-pack.c:1257
+#: fetch-pack.c:1353
#, c-format
msgid "error reading section header '%s'"
msgstr "error leyendo sección header '%s'"
-#: fetch-pack.c:1263
+#: fetch-pack.c:1359
#, c-format
msgid "expected '%s', received '%s'"
msgstr "se esperaba '%s', se recibió '%s'"
-#: fetch-pack.c:1303
+#: fetch-pack.c:1420
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "línea de confirmación inesperada: '%s'"
-#: fetch-pack.c:1308
+#: fetch-pack.c:1425
#, c-format
msgid "error processing acks: %d"
msgstr "error procesando acks: %d"
-#: fetch-pack.c:1318
+#: fetch-pack.c:1435
msgid "expected packfile to be sent after 'ready'"
msgstr "espere que el packfile sea mandado luego del 'listo'"
-#: fetch-pack.c:1320
+#: fetch-pack.c:1437
msgid "expected no other sections to be sent after no 'ready'"
msgstr "espere que ninguna otra sección sea enviada luego del 'listo'"
-#: fetch-pack.c:1362
+#: fetch-pack.c:1479
#, c-format
msgid "error processing shallow info: %d"
msgstr "error procesando información superficial: %d"
-#: fetch-pack.c:1409
+#: fetch-pack.c:1526
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "se esperaba wanted-ref, se obtuvo '%s'"
-#: fetch-pack.c:1414
+#: fetch-pack.c:1531
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "wanted-ref inesperado: '%s'"
-#: fetch-pack.c:1419
+#: fetch-pack.c:1536
#, c-format
msgid "error processing wanted refs: %d"
msgstr "error procesando refs deseadas: %d"
-#: fetch-pack.c:1762
+#: fetch-pack.c:1566
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack: se espera un paquete final de respuesta"
+
+#: fetch-pack.c:1960
msgid "no matching remote head"
msgstr "no concuerda el head remoto"
-#: fetch-pack.c:1785 builtin/clone.c:689
+#: fetch-pack.c:1983 builtin/clone.c:693
msgid "remote did not send all necessary objects"
msgstr "remoto no mando todos los objetos necesarios"
-#: fetch-pack.c:1812
+#: fetch-pack.c:2010
#, c-format
msgid "no such remote ref %s"
msgstr "no existe ref remota %s"
-#: fetch-pack.c:1815
+#: fetch-pack.c:2013
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "El servidor no permite solicitudes de objetos inadvertidos %s"
-#: gpg-interface.c:408
-msgid "gpg failed to sign the data"
-msgstr "gpg falló al firmar la data"
-
-#: gpg-interface.c:434
+#: gpg-interface.c:273
msgid "could not create temporary file"
msgstr "no se pudo crear archivo temporal"
-#: gpg-interface.c:437
+#: gpg-interface.c:276
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "falló al escribir la firma separada para '%s'"
+#: gpg-interface.c:470
+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:668
+#: grep.c:543
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
@@ -4039,18 +4290,18 @@
"el patrón provisto contiene bytes NULL (via -f <archivo>). Esto solo es "
"soportado con -P bajo PCRE v2"
-#: grep.c:2128
+#: grep.c:1906
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': no es posible leer %s"
-#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82
+#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr "falló al marcar '%s'"
-#: grep.c:2156
+#: grep.c:1934
#, c-format
msgid "'%s': short read"
msgstr "'%s': lectura corta"
@@ -4107,41 +4358,41 @@
msgid "Low-level Commands / Internal Helpers"
msgstr "Comandos de bajo nivel / Auxiliares internos"
-#: help.c:298
+#: help.c:300
#, c-format
msgid "available git commands in '%s'"
msgstr "comandos disponibles de git en '%s'"
-#: help.c:305
+#: help.c:307
msgid "git commands available from elsewhere on your $PATH"
msgstr "comandos disponibles de git desde otro lugar en tu $PATH"
-#: help.c:314
+#: help.c:316
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:365 git.c:100
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "comando de listado de tipos no soportado '%s'"
-#: help.c:403
-msgid "The common Git guides are:"
-msgstr "Las guías comunes de Git son:"
+#: help.c:405
+msgid "The Git concept guides are:"
+msgstr "Las guías de conceptos de Git son:"
-#: help.c:512
+#: help.c:429
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:434
msgid "External commands"
msgstr "Comandos externos"
-#: help.c:532
+#: help.c:449
msgid "Command aliases"
msgstr "Aliases de comando"
-#: help.c:596
+#: help.c:527
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4150,31 +4401,31 @@
"'%s' parece ser un comando de git, pero no hemos\n"
"podido ejecutarlo. ¿Tal vez git-%s se ha roto?"
-#: help.c:655
-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
-#, 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
-#, c-format
-msgid "Continuing under the assumption that you meant '%s'."
-msgstr "Continuando asumiendo que quisiste decir '%s'."
-
-#: help.c:687
-#, 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:543 help.c:631
#, 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:591
+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:613
+#, 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:618
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr "Continuando asumiendo que quisiste decir '%s'."
+
+#: help.c:623
+#, 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:635
msgid ""
"\n"
"The most similar command is"
@@ -4188,16 +4439,16 @@
"\n"
"Los comandos más similares son"
-#: help.c:714
+#: help.c:675
msgid "git version [<options>]"
msgstr "git versión [<opciones>]"
-#: help.c:783
+#: help.c:730
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:787
+#: help.c:734
msgid ""
"\n"
"Did you mean this?"
@@ -4211,7 +4462,15 @@
"\n"
"¿Quisiste decir alguno de estos?"
-#: ident.c:349
+#: ident.c:353
+msgid "Author identity unknown\n"
+msgstr "Identidad del autor desconocido\n"
+
+#: ident.c:356
+msgid "Committer identity unknown\n"
+msgstr "Se desconoce la identidad del autor\n"
+
+#: ident.c:362
msgid ""
"\n"
"*** Please tell me who you are.\n"
@@ -4237,39 +4496,81 @@
"Omite --global para configurar tu identidad solo en este repositorio.\n"
"\n"
-#: ident.c:379
+#: ident.c:397
msgid "no email was given and auto-detection is disabled"
msgstr "no se entrego ningún email y la detección automática está desactivada"
-#: ident.c:384
+#: ident.c:402
#, c-format
msgid "unable to auto-detect email address (got '%s')"
msgstr "no es posible auto-detectar la dirección de correo (se obtuvo '%s')"
-#: ident.c:401
+#: ident.c:419
msgid "no name was given and auto-detection is disabled"
msgstr "no se entrego ningún nombre y la detección automática está desactivada"
-#: ident.c:407
+#: ident.c:425
#, c-format
msgid "unable to auto-detect name (got '%s')"
msgstr "no es posible auto-detectar el nombre (se obtuvo '%s')"
-#: ident.c:415
+#: ident.c:433
#, c-format
msgid "empty ident name (for <%s>) not allowed"
msgstr "no se puede tener un nombre vacío (para <%s>)"
-#: ident.c:421
+#: ident.c:439
#, c-format
msgid "name consists only of disallowed characters: %s"
msgstr "el nombre consiste solo de caracteres no permitidos: %s"
-#: ident.c:436 builtin/commit.c:635
+#: ident.c:454 builtin/commit.c:634
#, c-format
msgid "invalid date format: %s"
msgstr "formato de fecha inválido: %s"
+#: list-objects-filter-options.c:81
+msgid "expected 'tree:<depth>'"
+msgstr "se esperaba 'tree:<depth>'"
+
+#: list-objects-filter-options.c:96
+msgid "sparse:path filters support has been dropped"
+msgstr "soporte para filtros sparse:path ha sido discontinuado"
+
+#: list-objects-filter-options.c:109
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "filtro -spec inválido '%s'"
+
+#: list-objects-filter-options.c:125
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr "tienes que escapar el caracter en sub-filter-spec: '%c'"
+
+#: list-objects-filter-options.c:167
+msgid "expected something after combine:"
+msgstr "se espera algo luego de combine:"
+
+#: list-objects-filter-options.c:249
+msgid "multiple filter-specs cannot be combined"
+msgstr "no se pueden combinar múltiples tipos de especificaciones de filtro"
+
+#: list-objects-filter-options.c:361
+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.c:492
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "no es posible acceder al blob en '%s'"
+
+#: list-objects-filter.c:495
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "incapaz de analizar filtro de data en %s"
+
#: list-objects.c:127
#, c-format
msgid "entry '%s' in tree %s has tree mode, but is not a tree"
@@ -4285,43 +4586,7 @@
msgid "unable to load root tree for commit %s"
msgstr "no se puede cargar árbol raíz para commit %s"
-#: list-objects-filter.c:492
-#, c-format
-msgid "unable to access sparse blob in '%s'"
-msgstr "no es posible acceder al blob en '%s'"
-
-#: list-objects-filter.c:495
-#, c-format
-msgid "unable to parse sparse filter data in %s"
-msgstr "incapaz de analizar filtro de data en %s"
-
-#: list-objects-filter-options.c:58
-msgid "expected 'tree:<depth>'"
-msgstr "se esperaba 'tree:<depth>'"
-
-#: 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 "invalid filter-spec '%s'"
-msgstr "filtro -spec inválido '%s'"
-
-#: list-objects-filter-options.c:102
-#, c-format
-msgid "must escape char in sub-filter-spec: '%c'"
-msgstr "tienes que escapar el caracter en sub-filter-spec: '%c'"
-
-#: list-objects-filter-options.c:144
-msgid "expected something after combine:"
-msgstr "se espera algo luego de combine:"
-
-#: list-objects-filter-options.c:226
-msgid "multiple filter-specs cannot be combined"
-msgstr "no se pueden combinar múltiples tipos de especificaciones de filtro"
-
-#: lockfile.c:151
+#: lockfile.c:152
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
@@ -4341,20 +4606,270 @@
"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"
+#: ls-refs.c:37
+#, c-format
+msgid "invalid value '%s' for lsrefs.unborn"
+msgstr "valor inválido '%s' para lsrefs.unborn"
-#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913
-#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810
-#: builtin/stash.c:265
-msgid "unable to write new index file"
-msgstr "no es posible escribir el archivo índice"
+#: ls-refs.c:167
+msgid "expected flush after ls-refs arguments"
+msgstr "se esperaba un flush luego de argumentos ls-refs"
+
+#: merge-ort.c:888 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-ort.c:897 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-ort.c:906 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-ort.c:916 merge-ort.c:923
+#, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr "Nota: Fast-forward de submódulo %s a %s"
+
+#: merge-ort.c:944
+#, c-format
+msgid "Failed to merge submodule %s"
+msgstr "falló al fusionar el submódulo %s"
+
+#: merge-ort.c:951
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but a possible merge resolution exists:\n"
+"%s\n"
+msgstr ""
+"Falló al fusionar el submódulo %s, pero existen posibles soluciones de "
+"fusión:\n"
+"%s\n"
+
+#: merge-ort.c:955 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 ""
+"Si esto es correcto simplemente agrégalo al índice por ejemplo\n"
+"usando:\n"
+"\n"
+" git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"el cual aceptará esta sugerencia.\n"
+
+#: merge-ort.c:968
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but multiple possible merges exist:\n"
+"%s"
+msgstr ""
+"Falló al fusionar el submódulo %s, pero existen múltipes fusiones posibles:\n"
+"%s"
+
+#: merge-ort.c:1127 merge-recursive.c:1341
+msgid "Failed to execute internal merge"
+msgstr "Falló al ejecutar la fusión interna"
+
+#: merge-ort.c:1132 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-ort.c:1139 merge-recursive.c:1378
+#, c-format
+msgid "Auto-merging %s"
+msgstr "Auto-fusionando %s"
+
+#: merge-ort.c:1278 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 ""
+"CONFLICTO (cambio de nombre de directorio implícito): Archivo/directorio "
+"existente en %s se interpone con el cambio de nombres implícito, poniendo "
+"la(s) siguiente(s) ruta(s) aquí: %s."
+
+#: merge-ort.c:1288 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 ""
+"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-ort.c:1471
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
+"renamed to multiple other directories, with no destination getting a "
+"majority of the files."
+msgstr ""
+"CONFLICTO (división de cambio de nombre de directorio): No está claro dónde "
+"cambiar el nombre de %s; se le cambió el nombre a varios otros directorios, "
+"sin que ningún destino obtenga la mayoría de los archivos."
+
+#: merge-ort.c:1637 merge-recursive.c:2447
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr ""
+"PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue "
+"renombrado."
+
+#: merge-ort.c:1781 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 ""
+"Path actualizado: %s agregado en %s dentro de un directorio que fue "
+"renombrado en %s; moviéndolo a %s."
+
+#: merge-ort.c:1788 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 ""
+"Path actualizado: %s renombrado a %s en %s, dentro de un directorio que fue "
+"renombrado en %s; moviéndolo a %s."
+
+#: merge-ort.c:1801 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 ""
+"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-ort.c:1809 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 ""
+"CONFLICTO (ubicación de archivo): %s renombrado a %s en %s, dentro de un "
+"directorio que fue renombrado en %s, sugiriendo que tal vez debería ser "
+"movido a %s."
+
+#: merge-ort.c:1952
+#, c-format
+msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
+msgstr ""
+"CONFLICTO (renombrar / renombrar): %s renombrado a %s en %s y %s en %s."
+
+#: merge-ort.c:2047
+#, c-format
+msgid ""
+"CONFLICT (rename involved in collision): rename of %s -> %s has content "
+"conflicts AND collides with another path; this may result in nested conflict "
+"markers."
+msgstr ""
+"CONFLICTO (cambio de nombre involucrado en colisión): cambio de nombre de%s -"
+">%s tiene conflictos de contenido Y colisiona con otra ruta; esto puede "
+"resultar en marcadores de conflicto anidados."
+
+#: merge-ort.c:2066 merge-ort.c:2090
+#, c-format
+msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
+msgstr ""
+"CONFLICTO (renombrar / eliminar): %s renombrado a %s en %s, pero eliminado "
+"en %s."
+
+#: merge-ort.c:2735
+#, c-format
+msgid ""
+"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
+"%s instead."
+msgstr ""
+"CONFLICTO (archivo / directorio): directorio en el camino de%s de%s; "
+"moviéndolo a%s en su lugar."
+
+#: merge-ort.c:2808
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed %s "
+"of them so each can be recorded somewhere."
+msgstr ""
+"CONFLICTO (tipos distintos):%s tenía tipos diferentes en cada lado; "
+"renombrado%s de ellos para que cada uno pueda ser grabado en algún lugar."
+
+#: merge-ort.c:2812
+msgid "both"
+msgstr "ambos"
+
+#: merge-ort.c:2812
+msgid "one"
+msgstr "uno"
+
+#: merge-ort.c:2907 merge-recursive.c:3052
+msgid "content"
+msgstr "contenido"
+
+#: merge-ort.c:2909 merge-recursive.c:3056
+msgid "add/add"
+msgstr "agregar/agregar"
+
+#: merge-ort.c:2911 merge-recursive.c:3101
+msgid "submodule"
+msgstr "submódulo"
+
+#: merge-ort.c:2913 merge-recursive.c:3102
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "CONFLICTO (%s): Conflicto de fusión en %s"
+
+#: merge-ort.c:2938
+#, c-format
+msgid ""
+"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
+"of %s left in tree."
+msgstr ""
+"CONFLICTO (modificar / eliminar): %s eliminado en %s y modificado en %s. "
+"Versión %s de %s restante en el árbol."
+
+#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
+#. base, and 2-3) the trees for the two trees we're merging.
+#.
+#: merge-ort.c:3406
+#, c-format
+msgid "collecting merge info failed for trees %s, %s, %s"
+msgstr ""
+"La recopilación de información de fusión falló para los árboles %s, %s, %s"
+
+#: merge-ort-wrappers.c:13 merge-recursive.c:3661
+#, 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-ort-wrappers.c:33 merge-recursive.c:3436
+#, c-format
+msgid "Already up to date!"
+msgstr "¡Ya está actualizado!"
#: merge-recursive.c:356
msgid "(bad commit)\n"
@@ -4414,21 +4929,6 @@
msgid "do not know what to do with %06o %s '%s'"
msgstr "no se que hacer con %06o %s '%s'"
-#: 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: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: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:1213 merge-recursive.c:1225
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
@@ -4454,42 +4954,11 @@
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "Se encontró una posible solución de fusión para el submódulo:\n"
-#: merge-recursive.c:1259
-#, 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 ""
-"Si esto es correcto simplemente agrégalo al índice por ejemplo\n"
-"usando:\n"
-"\n"
-" git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"el cual aceptará esta sugerencia.\n"
-
#: 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:1341
-msgid "Failed to execute internal merge"
-msgstr "Falló al ejecutar la fusión interna"
-
-#: 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:1378
-#, c-format
-msgid "Auto-merging %s"
-msgstr "Auto-fusionando %s"
-
#: merge-recursive.c:1402
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
@@ -4541,7 +5010,7 @@
msgid "renamed"
msgstr "renombrado"
-#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117
+#: 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"
@@ -4583,14 +5052,14 @@
msgid " (left unresolved)"
msgstr " (dejado sin resolver)"
-#: merge-recursive.c:1793
+#: 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:2056
+#: merge-recursive.c:2068
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -4601,26 +5070,7 @@
"colocar %s porque el directorio %s fue renombrado a otros múltiples "
"directorios, sin ningún que contenga la mayoría de archivos."
-#: merge-recursive.c:2088
-#, 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 ""
-"CONFLICTO (cambio de nombre de directorio implícito): Archivo/directorio "
-"existente en %s se interpone con el cambio de nombres implícito, poniendo "
-"la(s) siguiente(s) ruta(s) aquí: %s."
-
-#: merge-recursive.c:2098
-#, 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 ""
-"CONFLICTO (cambio de nombre implícito): No se puede mapear más de una ruta "
-"para %s; cambio de nombre implícito intentó poner estas rutas: %s"
-
-#: merge-recursive.c:2190
+#: merge-recursive.c:2202
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -4629,337 +5079,273 @@
"CONFLICTO (renombrar/renombrar): Renombrar directorio %s->%s en %s. "
"Renombrar directorio %s->%s en %s"
-#: merge-recursive.c:2435
-#, c-format
-msgid ""
-"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
-"renamed."
-msgstr ""
-"PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue "
-"renombrado."
-
-#: merge-recursive.c:2961
+#: merge-recursive.c:2973
#, c-format
msgid "cannot read object %s"
msgstr "no se pudo leer el objeto %s"
-#: merge-recursive.c:2964
+#: merge-recursive.c:2976
#, c-format
msgid "object %s is not a blob"
msgstr "objeto %s no es un blob"
-#: merge-recursive.c:3028
+#: merge-recursive.c:3040
msgid "modify"
msgstr "modificar"
-#: merge-recursive.c:3028
+#: merge-recursive.c:3040
msgid "modified"
msgstr "modificado"
-#: merge-recursive.c:3040
-msgid "content"
-msgstr "contenido"
-
-#: merge-recursive.c:3044
-msgid "add/add"
-msgstr "agregar/agregar"
-
-#: merge-recursive.c:3067
+#: merge-recursive.c:3079
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Saltado %s (fusionado como existente)"
-#: merge-recursive.c:3089 git-submodule.sh:1003
-msgid "submodule"
-msgstr "submódulo"
-
-#: merge-recursive.c:3090
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "CONFLICTO (%s): Conflicto de fusión en %s"
-
-#: merge-recursive.c:3120
+#: merge-recursive.c:3132
#, c-format
msgid "Adding as %s instead"
msgstr "Agregando más bien como %s"
-#: merge-recursive.c:3203
-#, c-format
-msgid ""
-"Path updated: %s added in %s inside a directory that was renamed in %s; "
-"moving it to %s."
-msgstr ""
-"Path actualizado: %s agregado en %s dentro de un directorio que fue "
-"renombrado en %s; moviéndolo a %s."
-
-#: merge-recursive.c:3206
-#, c-format
-msgid ""
-"CONFLICT (file location): %s added in %s inside a directory that was renamed "
-"in %s, suggesting it should perhaps be moved to %s."
-msgstr ""
-"CONFLICTO (ubicación de archivo): %s agregado en %s dentro de un directorio "
-"que fue renombrado en %s, sugerimos que debería ser movido a %s."
-
-#: merge-recursive.c:3210
-#, c-format
-msgid ""
-"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
-"%s; moving it to %s."
-msgstr ""
-"Path actualizado: %s renombrado a %s en %s, dentro de un directorio que fue "
-"renombrado en %s; moviéndolo a %s."
-
-#: merge-recursive.c:3213
-#, 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 ""
-"CONFLICTO (ubicación de archivo): %s renombrado a %s en %s, dentro de un "
-"directorio que fue renombrado en %s, sugiriendo que tal vez debería ser "
-"movido a %s."
-
-#: merge-recursive.c:3327
+#: merge-recursive.c:3339
#, c-format
msgid "Removing %s"
msgstr "Eliminando %s"
-#: merge-recursive.c:3350
+#: merge-recursive.c:3362
msgid "file/directory"
msgstr "archivo/directorio"
-#: merge-recursive.c:3355
+#: merge-recursive.c:3367
msgid "directory/file"
msgstr "directorio/archivo"
-#: merge-recursive.c:3362
+#: 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:3371
+#: merge-recursive.c:3383
#, c-format
msgid "Adding %s"
msgstr "Agregando %s"
-#: merge-recursive.c:3380
+#: 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:3424
-msgid "Already up to date!"
-msgstr "¡Ya está actualizado!"
-
-#: merge-recursive.c:3433
+#: 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:3537
+#: merge-recursive.c:3539
msgid "Merging:"
msgstr "Fusionando:"
-#: merge-recursive.c:3550
+#: merge-recursive.c:3552
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "se encontró %u ancestro común:"
msgstr[1] "se encontraron %u ancestros comunes:"
-#: merge-recursive.c:3600
+#: merge-recursive.c:3602
msgid "merge returned no commit"
msgstr "la fusión no devolvió ningún commit"
-#: merge-recursive.c:3659
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-" %s"
-msgstr ""
-"Los cambios locales de los siguientes archivos serán sobreescritos por "
-"merge:\n"
-" %s"
-
-#: merge-recursive.c:3756
+#: merge-recursive.c:3758
#, c-format
msgid "Could not parse object '%s'"
msgstr "No se pudo analizar el objeto '%s'"
-#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877
+#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896
+#: builtin/stash.c:471
msgid "Unable to write index."
msgstr "Incapaz de escribir el índice."
-#: midx.c:68
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "falló al leer la cache"
+
+#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917
+#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817
+#: builtin/stash.c:265
+msgid "unable to write new index file"
+msgstr "no es posible escribir el archivo índice"
+
+#: midx.c:62
+msgid "multi-pack-index OID fanout is of the wrong size"
+msgstr ""
+"El abanico de OID de índice de paquetes múltiples es del tamaño incorrecto"
+
+#: midx.c:93
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "archivo multi-pack-index %s es muy pequeño"
-#: midx.c:84
+#: midx.c:109
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "firma de multi-pack-index 0x%08x no concuerda con firma 0x%08x"
-#: midx.c:89
+#: midx.c:114
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "versión %d de multi-pack-index no reconocida"
-#: midx.c:94
+#: midx.c:119
#, c-format
-msgid "hash version %u does not match"
-msgstr "versión de hash %u no concuerda"
-
-#: midx.c:108
-msgid "invalid chunk offset (too large)"
-msgstr "offset inválido del conjunto (muy grande)"
-
-#: midx.c:132
-msgid "terminating multi-pack-index chunk id appears earlier than expected"
+msgid "multi-pack-index hash version %u does not match version %u"
msgstr ""
-"terminando multi-pack-index porque el id del conjunto aparece antes de lo "
-"esperado"
+"La versión de hash de índice de paquetes múltiples %u no coincide con la "
+"versión %u"
-#: midx.c:145
+#: midx.c:136
msgid "multi-pack-index missing required pack-name chunk"
msgstr "multi-pack-index le falta el conjunto pack-name requerido"
-#: midx.c:147
+#: midx.c:138
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "multi-pack-index le falta el conjunto OID fanout requerido"
-#: midx.c:149
+#: midx.c:140
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "multi-pack-index le falta el conjunto OID fanout requerido"
-#: midx.c:151
+#: midx.c:142
msgid "multi-pack-index missing required object offsets chunk"
msgstr "multi-pack-index le falta el conjunto de offset del objeto requerido"
-#: midx.c:165
+#: midx.c:158
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "multi-pack-index nombres de paquete fuera de orden:'%s' antes '%s'"
-#: midx.c:210
+#: midx.c:202
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "mal pack-int-id: %u (%u paquetes totales)"
-#: midx.c:260
+#: midx.c:252
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr "multi-pack-index guarda un offset de 64-bit, pero off_t es muy pequeño"
-#: midx.c:288
-msgid "error preparing packfile from multi-pack-index"
-msgstr "error preparando packfile de multi-pack-index"
-
-#: midx.c:472
+#: midx.c:467
#, c-format
msgid "failed to add packfile '%s'"
msgstr "falló al agregar packfile '%s'"
-#: midx.c:478
+#: midx.c:473
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "falló al abrir pack-index '%s'"
-#: midx.c:538
+#: midx.c:533
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "falló al ubicar objeto %d en packfile"
-#: midx.c:842
+#: midx.c:821
msgid "Adding packfiles to multi-pack-index"
msgstr "Agregando packfiles a multi-pack-index"
-#: midx.c:875
+#: midx.c:855
#, c-format
msgid "did not see pack-file %s to drop"
msgstr "no se vió pack-file %s caer"
-#: midx.c:973
-msgid "Writing chunks to multi-pack-index"
-msgstr "Escribiendo chunks a multi-pack-index"
+#: midx.c:904
+msgid "no pack files to index."
+msgstr "no hay archivos pack para indexar."
-#: midx.c:1052
+#: midx.c:965
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "falló al limpiar multi-pack-index en %s"
-#: midx.c:1108
+#: midx.c:1021
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr ""
+"El archivo de índice de paquetes múltiples existe, pero no se pudo analizar"
+
+#: midx.c:1029
msgid "Looking for referenced packfiles"
msgstr "Buscando por packfiles referidos"
-#: midx.c:1123
+#: midx.c:1044
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
"oid fanout fuera de orden: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:1128
+#: midx.c:1049
+msgid "the midx contains no oid"
+msgstr "el midx no contiene oid"
+
+#: midx.c:1058
msgid "Verifying OID order in multi-pack-index"
msgstr "Verificando orden de OID en multi-pack-index"
-#: midx.c:1137
+#: midx.c:1067
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "oid lookup fuera de orden: oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1157
+#: midx.c:1087
msgid "Sorting objects by packfile"
msgstr "Ordenando objetos por packfile"
-#: midx.c:1164
+#: midx.c:1094
msgid "Verifying object offsets"
msgstr "Verificando offsets de objetos"
-#: midx.c:1180
+#: midx.c:1110
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "fallo al cargar entrada pack para oid[%d] = %s"
-#: midx.c:1186
+#: midx.c:1116
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "falló al cargar el pack-index para packfile %s"
-#: midx.c:1195
+#: midx.c:1125
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "offset para objeto incorrecto oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-#: midx.c:1220
+#: midx.c:1150
msgid "Counting referenced objects"
msgstr "Contando objetos no referenciados"
-#: midx.c:1230
+#: midx.c:1160
msgid "Finding and deleting unreferenced packfiles"
msgstr "Encontrando y borrando packfiles sin referencias"
-#: midx.c:1388
+#: midx.c:1351
msgid "could not start pack-objects"
msgstr "no se pudo empezar los pack-objetcts"
-#: midx.c:1407
+#: midx.c:1371
msgid "could not finish pack-objects"
msgstr "no se pudo finalizar pack-objetcts"
-#: name-hash.c:537
+#: name-hash.c:538
#, c-format
msgid "unable to create lazy_dir thread: %s"
msgstr "no es posible crear hilo lazy_dir: %s"
-#: name-hash.c:559
+#: name-hash.c:560
#, c-format
msgid "unable to create lazy_name thread: %s"
msgstr "no es posible crear hilo lazy_name: %s"
-#: name-hash.c:565
+#: name-hash.c:566
#, c-format
msgid "unable to join lazy_name thread: %s"
msgstr "no es posible unir hilo lazy_name: %s"
@@ -5006,6 +5392,363 @@
msgid "Bad %s value: '%s'"
msgstr "Valor erróneo para %s: '%s'"
+#: object-file.c:480
+#, 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"
+
+#: object-file.c:531
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "incapaz de normalizar la ruta de objeto alterno: %s"
+
+#: object-file.c:603
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr "%s: ignorando espacios de objetos alternos, anidado muy profundo"
+
+#: object-file.c:610
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "incapaz de normalizar directorio de objeto: %s"
+
+#: object-file.c:653
+msgid "unable to fdopen alternates lockfile"
+msgstr "no es posible hacer fdopen en lockfile alternos"
+
+#: object-file.c:671
+msgid "unable to read alternates file"
+msgstr "no es posible leer archivos alternos"
+
+#: object-file.c:678
+msgid "unable to move new alternates file into place"
+msgstr "no es posible mover archivos alternos en el lugar"
+
+#: object-file.c:713
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "ruta '%s' no existe"
+
+#: object-file.c:734
+#, 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."
+
+#: object-file.c:740
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "repositorio de referencia '%s' no es un repositorio local."
+
+#: object-file.c:746
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "repositorio de referencia '%s' es superficial (shallow)"
+
+#: object-file.c:754
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "repositorio de referencia '% s' está injertado"
+
+#: object-file.c:814
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "línea inválida mientras se analizaban refs alternas: %s"
+
+#: object-file.c:964
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr "intentando usar mmap %<PRIuMAX> sobre límite %<PRIuMAX>"
+
+#: object-file.c:985
+msgid "mmap failed"
+msgstr "mmap falló"
+
+#: object-file.c:1149
+#, c-format
+msgid "object file %s is empty"
+msgstr "archivo de objeto %s está vacío"
+
+#: object-file.c:1284 object-file.c:2477
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "objeto perdido corrupto '%s'"
+
+#: object-file.c:1286 object-file.c:2481
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "basura al final del objeto perdido '%s'"
+
+#: object-file.c:1328
+msgid "invalid object type"
+msgstr "tipo de objeto inválido"
+
+#: object-file.c:1412
+#, c-format
+msgid "unable to unpack %s header with --allow-unknown-type"
+msgstr "no es posible desempacar header %s con --allow-unknown-type"
+
+#: object-file.c:1415
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "incapaz de desempaquetar header %s"
+
+#: object-file.c:1421
+#, c-format
+msgid "unable to parse %s header with --allow-unknown-type"
+msgstr "no es posible analizar header %s con --allow-unknown-type"
+
+#: object-file.c:1424
+#, c-format
+msgid "unable to parse %s header"
+msgstr "incapaz de analizar header %s"
+
+#: object-file.c:1651
+#, c-format
+msgid "failed to read object %s"
+msgstr "falló al leer objeto %s"
+
+#: object-file.c:1655
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "reemplazo %s no encontrado para %s"
+
+#: object-file.c:1659
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "objeto perdido %s (guardado en %s) está corrompido"
+
+#: object-file.c:1663
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "paquete de objeto %s (guardado en %s) está corrompido"
+
+#: object-file.c:1768
+#, c-format
+msgid "unable to write file %s"
+msgstr "no es posible escribir archivo %s"
+
+#: object-file.c:1775
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "no se pudo poner permisos a '%s'"
+
+#: object-file.c:1782
+msgid "file write error"
+msgstr "falló de escritura"
+
+#: object-file.c:1802
+msgid "error when closing loose object file"
+msgstr "error cerrando el archivo de objeto suelto"
+
+#: object-file.c:1867
+#, 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"
+
+#: object-file.c:1869
+msgid "unable to create temporary file"
+msgstr "no es posible crear un archivo temporal"
+
+#: object-file.c:1893
+msgid "unable to write loose object file"
+msgstr "no es posible escribir el archivo de objeto suelto"
+
+#: object-file.c:1899
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "no es posible desinflar el objeto nuevo %s (%d)"
+
+#: object-file.c:1903
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "deflateEnd en objeto %s falló (%d)"
+
+#: object-file.c:1907
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "confundido por fuente de data de objetos inestable para %s"
+
+#: object-file.c:1917 builtin/pack-objects.c:1097
+#, c-format
+msgid "failed utime() on %s"
+msgstr "falló utime() en %s"
+
+#: object-file.c:1994
+#, c-format
+msgid "cannot read object for %s"
+msgstr "no se pudo leer el objeto para %s"
+
+#: object-file.c:2045
+msgid "corrupt commit"
+msgstr "commit corrupto"
+
+#: object-file.c:2053
+msgid "corrupt tag"
+msgstr "tag corrupto"
+
+#: object-file.c:2153
+#, c-format
+msgid "read error while indexing %s"
+msgstr "error leyendo al indexar %s"
+
+#: object-file.c:2156
+#, c-format
+msgid "short read while indexing %s"
+msgstr "lectura corta al indexar %s"
+
+#: object-file.c:2229 object-file.c:2239
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr "%s: falló al insertar en la base de datos"
+
+#: object-file.c:2245
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s: tipo de archivo no soportado"
+
+#: object-file.c:2269
+#, c-format
+msgid "%s is not a valid object"
+msgstr "%s no es objeto válido"
+
+#: object-file.c:2271
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s no es un objeto '%s' válido"
+
+#: object-file.c:2298 builtin/index-pack.c:192
+#, c-format
+msgid "unable to open %s"
+msgstr "no es posible abrir %s"
+
+#: object-file.c:2488 object-file.c:2541
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "hash no concuerda para %s (se esperaba %s)"
+
+#: object-file.c:2512
+#, c-format
+msgid "unable to mmap %s"
+msgstr "no es posible hacer mmap a %s"
+
+#: object-file.c:2517
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "incapaz de desempaquetar header de %s"
+
+#: object-file.c:2523
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "incapaz de analizar header de %s"
+
+#: object-file.c:2534
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "no es posible desempaquetar contenidos de %s"
+
+#: object-name.c:486
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr "El ID de objeto corto %s es ambiguo"
+
+#: object-name.c:497
+msgid "The candidates are:"
+msgstr "Los candidatos son:"
+
+#: object-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 normalmente nunca crea una ref que termine con 40 caracteres hex\n"
+"porque esto sería ignorado cuando solo se especifiquen 40-hex. Estas refs\n"
+"tal vez sean creadas por error. Por ejemplo,\n"
+"\n"
+" git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"donde \"$br\" está de alguna manera vacía y una ref de 40-hex es creada. Por "
+"favor\n"
+"examina estas refs y tal vez bórralas. Silencia este mensaje \n"
+"ejecutando \"git config advice.objectNameWarning false\""
+
+#: object-name.c:916
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "log para '%.*s' solo va hasta %s"
+
+#: object-name.c:924
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "log para '%.*s' solo tiene %d entradas"
+
+#: object-name.c:1702
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr "la ruta '%s' existe en disco, pero no en '%.*s'"
+
+#: object-name.c:1708
+#, 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'?"
+
+#: object-name.c:1717
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "ruta '%s' no existe en '%.*s'"
+
+#: object-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 ""
+"ruta '%s' está en el index, pero no en stage %d\n"
+"ayuda:¿Quisiste decir: '%d:%s'?"
+
+#: object-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 ""
+"ruta '%s' está en el index, pero no '%s'\n"
+"ayuda:¿Quisiste decir ':%d:%s' o ':%d:./%s'?"
+
+#: object-name.c:1769
+#, 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"
+
+#: object-name.c:1771
+#, 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)"
+
+#: object-name.c:1784
+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"
+
+#: object-name.c:1922
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "nombre de objeto no válido: '%.*s'."
+
#: object.c:53
#, c-format
msgid "invalid object type \"%s\""
@@ -5031,26 +5774,95 @@
msgid "hash mismatch %s"
msgstr "hash no concuerda %s"
-#: packfile.c:629
+#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226
+#, c-format
+msgid "unable to get size of %s"
+msgstr "no se pudo obtener el tamaño de %s"
+
+#: pack-bitmap.c:1489 builtin/rev-list.c:92
+#, c-format
+msgid "unable to get disk usage of %s"
+msgstr "no se puede obtener el uso de disco de %s"
+
+#: pack-revindex.c:220
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr "El archivo de índice inverso %s es demasiado pequeño"
+
+#: pack-revindex.c:225
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr "El archivo de índice inverso %s está dañado"
+
+#: pack-revindex.c:233
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr "El archivo de índice inverso %s tiene una firma desconocida"
+
+#: pack-revindex.c:237
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr "archivo reverse-index %s tiene una versión no soportada %<PRIu32>"
+
+#: pack-revindex.c:242
+#, c-format
+msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
+msgstr "archivo reverse-index %s tiene un id de hash no soportado %<PRIu32>"
+
+#: pack-write.c:236
+msgid "cannot both write and verify reverse index"
+msgstr "no puede escribir y verificar el índice inverso"
+
+#: pack-write.c:257
+#, c-format
+msgid "could not stat: %s"
+msgstr "no se pudo estad: %s"
+
+#: pack-write.c:269
+#, c-format
+msgid "failed to make %s readable"
+msgstr "no pudo hacer %s legible"
+
+#: pack-write.c:508
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr "no se pudo escribir el archivo promisor '%s'"
+
+#: packfile.c:625
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset antes del final del paquete (broken .idx?)"
-#: packfile.c:1899
+#: packfile.c:1934
#, 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?)"
-#: packfile.c:1903
+#: packfile.c:1938
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
"offset más allá del índice de fin de paquete para %s (¿índice truncado?)"
-#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134
+#: parse-options-cb.c:20 parse-options-cb.c:24
#, c-format
-msgid "unable to get size of %s"
-msgstr "no se pudo obtener el tamaño de %s"
+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:132 parse-options-cb.c:149
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "nombre de objeto mal formado '%s'"
#: parse-options.c:38
#, c-format
@@ -5092,26 +5904,31 @@
msgid "did you mean `--%s` (with two dashes)?"
msgstr "¿quisiste decir `--%s` (con dos guiones)?"
-#: parse-options.c:857
+#: parse-options.c:666 parse-options.c:971
+#, c-format
+msgid "alias of --%s"
+msgstr "alias de --%s"
+
+#: parse-options.c:862
#, c-format
msgid "unknown option `%s'"
msgstr "opción `%s' desconocida"
-#: parse-options.c:859
+#: parse-options.c:864
#, c-format
msgid "unknown switch `%c'"
msgstr "switch desconocido `%c'"
-#: parse-options.c:861
+#: parse-options.c:866
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "opción desconocida en string no ascii: `%s'"
-#: parse-options.c:885
+#: parse-options.c:890
msgid "..."
msgstr "..."
-#: parse-options.c:904
+#: parse-options.c:909
#, c-format
msgid "usage: %s"
msgstr "uso: %s"
@@ -5119,45 +5936,20 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:910
+#: parse-options.c:915
#, c-format
msgid " or: %s"
msgstr " o: %s"
-#: parse-options.c:913
+#: parse-options.c:918
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:952
+#: parse-options.c:957
msgid "-NUM"
msgstr "-NUM"
-#: parse-options.c:966
-#, 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:915
#, c-format
msgid "Could not make %s writable by group"
@@ -5218,27 +6010,27 @@
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: 'literal' y 'glob' son incompatibles"
-#: pathspec.c:442
+#: pathspec.c:445
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr "%s: '%s' está fuera del repositorio en '%s'"
-#: pathspec.c:517
+#: pathspec.c:521
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s' (nemotécnico: '%c')"
-#: pathspec.c:527
+#: 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:594
+#: 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:639
+#: pathspec.c:643
#, c-format
msgid "line is badly quoted: %s"
msgstr "la línea está mál citada: %s"
@@ -5252,142 +6044,171 @@
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 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr "error remoto: %s"
-#: preload-index.c:119
+#: preload-index.c:125
msgid "Refreshing index"
msgstr "Refrescando index"
-#: preload-index.c:138
+#: preload-index.c:144
#, c-format
msgid "unable to create threaded lstat: %s"
msgstr "no es posible crear lstat hilado: %s"
-#: pretty.c:981
+#: pretty.c:984
msgid "unable to parse --pretty format"
msgstr "incapaz de analizar el formato --pretty"
-#: promisor-remote.c:23
-msgid "Remote with no URL"
-msgstr "Remoto sin URL"
+#: promisor-remote.c:30
+msgid "promisor-remote: unable to fork off fetch subprocess"
+msgstr "promisor-remote: no se puede bifurcar el subproceso de recuperación"
-#: promisor-remote.c:58
+#: promisor-remote.c:35 promisor-remote.c:37
+msgid "promisor-remote: could not write to fetch subprocess"
+msgstr "proiso-remote: no se pudo escribir para recuperar el subproceso"
+
+#: promisor-remote.c:41
+msgid "promisor-remote: could not close stdin to fetch subprocess"
+msgstr "promisor-remote: no se pudo cerrar stdin para recuperar el subproceso"
+
+#: promisor-remote.c:53
#, c-format
msgid "promisor remote name cannot begin with '/': %s"
msgstr "nombre remoto promisor no puede comenzar con '/': %s"
-#: range-diff.c:75
+#: prune-packed.c:35
+msgid "Removing duplicate objects"
+msgstr "Removiendo objetos duplicados"
+
+#: range-diff.c:78
msgid "could not start `log`"
msgstr "no se pudo comenzar `log`"
-#: range-diff.c:77
+#: range-diff.c:80
msgid "could not read `log` output"
msgstr "no se pudo leer output de `log`"
-#: range-diff.c:96 sequencer.c:5020
+#: range-diff.c:101 sequencer.c:5318
#, c-format
msgid "could not parse commit '%s'"
msgstr "no se pudo analizar commit '%s'"
-#: range-diff.c:122
+#: range-diff.c:115
+#, 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:140
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "no se puede analizar git header '%.*s'"
-#: range-diff.c:285
+#: range-diff.c:306
msgid "failed to generate diff"
msgstr "falló al generar diff"
-#: range-diff.c:518 range-diff.c:520
+#: range-diff.c:558
+msgid "--left-only and --right-only are mutually exclusive"
+msgstr "--left-only y --right-only son mutuamente exclusivas"
+
+#: range-diff.c:561 range-diff.c:563
#, c-format
msgid "could not parse log for '%s'"
msgstr "no se pudo leer el log para '%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 agregará alias de archivo '%s' ('%s' ya existe en el index)"
-#: read-cache.c:696
+#: read-cache.c:698
msgid "cannot create an empty blob in the object database"
msgstr "no se puede crear un blob vacío en la base de datos de objetos"
-#: read-cache.c:718
+#: read-cache.c:720
#, c-format
msgid "%s: can only add regular files, symbolic links or git-directories"
msgstr ""
"%s: solo puede agregar archivos regulares, symbolic links o git-directories"
-#: read-cache.c:723
+#: read-cache.c:725
#, c-format
msgid "'%s' does not have a commit checked out"
msgstr "'%s' no tiene un commit checked out"
-#: read-cache.c:775
+#: read-cache.c:777
#, c-format
msgid "unable to index file '%s'"
msgstr "no es posible indexar archivo '%s'"
-#: read-cache.c:794
+#: read-cache.c:796
#, c-format
msgid "unable to add '%s' to index"
msgstr "no es posible agregar '%s' al index"
-#: read-cache.c:805
+#: read-cache.c:807
#, c-format
msgid "unable to stat '%s'"
msgstr "incapaz de correr stat en '%s'"
-#: read-cache.c:1330
+#: read-cache.c:1318
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "'%s' parece ser un directorio y un archivo a la vez"
-#: read-cache.c:1536
+#: read-cache.c:1532
msgid "Refresh index"
msgstr "Refrescar index"
-#: read-cache.c:1651
+#: read-cache.c:1657
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -5396,7 +6217,7 @@
"index.version configurado, pero el valor no es válido.\n"
"Usando versión %i"
-#: read-cache.c:1661
+#: read-cache.c:1667
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -5405,139 +6226,139 @@
"GIT_INDEX_VERSION configurado, pero el valor no es válido.\n"
"Usando versión %i"
-#: read-cache.c:1717
+#: read-cache.c:1723
#, c-format
msgid "bad signature 0x%08x"
msgstr "mala firma 0x%08x"
-#: read-cache.c:1720
+#: read-cache.c:1726
#, c-format
msgid "bad index version %d"
msgstr "mala versión del índice %d"
-#: read-cache.c:1729
+#: read-cache.c:1735
msgid "bad index file sha1 signature"
msgstr "mala firma sha1 del archivo index"
-#: read-cache.c:1759
+#: read-cache.c:1765
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "index usa %.4s extensiones, cosa que no entendemos"
-#: read-cache.c:1761
+#: read-cache.c:1767
#, c-format
msgid "ignoring %.4s extension"
msgstr "ignorando extensión %.4s"
-#: read-cache.c:1798
+#: read-cache.c:1804
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "formato de index desconocido 0x%08x"
-#: read-cache.c:1814
+#: read-cache.c:1820
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "campo nombre malformado en el index, cerca a ruta '%s'"
-#: read-cache.c:1871
+#: read-cache.c:1877
msgid "unordered stage entries in index"
msgstr "entradas en stage desordenadas en index"
-#: read-cache.c:1874
+#: read-cache.c:1880
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "múltiples entradas extrañas para archivo fusionado '%s'"
-#: read-cache.c:1877
+#: read-cache.c:1883
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "entradas de stage desordenadas para '%s'"
-#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
-#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
-#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
-#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
-#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
+#: read-cache.c:1989 read-cache.c:2280 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181
+#: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991
+#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505
+#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290
#: builtin/submodule--helper.c:332
msgid "index file corrupt"
msgstr "archivo índice corrompido"
-#: read-cache.c:2124
+#: read-cache.c:2133
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "no es posible crear hilo load_cache_entries: %s"
-#: read-cache.c:2137
+#: read-cache.c:2146
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "no es posible unir hilo load_cache_entires: %s"
-#: read-cache.c:2170
+#: read-cache.c:2179
#, c-format
msgid "%s: index file open failed"
msgstr "%s: falló al abrir el archivo index"
-#: read-cache.c:2174
+#: read-cache.c:2183
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s: no se puede hacer stat del index abierto"
-#: read-cache.c:2178
+#: read-cache.c:2187
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s: archivo index más pequeño de lo esperado"
-#: read-cache.c:2182
+#: read-cache.c:2191
#, c-format
msgid "%s: unable to map index file"
msgstr "%s: no se pudo mapear el archivo index"
-#: read-cache.c:2224
+#: read-cache.c:2233
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "no es posible crear hilo load_index_extensions: %s"
-#: read-cache.c:2251
+#: read-cache.c:2260
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "no es posible unir hilo load_index_extensions: %s"
-#: read-cache.c:2283
+#: read-cache.c:2292
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "no se pudo refrescar el index compartido '%s'"
-#: read-cache.c:2330
+#: read-cache.c:2339
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "index roto, se esperaba %s en %s, se obtuvo %s"
-#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122
+#: read-cache.c:3035 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141
#, c-format
msgid "could not close '%s'"
msgstr "no se pudo cerrar '%s'"
-#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959
+#: read-cache.c:3138 sequencer.c:2487 sequencer.c:4239
#, c-format
msgid "could not stat '%s'"
msgstr "no se pudo definir '%s'"
-#: read-cache.c:3142
+#: read-cache.c:3151
#, c-format
msgid "unable to open git dir: %s"
msgstr "no es posible abrir el directorio de git: %s"
-#: read-cache.c:3154
+#: read-cache.c:3163
#, c-format
msgid "unable to unlink: %s"
msgstr "no es posible eliminar el vinculo: %s"
-#: read-cache.c:3179
+#: read-cache.c:3188
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "no se pudo arreglar bits de permisos en '%s'"
-#: read-cache.c:3328
+#: read-cache.c:3337
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s: no se puede eliminar a stage #0"
@@ -5608,7 +6429,7 @@
msgstr[0] "Rebase %s en %s (%d comando)"
msgstr[1] "Rebase %s en %s (%d comandos)"
-#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228
+#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -5616,7 +6437,7 @@
"\n"
"No eliminar ninguna línea. Usa 'drop' explícitamente para borrar un commit \n"
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232
+#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -5624,7 +6445,7 @@
"\n"
"Si eliminas una línea aquí EL COMMIT SE PERDERÁ.\n"
-#: rebase-interactive.c:81 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"
@@ -5638,7 +6459,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:86 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"
@@ -5648,14 +6469,14 @@
"Como sea, si quieres borrar todo, el rebase será abortado.\n"
"\n"
-#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444
-#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252
+#: rebase-interactive.c:110 rerere.c:469 rerere.c:676 sequencer.c:3615
+#: sequencer.c:3641 sequencer.c:5424 builtin/fsck.c:329 builtin/rebase.c:272
#, c-format
msgid "could not write '%s'"
msgstr "no se pudo escribir '%s'"
-#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210
-#: builtin/rebase.c:234
+#: rebase-interactive.c:116 builtin/rebase.c:204 builtin/rebase.c:230
+#: builtin/rebase.c:254
#, c-format
msgid "could not write '%s'."
msgstr "no se pudo escribir '%s'."
@@ -5687,132 +6508,14 @@
"Los posibles comportamientos son: ignore,warn,error.\n"
"\n"
-#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262
-#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221
-#: builtin/rebase.c:246
+#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2402
+#: builtin/rebase.c:190 builtin/rebase.c:215 builtin/rebase.c:241
+#: builtin/rebase.c:266
#, c-format
msgid "could not read '%s'."
msgstr "no se puede leer '%s'."
-#: refs.c:262
-#, c-format
-msgid "%s does not point to a valid object!"
-msgstr "¡%s no apunta a ningún objeto válido!"
-
-#: refs.c:667
-#, c-format
-msgid "ignoring dangling symref %s"
-msgstr "ignorando referencia rota %s"
-
-#: refs.c:669 ref-filter.c:2098
-#, 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 al escribir '%s'"
-
-#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905
-#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157
-#: wrapper.c:620
-#, c-format
-msgid "could not write to '%s'"
-msgstr "no se pudo escribir en '%s'"
-
-#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719
-#: builtin/rebase.c:1029
-#, 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 al borrar '%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:2023
-#, c-format
-msgid "multiple updates for ref '%s' not allowed"
-msgstr "múltiples actualizaciones para ref '%s' no permitidas"
-
-#: refs.c:2055
-msgid "ref updates forbidden inside quarantine environment"
-msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena"
-
-#: refs.c:2151 refs.c:2181
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr "'%s' existe; no se puede crear '%s'"
-
-#: refs.c:2157 refs.c:2192
-#, 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'"
-
-#: ref-filter.c:42 wt-status.c:1938
+#: ref-filter.c:42 wt-status.c:1975
msgid "gone"
msgstr "desaparecido"
@@ -5831,281 +6534,414 @@
msgid "ahead %d, behind %d"
msgstr "delante %d, detrás %d"
-#: ref-filter.c:165
+#: ref-filter.c:175
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "formato esperado: %%(color:<color>)"
-#: ref-filter.c:167
+#: ref-filter.c:177
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "color no reconocido: %%(color:%s)"
-#: ref-filter.c:189
+#: ref-filter.c:199
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Valor entero esperado refname:lstrip=%s"
-#: ref-filter.c:193
+#: ref-filter.c:203
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Valor entero esperado refname:rstrip=%s"
-#: ref-filter.c:195
+#: ref-filter.c:205
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "argumento: %s no reconocido %%(%s)"
-#: ref-filter.c:250
+#: ref-filter.c:260
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) no toma ningún argumento"
-#: ref-filter.c:272
+#: ref-filter.c:282
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr "%%(objectsize) no reconocido argumento: %s"
-#: ref-filter.c:280
+#: ref-filter.c:290
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) no toma argumentos"
-#: ref-filter.c:292
+#: ref-filter.c:302
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) no toma ningún argumento"
-#: ref-filter.c:301
+#: ref-filter.c:315
#, c-format
-msgid "%%(subject) does not take arguments"
-msgstr "%%(subject) no toma ningún argumento"
+msgid "unrecognized %%(subject) argument: %s"
+msgstr "argumento %%(sujeto) no reconocido: %s"
-#: ref-filter.c:323
+#: ref-filter.c:334
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr "se esperaba %%(trailers:key=<value>)"
+
+#: ref-filter.c:336
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "%%(trailers) desconocidos, argumento: %s"
-#: ref-filter.c:352
+#: ref-filter.c:367
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "valor positivo esperado contents:lines=%s"
-#: ref-filter.c:354
+#: ref-filter.c:369
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "argumento %s no reconocido %%(contents)"
-#: ref-filter.c:369
+#: ref-filter.c:384
#, c-format
-msgid "positive value expected objectname:short=%s"
-msgstr "valor positivo esperado objectname:short=%s"
+msgid "positive value expected '%s' in %%(%s)"
+msgstr "valor positivo esperado '%s' en %% (%s)"
-#: ref-filter.c:373
+#: ref-filter.c:388
#, c-format
-msgid "unrecognized %%(objectname) argument: %s"
-msgstr "argumento: %s no reconocido %%(objectname)"
+msgid "unrecognized argument '%s' in %%(%s)"
+msgstr "argumento no reconocido:'%s' en %%(%s)"
-#: ref-filter.c:403
+#: ref-filter.c:402
+#, c-format
+msgid "unrecognized email option: %s"
+msgstr "opción de email desconocida: %s"
+
+#: ref-filter.c:432
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "formato esperado: %%(align:<ancho>,<posición>)"
-#: ref-filter.c:415
+#: ref-filter.c:444
#, c-format
msgid "unrecognized position:%s"
msgstr "posición desconocida: %s"
-#: ref-filter.c:422
+#: ref-filter.c:451
#, c-format
msgid "unrecognized width:%s"
msgstr "ancho desconocido: %s"
-#: ref-filter.c:431
+#: ref-filter.c:460
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "argumento no reconocido para %%(align): %s"
-#: ref-filter.c:439
+#: ref-filter.c:468
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "se esperaba un ancho positivo con el átomo %%(align)"
-#: ref-filter.c:457
+#: ref-filter.c:486
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "argumento: %s no reconocido %%(if)"
-#: ref-filter.c:559
+#: ref-filter.c:588
#, c-format
msgid "malformed field name: %.*s"
msgstr "nombre mal formado de campo: %.*s"
-#: ref-filter.c:586
+#: ref-filter.c:615
#, c-format
msgid "unknown field name: %.*s"
msgstr "nombre de campo desconocido: %.*s"
-#: ref-filter.c:590
+#: ref-filter.c:619
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
"no es un repositorio git, pero el campo '%.*s' requiere acceso al objeto data"
-#: ref-filter.c:714
+#: ref-filter.c:743
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "formato: átomo %%(if) usado sin un átomo %%(then)"
-#: ref-filter.c:777
+#: ref-filter.c:806
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "formato: átomo %%(then) usado sin átomo %%(if)"
-#: ref-filter.c:779
+#: ref-filter.c:808
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "formato: átomo %%(then) usado más de una vez"
-#: ref-filter.c:781
+#: ref-filter.c:810
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "formato: átomo %%(then) usado después de %%(else)"
-#: ref-filter.c:809
+#: ref-filter.c:838
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "formato: átomo %%(else) usado sin un átomo %%(if)"
-#: ref-filter.c:811
+#: ref-filter.c:840
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "formato: átomo %%(else) usado sin un átomo %%(then)"
-#: ref-filter.c:813
+#: ref-filter.c:842
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "formato: átomo %%(else) usado más de una vez"
-#: ref-filter.c:828
+#: ref-filter.c:857
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "formato: átomo %%(end) usado sin átomo correspondiente"
-#: ref-filter.c:885
+#: ref-filter.c:914
#, c-format
msgid "malformed format string %s"
msgstr "formato de cadena mal formado %s"
-#: ref-filter.c:1488
+#: ref-filter.c:1555
#, c-format
-msgid "no branch, rebasing %s"
-msgstr "no hay rama, rebasando %s"
+msgid "(no branch, rebasing %s)"
+msgstr "(no hay rama, rebasando %s)"
-#: ref-filter.c:1491
+#: ref-filter.c:1558
#, c-format
-msgid "no branch, rebasing detached HEAD %s"
-msgstr "(o hay rama, rebasando con HEAD desacoplado %s"
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "(no una rama, rebasando con HEAD desacoplado %s)"
-#: ref-filter.c:1494
+#: ref-filter.c:1561
#, c-format
-msgid "no branch, bisect started on %s"
-msgstr "no hay rama, comenzando biseccón en %s"
+msgid "(no branch, bisect started on %s)"
+msgstr "(no hay rama, comenzando biseccón en %s)"
-#: ref-filter.c:1504
-msgid "no branch"
-msgstr "sin rama"
+#: ref-filter.c:1565
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD desacoplado en %s)"
-#: ref-filter.c:1540 ref-filter.c:1749
+#: ref-filter.c:1568
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD desacoplado de %s)"
+
+#: ref-filter.c:1571
+msgid "(no branch)"
+msgstr "(sin rama)"
+
+#: ref-filter.c:1603 ref-filter.c:1812
#, c-format
msgid "missing object %s for %s"
msgstr "falta objeto %s para %s"
-#: ref-filter.c:1550
+#: ref-filter.c:1613
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer falló en %s para %s"
-#: ref-filter.c:2004
+#: ref-filter.c:1996
#, c-format
msgid "malformed object at '%s'"
msgstr "objeto mal formado en '%s'"
-#: ref-filter.c:2093
+#: ref-filter.c:2085
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "ignorando referencia con nombre roto %s"
-#: ref-filter.c:2389
+#: ref-filter.c:2090 refs.c:676
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "ignorando referencia rota %s"
+
+#: ref-filter.c:2430
#, c-format
msgid "format: %%(end) atom missing"
msgstr "formato: falta átomo %%(end)"
-#: ref-filter.c:2489
-#, c-format
-msgid "option `%s' is incompatible with --merged"
-msgstr "opción `%s' es incompatible con --merged"
-
-#: ref-filter.c:2492
-#, c-format
-msgid "option `%s' is incompatible with --no-merged"
-msgstr "opción `%s' es incompatible con --no-merged"
-
-#: ref-filter.c:2502
+#: ref-filter.c:2529
#, c-format
msgid "malformed object name %s"
msgstr "nombre de objeto mal formado %s"
-#: ref-filter.c:2507
+#: ref-filter.c:2534
#, c-format
msgid "option `%s' must point to a commit"
msgstr "opción '%s' debe apuntar a un commit"
-#: remote.c:366
+#: 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:566
+#, c-format
+msgid ""
+"Using '%s' as the name for the initial branch. This default branch name\n"
+"is subject to change. To configure the initial branch name to use in all\n"
+"of your new repositories, which will suppress this warning, call:\n"
+"\n"
+"\tgit config --global init.defaultBranch <name>\n"
+"\n"
+"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"'development'. The just-created branch can be renamed via this command:\n"
+"\n"
+"\tgit branch -m <name>\n"
+msgstr ""
+"Usando '%s' como el nombre de la rama inicial. Este nombre de rama "
+"predeterminado\n"
+"está sujeto a cambios. Para configurar el nombre de la rama inicial para "
+"usar en todos\n"
+"de sus nuevos repositorios, que suprimirán esta advertencia, llame a:\n"
+"\n"
+"\tgit config --global init.defaultBranch <nombre>\n"
+"\n"
+"Los nombres comúnmente elegidos en lugar de 'maestro' son 'principal', "
+"'troncal' y\n"
+"'desarrollo'. Se puede cambiar el nombre de la rama recién creada mediante "
+"este comando:\n"
+"\n"
+"\tgit branch -m <nombre>\n"
+
+#: refs.c:588
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "no se pudo recibir `%s`"
+
+#: refs.c:598
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "nombre de rama inválido: %s = %s"
+
+#: refs.c:674
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "ignorando referencia rota %s"
+
+#: refs.c:922
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr "log de ref %s tiene un vacío tras %s"
+
+#: refs.c:929
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr "log de ref %s finalizado inesperadamente en %s"
+
+#: refs.c:994
+#, c-format
+msgid "log for %s is empty"
+msgstr "log de %s está vacío"
+
+#: refs.c:1086
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "rehusando actualizar ref con mal nombre '%s'"
+
+#: refs.c:1157
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "update_ref falló para ref '%s': %s"
+
+#: refs.c:2051
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "múltiples actualizaciones para ref '%s' no permitidas"
+
+#: refs.c:2131
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena"
+
+#: refs.c:2142
+msgid "ref updates aborted by hook"
+msgstr "ref update abortado por el hook"
+
+#: refs.c:2242 refs.c:2272
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "'%s' existe; no se puede crear '%s'"
+
+#: refs.c:2248 refs.c:2283
+#, 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:1228
+#, c-format
+msgid "could not remove reference %s"
+msgstr "no se pudo eliminar la referencia %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 se pudo eliminar la referencia %s: %s"
+
+#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#, c-format
+msgid "could not delete references: %s"
+msgstr "no se pudo eliminar la referencia: %s"
+
+#: refspec.c:170
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr "refspec inválido: '%s'"
+
+#: remote.c:351
#, c-format
msgid "config remote shorthand cannot begin with '/': %s"
msgstr "config remote shorthand no puede comenzar con '/': %s"
-#: remote.c:414
+#: remote.c:399
msgid "more than one receivepack given, using the first"
msgstr "más de un receivepack dado, usando el primero"
-#: remote.c:422
+#: remote.c:407
msgid "more than one uploadpack given, using the first"
msgstr "más de un uploadpack dado, usando el primero"
-#: remote.c:612
+#: remote.c:590
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "No se pueden traer ambos %s y %s a %s"
-#: remote.c:616
+#: remote.c:594
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s por lo general hace seguimiento a %s, no a %s"
-#: remote.c:620
+#: remote.c:598
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s hace seguimiento tanto a %s como a %s"
-#: remote.c:688
+#: remote.c:666
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr "llave '%s' de patrón no tuvo '*'"
-#: remote.c:698
+#: remote.c:676
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr "valor '%s' del patrón no tiene '*'"
-#: remote.c:1004
+#: remote.c:1083
#, c-format
msgid "src refspec %s does not match any"
msgstr "src refsoec %s: no concuerda con ninguno"
-#: remote.c:1009
+#: remote.c:1088
#, c-format
msgid "src refspec %s matches more than one"
msgstr "src refspec %s concuerda con más de uno"
@@ -6114,7 +6950,7 @@
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1024
+#: remote.c:1103
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
@@ -6138,7 +6974,7 @@
"Ninguno funcionó así que nos dimos por vencidos. Tienes que especificar el "
"full ref."
-#: remote.c:1044
+#: remote.c:1123
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
@@ -6149,7 +6985,7 @@
"¿Quisiste crear un branch nuevo mediante un push a\n"
"'%s:refs/heads/%s'?"
-#: remote.c:1049
+#: remote.c:1128
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
@@ -6160,7 +6996,7 @@
"Did you mean to create a new tag by pushing to\n"
"'%s:refs/tags/%s'?"
-#: remote.c:1054
+#: remote.c:1133
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
@@ -6171,7 +7007,7 @@
"¿Quisiste crear un tag nuevo mediante un push a\n"
"'%s:refs/heads/%s'?"
-#: remote.c:1059
+#: remote.c:1138
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
@@ -6182,115 +7018,115 @@
"¿Quisiste crear un tag nuevo mediante un push a\n"
"'%s:refs/heads/%s'?"
-#: remote.c:1095
+#: remote.c:1174
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "%s no puede ser resolver a un branch"
-#: remote.c:1106
+#: remote.c:1185
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "no es posible borrar '%s': ref remoto no existe"
-#: remote.c:1118
+#: remote.c:1197
#, c-format
msgid "dst refspec %s matches more than one"
msgstr "dst refspec %s concuerda con más de uno"
-#: remote.c:1125
+#: remote.c:1204
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr "dst ref %s recibe de más de un src"
-#: remote.c:1628 remote.c:1729
+#: remote.c:1724 remote.c:1825
msgid "HEAD does not point to a branch"
msgstr "HEAD no apunta a ninguna rama"
-#: remote.c:1637
+#: remote.c:1733
#, c-format
msgid "no such branch: '%s'"
msgstr "no existe tal rama: '%s'"
-#: remote.c:1640
+#: remote.c:1736
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "no se ha configurado upstream para la rama '%s'"
-#: remote.c:1646
+#: remote.c:1742
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "la rama '%s' de upstream no es guardad como rama de rastreo remoto"
-#: remote.c:1661
+#: remote.c:1757
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
"destino de push '%s' en el remoto '%s' no tiene una rama de rastreo local"
-#: remote.c:1673
+#: remote.c:1769
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "la rama '%s' no tiene remoto para enviar"
-#: remote.c:1683
+#: remote.c:1779
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "refspecs del push para '%s' no incluyen '%s'"
-#: remote.c:1696
+#: remote.c:1792
msgid "push has no destination (push.default is 'nothing')"
msgstr "push no tiene destino (push.default es 'nada')"
-#: remote.c:1718
+#: remote.c:1814
msgid "cannot resolve 'simple' push to a single destination"
msgstr "no se puede resolver push 'simple' para un destino único"
-#: remote.c:1844
+#: remote.c:1943
#, c-format
msgid "couldn't find remote ref %s"
msgstr "no se puedo encontrar ref remota %s"
-#: remote.c:1857
+#: remote.c:1956
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "* Ignorando ref graciosa '%s' localmente"
-#: remote.c:2020
+#: remote.c:2119
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "Tu rama está basada en '%s', pero upstream ha desaparecido.\n"
-#: remote.c:2024
+#: remote.c:2123
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (usa \"git branch --unset-upstream\" para arreglar)\n"
-#: remote.c:2027
+#: remote.c:2126
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "Tu rama está actualizada con '%s'.\n"
-#: remote.c:2031
+#: remote.c:2130
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "Tu rama y '%s' refieren a commits diferentes.\n"
-#: remote.c:2034
+#: remote.c:2133
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (usa \"%s\" para detalles)\n"
-#: remote.c:2038
+#: remote.c:2137
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "Tu rama está adelantada a '%s' por %d commit.\n"
msgstr[1] "Tu rama está adelantada a '%s' por %d commits.\n"
-#: remote.c:2044
+#: remote.c:2143
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (usa \"git push\" para publicar tus commits locales)\n"
-#: remote.c:2047
+#: remote.c:2146
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -6300,11 +7136,11 @@
msgstr[1] ""
"Tu rama está detrás de '%s' por %d commits, y puede ser avanzada rápido.\n"
-#: remote.c:2055
+#: remote.c:2154
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (usa \"git pull\" para actualizar tu rama local)\n"
-#: remote.c:2058
+#: remote.c:2157
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -6319,11 +7155,11 @@
"Tu rama y '%s' han divergido,\n"
"y tienen %d y %d commits diferentes cada una respectivamente.\n"
-#: remote.c:2068
+#: remote.c:2167
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (usa \"git pull\" para fusionar la rama remota en la tuya)\n"
-#: remote.c:2251
+#: remote.c:2359
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "no se puede leer el nombre de objeto '%s'"
@@ -6343,126 +7179,135 @@
msgid "replace depth too high for object %s"
msgstr "remplazar profundiad muy elevada para objeto %s"
-#: rerere.c:217 rerere.c:226 rerere.c:229
+#: rerere.c:201 rerere.c:210 rerere.c:213
msgid "corrupt MERGE_RR"
msgstr "MERGE_RR corrupto"
-#: rerere.c:264 rerere.c:269
+#: rerere.c:248 rerere.c:253
msgid "unable to write rerere record"
msgstr "incapaz de escribir entrada rerere"
-#: rerere.c:495
+#: rerere.c:479
#, c-format
msgid "there were errors while writing '%s' (%s)"
msgstr "hubieron errores mientras se escribía '%s' (%s)"
-#: rerere.c:498
+#: rerere.c:482
#, c-format
msgid "failed to flush '%s'"
msgstr "falló al hacer flush '%s'"
-#: rerere.c:503 rerere.c:1039
+#: rerere.c:487 rerere.c:1023
#, c-format
msgid "could not parse conflict hunks in '%s'"
msgstr "no se pudo analizar hunks en conflicto en '%s'"
-#: rerere.c:684
+#: rerere.c:668
#, c-format
msgid "failed utime() on '%s'"
msgstr "falló utime() en '%s'"
-#: rerere.c:694
+#: rerere.c:678
#, c-format
msgid "writing '%s' failed"
msgstr "escribiendo '%s' falló"
-#: rerere.c:714
+#: rerere.c:698
#, c-format
msgid "Staged '%s' using previous resolution."
msgstr "'%s' puesto en stage usando resolución previa."
-#: rerere.c:753
+#: rerere.c:737
#, c-format
msgid "Recorded resolution for '%s'."
msgstr "Resolución guardada para '%s'."
-#: rerere.c:788
+#: rerere.c:772
#, c-format
msgid "Resolved '%s' using previous resolution."
msgstr "'%s' resuelto usando resolución previa."
-#: rerere.c:803
+#: rerere.c:787
#, c-format
msgid "cannot unlink stray '%s'"
msgstr "no se puede desvincular stray '%s'"
-#: rerere.c:807
+#: rerere.c:791
#, c-format
msgid "Recorded preimage for '%s'"
msgstr "Resolución precargada para '%s'"
-#: rerere.c:881 submodule.c:2078 builtin/log.c:1871
-#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
+#: rerere.c:865 submodule.c:2088 builtin/log.c:1991
+#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890
#, c-format
msgid "could not create directory '%s'"
msgstr "no se pudo crear el directorio '%s'"
-#: rerere.c:1057
+#: rerere.c:1041
#, c-format
msgid "failed to update conflicted state in '%s'"
msgstr "falló al actualizar estado conflictivo en '%s'"
-#: rerere.c:1068 rerere.c:1075
+#: rerere.c:1052 rerere.c:1059
#, c-format
msgid "no remembered resolution for '%s'"
msgstr "resolución para '%s' no recordada"
-#: rerere.c:1077
+#: rerere.c:1061
#, c-format
msgid "cannot unlink '%s'"
msgstr "no se puede desvincular '%s'"
-#: rerere.c:1087
+#: rerere.c:1071
#, c-format
msgid "Updated preimage for '%s'"
msgstr "Actualizada preimagen para '%s'"
-#: rerere.c:1096
+#: rerere.c:1080
#, c-format
msgid "Forgot resolution for '%s'\n"
msgstr "Se olvidó resolución para '%s'\n"
-#: rerere.c:1199
+#: rerere.c:1191
msgid "unable to open rr-cache directory"
msgstr "no es posible abrir directorio rr-cache"
-#: revision.c:2497
+#: 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:3468
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "falló al encontrar árbol de %s"
+
+#: revision.c:2338
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "--unpacked=<packfile> ya no es soportado"
+
+#: revision.c:2668
msgid "your current branch appears to be broken"
msgstr "tu rama actual parece estar rota"
-#: revision.c:2500
+#: revision.c:2671
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "tu rama actual '%s' no tiene ningún commit todavía"
-#: revision.c:2708
-msgid "--first-parent is incompatible with --bisect"
-msgstr "--first-parent es incompatible con --bisect"
-
-#: revision.c:2712
+#: 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"
-#: run-command.c:763
+#: run-command.c:767
msgid "open /dev/null failed"
msgstr "falló al abrir /dev/null"
-#: run-command.c:1269
+#: run-command.c:1274
#, c-format
msgid "cannot create async thread: %s"
msgstr "no es posible crear hilo async: %s"
-#: run-command.c:1333
+#: run-command.c:1338
#, c-format
msgid ""
"The '%s' hook was ignored because it's not set as executable.\n"
@@ -6472,30 +7317,34 @@
"Puedes desactivar esta advertencias con `git config advice.ignoredHook "
"false`."
-#: send-pack.c:144
+#: send-pack.c:146
msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
"flush packet inesperado mientras se leía estatus de desempaquetado remoto"
-#: send-pack.c:146
+#: send-pack.c:148
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "no es posible analizar el estado de desempaquetado remoto: %s"
-#: send-pack.c:148
+#: send-pack.c:150
#, c-format
msgid "remote unpack failed: %s"
msgstr "desempaquetado remoto falló: %s"
-#: send-pack.c:309
+#: send-pack.c:374
msgid "failed to sign the push certificate"
msgstr "falló al firmar el certificado de push"
-#: send-pack.c:423
+#: send-pack.c:467
+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:476
msgid "the receiving end does not support --signed push"
msgstr "el final receptor no soporta --signed push"
-#: send-pack.c:425
+#: send-pack.c:478
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -6503,47 +7352,47 @@
"no se manda un certificado de push ya que el destino no soporta push firmado "
"(--signed )"
-#: send-pack.c:437
+#: send-pack.c:490
msgid "the receiving end does not support --atomic push"
msgstr "el destino no soporta push atómicos (--atomic)"
-#: send-pack.c:442
+#: send-pack.c:495
msgid "the receiving end does not support push options"
msgstr "el destino no soporta opciones de push"
-#: sequencer.c:191
+#: sequencer.c:195
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "mensaje de commit inválido, modo cleanup '%s'"
-#: sequencer.c:296
+#: sequencer.c:323
#, c-format
msgid "could not delete '%s'"
msgstr "no se pudo borrar '%s'"
-#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385
+#: sequencer.c:343 builtin/rebase.c:757 builtin/rebase.c:1602 builtin/rm.c:385
#, c-format
msgid "could not remove '%s'"
msgstr "no se pudo eliminar'%s'"
-#: sequencer.c:325
+#: sequencer.c:353
msgid "revert"
msgstr "revertir"
-#: sequencer.c:327
+#: sequencer.c:355
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:329
+#: sequencer.c:357
msgid "rebase"
msgstr "rebase"
-#: sequencer.c:331
+#: sequencer.c:359
#, c-format
msgid "unknown action: %d"
msgstr "acción desconocida: %d"
-#: sequencer.c:389
+#: sequencer.c:418
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -6551,7 +7400,7 @@
"después de resolver los conflictos, marca las rutas corregidas\n"
"con 'git add <rutas>' o 'git rm <rutas>'"
-#: sequencer.c:392
+#: sequencer.c:421
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -6561,44 +7410,43 @@
"con 'git add <rutas>' o 'git rm <rutas>'\n"
"y haz un commit del resultado con 'git commit'"
-#: sequencer.c:405 sequencer.c:2901
+#: sequencer.c:434 sequencer.c:3070
#, c-format
msgid "could not lock '%s'"
msgstr "no se pudo bloquear '%s'"
-#: sequencer.c:412
+#: sequencer.c:436 sequencer.c:2869 sequencer.c:3074 sequencer.c:3088
+#: sequencer.c:3345 sequencer.c:5334 strbuf.c:1168 wrapper.c:631
+#, c-format
+msgid "could not write to '%s'"
+msgstr "no se pudo escribir en '%s'"
+
+#: sequencer.c:441
#, c-format
msgid "could not write eol to '%s'"
msgstr "no se pudo escribir EOL en '%s'"
-#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921
-#: sequencer.c:3185
+#: sequencer.c:446 sequencer.c:2874 sequencer.c:3076 sequencer.c:3090
+#: sequencer.c:3353
#, c-format
msgid "failed to finalize '%s'"
msgstr "falló al finalizar '%s'"
-#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
-#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
-#: builtin/rebase.c:593
-#, c-format
-msgid "could not read '%s'"
-msgstr "no se pudo leer '%s'"
-
-#: sequencer.c:466
+#: sequencer.c:485
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "tus cambios locales serán sobreescritos por %s."
-#: sequencer.c:470
+#: sequencer.c:489
msgid "commit your changes or stash them to proceed."
msgstr "realiza un commit con tus cambios o aplica un stash para proceder."
-#: sequencer.c:502
+#: sequencer.c:521
#, c-format
msgid "%s: fast-forward"
msgstr "%s: avance rápido"
-#: sequencer.c:541 builtin/tag.c:565
+#: sequencer.c:560 builtin/tag.c:598
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Modo cleanup inválido %s"
@@ -6606,65 +7454,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:635
+#: sequencer.c:670
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Incapaz de escribir el nuevo archivo índice"
-#: sequencer.c:652
+#: sequencer.c:684
msgid "unable to update cache tree"
msgstr "no es posible actualizar el árbol de la caché"
-#: sequencer.c:666
+#: sequencer.c:698
msgid "could not resolve HEAD commit"
msgstr "no se pudo resolver el commit de HEAD"
-#: sequencer.c:746
+#: sequencer.c:778
#, c-format
msgid "no key present in '%.*s'"
msgstr "no hay llave presente en '%.*s'"
-#: sequencer.c:757
+#: sequencer.c:789
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "no es posible dequote para '%s'"
-#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710
-#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072
+#: sequencer.c:826 wrapper.c:201 wrapper.c:371 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1136 builtin/rebase.c:910
#, c-format
msgid "could not open '%s' for reading"
msgstr "no se pudo abrir '%s' para lectura"
-#: sequencer.c:804
+#: sequencer.c:836
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "'GIT_AUTHOR_NAME' ya proporcionado"
-#: sequencer.c:809
+#: sequencer.c:841
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "'GIT_AUTHOR_EMAIL' ya proporcionado"
-#: sequencer.c:814
+#: sequencer.c:846
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "'GIT_AUTHOR_DATE' ya proporcionado"
-#: sequencer.c:818
+#: sequencer.c:850
#, c-format
msgid "unknown variable '%s'"
msgstr "variable desconocida '%s'"
-#: sequencer.c:823
+#: sequencer.c:855
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "falta 'GIT_AUTHOR_NAME'"
-#: sequencer.c:825
+#: sequencer.c:857
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "falta 'GIT_AUTHOR_EMAIL'"
-#: sequencer.c:827
+#: sequencer.c:859
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "falta 'GIT_AUTHOR_DATE'"
-#: sequencer.c:876
+#: sequencer.c:924
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -6694,11 +7542,11 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:1148
+#: sequencer.c:1211
msgid "'prepare-commit-msg' hook failed"
msgstr "hook 'prepare-commit-msg' falló"
-#: sequencer.c:1154
+#: sequencer.c:1217
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6725,7 +7573,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1167
+#: sequencer.c:1230
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6749,324 +7597,338 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1209
+#: sequencer.c:1272
msgid "couldn't look up newly created commit"
msgstr "no se pudo revisar el commit recién creado"
-#: sequencer.c:1211
+#: sequencer.c:1274
msgid "could not parse newly created commit"
msgstr "no se pudo analizar el commit recién creado"
-#: sequencer.c:1257
+#: sequencer.c:1320
msgid "unable to resolve HEAD after creating commit"
msgstr "no se pudo resolver HEAD tras crear el commit"
-#: sequencer.c:1259
+#: sequencer.c:1322
msgid "detached HEAD"
msgstr "HEAD desacoplado"
-#: sequencer.c:1263
+#: sequencer.c:1326
msgid " (root-commit)"
msgstr " (commit-raíz)"
-#: sequencer.c:1284
+#: sequencer.c:1347
msgid "could not parse HEAD"
msgstr "no se pudo analizar HEAD"
-#: sequencer.c:1286
+#: sequencer.c:1349
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "¡HEAD %s no es un commit!"
-#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574
+#: sequencer.c:1353 sequencer.c:1431 builtin/commit.c:1577
msgid "could not parse HEAD commit"
msgstr "no se pudo analizar el commit de HEAD"
-#: sequencer.c:1342 sequencer.c:1968
+#: sequencer.c:1409 sequencer.c:2108
msgid "unable to parse commit author"
msgstr "no es posible analizar el autor del commit"
-#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687
+#: sequencer.c:1420 builtin/am.c:1566 builtin/merge.c:702
msgid "git write-tree failed to write a tree"
msgstr "git write-tree falló al escribir el árbol"
-#: sequencer.c:1386 sequencer.c:1447
+#: sequencer.c:1453 sequencer.c:1573
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "no se puede leer el mensaje del commit de '%s'"
-#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886
-#: builtin/merge.c:911
+#: sequencer.c:1484 sequencer.c:1516
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr "identidad de autor inválida '%s'"
+
+#: sequencer.c:1490
+msgid "corrupt author: missing date information"
+msgstr "autor corrupto: falta información"
+
+#: sequencer.c:1529 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:905
+#: builtin/merge.c:930 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "falló al escribir el objeto commit"
-#: sequencer.c:1474
+#: sequencer.c:1556 sequencer.c:4291 t/helper/test-fast-rebase.c:198
+#, c-format
+msgid "could not update %s"
+msgstr "no se puede actualizar %s"
+
+#: sequencer.c:1605
#, c-format
msgid "could not parse commit %s"
msgstr "no se pudo analizar commit %s"
-#: sequencer.c:1479
+#: sequencer.c:1610
#, c-format
msgid "could not parse parent commit %s"
msgstr "no se pudo analizar el commit padre %s"
-#: sequencer.c:1562 sequencer.c:1673
+#: sequencer.c:1693 sequencer.c:1804
#, c-format
msgid "unknown command: %d"
msgstr "comando desconocido: %d"
-#: sequencer.c:1620 sequencer.c:1645
+#: sequencer.c:1751 sequencer.c:1776
#, c-format
msgid "This is a combination of %d commits."
msgstr "Esta es una combinación de %d commits."
-#: sequencer.c:1630
+#: sequencer.c:1761
msgid "need a HEAD to fixup"
msgstr "se necesita un HEAD para arreglar"
-#: sequencer.c:1632 sequencer.c:3212
+#: sequencer.c:1763 sequencer.c:3380
msgid "could not read HEAD"
msgstr "no se pudo leer HEAD"
-#: sequencer.c:1634
+#: sequencer.c:1765
msgid "could not read HEAD's commit message"
msgstr "no se pudo leer el mensaje de commit de HEAD"
-#: sequencer.c:1640
+#: sequencer.c:1771
#, c-format
msgid "cannot write '%s'"
msgstr "no se puede escribir '%s'"
-#: sequencer.c:1647 git-rebase--preserve-merges.sh:496
+#: sequencer.c:1778 git-rebase--preserve-merges.sh:486
msgid "This is the 1st commit message:"
msgstr "Este es el mensaje del 1er commit:"
-#: sequencer.c:1655
+#: sequencer.c:1786
#, c-format
msgid "could not read commit message of %s"
msgstr "no se puede leer el mensaje del commit de %s"
-#: sequencer.c:1662
+#: sequencer.c:1793
#, c-format
msgid "This is the commit message #%d:"
msgstr "Este es el mensaje del commit #%d:"
-#: sequencer.c:1668
+#: sequencer.c:1799
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "El mensaje del commit #%d será saltado:"
-#: sequencer.c:1756
+#: sequencer.c:1887
msgid "your index file is unmerged."
msgstr "tu archivo índice no está fusionado."
-#: sequencer.c:1763
+#: sequencer.c:1894
msgid "cannot fixup root commit"
msgstr "no se puede arreglar el commit raíz"
-#: sequencer.c:1782
+#: sequencer.c:1913
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "el commit %s es una fusión pero no se proporcionó la opción -m."
-#: sequencer.c:1790 sequencer.c:1798
+#: sequencer.c:1921 sequencer.c:1929
#, c-format
msgid "commit %s does not have parent %d"
msgstr "el commit %s no tiene un padre %d"
-#: sequencer.c:1804
+#: sequencer.c:1935
#, c-format
msgid "cannot get commit message for %s"
msgstr "no se puede obtener el mensaje de commit para %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1823
+#: sequencer.c:1954
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: no se puede analizar el commit padre %s"
-#: sequencer.c:1888
+#: sequencer.c:2019
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "no se puede renombrar '%s' a '%s'"
-#: sequencer.c:1943
+#: sequencer.c:2079
#, c-format
msgid "could not revert %s... %s"
msgstr "no se pudo revertir %s... %s"
-#: sequencer.c:1944
+#: sequencer.c:2080
#, c-format
msgid "could not apply %s... %s"
msgstr "no se pudo aplicar %s... %s"
-#: sequencer.c:1961
+#: sequencer.c:2100
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "botando $%s %s -- contenidos del parche ya están en upstream\n"
-#: sequencer.c:2018
+#: sequencer.c:2158
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: falló al leer el índice"
-#: sequencer.c:2025
+#: sequencer.c:2165
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: falló al refrescar el índice"
-#: sequencer.c:2102
+#: sequencer.c:2242
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s no acepta los argumentos: '%s'"
-#: sequencer.c:2111
+#: sequencer.c:2251
#, c-format
msgid "missing arguments for %s"
msgstr "faltan argumentos para para %s"
-#: sequencer.c:2142
+#: sequencer.c:2282
#, c-format
msgid "could not parse '%s'"
msgstr "no se puede analizar '%s'"
-#: sequencer.c:2203
+#: sequencer.c:2343
#, c-format
msgid "invalid line %d: %.*s"
msgstr "línea inválida %d: %.*s"
-#: sequencer.c:2214
+#: sequencer.c:2354
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "no se puede '%s' sin un commit previo"
-#: sequencer.c:2298
+#: sequencer.c:2440
msgid "cancelling a cherry picking in progress"
msgstr "cancelando cherry-pick en progreso"
-#: sequencer.c:2305
+#: sequencer.c:2449
msgid "cancelling a revert in progress"
msgstr "cancelando revert en progreso"
-#: sequencer.c:2349
+#: sequencer.c:2493
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "por favor arregle esto usando 'git rebase --edit-todo'."
-#: sequencer.c:2351
+#: sequencer.c:2495
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "hoja de instrucciones inutilizable: '%s'"
-#: sequencer.c:2356
+#: sequencer.c:2500
msgid "no commits parsed."
msgstr "ningún commit analizado."
-#: sequencer.c:2367
+#: sequencer.c:2511
msgid "cannot cherry-pick during a revert."
msgstr "no se puede realizar cherry-pick durante un revert."
-#: sequencer.c:2369
+#: sequencer.c:2513
msgid "cannot revert during a cherry-pick."
msgstr "no se puede realizar un revert durante un cherry-pick."
-#: sequencer.c:2447
+#: sequencer.c:2591
#, c-format
msgid "invalid value for %s: %s"
msgstr "valor inválido para %s: %s"
-#: sequencer.c:2540
+#: sequencer.c:2698
msgid "unusable squash-onto"
msgstr "squash-onto inservible"
-#: sequencer.c:2556
+#: sequencer.c:2718
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "hoja de opciones mal formada: '%s'"
-#: sequencer.c:2644 sequencer.c:4361
+#: sequencer.c:2811 sequencer.c:4644
msgid "empty commit set passed"
msgstr "conjunto de commits vacío entregado"
-#: sequencer.c:2660
+#: sequencer.c:2828
msgid "revert is already in progress"
msgstr "revert ya está en progreso"
-#: sequencer.c:2662
+#: sequencer.c:2830
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "intenta \"git revert (--continue | --quit | %s --abort)\""
-#: sequencer.c:2665
+#: sequencer.c:2833
msgid "cherry-pick is already in progress"
msgstr "cherry-pick ya está en progreso"
-#: sequencer.c:2667
+#: sequencer.c:2835
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "intenta \"git cherry-pick (--continue | --quit | %s --abort)\""
-#: sequencer.c:2681
+#: sequencer.c:2849
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "no se pudo crear un directorio secuenciador '%s'"
-#: sequencer.c:2696
+#: sequencer.c:2864
msgid "could not lock HEAD"
msgstr "no se pudo bloquear HEAD"
-#: sequencer.c:2756 sequencer.c:4099
+#: sequencer.c:2924 sequencer.c:4379
msgid "no cherry-pick or revert in progress"
msgstr "ningún cherry-pick o revert en progreso"
-#: sequencer.c:2758 sequencer.c:2769
+#: sequencer.c:2926 sequencer.c:2937
msgid "cannot resolve HEAD"
msgstr "no se puede resolver HEAD"
-#: sequencer.c:2760 sequencer.c:2804
+#: sequencer.c:2928 sequencer.c:2972
msgid "cannot abort from a branch yet to be born"
msgstr "no se puede abortar de una rama por nacer"
-#: sequencer.c:2790 builtin/grep.c:724
+#: sequencer.c:2958 builtin/grep.c:757
#, c-format
msgid "cannot open '%s'"
msgstr "no se puede abrir '%s'"
-#: sequencer.c:2792
+#: sequencer.c:2960
#, c-format
msgid "cannot read '%s': %s"
msgstr "no se puede leer '%s': %s"
-#: sequencer.c:2793
+#: sequencer.c:2961
msgid "unexpected end of file"
msgstr "final de archivo inesperado"
-#: sequencer.c:2799
+#: sequencer.c:2967
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "archivo HEAD de pre-cherry-pick guardado '%s' está corrupto"
-#: sequencer.c:2810
+#: sequencer.c:2978
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!"
-#: sequencer.c:2851
+#: sequencer.c:3019
msgid "no revert in progress"
msgstr "no hay revert en progreso"
-#: sequencer.c:2859
+#: sequencer.c:3028
msgid "no cherry-pick in progress"
msgstr "ningún cherry-pick en progreso"
-#: sequencer.c:2869
+#: sequencer.c:3038
msgid "failed to skip the commit"
msgstr "falló al escribir el commit"
-#: sequencer.c:2876
+#: sequencer.c:3045
msgid "there is nothing to skip"
msgstr "no hay nada que saltar"
-#: sequencer.c:2879
+#: sequencer.c:3048
#, c-format
msgid ""
"have you committed already?\n"
@@ -7075,21 +7937,16 @@
"¿ya has hecho el commit?\n"
"intenta \"git %s --continue\""
-#: sequencer.c:3003 sequencer.c:4011
-#, c-format
-msgid "could not update %s"
-msgstr "no se puede actualizar %s"
-
-#: sequencer.c:3042 sequencer.c:3991
+#: sequencer.c:3210 sequencer.c:4271
msgid "cannot read HEAD"
msgstr "no se puede leer HEAD"
-#: sequencer.c:3059
+#: sequencer.c:3227
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "no se pudo copiar '%s' a '%s'"
-#: sequencer.c:3067
+#: sequencer.c:3235
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -7108,22 +7965,27 @@
"\n"
"\tgit rebase --continue\n"
-#: sequencer.c:3077
+#: sequencer.c:3245
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "No se pudo aplicar %s... %.*s"
-#: sequencer.c:3084
+#: sequencer.c:3252
#, c-format
msgid "Could not merge %.*s"
msgstr "No se pudo fusionar %.*s"
-#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641
+#: sequencer.c:3266 sequencer.c:3270 builtin/difftool.c:640
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "no se pudo copiar '%s' a '%s'"
-#: sequencer.c:3129
+#: sequencer.c:3282
+#, c-format
+msgid "Executing: %s\n"
+msgstr "Ejecutando: %s\n"
+
+#: sequencer.c:3297
#, c-format
msgid ""
"execution failed: %s\n"
@@ -7138,11 +8000,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3135
+#: sequencer.c:3303
msgid "and made changes to the index and/or the working tree\n"
msgstr "y se hicieron cambios al índice y/o árbol de trabajo\n"
-#: sequencer.c:3141
+#: sequencer.c:3309
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -7159,103 +8021,124 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3202
+#: sequencer.c:3370
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "nombre de label ilegal: '%.*s'"
-#: sequencer.c:3256
+#: sequencer.c:3424
msgid "writing fake root commit"
msgstr "escribiendo commit raíz falso"
-#: sequencer.c:3261
+#: sequencer.c:3429
msgid "writing squash-onto"
msgstr "escribiendo squash-onto"
-#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886
-#, c-format
-msgid "failed to find tree of %s"
-msgstr "falló al encontrar árbol de %s"
-
-#: sequencer.c:3344
+#: sequencer.c:3513
#, c-format
msgid "could not resolve '%s'"
msgstr "no se pudo resolver '%s'"
-#: sequencer.c:3375
+#: sequencer.c:3546
msgid "cannot merge without a current revision"
msgstr "no se puede fusionar sin una versión actual"
-#: sequencer.c:3397
+#: sequencer.c:3568
#, c-format
msgid "unable to parse '%.*s'"
msgstr "no se puede analizar '%.*s'"
-#: sequencer.c:3406
+#: sequencer.c:3577
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "nada para fusionar: '%.*s'"
-#: sequencer.c:3418
+#: sequencer.c:3589
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "fusión octopus no puede ser ejecutada en la punta de un [nuevo root]"
-#: sequencer.c:3434
+#: sequencer.c:3605
#, c-format
msgid "could not get commit message of '%s'"
msgstr "no se puede leer el mensaje del commit '%s'"
-#: sequencer.c:3594
+#: sequencer.c:3788
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "no se pudo intentar fusionar '%.*s'"
-#: sequencer.c:3610
+#: sequencer.c:3804
msgid "merge: Unable to write new index file"
msgstr "fusión: No se puede escribir el nuevo archivo índice"
-#: sequencer.c:3679 builtin/rebase.c:737
+#: sequencer.c:3878
+msgid "Cannot autostash"
+msgstr "No se puede ejecutar autostash"
+
+#: sequencer.c:3881
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "Respuesta de stash inesperada: '%s'"
+
+#: sequencer.c:3887
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "No se pudo crear el directorio para '%s'"
+
+#: sequencer.c:3890
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "Autostash creado: %s\n"
+
+#: sequencer.c:3894
+msgid "could not reset --hard"
+msgstr "no se pudo reset --hard"
+
+#: sequencer.c:3919
#, c-format
msgid "Applied autostash.\n"
msgstr "Autostash aplicado.\n"
-#: sequencer.c:3691
+#: sequencer.c:3931
#, c-format
msgid "cannot store %s"
msgstr "no se puede guardar %s"
-#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113
+#: sequencer.c:3934
#, 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:3755
-#, c-format
-msgid "%s: not a valid OID"
-msgstr "%s no es OID válido"
+#: sequencer.c:3939
+msgid "Applying autostash resulted in conflicts."
+msgstr "Apicar autostash resultó en conflictos."
-#: sequencer.c:3760 git-rebase--preserve-merges.sh:779
+#: sequencer.c:3940
+msgid "Autostash exists; creating a new stash entry."
+msgstr "Autostash existe; creando una nueva entrada stash."
+
+#: sequencer.c:4033 git-rebase--preserve-merges.sh:769
msgid "could not detach HEAD"
msgstr "no se puede desacoplar HEAD"
-#: sequencer.c:3775
+#: sequencer.c:4048
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Detenido en HEAD\n"
-#: sequencer.c:3777
+#: sequencer.c:4050
#, c-format
msgid "Stopped at %s\n"
msgstr "Detenido en %s\n"
-#: sequencer.c:3785
+#: sequencer.c:4058
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -7276,48 +8159,58 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:3869
+#: sequencer.c:4104
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "Aplicando rebase (%d/%d)%s"
+
+#: sequencer.c:4149
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Detenido en %s... %.*s\n"
-#: sequencer.c:3940
+#: sequencer.c:4220
#, c-format
msgid "unknown command %d"
msgstr "comando desconocido %d"
-#: sequencer.c:3999
+#: sequencer.c:4279
msgid "could not read orig-head"
msgstr "no se puede leer orig-head"
-#: sequencer.c:4004
+#: sequencer.c:4284
msgid "could not read 'onto'"
msgstr "no se puede leer 'onto'"
-#: sequencer.c:4018
+#: sequencer.c:4298
#, c-format
msgid "could not update HEAD to %s"
msgstr "no se puede actualizar HEAD a %s"
-#: sequencer.c:4111
+#: sequencer.c:4358
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "Rebase aplicado satisfactoriamente y actualizado %s.\n"
+
+#: sequencer.c:4391
msgid "cannot rebase: You have unstaged changes."
msgstr "no se puede realizar rebase: Tienes cambios fuera del área de stage."
-#: sequencer.c:4120
+#: sequencer.c:4400
msgid "cannot amend non-existing commit"
msgstr "no se puede arreglar un commit no existente"
-#: sequencer.c:4122
+#: sequencer.c:4402
#, c-format
msgid "invalid file: '%s'"
msgstr "archivo inválido: '%s'"
-#: sequencer.c:4124
+#: sequencer.c:4404
#, c-format
msgid "invalid contents: '%s'"
msgstr "contenido inválido: '%s'"
-#: sequencer.c:4127
+#: sequencer.c:4407
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -7328,59 +8221,59 @@
"un commit con estos\n"
"primero y luego ejecuta 'git rebase --continue' de nuevo."
-#: sequencer.c:4163 sequencer.c:4202
+#: sequencer.c:4443 sequencer.c:4482
#, c-format
msgid "could not write file: '%s'"
msgstr "no se pudo escribir el archivo: '%s'"
-#: sequencer.c:4217
+#: sequencer.c:4498
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "no se puede eliminar CHERRY_PICK_HEAD"
-#: sequencer.c:4224
+#: sequencer.c:4505
msgid "could not commit staged changes."
msgstr "no se pudo realizar el commit con los cambios en el área de stage."
-#: sequencer.c:4338
+#: sequencer.c:4621
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: no se puede aplicar cherry-pick a un %s"
-#: sequencer.c:4342
+#: sequencer.c:4625
#, c-format
msgid "%s: bad revision"
msgstr "%s: revisión errónea"
-#: sequencer.c:4377
+#: sequencer.c:4660
msgid "can't revert as initial commit"
msgstr "no se puede revertir como commit inicial"
-#: sequencer.c:4846
+#: sequencer.c:5137
msgid "make_script: unhandled options"
msgstr "make_script: opciones desconocidas"
-#: sequencer.c:4849
+#: sequencer.c:5140
msgid "make_script: error preparing revisions"
msgstr "make_script: error preparando revisiones"
-#: sequencer.c:5083 sequencer.c:5100
+#: sequencer.c:5382 sequencer.c:5399
msgid "nothing to do"
msgstr "nada que hacer"
-#: sequencer.c:5119
+#: sequencer.c:5418
msgid "could not skip unnecessary pick commands"
msgstr "no se pudo saltar los comandos pick innecesarios"
-#: sequencer.c:5213
+#: sequencer.c:5512
msgid "the script was already rearranged."
msgstr "este script ya fue reorganizado."
-#: setup.c:124
+#: setup.c:133
#, c-format
msgid "'%s' is outside repository at '%s'"
msgstr "'%s' está fuera del repositorio en '%s'"
-#: setup.c:175
+#: setup.c:185
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
@@ -7390,7 +8283,7 @@
"Use 'git <comando> -- <ruta>...' para especificar rutas que no existen "
"localmente."
-#: setup.c:188
+#: setup.c:198
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -7402,12 +8295,12 @@
"Use '--' para separar las rutas de las revisiones, de esta manera:\n"
"'git <comando> [<revisión>...] -- [<archivo>...]'"
-#: setup.c:254
+#: 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:273
+#: setup.c:283
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -7418,95 +8311,99 @@
"Use '--' para separar rutas de revisiones, de esta manera:\n"
"'git <comando> [<revisión>...] -- [<archivo>...]'"
-#: setup.c:409
+#: 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:413
+#: 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:559
+#: setup.c:661
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Se esperaba versión de git repo <= %d, encontrada %d"
-#: setup.c:567
+#: setup.c:669
msgid "unknown repository extensions found:"
msgstr "se encontró extensión de repositorio desconocida:"
-#: setup.c:586
+#: setup.c:681
+msgid "repo version is 0, but v1-only extensions found:"
+msgstr "versión de repo es 0, pero extensión v1-only encontrada:"
+
+#: setup.c:700
#, c-format
msgid "error opening '%s'"
msgstr "error abriendo '%s'"
-#: setup.c:588
+#: setup.c:702
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "muy grande para ser un archivo .git: '%s'"
-#: setup.c:590
+#: setup.c:704
#, c-format
msgid "error reading %s"
msgstr "error leyendo %s"
-#: setup.c:592
+#: setup.c:706
#, c-format
msgid "invalid gitfile format: %s"
msgstr "formato gitfile inválido: %s"
-#: setup.c:594
+#: setup.c:708
#, c-format
msgid "no path in gitfile: %s"
msgstr "no hay ruta en gitfile: %s"
-#: setup.c:596
+#: setup.c:710
#, c-format
msgid "not a git repository: %s"
msgstr "no es un repositorio git: %s"
-#: setup.c:695
+#: setup.c:812
#, c-format
msgid "'$%s' too big"
msgstr "'$%s' muy grande"
-#: setup.c:709
+#: setup.c:826
#, c-format
msgid "not a git repository: '%s'"
msgstr "no es un repositorio git: '%s'"
-#: setup.c:738 setup.c:740 setup.c:771
+#: setup.c:855 setup.c:857 setup.c:888
#, c-format
msgid "cannot chdir to '%s'"
msgstr "no se puede aplicar chdir a '%s'"
-#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856
+#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973
msgid "cannot come back to cwd"
msgstr "no se puede volver a cwd"
-#: setup.c:870
+#: setup.c:987
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "falló al determinar '%*s%s%s'"
-#: setup.c:1108
+#: setup.c:1225
msgid "Unable to read current working directory"
msgstr "Incapaz de leer el directorio de trabajo actual"
-#: setup.c:1117 setup.c:1123
+#: setup.c:1234 setup.c:1240
#, c-format
msgid "cannot change to '%s'"
msgstr "no se puede cambiar a '%s'"
-#: setup.c:1128
+#: setup.c:1245
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr ""
"no es un repositorio git (ni ninguno de los directorios superiores): %s"
-#: setup.c:1134
+#: setup.c:1251
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
@@ -7516,7 +8413,7 @@
"Parando en el límite del sistema de archivos "
"(GIT_DISCOVERY_ACROSS_FILESYSTEM no establecido)."
-#: setup.c:1245
+#: setup.c:1362
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -7525,413 +8422,56 @@
"problema con el valor del modo de archivo core.sharedRepository (0%.3o).\n"
"El dueño de los archivos tiene que tener permisos de lectura y escritura."
-#: setup.c:1289
+#: setup.c:1409
msgid "open /dev/null or dup failed"
msgstr "falló al abrir /dev/null o dup"
-#: setup.c:1304
+#: setup.c:1424
msgid "fork failed"
msgstr "falló fork"
-#: setup.c:1309
+#: setup.c:1429
msgid "setsid failed"
msgstr "falló setsid"
-#: sha1-file.c:452
-#, c-format
-msgid "object directory %s does not exist; check .git/objects/info/alternates"
-msgstr "objeto directorio %s no existe; revisa .git/objects/info/alternates"
-
-#: sha1-file.c:503
-#, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr "incapaz de normalizar la ruta de objeto alterno: %s"
-
-#: sha1-file.c:575
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr "%s: ignorando espacios de objetos alternos, anidado muy profundo"
-
-#: sha1-file.c:582
-#, c-format
-msgid "unable to normalize object directory: %s"
-msgstr "incapaz de normalizar directorio de objeto: %s"
-
-#: sha1-file.c:625
-msgid "unable to fdopen alternates lockfile"
-msgstr "no es posible hacer fdopen en lockfile alternos"
-
-#: sha1-file.c:643
-msgid "unable to read alternates file"
-msgstr "no es posible leer archivos alternos"
-
-#: sha1-file.c:650
-msgid "unable to move new alternates file into place"
-msgstr "no es posible mover archivos alternos en el lugar"
-
-#: sha1-file.c:685
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "ruta '%s' no existe"
-
-#: sha1-file.c:711
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr ""
-"repositorio de referencia '%s' como un checkout vinculado no es soportado "
-"todavía."
-
-#: sha1-file.c:717
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "repositorio de referencia '%s' no es un repositorio local."
-
-#: sha1-file.c:723
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "repositorio de referencia '%s' es superficial (shallow)"
-
-#: sha1-file.c:731
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "repositorio de referencia '% s' está injertado"
-
-#: sha1-file.c:791
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "línea inválida mientras se analizaban refs alternas: %s"
-
-#: sha1-file.c:943
-#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
-msgstr "intentando usar mmap %<PRIuMAX> sobre límite %<PRIuMAX>"
-
-#: sha1-file.c:964
-msgid "mmap failed"
-msgstr "mmap falló"
-
-#: sha1-file.c:1128
-#, c-format
-msgid "object file %s is empty"
-msgstr "archivo de objeto %s está vacío"
-
-#: sha1-file.c:1263 sha1-file.c:2443
-#, c-format
-msgid "corrupt loose object '%s'"
-msgstr "objeto perdido corrupto '%s'"
-
-#: sha1-file.c:1265 sha1-file.c:2447
-#, c-format
-msgid "garbage at end of loose object '%s'"
-msgstr "basura al final del objeto perdido '%s'"
-
-#: sha1-file.c:1307
-msgid "invalid object type"
-msgstr "tipo de objeto inválido"
-
-#: sha1-file.c:1391
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "no es posible desempacar header %s con --allow-unknown-type"
-
-#: sha1-file.c:1394
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "incapaz de desempaquetar header %s"
-
-#: sha1-file.c:1400
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "no es posible analizar header %s con --allow-unknown-type"
-
-#: sha1-file.c:1403
-#, c-format
-msgid "unable to parse %s header"
-msgstr "incapaz de analizar header %s"
-
-#: sha1-file.c:1629
-#, c-format
-msgid "failed to read object %s"
-msgstr "falló al leer objeto %s"
-
-#: sha1-file.c:1633
-#, c-format
-msgid "replacement %s not found for %s"
-msgstr "reemplazo %s no encontrado para %s"
-
-#: sha1-file.c:1637
-#, c-format
-msgid "loose object %s (stored in %s) is corrupt"
-msgstr "objeto perdido %s (guardado en %s) está corrompido"
-
-#: sha1-file.c:1641
-#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "paquete de objeto %s (guardado en %s) está corrompido"
-
-#: sha1-file.c:1746
-#, c-format
-msgid "unable to write file %s"
-msgstr "no es posible escribir archivo %s"
-
-#: sha1-file.c:1753
-#, c-format
-msgid "unable to set permission to '%s'"
-msgstr "no se pudo poner permisos a '%s'"
-
-#: sha1-file.c:1760
-msgid "file write error"
-msgstr "falló de escritura"
-
-#: sha1-file.c:1780
-msgid "error when closing loose object file"
-msgstr "error cerrando el archivo de objeto suelto"
-
-#: sha1-file.c:1845
-#, c-format
-msgid "insufficient permission for adding an object to repository database %s"
-msgstr ""
-"permisos insuficientes para agregar un objeto a la base de datos del "
-"repositorio %s"
-
-#: sha1-file.c:1847
-msgid "unable to create temporary file"
-msgstr "no es posible crear un archivo temporal"
-
-#: sha1-file.c:1871
-msgid "unable to write loose object file"
-msgstr "no es posible escribir el archivo de objeto suelto"
-
-#: sha1-file.c:1877
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr "no es posible desinflar el objeto nuevo %s (%d)"
-
-#: sha1-file.c:1881
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr "deflateEnd en objeto %s falló (%d)"
-
-#: sha1-file.c:1885
-#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr "confundido por fuente de data de objetos inestable para %s"
-
-#: sha1-file.c:1895 builtin/pack-objects.c:1054
-#, c-format
-msgid "failed utime() on %s"
-msgstr "falló utime() en %s"
-
-#: sha1-file.c:1972
-#, c-format
-msgid "cannot read object for %s"
-msgstr "no se pudo leer el objeto para %s"
-
-#: sha1-file.c:2011
-msgid "corrupt commit"
-msgstr "commit corrupto"
-
-#: sha1-file.c:2019
-msgid "corrupt tag"
-msgstr "tag corrupto"
-
-#: sha1-file.c:2119
-#, c-format
-msgid "read error while indexing %s"
-msgstr "error leyendo al indexar %s"
-
-#: sha1-file.c:2122
-#, c-format
-msgid "short read while indexing %s"
-msgstr "lectura corta al indexar %s"
-
-#: sha1-file.c:2195 sha1-file.c:2205
-#, c-format
-msgid "%s: failed to insert into database"
-msgstr "%s: falló al insertar en la base de datos"
-
-#: sha1-file.c:2211
-#, c-format
-msgid "%s: unsupported file type"
-msgstr "%s: tipo de archivo no soportado"
-
-#: sha1-file.c:2235
-#, c-format
-msgid "%s is not a valid object"
-msgstr "%s no es objeto válido"
-
-#: sha1-file.c:2237
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s no es un objeto '%s' válido"
-
-#: sha1-file.c:2264 builtin/index-pack.c:155
-#, c-format
-msgid "unable to open %s"
-msgstr "no es posible abrir %s"
-
-#: sha1-file.c:2454 sha1-file.c:2507
-#, c-format
-msgid "hash mismatch for %s (expected %s)"
-msgstr "hash no concuerda para %s (se esperaba %s)"
-
-#: sha1-file.c:2478
-#, c-format
-msgid "unable to mmap %s"
-msgstr "no es posible hacer mmap a %s"
-
-#: sha1-file.c:2483
-#, c-format
-msgid "unable to unpack header of %s"
-msgstr "incapaz de desempaquetar header de %s"
-
-#: sha1-file.c:2489
-#, c-format
-msgid "unable to parse header of %s"
-msgstr "incapaz de analizar header de %s"
-
-#: sha1-file.c:2500
-#, c-format
-msgid "unable to unpack contents of %s"
-msgstr "no es posible desempaquetar contenidos de %s"
-
-#: sha1-name.c:486
-#, c-format
-msgid "short SHA1 %s is ambiguous"
-msgstr "SHA1 %s corto es ambiguo"
-
-#: sha1-name.c:497
-msgid "The candidates are:"
-msgstr "Los candidatos son:"
-
-#: 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 normalmente nunca crea una ref que termine con 40 caracteres hex\n"
-"porque esto sería ignorado cuando solo se especifiquen 40-hex. Estas refs\n"
-"tal vez sean creadas por error. Por ejemplo,\n"
-"\n"
-" git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"donde \"$br\" está de alguna manera vacía y una ref de 40-hex es creada. Por "
-"favor\n"
-"examina estas refs y tal vez bórralas. Silencia este mensaje \n"
-"ejecutando \"git config advice.objectNameWarning false\""
-
-#: sha1-name.c:916
-#, c-format
-msgid "log for '%.*s' only goes back to %s"
-msgstr "log para '%.*s' solo va hasta %s"
-
-#: sha1-name.c:924
-#, c-format
-msgid "log for '%.*s' only has %d entries"
-msgstr "log para '%.*s' solo tiene %d entradas"
-
-#: sha1-name.c:1689
-#, c-format
-msgid "path '%s' exists on disk, but not in '%.*s'"
-msgstr "la ruta '%s' existe en disco, pero no en '%.*s'"
-
-#: sha1-name.c:1695
-#, c-format
-msgid ""
-"path '%s' exists, but not '%s'\n"
-"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
-msgstr ""
-"ruta '%s' existe, pero no '%s'\n"
-"ayuda: ¿Quisiste decir '%.*s:%s' o '%.*s:./%s'?"
-
-#: sha1-name.c:1704
-#, c-format
-msgid "path '%s' does not exist in '%.*s'"
-msgstr "ruta '%s' no existe en '%.*s'"
-
-#: sha1-name.c:1732
-#, c-format
-msgid ""
-"path '%s' is in the index, but not at stage %d\n"
-"hint: Did you mean ':%d:%s'?"
-msgstr ""
-"ruta '%s' está en el index, pero no en stage %d\n"
-"ayuda:¿Quisiste decir: '%d:%s'?"
-
-#: sha1-name.c:1748
-#, c-format
-msgid ""
-"path '%s' is in the index, but not '%s'\n"
-"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
-msgstr ""
-"ruta '%s' está en el index, pero no '%s'\n"
-"ayuda:¿Quisiste decir ':%d:%s' o ':%d:./%s'?"
-
-#: sha1-name.c:1756
-#, c-format
-msgid "path '%s' exists on disk, but not in the index"
-msgstr "ruta '%s' existe en el disco, pero no en el index"
-
-#: sha1-name.c:1758
-#, c-format
-msgid "path '%s' does not exist (neither on disk nor in the index)"
-msgstr "ruta '%s' no existe (ni en disco ni en el index)"
-
-#: sha1-name.c:1771
-msgid "relative path syntax can't be used outside working tree"
-msgstr ""
-"la sintaxis de ruta relativa no se puede usar fuera del directorio de trabajo"
-
-#: sha1-name.c:1909
-#, c-format
-msgid "invalid object name '%.*s'."
-msgstr "nombre de objeto no válido: '%.*s'."
-
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:837
+#: strbuf.c:848
#, c-format
msgid "%u.%2.2u GiB"
msgstr "%u.%2.2u GiB"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:839
+#: 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:847
+#: strbuf.c:858
#, c-format
msgid "%u.%2.2u MiB"
msgstr "%u.%2.2u MiB"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:849
+#: 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:856
+#: strbuf.c:867
#, c-format
msgid "%u.%2.2u KiB"
msgstr "%u.%2.2u KiB"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:858
+#: 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:864
+#: strbuf.c:875
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
@@ -7939,18 +8479,50 @@
msgstr[1] "%u bytes"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:866
+#: 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:1164
+#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719
+#: builtin/rebase.c:866
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "no se pudo abrir '%s' para escritura"
+
+#: 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 ""
@@ -7980,12 +8552,12 @@
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "El patrón de ruta '%s' está en el submódulo '%.*s'"
-#: submodule.c:434
+#: submodule.c:435
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr "mal argumento --ignore-submodules: %s"
-#: submodule.c:815
+#: submodule.c:817
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
@@ -7994,50 +8566,50 @@
"Submódulo en el commit %s en ruta: '%s' colisiona con un submódulo llamado "
"igual. Saltandolo."
-#: submodule.c:910
+#: submodule.c:920
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "entrada de submódulo '%s' (%s) es un %s, no un commit"
-#: submodule.c:995
+#: submodule.c:1005
#, 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 "
+"No se pudo ejecutar comando 'git rev-list <commits> --not --remotes -n 1' en "
"el submódulo %s"
-#: submodule.c:1118
+#: submodule.c:1128
#, c-format
msgid "process for submodule '%s' failed"
msgstr "proceso para submódulo '%s' falló"
-#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045
+#: submodule.c:1157 builtin/branch.c:689 builtin/submodule--helper.c:2469
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Falló al resolver HEAD como un ref válido."
-#: submodule.c:1158
+#: submodule.c:1168
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr "Empujando submódulo '%s'\n"
-#: submodule.c:1161
+#: submodule.c:1171
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "No es posible hacer push al submódulo '%s'\n"
-#: submodule.c:1453
+#: submodule.c:1463
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr "Haciendo fetch al submódulo %s%s\n"
-#: submodule.c:1483
+#: submodule.c:1497
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr "No pudo acceder al submódulo '%s'\n"
-#: submodule.c:1637
+#: submodule.c:1652
#, c-format
msgid ""
"Errors during submodule fetch:\n"
@@ -8046,61 +8618,61 @@
"Errores durante el fetch del submódulo:\n"
"%s"
-#: submodule.c:1662
+#: submodule.c:1677
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "'%s' no reconocido como un repositorio git"
-#: submodule.c:1679
+#: submodule.c:1694
#, 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
+#: submodule.c:1735
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr "'git status --procelain=2' falló en el submódulo %s"
-#: submodule.c:1800
+#: submodule.c:1810
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "no se pudo comenzar 'git status' en el submódulo '%s'"
-#: submodule.c:1813
+#: submodule.c:1823
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "no se pudo ejecutar 'git status' en el submódulo '%s'"
-#: submodule.c:1828
+#: submodule.c:1838
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "No se pudo quitar configuración core.worktree en submódulo '%s'"
-#: submodule.c:1855 submodule.c:2165
+#: submodule.c:1865 submodule.c:2175
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "no pudo recursar en el submódulo '%s'"
-#: submodule.c:1876
+#: submodule.c:1886
msgid "could not reset submodule index"
msgstr "no se pudo reiniciar el index del submódulo"
-#: submodule.c:1918
+#: submodule.c:1928
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "submódulo '%s' tiene un índice corrupto"
-#: submodule.c:1970
+#: submodule.c:1980
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "Submódulo '%s' no pudo ser actualizado."
-#: submodule.c:2038
+#: submodule.c:2048
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr "submódulo git dir '%s' esta dentro de git dir '%.*s'"
-#: submodule.c:2059
+#: submodule.c:2069
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -8108,17 +8680,17 @@
"relocate_gitdir para el submódulo '%s' con más de un árbol de trabajo no "
"soportado"
-#: submodule.c:2071 submodule.c:2130
+#: submodule.c:2081 submodule.c:2140
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "no se pudo resolver el nombre para el submódulo '%s'"
-#: submodule.c:2075
+#: submodule.c:2085
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr "rechazando mover '%s' dentro de un directorio git existente"
-#: submodule.c:2082
+#: submodule.c:2092
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -8129,95 +8701,259 @@
"'%s' hacia\n"
"'%s'\n"
-#: submodule.c:2209
+#: submodule.c:2220
msgid "could not start ls-files in .."
msgstr "no se pudo comenzar ls-files en .."
-#: submodule.c:2248
+#: submodule.c:2260
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree devolvió un código %d inesperado"
-#: submodule-config.c:236
-#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "ignorando submódulo sospechoso: %s"
-
-#: submodule-config.c:303
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "no se permiten valores negativos para submodule.fetchjobs"
-
-#: submodule-config.c:401
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr ""
-"ignorando '%s' ya que puede ser interpretado como una opción de línea de "
-"comando: %s"
-
-#: submodule-config.c:498
-#, c-format
-msgid "invalid value for %s"
-msgstr "valor inválido para %s"
-
-#: submodule-config.c:765
-#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr "No se pudo actualizar la entrada %s de .gitmodules"
-
-#: trailer.c:238
+#: trailer.c:236
#, c-format
msgid "running trailer command '%s' failed"
msgstr "ejecución del comando de remolque '%s' falló"
-#: 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 '%s' desconocido para la clave '%s'"
-#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323
+#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324
#, c-format
msgid "more than one %s"
msgstr "más de un %s"
-#: trailer.c:730
+#: trailer.c:728
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr "token de remolque vacío en el trailer '%.*s'"
-#: trailer.c:750
+#: trailer.c:748
#, c-format
msgid "could not read input file '%s'"
msgstr "no se pudo leer el archivo de entrada '%s'"
-#: trailer.c:753
+#: trailer.c:751 builtin/mktag.c:91
msgid "could not read from stdin"
msgstr "no se pudo leer desde stdin"
-#: trailer.c:1011 wrapper.c:665
+#: trailer.c:1009 wrapper.c:676
#, c-format
msgid "could not stat %s"
msgstr "no se pudo definir %s"
-#: trailer.c:1013
+#: trailer.c:1011
#, c-format
msgid "file %s is not a regular file"
msgstr "el archivo %s no es un archivo regular"
-#: trailer.c:1015
+#: trailer.c:1013
#, c-format
msgid "file %s is not writable by user"
msgstr "el archivo %s no puede ser escrito por el usuario"
-#: trailer.c:1027
+#: trailer.c:1025
msgid "could not open temporary file"
msgstr "no se pudo abrir el archivo temporal"
-#: trailer.c:1067
+#: trailer.c:1065
#, c-format
msgid "could not rename temporary file to %s"
msgstr "no se pudo renombrar el archivo temporal a %s"
+#: 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:145
+#, c-format
+msgid "unable to find remote helper for '%s'"
+msgstr "no es posible encontrar helper remoto para '%s'"
+
+#: 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:214
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
+msgstr ""
+"capacidad mandatoria desconocida %s; este helper remoto probablemente "
+"necesita una nueva versión de Git"
+
+#: transport-helper.c:220
+msgid "this remote helper should implement refspec capability"
+msgstr "este helper remoto debería implementar capacidad refspec"
+
+#: transport-helper.c:287 transport-helper.c:429
+#, c-format
+msgid "%s unexpectedly said: '%s'"
+msgstr "%s dijo inesperadamente: '%s'"
+
+#: transport-helper.c:417
+#, c-format
+msgid "%s also locked %s"
+msgstr "%s también bloqueó %s"
+
+#: transport-helper.c:497
+msgid "couldn't run fast-import"
+msgstr "no se pudo ejecutar fast-import"
+
+#: transport-helper.c:520
+msgid "error while running fast-import"
+msgstr "error al ejecutar fast-import"
+
+#: transport-helper.c:549 transport-helper.c:1237
+#, c-format
+msgid "could not read ref %s"
+msgstr "no se pudo leer la referencia %s"
+
+#: transport-helper.c:594
+#, c-format
+msgid "unknown response to connect: %s"
+msgstr "respuesta para conectar desconocida: %s"
+
+#: 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:618
+msgid "invalid remote service path"
+msgstr "ruta de servicio remoto inválida"
+
+#: transport-helper.c:661 transport.c:1447
+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:745
+msgid "'option' without a matching 'ok/error' directive"
+msgstr "'opción' sin una directiva correspondiente 'ok/error'"
+
+#: transport-helper.c:788
+#, c-format
+msgid "expected ok/error, helper said '%s'"
+msgstr "se esperaba ok/error, helper dijo '%s'"
+
+#: transport-helper.c:845
+#, c-format
+msgid "helper reported unexpected status of %s"
+msgstr "helper reportó estado inesperado de %s"
+
+#: transport-helper.c:928
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr "helper %s no soporta dry-run"
+
+#: transport-helper.c:931
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr "helper %s no soporta --signed"
+
+#: transport-helper.c:934
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr "helper %s no soporta --signed=if-asked"
+
+#: transport-helper.c:939
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr "helper %s no soporta --atomic"
+
+#: transport-helper.c:943
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr "helper %s no soporta --%s"
+
+#: transport-helper.c:950
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr "helper %s no soporta 'push-option'"
+
+#: transport-helper.c:1050
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr "remote-helper no soporta push; se necesita refspec"
+
+#: transport-helper.c:1055
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr "helper %s no soporta 'force'"
+
+#: transport-helper.c:1102
+msgid "couldn't run fast-export"
+msgstr "no se pudo ejecutar fast-export"
+
+#: transport-helper.c:1107
+msgid "error while running fast-export"
+msgstr "error al ejecutar fast-export"
+
+#: transport-helper.c:1132
+#, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\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.\n"
+
+#: transport-helper.c:1214
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr "formado de objeto no soportado '%s'"
+
+#: transport-helper.c:1223
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr "respuesta malformada en lista de refs: %s"
+
+#: transport-helper.c:1375
+#, c-format
+msgid "read(%s) failed"
+msgstr "leer(%s) falló"
+
+#: transport-helper.c:1402
+#, c-format
+msgid "write(%s) failed"
+msgstr "escribir(%s) falló"
+
+#: transport-helper.c:1451
+#, c-format
+msgid "%s thread failed"
+msgstr "hilo %s falló"
+
+#: transport-helper.c:1455
+#, c-format
+msgid "%s thread failed to join: %s"
+msgstr "hilo %s falló al unirse: %s"
+
+#: transport-helper.c:1474 transport-helper.c:1478
+#, 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:1515
+#, c-format
+msgid "%s process failed to wait"
+msgstr "proceso %s falló al esperar"
+
+#: transport-helper.c:1519
+#, c-format
+msgid "%s process failed"
+msgstr "proceso %s falló"
+
+#: transport-helper.c:1537 transport-helper.c:1546
+msgid "can't start thread for copying data"
+msgstr "no se puede iniciar hilo para copiar data"
+
#: transport.c:116
#, c-format
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
@@ -8228,42 +8964,42 @@
msgid "could not read bundle '%s'"
msgstr "no se pudo leer el conjunto '%s'"
-#: transport.c:214
+#: transport.c:220
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "transport: opción inválida '%s'"
-#: transport.c:266
+#: transport.c:269
msgid "see protocol.version in 'git help config' for more details"
msgstr "ver protocol.version en 'git help config' para más información"
-#: transport.c:267
+#: transport.c:270
msgid "server options require protocol version 2 or later"
msgstr "opciones del servidor requieren protocolo versión 2 o posterior"
-#: transport.c:632
+#: transport.c:727
msgid "could not parse transport.color.* config"
msgstr "no se pudo analizar valor de configuración transport.color.*"
-#: transport.c:705
+#: transport.c:802
msgid "support for protocol v2 not implemented yet"
msgstr "soporte para protocolo v2 no implementado todavía"
-#: transport.c:831
+#: transport.c:936
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "valor desconocido para configuración '%s': %s"
-#: transport.c:897
+#: transport.c:1002
#, c-format
msgid "transport '%s' not allowed"
msgstr "transporte '%s' no permitido"
-#: transport.c:949
+#: transport.c:1055
msgid "git-over-rsync is no longer supported"
msgstr "git-over-rsync ya no es soportado"
-#: transport.c:1044
+#: transport.c:1157
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -8272,7 +9008,7 @@
"La siguiente ruta de submódulo contiene cambios que no\n"
"pueden ser encontrados en ningún remoto:\n"
-#: transport.c:1048
+#: transport.c:1161
#, c-format
msgid ""
"\n"
@@ -8299,207 +9035,31 @@
"para hacer un push al remoto.\n"
"\n"
-#: transport.c:1056
+#: transport.c:1169
msgid "Aborting."
msgstr "Abortando."
-#: transport.c:1201
+#: transport.c:1316
msgid "failed to push all needed submodules"
msgstr "falló al hacer push a todos los submódulos necesarios"
-#: transport.c:1345 transport-helper.c:657
-msgid "operation not supported by protocol"
-msgstr "operación no soportada por protocolo"
-
-#: transport-helper.c:61 transport-helper.c:90
-msgid "full write to remote helper failed"
-msgstr "escritura total al helper remoto falló"
-
-#: transport-helper.c:144
-#, c-format
-msgid "unable to find remote helper for '%s'"
-msgstr "no es posible encontrar helper remoto para '%s'"
-
-#: transport-helper.c:160 transport-helper.c:571
-msgid "can't dup helper output fd"
-msgstr "no se puede duplicar output de fd del helper"
-
-#: transport-helper.c:211
-#, c-format
-msgid ""
-"unknown mandatory capability %s; this remote helper probably needs newer "
-"version of Git"
-msgstr ""
-"capacidad mandatoria desconocida %s; este helper remoto probablemente "
-"necesita una nueva versión de Git"
-
-#: transport-helper.c:217
-msgid "this remote helper should implement refspec capability"
-msgstr "este helper remoto debería implementar capacidad refspec"
-
-#: transport-helper.c:284 transport-helper.c:425
-#, c-format
-msgid "%s unexpectedly said: '%s'"
-msgstr "%s dijo inesperadamente: '%s'"
-
-#: transport-helper.c:414
-#, c-format
-msgid "%s also locked %s"
-msgstr "%s también bloqueó %s"
-
-#: transport-helper.c:493
-msgid "couldn't run fast-import"
-msgstr "no se pudo ejecutar fast-import"
-
-#: transport-helper.c:516
-msgid "error while running fast-import"
-msgstr "error al ejecutar fast-import"
-
-#: transport-helper.c:545 transport-helper.c:1134
-#, c-format
-msgid "could not read ref %s"
-msgstr "no se pudo leer la referencia %s"
-
-#: transport-helper.c:590
-#, c-format
-msgid "unknown response to connect: %s"
-msgstr "respuesta para conectar desconocida: %s"
-
-#: transport-helper.c:612
-msgid "setting remote service path not supported by protocol"
-msgstr "configurando servicio de ruta remota no soportado por el protocolo"
-
-#: transport-helper.c:614
-msgid "invalid remote service path"
-msgstr "ruta de servicio remoto inválida"
-
-#: transport-helper.c:660
-#, c-format
-msgid "can't connect to subservice %s"
-msgstr "no se puede conectar al subservicio %s"
-
-#: transport-helper.c:736
-#, c-format
-msgid "expected ok/error, helper said '%s'"
-msgstr "se esperaba ok/error, helper dijo '%s'"
-
-#: transport-helper.c:789
-#, c-format
-msgid "helper reported unexpected status of %s"
-msgstr "helper reportó estado inesperado de %s"
-
-#: transport-helper.c:850
-#, c-format
-msgid "helper %s does not support dry-run"
-msgstr "helper %s no soporta dry-run"
-
-#: transport-helper.c:853
-#, c-format
-msgid "helper %s does not support --signed"
-msgstr "helper %s no soporta --signed"
-
-#: transport-helper.c:856
-#, c-format
-msgid "helper %s does not support --signed=if-asked"
-msgstr "helper %s no soporta --signed=if-asked"
-
-#: transport-helper.c:861
-#, c-format
-msgid "helper %s does not support --atomic"
-msgstr "helper %s no soporta --atomic"
-
-#: transport-helper.c:867
-#, c-format
-msgid "helper %s does not support 'push-option'"
-msgstr "helper %s no soporta 'push-option'"
-
-#: transport-helper.c:965
-msgid "remote-helper doesn't support push; refspec needed"
-msgstr "remote-helper no soporta push; se necesita refspec"
-
-#: transport-helper.c:970
-#, c-format
-msgid "helper %s does not support 'force'"
-msgstr "helper %s no soporta 'force'"
-
-#: transport-helper.c:1017
-msgid "couldn't run fast-export"
-msgstr "no se pudo ejecutar fast-export"
-
-#: transport-helper.c:1022
-msgid "error while running fast-export"
-msgstr "error al ejecutar fast-export"
-
-#: transport-helper.c:1047
-#, c-format
-msgid ""
-"No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch such as 'master'.\n"
-msgstr ""
-"No hay refs comunes y ninguno especificado; no se hace nada.\n"
-"Tal vez deberías especificar un branch como 'master'.\n"
-
-#: transport-helper.c:1120
-#, c-format
-msgid "malformed response in ref list: %s"
-msgstr "respuesta malformada en lista de refs: %s"
-
-#: transport-helper.c:1272
-#, c-format
-msgid "read(%s) failed"
-msgstr "leer(%s) falló"
-
-#: transport-helper.c:1299
-#, c-format
-msgid "write(%s) failed"
-msgstr "escribir(%s) falló"
-
-#: transport-helper.c:1348
-#, c-format
-msgid "%s thread failed"
-msgstr "hilo %s falló"
-
-#: transport-helper.c:1352
-#, c-format
-msgid "%s thread failed to join: %s"
-msgstr "hilo %s falló al unirse: %s"
-
-#: transport-helper.c:1371 transport-helper.c:1375
-#, c-format
-msgid "can't start thread for copying data: %s"
-msgstr "no se puede iniciar el hilo para copiar data: %s"
-
-#: transport-helper.c:1412
-#, c-format
-msgid "%s process failed to wait"
-msgstr "proceso %s falló al esperar"
-
-#: transport-helper.c:1416
-#, c-format
-msgid "%s process failed"
-msgstr "proceso %s falló"
-
-#: transport-helper.c:1434 transport-helper.c:1443
-msgid "can't start thread for copying data"
-msgstr "no se puede iniciar hilo para copiar data"
-
-#: tree-walk.c:32
+#: tree-walk.c:33
msgid "too-short tree object"
msgstr "objeto de árbol muy corto"
-#: tree-walk.c:38
+#: tree-walk.c:39
msgid "malformed mode in tree entry"
msgstr "modo mal formado en la entrada de árbol"
-#: tree-walk.c:42
+#: tree-walk.c:43
msgid "empty filename in tree entry"
msgstr "nombre de archivo vacío en la entrada de árbol"
-#: tree-walk.c:117
+#: tree-walk.c:118
msgid "too-short tree file"
msgstr "archivo de árbol muy corto"
-#: unpack-trees.c:110
+#: unpack-trees.c:113
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -8510,7 +9070,7 @@
"%%sPor favor realiza un commit con los cambios o un stash antes de cambiar "
"ramas."
-#: unpack-trees.c:112
+#: unpack-trees.c:115
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -8520,7 +9080,7 @@
"checkout:\n"
"%%s"
-#: unpack-trees.c:115
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -8530,7 +9090,7 @@
"fusionar:\n"
"%%sPor favor, confirma tus cambios o aguárdalos antes de fusionar."
-#: unpack-trees.c:117
+#: unpack-trees.c:120
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -8540,7 +9100,7 @@
"merge:\n"
"%%s"
-#: unpack-trees.c:120
+#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -8549,7 +9109,7 @@
"Los cambios locales de los siguientes archivos serán sobrescritos al %s:\n"
"%%sPor favor, confirma tus cambios o guárdalos antes de %s."
-#: unpack-trees.c:122
+#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -8558,7 +9118,7 @@
"Los cambios locales de los siguientes archivos serán sobreescritos por %s:\n"
"%%s"
-#: unpack-trees.c:127
+#: unpack-trees.c:130
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -8568,7 +9128,7 @@
"seguimiento en ellos:\n"
"%s"
-#: unpack-trees.c:131
+#: unpack-trees.c:134
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -8578,7 +9138,7 @@
"eliminados al actualizar el árbol de trabajo:\n"
"%%sPor favor, muévelos o elimínalos antes de intercambiar ramas."
-#: unpack-trees.c:133
+#: unpack-trees.c:136
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -8588,7 +9148,7 @@
"eliminadosal actualizar el árbol de trabajo:\n"
"%%s"
-#: unpack-trees.c:136
+#: unpack-trees.c:139
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -8598,7 +9158,7 @@
"eliminados al fusionar:\n"
"%%sPor favor, muévelos o elimínalos antes de fusionar."
-#: unpack-trees.c:138
+#: unpack-trees.c:141
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -8608,7 +9168,7 @@
"eliminadosal fusionar:\n"
"%%s"
-#: unpack-trees.c:141
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -8618,7 +9178,7 @@
"eliminados al %s:\n"
"%%sPor favor, muévelos o elimínalos antes de %s."
-#: unpack-trees.c:143
+#: unpack-trees.c:146
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -8628,7 +9188,7 @@
"eliminados al ejecutar %s:\n"
"%%s"
-#: unpack-trees.c:149
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -8639,7 +9199,7 @@
"sobrescritos al actualizar el árbol de trabajo:\n"
"%%sPor favor, muévelos o elimínalos antes de intercambiar ramas."
-#: unpack-trees.c:151
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -8650,7 +9210,7 @@
"sobrescritos al actualizar el árbol de trabajo:\n"
"%%s"
-#: unpack-trees.c:154
+#: unpack-trees.c:157
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -8660,7 +9220,7 @@
"sobrescritos al fusionar:\n"
"%%sPor favor, muévelos o elimínalos antes de fusionar."
-#: unpack-trees.c:156
+#: unpack-trees.c:159
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -8670,7 +9230,7 @@
"sobrescritos al fusionar:\n"
"%%s"
-#: unpack-trees.c:159
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -8680,7 +9240,7 @@
"sobrescritos al %s:\n"
"%%sPor favor, muévelos o elimínalos antes de %s."
-#: unpack-trees.c:161
+#: unpack-trees.c:164
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -8690,44 +9250,12 @@
"eliminadospor %s:\n"
"%%s"
-#: unpack-trees.c:169
+#: 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:172
-#, 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"
-
-#: unpack-trees.c:174
-#, 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"
-
-#: unpack-trees.c:176
-#, 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"
-
-#: unpack-trees.c:178
+#: unpack-trees.c:175
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -8736,16 +9264,57 @@
"No se puede actualizar le submódulo:\n"
"%s"
-#: unpack-trees.c:255
+#: unpack-trees.c:178
+#, c-format
+msgid ""
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+"La siguientes rutas no están actualizadas y fueron dejadas a pesar del "
+"patrón especificado:\n"
+"%s"
+
+#: unpack-trees.c:180
+#, c-format
+msgid ""
+"The following paths are unmerged and were left despite sparse patterns:\n"
+"%s"
+msgstr ""
+"Las siguientes rutas son ignoradas y fueron dejadas a pesar de los patrones "
+"sparse:\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 ""
+"Las siguientes rutas ya estaban presentes y por eso no fueron actualizadas a "
+"pesar del patrón especificado:\n"
+"%s"
+
+#: unpack-trees.c:262
#, c-format
msgid "Aborting\n"
msgstr "Abortando\n"
-#: unpack-trees.c:317
+#: 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:349
+#: 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"
@@ -8755,10 +9324,14 @@
"en un filesystem case-insensitive) y solo una del grupo\n"
"colisionando está en el árbol de trabajo:\n"
-#: unpack-trees.c:1445
+#: unpack-trees.c:1498
msgid "Updating index flags"
msgstr "Actualizando flags del index"
+#: upload-pack.c:1543
+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"
@@ -8792,30 +9365,30 @@
msgid "Fetching objects"
msgstr "Haciendo fetch a objetos"
-#: worktree.c:259 builtin/am.c:2099
+#: worktree.c:238 builtin/am.c:2103
#, c-format
msgid "failed to read '%s'"
msgstr "falló al leer '%s'"
-#: worktree.c:305
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr ""
"'%s' en el árbol de trabajo principal no es el directorio del repositorio"
-#: worktree.c:316
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
"archivo '%s' no contiene una ruta absoluta a la ubicación del árbol de "
"trabajo"
-#: worktree.c:328
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' no existe"
-#: worktree.c:334
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "'%s' no es un archivo .git, código de error %d"
@@ -8825,17 +9398,85 @@
msgid "'%s' does not point back to '%s'"
msgstr "'%s' no apunta de vuelta a '%s'"
-#: wrapper.c:186 wrapper.c:356
+#: worktree.c:608
+msgid "not a directory"
+msgstr "no es un directorio"
+
+#: worktree.c:617
+msgid ".git is not a file"
+msgstr ".git no es un archivo"
+
+#: worktree.c:619
+msgid ".git file broken"
+msgstr "archivo .git roto"
+
+#: worktree.c:621
+msgid ".git file incorrect"
+msgstr "archivo .git incorrecto"
+
+#: worktree.c:727
+msgid "not a valid path"
+msgstr "no es una ruta válida"
+
+#: worktree.c:733
+msgid "unable to locate repository; .git is not a file"
+msgstr "no es posible ubicar el repositorio; .git no es un archivo"
+
+#: worktree.c:737
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr ""
+"incapaz de localizar el repositorio; El archivo .git no hace referencia a un "
+"repositorio"
+
+#: worktree.c:741
+msgid "unable to locate repository; .git file broken"
+msgstr "no es posible ubicar el repositorio; archivo .git roto"
+
+#: worktree.c:747
+msgid "gitdir unreadable"
+msgstr "gitdir ilegible"
+
+#: worktree.c:751
+msgid "gitdir incorrect"
+msgstr "gitdir incorrecto"
+
+#: worktree.c:776
+msgid "not a valid directory"
+msgstr "no en un directorio válido"
+
+#: worktree.c:782
+msgid "gitdir file does not exist"
+msgstr "archivo gitdir no existe"
+
+#: worktree.c:787 worktree.c:796
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "no es posible leer archivo gitdir (%s)"
+
+#: worktree.c:806
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr "lectura corta (se esperaba %<PRIuMAX> bytes, se leyó %<PRIuMAX>)"
+
+#: worktree.c:814
+msgid "invalid gitdir file"
+msgstr "archivo gitdir inválido"
+
+#: worktree.c:822
+msgid "gitdir file points to non-existent location"
+msgstr "archivo gitdir apunta a una ubicación inexistente"
+
+#: wrapper.c:197 wrapper.c:367
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "no se pudo abrir '%s' para lectura y escritura"
-#: wrapper.c:387 wrapper.c:588
+#: wrapper.c:398 wrapper.c:599
#, c-format
msgid "unable to access '%s'"
msgstr "no es posible acceder '%s'"
-#: wrapper.c:596
+#: wrapper.c:607
msgid "unable to get current working directory"
msgstr "no es posible obtener el directorio de trabajo actual"
@@ -8873,11 +9514,11 @@
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:"
@@ -8911,94 +9552,94 @@
msgstr ""
" (usa \"git %s <archivo>...\" para incluirlo a lo que se será confirmado)"
-#: wt-status.c:268
+#: wt-status.c:266
msgid "both deleted:"
msgstr "ambos borrados:"
-#: wt-status.c:270
+#: wt-status.c:268
msgid "added by us:"
msgstr "agregado por nosotros:"
-#: wt-status.c:272
+#: wt-status.c:270
msgid "deleted by them:"
msgstr "borrados por ellos:"
-#: wt-status.c:274
+#: wt-status.c:272
msgid "added by them:"
msgstr "agregado por ellos:"
-#: wt-status.c:276
+#: wt-status.c:274
msgid "deleted by us:"
msgstr "borrado por nosotros:"
-#: wt-status.c:278
+#: wt-status.c:276
msgid "both added:"
msgstr "ambos agregados:"
-#: wt-status.c:280
+#: wt-status.c:278
msgid "both modified:"
msgstr "ambos modificados:"
-#: wt-status.c:290
+#: wt-status.c:288
msgid "new file:"
msgstr "nuevo archivo:"
-#: wt-status.c:292
+#: wt-status.c:290
msgid "copied:"
msgstr "copiado:"
-#: wt-status.c:294
+#: wt-status.c:292
msgid "deleted:"
msgstr "borrado:"
-#: wt-status.c:296
+#: wt-status.c:294
msgid "modified:"
msgstr "modificado:"
-#: wt-status.c:298
+#: wt-status.c:296
msgid "renamed:"
msgstr "renombrado:"
-#: wt-status.c:300
+#: wt-status.c:298
msgid "typechange:"
msgstr "cambio de tipo:"
-#: wt-status.c:302
+#: wt-status.c:300
msgid "unknown:"
msgstr "desconocido:"
-#: wt-status.c:304
+#: wt-status.c:302
msgid "unmerged:"
msgstr "des-fusionado:"
-#: wt-status.c:384
+#: wt-status.c:382
msgid "new commits, "
msgstr "nuevos commits, "
-#: wt-status.c:386
+#: wt-status.c:384
msgid "modified content, "
msgstr "contenido modificado, "
-#: wt-status.c:388
+#: wt-status.c:386
msgid "untracked content, "
msgstr "contenido no rastreado, "
-#: wt-status.c:906
+#: wt-status.c:905
#, 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."
@@ -9006,7 +9647,7 @@
"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"
@@ -9017,107 +9658,107 @@
"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'."
@@ -9125,144 +9766,157 @@
"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:1437
+#: 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:1439
+#: wt-status.c:1437
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (use \"git cherry-pick --abort\" para cancelar la operación cherry-pick)"
-#: wt-status.c:1449
+#: wt-status.c:1447
msgid "Revert currently in progress."
msgstr "Revierte el estado en progreso actual."
-#: wt-status.c:1452
+#: wt-status.c:1450
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Estás revirtiendo el commit %s."
-#: wt-status.c:1458
+#: wt-status.c:1456
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (corrige los conflictos y ejecuta \"git revert --continue\")"
-#: wt-status.c:1461
+#: wt-status.c:1459
msgid " (run \"git revert --continue\" to continue)"
msgstr " (ejecuta \"git revert --continue\" para continuar)"
-#: wt-status.c:1464
+#: wt-status.c:1462
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (todos los conflictos corregidos: ejecuta \"git revert --continue\")"
-#: wt-status.c:1466
+#: 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:1468
+#: 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:1478
+#: 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:1482
+#: wt-status.c:1480
msgid "You are currently bisecting."
msgstr "Estás aplicando un bisect."
-#: wt-status.c:1485
+#: 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:1694
+#: 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:1701
+#: wt-status.c:1740
msgid "interactive rebase in progress; onto "
msgstr "rebase interactivo en progreso; en "
-#: wt-status.c:1703
+#: wt-status.c:1742
msgid "rebase in progress; onto "
msgstr "rebase en progreso; en "
-#: wt-status.c:1713
+#: wt-status.c:1747
+msgid "HEAD detached at "
+msgstr "HEAD desacoplada en "
+
+#: wt-status.c:1749
+msgid "HEAD detached from "
+msgstr "HEAD desacoplada de "
+
+#: wt-status.c:1752
msgid "Not currently on any branch."
msgstr "Actualmente no estás en ninguna rama."
-#: wt-status.c:1730
+#: wt-status.c:1769
msgid "Initial commit"
msgstr "Confirmación inicial"
-#: wt-status.c:1731
+#: wt-status.c:1770
msgid "No commits yet"
msgstr "No hay commits todavía"
-#: wt-status.c:1745
+#: wt-status.c:1784
msgid "Untracked files"
msgstr "Archivos sin seguimiento"
-#: wt-status.c:1747
+#: wt-status.c:1786
msgid "Ignored files"
msgstr "Archivos ignorados"
-#: wt-status.c:1751
+#: wt-status.c:1790
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -9273,31 +9927,31 @@
"puede acelerarlo, pero tienes que ser cuidadoso de no olvidar agregar\n"
"nuevos archivos tú mismo (vea 'git help status')."
-#: wt-status.c:1757
+#: wt-status.c:1796
#, c-format
msgid "Untracked files not listed%s"
msgstr "Archivos no rastreados no son mostrados %s"
-#: wt-status.c:1759
+#: 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:1765
+#: wt-status.c:1804
msgid "No changes"
msgstr "Sin cambios"
-#: wt-status.c:1770
+#: 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:1773
+#: wt-status.c:1813
#, c-format
msgid "no changes added to commit\n"
msgstr "no se agregaron cambios al commit\n"
-#: wt-status.c:1776
+#: wt-status.c:1817
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -9306,72 +9960,72 @@
"no hay nada agregado al commit pero hay archivos sin seguimiento presentes "
"(usa \"git add\" para hacerles seguimiento)\n"
-#: wt-status.c:1779
+#: wt-status.c:1821
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
"no hay nada agregado para confirmar, pero hay archivos sin seguimiento "
"presentes\n"
-#: wt-status.c:1782
+#: wt-status.c:1825
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"no hay nada para confirmar (crea/copia archivos y usa \"git add\" para "
"hacerles seguimiento)\n"
-#: wt-status.c:1785 wt-status.c:1790
+#: wt-status.c:1829 wt-status.c:1835
#, c-format
msgid "nothing to commit\n"
msgstr "nada para hacer commit\n"
-#: wt-status.c:1788
+#: wt-status.c:1832
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"nada para hacer commit (usa -u para mostrar los archivos no rastreados)\n"
-#: wt-status.c:1792
+#: wt-status.c:1837
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "nada para hacer commit, el árbol de trabajo está limpio\n"
-#: wt-status.c:1905
+#: wt-status.c:1942
msgid "No commits yet on "
msgstr "No hay commits todavía en "
-#: wt-status.c:1909
+#: wt-status.c:1946
msgid "HEAD (no branch)"
msgstr "HEAD (sin rama)"
-#: wt-status.c:1940
+#: wt-status.c:1977
msgid "different"
msgstr "diferente"
-#: wt-status.c:1942 wt-status.c:1950
+#: wt-status.c:1979 wt-status.c:1987
msgid "behind "
msgstr "detrás "
-#: wt-status.c:1945 wt-status.c:1948
+#: wt-status.c:1982 wt-status.c:1985
msgid "ahead "
msgstr "adelante "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2470
+#: wt-status.c:2507
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "no se puede %s: Tienes cambios sin marcar."
-#: wt-status.c:2476
+#: wt-status.c:2513
msgid "additionally, your index contains uncommitted changes."
msgstr "adicionalmente, tu índice contiene cambios que no están en un commit."
-#: wt-status.c:2478
+#: wt-status.c:2515
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "no se puede %s: Tu índice contiene cambios que no están en un commit."
-#: compat/precompose_utf8.c:58 builtin/clone.c:455
+#: compat/precompose_utf8.c:58 builtin/clone.c:457
#, c-format
msgid "failed to unlink '%s'"
msgstr "falló al desvincular '%s'"
@@ -9380,128 +10034,133 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<opción>] [--] <especificación-de-ruta>..."
-#: builtin/add.c:88
+#: builtin/add.c:58
+#, c-format
+msgid "cannot chmod %cx '%s'"
+msgstr "no se puede aplicar chmod %cx '%s'"
+
+#: builtin/add.c:96
#, c-format
msgid "unexpected diff status %c"
msgstr "diff status inesperado %c"
-#: builtin/add.c:93 builtin/commit.c:288
+#: builtin/add.c:101 builtin/commit.c:285
msgid "updating files failed"
msgstr "falló la actualización de carpetas"
-#: builtin/add.c:103
+#: builtin/add.c:111
#, c-format
msgid "remove '%s'\n"
msgstr "eliminar '%s'\n"
-#: builtin/add.c:178
+#: builtin/add.c:186
msgid "Unstaged changes after refreshing the index:"
msgstr "Cambios fuera del área de stage tras refrescar el índice:"
-#: builtin/add.c:266 builtin/rev-parse.c:899
+#: builtin/add.c:280 builtin/rev-parse.c:991
msgid "Could not read the index"
msgstr "No se pudo leer el índice"
-#: builtin/add.c:277
+#: builtin/add.c:291
#, c-format
msgid "Could not open '%s' for writing."
msgstr "No se pudo abrir '%s' para escritura."
-#: builtin/add.c:281
+#: builtin/add.c:295
msgid "Could not write patch"
msgstr "No se puede escribir el parche"
-#: builtin/add.c:284
+#: builtin/add.c:298
msgid "editing patch failed"
msgstr "falló la edición del parche"
-#: builtin/add.c:287
+#: builtin/add.c:301
#, c-format
msgid "Could not stat '%s'"
msgstr "No se pudo definir '%s'"
-#: builtin/add.c:289
+#: builtin/add.c:303
msgid "Empty patch. Aborted."
msgstr "Parche vacío. Abortado."
-#: builtin/add.c:294
+#: builtin/add.c:308
#, c-format
msgid "Could not apply '%s'"
msgstr "No se pudo aplicar '%s'"
-#: builtin/add.c:302
+#: builtin/add.c:316
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Las siguientes rutas son ignoradas por uno de tus archivos .gitignore:\n"
-#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548
-#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
+#: builtin/add.c:336 builtin/clean.c:904 builtin/fetch.c:169 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559
+#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190
msgid "dry run"
msgstr "dry run ( ejecución en seco)"
-#: builtin/add.c:325
+#: builtin/add.c:339
msgid "interactive picking"
msgstr "selección interactiva"
-#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307
+#: builtin/add.c:340 builtin/checkout.c:1546 builtin/reset.c:308
msgid "select hunks interactively"
msgstr "elegir hunks de forma interactiva"
-#: builtin/add.c:327
+#: builtin/add.c:341
msgid "edit current diff and apply"
msgstr "editar diff actual y aplicar"
-#: builtin/add.c:328
+#: builtin/add.c:342
msgid "allow adding otherwise ignored files"
msgstr "permitir agregar caso contrario ignorar archivos"
-#: builtin/add.c:329
+#: builtin/add.c:343
msgid "update tracked files"
msgstr "actualizado las carpetas rastreadas"
-#: builtin/add.c:330
+#: builtin/add.c:344
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "renormalizar EOL de los archivos rastreados (implica -u)"
-#: builtin/add.c:331
+#: builtin/add.c:345
msgid "record only the fact that the path will be added later"
msgstr "grabar solo el hecho de que la ruta será agregada después"
-#: builtin/add.c:332
+#: builtin/add.c:346
msgid "add changes from all tracked and untracked files"
msgstr "agregar los cambios de todas las carpetas con y sin seguimiento"
-#: builtin/add.c:335
+#: builtin/add.c:349
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
"ignorar rutas eliminadas en el árbol de trabajo (lo mismo que --no-all)"
-#: builtin/add.c:337
+#: builtin/add.c:351
msgid "don't add, only refresh the index"
msgstr "no agregar, solo actualizar el índice"
-#: builtin/add.c:338
+#: builtin/add.c:352
msgid "just skip files which cannot be added because of errors"
msgstr "saltar las carpetas que no pueden ser agregadas a causa de errores"
-#: builtin/add.c:339
+#: builtin/add.c:353
msgid "check if - even missing - files are ignored in dry run"
msgstr "comprobar si - incluso los archivos que faltan - se ignoran en dry run"
-#: builtin/add.c:341 builtin/update-index.c:1004
+#: builtin/add.c:355 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:343
+#: builtin/add.c:357
msgid "warn when adding an embedded repository"
msgstr "avisar cuando se agrega un repositorio incrustado"
-#: builtin/add.c:345
+#: builtin/add.c:359
msgid "backend for `git stash -p`"
msgstr "backend para `git stash -p`"
-#: builtin/add.c:363
+#: builtin/add.c:377
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -9532,12 +10191,12 @@
"\n"
"Vea \"git help submodule\" para más información."
-#: builtin/add.c:391
+#: builtin/add.c:405
#, c-format
msgid "adding embedded git repository: %s"
msgstr "agregando repositorio embebido: %s"
-#: builtin/add.c:410
+#: builtin/add.c:424
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
@@ -9547,47 +10206,47 @@
"Desactiva este mensaje ejecutando\n"
"\"git config advice.addIgnoredFile false\""
-#: builtin/add.c:419
+#: builtin/add.c:433
msgid "adding files failed"
msgstr "falló al agregar archivos"
-#: builtin/add.c:447 builtin/commit.c:348
+#: builtin/add.c:461 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
+#: builtin/add.c:478
msgid "--pathspec-from-file is incompatible with --edit"
msgstr "--pathspec-from-file es incompatible con --edit"
-#: builtin/add.c:476
+#: builtin/add.c:490
msgid "-A and -u are mutually incompatible"
msgstr "-A y -u son mutuamente incompatibles"
-#: builtin/add.c:479
+#: builtin/add.c:493
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "Opción --ignore-missing solo puede ser usada junto a --dry-run"
-#: builtin/add.c:483
+#: builtin/add.c:497
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "El parámetro '%s' para --chmod debe ser -x ó +x"
-#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354
-#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509
+#: builtin/add.c:515 builtin/checkout.c:1714 builtin/commit.c:351
+#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1569
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr "--pathspec-from-file es incompatible con argumentos de pathspec"
-#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360
-#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515
+#: builtin/add.c:522 builtin/checkout.c:1726 builtin/commit.c:357
+#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1575
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr "--pathspec-file-nul requiere --pathspec-from-file"
-#: builtin/add.c:512
+#: builtin/add.c:526
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Nada especificado, nada agregado.\n"
-#: builtin/add.c:514
+#: builtin/add.c:528
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
@@ -9645,7 +10304,7 @@
msgid "Patch format detection failed."
msgstr "Falló al detectar el formato del parche."
-#: builtin/am.c:953 builtin/clone.c:409
+#: builtin/am.c:953 builtin/clone.c:410
#, c-format
msgid "failed to create directory '%s'"
msgstr "falló al crear el directorio '%s'"
@@ -9721,12 +10380,12 @@
msgid "applying to an empty history"
msgstr "aplicando a un historial vacío"
-#: builtin/am.c:1621 builtin/am.c:1625
+#: builtin/am.c:1626 builtin/am.c:1630
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "no se puede continuar: %s no existe."
-#: builtin/am.c:1643
+#: builtin/am.c:1648
msgid "Commit Body is:"
msgstr "Cuerpo de commit es:"
@@ -9734,39 +10393,39 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1653
+#: builtin/am.c:1658
#, 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: "
-#: builtin/am.c:1700 builtin/commit.c:398
+#: builtin/am.c:1704 builtin/commit.c:395
msgid "unable to write index file"
msgstr "no es posible escribir en el archivo índice"
-#: builtin/am.c:1704
+#: builtin/am.c:1708
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Índice sucio: no se puede aplicar parches (sucio: %s)"
-#: builtin/am.c:1744 builtin/am.c:1812
+#: builtin/am.c:1748 builtin/am.c:1816
#, c-format
msgid "Applying: %.*s"
msgstr "Aplicando: %.*s"
-#: builtin/am.c:1761
+#: builtin/am.c:1765
msgid "No changes -- Patch already applied."
msgstr "Sin cambios -- parche ya aplicado."
-#: builtin/am.c:1767
+#: builtin/am.c:1771
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "El parche falló en %s %.*s"
-#: builtin/am.c:1771
+#: builtin/am.c:1775
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:1815
+#: builtin/am.c:1819
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -9776,7 +10435,7 @@
"Si no hay nada en el área de stage, las posibilidad es que algo mas\n"
"ya haya introducido el mismo cambio; tal vez quieras omitir este parche."
-#: builtin/am.c:1822
+#: builtin/am.c:1826
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -9789,17 +10448,17 @@
"Se puede ejecutar `git rm` en el archivo para aceptar \"borrado por ellos\" "
"en él."
-#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346
-#: builtin/reset.c:354
+#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 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:1981
+#: builtin/am.c:1985
msgid "failed to clean index"
msgstr "falló al limpiar el índice"
-#: builtin/am.c:2025
+#: builtin/am.c:2029
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -9807,154 +10466,156 @@
"Parece haber movido HEAD desde el último falló 'am'.\n"
"No rebobinando a ORIG_HEAD"
-#: builtin/am.c:2132
+#: builtin/am.c:2136
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valor inválido para --patch-format: %s"
-#: builtin/am.c:2172
+#: builtin/am.c:2178
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr "Valor inválido para --show-current-patch: %s"
-#: builtin/am.c:2176
+#: builtin/am.c:2182
#, c-format
msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
msgstr "--show-current-patch=%s es incompatible con --show-current-patch=%s"
-#: builtin/am.c:2207
+#: builtin/am.c:2213
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<opciones>] [(<mbox> | <Directorio-de-correo>)...]"
-#: builtin/am.c:2208
+#: builtin/am.c:2214
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<opciones>] (--continue | --skip | --abort)"
-#: builtin/am.c:2214
+#: builtin/am.c:2220
msgid "run interactively"
msgstr "ejecutar de manera interactiva"
-#: builtin/am.c:2216
+#: builtin/am.c:2222
msgid "historical option -- no-op"
msgstr "opción histórica -- no-op"
-#: builtin/am.c:2218
+#: builtin/am.c:2224
msgid "allow fall back on 3way merging if needed"
msgstr "permitir retroceso en fusión de 3-vías si es necesario"
-#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:304 builtin/stash.c:812
+#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16
+#: builtin/repack.c:334 builtin/stash.c:882
msgid "be quiet"
msgstr "ser silencioso"
-#: builtin/am.c:2221
-msgid "add a Signed-off-by line to the commit message"
+#: builtin/am.c:2227
+msgid "add a Signed-off-by trailer to the commit message"
msgstr "agregar una línea \"Firmado-por\" al mensaje del commit"
-#: builtin/am.c:2224
+#: builtin/am.c:2230
msgid "recode into utf8 (default)"
msgstr "recodificar en utf8 (default)"
-#: builtin/am.c:2226
+#: builtin/am.c:2232
msgid "pass -k flag to git-mailinfo"
msgstr "pasar flag -k a git-mailinfo"
-#: builtin/am.c:2228
+#: builtin/am.c:2234
msgid "pass -b flag to git-mailinfo"
msgstr "pasar flag -b a git-mailinfo"
-#: builtin/am.c:2230
+#: builtin/am.c:2236
msgid "pass -m flag to git-mailinfo"
msgstr "pasar flag -m a git-mailinfo"
-#: builtin/am.c:2232
+#: builtin/am.c:2238
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "pasar flag --keep-cr a git-mailsplit para formato mbox"
-#: builtin/am.c:2235
+#: builtin/am.c:2241
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"no pasar flag --keep-cr a git-mailsplit independientemente de am.keepcr"
-#: builtin/am.c:2238
+#: builtin/am.c:2244
msgid "strip everything before a scissors line"
msgstr "descubrir todo antes de una línea de tijeras"
-#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249
-#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261
-#: builtin/am.c:2267
+#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
+#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
+#: builtin/am.c:2273
msgid "pass it through git-apply"
msgstr "pasarlo a través de git-apply"
-#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670
-#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250
-#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505
-#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321
-#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:154 parse-options.h:175 parse-options.h:316
+#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:904 builtin/merge.c:261
+#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
+#: builtin/rebase.c:1347 builtin/repack.c:345 builtin/repack.c:349
+#: builtin/repack.c:351 builtin/show-branch.c:650 builtin/show-ref.c:172
+#: builtin/tag.c:436 parse-options.h:154 parse-options.h:175
+#: parse-options.h:316
msgid "n"
msgstr "n"
-#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38
+#: builtin/am.c:2269 builtin/branch.c:670 builtin/bugreport.c:136
+#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:470
+#: builtin/verify-tag.c:38
msgid "format"
msgstr "formato"
-#: builtin/am.c:2264
+#: builtin/am.c:2270
msgid "format the patch(es) are in"
msgstr "formatear el parche(s)"
-#: builtin/am.c:2270
+#: builtin/am.c:2276
msgid "override error message when patch failure occurs"
msgstr "sobrescribir mensajes de error cuando fallos de parchado ocurran"
-#: builtin/am.c:2272
+#: builtin/am.c:2278
msgid "continue applying patches after resolving a conflict"
msgstr "continuar aplicando los parches tras resolver conflictos"
-#: builtin/am.c:2275
+#: builtin/am.c:2281
msgid "synonyms for --continue"
msgstr "sinónimos para --continue"
-#: builtin/am.c:2278
+#: builtin/am.c:2284
msgid "skip the current patch"
msgstr "saltar el parche actual"
-#: builtin/am.c:2281
-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:2287
+msgid "restore the original branch and abort the patching operation"
+msgstr "restaurar la rama original y abortar la operación de parcheo"
-#: builtin/am.c:2284
-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:2290
+msgid "abort the patching operation but keep HEAD where it is"
+msgstr "abortar la operación de parcheo pero mantener HEAD donde está"
-#: builtin/am.c:2288
+#: builtin/am.c:2294
msgid "show the patch being applied"
msgstr "muestra el parche siendo aplicado"
-#: builtin/am.c:2293
+#: builtin/am.c:2299
msgid "lie about committer date"
msgstr "mentir sobre la fecha del committer"
-#: builtin/am.c:2295
+#: builtin/am.c:2301
msgid "use current timestamp for author date"
msgstr "usar el timestamp actual para la fecha del autor"
-#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512
-#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517
-#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418
+#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515
+#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:538
+#: builtin/rebase.c:1400 builtin/revert.c:117 builtin/tag.c:451
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
+#: builtin/am.c:2304 builtin/rebase.c:539 builtin/rebase.c:1401
msgid "GPG-sign commits"
msgstr "Commits con firma GPG"
-#: builtin/am.c:2301
+#: builtin/am.c:2307
msgid "(internal use for git-rebase)"
msgstr "(uso interno para git-rebase)"
-#: builtin/am.c:2319
+#: builtin/am.c:2325
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."
@@ -9962,16 +10623,16 @@
"La opción -b/--binary ha estado deshabilitada por mucho tiempo, y\n"
"será eliminada. Por favor no la use más."
-#: builtin/am.c:2326
+#: builtin/am.c:2332
msgid "failed to read the index"
msgstr "falló al leer el índice"
-#: builtin/am.c:2341
+#: builtin/am.c:2347
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "directorio de rebase previo %s todavía existe en el mbox dado."
-#: builtin/am.c:2365
+#: builtin/am.c:2371
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -9980,11 +10641,11 @@
"Directorio extraviado %s encontrado.\n"
"Use \"git am --abort\" para borrarlo."
-#: builtin/am.c:2371
+#: builtin/am.c:2377
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Operación de resolución no está en progreso, no vamos a continuar."
-#: builtin/am.c:2381
+#: builtin/am.c:2387
msgid "interactive mode requires patches on the command line"
msgstr "modo interactivo requiere parches en la línea de comando"
@@ -10022,43 +10683,15 @@
msgid "git archive: expected a flush"
msgstr "git archive: se esperaba 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 --write-terms <bad_term> <good_term>"
-msgstr "git bisect--helper --write-terms <mal_término> <buen_término>"
-
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-clean-state"
-msgstr "git bisect--helper --bisect-clean-state"
-
-#: builtin/bisect--helper.c:25
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --bisect-reset [<commit>]"
-#: builtin/bisect--helper.c:26
-msgid ""
-"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
-"<bad_term>"
-msgstr ""
-"git bisect--helper --bisect-write [--no-log] <estado> <revision> <buen_term> "
-"<mal_term>"
-
-#: builtin/bisect--helper.c:27
-msgid ""
-"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
-"<bad_term>"
-msgstr ""
-"git bisect--helper --bisect-check-and-set-terms <comando> <buen_term> "
-"<mal_term>"
-
-#: builtin/bisect--helper.c:28
+#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
msgstr "git bisect--helper --bisect-next-check <buen_term> <mal_term> [<term>]"
-#: builtin/bisect--helper.c:29
+#: builtin/bisect--helper.c:25
msgid ""
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
"term-new]"
@@ -10066,48 +10699,76 @@
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
"term-new]"
+#: builtin/bisect--helper.c:26
+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}=<término> --term-{old,"
+"good}=<término>] [--no-checkout] [--first-parent] [<malo> [<bueno>...]] [--] "
+"[<rutas>...]"
+
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next"
+msgstr "git bisect--helper --bisect-next"
+
+#: builtin/bisect--helper.c:29
+msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
+msgstr "git bisect--helper --bisect-state (bad|new) [<rev>]"
+
#: builtin/bisect--helper.c:30
-msgid ""
-"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
-"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
-msgstr ""
-"git bisect--helper --bisect-start [--term-{old,good}=<término> --term-{new,"
-"bad}=<término>][--no-checkout] [<malo> [<bueno>...]] [--] [<rutas>...]"
+msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
+msgstr "git bisect--helper --bisect-state (good|old) [<rev>...]"
-#: builtin/bisect--helper.c:86
+#: builtin/bisect--helper.c:31
+msgid "git bisect--helper --bisect-replay <filename>"
+msgstr "git bisect--helper --bisect-replay <archivio>"
+
+#: builtin/bisect--helper.c:32
+msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
+msgstr "git bisect--helper --bisect-skip [(<rev>|<rango>)...]"
+
+#: builtin/bisect--helper.c:107
+#, c-format
+msgid "cannot open file '%s' in mode '%s'"
+msgstr "no se puede abrir archivo '%s' en modo '%s'"
+
+#: builtin/bisect--helper.c:114
+#, c-format
+msgid "could not write to file '%s'"
+msgstr "no se pudo escribir al archivo '%s'"
+
+#: builtin/bisect--helper.c:153
#, c-format
msgid "'%s' is not a valid term"
msgstr "'%s' no es un término válido"
-#: builtin/bisect--helper.c:90
+#: builtin/bisect--helper.c:157
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "no se puede usar el comando nativo '%s' como un término"
-#: builtin/bisect--helper.c:100
+#: builtin/bisect--helper.c:167
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "no se puede cambiar el significado del término '%s'"
-#: builtin/bisect--helper.c:111
+#: builtin/bisect--helper.c:177
msgid "please use two different terms"
msgstr "por favor use dos términos diferentes"
-#: builtin/bisect--helper.c:118
-msgid "could not open the file BISECT_TERMS"
-msgstr "no se pudo abrir el archivo BISECT_TERMS"
-
-#: builtin/bisect--helper.c:155
+#: builtin/bisect--helper.c:193
#, c-format
msgid "We are not bisecting.\n"
msgstr "No estamos bisecando.\n"
-#: builtin/bisect--helper.c:163
+#: builtin/bisect--helper.c:201
#, c-format
msgid "'%s' is not a valid commit"
msgstr "'%s' no es un commit válido"
-#: builtin/bisect--helper.c:172
+#: builtin/bisect--helper.c:210
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -10115,27 +10776,27 @@
"no se pudo hacer check out al HEAD original '%s'. Intenta 'git bisect reset "
"<commit>'."
-#: builtin/bisect--helper.c:216
+#: builtin/bisect--helper.c:254
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr "Mal argumento bisect_write: %s"
-#: builtin/bisect--helper.c:221
+#: builtin/bisect--helper.c:259
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "no se puede obtener el oid de la rev '%s'"
-#: builtin/bisect--helper.c:233
+#: builtin/bisect--helper.c:271
#, c-format
msgid "couldn't open the file '%s'"
msgstr "no se pudo abrir el archivo '%s'"
-#: builtin/bisect--helper.c:259
+#: builtin/bisect--helper.c:297
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr "Comando inválido: actualmente se encuentra en un bisect %s/%s"
-#: builtin/bisect--helper.c:286
+#: builtin/bisect--helper.c:324
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
@@ -10144,7 +10805,7 @@
"Tienes que dar al menos un %s y un %s revision.\n"
"Se puede ver \"git bisect %s\" y \"git bisect %s\" para eso."
-#: builtin/bisect--helper.c:290
+#: builtin/bisect--helper.c:328
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -10155,7 +10816,7 @@
"Después tienes que entregar al menos un %s y una revision %s.\n"
"Puedes usar \"git bisect %s\" y \"git bisect %s\" para eso."
-#: builtin/bisect--helper.c:310
+#: builtin/bisect--helper.c:348
#, c-format
msgid "bisecting only with a %s commit"
msgstr "haciendo bisect solo con un commit %s"
@@ -10164,15 +10825,15 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:318
+#: builtin/bisect--helper.c:356
msgid "Are you sure [Y/n]? "
msgstr "¿Estás seguro [Y/n]? "
-#: builtin/bisect--helper.c:379
+#: builtin/bisect--helper.c:417
msgid "no terms defined"
msgstr "no hay términos definidos"
-#: builtin/bisect--helper.c:382
+#: builtin/bisect--helper.c:420
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
@@ -10181,7 +10842,7 @@
"Tus términos actuales son %s para el estado viejo\n"
"y %s para el estado nuevo.\n"
-#: builtin/bisect--helper.c:392
+#: builtin/bisect--helper.c:430
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
@@ -10190,263 +10851,308 @@
"argumento inválido %s para 'git bisect terms'.\n"
"Las opciones soportadas son: --term-good|--term-old y --term-bad|--term-new."
-#: builtin/bisect--helper.c:478
+#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1014
+msgid "revision walk setup failed\n"
+msgstr "la configuración del recorrido de revisión falló\n"
+
+#: builtin/bisect--helper.c:519
+#, c-format
+msgid "could not open '%s' for appending"
+msgstr "no se pudo abrir '%s' en modo append"
+
+#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651
+msgid "'' is not a valid term"
+msgstr "'' no es un término válido"
+
+#: builtin/bisect--helper.c:661
#, c-format
msgid "unrecognized option: '%s'"
msgstr "opción desconocida: '%s'"
-#: builtin/bisect--helper.c:482
+#: builtin/bisect--helper.c:665
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "'%s' no parece ser una revisión válida"
-#: builtin/bisect--helper.c:514
+#: builtin/bisect--helper.c:696
msgid "bad HEAD - I need a HEAD"
msgstr "mal HEAD - Necesito un HEAD"
-#: builtin/bisect--helper.c:529
+#: builtin/bisect--helper.c:711
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr ""
"error al hacer checkout '%s'. Intente 'git bisect start <rama-válida>'."
-#: builtin/bisect--helper.c:550
+#: builtin/bisect--helper.c:732
msgid "won't bisect on cg-seek'ed tree"
msgstr "no se bisecará en un árbol con cg-seek"
-#: builtin/bisect--helper.c:553
+#: builtin/bisect--helper.c:735
msgid "bad HEAD - strange symbolic ref"
msgstr "mal HEAD - ref simbólico extraño"
-#: builtin/bisect--helper.c:577
+#: builtin/bisect--helper.c:755
#, c-format
msgid "invalid ref: '%s'"
msgstr "ref inválido: '%s'"
-#: builtin/bisect--helper.c:633
-msgid "perform 'git bisect next'"
-msgstr "realiza 'git bisect next'"
+#: builtin/bisect--helper.c:813
+msgid "You need to start by \"git bisect start\"\n"
+msgstr "Debes iniciar con \"git bisect start\"\n"
-#: builtin/bisect--helper.c:635
-msgid "write the terms to .git/BISECT_TERMS"
-msgstr "escribe los términos a .git/BISECT_TERMS"
+#. 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:824
+msgid "Do you want me to do it for you [Y/n]? "
+msgstr "¿Quieres que lo haga por ti [Y/n]? "
-#: builtin/bisect--helper.c:637
-msgid "cleanup the bisection state"
-msgstr "limpiar el estado de bisección"
+#: builtin/bisect--helper.c:842
+msgid "Please call `--bisect-state` with at least one argument"
+msgstr "Llame a `--bisect-state` con al menos un argumento"
-#: builtin/bisect--helper.c:639
-msgid "check for expected revs"
-msgstr "revisar por revs esperados"
+#: builtin/bisect--helper.c:855
+#, c-format
+msgid "'git bisect %s' can take only one argument."
+msgstr "'git bisect %s' solo puede tomar un argumento."
-#: builtin/bisect--helper.c:641
+#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:878
+#, c-format
+msgid "Bad rev input: %s"
+msgstr "Mala entrada rev: %s"
+
+#: builtin/bisect--helper.c:912
+msgid "We are not bisecting."
+msgstr "No estamos bisecando."
+
+#: builtin/bisect--helper.c:962
+#, c-format
+msgid "'%s'?? what are you talking about?"
+msgstr "'%s'?? ¿De qué estás hablando?"
+
+#: builtin/bisect--helper.c:974
+#, c-format
+msgid "cannot read file '%s' for replaying"
+msgstr "no se puede leer '%s' para reproducir"
+
+#: builtin/bisect--helper.c:1047
msgid "reset the bisection state"
msgstr "reiniciar el estado de bisect"
-#: builtin/bisect--helper.c:643
-msgid "write out the bisection state in BISECT_LOG"
-msgstr "escribir el estado de bisect en BISECT_LOG"
-
-#: builtin/bisect--helper.c:645
-msgid "check and set terms in a bisection state"
-msgstr "revisar y configurar los terms en el estado de bisect"
-
-#: builtin/bisect--helper.c:647
+#: builtin/bisect--helper.c:1049
msgid "check whether bad or good terms exist"
msgstr "revisar si existen términos malos o buenos"
-#: builtin/bisect--helper.c:649
+#: builtin/bisect--helper.c:1051
msgid "print out the bisect terms"
msgstr "imprimir los terms del bisect"
-#: builtin/bisect--helper.c:651
+#: builtin/bisect--helper.c:1053
msgid "start the bisect session"
msgstr "comenzar la sesión de bisect"
-#: builtin/bisect--helper.c:653
-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:1055
+msgid "find the next bisection commit"
+msgstr "encontrar el siguiente commit de bisección"
-#: builtin/bisect--helper.c:655
+#: builtin/bisect--helper.c:1057
+msgid "mark the state of ref (or refs)"
+msgstr "marcar el estado de ref (o refs)"
+
+#: builtin/bisect--helper.c:1059
+msgid "list the bisection steps so far"
+msgstr "listar los pasos de bisección hasta ahora"
+
+#: builtin/bisect--helper.c:1061
+msgid "replay the bisection process from the given file"
+msgstr "reproducir el proceso de bisección del archivo dado"
+
+#: builtin/bisect--helper.c:1063
+msgid "skip some commits for checkout"
+msgstr "saltar algunos commits para checkout"
+
+#: builtin/bisect--helper.c:1065
msgid "no log for BISECT_WRITE"
msgstr "no hay log para BISECT_WRITE"
-#: builtin/bisect--helper.c:673
-msgid "--write-terms requires two arguments"
-msgstr "--write-terms requiere dos argumentos"
-
-#: builtin/bisect--helper.c:677
-msgid "--bisect-clean-state requires no arguments"
-msgstr "--bisect-clean-state no requiere argumentos"
-
-#: builtin/bisect--helper.c:684
+#: builtin/bisect--helper.c:1080
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-reset requiere un commit o ningún argumento"
-#: builtin/bisect--helper.c:688
-msgid "--bisect-write requires either 4 or 5 arguments"
-msgstr "--bisect-write requiere entre 4 o 5 argumentos"
-
-#: builtin/bisect--helper.c:694
-msgid "--check-and-set-terms requires 3 arguments"
-msgstr "--bisect-clean-state no requiere argumentos"
-
-#: builtin/bisect--helper.c:700
+#: builtin/bisect--helper.c:1085
msgid "--bisect-next-check requires 2 or 3 arguments"
msgstr "--bisect-next-check requiere 2 o 3 argumentos"
-#: builtin/bisect--helper.c:706
+#: builtin/bisect--helper.c:1091
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms requiere 0 o 1 argumentos"
-#: builtin/blame.c:31
+#: builtin/bisect--helper.c:1100
+msgid "--bisect-next requires 0 arguments"
+msgstr "--bisect-next requiere 0 argumentos"
+
+#: builtin/bisect--helper.c:1111
+msgid "--bisect-log requires 0 arguments"
+msgstr "--bisect-log requiere 0 argumentos"
+
+#: builtin/bisect--helper.c:1116
+msgid "no logfile given"
+msgstr "ningún logfile proporcionado"
+
+#: builtin/blame.c:32
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr "git blame [<opciones>] [<opciones-rev>] [<revision>] [--] <archivo>"
-#: builtin/blame.c:36
+#: builtin/blame.c:37
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<rev-opts> están documentadas en git-rev-list(1)"
-#: builtin/blame.c:409
+#: builtin/blame.c:410
#, c-format
msgid "expecting a color: %s"
msgstr "esperando un color: %s"
-#: builtin/blame.c:416
+#: builtin/blame.c:417
msgid "must end with a color"
msgstr "tiene que terminar con un color"
-#: builtin/blame.c:729
+#: builtin/blame.c:728
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "color inválido '%s' en color.blame.repeatedLines"
-#: builtin/blame.c:747
+#: builtin/blame.c:746
msgid "invalid value for blame.coloring"
msgstr "valor inválido para blame.coloring"
-#: builtin/blame.c:822
+#: builtin/blame.c:845
#, c-format
msgid "cannot find revision %s to ignore"
msgstr "no se pudo encontrar revision %s para ignorar"
-#: 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:867
+msgid "show blame entries as we find them, incrementally"
+msgstr "mostrar las entradas blame como las encontramos, incrementalmente"
-#: 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:868
+msgid "do not show object names of boundary commits (Default: off)"
+msgstr "no mostrar nombres de objetos de commits extremos (Default: off)"
-#: 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:869
+msgid "do not treat root commits as boundaries (Default: off)"
+msgstr "no tratar commits raíces como extremos (Default: off)"
-#: builtin/blame.c:847
-msgid "Show work cost statistics"
-msgstr "Mostrar estadísticas de costo de trabajo"
+#: builtin/blame.c:870
+msgid "show work cost statistics"
+msgstr "mostrar estadísticas de costo de trabajo"
-#: builtin/blame.c:848
-msgid "Force progress reporting"
-msgstr "Forzar el reporte de progreso"
+#: builtin/blame.c:871 builtin/checkout.c:1503 builtin/clone.c:92
+#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:175
+#: builtin/merge.c:297 builtin/multi-pack-index.c:27 builtin/pull.c:119
+#: builtin/push.c:575 builtin/send-pack.c:198
+msgid "force progress reporting"
+msgstr "forzar el reporte de progreso"
-#: 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:872
+msgid "show output score for blame entries"
+msgstr "mostrar la puntuación de salida de las entradas de blame"
-#: builtin/blame.c:850
-msgid "Show original filename (Default: auto)"
-msgstr "Mostrar nombre original del archivo (Default: auto)"
+#: builtin/blame.c:873
+msgid "show original filename (Default: auto)"
+msgstr "mostrar nombre original del archivo (Default: auto)"
-#: builtin/blame.c:851
-msgid "Show original linenumber (Default: off)"
-msgstr "Mostrar número de línea original (Default: off)"
+#: builtin/blame.c:874
+msgid "show original linenumber (Default: off)"
+msgstr "mostrar número de línea original (Default: off)"
-#: 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:875
+msgid "show in a format designed for machine consumption"
+msgstr "mostrar en un formato diseñado para consumo de máquina"
-#: builtin/blame.c:853
-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:876
+msgid "show porcelain format with per-line commit information"
+msgstr "mostrar en formato porcelana con información de commit por línea"
-#: builtin/blame.c:854
-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:877
+msgid "use the same output mode as git-annotate (Default: off)"
+msgstr "usar el mismo modo salida como git-annotate (Default: off)"
-#: builtin/blame.c:855
-msgid "Show raw timestamp (Default: off)"
-msgstr "Mostrar timestamp en formato raw (Default: off)"
+#: builtin/blame.c:878
+msgid "show raw timestamp (Default: off)"
+msgstr "mostrar timestamp en formato raw (Default: off)"
-#: builtin/blame.c:856
-msgid "Show long commit SHA1 (Default: off)"
-msgstr "Mostrar SHA1 del commit en formato largo (Default: off)"
+#: builtin/blame.c:879
+msgid "show long commit SHA1 (Default: off)"
+msgstr "mostrar SHA1 del commit en formato largo (Default: off)"
-#: builtin/blame.c:857
-msgid "Suppress author name and timestamp (Default: off)"
-msgstr "Suprimir nombre del autor y timestamp (Default: off)"
+#: builtin/blame.c:880
+msgid "suppress author name and timestamp (Default: off)"
+msgstr "suprimir nombre del autor y timestamp (Default: off)"
-#: 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:881
+msgid "show author email instead of name (Default: off)"
+msgstr "mostrar en cambio el email del autor (Default: off)"
-#: builtin/blame.c:859
-msgid "Ignore whitespace differences"
-msgstr "Ignorar diferencias de espacios en blanco"
+#: builtin/blame.c:882
+msgid "ignore whitespace differences"
+msgstr "ignorar diferencias de espacios en blanco"
-#: builtin/blame.c:860 builtin/log.c:1702
+#: builtin/blame.c:883 builtin/log.c:1812
msgid "rev"
msgstr "rev"
-#: builtin/blame.c:860
-msgid "Ignore <rev> when blaming"
-msgstr "Ignorar <rev> durante el blame"
+#: builtin/blame.c:883
+msgid "ignore <rev> when blaming"
+msgstr "ignorar <rev> durante el blame"
-#: builtin/blame.c:861
-msgid "Ignore revisions from <file>"
-msgstr "Ignorar revisiones de <archivo>"
+#: builtin/blame.c:884
+msgid "ignore revisions from <file>"
+msgstr "ignorar revisiones de <archivo>"
-#: builtin/blame.c:862
+#: builtin/blame.c:885
msgid "color redundant metadata from previous line differently"
msgstr "colorear metadata redundante de líneas previas de manera diferente"
-#: builtin/blame.c:863
+#: builtin/blame.c:886
msgid "color lines by age"
msgstr "colorear líneas por edad"
-#: builtin/blame.c:864
-msgid "Spend extra cycles to find better match"
-msgstr "Ocupo más ciclos para encontrar mejoras resultados"
+#: builtin/blame.c:887
+msgid "spend extra cycles to find better match"
+msgstr "ocupar más ciclos para encontrar mejoras resultados"
-#: 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:888
+msgid "use revisions from <file> instead of calling git-rev-list"
+msgstr "use revisiones desde <archivo> en lugar de llamar git-rev-list"
-#: builtin/blame.c:866
-msgid "Use <file>'s contents as the final image"
-msgstr "Usar contenido de <archivo> como imagen final"
+#: builtin/blame.c:889
+msgid "use <file>'s contents as the final image"
+msgstr "usar contenido de <archivo> como imagen final"
-#: builtin/blame.c:867 builtin/blame.c:868
+#: builtin/blame.c:890 builtin/blame.c:891
msgid "score"
msgstr "puntaje"
-#: 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:890
+msgid "find line copies within and across files"
+msgstr "encontrar copias de líneas entre y a través de archivos"
-#: builtin/blame.c:868
-msgid "Find line movements within and across files"
-msgstr "Encontrar movimientos de líneas entre y a través de archivos"
+#: builtin/blame.c:891
+msgid "find line movements within and across files"
+msgstr "encontrar movimientos de líneas entre y a través de archivos"
-#: builtin/blame.c:869
-msgid "n,m"
-msgstr "n,m"
+#: builtin/blame.c:892
+msgid "range"
+msgstr "rango"
-#: 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:893
+msgid "process only line range <start>,<end> or function :<funcname>"
+msgstr ""
+"Procesar solo el rango de líneas <inicio>,<fin> o función: <nombre-función>"
-#: builtin/blame.c:921
+#: builtin/blame.c:945
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr "--progress no puede ser usado con --incremental o formatos porcelana"
@@ -10458,24 +11164,24 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:972
+#: builtin/blame.c:996
msgid "4 years, 11 months ago"
msgstr "hace 4 años, 11 meses"
-#: builtin/blame.c:1079
+#: builtin/blame.c:1112
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "archivo %s tiene solo %lu línea"
msgstr[1] "archivo %s tiene solo %lu líneas"
-#: builtin/blame.c:1125
+#: builtin/blame.c:1157
msgid "Blaming lines"
msgstr "Blaming a líneas"
#: builtin/branch.c:29
-msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
-msgstr "git branch [<opciones>] [-r | -a] [--merged | --no-merged]"
+msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
+msgstr "git branch [<opciones>] [-r | -a] [--merged] [--no-merged]"
#: builtin/branch.c:30
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
@@ -10537,121 +11243,111 @@
msgid "Update of config-file failed"
msgstr "Falló de actualización de config-file"
-#: builtin/branch.c:220
+#: builtin/branch.c:223
msgid "cannot use -a with -d"
msgstr "no se puede usar-a con -d"
-#: builtin/branch.c:226
+#: builtin/branch.c:230
msgid "Couldn't look up commit object for HEAD"
msgstr "No se pudo revisar el objeto commit para HEAD"
-#: builtin/branch.c:240
+#: builtin/branch.c:244
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "No se puede borrar rama '%s' que cuenta con checkout en '%s'"
-#: builtin/branch.c:255
+#: builtin/branch.c:259
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "rama de rastreo remoto '%s' no encontrada."
-#: builtin/branch.c:256
+#: builtin/branch.c:260
#, c-format
msgid "branch '%s' not found."
msgstr "rama '%s' no encontrada."
-#: builtin/branch.c:271
-#, c-format
-msgid "Error deleting remote-tracking branch '%s'"
-msgstr "Error al eliminar la rama de rastreo remota '%s'"
-
-#: builtin/branch.c:272
-#, c-format
-msgid "Error deleting branch '%s'"
-msgstr "Error al eliminar la rama '%s'"
-
-#: builtin/branch.c:279
+#: builtin/branch.c:291
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Eliminada la rama de rastreo remota %s (era %s).\n"
-#: builtin/branch.c:280
+#: builtin/branch.c:292
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Eliminada la rama %s (era %s)..\n"
-#: builtin/branch.c:429 builtin/tag.c:61
+#: builtin/branch.c:438 builtin/tag.c:61
msgid "unable to parse format string"
msgstr "no es posible analizar el string de formato"
-#: builtin/branch.c:460
+#: builtin/branch.c:469
msgid "could not resolve HEAD"
msgstr "no se pudo resolver HEAD"
-#: builtin/branch.c:466
+#: builtin/branch.c:475
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) apunta fuera de refs/heads/"
-#: builtin/branch.c:481
+#: builtin/branch.c:490
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Rama %s está siendo rebasada en %s"
-#: builtin/branch.c:485
+#: builtin/branch.c:494
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Rama %s está siendo bisecada en %s"
-#: builtin/branch.c:502
+#: builtin/branch.c:511
msgid "cannot copy the current branch while not on any."
msgstr "no se puede copiar la rama actual mientras no se está en ninguna."
-#: builtin/branch.c:504
+#: builtin/branch.c:513
msgid "cannot rename the current branch while not on any."
msgstr "no se puede renombrar la rama actual mientras no se está en ninguna."
-#: builtin/branch.c:515
+#: builtin/branch.c:524
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nombre de rama inválido: '%s'"
-#: builtin/branch.c:542
+#: builtin/branch.c:553
msgid "Branch rename failed"
msgstr "Cambio de nombre de rama fallido"
-#: builtin/branch.c:544
+#: builtin/branch.c:555
msgid "Branch copy failed"
msgstr "Copiado de rama fallido"
-#: builtin/branch.c:548
+#: builtin/branch.c:559
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Copia creada de la rama malnombrada '%s'"
-#: builtin/branch.c:551
+#: builtin/branch.c:562
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Rama mal llamada '%s' renombrada"
-#: builtin/branch.c:557
+#: builtin/branch.c:568
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "¡Rama renombrada a %s, pero HEAD no está actualizado!"
-#: builtin/branch.c:566
+#: builtin/branch.c:577
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"La rama está renombrada, pero falló la actualización del archivo de "
"configuración"
-#: builtin/branch.c:568
+#: builtin/branch.c:579
msgid "Branch is copied, but update of config-file failed"
msgstr ""
"La rama está copiada, pero falló la actualización del archivo de "
"configuración"
-#: builtin/branch.c:584
+#: builtin/branch.c:595
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -10662,180 +11358,180 @@
"%s\n"
"Las líneas que comiencen con '%c' serán eliminadas.\n"
-#: builtin/branch.c:618
+#: builtin/branch.c:629
msgid "Generic options"
msgstr "Opciones genéricas"
-#: builtin/branch.c:620
+#: builtin/branch.c:631
msgid "show hash and subject, give twice for upstream branch"
msgstr "mostrar hash y tema, dar dos veces para rama upstream"
-#: builtin/branch.c:621
+#: builtin/branch.c:632
msgid "suppress informational messages"
msgstr "suprimir mensajes informativos"
-#: builtin/branch.c:622
+#: builtin/branch.c:633
msgid "set up tracking mode (see git-pull(1))"
msgstr "configurando modo tracking (mirar git-pull(1))"
-#: builtin/branch.c:624
+#: builtin/branch.c:635
msgid "do not use"
msgstr "no usar"
-#: builtin/branch.c:626 builtin/rebase.c:513
+#: builtin/branch.c:637 builtin/rebase.c:534
msgid "upstream"
msgstr "upstream"
-#: builtin/branch.c:626
+#: builtin/branch.c:637
msgid "change the upstream info"
msgstr "cambiar info de upstream"
-#: builtin/branch.c:627
+#: builtin/branch.c:638
msgid "unset the upstream info"
msgstr "desconfigurando la info de upstream"
-#: builtin/branch.c:628
+#: builtin/branch.c:639
msgid "use colored output"
msgstr "usar salida con colores"
-#: builtin/branch.c:629
+#: builtin/branch.c:640
msgid "act on remote-tracking branches"
msgstr "actuar en ramas de traqueo remoto"
-#: builtin/branch.c:631 builtin/branch.c:633
+#: builtin/branch.c:642 builtin/branch.c:644
msgid "print only branches that contain the commit"
msgstr "mostrar solo ramas que contienen el commit"
-#: builtin/branch.c:632 builtin/branch.c:634
+#: builtin/branch.c:643 builtin/branch.c:645
msgid "print only branches that don't contain the commit"
msgstr "mostrar solo ramas que no contienen el commit"
-#: builtin/branch.c:637
+#: builtin/branch.c:648
msgid "Specific git-branch actions:"
msgstr "Acciones específicas de git-branch:"
-#: builtin/branch.c:638
+#: builtin/branch.c:649
msgid "list both remote-tracking and local branches"
msgstr "listar ramas de remote-tracking y locales"
-#: builtin/branch.c:640
+#: builtin/branch.c:651
msgid "delete fully merged branch"
msgstr "borrar ramas totalmente fusionadas"
-#: builtin/branch.c:641
+#: builtin/branch.c:652
msgid "delete branch (even if not merged)"
msgstr "borrar rama (incluso si no está fusionada)"
-#: builtin/branch.c:642
+#: builtin/branch.c:653
msgid "move/rename a branch and its reflog"
msgstr "mover/renombrar una rama y su reflog"
-#: builtin/branch.c:643
+#: builtin/branch.c:654
msgid "move/rename a branch, even if target exists"
msgstr "mover/renombrar una rama, incluso si el destino existe"
-#: builtin/branch.c:644
+#: builtin/branch.c:655
msgid "copy a branch and its reflog"
msgstr "copiar una rama y su reflog"
-#: builtin/branch.c:645
+#: builtin/branch.c:656
msgid "copy a branch, even if target exists"
msgstr "copiar una rama, incluso si el objetivo existe"
-#: builtin/branch.c:646
+#: builtin/branch.c:657
msgid "list branch names"
msgstr "listar nombres de ramas"
-#: builtin/branch.c:647
+#: builtin/branch.c:658
msgid "show current branch name"
msgstr "muestra el nombre de branch actual"
-#: builtin/branch.c:648
+#: builtin/branch.c:659
msgid "create the branch's reflog"
msgstr "crea el reflog de la rama"
-#: builtin/branch.c:650
+#: builtin/branch.c:661
msgid "edit the description for the branch"
msgstr "edita la descripción de la rama"
-#: builtin/branch.c:651
+#: builtin/branch.c:662
msgid "force creation, move/rename, deletion"
msgstr "fuerza la creación,movimiento/renombrado,borrado"
-#: builtin/branch.c:652
+#: builtin/branch.c:663
msgid "print only branches that are merged"
msgstr "muestra solo ramas que han sido fusionadas"
-#: builtin/branch.c:653
+#: builtin/branch.c:664
msgid "print only branches that are not merged"
msgstr "muestra solo ramas que no han sido fusionadas"
-#: builtin/branch.c:654
+#: builtin/branch.c:665
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:667 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:466
msgid "object"
msgstr "objeto"
-#: builtin/branch.c:658
+#: builtin/branch.c:668
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:669 builtin/for-each-ref.c:48 builtin/tag.c:473
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:670 builtin/for-each-ref.c:38 builtin/tag.c:471
#: 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:785
+#: builtin/branch.c:693 builtin/clone.c:790
msgid "HEAD not found below refs/heads!"
msgstr "¡HEAD no encontrado abajo de refs/heads!"
-#: builtin/branch.c:708
+#: builtin/branch.c:717
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:732 builtin/branch.c:788 builtin/branch.c:797
msgid "branch name required"
msgstr "se necesita el nombre de la rama"
-#: builtin/branch.c:753
+#: builtin/branch.c:764
msgid "Cannot give description to detached HEAD"
msgstr "No se puede dar descripción al HEAD desacoplado"
-#: builtin/branch.c:758
+#: builtin/branch.c:769
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:776
#, 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:779
#, c-format
msgid "No branch named '%s'."
msgstr "No hay ninguna rama llamada '%s'."
-#: builtin/branch.c:783
+#: builtin/branch.c:794
msgid "too many branches for a copy operation"
msgstr "demasiadas ramas para una operación de copiado"
-#: builtin/branch.c:792
+#: builtin/branch.c:803
msgid "too many arguments for a rename operation"
msgstr "demasiados argumentos para una operación de renombrado"
-#: builtin/branch.c:797
+#: builtin/branch.c:808
msgid "too many arguments to set new upstream"
msgstr "demasiados argumentos para configurar un nuevo upstream"
-#: builtin/branch.c:801
+#: builtin/branch.c:812
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -10843,32 +11539,32 @@
"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:815 builtin/branch.c:838
#, c-format
msgid "no such branch '%s'"
msgstr "no hay tal rama '%s'"
-#: builtin/branch.c:808
+#: builtin/branch.c:819
#, c-format
msgid "branch '%s' does not exist"
msgstr "la rama '%s' no existe"
-#: builtin/branch.c:821
+#: builtin/branch.c:832
msgid "too many arguments to unset upstream"
msgstr "demasiados argumentos para desconfigurar upstream"
-#: builtin/branch.c:825
+#: builtin/branch.c:836
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:842
#, 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:852
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>?"
@@ -10876,7 +11572,7 @@
"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:856
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -10884,6 +11580,104 @@
"la opción '--set-upstream' ya no es soportada. Considere usar '--track' o '--"
"set-upstream-to' en cambio."
+#: builtin/bugreport.c:15
+msgid "git version:\n"
+msgstr "versión de git:\n"
+
+#: builtin/bugreport.c:21
+#, c-format
+msgid "uname() failed with error '%s' (%d)\n"
+msgstr "uname() falló con error '%s' (%d)\n"
+
+#: builtin/bugreport.c:31
+msgid "compiler info: "
+msgstr "información del compilador: "
+
+#: builtin/bugreport.c:34
+msgid "libc info: "
+msgstr "información de libc: "
+
+#: builtin/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"
+
+#: builtin/bugreport.c:90
+msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
+msgstr ""
+"git bugreport [-o|--output-directory <archivo>] [-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 ""
+"¡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"
+
+#: builtin/bugreport.c:135
+msgid "specify a destination for the bugreport file"
+msgstr "especificar el destino para el archivo de reporte de bug"
+
+#: builtin/bugreport.c:137
+msgid "specify a strftime format suffix for the filename"
+msgstr "especificar el sufijo formato strftime para el nombre del archivo"
+
+#: builtin/bugreport.c:159
+#, c-format
+msgid "could not create leading directories for '%s'"
+msgstr "no se pudo crear directorios principales para '%s'"
+
+#: builtin/bugreport.c:166
+msgid "System Info"
+msgstr "Información del sistema"
+
+#: builtin/bugreport.c:169
+msgid "Enabled Hooks"
+msgstr "Activar Hooks"
+
+#: builtin/bugreport.c:176
+#, c-format
+msgid "couldn't create a new file at '%s'"
+msgstr "no se pudo crear un archivo en '%s'"
+
+#: builtin/bugreport.c:179
+#, c-format
+msgid "unable to write to %s"
+msgstr "no es posible escribir en %s"
+
+#: builtin/bugreport.c:189
+#, c-format
+msgid "Created new report at '%s'.\n"
+msgstr "Crear un nuevo reporte en '%s'.\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>"
@@ -10900,49 +11694,53 @@
msgid "git bundle unbundle <file> [<refname>...]"
msgstr "git bundle unbundle <archivo> [<nombre-de-ref>...]"
-#: builtin/bundle.c:66 builtin/pack-objects.c:3375
+#: builtin/bundle.c:67 builtin/pack-objects.c:3495
msgid "do not show progress meter"
msgstr "no mostrar medidor de progreso"
-#: builtin/bundle.c:68 builtin/pack-objects.c:3377
+#: builtin/bundle.c:69 builtin/pack-objects.c:3497
msgid "show progress meter"
msgstr "mostrar medidor de progreso"
-#: builtin/bundle.c:70 builtin/pack-objects.c:3379
+#: builtin/bundle.c:71 builtin/pack-objects.c:3499
msgid "show progress meter during object writing phase"
msgstr "mostrar medidor de progreso durante la fase de escritura de objeto"
-#: builtin/bundle.c:73 builtin/pack-objects.c:3382
+#: builtin/bundle.c:74 builtin/pack-objects.c:3502
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
+#: builtin/bundle.c:76
+msgid "specify bundle format version"
+msgstr "especificar la versión del formato del paquete"
+
+#: builtin/bundle.c:96
msgid "Need a repository to create a bundle."
msgstr "Se necesita un repositorio para agrupar."
-#: builtin/bundle.c:104
+#: builtin/bundle.c:107
msgid "do not show bundle details"
msgstr "no mostrar detalles del bundle"
-#: builtin/bundle.c:119
+#: builtin/bundle.c:122
#, c-format
msgid "%s is okay\n"
msgstr "%s está bien\n"
-#: builtin/bundle.c:160
+#: builtin/bundle.c:163
msgid "Need a repository to unbundle."
msgstr "Se necesita un repositorio para desagrupar."
-#: builtin/bundle.c:168 builtin/remote.c:1686
+#: builtin/bundle.c:171 builtin/remote.c:1700
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
+#: builtin/bundle.c:193 builtin/remote.c:1731
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Sub-comando desconocido: %s"
-#: builtin/cat-file.c:595
+#: 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>"
@@ -10950,80 +11748,80 @@
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <tipo> | --textconv | --filters) [--path=<ruta>] <objeto>"
-#: builtin/cat-file.c:596
+#: builtin/cat-file.c: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:617
+#: 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:635
+#: 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:636
+#: builtin/cat-file.c:639
msgid "show object type"
msgstr "mostrar el tipo del objeto"
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:640
msgid "show object size"
msgstr "mostrar el tamaño del objeto"
-#: builtin/cat-file.c:639
+#: 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:640
+#: builtin/cat-file.c:643
msgid "pretty-print object's content"
msgstr "realizar pretty-print del contenido del objeto"
-#: builtin/cat-file.c:642
+#: 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:644
+#: 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:645 git-submodule.sh:1002
+#: builtin/cat-file.c:648
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:646
+#: 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:648
+#: 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:649
+#: builtin/cat-file.c:652
msgid "buffer --batch output"
msgstr "salida buffer --batch"
-#: builtin/cat-file.c:651
+#: 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:655
+#: 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:659
+#: 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:661
+#: 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:663
+#: builtin/cat-file.c:666
msgid "do not order --batch-all-objects output"
msgstr "no ordenar el output de --batch-all-objects"
@@ -11051,8 +11849,8 @@
msgid "terminate input and output records by a NUL character"
msgstr "terminar registros de entrada y salida con un carácter NUL"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537
-#: builtin/worktree.c:499
+#: builtin/check-ignore.c:21 builtin/checkout.c:1499 builtin/gc.c:549
+#: builtin/worktree.c:489
msgid "suppress progress reporting"
msgstr "suprimir el reporte de progreso"
@@ -11105,56 +11903,56 @@
msgid "no contacts specified"
msgstr "contactos no especificados"
-#: builtin/checkout-index.c:131
+#: builtin/checkout-index.c:152
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<opciones>] [--] [<archivo>...]"
-#: builtin/checkout-index.c:148
+#: builtin/checkout-index.c:169
msgid "stage should be between 1 and 3 or all"
msgstr "stage tiene que estar entre 1 y 3 o all"
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:186
msgid "check out all files in the index"
msgstr "revisar todos los archivos en el índice"
-#: builtin/checkout-index.c:165
+#: builtin/checkout-index.c:187
msgid "force overwrite of existing files"
msgstr "forzar sobreescritura de los archivos existentes"
-#: builtin/checkout-index.c:167
+#: builtin/checkout-index.c:189
msgid "no warning for existing files and files not in index"
msgstr ""
"no hay advertencias para los archivos existentes y los archivos no están en "
"el índice"
-#: builtin/checkout-index.c:169
+#: builtin/checkout-index.c:191
msgid "don't checkout new files"
msgstr "no revisar archivos nuevos"
-#: builtin/checkout-index.c:171
+#: builtin/checkout-index.c:193
msgid "update stat information in the index file"
msgstr "actualizar información de estado en el archivo índice"
-#: builtin/checkout-index.c:175
+#: builtin/checkout-index.c:197
msgid "read list of paths from the standard input"
msgstr "leer lista de rutas desde standard input"
-#: builtin/checkout-index.c:177
+#: builtin/checkout-index.c:199
msgid "write the content to temporary files"
msgstr "escribir el contenido en un archivo temporal"
-#: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403
-#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909
-#: builtin/worktree.c:672
+#: builtin/checkout-index.c:200 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:717
msgid "string"
msgstr "string"
-#: builtin/checkout-index.c:179
+#: builtin/checkout-index.c:201
msgid "when creating files, prepend <string>"
msgstr "cuando cree archivos, anteponer <string>"
-#: builtin/checkout-index.c:181
+#: builtin/checkout-index.c:203
msgid "copy out the files from named stage"
msgstr "copiar los archivos del stage nombrado"
@@ -11174,98 +11972,98 @@
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git restore [<opciones>] [--source=<rama>] -- <archivo>..."
-#: builtin/checkout.c:175 builtin/checkout.c:214
+#: builtin/checkout.c: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:177 builtin/checkout.c:216
+#: 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:193
+#: 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:243
+#: builtin/checkout.c:258
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "ruta '%s' no tiene versiones necesarias"
-#: builtin/checkout.c:261
+#: builtin/checkout.c:275
#, c-format
msgid "path '%s': cannot merge"
msgstr "ruta '%s': no se puede fusionar"
-#: builtin/checkout.c:277
+#: builtin/checkout.c:291
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Incapaz de agregar resultados de fusión a '%s'"
-#: builtin/checkout.c:377
+#: builtin/checkout.c:396
#, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
msgstr[0] "Recreado %d conflicto de merge"
msgstr[1] "Recreados %d conflictos de merge"
-#: builtin/checkout.c:382
+#: builtin/checkout.c:401
#, c-format
msgid "Updated %d path from %s"
msgid_plural "Updated %d paths from %s"
msgstr[0] "Actualizada %d ruta para %s"
msgstr[1] "Actualizadas %d rutas para %s"
-#: builtin/checkout.c:389
+#: builtin/checkout.c:408
#, c-format
msgid "Updated %d path from the index"
msgid_plural "Updated %d paths from the index"
msgstr[0] "Actualizada %d ruta desde el index"
msgstr[1] "Actualizadas %d rutas desde el index"
-#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418
-#: builtin/checkout.c:422
+#: builtin/checkout.c: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 puede ser usada con rutas actualizadas"
-#: builtin/checkout.c:425 builtin/checkout.c:428
+#: builtin/checkout.c:444 builtin/checkout.c:447
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' no puede ser usado con %s"
-#: builtin/checkout.c:432
+#: builtin/checkout.c:451
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "No se puede actualizar rutas y cambiar a la rama '%s' al mismo tiempo."
-#: builtin/checkout.c:436
+#: builtin/checkout.c:455
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "ni '%s' o '%s' están especificados"
-#: builtin/checkout.c:440
+#: builtin/checkout.c:459
#, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr "'%s' tiene que ser usado cuando '%s' no es especificado"
-#: builtin/checkout.c:445 builtin/checkout.c:450
+#: builtin/checkout.c:464 builtin/checkout.c:469
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr "'%s' o '%s' no puede ser usado con %s"
-#: builtin/checkout.c:509 builtin/checkout.c:516
+#: builtin/checkout.c:543 builtin/checkout.c:550
#, c-format
msgid "path '%s' is unmerged"
msgstr "ruta '%s' no esta fusionada"
-#: builtin/checkout.c:684 builtin/sparse-checkout.c:106
+#: builtin/checkout.c:718
msgid "you need to resolve your current index first"
msgstr "necesitas resolver tu índice actual primero"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:772
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -11274,50 +12072,50 @@
"no se puede continuar con los cambios en stage en los siguientes archivos:\n"
"%s"
-#: builtin/checkout.c:837
+#: builtin/checkout.c:865
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "No se puede hacer reflog para '%s': %s\n"
-#: builtin/checkout.c:879
+#: builtin/checkout.c:907
msgid "HEAD is now at"
msgstr "HEAD está ahora en"
-#: builtin/checkout.c:883 builtin/clone.c:717
+#: builtin/checkout.c:911 builtin/clone.c:721 t/helper/test-fast-rebase.c:202
msgid "unable to update HEAD"
msgstr "no es posible actualizar HEAD"
-#: builtin/checkout.c:887
+#: builtin/checkout.c:915
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Reiniciar rama '%s'\n"
-#: builtin/checkout.c:890
+#: builtin/checkout.c:918
#, c-format
msgid "Already on '%s'\n"
msgstr "Ya en '%s'\n"
-#: builtin/checkout.c:894
+#: builtin/checkout.c:922
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Rama reiniciada y cambiada a '%s'\n"
-#: builtin/checkout.c:896 builtin/checkout.c:1320
+#: builtin/checkout.c:924 builtin/checkout.c:1355
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Cambiado a nueva rama '%s'\n"
-#: builtin/checkout.c:898
+#: builtin/checkout.c:926
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Cambiado a rama '%s'\n"
-#: builtin/checkout.c:949
+#: builtin/checkout.c:977
#, c-format
msgid " ... and %d more.\n"
msgstr " ... y %d más.\n"
-#: builtin/checkout.c:955
+#: builtin/checkout.c:983
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -11340,7 +12138,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:974
+#: builtin/checkout.c:1002
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -11367,19 +12165,19 @@
" git branch <nombre-de-rama> %s\n"
"\n"
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1037
msgid "internal error in revision walk"
msgstr "error interno en camino de revisión"
-#: builtin/checkout.c:1013
+#: builtin/checkout.c:1041
msgid "Previous HEAD position was"
msgstr "La posición previa de HEAD era"
-#: builtin/checkout.c:1053 builtin/checkout.c:1315
+#: builtin/checkout.c:1081 builtin/checkout.c:1350
msgid "You are on a branch yet to be born"
msgstr "Estás en una rama por nacer"
-#: builtin/checkout.c:1128
+#: builtin/checkout.c:1163
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -11388,7 +12186,7 @@
"'%s' puede ser tanto un archivo local como una rama de rastreo.\n"
"Por favor use -- (y opcionalmente --no-guess) para desambiguar"
-#: builtin/checkout.c:1135
+#: builtin/checkout.c:1170
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"
@@ -11409,51 +12207,51 @@
"de nombre <nombre> remota, como 'origin', considera configurar\n"
"checkout.defaultRemote=origin en tu configuración."
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1180
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "'%s' concordó con multiples (%d) ramas de rastreo remoto"
-#: builtin/checkout.c:1211
+#: builtin/checkout.c:1246
msgid "only one reference expected"
msgstr "solo una referencia esperada"
-#: builtin/checkout.c:1228
+#: builtin/checkout.c:1263
#, c-format
msgid "only one reference expected, %d given."
msgstr "solo una referencia esperada, %d entregadas."
-#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448
+#: builtin/checkout.c:1309 builtin/worktree.c:270 builtin/worktree.c:438
#, c-format
msgid "invalid reference: %s"
msgstr "referencia inválida: %s"
-#: builtin/checkout.c:1287 builtin/checkout.c:1649
+#: builtin/checkout.c:1322 builtin/checkout.c:1688
#, c-format
msgid "reference is not a tree: %s"
msgstr "la referencia no es n árbol: %s"
-#: builtin/checkout.c:1334
+#: builtin/checkout.c:1369
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "se esperaba un branch, se obtuvo tag '%s'"
-#: builtin/checkout.c:1336
+#: builtin/checkout.c:1371
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "se espera una rama, se obtuvo una rama remota '%s'"
-#: builtin/checkout.c:1337 builtin/checkout.c:1345
+#: builtin/checkout.c:1372 builtin/checkout.c:1380
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "se esperaba branch, se obuto '%s'"
-#: builtin/checkout.c:1340
+#: builtin/checkout.c:1375
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "se espera una rama, se obtuvo commit '%s'"
-#: builtin/checkout.c:1356
+#: builtin/checkout.c:1391
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -11461,7 +12259,7 @@
"no se puede cambiar de branch durante un merge\n"
"Considera \"git merge --quit\" o \"git worktree add\"."
-#: builtin/checkout.c:1360
+#: builtin/checkout.c:1395
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -11469,7 +12267,7 @@
"no se puede cambiar de branch en medio de una sesión de am\n"
"Considera \"git am --quit\" o \"git worktree add\"."
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1399
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -11477,7 +12275,7 @@
"no se puede cambiar de branch durante un rebase\n"
"Considera \"git rebase --quit\" o \"git worktree add\"."
-#: builtin/checkout.c:1368
+#: builtin/checkout.c:1403
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -11485,7 +12283,7 @@
"no se puede cambiar de branch durante un cherry-pick\n"
"Considera \"git cherry-pick --quit\" o \"git worktree add\"."
-#: builtin/checkout.c:1372
+#: builtin/checkout.c:1407
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -11493,142 +12291,137 @@
"no se puede cambiar de branch durante un revert\n"
"Considera \"git revert --quit\" o \"git worktree add\"."
-#: builtin/checkout.c:1376
+#: builtin/checkout.c:1411
msgid "you are switching branch while bisecting"
msgstr "estás cambiando ramas durante un bisect"
-#: builtin/checkout.c:1383
+#: builtin/checkout.c:1418
msgid "paths cannot be used with switching branches"
msgstr "rutas no pueden ser usadas con cambios de rama"
-#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394
+#: builtin/checkout.c:1421 builtin/checkout.c:1425 builtin/checkout.c:1429
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' no puede ser usado con cambios de ramas"
-#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404
-#: builtin/checkout.c:1409 builtin/checkout.c:1414
+#: builtin/checkout.c:1433 builtin/checkout.c:1436 builtin/checkout.c:1439
+#: builtin/checkout.c:1444 builtin/checkout.c:1449
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' no puede ser usado con '%s'"
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1446
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s' no puede tomar <punto de partida>"
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1454
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "No se puede cambiar rama a un '%s' sin commits"
-#: builtin/checkout.c:1426
+#: builtin/checkout.c:1461
msgid "missing branch or commit argument"
msgstr "falta branch o commit como argumento"
-#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72
-#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286
-#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563
-#: builtin/send-pack.c:174
-msgid "force progress reporting"
-msgstr "forzar el reporte de progreso"
-
-#: builtin/checkout.c:1469
+#: builtin/checkout.c:1504
msgid "perform a 3-way merge with the new branch"
msgstr "realizar una fusión de tres vías con la rama nueva"
-#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322
+#: builtin/checkout.c:1505 builtin/log.c:1799 parse-options.h:322
msgid "style"
msgstr "estilo"
-#: builtin/checkout.c:1471
+#: builtin/checkout.c:1506
msgid "conflict style (merge or diff3)"
msgstr "conflicto de estilos (merge o diff3)"
-#: builtin/checkout.c:1483 builtin/worktree.c:496
+#: builtin/checkout.c:1518 builtin/worktree.c:486
msgid "detach HEAD at named commit"
msgstr "desacoplar HEAD en el commit nombrado"
-#: builtin/checkout.c:1484
+#: builtin/checkout.c:1519
msgid "set upstream info for new branch"
msgstr "configurar info de upstream para una rama nueva"
-#: builtin/checkout.c:1486
+#: builtin/checkout.c:1521
msgid "force checkout (throw away local modifications)"
msgstr "forzar el checkout (descartar modificaciones locales)"
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1523
msgid "new-branch"
msgstr "nueva-rama"
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1523
msgid "new unparented branch"
msgstr "nueva rama no emparentada"
-#: builtin/checkout.c:1490 builtin/merge.c:289
+#: builtin/checkout.c:1525 builtin/merge.c:301
msgid "update ignored files (default)"
msgstr "actualizar archivos ignorados (default)"
-#: builtin/checkout.c:1493
+#: builtin/checkout.c:1528
msgid "do not check if another worktree is holding the given ref"
msgstr "no revise si otro árbol de trabajo contiene la ref entregada"
-#: builtin/checkout.c:1506
+#: builtin/checkout.c:1541
msgid "checkout our version for unmerged files"
msgstr "hacer checkout a nuestra versión para archivos sin fusionar"
-#: builtin/checkout.c:1509
+#: builtin/checkout.c:1544
msgid "checkout their version for unmerged files"
msgstr "hacer checkout a su versión para los archivos sin fusionar"
-#: builtin/checkout.c:1513
+#: builtin/checkout.c:1548
msgid "do not limit pathspecs to sparse entries only"
msgstr "no limitar pathspecs a dispersar entradas solamente"
-#: builtin/checkout.c:1565
-msgid "-b, -B and --orphan are mutually exclusive"
-msgstr "-b, -B y --orphan son mutuamente exclusivas"
+#: builtin/checkout.c:1603
+#, c-format
+msgid "-%c, -%c and --orphan are mutually exclusive"
+msgstr "-%c, -%c y --orphan son mutuamente exclusivas"
-#: builtin/checkout.c:1568
+#: builtin/checkout.c:1607
msgid "-p and --overlay are mutually exclusive"
msgstr "-p y --overlay son mutuamente exclusivas"
-#: builtin/checkout.c:1605
+#: builtin/checkout.c:1644
msgid "--track needs a branch name"
msgstr "--track necesita el nombre de una rama"
-#: builtin/checkout.c:1610
-msgid "missing branch name; try -b"
-msgstr "falta nombre de rama; prueba -b"
+#: builtin/checkout.c:1649
+#, c-format
+msgid "missing branch name; try -%c"
+msgstr "falta nombre de rama; prueba -%c"
-#: builtin/checkout.c:1642
+#: builtin/checkout.c:1681
#, c-format
msgid "could not resolve %s"
msgstr "no se pudo resolver %s"
-#: builtin/checkout.c:1658
+#: builtin/checkout.c:1697
msgid "invalid path specification"
msgstr "especificación de ruta inválida"
-#: builtin/checkout.c:1665
+#: builtin/checkout.c:1704
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "'%s' no es un commit y una rama '%s' no puede ser creada desde este"
-#: builtin/checkout.c:1669
+#: builtin/checkout.c:1708
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach no toma un argumento de ruta '%s'"
-#: builtin/checkout.c:1678
+#: builtin/checkout.c:1717
msgid "--pathspec-from-file is incompatible with --detach"
msgstr "--pathspec-from-file es incompatible con --detach"
-#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506
+#: builtin/checkout.c:1720 builtin/reset.c:325 builtin/stash.c:1566
msgid "--pathspec-from-file is incompatible with --patch"
msgstr "--pathspec-from-file es incompatible con --patch"
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1733
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -11636,109 +12429,110 @@
"git checkout: --ours/--theirs, --force y --merge son incompatibles cuando\n"
"se revisa fuera del índice."
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1738
msgid "you must specify path(s) to restore"
msgstr "debes especificar path(s) para restaurar"
-#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774
-#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494
+#: builtin/checkout.c:1764 builtin/checkout.c:1766 builtin/checkout.c:1815
+#: builtin/checkout.c:1817 builtin/clone.c:122 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:482
+#: builtin/worktree.c:484
msgid "branch"
msgstr "rama"
-#: builtin/checkout.c:1724
+#: builtin/checkout.c:1765
msgid "create and checkout a new branch"
msgstr "crear y hacer checkout a una nueva rama"
-#: builtin/checkout.c:1726
+#: builtin/checkout.c:1767
msgid "create/reset and checkout a branch"
msgstr "crear/reiniciar y hacer checkout a una rama"
-#: builtin/checkout.c:1727
+#: builtin/checkout.c:1768
msgid "create reflog for new branch"
msgstr "crear un reflog para una nueva rama"
-#: builtin/checkout.c:1729
+#: builtin/checkout.c:1770
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "adivinar segunda opción 'git checkout <no-hay-tal-rama>' (default)"
-#: builtin/checkout.c:1730
+#: builtin/checkout.c:1771
msgid "use overlay mode (default)"
msgstr "usar modo overlay (default)"
-#: builtin/checkout.c:1775
+#: builtin/checkout.c:1816
msgid "create and switch to a new branch"
msgstr "crear y hacer switch a una nueva rama"
-#: builtin/checkout.c:1777
+#: builtin/checkout.c:1818
msgid "create/reset and switch to a branch"
msgstr "crear/reiniciar y hacer switch a una rama"
-#: builtin/checkout.c:1779
+#: builtin/checkout.c:1820
msgid "second guess 'git switch <no-such-branch>'"
msgstr "adivinar segunda opción 'git checkout <no-hay-tal-rama>'"
-#: builtin/checkout.c:1781
+#: builtin/checkout.c:1822
msgid "throw away local modifications"
msgstr "descartar modificaciones locales"
-#: builtin/checkout.c:1813
+#: builtin/checkout.c:1856
msgid "which tree-ish to checkout from"
msgstr "de qué árbol hacer el checkout"
-#: builtin/checkout.c:1815
+#: builtin/checkout.c:1858
msgid "restore the index"
msgstr "restaurar el index"
-#: builtin/checkout.c:1817
+#: builtin/checkout.c:1860
msgid "restore the working tree (default)"
msgstr "restaurar el árbol de trabajo (default)"
-#: builtin/checkout.c:1819
+#: builtin/checkout.c:1862
msgid "ignore unmerged entries"
msgstr "ignorar entradas no fusionadas"
-#: builtin/checkout.c:1820
+#: builtin/checkout.c:1863
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:301 git-add--interactive.perl:595
+#: builtin/clean.c:302 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -11751,7 +12545,7 @@
"foo - selecciona un objeto basado en un prefijo único\n"
" - (vacío) no elegir nada\n"
-#: builtin/clean.c:305 git-add--interactive.perl:604
+#: builtin/clean.c:306 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -11772,33 +12566,33 @@
"* - escoger todos los objetos\n"
" - (vacío) terminar selección\n"
-#: builtin/clean.c:521 git-add--interactive.perl:570
-#: git-add--interactive.perl:575
+#: builtin/clean.c:521 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "¿Ahh (%s)?\n"
-#: builtin/clean.c:663
+#: builtin/clean.c:661
#, c-format
msgid "Input ignore patterns>> "
msgstr "Input ignora los patrones >> "
-#: builtin/clean.c:700
+#: 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:721
+#: 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:762
+#: builtin/clean.c:758
#, c-format
msgid "Remove %s [y/N]? "
msgstr "¿Borrar %s [y/N]? "
-#: builtin/clean.c:795
+#: builtin/clean.c:789
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -11816,56 +12610,52 @@
"help - esta ventana\n"
"? - ayuda para selección de opciones"
-#: builtin/clean.c:831
+#: 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:847
+#: builtin/clean.c:841
msgid "No more files to clean, exiting."
msgstr "No hay más archivos para limpiar, saliendo."
-#: builtin/clean.c:909
+#: builtin/clean.c:903
msgid "do not print names of files removed"
msgstr "no imprimir nombres de archivos borrados"
-#: builtin/clean.c:911
+#: builtin/clean.c:905
msgid "force"
msgstr "forzar"
-#: builtin/clean.c:912
+#: builtin/clean.c:906
msgid "interactive cleaning"
msgstr "limpieza interactiva"
-#: builtin/clean.c:914
+#: builtin/clean.c:908
msgid "remove whole directories"
msgstr "borrar directorios completos"
-#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564
-#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179
-#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/grep.c:922 builtin/log.c:184 builtin/log.c:186
+#: builtin/ls-files.c:573 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "patrón"
-#: builtin/clean.c:916
+#: builtin/clean.c:910
msgid "add <pattern> to ignore rules"
msgstr "agregar <patrón> para ignorar reglas"
-#: builtin/clean.c:917
+#: builtin/clean.c:911
msgid "remove ignored files, too"
msgstr "borrar archivos ignorados, también"
-#: builtin/clean.c:919
+#: builtin/clean.c:913
msgid "remove only ignored files"
msgstr "borrar solo archivos ignorados"
-#: builtin/clean.c:937
-msgid "-x and -X cannot be used together"
-msgstr "-x y -X no pueden ser usadas juntas"
-
-#: builtin/clean.c:941
+#: builtin/clean.c:929
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -11873,7 +12663,7 @@
"clean.requireForce configurado como true y ninguno -i, -n, ni -f entregados; "
"rehusando el clean"
-#: builtin/clean.c:944
+#: builtin/clean.c:932
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -11881,31 +12671,35 @@
"clean.requireForce default en true y ninguno -i, -n, ni -f entregados; "
"rehusando el clean"
+#: 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>]"
-#: builtin/clone.c:93
+#: builtin/clone.c:94
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:95 builtin/clone.c:97 builtin/init-db.c:555
msgid "create a bare repository"
msgstr "crear un repositorio vacío"
-#: builtin/clone.c:98
+#: builtin/clone.c:99
msgid "create a mirror repository (implies bare)"
msgstr "crear un repositorio espejo (implica vacío)"
-#: builtin/clone.c:100
+#: builtin/clone.c:101
msgid "to clone from a local repository"
msgstr "clonar de un repositorio local"
-#: builtin/clone.c:102
+#: builtin/clone.c:103
msgid "don't use local hardlinks, always copy"
msgstr "no usar hardlinks, siempre copiar"
-#: builtin/clone.c:104
+#: builtin/clone.c:105
msgid "setup as shared repository"
msgstr "configurar como repositorio compartido"
@@ -11917,130 +12711,131 @@
msgid "initialize submodules in the clone"
msgstr "inicializar submódulos en el clonado"
-#: builtin/clone.c:110
+#: builtin/clone.c:111
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:112 builtin/init-db.c:552
msgid "template-directory"
msgstr "directorio-template"
-#: builtin/clone.c:112 builtin/init-db.c:487
+#: builtin/clone.c:113 builtin/init-db.c:553
msgid "directory from which templates will be used"
msgstr "directorio del cual los templates serán usados"
-#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407
-#: builtin/submodule--helper.c:1912
+#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831
+#: builtin/submodule--helper.c:2336
msgid "reference repository"
msgstr "repositorio de referencia"
-#: builtin/clone.c:118 builtin/submodule--helper.c:1409
-#: builtin/submodule--helper.c:1914
+#: builtin/clone.c:119 builtin/submodule--helper.c:1833
+#: builtin/submodule--helper.c:2338
msgid "use --reference only while cloning"
msgstr "usa--reference solamente si estás clonado"
-#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3441 builtin/repack.c:327
+#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3561 builtin/repack.c:357
msgid "name"
msgstr "nombre"
-#: builtin/clone.c:120
+#: builtin/clone.c:121
msgid "use <name> instead of 'origin' to track upstream"
msgstr "use <nombre> en lugar de 'origin' para rastrear upstream"
-#: builtin/clone.c:122
+#: builtin/clone.c:123
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "checkout <rama> en lugar de HEAD remota"
-#: builtin/clone.c:124
+#: builtin/clone.c:125
msgid "path to git-upload-pack on the remote"
msgstr "ruta para git-upload-pack en el remoto"
-#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828
-#: builtin/pull.c:207
+#: builtin/clone.c:126 builtin/fetch.c:176 builtin/grep.c:861
+#: builtin/pull.c:208
msgid "depth"
msgstr "profundidad"
-#: builtin/clone.c:126
+#: builtin/clone.c:127
msgid "create a shallow clone of that depth"
msgstr "crear un clon superficial para esa profundidad"
-#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430
+#: builtin/clone.c:128 builtin/fetch.c:178 builtin/pack-objects.c:3550
+#: builtin/pull.c:211
msgid "time"
msgstr "tiempo"
-#: builtin/clone.c:128
+#: builtin/clone.c:129
msgid "create a shallow clone since a specific time"
msgstr "crear un clon superficial desde el tiempo específico"
-#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195
-#: builtin/rebase.c:1480
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/fetch.c:203
+#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1323
msgid "revision"
msgstr "revision"
-#: builtin/clone.c:130 builtin/fetch.c:173
+#: builtin/clone.c:131 builtin/fetch.c:181 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/submodule--helper.c:1419
-#: builtin/submodule--helper.c:1928
+#: builtin/clone.c:133 builtin/submodule--helper.c:1843
+#: builtin/submodule--helper.c:2352
msgid "clone only one branch, HEAD or --branch"
msgstr "clonar solo una rama,HEAD o --branch"
-#: builtin/clone.c:134
+#: builtin/clone.c:135
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr "no clonar ningún tag, y hacer que los subsiguientes fetch no los sigan"
-#: builtin/clone.c:136
+#: builtin/clone.c:137
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:138 builtin/init-db.c:561
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:138 builtin/init-db.c:496
+#: builtin/clone.c:139 builtin/init-db.c:562
msgid "separate git dir from working tree"
msgstr "separa git dir del árbol de trabajo"
-#: builtin/clone.c:139
+#: builtin/clone.c:140
msgid "key=value"
msgstr "llave=valor"
-#: builtin/clone.c:140
+#: builtin/clone.c:141
msgid "set config inside the new repository"
msgstr "configurar config dentro del nuevo repositorio"
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
-#: builtin/push.c:573 builtin/send-pack.c:172
+#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77
+#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
msgid "server-specific"
msgstr "especifico-de-servidor"
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
-#: builtin/push.c:573 builtin/send-pack.c:173
+#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77
+#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
msgid "option to transmit"
msgstr "opción para trasmitir"
-#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220
-#: builtin/push.c:574
+#: builtin/clone.c:144 builtin/fetch.c:199 builtin/pull.c:234
+#: builtin/push.c:585
msgid "use IPv4 addresses only"
msgstr "solo usar direcciones IPv4"
-#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223
-#: builtin/push.c:576
+#: builtin/clone.c:146 builtin/fetch.c:201 builtin/pull.c:237
+#: builtin/push.c:587
msgid "use IPv6 addresses only"
msgstr "solo usar direcciones IPv6"
-#: builtin/clone.c:149
+#: builtin/clone.c:150
msgid "any cloned submodules will use their remote-tracking branch"
msgstr "cualquier submódulo clonado usará su branch de rastreo remoto"
-#: builtin/clone.c:151
+#: builtin/clone.c:152
msgid "initialize sparse-checkout file to include only files at root"
msgstr ""
"inicializar archivo sparse-checkout para incluir solo archivos en la raíz"
-#: builtin/clone.c:287
+#: builtin/clone.c:288
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -12048,42 +12843,42 @@
"No se pudo adivinar ningún nombre de directorio.\n"
"Por favor especifique un directorio en la línea de comando"
-#: builtin/clone.c:340
+#: builtin/clone.c:341
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: No se pudo agregar un alterno para '%s': %s\n"
-#: builtin/clone.c:413
+#: builtin/clone.c:414
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existe pero no es un directorio"
-#: builtin/clone.c:430
+#: builtin/clone.c:432
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "falló al iniciar el iterador sobre '%s'"
-#: builtin/clone.c:460
+#: builtin/clone.c:463
#, c-format
msgid "failed to create link '%s'"
msgstr "falló al crear link '%s'"
-#: builtin/clone.c:464
+#: builtin/clone.c:467
#, c-format
msgid "failed to copy file to '%s'"
msgstr "falló al copiar archivo a '%s'"
-#: builtin/clone.c:469
+#: builtin/clone.c:472
#, c-format
msgid "failed to iterate over '%s'"
msgstr "falló al iterar sobre '%s'"
-#: builtin/clone.c:494
+#: builtin/clone.c:499
#, c-format
msgid "done.\n"
msgstr "hecho.\n"
-#: builtin/clone.c:508
+#: builtin/clone.c:513
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -12093,100 +12888,105 @@
"Puedes inspeccionar a qué se hizo checkout con 'git status'\n"
"y volver a intentarlo con 'git restore --source=HEAD :/'\n"
-#: builtin/clone.c:585
+#: builtin/clone.c:590
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "No se pudo encontrar la rama remota %s para clonar."
-#: builtin/clone.c:705
+#: builtin/clone.c:709
#, c-format
msgid "unable to update %s"
msgstr "incapaz de actualizar %s"
-#: builtin/clone.c:753
+#: builtin/clone.c:757
msgid "failed to initialize sparse-checkout"
msgstr "falló al inicializar sparse-checkout"
-#: builtin/clone.c:776
+#: builtin/clone.c:780
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"remoto HEAD refiere a un ref inexistente, no se puede hacer checkout.\n"
-#: builtin/clone.c:807
+#: builtin/clone.c:812
msgid "unable to checkout working tree"
msgstr "no es posible realizar checkout en el árbol de trabajo"
-#: builtin/clone.c:862
+#: builtin/clone.c:887
msgid "unable to write parameters to config file"
msgstr "no es posible escribir parámetros al archivo config"
-#: builtin/clone.c:925
+#: builtin/clone.c:950
msgid "cannot repack to clean up"
msgstr "no se puede reempaquetar para limpiar"
-#: builtin/clone.c:927
+#: builtin/clone.c:952
msgid "cannot unlink temporary alternates file"
msgstr "no se puede desvincular archivos alternos temporales"
-#: builtin/clone.c:965 builtin/receive-pack.c:1950
+#: builtin/clone.c:993 builtin/receive-pack.c:2493
msgid "Too many arguments."
msgstr "Muchos argumentos."
-#: builtin/clone.c:969
+#: builtin/clone.c:997
msgid "You must specify a repository to clone."
msgstr "Tienes que especificar un repositorio para clonar."
-#: builtin/clone.c:982
+#: builtin/clone.c:1010
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "Las opciones --bare y --origin %s son incompatibles."
-#: builtin/clone.c:985
+#: builtin/clone.c:1013
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare y --separate-git-dir son incompatibles."
-#: builtin/clone.c:998
+#: builtin/clone.c:1026
#, c-format
msgid "repository '%s' does not exist"
msgstr "repositorio '%s' no existe"
-#: builtin/clone.c:1004 builtin/fetch.c:1796
+#: builtin/clone.c:1030 builtin/fetch.c:1951
#, c-format
msgid "depth %s is not a positive number"
msgstr "profundidad %s no es un numero positivo"
-#: builtin/clone.c:1014
+#: builtin/clone.c:1040
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "la ruta de destino '%s' ya existe y no es un directorio vacío."
-#: builtin/clone.c:1024
+#: builtin/clone.c:1046
+#, c-format
+msgid "repository path '%s' already exists and is not an empty directory."
+msgstr "La ruta del repositorio '%s' ya existe y no es un directorio vacío."
+
+#: builtin/clone.c:1060
#, c-format
msgid "working tree '%s' already exists."
msgstr "directorio de trabajo '%s' ya existe."
-#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271
-#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327
+#: builtin/clone.c:1075 builtin/clone.c:1096 builtin/difftool.c:271
+#: builtin/log.c:1986 builtin/worktree.c:282 builtin/worktree.c:314
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "no se pudo crear directorios principales de '%s'"
-#: builtin/clone.c:1044
+#: builtin/clone.c:1080
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "no se pudo crear un árbol de trabajo '%s'"
-#: builtin/clone.c:1064
+#: builtin/clone.c:1100
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Clonando en un repositorio vacío '%s'...\n"
-#: builtin/clone.c:1066
+#: builtin/clone.c:1102
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Clonando en '%s'...\n"
-#: builtin/clone.c:1090
+#: builtin/clone.c:1126
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -12194,36 +12994,41 @@
"clone --recursive no es compatible con --reference y --reference-if-able al "
"mismo tiempo"
-#: builtin/clone.c:1154
+#: builtin/clone.c:1170 builtin/remote.c:200 builtin/remote.c:705
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr "'%s' no es un nombre remoto válido"
+
+#: builtin/clone.c:1211
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth es ignorada en clonaciones locales; usa file:// más bien."
-#: builtin/clone.c:1156
+#: builtin/clone.c:1213
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "--shallow-since es ignorado en el clon local; use file:// ."
-#: builtin/clone.c:1158
+#: builtin/clone.c:1215
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr "--shallow-exclude es ignorado en clones locales; use file://."
-#: builtin/clone.c:1160
+#: builtin/clone.c:1217
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter es ignorado en clones locales; usa file:// en su lugar."
-#: builtin/clone.c:1163
+#: builtin/clone.c:1220
msgid "source repository is shallow, ignoring --local"
msgstr "repositorio fuente es superficial, ignorando --local"
-#: builtin/clone.c:1168
+#: builtin/clone.c:1225
msgid "--local is ignored"
msgstr "--local es ignorado"
-#: builtin/clone.c:1243 builtin/clone.c:1251
+#: builtin/clone.c:1315 builtin/clone.c:1323
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Rama remota %s no encontrada en upstream %s"
-#: builtin/clone.c:1254
+#: builtin/clone.c:1326
msgid "You appear to have cloned an empty repository."
msgstr "Pareces haber clonado un repositorio sin contenido."
@@ -12259,6 +13064,109 @@
msgid "--command must be the first argument"
msgstr "--command debe ser el primer argumento"
+#: 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 <objdir>] [--append] [--"
+"split[=<estrategia>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
+"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <opciones de split>"
+
+#: builtin/commit-graph.c:64
+#, 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:80 builtin/commit-graph.c:210
+#: builtin/commit-graph.c:316 builtin/fetch.c:187 builtin/log.c:1768
+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 "el directorio de objetos para guardar el gráfico"
+
+#: builtin/commit-graph.c:83
+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:106
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "No se pudo abrir commit-graph '%s'"
+
+#: builtin/commit-graph.c:142
+#, c-format
+msgid "unrecognized --split argument, %s"
+msgstr "argumento --split no reconocido, %s"
+
+#: builtin/commit-graph.c:155
+#, c-format
+msgid "unexpected non-hex object ID: %s"
+msgstr "ID de objeto no hex inesperado :%s"
+
+#: builtin/commit-graph.c:160
+#, c-format
+msgid "invalid object: %s"
+msgstr "no es un objeto válido: %s"
+
+#: builtin/commit-graph.c:213
+msgid "start walk at all refs"
+msgstr "comenzar caminata en todas las refs"
+
+#: builtin/commit-graph.c:215
+msgid "scan pack-indexes listed by stdin for commits"
+msgstr "escanear paquete de índices por stdin por commits"
+
+#: builtin/commit-graph.c:217
+msgid "start walk at commits listed by stdin"
+msgstr "comenzar a caminar a los commits listados por stdin"
+
+#: builtin/commit-graph.c:219
+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:221
+msgid "enable computation for changed paths"
+msgstr "habilitar computación para rutas cambiadas"
+
+#: builtin/commit-graph.c:224
+msgid "allow writing an incremental commit-graph file"
+msgstr "permitir escribir un archivo commit-graph incremental"
+
+#: builtin/commit-graph.c:228
+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:230
+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:232
+msgid "only expire files older than a given date-time"
+msgstr "expirar objetos más viejos a una fecha dada"
+
+#: builtin/commit-graph.c:234
+msgid "maximum number of changed-path Bloom filters to compute"
+msgstr "número máximo de cambios de ruta de filtro Bloom para computar"
+
+#: builtin/commit-graph.c:255
+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:287
+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 "
@@ -12272,7 +13180,7 @@
msgid "duplicate parent %s ignored"
msgstr "padre duplicado %s ignorado"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:557
#, c-format
msgid "not a valid object name %s"
msgstr "no es un nombre de objeto válido %s"
@@ -12300,13 +13208,13 @@
msgid "id of a parent commit object"
msgstr "id del objeto commit padre"
-#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477
-#: builtin/tag.c:412
+#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:282
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1537
+#: builtin/tag.c:445
msgid "message"
msgstr "mensaje"
-#: builtin/commit-tree.c:115 builtin/commit.c:1501
+#: builtin/commit-tree.c:115 builtin/commit.c:1504
msgid "commit message"
msgstr "mensaje del commit"
@@ -12314,8 +13222,8 @@
msgid "read commit log message from file"
msgstr "leer mensaje de commit desde un archivo"
-#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288
-#: builtin/pull.c:175 builtin/revert.c:118
+#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:299
+#: builtin/pull.c:176 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "Firmar commit con GPG"
@@ -12361,10 +13269,14 @@
"\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"
@@ -12386,69 +13298,73 @@
" 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:351
+#: 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:364
+#: 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:376
+#: builtin/commit.c:373
msgid "unable to create temporary index"
msgstr "no es posible crear un índice temporal"
-#: builtin/commit.c:385
+#: builtin/commit.c:382
msgid "interactive add failed"
msgstr "adición interactiva fallida"
-#: builtin/commit.c:400
+#: builtin/commit.c:397
msgid "unable to update temporary index"
msgstr "no es posible actualizar el índice temporal"
-#: builtin/commit.c:402
+#: builtin/commit.c:399
msgid "Failed to update main cache tree"
msgstr "Falló al actualizar el cache principal del árbol"
-#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496
+#: builtin/commit.c: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:479
+#: 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:481
+#: 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:489
+#: 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:508
+#: builtin/commit.c:507
msgid "unable to write temporary index file"
msgstr "no es posible escribir el índice temporal"
-#: builtin/commit.c:606
+#: builtin/commit.c:605
#, c-format
msgid "commit '%s' lacks author header"
msgstr "commit '%s' requiere cabecera de autor"
-#: builtin/commit.c:608
+#: 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:627
+#: builtin/commit.c:626
msgid "malformed --author parameter"
msgstr "parámetro --author mal formado"
-#: builtin/commit.c:680
+#: builtin/commit.c:679
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -12456,68 +13372,66 @@
"no es posible seleccionar un carácter de comentario que no es usado\n"
"en el mensaje de commit actual"
-#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097
+#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097
#, c-format
msgid "could not lookup commit %s"
msgstr "no se pudo revisar el commit %s"
-#: builtin/commit.c:730 builtin/shortlog.c:319
+#: builtin/commit.c:729 builtin/shortlog.c:413
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(leyendo mensajes de logs desde standard input)\n"
-#: builtin/commit.c:732
+#: builtin/commit.c:731
msgid "could not read log from standard input"
msgstr "no se pudo leer log desde standard input"
-#: builtin/commit.c:736
+#: builtin/commit.c:735
#, c-format
msgid "could not read log file '%s'"
msgstr "no se pudo leer el log '%s'"
-#: builtin/commit.c:767 builtin/commit.c:783
+#: builtin/commit.c:766 builtin/commit.c:782
msgid "could not read SQUASH_MSG"
msgstr "no se pudo leer SQUASH_MSG"
-#: builtin/commit.c:774
+#: builtin/commit.c:773
msgid "could not read MERGE_MSG"
msgstr "no se pudo leer MERGE_MSG"
-#: builtin/commit.c:834
+#: builtin/commit.c:833
msgid "could not write commit template"
msgstr "no se pudo escribir el template del commit"
#: builtin/commit.c:853
-#, c-format
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
+"If this is not correct, please run\n"
+"\tgit update-ref -d MERGE_HEAD\n"
"and try again.\n"
msgstr ""
"\n"
-"Parece que estás haciendo un commit con una fusión dentro.\n"
-"Si esto no es correcto, por favor elimina el archivo\n"
-"\t%s\n"
-"y vuelve a intentar.\n"
+"Parece que está realizando una fusión.\n"
+"Si esto no es correcto, ejecute\n"
+"\tgit update-ref -d MERGE_HEAD\n"
+"e intenta de nuevo.\n"
#: builtin/commit.c:858
-#, c-format
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
+"If this is not correct, please run\n"
+"\tgit update-ref -d CHERRY_PICK_HEAD\n"
"and try again.\n"
msgstr ""
"\n"
-"Parece que puedes estar haciendo un commit a un cherry-pick.\n"
-"Si esto no es correcto, por favor elimina el archivo\n"
-"\t%s\n"
-"y vuelve a intentar.\n"
+"Parece que puede estar cometiendo una selección de cerebros.\n"
+"Si esto no es correcto, ejecute\n"
+"\tgit update-ref -d CHERRY_PICK_HEAD\n"
+"e intenta de nuevo.\n"
-#: builtin/commit.c:871
+#: builtin/commit.c:868
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -12527,7 +13441,7 @@
" líneas que comiencen con '%c' serán ignoradas, y un mensaje\n"
" vacío aborta el commit.\n"
-#: builtin/commit.c:879
+#: builtin/commit.c:876
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -12539,22 +13453,22 @@
" usted mismo si lo desea.\n"
"Un mensaje vacío aborta el commit.\n"
-#: builtin/commit.c:896
+#: builtin/commit.c:893
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:904
+#: builtin/commit.c:901
#, c-format
msgid "%sDate: %s"
msgstr "%sFecha: %s"
-#: builtin/commit.c:911
+#: builtin/commit.c:908
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sCommitter: %.*s <%.*s>"
-#: builtin/commit.c:929
+#: builtin/commit.c:926
msgid "Cannot read index"
msgstr "No se puede leer el índice"
@@ -12562,7 +13476,7 @@
msgid "Error building trees"
msgstr "Error al construir los árboles"
-#: builtin/commit.c:1011 builtin/tag.c:275
+#: builtin/commit.c:1011 builtin/tag.c:308
#, 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"
@@ -12579,7 +13493,7 @@
msgid "Invalid ignored mode '%s'"
msgstr "Modo ignorado inválido '%s'"
-#: builtin/commit.c:1087 builtin/commit.c:1327
+#: builtin/commit.c:1087 builtin/commit.c:1331
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Modo inválido de los archivos no rastreados '%s'"
@@ -12604,78 +13518,82 @@
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Está en medio de un cherry-pick -- no se puede enmendar."
-#: builtin/commit.c:1188
+#: builtin/commit.c:1187
+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:1190
msgid "Options --squash and --fixup cannot be used together"
msgstr "Opciones --squash y --fixup no pueden ser usadas juntas"
-#: builtin/commit.c:1198
+#: builtin/commit.c:1200
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Solo uno de -c/-C/-F/--fixup puede ser usado."
-#: builtin/commit.c:1200
+#: builtin/commit.c:1202
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "La opción -m no puede ser combinada con -c/-C/-F."
-#: builtin/commit.c:1208
+#: builtin/commit.c:1211
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author sólo puede ser usada con -C, -c o --amend."
-#: builtin/commit.c:1225
+#: builtin/commit.c:1229
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Solo uno de --include/--only/--all/--interactive/--patch puede ser usado."
-#: builtin/commit.c:1231
+#: builtin/commit.c:1235
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "paths '%s ...' con -a no tiene sentido"
-#: builtin/commit.c:1362 builtin/commit.c:1524
+#: builtin/commit.c:1366 builtin/commit.c:1527
msgid "show status concisely"
msgstr "mostrar status de manera concisa"
-#: builtin/commit.c:1364 builtin/commit.c:1526
+#: builtin/commit.c:1368 builtin/commit.c:1529
msgid "show branch information"
msgstr "mostrar información de la rama"
-#: builtin/commit.c:1366
+#: builtin/commit.c:1370
msgid "show stash information"
msgstr "mostrar información del stash"
-#: builtin/commit.c:1368 builtin/commit.c:1528
+#: builtin/commit.c:1372 builtin/commit.c:1531
msgid "compute full ahead/behind values"
msgstr "calcular todos los valores delante/atrás"
-#: builtin/commit.c:1370
+#: builtin/commit.c:1374
msgid "version"
msgstr "version"
-#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549
-#: builtin/worktree.c:643
+#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560
+#: builtin/worktree.c:679
msgid "machine-readable output"
msgstr "output formato-maquina"
-#: builtin/commit.c:1373 builtin/commit.c:1532
+#: builtin/commit.c:1377 builtin/commit.c:1535
msgid "show status in long format (default)"
msgstr "mostrar status en formato largo (default)"
-#: builtin/commit.c:1376 builtin/commit.c:1535
+#: builtin/commit.c:1380 builtin/commit.c:1538
msgid "terminate entries with NUL"
msgstr "terminar entradas con NUL"
-#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538
-#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
-#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336
+#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541
+#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
+#: builtin/fast-export.c:1204 builtin/rebase.c:1412 parse-options.h:336
msgid "mode"
msgstr "modo"
-#: builtin/commit.c:1379 builtin/commit.c:1538
+#: builtin/commit.c:1383 builtin/commit.c:1541
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"mostrar archivos sin seguimiento, modos opcionales: all, normal, no. "
"(Predeterminado: all)"
-#: builtin/commit.c:1383
+#: builtin/commit.c:1387
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -12683,11 +13601,11 @@
"mostrar archivos ignorados, modos opcionales: traditional, matching, no. "
"(Predeterminado: traditional)"
-#: builtin/commit.c:1385 parse-options.h:192
+#: builtin/commit.c:1389 parse-options.h:192
msgid "when"
msgstr "cuando"
-#: builtin/commit.c:1386
+#: builtin/commit.c:1390
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -12695,173 +13613,173 @@
"ignorar cambios en submódulos, opcional cuando: all,dirty,untracked. "
"(Default: all)"
-#: builtin/commit.c:1388
+#: builtin/commit.c:1392
msgid "list untracked files in columns"
msgstr "listar en columnas los archivos sin seguimiento"
-#: builtin/commit.c:1389
+#: builtin/commit.c:1393
msgid "do not detect renames"
msgstr "no detectar renombrados"
-#: builtin/commit.c:1391
+#: builtin/commit.c:1395
msgid "detect renames, optionally set similarity index"
msgstr "detectar renombres, opcionalmente configurar similaridad de índice"
-#: builtin/commit.c:1411
+#: builtin/commit.c:1415
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
"Combinación de argumentos de archivos ignorados y no rastreados no soportada"
-#: builtin/commit.c:1494
+#: builtin/commit.c:1497
msgid "suppress summary after successful commit"
msgstr "suprime summary tras un commit exitoso"
-#: builtin/commit.c:1495
+#: builtin/commit.c:1498
msgid "show diff in commit message template"
msgstr "mostrar diff en el template del mensaje de commit"
-#: builtin/commit.c:1497
+#: builtin/commit.c:1500
msgid "Commit message options"
msgstr "Opciones para el mensaje del commit"
-#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414
+#: builtin/commit.c:1501 builtin/merge.c:286 builtin/tag.c:447
msgid "read message from file"
msgstr "leer mensaje desde un archivo"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1502
msgid "author"
msgstr "autor"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1502
msgid "override author for commit"
msgstr "sobrescribe el autor del commit"
-#: builtin/commit.c:1500 builtin/gc.c:538
+#: builtin/commit.c:1503 builtin/gc.c:550
msgid "date"
msgstr "fecha"
-#: builtin/commit.c:1500
+#: builtin/commit.c:1503
msgid "override date for commit"
msgstr "sobrescribe la fecha del commit"
-#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504
-#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92
+#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507
+#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:90
msgid "commit"
msgstr "confirmar"
-#: builtin/commit.c:1502
+#: builtin/commit.c:1505
msgid "reuse and edit message from specified commit"
msgstr "reusar y editar el mensaje de un commit especifico"
-#: builtin/commit.c:1503
+#: builtin/commit.c:1506
msgid "reuse message from specified commit"
msgstr "reusar el mensaje de un commit especifico"
-#: builtin/commit.c:1504
+#: builtin/commit.c:1507
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"usar mensaje de formato autosquash para arreglar el commit especificado"
-#: builtin/commit.c:1505
+#: builtin/commit.c:1508
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"usar el mensaje de formato autosquash para realizar squash al commit "
"especificado"
-#: builtin/commit.c:1506
+#: builtin/commit.c:1509
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "el autor del commit soy yo ahora (usado con -C/-c/--amend)"
-#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290
-#: builtin/pull.c:144 builtin/revert.c:110
-msgid "add Signed-off-by:"
-msgstr "agregar Signed-off-by: (firmado por)"
+#: builtin/commit.c:1510 builtin/log.c:1743 builtin/merge.c:302
+#: builtin/pull.c:145 builtin/revert.c:110
+msgid "add a Signed-off-by trailer"
+msgstr "agregar un firmado por al final"
-#: builtin/commit.c:1508
+#: builtin/commit.c:1511
msgid "use specified template file"
msgstr "usar archivo de template especificado"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1512
msgid "force edit of commit"
msgstr "forzar la edición del commit"
-#: builtin/commit.c:1511
+#: builtin/commit.c:1514
msgid "include status in commit message template"
msgstr "incluir status en el template del mensaje de commit"
-#: builtin/commit.c:1516
+#: builtin/commit.c:1519
msgid "Commit contents options"
msgstr "Opciones para el contenido del commit"
-#: builtin/commit.c:1517
+#: builtin/commit.c:1520
msgid "commit all changed files"
msgstr "confirmar todos los archivos cambiados"
-#: builtin/commit.c:1518
+#: builtin/commit.c:1521
msgid "add specified files to index for commit"
msgstr "agregar archivos específicos al índice para confirmar"
-#: builtin/commit.c:1519
+#: builtin/commit.c:1522
msgid "interactively add files"
msgstr "agregar archivos interactivamente"
-#: builtin/commit.c:1520
+#: builtin/commit.c:1523
msgid "interactively add changes"
msgstr "agregar cambios interactivamente"
-#: builtin/commit.c:1521
+#: builtin/commit.c:1524
msgid "commit only specified files"
msgstr "sólo confirmar archivos específicos"
-#: builtin/commit.c:1522
+#: builtin/commit.c:1525
msgid "bypass pre-commit and commit-msg hooks"
msgstr "evitar los capturadores (hooks) de pre-commit y commit-msg"
-#: builtin/commit.c:1523
+#: builtin/commit.c:1526
msgid "show what would be committed"
msgstr "mostrar lo que sería incluido en el commit"
-#: builtin/commit.c:1536
+#: builtin/commit.c:1539
msgid "amend previous commit"
msgstr "enmendar commit previo"
-#: builtin/commit.c:1537
+#: builtin/commit.c:1540
msgid "bypass post-rewrite hook"
msgstr "gancho bypass post reescritura"
-#: builtin/commit.c:1544
+#: builtin/commit.c:1547
msgid "ok to record an empty change"
msgstr "ok al grabar un cambio vacío"
-#: builtin/commit.c:1546
+#: builtin/commit.c:1549
msgid "ok to record a change with an empty message"
msgstr "ok al grabar un cambio con un mensaje vacío"
-#: builtin/commit.c:1619
+#: builtin/commit.c:1622
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Archivo MERGE_HEAD (%s) corrupto"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1629
msgid "could not read MERGE_MODE"
msgstr "no se pudo leer MERGE_MODE"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1650
#, c-format
msgid "could not read commit message: %s"
msgstr "no se pudo leer el mensaje de commit: %s"
-#: builtin/commit.c:1652
+#: builtin/commit.c:1657
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Abortando commit debido que el mensaje está en blanco.\n"
-#: builtin/commit.c:1657
+#: builtin/commit.c:1662
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Abortando commit; no se ha editado el mensaje\n"
-#: builtin/commit.c:1691
+#: builtin/commit.c:1696
msgid ""
"repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -12871,287 +13789,224 @@
"new_index. Verifique que el disco no este lleno y la quota no ha\n"
"sido superada, y luego \"git restore --sateged :/\" para recuperar."
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:17
-msgid ""
-"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
-msgstr ""
-"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
-
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:22
-msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
-msgstr ""
-"git commit-graph write [--object-dir <dir objeto>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <opciones de "
-"split>"
-
-#: builtin/commit-graph.c:52
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "no se pudo entoncrar el objeto directorio concordante con %s"
-
-#: builtin/commit-graph.c:68 builtin/commit-graph.c:125
-#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657
-msgid "dir"
-msgstr "dir"
-
-#: builtin/commit-graph.c:69 builtin/commit-graph.c:126
-#: builtin/commit-graph.c:211
-msgid "The object directory to store the graph"
-msgstr "El directorio de objetos para guardar el gráfico"
-
-#: builtin/commit-graph.c:71
-msgid "if the commit-graph is split, only verify the tip file"
-msgstr "si el commit-graph está cortado, solo verifica la punta del archivo"
-
-#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23
-#, c-format
-msgid "Could not open commit-graph '%s'"
-msgstr "No se pudo abrir commit-graph '%s'"
-
-#: builtin/commit-graph.c:128
-msgid "start walk at all refs"
-msgstr "comenzar caminata en todas las refs"
-
-#: builtin/commit-graph.c:130
-msgid "scan pack-indexes listed by stdin for commits"
-msgstr "escanear paquete de índices por stdin por commits"
-
-#: builtin/commit-graph.c:132
-msgid "start walk at commits listed by stdin"
-msgstr "comenzar a caminar a los commits listados por stdin"
-
-#: builtin/commit-graph.c:134
-msgid "include all commits already in the commit-graph file"
-msgstr "inclye todos los commits que ya están en el archivo commit-graph"
-
-#: builtin/commit-graph.c:137
-msgid "allow writing an incremental commit-graph file"
-msgstr "permitir escribir un archivo commit-graph incremental"
-
-#: builtin/commit-graph.c:139 builtin/commit-graph.c:143
-msgid "maximum number of commits in a non-base split commit-graph"
-msgstr "máximo número de commits en un commit-graph sin base cortada"
-
-#: builtin/commit-graph.c:141
-msgid "maximum ratio between two levels of a split commit-graph"
-msgstr "radio máximo entre dos niveles de corte de commit-graph"
-
-#: builtin/commit-graph.c:159
-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:104 builtin/env--helper.c:23
+#: builtin/config.c:109 builtin/env--helper.c:27
#, c-format
msgid "unrecognized --type argument, %s"
msgstr "argumento --type no reconocido, %s"
-#: builtin/config.c:116
+#: builtin/config.c:121
msgid "only one type at a time"
msgstr "solo un tipo a la vez"
-#: builtin/config.c:125
+#: builtin/config.c:130
msgid "Config file location"
msgstr "Ubicación del archivo configuración"
-#: builtin/config.c:126
+#: builtin/config.c:131
msgid "use global config file"
msgstr "usar archivo de config global"
-#: builtin/config.c:127
+#: builtin/config.c:132
msgid "use system config file"
msgstr "usar archivo de config del sistema"
-#: builtin/config.c:128
+#: builtin/config.c:133
msgid "use repository config file"
msgstr "usar archivo de config del repositorio"
-#: builtin/config.c:129
+#: builtin/config.c:134
msgid "use per-worktree config file"
msgstr "usar un archivo de config por árbol de trabajo"
-#: builtin/config.c:130
+#: builtin/config.c:135
msgid "use given config file"
msgstr "usar archivo config especificado"
-#: builtin/config.c:131
+#: builtin/config.c:136
msgid "blob-id"
msgstr "blob-id"
-#: builtin/config.c:131
+#: builtin/config.c:136
msgid "read config from given blob object"
msgstr "leer config del objeto blob suministrado"
-#: builtin/config.c:132
+#: builtin/config.c:137
msgid "Action"
msgstr "Acción"
-#: builtin/config.c:133
-msgid "get value: name [value-regex]"
-msgstr "obtener valor: nombre [valor-regex]"
+#: builtin/config.c:138
+msgid "get value: name [value-pattern]"
+msgstr "obtener valor: nombre [patrón de valor]"
-#: builtin/config.c:134
-msgid "get all values: key [value-regex]"
-msgstr "obtener todos los valores: llave [valores-regex]"
+#: builtin/config.c:139
+msgid "get all values: key [value-pattern]"
+msgstr "obtener todos los valores: clave [patrón de valor]"
-#: 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:140
+msgid "get values for regexp: name-regex [value-pattern]"
+msgstr "obtener valores para regexp: name-regex [value-pattern]"
-#: builtin/config.c:136
+#: builtin/config.c:141
msgid "get value specific for the URL: section[.var] URL"
msgstr "obtener valor especifico para el URL: sección[.var] URL"
-#: builtin/config.c:137
-msgid "replace all matching variables: name value [value_regex]"
+#: builtin/config.c:142
+msgid "replace all matching variables: name value [value-pattern]"
msgstr ""
-"remplazar todas las variables que concuerden: nombre valor [valor_regex]"
+"reemplazar todas las variables coincidentes: nombre valor [valor-patrón]"
-#: builtin/config.c:138
+#: builtin/config.c:143
msgid "add a new variable: name value"
msgstr "agregar nueva variable: nombre valor"
-#: builtin/config.c:139
-msgid "remove a variable: name [value-regex]"
-msgstr "borrar una variable. nombre [valor-regex]"
+#: builtin/config.c:144
+msgid "remove a variable: name [value-pattern]"
+msgstr "eliminar una variable: nombre [patrón de valor]"
-#: builtin/config.c:140
-msgid "remove all matches: name [value-regex]"
-msgstr "borrar todas las concurrencias: nombre [valor-regex]"
+#: builtin/config.c:145
+msgid "remove all matches: name [value-pattern]"
+msgstr "eliminar todas las coincidencias: nombre [patrón de valor]"
-#: builtin/config.c:141
+#: builtin/config.c:146
msgid "rename section: old-name new-name"
msgstr "renombrar sección: nombre-viejo nombre-nuevo"
-#: builtin/config.c:142
+#: builtin/config.c:147
msgid "remove a section: name"
msgstr "borrar una sección: nombre"
-#: builtin/config.c:143
+#: builtin/config.c:148
msgid "list all"
msgstr "listar todo"
-#: builtin/config.c:144
+#: builtin/config.c:149
+msgid "use string equality when comparing values to 'value-pattern'"
+msgstr "use la igualdad de cadenas al comparar valores con 'patrón de valor'"
+
+#: builtin/config.c:150
msgid "open an editor"
msgstr "abrir el editor"
-#: builtin/config.c:145
+#: builtin/config.c:151
msgid "find the color configured: slot [default]"
msgstr "encontrar el color configurado: slot [default]"
-#: builtin/config.c:146
+#: builtin/config.c:152
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "encontrar las opciones del color: slot [stdout-es-tty]"
-#: builtin/config.c:147
+#: builtin/config.c:153
msgid "Type"
msgstr "Tipo"
-#: builtin/config.c:148 builtin/env--helper.c:38
+#: builtin/config.c:154 builtin/env--helper.c:43
msgid "value is given this type"
msgstr "al valor se ha dado este tipo"
-#: builtin/config.c:149
+#: builtin/config.c:155
msgid "value is \"true\" or \"false\""
msgstr "valor es \"true\" o \"false\""
-#: builtin/config.c:150
+#: builtin/config.c:156
msgid "value is decimal number"
msgstr "valor es un numero decimal"
-#: builtin/config.c:151
+#: builtin/config.c:157
msgid "value is --bool or --int"
msgstr "valor es --bool o --int"
-#: builtin/config.c:152
+#: builtin/config.c:158
+msgid "value is --bool or string"
+msgstr "el valor es --bool o cadena"
+
+#: builtin/config.c:159
msgid "value is a path (file or directory name)"
msgstr "valor es una ruta (archivo o nombre de directorio)"
-#: builtin/config.c:153
+#: builtin/config.c:160
msgid "value is an expiry date"
msgstr "valor es una fecha de expiración"
-#: builtin/config.c:154
+#: builtin/config.c:161
msgid "Other"
msgstr "Otro"
-#: builtin/config.c:155
+#: builtin/config.c:162
msgid "terminate values with NUL byte"
msgstr "terminar valores con un byte NULL"
-#: builtin/config.c:156
+#: builtin/config.c:163
msgid "show variable names only"
msgstr "mostrar solo nombres de variables"
-#: builtin/config.c:157
+#: builtin/config.c:164
msgid "respect include directives on lookup"
msgstr "respetar directivas include en la búsqueda"
-#: builtin/config.c:158
+#: builtin/config.c:165
msgid "show origin of config (file, standard input, blob, command line)"
msgstr "mostrar el origen de configuración (archivo, stdin, blob, comando)"
-#: builtin/config.c:159
+#: builtin/config.c:166
msgid "show scope of config (worktree, local, global, system, command)"
msgstr ""
"mostrar el scope de la configuración (worktree, local, global, system, "
"command)"
-#: builtin/config.c:160 builtin/env--helper.c:40
+#: builtin/config.c:167 builtin/env--helper.c:45
msgid "value"
msgstr "valor"
-#: builtin/config.c:160
+#: builtin/config.c:167
msgid "with --get, use default value when missing entry"
msgstr "con --get, usa el valor por defecto cuando falta una entrada"
-#: builtin/config.c:174
+#: builtin/config.c:181
#, c-format
msgid "wrong number of arguments, should be %d"
msgstr "número de argumentos inválidos, deberían ser %d"
-#: builtin/config.c:176
+#: builtin/config.c:183
#, c-format
msgid "wrong number of arguments, should be from %d to %d"
msgstr "número de argumentos inválidos, deberían ser de %d a %d"
-#: builtin/config.c:324
+#: builtin/config.c:339
#, c-format
msgid "invalid key pattern: %s"
msgstr "patrón de llave inválido: %s"
-#: builtin/config.c:360
+#: builtin/config.c:377
#, c-format
msgid "failed to format default config value: %s"
msgstr "falló al formatear el valor por defecto de configuración: %s"
-#: builtin/config.c:417
+#: builtin/config.c:441
#, c-format
msgid "cannot parse color '%s'"
msgstr "no se analizar color '%s'"
-#: builtin/config.c:459
+#: builtin/config.c:483
msgid "unable to parse default color value"
msgstr "no es posible analizar el valor por defecto de color"
-#: builtin/config.c:512 builtin/config.c:768
+#: builtin/config.c:536 builtin/config.c:833
msgid "not in a git directory"
msgstr "no en un directorio git"
-#: builtin/config.c:515
+#: builtin/config.c:539
msgid "writing to stdin is not supported"
msgstr "escribir en stdin no está soportado"
-#: builtin/config.c:518
+#: builtin/config.c:542
msgid "writing config blobs is not supported"
msgstr "escribir blobs de configuración no está soportado"
-#: builtin/config.c:603
+#: builtin/config.c:627
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -13166,23 +14021,27 @@
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:627
+#: builtin/config.c:652
msgid "only one config file at a time"
msgstr "solo un archivo de configuración a la vez"
-#: builtin/config.c:632
+#: builtin/config.c:658
msgid "--local can only be used inside a git repository"
msgstr "--local solo puedo ser usado dentro de un repositorio"
-#: builtin/config.c:635
+#: builtin/config.c:660
msgid "--blob can only be used inside a git repository"
msgstr "--blob solo puede ser usado dentro de un repositorio"
-#: builtin/config.c:655
+#: builtin/config.c:662
+msgid "--worktree can only be used inside a git repository"
+msgstr "--worktree solo se puede usar dentro de un repositorio de git"
+
+#: builtin/config.c:684
msgid "$HOME not set"
msgstr "$HOME no está configurado"
-#: builtin/config.c:679
+#: builtin/config.c:708
msgid ""
"--worktree cannot be used with multiple working trees unless the config\n"
"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -13194,52 +14053,56 @@
"\"\n"
"en \"git help worktree\" para más detalles"
-#: builtin/config.c:714
+#: builtin/config.c:743
msgid "--get-color and variable type are incoherent"
msgstr "--get-color y tipo de variable incoherente"
-#: builtin/config.c:719
+#: builtin/config.c:748
msgid "only one action at a time"
msgstr "solo una acción a la vez"
-#: builtin/config.c:732
+#: builtin/config.c:761
msgid "--name-only is only applicable to --list or --get-regexp"
msgstr "--name-only solo es aplicable para --list o --get-regexp"
-#: builtin/config.c:738
+#: builtin/config.c:767
msgid ""
"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
"list"
msgstr ""
"--show-origin solo es aplicable para --get, --get-all, --get-regexp, y --list"
-#: builtin/config.c:744
+#: builtin/config.c:773
msgid "--default is only applicable to --get"
msgstr "--default solo es aplicable para --get"
-#: builtin/config.c:757
+#: builtin/config.c:806
+msgid "--fixed-value only applies with 'value-pattern'"
+msgstr "--fixed-value solo se aplica con 'value-pattern'"
+
+#: builtin/config.c:822
#, c-format
msgid "unable to read config file '%s'"
msgstr "no se puede leer el archivo de configuración '%s'"
-#: builtin/config.c:760
+#: builtin/config.c:825
msgid "error processing config file(s)"
msgstr "error al procesar archivo(s) de configuración"
-#: builtin/config.c:770
+#: builtin/config.c:835
msgid "editing stdin is not supported"
msgstr "editar stdin no está soportado"
-#: builtin/config.c:772
+#: builtin/config.c:837
msgid "editing blobs is not supported"
msgstr "editar blobs no está soportado"
-#: builtin/config.c:786
+#: builtin/config.c:851
#, c-format
msgid "cannot create configuration file %s"
msgstr "no se puede crear el archivo de configuración %s"
-#: builtin/config.c:799
+#: builtin/config.c:864
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -13248,7 +14111,7 @@
"no se puede sobrescribir múltiples valores con un único valor\n"
"\tUse una regexp, --add o --replace-all para cambiar %s."
-#: builtin/config.c:873 builtin/config.c:884
+#: builtin/config.c:943 builtin/config.c:954
#, c-format
msgid "no such section: %s"
msgstr "no existe la sección: %s"
@@ -13261,6 +14124,38 @@
msgid "print sizes in human readable format"
msgstr "mostrar tamaños en formato legible para humano"
+#: 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 ""
+"Los permisos en tu directorio de socket son demasiado flojos; otros\n"
+"usuarios pueden leer sus credenciales almacenadas en caché. Considera "
+"ejecutar:\n"
+"\n"
+"\tchmod 0700 %s"
+
+#: builtin/credential-cache--daemon.c:275
+msgid "print debugging messages to stderr"
+msgstr "mostrar mensajes de debug en stderr"
+
+#: builtin/credential-cache--daemon.c:315
+msgid "credential-cache--daemon unavailable; no unix socket support"
+msgstr "credential-cache--daemon no disponible; sin soporte de socket Unix"
+
+#: builtin/credential-cache.c:154
+msgid "credential-cache unavailable; no unix socket support"
+msgstr "credential-cache no disponible; sin soporte de socket Unix"
+
+#: builtin/credential-store.c:66
+#, c-format
+msgid "unable to get credential storage lock in %d ms"
+msgstr ""
+"no se puede obtener el bloqueo de almacenamiento de credenciales en %d ms"
+
#: builtin/describe.c:26
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<opciones>] [<commit-ish>...]"
@@ -13269,49 +14164,44 @@
msgid "git describe [<options>] --dirty"
msgstr "git describe [<opciones>] --dirty"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "head"
msgstr "head"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "lightweight"
msgstr "ligero"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "annotated"
msgstr "anotado"
-#: builtin/describe.c:275
+#: builtin/describe.c:277
#, c-format
msgid "annotated tag %s not available"
msgstr "tag anotado %s no disponible"
-#: builtin/describe.c:279
-#, c-format
-msgid "annotated tag %s has no embedded name"
-msgstr "tag anotado %s no tiene nombre embebido"
-
#: builtin/describe.c:281
#, c-format
-msgid "tag '%s' is really '%s' here"
-msgstr "tag '%s' es realmente '%s' aquí"
+msgid "tag '%s' is externally known as '%s'"
+msgstr "tag '%s' es literalmente conocida como '%s'"
-#: builtin/describe.c:325
+#: builtin/describe.c:328
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "no hay tag que concuerde exactamente con '%s'"
-#: builtin/describe.c:327
+#: 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:394
+#: builtin/describe.c:397
#, c-format
msgid "finished search at %s\n"
msgstr "búsqueda finalizada a las %s\n"
-#: builtin/describe.c:421
+#: builtin/describe.c:424
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -13320,7 +14210,7 @@
"No hay tags anotados que puedan describir '%s'.\n"
"Sin embargo, hubieron tags no anotados: intente --tags."
-#: builtin/describe.c:425
+#: builtin/describe.c:428
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -13329,12 +14219,12 @@
"Ningún tag puede describit '%s'.\n"
"Intente --always, o cree algunos tags."
-#: builtin/describe.c:455
+#: builtin/describe.c:458
#, c-format
msgid "traversed %lu commits\n"
msgstr "%lu commits cruzados\n"
-#: builtin/describe.c:458
+#: builtin/describe.c:461
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -13343,122 +14233,140 @@
"se encontró más de %i tags; se mostró %i más reciente\n"
"fin de la búsqueda en %s\n"
-#: builtin/describe.c:526
+#: builtin/describe.c:529
#, c-format
msgid "describe %s\n"
msgstr "describe %s\n"
-#: builtin/describe.c:529
+#: builtin/describe.c:532
#, c-format
msgid "Not a valid object name %s"
msgstr "Nombre de objeto %s no válido"
-#: builtin/describe.c:537
+#: 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:551
+#: 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:552
+#: builtin/describe.c:555
msgid "debug search strategy on stderr"
msgstr "hacer debug a la estrategia de búsqueda en stderr"
-#: builtin/describe.c:553
+#: builtin/describe.c:556
msgid "use any ref"
msgstr "use cualquier ref"
-#: builtin/describe.c:554
+#: builtin/describe.c:557
msgid "use any tag, even unannotated"
msgstr "use cualquier tag, incluso los no anotados"
-#: builtin/describe.c:555
+#: builtin/describe.c:558
msgid "always use long format"
msgstr "siempre usar formato largo"
-#: builtin/describe.c:556
+#: builtin/describe.c:559
msgid "only follow first parent"
msgstr "solo seguir el primer patrón"
-#: builtin/describe.c:559
+#: builtin/describe.c:562
msgid "only output exact matches"
msgstr "solo mostrar concordancias exactas"
-#: builtin/describe.c:561
+#: builtin/describe.c:564
msgid "consider <n> most recent tags (default: 10)"
msgstr "considerar <n> tags más recientes (default:10)"
-#: builtin/describe.c:563
+#: builtin/describe.c:566
msgid "only consider tags matching <pattern>"
msgstr "solo considerar tags que concuerden con <patrón>"
-#: builtin/describe.c:565
+#: builtin/describe.c:568
msgid "do not consider tags matching <pattern>"
msgstr "no considerar tags que concuerden con <patrón>"
-#: builtin/describe.c:567 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:535
msgid "show abbreviated commit object as fallback"
msgstr "mostrar el objeto commit abreviado como fallback"
-#: builtin/describe.c:568 builtin/describe.c:571
+#: builtin/describe.c:571 builtin/describe.c:574
msgid "mark"
msgstr "marca"
-#: builtin/describe.c:569
+#: 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:572
+#: 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:590
+#: builtin/describe.c:593
msgid "--long is incompatible with --abbrev=0"
msgstr "--long es incompatible con --abbrev=0"
-#: builtin/describe.c:619
+#: builtin/describe.c:622
msgid "No names found, cannot describe anything."
msgstr "No se encontraron nombres, no se puede describir nada."
-#: builtin/describe.c:670
+#: builtin/describe.c:673
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty es incompatible con commit-ismos"
-#: builtin/describe.c:672
+#: builtin/describe.c:675
msgid "--broken is incompatible with commit-ishes"
msgstr "--broken es incompatible con commit-ismos"
-#: builtin/diff.c:84
+#: builtin/diff-tree.c:155
+msgid "--stdin and --merge-base are mutually exclusive"
+msgstr "--stdin and --merge-baseson mutuamente exclusivas"
+
+#: builtin/diff-tree.c:157
+msgid "--merge-base only works with two commits"
+msgstr "--merge-base solo funciona con dos commits"
+
+#: builtin/diff.c:92
#, 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:259
#, c-format
msgid "invalid option: %s"
msgstr "opción inválida: %s"
-#: builtin/diff.c:350
+#: builtin/diff.c:376
+#, c-format
+msgid "%s...%s: no merge base"
+msgstr "%s...%s: se neceista una base de fusión"
+
+#: builtin/diff.c:486
msgid "Not a git repository"
msgstr "No es un repositorio git"
-#: builtin/diff.c:394
+#: builtin/diff.c:532 builtin/grep.c:682
#, c-format
msgid "invalid object '%s' given."
msgstr "objeto '%s' entregado no es válido."
-#: builtin/diff.c:403
+#: builtin/diff.c:543
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "más de dos blobs entregados: '%s'"
-#: builtin/diff.c:408
+#: builtin/diff.c:548
#, c-format
msgid "unhandled object '%s' given."
msgstr "objeto no manejado '%s' entregado."
+#: builtin/diff.c:582
+#, 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>...]"
@@ -13483,7 +14391,7 @@
msgid "could not read object %s for symlink %s"
msgstr "no se pudo leer el objeto %s para el symlink %s"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:412
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
@@ -13491,54 +14399,54 @@
"formatos combinados de diff ('-c' y '--cc') no soportados en\n"
"modo diff para directorio('-d' y '--dir-diff')."
-#: builtin/difftool.c:634
+#: builtin/difftool.c:633
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "ambos archivos modificados: '%s' y '%s'."
-#: builtin/difftool.c:636
+#: builtin/difftool.c:635
msgid "working tree file has been left."
msgstr "archivo del árbol de trabajo ha sido dejado."
-#: builtin/difftool.c:647
+#: builtin/difftool.c:646
#, c-format
msgid "temporary files exist in '%s'."
msgstr "archivo temporal existe en '%s'."
-#: builtin/difftool.c:648
+#: builtin/difftool.c:647
msgid "you may want to cleanup or recover these."
msgstr "tal vez desees limpiar o recuperar estos."
-#: builtin/difftool.c:697
+#: builtin/difftool.c:696
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "use `diff.guitool` en lugar de `diff.tool`"
-#: builtin/difftool.c:699
+#: builtin/difftool.c:698
msgid "perform a full-directory diff"
msgstr "realizar un diff de todo el directorio"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:700
msgid "do not prompt before launching a diff tool"
msgstr "no mostrar antes de lanzar una herramienta de diff"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:705
msgid "use symlinks in dir-diff mode"
msgstr "usar enlaces simbólicos en modo dir-diff"
-#: builtin/difftool.c:707
+#: builtin/difftool.c:706
msgid "tool"
msgstr "herramienta"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:707
msgid "use the specified diff tool"
msgstr "usar la herramienta de diff especificada"
-#: builtin/difftool.c:710
+#: builtin/difftool.c:709
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
"mostrar una lista de herramientas de diff que pueden ser usadas con `--tool`"
-#: builtin/difftool.c:713
+#: builtin/difftool.c:712
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
@@ -13546,31 +14454,31 @@
"hacer que 'git-difftool' salga cuando una herramienta de diff retorne un "
"código de salida distinto de cero"
-#: builtin/difftool.c:716
+#: builtin/difftool.c:715
msgid "specify a custom command for viewing diffs"
msgstr "especificar un comando personalizado para ver diffs"
-#: builtin/difftool.c:717
+#: builtin/difftool.c:716
msgid "passed to `diff`"
msgstr "pasado a `diff`"
-#: builtin/difftool.c:732
+#: builtin/difftool.c:731
msgid "difftool requires worktree or --no-index"
msgstr "difftool requiere un árbol de trabajo o --no-index"
-#: builtin/difftool.c:739
+#: builtin/difftool.c:738
msgid "--dir-diff is incompatible with --no-index"
msgstr "--dirty-diff es incompatible con --no-index"
-#: builtin/difftool.c:742
+#: builtin/difftool.c:741
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr "--gui, --tool y --extcmd son mutuamente exclusivas"
-#: builtin/difftool.c:750
+#: builtin/difftool.c:749
msgid "no <tool> given for --tool=<tool>"
msgstr "no se ha proporcionado <herramienta> para --tool=<herramienta>"
-#: builtin/difftool.c:757
+#: builtin/difftool.c:756
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "no se ha entregado <comando> para --extcmd=<comando>"
@@ -13578,24 +14486,24 @@
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
msgstr "git env--helper --type=[bool|ulong] <opciones> <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 "tipo"
-#: builtin/env--helper.c:41
+#: builtin/env--helper.c:46
msgid "default for git_env_*(...) to fall back on"
msgstr "default para git_env_*(...) es hacer fallback en"
-#: builtin/env--helper.c:43
+#: builtin/env--helper.c:48
msgid "be quiet only use git_env_*() value as exit code"
msgstr "ser silencioso solo usar valor git_env_*() como código de salida"
-#: 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 "opción `--default' espera un valor boolean con `--type=bool`, no `%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 `"
@@ -13607,184 +14515,245 @@
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-opts]"
-#: builtin/fast-export.c:853
+#: 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:1152
+#: builtin/fast-export.c:1177
+msgid "--anonymize-map token cannot be empty"
+msgstr "token --anonymize-map no puede estar vacío"
+
+#: builtin/fast-export.c:1197
msgid "show progress after <n> objects"
msgstr "mostrar progreso después de <n> objetos"
-#: builtin/fast-export.c:1154
+#: builtin/fast-export.c:1199
msgid "select handling of signed tags"
msgstr "seleccionar el manejo de tags firmados"
-#: builtin/fast-export.c:1157
+#: builtin/fast-export.c:1202
msgid "select handling of tags that tag filtered objects"
msgstr "seleccionar el manejo de tags que son tags de objetos filtrados"
-#: builtin/fast-export.c:1160
+#: builtin/fast-export.c:1205
msgid "select handling of commit messages in an alternate encoding"
msgstr "seleccionar el manejo de mensajes de commit en un encoding diferente"
-#: builtin/fast-export.c:1163
-msgid "Dump marks to this file"
-msgstr "Volcar marcas a este archivo"
+#: builtin/fast-export.c:1208
+msgid "dump marks to this file"
+msgstr "volcar marcas a este archivo"
-#: builtin/fast-export.c:1165
-msgid "Import marks from this file"
-msgstr "Importar marcas de este archivo"
+#: builtin/fast-export.c:1210
+msgid "import marks from this file"
+msgstr "importar marcas de este archivo"
-#: builtin/fast-export.c:1169
-msgid "Import marks from this file if it exists"
-msgstr "Importar marcas de este archivo si existe"
+#: builtin/fast-export.c:1214
+msgid "import marks from this file if it exists"
+msgstr "importar marcas de este archivo si existe"
-#: builtin/fast-export.c:1171
-msgid "Fake a tagger when tags lack one"
-msgstr "Falsificar un tagger cuando les falta uno"
+#: builtin/fast-export.c:1216
+msgid "fake a tagger when tags lack one"
+msgstr "falsificar un tagger cuando les falta uno"
-#: builtin/fast-export.c:1173
-msgid "Output full tree for each commit"
-msgstr "Mostrar todo el árbol para cada commit"
+#: builtin/fast-export.c:1218
+msgid "output full tree for each commit"
+msgstr "mostrar todo el árbol para cada commit"
-#: builtin/fast-export.c:1175
-msgid "Use the done feature to terminate the stream"
-msgstr "Use el feature done para terminar el stream"
+#: builtin/fast-export.c:1220
+msgid "use the done feature to terminate the stream"
+msgstr "use el feature done para terminar el stream"
-#: builtin/fast-export.c:1176
-msgid "Skip output of blob data"
-msgstr "Saltar el output de data blob"
+#: builtin/fast-export.c:1221
+msgid "skip output of blob data"
+msgstr "saltar el output de data blob"
-#: builtin/fast-export.c:1177 builtin/log.c:1705
+#: builtin/fast-export.c:1222 builtin/log.c:1815
msgid "refspec"
msgstr "refspec"
-#: builtin/fast-export.c:1178
-msgid "Apply refspec to exported refs"
-msgstr "Aplicar refspec para los refs exportados"
+#: builtin/fast-export.c:1223
+msgid "apply refspec to exported refs"
+msgstr "aplicar refspec para los refs exportados"
-#: builtin/fast-export.c:1179
+#: builtin/fast-export.c:1224
msgid "anonymize output"
msgstr "anonimizar la salida"
-#: builtin/fast-export.c:1181
-msgid "Reference parents which are not in fast-export stream by object id"
+#: builtin/fast-export.c:1225
+msgid "from:to"
+msgstr "de:para"
+
+#: builtin/fast-export.c:1226
+msgid "convert <from> to <to> in anonymized output"
+msgstr "convertir <de> a <para> en output anonimizado"
+
+#: builtin/fast-export.c:1229
+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"
+"padres de la referencia que no estan en fast-export stream por id de objeto"
-#: builtin/fast-export.c:1183
-msgid "Show original object ids of blobs/commits"
-msgstr "Mostrar ids de objetos originales para blobs/commits"
+#: builtin/fast-export.c:1231
+msgid "show original object ids of blobs/commits"
+msgstr "mostrar ids de objetos originales para blobs/commits"
-#: builtin/fast-export.c:1185
-msgid "Label tags with mark ids"
-msgstr "Marcar tags con ids de mark"
+#: builtin/fast-export.c:1233
+msgid "label tags with mark ids"
+msgstr "marcar tags con ids de mark"
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1256
+msgid "--anonymize-map without --anonymize does not make sense"
+msgstr "--anonymize-map sin --anonymize no tiene sentido"
+
+#: builtin/fast-export.c:1271
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
msgstr "No se puede pasar ambos --import-marks y --import-marks-if-exists"
-#: builtin/fetch.c:34
+#: builtin/fast-import.c:3088
+#, c-format
+msgid "Missing from marks for submodule '%s'"
+msgstr "Faltan marcas from para el submódulo '%s'"
+
+#: builtin/fast-import.c:3090
+#, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr "Faltan marcas to para el submódulo '%s'"
+
+#: builtin/fast-import.c:3225
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr "Se esperaba comando 'mark', se obtuvo %s"
+
+#: builtin/fast-import.c:3230
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr "Se esperaba comando 'to', se obtuvo %s"
+
+#: builtin/fast-import.c:3322
+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"
+
+#: builtin/fast-import.c:3377
+#, c-format
+msgid "feature '%s' forbidden in input without --allow-unsafe-features"
+msgstr "característica '%s' prohibida en input sin --allow-unsafe-features"
+
+#: builtin/fetch-pack.c:242
+#, 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:35
+#: builtin/fetch.c:36
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<opciones>] <grupo>"
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<opciones>] [(<repositorio> | <grupo>)...]"
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<opciones>]"
-#: builtin/fetch.c:116
+#: builtin/fetch.c:120
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel no puede ser negativo"
-#: builtin/fetch.c:139 builtin/pull.c:184
+#: builtin/fetch.c:143 builtin/pull.c:185
msgid "fetch from all remotes"
msgstr "extraer de todos los remotos"
-#: builtin/fetch.c:141 builtin/pull.c:228
+#: builtin/fetch.c:145 builtin/pull.c:245
msgid "set upstream for git pull/fetch"
msgstr "configurar upstream para git pulll/fetch"
-#: builtin/fetch.c:143 builtin/pull.c:187
+#: builtin/fetch.c:147 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:145 builtin/pull.c:190
+#: builtin/fetch.c:149
+msgid "use atomic transaction to update references"
+msgstr "usar transacción atómica para actualizar referencias"
+
+#: builtin/fetch.c:151 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:146
+#: builtin/fetch.c:152
msgid "force overwrite of local reference"
msgstr "forzar sobrescritura de referencia local"
-#: builtin/fetch.c:148
+#: builtin/fetch.c:154
msgid "fetch from multiple remotes"
msgstr "extraer de múltiples remotos"
-#: builtin/fetch.c:150 builtin/pull.c:194
+#: builtin/fetch.c:156 builtin/pull.c:195
msgid "fetch all tags and associated objects"
msgstr "extraer todos los tags y objetos asociados"
-#: builtin/fetch.c:152
+#: builtin/fetch.c:158
msgid "do not fetch all tags (--no-tags)"
msgstr "no extraer todos los tags (--no-tags)"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:160
msgid "number of submodules fetched in parallel"
msgstr "número de submódulos extraídos en paralelo"
-#: builtin/fetch.c:156 builtin/pull.c:197
+#: builtin/fetch.c:162 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:158
+#: builtin/fetch.c:164
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
"limpiar tags locales que no se encuentran en el remoto y eliminar tags "
"cambiados"
-#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121
+#: builtin/fetch.c:165 builtin/fetch.c:190 builtin/pull.c:122
msgid "on-demand"
msgstr "en demanda"
-#: builtin/fetch.c:160
+#: builtin/fetch.c:166
msgid "control recursive fetching of submodules"
msgstr "controlar extracción recursiva de submódulos"
-#: builtin/fetch.c:164 builtin/pull.c:205
+#: builtin/fetch.c:171
+msgid "write fetched references to the FETCH_HEAD file"
+msgstr "escribir referencias obtenidas en el archivo FETCH_HEAD"
+
+#: builtin/fetch.c:172 builtin/pull.c:206
msgid "keep downloaded pack"
msgstr "mantener el paquete descargado"
-#: builtin/fetch.c:166
+#: builtin/fetch.c:174
msgid "allow updating of HEAD ref"
msgstr "permitir actualizar la ref HEAD"
-#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208
+#: builtin/fetch.c:177 builtin/fetch.c:183 builtin/pull.c:209
+#: builtin/pull.c:218
msgid "deepen history of shallow clone"
msgstr "historia profunda de un clon superficial"
-#: builtin/fetch.c:171
+#: builtin/fetch.c:179 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:177 builtin/pull.c:211
+#: builtin/fetch.c:185 builtin/pull.c:221
msgid "convert to a complete repository"
msgstr "convertir a un repositorio completo"
-#: builtin/fetch.c:180
+#: builtin/fetch.c:188
msgid "prepend this to submodule path output"
msgstr "anteponer esto a salida de la ruta del submódulo"
-#: builtin/fetch.c:183
+#: builtin/fetch.c:191
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
@@ -13792,94 +14761,98 @@
"default para extracción recursiva de submódulos (menor prioridad que "
"archivos de configuración)"
-#: builtin/fetch.c:187 builtin/pull.c:214
+#: builtin/fetch.c:195 builtin/pull.c:224
msgid "accept refs that update .git/shallow"
msgstr "aceptar refs que actualicen .git/shallow"
-#: builtin/fetch.c:188 builtin/pull.c:216
+#: builtin/fetch.c:196 builtin/pull.c:226
msgid "refmap"
msgstr "refmap"
-#: builtin/fetch.c:189 builtin/pull.c:217
+#: builtin/fetch.c:197 builtin/pull.c:227
msgid "specify fetch refmap"
msgstr "especificar extracción de refmap"
-#: builtin/fetch.c:196
+#: builtin/fetch.c:204 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:199
-msgid "run 'gc --auto' after fetching"
-msgstr "ejecutar 'gc --auto' tras el fetch"
+#: builtin/fetch.c:207 builtin/fetch.c:209
+msgid "run 'maintenance --auto' after fetching"
+msgstr "ejecute 'maintenance --auto' después de buscar"
-#: builtin/fetch.c:201 builtin/pull.c:226
+#: builtin/fetch.c:211 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:203
+#: builtin/fetch.c:213
msgid "write the commit-graph after fetching"
msgstr "escribir commit-graph luego del fetch"
-#: builtin/fetch.c:513
+#: builtin/fetch.c:215
+msgid "accept refspecs from stdin"
+msgstr "aceptar refspecs de stdin"
+
+#: builtin/fetch.c:526
msgid "Couldn't find remote ref HEAD"
msgstr "No se puedo encontrar ref remota HEAD"
-#: builtin/fetch.c:653
+#: builtin/fetch.c:697
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "la configuración fetch.output contiene el valor inválido %s"
-#: builtin/fetch.c:751
+#: builtin/fetch.c:796
#, c-format
msgid "object %s not found"
msgstr "objeto %s no encontrado"
-#: builtin/fetch.c:755
+#: builtin/fetch.c:800
msgid "[up to date]"
msgstr "[actualizado]"
-#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
+#: builtin/fetch.c:813 builtin/fetch.c:829 builtin/fetch.c:901
msgid "[rejected]"
msgstr "[rechazado]"
-#: builtin/fetch.c:769
+#: builtin/fetch.c:814
msgid "can't fetch in current branch"
msgstr "no se puede traer en la rama actual"
-#: builtin/fetch.c:779
+#: builtin/fetch.c:824
msgid "[tag update]"
msgstr "[actualización de tag]"
-#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839
-#: builtin/fetch.c:851
+#: builtin/fetch.c:825 builtin/fetch.c:862 builtin/fetch.c:884
+#: builtin/fetch.c:896
msgid "unable to update local ref"
msgstr "no se posible actualizar el ref local"
-#: builtin/fetch.c:784
+#: builtin/fetch.c:829
msgid "would clobber existing tag"
msgstr "podría golpear tag existente"
-#: builtin/fetch.c:806
+#: builtin/fetch.c:851
msgid "[new tag]"
msgstr "[nuevo tag]"
-#: builtin/fetch.c:809
+#: builtin/fetch.c:854
msgid "[new branch]"
msgstr "[nueva rama]"
-#: builtin/fetch.c:812
+#: builtin/fetch.c:857
msgid "[new ref]"
msgstr "[nueva referencia]"
-#: builtin/fetch.c:851
+#: builtin/fetch.c:896
msgid "forced update"
msgstr "actualización forzada"
-#: builtin/fetch.c:856
+#: builtin/fetch.c:901
msgid "non-fast-forward"
msgstr "avance lento"
-#: builtin/fetch.c:877
+#: builtin/fetch.c:1005
msgid ""
"Fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
@@ -13890,7 +14863,7 @@
"show-forced-updates'\n"
"o ejecute 'git config fetch.showForcedUpdates true'."
-#: builtin/fetch.c:881
+#: builtin/fetch.c:1009
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
@@ -13903,22 +14876,22 @@
"false'\n"
"para evitar esta validación.\n"
-#: builtin/fetch.c:920
+#: builtin/fetch.c:1041
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s no envió todos los objetos necesarios\n"
-#: builtin/fetch.c:941
+#: builtin/fetch.c:1069
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "rechazado %s porque raíces superficiales no pueden ser actualizadas"
-#: builtin/fetch.c:1026 builtin/fetch.c:1164
+#: builtin/fetch.c:1146 builtin/fetch.c:1297
#, c-format
msgid "From %.*s\n"
msgstr "Desde %.*s\n"
-#: builtin/fetch.c:1037
+#: builtin/fetch.c:1168
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -13927,56 +14900,56 @@
"algunos refs locales no pudieron ser actualizados; intente ejecutar\n"
" 'git remote prune %s' para eliminar cualquier rama vieja o conflictiva"
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1267
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s se pondrá colgado)"
-#: builtin/fetch.c:1135
+#: builtin/fetch.c:1268
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s se ha colgado)"
-#: builtin/fetch.c:1167
+#: builtin/fetch.c:1300
msgid "[deleted]"
msgstr "[eliminado]"
-#: builtin/fetch.c:1168 builtin/remote.c:1112
+#: builtin/fetch.c:1301 builtin/remote.c:1118
msgid "(none)"
msgstr "(nada)"
-#: builtin/fetch.c:1191
+#: builtin/fetch.c:1324
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Rehusando extraer en la rama actual %s de un repositorio no vacío"
-#: builtin/fetch.c:1210
+#: builtin/fetch.c:1343
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Opción \"%s\" valor \"%s\" no es válido para %s"
-#: builtin/fetch.c:1213
+#: builtin/fetch.c:1346
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Opción \"%s\" es ignorada por %s\n"
-#: builtin/fetch.c:1421
+#: builtin/fetch.c:1558
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "múltiples ramas detectadas, incompatible con --set-upstream"
-#: builtin/fetch.c:1436
+#: builtin/fetch.c:1573
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "no configurar upstream para una rama de rastreo remoto"
-#: builtin/fetch.c:1438
+#: builtin/fetch.c:1575
msgid "not setting upstream for a remote tag"
msgstr "no configurar upstream para un tag remoto"
-#: builtin/fetch.c:1440
+#: builtin/fetch.c:1577
msgid "unknown branch type"
msgstr "tipo de branch desconocido"
-#: builtin/fetch.c:1442
+#: builtin/fetch.c:1579
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
@@ -13984,22 +14957,22 @@
"no se encontró rama fuente.\n"
"tienes que especificar exactamente una rama con la opción --set-upstream."
-#: builtin/fetch.c:1568 builtin/fetch.c:1631
+#: builtin/fetch.c:1708 builtin/fetch.c:1771
#, c-format
msgid "Fetching %s\n"
msgstr "Extrayendo %s\n"
-#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101
+#: builtin/fetch.c:1718 builtin/fetch.c:1773 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr "No se pudo extraer %s"
-#: builtin/fetch.c:1590
+#: builtin/fetch.c:1730
#, 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:1693
+#: builtin/fetch.c:1834
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -14007,44 +14980,44 @@
"No hay repositorio remoto especificado. Por favor, especifique un URL o un\n"
"nombre remoto del cual las nuevas revisiones deben ser extraídas."
-#: builtin/fetch.c:1730
+#: builtin/fetch.c:1870
msgid "You need to specify a tag name."
msgstr "Tienes que especificar un nombre de tag."
-#: builtin/fetch.c:1780
+#: builtin/fetch.c:1935
msgid "Negative depth in --deepen is not supported"
msgstr "Profundidad negativa en --deepen no soportada"
-#: builtin/fetch.c:1782
+#: builtin/fetch.c:1937
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen y --depth son mutuamente exclusivas"
-#: builtin/fetch.c:1787
+#: builtin/fetch.c:1942
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth y --unshallow no pueden ser usadas juntas"
-#: builtin/fetch.c:1789
+#: builtin/fetch.c:1944
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow no tiene sentido en un repositorio completo"
-#: builtin/fetch.c:1805
+#: builtin/fetch.c:1961
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all no toma un argumento de repositorio"
-#: builtin/fetch.c:1807
+#: builtin/fetch.c:1963
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all no tiene sentido con refspecs"
-#: builtin/fetch.c:1816
+#: builtin/fetch.c:1972
#, c-format
msgid "No such remote or remote group: %s"
msgstr "No existe el remoto o grupo remoto: %s"
-#: builtin/fetch.c:1823
+#: builtin/fetch.c:1979
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Extraer un grupo y especificar un refspecs no tiene sentido"
-#: builtin/fetch.c:1841
+#: builtin/fetch.c:1997
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
@@ -14052,29 +15025,37 @@
"--filter solo puede ser usado con el remoto configurado en extensions."
"partialClone"
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fetch.c:2001
+msgid "--atomic can only be used when fetching from one remote"
+msgstr "--atomic solo se puede usar cuando se busca desde un control remoto"
+
+#: builtin/fetch.c:2005
+msgid "--stdin can only be used when fetching from one remote"
+msgstr "--stdin solo se puede usar cuando se busca desde un control 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 <mensaje>] [--log[=<n>] | --no-log] [--file <archivo>]"
-#: builtin/fmt-merge-msg.c:671
+#: 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:674
+#: builtin/fmt-merge-msg.c:21
msgid "alias for --log (deprecated)"
msgstr "alias para --log (deprecado)"
-#: builtin/fmt-merge-msg.c:677
+#: builtin/fmt-merge-msg.c:24
msgid "text"
msgstr "texto"
-#: builtin/fmt-merge-msg.c:678
+#: 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:679
+#: builtin/fmt-merge-msg.c:26
msgid "file to read from"
msgstr "archivo del cual leer"
@@ -14087,8 +15068,8 @@
msgstr "git for-each-ref [--points-at <objeto>]"
#: 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>]]"
@@ -14114,7 +15095,7 @@
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:472
msgid "respect format colors"
msgstr "respetar el formato de colores"
@@ -14138,32 +15119,48 @@
msgid "print only refs which don't contain the commit"
msgstr "mostrar solo refs que no contienen el commit"
-#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148
+#: builtin/for-each-repo.c:9
+msgid "git for-each-repo --config=<config> <command-args>"
+msgstr "git for-each-repo --config=<config> <argumetnos-de-comando>"
+
+#: builtin/for-each-repo.c:37
+msgid "config"
+msgstr "config"
+
+#: builtin/for-each-repo.c:38
+msgid "config key storing a list of repository paths"
+msgstr "clave de configuración que almacena una lista de rutas de repositorio"
+
+#: builtin/for-each-repo.c:46
+msgid "missing --config=<config>"
+msgstr "falta --config=<config>"
+
+#: builtin/fsck.c:69 builtin/fsck.c:130 builtin/fsck.c:131
msgid "unknown"
msgstr "desconocido"
#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:100 builtin/fsck.c:120
+#: builtin/fsck.c:83 builtin/fsck.c:103
#, c-format
msgid "error in %s %s: %s"
msgstr "error en %s %s: %s"
#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:114
+#: builtin/fsck.c:97
#, c-format
msgid "warning in %s %s: %s"
msgstr "peligro en %s %s: %s"
-#: builtin/fsck.c:143 builtin/fsck.c:146
+#: builtin/fsck.c:126 builtin/fsck.c:129
#, c-format
msgid "broken link from %7s %s"
msgstr "link roto de %7s %s"
-#: builtin/fsck.c:155
+#: builtin/fsck.c:138
msgid "wrong object type in link"
msgstr "tipo de objeto equivocado en link"
-#: builtin/fsck.c:171
+#: builtin/fsck.c:154
#, c-format
msgid ""
"broken link from %7s %s\n"
@@ -14172,240 +15169,240 @@
"link roto de %7s %s\n"
" a %7s %s"
-#: builtin/fsck.c:282
+#: builtin/fsck.c:265
#, c-format
msgid "missing %s %s"
msgstr "faltan %s %s"
-#: builtin/fsck.c:309
+#: builtin/fsck.c:292
#, c-format
msgid "unreachable %s %s"
msgstr "inalcanzable %s %s"
-#: builtin/fsck.c:329
+#: builtin/fsck.c:312
#, c-format
msgid "dangling %s %s"
msgstr "actualizando %s %s"
-#: builtin/fsck.c:339
+#: builtin/fsck.c:322
msgid "could not create lost-found"
msgstr "no se pudo crear lost-found"
-#: builtin/fsck.c:350
+#: builtin/fsck.c:333
#, c-format
msgid "could not finish '%s'"
msgstr "no se pudo finalizar '%s'"
-#: builtin/fsck.c:367
+#: builtin/fsck.c:350
#, c-format
msgid "Checking %s"
msgstr "Revisando %s"
-#: builtin/fsck.c:405
+#: builtin/fsck.c:388
#, c-format
msgid "Checking connectivity (%d objects)"
msgstr "Verificando conectividad (%d objetos)"
-#: builtin/fsck.c:424
+#: builtin/fsck.c:407
#, c-format
msgid "Checking %s %s"
msgstr "Revisando %s %s"
-#: builtin/fsck.c:429
+#: builtin/fsck.c:412
msgid "broken links"
msgstr "links rotos"
-#: builtin/fsck.c:438
+#: builtin/fsck.c:421
#, c-format
msgid "root %s"
msgstr "raíz %s"
-#: builtin/fsck.c:446
+#: builtin/fsck.c:429
#, c-format
msgid "tagged %s %s (%s) in %s"
msgstr "tag %s %s (%s) en %s"
-#: builtin/fsck.c:475
+#: builtin/fsck.c:458
#, c-format
msgid "%s: object corrupt or missing"
msgstr "%s: objecto corrupto o faltante"
-#: builtin/fsck.c:500
+#: builtin/fsck.c:483
#, c-format
msgid "%s: invalid reflog entry %s"
msgstr "%s: referencia inválida %s"
-#: builtin/fsck.c:514
+#: builtin/fsck.c:497
#, c-format
msgid "Checking reflog %s->%s"
msgstr "Revisando reflog %s->%s"
-#: builtin/fsck.c:548
+#: builtin/fsck.c:531
#, c-format
msgid "%s: invalid sha1 pointer %s"
msgstr "%s: puntero sha1 inválido %s"
-#: builtin/fsck.c:555
+#: builtin/fsck.c:538
#, c-format
msgid "%s: not a commit"
msgstr "%s: no es un commit"
-#: builtin/fsck.c:609
+#: builtin/fsck.c:592
msgid "notice: No default references"
msgstr "aviso: No hay referencias por defecto"
-#: builtin/fsck.c:624
+#: builtin/fsck.c:607
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s: objeto corrupto o no encontrado: %s"
-#: builtin/fsck.c:637
+#: builtin/fsck.c:620
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s: no se puede analizar objeto: %s"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:640
#, c-format
msgid "bad sha1 file: %s"
msgstr "mal sha1 de archivo: %s"
-#: builtin/fsck.c:672
+#: builtin/fsck.c:655
msgid "Checking object directory"
msgstr "Revisando directorio de objetos"
-#: builtin/fsck.c:675
+#: builtin/fsck.c:658
msgid "Checking object directories"
msgstr "Revisando objetos directorios"
-#: builtin/fsck.c:690
+#: builtin/fsck.c:673
#, c-format
msgid "Checking %s link"
msgstr "Revisando link %s"
-#: builtin/fsck.c:695 builtin/index-pack.c:843
+#: builtin/fsck.c:678 builtin/index-pack.c:865
#, c-format
msgid "invalid %s"
msgstr "%s inválido"
-#: builtin/fsck.c:702
+#: builtin/fsck.c:685
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s apunta a algo extraño (%s)"
-#: builtin/fsck.c:708
+#: builtin/fsck.c:691
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s: HEAD desacoplado apunta a nada"
-#: builtin/fsck.c:712
+#: builtin/fsck.c:695
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "aviso: %s apunta a un branch no nacido (%s)"
-#: builtin/fsck.c:724
+#: builtin/fsck.c:707
msgid "Checking cache tree"
msgstr "Revisando el cache tree"
-#: builtin/fsck.c:729
+#: builtin/fsck.c:712
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "%s: puntero inválido sha1 en cache-tree"
-#: builtin/fsck.c:738
+#: builtin/fsck.c:721
msgid "non-tree in cache-tree"
msgstr "non-tree en cache-tree"
-#: builtin/fsck.c:769
+#: builtin/fsck.c:752
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<opciones>] [<objeto>...]"
-#: builtin/fsck.c:775
+#: builtin/fsck.c:758
msgid "show unreachable objects"
msgstr "mostrar objetos ilegibles"
-#: builtin/fsck.c:776
+#: builtin/fsck.c:759
msgid "show dangling objects"
msgstr "mostrar objetos colgados"
-#: builtin/fsck.c:777
+#: builtin/fsck.c:760
msgid "report tags"
msgstr "reportar tags"
-#: builtin/fsck.c:778
+#: builtin/fsck.c:761
msgid "report root nodes"
msgstr "reportar nodos raíz"
-#: builtin/fsck.c:779
+#: builtin/fsck.c:762
msgid "make index objects head nodes"
msgstr "hacer objetos índices cabezas de nodos"
-#: builtin/fsck.c:780
+#: builtin/fsck.c:763
msgid "make reflogs head nodes (default)"
msgstr "hacer reflogs cabeza de nodos (default)"
-#: builtin/fsck.c:781
+#: builtin/fsck.c:764
msgid "also consider packs and alternate objects"
msgstr "también considerar paquetes y objetos alternos"
-#: builtin/fsck.c:782
+#: builtin/fsck.c:765
msgid "check only connectivity"
msgstr "revisar solo conectividad"
-#: builtin/fsck.c:783
+#: builtin/fsck.c:766 builtin/mktag.c:78
msgid "enable more strict checking"
msgstr "habilitar revisión más estricta"
-#: builtin/fsck.c:785
+#: builtin/fsck.c:768
msgid "write dangling objects in .git/lost-found"
msgstr "escribir objetos colgados en .git/lost-found"
-#: builtin/fsck.c:786 builtin/prune.c:132
+#: builtin/fsck.c:769 builtin/prune.c:134
msgid "show progress"
msgstr "mostrar progreso"
-#: builtin/fsck.c:787
+#: builtin/fsck.c:770
msgid "show verbose names for reachable objects"
msgstr "mostrar nombres verboso para objetos alcanzables"
-#: builtin/fsck.c:846 builtin/index-pack.c:225
+#: builtin/fsck.c:829 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "Revisando objetos"
-#: builtin/fsck.c:874
+#: builtin/fsck.c:857
#, c-format
msgid "%s: object missing"
msgstr "%s: objeto faltante"
-#: builtin/fsck.c:885
+#: builtin/fsck.c:868
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "parámetro inválido: sha1 esperado, se obtuvo '%s'"
-#: builtin/gc.c:35
+#: builtin/gc.c:39
msgid "git gc [<options>]"
msgstr "git gc [<opciones>]"
-#: builtin/gc.c:90
+#: builtin/gc.c:93
#, c-format
msgid "Failed to fstat %s: %s"
msgstr "Falló el fstat %s: %s"
-#: builtin/gc.c:126
+#: builtin/gc.c:129
#, c-format
msgid "failed to parse '%s' value '%s'"
msgstr "falló al analizar '%s' valor '%s'"
-#: builtin/gc.c:475 builtin/init-db.c:55
+#: builtin/gc.c:487 builtin/init-db.c:58
#, c-format
msgid "cannot stat '%s'"
msgstr "no se pudo definir '%s'"
-#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
+#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:562
#, c-format
msgid "cannot read '%s'"
msgstr "no se puede leer '%s'"
-#: builtin/gc.c:491
+#: builtin/gc.c:503
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -14420,54 +15417,54 @@
"\n"
"%s"
-#: builtin/gc.c:539
+#: builtin/gc.c:551
msgid "prune unreferenced objects"
msgstr "limpiar objetos no referenciados"
-#: builtin/gc.c:541
+#: builtin/gc.c:553
msgid "be more thorough (increased runtime)"
msgstr "ser más exhaustivo (aumentar runtime)"
-#: builtin/gc.c:542
+#: builtin/gc.c:554
msgid "enable auto-gc mode"
msgstr "habilitar modo auto-gc"
-#: builtin/gc.c:545
+#: builtin/gc.c:557
msgid "force running gc even if there may be another gc running"
msgstr "forzar la ejecución de gc incluso si puede haber otro gc ejecutándose"
-#: builtin/gc.c:548
+#: builtin/gc.c:560
msgid "repack all other packs except the largest pack"
msgstr "reempaquetar todos los otros paquetes excepto el paquete más grande"
-#: builtin/gc.c:565
+#: builtin/gc.c:576
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "falló al analizar valor %s de gc.logexpirity"
-#: builtin/gc.c:576
+#: builtin/gc.c:587
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr "falló al analizar valor %s de prune expiry"
-#: builtin/gc.c:596
+#: builtin/gc.c:607
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"Auto empaquetado del repositorio en segundo plano para un performance "
"óptimo.\n"
-#: builtin/gc.c:598
+#: builtin/gc.c:609
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Auto empaquetado del repositorio para performance óptimo.\n"
-#: builtin/gc.c:599
+#: builtin/gc.c:610
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Vea \"git help gc\" para limpieza manual.\n"
-#: builtin/gc.c:639
+#: builtin/gc.c:650
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -14475,23 +15472,187 @@
"gc ya está ejecutándose en la máquina '%s' pid %<PRIuMAX> (use --force so no "
"es así)"
-#: builtin/gc.c:694
+#: builtin/gc.c:705
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/gc.c:715
+msgid ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
+msgstr ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
+
+#: builtin/gc.c:745
+msgid "--no-schedule is not allowed"
+msgstr "--no-schedule no está permitido"
+
+#: builtin/gc.c:750
+#, c-format
+msgid "unrecognized --schedule argument '%s'"
+msgstr "argumento --schedule no reconocido, '%s'"
+
+#: builtin/gc.c:869
+msgid "failed to write commit-graph"
+msgstr "no se pudo escribir el commit-graph"
+
+#: builtin/gc.c:914
+msgid "failed to fill remotes"
+msgstr "falló al borrar remotos"
+
+#: builtin/gc.c:1037
+msgid "failed to start 'git pack-objects' process"
+msgstr "no pudo iniciar el proceso 'git pack-objects'"
+
+#: builtin/gc.c:1054
+msgid "failed to finish 'git pack-objects' process"
+msgstr "no pudo finalizar el proceso 'git pack-objects'"
+
+#: builtin/gc.c:1106
+msgid "failed to write multi-pack-index"
+msgstr "no se pudo escribir el índice de paquetes múltiples"
+
+#: builtin/gc.c:1124
+msgid "'git multi-pack-index expire' failed"
+msgstr "'git multi-pack-index expire' falló"
+
+#: builtin/gc.c:1185
+msgid "'git multi-pack-index repack' failed"
+msgstr "'git multi-pack-index repack' falló"
+
+#: builtin/gc.c:1194
+msgid ""
+"skipping incremental-repack task because core.multiPackIndex is disabled"
+msgstr ""
+"omitiendo la tarea de reempaquetado incremental porque core.multiPackIndex "
+"está deshabilitado"
+
+#: builtin/gc.c:1298
+#, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr "el archivo de bloqueo '%s' existe, omitiendo el mantenimiento"
+
+#: builtin/gc.c:1328
+#, c-format
+msgid "task '%s' failed"
+msgstr "tarea '%s' falló"
+
+#: builtin/gc.c:1410
+#, c-format
+msgid "'%s' is not a valid task"
+msgstr "'%s' no es una tarea válida"
+
+#: builtin/gc.c:1415
+#, c-format
+msgid "task '%s' cannot be selected multiple times"
+msgstr "tarea '%s' no puede ser seleccionada múltipes veces"
+
+#: builtin/gc.c:1430
+msgid "run tasks based on the state of the repository"
+msgstr "ejecutar tareas basadas en el estado del repositorio"
+
+#: builtin/gc.c:1431
+msgid "frequency"
+msgstr "frecuencia"
+
+#: builtin/gc.c:1432
+msgid "run tasks based on frequency"
+msgstr "ejecutar tareas basado en frecuencia"
+
+#: builtin/gc.c:1435
+msgid "do not report progress or other information over stderr"
+msgstr "no reportar progreso u otra información por medio de stderr"
+
+#: builtin/gc.c:1436
+msgid "task"
+msgstr "tarea"
+
+#: builtin/gc.c:1437
+msgid "run a specific task"
+msgstr "ruta a tarea específica"
+
+#: builtin/gc.c:1454
+msgid "use at most one of --auto and --schedule=<frequency>"
+msgstr "usar como máximo una entre --auto y --schedule=<frecuencia>"
+
+#: builtin/gc.c:1497
+msgid "failed to run 'git config'"
+msgstr "no pudo ejecutar 'git config'"
+
+#: builtin/gc.c:1562
+#, c-format
+msgid "failed to expand path '%s'"
+msgstr "falló al expandir la ruta '%s'"
+
+#: builtin/gc.c:1591
+msgid "failed to start launchctl"
+msgstr "Falló al iniciar launchctl."
+
+#: builtin/gc.c:1628
+#, c-format
+msgid "failed to create directories for '%s'"
+msgstr "falló al crear directorios para '%s'"
+
+#: builtin/gc.c:1689
+#, c-format
+msgid "failed to bootstrap service %s"
+msgstr "falló al generar el servicio %s"
+
+#: builtin/gc.c:1760
+msgid "failed to create temp xml file"
+msgstr "no se pudo crear el archivo temp xml"
+
+#: builtin/gc.c:1850
+msgid "failed to start schtasks"
+msgstr "no pudo iniciar schtasks"
+
+#: builtin/gc.c:1894
+msgid "failed to run 'crontab -l'; your system might not support 'cron'"
+msgstr ""
+"no pudo ejecutar 'crontab -l'; es posible que su sistema no soporte 'cron'"
+
+#: builtin/gc.c:1911
+msgid "failed to run 'crontab'; your system might not support 'cron'"
+msgstr ""
+"no pudo ejecutar 'crontab'; es posible que su sistema no soporte 'cron'"
+
+#: builtin/gc.c:1915
+msgid "failed to open stdin of 'crontab'"
+msgstr "no pudo abrir stdin de 'crontab'"
+
+#: builtin/gc.c:1956
+msgid "'crontab' died"
+msgstr "'crontab' murió"
+
+#: builtin/gc.c:1990
+msgid "another process is scheduling background maintenance"
+msgstr "otro proceso está programando el mantenimiento en segundo plano"
+
+#: builtin/gc.c:2009
+msgid "failed to add repo to global config"
+msgstr "no se pudo agregar el repositorio a la configuración global"
+
+#: builtin/gc.c:2019
+msgid "git maintenance <subcommand> [<options>]"
+msgstr "git maintenance <subcomando> [<opciones>]"
+
+#: builtin/gc.c:2038
+#, c-format
+msgid "invalid subcommand: %s"
+msgstr "subcomando no válido: %s"
+
#: builtin/grep.c:30
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<opciones>] [-e] <patrón> [<rev>...] [[--] <ruta>...]"
-#: builtin/grep.c:225
+#: builtin/grep.c:223
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: falló al crear el hilo: %s"
-#: builtin/grep.c:279
+#: builtin/grep.c:277
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "número inválido de hilos especificado (%d) para %s"
@@ -14500,262 +15661,262 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731
-#: builtin/pack-objects.c:2854
+#: builtin/grep.c:285 builtin/index-pack.c:1589 builtin/index-pack.c:1808
+#: builtin/pack-objects.c:2944
#, c-format
msgid "no threads support, ignoring %s"
msgstr "no hay soporte para hilos, ignorando %s"
-#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618
+#: builtin/grep.c:473 builtin/grep.c:601 builtin/grep.c:641
#, c-format
msgid "unable to read tree (%s)"
msgstr "no es posible leer el árbol (%s)"
-#: builtin/grep.c:633
+#: builtin/grep.c:656
#, c-format
msgid "unable to grep from object of type %s"
msgstr "no es posible realizar grep del objeto de tipo %s"
-#: builtin/grep.c:704
+#: builtin/grep.c:737
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "switch `%c' espera un valor numérico"
-#: builtin/grep.c:803
+#: builtin/grep.c:836
msgid "search in index instead of in the work tree"
msgstr "buscar en el índice en lugar del árbol de trabajo"
-#: builtin/grep.c:805
+#: builtin/grep.c:838
msgid "find in contents not managed by git"
msgstr "encontrar en contenidos no manejados por git"
-#: builtin/grep.c:807
+#: builtin/grep.c:840
msgid "search in both tracked and untracked files"
msgstr "buscar en archivos rastreados y no rastreados"
-#: builtin/grep.c:809
+#: builtin/grep.c:842
msgid "ignore files specified via '.gitignore'"
msgstr "ignorar archivos especificados via '.gitignore'"
-#: builtin/grep.c:811
+#: builtin/grep.c:844
msgid "recursively search in each submodule"
msgstr "búsqueda recursiva en cada submódulo"
-#: builtin/grep.c:814
+#: builtin/grep.c:847
msgid "show non-matching lines"
msgstr "mostrar líneas que no concuerdan"
-#: builtin/grep.c:816
+#: builtin/grep.c:849
msgid "case insensitive matching"
msgstr "búsqueda insensible a mayúsculas"
-#: builtin/grep.c:818
+#: builtin/grep.c:851
msgid "match patterns only at word boundaries"
msgstr "concordar patrón solo a los límites de las palabras"
-#: builtin/grep.c:820
+#: builtin/grep.c:853
msgid "process binary files as text"
msgstr "procesar archivos binarios como texto"
-#: builtin/grep.c:822
+#: builtin/grep.c:855
msgid "don't match patterns in binary files"
msgstr "no concordar patrones en archivos binarios"
-#: builtin/grep.c:825
+#: builtin/grep.c:858
msgid "process binary files with textconv filters"
msgstr "procesar archivos binarios con filtros textconv"
-#: builtin/grep.c:827
+#: builtin/grep.c:860
msgid "search in subdirectories (default)"
msgstr "buscar en subdirectorios (default)"
-#: builtin/grep.c:829
+#: builtin/grep.c:862
msgid "descend at most <depth> levels"
msgstr "descender como máximo <valor-de-profundiad> niveles"
-#: builtin/grep.c:833
+#: builtin/grep.c:866
msgid "use extended POSIX regular expressions"
msgstr "usar expresiones regulares POSIX extendidas"
-#: builtin/grep.c:836
+#: builtin/grep.c:869
msgid "use basic POSIX regular expressions (default)"
msgstr "usar expresiones regulares POSIX (default)"
-#: builtin/grep.c:839
+#: builtin/grep.c:872
msgid "interpret patterns as fixed strings"
msgstr "interpretar patrones como strings arreglados"
-#: builtin/grep.c:842
+#: builtin/grep.c:875
msgid "use Perl-compatible regular expressions"
msgstr "usar expresiones regulares compatibles con Perl"
-#: builtin/grep.c:845
+#: builtin/grep.c:878
msgid "show line numbers"
msgstr "mostrar números de línea"
-#: builtin/grep.c:846
+#: builtin/grep.c:879
msgid "show column number of first match"
msgstr "mostrar el número de columna de la primer coincidencia"
-#: builtin/grep.c:847
+#: builtin/grep.c:880
msgid "don't show filenames"
msgstr "no mostrar nombres de archivo"
-#: builtin/grep.c:848
+#: builtin/grep.c:881
msgid "show filenames"
msgstr "mostrar nombres de archivo"
-#: builtin/grep.c:850
+#: builtin/grep.c:883
msgid "show filenames relative to top directory"
msgstr "mostrar nombres de archivo relativos al directorio superior"
-#: builtin/grep.c:852
+#: builtin/grep.c:885
msgid "show only filenames instead of matching lines"
msgstr "mostrar solo nombres de archivos en lugar de líneas encontradas"
-#: builtin/grep.c:854
+#: builtin/grep.c:887
msgid "synonym for --files-with-matches"
msgstr "sinónimo para --files-with-matches"
-#: builtin/grep.c:857
+#: builtin/grep.c:890
msgid "show only the names of files without match"
msgstr "mostrar solo los nombres de archivos sin coincidencias"
-#: builtin/grep.c:859
+#: builtin/grep.c:892
msgid "print NUL after filenames"
msgstr "imprimir NUL después del nombre de archivo"
-#: builtin/grep.c:862
+#: builtin/grep.c:895
msgid "show only matching parts of a line"
msgstr "mostrar solo partes que concuerdan de una línea"
-#: builtin/grep.c:864
+#: builtin/grep.c:897
msgid "show the number of matches instead of matching lines"
msgstr "mostrar el número de concordancias en lugar de las líneas concordantes"
-#: builtin/grep.c:865
+#: builtin/grep.c:898
msgid "highlight matches"
msgstr "resaltar concordancias"
-#: builtin/grep.c:867
+#: builtin/grep.c:900
msgid "print empty line between matches from different files"
msgstr "imprimir una línea vacía entre coincidencias de diferentes archivos"
-#: builtin/grep.c:869
+#: builtin/grep.c:902
msgid "show filename only once above matches from same file"
msgstr ""
"mostrar el nombre de archivo solo una vez para concordancias en el mismo "
"archivo"
-#: builtin/grep.c:872
+#: builtin/grep.c:905
msgid "show <n> context lines before and after matches"
msgstr "mostrar <n> líneas de contexto antes y después de la concordancia"
-#: builtin/grep.c:875
+#: builtin/grep.c:908
msgid "show <n> context lines before matches"
msgstr "mostrar <n> líneas de contexto antes de las concordancias"
-#: builtin/grep.c:877
+#: builtin/grep.c:910
msgid "show <n> context lines after matches"
msgstr "mostrar <n> líneas de context después de las concordancias"
-#: builtin/grep.c:879
+#: builtin/grep.c:912
msgid "use <n> worker threads"
msgstr "usar <n> hilos de trabajo"
-#: builtin/grep.c:880
+#: builtin/grep.c:913
msgid "shortcut for -C NUM"
msgstr "atajo para -C NUM"
-#: builtin/grep.c:883
+#: builtin/grep.c:916
msgid "show a line with the function name before matches"
msgstr ""
"mostrar una línea con el nombre de la función antes de las concordancias"
-#: builtin/grep.c:885
+#: builtin/grep.c:918
msgid "show the surrounding function"
msgstr "mostrar la función circundante"
-#: builtin/grep.c:888
+#: builtin/grep.c:921
msgid "read patterns from file"
msgstr "leer patrones del archivo"
-#: builtin/grep.c:890
+#: builtin/grep.c:923
msgid "match <pattern>"
msgstr "concordar <patrón>"
-#: builtin/grep.c:892
+#: builtin/grep.c:925
msgid "combine patterns specified with -e"
msgstr "combinar patrones especificados con -e"
-#: builtin/grep.c:904
+#: builtin/grep.c:937
msgid "indicate hit with exit status without output"
msgstr "indicar concordancia con exit status sin output"
-#: builtin/grep.c:906
+#: builtin/grep.c:939
msgid "show only matches from files that match all patterns"
msgstr ""
"mostrar solo concordancias con archivos que concuerdan todos los patrones"
-#: builtin/grep.c:908
-msgid "show parse tree for grep expression"
-msgstr "mostrar árbol analizado para la expresión grep"
-
-#: builtin/grep.c:912
+#: builtin/grep.c:942
msgid "pager"
msgstr "paginador"
-#: builtin/grep.c:912
+#: builtin/grep.c:942
msgid "show matching files in the pager"
msgstr "mostrar archivos concordantes en el paginador"
-#: builtin/grep.c:916
+#: builtin/grep.c:946
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permitir el llamado de grep(1) (ignorado por esta build)"
-#: builtin/grep.c:983
+#: builtin/grep.c:1012
msgid "no pattern given"
msgstr "no se ha entregado patrón"
-#: builtin/grep.c:1019
+#: builtin/grep.c:1048
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index o --untracked no se puede usar con revs"
-#: builtin/grep.c:1027
+#: builtin/grep.c:1056
#, c-format
msgid "unable to resolve revision: %s"
msgstr "no se posible resolver revisión: %s"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1086
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked no es soportada con --recurse-submodules"
-#: builtin/grep.c:1061
+#: builtin/grep.c:1090
msgid "invalid option combination, ignoring --threads"
msgstr "combinación de opciones inválida, ignorando --threads"
-#: builtin/grep.c:1064 builtin/pack-objects.c:3547
+#: builtin/grep.c:1093 builtin/pack-objects.c:3672
msgid "no threads support, ignoring --threads"
msgstr "no se soportan hilos, ignorando --threads"
-#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851
+#: builtin/grep.c:1096 builtin/index-pack.c:1586 builtin/pack-objects.c:2941
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "número inválido de hilos especificado (%d)"
-#: builtin/grep.c:1101
+#: builtin/grep.c:1130
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager solo funciona en el árbol de trabajo"
-#: builtin/grep.c:1127
+#: builtin/grep.c:1156
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached o --untracked no pueden ser usadas con --no-index"
-#: builtin/grep.c:1133
+#: builtin/grep.c:1159
+msgid "--untracked cannot be used with --cached"
+msgstr "--untracked no se puede usar con --cached"
+
+#: builtin/grep.c:1165
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "--[no-]exclude-standard no puede ser usada para contenido rastreado"
-#: builtin/grep.c:1141
+#: builtin/grep.c:1173
msgid "both --cached and trees are given"
msgstr "--cached y árboles han sido entregados"
@@ -14798,66 +15959,66 @@
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"
@@ -14866,7 +16027,7 @@
"'%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"
@@ -14875,396 +16036,428 @@
"'%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:340
#, 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:372
#, 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"
-#: builtin/index-pack.c:185
+#: builtin/index-pack.c:221
#, c-format
msgid "object type mismatch at %s"
msgstr "el tipo del objeto no concuerda en %s"
-#: builtin/index-pack.c:205
+#: builtin/index-pack.c:241
#, c-format
msgid "did not receive expected object %s"
msgstr "no se recibió el objeto esperado %s"
-#: builtin/index-pack.c:208
+#: builtin/index-pack.c:244
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objeto %s: tipo esperado %s, encontrado %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] "no se puede llenar %d byte"
msgstr[1] "no se pueden llenar %d bytes"
-#: builtin/index-pack.c:268
+#: builtin/index-pack.c:304
msgid "early EOF"
msgstr "EOF temprano"
-#: builtin/index-pack.c:269
+#: builtin/index-pack.c:305
msgid "read error on input"
msgstr "leer error en input"
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:317
msgid "used more bytes than were available"
msgstr "se usaron más bytes de los disponibles"
-#: builtin/index-pack.c:288 builtin/pack-objects.c:606
+#: builtin/index-pack.c:324 builtin/pack-objects.c:624
msgid "pack too large for current definition of off_t"
msgstr "paquete muy grande para la definición actual de off_t"
-#: builtin/index-pack.c:291 builtin/unpack-objects.c:95
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
msgid "pack exceeds maximum allowed size"
msgstr "paquete excede el máximo tamaño permitido"
-#: builtin/index-pack.c:312
+#: builtin/index-pack.c:342
+#, c-format
+msgid "unable to create '%s'"
+msgstr "no se puede crear '%s'"
+
+#: builtin/index-pack.c:348
#, c-format
msgid "cannot open packfile '%s'"
msgstr "no se puede abrir el archivo de paquete '%s'"
-#: builtin/index-pack.c:326
+#: builtin/index-pack.c:362
msgid "pack signature mismatch"
msgstr "firma del paquete no concuerda"
-#: builtin/index-pack.c:328
+#: builtin/index-pack.c:364
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "versión de paquete %<PRIu32> no soportada"
-#: builtin/index-pack.c:346
+#: builtin/index-pack.c:382
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "paquete tiene un mal objeto en el offset %<PRIuMAX>: %s"
-#: builtin/index-pack.c:466
+#: builtin/index-pack.c:488
#, c-format
msgid "inflate returned %d"
msgstr "inflate devolvió %d"
-#: builtin/index-pack.c:515
+#: builtin/index-pack.c:537
msgid "offset value overflow for delta base object"
msgstr "valor de offset desbordado para el objeto base delta"
-#: builtin/index-pack.c:523
+#: builtin/index-pack.c:545
msgid "delta base offset is out of bound"
msgstr "offset de base delta está fuera de límites"
-#: builtin/index-pack.c:531
+#: builtin/index-pack.c:553
#, c-format
msgid "unknown object type %d"
msgstr "tipo de objeto %d desconocido"
-#: builtin/index-pack.c:562
+#: builtin/index-pack.c:584
msgid "cannot pread pack file"
msgstr "no se puede propagar el paquete"
-#: 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] "final prematuro de archivo de paquete, %<PRIuMAX> byte faltante"
msgstr[1] "final prematuro de archivo de paquete, %<PRIuMAX> bytes faltantes"
-#: builtin/index-pack.c:590
+#: builtin/index-pack.c:612
msgid "serious inflate inconsistency"
msgstr "inconsistencia seria en inflate"
-#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765
-#: builtin/index-pack.c:804 builtin/index-pack.c:813
+#: builtin/index-pack.c: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 "¡COLISIÓN DE TIPO SHA1 ENCONTRADA CON %s !"
-#: builtin/index-pack.c:738 builtin/pack-objects.c:158
-#: builtin/pack-objects.c:218 builtin/pack-objects.c:313
+#: builtin/index-pack.c:760 builtin/pack-objects.c:171
+#: builtin/pack-objects.c:231 builtin/pack-objects.c:326
#, c-format
msgid "unable to read %s"
msgstr "no se posible leer %s"
-#: builtin/index-pack.c:802
+#: builtin/index-pack.c:824
#, c-format
msgid "cannot read existing object info %s"
msgstr "no se puede leer la información existente del objeto %s"
-#: builtin/index-pack.c:810
+#: builtin/index-pack.c:832
#, c-format
msgid "cannot read existing object %s"
msgstr "no se puede leer el objeto existente %s"
-#: builtin/index-pack.c:824
+#: builtin/index-pack.c:846
#, c-format
msgid "invalid blob object %s"
msgstr "objeto blob %s inválido"
-#: builtin/index-pack.c:827 builtin/index-pack.c:846
+#: builtin/index-pack.c:849 builtin/index-pack.c:868
msgid "fsck error in packed object"
msgstr "error de fsck en el objeto empaquetado"
-#: builtin/index-pack.c:848
+#: builtin/index-pack.c:870
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "No todos los objetos hijos de %s son alcanzables"
-#: builtin/index-pack.c:920 builtin/index-pack.c:951
+#: builtin/index-pack.c:931 builtin/index-pack.c:978
msgid "failed to apply delta"
msgstr "falló al aplicar delta"
-#: builtin/index-pack.c:1121
+#: builtin/index-pack.c:1161
msgid "Receiving objects"
msgstr "Recibiendo objetos"
-#: builtin/index-pack.c:1121
+#: builtin/index-pack.c:1161
msgid "Indexing objects"
msgstr "Indexando objetos"
-#: builtin/index-pack.c:1155
+#: builtin/index-pack.c:1195
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "paquete está corrompido (SHA1 no concuerda)"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1200
msgid "cannot fstat packfile"
msgstr "no se puede fstat al archivo de paquete"
-#: builtin/index-pack.c:1163
+#: builtin/index-pack.c:1203
msgid "pack has junk at the end"
msgstr "el paquete tiene basura al final"
-#: builtin/index-pack.c:1175
+#: builtin/index-pack.c:1215
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "confusión más allá de la locura en parse_pack_objects()"
-#: builtin/index-pack.c:1198
+#: builtin/index-pack.c:1238
msgid "Resolving deltas"
msgstr "Resolviendo deltas"
-#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615
+#: builtin/index-pack.c:1249 builtin/pack-objects.c:2707
#, c-format
msgid "unable to create thread: %s"
msgstr "no es posible crear hilo: %s"
-#: builtin/index-pack.c:1249
+#: builtin/index-pack.c:1282
msgid "confusion beyond insanity"
msgstr "confusión más allá de la locura"
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1288
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "completado con %d objeto local"
msgstr[1] "completado con %d objetos locales"
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1300
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Tail checksum para %s inesperada (¿corrupción de disco?)"
-#: builtin/index-pack.c:1271
+#: builtin/index-pack.c:1304
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "paquete tiene %d delta sin resolver"
msgstr[1] "paquete tiene %d deltas sin resolver"
-#: builtin/index-pack.c:1295
+#: builtin/index-pack.c:1328
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "no es posible desinflar el objeto adjunto (%d)"
-#: builtin/index-pack.c:1392
+#: builtin/index-pack.c:1424
#, c-format
msgid "local object %s is corrupt"
msgstr "objeto local %s está corrompido"
-#: builtin/index-pack.c:1406
+#: builtin/index-pack.c:1445
#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "nombre '%s' de archivo de paquete no termina con '.pack'"
+msgid "packfile name '%s' does not end with '.%s'"
+msgstr "el nombre del archivo de paquete '%s' no termina con '.%s'"
-#: builtin/index-pack.c:1431
+#: builtin/index-pack.c:1469
#, c-format
msgid "cannot write %s file '%s'"
msgstr "no se puede escribir %s en el archivo '%s'"
-#: builtin/index-pack.c:1439
+#: builtin/index-pack.c:1477
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "no se puede cerrar escrito %s en archivo '%s'"
-#: builtin/index-pack.c:1463
+#: builtin/index-pack.c:1503
msgid "error while closing pack file"
msgstr "error mientras se cierra el archivo paquete"
-#: builtin/index-pack.c:1477
+#: builtin/index-pack.c:1517
msgid "cannot store pack file"
msgstr "no se puede guardar el archivo paquete"
-#: builtin/index-pack.c:1485
+#: builtin/index-pack.c:1525
msgid "cannot store index file"
msgstr "no se puede guardar el archivo índice"
-#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862
+#: builtin/index-pack.c:1534
+msgid "cannot store reverse index file"
+msgstr "no se puede almacenar el archivo de índice inverso"
+
+#: builtin/index-pack.c:1580 builtin/pack-objects.c:2952
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "mal pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1597
+#: builtin/index-pack.c:1650
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "No se puede abrir el archivo paquete existente '%s'"
-#: builtin/index-pack.c:1599
+#: builtin/index-pack.c:1652
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "No se puede abrir el índice del archivo paquete para '%s'"
-#: builtin/index-pack.c:1647
+#: builtin/index-pack.c:1700
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "no delta: %d objeto"
msgstr[1] "no delta: %d objetos"
-#: builtin/index-pack.c:1654
+#: builtin/index-pack.c:1707
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "largo de cadena = %d: %lu objeto"
msgstr[1] "largo de cadena = %d: %lu objetos"
-#: builtin/index-pack.c:1693
+#: builtin/index-pack.c:1765
msgid "Cannot come back to cwd"
msgstr "No se puede regresar a cwd"
-#: builtin/index-pack.c:1742 builtin/index-pack.c:1745
-#: builtin/index-pack.c:1761 builtin/index-pack.c:1765
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1822
+#: builtin/index-pack.c:1838 builtin/index-pack.c:1842
#, c-format
msgid "bad %s"
msgstr "mal %s"
-#: builtin/index-pack.c:1781
+#: builtin/index-pack.c:1848 builtin/init-db.c:392 builtin/init-db.c:625
+#, c-format
+msgid "unknown hash algorithm '%s'"
+msgstr "algoritmo hash desconocido '%s'"
+
+#: builtin/index-pack.c:1867
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin no puede ser usada sin --stdin"
-#: builtin/index-pack.c:1783
+#: builtin/index-pack.c:1869
msgid "--stdin requires a git repository"
msgstr "--stdin requiere un repositorio git"
-#: builtin/index-pack.c:1789
+#: builtin/index-pack.c:1871
+msgid "--object-format cannot be used with --stdin"
+msgstr "--object-format no se puede usar con --stdin"
+
+#: builtin/index-pack.c:1886
msgid "--verify with no packfile name given"
msgstr "--verify no recibió ningún nombre de archivo de paquete"
-#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582
+#: builtin/index-pack.c:1956 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:64
#, c-format
msgid "cannot stat template '%s'"
msgstr "no se pudo definir template '%s'"
-#: builtin/init-db.c:66
+#: builtin/init-db.c:69
#, c-format
msgid "cannot opendir '%s'"
msgstr "no se puede abrir directorio '%s'"
-#: builtin/init-db.c:78
+#: builtin/init-db.c:81
#, c-format
msgid "cannot readlink '%s'"
msgstr "no se puede leer link '%s'"
-#: builtin/init-db.c:80
+#: builtin/init-db.c:83
#, c-format
msgid "cannot symlink '%s' '%s'"
msgstr "no se puede crear symlink '%s' '%s'"
-#: builtin/init-db.c:86
+#: builtin/init-db.c:89
#, 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:93
#, c-format
msgid "ignoring template %s"
msgstr "ignorando template %s"
-#: builtin/init-db.c:121
+#: builtin/init-db.c:124
#, c-format
msgid "templates not found in %s"
msgstr "template no encontrado en %s"
-#: builtin/init-db.c:136
+#: builtin/init-db.c:139
#, 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:275
+#, c-format
+msgid "invalid initial branch name: '%s'"
+msgstr "nombre de rama inicial inválido: '%s'"
+
+#: builtin/init-db.c:367
#, 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:370
#, 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:445
+#, c-format
+msgid "re-init: ignored --initial-branch=%s"
+msgstr "re-init: ignorando --initial-branch=%s"
+
+#: builtin/init-db.c:476
#, 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:477
#, 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:481
#, 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:482
#, 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:531
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -15272,26 +16465,42 @@
"git init [-q | --quiet] [--bare] [--template=<directorio-template>] [--"
"shared[=<permisos>]] [<directorio>]"
-#: builtin/init-db.c:491
+#: builtin/init-db.c:557
msgid "permissions"
msgstr "permisos"
-#: builtin/init-db.c:492
+#: builtin/init-db.c:558
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:564
+msgid "override the name of the initial branch"
+msgstr "sobrescribir el nombre de la rama inicial"
+
+#: builtin/init-db.c:565 builtin/verify-pack.c:74
+msgid "hash"
+msgstr "hash"
+
+#: builtin/init-db.c:566 builtin/show-index.c:22 builtin/verify-pack.c:75
+msgid "specify the hash algorithm to use"
+msgstr "especificar el algoritmo hash a usar"
+
+#: builtin/init-db.c:573
+msgid "--separate-git-dir and --bare are mutually exclusive"
+msgstr "--separate-git-dir y --bare son mutuamente excluyentes"
+
+#: builtin/init-db.c:602 builtin/init-db.c:607
#, c-format
msgid "cannot mkdir %s"
msgstr "no se pude crear directorio %s"
-#: builtin/init-db.c:538
+#: builtin/init-db.c:611 builtin/init-db.c:666
#, c-format
msgid "cannot chdir to %s"
msgstr "no se puede aplicar chdir a %s"
-#: builtin/init-db.c:559
+#: builtin/init-db.c:638
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -15300,11 +16509,15 @@
"%s (o --work-tree=<directorio>) no se permite sin especificar %s (o --git-"
"dir=<directorio>)"
-#: builtin/init-db.c:587
+#: builtin/init-db.c:690
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "No se puede acceder al árbol de trabajo '%s'"
+#: builtin/init-db.c:695
+msgid "--separate-git-dir incompatible with bare repository"
+msgstr "--separate-git-dir incompatible con el repositorio desnudo"
+
#: builtin/interpret-trailers.c:16
msgid ""
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
@@ -15369,126 +16582,130 @@
msgid "no input file given for in-place editing"
msgstr "no se entregó archivo de entrada para edición en lugar"
-#: builtin/log.c:56
+#: builtin/log.c:59
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<opciones>] [<rango-de-revisión>] [[--] <ruta>...]"
-#: builtin/log.c:57
+#: builtin/log.c:60
msgid "git show [<options>] <object>..."
msgstr "git show [<opciones>] <objeto>..."
-#: builtin/log.c:110
+#: builtin/log.c:113
#, c-format
msgid "invalid --decorate option: %s"
msgstr "opción --decorate inválida: %s"
-#: builtin/log.c:174
+#: builtin/log.c:180
msgid "show source"
msgstr "mostrar fuente"
-#: builtin/log.c:175
-msgid "Use mail map file"
-msgstr "Usar archivo de mapa de mail"
+#: builtin/log.c:181
+msgid "use mail map file"
+msgstr "usar archivo de mapa de mail"
-#: builtin/log.c:177
+#: builtin/log.c:184
msgid "only decorate refs that match <pattern>"
msgstr "solo decorar refs que concuerden con <patrón>"
-#: builtin/log.c:179
+#: builtin/log.c:186
msgid "do not decorate refs that match <pattern>"
msgstr "no decorar refs que concuerden con <patrón>"
-#: builtin/log.c:180
+#: builtin/log.c:187
msgid "decorate options"
msgstr "opciones de decorado"
-#: builtin/log.c:183
-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:190
+msgid ""
+"trace the evolution of line range <start>,<end> or function :<funcname> in "
+"<file>"
+msgstr ""
+"rastrear la evolución del rango de línea <inicio>, <fin> o función: <nombre-"
+"funcion> en <archivo>"
-#: builtin/log.c:281
+#: builtin/log.c:213
+msgid "-L<range>:<file> cannot be used with pathspec"
+msgstr "-L<rango>:<archivo> no se puede usar con pathspec"
+
+#: builtin/log.c:303
#, c-format
msgid "Final output: %d %s\n"
msgstr "Salida final: %d %s\n"
-#: builtin/log.c:535
+#: builtin/log.c:566
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: mal archivo"
-#: builtin/log.c:550 builtin/log.c:645
+#: builtin/log.c:581 builtin/log.c:671
#, c-format
msgid "could not read object %s"
msgstr "no se pudo leer objeto %s"
-#: builtin/log.c:670
+#: builtin/log.c:696
#, c-format
msgid "unknown type: %d"
msgstr "tipo desconocido: %d"
-#: builtin/log.c:814
+#: builtin/log.c:841
#, c-format
msgid "%s: invalid cover from description mode"
msgstr "%s: modo cover from description inválido"
-#: builtin/log.c:821
+#: builtin/log.c:848
msgid "format.headers without value"
msgstr "formate.headers. sin valor"
-#: builtin/log.c:936
-msgid "name of output directory is too long"
-msgstr "nombre del directorio de salida es muy largo"
-
-#: builtin/log.c:952
+#: builtin/log.c:977
#, c-format
msgid "cannot open patch file %s"
msgstr "no se puede abrir archivo patch %s"
-#: builtin/log.c:969
+#: builtin/log.c:994
msgid "need exactly one range"
msgstr "necesita exactamente un rango"
-#: builtin/log.c:979
+#: builtin/log.c:1004
msgid "not a range"
msgstr "no es un rango"
-#: builtin/log.c:1143
+#: builtin/log.c:1168
msgid "cover letter needs email format"
msgstr "letras de portada necesita formato email"
-#: builtin/log.c:1149
+#: builtin/log.c:1174
msgid "failed to create cover-letter file"
msgstr "falló al crear los archivos cover-letter"
-#: builtin/log.c:1228
+#: builtin/log.c:1261
#, c-format
msgid "insane in-reply-to: %s"
msgstr "insano in-reply-to: %s"
-#: builtin/log.c:1255
+#: builtin/log.c:1288
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<opciones>] [<desde> | <rango-de-revisiones>]"
-#: builtin/log.c:1313
+#: builtin/log.c:1346
msgid "two output directories?"
msgstr "¿dos directorios de salida?"
-#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211
+#: builtin/log.c:1497 builtin/log.c:2317 builtin/log.c:2319 builtin/log.c:2331
#, c-format
msgid "unknown commit %s"
msgstr "commit desconocido %s"
-#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1508 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "falló al resolver '%s' como ref válida"
-#: builtin/log.c:1439
+#: builtin/log.c:1517
msgid "could not find exact merge base"
msgstr "no se pudo encontrar una base de fusión exacta"
-#: builtin/log.c:1443
+#: builtin/log.c:1527
msgid ""
"failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
@@ -15500,281 +16717,290 @@
"O puedes especificar un commit base mediante --base=<id-commit-base> "
"manualmente"
-#: builtin/log.c:1463
+#: builtin/log.c:1550
msgid "failed to find exact merge base"
msgstr "falló al encontrar una base de fusión exacta"
-#: builtin/log.c:1474
+#: builtin/log.c:1567
msgid "base commit should be the ancestor of revision list"
msgstr "el commit base debe ser el ancestro de la lista de revisión"
-#: builtin/log.c:1478
+#: builtin/log.c:1577
msgid "base commit shouldn't be in revision list"
msgstr "el commit base no debe estar en la lista de revisión"
-#: builtin/log.c:1531
+#: builtin/log.c:1635
msgid "cannot get patch id"
msgstr "no se puede obtener id de patch"
-#: builtin/log.c:1583
-msgid "failed to infer range-diff ranges"
-msgstr "falló al inferir rangos range-diff"
+#: builtin/log.c:1692
+msgid "failed to infer range-diff origin of current series"
+msgstr "falló al inferir rangos range-diff de la serie actual"
-#: builtin/log.c:1629
+#: builtin/log.c:1694
+#, c-format
+msgid "using '%s' as range-diff origin of current series"
+msgstr "usando '%s' como origen de diferencia de rango de la serie actual"
+
+#: builtin/log.c:1738
msgid "use [PATCH n/m] even with a single patch"
msgstr "use [PATCH n/m] incluso con un único parche"
-#: builtin/log.c:1632
+#: builtin/log.c:1741
msgid "use [PATCH] even with multiple patches"
msgstr "use [PATCH] incluso con múltiples parches"
-#: builtin/log.c:1636
+#: builtin/log.c:1745
msgid "print patches to standard out"
msgstr "mostrar parches en standard out"
-#: builtin/log.c:1638
+#: builtin/log.c:1747
msgid "generate a cover letter"
msgstr "generar letra de cover"
-#: builtin/log.c:1640
+#: builtin/log.c:1749
msgid "use simple number sequence for output file names"
msgstr ""
"usar una secuencia simple de números para salida de nombres de archivos"
-#: builtin/log.c:1641
+#: builtin/log.c:1750
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1642
+#: builtin/log.c:1751
msgid "use <sfx> instead of '.patch'"
msgstr "use <sfx> en lugar de '.patch'"
-#: builtin/log.c:1644
+#: builtin/log.c:1753
msgid "start numbering patches at <n> instead of 1"
msgstr "comenzar a numerar los parches desde <n> en lugar de 1"
-#: builtin/log.c:1646
+#: builtin/log.c:1755
msgid "mark the series as Nth re-roll"
msgstr "marcar las series como Nth re-roll"
-#: builtin/log.c:1648
-msgid "Use [RFC PATCH] instead of [PATCH]"
-msgstr "Use [RFC PATCH] en lugar de [PATCH]"
+#: builtin/log.c:1757
+msgid "max length of output filename"
+msgstr "tamaño máximo de nombre de archivo resultante"
-#: builtin/log.c:1651
+#: builtin/log.c:1759
+msgid "use [RFC PATCH] instead of [PATCH]"
+msgstr "use [RFC PATCH] en lugar de [PATCH]"
+
+#: builtin/log.c:1762
msgid "cover-from-description-mode"
msgstr "modo-cover-from-description"
-#: builtin/log.c:1652
+#: builtin/log.c:1763
msgid "generate parts of a cover letter based on a branch's description"
msgstr ""
"genera partes de una carta de presentación basado en la descripción de la "
"rama"
-#: builtin/log.c:1654
-msgid "Use [<prefix>] instead of [PATCH]"
-msgstr "Use [<prefijo>] en lugar de [PATCH]"
+#: builtin/log.c:1765
+msgid "use [<prefix>] instead of [PATCH]"
+msgstr "use [<prefijo>] en lugar de [PATCH]"
-#: builtin/log.c:1657
+#: builtin/log.c:1768
msgid "store resulting files in <dir>"
msgstr "guardar archivos resultantes en <dir>"
-#: builtin/log.c:1660
+#: builtin/log.c:1771
msgid "don't strip/add [PATCH]"
msgstr "no cortar/agregar [PATCH]"
-#: builtin/log.c:1663
+#: builtin/log.c:1774
msgid "don't output binary diffs"
msgstr "no mostrar diffs binarios"
-#: builtin/log.c:1665
+#: builtin/log.c:1776
msgid "output all-zero hash in From header"
msgstr "salida como hash de todos-ceros en la cabecera From"
-#: builtin/log.c:1667
+#: builtin/log.c:1778
msgid "don't include a patch matching a commit upstream"
msgstr "no incluya un parche que coincida con un commit en upstream"
-#: builtin/log.c:1669
+#: builtin/log.c:1780
msgid "show patch format instead of default (patch + stat)"
msgstr "mostrar formato de parche en lugar del default (parche + stat)"
-#: builtin/log.c:1671
+#: builtin/log.c:1782
msgid "Messaging"
msgstr "Mensajeando"
-#: builtin/log.c:1672
+#: builtin/log.c:1783
msgid "header"
msgstr "cabezal"
-#: builtin/log.c:1673
+#: builtin/log.c:1784
msgid "add email header"
msgstr "agregar cabecera email"
-#: builtin/log.c:1674 builtin/log.c:1676
+#: builtin/log.c:1785 builtin/log.c:1786
msgid "email"
msgstr "email"
-#: builtin/log.c:1674
+#: builtin/log.c:1785
msgid "add To: header"
msgstr "agregar cabecera To:"
-#: builtin/log.c:1676
+#: builtin/log.c:1786
msgid "add Cc: header"
msgstr "agregar cabecera Cc:"
-#: builtin/log.c:1678
+#: builtin/log.c:1787
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1679
+#: builtin/log.c:1788
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"configurar dirección From a <ident> ( o identidad de committer si está "
"ausente)"
-#: builtin/log.c:1681
+#: builtin/log.c:1790
msgid "message-id"
msgstr "id de mensaje"
-#: builtin/log.c:1682
+#: builtin/log.c:1791
msgid "make first mail a reply to <message-id>"
msgstr "hacer primer mail una respuesta a <id de mensaje>"
-#: builtin/log.c:1683 builtin/log.c:1686
+#: builtin/log.c:1792 builtin/log.c:1795
msgid "boundary"
msgstr "límite"
-#: builtin/log.c:1684
+#: builtin/log.c:1793
msgid "attach the patch"
msgstr "adjuntar el parche"
-#: builtin/log.c:1687
+#: builtin/log.c:1796
msgid "inline the patch"
msgstr "poner el parche en línea"
-#: builtin/log.c:1691
+#: builtin/log.c:1800
msgid "enable message threading, styles: shallow, deep"
msgstr "habilitar hilos de mensajes, estilos: superficial, profundo"
-#: builtin/log.c:1693
+#: builtin/log.c:1802
msgid "signature"
msgstr "firma"
-#: builtin/log.c:1694
+#: builtin/log.c:1803
msgid "add a signature"
msgstr "agregar una firma"
-#: builtin/log.c:1695
+#: builtin/log.c:1804
msgid "base-commit"
msgstr "commit-base"
-#: builtin/log.c:1696
+#: builtin/log.c:1805
msgid "add prerequisite tree info to the patch series"
msgstr ""
"agregar información de árbol de requisitos previos a la serie de parches"
-#: builtin/log.c:1698
+#: builtin/log.c:1808
msgid "add a signature from a file"
msgstr "agregar una firma de un archivo"
-#: builtin/log.c:1699
+#: builtin/log.c:1809
msgid "don't print the patch filenames"
msgstr "no mostrar los nombres de archivos de los parches"
-#: builtin/log.c:1701
+#: builtin/log.c:1811
msgid "show progress while generating patches"
msgstr "mostrar medidor de progreso mientras se generan los parches"
-#: builtin/log.c:1703
+#: builtin/log.c:1813
msgid "show changes against <rev> in cover letter or single patch"
msgstr "muestra cambios contra <rev> en cover letter o en un solo parche"
-#: builtin/log.c:1706
+#: builtin/log.c:1816
msgid "show changes against <refspec> in cover letter or single patch"
msgstr "muestra cambios contra <refspec> en cover letter o en un solo parche"
-#: builtin/log.c:1708
+#: builtin/log.c:1818
msgid "percentage by which creation is weighted"
msgstr "porcentaje por el cual la creación es pesada"
-#: builtin/log.c:1792
+#: builtin/log.c:1904
#, c-format
msgid "invalid ident line: %s"
msgstr "línea de identificación inválida: %s"
-#: builtin/log.c:1807
+#: builtin/log.c:1919
msgid "-n and -k are mutually exclusive"
msgstr "-n y -k son mutuamente exclusivas"
-#: builtin/log.c:1809
+#: builtin/log.c:1921
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "--subject-prefix/--rfc y -k son mutuamente exclusivos"
-#: builtin/log.c:1817
+#: builtin/log.c:1929
msgid "--name-only does not make sense"
msgstr "--name-only no tiene sentido"
-#: builtin/log.c:1819
+#: builtin/log.c:1931
msgid "--name-status does not make sense"
msgstr "--name-status no tiene sentido"
-#: builtin/log.c:1821
+#: builtin/log.c:1933
msgid "--check does not make sense"
msgstr "--check no tiene sentido"
-#: builtin/log.c:1854
-msgid "standard output, or directory, which one?"
-msgstr "¿salida standard, o directorio, cual?"
+#: builtin/log.c:1955
+msgid "--stdout, --output, and --output-directory are mutually exclusive"
+msgstr "--stdout, --output, and --output-directory son mutuamente exclusivas"
-#: builtin/log.c:1958
+#: builtin/log.c:2078
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff requiere --cover-letter o un parche único"
-#: builtin/log.c:1962
+#: builtin/log.c:2082
msgid "Interdiff:"
msgstr "Interdiff:"
-#: builtin/log.c:1963
+#: builtin/log.c:2083
#, c-format
msgid "Interdiff against v%d:"
msgstr "Interdiff contra v%d:"
-#: builtin/log.c:1969
+#: builtin/log.c:2089
msgid "--creation-factor requires --range-diff"
msgstr "--creation-factor requiere --range-diff"
-#: builtin/log.c:1973
+#: builtin/log.c:2093
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff requiere --cover-letter o parche único"
-#: builtin/log.c:1981
+#: builtin/log.c:2101
msgid "Range-diff:"
msgstr "Range-diff:"
-#: builtin/log.c:1982
+#: builtin/log.c:2102
#, c-format
msgid "Range-diff against v%d:"
msgstr "Range-diff contra v%d:"
-#: builtin/log.c:1993
+#: builtin/log.c:2113
#, c-format
msgid "unable to read signature file '%s'"
msgstr "no se puede leer la firma del archivo '%s'"
-#: builtin/log.c:2029
+#: builtin/log.c:2149
msgid "Generating patches"
msgstr "Generando parches"
-#: builtin/log.c:2073
+#: builtin/log.c:2193
msgid "failed to create output files"
msgstr "falló al crear los archivos de salida"
-#: builtin/log.c:2132
+#: builtin/log.c:2252
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<upstream> [<head> [<límite>]]]"
-#: builtin/log.c:2186
+#: builtin/log.c:2306
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -15782,114 +17008,118 @@
"No se pudo encontrar una rama remota rastreada, por favor especifique "
"<upstream> manualmente.\n"
-#: builtin/ls-files.c:470
+#: builtin/ls-files.c:486
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<opciones>] [<archivo>...]"
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:542
msgid "identify the file status with tags"
msgstr "identifique el estado del archivo con tags"
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:544
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:546
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:548
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:550
msgid "show deleted files in the output"
msgstr "mostrar archivos borrados en la salida"
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:552
msgid "show modified files in the output"
msgstr "mostrar archivos modificados en la salida"
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:554
msgid "show other files in the output"
msgstr "mostrar otros archivos en la salida"
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:556
msgid "show ignored files in the output"
msgstr "mostrar archivos ignorados en la salida"
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:559
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:561
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:563
msgid "show 'other' directories' names only"
msgstr "mostrar solo nombres de 'directorios otros'"
-#: builtin/ls-files.c:549
+#: builtin/ls-files.c:565
msgid "show line endings of files"
msgstr "mostrar finales de línea de archivos"
-#: builtin/ls-files.c:551
+#: builtin/ls-files.c:567
msgid "don't show empty directories"
msgstr "no mostrar directorios vacíos"
-#: builtin/ls-files.c:554
+#: builtin/ls-files.c:570
msgid "show unmerged files in the output"
msgstr "mostrar archivos no fusionados en la salida"
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:572
msgid "show resolve-undo information"
msgstr "mostrar información resolver-deshacer"
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:574
msgid "skip files matching pattern"
msgstr "saltar archivos que concuerden con el patrón"
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:577
msgid "exclude patterns are read from <file>"
msgstr "excluir patrones leídos de <archivo>"
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:580
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:582
msgid "add the standard git exclusions"
msgstr "agregar las exclusiones standard de git"
-#: builtin/ls-files.c:570
+#: builtin/ls-files.c:586
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:589
msgid "recurse through submodules"
msgstr "recurrir a través de submódulos"
-#: builtin/ls-files.c:575
+#: builtin/ls-files.c:591
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:592
msgid "tree-ish"
msgstr "árbol-ismo"
-#: builtin/ls-files.c:577
+#: builtin/ls-files.c:593
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:595
msgid "show debugging data"
msgstr "mostrar data de debug"
+#: builtin/ls-files.c:597
+msgid "suppress duplicate entries"
+msgstr "suprimir entradas duplicadas"
+
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
@@ -15900,39 +17130,39 @@
" [-q | --quiet] [--exit-code] [--get-url]\n"
" [--symref] [<repositorio> [<refs>...]]"
-#: builtin/ls-remote.c:59
+#: builtin/ls-remote.c:60
msgid "do not print remote URL"
msgstr "no mostrar el URL remoto"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1404
msgid "exec"
msgstr "ejecutar"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
+#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
msgid "path of git-upload-pack on the remote host"
msgstr "ruta de git-upload-pack en el host remoto"
-#: builtin/ls-remote.c:65
+#: builtin/ls-remote.c:66
msgid "limit to tags"
msgstr "limitar a tags"
-#: builtin/ls-remote.c:66
+#: builtin/ls-remote.c:67
msgid "limit to heads"
msgstr "limitar a heads"
-#: builtin/ls-remote.c:67
+#: builtin/ls-remote.c:68
msgid "do not show peeled tags"
msgstr "no mostrar tags pelados"
-#: builtin/ls-remote.c:69
+#: builtin/ls-remote.c:70
msgid "take url.<base>.insteadOf into account"
msgstr "tomar url.<base>.insteadOf en cuenta"
-#: builtin/ls-remote.c:72
+#: builtin/ls-remote.c:73
msgid "exit with exit code 2 if no matching refs are found"
msgstr "salir con código de salida 2 si no se encuentran refs que concuerden"
-#: builtin/ls-remote.c:75
+#: builtin/ls-remote.c:76
msgid "show underlying ref in addition to the object pointed by it"
msgstr "mostrar ref subyacente en adición al objeto apuntado por él"
@@ -15978,396 +17208,6 @@
msgid "empty mbox: '%s'"
msgstr "mbox vacío: '%s'"
-#: builtin/merge.c:55
-msgid "git merge [<options>] [<commit>...]"
-msgstr "git merge [<opciones>] [<commit>...]"
-
-#: builtin/merge.c:56
-msgid "git merge --abort"
-msgstr "git merge --abort"
-
-#: builtin/merge.c:57
-msgid "git merge --continue"
-msgstr "git merge --continue"
-
-#: builtin/merge.c:119
-msgid "switch `m' requires a value"
-msgstr "cambiar `m' requiere un valor"
-
-#: builtin/merge.c:142
-#, c-format
-msgid "option `%s' requires a value"
-msgstr "opción `%s' requiere un valor"
-
-#: builtin/merge.c:188
-#, c-format
-msgid "Could not find merge strategy '%s'.\n"
-msgstr "No se pudo encontrar estrategia de fusión '%s'.\n"
-
-#: builtin/merge.c:189
-#, c-format
-msgid "Available strategies are:"
-msgstr "Estrategias disponibles son:"
-
-#: builtin/merge.c:194
-#, c-format
-msgid "Available custom strategies are:"
-msgstr "Estrategias personalizadas disponibles son:"
-
-#: builtin/merge.c:245 builtin/pull.c:132
-msgid "do not show a diffstat at the end of the merge"
-msgstr "no mostrar un diffstat al final de la fusión"
-
-#: builtin/merge.c:248 builtin/pull.c:135
-msgid "show a diffstat at the end of the merge"
-msgstr "mostrar un diffstat al final de la fusión"
-
-#: builtin/merge.c:249 builtin/pull.c:138
-msgid "(synonym to --stat)"
-msgstr "(sinónimo para --stat)"
-
-#: builtin/merge.c:251 builtin/pull.c:141
-msgid "add (at most <n>) entries from shortlog to merge commit message"
-msgstr ""
-"agregar (como máximo <n>) entradas del shortlog al mensaje del commit de "
-"fusión"
-
-#: builtin/merge.c:254 builtin/pull.c:147
-msgid "create a single commit instead of doing a merge"
-msgstr "crear un commit único en lugar de hacer una fusión"
-
-#: builtin/merge.c:256 builtin/pull.c:150
-msgid "perform a commit if the merge succeeds (default)"
-msgstr "realizar un commit si la fusión es exitosa (default)"
-
-#: builtin/merge.c:258 builtin/pull.c:153
-msgid "edit message before committing"
-msgstr "editar mensaje antes de realizar commit"
-
-#: builtin/merge.c:260
-msgid "allow fast-forward (default)"
-msgstr "permitir fast-forwars (default)"
-
-#: builtin/merge.c:262 builtin/pull.c:160
-msgid "abort if fast-forward is not possible"
-msgstr "abortar si fast-forward no es posible"
-
-#: builtin/merge.c:266 builtin/pull.c:163
-msgid "verify that the named commit has a valid GPG signature"
-msgstr "verificar que el commit nombrado tiene una firma GPG válida"
-
-#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167
-#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114
-msgid "strategy"
-msgstr "estrategia"
-
-#: builtin/merge.c:268 builtin/pull.c:168
-msgid "merge strategy to use"
-msgstr "estrategia de fusión para usar"
-
-#: builtin/merge.c:269 builtin/pull.c:171
-msgid "option=value"
-msgstr "opción=valor"
-
-#: builtin/merge.c:270 builtin/pull.c:172
-msgid "option for selected merge strategy"
-msgstr "opción para la estrategia de fusión seleccionada"
-
-#: builtin/merge.c:272
-msgid "merge commit message (for a non-fast-forward merge)"
-msgstr "fusionar mensaje de commit (para una fusión no fast-forward)"
-
-#: builtin/merge.c:279
-msgid "abort the current in-progress merge"
-msgstr "abortar la fusión en progreso actual"
-
-#: builtin/merge.c:281
-msgid "--abort but leave index and working tree alone"
-msgstr "--abort pero deja el índice y el árbol de trabajo solos"
-
-#: builtin/merge.c:283
-msgid "continue the current in-progress merge"
-msgstr "continuar la fusión en progreso actual"
-
-#: builtin/merge.c:285 builtin/pull.c:179
-msgid "allow merging unrelated histories"
-msgstr "permitir fusionar historias no relacionadas"
-
-#: builtin/merge.c:291
-msgid "bypass pre-merge-commit and commit-msg hooks"
-msgstr "hacer un bypass a hooks pre-merge-commit y commit-msg"
-
-#: builtin/merge.c:308
-msgid "could not run stash."
-msgstr "no se pudo ejecutar stash."
-
-#: builtin/merge.c:313
-msgid "stash failed"
-msgstr "stash falló"
-
-#: builtin/merge.c:318
-#, c-format
-msgid "not a valid object: %s"
-msgstr "no es un objeto válido: %s"
-
-#: builtin/merge.c:340 builtin/merge.c:357
-msgid "read-tree failed"
-msgstr "lectura de árbol falló"
-
-#: builtin/merge.c:387
-msgid " (nothing to squash)"
-msgstr " (nada para hacer squash)"
-
-#: builtin/merge.c:398
-#, c-format
-msgid "Squash commit -- not updating HEAD\n"
-msgstr "Commit de squash -- no actualizando HEAD\n"
-
-#: builtin/merge.c:448
-#, c-format
-msgid "No merge message -- not updating HEAD\n"
-msgstr "No hay mensaje de fusión -- no actualizando HEAD\n"
-
-#: builtin/merge.c:499
-#, c-format
-msgid "'%s' does not point to a commit"
-msgstr "'%s' no apunta a ningún commit"
-
-#: builtin/merge.c:586
-#, c-format
-msgid "Bad branch.%s.mergeoptions string: %s"
-msgstr "Mal string branch.%s.mergeoptions: %s"
-
-#: builtin/merge.c:708
-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
-#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Opción desconocida para merge-recursive: -X%s"
-
-#: builtin/merge.c:737
-#, c-format
-msgid "unable to write %s"
-msgstr "no es posible escribir %s"
-
-#: builtin/merge.c:789
-#, c-format
-msgid "Could not read from '%s'"
-msgstr "No se puedo leer de '%s'"
-
-#: builtin/merge.c:798
-#, 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
-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 ""
-"Por favor ingrese un mensaje de commit que explique por qué es necesaria "
-"esta fusión,\n"
-"especialmente si esto fusiona un upstream actualizado en una rama de "
-"tópico.\n"
-"\n"
-
-#: builtin/merge.c:809
-msgid "An empty message aborts the commit.\n"
-msgstr "Un mensaje vacío aborta el commit.\n"
-
-#: builtin/merge.c:812
-#, c-format
-msgid ""
-"Lines starting with '%c' will be ignored, and an empty message aborts\n"
-"the commit.\n"
-msgstr ""
-"Líneas comenzando con '%c' serán ignoradas, y un mensaje vacío aborta\n"
-" el commit.\n"
-
-#: builtin/merge.c:865
-msgid "Empty commit message."
-msgstr "Mensaje de commit vacío."
-
-#: builtin/merge.c:880
-#, c-format
-msgid "Wonderful.\n"
-msgstr "Maravilloso.\n"
-
-#: builtin/merge.c:941
-#, c-format
-msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
-msgstr ""
-"Fusión automática falló; arregle los conflictos y luego realice un commit "
-"con el resultado.\n"
-
-#: builtin/merge.c:980
-msgid "No current branch."
-msgstr "No rama actual."
-
-#: builtin/merge.c:982
-msgid "No remote for the current branch."
-msgstr "No hay remoto para la rama actual."
-
-#: builtin/merge.c:984
-msgid "No default upstream defined for the current branch."
-msgstr "Por defecto, no hay un upstream definido para la rama actual."
-
-#: builtin/merge.c:989
-#, c-format
-msgid "No remote-tracking branch for %s from %s"
-msgstr "No hay rama de rastreo remoto para %s de %s"
-
-#: builtin/merge.c:1046
-#, c-format
-msgid "Bad value '%s' in environment '%s'"
-msgstr "Valor erróneo '%s' en el entorno '%s'"
-
-#: builtin/merge.c:1149
-#, c-format
-msgid "not something we can merge in %s: %s"
-msgstr "nada que podamos fusionar en %s: %s"
-
-#: builtin/merge.c:1183
-msgid "not something we can merge"
-msgstr "nada que podamos fusionar"
-
-#: builtin/merge.c:1286
-msgid "--abort expects no arguments"
-msgstr "--abort no espera argumentos"
-
-#: builtin/merge.c:1290
-msgid "There is no merge to abort (MERGE_HEAD missing)."
-msgstr "No hay una fusión para abortar (falta MERGE_HEAD)"
-
-#: builtin/merge.c:1299
-msgid "--quit expects no arguments"
-msgstr "--quit no espera argumentos"
-
-#: builtin/merge.c:1312
-msgid "--continue expects no arguments"
-msgstr "--continue no espera argumentos"
-
-#: builtin/merge.c:1316
-msgid "There is no merge in progress (MERGE_HEAD missing)."
-msgstr "No hay fusión en progreso (falta MERGE_HEAD)."
-
-#: builtin/merge.c:1332
-msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you merge."
-msgstr ""
-"No has concluido la fusión (existe MERGE_HEAD).\n"
-"Por favor, realiza un commit con los cambios antes de fusionar."
-
-#: builtin/merge.c:1339
-msgid ""
-"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
-"Please, commit your changes before you merge."
-msgstr ""
-"No has concluido el cherry-pick (existe CHERRY_PICK_HEAD).\n"
-"Por favor, realiza un commit con los cambios antes de fusionar."
-
-#: builtin/merge.c:1342
-msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
-msgstr "No has concluido el cherry-pick (existe CHERRY_PICK_HEAD)."
-
-#: builtin/merge.c:1356
-msgid "You cannot combine --squash with --no-ff."
-msgstr "No se puede combinar --squash con --no-ff."
-
-#: builtin/merge.c:1358
-msgid "You cannot combine --squash with --commit."
-msgstr "No se puede combinar --squash con --commit."
-
-#: builtin/merge.c:1374
-msgid "No commit specified and merge.defaultToUpstream not set."
-msgstr ""
-"No hay commit especificado y merge.defaultToUpstream no está configurado."
-
-#: builtin/merge.c:1391
-msgid "Squash commit into empty head not supported yet"
-msgstr "Commit aplastado dentro de un head vacío no es soportado todavía"
-
-#: builtin/merge.c:1393
-msgid "Non-fast-forward commit does not make sense into an empty head"
-msgstr "Commit no fast-forward no tiene sentido dentro de un head vacío"
-
-#: builtin/merge.c:1398
-#, c-format
-msgid "%s - not something we can merge"
-msgstr "%s - nada que podamos fusionar"
-
-#: builtin/merge.c:1400
-msgid "Can merge only exactly one commit into empty head"
-msgstr "Solo se puede fusionar exactamente un commit en un head vacío"
-
-#: builtin/merge.c:1481
-msgid "refusing to merge unrelated histories"
-msgstr "rehusando fusionar historias no relacionadas"
-
-#: builtin/merge.c:1490
-msgid "Already up to date."
-msgstr "Ya está actualizado."
-
-#: builtin/merge.c:1500
-#, c-format
-msgid "Updating %s..%s\n"
-msgstr "Actualizando %s..%s\n"
-
-#: builtin/merge.c:1542
-#, c-format
-msgid "Trying really trivial in-index merge...\n"
-msgstr "Intentando fusión en índice realmente trivial...\n"
-
-#: builtin/merge.c:1549
-#, c-format
-msgid "Nope.\n"
-msgstr "Nop.\n"
-
-#: builtin/merge.c:1574
-msgid "Already up to date. Yeeah!"
-msgstr "Ya está actualizado. ¡Oh, yeaahh!"
-
-#: builtin/merge.c:1580
-msgid "Not possible to fast-forward, aborting."
-msgstr "No es posible hacer fast-forward, abortando."
-
-#: builtin/merge.c:1603 builtin/merge.c:1668
-#, c-format
-msgid "Rewinding the tree to pristine...\n"
-msgstr "Rebobinando el árbol a original...\n"
-
-#: builtin/merge.c:1607
-#, c-format
-msgid "Trying merge strategy %s...\n"
-msgstr "Intentando estrategia de fusión %s...\n"
-
-#: builtin/merge.c:1659
-#, c-format
-msgid "No merge strategy handled the merge.\n"
-msgstr "Ninguna estrategia de fusión manejó la fusión.\n"
-
-#: builtin/merge.c:1661
-#, c-format
-msgid "Merge with strategy %s failed.\n"
-msgstr "Fusionar con estrategia %s falló.\n"
-
-#: builtin/merge.c:1670
-#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
-msgstr "Usando el %s para preparar resolución a mano.\n"
-
-#: builtin/merge.c:1682
-#, 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>..."
@@ -16388,23 +17228,23 @@
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <ref> [<commit>]"
-#: builtin/merge-base.c:153
+#: builtin/merge-base.c:143
msgid "output all common ancestors"
msgstr "mostrar todos los ancestros comunes"
-#: builtin/merge-base.c:155
+#: 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:157
+#: builtin/merge-base.c:147
msgid "list revs not reachable from others"
msgstr "listar revs no alcanzables desde otros"
-#: builtin/merge-base.c:159
+#: 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:161
+#: builtin/merge-base.c:151
msgid "find where <commit> forked from reflog of <ref>"
msgstr "encontrar donde <commit> forjó del reflog de <ref>"
@@ -16479,6 +17319,437 @@
msgid "Merging %s with %s\n"
msgstr "Fusionando %s con %s\n"
+#: builtin/merge.c:58
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<opciones>] [<commit>...]"
+
+#: builtin/merge.c:59
+msgid "git merge --abort"
+msgstr "git merge --abort"
+
+#: builtin/merge.c:60
+msgid "git merge --continue"
+msgstr "git merge --continue"
+
+#: builtin/merge.c:123
+msgid "switch `m' requires a value"
+msgstr "cambiar `m' requiere un valor"
+
+#: builtin/merge.c:146
+#, c-format
+msgid "option `%s' requires a value"
+msgstr "opción `%s' requiere un valor"
+
+#: builtin/merge.c:199
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr "No se pudo encontrar estrategia de fusión '%s'.\n"
+
+#: builtin/merge.c:200
+#, c-format
+msgid "Available strategies are:"
+msgstr "Estrategias disponibles son:"
+
+#: builtin/merge.c:205
+#, c-format
+msgid "Available custom strategies are:"
+msgstr "Estrategias personalizadas disponibles son:"
+
+#: builtin/merge.c:256 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:259 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:260 builtin/pull.c:139
+msgid "(synonym to --stat)"
+msgstr "(sinónimo para --stat)"
+
+#: builtin/merge.c:262 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:265 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:267 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:269 builtin/pull.c:154
+msgid "edit message before committing"
+msgstr "editar mensaje antes de realizar commit"
+
+#: builtin/merge.c:271
+msgid "allow fast-forward (default)"
+msgstr "permitir fast-forwars (default)"
+
+#: builtin/merge.c:273 builtin/pull.c:161
+msgid "abort if fast-forward is not possible"
+msgstr "abortar si fast-forward no es posible"
+
+#: builtin/merge.c:277 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:278 builtin/notes.c:787 builtin/pull.c:168
+#: builtin/rebase.c:541 builtin/rebase.c:1418 builtin/revert.c:114
+msgid "strategy"
+msgstr "estrategia"
+
+#: builtin/merge.c:279 builtin/pull.c:169
+msgid "merge strategy to use"
+msgstr "estrategia de fusión para usar"
+
+#: builtin/merge.c:280 builtin/pull.c:172
+msgid "option=value"
+msgstr "opción=valor"
+
+#: builtin/merge.c:281 builtin/pull.c:173
+msgid "option for selected merge strategy"
+msgstr "opción para la estrategia de fusión seleccionada"
+
+#: builtin/merge.c:283
+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:290
+msgid "abort the current in-progress merge"
+msgstr "abortar la fusión en progreso actual"
+
+#: builtin/merge.c:292
+msgid "--abort but leave index and working tree alone"
+msgstr "--abort pero deja el índice y el árbol de trabajo solos"
+
+#: builtin/merge.c:294
+msgid "continue the current in-progress merge"
+msgstr "continuar la fusión en progreso actual"
+
+#: builtin/merge.c:296 builtin/pull.c:180
+msgid "allow merging unrelated histories"
+msgstr "permitir fusionar historias no relacionadas"
+
+#: builtin/merge.c:303
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr "hacer un bypass a hooks pre-merge-commit y commit-msg"
+
+#: builtin/merge.c:320
+msgid "could not run stash."
+msgstr "no se pudo ejecutar stash."
+
+#: builtin/merge.c:325
+msgid "stash failed"
+msgstr "stash falló"
+
+#: builtin/merge.c:330
+#, c-format
+msgid "not a valid object: %s"
+msgstr "no es un objeto válido: %s"
+
+#: builtin/merge.c:352 builtin/merge.c:369
+msgid "read-tree failed"
+msgstr "lectura de árbol falló"
+
+#: builtin/merge.c:399
+msgid " (nothing to squash)"
+msgstr " (nada para hacer squash)"
+
+#: builtin/merge.c:410
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr "Commit de squash -- no actualizando HEAD\n"
+
+#: builtin/merge.c:460
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr "No hay mensaje de fusión -- no actualizando HEAD\n"
+
+#: builtin/merge.c:511
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr "'%s' no apunta a ningún commit"
+
+#: builtin/merge.c:598
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr "Mal string branch.%s.mergeoptions: %s"
+
+#: builtin/merge.c:724
+msgid "Not handling anything other than two heads merge."
+msgstr "No manejando nada más que fusión de dos heads."
+
+#: builtin/merge.c:737
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr "Opción desconocida para merge-recursive: -X%s"
+
+#: builtin/merge.c:756 t/helper/test-fast-rebase.c:209
+#, c-format
+msgid "unable to write %s"
+msgstr "no es posible escribir %s"
+
+#: builtin/merge.c:808
+#, c-format
+msgid "Could not read from '%s'"
+msgstr "No se puedo leer de '%s'"
+
+#: builtin/merge.c:817
+#, 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:823
+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 ""
+"Por favor ingrese un mensaje de commit que explique por qué es necesaria "
+"esta fusión,\n"
+"especialmente si esto fusiona un upstream actualizado en una rama de "
+"tópico.\n"
+"\n"
+
+#: builtin/merge.c:828
+msgid "An empty message aborts the commit.\n"
+msgstr "Un mensaje vacío aborta el commit.\n"
+
+#: builtin/merge.c:831
+#, c-format
+msgid ""
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
+"Líneas comenzando con '%c' serán ignoradas, y un mensaje vacío aborta\n"
+" el commit.\n"
+
+#: builtin/merge.c:884
+msgid "Empty commit message."
+msgstr "Mensaje de commit vacío."
+
+#: builtin/merge.c:899
+#, c-format
+msgid "Wonderful.\n"
+msgstr "Maravilloso.\n"
+
+#: builtin/merge.c:960
+#, 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:999
+msgid "No current branch."
+msgstr "No rama actual."
+
+#: builtin/merge.c:1001
+msgid "No remote for the current branch."
+msgstr "No hay remoto para la rama actual."
+
+#: builtin/merge.c:1003
+msgid "No default upstream defined for the current branch."
+msgstr "Por defecto, no hay un upstream definido para la rama actual."
+
+#: builtin/merge.c:1008
+#, 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:1065
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "Valor erróneo '%s' en el entorno '%s'"
+
+#: builtin/merge.c:1168
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr "nada que podamos fusionar en %s: %s"
+
+#: builtin/merge.c:1202
+msgid "not something we can merge"
+msgstr "nada que podamos fusionar"
+
+#: builtin/merge.c:1312
+msgid "--abort expects no arguments"
+msgstr "--abort no espera argumentos"
+
+#: builtin/merge.c:1316
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr "No hay una fusión para abortar (falta MERGE_HEAD)"
+
+#: builtin/merge.c:1334
+msgid "--quit expects no arguments"
+msgstr "--quit no espera argumentos"
+
+#: builtin/merge.c:1347
+msgid "--continue expects no arguments"
+msgstr "--continue no espera argumentos"
+
+#: builtin/merge.c:1351
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr "No hay fusión en progreso (falta MERGE_HEAD)."
+
+#: builtin/merge.c:1367
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
+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:1374
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
+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:1377
+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:1391
+msgid "You cannot combine --squash with --no-ff."
+msgstr "No se puede combinar --squash con --no-ff."
+
+#: builtin/merge.c:1393
+msgid "You cannot combine --squash with --commit."
+msgstr "No se puede combinar --squash con --commit."
+
+#: builtin/merge.c:1409
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr ""
+"No hay commit especificado y merge.defaultToUpstream no está configurado."
+
+#: builtin/merge.c:1426
+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:1428
+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:1433
+#, c-format
+msgid "%s - not something we can merge"
+msgstr "%s - nada que podamos fusionar"
+
+#: builtin/merge.c:1435
+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:1516
+msgid "refusing to merge unrelated histories"
+msgstr "rehusando fusionar historias no relacionadas"
+
+#: builtin/merge.c:1525
+msgid "Already up to date."
+msgstr "Ya está actualizado."
+
+#: builtin/merge.c:1535
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr "Actualizando %s..%s\n"
+
+#: builtin/merge.c:1581
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr "Intentando fusión en índice realmente trivial...\n"
+
+#: builtin/merge.c:1588
+#, c-format
+msgid "Nope.\n"
+msgstr "Nop.\n"
+
+#: builtin/merge.c:1613
+msgid "Already up to date. Yeeah!"
+msgstr "Ya está actualizado. ¡Oh, yeaahh!"
+
+#: builtin/merge.c:1619
+msgid "Not possible to fast-forward, aborting."
+msgstr "No es posible hacer fast-forward, abortando."
+
+#: builtin/merge.c:1647 builtin/merge.c:1712
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr "Rebobinando el árbol a original...\n"
+
+#: builtin/merge.c:1651
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr "Intentando estrategia de fusión %s...\n"
+
+#: builtin/merge.c:1703
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr "Ninguna estrategia de fusión manejó la fusión.\n"
+
+#: builtin/merge.c:1705
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr "Fusionar con estrategia %s falló.\n"
+
+#: builtin/merge.c:1714
+#, 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:1728
+#, 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/mktag.c:10
+msgid "git mktag"
+msgstr "git mktag"
+
+#: builtin/mktag.c:30
+#, c-format
+msgid "warning: tag input does not pass fsck: %s"
+msgstr "peligro: información de tag no pasa fsck: %s"
+
+#: builtin/mktag.c:41
+#, c-format
+msgid "error: tag input does not pass fsck: %s"
+msgstr "error: valor de tag no pasa fsck: %s"
+
+#: builtin/mktag.c:44
+#, c-format
+msgid "%d (FSCK_IGNORE?) should never trigger this callback"
+msgstr "%d (FSCK_IGNORE?) nunca debería activar esta devolución de llamada"
+
+#: builtin/mktag.c:59
+#, c-format
+msgid "could not read tagged object '%s'"
+msgstr "no se pudo leer objeto de tag '%s'"
+
+#: builtin/mktag.c:62
+#, c-format
+msgid "object '%s' tagged as '%s', but is a '%s' type"
+msgstr "objeto '%s' es taggeado como '%s', pero es un tipo '%s'"
+
+#: builtin/mktag.c:99
+msgid "tag on stdin did not pass our strict fsck check"
+msgstr "etiqueta en stdin no pasó nuestro estricto control fsck"
+
+#: builtin/mktag.c:102
+msgid "tag on stdin did not refer to a valid object"
+msgstr "tag en stdin no se refería a un objeto válido"
+
+#: builtin/mktag.c:105 builtin/tag.c:232
+msgid "unable to write tag file"
+msgstr "incapaz de escribir el archivo de tag"
+
#: builtin/mktree.c:66
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
@@ -16515,7 +17786,10 @@
"durante el repack, recolectar los pack-files de tamaño menor en un batch que "
"es más grande que este tamaño"
-#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67
+#: builtin/multi-pack-index.c:50 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 builtin/prune-packed.c:25 builtin/tag.c:575
msgid "too many arguments"
msgstr "muchos argumentos"
@@ -16556,68 +17830,72 @@
msgid "skip move/rename errors"
msgstr "saltar errores de mover/renombrar"
-#: builtin/mv.c:169
+#: builtin/mv.c:170
#, c-format
msgid "destination '%s' is not a directory"
msgstr "destino '%s' no es un directorio"
-#: builtin/mv.c:180
+#: builtin/mv.c:181
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Revisando cambio de nombre de '%s' a '%s'\n"
-#: builtin/mv.c:184
+#: builtin/mv.c:185
msgid "bad source"
msgstr "mala fuente"
-#: builtin/mv.c:187
+#: builtin/mv.c:188
msgid "can not move directory into itself"
msgstr "no se pude mover un directorio en sí mismo"
-#: builtin/mv.c:190
+#: builtin/mv.c:191
msgid "cannot move directory over file"
msgstr "no se puede mover un directorio dentro de un archivo"
-#: builtin/mv.c:199
+#: builtin/mv.c:200
msgid "source directory is empty"
msgstr "directorio de fuente está vacío"
-#: builtin/mv.c:224
+#: builtin/mv.c:225
msgid "not under version control"
msgstr "no se encuentra bajo control de versión"
#: builtin/mv.c:227
+msgid "conflicted"
+msgstr "en conflicto"
+
+#: builtin/mv.c:230
msgid "destination exists"
msgstr "destino existe"
-#: builtin/mv.c:235
+#: builtin/mv.c:238
#, c-format
msgid "overwriting '%s'"
msgstr "sobrescribiendo '%s'"
-#: builtin/mv.c:238
+#: builtin/mv.c:241
msgid "Cannot overwrite"
msgstr "No se puede sobrescribir"
-#: builtin/mv.c:241
+#: builtin/mv.c:244
msgid "multiple sources for the same target"
msgstr "múltiples fuentes para el mismo objetivo"
-#: builtin/mv.c:243
+#: builtin/mv.c:246
msgid "destination directory does not exist"
msgstr "el directorio de destino no existe"
-#: builtin/mv.c:250
+#: builtin/mv.c:253
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, fuente=%s, destino=%s"
-#: builtin/mv.c:271
+#: builtin/mv.c:274
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Renombrando %s a %s\n"
-#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518
+#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:483
#, c-format
msgid "renaming '%s' failed"
msgstr "renombrando '%s' falló"
@@ -16635,8 +17913,8 @@
msgstr "git name-rev [<opciones>] --stdin"
#: builtin/name-rev.c:524
-msgid "print only names (no SHA-1)"
-msgstr "imprimir sólo nombres (sin SHA-1)"
+msgid "print only ref-based names (no object names)"
+msgstr "imprimir solo nombres basados en referencias (sin nombres de objetos)"
#: builtin/name-rev.c:525
msgid "only use tags to name the commits"
@@ -16811,7 +18089,7 @@
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:565
#, c-format
msgid "could not open or read '%s'"
msgstr "no se pudo abrir o leer '%s'"
@@ -16851,12 +18129,6 @@
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "rechazando %s notas en %s (fuera de refs/notes/)"
-#: 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:389 builtin/notes.c:678
#, c-format
msgid "no note found for object %s."
@@ -16914,8 +18186,8 @@
msgstr "cargar configuración de reescritura para <comando> (implica --stdin)"
#: builtin/notes.c:517
-msgid "too few parameters"
-msgstr "muy pocos parámetros"
+msgid "too few arguments"
+msgstr "muy pocos argumentos"
#: builtin/notes.c:538
#, c-format
@@ -17044,7 +18316,7 @@
"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:578
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Falló al resolver '%s' como una ref válida."
@@ -17062,7 +18334,7 @@
msgid "read object names from the standard input"
msgstr "leer nombres de objetos de standard input"
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148
msgid "do not remove, show only"
msgstr "no eliminar, solo mostrar"
@@ -17078,125 +18350,156 @@
msgid "use notes from <notes-ref>"
msgstr "usar notas desde <referencia-de-notas>"
-#: builtin/notes.c:1034 builtin/stash.c:1643
+#: builtin/notes.c:1034 builtin/stash.c:1671
#, c-format
msgid "unknown subcommand: %s"
msgstr "subcomando desconocido: %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 [<opciones>...] [< <lista-de-ref> | < <lista-de-"
"objetos>]"
-#: 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 [<opciones>...] <nombre-base> [< <lista-de-refs> | < <lista-"
"de-objetos>]"
-#: builtin/pack-objects.c:430
+#: builtin/pack-objects.c:440
+#, c-format
+msgid ""
+"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
+"pack %s"
+msgstr ""
+"write_reuse_object: no se pudo localizar %s, se esperaba en el "
+"desplazamiento %<PRIuMAX> en el paquete %s"
+
+#: builtin/pack-objects.c:448
#, c-format
msgid "bad packed object CRC for %s"
msgstr "mal paquete de objeto CRC para %s"
-#: builtin/pack-objects.c:441
+#: builtin/pack-objects.c:459
#, c-format
msgid "corrupt packed object for %s"
msgstr "objeto empaquetado corrupto para %s"
-#: builtin/pack-objects.c:572
+#: builtin/pack-objects.c:590
#, c-format
msgid "recursive delta detected for object %s"
msgstr "delta recursivo encontrado para objeto %s"
-#: builtin/pack-objects.c:783
+#: builtin/pack-objects.c:801
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "%u objetos ordenados, esperados %<PRIu32>"
-#: builtin/pack-objects.c:972
+#: builtin/pack-objects.c:896
+#, c-format
+msgid "expected object at offset %<PRIuMAX> in pack %s"
+msgstr "objeto esperado en el desplazamiento %<PRIuMAX> en el paquete %s"
+
+#: builtin/pack-objects.c:1015
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"deshabilitando escritura bitmap, paquetes son divididos debido a pack."
"packSizeLimit"
-#: builtin/pack-objects.c:985
+#: builtin/pack-objects.c:1028
msgid "Writing objects"
msgstr "Escribiendo objetos"
-#: builtin/pack-objects.c:1046 builtin/update-index.c:90
+#: builtin/pack-objects.c:1089 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "falló al iniciar %s"
-#: builtin/pack-objects.c:1099
+#: builtin/pack-objects.c:1141
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "%<PRIu32> objetos escritos mientras se esperaban %<PRIu32>"
-#: builtin/pack-objects.c:1297
+#: builtin/pack-objects.c:1358
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
"deshabilitando escritura bitmap, ya que algunos objetos no están siendo "
"empaquetados"
-#: builtin/pack-objects.c:1724
+#: builtin/pack-objects.c:1806
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "overflow de offset en la base de delta en paquete para %s"
-#: builtin/pack-objects.c:1733
+#: builtin/pack-objects.c:1815
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "outbound de offset en la base de delta para %s"
-#: builtin/pack-objects.c:2004
+#: builtin/pack-objects.c:2096
msgid "Counting objects"
msgstr "Contando objetos"
-#: builtin/pack-objects.c:2149
+#: builtin/pack-objects.c:2241
#, c-format
msgid "unable to parse object header of %s"
msgstr "incapaz de analizar header del objeto %s"
-#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235
-#: builtin/pack-objects.c:2245
+#: builtin/pack-objects.c:2311 builtin/pack-objects.c:2327
+#: builtin/pack-objects.c:2337
#, c-format
msgid "object %s cannot be read"
msgstr "objeto %s no puede ser leído"
-#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249
+#: builtin/pack-objects.c:2314 builtin/pack-objects.c:2341
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr ""
"objeto %s inconsistente con el largo del objeto (%<PRIuMAX> vs %<PRIuMAX>)"
-#: builtin/pack-objects.c:2259
+#: builtin/pack-objects.c:2351
msgid "suboptimal pack - out of memory"
msgstr "suboptimal pack - fuera de memoria"
-#: builtin/pack-objects.c:2574
+#: builtin/pack-objects.c:2666
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Compresión delta usando hasta %d hilos"
-#: builtin/pack-objects.c:2713
+#: builtin/pack-objects.c:2805
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "no es posible empaquetar objetos alcanzables desde tag %s"
-#: builtin/pack-objects.c:2801
+#: builtin/pack-objects.c:2891
msgid "Compressing objects"
msgstr "Comprimiendo objetos"
-#: builtin/pack-objects.c:2807
+#: builtin/pack-objects.c:2897
msgid "inconsistency with delta count"
msgstr "inconsistencia con la cuenta de delta"
-#: builtin/pack-objects.c:2888
+#: builtin/pack-objects.c:2976
+#, 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:2979
+#, 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:3008
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -17205,7 +18508,7 @@
"se espseraba ID de objeto al borde, se obtuvo basura:\n"
"%s"
-#: builtin/pack-objects.c:2894
+#: builtin/pack-objects.c:3014
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -17214,230 +18517,240 @@
"se esperaba ID de objeto, se obtuvo basuta:\n"
"%s"
-#: builtin/pack-objects.c:2992
+#: builtin/pack-objects.c:3112
msgid "invalid value for --missing"
msgstr "valor inválido para --missing"
-#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159
+#: builtin/pack-objects.c:3171 builtin/pack-objects.c:3279
msgid "cannot open pack index"
msgstr "no se puede abrir índice de paquetes"
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3202
#, c-format
msgid "loose object at %s could not be examined"
msgstr "objeto perdido en %s no pudo ser examinado"
-#: builtin/pack-objects.c:3167
+#: builtin/pack-objects.c:3287
msgid "unable to force loose object"
msgstr "incapaz de forzar un objeto perdido"
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3380
#, c-format
msgid "not a rev '%s'"
msgstr "no es una rev '%s'"
-#: builtin/pack-objects.c:3263
+#: builtin/pack-objects.c:3383
#, c-format
msgid "bad revision '%s'"
msgstr "mala revisión '%s'"
-#: builtin/pack-objects.c:3288
+#: builtin/pack-objects.c:3408
msgid "unable to add recent objects"
msgstr "incapaz de añadir objetos recientes"
-#: builtin/pack-objects.c:3341
+#: builtin/pack-objects.c:3461
#, c-format
msgid "unsupported index version %s"
msgstr "versión de índice no soportada %s"
-#: builtin/pack-objects.c:3345
+#: builtin/pack-objects.c:3465
#, c-format
msgid "bad index version '%s'"
msgstr "mala versión del índice '%s'"
-#: builtin/pack-objects.c:3383
+#: builtin/pack-objects.c:3503
msgid "<version>[,<offset>]"
msgstr "<versión>[,<offset>]"
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3504
msgid "write the pack index file in the specified idx format version"
msgstr ""
"escribir el índice de paquete en la versión de formato idx especificado"
-#: builtin/pack-objects.c:3387
+#: builtin/pack-objects.c:3507
msgid "maximum size of each output pack file"
msgstr "tamaño máximo de cada paquete resultante"
-#: builtin/pack-objects.c:3389
+#: builtin/pack-objects.c:3509
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorar objetos prestados de otros almacenes de objetos"
-#: builtin/pack-objects.c:3391
+#: builtin/pack-objects.c:3511
msgid "ignore packed objects"
msgstr "ignorar objetos paquete"
-#: builtin/pack-objects.c:3393
+#: builtin/pack-objects.c:3513
msgid "limit pack window by objects"
msgstr "limitar ventana de paquete por objetos"
-#: builtin/pack-objects.c:3395
+#: builtin/pack-objects.c:3515
msgid "limit pack window by memory in addition to object limit"
msgstr "limitar ventana de paquete por memoria en adición a límite de objetos"
-#: builtin/pack-objects.c:3397
+#: builtin/pack-objects.c:3517
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "longitud máxima de cadena delta permitida en el paquete resultante"
-#: builtin/pack-objects.c:3399
+#: builtin/pack-objects.c:3519
msgid "reuse existing deltas"
msgstr "reusar deltas existentes"
-#: builtin/pack-objects.c:3401
+#: builtin/pack-objects.c:3521
msgid "reuse existing objects"
msgstr "reutilizar objetos existentes"
-#: builtin/pack-objects.c:3403
+#: builtin/pack-objects.c:3523
msgid "use OFS_DELTA objects"
msgstr "usar objetos OFS_DELTA"
-#: builtin/pack-objects.c:3405
+#: builtin/pack-objects.c:3525
msgid "use threads when searching for best delta matches"
msgstr "usar hilos cuando se busque para mejores concordancias de delta"
-#: builtin/pack-objects.c:3407
+#: builtin/pack-objects.c:3527
msgid "do not create an empty pack output"
msgstr "no crear un paquete resultante vacío"
-#: builtin/pack-objects.c:3409
+#: builtin/pack-objects.c:3529
msgid "read revision arguments from standard input"
msgstr "leer argumentos de revisión de standard input"
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:3531
msgid "limit the objects to those that are not yet packed"
msgstr "limitar los objetos a aquellos que no han sido empaquetados todavía"
-#: builtin/pack-objects.c:3414
+#: builtin/pack-objects.c:3534
msgid "include objects reachable from any reference"
msgstr "incluir objetos alcanzables por cualquier referencia"
-#: builtin/pack-objects.c:3417
+#: builtin/pack-objects.c:3537
msgid "include objects referred by reflog entries"
msgstr "incluir objetos referidos por entradas de reflog"
-#: builtin/pack-objects.c:3420
+#: builtin/pack-objects.c:3540
msgid "include objects referred to by the index"
msgstr "incluir objetos referidos por el índice"
-#: builtin/pack-objects.c:3423
+#: builtin/pack-objects.c:3543
msgid "output pack to stdout"
msgstr "mostrar paquete en stdout"
-#: builtin/pack-objects.c:3425
+#: builtin/pack-objects.c:3545
msgid "include tag objects that refer to objects to be packed"
msgstr "incluir objetos tag que refieren a objetos a ser empaquetados"
-#: builtin/pack-objects.c:3427
+#: builtin/pack-objects.c:3547
msgid "keep unreachable objects"
msgstr "mantener objetos inalcanzables"
-#: builtin/pack-objects.c:3429
+#: builtin/pack-objects.c:3549
msgid "pack loose unreachable objects"
msgstr "empaquetar objetos sueltos inalcanzables"
-#: builtin/pack-objects.c:3431
+#: builtin/pack-objects.c:3551
msgid "unpack unreachable objects newer than <time>"
msgstr "desempaquetar objetos inalcanzables más nuevos que <tiempo>"
-#: builtin/pack-objects.c:3434
+#: builtin/pack-objects.c:3554
msgid "use the sparse reachability algorithm"
msgstr "usar el algoritmo sparse reachability"
-#: builtin/pack-objects.c:3436
+#: builtin/pack-objects.c:3556
msgid "create thin packs"
msgstr "crear paquetes delgados"
-#: builtin/pack-objects.c:3438
+#: builtin/pack-objects.c:3558
msgid "create packs suitable for shallow fetches"
msgstr "crear paquetes adecuados para fetches superficiales"
-#: builtin/pack-objects.c:3440
+#: builtin/pack-objects.c:3560
msgid "ignore packs that have companion .keep file"
msgstr "ignorar paquetes que tienen un archivo .keep acompañante"
-#: builtin/pack-objects.c:3442
+#: builtin/pack-objects.c:3562
msgid "ignore this pack"
msgstr "ignorar este paquete"
-#: builtin/pack-objects.c:3444
+#: builtin/pack-objects.c:3564
msgid "pack compression level"
msgstr "nivel de compresión del paquete"
-#: builtin/pack-objects.c:3446
+#: builtin/pack-objects.c:3566
msgid "do not hide commits by grafts"
msgstr "no ocultar commits por injertos"
-#: builtin/pack-objects.c:3448
+#: builtin/pack-objects.c:3568
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"usar un índice bitmap si está disponible para acelerar la cuenta de objetos"
-#: builtin/pack-objects.c:3450
+#: builtin/pack-objects.c:3570
msgid "write a bitmap index together with the pack index"
msgstr "escribir un índice de bitmap junto al índice de paquete"
-#: builtin/pack-objects.c:3454
+#: builtin/pack-objects.c:3574
msgid "write a bitmap index if possible"
msgstr "escribir un índice de bitmap si es posible"
-#: builtin/pack-objects.c:3458
+#: builtin/pack-objects.c:3578
msgid "handling for missing objects"
msgstr "manejo de objetos perdidos"
-#: builtin/pack-objects.c:3461
+#: builtin/pack-objects.c:3581
msgid "do not pack objects in promisor packfiles"
msgstr "no se puede empaquetar objetos en packfiles promisores"
-#: builtin/pack-objects.c:3463
+#: builtin/pack-objects.c:3583
msgid "respect islands during delta compression"
msgstr "respetar islas durante la compresión delta"
-#: builtin/pack-objects.c:3492
+#: builtin/pack-objects.c:3585
+msgid "protocol"
+msgstr "protocolo"
+
+#: builtin/pack-objects.c:3586
+msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
+msgstr ""
+"excluyendo cualquier uploadpack.blobpackfileuri configurado con este "
+"protocolo"
+
+#: builtin/pack-objects.c:3617
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "profundidad de cadena de delta %d es muy profunda, forzando %d"
-#: builtin/pack-objects.c:3497
+#: builtin/pack-objects.c:3622
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "pack.deltaCacheLimit es muy grande, forzando %d"
-#: builtin/pack-objects.c:3551
+#: builtin/pack-objects.c:3676
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
"--max-pack-size no puede ser usado para construir un paquete para "
"transferencia"
-#: builtin/pack-objects.c:3553
+#: builtin/pack-objects.c:3678
msgid "minimum pack size limit is 1 MiB"
msgstr "tamaño mínimo del paquete es 1 MiB"
-#: builtin/pack-objects.c:3558
+#: builtin/pack-objects.c:3683
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin no puede ser usado para construir un paquete indexable"
-#: builtin/pack-objects.c:3561
+#: builtin/pack-objects.c:3686
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable y --unpack-unreachable son incompatibles"
-#: builtin/pack-objects.c:3567
+#: builtin/pack-objects.c:3692
msgid "cannot use --filter without --stdout"
msgstr "no se puede usar--filter sin --stdout"
-#: builtin/pack-objects.c:3627
+#: builtin/pack-objects.c:3752
msgid "Enumerating objects"
msgstr "Enumerando objetos"
-#: builtin/pack-objects.c:3657
+#: builtin/pack-objects.c:3783
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -17446,6 +18759,20 @@
"Total %<PRIu32> (delta %<PRIu32>), reusado %<PRIu32> (delta %<PRIu32>), pack-"
"reusado %<PRIu32>"
+#: builtin/pack-redundant.c:601
+msgid ""
+"'git pack-redundant' is nominated for removal.\n"
+"If you still use this command, please add an extra\n"
+"option, '--i-still-use-this', on the command line\n"
+"and let us know you still use it by sending an e-mail\n"
+"to <git@vger.kernel.org>. Thanks.\n"
+msgstr ""
+"'git pack-redundant' está nominado para su eliminación.\n"
+"Si todavía usa este comando, agregue un extra\n"
+"opción, '--i-still-use-this', en la línea de comando\n"
+"y háganos saber que todavía lo usa enviando un correo electrónico\n"
+"a <git@vger.kernel.org>. Gracias.\n"
+
#: builtin/pack-refs.c:8
msgid "git pack-refs [<options>]"
msgstr "git pack-refs [<opciones>]"
@@ -17458,31 +18785,27 @@
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"
@@ -17496,56 +18819,56 @@
msgstr ""
"git pull [<opciones>] [<repositorio> [<especificación-de-referencia>...]]"
-#: builtin/pull.c:122
+#: builtin/pull.c:123
msgid "control for recursive fetching of submodules"
msgstr "control de fetch recursivo en submódulos"
-#: builtin/pull.c:126
+#: builtin/pull.c:127
msgid "Options related to merging"
msgstr "Opciones relacionadas a fusión"
-#: builtin/pull.c:129
+#: 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:157 builtin/rebase.c:471 builtin/revert.c:126
+#: builtin/pull.c:158 builtin/rebase.c:492 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "permitir fast-forward"
-#: builtin/pull.c:166
-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:182
+#: builtin/pull.c:183
msgid "Options related to fetching"
msgstr "Opciones relacionadas a fetch"
-#: builtin/pull.c:192
+#: builtin/pull.c:193
msgid "force overwrite of local branch"
msgstr "forzar sobrescritura de la rama local"
-#: builtin/pull.c:200
+#: 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:300
+#: builtin/pull.c:317
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Valor inválido para pull.ff: %s"
-#: builtin/pull.c:426
+#: builtin/pull.c:445
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr "No hay candidato para rebasar entre las refs que has bajado con fetch."
-#: builtin/pull.c:428
+#: builtin/pull.c:447
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"No hay candidatos para fusionar entre las refs que has bajado con fetch."
-#: builtin/pull.c:429
+#: builtin/pull.c:448
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -17554,7 +18877,7 @@
"tiene\n"
"concordancia en el final remoto."
-#: builtin/pull.c:432
+#: builtin/pull.c:451
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -17565,44 +18888,43 @@
"una rama. Porque este no es el remoto configurado por default\n"
"para tu rama actual, tienes que especificar una rama en la línea de comando."
-#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73
+#: builtin/pull.c:456 builtin/rebase.c:1253
msgid "You are not currently on a branch."
msgstr "No te encuentras actualmente en la rama."
-#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79
+#: builtin/pull.c:458 builtin/pull.c:473
msgid "Please specify which branch you want to rebase against."
msgstr "Por favor especifica a qué rama quieres rebasar."
-#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82
+#: builtin/pull.c:460 builtin/pull.c:475
msgid "Please specify which branch you want to merge with."
msgstr "Por favor especifica a qué rama quieres fusionar."
-#: builtin/pull.c:442 builtin/pull.c:457
+#: builtin/pull.c:461 builtin/pull.c:476
msgid "See git-pull(1) for details."
msgstr "Ver git-pull(1) para detalles."
-#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459
-#: builtin/rebase.c:1415 git-parse-remote.sh:64
+#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
+#: builtin/rebase.c:1259
msgid "<remote>"
msgstr "<remoto>"
-#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464
-#: git-parse-remote.sh:65
+#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
msgid "<branch>"
msgstr "<rama>"
-#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75
+#: builtin/pull.c:471 builtin/rebase.c:1251
msgid "There is no tracking information for the current branch."
msgstr "No hay información de rastreo para la rama actual."
-#: builtin/pull.c:461 git-parse-remote.sh:95
+#: builtin/pull.c:480
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Si deseas configurar el rastreo de información para esta rama, puedes "
"hacerlo con:"
-#: builtin/pull.c:466
+#: builtin/pull.c:485
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -17611,32 +18933,58 @@
"Tu configuración especifica fusionar con la ref '%s'\n"
"de tu remoto, pero no se pudo hacer fetch a esa ref."
-#: builtin/pull.c:576
+#: builtin/pull.c:596
#, c-format
msgid "unable to access commit %s"
msgstr "no es posible acceder al commit %s"
-#: builtin/pull.c:857
+#: builtin/pull.c:902
msgid "ignoring --verify-signatures for rebase"
msgstr "ignorando --verify-signatures para rebase"
-#: builtin/pull.c:912
-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:930
+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:920
+#: builtin/pull.c:991
msgid "Updating an unborn branch with changes added to the index."
msgstr "Actualizando una rama no nata con cambios agregados al índice."
-#: builtin/pull.c:924
+#: builtin/pull.c:995
msgid "pull with rebase"
msgstr "pull con rebase"
-#: builtin/pull.c:925
+#: builtin/pull.c:996
msgid "please commit or stash them."
msgstr "por favor realiza un commit o un stash con ellos."
-#: builtin/pull.c:950
+#: builtin/pull.c:1021
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -17647,7 +18995,7 @@
"realizando fast-forward al árbol de trabajo\n"
"desde commit %s."
-#: builtin/pull.c:956
+#: builtin/pull.c:1027
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -17664,15 +19012,15 @@
"$ git reset --hard\n"
"para recuperar."
-#: builtin/pull.c:971
+#: builtin/pull.c:1042
msgid "Cannot merge multiple branches into empty head."
msgstr "No se puede fusionar múltiples ramas en un head vacío."
-#: builtin/pull.c:975
+#: builtin/pull.c:1046
msgid "Cannot rebase onto multiple branches."
msgstr "No se puede rebasar en múltiples ramas."
-#: builtin/pull.c:982
+#: builtin/pull.c:1067
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"no se puede rebasar con modificaciones de submódulos grabadas localmente"
@@ -17682,15 +19030,15 @@
msgstr ""
"git push [<opciones>] [<repositorio> [<especificaciones-de-referencia>...]]"
-#: builtin/push.c:112
+#: builtin/push.c:111
msgid "tag shorthand without <tag>"
msgstr "taquigrafía de tag sin <tag>"
-#: builtin/push.c:122
+#: builtin/push.c:119
msgid "--delete only accepts plain target ref names"
msgstr "--delete solo acepta como objetivos nombres de ref planos"
-#: builtin/push.c:168
+#: builtin/push.c:164
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -17699,7 +19047,7 @@
"Para elegir si la opción es permanente, mira push.default en 'git help "
"config'."
-#: builtin/push.c:171
+#: builtin/push.c:167
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -17724,7 +19072,7 @@
" git push %s HEAD\n"
"%s"
-#: builtin/push.c:186
+#: builtin/push.c:182
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -17739,7 +19087,7 @@
"\n"
"\tgit push %s HEAD:<nombre-de-rama-remota>\n"
-#: builtin/push.c:200
+#: builtin/push.c:194
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -17753,12 +19101,12 @@
"\n"
"\tgit push --set-upstream %s %s\n"
-#: builtin/push.c:208
+#: builtin/push.c:202
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr "La rama actual %s tiene múltiples ramas upstream, rechazando el push."
-#: builtin/push.c:211
+#: builtin/push.c:205
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -17769,13 +19117,13 @@
"la rama actual '%s', sin decirme qué poner en el push\n"
"para actualizar en qué rama de remoto."
-#: builtin/push.c:270
+#: builtin/push.c:260
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
"No se especificó ningún refspecs para hacer push, y push.default es \"nada\"."
-#: builtin/push.c:277
+#: builtin/push.c: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"
@@ -17787,7 +19135,7 @@
"'git pull ...') antes de hacer push de nuevo.\n"
"Mira 'Note about fast-forwards' en 'git push --help' para más detalles."
-#: builtin/push.c:283
+#: builtin/push.c: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"
@@ -17800,7 +19148,7 @@
"(ejem. 'git pull ...') antes de volver a hacer push.\n"
"Vea las 'Notes about fast-forwards' en 'git push --help' para más detalles."
-#: builtin/push.c:289
+#: builtin/push.c: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"
@@ -17814,12 +19162,12 @@
"remotos (ej. 'git pull ...') antes de volver a hacer push.\n"
"Vea 'Notes about fast-forwards0 en 'git push --help' para detalles."
-#: builtin/push.c:296
+#: builtin/push.c:286
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
"Actualizaciones fueron rechazadas porque el tag ya existe en el remoto."
-#: builtin/push.c:299
+#: builtin/push.c: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"
@@ -17829,99 +19177,117 @@
"o actualizar un ref remoto para hacer que apunte a un objeto no-commit,\n"
"sin usar la opción '--force'.\n"
-#: builtin/push.c:360
+#: builtin/push.c:294
+msgid ""
+"Updates were rejected because the tip of the remote-tracking\n"
+"branch has been updated since the last checkout. You may want\n"
+"to integrate those changes locally (e.g., 'git pull ...')\n"
+"before forcing an update.\n"
+msgstr ""
+"Las actualizaciones se rechazaron porque la sugerencia del seguimiento "
+"remoto\n"
+"rama se ha actualizado desde la última vez que se realizó la compra. Es "
+"posible que desee\n"
+"para integrar esos cambios localmente (por ejemplo, 'git pull ...')\n"
+"antes de forzar una actualización.\n"
+
+#: builtin/push.c:364
#, c-format
msgid "Pushing to %s\n"
msgstr "Haciendo push a %s\n"
-#: builtin/push.c:367
+#: builtin/push.c:371
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "falló el push de algunas referencias a '%s'"
-#: builtin/push.c:542
+#: builtin/push.c:553
msgid "repository"
msgstr "repositorio"
-#: builtin/push.c:543 builtin/send-pack.c:164
+#: builtin/push.c:554 builtin/send-pack.c:189
msgid "push all refs"
msgstr "realizar push a todas las refs"
-#: builtin/push.c:544 builtin/send-pack.c:166
+#: builtin/push.c:555 builtin/send-pack.c:191
msgid "mirror all refs"
msgstr "realizar mirror a todas las refs"
-#: builtin/push.c:546
+#: builtin/push.c:557
msgid "delete refs"
msgstr "borrar refs"
-#: builtin/push.c:547
+#: builtin/push.c:558
msgid "push tags (can't be used with --all or --mirror)"
msgstr "realizar push a tags (no puede ser usado con --all o --mirror)"
-#: builtin/push.c:550 builtin/send-pack.c:167
+#: builtin/push.c:561 builtin/send-pack.c:192
msgid "force updates"
msgstr "forzar actualizaciones"
-#: builtin/push.c:552 builtin/send-pack.c:181
+#: builtin/push.c:562 builtin/send-pack.c:204
msgid "<refname>:<expect>"
msgstr "<refname>:<expect>"
-#: builtin/push.c:553 builtin/send-pack.c:182
+#: builtin/push.c:563 builtin/send-pack.c:205
msgid "require old value of ref to be at this value"
msgstr "requiere haber valor viejo de ref en este valor"
-#: builtin/push.c:556
+#: builtin/push.c:566 builtin/send-pack.c:208
+msgid "require remote updates to be integrated locally"
+msgstr "requieren que las actualizaciones remotas se integren localmente"
+
+#: builtin/push.c:569
msgid "control recursive pushing of submodules"
msgstr "controlar push recursivo de submódulos"
-#: builtin/push.c:558 builtin/send-pack.c:175
+#: builtin/push.c:570 builtin/send-pack.c:199
msgid "use thin pack"
msgstr "usar empaquetado delgado"
-#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161
-#: builtin/send-pack.c:162
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
+#: builtin/send-pack.c:187
msgid "receive pack program"
msgstr "recibir programa de paquete"
-#: builtin/push.c:561
+#: builtin/push.c:573
msgid "set upstream for git pull/status"
msgstr "configurar upstream para git pulll/status"
-#: builtin/push.c:564
+#: builtin/push.c:576
msgid "prune locally removed refs"
msgstr "recortando refs eliminadas localmente"
-#: builtin/push.c:566
+#: builtin/push.c:578
msgid "bypass pre-push hook"
msgstr "hacer un bypass al hook pre-push"
-#: builtin/push.c:567
+#: builtin/push.c:579
msgid "push missing but relevant tags"
msgstr "realizar push de tags faltantes pero relevantes"
-#: builtin/push.c:570 builtin/send-pack.c:169
+#: builtin/push.c:581 builtin/send-pack.c:193
msgid "GPG sign the push"
msgstr "Firmar con GPG el push"
-#: builtin/push.c:572 builtin/send-pack.c:176
+#: builtin/push.c:583 builtin/send-pack.c:200
msgid "request atomic transaction on remote side"
msgstr "solicitar transacción atómica en el lado remoto"
-#: builtin/push.c:590
+#: builtin/push.c:601
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete es incompatible con --all, --mirror y --tags"
-#: builtin/push.c:592
+#: builtin/push.c:603
msgid "--delete doesn't make sense without any refs"
msgstr "--delete no tiene sentido sin ninguna referencia"
-#: builtin/push.c:612
+#: builtin/push.c:623
#, c-format
msgid "bad repository '%s'"
msgstr "mal repositorio '%s'"
-#: builtin/push.c:613
+#: builtin/push.c:624
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -17943,70 +19309,78 @@
"\n"
" git push <nombre>\n"
-#: builtin/push.c:628
+#: builtin/push.c:639
msgid "--all and --tags are incompatible"
msgstr "--all y --tags son incompatibles"
-#: builtin/push.c:630
+#: builtin/push.c:641
msgid "--all can't be combined with refspecs"
msgstr "--all no puede ser combinada con refspecs"
-#: builtin/push.c:634
+#: builtin/push.c:645
msgid "--mirror and --tags are incompatible"
msgstr "--mirror y --tags son incompatibles"
-#: builtin/push.c:636
+#: builtin/push.c:647
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror no puede ser combinado con refspecs"
-#: builtin/push.c:639
+#: builtin/push.c:650
msgid "--all and --mirror are incompatible"
msgstr "--all y --mirror son incompatibles"
-#: builtin/push.c:643
+#: builtin/push.c:657
msgid "push options must not have new line characters"
msgstr "opciones de push no pueden tener caracteres de línea nueva"
-#: builtin/range-diff.c:8
+#: builtin/range-diff.c:9
msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
msgstr ""
"git range-diff [<opciones>] <base-vieja>..<punta-vieja> <base-nueva>..<punta-"
"nueva>"
-#: builtin/range-diff.c:9
+#: builtin/range-diff.c:10
msgid "git range-diff [<options>] <old-tip>...<new-tip>"
msgstr "git range-diff [<opciones>] <punta-vieja>...<punta-nueva>"
-#: builtin/range-diff.c:10
+#: builtin/range-diff.c:11
msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
msgstr "git range-diff [<opciones>] <base> <punta-vieja> <punta-nueva>"
-#: builtin/range-diff.c:22
+#: builtin/range-diff.c:28
msgid "Percentage by which creation is weighted"
msgstr "Porcentaje por el cual la creación es pesada"
-#: builtin/range-diff.c:24
+#: builtin/range-diff.c:30
msgid "use simple diff colors"
msgstr "usar colores simples de diff"
-#: builtin/range-diff.c:26
+#: builtin/range-diff.c:32
msgid "notes"
msgstr "notas"
-#: builtin/range-diff.c:26
+#: builtin/range-diff.c:32
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:35
+msgid "only emit output related to the first range"
+msgstr "solo emite salida relacionada con el primer rango"
-#: builtin/range-diff.c:64
+#: builtin/range-diff.c:37
+msgid "only emit output related to the second range"
+msgstr "solo emite salida relacionada con el segundo rango"
+
+#: builtin/range-diff.c:60 builtin/range-diff.c:64
+#, c-format
+msgid "not a commit range: '%s'"
+msgstr "no es un rango de commit: '%s'"
+
+#: builtin/range-diff.c:74
msgid "single arg format must be symmetric range"
msgstr "argumento único de formato debe ser un rango simétrico"
-#: builtin/range-diff.c:79
+#: builtin/range-diff.c:89
msgid "need two commit ranges"
msgstr "se necesitan dos rangos de commits"
@@ -18093,7 +19467,7 @@
msgid "You need to resolve your current index first"
msgstr "Necesitas resolver tu índice actual primero"
-#: builtin/rebase.c:32
+#: builtin/rebase.c:35
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
"[<upstream> [<branch>]]"
@@ -18101,217 +19475,203 @@
"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:175 builtin/rebase.c:199 builtin/rebase.c:226
+#: builtin/rebase.c:195 builtin/rebase.c:219 builtin/rebase.c:246
#, c-format
msgid "unusable todo list: '%s'"
msgstr "lista de pendientes inutilizable: '%s'"
-#: builtin/rebase.c:292
+#: builtin/rebase.c:312
#, c-format
msgid "could not create temporary %s"
msgstr "no se pudo crear archivo temporal %s"
-#: builtin/rebase.c:298
+#: builtin/rebase.c:318
msgid "could not mark as interactive"
msgstr "no se pudo marcar como interactivo"
-#: builtin/rebase.c:352
+#: builtin/rebase.c:371
msgid "could not generate todo list"
msgstr "no se pudo generar lista de pendientes"
-#: builtin/rebase.c:391
+#: builtin/rebase.c:413
msgid "a base commit must be provided with --upstream or --onto"
msgstr "un commit base tiene que ser provisto con --upstream o --onto"
-#: builtin/rebase.c:461
+#: builtin/rebase.c:482
msgid "git rebase--interactive [<options>]"
msgstr "git rebase--interactive [<opciones>]"
-#: builtin/rebase.c:474 builtin/rebase.c:1550
-msgid "(DEPRECATED) keep empty commits"
-msgstr "(DEPRECADO) mantener commits vacíos"
+#: builtin/rebase.c:495 builtin/rebase.c:1394
+msgid "keep commits which start empty"
+msgstr "mantener commits que comienzan con vacío"
-#: builtin/rebase.c:478 builtin/revert.c:128
+#: builtin/rebase.c:499 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr "permitir commits con mensajes vacíos"
-#: builtin/rebase.c:480
+#: builtin/rebase.c:501
msgid "rebase merge commits"
msgstr "rebasando commits de fusión"
-#: builtin/rebase.c:482
+#: builtin/rebase.c:503
msgid "keep original branch points of cousins"
msgstr "mantener puntos originales de la rama de sus primos"
-#: builtin/rebase.c:484
+#: builtin/rebase.c:505
msgid "move commits that begin with squash!/fixup!"
msgstr "mover commits que comienzan con squash!/fixup!"
-#: builtin/rebase.c:485
+#: builtin/rebase.c:506
msgid "sign commits"
msgstr "firmar commits"
-#: builtin/rebase.c:487 builtin/rebase.c:1490
+#: builtin/rebase.c:508 builtin/rebase.c:1333
msgid "display a diffstat of what changed upstream"
msgstr "mostrar un diffstat de lo que cambió en upstream"
-#: builtin/rebase.c:489
+#: builtin/rebase.c:510
msgid "continue rebase"
msgstr "continuar rebase"
-#: builtin/rebase.c:491
+#: builtin/rebase.c:512
msgid "skip commit"
msgstr "saltar commit"
-#: builtin/rebase.c:492
+#: builtin/rebase.c:513
msgid "edit the todo list"
msgstr "editar la lista de pendientes"
-#: builtin/rebase.c:494
+#: builtin/rebase.c:515
msgid "show the current patch"
msgstr "mostrar el parche actual"
-#: builtin/rebase.c:497
+#: builtin/rebase.c:518
msgid "shorten commit ids in the todo list"
msgstr "ids de commits cortos en la lista de pendientes"
-#: builtin/rebase.c:499
+#: builtin/rebase.c:520
msgid "expand commit ids in the todo list"
msgstr "expandir ids de commits en la lista de pendientes"
-#: builtin/rebase.c:501
+#: builtin/rebase.c:522
msgid "check the todo list"
msgstr "revisar la lista de pendientes"
-#: builtin/rebase.c:503
+#: builtin/rebase.c:524
msgid "rearrange fixup/squash lines"
msgstr "reorganizar líneas fixup/squash"
-#: builtin/rebase.c:505
+#: builtin/rebase.c:526
msgid "insert exec commands in todo list"
msgstr "insertar comando exec en la lista de pendientes"
-#: builtin/rebase.c:506
+#: builtin/rebase.c:527
msgid "onto"
msgstr "hacia"
-#: builtin/rebase.c:509
+#: builtin/rebase.c:530
msgid "restrict-revision"
msgstr "restrict-revision"
-#: builtin/rebase.c:509
+#: builtin/rebase.c:530
msgid "restrict revision"
msgstr "restringir revision"
-#: builtin/rebase.c:511
+#: builtin/rebase.c:532
msgid "squash-onto"
msgstr "squash-onto"
-#: builtin/rebase.c:512
+#: builtin/rebase.c:533
msgid "squash onto"
msgstr "squash hacia"
-#: builtin/rebase.c:514
+#: builtin/rebase.c:535
msgid "the upstream commit"
msgstr "el commit de upstream"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:537
msgid "head-name"
msgstr "head-name"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:537
msgid "head name"
msgstr "nombre de head"
-#: builtin/rebase.c:521
+#: builtin/rebase.c:542
msgid "rebase strategy"
msgstr "estrategia de rebase"
-#: builtin/rebase.c:522
+#: builtin/rebase.c:543
msgid "strategy-opts"
msgstr "strategy-opts"
-#: builtin/rebase.c:523
+#: builtin/rebase.c:544
msgid "strategy options"
msgstr "opciones de estrategia"
-#: builtin/rebase.c:524
+#: builtin/rebase.c:545
msgid "switch-to"
msgstr "cambiar a"
-#: builtin/rebase.c:525
+#: builtin/rebase.c:546
msgid "the branch or commit to checkout"
msgstr "la rama o commit para hacer checkout"
-#: builtin/rebase.c:526
+#: builtin/rebase.c:547
msgid "onto-name"
msgstr "hacia-nombre"
-#: builtin/rebase.c:526
+#: builtin/rebase.c:547
msgid "onto name"
msgstr "hacia nombre"
-#: builtin/rebase.c:527
+#: builtin/rebase.c:548
msgid "cmd"
msgstr "cmd"
-#: builtin/rebase.c:527
+#: builtin/rebase.c:548
msgid "the command to run"
msgstr "el comando para ejecutar"
-#: builtin/rebase.c:530 builtin/rebase.c:1584
+#: builtin/rebase.c:551 builtin/rebase.c:1427
msgid "automatically re-schedule any `exec` that fails"
msgstr "reprogramar automaticamente cualquier `exec` que falle"
-#: builtin/rebase.c:546
+#: builtin/rebase.c:567
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr "--[no-]rebase-cousins no tiene efecto sin --rebase-merges"
-#: builtin/rebase.c:562
+#: builtin/rebase.c:583
#, 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:612
+#: builtin/rebase.c:626
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "no se pudo conseguir 'onto': '%s'"
-#: builtin/rebase.c:627
+#: builtin/rebase.c:643
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "orig-head inválido: '%s'"
-#: builtin/rebase.c:652
+#: builtin/rebase.c:668
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "ignorando inválido allow_rerere_autoupdate: '%s'"
-#: builtin/rebase.c:728
-#, c-format
-msgid "Could not read '%s'"
-msgstr "No se pudo leer '%s'"
-
-#: builtin/rebase.c:746
-#, c-format
-msgid "Cannot store %s"
-msgstr "No se puede guardar %s"
-
-#: builtin/rebase.c:853
-msgid "could not determine HEAD revision"
-msgstr "no se pudo determinar revisión HEAD"
-
-#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -18326,7 +19686,7 @@
"Para abortar y regresar al estado previo al \"git rebase\", ejecuta \"git "
"rebase --abort\"."
-#: builtin/rebase.c:1058
+#: builtin/rebase.c:896
#, c-format
msgid ""
"\n"
@@ -18345,7 +19705,7 @@
"\n"
"Como resultado, git no puede hacer rebase con ellos."
-#: builtin/rebase.c:1383
+#: builtin/rebase.c:1227
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -18354,7 +19714,7 @@
"tipo '%s' vacío y desconocido; valores válidos son \"drop\", \"keep\", y "
"\"ask\"."
-#: builtin/rebase.c:1401
+#: builtin/rebase.c:1245
#, c-format
msgid ""
"%s\n"
@@ -18371,7 +19731,7 @@
" git rebase '<rama>'\n"
"\n"
-#: builtin/rebase.c:1417
+#: builtin/rebase.c:1261
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -18384,135 +19744,149 @@
" git branch --set-upstream-to=%s/<rama> %s\n"
"\n"
-#: builtin/rebase.c:1447
+#: builtin/rebase.c:1291
msgid "exec commands cannot contain newlines"
msgstr "comandos exec no pueden contener newlines"
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1295
msgid "empty exec command"
msgstr "comando exec vacío"
-#: builtin/rebase.c:1481
+#: builtin/rebase.c:1324
msgid "rebase onto given branch instead of upstream"
msgstr "haciendo rebase hacia rama dada en lugar de upstream"
-#: builtin/rebase.c:1483
+#: builtin/rebase.c:1326
msgid "use the merge-base of upstream and branch as the current base"
msgstr "usar la base de fusión de upstream y la rama como base actual"
-#: builtin/rebase.c:1485
+#: builtin/rebase.c:1328
msgid "allow pre-rebase hook to run"
msgstr "permitir ejecutar hook pre-rebase"
-#: builtin/rebase.c:1487
+#: builtin/rebase.c:1330
msgid "be quiet. implies --no-stat"
msgstr "ser silencioso implica --no-stat"
-#: builtin/rebase.c:1493
+#: builtin/rebase.c:1336
msgid "do not show diffstat of what changed upstream"
msgstr "no mostrar un diffstat de lo que cambió en upstream"
-#: builtin/rebase.c:1496
-msgid "add a Signed-off-by: line to each commit"
+#: builtin/rebase.c:1339
+msgid "add a Signed-off-by trailer to each commit"
msgstr "agregar una línea \"Firmado-por\" al mensaje de cada commit"
-#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504
-msgid "passed to 'git am'"
-msgstr "pasado a 'git am'"
+#: builtin/rebase.c:1342
+msgid "make committer date match author date"
+msgstr "hacer que la fecha del commit concuerde con la fecha de autoría"
-#: builtin/rebase.c:1506 builtin/rebase.c:1508
+#: builtin/rebase.c:1344
+msgid "ignore author date and use current date"
+msgstr "ignorar la fecha del autor y usar la fecha actual"
+
+#: builtin/rebase.c:1346
+msgid "synonym of --reset-author-date"
+msgstr "sinónimo para --reset-author-date"
+
+#: builtin/rebase.c:1348 builtin/rebase.c:1352
msgid "passed to 'git apply'"
msgstr "pasado a 'git-apply'"
-#: builtin/rebase.c:1510 builtin/rebase.c:1513
+#: builtin/rebase.c:1350
+msgid "ignore changes in whitespace"
+msgstr "ignorar cambios en espacios en blanco"
+
+#: builtin/rebase.c:1354 builtin/rebase.c:1357
msgid "cherry-pick all commits, even if unchanged"
msgstr "cherry-pick todos los commits, incluso si no han cambiado"
-#: builtin/rebase.c:1515
+#: builtin/rebase.c:1359
msgid "continue"
msgstr "continuar"
-#: builtin/rebase.c:1518
+#: builtin/rebase.c:1362
msgid "skip current patch and continue"
msgstr "saltar el parche y continuar"
-#: builtin/rebase.c:1520
+#: builtin/rebase.c:1364
msgid "abort and check out the original branch"
msgstr "aborta y revisa la rama original"
-#: builtin/rebase.c:1523
+#: builtin/rebase.c:1367
msgid "abort but keep HEAD where it is"
msgstr "aborta pero mantiene HEAD donde está"
-#: builtin/rebase.c:1524
+#: builtin/rebase.c:1368
msgid "edit the todo list during an interactive rebase"
msgstr "editar la lista de pendientes durante el rebase interactivo"
-#: builtin/rebase.c:1527
+#: builtin/rebase.c:1371
msgid "show the patch file being applied or merged"
msgstr "muestra el archivo parche siendo aplicado o fusionado"
-#: builtin/rebase.c:1530
+#: builtin/rebase.c:1374
msgid "use apply strategies to rebase"
msgstr "usar estrategias de apply para el rebase"
-#: builtin/rebase.c:1534
+#: builtin/rebase.c:1378
msgid "use merging strategies to rebase"
msgstr "usar estrategias de fusión para el rebase"
-#: builtin/rebase.c:1538
+#: builtin/rebase.c:1382
msgid "let the user edit the list of commits to rebase"
msgstr "permitir al usuario editar la lista de commits para rebasar"
-#: builtin/rebase.c:1542
+#: builtin/rebase.c:1386
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "(DEPRECADO) intentar recrear merges en lugar de ignorarlos"
-#: builtin/rebase.c:1547
+#: builtin/rebase.c:1391
msgid "how to handle commits that become empty"
msgstr "como manejar commits que se vuelven vacíos"
-#: builtin/rebase.c:1554
+#: builtin/rebase.c:1398
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "mover commits que comienzan con squash!/fixup! bajo -i"
-#: builtin/rebase.c:1560
-msgid "automatically stash/stash pop before and after"
-msgstr "ejecutar automáticamente stash/stash pop antes y después"
-
-#: builtin/rebase.c:1562
+#: builtin/rebase.c:1405
msgid "add exec lines after each commit of the editable list"
msgstr "agregar líneas exec tras cada acommit de la lista editable"
-#: builtin/rebase.c:1566
+#: builtin/rebase.c:1409
msgid "allow rebasing commits with empty messages"
msgstr "permitir rebase commits con mensajes vacíos"
-#: builtin/rebase.c:1570
+#: builtin/rebase.c:1413
msgid "try to rebase merges instead of skipping them"
msgstr "intentar fusiones por rebase en lugar de saltarlas"
-#: builtin/rebase.c:1573
+#: builtin/rebase.c:1416
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "use 'merge-base --fork-point' para refinar upstream"
-#: builtin/rebase.c:1575
+#: builtin/rebase.c:1418
msgid "use the given merge strategy"
msgstr "usar la estrategia de merge dada"
-#: builtin/rebase.c:1577 builtin/revert.c:115
+#: builtin/rebase.c:1420 builtin/revert.c:115
msgid "option"
msgstr "opción"
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1421
msgid "pass the argument through to the merge strategy"
msgstr "pasar el argumento para la estrategia de fusión"
-#: builtin/rebase.c:1581
+#: builtin/rebase.c:1424
msgid "rebase all reachable commits up to the root(s)"
msgstr "hacer rebase a todos los commits alcanzables hasta la raíz(raíces)"
-#: builtin/rebase.c:1598
+#: builtin/rebase.c:1429
+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:1446
msgid ""
"the rebase.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
@@ -18520,38 +19894,42 @@
"el soporte para rebase.useBuiltin ha sido eliminado!\n"
"Vea su entrada en 'git help config' para detalles."
-#: builtin/rebase.c:1604
+#: builtin/rebase.c:1452
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "Parece que 'git am' está en progreso. No se puede rebasar."
-#: builtin/rebase.c:1645
+#: builtin/rebase.c:1493
msgid ""
"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr ""
"git rebase --preserve-merges está deprecado. Use --rebase-merges en su lugar."
-#: builtin/rebase.c:1650
+#: builtin/rebase.c:1498
msgid "cannot combine '--keep-base' with '--onto'"
msgstr "no se puede combinar '--keep-base' con '--onto'"
-#: builtin/rebase.c:1652
+#: builtin/rebase.c:1500
msgid "cannot combine '--keep-base' with '--root'"
msgstr "no se puede combinar '--keep-base' con '--root'"
-#: builtin/rebase.c:1656
+#: builtin/rebase.c:1504
+msgid "cannot combine '--root' with '--fork-point'"
+msgstr "no se puede combinar '--root' con '--fork-point'"
+
+#: builtin/rebase.c:1507
msgid "No rebase in progress?"
msgstr "¿No hay rebase en progreso?"
-#: builtin/rebase.c:1660
+#: builtin/rebase.c:1511
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"La acción --edit-todo sólo puede ser usada al rebasar interactivamente."
-#: builtin/rebase.c:1683
+#: builtin/rebase.c:1534 t/helper/test-fast-rebase.c:123
msgid "Cannot read HEAD"
msgstr "No se puede leer el HEAD"
-#: builtin/rebase.c:1695
+#: builtin/rebase.c:1546
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -18559,16 +19937,16 @@
"Tienes que editar todos los conflictos de fusión y luego\n"
"marcarlos como resueltos usando git add"
-#: builtin/rebase.c:1714
+#: builtin/rebase.c:1565
msgid "could not discard worktree changes"
msgstr "no se pudo descartar los cambios del árbol de trabajo"
-#: builtin/rebase.c:1733
+#: builtin/rebase.c:1584
#, c-format
msgid "could not move back to %s"
msgstr "no se puede regresar a %s"
-#: builtin/rebase.c:1778
+#: builtin/rebase.c:1630
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -18589,167 +19967,144 @@
"y ejecútame nuevamente. Me estoy deteniendo en caso de que tengas\n"
"algo de valor ahí.\n"
-#: builtin/rebase.c:1806
+#: builtin/rebase.c:1658
msgid "switch `C' expects a numerical value"
msgstr "switch `C' espera un valor numérico"
-#: builtin/rebase.c:1847
+#: builtin/rebase.c:1700
#, c-format
msgid "Unknown mode: %s"
msgstr "Modo desconocido: %s"
-#: builtin/rebase.c:1869
+#: builtin/rebase.c:1739
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy requiere --merge o --interactive"
-#: builtin/rebase.c:1899
+#: builtin/rebase.c:1769
msgid "cannot combine apply options with merge options"
msgstr "no se pueden combinar opciones de apply con opciones de merge"
-#: builtin/rebase.c:1912
+#: builtin/rebase.c:1782
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "Backend de rebase desconocido: %s"
-#: builtin/rebase.c:1937
+#: builtin/rebase.c:1812
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec requiere --exec o --interactive"
-#: builtin/rebase.c:1957
+#: builtin/rebase.c:1832
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr "no se puede combinar '--preserve-merges' con '--rebase-merges'"
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1836
msgid ""
"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
"error: no se puede combinar '--preserve-merges' con '--reschedule-failed-"
"exec'"
-#: builtin/rebase.c:1985
+#: builtin/rebase.c:1860
#, c-format
msgid "invalid upstream '%s'"
msgstr "upstream inválido '%s'"
-#: builtin/rebase.c:1991
+#: builtin/rebase.c:1866
msgid "Could not create new root commit"
msgstr "No se pudo crear commit raíz nuevo"
-#: builtin/rebase.c:2017
+#: builtin/rebase.c:1892
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "'%s': necesita exactamente una base de fusión con rama"
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1895
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s': necesita exactamente una base de fusión"
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1903
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "No apunta a un commit válido '%s'"
-#: builtin/rebase.c:2054
+#: builtin/rebase.c:1931
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "fatal: no existe la rama/commit: '%s'"
-#: builtin/rebase.c:2062 builtin/submodule--helper.c:40
-#: builtin/submodule--helper.c:1990
+#: builtin/rebase.c:1939 builtin/submodule--helper.c:40
+#: builtin/submodule--helper.c:2414
#, c-format
msgid "No such ref: %s"
msgstr "No existe ref: %s"
-#: builtin/rebase.c:2073
+#: builtin/rebase.c:1950
msgid "Could not resolve HEAD to a revision"
msgstr "No se pudo resolver HEAD a una revisión"
-#: builtin/rebase.c:2111
-msgid "Cannot autostash"
-msgstr "No se puede ejecutar autostash"
-
-#: builtin/rebase.c:2114
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr "Respuesta de stash inesperada: '%s'"
-
-#: builtin/rebase.c:2120
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr "No se pudo crear el directorio para '%s'"
-
-#: builtin/rebase.c:2123
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr "Autostash creado: %s\n"
-
-#: builtin/rebase.c:2126
-msgid "could not reset --hard"
-msgstr "no se pudo reset --hard"
-
-#: builtin/rebase.c:2135
+#: builtin/rebase.c:1971
msgid "Please commit or stash them."
msgstr "Por favor, confírmalos o guárdalos."
-#: builtin/rebase.c:2169
+#: builtin/rebase.c:2007
#, c-format
msgid "could not switch to %s"
msgstr "no se pudo cambiar a %s"
-#: builtin/rebase.c:2180
+#: builtin/rebase.c:2018
msgid "HEAD is up to date."
msgstr "HEAD está actualizado."
-#: builtin/rebase.c:2182
+#: builtin/rebase.c:2020
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "La rama actual %s está actualizada.\n"
-#: builtin/rebase.c:2190
+#: builtin/rebase.c:2028
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD está actualizado, rebase forzado."
-#: builtin/rebase.c:2192
+#: builtin/rebase.c:2030
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "Rama actual %s está actualizada, rebase forzado.\n"
-#: builtin/rebase.c:2200
+#: builtin/rebase.c:2038
msgid "The pre-rebase hook refused to rebase."
msgstr "El hook pre-rebase rechazó el rebase."
-#: builtin/rebase.c:2207
+#: builtin/rebase.c:2045
#, c-format
msgid "Changes to %s:\n"
msgstr "Cambios a %s:\n"
-#: builtin/rebase.c:2210
+#: builtin/rebase.c:2048
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Cambios desde %s a %s:\n"
-#: builtin/rebase.c:2235
+#: builtin/rebase.c:2073
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"En primer lugar, rebobinando HEAD para después reproducir tus cambios encima "
"de ésta...\n"
-#: builtin/rebase.c:2244
+#: builtin/rebase.c:2082
msgid "Could not detach HEAD"
msgstr "No se puede desacoplar HEAD"
-#: builtin/rebase.c:2253
+#: builtin/rebase.c:2091
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Avance rápido de %s a %s.\n"
-#: builtin/receive-pack.c:33
+#: builtin/receive-pack.c:34
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-dir>"
-#: builtin/receive-pack.c:821
+#: builtin/receive-pack.c:1276
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"
@@ -18782,7 +20137,7 @@
"Para suprimir este mensaje y mantener el comportamiento predeterminado,\n"
"configura 'receive.denyCurrentBranch' a 'refuse'."
-#: builtin/receive-pack.c:841
+#: builtin/receive-pack.c:1296
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"
@@ -18803,11 +20158,11 @@
"\n"
"Para suprimir este mensaje, puedes configurarlo en 'refuse'."
-#: builtin/receive-pack.c:1938
+#: builtin/receive-pack.c:2481
msgid "quiet"
msgstr "tranquilo"
-#: builtin/receive-pack.c:1952
+#: builtin/receive-pack.c:2495
msgid "You must specify a directory."
msgstr "Se tiene que especificar un directorio."
@@ -18838,36 +20193,36 @@
msgid "'%s' is not a valid timestamp"
msgstr "'%s' no es una marca de tiempo válida"
-#: builtin/reflog.c:606
+#: builtin/reflog.c:609
#, c-format
msgid "Marking reachable objects..."
msgstr "Marcando objectos alcanzables..."
-#: builtin/reflog.c:644
+#: builtin/reflog.c:647
#, c-format
msgid "%s points nowhere!"
msgstr "¡%s apunta a ningún lado!"
-#: builtin/reflog.c:696
+#: builtin/reflog.c:699
msgid "no reflog specified to delete"
msgstr "no reflog especificado para borrar"
-#: builtin/reflog.c:705
+#: builtin/reflog.c:708
#, c-format
msgid "not a reflog: %s"
msgstr "no es una reflog: %s"
-#: builtin/reflog.c:710
+#: builtin/reflog.c:713
#, c-format
msgid "no reflog for '%s'"
msgstr "no reflog para '%s'"
-#: builtin/reflog.c:756
+#: builtin/reflog.c:759
#, c-format
msgid "invalid ref format: %s"
msgstr "formato inválido: %s"
-#: builtin/reflog.c:765
+#: builtin/reflog.c:768
msgid "git reflog [ show | expire | delete | exists ]"
msgstr "git reflog [ show | expire | delete | exists ]"
@@ -19005,40 +20360,35 @@
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "especificar ramas para rastrear solo tiene sentido con fetch mirrors"
-#: builtin/remote.c:195 builtin/remote.c:696
+#: builtin/remote.c:195 builtin/remote.c:700
#, c-format
msgid "remote %s already exists."
msgstr "remoto %s ya existe."
-#: 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:239
+#: builtin/remote.c:240
#, c-format
msgid "Could not setup master '%s'"
msgstr "No se pudo configurar master '%s'"
-#: builtin/remote.c:354
+#: builtin/remote.c:355
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "No se pudo realizar el fetch al mapa para refspec %s"
-#: builtin/remote.c:453 builtin/remote.c:461
+#: builtin/remote.c:454 builtin/remote.c:462
msgid "(matching)"
msgstr "(concordando)"
-#: builtin/remote.c:465
+#: builtin/remote.c:466
msgid "(delete)"
msgstr "(eliminar)"
-#: builtin/remote.c:653
+#: builtin/remote.c:655
#, c-format
msgid "could not set '%s'"
msgstr "no se pudo configurar '%s'"
-#: builtin/remote.c:658
+#: builtin/remote.c:660
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
@@ -19049,17 +20399,17 @@
"\t%s:%d\n"
"ahora nombra al remoto inexistente '%s'"
-#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940
+#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946
#, c-format
msgid "No such remote: '%s'"
msgstr "No existe el remoto '%s'"
-#: builtin/remote.c:706
+#: builtin/remote.c:710
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "No se pudo renombrar la sección de configuración '%s' a '%s'"
-#: builtin/remote.c:726
+#: builtin/remote.c:730
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -19070,17 +20420,17 @@
"\t%s\n"
"\tPor favor actualice la configuración manualmente si es necesario."
-#: builtin/remote.c:766
+#: builtin/remote.c:770
#, c-format
msgid "deleting '%s' failed"
msgstr "borrando '%s' falló"
-#: builtin/remote.c:800
+#: builtin/remote.c:804
#, c-format
msgid "creating '%s' failed"
msgstr "creando '%s' falló"
-#: builtin/remote.c:876
+#: builtin/remote.c:882
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -19095,118 +20445,118 @@
"eliminadas;\n"
"para borrarlas, use:"
-#: builtin/remote.c:890
+#: builtin/remote.c:896
#, c-format
msgid "Could not remove config section '%s'"
msgstr "No se pudo borrar la sección de configuración '%s'"
-#: builtin/remote.c:993
+#: builtin/remote.c:999
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " nuevo (siguiente fetch se guardará en remotes/%s)"
-#: builtin/remote.c:996
+#: builtin/remote.c:1002
msgid " tracked"
msgstr " rastreada"
-#: builtin/remote.c:998
+#: builtin/remote.c:1004
msgid " stale (use 'git remote prune' to remove)"
msgstr " viejo ( use 'git remote prune' para eliminar)"
-#: builtin/remote.c:1000
+#: builtin/remote.c:1006
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:1041
+#: builtin/remote.c:1047
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "inválido branch.%s.merge; no se puede rebasar en > 1 rama"
-#: builtin/remote.c:1050
+#: builtin/remote.c:1056
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "rebasa interactivamente en remoto %s"
-#: builtin/remote.c:1052
+#: builtin/remote.c:1058
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr "rebasa interactivamente (con fusiones) en remoto %s"
-#: builtin/remote.c:1055
+#: builtin/remote.c:1061
#, c-format
msgid "rebases onto remote %s"
msgstr "rebasa sobre el remoto %s"
-#: builtin/remote.c:1059
+#: builtin/remote.c:1065
#, c-format
msgid " merges with remote %s"
msgstr " se fusiona con remoto %s"
-#: builtin/remote.c:1062
+#: builtin/remote.c:1068
#, c-format
msgid "merges with remote %s"
msgstr "fusiona con remoto %s"
-#: builtin/remote.c:1065
+#: builtin/remote.c:1071
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s y con el remoto %s\n"
-#: builtin/remote.c:1108
+#: builtin/remote.c:1114
msgid "create"
msgstr "crear"
-#: builtin/remote.c:1111
+#: builtin/remote.c:1117
msgid "delete"
msgstr "borrar"
-#: builtin/remote.c:1115
+#: builtin/remote.c:1121
msgid "up to date"
msgstr "actualizado"
-#: builtin/remote.c:1118
+#: builtin/remote.c:1124
msgid "fast-forwardable"
msgstr "puede realizar fast-forward"
-#: builtin/remote.c:1121
+#: builtin/remote.c:1127
msgid "local out of date"
msgstr "desactualizado local"
-#: builtin/remote.c:1128
+#: builtin/remote.c:1134
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s fuerza a %-*s (%s)"
-#: builtin/remote.c:1131
+#: builtin/remote.c:1137
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s publica a %-*s (%s)"
-#: builtin/remote.c:1135
+#: builtin/remote.c:1141
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s fuerza a %s"
-#: builtin/remote.c:1138
+#: builtin/remote.c:1144
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s publica a %s"
-#: builtin/remote.c:1206
+#: builtin/remote.c:1212
msgid "do not query remotes"
msgstr "no consultar remotos"
-#: builtin/remote.c:1233
+#: builtin/remote.c:1239
#, c-format
msgid "* remote %s"
msgstr "* remoto %s"
-#: builtin/remote.c:1234
+#: builtin/remote.c:1240
#, c-format
msgid " Fetch URL: %s"
msgstr " URL para obtener: %s"
-#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390
+#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
msgid "(no URL)"
msgstr "(sin URL)"
@@ -19214,185 +20564,185 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1249 builtin/remote.c:1251
+#: builtin/remote.c:1255 builtin/remote.c:1257
#, c-format
msgid " Push URL: %s"
msgstr " URL para publicar: %s"
-#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
#, c-format
msgid " HEAD branch: %s"
msgstr " Rama HEAD: %s"
-#: builtin/remote.c:1253
+#: builtin/remote.c:1259
msgid "(not queried)"
msgstr "(no consultado)"
-#: builtin/remote.c:1255
+#: builtin/remote.c:1261
msgid "(unknown)"
msgstr "(desconocido)"
-#: builtin/remote.c:1259
+#: builtin/remote.c:1265
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
" HEAD en rama ( HEAD remoto es ambiguo, puede ser uno de los siguientes):\n"
-#: builtin/remote.c:1271
+#: builtin/remote.c:1277
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Rama remota:%s"
msgstr[1] " Ramas remotas:%s"
-#: builtin/remote.c:1274 builtin/remote.c:1300
+#: builtin/remote.c:1280 builtin/remote.c:1306
msgid " (status not queried)"
msgstr " (estado no consultado)"
-#: builtin/remote.c:1283
+#: builtin/remote.c:1289
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Rama local configurada para 'git pull':"
msgstr[1] " Ramas locales configuradas para 'git pull':"
-#: builtin/remote.c:1291
+#: builtin/remote.c:1297
msgid " Local refs will be mirrored by 'git push'"
msgstr " Las referencias locales serán reflejadas por 'git push'"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1303
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Referencia local configurada para 'git push'%s:"
msgstr[1] " Referencias locales configuradas para 'git push'%s:"
-#: builtin/remote.c:1318
+#: builtin/remote.c:1324
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "configurar refs/remotes/<nombre>/HEAD de acuerdo al remoto"
-#: builtin/remote.c:1320
+#: builtin/remote.c:1326
msgid "delete refs/remotes/<name>/HEAD"
msgstr "borrar refs/remotos/<nombre>/HEAD"
-#: builtin/remote.c:1335
+#: builtin/remote.c:1341
msgid "Cannot determine remote HEAD"
msgstr "No se puede determinar el HEAD remoto"
-#: builtin/remote.c:1337
+#: builtin/remote.c:1343
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "Múltiples ramas HEAD remotas. Por favor escoja una explícitamente con:"
-#: builtin/remote.c:1347
+#: builtin/remote.c:1353
#, c-format
msgid "Could not delete %s"
msgstr "No se pudo borrar %s"
-#: builtin/remote.c:1355
+#: builtin/remote.c:1361
#, c-format
msgid "Not a valid ref: %s"
msgstr "No es un ref válido: %s"
-#: builtin/remote.c:1357
+#: builtin/remote.c:1363
#, c-format
msgid "Could not setup %s"
msgstr "No se pudo configurar %s"
-#: builtin/remote.c:1375
+#: builtin/remote.c:1381
#, c-format
msgid " %s will become dangling!"
msgstr " ¡%s será colgado!"
-#: builtin/remote.c:1376
+#: builtin/remote.c:1382
#, c-format
msgid " %s has become dangling!"
msgstr " ¡%s ha sido colgado!"
-#: builtin/remote.c:1386
+#: builtin/remote.c:1392
#, c-format
msgid "Pruning %s"
msgstr "Recortando %s"
-#: builtin/remote.c:1387
+#: builtin/remote.c:1393
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1403
+#: builtin/remote.c:1409
#, c-format
msgid " * [would prune] %s"
msgstr " * [ejecutará prune] %s"
-#: builtin/remote.c:1406
+#: builtin/remote.c:1412
#, c-format
msgid " * [pruned] %s"
msgstr " * [prune realizado] %s"
-#: builtin/remote.c:1451
+#: builtin/remote.c:1457
msgid "prune remotes after fetching"
msgstr "recortar remotos tras realizar fetch"
-#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636
+#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
#, c-format
msgid "No such remote '%s'"
msgstr "No existe el remoto '%s'"
-#: builtin/remote.c:1530
+#: builtin/remote.c:1539
msgid "add branch"
msgstr "agregar rama"
-#: builtin/remote.c:1537
+#: builtin/remote.c:1546
msgid "no remote specified"
msgstr "no hay remotos especificados"
-#: builtin/remote.c:1554
+#: builtin/remote.c:1563
msgid "query push URLs rather than fetch URLs"
msgstr "consultar URLs de push en lugar de URLs de fetch"
-#: builtin/remote.c:1556
+#: builtin/remote.c:1565
msgid "return all URLs"
msgstr "retornar todos los URLs"
-#: builtin/remote.c:1584
+#: builtin/remote.c:1595
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "no hay URLs configurados para remoto '%s'"
-#: builtin/remote.c:1610
+#: builtin/remote.c:1621
msgid "manipulate push URLs"
msgstr "manipular URLs de push"
-#: builtin/remote.c:1612
+#: builtin/remote.c:1623
msgid "add URL"
msgstr "agregar URL"
-#: builtin/remote.c:1614
+#: builtin/remote.c:1625
msgid "delete URLs"
msgstr "borrar URLs"
-#: builtin/remote.c:1621
+#: builtin/remote.c:1632
msgid "--add --delete doesn't make sense"
msgstr "--add --delete no tiene sentido"
-#: builtin/remote.c:1660
+#: builtin/remote.c:1673
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Patrón de URL viejo inválido: %s"
-#: builtin/remote.c:1668
+#: builtin/remote.c:1681
#, c-format
msgid "No such URL found: %s"
msgstr "No se encontró URL: %s"
-#: builtin/remote.c:1670
+#: builtin/remote.c:1683
msgid "Will not delete all non-push URLs"
msgstr "No borrará todos los URLs de no-push"
-#: builtin/repack.c:23
+#: builtin/repack.c:26
msgid "git repack [<options>]"
msgstr "git repack [<opciones>]"
-#: builtin/repack.c:28
+#: builtin/repack.c:31
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -19400,137 +20750,123 @@
"Re empaquetados incrementales son incompatibles con índices bitmap. Use \n"
"--no-write-bitmap-index o deshabilite la configuración pack.writebitmaps."
-#: builtin/repack.c:191
+#: builtin/repack.c:198
msgid "could not start pack-objects to repack promisor objects"
msgstr "no se puede iniciar pack-objects para reempaquetar objetos promisores"
-#: builtin/repack.c:230 builtin/repack.c:416
+#: builtin/repack.c:270 builtin/repack.c:446
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
"repack: Esperando líneas de ID de objeto en full hex solo desde pack-objects."
-#: builtin/repack.c:254
+#: builtin/repack.c:294
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
"no se puede finalizar pack-objects para reempaquetar objetos promisores"
-#: builtin/repack.c:292
+#: builtin/repack.c:322
msgid "pack everything in a single pack"
msgstr "empaquetar todo en un único paquete"
-#: builtin/repack.c:294
+#: builtin/repack.c:324
msgid "same as -a, and turn unreachable objects loose"
msgstr "lo mismo que -a, y pierde objetos inaccesibles"
-#: builtin/repack.c:297
+#: builtin/repack.c:327
msgid "remove redundant packs, and run git-prune-packed"
msgstr "eliminar paquetes redundantes, y ejecutar git-prune-packed"
-#: builtin/repack.c:299
+#: builtin/repack.c:329
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "pasar --no-reuse-delta a git-pack-objects"
-#: builtin/repack.c:301
+#: builtin/repack.c:331
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "pasar --no-reuse-object a git-pack-objects"
-#: builtin/repack.c:303
+#: builtin/repack.c:333
msgid "do not run git-update-server-info"
msgstr "no ejecutar git-update-server-info"
-#: builtin/repack.c:306
+#: builtin/repack.c:336
msgid "pass --local to git-pack-objects"
msgstr "pasar --local a git-pack-objects"
-#: builtin/repack.c:308
+#: builtin/repack.c:338
msgid "write bitmap index"
msgstr "escribir un índice de bitmap"
-#: builtin/repack.c:310
+#: builtin/repack.c:340
msgid "pass --delta-islands to git-pack-objects"
msgstr "pasar --delta-islands a git-pack-objects"
-#: builtin/repack.c:311
+#: builtin/repack.c:341
msgid "approxidate"
msgstr "aproxime"
-#: builtin/repack.c:312
+#: builtin/repack.c:342
msgid "with -A, do not loosen objects older than this"
msgstr "con -A, no perder objetos más antiguos que este"
-#: builtin/repack.c:314
+#: builtin/repack.c:344
msgid "with -a, repack unreachable objects"
msgstr "con -a, re empaquetar objetos inalcanzables"
-#: builtin/repack.c:316
+#: builtin/repack.c:346
msgid "size of the window used for delta compression"
msgstr "tamaño de la ventana usado para la compresión delta"
-#: builtin/repack.c:317 builtin/repack.c:323
+#: builtin/repack.c:347 builtin/repack.c:353
msgid "bytes"
msgstr "bytes"
-#: builtin/repack.c:318
+#: builtin/repack.c:348
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
"lo mismo que arriba, pero limita el tamaño de memoria en lugar de contar "
"entradas"
-#: builtin/repack.c:320
+#: builtin/repack.c:350
msgid "limits the maximum delta depth"
msgstr "limita la profundidad máxima del delta"
-#: builtin/repack.c:322
+#: builtin/repack.c:352
msgid "limits the maximum number of threads"
msgstr "limita el número máximo de hilos"
-#: builtin/repack.c:324
+#: builtin/repack.c:354
msgid "maximum size of each packfile"
msgstr "tamaño máximo de cada paquete"
-#: builtin/repack.c:326
+#: builtin/repack.c:356
msgid "repack objects in packs marked with .keep"
msgstr "re-empaquetar objetos en paquetes marcados con .keep"
-#: builtin/repack.c:328
+#: builtin/repack.c:358
msgid "do not repack this pack"
msgstr "no reempaquetar este paquete"
-#: builtin/repack.c:338
+#: builtin/repack.c:368
msgid "cannot delete packs in a precious-objects repo"
msgstr "no se pueden borrar paquetes en un repositorio de objetos-preciosos"
-#: builtin/repack.c:342
+#: builtin/repack.c:372
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable y -A son incompatibles"
-#: builtin/repack.c:425
+#: builtin/repack.c:455
msgid "Nothing new to pack."
msgstr "Nada nuevo para empaquetar."
-#: builtin/repack.c:486
+#: builtin/repack.c:485
#, 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 ""
-"WARNING: Algunos packs en uso han sido renombrados\n"
-"WARNING: agregando el prefijo old- a sus nombres,para\n"
-"WARNING: reemplazarlos con la nueva versión del\n"
-"WARNING: archivo. Pero la operación falló, y el intento\n"
-"WARNING: de renombrarlos a sus nombres originales\n"
-"WARNING: también falló.\n"
-"WARNING: Por favor renombralos en %s manualmente:\n"
+msgid "missing required file: %s"
+msgstr "falta archivo requerido: %s"
-#: builtin/repack.c:534
+#: builtin/repack.c:487
#, c-format
-msgid "failed to remove '%s'"
-msgstr "falló al eliminar'%s'"
+msgid "could not unlink: %s"
+msgstr "no se pudo desvincular: %s"
#: builtin/replace.c:22
msgid "git replace [-f] <object> <replacement>"
@@ -19837,93 +21173,93 @@
msgid "keep"
msgstr "mantener"
-#: builtin/reset.c:82
+#: builtin/reset.c:83
msgid "You do not have a valid HEAD."
msgstr "No hay un HEAD válido."
-#: builtin/reset.c:84
+#: builtin/reset.c:85
msgid "Failed to find tree of HEAD."
msgstr "Falló al encontrar el HEAD del árbol."
-#: builtin/reset.c:90
+#: builtin/reset.c:91
#, c-format
msgid "Failed to find tree of %s."
msgstr "Falló al encontrar árbol de %s."
-#: builtin/reset.c:115
+#: builtin/reset.c:116
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD está ahora en %s"
-#: builtin/reset.c:194
+#: 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:294 builtin/stash.c:520 builtin/stash.c:595
-#: builtin/stash.c:619
+#: builtin/reset.c:295 builtin/stash.c:587 builtin/stash.c:661
+#: builtin/stash.c:685
msgid "be quiet, only report errors"
msgstr "ser silencioso, solo reportar errores"
-#: builtin/reset.c:296
+#: builtin/reset.c:297
msgid "reset HEAD and index"
msgstr "reiniciar HEAD e index"
-#: builtin/reset.c:297
+#: builtin/reset.c:298
msgid "reset only HEAD"
msgstr "reiniciar solo HEAD"
-#: builtin/reset.c:299 builtin/reset.c:301
+#: 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:303
+#: builtin/reset.c:304
msgid "reset HEAD but keep local changes"
msgstr "reiniciar HEAD pero mantener cambios locales"
-#: builtin/reset.c:309
+#: 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 eliminadas serán agregadas después"
-#: builtin/reset.c:343
+#: 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:351
+#: 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:360
+#: builtin/reset.c:361
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch es incompatible con --{hard,mixed,soft}"
-#: builtin/reset.c:370
+#: 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:372
+#: 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:387
+#: 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:391
+#: builtin/reset.c:392
msgid "-N can only be used with --mixed"
msgstr "-N sólo puede ser usada con --mixed"
-#: builtin/reset.c:412
+#: builtin/reset.c:413
msgid "Unstaged changes after reset:"
msgstr "Cambios fuera del área de stage tras el reset:"
-#: builtin/reset.c:415
+#: builtin/reset.c:416
#, c-format
msgid ""
"\n"
@@ -19937,48 +21273,48 @@
"usar '--quiet' para evitar esto. Configura la opción reset.quiet a true\n"
"para volverlo en el default.\n"
-#: builtin/reset.c:425
+#: builtin/reset.c: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:429
+#: builtin/reset.c:439
msgid "Could not write new index file."
msgstr "No se puede escribir un nuevo archivo índice."
-#: builtin/rev-list.c:499
+#: builtin/rev-list.c:534
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr "no se puede combinar --exclude-promisor-objects y --missing"
-#: builtin/rev-list.c:560
+#: builtin/rev-list.c:595
msgid "object filtering requires --objects"
msgstr "filtrado de objetos requiere --objects"
-#: builtin/rev-list.c:610
+#: builtin/rev-list.c:651
msgid "rev-list does not support display of notes"
msgstr "rev-list no soporta mostrar notas"
-#: builtin/rev-list.c:615
+#: builtin/rev-list.c:656
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"
@@ -20071,11 +21407,11 @@
msgid "keep redundant, empty commits"
msgstr "mantener commits redundantes, vacíos"
-#: builtin/revert.c:232
+#: builtin/revert.c:239
msgid "revert failed"
msgstr "falló al revertir"
-#: builtin/revert.c:245
+#: builtin/revert.c:252
msgid "cherry-pick failed"
msgstr "cherry-pick falló"
@@ -20177,55 +21513,76 @@
"[<ref>...]\n"
" --all y especificaciones <ref> explícitas son mutuamente exclusivas."
-#: builtin/send-pack.c:163
+#: builtin/send-pack.c:188
msgid "remote name"
msgstr "nombre remoto"
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:201
msgid "use stateless RPC protocol"
msgstr "usar protocolo RPC sin estado"
-#: builtin/send-pack.c:178
+#: builtin/send-pack.c:202
msgid "read refs from stdin"
msgstr "leer refs de stdin"
-#: builtin/send-pack.c:179
+#: builtin/send-pack.c:203
msgid "print status from remote helper"
msgstr "mostrar status del remote helper"
-#: builtin/shortlog.c:14
+#: builtin/shortlog.c:16
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git shortlog [<opciones>] [<rango-de-revisión>] [[--] <ruta>...]"
-#: builtin/shortlog.c:15
+#: builtin/shortlog.c:17
msgid "git log --pretty=short | git shortlog [<options>]"
msgstr "git log --pretty=short | git shorlog [<opciones>]"
-#: builtin/shortlog.c:264
-msgid "Group by committer rather than author"
-msgstr "Agrupar por committer en lugar de autor"
+#: builtin/shortlog.c:123
+msgid "using multiple --group options with stdin is not supported"
+msgstr "no se admite el uso de múltiples opciones de grupo --group con stdin"
-#: builtin/shortlog.c:266
+#: builtin/shortlog.c:133
+msgid "using --group=trailer with stdin is not supported"
+msgstr "el uso de --group = trailer con stdin no es compatible"
+
+#: builtin/shortlog.c:323
+#, c-format
+msgid "unknown group type: %s"
+msgstr "tipo de grupo desconocido: %s"
+
+#: builtin/shortlog.c:351
+msgid "group by committer rather than author"
+msgstr "agrupar por committer en lugar de autor"
+
+#: builtin/shortlog.c:354
msgid "sort output according to the number of commits per author"
msgstr "ordenar salida de acuerdo al número de commits por autor"
-#: builtin/shortlog.c:268
-msgid "Suppress commit descriptions, only provides commit count"
-msgstr "Suprimir descripción de commits, solo proveer cuenta de commits"
+#: builtin/shortlog.c:356
+msgid "suppress commit descriptions, only provides commit count"
+msgstr "suprimir descripción de commits, solo proveer cuenta de commits"
-#: builtin/shortlog.c:270
-msgid "Show the email address of each author"
-msgstr "Mostrar la dirección de correo de cada autor"
+#: builtin/shortlog.c:358
+msgid "show the email address of each author"
+msgstr "mostrar la dirección de correo de cada autor"
-#: builtin/shortlog.c:271
+#: builtin/shortlog.c:359
msgid "<w>[,<i1>[,<i2>]]"
msgstr "<w>[,<i1>[,<i2>]]"
-#: builtin/shortlog.c:272
-msgid "Linewrap output"
-msgstr "Salida de línea"
+#: builtin/shortlog.c:360
+msgid "linewrap output"
+msgstr "salida de línea"
-#: builtin/shortlog.c:301
+#: builtin/shortlog.c:362
+msgid "field"
+msgstr "campo"
+
+#: builtin/shortlog.c:363
+msgid "group by field"
+msgstr "agrupar por campo"
+
+#: builtin/shortlog.c:391
msgid "too many arguments given outside repository"
msgstr "demasiados argumentos dados fuera del repositorio"
@@ -20364,6 +21721,14 @@
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 | --"
@@ -20409,19 +21774,29 @@
msgstr "mostrar refs de stdin que no están en el repositorio local"
#: builtin/sparse-checkout.c:21
-msgid "git sparse-checkout (init|list|set|add|disable) <options>"
-msgstr "git sparse-checkout (init|list|set|add|disable) <opciones>"
+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
+#: builtin/sparse-checkout.c:45
+msgid "git sparse-checkout list"
+msgstr "git sparse-checkout list"
+
+#: builtin/sparse-checkout.c:71
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr ""
"este árbol de trabajo no tiene sparse (archivo sparese-checkout tal vez no "
"existe)"
-#: builtin/sparse-checkout.c:225
+#: builtin/sparse-checkout.c:223
msgid "failed to create directory for sparse-checkout file"
msgstr "falló al crear directorio para el archivo sparse-checkout"
+#: builtin/sparse-checkout.c:264
+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:266
msgid "failed to set extensions.worktreeConfig setting"
msgstr "falló al configurar opción extensions.worktreeConfig"
@@ -20434,46 +21809,42 @@
msgid "initialize the sparse-checkout in cone mode"
msgstr "inicializa el sparse-checkout en modo cono"
-#: builtin/sparse-checkout.c:308
-msgid "initialize sparse-checkout"
-msgstr "inicializar sparse-checkout"
-
-#: builtin/sparse-checkout.c:341
+#: builtin/sparse-checkout.c:339
#, c-format
msgid "failed to open '%s'"
msgstr "falló al abrir '%s'"
-#: builtin/sparse-checkout.c:398
+#: builtin/sparse-checkout.c:396
#, c-format
msgid "could not normalize path %s"
msgstr "no se pudo normalizar la ruta %s"
-#: builtin/sparse-checkout.c:410
+#: builtin/sparse-checkout.c:408
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
msgstr "git sparse-checkout (set|add) (--stdin | <patrones>)"
-#: builtin/sparse-checkout.c:435
+#: builtin/sparse-checkout.c:433
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "no es posible dequote para la cadena de estilo C '%s'"
-#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513
+#: builtin/sparse-checkout.c:487 builtin/sparse-checkout.c:511
msgid "unable to load existing sparse-checkout patterns"
msgstr "no se pudo cargar patrones de sparse-checkout existentes"
-#: builtin/sparse-checkout.c:558
+#: builtin/sparse-checkout.c:556
msgid "read patterns from standard in"
msgstr "leer patrones de standard in"
-#: builtin/sparse-checkout.c:564
-msgid "set sparse-checkout patterns"
-msgstr "configurar patrones de sparse-checkout"
+#: builtin/sparse-checkout.c:571
+msgid "git sparse-checkout reapply"
+msgstr "git sparse-checkout reapply"
-#: builtin/sparse-checkout.c:581
-msgid "disable sparse-checkout"
-msgstr "deshabilitar sparse-checkout"
+#: builtin/sparse-checkout.c:590
+msgid "git sparse-checkout disable"
+msgstr "git sparse-checkout disable"
-#: builtin/sparse-checkout.c:593
+#: builtin/sparse-checkout.c:618
msgid "error while refreshing working directory"
msgstr "error al refrescar directorio de trabajo"
@@ -20553,7 +21924,7 @@
msgid "Too many revisions specified:%s"
msgstr "Se especificaron demasiadas revisiones: %s"
-#: builtin/stash.c:162 git-legacy-stash.sh:549
+#: builtin/stash.c:162
msgid "No stash entries found."
msgstr "No se encontraron entradas de stash."
@@ -20562,158 +21933,172 @@
msgid "%s is not a valid reference"
msgstr "%s no es una referencia válida"
-#: builtin/stash.c:225 git-legacy-stash.sh:75
-msgid "git stash clear with parameters is unimplemented"
-msgstr "git stash clear con parámetros no está implementado"
+#: builtin/stash.c:225
+msgid "git stash clear with arguments is unimplemented"
+msgstr "git stash clear con argumentos no está implementado"
-#: builtin/stash.c:404
+#: builtin/stash.c:429
+#, c-format
+msgid ""
+"WARNING: Untracked file in way of tracked file! Renaming\n"
+" %s -> %s\n"
+" to make room.\n"
+msgstr ""
+"ADVERTENCIA: Archivo sin seguimiento en forma de archivo con seguimiento. "
+"Renombrar\n"
+" %s ->%s\n"
+" Para hacer espacio.\n"
+
+#: builtin/stash.c:490
msgid "cannot apply a stash in the middle of a merge"
msgstr "no se puede aplicar un stash en medio de un merge"
-#: builtin/stash.c:415
+#: builtin/stash.c:501
#, c-format
msgid "could not generate diff %s^!."
msgstr "no se pudo generar diff %s^!."
-#: builtin/stash.c:422
-msgid "conflicts in index.Try without --index."
+#: builtin/stash.c:508
+msgid "conflicts in index. Try without --index."
msgstr "conflictos en índice. Intente sin --index."
-#: builtin/stash.c:428
+#: builtin/stash.c:514
msgid "could not save index tree"
msgstr "no se puede guardar el índice del árbol"
-#: builtin/stash.c:437
+#: builtin/stash.c:523
msgid "could not restore untracked files from stash"
msgstr "no se pueden restaurar archivos no rastreados de la entrada stash"
-#: builtin/stash.c:451
+#: builtin/stash.c:537
#, c-format
msgid "Merging %s with %s"
msgstr "Fusionando %s con %s"
-#: builtin/stash.c:461 git-legacy-stash.sh:681
+#: builtin/stash.c:547
msgid "Index was not unstashed."
msgstr "El índice no fue sacado de stash."
-#: builtin/stash.c:522 builtin/stash.c:621
+#: builtin/stash.c:589 builtin/stash.c:687
msgid "attempt to recreate the index"
msgstr "intento de recrear el index"
-#: builtin/stash.c:555
+#: builtin/stash.c:633
#, c-format
msgid "Dropped %s (%s)"
msgstr "Botado %s (%s)"
-#: builtin/stash.c:558
+#: builtin/stash.c:636
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s: No se pudo borrar entrada stash"
-#: builtin/stash.c:583
+#: builtin/stash.c:649
#, c-format
msgid "'%s' is not a stash reference"
msgstr "'%s' no es una referencia stash"
-#: builtin/stash.c:633 git-legacy-stash.sh:695
+#: builtin/stash.c:699
msgid "The stash entry is kept in case you need it again."
msgstr "La entrada de stash se guardó en caso de ser necesario nuevamente."
-#: builtin/stash.c:656 git-legacy-stash.sh:713
+#: builtin/stash.c:722
msgid "No branch name specified"
msgstr "No se especificó el nombre de la rama"
-#: builtin/stash.c:796 builtin/stash.c:833
+#: builtin/stash.c:866 builtin/stash.c:903
#, c-format
msgid "Cannot update %s with %s"
msgstr "No se puede actualizar %s con %s"
-#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
+#: builtin/stash.c:884 builtin/stash.c:1538 builtin/stash.c:1603
msgid "stash message"
msgstr "mensaje de stash"
-#: builtin/stash.c:824
+#: builtin/stash.c:894
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" requiere un argumento <commit>"
-#: builtin/stash.c:1049 git-legacy-stash.sh:218
+#: builtin/stash.c:1109
msgid "No changes selected"
msgstr "Sin cambios seleccionados"
-#: builtin/stash.c:1149 git-legacy-stash.sh:150
+#: builtin/stash.c:1209
msgid "You do not have the initial commit yet"
msgstr "Aún no tienes un commit inicial"
-#: builtin/stash.c:1176 git-legacy-stash.sh:165
+#: builtin/stash.c:1236
msgid "Cannot save the current index state"
msgstr "No se puede guardar el estado actual del índice"
-#: builtin/stash.c:1185 git-legacy-stash.sh:180
+#: builtin/stash.c:1245
msgid "Cannot save the untracked files"
msgstr "No se pueden guardar los archivos no rastreados"
-#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201
-#: git-legacy-stash.sh:214
+#: builtin/stash.c:1256 builtin/stash.c:1265
msgid "Cannot save the current worktree state"
msgstr "No se puede guardar el estado actual del árbol de trabajo"
-#: builtin/stash.c:1233 git-legacy-stash.sh:234
+#: builtin/stash.c:1293
msgid "Cannot record working tree state"
msgstr "No se puede grabar el estado del árbol de trabajo"
-#: builtin/stash.c:1282 git-legacy-stash.sh:338
+#: builtin/stash.c:1342
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "No se puede usar --patch y --include-untracked o --all al mismo tiempo"
-#: builtin/stash.c:1298
+#: builtin/stash.c:1358
msgid "Did you forget to 'git add'?"
msgstr "¿Olvidaste 'git add'?"
-#: builtin/stash.c:1313 git-legacy-stash.sh:346
+#: builtin/stash.c:1373
msgid "No local changes to save"
msgstr "No hay cambios locales para guardar"
-#: builtin/stash.c:1320 git-legacy-stash.sh:351
+#: builtin/stash.c:1380
msgid "Cannot initialize stash"
msgstr "No se puede inicializar stash"
-#: builtin/stash.c:1335 git-legacy-stash.sh:355
+#: builtin/stash.c:1395
msgid "Cannot save the current status"
msgstr "No se puede guardar el estado actual"
-#: builtin/stash.c:1340
+#: builtin/stash.c:1400
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Directorio de trabajo guardado y estado de índice %s"
-#: builtin/stash.c:1430 git-legacy-stash.sh:385
+#: builtin/stash.c:1490
msgid "Cannot remove worktree changes"
msgstr "No se pueden eliminar cambios del árbol de trabajo"
-#: builtin/stash.c:1469 builtin/stash.c:1534
+#: builtin/stash.c:1529 builtin/stash.c:1594
msgid "keep index"
msgstr "mantener index"
-#: builtin/stash.c:1471 builtin/stash.c:1536
+#: builtin/stash.c:1531 builtin/stash.c:1596
msgid "stash in patch mode"
msgstr "stash en modo patch"
-#: builtin/stash.c:1472 builtin/stash.c:1537
+#: builtin/stash.c:1532 builtin/stash.c:1597
msgid "quiet mode"
msgstr "modo tranquilo"
-#: builtin/stash.c:1474 builtin/stash.c:1539
+#: builtin/stash.c:1534 builtin/stash.c:1599
msgid "include untracked files in stash"
msgstr "incluir archivos sin seguimiento en stash"
-#: builtin/stash.c:1476 builtin/stash.c:1541
+#: builtin/stash.c:1536 builtin/stash.c:1601
msgid "include ignore files"
msgstr "incluir archivos ignorados"
-#: builtin/stash.c:1600
-#, c-format
-msgid "could not exec %s"
-msgstr "no se pudo ejecutar %s"
+#: builtin/stash.c:1636
+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]"
@@ -20732,7 +22117,7 @@
msgid "prepend comment character and space to each line"
msgstr "anteponer carácter de comentario y espacio a cada línea"
-#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999
+#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Se esperaba un nombre de ref completo, se obtuvo %s"
@@ -20746,7 +22131,7 @@
msgid "cannot strip one component off url '%s'"
msgstr "no se puede quitar un componente del url '%s'"
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819
msgid "alternative anchor for relative paths"
msgstr "ancho alternativo para rutas relativas"
@@ -20754,8 +22139,8 @@
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<ruta>] [<ruta>...]"
-#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c: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 se encontró url para la ruta del submódulo '%s' en .gitmodules"
@@ -20786,12 +22171,13 @@
"."
#: builtin/submodule--helper.c:565
-msgid "Suppress output of entering each submodule command"
-msgstr "Suprime la salida al inicializar cada comando de submódulo"
+msgid "suppress output of entering each submodule command"
+msgstr "suprime la salida al inicializar cada comando de submódulo"
-#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063
-msgid "Recurse into nested submodules"
-msgstr "Recursar en submódulos anidados"
+#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888
+#: builtin/submodule--helper.c:1487
+msgid "recurse into nested submodules"
+msgstr "recursar en submódulos anidados"
#: builtin/submodule--helper.c:572
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
@@ -20806,105 +22192,158 @@
"no se pudo encontrar configuración '%s'. Asumiendo que este repositorio es "
"su propio upstream autoritativo."
-#: builtin/submodule--helper.c:667
+#: builtin/submodule--helper.c:666
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Falló al registrar el url para la ruta del submódulo '%s'"
-#: builtin/submodule--helper.c:671
+#: builtin/submodule--helper.c:670
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Submódulo '%s' (%s) registrado para ruta '%s'\n"
-#: builtin/submodule--helper.c:681
+#: builtin/submodule--helper.c:680
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
"peligro: modo de actualización de comandos sugerido para el submódulo '%s'\n"
-#: builtin/submodule--helper.c:688
+#: builtin/submodule--helper.c:687
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
"Error al registrar el modo de actualización para la ruta del submódulo '%s'"
-#: builtin/submodule--helper.c:710
-msgid "Suppress output for initializing a submodule"
-msgstr "Suprime la salida para inicializar un submódulo"
+#: builtin/submodule--helper.c:709
+msgid "suppress output for initializing a submodule"
+msgstr "suprime la salida para inicializar un submódulo"
-#: builtin/submodule--helper.c:715
+#: builtin/submodule--helper.c:714
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<opciones>] [<path>]"
-#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
+#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
"no se ha encontrado mapeo de submódulos en .gitmodules para la ruta '%s'"
-#: builtin/submodule--helper.c:837
+#: builtin/submodule--helper.c:835
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "no pudo resolver ref de HEAD dentro del submódulo '%s'"
-#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "falló al recursar en el submódulo '%s'"
-#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199
-msgid "Suppress submodule status output"
-msgstr "Suprimir output del estado del submódulo"
+#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623
+msgid "suppress submodule status output"
+msgstr "suprimir output del estado del submódulo"
-#: builtin/submodule--helper.c:889
+#: builtin/submodule--helper.c:887
msgid ""
-"Use commit stored in the index instead of the one stored in the submodule "
+"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr ""
-"Usar el commit guardado en el índice en lugar del guardado en el submódulo "
+"usar el commit guardado en el índice en lugar del guardado en el submódulo "
"HEAD"
-#: builtin/submodule--helper.c:890
-msgid "recurse into nested submodules"
-msgstr "recursar en submódulos anidados"
-
-#: builtin/submodule--helper.c:895
+#: builtin/submodule--helper.c:893
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<ruta>...]"
-#: builtin/submodule--helper.c:919
+#: builtin/submodule--helper.c:917
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <ruta>"
-#: builtin/submodule--helper.c:983
+#: 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 "no se pudo realizar hash del objeto '%s'"
+
+#: builtin/submodule--helper.c:1059
+#, c-format
+msgid "unexpected mode %o\n"
+msgstr "modo %o inesperado\n"
+
+#: builtin/submodule--helper.c:1300
+msgid "use the commit stored in the index instead of the submodule HEAD"
+msgstr ""
+"usar el commit guardado en el índice en lugar del guardado en el submódulo "
+"HEAD"
+
+#: builtin/submodule--helper.c:1302
+msgid "to compare the commit in the index with that in the submodule HEAD"
+msgstr ""
+"usar el commit guardado en el índice para comparar con el guardado en el "
+"submódulo HEAD"
+
+#: builtin/submodule--helper.c:1304
+msgid "skip submodules with 'ignore_config' value set to 'all'"
+msgstr "omitir submódulos con el valor 'ignore_config' establecido en 'all'"
+
+#: builtin/submodule--helper.c:1306
+msgid "limit the summary size"
+msgstr "limitar el tamaño de resumen"
+
+#: builtin/submodule--helper.c:1311
+msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
+msgstr "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
+
+#: builtin/submodule--helper.c:1335
+msgid "could not fetch a revision for HEAD"
+msgstr "no se puede obtener la revisión para HEAD"
+
+#: builtin/submodule--helper.c:1340
+msgid "--cached and --files are mutually exclusive"
+msgstr "--cached y --files son mutuamente exclusivos"
+
+#: builtin/submodule--helper.c:1407
#, c-format
msgid "Synchronizing submodule url for '%s'\n"
msgstr "Sincronizando url del submódulo para '%s'\n"
-#: builtin/submodule--helper.c:989
+#: builtin/submodule--helper.c:1413
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "falló al registrar el url para la ruta del submódulo '%s'"
-#: builtin/submodule--helper.c:1003
+#: builtin/submodule--helper.c:1427
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "error al conseguir el remoto por defecto para el submódulo '%s'"
-#: builtin/submodule--helper.c:1014
+#: builtin/submodule--helper.c:1438
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "error al actualizar el remoto para el submódulo '%s'"
-#: builtin/submodule--helper.c:1061
-msgid "Suppress output of synchronizing submodule url"
-msgstr "Suprime la salida del url del submódulo que se sincroniza"
+#: builtin/submodule--helper.c:1485
+msgid "suppress output of synchronizing submodule url"
+msgstr "suprime la salida del url del submódulo que se sincroniza"
-#: builtin/submodule--helper.c:1068
+#: builtin/submodule--helper.c:1492
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<ruta>]"
-#: builtin/submodule--helper.c:1122
+#: builtin/submodule--helper.c:1546
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -20913,7 +22352,7 @@
"El árbol de trabajo del submódulo '%s' contiene un directorio .git (use 'rm -"
"rf' si realmente quieres eliminarlo incluyendo todo en su historia)"
-#: builtin/submodule--helper.c:1134
+#: builtin/submodule--helper.c:1558
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -20922,46 +22361,46 @@
"El árbol de trabajo del submódulo '%s' contiene modificaciones locales; usa "
"'-f' para descartarlas"
-#: builtin/submodule--helper.c:1142
+#: builtin/submodule--helper.c:1566
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Directorio '%s' limpiado\n"
-#: builtin/submodule--helper.c:1144
+#: builtin/submodule--helper.c:1568
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "No se pudo eliminar el árbol de trabajo del submódulo '%s'\n"
-#: builtin/submodule--helper.c:1155
+#: builtin/submodule--helper.c:1579
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "no se pudo crear directorio vacío de submódulo %s"
-#: builtin/submodule--helper.c:1171
+#: builtin/submodule--helper.c:1595
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr "Submódulo '%s' (%s) no registrado para ruta '%s'\n"
-#: builtin/submodule--helper.c:1200
-msgid "Remove submodule working trees even if they contain local changes"
+#: builtin/submodule--helper.c:1624
+msgid "remove submodule working trees even if they contain local changes"
msgstr ""
-"Remover árboles de trabajo de submódulos incluso si contienen cambios locales"
+"remover árboles de trabajo de submódulos incluso si contienen cambios locales"
-#: builtin/submodule--helper.c:1201
-msgid "Unregister all submodules"
-msgstr "Quitar todos los submódulos"
+#: builtin/submodule--helper.c:1625
+msgid "unregister all submodules"
+msgstr "quitar todos los submódulos"
-#: builtin/submodule--helper.c:1206
+#: builtin/submodule--helper.c:1630
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<ruta>...]]"
-#: builtin/submodule--helper.c:1220
+#: builtin/submodule--helper.c:1644
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Usa '--all' si realmente quieres des-inicializar todos los submódulos"
-#: builtin/submodule--helper.c:1289
+#: 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"
@@ -20975,46 +22414,46 @@
"con\n"
"'--reference-if-able' en lugar de '--reference'."
-#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331
+#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "submódulo '%s' no puede agregar alterno: %s"
-#: builtin/submodule--helper.c:1367
+#: builtin/submodule--helper.c:1791
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "Valor '%s' para submodule.alternateErrorStrategy no es reconocido"
-#: builtin/submodule--helper.c:1374
+#: builtin/submodule--helper.c:1798
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Valor '%s' para submodule.alternateLocation no es reconocido"
-#: builtin/submodule--helper.c:1398
+#: builtin/submodule--helper.c:1822
msgid "where the new submodule will be cloned to"
msgstr "a donde el nuevo submódulo será clonado"
-#: builtin/submodule--helper.c:1401
+#: builtin/submodule--helper.c:1825
msgid "name of the new submodule"
msgstr "nombre del nuevo submódulo"
-#: builtin/submodule--helper.c:1404
+#: builtin/submodule--helper.c:1828
msgid "url where to clone the submodule from"
msgstr "url de dónde clonar el submódulo"
-#: builtin/submodule--helper.c:1412
+#: builtin/submodule--helper.c:1836
msgid "depth for shallow clones"
msgstr "profundidad para clones superficiales"
-#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924
+#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348
msgid "force cloning progress"
msgstr "forzar el proceso de clonado"
-#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926
+#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350
msgid "disallow cloning into non-empty directory"
msgstr "no permitir clonar en directorios no vacíos"
-#: builtin/submodule--helper.c:1424
+#: builtin/submodule--helper.c:1848
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -21024,104 +22463,104 @@
"<repositorio>] [--name <nombre>] [--depth <profundidad>] [--single-branch] --"
"url <url> --path <ruta>"
-#: builtin/submodule--helper.c:1449
+#: builtin/submodule--helper.c:1873
#, 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
+#: builtin/submodule--helper.c:1884
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "clon de '%s' en la ruta de submódulo '%s' falló"
-#: builtin/submodule--helper.c:1464
+#: builtin/submodule--helper.c:1888
#, c-format
msgid "directory not empty: '%s'"
msgstr "directorio no está vacío: '%s'"
-#: builtin/submodule--helper.c:1476
+#: builtin/submodule--helper.c:1900
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "no se pudo obtener el directorio de submódulo para '%s'"
-#: builtin/submodule--helper.c:1512
+#: builtin/submodule--helper.c:1936
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr "Modo de actualización inválido '%s' para ruta de submódulo '%s'"
-#: builtin/submodule--helper.c:1516
+#: builtin/submodule--helper.c:1940
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
"Modo de actualización inválido '%s' configurado para ruta de submódulo '%s'"
-#: builtin/submodule--helper.c:1617
+#: builtin/submodule--helper.c:2041
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Ruta de submódulo '%s' no inicializada"
-#: builtin/submodule--helper.c:1621
+#: builtin/submodule--helper.c:2045
msgid "Maybe you want to use 'update --init'?"
msgstr "¿Tal vez quieres usar 'update --init'?"
-#: builtin/submodule--helper.c:1651
+#: builtin/submodule--helper.c:2075
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Saltando submódulo %s no fusionado"
-#: builtin/submodule--helper.c:1680
+#: builtin/submodule--helper.c:2104
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Saltando submódulo '%s'"
-#: builtin/submodule--helper.c:1830
+#: builtin/submodule--helper.c:2254
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Falló al clonar '%s'. Reintento programado"
-#: builtin/submodule--helper.c:1841
+#: builtin/submodule--helper.c:2265
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Falló al clonar '%s' una segunda vez, abortando"
-#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149
+#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573
msgid "path into the working tree"
msgstr "ruta hacia el árbol de trabajo"
-#: builtin/submodule--helper.c:1906
+#: builtin/submodule--helper.c:2330
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
"ruta hacia el árbol de trabajo, a través de extremos de submódulos anidados"
-#: builtin/submodule--helper.c:1910
+#: builtin/submodule--helper.c:2334
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout o none"
-#: 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:2340
+msgid "create a shallow clone truncated to the specified number of revisions"
+msgstr "crea un clon superficial truncado al número especificado de revisión"
-#: builtin/submodule--helper.c:1919
+#: builtin/submodule--helper.c:2343
msgid "parallel jobs"
msgstr "trabajos paralelos"
-#: builtin/submodule--helper.c:1921
+#: builtin/submodule--helper.c:2345
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "si el clon inicial debe seguir la recomendación superficial"
-#: builtin/submodule--helper.c:1922
+#: builtin/submodule--helper.c:2346
msgid "don't print cloning progress"
msgstr "no mostrar el progreso de clonado"
-#: builtin/submodule--helper.c:1933
+#: builtin/submodule--helper.c:2357
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update-clone [--prefix=<ruta>] [<ruta>...]"
-#: builtin/submodule--helper.c:1946
+#: builtin/submodule--helper.c:2370
msgid "bad value for update parameter"
msgstr "mal valor para parámetro update"
-#: builtin/submodule--helper.c:1994
+#: builtin/submodule--helper.c:2418
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -21130,51 +22569,85 @@
"Rama de submódulo (%s) configurada para heredar rama del superproyecto, pero "
"el superproyecto no está en ninguna rama"
-#: builtin/submodule--helper.c:2117
+#: builtin/submodule--helper.c:2541
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "no se pudo conseguir un handle para el submódulo '%s'"
-#: builtin/submodule--helper.c:2150
+#: builtin/submodule--helper.c:2574
msgid "recurse into submodules"
msgstr "recurrir a submódulos"
-#: builtin/submodule--helper.c:2156
+#: builtin/submodule--helper.c:2580
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr "git submodule--helper absorb-git-dirs [<opciones>] [<path>...]"
-#: builtin/submodule--helper.c:2212
+#: builtin/submodule--helper.c:2636
msgid "check if it is safe to write to the .gitmodules file"
msgstr "revisar is es seguro escribir el archivo .gitmodules"
-#: builtin/submodule--helper.c:2215
+#: builtin/submodule--helper.c:2639
msgid "unset the config in the .gitmodules file"
msgstr "desconfigura la opción en elarchivo .gitmodules"
-#: builtin/submodule--helper.c:2220
+#: builtin/submodule--helper.c:2644
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config <nombre> [<valor>]"
-#: builtin/submodule--helper.c:2221
+#: builtin/submodule--helper.c:2645
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <nombre>"
-#: builtin/submodule--helper.c:2222
+#: builtin/submodule--helper.c:2646
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2241 git-submodule.sh:174
+#: builtin/submodule--helper.c:2665 git-submodule.sh:150
#, sh-format
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr ""
"por favor asegúrate que el archivo .gitmodules está en el árbol de trabajo"
-#: builtin/submodule--helper.c:2291 git.c:433 git.c:684
+#: builtin/submodule--helper.c:2681
+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:2685
+msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
+msgstr "git submodule--helper set-url [--quiet] <ruta> <nueva url>"
+
+#: builtin/submodule--helper.c:2718
+msgid "set the default tracking branch to master"
+msgstr "configurar la rama de rastreo por defecto a master"
+
+#: builtin/submodule--helper.c:2720
+msgid "set the default tracking branch"
+msgstr "configurar la rama de rastreo por defecto"
+
+#: 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) <ruta>"
+
+#: 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) <rama> <ruta>"
+
+#: builtin/submodule--helper.c:2732
+msgid "--branch or --default required"
+msgstr "--branch o --default requeridos"
+
+#: builtin/submodule--helper.c:2735
+msgid "--branch and --default are mutually exclusive"
+msgstr "--branch y --default son mutuamente exclusivos"
+
+#: builtin/submodule--helper.c:2792 git.c:441 git.c:714
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s no soporta --super-prefix"
-#: builtin/submodule--helper.c:2297
+#: builtin/submodule--helper.c:2798
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' no es un comando submodule--helper válido"
@@ -21199,11 +22672,11 @@
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:499
msgid "reason"
msgstr "razón"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
msgid "reason of the update"
msgstr "razón de la actualización"
@@ -21223,11 +22696,13 @@
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"
-"\t\t[--format=<formato>] [--[no-]merged [<commit>]] [<patrón>...]"
+"\t\t[--format=<formato>] [--merged <commit>] [--no-merged <commit>] "
+"[<patrón>...]"
#: builtin/tag.c:30
msgid "git tag -v [--format=<format>] <tagname>..."
@@ -21238,12 +22713,12 @@
msgid "tag '%s' not found."
msgstr "tag '%s' no encontrado."
-#: builtin/tag.c:105
+#: builtin/tag.c:124
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Etiqueta '%s' eliminada (era %s)\n"
-#: builtin/tag.c:135
+#: builtin/tag.c:159
#, c-format
msgid ""
"\n"
@@ -21256,7 +22731,7 @@
" %s\n"
"Las líneas que comienzan con '%c' serán ignoradas.\n"
-#: builtin/tag.c:139
+#: builtin/tag.c:163
#, c-format
msgid ""
"\n"
@@ -21271,15 +22746,11 @@
"Las líneas que comienzan con '%c' serán conservadas; puedes eliminarlas por "
"ti mismo si quieres hacerlo.\n"
-#: builtin/tag.c:198
+#: builtin/tag.c:230
msgid "unable to sign the tag"
msgstr "incapaz de firmar tag"
-#: builtin/tag.c:200
-msgid "unable to write tag file"
-msgstr "incapaz de escribir el archivo de tag"
-
-#: builtin/tag.c:216
+#: builtin/tag.c:248
#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
@@ -21292,138 +22763,134 @@
"\n"
"\tgit tag -f %s %s^{}"
-#: builtin/tag.c:232
+#: builtin/tag.c:264
msgid "bad object type."
msgstr "tipo de objeto erróneo."
-#: builtin/tag.c:284
+#: builtin/tag.c:317
msgid "no tag message?"
msgstr "¿Sin mensaje de tag?"
-#: builtin/tag.c:291
+#: builtin/tag.c:324
#, 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:435
msgid "list tag names"
msgstr "listar nombres de tags"
-#: builtin/tag.c:404
+#: builtin/tag.c:437
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:439
msgid "delete tags"
msgstr "eliminar tags"
-#: builtin/tag.c:407
+#: builtin/tag.c:440
msgid "verify tags"
msgstr "verificar tags"
-#: builtin/tag.c:409
+#: builtin/tag.c:442
msgid "Tag creation options"
msgstr "Opciones de creación de tags"
-#: builtin/tag.c:411
+#: builtin/tag.c:444
msgid "annotated tag, needs a message"
msgstr "tags anotadas necesitan un mensaje"
-#: builtin/tag.c:413
+#: builtin/tag.c:446
msgid "tag message"
msgstr "mensaje de tag"
-#: builtin/tag.c:415
+#: builtin/tag.c:448
msgid "force edit of tag message"
msgstr "forzar la edición del mensaje de tag"
-#: builtin/tag.c:416
+#: builtin/tag.c:449
msgid "annotated and GPG-signed tag"
msgstr "tag anotado y firmado con GPG"
-#: builtin/tag.c:419
+#: builtin/tag.c:452
msgid "use another key to sign the tag"
msgstr "usar otra clave para firmar el tag"
-#: builtin/tag.c:420
+#: builtin/tag.c:453
msgid "replace the tag if exists"
msgstr "remplazar tag si existe"
-#: builtin/tag.c:421 builtin/update-ref.c:369
+#: builtin/tag.c:454 builtin/update-ref.c:505
msgid "create a reflog"
msgstr "crear un reflog"
-#: builtin/tag.c:423
+#: builtin/tag.c:456
msgid "Tag listing options"
msgstr "Opciones de listado de tag"
-#: builtin/tag.c:424
+#: builtin/tag.c:457
msgid "show tag list in columns"
msgstr "mostrar lista de tags en columnas"
-#: builtin/tag.c:425 builtin/tag.c:427
+#: builtin/tag.c:458 builtin/tag.c:460
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:459 builtin/tag.c:461
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:462
msgid "print only tags that are merged"
msgstr "sólo imprimir las tags que están fusionadas"
-#: builtin/tag.c:430
+#: builtin/tag.c:463
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:467
msgid "print only tags of the object"
msgstr "sólo imprimir tags de el objeto"
-#: builtin/tag.c:482
+#: builtin/tag.c:515
msgid "--column and -n are incompatible"
msgstr "--column y -n son incompatibles"
-#: builtin/tag.c:504
+#: builtin/tag.c:537
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:539
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:541
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:543
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:545
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:556
msgid "only one -F or -m option is allowed."
msgstr "sólo se permite una de las opciones, -m ó -F."
-#: builtin/tag.c:542
-msgid "too many params"
-msgstr "demasiados parámetros"
-
-#: builtin/tag.c:548
+#: builtin/tag.c:581
#, 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:586
#, c-format
msgid "tag '%s' already exists"
msgstr "el tag '%s' ya existe"
-#: builtin/tag.c:584
+#: builtin/tag.c:617
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Etiqueta '%s' actualizada (era %s)\n"
@@ -21708,19 +23175,19 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<opciones>] --stdin [-z]"
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:500
msgid "delete the reference"
msgstr "eliminar la referencia"
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:502
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:503
msgid "stdin has NUL-terminated arguments"
msgstr "stdin tiene argumentos terminados en NUL"
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:504
msgid "read updates from stdin"
msgstr "lee actualizaciones de stdin"
@@ -21764,15 +23231,15 @@
msgid "print raw gpg status output"
msgstr "muestra la salida de status gpg en formato raw"
-#: 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] <paquete>..."
-#: builtin/verify-pack.c:65
+#: builtin/verify-pack.c:70
msgid "verbose"
msgstr "verboso"
-#: builtin/verify-pack.c:67
+#: builtin/verify-pack.c:72
msgid "show statistics only"
msgstr "solo mostrar estadísticas"
@@ -21784,229 +23251,207 @@
msgid "print tag contents"
msgstr "imprimir contenido del tag"
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<opciones>] <ruta> [<commit-ish>]"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree list [<options>]"
msgstr "git worktree list [<opciones>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<opciones>] <ruta>"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <worktree> <nueva-ruta>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<opciones>]"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<opciones>] <worktree>"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <ruta>"
-#: builtin/worktree.c:60 builtin/worktree.c:891
+#: builtin/worktree.c:61 builtin/worktree.c:933
#, c-format
msgid "failed to delete '%s'"
msgstr "falló al borrar '%s'"
-#: builtin/worktree.c:79
+#: builtin/worktree.c:74
#, c-format
-msgid "Removing worktrees/%s: not a valid directory"
-msgstr "Removiendo el worktrees/%s: no es un directorio válido"
+msgid "Removing %s/%s: %s"
+msgstr "Eliminando %s/%s: %s"
-#: builtin/worktree.c:85
-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
-msgstr "Removiendo worktrees/%s: archivo gitdir no existe"
-
-#: builtin/worktree.c:90 builtin/worktree.c:99
-#, c-format
-msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
-msgstr "Removiendo worktrees/%s: no es posible leer el archivo gitdir (%s)"
-
-#: builtin/worktree.c:109
-#, 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)"
-
-#: builtin/worktree.c:117
-#, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
-msgstr "Removiendo worktrees/%s: archivo gitdir inválido"
-
-#: builtin/worktree.c:126
-#, c-format
-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
-msgstr ""
-"Removiendo worktrees/%s: archivo gitdir apunta a una ubicación no existente"
-
-#: builtin/worktree.c:165
+#: builtin/worktree.c:149
msgid "report pruned working trees"
msgstr "reporta árboles de trabajo recortados"
-#: builtin/worktree.c:167
+#: builtin/worktree.c:151
msgid "expire working trees older than <time>"
msgstr "expirar árboles de trabajo más viejos a <tiempo>"
-#: builtin/worktree.c:234
+#: builtin/worktree.c:221
#, c-format
msgid "'%s' already exists"
msgstr "'%s' ya existe"
-#: builtin/worktree.c:244
+#: builtin/worktree.c:230
#, 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:249
+#: builtin/worktree.c:235
#, 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:251
+#: builtin/worktree.c:237
#, 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:301
+#: builtin/worktree.c:288
#, c-format
msgid "could not create directory of '%s'"
msgstr "no se pudo crear directorio de '%s'"
-#: builtin/worktree.c:432 builtin/worktree.c:438
+#: builtin/worktree.c:422 builtin/worktree.c:428
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Preparando árbol de trabajo (nueva rama '%s')"
-#: builtin/worktree.c:434
+#: builtin/worktree.c:424
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "Preparando árbol de trabajo (reiniciando rama '%s'; estaba en %s)"
-#: builtin/worktree.c:443
+#: builtin/worktree.c:433
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Preparando árbol de trabajo (haciendo checkout a '%s')"
-#: builtin/worktree.c:449
+#: builtin/worktree.c:439
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Preparando árbol de trabajo (HEAD desacoplado %s)"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:480
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
"hacer checkout a <rama> incluso si ya ha hecho checkout en otro árbol de "
"trabajo"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:483
msgid "create a new branch"
msgstr "crear una nueva rama"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:485
msgid "create or reset a branch"
msgstr "crear o restablecer una rama"
-#: builtin/worktree.c:497
+#: builtin/worktree.c:487
msgid "populate the new working tree"
msgstr "popular el nuevo árbol de trabajo"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:488
msgid "keep the new working tree locked"
msgstr "mantener el nuevo árbol de trabajo bloqueado"
-#: builtin/worktree.c:501
+#: builtin/worktree.c:491
msgid "set up tracking mode (see git-branch(1))"
msgstr "configurando modo tracking (mirar git-branch(1))"
-#: builtin/worktree.c:504
+#: builtin/worktree.c:494
msgid "try to match the new branch name with a remote-tracking branch"
msgstr ""
"intentar emparejar el nuevo nombre de rama con una rama de rastreo remoto"
-#: builtin/worktree.c:512
+#: builtin/worktree.c:502
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B, y --detach son mutuamente exclusivas"
-#: builtin/worktree.c:573
+#: builtin/worktree.c:563
msgid "--[no-]track can only be used if a new branch is created"
msgstr "--[no-]track solo puede ser usado si una nueva rama es creada"
-#: builtin/worktree.c:673
+#: builtin/worktree.c:680
+msgid "show extended annotations and reasons, if available"
+msgstr "mostrar anotaciones ampliadas y motivos, si están disponibles"
+
+#: builtin/worktree.c:682
+msgid "add 'prunable' annotation to worktrees older than <time>"
+msgstr ""
+"agregue la anotación 'podable' a los árboles de trabajo anteriores a <tiempo>"
+
+#: builtin/worktree.c:691
+msgid "--verbose and --porcelain are mutually exclusive"
+msgstr "--verbose and --porcelain son mutuamente exclusivas"
+
+#: builtin/worktree.c:718
msgid "reason for locking"
msgstr "razón para bloquear"
-#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
-#: builtin/worktree.c:919
+#: builtin/worktree.c:730 builtin/worktree.c:763 builtin/worktree.c:837
+#: builtin/worktree.c:961
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' no es un árbol de trabajo"
-#: builtin/worktree.c:687 builtin/worktree.c:720
+#: builtin/worktree.c:732 builtin/worktree.c:765
msgid "The main working tree cannot be locked or unlocked"
msgstr "El árbol de trabajo principal no puede ser bloqueado ni desbloqueado"
-#: builtin/worktree.c:692
+#: builtin/worktree.c:737
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' ya está bloqueado; razón: %s"
-#: builtin/worktree.c:694
+#: builtin/worktree.c:739
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' ya está bloqueado"
-#: builtin/worktree.c:722
+#: builtin/worktree.c:767
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' no está bloqueado"
-#: builtin/worktree.c:763
+#: builtin/worktree.c:808
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
"árboles de trabajo conteniendo submódulos no puede ser movidos o eliminado"
-#: builtin/worktree.c:771
+#: builtin/worktree.c:816
msgid "force move even if worktree is dirty or locked"
msgstr "forzar move incluso si el árbol de trabajo está sucio o bloqueado"
-#: builtin/worktree.c:794 builtin/worktree.c:921
+#: builtin/worktree.c:839 builtin/worktree.c:963
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' es un árbol de trabajo principal"
-#: builtin/worktree.c:799
+#: builtin/worktree.c:844
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "no se pudo descubrir el nombre de destino de '%s'"
-#: builtin/worktree.c:805
-#, c-format
-msgid "target '%s' already exists"
-msgstr "el objetivo '%s' ya existe"
-
-#: builtin/worktree.c:813
+#: builtin/worktree.c:857
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -22015,7 +23460,7 @@
"no se puede mover un árbol de trabajo bloqueado, motivo del bloqueo: %s\n"
"use 'move -f -f' para sobreescribir o desbloquear primero"
-#: builtin/worktree.c:815
+#: builtin/worktree.c:859
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -22023,37 +23468,37 @@
"no se puede mover un árbol de trabajo bloqueado;\n"
"use 'move -f -f' para sobreescribir o desbloquear primero"
-#: builtin/worktree.c:818
+#: builtin/worktree.c:862
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "falló validación, no se puede mover el árbol de trabajo: %s"
-#: builtin/worktree.c:823
+#: builtin/worktree.c:867
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "falló al mover '%s' a '%s'"
-#: builtin/worktree.c:871
+#: builtin/worktree.c:913
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "falló al ejecutar 'git status' en '%s'"
-#: builtin/worktree.c:875
+#: builtin/worktree.c:917
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
"'%s' contiene archivos no rastreados o modificados, use --force para borrarlo"
-#: builtin/worktree.c:880
+#: builtin/worktree.c:922
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "no se pudo ejecutar 'git status' en '%s', código %d"
-#: builtin/worktree.c:903
+#: builtin/worktree.c:945
msgid "force removal even if worktree is dirty or locked"
msgstr "forzar remoción incluso si el árbol de trabajo está sucio o bloqueado"
-#: builtin/worktree.c:926
+#: builtin/worktree.c:968
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -22062,7 +23507,7 @@
"no se pueden eliminar árbol de trabajo bloqueado, razón del bloqueo: %s\n"
"use 'remove -f -f' para sobreescribir o desbloquear primero"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:970
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -22070,11 +23515,21 @@
"no se pueden eliminar árbol de trabajo bloqueado;\n"
"use 'remove -f -f' para sobreescribir o desbloquear primero"
-#: builtin/worktree.c:931
+#: builtin/worktree.c:973
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "falló validación, no se puede eliminar árbol de trabajo: %s"
+#: builtin/worktree.c:997
+#, c-format
+msgid "repair: %s: %s"
+msgstr "reparar: %s: %s"
+
+#: builtin/worktree.c:1000
+#, c-format
+msgid "error: %s: %s"
+msgstr "error: %s: %s"
+
#: builtin/write-tree.c:15
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr "git write-tree [--missing-ok] [--prefix=<prefijo>/]"
@@ -22091,45 +23546,37 @@
msgid "only useful for debugging"
msgstr "sólo útil para depurar"
-#: fast-import.c:3125
+#: http-fetch.c:118
#, c-format
-msgid "Expected 'mark' command, got %s"
-msgstr "Se esperaba comando 'mark', se obtuvo %s"
+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')"
-#: fast-import.c:3130
-#, c-format
-msgid "Expected 'to' command, got %s"
-msgstr "Se esperaba comando 'to', se obtuvo %s"
+#: http-fetch.c:128
+msgid "not a git repository"
+msgstr "no es un repositorio git"
-#: fast-import.c:3254
-#, c-format
-msgid "feature '%s' forbidden in input without --allow-unsafe-features"
-msgstr "característica '%s' prohibida en input sin --allow-unsafe-features"
+#: http-fetch.c:134
+msgid "--packfile requires --index-pack-args"
+msgstr "--packfile requiere --index-pack-args"
-#: credential-cache--daemon.c:223
-#, c-format
-msgid ""
-"The permissions on your socket directory are too loose; other\n"
-"users may be able to read your cached credentials. Consider running:\n"
-"\n"
-"\tchmod 0700 %s"
-msgstr ""
-"Los permisos en tu directorio de socket son demasiado flojos; otros\n"
-"usuarios pueden leer sus credenciales almacenadas en caché. Considera "
-"ejecutar:\n"
-"\n"
-"\tchmod 0700 %s"
+#: http-fetch.c:143
+msgid "--index-pack-args can only be used with --packfile"
+msgstr "--index-pack-args solo se puede usar con --packfile"
-#: credential-cache--daemon.c:272
-msgid "print debugging messages to stderr"
-msgstr "mostrar mensajes de debug en stderr"
+#: t/helper/test-fast-rebase.c:141
+msgid "unhandled options"
+msgstr "opciones no manejadas"
-#: t/helper/test-reach.c:152
+#: t/helper/test-fast-rebase.c:146
+msgid "error preparing revisions"
+msgstr "error al preparar revisiones"
+
+#: t/helper/test-reach.c:154
#, c-format
msgid "commit %s is not marked reachable"
msgstr "commit %s no está marcado como alcanzable"
-#: t/helper/test-reach.c:162
+#: t/helper/test-reach.c:164
msgid "too many commits marked reachable"
msgstr "demasiados commits marcados como alcanzables"
@@ -22141,23 +23588,26 @@
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"
" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
"bare]\n"
" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
" <command> [<args>]"
msgstr ""
"git [--version] [--help] [-C <ruta>] [-c <nombre>=<valor>]\n"
-" [--exec-path[=<ruta>]] [--html-path] [--man-path] [--info-path]\n"
-" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+" [--exec-path [= <path>]] [--html-path] [--man-path] [--info-"
+"path]\n"
+" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
"bare]\n"
-" [--git-dir=<ruta>] [--work-tree=<ruta>] [--namespace=<nombre>]\n"
-" <comando> [<args>]"
+" [--git-dir=<ruta>] [--work-tree=<ruta>] [--namespace=<nombre>]\n"
+" [--super-prefix=<ruta>] [--config-env=<nombre>=<envvar>]\n"
+" <comando> [<args>]"
-#: git.c:34
+#: git.c:36
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"
@@ -22169,47 +23619,47 @@
"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:188
#, c-format
msgid "no directory given for --git-dir\n"
msgstr "no se entregó directorio para --git-dir\n"
-#: git.c:200
+#: git.c:202
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "no se entregó namespace para --namespace\n"
-#: git.c:214
+#: git.c:216
#, c-format
msgid "no directory given for --work-tree\n"
msgstr "no se entregó directorio para --work-tree\n"
-#: git.c:228
+#: git.c:230
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr "no se entregó prefijo para --super-prefix\n"
-#: git.c:250
+#: git.c:252
#, c-format
msgid "-c expects a configuration string\n"
msgstr "-c espera un string de configuración\n"
-#: git.c:288
+#: git.c:292
#, c-format
msgid "no directory given for -C\n"
msgstr "no se entregó directorio para -C\n"
-#: git.c:314
+#: git.c:318
#, c-format
msgid "unknown option: %s\n"
msgstr "opción %s desconocida\n"
-#: git.c:360
+#: git.c:367
#, c-format
msgid "while expanding alias '%s': '%s'"
msgstr "al expandir el alias '%s':'%s'"
-#: git.c:369
+#: git.c:376
#, c-format
msgid ""
"alias '%s' changes environment variables.\n"
@@ -22218,39 +23668,39 @@
"alias '%s' cambia las variables de entorno.\n"
"Puedes usar '!git' en el alias para hacer esto"
-#: git.c:376
+#: git.c:383
#, c-format
msgid "empty alias for %s"
msgstr "alias vacío para %s"
-#: git.c:379
+#: git.c:386
#, c-format
msgid "recursive alias: %s"
msgstr "alias recursivo: %s"
-#: git.c:459
+#: git.c:468
msgid "write failure on standard output"
msgstr "error de escritura en standard output"
-#: git.c:461
+#: git.c:470
msgid "unknown write failure on standard output"
msgstr "error desconocido de escritura en standard output"
-#: git.c:463
+#: git.c:472
msgid "close failed on standard output"
msgstr "cierre falló en standard output"
-#: git.c:793
+#: git.c:823
#, 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:873
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "no se puede manejar %s como un builtin"
-#: git.c:856
+#: git.c:886
#, c-format
msgid ""
"usage: %s\n"
@@ -22261,55 +23711,55 @@
"\n"
"\n"
-#: git.c:876
+#: git.c:906
#, 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:918
#, 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:1086
+#: http.c:1132
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "Backend SSL no soportado '%s'. Backends SSL soportados:"
-#: http.c:1093
+#: 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:1097
+#: 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:1966
+#: http.c:2025
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -22320,123 +23770,154 @@
" preguntaba por: %s\n"
" redireccionamiento: %s"
-#: remote-curl.c:166
+#: remote-curl.c:183
#, c-format
msgid "invalid quoting in push-option value: '%s'"
msgstr "quoting inválido en valor de push-option: '%s'"
-#: remote-curl.c:263
+#: remote-curl.c:307
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "%sinfo/refs no es válido: ¿es este un repositorio git?"
-#: remote-curl.c:364
+#: remote-curl.c:408
msgid "invalid server response; expected service, got flush packet"
msgstr ""
"respuesta de servidor inválida; se esperaba servicio, se obtuvo un flush "
"packet"
-#: remote-curl.c:395
+#: remote-curl.c:439
#, c-format
msgid "invalid server response; got '%s'"
msgstr "respuesta de servidor inválida; se obtuvo '%s'"
-#: remote-curl.c:455
+#: remote-curl.c:499
#, c-format
msgid "repository '%s' not found"
msgstr "repositorio '%s' no encontrado"
-#: remote-curl.c:459
+#: remote-curl.c:503
#, c-format
msgid "Authentication failed for '%s'"
msgstr "Autenticación falló para '%s'"
-#: remote-curl.c:463
+#: remote-curl.c:507
#, c-format
msgid "unable to access '%s': %s"
msgstr "no es posible acceder '%s':%s"
-#: remote-curl.c:469
+#: remote-curl.c:513
#, c-format
msgid "redirecting to %s"
msgstr "redirigiendo a %s"
-#: remote-curl.c:593
+#: remote-curl.c:642
msgid "shouldn't have EOF when not gentle on EOF"
msgstr "no debería tener EOF cuando no es gentil en EOF"
-#: remote-curl.c:673
+#: remote-curl.c:654
+msgid "remote server sent stateless separator"
+msgstr "el servidor remoto envió un separador sin estado (stateless)"
+
+#: remote-curl.c:724
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr ""
"no es posible rebobinar rpc post data - intenta incrementando http.postBuffer"
-#: remote-curl.c:733
+#: remote-curl.c:754
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr "remote-curl: mal caracter de largo de línea: %.4s"
+
+#: remote-curl.c:756
+msgid "remote-curl: unexpected response end packet"
+msgstr "remote-curl: packet de respuesta final inesperado"
+
+#: remote-curl.c:832
#, c-format
msgid "RPC failed; %s"
msgstr "RPC falló; %s"
-#: remote-curl.c:773
+#: remote-curl.c:872
msgid "cannot handle pushes this big"
msgstr "no se puede manejar pushes tan grandes"
-#: remote-curl.c:888
+#: remote-curl.c:987
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr "no se puede desinflar el request; zlib deflate error %d"
-#: remote-curl.c:892
+#: remote-curl.c:991
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr "no se puede desinflar el request; zlib end error %d"
-#: remote-curl.c:1023
+#: remote-curl.c:1041
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr "%d bytes de header de longitud fueron recibidos"
+
+#: remote-curl.c:1043
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr "%d bytes de cuerpo se siguen esperando"
+
+#: remote-curl.c:1132
msgid "dumb http transport does not support shallow capabilities"
msgstr "dump http transport no soporta capacidades superficiales"
-#: remote-curl.c:1038
+#: remote-curl.c:1147
msgid "fetch failed."
msgstr "fetch falló."
-#: remote-curl.c:1086
+#: remote-curl.c:1193
msgid "cannot fetch by sha1 over smart http"
msgstr "no se puede hacer fetch por sha1 sobre smart http"
-#: remote-curl.c:1130 remote-curl.c:1136
+#: remote-curl.c:1237 remote-curl.c:1243
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "error de protocolo: se esperaba sha/ref, se obtuvo '%s'"
-#: remote-curl.c:1148 remote-curl.c:1263
+#: remote-curl.c:1255 remote-curl.c:1373
#, c-format
msgid "http transport does not support %s"
msgstr "http transport no soporta %s"
-#: remote-curl.c:1184
+#: remote-curl.c:1291
msgid "git-http-push failed"
msgstr "git-http-push falló"
-#: remote-curl.c:1369
+#: remote-curl.c:1479
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl: uso: git remote-curl <remote> [<url>]"
-#: remote-curl.c:1401
+#: remote-curl.c:1511
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl: error leyendo command stream de git"
-#: remote-curl.c:1408
+#: remote-curl.c:1518
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl: fetch intentado sin un repositorio local"
-#: remote-curl.c:1448
+#: remote-curl.c:1559
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl: comando '%s' desconocido de git"
-#: list-objects-filter-options.h:85
+#: 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:91
msgid "args"
msgstr "args"
-#: list-objects-filter-options.h:86
+#: list-objects-filter-options.h:92
msgid "object filtering"
msgstr "filtrado de objeto"
@@ -22457,8 +23938,8 @@
msgstr "ser más discreto"
#: parse-options.h:317
-msgid "use <n> digits to display SHA-1s"
-msgstr "usa <n> dígitos para mostrar SHA-1s"
+msgid "use <n> digits to display object names"
+msgstr "use <n> dígitos para mostrar los nombres de los objetos"
#: parse-options.h:336
msgid "how to strip spaces and #comments from message"
@@ -22475,11 +23956,11 @@
"con --pathspec-from-file, elementos de pathspec son separados con caracter "
"NUL"
-#: ref-filter.h:101
+#: ref-filter.h:99
msgid "key"
msgstr "clave"
-#: ref-filter.h:101
+#: ref-filter.h:99
msgid "field name to sort on"
msgstr "nombre del campo por el cuál ordenar"
@@ -22489,14 +23970,6 @@
"actualizar el índice con la resolución de conflictos reutilizada si es "
"posible"
-#: wt-status.h:67
-msgid "HEAD detached at "
-msgstr "HEAD desacoplada en "
-
-#: wt-status.h:68
-msgid "HEAD detached from "
-msgstr "HEAD desacoplada de "
-
#: command-list.h:50
msgid "Add file contents to the index"
msgstr "Agrega contenido de carpetas al índice"
@@ -22535,690 +24008,670 @@
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 "Run a Git command on a list of repositories"
+msgstr "Ejecute un comando de Git en una lista de repositorios"
+
+#: command-list.h:100
msgid "Prepare patches for e-mail submission"
msgstr "Prepara parches para ser enviados por e-mail"
-#: command-list.h:99
+#: command-list.h:101
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:102
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:103
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:104
msgid "Print lines matching a pattern"
msgstr "Imprime las líneas que concuerdan con el patron"
-#: command-list.h:103
+#: command-list.h:105
msgid "A portable graphical interface to Git"
msgstr "Una interfaz gráfica portátil para Git"
-#: command-list.h:104
+#: command-list.h:106
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:107
msgid "Display help information about Git"
msgstr "Mostrar información sobre Git"
-#: command-list.h:106
+#: command-list.h:108
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:109
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:110
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:111
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:112
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:113
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:114
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:115
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:116
msgid "The Git repository browser"
msgstr "El navegador de repositorio Git"
-#: command-list.h:115
+#: command-list.h:117
msgid "Show commit logs"
msgstr "Muestra los logs de los commits"
-#: command-list.h:116
+#: command-list.h:118
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:119
msgid "List references in a remote repository"
msgstr "Lista referencias en un repositorio remoto"
-#: command-list.h:118
+#: command-list.h:120
msgid "List the contents of a tree object"
msgstr "Lista los contenidos de un objeto árbol"
-#: command-list.h:119
+#: command-list.h:121
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:122
msgid "Simple UNIX mbox splitter program"
msgstr "Programa divisor de mbox simple de UNIX"
-#: command-list.h:121
+#: command-list.h:123
+msgid "Run tasks to optimize Git repository data"
+msgstr "Ejecute tareas para optimizar los datos del repositorio de Git"
+
+#: command-list.h:124
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:125
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:126
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:127
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:128
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:129
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:130
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:131
msgid "Write and verify multi-pack-indexes"
msgstr "Escribe y verifica archivos multi-pack-index"
-#: command-list.h:129
-msgid "Creates a tag object"
-msgstr "Crea un objeto tag"
+#: command-list.h:132
+msgid "Creates a tag object with extra validation"
+msgstr "Crea un objeto de etiqueta con validación adicional"
-#: command-list.h:130
+#: command-list.h:133
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:134
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:135
msgid "Find symbolic names for given revs"
msgstr "Encontrar nombres simbólicos para revs dados"
-#: command-list.h:133
+#: command-list.h:136
msgid "Add or inspect object notes"
msgstr "Agrega o inspecciona objetos nota"
-#: command-list.h:134
+#: command-list.h:137
msgid "Import from and submit to Perforce repositories"
msgstr "Importar desde y enviar a repositorios Perforce"
-#: command-list.h:135
+#: command-list.h:138
msgid "Create a packed archive of objects"
msgstr "Crea un archivo de objetos empaquetados"
-#: command-list.h:136
+#: command-list.h:139
msgid "Find redundant pack files"
msgstr "Encuentra archivos empaquetados de manera redundante"
-#: command-list.h:137
+#: command-list.h:140
msgid "Pack heads and tags for efficient repository access"
msgstr "Empaqueta heads y tags para un acceso eficiente al repositorio"
-#: command-list.h:138
-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:141
msgid "Compute unique ID for a patch"
msgstr "Calcular ID único para un parche"
-#: command-list.h:140
+#: command-list.h:142
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:143
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:144
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:145
msgid "Update remote refs along with associated objects"
msgstr "Actualiza referencias remotas junto con sus objetos asociados"
-#: command-list.h:144
+#: command-list.h:146
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:147
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:148
msgid "Reads tree information into the index"
msgstr "Lee información del ábol en el índice"
-#: command-list.h:147
+#: command-list.h:149
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:150
msgid "Receive what is pushed into the repository"
msgstr "Recibir lo que es empujado en el respositorio"
-#: command-list.h:149
+#: command-list.h:151
msgid "Manage reflog information"
msgstr "Gestionar información de reflog"
-#: command-list.h:150
+#: command-list.h:152
msgid "Manage set of tracked repositories"
msgstr "Gestiona un conjunto de repositorios rastreados"
-#: command-list.h:151
+#: command-list.h:153
msgid "Pack unpacked objects in a repository"
msgstr "Empaquetar objetos no empaquetados en un repositorio"
-#: command-list.h:152
+#: command-list.h:154
msgid "Create, list, delete refs to replace objects"
msgstr "Crea, lista, borra referencias para reemplazar objetos"
-#: command-list.h:153
+#: command-list.h:155
msgid "Generates a summary of pending changes"
msgstr "Genera un resumen de cambios pendientes"
-#: command-list.h:154
+#: command-list.h:156
msgid "Reuse recorded resolution of conflicted merges"
msgstr "Reutilizar la resolución registrada de fusiones conflictivas"
-#: command-list.h:155
+#: command-list.h:157
msgid "Reset current HEAD to the specified state"
msgstr "Reinicia el HEAD actual a un estado especifico"
-#: command-list.h:156
+#: command-list.h:158
msgid "Restore working tree files"
msgstr "Restaurar archivos de árboles de trabajo"
-#: command-list.h:157
+#: command-list.h:159
msgid "Revert some existing commits"
msgstr "Revierte algunos commits existentes"
-#: command-list.h:158
+#: command-list.h:160
msgid "Lists commit objects in reverse chronological order"
msgstr "Lista objetos commit en orden cronológico inverso"
-#: command-list.h:159
+#: command-list.h:161
msgid "Pick out and massage parameters"
msgstr "Seleccionar y masajear los parámetros"
-#: command-list.h:160
+#: command-list.h:162
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:163
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:164
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:165
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:166
msgid "Summarize 'git log' output"
msgstr "Resumir la salida 'git log'"
-#: command-list.h:165
+#: command-list.h:167
msgid "Show various types of objects"
msgstr "Muestra varios tipos de objetos"
-#: command-list.h:166
+#: command-list.h:168
msgid "Show branches and their commits"
msgstr "Mostrar ramas y sus commits"
-#: command-list.h:167
+#: command-list.h:169
msgid "Show packed archive index"
msgstr "Mostrar el índice de archivo empaquetado"
-#: command-list.h:168
+#: command-list.h:170
msgid "List references in a local repository"
msgstr "Listar referencias en el repositorio local"
-#: command-list.h:169
+#: command-list.h:171
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:172
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:173
msgid "Initialize and modify the sparse-checkout"
msgstr "Inicializa y modifica el sparse-checkout"
-#: command-list.h:172
+#: command-list.h:174
msgid "Stash the changes in a dirty working directory away"
msgstr ""
"Poner en un stash los cambios en un directorio de trabajo sucio de todas "
"maneras"
-#: command-list.h:173
+#: command-list.h:175
msgid "Add file contents to the staging area"
msgstr "Agrega contenidos de un archivo al área de staging"
-#: command-list.h:174
+#: command-list.h:176
msgid "Show the working tree status"
msgstr "Muestra el estado del árbol de trabajo"
-#: command-list.h:175
+#: command-list.h:177
msgid "Remove unnecessary whitespace"
msgstr "Eliminar el espacio en blanco innecesario"
-#: command-list.h:176
+#: command-list.h:178
msgid "Initialize, update or inspect submodules"
msgstr "Inicializa, actualiza o inspecciona submódulos"
-#: command-list.h:177
+#: command-list.h:179
msgid "Bidirectional operation between a Subversion repository and Git"
msgstr "Operación bidireccional entre un repositorio Subversion y Git"
-#: command-list.h:178
+#: command-list.h:180
msgid "Switch branches"
msgstr "Cambiar branches"
-#: command-list.h:179
+#: command-list.h:181
msgid "Read, modify and delete symbolic refs"
msgstr "Lee, modifica y borra referencias simbólicas"
-#: command-list.h:180
+#: command-list.h:182
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr "Crea, lista, borra o verifica un tag de objeto firmado con GPG"
-#: command-list.h:181
+#: command-list.h:183
msgid "Creates a temporary file with a blob's contents"
msgstr "Crea un archivo temporal con contenidos de un blob"
-#: command-list.h:182
+#: command-list.h:184
msgid "Unpack objects from a packed archive"
msgstr "Desempaqueta objetos de un archivo empaquetado"
-#: command-list.h:183
+#: command-list.h:185
msgid "Register file contents in the working tree to the index"
msgstr "Registra contenidos de archivos en el árbol de trabajo al índice"
-#: command-list.h:184
+#: command-list.h:186
msgid "Update the object name stored in a ref safely"
msgstr ""
"Actualiza el nombre del objeto almacenado en una referencia de forma segura"
-#: command-list.h:185
+#: command-list.h:187
msgid "Update auxiliary info file to help dumb servers"
msgstr ""
"Actualiza el archivo de información auxiliar para ayudar a los servidores "
"dumb"
-#: command-list.h:186
+#: command-list.h:188
msgid "Send archive back to git-archive"
msgstr "Enviar archivo a git-archive"
-#: command-list.h:187
+#: command-list.h:189
msgid "Send objects packed back to git-fetch-pack"
msgstr "Enviar objetos empaquetados a git-fetch-pack"
-#: command-list.h:188
+#: command-list.h:190
msgid "Show a Git logical variable"
msgstr "Mostrar una variable lógica de Git"
-#: command-list.h:189
+#: command-list.h:191
msgid "Check the GPG signature of commits"
msgstr "Verificar firma GPG de commits"
-#: command-list.h:190
+#: command-list.h:192
msgid "Validate packed Git archive files"
msgstr "Valida archivos Git empaquetados"
-#: command-list.h:191
+#: command-list.h:193
msgid "Check the GPG signature of tags"
msgstr "Verifica la firma GPG de etiquetas"
-#: command-list.h:192
+#: command-list.h:194
msgid "Git web interface (web frontend to Git repositories)"
msgstr "Interfaz web Git (interfaz web para repositorios Git)"
-#: command-list.h:193
+#: command-list.h:195
msgid "Show logs with difference each commit introduces"
msgstr "Muestra logs con las diferencias que cada commit introduce"
-#: command-list.h:194
+#: command-list.h:196
msgid "Manage multiple working trees"
msgstr "Gestiona múltiples árboles de trabajo"
-#: command-list.h:195
+#: command-list.h:197
msgid "Create a tree object from the current index"
msgstr "Crea un objeto árbol del índice actual"
-#: command-list.h:196
+#: command-list.h:198
msgid "Defining attributes per path"
msgstr "Definiendo atributos por ruta"
-#: command-list.h:197
+#: command-list.h:199
msgid "Git command-line interface and conventions"
msgstr "Interfaz y convenciones de línea de comandos de Git"
-#: command-list.h:198
+#: command-list.h:200
msgid "A Git core tutorial for developers"
msgstr "Un tutorial básico de Git para desarrolladores"
-#: command-list.h:199
+#: command-list.h:201
+msgid "Providing usernames and passwords to Git"
+msgstr "Proporcionar nombres de usuario y contraseñas a Git"
+
+#: command-list.h:202
msgid "Git for CVS users"
msgstr "Git para usuarios CVS"
-#: command-list.h:200
+#: command-list.h:203
msgid "Tweaking diff output"
msgstr "Afinar la salida de diff"
-#: command-list.h:201
+#: command-list.h:204
msgid "A useful minimum set of commands for Everyday Git"
msgstr "Un conjunto mínimo útil de comandos diarios de Git"
-#: command-list.h:202
+#: command-list.h:205
+msgid "Frequently asked questions about using Git"
+msgstr "Preguntas frecuentes sobre el uso de Git"
+
+#: command-list.h:206
msgid "A Git Glossary"
msgstr "Un Glosario de Git"
-#: command-list.h:203
+#: command-list.h:207
msgid "Hooks used by Git"
msgstr "Hooks utilizados por Git"
-#: command-list.h:204
+#: command-list.h:208
msgid "Specifies intentionally untracked files to ignore"
msgstr "Especifica de forma intencional archivos sin seguimiento a ignorar"
-#: command-list.h:205
+#: command-list.h:209
+msgid "Map author/committer names and/or E-Mail addresses"
+msgstr ""
+"Mapear nombres de autor/ nombre de commiter y/o direcciones de correo "
+"electrónico"
+
+#: command-list.h:210
msgid "Defining submodule properties"
msgstr "Definiendo las propiedades del submódulo"
-#: command-list.h:206
+#: command-list.h:211
msgid "Git namespaces"
msgstr "Namespaces de Git"
-#: command-list.h:207
+#: command-list.h:212
+msgid "Helper programs to interact with remote repositories"
+msgstr "Programas de ayuda para interactuar con repositorios remotos"
+
+#: command-list.h:213
msgid "Git Repository Layout"
msgstr "Disposición del repositorio Git"
-#: command-list.h:208
+#: command-list.h:214
msgid "Specifying revisions and ranges for Git"
msgstr "Especificando revisiones y rangos para Git"
-#: command-list.h:209
+#: command-list.h:215
msgid "Mounting one repository inside another"
msgstr "Montando un repositorio dentro de otro"
-#: command-list.h:210
+#: command-list.h:216
msgid "A tutorial introduction to Git: part two"
msgstr "Un tutorial de introducción a Git: parte dos"
-#: command-list.h:211
+#: command-list.h:217
msgid "A tutorial introduction to Git"
msgstr "Un tutorial de introducción para Git"
-#: command-list.h:212
+#: command-list.h:218
msgid "An overview of recommended workflows with Git"
msgstr "Una visión general de flujos de trabajo recomendados con Git"
-#: git-bisect.sh:54
-msgid "You need to start by \"git bisect start\""
-msgstr "Debes iniciar 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 "¿Quieres que lo haga por ti [Y/n]? "
-
-#: git-bisect.sh:101
-#, sh-format
-msgid "Bad rev input: $arg"
-msgstr "Mala entrada rev: $arg"
-
-#: git-bisect.sh:121
-#, sh-format
-msgid "Bad rev input: $bisected_head"
-msgstr "Mala entrada rev: $bisected_head"
-
-#: git-bisect.sh:130
-#, sh-format
-msgid "Bad rev input: $rev"
-msgstr "Mala entrada rev: $rev"
-
-#: git-bisect.sh:139
-#, sh-format
-msgid "'git bisect $TERM_BAD' can take only one argument."
-msgstr "'git bisect $TERM_BAD' solo puede tomar un argumento."
-
-#: git-bisect.sh:209
-msgid "No logfile given"
-msgstr "Ningún logfile proporcionado"
-
-#: git-bisect.sh:210
-#, sh-format
-msgid "cannot read $file for replaying"
-msgstr "no se puede leer $file para reproducir"
-
-#: git-bisect.sh:232
-msgid "?? what are you talking about?"
-msgstr "?? ¿De qué estás hablando?"
-
-#: git-bisect.sh:241
+#: git-bisect.sh:68
msgid "bisect run failed: no command provided."
msgstr "bisect falló: no se proveyó comando."
-#: git-bisect.sh:246
+#: git-bisect.sh:73
#, sh-format
msgid "running $command"
msgstr "ejecutando $command"
-#: git-bisect.sh:253
+#: git-bisect.sh:80
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -23227,27 +24680,23 @@
"bisect falló:\n"
"código de salida $res de '$command' es <0 o >=128"
-#: git-bisect.sh:279
+#: git-bisect.sh:105
msgid "bisect run cannot continue any more"
msgstr "bisect no puede seguir continuando"
-#: git-bisect.sh:285
+#: git-bisect.sh:111
#, sh-format
msgid ""
"bisect run failed:\n"
-"'bisect_state $state' exited with error code $res"
+"'bisect-state $state' exited with error code $res"
msgstr ""
-"bisect falló:\n"
-"'bisect_state $state' salió con código de error $res"
+"bisect run falló:\n"
+"'bisect-state $state' salió con el código de error $res"
-#: git-bisect.sh:292
+#: git-bisect.sh:118
msgid "bisect run success"
msgstr "bisect exitoso"
-#: git-bisect.sh:300
-msgid "We are not bisecting."
-msgstr "No estamos bisecando."
-
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
@@ -23288,132 +24737,50 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "Fusión simple no funcionó, intentando fusión automática."
-#: git-legacy-stash.sh:221
-msgid "Cannot remove temporary index (can't happen)"
-msgstr "No se puede eliminar el índice temporal (no puede suceder)"
-
-#: git-legacy-stash.sh:272
-#, sh-format
-msgid "Cannot update $ref_stash with $w_commit"
-msgstr "No se puede actualizar $ref_stash con $w_commit"
-
-#: git-legacy-stash.sh:324
-#, sh-format
-msgid "error: unknown option for 'stash push': $option"
-msgstr "error: opción desconocida para 'stash pus': $option"
-
-#: git-legacy-stash.sh:356
-#, sh-format
-msgid "Saved working directory and index state $stash_msg"
-msgstr "Directorio de trabajo guardado y estado de índice $stash_msg"
-
-#: git-legacy-stash.sh:536
-#, sh-format
-msgid "unknown option: $opt"
-msgstr "opción desconocida: $opt"
-
-#: git-legacy-stash.sh:556
-#, sh-format
-msgid "Too many revisions specified: $REV"
-msgstr "Se especificaron demasiadas revisiones: $REV"
-
-#: git-legacy-stash.sh:571
-#, sh-format
-msgid "$reference is not a valid reference"
-msgstr "$reference no es una referencia válida"
-
-#: git-legacy-stash.sh:599
-#, sh-format
-msgid "'$args' is not a stash-like commit"
-msgstr "'$args' no es un commit estilo stash"
-
-#: git-legacy-stash.sh:610
-#, sh-format
-msgid "'$args' is not a stash reference"
-msgstr "'$args' no es una referencia stash"
-
-#: git-legacy-stash.sh:618
-msgid "unable to refresh index"
-msgstr "incapaz de refrescar el índice"
-
-#: git-legacy-stash.sh:622
-msgid "Cannot apply a stash in the middle of a merge"
-msgstr "No se puede aplicar un stash en medio de una fusión"
-
-#: git-legacy-stash.sh:630
-msgid "Conflicts in index. Try without --index."
-msgstr "Conflictos en índice. Intente sin --index."
-
-#: git-legacy-stash.sh:632
-msgid "Could not save index tree"
-msgstr "No se puede guardar el índice del árbol"
-
-#: git-legacy-stash.sh:641
-msgid "Could not restore untracked files from stash entry"
-msgstr "No se pueden restaurar archivos no rastreados de la entrada stash"
-
-#: git-legacy-stash.sh:666
-msgid "Cannot unstage modified files"
-msgstr "No se puede sacar de stage archivos modificados"
-
-#: git-legacy-stash.sh:704
-#, sh-format
-msgid "Dropped ${REV} ($s)"
-msgstr "Botado ${REV} ($s)"
-
-#: git-legacy-stash.sh:705
-#, sh-format
-msgid "${REV}: Could not drop stash entry"
-msgstr "${REV}: No se pudo borrar entrada stash"
-
-#: git-legacy-stash.sh:792
-msgid "(To restore them type \"git stash apply\")"
-msgstr "(Para restaurarlos, escribe \"git stash apply\")"
-
-#: git-submodule.sh:203
+#: git-submodule.sh:179
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"La ruta relativa sólo se puede usar desde el nivel superior del árbol de "
"trabajo"
-#: git-submodule.sh:213
+#: git-submodule.sh:189
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "repo URL: '$repo' debe ser absoluta o iniciar con ./|../"
-#: git-submodule.sh:232
+#: git-submodule.sh:208
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' ya existe en el índice"
-#: git-submodule.sh:235
+#: git-submodule.sh:211
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr "'$sm_path' ya existe en el índice y no es un submódulo"
-#: git-submodule.sh:242
+#: git-submodule.sh:218
#, sh-format
msgid "'$sm_path' does not have a commit checked out"
msgstr "'$sm_path' no tiene un commit checked out"
-#: git-submodule.sh:273
+#: git-submodule.sh:249
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Agregando el repositorio existente en '$sm_path' al índice"
-#: git-submodule.sh:275
+#: git-submodule.sh:251
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' ya existe y no es un repositorio git válido"
-#: git-submodule.sh:283
+#: git-submodule.sh:259
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
"Se encontró localmente un directorio git para '$sm_name' con el(los) "
"remoto(s):"
-#: git-submodule.sh:285
+#: git-submodule.sh:261
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -23430,39 +24797,39 @@
"o no estás seguro de lo que esto significa, escoge otro nombre con la opción "
"'--name'."
-#: git-submodule.sh:291
+#: git-submodule.sh:267
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "Reactivar directorio git local para el submódulo '$sm_name'."
-#: git-submodule.sh:303
+#: git-submodule.sh:279
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "No es posible hacer checkout al submódulo '$sm_path'"
-#: git-submodule.sh:308
+#: git-submodule.sh:284
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Falló al agregar el submódulo '$sm_path'"
-#: git-submodule.sh:317
+#: git-submodule.sh:293
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Falló al registrar el submódulo '$sm_path'"
-#: git-submodule.sh:590
+#: git-submodule.sh:568
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
"No se pudo encontrar la revisión actual en la ruta de submódulo "
"'$displaypath'"
-#: git-submodule.sh:600
+#: git-submodule.sh:578
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "No es posible realizar fetch en la ruta de submódulo '$sm_path'"
-#: git-submodule.sh:605
+#: git-submodule.sh:583
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -23471,7 +24838,7 @@
"No es posible encontrar revisión actual ${remote_name}/${branch} en la ruta "
"de submódulo '$sm_path'"
-#: git-submodule.sh:623
+#: git-submodule.sh:601
#, sh-format
msgid ""
"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
@@ -23480,7 +24847,7 @@
"No es posible realizar fetch en la ruta de submódulo '$displaypath'; "
"intentando hacer un fetch directo $sha1:"
-#: git-submodule.sh:629
+#: git-submodule.sh:607
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -23489,85 +24856,55 @@
"Fetch realizado en ruta de submódulo '$displaypath', pero no contenía $sha1. "
"Fetch directo del commit falló."
-#: git-submodule.sh:636
+#: git-submodule.sh:614
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "No es posible revisar '$sha1' en la ruta de submódulo '$displaypath'"
-#: git-submodule.sh:637
+#: git-submodule.sh:615
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Ruta de submódulo '$displaypath': check out realizado a '$sha1'"
-#: git-submodule.sh:641
+#: git-submodule.sh:619
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
"No se posible ejecutar rebase a '$sha1' en la ruta de submódulo "
"'$displaypath'"
-#: git-submodule.sh:642
+#: git-submodule.sh:620
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Ruta de submódulo '$displaypath': rebasada en '$sha1'"
-#: git-submodule.sh:647
+#: git-submodule.sh:625
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "Incapaz de fusionar '$sha1' en la ruta del submódulo '$displaypath'"
-#: git-submodule.sh:648
+#: git-submodule.sh:626
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Ruta de submódulo '$displaypath': fusionada en '$sha1'"
-#: git-submodule.sh:653
+#: git-submodule.sh:631
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"Falló la ejecución de '$command $sha1' en la ruta de submódulo "
"'$displaypath'"
-#: git-submodule.sh:654
+#: git-submodule.sh:632
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Ruta de submódulo '$displaypath': '$command $sha1'"
-#: git-submodule.sh:685
+#: git-submodule.sh:663
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Falló al recurrir en la ruta de submódulo '$displaypath'"
-#: git-submodule.sh:896
-msgid "The --cached option cannot be used with the --files option"
-msgstr "La opción --cached no puede ser usada con la opción --files"
-
-#: git-submodule.sh:948
-#, sh-format
-msgid "unexpected mode $mod_dst"
-msgstr "modo $mod_dst inesperado"
-
-#: git-submodule.sh:968
-#, sh-format
-msgid " Warn: $display_name doesn't contain commit $sha1_src"
-msgstr " Advertencia: $display_name no contiene el commit $sha1_src"
-
-#: git-submodule.sh:971
-#, sh-format
-msgid " Warn: $display_name doesn't contain commit $sha1_dst"
-msgstr " Advertencia: $display_name no contiene el commit $sha1_dst"
-
-#: git-submodule.sh:974
-#, sh-format
-msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
-msgstr ""
-" Advertencia: $display_name no contiene los commits $sha1_src y $sha1_dst"
-
-#: git-parse-remote.sh:89
-#, sh-format
-msgid "See git-${cmd}(1) for details."
-msgstr "Véase git-${cmd}(1) para más detalles."
-
#: git-rebase--preserve-merges.sh:109
msgid "Applied autostash."
msgstr "Autostash aplicado."
@@ -23577,12 +24914,23 @@
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)"
msgstr "Rebasando ($new_count/$total)"
-#: git-rebase--preserve-merges.sh:207
+#: git-rebase--preserve-merges.sh:197
msgid ""
"\n"
"Commands:\n"
@@ -23622,7 +24970,7 @@
"Estas líneas pueden ser reordenadas; son ejecutadas desde arriba hacia "
"abajo.\n"
-#: git-rebase--preserve-merges.sh:270
+#: git-rebase--preserve-merges.sh:260
#, sh-format
msgid ""
"You can amend the commit now, with\n"
@@ -23641,83 +24989,83 @@
"\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 es un commit que pueda ser cogido"
-#: git-rebase--preserve-merges.sh:334
+#: git-rebase--preserve-merges.sh:324
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr "Nombre de commit inválido: $sha1"
-#: git-rebase--preserve-merges.sh:364
+#: git-rebase--preserve-merges.sh:354
msgid "Cannot write current commit's replacement sha1"
msgstr "No se puede escribir el remplazo sha1 del commit actual"
-#: git-rebase--preserve-merges.sh:415
+#: git-rebase--preserve-merges.sh:405
#, sh-format
msgid "Fast-forward to $sha1"
msgstr "Avance rápido a $sha1"
-#: git-rebase--preserve-merges.sh:417
+#: git-rebase--preserve-merges.sh:407
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr "No se puede realizar avance rápido 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 se puede mover 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 "Rehusando a ejecutar squash en fusión: $sha1"
-#: git-rebase--preserve-merges.sh:449
+#: git-rebase--preserve-merges.sh:439
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "Error rehaciendo fusión $sha1"
-#: git-rebase--preserve-merges.sh:458
+#: git-rebase--preserve-merges.sh:448
#, sh-format
msgid "Could not pick $sha1"
msgstr "No se pudo coger $sha1"
-#: git-rebase--preserve-merges.sh:467
+#: git-rebase--preserve-merges.sh:457
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "Este es el mensaje del commit #${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 mensaje del commit #${n} será ignorado:"
-#: 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] "Esta es una combinación de $count commit."
msgstr[1] "Esta es la combinación de $count commits."
-#: git-rebase--preserve-merges.sh:492
+#: git-rebase--preserve-merges.sh:482
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "No se puede escribir $fixup_msg"
-#: git-rebase--preserve-merges.sh:495
+#: git-rebase--preserve-merges.sh:485
msgid "This is a combination of 2 commits."
msgstr "Esto es una combinación 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 "No se puede 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"
@@ -23734,31 +25082,31 @@
"problema antes\n"
"de que sea capaz de reformular el commit."
-#: git-rebase--preserve-merges.sh:626
+#: git-rebase--preserve-merges.sh:616
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "Detenido en $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 se puede '$squash_style' sin un commit previo"
-#: git-rebase--preserve-merges.sh:683
+#: git-rebase--preserve-merges.sh:673
#, sh-format
msgid "Executing: $rest"
msgstr "Ejecutando: $rest"
-#: git-rebase--preserve-merges.sh:691
+#: git-rebase--preserve-merges.sh:681
#, sh-format
msgid "Execution failed: $rest"
msgstr "Ejecución fallida: $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 "y hizo cambios al índice y/o al árbol de trabajo"
-#: git-rebase--preserve-merges.sh:695
+#: git-rebase--preserve-merges.sh:685
msgid ""
"You can fix the problem, and then run\n"
"\n"
@@ -23769,7 +25117,7 @@
"\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"
@@ -23784,25 +25132,25 @@
"\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 desconocido: $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 "Por favor, corrige esto 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 "$head_name rebasado y actualizado satisfactoriamente."
-#: git-rebase--preserve-merges.sh:812
+#: git-rebase--preserve-merges.sh:802
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "No se pudo 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"
@@ -23833,12 +25181,12 @@
"\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 ""
"Error tratando de encontrar la identidad del autor para remediar el 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."
@@ -23846,44 +25194,44 @@
"Tienes cambios sin confirmar en tu árbol de trabajo. Por favor, confírmalos\n"
"primero y entonces ejecuta 'git rebase --continue' de nuevo."
-#: 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 se pudo realizar el commit con los cambios en el área de stage."
-#: 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 se pudo ejecutar el editor"
-#: git-rebase--preserve-merges.sh:900
+#: git-rebase--preserve-merges.sh:890
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "No se pudo actualizar el árbol de trabajo a $switch_to"
-#: git-rebase--preserve-merges.sh:907
+#: git-rebase--preserve-merges.sh:897
msgid "No HEAD?"
msgstr "¿Sin HEAD?"
-#: git-rebase--preserve-merges.sh:908
+#: git-rebase--preserve-merges.sh:898
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "No se pudo crear $state_dir temporalmente"
-#: git-rebase--preserve-merges.sh:911
+#: git-rebase--preserve-merges.sh:901
msgid "Could not mark as interactive"
msgstr "No se pudo marcar como interactivo"
-#: 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 $shortrevisions en $shortonto ($todocount comando)"
msgstr[1] "Rebase $shortrevisions en $shortonto ($todocount comandos)"
-#: git-rebase--preserve-merges.sh:955
+#: git-rebase--preserve-merges.sh:945
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
+#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
msgid "Could not init rewritten commits"
msgstr "No se puede inicializar los commits reescritos"
@@ -23962,14 +25310,14 @@
msgid "%12s %12s %s"
msgstr "%12s %12s %s"
-#: git-add--interactive.perl:634
+#: git-add--interactive.perl:632
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] "touch hecho a %d ruta\n"
msgstr[1] "touch hecho a %d rutas\n"
-#: git-add--interactive.perl:1053
+#: git-add--interactive.perl:1056
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
@@ -23977,7 +25325,7 @@
"Si el parche aplica limpiamente, el hunk editado sera marcado\n"
"inmediatamente para el área de stage."
-#: git-add--interactive.perl:1056
+#: git-add--interactive.perl:1059
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
@@ -23985,7 +25333,7 @@
"Si el parche aplica limpiamente, el hunk editado sera marcado\n"
"inmediatamente para aplicar stash."
-#: git-add--interactive.perl:1059
+#: git-add--interactive.perl:1062
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
@@ -23993,8 +25341,8 @@
"Si el parche aplica limpiamente, el hunk editado sera marcado\n"
"inmediatamente para sacar del área de stage."
-#: git-add--interactive.perl:1062 git-add--interactive.perl:1071
-#: git-add--interactive.perl:1077
+#: git-add--interactive.perl:1065 git-add--interactive.perl:1074
+#: git-add--interactive.perl:1080
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
@@ -24002,8 +25350,8 @@
"Si el parche aplica de forma limpia, el hunk editado sera marcado \n"
"inmediatamente para aplicar."
-#: git-add--interactive.perl:1065 git-add--interactive.perl:1068
-#: git-add--interactive.perl:1074
+#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
+#: git-add--interactive.perl:1077
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
@@ -24011,12 +25359,12 @@
"Si el parche aplica de forma limpia, el hunk editado sera marcado\n"
"inmediatamente para descarte."
-#: git-add--interactive.perl:1111
+#: git-add--interactive.perl:1114
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr "falló al abrir el archivo de adición del hunk para escritura: %s"
-#: git-add--interactive.perl:1118
+#: git-add--interactive.perl:1121
#, perl-format
msgid ""
"---\n"
@@ -24029,12 +25377,12 @@
"Para eliminar '%s' líneas, bórrelas.\n"
"Lineas comenzando con %s serán eliminadas.\n"
-#: git-add--interactive.perl:1140
+#: git-add--interactive.perl:1143
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr "falló al abrir el archivo de edición del hunk para lectura: %s"
-#: git-add--interactive.perl:1248
+#: git-add--interactive.perl:1251
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -24049,7 +25397,7 @@
"d - no aplicar stage a este hunk o a ninguno de los posteriores en este "
"archivo"
-#: git-add--interactive.perl:1254
+#: git-add--interactive.perl:1257
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -24063,7 +25411,7 @@
"a - aplicar stash a este hunk y a todos los posteriores en el archivo\n"
"d - no aplicar stash a este hunk o ninguno de los posteriores en el archivo"
-#: git-add--interactive.perl:1260
+#: git-add--interactive.perl:1263
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -24078,7 +25426,7 @@
"d - no sacar del area de stage este hunk o ninguno de los posteriores en el "
"archivo"
-#: git-add--interactive.perl:1266
+#: git-add--interactive.perl:1269
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -24092,7 +25440,7 @@
"a - aplicar este hunk y todos los posteriores en el archivo\n"
"d - no aplicar este hunko ninguno de los posteriores en el archivo"
-#: git-add--interactive.perl:1272 git-add--interactive.perl:1290
+#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -24106,7 +25454,7 @@
"a - descartar este hunk y todos los posteriores en este archivo\n"
"d - no descartar este hunk o ninguno de los posteriores en el archivo"
-#: git-add--interactive.perl:1278
+#: git-add--interactive.perl:1281
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -24120,7 +25468,7 @@
"a - descartar este hunk y todos los posteriores en este archivo\n"
"d - no descartar este hunk o ninguno posterior en el archivo"
-#: git-add--interactive.perl:1284
+#: git-add--interactive.perl:1287
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -24134,7 +25482,7 @@
"a - aplicar este hunk y todos los posteriores en el archivo\n"
"d - no aplicar este hunk o ninguno de los siguientes en este archivo"
-#: git-add--interactive.perl:1296
+#: git-add--interactive.perl:1299
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -24148,7 +25496,7 @@
"a - aplicar este hunk y todos los posteriores en el archivo\n"
"d - no aplicar este hunk o ninguno de los siguientes en este archivo"
-#: git-add--interactive.perl:1311
+#: git-add--interactive.perl:1314
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -24170,85 +25518,90 @@
"e - editar manualmente el hunk actual\n"
"? - imprimir ayuda\n"
-#: git-add--interactive.perl:1342
+#: git-add--interactive.perl:1345
msgid "The selected hunks do not apply to the index!\n"
msgstr "¡Los hunks seleccionados no aplican al índice!\n"
-#: git-add--interactive.perl:1357
+#: git-add--interactive.perl:1360
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "ignorando lo no fusionado: %s\n"
-#: git-add--interactive.perl:1468
+#: git-add--interactive.perl:1479
#, 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,?]? "
-#: git-add--interactive.perl:1469
+#: git-add--interactive.perl:1480
#, 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,?]? "
-#: git-add--interactive.perl:1470
+#: git-add--interactive.perl:1481
+#, 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:1482
#, 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,?]? "
-#: git-add--interactive.perl:1570
+#: git-add--interactive.perl:1599
msgid "No other hunks to goto\n"
msgstr "No hay más pedazos para el ir\n"
-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1617
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Numero inválido: '%s'\n"
-#: git-add--interactive.perl:1593
+#: git-add--interactive.perl:1622
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "Lo siento, solo %d hunk disponible.\n"
msgstr[1] "Lo siento, solo %d hunks disponibles.\n"
-#: git-add--interactive.perl:1619
+#: git-add--interactive.perl:1657
msgid "No other hunks to search\n"
msgstr "No hay más pedazos para buscar\n"
-#: git-add--interactive.perl:1636
+#: git-add--interactive.perl:1674
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Regexp para la búsqueda mal formado %s: %s\n"
-#: git-add--interactive.perl:1646
+#: git-add--interactive.perl:1684
msgid "No hunk matches the given pattern\n"
msgstr "No hay hunks que concuerden con el patrón entregado.\n"
-#: git-add--interactive.perl:1658 git-add--interactive.perl:1680
+#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
msgid "No previous hunk\n"
msgstr "No el anterior hunk\n"
-#: git-add--interactive.perl:1667 git-add--interactive.perl:1686
+#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
msgid "No next hunk\n"
msgstr "No el siguiente hunk\n"
-#: git-add--interactive.perl:1692
+#: git-add--interactive.perl:1730
msgid "Sorry, cannot split this hunk\n"
msgstr "Perdón, no se puede dividir este pedazo\n"
-#: git-add--interactive.perl:1698
+#: git-add--interactive.perl:1736
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "Cortar en %d hunk.\n"
msgstr[1] "Cortar en %d hunks.\n"
-#: git-add--interactive.perl:1708
+#: git-add--interactive.perl:1746
msgid "Sorry, cannot edit this hunk\n"
msgstr "Perdón, no se puede editar este pedazo\n"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1773
+#: git-add--interactive.perl:1811
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
@@ -24268,19 +25621,19 @@
"add untracked - agrega contenidos de archivos no rastreados al grupo de "
"cambios del area de stage\n"
-#: git-add--interactive.perl:1790 git-add--interactive.perl:1795
-#: git-add--interactive.perl:1798 git-add--interactive.perl:1805
-#: git-add--interactive.perl:1808 git-add--interactive.perl:1815
-#: git-add--interactive.perl:1819 git-add--interactive.perl:1825
+#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
+#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
+#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
+#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
msgid "missing --"
msgstr "falta --"
-#: git-add--interactive.perl:1821
+#: git-add--interactive.perl:1866
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "modo --patch desconocido: %s"
-#: git-add--interactive.perl:1827 git-add--interactive.perl:1833
+#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "argumento inválido %s, se esperaba --"
@@ -24297,27 +25650,39 @@
msgid "the editor exited uncleanly, aborting everything"
msgstr "el editor se cerro inapropiadamente, abortando todo"
-#: 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 versión intermedia del correo que se estaba generando.\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 el email generado.\n"
-#: git-send-email.perl:408
+#: git-send-email.perl:410
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases no es compatible con otras opciones.\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: opciones de configuración encontradas para 'sendmail'\n"
+"git-send-email está configurado con las opciones sendemail. * - tenga en "
+"cuenta la 'e'.\n"
+"Establezca sendemail.forbidSendmailVariables en false para deshabilitar esta "
+"verificación.\n"
+
+#: git-send-email.perl:489 git-send-email.perl:691
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "No se puede ejecutar git format-patch desde fuera del repositorio.\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"
@@ -24325,37 +25690,37 @@
"`batch-size` y `relogin` deben ser especificados juntos (via la línea de "
"comando o por opción de configuración)\n"
-#: git-send-email.perl:497
+#: git-send-email.perl:505
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Campo --suppress-cc desconocido: '%s'\n"
-#: git-send-email.perl:528
+#: git-send-email.perl:536
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Configuración --confirm desconocida: '%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 "peligro: alias de sendmail con comillas no es soportado: %s\n"
-#: git-send-email.perl:558
+#: git-send-email.perl:566
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "peligro: `:include:` no soportado: %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 "advertencia: redirección `/file` o `|pipe` no soportada : %s\n"
-#: git-send-email.perl:565
+#: git-send-email.perl:573
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "advertencia: línea sendmail no reconocida: %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"
@@ -24370,12 +25735,12 @@
" * Diciendo \"./%s\" si se quiere decir un archivo; o\n"
" * Agregando la opción --format-patch si se quiere decir un rango.\n"
-#: git-send-email.perl:670
+#: git-send-email.perl:678
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Falló al abrir directorio %s: %s"
-#: git-send-email.perl:694
+#: git-send-email.perl:702
#, perl-format
msgid ""
"fatal: %s: %s\n"
@@ -24384,7 +25749,7 @@
"fatal: %s: %s\n"
"peligro: no se mandaron parches\n"
-#: git-send-email.perl:705
+#: git-send-email.perl:713
msgid ""
"\n"
"No patch files specified!\n"
@@ -24394,17 +25759,17 @@
"No se especificaron parches!\n"
"\n"
-#: git-send-email.perl:718
+#: git-send-email.perl:726
#, perl-format
msgid "No subject line in %s?"
msgstr "¿No hay línea de subject en %s?"
-#: git-send-email.perl:728
+#: git-send-email.perl:736
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "Falló al abrir para escritura %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"
@@ -24418,27 +25783,27 @@
"\n"
"Limpiar el contenido de body si no deseas mandar un resumen.\n"
-#: git-send-email.perl:763
+#: git-send-email.perl:771
#, perl-format
msgid "Failed to open %s: %s"
msgstr "Falló al abrir %s: %s"
-#: git-send-email.perl:780
+#: git-send-email.perl:788
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "Falló al abrir %s.final: %s"
-#: git-send-email.perl:823
+#: git-send-email.perl:831
msgid "Summary email is empty, skipping it\n"
msgstr "Archivo de resumen está vacío, saltando al siguiente\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 "¿Estás seguro de que deseas 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"
@@ -24446,11 +25811,11 @@
"Los siguientes archivos son 8bit, pero no declaran 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 "¿Que codificación de 8bit debería declarar [UTF-8]? "
-#: git-send-email.perl:926
+#: git-send-email.perl:934
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -24463,22 +25828,22 @@
"tiene el template '*** SUBJECT HERE ***'. Agrega --force si realmente lo "
"deseas mandar.\n"
-#: git-send-email.perl:945
+#: git-send-email.perl:953
msgid "To whom should the emails be sent (if anyone)?"
msgstr "¿A quien se deben mandar los correos (si existe)?"
-#: git-send-email.perl:963
+#: git-send-email.perl:971
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "fatal: alias '%s' se expande a si mismo\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 ""
"¿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
+#: 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 es posible extraer una dirección válida de %s\n"
@@ -24486,16 +25851,16 @@
#. 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 hacer con esta dirección? ([q]salir|[d]botar|[e]ditar): "
-#: git-send-email.perl:1362
+#: git-send-email.perl:1370
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "Ruta CA \"%s\" no existe"
-#: 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"
@@ -24523,134 +25888,554 @@
#. 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 "¿Mandar este email? ([y]si||[n]o|[e]editar|[q]salir|[a]todo): "
-#: git-send-email.perl:1463
+#: git-send-email.perl:1471
msgid "Send this email reply required"
msgstr "Necesitas mandar esta respuesta de email"
-#: git-send-email.perl:1491
+#: git-send-email.perl:1499
msgid "The required SMTP server is not properly defined."
msgstr "El servidor SMTP no esta definido adecuadamente."
-#: git-send-email.perl:1538
+#: git-send-email.perl:1546
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "¡El servidor no soporta 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 "¡Falló 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 ""
"No es posible inicializar SMTP adecuadamente. Verificar config y usar ---"
"smtp-debug."
-#: git-send-email.perl:1574
+#: git-send-email.perl:1582
#, perl-format
msgid "Failed to send %s\n"
msgstr "Falló al enviar %s\n"
-#: git-send-email.perl:1577
+#: git-send-email.perl:1585
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Dry-Sent %s\n"
-#: git-send-email.perl:1577
+#: git-send-email.perl:1585
#, perl-format
msgid "Sent %s\n"
msgstr "Enviado %s\n"
-#: git-send-email.perl:1579
+#: git-send-email.perl:1587
msgid "Dry-OK. Log says:\n"
msgstr "Dry-OK. Log dice:\n"
-#: git-send-email.perl:1579
+#: git-send-email.perl:1587
msgid "OK. Log says:\n"
msgstr "OK. Log dice:\n"
-#: git-send-email.perl:1591
+#: git-send-email.perl:1599
msgid "Result: "
msgstr "Resultado: "
-#: git-send-email.perl:1594
+#: git-send-email.perl:1602
msgid "Result: OK\n"
msgstr "Resultado: OK\n"
-#: git-send-email.perl:1612
+#: git-send-email.perl:1620
#, perl-format
msgid "can't open file %s"
msgstr "no se puede abrir el archivo %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) Agregando cc: %s de línea '%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) Agregando para: %s de la línea '%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) Agregando cc: %s de la línea '%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) Agregando cc: %s de la línea '%s'\n"
-#: git-send-email.perl:1864
+#: git-send-email.perl:1876
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) no se pudo ejecutar '%s'"
-#: git-send-email.perl:1871
+#: git-send-email.perl:1883
#, 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:1887
#, 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:1917
msgid "cannot send message as 7bit"
msgstr "no se puede mandar mensaje como 7bit"
-#: git-send-email.perl:1913
+#: git-send-email.perl:1925
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:1966 git-send-email.perl:2018 git-send-email.perl:2028
#, 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:1969
#, 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:1986
#, 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:1990
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "¿Realmente deseas mandar %s?[y|N]: "
+#~ msgid "store only"
+#~ msgstr "solo guardar"
+
+#~ msgid "compress faster"
+#~ msgstr "comprimir más rápido"
+
+#~ msgid "compress better"
+#~ msgstr "comprimir mejor"
+
+#~ msgid "unknown hash algorithm length"
+#~ msgstr "largo del algoritmo hash desconocido"
+
+#~ msgid "rev-list died"
+#~ msgstr "rev-list murió"
+
+#~ 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"
+
+#, c-format
+#~ msgid "commit-graph improper chunk offset %08x%08x"
+#~ msgstr "offset del chunk de commit-graph inapropiado %08x%08x"
+
+#, c-format
+#~ msgid "commit-graph chunk id %08x appears multiple times"
+#~ msgstr "id de chunk de commit-graph %08x parece tener múltiples tiempos"
+
+#~ msgid "Writing changed paths Bloom filters index"
+#~ msgstr "Escribiendo cambios de ruta del índice de filtros Bloom"
+
+#~ msgid "Counting distinct commits in commit graph"
+#~ msgstr "Contando commits distintos en commit graph"
+
+#, c-format
+#~ msgid "unexpected duplicate commit id %s"
+#~ msgstr "id de commit duplicado inesperado %s"
+
+#, c-format
+#~ msgid "the commit graph format cannot write %d commits"
+#~ msgstr "el formato de gráficos de commit no pudede escribir %d commits"
+
+#, c-format
+#~ msgid "hash version %u does not match"
+#~ msgstr "versión de hash %u no concuerda"
+
+#~ msgid "invalid chunk offset (too large)"
+#~ msgstr "offset inválido del conjunto (muy grande)"
+
+#~ msgid "error preparing packfile from multi-pack-index"
+#~ msgstr "error preparando packfile de multi-pack-index"
+
+#~ msgid "Writing chunks to multi-pack-index"
+#~ msgstr "Escribiendo chunks a multi-pack-index"
+
+#~ msgid "Remote with no URL"
+#~ msgstr "Remoto sin URL"
+
+#, c-format
+#~ msgid "%%(subject) does not take arguments"
+#~ msgstr "%%(subject) no toma ningún argumento"
+
+#, c-format
+#~ msgid "positive value expected objectname:short=%s"
+#~ msgstr "valor positivo esperado objectname:short=%s"
+
+#, c-format
+#~ msgid "unrecognized %%(objectname) argument: %s"
+#~ msgstr "argumento: %s no reconocido %%(objectname)"
+
+#, c-format
+#~ msgid "option `%s' is incompatible with --merged"
+#~ msgstr "opción `%s' es incompatible con --merged"
+
+#, c-format
+#~ msgid "option `%s' is incompatible with --no-merged"
+#~ msgstr "opción `%s' es incompatible con --no-merged"
+
+#, c-format
+#~ msgid "could not open '%s' for writing: %s"
+#~ msgstr "no se pudo abrir '%s' para escritura: %s"
+
+#, c-format
+#~ msgid "could not read ref '%s'"
+#~ msgstr "no se pudo leer la referencia '%s'"
+
+#, c-format
+#~ msgid "ref '%s' already exists"
+#~ msgstr "ref '%s' ya existe"
+
+#, c-format
+#~ msgid "unexpected object ID when writing '%s'"
+#~ msgstr "ID de objecto inesperado al escribir '%s'"
+
+#, c-format
+#~ msgid "unexpected object ID when deleting '%s'"
+#~ msgstr "ID de objecto inesperado al borrar '%s'"
+
+#, c-format
+#~ msgid "The hash algorithm %s is not supported in this build."
+#~ msgstr "El algoritmo hash %s no está soportado en este build."
+
+#, c-format
+#~ msgid "%s: not a valid OID"
+#~ msgstr "%s no es OID válido"
+
+#~ msgid "git bisect--helper --next-all [--no-checkout]"
+#~ msgstr "git bisect--helper --next-all [--no-checkout]"
+
+#~ msgid "git bisect--helper --write-terms <bad_term> <good_term>"
+#~ msgstr "git bisect--helper --write-terms <mal_término> <buen_término>"
+
+#~ msgid ""
+#~ "git bisect--helper --bisect-write [--no-log] <state> <revision> "
+#~ "<good_term> <bad_term>"
+#~ msgstr ""
+#~ "git bisect--helper --bisect-write [--no-log] <estado> <revision> "
+#~ "<buen_term> <mal_term>"
+
+#~ msgid ""
+#~ "git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
+#~ "<bad_term>"
+#~ msgstr ""
+#~ "git bisect--helper --bisect-check-and-set-terms <comando> <buen_term> "
+#~ "<mal_term>"
+
+#~ msgid "could not open the file BISECT_TERMS"
+#~ msgstr "no se pudo abrir el archivo BISECT_TERMS"
+
+#~ msgid "perform 'git bisect next'"
+#~ msgstr "realiza 'git bisect next'"
+
+#~ msgid "write the terms to .git/BISECT_TERMS"
+#~ msgstr "escribe los términos a .git/BISECT_TERMS"
+
+#~ msgid "cleanup the bisection state"
+#~ msgstr "limpiar el estado de bisección"
+
+#~ msgid "check for expected revs"
+#~ msgstr "revisar por revs esperados"
+
+#~ msgid "write out the bisection state in BISECT_LOG"
+#~ msgstr "escribir el estado de bisect en BISECT_LOG"
+
+#~ msgid "check and set terms in a bisection state"
+#~ msgstr "revisar y configurar los terms en el estado de bisect"
+
+#~ msgid "update BISECT_HEAD instead of checking out the current commit"
+#~ msgstr "actualiza BISECT_HEAD en lugar de revisar el commit actual"
+
+#~ msgid "--write-terms requires two arguments"
+#~ msgstr "--write-terms requiere dos argumentos"
+
+#~ msgid "--bisect-clean-state requires no arguments"
+#~ msgstr "--bisect-clean-state no requiere argumentos"
+
+#~ msgid "--bisect-write requires either 4 or 5 arguments"
+#~ msgstr "--bisect-write requiere entre 4 o 5 argumentos"
+
+#~ msgid "--check-and-set-terms requires 3 arguments"
+#~ msgstr "--bisect-clean-state no requiere argumentos"
+
+#~ msgid "Force progress reporting"
+#~ msgstr "Forzar el reporte de progreso"
+
+#~ msgid "n,m"
+#~ msgstr "n,m"
+
+#, c-format
+#~ msgid "Error deleting remote-tracking branch '%s'"
+#~ msgstr "Error al eliminar la rama de rastreo remota '%s'"
+
+#, c-format
+#~ msgid "Error deleting branch '%s'"
+#~ msgstr "Error al eliminar la rama '%s'"
+
+#~ msgid "show parse tree for grep expression"
+#~ msgstr "mostrar árbol analizado para la expresión grep"
+
+#~ msgid "Process line range n,m in file, counting from 1"
+#~ msgstr "Procesar rango de líneas n,m en archivo, contando desde 1"
+
+#~ msgid "name of output directory is too long"
+#~ msgstr "nombre del directorio de salida es muy largo"
+
+#~ msgid "standard output, or directory, which one?"
+#~ msgstr "¿salida standard, o directorio, cual?"
+
+#~ msgid "print only names (no SHA-1)"
+#~ msgstr "imprimir sólo nombres (sin SHA-1)"
+
+#~ msgid "too many parameters"
+#~ msgstr "demasiados parámetros"
+
+#~ msgid "too few parameters"
+#~ msgstr "muy pocos parámetros"
+
+#~ msgid "passed to 'git am'"
+#~ msgstr "pasado a 'git am'"
+
+#, 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 ""
+#~ "WARNING: Algunos packs en uso han sido renombrados\n"
+#~ "WARNING: agregando el prefijo old- a sus nombres,para\n"
+#~ "WARNING: reemplazarlos con la nueva versión del\n"
+#~ "WARNING: archivo. Pero la operación falló, y el intento\n"
+#~ "WARNING: de renombrarlos a sus nombres originales\n"
+#~ "WARNING: también falló.\n"
+#~ "WARNING: Por favor renombralos en %s manualmente:\n"
+
+#, c-format
+#~ msgid "failed to remove '%s'"
+#~ msgstr "falló al eliminar'%s'"
+
+#~ msgid "Recurse into nested submodules"
+#~ msgstr "Recursar en submódulos anidados"
+
+#~ msgid "too many params"
+#~ msgstr "demasiados parámetros"
+
+#~ msgid "Routines to help parsing remote repository access parameters"
+#~ msgstr ""
+#~ "Rutinas para ayudar a analizar los parámetros de acceso del repositorio "
+#~ "remoto"
+
+#, sh-format
+#~ msgid "Bad rev input: $bisected_head"
+#~ msgstr "Mala entrada rev: $bisected_head"
+
+#, sh-format
+#~ msgid "Bad rev input: $rev"
+#~ msgstr "Mala entrada rev: $rev"
+
+#~ 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"
+
+#, sh-format
+#~ msgid " Warn: $display_name doesn't contain commit $sha1_src"
+#~ msgstr " Advertencia: $display_name no contiene el commit $sha1_src"
+
+#, sh-format
+#~ msgid " Warn: $display_name doesn't contain commit $sha1_dst"
+#~ msgstr " Advertencia: $display_name no contiene el commit $sha1_dst"
+
+#, sh-format
+#~ msgid ""
+#~ " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
+#~ msgstr ""
+#~ " Advertencia: $display_name no contiene los commits $sha1_src y $sha1_dst"
+
+#, sh-format
+#~ msgid "See git-${cmd}(1) for details."
+#~ msgstr "Véase git-${cmd}(1) para más detalles."
+
+#, 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,?]? "
@@ -24691,9 +26476,6 @@
#~ 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'"
@@ -24731,18 +26513,6 @@
#~ 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"
@@ -24759,10 +26529,6 @@
#~ "$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"
@@ -24834,12 +26600,6 @@
#~ msgid "Server supports ofs-delta"
#~ msgstr "El servidor soporta ofs-delta"
-#~ msgid "(HEAD detached at %s)"
-#~ msgstr "(HEAD desacoplado en %s)"
-
-#~ msgid "(HEAD detached from %s)"
-#~ msgstr "(HEAD desacoplado de %s)"
-
#~ msgid "Checking out files"
#~ msgstr "Revisando archivos"
@@ -24867,9 +26627,6 @@
#~ msgid "unrecognized verb: %s"
#~ msgstr "verbo no reconocido: %s"
-#~ msgid "hash version %X does not match version %X"
-#~ msgstr "versión de hash %X no concuerda con versión %X"
-
#~ msgid "option '%s' requires a value"
#~ msgstr "opción '%s' requiere un valor"
@@ -25029,9 +26786,6 @@
#~ 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/po/fr.po b/po/fr.po
index 314ff37..71d9e14 100644
--- a/po/fr.po
+++ b/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: 2020-03-11 15:26+0800\n"
-"PO-Revision-Date: 2020-03-11 21:03+0100\n"
+"POT-Creation-Date: 2021-03-04 22:41+0800\n"
+"PO-Revision-Date: 2021-03-04 21:45+0100\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,235 +87,240 @@
"Plural-Forms: nplurals=2; plural=n<=1 ?0 : 1;\n"
"X-Generator: Poedit 2.2.3\n"
-#: add-interactive.c:368
+#: add-interactive.c:376
#, c-format
msgid "Huh (%s)?"
msgstr "Hein (%s) ?"
-#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124
-#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687
-#: builtin/rebase.c:2086 builtin/rebase.c:2130
+#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292
+#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538
+#: builtin/rebase.c:1963
msgid "could not read index"
msgstr "impossible de lire l'index"
-#: add-interactive.c:576 git-add--interactive.perl:269
+#: add-interactive.c:584 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "binaire"
-#: add-interactive.c:634 git-add--interactive.perl:278
+#: add-interactive.c:642 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "rien"
-#: add-interactive.c:635 git-add--interactive.perl:314
+#: add-interactive.c:643 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "inchangé"
-#: add-interactive.c:672 git-add--interactive.perl:643
+#: add-interactive.c:680 git-add--interactive.perl:641
msgid "Update"
msgstr "Mise à jour"
-#: add-interactive.c:689 add-interactive.c:877
+#: add-interactive.c:697 add-interactive.c:885
#, c-format
msgid "could not stage '%s'"
msgstr "impossible d'indexer '%s'"
-#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317
-#: builtin/rebase.c:899
+#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486
msgid "could not write index"
msgstr "impossible d'écrire l'index"
-#: add-interactive.c:698 git-add--interactive.perl:628
+#: add-interactive.c:706 git-add--interactive.perl:626
#, 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
+#: add-interactive.c:724 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "note : %s n'est plus suivi à présent.\n"
-#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281
-#: builtin/reset.c:144
+#: add-interactive.c:729 apply.c:4125 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
+#: add-interactive.c:759 git-add--interactive.perl:653
msgid "Revert"
msgstr "Inverser"
-#: add-interactive.c:767
+#: add-interactive.c:775
msgid "Could not parse HEAD^{tree}"
msgstr "impossible d'analyser HEAD^{tree}"
-#: add-interactive.c:805 git-add--interactive.perl:631
+#: add-interactive.c:813 git-add--interactive.perl:629
#, 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
+#: add-interactive.c:864 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr "Aucun Fichier non suivi.\n"
-#: add-interactive.c:860 git-add--interactive.perl:689
+#: add-interactive.c:868 git-add--interactive.perl:687
msgid "Add untracked"
msgstr "Ajouter un fichier non-suivi"
-#: add-interactive.c:887 git-add--interactive.perl:625
+#: add-interactive.c:895 git-add--interactive.perl:623
#, 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
+#: add-interactive.c:925
#, c-format
msgid "ignoring unmerged: %s"
msgstr "fichier non-fusionné ignoré : %s"
-#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366
+#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369
#, c-format
msgid "Only binary files changed.\n"
msgstr "Seuls des fichiers binaires ont changé.\n"
-#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368
+#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371
#, c-format
msgid "No changes.\n"
msgstr "Aucune modification.\n"
-#: add-interactive.c:935 git-add--interactive.perl:1376
+#: add-interactive.c:943 git-add--interactive.perl:1379
msgid "Patch update"
msgstr "Mise à jour par patch"
-#: add-interactive.c:974 git-add--interactive.perl:1754
+#: add-interactive.c:982 git-add--interactive.perl:1792
msgid "Review diff"
msgstr "Réviser la différence"
-#: add-interactive.c:1002
+#: add-interactive.c:1010
msgid "show paths with changes"
msgstr "afficher les chemins comprenant des modifications"
-#: add-interactive.c:1004
+#: add-interactive.c:1012
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
+#: add-interactive.c:1014
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
+#: add-interactive.c:1016
msgid "pick hunks and update selectively"
msgstr "sélection et mise à jour individuelle des sections"
-#: add-interactive.c:1010
+#: add-interactive.c:1018
msgid "view diff between HEAD and index"
msgstr "visualiser les diffs entre HEAD et l'index"
-#: add-interactive.c:1012
+#: add-interactive.c:1020
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
+#: add-interactive.c:1028 add-interactive.c:1077
msgid "Prompt help:"
msgstr "Aide :"
-#: add-interactive.c:1022
+#: add-interactive.c:1030
msgid "select a single item"
msgstr "sélectionner un seul élément"
-#: add-interactive.c:1024
+#: add-interactive.c:1032
msgid "select a range of items"
msgstr "sélectionner une plage d'éléments"
-#: add-interactive.c:1026
+#: add-interactive.c:1034
msgid "select multiple ranges"
msgstr "sélectionner plusieurs plages"
-#: add-interactive.c:1028 add-interactive.c:1073
+#: add-interactive.c:1036 add-interactive.c:1081
msgid "select item based on unique prefix"
msgstr "sélectionner un élément basé sur une préfixe unique"
-#: add-interactive.c:1030
+#: add-interactive.c:1038
msgid "unselect specified items"
msgstr "désélectionner les éléments spécifiés"
-#: add-interactive.c:1032
+#: add-interactive.c:1040
msgid "choose all items"
msgstr "choisir tous les éléments"
-#: add-interactive.c:1034
+#: add-interactive.c:1042
msgid "(empty) finish selecting"
msgstr "(vide) arrêter de sélectionner"
-#: add-interactive.c:1071
+#: add-interactive.c:1079
msgid "select a numbered item"
msgstr "sélectionner un élément par son numéro"
-#: add-interactive.c:1075
+#: add-interactive.c:1083
msgid "(empty) select nothing"
msgstr "(vide) ne rien sélectionner"
-#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851
+#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
msgid "*** Commands ***"
msgstr "*** Commandes ***"
-#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848
+#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
msgid "What now"
msgstr "Et maintenant ?"
-#: add-interactive.c:1136 git-add--interactive.perl:213
+#: add-interactive.c:1144 git-add--interactive.perl:213
msgid "staged"
msgstr "indexé"
-#: add-interactive.c:1136 git-add--interactive.perl:213
+#: add-interactive.c:1144 git-add--interactive.perl:213
msgid "unstaged"
msgstr "non-indexé"
-#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251
-#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144
-#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409
-#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
-#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
-#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
+#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257
+#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124
+#: builtin/fetch.c:150 builtin/merge.c:285 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
+#: add-interactive.c:1151
msgid "could not refresh index"
msgstr "impossible de rafraîchir l'index"
-#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765
+#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803
#, c-format
msgid "Bye.\n"
msgstr "Au revoir.\n"
-#: add-patch.c:33 git-add--interactive.perl:1428
+#: add-patch.c:34 git-add--interactive.perl:1431
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Indexer le changement de mode [y,n,q,a,d%s,?] ? "
-#: add-patch.c:34 git-add--interactive.perl:1429
+#: add-patch.c:35 git-add--interactive.perl:1432
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Indexer la suppression [y,n,q,a,d%s,?] ? "
-#: add-patch.c:35 git-add--interactive.perl:1430
+#: add-patch.c:36 git-add--interactive.perl:1433
+#, 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:1434
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "Indexer cette section [y,n,q,a,d%s,?] ? "
-#: add-patch.c:37
+#: add-patch.c:39
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"staging."
@@ -322,7 +328,7 @@
"Si le patch s'applique proprement, la section éditée sera immédiatement "
"marquée comme indexée."
-#: add-patch.c:40
+#: add-patch.c:42
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -336,22 +342,27 @@
"a - indexer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas indexer cette section ni les suivantes de ce fichier\n"
-#: add-patch.c:54 git-add--interactive.perl:1433
+#: add-patch.c:56 git-add--interactive.perl:1437
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Remiser le changement de mode [y,n,q,a,d%s,?] ? "
-#: add-patch.c:55 git-add--interactive.perl:1434
+#: add-patch.c:57 git-add--interactive.perl:1438
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Remiser la suppression [y,n,q,a,d%s,?] ? "
-#: add-patch.c:56 git-add--interactive.perl:1435
+#: add-patch.c:58 git-add--interactive.perl:1439
+#, 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:1440
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "Remiser cette section [y,n,q,a,d%s,?] ? "
-#: add-patch.c:58
+#: add-patch.c:61
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"stashing."
@@ -359,7 +370,7 @@
"Si le patch s'applique proprement, la section éditée sera immédiatement "
"marquée comme remisée."
-#: add-patch.c:61
+#: add-patch.c:64
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -373,22 +384,27 @@
"a - remiser cette section et toutes les suivantes de ce fichier\n"
"d - ne pas remiser cette section ni les suivantes de ce fichier\n"
-#: add-patch.c:77 git-add--interactive.perl:1438
+#: add-patch.c:80 git-add--interactive.perl:1443
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Désindexer le changement de mode [y,n,q,a,d%s,?] ? "
-#: add-patch.c:78 git-add--interactive.perl:1439
+#: add-patch.c:81 git-add--interactive.perl:1444
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Désindexer la suppression [y,n,q,a,d%s,?] ? "
-#: add-patch.c:79 git-add--interactive.perl:1440
+#: add-patch.c:82 git-add--interactive.perl:1445
+#, 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:1446
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "Désindexer cette section [y,n,q,a,d%s,?] ? "
-#: add-patch.c:81
+#: add-patch.c:85
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"unstaging."
@@ -396,7 +412,7 @@
"Si le patch s'applique proprement, la section éditée sera immédiatement "
"marquée comme desindexée."
-#: add-patch.c:84
+#: add-patch.c:88
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -410,22 +426,27 @@
"a - désindexer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas désindexer cette section ni les suivantes de ce fichier\n"
-#: add-patch.c:99 git-add--interactive.perl:1443
+#: add-patch.c:103 git-add--interactive.perl:1449
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "Appliquer le changement de mode à l'index [y,n,q,a,d%s,?] ? "
-#: add-patch.c:100 git-add--interactive.perl:1444
+#: add-patch.c:104 git-add--interactive.perl:1450
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Appliquer la suppression à l'index [y,n,q,a,d%s,?] ? "
-#: add-patch.c:101 git-add--interactive.perl:1445
+#: add-patch.c:105 git-add--interactive.perl:1451
+#, 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:1452
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "Appliquer cette section à l'index [y,n,q,a,d%s,?] ? "
-#: add-patch.c:103 add-patch.c:168 add-patch.c:211
+#: 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."
@@ -433,7 +454,7 @@
"Si le patch s'applique proprement, la section éditée sera immédiatement "
"marquée comme appliquée."
-#: add-patch.c:106
+#: add-patch.c:111
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -447,25 +468,31 @@
"a - appliquer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas appliquer cette section ni les suivantes de ce fichier\n"
-#: add-patch.c:121 git-add--interactive.perl:1448
-#: git-add--interactive.perl:1463
+#: add-patch.c:126 git-add--interactive.perl:1455
+#: git-add--interactive.perl:1473
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "Abandonner le changement de mode dans l'arbre [y,n,q,a,d%s,?] ? "
-#: add-patch.c:122 git-add--interactive.perl:1449
-#: git-add--interactive.perl:1464
+#: add-patch.c:127 git-add--interactive.perl:1456
+#: git-add--interactive.perl:1474
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Abandonner la suppression dans l'arbre [y,n,q,a,d%s,?] ? "
-#: add-patch.c:123 git-add--interactive.perl:1450
-#: git-add--interactive.perl:1465
+#: add-patch.c:128 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
+#, 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:1458
+#: git-add--interactive.perl:1476
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "Abandonner cette section dans l'arbre [y,n,q,a,d%s,?] ? "
-#: add-patch.c:125 add-patch.c:147 add-patch.c:190
+#: 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."
@@ -473,7 +500,7 @@
"Si le patch s'applique proprement, la section éditée sera immédiatement "
"marquée comme éliminée."
-#: add-patch.c:128 add-patch.c:193
+#: 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"
@@ -487,24 +514,29 @@
"a - supprimer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas supprimer cette section ni les suivantes de ce fichier\n"
-#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Abandonner le changement de mode dans l'index et l'arbre [y,n,q,a,d%s,?] ? "
-#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Abandonner la suppression de l'index et de l'arbre [y,n,q,a,d%s,?] ? "
-#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#, 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:1464
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Supprimer la section dans l'index et l'arbre de travail [y,n,q,a,d%s,?] ? "
-#: add-patch.c:150
+#: 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"
@@ -518,27 +550,33 @@
"a - éliminer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas éliminer cette section ni les suivantes de ce fichier\n"
-#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Appliquer le changement de mode dans l'index et l'arbre de travail [y,n,q,a,d"
"%s,?] ? "
-#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Appliquer la suppression dans l'index et l'arbre de travail [y,n,q,a,d"
"%s,?] ? "
-#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#, 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:1470
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Appliquer la section à l'index et l'arbre de travail [y,n,q,a,d%s,?] ? "
-#: add-patch.c:171
+#: 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"
@@ -552,7 +590,7 @@
"a - appliquer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas appliquer cette section ni les suivantes de ce fichier\n"
-#: add-patch.c:214
+#: add-patch.c:224
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -566,34 +604,34 @@
"a - appliquer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas appliquer cette section ni les suivantes de ce fichier\n"
-#: add-patch.c:318
+#: 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:337 add-patch.c:341
+#: 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:395
+#: add-patch.c:419
msgid "could not parse diff"
msgstr "impossible d'analyser la diff"
-#: add-patch.c:414
+#: add-patch.c:438
msgid "could not parse colored diff"
msgstr "impossible d'analyser la diff colorée"
-#: add-patch.c:428
+#: add-patch.c:452
#, c-format
msgid "failed to run '%s'"
msgstr "échec pour lancer '%s'"
-#: add-patch.c:587
+#: add-patch.c:611
msgid "mismatched output from interactive.diffFilter"
msgstr "sortie sans correspondance depuis interactive.diffFilter"
-#: add-patch.c:588
+#: add-patch.c:612
msgid ""
"Your filter must maintain a one-to-one correspondence\n"
"between its input and output lines."
@@ -601,7 +639,7 @@
"Votre filtre doit maintenir une correspondance un-pour-un\n"
"entre les lignes en entrée et en sortie."
-#: add-patch.c:761
+#: add-patch.c:790
#, c-format
msgid ""
"expected context line #%d in\n"
@@ -610,7 +648,7 @@
"ligne de contexte attendue #%d dans\n"
"%.*s"
-#: add-patch.c:776
+#: add-patch.c:805
#, c-format
msgid ""
"hunks do not overlap:\n"
@@ -623,12 +661,12 @@
"\tne se termine pas par :\n"
"%.*s"
-#: add-patch.c:1052 git-add--interactive.perl:1112
+#: add-patch.c:1081 git-add--interactive.perl:1115
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr ""
"Mode d'édition manuelle de section -- voir ci-dessous pour un guide rapide.\n"
-#: add-patch.c:1056
+#: add-patch.c:1085
#, c-format
msgid ""
"---\n"
@@ -642,7 +680,7 @@
"Les lignes commençant par %c seront éliminées.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1070 git-add--interactive.perl:1126
+#: add-patch.c:1099 git-add--interactive.perl:1129
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"
@@ -652,11 +690,11 @@
"l'éditer à nouveau. Si toutes les lignes de la section sont supprimées,\n"
"alors l'édition sera abandonnée et la section conservée.\n"
-#: add-patch.c:1103
+#: add-patch.c:1132
msgid "could not parse hunk header"
msgstr "impossible d'analyser l'entête de section"
-#: add-patch.c:1148
+#: add-patch.c:1177
msgid "'git apply --cached' failed"
msgstr "'git apply --cached' a échoué"
@@ -672,26 +710,26 @@
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1218 git-add--interactive.perl:1239
+#: add-patch.c:1246 git-add--interactive.perl:1242
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
"Votre section éditée ne s'applique pas. L'éditer à nouveau (\"no\" "
"l'élimine !) [y|n] ? "
-#: add-patch.c:1261
+#: add-patch.c:1289
msgid "The selected hunks do not apply to the index!"
msgstr "Les sections sélectionnées ne s'applique pas à l'index !"
-#: add-patch.c:1262 git-add--interactive.perl:1343
+#: add-patch.c:1290 git-add--interactive.perl:1346
msgid "Apply them to the worktree anyway? "
msgstr "Les appliquer quand même à l'arbre de travail ? "
-#: add-patch.c:1269 git-add--interactive.perl:1346
+#: add-patch.c:1297 git-add--interactive.perl:1349
msgid "Nothing was applied.\n"
msgstr "Rien n'a été appliqué.\n"
-#: add-patch.c:1326
+#: add-patch.c:1354
msgid ""
"j - leave this hunk undecided, see next undecided hunk\n"
"J - leave this hunk undecided, see next hunk\n"
@@ -713,103 +751,112 @@
"e - éditer manuellement la section actuelle\n"
"? - afficher l'aide\n"
-#: add-patch.c:1447 add-patch.c:1457
+#: add-patch.c:1516 add-patch.c:1526
msgid "No previous hunk"
msgstr "Pas de section précédente"
-#: add-patch.c:1452 add-patch.c:1462
+#: add-patch.c:1521 add-patch.c:1531
msgid "No next hunk"
msgstr "Pas de section suivante"
-#: add-patch.c:1468
+#: add-patch.c:1537
msgid "No other hunks to goto"
msgstr "Aucune autre section à atteindre"
-#: add-patch.c:1479 git-add--interactive.perl:1577
+#: add-patch.c:1548 git-add--interactive.perl:1606
msgid "go to which hunk (<ret> to see more)? "
msgstr "aller à quelle section (<ret> pour voir plus) ? "
-#: add-patch.c:1480 git-add--interactive.perl:1579
+#: add-patch.c:1549 git-add--interactive.perl:1608
msgid "go to which hunk? "
msgstr "aller à quelle section ? "
-#: add-patch.c:1491
+#: add-patch.c:1560
#, c-format
msgid "Invalid number: '%s'"
msgstr "Numéro invalide : '%s'"
-#: add-patch.c:1496
+#: add-patch.c:1565
#, c-format
msgid "Sorry, only %d hunk available."
msgid_plural "Sorry, only %d hunks available."
msgstr[0] "Désolé, %d seule section disponible."
msgstr[1] "Désolé, Seulement %d sections disponibles."
-#: add-patch.c:1505
+#: add-patch.c:1574
msgid "No other hunks to search"
msgstr "aucune autre section à rechercher"
-#: add-patch.c:1511 git-add--interactive.perl:1623
+#: add-patch.c:1580 git-add--interactive.perl:1661
msgid "search for regex? "
msgstr "rechercher la regex ? "
-#: add-patch.c:1526
+#: add-patch.c:1595
#, c-format
msgid "Malformed search regexp %s: %s"
msgstr "Regex de recherche malformée %s : %s"
-#: add-patch.c:1543
+#: add-patch.c:1612
msgid "No hunk matches the given pattern"
msgstr "Aucune section ne correspond au motif donné"
-#: add-patch.c:1550
+#: add-patch.c:1619
msgid "Sorry, cannot split this hunk"
msgstr "Désolé, impossible de découper cette section"
-#: add-patch.c:1554
+#: add-patch.c:1623
#, c-format
msgid "Split into %d hunks."
msgstr "Découpée en %d sections."
-#: add-patch.c:1558
+#: add-patch.c:1627
msgid "Sorry, cannot edit this hunk"
msgstr "Désolé, impossible d'éditer cette section"
-#: add-patch.c:1609
+#: add-patch.c:1679
msgid "'git apply' failed"
msgstr "'git apply' a échoué"
-#: advice.c:115
+#: advice.c:143
+#, 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:159
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sastuce: %.*s%s\n"
-#: advice.c:168
+#: advice.c:250
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "Impossible de picorer car vous avez des fichiers non fusionnés."
-#: advice.c:170
+#: advice.c:252
msgid "Committing is not possible because you have unmerged files."
msgstr "Impossible de valider car vous avez des fichiers non fusionnés."
-#: advice.c:172
+#: advice.c:254
msgid "Merging is not possible because you have unmerged files."
msgstr "Impossible de fusionner car vous avez des fichiers non fusionnés."
-#: advice.c:174
+#: advice.c:256
msgid "Pulling is not possible because you have unmerged files."
msgstr "Impossible de tirer car vous avez des fichiers non fusionnés."
-#: advice.c:176
+#: advice.c:258
msgid "Reverting is not possible because you have unmerged files."
msgstr "Impossible d'annuler car vous avez des fichiers non fusionnés."
-#: advice.c:178
+#: advice.c:260
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "%s n'est pas possible car vous avez des fichiers non fusionnés."
-#: advice.c:186
+#: advice.c:268
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
@@ -817,23 +864,23 @@
"Corrigez-les puis lancez 'git add/rm <fichier>'\n"
"si nécessaire pour marquer la résolution et valider."
-#: advice.c:194
+#: advice.c:276
msgid "Exiting because of an unresolved conflict."
msgstr "Abandon à cause de conflit non résolu."
-#: advice.c:199 builtin/merge.c:1335
+#: advice.c:281 builtin/merge.c:1370
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)."
-#: advice.c:201
+#: advice.c:283
msgid "Please, commit your changes before merging."
msgstr "Veuillez valider vos changements avant de fusionner."
-#: advice.c:202
+#: advice.c:284
msgid "Exiting because of unfinished merge."
msgstr "Abandon à cause d'une fusion non terminée."
-#: advice.c:208
+#: advice.c:290
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -1135,7 +1182,8 @@
msgid "cannot checkout %s"
msgstr "extraction de %s impossible"
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:86 pack-revindex.c:213
+#: setup.c:308
#, c-format
msgid "failed to read %s"
msgstr "échec de la lecture de %s"
@@ -1155,7 +1203,7 @@
msgid "%s: does not exist in index"
msgstr "%s : n'existe pas dans l'index"
-#: apply.c:3537 apply.c:3708
+#: apply.c:3537 apply.c:3708 apply.c:3952
#, c-format
msgid "%s: does not match index"
msgstr "%s : ne correspond pas à l'index"
@@ -1205,325 +1253,369 @@
msgid "%s has type %o, expected %o"
msgstr "%s est de type %o, mais %o attendu"
-#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856
-#: read-cache.c:1325
+#: apply.c: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:3936
+#: apply.c:3950
#, c-format
msgid "%s: already exists in index"
msgstr "%s : existe déjà dans l'index"
-#: apply.c:3939
+#: apply.c:3954
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s : existe déjà dans la copie de travail"
-#: apply.c:3959
+#: apply.c:3974
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o)"
-#: apply.c:3964
+#: apply.c:3979
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
"le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s"
-#: apply.c:3984
+#: apply.c:3999
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "le fichier affecté '%s' est au-delà d'un lien symbolique"
-#: apply.c:3988
+#: apply.c:4003
#, c-format
msgid "%s: patch does not apply"
msgstr "%s : le patch ne s'applique pas"
-#: apply.c:4003
+#: apply.c:4018
#, c-format
msgid "Checking patch %s..."
msgstr "Vérification du patch %s..."
-#: apply.c:4095
+#: apply.c:4110
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
"l'information sha1 est manquante ou inutilisable pour le sous-module %s"
-#: apply.c:4102
+#: apply.c:4117
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "le mode change pour %s, qui n'est pas dans la HEAD actuelle"
-#: apply.c:4105
+#: apply.c:4120
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "l'information de sha1 est manquante ou inutilisable (%s)."
-#: apply.c:4114
+#: apply.c:4129
#, c-format
msgid "could not add %s to temporary index"
msgstr "impossible d'ajouter %s à l'index temporaire"
-#: apply.c:4124
+#: apply.c:4139
#, c-format
msgid "could not write temporary index to %s"
msgstr "impossible d'écrire l'index temporaire dans %s"
-#: apply.c:4262
+#: apply.c:4277
#, c-format
msgid "unable to remove %s from index"
msgstr "suppression de %s dans l'index impossible"
-#: apply.c:4296
+#: apply.c:4311
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "patch corrompu pour le sous-module %s"
-#: apply.c:4302
+#: apply.c:4317
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "stat du fichier nouvellement créé '%s' impossible"
-#: apply.c:4310
+#: apply.c:4325
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
"création du magasin de stockage pour le fichier nouvellement créé %s "
"impossible"
-#: apply.c:4316 apply.c:4461
+#: apply.c:4331 apply.c:4476
#, c-format
msgid "unable to add cache entry for %s"
msgstr "ajout de l'élément de cache %s impossible"
-#: apply.c:4359
+#: apply.c:4374 builtin/bisect--helper.c:523
#, c-format
msgid "failed to write to '%s'"
msgstr "échec de l'écriture dans '%s'"
-#: apply.c:4363
+#: apply.c:4378
#, c-format
msgid "closing file '%s'"
msgstr "fermeture du fichier '%s'"
-#: apply.c:4433
+#: apply.c:4448
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "écriture du fichier '%s' mode %o impossible"
-#: apply.c:4531
+#: apply.c:4546
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Patch %s appliqué proprement."
-#: apply.c:4539
+#: apply.c:4554
msgid "internal error"
msgstr "erreur interne"
-#: apply.c:4542
+#: apply.c:4557
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Application du patch %%s avec %d rejet..."
msgstr[1] "Application du patch %%s avec %d rejets..."
-#: apply.c:4553
+#: apply.c:4568
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "troncature du nom de fichier .rej en %.*s.rej"
-#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201
+#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334
#, c-format
msgid "cannot open %s"
msgstr "impossible d'ouvrir %s"
-#: apply.c:4575
+#: apply.c:4590
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Section n°%d appliquée proprement."
-#: apply.c:4579
+#: apply.c:4594
#, c-format
msgid "Rejected hunk #%d."
msgstr "Section n°%d rejetée."
-#: apply.c:4698
+#: apply.c:4718
#, c-format
msgid "Skipped patch '%s'."
msgstr "Chemin '%s' non traité."
-#: apply.c:4706
+#: apply.c:4726
msgid "unrecognized input"
msgstr "entrée non reconnue"
-#: apply.c:4726
+#: apply.c:4746
msgid "unable to read index file"
msgstr "lecture du fichier d'index impossible"
-#: apply.c:4883
+#: apply.c:4903
#, c-format
msgid "can't open patch '%s': %s"
msgstr "ouverture impossible du patch '%s' :%s"
-#: apply.c:4910
+#: apply.c:4930
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "%d erreur d'espace ignorée"
msgstr[1] "%d erreurs d'espace ignorées"
-#: apply.c:4916 apply.c:4931
+#: apply.c:4936 apply.c:4951
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d ligne a ajouté des erreurs d'espace."
msgstr[1] "%d lignes ont ajouté des erreurs d'espace."
-#: apply.c:4924
+#: apply.c:4944
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "%d ligne ajoutée après correction des erreurs d'espace."
msgstr[1] "%d lignes ajoutées après correction des erreurs d'espace."
-#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406
+#: apply.c:4960 builtin/add.c:626 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:4968
+#: apply.c:4988
msgid "don't apply changes matching the given path"
msgstr "ne pas appliquer les modifications qui correspondent au chemin donné"
-#: apply.c:4971
+#: apply.c:4991
msgid "apply changes matching the given path"
msgstr "appliquer les modifications qui correspondent au chemin donné"
-#: apply.c:4973 builtin/am.c:2260
+#: apply.c:4993 builtin/am.c:2266
msgid "num"
msgstr "num"
-#: apply.c:4974
+#: apply.c:4994
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "supprimer <num> barres obliques des chemins traditionnels de diff"
-#: apply.c:4977
+#: apply.c:4997
msgid "ignore additions made by the patch"
msgstr "ignorer les additions réalisées par le patch"
-#: apply.c:4979
+#: apply.c:4999
msgid "instead of applying the patch, output diffstat for the input"
msgstr "au lieu d'appliquer le patch, afficher le diffstat de l'entrée"
-#: apply.c:4983
+#: apply.c:5003
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
"afficher le nombre de lignes ajoutées et supprimées en notation décimale"
-#: apply.c:4985
+#: apply.c:5005
msgid "instead of applying the patch, output a summary for the input"
msgstr "au lieu d'appliquer le patch, afficher un résumé de l'entrée"
-#: apply.c:4987
+#: apply.c:5007
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "au lieu d'appliquer le patch, voir si le patch est applicable"
-#: apply.c:4989
+#: apply.c:5009
msgid "make sure the patch is applicable to the current index"
msgstr "s'assurer que le patch est applicable sur l'index actuel"
-#: apply.c:4991
+#: apply.c:5011
msgid "mark new files with `git add --intent-to-add`"
msgstr "marquer les nouveaux fichiers `git add --intent-to-add`"
-#: apply.c:4993
+#: apply.c:5013
msgid "apply a patch without touching the working tree"
msgstr "appliquer les patch sans toucher à la copie de travail"
-#: apply.c:4995
+#: apply.c:5015
msgid "accept a patch that touches outside the working area"
msgstr "accepter un patch qui touche hors de la copie de travail"
-#: apply.c:4998
+#: apply.c:5018
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "appliquer aussi le patch (à utiliser avec --stat/--summary/--check)"
-#: apply.c:5000
+#: apply.c:5020
msgid "attempt three-way merge if a patch does not apply"
msgstr "tenter une fusion à 3 points si le patch ne s'applique pas proprement"
-#: apply.c:5002
+#: apply.c:5022
msgid "build a temporary index based on embedded index information"
msgstr ""
"construire un index temporaire fondé sur l'information de l'index embarqué"
-#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540
msgid "paths are separated with NUL character"
msgstr "les chemins sont séparés par un caractère NUL"
-#: apply.c:5007
+#: apply.c:5027
msgid "ensure at least <n> lines of context match"
msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"
-#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98
+#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98
#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3457 builtin/rebase.c:1508
+#: builtin/pack-objects.c:3577 builtin/rebase.c:1352
msgid "action"
msgstr "action"
-#: apply.c:5009
+#: apply.c:5029
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
"détecter des lignes nouvelles ou modifiées qui contiennent des erreurs "
"d'espace"
-#: apply.c:5012 apply.c:5015
+#: apply.c:5032 apply.c:5035
msgid "ignore changes in whitespace when finding context"
msgstr "ignorer des modifications d'espace lors de la recherche de contexte"
-#: apply.c:5018
+#: apply.c:5038
msgid "apply the patch in reverse"
msgstr "appliquer le patch en sens inverse"
-#: apply.c:5020
+#: apply.c:5040
msgid "don't expect at least one line of context"
msgstr "ne pas s'attendre à au moins une ligne de contexte"
-#: apply.c:5022
+#: apply.c:5042
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants"
-#: apply.c:5024
+#: apply.c:5044
msgid "allow overlapping hunks"
msgstr "accepter les recouvrements de sections"
-#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22
-#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774
-#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22
+#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757
+#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "mode verbeux"
-#: apply.c:5027
+#: apply.c:5047
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
"tolérer des erreurs de détection de retours chariot manquants en fin de "
"fichier"
-#: apply.c:5030
+#: apply.c:5050
msgid "do not trust the line counts in the hunk headers"
msgstr "ne pas se fier au compte de lignes dans les en-têtes de section"
-#: apply.c:5032 builtin/am.c:2248
+#: apply.c:5052 builtin/am.c:2254
msgid "root"
msgstr "racine"
-#: apply.c:5033
+#: apply.c:5053
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:450
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr "impossible de démarrer le filtre '%s'"
+
+#: archive-tar.c:453
+msgid "unable to redirect descriptor"
+msgstr "impossible de rediriger un descripteur"
+
+#: archive-tar.c:460
+#, 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>...]"
@@ -1543,183 +1635,157 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <dépôt> [--exec <commande>] --list"
-#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
-#, c-format
-msgid "pathspec '%s' did not match any files"
-msgstr "le chemin '%s' ne correspond à aucun fichier"
-
-#: archive.c:396
-#, c-format
-msgid "no such ref: %.*s"
-msgstr "référence inexistante : %.*s"
-
-#: archive.c:401
-#, c-format
-msgid "not a valid object name: %s"
-msgstr "nom d'objet invalide : %s"
-
-#: archive.c:414
-#, c-format
-msgid "not a tree object: %s"
-msgstr "objet arbre invalide : %s"
-
-#: archive.c:426
-msgid "current working directory is untracked"
-msgstr "l'arbre de travail actuel est non-suivi"
-
-#: archive.c:457
-msgid "fmt"
-msgstr "fmt"
-
-#: archive.c:457
-msgid "archive format"
-msgstr "format d'archive"
-
-#: archive.c:458 builtin/log.c:1653
-msgid "prefix"
-msgstr "préfixe"
-
-#: archive.c:459
-msgid "prepend prefix to each pathname in the archive"
-msgstr "préfixer chaque chemin de fichier dans l'archive"
-
-#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
-#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
-#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887
-#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
-#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
-#: parse-options.h:190
-msgid "file"
-msgstr "fichier"
-
-#: archive.c:461 builtin/archive.c:90
-msgid "write the archive to this file"
-msgstr "écrire l'archive dans ce fichier"
-
-#: archive.c:463
-msgid "read .gitattributes in working directory"
-msgstr "lire .gitattributes dans le répertoire de travail"
-
-#: archive.c:464
-msgid "report archived files on stderr"
-msgstr "afficher les fichiers archivés sur stderr"
-
-#: archive.c:465
-msgid "store only"
-msgstr "stockage seulement"
-
-#: archive.c:466
-msgid "compress faster"
-msgstr "compression rapide"
-
-#: archive.c:474
-msgid "compress better"
-msgstr "compression efficace"
-
-#: archive.c:477
-msgid "list supported archive formats"
-msgstr "afficher les formats d'archive supportés"
-
-#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
-#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
-msgid "repo"
-msgstr "dépôt"
-
-#: archive.c:480 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:715
-#: builtin/notes.c:498
-msgid "command"
-msgstr "commande"
-
-#: archive.c:482 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
-msgid "Unexpected option --remote"
-msgstr "Option --remote inattendue"
-
-#: archive.c:491
-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
-msgid "Unexpected option --output"
-msgstr "Option --output inattendue"
-
-#: archive.c:515
-#, c-format
-msgid "Unknown archive format '%s'"
-msgstr "Format d'archive inconnu '%s'"
-
-#: archive.c:522
-#, 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:351
-#, c-format
-msgid "cannot stream blob %s"
-msgstr "impossible de transmettre le blob %s en flux"
-
-#: archive-tar.c:266 archive-zip.c:369
-#, c-format
-msgid "unsupported file mode: 0%o (SHA1: %s)"
-msgstr "mode de fichier non supporté :0%o (SHA1: %s)"
-
-#: archive-tar.c:293 archive-zip.c:359
+#: archive.c:192
#, c-format
msgid "cannot read %s"
msgstr "impossible de lire %s"
-#: archive-tar.c:465
+#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894
+#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786
+#: builtin/merge.c:1139
#, c-format
-msgid "unable to start '%s' filter"
-msgstr "impossible de démarrer le filtre '%s'"
+msgid "could not read '%s'"
+msgstr "impossible de lire '%s'"
-#: archive-tar.c:468
-msgid "unable to redirect descriptor"
-msgstr "impossible de rediriger un descripteur"
-
-#: archive-tar.c:475
+#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315
#, c-format
-msgid "'%s' filter reported error"
-msgstr "le filtre '%s' a retourné une erreur"
+msgid "pathspec '%s' did not match any files"
+msgstr "le chemin '%s' ne correspond à aucun fichier"
-#: archive-zip.c:319
+#: archive.c:454
#, c-format
-msgid "path is not valid UTF-8: %s"
-msgstr "le chemin n'est pas codé en UTF-8 valide : %s"
+msgid "no such ref: %.*s"
+msgstr "référence inexistante : %.*s"
-#: archive-zip.c:323
+#: archive.c:460
#, c-format
-msgid "path too long (%d chars, SHA1: %s): %s"
-msgstr "le chemin est trop long (%d caractères, SHA1 : %s) : %s"
+msgid "not a valid object name: %s"
+msgstr "nom d'objet invalide : %s"
-#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
+#: archive.c:473
#, c-format
-msgid "deflate error (%d)"
-msgstr "erreur de compression (%d)"
+msgid "not a tree object: %s"
+msgstr "objet arbre invalide : %s"
-#: archive-zip.c:615
+#: archive.c:485
+msgid "current working directory is untracked"
+msgstr "l'arbre de travail actuel est non-suivi"
+
+#: archive.c:526
#, c-format
-msgid "timestamp too large for this system: %<PRIuMAX>"
-msgstr "l'horodatage est trop grand pour ce système : %<PRIuMAX>"
+msgid "File not found: %s"
+msgstr "Fichier non trouvé : %s"
-#: attr.c:212
+#: archive.c:528
+#, c-format
+msgid "Not a regular file: %s"
+msgstr "'%s' n'est pas un fichier normal"
+
+#: archive.c:555
+msgid "fmt"
+msgstr "fmt"
+
+#: archive.c:555
+msgid "archive format"
+msgstr "format d'archive"
+
+#: archive.c:556 builtin/log.c:1764
+msgid "prefix"
+msgstr "préfixe"
+
+#: archive.c:557
+msgid "prepend prefix to each pathname in the archive"
+msgstr "préfixer chaque chemin de fichier dans l'archive"
+
+#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888
+#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
+#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
+#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105
+#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412
+#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190
+msgid "file"
+msgstr "fichier"
+
+#: archive.c:559
+msgid "add untracked file to archive"
+msgstr "ajouter les fichiers non suivis à l'archive"
+
+#: archive.c:562 builtin/archive.c:90
+msgid "write the archive to this file"
+msgstr "écrire l'archive dans ce fichier"
+
+#: archive.c:564
+msgid "read .gitattributes in working directory"
+msgstr "lire .gitattributes dans le répertoire de travail"
+
+#: archive.c:565
+msgid "report archived files on stderr"
+msgstr "afficher les fichiers archivés sur stderr"
+
+#: archive.c:567
+msgid "set compression level"
+msgstr "régler le niveau de compression"
+
+#: archive.c:570
+msgid "list supported archive formats"
+msgstr "afficher les formats d'archive supportés"
+
+#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117
+#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
+msgid "repo"
+msgstr "dépôt"
+
+#: archive.c:573 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:574 builtin/archive.c:93 builtin/difftool.c:714
+#: builtin/notes.c:498
+msgid "command"
+msgstr "commande"
+
+#: archive.c:575 builtin/archive.c:94
+msgid "path to the remote git-upload-archive command"
+msgstr "chemin vers la commande distante git-upload-archive"
+
+#: archive.c:582
+msgid "Unexpected option --remote"
+msgstr "Option --remote inattendue"
+
+#: archive.c:584
+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:586
+msgid "Unexpected option --output"
+msgstr "Option --output inattendue"
+
+#: archive.c:588
+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:610
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "Format d'archive inconnu '%s'"
+
+#: archive.c:619
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "Argument non supporté pour le format '%s' : -%d"
+
+#: attr.c:202
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s n'est pas un nom valide d'attribut"
-#: attr.c:369
+#: attr.c:359
#, c-format
msgid "%s not allowed: %s:%d"
msgstr "%s non permis : %s : %d"
-#: attr.c:409
+#: attr.c:399
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -1727,22 +1793,22 @@
"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:489
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Contenu mal cité dans le fichier '%s' : %s"
-#: bisect.c:678
+#: bisect.c:699
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Impossible de pousser la bissection plus loin !\n"
-#: bisect.c:745
+#: bisect.c:766
#, c-format
msgid "Not a valid commit name %s"
msgstr "%s n'est pas un nom de commit valide"
-#: bisect.c:770
+#: bisect.c:791
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1751,7 +1817,7 @@
"La base de fusion %s est mauvaise.\n"
"Cela signifie que le bogue été corrigé entre %s et [%s].\n"
-#: bisect.c:775
+#: bisect.c:796
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1760,7 +1826,7 @@
"La base de fusion %s est nouvelle.\n"
"La propriété a changé entre %s et [%s].\n"
-#: bisect.c:780
+#: bisect.c:801
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1769,7 +1835,7 @@
"La base de fusion %s est %s.\n"
"Ceci signifie que le premier commit '%s' est entre %s et [%s].\n"
-#: bisect.c:788
+#: bisect.c:809
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1780,7 +1846,7 @@
"git bisect ne peut pas fonctionner correctement dans ce cas.\n"
"Peut-être les révisions %s et %s ne sont-elles pas les bonnes ?\n"
-#: bisect.c:801
+#: bisect.c:822
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1792,45 +1858,45 @@
"et %s.\n"
"On continue tout de même."
-#: bisect.c:840
+#: bisect.c:861
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Bissection : une base de fusion doit être testée\n"
-#: bisect.c:890
+#: bisect.c:911
#, c-format
msgid "a %s revision is needed"
msgstr "une révision %s est nécessaire"
-#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287
#, c-format
msgid "could not create file '%s'"
msgstr "impossible de créer le fichier '%s'"
-#: bisect.c:966 builtin/merge.c:149
+#: bisect.c:987 builtin/merge.c:153
#, c-format
msgid "could not read file '%s'"
msgstr "impossible de lire le fichier '%s'"
-#: bisect.c:997
+#: bisect.c:1027
msgid "reading bisect refs failed"
msgstr "impossible de lire les références de bissection"
-#: bisect.c:1019
+#: bisect.c:1057
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s était à la fois %s et %s\n"
-#: bisect.c:1028
+#: bisect.c:1066
#, c-format
msgid ""
"No testable commit found.\n"
-"Maybe you started with bad path parameters?\n"
+"Maybe you started with bad path arguments?\n"
msgstr ""
"Aucun commit testable n'a été trouvé\n"
-"Peut-être avez-vous démarré avec un mauvais paramètre de chemin ?\n"
+"Peut-être avez-vous démarré avec un mauvais arguement de chemin ?\n"
-#: bisect.c:1057
+#: bisect.c:1095
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1840,48 +1906,48 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1063
+#: bisect.c:1101
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[0] "Bissection : %d révision à tester après ceci %s\n"
msgstr[1] "Bissection : %d révisions à tester après ceci %s\n"
-#: blame.c:2700
+#: blame.c:2777
msgid "--contents and --reverse do not blend well."
msgstr "--contents et --reverse ne font pas bon ménage."
-#: blame.c:2714
+#: blame.c:2791
msgid "cannot use --contents with final commit object name"
msgstr "on ne peut pas utiliser --contents avec un nom d'objet commit final"
-#: blame.c:2735
+#: blame.c:2812
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
"--reverse et --first-parent ensemble nécessitent la spécification d'un "
"dernier commit"
-#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006
-#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388
-#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215
-#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290
-#: builtin/shortlog.c:192
+#: blame.c:2821 bundle.c:213 ref-filter.c:2206 remote.c:2041 sequencer.c:2146
+#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411
+#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335
+#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410
+#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr "échec de la préparation du parcours des révisions"
-#: blame.c:2762
+#: blame.c:2839
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
"--reverse --first-parent ensemble nécessitent une portée avec la chaîne de "
"premier parent"
-#: blame.c:2773
+#: blame.c:2850
#, c-format
msgid "no such path %s in %s"
msgstr "pas de chemin %s dans %s"
-#: blame.c:2784
+#: blame.c:2861
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "impossible de lire le blob %s pour le chemin %s"
@@ -2024,114 +2090,421 @@
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 "'%s' does not look like a v2 bundle file"
-msgstr "'%s' ne semble pas être un fichier bundle v2"
+msgid "unrecognized bundle hash algorithm: %s"
+msgstr "algorithme d'empreinte du colis inconnu : %s"
-#: bundle.c:64
+#: 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 or v3 bundle file"
+msgstr "'%s' ne semble pas être un fichier colis v2 our v3"
+
+#: 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:2258 sequencer.c:3016
-#: builtin/commit.c:815
+#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184
+#: 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:273
+#: bundle.c:319
msgid "unable to dup bundle descriptor"
msgstr "impossible de dupliquer le descripteur de liasse"
-#: bundle.c:280
+#: bundle.c:326
msgid "Could not spawn pack-objects"
msgstr "Impossible de créer des objets groupés"
-#: bundle.c:291
+#: bundle.c:337
msgid "pack-objects died"
msgstr "les objets groupés ont disparu"
-#: bundle.c:333
-msgid "rev-list died"
-msgstr "rev-list a disparu"
-
-#: bundle.c:382
+#: bundle.c:386
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "la référence '%s' est exclue par les options de rev-list"
-#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306
+#: bundle.c:490
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr "version de colis non supportée %d"
+
+#: bundle.c:492
+#, 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:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396
#, c-format
msgid "unrecognized argument: %s"
msgstr "argument non reconnu : %s"
-#: bundle.c:469
+#: bundle.c:539
msgid "Refusing to create empty bundle."
msgstr "Refus de créer un colis vide."
-#: bundle.c:479
+#: bundle.c:549
#, c-format
msgid "cannot create '%s'"
msgstr "impossible de créer '%s'"
-#: bundle.c:504
+#: bundle.c:574
msgid "index-pack died"
msgstr "l'index de groupe a disparu"
+#: chunk-format.c:113
+msgid "terminating chunk id appears earlier than expected"
+msgstr "l'identifiant de terminaison de tronçon apparaît plus tôt qu'attendu"
+
+#: chunk-format.c:122
+#, c-format
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr "décalage(s) de section incorrect(s) %<PRIx64> et %<PRIx64>"
+
+#: chunk-format.c:129
+#, c-format
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr "ID de section dupliqué %<PRIx32>"
+
+#: chunk-format.c:143
+#, c-format
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr "la section finale a un id non nul %<PRIx32>"
+
#: color.c:329
#, c-format
msgid "invalid color value: %.*s"
msgstr "Valeur invalide de couleur : %.*s"
-#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403
-#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457
+#: commit-graph.c:197 midx.c:46
+msgid "invalid hash version"
+msgstr "version d'empreinte invalide"
+
+#: commit-graph.c:255
+msgid "commit-graph file is too small"
+msgstr "le graphe de commit est trop petit"
+
+#: commit-graph.c:348
+#, 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:355
+#, 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:362
+#, 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:379
+#, 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:472
+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:482
+msgid "commit-graph chain does not match"
+msgstr "la chaîne de graphe de commit ne correspond pas"
+
+#: commit-graph.c:530
+#, 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:554
+msgid "unable to find all commit-graph files"
+msgstr "impossible de trouver tous les fichiers du graphe de commit"
+
+#: commit-graph.c:735 commit-graph.c:772
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr ""
+"position de commit invalide. Le graphe de commit est vraisemblablement "
+"corrompu"
+
+#: commit-graph.c:756
+#, c-format
+msgid "could not find commit %s"
+msgstr "impossible de trouver le commit %s"
+
+#: commit-graph.c:789
+msgid "commit-graph requires overflow generation data but has none"
+msgstr ""
+"le graphe de commits requiert des données de génération de débordement mais "
+"n'en contient pas"
+
+#: commit-graph.c:1065 builtin/am.c:1292
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "impossible d'analyser le commit %s"
+
+#: commit-graph.c:1327 builtin/pack-objects.c:2872
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "impossible d'obtenir le type de l'objet %s"
+
+#: commit-graph.c:1358
+msgid "Loading known commits in commit graph"
+msgstr "Lecture des commits connus dans un graphe de commit"
+
+#: commit-graph.c:1375
+msgid "Expanding reachable commits in commit graph"
+msgstr "Expansion des commits joignables dans un graphe de commit"
+
+#: commit-graph.c:1395
+msgid "Clearing commit marks in commit graph"
+msgstr "Suppression les marques de commit dans le graphe de commits"
+
+#: commit-graph.c:1414
+msgid "Computing commit graph topological levels"
+msgstr "Calcul des niveaux topologiques du graphe de commits"
+
+#: commit-graph.c:1467
+msgid "Computing commit graph generation numbers"
+msgstr "Calcul des chiffres de génération du graphe de commits"
+
+#: commit-graph.c:1548
+msgid "Computing commit changed paths Bloom filters"
+msgstr "Calcul des filtres Bloom des chemins modifiés du commit"
+
+#: commit-graph.c:1625
+msgid "Collecting referenced commits"
+msgstr "Collecte des commits référencés"
+
+#: commit-graph.c:1650
+#, 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:1663
+#, c-format
+msgid "error adding pack %s"
+msgstr "erreur à l'ajout du packet %s"
+
+#: commit-graph.c:1667
+#, c-format
+msgid "error opening index for %s"
+msgstr "erreur à l'ouverture de l'index pour %s"
+
+#: commit-graph.c:1704
+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:1722
+msgid "Finding extra edges in commit graph"
+msgstr "Recherche d'arêtes supplémentaires dans un graphe de commits"
+
+#: commit-graph.c:1771
+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:1802 midx.c:794
+#, 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:1815
+msgid "unable to create temporary graph layer"
+msgstr "impossible de créer une couche de graphe temporaire"
+
+#: commit-graph.c:1820
+#, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "impossible de régler les droits partagés pour '%s'"
+
+#: commit-graph.c:1879
+#, 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:1915
+msgid "unable to open commit-graph chain file"
+msgstr "impossible d'ouvrir le fichier de graphe de commit"
+
+#: commit-graph.c:1931
+msgid "failed to rename base commit-graph file"
+msgstr "échec du renommage du fichier de graphe de commits"
+
+#: commit-graph.c:1951
+msgid "failed to rename temporary commit-graph file"
+msgstr "impossible de renommer le fichier temporaire de graphe de commits"
+
+#: commit-graph.c:2084
+msgid "Scanning merged commits"
+msgstr "Analyse des commits de fusion"
+
+#: commit-graph.c:2128
+msgid "Merging commit-graph"
+msgstr "fusion du graphe de commits"
+
+#: commit-graph.c:2235
+msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
+msgstr ""
+"essai d'écriture de graphe de commits, mais 'core.commitGraph' est désactivé"
+
+#: commit-graph.c:2342
+msgid "too many commits to write graph"
+msgstr "trop de commits pour écrire un graphe"
+
+#: commit-graph.c:2440
+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:2450
+#, 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:2460 commit-graph.c:2475
+#, 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:2467
+#, 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:2485
+msgid "Verifying commits in commit graph"
+msgstr "Verification des commits dans le graphe de commits"
+
+#: commit-graph.c:2500
+#, 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:2507
+#, 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:2517
+#, 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:2526
+#, 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:2540
+#, 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:2545
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+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:2549
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+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:2566
+#, c-format
+msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
+msgstr ""
+"la génération du graphe de commit pour le commit %s est %<PRIuMAX> < "
+"%<PRIuMAX>"
+
+#: commit-graph.c:2572
+#, 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:2887 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr "impossible d'analyser %s"
-#: commit.c:53
+#: commit.c:54
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s n'est pas un commit !"
-#: commit.c:193
+#: commit.c:194
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -2151,27 +2524,27 @@
"Supprimez ce message en lançant\n"
"\"git config advice.graftFileDeprecated false\""
-#: commit.c:1153
+#: commit.c:1223
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "La validation %s a une signature GPG non fiable, prétendument par %s."
-#: commit.c:1157
+#: commit.c:1227
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "La validation %s a une mauvaise signature GPG prétendument par %s."
-#: commit.c:1160
+#: commit.c:1230
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "La validation %s n'a pas de signature GPG."
-#: commit.c:1163
+#: commit.c:1233
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "La validation %s a une signature GPG correcte par %s\n"
-#: commit.c:1417
+#: commit.c:1487
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
@@ -2183,287 +2556,11 @@
"variable de configuration i18n.commitencoding à l'encodage utilisé par votre "
"projet.\n"
-#: commit-graph.c:122
-msgid "commit-graph file is too small"
-msgstr "le graphe de commit est trop petit"
-
-#: commit-graph.c:189
-#, c-format
-msgid "commit-graph signature %X does not match signature %X"
-msgstr ""
-"la signature du graphe de commit %X ne correspond pas à la signature %X"
-
-#: commit-graph.c:196
-#, c-format
-msgid "commit-graph version %X does not match version %X"
-msgstr "la version %X du graphe de commit ne correspond pas à la version %X"
-
-#: commit-graph.c:203
-#, c-format
-msgid "commit-graph hash version %X does not match version %X"
-msgstr ""
-"l'empreinte de la version %X du graphe de commit ne correspond pas à la "
-"version %X"
-
-#: commit-graph.c:226
-msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
-msgstr ""
-"entrée de table de consultation de morceaux de graphe de commite manquante ; "
-"le fichier est peut être incomplet"
-
-#: commit-graph.c:237
-#, c-format
-msgid "commit-graph improper chunk offset %08x%08x"
-msgstr "décalage de bloc %08x%08x du graphe de commit inadéquat"
-
-#: commit-graph.c:280
-#, c-format
-msgid "commit-graph chunk id %08x appears multiple times"
-msgstr "l'id de bloc de graphe de commit %08x apparaît des multiples fois"
-
-#: commit-graph.c:343
-msgid "commit-graph has no base graphs chunk"
-msgstr "le graphe de commit n'a pas de section de graphes de base"
-
-#: commit-graph.c:353
-msgid "commit-graph chain does not match"
-msgstr "la chaîne de graphe de commit ne correspond pas"
-
-#: commit-graph.c:401
-#, c-format
-msgid "invalid commit-graph chain: line '%s' not a hash"
-msgstr ""
-"chaîne de graphe de commit invalide : la ligne '%s' n'est pas une empreinte"
-
-#: commit-graph.c:425
-msgid "unable to find all commit-graph files"
-msgstr "impossible de trouver tous les fichiers du graphe de commit"
-
-#: commit-graph.c:558 commit-graph.c:618
-msgid "invalid commit position. commit-graph is likely corrupt"
-msgstr ""
-"position de commit invalide. Le graphe de commit est vraisemblablement "
-"corrompu"
-
-#: commit-graph.c:579
-#, c-format
-msgid "could not find commit %s"
-msgstr "impossible de trouver le commit %s"
-
-#: commit-graph.c:852 builtin/am.c:1292
-#, c-format
-msgid "unable to parse commit %s"
-msgstr "impossible d'analyser le commit %s"
-
-#: commit-graph.c:1011 builtin/pack-objects.c:2782
-#, c-format
-msgid "unable to get type of object %s"
-msgstr "impossible d'obtenir le type de l'objet %s"
-
-#: commit-graph.c:1043
-msgid "Loading known commits in commit graph"
-msgstr "Lecture des commits connus dans un graphe de commit"
-
-#: commit-graph.c:1060
-msgid "Expanding reachable commits in commit graph"
-msgstr "Expansion des commits joignables dans un graphe de commit"
-
-#: commit-graph.c:1079
-msgid "Clearing commit marks in commit graph"
-msgstr "Suppression les marques de commit dans le graphe de commits"
-
-#: commit-graph.c:1098
-msgid "Computing commit graph generation numbers"
-msgstr "Calcul des chiffres de génération du graphe de commits"
-
-#: commit-graph.c:1173
-#, c-format
-msgid "Finding commits for commit graph in %d pack"
-msgid_plural "Finding commits for commit graph in %d packs"
-msgstr[0] "Recherche de commits pour un graphe de commits dans %d paquet"
-msgstr[1] "Recherche de commits pour un graphe de commits dans %d paquets"
-
-#: commit-graph.c:1186
-#, c-format
-msgid "error adding pack %s"
-msgstr "erreur à l'ajout du packet %s"
-
-#: commit-graph.c:1190
-#, c-format
-msgid "error opening index for %s"
-msgstr "erreur à l'ouverture de l'index pour %s"
-
-#: commit-graph.c:1214
-#, c-format
-msgid "Finding commits for commit graph from %d ref"
-msgid_plural "Finding commits for commit graph from %d refs"
-msgstr[0] "Recherche de commits pour un graphe de commits depuis %d réf"
-msgstr[1] "Recherche de commits pour un graphe de commits depuis %d réfs"
-
-#: commit-graph.c:1234
-#, c-format
-msgid "invalid commit object id: %s"
-msgstr "identifiant d'objet commit invalide : %s"
-
-#: commit-graph.c:1249
-msgid "Finding commits for commit graph among packed objects"
-msgstr ""
-"Recherche de commits pour un graphe de commits parmi les objets empaquetés"
-
-#: commit-graph.c:1264
-msgid "Counting distinct commits in commit graph"
-msgstr "Comptage des commits distincts dans un graphe de commit"
-
-#: commit-graph.c:1294
-msgid "Finding extra edges in commit graph"
-msgstr "Recherche d'arêtes supplémentaires dans un graphe de commits"
-
-#: commit-graph.c:1340
-msgid "failed to write correct number of base graph ids"
-msgstr "échec à l'écriture le nombre correct d'id de base de fusion"
-
-#: commit-graph.c:1373 midx.c:814
-#, c-format
-msgid "unable to create leading directories of %s"
-msgstr "impossible de créer les répertoires de premier niveau de %s"
-
-#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248
-#, c-format
-msgid "unable to create '%s'"
-msgstr "impossible de créer '%s'"
-
-#: commit-graph.c:1445
-#, c-format
-msgid "Writing out commit graph in %d pass"
-msgid_plural "Writing out commit graph in %d passes"
-msgstr[0] "Écriture le graphe de commits en %d passe"
-msgstr[1] "Écriture le graphe de commits en %d passes"
-
-#: commit-graph.c:1486
-msgid "unable to open commit-graph chain file"
-msgstr "impossible d'ouvrir le fichier de graphe de commit"
-
-#: commit-graph.c:1498
-msgid "failed to rename base commit-graph file"
-msgstr "échec du renommage du fichier de graphe de commits"
-
-#: commit-graph.c:1518
-msgid "failed to rename temporary commit-graph file"
-msgstr "impossible de renommer le fichier temporaire de graphe de commits"
-
-#: commit-graph.c:1631
-msgid "Scanning merged commits"
-msgstr "Analyse des commits de fusion"
-
-#: commit-graph.c:1642
-#, c-format
-msgid "unexpected duplicate commit id %s"
-msgstr "id de commit %s dupliqué inattendu"
-
-#: commit-graph.c:1665
-msgid "Merging commit-graph"
-msgstr "fusion du graphe de commits"
-
-#: commit-graph.c:1844
-#, 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
-msgid "too many commits to write graph"
-msgstr "trop de commits pour écrire un graphe"
-
-#: commit-graph.c:1944
-msgid "the commit-graph file has incorrect checksum and is likely corrupt"
-msgstr ""
-"le graphe de commit a une somme de contrôle incorrecte et est "
-"vraisemblablement corrompu"
-
-#: commit-graph.c:1954
-#, c-format
-msgid "commit-graph has incorrect OID order: %s then %s"
-msgstr "le graphe de commit a un ordre d'OID incorrect : %s puis %s"
-
-#: commit-graph.c:1964 commit-graph.c:1979
-#, c-format
-msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
-msgstr ""
-"le graphe de commit a une valeur de dispersion incorrecte : dispersion[%d] = "
-"%u != %u"
-
-#: commit-graph.c:1971
-#, 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
-msgid "Verifying commits in commit graph"
-msgstr "Verification des commits dans le graphe de commits"
-
-#: commit-graph.c:2003
-#, c-format
-msgid "failed to parse commit %s from object database for commit-graph"
-msgstr ""
-"échec de l'analyse du commit %s depuis la base de données d'objets pour le "
-"graphe de commit"
-
-#: commit-graph.c:2010
-#, c-format
-msgid "root tree OID for commit %s in commit-graph is %s != %s"
-msgstr ""
-"l'OID de l'arbre racine pour le commit %s dans le graphe de commit est %s != "
-"%s"
-
-#: commit-graph.c:2020
-#, c-format
-msgid "commit-graph parent list for commit %s is too long"
-msgstr ""
-"la liste des parents du graphe de commit pour le commit %s est trop longue"
-
-#: commit-graph.c:2029
-#, c-format
-msgid "commit-graph parent for %s is %s != %s"
-msgstr "le parent du graphe de commit pour %s est %s != %s"
-
-#: commit-graph.c:2042
-#, c-format
-msgid "commit-graph parent list for commit %s terminates early"
-msgstr ""
-"la liste de parents du graphe de commit pour le commit %s se termine trop tôt"
-
-#: commit-graph.c:2047
-#, c-format
-msgid ""
-"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
-msgstr ""
-"le graphe de commit a un numéro de génération nul pour le commit %s, mais "
-"non-nul ailleurs"
-
-#: commit-graph.c:2051
-#, c-format
-msgid ""
-"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
-msgstr ""
-"le graphe de commit a un numéro de génération non-nul pour le commit %s, "
-"mais nul ailleurs"
-
-#: commit-graph.c:2066
-#, c-format
-msgid "commit-graph generation for commit %s is %u != %u"
-msgstr "la génération du graphe de commit pour le commit %s est %u != %u"
-
-#: commit-graph.c:2072
-#, 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>"
-
#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "plus de mémoire"
-#: config.c:124
+#: config.c:126
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2478,306 +2575,350 @@
"\t%s\n"
"possibilité d'inclusions multiples."
-#: config.c:140
+#: config.c:142
#, c-format
msgid "could not expand include path '%s'"
msgstr "expansion impossible du chemin d'inclusion '%s'"
-#: config.c:151
+#: config.c:153
msgid "relative config includes must come from files"
msgstr "les inclusions de configuration relatives doivent venir de fichiers"
-#: config.c:197
+#: config.c:199
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:396
+#, c-format
+msgid "invalid config format: %s"
+msgstr "format de config invalide : %s"
+
+#: config.c:400
+#, c-format
+msgid "missing environment variable name for configuration '%.*s'"
+msgstr "nom de variable d'environnement manquant pour le configuration '%.*s'"
+
+#: config.c:405
+#, c-format
+msgid "missing environment variable '%s' for configuration '%.*s'"
+msgstr "variable d'environnement '%s' manquante pour le configuration '%.*s'"
+
+#: config.c:442
#, c-format
msgid "key does not contain a section: %s"
msgstr "la clé ne contient pas de section: %s"
-#: config.c:382
+#: config.c:448
#, 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:2444
+#: config.c:472 sequencer.c:2588
#, c-format
msgid "invalid key: %s"
msgstr "clé invalide : %s"
-#: config.c:412
+#: config.c:478
#, c-format
msgid "invalid key (newline): %s"
msgstr "clé invalide (retour chariot) : %s"
-#: config.c:448 config.c:460
+#: config.c:511
+msgid "empty config key"
+msgstr "clé de configuration vide"
+
+#: config.c:529 config.c:541
#, c-format
msgid "bogus config parameter: %s"
msgstr "paramètre de configuration mal formé: %s"
-#: config.c:495
+#: config.c:555 config.c:572 config.c:579 config.c:588
#, c-format
msgid "bogus format in %s"
msgstr "formatage mal formé dans %s"
-#: config.c:821
+#: config.c:622
+#, c-format
+msgid "bogus count in %s"
+msgstr "compte faux dans %s"
+
+#: config.c:626
+#, c-format
+msgid "too many entries in %s"
+msgstr "trop d'entrées dans %s"
+
+#: config.c:636
+#, c-format
+msgid "missing config key %s"
+msgstr "clé de configuration %s manquante"
+
+#: config.c:644
+#, c-format
+msgid "missing config value %s"
+msgstr "valeur de config manquante %s"
+
+#: config.c:995
#, 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:999
#, 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:1003
#, 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:1007
#, 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:1011
#, 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:1015
#, c-format
msgid "bad config line %d in %s"
msgstr "ligne %d de config incorrecte dans %s"
-#: config.c:978
+#: config.c:1152
msgid "out of range"
msgstr "hors plage"
-#: config.c:978
+#: config.c:1152
msgid "invalid unit"
msgstr "unité invalide"
-#: config.c:979
+#: config.c:1153
#, 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:1163
#, 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:1166
#, 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:1169
#, 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:1172
#, 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:1175
#, 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:1178
#, 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:1194
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr "valeur booléenne de configuration invalide '%s' pour '%s'"
+
+#: config.c:1289
#, 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:1298
#, 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:1391
#, c-format
msgid "abbrev length out of range: %d"
msgstr "longueur d'abbrev hors plage : %d"
-#: config.c:1222 config.c:1233
+#: config.c:1405 config.c:1416
#, c-format
msgid "bad zlib compression level %d"
msgstr "niveau de compression zlib incorrect %d"
-#: config.c:1325
+#: config.c:1508
msgid "core.commentChar should only be one character"
msgstr "core.commentChar ne devrait être qu'un unique caractère"
-#: config.c:1358
+#: config.c:1541
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "mode invalide pour la création d'objet : %s"
-#: config.c:1430
+#: config.c:1613
#, c-format
msgid "malformed value for %s"
msgstr "valeur mal formée pour %s"
-#: config.c:1456
+#: config.c:1639
#, c-format
msgid "malformed value for %s: %s"
msgstr "valeur mal formée pour %s : %s"
-#: config.c:1457
+#: config.c:1640
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "doit être parmi nothing, matching, simple, upstream ou current"
-#: config.c:1518 builtin/pack-objects.c:3541
+#: config.c:1701 builtin/pack-objects.c:3666
#, c-format
msgid "bad pack compression level %d"
msgstr "niveau de compression du paquet %d"
-#: config.c:1639
+#: config.c:1823
#, 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:1826
#, 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:1843
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "impossible de résoudre le blob de config '%s'"
-#: config.c:1689
+#: config.c:1873
#, c-format
msgid "failed to parse %s"
msgstr "échec de l'analyse de %s"
-#: config.c:1743
+#: config.c:1927
msgid "unable to parse command-line config"
msgstr "lecture de la configuration de ligne de commande impossible"
-#: config.c:2097
+#: config.c:2290
msgid "unknown error occurred while reading the configuration files"
msgstr "erreur inconnue pendant la lecture des fichiers de configuration"
-#: config.c:2267
+#: config.c:2464
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s invalide : '%s'"
-#: config.c:2312
+#: config.c:2509
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
"la valeur '%d' de splitIndex.maxPercentChange devrait se situer entre 0 et "
"100"
-#: config.c:2358
+#: config.c:2555
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr ""
"impossible d'analyser '%s' depuis le configuration en ligne de commande"
-#: config.c:2360
+#: config.c:2557
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr ""
"variable de configuration '%s' incorrecte dans le fichier '%s' à la ligne %d"
-#: config.c:2441
+#: config.c:2641
#, c-format
msgid "invalid section name '%s'"
msgstr "nom de section invalide '%s'"
-#: config.c:2473
+#: config.c:2673
#, c-format
msgid "%s has multiple values"
msgstr "%s a des valeurs multiples"
-#: config.c:2502
+#: config.c:2702
#, c-format
msgid "failed to write new configuration file %s"
msgstr "impossible d'écrire le fichier de configuration %s"
-#: config.c:2754 config.c:3078
+#: config.c:2954 config.c:3280
#, c-format
msgid "could not lock config file %s"
msgstr "impossible de verrouiller le fichier de configuration %s"
-#: config.c:2765
+#: config.c:2965
#, c-format
msgid "opening %s"
msgstr "ouverture de %s"
-#: config.c:2800 builtin/config.c:344
+#: config.c:3002 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "motif invalide : %s"
-#: config.c:2825
+#: config.c:3027
#, c-format
msgid "invalid config file %s"
msgstr "fichier de configuration invalide %s"
-#: config.c:2838 config.c:3091
+#: config.c:3040 config.c:3293
#, c-format
msgid "fstat on %s failed"
msgstr "échec de fstat sur %s"
-#: config.c:2849
+#: config.c:3051
#, c-format
msgid "unable to mmap '%s'"
msgstr "impossible de réaliser un map de '%s'"
-#: config.c:2858 config.c:3096
+#: config.c:3060 config.c:3298
#, c-format
msgid "chmod on %s failed"
msgstr "échec de chmod sur %s"
-#: config.c:2943 config.c:3193
+#: config.c:3145 config.c:3395
#, c-format
msgid "could not write config file %s"
msgstr "impossible d'écrire le fichier de configuration %s"
-#: config.c:2977
+#: config.c:3179
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "impossible de régler '%s' à '%s'"
-#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
+#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
#, c-format
msgid "could not unset '%s'"
msgstr "impossible de désinitialiser '%s'"
-#: config.c:3069
+#: config.c:3271
#, c-format
msgid "invalid section name: %s"
msgstr "nom de section invalide : %s"
-#: config.c:3236
+#: config.c:3438
#, c-format
msgid "missing value for '%s'"
msgstr "valeur manquante pour '%s'"
@@ -2803,72 +2944,81 @@
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:497
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr "format d'objet spécifié par le serveur inconnu '%s'"
+
+#: connect.c:526
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "réponse à ls-ref invalide : %s"
-#: connect.c:445
+#: connect.c:530
msgid "expected flush after ref listing"
msgstr "vidage attendu après le listage de références"
-#: connect.c:544
+#: connect.c:533
+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:666
#, c-format
msgid "protocol '%s' is not supported"
msgstr "le protocole '%s' n'est pas supporté"
-#: connect.c:595
+#: connect.c:717
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:757 connect.c:820
#, c-format
msgid "Looking up %s ... "
msgstr "Recherche de %s… "
-#: connect.c:639
+#: connect.c:761
#, 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:765 connect.c:836
#, c-format
msgid ""
"done.\n"
@@ -2877,7 +3027,7 @@
"fait.\n"
"Connexion à %s (port %s)… "
-#: connect.c:665 connect.c:742
+#: connect.c:787 connect.c:864
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -2887,75 +3037,80 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:671 connect.c:748
+#: connect.c:793 connect.c:870
msgid "done."
msgstr "fait."
-#: connect.c:702
+#: connect.c:824
#, c-format
msgid "unable to look up %s (%s)"
msgstr "impossible de rechercher %s (%s)"
-#: connect.c:708
+#: connect.c:830
#, c-format
msgid "unknown port %s"
msgstr "port inconnu %s"
-#: connect.c:845 connect.c:1175
+#: connect.c:967 connect.c:1299
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "nom d'hôte étrange '%s' bloqué"
-#: connect.c:847
+#: connect.c:969
#, c-format
msgid "strange port '%s' blocked"
msgstr "port étrange '%s' bloqué"
-#: connect.c:857
+#: connect.c:979
#, c-format
msgid "cannot start proxy %s"
msgstr "impossible de démarrer un proxy %s"
-#: connect.c:928
+#: connect.c:1050
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
"aucun chemin spécifié ; référez-vous à 'git help pull' pour une syntaxe "
"d'URL valide"
-#: connect.c:1123
+#: connect.c:1190
+msgid "newline is forbidden in git:// hosts and repo paths"
+msgstr ""
+"le retour chariot est interdit dans les hôtes git:// et les chemins de dépôt"
+
+#: connect.c:1247
msgid "ssh variant 'simple' does not support -4"
msgstr "la variante ssh 'simple' ne supporte pas -4"
-#: connect.c:1135
+#: connect.c:1259
msgid "ssh variant 'simple' does not support -6"
msgstr "la variante ssh 'simple' ne supporte pas -6"
-#: connect.c:1152
+#: connect.c:1276
msgid "ssh variant 'simple' does not support setting port"
msgstr "la variante ssh 'simple' ne supporte pas de spécifier le port"
-#: connect.c:1264
+#: connect.c:1388
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "chemin étrange '%s' bloqué"
-#: connect.c:1311
+#: connect.c:1436
msgid "unable to fork"
msgstr "fork impossible"
-#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43
+#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45
msgid "Checking connectivity"
msgstr "Vérification de la connectivité"
-#: connected.c:110
+#: connected.c:120
msgid "Could not run 'git rev-list'"
msgstr "Impossible de lancer 'git rev-list'"
-#: connected.c:130
+#: connected.c:144
msgid "failed write to rev-list"
msgstr "impossible d'écrire dans la rev-list"
-#: connected.c:137
+#: connected.c:149
msgid "failed to close rev-list's stdin"
msgstr "impossible de fermer l'entrée standard du rev-list"
@@ -3033,40 +3188,40 @@
"encoder '%s' depuis %s vers %s puis inversement ne produit pas le même "
"contenu"
-#: convert.c:668
+#: 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:688
+#: 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:695
+#: convert.c:692
#, c-format
msgid "external filter '%s' failed %d"
msgstr "le filtre externe '%s' a échoué %d"
-#: convert.c:730 convert.c:733
+#: 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:736 convert.c:791
+#: convert.c:733 convert.c:788
#, c-format
msgid "external filter '%s' failed"
msgstr "le filtre externe '%s' a échoué"
-#: convert.c:839
+#: convert.c:837
msgid "unexpected filter type"
msgstr "type de filtre inattendu"
-#: convert.c:850
+#: convert.c:848
msgid "path name too long for external filter"
msgstr "nom de chemin trop long pour un filtre externe"
-#: convert.c:924
+#: convert.c:940
#, c-format
msgid ""
"external filter '%s' is not available anymore although not all paths have "
@@ -3075,20 +3230,51 @@
"le filtre externe '%s' n'est plus disponible bien que tous les chemins "
"n'aient pas été filtrés"
-#: convert.c:1223
+#: 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:1411 convert.c:1445
+#: convert.c:1428 convert.c:1462
#, c-format
msgid "%s: clean filter '%s' failed"
msgstr "%s : le filtre clean '%s' a échoué"
-#: convert.c:1489
+#: convert.c:1508
#, c-format
msgid "%s: smudge filter %s failed"
msgstr "%s : le filtre smudge '%s' a échoué"
+#: 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"
@@ -3183,14 +3369,30 @@
msgid "Marked %d islands, done.\n"
msgstr "Marquage de %d îlots, fait.\n"
-#: diffcore-order.c:24
+#: diff-merges.c:70
#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "impossible de lire le fichier de commande '%s'"
+msgid "unknown value for --diff-merges: %s"
+msgstr "valeur inconnue pour --diff-merges : %s"
-#: diffcore-rename.c:543
-msgid "Performing inexact rename detection"
-msgstr "Détection de renommage inexact en cours"
+#: diff-lib.c:534
+msgid "--merge-base does not work with ranges"
+msgstr "--merge-base ne fonctionne pas avec des plages"
+
+#: diff-lib.c:536
+msgid "--merge-base only works with commits"
+msgstr "--merge-base ne fonctionne qu'avec des commits"
+
+#: diff-lib.c:553
+msgid "unable to get HEAD"
+msgstr "impossible d'acquérir HEAD"
+
+#: diff-lib.c:560
+msgid "no merge base found"
+msgstr "aucune base de fusion trouvée"
+
+#: diff-lib.c:562
+msgid "multiple merge bases found"
+msgstr "bases multiples de fusion trouvées"
#: diff-no-index.c:238
msgid "git diff --no-index [<options>] <path> <path>"
@@ -3204,18 +3406,18 @@
"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'"
@@ -3223,7 +3425,7 @@
"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', "
@@ -3233,7 +3435,7 @@
"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"
@@ -3241,13 +3443,13 @@
"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"
@@ -3256,35 +3458,35 @@
"Erreurs dans la variable de configuration 'diff.dirstat' :\n"
"%s"
-#: diff.c:4202
+#: diff.c:4276
#, c-format
msgid "external diff died, stopping at %s"
msgstr "l'application de diff externe a disparu, arrêt à %s"
-#: diff.c:4547
+#: diff.c:4628
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs"
-#: diff.c:4550
+#: diff.c:4631
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G, -S et --find-object sont mutuellement exclusifs"
-#: diff.c:4628
+#: diff.c:4710
msgid "--follow requires exactly one pathspec"
msgstr "--follow a besoin d'une spécification de chemin unique"
-#: diff.c:4676
+#: diff.c:4758
#, c-format
msgid "invalid --stat value: %s"
msgstr "valeur invalide de --stat : %s"
-#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
-#: parse-options.c:197 parse-options.c:201
+#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306
+#: 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:4713
+#: diff.c:4795
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3293,42 +3495,42 @@
"Impossible d'analyser le paramètre de l'option --dirstat/-X :\n"
"%s"
-#: diff.c:4798
+#: diff.c:4880
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "classe de modification inconnue '%c' dans --diff-fileter=%s"
-#: diff.c:4822
+#: diff.c:4904
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "valeur inconnue après ws-error-highlight=%.*s"
-#: diff.c:4836
+#: diff.c:4918
#, c-format
msgid "unable to resolve '%s'"
msgstr "impossible de résoudre '%s'"
-#: diff.c:4886 diff.c:4892
+#: diff.c:4968 diff.c:4974
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "forme <n>/<m> attendue par %s"
-#: diff.c:4904
+#: diff.c:4986
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "caractère attendu par %s, '%s' trouvé"
-#: diff.c:4925
+#: diff.c:5007
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "mauvais argument --color-moved : %s"
-#: diff.c:4944
+#: diff.c:5026
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "mode invalide '%s' dans --color-moved-ws"
-#: diff.c:4984
+#: diff.c:5066
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
@@ -3336,155 +3538,160 @@
"l'option diff-algorithm accept \"myers\", \"minimal\", \"patience\" et "
"\"histogram\""
-#: diff.c:5020 diff.c:5040
+#: diff.c:5102 diff.c:5122
#, c-format
msgid "invalid argument to %s"
msgstr "argument invalide pour %s"
-#: diff.c:5178
+#: diff.c:5226
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr "regex invalide fournie à -I : '%s'"
+
+#: diff.c:5275
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "échec de l'analyse du paramètre de l'option --submodule : '%s'"
-#: diff.c:5234
+#: diff.c:5331
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "mauvais argument pour --word-diff : %s"
-#: diff.c:5257
+#: diff.c:5367
msgid "Diff output format options"
msgstr "Options de format de sortie de diff"
-#: diff.c:5259 diff.c:5265
+#: diff.c:5369 diff.c:5375
msgid "generate patch"
msgstr "générer la rustine"
-#: diff.c:5262 builtin/log.c:173
+#: diff.c:5372 builtin/log.c:179
msgid "suppress diff output"
msgstr "supprimer la sortie des différences"
-#: diff.c:5267 diff.c:5381 diff.c:5388
+#: diff.c:5377 diff.c:5491 diff.c:5498
msgid "<n>"
msgstr "<n>"
-#: diff.c:5268 diff.c:5271
+#: diff.c:5378 diff.c:5381
msgid "generate diffs with <n> lines context"
msgstr "générer les diffs avec <n> lignes de contexte"
-#: diff.c:5273
+#: diff.c:5383
msgid "generate the diff in raw format"
msgstr "générer le diff en format brut"
-#: diff.c:5276
+#: diff.c:5386
msgid "synonym for '-p --raw'"
msgstr "synonyme de '-p --raw'"
-#: diff.c:5280
+#: diff.c:5390
msgid "synonym for '-p --stat'"
msgstr "synonyme de '-p --stat'"
-#: diff.c:5284
+#: diff.c:5394
msgid "machine friendly --stat"
msgstr "--stat pour traitement automatique"
-#: diff.c:5287
+#: diff.c:5397
msgid "output only the last line of --stat"
msgstr "afficher seulement la dernière ligne de --stat"
-#: diff.c:5289 diff.c:5297
+#: diff.c:5399 diff.c:5407
msgid "<param1,param2>..."
msgstr "<param1,param2>..."
-#: diff.c:5290
+#: diff.c:5400
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
"afficher la distribution des quantités de modifications relatives pour "
"chaque sous-répertoire"
-#: diff.c:5294
+#: diff.c:5404
msgid "synonym for --dirstat=cumulative"
msgstr "synonyme pour --dirstat=cumulative"
-#: diff.c:5298
+#: diff.c:5408
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "synonyme pour --dirstat=files,param1,param2..."
-#: diff.c:5302
+#: diff.c:5412
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
"avertir si les modifications introduisent des marqueurs de conflit ou des "
"erreurs d'espace"
-#: diff.c:5305
+#: diff.c:5415
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
"résumé succinct tel que les créations, les renommages et les modifications "
"de mode"
-#: diff.c:5308
+#: diff.c:5418
msgid "show only names of changed files"
msgstr "n'afficher que les noms de fichiers modifiés"
-#: diff.c:5311
+#: diff.c:5421
msgid "show only names and status of changed files"
msgstr "n'afficher que les noms et les status des fichiers modifiés"
-#: diff.c:5313
+#: diff.c:5423
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<largeur>[,<largeur-de-nom>[,<compte>]]"
-#: diff.c:5314
+#: diff.c:5424
msgid "generate diffstat"
msgstr "générer un diffstat"
-#: diff.c:5316 diff.c:5319 diff.c:5322
+#: diff.c:5426 diff.c:5429 diff.c:5432
msgid "<width>"
msgstr "<largeur>"
-#: diff.c:5317
+#: diff.c:5427
msgid "generate diffstat with a given width"
msgstr "générer un diffstat avec la largeur indiquée"
-#: diff.c:5320
+#: diff.c:5430
msgid "generate diffstat with a given name width"
msgstr "génerer un diffstat avec la largeur de nom indiquée"
-#: diff.c:5323
+#: diff.c:5433
msgid "generate diffstat with a given graph width"
msgstr "génerer un diffstat avec la largeur de graphe indiquée"
-#: diff.c:5325
+#: diff.c:5435
msgid "<count>"
msgstr "<compte>"
-#: diff.c:5326
+#: diff.c:5436
msgid "generate diffstat with limited lines"
msgstr "générer un diffstat avec des lignes limitées"
-#: diff.c:5329
+#: diff.c:5439
msgid "generate compact summary in diffstat"
msgstr "générer une résumé compact dans le diffstat"
-#: diff.c:5332
+#: diff.c:5442
msgid "output a binary diff that can be applied"
msgstr "produire un diff binaire qui peut être appliqué"
-#: diff.c:5335
+#: diff.c:5445
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
"afficher les noms complets des objets pre- et post-image sur les lignes "
"\"index\""
-#: diff.c:5337
+#: diff.c:5447
msgid "show colored diff"
msgstr "afficher un diff coloré"
-#: diff.c:5338
+#: diff.c:5448
msgid "<kind>"
msgstr "<sorte>"
-#: diff.c:5339
+#: diff.c:5449
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
@@ -3492,7 +3699,7 @@
"surligner les erreurs d'espace dans les lignes 'contexte', 'ancien', "
"'nouveau' dans le diff"
-#: diff.c:5342
+#: diff.c:5452
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3500,93 +3707,93 @@
"ne pas compresser les chemins et utiliser des NULs comme terminateurs de "
"champs dans --raw ou --numstat"
-#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457
+#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570
msgid "<prefix>"
msgstr "<préfixe>"
-#: diff.c:5346
+#: diff.c:5456
msgid "show the given source prefix instead of \"a/\""
msgstr "afficher le préfixe de source indiqué au lieu de \"a/\""
-#: diff.c:5349
+#: diff.c:5459
msgid "show the given destination prefix instead of \"b/\""
msgstr "afficher le préfixe de destination indiqué au lieu de \"b/\""
-#: diff.c:5352
+#: diff.c:5462
msgid "prepend an additional prefix to every line of output"
msgstr "préfixer toutes les lignes en sortie avec la chaîne indiquée"
-#: diff.c:5355
+#: diff.c:5465
msgid "do not show any source or destination prefix"
msgstr "n'afficher aucun préfixe, ni de source, ni de destination"
-#: diff.c:5358
+#: diff.c:5468
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
"afficher le contexte entre les sections à concurrence du nombre de ligne "
"indiqué"
-#: diff.c:5362 diff.c:5367 diff.c:5372
+#: diff.c:5472 diff.c:5477 diff.c:5482
msgid "<char>"
msgstr "<caractère>"
-#: diff.c:5363
+#: diff.c:5473
msgid "specify the character to indicate a new line instead of '+'"
msgstr "spécifier le caractère pour indiquer une nouvelle ligne au lieu de '+'"
-#: diff.c:5368
+#: diff.c:5478
msgid "specify the character to indicate an old line instead of '-'"
msgstr "spécifier le caractère pour indiquer une ancienne ligne au lieu de '-'"
-#: diff.c:5373
+#: diff.c:5483
msgid "specify the character to indicate a context instead of ' '"
msgstr ""
"spécifier le caractère pour indiquer une ligne de contexte au lieu de ' '"
-#: diff.c:5376
+#: diff.c:5486
msgid "Diff rename options"
msgstr "Options de renommage de diff"
-#: diff.c:5377
+#: diff.c:5487
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5378
+#: diff.c:5488
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
"casser les modifications d'une réécrire complète en paires de suppression et "
"création"
-#: diff.c:5382
+#: diff.c:5492
msgid "detect renames"
msgstr "détecter les renommages"
-#: diff.c:5386
+#: diff.c:5496
msgid "omit the preimage for deletes"
msgstr "supprimer la pré-image pour les suppressions"
-#: diff.c:5389
+#: diff.c:5499
msgid "detect copies"
msgstr "détecter les copies"
-#: diff.c:5393
+#: diff.c:5503
msgid "use unmodified files as source to find copies"
msgstr ""
"utiliser les fichiers non-modifiés comme sources pour trouver des copies"
-#: diff.c:5395
+#: diff.c:5505
msgid "disable rename detection"
msgstr "désactiver la détection de renommage"
-#: diff.c:5398
+#: diff.c:5508
msgid "use empty blobs as rename source"
msgstr "utiliser des blobs vides comme source de renommage"
-#: diff.c:5400
+#: diff.c:5510
msgid "continue listing the history of a file beyond renames"
msgstr "continuer à afficher l'historique d'un fichier au delà des renommages"
-#: diff.c:5403
+#: diff.c:5513
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
@@ -3594,161 +3801,165 @@
"empêcher la détection de renommage/copie si le nombre de cibles de renommage/"
"copie excède la limite indiquée"
-#: diff.c:5405
+#: diff.c:5515
msgid "Diff algorithm options"
msgstr "Options de l'algorithme de diff"
-#: diff.c:5407
+#: diff.c:5517
msgid "produce the smallest possible diff"
msgstr "produire le diff le plus petit possible"
-#: diff.c:5410
+#: diff.c:5520
msgid "ignore whitespace when comparing lines"
msgstr "ignorer les espaces lors de la comparaison de ligne"
-#: diff.c:5413
+#: diff.c:5523
msgid "ignore changes in amount of whitespace"
msgstr "ignorer des modifications du nombre d'espaces"
-#: diff.c:5416
+#: diff.c:5526
msgid "ignore changes in whitespace at EOL"
msgstr "ignorer des modifications d'espace en fin de ligne"
-#: diff.c:5419
+#: diff.c:5529
msgid "ignore carrier-return at the end of line"
msgstr "ignore le retour chariot en fin de ligne"
-#: diff.c:5422
+#: diff.c:5532
msgid "ignore changes whose lines are all blank"
msgstr "ignorer les modifications dont les lignes sont vides"
-#: diff.c:5425
+#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604
+msgid "<regex>"
+msgstr "<regex>"
+
+#: diff.c:5535
+msgid "ignore changes whose all lines match <regex>"
+msgstr "ignorer les modifications dont les lignes correspondent à <regex>"
+
+#: diff.c:5538
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr ""
"heuristique qui déplace les limites de sections de diff pour faciliter la "
"lecture"
-#: diff.c:5428
+#: diff.c:5541
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "générer un diff en utilisant l'algorithme de différence \"patience\""
-#: diff.c:5432
+#: diff.c:5545
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr ""
"générer un diff en utilisant l'algorithme de différence \"histogramme\""
-#: diff.c:5434
+#: diff.c:5547
msgid "<algorithm>"
msgstr "<algorithme>"
-#: diff.c:5435
+#: diff.c:5548
msgid "choose a diff algorithm"
msgstr "choisir un algorithme de différence"
-#: diff.c:5437
+#: diff.c:5550
msgid "<text>"
msgstr "<texte>"
-#: diff.c:5438
+#: diff.c:5551
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "générer un diff en utilisant l'algorithme de différence \"ancré\""
-#: diff.c:5440 diff.c:5449 diff.c:5452
+#: diff.c:5553 diff.c:5562 diff.c:5565
msgid "<mode>"
msgstr "<mode>"
-#: diff.c:5441
+#: diff.c:5554
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
"afficher des différences par mot, en utilisant <mode> pour délimiter les "
"mots modifiés"
-#: diff.c:5443 diff.c:5446 diff.c:5491
-msgid "<regex>"
-msgstr "<regex>"
-
-#: diff.c:5444
+#: diff.c:5557
msgid "use <regex> to decide what a word is"
msgstr "utiliser <regex> pour décider ce qu'est un mot"
-#: diff.c:5447
+#: diff.c:5560
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "équivalent à --word-diff=color --word-diff-regex=<regex>"
-#: diff.c:5450
+#: diff.c:5563
msgid "moved lines of code are colored differently"
msgstr "les lignes déplacées sont colorées différemment"
-#: diff.c:5453
+#: diff.c:5566
msgid "how white spaces are ignored in --color-moved"
msgstr "comment les espaces sont ignorés dans --color-moved"
-#: diff.c:5456
+#: diff.c:5569
msgid "Other diff options"
msgstr "Autres options diff"
-#: diff.c:5458
+#: diff.c:5571
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
"lancé depuis un sous-répertoire, exclure les modifications en dehors et "
"afficher les chemins relatifs"
-#: diff.c:5462
+#: diff.c:5575
msgid "treat all files as text"
msgstr "traiter les fichiers comme texte"
-#: diff.c:5464
+#: diff.c:5577
msgid "swap two inputs, reverse the diff"
msgstr "échanger les entrées, inverser le diff"
-#: diff.c:5466
+#: diff.c:5579
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "sortir un code d'erreur 1 s'il y avait de différences, 0 sinon"
-#: diff.c:5468
+#: diff.c:5581
msgid "disable all output of the program"
msgstr "désactiver tous les affichages du programme"
-#: diff.c:5470
+#: diff.c:5583
msgid "allow an external diff helper to be executed"
msgstr "autoriser l'exécution d'un assistant externe de diff"
-#: diff.c:5472
+#: diff.c:5585
msgid "run external text conversion filters when comparing binary files"
msgstr ""
"lancer les filtres externes de conversion en texte lors de la comparaison de "
"fichiers binaires"
-#: diff.c:5474
+#: diff.c:5587
msgid "<when>"
msgstr "<quand>"
-#: diff.c:5475
+#: diff.c:5588
msgid "ignore changes to submodules in the diff generation"
msgstr ""
"ignorer les modifications dans les sous-modules lors de la génération de diff"
-#: diff.c:5478
+#: diff.c:5591
msgid "<format>"
msgstr "<format>"
-#: diff.c:5479
+#: diff.c:5592
msgid "specify how differences in submodules are shown"
msgstr "spécifier comment les différences dans les sous-modules sont affichées"
-#: diff.c:5483
+#: diff.c:5596
msgid "hide 'git add -N' entries from the index"
msgstr "masquer les entrées 'git add -N' de l'index"
-#: diff.c:5486
+#: diff.c:5599
msgid "treat 'git add -N' entries as real in the index"
msgstr "traiter les entrées 'git add -N' comme réelles dans l'index"
-#: diff.c:5488
+#: diff.c:5601
msgid "<string>"
msgstr "<chaîne>"
-#: diff.c:5489
+#: diff.c:5602
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
@@ -3756,7 +3967,7 @@
"rechercher les différences qui modifient le nombre d'occurrences de la "
"chaîne spécifiée"
-#: diff.c:5492
+#: diff.c:5605
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
@@ -3764,26 +3975,38 @@
"rechercher les différences qui modifient le nombre d'occurrences de la regex "
"spécifiée"
-#: diff.c:5495
+#: diff.c:5608
msgid "show all changes in the changeset with -S or -G"
msgstr ""
"afficher toutes les modifications dans l'ensemble de modifications avec -S "
"ou -G"
-#: diff.c:5498
+#: diff.c:5611
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr ""
"traiter <chaîne> dans -S comme une expression rationnelle POSIX étendue"
-#: diff.c:5501
+#: diff.c:5614
msgid "control the order in which files appear in the output"
msgstr "contrôler l'ordre dans lequel les fichiers apparaissent dans la sortie"
-#: diff.c:5502
+#: diff.c:5615 diff.c:5618
+msgid "<path>"
+msgstr "<chemin>"
+
+#: diff.c:5616
+msgid "show the change in the specified path first"
+msgstr "afficher la modification dans les fichier spécifié en premier"
+
+#: diff.c:5619
+msgid "skip the output to the specified path"
+msgstr "sauter la sortie pour le chemin spécifié"
+
+#: diff.c:5621
msgid "<object-id>"
msgstr "<id-objet>"
-#: diff.c:5503
+#: diff.c:5622
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
@@ -3791,35 +4014,35 @@
"rechercher les différences qui modifient le nombre d'occurrences de l'objet "
"indiqué"
-#: diff.c:5505
+#: diff.c:5624
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5506
+#: diff.c:5625
msgid "select files by diff type"
msgstr "sélectionner les fichiers par types de diff"
-#: diff.c:5508
+#: diff.c:5627
msgid "<file>"
msgstr "<fichier>"
-#: diff.c:5509
+#: diff.c:5628
msgid "Output to a specific file"
msgstr "Sortie vers un fichier spécifié"
-#: diff.c:6164
+#: diff.c:6285
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
"détection de renommage inexact annulée à cause d'un trop grand nombre de "
"fichiers."
-#: diff.c:6167
+#: diff.c:6288
msgid "only found copies from modified paths due to too many files."
msgstr ""
"recherche uniquement des copies par modification de chemin à cause d'un trop "
"grand nombre de fichiers."
-#: diff.c:6170
+#: diff.c:6291
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -3827,88 +4050,102 @@
"vous souhaitez peut-être régler la variable %s à au moins %d et réessayer le "
"commande."
-#: dir.c:555
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "impossible de lire le fichier de commande '%s'"
+
+#: diffcore-rename.c:786
+msgid "Performing inexact rename detection"
+msgstr "Détection de renommage inexact en cours"
+
+#: diffcore-rotate.c:29
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr "pas de chemin '%s' dans la diff"
+
+#: 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:695 dir.c:724 dir.c:737
+#: dir.c:718 dir.c:747 dir.c:760
#, c-format
msgid "unrecognized pattern: '%s'"
msgstr "motif non reconnu : '%s'"
-#: dir.c:754 dir.c:768
+#: dir.c:777 dir.c:791
#, c-format
msgid "unrecognized negative pattern: '%s'"
msgstr "motif négatif non reconnu : '%s'"
-#: dir.c:786
+#: 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:796
+#: dir.c:819
msgid "disabling cone pattern matching"
msgstr "désactivation de la correspondance de motif de cone"
-#: dir.c:1173
+#: dir.c:1198
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "impossible d'utiliser %s comme fichier d'exclusion"
-#: dir.c:2144
+#: dir.c:2305
#, c-format
msgid "could not open directory '%s'"
msgstr "impossible d'ouvrir le répertoire '%s'"
-#: dir.c:2479
+#: dir.c:2605
msgid "failed to get kernel name and information"
msgstr "echec de l'obtention d'information de kernel"
-#: dir.c:2603
+#: 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:3407
+#: dir.c:3534
#, c-format
msgid "index file corrupt in repo %s"
msgstr "fichier d'index corrompu dans le dépôt %s"
-#: dir.c:3452 dir.c:3457
+#: dir.c:3579 dir.c:3584
#, c-format
msgid "could not create directories for %s"
msgstr "impossible de créer les répertoires pour %s"
-#: dir.c:3486
+#: dir.c:3613
#, 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'"
-#: environment.c:149
+#: environment.c:152
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "Espaces de nom de Git \"%s\""
-#: environment.c:331
+#: environment.c:335
#, c-format
msgid "could not set GIT_DIR to '%s'"
msgstr "impossible de régler GIT_DIR à '%s'"
@@ -3918,251 +4155,273 @@
msgid "too many args to run %s"
msgstr "trop d'arguments pour lancer %s"
-#: fetch-pack.c:150
+#: fetch-pack.c:177
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack : liste superficielle attendue"
-#: fetch-pack.c:153
+#: fetch-pack.c:180
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr ""
"git fetch-pack : paquet de vidage attendu après une liste superficielle"
-#: fetch-pack.c:164
+#: fetch-pack.c:191
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack : ACK/NACK attendu, paquet de nettoyage reçu"
-#: fetch-pack.c:184
+#: fetch-pack.c:211
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu"
-#: fetch-pack.c:195
+#: fetch-pack.c:222
msgid "unable to write to remote"
msgstr "impossible d'écrire sur un distant"
-#: fetch-pack.c:257
+#: fetch-pack.c:283
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc nécessite multi_ack_detailed"
-#: fetch-pack.c:356 fetch-pack.c:1340
+#: fetch-pack.c:378 fetch-pack.c:1457
#, c-format
msgid "invalid shallow line: %s"
msgstr "ligne de superficiel invalide : %s"
-#: fetch-pack.c:362 fetch-pack.c:1346
+#: fetch-pack.c:384 fetch-pack.c:1463
#, c-format
msgid "invalid unshallow line: %s"
msgstr "ligne de fin de superficiel invalide : %s"
-#: fetch-pack.c:364 fetch-pack.c:1348
+#: fetch-pack.c:386 fetch-pack.c:1465
#, c-format
msgid "object not found: %s"
msgstr "objet non trouvé : %s"
-#: fetch-pack.c:367 fetch-pack.c:1351
+#: fetch-pack.c:389 fetch-pack.c:1468
#, c-format
msgid "error in object: %s"
msgstr "Erreur dans l'objet : %s"
-#: fetch-pack.c:369 fetch-pack.c:1353
+#: fetch-pack.c:391 fetch-pack.c:1470
#, c-format
msgid "no shallow found: %s"
msgstr "Pas de superficiel trouvé : %s"
-#: fetch-pack.c:372 fetch-pack.c:1357
+#: fetch-pack.c:394 fetch-pack.c:1474
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "superficiel/non superficiel attendu, %s trouvé"
-#: fetch-pack.c:414
+#: fetch-pack.c:434
#, c-format
msgid "got %s %d %s"
msgstr "réponse %s %d %s"
-#: fetch-pack.c:431
+#: fetch-pack.c:451
#, c-format
msgid "invalid commit %s"
msgstr "commit invalide %s"
-#: fetch-pack.c:462
+#: fetch-pack.c:482
msgid "giving up"
msgstr "abandon"
-#: fetch-pack.c:475 progress.c:323
+#: fetch-pack.c:495 progress.c:339
msgid "done"
msgstr "fait"
-#: fetch-pack.c:487
+#: fetch-pack.c:507
#, c-format
msgid "got %s (%d) %s"
msgstr "%s trouvé (%d) %s"
-#: fetch-pack.c:533
+#: fetch-pack.c:543
#, c-format
msgid "Marking %s as complete"
msgstr "Marquage de %s comme terminé"
-#: fetch-pack.c:754
+#: fetch-pack.c:758
#, c-format
msgid "already have %s (%s)"
msgstr "%s déjà possédé (%s)"
-#: fetch-pack.c:818
+#: fetch-pack.c:844
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral"
-#: fetch-pack.c:826
+#: fetch-pack.c:852
msgid "protocol error: bad pack header"
msgstr "erreur de protocole : mauvais entête de paquet"
-#: fetch-pack.c:900
+#: fetch-pack.c:946
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack : impossible de dupliquer %s"
-#: fetch-pack.c:916
+#: fetch-pack.c:952
+msgid "fetch-pack: invalid index-pack output"
+msgstr "fetch-pack : sortie d'index de pack invalide"
+
+#: fetch-pack.c:969
#, c-format
msgid "%s failed"
msgstr "échec de %s"
-#: fetch-pack.c:918
+#: fetch-pack.c:971
msgid "error in sideband demultiplexer"
msgstr "erreur dans le démultiplexer latéral"
-#: fetch-pack.c:965
+#: fetch-pack.c:1031
#, c-format
msgid "Server version is %.*s"
msgstr "La version du serveur est %.*s"
-#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985
-#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001
-#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017
-#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039
+#: fetch-pack.c:1039 fetch-pack.c:1045 fetch-pack.c:1048 fetch-pack.c:1054
+#: fetch-pack.c:1058 fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070
+#: fetch-pack.c:1074 fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086
+#: fetch-pack.c:1092 fetch-pack.c:1098 fetch-pack.c:1103 fetch-pack.c:1108
#, c-format
msgid "Server supports %s"
msgstr "Le serveur supporte %s"
-#: fetch-pack.c:972
+#: fetch-pack.c:1041
msgid "Server does not support shallow clients"
msgstr "Le serveur ne supporte les clients superficiels"
-#: fetch-pack.c:1032
+#: fetch-pack.c:1101
msgid "Server does not support --shallow-since"
msgstr "Le receveur ne gère pas --shallow-since"
-#: fetch-pack.c:1037
+#: fetch-pack.c:1106
msgid "Server does not support --shallow-exclude"
msgstr "Le receveur ne gère pas --shallow-exclude"
-#: fetch-pack.c:1041
+#: fetch-pack.c:1110
msgid "Server does not support --deepen"
msgstr "Le receveur ne gère pas --deepen"
-#: fetch-pack.c:1058
+#: fetch-pack.c:1112
+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:1125
msgid "no common commits"
msgstr "pas de commit commun"
-#: fetch-pack.c:1070 fetch-pack.c:1536
+#: fetch-pack.c:1138 fetch-pack.c:1682
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack : échec de le récupération."
-#: fetch-pack.c:1209
-msgid "Server does not support shallow requests"
-msgstr "Le serveur ne supporte les requêtes superficielles"
+#: fetch-pack.c:1265
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "non-correspondance des algorithmes : client %s ; serveur %s"
-#: fetch-pack.c:1216
+#: fetch-pack.c:1269
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "Le serveur ne supporte pas l'algorithme '%s'"
+
+#: fetch-pack.c:1289
+msgid "Server does not support shallow requests"
+msgstr "Le serveur ne supporte pas les requêtes superficielles"
+
+#: fetch-pack.c:1296
msgid "Server supports filter"
msgstr "Le serveur supporte filter"
-#: fetch-pack.c:1239
+#: fetch-pack.c:1335
msgid "unable to write request to remote"
msgstr "impossible d'écrire la requête sur le distant"
-#: fetch-pack.c:1257
+#: fetch-pack.c:1353
#, c-format
msgid "error reading section header '%s'"
msgstr "erreur à la lecture de l'entête de section '%s'"
-#: fetch-pack.c:1263
+#: fetch-pack.c:1359
#, c-format
msgid "expected '%s', received '%s'"
msgstr "'%s' attendu, '%s' reçu"
-#: fetch-pack.c:1303
+#: fetch-pack.c:1420
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "ligne d'acquittement inattendue : '%s'"
-#: fetch-pack.c:1308
+#: fetch-pack.c:1425
#, c-format
msgid "error processing acks: %d"
msgstr "erreur lors du traitement des acquittements : %d"
-#: fetch-pack.c:1318
+#: fetch-pack.c:1435
msgid "expected packfile to be sent after 'ready'"
msgstr "fichier paquet attendu à envoyer après 'ready'"
-#: fetch-pack.c:1320
+#: fetch-pack.c:1437
msgid "expected no other sections to be sent after no 'ready'"
msgstr "aucune autre section attendue à envoyer après absence de 'ready'"
-#: fetch-pack.c:1362
+#: fetch-pack.c:1479
#, c-format
msgid "error processing shallow info: %d"
msgstr "erreur lors du traitement de l'information de superficialité : %d"
-#: fetch-pack.c:1409
+#: fetch-pack.c:1526
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "wanted-ref attendu, '%s' trouvé"
-#: fetch-pack.c:1414
+#: fetch-pack.c:1531
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "wanted-ref inattendu : '%s'"
-#: fetch-pack.c:1419
+#: fetch-pack.c:1536
#, c-format
msgid "error processing wanted refs: %d"
msgstr "erreur lors du traitement des références voulues : %d"
-#: fetch-pack.c:1762
+#: fetch-pack.c:1566
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack : paquet de fin de réponse attendu"
+
+#: fetch-pack.c:1960
msgid "no matching remote head"
msgstr "pas de HEAD distante correspondante"
-#: fetch-pack.c:1785 builtin/clone.c:689
+#: fetch-pack.c:1983 builtin/clone.c:693
msgid "remote did not send all necessary objects"
msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"
-#: fetch-pack.c:1812
+#: fetch-pack.c:2010
#, c-format
msgid "no such remote ref %s"
msgstr "référence distante inconnue %s"
-#: fetch-pack.c:1815
+#: fetch-pack.c:2013
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Le serveur n'autorise pas de requête pour l'objet %s non annoncé"
-#: gpg-interface.c:408
-msgid "gpg failed to sign the data"
-msgstr "gpg n'a pas pu signer les données"
-
-#: gpg-interface.c:434
+#: gpg-interface.c:273
msgid "could not create temporary file"
msgstr "impossible de créer un fichier temporaire"
-#: gpg-interface.c:437
+#: gpg-interface.c:276
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "impossible d'écrire la signature détachée dans '%s'"
+#: gpg-interface.c:470
+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:668
+#: grep.c:543
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
@@ -4170,18 +4429,18 @@
"le motif fourni contient des octets NUL (via -f <fichier>). Ce n'est "
"supporté qu'avec -P avec PCRE v2"
-#: grep.c:2128
+#: grep.c:1906
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s' : lecture de %s impossible"
-#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82
+#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr "échec du stat de '%s'"
-#: grep.c:2156
+#: grep.c:1934
#, c-format
msgid "'%s': short read"
msgstr "'%s' : lecture tronquée"
@@ -4239,43 +4498,43 @@
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:100
#, 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:527
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4284,33 +4543,33 @@
"'%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:543 help.c:631
+#, 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:591
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:613
#, 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:618
#, 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:623
#, 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
-#, 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:635
msgid ""
"\n"
"The most similar command is"
@@ -4324,16 +4583,16 @@
"\n"
"Les commandes les plus ressemblantes sont"
-#: help.c:714
+#: help.c:675
msgid "git version [<options>]"
msgstr "git version [<options>]"
-#: help.c:783
+#: help.c:730
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:787
+#: help.c:734
msgid ""
"\n"
"Did you mean this?"
@@ -4347,7 +4606,15 @@
"\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"
@@ -4373,39 +4640,82 @@
"É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:635
+#: ident.c:454 builtin/commit.c:634
#, c-format
msgid "invalid date format: %s"
msgstr "format de date invalide : %s"
+#: 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 "invalid filter-spec '%s'"
+msgstr "spécificateur de filtre invalide '%s'"
+
+#: list-objects-filter-options.c:125
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr ""
+"le caractère doit être échappé dans le spécificateur de sous-filtre : '%c'"
+
+#: list-objects-filter-options.c:167
+msgid "expected something after combine:"
+msgstr "quelque chose attendu après combine :"
+
+#: 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: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.c:492
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "impossible d'accéder au blob clairsemé dans '%s'"
+
+#: list-objects-filter.c:495
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "impossible d'analyser la donnée de filtre clairsemé dans %s"
+
#: list-objects.c:127
#, c-format
msgid "entry '%s' in tree %s has tree mode, but is not a tree"
@@ -4423,44 +4733,7 @@
msgid "unable to load root tree for commit %s"
msgstr "impossible de charger l'arbre racine pour le commit %s"
-#: list-objects-filter.c:492
-#, c-format
-msgid "unable to access sparse blob in '%s'"
-msgstr "impossible d'accéder au blob clairsemé dans '%s'"
-
-#: list-objects-filter.c:495
-#, c-format
-msgid "unable to parse sparse filter data in %s"
-msgstr "impossible d'analyser la donnée de filtre clairsemé dans %s"
-
-#: list-objects-filter-options.c:58
-msgid "expected 'tree:<depth>'"
-msgstr "attendu : 'tree:<profondeur>'"
-
-#: list-objects-filter-options.c:73
-msgid "sparse:path filters support has been dropped"
-msgstr "sparse : le support des filtres de chemin a été abandonné"
-
-#: list-objects-filter-options.c:86
-#, c-format
-msgid "invalid filter-spec '%s'"
-msgstr "spécificateur de filtre invalide '%s'"
-
-#: list-objects-filter-options.c:102
-#, c-format
-msgid "must escape char in sub-filter-spec: '%c'"
-msgstr ""
-"le caractère doit être échappé dans le spécificateur de sous-filtre : '%c'"
-
-#: list-objects-filter-options.c:144
-msgid "expected something after combine:"
-msgstr "quelque chose attendu après combine :"
-
-#: list-objects-filter-options.c:226
-msgid "multiple filter-specs cannot be combined"
-msgstr "impossible de combiner des spécificateurs multiples de filtre"
-
-#: lockfile.c:151
+#: lockfile.c:152
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
@@ -4479,20 +4752,272 @@
"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"
+#: ls-refs.c:37
+#, c-format
+msgid "invalid value '%s' for lsrefs.unborn"
+msgstr "valeur invalide '%s' pour lsrefs.unborn"
-#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913
-#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810
-#: builtin/stash.c:265
-msgid "unable to write new index file"
-msgstr "impossible d'écrire le nouveau fichier d'index"
+#: ls-refs.c:167
+msgid "expected flush after ls-refs arguments"
+msgstr "vidage attendu après les arguments ls-refs"
+
+#: merge-ort.c:888 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-ort.c:897 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-ort.c:906 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-ort.c:916 merge-ort.c:923
+#, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr "Note : Avance rapide du sous-module %s à %s"
+
+#: merge-ort.c:944
+#, c-format
+msgid "Failed to merge submodule %s"
+msgstr "Échec de la fusion du sous-module %s"
+
+#: merge-ort.c:951
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but a possible merge resolution exists:\n"
+"%s\n"
+msgstr ""
+"Échec de fusion du sous-module %s mais une résolution possible de fusion "
+"existe :\n"
+"%s\n"
+
+#: merge-ort.c:955 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 ""
+"Si c'est correct, ajoutez le simplement à l'index\n"
+"en utilisant par exemple :\n"
+"\n"
+" git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"qui acceptera cette suggestion.\n"
+
+#: merge-ort.c:968
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but multiple possible merges exist:\n"
+"%s"
+msgstr ""
+"Échec de fusion du sous-module %s mais de multiples solutions de fusion "
+"existent :\n"
+"%s"
+
+#: merge-ort.c:1127 merge-recursive.c:1341
+msgid "Failed to execute internal merge"
+msgstr "Échec à l'exécution de la fusion interne"
+
+#: merge-ort.c:1132 merge-recursive.c:1346
+#, c-format
+msgid "Unable to add %s to database"
+msgstr "Impossible d'ajouter %s à la base de données"
+
+#: merge-ort.c:1139 merge-recursive.c:1378
+#, c-format
+msgid "Auto-merging %s"
+msgstr "Fusion automatique de %s"
+
+#: merge-ort.c:1278 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 ""
+"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-ort.c:1288 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 ""
+"CONFLIT (renommage implicite de répertoire) : impossible de transformer "
+"plusieurs chemins sur %s ; les chemins concernés sont : %s"
+
+#: merge-ort.c:1471
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
+"renamed to multiple other directories, with no destination getting a "
+"majority of the files."
+msgstr ""
+"CONFLIT (renommage de répertoire coupé) : le renommage de %s n'est pas clair "
+"parce que le répertoire a été renommé en plusieurs autres répertoires, sans "
+"aucune destination récupérant la majorité des fichiers."
+
+#: merge-ort.c:1637 merge-recursive.c:2447
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr ""
+"AVERTISSEMENT : ne renomme pas %s->%s dans %s, parce que %s lui-même a été "
+"renommé."
+
+#: merge-ort.c:1781 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 ""
+"Chemin mis à jour : %s ajouté dans %s dans un répertoire qui a été renommé "
+"en %s ; déplacé dans %s."
+
+#: merge-ort.c:1788 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 ""
+"Chemin mis à jour : %s renommé en %s dans %s, dans un répertoire qui a été "
+"renommé en %s ; déplacé dans %s."
+
+#: merge-ort.c:1801 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 ""
+"CONFLIT (localisation de fichier) : %s ajouté dans %s dans un répertoire qui "
+"a été renommé dans %s, ce qui suggère qu'il devrait peut-être être déplacé "
+"vers %s."
+
+#: merge-ort.c:1809 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 ""
+"CONFLIT (localisation de fichier) : %s renommé en %s dans %s, dans un "
+"répertoire qui a été renommé dans %s, ce qui suggère qu'il devrait peut-être "
+"être déplacé vers %s."
+
+#: merge-ort.c:1952
+#, c-format
+msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
+msgstr ""
+"CONFLIT (renommage/renommage) : %s renommé en %s dans %s et en %s dans %s."
+
+#: merge-ort.c:2047
+#, c-format
+msgid ""
+"CONFLICT (rename involved in collision): rename of %s -> %s has content "
+"conflicts AND collides with another path; this may result in nested conflict "
+"markers."
+msgstr ""
+"CONFLIT (renommage au sein d'une collision) : lre renommage de %s -> %s a "
+"des conflits de contenu ET entre en collision avec un autre chemin ; ceci "
+"peut resulter en des marqueurs de conflit imbriqués."
+
+#: merge-ort.c:2066 merge-ort.c:2090
+#, c-format
+msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
+msgstr ""
+"CONFLIT (renommage/suppression) : Renommage de %s en %s dans %s mais "
+"supprimé dans %s."
+
+#: merge-ort.c:2735
+#, c-format
+msgid ""
+"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
+"%s instead."
+msgstr ""
+"CONFLIT (fichier/répertoire) : répertoire au milieu de %s depuis %s ; "
+"déplacement dans %s à la place."
+
+#: merge-ort.c:2808
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed %s "
+"of them so each can be recorded somewhere."
+msgstr ""
+"CONFLIT (types différents) : %s a des types différents des deux côtés ; "
+"renommé la version %s de manière à pouvoir enregistrer les deux quelque part."
+
+#: merge-ort.c:2812
+msgid "both"
+msgstr "les deux"
+
+#: merge-ort.c:2812
+msgid "one"
+msgstr "un"
+
+#: merge-ort.c:2907 merge-recursive.c:3052
+msgid "content"
+msgstr "contenu"
+
+#: merge-ort.c:2909 merge-recursive.c:3056
+msgid "add/add"
+msgstr "ajout/ajout"
+
+#: merge-ort.c:2911 merge-recursive.c:3101
+msgid "submodule"
+msgstr "sous-module"
+
+#: merge-ort.c:2913 merge-recursive.c:3102
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "CONFLIT (%s) : Conflit de fusion dans %s"
+
+#: merge-ort.c:2938
+#, c-format
+msgid ""
+"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
+"of %s left in tree."
+msgstr ""
+"CONFLIT (modification/suppression) : %s supprimé dans %s et modifié dans %s. "
+"Version %s de %s laissée dans l'arbre."
+
+#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
+#. base, and 2-3) the trees for the two trees we're merging.
+#.
+#: merge-ort.c:3406
+#, c-format
+msgid "collecting merge info failed for trees %s, %s, %s"
+msgstr "échec de collecte l'information de fusion pour les arbres %s, %s, %s"
+
+#: merge-ort-wrappers.c:13 merge-recursive.c:3661
+#, 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-ort-wrappers.c:33 merge-recursive.c:3436
+#, c-format
+msgid "Already up to date!"
+msgstr "Déjà à jour !"
#: merge-recursive.c:356
msgid "(bad commit)\n"
@@ -4552,23 +5077,6 @@
msgid "do not know what to do with %06o %s '%s'"
msgstr "ne sait pas traiter %06o %s '%s'"
-#: 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: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: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:1213 merge-recursive.c:1225
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
@@ -4594,42 +5102,11 @@
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "Résolution possible de fusion trouvée pour le sous-module :\n"
-#: merge-recursive.c:1259
-#, 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 ""
-"Si c'est correct, ajoutez le simplement à l'index\n"
-"en utilisant par exemple :\n"
-"\n"
-" git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"qui acceptera cette suggestion.\n"
-
#: 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:1341
-msgid "Failed to execute internal merge"
-msgstr "Échec à l'exécution de la fusion interne"
-
-#: 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:1378
-#, c-format
-msgid "Auto-merging %s"
-msgstr "Fusion automatique de %s"
-
#: merge-recursive.c:1402
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
@@ -4681,7 +5158,7 @@
msgid "renamed"
msgstr "renommé"
-#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117
+#: 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"
@@ -4720,14 +5197,14 @@
msgid " (left unresolved)"
msgstr " (laissé non résolu)"
-#: merge-recursive.c:1793
+#: 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:2056
+#: merge-recursive.c:2068
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -4738,25 +5215,7 @@
"parce que le répertoire %s a été renommé en plusieurs autres répertoires, "
"sans aucune destination récupérant la majorité des fichiers."
-#: merge-recursive.c:2088
-#, 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 ""
-"CONFLIT (renommage implicite de répertoire) : le répertoire/fichier %s gêne "
-"des renommages implicites de répertoire déplaçant les chemins suivants : %s."
-
-#: merge-recursive.c:2098
-#, 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 ""
-"CONFLIT (renommage implicite de répertoire) : impossible de transformer "
-"plusieurs chemins sur %s ; les chemins concernés sont : %s"
-
-#: merge-recursive.c:2190
+#: merge-recursive.c:2202
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -4765,276 +5224,205 @@
"CONFLIT (renommage/renommage) : renommage du répertoire %s->%s dans %s. "
"Renommage de répertoire %s->%s dans %s"
-#: merge-recursive.c:2435
-#, c-format
-msgid ""
-"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
-"renamed."
-msgstr ""
-"AVERTISSEMENT : ne renomme pas %s->%s dans %s, parce que %s lui-même a été "
-"renommé."
-
-#: merge-recursive.c:2961
+#: merge-recursive.c:2973
#, c-format
msgid "cannot read object %s"
msgstr "impossible de lire l'objet %s"
-#: merge-recursive.c:2964
+#: 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:3028
+#: merge-recursive.c:3040
msgid "modify"
msgstr "modification"
-#: merge-recursive.c:3028
+#: merge-recursive.c:3040
msgid "modified"
msgstr "modifié"
-#: merge-recursive.c:3040
-msgid "content"
-msgstr "contenu"
-
-#: merge-recursive.c:3044
-msgid "add/add"
-msgstr "ajout/ajout"
-
-#: merge-recursive.c:3067
+#: merge-recursive.c:3079
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "%s sauté (fusion identique à l'existant)"
-#: merge-recursive.c:3089 git-submodule.sh:1003
-msgid "submodule"
-msgstr "sous-module"
-
-#: merge-recursive.c:3090
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "CONFLIT (%s) : Conflit de fusion dans %s"
-
-#: merge-recursive.c:3120
+#: merge-recursive.c:3132
#, c-format
msgid "Adding as %s instead"
msgstr "Ajout plutôt comme %s"
-#: merge-recursive.c:3203
-#, c-format
-msgid ""
-"Path updated: %s added in %s inside a directory that was renamed in %s; "
-"moving it to %s."
-msgstr ""
-"Chemin mis à jour : %s ajouté dans %s dans un répertoire qui a été renommé "
-"en %s ; déplacé dans %s."
-
-#: merge-recursive.c:3206
-#, 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 ""
-"CONFLIT (localisation de fichier) : %s ajouté dans %s dans un 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:3210
-#, c-format
-msgid ""
-"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
-"%s; moving it to %s."
-msgstr ""
-"Chemin mis à jour : %s renommé en %s dans %s, dans un répertoire qui a été "
-"renommé en %s ; déplacé dans %s."
-
-#: merge-recursive.c:3213
-#, 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 ""
-"CONFLIT (localisation de fichier) : %s renommé en %s dans %s, dans un "
-"répertoire qui a été renommé dans %s, ce qui suggère qu'il devrait peut-être "
-"être déplacé vers %s."
-
-#: merge-recursive.c:3327
+#: merge-recursive.c:3339
#, c-format
msgid "Removing %s"
msgstr "Suppression de %s"
-#: merge-recursive.c:3350
+#: merge-recursive.c:3362
msgid "file/directory"
msgstr "fichier/répertoire"
-#: merge-recursive.c:3355
+#: merge-recursive.c:3367
msgid "directory/file"
msgstr "répertoire/fichier"
-#: merge-recursive.c:3362
+#: 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:3371
+#: merge-recursive.c:3383
#, c-format
msgid "Adding %s"
msgstr "Ajout de %s"
-#: merge-recursive.c:3380
+#: 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:3424
-msgid "Already up to date!"
-msgstr "Déjà à jour !"
-
-#: merge-recursive.c:3433
+#: 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:3537
+#: merge-recursive.c:3539
msgid "Merging:"
msgstr "Fusion :"
-#: merge-recursive.c:3550
+#: merge-recursive.c:3552
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "%u ancêtre commun trouvé :"
msgstr[1] "%u ancêtres communs trouvés :"
-#: merge-recursive.c:3600
+#: merge-recursive.c:3602
msgid "merge returned no commit"
msgstr "la fusion n'a pas retourné de commit"
-#: merge-recursive.c:3659
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-" %s"
-msgstr ""
-"Vos modifications locales aux fichiers suivants seraient écrasées par la "
-"fusion :\n"
-" %s"
-
-#: merge-recursive.c:3756
+#: merge-recursive.c:3758
#, c-format
msgid "Could not parse object '%s'"
msgstr "Impossible d'analyser l'objet '%s'"
-#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877
+#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896
+#: builtin/stash.c:471
msgid "Unable to write index."
msgstr "Impossible d'écrire l'index."
-#: midx.c:68
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "impossible de lire le cache"
+
+#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917
+#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817
+#: builtin/stash.c:265
+msgid "unable to write new index file"
+msgstr "impossible d'écrire le nouveau fichier d'index"
+
+#: midx.c:62
+msgid "multi-pack-index OID fanout is of the wrong size"
+msgstr "l'étalement de l'OID d'index multi-paquet n'a pas la bonne taille"
+
+#: midx.c:93
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "le fichier d'index multi-paquet %s est trop petit"
-#: midx.c:84
+#: midx.c:109
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
"la signature de l'index multi-paquet 0x%08x ne correspond pas à la signature "
"0x%08x"
-#: midx.c:89
+#: midx.c:114
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "la version d'index multi-paquet %d n'est pas reconnue"
-#: midx.c:94
+#: midx.c:119
#, c-format
-msgid "hash version %u does not match"
-msgstr "la version %u du condensé ne correspond pas"
-
-#: midx.c:108
-msgid "invalid chunk offset (too large)"
-msgstr "décalage de section invalide (trop grand)"
-
-#: midx.c:132
-msgid "terminating multi-pack-index chunk id appears earlier than expected"
+msgid "multi-pack-index hash version %u does not match version %u"
msgstr ""
-"identifiant de terminaison de tronçon d'index multi-paquet terminant "
-"apparaît plus tôt qu'attendu"
+"la version d'empreinte d'index multi-paquet %u ne correspond pas à la "
+"version %u"
-#: midx.c:145
+#: midx.c:136
msgid "multi-pack-index missing required pack-name chunk"
msgstr "index multi-paquet manque de tronçon de nom de paquet"
-#: midx.c:147
+#: midx.c:138
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "index multi-paquet manque de tronçon de d'étalement OID requis"
-#: midx.c:149
+#: midx.c:140
msgid "multi-pack-index missing required OID lookup chunk"
-msgstr "index multi-paquet manque de tronçon de recherche OID"
+msgstr "index multi-paquet manque de tronçon de recherche OID requis"
-#: midx.c:151
+#: midx.c:142
msgid "multi-pack-index missing required object offsets chunk"
-msgstr "index multi-paquet manque de tronçon de décalage d'objet"
+msgstr "index multi-paquet manque de tronçon de décalage d'objet requis"
-#: midx.c:165
+#: midx.c:158
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
"index multi-paquet les noms de paquets sont en désordre : '%s' avant '%s'"
-#: midx.c:210
+#: midx.c:202
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "mauvais pack-int-id : %u (%u paquets au total)"
-#: midx.c:260
+#: midx.c:252
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:288
-msgid "error preparing packfile from multi-pack-index"
-msgstr "erreur à la préparation du fichier paquet depuis un index multi-paquet"
-
-#: midx.c:472
+#: midx.c:467
#, c-format
msgid "failed to add packfile '%s'"
msgstr "échec de l'ajout du fichier paquet '%s'"
-#: midx.c:478
+#: midx.c:473
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "échec à l'ouverture du fichier paquet '%s'"
-#: midx.c:538
+#: midx.c:533
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "échec de localisation de l'objet %d dans le fichier paquet"
-#: midx.c:842
+#: midx.c:821
msgid "Adding packfiles to multi-pack-index"
msgstr "Ajout de fichiers paquet à un index multi-paquet"
-#: midx.c:875
+#: midx.c:855
#, c-format
msgid "did not see pack-file %s to drop"
msgstr "fichier paquet à éliminer %s non trouvé"
-#: midx.c:973
-msgid "Writing chunks to multi-pack-index"
-msgstr "Écriture des sections dans l'index multi-paquet"
+#: midx.c:904
+msgid "no pack files to index."
+msgstr "Aucun fichier paquet à l'index."
-#: midx.c:1052
+#: midx.c:965
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "échec du nettoyage de l'index de multi-paquet à %s"
-#: midx.c:1108
+#: midx.c:1021
+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:1029
msgid "Looking for referenced packfiles"
msgstr "Recherche de fichiers paquets référencés"
-#: midx.c:1123
+#: midx.c:1044
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
@@ -5042,65 +5430,69 @@
"étalement oid en désordre : étalement[%d] = %<PRIx32> > %<PRIx32> = "
"étalement[%d]"
-#: midx.c:1128
+#: midx.c:1049
+msgid "the midx contains no oid"
+msgstr "le midx ne contient aucun oid"
+
+#: midx.c:1058
msgid "Verifying OID order in multi-pack-index"
msgstr "Vérification de l'ordre des OID dans l'index multi-paquet"
-#: midx.c:1137
+#: midx.c:1067
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "recherche d'oid en désordre : oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1157
+#: midx.c:1087
msgid "Sorting objects by packfile"
msgstr "Classement des objets par fichier paquet"
-#: midx.c:1164
+#: midx.c:1094
msgid "Verifying object offsets"
msgstr "Vérification des décalages des objets"
-#: midx.c:1180
+#: midx.c:1110
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "échec de la lecture de l'élément de cache pour oid[%d] = %s"
-#: midx.c:1186
+#: midx.c:1116
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "impossible de lire le fichier paquet %s"
-#: midx.c:1195
+#: midx.c:1125
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "décalage d'objet incorrect pour oid[%d] = %s : %<PRIx64> != %<PRIx64>"
-#: midx.c:1220
+#: midx.c:1150
msgid "Counting referenced objects"
msgstr "Comptage des objets référencés"
-#: midx.c:1230
+#: midx.c:1160
msgid "Finding and deleting unreferenced packfiles"
msgstr "Recherche et effacement des fichiers paquets non-référencés"
-#: midx.c:1388
+#: midx.c:1351
msgid "could not start pack-objects"
msgstr "Impossible de démarrer le groupement d'objets"
-#: midx.c:1407
+#: midx.c:1371
msgid "could not finish pack-objects"
msgstr "Impossible de finir le groupement d'objets"
-#: name-hash.c:537
+#: name-hash.c:538
#, c-format
msgid "unable to create lazy_dir thread: %s"
msgstr "impossible de créer le fil lazy_dir : %s"
-#: name-hash.c:559
+#: name-hash.c:560
#, c-format
msgid "unable to create lazy_name thread: %s"
msgstr "impossible de créer le fil lazy_name : %s"
-#: name-hash.c:565
+#: name-hash.c:566
#, c-format
msgid "unable to join lazy_name thread: %s"
msgstr "impossible de joindre le fil lazy_name : %s"
@@ -5144,6 +5536,365 @@
msgid "Bad %s value: '%s'"
msgstr "Mauvaise valeur de %s : '%s'"
+#: object-file.c:480
+#, 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"
+
+#: object-file.c:531
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "impossible de normaliser le chemin d'objet alternatif : %s"
+
+#: object-file.c:603
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr "%s : magasins d'objets alternatifs ignorés, récursion trop profonde"
+
+#: object-file.c:610
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "impossible de normaliser le répertoire d'objet : %s"
+
+#: object-file.c:653
+msgid "unable to fdopen alternates lockfile"
+msgstr "impossible d'ouvrir (fdopen) le fichier verrou des alternatives"
+
+#: object-file.c:671
+msgid "unable to read alternates file"
+msgstr "lecture du fichier d'alternatives impossible"
+
+#: object-file.c:678
+msgid "unable to move new alternates file into place"
+msgstr "impossible de déplacer le nouveau fichier d'alternative"
+
+#: object-file.c:713
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "le chemin '%s' n'existe pas"
+
+#: object-file.c:734
+#, 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é."
+
+#: object-file.c:740
+#, 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."
+
+#: object-file.c:746
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "le dépôt de référence '%s' est superficiel"
+
+#: object-file.c:754
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "le dépôt de référence '%s' est greffé"
+
+#: object-file.c:814
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "ligne invalide pendant l'analyse des refs alternatives : %s"
+
+#: object-file.c:964
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr "essai de mmap %<PRIuMAX> au delà de la limite %<PRIuMAX>"
+
+#: object-file.c:985
+msgid "mmap failed"
+msgstr "échec de mmap"
+
+#: object-file.c:1149
+#, c-format
+msgid "object file %s is empty"
+msgstr "le fichier objet %s est vide"
+
+#: object-file.c:1284 object-file.c:2477
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "objet libre corrompu '%s'"
+
+#: object-file.c:1286 object-file.c:2481
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "données incorrectes à la fin de l'objet libre '%s'"
+
+#: object-file.c:1328
+msgid "invalid object type"
+msgstr "type d'objet invalide"
+
+#: object-file.c:1412
+#, 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"
+
+#: object-file.c:1415
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "impossible de dépaqueter l'entête %s"
+
+#: object-file.c:1421
+#, c-format
+msgid "unable to parse %s header with --allow-unknown-type"
+msgstr "impossible d'analyser l'entête %s avec --allow-unknow-type"
+
+#: object-file.c:1424
+#, c-format
+msgid "unable to parse %s header"
+msgstr "impossible d'analyser l'entête %s"
+
+#: object-file.c:1651
+#, c-format
+msgid "failed to read object %s"
+msgstr "impossible de lire l'objet %s"
+
+#: object-file.c:1655
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "remplacement %s non trouvé pour %s"
+
+#: object-file.c:1659
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "l'objet libre %s (stocké dans %s) est corrompu"
+
+#: object-file.c:1663
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "l'objet empaqueté %s (stocké dans %s) est corrompu"
+
+#: object-file.c:1768
+#, c-format
+msgid "unable to write file %s"
+msgstr "impossible d'écrire le fichier %s"
+
+#: object-file.c:1775
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "impossible de régler les droits de '%s'"
+
+#: object-file.c:1782
+msgid "file write error"
+msgstr "erreur d'écriture d'un fichier"
+
+#: object-file.c:1802
+msgid "error when closing loose object file"
+msgstr "erreur en fermeture du fichier d'objet esseulé"
+
+#: object-file.c:1867
+#, 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"
+
+#: object-file.c:1869
+msgid "unable to create temporary file"
+msgstr "impossible de créer un fichier temporaire"
+
+#: object-file.c:1893
+msgid "unable to write loose object file"
+msgstr "impossible d'écrire le fichier d'objet esseulé"
+
+#: object-file.c:1899
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "impossible de compresser le nouvel objet %s (%d)"
+
+#: object-file.c:1903
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "échec de deflateEnd sur l'objet %s (%d)"
+
+#: object-file.c:1907
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "données de source d'objet instable pour %s"
+
+#: object-file.c:1917 builtin/pack-objects.c:1097
+#, c-format
+msgid "failed utime() on %s"
+msgstr "échec de utime() sur %s"
+
+#: object-file.c:1994
+#, c-format
+msgid "cannot read object for %s"
+msgstr "impossible de lire l'objet pour %s"
+
+#: object-file.c:2045
+msgid "corrupt commit"
+msgstr "commit corrompu"
+
+#: object-file.c:2053
+msgid "corrupt tag"
+msgstr "étiquette corrompue"
+
+#: object-file.c:2153
+#, c-format
+msgid "read error while indexing %s"
+msgstr "erreur de lecture à l'indexation de %s"
+
+#: object-file.c:2156
+#, c-format
+msgid "short read while indexing %s"
+msgstr "lecture tronquée pendant l'indexation de %s"
+
+#: object-file.c:2229 object-file.c:2239
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr "%s : échec de l'insertion dans la base de données"
+
+#: object-file.c:2245
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s : type de fichier non supporté"
+
+#: object-file.c:2269
+#, c-format
+msgid "%s is not a valid object"
+msgstr "%s n'est pas un objet valide"
+
+#: object-file.c:2271
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s n'est pas un objet '%s' valide"
+
+#: object-file.c:2298 builtin/index-pack.c:192
+#, c-format
+msgid "unable to open %s"
+msgstr "impossible d'ouvrir %s"
+
+#: object-file.c:2488 object-file.c:2541
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "incohérence de hachage pour %s (%s attendu)"
+
+#: object-file.c:2512
+#, c-format
+msgid "unable to mmap %s"
+msgstr "impossible de mmap %s"
+
+#: object-file.c:2517
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "impossible de dépaqueter l'entête de %s"
+
+#: object-file.c:2523
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "impossible d'analyser l'entête de %s"
+
+#: object-file.c:2534
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "impossible de dépaqueter le contenu de %s"
+
+#: object-name.c:486
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr "l'id court d'objet %s est ambigu"
+
+#: object-name.c:497
+msgid "The candidates are:"
+msgstr "Les candidats sont :"
+
+#: object-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 ne crée normalement jamais de référence qui se termine par 40\n"
+"caractères hexa car elle serait ignorée si vous spécifiez juste\n"
+"40-hexa. Ces références peuvent être créées par erreur. Par exemple,\n"
+"\n"
+" git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"où \"$br\" est d'une manière ou d'une autre vide et une référence 40-hexa "
+"est créée.\n"
+"Veuillez examiner ces références et peut-être les supprimer. Désactivez ce "
+"message\n"
+"en lançant \"git config advice.objectNameWarning false\""
+
+#: object-name.c:916
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "le journal de '%.*s' ne remonte qu'à %s"
+
+#: object-name.c:924
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "le journal de '%.*s' n'a que %d entrées"
+
+#: object-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'"
+
+#: object-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'"
+
+#: object-name.c:1717
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "le chemin '%s' n'existe pas dans '%.*s'"
+
+#: object-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' ?"
+
+#: object-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'"
+
+#: object-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"
+
+#: object-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)"
+
+#: object-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"
+
+#: object-name.c:1922
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "nom d'objet invalide : '%.*s'."
+
#: object.c:53
#, c-format
msgid "invalid object type \"%s\""
@@ -5169,25 +5920,94 @@
msgid "hash mismatch %s"
msgstr "incohérence de hachage %s"
-#: packfile.c:629
+#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226
+#, c-format
+msgid "unable to get size of %s"
+msgstr "impossible de récupérer la taille de %s"
+
+#: pack-bitmap.c:1489 builtin/rev-list.c:92
+#, c-format
+msgid "unable to get disk usage of %s"
+msgstr "impossible de récupérer l'utilisation du disque de %s"
+
+#: pack-revindex.c:220
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr "le fichier d'index inversé %s est trop petit"
+
+#: pack-revindex.c:225
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr "le fichier d'index inversé %s est corrompu"
+
+#: pack-revindex.c:233
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr "le fichier d'index inversé %s a une signature inconnue"
+
+#: pack-revindex.c:237
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr "le fichier d'index inverse %s a une version non gérée %<PRIu32>"
+
+#: pack-revindex.c:242
+#, c-format
+msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
+msgstr "le fichier d'index inverse %s a un id d'empreinte non géré %<PRIu32>"
+
+#: pack-write.c:236
+msgid "cannot both write and verify reverse index"
+msgstr "impossible de lire et vérifier à la fois l'index inverse"
+
+#: pack-write.c:257
+#, c-format
+msgid "could not stat: %s"
+msgstr "stat impossible de %s"
+
+#: pack-write.c:269
+#, c-format
+msgid "failed to make %s readable"
+msgstr "échec de rendre %s lisible"
+
+#: pack-write.c:508
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr "impossible d'écrire le fichier de prometteur '%s'"
+
+#: packfile.c:625
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"
-#: packfile.c:1899
+#: packfile.c:1934
#, 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:1938
#, 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é ?)"
-#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134
+#: parse-options-cb.c:20 parse-options-cb.c:24
#, c-format
-msgid "unable to get size of %s"
-msgstr "impossible de récupérer la taille de %s"
+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
@@ -5229,26 +6049,31 @@
msgid "did you mean `--%s` (with two dashes)?"
msgstr "vouliez-vous dire `--%s` (avec deux signes moins)?"
-#: parse-options.c:857
+#: 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:859
+#: parse-options.c:864
#, c-format
msgid "unknown switch `%c'"
msgstr "bascule inconnue « %c »"
-#: parse-options.c:861
+#: 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:885
+#: parse-options.c:890
msgid "..."
msgstr "..."
-#: parse-options.c:904
+#: parse-options.c:909
#, c-format
msgid "usage: %s"
msgstr "usage : %s"
@@ -5256,45 +6081,20 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:910
+#: parse-options.c:915
#, c-format
msgid " or: %s"
msgstr " ou : %s"
-#: parse-options.c:913
+#: parse-options.c:918
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:952
+#: parse-options.c:957
msgid "-NUM"
msgstr "-NUM"
-#: parse-options.c:966
-#, 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:915
#, c-format
msgid "Could not make %s writable by group"
@@ -5357,29 +6157,29 @@
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s : 'literal' et 'glob' sont incompatibles"
-#: pathspec.c:442
+#: pathspec.c:445
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr "%s : '%s' est hors du dépôt à '%s'"
-#: pathspec.c:517
+#: pathspec.c:521
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s' (mnémonique : '%c')"
-#: pathspec.c:527
+#: 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:594
+#: 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:639
+#: pathspec.c:643
#, c-format
msgid "line is badly quoted: %s"
msgstr "la ligne est mal citée : %s"
@@ -5393,145 +6193,178 @@
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:165
#, c-format
msgid "remote error: %s"
msgstr "erreur distante : %s"
-#: preload-index.c:119
+#: preload-index.c:125
msgid "Refreshing index"
msgstr "Rafraîchissement de l'index"
-#: preload-index.c:138
+#: preload-index.c:144
#, c-format
msgid "unable to create threaded lstat: %s"
msgstr "impossible de créer le lstat en fil : %s"
-#: pretty.c:981
+#: pretty.c:984
msgid "unable to parse --pretty format"
msgstr "impossible d'analyser le format --pretty"
-#: promisor-remote.c:23
-msgid "Remote with no URL"
-msgstr "Dépôt distant sans URL"
+#: promisor-remote.c: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:58
+#: 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"
-#: range-diff.c:75
+#: prune-packed.c:35
+msgid "Removing duplicate objects"
+msgstr "Suppression des objets dupliqués"
+
+#: range-diff.c:78
msgid "could not start `log`"
msgstr "impossible de démarrer `log`"
-#: range-diff.c:77
+#: range-diff.c:80
msgid "could not read `log` output"
msgstr "impossible de lire la sortie de `log`"
-#: range-diff.c:96 sequencer.c:5020
+#: range-diff.c:101 sequencer.c:5318
#, c-format
msgid "could not parse commit '%s'"
msgstr "impossible d'analyser le commit '%s'"
-#: range-diff.c:122
+#: range-diff.c:115
+#, 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:140
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "impossible d'analyser l'entête git '%.*s'"
-#: range-diff.c:285
+#: range-diff.c:306
msgid "failed to generate diff"
msgstr "échec de la génération de diff"
-#: range-diff.c:518 range-diff.c:520
+#: range-diff.c:558
+msgid "--left-only and --right-only are mutually exclusive"
+msgstr "--left-only et --right-only sont mutuellement exclusifs"
+
+#: range-diff.c:561 range-diff.c:563
#, 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:1330
+#: 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:1536
+#: read-cache.c:1532
msgid "Refresh index"
msgstr "Rafraîchir l'index"
-#: read-cache.c:1651
+#: read-cache.c:1657
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -5540,7 +6373,7 @@
"version d'index renseignée, mais la valeur est invalide.\n"
"Utilisation de la version %i"
-#: read-cache.c:1661
+#: read-cache.c:1667
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -5549,139 +6382,139 @@
"GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n"
"Utilisation de la version %i"
-#: read-cache.c:1717
+#: read-cache.c:1723
#, c-format
msgid "bad signature 0x%08x"
msgstr "signature incorrecte 0x%08x"
-#: read-cache.c:1720
+#: read-cache.c:1726
#, c-format
msgid "bad index version %d"
msgstr "mauvaise version d'index %d"
-#: read-cache.c:1729
+#: read-cache.c:1735
msgid "bad index file sha1 signature"
msgstr "mauvaise signature sha1 d'index"
-#: read-cache.c:1759
+#: read-cache.c:1765
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "l'index utilise l'extension %.4s qui n'est pas comprise"
-#: read-cache.c:1761
+#: read-cache.c:1767
#, c-format
msgid "ignoring %.4s extension"
msgstr "extension %.4s ignorée"
-#: read-cache.c:1798
+#: read-cache.c:1804
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "format d'entrée d'index inconnu 0x%08x"
-#: read-cache.c:1814
+#: read-cache.c:1820
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "champ de nom malformé dans l'index, près du chemin '%s'"
-#: read-cache.c:1871
+#: read-cache.c:1877
msgid "unordered stage entries in index"
msgstr "entrées de préparation non ordonnées dans l'index"
-#: read-cache.c:1874
+#: read-cache.c:1880
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "entrées multiples de préparation pour le fichier fusionné '%s'"
-#: read-cache.c:1877
+#: read-cache.c:1883
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "entrées de préparation non ordonnées pour '%s'"
-#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
-#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
-#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
-#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
-#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
+#: read-cache.c:1989 read-cache.c:2280 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181
+#: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991
+#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505
+#: 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:2124
+#: read-cache.c:2133
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "impossible de créer le fil load_cache_entries : %s"
-#: read-cache.c:2137
+#: read-cache.c:2146
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "impossible de joindre le fil load_cach_entries : %s"
-#: read-cache.c:2170
+#: read-cache.c:2179
#, c-format
msgid "%s: index file open failed"
msgstr "%s : l'ouverture du fichier d'index a échoué"
-#: read-cache.c:2174
+#: read-cache.c:2183
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s : impossible de faire un stat sur l'index ouvert"
-#: read-cache.c:2178
+#: read-cache.c:2187
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s : fichier d'index plus petit qu'attendu"
-#: read-cache.c:2182
+#: read-cache.c:2191
#, c-format
msgid "%s: unable to map index file"
msgstr "%s : impossible de mapper le fichier d'index"
-#: read-cache.c:2224
+#: read-cache.c:2233
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "impossible de créer le fil load_index_extensions : %s"
-#: read-cache.c:2251
+#: read-cache.c:2260
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "impossible de joindre le fil load_index_extensions : %s"
-#: read-cache.c:2283
+#: read-cache.c:2292
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "impossible de rafraîchir l'index partagé '%s'"
-#: read-cache.c:2330
+#: read-cache.c:2339
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "index cassé, %s attendu dans %s, %s obtenu"
-#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122
+#: read-cache.c:3035 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141
#, c-format
msgid "could not close '%s'"
msgstr "impossible de fermer '%s'"
-#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959
+#: read-cache.c:3138 sequencer.c:2487 sequencer.c:4239
#, c-format
msgid "could not stat '%s'"
msgstr "stat impossible de '%s'"
-#: read-cache.c:3142
+#: read-cache.c:3151
#, c-format
msgid "unable to open git dir: %s"
msgstr "impossible d'ouvrir le répertoire git : %s"
-#: read-cache.c:3154
+#: read-cache.c:3163
#, c-format
msgid "unable to unlink: %s"
msgstr "échec lors de l'unlink : %s"
-#: read-cache.c:3179
+#: read-cache.c:3188
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "impossible de régler les bits de droit de '%s'"
-#: read-cache.c:3328
+#: read-cache.c:3337
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s : impossible de revenir à l'étape 0"
@@ -5752,7 +6585,7 @@
msgstr[0] "Rebasage de %s sur %s (%d commande)"
msgstr[1] "Rebasage de %s sur %s (%d commandes)"
-#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228
+#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -5761,7 +6594,7 @@
"Ne supprimez aucune ligne. Utilisez 'drop' explicitement pour supprimer un "
"commit.\n"
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232
+#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -5769,7 +6602,7 @@
"\n"
"Si vous éliminez une ligne ici, LE COMMIT CORRESPONDANT SERA PERDU.\n"
-#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871
+#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -5784,7 +6617,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:86 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"
@@ -5794,14 +6627,14 @@
"Cependant, si vous effacez tout, le rebasage sera annulé.\n"
"\n"
-#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444
-#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252
+#: rebase-interactive.c:110 rerere.c:469 rerere.c:676 sequencer.c:3615
+#: sequencer.c:3641 sequencer.c:5424 builtin/fsck.c:329 builtin/rebase.c:272
#, c-format
msgid "could not write '%s'"
msgstr "impossible d'écrire '%s'"
-#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210
-#: builtin/rebase.c:234
+#: rebase-interactive.c:116 builtin/rebase.c:204 builtin/rebase.c:230
+#: builtin/rebase.c:254
#, c-format
msgid "could not write '%s'."
msgstr "impossible d'écrire '%s'."
@@ -5833,133 +6666,15 @@
"Les comportements disponibles sont : ignore, warn, error.\n"
"\n"
-#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262
-#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221
-#: builtin/rebase.c:246
+#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2402
+#: builtin/rebase.c:190 builtin/rebase.c:215 builtin/rebase.c:241
+#: builtin/rebase.c:266
#, c-format
msgid "could not read '%s'."
msgstr "impossible de lire '%s'."
-#: refs.c:262
-#, c-format
-msgid "%s does not point to a valid object!"
-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:2098
-#, 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:407 sequencer.c:2701 sequencer.c:2905
-#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157
-#: wrapper.c:620
-#, c-format
-msgid "could not write to '%s'"
-msgstr "impossible d'écrire dans '%s'"
-
-#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719
-#: builtin/rebase.c:1029
-#, 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:2023
-#, c-format
-msgid "multiple updates for ref '%s' not allowed"
-msgstr "mises à jour multiples pour la réf '%s' non permises"
-
-#: refs.c:2055
-msgid "ref updates forbidden inside quarantine environment"
-msgstr "mises à jour des références interdites en environnement de quarantaine"
-
-#: refs.c:2151 refs.c:2181
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr "'%s' existe ; impossible de créer '%s'"
-
-#: refs.c:2157 refs.c:2192
-#, c-format
-msgid "cannot process '%s' and '%s' at the same time"
-msgstr "impossible de traiter '%s' et '%s' en même temps"
-
-#: refs/files-backend.c:1233
-#, c-format
-msgid "could not remove reference %s"
-msgstr "impossible de supprimer la référence %s"
-
-#: refs/files-backend.c:1247 refs/packed-backend.c:1541
-#: refs/packed-backend.c:1551
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "Impossible de supprimer la référence %s : %s"
-
-#: refs/files-backend.c:1250 refs/packed-backend.c:1554
-#, 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'"
-
# à priori on parle d'une branche ici
-#: ref-filter.c:42 wt-status.c:1938
+#: ref-filter.c:42 wt-status.c:1975
msgid "gone"
msgstr "disparue"
@@ -5978,283 +6693,412 @@
msgid "ahead %d, behind %d"
msgstr "en avance de %d, en retard de %d"
-#: ref-filter.c:165
+#: ref-filter.c:175
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "format attendu : %%(color:<couleur>)"
-#: ref-filter.c:167
+#: ref-filter.c:177
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "couleur non reconnue : %%(color:%s)"
-#: ref-filter.c:189
+#: ref-filter.c:199
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Valeur entière attendue refname:lstrip=%s"
-#: ref-filter.c:193
+#: ref-filter.c:203
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Valeur entière attendue refname:rstrip=%s"
-#: ref-filter.c:195
+#: ref-filter.c:205
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "argument %%(%s) non reconnu : %s"
-#: ref-filter.c:250
+#: ref-filter.c:260
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) n'accepte pas d'argument"
-#: ref-filter.c:272
+#: ref-filter.c:282
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr "argument %%(objectsize) non reconnu : %s"
-#: ref-filter.c:280
+#: ref-filter.c:290
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) n'accepte pas d'argument"
-#: ref-filter.c:292
+#: ref-filter.c:302
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) n'accepte pas d'argument"
-#: ref-filter.c:301
+#: ref-filter.c:315
#, 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:323
+#: ref-filter.c:334
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr "%%(trailers:key=<value>) attendu"
+
+#: ref-filter.c:336
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "argument %%(trailers) inconnu : %s"
-#: ref-filter.c:352
+#: ref-filter.c:367
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "valeur positive attendue contents:lines=%s"
-#: ref-filter.c:354
+#: ref-filter.c:369
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "argument %%(contents) non reconnu : %s"
-#: ref-filter.c:369
+#: ref-filter.c:384
#, 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:373
+#: ref-filter.c:388
#, 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:403
+#: ref-filter.c:402
+#, c-format
+msgid "unrecognized email option: %s"
+msgstr "option de courriel non reconnue : %s"
+
+#: ref-filter.c:432
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "format attendu : %%(align:<largeur>,<position>)"
-#: ref-filter.c:415
+#: ref-filter.c:444
#, c-format
msgid "unrecognized position:%s"
msgstr "position non reconnue : %s"
-#: ref-filter.c:422
+#: ref-filter.c:451
#, c-format
msgid "unrecognized width:%s"
msgstr "largeur non reconnue : %s"
-#: ref-filter.c:431
+#: ref-filter.c:460
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "argument %%(align) non reconnu : %s"
-#: ref-filter.c:439
+#: ref-filter.c:468
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "valeur positive attendue avec l'atome %%(align)"
-#: ref-filter.c:457
+#: ref-filter.c:486
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "argument %%(if) non reconnu : %s"
-#: ref-filter.c:559
+#: ref-filter.c:588
#, c-format
msgid "malformed field name: %.*s"
msgstr "nom de champ malformé %.*s"
-#: ref-filter.c:586
+#: ref-filter.c:615
#, c-format
msgid "unknown field name: %.*s"
msgstr "nom de champ inconnu : %.*s"
-#: ref-filter.c:590
+#: ref-filter.c:619
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
"pas un dépôt git, mais le champ '%.*s' nécessite l'accès aux données d'objet"
-#: ref-filter.c:714
+#: ref-filter.c:743
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "format : atome %%(if) utilisé sans un atome %%(then)"
-#: ref-filter.c:777
+#: ref-filter.c:806
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "format : atome %%(then) utilisé sans un atome %%(if)"
-#: ref-filter.c:779
+#: ref-filter.c:808
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "format : atome %%(then) utilisé plus d'une fois"
-#: ref-filter.c:781
+#: ref-filter.c:810
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "format: atome %%(then) utilisé après %%(else)"
-#: ref-filter.c:809
+#: ref-filter.c:838
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "format : atome %%(else) utilisé sans un atome %%(if)"
-#: ref-filter.c:811
+#: ref-filter.c:840
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "format : atome %%(else) utilisé sans un atome %%(then)"
-#: ref-filter.c:813
+#: ref-filter.c:842
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "format : atome %%(else) utilisé plus d'une fois"
-#: ref-filter.c:828
+#: ref-filter.c:857
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "format : atome %%(end) utilisé sans atome correspondant"
-#: ref-filter.c:885
+#: ref-filter.c:914
#, c-format
msgid "malformed format string %s"
msgstr "Chaîne de formatage mal formée %s"
-#: ref-filter.c:1488
+#: ref-filter.c:1555
#, c-format
-msgid "no branch, rebasing %s"
-msgstr "aucune branche, rebasage de %s"
+msgid "(no branch, rebasing %s)"
+msgstr "(aucune branche, rebasage de %s)"
-#: ref-filter.c:1491
+#: ref-filter.c:1558
#, c-format
-msgid "no branch, rebasing detached HEAD %s"
-msgstr "aucune branche, rebasage de la HEAD détachée %s"
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "(aucune branche, rebasage de la HEAD détachée %s)"
-#: ref-filter.c:1494
+#: ref-filter.c:1561
#, c-format
-msgid "no branch, bisect started on %s"
-msgstr "aucune branche, bisect a démarré sur %s"
+msgid "(no branch, bisect started on %s)"
+msgstr "(aucune branche, bisect a démarré sur %s)"
-#: ref-filter.c:1504
-msgid "no branch"
-msgstr "aucune branche"
+#: ref-filter.c:1565
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD détachée sur %s)"
-#: ref-filter.c:1540 ref-filter.c:1749
+#: ref-filter.c:1568
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD détachée depuis %s)"
+
+#: ref-filter.c:1571
+msgid "(no branch)"
+msgstr "(aucune branche)"
+
+#: ref-filter.c:1603 ref-filter.c:1812
#, c-format
msgid "missing object %s for %s"
msgstr "objet manquant %s pour %s"
-#: ref-filter.c:1550
+#: ref-filter.c:1613
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "échec de parse_object_buffer sur %s pour %s"
-#: ref-filter.c:2004
+#: ref-filter.c:1996
#, c-format
msgid "malformed object at '%s'"
msgstr "objet malformé à '%s'"
-#: ref-filter.c:2093
+#: ref-filter.c:2085
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "réf avec un nom cassé %s ignoré"
-#: ref-filter.c:2389
+#: ref-filter.c:2090 refs.c:676
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "réf cassé %s ignoré"
+
+#: ref-filter.c:2430
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: atome %%(end) manquant"
-#: ref-filter.c:2489
-#, c-format
-msgid "option `%s' is incompatible with --merged"
-msgstr "l'option « %s » est incompatible avec --merged"
-
-#: ref-filter.c:2492
-#, c-format
-msgid "option `%s' is incompatible with --no-merged"
-msgstr "l'option « %s » est incompatible avec --no-merged"
-
-#: ref-filter.c:2502
+#: ref-filter.c:2529
#, c-format
msgid "malformed object name %s"
msgstr "nom d'objet malformé %s"
-#: ref-filter.c:2507
+#: ref-filter.c:2534
#, c-format
msgid "option `%s' must point to a commit"
msgstr "l'option '%s' doit pointer sur un commit"
-#: remote.c:366
+#: 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:566
+#, c-format
+msgid ""
+"Using '%s' as the name for the initial branch. This default branch name\n"
+"is subject to change. To configure the initial branch name to use in all\n"
+"of your new repositories, which will suppress this warning, call:\n"
+"\n"
+"\tgit config --global init.defaultBranch <name>\n"
+"\n"
+"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"'development'. The just-created branch can be renamed via this command:\n"
+"\n"
+"\tgit branch -m <name>\n"
+msgstr ""
+"Utilisation de '%s' comme nom de la branche initiale. Le nom de la branche\n"
+"par défaut peut changer. Pour configurer le nom de la branche initiale\n"
+"pour tous les nouveaux dépôts, et supprimer cet avertissement, lancez :\n"
+"\n"
+"\tgit config --global init.defaultBranch <nom>\n"
+"\n"
+"Les noms les plus utilisés à la place de 'master' sont 'main', 'trunk' et\n"
+"'development'. La branche nouvellement créée peut être rénommée avec :\n"
+"\n"
+"\tgit branch -m <nom>\n"
+
+#: refs.c:588
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "impossible de récupérer `%s`"
+
+#: refs.c:598
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "Nom de branche invalide : %s = %s"
+
+#: refs.c:674
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "symref pendant %s ignoré"
+
+#: refs.c:922
+#, 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:929
+#, 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:994
+#, c-format
+msgid "log for %s is empty"
+msgstr "le journal pour la réf %s est vide"
+
+#: refs.c:1086
+#, 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:1157
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "échec de update_ref pour la réf '%s' : %s"
+
+#: refs.c:2051
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "mises à jour multiples pour la réf '%s' non permises"
+
+#: refs.c:2131
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "mises à jour des références interdites en environnement de quarantaine"
+
+#: refs.c:2142
+msgid "ref updates aborted by hook"
+msgstr "mises à jour des références annulées par le crochet"
+
+#: refs.c:2242 refs.c:2272
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "'%s' existe ; impossible de créer '%s'"
+
+#: refs.c:2248 refs.c:2283
+#, 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:170
+#, 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:414
+#: remote.c:399
msgid "more than one receivepack given, using the first"
msgstr "plus d'un receivepack fournis, utilisation du premier"
-#: remote.c:422
+#: remote.c:407
msgid "more than one uploadpack given, using the first"
msgstr "plus d'un uploadpack fournis, utilisation du premier"
-#: remote.c:612
+#: 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:616
+#: remote.c:594
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s suit habituellement %s, pas %s"
-#: remote.c:620
+#: remote.c:598
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s suit à la fois %s et %s"
-#: remote.c:688
+#: 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:698
+#: 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:1004
+#: remote.c:1083
#, c-format
msgid "src refspec %s does not match any"
msgstr ""
"le spécificateur de référence source %s ne correspond à aucune référence"
-#: remote.c:1009
+#: remote.c:1088
#, c-format
msgid "src refspec %s matches more than one"
msgstr ""
@@ -6264,7 +7108,7 @@
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1024
+#: remote.c:1103
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
@@ -6288,7 +7132,7 @@
"Aucune n'a fonctionné, donc abandon. Veuillez spécifier une référence "
"totalement qualifiée."
-#: remote.c:1044
+#: remote.c:1123
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
@@ -6299,7 +7143,7 @@
"Souhaitiez-vous créer une nouvelle branche en poussant sur\n"
"'%s:refs/heads/%s' ?"
-#: remote.c:1049
+#: remote.c:1128
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
@@ -6310,7 +7154,7 @@
"Souhaitiez-vous créer une nouvelle étiquette en poussant sur\n"
"'%s:refs/tags/%s' ?"
-#: remote.c:1054
+#: remote.c:1133
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
@@ -6321,7 +7165,7 @@
"Souhaitiez-vous créer un nouvel arbre en poussant sur\n"
"'%s:refs/tags/%s' ?"
-#: remote.c:1059
+#: remote.c:1138
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
@@ -6332,119 +7176,119 @@
"Souhaitiez-vous créer un nouveau blob en poussant sur\n"
"'%s:refs/tags/%s' ?"
-#: remote.c:1095
+#: remote.c:1174
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "'%s' ne peut pas être résolue comme une branche"
-#: remote.c:1106
+#: remote.c:1185
#, 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:1118
+#: remote.c:1197
#, c-format
msgid "dst refspec %s matches more than one"
msgstr ""
"le spécificateur de référence dst %s correspond à plus d'un spécificateur de "
"références"
-#: remote.c:1125
+#: remote.c:1204
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr "le spécificateur de référence dst %s reçoit depuis plus d'une source"
-#: remote.c:1628 remote.c:1729
+#: remote.c:1724 remote.c:1825
msgid "HEAD does not point to a branch"
msgstr "HEAD ne pointe pas sur une branche"
-#: remote.c:1637
+#: remote.c:1733
#, c-format
msgid "no such branch: '%s'"
msgstr "pas de branche '%s'"
-#: remote.c:1640
+#: remote.c:1736
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "aucune branche amont configurée pour la branche '%s'"
-#: remote.c:1646
+#: remote.c:1742
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "la branche amont '%s' n'est pas stockée comme branche de suivi"
-#: remote.c:1661
+#: remote.c:1757
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
"la destination de poussée '%s' sur le serveur distant '%s' n'a pas de "
"branche locale de suivi"
-#: remote.c:1673
+#: remote.c:1769
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "la branche '%s' n'a aucune branche distante de poussée"
-#: remote.c:1683
+#: remote.c:1779
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "les références de spec pour '%s' n'incluent pas '%s'"
-#: remote.c:1696
+#: remote.c:1792
msgid "push has no destination (push.default is 'nothing')"
msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')"
-#: remote.c:1718
+#: remote.c:1814
msgid "cannot resolve 'simple' push to a single destination"
msgstr ""
"impossible de résoudre une poussée 'simple' pour une destination unique"
-#: remote.c:1844
+#: remote.c:1943
#, c-format
msgid "couldn't find remote ref %s"
msgstr "impossible de trouver la référence distante %s"
-#: remote.c:1857
+#: remote.c:1956
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "* Référence bizarre '%s' ignorée localement"
-#: remote.c:2020
+#: remote.c:2119
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "Votre branche est basée sur '%s', mais la branche amont a disparu.\n"
-#: remote.c:2024
+#: remote.c:2123
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n"
-#: remote.c:2027
+#: remote.c:2126
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "Votre branche est à jour avec '%s'.\n"
-#: remote.c:2031
+#: remote.c:2130
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "Votre branche et '%s' font référence à des commits différents.\n"
-#: remote.c:2034
+#: remote.c:2133
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (utilisez \"%s\" pour plus de détails)\n"
-#: remote.c:2038
+#: remote.c:2137
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "Votre branche est en avance sur '%s' de %d commit.\n"
msgstr[1] "Votre branche est en avance sur '%s' de %d commits.\n"
-#: remote.c:2044
+#: remote.c:2143
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n"
-#: remote.c:2047
+#: remote.c:2146
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -6456,11 +7300,11 @@
"Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour "
"en avance rapide.\n"
-#: remote.c:2055
+#: remote.c:2154
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n"
-#: remote.c:2058
+#: remote.c:2157
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -6475,12 +7319,12 @@
"Votre branche et '%s' ont divergé,\n"
"et ont %d et %d commits différents chacune respectivement.\n"
-#: remote.c:2068
+#: remote.c:2167
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
" (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n"
-#: remote.c:2251
+#: remote.c:2359
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "impossible d'analyser le nom attendu d'objet '%s'"
@@ -6500,126 +7344,135 @@
msgid "replace depth too high for object %s"
msgstr "profondeur de remplacement trop grande pour l'objet %s"
-#: rerere.c:217 rerere.c:226 rerere.c:229
+#: rerere.c:201 rerere.c:210 rerere.c:213
msgid "corrupt MERGE_RR"
msgstr "MERGE_RR corrompu"
-#: rerere.c:264 rerere.c:269
+#: rerere.c:248 rerere.c:253
msgid "unable to write rerere record"
msgstr "impossible d'écrire l'enregistrement rerere"
-#: rerere.c:495
+#: rerere.c:479
#, c-format
msgid "there were errors while writing '%s' (%s)"
msgstr "il y a eu des erreurs à l'écriture de '%s' (%s)"
-#: rerere.c:498
+#: rerere.c:482
#, c-format
msgid "failed to flush '%s'"
msgstr "échec du flush de '%s'"
-#: rerere.c:503 rerere.c:1039
+#: rerere.c:487 rerere.c:1023
#, c-format
msgid "could not parse conflict hunks in '%s'"
msgstr "impossible d'analyser la section en conflit dans '%s'"
-#: rerere.c:684
+#: rerere.c:668
#, c-format
msgid "failed utime() on '%s'"
msgstr "échec de utime() sur '%s'"
-#: rerere.c:694
+#: rerere.c:678
#, c-format
msgid "writing '%s' failed"
msgstr "échec de l'écriture de '%s'"
-#: rerere.c:714
+#: rerere.c:698
#, c-format
msgid "Staged '%s' using previous resolution."
msgstr "'%s' indexé en utilisant la résolution pré-existante."
-#: rerere.c:753
+#: rerere.c:737
#, c-format
msgid "Recorded resolution for '%s'."
msgstr "Résolution enregistrée pour '%s'."
-#: rerere.c:788
+#: rerere.c:772
#, c-format
msgid "Resolved '%s' using previous resolution."
msgstr "'%s' résolu en utilisant la résolution pré-existante."
-#: rerere.c:803
+#: rerere.c:787
#, c-format
msgid "cannot unlink stray '%s'"
msgstr "impossible de délier '%s' qui est errant"
-#: rerere.c:807
+#: rerere.c:791
#, c-format
msgid "Recorded preimage for '%s'"
msgstr "Pré-image enregistrée pour '%s'"
-#: rerere.c:881 submodule.c:2078 builtin/log.c:1871
-#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
+#: rerere.c:865 submodule.c:2088 builtin/log.c:1991
+#: 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'"
-#: rerere.c:1057
+#: rerere.c:1041
#, c-format
msgid "failed to update conflicted state in '%s'"
msgstr "échec de la mise à jour de l'état en conflit dans '%s'"
-#: rerere.c:1068 rerere.c:1075
+#: rerere.c:1052 rerere.c:1059
#, c-format
msgid "no remembered resolution for '%s'"
msgstr "Aucune résolution enregistrée pour '%s'"
-#: rerere.c:1077
+#: rerere.c:1061
#, c-format
msgid "cannot unlink '%s'"
msgstr "impossible de délier '%s'"
-#: rerere.c:1087
+#: rerere.c:1071
#, c-format
msgid "Updated preimage for '%s'"
msgstr "Pré-image mise à jour pour '%s'"
-#: rerere.c:1096
+#: rerere.c:1080
#, c-format
msgid "Forgot resolution for '%s'\n"
msgstr "Résolution pour '%s' oubliée\n"
-#: rerere.c:1199
+#: rerere.c:1191
msgid "unable to open rr-cache directory"
msgstr "impossible d'ouvrir le répertoire rr-cache"
-#: revision.c:2497
+#: 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:3468
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "impossible de trouver l'arbre de %s"
+
+#: revision.c:2338
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "--unpacked=<fichier-paquet> n'est plus géré"
+
+#: revision.c:2668
msgid "your current branch appears to be broken"
msgstr "votre branche actuelle semble cassée"
-#: revision.c:2500
+#: revision.c:2671
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "votre branche actuelle '%s' ne contient encore aucun commit"
-#: revision.c:2708
-msgid "--first-parent is incompatible with --bisect"
-msgstr "--first-parent est incompatible avec --bisect"
-
-#: revision.c:2712
+#: revision.c:2877
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"
-#: run-command.c:763
+#: run-command.c:767
msgid "open /dev/null failed"
msgstr "échec de l'ouverture de /dev/null"
-#: run-command.c:1269
+#: run-command.c:1274
#, c-format
msgid "cannot create async thread: %s"
msgstr "impossible de créer un fil asynchrone : %s"
-#: run-command.c:1333
+#: run-command.c:1338
#, c-format
msgid ""
"The '%s' hook was ignored because it's not set as executable.\n"
@@ -6629,31 +7482,35 @@
"Vous pouvez désactiver cet avertissement avec `git config advice.ignoredHook "
"false`."
-#: send-pack.c:144
+#: send-pack.c:146
msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
"paquet de nettoyage inattendu pendant la lecture de l'état de dépaquetage "
"distant"
-#: send-pack.c:146
+#: send-pack.c:148
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "impossible d'analyser l'état de dépaquetage distant : %s"
-#: send-pack.c:148
+#: send-pack.c:150
#, c-format
msgid "remote unpack failed: %s"
msgstr "le dépaquetage a échoué : %s"
-#: send-pack.c:309
+#: send-pack.c:374
msgid "failed to sign the push certificate"
msgstr "impossible de signer le certificat de poussée"
-#: send-pack.c:423
+#: send-pack.c:467
+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:476
msgid "the receiving end does not support --signed push"
msgstr "Le receveur ne gère pas les poussées avec --signed"
-#: send-pack.c:425
+#: send-pack.c:478
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -6661,47 +7518,47 @@
"pas d'envoi de certificat de poussée car le receveur ne gère pas les "
"poussées avec --signed"
-#: send-pack.c:437
+#: send-pack.c:490
msgid "the receiving end does not support --atomic push"
msgstr "Le receveur ne gère pas les poussées avec --atomic"
-#: send-pack.c:442
+#: send-pack.c:495
msgid "the receiving end does not support push options"
msgstr "Le receveur ne gère pas les options de poussées"
-#: sequencer.c:191
+#: sequencer.c:195
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "mode de nettoyage invalide de message de validation '%s'"
-#: sequencer.c:296
+#: sequencer.c:323
#, c-format
msgid "could not delete '%s'"
msgstr "Impossible de supprimer '%s'"
-#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385
+#: sequencer.c:343 builtin/rebase.c:757 builtin/rebase.c:1602 builtin/rm.c:385
#, c-format
msgid "could not remove '%s'"
msgstr "impossible de supprimer '%s'"
-#: sequencer.c:325
+#: sequencer.c:353
msgid "revert"
msgstr "revert"
-#: sequencer.c:327
+#: sequencer.c:355
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:329
+#: sequencer.c:357
msgid "rebase"
msgstr "rebase"
-#: sequencer.c:331
+#: sequencer.c:359
#, c-format
msgid "unknown action: %d"
msgstr "action inconnue : %d"
-#: sequencer.c:389
+#: sequencer.c:418
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -6709,7 +7566,7 @@
"après résolution des conflits, marquez les chemins corrigés\n"
"avec 'git add <chemins>' ou 'git rm <chemins>'"
-#: sequencer.c:392
+#: sequencer.c:421
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -6719,44 +7576,43 @@
"avec 'git add <chemins>' ou 'git rm <chemins>'\n"
"puis validez le résultat avec 'git commit'"
-#: sequencer.c:405 sequencer.c:2901
+#: sequencer.c:434 sequencer.c:3070
#, c-format
msgid "could not lock '%s'"
msgstr "impossible de verrouiller '%s'"
-#: sequencer.c:412
+#: sequencer.c:436 sequencer.c:2869 sequencer.c:3074 sequencer.c:3088
+#: sequencer.c:3345 sequencer.c:5334 strbuf.c:1168 wrapper.c:631
+#, c-format
+msgid "could not write to '%s'"
+msgstr "impossible d'écrire dans '%s'"
+
+#: sequencer.c:441
#, c-format
msgid "could not write eol to '%s'"
msgstr "impossible d'écrire la fin de ligne dans '%s'"
-#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921
-#: sequencer.c:3185
+#: sequencer.c:446 sequencer.c:2874 sequencer.c:3076 sequencer.c:3090
+#: sequencer.c:3353
#, c-format
msgid "failed to finalize '%s'"
msgstr "échec lors de la finalisation de '%s'"
-#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
-#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
-#: builtin/rebase.c:593
-#, c-format
-msgid "could not read '%s'"
-msgstr "impossible de lire '%s'"
-
-#: sequencer.c:466
+#: sequencer.c:485
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "vos modifications locales seraient écrasées par %s."
-#: sequencer.c:470
+#: sequencer.c:489
msgid "commit your changes or stash them to proceed."
msgstr "validez vos modifications ou les remiser pour continuer."
-#: sequencer.c:502
+#: sequencer.c:521
#, c-format
msgid "%s: fast-forward"
msgstr "%s : avance rapide"
-#: sequencer.c:541 builtin/tag.c:565
+#: sequencer.c:560 builtin/tag.c:598
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Mode de nettoyage invalide %s"
@@ -6764,65 +7620,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:635
+#: sequencer.c:670
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Impossible d'écrire le nouveau fichier index"
-#: sequencer.c:652
+#: sequencer.c:684
msgid "unable to update cache tree"
msgstr "impossible de mettre à jour l'arbre de cache"
-#: sequencer.c:666
+#: sequencer.c:698
msgid "could not resolve HEAD commit"
msgstr "impossible de résoudre le commit HEAD"
-#: sequencer.c:746
+#: sequencer.c:778
#, c-format
msgid "no key present in '%.*s'"
msgstr "aucune clé présente dans '%.*s'"
-#: sequencer.c:757
+#: sequencer.c:789
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "Impossible de décoter la valeur de '%s'"
-#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710
-#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072
+#: sequencer.c:826 wrapper.c:201 wrapper.c:371 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1136 builtin/rebase.c:910
#, c-format
msgid "could not open '%s' for reading"
msgstr "impossible d'ouvrir '%s' en lecture"
-#: sequencer.c:804
+#: sequencer.c:836
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "'GIT_AUTHOR_NAME' déjà fourni"
-#: sequencer.c:809
+#: sequencer.c:841
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "'GIT_AUTHOR_EMAIL' déjà fourni"
-#: sequencer.c:814
+#: sequencer.c:846
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "'GIT_AUTHOR_DATE' déjà fourni"
-#: sequencer.c:818
+#: sequencer.c:850
#, c-format
msgid "unknown variable '%s'"
msgstr "variable inconnue '%s'"
-#: sequencer.c:823
+#: sequencer.c:855
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "'GIT_AUTHOR_NAME' manquant"
-#: sequencer.c:825
+#: sequencer.c:857
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "'GIT_AUTHOR_EMAIL' manquant"
-#: sequencer.c:827
+#: sequencer.c:859
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "'GIT_AUTHOR_DATE' manquant"
-#: sequencer.c:876
+#: sequencer.c:924
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -6851,11 +7707,11 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:1148
+#: sequencer.c:1211
msgid "'prepare-commit-msg' hook failed"
msgstr "échec du crochet 'prepare-commit-msg'"
-#: sequencer.c:1154
+#: sequencer.c:1217
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6884,7 +7740,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1167
+#: sequencer.c:1230
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6910,325 +7766,339 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1209
+#: sequencer.c:1272
msgid "couldn't look up newly created commit"
msgstr "impossible de retrouver le commit nouvellement créé"
-#: sequencer.c:1211
+#: sequencer.c:1274
msgid "could not parse newly created commit"
msgstr "impossible d'analyser le commit nouvellement créé"
-#: sequencer.c:1257
+#: sequencer.c:1320
msgid "unable to resolve HEAD after creating commit"
msgstr "impossible de résoudre HEAD après création du commit"
-#: sequencer.c:1259
+#: sequencer.c:1322
msgid "detached HEAD"
msgstr "HEAD détachée"
-#: sequencer.c:1263
+#: sequencer.c:1326
msgid " (root-commit)"
msgstr " (commit racine)"
-#: sequencer.c:1284
+#: sequencer.c:1347
msgid "could not parse HEAD"
msgstr "impossible de lire HEAD"
-#: sequencer.c:1286
+#: sequencer.c:1349
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s n'est pas un commit !"
-#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574
+#: sequencer.c:1353 sequencer.c:1431 builtin/commit.c:1577
msgid "could not parse HEAD commit"
msgstr "impossible d'analyser le commit HEAD"
-#: sequencer.c:1342 sequencer.c:1968
+#: sequencer.c:1409 sequencer.c:2108
msgid "unable to parse commit author"
msgstr "impossible d'analyser l'auteur du commit"
-#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687
+#: sequencer.c:1420 builtin/am.c:1566 builtin/merge.c:702
msgid "git write-tree failed to write a tree"
msgstr "git write-tree a échoué à écrire un arbre"
-#: sequencer.c:1386 sequencer.c:1447
+#: sequencer.c:1453 sequencer.c:1573
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "impossible de lire le message de validation de '%s'"
-#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886
-#: builtin/merge.c:911
+#: sequencer.c:1484 sequencer.c:1516
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr "identité d'auteur invalide '%s'"
+
+#: sequencer.c:1490
+msgid "corrupt author: missing date information"
+msgstr "auteur corrompu : information de date manquante"
+
+#: sequencer.c:1529 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:905
+#: builtin/merge.c:930 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "échec de l'écriture de l'objet commit"
-#: sequencer.c:1474
+#: sequencer.c:1556 sequencer.c:4291 t/helper/test-fast-rebase.c:198
+#, c-format
+msgid "could not update %s"
+msgstr "impossible de mettre à jour %s"
+
+#: sequencer.c:1605
#, c-format
msgid "could not parse commit %s"
msgstr "impossible d'analyser le commit %s"
-#: sequencer.c:1479
+#: sequencer.c:1610
#, c-format
msgid "could not parse parent commit %s"
msgstr "impossible d'analyser le commit parent %s"
-#: sequencer.c:1562 sequencer.c:1673
+#: sequencer.c:1693 sequencer.c:1804
#, c-format
msgid "unknown command: %d"
msgstr "commande inconnue : %d"
-#: sequencer.c:1620 sequencer.c:1645
+#: sequencer.c:1751 sequencer.c:1776
#, c-format
msgid "This is a combination of %d commits."
msgstr "Ceci est la combinaison de %d commits."
-#: sequencer.c:1630
+#: sequencer.c:1761
msgid "need a HEAD to fixup"
msgstr "une HEAD est nécessaire à la correction"
-#: sequencer.c:1632 sequencer.c:3212
+#: sequencer.c:1763 sequencer.c:3380
msgid "could not read HEAD"
msgstr "Impossible de lire HEAD"
-#: sequencer.c:1634
+#: sequencer.c:1765
msgid "could not read HEAD's commit message"
msgstr "impossible de lire le message de validation de HEAD"
-#: sequencer.c:1640
+#: sequencer.c:1771
#, c-format
msgid "cannot write '%s'"
msgstr "impossible d'écrire '%s'"
-#: sequencer.c:1647 git-rebase--preserve-merges.sh:496
+#: sequencer.c:1778 git-rebase--preserve-merges.sh:486
msgid "This is the 1st commit message:"
msgstr "Ceci est le premier message de validation :"
-#: sequencer.c:1655
+#: sequencer.c:1786
#, c-format
msgid "could not read commit message of %s"
msgstr "impossible de lire le message de validation de %s"
-#: sequencer.c:1662
+#: sequencer.c:1793
#, c-format
msgid "This is the commit message #%d:"
msgstr "Ceci est le message de validation numéro %d :"
-#: sequencer.c:1668
+#: sequencer.c:1799
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Le message de validation %d sera ignoré :"
-#: sequencer.c:1756
+#: sequencer.c:1887
msgid "your index file is unmerged."
msgstr "votre fichier d'index n'est pas fusionné."
-#: sequencer.c:1763
+#: sequencer.c:1894
msgid "cannot fixup root commit"
msgstr "impossible de réparer le commit racine"
-#: sequencer.c:1782
+#: sequencer.c:1913
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "le commit %s est une fusion mais l'option -m n'a pas été spécifiée."
-#: sequencer.c:1790 sequencer.c:1798
+#: sequencer.c:1921 sequencer.c:1929
#, c-format
msgid "commit %s does not have parent %d"
msgstr "le commit %s n'a pas de parent %d"
-#: sequencer.c:1804
+#: sequencer.c:1935
#, c-format
msgid "cannot get commit message for %s"
msgstr "impossible d'obtenir un message de validation pour %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1823
+#: sequencer.c:1954
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s : impossible d'analyser le commit parent %s"
-#: sequencer.c:1888
+#: sequencer.c:2019
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "impossible de renommer '%s' en '%s'"
-#: sequencer.c:1943
+#: sequencer.c:2079
#, c-format
msgid "could not revert %s... %s"
msgstr "impossible d'annuler %s... %s"
-#: sequencer.c:1944
+#: sequencer.c:2080
#, c-format
msgid "could not apply %s... %s"
msgstr "impossible d'appliquer %s... %s"
-#: sequencer.c:1961
+#: sequencer.c:2100
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "abandon de %s %s -- le contenu de la rustine déjà en amont\n"
-#: sequencer.c:2018
+#: sequencer.c:2158
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s : échec à la lecture de l'index"
-#: sequencer.c:2025
+#: sequencer.c:2165
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s : échec du rafraîchissement de l'index"
-#: sequencer.c:2102
+#: sequencer.c:2242
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s n'accepte pas d'argument : '%s'"
-#: sequencer.c:2111
+#: sequencer.c:2251
#, c-format
msgid "missing arguments for %s"
msgstr "argument manquant pour %s"
-#: sequencer.c:2142
+#: sequencer.c:2282
#, c-format
msgid "could not parse '%s'"
msgstr "impossible d'analyser '%s'"
-#: sequencer.c:2203
+#: sequencer.c:2343
#, c-format
msgid "invalid line %d: %.*s"
msgstr "ligne %d invalide : %.*s"
-#: sequencer.c:2214
+#: sequencer.c:2354
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "'%s' impossible avec le commit précédent"
-#: sequencer.c:2298
+#: sequencer.c:2440
msgid "cancelling a cherry picking in progress"
msgstr "annulation d'un picorage en cours"
-#: sequencer.c:2305
+#: sequencer.c:2449
msgid "cancelling a revert in progress"
msgstr "annulation d'un retour en cours"
-#: sequencer.c:2349
+#: sequencer.c:2493
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'."
-#: sequencer.c:2351
+#: sequencer.c:2495
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "feuille d'instruction inutilisable : '%s'"
-#: sequencer.c:2356
+#: sequencer.c:2500
msgid "no commits parsed."
msgstr "aucun commit analysé."
-#: sequencer.c:2367
+#: sequencer.c:2511
msgid "cannot cherry-pick during a revert."
msgstr "impossible de picorer pendant l'annulation d'un commit."
-#: sequencer.c:2369
+#: sequencer.c:2513
msgid "cannot revert during a cherry-pick."
msgstr "impossible d'annuler un commit pendant un picorage."
-#: sequencer.c:2447
+#: sequencer.c:2591
#, c-format
msgid "invalid value for %s: %s"
msgstr "valeur invalide pour %s : %s"
-#: sequencer.c:2540
+#: sequencer.c:2698
msgid "unusable squash-onto"
msgstr "\"écrase-sur\" inutilisable"
-#: sequencer.c:2556
+#: sequencer.c:2718
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "feuille d'options malformée : %s"
-#: sequencer.c:2644 sequencer.c:4361
+#: sequencer.c:2811 sequencer.c:4644
msgid "empty commit set passed"
msgstr "l'ensemble de commits spécifié est vide"
-#: sequencer.c:2660
+#: sequencer.c:2828
msgid "revert is already in progress"
msgstr "un retour est déjà en cours"
-#: sequencer.c:2662
+#: sequencer.c:2830
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "essayez \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:2665
+#: sequencer.c:2833
msgid "cherry-pick is already in progress"
msgstr "un picorage est déjà en cours"
-#: sequencer.c:2667
+#: sequencer.c:2835
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "essayez \"git cherry-pick (--continue | %s--abort | --quit)\""
-#: sequencer.c:2681
+#: sequencer.c:2849
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "impossible de créer le répertoire de séquenceur '%s'"
-#: sequencer.c:2696
+#: sequencer.c:2864
msgid "could not lock HEAD"
msgstr "impossible de verrouiller HEAD"
-#: sequencer.c:2756 sequencer.c:4099
+#: sequencer.c:2924 sequencer.c:4379
msgid "no cherry-pick or revert in progress"
msgstr "aucun picorage ou retour en cours"
-#: sequencer.c:2758 sequencer.c:2769
+#: sequencer.c:2926 sequencer.c:2937
msgid "cannot resolve HEAD"
msgstr "impossible de résoudre HEAD"
-#: sequencer.c:2760 sequencer.c:2804
+#: sequencer.c:2928 sequencer.c:2972
msgid "cannot abort from a branch yet to be born"
msgstr "impossible d'abandonner depuis une branche non encore créée"
-#: sequencer.c:2790 builtin/grep.c:724
+#: sequencer.c:2958 builtin/grep.c:757
#, c-format
msgid "cannot open '%s'"
msgstr "impossible d'ouvrir '%s'"
-#: sequencer.c:2792
+#: sequencer.c:2960
#, c-format
msgid "cannot read '%s': %s"
msgstr "impossible de lire '%s' : %s"
-#: sequencer.c:2793
+#: sequencer.c:2961
msgid "unexpected end of file"
msgstr "fin de fichier inattendue"
-#: sequencer.c:2799
+#: sequencer.c:2967
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "le fichier HEAD de préparation de picorage '%s' est corrompu"
-#: sequencer.c:2810
+#: sequencer.c:2978
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Vous semblez avoir déplacé la HEAD. Pas de rembobinage, vérifiez votre HEAD !"
-#: sequencer.c:2851
+#: sequencer.c:3019
msgid "no revert in progress"
msgstr "Pas de retour en cours ?"
-#: sequencer.c:2859
+#: sequencer.c:3028
msgid "no cherry-pick in progress"
msgstr "aucun picorage en cours"
-#: sequencer.c:2869
+#: sequencer.c:3038
msgid "failed to skip the commit"
msgstr "échec du saut de commit"
-#: sequencer.c:2876
+#: sequencer.c:3045
msgid "there is nothing to skip"
msgstr "il n'y a rien à sauter"
-#: sequencer.c:2879
+#: sequencer.c:3048
#, c-format
msgid ""
"have you committed already?\n"
@@ -7237,21 +8107,16 @@
"Avez-vous déjà validé ?\n"
"essayez \"git %s -continue\""
-#: sequencer.c:3003 sequencer.c:4011
-#, c-format
-msgid "could not update %s"
-msgstr "impossible de mettre à jour %s"
-
-#: sequencer.c:3042 sequencer.c:3991
+#: sequencer.c:3210 sequencer.c:4271
msgid "cannot read HEAD"
msgstr "impossible de lire HEAD"
-#: sequencer.c:3059
+#: sequencer.c:3227
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "impossible de copier '%s' vers '%s'"
-#: sequencer.c:3067
+#: sequencer.c:3235
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -7270,22 +8135,27 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:3077
+#: sequencer.c:3245
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "impossible d'appliquer %s... %.*s"
-#: sequencer.c:3084
+#: sequencer.c:3252
#, c-format
msgid "Could not merge %.*s"
msgstr "Impossible de fusionner %.*s"
-#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641
+#: sequencer.c:3266 sequencer.c:3270 builtin/difftool.c:640
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "impossible de copier '%s' vers '%s'"
-#: sequencer.c:3129
+#: sequencer.c:3282
+#, c-format
+msgid "Executing: %s\n"
+msgstr "Exécution : %s\n"
+
+#: sequencer.c:3297
#, c-format
msgid ""
"execution failed: %s\n"
@@ -7300,11 +8170,11 @@
"git rebase --continue\n"
"\n"
-#: sequencer.c:3135
+#: sequencer.c:3303
msgid "and made changes to the index and/or the working tree\n"
msgstr "et a mis à jour l'index ou l'arbre de travail\n"
-#: sequencer.c:3141
+#: sequencer.c:3309
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -7321,103 +8191,125 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3202
+#: sequencer.c:3370
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "nom de label illégal '%.*s'"
-#: sequencer.c:3256
+#: sequencer.c:3424
msgid "writing fake root commit"
msgstr "écriture d'un commit racine bidon"
-#: sequencer.c:3261
+#: sequencer.c:3429
msgid "writing squash-onto"
msgstr "écriture de 'écraser-sur'"
-#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886
-#, c-format
-msgid "failed to find tree of %s"
-msgstr "impossible de trouver l'arbre de %s"
-
-#: sequencer.c:3344
+#: sequencer.c:3513
#, c-format
msgid "could not resolve '%s'"
msgstr "impossible de résoudre '%s'"
-#: sequencer.c:3375
+#: sequencer.c:3546
msgid "cannot merge without a current revision"
msgstr "impossible de fusionner avec une révision courante"
-#: sequencer.c:3397
+#: sequencer.c:3568
#, c-format
msgid "unable to parse '%.*s'"
msgstr "impossible d'analyser '%.*s'"
-#: sequencer.c:3406
+#: sequencer.c:3577
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "rien à fusionner : '%.*s'"
-#: sequencer.c:3418
+#: sequencer.c:3589
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
"une fusion octopus ne peut pas être exécutée par dessus une nouvelle racine"
-#: sequencer.c:3434
+#: sequencer.c:3605
#, c-format
msgid "could not get commit message of '%s'"
msgstr "impossible de lire le message de validation de '%s'"
-#: sequencer.c:3594
+#: sequencer.c:3788
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "impossible de seulement essayer de fusionner '%.*s'"
-#: sequencer.c:3610
+#: sequencer.c:3804
msgid "merge: Unable to write new index file"
msgstr "fusion : Impossible d'écrire le nouveau fichier index"
-#: sequencer.c:3679 builtin/rebase.c:737
+#: sequencer.c:3878
+msgid "Cannot autostash"
+msgstr "Autoremisage impossible"
+
+#: sequencer.c:3881
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "réponse de remisage inattendue : '%s'"
+
+#: sequencer.c:3887
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "Impossible de créer le répertoire pour '%s'"
+
+#: sequencer.c:3890
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "Autoremisage créé : %s\n"
+
+#: sequencer.c:3894
+msgid "could not reset --hard"
+msgstr "impossible de réinitialiser --hard"
+
+#: sequencer.c:3919
#, c-format
msgid "Applied autostash.\n"
msgstr "Autoremisage appliqué.\n"
-#: sequencer.c:3691
+#: sequencer.c:3931
#, c-format
msgid "cannot store %s"
msgstr "impossible de stocker %s"
-#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113
+#: sequencer.c:3934
#, 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:3755
-#, c-format
-msgid "%s: not a valid OID"
-msgstr "%s n'est pas un OID valide"
+#: sequencer.c:3939
+msgid "Applying autostash resulted in conflicts."
+msgstr "L'application du remisage automatique a créé des conflits."
-#: sequencer.c:3760 git-rebase--preserve-merges.sh:779
+#: sequencer.c:3940
+msgid "Autostash exists; creating a new stash entry."
+msgstr ""
+"Un remisage automatique existe ; création d'une nouvelle entrée de remisage."
+
+#: sequencer.c:4033 git-rebase--preserve-merges.sh:769
msgid "could not detach HEAD"
msgstr "Impossible de détacher HEAD"
-#: sequencer.c:3775
+#: sequencer.c:4048
#, c-format
msgid "Stopped at HEAD\n"
msgstr "arrêt à HEAD\n"
-#: sequencer.c:3777
+#: sequencer.c:4050
#, c-format
msgid "Stopped at %s\n"
msgstr "Arrêté à %s\n"
-#: sequencer.c:3785
+#: sequencer.c:4058
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -7438,48 +8330,58 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:3869
+#: sequencer.c:4104
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "Rebasage (%d/%d)%s"
+
+#: sequencer.c:4149
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "arrêt à %s... %.*s\n"
-#: sequencer.c:3940
+#: sequencer.c:4220
#, c-format
msgid "unknown command %d"
msgstr "commande inconnue %d"
-#: sequencer.c:3999
+#: sequencer.c:4279
msgid "could not read orig-head"
msgstr "impossible de lire orig-head"
-#: sequencer.c:4004
+#: sequencer.c:4284
msgid "could not read 'onto'"
msgstr "impossible de lire 'onto'"
-#: sequencer.c:4018
+#: sequencer.c:4298
#, c-format
msgid "could not update HEAD to %s"
msgstr "impossible de mettre à jour HEAD sur %s"
-#: sequencer.c:4111
+#: sequencer.c:4358
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "Rebasage et mise à jour de %s avec succès.\n"
+
+#: sequencer.c:4391
msgid "cannot rebase: You have unstaged changes."
msgstr "impossible de rebaser : vous avez des modifications non indexées."
-#: sequencer.c:4120
+#: sequencer.c:4400
msgid "cannot amend non-existing commit"
msgstr "impossible de corriger un commit non-existant"
-#: sequencer.c:4122
+#: sequencer.c:4402
#, c-format
msgid "invalid file: '%s'"
msgstr "fichier invalide : '%s'"
-#: sequencer.c:4124
+#: sequencer.c:4404
#, c-format
msgid "invalid contents: '%s'"
msgstr "contenu invalide : '%s'"
-#: sequencer.c:4127
+#: sequencer.c:4407
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -7489,59 +8391,59 @@
"Vous avez des modifications non validées dans votre copie de travail.\n"
"Veuillez les valider d'abord, puis relancer 'git rebase --continue'."
-#: sequencer.c:4163 sequencer.c:4202
+#: sequencer.c:4443 sequencer.c:4482
#, c-format
msgid "could not write file: '%s'"
msgstr "impossible d'écrire le fichier : '%s'"
-#: sequencer.c:4217
+#: sequencer.c:4498
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "impossible de supprimer CHERRY_PICK_HEAD"
-#: sequencer.c:4224
+#: sequencer.c:4505
msgid "could not commit staged changes."
msgstr "impossible de valider les modifications indexées."
-#: sequencer.c:4338
+#: sequencer.c:4621
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s : impossible de picorer un %s"
-#: sequencer.c:4342
+#: sequencer.c:4625
#, c-format
msgid "%s: bad revision"
msgstr "%s : mauvaise révision"
-#: sequencer.c:4377
+#: sequencer.c:4660
msgid "can't revert as initial commit"
msgstr "impossible d'annuler en tant que commit initial"
-#: sequencer.c:4846
+#: sequencer.c:5137
msgid "make_script: unhandled options"
msgstr "make_script : options non gérées"
-#: sequencer.c:4849
+#: sequencer.c:5140
msgid "make_script: error preparing revisions"
msgstr "make_script : erreur lors de la préparation des révisions"
-#: sequencer.c:5083 sequencer.c:5100
+#: sequencer.c:5382 sequencer.c:5399
msgid "nothing to do"
msgstr "rien à faire"
-#: sequencer.c:5119
+#: sequencer.c:5418
msgid "could not skip unnecessary pick commands"
msgstr "impossible d'éviter les commandes de picorage non nécessaires"
-#: sequencer.c:5213
+#: sequencer.c:5512
msgid "the script was already rearranged."
msgstr "le script a déjà été réarrangé."
-#: setup.c:124
+#: setup.c:133
#, c-format
msgid "'%s' is outside repository at '%s'"
msgstr "'%s' est hors du dépôt à '%s'"
-#: setup.c:175
+#: setup.c:185
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
@@ -7551,7 +8453,7 @@
"Utilisez 'git <commande> -- <chemin>...' pour spécifier des chemins qui "
"n'existent pas localement."
-#: setup.c:188
+#: setup.c:198
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -7562,14 +8464,14 @@
"Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"
"'git <commande> [<révision>...] -- [<chemin>...]'"
-#: setup.c:254
+#: 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:273
+#: setup.c:283
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -7580,94 +8482,99 @@
"Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"
"'git <commande> [<révision>...] -- [<chemin>...]'"
-#: setup.c:409
+#: 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:413
+#: 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:559
+#: 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:567
+#: setup.c:669
msgid "unknown repository extensions found:"
msgstr "extensions de dépôt inconnues trouvées :"
-#: setup.c:586
+#: 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:588
+#: 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:590
+#: setup.c:704
#, c-format
msgid "error reading %s"
msgstr "erreur à la lecture de %s"
-#: setup.c:592
+#: setup.c:706
#, c-format
msgid "invalid gitfile format: %s"
msgstr "format de fichier git invalide : %s"
-#: setup.c:594
+#: setup.c:708
#, c-format
msgid "no path in gitfile: %s"
msgstr "aucun chemin dans le fichier git : %s"
-#: setup.c:596
+#: setup.c:710
#, c-format
msgid "not a git repository: %s"
msgstr "ce n'est pas un dépôt git : %s"
-#: setup.c:695
+#: setup.c:812
#, c-format
msgid "'$%s' too big"
msgstr "'$%s' trop gros"
-#: setup.c:709
+#: setup.c:826
#, c-format
msgid "not a git repository: '%s'"
msgstr "ce n'est pas un dépôt git : '%s'"
-#: setup.c:738 setup.c:740 setup.c:771
+#: setup.c: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:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856
+#: 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:870
+#: setup.c:987
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "échec du stat de '%*s%s%s'"
-#: setup.c:1108
+#: setup.c:1225
msgid "Unable to read current working directory"
msgstr "Impossible d'accéder au répertoire de travail courant"
-#: setup.c:1117 setup.c:1123
+#: setup.c:1234 setup.c:1240
#, c-format
msgid "cannot change to '%s'"
msgstr "impossible de modifier en '%s'"
-#: setup.c:1128
+#: 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:1134
+#: setup.c:1251
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
@@ -7678,7 +8585,7 @@
"Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM "
"n'est pas défini)."
-#: setup.c:1245
+#: setup.c:1362
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -7688,415 +8595,56 @@
"Le propriétaire des fichiers doit toujours avoir les droits en lecture et "
"écriture."
-#: setup.c:1289
+#: setup.c:1409
msgid "open /dev/null or dup failed"
msgstr "échec de l'ouverture ou au dup de /dev/null"
-#: setup.c:1304
+#: setup.c:1424
msgid "fork failed"
msgstr "échec de la bifurcation"
-#: setup.c:1309
+#: setup.c:1429
msgid "setsid failed"
msgstr "échec du setsid"
-#: sha1-file.c:452
-#, c-format
-msgid "object directory %s does not exist; check .git/objects/info/alternates"
-msgstr ""
-"le répertoire objet %s n'existe pas ; vérifiez .git/objects/info/alternates"
-
-#: sha1-file.c:503
-#, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr "impossible de normaliser le chemin d'objet alternatif : %s"
-
-#: sha1-file.c:575
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr "%s : magasins d'objets alternatifs ignorés, récursion trop profonde"
-
-#: sha1-file.c:582
-#, c-format
-msgid "unable to normalize object directory: %s"
-msgstr "impossible de normaliser le répertoire d'objet : %s"
-
-#: sha1-file.c:625
-msgid "unable to fdopen alternates lockfile"
-msgstr "impossible d'ouvrir (fdopen) le fichier verrou des alternatives"
-
-#: sha1-file.c:643
-msgid "unable to read alternates file"
-msgstr "lecture du fichier d'alternatives impossible"
-
-#: sha1-file.c:650
-msgid "unable to move new alternates file into place"
-msgstr "impossible de déplacer le nouveau fichier d'alternative"
-
-#: sha1-file.c:685
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "le chemin '%s' n'existe pas"
-
-#: sha1-file.c:711
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr ""
-"extraire le dépôt de référence '%s' comme une extraction liée n'est pas "
-"encore supporté."
-
-#: sha1-file.c:717
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "le dépôt de référence '%s' n'est pas un dépôt local."
-
-#: sha1-file.c:723
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "le dépôt de référence '%s' est superficiel"
-
-#: sha1-file.c:731
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "le dépôt de référence '%s' est greffé"
-
-#: sha1-file.c:791
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "ligne invalide pendant l'analyse des refs alternatives : %s"
-
-#: sha1-file.c:943
-#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
-msgstr "essai de mmap %<PRIuMAX> au delà de la limite %<PRIuMAX>"
-
-#: sha1-file.c:964
-msgid "mmap failed"
-msgstr "échec de mmap"
-
-#: sha1-file.c:1128
-#, c-format
-msgid "object file %s is empty"
-msgstr "le fichier objet %s est vide"
-
-#: sha1-file.c:1263 sha1-file.c:2443
-#, c-format
-msgid "corrupt loose object '%s'"
-msgstr "objet libre corrompu '%s'"
-
-#: sha1-file.c:1265 sha1-file.c:2447
-#, c-format
-msgid "garbage at end of loose object '%s'"
-msgstr "données incorrectes à la fin de l'objet libre '%s'"
-
-#: sha1-file.c:1307
-msgid "invalid object type"
-msgstr "type d'objet invalide"
-
-#: sha1-file.c:1391
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "impossible de dépaqueter l'entête %s avec --allow-unknow-type"
-
-#: sha1-file.c:1394
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "impossible de dépaqueter l'entête %s"
-
-#: sha1-file.c:1400
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "impossible d'analyser l'entête %s avec --allow-unknow-type"
-
-#: sha1-file.c:1403
-#, c-format
-msgid "unable to parse %s header"
-msgstr "impossible d'analyser l'entête %s"
-
-#: sha1-file.c:1629
-#, c-format
-msgid "failed to read object %s"
-msgstr "impossible de lire l'objet %s"
-
-#: sha1-file.c:1633
-#, c-format
-msgid "replacement %s not found for %s"
-msgstr "remplacement %s non trouvé pour %s"
-
-#: sha1-file.c:1637
-#, c-format
-msgid "loose object %s (stored in %s) is corrupt"
-msgstr "l'objet libre %s (stocké dans %s) est corrompu"
-
-#: sha1-file.c:1641
-#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "l'objet empaqueté %s (stocké dans %s) est corrompu"
-
-#: sha1-file.c:1746
-#, c-format
-msgid "unable to write file %s"
-msgstr "impossible d'écrire le fichier %s"
-
-#: sha1-file.c:1753
-#, c-format
-msgid "unable to set permission to '%s'"
-msgstr "impossible de régler les droits de '%s'"
-
-#: sha1-file.c:1760
-msgid "file write error"
-msgstr "erreur d'écriture d'un fichier"
-
-#: sha1-file.c:1780
-msgid "error when closing loose object file"
-msgstr "erreur en fermeture du fichier d'objet esseulé"
-
-#: sha1-file.c:1845
-#, c-format
-msgid "insufficient permission for adding an object to repository database %s"
-msgstr ""
-"droits insuffisants pour ajouter un objet à la base de données %s du dépôt"
-
-#: sha1-file.c:1847
-msgid "unable to create temporary file"
-msgstr "impossible de créer un fichier temporaire"
-
-#: sha1-file.c:1871
-msgid "unable to write loose object file"
-msgstr "impossible d'écrire le fichier d'objet esseulé"
-
-#: sha1-file.c:1877
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr "impossible de compresser le nouvel objet %s (%d)"
-
-#: sha1-file.c:1881
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr "échec de deflateEnd sur l'objet %s (%d)"
-
-#: sha1-file.c:1885
-#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr "données de source d'objet instable pour %s"
-
-#: sha1-file.c:1895 builtin/pack-objects.c:1054
-#, c-format
-msgid "failed utime() on %s"
-msgstr "échec de utime() sur %s"
-
-#: sha1-file.c:1972
-#, c-format
-msgid "cannot read object for %s"
-msgstr "impossible de lire l'objet pour %s"
-
-#: sha1-file.c:2011
-msgid "corrupt commit"
-msgstr "commit corrompu"
-
-#: sha1-file.c:2019
-msgid "corrupt tag"
-msgstr "étiquette corrompue"
-
-#: sha1-file.c:2119
-#, c-format
-msgid "read error while indexing %s"
-msgstr "erreur de lecture à l'indexation de %s"
-
-#: sha1-file.c:2122
-#, c-format
-msgid "short read while indexing %s"
-msgstr "lecture tronquée pendant l'indexation de %s"
-
-#: sha1-file.c:2195 sha1-file.c:2205
-#, c-format
-msgid "%s: failed to insert into database"
-msgstr "%s : échec de l'insertion dans la base de données"
-
-#: sha1-file.c:2211
-#, c-format
-msgid "%s: unsupported file type"
-msgstr "%s : type de fichier non supporté"
-
-#: sha1-file.c:2235
-#, c-format
-msgid "%s is not a valid object"
-msgstr "%s n'est pas un objet valide"
-
-#: sha1-file.c:2237
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s n'est pas un objet '%s' valide"
-
-#: sha1-file.c:2264 builtin/index-pack.c:155
-#, c-format
-msgid "unable to open %s"
-msgstr "impossible d'ouvrir %s"
-
-#: sha1-file.c:2454 sha1-file.c:2507
-#, c-format
-msgid "hash mismatch for %s (expected %s)"
-msgstr "incohérence de hachage pour %s (%s attendu)"
-
-#: sha1-file.c:2478
-#, c-format
-msgid "unable to mmap %s"
-msgstr "impossible de mmap %s"
-
-#: sha1-file.c:2483
-#, c-format
-msgid "unable to unpack header of %s"
-msgstr "impossible de dépaqueter l'entête de %s"
-
-#: sha1-file.c:2489
-#, c-format
-msgid "unable to parse header of %s"
-msgstr "impossible d'analyser l'entête de %s"
-
-#: sha1-file.c:2500
-#, c-format
-msgid "unable to unpack contents of %s"
-msgstr "impossible de dépaqueter le contenu de %s"
-
-#: sha1-name.c:486
-#, c-format
-msgid "short SHA1 %s is ambiguous"
-msgstr "le SHA1 court %s est ambigu"
-
-#: sha1-name.c:497
-msgid "The candidates are:"
-msgstr "Les candidats sont :"
-
-#: 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 ne crée normalement jamais de référence qui se termine par 40\n"
-"caractères hexa car elle serait ignorée si vous spécifiez juste\n"
-"40-hexa. Ces références peuvent être créées par erreur. Par exemple,\n"
-"\n"
-" git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"où \"$br\" est d'une manière ou d'une autre vide et une référence 40-hexa "
-"est créée.\n"
-"Veuillez examiner ces références et peut-être les supprimer. Désactivez ce "
-"message\n"
-"en lançant \"git config advice.objectNameWarning false\""
-
-#: sha1-name.c:916
-#, c-format
-msgid "log for '%.*s' only goes back to %s"
-msgstr "le journal de '%.*s' ne remonte qu'à %s"
-
-#: sha1-name.c:924
-#, c-format
-msgid "log for '%.*s' only has %d entries"
-msgstr "le journal de '%.*s' n'a que %d entrées"
-
-#: sha1-name.c:1689
-#, c-format
-msgid "path '%s' exists on disk, but not in '%.*s'"
-msgstr "le chemin '%s' existe sur le disque, mais pas dans '%.*s'"
-
-#: sha1-name.c:1695
-#, c-format
-msgid ""
-"path '%s' exists, but not '%s'\n"
-"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
-msgstr ""
-"le chemin '%s' existe, mais pas '%s'\n"
-"conseil : peut-être vouliez-vous dire '%.*s:%s', soit '%.*s:./%s'"
-
-#: sha1-name.c:1704
-#, c-format
-msgid "path '%s' does not exist in '%.*s'"
-msgstr "le chemin '%s' n'existe pas dnas '%.*s'"
-
-#: sha1-name.c:1732
-#, c-format
-msgid ""
-"path '%s' is in the index, but not at stage %d\n"
-"hint: Did you mean ':%d:%s'?"
-msgstr ""
-"le chemin '%s' est dans l'index, mais pas à l'étape %d\n"
-"conseil : vous vouliez peut-être dire ':%d:%s' ?"
-
-#: sha1-name.c:1748
-#, c-format
-msgid ""
-"path '%s' is in the index, but not '%s'\n"
-"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
-msgstr ""
-"le chemin '%s' est dans l'index, mais pas '%s'\n"
-"conseil : peut-être vouliez-vous dire ':%d:%s', soit '%d:./%s'"
-
-#: sha1-name.c:1756
-#, c-format
-msgid "path '%s' exists on disk, but not in the index"
-msgstr "le chemin '%s' existe sur le disque, mais pas dans l'index"
-
-#: sha1-name.c:1758
-#, c-format
-msgid "path '%s' does not exist (neither on disk nor in the index)"
-msgstr "le chemin '%s' n'existe pas (ni sur le disque, ni dans l'index)"
-
-#: sha1-name.c:1771
-msgid "relative path syntax can't be used outside working tree"
-msgstr ""
-"la syntaxe de chemin relatif ne peut pas être utilisée hors de l'arbre de "
-"travail"
-
-#: sha1-name.c:1909
-#, c-format
-msgid "invalid object name '%.*s'."
-msgstr "nom d'objet invalide : '%.*s'."
-
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:837
+#: strbuf.c:848
#, c-format
msgid "%u.%2.2u GiB"
msgstr "%u.%2.2u Gio"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:839
+#: 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:847
+#: strbuf.c:858
#, c-format
msgid "%u.%2.2u MiB"
msgstr "%u.%2.2u Mio"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:849
+#: 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:856
+#: strbuf.c:867
#, c-format
msgid "%u.%2.2u KiB"
msgstr "%u.%2.2u Kio"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:858
+#: 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:864
+#: strbuf.c:875
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
@@ -8104,18 +8652,50 @@
msgstr[1] "%u octets"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:866
+#: 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:1164
+#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719
+#: builtin/rebase.c:866
+#, 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 ""
@@ -8147,12 +8727,12 @@
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Le chemin '%s' est dans le sous-module '%.*s'"
-#: submodule.c:434
+#: submodule.c:435
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr "mauvais argument --ignore-submodules : %s"
-#: submodule.c:815
+#: submodule.c:817
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
@@ -8161,12 +8741,12 @@
"Le sous-module dans le commit %s au chemin : '%s' entre en collision avec un "
"sous-module du même nom. Ignoré."
-#: submodule.c:910
+#: submodule.c:920
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "l'entrée de sous-module '%s' (%s) est un %s, pas un commit"
-#: submodule.c:995
+#: submodule.c:1005
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
@@ -8175,36 +8755,36 @@
"Impossible de lancer la commande 'git rev-list <commits> --not --remotes -n "
"1' dans le sous-module %s"
-#: submodule.c:1118
+#: submodule.c:1128
#, c-format
msgid "process for submodule '%s' failed"
msgstr "le processus pour le sous-module '%s' a échoué"
-#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045
+#: submodule.c:1157 builtin/branch.c:689 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:1158
+#: submodule.c:1168
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr "Poussée du sous-module '%s'\n"
-#: submodule.c:1161
+#: submodule.c:1171
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "Impossible de pousser le sous-module '%s'\n"
-#: submodule.c:1453
+#: submodule.c:1463
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr "Récupération du sous-module %s%s\n"
-#: submodule.c:1483
+#: submodule.c:1497
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr "Impossible d'accéder au sous-module '%s'\n"
-#: submodule.c:1637
+#: submodule.c:1652
#, c-format
msgid ""
"Errors during submodule fetch:\n"
@@ -8213,63 +8793,63 @@
"Erreurs pendant la récupération du sous-module :\n"
"%s"
-#: submodule.c:1662
+#: submodule.c:1677
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "'%s' n'est pas reconnu comme dépôt git"
-#: submodule.c:1679
+#: submodule.c:1694
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr "impossible de lancer 'git status --porcelain=2' dans le sous-module %s"
-#: submodule.c:1720
+#: submodule.c:1735
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr "'git status --porcelain=2' a échoué dans le sous-module %s"
-#: submodule.c:1800
+#: submodule.c:1810
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "impossible de démarrer 'git status' dans le sous-module '%s'"
-#: submodule.c:1813
+#: submodule.c:1823
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "impossible de lancer 'git status' dans le sous-module '%s'"
-#: submodule.c:1828
+#: submodule.c:1838
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "Impossible de désactiver core.worktree dans le sous-module '%s'"
-#: submodule.c:1855 submodule.c:2165
+#: submodule.c:1865 submodule.c:2175
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "récursion impossible dans le sous-module '%s'"
-#: submodule.c:1876
+#: submodule.c:1886
msgid "could not reset submodule index"
msgstr "impossible de réinitialiser l'index du sous-module"
-#: submodule.c:1918
+#: submodule.c:1928
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "le sous-module '%s' a un index sale"
-#: submodule.c:1970
+#: submodule.c:1980
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "le sous-module '%s' n'a pas pu être mis à jour."
-#: submodule.c:2038
+#: submodule.c:2048
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr ""
"le répertoire git du sous-module '%s' est à l'intérieur du répertoire git "
"'%.*s'"
-#: submodule.c:2059
+#: submodule.c:2069
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -8277,17 +8857,17 @@
"relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail "
"n'est pas supporté"
-#: submodule.c:2071 submodule.c:2130
+#: submodule.c:2081 submodule.c:2140
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "impossible de trouve le nom pour le sous-module '%s'"
-#: submodule.c:2075
+#: submodule.c:2085
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr "refus de déplacer '%s' dans une répertoire git existant"
-#: submodule.c:2082
+#: submodule.c:2092
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -8298,95 +8878,264 @@
"'%s' sur\n"
"'%s'\n"
-#: submodule.c:2209
+#: submodule.c:2220
msgid "could not start ls-files in .."
msgstr "impossible de démarrer ls-files dans .."
-#: submodule.c:2248
+#: submodule.c:2260
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree a renvoyé un code de retour inattendu %d"
-#: submodule-config.c:236
-#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "nom de sous-module suspicieux %s ignoré"
-
-#: submodule-config.c:303
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs"
-
-#: submodule-config.c:401
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr ""
-"'%s' ignoré et qui peut être interprété comme une option de ligne de "
-"commande : %s"
-
-#: submodule-config.c:498
-#, c-format
-msgid "invalid value for %s"
-msgstr "Valeur invalide pour %s"
-
-#: submodule-config.c:765
-#, 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:298 builtin/remote.c:323
+#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324
#, 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 builtin/mktag.c:91
msgid "could not read from stdin"
msgstr "Impossible de lire depuis l'entrée standard"
-#: trailer.c:1011 wrapper.c:665
+#: 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-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:145
+#, c-format
+msgid "unable to find remote helper for '%s'"
+msgstr "Impossible de trouver un assistant distant pour '%s'"
+
+#: 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:214
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
+msgstr ""
+"capacité obligatoire inconnue %s ; cet assistant distant requiert "
+"probablement une une nouvelle version de Git"
+
+#: transport-helper.c:220
+msgid "this remote helper should implement refspec capability"
+msgstr "cet assistant distant devrait supporter la capacité refspec"
+
+#: 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:417
+#, c-format
+msgid "%s also locked %s"
+msgstr "%s a aussi verrouillé %s"
+
+#: transport-helper.c:497
+msgid "couldn't run fast-import"
+msgstr "impossible de lancer fast-import"
+
+#: transport-helper.c:520
+msgid "error while running fast-import"
+msgstr "erreur au lancement de fast-import"
+
+#: transport-helper.c:549 transport-helper.c:1237
+#, c-format
+msgid "could not read ref %s"
+msgstr "impossible de lire la réf %s"
+
+#: transport-helper.c:594
+#, c-format
+msgid "unknown response to connect: %s"
+msgstr "réponse inconnue à connect : %s"
+
+#: 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:618
+msgid "invalid remote service path"
+msgstr "chemin de service distant invalide"
+
+#: transport-helper.c:661 transport.c:1447
+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: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:845
+#, c-format
+msgid "helper reported unexpected status of %s"
+msgstr "l'assistant a renvoyé un statut de retour inattendu %s"
+
+#: transport-helper.c:928
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr "l'assistant %s ne gère pas dry-run"
+
+#: transport-helper.c:931
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr "l'assistant %s ne gère pas --signed"
+
+#: transport-helper.c:934
+#, 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:939
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr "l'assistant %s ne gère pas --atomic"
+
+#: transport-helper.c:943
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr "l'assistant %s ne gère pas --%s"
+
+#: transport-helper.c:950
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr "l'assistant %s ne gère pas 'push-option'"
+
+#: transport-helper.c:1050
+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:1055
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr "l'assistant %s ne gère pas 'force'"
+
+#: transport-helper.c:1102
+msgid "couldn't run fast-export"
+msgstr "impossible de lancer fast-export"
+
+#: transport-helper.c:1107
+msgid "error while running fast-export"
+msgstr "erreur au lancement de fast-export"
+
+#: transport-helper.c:1132
+#, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\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.\n"
+
+#: transport-helper.c:1214
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr "format d'objet non géré '%s'"
+
+#: transport-helper.c:1223
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr "réponse malformée dans le liste de réfs : %s"
+
+#: transport-helper.c:1375
+#, c-format
+msgid "read(%s) failed"
+msgstr "échec de read(%s)"
+
+#: transport-helper.c:1402
+#, c-format
+msgid "write(%s) failed"
+msgstr "échec de write(%s)"
+
+#: transport-helper.c:1451
+#, c-format
+msgid "%s thread failed"
+msgstr "échec du fil d'exécution %s"
+
+#: transport-helper.c:1455
+#, c-format
+msgid "%s thread failed to join: %s"
+msgstr "échec de jonction du fil d'exécution %s : %s"
+
+#: transport-helper.c:1474 transport-helper.c:1478
+#, 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:1515
+#, c-format
+msgid "%s process failed to wait"
+msgstr "échec du processus %s pour l'attente"
+
+#: transport-helper.c:1519
+#, c-format
+msgid "%s process failed"
+msgstr "échec du processus %s"
+
+#: transport-helper.c:1537 transport-helper.c:1546
+msgid "can't start thread for copying data"
+msgstr "impossible de démarrer le fil d'exécution pour copier les données"
+
#: transport.c:116
#, c-format
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
@@ -8397,42 +9146,42 @@
msgid "could not read bundle '%s'"
msgstr "impossible de lire la liasse '%s'"
-#: transport.c:214
+#: transport.c:220
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "transport : option de profondeur invalide '%s'"
-#: transport.c:266
+#: 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:267
+#: 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:632
+#: transport.c:727
msgid "could not parse transport.color.* config"
msgstr "impossible d'analyser la configuration transport.color.*"
-#: transport.c:705
+#: transport.c:802
msgid "support for protocol v2 not implemented yet"
msgstr "le support du protocole v2 n'est pas encore implanté"
-#: transport.c:831
+#: transport.c:936
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "valeur inconnue pour la config '%s' : %s"
-#: transport.c:897
+#: transport.c:1002
#, c-format
msgid "transport '%s' not allowed"
msgstr "transport '%s' non permis"
-#: transport.c:949
+#: transport.c:1055
msgid "git-over-rsync is no longer supported"
msgstr "git-over-rsync n'est plus supporté"
-#: transport.c:1044
+#: transport.c:1157
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -8441,7 +9190,7 @@
"Les chemins suivants de sous-module contiennent des modifications\n"
"qui ne peuvent être trouvées sur aucun distant :\n"
-#: transport.c:1048
+#: transport.c:1161
#, c-format
msgid ""
"\n"
@@ -8468,212 +9217,31 @@
"pour les pousser vers un serveur distant.\n"
"\n"
-#: transport.c:1056
+#: transport.c:1169
msgid "Aborting."
msgstr "Abandon."
-#: transport.c:1201
+#: transport.c:1316
msgid "failed to push all needed submodules"
msgstr "échec de la poussée de tous les sous-modules nécessaires"
-#: transport.c:1345 transport-helper.c:657
-msgid "operation not supported by protocol"
-msgstr "option non supportée par le protocole"
-
-#: transport-helper.c:61 transport-helper.c:90
-msgid "full write to remote helper failed"
-msgstr "échec de l'écriture totale sur l'assistant distant"
-
-#: transport-helper.c:144
-#, c-format
-msgid "unable to find remote helper for '%s'"
-msgstr "Impossible de trouver un assistant distant pour '%s'"
-
-#: transport-helper.c:160 transport-helper.c:571
-msgid "can't dup helper output fd"
-msgstr ""
-"impossible de dupliquer le descripteur de flux de sortie de l'assistant"
-
-#: transport-helper.c:211
-#, c-format
-msgid ""
-"unknown mandatory capability %s; this remote helper probably needs newer "
-"version of Git"
-msgstr ""
-"capacité obligatoire inconnue %s ; cet assistant distant requiert "
-"probablement une une nouvelle version de Git"
-
-#: transport-helper.c:217
-msgid "this remote helper should implement refspec capability"
-msgstr "cet assistant distant devrait supporter la capacité refspec"
-
-#: transport-helper.c:284 transport-helper.c:425
-#, c-format
-msgid "%s unexpectedly said: '%s'"
-msgstr "%s a dit de manière inattendue : '%s'"
-
-#: transport-helper.c:414
-#, c-format
-msgid "%s also locked %s"
-msgstr "%s a aussi verrouillé %s"
-
-#: transport-helper.c:493
-msgid "couldn't run fast-import"
-msgstr "impossible de lancer fast-import"
-
-#: transport-helper.c:516
-msgid "error while running fast-import"
-msgstr "erreur au lancement de fast-import"
-
-#: transport-helper.c:545 transport-helper.c:1134
-#, c-format
-msgid "could not read ref %s"
-msgstr "impossible de lire la réf %s"
-
-#: transport-helper.c:590
-#, c-format
-msgid "unknown response to connect: %s"
-msgstr "réponse inconnue à connect : %s"
-
-#: transport-helper.c:612
-msgid "setting remote service path not supported by protocol"
-msgstr ""
-"la spécification du chemin de service distant n'est pas supportée par le "
-"protocole"
-
-#: transport-helper.c:614
-msgid "invalid remote service path"
-msgstr "chemin de service distant invalide"
-
-#: transport-helper.c:660
-#, c-format
-msgid "can't connect to subservice %s"
-msgstr "impossible de se connecter au sous-service %s"
-
-#: transport-helper.c:736
-#, c-format
-msgid "expected ok/error, helper said '%s'"
-msgstr "ok/error attendu, l'assistant a dit '%s'"
-
-#: transport-helper.c:789
-#, c-format
-msgid "helper reported unexpected status of %s"
-msgstr "l'assistant a renvoyé un statut de retour inattendu %s"
-
-#: transport-helper.c:850
-#, c-format
-msgid "helper %s does not support dry-run"
-msgstr "l'assistant %s ne gère pas dry-run"
-
-#: transport-helper.c:853
-#, c-format
-msgid "helper %s does not support --signed"
-msgstr "l'assistant %s ne gère pas --signed"
-
-#: transport-helper.c:856
-#, c-format
-msgid "helper %s does not support --signed=if-asked"
-msgstr "l'assistant %s ne gère pas --signed=if-asked"
-
-#: transport-helper.c:861
-#, c-format
-msgid "helper %s does not support --atomic"
-msgstr "l'assistant %s ne gère pas --atomic"
-
-#: transport-helper.c:867
-#, c-format
-msgid "helper %s does not support 'push-option'"
-msgstr "l'assistant %s ne gère pas 'push-option'"
-
-#: transport-helper.c:965
-msgid "remote-helper doesn't support push; refspec needed"
-msgstr ""
-"l'assistant %s ne gère pas push ; un spécificateur de référence est "
-"nécessaire"
-
-#: transport-helper.c:970
-#, c-format
-msgid "helper %s does not support 'force'"
-msgstr "l'assistant %s ne gère pas 'force'"
-
-#: transport-helper.c:1017
-msgid "couldn't run fast-export"
-msgstr "impossible de lancer fast-export"
-
-#: transport-helper.c:1022
-msgid "error while running fast-export"
-msgstr "erreur au lancement de fast-export"
-
-#: transport-helper.c:1047
-#, c-format
-msgid ""
-"No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch such as 'master'.\n"
-msgstr ""
-"Aucune référence en commun et aucune spécfiée ; rien à faire.\n"
-"Vous devriez peut-être spécifier une branche telle que 'master'.\n"
-
-#: transport-helper.c:1120
-#, c-format
-msgid "malformed response in ref list: %s"
-msgstr "réponse malformée dans le liste de réfs : %s"
-
-#: transport-helper.c:1272
-#, c-format
-msgid "read(%s) failed"
-msgstr "échec de read(%s)"
-
-#: transport-helper.c:1299
-#, c-format
-msgid "write(%s) failed"
-msgstr "échec de write(%s)"
-
-#: transport-helper.c:1348
-#, c-format
-msgid "%s thread failed"
-msgstr "échec du fil d'exécution %s"
-
-#: transport-helper.c:1352
-#, c-format
-msgid "%s thread failed to join: %s"
-msgstr "échec de jonction du fil d'exécution %s : %s"
-
-#: transport-helper.c:1371 transport-helper.c:1375
-#, c-format
-msgid "can't start thread for copying data: %s"
-msgstr "impossible de démarrer le fil d'exécution pour copier les données : %s"
-
-#: transport-helper.c:1412
-#, c-format
-msgid "%s process failed to wait"
-msgstr "échec du processus %s pour l'attente"
-
-#: transport-helper.c:1416
-#, c-format
-msgid "%s process failed"
-msgstr "échec du processus %s"
-
-#: transport-helper.c:1434 transport-helper.c:1443
-msgid "can't start thread for copying data"
-msgstr "impossible de démarrer le fil d'exécution pour copier les données"
-
-#: tree-walk.c:32
+#: tree-walk.c:33
msgid "too-short tree object"
msgstr "objet arbre trop court"
-#: tree-walk.c:38
+#: tree-walk.c:39
msgid "malformed mode in tree entry"
msgstr "mode invalide dans l'entrée d'arbre"
-#: tree-walk.c:42
+#: tree-walk.c:43
msgid "empty filename in tree entry"
msgstr "nom de fichier vide dans une entrée de l'arbre"
-#: tree-walk.c:117
+#: tree-walk.c:118
msgid "too-short tree file"
msgstr "fichier arbre trop court"
-#: unpack-trees.c:110
+#: unpack-trees.c:113
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -8684,7 +9252,7 @@
"%%sVeuillez valider ou remiser vos modifications avant de basculer de "
"branche."
-#: unpack-trees.c:112
+#: unpack-trees.c:115
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -8694,7 +9262,7 @@
"l'extraction :\n"
"%%s"
-#: unpack-trees.c:115
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -8704,7 +9272,7 @@
"fusion :\n"
"%%sVeuillez valider ou remiser vos modifications avant la fusion."
-#: unpack-trees.c:117
+#: unpack-trees.c:120
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -8714,7 +9282,7 @@
"fusion :\n"
"%%s"
-#: unpack-trees.c:120
+#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -8723,7 +9291,7 @@
"Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"
"%%sVeuillez valider ou remiser vos modifications avant %s."
-#: unpack-trees.c:122
+#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -8732,7 +9300,7 @@
"Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"
"%%s"
-#: unpack-trees.c:127
+#: unpack-trees.c:130
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -8742,7 +9310,7 @@
"contenus :\n"
"%s"
-#: unpack-trees.c:131
+#: unpack-trees.c:134
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -8752,7 +9320,7 @@
"l'extraction :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
-#: unpack-trees.c:133
+#: unpack-trees.c:136
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -8761,7 +9329,7 @@
"Les fichiers suivants non suivis seraient effacés par l'extraction :\n"
"%%s"
-#: unpack-trees.c:136
+#: unpack-trees.c:139
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -8771,7 +9339,7 @@
"la fusion :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
-#: unpack-trees.c:138
+#: unpack-trees.c:141
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -8780,7 +9348,7 @@
"Les fichiers suivants non suivis seraient effacés par la fusion :\n"
"%%s"
-#: unpack-trees.c:141
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -8790,7 +9358,7 @@
"%s :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant %s."
-#: unpack-trees.c:143
+#: unpack-trees.c:146
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -8799,7 +9367,7 @@
"Les fichiers suivants non suivis seraient effacés par %s :\n"
"%%s"
-#: unpack-trees.c:149
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -8810,7 +9378,7 @@
"l'extraction :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
-#: unpack-trees.c:151
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -8820,7 +9388,7 @@
"Les fichiers suivants non suivis seraient écrasés par l'extraction :\n"
"%%s"
-#: unpack-trees.c:154
+#: unpack-trees.c:157
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -8830,7 +9398,7 @@
"la fusion :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
-#: unpack-trees.c:156
+#: unpack-trees.c:159
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -8839,7 +9407,7 @@
"Les fichiers suivants non suivis seraient écrasés par la fusion :\n"
"%%s"
-#: unpack-trees.c:159
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -8849,7 +9417,7 @@
"%s :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant %s."
-#: unpack-trees.c:161
+#: unpack-trees.c:164
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -8858,44 +9426,12 @@
"Les fichiers suivants non suivis seraient écrasés par %s :\n"
"%%s"
-#: unpack-trees.c:169
+#: 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:172
-#, c-format
-msgid ""
-"Cannot update sparse checkout: the following entries are not up to date:\n"
-"%s"
-msgstr ""
-"Mise à jour d'extraction creuse impossible : les entrées suivantes ne sont "
-"pas à jour :\n"
-"%s"
-
-#: unpack-trees.c:174
-#, c-format
-msgid ""
-"The following working tree files would be overwritten by sparse checkout "
-"update:\n"
-"%s"
-msgstr ""
-"Les fichiers suivants de la copie de travail seraient écrasés par la mise à "
-"jour par l'extraction creuse :\n"
-"%s"
-
-#: unpack-trees.c:176
-#, c-format
-msgid ""
-"The following working tree files would be removed by sparse checkout "
-"update:\n"
-"%s"
-msgstr ""
-"Les fichiers suivants de la copie de travail seraient supprimés par la mise "
-"à jour par extraction creuse :\n"
-"%s"
-
-#: unpack-trees.c:178
+#: unpack-trees.c:175
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -8904,16 +9440,57 @@
"Mise à jour impossible pour le sous-module :\n"
"%s"
-#: unpack-trees.c:255
+#: unpack-trees.c:178
+#, c-format
+msgid ""
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+"Les chemins suivants ne sont pas à jour et ont été laissés malgré les motifs "
+"clairsemés :\n"
+"%s"
+
+#: unpack-trees.c:180
+#, c-format
+msgid ""
+"The following paths are unmerged and were left despite sparse patterns:\n"
+"%s"
+msgstr ""
+"Les chemins suivants ne sont pas fusionnés et ont été laissés malgré les "
+"motifs clairsemés :\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 ""
+"Les chemins suivants étaient déjà présents et ont été laissés malgré les "
+"motifs clairsemés :\n"
+"%s"
+
+#: unpack-trees.c:262
#, c-format
msgid "Aborting\n"
msgstr "Abandon\n"
-#: unpack-trees.c:317
+#: 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:349
+#: 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"
@@ -8923,10 +9500,14 @@
"sensibles à la casse dans une système de fichier insensible) et un\n"
"seul du groupe en collision est dans l'arbre de travail :\n"
-#: unpack-trees.c:1445
+#: unpack-trees.c:1498
msgid "Updating index flags"
msgstr "Mise à jour des drapeaux de l'index"
+#: upload-pack.c:1543
+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"
@@ -8960,30 +9541,30 @@
msgid "Fetching objects"
msgstr "Récupération des objets"
-#: worktree.c:259 builtin/am.c:2099
+#: worktree.c:238 builtin/am.c:2103
#, c-format
msgid "failed to read '%s'"
msgstr "échec de la lecture de '%s'"
-#: worktree.c:305
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr ""
"'%s' dans l'arbre de travail principal n'est pas le répertoire de dépôt"
-#: worktree.c:316
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
"le fichier '%s' ne contient pas de chemin absolu à l'emplacement de l'arbre "
"de travail"
-#: worktree.c:328
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' n'existe pas"
-#: worktree.c:334
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "'%s' n'est pas un fichier .git, code d'erreur %d"
@@ -8993,17 +9574,85 @@
msgid "'%s' does not point back to '%s'"
msgstr "'%s' ne pointe pas en retour sur '%s'"
-#: wrapper.c:186 wrapper.c:356
+#: worktree.c:608
+msgid "not a directory"
+msgstr "pas un répertoire"
+
+#: worktree.c:617
+msgid ".git is not a file"
+msgstr ".git n'est pas un fichier"
+
+#: worktree.c:619
+msgid ".git file broken"
+msgstr "fichier .git cassé"
+
+#: worktree.c:621
+msgid ".git file incorrect"
+msgstr "fichier .git incorrect"
+
+#: worktree.c:727
+msgid "not a valid path"
+msgstr "pas un chemin valide"
+
+#: worktree.c:733
+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:737
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr ""
+"impossible de localiser le dépôt ; .git ne fait pas référence à un dépôt"
+
+#: worktree.c:741
+msgid "unable to locate repository; .git file broken"
+msgstr "impossible de localiser le dépôt ; fichier .git cassé"
+
+#: worktree.c:747
+msgid "gitdir unreadable"
+msgstr "gitdir non lisible"
+
+#: worktree.c:751
+msgid "gitdir incorrect"
+msgstr "gitdir incorrect"
+
+#: worktree.c:776
+msgid "not a valid directory"
+msgstr "pas un répertoire valide"
+
+#: worktree.c:782
+msgid "gitdir file does not exist"
+msgstr "le fichier gitdir n'existe pas"
+
+#: worktree.c:787 worktree.c:796
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "impossible de lire le fichier gitdir (%s)"
+
+#: worktree.c:806
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr ""
+"lecture trop courte ( %<PRIuMAX> octets attendus, %<PRIuMAX> octets lus)"
+
+#: worktree.c:814
+msgid "invalid gitdir file"
+msgstr "fichier gitdir invalide"
+
+#: worktree.c:822
+msgid "gitdir file points to non-existent location"
+msgstr "le fichier gitdir pointe sur un endroit inexistant"
+
+#: 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:387 wrapper.c:588
+#: wrapper.c:398 wrapper.c:599
#, c-format
msgid "unable to access '%s'"
msgstr "impossible d'accéder à '%s'"
-#: wrapper.c:596
+#: wrapper.c:607
msgid "unable to get current working directory"
msgstr "impossible d'accéder au répertoire de travail courant"
@@ -9040,11 +9689,11 @@
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:1072
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:1081
msgid "Changes not staged for commit:"
msgstr "Modifications qui ne seront pas validées :"
@@ -9077,94 +9726,94 @@
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:905
#, 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:936
msgid "Submodules changed but not updated:"
msgstr "Sous-modules modifiés mais non mis à jour :"
-#: wt-status.c:940
+#: wt-status.c:938
msgid "Submodule changes to be committed:"
msgstr "Changements du sous-module à valider :"
-#: wt-status.c:1022
+#: wt-status.c:1020
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
@@ -9172,7 +9821,7 @@
"Ne touchez pas à la ligne ci-dessus.\n"
"Tout ce qui suit sera éliminé."
-#: wt-status.c:1114
+#: wt-status.c:1112
#, c-format
msgid ""
"\n"
@@ -9184,107 +9833,107 @@
"de la branche.\n"
"Vous pouvez utiliser '--no-ahead-behind' pour éviter ceci.\n"
-#: wt-status.c:1144
+#: wt-status.c:1142
msgid "You have unmerged paths."
msgstr "Vous avez des chemins non fusionnés."
-#: wt-status.c:1147
+#: wt-status.c:1145
msgid " (fix conflicts and run \"git commit\")"
msgstr " (réglez les conflits puis lancez \"git commit\")"
-#: wt-status.c:1149
+#: wt-status.c:1147
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:1151
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:1154
msgid " (use \"git commit\" to conclude merge)"
msgstr " (utilisez \"git commit\" pour terminer la fusion)"
-#: wt-status.c:1165
+#: wt-status.c:1163
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:1166
msgid "The current patch is empty."
msgstr "Le patch actuel est vide."
-#: wt-status.c:1172
+#: wt-status.c:1170
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:1172
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:1174
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:1307
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo est manquant."
-#: wt-status.c:1311
+#: wt-status.c:1309
msgid "No commands done."
msgstr "Aucune commande réalisée."
-#: 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] "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:1323
#, c-format
msgid " (see more in file %s)"
msgstr " (voir plus dans le fichier %s)"
-#: wt-status.c:1330
+#: wt-status.c:1328
msgid "No commands remaining."
msgstr "Aucune commande restante."
-#: 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] "Prochaine commande à effectuer (%d commande restante) :"
msgstr[1] "Prochaines commandes à effectuer (%d commandes restantes) :"
-#: wt-status.c:1341
+#: wt-status.c:1339
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:1351
#, 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:1356
msgid "You are currently rebasing."
msgstr "Vous êtes en train de rebaser."
-#: wt-status.c:1371
+#: wt-status.c:1369
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:1371
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:1373
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:1380
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:1384
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -9292,144 +9941,159 @@
"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:1389
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:1392
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:1396
#, 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:1401
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:1404
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:1406
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:1417
msgid "Cherry-pick currently in progress."
msgstr "Picorage en cours."
-#: wt-status.c:1422
+#: wt-status.c:1420
#, 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:1427
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:1430
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (lancez \"git cherry-pick --continue\" pour continuer)"
-#: wt-status.c:1435
+#: wt-status.c:1433
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:1435
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
msgstr " (utilisez \"git cherry-pick --skip\" pour sauter ce patch)"
-#: wt-status.c:1439
+#: wt-status.c:1437
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " (utilisez \"git cherry-pick --abort\" pour annuler le picorage)"
-#: wt-status.c:1449
+#: wt-status.c:1447
msgid "Revert currently in progress."
msgstr "Rétablissement en cours."
-#: wt-status.c:1452
+#: wt-status.c:1450
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Vous êtes actuellement en train de rétablir le commit %s."
-#: wt-status.c:1458
+#: wt-status.c:1456
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (réglez les conflits puis lancez \"git revert --continue\")"
-#: wt-status.c:1461
+#: wt-status.c:1459
msgid " (run \"git revert --continue\" to continue)"
msgstr " (lancez \"git revert --continue\" pour continuer)"
-#: wt-status.c:1464
+#: wt-status.c:1462
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")"
-#: wt-status.c:1466
+#: wt-status.c:1464
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr " (utilisez \"git revert --skip\" pour sauter ce patch)"
-#: wt-status.c:1468
+#: wt-status.c:1466
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)"
-#: wt-status.c:1478
+#: wt-status.c:1476
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Vous êtes en cours de bissection, depuis la branche '%s'."
-#: wt-status.c:1482
+#: wt-status.c:1480
msgid "You are currently bisecting."
msgstr "Vous êtes en cours de bissection."
-#: wt-status.c:1485
+#: wt-status.c:1483
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (utilisez \"git bisect reset\" pour revenir à la branche d'origine)"
-#: wt-status.c:1694
+#: wt-status.c:1494
+#, 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:1733
msgid "On branch "
msgstr "Sur la branche "
-#: wt-status.c:1701
+#: wt-status.c:1740
msgid "interactive rebase in progress; onto "
msgstr "rebasage interactif en cours ; sur "
-#: wt-status.c:1703
+#: wt-status.c:1742
msgid "rebase in progress; onto "
msgstr "rebasage en cours ; sur "
-#: wt-status.c:1713
+#: wt-status.c:1747
+msgid "HEAD detached at "
+msgstr "HEAD détachée sur "
+
+#: wt-status.c:1749
+msgid "HEAD detached from "
+msgstr "HEAD détachée depuis "
+
+#: wt-status.c:1752
msgid "Not currently on any branch."
msgstr "Actuellement sur aucun branche."
-#: wt-status.c:1730
+#: wt-status.c:1769
msgid "Initial commit"
msgstr "Validation initiale"
-#: wt-status.c:1731
+#: wt-status.c:1770
msgid "No commits yet"
msgstr "Aucun commit"
-#: wt-status.c:1745
+#: wt-status.c:1784
msgid "Untracked files"
msgstr "Fichiers non suivis"
-#: wt-status.c:1747
+#: wt-status.c:1786
msgid "Ignored files"
msgstr "Fichiers ignorés"
-#: wt-status.c:1751
+#: wt-status.c:1790
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -9441,32 +10105,32 @@
"oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help "
"status')."
-#: wt-status.c:1757
+#: wt-status.c:1796
#, c-format
msgid "Untracked files not listed%s"
msgstr "Fichiers non suivis non affichés%s"
-#: wt-status.c:1759
+#: wt-status.c:1798
msgid " (use -u option to show untracked files)"
msgstr " (utilisez -u pour afficher les fichiers non suivis)"
-#: wt-status.c:1765
+#: wt-status.c:1804
msgid "No changes"
msgstr "Aucune modification"
-#: wt-status.c:1770
+#: wt-status.c:1809
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou "
"\"git commit -a\")\n"
-#: wt-status.c:1773
+#: wt-status.c:1813
#, c-format
msgid "no changes added to commit\n"
msgstr "aucune modification ajoutée à la validation\n"
-#: wt-status.c:1776
+#: wt-status.c:1817
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -9475,71 +10139,71 @@
"aucune modification ajoutée à la validation mais des fichiers non suivis "
"sont présents (utilisez \"git add\" pour les suivre)\n"
-#: wt-status.c:1779
+#: wt-status.c:1821
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
"aucune modification ajoutée à la validation mais des fichiers non suivis "
"sont présents\n"
-#: wt-status.c:1782
+#: wt-status.c:1825
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les "
"suivre)\n"
-#: wt-status.c:1785 wt-status.c:1790
+#: wt-status.c:1829 wt-status.c:1835
#, c-format
msgid "nothing to commit\n"
msgstr "rien à valider\n"
-#: wt-status.c:1788
+#: wt-status.c:1832
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "rien à valider (utilisez -u pour afficher les fichiers non suivis)\n"
-#: wt-status.c:1792
+#: wt-status.c:1837
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "rien à valider, la copie de travail est propre\n"
-#: wt-status.c:1905
+#: wt-status.c:1942
msgid "No commits yet on "
msgstr "Encore aucun commit sur "
-#: wt-status.c:1909
+#: wt-status.c:1946
msgid "HEAD (no branch)"
msgstr "HEAD (aucune branche)"
-#: wt-status.c:1940
+#: wt-status.c:1977
msgid "different"
msgstr "différent"
-#: wt-status.c:1942 wt-status.c:1950
+#: wt-status.c:1979 wt-status.c:1987
msgid "behind "
msgstr "derrière "
-#: wt-status.c:1945 wt-status.c:1948
+#: wt-status.c:1982 wt-status.c:1985
msgid "ahead "
msgstr "devant "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2470
+#: wt-status.c:2507
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "Impossible de %s : vous avez des modifications non indexées."
-#: wt-status.c:2476
+#: wt-status.c:2513
msgid "additionally, your index contains uncommitted changes."
msgstr "de plus, votre index contient des modifications non validées."
-#: wt-status.c:2478
+#: wt-status.c:2515
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "%s impossible : votre index contient des modifications non validées."
-#: compat/precompose_utf8.c:58 builtin/clone.c:455
+#: compat/precompose_utf8.c:58 builtin/clone.c:457
#, c-format
msgid "failed to unlink '%s'"
msgstr "échec pour délier '%s'"
@@ -9548,131 +10212,136 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<options>] [--] <chemin>..."
-#: builtin/add.c:88
+#: builtin/add.c:58
+#, c-format
+msgid "cannot chmod %cx '%s'"
+msgstr "impossible de chmod %cx '%s'"
+
+#: builtin/add.c:96
#, c-format
msgid "unexpected diff status %c"
msgstr "état de diff inattendu %c"
-#: builtin/add.c:93 builtin/commit.c:288
+#: builtin/add.c:101 builtin/commit.c:285
msgid "updating files failed"
msgstr "échec de la mise à jour des fichiers"
-#: builtin/add.c:103
+#: builtin/add.c:111
#, c-format
msgid "remove '%s'\n"
msgstr "suppression de '%s'\n"
-#: builtin/add.c:178
+#: builtin/add.c:186
msgid "Unstaged changes after refreshing the index:"
msgstr "Modifications non indexées après rafraîchissement de l'index :"
-#: builtin/add.c:266 builtin/rev-parse.c:899
+#: builtin/add.c:280 builtin/rev-parse.c:991
msgid "Could not read the index"
msgstr "Impossible de lire l'index"
-#: builtin/add.c:277
+#: builtin/add.c:291
#, c-format
msgid "Could not open '%s' for writing."
msgstr "Impossible d'ouvrir '%s' en écriture."
-#: builtin/add.c:281
+#: builtin/add.c:295
msgid "Could not write patch"
msgstr "Impossible d'écrire le patch"
-#: builtin/add.c:284
+#: builtin/add.c:298
msgid "editing patch failed"
msgstr "échec de l'édition du patch"
-#: builtin/add.c:287
+#: builtin/add.c:301
#, c-format
msgid "Could not stat '%s'"
msgstr "Stat de '%s' impossible"
-#: builtin/add.c:289
+#: builtin/add.c:303
msgid "Empty patch. Aborted."
msgstr "Patch vide. Abandon."
-#: builtin/add.c:294
+#: builtin/add.c:308
#, c-format
msgid "Could not apply '%s'"
msgstr "Impossible d'appliquer '%s'"
-#: builtin/add.c:302
+#: builtin/add.c:316
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n"
-#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548
-#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
+#: builtin/add.c:336 builtin/clean.c:904 builtin/fetch.c:169 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559
+#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190
msgid "dry run"
msgstr "simuler l'action"
-#: builtin/add.c:325
+#: builtin/add.c:339
msgid "interactive picking"
msgstr "sélection interactive"
-#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307
+#: builtin/add.c:340 builtin/checkout.c:1546 builtin/reset.c:308
msgid "select hunks interactively"
msgstr "sélection interactive des sections"
-#: builtin/add.c:327
+#: builtin/add.c:341
msgid "edit current diff and apply"
msgstr "édition du diff actuel et application"
-#: builtin/add.c:328
+#: builtin/add.c:342
msgid "allow adding otherwise ignored files"
msgstr "permettre l'ajout de fichiers ignorés"
-#: builtin/add.c:329
+#: builtin/add.c:343
msgid "update tracked files"
msgstr "mettre à jour les fichiers suivis"
-#: builtin/add.c:330
+#: builtin/add.c:344
msgid "renormalize EOL of tracked files (implies -u)"
msgstr ""
"renormaliser les fins de lignes (EOL) des fichiers suivis (implique -u)"
-#: builtin/add.c:331
+#: builtin/add.c:345
msgid "record only the fact that the path will be added later"
msgstr "enregistrer seulement le fait que le chemin sera ajouté plus tard"
-#: builtin/add.c:332
+#: builtin/add.c:346
msgid "add changes from all tracked and untracked files"
msgstr "ajouter les modifications de tous les fichiers suivis et non suivis"
-#: builtin/add.c:335
+#: builtin/add.c:349
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
"ignorer les chemins effacés dans la copie de travail (identique à --no-all)"
-#: builtin/add.c:337
+#: builtin/add.c:351
msgid "don't add, only refresh the index"
msgstr "ne pas ajouter, juste rafraîchir l'index"
-#: builtin/add.c:338
+#: builtin/add.c:352
msgid "just skip files which cannot be added because of errors"
msgstr ""
"sauter seulement les fichiers qui ne peuvent pas être ajoutés du fait "
"d'erreurs"
-#: builtin/add.c:339
+#: builtin/add.c:353
msgid "check if - even missing - files are ignored in dry run"
msgstr "vérifier si des fichiers - même manquants - sont ignorés, à vide"
-#: builtin/add.c:341 builtin/update-index.c:1004
+#: builtin/add.c:355 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:343
+#: builtin/add.c:357
msgid "warn when adding an embedded repository"
msgstr "avertir lors de l'ajout d'un dépôt embarqué"
-#: builtin/add.c:345
+#: builtin/add.c:359
msgid "backend for `git stash -p`"
msgstr "backend pour `git stash -p`"
-#: builtin/add.c:363
+#: builtin/add.c:377
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -9703,12 +10372,12 @@
"\n"
"Référez-vous à \"git help submodule\" pour plus d'information."
-#: builtin/add.c:391
+#: builtin/add.c:405
#, c-format
msgid "adding embedded git repository: %s"
msgstr "dépôt git embarqué ajouté : %s"
-#: builtin/add.c:410
+#: builtin/add.c:424
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
@@ -9718,48 +10387,48 @@
"Éliminez ce message en lançant\n"
"\"git config advice.addIgnoredFile false\""
-#: builtin/add.c:419
+#: builtin/add.c:433
msgid "adding files failed"
msgstr "échec de l'ajout de fichiers"
-#: builtin/add.c:447 builtin/commit.c:348
+#: builtin/add.c:461 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:464
+#: builtin/add.c:478
msgid "--pathspec-from-file is incompatible with --edit"
msgstr "--pathspec-from-file est incompatible avec --edit"
-#: builtin/add.c:476
+#: builtin/add.c:490
msgid "-A and -u are mutually incompatible"
msgstr "-A et -u sont mutuellement incompatibles"
-#: builtin/add.c:479
+#: builtin/add.c:493
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
"L'option --ignore-missing ne peut être utilisée qu'en complément de --dry-run"
-#: builtin/add.c:483
+#: builtin/add.c:497
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "Le paramètre '%s' de --chmod doit être soit -x soit +x"
-#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354
-#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509
+#: builtin/add.c:515 builtin/checkout.c:1714 builtin/commit.c:351
+#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1569
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr "--pathspec-from-file est incompatible avec pathspec arguments"
-#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360
-#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515
+#: builtin/add.c:522 builtin/checkout.c:1726 builtin/commit.c:357
+#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1575
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr "--pathspec-file-nul nécessite --pathspec-from-file"
-#: builtin/add.c:512
+#: builtin/add.c:526
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Rien de spécifié, rien n'a été ajouté.\n"
-#: builtin/add.c:514
+#: builtin/add.c:528
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
@@ -9817,7 +10486,7 @@
msgid "Patch format detection failed."
msgstr "Échec de détection du format du patch."
-#: builtin/am.c:953 builtin/clone.c:409
+#: builtin/am.c:953 builtin/clone.c:410
#, c-format
msgid "failed to create directory '%s'"
msgstr "échec de la création du répertoire '%s'"
@@ -9894,12 +10563,12 @@
msgid "applying to an empty history"
msgstr "application à un historique vide"
-#: builtin/am.c:1621 builtin/am.c:1625
+#: builtin/am.c:1626 builtin/am.c:1630
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "impossible de continuer : %s n'existe pas."
-#: builtin/am.c:1643
+#: builtin/am.c:1648
msgid "Commit Body is:"
msgstr "Le corps de la validation est :"
@@ -9907,39 +10576,40 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1653
+#: builtin/am.c:1658
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "Appliquer ? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all : "
-#: builtin/am.c:1700 builtin/commit.c:398
+#: builtin/am.c:1704 builtin/commit.c:395
msgid "unable to write index file"
msgstr "impossible d'écrire le fichier d'index"
-#: builtin/am.c:1704
+#: builtin/am.c:1708
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"
-#: builtin/am.c:1744 builtin/am.c:1812
+#: builtin/am.c:1748 builtin/am.c:1816
#, c-format
msgid "Applying: %.*s"
msgstr "Application de %.*s"
-#: builtin/am.c:1761
+#: builtin/am.c:1765
msgid "No changes -- Patch already applied."
msgstr "Pas de changement -- Patch déjà appliqué."
-#: builtin/am.c:1767
+#: builtin/am.c:1771
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "le patch a échoué à %s %.*s"
-#: builtin/am.c:1771
+#: builtin/am.c:1775
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
-msgstr "Utilisez 'git am --show-current-patch=diff' pour visualiser le patch en échec"
+msgstr ""
+"Utilisez 'git am --show-current-patch=diff' pour visualiser le patch en échec"
-#: builtin/am.c:1815
+#: builtin/am.c:1819
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -9950,7 +10620,7 @@
"introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "
"patch."
-#: builtin/am.c:1822
+#: builtin/am.c:1826
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -9963,17 +10633,17 @@
"Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour "
"accepter son état."
-#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346
-#: builtin/reset.c:354
+#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 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:1981
+#: builtin/am.c:1985
msgid "failed to clean index"
msgstr "échec du nettoyage de l'index"
-#: builtin/am.c:2025
+#: builtin/am.c:2029
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -9981,155 +10651,156 @@
"Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"
"Pas de retour à ORIG_HEAD"
-#: builtin/am.c:2132
+#: builtin/am.c:2136
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valeur invalide pour --patch-format : %s"
-#: builtin/am.c:2172
+#: builtin/am.c:2178
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr "Valeur invalide pour --show-current-patch : %s"
-#: builtin/am.c:2176
+#: builtin/am.c:2182
#, c-format
msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
msgstr "--show-current-patch=%s est incompatible avec --show-current-patch=%s"
-#: builtin/am.c:2207
+#: builtin/am.c:2213
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<options>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2208
+#: builtin/am.c:2214
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<options>] (--continue | --skip | --abort)"
-#: builtin/am.c:2214
+#: builtin/am.c:2220
msgid "run interactively"
msgstr "exécution interactive"
-#: builtin/am.c:2216
+#: builtin/am.c:2222
msgid "historical option -- no-op"
msgstr "option historique -- no-op"
-#: builtin/am.c:2218
+#: builtin/am.c:2224
msgid "allow fall back on 3way merging if needed"
msgstr "permettre de revenir à une fusion à 3 points si nécessaire"
-#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:304 builtin/stash.c:812
+#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16
+#: builtin/repack.c:334 builtin/stash.c:882
msgid "be quiet"
msgstr "être silencieux"
-#: builtin/am.c:2221
-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:2227
+msgid "add a Signed-off-by trailer to the commit message"
+msgstr "ajouter une ligne terminale Signed-off-by au message de validation"
-#: builtin/am.c:2224
+#: builtin/am.c:2230
msgid "recode into utf8 (default)"
msgstr "recoder en utf-8 (par défaut)"
-#: builtin/am.c:2226
+#: builtin/am.c:2232
msgid "pass -k flag to git-mailinfo"
msgstr "passer l'option -k à git-mailinfo"
-#: builtin/am.c:2228
+#: builtin/am.c:2234
msgid "pass -b flag to git-mailinfo"
msgstr "passer l'option -b à git-mailinfo"
-#: builtin/am.c:2230
+#: builtin/am.c:2236
msgid "pass -m flag to git-mailinfo"
msgstr "passer l'option -m à git-mailinfo"
-#: builtin/am.c:2232
+#: builtin/am.c:2238
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "passer l'option --keep-cr à git-mailsplit fpour le format mbox"
-#: builtin/am.c:2235
+#: builtin/am.c:2241
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr"
-#: builtin/am.c:2238
+#: builtin/am.c:2244
msgid "strip everything before a scissors line"
msgstr "retirer tout le contenu avant la ligne des ciseaux"
-#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249
-#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261
-#: builtin/am.c:2267
+#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
+#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
+#: builtin/am.c:2273
msgid "pass it through git-apply"
msgstr "le passer jusqu'à git-apply"
-#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670
-#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250
-#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505
-#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321
-#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:154 parse-options.h:175 parse-options.h:316
+#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:904 builtin/merge.c:261
+#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
+#: builtin/rebase.c:1347 builtin/repack.c:345 builtin/repack.c:349
+#: builtin/repack.c:351 builtin/show-branch.c:650 builtin/show-ref.c:172
+#: builtin/tag.c:436 parse-options.h:154 parse-options.h:175
+#: parse-options.h:316
msgid "n"
msgstr "n"
-#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38
+#: builtin/am.c:2269 builtin/branch.c:670 builtin/bugreport.c:136
+#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:470
+#: builtin/verify-tag.c:38
msgid "format"
msgstr "format"
-#: builtin/am.c:2264
+#: builtin/am.c:2270
msgid "format the patch(es) are in"
msgstr "format de présentation des patchs"
-#: builtin/am.c:2270
+#: builtin/am.c:2276
msgid "override error message when patch failure occurs"
msgstr "surcharger le message d'erreur lors d'un échec d'application de patch"
-#: builtin/am.c:2272
+#: builtin/am.c:2278
msgid "continue applying patches after resolving a conflict"
msgstr "continuer à appliquer les patchs après résolution d'un conflit"
-#: builtin/am.c:2275
+#: builtin/am.c:2281
msgid "synonyms for --continue"
msgstr "synonymes de --continue"
-#: builtin/am.c:2278
+#: builtin/am.c:2284
msgid "skip the current patch"
msgstr "sauter le patch courant"
-#: builtin/am.c:2281
-msgid "restore the original branch and abort the patching operation."
-msgstr ""
-"restaurer la branche originale et abandonner les applications de patch."
+#: builtin/am.c:2287
+msgid "restore the original branch and abort the patching operation"
+msgstr "restaurer la branche originale et abandonner les applications de patch"
-#: builtin/am.c:2284
-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:2290
+msgid "abort the patching operation but keep HEAD where it is"
+msgstr "abandonne l'opération de patch mais garde HEAD où il est"
-#: builtin/am.c:2288
+#: builtin/am.c:2294
msgid "show the patch being applied"
msgstr "afficher le patch en cours d'application"
-#: builtin/am.c:2293
+#: builtin/am.c:2299
msgid "lie about committer date"
msgstr "mentir sur la date de validation"
-#: builtin/am.c:2295
+#: builtin/am.c:2301
msgid "use current timestamp for author date"
msgstr "utiliser l'horodatage actuel pour la date d'auteur"
-#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512
-#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517
-#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418
+#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515
+#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:538
+#: builtin/rebase.c:1400 builtin/revert.c:117 builtin/tag.c:451
msgid "key-id"
msgstr "id-clé"
-#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
+#: builtin/am.c:2304 builtin/rebase.c:539 builtin/rebase.c:1401
msgid "GPG-sign commits"
msgstr "signer les commits avec GPG"
-#: builtin/am.c:2301
+#: builtin/am.c:2307
msgid "(internal use for git-rebase)"
msgstr "(utilisation interne pour git-rebase)"
-#: builtin/am.c:2319
+#: builtin/am.c:2325
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
@@ -10137,17 +10808,17 @@
"L'option -b/--binary ne fait plus rien depuis longtemps,\n"
"et elle sera supprimée. Veuillez ne plus l'utiliser."
-#: builtin/am.c:2326
+#: builtin/am.c:2332
msgid "failed to read the index"
msgstr "échec à la lecture de l'index"
-#: builtin/am.c:2341
+#: builtin/am.c:2347
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
"le répertoire précédent de rebasage %s existe toujours mais mbox donnée."
-#: builtin/am.c:2365
+#: builtin/am.c:2371
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -10156,13 +10827,13 @@
"Répertoire abandonné %s trouvé.\n"
"Utilisez \"git am --abort\" pour le supprimer."
-#: builtin/am.c:2371
+#: builtin/am.c:2377
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
"Pas de résolution de l'opération en cours, nous ne sommes pas dans une "
"reprise."
-#: builtin/am.c:2381
+#: builtin/am.c:2387
msgid "interactive mode requires patches on the command line"
msgstr "le mode interactif requiert des rustines sur la ligne de commande"
@@ -10200,45 +10871,17 @@
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 --write-terms <bad_term> <good_term>"
-msgstr "git bisect--helper --write-terms <terme-pour-mauvais> <terme-pour-bon>"
-
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-clean-state"
-msgstr "git bisect--helper --bisect-clean-state"
-
-#: builtin/bisect--helper.c:25
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --bisect-reset [<commit>]"
-#: builtin/bisect--helper.c:26
-msgid ""
-"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
-"<bad_term>"
-msgstr ""
-"git bisect--helper --bisect-write [--no-log] <état> <révision> <terme-pour-"
-"bon> <terme-pour-mauvais>"
-
-#: builtin/bisect--helper.c:27
-msgid ""
-"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
-"<bad_term>"
-msgstr ""
-"git bisect--helper --bisect-check-and-set-terms <commande> <terme-pour-bon> "
-"<terme-pour-mauvais>"
-
-#: builtin/bisect--helper.c:28
+#: builtin/bisect--helper.c:24
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:25
msgid ""
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
"term-new]"
@@ -10246,48 +10889,76 @@
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
"term-new]"
+#: builtin/bisect--helper.c:26
+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}=<terme> --term-{old,good}"
+"=<terme>][--no-checkout] [--first-parent] [<mauvais> [<bon>...]] [--] "
+"[<chemins>...]"
+
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next"
+msgstr "git bisect--helper --bisect-next"
+
+#: builtin/bisect--helper.c:29
+msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
+msgstr "git bisect--helper --bisect-reset (bad|new) [<rév>]"
+
#: builtin/bisect--helper.c:30
-msgid ""
-"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
-"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
-msgstr ""
-"git bisect--helper --bisect-start [--term-{old,good}=<terme> --term-{new,bad}"
-"=<terme>][--no-checkout] [<mauvais> [<bon>...]] [--] [<chemins>...]"
+msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
+msgstr "git bisect--helper --bisect-reset (good|old) [<rév>...]"
-#: builtin/bisect--helper.c:86
+#: builtin/bisect--helper.c:31
+msgid "git bisect--helper --bisect-replay <filename>"
+msgstr "git bisect--helper --bisect-next <nom-de-fichier>"
+
+#: builtin/bisect--helper.c:32
+msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
+msgstr "git bisect--helper --bisect-skip [(<rév>|<plage>)...]"
+
+#: builtin/bisect--helper.c:107
+#, c-format
+msgid "cannot open file '%s' in mode '%s'"
+msgstr "impossible d'ouvrir le fichier '%s' en mode '%s'"
+
+#: builtin/bisect--helper.c:114
+#, c-format
+msgid "could not write to file '%s'"
+msgstr "impossible d'écrire le fichier '%s'"
+
+#: builtin/bisect--helper.c:153
#, 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:157
#, 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:167
#, 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:177
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:193
#, c-format
msgid "We are not bisecting.\n"
msgstr "Pas de bissection en cours.\n"
-#: builtin/bisect--helper.c:163
+#: builtin/bisect--helper.c:201
#, c-format
msgid "'%s' is not a valid commit"
msgstr "'%s' n'est pas un commit valide"
-#: builtin/bisect--helper.c:172
+#: builtin/bisect--helper.c:210
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -10295,27 +10966,27 @@
"Échec d'extraction de la HEAD d'origine '%s'. Essayez 'git bisect reset "
"<commit>'."
-#: builtin/bisect--helper.c:216
+#: builtin/bisect--helper.c:254
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr "Mauvais argument pour bisect_write : %s"
-#: builtin/bisect--helper.c:221
+#: builtin/bisect--helper.c:259
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "impossible d'obtenir l'oid de la révision '%s'"
-#: builtin/bisect--helper.c:233
+#: builtin/bisect--helper.c:271
#, c-format
msgid "couldn't open the file '%s'"
msgstr "impossible d'ouvrir le fichier '%s'"
-#: builtin/bisect--helper.c:259
+#: builtin/bisect--helper.c:297
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr "Commande invalide : vous êtes actuellement dans une bissection %s/%s"
-#: builtin/bisect--helper.c:286
+#: builtin/bisect--helper.c:324
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
@@ -10324,7 +10995,7 @@
"Vous devez me donner au moins une révision %s et une révision %s.\n"
"Vous pouvez utiliser \"git bisect %s\" et \"git bisect %s\" pour cela."
-#: builtin/bisect--helper.c:290
+#: builtin/bisect--helper.c:328
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -10335,7 +11006,7 @@
"Puis vous devez me donner au moins une révision %s et une révision %s.\n"
"Vous pouvez utiliser \"git bisect %s\" et \"git bisect %s\" pour cela."
-#: builtin/bisect--helper.c:310
+#: builtin/bisect--helper.c:348
#, c-format
msgid "bisecting only with a %s commit"
msgstr "Attention : bissection avec seulement une validation %s"
@@ -10344,15 +11015,15 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:318
+#: builtin/bisect--helper.c:356
msgid "Are you sure [Y/n]? "
msgstr "Confirmez-vous [Y/n] ? "
-#: builtin/bisect--helper.c:379
+#: builtin/bisect--helper.c:417
msgid "no terms defined"
msgstr "aucun terme défini"
-#: builtin/bisect--helper.c:382
+#: builtin/bisect--helper.c:420
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
@@ -10361,7 +11032,7 @@
"Vos termes actuels sont %s pour l'état ancien\n"
"et %s pour le nouvel état.\n"
-#: builtin/bisect--helper.c:392
+#: builtin/bisect--helper.c:430
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
@@ -10371,270 +11042,317 @@
"Les options supportées sont : --term-good|--term-old et --term-bad|--term-"
"new."
-#: builtin/bisect--helper.c:478
+#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1014
+msgid "revision walk setup failed\n"
+msgstr "échec de la préparation du parcours des révisions\n"
+
+#: builtin/bisect--helper.c:519
+#, c-format
+msgid "could not open '%s' for appending"
+msgstr "impossible d'ouvrir '%s' en ajout"
+
+#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651
+msgid "'' is not a valid term"
+msgstr "'' n'est pas un terme valide"
+
+#: builtin/bisect--helper.c:661
#, c-format
msgid "unrecognized option: '%s'"
-msgstr "option non reconnue : %s"
+msgstr "option non reconnue : '%s'"
-#: builtin/bisect--helper.c:482
+#: builtin/bisect--helper.c:665
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "'%s' ne semble être une révision valide"
-#: builtin/bisect--helper.c:514
+#: builtin/bisect--helper.c:696
msgid "bad HEAD - I need a HEAD"
msgstr "mauvaise HEAD - j'ai besoin d'une HEAD"
-#: builtin/bisect--helper.c:529
+#: builtin/bisect--helper.c:711
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr ""
"L'extraction de '%s' a échoué. Essayez 'git bisect start <branche-valide>'."
-#: builtin/bisect--helper.c:550
+#: builtin/bisect--helper.c:732
msgid "won't bisect on cg-seek'ed tree"
msgstr "refus de bissecter sur un arbre 'cg-seeked'"
-#: builtin/bisect--helper.c:553
+#: builtin/bisect--helper.c:735
msgid "bad HEAD - strange symbolic ref"
msgstr "mauvaise HEAD - référence symbolique douteuse"
-#: builtin/bisect--helper.c:577
+#: builtin/bisect--helper.c:755
#, c-format
msgid "invalid ref: '%s'"
msgstr "réference invalide : '%s'"
-#: builtin/bisect--helper.c:633
-msgid "perform 'git bisect next'"
-msgstr "effectuer 'git bisect next'"
+#: builtin/bisect--helper.c:813
+msgid "You need to start by \"git bisect start\"\n"
+msgstr "Vous devez démarrer avec \"git bisect start\"\n"
-#: builtin/bisect--helper.c:635
-msgid "write the terms to .git/BISECT_TERMS"
-msgstr "écrire les termes dans .git/BISECT_TERMS"
+#. 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:824
+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:637
-msgid "cleanup the bisection state"
-msgstr "vérifier l'état de la bissection"
+#: builtin/bisect--helper.c:842
+msgid "Please call `--bisect-state` with at least one argument"
+msgstr "Veuillez appeler `--bisect-state` avec au moins un argument"
-#: builtin/bisect--helper.c:639
-msgid "check for expected revs"
-msgstr "vérifier si des révisions sont attendues"
+#: builtin/bisect--helper.c:855
+#, c-format
+msgid "'git bisect %s' can take only one argument."
+msgstr "'git bisect %s' n'accepte qu'un seul argument."
-#: builtin/bisect--helper.c:641
+#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:878
+#, c-format
+msgid "Bad rev input: %s"
+msgstr "Mauvaise révision en entrée : %s"
+
+#: builtin/bisect--helper.c:912
+msgid "We are not bisecting."
+msgstr "Pas de bissection en cours."
+
+#: builtin/bisect--helper.c:962
+#, c-format
+msgid "'%s'?? what are you talking about?"
+msgstr "'%s' ?? de quoi parlez-vous ?"
+
+#: builtin/bisect--helper.c:974
+#, c-format
+msgid "cannot read file '%s' for replaying"
+msgstr "impossible de lire le fichier '%s' pour rejouer"
+
+#: builtin/bisect--helper.c:1047
msgid "reset the bisection state"
msgstr "réinitialiser l'état de la bissection"
-#: builtin/bisect--helper.c:643
-msgid "write out the bisection state in BISECT_LOG"
-msgstr "écrire l'état de la bissection dans BISECT_LOG"
-
-#: builtin/bisect--helper.c:645
-msgid "check and set terms in a bisection state"
-msgstr "vérifier et régler les termes dans un état de la bissection"
-
-#: builtin/bisect--helper.c:647
+#: builtin/bisect--helper.c:1049
msgid "check whether bad or good terms exist"
msgstr "vérifier si les termes bons ou mauvais existent"
-#: builtin/bisect--helper.c:649
+#: builtin/bisect--helper.c:1051
msgid "print out the bisect terms"
msgstr "afficher les termes de bissection"
-#: builtin/bisect--helper.c:651
+#: builtin/bisect--helper.c:1053
msgid "start the bisect session"
msgstr "démarrer une session de bissection"
-#: builtin/bisect--helper.c:653
-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:1055
+msgid "find the next bisection commit"
+msgstr "trouver le prochain commit de bissection"
-#: builtin/bisect--helper.c:655
+#: builtin/bisect--helper.c:1057
+msgid "mark the state of ref (or refs)"
+msgstr "marquer l'état d'une références (ou plusieurs)"
+
+#: builtin/bisect--helper.c:1059
+msgid "list the bisection steps so far"
+msgstr "lister les étapes de bissection jusqu'ici"
+
+#: builtin/bisect--helper.c:1061
+msgid "replay the bisection process from the given file"
+msgstr "rejouer le processus de bissection depuis le fichier fourni"
+
+#: builtin/bisect--helper.c:1063
+msgid "skip some commits for checkout"
+msgstr "sauter certains commits pour l'extraction"
+
+#: builtin/bisect--helper.c:1065
msgid "no log for BISECT_WRITE"
msgstr "pas de journal pour BISECT_WRITE"
-#: builtin/bisect--helper.c:673
-msgid "--write-terms requires two arguments"
-msgstr "--write-terms exige deux arguments"
-
-#: builtin/bisect--helper.c:677
-msgid "--bisect-clean-state requires no arguments"
-msgstr "--bisect-clean-state ne supporte aucun argument"
-
-#: builtin/bisect--helper.c:684
+#: builtin/bisect--helper.c:1080
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-reset supporte soit aucun argument, soit un commit"
-#: builtin/bisect--helper.c:688
-msgid "--bisect-write requires either 4 or 5 arguments"
-msgstr "--bisect-write supporte soit 4 arguments, soit 5 arguments"
-
-#: builtin/bisect--helper.c:694
-msgid "--check-and-set-terms requires 3 arguments"
-msgstr "--check-and-set-terms exige 3 arguments"
-
-#: builtin/bisect--helper.c:700
+#: builtin/bisect--helper.c:1085
msgid "--bisect-next-check requires 2 or 3 arguments"
msgstr "--bisect-next-check exige 2 ou 3 arguments"
-#: builtin/bisect--helper.c:706
+#: builtin/bisect--helper.c:1091
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms exige 0 ou 1 argument"
-#: builtin/blame.c:31
+#: builtin/bisect--helper.c:1100
+msgid "--bisect-next requires 0 arguments"
+msgstr "--bisect-next exige 0 argument"
+
+#: builtin/bisect--helper.c:1111
+msgid "--bisect-log requires 0 arguments"
+msgstr "--bisect-log exige 0 argument"
+
+#: builtin/bisect--helper.c:1116
+msgid "no logfile given"
+msgstr "pas de fichier de log donné"
+
+#: builtin/blame.c:32
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr "git blame [<options>] [<rev-opts>] [<rev>] [--] <fichier>"
-#: builtin/blame.c:36
+#: builtin/blame.c:37
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<options-de-révision> sont documentés dans git-rev-list(1)"
-#: builtin/blame.c:409
+#: builtin/blame.c:410
#, c-format
msgid "expecting a color: %s"
msgstr "couleur attendue : %s"
-#: builtin/blame.c:416
+#: builtin/blame.c:417
msgid "must end with a color"
msgstr "doit finir avec une couleur"
-#: builtin/blame.c:729
+#: builtin/blame.c:728
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "couleur invalide '%s' dans color.blame.repeatedlines"
-#: builtin/blame.c:747
+#: builtin/blame.c:746
msgid "invalid value for blame.coloring"
msgstr "valeur invalide pour blame.coloring"
-#: builtin/blame.c:822
+#: builtin/blame.c:845
#, c-format
msgid "cannot find revision %s to ignore"
msgstr "référence à ignorer %s introuvable"
-#: builtin/blame.c:844
-msgid "Show blame entries as we find them, incrementally"
+#: 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 "
+"montrer les éléments de blâme au fur et à mesure de leur découverte, de "
"manière incrémentale"
-#: builtin/blame.c:845
-msgid "Show blank SHA-1 for boundary commits (Default: off)"
-msgstr "Montrer un SHA-1 blanc pour les commits de limite (Défaut : désactivé)"
-
-#: builtin/blame.c:846
-msgid "Do not treat root commits as boundaries (Default: off)"
+#: builtin/blame.c:868
+msgid "do not show object names of boundary commits (Default: off)"
msgstr ""
-"Ne pas traiter les commits racine comme des limites (Défaut : désactivé)"
+"ne pas montrer les noms des objets pour les commits de limite (Défaut : "
+"désactivé)"
-#: builtin/blame.c:847
-msgid "Show work cost statistics"
-msgstr "Montrer les statistiques de coût d'activité"
+#: 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
-msgid "Force progress reporting"
-msgstr "Forcer l'affichage de l'état d'avancement"
+#: builtin/blame.c:870
+msgid "show work cost statistics"
+msgstr "montrer les statistiques de coût d'activité"
-#: builtin/blame.c:849
-msgid "Show output score for blame entries"
-msgstr "Montrer le score de sortie pour les éléments de blâme"
+#: builtin/blame.c:871 builtin/checkout.c:1503 builtin/clone.c:92
+#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:175
+#: builtin/merge.c:297 builtin/multi-pack-index.c:27 builtin/pull.c:119
+#: builtin/push.c:575 builtin/send-pack.c:198
+msgid "force progress reporting"
+msgstr "forcer l'affichage de l'état d'avancement"
-#: builtin/blame.c:850
-msgid "Show original filename (Default: auto)"
-msgstr "Montrer les noms de fichier originaux (Défaut : auto)"
+#: 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
-msgid "Show original linenumber (Default: off)"
-msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)"
+#: builtin/blame.c:873
+msgid "show original filename (Default: auto)"
+msgstr "montrer les noms de fichier originaux (Défaut : auto)"
-#: builtin/blame.c:852
-msgid "Show in a format designed for machine consumption"
-msgstr "Afficher dans un format propice à la consommation par machine"
+#: 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
-msgid "Show porcelain format with per-line commit information"
-msgstr "Afficher en format porcelaine avec l'information de commit par ligne"
+#: 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
-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: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
-msgid "Show raw timestamp (Default: off)"
-msgstr "Afficher les horodatages bruts (Défaut : désactivé)"
+#: 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
-msgid "Show long commit SHA1 (Default: off)"
-msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)"
+#: builtin/blame.c:878
+msgid "show raw timestamp (Default: off)"
+msgstr "afficher les horodatages bruts (Défaut : désactivé)"
-#: builtin/blame.c:857
-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:879
+msgid "show long commit SHA1 (Default: off)"
+msgstr "afficher les longs SHA1 de commits (Défaut : désactivé)"
-#: builtin/blame.c:858
-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: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
-msgid "Ignore whitespace differences"
-msgstr "Ignorer les différences d'espace"
+#: 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/log.c:1702
+#: builtin/blame.c:882
+msgid "ignore whitespace differences"
+msgstr "ignorer les différences d'espace"
+
+#: builtin/blame.c:883 builtin/log.c:1812
msgid "rev"
msgstr "rév"
-#: builtin/blame.c:860
-msgid "Ignore <rev> when blaming"
-msgstr "ignore <rev> pendant le blâme"
+#: builtin/blame.c:883
+msgid "ignore <rev> when blaming"
+msgstr "ignorer <rev> pendant le blâme"
-#: builtin/blame.c:861
-msgid "Ignore revisions from <file>"
+#: builtin/blame.c:884
+msgid "ignore revisions from <file>"
msgstr "ignorer les révisions listées dans <fichier>"
-#: builtin/blame.c:862
+#: 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:863
+#: builtin/blame.c:886
msgid "color lines by age"
msgstr "colorier les lignes par âge"
-#: builtin/blame.c:864
-msgid "Spend extra cycles to find better match"
+#: builtin/blame.c:887
+msgid "spend extra cycles to find better match"
msgstr ""
-"Dépenser des cycles supplémentaires pour trouver une meilleure correspondance"
+"dépenser des cycles supplémentaires pour trouver une meilleure correspondance"
-#: builtin/blame.c:865
-msgid "Use revisions from <file> instead of calling git-rev-list"
+#: 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"
+"utiliser les révisions du fichier <fichier> au lieu d'appeler git-rev-list"
-#: builtin/blame.c:866
-msgid "Use <file>'s contents as the final image"
-msgstr "Utiliser le contenu de <fichier> comme image finale"
+#: 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:867 builtin/blame.c:868
+#: builtin/blame.c:890 builtin/blame.c:891
msgid "score"
msgstr "score"
-#: builtin/blame.c:867
-msgid "Find line copies within and across files"
-msgstr "Trouver les copies de ligne dans et entre les fichiers"
+#: 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:868
-msgid "Find line movements within and across files"
-msgstr "Trouver les mouvements de ligne dans et entre les fichiers"
+#: 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:869
-msgid "n,m"
-msgstr "n,m"
+#: builtin/blame.c:892
+msgid "range"
+msgstr "plage"
-#: builtin/blame.c:869
-msgid "Process only line range n,m, counting from 1"
+#: builtin/blame.c:893
+msgid "process only line range <start>,<end> or function :<funcname>"
msgstr ""
-"Traiter seulement l'intervalle de ligne n,m en commençant le compte à 1"
+"traiter seulement l'intervalle de ligne <début>,<fin> ou la fonction : <nom-"
+"de-fonction>"
-#: builtin/blame.c:921
+#: builtin/blame.c:945
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"--progress ne peut pas être utilisé avec --incremental ou les formats "
@@ -10648,23 +11366,23 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:972
+#: builtin/blame.c:996
msgid "4 years, 11 months ago"
msgstr "il y a 10 ans et 11 mois"
-#: builtin/blame.c:1079
+#: builtin/blame.c:1112
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "le fichier %s n'a qu'%lu ligne"
msgstr[1] "le fichier %s n'a que %lu lignes"
-#: builtin/blame.c:1125
+#: builtin/blame.c:1157
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
@@ -10729,121 +11447,111 @@
msgid "Update of config-file failed"
msgstr "Échec de la mise à jour du fichier de configuration"
-#: builtin/branch.c:220
+#: builtin/branch.c:223
msgid "cannot use -a with -d"
msgstr "impossible d'utiliser -a avec -d"
-#: builtin/branch.c:226
+#: builtin/branch.c:230
msgid "Couldn't look up commit object for HEAD"
msgstr "Impossible de rechercher l'objet commit pour HEAD"
-#: builtin/branch.c:240
+#: builtin/branch.c:244
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Impossible de supprimer la branche '%s' extraite dans '%s'"
-#: builtin/branch.c:255
+#: builtin/branch.c:259
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "branche de suivi '%s' non trouvée."
-#: builtin/branch.c:256
+#: builtin/branch.c:260
#, c-format
msgid "branch '%s' not found."
msgstr "branche '%s' non trouvée."
-#: builtin/branch.c:271
-#, c-format
-msgid "Error deleting remote-tracking branch '%s'"
-msgstr "Erreur lors de la suppression de la branche de suivi '%s'"
-
-#: builtin/branch.c:272
-#, c-format
-msgid "Error deleting branch '%s'"
-msgstr "Erreur lors de la suppression de la branche '%s'"
-
-#: builtin/branch.c:279
+#: builtin/branch.c:291
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Branche de suivi %s supprimée (précédemment %s).\n"
-#: builtin/branch.c:280
+#: builtin/branch.c:292
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Branche %s supprimée (précédemment %s).\n"
-#: builtin/branch.c:429 builtin/tag.c:61
+#: builtin/branch.c:438 builtin/tag.c:61
msgid "unable to parse format string"
msgstr "impossible d'analyser la chaîne de format"
-#: builtin/branch.c:460
+#: builtin/branch.c:469
msgid "could not resolve HEAD"
msgstr "impossible de résoudre HEAD"
-#: builtin/branch.c:466
+#: builtin/branch.c:475
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) pointe hors de refs/heads/"
-#: builtin/branch.c:481
+#: builtin/branch.c:490
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "La branche %s est en cours de rebasage sur %s"
-#: builtin/branch.c:485
+#: builtin/branch.c:494
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "La branche %s est en cours de bissection sur %s"
-#: builtin/branch.c:502
+#: builtin/branch.c:511
msgid "cannot copy the current branch while not on any."
msgstr "impossible de copier la branche actuelle, il n'y en a pas."
-#: builtin/branch.c:504
+#: builtin/branch.c:513
msgid "cannot rename the current branch while not on any."
msgstr "impossible de renommer la branche actuelle, il n'y en a pas."
-#: builtin/branch.c:515
+#: builtin/branch.c:524
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nom de branche invalide : '%s'"
-#: builtin/branch.c:542
+#: builtin/branch.c:553
msgid "Branch rename failed"
msgstr "Échec de renommage de la branche"
-#: builtin/branch.c:544
+#: builtin/branch.c:555
msgid "Branch copy failed"
msgstr "Échec de copie de la branche"
-#: builtin/branch.c:548
+#: builtin/branch.c:559
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Création d'une copie d'une branche mal nommée '%s'"
-#: builtin/branch.c:551
+#: builtin/branch.c:562
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Renommage d'une branche mal nommée '%s'"
-#: builtin/branch.c:557
+#: builtin/branch.c:568
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "La branche a été renommée en %s, mais HEAD n'est pas mise à jour !"
-#: builtin/branch.c:566
+#: builtin/branch.c:577
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"La branche est renommée, mais la mise à jour du fichier de configuration a "
"échoué"
-#: builtin/branch.c:568
+#: builtin/branch.c:579
msgid "Branch is copied, but update of config-file failed"
msgstr ""
"La branche est copiée, mais la mise à jour du fichier de configuration a "
"échoué"
-#: builtin/branch.c:584
+#: builtin/branch.c:595
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -10854,180 +11562,180 @@
" %s\n"
"Les lignes commençant par '%c' seront ignorées.\n"
-#: builtin/branch.c:618
+#: builtin/branch.c:629
msgid "Generic options"
msgstr "Options génériques"
-#: builtin/branch.c:620
+#: builtin/branch.c:631
msgid "show hash and subject, give twice for upstream branch"
msgstr "afficher le hachage et le sujet, doublé pour la branche amont"
-#: builtin/branch.c:621
+#: builtin/branch.c:632
msgid "suppress informational messages"
msgstr "supprimer les messages d'information"
-#: builtin/branch.c:622
+#: builtin/branch.c:633
msgid "set up tracking mode (see git-pull(1))"
msgstr "régler le mode de suivi (voir git-pull(1))"
-#: builtin/branch.c:624
+#: builtin/branch.c:635
msgid "do not use"
msgstr "ne pas utiliser"
-#: builtin/branch.c:626 builtin/rebase.c:513
+#: builtin/branch.c:637 builtin/rebase.c:534
msgid "upstream"
msgstr "amont"
-#: builtin/branch.c:626
+#: builtin/branch.c:637
msgid "change the upstream info"
msgstr "modifier l'information amont"
-#: builtin/branch.c:627
+#: builtin/branch.c:638
msgid "unset the upstream info"
msgstr "désactiver l'information amont"
-#: builtin/branch.c:628
+#: builtin/branch.c:639
msgid "use colored output"
msgstr "utiliser la coloration dans la sortie"
-#: builtin/branch.c:629
+#: builtin/branch.c:640
msgid "act on remote-tracking branches"
msgstr "agir sur les branches de suivi distantes"
-#: builtin/branch.c:631 builtin/branch.c:633
+#: builtin/branch.c:642 builtin/branch.c:644
msgid "print only branches that contain the commit"
msgstr "afficher seulement les branches qui contiennent le commit"
-#: builtin/branch.c:632 builtin/branch.c:634
+#: builtin/branch.c:643 builtin/branch.c:645
msgid "print only branches that don't contain the commit"
msgstr "afficher seulement les branches qui ne contiennent pas le commit"
-#: builtin/branch.c:637
+#: builtin/branch.c:648
msgid "Specific git-branch actions:"
msgstr "Actions spécifiques à git-branch :"
-#: builtin/branch.c:638
+#: builtin/branch.c:649
msgid "list both remote-tracking and local branches"
msgstr "afficher à la fois les branches de suivi et les branches locales"
-#: builtin/branch.c:640
+#: builtin/branch.c:651
msgid "delete fully merged branch"
msgstr "supprimer une branche totalement fusionnée"
-#: builtin/branch.c:641
+#: builtin/branch.c:652
msgid "delete branch (even if not merged)"
msgstr "supprimer une branche (même non fusionnée)"
-#: builtin/branch.c:642
+#: builtin/branch.c:653
msgid "move/rename a branch and its reflog"
msgstr "déplacer/renommer une branche et son reflog"
-#: builtin/branch.c:643
+#: builtin/branch.c:654
msgid "move/rename a branch, even if target exists"
msgstr "déplacer/renommer une branche, même si la cible existe"
-#: builtin/branch.c:644
+#: builtin/branch.c:655
msgid "copy a branch and its reflog"
msgstr "copier une branche et son reflog"
-#: builtin/branch.c:645
+#: builtin/branch.c:656
msgid "copy a branch, even if target exists"
msgstr "copier une branche, même si la cible existe"
-#: builtin/branch.c:646
+#: builtin/branch.c:657
msgid "list branch names"
msgstr "afficher les noms des branches"
-#: builtin/branch.c:647
+#: builtin/branch.c:658
msgid "show current branch name"
msgstr "afficher le nom de la branche courante"
-#: builtin/branch.c:648
+#: builtin/branch.c:659
msgid "create the branch's reflog"
msgstr "créer le reflog de la branche"
-#: builtin/branch.c:650
+#: builtin/branch.c:661
msgid "edit the description for the branch"
msgstr "éditer la description de la branche"
-#: builtin/branch.c:651
+#: builtin/branch.c:662
msgid "force creation, move/rename, deletion"
msgstr "forcer la création, le déplacement/renommage, ou la suppression"
-#: builtin/branch.c:652
+#: builtin/branch.c:663
msgid "print only branches that are merged"
msgstr "afficher seulement les branches qui sont fusionnées"
-#: builtin/branch.c:653
+#: builtin/branch.c:664
msgid "print only branches that are not merged"
msgstr "afficher seulement les branches qui ne sont pas fusionnées"
-#: builtin/branch.c:654
+#: builtin/branch.c:665
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:667 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:466
msgid "object"
msgstr "objet"
-#: builtin/branch.c:658
+#: builtin/branch.c:668
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:669 builtin/for-each-ref.c:48 builtin/tag.c:473
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:670 builtin/for-each-ref.c:38 builtin/tag.c:471
#: 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:785
+#: builtin/branch.c:693 builtin/clone.c:790
msgid "HEAD not found below refs/heads!"
msgstr "HEAD non trouvée sous refs/heads !"
-#: builtin/branch.c:708
+#: builtin/branch.c:717
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:732 builtin/branch.c:788 builtin/branch.c:797
msgid "branch name required"
msgstr "le nom de branche est requis"
-#: builtin/branch.c:753
+#: builtin/branch.c:764
msgid "Cannot give description to detached HEAD"
msgstr "Impossible de décrire une HEAD détachée"
-#: builtin/branch.c:758
+#: builtin/branch.c:769
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:776
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Aucun commit sur la branche '%s'."
-#: builtin/branch.c:768
+#: builtin/branch.c:779
#, c-format
msgid "No branch named '%s'."
msgstr "Aucune branche nommée '%s'."
-#: builtin/branch.c:783
+#: builtin/branch.c:794
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:803
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:808
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:812
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -11035,32 +11743,32 @@
"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:815 builtin/branch.c:838
#, c-format
msgid "no such branch '%s'"
msgstr "pas de branche '%s'"
-#: builtin/branch.c:808
+#: builtin/branch.c:819
#, c-format
msgid "branch '%s' does not exist"
msgstr "la branche '%s' n'existe pas"
-#: builtin/branch.c:821
+#: builtin/branch.c:832
msgid "too many arguments to unset upstream"
msgstr "trop d'arguments pour désactiver un amont"
-#: builtin/branch.c:825
+#: builtin/branch.c:836
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:842
#, 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:852
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>?"
@@ -11069,7 +11777,7 @@
"branche.\n"
"Vouliez-vous plutôt dire -a|-r --list <motif> ?"
-#: builtin/branch.c:845
+#: builtin/branch.c:856
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -11077,6 +11785,104 @@
"l'option '--set-upstream' est obsolète. Utilisez '--track' ou '--set-"
"upstream-to' à la place."
+#: builtin/bugreport.c:15
+msgid "git version:\n"
+msgstr "version git ::\n"
+
+#: builtin/bugreport.c:21
+#, c-format
+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:135
+msgid "specify a destination for the bugreport file"
+msgstr "spécifier la destination du fichier de rapport de bogue"
+
+#: builtin/bugreport.c:137
+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:159
+#, 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:166
+msgid "System Info"
+msgstr "Info système"
+
+#: builtin/bugreport.c:169
+msgid "Enabled Hooks"
+msgstr "Crochets activés"
+
+#: builtin/bugreport.c:176
+#, c-format
+msgid "couldn't create a new file at '%s'"
+msgstr "impossible de créer un fichier nouveau à '%s'"
+
+#: builtin/bugreport.c:179
+#, c-format
+msgid "unable to write to %s"
+msgstr "impossible d'écrire dans %s"
+
+#: builtin/bugreport.c:189
+#, 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>"
@@ -11093,49 +11899,53 @@
msgid "git bundle unbundle <file> [<refname>...]"
msgstr "git bundle unbundle <fichier> [<nom-de-ref>...]"
-#: builtin/bundle.c:66 builtin/pack-objects.c:3375
+#: builtin/bundle.c:67 builtin/pack-objects.c:3495
msgid "do not show progress meter"
msgstr "ne pas afficher la barre de progression"
-#: builtin/bundle.c:68 builtin/pack-objects.c:3377
+#: builtin/bundle.c:69 builtin/pack-objects.c:3497
msgid "show progress meter"
msgstr "afficher la barre de progression"
-#: builtin/bundle.c:70 builtin/pack-objects.c:3379
+#: builtin/bundle.c:71 builtin/pack-objects.c:3499
msgid "show progress meter during object writing phase"
msgstr "afficher la barre de progression durant la phase d'écrite des objets"
-#: builtin/bundle.c:73 builtin/pack-objects.c:3382
+#: builtin/bundle.c:74 builtin/pack-objects.c:3502
msgid "similar to --all-progress when progress meter is shown"
msgstr "similaire à --all-progress quand la barre de progression est affichée"
-#: builtin/bundle.c:93
+#: 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:104
+#: builtin/bundle.c:107
msgid "do not show bundle details"
msgstr "ne pas afficher les détails du colis"
-#: builtin/bundle.c:119
+#: builtin/bundle.c:122
#, c-format
msgid "%s is okay\n"
msgstr "%s est correct\n"
-#: builtin/bundle.c:160
+#: builtin/bundle.c:163
msgid "Need a repository to unbundle."
msgstr "Le dépaquetage d'un colis requiert un dépôt."
-#: builtin/bundle.c:168 builtin/remote.c:1686
+#: builtin/bundle.c:171 builtin/remote.c:1700
msgid "be verbose; must be placed before a subcommand"
msgstr "être verbeux : doit être placé avant une sous-commande"
-#: builtin/bundle.c:190 builtin/remote.c:1717
+#: builtin/bundle.c:193 builtin/remote.c:1731
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Sous-commande inconnue : %s"
-#: builtin/cat-file.c:595
+#: 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>"
@@ -11143,82 +11953,82 @@
"git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p "
"| <type> | --textconv | --filters) [--path=<chemin>] <objet>"
-#: builtin/cat-file.c:596
+#: builtin/cat-file.c: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:617
+#: 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:635
+#: 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:636
+#: builtin/cat-file.c:639
msgid "show object type"
msgstr "afficher le type de l'objet"
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:640
msgid "show object size"
msgstr "afficher la taille de l'objet"
-#: builtin/cat-file.c:639
+#: 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:640
+#: 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:642
+#: 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:644
+#: 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:645 git-submodule.sh:1002
+#: builtin/cat-file.c:648
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:646
+#: 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:648
+#: 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:649
+#: builtin/cat-file.c:652
msgid "buffer --batch output"
msgstr "bufferiser la sortie de --batch"
-#: builtin/cat-file.c:651
+#: 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:655
+#: 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:659
+#: 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:661
+#: 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:663
+#: builtin/cat-file.c:666
msgid "do not order --batch-all-objects output"
msgstr "ne pas ordonner la sortie de --batch-all-objects"
@@ -11247,8 +12057,8 @@
msgstr ""
"terminer les enregistrements en entrée et en sortie par un caractère NUL"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537
-#: builtin/worktree.c:499
+#: builtin/check-ignore.c:21 builtin/checkout.c:1499 builtin/gc.c:549
+#: builtin/worktree.c:489
msgid "suppress progress reporting"
msgstr "supprimer l'état d'avancement"
@@ -11301,56 +12111,56 @@
msgid "no contacts specified"
msgstr "aucun contact spécifié"
-#: builtin/checkout-index.c:131
+#: builtin/checkout-index.c:152
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<options>] [--] [<fichier>...]"
-#: builtin/checkout-index.c:148
+#: builtin/checkout-index.c:169
msgid "stage should be between 1 and 3 or all"
msgstr "stage doit valoir entre 1 et 3, ou all"
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:186
msgid "check out all files in the index"
msgstr "extraire tous les fichiers présents dans l'index"
-#: builtin/checkout-index.c:165
+#: builtin/checkout-index.c:187
msgid "force overwrite of existing files"
msgstr "forcer l'écrasement des fichiers existants"
-#: builtin/checkout-index.c:167
+#: builtin/checkout-index.c:189
msgid "no warning for existing files and files not in index"
msgstr ""
"pas d'avertissement pour les fichiers existants et les fichiers absents de "
"l'index"
-#: builtin/checkout-index.c:169
+#: builtin/checkout-index.c:191
msgid "don't checkout new files"
msgstr "ne pas extraire les nouveaux fichiers"
-#: builtin/checkout-index.c:171
+#: builtin/checkout-index.c:193
msgid "update stat information in the index file"
msgstr "mettre à jour l'information de stat dans le fichier d'index"
-#: builtin/checkout-index.c:175
+#: builtin/checkout-index.c:197
msgid "read list of paths from the standard input"
msgstr "lire la liste des chemins depuis l'entrée standard"
-#: builtin/checkout-index.c:177
+#: builtin/checkout-index.c:199
msgid "write the content to temporary files"
msgstr "écrire le contenu dans des fichiers temporaires"
-#: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403
-#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909
-#: builtin/worktree.c:672
+#: builtin/checkout-index.c:200 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:717
msgid "string"
msgstr "chaîne"
-#: builtin/checkout-index.c:179
+#: builtin/checkout-index.c:201
msgid "when creating files, prepend <string>"
msgstr "lors de la création de fichiers, préfixer par <chaîne>"
-#: builtin/checkout-index.c:181
+#: builtin/checkout-index.c:203
msgid "copy out the files from named stage"
msgstr "copier les fichiers depuis l'index nommé"
@@ -11370,100 +12180,100 @@
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git restore [<options>] [--source=<branche>] <fichier>..."
-#: builtin/checkout.c:175 builtin/checkout.c:214
+#: builtin/checkout.c: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:177 builtin/checkout.c:216
+#: 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:193
+#: 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:243
+#: 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:261
+#: builtin/checkout.c:275
#, c-format
msgid "path '%s': cannot merge"
msgstr "chemin '%s' : impossible de fusionner"
-#: builtin/checkout.c:277
+#: 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:377
+#: 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:382
+#: 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:389
+#: 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:412 builtin/checkout.c:415 builtin/checkout.c:418
-#: builtin/checkout.c:422
+#: 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:425 builtin/checkout.c:428
+#: 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:432
+#: 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:436
+#: builtin/checkout.c:455
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "ni '%s', ni '%s' spécifié"
-#: builtin/checkout.c:440
+#: 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:445 builtin/checkout.c:450
+#: 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:509 builtin/checkout.c:516
+#: builtin/checkout.c:543 builtin/checkout.c:550
#, c-format
msgid "path '%s' is unmerged"
msgstr "le chemin '%s' n'est pas fusionné"
-#: builtin/checkout.c:684 builtin/sparse-checkout.c:106
+#: builtin/checkout.c:718
msgid "you need to resolve your current index first"
msgstr "vous devez d'abord résoudre votre index courant"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:772
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -11473,50 +12283,50 @@
"suivants :\n"
"%s"
-#: builtin/checkout.c:837
+#: builtin/checkout.c:865
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Impossible de faire un reflog pour '%s' : %s\n"
-#: builtin/checkout.c:879
+#: builtin/checkout.c:907
msgid "HEAD is now at"
msgstr "HEAD est maintenant sur"
-#: builtin/checkout.c:883 builtin/clone.c:717
+#: builtin/checkout.c:911 builtin/clone.c:721 t/helper/test-fast-rebase.c:202
msgid "unable to update HEAD"
msgstr "impossible de mettre à jour HEAD"
-#: builtin/checkout.c:887
+#: builtin/checkout.c:915
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Remise à zéro de la branche '%s'\n"
-#: builtin/checkout.c:890
+#: builtin/checkout.c:918
#, c-format
msgid "Already on '%s'\n"
msgstr "Déjà sur '%s'\n"
-#: builtin/checkout.c:894
+#: builtin/checkout.c:922
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Basculement et remise à zéro de la branche '%s'\n"
-#: builtin/checkout.c:896 builtin/checkout.c:1320
+#: builtin/checkout.c:924 builtin/checkout.c:1355
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Basculement sur la nouvelle branche '%s'\n"
-#: builtin/checkout.c:898
+#: builtin/checkout.c:926
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Basculement sur la branche '%s'\n"
-#: builtin/checkout.c:949
+#: builtin/checkout.c:977
#, c-format
msgid " ... and %d more.\n"
msgstr " ... et %d en plus.\n"
-#: builtin/checkout.c:955
+#: builtin/checkout.c:983
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -11539,7 +12349,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:974
+#: builtin/checkout.c:1002
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -11568,19 +12378,19 @@
"git branch <nouvelle-branche> %s\n"
"\n"
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1037
msgid "internal error in revision walk"
msgstr "erreur interne lors du parcours des révisions"
-#: builtin/checkout.c:1013
+#: builtin/checkout.c:1041
msgid "Previous HEAD position was"
msgstr "La position précédente de HEAD était sur"
-#: builtin/checkout.c:1053 builtin/checkout.c:1315
+#: builtin/checkout.c:1081 builtin/checkout.c:1350
msgid "You are on a branch yet to be born"
msgstr "Vous êtes sur une branche qui doit encore naître"
-#: builtin/checkout.c:1128
+#: builtin/checkout.c:1163
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -11589,7 +12399,7 @@
"'%s' pourrait être un fichier local ou un branche de suivi.\n"
"Veuillez utiliser -- (et --no-guess en facultatif) pour les distinguer"
-#: builtin/checkout.c:1135
+#: builtin/checkout.c:1170
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"
@@ -11609,51 +12419,51 @@
"ambigu, vous pouvez positionner checkout.defaultRemote=origin dans\n"
"votre config."
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1180
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "'%s' correspond à plusieurs (%d) branches de suivi à distance"
-#: builtin/checkout.c:1211
+#: builtin/checkout.c:1246
msgid "only one reference expected"
msgstr "une seule référence attendue"
-#: builtin/checkout.c:1228
+#: builtin/checkout.c:1263
#, c-format
msgid "only one reference expected, %d given."
msgstr "une seule référence attendue, %d fournies."
-#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448
+#: builtin/checkout.c:1309 builtin/worktree.c:270 builtin/worktree.c:438
#, c-format
msgid "invalid reference: %s"
msgstr "référence invalide : %s"
-#: builtin/checkout.c:1287 builtin/checkout.c:1649
+#: builtin/checkout.c:1322 builtin/checkout.c:1688
#, c-format
msgid "reference is not a tree: %s"
msgstr "la référence n'est pas un arbre : %s"
-#: builtin/checkout.c:1334
+#: builtin/checkout.c:1369
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "branche attendue, mais étiquette '%s' reçue"
-#: builtin/checkout.c:1336
+#: builtin/checkout.c:1371
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "une branche est attendue, mais une branche distante '%s' a été reçue"
-#: builtin/checkout.c:1337 builtin/checkout.c:1345
+#: builtin/checkout.c:1372 builtin/checkout.c:1380
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "une branche est attendue, mais '%s' a été reçue"
-#: builtin/checkout.c:1340
+#: builtin/checkout.c:1375
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "une branche est attendue, mais un commit '%s' a été reçu"
-#: builtin/checkout.c:1356
+#: builtin/checkout.c:1391
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -11661,7 +12471,7 @@
"impossible de basculer de branche pendant une fusion\n"
"Envisagez \"git merge --quit\" ou \"git worktree add\"."
-#: builtin/checkout.c:1360
+#: builtin/checkout.c:1395
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -11669,7 +12479,7 @@
"impossible de basculer de branche pendant une session am\n"
"Envisagez \"git am --quit\" ou \"git worktree add\"."
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1399
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -11677,7 +12487,7 @@
"impossible de basculer de branche pendant un rebasage\n"
"Envisagez \"git rebase --quit\" ou \"git worktree add\"."
-#: builtin/checkout.c:1368
+#: builtin/checkout.c:1403
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -11685,7 +12495,7 @@
"impossible de basculer de branche pendant un picorage\n"
"Envisagez \"git cherry-pick --quit\" ou \"git worktree add\"."
-#: builtin/checkout.c:1372
+#: builtin/checkout.c:1407
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -11693,144 +12503,139 @@
"impossible de basculer de branche pendant un retour\n"
"Envisagez \"git revert --quit\" ou \"git worktree add\"."
-#: builtin/checkout.c:1376
+#: builtin/checkout.c:1411
msgid "you are switching branch while bisecting"
msgstr "Vous basculez de branche en cours de bissection"
-#: builtin/checkout.c:1383
+#: builtin/checkout.c:1418
msgid "paths cannot be used with switching branches"
msgstr "impossible d'utiliser des chemins avec un basculement de branches"
-#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394
+#: builtin/checkout.c:1421 builtin/checkout.c:1425 builtin/checkout.c:1429
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' ne peut pas être utilisé avec un basculement de branches"
-#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404
-#: builtin/checkout.c:1409 builtin/checkout.c:1414
+#: builtin/checkout.c:1433 builtin/checkout.c:1436 builtin/checkout.c:1439
+#: builtin/checkout.c:1444 builtin/checkout.c:1449
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' ne peut pas être utilisé avec '%s'"
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1446
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s' n'accepte pas <point-de-départ>"
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1454
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Impossible de basculer de branche vers '%s' qui n'est pas un commit"
-#: builtin/checkout.c:1426
+#: builtin/checkout.c:1461
msgid "missing branch or commit argument"
msgstr "argument de branche ou de commit manquant"
-#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72
-#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286
-#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563
-#: builtin/send-pack.c:174
-msgid "force progress reporting"
-msgstr "forcer l'affichage de l'état d'avancement"
-
-#: builtin/checkout.c:1469
+#: builtin/checkout.c:1504
msgid "perform a 3-way merge with the new branch"
msgstr "effectuer une fusion à 3 points avec la nouvelle branche"
-#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322
+#: builtin/checkout.c:1505 builtin/log.c:1799 parse-options.h:322
msgid "style"
msgstr "style"
-#: builtin/checkout.c:1471
+#: builtin/checkout.c:1506
msgid "conflict style (merge or diff3)"
msgstr "style de conflit (merge (fusion) ou diff3)"
-#: builtin/checkout.c:1483 builtin/worktree.c:496
+#: builtin/checkout.c:1518 builtin/worktree.c:486
msgid "detach HEAD at named commit"
msgstr "détacher la HEAD au commit nommé"
-#: builtin/checkout.c:1484
+#: builtin/checkout.c:1519
msgid "set upstream info for new branch"
msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"
-#: builtin/checkout.c:1486
+#: builtin/checkout.c:1521
msgid "force checkout (throw away local modifications)"
msgstr "forcer l'extraction (laisser tomber les modifications locales)"
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1523
msgid "new-branch"
msgstr "nouvelle branche"
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1523
msgid "new unparented branch"
msgstr "nouvelle branche sans parent"
-#: builtin/checkout.c:1490 builtin/merge.c:289
+#: builtin/checkout.c:1525 builtin/merge.c:301
msgid "update ignored files (default)"
msgstr "mettre à jour les fichiers ignorés (par défaut)"
-#: builtin/checkout.c:1493
+#: builtin/checkout.c:1528
msgid "do not check if another worktree is holding the given ref"
msgstr ""
"ne pas vérifier si une autre copie de travail contient le référence fournie"
-#: builtin/checkout.c:1506
+#: builtin/checkout.c:1541
msgid "checkout our version for unmerged files"
msgstr "extraire notre version pour les fichiers non fusionnés"
-#: builtin/checkout.c:1509
+#: builtin/checkout.c:1544
msgid "checkout their version for unmerged files"
msgstr "extraire leur version pour les fichiers non fusionnés"
-#: builtin/checkout.c:1513
+#: builtin/checkout.c:1548
msgid "do not limit pathspecs to sparse entries only"
msgstr "ne pas limiter les spécificateurs de chemins aux seuls éléments creux"
-#: builtin/checkout.c:1565
-msgid "-b, -B and --orphan are mutually exclusive"
-msgstr "-b, -B et --orphan sont mutuellement exclusifs"
+#: builtin/checkout.c:1603
+#, c-format
+msgid "-%c, -%c and --orphan are mutually exclusive"
+msgstr "-%c, -%c et --orphan sont mutuellement exclusifs"
-#: builtin/checkout.c:1568
+#: builtin/checkout.c:1607
msgid "-p and --overlay are mutually exclusive"
msgstr "-p et --overlay sont mutuellement exclusifs"
-#: builtin/checkout.c:1605
+#: builtin/checkout.c:1644
msgid "--track needs a branch name"
msgstr "--track requiert un nom de branche"
-#: builtin/checkout.c:1610
-msgid "missing branch name; try -b"
-msgstr "nom de branche manquant ; essayez -b"
+#: builtin/checkout.c:1649
+#, c-format
+msgid "missing branch name; try -%c"
+msgstr "nom de branche manquant ; essayez -%c"
-#: builtin/checkout.c:1642
+#: builtin/checkout.c:1681
#, c-format
msgid "could not resolve %s"
msgstr "impossible de résoudre %s"
-#: builtin/checkout.c:1658
+#: builtin/checkout.c:1697
msgid "invalid path specification"
msgstr "spécification de chemin invalide"
-#: builtin/checkout.c:1665
+#: builtin/checkout.c:1704
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
"'%s' n'est pas un commit et une branche '%s' ne peut pas en être créée depuis"
-#: builtin/checkout.c:1669
+#: builtin/checkout.c:1708
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach n'accepte pas un argument de chemin '%s'"
-#: builtin/checkout.c:1678
+#: builtin/checkout.c:1717
msgid "--pathspec-from-file is incompatible with --detach"
msgstr "--pathspec-from-file est incompatible avec --detach"
-#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506
+#: builtin/checkout.c:1720 builtin/reset.c:325 builtin/stash.c:1566
msgid "--pathspec-from-file is incompatible with --patch"
msgstr "--pathspec-from-file est incompatible avec --patch"
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1733
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -11838,110 +12643,111 @@
"git checkout: --ours/--theirs, --force et --merge sont incompatibles lors\n"
"de l'extraction de l'index."
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1738
msgid "you must specify path(s) to restore"
msgstr "Vous devez spécifier un ou des chemins à restaurer"
-#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774
-#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494
+#: builtin/checkout.c:1764 builtin/checkout.c:1766 builtin/checkout.c:1815
+#: builtin/checkout.c:1817 builtin/clone.c:122 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:482
+#: builtin/worktree.c:484
msgid "branch"
msgstr "branche"
-#: builtin/checkout.c:1724
+#: builtin/checkout.c:1765
msgid "create and checkout a new branch"
msgstr "créer et extraire une nouvelle branche"
-#: builtin/checkout.c:1726
+#: builtin/checkout.c:1767
msgid "create/reset and checkout a branch"
msgstr "créer/réinitialiser et extraire une branche"
-#: builtin/checkout.c:1727
+#: builtin/checkout.c:1768
msgid "create reflog for new branch"
msgstr "créer un reflog pour une nouvelle branche"
-#: builtin/checkout.c:1729
+#: builtin/checkout.c:1770
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr ""
"essayer d'interpréter 'git checkout <branche-inexistante>' (par défaut)"
-#: builtin/checkout.c:1730
+#: builtin/checkout.c:1771
msgid "use overlay mode (default)"
msgstr "utiliser le mode de superposition (défaut)"
-#: builtin/checkout.c:1775
+#: builtin/checkout.c:1816
msgid "create and switch to a new branch"
msgstr "créer et basculer sur une nouvelle branche"
-#: builtin/checkout.c:1777
+#: builtin/checkout.c:1818
msgid "create/reset and switch to a branch"
msgstr "créer/réinitialiser et basculer sur une branche"
-#: builtin/checkout.c:1779
+#: builtin/checkout.c:1820
msgid "second guess 'git switch <no-such-branch>'"
msgstr "interpréter 'git switch <branche-inexistante>'"
-#: builtin/checkout.c:1781
+#: builtin/checkout.c:1822
msgid "throw away local modifications"
msgstr "laisser tomber les modifications locales"
-#: builtin/checkout.c:1813
+#: builtin/checkout.c:1856
msgid "which tree-ish to checkout from"
msgstr "de quel <arbre-esque> faire l'extraction"
-#: builtin/checkout.c:1815
+#: builtin/checkout.c:1858
msgid "restore the index"
msgstr "restaurer l'index"
-#: builtin/checkout.c:1817
+#: builtin/checkout.c:1860
msgid "restore the working tree (default)"
msgstr "restaurer l'arbre de travail (par défaut)"
-#: builtin/checkout.c:1819
+#: builtin/checkout.c:1862
msgid "ignore unmerged entries"
msgstr "ignorer les entrées non-fusionnées"
-#: builtin/checkout.c:1820
+#: builtin/checkout.c:1863
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:301 git-add--interactive.perl:595
+#: builtin/clean.c:302 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -11954,7 +12760,7 @@
"foo - sélectionner un élément par un préfixe unique\n"
" - (vide) ne rien sélectionner\n"
-#: builtin/clean.c:305 git-add--interactive.perl:604
+#: builtin/clean.c:306 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -11975,33 +12781,33 @@
"* - choisir tous les éléments\n"
" - (vide) terminer la sélection\n"
-#: builtin/clean.c:521 git-add--interactive.perl:570
-#: git-add--interactive.perl:575
+#: builtin/clean.c:521 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Hein (%s) ?\n"
-#: builtin/clean.c:663
+#: builtin/clean.c:661
#, c-format
msgid "Input ignore patterns>> "
msgstr "Entrez les motifs à ignorer>> "
-#: builtin/clean.c:700
+#: 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:721
+#: 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:762
+#: builtin/clean.c:758
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Supprimer %s [y/N] ? "
-#: builtin/clean.c:795
+#: builtin/clean.c:789
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -12019,56 +12825,52 @@
"help - cet écran\n"
"? - aide pour la sélection en ligne"
-#: builtin/clean.c:831
+#: 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:847
+#: builtin/clean.c:841
msgid "No more files to clean, exiting."
msgstr "Plus de fichier à nettoyer, sortie."
-#: builtin/clean.c:909
+#: 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:911
+#: builtin/clean.c:905
msgid "force"
msgstr "forcer"
-#: builtin/clean.c:912
+#: builtin/clean.c:906
msgid "interactive cleaning"
msgstr "nettoyage interactif"
-#: builtin/clean.c:914
+#: builtin/clean.c:908
msgid "remove whole directories"
msgstr "supprimer les répertoires entiers"
-#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564
-#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179
-#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/grep.c:922 builtin/log.c:184 builtin/log.c:186
+#: builtin/ls-files.c:573 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "motif"
-#: builtin/clean.c:916
+#: builtin/clean.c:910
msgid "add <pattern> to ignore rules"
msgstr "ajouter <motif> aux règles ignore"
-#: builtin/clean.c:917
+#: builtin/clean.c:911
msgid "remove ignored files, too"
msgstr "supprimer les fichiers ignorés, aussi"
-#: builtin/clean.c:919
+#: builtin/clean.c:913
msgid "remove only ignored files"
msgstr "supprimer seulement les fichiers ignorés"
-#: builtin/clean.c:937
-msgid "-x and -X cannot be used together"
-msgstr "-x et -X ne peuvent pas être utilisés ensemble"
-
-#: builtin/clean.c:941
+#: builtin/clean.c:929
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -12076,7 +12878,7 @@
"clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de "
"nettoyer"
-#: builtin/clean.c:944
+#: builtin/clean.c:932
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -12084,31 +12886,35 @@
"clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de "
"nettoyer"
+#: 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>]"
-#: builtin/clone.c:93
+#: builtin/clone.c:94
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:95 builtin/clone.c:97 builtin/init-db.c:555
msgid "create a bare repository"
msgstr "créer un dépôt nu"
-#: builtin/clone.c:98
+#: builtin/clone.c:99
msgid "create a mirror repository (implies bare)"
msgstr "créer un dépôt miroir (implique dépôt nu)"
-#: builtin/clone.c:100
+#: builtin/clone.c:101
msgid "to clone from a local repository"
msgstr "pour cloner depuis un dépôt local"
-#: builtin/clone.c:102
+#: builtin/clone.c:103
msgid "don't use local hardlinks, always copy"
msgstr "ne pas utiliser de liens durs locaux, toujours copier"
-#: builtin/clone.c:104
+#: builtin/clone.c:105
msgid "setup as shared repository"
msgstr "régler comme dépôt partagé"
@@ -12120,135 +12926,136 @@
msgid "initialize submodules in the clone"
msgstr "initialiser les sous-modules dans le clone"
-#: builtin/clone.c:110
+#: builtin/clone.c:111
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:112 builtin/init-db.c:552
msgid "template-directory"
msgstr "répertoire-modèle"
-#: builtin/clone.c:112 builtin/init-db.c:487
+#: builtin/clone.c:113 builtin/init-db.c:553
msgid "directory from which templates will be used"
msgstr "répertoire depuis lequel les modèles vont être utilisés"
-#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407
-#: builtin/submodule--helper.c:1912
+#: builtin/clone.c:115 builtin/clone.c:117 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:1409
-#: builtin/submodule--helper.c:1914
+#: builtin/clone.c:119 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:3441 builtin/repack.c:327
+#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3561 builtin/repack.c:357
msgid "name"
msgstr "nom"
-#: builtin/clone.c:120
+#: builtin/clone.c:121
msgid "use <name> instead of 'origin' to track upstream"
msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont"
-#: builtin/clone.c:122
+#: builtin/clone.c:123
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"
-#: builtin/clone.c:124
+#: builtin/clone.c:125
msgid "path to git-upload-pack on the remote"
msgstr "chemin vers git-upload-pack sur le serveur distant"
-#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828
-#: builtin/pull.c:207
+#: builtin/clone.c:126 builtin/fetch.c:176 builtin/grep.c:861
+#: builtin/pull.c:208
msgid "depth"
msgstr "profondeur"
-#: builtin/clone.c:126
+#: builtin/clone.c:127
msgid "create a shallow clone of that depth"
msgstr "créer un clone superficiel de cette profondeur"
-#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430
+#: builtin/clone.c:128 builtin/fetch.c:178 builtin/pack-objects.c:3550
+#: builtin/pull.c:211
msgid "time"
msgstr "heure"
-#: builtin/clone.c:128
+#: builtin/clone.c:129
msgid "create a shallow clone since a specific time"
msgstr "créer un clone superficiel depuis une date spécifique"
-#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195
-#: builtin/rebase.c:1480
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/fetch.c:203
+#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1323
msgid "revision"
msgstr "révision"
-#: builtin/clone.c:130 builtin/fetch.c:173
+#: builtin/clone.c:131 builtin/fetch.c:181 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/submodule--helper.c:1419
-#: builtin/submodule--helper.c:1928
+#: builtin/clone.c:133 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"
-#: builtin/clone.c:134
+#: builtin/clone.c:135
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
"ne pas cloner les tags et indiquer aux récupérations futures de ne pas le "
"faire"
-#: builtin/clone.c:136
+#: builtin/clone.c:137
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:138 builtin/init-db.c:561
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:138 builtin/init-db.c:496
+#: builtin/clone.c:139 builtin/init-db.c:562
msgid "separate git dir from working tree"
msgstr "séparer le répertoire git de la copie de travail"
-#: builtin/clone.c:139
+#: builtin/clone.c:140
msgid "key=value"
msgstr "clé=valeur"
-#: builtin/clone.c:140
+#: builtin/clone.c:141
msgid "set config inside the new repository"
msgstr "régler la configuration dans le nouveau dépôt"
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
-#: builtin/push.c:573 builtin/send-pack.c:172
+#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77
+#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
msgid "server-specific"
msgstr "spécifique au serveur"
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
-#: builtin/push.c:573 builtin/send-pack.c:173
+#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77
+#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
msgid "option to transmit"
msgstr "option à transmettre"
-#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220
-#: builtin/push.c:574
+#: builtin/clone.c:144 builtin/fetch.c:199 builtin/pull.c:234
+#: builtin/push.c:585
msgid "use IPv4 addresses only"
msgstr "n'utiliser que des adresses IPv4"
-#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223
-#: builtin/push.c:576
+#: builtin/clone.c:146 builtin/fetch.c:201 builtin/pull.c:237
+#: builtin/push.c:587
msgid "use IPv6 addresses only"
msgstr "n'utiliser que des adresses IPv6"
-#: builtin/clone.c:149
+#: builtin/clone.c:150
msgid "any cloned submodules will use their remote-tracking branch"
msgstr ""
"tous les sous-modules clonés utiliseront leur branche de suivi à distance"
-#: builtin/clone.c:151
+#: builtin/clone.c:152
msgid "initialize sparse-checkout file to include only files at root"
msgstr ""
"initialiser le fichier d'extraction partielle pour n'inclure que les "
"fichiers à la racine"
-#: builtin/clone.c:287
+#: builtin/clone.c:288
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -12256,42 +13063,42 @@
"Aucun nom de répertoire n'a pu être deviné\n"
"Veuillez spécifier un répertoire dans la ligne de commande"
-#: builtin/clone.c:340
+#: builtin/clone.c:341
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info : impossible d'ajouter une alternative pour '%s' : %s\n"
-#: builtin/clone.c:413
+#: builtin/clone.c:414
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existe et n'est pas un répertoire"
-#: builtin/clone.c:430
+#: builtin/clone.c:432
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "échec du démarrage un itérateur sur '%s'"
-#: builtin/clone.c:460
+#: builtin/clone.c:463
#, c-format
msgid "failed to create link '%s'"
msgstr "échec de la création du lien '%s'"
-#: builtin/clone.c:464
+#: builtin/clone.c:467
#, c-format
msgid "failed to copy file to '%s'"
msgstr "échec de la copie vers '%s'"
-#: builtin/clone.c:469
+#: builtin/clone.c:472
#, c-format
msgid "failed to iterate over '%s'"
msgstr "échec de l'itération sur '%s'"
-#: builtin/clone.c:494
+#: builtin/clone.c:499
#, c-format
msgid "done.\n"
msgstr "fait.\n"
-#: builtin/clone.c:508
+#: builtin/clone.c:513
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -12301,102 +13108,107 @@
"Vous pouvez inspecter ce qui a été extrait avec 'git status'\n"
"et réessayer avec 'git restore --source=HEAD :/'\n"
-#: builtin/clone.c:585
+#: builtin/clone.c:590
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Impossible de trouver la branche distante '%s' à cloner."
-#: builtin/clone.c:705
+#: builtin/clone.c:709
#, c-format
msgid "unable to update %s"
msgstr "impossible de mettre à jour %s"
-#: builtin/clone.c:753
+#: builtin/clone.c:757
msgid "failed to initialize sparse-checkout"
msgstr "échec lors de l'initialisation l'extraction partielle"
-#: builtin/clone.c:776
+#: builtin/clone.c:780
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"la HEAD distante réfère à une référence non existante, impossible de "
"l'extraire.\n"
-#: builtin/clone.c:807
+#: builtin/clone.c:812
msgid "unable to checkout working tree"
msgstr "impossible d'extraire la copie de travail"
-#: builtin/clone.c:862
+#: builtin/clone.c:887
msgid "unable to write parameters to config file"
msgstr "impossible d'écrire les paramètres dans le fichier de configuration"
-#: builtin/clone.c:925
+#: builtin/clone.c:950
msgid "cannot repack to clean up"
msgstr "impossible de remballer pour nettoyer"
-#: builtin/clone.c:927
+#: builtin/clone.c:952
msgid "cannot unlink temporary alternates file"
msgstr "impossible de délier le fichier temporaire alternates"
-#: builtin/clone.c:965 builtin/receive-pack.c:1950
+#: builtin/clone.c:993 builtin/receive-pack.c:2493
msgid "Too many arguments."
msgstr "Trop d'arguments."
-#: builtin/clone.c:969
+#: builtin/clone.c:997
msgid "You must specify a repository to clone."
msgstr "Vous devez spécifier un dépôt à cloner."
-#: builtin/clone.c:982
+#: builtin/clone.c:1010
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "les options --bare et --origin %s sont incompatibles."
-#: builtin/clone.c:985
+#: builtin/clone.c:1013
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare et --separate-git-dir sont incompatibles."
-#: builtin/clone.c:998
+#: builtin/clone.c:1026
#, c-format
msgid "repository '%s' does not exist"
msgstr "le dépôt '%s' n'existe pas"
-#: builtin/clone.c:1004 builtin/fetch.c:1796
+#: builtin/clone.c:1030 builtin/fetch.c:1951
#, c-format
msgid "depth %s is not a positive number"
msgstr "la profondeur %s n'est pas un entier positif"
-#: builtin/clone.c:1014
+#: builtin/clone.c:1040
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
"le chemin de destination '%s' existe déjà et n'est pas un répertoire vide."
-#: builtin/clone.c:1024
+#: builtin/clone.c:1046
+#, 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:1060
#, c-format
msgid "working tree '%s' already exists."
msgstr "la copie de travail '%s' existe déjà."
-#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271
-#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327
+#: builtin/clone.c:1075 builtin/clone.c:1096 builtin/difftool.c:271
+#: builtin/log.c:1986 builtin/worktree.c:282 builtin/worktree.c:314
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "impossible de créer les répertoires de premier niveau dans '%s'"
-#: builtin/clone.c:1044
+#: builtin/clone.c:1080
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "impossible de créer le répertoire de la copie de travail '%s'"
-#: builtin/clone.c:1064
+#: builtin/clone.c:1100
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Clonage dans le dépôt nu '%s'\n"
-#: builtin/clone.c:1066
+#: builtin/clone.c:1102
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Clonage dans '%s'...\n"
-#: builtin/clone.c:1090
+#: builtin/clone.c:1126
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -12404,41 +13216,46 @@
"clone --recursive n'est pas compatible avec à la fois --reference et --"
"reference-if-able"
-#: builtin/clone.c:1154
+#: builtin/clone.c:1170 builtin/remote.c:200 builtin/remote.c:705
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr "'%s' n'est pas un nom valide de distante"
+
+#: builtin/clone.c:1211
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
"--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"."
-#: builtin/clone.c:1156
+#: builtin/clone.c:1213
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-since est ignoré dans les clones locaux : utilisez plutôt \"file://"
"\"."
-#: builtin/clone.c:1158
+#: builtin/clone.c:1215
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-exclude est ignoré dans les clones locaux : utilisez plutôt "
"\"file://\"."
-#: builtin/clone.c:1160
+#: builtin/clone.c:1217
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter est ignoré dans les clones locaux ; utilisez plutôt file:// ."
-#: builtin/clone.c:1163
+#: builtin/clone.c:1220
msgid "source repository is shallow, ignoring --local"
msgstr "le dépôt source est superficiel, option --local ignorée"
-#: builtin/clone.c:1168
+#: builtin/clone.c:1225
msgid "--local is ignored"
msgstr "--local est ignoré"
-#: builtin/clone.c:1243 builtin/clone.c:1251
+#: builtin/clone.c:1315 builtin/clone.c:1323
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "La branche distante %s n'a pas été trouvée dans le dépôt amont %s"
-#: builtin/clone.c:1254
+#: builtin/clone.c:1326
msgid "You appear to have cloned an empty repository."
msgstr "Vous semblez avoir cloné un dépôt vide."
@@ -12474,6 +13291,112 @@
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:187 builtin/log.c:1768
+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 "
@@ -12487,7 +13410,7 @@
msgid "duplicate parent %s ignored"
msgstr "le parent dupliqué %s est ignoré"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:557
#, c-format
msgid "not a valid object name %s"
msgstr "nom d'objet invalide %s"
@@ -12515,13 +13438,13 @@
msgid "id of a parent commit object"
msgstr "id d'un objet commit parent"
-#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477
-#: builtin/tag.c:412
+#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:282
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1537
+#: builtin/tag.c:445
msgid "message"
msgstr "message"
-#: builtin/commit-tree.c:115 builtin/commit.c:1501
+#: builtin/commit-tree.c:115 builtin/commit.c:1504
msgid "commit message"
msgstr "message de validation"
@@ -12529,8 +13452,8 @@
msgid "read commit log message from file"
msgstr "lire le message de validation depuis un fichier"
-#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288
-#: builtin/pull.c:175 builtin/revert.c:118
+#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:299
+#: builtin/pull.c:176 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "signer la validation avec GPG"
@@ -12577,10 +13500,14 @@
"\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"
@@ -12602,69 +13529,73 @@
" 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:351
+#: 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:364
+#: 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:376
+#: builtin/commit.c:373
msgid "unable to create temporary index"
msgstr "impossible de créer l'index temporaire"
-#: builtin/commit.c:385
+#: builtin/commit.c:382
msgid "interactive add failed"
msgstr "échec de l'ajout interactif"
-#: builtin/commit.c:400
+#: builtin/commit.c:397
msgid "unable to update temporary index"
msgstr "impossible de mettre à jour l'index temporaire"
-#: builtin/commit.c:402
+#: builtin/commit.c:399
msgid "Failed to update main cache tree"
msgstr "Impossible de mettre à jour l'arbre de cache principal"
-#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496
+#: builtin/commit.c: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:479
+#: 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:481
+#: 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:489
+#: 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:508
+#: builtin/commit.c:507
msgid "unable to write temporary index file"
msgstr "impossible d'écrire le fichier d'index temporaire"
-#: builtin/commit.c:606
+#: 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:608
+#: 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:627
+#: builtin/commit.c:626
msgid "malformed --author parameter"
msgstr "paramètre --author mal formé"
-#: builtin/commit.c:680
+#: builtin/commit.c:679
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -12672,68 +13603,66 @@
"impossible de sélectionner un caractère de commentaire\n"
"qui n'est pas utilisé dans le message de validation actuel"
-#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097
+#: builtin/commit.c: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:730 builtin/shortlog.c:319
+#: builtin/commit.c:729 builtin/shortlog.c:413
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(lecture du message de journal depuis l'entrée standard)\n"
-#: builtin/commit.c:732
+#: builtin/commit.c:731
msgid "could not read log from standard input"
msgstr "impossible de lire le journal depuis l'entrée standard"
-#: builtin/commit.c:736
+#: builtin/commit.c:735
#, c-format
msgid "could not read log file '%s'"
msgstr "impossible de lire le fichier de journal '%s'"
-#: builtin/commit.c:767 builtin/commit.c:783
+#: builtin/commit.c:766 builtin/commit.c:782
msgid "could not read SQUASH_MSG"
msgstr "impossible de lire SQUASH_MSG"
-#: builtin/commit.c:774
+#: builtin/commit.c:773
msgid "could not read MERGE_MSG"
msgstr "impossible de lire MERGE_MSG"
-#: builtin/commit.c:834
+#: builtin/commit.c:833
msgid "could not write commit template"
msgstr "impossible d'écrire le modèle de commit"
#: builtin/commit.c:853
-#, c-format
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
+"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:858
-#, c-format
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
+"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:871
+#: builtin/commit.c:868
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -12743,7 +13672,7 @@
"commençant par '%c' seront ignorées, et un message vide abandonne la "
"validation.\n"
-#: builtin/commit.c:879
+#: builtin/commit.c:876
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -12754,22 +13683,22 @@
"commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n"
"si vous le souhaitez. Un message vide abandonne la validation.\n"
-#: builtin/commit.c:896
+#: builtin/commit.c:893
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAuteur : %.*s <%.*s>"
-#: builtin/commit.c:904
+#: builtin/commit.c:901
#, c-format
msgid "%sDate: %s"
msgstr "%sDate : %s"
-#: builtin/commit.c:911
+#: builtin/commit.c:908
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sValidateur : %.*s <%.*s>"
-#: builtin/commit.c:929
+#: builtin/commit.c:926
msgid "Cannot read index"
msgstr "Impossible de lire l'index"
@@ -12777,7 +13706,7 @@
msgid "Error building trees"
msgstr "Erreur lors de la construction des arbres"
-#: builtin/commit.c:1011 builtin/tag.c:275
+#: builtin/commit.c:1011 builtin/tag.c:308
#, 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"
@@ -12794,7 +13723,7 @@
msgid "Invalid ignored mode '%s'"
msgstr "Mode de fichier ignoré invalide '%s'"
-#: builtin/commit.c:1087 builtin/commit.c:1327
+#: builtin/commit.c:1087 builtin/commit.c:1331
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Mode de fichier non suivi invalide '%s'"
@@ -12819,79 +13748,83 @@
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Vous êtes en plein picorage -- impossible de corriger (amend)."
-#: builtin/commit.c:1188
+#: builtin/commit.c: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:1198
+#: 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:1200
+#: 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:1208
+#: 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:1225
+#: 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:1231
+#: 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:1362 builtin/commit.c:1524
+#: builtin/commit.c:1366 builtin/commit.c:1527
msgid "show status concisely"
msgstr "afficher l'état avec concision"
-#: builtin/commit.c:1364 builtin/commit.c:1526
+#: builtin/commit.c:1368 builtin/commit.c:1529
msgid "show branch information"
msgstr "afficher l'information de branche"
-#: builtin/commit.c:1366
+#: builtin/commit.c:1370
msgid "show stash information"
msgstr "afficher l'information de remisage"
-#: builtin/commit.c:1368 builtin/commit.c:1528
+#: 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:1370
+#: builtin/commit.c:1374
msgid "version"
msgstr "version"
-#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549
-#: builtin/worktree.c:643
+#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560
+#: builtin/worktree.c:679
msgid "machine-readable output"
msgstr "sortie pour traitement automatique"
-#: builtin/commit.c:1373 builtin/commit.c:1532
+#: 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:1376 builtin/commit.c:1535
+#: builtin/commit.c:1380 builtin/commit.c:1538
msgid "terminate entries with NUL"
msgstr "terminer les éléments par NUL"
-#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538
-#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
-#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336
+#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541
+#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
+#: builtin/fast-export.c:1204 builtin/rebase.c:1412 parse-options.h:336
msgid "mode"
msgstr "mode"
-#: builtin/commit.c:1379 builtin/commit.c:1538
+#: 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:1383
+#: builtin/commit.c:1387
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -12899,11 +13832,11 @@
"afficher les fichiers ignorés, \"mode\" facultatif : traditional "
"(traditionnel), matching (correspondant), no. (Défaut : traditional)"
-#: builtin/commit.c:1385 parse-options.h:192
+#: builtin/commit.c:1389 parse-options.h:192
msgid "when"
msgstr "quand"
-#: builtin/commit.c:1386
+#: builtin/commit.c:1390
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -12911,175 +13844,175 @@
"ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "
"(tous), dirty (sale), untracked (non suivi). (Défaut : all)"
-#: builtin/commit.c:1388
+#: builtin/commit.c:1392
msgid "list untracked files in columns"
msgstr "afficher les fichiers non suivis en colonnes"
-#: builtin/commit.c:1389
+#: builtin/commit.c:1393
msgid "do not detect renames"
msgstr "ne pas détecter les renommages"
-#: builtin/commit.c:1391
+#: 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:1411
+#: 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:1494
+#: builtin/commit.c:1497
msgid "suppress summary after successful commit"
msgstr "supprimer le résumé après une validation réussie"
-#: builtin/commit.c:1495
+#: 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:1497
+#: builtin/commit.c:1500
msgid "Commit message options"
msgstr "Options du message de validation"
-#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414
+#: builtin/commit.c:1501 builtin/merge.c:286 builtin/tag.c:447
msgid "read message from file"
msgstr "lire le message depuis un fichier"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1502
msgid "author"
msgstr "auteur"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1502
msgid "override author for commit"
msgstr "remplacer l'auteur pour la validation"
-#: builtin/commit.c:1500 builtin/gc.c:538
+#: builtin/commit.c:1503 builtin/gc.c:550
msgid "date"
msgstr "date"
-#: builtin/commit.c:1500
+#: builtin/commit.c:1503
msgid "override date for commit"
msgstr "remplacer la date pour la validation"
-#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504
-#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92
+#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507
+#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:90
msgid "commit"
msgstr "commit"
-#: builtin/commit.c:1502
+#: 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:1503
+#: builtin/commit.c:1506
msgid "reuse message from specified commit"
msgstr "réutiliser le message du commit spécifié"
-#: builtin/commit.c:1504
+#: 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:1505
+#: 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:1506
+#: 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:1507 builtin/log.c:1634 builtin/merge.c:290
-#: builtin/pull.c:144 builtin/revert.c:110
-msgid "add Signed-off-by:"
-msgstr "ajouter une entrée Signed-off-by :"
+#: builtin/commit.c:1510 builtin/log.c:1743 builtin/merge.c:302
+#: builtin/pull.c:145 builtin/revert.c:110
+msgid "add a Signed-off-by trailer"
+msgstr "ajouter une ligne terminale Signed-off-by"
-#: builtin/commit.c:1508
+#: builtin/commit.c:1511
msgid "use specified template file"
msgstr "utiliser le fichier de modèle spécifié"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1512
msgid "force edit of commit"
msgstr "forcer l'édition du commit"
-#: builtin/commit.c:1511
+#: 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:1516
+#: builtin/commit.c:1519
msgid "Commit contents options"
msgstr "Valider les options des contenus"
-#: builtin/commit.c:1517
+#: builtin/commit.c:1520
msgid "commit all changed files"
msgstr "valider tous les fichiers modifiés"
-#: builtin/commit.c:1518
+#: 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:1519
+#: builtin/commit.c:1522
msgid "interactively add files"
msgstr "ajouter des fichiers en mode interactif"
-#: builtin/commit.c:1520
+#: builtin/commit.c:1523
msgid "interactively add changes"
msgstr "ajouter les modifications en mode interactif"
-#: builtin/commit.c:1521
+#: builtin/commit.c:1524
msgid "commit only specified files"
msgstr "valider seulement les fichiers spécifiés"
-#: builtin/commit.c:1522
+#: 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:1523
+#: builtin/commit.c:1526
msgid "show what would be committed"
msgstr "afficher ce qui serait validé"
-#: builtin/commit.c:1536
+#: builtin/commit.c:1539
msgid "amend previous commit"
msgstr "corriger la validation précédente"
-#: builtin/commit.c:1537
+#: builtin/commit.c:1540
msgid "bypass post-rewrite hook"
msgstr "éviter d'utiliser le crochet post-rewrite"
-#: builtin/commit.c:1544
+#: builtin/commit.c:1547
msgid "ok to record an empty change"
msgstr "accepter d'enregistrer une modification vide"
-#: builtin/commit.c:1546
+#: 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:1619
+#: builtin/commit.c:1622
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Fichier MERGE_HEAD corrompu (%s)"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1629
msgid "could not read MERGE_MODE"
msgstr "impossible de lire MERGE_MODE"
-#: builtin/commit.c:1645
+#: 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:1652
+#: 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:1657
+#: 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:1691
+#: 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"
@@ -13089,292 +14022,227 @@
"new_index. Vérifiez que le disque n'est pas plein ou que le quota\n"
"n'a pas été dépassé, puis lancez \"git restore --staged :/\" pour réparer."
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:17
-msgid ""
-"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
-msgstr ""
-"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
-
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:22
-msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
-msgstr ""
-"git commit-graph write [--object-dir <répertoire-d'objet>] [--append|--"
-"split] [--reachable|--stdin-packs|--stdin-commits] [--|no-]progress] "
-"<options de division>"
-
-#: builtin/commit-graph.c:52
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "impossible de trouver le répertoire objet correspondant à %s"
-
-#: builtin/commit-graph.c:68 builtin/commit-graph.c:125
-#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657
-msgid "dir"
-msgstr "répertoire"
-
-#: builtin/commit-graph.c:69 builtin/commit-graph.c:126
-#: builtin/commit-graph.c:211
-msgid "The object directory to store the graph"
-msgstr "Le répertoire d'objet où stocker le graphe"
-
-#: builtin/commit-graph.c:71
-msgid "if the commit-graph is split, only verify the tip file"
-msgstr ""
-"si le graphe de commit est divisé, vérifier seulement le fichier sommet"
-
-#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23
-#, c-format
-msgid "Could not open commit-graph '%s'"
-msgstr "impossible d'ouvrir le graphe de commit '%s'"
-
-#: builtin/commit-graph.c:128
-msgid "start walk at all refs"
-msgstr "commencer le parcours à toutes les réfs"
-
-#: builtin/commit-graph.c:130
-msgid "scan pack-indexes listed by stdin for commits"
-msgstr "scanner les index compactés listés sur stdin à la recherche de commits"
-
-#: builtin/commit-graph.c:132
-msgid "start walk at commits listed by stdin"
-msgstr "commencer le parcours aux commits listés sur stdin"
-
-#: builtin/commit-graph.c:134
-msgid "include all commits already in the commit-graph file"
-msgstr ""
-"inclure tous les commits déjà présents dans le fichier de graphe de commits"
-
-#: builtin/commit-graph.c:137
-msgid "allow writing an incremental commit-graph file"
-msgstr "permettre d'écrire un fichier incrémental de graphe de commit"
-
-#: builtin/commit-graph.c:139 builtin/commit-graph.c:143
-msgid "maximum number of commits in a non-base split commit-graph"
-msgstr ""
-"le nombre maximum de commits dans un graphe de commit divisé pas de base"
-
-#: builtin/commit-graph.c:141
-msgid "maximum ratio between two levels of a split commit-graph"
-msgstr "rapport maximum entre deux niveaux d'un graphe de commit divisé"
-
-#: builtin/commit-graph.c:159
-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:104 builtin/env--helper.c:23
+#: builtin/config.c:109 builtin/env--helper.c:27
#, c-format
msgid "unrecognized --type argument, %s"
msgstr "argument --type non reconnu, %s"
-#: builtin/config.c:116
+#: builtin/config.c:121
msgid "only one type at a time"
msgstr "qu'un seul type à la fois"
-#: builtin/config.c:125
+#: builtin/config.c:130
msgid "Config file location"
msgstr "Emplacement du fichier de configuration"
-#: builtin/config.c:126
+#: builtin/config.c:131
msgid "use global config file"
msgstr "utiliser les fichier de configuration global"
-#: builtin/config.c:127
+#: builtin/config.c:132
msgid "use system config file"
msgstr "utiliser le fichier de configuration du système"
-#: builtin/config.c:128
+#: builtin/config.c:133
msgid "use repository config file"
msgstr "utiliser le fichier de configuration du dépôt"
-#: builtin/config.c:129
+#: builtin/config.c:134
msgid "use per-worktree config file"
msgstr "utiliser un fichier de configuration par arbre de travail"
-#: builtin/config.c:130
+#: builtin/config.c:135
msgid "use given config file"
msgstr "utiliser le fichier de configuration spécifié"
-#: builtin/config.c:131
+#: builtin/config.c:136
msgid "blob-id"
msgstr "blob-id"
-#: builtin/config.c:131
+#: builtin/config.c:136
msgid "read config from given blob object"
msgstr "lire la configuration depuis l'objet blob fourni"
-#: builtin/config.c:132
+#: builtin/config.c:137
msgid "Action"
msgstr "Action"
-#: builtin/config.c:133
-msgid "get value: name [value-regex]"
-msgstr "obtenir la valeur : nom [regex-de-valeur]"
+#: builtin/config.c:138
+msgid "get value: name [value-pattern]"
+msgstr "obtenir la valeur : nom [motif-de-valeur]"
-#: builtin/config.c:134
-msgid "get all values: key [value-regex]"
-msgstr "obtenir toutes les valeurs : clé [regex-de-valeur]"
+#: builtin/config.c:139
+msgid "get all values: key [value-pattern]"
+msgstr "obtenir toutes les valeurs : clé [motif-de-valeur]"
-#: builtin/config.c:135
-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:140
+msgid "get values for regexp: name-regex [value-pattern]"
+msgstr "obtenir les valeur pour la regexp : regex-de-nom [motif-de-valeur]"
-#: builtin/config.c:136
+#: builtin/config.c:141
msgid "get value specific for the URL: section[.var] URL"
msgstr "obtenir la valeur spécifique pour l'URL : section[.var] URL"
-#: builtin/config.c:137
-msgid "replace all matching variables: name value [value_regex]"
+#: builtin/config.c:142
+msgid "replace all matching variables: name value [value-pattern]"
msgstr ""
-"remplacer toutes les variables correspondant : nom valeur [regex-de-valeur]"
+"remplacer toutes les variables correspondant : nom valeur [motif-de-valeur]"
-#: builtin/config.c:138
+#: builtin/config.c:143
msgid "add a new variable: name value"
msgstr "ajouter une nouvelle variable : nom valeur"
-#: builtin/config.c:139
-msgid "remove a variable: name [value-regex]"
-msgstr "supprimer une variable : nom [regex-de-valeur]"
+#: builtin/config.c:144
+msgid "remove a variable: name [value-pattern]"
+msgstr "supprimer une variable : nom [motif-de-valeur]"
-#: builtin/config.c:140
-msgid "remove all matches: name [value-regex]"
-msgstr "supprimer toutes les correspondances nom [regex-de-valeur]"
+#: builtin/config.c:145
+msgid "remove all matches: name [value-pattern]"
+msgstr "supprimer toutes les correspondances nom [motif-de-valeur]"
-#: builtin/config.c:141
+#: builtin/config.c:146
msgid "rename section: old-name new-name"
msgstr "renommer une section : ancien-nom nouveau-nom"
-#: builtin/config.c:142
+#: builtin/config.c:147
msgid "remove a section: name"
msgstr "supprimer une section : nom"
-#: builtin/config.c:143
+#: builtin/config.c:148
msgid "list all"
msgstr "afficher tout"
-#: builtin/config.c:144
+#: builtin/config.c:149
+msgid "use string equality when comparing values to 'value-pattern'"
+msgstr ""
+"utiliser l'égalité de chaînes lors de la comparaison de 'motif-de-valeur'"
+
+#: builtin/config.c:150
msgid "open an editor"
msgstr "ouvrir un éditeur"
-#: builtin/config.c:145
+#: builtin/config.c:151
msgid "find the color configured: slot [default]"
msgstr "trouver la couleur configurée : slot [par défaut]"
-#: builtin/config.c:146
+#: builtin/config.c:152
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "trouver le réglage de la couleur : slot [stdout-est-tty]"
-#: builtin/config.c:147
+#: builtin/config.c:153
msgid "Type"
msgstr "Type"
-#: builtin/config.c:148 builtin/env--helper.c:38
+#: builtin/config.c:154 builtin/env--helper.c:43
msgid "value is given this type"
msgstr "ce type est assigné à la valeur"
-#: builtin/config.c:149
+#: builtin/config.c:155
msgid "value is \"true\" or \"false\""
msgstr "la valeur est \"true\" (vrai) ou \"false\" (faux)"
-#: builtin/config.c:150
+#: builtin/config.c:156
msgid "value is decimal number"
msgstr "la valeur est un nombre décimal"
-#: builtin/config.c:151
+#: builtin/config.c:157
msgid "value is --bool or --int"
msgstr "la valeur est --bool ou --int"
-#: builtin/config.c:152
+#: builtin/config.c:158
+msgid "value is --bool or string"
+msgstr "la valeur est --bool ou une chaîne"
+
+#: builtin/config.c:159
msgid "value is a path (file or directory name)"
msgstr "la valeur est un chemin (vers un fichier ou un répertoire)"
-#: builtin/config.c:153
+#: builtin/config.c:160
msgid "value is an expiry date"
msgstr "la valeur est une date d'expiration"
-#: builtin/config.c:154
+#: builtin/config.c:161
msgid "Other"
msgstr "Autre"
-#: builtin/config.c:155
+#: builtin/config.c:162
msgid "terminate values with NUL byte"
msgstr "terminer les valeurs avec un caractère NUL"
-#: builtin/config.c:156
+#: builtin/config.c:163
msgid "show variable names only"
msgstr "n'afficher que les noms de variable"
-#: builtin/config.c:157
+#: builtin/config.c:164
msgid "respect include directives on lookup"
msgstr "respecter les directives d'inclusion lors de la recherche"
-#: builtin/config.c:158
+#: builtin/config.c:165
msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
"afficher l'origine de la configuration (fichier, entrée standard, blob, "
"ligne de commande)"
-#: builtin/config.c:159
+#: builtin/config.c:166
msgid "show scope of config (worktree, local, global, system, command)"
msgstr ""
"afficher la portée de configuration (arbre de travail, local, global, "
"système, commande)"
-#: builtin/config.c:160 builtin/env--helper.c:40
+#: builtin/config.c:167 builtin/env--helper.c:45
msgid "value"
msgstr "valeur"
-#: builtin/config.c:160
+#: builtin/config.c:167
msgid "with --get, use default value when missing entry"
msgstr "avec --get, utiliser le valeur par défaut quand l'entrée n'existe pas"
-#: builtin/config.c:174
+#: builtin/config.c:181
#, c-format
msgid "wrong number of arguments, should be %d"
msgstr "mauvais nombre d'arguments, devrait être %d"
-#: builtin/config.c:176
+#: builtin/config.c:183
#, c-format
msgid "wrong number of arguments, should be from %d to %d"
msgstr "mauvais nombre d'arguments, devrait être entre %d et %d"
-#: builtin/config.c:324
+#: builtin/config.c:339
#, c-format
msgid "invalid key pattern: %s"
msgstr "motif de clé invalide : %s"
-#: builtin/config.c:360
+#: builtin/config.c:377
#, c-format
msgid "failed to format default config value: %s"
msgstr "échec du formatage de la valeur de config par défaut : %s"
-#: builtin/config.c:417
+#: builtin/config.c:441
#, c-format
msgid "cannot parse color '%s'"
msgstr "impossible d'analyser la couleur '%s'"
-#: builtin/config.c:459
+#: builtin/config.c:483
msgid "unable to parse default color value"
msgstr "impossible de lire la valeur de couleur par défaut"
-#: builtin/config.c:512 builtin/config.c:768
+#: builtin/config.c:536 builtin/config.c:833
msgid "not in a git directory"
msgstr "pas dans un répertoire git"
-#: builtin/config.c:515
+#: builtin/config.c:539
msgid "writing to stdin is not supported"
msgstr "l'écriture sur stdin n'est pas supportée"
-#: builtin/config.c:518
+#: builtin/config.c:542
msgid "writing config blobs is not supported"
msgstr "l'écriture de blob de configuration n'est pas supportée<"
-#: builtin/config.c:603
+#: builtin/config.c:627
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -13389,23 +14257,27 @@
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:627
+#: builtin/config.c:652
msgid "only one config file at a time"
msgstr "un seul fichier de configuration à la fois"
-#: builtin/config.c:632
+#: builtin/config.c:658
msgid "--local can only be used inside a git repository"
msgstr "--local ne peut être utilisé qu'à l'intérieur d'un dépôt git"
-#: builtin/config.c:635
+#: builtin/config.c:660
msgid "--blob can only be used inside a git repository"
msgstr "--blob ne peut être utilisé qu'à l'intérieur d'un dépôt git"
-#: builtin/config.c:655
+#: builtin/config.c:662
+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:684
msgid "$HOME not set"
msgstr "$HOME n'est pas défini"
-#: builtin/config.c:679
+#: builtin/config.c:708
msgid ""
"--worktree cannot be used with multiple working trees unless the config\n"
"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -13416,19 +14288,19 @@
"la section \"CONFIGURATION FILE\" de \"git help worktree\" pour plus de "
"détails"
-#: builtin/config.c:714
+#: builtin/config.c:743
msgid "--get-color and variable type are incoherent"
msgstr "--get-color et le type de la variable sont incohérents"
-#: builtin/config.c:719
+#: builtin/config.c:748
msgid "only one action at a time"
msgstr "une seule action à la fois"
-#: builtin/config.c:732
+#: builtin/config.c:761
msgid "--name-only is only applicable to --list or --get-regexp"
msgstr "--name-only n'est applicable qu'avec --list ou --get-regexp"
-#: builtin/config.c:738
+#: builtin/config.c:767
msgid ""
"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
"list"
@@ -13436,33 +14308,37 @@
"--show-origin n'est applicable qu'avec --get, --get-all, --get-regexp ou --"
"list"
-#: builtin/config.c:744
+#: builtin/config.c:773
msgid "--default is only applicable to --get"
msgstr "--default n'est applicable qu'avec --get"
-#: builtin/config.c:757
+#: builtin/config.c:806
+msgid "--fixed-value only applies with 'value-pattern'"
+msgstr "--fixed-value ne s'applique qu'à 'motif-de-valeur'"
+
+#: builtin/config.c:822
#, c-format
msgid "unable to read config file '%s'"
msgstr "lecture du fichier de configuration '%s' impossible"
-#: builtin/config.c:760
+#: builtin/config.c:825
msgid "error processing config file(s)"
msgstr "erreur lors du traitement de fichier(s) de configuration"
-#: builtin/config.c:770
+#: builtin/config.c:835
msgid "editing stdin is not supported"
msgstr "l'édition de stdin n'est pas supportée"
-#: builtin/config.c:772
+#: builtin/config.c:837
msgid "editing blobs is not supported"
msgstr "l'édition de blobs n'est pas supportée"
-#: builtin/config.c:786
+#: builtin/config.c:851
#, c-format
msgid "cannot create configuration file %s"
msgstr "création impossible du fichier de configuration '%s'"
-#: builtin/config.c:799
+#: builtin/config.c:864
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -13471,7 +14347,7 @@
"impossible de surcharger des valeurs multiples avec une seule valeur\n"
" Utilisez une regexp, --add ou --replace-all pour modifier %s."
-#: builtin/config.c:873 builtin/config.c:884
+#: builtin/config.c:943 builtin/config.c:954
#, c-format
msgid "no such section: %s"
msgstr "section inexistante : %s"
@@ -13484,6 +14360,37 @@
msgid "print sizes in human readable format"
msgstr "affiche les tailles dans un format humainement lisible"
+#: 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/credential-store.c:66
+#, c-format
+msgid "unable to get credential storage lock in %d ms"
+msgstr "impossible d'accéder au verrou de stockage d'identification en %d ms"
+
#: builtin/describe.c:26
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<options>] <commit ou apparenté>*"
@@ -13492,51 +14399,46 @@
msgid "git describe [<options>] --dirty"
msgstr "git describe [<options>] --dirty"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "head"
msgstr "tête"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "lightweight"
msgstr "léger"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "annotated"
msgstr "annoté"
-#: builtin/describe.c:275
+#: builtin/describe.c:277
#, c-format
msgid "annotated tag %s not available"
msgstr "l'étiquette annotée %s n'est pas disponible"
-#: builtin/describe.c:279
-#, c-format
-msgid "annotated tag %s has no embedded name"
-msgstr "l'étiquette annotée %s n'a pas de nom embarqué"
-
#: builtin/describe.c:281
#, 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:325
+#: builtin/describe.c:328
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "aucune étiquette ne correspond parfaitement à '%s'"
-#: builtin/describe.c:327
+#: 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:394
+#: builtin/describe.c:397
#, c-format
msgid "finished search at %s\n"
msgstr "recherche terminée à %s\n"
-#: builtin/describe.c:421
+#: builtin/describe.c:424
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -13545,7 +14447,7 @@
"Aucune étiquette annotée ne peut décrire '%s'.\n"
"Cependant, il existe des étiquettes non-annotées : essayez avec --tags."
-#: builtin/describe.c:425
+#: builtin/describe.c:428
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -13554,12 +14456,12 @@
"Aucune étiquette ne peut décrire '%s'.\n"
"Essayez --always, ou créez des étiquettes."
-#: builtin/describe.c:455
+#: builtin/describe.c:458
#, c-format
msgid "traversed %lu commits\n"
msgstr "%lu commits parcourus\n"
-#: builtin/describe.c:458
+#: builtin/describe.c:461
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -13569,124 +14471,142 @@
"affichées\n"
"abandon de la recherche à %s\n"
-#: builtin/describe.c:526
+#: builtin/describe.c:529
#, c-format
msgid "describe %s\n"
msgstr "décrire %s\n"
-#: builtin/describe.c:529
+#: 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:537
+#: 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:551
+#: builtin/describe.c:554
msgid "find the tag that comes after the commit"
msgstr "rechercher l'étiquette qui suit le commit"
-#: builtin/describe.c:552
+#: builtin/describe.c:555
msgid "debug search strategy on stderr"
msgstr "déboguer la stratégie de recherche sur stderr"
-#: builtin/describe.c:553
+#: builtin/describe.c:556
msgid "use any ref"
msgstr "utiliser n'importe quelle référence"
-#: builtin/describe.c:554
+#: builtin/describe.c:557
msgid "use any tag, even unannotated"
msgstr "utiliser n'importe quelle étiquette, même non-annotée"
-#: builtin/describe.c:555
+#: builtin/describe.c:558
msgid "always use long format"
msgstr "toujours utiliser le format long"
-#: builtin/describe.c:556
+#: builtin/describe.c:559
msgid "only follow first parent"
msgstr "ne suivre que le premier parent"
-#: builtin/describe.c:559
+#: builtin/describe.c:562
msgid "only output exact matches"
msgstr "n'afficher que les correspondances exactes"
-#: builtin/describe.c:561
+#: 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:563
+#: builtin/describe.c:566
msgid "only consider tags matching <pattern>"
msgstr "ne considérer que les étiquettes correspondant à <motif>"
-#: builtin/describe.c:565
+#: builtin/describe.c:568
msgid "do not consider tags matching <pattern>"
msgstr "ne pas considérer les étiquettes correspondant à <motif>"
-#: builtin/describe.c:567 builtin/name-rev.c:535
+#: builtin/describe.c: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:568 builtin/describe.c:571
+#: builtin/describe.c:571 builtin/describe.c:574
msgid "mark"
msgstr "marque"
-#: builtin/describe.c:569
+#: 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:572
+#: 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:590
+#: builtin/describe.c:593
msgid "--long is incompatible with --abbrev=0"
msgstr "--long et --abbrev=0 sont incompatibles"
-#: builtin/describe.c:619
+#: 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:670
+#: 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:672
+#: 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-tree.c:155
+msgid "--stdin and --merge-base are mutually exclusive"
+msgstr "--stdin et --merge-base sont mutuellement exclusifs"
+
+#: builtin/diff-tree.c:157
+msgid "--merge-base only works with two commits"
+msgstr "--merge-base ne fonctionne qu'avec deux commits"
+
+#: builtin/diff.c:92
#, 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:259
#, c-format
msgid "invalid option: %s"
msgstr "option invalide : %s"
-#: builtin/diff.c:350
+#: builtin/diff.c:376
+#, c-format
+msgid "%s...%s: no merge base"
+msgstr "%s..%s: pas de base de fusion"
+
+#: builtin/diff.c:486
msgid "Not a git repository"
msgstr "Ce n'est pas un dépôt git !"
-#: builtin/diff.c:394
+#: builtin/diff.c:532 builtin/grep.c:682
#, c-format
msgid "invalid object '%s' given."
msgstr "objet spécifié '%s' invalide."
-#: builtin/diff.c:403
+#: builtin/diff.c:543
#, 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:548
#, c-format
msgid "unhandled object '%s' given."
msgstr "objet non géré '%s' spécifié."
+#: builtin/diff.c:582
+#, 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>...]"
@@ -13711,7 +14631,7 @@
msgid "could not read object %s for symlink %s"
msgstr "Impossible de lire l'objet %s pour le symlink %s"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:412
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
@@ -13719,53 +14639,53 @@
"les formats de diff combinés ('-c' et '--cc') ne sont pas supportés\n"
"dans le mode de diff de répertoire ('-d' et '--dir-diff')."
-#: builtin/difftool.c:634
+#: builtin/difftool.c:633
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "les deux fichiers sont modifiés : '%s' et '%s'."
-#: builtin/difftool.c:636
+#: builtin/difftool.c:635
msgid "working tree file has been left."
msgstr "le fichier dans l'arbre de travail a été laissé."
-#: builtin/difftool.c:647
+#: builtin/difftool.c:646
#, c-format
msgid "temporary files exist in '%s'."
msgstr "des fichiers temporaires existent dans '%s'."
-#: builtin/difftool.c:648
+#: builtin/difftool.c:647
msgid "you may want to cleanup or recover these."
msgstr "vous pourriez souhaiter les nettoyer ou les récupérer."
-#: builtin/difftool.c:697
+#: builtin/difftool.c:696
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "utiliser `diff.guitool` au lieu de `diff.tool`"
-#: builtin/difftool.c:699
+#: builtin/difftool.c:698
msgid "perform a full-directory diff"
msgstr "réalise un diff de répertoire complet"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:700
msgid "do not prompt before launching a diff tool"
msgstr "ne pas confirmer avant de lancer l'outil de diff"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:705
msgid "use symlinks in dir-diff mode"
msgstr "utiliser les liens symboliques en mode de diff de répertoire"
-#: builtin/difftool.c:707
+#: builtin/difftool.c:706
msgid "tool"
msgstr "outil"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:707
msgid "use the specified diff tool"
msgstr "utiliser l'outil de diff spécifié"
-#: builtin/difftool.c:710
+#: builtin/difftool.c:709
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "afficher une liste des outils de diff utilisables avec `--tool`"
-#: builtin/difftool.c:713
+#: builtin/difftool.c:712
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
@@ -13773,31 +14693,31 @@
"provoque la fin de 'git-difftool' si l'outil de diff invoqué renvoie un code "
"non-nul"
-#: builtin/difftool.c:716
+#: builtin/difftool.c:715
msgid "specify a custom command for viewing diffs"
msgstr "spécifier une commande personnalisée pour visualiser les différences"
-#: builtin/difftool.c:717
+#: builtin/difftool.c:716
msgid "passed to `diff`"
msgstr "passé à `diff`"
-#: builtin/difftool.c:732
+#: builtin/difftool.c:731
msgid "difftool requires worktree or --no-index"
msgstr "difftool exige un arbre de travail ou --no-index"
-#: builtin/difftool.c:739
+#: builtin/difftool.c:738
msgid "--dir-diff is incompatible with --no-index"
msgstr "--dir-diff est incompatible avec --no-index"
-#: builtin/difftool.c:742
+#: builtin/difftool.c:741
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr "--gui, --tool et --extcmd sont mutuellement exclusifs"
-#: builtin/difftool.c:750
+#: builtin/difftool.c:749
msgid "no <tool> given for --tool=<tool>"
msgstr "pas d'<outil> spécifié pour --tool=<outil>"
-#: builtin/difftool.c:757
+#: builtin/difftool.c:756
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "pas de <commande> spécifié pour --extcmd=<commande>"
@@ -13805,27 +14725,27 @@
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 `"
@@ -13838,191 +14758,253 @@
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [options-de-liste-de-révisions]"
-#: builtin/fast-export.c:853
+#: 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:1152
+#: builtin/fast-export.c:1177
+msgid "--anonymize-map token cannot be empty"
+msgstr "le jeton --anonymize-map ne peut pas être vide"
+
+#: builtin/fast-export.c:1197
msgid "show progress after <n> objects"
msgstr "afficher la progression après <n> objets"
-#: builtin/fast-export.c:1154
+#: builtin/fast-export.c:1199
msgid "select handling of signed tags"
msgstr "sélectionner la gestion des étiquettes signées"
-#: builtin/fast-export.c:1157
+#: builtin/fast-export.c:1202
msgid "select handling of tags that tag filtered objects"
msgstr ""
"sélectionner la gestion des étiquettes qui pointent sur des objets filtrés"
-#: builtin/fast-export.c:1160
+#: builtin/fast-export.c:1205
msgid "select handling of commit messages in an alternate encoding"
msgstr ""
"sélectionner la gestion des messages de validation dans un encodage "
"alternatif"
-#: builtin/fast-export.c:1163
-msgid "Dump marks to this file"
-msgstr "Enregistrer les marques dans ce fichier"
+#: builtin/fast-export.c:1208
+msgid "dump marks to this file"
+msgstr "enregistrer les marques dans ce fichier"
-#: builtin/fast-export.c:1165
-msgid "Import marks from this file"
+#: builtin/fast-export.c:1210
+msgid "import marks from this file"
msgstr "importer les marques depuis ce fichier"
-#: builtin/fast-export.c:1169
-msgid "Import marks from this file if it exists"
+#: builtin/fast-export.c:1214
+msgid "import marks from this file if it exists"
msgstr "importer les marques depuis ce fichier s'il existe"
-#: builtin/fast-export.c:1171
-msgid "Fake a tagger when tags lack one"
+#: builtin/fast-export.c:1216
+msgid "fake a tagger when tags lack one"
msgstr "falsifier un auteur d'étiquette si l'étiquette n'en présente pas"
-#: builtin/fast-export.c:1173
-msgid "Output full tree for each commit"
-msgstr "Afficher l'arbre complet pour chaque commit"
+#: builtin/fast-export.c:1218
+msgid "output full tree for each commit"
+msgstr "afficher l'arbre complet pour chaque commit"
-#: builtin/fast-export.c:1175
-msgid "Use the done feature to terminate the stream"
-msgstr "Utiliser la fonction \"done\" pour terminer le flux"
+#: builtin/fast-export.c:1220
+msgid "use the done feature to terminate the stream"
+msgstr "utiliser la fonction \"done\" pour terminer le flux"
-#: builtin/fast-export.c:1176
-msgid "Skip output of blob data"
-msgstr "Sauter l'affichage de données de blob"
+#: builtin/fast-export.c:1221
+msgid "skip output of blob data"
+msgstr "sauter l'affichage de données de blob"
-#: builtin/fast-export.c:1177 builtin/log.c:1705
+#: builtin/fast-export.c:1222 builtin/log.c:1815
msgid "refspec"
msgstr "spécificateur de référence"
-#: builtin/fast-export.c:1178
-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:1223
+msgid "apply refspec to exported refs"
+msgstr "appliquer le spécificateur de référence aux références exportées"
-#: builtin/fast-export.c:1179
+#: builtin/fast-export.c:1224
msgid "anonymize output"
msgstr "anonymise la sortie"
-#: builtin/fast-export.c:1181
-msgid "Reference parents which are not in fast-export stream by object id"
+#: builtin/fast-export.c:1225
+msgid "from:to"
+msgstr "depuis:vers"
+
+#: builtin/fast-export.c:1226
+msgid "convert <from> to <to> in anonymized output"
+msgstr "convertit <depuis> en <vers> dans la sortie anonymisée"
+
+#: builtin/fast-export.c:1229
+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 "
+"référencer les parents qui ne sont pas dans le flux d'export rapide par id "
"d'objet"
-#: builtin/fast-export.c:1183
-msgid "Show original object ids of blobs/commits"
-msgstr "Afficher les ids d'objet originaux des blobs/commits"
+#: builtin/fast-export.c:1231
+msgid "show original object ids of blobs/commits"
+msgstr "afficher les ids d'objet originaux des blobs/commits"
-#: builtin/fast-export.c:1185
-msgid "Label tags with mark ids"
-msgstr "Marquer les étiquettes avec des ids de marque"
+#: builtin/fast-export.c:1233
+msgid "label tags with mark ids"
+msgstr "marquer les étiquettes avec des ids de marque"
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1256
+msgid "--anonymize-map without --anonymize does not make sense"
+msgstr "--anonymize-map n'a aucune signification sans --anonymize"
+
+#: builtin/fast-export.c:1271
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
msgstr ""
"Impossible d'utiliser à la fois --import-marks et --import-marks-if-exists"
-#: builtin/fetch.c:34
+#: builtin/fast-import.c:3088
+#, c-format
+msgid "Missing from marks for submodule '%s'"
+msgstr "Champs from manquants pour le sous-module '%s'"
+
+#: builtin/fast-import.c:3090
+#, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr "champs to manquants pour le sous-module '%s'"
+
+#: builtin/fast-import.c:3225
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr "commande 'mark' attendue, %s trouvé"
+
+#: builtin/fast-import.c:3230
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr "commande 'to' attendue, %s trouvé"
+
+#: builtin/fast-import.c:3322
+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:3377
+#, 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:242
+#, 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:35
+#: builtin/fetch.c:36
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<options>] <groupe>"
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]"
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<options>]"
-#: builtin/fetch.c:116
+#: builtin/fetch.c:120
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel ne peut pas être négatif"
-#: builtin/fetch.c:139 builtin/pull.c:184
+#: builtin/fetch.c:143 builtin/pull.c:185
msgid "fetch from all remotes"
msgstr "récupérer depuis tous les dépôts distants"
-#: builtin/fetch.c:141 builtin/pull.c:228
+#: builtin/fetch.c:145 builtin/pull.c:245
msgid "set upstream for git pull/fetch"
msgstr "définir la branche amont pour git pull/fetch"
-#: builtin/fetch.c:143 builtin/pull.c:187
+#: builtin/fetch.c:147 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:145 builtin/pull.c:190
+#: builtin/fetch.c:149
+msgid "use atomic transaction to update references"
+msgstr "utiliser une transaction atomique pour mettre à jour les références"
+
+#: builtin/fetch.c:151 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:146
+#: builtin/fetch.c:152
msgid "force overwrite of local reference"
msgstr "forcer l'écrasement de la branche locale"
-#: builtin/fetch.c:148
+#: builtin/fetch.c:154
msgid "fetch from multiple remotes"
msgstr "récupérer depuis plusieurs dépôts distants"
-#: builtin/fetch.c:150 builtin/pull.c:194
+#: builtin/fetch.c:156 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:152
+#: builtin/fetch.c:158
msgid "do not fetch all tags (--no-tags)"
msgstr "ne pas récupérer toutes les étiquettes (--no-tags)"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:160
msgid "number of submodules fetched in parallel"
msgstr "nombre de sous-modules récupérés en parallèle"
-#: builtin/fetch.c:156 builtin/pull.c:197
+#: builtin/fetch.c:162 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:158
+#: builtin/fetch.c:164
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
"éliminer les étiquettes locales qui ont disparu du dépôt distant et qui "
"encombrent les étiquettes modifiées"
-#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121
+#: builtin/fetch.c:165 builtin/fetch.c:190 builtin/pull.c:122
msgid "on-demand"
msgstr "à la demande"
-#: builtin/fetch.c:160
+#: builtin/fetch.c:166
msgid "control recursive fetching of submodules"
msgstr "contrôler la récupération récursive dans les sous-modules"
-#: builtin/fetch.c:164 builtin/pull.c:205
+#: builtin/fetch.c:171
+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:172 builtin/pull.c:206
msgid "keep downloaded pack"
msgstr "conserver le paquet téléchargé"
-#: builtin/fetch.c:166
+#: builtin/fetch.c:174
msgid "allow updating of HEAD ref"
msgstr "permettre la mise à jour de la référence HEAD"
-#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208
+#: builtin/fetch.c:177 builtin/fetch.c:183 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:171
+#: builtin/fetch.c:179 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:177 builtin/pull.c:211
+#: builtin/fetch.c:185 builtin/pull.c:221
msgid "convert to a complete repository"
msgstr "convertir en un dépôt complet"
-#: builtin/fetch.c:180
+#: builtin/fetch.c:188
msgid "prepend this to submodule path output"
msgstr "préfixer ceci à la sortie du chemin du sous-module"
-#: builtin/fetch.c:183
+#: builtin/fetch.c:191
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
@@ -14030,95 +15012,99 @@
"par défaut pour la récupération récursive de sous-modules (priorité plus "
"basse que les fichiers de config)"
-#: builtin/fetch.c:187 builtin/pull.c:214
+#: builtin/fetch.c:195 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:188 builtin/pull.c:216
+#: builtin/fetch.c:196 builtin/pull.c:226
msgid "refmap"
msgstr "correspondance de référence"
-#: builtin/fetch.c:189 builtin/pull.c:217
+#: builtin/fetch.c:197 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:196
+#: builtin/fetch.c:204 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:199
-msgid "run 'gc --auto' after fetching"
-msgstr "lancer 'gc --auto' après la récupération"
+#: builtin/fetch.c:207 builtin/fetch.c:209
+msgid "run 'maintenance --auto' after fetching"
+msgstr "lancer 'maintenance --auto' après la récupération"
-#: builtin/fetch.c:201 builtin/pull.c:226
+#: builtin/fetch.c:211 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:203
+#: builtin/fetch.c:213
msgid "write the commit-graph after fetching"
msgstr "écrire le graphe de commits après le rapatriement"
-#: builtin/fetch.c:513
+#: builtin/fetch.c:215
+msgid "accept refspecs from stdin"
+msgstr "lire les spécificateurs de référence depuis l'entrée standard"
+
+#: builtin/fetch.c:526
msgid "Couldn't find remote ref HEAD"
msgstr "impossible de trouver la référence HEAD distante"
-#: builtin/fetch.c:653
+#: builtin/fetch.c:697
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr ""
"le paramètre de configuration fetch.output contient une valeur invalide %s"
-#: builtin/fetch.c:751
+#: builtin/fetch.c:796
#, c-format
msgid "object %s not found"
msgstr "objet %s non trouvé"
-#: builtin/fetch.c:755
+#: builtin/fetch.c:800
msgid "[up to date]"
msgstr "[à jour]"
-#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
+#: builtin/fetch.c:813 builtin/fetch.c:829 builtin/fetch.c:901
msgid "[rejected]"
msgstr "[rejeté]"
-#: builtin/fetch.c:769
+#: builtin/fetch.c:814
msgid "can't fetch in current branch"
msgstr "impossible de récupérer dans la branche actuelle"
-#: builtin/fetch.c:779
+#: builtin/fetch.c:824
msgid "[tag update]"
msgstr "[mise à jour de l'étiquette]"
-#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839
-#: builtin/fetch.c:851
+#: builtin/fetch.c:825 builtin/fetch.c:862 builtin/fetch.c:884
+#: builtin/fetch.c:896
msgid "unable to update local ref"
msgstr "impossible de mettre à jour la référence locale"
-#: builtin/fetch.c:784
+#: builtin/fetch.c:829
msgid "would clobber existing tag"
msgstr "écraserait l'étiquette existante"
-#: builtin/fetch.c:806
+#: builtin/fetch.c:851
msgid "[new tag]"
msgstr "[nouvelle étiquette]"
-#: builtin/fetch.c:809
+#: builtin/fetch.c:854
msgid "[new branch]"
msgstr "[nouvelle branche]"
-#: builtin/fetch.c:812
+#: builtin/fetch.c:857
msgid "[new ref]"
msgstr "[nouvelle référence]"
-#: builtin/fetch.c:851
+#: builtin/fetch.c:896
msgid "forced update"
msgstr "mise à jour forcée"
-#: builtin/fetch.c:856
+#: builtin/fetch.c:901
msgid "non-fast-forward"
msgstr "pas en avance rapide"
-#: builtin/fetch.c:877
+#: builtin/fetch.c:1005
msgid ""
"Fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
@@ -14128,7 +15114,7 @@
"mais ceci a été désactivé. Pour ré-activer, utilisez le drapeau\n"
"'--show-forced-update' ou lancez 'git config fetch.showForcedUpdates true'."
-#: builtin/fetch.c:881
+#: builtin/fetch.c:1009
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
@@ -14140,23 +15126,23 @@
"Vous pouvez utiliser '--no-show-forced-update' ou lancer\n"
"'git config fetch.showForcedUpdates false' pour éviter ceci.\n"
-#: builtin/fetch.c:920
+#: builtin/fetch.c:1041
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s n'a pas envoyé tous les objets nécessaires\n"
-#: builtin/fetch.c:941
+#: builtin/fetch.c:1069
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
"%s rejeté parce que les racines superficielles ne sont pas mises à jour"
-#: builtin/fetch.c:1026 builtin/fetch.c:1164
+#: builtin/fetch.c:1146 builtin/fetch.c:1297
#, c-format
msgid "From %.*s\n"
msgstr "Depuis %.*s\n"
-#: builtin/fetch.c:1037
+#: builtin/fetch.c:1168
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -14165,56 +15151,56 @@
"des références locales n'ont pas pu être mises à jour ; essayez de lancer\n"
" 'git remote prune %s' pour supprimer des branches anciennes en conflit"
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1267
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s sera en suspens)"
-#: builtin/fetch.c:1135
+#: builtin/fetch.c:1268
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s est devenu en suspens)"
-#: builtin/fetch.c:1167
+#: builtin/fetch.c:1300
msgid "[deleted]"
msgstr "[supprimé]"
-#: builtin/fetch.c:1168 builtin/remote.c:1112
+#: builtin/fetch.c:1301 builtin/remote.c:1118
msgid "(none)"
msgstr "(aucun(e))"
-#: builtin/fetch.c:1191
+#: builtin/fetch.c:1324
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu"
-#: builtin/fetch.c:1210
+#: builtin/fetch.c:1343
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "La valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s"
-#: builtin/fetch.c:1213
+#: builtin/fetch.c:1346
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "L'option \"%s\" est ignorée pour %s\n"
-#: builtin/fetch.c:1421
+#: builtin/fetch.c:1558
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "branches multiples détectées, imcompatible avec --set-upstream"
-#: builtin/fetch.c:1436
+#: builtin/fetch.c:1573
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "dépôt amont non défini pour la branche de suivi à distance"
-#: builtin/fetch.c:1438
+#: builtin/fetch.c:1575
msgid "not setting upstream for a remote tag"
msgstr "dépôt amont non défini pour l'étiquette distante"
-#: builtin/fetch.c:1440
+#: builtin/fetch.c:1577
msgid "unknown branch type"
msgstr "type de branche inconnu"
-#: builtin/fetch.c:1442
+#: builtin/fetch.c:1579
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
@@ -14222,22 +15208,22 @@
"Aucune branche source trouvée.\n"
"Vous devez spécifier exactement une branche avec l'option --set-upstream."
-#: builtin/fetch.c:1568 builtin/fetch.c:1631
+#: builtin/fetch.c:1708 builtin/fetch.c:1771
#, c-format
msgid "Fetching %s\n"
msgstr "Récupération de %s\n"
-#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101
+#: builtin/fetch.c:1718 builtin/fetch.c:1773 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr "Impossible de récupérer %s"
-#: builtin/fetch.c:1590
+#: builtin/fetch.c:1730
#, 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:1693
+#: builtin/fetch.c:1834
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -14245,46 +15231,46 @@
"Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n"
"distant depuis lesquels les nouvelles révisions devraient être récupérées."
-#: builtin/fetch.c:1730
+#: builtin/fetch.c:1870
msgid "You need to specify a tag name."
msgstr "Vous devez spécifier un nom d'étiquette."
-#: builtin/fetch.c:1780
+#: builtin/fetch.c:1935
msgid "Negative depth in --deepen is not supported"
msgstr "Une profondeur négative dans --deepen n'est pas supportée"
-#: builtin/fetch.c:1782
+#: builtin/fetch.c:1937
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen et --depth sont mutuellement exclusifs"
-#: builtin/fetch.c:1787
+#: builtin/fetch.c:1942
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble"
-#: builtin/fetch.c:1789
+#: builtin/fetch.c:1944
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow sur un dépôt complet n'a pas de sens"
-#: builtin/fetch.c:1805
+#: builtin/fetch.c:1961
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all n'accepte pas d'argument de dépôt"
-#: builtin/fetch.c:1807
+#: builtin/fetch.c:1963
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all n'a pas de sens avec des spécifications de référence"
-#: builtin/fetch.c:1816
+#: builtin/fetch.c:1972
#, c-format
msgid "No such remote or remote group: %s"
msgstr "distant ou groupe distant inexistant : %s"
-#: builtin/fetch.c:1823
+#: builtin/fetch.c:1979
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
"La récupération d'un groupe et les spécifications de référence n'ont pas de "
"sens"
-#: builtin/fetch.c:1841
+#: builtin/fetch.c:1997
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
@@ -14292,29 +15278,37 @@
"--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:2001
+msgid "--atomic can only be used when fetching from one remote"
+msgstr "--atomic ne peut être utilisée qu'en récupérant depuis un seul distant"
+
+#: builtin/fetch.c:2005
+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:671
+#: 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:674
+#: builtin/fmt-merge-msg.c:21
msgid "alias for --log (deprecated)"
msgstr "alias pour --log (obsolète)"
-#: builtin/fmt-merge-msg.c:677
+#: builtin/fmt-merge-msg.c:24
msgid "text"
msgstr "texte"
-#: builtin/fmt-merge-msg.c:678
+#: 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:679
+#: builtin/fmt-merge-msg.c:26
msgid "file to read from"
msgstr "fichier d'où lire"
@@ -14327,8 +15321,8 @@
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>]]"
@@ -14354,7 +15348,7 @@
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:472
msgid "respect format colors"
msgstr "respecter les couleurs de formatage"
@@ -14378,32 +15372,48 @@
msgid "print only refs which don't contain the commit"
msgstr "afficher seulement les références qui ne contiennent pas le commit"
-#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148
+#: builtin/for-each-repo.c:9
+msgid "git for-each-repo --config=<config> <command-args>"
+msgstr "git for-each-repo --config=<config> <arguments-de-commande>"
+
+#: builtin/for-each-repo.c:37
+msgid "config"
+msgstr "config"
+
+#: builtin/for-each-repo.c:38
+msgid "config key storing a list of repository paths"
+msgstr "clé de config qui stocke la liste des chemins de dépôts"
+
+#: builtin/for-each-repo.c:46
+msgid "missing --config=<config>"
+msgstr "--config=<config> manquant"
+
+#: builtin/fsck.c:69 builtin/fsck.c:130 builtin/fsck.c:131
msgid "unknown"
msgstr "inconnu"
#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:100 builtin/fsck.c:120
+#: builtin/fsck.c:83 builtin/fsck.c:103
#, c-format
msgid "error in %s %s: %s"
msgstr "erreur dans l'objet %s %s : %s"
#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:114
+#: builtin/fsck.c:97
#, c-format
msgid "warning in %s %s: %s"
msgstr "avertissement dans l'objet %s %s : %s"
-#: builtin/fsck.c:143 builtin/fsck.c:146
+#: builtin/fsck.c:126 builtin/fsck.c:129
#, c-format
msgid "broken link from %7s %s"
msgstr "lien cassé dans l'objet %7s %s"
-#: builtin/fsck.c:155
+#: builtin/fsck.c:138
msgid "wrong object type in link"
msgstr "type d'objet inconnu dans le lien"
-#: builtin/fsck.c:171
+#: builtin/fsck.c:154
#, c-format
msgid ""
"broken link from %7s %s\n"
@@ -14412,241 +15422,241 @@
"lien cassé depuis %7s %s\n"
" vers %7s %s"
-#: builtin/fsck.c:282
+#: builtin/fsck.c:265
#, c-format
msgid "missing %s %s"
msgstr "objet %s manquant %s"
-#: builtin/fsck.c:309
+#: builtin/fsck.c:292
#, c-format
msgid "unreachable %s %s"
msgstr "objet %s inatteignable %s"
-#: builtin/fsck.c:329
+#: builtin/fsck.c:312
#, c-format
msgid "dangling %s %s"
msgstr "objet %s fantôme %s"
-#: builtin/fsck.c:339
+#: builtin/fsck.c:322
msgid "could not create lost-found"
msgstr "impossible de créer le fichier lost-found"
-#: builtin/fsck.c:350
+#: builtin/fsck.c:333
#, c-format
msgid "could not finish '%s'"
msgstr "impossible de finir '%s'"
-#: builtin/fsck.c:367
+#: builtin/fsck.c:350
#, c-format
msgid "Checking %s"
msgstr "Vérification de l'objet %s"
-#: builtin/fsck.c:405
+#: builtin/fsck.c:388
#, c-format
msgid "Checking connectivity (%d objects)"
msgstr "Vérification de la connectivité (%d objets)"
-#: builtin/fsck.c:424
+#: builtin/fsck.c:407
#, c-format
msgid "Checking %s %s"
msgstr "Vérification de l'objet %s %s"
-#: builtin/fsck.c:429
+#: builtin/fsck.c:412
msgid "broken links"
msgstr "liens cassés"
-#: builtin/fsck.c:438
+#: builtin/fsck.c:421
#, c-format
msgid "root %s"
msgstr "racine %s"
-#: builtin/fsck.c:446
+#: builtin/fsck.c:429
#, c-format
msgid "tagged %s %s (%s) in %s"
msgstr "étiquetage de l'objet %s %s (%s) dans %s"
-#: builtin/fsck.c:475
+#: builtin/fsck.c:458
#, c-format
msgid "%s: object corrupt or missing"
msgstr "%s : objet corrompu ou manquant"
-#: builtin/fsck.c:500
+#: builtin/fsck.c:483
#, c-format
msgid "%s: invalid reflog entry %s"
msgstr "%s : entrée %s de journal de références invalide"
-#: builtin/fsck.c:514
+#: builtin/fsck.c:497
#, c-format
msgid "Checking reflog %s->%s"
msgstr "Vérification du journal de réferences %s-> %s"
-#: builtin/fsck.c:548
+#: builtin/fsck.c:531
#, c-format
msgid "%s: invalid sha1 pointer %s"
msgstr "%s : pointeur de sha1 invalide %s"
-#: builtin/fsck.c:555
+#: builtin/fsck.c:538
#, c-format
msgid "%s: not a commit"
msgstr "l'objet %s n'est pas un commit"
-#: builtin/fsck.c:609
+#: builtin/fsck.c:592
msgid "notice: No default references"
msgstr "Note : pas de référence par défaut"
-#: builtin/fsck.c:624
+#: builtin/fsck.c:607
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s : objet corrompu ou manquant : %s"
-#: builtin/fsck.c:637
+#: builtin/fsck.c:620
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s : impossible d'analyser : %s"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:640
#, c-format
msgid "bad sha1 file: %s"
msgstr "mauvais fichier de sha1 : %s"
-#: builtin/fsck.c:672
+#: builtin/fsck.c:655
msgid "Checking object directory"
msgstr "Vérification du répertoire d'objet"
-#: builtin/fsck.c:675
+#: builtin/fsck.c:658
msgid "Checking object directories"
msgstr "Vérification des répertoires d'objet"
-#: builtin/fsck.c:690
+#: builtin/fsck.c:673
#, c-format
msgid "Checking %s link"
msgstr "Vérification du lien %s"
-#: builtin/fsck.c:695 builtin/index-pack.c:843
+#: builtin/fsck.c:678 builtin/index-pack.c:865
#, c-format
msgid "invalid %s"
msgstr "%s invalide"
-#: builtin/fsck.c:702
+#: builtin/fsck.c:685
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s pointe sur quelque chose bizarre (%s)"
-#: builtin/fsck.c:708
+#: builtin/fsck.c:691
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s : la HEAD détachée ne pointe sur rien"
-#: builtin/fsck.c:712
+#: builtin/fsck.c:695
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "note : %s pointe sur une branche non-née (%s)"
-#: builtin/fsck.c:724
+#: builtin/fsck.c:707
msgid "Checking cache tree"
msgstr "Vérification de l'arbre cache"
-#: builtin/fsck.c:729
+#: builtin/fsck.c:712
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "%s : pointer sha1 invalide dans l'arbre de cache"
-#: builtin/fsck.c:738
+#: builtin/fsck.c:721
msgid "non-tree in cache-tree"
msgstr "non-arbre dans l'arbre de cache"
-#: builtin/fsck.c:769
+#: builtin/fsck.c:752
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<options>] [<objet>...]"
-#: builtin/fsck.c:775
+#: builtin/fsck.c:758
msgid "show unreachable objects"
msgstr "afficher les objets inaccessibles"
-#: builtin/fsck.c:776
+#: builtin/fsck.c:759
msgid "show dangling objects"
msgstr "afficher les objets en suspens"
-#: builtin/fsck.c:777
+#: builtin/fsck.c:760
msgid "report tags"
msgstr "afficher les étiquettes"
-#: builtin/fsck.c:778
+#: builtin/fsck.c:761
msgid "report root nodes"
msgstr "signaler les nœuds racines"
-#: builtin/fsck.c:779
+#: builtin/fsck.c:762
msgid "make index objects head nodes"
msgstr "considérer les objets de l'index comme nœuds tête"
# translated from man page
-#: builtin/fsck.c:780
+#: builtin/fsck.c:763
msgid "make reflogs head nodes (default)"
msgstr "considérer les reflogs comme nœuds tête (par défaut)"
-#: builtin/fsck.c:781
+#: builtin/fsck.c:764
msgid "also consider packs and alternate objects"
msgstr "inspecter aussi les objets pack et alternatifs"
-#: builtin/fsck.c:782
+#: builtin/fsck.c:765
msgid "check only connectivity"
msgstr "ne vérifier que la connectivité"
-#: builtin/fsck.c:783
+#: builtin/fsck.c:766 builtin/mktag.c:78
msgid "enable more strict checking"
msgstr "activer une vérification plus strict"
-#: builtin/fsck.c:785
+#: builtin/fsck.c:768
msgid "write dangling objects in .git/lost-found"
msgstr "écrire les objets en suspens dans .git/lost-found"
-#: builtin/fsck.c:786 builtin/prune.c:132
+#: builtin/fsck.c:769 builtin/prune.c:134
msgid "show progress"
msgstr "afficher la progression"
-#: builtin/fsck.c:787
+#: builtin/fsck.c:770
msgid "show verbose names for reachable objects"
msgstr "afficher les noms étendus pour les objets inaccessibles"
-#: builtin/fsck.c:846 builtin/index-pack.c:225
+#: builtin/fsck.c:829 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "Vérification des objets"
-#: builtin/fsck.c:874
+#: builtin/fsck.c:857
#, c-format
msgid "%s: object missing"
msgstr "%s : objet manquant"
-#: builtin/fsck.c:885
+#: builtin/fsck.c:868
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "paramètre invalide : sha-1 attendu, '%s' trouvé"
-#: builtin/gc.c:35
+#: builtin/gc.c:39
msgid "git gc [<options>]"
msgstr "git gc [<options>]"
-#: builtin/gc.c:90
+#: builtin/gc.c:93
#, c-format
msgid "Failed to fstat %s: %s"
msgstr "Échec du stat de %s : %s"
-#: builtin/gc.c:126
+#: builtin/gc.c:129
#, c-format
msgid "failed to parse '%s' value '%s'"
msgstr "échec de l'analyse de '%s' valeur '%s'"
-#: builtin/gc.c:475 builtin/init-db.c:55
+#: builtin/gc.c:487 builtin/init-db.c:58
#, c-format
msgid "cannot stat '%s'"
msgstr "impossible de faire un stat de '%s'"
-#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
+#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:562
#, c-format
msgid "cannot read '%s'"
msgstr "impossible de lire '%s'"
-#: builtin/gc.c:491
+#: builtin/gc.c:503
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -14662,56 +15672,56 @@
"\n"
"%s"
-#: builtin/gc.c:539
+#: builtin/gc.c:551
msgid "prune unreferenced objects"
msgstr "éliminer les objets non référencés"
-#: builtin/gc.c:541
+#: builtin/gc.c:553
msgid "be more thorough (increased runtime)"
msgstr "être plus consciencieux (durée de traitement allongée)"
-#: builtin/gc.c:542
+#: builtin/gc.c:554
msgid "enable auto-gc mode"
msgstr "activer le mode auto-gc"
-#: builtin/gc.c:545
+#: builtin/gc.c:557
msgid "force running gc even if there may be another gc running"
msgstr ""
"forcer le lancement du ramasse-miettes même si un autre ramasse-miettes "
"tourne déjà"
-#: builtin/gc.c:548
+#: builtin/gc.c:560
msgid "repack all other packs except the largest pack"
msgstr "recompacter tous les autres paquets excepté le plus gros paquet"
-#: builtin/gc.c:565
+#: builtin/gc.c:576
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "impossible d'analyser gc.logexpiry %s"
-#: builtin/gc.c:576
+#: builtin/gc.c:587
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr "impossible d'analyser la valeur d'expiration d'élagage %s"
-#: builtin/gc.c:596
+#: builtin/gc.c:607
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"Compression automatique du dépôt en tâche de fond pour optimiser les "
"performances.\n"
-#: builtin/gc.c:598
+#: builtin/gc.c:609
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Compression du dépôt pour optimiser les performances.\n"
-#: builtin/gc.c:599
+#: builtin/gc.c:610
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Voir \"git help gc\" pour toute information sur le nettoyage manuel.\n"
-#: builtin/gc.c:639
+#: builtin/gc.c:650
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -14719,23 +15729,190 @@
"un ramasse-miettes est déjà en cours sur la machine '%s' pid %<PRIuMAX> "
"(utilisez --force si ce n'est pas le cas)"
-#: builtin/gc.c:694
+#: builtin/gc.c:705
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Il y a trop d'objets seuls inaccessibles ; lancez 'git prune' pour les "
"supprimer."
+#: builtin/gc.c:715
+msgid ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
+msgstr ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<tâche>] [--schedule]"
+
+#: builtin/gc.c:745
+msgid "--no-schedule is not allowed"
+msgstr "--schedule n'est pas accepté"
+
+#: builtin/gc.c:750
+#, c-format
+msgid "unrecognized --schedule argument '%s'"
+msgstr "argument de --schedule non reconnu, '%s'"
+
+#: builtin/gc.c:869
+msgid "failed to write commit-graph"
+msgstr "échec de l'écriture du graphe de commits"
+
+#: builtin/gc.c:914
+msgid "failed to fill remotes"
+msgstr "échec du remplissage des distants"
+
+#: builtin/gc.c:1037
+msgid "failed to start 'git pack-objects' process"
+msgstr "Impossible de démarrer le processus 'git pack-objects'"
+
+#: builtin/gc.c:1054
+msgid "failed to finish 'git pack-objects' process"
+msgstr "Impossible de finir le processus 'git pack-objects'"
+
+#: builtin/gc.c:1106
+msgid "failed to write multi-pack-index"
+msgstr "échec de l'écriture de l'index de multi-paquet"
+
+#: builtin/gc.c:1124
+msgid "'git multi-pack-index expire' failed"
+msgstr "échec de 'git multi-pack-index expire'"
+
+#: builtin/gc.c:1185
+msgid "'git multi-pack-index repack' failed"
+msgstr "échec de 'git multi-pack-index repack'"
+
+#: builtin/gc.c:1194
+msgid ""
+"skipping incremental-repack task because core.multiPackIndex is disabled"
+msgstr ""
+"tâche incremental-repack ignorée parce que core.multiPackIndex est désactivé"
+
+#: builtin/gc.c:1298
+#, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr "le fichier verrou '%s' existe, pas de maintenance"
+
+#: builtin/gc.c:1328
+#, c-format
+msgid "task '%s' failed"
+msgstr "échec de la tâche '%s'"
+
+#: builtin/gc.c:1410
+#, c-format
+msgid "'%s' is not a valid task"
+msgstr "'%s' n'est pas une tâche valide"
+
+#: builtin/gc.c:1415
+#, 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:1430
+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:1431
+msgid "frequency"
+msgstr "fréquence"
+
+#: builtin/gc.c:1432
+msgid "run tasks based on frequency"
+msgstr "lancer les tâches selon une fréquence"
+
+#: builtin/gc.c:1435
+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:1436
+msgid "task"
+msgstr "tâche"
+
+#: builtin/gc.c:1437
+msgid "run a specific task"
+msgstr "lancer une tâche spécifique"
+
+#: builtin/gc.c:1454
+msgid "use at most one of --auto and --schedule=<frequency>"
+msgstr "--auto et --schedule=<fréquence> sont mutuellement exclusifs"
+
+#: builtin/gc.c:1497
+msgid "failed to run 'git config'"
+msgstr "échec du lancement de 'git config'"
+
+#: builtin/gc.c:1562
+#, c-format
+msgid "failed to expand path '%s'"
+msgstr "impossible d'étendre le chemin '%s'"
+
+#: builtin/gc.c:1591
+msgid "failed to start launchctl"
+msgstr "échec de démarrage de launchctl"
+
+#: builtin/gc.c:1628
+#, c-format
+msgid "failed to create directories for '%s'"
+msgstr "échec de la création des répertoires pour '%s'"
+
+#: builtin/gc.c:1689
+#, c-format
+msgid "failed to bootstrap service %s"
+msgstr "échec de l'amorçage du service %s"
+
+#: builtin/gc.c:1760
+msgid "failed to create temp xml file"
+msgstr "échec de création du fichier temporaire xml"
+
+#: builtin/gc.c:1850
+msgid "failed to start schtasks"
+msgstr "échec du démarrage de schtasks"
+
+#: builtin/gc.c:1894
+msgid "failed to run 'crontab -l'; your system might not support 'cron'"
+msgstr ""
+"echec du lancement de 'crontab -l' ; votre système n'a pas l'air de fournir "
+"'cron'"
+
+#: builtin/gc.c:1911
+msgid "failed to run 'crontab'; your system might not support 'cron'"
+msgstr ""
+"echec du lancement de 'crontab' ; votre système n'a pas l'air de fournir "
+"'cron'"
+
+#: builtin/gc.c:1915
+msgid "failed to open stdin of 'crontab'"
+msgstr "échec à l'ouverture de stdin de 'crontab'"
+
+#: builtin/gc.c:1956
+msgid "'crontab' died"
+msgstr "'crontab' est mort"
+
+#: builtin/gc.c:1990
+msgid "another process is scheduling background maintenance"
+msgstr ""
+"un autre processus est en train de programmer une maintenance en tâche de "
+"fond"
+
+#: builtin/gc.c:2009
+msgid "failed to add repo to global config"
+msgstr "échec de l'ajout du dépôt à la config globale"
+
+#: builtin/gc.c:2019
+msgid "git maintenance <subcommand> [<options>]"
+msgstr "git maintenance <subcommand> [<options>]"
+
+#: builtin/gc.c:2038
+#, 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>...]"
-#: builtin/grep.c:225
+#: builtin/grep.c:223
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep : échec de création du fil: %s"
-#: builtin/grep.c:279
+#: builtin/grep.c:277
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "nombre de fils spécifié invalide (%d) pour %s"
@@ -14744,266 +15921,266 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731
-#: builtin/pack-objects.c:2854
+#: builtin/grep.c:285 builtin/index-pack.c:1589 builtin/index-pack.c:1808
+#: builtin/pack-objects.c:2944
#, c-format
msgid "no threads support, ignoring %s"
msgstr "pas de support des fils, ignore %s"
-#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618
+#: builtin/grep.c:473 builtin/grep.c:601 builtin/grep.c:641
#, c-format
msgid "unable to read tree (%s)"
msgstr "impossible de lire l'arbre (%s)"
-#: builtin/grep.c:633
+#: builtin/grep.c:656
#, c-format
msgid "unable to grep from object of type %s"
msgstr "impossible de faire un grep sur un objet de type %s"
-#: builtin/grep.c:704
+#: builtin/grep.c:737
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "l'option '%c' attend une valeur numérique"
-#: builtin/grep.c:803
+#: builtin/grep.c:836
msgid "search in index instead of in the work tree"
msgstr "rechercher dans l'index plutôt que dans la copie de travail"
-#: builtin/grep.c:805
+#: builtin/grep.c:838
msgid "find in contents not managed by git"
msgstr "rechercher dans les contenus non gérés par git"
-#: builtin/grep.c:807
+#: builtin/grep.c:840
msgid "search in both tracked and untracked files"
msgstr "rechercher dans les fichiers suivis et non-suivis"
-#: builtin/grep.c:809
+#: builtin/grep.c:842
msgid "ignore files specified via '.gitignore'"
msgstr "ignorer les fichiers spécifiés via '.gitignore'"
-#: builtin/grep.c:811
+#: builtin/grep.c:844
msgid "recursively search in each submodule"
msgstr "rechercher récursivement dans chaque sous-module"
-#: builtin/grep.c:814
+#: builtin/grep.c:847
msgid "show non-matching lines"
msgstr "afficher les lignes qui ne correspondent pas"
-#: builtin/grep.c:816
+#: builtin/grep.c:849
msgid "case insensitive matching"
msgstr "correspondance insensible à la casse"
-#: builtin/grep.c:818
+#: builtin/grep.c:851
msgid "match patterns only at word boundaries"
msgstr "rechercher les motifs aux séparateurs de mots"
-#: builtin/grep.c:820
+#: builtin/grep.c:853
msgid "process binary files as text"
msgstr "traiter les fichiers binaires comme texte"
-#: builtin/grep.c:822
+#: builtin/grep.c:855
msgid "don't match patterns in binary files"
msgstr "ne pas chercher les motifs dans les fichiers binaires"
-#: builtin/grep.c:825
+#: builtin/grep.c:858
msgid "process binary files with textconv filters"
msgstr "traiter les fichiers binaires avec les filtres textconv"
-#: builtin/grep.c:827
+#: builtin/grep.c:860
msgid "search in subdirectories (default)"
msgstr "rechercher dans les sous-répertoires (défaut)"
-#: builtin/grep.c:829
+#: builtin/grep.c:862
msgid "descend at most <depth> levels"
msgstr "descendre au plus de <profondeur> dans l'arborescence"
-#: builtin/grep.c:833
+#: builtin/grep.c:866
msgid "use extended POSIX regular expressions"
msgstr "utiliser des expressions régulières étendues POSIX"
-#: builtin/grep.c:836
+#: builtin/grep.c:869
msgid "use basic POSIX regular expressions (default)"
msgstr "utiliser des expressions régulières basiques POSIX (par défaut)"
-#: builtin/grep.c:839
+#: builtin/grep.c:872
msgid "interpret patterns as fixed strings"
msgstr "interpréter les motifs comme de chaînes fixes"
-#: builtin/grep.c:842
+#: builtin/grep.c:875
msgid "use Perl-compatible regular expressions"
msgstr "utiliser des expressions régulières compatibles avec Perl"
-#: builtin/grep.c:845
+#: builtin/grep.c:878
msgid "show line numbers"
msgstr "afficher les numéros de ligne"
-#: builtin/grep.c:846
+#: builtin/grep.c:879
msgid "show column number of first match"
msgstr "afficher le numéro de colonne de la première correspondance"
-#: builtin/grep.c:847
+#: builtin/grep.c:880
msgid "don't show filenames"
msgstr "ne pas pas afficher les noms de fichier"
-#: builtin/grep.c:848
+#: builtin/grep.c:881
msgid "show filenames"
msgstr "afficher les noms de fichier"
-#: builtin/grep.c:850
+#: builtin/grep.c:883
msgid "show filenames relative to top directory"
msgstr "afficher les noms de fichiers relativement au répertoire de base"
-#: builtin/grep.c:852
+#: builtin/grep.c:885
msgid "show only filenames instead of matching lines"
msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant"
-#: builtin/grep.c:854
+#: builtin/grep.c:887
msgid "synonym for --files-with-matches"
msgstr "synonyme pour --files-with-matches"
-#: builtin/grep.c:857
+#: builtin/grep.c:890
msgid "show only the names of files without match"
msgstr "n'afficher que les noms des fichiers sans correspondance"
-#: builtin/grep.c:859
+#: builtin/grep.c:892
msgid "print NUL after filenames"
msgstr "imprimer une caractère NUL après le noms de fichier"
-#: builtin/grep.c:862
+#: builtin/grep.c:895
msgid "show only matching parts of a line"
msgstr "n'afficher que les parties correspondantes d'une ligne"
-#: builtin/grep.c:864
+#: builtin/grep.c:897
msgid "show the number of matches instead of matching lines"
msgstr "afficher le nombre de correspondances au lieu des lignes correspondant"
-#: builtin/grep.c:865
+#: builtin/grep.c:898
msgid "highlight matches"
msgstr "mettre en évidence les correspondances"
-#: builtin/grep.c:867
+#: builtin/grep.c:900
msgid "print empty line between matches from different files"
msgstr ""
"imprimer une ligne vide entre les correspondances de fichiers différents"
-#: builtin/grep.c:869
+#: builtin/grep.c:902
msgid "show filename only once above matches from same file"
msgstr ""
"afficher le nom de fichier une fois au dessus des correspondances du même "
"fichier"
-#: builtin/grep.c:872
+#: builtin/grep.c:905
msgid "show <n> context lines before and after matches"
msgstr "afficher <n> lignes de contexte avant et après les correspondances"
-#: builtin/grep.c:875
+#: builtin/grep.c:908
msgid "show <n> context lines before matches"
msgstr "afficher <n> lignes de contexte avant les correspondances"
-#: builtin/grep.c:877
+#: builtin/grep.c:910
msgid "show <n> context lines after matches"
msgstr "afficher <n> lignes de contexte après les correspondances"
-#: builtin/grep.c:879
+#: builtin/grep.c:912
msgid "use <n> worker threads"
msgstr "utiliser <n> fils de travail"
-#: builtin/grep.c:880
+#: builtin/grep.c:913
msgid "shortcut for -C NUM"
msgstr "raccourci pour -C NUM"
-#: builtin/grep.c:883
+#: builtin/grep.c:916
msgid "show a line with the function name before matches"
msgstr ""
"afficher une ligne avec le nom de la fonction avant les correspondances"
-#: builtin/grep.c:885
+#: builtin/grep.c:918
msgid "show the surrounding function"
msgstr "afficher la fonction contenante"
-#: builtin/grep.c:888
+#: builtin/grep.c:921
msgid "read patterns from file"
msgstr "lire les motifs depuis fichier"
-#: builtin/grep.c:890
+#: builtin/grep.c:923
msgid "match <pattern>"
msgstr "rechercher <motif>"
-#: builtin/grep.c:892
+#: builtin/grep.c:925
msgid "combine patterns specified with -e"
msgstr "combiner les motifs spécifiés par -e"
-#: builtin/grep.c:904
+#: builtin/grep.c:937
msgid "indicate hit with exit status without output"
msgstr ""
"indiquer des correspondances avec le code de sortie mais sans rien afficher"
-#: builtin/grep.c:906
+#: builtin/grep.c:939
msgid "show only matches from files that match all patterns"
msgstr ""
"n'afficher que les correspondances de fichiers qui correspondent à tous les "
"motifs"
-#: builtin/grep.c:908
-msgid "show parse tree for grep expression"
-msgstr "afficher l'arbre d'analyse pour le motif grep"
-
-#: builtin/grep.c:912
+#: builtin/grep.c:942
msgid "pager"
msgstr "pagineur"
-#: builtin/grep.c:912
+#: builtin/grep.c:942
msgid "show matching files in the pager"
msgstr "afficher les fichiers correspondant dans le pagineur"
-#: builtin/grep.c:916
+#: builtin/grep.c:946
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permettre l'appel de grep(1) (ignoré par ce build)"
-#: builtin/grep.c:983
+#: builtin/grep.c:1012
msgid "no pattern given"
msgstr "aucun motif fourni"
-#: builtin/grep.c:1019
+#: builtin/grep.c:1048
msgid "--no-index or --untracked cannot be used with revs"
msgstr ""
"--no-index ou --untracked ne peuvent pas être utilisés avec des révisions"
-#: builtin/grep.c:1027
+#: builtin/grep.c:1056
#, c-format
msgid "unable to resolve revision: %s"
msgstr "impossible de résoudre la révision : %s"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1086
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked non supportée avec --recurse-submodules"
-#: builtin/grep.c:1061
+#: builtin/grep.c:1090
msgid "invalid option combination, ignoring --threads"
msgstr "option de combinaison invalide, ignore --threads"
-#: builtin/grep.c:1064 builtin/pack-objects.c:3547
+#: builtin/grep.c:1093 builtin/pack-objects.c:3672
msgid "no threads support, ignoring --threads"
msgstr "pas de support des fils, ignore --threads"
-#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851
+#: builtin/grep.c:1096 builtin/index-pack.c:1586 builtin/pack-objects.c:2941
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "nombre de fils spécifié invalide (%d)"
-#: builtin/grep.c:1101
+#: builtin/grep.c:1130
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager ne fonctionne que sur la copie de travail"
-#: builtin/grep.c:1127
+#: builtin/grep.c:1156
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached ou --untracked ne peuvent pas être utilisés avec --no-index"
-#: builtin/grep.c:1133
+#: builtin/grep.c:1159
+msgid "--untracked cannot be used with --cached"
+msgstr "--untracked ne peut pas être utilisé avec --cached"
+
+#: builtin/grep.c:1165
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "--[no-]exclude-standard ne peut pas être utilisé avec du contenu suivi"
-#: builtin/grep.c:1141
+#: builtin/grep.c:1173
msgid "both --cached and trees are given"
msgstr "--cached et des arbres sont fournis en même temps"
@@ -15046,66 +16223,66 @@
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"
@@ -15114,7 +16291,7 @@
"'%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"
@@ -15123,397 +16300,429 @@
"'%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:340
#, 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:372
#, 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:606
+#: builtin/index-pack.c:324 builtin/pack-objects.c:624
msgid "pack too large for current definition of off_t"
msgstr "le paquet est trop grand pour la définition actuelle de off_t"
-#: builtin/index-pack.c:291 builtin/unpack-objects.c:95
+#: builtin/index-pack.c: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
+#, 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:765
-#: builtin/index-pack.c:804 builtin/index-pack.c:813
+#: 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:158
-#: builtin/pack-objects.c:218 builtin/pack-objects.c:313
+#: 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:802
+#: 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:810
+#: 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:824
+#: builtin/index-pack.c:846
#, c-format
msgid "invalid blob object %s"
msgstr "objet blob invalide %s"
-#: builtin/index-pack.c:827 builtin/index-pack.c:846
+#: builtin/index-pack.c:849 builtin/index-pack.c:868
msgid "fsck error in packed object"
msgstr "erreur de fsck dans l'objet empaqueté"
-#: builtin/index-pack.c:848
+#: 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:920 builtin/index-pack.c:951
+#: 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:1121
+#: builtin/index-pack.c:1161
msgid "Receiving objects"
msgstr "Réception d'objets"
-#: builtin/index-pack.c:1121
+#: builtin/index-pack.c:1161
msgid "Indexing objects"
msgstr "Indexation d'objets"
-#: builtin/index-pack.c:1155
+#: builtin/index-pack.c:1195
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "le paquet est corrompu (SHA1 ne correspond pas)"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1200
msgid "cannot fstat packfile"
msgstr "impossible d'obtenir le statut (fstat) du fichier paquet"
-#: builtin/index-pack.c:1163
+#: builtin/index-pack.c:1203
msgid "pack has junk at the end"
msgstr "le paquet est invalide à la fin"
-#: builtin/index-pack.c:1175
+#: 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:1198
+#: builtin/index-pack.c:1238
msgid "Resolving deltas"
msgstr "Résolution des deltas"
-#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615
+#: builtin/index-pack.c:1249 builtin/pack-objects.c:2707
#, c-format
msgid "unable to create thread: %s"
msgstr "impossible de créer le fil : %s"
-#: builtin/index-pack.c:1249
+#: builtin/index-pack.c:1282
msgid "confusion beyond insanity"
msgstr "confusion extrême"
-#: builtin/index-pack.c:1255
+#: 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:1267
+#: 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:1271
+#: 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:1295
+#: 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:1392
+#: builtin/index-pack.c:1424
#, c-format
msgid "local object %s is corrupt"
msgstr "l'objet local %s est corrompu"
-#: builtin/index-pack.c:1406
+#: builtin/index-pack.c:1445
#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'"
+msgid "packfile name '%s' does not end with '.%s'"
+msgstr "le nom de fichier paquet '%s' ne se termine pas par '.%s'"
-#: builtin/index-pack.c:1431
+#: 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:1439
+#: 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:1463
+#: builtin/index-pack.c:1503
msgid "error while closing pack file"
msgstr "erreur en fermeture du fichier paquet"
-#: builtin/index-pack.c:1477
+#: builtin/index-pack.c:1517
msgid "cannot store pack file"
msgstr "impossible de stocker le fichier paquet"
-#: builtin/index-pack.c:1485
+#: builtin/index-pack.c:1525
msgid "cannot store index file"
msgstr "impossible de stocker le fichier d'index"
-#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862
+#: builtin/index-pack.c:1534
+msgid "cannot store reverse index file"
+msgstr "impossible de stocker le fichier d'index inversé"
+
+#: builtin/index-pack.c:1580 builtin/pack-objects.c:2952
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "mauvais pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1597
+#: builtin/index-pack.c:1650
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Impossible d'ouvrir le fichier paquet existant '%s'"
-#: builtin/index-pack.c:1599
+#: builtin/index-pack.c:1652
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Impossible d'ouvrir le fichier paquet d'index existant pour '%s'"
-#: builtin/index-pack.c:1647
+#: builtin/index-pack.c:1700
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "pas un delta : %d objet"
msgstr[1] "pas un delta : %d objets"
-#: builtin/index-pack.c:1654
+#: builtin/index-pack.c:1707
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "longueur chaînée = %d : %lu objet"
msgstr[1] "longueur chaînée = %d : %lu objets"
-#: builtin/index-pack.c:1693
+#: builtin/index-pack.c:1765
msgid "Cannot come back to cwd"
msgstr "Impossible de revenir au répertoire de travail courant"
-#: builtin/index-pack.c:1742 builtin/index-pack.c:1745
-#: builtin/index-pack.c:1761 builtin/index-pack.c:1765
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1822
+#: builtin/index-pack.c:1838 builtin/index-pack.c:1842
#, c-format
msgid "bad %s"
msgstr "mauvais %s"
-#: builtin/index-pack.c:1781
+#: builtin/index-pack.c:1848 builtin/init-db.c:392 builtin/init-db.c:625
+#, c-format
+msgid "unknown hash algorithm '%s'"
+msgstr "algorithme d'empreinte inconnu '%s'"
+
+#: builtin/index-pack.c:1867
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin ne peut pas être utilisé sans --stdin"
-#: builtin/index-pack.c:1783
+#: builtin/index-pack.c:1869
msgid "--stdin requires a git repository"
msgstr "--stdin requiert un dépôt git"
-#: builtin/index-pack.c:1789
+#: builtin/index-pack.c:1871
+msgid "--object-format cannot be used with --stdin"
+msgstr "--object-format ne peut pas être utilisé avec --stdin"
+
+#: builtin/index-pack.c:1886
msgid "--verify with no packfile name given"
msgstr "--verify sans nom de fichier paquet donné"
-#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582
+#: builtin/index-pack.c:1956 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:275
+#, c-format
+msgid "invalid initial branch name: '%s'"
+msgstr "Nom de branche initiale invalide : '%s'"
+
+#: builtin/init-db.c:367
#, 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:370
#, 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:386
+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:410 builtin/init-db.c:413
#, c-format
msgid "%s already exists"
msgstr "%s existe déjà"
-#: builtin/init-db.c:413
+#: builtin/init-db.c:445
+#, c-format
+msgid "re-init: ignored --initial-branch=%s"
+msgstr "re-initialisation : --initial-branch=%s ignoré"
+
+#: builtin/init-db.c:476
#, 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:477
#, 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:481
#, 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:482
#, 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:531
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -15521,25 +16730,41 @@
"git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--"
"shared[=<permissions>]] [<répertoire>]"
-#: builtin/init-db.c:491
+#: builtin/init-db.c:557
msgid "permissions"
msgstr "permissions"
-#: builtin/init-db.c:492
+#: builtin/init-db.c:558
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:564
+msgid "override the name of the initial branch"
+msgstr "outrepasser le nom de la branche initiale"
+
+#: builtin/init-db.c:565 builtin/verify-pack.c:74
+msgid "hash"
+msgstr "empreinte"
+
+#: builtin/init-db.c:566 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:573
+msgid "--separate-git-dir and --bare are mutually exclusive"
+msgstr "--separate-git-dir et --bare sont mutuellement exclusifs"
+
+#: builtin/init-db.c:602 builtin/init-db.c:607
#, 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:611 builtin/init-db.c:666
#, 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:638
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -15548,11 +16773,15 @@
"%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:690
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Impossible d'accéder à l'arbre de travail '%s'"
+#: builtin/init-db.c:695
+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 "
@@ -15617,128 +16846,131 @@
msgid "no input file given for in-place editing"
msgstr "aucun fichier en entrée pour l'éditon sur place"
-#: builtin/log.c:56
+#: builtin/log.c:59
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<options>] [<plage de révisions>] [[--] <chemin>...]"
-#: builtin/log.c:57
+#: builtin/log.c:60
msgid "git show [<options>] <object>..."
msgstr "git show [<options>] <objet>..."
-#: builtin/log.c:110
+#: builtin/log.c:113
#, c-format
msgid "invalid --decorate option: %s"
msgstr "option --decorate invalide : %s"
-#: builtin/log.c:174
+#: builtin/log.c:180
msgid "show source"
msgstr "afficher la source"
-#: builtin/log.c:175
-msgid "Use mail map file"
-msgstr "Utiliser le fichier de correspondance de mail"
+#: builtin/log.c:181
+msgid "use mail map file"
+msgstr "utiliser le fichier de correspondance de mail"
-#: builtin/log.c:177
+#: builtin/log.c:184
msgid "only decorate refs that match <pattern>"
msgstr "décorer seulement les références correspondant à <motif>"
-#: builtin/log.c:179
+#: builtin/log.c:186
msgid "do not decorate refs that match <pattern>"
msgstr "ne pas décorer les références correspondant à <motif>"
-#: builtin/log.c:180
+#: builtin/log.c:187
msgid "decorate options"
msgstr "décorer les options"
-#: builtin/log.c:183
-msgid "Process line range n,m in file, counting from 1"
+#: builtin/log.c:190
+msgid ""
+"trace the evolution of line range <start>,<end> or function :<funcname> in "
+"<file>"
msgstr ""
-"Traiter seulement l'intervalle de lignes n,m du fichier en commençant le "
-"compte à 1"
+"tracer l'évolution d'une plage <début>,<fin> ou d'une fonction <nom-de-"
+"fonction> dans <fichier>"
-#: builtin/log.c:281
+#: builtin/log.c:213
+msgid "-L<range>:<file> cannot be used with pathspec"
+msgstr ""
+"-L<plage>:<fichier> ne peut pas être utilisé avec une spécificateur de chemin"
+
+#: builtin/log.c:303
#, c-format
msgid "Final output: %d %s\n"
msgstr "Sortie finale : %d %s\n"
-#: builtin/log.c:535
+#: builtin/log.c:566
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s : fichier incorrect"
-#: builtin/log.c:550 builtin/log.c:645
+#: builtin/log.c:581 builtin/log.c:671
#, c-format
msgid "could not read object %s"
msgstr "impossible de lire l'objet %s"
-#: builtin/log.c:670
+#: builtin/log.c:696
#, c-format
msgid "unknown type: %d"
msgstr "type inconnu : %d"
-#: builtin/log.c:814
+#: builtin/log.c:841
#, c-format
msgid "%s: invalid cover from description mode"
msgstr "%s : couverture invalide pour le mode de description"
-#: builtin/log.c:821
+#: builtin/log.c:848
msgid "format.headers without value"
msgstr "format.headers sans valeur"
-#: builtin/log.c:936
-msgid "name of output directory is too long"
-msgstr "le nom du répertoire de sortie est trop long"
-
-#: builtin/log.c:952
+#: builtin/log.c:977
#, c-format
msgid "cannot open patch file %s"
msgstr "impossible d'ouvrir le fichier correctif %s"
-#: builtin/log.c:969
+#: builtin/log.c:994
msgid "need exactly one range"
msgstr "exactement une plage nécessaire"
-#: builtin/log.c:979
+#: builtin/log.c:1004
msgid "not a range"
msgstr "ceci n'est pas une plage"
-#: builtin/log.c:1143
+#: builtin/log.c:1168
msgid "cover letter needs email format"
msgstr "la lettre de motivation doit être au format courriel"
-#: builtin/log.c:1149
+#: builtin/log.c:1174
msgid "failed to create cover-letter file"
msgstr "échec de création du fichier de lettre de motivation"
-#: builtin/log.c:1228
+#: builtin/log.c:1261
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to aberrant : %s"
-#: builtin/log.c:1255
+#: builtin/log.c:1288
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]"
-#: builtin/log.c:1313
+#: builtin/log.c:1346
msgid "two output directories?"
msgstr "deux répertoires de sortie ?"
-#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211
+#: builtin/log.c:1497 builtin/log.c:2317 builtin/log.c:2319 builtin/log.c:2331
#, c-format
msgid "unknown commit %s"
msgstr "commit inconnu %s"
-#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1508 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "échec à résoudre '%s' comme une référence valide"
-#: builtin/log.c:1439
+#: builtin/log.c:1517
msgid "could not find exact merge base"
msgstr "impossible de trouver la base de fusion exacte"
-#: builtin/log.c:1443
+#: builtin/log.c:1527
msgid ""
"failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
@@ -15751,285 +16983,297 @@
"Ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> "
"manuellement"
-#: builtin/log.c:1463
+#: builtin/log.c:1550
msgid "failed to find exact merge base"
msgstr "échec à trouver la base de fusion exacte"
-#: builtin/log.c:1474
+#: builtin/log.c:1567
msgid "base commit should be the ancestor of revision list"
msgstr "le commit de base devrait être l'ancêtre de la liste de révisions"
-#: builtin/log.c:1478
+#: builtin/log.c:1577
msgid "base commit shouldn't be in revision list"
msgstr "le commit de base ne devrait pas faire partie de la liste de révisions"
-#: builtin/log.c:1531
+#: builtin/log.c:1635
msgid "cannot get patch id"
msgstr "impossible d'obtenir l'id du patch"
-#: builtin/log.c:1583
-msgid "failed to infer range-diff ranges"
-msgstr "échec d'inférence d'intervalles de différence d'intervalles"
+#: builtin/log.c:1692
+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:1629
+#: builtin/log.c:1694
+#, 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:1738
msgid "use [PATCH n/m] even with a single patch"
msgstr "utiliser [PATCH n/m] même avec un patch unique"
-#: builtin/log.c:1632
+#: builtin/log.c:1741
msgid "use [PATCH] even with multiple patches"
msgstr "utiliser [PATCH] même avec des patchs multiples"
-#: builtin/log.c:1636
+#: builtin/log.c:1745
msgid "print patches to standard out"
msgstr "afficher les patchs sur la sortie standard"
-#: builtin/log.c:1638
+#: builtin/log.c:1747
msgid "generate a cover letter"
msgstr "générer une lettre de motivation"
-#: builtin/log.c:1640
+#: builtin/log.c:1749
msgid "use simple number sequence for output file names"
msgstr ""
"utiliser une séquence simple de nombres pour les nom des fichiers de sortie"
-#: builtin/log.c:1641
+#: builtin/log.c:1750
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1642
+#: builtin/log.c:1751
msgid "use <sfx> instead of '.patch'"
msgstr "utiliser <sfx> au lieu de '.patch'"
-#: builtin/log.c:1644
+#: builtin/log.c:1753
msgid "start numbering patches at <n> instead of 1"
msgstr "démarrer la numérotation des patchs à <n> au lieu de 1"
-#: builtin/log.c:1646
+#: builtin/log.c:1755
msgid "mark the series as Nth re-roll"
msgstr "marquer la série comme une Nième réédition"
-#: builtin/log.c:1648
-msgid "Use [RFC PATCH] instead of [PATCH]"
+#: builtin/log.c:1757
+msgid "max length of output filename"
+msgstr "taille maximum du nom du fichier de sortie"
+
+#: builtin/log.c:1759
+msgid "use [RFC PATCH] instead of [PATCH]"
msgstr "utiliser [RFC PATCH] au lieu de [PATCH]"
-#: builtin/log.c:1651
+#: builtin/log.c:1762
msgid "cover-from-description-mode"
msgstr "cover-from-description-mode"
-#: builtin/log.c:1652
+#: builtin/log.c:1763
msgid "generate parts of a cover letter based on a branch's description"
msgstr ""
"générer des parties de la lettre d'introduction à partir de la description "
"de la branche"
-#: builtin/log.c:1654
-msgid "Use [<prefix>] instead of [PATCH]"
+#: builtin/log.c:1765
+msgid "use [<prefix>] instead of [PATCH]"
msgstr "utiliser [<préfixe>] au lieu de [PATCH]"
-#: builtin/log.c:1657
+#: builtin/log.c:1768
msgid "store resulting files in <dir>"
msgstr "stocker les fichiers résultats dans <répertoire>"
-#: builtin/log.c:1660
+#: builtin/log.c:1771
msgid "don't strip/add [PATCH]"
msgstr "ne pas retirer/ajouter [PATCH]"
-#: builtin/log.c:1663
+#: builtin/log.c:1774
msgid "don't output binary diffs"
msgstr "ne pas imprimer les diffs binaires"
-#: builtin/log.c:1665
+#: builtin/log.c:1776
msgid "output all-zero hash in From header"
msgstr "écrire une empreinte à zéro dans l'entête From"
-#: builtin/log.c:1667
+#: builtin/log.c:1778
msgid "don't include a patch matching a commit upstream"
msgstr "ne pas inclure un patch correspondant à un commit amont"
-#: builtin/log.c:1669
+#: builtin/log.c:1780
msgid "show patch format instead of default (patch + stat)"
msgstr "afficher le format du patch au lieu du défaut (patch + stat)"
-#: builtin/log.c:1671
+#: builtin/log.c:1782
msgid "Messaging"
msgstr "Communication"
-#: builtin/log.c:1672
+#: builtin/log.c:1783
msgid "header"
msgstr "en-tête"
-#: builtin/log.c:1673
+#: builtin/log.c:1784
msgid "add email header"
msgstr "ajouter l'en-tête de courriel"
-#: builtin/log.c:1674 builtin/log.c:1676
+#: builtin/log.c:1785 builtin/log.c:1786
msgid "email"
msgstr "courriel"
-#: builtin/log.c:1674
+#: builtin/log.c:1785
msgid "add To: header"
msgstr "ajouter l'en-tête \"To:\""
-#: builtin/log.c:1676
+#: builtin/log.c:1786
msgid "add Cc: header"
msgstr "ajouter l'en-tête \"Cc:\""
-#: builtin/log.c:1678
+#: builtin/log.c:1787
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1679
+#: builtin/log.c:1788
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)"
-#: builtin/log.c:1681
+#: builtin/log.c:1790
msgid "message-id"
msgstr "id-message"
-#: builtin/log.c:1682
+#: builtin/log.c:1791
msgid "make first mail a reply to <message-id>"
msgstr "répondre dans le premier message à <id-message>"
-#: builtin/log.c:1683 builtin/log.c:1686
+#: builtin/log.c:1792 builtin/log.c:1795
msgid "boundary"
msgstr "limite"
-#: builtin/log.c:1684
+#: builtin/log.c:1793
msgid "attach the patch"
msgstr "attacher le patch"
-#: builtin/log.c:1687
+#: builtin/log.c:1796
msgid "inline the patch"
msgstr "patch à l'intérieur"
-#: builtin/log.c:1691
+#: builtin/log.c:1800
msgid "enable message threading, styles: shallow, deep"
msgstr ""
"activer l'enfilage de message, styles : shallow (superficiel), deep (profond)"
-#: builtin/log.c:1693
+#: builtin/log.c:1802
msgid "signature"
msgstr "signature"
-#: builtin/log.c:1694
+#: builtin/log.c:1803
msgid "add a signature"
msgstr "ajouter une signature"
-#: builtin/log.c:1695
+#: builtin/log.c:1804
msgid "base-commit"
msgstr "commit-de-base"
-#: builtin/log.c:1696
+#: builtin/log.c:1805
msgid "add prerequisite tree info to the patch series"
msgstr "Ajouter un arbre prérequis à la série de patchs"
-#: builtin/log.c:1698
+#: builtin/log.c:1808
msgid "add a signature from a file"
msgstr "ajouter une signature depuis un fichier"
-#: builtin/log.c:1699
+#: builtin/log.c:1809
msgid "don't print the patch filenames"
msgstr "ne pas afficher les noms de fichiers des patchs"
-#: builtin/log.c:1701
+#: builtin/log.c:1811
msgid "show progress while generating patches"
msgstr ""
"afficher la barre de progression durant la phase de génération des patchs"
-#: builtin/log.c:1703
+#: builtin/log.c:1813
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
"afficher les modifications par rapport à <rév> dans la première page ou une "
"rustine"
-#: builtin/log.c:1706
+#: builtin/log.c:1816
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
"afficher les modifications par rapport à <refspec> dans la première page ou "
"une rustine"
-#: builtin/log.c:1708
+#: builtin/log.c:1818
msgid "percentage by which creation is weighted"
msgstr "pourcentage par lequel la création est pondérée"
-#: builtin/log.c:1792
+#: builtin/log.c:1904
#, c-format
msgid "invalid ident line: %s"
msgstr "ligne d'identification invalide : %s"
-#: builtin/log.c:1807
+#: builtin/log.c:1919
msgid "-n and -k are mutually exclusive"
msgstr "-n et -k sont mutuellement exclusifs"
-#: builtin/log.c:1809
+#: builtin/log.c:1921
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs"
-#: builtin/log.c:1817
+#: builtin/log.c:1929
msgid "--name-only does not make sense"
msgstr "--name-only n'a pas de sens"
-#: builtin/log.c:1819
+#: builtin/log.c:1931
msgid "--name-status does not make sense"
msgstr "--name-status n'a pas de sens"
-#: builtin/log.c:1821
+#: builtin/log.c:1933
msgid "--check does not make sense"
msgstr "--check n'a pas de sens"
-#: builtin/log.c:1854
-msgid "standard output, or directory, which one?"
-msgstr "sortie standard, ou répertoire, lequel ?"
+#: builtin/log.c:1955
+msgid "--stdout, --output, and --output-directory are mutually exclusive"
+msgstr "--stdout, --output, et --output-directory sont mutuellement exclusifs"
-#: builtin/log.c:1958
+#: builtin/log.c:2078
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff requiert --cover-letter ou une rustine unique"
-#: builtin/log.c:1962
+#: builtin/log.c:2082
msgid "Interdiff:"
msgstr "Interdiff :"
-#: builtin/log.c:1963
+#: builtin/log.c:2083
#, c-format
msgid "Interdiff against v%d:"
msgstr "Interdiff contre v%d :"
-#: builtin/log.c:1969
+#: builtin/log.c:2089
msgid "--creation-factor requires --range-diff"
msgstr "--creation-factor requiert --range-diff"
-#: builtin/log.c:1973
+#: builtin/log.c:2093
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff requiert --cover-letter ou une rustine unique"
-#: builtin/log.c:1981
+#: builtin/log.c:2101
msgid "Range-diff:"
msgstr "Diff-intervalle :"
-#: builtin/log.c:1982
+#: builtin/log.c:2102
#, c-format
msgid "Range-diff against v%d:"
msgstr "Diff-intervalle contre v%d :"
-#: builtin/log.c:1993
+#: builtin/log.c:2113
#, c-format
msgid "unable to read signature file '%s'"
msgstr "lecture du fichier de signature '%s' impossible"
-#: builtin/log.c:2029
+#: builtin/log.c:2149
msgid "Generating patches"
msgstr "Génération des patchs"
-#: builtin/log.c:2073
+#: builtin/log.c:2193
msgid "failed to create output files"
msgstr "échec de création des fichiers en sortie"
-#: builtin/log.c:2132
+#: builtin/log.c:2252
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]"
-#: builtin/log.c:2186
+#: builtin/log.c:2306
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -16037,113 +17281,117 @@
"Impossible de trouver une branche distante suivie, merci de spécifier "
"<branche_amont> manuellement.\n"
-#: builtin/ls-files.c:470
+#: builtin/ls-files.c:486
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<options>] [<fichier>...]"
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:542
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:544
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:546
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:548
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:550
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:552
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:554
msgid "show other files in the output"
msgstr "afficher les autres fichiers dans la sortie"
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:556
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:559
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:561
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:563
msgid "show 'other' directories' names only"
msgstr "afficher seulement les noms des répertoires 'other'"
-#: builtin/ls-files.c:549
+#: builtin/ls-files.c:565
msgid "show line endings of files"
msgstr "afficher les fins de lignes des fichiers"
-#: builtin/ls-files.c:551
+#: builtin/ls-files.c:567
msgid "don't show empty directories"
msgstr "ne pas afficher les répertoires vides"
-#: builtin/ls-files.c:554
+#: builtin/ls-files.c:570
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:572
msgid "show resolve-undo information"
msgstr "afficher l'information resolv-undo"
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:574
msgid "skip files matching pattern"
msgstr "sauter les fichiers correspondant au motif"
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:577
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:580
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:582
msgid "add the standard git exclusions"
msgstr "ajouter les exclusions git standard"
-#: builtin/ls-files.c:570
+#: builtin/ls-files.c:586
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:589
msgid "recurse through submodules"
msgstr "parcourir récursivement les sous-modules"
-#: builtin/ls-files.c:575
+#: builtin/ls-files.c:591
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:592
msgid "tree-ish"
msgstr "arbre ou apparenté"
-#: builtin/ls-files.c:577
+#: builtin/ls-files.c:593
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:595
msgid "show debugging data"
msgstr "afficher les données de débogage"
+#: builtin/ls-files.c:597
+msgid "suppress duplicate entries"
+msgstr "supprimer les entrées dupliquées"
+
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
@@ -16154,41 +17402,41 @@
" [-q | --quiet] [--exit-code] [--get-url]\n"
" [--symref] [<dépôt> [<références>...]]"
-#: builtin/ls-remote.c:59
+#: builtin/ls-remote.c:60
msgid "do not print remote URL"
msgstr "ne pas afficher les URL distantes"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1404
msgid "exec"
msgstr "exécutable"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
+#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
msgid "path of git-upload-pack on the remote host"
msgstr "chemin vers git-upload-pack sur le serveur distant"
-#: builtin/ls-remote.c:65
+#: builtin/ls-remote.c:66
msgid "limit to tags"
msgstr "limiter aux étiquettes"
-#: builtin/ls-remote.c:66
+#: builtin/ls-remote.c:67
msgid "limit to heads"
msgstr "limiter aux heads"
-#: builtin/ls-remote.c:67
+#: builtin/ls-remote.c:68
msgid "do not show peeled tags"
msgstr "ne pas afficher les étiquettes pelées"
-#: builtin/ls-remote.c:69
+#: builtin/ls-remote.c:70
msgid "take url.<base>.insteadOf into account"
msgstr "prendre en compte url.<base>.insteadOf"
-#: builtin/ls-remote.c:72
+#: builtin/ls-remote.c:73
msgid "exit with exit code 2 if no matching refs are found"
msgstr ""
"sortir avec un code d'erreur 2 si aucune correspondance de référence n'est "
"trouvée"
-#: builtin/ls-remote.c:75
+#: builtin/ls-remote.c:76
msgid "show underlying ref in addition to the object pointed by it"
msgstr "afficher la réf sous-jacente en plus de l'objet pointé par elle"
@@ -16235,398 +17483,6 @@
msgid "empty mbox: '%s'"
msgstr "mbox vide : '%s'"
-#: builtin/merge.c:55
-msgid "git merge [<options>] [<commit>...]"
-msgstr "git merge [<options>] [<commit>...]"
-
-#: builtin/merge.c:56
-msgid "git merge --abort"
-msgstr "git merge --abort"
-
-#: builtin/merge.c:57
-msgid "git merge --continue"
-msgstr "git merge --continue"
-
-#: builtin/merge.c:119
-msgid "switch `m' requires a value"
-msgstr "le commutateur `m' a besoin d'une valeur"
-
-#: builtin/merge.c:142
-#, c-format
-msgid "option `%s' requires a value"
-msgstr "le commutateur '%s' a besoin d'une valeur"
-
-#: builtin/merge.c:188
-#, c-format
-msgid "Could not find merge strategy '%s'.\n"
-msgstr "Impossible de trouver la stratégie de fusion '%s'.\n"
-
-#: builtin/merge.c:189
-#, c-format
-msgid "Available strategies are:"
-msgstr "Les stratégies disponibles sont :"
-
-#: builtin/merge.c:194
-#, c-format
-msgid "Available custom strategies are:"
-msgstr "Les stratégies personnalisées sont :"
-
-#: builtin/merge.c:245 builtin/pull.c:132
-msgid "do not show a diffstat at the end of the merge"
-msgstr "ne pas afficher un diffstat à la fin de la fusion"
-
-#: builtin/merge.c:248 builtin/pull.c:135
-msgid "show a diffstat at the end of the merge"
-msgstr "afficher un diffstat à la fin de la fusion"
-
-#: builtin/merge.c:249 builtin/pull.c:138
-msgid "(synonym to --stat)"
-msgstr "(synonyme de --stat)"
-
-#: builtin/merge.c:251 builtin/pull.c:141
-msgid "add (at most <n>) entries from shortlog to merge commit message"
-msgstr ""
-"ajouter (au plus <n>) éléments du journal court au message de validation de "
-"la fusion"
-
-#: builtin/merge.c:254 builtin/pull.c:147
-msgid "create a single commit instead of doing a merge"
-msgstr "créer une validation unique au lieu de faire une fusion"
-
-#: builtin/merge.c:256 builtin/pull.c:150
-msgid "perform a commit if the merge succeeds (default)"
-msgstr "effectuer une validation si la fusion réussit (défaut)"
-
-#: builtin/merge.c:258 builtin/pull.c:153
-msgid "edit message before committing"
-msgstr "éditer le message avant la validation"
-
-#: builtin/merge.c:260
-msgid "allow fast-forward (default)"
-msgstr "autoriser l'avance rapide (défaut)"
-
-#: builtin/merge.c:262 builtin/pull.c:160
-msgid "abort if fast-forward is not possible"
-msgstr "abandonner si l'avance rapide n'est pas possible"
-
-#: builtin/merge.c:266 builtin/pull.c:163
-msgid "verify that the named commit has a valid GPG signature"
-msgstr "vérifier que le commit nommé a une signature GPG valide"
-
-#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167
-#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114
-msgid "strategy"
-msgstr "stratégie"
-
-#: builtin/merge.c:268 builtin/pull.c:168
-msgid "merge strategy to use"
-msgstr "stratégie de fusion à utiliser"
-
-#: builtin/merge.c:269 builtin/pull.c:171
-msgid "option=value"
-msgstr "option=valeur"
-
-#: builtin/merge.c:270 builtin/pull.c:172
-msgid "option for selected merge strategy"
-msgstr "option pour la stratégie de fusion sélectionnée"
-
-#: builtin/merge.c:272
-msgid "merge commit message (for a non-fast-forward merge)"
-msgstr ""
-"message de validation de la fusion (pour une fusion sans avance rapide)"
-
-#: builtin/merge.c:279
-msgid "abort the current in-progress merge"
-msgstr "abandonner la fusion en cours"
-
-#: builtin/merge.c:281
-msgid "--abort but leave index and working tree alone"
-msgstr "--abort mais laisser l'index et l'arbre de travail inchangés"
-
-#: builtin/merge.c:283
-msgid "continue the current in-progress merge"
-msgstr "continuer la fusion en cours"
-
-#: builtin/merge.c:285 builtin/pull.c:179
-msgid "allow merging unrelated histories"
-msgstr "permettre la fusion d'historiques sans rapport"
-
-#: builtin/merge.c:291
-msgid "bypass pre-merge-commit and commit-msg hooks"
-msgstr "ne pas utiliser les crochets pre-merge-commit et commit-msg"
-
-#: builtin/merge.c:308
-msgid "could not run stash."
-msgstr "impossible de lancer le remisage."
-
-#: builtin/merge.c:313
-msgid "stash failed"
-msgstr "échec du remisage"
-
-#: builtin/merge.c:318
-#, c-format
-msgid "not a valid object: %s"
-msgstr "pas un objet valide : %s"
-
-#: builtin/merge.c:340 builtin/merge.c:357
-msgid "read-tree failed"
-msgstr "read-tree a échoué"
-
-#: builtin/merge.c:387
-msgid " (nothing to squash)"
-msgstr " (rien à compresser)"
-
-#: builtin/merge.c:398
-#, c-format
-msgid "Squash commit -- not updating HEAD\n"
-msgstr "Validation compressée -- HEAD non mise à jour\n"
-
-#: builtin/merge.c:448
-#, c-format
-msgid "No merge message -- not updating HEAD\n"
-msgstr "Pas de message de fusion -- pas de mise à jour de HEAD\n"
-
-#: builtin/merge.c:499
-#, c-format
-msgid "'%s' does not point to a commit"
-msgstr "'%s' ne pointe pas sur un commit"
-
-#: builtin/merge.c:586
-#, c-format
-msgid "Bad branch.%s.mergeoptions string: %s"
-msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s"
-
-#: builtin/merge.c:708
-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
-#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Options inconnue pour merge-recursive : -X%s"
-
-#: builtin/merge.c:737
-#, c-format
-msgid "unable to write %s"
-msgstr "impossible d'écrire %s"
-
-#: builtin/merge.c:789
-#, c-format
-msgid "Could not read from '%s'"
-msgstr "Impossible de lire depuis '%s'"
-
-#: builtin/merge.c:798
-#, 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
-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 ""
-"Veuillez entrer un message de validation pour expliquer en quoi cette fusion "
-"est\n"
-"nécessaire, surtout si cela fusionne une branche amont mise à jour dans une "
-"branche de sujet.\n"
-"\n"
-
-#: builtin/merge.c:809
-msgid "An empty message aborts the commit.\n"
-msgstr "Un message vide abandonne la validation.\n"
-
-#: builtin/merge.c:812
-#, c-format
-msgid ""
-"Lines starting with '%c' will be ignored, and an empty message aborts\n"
-"the commit.\n"
-msgstr ""
-"Les lignes commençant par '%c' seront ignorées, et un message vide\n"
-"abandonne la validation.\n"
-
-#: builtin/merge.c:865
-msgid "Empty commit message."
-msgstr "Message de validation vide."
-
-#: builtin/merge.c:880
-#, c-format
-msgid "Wonderful.\n"
-msgstr "Merveilleux.\n"
-
-#: builtin/merge.c:941
-#, c-format
-msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
-msgstr ""
-"La fusion automatique a échoué ; réglez les conflits et validez le "
-"résultat.\n"
-
-#: builtin/merge.c:980
-msgid "No current branch."
-msgstr "Pas de branche courante."
-
-#: builtin/merge.c:982
-msgid "No remote for the current branch."
-msgstr "Pas de branche distante pour la branche courante."
-
-#: builtin/merge.c:984
-msgid "No default upstream defined for the current branch."
-msgstr "Pas de branche amont par défaut définie pour la branche courante."
-
-#: builtin/merge.c:989
-#, c-format
-msgid "No remote-tracking branch for %s from %s"
-msgstr "Pas de branche de suivi pour %s depuis %s"
-
-#: builtin/merge.c:1046
-#, c-format
-msgid "Bad value '%s' in environment '%s'"
-msgstr "Mauvaise valeur '%s' dans l'environnement '%s'"
-
-#: builtin/merge.c:1149
-#, c-format
-msgid "not something we can merge in %s: %s"
-msgstr "pas possible de fusionner ceci dans %s : %s"
-
-#: builtin/merge.c:1183
-msgid "not something we can merge"
-msgstr "pas possible de fusionner ceci"
-
-#: builtin/merge.c:1286
-msgid "--abort expects no arguments"
-msgstr "--abort n'accepte pas d'argument"
-
-#: builtin/merge.c:1290
-msgid "There is no merge to abort (MERGE_HEAD missing)."
-msgstr "Il n'y a pas de fusion à abandonner (MERGE_HEAD manquant)."
-
-#: builtin/merge.c:1299
-msgid "--quit expects no arguments"
-msgstr "--quit n'accepte pas d'argument"
-
-#: builtin/merge.c:1312
-msgid "--continue expects no arguments"
-msgstr "--continue ne supporte aucun argument"
-
-#: builtin/merge.c:1316
-msgid "There is no merge in progress (MERGE_HEAD missing)."
-msgstr "Il n'y a pas de fusion en cours (MERGE_HEAD manquant)."
-
-#: builtin/merge.c:1332
-msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you merge."
-msgstr ""
-"Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n"
-"Veuillez valider vos modifications avant de pouvoir fusionner."
-
-#: builtin/merge.c:1339
-msgid ""
-"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
-"Please, commit your changes before you merge."
-msgstr ""
-"Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n"
-"Veuillez valider vos modifications avant de pouvoir fusionner."
-
-#: builtin/merge.c:1342
-msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
-msgstr "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe)."
-
-#: builtin/merge.c:1356
-msgid "You cannot combine --squash with --no-ff."
-msgstr "Vous ne pouvez pas combiner --squash avec --no-ff."
-
-#: builtin/merge.c:1358
-msgid "You cannot combine --squash with --commit."
-msgstr "Vous ne pouvez pas combiner --squash avec --commit."
-
-#: builtin/merge.c:1374
-msgid "No commit specified and merge.defaultToUpstream not set."
-msgstr ""
-"Pas de validation spécifiée et merge.defaultToUpstream n'est pas défini."
-
-#: builtin/merge.c:1391
-msgid "Squash commit into empty head not supported yet"
-msgstr "La validation compressée vers une tête vide n'est pas encore supportée"
-
-#: builtin/merge.c:1393
-msgid "Non-fast-forward commit does not make sense into an empty head"
-msgstr "Une validation sans avance rapide n'a pas de sens dans une tête vide"
-
-#: builtin/merge.c:1398
-#, c-format
-msgid "%s - not something we can merge"
-msgstr "%s - pas possible de fusionner ceci"
-
-#: builtin/merge.c:1400
-msgid "Can merge only exactly one commit into empty head"
-msgstr ""
-"Possible de fusionner exactement une seule validation dans une tête vide"
-
-#: builtin/merge.c:1481
-msgid "refusing to merge unrelated histories"
-msgstr "refus de fusionner des historiques sans relation"
-
-#: builtin/merge.c:1490
-msgid "Already up to date."
-msgstr "Déjà à jour."
-
-#: builtin/merge.c:1500
-#, c-format
-msgid "Updating %s..%s\n"
-msgstr "Mise à jour %s..%s\n"
-
-#: builtin/merge.c:1542
-#, c-format
-msgid "Trying really trivial in-index merge...\n"
-msgstr "Essai de fusion vraiment triviale dans l'index...\n"
-
-#: builtin/merge.c:1549
-#, c-format
-msgid "Nope.\n"
-msgstr "Non.\n"
-
-#: builtin/merge.c:1574
-msgid "Already up to date. Yeeah!"
-msgstr "Déjà à jour. Ouais !"
-
-#: builtin/merge.c:1580
-msgid "Not possible to fast-forward, aborting."
-msgstr "Pas possible d'avancer rapidement, abandon."
-
-#: builtin/merge.c:1603 builtin/merge.c:1668
-#, c-format
-msgid "Rewinding the tree to pristine...\n"
-msgstr "Retour de l'arbre à l'original...\n"
-
-#: builtin/merge.c:1607
-#, c-format
-msgid "Trying merge strategy %s...\n"
-msgstr "Essai de la stratégie de fusion %s...\n"
-
-#: builtin/merge.c:1659
-#, c-format
-msgid "No merge strategy handled the merge.\n"
-msgstr "Aucune stratégie de fusion n'a pris en charge la fusion.\n"
-
-#: builtin/merge.c:1661
-#, c-format
-msgid "Merge with strategy %s failed.\n"
-msgstr "La fusion avec la stratégie %s a échoué.\n"
-
-#: builtin/merge.c:1670
-#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
-msgstr "Utilisation de %s pour préparer la résolution à la main.\n"
-
-#: builtin/merge.c:1682
-#, 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>..."
@@ -16647,23 +17503,23 @@
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <référence> [<validation>]"
-#: builtin/merge-base.c:153
+#: builtin/merge-base.c:143
msgid "output all common ancestors"
msgstr "afficher tous les ancêtres communs"
-#: builtin/merge-base.c:155
+#: 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:157
+#: 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:159
+#: 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:161
+#: 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>"
@@ -16738,6 +17594,439 @@
msgid "Merging %s with %s\n"
msgstr "Fusion de %s avec %s\n"
+#: builtin/merge.c:58
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<options>] [<commit>...]"
+
+#: builtin/merge.c:59
+msgid "git merge --abort"
+msgstr "git merge --abort"
+
+#: builtin/merge.c:60
+msgid "git merge --continue"
+msgstr "git merge --continue"
+
+#: builtin/merge.c:123
+msgid "switch `m' requires a value"
+msgstr "le commutateur `m' a besoin d'une valeur"
+
+#: builtin/merge.c:146
+#, c-format
+msgid "option `%s' requires a value"
+msgstr "le commutateur '%s' a besoin d'une valeur"
+
+#: builtin/merge.c:199
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr "Impossible de trouver la stratégie de fusion '%s'.\n"
+
+#: builtin/merge.c:200
+#, c-format
+msgid "Available strategies are:"
+msgstr "Les stratégies disponibles sont :"
+
+#: builtin/merge.c:205
+#, c-format
+msgid "Available custom strategies are:"
+msgstr "Les stratégies personnalisées sont :"
+
+#: builtin/merge.c:256 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:259 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:260 builtin/pull.c:139
+msgid "(synonym to --stat)"
+msgstr "(synonyme de --stat)"
+
+#: builtin/merge.c:262 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:265 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:267 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:269 builtin/pull.c:154
+msgid "edit message before committing"
+msgstr "éditer le message avant la validation"
+
+#: builtin/merge.c:271
+msgid "allow fast-forward (default)"
+msgstr "autoriser l'avance rapide (défaut)"
+
+#: builtin/merge.c:273 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:277 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:278 builtin/notes.c:787 builtin/pull.c:168
+#: builtin/rebase.c:541 builtin/rebase.c:1418 builtin/revert.c:114
+msgid "strategy"
+msgstr "stratégie"
+
+#: builtin/merge.c:279 builtin/pull.c:169
+msgid "merge strategy to use"
+msgstr "stratégie de fusion à utiliser"
+
+#: builtin/merge.c:280 builtin/pull.c:172
+msgid "option=value"
+msgstr "option=valeur"
+
+#: builtin/merge.c:281 builtin/pull.c:173
+msgid "option for selected merge strategy"
+msgstr "option pour la stratégie de fusion sélectionnée"
+
+#: builtin/merge.c:283
+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:290
+msgid "abort the current in-progress merge"
+msgstr "abandonner la fusion en cours"
+
+#: builtin/merge.c:292
+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:294
+msgid "continue the current in-progress merge"
+msgstr "continuer la fusion en cours"
+
+#: builtin/merge.c:296 builtin/pull.c:180
+msgid "allow merging unrelated histories"
+msgstr "permettre la fusion d'historiques sans rapport"
+
+#: builtin/merge.c:303
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr "ne pas utiliser les crochets pre-merge-commit et commit-msg"
+
+#: builtin/merge.c:320
+msgid "could not run stash."
+msgstr "impossible de lancer le remisage."
+
+#: builtin/merge.c:325
+msgid "stash failed"
+msgstr "échec du remisage"
+
+#: builtin/merge.c:330
+#, c-format
+msgid "not a valid object: %s"
+msgstr "pas un objet valide : %s"
+
+#: builtin/merge.c:352 builtin/merge.c:369
+msgid "read-tree failed"
+msgstr "read-tree a échoué"
+
+#: builtin/merge.c:399
+msgid " (nothing to squash)"
+msgstr " (rien à compresser)"
+
+#: builtin/merge.c:410
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr "Validation compressée -- HEAD non mise à jour\n"
+
+#: builtin/merge.c:460
+#, 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:511
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr "'%s' ne pointe pas sur un commit"
+
+#: builtin/merge.c:598
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s"
+
+#: builtin/merge.c:724
+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:737
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr "Options inconnue pour merge-recursive : -X%s"
+
+#: builtin/merge.c:756 t/helper/test-fast-rebase.c:209
+#, c-format
+msgid "unable to write %s"
+msgstr "impossible d'écrire %s"
+
+#: builtin/merge.c:808
+#, c-format
+msgid "Could not read from '%s'"
+msgstr "Impossible de lire depuis '%s'"
+
+#: builtin/merge.c:817
+#, 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:823
+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 ""
+"Veuillez entrer un message de validation pour expliquer en quoi cette fusion "
+"est\n"
+"nécessaire, surtout si cela fusionne une branche amont mise à jour dans une "
+"branche de sujet.\n"
+"\n"
+
+#: builtin/merge.c:828
+msgid "An empty message aborts the commit.\n"
+msgstr "Un message vide abandonne la validation.\n"
+
+#: builtin/merge.c:831
+#, c-format
+msgid ""
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
+"Les lignes commençant par '%c' seront ignorées, et un message vide\n"
+"abandonne la validation.\n"
+
+#: builtin/merge.c:884
+msgid "Empty commit message."
+msgstr "Message de validation vide."
+
+#: builtin/merge.c:899
+#, c-format
+msgid "Wonderful.\n"
+msgstr "Merveilleux.\n"
+
+#: builtin/merge.c:960
+#, 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:999
+msgid "No current branch."
+msgstr "Pas de branche courante."
+
+#: builtin/merge.c:1001
+msgid "No remote for the current branch."
+msgstr "Pas de branche distante pour la branche courante."
+
+#: builtin/merge.c:1003
+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:1008
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
+msgstr "Pas de branche de suivi pour %s depuis %s"
+
+#: builtin/merge.c:1065
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "Mauvaise valeur '%s' dans l'environnement '%s'"
+
+#: builtin/merge.c:1168
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr "pas possible de fusionner ceci dans %s : %s"
+
+#: builtin/merge.c:1202
+msgid "not something we can merge"
+msgstr "pas possible de fusionner ceci"
+
+#: builtin/merge.c:1312
+msgid "--abort expects no arguments"
+msgstr "--abort n'accepte pas d'argument"
+
+#: builtin/merge.c:1316
+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:1334
+msgid "--quit expects no arguments"
+msgstr "--quit n'accepte pas d'argument"
+
+#: builtin/merge.c:1347
+msgid "--continue expects no arguments"
+msgstr "--continue ne supporte aucun argument"
+
+#: builtin/merge.c:1351
+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:1367
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+"Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n"
+"Veuillez valider vos modifications avant de pouvoir fusionner."
+
+#: builtin/merge.c:1374
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+"Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n"
+"Veuillez valider vos modifications avant de pouvoir fusionner."
+
+#: builtin/merge.c:1377
+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:1391
+msgid "You cannot combine --squash with --no-ff."
+msgstr "Vous ne pouvez pas combiner --squash avec --no-ff."
+
+#: builtin/merge.c:1393
+msgid "You cannot combine --squash with --commit."
+msgstr "Vous ne pouvez pas combiner --squash avec --commit."
+
+#: builtin/merge.c:1409
+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:1426
+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:1428
+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:1433
+#, c-format
+msgid "%s - not something we can merge"
+msgstr "%s - pas possible de fusionner ceci"
+
+#: builtin/merge.c:1435
+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:1516
+msgid "refusing to merge unrelated histories"
+msgstr "refus de fusionner des historiques sans relation"
+
+#: builtin/merge.c:1525
+msgid "Already up to date."
+msgstr "Déjà à jour."
+
+#: builtin/merge.c:1535
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr "Mise à jour %s..%s\n"
+
+#: builtin/merge.c:1581
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr "Essai de fusion vraiment triviale dans l'index...\n"
+
+#: builtin/merge.c:1588
+#, c-format
+msgid "Nope.\n"
+msgstr "Non.\n"
+
+#: builtin/merge.c:1613
+msgid "Already up to date. Yeeah!"
+msgstr "Déjà à jour. Ouais !"
+
+#: builtin/merge.c:1619
+msgid "Not possible to fast-forward, aborting."
+msgstr "Pas possible d'avancer rapidement, abandon."
+
+#: builtin/merge.c:1647 builtin/merge.c:1712
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr "Retour de l'arbre à l'original...\n"
+
+#: builtin/merge.c:1651
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr "Essai de la stratégie de fusion %s...\n"
+
+#: builtin/merge.c:1703
+#, 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:1705
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr "La fusion avec la stratégie %s a échoué.\n"
+
+#: builtin/merge.c:1714
+#, 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:1728
+#, 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/mktag.c:10
+msgid "git mktag"
+msgstr "git mktag"
+
+#: builtin/mktag.c:30
+#, c-format
+msgid "warning: tag input does not pass fsck: %s"
+msgstr "attention : l'entrée d'étiquette ne passe pas fsck : %s"
+
+#: builtin/mktag.c:41
+#, c-format
+msgid "error: tag input does not pass fsck: %s"
+msgstr "erreur : l'entrée d'étiquette ne passe pas fsck : %s"
+
+#: builtin/mktag.c:44
+#, c-format
+msgid "%d (FSCK_IGNORE?) should never trigger this callback"
+msgstr "%d (FSCK_IGNORE?) ne devrait jamais rappeler cette fonction"
+
+#: builtin/mktag.c:59
+#, c-format
+msgid "could not read tagged object '%s'"
+msgstr "impossible de lire l'objet étiqueté '%s'"
+
+#: builtin/mktag.c:62
+#, c-format
+msgid "object '%s' tagged as '%s', but is a '%s' type"
+msgstr "l'objet '%s' étiqueté comme '%s', mais est de type '%s'"
+
+#: builtin/mktag.c:99
+msgid "tag on stdin did not pass our strict fsck check"
+msgstr "l'étiquette sur stdin n'a pas passé le test strict fsck"
+
+#: builtin/mktag.c:102
+msgid "tag on stdin did not refer to a valid object"
+msgstr "l'étiquette sur stdin ne pointe pas sur un objet valide"
+
+#: builtin/mktag.c:105 builtin/tag.c:232
+msgid "unable to write tag file"
+msgstr "impossible d'écrire le fichier d'étiquettes"
+
#: builtin/mktree.c:66
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
@@ -16776,7 +18065,10 @@
"pendant le repaquetage, collecter les fichiers paquet de plus petite taille "
"dans un lot plus grand que cette taille"
-#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67
+#: builtin/multi-pack-index.c:50 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 builtin/prune-packed.c:25 builtin/tag.c:575
msgid "too many arguments"
msgstr "trop d'arguments"
@@ -16817,68 +18109,72 @@
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:781 builtin/repack.c:518
+#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:483
#, c-format
msgid "renaming '%s' failed"
msgstr "le renommage de '%s' a échoué"
@@ -16896,8 +18192,9 @@
msgstr "git name-rev [<options>] --stdin"
#: builtin/name-rev.c:524
-msgid "print only names (no SHA-1)"
-msgstr "afficher seulement les noms (pas de SHA-1)"
+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:525
msgid "only use tags to name the commits"
@@ -17071,7 +18368,7 @@
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:565
#, c-format
msgid "could not open or read '%s'"
msgstr "impossible d'ouvrir ou lire '%s'"
@@ -17111,12 +18408,6 @@
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "Refus de faire %s sur des notes dans %s (hors de refs/notes/)"
-#: 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 "trop de paramètres"
-
#: builtin/notes.c:389 builtin/notes.c:678
#, c-format
msgid "no note found for object %s."
@@ -17175,8 +18466,8 @@
"charger la configuration de réécriture pour <commande> (implique --stdin)"
#: builtin/notes.c:517
-msgid "too few parameters"
-msgstr "pas assez de paramètres"
+msgid "too few arguments"
+msgstr "trop peu d'arguments"
#: builtin/notes.c:538
#, c-format
@@ -17305,7 +18596,7 @@
"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:578
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Impossible de résoudre '%s' comme une référence valide."
@@ -17324,7 +18615,7 @@
msgid "read object names from the standard input"
msgstr "lire les noms d'objet depuis l'entrée standard"
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148
msgid "do not remove, show only"
msgstr "ne pas supprimer, afficher seulement"
@@ -17340,125 +18631,156 @@
msgid "use notes from <notes-ref>"
msgstr "utiliser les notes depuis <références-notes>"
-#: builtin/notes.c:1034 builtin/stash.c:1643
+#: builtin/notes.c:1034 builtin/stash.c:1671
#, 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:430
+#: builtin/pack-objects.c:440
+#, c-format
+msgid ""
+"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
+"pack %s"
+msgstr ""
+"write_reuse_object : impossible de localiser %s, attendu à l'offset "
+"%<PRIuMAX> dans le paquet %s"
+
+#: builtin/pack-objects.c:448
#, c-format
msgid "bad packed object CRC for %s"
msgstr "mauvais CRC d'objet empaqueté pour %s"
-#: builtin/pack-objects.c:441
+#: builtin/pack-objects.c:459
#, c-format
msgid "corrupt packed object for %s"
msgstr "objet empaqueté corrompu pour %s"
-#: builtin/pack-objects.c:572
+#: builtin/pack-objects.c:590
#, c-format
msgid "recursive delta detected for object %s"
msgstr "delta récursif détecté pour l'objet %s"
-#: builtin/pack-objects.c:783
+#: builtin/pack-objects.c:801
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "%u objets commandés, %<PRIu32> attendus"
-#: builtin/pack-objects.c:972
+#: builtin/pack-objects.c:896
+#, c-format
+msgid "expected object at offset %<PRIuMAX> in pack %s"
+msgstr "objet attendu à l'offset %<PRIuMAX> dans le paquet %s"
+
+#: builtin/pack-objects.c:1015
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"désactivation de l'écriture en bitmap, les fichiers paquets sont scindés à "
"cause de pack.packSizeLimit"
-#: builtin/pack-objects.c:985
+#: builtin/pack-objects.c:1028
msgid "Writing objects"
msgstr "Écriture des objets"
-#: builtin/pack-objects.c:1046 builtin/update-index.c:90
+#: builtin/pack-objects.c:1089 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "échec du stat de %s"
-#: builtin/pack-objects.c:1099
+#: builtin/pack-objects.c:1141
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "%<PRIu32> objets écrits, %<PRIu32> attendus"
-#: builtin/pack-objects.c:1297
+#: builtin/pack-objects.c:1358
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
"désactivation de l'écriture en bitmap car certains objets ne sont pas "
"compressés"
-#: builtin/pack-objects.c:1724
+#: builtin/pack-objects.c:1806
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "dépassement de décalage de base de delta pour %s"
-#: builtin/pack-objects.c:1733
+#: builtin/pack-objects.c:1815
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "décalage de base de delta est hors limite pour %s"
-#: builtin/pack-objects.c:2004
+#: builtin/pack-objects.c:2096
msgid "Counting objects"
msgstr "Décompte des objets"
-#: builtin/pack-objects.c:2149
+#: builtin/pack-objects.c:2241
#, c-format
msgid "unable to parse object header of %s"
msgstr "impossible d'analyser l'entête d'objet de %s"
-#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235
-#: builtin/pack-objects.c:2245
+#: builtin/pack-objects.c:2311 builtin/pack-objects.c:2327
+#: builtin/pack-objects.c:2337
#, c-format
msgid "object %s cannot be read"
msgstr "l'objet %s ne peut être lu"
-#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249
+#: builtin/pack-objects.c:2314 builtin/pack-objects.c:2341
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr ""
"objet %s longueur de l'objet inconsistante (%<PRIuMAX> contre %<PRIuMAX>)"
-#: builtin/pack-objects.c:2259
+#: builtin/pack-objects.c:2351
msgid "suboptimal pack - out of memory"
msgstr "paquet sous-optimal - mémoire insuffisante"
-#: builtin/pack-objects.c:2574
+#: builtin/pack-objects.c:2666
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Compression par delta en utilisant jusqu'à %d fils d'exécution"
-#: builtin/pack-objects.c:2713
+#: builtin/pack-objects.c:2805
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "impossible d'empaqueter les objets joignables depuis l'étiquette %s"
-#: builtin/pack-objects.c:2801
+#: builtin/pack-objects.c:2891
msgid "Compressing objects"
msgstr "Compression des objets"
-#: builtin/pack-objects.c:2807
+#: builtin/pack-objects.c:2897
msgid "inconsistency with delta count"
msgstr "inconsistance dans le compte de delta"
-#: builtin/pack-objects.c:2888
+#: builtin/pack-objects.c:2976
+#, 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:2979
+#, 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:3008
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -17467,7 +18789,7 @@
"ID d'objet de bord attendu, reçu des données illisibles :\n"
"%s"
-#: builtin/pack-objects.c:2894
+#: builtin/pack-objects.c:3014
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -17476,236 +18798,244 @@
"ID d'objet attendu, reçu des données illisibles :\n"
"%s"
-#: builtin/pack-objects.c:2992
+#: builtin/pack-objects.c:3112
msgid "invalid value for --missing"
msgstr "valeur invalide pour --missing"
-#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159
+#: builtin/pack-objects.c:3171 builtin/pack-objects.c:3279
msgid "cannot open pack index"
msgstr "impossible d'ouvrir l'index de paquet"
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3202
#, c-format
msgid "loose object at %s could not be examined"
msgstr "l'objet libre à %s n'a pas pu être examiné"
-#: builtin/pack-objects.c:3167
+#: builtin/pack-objects.c:3287
msgid "unable to force loose object"
msgstr "impossible de forcer l'objet libre"
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3380
#, c-format
msgid "not a rev '%s'"
msgstr "'%s' n'est pas une révision"
-#: builtin/pack-objects.c:3263
+#: builtin/pack-objects.c:3383
#, c-format
msgid "bad revision '%s'"
msgstr "mauvaise révision '%s'"
-#: builtin/pack-objects.c:3288
+#: builtin/pack-objects.c:3408
msgid "unable to add recent objects"
msgstr "impossible d'ajouter les objets récents"
-#: builtin/pack-objects.c:3341
+#: builtin/pack-objects.c:3461
#, c-format
msgid "unsupported index version %s"
msgstr "version d'index non supportée %s"
-#: builtin/pack-objects.c:3345
+#: builtin/pack-objects.c:3465
#, c-format
msgid "bad index version '%s'"
msgstr "mauvaise version d'index '%s'"
-#: builtin/pack-objects.c:3383
+#: builtin/pack-objects.c:3503
msgid "<version>[,<offset>]"
msgstr "<version>[,<décalage>]"
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3504
msgid "write the pack index file in the specified idx format version"
msgstr ""
"écrire le fichier d'index du paquet dans le format d'index de version "
"spécifié"
-#: builtin/pack-objects.c:3387
+#: builtin/pack-objects.c:3507
msgid "maximum size of each output pack file"
msgstr "taille maximum de chaque fichier paquet en sortie"
-#: builtin/pack-objects.c:3389
+#: builtin/pack-objects.c:3509
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorer les objets empruntés à un autre magasin d'objets"
-#: builtin/pack-objects.c:3391
+#: builtin/pack-objects.c:3511
msgid "ignore packed objects"
msgstr "ignorer les objets empaquetés"
-#: builtin/pack-objects.c:3393
+#: builtin/pack-objects.c:3513
msgid "limit pack window by objects"
msgstr "limiter la fenêtre d'empaquetage par objets"
-#: builtin/pack-objects.c:3395
+#: builtin/pack-objects.c:3515
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"limiter la fenêtre d'empaquetage par mémoire en plus de la limite d'objets"
-#: builtin/pack-objects.c:3397
+#: builtin/pack-objects.c:3517
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
"longueur maximum de la chaîne de delta autorisée dans le paquet résultant"
-#: builtin/pack-objects.c:3399
+#: builtin/pack-objects.c:3519
msgid "reuse existing deltas"
msgstr "réutiliser les deltas existants"
-#: builtin/pack-objects.c:3401
+#: builtin/pack-objects.c:3521
msgid "reuse existing objects"
msgstr "réutiliser les objets existants"
-#: builtin/pack-objects.c:3403
+#: builtin/pack-objects.c:3523
msgid "use OFS_DELTA objects"
msgstr "utiliser les objets OFS_DELTA"
-#: builtin/pack-objects.c:3405
+#: builtin/pack-objects.c:3525
msgid "use threads when searching for best delta matches"
msgstr ""
"utiliser des fils lors de la recherche pour une meilleure correspondance des "
"deltas"
-#: builtin/pack-objects.c:3407
+#: builtin/pack-objects.c:3527
msgid "do not create an empty pack output"
msgstr "ne pas créer un paquet vide"
-#: builtin/pack-objects.c:3409
+#: builtin/pack-objects.c:3529
msgid "read revision arguments from standard input"
msgstr "lire les paramètres de révision depuis l'entrée standard"
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:3531
msgid "limit the objects to those that are not yet packed"
msgstr "limiter les objets à ceux qui ne sont pas encore empaquetés"
-#: builtin/pack-objects.c:3414
+#: builtin/pack-objects.c:3534
msgid "include objects reachable from any reference"
msgstr "inclure les objets accessibles depuis toute référence"
-#: builtin/pack-objects.c:3417
+#: builtin/pack-objects.c:3537
msgid "include objects referred by reflog entries"
msgstr "inclure les objets référencés par les éléments de reflog"
-#: builtin/pack-objects.c:3420
+#: builtin/pack-objects.c:3540
msgid "include objects referred to by the index"
msgstr "inclure les objets référencés par l'index"
-#: builtin/pack-objects.c:3423
+#: builtin/pack-objects.c:3543
msgid "output pack to stdout"
msgstr "afficher l'empaquetage sur la sortie standard"
-#: builtin/pack-objects.c:3425
+#: builtin/pack-objects.c:3545
msgid "include tag objects that refer to objects to be packed"
msgstr "inclure les objets d'étiquettes qui réfèrent à des objets à empaqueter"
-#: builtin/pack-objects.c:3427
+#: builtin/pack-objects.c:3547
msgid "keep unreachable objects"
msgstr "garder les objets inaccessibles"
-#: builtin/pack-objects.c:3429
+#: builtin/pack-objects.c:3549
msgid "pack loose unreachable objects"
msgstr "empaqueter les objets inaccessibles détachés"
-#: builtin/pack-objects.c:3431
+#: builtin/pack-objects.c:3551
msgid "unpack unreachable objects newer than <time>"
msgstr "dépaqueter les objets inaccessibles plus récents que <heure>"
-#: builtin/pack-objects.c:3434
+#: builtin/pack-objects.c:3554
msgid "use the sparse reachability algorithm"
msgstr "utiliser l'algorithme de joignabilité creuse"
-#: builtin/pack-objects.c:3436
+#: builtin/pack-objects.c:3556
msgid "create thin packs"
msgstr "créer des paquets légers"
-#: builtin/pack-objects.c:3438
+#: builtin/pack-objects.c:3558
msgid "create packs suitable for shallow fetches"
msgstr "créer des paquets permettant des récupérations superficielles"
-#: builtin/pack-objects.c:3440
+#: builtin/pack-objects.c:3560
msgid "ignore packs that have companion .keep file"
msgstr "ignorer les paquets qui ont un fichier .keep"
-#: builtin/pack-objects.c:3442
+#: builtin/pack-objects.c:3562
msgid "ignore this pack"
msgstr "ignorer ce paquet"
-#: builtin/pack-objects.c:3444
+#: builtin/pack-objects.c:3564
msgid "pack compression level"
msgstr "niveau de compression du paquet"
-#: builtin/pack-objects.c:3446
+#: builtin/pack-objects.c:3566
msgid "do not hide commits by grafts"
msgstr "ne pas cacher les validations par greffes"
-#: builtin/pack-objects.c:3448
+#: builtin/pack-objects.c:3568
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"utiliser un index en bitmap si disponible pour accélerer le décompte des "
"objets"
-#: builtin/pack-objects.c:3450
+#: builtin/pack-objects.c:3570
msgid "write a bitmap index together with the pack index"
msgstr "écrire un index en bitmap associé à l'index de paquet"
-#: builtin/pack-objects.c:3454
+#: builtin/pack-objects.c:3574
msgid "write a bitmap index if possible"
msgstr "écrire un index de bitmap si possible"
-#: builtin/pack-objects.c:3458
+#: builtin/pack-objects.c:3578
msgid "handling for missing objects"
msgstr "gestion des objets manquants"
-#: builtin/pack-objects.c:3461
+#: builtin/pack-objects.c:3581
msgid "do not pack objects in promisor packfiles"
msgstr "ne pas empaqueter les objets dans les fichiers paquets prometteurs"
-#: builtin/pack-objects.c:3463
+#: builtin/pack-objects.c:3583
msgid "respect islands during delta compression"
msgstr "respecter les îlots pendant la compression des deltas"
-#: builtin/pack-objects.c:3492
+#: builtin/pack-objects.c:3585
+msgid "protocol"
+msgstr "protocole"
+
+#: builtin/pack-objects.c:3586
+msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
+msgstr "exclure tout uploadpack.blobpackfileuri configuré avec ce protocole"
+
+#: builtin/pack-objects.c:3617
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "la profondeur %d de chaîne de delta est trop grande, forcée à %d"
-#: builtin/pack-objects.c:3497
+#: builtin/pack-objects.c:3622
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "pack.deltaCacheLimit est trop grand, forcé à %d"
-#: builtin/pack-objects.c:3551
+#: builtin/pack-objects.c:3676
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
"--max-pack-size ne peut pas être utilisé pour construire un paquet à "
"transférer"
-#: builtin/pack-objects.c:3553
+#: builtin/pack-objects.c:3678
msgid "minimum pack size limit is 1 MiB"
msgstr "la taille limite minimale d'un paquet est 1 MiB"
-#: builtin/pack-objects.c:3558
+#: builtin/pack-objects.c:3683
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin ne peut pas être utilisé pour construire un paquet indexable"
-#: builtin/pack-objects.c:3561
+#: builtin/pack-objects.c:3686
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable et --unpack-unreachable sont incompatibles"
-#: builtin/pack-objects.c:3567
+#: builtin/pack-objects.c:3692
msgid "cannot use --filter without --stdout"
msgstr "impossible d'utiliser --filter sans --stdout"
-#: builtin/pack-objects.c:3627
+#: builtin/pack-objects.c:3752
msgid "Enumerating objects"
msgstr "Énumération des objets"
-#: builtin/pack-objects.c:3657
+#: builtin/pack-objects.c:3783
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -17714,6 +19044,20 @@
"Total %<PRIu32> (delta %<PRIu32>), réutilisés %<PRIu32> (delta %<PRIu32>), "
"réutilisés du pack %<PRIu32>"
+#: builtin/pack-redundant.c:601
+msgid ""
+"'git pack-redundant' is nominated for removal.\n"
+"If you still use this command, please add an extra\n"
+"option, '--i-still-use-this', on the command line\n"
+"and let us know you still use it by sending an e-mail\n"
+"to <git@vger.kernel.org>. Thanks.\n"
+msgstr ""
+"La suppression de 'git pack-redundant' est prévue.\n"
+"Si vous utilisez cette commande, veuillez ajouter\n"
+"une option supplémentaire, '--i-still-use-this',\n"
+"sur la ligne de commande pour nous avertir par\n"
+"un courriel à <git@vger.kernel.org>. Merci.\n"
+
#: builtin/pack-refs.c:8
msgid "git pack-refs [<options>]"
msgstr "git pack-refs [<options>]"
@@ -17726,31 +19070,27 @@
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"
@@ -17763,44 +19103,44 @@
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<options>] [<dépôt> [<spécification-de-référence>...]]"
-#: builtin/pull.c:122
+#: builtin/pull.c:123
msgid "control for recursive fetching of submodules"
msgstr "contrôler la récupération récursive dans les sous-modules"
-#: builtin/pull.c:126
+#: builtin/pull.c:127
msgid "Options related to merging"
msgstr "Options relatives à la fusion"
-#: builtin/pull.c:129
+#: 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:157 builtin/rebase.c:471 builtin/revert.c:126
+#: builtin/pull.c:158 builtin/rebase.c:492 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "autoriser l'avance rapide"
-#: builtin/pull.c:166
-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:182
+#: builtin/pull.c:183
msgid "Options related to fetching"
msgstr "Options relatives au rapatriement"
-#: builtin/pull.c:192
+#: builtin/pull.c:193
msgid "force overwrite of local branch"
msgstr "forcer l'écrasement de la branche locale"
-#: builtin/pull.c:200
+#: builtin/pull.c:201
msgid "number of submodules pulled in parallel"
msgstr "nombre de sous-modules tirés en parallèle"
-#: builtin/pull.c:300
+#: builtin/pull.c:317
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Valeur invalide pour pull.ff : %s"
-#: builtin/pull.c:426
+#: builtin/pull.c:445
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -17808,14 +19148,14 @@
"Il n'y a pas de candidate sur laquelle rebaser parmi les références que vous "
"venez de récupérer."
-#: builtin/pull.c:428
+#: builtin/pull.c:447
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"Il n'y a pas de candidate avec laquelle fusionner parmi les références que "
"vous venez de récupérer."
-#: builtin/pull.c:429
+#: builtin/pull.c:448
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -17823,7 +19163,7 @@
"Généralement, cela signifie que vous avez indiqué un spécificateur\n"
"de référence joker qui n'a pas eu de correspondance sur le serveur distant."
-#: builtin/pull.c:432
+#: builtin/pull.c:451
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -17835,44 +19175,43 @@
"configuration\n"
"pour la branche actuelle, vous devez spécifier la branche avec la commande."
-#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73
+#: builtin/pull.c:456 builtin/rebase.c:1253
msgid "You are not currently on a branch."
msgstr "Vous n'êtes actuellement sur aucune branche."
-#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79
+#: builtin/pull.c:458 builtin/pull.c:473
msgid "Please specify which branch you want to rebase against."
msgstr "Veuillez spécifier sur quelle branche vous souhaiter rebaser."
-#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82
+#: builtin/pull.c:460 builtin/pull.c:475
msgid "Please specify which branch you want to merge with."
msgstr "Veuillez spécifier une branche avec laquelle fusionner."
-#: builtin/pull.c:442 builtin/pull.c:457
+#: builtin/pull.c:461 builtin/pull.c:476
msgid "See git-pull(1) for details."
msgstr "Référez-vous à git-pull(1) pour de plus amples détails."
-#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459
-#: builtin/rebase.c:1415 git-parse-remote.sh:64
+#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
+#: builtin/rebase.c:1259
msgid "<remote>"
msgstr "<distant>"
-#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464
-#: git-parse-remote.sh:65
+#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
msgid "<branch>"
msgstr "<branche>"
-#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75
+#: builtin/pull.c:471 builtin/rebase.c:1251
msgid "There is no tracking information for the current branch."
msgstr "Pas d'information de suivi distant pour la branche actuelle."
-#: builtin/pull.c:461 git-parse-remote.sh:95
+#: builtin/pull.c:480
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Si vous souhaitez indiquer l'information de suivi distant pour cette "
"branche, vous pouvez le faire avec :"
-#: builtin/pull.c:466
+#: builtin/pull.c:485
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -17882,34 +19221,59 @@
"'%s'\n"
"du serveur distant, mais cette référence n'a pas été récupérée."
-#: builtin/pull.c:576
+#: builtin/pull.c:596
#, c-format
msgid "unable to access commit %s"
msgstr "impossible d'accéder le commit %s"
-#: builtin/pull.c:857
+#: builtin/pull.c:902
msgid "ignoring --verify-signatures for rebase"
msgstr "--verify-signatures est ignoré pour un rebasage"
-#: builtin/pull.c:912
-msgid "--[no-]autostash option is only valid with --rebase."
-msgstr "l'option --[no-]autostash n'est valide qu'avec --rebase."
+#: builtin/pull.c:930
+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:920
+#: builtin/pull.c:991
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
"Mise à jour d'une branche non encore créée avec les changements ajoutés dans "
"l'index."
-#: builtin/pull.c:924
+#: builtin/pull.c:995
msgid "pull with rebase"
msgstr "tirer avec un rebasage"
-#: builtin/pull.c:925
+#: builtin/pull.c:996
msgid "please commit or stash them."
msgstr "veuillez les valider ou les remiser."
-#: builtin/pull.c:950
+#: builtin/pull.c:1021
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -17920,7 +19284,7 @@
"avance rapide de votre copie de travail\n"
"depuis le commit %s."
-#: builtin/pull.c:956
+#: builtin/pull.c:1027
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -17937,15 +19301,15 @@
"$ git reset --hard\n"
"pour régénérer."
-#: builtin/pull.c:971
+#: builtin/pull.c:1042
msgid "Cannot merge multiple branches into empty head."
msgstr "Impossible de fusionner de multiples branches sur une tête vide."
-#: builtin/pull.c:975
+#: builtin/pull.c:1046
msgid "Cannot rebase onto multiple branches."
msgstr "Impossible de rebaser sur de multiples branches."
-#: builtin/pull.c:982
+#: builtin/pull.c:1067
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"impossible de rebaser avec des modifications de sous-modules enregistrées "
@@ -17955,15 +19319,15 @@
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<options>] [<dépôt> [<spécification-de-référence>...]]"
-#: builtin/push.c:112
+#: builtin/push.c:111
msgid "tag shorthand without <tag>"
msgstr "raccourci d'étiquette sans <étiquette>"
-#: builtin/push.c:122
+#: builtin/push.c:119
msgid "--delete only accepts plain target ref names"
msgstr "--delete accepte seulement des noms entiers de références cibles"
-#: builtin/push.c:168
+#: builtin/push.c:164
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -17972,7 +19336,7 @@
"Pour choisir l'option de manière permanente, voir push.default dans 'git "
"help config'."
-#: builtin/push.c:171
+#: builtin/push.c:167
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -17997,7 +19361,7 @@
" git push %s HEAD\n"
"%s"
-#: builtin/push.c:186
+#: builtin/push.c:182
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -18012,7 +19376,7 @@
"\n"
" git push %s HEAD:<nom-de-la-branche-amont>\n"
-#: builtin/push.c:200
+#: builtin/push.c:194
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -18026,31 +19390,31 @@
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:208
+#: 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:211
+#: 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 ""
-"Vous êtes en train de pousser vers la branche distante '%s', qui n'est\n"
-"pas une branche amont de votre branche courante '%s', sans me dire\n"
-"quoi pousser pour mettre à jour quelle branche amont."
+"Vous êtes en train de pousser vers le dépôt distant '%s',\n"
+"qui n'est pas l'amont de votre branche courante '%s', sans\n"
+"me dire quoi pousser pour mettre à jour quelle branche amont."
-#: builtin/push.c:270
+#: 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:277
+#: 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"
@@ -18065,7 +19429,7 @@
"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
"d'information."
-#: builtin/push.c:283
+#: 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"
@@ -18080,7 +19444,7 @@
"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
"d'information."
-#: builtin/push.c:289
+#: 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"
@@ -18098,13 +19462,13 @@
"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
"d'information."
-#: builtin/push.c:296
+#: 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:299
+#: 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"
@@ -18116,100 +19480,116 @@
"pointer\n"
"vers un objet qui n'est pas un commit, sans utiliser l'option '--force'.\n"
-#: builtin/push.c:360
+#: builtin/push.c:294
+msgid ""
+"Updates were rejected because the tip of the remote-tracking\n"
+"branch has been updated since the last checkout. You may want\n"
+"to integrate those changes locally (e.g., 'git pull ...')\n"
+"before forcing an update.\n"
+msgstr ""
+"Les mises à jour ont été rejetées, car la pointe de la branche\n"
+"de suivi a été mise à jour depuis la dernière extraction. Intégrez\n"
+"ces changements localement (par exemple 'git pull ...') avant de\n"
+"forcer à nouveau une mise à jour.\n"
+
+#: builtin/push.c:364
#, c-format
msgid "Pushing to %s\n"
msgstr "Poussée vers %s\n"
-#: builtin/push.c:367
+#: builtin/push.c:371
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "impossible de pousser des références vers '%s'"
-#: builtin/push.c:542
+#: builtin/push.c:553
msgid "repository"
msgstr "dépôt"
-#: builtin/push.c:543 builtin/send-pack.c:164
+#: builtin/push.c:554 builtin/send-pack.c:189
msgid "push all refs"
msgstr "pousser toutes les références"
-#: builtin/push.c:544 builtin/send-pack.c:166
+#: builtin/push.c:555 builtin/send-pack.c:191
msgid "mirror all refs"
msgstr "refléter toutes les références"
-#: builtin/push.c:546
+#: builtin/push.c:557
msgid "delete refs"
msgstr "supprimer les références"
-#: builtin/push.c:547
+#: builtin/push.c:558
msgid "push tags (can't be used with --all or --mirror)"
msgstr ""
"pousser les étiquettes (ne peut pas être utilisé avec --all ou --mirror)"
-#: builtin/push.c:550 builtin/send-pack.c:167
+#: builtin/push.c:561 builtin/send-pack.c:192
msgid "force updates"
msgstr "forcer les mises à jour"
-#: builtin/push.c:552 builtin/send-pack.c:181
+#: builtin/push.c:562 builtin/send-pack.c:204
msgid "<refname>:<expect>"
msgstr "<nom-de-ref>:<attendu>"
-#: builtin/push.c:553 builtin/send-pack.c:182
+#: builtin/push.c:563 builtin/send-pack.c:205
msgid "require old value of ref to be at this value"
msgstr "exiger que l'ancienne valeur de la référence soit à cette valeur"
-#: builtin/push.c:556
+#: builtin/push.c:566 builtin/send-pack.c:208
+msgid "require remote updates to be integrated locally"
+msgstr "exiger des mises à jours distantes pour une intégration locale"
+
+#: builtin/push.c:569
msgid "control recursive pushing of submodules"
msgstr "contrôler la poussée récursive des sous-modules"
-#: builtin/push.c:558 builtin/send-pack.c:175
+#: builtin/push.c:570 builtin/send-pack.c:199
msgid "use thin pack"
msgstr "utiliser un empaquetage léger"
-#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161
-#: builtin/send-pack.c:162
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
+#: builtin/send-pack.c:187
msgid "receive pack program"
msgstr "recevoir le programme d'empaquetage"
-#: builtin/push.c:561
+#: builtin/push.c:573
msgid "set upstream for git pull/status"
msgstr "définir la branche amont pour git pull/status"
-#: builtin/push.c:564
+#: builtin/push.c:576
msgid "prune locally removed refs"
msgstr "éliminer les références locales supprimées"
-#: builtin/push.c:566
+#: builtin/push.c:578
msgid "bypass pre-push hook"
msgstr "éviter d'utiliser le crochet pre-push"
-#: builtin/push.c:567
+#: builtin/push.c:579
msgid "push missing but relevant tags"
msgstr "pousser les étiquettes manquantes mais pertinentes"
-#: builtin/push.c:570 builtin/send-pack.c:169
+#: builtin/push.c:581 builtin/send-pack.c:193
msgid "GPG sign the push"
msgstr "signer la poussée avec GPG"
-#: builtin/push.c:572 builtin/send-pack.c:176
+#: builtin/push.c:583 builtin/send-pack.c:200
msgid "request atomic transaction on remote side"
msgstr "demande une transaction atomique sur le serveur distant"
-#: builtin/push.c:590
+#: builtin/push.c:601
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete est incompatible avec --all, --mirror et --tags"
-#: builtin/push.c:592
+#: builtin/push.c:603
msgid "--delete doesn't make sense without any refs"
msgstr "--delete n'a pas de sens sans aucune référence"
-#: builtin/push.c:612
+#: builtin/push.c:623
#, c-format
msgid "bad repository '%s'"
msgstr "mauvais dépôt '%s'"
-#: builtin/push.c:613
+#: builtin/push.c:624
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -18231,72 +19611,80 @@
"\n"
" git push <nom>\n"
-#: builtin/push.c:628
+#: builtin/push.c:639
msgid "--all and --tags are incompatible"
msgstr "--all et --tags sont incompatibles"
-#: builtin/push.c:630
+#: builtin/push.c:641
msgid "--all can't be combined with refspecs"
msgstr "--all ne peut pas être combiné avec des spécifications de référence"
-#: builtin/push.c:634
+#: builtin/push.c:645
msgid "--mirror and --tags are incompatible"
msgstr "--mirror et --tags sont incompatibles"
-#: builtin/push.c:636
+#: builtin/push.c:647
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror ne peut pas être combiné avec des spécifications de référence"
-#: builtin/push.c:639
+#: builtin/push.c:650
msgid "--all and --mirror are incompatible"
msgstr "--all et --mirror sont incompatibles"
-#: builtin/push.c:643
+#: builtin/push.c:657
msgid "push options must not have new line characters"
msgstr ""
"les options de poussée ne peuvent pas contenir de caractères de nouvelle "
"ligne"
-#: builtin/range-diff.c:8
+#: builtin/range-diff.c:9
msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
msgstr ""
"git range-diff [<options>] <ancienne-base>..<ancien-sommet> <nouvelle-base>.."
"<nouveau-sommet>"
-#: builtin/range-diff.c:9
+#: builtin/range-diff.c:10
msgid "git range-diff [<options>] <old-tip>...<new-tip>"
msgstr "git range-diff [<options>] <ancien-sommet>...<nouveau-sommet>"
-#: builtin/range-diff.c:10
+#: builtin/range-diff.c:11
msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
msgstr "git range-diff [<options>] <base> <ancien-sommet> <nouveau-sommet>"
-#: builtin/range-diff.c:22
+#: builtin/range-diff.c:28
msgid "Percentage by which creation is weighted"
msgstr "Pourcentage par lequel la création est pondérée"
-#: builtin/range-diff.c:24
+#: builtin/range-diff.c:30
msgid "use simple diff colors"
msgstr "utiliser des couleurs de diff simples"
-#: builtin/range-diff.c:26
+#: builtin/range-diff.c:32
msgid "notes"
msgstr "notes"
-#: builtin/range-diff.c:26
+#: builtin/range-diff.c:32
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:35
+msgid "only emit output related to the first range"
+msgstr "afficher seulement les sorties liées à la première plage"
-#: builtin/range-diff.c:64
+#: builtin/range-diff.c:37
+msgid "only emit output related to the second range"
+msgstr "afficher seulement les sorties liées à la deuxième plage"
+
+#: builtin/range-diff.c:60 builtin/range-diff.c:64
+#, c-format
+msgid "not a commit range: '%s'"
+msgstr "pas une plage de commit : '%s'"
+
+#: builtin/range-diff.c:74
msgid "single arg format must be symmetric range"
msgstr "un format d'argument unique doit être une plage symétrique"
-#: builtin/range-diff.c:79
+#: builtin/range-diff.c:89
msgid "need two commit ranges"
msgstr "plage entre deux commits requise"
@@ -18383,7 +19771,7 @@
msgid "You need to resolve your current index first"
msgstr "Vous devez d'abord résoudre votre index courant"
-#: builtin/rebase.c:32
+#: builtin/rebase.c:35
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
"[<upstream> [<branch>]]"
@@ -18391,218 +19779,204 @@
"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:175 builtin/rebase.c:199 builtin/rebase.c:226
+#: builtin/rebase.c:195 builtin/rebase.c:219 builtin/rebase.c:246
#, c-format
msgid "unusable todo list: '%s'"
msgstr "liste à faire inutilisable : '%s'"
-#: builtin/rebase.c:292
+#: builtin/rebase.c:312
#, c-format
msgid "could not create temporary %s"
msgstr "impossible de créer un fichier temporaire %s"
-#: builtin/rebase.c:298
+#: builtin/rebase.c:318
msgid "could not mark as interactive"
msgstr "impossible de marquer comme interactif"
-#: builtin/rebase.c:352
+#: builtin/rebase.c:371
msgid "could not generate todo list"
msgstr "impossible de générer la liste à-faire"
-#: builtin/rebase.c:391
+#: builtin/rebase.c:413
msgid "a base commit must be provided with --upstream or --onto"
msgstr "un commit de base doit être fourni avec --upstream ou --onto"
-#: builtin/rebase.c:461
+#: builtin/rebase.c:482
msgid "git rebase--interactive [<options>]"
msgstr "git rebase--interactive [<options>]"
-#: builtin/rebase.c:474 builtin/rebase.c:1550
-msgid "(DEPRECATED) keep empty commits"
-msgstr "(OBSOLÈTE) garder les validations vides"
+#: builtin/rebase.c:495 builtin/rebase.c:1394
+msgid "keep commits which start empty"
+msgstr "conserver les commits qui commencent vides"
-#: builtin/rebase.c:478 builtin/revert.c:128
+#: builtin/rebase.c:499 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr "autoriser les validations avec des messages vides"
-#: builtin/rebase.c:480
+#: builtin/rebase.c:501
msgid "rebase merge commits"
msgstr "rebaser les commits de fusion"
-#: builtin/rebase.c:482
+#: builtin/rebase.c:503
msgid "keep original branch points of cousins"
msgstr "conserver les points de branchement de cousins originaux"
-#: builtin/rebase.c:484
+#: builtin/rebase.c:505
msgid "move commits that begin with squash!/fixup!"
msgstr "déplacer les commits qui commencent par squash!/fixup!"
-#: builtin/rebase.c:485
+#: builtin/rebase.c:506
msgid "sign commits"
msgstr "signer les commits"
-#: builtin/rebase.c:487 builtin/rebase.c:1490
+#: builtin/rebase.c:508 builtin/rebase.c:1333
msgid "display a diffstat of what changed upstream"
msgstr "afficher un diffstat de ce qui a changé en amont"
-#: builtin/rebase.c:489
+#: builtin/rebase.c:510
msgid "continue rebase"
msgstr "continuer le rebasage"
-#: builtin/rebase.c:491
+#: builtin/rebase.c:512
msgid "skip commit"
msgstr "sauter le commit"
-#: builtin/rebase.c:492
+#: builtin/rebase.c:513
msgid "edit the todo list"
msgstr "éditer la liste à-faire"
-#: builtin/rebase.c:494
+#: builtin/rebase.c:515
msgid "show the current patch"
msgstr "afficher le patch courant"
-#: builtin/rebase.c:497
+#: builtin/rebase.c:518
msgid "shorten commit ids in the todo list"
msgstr "raccourcir les identifiants de commits dans la liste à-faire"
-#: builtin/rebase.c:499
+#: builtin/rebase.c:520
msgid "expand commit ids in the todo list"
msgstr "étendre les identifiants de commit dans la liste à-faire"
-#: builtin/rebase.c:501
+#: builtin/rebase.c:522
msgid "check the todo list"
msgstr "vérifier la liste à-faire"
-#: builtin/rebase.c:503
+#: builtin/rebase.c:524
msgid "rearrange fixup/squash lines"
msgstr "réarranger les lignes fixup/squash"
-#: builtin/rebase.c:505
+#: builtin/rebase.c:526
msgid "insert exec commands in todo list"
msgstr "insérer les commandes exec dans la liste à-faire"
-#: builtin/rebase.c:506
+#: builtin/rebase.c:527
msgid "onto"
msgstr "sur"
-#: builtin/rebase.c:509
+#: builtin/rebase.c:530
msgid "restrict-revision"
msgstr "restrict-revision"
-#: builtin/rebase.c:509
+#: builtin/rebase.c:530
msgid "restrict revision"
msgstr "restreindre la révision"
-#: builtin/rebase.c:511
+#: builtin/rebase.c:532
msgid "squash-onto"
msgstr "écraser-sur"
-#: builtin/rebase.c:512
+#: builtin/rebase.c:533
msgid "squash onto"
msgstr "écraser sur"
-#: builtin/rebase.c:514
+#: builtin/rebase.c:535
msgid "the upstream commit"
msgstr "le commit amont"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:537
msgid "head-name"
msgstr "nom du head"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:537
msgid "head name"
msgstr "nom du head"
-#: builtin/rebase.c:521
+#: builtin/rebase.c:542
msgid "rebase strategy"
msgstr "stratégie de rebasage"
-#: builtin/rebase.c:522
+#: builtin/rebase.c:543
msgid "strategy-opts"
msgstr "options de stratégie"
-#: builtin/rebase.c:523
+#: builtin/rebase.c:544
msgid "strategy options"
msgstr "options de stratégie"
-#: builtin/rebase.c:524
+#: builtin/rebase.c:545
msgid "switch-to"
msgstr "switch-to"
-#: builtin/rebase.c:525
+#: builtin/rebase.c:546
msgid "the branch or commit to checkout"
msgstr "la branche ou le commit à extraire"
-#: builtin/rebase.c:526
+#: builtin/rebase.c:547
msgid "onto-name"
msgstr "sur-le-nom"
-#: builtin/rebase.c:526
+#: builtin/rebase.c:547
msgid "onto name"
msgstr "sur le nom"
-#: builtin/rebase.c:527
+#: builtin/rebase.c:548
msgid "cmd"
msgstr "cmd"
-#: builtin/rebase.c:527
+#: builtin/rebase.c:548
msgid "the command to run"
msgstr "la commande à lancer"
-#: builtin/rebase.c:530 builtin/rebase.c:1584
+#: builtin/rebase.c:551 builtin/rebase.c:1427
msgid "automatically re-schedule any `exec` that fails"
msgstr "re-planifier automatiquement tout `exec` qui échoue"
-#: builtin/rebase.c:546
+#: builtin/rebase.c:567
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr "--[no-]rebase-cousins n'a aucun effet sans --rebase-merges"
-#: builtin/rebase.c:562
+#: builtin/rebase.c:583
#, 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:612
+#: builtin/rebase.c:626
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "impossible d'accéder 'onto' : '%s'"
-#: builtin/rebase.c:627
+#: builtin/rebase.c:643
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "orig-head invalide : '%s'"
-#: builtin/rebase.c:652
+#: builtin/rebase.c:668
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "allow_rerere_autoupdate invalide ignoré : '%s'"
-#: builtin/rebase.c:728
-#, c-format
-msgid "Could not read '%s'"
-msgstr "Impossible de lire '%s'"
-
-#: builtin/rebase.c:746
-#, c-format
-msgid "Cannot store %s"
-msgstr "Impossible de stocker %s"
-
-#: builtin/rebase.c:853
-msgid "could not determine HEAD revision"
-msgstr "impossible de déterminer la révision HEAD"
-
-#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -18616,7 +19990,7 @@
"arrêter\n"
"et revenir à l'état antérieur à la commande, lancez \"git rebase --abort\"."
-#: builtin/rebase.c:1058
+#: builtin/rebase.c:896
#, c-format
msgid ""
"\n"
@@ -18635,7 +20009,7 @@
"\n"
"Résultat, git ne peut pas les rebaser."
-#: builtin/rebase.c:1383
+#: builtin/rebase.c:1227
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -18644,7 +20018,7 @@
"type vide non connu '%s' ; les valeurs valides sont \"drop\" (abandonner), "
"\"keep\" (garder) et \"ask\" (demander)."
-#: builtin/rebase.c:1401
+#: builtin/rebase.c:1245
#, c-format
msgid ""
"%s\n"
@@ -18661,7 +20035,7 @@
" git rebase '<branche>'\n"
"\n"
-#: builtin/rebase.c:1417
+#: builtin/rebase.c:1261
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -18675,136 +20049,149 @@
" git branch --set-upstream-to=%s/<branche> %s\n"
"\n"
-#: builtin/rebase.c:1447
+#: builtin/rebase.c:1291
msgid "exec commands cannot contain newlines"
msgstr "les commandes exec ne peut pas contenir de retour à la ligne"
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1295
msgid "empty exec command"
msgstr "commande exec vide"
-#: builtin/rebase.c:1481
+#: builtin/rebase.c:1324
msgid "rebase onto given branch instead of upstream"
msgstr "rebaser sur la branche %s au lieu de la branche amont"
-#: builtin/rebase.c:1483
+#: builtin/rebase.c:1326
msgid "use the merge-base of upstream and branch as the current base"
msgstr ""
"utiliser la base de fusion de l'amont et la branche comme base actuelle"
-#: builtin/rebase.c:1485
+#: builtin/rebase.c:1328
msgid "allow pre-rebase hook to run"
msgstr "permettre le lancement du crochet pre-rebase"
-#: builtin/rebase.c:1487
+#: builtin/rebase.c:1330
msgid "be quiet. implies --no-stat"
msgstr "être silencieux. implique --no-stat"
-#: builtin/rebase.c:1493
+#: builtin/rebase.c:1336
msgid "do not show diffstat of what changed upstream"
msgstr "ne pas afficher un diffstat de ce qui a changé en amont"
-#: builtin/rebase.c:1496
-msgid "add a Signed-off-by: line to each commit"
+#: builtin/rebase.c:1339
+msgid "add a Signed-off-by trailer to each commit"
msgstr "ajouter une ligne Signed-off-by à chaque message de validation"
-#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504
-msgid "passed to 'git am'"
-msgstr "passé jusqu'à 'git am'"
+#: builtin/rebase.c:1342
+msgid "make committer date match author date"
+msgstr "mettre la date de validateur à la date auteur"
-#: builtin/rebase.c:1506 builtin/rebase.c:1508
+#: builtin/rebase.c:1344
+msgid "ignore author date and use current date"
+msgstr "ignorer la date d'auteur et utilise la date actuelle"
+
+#: builtin/rebase.c:1346
+msgid "synonym of --reset-author-date"
+msgstr "synonyme pour --reset-author-date"
+
+#: builtin/rebase.c:1348 builtin/rebase.c:1352
msgid "passed to 'git apply'"
msgstr "passé jusqu'à git-apply"
-#: builtin/rebase.c:1510 builtin/rebase.c:1513
+#: builtin/rebase.c:1350
+msgid "ignore changes in whitespace"
+msgstr "ignorer des modifications d'espaces"
+
+#: builtin/rebase.c:1354 builtin/rebase.c:1357
msgid "cherry-pick all commits, even if unchanged"
msgstr "picorer tous les commits, même sans modifiant"
-#: builtin/rebase.c:1515
+#: builtin/rebase.c:1359
msgid "continue"
msgstr "continuer"
-#: builtin/rebase.c:1518
+#: builtin/rebase.c:1362
msgid "skip current patch and continue"
msgstr "sauter le patch courant et continuer"
-#: builtin/rebase.c:1520
+#: builtin/rebase.c:1364
msgid "abort and check out the original branch"
msgstr "abandonner et extraire la branche d'origine"
-#: builtin/rebase.c:1523
+#: builtin/rebase.c:1367
msgid "abort but keep HEAD where it is"
msgstr "abandonne mais garde HEAD où il est"
-#: builtin/rebase.c:1524
+#: builtin/rebase.c:1368
msgid "edit the todo list during an interactive rebase"
msgstr "éditer la liste à faire lors d'un rebasage interactif"
-#: builtin/rebase.c:1527
+#: builtin/rebase.c:1371
msgid "show the patch file being applied or merged"
msgstr "afficher le patch en cours d'application ou de fusion"
-#: builtin/rebase.c:1530
+#: builtin/rebase.c:1374
msgid "use apply strategies to rebase"
msgstr "utiliser des stratégies d'application pour rebaser"
-#: builtin/rebase.c:1534
+#: builtin/rebase.c:1378
msgid "use merging strategies to rebase"
msgstr "utiliser des stratégies de fusion pour rebaser"
-#: builtin/rebase.c:1538
+#: builtin/rebase.c:1382
msgid "let the user edit the list of commits to rebase"
msgstr "laisser l'utilisateur éditer la liste des commits à rebaser"
-#: builtin/rebase.c:1542
+#: builtin/rebase.c:1386
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "(DÉCONSEILLÉ) essayer de recréer les fusions au lieu de les ignorer"
-#: builtin/rebase.c:1547
+#: builtin/rebase.c:1391
msgid "how to handle commits that become empty"
msgstr "comment gérer les commits qui deviennent vides"
-#: builtin/rebase.c:1554
+#: builtin/rebase.c:1398
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "déplace les commits qui commencent par squash!/fixup! sous -i"
-#: builtin/rebase.c:1560
-msgid "automatically stash/stash pop before and after"
-msgstr "remiser et réappliquer automatiquement avant et après"
-
-#: builtin/rebase.c:1562
+#: builtin/rebase.c:1405
msgid "add exec lines after each commit of the editable list"
msgstr "ajouter les lignes exec après chaque commit de la liste éditable"
-#: builtin/rebase.c:1566
+#: builtin/rebase.c:1409
msgid "allow rebasing commits with empty messages"
msgstr "autoriser les commits de rebasage avec des messages vides"
-#: builtin/rebase.c:1570
+#: builtin/rebase.c:1413
msgid "try to rebase merges instead of skipping them"
msgstr "essayer de rebaser les fusions au lieu de les garder"
-#: builtin/rebase.c:1573
+#: builtin/rebase.c:1416
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "utiliser 'merge-base --fork-point' pour raffiner l'amont"
-#: builtin/rebase.c:1575
+#: builtin/rebase.c:1418
msgid "use the given merge strategy"
msgstr "utiliser la stratégie de fusion indiquée"
-#: builtin/rebase.c:1577 builtin/revert.c:115
+#: builtin/rebase.c:1420 builtin/revert.c:115
msgid "option"
msgstr "option"
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1421
msgid "pass the argument through to the merge strategy"
msgstr "passer les arguments jusqu'à la stratégie de fusion"
-#: builtin/rebase.c:1581
+#: builtin/rebase.c:1424
msgid "rebase all reachable commits up to the root(s)"
msgstr "rebaser tous les objets inatteignables depuis les racines"
-#: builtin/rebase.c:1598
+#: builtin/rebase.c:1429
+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:1446
msgid ""
"the rebase.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
@@ -18812,40 +20199,44 @@
"les support de rebase.useBuiltin a été supprimé !\n"
"Voir son entrée dans 'git help config' pour plus de détails."
-#: builtin/rebase.c:1604
+#: builtin/rebase.c:1452
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "Il semble que 'git-am' soit en cours. Impossible de rebaser."
-#: builtin/rebase.c:1645
+#: builtin/rebase.c:1493
msgid ""
"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr ""
"git rebase --preserve-merges est déconseillé. Utilisez --rebase-merges à la "
"place."
-#: builtin/rebase.c:1650
+#: builtin/rebase.c:1498
msgid "cannot combine '--keep-base' with '--onto'"
msgstr "impossible de combiner '--keep-base' avec '--onto'"
-#: builtin/rebase.c:1652
+#: builtin/rebase.c:1500
msgid "cannot combine '--keep-base' with '--root'"
msgstr "impossible de combiner '--keep-base' avec '--root'"
-#: builtin/rebase.c:1656
+#: builtin/rebase.c:1504
+msgid "cannot combine '--root' with '--fork-point'"
+msgstr "impossible de combiner '--root' avec '--fork-point'"
+
+#: builtin/rebase.c:1507
msgid "No rebase in progress?"
msgstr "Pas de rebasage en cours ?"
-#: builtin/rebase.c:1660
+#: builtin/rebase.c:1511
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"L'action --edit-todo peut seulement être utilisée lors d'un rebasage "
"interactif."
-#: builtin/rebase.c:1683
+#: builtin/rebase.c:1534 t/helper/test-fast-rebase.c:123
msgid "Cannot read HEAD"
msgstr "Impossible de lire HEAD"
-#: builtin/rebase.c:1695
+#: builtin/rebase.c:1546
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -18853,16 +20244,16 @@
"Vous devez éditer tous les conflits de fusion et\n"
"les marquer comme résolus avec git add"
-#: builtin/rebase.c:1714
+#: builtin/rebase.c:1565
msgid "could not discard worktree changes"
msgstr "Impossible de supprimer les changements de l'arbre de travail"
-#: builtin/rebase.c:1733
+#: builtin/rebase.c:1584
#, c-format
msgid "could not move back to %s"
msgstr "Impossible de revenir à %s"
-#: builtin/rebase.c:1778
+#: builtin/rebase.c:1630
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -18884,168 +20275,145 @@
"chose\n"
"d'important ici.\n"
-#: builtin/rebase.c:1806
+#: builtin/rebase.c:1658
msgid "switch `C' expects a numerical value"
msgstr "l'option `C' attend un valeur numérique"
-#: builtin/rebase.c:1847
+#: builtin/rebase.c:1700
#, c-format
msgid "Unknown mode: %s"
msgstr "mode inconnu : %s"
-#: builtin/rebase.c:1869
+#: builtin/rebase.c:1739
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy requiert --merge ou --interactive"
-#: builtin/rebase.c:1899
+#: builtin/rebase.c:1769
msgid "cannot combine apply options with merge options"
msgstr ""
"impossible de combiner les options d'application avec les options de fusion"
-#: builtin/rebase.c:1912
+#: builtin/rebase.c:1782
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "backend de rebasage inconnu : %s"
-#: builtin/rebase.c:1937
+#: builtin/rebase.c:1812
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec requiert --exec ou --interactive"
-#: builtin/rebase.c:1957
+#: builtin/rebase.c:1832
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr "impossible de combiner '--preserve-merges' avec '--rebase-merges'"
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1836
msgid ""
"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
"erreur : impossible de combiner '--preserve-merges' avec '--reschedule-"
"failed-exec'"
-#: builtin/rebase.c:1985
+#: builtin/rebase.c:1860
#, c-format
msgid "invalid upstream '%s'"
msgstr "amont invalide '%s'"
-#: builtin/rebase.c:1991
+#: builtin/rebase.c:1866
msgid "Could not create new root commit"
msgstr "Impossible de créer un nouveau commit racine"
-#: builtin/rebase.c:2017
+#: builtin/rebase.c:1892
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "'%s': exactement une base de fusion nécessaire avec une branche"
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1895
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s': exactement une base de fusion nécessaire"
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1903
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "ne pointe pas sur une validation valide : '%s'"
-#: builtin/rebase.c:2054
+#: builtin/rebase.c:1931
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "fatal : pas de branche ou commit '%s'"
-#: builtin/rebase.c:2062 builtin/submodule--helper.c:40
-#: builtin/submodule--helper.c:1990
+#: builtin/rebase.c:1939 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:2073
+#: builtin/rebase.c:1950
msgid "Could not resolve HEAD to a revision"
msgstr "Impossible de résoudre le commit HEAD vers un révision"
-#: builtin/rebase.c:2111
-msgid "Cannot autostash"
-msgstr "Autoremisage impossible"
-
-#: builtin/rebase.c:2114
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr "réponse de remisage inattendue : '%s'"
-
-#: builtin/rebase.c:2120
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr "Impossible de créer le répertoire pour '%s'"
-
-#: builtin/rebase.c:2123
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr "Autoremisage créé : %s\n"
-
-#: builtin/rebase.c:2126
-msgid "could not reset --hard"
-msgstr "impossible de réinitialiser --hard"
-
-#: builtin/rebase.c:2135
+#: builtin/rebase.c:1971
msgid "Please commit or stash them."
msgstr "Veuillez les valider ou les remiser."
-#: builtin/rebase.c:2169
+#: builtin/rebase.c:2007
#, c-format
msgid "could not switch to %s"
msgstr "Impossible de basculer vers %s"
-#: builtin/rebase.c:2180
+#: builtin/rebase.c:2018
msgid "HEAD is up to date."
msgstr "HEAD est à jour."
-#: builtin/rebase.c:2182
+#: builtin/rebase.c:2020
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "La branche courante %s est à jour.\n"
-#: builtin/rebase.c:2190
+#: builtin/rebase.c:2028
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD est à jour, rebasage forcé."
-#: builtin/rebase.c:2192
+#: builtin/rebase.c:2030
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "La branche courante %s est à jour, rebasage forcé.\n"
-#: builtin/rebase.c:2200
+#: builtin/rebase.c:2038
msgid "The pre-rebase hook refused to rebase."
msgstr "Le crochet pre-rebase a refusé de rebaser."
-#: builtin/rebase.c:2207
+#: builtin/rebase.c:2045
#, c-format
msgid "Changes to %s:\n"
msgstr "Changements vers %s :\n"
-#: builtin/rebase.c:2210
+#: builtin/rebase.c:2048
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Changements de %s sur %s :\n"
-#: builtin/rebase.c:2235
+#: builtin/rebase.c:2073
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"Rembobinage préalable de head pour pouvoir rejouer votre travail par-"
"dessus...\n"
-#: builtin/rebase.c:2244
+#: builtin/rebase.c:2082
msgid "Could not detach HEAD"
msgstr "Impossible de détacher HEAD"
-#: builtin/rebase.c:2253
+#: builtin/rebase.c:2091
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Avance rapide de %s sur %s.\n"
-#: builtin/receive-pack.c:33
+#: builtin/receive-pack.c:34
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <répertoire-git>"
-#: builtin/receive-pack.c:821
+#: builtin/receive-pack.c:1276
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
@@ -19075,7 +20443,7 @@
"Pour éliminer ce message et conserver le comportement par défaut,\n"
"réglez « receive.denyCurrentBranch » à 'refuse'."
-#: builtin/receive-pack.c:841
+#: builtin/receive-pack.c:1296
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"
@@ -19095,11 +20463,11 @@
"\n"
"Pour éliminer ce message, réglez-le à 'refuse'."
-#: builtin/receive-pack.c:1938
+#: builtin/receive-pack.c:2481
msgid "quiet"
msgstr "quiet"
-#: builtin/receive-pack.c:1952
+#: builtin/receive-pack.c:2495
msgid "You must specify a directory."
msgstr "Vous devez spécifier un répertoire."
@@ -19130,36 +20498,36 @@
msgid "'%s' is not a valid timestamp"
msgstr "'%s' n'est pas un horodatage valide"
-#: builtin/reflog.c:606
+#: builtin/reflog.c:609
#, c-format
msgid "Marking reachable objects..."
msgstr "Marquage des objets inaccessibles..."
-#: builtin/reflog.c:644
+#: builtin/reflog.c:647
#, c-format
msgid "%s points nowhere!"
msgstr "%s ne pointe nulle part !"
-#: builtin/reflog.c:696
+#: builtin/reflog.c:699
msgid "no reflog specified to delete"
msgstr "pas de journal de références à supprimer spécifié"
-#: builtin/reflog.c:705
+#: builtin/reflog.c:708
#, c-format
msgid "not a reflog: %s"
msgstr "'%s' n'est pas un journal de références"
-#: builtin/reflog.c:710
+#: builtin/reflog.c:713
#, c-format
msgid "no reflog for '%s'"
msgstr "pas de journal de références pour '%s'"
-#: builtin/reflog.c:756
+#: builtin/reflog.c:759
#, c-format
msgid "invalid ref format: %s"
msgstr "format de référence invalide : %s"
-#: builtin/reflog.c:765
+#: builtin/reflog.c:768
msgid "git reflog [ show | expire | delete | exists ]"
msgstr "git reflog [ show | expire | delete | exists ]"
@@ -19300,42 +20668,37 @@
"spécifier les branches à suivre n'a de sens qu'avec des miroirs de "
"rapatriement"
-#: builtin/remote.c:195 builtin/remote.c:696
+#: builtin/remote.c:195 builtin/remote.c:700
#, c-format
msgid "remote %s already exists."
msgstr "la distante %s existe déjà."
-#: builtin/remote.c:199 builtin/remote.c:700
-#, c-format
-msgid "'%s' is not a valid remote name"
-msgstr "'%s' n'est pas un nom valide de distante"
-
-#: builtin/remote.c:239
+#: builtin/remote.c:240
#, c-format
msgid "Could not setup master '%s'"
msgstr "Impossible de paramétrer la maîtresse '%s'"
-#: builtin/remote.c:354
+#: builtin/remote.c:355
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr ""
"Impossible d'obtenir une correspondance distante pour la spécification de "
"référence %s"
-#: builtin/remote.c:453 builtin/remote.c:461
+#: builtin/remote.c:454 builtin/remote.c:462
msgid "(matching)"
msgstr "(correspond)"
-#: builtin/remote.c:465
+#: builtin/remote.c:466
msgid "(delete)"
msgstr "(supprimer)"
-#: builtin/remote.c:653
+#: builtin/remote.c:655
#, c-format
msgid "could not set '%s'"
msgstr "impossible d'assigner '%s'"
-#: builtin/remote.c:658
+#: builtin/remote.c:660
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
@@ -19346,17 +20709,17 @@
"\t%s%d\n"
"nomme à présent le distant inexistant '%s'"
-#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940
+#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946
#, c-format
msgid "No such remote: '%s'"
msgstr "Pas de serveur remote : '%s'"
-#: builtin/remote.c:706
+#: builtin/remote.c:710
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Impossible de renommer la section de configuration '%s' en '%s'"
-#: builtin/remote.c:726
+#: builtin/remote.c:730
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -19367,17 +20730,17 @@
"\t%s\n"
"\tVeuillez mettre à jour la configuration manuellement si nécessaire."
-#: builtin/remote.c:766
+#: builtin/remote.c:770
#, c-format
msgid "deleting '%s' failed"
msgstr "échec de suppression de '%s'"
-#: builtin/remote.c:800
+#: builtin/remote.c:804
#, c-format
msgid "creating '%s' failed"
msgstr "échec de création de '%s'"
-#: builtin/remote.c:876
+#: builtin/remote.c:882
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -19392,118 +20755,118 @@
"supprimées ;\n"
"pour les supprimer, utilisez :"
-#: builtin/remote.c:890
+#: builtin/remote.c:896
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Impossible de supprimer la section de configuration '%s'"
-#: builtin/remote.c:993
+#: builtin/remote.c:999
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " nouveau (le prochain rapatriement (fetch) stockera dans remotes/%s)"
-#: builtin/remote.c:996
+#: builtin/remote.c:1002
msgid " tracked"
msgstr " suivi"
-#: builtin/remote.c:998
+#: builtin/remote.c:1004
msgid " stale (use 'git remote prune' to remove)"
msgstr " dépassé (utilisez 'git remote prune' pour supprimer)"
-#: builtin/remote.c:1000
+#: builtin/remote.c:1006
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:1041
+#: builtin/remote.c:1047
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "branch.%s.merge invalide ; ne peut pas rebaser sur plus d'une branche"
-#: builtin/remote.c:1050
+#: builtin/remote.c:1056
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "rebase de manière interactive sur la distante %s"
-#: builtin/remote.c:1052
+#: builtin/remote.c:1058
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr "rebase de manière interactive (avec fusions) sur la distante %s"
-#: builtin/remote.c:1055
+#: builtin/remote.c:1061
#, c-format
msgid "rebases onto remote %s"
msgstr "rebase sur la distante %s"
-#: builtin/remote.c:1059
+#: builtin/remote.c:1065
#, c-format
msgid " merges with remote %s"
msgstr " fusionne avec la distante %s"
-#: builtin/remote.c:1062
+#: builtin/remote.c:1068
#, c-format
msgid "merges with remote %s"
msgstr "fusionne avec la distante %s"
-#: builtin/remote.c:1065
+#: builtin/remote.c:1071
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s et avec la distante %s\n"
-#: builtin/remote.c:1108
+#: builtin/remote.c:1114
msgid "create"
msgstr "créer"
-#: builtin/remote.c:1111
+#: builtin/remote.c:1117
msgid "delete"
msgstr "supprimer"
-#: builtin/remote.c:1115
+#: builtin/remote.c:1121
msgid "up to date"
msgstr "à jour"
-#: builtin/remote.c:1118
+#: builtin/remote.c:1124
msgid "fast-forwardable"
msgstr "peut être mis à jour en avance rapide"
-#: builtin/remote.c:1121
+#: builtin/remote.c:1127
msgid "local out of date"
msgstr "le local n'est pas à jour"
-#: builtin/remote.c:1128
+#: builtin/remote.c:1134
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s force vers %-*s (%s)"
-#: builtin/remote.c:1131
+#: builtin/remote.c:1137
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s pousse vers %-*s (%s)"
-#: builtin/remote.c:1135
+#: builtin/remote.c:1141
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s force vers %s"
-#: builtin/remote.c:1138
+#: builtin/remote.c:1144
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s pousse vers %s"
-#: builtin/remote.c:1206
+#: builtin/remote.c:1212
msgid "do not query remotes"
msgstr "ne pas interroger les distantes"
-#: builtin/remote.c:1233
+#: builtin/remote.c:1239
#, c-format
msgid "* remote %s"
msgstr "* distante %s"
-#: builtin/remote.c:1234
+#: builtin/remote.c:1240
#, c-format
msgid " Fetch URL: %s"
msgstr " URL de rapatriement : %s"
-#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390
+#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
msgid "(no URL)"
msgstr "(pas d'URL)"
@@ -19511,25 +20874,25 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1249 builtin/remote.c:1251
+#: builtin/remote.c:1255 builtin/remote.c:1257
#, c-format
msgid " Push URL: %s"
msgstr " URL push : %s"
-#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
#, c-format
msgid " HEAD branch: %s"
msgstr " Branche HEAD : %s"
-#: builtin/remote.c:1253
+#: builtin/remote.c:1259
msgid "(not queried)"
msgstr "(non demandé)"
-#: builtin/remote.c:1255
+#: builtin/remote.c:1261
msgid "(unknown)"
msgstr "(inconnu)"
-#: builtin/remote.c:1259
+#: builtin/remote.c:1265
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -19537,162 +20900,162 @@
" Branche HEAD (la HEAD distante est ambiguë, peut être l'une des "
"suivantes) :\n"
-#: builtin/remote.c:1271
+#: builtin/remote.c:1277
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Branche distante :%s"
msgstr[1] " Branches distantes :%s"
-#: builtin/remote.c:1274 builtin/remote.c:1300
+#: builtin/remote.c:1280 builtin/remote.c:1306
msgid " (status not queried)"
msgstr " (état non demandé)"
-#: builtin/remote.c:1283
+#: builtin/remote.c:1289
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Branche locale configurée pour 'git pull' :"
msgstr[1] " Branches locales configurées pour 'git pull' :"
-#: builtin/remote.c:1291
+#: builtin/remote.c:1297
msgid " Local refs will be mirrored by 'git push'"
msgstr " Les références locales seront reflétées par 'git push'"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1303
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Référence locale configurée pour 'git push'%s :"
msgstr[1] " Références locales configurées pour 'git push'%s :"
-#: builtin/remote.c:1318
+#: builtin/remote.c:1324
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "définir refs/remotes/<nom>/HEAD selon la distante"
-#: builtin/remote.c:1320
+#: builtin/remote.c:1326
msgid "delete refs/remotes/<name>/HEAD"
msgstr "supprimer refs/remotes/<nom>/HEAD"
-#: builtin/remote.c:1335
+#: builtin/remote.c:1341
msgid "Cannot determine remote HEAD"
msgstr "Impossible de déterminer la HEAD distante"
-#: builtin/remote.c:1337
+#: builtin/remote.c:1343
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
"Il y a de multiples branches HEAD distantes. Veuillez en choisir une "
"explicitement avec :"
-#: builtin/remote.c:1347
+#: builtin/remote.c:1353
#, c-format
msgid "Could not delete %s"
msgstr "Impossible de supprimer %s"
-#: builtin/remote.c:1355
+#: builtin/remote.c:1361
#, c-format
msgid "Not a valid ref: %s"
msgstr "Référence non valide : %s"
-#: builtin/remote.c:1357
+#: builtin/remote.c:1363
#, c-format
msgid "Could not setup %s"
msgstr "Impossible de paramétrer %s"
-#: builtin/remote.c:1375
+#: builtin/remote.c:1381
#, c-format
msgid " %s will become dangling!"
msgstr " %s se retrouvera en suspens !"
-#: builtin/remote.c:1376
+#: builtin/remote.c:1382
#, c-format
msgid " %s has become dangling!"
msgstr " %s se retrouve en suspens !"
-#: builtin/remote.c:1386
+#: builtin/remote.c:1392
#, c-format
msgid "Pruning %s"
msgstr "Élimination de %s"
-#: builtin/remote.c:1387
+#: builtin/remote.c:1393
#, c-format
msgid "URL: %s"
msgstr "URL : %s"
-#: builtin/remote.c:1403
+#: builtin/remote.c:1409
#, c-format
msgid " * [would prune] %s"
msgstr " * [serait éliminé] %s"
-#: builtin/remote.c:1406
+#: builtin/remote.c:1412
#, c-format
msgid " * [pruned] %s"
msgstr " * [éliminé] %s"
-#: builtin/remote.c:1451
+#: builtin/remote.c:1457
msgid "prune remotes after fetching"
msgstr "éliminer les distants après le rapatriement"
-#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636
+#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
#, c-format
msgid "No such remote '%s'"
msgstr "Pas de serveur remote '%s'"
-#: builtin/remote.c:1530
+#: builtin/remote.c:1539
msgid "add branch"
msgstr "ajouter une branche"
-#: builtin/remote.c:1537
+#: builtin/remote.c:1546
msgid "no remote specified"
msgstr "pas de serveur distant spécifié"
-#: builtin/remote.c:1554
+#: builtin/remote.c:1563
msgid "query push URLs rather than fetch URLs"
msgstr "interroger les URLs de poussée plutôt que les URLs de récupération"
-#: builtin/remote.c:1556
+#: builtin/remote.c:1565
msgid "return all URLs"
msgstr "retourner toutes les URLs"
-#: builtin/remote.c:1584
+#: builtin/remote.c:1595
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "aucune URL configurée pour le dépôt distant '%s'"
-#: builtin/remote.c:1610
+#: builtin/remote.c:1621
msgid "manipulate push URLs"
msgstr "manipuler les URLs push"
-#: builtin/remote.c:1612
+#: builtin/remote.c:1623
msgid "add URL"
msgstr "ajouter une URL"
-#: builtin/remote.c:1614
+#: builtin/remote.c:1625
msgid "delete URLs"
msgstr "supprimer des URLs"
-#: builtin/remote.c:1621
+#: builtin/remote.c:1632
msgid "--add --delete doesn't make sense"
msgstr "--add --delete n'a aucun sens"
-#: builtin/remote.c:1660
+#: builtin/remote.c:1673
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Motif d'URL ancien invalide : %s"
-#: builtin/remote.c:1668
+#: builtin/remote.c:1681
#, c-format
msgid "No such URL found: %s"
msgstr "Pas d'URL trouvée : %s"
-#: builtin/remote.c:1670
+#: builtin/remote.c:1683
msgid "Will not delete all non-push URLs"
msgstr "Pas de suppression de toutes les URLs non-push"
-#: builtin/repack.c:23
+#: builtin/repack.c:26
msgid "git repack [<options>]"
msgstr "git repack [<options>]"
-#: builtin/repack.c:28
+#: builtin/repack.c:31
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -19701,139 +21064,125 @@
"Utilisez\n"
"--no-write-bitmap-index ou désactivez le paramètre pack.writebitmaps."
-#: builtin/repack.c:191
+#: builtin/repack.c:198
msgid "could not start pack-objects to repack promisor objects"
msgstr ""
"ne pas démarrer pack-objects pour ré-empaqueter les objects de prometteur"
-#: builtin/repack.c:230 builtin/repack.c:416
+#: builtin/repack.c:270 builtin/repack.c:446
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
"repack : attente de lignes d'Id d'objets en hexa complet seulement depuis "
"les objects de paquet."
-#: builtin/repack.c:254
+#: builtin/repack.c:294
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
"impossible de terminer pack-objects pour ré-empaqueter les objets de "
"prometteur"
-#: builtin/repack.c:292
+#: builtin/repack.c:322
msgid "pack everything in a single pack"
msgstr "empaqueter tout dans un seul paquet"
-#: builtin/repack.c:294
+#: builtin/repack.c:324
msgid "same as -a, and turn unreachable objects loose"
msgstr "identique à -a et transformer les objets inaccessibles en suspens"
-#: builtin/repack.c:297
+#: builtin/repack.c:327
msgid "remove redundant packs, and run git-prune-packed"
msgstr "supprimer les paquets redondants et lancer git-prune-packed"
-#: builtin/repack.c:299
+#: builtin/repack.c:329
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "passer --no-reuse-delta à git-pack-objects"
-#: builtin/repack.c:301
+#: builtin/repack.c:331
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "passer --no-reuse-object à git-pack-objects"
-#: builtin/repack.c:303
+#: builtin/repack.c:333
msgid "do not run git-update-server-info"
msgstr "ne pas lancer git update-server-info"
-#: builtin/repack.c:306
+#: builtin/repack.c:336
msgid "pass --local to git-pack-objects"
msgstr "passer --local à git-pack-objects"
-#: builtin/repack.c:308
+#: builtin/repack.c:338
msgid "write bitmap index"
msgstr "écrire un index en bitmap"
-#: builtin/repack.c:310
+#: builtin/repack.c:340
msgid "pass --delta-islands to git-pack-objects"
msgstr "passer --delta-islands à git-pack-objects"
-#: builtin/repack.c:311
+#: builtin/repack.c:341
msgid "approxidate"
msgstr "date approximative"
-#: builtin/repack.c:312
+#: builtin/repack.c:342
msgid "with -A, do not loosen objects older than this"
msgstr "avec -A, ne pas suspendre les objets plus vieux que celui-ci"
-#: builtin/repack.c:314
+#: builtin/repack.c:344
msgid "with -a, repack unreachable objects"
msgstr "avec -a, repaquétiser les objets inaccessibles"
-#: builtin/repack.c:316
+#: builtin/repack.c:346
msgid "size of the window used for delta compression"
msgstr "taille de la fenêtre utilisée pour la compression des deltas"
-#: builtin/repack.c:317 builtin/repack.c:323
+#: builtin/repack.c:347 builtin/repack.c:353
msgid "bytes"
msgstr "octets"
-#: builtin/repack.c:318
+#: builtin/repack.c:348
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
"idem ci-dessus, mais limiter la taille mémoire au lieu du nombre d'éléments"
-#: builtin/repack.c:320
+#: builtin/repack.c:350
msgid "limits the maximum delta depth"
msgstr "limite la profondeur maximale des deltas"
-#: builtin/repack.c:322
+#: builtin/repack.c:352
msgid "limits the maximum number of threads"
msgstr "limite le nombre maximal de fils"
-#: builtin/repack.c:324
+#: builtin/repack.c:354
msgid "maximum size of each packfile"
msgstr "taille maximum de chaque fichier paquet"
-#: builtin/repack.c:326
+#: builtin/repack.c:356
msgid "repack objects in packs marked with .keep"
msgstr "réempaqueter les objets dans des paquets marqués avec .keep"
-#: builtin/repack.c:328
+#: builtin/repack.c:358
msgid "do not repack this pack"
msgstr "ne pas rempaqueter ce paquet"
-#: builtin/repack.c:338
+#: builtin/repack.c:368
msgid "cannot delete packs in a precious-objects repo"
msgstr "impossible de supprimer les paquets dans un dépôt d'objets précieux"
-#: builtin/repack.c:342
+#: builtin/repack.c:372
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable et -A sont incompatibles"
-#: builtin/repack.c:425
+#: builtin/repack.c:455
msgid "Nothing new to pack."
msgstr "Rien de neuf à empaqueter."
-#: builtin/repack.c:486
+#: builtin/repack.c:485
#, 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 ""
-"ALERTE : certains paquets utilisés ont été renommés\n"
-"ALERTE : en les préfixant par old-, de manière à\n"
-"ALERTE : les remplacer par une nouvelle version de\n"
-"ALERTE : fichier. Mais l'opération a échoué et la\n"
-"ALERTE : tentative de renommage en sens inverse a\n"
-"ALERTE : aussi échoué.\n"
-"ALERTE : Veuillez les renommer manuellement dans %s :\n"
+msgid "missing required file: %s"
+msgstr "fichier nécessaire manquant : %s"
-#: builtin/repack.c:534
+#: builtin/repack.c:487
#, c-format
-msgid "failed to remove '%s'"
-msgstr "échec de la suppression de '%s'"
+msgid "could not unlink: %s"
+msgstr "impossible de délier : '%s'"
#: builtin/replace.c:22
msgid "git replace [-f] <object> <replacement>"
@@ -20142,95 +21491,95 @@
msgid "keep"
msgstr "keep"
-#: builtin/reset.c:82
+#: builtin/reset.c:83
msgid "You do not have a valid HEAD."
msgstr "Vous n'avez pas une HEAD valide."
-#: builtin/reset.c:84
+#: builtin/reset.c:85
msgid "Failed to find tree of HEAD."
msgstr "Impossible de trouver l'arbre pour HEAD."
-#: builtin/reset.c:90
+#: builtin/reset.c:91
#, c-format
msgid "Failed to find tree of %s."
msgstr "Impossible de trouver l'arbre pour %s."
-#: builtin/reset.c:115
+#: builtin/reset.c:116
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD est maintenant à %s"
-#: builtin/reset.c:194
+#: 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:294 builtin/stash.c:520 builtin/stash.c:595
-#: builtin/stash.c:619
+#: builtin/reset.c:295 builtin/stash.c:587 builtin/stash.c:661
+#: builtin/stash.c:685
msgid "be quiet, only report errors"
msgstr "être silencieux, afficher seulement les erreurs"
-#: builtin/reset.c:296
+#: builtin/reset.c:297
msgid "reset HEAD and index"
msgstr "réinitialiser HEAD et l'index"
-#: builtin/reset.c:297
+#: builtin/reset.c:298
msgid "reset only HEAD"
msgstr "réinitialiser seulement HEAD"
-#: builtin/reset.c:299 builtin/reset.c:301
+#: 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:303
+#: builtin/reset.c:304
msgid "reset HEAD but keep local changes"
msgstr "réinitialiser HEAD mais garder les changements locaux"
-#: builtin/reset.c:309
+#: 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:343
+#: 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:351
+#: 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:360
+#: builtin/reset.c:361
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch est incompatible avec --{hard,mixed,soft}"
-#: builtin/reset.c:370
+#: 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:372
+#: 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:387
+#: 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:391
+#: builtin/reset.c:392
msgid "-N can only be used with --mixed"
msgstr "-N ne peut être utilisé qu'avec --mixed"
-#: builtin/reset.c:412
+#: builtin/reset.c:413
msgid "Unstaged changes after reset:"
msgstr "Modifications non indexées après reset :"
-#: builtin/reset.c:415
+#: builtin/reset.c:416
#, c-format
msgid ""
"\n"
@@ -20245,48 +21594,48 @@
"de\n"
"config reset.quiet à true pour avoir ce comportement en permanence.\n"
-#: builtin/reset.c:425
+#: 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:429
+#: builtin/reset.c:439
msgid "Could not write new index file."
msgstr "Impossible d'écrire le nouveau fichier d'index."
-#: builtin/rev-list.c:499
+#: builtin/rev-list.c:534
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr "impossible de combiner --exclude-promisor-objects et --missing"
-#: builtin/rev-list.c:560
+#: builtin/rev-list.c:595
msgid "object filtering requires --objects"
msgstr "le filtrage d'objet exige --objects"
-#: builtin/rev-list.c:610
+#: builtin/rev-list.c:651
msgid "rev-list does not support display of notes"
msgstr "rev-list ne supporte l'affichage des notes"
-#: builtin/rev-list.c:615
+#: builtin/rev-list.c:656
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"
@@ -20379,11 +21728,11 @@
msgid "keep redundant, empty commits"
msgstr "garder les validations redondantes, vides"
-#: builtin/revert.c:232
+#: builtin/revert.c:239
msgid "revert failed"
msgstr "revert a échoué"
-#: builtin/revert.c:245
+#: builtin/revert.c:252
msgid "cherry-pick failed"
msgstr "le picorage a échoué"
@@ -20455,7 +21804,8 @@
#: 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é ?"
+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"
@@ -20486,57 +21836,79 @@
" --all et la spécification explicite de <référence> sont mutuellement "
"exclusifs."
-#: builtin/send-pack.c:163
+#: builtin/send-pack.c:188
msgid "remote name"
msgstr "nom distant"
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:201
msgid "use stateless RPC protocol"
msgstr "utiliser un protocole RPC sans état"
-#: builtin/send-pack.c:178
+#: builtin/send-pack.c:202
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:203
msgid "print status from remote helper"
msgstr "afficher les messages du greffon de protocole distant"
-#: builtin/shortlog.c:14
+#: builtin/shortlog.c:16
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git shortlog [<options>] [<intervalle-révisions>] [[--] <chemin>...]"
-#: builtin/shortlog.c:15
+#: builtin/shortlog.c:17
msgid "git log --pretty=short | git shortlog [<options>]"
msgstr "git log --pretty=short | git shortlog [<options>]"
-#: builtin/shortlog.c:264
-msgid "Group by committer rather than author"
-msgstr "Grouper par validateur plutôt que par auteur"
+#: builtin/shortlog.c:123
+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:266
+#: builtin/shortlog.c:133
+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:323
+#, c-format
+msgid "unknown group type: %s"
+msgstr "type de groupe inconnu : %s"
+
+#: builtin/shortlog.c:351
+msgid "group by committer rather than author"
+msgstr "grouper par validateur plutôt que par auteur"
+
+#: builtin/shortlog.c:354
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
-msgid "Suppress commit descriptions, only provides commit count"
+#: builtin/shortlog.c:356
+msgid "suppress commit descriptions, only provides commit count"
msgstr ""
-"Supprimer les descriptions de validation, fournit seulement le nombre de "
+"supprimer les descriptions de validation, fournit seulement le nombre de "
"validations"
-#: builtin/shortlog.c:270
-msgid "Show the email address of each author"
-msgstr "Afficher l'adresse courriel de chaque auteur"
+#: builtin/shortlog.c:358
+msgid "show the email address of each author"
+msgstr "afficher l'adresse courriel de chaque auteur"
-#: builtin/shortlog.c:271
+#: builtin/shortlog.c:359
msgid "<w>[,<i1>[,<i2>]]"
msgstr "<w>[,<i1>[,<i2>]]"
-#: builtin/shortlog.c:272
-msgid "Linewrap output"
-msgstr "Couper les lignes"
+#: builtin/shortlog.c:360
+msgid "linewrap output"
+msgstr "couper les lignes"
-#: builtin/shortlog.c:301
+#: builtin/shortlog.c:362
+msgid "field"
+msgstr "champ"
+
+#: builtin/shortlog.c:363
+msgid "group by field"
+msgstr "grouper par champ"
+
+#: builtin/shortlog.c:391
msgid "too many arguments given outside repository"
msgstr "trop d'arguments fournis hors d'un dépôt"
@@ -20678,6 +22050,14 @@
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 | --"
@@ -20728,20 +22108,29 @@
"local"
#: builtin/sparse-checkout.c:21
-msgid "git sparse-checkout (init|list|set|add|disable) <options>"
-msgstr "git sparse-checkout (init|list|set|add|disable) <options>"
+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:64
+#: builtin/sparse-checkout.c:45
+msgid "git sparse-checkout list"
+msgstr "git sparse-checkout list"
+
+#: builtin/sparse-checkout.c:71
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr ""
"cet arbre de travail n'est pas partiel (le fichier sparse-checkout pourrait "
"ne pas exister)"
-#: builtin/sparse-checkout.c:225
+#: builtin/sparse-checkout.c:223
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:264
+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:266
msgid "failed to set extensions.worktreeConfig setting"
msgstr "échec de paramétrage extensions.worktreeConfig"
@@ -20754,46 +22143,42 @@
msgid "initialize the sparse-checkout in cone mode"
msgstr "initialiser l'extraction partielle en mode cone"
-#: builtin/sparse-checkout.c:308
-msgid "initialize sparse-checkout"
-msgstr "initialiser l'extraction partielle"
-
-#: builtin/sparse-checkout.c:341
+#: builtin/sparse-checkout.c:339
#, c-format
msgid "failed to open '%s'"
msgstr "échec à l'ouverture de '%s'"
-#: builtin/sparse-checkout.c:398
+#: builtin/sparse-checkout.c:396
#, c-format
msgid "could not normalize path %s"
msgstr "impossible de normaliser le chemin '%s'"
-#: builtin/sparse-checkout.c:410
+#: builtin/sparse-checkout.c:408
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
msgstr "git sparse-checkout (set|add) (--stdin | <motifs>)"
-#: builtin/sparse-checkout.c:435
+#: builtin/sparse-checkout.c:433
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "Impossible de décoter la chaîne en style C '%s'"
-#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513
+#: builtin/sparse-checkout.c:487 builtin/sparse-checkout.c:511
msgid "unable to load existing sparse-checkout patterns"
msgstr "impossible de charger les motifs de l'extraction partielle existants"
-#: builtin/sparse-checkout.c:558
+#: builtin/sparse-checkout.c:556
msgid "read patterns from standard in"
msgstr "lire les motifs depuis l'entrée standard"
-#: builtin/sparse-checkout.c:564
-msgid "set sparse-checkout patterns"
-msgstr "indiquer les motifs de l'extraction partielle"
+#: builtin/sparse-checkout.c:571
+msgid "git sparse-checkout reapply"
+msgstr "git sparse-checkout reapply"
-#: builtin/sparse-checkout.c:581
-msgid "disable sparse-checkout"
-msgstr "désactiver d'extraction partielle"
+#: builtin/sparse-checkout.c:590
+msgid "git sparse-checkout disable"
+msgstr "git sparse-checkout disable"
-#: builtin/sparse-checkout.c:593
+#: builtin/sparse-checkout.c:618
msgid "error while refreshing working directory"
msgstr "erreur lors du rafraîchissement du répertoire de travail"
@@ -20873,7 +22258,7 @@
msgid "Too many revisions specified:%s"
msgstr "Trop de révisions spécifiées : %s"
-#: builtin/stash.c:162 git-legacy-stash.sh:549
+#: builtin/stash.c:162
msgid "No stash entries found."
msgstr "Aucune entrée de remisage trouvée."
@@ -20882,160 +22267,174 @@
msgid "%s is not a valid reference"
msgstr "%s n'est pas une référence valide"
-#: builtin/stash.c:225 git-legacy-stash.sh:75
-msgid "git stash clear with parameters is unimplemented"
-msgstr "git stash clear avec des paramètres n'est pas implémenté"
+#: builtin/stash.c:225
+msgid "git stash clear with arguments is unimplemented"
+msgstr "git stash clear avec des arguments n'est pas implémenté"
-#: builtin/stash.c:404
+#: builtin/stash.c:429
+#, c-format
+msgid ""
+"WARNING: Untracked file in way of tracked file! Renaming\n"
+" %s -> %s\n"
+" to make room.\n"
+msgstr ""
+"AVERTISSEMENT : un fichier non-suivi en travers d'un fichier suivi ! "
+"Renommage\n"
+" %s -> %s\n"
+" pour faire de la place.\n"
+
+#: builtin/stash.c:490
msgid "cannot apply a stash in the middle of a merge"
msgstr "impossible d'appliquer un remisage en cours de fusion"
-#: builtin/stash.c:415
+#: builtin/stash.c:501
#, c-format
msgid "could not generate diff %s^!."
msgstr "impossible de générer %s^!."
-#: builtin/stash.c:422
-msgid "conflicts in index.Try without --index."
+#: builtin/stash.c:508
+msgid "conflicts in index. Try without --index."
msgstr "conflits dans l'index. Essayez sans --index."
-#: builtin/stash.c:428
+#: builtin/stash.c:514
msgid "could not save index tree"
msgstr "impossible de sauvegarder l'arbre d'index"
-#: builtin/stash.c:437
+#: builtin/stash.c:523
msgid "could not restore untracked files from stash"
msgstr "impossible de restaurer les fichiers non-suivis depuis le remisage"
-#: builtin/stash.c:451
+#: builtin/stash.c:537
#, c-format
msgid "Merging %s with %s"
msgstr "Fusion de %s avec %s"
-#: builtin/stash.c:461 git-legacy-stash.sh:681
+#: builtin/stash.c:547
msgid "Index was not unstashed."
msgstr "L'index n'a pas été sorti de remise."
-#: builtin/stash.c:522 builtin/stash.c:621
+#: builtin/stash.c:589 builtin/stash.c:687
msgid "attempt to recreate the index"
msgstr "tentative de recréer l'index"
-#: builtin/stash.c:555
+#: builtin/stash.c:633
#, c-format
msgid "Dropped %s (%s)"
msgstr "%s supprimé (%s)"
-#: builtin/stash.c:558
+#: builtin/stash.c:636
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s : Impossible de supprimer l'élément de stash"
-#: builtin/stash.c:583
+#: builtin/stash.c:649
#, c-format
msgid "'%s' is not a stash reference"
msgstr "'%s' n'est pas une référence de remisage"
-#: builtin/stash.c:633 git-legacy-stash.sh:695
+#: builtin/stash.c:699
msgid "The stash entry is kept in case you need it again."
msgstr ""
"L'entrée de remisage est conservée au cas où vous en auriez encore besoin."
-#: builtin/stash.c:656 git-legacy-stash.sh:713
+#: builtin/stash.c:722
msgid "No branch name specified"
msgstr "Aucune branche spécifiée"
-#: builtin/stash.c:796 builtin/stash.c:833
+#: builtin/stash.c:866 builtin/stash.c:903
#, c-format
msgid "Cannot update %s with %s"
msgstr "Impossible de mettre à jour %s avec %s"
-#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
+#: builtin/stash.c:884 builtin/stash.c:1538 builtin/stash.c:1603
msgid "stash message"
msgstr "message pour le remisage"
-#: builtin/stash.c:824
+#: builtin/stash.c:894
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" exige un argument <commit>"
-#: builtin/stash.c:1049 git-legacy-stash.sh:218
+#: builtin/stash.c:1109
msgid "No changes selected"
msgstr "Aucun changement sélectionné"
-#: builtin/stash.c:1149 git-legacy-stash.sh:150
+#: builtin/stash.c:1209
msgid "You do not have the initial commit yet"
msgstr "Vous n'avez pas encore la validation initiale"
-#: builtin/stash.c:1176 git-legacy-stash.sh:165
+#: builtin/stash.c:1236
msgid "Cannot save the current index state"
msgstr "Impossible de sauver l'état courant de l'index"
-#: builtin/stash.c:1185 git-legacy-stash.sh:180
+#: builtin/stash.c:1245
msgid "Cannot save the untracked files"
msgstr "Impossible de sauver les fichiers non-suivis"
-#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201
-#: git-legacy-stash.sh:214
+#: builtin/stash.c:1256 builtin/stash.c:1265
msgid "Cannot save the current worktree state"
msgstr "Impossible de sauver l'état courant de la copie de travail"
-#: builtin/stash.c:1233 git-legacy-stash.sh:234
+#: builtin/stash.c:1293
msgid "Cannot record working tree state"
msgstr "Impossible d'enregistrer l'état de la copie de travail"
-#: builtin/stash.c:1282 git-legacy-stash.sh:338
+#: builtin/stash.c:1342
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr ""
"Impossible d'utiliser --patch et --include-untracked ou --all en même temps"
-#: builtin/stash.c:1298
+#: builtin/stash.c:1358
msgid "Did you forget to 'git add'?"
msgstr "Vous avez sûrement oublié 'git add' ?"
-#: builtin/stash.c:1313 git-legacy-stash.sh:346
+#: builtin/stash.c:1373
msgid "No local changes to save"
msgstr "Pas de modifications locales à sauver"
-#: builtin/stash.c:1320 git-legacy-stash.sh:351
+#: builtin/stash.c:1380
msgid "Cannot initialize stash"
msgstr "Impossible d'initialiser le remisage"
-#: builtin/stash.c:1335 git-legacy-stash.sh:355
+#: builtin/stash.c:1395
msgid "Cannot save the current status"
msgstr "Impossible de sauver l'état courant"
-#: builtin/stash.c:1340
+#: builtin/stash.c:1400
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Arbre de travail et état de l'index sauvegardés dans %s"
-#: builtin/stash.c:1430 git-legacy-stash.sh:385
+#: builtin/stash.c:1490
msgid "Cannot remove worktree changes"
msgstr "Impossible de supprimer les changements de la copie de travail"
-#: builtin/stash.c:1469 builtin/stash.c:1534
+#: builtin/stash.c:1529 builtin/stash.c:1594
msgid "keep index"
msgstr "conserver l'index"
-#: builtin/stash.c:1471 builtin/stash.c:1536
+#: builtin/stash.c:1531 builtin/stash.c:1596
msgid "stash in patch mode"
msgstr "remiser une mode rustine"
-#: builtin/stash.c:1472 builtin/stash.c:1537
+#: builtin/stash.c:1532 builtin/stash.c:1597
msgid "quiet mode"
msgstr "mode silencieux"
-#: builtin/stash.c:1474 builtin/stash.c:1539
+#: builtin/stash.c:1534 builtin/stash.c:1599
msgid "include untracked files in stash"
msgstr "inclure les fichiers non suivis dans la remise"
-#: builtin/stash.c:1476 builtin/stash.c:1541
+#: builtin/stash.c:1536 builtin/stash.c:1601
msgid "include ignore files"
msgstr "inclure les fichiers ignorés"
-#: builtin/stash.c:1600
-#, c-format
-msgid "could not exec %s"
-msgstr "impossible d'exécuter %s"
+#: builtin/stash.c:1636
+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]"
@@ -21055,7 +22454,7 @@
msgid "prepend comment character and space to each line"
msgstr "ajouter devant chaque ligne le caractère de commentaire et un espace"
-#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999
+#: builtin/submodule--helper.c: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"
@@ -21069,7 +22468,7 @@
msgid "cannot strip one component off url '%s'"
msgstr "impossible de supprimer un composant de l'URL '%s'"
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819
msgid "alternative anchor for relative paths"
msgstr "ancre alternative pour les chemins relatifs"
@@ -21077,8 +22476,8 @@
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]"
-#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c: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"
@@ -21109,13 +22508,14 @@
"."
#: builtin/submodule--helper.c:565
-msgid "Suppress output of entering each submodule command"
+msgid "suppress output of entering each submodule command"
msgstr ""
-"Supprimer la sortie lors de l'entrée dans chaque commande de sous-module"
+"supprimer la sortie lors de l'entrée dans chaque commande de sous-module"
-#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063
-msgid "Recurse into nested submodules"
-msgstr "Parcourir récursivement les sous-modules"
+#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888
+#: builtin/submodule--helper.c:1487
+msgid "recurse into nested submodules"
+msgstr "parcourir récursivement les sous-modules"
#: builtin/submodule--helper.c:572
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
@@ -21130,109 +22530,161 @@
"impossible de trouver la configuration '%s'. Ce dépôt est considéré comme "
"son propre amont d'autorité."
-#: builtin/submodule--helper.c:667
+#: builtin/submodule--helper.c: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:671
+#: 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:681
+#: 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:688
+#: 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:710
-msgid "Suppress output for initializing a submodule"
-msgstr "Supprimer la sortie lors de l'initialisation d'un sous-module"
+#: 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:715
+#: builtin/submodule--helper.c:714
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<options>] [<chemin>]"
-#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
+#: builtin/submodule--helper.c: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:837
+#: 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:864 builtin/submodule--helper.c:1033
+#: 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:888 builtin/submodule--helper.c:1199
-msgid "Suppress submodule status output"
+#: 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:889
+#: builtin/submodule--helper.c:887
msgid ""
-"Use commit stored in the index instead of the one stored in the submodule "
+"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr ""
-"Utiliser le commit stocké dans l'index au lieu de celui stocké dans la HEAD "
+"utiliser le commit stocké dans l'index au lieu de celui stocké dans la HEAD "
"du sous-module"
-#: builtin/submodule--helper.c:890
-msgid "recurse into nested submodules"
-msgstr "parcourir récursivement les sous-modules"
-
-#: builtin/submodule--helper.c:895
+#: 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:919
+#: builtin/submodule--helper.c:917
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper <nom> <chemin>"
-#: builtin/submodule--helper.c:983
+#: 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:989
+#: 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:1003
+#: 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:1014
+#: 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:1061
-msgid "Suppress output of synchronizing submodule url"
+#: 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"
+"supprimer la sortie lors de la synchronisation de l'URL d'un sous-module"
-#: builtin/submodule--helper.c:1068
+#: 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:1122
+#: builtin/submodule--helper.c:1546
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -21242,7 +22694,7 @@
"'rm -rf' si vous voulez vraiment le supprimer en incluant tout son "
"historique)"
-#: builtin/submodule--helper.c:1134
+#: builtin/submodule--helper.c:1558
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -21251,48 +22703,48 @@
"L'arbre de travail du sous-module '%s' contient des modifications locales ; "
"utilisez '-f' pour les annuler"
-#: builtin/submodule--helper.c:1142
+#: builtin/submodule--helper.c:1566
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Répertoire '%s' nettoyé\n"
-#: builtin/submodule--helper.c:1144
+#: 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:1155
+#: 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:1171
+#: 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:1200
-msgid "Remove submodule working trees even if they contain local changes"
+#: 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 "
+"éliminer les arbres de travail des sous-modules même s'ils contiennent des "
"modifications locales"
-#: builtin/submodule--helper.c:1201
-msgid "Unregister all submodules"
-msgstr "Désenregistrer tous les sous-modules"
+#: builtin/submodule--helper.c:1625
+msgid "unregister all submodules"
+msgstr "désenregistrer tous les sous-modules"
-#: builtin/submodule--helper.c:1206
+#: 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:1220
+#: 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:1289
+#: 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"
@@ -21304,47 +22756,47 @@
"submodule.alternateErrorStrategy à 'info', ou de manière équivalente,\n"
"clonez avec '--reference-if-able' au lieu de '--reference'."
-#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331
+#: builtin/submodule--helper.c: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:1367
+#: 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:1374
+#: 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:1398
+#: 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:1401
+#: builtin/submodule--helper.c:1825
msgid "name of the new submodule"
msgstr "nom du nouveau sous-module"
-#: builtin/submodule--helper.c:1404
+#: 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:1412
+#: builtin/submodule--helper.c:1836
msgid "depth for shallow clones"
msgstr "profondeur de l'historique des clones superficiels"
-#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924
+#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348
msgid "force cloning progress"
msgstr "forcer l'affichage de la progression du clonage"
-#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926
+#: 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:1424
+#: builtin/submodule--helper.c:1848
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -21354,105 +22806,105 @@
"<dépôt>] [--name <nom>] [--depth <profondeur>] [--single-branch] --url <url> "
"--path <chemin>"
-#: builtin/submodule--helper.c:1449
+#: 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:1460
+#: 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:1464
+#: 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:1476
+#: 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:1512
+#: 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:1516
+#: 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:1617
+#: 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:1621
+#: 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:1651
+#: builtin/submodule--helper.c:2075
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Sous-module non fusionné %s non traité"
-#: builtin/submodule--helper.c:1680
+#: builtin/submodule--helper.c:2104
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Sous-module '%s' non traité"
-#: builtin/submodule--helper.c:1830
+#: 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:1841
+#: 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:1903 builtin/submodule--helper.c:2149
+#: 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:1906
+#: 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:1910
+#: builtin/submodule--helper.c:2334
msgid "rebase, merge, checkout or none"
msgstr "valeurs possibles : rebase, merge, checkout ou none"
-#: builtin/submodule--helper.c:1916
-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: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:1919
+#: builtin/submodule--helper.c:2343
msgid "parallel jobs"
msgstr "jobs parallèles"
-#: builtin/submodule--helper.c:1921
+#: 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:1922
+#: builtin/submodule--helper.c:2346
msgid "don't print cloning progress"
msgstr "ne pas afficher la progression du clonage"
-#: builtin/submodule--helper.c:1933
+#: 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:1946
+#: 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:1994
+#: builtin/submodule--helper.c:2418
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -21461,51 +22913,86 @@
"la branche du sous-module %s est configurée pour hériter de la branche du "
"superprojet, mais le superprojet n'est sur aucune branche"
-#: builtin/submodule--helper.c:2117
+#: builtin/submodule--helper.c: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:2150
+#: builtin/submodule--helper.c:2574
msgid "recurse into submodules"
msgstr "parcourir récursivement les sous-modules"
-#: builtin/submodule--helper.c:2156
+#: 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:2212
+#: 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:2215
+#: 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:2220
+#: builtin/submodule--helper.c:2644
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config name [<valeur>]"
-#: builtin/submodule--helper.c:2221
+#: builtin/submodule--helper.c:2645
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <nom>"
-#: builtin/submodule--helper.c:2222
+#: builtin/submodule--helper.c:2646
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2241 git-submodule.sh:174
+#: builtin/submodule--helper.c:2665 git-submodule.sh:150
#, sh-format
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr ""
"veuillez vous assurer que le fichier .gitmodules est dans l'arbre de travail"
-#: builtin/submodule--helper.c:2291 git.c:433 git.c:684
+#: builtin/submodule--helper.c: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:441 git.c:714
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s ne gère pas --super-prefix"
-#: builtin/submodule--helper.c:2297
+#: builtin/submodule--helper.c:2798
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' n'est pas une sous-commande valide de submodule--helper"
@@ -21531,11 +23018,11 @@
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:499
msgid "reason"
msgstr "raison"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
msgid "reason of the update"
msgstr "raison de la mise à jour"
@@ -21555,11 +23042,13 @@
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>..."
@@ -21570,12 +23059,12 @@
msgid "tag '%s' not found."
msgstr "étiquette '%s' non trouvée."
-#: builtin/tag.c:105
+#: builtin/tag.c:124
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Étiquette '%s' supprimée (elle était sur %s)\n"
-#: builtin/tag.c:135
+#: builtin/tag.c:159
#, c-format
msgid ""
"\n"
@@ -21588,7 +23077,7 @@
" %s\n"
"Les lignes commençant par '%c' seront ignorées.\n"
-#: builtin/tag.c:139
+#: builtin/tag.c:163
#, c-format
msgid ""
"\n"
@@ -21603,15 +23092,11 @@
"Les lignes commençant par '%c' seront gardées ; vous pouvez les retirer vous-"
"même si vous le souhaitez.\n"
-#: builtin/tag.c:198
+#: builtin/tag.c:230
msgid "unable to sign the tag"
msgstr "impossible de signer l'étiquette"
-#: builtin/tag.c:200
-msgid "unable to write tag file"
-msgstr "impossible d'écrire le fichier d'étiquettes"
-
-#: builtin/tag.c:216
+#: builtin/tag.c:248
#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
@@ -21626,139 +23111,135 @@
"\n"
"\tgit tag -f %s %s^{}"
-#: builtin/tag.c:232
+#: builtin/tag.c:264
msgid "bad object type."
msgstr "mauvais type d'objet."
-#: builtin/tag.c:284
+#: builtin/tag.c:317
msgid "no tag message?"
msgstr "pas de message pour l'étiquette ?"
-#: builtin/tag.c:291
+#: builtin/tag.c:324
#, 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:435
msgid "list tag names"
msgstr "afficher les noms des étiquettes"
-#: builtin/tag.c:404
+#: builtin/tag.c:437
msgid "print <n> lines of each tag message"
msgstr "affiche <n> lignes de chaque message d'étiquette"
-#: builtin/tag.c:406
+#: builtin/tag.c:439
msgid "delete tags"
msgstr "supprimer des étiquettes"
-#: builtin/tag.c:407
+#: builtin/tag.c:440
msgid "verify tags"
msgstr "vérifier des étiquettes"
-#: builtin/tag.c:409
+#: builtin/tag.c:442
msgid "Tag creation options"
msgstr "Options de création de l'étiquette"
-#: builtin/tag.c:411
+#: builtin/tag.c:444
msgid "annotated tag, needs a message"
msgstr "étiquette annotée, nécessite un message"
-#: builtin/tag.c:413
+#: builtin/tag.c:446
msgid "tag message"
msgstr "message pour l'étiquette"
-#: builtin/tag.c:415
+#: builtin/tag.c:448
msgid "force edit of tag message"
msgstr "forcer l'édition du message d'étiquetage"
-#: builtin/tag.c:416
+#: builtin/tag.c:449
msgid "annotated and GPG-signed tag"
msgstr "étiquette annotée et signée avec GPG"
-#: builtin/tag.c:419
+#: builtin/tag.c:452
msgid "use another key to sign the tag"
msgstr "utiliser une autre clé pour signer l'étiquette"
-#: builtin/tag.c:420
+#: builtin/tag.c:453
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:454 builtin/update-ref.c:505
msgid "create a reflog"
msgstr "créer un reflog"
-#: builtin/tag.c:423
+#: builtin/tag.c:456
msgid "Tag listing options"
msgstr "Options d'affichage des étiquettes"
-#: builtin/tag.c:424
+#: builtin/tag.c:457
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:458 builtin/tag.c:460
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:459 builtin/tag.c:461
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:462
msgid "print only tags that are merged"
msgstr "afficher seulement les étiquettes qui sont fusionnées"
-#: builtin/tag.c:430
+#: builtin/tag.c:463
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:467
msgid "print only tags of the object"
msgstr "afficher seulement les étiquettes de l'objet"
-#: builtin/tag.c:482
+#: builtin/tag.c:515
msgid "--column and -n are incompatible"
msgstr "--column et -n sont incompatibles"
-#: builtin/tag.c:504
+#: builtin/tag.c:537
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:539
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:541
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:543
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:545
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:556
msgid "only one -F or -m option is allowed."
msgstr "une seule option -F ou -m est autorisée."
-#: builtin/tag.c:542
-msgid "too many params"
-msgstr "trop de paramètres"
-
-#: builtin/tag.c:548
+#: builtin/tag.c:581
#, 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:586
#, c-format
msgid "tag '%s' already exists"
msgstr "l'étiquette '%s' existe déjà"
-#: builtin/tag.c:584
+#: builtin/tag.c:617
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n"
@@ -22050,19 +23531,19 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<options>] --stdin [-z]"
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:500
msgid "delete the reference"
msgstr "supprimer la référence"
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:502
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:503
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:504
msgid "read updates from stdin"
msgstr "lire les mises à jour depuis l'entrée standard"
@@ -22089,8 +23570,7 @@
#: 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"
@@ -22108,15 +23588,15 @@
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"
@@ -22128,236 +23608,212 @@
msgid "print tag contents"
msgstr "afficher le contenu de l'étiquette"
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<options>] <chemin> [<commit>]"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree list [<options>]"
msgstr "git worktree list [<options>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<options>] <chemin>"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <arbre-de-travail> <nouveau-chemin>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<options>]"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<options>] <arbre-de-travail>"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <chemin>"
-#: builtin/worktree.c:60 builtin/worktree.c:891
+#: builtin/worktree.c:61 builtin/worktree.c:933
#, c-format
msgid "failed to delete '%s'"
msgstr "échec de la suppression de '%s'"
-#: builtin/worktree.c:79
+#: builtin/worktree.c:74
#, c-format
-msgid "Removing worktrees/%s: not a valid directory"
-msgstr "Suppression de worktrees/%s : répertoire invalide"
+msgid "Removing %s/%s: %s"
+msgstr "Suppression de %s/%s : %s"
-#: builtin/worktree.c:85
-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
-msgstr "Suppression de worktrees/%s : le fichier gitdir n'existe pas"
-
-#: builtin/worktree.c:90 builtin/worktree.c:99
-#, c-format
-msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
-msgstr ""
-"Suppression de worktrees/%s : échec de la lecture du fichier gitdir (%s)"
-
-#: builtin/worktree.c:109
-#, c-format
-msgid ""
-"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
-"%<PRIuMAX>)"
-msgstr ""
-"Suppression de worktrees/%s: lecture trop courte ( %<PRIuMAX> octets "
-"attendus, %<PRIuMAX> octets lus)"
-
-#: builtin/worktree.c:117
-#, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
-msgstr "Suppression de worktrees/%s : fichier gitdir invalide"
-
-#: builtin/worktree.c:126
-#, c-format
-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
-msgstr ""
-"Suppression de worktrees/%s : le fichier gitdir point sur un endroit "
-"inexistant"
-
-#: builtin/worktree.c:165
+#: builtin/worktree.c:149
msgid "report pruned working trees"
msgstr "afficher les arbres de travail éliminés"
-#: builtin/worktree.c:167
+#: builtin/worktree.c:151
msgid "expire working trees older than <time>"
msgstr "faire expirer les arbres de travail plus vieux que <temps>"
-#: builtin/worktree.c:234
+#: builtin/worktree.c:221
#, c-format
msgid "'%s' already exists"
msgstr "'%s' existe déjà"
-#: builtin/worktree.c:244
+#: builtin/worktree.c:230
#, 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:249
+#: builtin/worktree.c:235
#, 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:251
+#: builtin/worktree.c:237
#, 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:301
+#: builtin/worktree.c:288
#, c-format
msgid "could not create directory of '%s'"
msgstr "impossible de créer le répertoire de '%s'"
-#: builtin/worktree.c:432 builtin/worktree.c:438
+#: builtin/worktree.c:422 builtin/worktree.c:428
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Préparation de l'arbre de travail (nouvelle branche '%s')"
-#: builtin/worktree.c:434
+#: builtin/worktree.c:424
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
"Préparation de l'arbre de travail (réinitialisation de la branche '%s' ; "
"précédemment sur %s)"
-#: builtin/worktree.c:443
+#: builtin/worktree.c:433
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Préparation de l'arbre de travail (extraction de '%s')"
-#: builtin/worktree.c:449
+#: builtin/worktree.c:439
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Préparation de l'arbre de travail (HEAD détachée %s)"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:480
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
"extraire la <branche> même si elle est déjà extraite dans une autre copie de "
"travail"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:483
msgid "create a new branch"
msgstr "créer une nouvelle branche"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:485
msgid "create or reset a branch"
msgstr "créer ou réinitialiser une branche"
-#: builtin/worktree.c:497
+#: builtin/worktree.c:487
msgid "populate the new working tree"
msgstr "remplissage de la nouvelle copie de travail"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:488
msgid "keep the new working tree locked"
msgstr "conserver le verrou sur le nouvel arbre de travail"
-#: builtin/worktree.c:501
+#: builtin/worktree.c:491
msgid "set up tracking mode (see git-branch(1))"
msgstr "régler le mode de suivi (voir git-branch(1))"
-#: builtin/worktree.c:504
+#: builtin/worktree.c:494
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "essayer de nommer la nouvelle branche comme la branche amont"
-#: builtin/worktree.c:512
+#: builtin/worktree.c:502
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B et --detach sont mutuellement exclusifs"
-#: builtin/worktree.c:573
+#: builtin/worktree.c:563
msgid "--[no-]track can only be used if a new branch is created"
msgstr ""
"--[no-]track ne peut être utilisé qu'à la création d'une nouvelle branche"
-#: builtin/worktree.c:673
+#: builtin/worktree.c:680
+msgid "show extended annotations and reasons, if available"
+msgstr "afficher les annotations étendues et les raisons, si disponible"
+
+#: builtin/worktree.c:682
+msgid "add 'prunable' annotation to worktrees older than <time>"
+msgstr ""
+"ajouter l'annotation 'prunable' aux arbres de travail plus vieux que <temps>"
+
+#: builtin/worktree.c:691
+msgid "--verbose and --porcelain are mutually exclusive"
+msgstr "--verbose et --porcelain sont mutuellement exclusifs"
+
+#: builtin/worktree.c:718
msgid "reason for locking"
msgstr "raison du verrouillage"
-#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
-#: builtin/worktree.c:919
+#: builtin/worktree.c:730 builtin/worktree.c:763 builtin/worktree.c:837
+#: builtin/worktree.c:961
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' n'est pas une copie de travail"
-#: builtin/worktree.c:687 builtin/worktree.c:720
+#: builtin/worktree.c:732 builtin/worktree.c:765
msgid "The main working tree cannot be locked or unlocked"
msgstr ""
"La copie de travail principale ne peut pas être verrouillée ou déverrouillée"
-#: builtin/worktree.c:692
+#: builtin/worktree.c:737
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' est déjà verrouillé, car '%s'"
-#: builtin/worktree.c:694
+#: builtin/worktree.c:739
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' est déjà verrouillé"
-#: builtin/worktree.c:722
+#: builtin/worktree.c:767
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' n'est pas verrouillé"
-#: builtin/worktree.c:763
+#: builtin/worktree.c:808
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
"les arbres de travail contenant des sous-modules ne peuvent pas être "
"déplacés ou supprimés"
-#: builtin/worktree.c:771
+#: builtin/worktree.c:816
msgid "force move even if worktree is dirty or locked"
msgstr ""
"forcer le déplacement même si l'arbre de travail est sale ou verrouillé"
-#: builtin/worktree.c:794 builtin/worktree.c:921
+#: builtin/worktree.c:839 builtin/worktree.c:963
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' est un arbre de travail principal"
-#: builtin/worktree.c:799
+#: builtin/worktree.c:844
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "impossible de trouver le nom de la destination à partir de '%s'"
-#: builtin/worktree.c:805
-#, c-format
-msgid "target '%s' already exists"
-msgstr "la cible '%s' existe déjà"
-
-#: builtin/worktree.c:813
+#: builtin/worktree.c:857
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -22367,7 +23823,7 @@
"verrouillage : %s\n"
"utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
-#: builtin/worktree.c:815
+#: builtin/worktree.c:859
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -22375,39 +23831,39 @@
"impossible de déplacer un arbre de travail verrouillé;\n"
"utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
-#: builtin/worktree.c:818
+#: builtin/worktree.c:862
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "la validation a échoué, impossible de déplacer l'arbre de travail : %s"
-#: builtin/worktree.c:823
+#: builtin/worktree.c:867
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "échec au déplacement de '%s' vers '%s'"
-#: builtin/worktree.c:871
+#: builtin/worktree.c:913
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "échec du lancement de 'git status' sur '%s'"
-#: builtin/worktree.c:875
+#: builtin/worktree.c:917
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
"'%s' contient des fichiers modifiés ou non-suivis, utilisez --force pour le "
"supprimer"
-#: builtin/worktree.c:880
+#: builtin/worktree.c:922
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "impossible de lancer 'git status' sur '%s', code %d"
-#: builtin/worktree.c:903
+#: builtin/worktree.c:945
msgid "force removal even if worktree is dirty or locked"
msgstr ""
"forcer la suppression même si l'arbre de travail est sale ou verrouillé"
-#: builtin/worktree.c:926
+#: builtin/worktree.c:968
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -22417,7 +23873,7 @@
"verrouillage : %s\n"
"utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:970
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -22425,12 +23881,22 @@
"impossible de supprimer un arbre de travail verrouillé;\n"
"utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
-#: builtin/worktree.c:931
+#: builtin/worktree.c:973
#, 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:997
+#, c-format
+msgid "repair: %s: %s"
+msgstr "réparation : %s : '%s'"
+
+#: builtin/worktree.c:1000
+#, 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>/]"
@@ -22447,45 +23913,37 @@
msgid "only useful for debugging"
msgstr "seulement utile pour le débogage"
-#: fast-import.c:3125
+#: http-fetch.c:118
#, c-format
-msgid "Expected 'mark' command, got %s"
-msgstr "commande 'mark' attendue, %s trouvé"
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr "l'argument de --packfile doit être une empreinte valide ('%s' reçu)"
-#: fast-import.c:3130
-#, c-format
-msgid "Expected 'to' command, got %s"
-msgstr "commande 'to' attendue, %s trouvé"
+#: http-fetch.c:128
+msgid "not a git repository"
+msgstr "pas un dépôt git"
-#: fast-import.c:3254
-#, c-format
-msgid "feature '%s' forbidden in input without --allow-unsafe-features"
-msgstr ""
-"la fonctionnalité '%s' est interdite en entrée sans --allow-unsafe-features"
+#: http-fetch.c:134
+msgid "--packfile requires --index-pack-args"
+msgstr "--packfile nécessite --index-pack-args"
-#: credential-cache--daemon.c:223
-#, c-format
-msgid ""
-"The permissions on your socket directory are too loose; other\n"
-"users may be able to read your cached credentials. Consider running:\n"
-"\n"
-"\tchmod 0700 %s"
-msgstr ""
-"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"
+#: http-fetch.c:143
+msgid "--index-pack-args can only be used with --packfile"
+msgstr "--index-pack-args ne peut être utilisé qu'avec --packfile"
-#: credential-cache--daemon.c:272
-msgid "print debugging messages to stderr"
-msgstr "afficher les messages de debug sur stderr"
+#: t/helper/test-fast-rebase.c:141
+msgid "unhandled options"
+msgstr "options non gérées"
-#: t/helper/test-reach.c:152
+#: t/helper/test-fast-rebase.c:146
+msgid "error preparing revisions"
+msgstr "erreur lors de la préparation des révisions"
+
+#: 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"
@@ -22497,13 +23955,14 @@
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"
" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
"bare]\n"
" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
" <command> [<args>]"
msgstr ""
"git [--version] [--help] [-C <chemin>] [-c <nom>=<valeur>]\n"
@@ -22512,9 +23971,11 @@
" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
"bare]\n"
" [--git-dir=<chemin>] [--work-tree=<chemin>] [--namespace=<nom>]\n"
+" [--super-prefix=<chemin>] [--config-env=<nom>=<variable-d-"
+"environnement>]\n"
" <commande> [<args>]"
-#: git.c:34
+#: git.c:36
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"
@@ -22526,47 +23987,47 @@
"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:188
#, c-format
msgid "no directory given for --git-dir\n"
msgstr "aucun répertoire fourni pour --git-dir\n"
-#: git.c:200
+#: git.c:202
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "aucun espace de nom fournit pour --namespace\n"
-#: git.c:214
+#: git.c:216
#, c-format
msgid "no directory given for --work-tree\n"
msgstr "aucun répertoire fourni pour --work-tree\n"
-#: git.c:228
+#: git.c:230
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr "aucun préfixe fourni pour --super-prefix\n"
-#: git.c:250
+#: git.c:252
#, c-format
msgid "-c expects a configuration string\n"
msgstr "-c requiert une chaîne de configuration\n"
-#: git.c:288
+#: git.c:292
#, c-format
msgid "no directory given for -C\n"
msgstr "aucun répertoire fourni pour -C\n"
-#: git.c:314
+#: git.c:318
#, c-format
msgid "unknown option: %s\n"
msgstr "option inconnue : %s\n"
-#: git.c:360
+#: git.c:367
#, c-format
msgid "while expanding alias '%s': '%s'"
msgstr "lors de l'expansion de l'alias '%s' : '%s'"
-#: git.c:369
+#: git.c:376
#, c-format
msgid ""
"alias '%s' changes environment variables.\n"
@@ -22575,39 +24036,39 @@
"l'alias '%s' modifie les variables d'environnement.\n"
"Vous pouvez utiliser '!git' dans l'alias pour le faire"
-#: git.c:376
+#: git.c:383
#, c-format
msgid "empty alias for %s"
msgstr "alias vide pour %s"
-#: git.c:379
+#: git.c:386
#, c-format
msgid "recursive alias: %s"
msgstr "alias recursif : %s"
-#: git.c:459
+#: git.c:468
msgid "write failure on standard output"
msgstr "échec d'écriture sur la sortie standard"
-#: git.c:461
+#: git.c:470
msgid "unknown write failure on standard output"
msgstr "échec inconnu d'écriture sur la sortie standard"
-#: git.c:463
+#: git.c:472
msgid "close failed on standard output"
msgstr "échec de fermeture de la sortie standard"
-#: git.c:793
+#: git.c:823
#, 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:873
#, 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:886
#, c-format
msgid ""
"usage: %s\n"
@@ -22616,57 +24077,57 @@
"usage : %s\n"
"\n"
-#: git.c:876
+#: git.c:906
#, 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:918
#, 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:1086
+#: 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:1093
+#: 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:1097
+#: 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:1966
+#: http.c:2025
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -22677,122 +24138,153 @@
" demandé : %s\n"
" redirection : %s"
-#: remote-curl.c:166
+#: remote-curl.c:183
#, c-format
msgid "invalid quoting in push-option value: '%s'"
msgstr "citation invalide dans la valeur push-option : '%s'"
-#: remote-curl.c:263
+#: remote-curl.c:307
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "%sinfo/refs n'est pas valide : est-ce bien un dépôt git ?"
-#: remote-curl.c:364
+#: remote-curl.c:408
msgid "invalid server response; expected service, got flush packet"
msgstr "réponse du serveur invalide ; service attendu, paquet de vidage reçu"
-#: remote-curl.c:395
+#: remote-curl.c:439
#, c-format
msgid "invalid server response; got '%s'"
msgstr "réponse du serveur invalide ; '%s' reçu"
-#: remote-curl.c:455
+#: remote-curl.c:499
#, c-format
msgid "repository '%s' not found"
msgstr "dépôt '%s' non trouvé"
-#: remote-curl.c:459
+#: remote-curl.c:503
#, c-format
msgid "Authentication failed for '%s'"
msgstr "Échec d'authentification pour '%s'"
-#: remote-curl.c:463
+#: remote-curl.c:507
#, c-format
msgid "unable to access '%s': %s"
msgstr "impossible d'accéder à '%s' : %s"
-#: remote-curl.c:469
+#: remote-curl.c:513
#, c-format
msgid "redirecting to %s"
msgstr "redirection vers %s"
-#: remote-curl.c:593
+#: remote-curl.c:642
msgid "shouldn't have EOF when not gentle on EOF"
msgstr "ne devrait pas recevoir OEF quand on n'est pas gentil sur EOF"
-#: remote-curl.c:673
+#: remote-curl.c:654
+msgid "remote server sent stateless separator"
+msgstr "le serveur distant a envoyé un séparateur sans état"
+
+#: remote-curl.c:724
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr ""
"impossible de rembobiner le données post rpc - essayer d'augmenter http."
"postBuffer"
-#: remote-curl.c:733
+#: remote-curl.c:754
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr "remote-curl : mauvais caractère de longueur de ligne : %.4s"
+
+#: remote-curl.c:756
+msgid "remote-curl: unexpected response end packet"
+msgstr "remote-curl : paquet de fin de réponse inattendu"
+
+#: remote-curl.c:832
#, c-format
msgid "RPC failed; %s"
msgstr "échec RPC ; %s"
-#: remote-curl.c:773
+#: remote-curl.c:872
msgid "cannot handle pushes this big"
msgstr "impossible de gérer des poussées aussi grosses"
-#: remote-curl.c:888
+#: remote-curl.c:987
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr "impossible de compresser la requête ; erreur de compression zlib %d"
-#: remote-curl.c:892
+#: remote-curl.c:991
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr "impossible de compresser la requête ; erreur de fin zlib %d"
-#: remote-curl.c:1023
+#: remote-curl.c:1041
+#, 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:1043
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr "%d octets de corps sont encore attendus"
+
+#: remote-curl.c:1132
msgid "dumb http transport does not support shallow capabilities"
msgstr "le protocole http idiot ne supporte la capacité superficielle"
-#: remote-curl.c:1038
+#: remote-curl.c:1147
msgid "fetch failed."
msgstr "échec du récupération."
-#: remote-curl.c:1086
+#: remote-curl.c:1193
msgid "cannot fetch by sha1 over smart http"
msgstr "impossible de récupérer par sha1 sur http intelligent"
-#: remote-curl.c:1130 remote-curl.c:1136
+#: remote-curl.c:1237 remote-curl.c:1243
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "erreur de protocole : sha/ref attendu, '%s' trouvé"
-#: remote-curl.c:1148 remote-curl.c:1263
+#: remote-curl.c:1255 remote-curl.c:1373
#, c-format
msgid "http transport does not support %s"
msgstr "le transport http ne supporte pas %s"
-#: remote-curl.c:1184
+#: remote-curl.c:1291
msgid "git-http-push failed"
msgstr "échec de git-http-push"
-#: remote-curl.c:1369
+#: remote-curl.c:1479
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl: usage: git remote-curl <distant> [<url>]"
-#: remote-curl.c:1401
+#: remote-curl.c:1511
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl : erreur de lecture du flux de commande depuis git"
-#: remote-curl.c:1408
+#: remote-curl.c:1518
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl : récupération tentée sans dépôt local"
-#: remote-curl.c:1448
+#: remote-curl.c:1559
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl : commande inconnue '%s' depuis git"
-#: list-objects-filter-options.h:85
+#: 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:86
+#: list-objects-filter-options.h:92
msgid "object filtering"
msgstr "filtrage d'objet"
@@ -22813,8 +24305,8 @@
msgstr "être plus silencieux"
#: parse-options.h:317
-msgid "use <n> digits to display SHA-1s"
-msgstr "utiliser <n> chiffres pour afficher les SHA-1s"
+msgid "use <n> digits to display object names"
+msgstr "utiliser <n> chiffres pour afficher les noms des objets"
#: parse-options.h:336
msgid "how to strip spaces and #comments from message"
@@ -22831,11 +24323,11 @@
"avec --pathspec-from-file, les spécificateurs de chemin sont séparés par un "
"caractère NUL"
-#: ref-filter.h:101
+#: ref-filter.h:99
msgid "key"
msgstr "clé"
-#: ref-filter.h:101
+#: ref-filter.h:99
msgid "field name to sort on"
msgstr "nom du champ servant à trier"
@@ -22844,14 +24336,6 @@
msgstr ""
"met à jour l'index avec les résolutions de conflit réutilisées si possible"
-#: wt-status.h:67
-msgid "HEAD detached at "
-msgstr "HEAD détachée sur "
-
-#: wt-status.h:68
-msgid "HEAD detached from "
-msgstr "HEAD détachée depuis "
-
#: command-list.h:50
msgid "Add file contents to the index"
msgstr "Ajouter le contenu de fichiers dans l'index"
@@ -22891,699 +24375,680 @@
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
-msgid "Ensures that a reference name is well formed"
-msgstr "Assure qu'un nom de référence est bien formé"
-
#: command-list.h:67
+msgid "Ensures that a reference name is well formed"
+msgstr "S'assurer qu'un nom de référence est bien formé"
+
+#: 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
-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"
-
#: command-list.h:90
+msgid "Compares the content and mode of blobs found via two tree objects"
+msgstr "Compare le contenu et le mode des blobs trouvés via deux objets arbre"
+
+#: 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
-msgid "Output information on each ref"
-msgstr "Afficher l'information de chaque référence"
-
#: command-list.h:98
+msgid "Output information on each ref"
+msgstr "Afficher de l'information sur chaque référence"
+
+#: command-list.h:99
+msgid "Run a Git command on a list of repositories"
+msgstr "Lance une commande Git sur une liste de dépôts"
+
+#: command-list.h:100
msgid "Prepare patches for e-mail submission"
msgstr "Préparer les patchs pour soumission par courriel"
-#: command-list.h:99
+#: command-list.h:101
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:102
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:103
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:104
msgid "Print lines matching a pattern"
msgstr "Afficher les lignes correspondant à un motif"
-#: command-list.h:103
+#: command-list.h:105
msgid "A portable graphical interface to Git"
msgstr "Une interface graphique portable pour Git"
-#: command-list.h:104
+#: command-list.h:106
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:107
msgid "Display help information about Git"
msgstr "Afficher l'information d'aide à propos de Git"
-#: command-list.h:106
+#: command-list.h:108
msgid "Server side implementation of Git over HTTP"
msgstr "Implantation côté serveur de Git sur HTTP"
-#: command-list.h:107
+#: command-list.h:109
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:110
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:111
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:112
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:113
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:114
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:115
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:116
msgid "The Git repository browser"
msgstr "Le navigateur de dépôt Git"
-#: command-list.h:115
+#: command-list.h:117
msgid "Show commit logs"
msgstr "Afficher l'historique des validations"
-#: command-list.h:116
+#: command-list.h:118
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:119
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:120
msgid "List the contents of a tree object"
msgstr "Afficher le contenu d'un objet arbre"
-#: command-list.h:119
+#: command-list.h:121
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:122
msgid "Simple UNIX mbox splitter program"
msgstr "Programme simple de découpage de mbox UNIX"
-#: command-list.h:121
+#: command-list.h:123
+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:124
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:125
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:126
msgid "Run a three-way file merge"
msgstr "Lancer une fusion à 3 points"
-#: command-list.h:124
+#: command-list.h:127
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:128
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:129
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:130
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:131
msgid "Write and verify multi-pack-indexes"
msgstr "Écrire et vérifier les index multi-paquet"
-#: command-list.h:129
-msgid "Creates a tag object"
-msgstr "Créer un objet étiquette"
+#: command-list.h:132
+msgid "Creates a tag object with extra validation"
+msgstr "Créer un objet étiquette avec validation supplémentaire"
-#: command-list.h:130
+#: command-list.h:133
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:134
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:135
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:136
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:137
msgid "Import from and submit to Perforce repositories"
msgstr "Importer et soumettre à des dépôt Perforce"
-#: command-list.h:135
+#: command-list.h:138
msgid "Create a packed archive of objects"
msgstr "Créer une archive compactée d'objets"
-#: command-list.h:136
+#: command-list.h:139
msgid "Find redundant pack files"
msgstr "Trouver les fichiers pack redondants"
-#: command-list.h:137
+#: command-list.h:140
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
-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:172
+#: 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:173
+#: command-list.h:175
msgid "Add file contents to the staging area"
msgstr "Ajouter le contenu de fichiers à l'index"
-#: command-list.h:174
+#: command-list.h:176
msgid "Show the working tree status"
msgstr "Afficher l'état de la copie de travail"
-#: command-list.h:175
+#: command-list.h:177
msgid "Remove unnecessary whitespace"
msgstr "Retirer les espaces inutiles"
-#: command-list.h:176
+#: command-list.h:178
msgid "Initialize, update or inspect submodules"
msgstr "Initialiser, mettre à jour et inspecter les sous-modules"
-#: command-list.h:177
+#: 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:178
+#: command-list.h:180
msgid "Switch branches"
msgstr "Basculer de branche"
-#: command-list.h:179
+#: command-list.h:181
msgid "Read, modify and delete symbolic refs"
msgstr "Lire, modifier et supprimer les références symboliques"
-#: command-list.h:180
+#: 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:181
+#: 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:182
+#: command-list.h:184
msgid "Unpack objects from a packed archive"
msgstr "Dépaqueter les objets depuis une archive empaquetée"
-#: command-list.h:183
+#: 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:184
+#: 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:185
+#: 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:186
+#: command-list.h:188
msgid "Send archive back to git-archive"
msgstr "Renvoyer une archive dans git-archive"
-#: command-list.h:187
+#: 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:188
+#: command-list.h:190
msgid "Show a Git logical variable"
msgstr "Afficher un variable logique de Git"
-#: command-list.h:189
+#: command-list.h:191
msgid "Check the GPG signature of commits"
msgstr "Vérifier la signature GPG de commits"
-#: command-list.h:190
+#: command-list.h:192
msgid "Validate packed Git archive files"
msgstr "Valider des fichiers d'archive Git empaquetés"
-#: command-list.h:191
+#: command-list.h:193
msgid "Check the GPG signature of tags"
msgstr "Vérifier la signature GPG d'étiquettes"
-#: command-list.h:192
+#: command-list.h:194
msgid "Git web interface (web frontend to Git repositories)"
msgstr "Interface web de Git"
-#: command-list.h:193
+#: 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:194
+#: 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:195
+#: 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:196
+#: command-list.h:198
msgid "Defining attributes per path"
msgstr "Définition des attributs par chemin"
-#: command-list.h:197
+#: command-list.h:199
msgid "Git command-line interface and conventions"
msgstr "interface en ligne de commande et conventions de Git"
-#: command-list.h:198
+#: 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:199
+#: 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:200
+#: command-list.h:203
msgid "Tweaking diff output"
msgstr "Bidouillage de la sortie diff"
-#: command-list.h:201
+#: 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:202
+#: 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:203
+#: command-list.h:207
msgid "Hooks used by Git"
msgstr "Crochets utilisés par Git"
-#: command-list.h:204
+#: command-list.h:208
msgid "Specifies intentionally untracked files to ignore"
msgstr "Spécifie les fichiers non-suivis à ignorer intentionnellement"
-#: command-list.h:205
+#: command-list.h:209
+msgid "Map author/committer names and/or E-Mail addresses"
+msgstr ""
+"Fait correspondre les noms d'auteur/validateur avec les adresses de courriel"
+
+#: command-list.h:210
msgid "Defining submodule properties"
msgstr "Définition des propriétés de sous-module"
-#: command-list.h:206
+#: command-list.h:211
msgid "Git namespaces"
msgstr "Espaces de nom de Git"
-#: command-list.h:207
+#: command-list.h:212
+msgid "Helper programs to interact with remote repositories"
+msgstr "Programmes assistants pour interagir avec des dépôts distants"
+
+#: command-list.h:213
msgid "Git Repository Layout"
msgstr "Disposition d'un dépôt Git"
-#: command-list.h:208
+#: command-list.h:214
msgid "Specifying revisions and ranges for Git"
msgstr "Spécification des révisions et portées pour Git"
-#: command-list.h:209
+#: command-list.h:215
msgid "Mounting one repository inside another"
msgstr "Montage d'un dépôt dans un autre dépôt"
-#: command-list.h:210
+#: command-list.h:216
msgid "A tutorial introduction to Git: part two"
msgstr "Une introduction pratique à Git : deuxième partie"
-#: command-list.h:211
+#: command-list.h:217
msgid "A tutorial introduction to Git"
msgstr "Une introduction pratique à Git"
-#: command-list.h:212
+#: command-list.h:218
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
-#, sh-format
-msgid "Bad rev input: $arg"
-msgstr "Mauvaise révision en entrée : $arg"
-
-#: git-bisect.sh:121
-#, sh-format
-msgid "Bad rev input: $bisected_head"
-msgstr "Mauvaise révision en entrée : $bisected_head"
-
-#: git-bisect.sh:130
-#, sh-format
-msgid "Bad rev input: $rev"
-msgstr "Mauvaise révision en entrée : $rev"
-
-#: git-bisect.sh:139
-#, 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
-msgid "No logfile given"
-msgstr "Pas de fichier de log donné"
-
-#: git-bisect.sh:210
-#, sh-format
-msgid "cannot read $file for replaying"
-msgstr "impossible de lire $file pour rejouer"
-
-#: git-bisect.sh:232
-msgid "?? what are you talking about?"
-msgstr "?? de quoi parlez-vous ?"
-
-#: git-bisect.sh:241
+#: git-bisect.sh:68
msgid "bisect run failed: no command provided."
msgstr "la bissection a échoué : aucune commande fournie."
-#: git-bisect.sh:246
+#: git-bisect.sh:73
#, sh-format
msgid "running $command"
msgstr "lancement de $command"
-#: git-bisect.sh:253
+#: git-bisect.sh:80
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -23592,27 +25057,23 @@
"la bissection a échoué :\n"
"le code retour $res de '$command' est < 0 ou >= 128"
-#: git-bisect.sh:279
+#: git-bisect.sh:105
msgid "bisect run cannot continue any more"
msgstr "la bissection ne peut plus continuer"
-#: git-bisect.sh:285
+#: git-bisect.sh:111
#, sh-format
msgid ""
"bisect run failed:\n"
-"'bisect_state $state' exited with error code $res"
+"'bisect-state $state' exited with error code $res"
msgstr ""
"la bissection a échoué :\n"
-"'bisect_state $state' a retourné le code erreur $res"
+"'bisect-state $state' a retourné le code erreur $res"
-#: git-bisect.sh:292
+#: git-bisect.sh:118
msgid "bisect run success"
msgstr "succès de la bissection"
-#: git-bisect.sh:300
-msgid "We are not bisecting."
-msgstr "Pas de bissection en cours."
-
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
@@ -23653,133 +25114,50 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "La fusion simple a échoué, essai avec la fusion automatique."
-#: git-legacy-stash.sh:221
-msgid "Cannot remove temporary index (can't happen)"
-msgstr "Impossible de supprimer l'index temporaire (ne peut pas se produire)"
-
-#: git-legacy-stash.sh:272
-#, sh-format
-msgid "Cannot update $ref_stash with $w_commit"
-msgstr "Impossible de mettre à jour $ref_stash avec $w_commit"
-
-#: git-legacy-stash.sh:324
-#, sh-format
-msgid "error: unknown option for 'stash push': $option"
-msgstr "erreur : option inconnue pour 'stash push' : $option"
-
-#: git-legacy-stash.sh:356
-#, sh-format
-msgid "Saved working directory and index state $stash_msg"
-msgstr "Copie de travail et état de l'index sauvegardés dans $stash_msg"
-
-#: git-legacy-stash.sh:536
-#, sh-format
-msgid "unknown option: $opt"
-msgstr "option inconnue : $opt"
-
-#: git-legacy-stash.sh:556
-#, sh-format
-msgid "Too many revisions specified: $REV"
-msgstr "Trop de révisions spécifiées : $REV"
-
-#: git-legacy-stash.sh:571
-#, sh-format
-msgid "$reference is not a valid reference"
-msgstr "$reference n'est pas une référence valide"
-
-#: git-legacy-stash.sh:599
-#, sh-format
-msgid "'$args' is not a stash-like commit"
-msgstr "'$args' n'est pas une validation de type remisage"
-
-#: git-legacy-stash.sh:610
-#, sh-format
-msgid "'$args' is not a stash reference"
-msgstr "'$args' n'est pas une référence de remisage"
-
-#: git-legacy-stash.sh:618
-msgid "unable to refresh index"
-msgstr "impossible de rafraîchir l'index"
-
-#: git-legacy-stash.sh:622
-msgid "Cannot apply a stash in the middle of a merge"
-msgstr "Impossible d'appliquer un remisage en cours de fusion"
-
-#: git-legacy-stash.sh:630
-msgid "Conflicts in index. Try without --index."
-msgstr "Conflits dans l'index. Essayez sans --index."
-
-#: git-legacy-stash.sh:632
-msgid "Could not save index tree"
-msgstr "Impossible de sauvegarder l'arbre d'index"
-
-#: git-legacy-stash.sh:641
-msgid "Could not restore untracked files from stash entry"
-msgstr ""
-"Impossible de restaurer les fichiers non-suivis depuis l'entrée de remisage"
-
-#: git-legacy-stash.sh:666
-msgid "Cannot unstage modified files"
-msgstr "Impossible de désindexer les fichiers modifiés"
-
-#: git-legacy-stash.sh:704
-#, sh-format
-msgid "Dropped ${REV} ($s)"
-msgstr "${REV} supprimé ($s)"
-
-#: git-legacy-stash.sh:705
-#, sh-format
-msgid "${REV}: Could not drop stash entry"
-msgstr "${REV}: Impossible de supprimer l'entrée de stash"
-
-#: git-legacy-stash.sh:792
-msgid "(To restore them type \"git stash apply\")"
-msgstr "(Pour les restaurer tapez \"git stash apply\")"
-
-#: git-submodule.sh:203
+#: git-submodule.sh:179
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"Un chemin relatif ne peut être utilisé que depuis la racine de la copie de "
"travail"
-#: git-submodule.sh:213
+#: git-submodule.sh:189
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "L'URL de dépôt '$repo' doit être absolu ou commencer par ./|../"
-#: git-submodule.sh:232
+#: git-submodule.sh:208
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' existe déjà dans l'index"
-#: git-submodule.sh:235
+#: git-submodule.sh:211
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr "'$sm_path' existe déjà dans l'index et n'est pas un sous-module"
-#: git-submodule.sh:242
+#: git-submodule.sh:218
#, sh-format
msgid "'$sm_path' does not have a commit checked out"
msgstr "'$sm_path' n'a pas de commit extrait"
-#: git-submodule.sh:273
+#: git-submodule.sh:249
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Ajout du dépôt existant à '$sm_path' dans l'index"
-#: git-submodule.sh:275
+#: git-submodule.sh:251
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' existe déjà et n'est pas un dépôt git valide"
-#: git-submodule.sh:283
+#: git-submodule.sh:259
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
"Un répertoire git pour '$sm_name' est trouvé en local avec le(s) serveur(s) "
"distant(s) :"
-#: git-submodule.sh:285
+#: git-submodule.sh:261
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -23796,39 +25174,39 @@
"correct\n"
"ou si ceci n'est pas clair, choisissez un autre nom avec l'option '--name'."
-#: git-submodule.sh:291
+#: git-submodule.sh:267
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "Réactivation du répertoire git local pour le sous-module '$sm_name'."
-#: git-submodule.sh:303
+#: git-submodule.sh:279
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Impossible d'extraire le sous-module '$sm_path'"
-#: git-submodule.sh:308
+#: git-submodule.sh:284
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Échec d'ajout du sous-module '$sm_path'"
-#: git-submodule.sh:317
+#: git-submodule.sh:293
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Échec d'enregistrement du sous-module '$sm_path'"
-#: git-submodule.sh:590
+#: git-submodule.sh:568
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
"Impossible de trouver la révision courante dans le chemin de sous-module "
"'$displaypath'"
-#: git-submodule.sh:600
+#: git-submodule.sh:578
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Impossible de rapatrier dans le chemin de sous-module '$sm_path'"
-#: git-submodule.sh:605
+#: git-submodule.sh:583
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -23837,7 +25215,7 @@
"Impossible de trouver la révision courante ${remote_name}/${branch} dans le "
"chemin de sous-module '$sm_path'"
-#: git-submodule.sh:623
+#: git-submodule.sh:601
#, sh-format
msgid ""
"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
@@ -23846,7 +25224,7 @@
"Impossible de rapatrier dans le chemin de sous-module '$displaypath' ; essai "
"de rapatriement direct de $sha1 :"
-#: git-submodule.sh:629
+#: git-submodule.sh:607
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -23855,87 +25233,56 @@
"Chemin de sous-module '$displaypath' récupéré, mais il ne contenait pas "
"$sha1. La récupération directe de ce commit a échoué."
-#: git-submodule.sh:636
+#: git-submodule.sh:614
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
"Impossible d'extraire '$sha1' dans le chemin de sous-module '$displaypath'"
-#: git-submodule.sh:637
+#: git-submodule.sh:615
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait"
-#: git-submodule.sh:641
+#: git-submodule.sh:619
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
"Impossible de rebaser '$sha1' dans le chemin de sous-module '$displaypath'"
-#: git-submodule.sh:642
+#: git-submodule.sh:620
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : rebasé dans '$sha1'"
-#: git-submodule.sh:647
+#: git-submodule.sh:625
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
"Impossible de fusionner '$sha1' dans le chemin de sous-module '$displaypath'"
-#: git-submodule.sh:648
+#: git-submodule.sh:626
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : fusionné dans '$sha1'"
-#: git-submodule.sh:653
+#: git-submodule.sh:631
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"L'exécution de '$command $sha1' a échoué dans le chemin de sous-module "
"'$displaypath'"
-#: git-submodule.sh:654
+#: git-submodule.sh:632
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Chemin de sous-module '$displaypath' : '$command $sha1'"
-#: git-submodule.sh:685
+#: git-submodule.sh:663
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'"
-#: git-submodule.sh:896
-msgid "The --cached option cannot be used with the --files option"
-msgstr "L'option --cached ne peut pas être utilisée avec l'option --files"
-
-#: git-submodule.sh:948
-#, sh-format
-msgid "unexpected mode $mod_dst"
-msgstr "mode $mod_dst inattendu"
-
-#: git-submodule.sh:968
-#, sh-format
-msgid " Warn: $display_name doesn't contain commit $sha1_src"
-msgstr " Attention : $display_name ne contient pas la validation $sha1_src"
-
-#: git-submodule.sh:971
-#, sh-format
-msgid " Warn: $display_name doesn't contain commit $sha1_dst"
-msgstr " Attention : $display_name ne contient pas la validation $sha1_dst"
-
-#: git-submodule.sh:974
-#, 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."
-msgstr "Référez-vous à git-${cmd}(1) pour de plus amples détails."
-
#: git-rebase--preserve-merges.sh:109
msgid "Applied autostash."
msgstr "Autoremisage appliqué."
@@ -23945,12 +25292,22 @@
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"
@@ -23989,7 +25346,7 @@
"\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"
@@ -24008,83 +25365,83 @@
"\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"
@@ -24101,31 +25458,31 @@
"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"
@@ -24136,7 +25493,7 @@
"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"
@@ -24151,25 +25508,25 @@
"\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"
@@ -24200,12 +25557,12 @@
"\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."
@@ -24213,44 +25570,44 @@
"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:955
+#: 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: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 "Impossible d'initialiser les commits réécrits"
@@ -24327,14 +25684,14 @@
msgid "%12s %12s %s"
msgstr "%12s %s12s %s"
-#: git-add--interactive.perl:634
+#: git-add--interactive.perl:632
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] "%d chemin touché\n"
msgstr[1] "%d chemins touchés\n"
-#: git-add--interactive.perl:1053
+#: git-add--interactive.perl:1056
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
@@ -24342,7 +25699,7 @@
"Si le patch s'applique proprement, la section éditée sera\n"
"immédiatement marquée comme indexée."
-#: git-add--interactive.perl:1056
+#: git-add--interactive.perl:1059
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
@@ -24350,7 +25707,7 @@
"Si le patch s'applique proprement, la section éditée sera\n"
"immédiatement marquée comme remisée."
-#: git-add--interactive.perl:1059
+#: git-add--interactive.perl:1062
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
@@ -24358,8 +25715,8 @@
"Si le patch s'applique proprement, la section éditée sera\n"
"immédiatement marquée comme desindexée."
-#: git-add--interactive.perl:1062 git-add--interactive.perl:1071
-#: git-add--interactive.perl:1077
+#: git-add--interactive.perl:1065 git-add--interactive.perl:1074
+#: git-add--interactive.perl:1080
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
@@ -24367,8 +25724,8 @@
"Si le patch s'applique proprement, la section éditée sera\n"
"immédiatement marquée comme appliquée."
-#: git-add--interactive.perl:1065 git-add--interactive.perl:1068
-#: git-add--interactive.perl:1074
+#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
+#: git-add--interactive.perl:1077
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
@@ -24376,12 +25733,12 @@
"Si le patch s'applique proprement, la section éditée sera\n"
"immédiatement marquée comme éliminée."
-#: git-add--interactive.perl:1111
+#: git-add--interactive.perl:1114
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr "impossible d'ouvrir le fichier d'édition de section en écriture : %s"
-#: git-add--interactive.perl:1118
+#: git-add--interactive.perl:1121
#, perl-format
msgid ""
"---\n"
@@ -24394,12 +25751,12 @@
"Pour éliminer les lignes '%s', effacez-les.\n"
"Les lignes commençant par %s seront éliminées.\n"
-#: git-add--interactive.perl:1140
+#: git-add--interactive.perl:1143
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr "échec de l'ouverture du fichier d'édition de section en lecture : %s"
-#: git-add--interactive.perl:1248
+#: git-add--interactive.perl:1251
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -24413,7 +25770,7 @@
"a - indexer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas indexer cette section ni les suivantes de ce fichier"
-#: git-add--interactive.perl:1254
+#: git-add--interactive.perl:1257
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -24427,7 +25784,7 @@
"a - remiser cette section et toutes les suivantes de ce fichier\n"
"d - ne pas remiser cette section ni les suivantes de ce fichier"
-#: git-add--interactive.perl:1260
+#: git-add--interactive.perl:1263
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -24441,7 +25798,7 @@
"a - désindexer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas désindexer cette section ni les suivantes de ce fichier"
-#: git-add--interactive.perl:1266
+#: git-add--interactive.perl:1269
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -24455,7 +25812,7 @@
"a - appliquer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas appliquer cette section ni les suivantes de ce fichier"
-#: git-add--interactive.perl:1272 git-add--interactive.perl:1290
+#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -24469,7 +25826,7 @@
"a - supprimer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas supprimer cette section ni les suivantes de ce fichier"
-#: git-add--interactive.perl:1278
+#: git-add--interactive.perl:1281
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -24483,7 +25840,7 @@
"a - éliminer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas éliminer cette section ni les suivantes de ce fichier"
-#: git-add--interactive.perl:1284
+#: git-add--interactive.perl:1287
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -24497,7 +25854,7 @@
"a - appliquer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas appliquer cette section ni les suivantes de ce fichier"
-#: git-add--interactive.perl:1296
+#: git-add--interactive.perl:1299
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -24511,7 +25868,7 @@
"a - appliquer cette section et toutes les suivantes de ce fichier\n"
"d - ne pas appliquer cette section ni les suivantes de ce fichier"
-#: git-add--interactive.perl:1311
+#: git-add--interactive.perl:1314
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -24533,86 +25890,91 @@
"e - éditer manuellement la section actuelle\n"
"? - afficher l'aide\n"
-#: git-add--interactive.perl:1342
+#: git-add--interactive.perl:1345
msgid "The selected hunks do not apply to the index!\n"
msgstr "Les sections sélectionnées ne s'applique pas à l'index !\n"
-#: git-add--interactive.perl:1357
+#: git-add--interactive.perl:1360
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "fichier non-fusionné ignoré : %s\n"
-#: git-add--interactive.perl:1468
+#: git-add--interactive.perl:1479
#, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Appliquer le changement de mode dans l'arbre de travail [y,n,q,a,d%s,?] ? "
-#: git-add--interactive.perl:1469
+#: git-add--interactive.perl:1480
#, perl-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
msgstr "Appliquer la suppression dans l'arbre de travail [y,n,q,a,d%s,?] ? "
-#: git-add--interactive.perl:1470
+#: git-add--interactive.perl:1481
+#, 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:1482
#, perl-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr "Appliquer la section à l'arbre de travail [y,n,q,a,d%s,?] ? "
-#: git-add--interactive.perl:1570
+#: git-add--interactive.perl:1599
msgid "No other hunks to goto\n"
msgstr "Aucune autre section à atteindre\n"
-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1617
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Nombre invalide : '%s'\n"
-#: git-add--interactive.perl:1593
+#: git-add--interactive.perl:1622
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "Désolé, %d seule section disponible.\n"
msgstr[1] "Désolé, Seulement %d sections disponibles.\n"
-#: git-add--interactive.perl:1619
+#: git-add--interactive.perl:1657
msgid "No other hunks to search\n"
msgstr "aucune autre section à rechercher\n"
-#: git-add--interactive.perl:1636
+#: git-add--interactive.perl:1674
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Regex de recherche malformée %s : %s\n"
-#: git-add--interactive.perl:1646
+#: git-add--interactive.perl:1684
msgid "No hunk matches the given pattern\n"
msgstr "Aucune section ne correspond au motif donné\n"
-#: git-add--interactive.perl:1658 git-add--interactive.perl:1680
+#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
msgid "No previous hunk\n"
msgstr "Pas de section précédente\n"
-#: git-add--interactive.perl:1667 git-add--interactive.perl:1686
+#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
msgid "No next hunk\n"
msgstr "Pas de section suivante\n"
-#: git-add--interactive.perl:1692
+#: git-add--interactive.perl:1730
msgid "Sorry, cannot split this hunk\n"
msgstr "Désolé, impossible de découper cette section\n"
-#: git-add--interactive.perl:1698
+#: git-add--interactive.perl:1736
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "Découpée en %d section.\n"
msgstr[1] "Découpée en %d sections.\n"
-#: git-add--interactive.perl:1708
+#: git-add--interactive.perl:1746
msgid "Sorry, cannot edit this hunk\n"
msgstr "Désolé, impossible d'éditer cette section\n"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1773
+#: git-add--interactive.perl:1811
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
@@ -24630,19 +25992,19 @@
"diff - visualiser les diff entre HEAD et l'index\n"
"add untracked - ajouter les fichiers non-suivis aux modifications à indexer\n"
-#: git-add--interactive.perl:1790 git-add--interactive.perl:1795
-#: git-add--interactive.perl:1798 git-add--interactive.perl:1805
-#: git-add--interactive.perl:1808 git-add--interactive.perl:1815
-#: git-add--interactive.perl:1819 git-add--interactive.perl:1825
+#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
+#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
+#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
+#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
msgid "missing --"
msgstr "-- manquant"
-#: git-add--interactive.perl:1821
+#: git-add--interactive.perl:1866
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "mode de --patch inconnu : %s"
-#: git-add--interactive.perl:1827 git-add--interactive.perl:1833
+#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "argument invalide %s, -- attendu"
@@ -24660,27 +26022,39 @@
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"
@@ -24688,39 +26062,39 @@
"`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"
@@ -24735,12 +26109,12 @@
" * 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"
@@ -24749,7 +26123,7 @@
"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"
@@ -24759,17 +26133,17 @@
"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"
@@ -24783,27 +26157,27 @@
"\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"
@@ -24811,11 +26185,11 @@
"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"
@@ -24828,22 +26202,22 @@
"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"
@@ -24851,16 +26225,16 @@
#. 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"
@@ -24887,130 +26261,155 @@
#. 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 "repository contains replace objects; skipping commit-graph"
+#~ msgstr ""
+#~ "le dépôt contient des object de remplacement ; saut du graphe de commits"
+
+#~ msgid "repository contains (deprecated) grafts; skipping commit-graph"
+#~ msgstr ""
+#~ "le dépôt contient des greffes (déconseillées) ; saut du graphe de commits"
+
+#~ msgid "repository is shallow; skipping commit-graph"
+#~ msgstr "le dépôt est superficiel ; saut du graphe de commit"
+
+#, c-format
+#~ msgid "commit-graph improper chunk offset %08x%08x"
+#~ msgstr "décalage de bloc %08x%08x du graphe de commit inadéquat"
+
+#, 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"
+
+#~ msgid "invalid chunk offset (too large)"
+#~ msgstr "décalage de section invalide (trop grand)"
+
+#~ msgid "Writing chunks to multi-pack-index"
+#~ msgstr "Écriture des sections dans l'index multi-paquet"
diff --git a/po/git.pot b/po/git.pot
index 7dd2e2b..ee9ba62 100644
--- a/po/git.pot
+++ b/po/git.pot
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2020-03-11 15:26+0800\n"
+"POT-Creation-Date: 2021-03-04 22:41+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,238 +18,243 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: add-interactive.c:368
+#: add-interactive.c:376
#, c-format
msgid "Huh (%s)?"
msgstr ""
-#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124
-#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687
-#: builtin/rebase.c:2086 builtin/rebase.c:2130
+#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292
+#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538
+#: builtin/rebase.c:1963
msgid "could not read index"
msgstr ""
-#: add-interactive.c:576 git-add--interactive.perl:269
+#: add-interactive.c:584 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr ""
-#: add-interactive.c:634 git-add--interactive.perl:278
+#: add-interactive.c:642 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr ""
-#: add-interactive.c:635 git-add--interactive.perl:314
+#: add-interactive.c:643 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr ""
-#: add-interactive.c:672 git-add--interactive.perl:643
+#: add-interactive.c:680 git-add--interactive.perl:641
msgid "Update"
msgstr ""
-#: add-interactive.c:689 add-interactive.c:877
+#: add-interactive.c:697 add-interactive.c:885
#, c-format
msgid "could not stage '%s'"
msgstr ""
-#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317
-#: builtin/rebase.c:899
+#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486
msgid "could not write index"
msgstr ""
-#: add-interactive.c:698 git-add--interactive.perl:628
+#: add-interactive.c:706 git-add--interactive.perl:626
#, 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
+#: add-interactive.c:724 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr ""
-#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281
-#: builtin/reset.c:144
+#: add-interactive.c:729 apply.c:4125 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
+#: add-interactive.c:759 git-add--interactive.perl:653
msgid "Revert"
msgstr ""
-#: add-interactive.c:767
+#: add-interactive.c:775
msgid "Could not parse HEAD^{tree}"
msgstr ""
-#: add-interactive.c:805 git-add--interactive.perl:631
+#: add-interactive.c:813 git-add--interactive.perl:629
#, 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
+#: add-interactive.c:864 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr ""
-#: add-interactive.c:860 git-add--interactive.perl:689
+#: add-interactive.c:868 git-add--interactive.perl:687
msgid "Add untracked"
msgstr ""
-#: add-interactive.c:887 git-add--interactive.perl:625
+#: add-interactive.c:895 git-add--interactive.perl:623
#, c-format, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: add-interactive.c:917
+#: add-interactive.c:925
#, c-format
msgid "ignoring unmerged: %s"
msgstr ""
-#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366
+#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369
#, c-format
msgid "Only binary files changed.\n"
msgstr ""
-#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368
+#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371
#, c-format
msgid "No changes.\n"
msgstr ""
-#: add-interactive.c:935 git-add--interactive.perl:1376
+#: add-interactive.c:943 git-add--interactive.perl:1379
msgid "Patch update"
msgstr ""
-#: add-interactive.c:974 git-add--interactive.perl:1754
+#: add-interactive.c:982 git-add--interactive.perl:1792
msgid "Review diff"
msgstr ""
-#: add-interactive.c:1002
+#: add-interactive.c:1010
msgid "show paths with changes"
msgstr ""
-#: add-interactive.c:1004
+#: add-interactive.c:1012
msgid "add working tree state to the staged set of changes"
msgstr ""
-#: add-interactive.c:1006
+#: add-interactive.c:1014
msgid "revert staged set of changes back to the HEAD version"
msgstr ""
-#: add-interactive.c:1008
+#: add-interactive.c:1016
msgid "pick hunks and update selectively"
msgstr ""
-#: add-interactive.c:1010
+#: add-interactive.c:1018
msgid "view diff between HEAD and index"
msgstr ""
-#: add-interactive.c:1012
+#: add-interactive.c:1020
msgid "add contents of untracked files to the staged set of changes"
msgstr ""
-#: add-interactive.c:1020 add-interactive.c:1069
+#: add-interactive.c:1028 add-interactive.c:1077
msgid "Prompt help:"
msgstr ""
-#: add-interactive.c:1022
+#: add-interactive.c:1030
msgid "select a single item"
msgstr ""
-#: add-interactive.c:1024
+#: add-interactive.c:1032
msgid "select a range of items"
msgstr ""
-#: add-interactive.c:1026
+#: add-interactive.c:1034
msgid "select multiple ranges"
msgstr ""
-#: add-interactive.c:1028 add-interactive.c:1073
+#: add-interactive.c:1036 add-interactive.c:1081
msgid "select item based on unique prefix"
msgstr ""
-#: add-interactive.c:1030
+#: add-interactive.c:1038
msgid "unselect specified items"
msgstr ""
-#: add-interactive.c:1032
+#: add-interactive.c:1040
msgid "choose all items"
msgstr ""
-#: add-interactive.c:1034
+#: add-interactive.c:1042
msgid "(empty) finish selecting"
msgstr ""
-#: add-interactive.c:1071
+#: add-interactive.c:1079
msgid "select a numbered item"
msgstr ""
-#: add-interactive.c:1075
+#: add-interactive.c:1083
msgid "(empty) select nothing"
msgstr ""
-#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851
+#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
msgid "*** Commands ***"
msgstr ""
-#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848
+#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
msgid "What now"
msgstr ""
-#: add-interactive.c:1136 git-add--interactive.perl:213
+#: add-interactive.c:1144 git-add--interactive.perl:213
msgid "staged"
msgstr ""
-#: add-interactive.c:1136 git-add--interactive.perl:213
+#: add-interactive.c:1144 git-add--interactive.perl:213
msgid "unstaged"
msgstr ""
-#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251
-#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144
-#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409
-#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
-#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
-#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
+#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257
+#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124
+#: builtin/fetch.c:150 builtin/merge.c:285 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
+#: add-interactive.c:1151
msgid "could not refresh index"
msgstr ""
-#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765
+#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803
#, c-format
msgid "Bye.\n"
msgstr ""
-#: add-patch.c:33 git-add--interactive.perl:1428
+#: add-patch.c:34 git-add--interactive.perl:1431
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:34 git-add--interactive.perl:1429
+#: add-patch.c:35 git-add--interactive.perl:1432
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:35 git-add--interactive.perl:1430
+#: add-patch.c:36 git-add--interactive.perl:1433
+#, c-format, perl-format
+msgid "Stage addition [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:37 git-add--interactive.perl:1434
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:37
+#: add-patch.c:39
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"staging."
msgstr ""
-#: add-patch.c:40
+#: add-patch.c:42
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -258,28 +263,33 @@
"d - do not stage this hunk or any of the later hunks in the file\n"
msgstr ""
-#: add-patch.c:54 git-add--interactive.perl:1433
+#: add-patch.c:56 git-add--interactive.perl:1437
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:55 git-add--interactive.perl:1434
+#: add-patch.c:57 git-add--interactive.perl:1438
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:56 git-add--interactive.perl:1435
+#: add-patch.c:58 git-add--interactive.perl:1439
+#, c-format, perl-format
+msgid "Stash addition [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:59 git-add--interactive.perl:1440
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:58
+#: add-patch.c:61
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"stashing."
msgstr ""
-#: add-patch.c:61
+#: add-patch.c:64
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -288,28 +298,33 @@
"d - do not stash this hunk or any of the later hunks in the file\n"
msgstr ""
-#: add-patch.c:77 git-add--interactive.perl:1438
+#: add-patch.c:80 git-add--interactive.perl:1443
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:78 git-add--interactive.perl:1439
+#: add-patch.c:81 git-add--interactive.perl:1444
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:79 git-add--interactive.perl:1440
+#: add-patch.c:82 git-add--interactive.perl:1445
+#, c-format, perl-format
+msgid "Unstage addition [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:83 git-add--interactive.perl:1446
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:81
+#: add-patch.c:85
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"unstaging."
msgstr ""
-#: add-patch.c:84
+#: add-patch.c:88
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -318,28 +333,33 @@
"d - do not unstage this hunk or any of the later hunks in the file\n"
msgstr ""
-#: add-patch.c:99 git-add--interactive.perl:1443
+#: add-patch.c:103 git-add--interactive.perl:1449
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:100 git-add--interactive.perl:1444
+#: add-patch.c:104 git-add--interactive.perl:1450
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:101 git-add--interactive.perl:1445
+#: add-patch.c:105 git-add--interactive.perl:1451
+#, c-format, perl-format
+msgid "Apply addition to index [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:106 git-add--interactive.perl:1452
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:103 add-patch.c:168 add-patch.c:211
+#: 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:106
+#: add-patch.c:111
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -348,31 +368,37 @@
"d - do not apply this hunk or any of the later hunks in the file\n"
msgstr ""
-#: add-patch.c:121 git-add--interactive.perl:1448
-#: git-add--interactive.perl:1463
+#: add-patch.c:126 git-add--interactive.perl:1455
+#: git-add--interactive.perl:1473
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:122 git-add--interactive.perl:1449
-#: git-add--interactive.perl:1464
+#: add-patch.c:127 git-add--interactive.perl:1456
+#: git-add--interactive.perl:1474
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:123 git-add--interactive.perl:1450
-#: git-add--interactive.perl:1465
+#: add-patch.c:128 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
+#, c-format, perl-format
+msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:129 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:125 add-patch.c:147 add-patch.c:190
+#: 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:128 add-patch.c:193
+#: 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"
@@ -381,22 +407,27 @@
"d - do not discard this hunk or any of the later hunks in the file\n"
msgstr ""
-#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#, 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:1464
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:150
+#: 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"
@@ -405,22 +436,27 @@
"d - do not discard this hunk or any of the later hunks in the file\n"
msgstr ""
-#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#, 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:1470
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: add-patch.c:171
+#: 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"
@@ -429,7 +465,7 @@
"d - do not apply this hunk or any of the later hunks in the file\n"
msgstr ""
-#: add-patch.c:214
+#: add-patch.c:224
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -438,47 +474,47 @@
"d - do not apply this hunk or any of the later hunks in the file\n"
msgstr ""
-#: add-patch.c:318
+#: add-patch.c:342
#, c-format
msgid "could not parse hunk header '%.*s'"
msgstr ""
-#: add-patch.c:337 add-patch.c:341
+#: add-patch.c:361 add-patch.c:365
#, c-format
msgid "could not parse colored hunk header '%.*s'"
msgstr ""
-#: add-patch.c:395
+#: add-patch.c:419
msgid "could not parse diff"
msgstr ""
-#: add-patch.c:414
+#: add-patch.c:438
msgid "could not parse colored diff"
msgstr ""
-#: add-patch.c:428
+#: add-patch.c:452
#, c-format
msgid "failed to run '%s'"
msgstr ""
-#: add-patch.c:587
+#: add-patch.c:611
msgid "mismatched output from interactive.diffFilter"
msgstr ""
-#: add-patch.c:588
+#: 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:761
+#: add-patch.c:790
#, c-format
msgid ""
"expected context line #%d in\n"
"%.*s"
msgstr ""
-#: add-patch.c:776
+#: add-patch.c:805
#, c-format
msgid ""
"hunks do not overlap:\n"
@@ -487,11 +523,11 @@
"%.*s"
msgstr ""
-#: add-patch.c:1052 git-add--interactive.perl:1112
+#: add-patch.c:1081 git-add--interactive.perl:1115
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr ""
-#: add-patch.c:1056
+#: add-patch.c:1085
#, c-format
msgid ""
"---\n"
@@ -501,18 +537,18 @@
msgstr ""
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1070 git-add--interactive.perl:1126
+#: add-patch.c:1099 git-add--interactive.perl:1129
msgid ""
"If it does not apply cleanly, you will be given an opportunity to\n"
"edit again. If all lines of the hunk are removed, then the edit is\n"
"aborted and the hunk is left unchanged.\n"
msgstr ""
-#: add-patch.c:1103
+#: add-patch.c:1132
msgid "could not parse hunk header"
msgstr ""
-#: add-patch.c:1148
+#: add-patch.c:1177
msgid "'git apply --cached' failed"
msgstr ""
@@ -528,24 +564,24 @@
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1218 git-add--interactive.perl:1239
+#: add-patch.c:1246 git-add--interactive.perl:1242
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
-#: add-patch.c:1261
+#: add-patch.c:1289
msgid "The selected hunks do not apply to the index!"
msgstr ""
-#: add-patch.c:1262 git-add--interactive.perl:1343
+#: add-patch.c:1290 git-add--interactive.perl:1346
msgid "Apply them to the worktree anyway? "
msgstr ""
-#: add-patch.c:1269 git-add--interactive.perl:1346
+#: add-patch.c:1297 git-add--interactive.perl:1349
msgid "Nothing was applied.\n"
msgstr ""
-#: add-patch.c:1326
+#: add-patch.c:1354
msgid ""
"j - leave this hunk undecided, see next undecided hunk\n"
"J - leave this hunk undecided, see next hunk\n"
@@ -558,125 +594,132 @@
"? - print help\n"
msgstr ""
-#: add-patch.c:1447 add-patch.c:1457
+#: add-patch.c:1516 add-patch.c:1526
msgid "No previous hunk"
msgstr ""
-#: add-patch.c:1452 add-patch.c:1462
+#: add-patch.c:1521 add-patch.c:1531
msgid "No next hunk"
msgstr ""
-#: add-patch.c:1468
+#: add-patch.c:1537
msgid "No other hunks to goto"
msgstr ""
-#: add-patch.c:1479 git-add--interactive.perl:1577
+#: add-patch.c:1548 git-add--interactive.perl:1606
msgid "go to which hunk (<ret> to see more)? "
msgstr ""
-#: add-patch.c:1480 git-add--interactive.perl:1579
+#: add-patch.c:1549 git-add--interactive.perl:1608
msgid "go to which hunk? "
msgstr ""
-#: add-patch.c:1491
+#: add-patch.c:1560
#, c-format
msgid "Invalid number: '%s'"
msgstr ""
-#: add-patch.c:1496
+#: add-patch.c:1565
#, c-format
msgid "Sorry, only %d hunk available."
msgid_plural "Sorry, only %d hunks available."
msgstr[0] ""
msgstr[1] ""
-#: add-patch.c:1505
+#: add-patch.c:1574
msgid "No other hunks to search"
msgstr ""
-#: add-patch.c:1511 git-add--interactive.perl:1623
+#: add-patch.c:1580 git-add--interactive.perl:1661
msgid "search for regex? "
msgstr ""
-#: add-patch.c:1526
+#: add-patch.c:1595
#, c-format
msgid "Malformed search regexp %s: %s"
msgstr ""
-#: add-patch.c:1543
+#: add-patch.c:1612
msgid "No hunk matches the given pattern"
msgstr ""
-#: add-patch.c:1550
+#: add-patch.c:1619
msgid "Sorry, cannot split this hunk"
msgstr ""
-#: add-patch.c:1554
+#: add-patch.c:1623
#, c-format
msgid "Split into %d hunks."
msgstr ""
-#: add-patch.c:1558
+#: add-patch.c:1627
msgid "Sorry, cannot edit this hunk"
msgstr ""
-#: add-patch.c:1609
+#: add-patch.c:1679
msgid "'git apply' failed"
msgstr ""
-#: advice.c:115
+#: advice.c:143
+#, c-format
+msgid ""
+"\n"
+"Disable this message with \"git config advice.%s false\""
+msgstr ""
+
+#: advice.c:159
#, c-format
msgid "%shint: %.*s%s\n"
msgstr ""
-#: advice.c:168
+#: advice.c:250
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
-#: advice.c:170
+#: advice.c:252
msgid "Committing is not possible because you have unmerged files."
msgstr ""
-#: advice.c:172
+#: advice.c:254
msgid "Merging is not possible because you have unmerged files."
msgstr ""
-#: advice.c:174
+#: advice.c:256
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
-#: advice.c:176
+#: advice.c:258
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
-#: advice.c:178
+#: advice.c:260
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr ""
-#: advice.c:186
+#: advice.c:268
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
msgstr ""
-#: advice.c:194
+#: advice.c:276
msgid "Exiting because of an unresolved conflict."
msgstr ""
-#: advice.c:199 builtin/merge.c:1335
+#: advice.c:281 builtin/merge.c:1370
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
-#: advice.c:201
+#: advice.c:283
msgid "Please, commit your changes before merging."
msgstr ""
-#: advice.c:202
+#: advice.c:284
msgid "Exiting because of unfinished merge."
msgstr ""
-#: advice.c:208
+#: advice.c:290
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -936,7 +979,8 @@
msgid "cannot checkout %s"
msgstr ""
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:86 pack-revindex.c:213
+#: setup.c:308
#, c-format
msgid "failed to read %s"
msgstr ""
@@ -956,7 +1000,7 @@
msgid "%s: does not exist in index"
msgstr ""
-#: apply.c:3537 apply.c:3708
+#: apply.c:3537 apply.c:3708 apply.c:3952
#, c-format
msgid "%s: does not match index"
msgstr ""
@@ -1004,315 +1048,359 @@
msgid "%s has type %o, expected %o"
msgstr ""
-#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856
-#: read-cache.c:1325
+#: apply.c: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:3936
+#: apply.c:3950
#, c-format
msgid "%s: already exists in index"
msgstr ""
-#: apply.c:3939
+#: apply.c:3954
#, c-format
msgid "%s: already exists in working directory"
msgstr ""
-#: apply.c:3959
+#: apply.c:3974
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr ""
-#: apply.c:3964
+#: apply.c:3979
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
-#: apply.c:3984
+#: apply.c:3999
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr ""
-#: apply.c:3988
+#: apply.c:4003
#, c-format
msgid "%s: patch does not apply"
msgstr ""
-#: apply.c:4003
+#: apply.c:4018
#, c-format
msgid "Checking patch %s..."
msgstr ""
-#: apply.c:4095
+#: apply.c:4110
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
-#: apply.c:4102
+#: apply.c:4117
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr ""
-#: apply.c:4105
+#: apply.c:4120
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr ""
-#: apply.c:4114
+#: apply.c:4129
#, c-format
msgid "could not add %s to temporary index"
msgstr ""
-#: apply.c:4124
+#: apply.c:4139
#, c-format
msgid "could not write temporary index to %s"
msgstr ""
-#: apply.c:4262
+#: apply.c:4277
#, c-format
msgid "unable to remove %s from index"
msgstr ""
-#: apply.c:4296
+#: apply.c:4311
#, c-format
msgid "corrupt patch for submodule %s"
msgstr ""
-#: apply.c:4302
+#: apply.c:4317
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
-#: apply.c:4310
+#: apply.c:4325
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
-#: apply.c:4316 apply.c:4461
+#: apply.c:4331 apply.c:4476
#, c-format
msgid "unable to add cache entry for %s"
msgstr ""
-#: apply.c:4359
+#: apply.c:4374 builtin/bisect--helper.c:523
#, c-format
msgid "failed to write to '%s'"
msgstr ""
-#: apply.c:4363
+#: apply.c:4378
#, c-format
msgid "closing file '%s'"
msgstr ""
-#: apply.c:4433
+#: apply.c:4448
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr ""
-#: apply.c:4531
+#: apply.c:4546
#, c-format
msgid "Applied patch %s cleanly."
msgstr ""
-#: apply.c:4539
+#: apply.c:4554
msgid "internal error"
msgstr ""
-#: apply.c:4542
+#: apply.c:4557
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4553
+#: apply.c:4568
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ""
-#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201
+#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334
#, c-format
msgid "cannot open %s"
msgstr ""
-#: apply.c:4575
+#: apply.c:4590
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr ""
-#: apply.c:4579
+#: apply.c:4594
#, c-format
msgid "Rejected hunk #%d."
msgstr ""
-#: apply.c:4698
+#: apply.c:4718
#, c-format
msgid "Skipped patch '%s'."
msgstr ""
-#: apply.c:4706
+#: apply.c:4726
msgid "unrecognized input"
msgstr ""
-#: apply.c:4726
+#: apply.c:4746
msgid "unable to read index file"
msgstr ""
-#: apply.c:4883
+#: apply.c:4903
#, c-format
msgid "can't open patch '%s': %s"
msgstr ""
-#: apply.c:4910
+#: apply.c:4930
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4916 apply.c:4931
+#: apply.c:4936 apply.c:4951
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4924
+#: apply.c:4944
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406
+#: apply.c:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406
msgid "Unable to write new index file"
msgstr ""
-#: apply.c:4968
+#: apply.c:4988
msgid "don't apply changes matching the given path"
msgstr ""
-#: apply.c:4971
+#: apply.c:4991
msgid "apply changes matching the given path"
msgstr ""
-#: apply.c:4973 builtin/am.c:2260
+#: apply.c:4993 builtin/am.c:2266
msgid "num"
msgstr ""
-#: apply.c:4974
+#: apply.c:4994
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
-#: apply.c:4977
+#: apply.c:4997
msgid "ignore additions made by the patch"
msgstr ""
-#: apply.c:4979
+#: apply.c:4999
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
-#: apply.c:4983
+#: apply.c:5003
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
-#: apply.c:4985
+#: apply.c:5005
msgid "instead of applying the patch, output a summary for the input"
msgstr ""
-#: apply.c:4987
+#: apply.c:5007
msgid "instead of applying the patch, see if the patch is applicable"
msgstr ""
-#: apply.c:4989
+#: apply.c:5009
msgid "make sure the patch is applicable to the current index"
msgstr ""
-#: apply.c:4991
+#: apply.c:5011
msgid "mark new files with `git add --intent-to-add`"
msgstr ""
-#: apply.c:4993
+#: apply.c:5013
msgid "apply a patch without touching the working tree"
msgstr ""
-#: apply.c:4995
+#: apply.c:5015
msgid "accept a patch that touches outside the working area"
msgstr ""
-#: apply.c:4998
+#: apply.c:5018
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
-#: apply.c:5000
+#: apply.c:5020
msgid "attempt three-way merge if a patch does not apply"
msgstr ""
-#: apply.c:5002
+#: apply.c:5022
msgid "build a temporary index based on embedded index information"
msgstr ""
-#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540
msgid "paths are separated with NUL character"
msgstr ""
-#: apply.c:5007
+#: apply.c:5027
msgid "ensure at least <n> lines of context match"
msgstr ""
-#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98
+#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98
#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3457 builtin/rebase.c:1508
+#: builtin/pack-objects.c:3577 builtin/rebase.c:1352
msgid "action"
msgstr ""
-#: apply.c:5009
+#: apply.c:5029
msgid "detect new or modified lines that have whitespace errors"
msgstr ""
-#: apply.c:5012 apply.c:5015
+#: apply.c:5032 apply.c:5035
msgid "ignore changes in whitespace when finding context"
msgstr ""
-#: apply.c:5018
+#: apply.c:5038
msgid "apply the patch in reverse"
msgstr ""
-#: apply.c:5020
+#: apply.c:5040
msgid "don't expect at least one line of context"
msgstr ""
-#: apply.c:5022
+#: apply.c:5042
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr ""
-#: apply.c:5024
+#: apply.c:5044
msgid "allow overlapping hunks"
msgstr ""
-#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22
-#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774
-#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22
+#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757
+#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr ""
-#: apply.c:5027
+#: apply.c:5047
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
-#: apply.c:5030
+#: apply.c:5050
msgid "do not trust the line counts in the hunk headers"
msgstr ""
-#: apply.c:5032 builtin/am.c:2248
+#: apply.c:5052 builtin/am.c:2254
msgid "root"
msgstr ""
-#: apply.c:5033
+#: apply.c:5053
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:450
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr ""
+
+#: archive-tar.c:453
+msgid "unable to redirect descriptor"
+msgstr ""
+
+#: archive-tar.c:460
+#, 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 ""
@@ -1330,225 +1418,198 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr ""
-#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
-#, c-format
-msgid "pathspec '%s' did not match any files"
-msgstr ""
-
-#: archive.c:396
-#, c-format
-msgid "no such ref: %.*s"
-msgstr ""
-
-#: archive.c:401
-#, c-format
-msgid "not a valid object name: %s"
-msgstr ""
-
-#: archive.c:414
-#, c-format
-msgid "not a tree object: %s"
-msgstr ""
-
-#: archive.c:426
-msgid "current working directory is untracked"
-msgstr ""
-
-#: archive.c:457
-msgid "fmt"
-msgstr ""
-
-#: archive.c:457
-msgid "archive format"
-msgstr ""
-
-#: archive.c:458 builtin/log.c:1653
-msgid "prefix"
-msgstr ""
-
-#: archive.c:459
-msgid "prepend prefix to each pathname in the archive"
-msgstr ""
-
-#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
-#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
-#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887
-#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
-#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
-#: parse-options.h:190
-msgid "file"
-msgstr ""
-
-#: archive.c:461 builtin/archive.c:90
-msgid "write the archive to this file"
-msgstr ""
-
-#: archive.c:463
-msgid "read .gitattributes in working directory"
-msgstr ""
-
-#: archive.c:464
-msgid "report archived files on stderr"
-msgstr ""
-
-#: archive.c:465
-msgid "store only"
-msgstr ""
-
-#: archive.c:466
-msgid "compress faster"
-msgstr ""
-
-#: archive.c:474
-msgid "compress better"
-msgstr ""
-
-#: archive.c:477
-msgid "list supported archive formats"
-msgstr ""
-
-#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
-#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
-msgid "repo"
-msgstr ""
-
-#: archive.c:480 builtin/archive.c:92
-msgid "retrieve the archive from remote repository <repo>"
-msgstr ""
-
-#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
-#: builtin/notes.c:498
-msgid "command"
-msgstr ""
-
-#: archive.c:482 builtin/archive.c:94
-msgid "path to the remote git-upload-archive command"
-msgstr ""
-
-#: archive.c:489
-msgid "Unexpected option --remote"
-msgstr ""
-
-#: archive.c:491
-msgid "Option --exec can only be used together with --remote"
-msgstr ""
-
-#: archive.c:493
-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:351
-#, c-format
-msgid "cannot stream blob %s"
-msgstr ""
-
-#: archive-tar.c:266 archive-zip.c:369
-#, c-format
-msgid "unsupported file mode: 0%o (SHA1: %s)"
-msgstr ""
-
-#: archive-tar.c:293 archive-zip.c:359
+#: archive.c:192
#, c-format
msgid "cannot read %s"
msgstr ""
-#: archive-tar.c:465
+#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894
+#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786
+#: builtin/merge.c:1139
#, c-format
-msgid "unable to start '%s' filter"
+msgid "could not read '%s'"
msgstr ""
-#: archive-tar.c:468
-msgid "unable to redirect descriptor"
-msgstr ""
-
-#: archive-tar.c:475
+#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315
#, c-format
-msgid "'%s' filter reported error"
+msgid "pathspec '%s' did not match any files"
msgstr ""
-#: archive-zip.c:319
+#: archive.c:454
#, c-format
-msgid "path is not valid UTF-8: %s"
+msgid "no such ref: %.*s"
msgstr ""
-#: archive-zip.c:323
+#: archive.c:460
#, c-format
-msgid "path too long (%d chars, SHA1: %s): %s"
+msgid "not a valid object name: %s"
msgstr ""
-#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
+#: archive.c:473
#, c-format
-msgid "deflate error (%d)"
+msgid "not a tree object: %s"
msgstr ""
-#: archive-zip.c:615
+#: archive.c:485
+msgid "current working directory is untracked"
+msgstr ""
+
+#: archive.c:526
#, c-format
-msgid "timestamp too large for this system: %<PRIuMAX>"
+msgid "File not found: %s"
msgstr ""
-#: attr.c:212
+#: archive.c:528
+#, c-format
+msgid "Not a regular file: %s"
+msgstr ""
+
+#: archive.c:555
+msgid "fmt"
+msgstr ""
+
+#: archive.c:555
+msgid "archive format"
+msgstr ""
+
+#: archive.c:556 builtin/log.c:1764
+msgid "prefix"
+msgstr ""
+
+#: archive.c:557
+msgid "prepend prefix to each pathname in the archive"
+msgstr ""
+
+#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888
+#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
+#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
+#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105
+#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412
+#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190
+msgid "file"
+msgstr ""
+
+#: archive.c:559
+msgid "add untracked file to archive"
+msgstr ""
+
+#: archive.c:562 builtin/archive.c:90
+msgid "write the archive to this file"
+msgstr ""
+
+#: archive.c:564
+msgid "read .gitattributes in working directory"
+msgstr ""
+
+#: archive.c:565
+msgid "report archived files on stderr"
+msgstr ""
+
+#: archive.c:567
+msgid "set compression level"
+msgstr ""
+
+#: archive.c:570
+msgid "list supported archive formats"
+msgstr ""
+
+#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117
+#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
+msgid "repo"
+msgstr ""
+
+#: archive.c:573 builtin/archive.c:92
+msgid "retrieve the archive from remote repository <repo>"
+msgstr ""
+
+#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714
+#: builtin/notes.c:498
+msgid "command"
+msgstr ""
+
+#: archive.c:575 builtin/archive.c:94
+msgid "path to the remote git-upload-archive command"
+msgstr ""
+
+#: archive.c:582
+msgid "Unexpected option --remote"
+msgstr ""
+
+#: archive.c:584
+msgid "Option --exec can only be used together with --remote"
+msgstr ""
+
+#: archive.c:586
+msgid "Unexpected option --output"
+msgstr ""
+
+#: archive.c:588
+msgid "Options --add-file and --remote cannot be used together"
+msgstr ""
+
+#: archive.c:610
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr ""
+
+#: archive.c:619
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr ""
+
+#: attr.c:202
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr ""
-#: attr.c:369
+#: attr.c:359
#, c-format
msgid "%s not allowed: %s:%d"
msgstr ""
-#: attr.c:409
+#: attr.c:399
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgstr ""
-#: bisect.c:468
+#: bisect.c:489
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr ""
-#: bisect.c:678
+#: bisect.c:699
#, c-format
msgid "We cannot bisect more!\n"
msgstr ""
-#: bisect.c:745
+#: bisect.c:766
#, c-format
msgid "Not a valid commit name %s"
msgstr ""
-#: bisect.c:770
+#: bisect.c:791
#, c-format
msgid ""
"The merge base %s is bad.\n"
"This means the bug has been fixed between %s and [%s].\n"
msgstr ""
-#: bisect.c:775
+#: bisect.c:796
#, c-format
msgid ""
"The merge base %s is new.\n"
"The property has changed between %s and [%s].\n"
msgstr ""
-#: bisect.c:780
+#: bisect.c:801
#, c-format
msgid ""
"The merge base %s is %s.\n"
"This means the first '%s' commit is between %s and [%s].\n"
msgstr ""
-#: bisect.c:788
+#: bisect.c:809
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1556,7 +1617,7 @@
"Maybe you mistook %s and %s revs?\n"
msgstr ""
-#: bisect.c:801
+#: bisect.c:822
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1564,43 +1625,43 @@
"We continue anyway."
msgstr ""
-#: bisect.c:840
+#: bisect.c:861
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr ""
-#: bisect.c:890
+#: bisect.c:911
#, c-format
msgid "a %s revision is needed"
msgstr ""
-#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287
#, c-format
msgid "could not create file '%s'"
msgstr ""
-#: bisect.c:966 builtin/merge.c:149
+#: bisect.c:987 builtin/merge.c:153
#, c-format
msgid "could not read file '%s'"
msgstr ""
-#: bisect.c:997
+#: bisect.c:1027
msgid "reading bisect refs failed"
msgstr ""
-#: bisect.c:1019
+#: bisect.c:1057
#, c-format
msgid "%s was both %s and %s\n"
msgstr ""
-#: bisect.c:1028
+#: bisect.c:1066
#, c-format
msgid ""
"No testable commit found.\n"
-"Maybe you started with bad path parameters?\n"
+"Maybe you started with bad path arguments?\n"
msgstr ""
-#: bisect.c:1057
+#: bisect.c:1095
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1610,44 +1671,44 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1063
+#: bisect.c:1101
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[0] ""
msgstr[1] ""
-#: blame.c:2700
+#: blame.c:2777
msgid "--contents and --reverse do not blend well."
msgstr ""
-#: blame.c:2714
+#: blame.c:2791
msgid "cannot use --contents with final commit object name"
msgstr ""
-#: blame.c:2735
+#: blame.c:2812
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
-#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006
-#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388
-#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215
-#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290
-#: builtin/shortlog.c:192
+#: blame.c:2821 bundle.c:213 ref-filter.c:2206 remote.c:2041 sequencer.c:2146
+#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411
+#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335
+#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410
+#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr ""
-#: blame.c:2762
+#: blame.c:2839
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
-#: blame.c:2773
+#: blame.c:2850
#, c-format
msgid "no such path %s in %s"
msgstr ""
-#: blame.c:2784
+#: blame.c:2861
#, c-format
msgid "cannot read blob %s for path %s"
msgstr ""
@@ -1766,114 +1827,393 @@
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 "'%s' does not look like a v2 bundle file"
+msgid "unrecognized bundle hash algorithm: %s"
msgstr ""
-#: bundle.c:64
+#: bundle.c:45
+#, c-format
+msgid "unknown capability '%s'"
+msgstr ""
+
+#: bundle.c:71
+#, c-format
+msgid "'%s' does not look like a v2 or v3 bundle file"
+msgstr ""
+
+#: bundle.c:110
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016
-#: builtin/commit.c:815
+#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184
+#: 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:273
+#: bundle.c:319
msgid "unable to dup bundle descriptor"
msgstr ""
-#: bundle.c:280
+#: bundle.c:326
msgid "Could not spawn pack-objects"
msgstr ""
-#: bundle.c:291
+#: bundle.c:337
msgid "pack-objects died"
msgstr ""
-#: bundle.c:333
-msgid "rev-list died"
-msgstr ""
-
-#: bundle.c:382
+#: bundle.c:386
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
-#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306
+#: bundle.c:490
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr ""
+
+#: bundle.c:492
+#, c-format
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr ""
+
+#: bundle.c:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
-#: bundle.c:469
+#: bundle.c:539
msgid "Refusing to create empty bundle."
msgstr ""
-#: bundle.c:479
+#: bundle.c:549
#, c-format
msgid "cannot create '%s'"
msgstr ""
-#: bundle.c:504
+#: bundle.c:574
msgid "index-pack died"
msgstr ""
+#: chunk-format.c:113
+msgid "terminating chunk id appears earlier than expected"
+msgstr ""
+
+#: chunk-format.c:122
+#, c-format
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr ""
+
+#: chunk-format.c:129
+#, c-format
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr ""
+
+#: chunk-format.c:143
+#, c-format
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr ""
+
#: color.c:329
#, c-format
msgid "invalid color value: %.*s"
msgstr ""
-#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403
-#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457
+#: commit-graph.c:197 midx.c:46
+msgid "invalid hash version"
+msgstr ""
+
+#: commit-graph.c:255
+msgid "commit-graph file is too small"
+msgstr ""
+
+#: commit-graph.c:348
+#, c-format
+msgid "commit-graph signature %X does not match signature %X"
+msgstr ""
+
+#: commit-graph.c:355
+#, c-format
+msgid "commit-graph version %X does not match version %X"
+msgstr ""
+
+#: commit-graph.c:362
+#, c-format
+msgid "commit-graph hash version %X does not match version %X"
+msgstr ""
+
+#: commit-graph.c:379
+#, c-format
+msgid "commit-graph file is too small to hold %u chunks"
+msgstr ""
+
+#: commit-graph.c:472
+msgid "commit-graph has no base graphs chunk"
+msgstr ""
+
+#: commit-graph.c:482
+msgid "commit-graph chain does not match"
+msgstr ""
+
+#: commit-graph.c:530
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr ""
+
+#: commit-graph.c:554
+msgid "unable to find all commit-graph files"
+msgstr ""
+
+#: commit-graph.c:735 commit-graph.c:772
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr ""
+
+#: commit-graph.c:756
+#, c-format
+msgid "could not find commit %s"
+msgstr ""
+
+#: commit-graph.c:789
+msgid "commit-graph requires overflow generation data but has none"
+msgstr ""
+
+#: commit-graph.c:1065 builtin/am.c:1292
+#, c-format
+msgid "unable to parse commit %s"
+msgstr ""
+
+#: commit-graph.c:1327 builtin/pack-objects.c:2872
+#, c-format
+msgid "unable to get type of object %s"
+msgstr ""
+
+#: commit-graph.c:1358
+msgid "Loading known commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:1375
+msgid "Expanding reachable commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:1395
+msgid "Clearing commit marks in commit graph"
+msgstr ""
+
+#: commit-graph.c:1414
+msgid "Computing commit graph topological levels"
+msgstr ""
+
+#: commit-graph.c:1467
+msgid "Computing commit graph generation numbers"
+msgstr ""
+
+#: commit-graph.c:1548
+msgid "Computing commit changed paths Bloom filters"
+msgstr ""
+
+#: commit-graph.c:1625
+msgid "Collecting referenced commits"
+msgstr ""
+
+#: commit-graph.c:1650
+#, 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:1663
+#, c-format
+msgid "error adding pack %s"
+msgstr ""
+
+#: commit-graph.c:1667
+#, c-format
+msgid "error opening index for %s"
+msgstr ""
+
+#: commit-graph.c:1704
+msgid "Finding commits for commit graph among packed objects"
+msgstr ""
+
+#: commit-graph.c:1722
+msgid "Finding extra edges in commit graph"
+msgstr ""
+
+#: commit-graph.c:1771
+msgid "failed to write correct number of base graph ids"
+msgstr ""
+
+#: commit-graph.c:1802 midx.c:794
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr ""
+
+#: commit-graph.c:1815
+msgid "unable to create temporary graph layer"
+msgstr ""
+
+#: commit-graph.c:1820
+#, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr ""
+
+#: commit-graph.c:1879
+#, 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:1915
+msgid "unable to open commit-graph chain file"
+msgstr ""
+
+#: commit-graph.c:1931
+msgid "failed to rename base commit-graph file"
+msgstr ""
+
+#: commit-graph.c:1951
+msgid "failed to rename temporary commit-graph file"
+msgstr ""
+
+#: commit-graph.c:2084
+msgid "Scanning merged commits"
+msgstr ""
+
+#: commit-graph.c:2128
+msgid "Merging commit-graph"
+msgstr ""
+
+#: commit-graph.c:2235
+msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
+msgstr ""
+
+#: commit-graph.c:2342
+msgid "too many commits to write graph"
+msgstr ""
+
+#: commit-graph.c:2440
+msgid "the commit-graph file has incorrect checksum and is likely corrupt"
+msgstr ""
+
+#: commit-graph.c:2450
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr ""
+
+#: commit-graph.c:2460 commit-graph.c:2475
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr ""
+
+#: commit-graph.c:2467
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr ""
+
+#: commit-graph.c:2485
+msgid "Verifying commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:2500
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr ""
+
+#: commit-graph.c:2507
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr ""
+
+#: commit-graph.c:2517
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr ""
+
+#: commit-graph.c:2526
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr ""
+
+#: commit-graph.c:2540
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr ""
+
+#: commit-graph.c:2545
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr ""
+
+#: commit-graph.c:2549
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr ""
+
+#: commit-graph.c:2566
+#, c-format
+msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
+msgstr ""
+
+#: commit-graph.c:2572
+#, c-format
+msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
+msgstr ""
+
+#: commit.c:52 sequencer.c:2887 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr ""
-#: commit.c:53
+#: commit.c:54
#, c-format
msgid "%s %s is not a commit!"
msgstr ""
-#: commit.c:193
+#: commit.c:194
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -1885,289 +2225,38 @@
"\"git config advice.graftFileDeprecated false\""
msgstr ""
-#: commit.c:1153
+#: commit.c:1223
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
-#: commit.c:1157
+#: commit.c:1227
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
-#: commit.c:1160
+#: commit.c:1230
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr ""
-#: commit.c:1163
+#: commit.c:1233
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr ""
-#: commit.c:1417
+#: commit.c:1487
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
"variable i18n.commitencoding to the encoding your project uses.\n"
msgstr ""
-#: commit-graph.c:122
-msgid "commit-graph file is too small"
-msgstr ""
-
-#: commit-graph.c:189
-#, c-format
-msgid "commit-graph signature %X does not match signature %X"
-msgstr ""
-
-#: commit-graph.c:196
-#, c-format
-msgid "commit-graph version %X does not match version %X"
-msgstr ""
-
-#: commit-graph.c:203
-#, c-format
-msgid "commit-graph hash version %X does not match version %X"
-msgstr ""
-
-#: commit-graph.c:226
-msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
-msgstr ""
-
-#: commit-graph.c:237
-#, c-format
-msgid "commit-graph improper chunk offset %08x%08x"
-msgstr ""
-
-#: commit-graph.c:280
-#, c-format
-msgid "commit-graph chunk id %08x appears multiple times"
-msgstr ""
-
-#: commit-graph.c:343
-msgid "commit-graph has no base graphs chunk"
-msgstr ""
-
-#: commit-graph.c:353
-msgid "commit-graph chain does not match"
-msgstr ""
-
-#: commit-graph.c:401
-#, c-format
-msgid "invalid commit-graph chain: line '%s' not a hash"
-msgstr ""
-
-#: commit-graph.c:425
-msgid "unable to find all commit-graph files"
-msgstr ""
-
-#: commit-graph.c:558 commit-graph.c:618
-msgid "invalid commit position. commit-graph is likely corrupt"
-msgstr ""
-
-#: commit-graph.c:579
-#, c-format
-msgid "could not find commit %s"
-msgstr ""
-
-#: commit-graph.c:852 builtin/am.c:1292
-#, c-format
-msgid "unable to parse commit %s"
-msgstr ""
-
-#: commit-graph.c:1011 builtin/pack-objects.c:2782
-#, c-format
-msgid "unable to get type of object %s"
-msgstr ""
-
-#: commit-graph.c:1043
-msgid "Loading known commits in commit graph"
-msgstr ""
-
-#: commit-graph.c:1060
-msgid "Expanding reachable commits in commit graph"
-msgstr ""
-
-#: commit-graph.c:1079
-msgid "Clearing commit marks in commit graph"
-msgstr ""
-
-#: commit-graph.c:1098
-msgid "Computing commit graph generation numbers"
-msgstr ""
-
-#: commit-graph.c:1173
-#, c-format
-msgid "Finding commits for commit graph in %d pack"
-msgid_plural "Finding commits for commit graph in %d packs"
-msgstr[0] ""
-msgstr[1] ""
-
-#: commit-graph.c:1186
-#, c-format
-msgid "error adding pack %s"
-msgstr ""
-
-#: commit-graph.c:1190
-#, c-format
-msgid "error opening index for %s"
-msgstr ""
-
-#: commit-graph.c:1214
-#, c-format
-msgid "Finding commits for commit graph from %d ref"
-msgid_plural "Finding commits for commit graph from %d refs"
-msgstr[0] ""
-msgstr[1] ""
-
-#: commit-graph.c:1234
-#, c-format
-msgid "invalid commit object id: %s"
-msgstr ""
-
-#: commit-graph.c:1249
-msgid "Finding commits for commit graph among packed objects"
-msgstr ""
-
-#: commit-graph.c:1264
-msgid "Counting distinct commits in commit graph"
-msgstr ""
-
-#: commit-graph.c:1294
-msgid "Finding extra edges in commit graph"
-msgstr ""
-
-#: commit-graph.c:1340
-msgid "failed to write correct number of base graph ids"
-msgstr ""
-
-#: commit-graph.c:1373 midx.c:814
-#, c-format
-msgid "unable to create leading directories of %s"
-msgstr ""
-
-#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248
-#, c-format
-msgid "unable to create '%s'"
-msgstr ""
-
-#: commit-graph.c:1445
-#, c-format
-msgid "Writing out commit graph in %d pass"
-msgid_plural "Writing out commit graph in %d passes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: commit-graph.c:1486
-msgid "unable to open commit-graph chain file"
-msgstr ""
-
-#: commit-graph.c:1498
-msgid "failed to rename base commit-graph file"
-msgstr ""
-
-#: commit-graph.c:1518
-msgid "failed to rename temporary commit-graph file"
-msgstr ""
-
-#: commit-graph.c:1631
-msgid "Scanning merged commits"
-msgstr ""
-
-#: commit-graph.c:1642
-#, c-format
-msgid "unexpected duplicate commit id %s"
-msgstr ""
-
-#: commit-graph.c:1665
-msgid "Merging commit-graph"
-msgstr ""
-
-#: commit-graph.c:1844
-#, c-format
-msgid "the commit graph format cannot write %d commits"
-msgstr ""
-
-#: commit-graph.c:1855
-msgid "too many commits to write graph"
-msgstr ""
-
-#: commit-graph.c:1944
-msgid "the commit-graph file has incorrect checksum and is likely corrupt"
-msgstr ""
-
-#: commit-graph.c:1954
-#, c-format
-msgid "commit-graph has incorrect OID order: %s then %s"
-msgstr ""
-
-#: commit-graph.c:1964 commit-graph.c:1979
-#, c-format
-msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
-msgstr ""
-
-#: commit-graph.c:1971
-#, c-format
-msgid "failed to parse commit %s from commit-graph"
-msgstr ""
-
-#: commit-graph.c:1989
-msgid "Verifying commits in commit graph"
-msgstr ""
-
-#: commit-graph.c:2003
-#, c-format
-msgid "failed to parse commit %s from object database for commit-graph"
-msgstr ""
-
-#: commit-graph.c:2010
-#, c-format
-msgid "root tree OID for commit %s in commit-graph is %s != %s"
-msgstr ""
-
-#: commit-graph.c:2020
-#, c-format
-msgid "commit-graph parent list for commit %s is too long"
-msgstr ""
-
-#: commit-graph.c:2029
-#, c-format
-msgid "commit-graph parent for %s is %s != %s"
-msgstr ""
-
-#: commit-graph.c:2042
-#, c-format
-msgid "commit-graph parent list for commit %s terminates early"
-msgstr ""
-
-#: commit-graph.c:2047
-#, c-format
-msgid ""
-"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
-msgstr ""
-
-#: commit-graph.c:2051
-#, c-format
-msgid ""
-"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
-msgstr ""
-
-#: commit-graph.c:2066
-#, c-format
-msgid "commit-graph generation for commit %s is %u != %u"
-msgstr ""
-
-#: commit-graph.c:2072
-#, c-format
-msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
-msgstr ""
-
#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr ""
-#: config.c:124
+#: config.c:126
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2177,289 +2266,333 @@
"This might be due to circular includes."
msgstr ""
-#: config.c:140
+#: config.c:142
#, c-format
msgid "could not expand include path '%s'"
msgstr ""
-#: config.c:151
+#: config.c:153
msgid "relative config includes must come from files"
msgstr ""
-#: config.c:197
+#: config.c:199
msgid "relative config include conditionals must come from files"
msgstr ""
-#: config.c:376
+#: config.c:396
+#, c-format
+msgid "invalid config format: %s"
+msgstr ""
+
+#: config.c:400
+#, c-format
+msgid "missing environment variable name for configuration '%.*s'"
+msgstr ""
+
+#: config.c:405
+#, c-format
+msgid "missing environment variable '%s' for configuration '%.*s'"
+msgstr ""
+
+#: config.c:442
#, c-format
msgid "key does not contain a section: %s"
msgstr ""
-#: config.c:382
+#: config.c:448
#, c-format
msgid "key does not contain variable name: %s"
msgstr ""
-#: config.c:406 sequencer.c:2444
+#: config.c:472 sequencer.c:2588
#, c-format
msgid "invalid key: %s"
msgstr ""
-#: config.c:412
+#: config.c:478
#, c-format
msgid "invalid key (newline): %s"
msgstr ""
-#: config.c:448 config.c:460
+#: config.c:511
+msgid "empty config key"
+msgstr ""
+
+#: config.c:529 config.c:541
#, c-format
msgid "bogus config parameter: %s"
msgstr ""
-#: config.c:495
+#: config.c:555 config.c:572 config.c:579 config.c:588
#, c-format
msgid "bogus format in %s"
msgstr ""
-#: config.c:821
+#: config.c:622
+#, c-format
+msgid "bogus count in %s"
+msgstr ""
+
+#: config.c:626
+#, c-format
+msgid "too many entries in %s"
+msgstr ""
+
+#: config.c:636
+#, c-format
+msgid "missing config key %s"
+msgstr ""
+
+#: config.c:644
+#, c-format
+msgid "missing config value %s"
+msgstr ""
+
+#: config.c:995
#, c-format
msgid "bad config line %d in blob %s"
msgstr ""
-#: config.c:825
+#: config.c:999
#, c-format
msgid "bad config line %d in file %s"
msgstr ""
-#: config.c:829
+#: config.c:1003
#, c-format
msgid "bad config line %d in standard input"
msgstr ""
-#: config.c:833
+#: config.c:1007
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr ""
-#: config.c:837
+#: config.c:1011
#, c-format
msgid "bad config line %d in command line %s"
msgstr ""
-#: config.c:841
+#: config.c:1015
#, c-format
msgid "bad config line %d in %s"
msgstr ""
-#: config.c:978
+#: config.c:1152
msgid "out of range"
msgstr ""
-#: config.c:978
+#: config.c:1152
msgid "invalid unit"
msgstr ""
-#: config.c:979
+#: config.c:1153
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr ""
-#: config.c:998
+#: config.c:1163
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
-#: config.c:1001
+#: config.c:1166
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
-#: config.c:1004
+#: config.c:1169
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
-#: config.c:1007
+#: config.c:1172
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
-#: config.c:1010
+#: config.c:1175
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
-#: config.c:1013
+#: config.c:1178
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr ""
-#: config.c:1108
+#: config.c:1194
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr ""
+
+#: config.c:1289
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr ""
-#: config.c:1117
+#: config.c:1298
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr ""
-#: config.c:1208
+#: config.c:1391
#, c-format
msgid "abbrev length out of range: %d"
msgstr ""
-#: config.c:1222 config.c:1233
+#: config.c:1405 config.c:1416
#, c-format
msgid "bad zlib compression level %d"
msgstr ""
-#: config.c:1325
+#: config.c:1508
msgid "core.commentChar should only be one character"
msgstr ""
-#: config.c:1358
+#: config.c:1541
#, c-format
msgid "invalid mode for object creation: %s"
msgstr ""
-#: config.c:1430
+#: config.c:1613
#, c-format
msgid "malformed value for %s"
msgstr ""
-#: config.c:1456
+#: config.c:1639
#, c-format
msgid "malformed value for %s: %s"
msgstr ""
-#: config.c:1457
+#: config.c:1640
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
-#: config.c:1518 builtin/pack-objects.c:3541
+#: config.c:1701 builtin/pack-objects.c:3666
#, c-format
msgid "bad pack compression level %d"
msgstr ""
-#: config.c:1639
+#: config.c:1823
#, c-format
msgid "unable to load config blob object '%s'"
msgstr ""
-#: config.c:1642
+#: config.c:1826
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr ""
-#: config.c:1659
+#: config.c:1843
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr ""
-#: config.c:1689
+#: config.c:1873
#, c-format
msgid "failed to parse %s"
msgstr ""
-#: config.c:1743
+#: config.c:1927
msgid "unable to parse command-line config"
msgstr ""
-#: config.c:2097
+#: config.c:2290
msgid "unknown error occurred while reading the configuration files"
msgstr ""
-#: config.c:2267
+#: config.c:2464
#, c-format
msgid "Invalid %s: '%s'"
msgstr ""
-#: config.c:2312
+#: config.c:2509
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
-#: config.c:2358
+#: config.c:2555
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr ""
-#: config.c:2360
+#: config.c:2557
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr ""
-#: config.c:2441
+#: config.c:2641
#, c-format
msgid "invalid section name '%s'"
msgstr ""
-#: config.c:2473
+#: config.c:2673
#, c-format
msgid "%s has multiple values"
msgstr ""
-#: config.c:2502
+#: config.c:2702
#, c-format
msgid "failed to write new configuration file %s"
msgstr ""
-#: config.c:2754 config.c:3078
+#: config.c:2954 config.c:3280
#, c-format
msgid "could not lock config file %s"
msgstr ""
-#: config.c:2765
+#: config.c:2965
#, c-format
msgid "opening %s"
msgstr ""
-#: config.c:2800 builtin/config.c:344
+#: config.c:3002 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr ""
-#: config.c:2825
+#: config.c:3027
#, c-format
msgid "invalid config file %s"
msgstr ""
-#: config.c:2838 config.c:3091
+#: config.c:3040 config.c:3293
#, c-format
msgid "fstat on %s failed"
msgstr ""
-#: config.c:2849
+#: config.c:3051
#, c-format
msgid "unable to mmap '%s'"
msgstr ""
-#: config.c:2858 config.c:3096
+#: config.c:3060 config.c:3298
#, c-format
msgid "chmod on %s failed"
msgstr ""
-#: config.c:2943 config.c:3193
+#: config.c:3145 config.c:3395
#, c-format
msgid "could not write config file %s"
msgstr ""
-#: config.c:2977
+#: config.c:3179
#, c-format
msgid "could not set '%s' to '%s'"
msgstr ""
-#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
+#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
#, c-format
msgid "could not unset '%s'"
msgstr ""
-#: config.c:3069
+#: config.c:3271
#, c-format
msgid "invalid section name: %s"
msgstr ""
-#: config.c:3236
+#: config.c:3438
#, c-format
msgid "missing value for '%s'"
msgstr ""
@@ -2481,79 +2614,88 @@
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:497
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr ""
+
+#: connect.c:526
#, c-format
msgid "invalid ls-refs response: %s"
msgstr ""
-#: connect.c:445
+#: connect.c:530
msgid "expected flush after ref listing"
msgstr ""
-#: connect.c:544
+#: connect.c:533
+msgid "expected response end packet after ref listing"
+msgstr ""
+
+#: connect.c:666
#, c-format
msgid "protocol '%s' is not supported"
msgstr ""
-#: connect.c:595
+#: connect.c:717
msgid "unable to set SO_KEEPALIVE on socket"
msgstr ""
-#: connect.c:635 connect.c:698
+#: connect.c:757 connect.c:820
#, c-format
msgid "Looking up %s ... "
msgstr ""
-#: connect.c:639
+#: connect.c:761
#, 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:765 connect.c:836
#, c-format
msgid ""
"done.\n"
"Connecting to %s (port %s) ... "
msgstr ""
-#: connect.c:665 connect.c:742
+#: connect.c:787 connect.c:864
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -2561,73 +2703,77 @@
msgstr ""
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:671 connect.c:748
+#: connect.c:793 connect.c:870
msgid "done."
msgstr ""
-#: connect.c:702
+#: connect.c:824
#, c-format
msgid "unable to look up %s (%s)"
msgstr ""
-#: connect.c:708
+#: connect.c:830
#, c-format
msgid "unknown port %s"
msgstr ""
-#: connect.c:845 connect.c:1175
+#: connect.c:967 connect.c:1299
#, c-format
msgid "strange hostname '%s' blocked"
msgstr ""
-#: connect.c:847
+#: connect.c:969
#, c-format
msgid "strange port '%s' blocked"
msgstr ""
-#: connect.c:857
+#: connect.c:979
#, c-format
msgid "cannot start proxy %s"
msgstr ""
-#: connect.c:928
+#: connect.c:1050
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr ""
-#: connect.c:1123
+#: connect.c:1190
+msgid "newline is forbidden in git:// hosts and repo paths"
+msgstr ""
+
+#: connect.c:1247
msgid "ssh variant 'simple' does not support -4"
msgstr ""
-#: connect.c:1135
+#: connect.c:1259
msgid "ssh variant 'simple' does not support -6"
msgstr ""
-#: connect.c:1152
+#: connect.c:1276
msgid "ssh variant 'simple' does not support setting port"
msgstr ""
-#: connect.c:1264
+#: connect.c:1388
#, c-format
msgid "strange pathname '%s' blocked"
msgstr ""
-#: connect.c:1311
+#: connect.c:1436
msgid "unable to fork"
msgstr ""
-#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43
+#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45
msgid "Checking connectivity"
msgstr ""
-#: connected.c:110
+#: connected.c:120
msgid "Could not run 'git rev-list'"
msgstr ""
-#: connected.c:130
+#: connected.c:144
msgid "failed write to rev-list"
msgstr ""
-#: connected.c:137
+#: connected.c:149
msgid "failed to close rev-list's stdin"
msgstr ""
@@ -2694,60 +2840,88 @@
msgid "encoding '%s' from %s to %s and back is not the same"
msgstr ""
-#: convert.c:668
+#: convert.c:665
#, c-format
msgid "cannot fork to run external filter '%s'"
msgstr ""
-#: convert.c:688
+#: convert.c:685
#, c-format
msgid "cannot feed the input to external filter '%s'"
msgstr ""
-#: convert.c:695
+#: convert.c:692
#, c-format
msgid "external filter '%s' failed %d"
msgstr ""
-#: convert.c:730 convert.c:733
+#: convert.c:727 convert.c:730
#, c-format
msgid "read from external filter '%s' failed"
msgstr ""
-#: convert.c:736 convert.c:791
+#: convert.c:733 convert.c:788
#, c-format
msgid "external filter '%s' failed"
msgstr ""
-#: convert.c:839
+#: convert.c:837
msgid "unexpected filter type"
msgstr ""
-#: convert.c:850
+#: convert.c:848
msgid "path name too long for external filter"
msgstr ""
-#: convert.c:924
+#: convert.c:940
#, c-format
msgid ""
"external filter '%s' is not available anymore although not all paths have "
"been filtered"
msgstr ""
-#: convert.c:1223
+#: convert.c:1240
msgid "true/false are no valid working-tree-encodings"
msgstr ""
-#: convert.c:1411 convert.c:1445
+#: convert.c:1428 convert.c:1462
#, c-format
msgid "%s: clean filter '%s' failed"
msgstr ""
-#: convert.c:1489
+#: convert.c:1508
#, c-format
msgid "%s: smudge filter %s failed"
msgstr ""
+#: 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 ""
@@ -2840,13 +3014,29 @@
msgid "Marked %d islands, done.\n"
msgstr ""
-#: diffcore-order.c:24
+#: diff-merges.c:70
#, c-format
-msgid "failed to read orderfile '%s'"
+msgid "unknown value for --diff-merges: %s"
msgstr ""
-#: diffcore-rename.c:543
-msgid "Performing inexact rename detection"
+#: diff-lib.c:534
+msgid "--merge-base does not work with ranges"
+msgstr ""
+
+#: diff-lib.c:536
+msgid "--merge-base only works with commits"
+msgstr ""
+
+#: diff-lib.c:553
+msgid "unable to get HEAD"
+msgstr ""
+
+#: diff-lib.c:560
+msgid "no merge base found"
+msgstr ""
+
+#: diff-lib.c:562
+msgid "multiple merge bases found"
msgstr ""
#: diff-no-index.c:238
@@ -2859,646 +3049,681 @@
"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:4202
+#: diff.c:4276
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
-#: diff.c:4547
+#: diff.c:4628
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
-#: diff.c:4550
+#: diff.c:4631
msgid "-G, -S and --find-object are mutually exclusive"
msgstr ""
-#: diff.c:4628
+#: diff.c:4710
msgid "--follow requires exactly one pathspec"
msgstr ""
-#: diff.c:4676
+#: diff.c:4758
#, c-format
msgid "invalid --stat value: %s"
msgstr ""
-#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
-#: parse-options.c:197 parse-options.c:201
+#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306
+#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
#, c-format
msgid "%s expects a numerical value"
msgstr ""
-#: diff.c:4713
+#: diff.c:4795
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
-#: diff.c:4798
+#: diff.c:4880
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr ""
-#: diff.c:4822
+#: diff.c:4904
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr ""
-#: diff.c:4836
+#: diff.c:4918
#, c-format
msgid "unable to resolve '%s'"
msgstr ""
-#: diff.c:4886 diff.c:4892
+#: diff.c:4968 diff.c:4974
#, c-format
msgid "%s expects <n>/<m> form"
msgstr ""
-#: diff.c:4904
+#: diff.c:4986
#, c-format
msgid "%s expects a character, got '%s'"
msgstr ""
-#: diff.c:4925
+#: diff.c:5007
#, c-format
msgid "bad --color-moved argument: %s"
msgstr ""
-#: diff.c:4944
+#: diff.c:5026
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr ""
-#: diff.c:4984
+#: diff.c:5066
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
msgstr ""
-#: diff.c:5020 diff.c:5040
+#: diff.c:5102 diff.c:5122
#, c-format
msgid "invalid argument to %s"
msgstr ""
-#: diff.c:5178
+#: diff.c:5226
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr ""
+
+#: diff.c:5275
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr ""
-#: diff.c:5234
+#: diff.c:5331
#, c-format
msgid "bad --word-diff argument: %s"
msgstr ""
-#: diff.c:5257
+#: diff.c:5367
msgid "Diff output format options"
msgstr ""
-#: diff.c:5259 diff.c:5265
+#: diff.c:5369 diff.c:5375
msgid "generate patch"
msgstr ""
-#: diff.c:5262 builtin/log.c:173
+#: diff.c:5372 builtin/log.c:179
msgid "suppress diff output"
msgstr ""
-#: diff.c:5267 diff.c:5381 diff.c:5388
+#: diff.c:5377 diff.c:5491 diff.c:5498
msgid "<n>"
msgstr ""
-#: diff.c:5268 diff.c:5271
+#: diff.c:5378 diff.c:5381
msgid "generate diffs with <n> lines context"
msgstr ""
-#: diff.c:5273
+#: diff.c:5383
msgid "generate the diff in raw format"
msgstr ""
-#: diff.c:5276
+#: diff.c:5386
msgid "synonym for '-p --raw'"
msgstr ""
-#: diff.c:5280
+#: diff.c:5390
msgid "synonym for '-p --stat'"
msgstr ""
-#: diff.c:5284
+#: diff.c:5394
msgid "machine friendly --stat"
msgstr ""
-#: diff.c:5287
+#: diff.c:5397
msgid "output only the last line of --stat"
msgstr ""
-#: diff.c:5289 diff.c:5297
+#: diff.c:5399 diff.c:5407
msgid "<param1,param2>..."
msgstr ""
-#: diff.c:5290
+#: diff.c:5400
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
-#: diff.c:5294
+#: diff.c:5404
msgid "synonym for --dirstat=cumulative"
msgstr ""
-#: diff.c:5298
+#: diff.c:5408
msgid "synonym for --dirstat=files,param1,param2..."
msgstr ""
-#: diff.c:5302
+#: diff.c:5412
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
-#: diff.c:5305
+#: diff.c:5415
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
-#: diff.c:5308
+#: diff.c:5418
msgid "show only names of changed files"
msgstr ""
-#: diff.c:5311
+#: diff.c:5421
msgid "show only names and status of changed files"
msgstr ""
-#: diff.c:5313
+#: diff.c:5423
msgid "<width>[,<name-width>[,<count>]]"
msgstr ""
-#: diff.c:5314
+#: diff.c:5424
msgid "generate diffstat"
msgstr ""
-#: diff.c:5316 diff.c:5319 diff.c:5322
+#: diff.c:5426 diff.c:5429 diff.c:5432
msgid "<width>"
msgstr ""
-#: diff.c:5317
+#: diff.c:5427
msgid "generate diffstat with a given width"
msgstr ""
-#: diff.c:5320
+#: diff.c:5430
msgid "generate diffstat with a given name width"
msgstr ""
-#: diff.c:5323
+#: diff.c:5433
msgid "generate diffstat with a given graph width"
msgstr ""
-#: diff.c:5325
+#: diff.c:5435
msgid "<count>"
msgstr ""
-#: diff.c:5326
+#: diff.c:5436
msgid "generate diffstat with limited lines"
msgstr ""
-#: diff.c:5329
+#: diff.c:5439
msgid "generate compact summary in diffstat"
msgstr ""
-#: diff.c:5332
+#: diff.c:5442
msgid "output a binary diff that can be applied"
msgstr ""
-#: diff.c:5335
+#: diff.c:5445
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
-#: diff.c:5337
+#: diff.c:5447
msgid "show colored diff"
msgstr ""
-#: diff.c:5338
+#: diff.c:5448
msgid "<kind>"
msgstr ""
-#: diff.c:5339
+#: diff.c:5449
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgstr ""
-#: diff.c:5342
+#: diff.c:5452
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
msgstr ""
-#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457
+#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570
msgid "<prefix>"
msgstr ""
-#: diff.c:5346
+#: diff.c:5456
msgid "show the given source prefix instead of \"a/\""
msgstr ""
-#: diff.c:5349
+#: diff.c:5459
msgid "show the given destination prefix instead of \"b/\""
msgstr ""
-#: diff.c:5352
+#: diff.c:5462
msgid "prepend an additional prefix to every line of output"
msgstr ""
-#: diff.c:5355
+#: diff.c:5465
msgid "do not show any source or destination prefix"
msgstr ""
-#: diff.c:5358
+#: diff.c:5468
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
-#: diff.c:5362 diff.c:5367 diff.c:5372
+#: diff.c:5472 diff.c:5477 diff.c:5482
msgid "<char>"
msgstr ""
-#: diff.c:5363
+#: diff.c:5473
msgid "specify the character to indicate a new line instead of '+'"
msgstr ""
-#: diff.c:5368
+#: diff.c:5478
msgid "specify the character to indicate an old line instead of '-'"
msgstr ""
-#: diff.c:5373
+#: diff.c:5483
msgid "specify the character to indicate a context instead of ' '"
msgstr ""
-#: diff.c:5376
+#: diff.c:5486
msgid "Diff rename options"
msgstr ""
-#: diff.c:5377
+#: diff.c:5487
msgid "<n>[/<m>]"
msgstr ""
-#: diff.c:5378
+#: diff.c:5488
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
-#: diff.c:5382
+#: diff.c:5492
msgid "detect renames"
msgstr ""
-#: diff.c:5386
+#: diff.c:5496
msgid "omit the preimage for deletes"
msgstr ""
-#: diff.c:5389
+#: diff.c:5499
msgid "detect copies"
msgstr ""
-#: diff.c:5393
+#: diff.c:5503
msgid "use unmodified files as source to find copies"
msgstr ""
-#: diff.c:5395
+#: diff.c:5505
msgid "disable rename detection"
msgstr ""
-#: diff.c:5398
+#: diff.c:5508
msgid "use empty blobs as rename source"
msgstr ""
-#: diff.c:5400
+#: diff.c:5510
msgid "continue listing the history of a file beyond renames"
msgstr ""
-#: diff.c:5403
+#: diff.c:5513
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr ""
-#: diff.c:5405
+#: diff.c:5515
msgid "Diff algorithm options"
msgstr ""
-#: diff.c:5407
+#: diff.c:5517
msgid "produce the smallest possible diff"
msgstr ""
-#: diff.c:5410
+#: diff.c:5520
msgid "ignore whitespace when comparing lines"
msgstr ""
-#: diff.c:5413
+#: diff.c:5523
msgid "ignore changes in amount of whitespace"
msgstr ""
-#: diff.c:5416
+#: diff.c:5526
msgid "ignore changes in whitespace at EOL"
msgstr ""
-#: diff.c:5419
+#: diff.c:5529
msgid "ignore carrier-return at the end of line"
msgstr ""
-#: diff.c:5422
+#: diff.c:5532
msgid "ignore changes whose lines are all blank"
msgstr ""
-#: diff.c:5425
-msgid "heuristic to shift diff hunk boundaries for easy reading"
-msgstr ""
-
-#: diff.c:5428
-msgid "generate diff using the \"patience diff\" algorithm"
-msgstr ""
-
-#: diff.c:5432
-msgid "generate diff using the \"histogram diff\" algorithm"
-msgstr ""
-
-#: diff.c:5434
-msgid "<algorithm>"
-msgstr ""
-
-#: diff.c:5435
-msgid "choose a diff algorithm"
-msgstr ""
-
-#: diff.c:5437
-msgid "<text>"
-msgstr ""
-
-#: diff.c:5438
-msgid "generate diff using the \"anchored diff\" algorithm"
-msgstr ""
-
-#: diff.c:5440 diff.c:5449 diff.c:5452
-msgid "<mode>"
-msgstr ""
-
-#: diff.c:5441
-msgid "show word diff, using <mode> to delimit changed words"
-msgstr ""
-
-#: diff.c:5443 diff.c:5446 diff.c:5491
+#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604
msgid "<regex>"
msgstr ""
-#: diff.c:5444
+#: diff.c:5535
+msgid "ignore changes whose all lines match <regex>"
+msgstr ""
+
+#: diff.c:5538
+msgid "heuristic to shift diff hunk boundaries for easy reading"
+msgstr ""
+
+#: diff.c:5541
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr ""
+
+#: diff.c:5545
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr ""
+
+#: diff.c:5547
+msgid "<algorithm>"
+msgstr ""
+
+#: diff.c:5548
+msgid "choose a diff algorithm"
+msgstr ""
+
+#: diff.c:5550
+msgid "<text>"
+msgstr ""
+
+#: diff.c:5551
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr ""
+
+#: diff.c:5553 diff.c:5562 diff.c:5565
+msgid "<mode>"
+msgstr ""
+
+#: diff.c:5554
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr ""
+
+#: diff.c:5557
msgid "use <regex> to decide what a word is"
msgstr ""
-#: diff.c:5447
+#: diff.c:5560
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr ""
-#: diff.c:5450
+#: diff.c:5563
msgid "moved lines of code are colored differently"
msgstr ""
-#: diff.c:5453
+#: diff.c:5566
msgid "how white spaces are ignored in --color-moved"
msgstr ""
-#: diff.c:5456
+#: diff.c:5569
msgid "Other diff options"
msgstr ""
-#: diff.c:5458
+#: diff.c:5571
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
-#: diff.c:5462
+#: diff.c:5575
msgid "treat all files as text"
msgstr ""
-#: diff.c:5464
+#: diff.c:5577
msgid "swap two inputs, reverse the diff"
msgstr ""
-#: diff.c:5466
+#: diff.c:5579
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr ""
-#: diff.c:5468
+#: diff.c:5581
msgid "disable all output of the program"
msgstr ""
-#: diff.c:5470
+#: diff.c:5583
msgid "allow an external diff helper to be executed"
msgstr ""
-#: diff.c:5472
+#: diff.c:5585
msgid "run external text conversion filters when comparing binary files"
msgstr ""
-#: diff.c:5474
+#: diff.c:5587
msgid "<when>"
msgstr ""
-#: diff.c:5475
+#: diff.c:5588
msgid "ignore changes to submodules in the diff generation"
msgstr ""
-#: diff.c:5478
+#: diff.c:5591
msgid "<format>"
msgstr ""
-#: diff.c:5479
+#: diff.c:5592
msgid "specify how differences in submodules are shown"
msgstr ""
-#: diff.c:5483
+#: diff.c:5596
msgid "hide 'git add -N' entries from the index"
msgstr ""
-#: diff.c:5486
+#: diff.c:5599
msgid "treat 'git add -N' entries as real in the index"
msgstr ""
-#: diff.c:5488
+#: diff.c:5601
msgid "<string>"
msgstr ""
-#: diff.c:5489
+#: diff.c:5602
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr ""
-#: diff.c:5492
+#: diff.c:5605
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr ""
-#: diff.c:5495
+#: diff.c:5608
msgid "show all changes in the changeset with -S or -G"
msgstr ""
-#: diff.c:5498
+#: diff.c:5611
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr ""
-#: diff.c:5501
+#: diff.c:5614
msgid "control the order in which files appear in the output"
msgstr ""
-#: diff.c:5502
+#: diff.c:5615 diff.c:5618
+msgid "<path>"
+msgstr ""
+
+#: diff.c:5616
+msgid "show the change in the specified path first"
+msgstr ""
+
+#: diff.c:5619
+msgid "skip the output to the specified path"
+msgstr ""
+
+#: diff.c:5621
msgid "<object-id>"
msgstr ""
-#: diff.c:5503
+#: diff.c:5622
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr ""
-#: diff.c:5505
+#: diff.c:5624
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr ""
-#: diff.c:5506
+#: diff.c:5625
msgid "select files by diff type"
msgstr ""
-#: diff.c:5508
+#: diff.c:5627
msgid "<file>"
msgstr ""
-#: diff.c:5509
+#: diff.c:5628
msgid "Output to a specific file"
msgstr ""
-#: diff.c:6164
+#: diff.c:6285
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
-#: diff.c:6167
+#: diff.c:6288
msgid "only found copies from modified paths due to too many files."
msgstr ""
-#: diff.c:6170
+#: diff.c:6291
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr ""
-#: dir.c:555
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr ""
+
+#: diffcore-rename.c:786
+msgid "Performing inexact rename detection"
+msgstr ""
+
+#: diffcore-rotate.c:29
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr ""
+
+#: dir.c:578
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
msgstr ""
-#: dir.c:695 dir.c:724 dir.c:737
+#: dir.c:718 dir.c:747 dir.c:760
#, c-format
msgid "unrecognized pattern: '%s'"
msgstr ""
-#: dir.c:754 dir.c:768
+#: dir.c:777 dir.c:791
#, c-format
msgid "unrecognized negative pattern: '%s'"
msgstr ""
-#: dir.c:786
+#: dir.c:809
#, c-format
msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
msgstr ""
-#: dir.c:796
+#: dir.c:819
msgid "disabling cone pattern matching"
msgstr ""
-#: dir.c:1173
+#: dir.c:1198
#, c-format
msgid "cannot use %s as an exclude file"
msgstr ""
-#: dir.c:2144
+#: dir.c:2305
#, c-format
msgid "could not open directory '%s'"
msgstr ""
-#: dir.c:2479
+#: dir.c:2605
msgid "failed to get kernel name and information"
msgstr ""
-#: dir.c:2603
+#: dir.c:2729
msgid "untracked cache is disabled on this system or location"
msgstr ""
-#: dir.c:3407
+#: dir.c:3534
#, c-format
msgid "index file corrupt in repo %s"
msgstr ""
-#: dir.c:3452 dir.c:3457
+#: dir.c:3579 dir.c:3584
#, c-format
msgid "could not create directories for %s"
msgstr ""
-#: dir.c:3486
+#: dir.c:3613
#, 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 ""
-#: environment.c:149
+#: environment.c:152
#, c-format
msgid "bad git namespace path \"%s\""
msgstr ""
-#: environment.c:331
+#: environment.c:335
#, c-format
msgid "could not set GIT_DIR to '%s'"
msgstr ""
@@ -3508,267 +3733,289 @@
msgid "too many args to run %s"
msgstr ""
-#: fetch-pack.c:150
+#: fetch-pack.c:177
msgid "git fetch-pack: expected shallow list"
msgstr ""
-#: fetch-pack.c:153
+#: fetch-pack.c:180
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr ""
-#: fetch-pack.c:164
+#: fetch-pack.c:191
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr ""
-#: fetch-pack.c:184
+#: fetch-pack.c:211
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr ""
-#: fetch-pack.c:195
+#: fetch-pack.c:222
msgid "unable to write to remote"
msgstr ""
-#: fetch-pack.c:257
+#: fetch-pack.c:283
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr ""
-#: fetch-pack.c:356 fetch-pack.c:1340
+#: fetch-pack.c:378 fetch-pack.c:1457
#, c-format
msgid "invalid shallow line: %s"
msgstr ""
-#: fetch-pack.c:362 fetch-pack.c:1346
+#: fetch-pack.c:384 fetch-pack.c:1463
#, c-format
msgid "invalid unshallow line: %s"
msgstr ""
-#: fetch-pack.c:364 fetch-pack.c:1348
+#: fetch-pack.c:386 fetch-pack.c:1465
#, c-format
msgid "object not found: %s"
msgstr ""
-#: fetch-pack.c:367 fetch-pack.c:1351
+#: fetch-pack.c:389 fetch-pack.c:1468
#, c-format
msgid "error in object: %s"
msgstr ""
-#: fetch-pack.c:369 fetch-pack.c:1353
+#: fetch-pack.c:391 fetch-pack.c:1470
#, c-format
msgid "no shallow found: %s"
msgstr ""
-#: fetch-pack.c:372 fetch-pack.c:1357
+#: fetch-pack.c:394 fetch-pack.c:1474
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr ""
-#: fetch-pack.c:414
+#: fetch-pack.c:434
#, c-format
msgid "got %s %d %s"
msgstr ""
-#: fetch-pack.c:431
+#: fetch-pack.c:451
#, c-format
msgid "invalid commit %s"
msgstr ""
-#: fetch-pack.c:462
+#: fetch-pack.c:482
msgid "giving up"
msgstr ""
-#: fetch-pack.c:475 progress.c:323
+#: fetch-pack.c:495 progress.c:339
msgid "done"
msgstr ""
-#: fetch-pack.c:487
+#: fetch-pack.c:507
#, c-format
msgid "got %s (%d) %s"
msgstr ""
-#: fetch-pack.c:533
+#: fetch-pack.c:543
#, c-format
msgid "Marking %s as complete"
msgstr ""
-#: fetch-pack.c:754
+#: fetch-pack.c:758
#, c-format
msgid "already have %s (%s)"
msgstr ""
-#: fetch-pack.c:818
+#: fetch-pack.c:844
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:826
+#: fetch-pack.c:852
msgid "protocol error: bad pack header"
msgstr ""
-#: fetch-pack.c:900
+#: fetch-pack.c:946
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr ""
-#: fetch-pack.c:916
+#: fetch-pack.c:952
+msgid "fetch-pack: invalid index-pack output"
+msgstr ""
+
+#: fetch-pack.c:969
#, c-format
msgid "%s failed"
msgstr ""
-#: fetch-pack.c:918
+#: fetch-pack.c:971
msgid "error in sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:965
+#: fetch-pack.c:1031
#, c-format
msgid "Server version is %.*s"
msgstr ""
-#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985
-#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001
-#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017
-#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039
+#: fetch-pack.c:1039 fetch-pack.c:1045 fetch-pack.c:1048 fetch-pack.c:1054
+#: fetch-pack.c:1058 fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070
+#: fetch-pack.c:1074 fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086
+#: fetch-pack.c:1092 fetch-pack.c:1098 fetch-pack.c:1103 fetch-pack.c:1108
#, c-format
msgid "Server supports %s"
msgstr ""
-#: fetch-pack.c:972
+#: fetch-pack.c:1041
msgid "Server does not support shallow clients"
msgstr ""
-#: fetch-pack.c:1032
+#: fetch-pack.c:1101
msgid "Server does not support --shallow-since"
msgstr ""
-#: fetch-pack.c:1037
+#: fetch-pack.c:1106
msgid "Server does not support --shallow-exclude"
msgstr ""
-#: fetch-pack.c:1041
+#: fetch-pack.c:1110
msgid "Server does not support --deepen"
msgstr ""
-#: fetch-pack.c:1058
+#: fetch-pack.c:1112
+msgid "Server does not support this repository's object format"
+msgstr ""
+
+#: fetch-pack.c:1125
msgid "no common commits"
msgstr ""
-#: fetch-pack.c:1070 fetch-pack.c:1536
+#: fetch-pack.c:1138 fetch-pack.c:1682
msgid "git fetch-pack: fetch failed."
msgstr ""
-#: fetch-pack.c:1209
+#: fetch-pack.c:1265
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr ""
+
+#: fetch-pack.c:1269
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr ""
+
+#: fetch-pack.c:1289
msgid "Server does not support shallow requests"
msgstr ""
-#: fetch-pack.c:1216
+#: fetch-pack.c:1296
msgid "Server supports filter"
msgstr ""
-#: fetch-pack.c:1239
+#: fetch-pack.c:1335
msgid "unable to write request to remote"
msgstr ""
-#: fetch-pack.c:1257
+#: fetch-pack.c:1353
#, c-format
msgid "error reading section header '%s'"
msgstr ""
-#: fetch-pack.c:1263
+#: fetch-pack.c:1359
#, c-format
msgid "expected '%s', received '%s'"
msgstr ""
-#: fetch-pack.c:1303
+#: fetch-pack.c:1420
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr ""
-#: fetch-pack.c:1308
+#: fetch-pack.c:1425
#, c-format
msgid "error processing acks: %d"
msgstr ""
-#: fetch-pack.c:1318
+#: fetch-pack.c:1435
msgid "expected packfile to be sent after 'ready'"
msgstr ""
-#: fetch-pack.c:1320
+#: fetch-pack.c:1437
msgid "expected no other sections to be sent after no 'ready'"
msgstr ""
-#: fetch-pack.c:1362
+#: fetch-pack.c:1479
#, c-format
msgid "error processing shallow info: %d"
msgstr ""
-#: fetch-pack.c:1409
+#: fetch-pack.c:1526
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr ""
-#: fetch-pack.c:1414
+#: fetch-pack.c:1531
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr ""
-#: fetch-pack.c:1419
+#: fetch-pack.c:1536
#, c-format
msgid "error processing wanted refs: %d"
msgstr ""
-#: fetch-pack.c:1762
+#: fetch-pack.c:1566
+msgid "git fetch-pack: expected response end packet"
+msgstr ""
+
+#: fetch-pack.c:1960
msgid "no matching remote head"
msgstr ""
-#: fetch-pack.c:1785 builtin/clone.c:689
+#: fetch-pack.c:1983 builtin/clone.c:693
msgid "remote did not send all necessary objects"
msgstr ""
-#: fetch-pack.c:1812
+#: fetch-pack.c:2010
#, c-format
msgid "no such remote ref %s"
msgstr ""
-#: fetch-pack.c:1815
+#: fetch-pack.c:2013
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr ""
-#: gpg-interface.c:408
-msgid "gpg failed to sign the data"
-msgstr ""
-
-#: gpg-interface.c:434
+#: gpg-interface.c:273
msgid "could not create temporary file"
msgstr ""
-#: gpg-interface.c:437
+#: gpg-interface.c:276
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr ""
+#: gpg-interface.c:470
+msgid "gpg failed to sign the data"
+msgstr ""
+
#: graph.c:98
#, c-format
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr ""
-#: grep.c:668
+#: grep.c:543
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
msgstr ""
-#: grep.c:2128
+#: grep.c:1906
#, c-format
msgid "'%s': unable to read %s"
msgstr ""
-#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82
+#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr ""
-#: grep.c:2156
+#: grep.c:1934
#, c-format
msgid "'%s': short read"
msgstr ""
@@ -3825,72 +4072,72 @@
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:100
#, 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:527
#, 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
-msgid "Uh oh. Your system reports no Git commands at all."
-msgstr ""
-
-#: help.c:677
-#, c-format
-msgid "WARNING: You called a Git command named '%s', which does not exist."
-msgstr ""
-
-#: help.c:682
-#, c-format
-msgid "Continuing under the assumption that you meant '%s'."
-msgstr ""
-
-#: help.c:687
-#, c-format
-msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
-msgstr ""
-
-#: help.c:695
+#: help.c:543 help.c:631
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr ""
-#: help.c:699
+#: help.c:591
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr ""
+
+#: help.c:613
+#, c-format
+msgid "WARNING: You called a Git command named '%s', which does not exist."
+msgstr ""
+
+#: help.c:618
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr ""
+
+#: help.c:623
+#, c-format
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgstr ""
+
+#: help.c:635
msgid ""
"\n"
"The most similar command is"
@@ -3900,16 +4147,16 @@
msgstr[0] ""
msgstr[1] ""
-#: help.c:714
+#: help.c:675
msgid "git version [<options>]"
msgstr ""
-#: help.c:783
+#: help.c:730
#, c-format
msgid "%s: %s - %s"
msgstr ""
-#: help.c:787
+#: help.c:734
msgid ""
"\n"
"Did you mean this?"
@@ -3919,7 +4166,15 @@
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"
@@ -3934,39 +4189,79 @@
"\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:635
+#: ident.c:454 builtin/commit.c:634
#, c-format
msgid "invalid date format: %s"
msgstr ""
+#: 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
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr ""
+
+#: 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
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr ""
+
+#: list-objects-filter.c:495
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr ""
+
#: list-objects.c:127
#, c-format
msgid "entry '%s' in tree %s has tree mode, but is not a tree"
@@ -3982,43 +4277,7 @@
msgid "unable to load root tree for commit %s"
msgstr ""
-#: list-objects-filter.c:492
-#, c-format
-msgid "unable to access sparse blob in '%s'"
-msgstr ""
-
-#: list-objects-filter.c:495
-#, c-format
-msgid "unable to parse sparse filter data in %s"
-msgstr ""
-
-#: list-objects-filter-options.c:58
-msgid "expected 'tree:<depth>'"
-msgstr ""
-
-#: list-objects-filter-options.c:73
-msgid "sparse:path filters support has been dropped"
-msgstr ""
-
-#: list-objects-filter-options.c:86
-#, c-format
-msgid "invalid filter-spec '%s'"
-msgstr ""
-
-#: list-objects-filter-options.c:102
-#, c-format
-msgid "must escape char in sub-filter-spec: '%c'"
-msgstr ""
-
-#: list-objects-filter-options.c:144
-msgid "expected something after combine:"
-msgstr ""
-
-#: list-objects-filter-options.c:226
-msgid "multiple filter-specs cannot be combined"
-msgstr ""
-
-#: lockfile.c:151
+#: lockfile.c:152
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
@@ -4030,19 +4289,223 @@
"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:37
+#, c-format
+msgid "invalid value '%s' for lsrefs.unborn"
msgstr ""
-#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913
-#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810
-#: builtin/stash.c:265
-msgid "unable to write new index file"
+#: ls-refs.c:167
+msgid "expected flush after ls-refs arguments"
+msgstr ""
+
+#: merge-ort.c:888 merge-recursive.c:1191
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr ""
+
+#: merge-ort.c:897 merge-recursive.c:1198
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr ""
+
+#: merge-ort.c:906 merge-recursive.c:1205
+#, c-format
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
+msgstr ""
+
+#: merge-ort.c:916 merge-ort.c:923
+#, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr ""
+
+#: merge-ort.c:944
+#, c-format
+msgid "Failed to merge submodule %s"
+msgstr ""
+
+#: merge-ort.c:951
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but a possible merge resolution exists:\n"
+"%s\n"
+msgstr ""
+
+#: merge-ort.c:955 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-ort.c:968
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but multiple possible merges exist:\n"
+"%s"
+msgstr ""
+
+#: merge-ort.c:1127 merge-recursive.c:1341
+msgid "Failed to execute internal merge"
+msgstr ""
+
+#: merge-ort.c:1132 merge-recursive.c:1346
+#, c-format
+msgid "Unable to add %s to database"
+msgstr ""
+
+#: merge-ort.c:1139 merge-recursive.c:1378
+#, c-format
+msgid "Auto-merging %s"
+msgstr ""
+
+#: merge-ort.c:1278 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-ort.c:1288 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-ort.c:1471
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
+"renamed to multiple other directories, with no destination getting a "
+"majority of the files."
+msgstr ""
+
+#: merge-ort.c:1637 merge-recursive.c:2447
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr ""
+
+#: merge-ort.c:1781 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-ort.c:1788 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-ort.c:1801 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-ort.c:1809 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-ort.c:1952
+#, c-format
+msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
+msgstr ""
+
+#: merge-ort.c:2047
+#, c-format
+msgid ""
+"CONFLICT (rename involved in collision): rename of %s -> %s has content "
+"conflicts AND collides with another path; this may result in nested conflict "
+"markers."
+msgstr ""
+
+#: merge-ort.c:2066 merge-ort.c:2090
+#, c-format
+msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
+msgstr ""
+
+#: merge-ort.c:2735
+#, c-format
+msgid ""
+"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
+"%s instead."
+msgstr ""
+
+#: merge-ort.c:2808
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed %s "
+"of them so each can be recorded somewhere."
+msgstr ""
+
+#: merge-ort.c:2812
+msgid "both"
+msgstr ""
+
+#: merge-ort.c:2812
+msgid "one"
+msgstr ""
+
+#: merge-ort.c:2907 merge-recursive.c:3052
+msgid "content"
+msgstr ""
+
+#: merge-ort.c:2909 merge-recursive.c:3056
+msgid "add/add"
+msgstr ""
+
+#: merge-ort.c:2911 merge-recursive.c:3101
+msgid "submodule"
+msgstr ""
+
+#: merge-ort.c:2913 merge-recursive.c:3102
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr ""
+
+#: merge-ort.c:2938
+#, c-format
+msgid ""
+"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
+"of %s left in tree."
+msgstr ""
+
+#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
+#. base, and 2-3) the trees for the two trees we're merging.
+#.
+#: merge-ort.c:3406
+#, c-format
+msgid "collecting merge info failed for trees %s, %s, %s"
+msgstr ""
+
+#: merge-ort-wrappers.c:13 merge-recursive.c:3661
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+" %s"
+msgstr ""
+
+#: merge-ort-wrappers.c:33 merge-recursive.c:3436
+#, c-format
+msgid "Already up to date!"
msgstr ""
#: merge-recursive.c:356
@@ -4103,21 +4566,6 @@
msgid "do not know what to do with %06o %s '%s'"
msgstr ""
-#: merge-recursive.c:1191
-#, c-format
-msgid "Failed to merge submodule %s (not checked out)"
-msgstr ""
-
-#: merge-recursive.c:1198
-#, c-format
-msgid "Failed to merge submodule %s (commits not present)"
-msgstr ""
-
-#: 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:"
@@ -4142,36 +4590,11 @@
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 ""
-
-#: merge-recursive.c:1346
-#, c-format
-msgid "Unable to add %s to database"
-msgstr ""
-
-#: merge-recursive.c:1378
-#, c-format
-msgid "Auto-merging %s"
-msgstr ""
-
#: merge-recursive.c:1402
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
@@ -4213,7 +4636,7 @@
msgid "renamed"
msgstr ""
-#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117
+#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr ""
@@ -4249,12 +4672,12 @@
msgid " (left unresolved)"
msgstr ""
-#: merge-recursive.c:1793
+#: merge-recursive.c:1805
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
-#: merge-recursive.c:2056
+#: merge-recursive.c:2068
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -4262,339 +4685,273 @@
"getting a majority of the files."
msgstr ""
-#: merge-recursive.c:2088
-#, c-format
-msgid ""
-"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
-"implicit directory rename(s) putting the following path(s) there: %s."
-msgstr ""
-
-#: merge-recursive.c:2098
-#, c-format
-msgid ""
-"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
-"implicit directory renames tried to put these paths there: %s"
-msgstr ""
-
-#: merge-recursive.c:2190
+#: 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:2435
-#, c-format
-msgid ""
-"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
-"renamed."
-msgstr ""
-
-#: merge-recursive.c:2961
+#: merge-recursive.c:2973
#, c-format
msgid "cannot read object %s"
msgstr ""
-#: merge-recursive.c:2964
+#: merge-recursive.c:2976
#, c-format
msgid "object %s is not a blob"
msgstr ""
-#: merge-recursive.c:3028
+#: merge-recursive.c:3040
msgid "modify"
msgstr ""
-#: merge-recursive.c:3028
+#: merge-recursive.c:3040
msgid "modified"
msgstr ""
-#: merge-recursive.c:3040
-msgid "content"
-msgstr ""
-
-#: merge-recursive.c:3044
-msgid "add/add"
-msgstr ""
-
-#: merge-recursive.c:3067
+#: merge-recursive.c:3079
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr ""
-#: merge-recursive.c:3089 git-submodule.sh:1003
-msgid "submodule"
-msgstr ""
-
-#: merge-recursive.c:3090
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr ""
-
-#: merge-recursive.c:3120
+#: merge-recursive.c:3132
#, c-format
msgid "Adding as %s instead"
msgstr ""
-#: merge-recursive.c:3203
-#, c-format
-msgid ""
-"Path updated: %s added in %s inside a directory that was renamed in %s; "
-"moving it to %s."
-msgstr ""
-
-#: merge-recursive.c:3206
-#, c-format
-msgid ""
-"CONFLICT (file location): %s added in %s inside a directory that was renamed "
-"in %s, suggesting it should perhaps be moved to %s."
-msgstr ""
-
-#: merge-recursive.c:3210
-#, c-format
-msgid ""
-"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
-"%s; moving it to %s."
-msgstr ""
-
-#: merge-recursive.c:3213
-#, c-format
-msgid ""
-"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
-"was renamed in %s, suggesting it should perhaps be moved to %s."
-msgstr ""
-
-#: merge-recursive.c:3327
+#: merge-recursive.c:3339
#, c-format
msgid "Removing %s"
msgstr ""
-#: merge-recursive.c:3350
+#: merge-recursive.c:3362
msgid "file/directory"
msgstr ""
-#: merge-recursive.c:3355
+#: merge-recursive.c:3367
msgid "directory/file"
msgstr ""
-#: merge-recursive.c:3362
+#: 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:3371
+#: merge-recursive.c:3383
#, c-format
msgid "Adding %s"
msgstr ""
-#: merge-recursive.c:3380
+#: merge-recursive.c:3392
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr ""
-#: merge-recursive.c:3424
-msgid "Already up to date!"
-msgstr ""
-
-#: merge-recursive.c:3433
+#: merge-recursive.c:3445
#, c-format
msgid "merging of trees %s and %s failed"
msgstr ""
-#: merge-recursive.c:3537
+#: merge-recursive.c:3539
msgid "Merging:"
msgstr ""
-#: merge-recursive.c:3550
+#: merge-recursive.c:3552
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] ""
msgstr[1] ""
-#: merge-recursive.c:3600
+#: merge-recursive.c:3602
msgid "merge returned no commit"
msgstr ""
-#: merge-recursive.c:3659
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-" %s"
-msgstr ""
-
-#: merge-recursive.c:3756
+#: merge-recursive.c:3758
#, c-format
msgid "Could not parse object '%s'"
msgstr ""
-#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877
+#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896
+#: builtin/stash.c:471
msgid "Unable to write index."
msgstr ""
-#: midx.c:68
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr ""
+
+#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917
+#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817
+#: builtin/stash.c:265
+msgid "unable to write new index file"
+msgstr ""
+
+#: midx.c:62
+msgid "multi-pack-index OID fanout is of the wrong size"
+msgstr ""
+
+#: midx.c:93
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr ""
-#: midx.c:84
+#: midx.c:109
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
-#: midx.c:89
+#: midx.c:114
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr ""
-#: midx.c:94
+#: midx.c:119
#, c-format
-msgid "hash version %u does not match"
+msgid "multi-pack-index hash version %u does not match version %u"
msgstr ""
-#: midx.c:108
-msgid "invalid chunk offset (too large)"
-msgstr ""
-
-#: midx.c:132
-msgid "terminating multi-pack-index chunk id appears earlier than expected"
-msgstr ""
-
-#: midx.c:145
+#: midx.c:136
msgid "multi-pack-index missing required pack-name chunk"
msgstr ""
-#: midx.c:147
+#: midx.c:138
msgid "multi-pack-index missing required OID fanout chunk"
msgstr ""
-#: midx.c:149
+#: midx.c:140
msgid "multi-pack-index missing required OID lookup chunk"
msgstr ""
-#: midx.c:151
+#: midx.c:142
msgid "multi-pack-index missing required object offsets chunk"
msgstr ""
-#: midx.c:165
+#: midx.c:158
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
-#: midx.c:210
+#: midx.c:202
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr ""
-#: midx.c:260
+#: midx.c:252
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
-#: midx.c:288
-msgid "error preparing packfile from multi-pack-index"
-msgstr ""
-
-#: midx.c:472
+#: midx.c:467
#, c-format
msgid "failed to add packfile '%s'"
msgstr ""
-#: midx.c:478
+#: midx.c:473
#, c-format
msgid "failed to open pack-index '%s'"
msgstr ""
-#: midx.c:538
+#: midx.c:533
#, c-format
msgid "failed to locate object %d in packfile"
msgstr ""
-#: midx.c:842
+#: midx.c:821
msgid "Adding packfiles to multi-pack-index"
msgstr ""
-#: midx.c:875
+#: midx.c:855
#, c-format
msgid "did not see pack-file %s to drop"
msgstr ""
-#: midx.c:973
-msgid "Writing chunks to multi-pack-index"
+#: midx.c:904
+msgid "no pack files to index."
msgstr ""
-#: midx.c:1052
+#: midx.c:965
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr ""
-#: midx.c:1108
+#: midx.c:1021
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr ""
+
+#: midx.c:1029
msgid "Looking for referenced packfiles"
msgstr ""
-#: midx.c:1123
+#: midx.c:1044
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
-#: midx.c:1128
+#: midx.c:1049
+msgid "the midx contains no oid"
+msgstr ""
+
+#: midx.c:1058
msgid "Verifying OID order in multi-pack-index"
msgstr ""
-#: midx.c:1137
+#: midx.c:1067
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr ""
-#: midx.c:1157
+#: midx.c:1087
msgid "Sorting objects by packfile"
msgstr ""
-#: midx.c:1164
+#: midx.c:1094
msgid "Verifying object offsets"
msgstr ""
-#: midx.c:1180
+#: midx.c:1110
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr ""
-#: midx.c:1186
+#: midx.c:1116
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr ""
-#: midx.c:1195
+#: midx.c:1125
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr ""
-#: midx.c:1220
+#: midx.c:1150
msgid "Counting referenced objects"
msgstr ""
-#: midx.c:1230
+#: midx.c:1160
msgid "Finding and deleting unreferenced packfiles"
msgstr ""
-#: midx.c:1388
+#: midx.c:1351
msgid "could not start pack-objects"
msgstr ""
-#: midx.c:1407
+#: midx.c:1371
msgid "could not finish pack-objects"
msgstr ""
-#: name-hash.c:537
+#: name-hash.c:538
#, c-format
msgid "unable to create lazy_dir thread: %s"
msgstr ""
-#: name-hash.c:559
+#: name-hash.c:560
#, c-format
msgid "unable to create lazy_name thread: %s"
msgstr ""
-#: name-hash.c:565
+#: name-hash.c:566
#, c-format
msgid "unable to join lazy_name thread: %s"
msgstr ""
@@ -4635,6 +4992,342 @@
msgid "Bad %s value: '%s'"
msgstr ""
+#: object-file.c:480
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr ""
+
+#: object-file.c:531
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr ""
+
+#: object-file.c:603
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr ""
+
+#: object-file.c:610
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr ""
+
+#: object-file.c:653
+msgid "unable to fdopen alternates lockfile"
+msgstr ""
+
+#: object-file.c:671
+msgid "unable to read alternates file"
+msgstr ""
+
+#: object-file.c:678
+msgid "unable to move new alternates file into place"
+msgstr ""
+
+#: object-file.c:713
+#, c-format
+msgid "path '%s' does not exist"
+msgstr ""
+
+#: object-file.c:734
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr ""
+
+#: object-file.c:740
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr ""
+
+#: object-file.c:746
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr ""
+
+#: object-file.c:754
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr ""
+
+#: object-file.c:814
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr ""
+
+#: object-file.c:964
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr ""
+
+#: object-file.c:985
+msgid "mmap failed"
+msgstr ""
+
+#: object-file.c:1149
+#, c-format
+msgid "object file %s is empty"
+msgstr ""
+
+#: object-file.c:1284 object-file.c:2477
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr ""
+
+#: object-file.c:1286 object-file.c:2481
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr ""
+
+#: object-file.c:1328
+msgid "invalid object type"
+msgstr ""
+
+#: object-file.c:1412
+#, c-format
+msgid "unable to unpack %s header with --allow-unknown-type"
+msgstr ""
+
+#: object-file.c:1415
+#, c-format
+msgid "unable to unpack %s header"
+msgstr ""
+
+#: object-file.c:1421
+#, c-format
+msgid "unable to parse %s header with --allow-unknown-type"
+msgstr ""
+
+#: object-file.c:1424
+#, c-format
+msgid "unable to parse %s header"
+msgstr ""
+
+#: object-file.c:1651
+#, c-format
+msgid "failed to read object %s"
+msgstr ""
+
+#: object-file.c:1655
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr ""
+
+#: object-file.c:1659
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr ""
+
+#: object-file.c:1663
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr ""
+
+#: object-file.c:1768
+#, c-format
+msgid "unable to write file %s"
+msgstr ""
+
+#: object-file.c:1775
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr ""
+
+#: object-file.c:1782
+msgid "file write error"
+msgstr ""
+
+#: object-file.c:1802
+msgid "error when closing loose object file"
+msgstr ""
+
+#: object-file.c:1867
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
+msgstr ""
+
+#: object-file.c:1869
+msgid "unable to create temporary file"
+msgstr ""
+
+#: object-file.c:1893
+msgid "unable to write loose object file"
+msgstr ""
+
+#: object-file.c:1899
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr ""
+
+#: object-file.c:1903
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr ""
+
+#: object-file.c:1907
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr ""
+
+#: object-file.c:1917 builtin/pack-objects.c:1097
+#, c-format
+msgid "failed utime() on %s"
+msgstr ""
+
+#: object-file.c:1994
+#, c-format
+msgid "cannot read object for %s"
+msgstr ""
+
+#: object-file.c:2045
+msgid "corrupt commit"
+msgstr ""
+
+#: object-file.c:2053
+msgid "corrupt tag"
+msgstr ""
+
+#: object-file.c:2153
+#, c-format
+msgid "read error while indexing %s"
+msgstr ""
+
+#: object-file.c:2156
+#, c-format
+msgid "short read while indexing %s"
+msgstr ""
+
+#: object-file.c:2229 object-file.c:2239
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr ""
+
+#: object-file.c:2245
+#, c-format
+msgid "%s: unsupported file type"
+msgstr ""
+
+#: object-file.c:2269
+#, c-format
+msgid "%s is not a valid object"
+msgstr ""
+
+#: object-file.c:2271
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr ""
+
+#: object-file.c:2298 builtin/index-pack.c:192
+#, c-format
+msgid "unable to open %s"
+msgstr ""
+
+#: object-file.c:2488 object-file.c:2541
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr ""
+
+#: object-file.c:2512
+#, c-format
+msgid "unable to mmap %s"
+msgstr ""
+
+#: object-file.c:2517
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr ""
+
+#: object-file.c:2523
+#, c-format
+msgid "unable to parse header of %s"
+msgstr ""
+
+#: object-file.c:2534
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr ""
+
+#: object-name.c:486
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr ""
+
+#: object-name.c:497
+msgid "The candidates are:"
+msgstr ""
+
+#: object-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 ""
+
+#: object-name.c:916
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr ""
+
+#: object-name.c:924
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr ""
+
+#: object-name.c:1702
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr ""
+
+#: object-name.c:1708
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+msgstr ""
+
+#: object-name.c:1717
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr ""
+
+#: object-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 ""
+
+#: object-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 ""
+
+#: object-name.c:1769
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr ""
+
+#: object-name.c:1771
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr ""
+
+#: object-name.c:1784
+msgid "relative path syntax can't be used outside working tree"
+msgstr ""
+
+#: object-name.c:1922
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr ""
+
#: object.c:53
#, c-format
msgid "invalid object type \"%s\""
@@ -4660,23 +5353,92 @@
msgid "hash mismatch %s"
msgstr ""
-#: packfile.c:629
+#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226
+#, c-format
+msgid "unable to get size of %s"
+msgstr ""
+
+#: pack-bitmap.c:1489 builtin/rev-list.c:92
+#, c-format
+msgid "unable to get disk usage of %s"
+msgstr ""
+
+#: pack-revindex.c:220
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr ""
+
+#: pack-revindex.c:225
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr ""
+
+#: pack-revindex.c:233
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr ""
+
+#: pack-revindex.c:237
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr ""
+
+#: pack-revindex.c:242
+#, c-format
+msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
+msgstr ""
+
+#: pack-write.c:236
+msgid "cannot both write and verify reverse index"
+msgstr ""
+
+#: pack-write.c:257
+#, c-format
+msgid "could not stat: %s"
+msgstr ""
+
+#: pack-write.c:269
+#, c-format
+msgid "failed to make %s readable"
+msgstr ""
+
+#: pack-write.c:508
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr ""
+
+#: packfile.c:625
msgid "offset before end of packfile (broken .idx?)"
msgstr ""
-#: packfile.c:1899
+#: packfile.c:1934
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr ""
-#: packfile.c:1903
+#: packfile.c:1938
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr ""
-#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134
+#: parse-options-cb.c:20 parse-options-cb.c:24
#, c-format
-msgid "unable to get size of %s"
+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
@@ -4719,26 +5481,31 @@
msgid "did you mean `--%s` (with two dashes)?"
msgstr ""
-#: parse-options.c:857
+#: 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:859
+#: parse-options.c:864
#, c-format
msgid "unknown switch `%c'"
msgstr ""
-#: parse-options.c:861
+#: parse-options.c:866
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr ""
-#: parse-options.c:885
+#: parse-options.c:890
msgid "..."
msgstr ""
-#: parse-options.c:904
+#: parse-options.c:909
#, c-format
msgid "usage: %s"
msgstr ""
@@ -4746,45 +5513,20 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:910
+#: parse-options.c:915
#, c-format
msgid " or: %s"
msgstr ""
-#: parse-options.c:913
+#: parse-options.c:918
#, c-format
msgid " %s"
msgstr ""
-#: parse-options.c:952
+#: parse-options.c:957
msgid "-NUM"
msgstr ""
-#: parse-options.c:966
-#, 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:915
#, c-format
msgid "Could not make %s writable by group"
@@ -4841,27 +5583,27 @@
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr ""
-#: pathspec.c:442
+#: pathspec.c:445
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr ""
-#: pathspec.c:517
+#: pathspec.c:521
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr ""
-#: pathspec.c:527
+#: pathspec.c:531
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
-#: pathspec.c:594
+#: pathspec.c:598
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr ""
-#: pathspec.c:639
+#: pathspec.c:643
#, c-format
msgid "line is badly quoted: %s"
msgstr ""
@@ -4875,287 +5617,314 @@
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:165
#, c-format
msgid "remote error: %s"
msgstr ""
-#: preload-index.c:119
+#: preload-index.c:125
msgid "Refreshing index"
msgstr ""
-#: preload-index.c:138
+#: preload-index.c:144
#, c-format
msgid "unable to create threaded lstat: %s"
msgstr ""
-#: pretty.c:981
+#: pretty.c:984
msgid "unable to parse --pretty format"
msgstr ""
-#: promisor-remote.c:23
-msgid "Remote with no URL"
+#: promisor-remote.c:30
+msgid "promisor-remote: unable to fork off fetch subprocess"
msgstr ""
-#: promisor-remote.c:58
+#: 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 ""
-#: range-diff.c:75
+#: prune-packed.c:35
+msgid "Removing duplicate objects"
+msgstr ""
+
+#: range-diff.c:78
msgid "could not start `log`"
msgstr ""
-#: range-diff.c:77
+#: range-diff.c:80
msgid "could not read `log` output"
msgstr ""
-#: range-diff.c:96 sequencer.c:5020
+#: range-diff.c:101 sequencer.c:5318
#, c-format
msgid "could not parse commit '%s'"
msgstr ""
-#: range-diff.c:122
+#: range-diff.c:115
+#, c-format
+msgid ""
+"could not parse first line of `log` output: did not start with 'commit ': "
+"'%s'"
+msgstr ""
+
+#: range-diff.c:140
#, c-format
msgid "could not parse git header '%.*s'"
msgstr ""
-#: range-diff.c:285
+#: range-diff.c:306
msgid "failed to generate diff"
msgstr ""
-#: range-diff.c:518 range-diff.c:520
+#: range-diff.c:558
+msgid "--left-only and --right-only are mutually exclusive"
+msgstr ""
+
+#: range-diff.c:561 range-diff.c:563
#, 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:1330
+#: read-cache.c:1318
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr ""
-#: read-cache.c:1536
+#: read-cache.c:1532
msgid "Refresh index"
msgstr ""
-#: read-cache.c:1651
+#: read-cache.c:1657
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-#: read-cache.c:1661
+#: read-cache.c:1667
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-#: read-cache.c:1717
+#: read-cache.c:1723
#, c-format
msgid "bad signature 0x%08x"
msgstr ""
-#: read-cache.c:1720
+#: read-cache.c:1726
#, c-format
msgid "bad index version %d"
msgstr ""
-#: read-cache.c:1729
+#: read-cache.c:1735
msgid "bad index file sha1 signature"
msgstr ""
-#: read-cache.c:1759
+#: read-cache.c:1765
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr ""
-#: read-cache.c:1761
+#: read-cache.c:1767
#, c-format
msgid "ignoring %.4s extension"
msgstr ""
-#: read-cache.c:1798
+#: read-cache.c:1804
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr ""
-#: read-cache.c:1814
+#: read-cache.c:1820
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr ""
-#: read-cache.c:1871
+#: read-cache.c:1877
msgid "unordered stage entries in index"
msgstr ""
-#: read-cache.c:1874
+#: read-cache.c:1880
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr ""
-#: read-cache.c:1877
+#: read-cache.c:1883
#, c-format
msgid "unordered stage entries for '%s'"
msgstr ""
-#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
-#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
-#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
-#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
-#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
+#: read-cache.c:1989 read-cache.c:2280 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181
+#: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991
+#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505
+#: 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:2124
+#: read-cache.c:2133
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr ""
-#: read-cache.c:2137
+#: read-cache.c:2146
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr ""
-#: read-cache.c:2170
+#: read-cache.c:2179
#, c-format
msgid "%s: index file open failed"
msgstr ""
-#: read-cache.c:2174
+#: read-cache.c:2183
#, c-format
msgid "%s: cannot stat the open index"
msgstr ""
-#: read-cache.c:2178
+#: read-cache.c:2187
#, c-format
msgid "%s: index file smaller than expected"
msgstr ""
-#: read-cache.c:2182
+#: read-cache.c:2191
#, c-format
msgid "%s: unable to map index file"
msgstr ""
-#: read-cache.c:2224
+#: read-cache.c:2233
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr ""
-#: read-cache.c:2251
+#: read-cache.c:2260
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr ""
-#: read-cache.c:2283
+#: read-cache.c:2292
#, c-format
msgid "could not freshen shared index '%s'"
msgstr ""
-#: read-cache.c:2330
+#: read-cache.c:2339
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr ""
-#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122
+#: read-cache.c:3035 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141
#, c-format
msgid "could not close '%s'"
msgstr ""
-#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959
+#: read-cache.c:3138 sequencer.c:2487 sequencer.c:4239
#, c-format
msgid "could not stat '%s'"
msgstr ""
-#: read-cache.c:3142
+#: read-cache.c:3151
#, c-format
msgid "unable to open git dir: %s"
msgstr ""
-#: read-cache.c:3154
+#: read-cache.c:3163
#, c-format
msgid "unable to unlink: %s"
msgstr ""
-#: read-cache.c:3179
+#: read-cache.c:3188
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr ""
-#: read-cache.c:3328
+#: read-cache.c:3337
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr ""
@@ -5202,19 +5971,19 @@
msgstr[0] ""
msgstr[1] ""
-#: rebase-interactive.c:72 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:75 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:81 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"
@@ -5223,21 +5992,21 @@
"\n"
msgstr ""
-#: rebase-interactive.c:86 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:110 rerere.c:485 rerere.c:692 sequencer.c:3444
-#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252
+#: rebase-interactive.c:110 rerere.c:469 rerere.c:676 sequencer.c:3615
+#: sequencer.c:3641 sequencer.c:5424 builtin/fsck.c:329 builtin/rebase.c:272
#, c-format
msgid "could not write '%s'"
msgstr ""
-#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210
-#: builtin/rebase.c:234
+#: rebase-interactive.c:116 builtin/rebase.c:204 builtin/rebase.c:230
+#: builtin/rebase.c:254
#, c-format
msgid "could not write '%s'."
msgstr ""
@@ -5260,132 +6029,14 @@
"\n"
msgstr ""
-#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262
-#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221
-#: builtin/rebase.c:246
+#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2402
+#: builtin/rebase.c:190 builtin/rebase.c:215 builtin/rebase.c:241
+#: builtin/rebase.c:266
#, c-format
msgid "could not read '%s'."
msgstr ""
-#: refs.c:262
-#, c-format
-msgid "%s does not point to a valid object!"
-msgstr ""
-
-#: refs.c:667
-#, c-format
-msgid "ignoring dangling symref %s"
-msgstr ""
-
-#: refs.c:669 ref-filter.c:2098
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr ""
-
-#: refs.c:804
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr ""
-
-#: refs.c:814 refs.c:865
-#, c-format
-msgid "could not read ref '%s'"
-msgstr ""
-
-#: refs.c:820
-#, c-format
-msgid "ref '%s' already exists"
-msgstr ""
-
-#: refs.c:825
-#, c-format
-msgid "unexpected object ID when writing '%s'"
-msgstr ""
-
-#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905
-#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157
-#: wrapper.c:620
-#, c-format
-msgid "could not write to '%s'"
-msgstr ""
-
-#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719
-#: builtin/rebase.c:1029
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr ""
-
-#: refs.c:867
-#, c-format
-msgid "unexpected object ID when deleting '%s'"
-msgstr ""
-
-#: 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
-#, c-format
-msgid "refusing to update ref with bad name '%s'"
-msgstr ""
-
-#: refs.c:1231
-#, c-format
-msgid "update_ref failed for ref '%s': %s"
-msgstr ""
-
-#: refs.c:2023
-#, c-format
-msgid "multiple updates for ref '%s' not allowed"
-msgstr ""
-
-#: refs.c:2055
-msgid "ref updates forbidden inside quarantine environment"
-msgstr ""
-
-#: refs.c:2151 refs.c:2181
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr ""
-
-#: refs.c:2157 refs.c:2192
-#, c-format
-msgid "cannot process '%s' and '%s' at the same time"
-msgstr ""
-
-#: refs/files-backend.c:1233
-#, c-format
-msgid "could not remove reference %s"
-msgstr ""
-
-#: 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 ""
-
-#: refs/files-backend.c:1250 refs/packed-backend.c:1554
-#, c-format
-msgid "could not delete references: %s"
-msgstr ""
-
-#: refspec.c:137
-#, c-format
-msgid "invalid refspec '%s'"
-msgstr ""
-
-#: ref-filter.c:42 wt-status.c:1938
+#: ref-filter.c:42 wt-status.c:1975
msgid "gone"
msgstr ""
@@ -5404,280 +6055,399 @@
msgid "ahead %d, behind %d"
msgstr ""
-#: ref-filter.c:165
+#: ref-filter.c:175
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr ""
-#: ref-filter.c:167
+#: ref-filter.c:177
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr ""
-#: ref-filter.c:189
+#: ref-filter.c:199
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr ""
-#: ref-filter.c:193
+#: ref-filter.c:203
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr ""
-#: ref-filter.c:195
+#: ref-filter.c:205
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr ""
-#: ref-filter.c:250
+#: ref-filter.c:260
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr ""
-#: ref-filter.c:272
+#: ref-filter.c:282
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr ""
-#: ref-filter.c:280
+#: ref-filter.c:290
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr ""
-#: ref-filter.c:292
+#: ref-filter.c:302
#, c-format
msgid "%%(body) does not take arguments"
msgstr ""
-#: ref-filter.c:301
+#: ref-filter.c:315
#, c-format
-msgid "%%(subject) does not take arguments"
+msgid "unrecognized %%(subject) argument: %s"
msgstr ""
-#: ref-filter.c:323
+#: ref-filter.c:334
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr ""
+
+#: ref-filter.c:336
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr ""
-#: ref-filter.c:352
+#: ref-filter.c:367
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr ""
-#: ref-filter.c:354
+#: ref-filter.c:369
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr ""
-#: ref-filter.c:369
+#: ref-filter.c:384
#, c-format
-msgid "positive value expected objectname:short=%s"
+msgid "positive value expected '%s' in %%(%s)"
msgstr ""
-#: ref-filter.c:373
+#: ref-filter.c:388
#, c-format
-msgid "unrecognized %%(objectname) argument: %s"
+msgid "unrecognized argument '%s' in %%(%s)"
msgstr ""
-#: ref-filter.c:403
+#: ref-filter.c:402
+#, c-format
+msgid "unrecognized email option: %s"
+msgstr ""
+
+#: ref-filter.c:432
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr ""
-#: ref-filter.c:415
+#: ref-filter.c:444
#, c-format
msgid "unrecognized position:%s"
msgstr ""
-#: ref-filter.c:422
+#: ref-filter.c:451
#, c-format
msgid "unrecognized width:%s"
msgstr ""
-#: ref-filter.c:431
+#: ref-filter.c:460
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr ""
-#: ref-filter.c:439
+#: ref-filter.c:468
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr ""
-#: ref-filter.c:457
+#: ref-filter.c:486
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr ""
-#: ref-filter.c:559
+#: ref-filter.c:588
#, c-format
msgid "malformed field name: %.*s"
msgstr ""
-#: ref-filter.c:586
+#: ref-filter.c:615
#, c-format
msgid "unknown field name: %.*s"
msgstr ""
-#: ref-filter.c:590
+#: ref-filter.c:619
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
-#: ref-filter.c:714
+#: ref-filter.c:743
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr ""
-#: ref-filter.c:777
+#: ref-filter.c:806
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr ""
-#: ref-filter.c:779
+#: ref-filter.c:808
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr ""
-#: ref-filter.c:781
+#: ref-filter.c:810
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr ""
-#: ref-filter.c:809
+#: ref-filter.c:838
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr ""
-#: ref-filter.c:811
+#: ref-filter.c:840
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr ""
-#: ref-filter.c:813
+#: ref-filter.c:842
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr ""
-#: ref-filter.c:828
+#: ref-filter.c:857
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr ""
-#: ref-filter.c:885
+#: ref-filter.c:914
#, c-format
msgid "malformed format string %s"
msgstr ""
-#: ref-filter.c:1488
+#: ref-filter.c:1555
#, c-format
-msgid "no branch, rebasing %s"
+msgid "(no branch, rebasing %s)"
msgstr ""
-#: ref-filter.c:1491
+#: ref-filter.c:1558
#, c-format
-msgid "no branch, rebasing detached HEAD %s"
+msgid "(no branch, rebasing detached HEAD %s)"
msgstr ""
-#: ref-filter.c:1494
+#: ref-filter.c:1561
#, c-format
-msgid "no branch, bisect started on %s"
+msgid "(no branch, bisect started on %s)"
msgstr ""
-#: ref-filter.c:1504
-msgid "no branch"
+#: ref-filter.c:1565
+#, c-format
+msgid "(HEAD detached at %s)"
msgstr ""
-#: ref-filter.c:1540 ref-filter.c:1749
+#: ref-filter.c:1568
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr ""
+
+#: ref-filter.c:1571
+msgid "(no branch)"
+msgstr ""
+
+#: ref-filter.c:1603 ref-filter.c:1812
#, c-format
msgid "missing object %s for %s"
msgstr ""
-#: ref-filter.c:1550
+#: ref-filter.c:1613
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr ""
-#: ref-filter.c:2004
+#: ref-filter.c:1996
#, c-format
msgid "malformed object at '%s'"
msgstr ""
-#: ref-filter.c:2093
+#: ref-filter.c:2085
#, c-format
msgid "ignoring ref with broken name %s"
msgstr ""
-#: ref-filter.c:2389
+#: ref-filter.c:2090 refs.c:676
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr ""
+
+#: ref-filter.c:2430
#, c-format
msgid "format: %%(end) atom missing"
msgstr ""
-#: ref-filter.c:2489
-#, c-format
-msgid "option `%s' is incompatible with --merged"
-msgstr ""
-
-#: ref-filter.c:2492
-#, c-format
-msgid "option `%s' is incompatible with --no-merged"
-msgstr ""
-
-#: ref-filter.c:2502
+#: ref-filter.c:2529
#, c-format
msgid "malformed object name %s"
msgstr ""
-#: ref-filter.c:2507
+#: ref-filter.c:2534
#, c-format
msgid "option `%s' must point to a commit"
msgstr ""
-#: remote.c:366
+#: refs.c:264
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr ""
+
+#: refs.c:566
+#, c-format
+msgid ""
+"Using '%s' as the name for the initial branch. This default branch name\n"
+"is subject to change. To configure the initial branch name to use in all\n"
+"of your new repositories, which will suppress this warning, call:\n"
+"\n"
+"\tgit config --global init.defaultBranch <name>\n"
+"\n"
+"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"'development'. The just-created branch can be renamed via this command:\n"
+"\n"
+"\tgit branch -m <name>\n"
+msgstr ""
+
+#: refs.c:588
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr ""
+
+#: refs.c:598
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr ""
+
+#: refs.c:674
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr ""
+
+#: refs.c:922
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr ""
+
+#: refs.c:929
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr ""
+
+#: refs.c:994
+#, c-format
+msgid "log for %s is empty"
+msgstr ""
+
+#: refs.c:1086
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr ""
+
+#: refs.c:1157
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr ""
+
+#: refs.c:2051
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr ""
+
+#: refs.c:2131
+msgid "ref updates forbidden inside quarantine environment"
+msgstr ""
+
+#: refs.c:2142
+msgid "ref updates aborted by hook"
+msgstr ""
+
+#: refs.c:2242 refs.c:2272
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr ""
+
+#: refs.c:2248 refs.c:2283
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
+msgstr ""
+
+#: refs/files-backend.c:1228
+#, c-format
+msgid "could not remove reference %s"
+msgstr ""
+
+#: 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 ""
+
+#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#, c-format
+msgid "could not delete references: %s"
+msgstr ""
+
+#: refspec.c:170
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr ""
+
+#: remote.c:351
#, c-format
msgid "config remote shorthand cannot begin with '/': %s"
msgstr ""
-#: remote.c:414
+#: remote.c:399
msgid "more than one receivepack given, using the first"
msgstr ""
-#: remote.c:422
+#: remote.c:407
msgid "more than one uploadpack given, using the first"
msgstr ""
-#: remote.c:612
+#: remote.c:590
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr ""
-#: remote.c:616
+#: remote.c:594
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr ""
-#: remote.c:620
+#: remote.c:598
#, c-format
msgid "%s tracks both %s and %s"
msgstr ""
-#: remote.c:688
+#: remote.c:666
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr ""
-#: remote.c:698
+#: remote.c:676
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr ""
-#: remote.c:1004
+#: remote.c:1083
#, c-format
msgid "src refspec %s does not match any"
msgstr ""
-#: remote.c:1009
+#: remote.c:1088
#, c-format
msgid "src refspec %s matches more than one"
msgstr ""
@@ -5686,7 +6456,7 @@
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1024
+#: remote.c:1103
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
@@ -5700,7 +6470,7 @@
"Neither worked, so we gave up. You must fully qualify the ref."
msgstr ""
-#: remote.c:1044
+#: remote.c:1123
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
@@ -5708,7 +6478,7 @@
"'%s:refs/heads/%s'?"
msgstr ""
-#: remote.c:1049
+#: remote.c:1128
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
@@ -5716,7 +6486,7 @@
"'%s:refs/tags/%s'?"
msgstr ""
-#: remote.c:1054
+#: remote.c:1133
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
@@ -5724,7 +6494,7 @@
"'%s:refs/tags/%s'?"
msgstr ""
-#: remote.c:1059
+#: remote.c:1138
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
@@ -5732,114 +6502,114 @@
"'%s:refs/tags/%s'?"
msgstr ""
-#: remote.c:1095
+#: remote.c:1174
#, c-format
msgid "%s cannot be resolved to branch"
msgstr ""
-#: remote.c:1106
+#: remote.c:1185
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr ""
-#: remote.c:1118
+#: remote.c:1197
#, c-format
msgid "dst refspec %s matches more than one"
msgstr ""
-#: remote.c:1125
+#: remote.c:1204
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr ""
-#: remote.c:1628 remote.c:1729
+#: remote.c:1724 remote.c:1825
msgid "HEAD does not point to a branch"
msgstr ""
-#: remote.c:1637
+#: remote.c:1733
#, c-format
msgid "no such branch: '%s'"
msgstr ""
-#: remote.c:1640
+#: remote.c:1736
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr ""
-#: remote.c:1646
+#: remote.c:1742
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
-#: remote.c:1661
+#: remote.c:1757
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
-#: remote.c:1673
+#: remote.c:1769
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr ""
-#: remote.c:1683
+#: remote.c:1779
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr ""
-#: remote.c:1696
+#: remote.c:1792
msgid "push has no destination (push.default is 'nothing')"
msgstr ""
-#: remote.c:1718
+#: remote.c:1814
msgid "cannot resolve 'simple' push to a single destination"
msgstr ""
-#: remote.c:1844
+#: remote.c:1943
#, c-format
msgid "couldn't find remote ref %s"
msgstr ""
-#: remote.c:1857
+#: remote.c:1956
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr ""
-#: remote.c:2020
+#: remote.c:2119
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
-#: remote.c:2024
+#: remote.c:2123
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr ""
-#: remote.c:2027
+#: remote.c:2126
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr ""
-#: remote.c:2031
+#: remote.c:2130
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr ""
-#: remote.c:2034
+#: remote.c:2133
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr ""
-#: remote.c:2038
+#: remote.c:2137
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] ""
msgstr[1] ""
-#: remote.c:2044
+#: remote.c:2143
msgid " (use \"git push\" to publish your local commits)\n"
msgstr ""
-#: remote.c:2047
+#: remote.c:2146
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -5847,11 +6617,11 @@
msgstr[0] ""
msgstr[1] ""
-#: remote.c:2055
+#: remote.c:2154
msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
-#: remote.c:2058
+#: remote.c:2157
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -5862,11 +6632,11 @@
msgstr[0] ""
msgstr[1] ""
-#: remote.c:2068
+#: remote.c:2167
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
-#: remote.c:2251
+#: remote.c:2359
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr ""
@@ -5886,251 +6656,263 @@
msgid "replace depth too high for object %s"
msgstr ""
-#: rerere.c:217 rerere.c:226 rerere.c:229
+#: rerere.c:201 rerere.c:210 rerere.c:213
msgid "corrupt MERGE_RR"
msgstr ""
-#: rerere.c:264 rerere.c:269
+#: rerere.c:248 rerere.c:253
msgid "unable to write rerere record"
msgstr ""
-#: rerere.c:495
+#: rerere.c:479
#, c-format
msgid "there were errors while writing '%s' (%s)"
msgstr ""
-#: rerere.c:498
+#: rerere.c:482
#, c-format
msgid "failed to flush '%s'"
msgstr ""
-#: rerere.c:503 rerere.c:1039
+#: rerere.c:487 rerere.c:1023
#, c-format
msgid "could not parse conflict hunks in '%s'"
msgstr ""
-#: rerere.c:684
+#: rerere.c:668
#, c-format
msgid "failed utime() on '%s'"
msgstr ""
-#: rerere.c:694
+#: rerere.c:678
#, c-format
msgid "writing '%s' failed"
msgstr ""
-#: rerere.c:714
+#: rerere.c:698
#, c-format
msgid "Staged '%s' using previous resolution."
msgstr ""
-#: rerere.c:753
+#: rerere.c:737
#, c-format
msgid "Recorded resolution for '%s'."
msgstr ""
-#: rerere.c:788
+#: rerere.c:772
#, c-format
msgid "Resolved '%s' using previous resolution."
msgstr ""
-#: rerere.c:803
+#: rerere.c:787
#, c-format
msgid "cannot unlink stray '%s'"
msgstr ""
-#: rerere.c:807
+#: rerere.c:791
#, c-format
msgid "Recorded preimage for '%s'"
msgstr ""
-#: rerere.c:881 submodule.c:2078 builtin/log.c:1871
-#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
+#: rerere.c:865 submodule.c:2088 builtin/log.c:1991
+#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890
#, c-format
msgid "could not create directory '%s'"
msgstr ""
-#: rerere.c:1057
+#: rerere.c:1041
#, c-format
msgid "failed to update conflicted state in '%s'"
msgstr ""
-#: rerere.c:1068 rerere.c:1075
+#: rerere.c:1052 rerere.c:1059
#, c-format
msgid "no remembered resolution for '%s'"
msgstr ""
-#: rerere.c:1077
+#: rerere.c:1061
#, c-format
msgid "cannot unlink '%s'"
msgstr ""
-#: rerere.c:1087
+#: rerere.c:1071
#, c-format
msgid "Updated preimage for '%s'"
msgstr ""
-#: rerere.c:1096
+#: rerere.c:1080
#, c-format
msgid "Forgot resolution for '%s'\n"
msgstr ""
-#: rerere.c:1199
+#: rerere.c:1191
msgid "unable to open rr-cache directory"
msgstr ""
-#: revision.c:2497
+#: reset.c:42
+msgid "could not determine HEAD revision"
+msgstr ""
+
+#: reset.c:70 reset.c:76 sequencer.c:3468
+#, c-format
+msgid "failed to find tree of %s"
+msgstr ""
+
+#: revision.c:2338
+msgid "--unpacked=<packfile> no longer supported"
+msgstr ""
+
+#: revision.c:2668
msgid "your current branch appears to be broken"
msgstr ""
-#: revision.c:2500
+#: revision.c:2671
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr ""
-#: revision.c:2708
-msgid "--first-parent is incompatible with --bisect"
-msgstr ""
-
-#: revision.c:2712
+#: revision.c:2877
msgid "-L does not yet support diff formats besides -p and -s"
msgstr ""
-#: run-command.c:763
+#: run-command.c:767
msgid "open /dev/null failed"
msgstr ""
-#: run-command.c:1269
+#: run-command.c:1274
#, c-format
msgid "cannot create async thread: %s"
msgstr ""
-#: run-command.c:1333
+#: run-command.c:1338
#, c-format
msgid ""
"The '%s' hook was ignored because it's not set as executable.\n"
"You can disable this warning with `git config advice.ignoredHook false`."
msgstr ""
-#: send-pack.c:144
-msgid "unexpected flush packet while reading remote unpack status"
-msgstr ""
-
#: send-pack.c:146
-#, c-format
-msgid "unable to parse remote unpack status: %s"
+msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
#: send-pack.c:148
#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr ""
+
+#: send-pack.c:150
+#, c-format
msgid "remote unpack failed: %s"
msgstr ""
-#: send-pack.c:309
+#: send-pack.c:374
msgid "failed to sign the push certificate"
msgstr ""
-#: send-pack.c:423
+#: send-pack.c:467
+msgid "the receiving end does not support this repository's hash algorithm"
+msgstr ""
+
+#: send-pack.c:476
msgid "the receiving end does not support --signed push"
msgstr ""
-#: send-pack.c:425
+#: send-pack.c:478
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr ""
-#: send-pack.c:437
+#: send-pack.c:490
msgid "the receiving end does not support --atomic push"
msgstr ""
-#: send-pack.c:442
+#: send-pack.c:495
msgid "the receiving end does not support push options"
msgstr ""
-#: sequencer.c:191
+#: sequencer.c:195
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr ""
-#: sequencer.c:296
+#: sequencer.c:323
#, c-format
msgid "could not delete '%s'"
msgstr ""
-#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385
+#: sequencer.c:343 builtin/rebase.c:757 builtin/rebase.c:1602 builtin/rm.c:385
#, c-format
msgid "could not remove '%s'"
msgstr ""
-#: sequencer.c:325
+#: sequencer.c:353
msgid "revert"
msgstr ""
-#: sequencer.c:327
+#: sequencer.c:355
msgid "cherry-pick"
msgstr ""
-#: sequencer.c:329
+#: sequencer.c:357
msgid "rebase"
msgstr ""
-#: sequencer.c:331
+#: sequencer.c:359
#, c-format
msgid "unknown action: %d"
msgstr ""
-#: sequencer.c:389
+#: sequencer.c:418
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
-#: sequencer.c:392
+#: sequencer.c:421
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"and commit the result with 'git commit'"
msgstr ""
-#: sequencer.c:405 sequencer.c:2901
+#: sequencer.c:434 sequencer.c:3070
#, c-format
msgid "could not lock '%s'"
msgstr ""
-#: sequencer.c:412
+#: sequencer.c:436 sequencer.c:2869 sequencer.c:3074 sequencer.c:3088
+#: sequencer.c:3345 sequencer.c:5334 strbuf.c:1168 wrapper.c:631
+#, c-format
+msgid "could not write to '%s'"
+msgstr ""
+
+#: sequencer.c:441
#, c-format
msgid "could not write eol to '%s'"
msgstr ""
-#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921
-#: sequencer.c:3185
+#: sequencer.c:446 sequencer.c:2874 sequencer.c:3076 sequencer.c:3090
+#: sequencer.c:3353
#, c-format
msgid "failed to finalize '%s'"
msgstr ""
-#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
-#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
-#: builtin/rebase.c:593
-#, c-format
-msgid "could not read '%s'"
-msgstr ""
-
-#: sequencer.c:466
+#: sequencer.c:485
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr ""
-#: sequencer.c:470
+#: sequencer.c:489
msgid "commit your changes or stash them to proceed."
msgstr ""
-#: sequencer.c:502
+#: sequencer.c:521
#, c-format
msgid "%s: fast-forward"
msgstr ""
-#: sequencer.c:541 builtin/tag.c:565
+#: sequencer.c:560 builtin/tag.c:598
#, c-format
msgid "Invalid cleanup mode %s"
msgstr ""
@@ -6138,65 +6920,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:635
+#: sequencer.c:670
#, c-format
msgid "%s: Unable to write new index file"
msgstr ""
-#: sequencer.c:652
+#: sequencer.c:684
msgid "unable to update cache tree"
msgstr ""
-#: sequencer.c:666
+#: sequencer.c:698
msgid "could not resolve HEAD commit"
msgstr ""
-#: sequencer.c:746
+#: sequencer.c:778
#, c-format
msgid "no key present in '%.*s'"
msgstr ""
-#: sequencer.c:757
+#: sequencer.c:789
#, c-format
msgid "unable to dequote value of '%s'"
msgstr ""
-#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710
-#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072
+#: sequencer.c:826 wrapper.c:201 wrapper.c:371 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1136 builtin/rebase.c:910
#, c-format
msgid "could not open '%s' for reading"
msgstr ""
-#: sequencer.c:804
+#: sequencer.c:836
msgid "'GIT_AUTHOR_NAME' already given"
msgstr ""
-#: sequencer.c:809
+#: sequencer.c:841
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr ""
-#: sequencer.c:814
+#: sequencer.c:846
msgid "'GIT_AUTHOR_DATE' already given"
msgstr ""
-#: sequencer.c:818
+#: sequencer.c:850
#, c-format
msgid "unknown variable '%s'"
msgstr ""
-#: sequencer.c:823
+#: sequencer.c:855
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr ""
-#: sequencer.c:825
+#: sequencer.c:857
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr ""
-#: sequencer.c:827
+#: sequencer.c:859
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr ""
-#: sequencer.c:876
+#: sequencer.c:924
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -6213,11 +6995,11 @@
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:1148
+#: sequencer.c:1211
msgid "'prepare-commit-msg' hook failed"
msgstr ""
-#: sequencer.c:1154
+#: sequencer.c:1217
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6232,7 +7014,7 @@
" git commit --amend --reset-author\n"
msgstr ""
-#: sequencer.c:1167
+#: sequencer.c:1230
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6246,345 +7028,354 @@
" git commit --amend --reset-author\n"
msgstr ""
-#: sequencer.c:1209
+#: sequencer.c:1272
msgid "couldn't look up newly created commit"
msgstr ""
-#: sequencer.c:1211
+#: sequencer.c:1274
msgid "could not parse newly created commit"
msgstr ""
-#: sequencer.c:1257
+#: sequencer.c:1320
msgid "unable to resolve HEAD after creating commit"
msgstr ""
-#: sequencer.c:1259
+#: sequencer.c:1322
msgid "detached HEAD"
msgstr ""
-#: sequencer.c:1263
+#: sequencer.c:1326
msgid " (root-commit)"
msgstr ""
-#: sequencer.c:1284
+#: sequencer.c:1347
msgid "could not parse HEAD"
msgstr ""
-#: sequencer.c:1286
+#: sequencer.c:1349
#, c-format
msgid "HEAD %s is not a commit!"
msgstr ""
-#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574
+#: sequencer.c:1353 sequencer.c:1431 builtin/commit.c:1577
msgid "could not parse HEAD commit"
msgstr ""
-#: sequencer.c:1342 sequencer.c:1968
+#: sequencer.c:1409 sequencer.c:2108
msgid "unable to parse commit author"
msgstr ""
-#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687
+#: sequencer.c:1420 builtin/am.c:1566 builtin/merge.c:702
msgid "git write-tree failed to write a tree"
msgstr ""
-#: sequencer.c:1386 sequencer.c:1447
+#: sequencer.c:1453 sequencer.c:1573
#, c-format
msgid "unable to read commit message from '%s'"
msgstr ""
-#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886
-#: builtin/merge.c:911
+#: sequencer.c:1484 sequencer.c:1516
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr ""
+
+#: sequencer.c:1490
+msgid "corrupt author: missing date information"
+msgstr ""
+
+#: sequencer.c:1529 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:905
+#: builtin/merge.c:930 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr ""
-#: sequencer.c:1474
+#: sequencer.c:1556 sequencer.c:4291 t/helper/test-fast-rebase.c:198
+#, c-format
+msgid "could not update %s"
+msgstr ""
+
+#: sequencer.c:1605
#, c-format
msgid "could not parse commit %s"
msgstr ""
-#: sequencer.c:1479
+#: sequencer.c:1610
#, c-format
msgid "could not parse parent commit %s"
msgstr ""
-#: sequencer.c:1562 sequencer.c:1673
+#: sequencer.c:1693 sequencer.c:1804
#, c-format
msgid "unknown command: %d"
msgstr ""
-#: sequencer.c:1620 sequencer.c:1645
+#: sequencer.c:1751 sequencer.c:1776
#, c-format
msgid "This is a combination of %d commits."
msgstr ""
-#: sequencer.c:1630
+#: sequencer.c:1761
msgid "need a HEAD to fixup"
msgstr ""
-#: sequencer.c:1632 sequencer.c:3212
+#: sequencer.c:1763 sequencer.c:3380
msgid "could not read HEAD"
msgstr ""
-#: sequencer.c:1634
+#: sequencer.c:1765
msgid "could not read HEAD's commit message"
msgstr ""
-#: sequencer.c:1640
+#: sequencer.c:1771
#, c-format
msgid "cannot write '%s'"
msgstr ""
-#: sequencer.c:1647 git-rebase--preserve-merges.sh:496
+#: sequencer.c:1778 git-rebase--preserve-merges.sh:486
msgid "This is the 1st commit message:"
msgstr ""
-#: sequencer.c:1655
+#: sequencer.c:1786
#, c-format
msgid "could not read commit message of %s"
msgstr ""
-#: sequencer.c:1662
+#: sequencer.c:1793
#, c-format
msgid "This is the commit message #%d:"
msgstr ""
-#: sequencer.c:1668
+#: sequencer.c:1799
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr ""
-#: sequencer.c:1756
+#: sequencer.c:1887
msgid "your index file is unmerged."
msgstr ""
-#: sequencer.c:1763
+#: sequencer.c:1894
msgid "cannot fixup root commit"
msgstr ""
-#: sequencer.c:1782
+#: sequencer.c:1913
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr ""
-#: sequencer.c:1790 sequencer.c:1798
+#: sequencer.c:1921 sequencer.c:1929
#, c-format
msgid "commit %s does not have parent %d"
msgstr ""
-#: sequencer.c:1804
+#: sequencer.c:1935
#, c-format
msgid "cannot get commit message for %s"
msgstr ""
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1823
+#: sequencer.c:1954
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: sequencer.c:1888
+#: sequencer.c:2019
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr ""
-#: sequencer.c:1943
+#: sequencer.c:2079
#, c-format
msgid "could not revert %s... %s"
msgstr ""
-#: sequencer.c:1944
+#: sequencer.c:2080
#, c-format
msgid "could not apply %s... %s"
msgstr ""
-#: sequencer.c:1961
+#: sequencer.c:2100
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr ""
-#: sequencer.c:2018
+#: sequencer.c:2158
#, c-format
msgid "git %s: failed to read the index"
msgstr ""
-#: sequencer.c:2025
+#: sequencer.c:2165
#, c-format
msgid "git %s: failed to refresh the index"
msgstr ""
-#: sequencer.c:2102
+#: sequencer.c:2242
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr ""
-#: sequencer.c:2111
+#: sequencer.c:2251
#, c-format
msgid "missing arguments for %s"
msgstr ""
-#: sequencer.c:2142
+#: sequencer.c:2282
#, c-format
msgid "could not parse '%s'"
msgstr ""
-#: sequencer.c:2203
+#: sequencer.c:2343
#, c-format
msgid "invalid line %d: %.*s"
msgstr ""
-#: sequencer.c:2214
+#: sequencer.c:2354
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr ""
-#: sequencer.c:2298
+#: sequencer.c:2440
msgid "cancelling a cherry picking in progress"
msgstr ""
-#: sequencer.c:2305
+#: sequencer.c:2449
msgid "cancelling a revert in progress"
msgstr ""
-#: sequencer.c:2349
+#: sequencer.c:2493
msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: sequencer.c:2351
+#: sequencer.c:2495
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr ""
-#: sequencer.c:2356
+#: sequencer.c:2500
msgid "no commits parsed."
msgstr ""
-#: sequencer.c:2367
+#: sequencer.c:2511
msgid "cannot cherry-pick during a revert."
msgstr ""
-#: sequencer.c:2369
+#: sequencer.c:2513
msgid "cannot revert during a cherry-pick."
msgstr ""
-#: sequencer.c:2447
+#: sequencer.c:2591
#, c-format
msgid "invalid value for %s: %s"
msgstr ""
-#: sequencer.c:2540
+#: sequencer.c:2698
msgid "unusable squash-onto"
msgstr ""
-#: sequencer.c:2556
+#: sequencer.c:2718
#, c-format
msgid "malformed options sheet: '%s'"
msgstr ""
-#: sequencer.c:2644 sequencer.c:4361
+#: sequencer.c:2811 sequencer.c:4644
msgid "empty commit set passed"
msgstr ""
-#: sequencer.c:2660
+#: sequencer.c:2828
msgid "revert is already in progress"
msgstr ""
-#: sequencer.c:2662
+#: sequencer.c:2830
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr ""
-#: sequencer.c:2665
+#: sequencer.c:2833
msgid "cherry-pick is already in progress"
msgstr ""
-#: sequencer.c:2667
+#: sequencer.c:2835
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr ""
-#: sequencer.c:2681
+#: sequencer.c:2849
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr ""
-#: sequencer.c:2696
+#: sequencer.c:2864
msgid "could not lock HEAD"
msgstr ""
-#: sequencer.c:2756 sequencer.c:4099
+#: sequencer.c:2924 sequencer.c:4379
msgid "no cherry-pick or revert in progress"
msgstr ""
-#: sequencer.c:2758 sequencer.c:2769
+#: sequencer.c:2926 sequencer.c:2937
msgid "cannot resolve HEAD"
msgstr ""
-#: sequencer.c:2760 sequencer.c:2804
+#: sequencer.c:2928 sequencer.c:2972
msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: sequencer.c:2790 builtin/grep.c:724
+#: sequencer.c:2958 builtin/grep.c:757
#, c-format
msgid "cannot open '%s'"
msgstr ""
-#: sequencer.c:2792
+#: sequencer.c:2960
#, c-format
msgid "cannot read '%s': %s"
msgstr ""
-#: sequencer.c:2793
+#: sequencer.c:2961
msgid "unexpected end of file"
msgstr ""
-#: sequencer.c:2799
+#: sequencer.c:2967
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: sequencer.c:2810
+#: sequencer.c:2978
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
-#: sequencer.c:2851
+#: sequencer.c:3019
msgid "no revert in progress"
msgstr ""
-#: sequencer.c:2859
+#: sequencer.c:3028
msgid "no cherry-pick in progress"
msgstr ""
-#: sequencer.c:2869
+#: sequencer.c:3038
msgid "failed to skip the commit"
msgstr ""
-#: sequencer.c:2876
+#: sequencer.c:3045
msgid "there is nothing to skip"
msgstr ""
-#: sequencer.c:2879
+#: sequencer.c:3048
#, c-format
msgid ""
"have you committed already?\n"
"try \"git %s --continue\""
msgstr ""
-#: sequencer.c:3003 sequencer.c:4011
-#, c-format
-msgid "could not update %s"
-msgstr ""
-
-#: sequencer.c:3042 sequencer.c:3991
+#: sequencer.c:3210 sequencer.c:4271
msgid "cannot read HEAD"
msgstr ""
-#: sequencer.c:3059
+#: sequencer.c:3227
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr ""
-#: sequencer.c:3067
+#: sequencer.c:3235
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -6596,22 +7387,27 @@
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:3077
+#: sequencer.c:3245
#, c-format
msgid "Could not apply %s... %.*s"
msgstr ""
-#: sequencer.c:3084
+#: sequencer.c:3252
#, c-format
msgid "Could not merge %.*s"
msgstr ""
-#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641
+#: sequencer.c:3266 sequencer.c:3270 builtin/difftool.c:640
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr ""
-#: sequencer.c:3129
+#: sequencer.c:3282
+#, c-format
+msgid "Executing: %s\n"
+msgstr ""
+
+#: sequencer.c:3297
#, c-format
msgid ""
"execution failed: %s\n"
@@ -6621,11 +7417,11 @@
"\n"
msgstr ""
-#: sequencer.c:3135
+#: sequencer.c:3303
msgid "and made changes to the index and/or the working tree\n"
msgstr ""
-#: sequencer.c:3141
+#: sequencer.c:3309
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -6636,99 +7432,120 @@
"\n"
msgstr ""
-#: sequencer.c:3202
+#: sequencer.c:3370
#, c-format
msgid "illegal label name: '%.*s'"
msgstr ""
-#: sequencer.c:3256
+#: sequencer.c:3424
msgid "writing fake root commit"
msgstr ""
-#: sequencer.c:3261
+#: sequencer.c:3429
msgid "writing squash-onto"
msgstr ""
-#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886
-#, c-format
-msgid "failed to find tree of %s"
-msgstr ""
-
-#: sequencer.c:3344
+#: sequencer.c:3513
#, c-format
msgid "could not resolve '%s'"
msgstr ""
-#: sequencer.c:3375
+#: sequencer.c:3546
msgid "cannot merge without a current revision"
msgstr ""
-#: sequencer.c:3397
+#: sequencer.c:3568
#, c-format
msgid "unable to parse '%.*s'"
msgstr ""
-#: sequencer.c:3406
+#: sequencer.c:3577
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr ""
-#: sequencer.c:3418
+#: sequencer.c:3589
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
-#: sequencer.c:3434
+#: sequencer.c:3605
#, c-format
msgid "could not get commit message of '%s'"
msgstr ""
-#: sequencer.c:3594
+#: sequencer.c:3788
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr ""
-#: sequencer.c:3610
+#: sequencer.c:3804
msgid "merge: Unable to write new index file"
msgstr ""
-#: sequencer.c:3679 builtin/rebase.c:737
+#: sequencer.c:3878
+msgid "Cannot autostash"
+msgstr ""
+
+#: sequencer.c:3881
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr ""
+
+#: sequencer.c:3887
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr ""
+
+#: sequencer.c:3890
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr ""
+
+#: sequencer.c:3894
+msgid "could not reset --hard"
+msgstr ""
+
+#: sequencer.c:3919
#, c-format
msgid "Applied autostash.\n"
msgstr ""
-#: sequencer.c:3691
+#: sequencer.c:3931
#, c-format
msgid "cannot store %s"
msgstr ""
-#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113
+#: sequencer.c:3934
#, 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:3755
-#, c-format
-msgid "%s: not a valid OID"
+#: sequencer.c:3939
+msgid "Applying autostash resulted in conflicts."
msgstr ""
-#: sequencer.c:3760 git-rebase--preserve-merges.sh:779
+#: sequencer.c:3940
+msgid "Autostash exists; creating a new stash entry."
+msgstr ""
+
+#: sequencer.c:4033 git-rebase--preserve-merges.sh:769
msgid "could not detach HEAD"
msgstr ""
-#: sequencer.c:3775
+#: sequencer.c:4048
#, c-format
msgid "Stopped at HEAD\n"
msgstr ""
-#: sequencer.c:3777
+#: sequencer.c:4050
#, c-format
msgid "Stopped at %s\n"
msgstr ""
-#: sequencer.c:3785
+#: sequencer.c:4058
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -6741,114 +7558,124 @@
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:3869
+#: sequencer.c:4104
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr ""
+
+#: sequencer.c:4149
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr ""
-#: sequencer.c:3940
+#: sequencer.c:4220
#, c-format
msgid "unknown command %d"
msgstr ""
-#: sequencer.c:3999
+#: sequencer.c:4279
msgid "could not read orig-head"
msgstr ""
-#: sequencer.c:4004
+#: sequencer.c:4284
msgid "could not read 'onto'"
msgstr ""
-#: sequencer.c:4018
+#: sequencer.c:4298
#, c-format
msgid "could not update HEAD to %s"
msgstr ""
-#: sequencer.c:4111
+#: sequencer.c:4358
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr ""
+
+#: sequencer.c:4391
msgid "cannot rebase: You have unstaged changes."
msgstr ""
-#: sequencer.c:4120
+#: sequencer.c:4400
msgid "cannot amend non-existing commit"
msgstr ""
-#: sequencer.c:4122
+#: sequencer.c:4402
#, c-format
msgid "invalid file: '%s'"
msgstr ""
-#: sequencer.c:4124
+#: sequencer.c:4404
#, c-format
msgid "invalid contents: '%s'"
msgstr ""
-#: sequencer.c:4127
+#: sequencer.c:4407
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
-#: sequencer.c:4163 sequencer.c:4202
+#: sequencer.c:4443 sequencer.c:4482
#, c-format
msgid "could not write file: '%s'"
msgstr ""
-#: sequencer.c:4217
+#: sequencer.c:4498
msgid "could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: sequencer.c:4224
+#: sequencer.c:4505
msgid "could not commit staged changes."
msgstr ""
-#: sequencer.c:4338
+#: sequencer.c:4621
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: sequencer.c:4342
+#: sequencer.c:4625
#, c-format
msgid "%s: bad revision"
msgstr ""
-#: sequencer.c:4377
+#: sequencer.c:4660
msgid "can't revert as initial commit"
msgstr ""
-#: sequencer.c:4846
+#: sequencer.c:5137
msgid "make_script: unhandled options"
msgstr ""
-#: sequencer.c:4849
+#: sequencer.c:5140
msgid "make_script: error preparing revisions"
msgstr ""
-#: sequencer.c:5083 sequencer.c:5100
+#: sequencer.c:5382 sequencer.c:5399
msgid "nothing to do"
msgstr ""
-#: sequencer.c:5119
+#: sequencer.c:5418
msgid "could not skip unnecessary pick commands"
msgstr ""
-#: sequencer.c:5213
+#: sequencer.c:5512
msgid "the script was already rearranged."
msgstr ""
-#: setup.c:124
+#: setup.c:133
#, c-format
msgid "'%s' is outside repository at '%s'"
msgstr ""
-#: setup.c:175
+#: 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:188
+#: setup.c:198
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -6856,12 +7683,12 @@
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-#: setup.c:254
+#: setup.c:264
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr ""
-#: setup.c:273
+#: setup.c:283
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -6869,491 +7696,159 @@
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-#: setup.c:409
+#: setup.c:419
msgid "unable to set up work tree using invalid config"
msgstr ""
-#: setup.c:413
+#: setup.c:423
msgid "this operation must be run in a work tree"
msgstr ""
-#: setup.c:559
+#: setup.c:661
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr ""
-#: setup.c:567
+#: setup.c:669
msgid "unknown repository extensions found:"
msgstr ""
-#: setup.c:586
+#: 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:588
+#: setup.c:702
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr ""
-#: setup.c:590
+#: setup.c:704
#, c-format
msgid "error reading %s"
msgstr ""
-#: setup.c:592
+#: setup.c:706
#, c-format
msgid "invalid gitfile format: %s"
msgstr ""
-#: setup.c:594
+#: setup.c:708
#, c-format
msgid "no path in gitfile: %s"
msgstr ""
-#: setup.c:596
+#: setup.c:710
#, c-format
msgid "not a git repository: %s"
msgstr ""
-#: setup.c:695
+#: setup.c:812
#, c-format
msgid "'$%s' too big"
msgstr ""
-#: setup.c:709
+#: setup.c:826
#, c-format
msgid "not a git repository: '%s'"
msgstr ""
-#: setup.c:738 setup.c:740 setup.c:771
+#: setup.c:855 setup.c:857 setup.c:888
#, c-format
msgid "cannot chdir to '%s'"
msgstr ""
-#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856
+#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973
msgid "cannot come back to cwd"
msgstr ""
-#: setup.c:870
+#: setup.c:987
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr ""
-#: setup.c:1108
+#: setup.c:1225
msgid "Unable to read current working directory"
msgstr ""
-#: setup.c:1117 setup.c:1123
+#: setup.c:1234 setup.c:1240
#, c-format
msgid "cannot change to '%s'"
msgstr ""
-#: setup.c:1128
+#: setup.c:1245
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr ""
-#: setup.c:1134
+#: 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:1245
+#: 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:1289
+#: setup.c:1409
msgid "open /dev/null or dup failed"
msgstr ""
-#: setup.c:1304
+#: setup.c:1424
msgid "fork failed"
msgstr ""
-#: setup.c:1309
+#: setup.c:1429
msgid "setsid failed"
msgstr ""
-#: sha1-file.c:452
-#, c-format
-msgid "object directory %s does not exist; check .git/objects/info/alternates"
-msgstr ""
-
-#: sha1-file.c:503
-#, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr ""
-
-#: sha1-file.c:575
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr ""
-
-#: sha1-file.c:582
-#, c-format
-msgid "unable to normalize object directory: %s"
-msgstr ""
-
-#: sha1-file.c:625
-msgid "unable to fdopen alternates lockfile"
-msgstr ""
-
-#: sha1-file.c:643
-msgid "unable to read alternates file"
-msgstr ""
-
-#: sha1-file.c:650
-msgid "unable to move new alternates file into place"
-msgstr ""
-
-#: sha1-file.c:685
-#, c-format
-msgid "path '%s' does not exist"
-msgstr ""
-
-#: sha1-file.c:711
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr ""
-
-#: sha1-file.c:717
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr ""
-
-#: sha1-file.c:723
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr ""
-
-#: sha1-file.c:731
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr ""
-
-#: sha1-file.c:791
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr ""
-
-#: sha1-file.c:943
-#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
-msgstr ""
-
-#: sha1-file.c:964
-msgid "mmap failed"
-msgstr ""
-
-#: sha1-file.c:1128
-#, c-format
-msgid "object file %s is empty"
-msgstr ""
-
-#: sha1-file.c:1263 sha1-file.c:2443
-#, c-format
-msgid "corrupt loose object '%s'"
-msgstr ""
-
-#: sha1-file.c:1265 sha1-file.c:2447
-#, c-format
-msgid "garbage at end of loose object '%s'"
-msgstr ""
-
-#: sha1-file.c:1307
-msgid "invalid object type"
-msgstr ""
-
-#: sha1-file.c:1391
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr ""
-
-#: sha1-file.c:1394
-#, c-format
-msgid "unable to unpack %s header"
-msgstr ""
-
-#: sha1-file.c:1400
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr ""
-
-#: sha1-file.c:1403
-#, c-format
-msgid "unable to parse %s header"
-msgstr ""
-
-#: sha1-file.c:1629
-#, c-format
-msgid "failed to read object %s"
-msgstr ""
-
-#: sha1-file.c:1633
-#, c-format
-msgid "replacement %s not found for %s"
-msgstr ""
-
-#: sha1-file.c:1637
-#, c-format
-msgid "loose object %s (stored in %s) is corrupt"
-msgstr ""
-
-#: sha1-file.c:1641
-#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr ""
-
-#: sha1-file.c:1746
-#, c-format
-msgid "unable to write file %s"
-msgstr ""
-
-#: sha1-file.c:1753
-#, c-format
-msgid "unable to set permission to '%s'"
-msgstr ""
-
-#: sha1-file.c:1760
-msgid "file write error"
-msgstr ""
-
-#: sha1-file.c:1780
-msgid "error when closing loose object file"
-msgstr ""
-
-#: sha1-file.c:1845
-#, c-format
-msgid "insufficient permission for adding an object to repository database %s"
-msgstr ""
-
-#: sha1-file.c:1847
-msgid "unable to create temporary file"
-msgstr ""
-
-#: sha1-file.c:1871
-msgid "unable to write loose object file"
-msgstr ""
-
-#: sha1-file.c:1877
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr ""
-
-#: sha1-file.c:1881
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr ""
-
-#: sha1-file.c:1885
-#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr ""
-
-#: sha1-file.c:1895 builtin/pack-objects.c:1054
-#, c-format
-msgid "failed utime() on %s"
-msgstr ""
-
-#: sha1-file.c:1972
-#, c-format
-msgid "cannot read object for %s"
-msgstr ""
-
-#: sha1-file.c:2011
-msgid "corrupt commit"
-msgstr ""
-
-#: sha1-file.c:2019
-msgid "corrupt tag"
-msgstr ""
-
-#: sha1-file.c:2119
-#, c-format
-msgid "read error while indexing %s"
-msgstr ""
-
-#: sha1-file.c:2122
-#, c-format
-msgid "short read while indexing %s"
-msgstr ""
-
-#: sha1-file.c:2195 sha1-file.c:2205
-#, c-format
-msgid "%s: failed to insert into database"
-msgstr ""
-
-#: sha1-file.c:2211
-#, c-format
-msgid "%s: unsupported file type"
-msgstr ""
-
-#: sha1-file.c:2235
-#, c-format
-msgid "%s is not a valid object"
-msgstr ""
-
-#: sha1-file.c:2237
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr ""
-
-#: sha1-file.c:2264 builtin/index-pack.c:155
-#, c-format
-msgid "unable to open %s"
-msgstr ""
-
-#: sha1-file.c:2454 sha1-file.c:2507
-#, c-format
-msgid "hash mismatch for %s (expected %s)"
-msgstr ""
-
-#: sha1-file.c:2478
-#, c-format
-msgid "unable to mmap %s"
-msgstr ""
-
-#: sha1-file.c:2483
-#, c-format
-msgid "unable to unpack header of %s"
-msgstr ""
-
-#: sha1-file.c:2489
-#, c-format
-msgid "unable to parse header of %s"
-msgstr ""
-
-#: sha1-file.c:2500
-#, c-format
-msgid "unable to unpack contents of %s"
-msgstr ""
-
-#: sha1-name.c:486
-#, c-format
-msgid "short SHA1 %s is ambiguous"
-msgstr ""
-
-#: 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 ""
-
-#: sha1-name.c:916
-#, c-format
-msgid "log for '%.*s' only goes back to %s"
-msgstr ""
-
-#: sha1-name.c:924
-#, c-format
-msgid "log for '%.*s' only has %d entries"
-msgstr ""
-
-#: sha1-name.c:1689
-#, c-format
-msgid "path '%s' exists on disk, but not in '%.*s'"
-msgstr ""
-
-#: sha1-name.c:1695
-#, c-format
-msgid ""
-"path '%s' exists, but not '%s'\n"
-"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
-msgstr ""
-
-#: sha1-name.c:1704
-#, c-format
-msgid "path '%s' does not exist in '%.*s'"
-msgstr ""
-
-#: sha1-name.c:1732
-#, c-format
-msgid ""
-"path '%s' is in the index, but not at stage %d\n"
-"hint: Did you mean ':%d:%s'?"
-msgstr ""
-
-#: sha1-name.c:1748
-#, c-format
-msgid ""
-"path '%s' is in the index, but not '%s'\n"
-"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
-msgstr ""
-
-#: sha1-name.c:1756
-#, c-format
-msgid "path '%s' exists on disk, but not in the index"
-msgstr ""
-
-#: sha1-name.c:1758
-#, c-format
-msgid "path '%s' does not exist (neither on disk nor in the index)"
-msgstr ""
-
-#: sha1-name.c:1771
-msgid "relative path syntax can't be used outside working tree"
-msgstr ""
-
-#: sha1-name.c:1909
-#, c-format
-msgid "invalid object name '%.*s'."
-msgstr ""
-
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:837
+#: strbuf.c:848
#, c-format
msgid "%u.%2.2u GiB"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:839
+#: strbuf.c:850
#, c-format
msgid "%u.%2.2u GiB/s"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:847
+#: strbuf.c:858
#, c-format
msgid "%u.%2.2u MiB"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:849
+#: strbuf.c:860
#, c-format
msgid "%u.%2.2u MiB/s"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:856
+#: strbuf.c:867
#, c-format
msgid "%u.%2.2u KiB"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:858
+#: strbuf.c:869
#, c-format
msgid "%u.%2.2u KiB/s"
msgstr ""
#. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:864
+#: strbuf.c:875
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
@@ -7361,18 +7856,48 @@
msgstr[1] ""
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:866
+#: strbuf.c:877
#, c-format
msgid "%u byte/s"
msgid_plural "%u bytes/s"
msgstr[0] ""
msgstr[1] ""
-#: strbuf.c:1164
+#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719
+#: builtin/rebase.c:866
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr ""
+
+#: strbuf.c:1175
#, c-format
msgid "could not edit '%s'"
msgstr ""
+#: submodule-config.c:237
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr ""
+
+#: submodule-config.c:304
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr ""
+
+#: 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 ""
+
+#: submodule-config.c:766
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr ""
+
#: submodule.c:114 submodule.c:143
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
@@ -7401,137 +7926,137 @@
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr ""
-#: submodule.c:434
+#: submodule.c:435
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr ""
-#: submodule.c:815
+#: submodule.c:817
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
"same. Skipping it."
msgstr ""
-#: submodule.c:910
+#: submodule.c:920
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr ""
-#: submodule.c:995
+#: submodule.c:1005
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
"submodule %s"
msgstr ""
-#: submodule.c:1118
+#: submodule.c:1128
#, c-format
msgid "process for submodule '%s' failed"
msgstr ""
-#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045
+#: submodule.c:1157 builtin/branch.c:689 builtin/submodule--helper.c:2469
msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
-#: submodule.c:1158
+#: submodule.c:1168
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr ""
-#: submodule.c:1161
+#: submodule.c:1171
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr ""
-#: submodule.c:1453
+#: submodule.c:1463
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr ""
-#: submodule.c:1483
+#: submodule.c:1497
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr ""
-#: submodule.c:1637
+#: submodule.c:1652
#, c-format
msgid ""
"Errors during submodule fetch:\n"
"%s"
msgstr ""
-#: submodule.c:1662
+#: submodule.c:1677
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr ""
-#: submodule.c:1679
+#: submodule.c:1694
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr ""
-#: submodule.c:1720
+#: submodule.c:1735
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr ""
-#: submodule.c:1800
+#: submodule.c:1810
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr ""
-#: submodule.c:1813
+#: submodule.c:1823
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr ""
-#: submodule.c:1828
+#: submodule.c:1838
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr ""
-#: submodule.c:1855 submodule.c:2165
+#: submodule.c:1865 submodule.c:2175
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr ""
-#: submodule.c:1876
+#: submodule.c:1886
msgid "could not reset submodule index"
msgstr ""
-#: submodule.c:1918
+#: submodule.c:1928
#, c-format
msgid "submodule '%s' has dirty index"
msgstr ""
-#: submodule.c:1970
+#: submodule.c:1980
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr ""
-#: submodule.c:2038
+#: submodule.c:2048
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr ""
-#: submodule.c:2059
+#: submodule.c:2069
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr ""
-#: submodule.c:2071 submodule.c:2130
+#: submodule.c:2081 submodule.c:2140
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr ""
-#: submodule.c:2075
+#: submodule.c:2085
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr ""
-#: submodule.c:2082
+#: submodule.c:2092
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -7539,93 +8064,255 @@
"'%s'\n"
msgstr ""
-#: submodule.c:2209
+#: submodule.c:2220
msgid "could not start ls-files in .."
msgstr ""
-#: submodule.c:2248
+#: submodule.c:2260
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr ""
-#: submodule-config.c:236
-#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr ""
-
-#: submodule-config.c:303
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr ""
-
-#: submodule-config.c:401
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr ""
-
-#: submodule-config.c:498
-#, c-format
-msgid "invalid value for %s"
-msgstr ""
-
-#: submodule-config.c:765
-#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr ""
-
-#: trailer.c:238
+#: trailer.c:236
#, c-format
msgid "running trailer command '%s' failed"
msgstr ""
-#: 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 ""
-#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323
+#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324
#, c-format
msgid "more than one %s"
msgstr ""
-#: trailer.c:730
+#: trailer.c:728
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr ""
-#: trailer.c:750
+#: trailer.c:748
#, c-format
msgid "could not read input file '%s'"
msgstr ""
-#: trailer.c:753
+#: trailer.c:751 builtin/mktag.c:91
msgid "could not read from stdin"
msgstr ""
-#: trailer.c:1011 wrapper.c:665
+#: trailer.c:1009 wrapper.c:676
#, c-format
msgid "could not stat %s"
msgstr ""
-#: trailer.c:1013
+#: trailer.c:1011
#, c-format
msgid "file %s is not a regular file"
msgstr ""
-#: trailer.c:1015
+#: trailer.c:1013
#, c-format
msgid "file %s is not writable by user"
msgstr ""
-#: 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 ""
+#: 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 ""
+
+#: 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
+#, c-format
+msgid "%s unexpectedly said: '%s'"
+msgstr ""
+
+#: transport-helper.c:417
+#, c-format
+msgid "%s also locked %s"
+msgstr ""
+
+#: transport-helper.c:497
+msgid "couldn't run fast-import"
+msgstr ""
+
+#: transport-helper.c:520
+msgid "error while running fast-import"
+msgstr ""
+
+#: transport-helper.c:549 transport-helper.c:1237
+#, c-format
+msgid "could not read ref %s"
+msgstr ""
+
+#: transport-helper.c:594
+#, c-format
+msgid "unknown response to connect: %s"
+msgstr ""
+
+#: 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:1447
+msgid "operation not supported by protocol"
+msgstr ""
+
+#: 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
+#, c-format
+msgid "expected ok/error, helper said '%s'"
+msgstr ""
+
+#: transport-helper.c:845
+#, c-format
+msgid "helper reported unexpected status of %s"
+msgstr ""
+
+#: transport-helper.c:928
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr ""
+
+#: transport-helper.c:931
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr ""
+
+#: transport-helper.c:934
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr ""
+
+#: transport-helper.c:939
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr ""
+
+#: transport-helper.c:943
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr ""
+
+#: transport-helper.c:950
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr ""
+
+#: transport-helper.c:1050
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr ""
+
+#: transport-helper.c:1055
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr ""
+
+#: transport-helper.c:1102
+msgid "couldn't run fast-export"
+msgstr ""
+
+#: transport-helper.c:1107
+msgid "error while running fast-export"
+msgstr ""
+
+#: transport-helper.c:1132
+#, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch.\n"
+msgstr ""
+
+#: transport-helper.c:1214
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr ""
+
+#: transport-helper.c:1223
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr ""
+
+#: transport-helper.c:1375
+#, c-format
+msgid "read(%s) failed"
+msgstr ""
+
+#: transport-helper.c:1402
+#, c-format
+msgid "write(%s) failed"
+msgstr ""
+
+#: transport-helper.c:1451
+#, c-format
+msgid "%s thread failed"
+msgstr ""
+
+#: transport-helper.c:1455
+#, c-format
+msgid "%s thread failed to join: %s"
+msgstr ""
+
+#: transport-helper.c:1474 transport-helper.c:1478
+#, c-format
+msgid "can't start thread for copying data: %s"
+msgstr ""
+
+#: transport-helper.c:1515
+#, c-format
+msgid "%s process failed to wait"
+msgstr ""
+
+#: transport-helper.c:1519
+#, c-format
+msgid "%s process failed"
+msgstr ""
+
+#: transport-helper.c:1537 transport-helper.c:1546
+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"
@@ -7636,49 +8323,49 @@
msgid "could not read bundle '%s'"
msgstr ""
-#: transport.c:214
+#: transport.c:220
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr ""
-#: transport.c:266
+#: transport.c:269
msgid "see protocol.version in 'git help config' for more details"
msgstr ""
-#: transport.c:267
+#: transport.c:270
msgid "server options require protocol version 2 or later"
msgstr ""
-#: transport.c:632
+#: transport.c:727
msgid "could not parse transport.color.* config"
msgstr ""
-#: transport.c:705
+#: transport.c:802
msgid "support for protocol v2 not implemented yet"
msgstr ""
-#: transport.c:831
+#: transport.c:936
#, c-format
msgid "unknown value for config '%s': %s"
msgstr ""
-#: transport.c:897
+#: transport.c:1002
#, c-format
msgid "transport '%s' not allowed"
msgstr ""
-#: transport.c:949
+#: transport.c:1055
msgid "git-over-rsync is no longer supported"
msgstr ""
-#: transport.c:1044
+#: transport.c:1157
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr ""
-#: transport.c:1048
+#: transport.c:1161
#, c-format
msgid ""
"\n"
@@ -7694,294 +8381,122 @@
"\n"
msgstr ""
-#: transport.c:1056
+#: transport.c:1169
msgid "Aborting."
msgstr ""
-#: transport.c:1201
+#: transport.c:1316
msgid "failed to push all needed submodules"
msgstr ""
-#: transport.c:1345 transport-helper.c:657
-msgid "operation not supported by protocol"
-msgstr ""
-
-#: transport-helper.c:61 transport-helper.c:90
-msgid "full write to remote helper failed"
-msgstr ""
-
-#: transport-helper.c:144
-#, c-format
-msgid "unable to find remote helper for '%s'"
-msgstr ""
-
-#: transport-helper.c:160 transport-helper.c:571
-msgid "can't dup helper output fd"
-msgstr ""
-
-#: transport-helper.c:211
-#, c-format
-msgid ""
-"unknown mandatory capability %s; this remote helper probably needs newer "
-"version of Git"
-msgstr ""
-
-#: transport-helper.c:217
-msgid "this remote helper should implement refspec capability"
-msgstr ""
-
-#: transport-helper.c:284 transport-helper.c:425
-#, c-format
-msgid "%s unexpectedly said: '%s'"
-msgstr ""
-
-#: transport-helper.c:414
-#, c-format
-msgid "%s also locked %s"
-msgstr ""
-
-#: transport-helper.c:493
-msgid "couldn't run fast-import"
-msgstr ""
-
-#: transport-helper.c:516
-msgid "error while running fast-import"
-msgstr ""
-
-#: transport-helper.c:545 transport-helper.c:1134
-#, c-format
-msgid "could not read ref %s"
-msgstr ""
-
-#: transport-helper.c:590
-#, c-format
-msgid "unknown response to connect: %s"
-msgstr ""
-
-#: transport-helper.c:612
-msgid "setting remote service path not supported by protocol"
-msgstr ""
-
-#: transport-helper.c:614
-msgid "invalid remote service path"
-msgstr ""
-
-#: transport-helper.c:660
-#, c-format
-msgid "can't connect to subservice %s"
-msgstr ""
-
-#: transport-helper.c:736
-#, c-format
-msgid "expected ok/error, helper said '%s'"
-msgstr ""
-
-#: transport-helper.c:789
-#, c-format
-msgid "helper reported unexpected status of %s"
-msgstr ""
-
-#: transport-helper.c:850
-#, c-format
-msgid "helper %s does not support dry-run"
-msgstr ""
-
-#: transport-helper.c:853
-#, c-format
-msgid "helper %s does not support --signed"
-msgstr ""
-
-#: transport-helper.c:856
-#, c-format
-msgid "helper %s does not support --signed=if-asked"
-msgstr ""
-
-#: transport-helper.c:861
-#, c-format
-msgid "helper %s does not support --atomic"
-msgstr ""
-
-#: transport-helper.c:867
-#, c-format
-msgid "helper %s does not support 'push-option'"
-msgstr ""
-
-#: transport-helper.c:965
-msgid "remote-helper doesn't support push; refspec needed"
-msgstr ""
-
-#: transport-helper.c:970
-#, c-format
-msgid "helper %s does not support 'force'"
-msgstr ""
-
-#: transport-helper.c:1017
-msgid "couldn't run fast-export"
-msgstr ""
-
-#: transport-helper.c:1022
-msgid "error while running fast-export"
-msgstr ""
-
-#: transport-helper.c:1047
-#, c-format
-msgid ""
-"No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch such as 'master'.\n"
-msgstr ""
-
-#: transport-helper.c:1120
-#, c-format
-msgid "malformed response in ref list: %s"
-msgstr ""
-
-#: transport-helper.c:1272
-#, c-format
-msgid "read(%s) failed"
-msgstr ""
-
-#: transport-helper.c:1299
-#, c-format
-msgid "write(%s) failed"
-msgstr ""
-
-#: transport-helper.c:1348
-#, c-format
-msgid "%s thread failed"
-msgstr ""
-
-#: transport-helper.c:1352
-#, c-format
-msgid "%s thread failed to join: %s"
-msgstr ""
-
-#: transport-helper.c:1371 transport-helper.c:1375
-#, c-format
-msgid "can't start thread for copying data: %s"
-msgstr ""
-
-#: transport-helper.c:1412
-#, c-format
-msgid "%s process failed to wait"
-msgstr ""
-
-#: transport-helper.c:1416
-#, c-format
-msgid "%s process failed"
-msgstr ""
-
-#: transport-helper.c:1434 transport-helper.c:1443
-msgid "can't start thread for copying data"
-msgstr ""
-
-#: tree-walk.c:32
+#: tree-walk.c:33
msgid "too-short tree object"
msgstr ""
-#: tree-walk.c:38
+#: tree-walk.c:39
msgid "malformed mode in tree entry"
msgstr ""
-#: tree-walk.c:42
+#: tree-walk.c:43
msgid "empty filename in tree entry"
msgstr ""
-#: tree-walk.c:117
+#: tree-walk.c:118
msgid "too-short tree file"
msgstr ""
-#: unpack-trees.c:110
+#: unpack-trees.c: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:112
+#: 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:115
+#: 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:117
+#: 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:120
+#: 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:122
+#: 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:127
+#: unpack-trees.c:130
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
"%s"
msgstr ""
-#: unpack-trees.c:131
+#: 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:133
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
-msgstr ""
-
#: unpack-trees.c:136
#, c-format
msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+
+#: 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:138
+#: unpack-trees.c:141
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:141
+#: 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:143
+#: unpack-trees.c:146
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:149
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -7989,7 +8504,7 @@
"%%sPlease move or remove them before you switch branches."
msgstr ""
-#: unpack-trees.c:151
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -7997,89 +8512,100 @@
"%%s"
msgstr ""
-#: unpack-trees.c:154
+#: 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:156
+#: unpack-trees.c:159
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:159
+#: 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:161
+#: unpack-trees.c:164
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:169
+#: unpack-trees.c:172
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr ""
-#: unpack-trees.c:172
-#, c-format
-msgid ""
-"Cannot update sparse checkout: the following entries are not up to date:\n"
-"%s"
-msgstr ""
-
-#: unpack-trees.c:174
-#, c-format
-msgid ""
-"The following working tree files would be overwritten by sparse checkout "
-"update:\n"
-"%s"
-msgstr ""
-
-#: unpack-trees.c:176
-#, c-format
-msgid ""
-"The following working tree files would be removed by sparse checkout "
-"update:\n"
-"%s"
-msgstr ""
-
-#: unpack-trees.c:178
+#: unpack-trees.c:175
#, c-format
msgid ""
"Cannot update submodule:\n"
"%s"
msgstr ""
-#: unpack-trees.c:255
+#: unpack-trees.c:178
+#, c-format
+msgid ""
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:180
+#, c-format
+msgid ""
+"The following paths are unmerged and were left despite sparse patterns:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:182
+#, c-format
+msgid ""
+"The following paths were already present and thus not updated despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:262
#, c-format
msgid "Aborting\n"
msgstr ""
-#: unpack-trees.c:317
+#: 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:349
+#: 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:1445
+#: unpack-trees.c:1498
msgid "Updating index flags"
msgstr ""
+#: upload-pack.c:1543
+msgid "expected flush after fetch arguments"
+msgstr ""
+
#: urlmatch.c:163
msgid "invalid URL scheme name or missing '://' suffix"
msgstr ""
@@ -8113,27 +8639,27 @@
msgid "Fetching objects"
msgstr ""
-#: worktree.c:259 builtin/am.c:2099
+#: worktree.c:238 builtin/am.c:2103
#, c-format
msgid "failed to read '%s'"
msgstr ""
-#: worktree.c:305
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr ""
-#: worktree.c:316
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
-#: worktree.c:328
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr ""
-#: worktree.c:334
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr ""
@@ -8143,17 +8669,83 @@
msgid "'%s' does not point back to '%s'"
msgstr ""
-#: wrapper.c:186 wrapper.c:356
+#: worktree.c:608
+msgid "not a directory"
+msgstr ""
+
+#: worktree.c:617
+msgid ".git is not a file"
+msgstr ""
+
+#: worktree.c:619
+msgid ".git file broken"
+msgstr ""
+
+#: worktree.c:621
+msgid ".git file incorrect"
+msgstr ""
+
+#: worktree.c:727
+msgid "not a valid path"
+msgstr ""
+
+#: worktree.c:733
+msgid "unable to locate repository; .git is not a file"
+msgstr ""
+
+#: worktree.c:737
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr ""
+
+#: worktree.c:741
+msgid "unable to locate repository; .git file broken"
+msgstr ""
+
+#: worktree.c:747
+msgid "gitdir unreadable"
+msgstr ""
+
+#: worktree.c:751
+msgid "gitdir incorrect"
+msgstr ""
+
+#: worktree.c:776
+msgid "not a valid directory"
+msgstr ""
+
+#: worktree.c:782
+msgid "gitdir file does not exist"
+msgstr ""
+
+#: worktree.c:787 worktree.c:796
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr ""
+
+#: worktree.c:806
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr ""
+
+#: worktree.c:814
+msgid "invalid gitdir file"
+msgstr ""
+
+#: worktree.c:822
+msgid "gitdir file points to non-existent location"
+msgstr ""
+
+#: wrapper.c:197 wrapper.c:367
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr ""
-#: wrapper.c:387 wrapper.c:588
+#: wrapper.c:398 wrapper.c:599
#, c-format
msgid "unable to access '%s'"
msgstr ""
-#: wrapper.c:596
+#: wrapper.c:607
msgid "unable to get current working directory"
msgstr ""
@@ -8186,11 +8778,11 @@
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
-#: wt-status.c:211 wt-status.c:1074
+#: wt-status.c:211 wt-status.c:1072
msgid "Changes to be committed:"
msgstr ""
-#: wt-status.c:234 wt-status.c:1083
+#: wt-status.c:234 wt-status.c:1081
msgid "Changes not staged for commit:"
msgstr ""
@@ -8216,100 +8808,100 @@
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:905
#, 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:936
msgid "Submodules changed but not updated:"
msgstr ""
-#: wt-status.c:940
+#: wt-status.c:938
msgid "Submodule changes to be committed:"
msgstr ""
-#: wt-status.c:1022
+#: wt-status.c:1020
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
msgstr ""
-#: wt-status.c:1114
+#: wt-status.c:1112
#, c-format
msgid ""
"\n"
@@ -8317,242 +8909,255 @@
"You can use '--no-ahead-behind' to avoid this.\n"
msgstr ""
-#: wt-status.c:1144
+#: wt-status.c:1142
msgid "You have unmerged paths."
msgstr ""
-#: wt-status.c:1147
+#: wt-status.c:1145
msgid " (fix conflicts and run \"git commit\")"
msgstr ""
-#: wt-status.c:1149
+#: wt-status.c:1147
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr ""
-#: wt-status.c:1153
+#: wt-status.c:1151
msgid "All conflicts fixed but you are still merging."
msgstr ""
-#: wt-status.c:1156
+#: wt-status.c:1154
msgid " (use \"git commit\" to conclude merge)"
msgstr ""
-#: wt-status.c:1165
+#: wt-status.c:1163
msgid "You are in the middle of an am session."
msgstr ""
-#: wt-status.c:1168
+#: wt-status.c:1166
msgid "The current patch is empty."
msgstr ""
-#: wt-status.c:1172
+#: wt-status.c:1170
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr ""
-#: wt-status.c:1174
+#: wt-status.c:1172
msgid " (use \"git am --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:1176
+#: wt-status.c:1174
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
-#: wt-status.c:1309
+#: wt-status.c:1307
msgid "git-rebase-todo is missing."
msgstr ""
-#: wt-status.c:1311
+#: wt-status.c:1309
msgid "No commands done."
msgstr ""
-#: 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] ""
msgstr[1] ""
-#: wt-status.c:1325
+#: wt-status.c:1323
#, c-format
msgid " (see more in file %s)"
msgstr ""
-#: wt-status.c:1330
+#: wt-status.c:1328
msgid "No commands remaining."
msgstr ""
-#: 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] ""
msgstr[1] ""
-#: wt-status.c:1341
+#: wt-status.c:1339
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr ""
-#: wt-status.c:1353
+#: wt-status.c:1351
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1358
+#: wt-status.c:1356
msgid "You are currently rebasing."
msgstr ""
-#: wt-status.c:1371
+#: wt-status.c:1369
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1373
+#: wt-status.c:1371
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:1375
+#: wt-status.c:1373
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
-#: wt-status.c:1382
+#: wt-status.c:1380
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1386
+#: wt-status.c:1384
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1391
+#: wt-status.c:1389
msgid "You are currently splitting a commit during a rebase."
msgstr ""
-#: wt-status.c:1394
+#: wt-status.c:1392
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1398
+#: wt-status.c:1396
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1403
+#: wt-status.c:1401
msgid "You are currently editing a commit during a rebase."
msgstr ""
-#: wt-status.c:1406
+#: wt-status.c:1404
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
-#: wt-status.c:1408
+#: wt-status.c:1406
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
-#: wt-status.c:1419
+#: wt-status.c:1417
msgid "Cherry-pick currently in progress."
msgstr ""
-#: wt-status.c:1422
+#: wt-status.c:1420
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr ""
-#: wt-status.c:1429
+#: wt-status.c:1427
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
-#: wt-status.c:1432
+#: wt-status.c:1430
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr ""
-#: wt-status.c:1435
+#: wt-status.c:1433
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
-#: wt-status.c:1437
+#: wt-status.c:1435
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:1439
+#: wt-status.c:1437
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
-#: wt-status.c:1449
+#: wt-status.c:1447
msgid "Revert currently in progress."
msgstr ""
-#: wt-status.c:1452
+#: wt-status.c:1450
#, c-format
msgid "You are currently reverting commit %s."
msgstr ""
-#: wt-status.c:1458
+#: wt-status.c:1456
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr ""
-#: wt-status.c:1461
+#: wt-status.c:1459
msgid " (run \"git revert --continue\" to continue)"
msgstr ""
-#: wt-status.c:1464
+#: wt-status.c:1462
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
-#: wt-status.c:1466
+#: wt-status.c:1464
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:1468
+#: wt-status.c:1466
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
-#: wt-status.c:1478
+#: wt-status.c:1476
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr ""
-#: wt-status.c:1482
+#: wt-status.c:1480
msgid "You are currently bisecting."
msgstr ""
-#: wt-status.c:1485
+#: wt-status.c:1483
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
-#: wt-status.c:1694
+#: wt-status.c:1494
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr ""
+
+#: wt-status.c:1733
msgid "On branch "
msgstr ""
-#: wt-status.c:1701
+#: wt-status.c:1740
msgid "interactive rebase in progress; onto "
msgstr ""
-#: wt-status.c:1703
+#: wt-status.c:1742
msgid "rebase in progress; onto "
msgstr ""
-#: wt-status.c:1713
+#: wt-status.c:1747
+msgid "HEAD detached at "
+msgstr ""
+
+#: wt-status.c:1749
+msgid "HEAD detached from "
+msgstr ""
+
+#: wt-status.c:1752
msgid "Not currently on any branch."
msgstr ""
-#: wt-status.c:1730
+#: wt-status.c:1769
msgid "Initial commit"
msgstr ""
-#: wt-status.c:1731
+#: wt-status.c:1770
msgid "No commits yet"
msgstr ""
-#: wt-status.c:1745
+#: wt-status.c:1784
msgid "Untracked files"
msgstr ""
-#: wt-status.c:1747
+#: wt-status.c:1786
msgid "Ignored files"
msgstr ""
-#: wt-status.c:1751
+#: wt-status.c:1790
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -8560,97 +9165,97 @@
"new files yourself (see 'git help status')."
msgstr ""
-#: wt-status.c:1757
+#: wt-status.c:1796
#, c-format
msgid "Untracked files not listed%s"
msgstr ""
-#: wt-status.c:1759
+#: wt-status.c:1798
msgid " (use -u option to show untracked files)"
msgstr ""
-#: wt-status.c:1765
+#: wt-status.c:1804
msgid "No changes"
msgstr ""
-#: wt-status.c:1770
+#: wt-status.c:1809
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-#: wt-status.c:1773
+#: wt-status.c:1813
#, c-format
msgid "no changes added to commit\n"
msgstr ""
-#: wt-status.c:1776
+#: wt-status.c:1817
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr ""
-#: wt-status.c:1779
+#: wt-status.c:1821
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
-#: wt-status.c:1782
+#: wt-status.c:1825
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-#: wt-status.c:1785 wt-status.c:1790
+#: wt-status.c:1829 wt-status.c:1835
#, c-format
msgid "nothing to commit\n"
msgstr ""
-#: wt-status.c:1788
+#: wt-status.c:1832
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-#: wt-status.c:1792
+#: wt-status.c:1837
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr ""
-#: wt-status.c:1905
+#: wt-status.c:1942
msgid "No commits yet on "
msgstr ""
-#: wt-status.c:1909
+#: wt-status.c:1946
msgid "HEAD (no branch)"
msgstr ""
-#: wt-status.c:1940
+#: wt-status.c:1977
msgid "different"
msgstr ""
-#: wt-status.c:1942 wt-status.c:1950
+#: wt-status.c:1979 wt-status.c:1987
msgid "behind "
msgstr ""
-#: wt-status.c:1945 wt-status.c:1948
+#: wt-status.c:1982 wt-status.c:1985
msgid "ahead "
msgstr ""
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2470
+#: wt-status.c:2507
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr ""
-#: wt-status.c:2476
+#: wt-status.c:2513
msgid "additionally, your index contains uncommitted changes."
msgstr ""
-#: wt-status.c:2478
+#: wt-status.c:2515
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
-#: compat/precompose_utf8.c:58 builtin/clone.c:455
+#: compat/precompose_utf8.c:58 builtin/clone.c:457
#, c-format
msgid "failed to unlink '%s'"
msgstr ""
@@ -8659,126 +9264,131 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/add.c:88
+#: builtin/add.c:58
+#, c-format
+msgid "cannot chmod %cx '%s'"
+msgstr ""
+
+#: builtin/add.c:96
#, c-format
msgid "unexpected diff status %c"
msgstr ""
-#: builtin/add.c:93 builtin/commit.c:288
+#: builtin/add.c:101 builtin/commit.c:285
msgid "updating files failed"
msgstr ""
-#: builtin/add.c:103
+#: builtin/add.c:111
#, c-format
msgid "remove '%s'\n"
msgstr ""
-#: builtin/add.c:178
+#: builtin/add.c:186
msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#: builtin/add.c:266 builtin/rev-parse.c:899
+#: builtin/add.c:280 builtin/rev-parse.c:991
msgid "Could not read the index"
msgstr ""
-#: builtin/add.c:277
+#: builtin/add.c:291
#, c-format
msgid "Could not open '%s' for writing."
msgstr ""
-#: builtin/add.c:281
+#: builtin/add.c:295
msgid "Could not write patch"
msgstr ""
-#: builtin/add.c:284
+#: builtin/add.c:298
msgid "editing patch failed"
msgstr ""
-#: builtin/add.c:287
+#: builtin/add.c:301
#, c-format
msgid "Could not stat '%s'"
msgstr ""
-#: builtin/add.c:289
+#: builtin/add.c:303
msgid "Empty patch. Aborted."
msgstr ""
-#: builtin/add.c:294
+#: builtin/add.c:308
#, c-format
msgid "Could not apply '%s'"
msgstr ""
-#: builtin/add.c:302
+#: builtin/add.c:316
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
-#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548
-#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
+#: builtin/add.c:336 builtin/clean.c:904 builtin/fetch.c:169 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559
+#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190
msgid "dry run"
msgstr ""
-#: builtin/add.c:325
+#: builtin/add.c:339
msgid "interactive picking"
msgstr ""
-#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307
+#: builtin/add.c:340 builtin/checkout.c:1546 builtin/reset.c:308
msgid "select hunks interactively"
msgstr ""
-#: builtin/add.c:327
+#: builtin/add.c:341
msgid "edit current diff and apply"
msgstr ""
-#: builtin/add.c:328
+#: builtin/add.c:342
msgid "allow adding otherwise ignored files"
msgstr ""
-#: builtin/add.c:329
+#: builtin/add.c:343
msgid "update tracked files"
msgstr ""
-#: builtin/add.c:330
+#: builtin/add.c:344
msgid "renormalize EOL of tracked files (implies -u)"
msgstr ""
-#: builtin/add.c:331
+#: builtin/add.c:345
msgid "record only the fact that the path will be added later"
msgstr ""
-#: builtin/add.c:332
+#: builtin/add.c:346
msgid "add changes from all tracked and untracked files"
msgstr ""
-#: builtin/add.c:335
+#: builtin/add.c:349
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
-#: builtin/add.c:337
+#: builtin/add.c:351
msgid "don't add, only refresh the index"
msgstr ""
-#: builtin/add.c:338
+#: builtin/add.c:352
msgid "just skip files which cannot be added because of errors"
msgstr ""
-#: builtin/add.c:339
+#: builtin/add.c:353
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
-#: builtin/add.c:341 builtin/update-index.c:1004
+#: builtin/add.c:355 builtin/update-index.c:1004
msgid "override the executable bit of the listed files"
msgstr ""
-#: builtin/add.c:343
+#: builtin/add.c:357
msgid "warn when adding an embedded repository"
msgstr ""
-#: builtin/add.c:345
+#: builtin/add.c:359
msgid "backend for `git stash -p`"
msgstr ""
-#: builtin/add.c:363
+#: builtin/add.c:377
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -8796,59 +9406,59 @@
"See \"git help submodule\" for more information."
msgstr ""
-#: builtin/add.c:391
+#: builtin/add.c:405
#, c-format
msgid "adding embedded git repository: %s"
msgstr ""
-#: builtin/add.c:410
+#: builtin/add.c:424
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:419
+#: builtin/add.c:433
msgid "adding files failed"
msgstr ""
-#: builtin/add.c:447 builtin/commit.c:348
+#: builtin/add.c:461 builtin/commit.c:345
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
msgstr ""
-#: builtin/add.c:464
+#: builtin/add.c:478
msgid "--pathspec-from-file is incompatible with --edit"
msgstr ""
-#: builtin/add.c:476
+#: builtin/add.c:490
msgid "-A and -u are mutually incompatible"
msgstr ""
-#: builtin/add.c:479
+#: builtin/add.c:493
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
-#: builtin/add.c:483
+#: builtin/add.c:497
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr ""
-#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354
-#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509
+#: builtin/add.c:515 builtin/checkout.c:1714 builtin/commit.c:351
+#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1569
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr ""
-#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360
-#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515
+#: builtin/add.c:522 builtin/checkout.c:1726 builtin/commit.c:357
+#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1575
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr ""
-#: builtin/add.c:512
+#: builtin/add.c:526
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr ""
-#: builtin/add.c:514
+#: builtin/add.c:528
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
@@ -8903,7 +9513,7 @@
msgid "Patch format detection failed."
msgstr ""
-#: builtin/am.c:953 builtin/clone.c:409
+#: builtin/am.c:953 builtin/clone.c:410
#, c-format
msgid "failed to create directory '%s'"
msgstr ""
@@ -8971,12 +9581,12 @@
msgid "applying to an empty history"
msgstr ""
-#: builtin/am.c:1621 builtin/am.c:1625
+#: builtin/am.c:1626 builtin/am.c:1630
#, c-format
msgid "cannot resume: %s does not exist."
msgstr ""
-#: builtin/am.c:1643
+#: builtin/am.c:1648
msgid "Commit Body is:"
msgstr ""
@@ -8984,46 +9594,46 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1653
+#: builtin/am.c:1658
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
-#: builtin/am.c:1700 builtin/commit.c:398
+#: builtin/am.c:1704 builtin/commit.c:395
msgid "unable to write index file"
msgstr ""
-#: builtin/am.c:1704
+#: builtin/am.c:1708
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
-#: builtin/am.c:1744 builtin/am.c:1812
+#: builtin/am.c:1748 builtin/am.c:1816
#, c-format
msgid "Applying: %.*s"
msgstr ""
-#: builtin/am.c:1761
+#: builtin/am.c:1765
msgid "No changes -- Patch already applied."
msgstr ""
-#: builtin/am.c:1767
+#: builtin/am.c:1771
#, c-format
msgid "Patch failed at %s %.*s"
msgstr ""
-#: builtin/am.c:1771
+#: builtin/am.c:1775
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr ""
-#: builtin/am.c:1815
+#: builtin/am.c:1819
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"already introduced the same changes; you might want to skip this patch."
msgstr ""
-#: builtin/am.c:1822
+#: builtin/am.c:1826
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -9031,195 +9641,197 @@
"You might run `git rm` on a file to accept \"deleted by them\" for it."
msgstr ""
-#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346
-#: builtin/reset.c:354
+#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 builtin/reset.c:347
+#: builtin/reset.c:355
#, c-format
msgid "Could not parse object '%s'."
msgstr ""
-#: builtin/am.c:1981
+#: builtin/am.c:1985
msgid "failed to clean index"
msgstr ""
-#: builtin/am.c:2025
+#: builtin/am.c:2029
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr ""
-#: builtin/am.c:2132
+#: builtin/am.c:2136
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr ""
-#: builtin/am.c:2172
+#: builtin/am.c:2178
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr ""
-#: builtin/am.c:2176
+#: builtin/am.c:2182
#, c-format
msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
msgstr ""
-#: builtin/am.c:2207
+#: builtin/am.c:2213
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr ""
-#: builtin/am.c:2208
+#: builtin/am.c:2214
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr ""
-#: builtin/am.c:2214
+#: builtin/am.c:2220
msgid "run interactively"
msgstr ""
-#: builtin/am.c:2216
+#: builtin/am.c:2222
msgid "historical option -- no-op"
msgstr ""
-#: builtin/am.c:2218
+#: builtin/am.c:2224
msgid "allow fall back on 3way merging if needed"
msgstr ""
-#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:304 builtin/stash.c:812
+#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16
+#: builtin/repack.c:334 builtin/stash.c:882
msgid "be quiet"
msgstr ""
-#: builtin/am.c:2221
-msgid "add a Signed-off-by line to the commit message"
-msgstr ""
-
-#: builtin/am.c:2224
-msgid "recode into utf8 (default)"
-msgstr ""
-
-#: builtin/am.c:2226
-msgid "pass -k flag to git-mailinfo"
-msgstr ""
-
-#: builtin/am.c:2228
-msgid "pass -b flag to git-mailinfo"
+#: builtin/am.c:2227
+msgid "add a Signed-off-by trailer to the commit message"
msgstr ""
#: builtin/am.c:2230
-msgid "pass -m flag to git-mailinfo"
+msgid "recode into utf8 (default)"
msgstr ""
#: builtin/am.c:2232
-msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+msgid "pass -k flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2235
-msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
+#: builtin/am.c:2234
+msgid "pass -b flag to git-mailinfo"
+msgstr ""
+
+#: builtin/am.c:2236
+msgid "pass -m flag to git-mailinfo"
msgstr ""
#: builtin/am.c:2238
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+msgstr ""
+
+#: builtin/am.c:2241
+msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
+msgstr ""
+
+#: builtin/am.c:2244
msgid "strip everything before a scissors line"
msgstr ""
-#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249
-#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261
-#: builtin/am.c:2267
+#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
+#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
+#: builtin/am.c:2273
msgid "pass it through git-apply"
msgstr ""
-#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670
-#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250
-#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505
-#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321
-#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:154 parse-options.h:175 parse-options.h:316
+#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:904 builtin/merge.c:261
+#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
+#: builtin/rebase.c:1347 builtin/repack.c:345 builtin/repack.c:349
+#: builtin/repack.c:351 builtin/show-branch.c:650 builtin/show-ref.c:172
+#: builtin/tag.c:436 parse-options.h:154 parse-options.h:175
+#: parse-options.h:316
msgid "n"
msgstr ""
-#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38
+#: builtin/am.c:2269 builtin/branch.c:670 builtin/bugreport.c:136
+#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:470
+#: builtin/verify-tag.c:38
msgid "format"
msgstr ""
-#: builtin/am.c:2264
+#: builtin/am.c:2270
msgid "format the patch(es) are in"
msgstr ""
-#: builtin/am.c:2270
+#: builtin/am.c:2276
msgid "override error message when patch failure occurs"
msgstr ""
-#: builtin/am.c:2272
+#: builtin/am.c:2278
msgid "continue applying patches after resolving a conflict"
msgstr ""
-#: builtin/am.c:2275
+#: builtin/am.c:2281
msgid "synonyms for --continue"
msgstr ""
-#: builtin/am.c:2278
+#: builtin/am.c:2284
msgid "skip the current patch"
msgstr ""
-#: builtin/am.c:2281
-msgid "restore the original branch and abort the patching operation."
+#: builtin/am.c:2287
+msgid "restore the original branch and abort the patching operation"
msgstr ""
-#: builtin/am.c:2284
-msgid "abort the patching operation but keep HEAD where it is."
+#: builtin/am.c:2290
+msgid "abort the patching operation but keep HEAD where it is"
msgstr ""
-#: builtin/am.c:2288
+#: builtin/am.c:2294
msgid "show the patch being applied"
msgstr ""
-#: builtin/am.c:2293
+#: builtin/am.c:2299
msgid "lie about committer date"
msgstr ""
-#: builtin/am.c:2295
+#: builtin/am.c:2301
msgid "use current timestamp for author date"
msgstr ""
-#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512
-#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517
-#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418
+#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515
+#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:538
+#: builtin/rebase.c:1400 builtin/revert.c:117 builtin/tag.c:451
msgid "key-id"
msgstr ""
-#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
+#: builtin/am.c:2304 builtin/rebase.c:539 builtin/rebase.c:1401
msgid "GPG-sign commits"
msgstr ""
-#: builtin/am.c:2301
+#: builtin/am.c:2307
msgid "(internal use for git-rebase)"
msgstr ""
-#: builtin/am.c:2319
+#: builtin/am.c:2325
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
msgstr ""
-#: builtin/am.c:2326
+#: builtin/am.c:2332
msgid "failed to read the index"
msgstr ""
-#: builtin/am.c:2341
+#: builtin/am.c:2347
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
-#: builtin/am.c:2365
+#: builtin/am.c:2371
#, c-format
msgid ""
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr ""
-#: builtin/am.c:2371
+#: builtin/am.c:2377
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
-#: builtin/am.c:2381
+#: builtin/am.c:2387
msgid "interactive mode requires patches on the command line"
msgstr ""
@@ -9257,117 +9869,120 @@
msgid "git archive: expected a flush"
msgstr ""
-#: builtin/bisect--helper.c:22
-msgid "git bisect--helper --next-all [--no-checkout]"
-msgstr ""
-
#: builtin/bisect--helper.c:23
-msgid "git bisect--helper --write-terms <bad_term> <good_term>"
-msgstr ""
-
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-clean-state"
-msgstr ""
-
-#: builtin/bisect--helper.c:25
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr ""
-#: builtin/bisect--helper.c:26
-msgid ""
-"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
-"<bad_term>"
-msgstr ""
-
-#: builtin/bisect--helper.c:27
-msgid ""
-"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
-"<bad_term>"
-msgstr ""
-
-#: builtin/bisect--helper.c:28
+#: builtin/bisect--helper.c:24
msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
msgstr ""
-#: builtin/bisect--helper.c:29
+#: builtin/bisect--helper.c:25
msgid ""
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
"term-new]"
msgstr ""
-#: builtin/bisect--helper.c:30
+#: builtin/bisect--helper.c:26
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:86
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next"
+msgstr ""
+
+#: builtin/bisect--helper.c:29
+msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
+msgstr ""
+
+#: builtin/bisect--helper.c:30
+msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
+msgstr ""
+
+#: builtin/bisect--helper.c:31
+msgid "git bisect--helper --bisect-replay <filename>"
+msgstr ""
+
+#: builtin/bisect--helper.c:32
+msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
+msgstr ""
+
+#: builtin/bisect--helper.c:107
+#, c-format
+msgid "cannot open file '%s' in mode '%s'"
+msgstr ""
+
+#: builtin/bisect--helper.c:114
+#, c-format
+msgid "could not write to file '%s'"
+msgstr ""
+
+#: builtin/bisect--helper.c:153
#, c-format
msgid "'%s' is not a valid term"
msgstr ""
-#: builtin/bisect--helper.c:90
+#: builtin/bisect--helper.c:157
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr ""
-#: builtin/bisect--helper.c:100
+#: builtin/bisect--helper.c:167
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr ""
-#: builtin/bisect--helper.c:111
+#: builtin/bisect--helper.c:177
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:193
#, c-format
msgid "We are not bisecting.\n"
msgstr ""
-#: builtin/bisect--helper.c:163
+#: builtin/bisect--helper.c:201
#, c-format
msgid "'%s' is not a valid commit"
msgstr ""
-#: builtin/bisect--helper.c:172
+#: builtin/bisect--helper.c:210
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
msgstr ""
-#: builtin/bisect--helper.c:216
+#: builtin/bisect--helper.c:254
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr ""
-#: builtin/bisect--helper.c:221
+#: builtin/bisect--helper.c:259
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr ""
-#: builtin/bisect--helper.c:233
+#: builtin/bisect--helper.c:271
#, c-format
msgid "couldn't open the file '%s'"
msgstr ""
-#: builtin/bisect--helper.c:259
+#: builtin/bisect--helper.c:297
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr ""
-#: builtin/bisect--helper.c:286
+#: builtin/bisect--helper.c:324
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
"You can use \"git bisect %s\" and \"git bisect %s\" for that."
msgstr ""
-#: builtin/bisect--helper.c:290
+#: builtin/bisect--helper.c:328
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -9375,7 +9990,7 @@
"You can use \"git bisect %s\" and \"git bisect %s\" for that."
msgstr ""
-#: builtin/bisect--helper.c:310
+#: builtin/bisect--helper.c:348
#, c-format
msgid "bisecting only with a %s commit"
msgstr ""
@@ -9384,284 +9999,328 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:318
+#: builtin/bisect--helper.c:356
msgid "Are you sure [Y/n]? "
msgstr ""
-#: builtin/bisect--helper.c:379
+#: builtin/bisect--helper.c:417
msgid "no terms defined"
msgstr ""
-#: builtin/bisect--helper.c:382
+#: builtin/bisect--helper.c:420
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
"and %s for the new state.\n"
msgstr ""
-#: builtin/bisect--helper.c:392
+#: builtin/bisect--helper.c:430
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
"Supported options are: --term-good|--term-old and --term-bad|--term-new."
msgstr ""
-#: builtin/bisect--helper.c:478
+#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1014
+msgid "revision walk setup failed\n"
+msgstr ""
+
+#: builtin/bisect--helper.c:519
+#, c-format
+msgid "could not open '%s' for appending"
+msgstr ""
+
+#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651
+msgid "'' is not a valid term"
+msgstr ""
+
+#: builtin/bisect--helper.c:661
#, c-format
msgid "unrecognized option: '%s'"
msgstr ""
-#: builtin/bisect--helper.c:482
+#: builtin/bisect--helper.c:665
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr ""
-#: builtin/bisect--helper.c:514
+#: builtin/bisect--helper.c:696
msgid "bad HEAD - I need a HEAD"
msgstr ""
-#: builtin/bisect--helper.c:529
+#: builtin/bisect--helper.c:711
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr ""
-#: builtin/bisect--helper.c:550
+#: builtin/bisect--helper.c:732
msgid "won't bisect on cg-seek'ed tree"
msgstr ""
-#: builtin/bisect--helper.c:553
+#: builtin/bisect--helper.c:735
msgid "bad HEAD - strange symbolic ref"
msgstr ""
-#: builtin/bisect--helper.c:577
+#: builtin/bisect--helper.c:755
#, c-format
msgid "invalid ref: '%s'"
msgstr ""
-#: builtin/bisect--helper.c:633
-msgid "perform 'git bisect next'"
+#: builtin/bisect--helper.c:813
+msgid "You need to start by \"git bisect start\"\n"
msgstr ""
-#: builtin/bisect--helper.c:635
-msgid "write the terms to .git/BISECT_TERMS"
+#. 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:824
+msgid "Do you want me to do it for you [Y/n]? "
msgstr ""
-#: builtin/bisect--helper.c:637
-msgid "cleanup the bisection state"
+#: builtin/bisect--helper.c:842
+msgid "Please call `--bisect-state` with at least one argument"
msgstr ""
-#: builtin/bisect--helper.c:639
-msgid "check for expected revs"
+#: builtin/bisect--helper.c:855
+#, c-format
+msgid "'git bisect %s' can take only one argument."
msgstr ""
-#: builtin/bisect--helper.c:641
+#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:878
+#, c-format
+msgid "Bad rev input: %s"
+msgstr ""
+
+#: builtin/bisect--helper.c:912
+msgid "We are not bisecting."
+msgstr ""
+
+#: builtin/bisect--helper.c:962
+#, c-format
+msgid "'%s'?? what are you talking about?"
+msgstr ""
+
+#: builtin/bisect--helper.c:974
+#, c-format
+msgid "cannot read file '%s' for replaying"
+msgstr ""
+
+#: builtin/bisect--helper.c:1047
msgid "reset the bisection state"
msgstr ""
-#: builtin/bisect--helper.c:643
-msgid "write out the bisection state in BISECT_LOG"
-msgstr ""
-
-#: builtin/bisect--helper.c:645
-msgid "check and set terms in a bisection state"
-msgstr ""
-
-#: builtin/bisect--helper.c:647
+#: builtin/bisect--helper.c:1049
msgid "check whether bad or good terms exist"
msgstr ""
-#: builtin/bisect--helper.c:649
+#: builtin/bisect--helper.c:1051
msgid "print out the bisect terms"
msgstr ""
-#: builtin/bisect--helper.c:651
+#: builtin/bisect--helper.c:1053
msgid "start the bisect session"
msgstr ""
-#: builtin/bisect--helper.c:653
-msgid "update BISECT_HEAD instead of checking out the current commit"
+#: builtin/bisect--helper.c:1055
+msgid "find the next bisection commit"
msgstr ""
-#: builtin/bisect--helper.c:655
+#: builtin/bisect--helper.c:1057
+msgid "mark the state of ref (or refs)"
+msgstr ""
+
+#: builtin/bisect--helper.c:1059
+msgid "list the bisection steps so far"
+msgstr ""
+
+#: builtin/bisect--helper.c:1061
+msgid "replay the bisection process from the given file"
+msgstr ""
+
+#: builtin/bisect--helper.c:1063
+msgid "skip some commits for checkout"
+msgstr ""
+
+#: builtin/bisect--helper.c:1065
msgid "no log for BISECT_WRITE"
msgstr ""
-#: builtin/bisect--helper.c:673
-msgid "--write-terms requires two arguments"
-msgstr ""
-
-#: builtin/bisect--helper.c:677
-msgid "--bisect-clean-state requires no arguments"
-msgstr ""
-
-#: builtin/bisect--helper.c:684
+#: builtin/bisect--helper.c:1080
msgid "--bisect-reset requires either no argument or a commit"
msgstr ""
-#: builtin/bisect--helper.c:688
-msgid "--bisect-write requires either 4 or 5 arguments"
-msgstr ""
-
-#: builtin/bisect--helper.c:694
-msgid "--check-and-set-terms requires 3 arguments"
-msgstr ""
-
-#: builtin/bisect--helper.c:700
+#: builtin/bisect--helper.c:1085
msgid "--bisect-next-check requires 2 or 3 arguments"
msgstr ""
-#: builtin/bisect--helper.c:706
+#: builtin/bisect--helper.c:1091
msgid "--bisect-terms requires 0 or 1 argument"
msgstr ""
-#: builtin/blame.c:31
+#: builtin/bisect--helper.c:1100
+msgid "--bisect-next requires 0 arguments"
+msgstr ""
+
+#: builtin/bisect--helper.c:1111
+msgid "--bisect-log requires 0 arguments"
+msgstr ""
+
+#: builtin/bisect--helper.c:1116
+msgid "no logfile given"
+msgstr ""
+
+#: builtin/blame.c:32
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr ""
-#: builtin/blame.c:36
+#: builtin/blame.c:37
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr ""
-#: builtin/blame.c:409
+#: builtin/blame.c:410
#, c-format
msgid "expecting a color: %s"
msgstr ""
-#: builtin/blame.c:416
+#: builtin/blame.c:417
msgid "must end with a color"
msgstr ""
-#: builtin/blame.c:729
+#: builtin/blame.c:728
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr ""
-#: builtin/blame.c:747
+#: builtin/blame.c:746
msgid "invalid value for blame.coloring"
msgstr ""
-#: builtin/blame.c:822
+#: builtin/blame.c:845
#, c-format
msgid "cannot find revision %s to ignore"
msgstr ""
-#: builtin/blame.c:844
-msgid "Show blame entries as we find them, incrementally"
-msgstr ""
-
-#: builtin/blame.c:845
-msgid "Show blank SHA-1 for boundary commits (Default: off)"
-msgstr ""
-
-#: builtin/blame.c:846
-msgid "Do not treat root commits as boundaries (Default: off)"
-msgstr ""
-
-#: builtin/blame.c:847
-msgid "Show work cost statistics"
-msgstr ""
-
-#: builtin/blame.c:848
-msgid "Force progress reporting"
-msgstr ""
-
-#: builtin/blame.c:849
-msgid "Show output score for blame entries"
-msgstr ""
-
-#: builtin/blame.c:850
-msgid "Show original filename (Default: auto)"
-msgstr ""
-
-#: builtin/blame.c:851
-msgid "Show original linenumber (Default: off)"
-msgstr ""
-
-#: builtin/blame.c:852
-msgid "Show in a format designed for machine consumption"
-msgstr ""
-
-#: builtin/blame.c:853
-msgid "Show porcelain format with per-line commit information"
-msgstr ""
-
-#: builtin/blame.c:854
-msgid "Use the same output mode as git-annotate (Default: off)"
-msgstr ""
-
-#: builtin/blame.c:855
-msgid "Show raw timestamp (Default: off)"
-msgstr ""
-
-#: builtin/blame.c:856
-msgid "Show long commit SHA1 (Default: off)"
-msgstr ""
-
-#: builtin/blame.c:857
-msgid "Suppress author name and timestamp (Default: off)"
-msgstr ""
-
-#: builtin/blame.c:858
-msgid "Show author email instead of name (Default: off)"
-msgstr ""
-
-#: builtin/blame.c:859
-msgid "Ignore whitespace differences"
-msgstr ""
-
-#: builtin/blame.c:860 builtin/log.c:1702
-msgid "rev"
-msgstr ""
-
-#: builtin/blame.c:860
-msgid "Ignore <rev> when blaming"
-msgstr ""
-
-#: builtin/blame.c:861
-msgid "Ignore revisions from <file>"
-msgstr ""
-
-#: builtin/blame.c:862
-msgid "color redundant metadata from previous line differently"
-msgstr ""
-
-#: builtin/blame.c:863
-msgid "color lines by age"
-msgstr ""
-
-#: builtin/blame.c:864
-msgid "Spend extra cycles to find better match"
-msgstr ""
-
-#: builtin/blame.c:865
-msgid "Use revisions from <file> instead of calling git-rev-list"
-msgstr ""
-
-#: builtin/blame.c:866
-msgid "Use <file>'s contents as the final image"
-msgstr ""
-
-#: builtin/blame.c:867 builtin/blame.c:868
-msgid "score"
-msgstr ""
-
#: builtin/blame.c:867
-msgid "Find line copies within and across files"
+msgid "show blame entries as we find them, incrementally"
msgstr ""
#: builtin/blame.c:868
-msgid "Find line movements within and across files"
+msgid "do not show object names of boundary commits (Default: off)"
msgstr ""
#: builtin/blame.c:869
-msgid "n,m"
+msgid "do not treat root commits as boundaries (Default: off)"
msgstr ""
-#: builtin/blame.c:869
-msgid "Process only line range n,m, counting from 1"
+#: builtin/blame.c:870
+msgid "show work cost statistics"
msgstr ""
-#: builtin/blame.c:921
+#: builtin/blame.c:871 builtin/checkout.c:1503 builtin/clone.c:92
+#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:175
+#: builtin/merge.c:297 builtin/multi-pack-index.c:27 builtin/pull.c:119
+#: builtin/push.c:575 builtin/send-pack.c:198
+msgid "force progress reporting"
+msgstr ""
+
+#: builtin/blame.c:872
+msgid "show output score for blame entries"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/blame.c:878
+msgid "show raw timestamp (Default: off)"
+msgstr ""
+
+#: builtin/blame.c:879
+msgid "show long commit SHA1 (Default: off)"
+msgstr ""
+
+#: 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:1812
+msgid "rev"
+msgstr ""
+
+#: builtin/blame.c:883
+msgid "ignore <rev> when blaming"
+msgstr ""
+
+#: 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 ""
+
+#: 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 "range"
+msgstr ""
+
+#: builtin/blame.c:893
+msgid "process only line range <start>,<end> or function :<funcname>"
+msgstr ""
+
+#: builtin/blame.c:945
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
@@ -9673,23 +10332,23 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:972
+#: builtin/blame.c:996
msgid "4 years, 11 months ago"
msgstr ""
-#: builtin/blame.c:1079
+#: builtin/blame.c:1112
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] ""
msgstr[1] ""
-#: builtin/blame.c:1125
+#: builtin/blame.c:1157
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
@@ -9746,117 +10405,107 @@
msgid "Update of config-file failed"
msgstr ""
-#: builtin/branch.c:220
+#: builtin/branch.c:223
msgid "cannot use -a with -d"
msgstr ""
-#: builtin/branch.c:226
+#: builtin/branch.c:230
msgid "Couldn't look up commit object for HEAD"
msgstr ""
-#: builtin/branch.c:240
+#: builtin/branch.c:244
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr ""
-#: builtin/branch.c:255
+#: builtin/branch.c:259
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr ""
-#: builtin/branch.c:256
+#: builtin/branch.c:260
#, c-format
msgid "branch '%s' not found."
msgstr ""
-#: builtin/branch.c:271
-#, c-format
-msgid "Error deleting remote-tracking branch '%s'"
-msgstr ""
-
-#: builtin/branch.c:272
-#, c-format
-msgid "Error deleting branch '%s'"
-msgstr ""
-
-#: builtin/branch.c:279
+#: builtin/branch.c:291
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr ""
-#: builtin/branch.c:280
+#: builtin/branch.c:292
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr ""
-#: builtin/branch.c:429 builtin/tag.c:61
+#: builtin/branch.c:438 builtin/tag.c:61
msgid "unable to parse format string"
msgstr ""
-#: builtin/branch.c:460
+#: builtin/branch.c:469
msgid "could not resolve HEAD"
msgstr ""
-#: builtin/branch.c:466
+#: builtin/branch.c:475
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr ""
-#: builtin/branch.c:481
+#: builtin/branch.c:490
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr ""
-#: builtin/branch.c:485
+#: builtin/branch.c:494
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr ""
-#: builtin/branch.c:502
+#: builtin/branch.c:511
msgid "cannot copy the current branch while not on any."
msgstr ""
-#: builtin/branch.c:504
+#: builtin/branch.c:513
msgid "cannot rename the current branch while not on any."
msgstr ""
-#: builtin/branch.c:515
+#: builtin/branch.c:524
#, c-format
msgid "Invalid branch name: '%s'"
msgstr ""
-#: builtin/branch.c:542
+#: builtin/branch.c:553
msgid "Branch rename failed"
msgstr ""
-#: builtin/branch.c:544
+#: builtin/branch.c:555
msgid "Branch copy failed"
msgstr ""
-#: builtin/branch.c:548
+#: builtin/branch.c:559
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr ""
-#: builtin/branch.c:551
+#: builtin/branch.c:562
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr ""
-#: builtin/branch.c:557
+#: builtin/branch.c:568
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr ""
-#: builtin/branch.c:566
+#: builtin/branch.c:577
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
-#: builtin/branch.c:568
+#: builtin/branch.c:579
msgid "Branch is copied, but update of config-file failed"
msgstr ""
-#: builtin/branch.c:584
+#: builtin/branch.c:595
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -9864,220 +10513,300 @@
"Lines starting with '%c' will be stripped.\n"
msgstr ""
-#: builtin/branch.c:618
+#: builtin/branch.c:629
msgid "Generic options"
msgstr ""
-#: builtin/branch.c:620
+#: builtin/branch.c:631
msgid "show hash and subject, give twice for upstream branch"
msgstr ""
-#: builtin/branch.c:621
+#: builtin/branch.c:632
msgid "suppress informational messages"
msgstr ""
-#: builtin/branch.c:622
+#: builtin/branch.c:633
msgid "set up tracking mode (see git-pull(1))"
msgstr ""
-#: builtin/branch.c:624
+#: builtin/branch.c:635
msgid "do not use"
msgstr ""
-#: builtin/branch.c:626 builtin/rebase.c:513
+#: builtin/branch.c:637 builtin/rebase.c:534
msgid "upstream"
msgstr ""
-#: builtin/branch.c:626
+#: builtin/branch.c:637
msgid "change the upstream info"
msgstr ""
-#: builtin/branch.c:627
+#: builtin/branch.c:638
msgid "unset the upstream info"
msgstr ""
-#: builtin/branch.c:628
+#: builtin/branch.c:639
msgid "use colored output"
msgstr ""
-#: builtin/branch.c:629
+#: builtin/branch.c:640
msgid "act on remote-tracking branches"
msgstr ""
-#: builtin/branch.c:631 builtin/branch.c:633
+#: builtin/branch.c:642 builtin/branch.c:644
msgid "print only branches that contain the commit"
msgstr ""
-#: builtin/branch.c:632 builtin/branch.c:634
+#: builtin/branch.c:643 builtin/branch.c:645
msgid "print only branches that don't contain the commit"
msgstr ""
-#: builtin/branch.c:637
+#: builtin/branch.c:648
msgid "Specific git-branch actions:"
msgstr ""
-#: builtin/branch.c:638
+#: builtin/branch.c:649
msgid "list both remote-tracking and local branches"
msgstr ""
-#: builtin/branch.c:640
+#: builtin/branch.c:651
msgid "delete fully merged branch"
msgstr ""
-#: builtin/branch.c:641
+#: builtin/branch.c:652
msgid "delete branch (even if not merged)"
msgstr ""
-#: builtin/branch.c:642
+#: builtin/branch.c:653
msgid "move/rename a branch and its reflog"
msgstr ""
-#: builtin/branch.c:643
+#: builtin/branch.c:654
msgid "move/rename a branch, even if target exists"
msgstr ""
-#: builtin/branch.c:644
+#: builtin/branch.c:655
msgid "copy a branch and its reflog"
msgstr ""
-#: builtin/branch.c:645
+#: builtin/branch.c:656
msgid "copy a branch, even if target exists"
msgstr ""
-#: builtin/branch.c:646
+#: builtin/branch.c:657
msgid "list branch names"
msgstr ""
-#: builtin/branch.c:647
+#: builtin/branch.c:658
msgid "show current branch name"
msgstr ""
-#: builtin/branch.c:648
+#: builtin/branch.c:659
msgid "create the branch's reflog"
msgstr ""
-#: builtin/branch.c:650
+#: builtin/branch.c:661
msgid "edit the description for the branch"
msgstr ""
-#: builtin/branch.c:651
+#: builtin/branch.c:662
msgid "force creation, move/rename, deletion"
msgstr ""
-#: builtin/branch.c:652
+#: builtin/branch.c:663
msgid "print only branches that are merged"
msgstr ""
-#: builtin/branch.c:653
+#: builtin/branch.c:664
msgid "print only branches that are not merged"
msgstr ""
-#: builtin/branch.c:654
+#: builtin/branch.c:665
msgid "list branches in columns"
msgstr ""
-#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415
+#: builtin/branch.c:667 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:466
msgid "object"
msgstr ""
-#: builtin/branch.c:658
+#: builtin/branch.c:668
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:669 builtin/for-each-ref.c:48 builtin/tag.c:473
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:670 builtin/for-each-ref.c:38 builtin/tag.c:471
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr ""
-#: builtin/branch.c:684 builtin/clone.c:785
+#: builtin/branch.c:693 builtin/clone.c:790
msgid "HEAD not found below refs/heads!"
msgstr ""
-#: builtin/branch.c:708
+#: builtin/branch.c:717
msgid "--column and --verbose are incompatible"
msgstr ""
-#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
+#: builtin/branch.c:732 builtin/branch.c:788 builtin/branch.c:797
msgid "branch name required"
msgstr ""
-#: builtin/branch.c:753
+#: builtin/branch.c:764
msgid "Cannot give description to detached HEAD"
msgstr ""
-#: builtin/branch.c:758
+#: builtin/branch.c:769
msgid "cannot edit description of more than one branch"
msgstr ""
-#: builtin/branch.c:765
+#: builtin/branch.c:776
#, c-format
msgid "No commit on branch '%s' yet."
msgstr ""
-#: builtin/branch.c:768
+#: builtin/branch.c:779
#, c-format
msgid "No branch named '%s'."
msgstr ""
-#: builtin/branch.c:783
+#: builtin/branch.c:794
msgid "too many branches for a copy operation"
msgstr ""
-#: builtin/branch.c:792
+#: builtin/branch.c:803
msgid "too many arguments for a rename operation"
msgstr ""
-#: builtin/branch.c:797
+#: builtin/branch.c:808
msgid "too many arguments to set new upstream"
msgstr ""
-#: builtin/branch.c:801
+#: builtin/branch.c:812
#, 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:815 builtin/branch.c:838
#, c-format
msgid "no such branch '%s'"
msgstr ""
-#: builtin/branch.c:808
+#: builtin/branch.c:819
#, c-format
msgid "branch '%s' does not exist"
msgstr ""
-#: builtin/branch.c:821
+#: builtin/branch.c:832
msgid "too many arguments to unset upstream"
msgstr ""
-#: builtin/branch.c:825
+#: builtin/branch.c:836
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:831
+#: builtin/branch.c:842
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr ""
-#: builtin/branch.c:841
+#: builtin/branch.c:852
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:856
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
msgstr ""
+#: builtin/bugreport.c:15
+msgid "git version:\n"
+msgstr ""
+
+#: 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"
+"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:135
+msgid "specify a destination for the bugreport file"
+msgstr ""
+
+#: builtin/bugreport.c:137
+msgid "specify a strftime format suffix for the filename"
+msgstr ""
+
+#: builtin/bugreport.c:159
+#, c-format
+msgid "could not create leading directories for '%s'"
+msgstr ""
+
+#: builtin/bugreport.c:166
+msgid "System Info"
+msgstr ""
+
+#: builtin/bugreport.c:169
+msgid "Enabled Hooks"
+msgstr ""
+
+#: builtin/bugreport.c:176
+#, c-format
+msgid "couldn't create a new file at '%s'"
+msgstr ""
+
+#: builtin/bugreport.c:179
+#, c-format
+msgid "unable to write to %s"
+msgstr ""
+
+#: builtin/bugreport.c:189
+#, 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 ""
@@ -10094,125 +10823,129 @@
msgid "git bundle unbundle <file> [<refname>...]"
msgstr ""
-#: builtin/bundle.c:66 builtin/pack-objects.c:3375
+#: builtin/bundle.c:67 builtin/pack-objects.c:3495
msgid "do not show progress meter"
msgstr ""
-#: builtin/bundle.c:68 builtin/pack-objects.c:3377
+#: builtin/bundle.c:69 builtin/pack-objects.c:3497
msgid "show progress meter"
msgstr ""
-#: builtin/bundle.c:70 builtin/pack-objects.c:3379
+#: builtin/bundle.c:71 builtin/pack-objects.c:3499
msgid "show progress meter during object writing phase"
msgstr ""
-#: builtin/bundle.c:73 builtin/pack-objects.c:3382
+#: builtin/bundle.c:74 builtin/pack-objects.c:3502
msgid "similar to --all-progress when progress meter is shown"
msgstr ""
-#: builtin/bundle.c:93
+#: 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:104
+#: builtin/bundle.c:107
msgid "do not show bundle details"
msgstr ""
-#: builtin/bundle.c:119
+#: builtin/bundle.c:122
#, c-format
msgid "%s is okay\n"
msgstr ""
-#: builtin/bundle.c:160
+#: builtin/bundle.c:163
msgid "Need a repository to unbundle."
msgstr ""
-#: builtin/bundle.c:168 builtin/remote.c:1686
+#: builtin/bundle.c:171 builtin/remote.c:1700
msgid "be verbose; must be placed before a subcommand"
msgstr ""
-#: builtin/bundle.c:190 builtin/remote.c:1717
+#: builtin/bundle.c:193 builtin/remote.c:1731
#, c-format
msgid "Unknown subcommand: %s"
msgstr ""
-#: builtin/cat-file.c:595
+#: 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:596
+#: 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:617
+#: builtin/cat-file.c:620
msgid "only one batch option may be specified"
msgstr ""
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:638
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr ""
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:639
msgid "show object type"
msgstr ""
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:640
msgid "show object size"
msgstr ""
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:642
msgid "exit with zero when there's no error"
msgstr ""
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:643
msgid "pretty-print object's content"
msgstr ""
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:645
msgid "for blob objects, run textconv on object's content"
msgstr ""
-#: builtin/cat-file.c:644
+#: builtin/cat-file.c:647
msgid "for blob objects, run filters on object's content"
msgstr ""
-#: builtin/cat-file.c:645 git-submodule.sh:1002
+#: builtin/cat-file.c:648
msgid "blob"
msgstr ""
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:649
msgid "use a specific path for --textconv/--filters"
msgstr ""
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:651
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr ""
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:652
msgid "buffer --batch output"
msgstr ""
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:654
msgid "show info and content of objects fed from the standard input"
msgstr ""
-#: builtin/cat-file.c:655
+#: builtin/cat-file.c:658
msgid "show info about objects fed from the standard input"
msgstr ""
-#: builtin/cat-file.c:659
+#: builtin/cat-file.c:662
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
-#: builtin/cat-file.c:661
+#: builtin/cat-file.c:664
msgid "show all objects with --batch or --batch-check"
msgstr ""
-#: builtin/cat-file.c:663
+#: builtin/cat-file.c:666
msgid "do not order --batch-all-objects output"
msgstr ""
@@ -10240,8 +10973,8 @@
msgid "terminate input and output records by a NUL character"
msgstr ""
-#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537
-#: builtin/worktree.c:499
+#: builtin/check-ignore.c:21 builtin/checkout.c:1499 builtin/gc.c:549
+#: builtin/worktree.c:489
msgid "suppress progress reporting"
msgstr ""
@@ -10294,54 +11027,54 @@
msgid "no contacts specified"
msgstr ""
-#: builtin/checkout-index.c:131
+#: builtin/checkout-index.c:152
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr ""
-#: builtin/checkout-index.c:148
+#: builtin/checkout-index.c:169
msgid "stage should be between 1 and 3 or all"
msgstr ""
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:186
msgid "check out all files in the index"
msgstr ""
-#: builtin/checkout-index.c:165
+#: builtin/checkout-index.c:187
msgid "force overwrite of existing files"
msgstr ""
-#: builtin/checkout-index.c:167
+#: builtin/checkout-index.c:189
msgid "no warning for existing files and files not in index"
msgstr ""
-#: builtin/checkout-index.c:169
+#: builtin/checkout-index.c:191
msgid "don't checkout new files"
msgstr ""
-#: builtin/checkout-index.c:171
+#: builtin/checkout-index.c:193
msgid "update stat information in the index file"
msgstr ""
-#: builtin/checkout-index.c:175
+#: builtin/checkout-index.c:197
msgid "read list of paths from the standard input"
msgstr ""
-#: builtin/checkout-index.c:177
+#: builtin/checkout-index.c:199
msgid "write the content to temporary files"
msgstr ""
-#: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403
-#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909
-#: builtin/worktree.c:672
+#: builtin/checkout-index.c:200 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:717
msgid "string"
msgstr ""
-#: builtin/checkout-index.c:179
+#: builtin/checkout-index.c:201
msgid "when creating files, prepend <string>"
msgstr ""
-#: builtin/checkout-index.c:181
+#: builtin/checkout-index.c:203
msgid "copy out the files from named stage"
msgstr ""
@@ -10361,148 +11094,148 @@
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr ""
-#: builtin/checkout.c:175 builtin/checkout.c:214
+#: builtin/checkout.c:188 builtin/checkout.c:227
#, c-format
msgid "path '%s' does not have our version"
msgstr ""
-#: builtin/checkout.c:177 builtin/checkout.c:216
+#: builtin/checkout.c:190 builtin/checkout.c:229
#, c-format
msgid "path '%s' does not have their version"
msgstr ""
-#: builtin/checkout.c:193
+#: builtin/checkout.c:206
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr ""
-#: builtin/checkout.c:243
+#: builtin/checkout.c:258
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr ""
-#: builtin/checkout.c:261
+#: builtin/checkout.c:275
#, c-format
msgid "path '%s': cannot merge"
msgstr ""
-#: builtin/checkout.c:277
+#: builtin/checkout.c:291
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr ""
-#: builtin/checkout.c:377
+#: builtin/checkout.c:396
#, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:382
+#: 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:389
+#: 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:412 builtin/checkout.c:415 builtin/checkout.c:418
-#: builtin/checkout.c:422
+#: 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:425 builtin/checkout.c:428
+#: builtin/checkout.c:444 builtin/checkout.c:447
#, c-format
msgid "'%s' cannot be used with %s"
msgstr ""
-#: builtin/checkout.c:432
+#: builtin/checkout.c:451
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
-#: builtin/checkout.c:436
+#: builtin/checkout.c:455
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr ""
-#: builtin/checkout.c:440
+#: builtin/checkout.c:459
#, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr ""
-#: builtin/checkout.c:445 builtin/checkout.c:450
+#: builtin/checkout.c:464 builtin/checkout.c:469
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr ""
-#: builtin/checkout.c:509 builtin/checkout.c:516
+#: builtin/checkout.c:543 builtin/checkout.c:550
#, c-format
msgid "path '%s' is unmerged"
msgstr ""
-#: builtin/checkout.c:684 builtin/sparse-checkout.c:106
+#: builtin/checkout.c:718
msgid "you need to resolve your current index first"
msgstr ""
-#: builtin/checkout.c:734
+#: builtin/checkout.c:772
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"%s"
msgstr ""
-#: builtin/checkout.c:837
+#: builtin/checkout.c:865
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr ""
-#: builtin/checkout.c:879
+#: builtin/checkout.c:907
msgid "HEAD is now at"
msgstr ""
-#: builtin/checkout.c:883 builtin/clone.c:717
+#: builtin/checkout.c:911 builtin/clone.c:721 t/helper/test-fast-rebase.c:202
msgid "unable to update HEAD"
msgstr ""
-#: builtin/checkout.c:887
+#: builtin/checkout.c:915
#, c-format
msgid "Reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:890
+#: builtin/checkout.c:918
#, c-format
msgid "Already on '%s'\n"
msgstr ""
-#: builtin/checkout.c:894
+#: builtin/checkout.c:922
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:896 builtin/checkout.c:1320
+#: builtin/checkout.c:924 builtin/checkout.c:1355
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:898
+#: builtin/checkout.c:926
#, c-format
msgid "Switched to branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:949
+#: builtin/checkout.c:977
#, c-format
msgid " ... and %d more.\n"
msgstr ""
-#: builtin/checkout.c:955
+#: builtin/checkout.c:983
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -10517,7 +11250,7 @@
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:974
+#: builtin/checkout.c:1002
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -10534,26 +11267,26 @@
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1037
msgid "internal error in revision walk"
msgstr ""
-#: builtin/checkout.c:1013
+#: builtin/checkout.c:1041
msgid "Previous HEAD position was"
msgstr ""
-#: builtin/checkout.c:1053 builtin/checkout.c:1315
+#: builtin/checkout.c:1081 builtin/checkout.c:1350
msgid "You are on a branch yet to be born"
msgstr ""
-#: builtin/checkout.c:1128
+#: builtin/checkout.c:1163
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
"Please use -- (and optionally --no-guess) to disambiguate"
msgstr ""
-#: builtin/checkout.c:1135
+#: builtin/checkout.c:1170
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"
@@ -10565,323 +11298,319 @@
"checkout.defaultRemote=origin in your config."
msgstr ""
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1180
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr ""
-#: builtin/checkout.c:1211
+#: builtin/checkout.c:1246
msgid "only one reference expected"
msgstr ""
-#: builtin/checkout.c:1228
+#: builtin/checkout.c:1263
#, c-format
msgid "only one reference expected, %d given."
msgstr ""
-#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448
+#: builtin/checkout.c:1309 builtin/worktree.c:270 builtin/worktree.c:438
#, c-format
msgid "invalid reference: %s"
msgstr ""
-#: builtin/checkout.c:1287 builtin/checkout.c:1649
+#: builtin/checkout.c:1322 builtin/checkout.c:1688
#, c-format
msgid "reference is not a tree: %s"
msgstr ""
-#: builtin/checkout.c:1334
+#: builtin/checkout.c:1369
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr ""
-#: builtin/checkout.c:1336
+#: builtin/checkout.c:1371
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr ""
-#: builtin/checkout.c:1337 builtin/checkout.c:1345
+#: builtin/checkout.c:1372 builtin/checkout.c:1380
#, c-format
msgid "a branch is expected, got '%s'"
msgstr ""
-#: builtin/checkout.c:1340
+#: builtin/checkout.c:1375
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr ""
-#: builtin/checkout.c:1356
+#: builtin/checkout.c:1391
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1360
+#: builtin/checkout.c:1395
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1399
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1368
+#: builtin/checkout.c:1403
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1372
+#: builtin/checkout.c:1407
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
msgstr ""
-#: builtin/checkout.c:1376
+#: builtin/checkout.c:1411
msgid "you are switching branch while bisecting"
msgstr ""
-#: builtin/checkout.c:1383
+#: builtin/checkout.c:1418
msgid "paths cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394
+#: builtin/checkout.c:1421 builtin/checkout.c:1425 builtin/checkout.c:1429
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404
-#: builtin/checkout.c:1409 builtin/checkout.c:1414
+#: builtin/checkout.c:1433 builtin/checkout.c:1436 builtin/checkout.c:1439
+#: builtin/checkout.c:1444 builtin/checkout.c:1449
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr ""
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1446
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr ""
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1454
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
-#: builtin/checkout.c:1426
+#: builtin/checkout.c:1461
msgid "missing branch or commit argument"
msgstr ""
-#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72
-#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286
-#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563
-#: builtin/send-pack.c:174
-msgid "force progress reporting"
-msgstr ""
-
-#: builtin/checkout.c:1469
+#: builtin/checkout.c:1504
msgid "perform a 3-way merge with the new branch"
msgstr ""
-#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322
+#: builtin/checkout.c:1505 builtin/log.c:1799 parse-options.h:322
msgid "style"
msgstr ""
-#: builtin/checkout.c:1471
+#: builtin/checkout.c:1506
msgid "conflict style (merge or diff3)"
msgstr ""
-#: builtin/checkout.c:1483 builtin/worktree.c:496
+#: builtin/checkout.c:1518 builtin/worktree.c:486
msgid "detach HEAD at named commit"
msgstr ""
-#: builtin/checkout.c:1484
+#: builtin/checkout.c:1519
msgid "set upstream info for new branch"
msgstr ""
-#: builtin/checkout.c:1486
+#: builtin/checkout.c:1521
msgid "force checkout (throw away local modifications)"
msgstr ""
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1523
msgid "new-branch"
msgstr ""
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1523
msgid "new unparented branch"
msgstr ""
-#: builtin/checkout.c:1490 builtin/merge.c:289
+#: builtin/checkout.c:1525 builtin/merge.c:301
msgid "update ignored files (default)"
msgstr ""
-#: builtin/checkout.c:1493
+#: builtin/checkout.c:1528
msgid "do not check if another worktree is holding the given ref"
msgstr ""
-#: builtin/checkout.c:1506
+#: builtin/checkout.c:1541
msgid "checkout our version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1509
+#: builtin/checkout.c:1544
msgid "checkout their version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1513
+#: builtin/checkout.c:1548
msgid "do not limit pathspecs to sparse entries only"
msgstr ""
-#: builtin/checkout.c:1565
-msgid "-b, -B and --orphan are mutually exclusive"
+#: builtin/checkout.c:1603
+#, c-format
+msgid "-%c, -%c and --orphan are mutually exclusive"
msgstr ""
-#: builtin/checkout.c:1568
+#: builtin/checkout.c:1607
msgid "-p and --overlay are mutually exclusive"
msgstr ""
-#: builtin/checkout.c:1605
+#: builtin/checkout.c:1644
msgid "--track needs a branch name"
msgstr ""
-#: builtin/checkout.c:1610
-msgid "missing branch name; try -b"
+#: builtin/checkout.c:1649
+#, c-format
+msgid "missing branch name; try -%c"
msgstr ""
-#: builtin/checkout.c:1642
+#: builtin/checkout.c:1681
#, c-format
msgid "could not resolve %s"
msgstr ""
-#: builtin/checkout.c:1658
+#: builtin/checkout.c:1697
msgid "invalid path specification"
msgstr ""
-#: builtin/checkout.c:1665
+#: builtin/checkout.c:1704
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
-#: builtin/checkout.c:1669
+#: builtin/checkout.c:1708
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr ""
-#: builtin/checkout.c:1678
+#: builtin/checkout.c:1717
msgid "--pathspec-from-file is incompatible with --detach"
msgstr ""
-#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506
+#: builtin/checkout.c:1720 builtin/reset.c:325 builtin/stash.c:1566
msgid "--pathspec-from-file is incompatible with --patch"
msgstr ""
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1733
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1738
msgid "you must specify path(s) to restore"
msgstr ""
-#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774
-#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494
+#: builtin/checkout.c:1764 builtin/checkout.c:1766 builtin/checkout.c:1815
+#: builtin/checkout.c:1817 builtin/clone.c:122 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:482
+#: builtin/worktree.c:484
msgid "branch"
msgstr ""
-#: builtin/checkout.c:1724
+#: builtin/checkout.c:1765
msgid "create and checkout a new branch"
msgstr ""
-#: builtin/checkout.c:1726
+#: builtin/checkout.c:1767
msgid "create/reset and checkout a branch"
msgstr ""
-#: builtin/checkout.c:1727
+#: builtin/checkout.c:1768
msgid "create reflog for new branch"
msgstr ""
-#: builtin/checkout.c:1729
+#: builtin/checkout.c:1770
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr ""
-#: builtin/checkout.c:1730
+#: builtin/checkout.c:1771
msgid "use overlay mode (default)"
msgstr ""
-#: builtin/checkout.c:1775
+#: builtin/checkout.c:1816
msgid "create and switch to a new branch"
msgstr ""
-#: builtin/checkout.c:1777
+#: builtin/checkout.c:1818
msgid "create/reset and switch to a branch"
msgstr ""
-#: builtin/checkout.c:1779
+#: builtin/checkout.c:1820
msgid "second guess 'git switch <no-such-branch>'"
msgstr ""
-#: builtin/checkout.c:1781
+#: builtin/checkout.c:1822
msgid "throw away local modifications"
msgstr ""
-#: builtin/checkout.c:1813
+#: builtin/checkout.c:1856
msgid "which tree-ish to checkout from"
msgstr ""
-#: builtin/checkout.c:1815
+#: builtin/checkout.c:1858
msgid "restore the index"
msgstr ""
-#: builtin/checkout.c:1817
+#: builtin/checkout.c:1860
msgid "restore the working tree (default)"
msgstr ""
-#: builtin/checkout.c:1819
+#: builtin/checkout.c:1862
msgid "ignore unmerged entries"
msgstr ""
-#: builtin/checkout.c:1820
+#: builtin/checkout.c:1863
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:301 git-add--interactive.perl:595
+#: builtin/clean.c:302 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -10890,7 +11619,7 @@
" - (empty) select nothing\n"
msgstr ""
-#: builtin/clean.c:305 git-add--interactive.perl:604
+#: builtin/clean.c:306 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -10903,33 +11632,33 @@
" - (empty) finish selecting\n"
msgstr ""
-#: builtin/clean.c:521 git-add--interactive.perl:570
-#: git-add--interactive.perl:575
+#: builtin/clean.c:521 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr ""
-#: builtin/clean.c:663
+#: builtin/clean.c:661
#, c-format
msgid "Input ignore patterns>> "
msgstr ""
-#: builtin/clean.c:700
+#: builtin/clean.c:696
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr ""
-#: builtin/clean.c:721
+#: builtin/clean.c:717
msgid "Select items to delete"
msgstr ""
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:762
+#: builtin/clean.c:758
#, c-format
msgid "Remove %s [y/N]? "
msgstr ""
-#: builtin/clean.c:795
+#: builtin/clean.c:789
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -10940,92 +11669,92 @@
"? - help for prompt selection"
msgstr ""
-#: builtin/clean.c:831
+#: builtin/clean.c:825
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/clean.c:847
+#: builtin/clean.c:841
msgid "No more files to clean, exiting."
msgstr ""
-#: builtin/clean.c:909
+#: builtin/clean.c:903
msgid "do not print names of files removed"
msgstr ""
-#: builtin/clean.c:911
+#: builtin/clean.c:905
msgid "force"
msgstr ""
-#: builtin/clean.c:912
+#: builtin/clean.c:906
msgid "interactive cleaning"
msgstr ""
-#: builtin/clean.c:914
+#: builtin/clean.c:908
msgid "remove whole directories"
msgstr ""
-#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564
-#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179
-#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/grep.c:922 builtin/log.c:184 builtin/log.c:186
+#: builtin/ls-files.c:573 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr ""
-#: builtin/clean.c:916
+#: builtin/clean.c:910
msgid "add <pattern> to ignore rules"
msgstr ""
-#: builtin/clean.c:917
+#: builtin/clean.c:911
msgid "remove ignored files, too"
msgstr ""
-#: builtin/clean.c:919
+#: builtin/clean.c:913
msgid "remove only ignored files"
msgstr ""
-#: builtin/clean.c:937
-msgid "-x and -X cannot be used together"
-msgstr ""
-
-#: builtin/clean.c:941
+#: builtin/clean.c:929
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
msgstr ""
-#: builtin/clean.c:944
+#: builtin/clean.c:932
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
msgstr ""
+#: builtin/clean.c:944
+msgid "-x and -X cannot be used together"
+msgstr ""
+
#: builtin/clone.c:45
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr ""
-#: builtin/clone.c:93
+#: builtin/clone.c:94
msgid "don't create a checkout"
msgstr ""
-#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
+#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:555
msgid "create a bare repository"
msgstr ""
-#: builtin/clone.c:98
+#: builtin/clone.c:99
msgid "create a mirror repository (implies bare)"
msgstr ""
-#: builtin/clone.c:100
+#: builtin/clone.c:101
msgid "to clone from a local repository"
msgstr ""
-#: builtin/clone.c:102
+#: builtin/clone.c:103
msgid "don't use local hardlinks, always copy"
msgstr ""
-#: builtin/clone.c:104
+#: builtin/clone.c:105
msgid "setup as shared repository"
msgstr ""
@@ -11037,304 +11766,315 @@
msgid "initialize submodules in the clone"
msgstr ""
-#: builtin/clone.c:110
+#: builtin/clone.c:111
msgid "number of submodules cloned in parallel"
msgstr ""
-#: builtin/clone.c:111 builtin/init-db.c:486
+#: builtin/clone.c:112 builtin/init-db.c:552
msgid "template-directory"
msgstr ""
-#: builtin/clone.c:112 builtin/init-db.c:487
+#: builtin/clone.c:113 builtin/init-db.c:553
msgid "directory from which templates will be used"
msgstr ""
-#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407
-#: builtin/submodule--helper.c:1912
+#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831
+#: builtin/submodule--helper.c:2336
msgid "reference repository"
msgstr ""
-#: builtin/clone.c:118 builtin/submodule--helper.c:1409
-#: builtin/submodule--helper.c:1914
+#: builtin/clone.c:119 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:3441 builtin/repack.c:327
+#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3561 builtin/repack.c:357
msgid "name"
msgstr ""
-#: builtin/clone.c:120
+#: builtin/clone.c:121
msgid "use <name> instead of 'origin' to track upstream"
msgstr ""
-#: builtin/clone.c:122
+#: builtin/clone.c:123
msgid "checkout <branch> instead of the remote's HEAD"
msgstr ""
-#: builtin/clone.c:124
+#: builtin/clone.c:125
msgid "path to git-upload-pack on the remote"
msgstr ""
-#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828
-#: builtin/pull.c:207
+#: builtin/clone.c:126 builtin/fetch.c:176 builtin/grep.c:861
+#: builtin/pull.c:208
msgid "depth"
msgstr ""
-#: builtin/clone.c:126
+#: builtin/clone.c:127
msgid "create a shallow clone of that depth"
msgstr ""
-#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430
+#: builtin/clone.c:128 builtin/fetch.c:178 builtin/pack-objects.c:3550
+#: builtin/pull.c:211
msgid "time"
msgstr ""
-#: builtin/clone.c:128
+#: builtin/clone.c:129
msgid "create a shallow clone since a specific time"
msgstr ""
-#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195
-#: builtin/rebase.c:1480
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/fetch.c:203
+#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1323
msgid "revision"
msgstr ""
-#: builtin/clone.c:130 builtin/fetch.c:173
+#: builtin/clone.c:131 builtin/fetch.c:181 builtin/pull.c:215
msgid "deepen history of shallow clone, excluding rev"
msgstr ""
-#: builtin/clone.c:132 builtin/submodule--helper.c:1419
-#: builtin/submodule--helper.c:1928
+#: builtin/clone.c:133 builtin/submodule--helper.c:1843
+#: builtin/submodule--helper.c:2352
msgid "clone only one branch, HEAD or --branch"
msgstr ""
-#: builtin/clone.c:134
+#: builtin/clone.c:135
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
-#: builtin/clone.c:136
+#: builtin/clone.c:137
msgid "any cloned submodules will be shallow"
msgstr ""
-#: builtin/clone.c:137 builtin/init-db.c:495
+#: builtin/clone.c:138 builtin/init-db.c:561
msgid "gitdir"
msgstr ""
-#: builtin/clone.c:138 builtin/init-db.c:496
+#: builtin/clone.c:139 builtin/init-db.c:562
msgid "separate git dir from working tree"
msgstr ""
-#: builtin/clone.c:139
+#: builtin/clone.c:140
msgid "key=value"
msgstr ""
-#: builtin/clone.c:140
+#: builtin/clone.c:141
msgid "set config inside the new repository"
msgstr ""
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
-#: builtin/push.c:573 builtin/send-pack.c:172
+#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77
+#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
msgid "server-specific"
msgstr ""
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
-#: builtin/push.c:573 builtin/send-pack.c:173
+#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77
+#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
msgid "option to transmit"
msgstr ""
-#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220
-#: builtin/push.c:574
+#: builtin/clone.c:144 builtin/fetch.c:199 builtin/pull.c:234
+#: builtin/push.c:585
msgid "use IPv4 addresses only"
msgstr ""
-#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223
-#: builtin/push.c:576
+#: builtin/clone.c:146 builtin/fetch.c:201 builtin/pull.c:237
+#: builtin/push.c:587
msgid "use IPv6 addresses only"
msgstr ""
-#: builtin/clone.c:149
+#: builtin/clone.c:150
msgid "any cloned submodules will use their remote-tracking branch"
msgstr ""
-#: builtin/clone.c:151
+#: builtin/clone.c:152
msgid "initialize sparse-checkout file to include only files at root"
msgstr ""
-#: builtin/clone.c:287
+#: builtin/clone.c:288
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
msgstr ""
-#: builtin/clone.c:340
+#: builtin/clone.c:341
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr ""
-#: builtin/clone.c:413
+#: builtin/clone.c:414
#, c-format
msgid "%s exists and is not a directory"
msgstr ""
-#: builtin/clone.c:430
+#: builtin/clone.c:432
#, c-format
msgid "failed to start iterator over '%s'"
msgstr ""
-#: builtin/clone.c:460
+#: builtin/clone.c:463
#, c-format
msgid "failed to create link '%s'"
msgstr ""
-#: builtin/clone.c:464
+#: builtin/clone.c:467
#, c-format
msgid "failed to copy file to '%s'"
msgstr ""
-#: builtin/clone.c:469
+#: builtin/clone.c:472
#, c-format
msgid "failed to iterate over '%s'"
msgstr ""
-#: builtin/clone.c:494
+#: builtin/clone.c:499
#, c-format
msgid "done.\n"
msgstr ""
-#: builtin/clone.c:508
+#: builtin/clone.c:513
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"and retry with 'git restore --source=HEAD :/'\n"
msgstr ""
-#: builtin/clone.c:585
+#: builtin/clone.c:590
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr ""
-#: builtin/clone.c:705
+#: builtin/clone.c:709
#, c-format
msgid "unable to update %s"
msgstr ""
-#: builtin/clone.c:753
+#: builtin/clone.c:757
msgid "failed to initialize sparse-checkout"
msgstr ""
-#: builtin/clone.c:776
+#: builtin/clone.c:780
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
-#: builtin/clone.c:807
+#: builtin/clone.c:812
msgid "unable to checkout working tree"
msgstr ""
-#: builtin/clone.c:862
+#: builtin/clone.c:887
msgid "unable to write parameters to config file"
msgstr ""
-#: builtin/clone.c:925
+#: builtin/clone.c:950
msgid "cannot repack to clean up"
msgstr ""
-#: builtin/clone.c:927
+#: builtin/clone.c:952
msgid "cannot unlink temporary alternates file"
msgstr ""
-#: builtin/clone.c:965 builtin/receive-pack.c:1950
+#: builtin/clone.c:993 builtin/receive-pack.c:2493
msgid "Too many arguments."
msgstr ""
-#: builtin/clone.c:969
+#: builtin/clone.c:997
msgid "You must specify a repository to clone."
msgstr ""
-#: builtin/clone.c:982
+#: builtin/clone.c:1010
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr ""
-#: builtin/clone.c:985
+#: builtin/clone.c:1013
msgid "--bare and --separate-git-dir are incompatible."
msgstr ""
-#: builtin/clone.c:998
+#: builtin/clone.c:1026
#, c-format
msgid "repository '%s' does not exist"
msgstr ""
-#: builtin/clone.c:1004 builtin/fetch.c:1796
+#: builtin/clone.c:1030 builtin/fetch.c:1951
#, c-format
msgid "depth %s is not a positive number"
msgstr ""
-#: builtin/clone.c:1014
+#: builtin/clone.c:1040
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
-#: builtin/clone.c:1024
+#: builtin/clone.c:1046
+#, c-format
+msgid "repository path '%s' already exists and is not an empty directory."
+msgstr ""
+
+#: builtin/clone.c:1060
#, c-format
msgid "working tree '%s' already exists."
msgstr ""
-#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271
-#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327
+#: builtin/clone.c:1075 builtin/clone.c:1096 builtin/difftool.c:271
+#: builtin/log.c:1986 builtin/worktree.c:282 builtin/worktree.c:314
#, c-format
msgid "could not create leading directories of '%s'"
msgstr ""
-#: builtin/clone.c:1044
+#: builtin/clone.c:1080
#, c-format
msgid "could not create work tree dir '%s'"
msgstr ""
-#: builtin/clone.c:1064
+#: builtin/clone.c:1100
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr ""
-#: builtin/clone.c:1066
+#: builtin/clone.c:1102
#, c-format
msgid "Cloning into '%s'...\n"
msgstr ""
-#: builtin/clone.c:1090
+#: builtin/clone.c:1126
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr ""
-#: builtin/clone.c:1154
+#: builtin/clone.c:1170 builtin/remote.c:200 builtin/remote.c:705
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr ""
+
+#: builtin/clone.c:1211
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1156
+#: builtin/clone.c:1213
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1158
+#: builtin/clone.c:1215
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1160
+#: builtin/clone.c:1217
msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1163
+#: builtin/clone.c:1220
msgid "source repository is shallow, ignoring --local"
msgstr ""
-#: builtin/clone.c:1168
+#: builtin/clone.c:1225
msgid "--local is ignored"
msgstr ""
-#: builtin/clone.c:1243 builtin/clone.c:1251
+#: builtin/clone.c:1315 builtin/clone.c:1323
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr ""
-#: builtin/clone.c:1254
+#: builtin/clone.c:1326
msgid "You appear to have cloned an empty repository."
msgstr ""
@@ -11370,6 +12110,105 @@
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:187 builtin/log.c:1768
+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 "
@@ -11381,7 +12220,7 @@
msgid "duplicate parent %s ignored"
msgstr ""
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:557
#, c-format
msgid "not a valid object name %s"
msgstr ""
@@ -11409,13 +12248,13 @@
msgid "id of a parent commit object"
msgstr ""
-#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477
-#: builtin/tag.c:412
+#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:282
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1537
+#: builtin/tag.c:445
msgid "message"
msgstr ""
-#: builtin/commit-tree.c:115 builtin/commit.c:1501
+#: builtin/commit-tree.c:115 builtin/commit.c:1504
msgid "commit message"
msgstr ""
@@ -11423,8 +12262,8 @@
msgid "read commit log message from file"
msgstr ""
-#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288
-#: builtin/pull.c:175 builtin/revert.c:118
+#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:299
+#: builtin/pull.c:176 builtin/revert.c:118
msgid "GPG sign commit"
msgstr ""
@@ -11461,10 +12300,14 @@
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"
@@ -11477,133 +12320,135 @@
"\n"
msgstr ""
-#: builtin/commit.c:315
+#: builtin/commit.c:312
msgid "failed to unpack HEAD tree object"
msgstr ""
-#: builtin/commit.c:351
+#: builtin/commit.c:348
msgid "--pathspec-from-file with -a does not make sense"
msgstr ""
-#: builtin/commit.c:364
+#: builtin/commit.c:361
msgid "No paths with --include/--only does not make sense."
msgstr ""
-#: builtin/commit.c:376
+#: builtin/commit.c:373
msgid "unable to create temporary index"
msgstr ""
-#: builtin/commit.c:385
+#: builtin/commit.c:382
msgid "interactive add failed"
msgstr ""
-#: builtin/commit.c:400
+#: builtin/commit.c:397
msgid "unable to update temporary index"
msgstr ""
-#: builtin/commit.c:402
+#: builtin/commit.c:399
msgid "Failed to update main cache tree"
msgstr ""
-#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496
+#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495
msgid "unable to write new_index file"
msgstr ""
-#: builtin/commit.c:479
+#: builtin/commit.c:476
msgid "cannot do a partial commit during a merge."
msgstr ""
-#: builtin/commit.c:481
+#: builtin/commit.c:478
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
-#: builtin/commit.c:489
+#: 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:508
+#: builtin/commit.c:507
msgid "unable to write temporary index file"
msgstr ""
-#: builtin/commit.c:606
+#: builtin/commit.c:605
#, c-format
msgid "commit '%s' lacks author header"
msgstr ""
-#: builtin/commit.c:608
+#: builtin/commit.c:607
#, c-format
msgid "commit '%s' has malformed author line"
msgstr ""
-#: builtin/commit.c:627
+#: builtin/commit.c:626
msgid "malformed --author parameter"
msgstr ""
-#: builtin/commit.c:680
+#: 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:718 builtin/commit.c:751 builtin/commit.c:1097
+#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097
#, c-format
msgid "could not lookup commit %s"
msgstr ""
-#: builtin/commit.c:730 builtin/shortlog.c:319
+#: builtin/commit.c:729 builtin/shortlog.c:413
#, c-format
msgid "(reading log message from standard input)\n"
msgstr ""
-#: builtin/commit.c:732
+#: builtin/commit.c:731
msgid "could not read log from standard input"
msgstr ""
-#: builtin/commit.c:736
+#: builtin/commit.c:735
#, c-format
msgid "could not read log file '%s'"
msgstr ""
-#: builtin/commit.c:767 builtin/commit.c:783
+#: builtin/commit.c:766 builtin/commit.c:782
msgid "could not read SQUASH_MSG"
msgstr ""
-#: builtin/commit.c:774
+#: builtin/commit.c:773
msgid "could not read MERGE_MSG"
msgstr ""
-#: builtin/commit.c:834
+#: builtin/commit.c:833
msgid "could not write commit template"
msgstr ""
#: builtin/commit.c:853
-#, c-format
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
+"If this is not correct, please run\n"
+"\tgit update-ref -d MERGE_HEAD\n"
"and try again.\n"
msgstr ""
#: builtin/commit.c:858
-#, c-format
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
+"If this is not correct, please run\n"
+"\tgit update-ref -d CHERRY_PICK_HEAD\n"
"and try again.\n"
msgstr ""
-#: builtin/commit.c:871
+#: 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:879
+#: builtin/commit.c:876
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -11611,22 +12456,22 @@
"An empty message aborts the commit.\n"
msgstr ""
-#: builtin/commit.c:896
+#: builtin/commit.c:893
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr ""
-#: builtin/commit.c:904
+#: builtin/commit.c:901
#, c-format
msgid "%sDate: %s"
msgstr ""
-#: builtin/commit.c:911
+#: builtin/commit.c:908
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr ""
-#: builtin/commit.c:929
+#: builtin/commit.c:926
msgid "Cannot read index"
msgstr ""
@@ -11634,7 +12479,7 @@
msgid "Error building trees"
msgstr ""
-#: builtin/commit.c:1011 builtin/tag.c:275
+#: builtin/commit.c:1011 builtin/tag.c:308
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
@@ -11649,7 +12494,7 @@
msgid "Invalid ignored mode '%s'"
msgstr ""
-#: builtin/commit.c:1087 builtin/commit.c:1327
+#: builtin/commit.c:1087 builtin/commit.c:1331
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr ""
@@ -11674,533 +12519,478 @@
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
-#: builtin/commit.c:1188
+#: 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:1198
+#: builtin/commit.c:1200
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
-#: builtin/commit.c:1200
+#: builtin/commit.c:1202
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr ""
-#: builtin/commit.c:1208
+#: builtin/commit.c:1211
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
-#: builtin/commit.c:1225
+#: builtin/commit.c:1229
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
-#: builtin/commit.c:1231
+#: builtin/commit.c:1235
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr ""
-#: builtin/commit.c:1362 builtin/commit.c:1524
+#: builtin/commit.c:1366 builtin/commit.c:1527
msgid "show status concisely"
msgstr ""
-#: builtin/commit.c:1364 builtin/commit.c:1526
+#: builtin/commit.c:1368 builtin/commit.c:1529
msgid "show branch information"
msgstr ""
-#: builtin/commit.c:1366
+#: builtin/commit.c:1370
msgid "show stash information"
msgstr ""
-#: builtin/commit.c:1368 builtin/commit.c:1528
+#: builtin/commit.c:1372 builtin/commit.c:1531
msgid "compute full ahead/behind values"
msgstr ""
-#: builtin/commit.c:1370
+#: builtin/commit.c:1374
msgid "version"
msgstr ""
-#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549
-#: builtin/worktree.c:643
+#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560
+#: builtin/worktree.c:679
msgid "machine-readable output"
msgstr ""
-#: builtin/commit.c:1373 builtin/commit.c:1532
+#: builtin/commit.c:1377 builtin/commit.c:1535
msgid "show status in long format (default)"
msgstr ""
-#: builtin/commit.c:1376 builtin/commit.c:1535
+#: builtin/commit.c:1380 builtin/commit.c:1538
msgid "terminate entries with NUL"
msgstr ""
-#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538
-#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
-#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336
+#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541
+#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
+#: builtin/fast-export.c:1204 builtin/rebase.c:1412 parse-options.h:336
msgid "mode"
msgstr ""
-#: builtin/commit.c:1379 builtin/commit.c:1538
+#: builtin/commit.c:1383 builtin/commit.c:1541
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
-#: builtin/commit.c:1383
+#: builtin/commit.c:1387
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
msgstr ""
-#: builtin/commit.c:1385 parse-options.h:192
+#: builtin/commit.c:1389 parse-options.h:192
msgid "when"
msgstr ""
-#: builtin/commit.c:1386
+#: builtin/commit.c:1390
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
-#: builtin/commit.c:1388
+#: builtin/commit.c:1392
msgid "list untracked files in columns"
msgstr ""
-#: builtin/commit.c:1389
+#: builtin/commit.c:1393
msgid "do not detect renames"
msgstr ""
-#: builtin/commit.c:1391
+#: builtin/commit.c:1395
msgid "detect renames, optionally set similarity index"
msgstr ""
-#: builtin/commit.c:1411
+#: builtin/commit.c:1415
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr ""
-#: builtin/commit.c:1494
+#: builtin/commit.c:1497
msgid "suppress summary after successful commit"
msgstr ""
-#: builtin/commit.c:1495
+#: builtin/commit.c:1498
msgid "show diff in commit message template"
msgstr ""
-#: builtin/commit.c:1497
+#: builtin/commit.c:1500
msgid "Commit message options"
msgstr ""
-#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414
+#: builtin/commit.c:1501 builtin/merge.c:286 builtin/tag.c:447
msgid "read message from file"
msgstr ""
-#: builtin/commit.c:1499
+#: builtin/commit.c:1502
msgid "author"
msgstr ""
-#: builtin/commit.c:1499
+#: builtin/commit.c:1502
msgid "override author for commit"
msgstr ""
-#: builtin/commit.c:1500 builtin/gc.c:538
+#: builtin/commit.c:1503 builtin/gc.c:550
msgid "date"
msgstr ""
-#: builtin/commit.c:1500
+#: builtin/commit.c:1503
msgid "override date for commit"
msgstr ""
-#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504
-#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92
+#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507
+#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:90
msgid "commit"
msgstr ""
-#: builtin/commit.c:1502
+#: builtin/commit.c:1505
msgid "reuse and edit message from specified commit"
msgstr ""
-#: builtin/commit.c:1503
+#: builtin/commit.c:1506
msgid "reuse message from specified commit"
msgstr ""
-#: builtin/commit.c:1504
+#: builtin/commit.c:1507
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
-#: builtin/commit.c:1505
+#: builtin/commit.c:1508
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
-#: builtin/commit.c:1506
+#: builtin/commit.c:1509
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
-#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290
-#: builtin/pull.c:144 builtin/revert.c:110
-msgid "add Signed-off-by:"
-msgstr ""
-
-#: builtin/commit.c:1508
-msgid "use specified template file"
-msgstr ""
-
-#: builtin/commit.c:1509
-msgid "force edit of commit"
+#: builtin/commit.c:1510 builtin/log.c:1743 builtin/merge.c:302
+#: builtin/pull.c:145 builtin/revert.c:110
+msgid "add a Signed-off-by trailer"
msgstr ""
#: 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:1516
+#: builtin/commit.c:1519
msgid "Commit contents options"
msgstr ""
-#: builtin/commit.c:1517
+#: builtin/commit.c:1520
msgid "commit all changed files"
msgstr ""
-#: builtin/commit.c:1518
+#: builtin/commit.c:1521
msgid "add specified files to index for commit"
msgstr ""
-#: builtin/commit.c:1519
+#: builtin/commit.c:1522
msgid "interactively add files"
msgstr ""
-#: builtin/commit.c:1520
+#: builtin/commit.c:1523
msgid "interactively add changes"
msgstr ""
-#: builtin/commit.c:1521
+#: builtin/commit.c:1524
msgid "commit only specified files"
msgstr ""
-#: builtin/commit.c:1522
+#: builtin/commit.c:1525
msgid "bypass pre-commit and commit-msg hooks"
msgstr ""
-#: builtin/commit.c:1523
+#: builtin/commit.c:1526
msgid "show what would be committed"
msgstr ""
-#: builtin/commit.c:1536
+#: builtin/commit.c:1539
msgid "amend previous commit"
msgstr ""
-#: builtin/commit.c:1537
+#: builtin/commit.c:1540
msgid "bypass post-rewrite hook"
msgstr ""
-#: builtin/commit.c:1544
+#: builtin/commit.c:1547
msgid "ok to record an empty change"
msgstr ""
-#: builtin/commit.c:1546
+#: builtin/commit.c:1549
msgid "ok to record a change with an empty message"
msgstr ""
-#: builtin/commit.c:1619
+#: builtin/commit.c:1622
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
-#: builtin/commit.c:1626
+#: builtin/commit.c:1629
msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/commit.c:1645
+#: builtin/commit.c:1650
#, c-format
msgid "could not read commit message: %s"
msgstr ""
-#: builtin/commit.c:1652
+#: builtin/commit.c:1657
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr ""
-#: builtin/commit.c:1657
+#: builtin/commit.c:1662
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr ""
-#: builtin/commit.c:1691
+#: 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 builtin/commit-graph.c:17
-msgid ""
-"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
-msgstr ""
-
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:22
-msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
-msgstr ""
-
-#: builtin/commit-graph.c:52
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr ""
-
-#: builtin/commit-graph.c:68 builtin/commit-graph.c:125
-#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657
-msgid "dir"
-msgstr ""
-
-#: builtin/commit-graph.c:69 builtin/commit-graph.c:126
-#: builtin/commit-graph.c:211
-msgid "The object directory to store the graph"
-msgstr ""
-
-#: builtin/commit-graph.c:71
-msgid "if the commit-graph is split, only verify the tip file"
-msgstr ""
-
-#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23
-#, c-format
-msgid "Could not open commit-graph '%s'"
-msgstr ""
-
-#: builtin/commit-graph.c:128
-msgid "start walk at all refs"
-msgstr ""
-
-#: builtin/commit-graph.c:130
-msgid "scan pack-indexes listed by stdin for commits"
-msgstr ""
-
-#: builtin/commit-graph.c:132
-msgid "start walk at commits listed by stdin"
-msgstr ""
-
-#: builtin/commit-graph.c:134
-msgid "include all commits already in the commit-graph file"
-msgstr ""
-
-#: builtin/commit-graph.c:137
-msgid "allow writing an incremental commit-graph file"
-msgstr ""
-
-#: builtin/commit-graph.c:139 builtin/commit-graph.c:143
-msgid "maximum number of commits in a non-base split commit-graph"
-msgstr ""
-
-#: builtin/commit-graph.c:141
-msgid "maximum ratio between two levels of a split commit-graph"
-msgstr ""
-
-#: builtin/commit-graph.c:159
-msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
-msgstr ""
-
#: builtin/config.c:11
msgid "git config [<options>]"
msgstr ""
-#: builtin/config.c:104 builtin/env--helper.c:23
+#: builtin/config.c:109 builtin/env--helper.c:27
#, c-format
msgid "unrecognized --type argument, %s"
msgstr ""
-#: builtin/config.c:116
+#: builtin/config.c:121
msgid "only one type at a time"
msgstr ""
-#: builtin/config.c:125
+#: builtin/config.c:130
msgid "Config file location"
msgstr ""
-#: builtin/config.c:126
+#: builtin/config.c:131
msgid "use global config file"
msgstr ""
-#: builtin/config.c:127
+#: builtin/config.c:132
msgid "use system config file"
msgstr ""
-#: builtin/config.c:128
+#: builtin/config.c:133
msgid "use repository config file"
msgstr ""
-#: builtin/config.c:129
+#: builtin/config.c:134
msgid "use per-worktree config file"
msgstr ""
-#: builtin/config.c:130
+#: builtin/config.c:135
msgid "use given config file"
msgstr ""
-#: builtin/config.c:131
+#: builtin/config.c:136
msgid "blob-id"
msgstr ""
-#: builtin/config.c:131
+#: builtin/config.c:136
msgid "read config from given blob object"
msgstr ""
-#: builtin/config.c:132
+#: builtin/config.c:137
msgid "Action"
msgstr ""
-#: builtin/config.c:133
-msgid "get value: name [value-regex]"
-msgstr ""
-
-#: builtin/config.c:134
-msgid "get all values: key [value-regex]"
-msgstr ""
-
-#: builtin/config.c:135
-msgid "get values for regexp: name-regex [value-regex]"
-msgstr ""
-
-#: builtin/config.c:136
-msgid "get value specific for the URL: section[.var] URL"
-msgstr ""
-
-#: builtin/config.c:137
-msgid "replace all matching variables: name value [value_regex]"
-msgstr ""
-
#: builtin/config.c:138
-msgid "add a new variable: name value"
+msgid "get value: name [value-pattern]"
msgstr ""
#: builtin/config.c:139
-msgid "remove a variable: name [value-regex]"
+msgid "get all values: key [value-pattern]"
msgstr ""
#: builtin/config.c:140
-msgid "remove all matches: name [value-regex]"
+msgid "get values for regexp: name-regex [value-pattern]"
msgstr ""
#: builtin/config.c:141
-msgid "rename section: old-name new-name"
+msgid "get value specific for the URL: section[.var] URL"
msgstr ""
#: builtin/config.c:142
-msgid "remove a section: name"
+msgid "replace all matching variables: name value [value-pattern]"
msgstr ""
#: builtin/config.c:143
-msgid "list all"
+msgid "add a new variable: name value"
msgstr ""
#: builtin/config.c:144
-msgid "open an editor"
+msgid "remove a variable: name [value-pattern]"
msgstr ""
#: builtin/config.c:145
-msgid "find the color configured: slot [default]"
+msgid "remove all matches: name [value-pattern]"
msgstr ""
#: builtin/config.c:146
-msgid "find the color setting: slot [stdout-is-tty]"
+msgid "rename section: old-name new-name"
msgstr ""
#: builtin/config.c:147
-msgid "Type"
+msgid "remove a section: name"
msgstr ""
-#: builtin/config.c:148 builtin/env--helper.c:38
-msgid "value is given this type"
+#: builtin/config.c:148
+msgid "list all"
msgstr ""
#: builtin/config.c:149
-msgid "value is \"true\" or \"false\""
+msgid "use string equality when comparing values to 'value-pattern'"
msgstr ""
#: builtin/config.c:150
-msgid "value is decimal number"
+msgid "open an editor"
msgstr ""
#: builtin/config.c:151
-msgid "value is --bool or --int"
+msgid "find the color configured: slot [default]"
msgstr ""
#: builtin/config.c:152
-msgid "value is a path (file or directory name)"
+msgid "find the color setting: slot [stdout-is-tty]"
msgstr ""
#: builtin/config.c:153
-msgid "value is an expiry date"
+msgid "Type"
msgstr ""
-#: builtin/config.c:154
-msgid "Other"
+#: builtin/config.c:154 builtin/env--helper.c:43
+msgid "value is given this type"
msgstr ""
#: builtin/config.c:155
-msgid "terminate values with NUL byte"
+msgid "value is \"true\" or \"false\""
msgstr ""
#: builtin/config.c:156
-msgid "show variable names only"
+msgid "value is decimal number"
msgstr ""
#: builtin/config.c:157
-msgid "respect include directives on lookup"
+msgid "value is --bool or --int"
msgstr ""
#: builtin/config.c:158
-msgid "show origin of config (file, standard input, blob, command line)"
+msgid "value is --bool or string"
msgstr ""
#: builtin/config.c:159
-msgid "show scope of config (worktree, local, global, system, command)"
-msgstr ""
-
-#: builtin/config.c:160 builtin/env--helper.c:40
-msgid "value"
+msgid "value is a path (file or directory name)"
msgstr ""
#: builtin/config.c:160
+msgid "value is an expiry date"
+msgstr ""
+
+#: builtin/config.c:161
+msgid "Other"
+msgstr ""
+
+#: builtin/config.c:162
+msgid "terminate values with NUL byte"
+msgstr ""
+
+#: builtin/config.c:163
+msgid "show variable names only"
+msgstr ""
+
+#: builtin/config.c:164
+msgid "respect include directives on lookup"
+msgstr ""
+
+#: builtin/config.c:165
+msgid "show origin of config (file, standard input, blob, command line)"
+msgstr ""
+
+#: builtin/config.c:166
+msgid "show scope of config (worktree, local, global, system, command)"
+msgstr ""
+
+#: builtin/config.c:167 builtin/env--helper.c:45
+msgid "value"
+msgstr ""
+
+#: builtin/config.c:167
msgid "with --get, use default value when missing entry"
msgstr ""
-#: builtin/config.c:174
+#: builtin/config.c:181
#, c-format
msgid "wrong number of arguments, should be %d"
msgstr ""
-#: builtin/config.c:176
+#: builtin/config.c:183
#, c-format
msgid "wrong number of arguments, should be from %d to %d"
msgstr ""
-#: builtin/config.c:324
+#: builtin/config.c:339
#, c-format
msgid "invalid key pattern: %s"
msgstr ""
-#: builtin/config.c:360
+#: builtin/config.c:377
#, c-format
msgid "failed to format default config value: %s"
msgstr ""
-#: builtin/config.c:417
+#: builtin/config.c:441
#, c-format
msgid "cannot parse color '%s'"
msgstr ""
-#: builtin/config.c:459
+#: builtin/config.c:483
msgid "unable to parse default color value"
msgstr ""
-#: builtin/config.c:512 builtin/config.c:768
+#: builtin/config.c:536 builtin/config.c:833
msgid "not in a git directory"
msgstr ""
-#: builtin/config.c:515
+#: builtin/config.c:539
msgid "writing to stdin is not supported"
msgstr ""
-#: builtin/config.c:518
+#: builtin/config.c:542
msgid "writing config blobs is not supported"
msgstr ""
-#: builtin/config.c:603
+#: builtin/config.c:627
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -12210,81 +13000,89 @@
"#\temail = %s\n"
msgstr ""
-#: builtin/config.c:627
+#: builtin/config.c:652
msgid "only one config file at a time"
msgstr ""
-#: builtin/config.c:632
+#: builtin/config.c:658
msgid "--local can only be used inside a git repository"
msgstr ""
-#: builtin/config.c:635
+#: builtin/config.c:660
msgid "--blob can only be used inside a git repository"
msgstr ""
-#: builtin/config.c:655
+#: builtin/config.c:662
+msgid "--worktree can only be used inside a git repository"
+msgstr ""
+
+#: builtin/config.c:684
msgid "$HOME not set"
msgstr ""
-#: builtin/config.c:679
+#: builtin/config.c:708
msgid ""
"--worktree cannot be used with multiple working trees unless the config\n"
"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
"section in \"git help worktree\" for details"
msgstr ""
-#: builtin/config.c:714
+#: builtin/config.c:743
msgid "--get-color and variable type are incoherent"
msgstr ""
-#: builtin/config.c:719
+#: builtin/config.c:748
msgid "only one action at a time"
msgstr ""
-#: builtin/config.c:732
+#: builtin/config.c:761
msgid "--name-only is only applicable to --list or --get-regexp"
msgstr ""
-#: builtin/config.c:738
+#: builtin/config.c:767
msgid ""
"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
"list"
msgstr ""
-#: builtin/config.c:744
+#: builtin/config.c:773
msgid "--default is only applicable to --get"
msgstr ""
-#: builtin/config.c:757
+#: builtin/config.c:806
+msgid "--fixed-value only applies with 'value-pattern'"
+msgstr ""
+
+#: builtin/config.c:822
#, c-format
msgid "unable to read config file '%s'"
msgstr ""
-#: builtin/config.c:760
+#: builtin/config.c:825
msgid "error processing config file(s)"
msgstr ""
-#: builtin/config.c:770
+#: builtin/config.c:835
msgid "editing stdin is not supported"
msgstr ""
-#: builtin/config.c:772
+#: builtin/config.c:837
msgid "editing blobs is not supported"
msgstr ""
-#: builtin/config.c:786
+#: builtin/config.c:851
#, c-format
msgid "cannot create configuration file %s"
msgstr ""
-#: builtin/config.c:799
+#: builtin/config.c:864
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
" Use a regexp, --add or --replace-all to change %s."
msgstr ""
-#: builtin/config.c:873 builtin/config.c:884
+#: builtin/config.c:943 builtin/config.c:954
#, c-format
msgid "no such section: %s"
msgstr ""
@@ -12297,6 +13095,32 @@
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 ""
+
+#: 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/credential-store.c:66
+#, c-format
+msgid "unable to get credential storage lock in %d ms"
+msgstr ""
+
#: builtin/describe.c:26
msgid "git describe [<options>] [<commit-ish>...]"
msgstr ""
@@ -12305,190 +13129,203 @@
msgid "git describe [<options>] --dirty"
msgstr ""
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "head"
msgstr ""
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "lightweight"
msgstr ""
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "annotated"
msgstr ""
-#: builtin/describe.c:275
+#: builtin/describe.c:277
#, c-format
msgid "annotated tag %s not available"
msgstr ""
-#: builtin/describe.c:279
-#, c-format
-msgid "annotated tag %s has no embedded name"
-msgstr ""
-
#: 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:325
+#: builtin/describe.c:328
#, c-format
msgid "no tag exactly matches '%s'"
msgstr ""
-#: builtin/describe.c:327
+#: builtin/describe.c:330
#, c-format
msgid "No exact match on refs or tags, searching to describe\n"
msgstr ""
-#: builtin/describe.c:394
+#: builtin/describe.c:397
#, c-format
msgid "finished search at %s\n"
msgstr ""
-#: builtin/describe.c:421
+#: 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:425
+#: builtin/describe.c:428
#, c-format
msgid ""
"No tags can describe '%s'.\n"
"Try --always, or create some tags."
msgstr ""
-#: builtin/describe.c:455
+#: builtin/describe.c:458
#, c-format
msgid "traversed %lu commits\n"
msgstr ""
-#: builtin/describe.c:458
+#: 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:526
+#: builtin/describe.c:529
#, c-format
msgid "describe %s\n"
msgstr ""
-#: builtin/describe.c:529
+#: builtin/describe.c:532
#, c-format
msgid "Not a valid object name %s"
msgstr ""
-#: builtin/describe.c:537
+#: builtin/describe.c:540
#, c-format
msgid "%s is neither a commit nor blob"
msgstr ""
-#: builtin/describe.c:551
+#: builtin/describe.c:554
msgid "find the tag that comes after the commit"
msgstr ""
-#: builtin/describe.c:552
+#: builtin/describe.c:555
msgid "debug search strategy on stderr"
msgstr ""
-#: builtin/describe.c:553
+#: builtin/describe.c:556
msgid "use any ref"
msgstr ""
-#: builtin/describe.c:554
+#: builtin/describe.c:557
msgid "use any tag, even unannotated"
msgstr ""
-#: builtin/describe.c:555
+#: builtin/describe.c:558
msgid "always use long format"
msgstr ""
-#: builtin/describe.c:556
+#: builtin/describe.c:559
msgid "only follow first parent"
msgstr ""
-#: builtin/describe.c:559
+#: builtin/describe.c:562
msgid "only output exact matches"
msgstr ""
-#: builtin/describe.c:561
+#: builtin/describe.c:564
msgid "consider <n> most recent tags (default: 10)"
msgstr ""
-#: builtin/describe.c:563
+#: builtin/describe.c:566
msgid "only consider tags matching <pattern>"
msgstr ""
-#: builtin/describe.c:565
+#: builtin/describe.c:568
msgid "do not consider tags matching <pattern>"
msgstr ""
-#: builtin/describe.c:567 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:535
msgid "show abbreviated commit object as fallback"
msgstr ""
-#: builtin/describe.c:568 builtin/describe.c:571
+#: builtin/describe.c:571 builtin/describe.c:574
msgid "mark"
msgstr ""
-#: builtin/describe.c:569
+#: builtin/describe.c:572
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr ""
-#: builtin/describe.c:572
+#: builtin/describe.c:575
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr ""
-#: builtin/describe.c:590
+#: builtin/describe.c:593
msgid "--long is incompatible with --abbrev=0"
msgstr ""
-#: builtin/describe.c:619
+#: builtin/describe.c:622
msgid "No names found, cannot describe anything."
msgstr ""
-#: builtin/describe.c:670
+#: builtin/describe.c:673
msgid "--dirty is incompatible with commit-ishes"
msgstr ""
-#: builtin/describe.c:672
+#: builtin/describe.c:675
msgid "--broken is incompatible with commit-ishes"
msgstr ""
-#: builtin/diff.c:84
+#: builtin/diff-tree.c:155
+msgid "--stdin and --merge-base are mutually exclusive"
+msgstr ""
+
+#: builtin/diff-tree.c:157
+msgid "--merge-base only works with two commits"
+msgstr ""
+
+#: builtin/diff.c:92
#, c-format
msgid "'%s': not a regular file or symlink"
msgstr ""
-#: builtin/diff.c:235
+#: builtin/diff.c:259
#, c-format
msgid "invalid option: %s"
msgstr ""
-#: builtin/diff.c:350
+#: builtin/diff.c:376
+#, c-format
+msgid "%s...%s: no merge base"
+msgstr ""
+
+#: builtin/diff.c:486
msgid "Not a git repository"
msgstr ""
-#: builtin/diff.c:394
+#: builtin/diff.c:532 builtin/grep.c:682
#, c-format
msgid "invalid object '%s' given."
msgstr ""
-#: builtin/diff.c:403
+#: builtin/diff.c:543
#, c-format
msgid "more than two blobs given: '%s'"
msgstr ""
-#: builtin/diff.c:408
+#: builtin/diff.c:548
#, c-format
msgid "unhandled object '%s' given."
msgstr ""
+#: builtin/diff.c:582
+#, c-format
+msgid "%s...%s: multiple merge bases, using %s"
+msgstr ""
+
#: builtin/difftool.c:30
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr ""
@@ -12513,89 +13350,89 @@
msgid "could not read object %s for symlink %s"
msgstr ""
-#: builtin/difftool.c:413
+#: builtin/difftool.c:412
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
msgstr ""
-#: builtin/difftool.c:634
+#: builtin/difftool.c:633
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr ""
-#: builtin/difftool.c:636
+#: builtin/difftool.c:635
msgid "working tree file has been left."
msgstr ""
-#: builtin/difftool.c:647
+#: builtin/difftool.c:646
#, c-format
msgid "temporary files exist in '%s'."
msgstr ""
-#: builtin/difftool.c:648
+#: builtin/difftool.c:647
msgid "you may want to cleanup or recover these."
msgstr ""
-#: builtin/difftool.c:697
+#: builtin/difftool.c:696
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr ""
-#: builtin/difftool.c:699
+#: builtin/difftool.c:698
msgid "perform a full-directory diff"
msgstr ""
-#: builtin/difftool.c:701
+#: builtin/difftool.c:700
msgid "do not prompt before launching a diff tool"
msgstr ""
-#: builtin/difftool.c:706
+#: builtin/difftool.c:705
msgid "use symlinks in dir-diff mode"
msgstr ""
-#: builtin/difftool.c:707
+#: builtin/difftool.c:706
msgid "tool"
msgstr ""
-#: builtin/difftool.c:708
+#: builtin/difftool.c:707
msgid "use the specified diff tool"
msgstr ""
-#: builtin/difftool.c:710
+#: builtin/difftool.c:709
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
-#: builtin/difftool.c:713
+#: builtin/difftool.c:712
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
msgstr ""
-#: builtin/difftool.c:716
+#: builtin/difftool.c:715
msgid "specify a custom command for viewing diffs"
msgstr ""
-#: builtin/difftool.c:717
+#: builtin/difftool.c:716
msgid "passed to `diff`"
msgstr ""
-#: builtin/difftool.c:732
+#: builtin/difftool.c:731
msgid "difftool requires worktree or --no-index"
msgstr ""
-#: builtin/difftool.c:739
+#: builtin/difftool.c:738
msgid "--dir-diff is incompatible with --no-index"
msgstr ""
-#: builtin/difftool.c:742
+#: builtin/difftool.c:741
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr ""
-#: builtin/difftool.c:750
+#: builtin/difftool.c:749
msgid "no <tool> given for --tool=<tool>"
msgstr ""
-#: builtin/difftool.c:757
+#: builtin/difftool.c:756
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr ""
@@ -12603,24 +13440,24 @@
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 `"
@@ -12631,279 +13468,342 @@
msgid "git fast-export [rev-list-opts]"
msgstr ""
-#: builtin/fast-export.c:853
+#: builtin/fast-export.c:868
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr ""
-#: builtin/fast-export.c:1152
+#: builtin/fast-export.c:1177
+msgid "--anonymize-map token cannot be empty"
+msgstr ""
+
+#: builtin/fast-export.c:1197
msgid "show progress after <n> objects"
msgstr ""
-#: builtin/fast-export.c:1154
+#: builtin/fast-export.c:1199
msgid "select handling of signed tags"
msgstr ""
-#: builtin/fast-export.c:1157
+#: builtin/fast-export.c:1202
msgid "select handling of tags that tag filtered objects"
msgstr ""
-#: builtin/fast-export.c:1160
+#: builtin/fast-export.c:1205
msgid "select handling of commit messages in an alternate encoding"
msgstr ""
-#: builtin/fast-export.c:1163
-msgid "Dump marks to this file"
+#: builtin/fast-export.c:1208
+msgid "dump marks to this file"
msgstr ""
-#: builtin/fast-export.c:1165
-msgid "Import marks from this file"
+#: builtin/fast-export.c:1210
+msgid "import marks from this file"
msgstr ""
-#: builtin/fast-export.c:1169
-msgid "Import marks from this file if it exists"
+#: builtin/fast-export.c:1214
+msgid "import marks from this file if it exists"
msgstr ""
-#: builtin/fast-export.c:1171
-msgid "Fake a tagger when tags lack one"
+#: builtin/fast-export.c:1216
+msgid "fake a tagger when tags lack one"
msgstr ""
-#: builtin/fast-export.c:1173
-msgid "Output full tree for each commit"
-msgstr ""
-
-#: builtin/fast-export.c:1175
-msgid "Use the done feature to terminate the stream"
-msgstr ""
-
-#: builtin/fast-export.c:1176
-msgid "Skip output of blob data"
-msgstr ""
-
-#: builtin/fast-export.c:1177 builtin/log.c:1705
-msgid "refspec"
-msgstr ""
-
-#: builtin/fast-export.c:1178
-msgid "Apply refspec to exported refs"
-msgstr ""
-
-#: builtin/fast-export.c:1179
-msgid "anonymize output"
-msgstr ""
-
-#: builtin/fast-export.c:1181
-msgid "Reference parents which are not in fast-export stream by object id"
-msgstr ""
-
-#: builtin/fast-export.c:1183
-msgid "Show original object ids of blobs/commits"
-msgstr ""
-
-#: builtin/fast-export.c:1185
-msgid "Label tags with mark ids"
+#: builtin/fast-export.c:1218
+msgid "output full tree for each commit"
msgstr ""
#: builtin/fast-export.c:1220
+msgid "use the done feature to terminate the stream"
+msgstr ""
+
+#: builtin/fast-export.c:1221
+msgid "skip output of blob data"
+msgstr ""
+
+#: builtin/fast-export.c:1222 builtin/log.c:1815
+msgid "refspec"
+msgstr ""
+
+#: builtin/fast-export.c:1223
+msgid "apply refspec to exported refs"
+msgstr ""
+
+#: builtin/fast-export.c:1224
+msgid "anonymize output"
+msgstr ""
+
+#: builtin/fast-export.c:1225
+msgid "from:to"
+msgstr ""
+
+#: builtin/fast-export.c:1226
+msgid "convert <from> to <to> in anonymized output"
+msgstr ""
+
+#: builtin/fast-export.c:1229
+msgid "reference parents which are not in fast-export stream by object id"
+msgstr ""
+
+#: builtin/fast-export.c:1231
+msgid "show original object ids of blobs/commits"
+msgstr ""
+
+#: builtin/fast-export.c:1233
+msgid "label tags with mark ids"
+msgstr ""
+
+#: builtin/fast-export.c:1256
+msgid "--anonymize-map without --anonymize does not make sense"
+msgstr ""
+
+#: builtin/fast-export.c:1271
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
msgstr ""
-#: builtin/fetch.c:34
-msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+#: builtin/fast-import.c:3088
+#, c-format
+msgid "Missing from marks for submodule '%s'"
+msgstr ""
+
+#: builtin/fast-import.c:3090
+#, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr ""
+
+#: builtin/fast-import.c:3225
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr ""
+
+#: builtin/fast-import.c:3230
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr ""
+
+#: builtin/fast-import.c:3322
+msgid "Expected format name:filename for submodule rewrite option"
+msgstr ""
+
+#: builtin/fast-import.c:3377
+#, c-format
+msgid "feature '%s' forbidden in input without --allow-unsafe-features"
+msgstr ""
+
+#: builtin/fetch-pack.c:242
+#, c-format
+msgid "Lockfile created but not reported: %s"
msgstr ""
#: builtin/fetch.c:35
-msgid "git fetch [<options>] <group>"
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr ""
#: builtin/fetch.c:36
-msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+msgid "git fetch [<options>] <group>"
msgstr ""
#: builtin/fetch.c:37
+msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+msgstr ""
+
+#: builtin/fetch.c:38
msgid "git fetch --all [<options>]"
msgstr ""
-#: builtin/fetch.c:116
+#: builtin/fetch.c:120
msgid "fetch.parallel cannot be negative"
msgstr ""
-#: builtin/fetch.c:139 builtin/pull.c:184
+#: builtin/fetch.c:143 builtin/pull.c:185
msgid "fetch from all remotes"
msgstr ""
-#: builtin/fetch.c:141 builtin/pull.c:228
+#: builtin/fetch.c:145 builtin/pull.c:245
msgid "set upstream for git pull/fetch"
msgstr ""
-#: builtin/fetch.c:143 builtin/pull.c:187
+#: builtin/fetch.c:147 builtin/pull.c:188
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr ""
-#: builtin/fetch.c:145 builtin/pull.c:190
+#: builtin/fetch.c:149
+msgid "use atomic transaction to update references"
+msgstr ""
+
+#: builtin/fetch.c:151 builtin/pull.c:191
msgid "path to upload pack on remote end"
msgstr ""
-#: builtin/fetch.c:146
+#: builtin/fetch.c:152
msgid "force overwrite of local reference"
msgstr ""
-#: builtin/fetch.c:148
+#: builtin/fetch.c:154
msgid "fetch from multiple remotes"
msgstr ""
-#: builtin/fetch.c:150 builtin/pull.c:194
+#: builtin/fetch.c:156 builtin/pull.c:195
msgid "fetch all tags and associated objects"
msgstr ""
-#: builtin/fetch.c:152
+#: builtin/fetch.c:158
msgid "do not fetch all tags (--no-tags)"
msgstr ""
-#: builtin/fetch.c:154
+#: builtin/fetch.c:160
msgid "number of submodules fetched in parallel"
msgstr ""
-#: builtin/fetch.c:156 builtin/pull.c:197
+#: builtin/fetch.c:162 builtin/pull.c:198
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
-#: builtin/fetch.c:158
+#: builtin/fetch.c:164
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
-#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121
+#: builtin/fetch.c:165 builtin/fetch.c:190 builtin/pull.c:122
msgid "on-demand"
msgstr ""
-#: builtin/fetch.c:160
+#: builtin/fetch.c:166
msgid "control recursive fetching of submodules"
msgstr ""
-#: builtin/fetch.c:164 builtin/pull.c:205
+#: builtin/fetch.c:171
+msgid "write fetched references to the FETCH_HEAD file"
+msgstr ""
+
+#: builtin/fetch.c:172 builtin/pull.c:206
msgid "keep downloaded pack"
msgstr ""
-#: builtin/fetch.c:166
+#: builtin/fetch.c:174
msgid "allow updating of HEAD ref"
msgstr ""
-#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208
+#: builtin/fetch.c:177 builtin/fetch.c:183 builtin/pull.c:209
+#: builtin/pull.c:218
msgid "deepen history of shallow clone"
msgstr ""
-#: builtin/fetch.c:171
+#: builtin/fetch.c:179 builtin/pull.c:212
msgid "deepen history of shallow repository based on time"
msgstr ""
-#: builtin/fetch.c:177 builtin/pull.c:211
+#: builtin/fetch.c:185 builtin/pull.c:221
msgid "convert to a complete repository"
msgstr ""
-#: builtin/fetch.c:180
+#: builtin/fetch.c:188
msgid "prepend this to submodule path output"
msgstr ""
-#: builtin/fetch.c:183
+#: builtin/fetch.c:191
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr ""
-#: builtin/fetch.c:187 builtin/pull.c:214
+#: builtin/fetch.c:195 builtin/pull.c:224
msgid "accept refs that update .git/shallow"
msgstr ""
-#: builtin/fetch.c:188 builtin/pull.c:216
+#: builtin/fetch.c:196 builtin/pull.c:226
msgid "refmap"
msgstr ""
-#: builtin/fetch.c:189 builtin/pull.c:217
+#: builtin/fetch.c:197 builtin/pull.c:227
msgid "specify fetch refmap"
msgstr ""
-#: builtin/fetch.c:196
+#: builtin/fetch.c:204 builtin/pull.c:240
msgid "report that we have only objects reachable from this object"
msgstr ""
-#: builtin/fetch.c:199
-msgid "run 'gc --auto' after fetching"
+#: builtin/fetch.c:207 builtin/fetch.c:209
+msgid "run 'maintenance --auto' after fetching"
msgstr ""
-#: builtin/fetch.c:201 builtin/pull.c:226
+#: builtin/fetch.c:211 builtin/pull.c:243
msgid "check for forced-updates on all updated branches"
msgstr ""
-#: builtin/fetch.c:203
+#: builtin/fetch.c:213
msgid "write the commit-graph after fetching"
msgstr ""
-#: builtin/fetch.c:513
+#: builtin/fetch.c:215
+msgid "accept refspecs from stdin"
+msgstr ""
+
+#: builtin/fetch.c:526
msgid "Couldn't find remote ref HEAD"
msgstr ""
-#: builtin/fetch.c:653
+#: builtin/fetch.c:697
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr ""
-#: builtin/fetch.c:751
+#: builtin/fetch.c:796
#, c-format
msgid "object %s not found"
msgstr ""
-#: builtin/fetch.c:755
+#: builtin/fetch.c:800
msgid "[up to date]"
msgstr ""
-#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
+#: builtin/fetch.c:813 builtin/fetch.c:829 builtin/fetch.c:901
msgid "[rejected]"
msgstr ""
-#: builtin/fetch.c:769
+#: builtin/fetch.c:814
msgid "can't fetch in current branch"
msgstr ""
-#: builtin/fetch.c:779
+#: builtin/fetch.c:824
msgid "[tag update]"
msgstr ""
-#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839
-#: builtin/fetch.c:851
+#: builtin/fetch.c:825 builtin/fetch.c:862 builtin/fetch.c:884
+#: builtin/fetch.c:896
msgid "unable to update local ref"
msgstr ""
-#: builtin/fetch.c:784
+#: builtin/fetch.c:829
msgid "would clobber existing tag"
msgstr ""
-#: builtin/fetch.c:806
+#: builtin/fetch.c:851
msgid "[new tag]"
msgstr ""
-#: builtin/fetch.c:809
+#: builtin/fetch.c:854
msgid "[new branch]"
msgstr ""
-#: builtin/fetch.c:812
+#: builtin/fetch.c:857
msgid "[new ref]"
msgstr ""
-#: builtin/fetch.c:851
+#: builtin/fetch.c:896
msgid "forced update"
msgstr ""
-#: builtin/fetch.c:856
+#: builtin/fetch.c:901
msgid "non-fast-forward"
msgstr ""
-#: builtin/fetch.c:877
+#: builtin/fetch.c:1005
msgid ""
"Fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
"flag or run 'git config fetch.showForcedUpdates true'."
msgstr ""
-#: builtin/fetch.c:881
+#: builtin/fetch.c:1009
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
@@ -12912,169 +13812,177 @@
" to avoid this check.\n"
msgstr ""
-#: builtin/fetch.c:920
+#: builtin/fetch.c:1041
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr ""
-#: builtin/fetch.c:941
+#: builtin/fetch.c:1069
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
-#: builtin/fetch.c:1026 builtin/fetch.c:1164
+#: builtin/fetch.c:1146 builtin/fetch.c:1297
#, c-format
msgid "From %.*s\n"
msgstr ""
-#: builtin/fetch.c:1037
+#: builtin/fetch.c:1168
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting branches"
msgstr ""
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1267
#, c-format
msgid " (%s will become dangling)"
msgstr ""
-#: builtin/fetch.c:1135
+#: builtin/fetch.c:1268
#, c-format
msgid " (%s has become dangling)"
msgstr ""
-#: builtin/fetch.c:1167
+#: builtin/fetch.c:1300
msgid "[deleted]"
msgstr ""
-#: builtin/fetch.c:1168 builtin/remote.c:1112
+#: builtin/fetch.c:1301 builtin/remote.c:1118
msgid "(none)"
msgstr ""
-#: builtin/fetch.c:1191
+#: builtin/fetch.c:1324
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
-#: builtin/fetch.c:1210
+#: builtin/fetch.c:1343
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
-#: builtin/fetch.c:1213
+#: builtin/fetch.c:1346
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
-#: builtin/fetch.c:1421
+#: builtin/fetch.c:1558
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr ""
-#: builtin/fetch.c:1436
+#: builtin/fetch.c:1573
msgid "not setting upstream for a remote remote-tracking branch"
msgstr ""
-#: builtin/fetch.c:1438
+#: builtin/fetch.c:1575
msgid "not setting upstream for a remote tag"
msgstr ""
-#: builtin/fetch.c:1440
+#: builtin/fetch.c:1577
msgid "unknown branch type"
msgstr ""
-#: builtin/fetch.c:1442
+#: builtin/fetch.c:1579
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
msgstr ""
-#: builtin/fetch.c:1568 builtin/fetch.c:1631
+#: builtin/fetch.c:1708 builtin/fetch.c:1771
#, c-format
msgid "Fetching %s\n"
msgstr ""
-#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101
+#: builtin/fetch.c:1718 builtin/fetch.c:1773 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr ""
-#: builtin/fetch.c:1590
+#: builtin/fetch.c:1730
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr ""
-#: builtin/fetch.c:1693
+#: builtin/fetch.c:1834
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr ""
-#: builtin/fetch.c:1730
+#: builtin/fetch.c:1870
msgid "You need to specify a tag name."
msgstr ""
-#: builtin/fetch.c:1780
+#: builtin/fetch.c:1935
msgid "Negative depth in --deepen is not supported"
msgstr ""
-#: builtin/fetch.c:1782
+#: builtin/fetch.c:1937
msgid "--deepen and --depth are mutually exclusive"
msgstr ""
-#: builtin/fetch.c:1787
+#: builtin/fetch.c:1942
msgid "--depth and --unshallow cannot be used together"
msgstr ""
-#: builtin/fetch.c:1789
+#: builtin/fetch.c:1944
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
-#: builtin/fetch.c:1805
+#: builtin/fetch.c:1961
msgid "fetch --all does not take a repository argument"
msgstr ""
-#: builtin/fetch.c:1807
+#: builtin/fetch.c:1963
msgid "fetch --all does not make sense with refspecs"
msgstr ""
-#: builtin/fetch.c:1816
+#: builtin/fetch.c:1972
#, c-format
msgid "No such remote or remote group: %s"
msgstr ""
-#: builtin/fetch.c:1823
+#: builtin/fetch.c:1979
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
-#: builtin/fetch.c:1841
+#: builtin/fetch.c:1997
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
msgstr ""
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fetch.c:2001
+msgid "--atomic can only be used when fetching from one remote"
+msgstr ""
+
+#: builtin/fetch.c:2005
+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:671
+#: builtin/fmt-merge-msg.c:18
msgid "populate log with at most <n> entries from shortlog"
msgstr ""
-#: builtin/fmt-merge-msg.c:674
+#: builtin/fmt-merge-msg.c:21
msgid "alias for --log (deprecated)"
msgstr ""
-#: builtin/fmt-merge-msg.c:677
+#: builtin/fmt-merge-msg.c:24
msgid "text"
msgstr ""
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:25
msgid "use <text> as start of message"
msgstr ""
-#: builtin/fmt-merge-msg.c:679
+#: builtin/fmt-merge-msg.c:26
msgid "file to read from"
msgstr ""
@@ -13087,7 +13995,7 @@
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
@@ -13114,7 +14022,7 @@
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:472
msgid "respect format colors"
msgstr ""
@@ -13138,272 +14046,288 @@
msgid "print only refs which don't contain the commit"
msgstr ""
-#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148
+#: builtin/for-each-repo.c:9
+msgid "git for-each-repo --config=<config> <command-args>"
+msgstr ""
+
+#: builtin/for-each-repo.c:37
+msgid "config"
+msgstr ""
+
+#: builtin/for-each-repo.c:38
+msgid "config key storing a list of repository paths"
+msgstr ""
+
+#: builtin/for-each-repo.c:46
+msgid "missing --config=<config>"
+msgstr ""
+
+#: builtin/fsck.c:69 builtin/fsck.c:130 builtin/fsck.c:131
msgid "unknown"
msgstr ""
#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:100 builtin/fsck.c:120
+#: builtin/fsck.c:83 builtin/fsck.c:103
#, c-format
msgid "error in %s %s: %s"
msgstr ""
#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:114
+#: builtin/fsck.c:97
#, c-format
msgid "warning in %s %s: %s"
msgstr ""
-#: builtin/fsck.c:143 builtin/fsck.c:146
+#: builtin/fsck.c:126 builtin/fsck.c:129
#, c-format
msgid "broken link from %7s %s"
msgstr ""
-#: builtin/fsck.c:155
+#: builtin/fsck.c:138
msgid "wrong object type in link"
msgstr ""
-#: builtin/fsck.c:171
+#: builtin/fsck.c:154
#, c-format
msgid ""
"broken link from %7s %s\n"
" to %7s %s"
msgstr ""
-#: builtin/fsck.c:282
+#: builtin/fsck.c:265
#, c-format
msgid "missing %s %s"
msgstr ""
-#: builtin/fsck.c:309
+#: builtin/fsck.c:292
#, c-format
msgid "unreachable %s %s"
msgstr ""
-#: builtin/fsck.c:329
+#: builtin/fsck.c:312
#, c-format
msgid "dangling %s %s"
msgstr ""
-#: builtin/fsck.c:339
+#: builtin/fsck.c:322
msgid "could not create lost-found"
msgstr ""
-#: builtin/fsck.c:350
+#: builtin/fsck.c:333
#, c-format
msgid "could not finish '%s'"
msgstr ""
-#: builtin/fsck.c:367
+#: builtin/fsck.c:350
#, c-format
msgid "Checking %s"
msgstr ""
-#: builtin/fsck.c:405
+#: builtin/fsck.c:388
#, c-format
msgid "Checking connectivity (%d objects)"
msgstr ""
-#: builtin/fsck.c:424
+#: builtin/fsck.c:407
#, c-format
msgid "Checking %s %s"
msgstr ""
-#: builtin/fsck.c:429
+#: builtin/fsck.c:412
msgid "broken links"
msgstr ""
-#: builtin/fsck.c:438
+#: builtin/fsck.c:421
#, c-format
msgid "root %s"
msgstr ""
-#: builtin/fsck.c:446
+#: builtin/fsck.c:429
#, c-format
msgid "tagged %s %s (%s) in %s"
msgstr ""
-#: builtin/fsck.c:475
+#: builtin/fsck.c:458
#, c-format
msgid "%s: object corrupt or missing"
msgstr ""
-#: builtin/fsck.c:500
+#: builtin/fsck.c:483
#, c-format
msgid "%s: invalid reflog entry %s"
msgstr ""
-#: builtin/fsck.c:514
+#: builtin/fsck.c:497
#, c-format
msgid "Checking reflog %s->%s"
msgstr ""
-#: builtin/fsck.c:548
+#: builtin/fsck.c:531
#, c-format
msgid "%s: invalid sha1 pointer %s"
msgstr ""
-#: builtin/fsck.c:555
+#: builtin/fsck.c:538
#, c-format
msgid "%s: not a commit"
msgstr ""
-#: builtin/fsck.c:609
+#: builtin/fsck.c:592
msgid "notice: No default references"
msgstr ""
-#: builtin/fsck.c:624
+#: builtin/fsck.c:607
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr ""
-#: builtin/fsck.c:637
+#: builtin/fsck.c:620
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr ""
-#: builtin/fsck.c:657
+#: builtin/fsck.c:640
#, c-format
msgid "bad sha1 file: %s"
msgstr ""
-#: builtin/fsck.c:672
+#: builtin/fsck.c:655
msgid "Checking object directory"
msgstr ""
-#: builtin/fsck.c:675
+#: builtin/fsck.c:658
msgid "Checking object directories"
msgstr ""
-#: builtin/fsck.c:690
+#: builtin/fsck.c:673
#, c-format
msgid "Checking %s link"
msgstr ""
-#: builtin/fsck.c:695 builtin/index-pack.c:843
+#: builtin/fsck.c:678 builtin/index-pack.c:865
#, c-format
msgid "invalid %s"
msgstr ""
-#: builtin/fsck.c:702
+#: builtin/fsck.c:685
#, c-format
msgid "%s points to something strange (%s)"
msgstr ""
-#: builtin/fsck.c:708
+#: builtin/fsck.c:691
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr ""
-#: builtin/fsck.c:712
+#: builtin/fsck.c:695
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr ""
-#: builtin/fsck.c:724
+#: builtin/fsck.c:707
msgid "Checking cache tree"
msgstr ""
-#: builtin/fsck.c:729
+#: builtin/fsck.c:712
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr ""
-#: builtin/fsck.c:738
+#: builtin/fsck.c:721
msgid "non-tree in cache-tree"
msgstr ""
-#: builtin/fsck.c:769
+#: builtin/fsck.c:752
msgid "git fsck [<options>] [<object>...]"
msgstr ""
-#: builtin/fsck.c:775
+#: builtin/fsck.c:758
msgid "show unreachable objects"
msgstr ""
-#: builtin/fsck.c:776
+#: builtin/fsck.c:759
msgid "show dangling objects"
msgstr ""
-#: builtin/fsck.c:777
+#: builtin/fsck.c:760
msgid "report tags"
msgstr ""
-#: builtin/fsck.c:778
+#: builtin/fsck.c:761
msgid "report root nodes"
msgstr ""
-#: builtin/fsck.c:779
+#: builtin/fsck.c:762
msgid "make index objects head nodes"
msgstr ""
-#: builtin/fsck.c:780
+#: builtin/fsck.c:763
msgid "make reflogs head nodes (default)"
msgstr ""
-#: builtin/fsck.c:781
+#: builtin/fsck.c:764
msgid "also consider packs and alternate objects"
msgstr ""
-#: builtin/fsck.c:782
+#: builtin/fsck.c:765
msgid "check only connectivity"
msgstr ""
-#: builtin/fsck.c:783
+#: builtin/fsck.c:766 builtin/mktag.c:78
msgid "enable more strict checking"
msgstr ""
-#: builtin/fsck.c:785
+#: builtin/fsck.c:768
msgid "write dangling objects in .git/lost-found"
msgstr ""
-#: builtin/fsck.c:786 builtin/prune.c:132
+#: builtin/fsck.c:769 builtin/prune.c:134
msgid "show progress"
msgstr ""
-#: builtin/fsck.c:787
+#: builtin/fsck.c:770
msgid "show verbose names for reachable objects"
msgstr ""
-#: builtin/fsck.c:846 builtin/index-pack.c:225
+#: builtin/fsck.c:829 builtin/index-pack.c:261
msgid "Checking objects"
msgstr ""
-#: builtin/fsck.c:874
+#: builtin/fsck.c:857
#, c-format
msgid "%s: object missing"
msgstr ""
-#: builtin/fsck.c:885
+#: builtin/fsck.c:868
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr ""
-#: builtin/gc.c:35
+#: builtin/gc.c:39
msgid "git gc [<options>]"
msgstr ""
-#: builtin/gc.c:90
+#: builtin/gc.c:93
#, c-format
msgid "Failed to fstat %s: %s"
msgstr ""
-#: builtin/gc.c:126
+#: builtin/gc.c:129
#, c-format
msgid "failed to parse '%s' value '%s'"
msgstr ""
-#: builtin/gc.c:475 builtin/init-db.c:55
+#: builtin/gc.c:487 builtin/init-db.c:58
#, c-format
msgid "cannot stat '%s'"
msgstr ""
-#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
+#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:562
#, c-format
msgid "cannot read '%s'"
msgstr ""
-#: builtin/gc.c:491
+#: builtin/gc.c:503
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -13413,72 +14337,231 @@
"%s"
msgstr ""
-#: builtin/gc.c:539
+#: builtin/gc.c:551
msgid "prune unreferenced objects"
msgstr ""
-#: builtin/gc.c:541
+#: builtin/gc.c:553
msgid "be more thorough (increased runtime)"
msgstr ""
-#: builtin/gc.c:542
+#: builtin/gc.c:554
msgid "enable auto-gc mode"
msgstr ""
-#: builtin/gc.c:545
+#: builtin/gc.c:557
msgid "force running gc even if there may be another gc running"
msgstr ""
-#: builtin/gc.c:548
+#: builtin/gc.c:560
msgid "repack all other packs except the largest pack"
msgstr ""
-#: builtin/gc.c:565
-#, c-format
-msgid "failed to parse gc.logexpiry value %s"
-msgstr ""
-
#: builtin/gc.c:576
#, c-format
+msgid "failed to parse gc.logexpiry value %s"
+msgstr ""
+
+#: builtin/gc.c:587
+#, c-format
msgid "failed to parse prune expiry value %s"
msgstr ""
-#: builtin/gc.c:596
+#: builtin/gc.c:607
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
-#: builtin/gc.c:598
+#: builtin/gc.c:609
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr ""
-#: builtin/gc.c:599
+#: builtin/gc.c:610
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr ""
-#: builtin/gc.c:639
+#: builtin/gc.c:650
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
-#: builtin/gc.c:694
+#: builtin/gc.c:705
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
+#: builtin/gc.c:715
+msgid ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
+msgstr ""
+
+#: builtin/gc.c:745
+msgid "--no-schedule is not allowed"
+msgstr ""
+
+#: builtin/gc.c:750
+#, c-format
+msgid "unrecognized --schedule argument '%s'"
+msgstr ""
+
+#: builtin/gc.c:869
+msgid "failed to write commit-graph"
+msgstr ""
+
+#: builtin/gc.c:914
+msgid "failed to fill remotes"
+msgstr ""
+
+#: builtin/gc.c:1037
+msgid "failed to start 'git pack-objects' process"
+msgstr ""
+
+#: builtin/gc.c:1054
+msgid "failed to finish 'git pack-objects' process"
+msgstr ""
+
+#: builtin/gc.c:1106
+msgid "failed to write multi-pack-index"
+msgstr ""
+
+#: builtin/gc.c:1124
+msgid "'git multi-pack-index expire' failed"
+msgstr ""
+
+#: builtin/gc.c:1185
+msgid "'git multi-pack-index repack' failed"
+msgstr ""
+
+#: builtin/gc.c:1194
+msgid ""
+"skipping incremental-repack task because core.multiPackIndex is disabled"
+msgstr ""
+
+#: builtin/gc.c:1298
+#, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr ""
+
+#: builtin/gc.c:1328
+#, c-format
+msgid "task '%s' failed"
+msgstr ""
+
+#: builtin/gc.c:1410
+#, c-format
+msgid "'%s' is not a valid task"
+msgstr ""
+
+#: builtin/gc.c:1415
+#, c-format
+msgid "task '%s' cannot be selected multiple times"
+msgstr ""
+
+#: builtin/gc.c:1430
+msgid "run tasks based on the state of the repository"
+msgstr ""
+
+#: builtin/gc.c:1431
+msgid "frequency"
+msgstr ""
+
+#: builtin/gc.c:1432
+msgid "run tasks based on frequency"
+msgstr ""
+
+#: builtin/gc.c:1435
+msgid "do not report progress or other information over stderr"
+msgstr ""
+
+#: builtin/gc.c:1436
+msgid "task"
+msgstr ""
+
+#: builtin/gc.c:1437
+msgid "run a specific task"
+msgstr ""
+
+#: builtin/gc.c:1454
+msgid "use at most one of --auto and --schedule=<frequency>"
+msgstr ""
+
+#: builtin/gc.c:1497
+msgid "failed to run 'git config'"
+msgstr ""
+
+#: builtin/gc.c:1562
+#, c-format
+msgid "failed to expand path '%s'"
+msgstr ""
+
+#: builtin/gc.c:1591
+msgid "failed to start launchctl"
+msgstr ""
+
+#: builtin/gc.c:1628
+#, c-format
+msgid "failed to create directories for '%s'"
+msgstr ""
+
+#: builtin/gc.c:1689
+#, c-format
+msgid "failed to bootstrap service %s"
+msgstr ""
+
+#: builtin/gc.c:1760
+msgid "failed to create temp xml file"
+msgstr ""
+
+#: builtin/gc.c:1850
+msgid "failed to start schtasks"
+msgstr ""
+
+#: builtin/gc.c:1894
+msgid "failed to run 'crontab -l'; your system might not support 'cron'"
+msgstr ""
+
+#: builtin/gc.c:1911
+msgid "failed to run 'crontab'; your system might not support 'cron'"
+msgstr ""
+
+#: builtin/gc.c:1915
+msgid "failed to open stdin of 'crontab'"
+msgstr ""
+
+#: builtin/gc.c:1956
+msgid "'crontab' died"
+msgstr ""
+
+#: builtin/gc.c:1990
+msgid "another process is scheduling background maintenance"
+msgstr ""
+
+#: builtin/gc.c:2009
+msgid "failed to add repo to global config"
+msgstr ""
+
+#: builtin/gc.c:2019
+msgid "git maintenance <subcommand> [<options>]"
+msgstr ""
+
+#: builtin/gc.c:2038
+#, c-format
+msgid "invalid subcommand: %s"
+msgstr ""
+
#: builtin/grep.c:30
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr ""
-#: builtin/grep.c:225
+#: builtin/grep.c:223
#, c-format
msgid "grep: failed to create thread: %s"
msgstr ""
-#: builtin/grep.c:279
+#: builtin/grep.c:277
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr ""
@@ -13487,258 +14570,258 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731
-#: builtin/pack-objects.c:2854
+#: builtin/grep.c:285 builtin/index-pack.c:1589 builtin/index-pack.c:1808
+#: builtin/pack-objects.c:2944
#, c-format
msgid "no threads support, ignoring %s"
msgstr ""
-#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618
+#: builtin/grep.c:473 builtin/grep.c:601 builtin/grep.c:641
#, c-format
msgid "unable to read tree (%s)"
msgstr ""
-#: builtin/grep.c:633
+#: builtin/grep.c:656
#, c-format
msgid "unable to grep from object of type %s"
msgstr ""
-#: builtin/grep.c:704
+#: builtin/grep.c:737
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr ""
-#: builtin/grep.c:803
+#: builtin/grep.c:836
msgid "search in index instead of in the work tree"
msgstr ""
-#: builtin/grep.c:805
+#: builtin/grep.c:838
msgid "find in contents not managed by git"
msgstr ""
-#: builtin/grep.c:807
+#: builtin/grep.c:840
msgid "search in both tracked and untracked files"
msgstr ""
-#: builtin/grep.c:809
+#: builtin/grep.c:842
msgid "ignore files specified via '.gitignore'"
msgstr ""
-#: builtin/grep.c:811
+#: builtin/grep.c:844
msgid "recursively search in each submodule"
msgstr ""
-#: builtin/grep.c:814
+#: builtin/grep.c:847
msgid "show non-matching lines"
msgstr ""
-#: builtin/grep.c:816
+#: builtin/grep.c:849
msgid "case insensitive matching"
msgstr ""
-#: builtin/grep.c:818
+#: builtin/grep.c:851
msgid "match patterns only at word boundaries"
msgstr ""
-#: builtin/grep.c:820
+#: builtin/grep.c:853
msgid "process binary files as text"
msgstr ""
-#: builtin/grep.c:822
+#: builtin/grep.c:855
msgid "don't match patterns in binary files"
msgstr ""
-#: builtin/grep.c:825
+#: builtin/grep.c:858
msgid "process binary files with textconv filters"
msgstr ""
-#: builtin/grep.c:827
+#: builtin/grep.c:860
msgid "search in subdirectories (default)"
msgstr ""
-#: builtin/grep.c:829
+#: builtin/grep.c:862
msgid "descend at most <depth> levels"
msgstr ""
-#: builtin/grep.c:833
+#: builtin/grep.c:866
msgid "use extended POSIX regular expressions"
msgstr ""
-#: builtin/grep.c:836
+#: builtin/grep.c:869
msgid "use basic POSIX regular expressions (default)"
msgstr ""
-#: builtin/grep.c:839
+#: builtin/grep.c:872
msgid "interpret patterns as fixed strings"
msgstr ""
-#: builtin/grep.c:842
+#: builtin/grep.c:875
msgid "use Perl-compatible regular expressions"
msgstr ""
-#: builtin/grep.c:845
+#: builtin/grep.c:878
msgid "show line numbers"
msgstr ""
-#: builtin/grep.c:846
+#: builtin/grep.c:879
msgid "show column number of first match"
msgstr ""
-#: builtin/grep.c:847
+#: builtin/grep.c:880
msgid "don't show filenames"
msgstr ""
-#: builtin/grep.c:848
+#: builtin/grep.c:881
msgid "show filenames"
msgstr ""
-#: builtin/grep.c:850
+#: builtin/grep.c:883
msgid "show filenames relative to top directory"
msgstr ""
-#: builtin/grep.c:852
+#: builtin/grep.c:885
msgid "show only filenames instead of matching lines"
msgstr ""
-#: builtin/grep.c:854
+#: builtin/grep.c:887
msgid "synonym for --files-with-matches"
msgstr ""
-#: builtin/grep.c:857
+#: builtin/grep.c:890
msgid "show only the names of files without match"
msgstr ""
-#: builtin/grep.c:859
+#: builtin/grep.c:892
msgid "print NUL after filenames"
msgstr ""
-#: builtin/grep.c:862
+#: builtin/grep.c:895
msgid "show only matching parts of a line"
msgstr ""
-#: builtin/grep.c:864
+#: builtin/grep.c:897
msgid "show the number of matches instead of matching lines"
msgstr ""
-#: builtin/grep.c:865
+#: builtin/grep.c:898
msgid "highlight matches"
msgstr ""
-#: builtin/grep.c:867
+#: builtin/grep.c:900
msgid "print empty line between matches from different files"
msgstr ""
-#: builtin/grep.c:869
+#: builtin/grep.c:902
msgid "show filename only once above matches from same file"
msgstr ""
-#: builtin/grep.c:872
+#: builtin/grep.c:905
msgid "show <n> context lines before and after matches"
msgstr ""
-#: builtin/grep.c:875
+#: builtin/grep.c:908
msgid "show <n> context lines before matches"
msgstr ""
-#: builtin/grep.c:877
+#: builtin/grep.c:910
msgid "show <n> context lines after matches"
msgstr ""
-#: builtin/grep.c:879
+#: builtin/grep.c:912
msgid "use <n> worker threads"
msgstr ""
-#: builtin/grep.c:880
+#: builtin/grep.c:913
msgid "shortcut for -C NUM"
msgstr ""
-#: builtin/grep.c:883
+#: builtin/grep.c:916
msgid "show a line with the function name before matches"
msgstr ""
-#: builtin/grep.c:885
+#: builtin/grep.c:918
msgid "show the surrounding function"
msgstr ""
-#: builtin/grep.c:888
+#: builtin/grep.c:921
msgid "read patterns from file"
msgstr ""
-#: builtin/grep.c:890
+#: builtin/grep.c:923
msgid "match <pattern>"
msgstr ""
-#: builtin/grep.c:892
+#: builtin/grep.c:925
msgid "combine patterns specified with -e"
msgstr ""
-#: builtin/grep.c:904
+#: builtin/grep.c:937
msgid "indicate hit with exit status without output"
msgstr ""
-#: builtin/grep.c:906
+#: builtin/grep.c:939
msgid "show only matches from files that match all patterns"
msgstr ""
-#: builtin/grep.c:908
-msgid "show parse tree for grep expression"
-msgstr ""
-
-#: builtin/grep.c:912
+#: builtin/grep.c:942
msgid "pager"
msgstr ""
-#: builtin/grep.c:912
+#: builtin/grep.c:942
msgid "show matching files in the pager"
msgstr ""
-#: builtin/grep.c:916
+#: builtin/grep.c:946
msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
-#: builtin/grep.c:983
+#: builtin/grep.c:1012
msgid "no pattern given"
msgstr ""
-#: builtin/grep.c:1019
+#: builtin/grep.c:1048
msgid "--no-index or --untracked cannot be used with revs"
msgstr ""
-#: builtin/grep.c:1027
+#: builtin/grep.c:1056
#, c-format
msgid "unable to resolve revision: %s"
msgstr ""
-#: builtin/grep.c:1057
+#: builtin/grep.c:1086
msgid "--untracked not supported with --recurse-submodules"
msgstr ""
-#: builtin/grep.c:1061
+#: builtin/grep.c:1090
msgid "invalid option combination, ignoring --threads"
msgstr ""
-#: builtin/grep.c:1064 builtin/pack-objects.c:3547
+#: builtin/grep.c:1093 builtin/pack-objects.c:3672
msgid "no threads support, ignoring --threads"
msgstr ""
-#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851
+#: builtin/grep.c:1096 builtin/index-pack.c:1586 builtin/pack-objects.c:2941
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr ""
-#: builtin/grep.c:1101
+#: builtin/grep.c:1130
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
-#: builtin/grep.c:1127
+#: builtin/grep.c:1156
msgid "--cached or --untracked cannot be used with --no-index"
msgstr ""
-#: builtin/grep.c:1133
+#: builtin/grep.c:1159
+msgid "--untracked cannot be used with --cached"
+msgstr ""
+
+#: builtin/grep.c:1165
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr ""
-#: builtin/grep.c:1141
+#: builtin/grep.c:1173
msgid "both --cached and trees are given"
msgstr ""
@@ -13777,504 +14860,556 @@
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:340
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr ""
-#: builtin/help.c:448 git.c:365
+#: builtin/help.c:534 git.c:372
#, 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:606
+#: builtin/index-pack.c:324 builtin/pack-objects.c:624
msgid "pack too large for current definition of off_t"
msgstr ""
-#: builtin/index-pack.c:291 builtin/unpack-objects.c:95
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
msgid "pack exceeds maximum allowed size"
msgstr ""
-#: builtin/index-pack.c:312
+#: builtin/index-pack.c:342
+#, 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:765
-#: builtin/index-pack.c:804 builtin/index-pack.c:813
+#: 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:158
-#: builtin/pack-objects.c:218 builtin/pack-objects.c:313
+#: 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:802
+#: builtin/index-pack.c:824
#, c-format
msgid "cannot read existing object info %s"
msgstr ""
-#: builtin/index-pack.c:810
+#: builtin/index-pack.c:832
#, c-format
msgid "cannot read existing object %s"
msgstr ""
-#: builtin/index-pack.c:824
+#: builtin/index-pack.c:846
#, c-format
msgid "invalid blob object %s"
msgstr ""
-#: builtin/index-pack.c:827 builtin/index-pack.c:846
+#: builtin/index-pack.c:849 builtin/index-pack.c:868
msgid "fsck error in packed object"
msgstr ""
-#: builtin/index-pack.c:848
+#: builtin/index-pack.c:870
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr ""
-#: builtin/index-pack.c:920 builtin/index-pack.c:951
+#: builtin/index-pack.c:931 builtin/index-pack.c:978
msgid "failed to apply delta"
msgstr ""
-#: builtin/index-pack.c:1121
+#: builtin/index-pack.c:1161
msgid "Receiving objects"
msgstr ""
-#: builtin/index-pack.c:1121
+#: builtin/index-pack.c:1161
msgid "Indexing objects"
msgstr ""
-#: builtin/index-pack.c:1155
+#: builtin/index-pack.c:1195
msgid "pack is corrupted (SHA1 mismatch)"
msgstr ""
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1200
msgid "cannot fstat packfile"
msgstr ""
-#: builtin/index-pack.c:1163
+#: builtin/index-pack.c:1203
msgid "pack has junk at the end"
msgstr ""
-#: builtin/index-pack.c:1175
+#: builtin/index-pack.c:1215
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr ""
-#: builtin/index-pack.c:1198
+#: builtin/index-pack.c:1238
msgid "Resolving deltas"
msgstr ""
-#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615
+#: builtin/index-pack.c:1249 builtin/pack-objects.c:2707
#, c-format
msgid "unable to create thread: %s"
msgstr ""
-#: builtin/index-pack.c:1249
+#: builtin/index-pack.c:1282
msgid "confusion beyond insanity"
msgstr ""
-#: builtin/index-pack.c:1255
+#: 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:1267
+#: builtin/index-pack.c:1300
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
-#: builtin/index-pack.c:1271
+#: 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:1295
+#: builtin/index-pack.c:1328
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr ""
-#: builtin/index-pack.c:1392
+#: builtin/index-pack.c:1424
#, c-format
msgid "local object %s is corrupt"
msgstr ""
-#: builtin/index-pack.c:1406
+#: builtin/index-pack.c:1445
#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
+msgid "packfile name '%s' does not end with '.%s'"
msgstr ""
-#: builtin/index-pack.c:1431
+#: builtin/index-pack.c:1469
#, c-format
msgid "cannot write %s file '%s'"
msgstr ""
-#: builtin/index-pack.c:1439
+#: builtin/index-pack.c:1477
#, c-format
msgid "cannot close written %s file '%s'"
msgstr ""
-#: builtin/index-pack.c:1463
+#: builtin/index-pack.c:1503
msgid "error while closing pack file"
msgstr ""
-#: builtin/index-pack.c:1477
+#: builtin/index-pack.c:1517
msgid "cannot store pack file"
msgstr ""
-#: builtin/index-pack.c:1485
+#: builtin/index-pack.c:1525
msgid "cannot store index file"
msgstr ""
-#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862
+#: builtin/index-pack.c:1534
+msgid "cannot store reverse index file"
+msgstr ""
+
+#: builtin/index-pack.c:1580 builtin/pack-objects.c:2952
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr ""
-#: builtin/index-pack.c:1597
+#: builtin/index-pack.c:1650
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr ""
-#: builtin/index-pack.c:1599
+#: builtin/index-pack.c:1652
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr ""
-#: builtin/index-pack.c:1647
+#: builtin/index-pack.c:1700
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1654
+#: builtin/index-pack.c:1707
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1693
+#: builtin/index-pack.c:1765
msgid "Cannot come back to cwd"
msgstr ""
-#: builtin/index-pack.c:1742 builtin/index-pack.c:1745
-#: builtin/index-pack.c:1761 builtin/index-pack.c:1765
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1822
+#: builtin/index-pack.c:1838 builtin/index-pack.c:1842
#, c-format
msgid "bad %s"
msgstr ""
-#: builtin/index-pack.c:1781
+#: builtin/index-pack.c:1848 builtin/init-db.c:392 builtin/init-db.c:625
+#, c-format
+msgid "unknown hash algorithm '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:1867
msgid "--fix-thin cannot be used without --stdin"
msgstr ""
-#: builtin/index-pack.c:1783
+#: builtin/index-pack.c:1869
msgid "--stdin requires a git repository"
msgstr ""
-#: builtin/index-pack.c:1789
+#: builtin/index-pack.c:1871
+msgid "--object-format cannot be used with --stdin"
+msgstr ""
+
+#: builtin/index-pack.c:1886
msgid "--verify with no packfile name given"
msgstr ""
-#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582
+#: builtin/index-pack.c:1956 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:275
+#, c-format
+msgid "invalid initial branch name: '%s'"
+msgstr ""
+
+#: builtin/init-db.c:367
#, c-format
msgid "unable to handle file type %d"
msgstr ""
-#: builtin/init-db.c:337
+#: builtin/init-db.c:370
#, c-format
msgid "unable to move %s to %s"
msgstr ""
-#: builtin/init-db.c:354 builtin/init-db.c:357
+#: builtin/init-db.c:386
+msgid "attempt to reinitialize repository with different hash"
+msgstr ""
+
+#: builtin/init-db.c:410 builtin/init-db.c:413
#, c-format
msgid "%s already exists"
msgstr ""
-#: builtin/init-db.c:413
+#: builtin/init-db.c:445
+#, c-format
+msgid "re-init: ignored --initial-branch=%s"
+msgstr ""
+
+#: builtin/init-db.c:476
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:414
+#: builtin/init-db.c:477
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:418
+#: builtin/init-db.c:481
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:419
+#: builtin/init-db.c:482
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr ""
-#: builtin/init-db.c:468
+#: builtin/init-db.c:531
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
msgstr ""
-#: builtin/init-db.c:491
+#: builtin/init-db.c:557
msgid "permissions"
msgstr ""
-#: builtin/init-db.c:492
+#: builtin/init-db.c:558
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:564
+msgid "override the name of the initial branch"
+msgstr ""
+
+#: builtin/init-db.c:565 builtin/verify-pack.c:74
+msgid "hash"
+msgstr ""
+
+#: builtin/init-db.c:566 builtin/show-index.c:22 builtin/verify-pack.c:75
+msgid "specify the hash algorithm to use"
+msgstr ""
+
+#: builtin/init-db.c:573
+msgid "--separate-git-dir and --bare are mutually exclusive"
+msgstr ""
+
+#: builtin/init-db.c:602 builtin/init-db.c:607
#, c-format
msgid "cannot mkdir %s"
msgstr ""
-#: builtin/init-db.c:538
+#: builtin/init-db.c:611 builtin/init-db.c:666
#, c-format
msgid "cannot chdir to %s"
msgstr ""
-#: builtin/init-db.c:559
+#: builtin/init-db.c:638
#, 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:690
#, c-format
msgid "Cannot access work tree '%s'"
msgstr ""
+#: builtin/init-db.c:695
+msgid "--separate-git-dir incompatible with bare repository"
+msgstr ""
+
#: builtin/interpret-trailers.c:16
msgid ""
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
@@ -14337,510 +15472,525 @@
msgid "no input file given for in-place editing"
msgstr ""
-#: builtin/log.c:56
+#: builtin/log.c:59
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr ""
-#: builtin/log.c:57
+#: builtin/log.c:60
msgid "git show [<options>] <object>..."
msgstr ""
-#: builtin/log.c:110
+#: builtin/log.c:113
#, c-format
msgid "invalid --decorate option: %s"
msgstr ""
-#: builtin/log.c:174
+#: builtin/log.c:180
msgid "show source"
msgstr ""
-#: builtin/log.c:175
-msgid "Use mail map file"
+#: builtin/log.c:181
+msgid "use mail map file"
msgstr ""
-#: builtin/log.c:177
+#: builtin/log.c:184
msgid "only decorate refs that match <pattern>"
msgstr ""
-#: builtin/log.c:179
+#: builtin/log.c:186
msgid "do not decorate refs that match <pattern>"
msgstr ""
-#: builtin/log.c:180
+#: builtin/log.c:187
msgid "decorate options"
msgstr ""
-#: builtin/log.c:183
-msgid "Process line range n,m in file, counting from 1"
+#: builtin/log.c:190
+msgid ""
+"trace the evolution of line range <start>,<end> or function :<funcname> in "
+"<file>"
msgstr ""
-#: builtin/log.c:281
+#: builtin/log.c:213
+msgid "-L<range>:<file> cannot be used with pathspec"
+msgstr ""
+
+#: builtin/log.c:303
#, c-format
msgid "Final output: %d %s\n"
msgstr ""
-#: builtin/log.c:535
+#: builtin/log.c:566
#, c-format
msgid "git show %s: bad file"
msgstr ""
-#: builtin/log.c:550 builtin/log.c:645
+#: builtin/log.c:581 builtin/log.c:671
#, c-format
msgid "could not read object %s"
msgstr ""
-#: builtin/log.c:670
+#: builtin/log.c:696
#, c-format
msgid "unknown type: %d"
msgstr ""
-#: builtin/log.c:814
+#: builtin/log.c:841
#, c-format
msgid "%s: invalid cover from description mode"
msgstr ""
-#: builtin/log.c:821
+#: builtin/log.c:848
msgid "format.headers without value"
msgstr ""
-#: builtin/log.c:936
-msgid "name of output directory is too long"
-msgstr ""
-
-#: builtin/log.c:952
+#: builtin/log.c:977
#, c-format
msgid "cannot open patch file %s"
msgstr ""
-#: builtin/log.c:969
+#: builtin/log.c:994
msgid "need exactly one range"
msgstr ""
-#: builtin/log.c:979
+#: builtin/log.c:1004
msgid "not a range"
msgstr ""
-#: builtin/log.c:1143
+#: builtin/log.c:1168
msgid "cover letter needs email format"
msgstr ""
-#: builtin/log.c:1149
+#: builtin/log.c:1174
msgid "failed to create cover-letter file"
msgstr ""
-#: builtin/log.c:1228
+#: builtin/log.c:1261
#, c-format
msgid "insane in-reply-to: %s"
msgstr ""
-#: builtin/log.c:1255
+#: builtin/log.c:1288
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr ""
-#: builtin/log.c:1313
+#: builtin/log.c:1346
msgid "two output directories?"
msgstr ""
-#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211
+#: builtin/log.c:1497 builtin/log.c:2317 builtin/log.c:2319 builtin/log.c:2331
#, c-format
msgid "unknown commit %s"
msgstr ""
-#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1508 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr ""
-#: builtin/log.c:1439
+#: builtin/log.c:1517
msgid "could not find exact merge base"
msgstr ""
-#: builtin/log.c:1443
+#: builtin/log.c:1527
msgid ""
"failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
"Or you could specify base commit by --base=<base-commit-id> manually"
msgstr ""
-#: builtin/log.c:1463
+#: builtin/log.c:1550
msgid "failed to find exact merge base"
msgstr ""
-#: builtin/log.c:1474
+#: builtin/log.c:1567
msgid "base commit should be the ancestor of revision list"
msgstr ""
-#: builtin/log.c:1478
+#: builtin/log.c:1577
msgid "base commit shouldn't be in revision list"
msgstr ""
-#: builtin/log.c:1531
+#: builtin/log.c:1635
msgid "cannot get patch id"
msgstr ""
-#: builtin/log.c:1583
-msgid "failed to infer range-diff ranges"
-msgstr ""
-
-#: builtin/log.c:1629
-msgid "use [PATCH n/m] even with a single patch"
-msgstr ""
-
-#: builtin/log.c:1632
-msgid "use [PATCH] even with multiple patches"
-msgstr ""
-
-#: builtin/log.c:1636
-msgid "print patches to standard out"
-msgstr ""
-
-#: builtin/log.c:1638
-msgid "generate a cover letter"
-msgstr ""
-
-#: builtin/log.c:1640
-msgid "use simple number sequence for output file names"
-msgstr ""
-
-#: builtin/log.c:1641
-msgid "sfx"
-msgstr ""
-
-#: builtin/log.c:1642
-msgid "use <sfx> instead of '.patch'"
-msgstr ""
-
-#: builtin/log.c:1644
-msgid "start numbering patches at <n> instead of 1"
-msgstr ""
-
-#: builtin/log.c:1646
-msgid "mark the series as Nth re-roll"
-msgstr ""
-
-#: builtin/log.c:1648
-msgid "Use [RFC PATCH] instead of [PATCH]"
-msgstr ""
-
-#: builtin/log.c:1651
-msgid "cover-from-description-mode"
-msgstr ""
-
-#: builtin/log.c:1652
-msgid "generate parts of a cover letter based on a branch's description"
-msgstr ""
-
-#: builtin/log.c:1654
-msgid "Use [<prefix>] instead of [PATCH]"
-msgstr ""
-
-#: builtin/log.c:1657
-msgid "store resulting files in <dir>"
-msgstr ""
-
-#: builtin/log.c:1660
-msgid "don't strip/add [PATCH]"
-msgstr ""
-
-#: builtin/log.c:1663
-msgid "don't output binary diffs"
-msgstr ""
-
-#: builtin/log.c:1665
-msgid "output all-zero hash in From header"
-msgstr ""
-
-#: builtin/log.c:1667
-msgid "don't include a patch matching a commit upstream"
-msgstr ""
-
-#: builtin/log.c:1669
-msgid "show patch format instead of default (patch + stat)"
-msgstr ""
-
-#: builtin/log.c:1671
-msgid "Messaging"
-msgstr ""
-
-#: builtin/log.c:1672
-msgid "header"
-msgstr ""
-
-#: builtin/log.c:1673
-msgid "add email header"
-msgstr ""
-
-#: builtin/log.c:1674 builtin/log.c:1676
-msgid "email"
-msgstr ""
-
-#: builtin/log.c:1674
-msgid "add To: header"
-msgstr ""
-
-#: builtin/log.c:1676
-msgid "add Cc: header"
-msgstr ""
-
-#: builtin/log.c:1678
-msgid "ident"
-msgstr ""
-
-#: builtin/log.c:1679
-msgid "set From address to <ident> (or committer ident if absent)"
-msgstr ""
-
-#: builtin/log.c:1681
-msgid "message-id"
-msgstr ""
-
-#: builtin/log.c:1682
-msgid "make first mail a reply to <message-id>"
-msgstr ""
-
-#: builtin/log.c:1683 builtin/log.c:1686
-msgid "boundary"
-msgstr ""
-
-#: builtin/log.c:1684
-msgid "attach the patch"
-msgstr ""
-
-#: builtin/log.c:1687
-msgid "inline the patch"
-msgstr ""
-
-#: builtin/log.c:1691
-msgid "enable message threading, styles: shallow, deep"
-msgstr ""
-
-#: builtin/log.c:1693
-msgid "signature"
+#: builtin/log.c:1692
+msgid "failed to infer range-diff origin of current series"
msgstr ""
#: builtin/log.c:1694
+#, c-format
+msgid "using '%s' as range-diff origin of current series"
+msgstr ""
+
+#: builtin/log.c:1738
+msgid "use [PATCH n/m] even with a single patch"
+msgstr ""
+
+#: builtin/log.c:1741
+msgid "use [PATCH] even with multiple patches"
+msgstr ""
+
+#: builtin/log.c:1745
+msgid "print patches to standard out"
+msgstr ""
+
+#: builtin/log.c:1747
+msgid "generate a cover letter"
+msgstr ""
+
+#: builtin/log.c:1749
+msgid "use simple number sequence for output file names"
+msgstr ""
+
+#: builtin/log.c:1750
+msgid "sfx"
+msgstr ""
+
+#: builtin/log.c:1751
+msgid "use <sfx> instead of '.patch'"
+msgstr ""
+
+#: builtin/log.c:1753
+msgid "start numbering patches at <n> instead of 1"
+msgstr ""
+
+#: builtin/log.c:1755
+msgid "mark the series as Nth re-roll"
+msgstr ""
+
+#: builtin/log.c:1757
+msgid "max length of output filename"
+msgstr ""
+
+#: builtin/log.c:1759
+msgid "use [RFC PATCH] instead of [PATCH]"
+msgstr ""
+
+#: builtin/log.c:1762
+msgid "cover-from-description-mode"
+msgstr ""
+
+#: builtin/log.c:1763
+msgid "generate parts of a cover letter based on a branch's description"
+msgstr ""
+
+#: builtin/log.c:1765
+msgid "use [<prefix>] instead of [PATCH]"
+msgstr ""
+
+#: builtin/log.c:1768
+msgid "store resulting files in <dir>"
+msgstr ""
+
+#: builtin/log.c:1771
+msgid "don't strip/add [PATCH]"
+msgstr ""
+
+#: builtin/log.c:1774
+msgid "don't output binary diffs"
+msgstr ""
+
+#: builtin/log.c:1776
+msgid "output all-zero hash in From header"
+msgstr ""
+
+#: builtin/log.c:1778
+msgid "don't include a patch matching a commit upstream"
+msgstr ""
+
+#: builtin/log.c:1780
+msgid "show patch format instead of default (patch + stat)"
+msgstr ""
+
+#: builtin/log.c:1782
+msgid "Messaging"
+msgstr ""
+
+#: builtin/log.c:1783
+msgid "header"
+msgstr ""
+
+#: builtin/log.c:1784
+msgid "add email header"
+msgstr ""
+
+#: builtin/log.c:1785 builtin/log.c:1786
+msgid "email"
+msgstr ""
+
+#: builtin/log.c:1785
+msgid "add To: header"
+msgstr ""
+
+#: builtin/log.c:1786
+msgid "add Cc: header"
+msgstr ""
+
+#: builtin/log.c:1787
+msgid "ident"
+msgstr ""
+
+#: builtin/log.c:1788
+msgid "set From address to <ident> (or committer ident if absent)"
+msgstr ""
+
+#: builtin/log.c:1790
+msgid "message-id"
+msgstr ""
+
+#: builtin/log.c:1791
+msgid "make first mail a reply to <message-id>"
+msgstr ""
+
+#: builtin/log.c:1792 builtin/log.c:1795
+msgid "boundary"
+msgstr ""
+
+#: builtin/log.c:1793
+msgid "attach the patch"
+msgstr ""
+
+#: builtin/log.c:1796
+msgid "inline the patch"
+msgstr ""
+
+#: builtin/log.c:1800
+msgid "enable message threading, styles: shallow, deep"
+msgstr ""
+
+#: builtin/log.c:1802
+msgid "signature"
+msgstr ""
+
+#: builtin/log.c:1803
msgid "add a signature"
msgstr ""
-#: builtin/log.c:1695
+#: builtin/log.c:1804
msgid "base-commit"
msgstr ""
-#: builtin/log.c:1696
+#: builtin/log.c:1805
msgid "add prerequisite tree info to the patch series"
msgstr ""
-#: builtin/log.c:1698
+#: builtin/log.c:1808
msgid "add a signature from a file"
msgstr ""
-#: builtin/log.c:1699
+#: builtin/log.c:1809
msgid "don't print the patch filenames"
msgstr ""
-#: builtin/log.c:1701
+#: builtin/log.c:1811
msgid "show progress while generating patches"
msgstr ""
-#: builtin/log.c:1703
+#: builtin/log.c:1813
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
-#: builtin/log.c:1706
+#: builtin/log.c:1816
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
-#: builtin/log.c:1708
+#: builtin/log.c:1818
msgid "percentage by which creation is weighted"
msgstr ""
-#: builtin/log.c:1792
+#: builtin/log.c:1904
#, c-format
msgid "invalid ident line: %s"
msgstr ""
-#: builtin/log.c:1807
+#: builtin/log.c:1919
msgid "-n and -k are mutually exclusive"
msgstr ""
-#: builtin/log.c:1809
+#: builtin/log.c:1921
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr ""
-#: builtin/log.c:1817
+#: builtin/log.c:1929
msgid "--name-only does not make sense"
msgstr ""
-#: builtin/log.c:1819
+#: builtin/log.c:1931
msgid "--name-status does not make sense"
msgstr ""
-#: builtin/log.c:1821
+#: builtin/log.c:1933
msgid "--check does not make sense"
msgstr ""
-#: builtin/log.c:1854
-msgid "standard output, or directory, which one?"
+#: builtin/log.c:1955
+msgid "--stdout, --output, and --output-directory are mutually exclusive"
msgstr ""
-#: builtin/log.c:1958
+#: builtin/log.c:2078
msgid "--interdiff requires --cover-letter or single patch"
msgstr ""
-#: builtin/log.c:1962
+#: builtin/log.c:2082
msgid "Interdiff:"
msgstr ""
-#: builtin/log.c:1963
+#: builtin/log.c:2083
#, c-format
msgid "Interdiff against v%d:"
msgstr ""
-#: builtin/log.c:1969
+#: builtin/log.c:2089
msgid "--creation-factor requires --range-diff"
msgstr ""
-#: builtin/log.c:1973
+#: builtin/log.c:2093
msgid "--range-diff requires --cover-letter or single patch"
msgstr ""
-#: builtin/log.c:1981
+#: builtin/log.c:2101
msgid "Range-diff:"
msgstr ""
-#: builtin/log.c:1982
+#: builtin/log.c:2102
#, c-format
msgid "Range-diff against v%d:"
msgstr ""
-#: builtin/log.c:1993
+#: builtin/log.c:2113
#, c-format
msgid "unable to read signature file '%s'"
msgstr ""
-#: builtin/log.c:2029
+#: builtin/log.c:2149
msgid "Generating patches"
msgstr ""
-#: builtin/log.c:2073
+#: builtin/log.c:2193
msgid "failed to create output files"
msgstr ""
-#: builtin/log.c:2132
+#: builtin/log.c:2252
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr ""
-#: builtin/log.c:2186
+#: builtin/log.c:2306
#, 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:486
msgid "git ls-files [<options>] [<file>...]"
msgstr ""
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:542
msgid "identify the file status with tags"
msgstr ""
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:544
msgid "use lowercase letters for 'assume unchanged' files"
msgstr ""
-#: builtin/ls-files.c:530
+#: builtin/ls-files.c:546
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr ""
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:548
msgid "show cached files in the output (default)"
msgstr ""
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:550
msgid "show deleted files in the output"
msgstr ""
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:552
msgid "show modified files in the output"
msgstr ""
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:554
msgid "show other files in the output"
msgstr ""
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:556
msgid "show ignored files in the output"
msgstr ""
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:559
msgid "show staged contents' object name in the output"
msgstr ""
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:561
msgid "show files on the filesystem that need to be removed"
msgstr ""
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:563
msgid "show 'other' directories' names only"
msgstr ""
-#: builtin/ls-files.c:549
+#: builtin/ls-files.c:565
msgid "show line endings of files"
msgstr ""
-#: builtin/ls-files.c:551
+#: builtin/ls-files.c:567
msgid "don't show empty directories"
msgstr ""
-#: builtin/ls-files.c:554
+#: builtin/ls-files.c:570
msgid "show unmerged files in the output"
msgstr ""
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:572
msgid "show resolve-undo information"
msgstr ""
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:574
msgid "skip files matching pattern"
msgstr ""
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:577
msgid "exclude patterns are read from <file>"
msgstr ""
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:580
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
-#: builtin/ls-files.c:566
+#: builtin/ls-files.c:582
msgid "add the standard git exclusions"
msgstr ""
-#: builtin/ls-files.c:570
+#: builtin/ls-files.c:586
msgid "make the output relative to the project top directory"
msgstr ""
-#: builtin/ls-files.c:573
+#: builtin/ls-files.c:589
msgid "recurse through submodules"
msgstr ""
-#: builtin/ls-files.c:575
+#: builtin/ls-files.c:591
msgid "if any <file> is not in the index, treat this as an error"
msgstr ""
-#: builtin/ls-files.c:576
+#: builtin/ls-files.c:592
msgid "tree-ish"
msgstr ""
-#: builtin/ls-files.c:577
+#: builtin/ls-files.c:593
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
-#: builtin/ls-files.c:579
+#: builtin/ls-files.c:595
msgid "show debugging data"
msgstr ""
+#: builtin/ls-files.c:597
+msgid "suppress duplicate entries"
+msgstr ""
+
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
@@ -14848,39 +15998,39 @@
" [--symref] [<repository> [<refs>...]]"
msgstr ""
-#: builtin/ls-remote.c:59
+#: builtin/ls-remote.c:60
msgid "do not print remote URL"
msgstr ""
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1404
msgid "exec"
msgstr ""
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
+#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
msgid "path of git-upload-pack on the remote host"
msgstr ""
-#: builtin/ls-remote.c:65
+#: builtin/ls-remote.c:66
msgid "limit to tags"
msgstr ""
-#: builtin/ls-remote.c:66
+#: builtin/ls-remote.c:67
msgid "limit to heads"
msgstr ""
-#: builtin/ls-remote.c:67
+#: builtin/ls-remote.c:68
msgid "do not show peeled tags"
msgstr ""
-#: builtin/ls-remote.c:69
+#: builtin/ls-remote.c:70
msgid "take url.<base>.insteadOf into account"
msgstr ""
-#: builtin/ls-remote.c:72
+#: builtin/ls-remote.c:73
msgid "exit with exit code 2 if no matching refs are found"
msgstr ""
-#: builtin/ls-remote.c:75
+#: builtin/ls-remote.c:76
msgid "show underlying ref in addition to the object pointed by it"
msgstr ""
@@ -14925,377 +16075,6 @@
msgid "empty mbox: '%s'"
msgstr ""
-#: builtin/merge.c:55
-msgid "git merge [<options>] [<commit>...]"
-msgstr ""
-
-#: builtin/merge.c:56
-msgid "git merge --abort"
-msgstr ""
-
-#: builtin/merge.c:57
-msgid "git merge --continue"
-msgstr ""
-
-#: builtin/merge.c:119
-msgid "switch `m' requires a value"
-msgstr ""
-
-#: builtin/merge.c:142
-#, c-format
-msgid "option `%s' requires a value"
-msgstr ""
-
-#: builtin/merge.c:188
-#, c-format
-msgid "Could not find merge strategy '%s'.\n"
-msgstr ""
-
-#: builtin/merge.c:189
-#, c-format
-msgid "Available strategies are:"
-msgstr ""
-
-#: builtin/merge.c:194
-#, c-format
-msgid "Available custom strategies are:"
-msgstr ""
-
-#: builtin/merge.c:245 builtin/pull.c:132
-msgid "do not show a diffstat at the end of the merge"
-msgstr ""
-
-#: builtin/merge.c:248 builtin/pull.c:135
-msgid "show a diffstat at the end of the merge"
-msgstr ""
-
-#: builtin/merge.c:249 builtin/pull.c:138
-msgid "(synonym to --stat)"
-msgstr ""
-
-#: builtin/merge.c:251 builtin/pull.c:141
-msgid "add (at most <n>) entries from shortlog to merge commit message"
-msgstr ""
-
-#: builtin/merge.c:254 builtin/pull.c:147
-msgid "create a single commit instead of doing a merge"
-msgstr ""
-
-#: builtin/merge.c:256 builtin/pull.c:150
-msgid "perform a commit if the merge succeeds (default)"
-msgstr ""
-
-#: builtin/merge.c:258 builtin/pull.c:153
-msgid "edit message before committing"
-msgstr ""
-
-#: builtin/merge.c:260
-msgid "allow fast-forward (default)"
-msgstr ""
-
-#: builtin/merge.c:262 builtin/pull.c:160
-msgid "abort if fast-forward is not possible"
-msgstr ""
-
-#: builtin/merge.c:266 builtin/pull.c:163
-msgid "verify that the named commit has a valid GPG signature"
-msgstr ""
-
-#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167
-#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114
-msgid "strategy"
-msgstr ""
-
-#: builtin/merge.c:268 builtin/pull.c:168
-msgid "merge strategy to use"
-msgstr ""
-
-#: builtin/merge.c:269 builtin/pull.c:171
-msgid "option=value"
-msgstr ""
-
-#: builtin/merge.c:270 builtin/pull.c:172
-msgid "option for selected merge strategy"
-msgstr ""
-
-#: builtin/merge.c:272
-msgid "merge commit message (for a non-fast-forward merge)"
-msgstr ""
-
-#: builtin/merge.c:279
-msgid "abort the current in-progress merge"
-msgstr ""
-
-#: builtin/merge.c:281
-msgid "--abort but leave index and working tree alone"
-msgstr ""
-
-#: builtin/merge.c:283
-msgid "continue the current in-progress merge"
-msgstr ""
-
-#: builtin/merge.c:285 builtin/pull.c:179
-msgid "allow merging unrelated histories"
-msgstr ""
-
-#: builtin/merge.c:291
-msgid "bypass pre-merge-commit and commit-msg hooks"
-msgstr ""
-
-#: builtin/merge.c:308
-msgid "could not run stash."
-msgstr ""
-
-#: builtin/merge.c:313
-msgid "stash failed"
-msgstr ""
-
-#: builtin/merge.c:318
-#, c-format
-msgid "not a valid object: %s"
-msgstr ""
-
-#: builtin/merge.c:340 builtin/merge.c:357
-msgid "read-tree failed"
-msgstr ""
-
-#: builtin/merge.c:387
-msgid " (nothing to squash)"
-msgstr ""
-
-#: builtin/merge.c:398
-#, c-format
-msgid "Squash commit -- not updating HEAD\n"
-msgstr ""
-
-#: builtin/merge.c:448
-#, c-format
-msgid "No merge message -- not updating HEAD\n"
-msgstr ""
-
-#: builtin/merge.c:499
-#, c-format
-msgid "'%s' does not point to a commit"
-msgstr ""
-
-#: builtin/merge.c:586
-#, c-format
-msgid "Bad branch.%s.mergeoptions string: %s"
-msgstr ""
-
-#: builtin/merge.c:708
-msgid "Not handling anything other than two heads merge."
-msgstr ""
-
-#: builtin/merge.c:722
-#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr ""
-
-#: builtin/merge.c:737
-#, c-format
-msgid "unable to write %s"
-msgstr ""
-
-#: builtin/merge.c:789
-#, c-format
-msgid "Could not read from '%s'"
-msgstr ""
-
-#: builtin/merge.c:798
-#, c-format
-msgid "Not committing merge; use 'git commit' to complete the merge.\n"
-msgstr ""
-
-#: builtin/merge.c:804
-msgid ""
-"Please enter a commit message to explain why this merge is necessary,\n"
-"especially if it merges an updated upstream into a topic branch.\n"
-"\n"
-msgstr ""
-
-#: builtin/merge.c:809
-msgid "An empty message aborts the commit.\n"
-msgstr ""
-
-#: builtin/merge.c:812
-#, c-format
-msgid ""
-"Lines starting with '%c' will be ignored, and an empty message aborts\n"
-"the commit.\n"
-msgstr ""
-
-#: builtin/merge.c:865
-msgid "Empty commit message."
-msgstr ""
-
-#: builtin/merge.c:880
-#, c-format
-msgid "Wonderful.\n"
-msgstr ""
-
-#: builtin/merge.c:941
-#, c-format
-msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
-msgstr ""
-
-#: builtin/merge.c:980
-msgid "No current branch."
-msgstr ""
-
-#: builtin/merge.c:982
-msgid "No remote for the current branch."
-msgstr ""
-
-#: builtin/merge.c:984
-msgid "No default upstream defined for the current branch."
-msgstr ""
-
-#: builtin/merge.c:989
-#, c-format
-msgid "No remote-tracking branch for %s from %s"
-msgstr ""
-
-#: builtin/merge.c:1046
-#, c-format
-msgid "Bad value '%s' in environment '%s'"
-msgstr ""
-
-#: builtin/merge.c:1149
-#, c-format
-msgid "not something we can merge in %s: %s"
-msgstr ""
-
-#: builtin/merge.c:1183
-msgid "not something we can merge"
-msgstr ""
-
-#: builtin/merge.c:1286
-msgid "--abort expects no arguments"
-msgstr ""
-
-#: builtin/merge.c:1290
-msgid "There is no merge to abort (MERGE_HEAD missing)."
-msgstr ""
-
-#: builtin/merge.c:1299
-msgid "--quit expects no arguments"
-msgstr ""
-
-#: builtin/merge.c:1312
-msgid "--continue expects no arguments"
-msgstr ""
-
-#: builtin/merge.c:1316
-msgid "There is no merge in progress (MERGE_HEAD missing)."
-msgstr ""
-
-#: builtin/merge.c:1332
-msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you merge."
-msgstr ""
-
-#: builtin/merge.c:1339
-msgid ""
-"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
-"Please, commit your changes before you merge."
-msgstr ""
-
-#: builtin/merge.c:1342
-msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
-msgstr ""
-
-#: builtin/merge.c:1356
-msgid "You cannot combine --squash with --no-ff."
-msgstr ""
-
-#: builtin/merge.c:1358
-msgid "You cannot combine --squash with --commit."
-msgstr ""
-
-#: builtin/merge.c:1374
-msgid "No commit specified and merge.defaultToUpstream not set."
-msgstr ""
-
-#: builtin/merge.c:1391
-msgid "Squash commit into empty head not supported yet"
-msgstr ""
-
-#: builtin/merge.c:1393
-msgid "Non-fast-forward commit does not make sense into an empty head"
-msgstr ""
-
-#: builtin/merge.c:1398
-#, c-format
-msgid "%s - not something we can merge"
-msgstr ""
-
-#: builtin/merge.c:1400
-msgid "Can merge only exactly one commit into empty head"
-msgstr ""
-
-#: builtin/merge.c:1481
-msgid "refusing to merge unrelated histories"
-msgstr ""
-
-#: builtin/merge.c:1490
-msgid "Already up to date."
-msgstr ""
-
-#: builtin/merge.c:1500
-#, c-format
-msgid "Updating %s..%s\n"
-msgstr ""
-
-#: builtin/merge.c:1542
-#, c-format
-msgid "Trying really trivial in-index merge...\n"
-msgstr ""
-
-#: builtin/merge.c:1549
-#, c-format
-msgid "Nope.\n"
-msgstr ""
-
-#: builtin/merge.c:1574
-msgid "Already up to date. Yeeah!"
-msgstr ""
-
-#: builtin/merge.c:1580
-msgid "Not possible to fast-forward, aborting."
-msgstr ""
-
-#: builtin/merge.c:1603 builtin/merge.c:1668
-#, c-format
-msgid "Rewinding the tree to pristine...\n"
-msgstr ""
-
-#: builtin/merge.c:1607
-#, c-format
-msgid "Trying merge strategy %s...\n"
-msgstr ""
-
-#: builtin/merge.c:1659
-#, c-format
-msgid "No merge strategy handled the merge.\n"
-msgstr ""
-
-#: builtin/merge.c:1661
-#, c-format
-msgid "Merge with strategy %s failed.\n"
-msgstr ""
-
-#: builtin/merge.c:1670
-#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
-msgstr ""
-
-#: builtin/merge.c:1682
-#, 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 ""
@@ -15316,23 +16095,23 @@
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr ""
-#: builtin/merge-base.c:153
+#: builtin/merge-base.c:143
msgid "output all common ancestors"
msgstr ""
-#: builtin/merge-base.c:155
+#: builtin/merge-base.c:145
msgid "find ancestors for a single n-way merge"
msgstr ""
-#: builtin/merge-base.c:157
+#: builtin/merge-base.c:147
msgid "list revs not reachable from others"
msgstr ""
-#: builtin/merge-base.c:159
+#: builtin/merge-base.c:149
msgid "is the first one ancestor of the other?"
msgstr ""
-#: builtin/merge-base.c:161
+#: builtin/merge-base.c:151
msgid "find where <commit> forked from reflog of <ref>"
msgstr ""
@@ -15405,6 +16184,418 @@
msgid "Merging %s with %s\n"
msgstr ""
+#: builtin/merge.c:58
+msgid "git merge [<options>] [<commit>...]"
+msgstr ""
+
+#: builtin/merge.c:59
+msgid "git merge --abort"
+msgstr ""
+
+#: builtin/merge.c:60
+msgid "git merge --continue"
+msgstr ""
+
+#: builtin/merge.c:123
+msgid "switch `m' requires a value"
+msgstr ""
+
+#: builtin/merge.c:146
+#, c-format
+msgid "option `%s' requires a value"
+msgstr ""
+
+#: builtin/merge.c:199
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr ""
+
+#: builtin/merge.c:200
+#, c-format
+msgid "Available strategies are:"
+msgstr ""
+
+#: builtin/merge.c:205
+#, c-format
+msgid "Available custom strategies are:"
+msgstr ""
+
+#: builtin/merge.c:256 builtin/pull.c:133
+msgid "do not show a diffstat at the end of the merge"
+msgstr ""
+
+#: builtin/merge.c:259 builtin/pull.c:136
+msgid "show a diffstat at the end of the merge"
+msgstr ""
+
+#: builtin/merge.c:260 builtin/pull.c:139
+msgid "(synonym to --stat)"
+msgstr ""
+
+#: builtin/merge.c:262 builtin/pull.c:142
+msgid "add (at most <n>) entries from shortlog to merge commit message"
+msgstr ""
+
+#: builtin/merge.c:265 builtin/pull.c:148
+msgid "create a single commit instead of doing a merge"
+msgstr ""
+
+#: builtin/merge.c:267 builtin/pull.c:151
+msgid "perform a commit if the merge succeeds (default)"
+msgstr ""
+
+#: builtin/merge.c:269 builtin/pull.c:154
+msgid "edit message before committing"
+msgstr ""
+
+#: builtin/merge.c:271
+msgid "allow fast-forward (default)"
+msgstr ""
+
+#: builtin/merge.c:273 builtin/pull.c:161
+msgid "abort if fast-forward is not possible"
+msgstr ""
+
+#: builtin/merge.c:277 builtin/pull.c:164
+msgid "verify that the named commit has a valid GPG signature"
+msgstr ""
+
+#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
+#: builtin/rebase.c:541 builtin/rebase.c:1418 builtin/revert.c:114
+msgid "strategy"
+msgstr ""
+
+#: builtin/merge.c:279 builtin/pull.c:169
+msgid "merge strategy to use"
+msgstr ""
+
+#: builtin/merge.c:280 builtin/pull.c:172
+msgid "option=value"
+msgstr ""
+
+#: builtin/merge.c:281 builtin/pull.c:173
+msgid "option for selected merge strategy"
+msgstr ""
+
+#: builtin/merge.c:283
+msgid "merge commit message (for a non-fast-forward merge)"
+msgstr ""
+
+#: builtin/merge.c:290
+msgid "abort the current in-progress merge"
+msgstr ""
+
+#: builtin/merge.c:292
+msgid "--abort but leave index and working tree alone"
+msgstr ""
+
+#: builtin/merge.c:294
+msgid "continue the current in-progress merge"
+msgstr ""
+
+#: builtin/merge.c:296 builtin/pull.c:180
+msgid "allow merging unrelated histories"
+msgstr ""
+
+#: builtin/merge.c:303
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr ""
+
+#: builtin/merge.c:320
+msgid "could not run stash."
+msgstr ""
+
+#: builtin/merge.c:325
+msgid "stash failed"
+msgstr ""
+
+#: builtin/merge.c:330
+#, c-format
+msgid "not a valid object: %s"
+msgstr ""
+
+#: builtin/merge.c:352 builtin/merge.c:369
+msgid "read-tree failed"
+msgstr ""
+
+#: builtin/merge.c:399
+msgid " (nothing to squash)"
+msgstr ""
+
+#: builtin/merge.c:410
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr ""
+
+#: builtin/merge.c:460
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr ""
+
+#: builtin/merge.c:511
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr ""
+
+#: builtin/merge.c:598
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr ""
+
+#: builtin/merge.c:724
+msgid "Not handling anything other than two heads merge."
+msgstr ""
+
+#: builtin/merge.c:737
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr ""
+
+#: builtin/merge.c:756 t/helper/test-fast-rebase.c:209
+#, c-format
+msgid "unable to write %s"
+msgstr ""
+
+#: builtin/merge.c:808
+#, c-format
+msgid "Could not read from '%s'"
+msgstr ""
+
+#: builtin/merge.c:817
+#, c-format
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+msgstr ""
+
+#: builtin/merge.c:823
+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:828
+msgid "An empty message aborts the commit.\n"
+msgstr ""
+
+#: builtin/merge.c:831
+#, c-format
+msgid ""
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
+
+#: builtin/merge.c:884
+msgid "Empty commit message."
+msgstr ""
+
+#: builtin/merge.c:899
+#, c-format
+msgid "Wonderful.\n"
+msgstr ""
+
+#: builtin/merge.c:960
+#, c-format
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgstr ""
+
+#: builtin/merge.c:999
+msgid "No current branch."
+msgstr ""
+
+#: builtin/merge.c:1001
+msgid "No remote for the current branch."
+msgstr ""
+
+#: builtin/merge.c:1003
+msgid "No default upstream defined for the current branch."
+msgstr ""
+
+#: builtin/merge.c:1008
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
+msgstr ""
+
+#: builtin/merge.c:1065
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr ""
+
+#: builtin/merge.c:1168
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr ""
+
+#: builtin/merge.c:1202
+msgid "not something we can merge"
+msgstr ""
+
+#: builtin/merge.c:1312
+msgid "--abort expects no arguments"
+msgstr ""
+
+#: builtin/merge.c:1316
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr ""
+
+#: builtin/merge.c:1334
+msgid "--quit expects no arguments"
+msgstr ""
+
+#: builtin/merge.c:1347
+msgid "--continue expects no arguments"
+msgstr ""
+
+#: builtin/merge.c:1351
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr ""
+
+#: builtin/merge.c:1367
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+
+#: builtin/merge.c:1374
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+
+#: builtin/merge.c:1377
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+msgstr ""
+
+#: builtin/merge.c:1391
+msgid "You cannot combine --squash with --no-ff."
+msgstr ""
+
+#: builtin/merge.c:1393
+msgid "You cannot combine --squash with --commit."
+msgstr ""
+
+#: builtin/merge.c:1409
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr ""
+
+#: builtin/merge.c:1426
+msgid "Squash commit into empty head not supported yet"
+msgstr ""
+
+#: builtin/merge.c:1428
+msgid "Non-fast-forward commit does not make sense into an empty head"
+msgstr ""
+
+#: builtin/merge.c:1433
+#, c-format
+msgid "%s - not something we can merge"
+msgstr ""
+
+#: builtin/merge.c:1435
+msgid "Can merge only exactly one commit into empty head"
+msgstr ""
+
+#: builtin/merge.c:1516
+msgid "refusing to merge unrelated histories"
+msgstr ""
+
+#: builtin/merge.c:1525
+msgid "Already up to date."
+msgstr ""
+
+#: builtin/merge.c:1535
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr ""
+
+#: builtin/merge.c:1581
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr ""
+
+#: builtin/merge.c:1588
+#, c-format
+msgid "Nope.\n"
+msgstr ""
+
+#: builtin/merge.c:1613
+msgid "Already up to date. Yeeah!"
+msgstr ""
+
+#: builtin/merge.c:1619
+msgid "Not possible to fast-forward, aborting."
+msgstr ""
+
+#: builtin/merge.c:1647 builtin/merge.c:1712
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr ""
+
+#: builtin/merge.c:1651
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr ""
+
+#: builtin/merge.c:1703
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr ""
+
+#: builtin/merge.c:1705
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr ""
+
+#: builtin/merge.c:1714
+#, c-format
+msgid "Using the %s to prepare resolving by hand.\n"
+msgstr ""
+
+#: builtin/merge.c:1728
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
+msgstr ""
+
+#: builtin/mktag.c:10
+msgid "git mktag"
+msgstr ""
+
+#: builtin/mktag.c:30
+#, c-format
+msgid "warning: tag input does not pass fsck: %s"
+msgstr ""
+
+#: builtin/mktag.c:41
+#, c-format
+msgid "error: tag input does not pass fsck: %s"
+msgstr ""
+
+#: builtin/mktag.c:44
+#, c-format
+msgid "%d (FSCK_IGNORE?) should never trigger this callback"
+msgstr ""
+
+#: builtin/mktag.c:59
+#, c-format
+msgid "could not read tagged object '%s'"
+msgstr ""
+
+#: builtin/mktag.c:62
+#, c-format
+msgid "object '%s' tagged as '%s', but is a '%s' type"
+msgstr ""
+
+#: builtin/mktag.c:99
+msgid "tag on stdin did not pass our strict fsck check"
+msgstr ""
+
+#: builtin/mktag.c:102
+msgid "tag on stdin did not refer to a valid object"
+msgstr ""
+
+#: builtin/mktag.c:105 builtin/tag.c:232
+msgid "unable to write tag file"
+msgstr ""
+
#: builtin/mktree.c:66
msgid "git mktree [-z] [--missing] [--batch]"
msgstr ""
@@ -15437,7 +16628,10 @@
"larger than this size"
msgstr ""
-#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67
+#: builtin/multi-pack-index.c:50 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 builtin/prune-packed.c:25 builtin/tag.c:575
msgid "too many arguments"
msgstr ""
@@ -15476,68 +16670,72 @@
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:781 builtin/repack.c:518
+#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:483
#, c-format
msgid "renaming '%s' failed"
msgstr ""
@@ -15555,7 +16753,7 @@
msgstr ""
#: builtin/name-rev.c:524
-msgid "print only names (no SHA-1)"
+msgid "print only ref-based names (no object names)"
msgstr ""
#: builtin/name-rev.c:525
@@ -15722,7 +16920,7 @@
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:565
#, c-format
msgid "could not open or read '%s'"
msgstr ""
@@ -15762,12 +16960,6 @@
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr ""
-#: 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."
@@ -15823,7 +17015,7 @@
msgstr ""
#: builtin/notes.c:517
-msgid "too few parameters"
+msgid "too few arguments"
msgstr ""
#: builtin/notes.c:538
@@ -15943,7 +17135,7 @@
"abort'.\n"
msgstr ""
-#: builtin/notes.c:897 builtin/tag.c:545
+#: builtin/notes.c:897 builtin/tag.c:578
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr ""
@@ -15961,7 +17153,7 @@
msgid "read object names from the standard input"
msgstr ""
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148
msgid "do not remove, show only"
msgstr ""
@@ -15977,355 +17169,397 @@
msgid "use notes from <notes-ref>"
msgstr ""
-#: builtin/notes.c:1034 builtin/stash.c:1643
+#: builtin/notes.c:1034 builtin/stash.c:1671
#, 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:430
+#: builtin/pack-objects.c:440
+#, c-format
+msgid ""
+"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
+"pack %s"
+msgstr ""
+
+#: builtin/pack-objects.c:448
#, c-format
msgid "bad packed object CRC for %s"
msgstr ""
-#: builtin/pack-objects.c:441
+#: builtin/pack-objects.c:459
#, c-format
msgid "corrupt packed object for %s"
msgstr ""
-#: builtin/pack-objects.c:572
+#: builtin/pack-objects.c:590
#, c-format
msgid "recursive delta detected for object %s"
msgstr ""
-#: builtin/pack-objects.c:783
+#: builtin/pack-objects.c:801
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr ""
-#: builtin/pack-objects.c:972
+#: builtin/pack-objects.c:896
+#, c-format
+msgid "expected object at offset %<PRIuMAX> in pack %s"
+msgstr ""
+
+#: builtin/pack-objects.c:1015
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
-#: builtin/pack-objects.c:985
+#: builtin/pack-objects.c:1028
msgid "Writing objects"
msgstr ""
-#: builtin/pack-objects.c:1046 builtin/update-index.c:90
+#: builtin/pack-objects.c:1089 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr ""
-#: builtin/pack-objects.c:1099
+#: builtin/pack-objects.c:1141
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr ""
-#: builtin/pack-objects.c:1297
+#: builtin/pack-objects.c:1358
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
-#: builtin/pack-objects.c:1724
+#: builtin/pack-objects.c:1806
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr ""
-#: builtin/pack-objects.c:1733
+#: builtin/pack-objects.c:1815
#, c-format
msgid "delta base offset out of bound for %s"
msgstr ""
-#: builtin/pack-objects.c:2004
+#: builtin/pack-objects.c:2096
msgid "Counting objects"
msgstr ""
-#: builtin/pack-objects.c:2149
+#: builtin/pack-objects.c:2241
#, c-format
msgid "unable to parse object header of %s"
msgstr ""
-#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235
-#: builtin/pack-objects.c:2245
+#: builtin/pack-objects.c:2311 builtin/pack-objects.c:2327
+#: builtin/pack-objects.c:2337
#, c-format
msgid "object %s cannot be read"
msgstr ""
-#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249
+#: builtin/pack-objects.c:2314 builtin/pack-objects.c:2341
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr ""
-#: builtin/pack-objects.c:2259
+#: builtin/pack-objects.c:2351
msgid "suboptimal pack - out of memory"
msgstr ""
-#: builtin/pack-objects.c:2574
+#: builtin/pack-objects.c:2666
#, c-format
msgid "Delta compression using up to %d threads"
msgstr ""
-#: builtin/pack-objects.c:2713
+#: builtin/pack-objects.c:2805
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr ""
-#: builtin/pack-objects.c:2801
+#: builtin/pack-objects.c:2891
msgid "Compressing objects"
msgstr ""
-#: builtin/pack-objects.c:2807
+#: builtin/pack-objects.c:2897
msgid "inconsistency with delta count"
msgstr ""
-#: builtin/pack-objects.c:2888
+#: builtin/pack-objects.c:2976
+#, c-format
+msgid ""
+"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
+"hash> <uri>' (got '%s')"
+msgstr ""
+
+#: builtin/pack-objects.c:2979
+#, c-format
+msgid ""
+"object already configured in another uploadpack.blobpackfileuri (got '%s')"
+msgstr ""
+
+#: builtin/pack-objects.c:3008
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
" %s"
msgstr ""
-#: builtin/pack-objects.c:2894
+#: builtin/pack-objects.c:3014
#, c-format
msgid ""
"expected object ID, got garbage:\n"
" %s"
msgstr ""
-#: builtin/pack-objects.c:2992
+#: builtin/pack-objects.c:3112
msgid "invalid value for --missing"
msgstr ""
-#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159
+#: builtin/pack-objects.c:3171 builtin/pack-objects.c:3279
msgid "cannot open pack index"
msgstr ""
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3202
#, c-format
msgid "loose object at %s could not be examined"
msgstr ""
-#: builtin/pack-objects.c:3167
+#: builtin/pack-objects.c:3287
msgid "unable to force loose object"
msgstr ""
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3380
#, c-format
msgid "not a rev '%s'"
msgstr ""
-#: builtin/pack-objects.c:3263
+#: builtin/pack-objects.c:3383
#, c-format
msgid "bad revision '%s'"
msgstr ""
-#: builtin/pack-objects.c:3288
+#: builtin/pack-objects.c:3408
msgid "unable to add recent objects"
msgstr ""
-#: builtin/pack-objects.c:3341
+#: builtin/pack-objects.c:3461
#, c-format
msgid "unsupported index version %s"
msgstr ""
-#: builtin/pack-objects.c:3345
+#: builtin/pack-objects.c:3465
#, c-format
msgid "bad index version '%s'"
msgstr ""
-#: builtin/pack-objects.c:3383
+#: builtin/pack-objects.c:3503
msgid "<version>[,<offset>]"
msgstr ""
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3504
msgid "write the pack index file in the specified idx format version"
msgstr ""
-#: builtin/pack-objects.c:3387
+#: builtin/pack-objects.c:3507
msgid "maximum size of each output pack file"
msgstr ""
-#: builtin/pack-objects.c:3389
+#: builtin/pack-objects.c:3509
msgid "ignore borrowed objects from alternate object store"
msgstr ""
-#: builtin/pack-objects.c:3391
+#: builtin/pack-objects.c:3511
msgid "ignore packed objects"
msgstr ""
-#: builtin/pack-objects.c:3393
+#: builtin/pack-objects.c:3513
msgid "limit pack window by objects"
msgstr ""
-#: builtin/pack-objects.c:3395
+#: builtin/pack-objects.c:3515
msgid "limit pack window by memory in addition to object limit"
msgstr ""
-#: builtin/pack-objects.c:3397
+#: builtin/pack-objects.c:3517
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
-#: builtin/pack-objects.c:3399
+#: builtin/pack-objects.c:3519
msgid "reuse existing deltas"
msgstr ""
-#: builtin/pack-objects.c:3401
+#: builtin/pack-objects.c:3521
msgid "reuse existing objects"
msgstr ""
-#: builtin/pack-objects.c:3403
+#: builtin/pack-objects.c:3523
msgid "use OFS_DELTA objects"
msgstr ""
-#: builtin/pack-objects.c:3405
+#: builtin/pack-objects.c:3525
msgid "use threads when searching for best delta matches"
msgstr ""
-#: builtin/pack-objects.c:3407
+#: builtin/pack-objects.c:3527
msgid "do not create an empty pack output"
msgstr ""
-#: builtin/pack-objects.c:3409
+#: builtin/pack-objects.c:3529
msgid "read revision arguments from standard input"
msgstr ""
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:3531
msgid "limit the objects to those that are not yet packed"
msgstr ""
-#: builtin/pack-objects.c:3414
+#: builtin/pack-objects.c:3534
msgid "include objects reachable from any reference"
msgstr ""
-#: builtin/pack-objects.c:3417
+#: builtin/pack-objects.c:3537
msgid "include objects referred by reflog entries"
msgstr ""
-#: builtin/pack-objects.c:3420
+#: builtin/pack-objects.c:3540
msgid "include objects referred to by the index"
msgstr ""
-#: builtin/pack-objects.c:3423
+#: builtin/pack-objects.c:3543
msgid "output pack to stdout"
msgstr ""
-#: builtin/pack-objects.c:3425
+#: builtin/pack-objects.c:3545
msgid "include tag objects that refer to objects to be packed"
msgstr ""
-#: builtin/pack-objects.c:3427
+#: builtin/pack-objects.c:3547
msgid "keep unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:3429
+#: builtin/pack-objects.c:3549
msgid "pack loose unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:3431
+#: builtin/pack-objects.c:3551
msgid "unpack unreachable objects newer than <time>"
msgstr ""
-#: builtin/pack-objects.c:3434
+#: builtin/pack-objects.c:3554
msgid "use the sparse reachability algorithm"
msgstr ""
-#: builtin/pack-objects.c:3436
+#: builtin/pack-objects.c:3556
msgid "create thin packs"
msgstr ""
-#: builtin/pack-objects.c:3438
+#: builtin/pack-objects.c:3558
msgid "create packs suitable for shallow fetches"
msgstr ""
-#: builtin/pack-objects.c:3440
+#: builtin/pack-objects.c:3560
msgid "ignore packs that have companion .keep file"
msgstr ""
-#: builtin/pack-objects.c:3442
+#: builtin/pack-objects.c:3562
msgid "ignore this pack"
msgstr ""
-#: builtin/pack-objects.c:3444
+#: builtin/pack-objects.c:3564
msgid "pack compression level"
msgstr ""
-#: builtin/pack-objects.c:3446
+#: builtin/pack-objects.c:3566
msgid "do not hide commits by grafts"
msgstr ""
-#: builtin/pack-objects.c:3448
+#: builtin/pack-objects.c:3568
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
-#: builtin/pack-objects.c:3450
+#: builtin/pack-objects.c:3570
msgid "write a bitmap index together with the pack index"
msgstr ""
-#: builtin/pack-objects.c:3454
+#: builtin/pack-objects.c:3574
msgid "write a bitmap index if possible"
msgstr ""
-#: builtin/pack-objects.c:3458
+#: builtin/pack-objects.c:3578
msgid "handling for missing objects"
msgstr ""
-#: builtin/pack-objects.c:3461
+#: builtin/pack-objects.c:3581
msgid "do not pack objects in promisor packfiles"
msgstr ""
-#: builtin/pack-objects.c:3463
+#: builtin/pack-objects.c:3583
msgid "respect islands during delta compression"
msgstr ""
-#: builtin/pack-objects.c:3492
+#: builtin/pack-objects.c:3585
+msgid "protocol"
+msgstr ""
+
+#: builtin/pack-objects.c:3586
+msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
+msgstr ""
+
+#: builtin/pack-objects.c:3617
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr ""
-#: builtin/pack-objects.c:3497
+#: builtin/pack-objects.c:3622
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr ""
-#: builtin/pack-objects.c:3551
+#: builtin/pack-objects.c:3676
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
-#: builtin/pack-objects.c:3553
+#: builtin/pack-objects.c:3678
msgid "minimum pack size limit is 1 MiB"
msgstr ""
-#: builtin/pack-objects.c:3558
+#: builtin/pack-objects.c:3683
msgid "--thin cannot be used to build an indexable pack"
msgstr ""
-#: builtin/pack-objects.c:3561
+#: builtin/pack-objects.c:3686
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr ""
-#: builtin/pack-objects.c:3567
+#: builtin/pack-objects.c:3692
msgid "cannot use --filter without --stdout"
msgstr ""
-#: builtin/pack-objects.c:3627
+#: builtin/pack-objects.c:3752
msgid "Enumerating objects"
msgstr ""
-#: builtin/pack-objects.c:3657
+#: builtin/pack-objects.c:3783
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
"reused %<PRIu32>"
msgstr ""
+#: builtin/pack-redundant.c:601
+msgid ""
+"'git pack-redundant' is nominated for removal.\n"
+"If you still use this command, please add an extra\n"
+"option, '--i-still-use-this', on the command line\n"
+"and let us know you still use it by sending an e-mail\n"
+"to <git@vger.kernel.org>. Thanks.\n"
+msgstr ""
+
#: builtin/pack-refs.c:8
msgid "git pack-refs [<options>]"
msgstr ""
@@ -16338,31 +17572,27 @@
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 ""
@@ -16375,61 +17605,61 @@
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/pull.c:122
+#: builtin/pull.c:123
msgid "control for recursive fetching of submodules"
msgstr ""
-#: builtin/pull.c:126
+#: builtin/pull.c:127
msgid "Options related to merging"
msgstr ""
-#: builtin/pull.c:129
+#: builtin/pull.c:130
msgid "incorporate changes by rebasing rather than merging"
msgstr ""
-#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126
+#: builtin/pull.c:158 builtin/rebase.c:492 builtin/revert.c:126
msgid "allow fast-forward"
msgstr ""
-#: builtin/pull.c:166
-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:182
+#: builtin/pull.c:183
msgid "Options related to fetching"
msgstr ""
-#: builtin/pull.c:192
+#: builtin/pull.c:193
msgid "force overwrite of local branch"
msgstr ""
-#: builtin/pull.c:200
+#: builtin/pull.c:201
msgid "number of submodules pulled in parallel"
msgstr ""
-#: builtin/pull.c:300
+#: builtin/pull.c:317
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr ""
-#: builtin/pull.c:426
+#: builtin/pull.c:445
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr ""
-#: builtin/pull.c:428
+#: builtin/pull.c:447
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
-#: builtin/pull.c:429
+#: builtin/pull.c:448
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
msgstr ""
-#: builtin/pull.c:432
+#: builtin/pull.c:451
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -16437,74 +17667,86 @@
"for your current branch, you must specify a branch on the command line."
msgstr ""
-#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73
+#: builtin/pull.c:456 builtin/rebase.c:1253
msgid "You are not currently on a branch."
msgstr ""
-#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79
+#: builtin/pull.c:458 builtin/pull.c:473
msgid "Please specify which branch you want to rebase against."
msgstr ""
-#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82
+#: builtin/pull.c:460 builtin/pull.c:475
msgid "Please specify which branch you want to merge with."
msgstr ""
-#: builtin/pull.c:442 builtin/pull.c:457
+#: builtin/pull.c:461 builtin/pull.c:476
msgid "See git-pull(1) for details."
msgstr ""
-#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459
-#: builtin/rebase.c:1415 git-parse-remote.sh:64
+#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
+#: builtin/rebase.c:1259
msgid "<remote>"
msgstr ""
-#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464
-#: git-parse-remote.sh:65
+#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
msgid "<branch>"
msgstr ""
-#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75
+#: builtin/pull.c:471 builtin/rebase.c:1251
msgid "There is no tracking information for the current branch."
msgstr ""
-#: builtin/pull.c:461 git-parse-remote.sh:95
+#: builtin/pull.c:480
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
-#: builtin/pull.c:466
+#: builtin/pull.c:485
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"from the remote, but no such ref was fetched."
msgstr ""
-#: builtin/pull.c:576
+#: builtin/pull.c:596
#, c-format
msgid "unable to access commit %s"
msgstr ""
-#: builtin/pull.c:857
+#: builtin/pull.c:902
msgid "ignoring --verify-signatures for rebase"
msgstr ""
-#: builtin/pull.c:912
-msgid "--[no-]autostash option is only valid with --rebase."
+#: builtin/pull.c:930
+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:920
+#: builtin/pull.c:991
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
-#: builtin/pull.c:924
+#: builtin/pull.c:995
msgid "pull with rebase"
msgstr ""
-#: builtin/pull.c:925
+#: builtin/pull.c:996
msgid "please commit or stash them."
msgstr ""
-#: builtin/pull.c:950
+#: builtin/pull.c:1021
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -16512,7 +17754,7 @@
"commit %s."
msgstr ""
-#: builtin/pull.c:956
+#: builtin/pull.c:1027
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -16523,15 +17765,15 @@
"to recover."
msgstr ""
-#: builtin/pull.c:971
+#: builtin/pull.c:1042
msgid "Cannot merge multiple branches into empty head."
msgstr ""
-#: builtin/pull.c:975
+#: builtin/pull.c:1046
msgid "Cannot rebase onto multiple branches."
msgstr ""
-#: builtin/pull.c:982
+#: builtin/pull.c:1067
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
@@ -16539,21 +17781,21 @@
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/push.c:112
+#: builtin/push.c:111
msgid "tag shorthand without <tag>"
msgstr ""
-#: builtin/push.c:122
+#: builtin/push.c:119
msgid "--delete only accepts plain target ref names"
msgstr ""
-#: builtin/push.c:168
+#: builtin/push.c:164
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
msgstr ""
-#: builtin/push.c:171
+#: builtin/push.c:167
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -16568,7 +17810,7 @@
"%s"
msgstr ""
-#: builtin/push.c:186
+#: builtin/push.c:182
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -16578,7 +17820,7 @@
" git push %s HEAD:<name-of-remote-branch>\n"
msgstr ""
-#: builtin/push.c:200
+#: builtin/push.c:194
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -16587,12 +17829,12 @@
" git push --set-upstream %s %s\n"
msgstr ""
-#: builtin/push.c:208
+#: builtin/push.c:202
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
-#: builtin/push.c:211
+#: builtin/push.c:205
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -16600,12 +17842,12 @@
"to update which remote branch."
msgstr ""
-#: builtin/push.c:270
+#: builtin/push.c:260
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
-#: builtin/push.c:277
+#: 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"
@@ -16613,7 +17855,7 @@
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-#: builtin/push.c:283
+#: 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"
@@ -16621,7 +17863,7 @@
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-#: builtin/push.c:289
+#: 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"
@@ -16630,110 +17872,122 @@
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-#: builtin/push.c:296
+#: builtin/push.c:286
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
-#: builtin/push.c:299
+#: 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:360
+#: builtin/push.c:294
+msgid ""
+"Updates were rejected because the tip of the remote-tracking\n"
+"branch has been updated since the last checkout. You may want\n"
+"to integrate those changes locally (e.g., 'git pull ...')\n"
+"before forcing an update.\n"
+msgstr ""
+
+#: builtin/push.c:364
#, c-format
msgid "Pushing to %s\n"
msgstr ""
-#: builtin/push.c:367
+#: builtin/push.c:371
#, c-format
msgid "failed to push some refs to '%s'"
msgstr ""
-#: builtin/push.c:542
+#: builtin/push.c:553
msgid "repository"
msgstr ""
-#: builtin/push.c:543 builtin/send-pack.c:164
+#: builtin/push.c:554 builtin/send-pack.c:189
msgid "push all refs"
msgstr ""
-#: builtin/push.c:544 builtin/send-pack.c:166
+#: builtin/push.c:555 builtin/send-pack.c:191
msgid "mirror all refs"
msgstr ""
-#: builtin/push.c:546
+#: builtin/push.c:557
msgid "delete refs"
msgstr ""
-#: builtin/push.c:547
+#: builtin/push.c:558
msgid "push tags (can't be used with --all or --mirror)"
msgstr ""
-#: builtin/push.c:550 builtin/send-pack.c:167
+#: builtin/push.c:561 builtin/send-pack.c:192
msgid "force updates"
msgstr ""
-#: builtin/push.c:552 builtin/send-pack.c:181
+#: builtin/push.c:562 builtin/send-pack.c:204
msgid "<refname>:<expect>"
msgstr ""
-#: builtin/push.c:553 builtin/send-pack.c:182
+#: builtin/push.c:563 builtin/send-pack.c:205
msgid "require old value of ref to be at this value"
msgstr ""
-#: builtin/push.c:556
+#: builtin/push.c:566 builtin/send-pack.c:208
+msgid "require remote updates to be integrated locally"
+msgstr ""
+
+#: builtin/push.c:569
msgid "control recursive pushing of submodules"
msgstr ""
-#: builtin/push.c:558 builtin/send-pack.c:175
+#: builtin/push.c:570 builtin/send-pack.c:199
msgid "use thin pack"
msgstr ""
-#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161
-#: builtin/send-pack.c:162
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
+#: builtin/send-pack.c:187
msgid "receive pack program"
msgstr ""
-#: builtin/push.c:561
+#: builtin/push.c:573
msgid "set upstream for git pull/status"
msgstr ""
-#: builtin/push.c:564
+#: builtin/push.c:576
msgid "prune locally removed refs"
msgstr ""
-#: builtin/push.c:566
+#: builtin/push.c:578
msgid "bypass pre-push hook"
msgstr ""
-#: builtin/push.c:567
+#: builtin/push.c:579
msgid "push missing but relevant tags"
msgstr ""
-#: builtin/push.c:570 builtin/send-pack.c:169
+#: builtin/push.c:581 builtin/send-pack.c:193
msgid "GPG sign the push"
msgstr ""
-#: builtin/push.c:572 builtin/send-pack.c:176
+#: builtin/push.c:583 builtin/send-pack.c:200
msgid "request atomic transaction on remote side"
msgstr ""
-#: builtin/push.c:590
+#: builtin/push.c:601
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr ""
-#: builtin/push.c:592
+#: builtin/push.c:603
msgid "--delete doesn't make sense without any refs"
msgstr ""
-#: builtin/push.c:612
+#: builtin/push.c:623
#, c-format
msgid "bad repository '%s'"
msgstr ""
-#: builtin/push.c:613
+#: builtin/push.c:624
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -16746,68 +18000,76 @@
" git push <name>\n"
msgstr ""
-#: builtin/push.c:628
+#: builtin/push.c:639
msgid "--all and --tags are incompatible"
msgstr ""
-#: builtin/push.c:630
+#: builtin/push.c:641
msgid "--all can't be combined with refspecs"
msgstr ""
-#: builtin/push.c:634
+#: builtin/push.c:645
msgid "--mirror and --tags are incompatible"
msgstr ""
-#: builtin/push.c:636
+#: builtin/push.c:647
msgid "--mirror can't be combined with refspecs"
msgstr ""
-#: builtin/push.c:639
+#: builtin/push.c:650
msgid "--all and --mirror are incompatible"
msgstr ""
-#: builtin/push.c:643
+#: builtin/push.c:657
msgid "push options must not have new line characters"
msgstr ""
-#: builtin/range-diff.c:8
+#: builtin/range-diff.c:9
msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
msgstr ""
-#: builtin/range-diff.c:9
+#: builtin/range-diff.c:10
msgid "git range-diff [<options>] <old-tip>...<new-tip>"
msgstr ""
-#: builtin/range-diff.c:10
+#: builtin/range-diff.c:11
msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
msgstr ""
-#: builtin/range-diff.c:22
+#: builtin/range-diff.c:28
msgid "Percentage by which creation is weighted"
msgstr ""
-#: builtin/range-diff.c:24
+#: builtin/range-diff.c:30
msgid "use simple diff colors"
msgstr ""
-#: builtin/range-diff.c:26
+#: builtin/range-diff.c:32
msgid "notes"
msgstr ""
-#: builtin/range-diff.c:26
+#: builtin/range-diff.c:32
msgid "passed to 'git log'"
msgstr ""
-#: builtin/range-diff.c:50 builtin/range-diff.c:54
-#, c-format
-msgid "no .. in range: '%s'"
+#: builtin/range-diff.c:35
+msgid "only emit output related to the first range"
msgstr ""
-#: builtin/range-diff.c:64
+#: builtin/range-diff.c:37
+msgid "only emit output related to the second range"
+msgstr ""
+
+#: builtin/range-diff.c:60 builtin/range-diff.c:64
+#, c-format
+msgid "not a commit range: '%s'"
+msgstr ""
+
+#: builtin/range-diff.c:74
msgid "single arg format must be symmetric range"
msgstr ""
-#: builtin/range-diff.c:79
+#: builtin/range-diff.c:89
msgid "need two commit ranges"
msgstr ""
@@ -16890,222 +18152,208 @@
msgid "You need to resolve your current index first"
msgstr ""
-#: builtin/rebase.c:32
+#: builtin/rebase.c:35
msgid ""
"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:175 builtin/rebase.c:199 builtin/rebase.c:226
+#: builtin/rebase.c:195 builtin/rebase.c:219 builtin/rebase.c:246
#, c-format
msgid "unusable todo list: '%s'"
msgstr ""
-#: builtin/rebase.c:292
+#: builtin/rebase.c:312
#, c-format
msgid "could not create temporary %s"
msgstr ""
-#: builtin/rebase.c:298
+#: builtin/rebase.c:318
msgid "could not mark as interactive"
msgstr ""
-#: builtin/rebase.c:352
+#: builtin/rebase.c:371
msgid "could not generate todo list"
msgstr ""
-#: builtin/rebase.c:391
+#: builtin/rebase.c:413
msgid "a base commit must be provided with --upstream or --onto"
msgstr ""
-#: builtin/rebase.c:461
+#: builtin/rebase.c:482
msgid "git rebase--interactive [<options>]"
msgstr ""
-#: builtin/rebase.c:474 builtin/rebase.c:1550
-msgid "(DEPRECATED) keep empty commits"
+#: builtin/rebase.c:495 builtin/rebase.c:1394
+msgid "keep commits which start empty"
msgstr ""
-#: builtin/rebase.c:478 builtin/revert.c:128
+#: builtin/rebase.c:499 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr ""
-#: builtin/rebase.c:480
+#: builtin/rebase.c:501
msgid "rebase merge commits"
msgstr ""
-#: builtin/rebase.c:482
+#: builtin/rebase.c:503
msgid "keep original branch points of cousins"
msgstr ""
-#: builtin/rebase.c:484
+#: builtin/rebase.c:505
msgid "move commits that begin with squash!/fixup!"
msgstr ""
-#: builtin/rebase.c:485
+#: builtin/rebase.c:506
msgid "sign commits"
msgstr ""
-#: builtin/rebase.c:487 builtin/rebase.c:1490
+#: builtin/rebase.c:508 builtin/rebase.c:1333
msgid "display a diffstat of what changed upstream"
msgstr ""
-#: builtin/rebase.c:489
+#: builtin/rebase.c:510
msgid "continue rebase"
msgstr ""
-#: builtin/rebase.c:491
+#: builtin/rebase.c:512
msgid "skip commit"
msgstr ""
-#: builtin/rebase.c:492
+#: builtin/rebase.c:513
msgid "edit the todo list"
msgstr ""
-#: builtin/rebase.c:494
+#: builtin/rebase.c:515
msgid "show the current patch"
msgstr ""
-#: builtin/rebase.c:497
+#: builtin/rebase.c:518
msgid "shorten commit ids in the todo list"
msgstr ""
-#: builtin/rebase.c:499
+#: builtin/rebase.c:520
msgid "expand commit ids in the todo list"
msgstr ""
-#: builtin/rebase.c:501
+#: builtin/rebase.c:522
msgid "check the todo list"
msgstr ""
-#: builtin/rebase.c:503
+#: builtin/rebase.c:524
msgid "rearrange fixup/squash lines"
msgstr ""
-#: builtin/rebase.c:505
+#: builtin/rebase.c:526
msgid "insert exec commands in todo list"
msgstr ""
-#: builtin/rebase.c:506
+#: builtin/rebase.c:527
msgid "onto"
msgstr ""
-#: builtin/rebase.c:509
+#: builtin/rebase.c:530
msgid "restrict-revision"
msgstr ""
-#: builtin/rebase.c:509
+#: builtin/rebase.c:530
msgid "restrict revision"
msgstr ""
-#: builtin/rebase.c:511
+#: builtin/rebase.c:532
msgid "squash-onto"
msgstr ""
-#: builtin/rebase.c:512
+#: builtin/rebase.c:533
msgid "squash onto"
msgstr ""
-#: builtin/rebase.c:514
+#: builtin/rebase.c:535
msgid "the upstream commit"
msgstr ""
-#: builtin/rebase.c:516
+#: builtin/rebase.c:537
msgid "head-name"
msgstr ""
-#: builtin/rebase.c:516
+#: builtin/rebase.c:537
msgid "head name"
msgstr ""
-#: builtin/rebase.c:521
+#: builtin/rebase.c:542
msgid "rebase strategy"
msgstr ""
-#: builtin/rebase.c:522
+#: builtin/rebase.c:543
msgid "strategy-opts"
msgstr ""
-#: builtin/rebase.c:523
+#: builtin/rebase.c:544
msgid "strategy options"
msgstr ""
-#: builtin/rebase.c:524
+#: builtin/rebase.c:545
msgid "switch-to"
msgstr ""
-#: builtin/rebase.c:525
+#: builtin/rebase.c:546
msgid "the branch or commit to checkout"
msgstr ""
-#: builtin/rebase.c:526
+#: builtin/rebase.c:547
msgid "onto-name"
msgstr ""
-#: builtin/rebase.c:526
+#: builtin/rebase.c:547
msgid "onto name"
msgstr ""
-#: builtin/rebase.c:527
+#: builtin/rebase.c:548
msgid "cmd"
msgstr ""
-#: builtin/rebase.c:527
+#: builtin/rebase.c:548
msgid "the command to run"
msgstr ""
-#: builtin/rebase.c:530 builtin/rebase.c:1584
+#: builtin/rebase.c:551 builtin/rebase.c:1427
msgid "automatically re-schedule any `exec` that fails"
msgstr ""
-#: builtin/rebase.c:546
+#: builtin/rebase.c:567
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr ""
-#: builtin/rebase.c:562
+#: builtin/rebase.c:583
#, c-format
-msgid "%s requires an interactive rebase"
+msgid "%s requires the merge backend"
msgstr ""
-#: builtin/rebase.c:612
+#: builtin/rebase.c:626
#, c-format
msgid "could not get 'onto': '%s'"
msgstr ""
-#: builtin/rebase.c:627
+#: builtin/rebase.c:643
#, c-format
msgid "invalid orig-head: '%s'"
msgstr ""
-#: builtin/rebase.c:652
+#: builtin/rebase.c:668
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr ""
-#: builtin/rebase.c:728
-#, c-format
-msgid "Could not read '%s'"
-msgstr ""
-
-#: builtin/rebase.c:746
-#, c-format
-msgid "Cannot store %s"
-msgstr ""
-
-#: builtin/rebase.c:853
-msgid "could not determine HEAD revision"
-msgstr ""
-
-#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -17114,7 +18362,7 @@
"abort\"."
msgstr ""
-#: builtin/rebase.c:1058
+#: builtin/rebase.c:896
#, c-format
msgid ""
"\n"
@@ -17126,14 +18374,14 @@
"As a result, git cannot rebase them."
msgstr ""
-#: builtin/rebase.c:1383
+#: builtin/rebase.c:1227
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
"\"."
msgstr ""
-#: builtin/rebase.c:1401
+#: builtin/rebase.c:1245
#, c-format
msgid ""
"%s\n"
@@ -17144,7 +18392,7 @@
"\n"
msgstr ""
-#: builtin/rebase.c:1417
+#: builtin/rebase.c:1261
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -17153,185 +18401,201 @@
"\n"
msgstr ""
-#: builtin/rebase.c:1447
+#: builtin/rebase.c:1291
msgid "exec commands cannot contain newlines"
msgstr ""
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1295
msgid "empty exec command"
msgstr ""
-#: builtin/rebase.c:1481
+#: builtin/rebase.c:1324
msgid "rebase onto given branch instead of upstream"
msgstr ""
-#: builtin/rebase.c:1483
+#: builtin/rebase.c:1326
msgid "use the merge-base of upstream and branch as the current base"
msgstr ""
-#: builtin/rebase.c:1485
+#: builtin/rebase.c:1328
msgid "allow pre-rebase hook to run"
msgstr ""
-#: builtin/rebase.c:1487
+#: builtin/rebase.c:1330
msgid "be quiet. implies --no-stat"
msgstr ""
-#: builtin/rebase.c:1493
+#: builtin/rebase.c:1336
msgid "do not show diffstat of what changed upstream"
msgstr ""
-#: builtin/rebase.c:1496
-msgid "add a Signed-off-by: line to each commit"
+#: builtin/rebase.c:1339
+msgid "add a Signed-off-by trailer to each commit"
msgstr ""
-#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504
-msgid "passed to 'git am'"
+#: builtin/rebase.c:1342
+msgid "make committer date match author date"
msgstr ""
-#: builtin/rebase.c:1506 builtin/rebase.c:1508
+#: builtin/rebase.c:1344
+msgid "ignore author date and use current date"
+msgstr ""
+
+#: builtin/rebase.c:1346
+msgid "synonym of --reset-author-date"
+msgstr ""
+
+#: builtin/rebase.c:1348 builtin/rebase.c:1352
msgid "passed to 'git apply'"
msgstr ""
-#: builtin/rebase.c:1510 builtin/rebase.c:1513
+#: builtin/rebase.c:1350
+msgid "ignore changes in whitespace"
+msgstr ""
+
+#: builtin/rebase.c:1354 builtin/rebase.c:1357
msgid "cherry-pick all commits, even if unchanged"
msgstr ""
-#: builtin/rebase.c:1515
+#: builtin/rebase.c:1359
msgid "continue"
msgstr ""
-#: builtin/rebase.c:1518
+#: builtin/rebase.c:1362
msgid "skip current patch and continue"
msgstr ""
-#: builtin/rebase.c:1520
+#: builtin/rebase.c:1364
msgid "abort and check out the original branch"
msgstr ""
-#: builtin/rebase.c:1523
+#: builtin/rebase.c:1367
msgid "abort but keep HEAD where it is"
msgstr ""
-#: builtin/rebase.c:1524
+#: builtin/rebase.c:1368
msgid "edit the todo list during an interactive rebase"
msgstr ""
-#: builtin/rebase.c:1527
+#: builtin/rebase.c:1371
msgid "show the patch file being applied or merged"
msgstr ""
-#: builtin/rebase.c:1530
+#: builtin/rebase.c:1374
msgid "use apply strategies to rebase"
msgstr ""
-#: builtin/rebase.c:1534
+#: builtin/rebase.c:1378
msgid "use merging strategies to rebase"
msgstr ""
-#: builtin/rebase.c:1538
+#: builtin/rebase.c:1382
msgid "let the user edit the list of commits to rebase"
msgstr ""
-#: builtin/rebase.c:1542
+#: builtin/rebase.c:1386
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr ""
-#: builtin/rebase.c:1547
+#: builtin/rebase.c:1391
msgid "how to handle commits that become empty"
msgstr ""
-#: builtin/rebase.c:1554
+#: builtin/rebase.c:1398
msgid "move commits that begin with squash!/fixup! under -i"
msgstr ""
-#: builtin/rebase.c:1560
-msgid "automatically stash/stash pop before and after"
-msgstr ""
-
-#: builtin/rebase.c:1562
+#: builtin/rebase.c:1405
msgid "add exec lines after each commit of the editable list"
msgstr ""
-#: builtin/rebase.c:1566
+#: builtin/rebase.c:1409
msgid "allow rebasing commits with empty messages"
msgstr ""
-#: builtin/rebase.c:1570
+#: builtin/rebase.c:1413
msgid "try to rebase merges instead of skipping them"
msgstr ""
-#: builtin/rebase.c:1573
+#: builtin/rebase.c:1416
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr ""
-#: builtin/rebase.c:1575
+#: builtin/rebase.c:1418
msgid "use the given merge strategy"
msgstr ""
-#: builtin/rebase.c:1577 builtin/revert.c:115
+#: builtin/rebase.c:1420 builtin/revert.c:115
msgid "option"
msgstr ""
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1421
msgid "pass the argument through to the merge strategy"
msgstr ""
-#: builtin/rebase.c:1581
+#: builtin/rebase.c:1424
msgid "rebase all reachable commits up to the root(s)"
msgstr ""
-#: builtin/rebase.c:1598
+#: builtin/rebase.c:1429
+msgid "apply all changes, even those already present upstream"
+msgstr ""
+
+#: builtin/rebase.c:1446
msgid ""
"the rebase.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
msgstr ""
-#: builtin/rebase.c:1604
+#: builtin/rebase.c:1452
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr ""
-#: builtin/rebase.c:1645
+#: builtin/rebase.c:1493
msgid ""
"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr ""
-#: builtin/rebase.c:1650
+#: builtin/rebase.c:1498
msgid "cannot combine '--keep-base' with '--onto'"
msgstr ""
-#: builtin/rebase.c:1652
+#: builtin/rebase.c:1500
msgid "cannot combine '--keep-base' with '--root'"
msgstr ""
-#: builtin/rebase.c:1656
+#: builtin/rebase.c:1504
+msgid "cannot combine '--root' with '--fork-point'"
+msgstr ""
+
+#: builtin/rebase.c:1507
msgid "No rebase in progress?"
msgstr ""
-#: builtin/rebase.c:1660
+#: builtin/rebase.c:1511
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
-#: builtin/rebase.c:1683
+#: builtin/rebase.c:1534 t/helper/test-fast-rebase.c:123
msgid "Cannot read HEAD"
msgstr ""
-#: builtin/rebase.c:1695
+#: builtin/rebase.c:1546
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
msgstr ""
-#: builtin/rebase.c:1714
+#: builtin/rebase.c:1565
msgid "could not discard worktree changes"
msgstr ""
-#: builtin/rebase.c:1733
+#: builtin/rebase.c:1584
#, c-format
msgid "could not move back to %s"
msgstr ""
-#: builtin/rebase.c:1778
+#: builtin/rebase.c:1630
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -17344,163 +18608,140 @@
"valuable there.\n"
msgstr ""
-#: builtin/rebase.c:1806
+#: builtin/rebase.c:1658
msgid "switch `C' expects a numerical value"
msgstr ""
-#: builtin/rebase.c:1847
+#: builtin/rebase.c:1700
#, c-format
msgid "Unknown mode: %s"
msgstr ""
-#: builtin/rebase.c:1869
+#: builtin/rebase.c:1739
msgid "--strategy requires --merge or --interactive"
msgstr ""
-#: builtin/rebase.c:1899
+#: builtin/rebase.c:1769
msgid "cannot combine apply options with merge options"
msgstr ""
-#: builtin/rebase.c:1912
+#: builtin/rebase.c:1782
#, c-format
msgid "Unknown rebase backend: %s"
msgstr ""
-#: builtin/rebase.c:1937
+#: builtin/rebase.c:1812
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr ""
-#: builtin/rebase.c:1957
+#: builtin/rebase.c:1832
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr ""
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1836
msgid ""
"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
-#: builtin/rebase.c:1985
+#: builtin/rebase.c:1860
#, c-format
msgid "invalid upstream '%s'"
msgstr ""
-#: builtin/rebase.c:1991
+#: builtin/rebase.c:1866
msgid "Could not create new root commit"
msgstr ""
-#: builtin/rebase.c:2017
+#: builtin/rebase.c:1892
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr ""
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1895
#, c-format
msgid "'%s': need exactly one merge base"
msgstr ""
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1903
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr ""
-#: builtin/rebase.c:2054
+#: builtin/rebase.c:1931
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr ""
-#: builtin/rebase.c:2062 builtin/submodule--helper.c:40
-#: builtin/submodule--helper.c:1990
+#: builtin/rebase.c:1939 builtin/submodule--helper.c:40
+#: builtin/submodule--helper.c:2414
#, c-format
msgid "No such ref: %s"
msgstr ""
-#: builtin/rebase.c:2073
+#: builtin/rebase.c:1950
msgid "Could not resolve HEAD to a revision"
msgstr ""
-#: builtin/rebase.c:2111
-msgid "Cannot autostash"
-msgstr ""
-
-#: builtin/rebase.c:2114
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr ""
-
-#: builtin/rebase.c:2120
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr ""
-
-#: builtin/rebase.c:2123
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr ""
-
-#: builtin/rebase.c:2126
-msgid "could not reset --hard"
-msgstr ""
-
-#: builtin/rebase.c:2135
+#: builtin/rebase.c:1971
msgid "Please commit or stash them."
msgstr ""
-#: builtin/rebase.c:2169
+#: builtin/rebase.c:2007
#, c-format
msgid "could not switch to %s"
msgstr ""
-#: builtin/rebase.c:2180
+#: builtin/rebase.c:2018
msgid "HEAD is up to date."
msgstr ""
-#: builtin/rebase.c:2182
+#: builtin/rebase.c:2020
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr ""
-#: builtin/rebase.c:2190
+#: builtin/rebase.c:2028
msgid "HEAD is up to date, rebase forced."
msgstr ""
-#: builtin/rebase.c:2192
+#: builtin/rebase.c:2030
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr ""
-#: builtin/rebase.c:2200
+#: builtin/rebase.c:2038
msgid "The pre-rebase hook refused to rebase."
msgstr ""
-#: builtin/rebase.c:2207
+#: builtin/rebase.c:2045
#, c-format
msgid "Changes to %s:\n"
msgstr ""
-#: builtin/rebase.c:2210
+#: builtin/rebase.c:2048
#, c-format
msgid "Changes from %s to %s:\n"
msgstr ""
-#: builtin/rebase.c:2235
+#: builtin/rebase.c:2073
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
-#: builtin/rebase.c:2244
+#: builtin/rebase.c:2082
msgid "Could not detach HEAD"
msgstr ""
-#: builtin/rebase.c:2253
+#: builtin/rebase.c:2091
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr ""
-#: builtin/receive-pack.c:33
+#: builtin/receive-pack.c:34
msgid "git receive-pack <git-dir>"
msgstr ""
-#: builtin/receive-pack.c:821
+#: builtin/receive-pack.c:1276
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
@@ -17517,7 +18758,7 @@
"'receive.denyCurrentBranch' configuration variable to 'refuse'."
msgstr ""
-#: builtin/receive-pack.c:841
+#: builtin/receive-pack.c:1296
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"
@@ -17529,11 +18770,11 @@
"To squelch this message, you can set it to 'refuse'."
msgstr ""
-#: builtin/receive-pack.c:1938
+#: builtin/receive-pack.c:2481
msgid "quiet"
msgstr ""
-#: builtin/receive-pack.c:1952
+#: builtin/receive-pack.c:2495
msgid "You must specify a directory."
msgstr ""
@@ -17559,36 +18800,36 @@
msgid "'%s' is not a valid timestamp"
msgstr ""
-#: builtin/reflog.c:606
+#: builtin/reflog.c:609
#, c-format
msgid "Marking reachable objects..."
msgstr ""
-#: builtin/reflog.c:644
+#: builtin/reflog.c:647
#, c-format
msgid "%s points nowhere!"
msgstr ""
-#: builtin/reflog.c:696
+#: builtin/reflog.c:699
msgid "no reflog specified to delete"
msgstr ""
-#: builtin/reflog.c:705
+#: builtin/reflog.c:708
#, c-format
msgid "not a reflog: %s"
msgstr ""
-#: builtin/reflog.c:710
+#: builtin/reflog.c:713
#, c-format
msgid "no reflog for '%s'"
msgstr ""
-#: builtin/reflog.c:756
+#: builtin/reflog.c:759
#, c-format
msgid "invalid ref format: %s"
msgstr ""
-#: builtin/reflog.c:765
+#: builtin/reflog.c:768
msgid "git reflog [ show | expire | delete | exists ]"
msgstr ""
@@ -17719,40 +18960,35 @@
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr ""
-#: builtin/remote.c:195 builtin/remote.c:696
+#: builtin/remote.c:195 builtin/remote.c:700
#, c-format
msgid "remote %s already exists."
msgstr ""
-#: builtin/remote.c:199 builtin/remote.c:700
-#, c-format
-msgid "'%s' is not a valid remote name"
-msgstr ""
-
-#: builtin/remote.c:239
+#: builtin/remote.c:240
#, c-format
msgid "Could not setup master '%s'"
msgstr ""
-#: builtin/remote.c:354
+#: builtin/remote.c:355
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr ""
-#: builtin/remote.c:453 builtin/remote.c:461
+#: builtin/remote.c:454 builtin/remote.c:462
msgid "(matching)"
msgstr ""
-#: builtin/remote.c:465
+#: builtin/remote.c:466
msgid "(delete)"
msgstr ""
-#: builtin/remote.c:653
+#: builtin/remote.c:655
#, c-format
msgid "could not set '%s'"
msgstr ""
-#: builtin/remote.c:658
+#: builtin/remote.c:660
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
@@ -17760,17 +18996,17 @@
"now names the non-existent remote '%s'"
msgstr ""
-#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940
+#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946
#, c-format
msgid "No such remote: '%s'"
msgstr ""
-#: builtin/remote.c:706
+#: builtin/remote.c:710
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr ""
-#: builtin/remote.c:726
+#: builtin/remote.c:730
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -17778,17 +19014,17 @@
"\tPlease update the configuration manually if necessary."
msgstr ""
-#: builtin/remote.c:766
+#: builtin/remote.c:770
#, c-format
msgid "deleting '%s' failed"
msgstr ""
-#: builtin/remote.c:800
+#: builtin/remote.c:804
#, c-format
msgid "creating '%s' failed"
msgstr ""
-#: builtin/remote.c:876
+#: builtin/remote.c:882
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -17798,118 +19034,118 @@
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:890
+#: builtin/remote.c:896
#, c-format
msgid "Could not remove config section '%s'"
msgstr ""
-#: builtin/remote.c:993
+#: builtin/remote.c:999
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr ""
-#: builtin/remote.c:996
+#: builtin/remote.c:1002
msgid " tracked"
msgstr ""
-#: builtin/remote.c:998
+#: builtin/remote.c:1004
msgid " stale (use 'git remote prune' to remove)"
msgstr ""
-#: builtin/remote.c:1000
+#: builtin/remote.c:1006
msgid " ???"
msgstr ""
-#: builtin/remote.c:1041
+#: builtin/remote.c:1047
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr ""
-#: builtin/remote.c:1050
+#: builtin/remote.c:1056
#, c-format
msgid "rebases interactively onto remote %s"
msgstr ""
-#: builtin/remote.c:1052
+#: builtin/remote.c:1058
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr ""
-#: builtin/remote.c:1055
+#: builtin/remote.c:1061
#, c-format
msgid "rebases onto remote %s"
msgstr ""
-#: builtin/remote.c:1059
+#: builtin/remote.c:1065
#, c-format
msgid " merges with remote %s"
msgstr ""
-#: builtin/remote.c:1062
+#: builtin/remote.c:1068
#, c-format
msgid "merges with remote %s"
msgstr ""
-#: builtin/remote.c:1065
+#: builtin/remote.c:1071
#, c-format
msgid "%-*s and with remote %s\n"
msgstr ""
-#: builtin/remote.c:1108
+#: builtin/remote.c:1114
msgid "create"
msgstr ""
-#: builtin/remote.c:1111
+#: builtin/remote.c:1117
msgid "delete"
msgstr ""
-#: builtin/remote.c:1115
+#: builtin/remote.c:1121
msgid "up to date"
msgstr ""
-#: builtin/remote.c:1118
+#: builtin/remote.c:1124
msgid "fast-forwardable"
msgstr ""
-#: builtin/remote.c:1121
+#: builtin/remote.c:1127
msgid "local out of date"
msgstr ""
-#: builtin/remote.c:1128
+#: builtin/remote.c:1134
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr ""
-#: builtin/remote.c:1131
+#: builtin/remote.c:1137
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr ""
-#: builtin/remote.c:1135
+#: builtin/remote.c:1141
#, c-format
msgid " %-*s forces to %s"
msgstr ""
-#: builtin/remote.c:1138
+#: builtin/remote.c:1144
#, c-format
msgid " %-*s pushes to %s"
msgstr ""
-#: builtin/remote.c:1206
+#: builtin/remote.c:1212
msgid "do not query remotes"
msgstr ""
-#: builtin/remote.c:1233
+#: builtin/remote.c:1239
#, c-format
msgid "* remote %s"
msgstr ""
-#: builtin/remote.c:1234
+#: builtin/remote.c:1240
#, c-format
msgid " Fetch URL: %s"
msgstr ""
-#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390
+#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
msgid "(no URL)"
msgstr ""
@@ -17917,308 +19153,301 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1249 builtin/remote.c:1251
+#: builtin/remote.c:1255 builtin/remote.c:1257
#, c-format
msgid " Push URL: %s"
msgstr ""
-#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
#, c-format
msgid " HEAD branch: %s"
msgstr ""
-#: builtin/remote.c:1253
+#: builtin/remote.c:1259
msgid "(not queried)"
msgstr ""
-#: builtin/remote.c:1255
+#: builtin/remote.c:1261
msgid "(unknown)"
msgstr ""
-#: builtin/remote.c:1259
+#: builtin/remote.c:1265
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
-#: builtin/remote.c:1271
+#: builtin/remote.c:1277
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1274 builtin/remote.c:1300
+#: builtin/remote.c:1280 builtin/remote.c:1306
msgid " (status not queried)"
msgstr ""
-#: builtin/remote.c:1283
+#: builtin/remote.c:1289
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1291
+#: builtin/remote.c:1297
msgid " Local refs will be mirrored by 'git push'"
msgstr ""
-#: builtin/remote.c:1297
+#: builtin/remote.c:1303
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1318
+#: builtin/remote.c:1324
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr ""
-#: builtin/remote.c:1320
+#: builtin/remote.c:1326
msgid "delete refs/remotes/<name>/HEAD"
msgstr ""
-#: builtin/remote.c:1335
+#: builtin/remote.c:1341
msgid "Cannot determine remote HEAD"
msgstr ""
-#: builtin/remote.c:1337
+#: builtin/remote.c:1343
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
-#: builtin/remote.c:1347
+#: builtin/remote.c:1353
#, c-format
msgid "Could not delete %s"
msgstr ""
-#: builtin/remote.c:1355
+#: builtin/remote.c:1361
#, c-format
msgid "Not a valid ref: %s"
msgstr ""
-#: builtin/remote.c:1357
+#: builtin/remote.c:1363
#, c-format
msgid "Could not setup %s"
msgstr ""
-#: builtin/remote.c:1375
+#: builtin/remote.c:1381
#, c-format
msgid " %s will become dangling!"
msgstr ""
-#: builtin/remote.c:1376
+#: builtin/remote.c:1382
#, c-format
msgid " %s has become dangling!"
msgstr ""
-#: builtin/remote.c:1386
+#: builtin/remote.c:1392
#, c-format
msgid "Pruning %s"
msgstr ""
-#: builtin/remote.c:1387
+#: builtin/remote.c:1393
#, c-format
msgid "URL: %s"
msgstr ""
-#: builtin/remote.c:1403
+#: builtin/remote.c:1409
#, c-format
msgid " * [would prune] %s"
msgstr ""
-#: builtin/remote.c:1406
+#: builtin/remote.c:1412
#, c-format
msgid " * [pruned] %s"
msgstr ""
-#: builtin/remote.c:1451
+#: builtin/remote.c:1457
msgid "prune remotes after fetching"
msgstr ""
-#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636
+#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
#, c-format
msgid "No such remote '%s'"
msgstr ""
-#: builtin/remote.c:1530
+#: builtin/remote.c:1539
msgid "add branch"
msgstr ""
-#: builtin/remote.c:1537
+#: builtin/remote.c:1546
msgid "no remote specified"
msgstr ""
-#: builtin/remote.c:1554
+#: builtin/remote.c:1563
msgid "query push URLs rather than fetch URLs"
msgstr ""
-#: builtin/remote.c:1556
+#: builtin/remote.c:1565
msgid "return all URLs"
msgstr ""
-#: builtin/remote.c:1584
+#: builtin/remote.c:1595
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr ""
-#: builtin/remote.c:1610
+#: builtin/remote.c:1621
msgid "manipulate push URLs"
msgstr ""
-#: builtin/remote.c:1612
+#: builtin/remote.c:1623
msgid "add URL"
msgstr ""
-#: builtin/remote.c:1614
+#: builtin/remote.c:1625
msgid "delete URLs"
msgstr ""
-#: builtin/remote.c:1621
+#: builtin/remote.c:1632
msgid "--add --delete doesn't make sense"
msgstr ""
-#: builtin/remote.c:1660
+#: builtin/remote.c:1673
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr ""
-#: builtin/remote.c:1668
+#: builtin/remote.c:1681
#, c-format
msgid "No such URL found: %s"
msgstr ""
-#: builtin/remote.c:1670
+#: builtin/remote.c:1683
msgid "Will not delete all non-push URLs"
msgstr ""
-#: builtin/repack.c:23
+#: builtin/repack.c:26
msgid "git repack [<options>]"
msgstr ""
-#: builtin/repack.c:28
+#: builtin/repack.c:31
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
msgstr ""
-#: builtin/repack.c:191
+#: builtin/repack.c:198
msgid "could not start pack-objects to repack promisor objects"
msgstr ""
-#: builtin/repack.c:230 builtin/repack.c:416
+#: builtin/repack.c:270 builtin/repack.c:446
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
-#: builtin/repack.c:254
+#: builtin/repack.c:294
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
-#: builtin/repack.c:292
+#: builtin/repack.c:322
msgid "pack everything in a single pack"
msgstr ""
-#: builtin/repack.c:294
+#: builtin/repack.c:324
msgid "same as -a, and turn unreachable objects loose"
msgstr ""
-#: builtin/repack.c:297
+#: builtin/repack.c:327
msgid "remove redundant packs, and run git-prune-packed"
msgstr ""
-#: builtin/repack.c:299
+#: builtin/repack.c:329
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr ""
-#: builtin/repack.c:301
+#: builtin/repack.c:331
msgid "pass --no-reuse-object to git-pack-objects"
msgstr ""
-#: builtin/repack.c:303
+#: builtin/repack.c:333
msgid "do not run git-update-server-info"
msgstr ""
-#: builtin/repack.c:306
+#: builtin/repack.c:336
msgid "pass --local to git-pack-objects"
msgstr ""
-#: builtin/repack.c:308
+#: builtin/repack.c:338
msgid "write bitmap index"
msgstr ""
-#: builtin/repack.c:310
+#: builtin/repack.c:340
msgid "pass --delta-islands to git-pack-objects"
msgstr ""
-#: builtin/repack.c:311
+#: builtin/repack.c:341
msgid "approxidate"
msgstr ""
-#: builtin/repack.c:312
+#: builtin/repack.c:342
msgid "with -A, do not loosen objects older than this"
msgstr ""
-#: builtin/repack.c:314
+#: builtin/repack.c:344
msgid "with -a, repack unreachable objects"
msgstr ""
-#: builtin/repack.c:316
+#: builtin/repack.c:346
msgid "size of the window used for delta compression"
msgstr ""
-#: builtin/repack.c:317 builtin/repack.c:323
+#: builtin/repack.c:347 builtin/repack.c:353
msgid "bytes"
msgstr ""
-#: builtin/repack.c:318
+#: builtin/repack.c:348
msgid "same as the above, but limit memory size instead of entries count"
msgstr ""
-#: builtin/repack.c:320
+#: builtin/repack.c:350
msgid "limits the maximum delta depth"
msgstr ""
-#: builtin/repack.c:322
+#: builtin/repack.c:352
msgid "limits the maximum number of threads"
msgstr ""
-#: builtin/repack.c:324
+#: builtin/repack.c:354
msgid "maximum size of each packfile"
msgstr ""
-#: builtin/repack.c:326
+#: builtin/repack.c:356
msgid "repack objects in packs marked with .keep"
msgstr ""
-#: builtin/repack.c:328
+#: builtin/repack.c:358
msgid "do not repack this pack"
msgstr ""
-#: builtin/repack.c:338
+#: builtin/repack.c:368
msgid "cannot delete packs in a precious-objects repo"
msgstr ""
-#: builtin/repack.c:342
+#: builtin/repack.c:372
msgid "--keep-unreachable and -A are incompatible"
msgstr ""
-#: builtin/repack.c:425
+#: builtin/repack.c:455
msgid "Nothing new to pack."
msgstr ""
-#: builtin/repack.c:486
+#: builtin/repack.c:485
#, 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"
+msgid "missing required file: %s"
msgstr ""
-#: builtin/repack.c:534
+#: builtin/repack.c:487
#, c-format
-msgid "failed to remove '%s'"
+msgid "could not unlink: %s"
msgstr ""
#: builtin/replace.c:22
@@ -18515,91 +19744,91 @@
msgid "keep"
msgstr ""
-#: builtin/reset.c:82
+#: builtin/reset.c:83
msgid "You do not have a valid HEAD."
msgstr ""
-#: builtin/reset.c:84
+#: builtin/reset.c:85
msgid "Failed to find tree of HEAD."
msgstr ""
-#: builtin/reset.c:90
+#: builtin/reset.c:91
#, c-format
msgid "Failed to find tree of %s."
msgstr ""
-#: builtin/reset.c:115
+#: builtin/reset.c:116
#, c-format
msgid "HEAD is now at %s"
msgstr ""
-#: builtin/reset.c:194
+#: builtin/reset.c:195
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr ""
-#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595
-#: builtin/stash.c:619
+#: builtin/reset.c:295 builtin/stash.c:587 builtin/stash.c:661
+#: builtin/stash.c:685
msgid "be quiet, only report errors"
msgstr ""
-#: builtin/reset.c:296
+#: builtin/reset.c:297
msgid "reset HEAD and index"
msgstr ""
-#: builtin/reset.c:297
+#: builtin/reset.c:298
msgid "reset only HEAD"
msgstr ""
-#: builtin/reset.c:299 builtin/reset.c:301
+#: builtin/reset.c:300 builtin/reset.c:302
msgid "reset HEAD, index and working tree"
msgstr ""
-#: builtin/reset.c:303
+#: builtin/reset.c:304
msgid "reset HEAD but keep local changes"
msgstr ""
-#: builtin/reset.c:309
+#: builtin/reset.c:310
msgid "record only the fact that removed paths will be added later"
msgstr ""
-#: builtin/reset.c:343
+#: builtin/reset.c:344
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr ""
-#: builtin/reset.c:351
+#: builtin/reset.c:352
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr ""
-#: builtin/reset.c:360
+#: builtin/reset.c:361
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr ""
-#: builtin/reset.c:370
+#: builtin/reset.c:371
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
-#: builtin/reset.c:372
+#: builtin/reset.c:373
#, c-format
msgid "Cannot do %s reset with paths."
msgstr ""
-#: builtin/reset.c:387
+#: builtin/reset.c:388
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr ""
-#: builtin/reset.c:391
+#: builtin/reset.c:392
msgid "-N can only be used with --mixed"
msgstr ""
-#: builtin/reset.c:412
+#: builtin/reset.c:413
msgid "Unstaged changes after reset:"
msgstr ""
-#: builtin/reset.c:415
+#: builtin/reset.c:416
#, c-format
msgid ""
"\n"
@@ -18608,48 +19837,48 @@
"to make this the default.\n"
msgstr ""
-#: builtin/reset.c:425
+#: builtin/reset.c:434
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr ""
-#: builtin/reset.c:429
+#: builtin/reset.c:439
msgid "Could not write new index file."
msgstr ""
-#: builtin/rev-list.c:499
+#: builtin/rev-list.c:534
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr ""
-#: builtin/rev-list.c:560
+#: builtin/rev-list.c:595
msgid "object filtering requires --objects"
msgstr ""
-#: builtin/rev-list.c:610
+#: builtin/rev-list.c:651
msgid "rev-list does not support display of notes"
msgstr ""
-#: builtin/rev-list.c:615
+#: builtin/rev-list.c:656
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"
@@ -18736,11 +19965,11 @@
msgid "keep redundant, empty commits"
msgstr ""
-#: builtin/revert.c:232
+#: builtin/revert.c:239
msgid "revert failed"
msgstr ""
-#: builtin/revert.c:245
+#: builtin/revert.c:252
msgid "cherry-pick failed"
msgstr ""
@@ -18828,55 +20057,76 @@
" --all and explicit <ref> specification are mutually exclusive."
msgstr ""
-#: builtin/send-pack.c:163
+#: builtin/send-pack.c:188
msgid "remote name"
msgstr ""
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:201
msgid "use stateless RPC protocol"
msgstr ""
-#: builtin/send-pack.c:178
+#: builtin/send-pack.c:202
msgid "read refs from stdin"
msgstr ""
-#: builtin/send-pack.c:179
+#: builtin/send-pack.c:203
msgid "print status from remote helper"
msgstr ""
-#: builtin/shortlog.c:14
+#: builtin/shortlog.c:16
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
msgstr ""
-#: builtin/shortlog.c:15
+#: builtin/shortlog.c:17
msgid "git log --pretty=short | git shortlog [<options>]"
msgstr ""
-#: builtin/shortlog.c:264
-msgid "Group by committer rather than author"
+#: builtin/shortlog.c:123
+msgid "using multiple --group options with stdin is not supported"
msgstr ""
-#: builtin/shortlog.c:266
+#: builtin/shortlog.c:133
+msgid "using --group=trailer with stdin is not supported"
+msgstr ""
+
+#: builtin/shortlog.c:323
+#, c-format
+msgid "unknown group type: %s"
+msgstr ""
+
+#: builtin/shortlog.c:351
+msgid "group by committer rather than author"
+msgstr ""
+
+#: builtin/shortlog.c:354
msgid "sort output according to the number of commits per author"
msgstr ""
-#: builtin/shortlog.c:268
-msgid "Suppress commit descriptions, only provides commit count"
+#: builtin/shortlog.c:356
+msgid "suppress commit descriptions, only provides commit count"
msgstr ""
-#: builtin/shortlog.c:270
-msgid "Show the email address of each author"
+#: builtin/shortlog.c:358
+msgid "show the email address of each author"
msgstr ""
-#: builtin/shortlog.c:271
+#: builtin/shortlog.c:359
msgid "<w>[,<i1>[,<i2>]]"
msgstr ""
-#: builtin/shortlog.c:272
-msgid "Linewrap output"
+#: builtin/shortlog.c:360
+msgid "linewrap output"
msgstr ""
-#: builtin/shortlog.c:301
+#: builtin/shortlog.c:362
+msgid "field"
+msgstr ""
+
+#: builtin/shortlog.c:363
+msgid "group by field"
+msgstr ""
+
+#: builtin/shortlog.c:391
msgid "too many arguments given outside repository"
msgstr ""
@@ -19010,6 +20260,14 @@
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 | --"
@@ -19053,17 +20311,25 @@
msgstr ""
#: builtin/sparse-checkout.c:21
-msgid "git sparse-checkout (init|list|set|add|disable) <options>"
+msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
msgstr ""
-#: builtin/sparse-checkout.c:64
+#: builtin/sparse-checkout.c:45
+msgid "git sparse-checkout list"
+msgstr ""
+
+#: builtin/sparse-checkout.c:71
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr ""
-#: builtin/sparse-checkout.c:225
+#: builtin/sparse-checkout.c:223
msgid "failed to create directory for sparse-checkout file"
msgstr ""
+#: builtin/sparse-checkout.c:264
+msgid "unable to upgrade repository format to enable worktreeConfig"
+msgstr ""
+
#: builtin/sparse-checkout.c:266
msgid "failed to set extensions.worktreeConfig setting"
msgstr ""
@@ -19076,46 +20342,42 @@
msgid "initialize the sparse-checkout in cone mode"
msgstr ""
-#: builtin/sparse-checkout.c:308
-msgid "initialize sparse-checkout"
-msgstr ""
-
-#: builtin/sparse-checkout.c:341
+#: builtin/sparse-checkout.c:339
#, c-format
msgid "failed to open '%s'"
msgstr ""
-#: builtin/sparse-checkout.c:398
+#: builtin/sparse-checkout.c:396
#, c-format
msgid "could not normalize path %s"
msgstr ""
-#: builtin/sparse-checkout.c:410
+#: builtin/sparse-checkout.c:408
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
msgstr ""
-#: builtin/sparse-checkout.c:435
+#: builtin/sparse-checkout.c:433
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr ""
-#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513
+#: builtin/sparse-checkout.c:487 builtin/sparse-checkout.c:511
msgid "unable to load existing sparse-checkout patterns"
msgstr ""
-#: builtin/sparse-checkout.c:558
+#: builtin/sparse-checkout.c:556
msgid "read patterns from standard in"
msgstr ""
-#: builtin/sparse-checkout.c:564
-msgid "set sparse-checkout patterns"
+#: builtin/sparse-checkout.c:571
+msgid "git sparse-checkout reapply"
msgstr ""
-#: builtin/sparse-checkout.c:581
-msgid "disable sparse-checkout"
+#: builtin/sparse-checkout.c:590
+msgid "git sparse-checkout disable"
msgstr ""
-#: builtin/sparse-checkout.c:593
+#: builtin/sparse-checkout.c:618
msgid "error while refreshing working directory"
msgstr ""
@@ -19186,7 +20448,7 @@
msgid "Too many revisions specified:%s"
msgstr ""
-#: builtin/stash.c:162 git-legacy-stash.sh:549
+#: builtin/stash.c:162
msgid "No stash entries found."
msgstr ""
@@ -19195,157 +20457,165 @@
msgid "%s is not a valid reference"
msgstr ""
-#: builtin/stash.c:225 git-legacy-stash.sh:75
-msgid "git stash clear with parameters is unimplemented"
+#: builtin/stash.c:225
+msgid "git stash clear with arguments is unimplemented"
msgstr ""
-#: builtin/stash.c:404
+#: builtin/stash.c:429
+#, c-format
+msgid ""
+"WARNING: Untracked file in way of tracked file! Renaming\n"
+" %s -> %s\n"
+" to make room.\n"
+msgstr ""
+
+#: builtin/stash.c:490
msgid "cannot apply a stash in the middle of a merge"
msgstr ""
-#: builtin/stash.c:415
+#: builtin/stash.c:501
#, c-format
msgid "could not generate diff %s^!."
msgstr ""
-#: builtin/stash.c:422
-msgid "conflicts in index.Try without --index."
+#: builtin/stash.c:508
+msgid "conflicts in index. Try without --index."
msgstr ""
-#: builtin/stash.c:428
+#: builtin/stash.c:514
msgid "could not save index tree"
msgstr ""
-#: builtin/stash.c:437
+#: builtin/stash.c:523
msgid "could not restore untracked files from stash"
msgstr ""
-#: builtin/stash.c:451
+#: builtin/stash.c:537
#, c-format
msgid "Merging %s with %s"
msgstr ""
-#: builtin/stash.c:461 git-legacy-stash.sh:681
+#: builtin/stash.c:547
msgid "Index was not unstashed."
msgstr ""
-#: builtin/stash.c:522 builtin/stash.c:621
+#: builtin/stash.c:589 builtin/stash.c:687
msgid "attempt to recreate the index"
msgstr ""
-#: builtin/stash.c:555
+#: builtin/stash.c:633
#, c-format
msgid "Dropped %s (%s)"
msgstr ""
-#: builtin/stash.c:558
+#: builtin/stash.c:636
#, c-format
msgid "%s: Could not drop stash entry"
msgstr ""
-#: builtin/stash.c:583
+#: builtin/stash.c:649
#, c-format
msgid "'%s' is not a stash reference"
msgstr ""
-#: builtin/stash.c:633 git-legacy-stash.sh:695
+#: builtin/stash.c:699
msgid "The stash entry is kept in case you need it again."
msgstr ""
-#: builtin/stash.c:656 git-legacy-stash.sh:713
+#: builtin/stash.c:722
msgid "No branch name specified"
msgstr ""
-#: builtin/stash.c:796 builtin/stash.c:833
+#: builtin/stash.c:866 builtin/stash.c:903
#, c-format
msgid "Cannot update %s with %s"
msgstr ""
-#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
+#: builtin/stash.c:884 builtin/stash.c:1538 builtin/stash.c:1603
msgid "stash message"
msgstr ""
-#: builtin/stash.c:824
+#: builtin/stash.c:894
msgid "\"git stash store\" requires one <commit> argument"
msgstr ""
-#: builtin/stash.c:1049 git-legacy-stash.sh:218
+#: builtin/stash.c:1109
msgid "No changes selected"
msgstr ""
-#: builtin/stash.c:1149 git-legacy-stash.sh:150
+#: builtin/stash.c:1209
msgid "You do not have the initial commit yet"
msgstr ""
-#: builtin/stash.c:1176 git-legacy-stash.sh:165
+#: builtin/stash.c:1236
msgid "Cannot save the current index state"
msgstr ""
-#: builtin/stash.c:1185 git-legacy-stash.sh:180
+#: builtin/stash.c:1245
msgid "Cannot save the untracked files"
msgstr ""
-#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201
-#: git-legacy-stash.sh:214
+#: builtin/stash.c:1256 builtin/stash.c:1265
msgid "Cannot save the current worktree state"
msgstr ""
-#: builtin/stash.c:1233 git-legacy-stash.sh:234
+#: builtin/stash.c:1293
msgid "Cannot record working tree state"
msgstr ""
-#: builtin/stash.c:1282 git-legacy-stash.sh:338
+#: builtin/stash.c:1342
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr ""
-#: builtin/stash.c:1298
+#: builtin/stash.c:1358
msgid "Did you forget to 'git add'?"
msgstr ""
-#: builtin/stash.c:1313 git-legacy-stash.sh:346
+#: builtin/stash.c:1373
msgid "No local changes to save"
msgstr ""
-#: builtin/stash.c:1320 git-legacy-stash.sh:351
+#: builtin/stash.c:1380
msgid "Cannot initialize stash"
msgstr ""
-#: builtin/stash.c:1335 git-legacy-stash.sh:355
+#: builtin/stash.c:1395
msgid "Cannot save the current status"
msgstr ""
-#: builtin/stash.c:1340
+#: builtin/stash.c:1400
#, c-format
msgid "Saved working directory and index state %s"
msgstr ""
-#: builtin/stash.c:1430 git-legacy-stash.sh:385
+#: builtin/stash.c:1490
msgid "Cannot remove worktree changes"
msgstr ""
-#: builtin/stash.c:1469 builtin/stash.c:1534
+#: builtin/stash.c:1529 builtin/stash.c:1594
msgid "keep index"
msgstr ""
-#: builtin/stash.c:1471 builtin/stash.c:1536
+#: builtin/stash.c:1531 builtin/stash.c:1596
msgid "stash in patch mode"
msgstr ""
-#: builtin/stash.c:1472 builtin/stash.c:1537
+#: builtin/stash.c:1532 builtin/stash.c:1597
msgid "quiet mode"
msgstr ""
-#: builtin/stash.c:1474 builtin/stash.c:1539
+#: builtin/stash.c:1534 builtin/stash.c:1599
msgid "include untracked files in stash"
msgstr ""
-#: builtin/stash.c:1476 builtin/stash.c:1541
+#: builtin/stash.c:1536 builtin/stash.c:1601
msgid "include ignore files"
msgstr ""
-#: builtin/stash.c:1600
-#, c-format
-msgid "could not exec %s"
+#: builtin/stash.c:1636
+msgid ""
+"the stash.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
msgstr ""
#: builtin/stripspace.c:18
@@ -19364,7 +20634,7 @@
msgid "prepend comment character and space to each line"
msgstr ""
-#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999
+#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr ""
@@ -19378,7 +20648,7 @@
msgid "cannot strip one component off url '%s'"
msgstr ""
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819
msgid "alternative anchor for relative paths"
msgstr ""
@@ -19386,8 +20656,8 @@
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629
+#: builtin/submodule--helper.c:652
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr ""
@@ -19413,11 +20683,12 @@
msgstr ""
#: builtin/submodule--helper.c:565
-msgid "Suppress output of entering each submodule command"
+msgid "suppress output of entering each submodule command"
msgstr ""
-#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063
-msgid "Recurse into nested submodules"
+#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888
+#: builtin/submodule--helper.c:1487
+msgid "recurse into nested submodules"
msgstr ""
#: builtin/submodule--helper.c:572
@@ -19431,151 +20702,200 @@
"authoritative upstream."
msgstr ""
-#: builtin/submodule--helper.c:667
+#: builtin/submodule--helper.c:666
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:671
+#: builtin/submodule--helper.c:670
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:681
+#: builtin/submodule--helper.c:680
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:688
+#: builtin/submodule--helper.c:687
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:710
-msgid "Suppress output for initializing a submodule"
+#: builtin/submodule--helper.c:709
+msgid "suppress output for initializing a submodule"
msgstr ""
-#: builtin/submodule--helper.c:715
+#: builtin/submodule--helper.c:714
msgid "git submodule--helper init [<options>] [<path>]"
msgstr ""
-#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
+#: 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:837
+#: builtin/submodule--helper.c:835
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199
-msgid "Suppress submodule status output"
+#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623
+msgid "suppress submodule status output"
msgstr ""
-#: builtin/submodule--helper.c:889
+#: builtin/submodule--helper.c:887
msgid ""
-"Use commit stored in the index instead of the one stored in the submodule "
+"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr ""
-#: builtin/submodule--helper.c:890
-msgid "recurse into nested submodules"
-msgstr ""
-
-#: builtin/submodule--helper.c:895
+#: builtin/submodule--helper.c:893
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:919
+#: builtin/submodule--helper.c:917
msgid "git submodule--helper name <path>"
msgstr ""
-#: builtin/submodule--helper.c:983
-#, c-format
-msgid "Synchronizing submodule url for '%s'\n"
-msgstr ""
-
#: 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:1413
+#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1003
+#: builtin/submodule--helper.c:1427
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1014
+#: builtin/submodule--helper.c:1438
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1061
-msgid "Suppress output of synchronizing submodule url"
+#: builtin/submodule--helper.c:1485
+msgid "suppress output of synchronizing submodule url"
msgstr ""
-#: builtin/submodule--helper.c:1068
+#: builtin/submodule--helper.c:1492
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr ""
-#: builtin/submodule--helper.c:1122
+#: 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:1134
+#: 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:1142
+#: builtin/submodule--helper.c:1566
#, c-format
msgid "Cleared directory '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1144
+#: builtin/submodule--helper.c:1568
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1155
+#: builtin/submodule--helper.c:1579
#, c-format
msgid "could not create empty submodule directory %s"
msgstr ""
-#: builtin/submodule--helper.c:1171
+#: builtin/submodule--helper.c:1595
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1200
-msgid "Remove submodule working trees even if they contain local changes"
+#: builtin/submodule--helper.c:1624
+msgid "remove submodule working trees even if they contain local changes"
msgstr ""
-#: builtin/submodule--helper.c:1201
-msgid "Unregister all submodules"
+#: builtin/submodule--helper.c:1625
+msgid "unregister all submodules"
msgstr ""
-#: builtin/submodule--helper.c:1206
+#: builtin/submodule--helper.c:1630
msgid ""
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
msgstr ""
-#: builtin/submodule--helper.c:1220
+#: builtin/submodule--helper.c:1644
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr ""
-#: builtin/submodule--helper.c:1289
+#: 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"
@@ -19583,198 +20903,231 @@
"'--reference-if-able' instead of '--reference'."
msgstr ""
-#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331
+#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr ""
-#: builtin/submodule--helper.c:1367
+#: builtin/submodule--helper.c:1791
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
-#: builtin/submodule--helper.c:1374
+#: builtin/submodule--helper.c:1798
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr ""
-#: builtin/submodule--helper.c:1398
+#: builtin/submodule--helper.c:1822
msgid "where the new submodule will be cloned to"
msgstr ""
-#: builtin/submodule--helper.c:1401
+#: builtin/submodule--helper.c:1825
msgid "name of the new submodule"
msgstr ""
-#: builtin/submodule--helper.c:1404
+#: builtin/submodule--helper.c:1828
msgid "url where to clone the submodule from"
msgstr ""
-#: builtin/submodule--helper.c:1412
+#: builtin/submodule--helper.c:1836
msgid "depth for shallow clones"
msgstr ""
-#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924
+#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348
msgid "force cloning progress"
msgstr ""
-#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926
+#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350
msgid "disallow cloning into non-empty directory"
msgstr ""
-#: builtin/submodule--helper.c:1424
+#: 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 ""
-#: builtin/submodule--helper.c:1449
+#: builtin/submodule--helper.c:1873
#, c-format
msgid "refusing to create/use '%s' in another submodule's git dir"
msgstr ""
-#: builtin/submodule--helper.c:1460
+#: builtin/submodule--helper.c:1884
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr ""
-#: builtin/submodule--helper.c:1464
+#: builtin/submodule--helper.c:1888
#, c-format
msgid "directory not empty: '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1476
+#: builtin/submodule--helper.c:1900
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1512
+#: builtin/submodule--helper.c:1936
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1516
+#: builtin/submodule--helper.c:1940
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1617
+#: builtin/submodule--helper.c:2041
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr ""
-#: builtin/submodule--helper.c:1621
+#: builtin/submodule--helper.c:2045
msgid "Maybe you want to use 'update --init'?"
msgstr ""
-#: builtin/submodule--helper.c:1651
+#: builtin/submodule--helper.c:2075
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr ""
-#: builtin/submodule--helper.c:1680
+#: builtin/submodule--helper.c:2104
#, c-format
msgid "Skipping submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1830
+#: builtin/submodule--helper.c:2254
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr ""
-#: builtin/submodule--helper.c:1841
+#: builtin/submodule--helper.c:2265
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr ""
-#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149
+#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573
msgid "path into the working tree"
msgstr ""
-#: builtin/submodule--helper.c:1906
+#: builtin/submodule--helper.c:2330
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
-#: builtin/submodule--helper.c:1910
+#: builtin/submodule--helper.c:2334
msgid "rebase, merge, checkout or none"
msgstr ""
-#: builtin/submodule--helper.c:1916
-msgid "Create a shallow clone truncated to the specified number of revisions"
+#: builtin/submodule--helper.c:2340
+msgid "create a shallow clone truncated to the specified number of revisions"
msgstr ""
-#: builtin/submodule--helper.c:1919
+#: builtin/submodule--helper.c:2343
msgid "parallel jobs"
msgstr ""
-#: builtin/submodule--helper.c:1921
+#: builtin/submodule--helper.c:2345
msgid "whether the initial clone should follow the shallow recommendation"
msgstr ""
-#: builtin/submodule--helper.c:1922
+#: builtin/submodule--helper.c:2346
msgid "don't print cloning progress"
msgstr ""
-#: builtin/submodule--helper.c:1933
+#: builtin/submodule--helper.c:2357
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:1946
+#: builtin/submodule--helper.c:2370
msgid "bad value for update parameter"
msgstr ""
-#: builtin/submodule--helper.c:1994
+#: 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:2117
+#: builtin/submodule--helper.c:2541
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:2150
+#: builtin/submodule--helper.c:2574
msgid "recurse into submodules"
msgstr ""
-#: builtin/submodule--helper.c:2156
+#: builtin/submodule--helper.c:2580
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:2212
+#: builtin/submodule--helper.c:2636
msgid "check if it is safe to write to the .gitmodules file"
msgstr ""
-#: builtin/submodule--helper.c:2215
+#: builtin/submodule--helper.c:2639
msgid "unset the config in the .gitmodules file"
msgstr ""
-#: builtin/submodule--helper.c:2220
+#: builtin/submodule--helper.c:2644
msgid "git submodule--helper config <name> [<value>]"
msgstr ""
-#: builtin/submodule--helper.c:2221
+#: builtin/submodule--helper.c:2645
msgid "git submodule--helper config --unset <name>"
msgstr ""
-#: builtin/submodule--helper.c:2222
+#: builtin/submodule--helper.c:2646
msgid "git submodule--helper config --check-writeable"
msgstr ""
-#: builtin/submodule--helper.c:2241 git-submodule.sh:174
+#: builtin/submodule--helper.c:2665 git-submodule.sh:150
#, sh-format
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr ""
-#: builtin/submodule--helper.c:2291 git.c:433 git.c:684
+#: builtin/submodule--helper.c: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:441 git.c:714
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr ""
-#: builtin/submodule--helper.c:2297
+#: builtin/submodule--helper.c:2798
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr ""
@@ -19799,11 +21152,11 @@
msgid "shorten ref output"
msgstr ""
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
msgid "reason"
msgstr ""
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
msgid "reason of the update"
msgstr ""
@@ -19821,7 +21174,8 @@
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
@@ -19833,12 +21187,12 @@
msgid "tag '%s' not found."
msgstr ""
-#: builtin/tag.c:105
+#: builtin/tag.c:124
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr ""
-#: builtin/tag.c:135
+#: builtin/tag.c:159
#, c-format
msgid ""
"\n"
@@ -19847,7 +21201,7 @@
"Lines starting with '%c' will be ignored.\n"
msgstr ""
-#: builtin/tag.c:139
+#: builtin/tag.c:163
#, c-format
msgid ""
"\n"
@@ -19857,15 +21211,11 @@
"want to.\n"
msgstr ""
-#: builtin/tag.c:198
+#: builtin/tag.c:230
msgid "unable to sign the tag"
msgstr ""
-#: builtin/tag.c:200
-msgid "unable to write tag file"
-msgstr ""
-
-#: builtin/tag.c:216
+#: builtin/tag.c:248
#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
@@ -19874,138 +21224,134 @@
"\tgit tag -f %s %s^{}"
msgstr ""
-#: builtin/tag.c:232
+#: builtin/tag.c:264
msgid "bad object type."
msgstr ""
-#: builtin/tag.c:284
+#: builtin/tag.c:317
msgid "no tag message?"
msgstr ""
-#: builtin/tag.c:291
+#: builtin/tag.c:324
#, c-format
msgid "The tag message has been left in %s\n"
msgstr ""
-#: builtin/tag.c:402
+#: builtin/tag.c:435
msgid "list tag names"
msgstr ""
-#: builtin/tag.c:404
+#: builtin/tag.c:437
msgid "print <n> lines of each tag message"
msgstr ""
-#: builtin/tag.c:406
+#: builtin/tag.c:439
msgid "delete tags"
msgstr ""
-#: builtin/tag.c:407
+#: builtin/tag.c:440
msgid "verify tags"
msgstr ""
-#: builtin/tag.c:409
+#: builtin/tag.c:442
msgid "Tag creation options"
msgstr ""
-#: builtin/tag.c:411
+#: builtin/tag.c:444
msgid "annotated tag, needs a message"
msgstr ""
-#: builtin/tag.c:413
+#: builtin/tag.c:446
msgid "tag message"
msgstr ""
-#: builtin/tag.c:415
+#: builtin/tag.c:448
msgid "force edit of tag message"
msgstr ""
-#: builtin/tag.c:416
+#: builtin/tag.c:449
msgid "annotated and GPG-signed tag"
msgstr ""
-#: builtin/tag.c:419
+#: builtin/tag.c:452
msgid "use another key to sign the tag"
msgstr ""
-#: builtin/tag.c:420
+#: builtin/tag.c:453
msgid "replace the tag if exists"
msgstr ""
-#: builtin/tag.c:421 builtin/update-ref.c:369
+#: builtin/tag.c:454 builtin/update-ref.c:505
msgid "create a reflog"
msgstr ""
-#: builtin/tag.c:423
+#: builtin/tag.c:456
msgid "Tag listing options"
msgstr ""
-#: builtin/tag.c:424
+#: builtin/tag.c:457
msgid "show tag list in columns"
msgstr ""
-#: builtin/tag.c:425 builtin/tag.c:427
+#: builtin/tag.c:458 builtin/tag.c:460
msgid "print only tags that contain the commit"
msgstr ""
-#: builtin/tag.c:426 builtin/tag.c:428
+#: builtin/tag.c:459 builtin/tag.c:461
msgid "print only tags that don't contain the commit"
msgstr ""
-#: builtin/tag.c:429
+#: builtin/tag.c:462
msgid "print only tags that are merged"
msgstr ""
-#: builtin/tag.c:430
+#: builtin/tag.c:463
msgid "print only tags that are not merged"
msgstr ""
-#: builtin/tag.c:434
+#: builtin/tag.c:467
msgid "print only tags of the object"
msgstr ""
-#: builtin/tag.c:482
+#: builtin/tag.c:515
msgid "--column and -n are incompatible"
msgstr ""
-#: builtin/tag.c:504
+#: builtin/tag.c:537
msgid "-n option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:506
+#: builtin/tag.c:539
msgid "--contains option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:508
+#: builtin/tag.c:541
msgid "--no-contains option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:510
+#: builtin/tag.c:543
msgid "--points-at option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:512
+#: builtin/tag.c:545
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr ""
-#: builtin/tag.c:523
+#: builtin/tag.c:556
msgid "only one -F or -m option is allowed."
msgstr ""
-#: builtin/tag.c:542
-msgid "too many params"
-msgstr ""
-
-#: builtin/tag.c:548
+#: builtin/tag.c:581
#, c-format
msgid "'%s' is not a valid tag name."
msgstr ""
-#: builtin/tag.c:553
+#: builtin/tag.c:586
#, c-format
msgid "tag '%s' already exists"
msgstr ""
-#: builtin/tag.c:584
+#: builtin/tag.c:617
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr ""
@@ -20269,19 +21615,19 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr ""
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:500
msgid "delete the reference"
msgstr ""
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:502
msgid "update <refname> not the one it points to"
msgstr ""
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:503
msgid "stdin has NUL-terminated arguments"
msgstr ""
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:504
msgid "read updates from stdin"
msgstr ""
@@ -20325,15 +21671,15 @@
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 ""
@@ -20345,276 +21691,266 @@
msgid "print tag contents"
msgstr ""
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr ""
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree list [<options>]"
msgstr ""
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree lock [<options>] <path>"
msgstr ""
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree move <worktree> <new-path>"
msgstr ""
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree prune [<options>]"
msgstr ""
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree remove [<options>] <worktree>"
msgstr ""
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree unlock <path>"
msgstr ""
-#: builtin/worktree.c:60 builtin/worktree.c:891
+#: builtin/worktree.c:61 builtin/worktree.c:933
#, c-format
msgid "failed to delete '%s'"
msgstr ""
-#: builtin/worktree.c:79
+#: builtin/worktree.c:74
#, c-format
-msgid "Removing worktrees/%s: not a valid directory"
+msgid "Removing %s/%s: %s"
msgstr ""
-#: builtin/worktree.c:85
-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
-msgstr ""
-
-#: builtin/worktree.c:90 builtin/worktree.c:99
-#, c-format
-msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
-msgstr ""
-
-#: builtin/worktree.c:109
-#, c-format
-msgid ""
-"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
-"%<PRIuMAX>)"
-msgstr ""
-
-#: builtin/worktree.c:117
-#, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
-msgstr ""
-
-#: builtin/worktree.c:126
-#, c-format
-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
-msgstr ""
-
-#: builtin/worktree.c:165
+#: builtin/worktree.c:149
msgid "report pruned working trees"
msgstr ""
-#: builtin/worktree.c:167
+#: builtin/worktree.c:151
msgid "expire working trees older than <time>"
msgstr ""
-#: builtin/worktree.c:234
+#: builtin/worktree.c:221
#, c-format
msgid "'%s' already exists"
msgstr ""
-#: builtin/worktree.c:244
+#: builtin/worktree.c:230
#, c-format
-msgid "unable to re-add worktree '%s'"
+msgid "unusable worktree destination '%s'"
msgstr ""
-#: builtin/worktree.c:249
+#: builtin/worktree.c:235
#, 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:251
+#: builtin/worktree.c:237
#, 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:301
+#: builtin/worktree.c:288
#, c-format
msgid "could not create directory of '%s'"
msgstr ""
-#: builtin/worktree.c:432 builtin/worktree.c:438
+#: builtin/worktree.c:422 builtin/worktree.c:428
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr ""
-#: builtin/worktree.c:434
+#: builtin/worktree.c:424
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
-#: builtin/worktree.c:443
+#: builtin/worktree.c:433
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr ""
-#: builtin/worktree.c:449
+#: builtin/worktree.c:439
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr ""
-#: builtin/worktree.c:490
+#: builtin/worktree.c:480
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
-#: builtin/worktree.c:493
+#: builtin/worktree.c:483
msgid "create a new branch"
msgstr ""
-#: builtin/worktree.c:495
+#: builtin/worktree.c:485
msgid "create or reset a branch"
msgstr ""
-#: builtin/worktree.c:497
+#: builtin/worktree.c:487
msgid "populate the new working tree"
msgstr ""
-#: builtin/worktree.c:498
+#: builtin/worktree.c:488
msgid "keep the new working tree locked"
msgstr ""
-#: builtin/worktree.c:501
+#: builtin/worktree.c:491
msgid "set up tracking mode (see git-branch(1))"
msgstr ""
-#: builtin/worktree.c:504
+#: builtin/worktree.c:494
msgid "try to match the new branch name with a remote-tracking branch"
msgstr ""
-#: builtin/worktree.c:512
+#: builtin/worktree.c:502
msgid "-b, -B, and --detach are mutually exclusive"
msgstr ""
-#: builtin/worktree.c:573
+#: builtin/worktree.c:563
msgid "--[no-]track can only be used if a new branch is created"
msgstr ""
-#: builtin/worktree.c:673
+#: builtin/worktree.c:680
+msgid "show extended annotations and reasons, if available"
+msgstr ""
+
+#: builtin/worktree.c:682
+msgid "add 'prunable' annotation to worktrees older than <time>"
+msgstr ""
+
+#: builtin/worktree.c:691
+msgid "--verbose and --porcelain are mutually exclusive"
+msgstr ""
+
+#: builtin/worktree.c:718
msgid "reason for locking"
msgstr ""
-#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
-#: builtin/worktree.c:919
+#: builtin/worktree.c:730 builtin/worktree.c:763 builtin/worktree.c:837
+#: builtin/worktree.c:961
#, c-format
msgid "'%s' is not a working tree"
msgstr ""
-#: builtin/worktree.c:687 builtin/worktree.c:720
+#: builtin/worktree.c:732 builtin/worktree.c:765
msgid "The main working tree cannot be locked or unlocked"
msgstr ""
-#: builtin/worktree.c:692
+#: builtin/worktree.c:737
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr ""
-#: builtin/worktree.c:694
+#: builtin/worktree.c:739
#, c-format
msgid "'%s' is already locked"
msgstr ""
-#: builtin/worktree.c:722
+#: builtin/worktree.c:767
#, c-format
msgid "'%s' is not locked"
msgstr ""
-#: builtin/worktree.c:763
+#: builtin/worktree.c:808
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
-#: builtin/worktree.c:771
+#: builtin/worktree.c:816
msgid "force move even if worktree is dirty or locked"
msgstr ""
-#: builtin/worktree.c:794 builtin/worktree.c:921
+#: builtin/worktree.c:839 builtin/worktree.c:963
#, c-format
msgid "'%s' is a main working tree"
msgstr ""
-#: builtin/worktree.c:799
+#: builtin/worktree.c:844
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr ""
-#: builtin/worktree.c:805
-#, c-format
-msgid "target '%s' already exists"
-msgstr ""
-
-#: builtin/worktree.c:813
+#: builtin/worktree.c:857
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:815
+#: builtin/worktree.c:859
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:818
+#: builtin/worktree.c:862
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr ""
-#: builtin/worktree.c:823
+#: builtin/worktree.c:867
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr ""
-#: builtin/worktree.c:871
+#: builtin/worktree.c:913
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr ""
-#: builtin/worktree.c:875
+#: builtin/worktree.c:917
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
-#: builtin/worktree.c:880
+#: builtin/worktree.c:922
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr ""
-#: builtin/worktree.c:903
+#: builtin/worktree.c:945
msgid "force removal even if worktree is dirty or locked"
msgstr ""
-#: builtin/worktree.c:926
+#: builtin/worktree.c:968
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:928
+#: builtin/worktree.c:970
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:931
+#: builtin/worktree.c:973
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr ""
+#: builtin/worktree.c:997
+#, c-format
+msgid "repair: %s: %s"
+msgstr ""
+
+#: builtin/worktree.c:1000
+#, c-format
+msgid "error: %s: %s"
+msgstr ""
+
#: builtin/write-tree.c:15
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr ""
@@ -20631,40 +21967,37 @@
msgid "only useful for debugging"
msgstr ""
-#: fast-import.c:3125
+#: http-fetch.c:118
#, c-format
-msgid "Expected 'mark' command, got %s"
+msgid "argument to --packfile must be a valid hash (got '%s')"
msgstr ""
-#: fast-import.c:3130
-#, c-format
-msgid "Expected 'to' command, got %s"
+#: http-fetch.c:128
+msgid "not a git repository"
msgstr ""
-#: fast-import.c:3254
-#, c-format
-msgid "feature '%s' forbidden in input without --allow-unsafe-features"
+#: http-fetch.c:134
+msgid "--packfile requires --index-pack-args"
msgstr ""
-#: credential-cache--daemon.c:223
-#, c-format
-msgid ""
-"The permissions on your socket directory are too loose; other\n"
-"users may be able to read your cached credentials. Consider running:\n"
-"\n"
-"\tchmod 0700 %s"
+#: http-fetch.c:143
+msgid "--index-pack-args can only be used with --packfile"
msgstr ""
-#: credential-cache--daemon.c:272
-msgid "print debugging messages to stderr"
+#: t/helper/test-fast-rebase.c:141
+msgid "unhandled options"
msgstr ""
-#: t/helper/test-reach.c:152
+#: t/helper/test-fast-rebase.c:146
+msgid "error preparing revisions"
+msgstr ""
+
+#: 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 ""
@@ -20676,17 +22009,18 @@
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"
" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
"bare]\n"
" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
" <command> [<args>]"
msgstr ""
-#: git.c:34
+#: git.c:36
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"
@@ -20694,139 +22028,139 @@
"See 'git help git' for an overview of the system."
msgstr ""
-#: git.c:186
+#: git.c:188
#, c-format
msgid "no directory given for --git-dir\n"
msgstr ""
-#: git.c:200
+#: git.c:202
#, c-format
msgid "no namespace given for --namespace\n"
msgstr ""
-#: git.c:214
+#: git.c:216
#, c-format
msgid "no directory given for --work-tree\n"
msgstr ""
-#: git.c:228
+#: git.c:230
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr ""
-#: git.c:250
+#: git.c:252
#, c-format
msgid "-c expects a configuration string\n"
msgstr ""
-#: git.c:288
+#: git.c:292
#, c-format
msgid "no directory given for -C\n"
msgstr ""
-#: git.c:314
+#: git.c:318
#, c-format
msgid "unknown option: %s\n"
msgstr ""
-#: git.c:360
+#: git.c:367
#, c-format
msgid "while expanding alias '%s': '%s'"
msgstr ""
-#: git.c:369
+#: git.c:376
#, c-format
msgid ""
"alias '%s' changes environment variables.\n"
"You can use '!git' in the alias to do this"
msgstr ""
-#: git.c:376
+#: git.c:383
#, c-format
msgid "empty alias for %s"
msgstr ""
-#: git.c:379
+#: git.c:386
#, c-format
msgid "recursive alias: %s"
msgstr ""
-#: git.c:459
+#: git.c:468
msgid "write failure on standard output"
msgstr ""
-#: git.c:461
+#: git.c:470
msgid "unknown write failure on standard output"
msgstr ""
-#: git.c:463
+#: git.c:472
msgid "close failed on standard output"
msgstr ""
-#: git.c:793
+#: git.c:823
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr ""
-#: git.c:843
+#: git.c:873
#, c-format
msgid "cannot handle %s as a builtin"
msgstr ""
-#: git.c:856
+#: git.c:886
#, c-format
msgid ""
"usage: %s\n"
"\n"
msgstr ""
-#: git.c:876
+#: git.c:906
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
-#: git.c:888
+#: git.c:918
#, 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:1086
+#: http.c:1132
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr ""
-#: http.c:1093
+#: http.c:1139
#, c-format
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
msgstr ""
-#: http.c:1097
+#: http.c:1143
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr ""
-#: http.c:1966
+#: http.c:2025
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -20834,120 +22168,151 @@
" redirect: %s"
msgstr ""
-#: remote-curl.c:166
+#: remote-curl.c:183
#, c-format
msgid "invalid quoting in push-option value: '%s'"
msgstr ""
-#: remote-curl.c:263
+#: remote-curl.c:307
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr ""
-#: remote-curl.c:364
+#: remote-curl.c:408
msgid "invalid server response; expected service, got flush packet"
msgstr ""
-#: remote-curl.c:395
+#: remote-curl.c:439
#, c-format
msgid "invalid server response; got '%s'"
msgstr ""
-#: remote-curl.c:455
+#: remote-curl.c:499
#, c-format
msgid "repository '%s' not found"
msgstr ""
-#: remote-curl.c:459
+#: remote-curl.c:503
#, c-format
msgid "Authentication failed for '%s'"
msgstr ""
-#: remote-curl.c:463
+#: remote-curl.c:507
#, c-format
msgid "unable to access '%s': %s"
msgstr ""
-#: remote-curl.c:469
+#: remote-curl.c:513
#, c-format
msgid "redirecting to %s"
msgstr ""
-#: remote-curl.c:593
+#: remote-curl.c:642
msgid "shouldn't have EOF when not gentle on EOF"
msgstr ""
-#: remote-curl.c:673
+#: remote-curl.c:654
+msgid "remote server sent stateless separator"
+msgstr ""
+
+#: remote-curl.c:724
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr ""
-#: remote-curl.c:733
+#: remote-curl.c:754
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr ""
+
+#: remote-curl.c:756
+msgid "remote-curl: unexpected response end packet"
+msgstr ""
+
+#: remote-curl.c:832
#, c-format
msgid "RPC failed; %s"
msgstr ""
-#: remote-curl.c:773
+#: remote-curl.c:872
msgid "cannot handle pushes this big"
msgstr ""
-#: remote-curl.c:888
+#: remote-curl.c:987
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr ""
-#: remote-curl.c:892
+#: remote-curl.c:991
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr ""
-#: remote-curl.c:1023
+#: remote-curl.c:1041
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr ""
+
+#: remote-curl.c:1043
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr ""
+
+#: remote-curl.c:1132
msgid "dumb http transport does not support shallow capabilities"
msgstr ""
-#: remote-curl.c:1038
+#: remote-curl.c:1147
msgid "fetch failed."
msgstr ""
-#: remote-curl.c:1086
+#: remote-curl.c:1193
msgid "cannot fetch by sha1 over smart http"
msgstr ""
-#: remote-curl.c:1130 remote-curl.c:1136
+#: remote-curl.c:1237 remote-curl.c:1243
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr ""
-#: remote-curl.c:1148 remote-curl.c:1263
+#: remote-curl.c:1255 remote-curl.c:1373
#, c-format
msgid "http transport does not support %s"
msgstr ""
-#: remote-curl.c:1184
+#: remote-curl.c:1291
msgid "git-http-push failed"
msgstr ""
-#: remote-curl.c:1369
+#: remote-curl.c:1479
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr ""
-#: remote-curl.c:1401
+#: remote-curl.c:1511
msgid "remote-curl: error reading command stream from git"
msgstr ""
-#: remote-curl.c:1408
+#: remote-curl.c:1518
msgid "remote-curl: fetch attempted without a local repo"
msgstr ""
-#: remote-curl.c:1448
+#: remote-curl.c:1559
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr ""
-#: list-objects-filter-options.h:85
+#: 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:86
+#: list-objects-filter-options.h:92
msgid "object filtering"
msgstr ""
@@ -20968,7 +22333,7 @@
msgstr ""
#: parse-options.h:317
-msgid "use <n> digits to display SHA-1s"
+msgid "use <n> digits to display object names"
msgstr ""
#: parse-options.h:336
@@ -20984,11 +22349,11 @@
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr ""
-#: ref-filter.h:101
+#: ref-filter.h:99
msgid "key"
msgstr ""
-#: ref-filter.h:101
+#: ref-filter.h:99
msgid "field name to sort on"
msgstr ""
@@ -20996,14 +22361,6 @@
msgid "update the index with reused conflict resolution if possible"
msgstr ""
-#: wt-status.h:67
-msgid "HEAD detached at "
-msgstr ""
-
-#: wt-status.h:68
-msgid "HEAD detached from "
-msgstr ""
-
#: command-list.h:50
msgid "Add file contents to the index"
msgstr ""
@@ -21041,700 +22398,676 @@
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 "Run a Git command on a list of repositories"
msgstr ""
#: command-list.h:100
-msgid "Cleanup unnecessary files and optimize the local repository"
+msgid "Prepare patches for e-mail submission"
msgstr ""
#: command-list.h:101
-msgid "Extract commit ID from an archive created using git-archive"
+msgid "Verifies the connectivity and validity of the objects in the database"
msgstr ""
#: command-list.h:102
-msgid "Print lines matching a pattern"
+msgid "Cleanup unnecessary files and optimize the local repository"
msgstr ""
#: command-list.h:103
-msgid "A portable graphical interface to Git"
+msgid "Extract commit ID from an archive created using git-archive"
msgstr ""
#: command-list.h:104
-msgid "Compute object ID and optionally creates a blob from a file"
+msgid "Print lines matching a pattern"
msgstr ""
#: command-list.h:105
-msgid "Display help information about Git"
+msgid "A portable graphical interface to Git"
msgstr ""
#: command-list.h:106
-msgid "Server side implementation of Git over HTTP"
+msgid "Compute object ID and optionally creates a blob from a file"
msgstr ""
#: command-list.h:107
-msgid "Download from a remote Git repository via HTTP"
+msgid "Display help information about Git"
msgstr ""
#: command-list.h:108
-msgid "Push objects over HTTP/DAV to another repository"
+msgid "Server side implementation of Git over HTTP"
msgstr ""
#: command-list.h:109
-msgid "Send a collection of patches from stdin to an IMAP folder"
+msgid "Download from a remote Git repository via HTTP"
msgstr ""
#: command-list.h:110
-msgid "Build pack index file for an existing packed archive"
+msgid "Push objects over HTTP/DAV to another repository"
msgstr ""
#: command-list.h:111
-msgid "Create an empty Git repository or reinitialize an existing one"
+msgid "Send a collection of patches from stdin to an IMAP folder"
msgstr ""
#: command-list.h:112
-msgid "Instantly browse your working repository in gitweb"
+msgid "Build pack index file for an existing packed archive"
msgstr ""
#: command-list.h:113
-msgid "Add or parse structured information in commit messages"
+msgid "Create an empty Git repository or reinitialize an existing one"
msgstr ""
#: command-list.h:114
-msgid "The Git repository browser"
+msgid "Instantly browse your working repository in gitweb"
msgstr ""
#: command-list.h:115
-msgid "Show commit logs"
+msgid "Add or parse structured information in commit messages"
msgstr ""
#: command-list.h:116
-msgid "Show information about files in the index and the working tree"
+msgid "The Git repository browser"
msgstr ""
#: command-list.h:117
-msgid "List references in a remote repository"
+msgid "Show commit logs"
msgstr ""
#: command-list.h:118
-msgid "List the contents of a tree object"
+msgid "Show information about files in the index and the working tree"
msgstr ""
#: command-list.h:119
-msgid "Extracts patch and authorship from a single e-mail message"
+msgid "List references in a remote repository"
msgstr ""
#: command-list.h:120
-msgid "Simple UNIX mbox splitter program"
+msgid "List the contents of a tree object"
msgstr ""
#: command-list.h:121
-msgid "Join two or more development histories together"
+msgid "Extracts patch and authorship from a single e-mail message"
msgstr ""
#: command-list.h:122
-msgid "Find as good common ancestors as possible for a merge"
+msgid "Simple UNIX mbox splitter program"
msgstr ""
#: command-list.h:123
-msgid "Run a three-way file merge"
+msgid "Run tasks to optimize Git repository data"
msgstr ""
#: command-list.h:124
-msgid "Run a merge for files needing merging"
+msgid "Join two or more development histories together"
msgstr ""
#: command-list.h:125
-msgid "The standard helper program to use with git-merge-index"
+msgid "Find as good common ancestors as possible for a merge"
msgstr ""
#: command-list.h:126
-msgid "Run merge conflict resolution tools to resolve merge conflicts"
+msgid "Run a three-way file merge"
msgstr ""
#: command-list.h:127
-msgid "Show three-way merge without touching index"
+msgid "Run a merge for files needing merging"
msgstr ""
#: command-list.h:128
-msgid "Write and verify multi-pack-indexes"
+msgid "The standard helper program to use with git-merge-index"
msgstr ""
#: command-list.h:129
-msgid "Creates a tag object"
+msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr ""
#: command-list.h:130
-msgid "Build a tree-object from ls-tree formatted text"
+msgid "Show three-way merge without touching index"
msgstr ""
#: command-list.h:131
-msgid "Move or rename a file, a directory, or a symlink"
+msgid "Write and verify multi-pack-indexes"
msgstr ""
#: command-list.h:132
-msgid "Find symbolic names for given revs"
+msgid "Creates a tag object with extra validation"
msgstr ""
#: command-list.h:133
-msgid "Add or inspect object notes"
+msgid "Build a tree-object from ls-tree formatted text"
msgstr ""
#: command-list.h:134
-msgid "Import from and submit to Perforce repositories"
+msgid "Move or rename a file, a directory, or a symlink"
msgstr ""
#: command-list.h:135
-msgid "Create a packed archive of objects"
+msgid "Find symbolic names for given revs"
msgstr ""
#: command-list.h:136
-msgid "Find redundant pack files"
+msgid "Add or inspect object notes"
msgstr ""
#: command-list.h:137
-msgid "Pack heads and tags for efficient repository access"
+msgid "Import from and submit to Perforce repositories"
msgstr ""
#: command-list.h:138
-msgid "Routines to help parsing remote repository access parameters"
+msgid "Create a packed archive of objects"
msgstr ""
#: command-list.h:139
-msgid "Compute unique ID for a patch"
+msgid "Find redundant pack files"
msgstr ""
#: command-list.h:140
-msgid "Prune all unreachable objects from the object database"
+msgid "Pack heads and tags for efficient repository access"
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 "Initialize and modify the sparse-checkout"
+msgid "Git's i18n setup code for shell scripts"
msgstr ""
#: command-list.h:172
-msgid "Stash the changes in a dirty working directory away"
+msgid "Common Git shell script setup code"
msgstr ""
#: command-list.h:173
-msgid "Add file contents to the staging area"
+msgid "Initialize and modify the sparse-checkout"
msgstr ""
#: command-list.h:174
-msgid "Show the working tree status"
+msgid "Stash the changes in a dirty working directory away"
msgstr ""
#: command-list.h:175
-msgid "Remove unnecessary whitespace"
+msgid "Add file contents to the staging area"
msgstr ""
#: command-list.h:176
-msgid "Initialize, update or inspect submodules"
+msgid "Show the working tree status"
msgstr ""
#: command-list.h:177
-msgid "Bidirectional operation between a Subversion repository and Git"
+msgid "Remove unnecessary whitespace"
msgstr ""
#: command-list.h:178
-msgid "Switch branches"
+msgid "Initialize, update or inspect submodules"
msgstr ""
#: command-list.h:179
-msgid "Read, modify and delete symbolic refs"
+msgid "Bidirectional operation between a Subversion repository and Git"
msgstr ""
#: command-list.h:180
-msgid "Create, list, delete or verify a tag object signed with GPG"
+msgid "Switch branches"
msgstr ""
#: command-list.h:181
-msgid "Creates a temporary file with a blob's contents"
+msgid "Read, modify and delete symbolic refs"
msgstr ""
#: command-list.h:182
-msgid "Unpack objects from a packed archive"
+msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr ""
#: command-list.h:183
-msgid "Register file contents in the working tree to the index"
+msgid "Creates a temporary file with a blob's contents"
msgstr ""
#: command-list.h:184
-msgid "Update the object name stored in a ref safely"
+msgid "Unpack objects from a packed archive"
msgstr ""
#: command-list.h:185
-msgid "Update auxiliary info file to help dumb servers"
+msgid "Register file contents in the working tree to the index"
msgstr ""
#: command-list.h:186
-msgid "Send archive back to git-archive"
+msgid "Update the object name stored in a ref safely"
msgstr ""
#: command-list.h:187
-msgid "Send objects packed back to git-fetch-pack"
+msgid "Update auxiliary info file to help dumb servers"
msgstr ""
#: command-list.h:188
-msgid "Show a Git logical variable"
+msgid "Send archive back to git-archive"
msgstr ""
#: command-list.h:189
-msgid "Check the GPG signature of commits"
+msgid "Send objects packed back to git-fetch-pack"
msgstr ""
#: command-list.h:190
-msgid "Validate packed Git archive files"
+msgid "Show a Git logical variable"
msgstr ""
#: command-list.h:191
-msgid "Check the GPG signature of tags"
+msgid "Check the GPG signature of commits"
msgstr ""
#: command-list.h:192
-msgid "Git web interface (web frontend to Git repositories)"
+msgid "Validate packed Git archive files"
msgstr ""
#: command-list.h:193
-msgid "Show logs with difference each commit introduces"
+msgid "Check the GPG signature of tags"
msgstr ""
#: command-list.h:194
-msgid "Manage multiple working trees"
+msgid "Git web interface (web frontend to Git repositories)"
msgstr ""
#: command-list.h:195
-msgid "Create a tree object from the current index"
+msgid "Show logs with difference each commit introduces"
msgstr ""
#: command-list.h:196
-msgid "Defining attributes per path"
+msgid "Manage multiple working trees"
msgstr ""
#: command-list.h:197
-msgid "Git command-line interface and conventions"
+msgid "Create a tree object from the current index"
msgstr ""
#: command-list.h:198
-msgid "A Git core tutorial for developers"
+msgid "Defining attributes per path"
msgstr ""
#: command-list.h:199
-msgid "Git for CVS users"
+msgid "Git command-line interface and conventions"
msgstr ""
#: command-list.h:200
-msgid "Tweaking diff output"
+msgid "A Git core tutorial for developers"
msgstr ""
#: command-list.h:201
-msgid "A useful minimum set of commands for Everyday Git"
+msgid "Providing usernames and passwords to Git"
msgstr ""
#: command-list.h:202
-msgid "A Git Glossary"
+msgid "Git for CVS users"
msgstr ""
#: command-list.h:203
-msgid "Hooks used by Git"
+msgid "Tweaking diff output"
msgstr ""
#: command-list.h:204
-msgid "Specifies intentionally untracked files to ignore"
+msgid "A useful minimum set of commands for Everyday Git"
msgstr ""
#: command-list.h:205
-msgid "Defining submodule properties"
+msgid "Frequently asked questions about using Git"
msgstr ""
#: command-list.h:206
-msgid "Git namespaces"
+msgid "A Git Glossary"
msgstr ""
#: command-list.h:207
-msgid "Git Repository Layout"
+msgid "Hooks used by Git"
msgstr ""
#: command-list.h:208
-msgid "Specifying revisions and ranges for Git"
+msgid "Specifies intentionally untracked files to ignore"
msgstr ""
#: command-list.h:209
-msgid "Mounting one repository inside another"
+msgid "Map author/committer names and/or E-Mail addresses"
msgstr ""
#: command-list.h:210
-msgid "A tutorial introduction to Git: part two"
+msgid "Defining submodule properties"
msgstr ""
#: command-list.h:211
-msgid "A tutorial introduction to Git"
+msgid "Git namespaces"
msgstr ""
#: command-list.h:212
+msgid "Helper programs to interact with remote repositories"
+msgstr ""
+
+#: command-list.h:213
+msgid "Git Repository Layout"
+msgstr ""
+
+#: command-list.h:214
+msgid "Specifying revisions and ranges for Git"
+msgstr ""
+
+#: command-list.h:215
+msgid "Mounting one repository inside another"
+msgstr ""
+
+#: command-list.h:216
+msgid "A tutorial introduction to Git: part two"
+msgstr ""
+
+#: command-list.h:217
+msgid "A tutorial introduction to Git"
+msgstr ""
+
+#: command-list.h:218
msgid "An overview of recommended workflows with Git"
msgstr ""
-#: git-bisect.sh:54
-msgid "You need to start by \"git bisect start\""
-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 ""
-
-#: git-bisect.sh:101
-#, sh-format
-msgid "Bad rev input: $arg"
-msgstr ""
-
-#: git-bisect.sh:121
-#, sh-format
-msgid "Bad rev input: $bisected_head"
-msgstr ""
-
-#: git-bisect.sh:130
-#, sh-format
-msgid "Bad rev input: $rev"
-msgstr ""
-
-#: git-bisect.sh:139
-#, sh-format
-msgid "'git bisect $TERM_BAD' can take only one argument."
-msgstr ""
-
-#: git-bisect.sh:209
-msgid "No logfile given"
-msgstr ""
-
-#: git-bisect.sh:210
-#, sh-format
-msgid "cannot read $file for replaying"
-msgstr ""
-
-#: git-bisect.sh:232
-msgid "?? what are you talking about?"
-msgstr ""
-
-#: git-bisect.sh:241
+#: git-bisect.sh:68
msgid "bisect run failed: no command provided."
msgstr ""
-#: git-bisect.sh:246
+#: git-bisect.sh:73
#, sh-format
msgid "running $command"
msgstr ""
-#: git-bisect.sh:253
+#: git-bisect.sh:80
#, sh-format
msgid ""
"bisect run failed:\n"
"exit code $res from '$command' is < 0 or >= 128"
msgstr ""
-#: git-bisect.sh:279
+#: git-bisect.sh:105
msgid "bisect run cannot continue any more"
msgstr ""
-#: git-bisect.sh:285
+#: git-bisect.sh:111
#, sh-format
msgid ""
"bisect run failed:\n"
-"'bisect_state $state' exited with error code $res"
+"'bisect-state $state' exited with error code $res"
msgstr ""
-#: git-bisect.sh:292
+#: git-bisect.sh:118
msgid "bisect run success"
msgstr ""
-#: git-bisect.sh:300
-msgid "We are not bisecting."
-msgstr ""
-
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
@@ -21773,128 +23106,46 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr ""
-#: git-legacy-stash.sh:221
-msgid "Cannot remove temporary index (can't happen)"
-msgstr ""
-
-#: git-legacy-stash.sh:272
-#, sh-format
-msgid "Cannot update $ref_stash with $w_commit"
-msgstr ""
-
-#: git-legacy-stash.sh:324
-#, sh-format
-msgid "error: unknown option for 'stash push': $option"
-msgstr ""
-
-#: git-legacy-stash.sh:356
-#, sh-format
-msgid "Saved working directory and index state $stash_msg"
-msgstr ""
-
-#: git-legacy-stash.sh:536
-#, sh-format
-msgid "unknown option: $opt"
-msgstr ""
-
-#: git-legacy-stash.sh:556
-#, sh-format
-msgid "Too many revisions specified: $REV"
-msgstr ""
-
-#: git-legacy-stash.sh:571
-#, sh-format
-msgid "$reference is not a valid reference"
-msgstr ""
-
-#: git-legacy-stash.sh:599
-#, sh-format
-msgid "'$args' is not a stash-like commit"
-msgstr ""
-
-#: git-legacy-stash.sh:610
-#, sh-format
-msgid "'$args' is not a stash reference"
-msgstr ""
-
-#: git-legacy-stash.sh:618
-msgid "unable to refresh index"
-msgstr ""
-
-#: git-legacy-stash.sh:622
-msgid "Cannot apply a stash in the middle of a merge"
-msgstr ""
-
-#: git-legacy-stash.sh:630
-msgid "Conflicts in index. Try without --index."
-msgstr ""
-
-#: git-legacy-stash.sh:632
-msgid "Could not save index tree"
-msgstr ""
-
-#: git-legacy-stash.sh:641
-msgid "Could not restore untracked files from stash entry"
-msgstr ""
-
-#: git-legacy-stash.sh:666
-msgid "Cannot unstage modified files"
-msgstr ""
-
-#: git-legacy-stash.sh:704
-#, sh-format
-msgid "Dropped ${REV} ($s)"
-msgstr ""
-
-#: git-legacy-stash.sh:705
-#, sh-format
-msgid "${REV}: Could not drop stash entry"
-msgstr ""
-
-#: git-legacy-stash.sh:792
-msgid "(To restore them type \"git stash apply\")"
-msgstr ""
-
-#: git-submodule.sh:203
+#: git-submodule.sh:179
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
-#: git-submodule.sh:213
+#: git-submodule.sh:189
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
-#: git-submodule.sh:232
+#: git-submodule.sh:208
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr ""
-#: git-submodule.sh:235
+#: git-submodule.sh:211
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr ""
-#: git-submodule.sh:242
+#: git-submodule.sh:218
#, sh-format
msgid "'$sm_path' does not have a commit checked out"
msgstr ""
-#: git-submodule.sh:273
+#: git-submodule.sh:249
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr ""
-#: git-submodule.sh:275
+#: git-submodule.sh:251
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr ""
-#: git-submodule.sh:283
+#: git-submodule.sh:259
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
-#: git-submodule.sh:285
+#: git-submodule.sh:261
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -21905,131 +23156,102 @@
"option."
msgstr ""
-#: git-submodule.sh:291
+#: git-submodule.sh:267
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr ""
-#: git-submodule.sh:303
+#: git-submodule.sh:279
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:308
+#: git-submodule.sh:284
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:317
+#: git-submodule.sh:293
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr ""
-#: git-submodule.sh:590
+#: git-submodule.sh:568
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:600
+#: git-submodule.sh:578
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:605
+#: git-submodule.sh:583
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr ""
-#: git-submodule.sh:623
+#: git-submodule.sh:601
#, sh-format
msgid ""
"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
"$sha1:"
msgstr ""
-#: git-submodule.sh:629
+#: git-submodule.sh:607
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
"Direct fetching of that commit failed."
msgstr ""
-#: git-submodule.sh:636
+#: git-submodule.sh:614
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:637
+#: git-submodule.sh:615
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr ""
-#: git-submodule.sh:641
+#: git-submodule.sh:619
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:642
+#: git-submodule.sh:620
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr ""
-#: git-submodule.sh:647
+#: git-submodule.sh:625
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:648
+#: git-submodule.sh:626
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr ""
-#: git-submodule.sh:653
+#: git-submodule.sh:631
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:654
+#: git-submodule.sh:632
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr ""
-#: git-submodule.sh:685
+#: git-submodule.sh:663
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:896
-msgid "The --cached option cannot be used with the --files option"
-msgstr ""
-
-#: git-submodule.sh:948
-#, sh-format
-msgid "unexpected mode $mod_dst"
-msgstr ""
-
-#: git-submodule.sh:968
-#, sh-format
-msgid " Warn: $display_name doesn't contain commit $sha1_src"
-msgstr ""
-
-#: git-submodule.sh:971
-#, sh-format
-msgid " Warn: $display_name doesn't contain commit $sha1_dst"
-msgstr ""
-
-#: git-submodule.sh:974
-#, 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."
-msgstr ""
-
#: git-rebase--preserve-merges.sh:109
msgid "Applied autostash."
msgstr ""
@@ -22039,12 +23261,19 @@
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"
@@ -22065,7 +23294,7 @@
"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"
@@ -22077,83 +23306,83 @@
"\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"
@@ -22163,31 +23392,31 @@
"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"
@@ -22195,7 +23424,7 @@
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"
@@ -22205,25 +23434,25 @@
"\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"
@@ -22241,54 +23470,54 @@
" 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:955
+#: git-rebase--preserve-merges.sh:945
msgid "Note that empty commits are commented out"
msgstr ""
-#: 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 ""
@@ -22355,51 +23584,51 @@
msgid "%12s %12s %s"
msgstr ""
-#: git-add--interactive.perl:634
+#: git-add--interactive.perl:632
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:1053
+#: git-add--interactive.perl:1056
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
msgstr ""
-#: git-add--interactive.perl:1056
+#: git-add--interactive.perl:1059
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
msgstr ""
-#: git-add--interactive.perl:1059
+#: git-add--interactive.perl:1062
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
msgstr ""
-#: git-add--interactive.perl:1062 git-add--interactive.perl:1071
-#: git-add--interactive.perl:1077
+#: git-add--interactive.perl:1065 git-add--interactive.perl:1074
+#: git-add--interactive.perl:1080
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
msgstr ""
-#: git-add--interactive.perl:1065 git-add--interactive.perl:1068
-#: git-add--interactive.perl:1074
+#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
+#: git-add--interactive.perl:1077
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
msgstr ""
-#: git-add--interactive.perl:1111
+#: git-add--interactive.perl:1114
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr ""
-#: git-add--interactive.perl:1118
+#: git-add--interactive.perl:1121
#, perl-format
msgid ""
"---\n"
@@ -22408,12 +23637,12 @@
"Lines starting with %s will be removed.\n"
msgstr ""
-#: git-add--interactive.perl:1140
+#: git-add--interactive.perl:1143
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr ""
-#: git-add--interactive.perl:1248
+#: git-add--interactive.perl:1251
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -22422,7 +23651,7 @@
"d - do not stage this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1254
+#: git-add--interactive.perl:1257
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -22431,7 +23660,7 @@
"d - do not stash this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1260
+#: git-add--interactive.perl:1263
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -22440,7 +23669,7 @@
"d - do not unstage this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1266
+#: git-add--interactive.perl:1269
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -22449,7 +23678,7 @@
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1272 git-add--interactive.perl:1290
+#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -22458,7 +23687,7 @@
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1278
+#: git-add--interactive.perl:1281
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -22467,7 +23696,7 @@
"d - do not discard this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1284
+#: git-add--interactive.perl:1287
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -22476,7 +23705,7 @@
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1296
+#: git-add--interactive.perl:1299
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -22485,7 +23714,7 @@
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
-#: git-add--interactive.perl:1311
+#: git-add--interactive.perl:1314
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -22498,85 +23727,90 @@
"? - print help\n"
msgstr ""
-#: git-add--interactive.perl:1342
+#: git-add--interactive.perl:1345
msgid "The selected hunks do not apply to the index!\n"
msgstr ""
-#: git-add--interactive.perl:1357
+#: git-add--interactive.perl:1360
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr ""
-#: git-add--interactive.perl:1468
+#: git-add--interactive.perl:1479
#, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1469
+#: git-add--interactive.perl:1480
#, perl-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1470
+#: git-add--interactive.perl:1481
+#, perl-format
+msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1482
#, perl-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr ""
-#: git-add--interactive.perl:1570
+#: git-add--interactive.perl:1599
msgid "No other hunks to goto\n"
msgstr ""
-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1617
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr ""
-#: git-add--interactive.perl:1593
+#: git-add--interactive.perl:1622
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:1619
+#: git-add--interactive.perl:1657
msgid "No other hunks to search\n"
msgstr ""
-#: git-add--interactive.perl:1636
+#: git-add--interactive.perl:1674
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr ""
-#: git-add--interactive.perl:1646
+#: git-add--interactive.perl:1684
msgid "No hunk matches the given pattern\n"
msgstr ""
-#: git-add--interactive.perl:1658 git-add--interactive.perl:1680
+#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
msgid "No previous hunk\n"
msgstr ""
-#: git-add--interactive.perl:1667 git-add--interactive.perl:1686
+#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
msgid "No next hunk\n"
msgstr ""
-#: git-add--interactive.perl:1692
+#: git-add--interactive.perl:1730
msgid "Sorry, cannot split this hunk\n"
msgstr ""
-#: git-add--interactive.perl:1698
+#: git-add--interactive.perl:1736
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] ""
msgstr[1] ""
-#: git-add--interactive.perl:1708
+#: git-add--interactive.perl:1746
msgid "Sorry, cannot edit this hunk\n"
msgstr ""
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1773
+#: git-add--interactive.perl:1811
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
@@ -22587,19 +23821,19 @@
"changes\n"
msgstr ""
-#: git-add--interactive.perl:1790 git-add--interactive.perl:1795
-#: git-add--interactive.perl:1798 git-add--interactive.perl:1805
-#: git-add--interactive.perl:1808 git-add--interactive.perl:1815
-#: git-add--interactive.perl:1819 git-add--interactive.perl:1825
+#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
+#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
+#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
+#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
msgid "missing --"
msgstr ""
-#: git-add--interactive.perl:1821
+#: git-add--interactive.perl:1866
#, perl-format
msgid "unknown --patch mode: %s"
msgstr ""
-#: git-add--interactive.perl:1827 git-add--interactive.perl:1833
+#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr ""
@@ -22616,62 +23850,69 @@
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"
@@ -22681,36 +23922,36 @@
" * 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"
@@ -22719,37 +23960,37 @@
"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"
@@ -22758,20 +23999,20 @@
"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 ""
@@ -22779,16 +24020,16 @@
#. 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"
@@ -22805,128 +24046,128 @@
#. 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/po/id.po b/po/id.po
new file mode 100644
index 0000000..ce9720f
--- /dev/null
+++ b/po/id.po
@@ -0,0 +1,24358 @@
+# Indonesian translations for Git package.
+# Copyright (C) 2021 Bagas Sanjaya
+# This file is distributed under the same license as the Git package.
+# Bagas Sanjaya <bagasdotme@gmail.com>, 2021.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Git\n"
+"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
+"POT-Creation-Date: 2021-03-04 22:41+0800\n"
+"PO-Revision-Date: 2021-02-20 18:07+0700\n"
+"Last-Translator: Bagas Sanjaya <bagasdotme@gmail.com>\n"
+"Language-Team: Indonesian\n"
+"Language: id\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:376
+#, c-format
+msgid "Huh (%s)?"
+msgstr ""
+
+#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292
+#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538
+#: builtin/rebase.c:1963
+msgid "could not read index"
+msgstr ""
+
+#: add-interactive.c:584 git-add--interactive.perl:269
+#: git-add--interactive.perl:294
+msgid "binary"
+msgstr ""
+
+#: add-interactive.c:642 git-add--interactive.perl:278
+#: git-add--interactive.perl:332
+msgid "nothing"
+msgstr ""
+
+#: add-interactive.c:643 git-add--interactive.perl:314
+#: git-add--interactive.perl:329
+msgid "unchanged"
+msgstr ""
+
+#: add-interactive.c:680 git-add--interactive.perl:641
+msgid "Update"
+msgstr ""
+
+#: add-interactive.c:697 add-interactive.c:885
+#, c-format
+msgid "could not stage '%s'"
+msgstr ""
+
+#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486
+msgid "could not write index"
+msgstr ""
+
+#: add-interactive.c:706 git-add--interactive.perl:626
+#, c-format, perl-format
+msgid "updated %d path\n"
+msgid_plural "updated %d paths\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: add-interactive.c:724 git-add--interactive.perl:676
+#, c-format, perl-format
+msgid "note: %s is untracked now.\n"
+msgstr ""
+
+#: add-interactive.c:729 apply.c:4125 builtin/checkout.c:295
+#: builtin/reset.c:145
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr ""
+
+#: add-interactive.c:759 git-add--interactive.perl:653
+msgid "Revert"
+msgstr ""
+
+#: add-interactive.c:775
+msgid "Could not parse HEAD^{tree}"
+msgstr ""
+
+#: add-interactive.c:813 git-add--interactive.perl:629
+#, c-format, perl-format
+msgid "reverted %d path\n"
+msgid_plural "reverted %d paths\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: add-interactive.c:864 git-add--interactive.perl:693
+#, c-format
+msgid "No untracked files.\n"
+msgstr ""
+
+#: add-interactive.c:868 git-add--interactive.perl:687
+msgid "Add untracked"
+msgstr ""
+
+#: add-interactive.c:895 git-add--interactive.perl:623
+#, c-format, perl-format
+msgid "added %d path\n"
+msgid_plural "added %d paths\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: add-interactive.c:925
+#, c-format
+msgid "ignoring unmerged: %s"
+msgstr ""
+
+#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369
+#, c-format
+msgid "Only binary files changed.\n"
+msgstr ""
+
+#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371
+#, c-format
+msgid "No changes.\n"
+msgstr ""
+
+#: add-interactive.c:943 git-add--interactive.perl:1379
+msgid "Patch update"
+msgstr ""
+
+#: add-interactive.c:982 git-add--interactive.perl:1792
+msgid "Review diff"
+msgstr ""
+
+#: add-interactive.c:1010
+msgid "show paths with changes"
+msgstr ""
+
+#: add-interactive.c:1012
+msgid "add working tree state to the staged set of changes"
+msgstr ""
+
+#: add-interactive.c:1014
+msgid "revert staged set of changes back to the HEAD version"
+msgstr ""
+
+#: add-interactive.c:1016
+msgid "pick hunks and update selectively"
+msgstr ""
+
+#: add-interactive.c:1018
+msgid "view diff between HEAD and index"
+msgstr ""
+
+#: add-interactive.c:1020
+msgid "add contents of untracked files to the staged set of changes"
+msgstr ""
+
+#: add-interactive.c:1028 add-interactive.c:1077
+msgid "Prompt help:"
+msgstr ""
+
+#: add-interactive.c:1030
+msgid "select a single item"
+msgstr ""
+
+#: add-interactive.c:1032
+msgid "select a range of items"
+msgstr ""
+
+#: add-interactive.c:1034
+msgid "select multiple ranges"
+msgstr ""
+
+#: add-interactive.c:1036 add-interactive.c:1081
+msgid "select item based on unique prefix"
+msgstr ""
+
+#: add-interactive.c:1038
+msgid "unselect specified items"
+msgstr ""
+
+#: add-interactive.c:1040
+msgid "choose all items"
+msgstr ""
+
+#: add-interactive.c:1042
+msgid "(empty) finish selecting"
+msgstr ""
+
+#: add-interactive.c:1079
+msgid "select a numbered item"
+msgstr ""
+
+#: add-interactive.c:1083
+msgid "(empty) select nothing"
+msgstr ""
+
+#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
+msgid "*** Commands ***"
+msgstr ""
+
+#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
+msgid "What now"
+msgstr ""
+
+#: add-interactive.c:1144 git-add--interactive.perl:213
+msgid "staged"
+msgstr ""
+
+#: add-interactive.c:1144 git-add--interactive.perl:213
+msgid "unstaged"
+msgstr ""
+
+#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257
+#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124
+#: builtin/fetch.c:150 builtin/merge.c:285 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:1151
+msgid "could not refresh index"
+msgstr ""
+
+#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803
+#, c-format
+msgid "Bye.\n"
+msgstr ""
+
+#: add-patch.c:34 git-add--interactive.perl:1431
+#, c-format, perl-format
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:35 git-add--interactive.perl:1432
+#, c-format, perl-format
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:36 git-add--interactive.perl:1433
+#, c-format, perl-format
+msgid "Stage addition [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:37 git-add--interactive.perl:1434
+#, 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:1437
+#, c-format, perl-format
+msgid "Stash mode change [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:57 git-add--interactive.perl:1438
+#, c-format, perl-format
+msgid "Stash deletion [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:58 git-add--interactive.perl:1439
+#, c-format, perl-format
+msgid "Stash addition [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:59 git-add--interactive.perl:1440
+#, 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:1443
+#, c-format, perl-format
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:81 git-add--interactive.perl:1444
+#, c-format, perl-format
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:82 git-add--interactive.perl:1445
+#, c-format, perl-format
+msgid "Unstage addition [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:83 git-add--interactive.perl:1446
+#, 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:1449
+#, 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:1450
+#, c-format, perl-format
+msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:105 git-add--interactive.perl:1451
+#, c-format, perl-format
+msgid "Apply addition to index [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:106 git-add--interactive.perl:1452
+#, 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:1455
+#: git-add--interactive.perl:1473
+#, 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:1456
+#: git-add--interactive.perl:1474
+#, c-format, perl-format
+msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:128 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
+#, c-format, perl-format
+msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:129 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
+#, 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:1461
+#, 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:1462
+#, 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:1463
+#, 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:1464
+#, 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:1467
+#, 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:1468
+#, 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:1469
+#, 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:1470
+#, 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:790
+#, c-format
+msgid ""
+"expected context line #%d in\n"
+"%.*s"
+msgstr ""
+
+#: add-patch.c:805
+#, c-format
+msgid ""
+"hunks do not overlap:\n"
+"%.*s\n"
+"\tdoes not end with:\n"
+"%.*s"
+msgstr ""
+
+#: add-patch.c:1081 git-add--interactive.perl:1115
+msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
+msgstr ""
+
+#: add-patch.c:1085
+#, 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:1099 git-add--interactive.perl:1129
+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:1132
+msgid "could not parse hunk header"
+msgstr ""
+
+#: add-patch.c:1177
+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:1246 git-add--interactive.perl:1242
+msgid ""
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+msgstr ""
+
+#: add-patch.c:1289
+msgid "The selected hunks do not apply to the index!"
+msgstr ""
+
+#: add-patch.c:1290 git-add--interactive.perl:1346
+msgid "Apply them to the worktree anyway? "
+msgstr ""
+
+#: add-patch.c:1297 git-add--interactive.perl:1349
+msgid "Nothing was applied.\n"
+msgstr ""
+
+#: add-patch.c:1354
+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:1516 add-patch.c:1526
+msgid "No previous hunk"
+msgstr ""
+
+#: add-patch.c:1521 add-patch.c:1531
+msgid "No next hunk"
+msgstr ""
+
+#: add-patch.c:1537
+msgid "No other hunks to goto"
+msgstr ""
+
+#: add-patch.c:1548 git-add--interactive.perl:1606
+msgid "go to which hunk (<ret> to see more)? "
+msgstr ""
+
+#: add-patch.c:1549 git-add--interactive.perl:1608
+msgid "go to which hunk? "
+msgstr ""
+
+#: add-patch.c:1560
+#, c-format
+msgid "Invalid number: '%s'"
+msgstr ""
+
+#: add-patch.c:1565
+#, c-format
+msgid "Sorry, only %d hunk available."
+msgid_plural "Sorry, only %d hunks available."
+msgstr[0] ""
+msgstr[1] ""
+
+#: add-patch.c:1574
+msgid "No other hunks to search"
+msgstr ""
+
+#: add-patch.c:1580 git-add--interactive.perl:1661
+msgid "search for regex? "
+msgstr ""
+
+#: add-patch.c:1595
+#, c-format
+msgid "Malformed search regexp %s: %s"
+msgstr ""
+
+#: add-patch.c:1612
+msgid "No hunk matches the given pattern"
+msgstr ""
+
+#: add-patch.c:1619
+msgid "Sorry, cannot split this hunk"
+msgstr ""
+
+#: add-patch.c:1623
+#, c-format
+msgid "Split into %d hunks."
+msgstr ""
+
+#: add-patch.c:1627
+msgid "Sorry, cannot edit this hunk"
+msgstr ""
+
+#: add-patch.c:1679
+msgid "'git apply' failed"
+msgstr ""
+
+#: advice.c:143
+#, c-format
+msgid ""
+"\n"
+"Disable this message with \"git config advice.%s false\""
+msgstr ""
+
+#: advice.c:159
+#, c-format
+msgid "%shint: %.*s%s\n"
+msgstr ""
+
+#: advice.c:250
+msgid "Cherry-picking is not possible because you have unmerged files."
+msgstr ""
+
+#: advice.c:252
+msgid "Committing is not possible because you have unmerged files."
+msgstr ""
+
+#: advice.c:254
+msgid "Merging is not possible because you have unmerged files."
+msgstr ""
+
+#: advice.c:256
+msgid "Pulling is not possible because you have unmerged files."
+msgstr ""
+
+#: advice.c:258
+msgid "Reverting is not possible because you have unmerged files."
+msgstr ""
+
+#: advice.c:260
+#, c-format
+msgid "It is not possible to %s because you have unmerged files."
+msgstr ""
+
+#: advice.c:268
+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:276
+msgid "Exiting because of an unresolved conflict."
+msgstr ""
+
+#: advice.c:281 builtin/merge.c:1370
+msgid "You have not concluded your merge (MERGE_HEAD exists)."
+msgstr ""
+
+#: advice.c:283
+msgid "Please, commit your changes before merging."
+msgstr ""
+
+#: advice.c:284
+msgid "Exiting because of unfinished merge."
+msgstr ""
+
+#: advice.c:290
+#, 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 ""
+
+#: 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 ""
+
+#: apply.c:85
+#, c-format
+msgid "unrecognized whitespace ignore option '%s'"
+msgstr ""
+
+#: apply.c:135
+msgid "--reject and --3way cannot be used together."
+msgstr ""
+
+#: apply.c:137
+msgid "--cached and --3way cannot be used together."
+msgstr ""
+
+#: apply.c:140
+msgid "--3way outside a repository"
+msgstr ""
+
+#: apply.c:151
+msgid "--index outside a repository"
+msgstr ""
+
+#: apply.c:154
+msgid "--cached outside a repository"
+msgstr ""
+
+#: apply.c:801
+#, c-format
+msgid "Cannot prepare timestamp regexp %s"
+msgstr ""
+
+#: apply.c:810
+#, c-format
+msgid "regexec returned %d for input: %s"
+msgstr ""
+
+#: apply.c:884
+#, c-format
+msgid "unable to find filename in patch at line %d"
+msgstr ""
+
+#: apply.c:922
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
+msgstr ""
+
+#: apply.c:928
+#, c-format
+msgid "git apply: bad git-diff - inconsistent new filename on line %d"
+msgstr ""
+
+#: apply.c:929
+#, c-format
+msgid "git apply: bad git-diff - inconsistent old filename on line %d"
+msgstr ""
+
+#: apply.c:934
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null on line %d"
+msgstr ""
+
+#: apply.c:963
+#, c-format
+msgid "invalid mode on line %d: %s"
+msgstr ""
+
+#: apply.c:1282
+#, c-format
+msgid "inconsistent header lines %d and %d"
+msgstr ""
+
+#: 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] ""
+msgstr[1] ""
+
+#: apply.c:1385
+#, c-format
+msgid "git diff header lacks filename information (line %d)"
+msgstr ""
+
+#: apply.c:1481
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr ""
+
+#: apply.c:1550
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr ""
+
+#: apply.c:1753
+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 ""
+
+#: apply.c:1826
+#, c-format
+msgid "new file %s depends on old contents"
+msgstr ""
+
+#: apply.c:1828
+#, c-format
+msgid "deleted file %s still has contents"
+msgstr ""
+
+#: apply.c:1831
+#, c-format
+msgid "** warning: file %s becomes empty but is not deleted"
+msgstr ""
+
+#: apply.c:1978
+#, c-format
+msgid "corrupt binary patch at line %d: %.*s"
+msgstr ""
+
+#: apply.c:2015
+#, c-format
+msgid "unrecognized binary patch at line %d"
+msgstr ""
+
+#: apply.c:2177
+#, c-format
+msgid "patch with only garbage at line %d"
+msgstr ""
+
+#: apply.c:2263
+#, c-format
+msgid "unable to read symlink %s"
+msgstr ""
+
+#: apply.c:2267
+#, c-format
+msgid "unable to open or read %s"
+msgstr ""
+
+#: apply.c:2936
+#, c-format
+msgid "invalid start of line: '%c'"
+msgstr ""
+
+#: 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:3069
+#, c-format
+msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
+msgstr ""
+
+#: apply.c:3075
+#, c-format
+msgid ""
+"while searching for:\n"
+"%.*s"
+msgstr ""
+
+#: apply.c:3097
+#, c-format
+msgid "missing binary patch data for '%s'"
+msgstr ""
+
+#: apply.c:3105
+#, c-format
+msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
+msgstr ""
+
+#: apply.c:3152
+#, c-format
+msgid "cannot apply binary patch to '%s' without full index line"
+msgstr ""
+
+#: apply.c:3163
+#, c-format
+msgid ""
+"the patch applies to '%s' (%s), which does not match the current contents."
+msgstr ""
+
+#: apply.c:3171
+#, c-format
+msgid "the patch applies to an empty '%s' but it is not empty"
+msgstr ""
+
+#: apply.c:3189
+#, c-format
+msgid "the necessary postimage %s for '%s' cannot be read"
+msgstr ""
+
+#: apply.c:3202
+#, c-format
+msgid "binary patch does not apply to '%s'"
+msgstr ""
+
+#: apply.c:3209
+#, c-format
+msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
+msgstr ""
+
+#: apply.c:3230
+#, c-format
+msgid "patch failed: %s:%ld"
+msgstr ""
+
+#: apply.c:3353
+#, c-format
+msgid "cannot checkout %s"
+msgstr ""
+
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:86 pack-revindex.c:213
+#: setup.c:308
+#, c-format
+msgid "failed to read %s"
+msgstr ""
+
+#: apply.c:3413
+#, c-format
+msgid "reading from '%s' beyond a symbolic link"
+msgstr ""
+
+#: apply.c:3442 apply.c:3685
+#, c-format
+msgid "path %s has been renamed/deleted"
+msgstr ""
+
+#: apply.c:3528 apply.c:3700
+#, c-format
+msgid "%s: does not exist in index"
+msgstr ""
+
+#: apply.c:3537 apply.c:3708 apply.c:3952
+#, c-format
+msgid "%s: does not match index"
+msgstr ""
+
+#: 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 ""
+
+#: apply.c:3591 apply.c:3595
+#, c-format
+msgid "cannot read the current contents of '%s'"
+msgstr ""
+
+#: apply.c:3607
+#, c-format
+msgid "Failed to fall back on three-way merge...\n"
+msgstr ""
+
+#: apply.c:3621
+#, c-format
+msgid "Applied patch to '%s' with conflicts.\n"
+msgstr ""
+
+#: apply.c:3626
+#, c-format
+msgid "Applied patch to '%s' cleanly.\n"
+msgstr ""
+
+#: apply.c:3652
+msgid "removal patch leaves file contents"
+msgstr ""
+
+#: apply.c:3725
+#, c-format
+msgid "%s: wrong type"
+msgstr ""
+
+#: apply.c:3727
+#, c-format
+msgid "%s has type %o, expected %o"
+msgstr ""
+
+#: 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:3950
+#, c-format
+msgid "%s: already exists in index"
+msgstr ""
+
+#: apply.c:3954
+#, c-format
+msgid "%s: already exists in working directory"
+msgstr ""
+
+#: apply.c:3974
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o)"
+msgstr ""
+
+#: apply.c:3979
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o) of %s"
+msgstr ""
+
+#: apply.c:3999
+#, c-format
+msgid "affected file '%s' is beyond a symbolic link"
+msgstr ""
+
+#: apply.c:4003
+#, c-format
+msgid "%s: patch does not apply"
+msgstr ""
+
+#: apply.c:4018
+#, c-format
+msgid "Checking patch %s..."
+msgstr ""
+
+#: apply.c:4110
+#, c-format
+msgid "sha1 information is lacking or useless for submodule %s"
+msgstr ""
+
+#: apply.c:4117
+#, c-format
+msgid "mode change for %s, which is not in current HEAD"
+msgstr ""
+
+#: apply.c:4120
+#, c-format
+msgid "sha1 information is lacking or useless (%s)."
+msgstr ""
+
+#: apply.c:4129
+#, c-format
+msgid "could not add %s to temporary index"
+msgstr ""
+
+#: apply.c:4139
+#, c-format
+msgid "could not write temporary index to %s"
+msgstr ""
+
+#: apply.c:4277
+#, c-format
+msgid "unable to remove %s from index"
+msgstr ""
+
+#: apply.c:4311
+#, c-format
+msgid "corrupt patch for submodule %s"
+msgstr ""
+
+#: apply.c:4317
+#, c-format
+msgid "unable to stat newly created file '%s'"
+msgstr ""
+
+#: apply.c:4325
+#, c-format
+msgid "unable to create backing store for newly created file %s"
+msgstr ""
+
+#: apply.c:4331 apply.c:4476
+#, c-format
+msgid "unable to add cache entry for %s"
+msgstr ""
+
+#: apply.c:4374 builtin/bisect--helper.c:523
+#, c-format
+msgid "failed to write to '%s'"
+msgstr ""
+
+#: apply.c:4378
+#, c-format
+msgid "closing file '%s'"
+msgstr ""
+
+#: apply.c:4448
+#, c-format
+msgid "unable to write file '%s' mode %o"
+msgstr ""
+
+#: apply.c:4546
+#, c-format
+msgid "Applied patch %s cleanly."
+msgstr ""
+
+#: apply.c:4554
+msgid "internal error"
+msgstr ""
+
+#: apply.c:4557
+#, c-format
+msgid "Applying patch %%s with %d reject..."
+msgid_plural "Applying patch %%s with %d rejects..."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apply.c:4568
+#, c-format
+msgid "truncating .rej filename to %.*s.rej"
+msgstr ""
+
+#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334
+#, c-format
+msgid "cannot open %s"
+msgstr ""
+
+#: apply.c:4590
+#, c-format
+msgid "Hunk #%d applied cleanly."
+msgstr ""
+
+#: apply.c:4594
+#, c-format
+msgid "Rejected hunk #%d."
+msgstr ""
+
+#: apply.c:4718
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr ""
+
+#: apply.c:4726
+msgid "unrecognized input"
+msgstr ""
+
+#: apply.c:4746
+msgid "unable to read index file"
+msgstr ""
+
+#: apply.c:4903
+#, c-format
+msgid "can't open patch '%s': %s"
+msgstr ""
+
+#: apply.c:4930
+#, c-format
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apply.c:4936 apply.c:4951
+#, c-format
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apply.c:4944
+#, 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:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406
+msgid "Unable to write new index file"
+msgstr ""
+
+#: apply.c:4988
+msgid "don't apply changes matching the given path"
+msgstr ""
+
+#: apply.c:4991
+msgid "apply changes matching the given path"
+msgstr ""
+
+#: apply.c:4993 builtin/am.c:2266
+msgid "num"
+msgstr ""
+
+#: apply.c:4994
+msgid "remove <num> leading slashes from traditional diff paths"
+msgstr ""
+
+#: apply.c:4997
+msgid "ignore additions made by the patch"
+msgstr ""
+
+#: apply.c:4999
+msgid "instead of applying the patch, output diffstat for the input"
+msgstr ""
+
+#: apply.c:5003
+msgid "show number of added and deleted lines in decimal notation"
+msgstr ""
+
+#: apply.c:5005
+msgid "instead of applying the patch, output a summary for the input"
+msgstr ""
+
+#: apply.c:5007
+msgid "instead of applying the patch, see if the patch is applicable"
+msgstr ""
+
+#: apply.c:5009
+msgid "make sure the patch is applicable to the current index"
+msgstr ""
+
+#: apply.c:5011
+msgid "mark new files with `git add --intent-to-add`"
+msgstr ""
+
+#: apply.c:5013
+msgid "apply a patch without touching the working tree"
+msgstr ""
+
+#: apply.c:5015
+msgid "accept a patch that touches outside the working area"
+msgstr ""
+
+#: apply.c:5018
+msgid "also apply the patch (use with --stat/--summary/--check)"
+msgstr ""
+
+#: apply.c:5020
+msgid "attempt three-way merge if a patch does not apply"
+msgstr ""
+
+#: apply.c:5022
+msgid "build a temporary index based on embedded index information"
+msgstr ""
+
+#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540
+msgid "paths are separated with NUL character"
+msgstr ""
+
+#: apply.c:5027
+msgid "ensure at least <n> lines of context match"
+msgstr ""
+
+#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
+#: builtin/pack-objects.c:3577 builtin/rebase.c:1352
+msgid "action"
+msgstr ""
+
+#: apply.c:5029
+msgid "detect new or modified lines that have whitespace errors"
+msgstr ""
+
+#: apply.c:5032 apply.c:5035
+msgid "ignore changes in whitespace when finding context"
+msgstr ""
+
+#: apply.c:5038
+msgid "apply the patch in reverse"
+msgstr ""
+
+#: apply.c:5040
+msgid "don't expect at least one line of context"
+msgstr ""
+
+#: apply.c:5042
+msgid "leave the rejected hunks in corresponding *.rej files"
+msgstr ""
+
+#: apply.c:5044
+msgid "allow overlapping hunks"
+msgstr ""
+
+#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22
+#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757
+#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128
+msgid "be verbose"
+msgstr ""
+
+#: apply.c:5047
+msgid "tolerate incorrectly detected missing new-line at the end of file"
+msgstr ""
+
+#: apply.c:5050
+msgid "do not trust the line counts in the hunk headers"
+msgstr ""
+
+#: apply.c:5052 builtin/am.c:2254
+msgid "root"
+msgstr ""
+
+#: apply.c:5053
+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:450
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr ""
+
+#: archive-tar.c:453
+msgid "unable to redirect descriptor"
+msgstr ""
+
+#: archive-tar.c:460
+#, 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 ""
+
+#: archive.c:15
+msgid "git archive --list"
+msgstr ""
+
+#: archive.c:16
+msgid ""
+"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
+msgstr ""
+
+#: archive.c:17
+msgid "git archive --remote <repo> [--exec <cmd>] --list"
+msgstr ""
+
+#: archive.c:192
+#, c-format
+msgid "cannot read %s"
+msgstr ""
+
+#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894
+#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786
+#: builtin/merge.c:1139
+#, c-format
+msgid "could not read '%s'"
+msgstr ""
+
+#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315
+#, c-format
+msgid "pathspec '%s' did not match any files"
+msgstr ""
+
+#: archive.c:454
+#, c-format
+msgid "no such ref: %.*s"
+msgstr ""
+
+#: archive.c:460
+#, c-format
+msgid "not a valid object name: %s"
+msgstr ""
+
+#: archive.c:473
+#, c-format
+msgid "not a tree object: %s"
+msgstr ""
+
+#: archive.c:485
+msgid "current working directory is untracked"
+msgstr ""
+
+#: 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:555
+msgid "fmt"
+msgstr ""
+
+#: archive.c:555
+msgid "archive format"
+msgstr ""
+
+#: archive.c:556 builtin/log.c:1764
+msgid "prefix"
+msgstr ""
+
+#: archive.c:557
+msgid "prepend prefix to each pathname in the archive"
+msgstr ""
+
+#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888
+#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
+#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
+#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105
+#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412
+#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190
+msgid "file"
+msgstr ""
+
+#: archive.c:559
+msgid "add untracked file to archive"
+msgstr ""
+
+#: archive.c:562 builtin/archive.c:90
+msgid "write the archive to this file"
+msgstr ""
+
+#: archive.c:564
+msgid "read .gitattributes in working directory"
+msgstr ""
+
+#: archive.c:565
+msgid "report archived files on stderr"
+msgstr ""
+
+#: archive.c:567
+msgid "set compression level"
+msgstr ""
+
+#: archive.c:570
+msgid "list supported archive formats"
+msgstr ""
+
+#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117
+#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
+msgid "repo"
+msgstr ""
+
+#: archive.c:573 builtin/archive.c:92
+msgid "retrieve the archive from remote repository <repo>"
+msgstr ""
+
+#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714
+#: builtin/notes.c:498
+msgid "command"
+msgstr ""
+
+#: archive.c:575 builtin/archive.c:94
+msgid "path to the remote git-upload-archive command"
+msgstr ""
+
+#: archive.c:582
+msgid "Unexpected option --remote"
+msgstr ""
+
+#: archive.c:584
+msgid "Option --exec can only be used together with --remote"
+msgstr ""
+
+#: archive.c:586
+msgid "Unexpected option --output"
+msgstr ""
+
+#: archive.c:588
+msgid "Options --add-file and --remote cannot be used together"
+msgstr ""
+
+#: archive.c:610
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr ""
+
+#: archive.c:619
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr ""
+
+#: attr.c:202
+#, c-format
+msgid "%.*s is not a valid attribute name"
+msgstr ""
+
+#: attr.c:359
+#, c-format
+msgid "%s not allowed: %s:%d"
+msgstr ""
+
+#: attr.c:399
+msgid ""
+"Negative patterns are ignored in git attributes\n"
+"Use '\\!' for literal leading exclamation."
+msgstr ""
+
+#: bisect.c:489
+#, c-format
+msgid "Badly quoted content in file '%s': %s"
+msgstr ""
+
+#: bisect.c:699
+#, c-format
+msgid "We cannot bisect more!\n"
+msgstr ""
+
+#: bisect.c:766
+#, c-format
+msgid "Not a valid commit name %s"
+msgstr ""
+
+#: bisect.c:791
+#, 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:796
+#, c-format
+msgid ""
+"The merge base %s is new.\n"
+"The property has changed between %s and [%s].\n"
+msgstr ""
+
+#: bisect.c:801
+#, 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:809
+#, 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 ""
+
+#: bisect.c:822
+#, 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 ""
+
+#: bisect.c:861
+#, c-format
+msgid "Bisecting: a merge base must be tested\n"
+msgstr ""
+
+#: bisect.c:911
+#, c-format
+msgid "a %s revision is needed"
+msgstr ""
+
+#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287
+#, c-format
+msgid "could not create file '%s'"
+msgstr ""
+
+#: bisect.c:987 builtin/merge.c:153
+#, c-format
+msgid "could not read file '%s'"
+msgstr ""
+
+#: bisect.c:1027
+msgid "reading bisect refs failed"
+msgstr ""
+
+#: bisect.c:1057
+#, c-format
+msgid "%s was both %s and %s\n"
+msgstr ""
+
+#: bisect.c:1066
+#, c-format
+msgid ""
+"No testable commit found.\n"
+"Maybe you started with bad path arguments?\n"
+msgstr ""
+
+#: bisect.c:1095
+#, c-format
+msgid "(roughly %d step)"
+msgid_plural "(roughly %d steps)"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANSLATORS: the last %s will be replaced with "(roughly %d
+#. steps)" translation.
+#.
+#: bisect.c:1101
+#, 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:2777
+msgid "--contents and --reverse do not blend well."
+msgstr ""
+
+#: blame.c:2791
+msgid "cannot use --contents with final commit object name"
+msgstr ""
+
+#: blame.c:2812
+msgid "--reverse and --first-parent together require specified latest commit"
+msgstr ""
+
+#: blame.c:2821 bundle.c:213 ref-filter.c:2206 remote.c:2041 sequencer.c:2146
+#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411
+#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335
+#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410
+#: builtin/shortlog.c:255
+msgid "revision walk setup failed"
+msgstr "persiapan jalan revisi gagal"
+
+#: blame.c:2839
+msgid ""
+"--reverse --first-parent together require range along first-parent chain"
+msgstr ""
+
+#: blame.c:2850
+#, c-format
+msgid "no such path %s in %s"
+msgstr ""
+
+#: blame.c:2861
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr ""
+
+#: 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 ""
+
+#: branch.c:67
+#, c-format
+msgid "Not setting branch %s as its own upstream."
+msgstr ""
+
+#: branch.c:93
+#, c-format
+msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+msgstr ""
+
+#: branch.c:94
+#, c-format
+msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
+msgstr ""
+
+#: branch.c:98
+#, c-format
+msgid "Branch '%s' set up to track local branch '%s' by rebasing."
+msgstr ""
+
+#: branch.c:99
+#, c-format
+msgid "Branch '%s' set up to track local branch '%s'."
+msgstr ""
+
+#: branch.c:104
+#, c-format
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+msgstr ""
+
+#: branch.c:105
+#, c-format
+msgid "Branch '%s' set up to track remote ref '%s'."
+msgstr ""
+
+#: branch.c:109
+#, c-format
+msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgstr ""
+
+#: branch.c:110
+#, c-format
+msgid "Branch '%s' set up to track local ref '%s'."
+msgstr ""
+
+#: 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 ""
+
+#: branch.c:189
+#, c-format
+msgid "'%s' is not a valid branch name."
+msgstr ""
+
+#: branch.c:208
+#, c-format
+msgid "A branch named '%s' already exists."
+msgstr ""
+
+#: 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 ""
+
+#: branch.c:235
+#, c-format
+msgid "the requested upstream branch '%s' does not exist"
+msgstr ""
+
+#: 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 ""
+
+#: branch.c:281
+#, c-format
+msgid "Not a valid object name: '%s'."
+msgstr ""
+
+#: branch.c:301
+#, c-format
+msgid "Ambiguous object name: '%s'."
+msgstr ""
+
+#: branch.c:306
+#, c-format
+msgid "Not a valid branch point: '%s'."
+msgstr ""
+
+#: branch.c:365
+#, c-format
+msgid "'%s' is already checked out at '%s'"
+msgstr ""
+
+#: branch.c:388
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr ""
+
+#: 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 or v3 bundle file"
+msgstr ""
+
+#: bundle.c:110
+#, c-format
+msgid "unrecognized header: %s%s (%d)"
+msgstr ""
+
+#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184
+#: builtin/commit.c:814
+#, c-format
+msgid "could not open '%s'"
+msgstr ""
+
+#: 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] ""
+msgstr[1] ""
+
+#: 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] ""
+msgstr[1] ""
+
+#: bundle.c:319
+msgid "unable to dup bundle descriptor"
+msgstr ""
+
+#: bundle.c:326
+msgid "Could not spawn pack-objects"
+msgstr ""
+
+#: bundle.c:337
+msgid "pack-objects died"
+msgstr ""
+
+#: bundle.c:386
+#, c-format
+msgid "ref '%s' is excluded by the rev-list options"
+msgstr ""
+
+#: bundle.c:490
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr ""
+
+#: bundle.c:492
+#, c-format
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr ""
+
+#: bundle.c:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr ""
+
+#: bundle.c:539
+msgid "Refusing to create empty bundle."
+msgstr ""
+
+#: bundle.c:549
+#, c-format
+msgid "cannot create '%s'"
+msgstr ""
+
+#: bundle.c:574
+msgid "index-pack died"
+msgstr ""
+
+#: chunk-format.c:113
+msgid "terminating chunk id appears earlier than expected"
+msgstr ""
+
+#: chunk-format.c:122
+#, c-format
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr ""
+
+#: chunk-format.c:129
+#, c-format
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr ""
+
+#: chunk-format.c:143
+#, c-format
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr ""
+
+#: color.c:329
+#, c-format
+msgid "invalid color value: %.*s"
+msgstr ""
+
+#: commit-graph.c:197 midx.c:46
+msgid "invalid hash version"
+msgstr ""
+
+#: commit-graph.c:255
+msgid "commit-graph file is too small"
+msgstr ""
+
+#: commit-graph.c:348
+#, c-format
+msgid "commit-graph signature %X does not match signature %X"
+msgstr ""
+
+#: commit-graph.c:355
+#, c-format
+msgid "commit-graph version %X does not match version %X"
+msgstr ""
+
+#: commit-graph.c:362
+#, c-format
+msgid "commit-graph hash version %X does not match version %X"
+msgstr ""
+
+#: commit-graph.c:379
+#, c-format
+msgid "commit-graph file is too small to hold %u chunks"
+msgstr ""
+
+#: commit-graph.c:472
+msgid "commit-graph has no base graphs chunk"
+msgstr ""
+
+#: commit-graph.c:482
+msgid "commit-graph chain does not match"
+msgstr ""
+
+#: commit-graph.c:530
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr ""
+
+#: commit-graph.c:554
+msgid "unable to find all commit-graph files"
+msgstr ""
+
+#: commit-graph.c:735 commit-graph.c:772
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr ""
+
+#: commit-graph.c:756
+#, c-format
+msgid "could not find commit %s"
+msgstr ""
+
+#: commit-graph.c:789
+msgid "commit-graph requires overflow generation data but has none"
+msgstr ""
+
+#: commit-graph.c:1065 builtin/am.c:1292
+#, c-format
+msgid "unable to parse commit %s"
+msgstr ""
+
+#: commit-graph.c:1327 builtin/pack-objects.c:2872
+#, c-format
+msgid "unable to get type of object %s"
+msgstr ""
+
+#: commit-graph.c:1358
+msgid "Loading known commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:1375
+msgid "Expanding reachable commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:1395
+msgid "Clearing commit marks in commit graph"
+msgstr ""
+
+#: commit-graph.c:1414
+msgid "Computing commit graph topological levels"
+msgstr ""
+
+#: commit-graph.c:1467
+msgid "Computing commit graph generation numbers"
+msgstr ""
+
+#: commit-graph.c:1548
+msgid "Computing commit changed paths Bloom filters"
+msgstr ""
+
+#: commit-graph.c:1625
+msgid "Collecting referenced commits"
+msgstr ""
+
+#: commit-graph.c:1650
+#, 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:1663
+#, c-format
+msgid "error adding pack %s"
+msgstr ""
+
+#: commit-graph.c:1667
+#, c-format
+msgid "error opening index for %s"
+msgstr ""
+
+#: commit-graph.c:1704
+msgid "Finding commits for commit graph among packed objects"
+msgstr ""
+
+#: commit-graph.c:1722
+msgid "Finding extra edges in commit graph"
+msgstr ""
+
+#: commit-graph.c:1771
+msgid "failed to write correct number of base graph ids"
+msgstr ""
+
+#: commit-graph.c:1802 midx.c:794
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr ""
+
+#: commit-graph.c:1815
+msgid "unable to create temporary graph layer"
+msgstr ""
+
+#: commit-graph.c:1820
+#, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr ""
+
+#: commit-graph.c:1879
+#, 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:1915
+msgid "unable to open commit-graph chain file"
+msgstr ""
+
+#: commit-graph.c:1931
+msgid "failed to rename base commit-graph file"
+msgstr ""
+
+#: commit-graph.c:1951
+msgid "failed to rename temporary commit-graph file"
+msgstr ""
+
+#: commit-graph.c:2084
+msgid "Scanning merged commits"
+msgstr ""
+
+#: commit-graph.c:2128
+msgid "Merging commit-graph"
+msgstr ""
+
+#: commit-graph.c:2235
+msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
+msgstr ""
+
+#: commit-graph.c:2342
+msgid "too many commits to write graph"
+msgstr ""
+
+#: commit-graph.c:2440
+msgid "the commit-graph file has incorrect checksum and is likely corrupt"
+msgstr ""
+
+#: commit-graph.c:2450
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr ""
+
+#: commit-graph.c:2460 commit-graph.c:2475
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr ""
+
+#: commit-graph.c:2467
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr ""
+
+#: commit-graph.c:2485
+msgid "Verifying commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:2500
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr ""
+
+#: commit-graph.c:2507
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr ""
+
+#: commit-graph.c:2517
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr ""
+
+#: commit-graph.c:2526
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr ""
+
+#: commit-graph.c:2540
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr ""
+
+#: commit-graph.c:2545
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr ""
+
+#: commit-graph.c:2549
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr ""
+
+#: commit-graph.c:2566
+#, c-format
+msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
+msgstr ""
+
+#: commit-graph.c:2572
+#, c-format
+msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
+msgstr ""
+
+#: commit.c:52 sequencer.c:2887 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2018 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:1223
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgstr ""
+
+#: commit.c:1227
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr ""
+
+#: commit.c:1230
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr ""
+
+#: commit.c:1233
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr ""
+
+#: commit.c:1487
+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:126
+#, 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:142
+#, c-format
+msgid "could not expand include path '%s'"
+msgstr ""
+
+#: config.c:153
+msgid "relative config includes must come from files"
+msgstr ""
+
+#: config.c:199
+msgid "relative config include conditionals must come from files"
+msgstr ""
+
+#: config.c:396
+msgid "invalid config format: %s"
+msgstr ""
+
+#: config.c:400
+#, c-format
+msgid "missing environment variable name for configuration '%.*s'"
+msgstr ""
+
+#: config.c:405
+#, c-format
+msgid "missing environment variable '%s' for configuration '%.*s'"
+msgstr ""
+
+#: config.c:442
+#, c-format
+msgid "key does not contain a section: %s"
+msgstr ""
+
+#: config.c:448
+#, c-format
+msgid "key does not contain variable name: %s"
+msgstr ""
+
+#: config.c:472 sequencer.c:2588
+#, c-format
+msgid "invalid key: %s"
+msgstr ""
+
+#: config.c:478
+#, c-format
+msgid "invalid key (newline): %s"
+msgstr ""
+
+#: config.c:511
+msgid "empty config key"
+msgstr ""
+
+#: config.c:529 config.c:541
+#, c-format
+msgid "bogus config parameter: %s"
+msgstr ""
+
+#: config.c:555 config.c:572 config.c:579 config.c:588
+#, c-format
+msgid "bogus format in %s"
+msgstr ""
+
+#: config.c:622
+#, c-format
+msgid "bogus count in %s"
+msgstr ""
+
+#: config.c:626
+#, c-format
+msgid "too many entries in %s"
+msgstr ""
+
+#: config.c:636
+#, c-format
+msgid "missing config key %s"
+msgstr ""
+
+#: config.c:644
+#, c-format
+msgid "missing config value %s"
+msgstr ""
+
+#: config.c:995
+#, c-format
+msgid "bad config line %d in blob %s"
+msgstr ""
+
+#: config.c:999
+#, c-format
+msgid "bad config line %d in file %s"
+msgstr ""
+
+#: config.c:1003
+#, c-format
+msgid "bad config line %d in standard input"
+msgstr ""
+
+#: config.c:1007
+#, c-format
+msgid "bad config line %d in submodule-blob %s"
+msgstr ""
+
+#: config.c:1011
+#, c-format
+msgid "bad config line %d in command line %s"
+msgstr ""
+
+#: config.c:1015
+#, c-format
+msgid "bad config line %d in %s"
+msgstr ""
+
+#: config.c:1152
+msgid "out of range"
+msgstr ""
+
+#: config.c:1152
+msgid "invalid unit"
+msgstr ""
+
+#: config.c:1153
+#, c-format
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr ""
+
+#: config.c:1163
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
+msgstr ""
+
+#: config.c:1166
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in file %s: %s"
+msgstr ""
+
+#: config.c:1169
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgstr ""
+
+#: config.c:1172
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
+msgstr ""
+
+#: config.c:1175
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
+msgstr ""
+
+#: config.c:1178
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr ""
+
+#: config.c:1194
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr ""
+
+#: config.c:1289
+#, c-format
+msgid "failed to expand user dir in: '%s'"
+msgstr ""
+
+#: config.c:1298
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr ""
+
+#: config.c:1391
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr ""
+
+#: config.c:1405 config.c:1416
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr ""
+
+#: config.c:1508
+msgid "core.commentChar should only be one character"
+msgstr ""
+
+#: config.c:1541
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr ""
+
+#: config.c:1613
+#, c-format
+msgid "malformed value for %s"
+msgstr ""
+
+#: config.c:1639
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr ""
+
+#: config.c:1640
+msgid "must be one of nothing, matching, simple, upstream or current"
+msgstr ""
+
+#: config.c:1701 builtin/pack-objects.c:3666
+#, c-format
+msgid "bad pack compression level %d"
+msgstr ""
+
+#: config.c:1823
+#, c-format
+msgid "unable to load config blob object '%s'"
+msgstr ""
+
+#: config.c:1826
+#, c-format
+msgid "reference '%s' does not point to a blob"
+msgstr ""
+
+#: config.c:1843
+#, c-format
+msgid "unable to resolve config blob '%s'"
+msgstr ""
+
+#: config.c:1873
+#, c-format
+msgid "failed to parse %s"
+msgstr ""
+
+#: config.c:1927
+msgid "unable to parse command-line config"
+msgstr ""
+
+#: config.c:2290
+msgid "unknown error occurred while reading the configuration files"
+msgstr ""
+
+#: config.c:2464
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr ""
+
+#: config.c:2509
+#, c-format
+msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
+msgstr ""
+
+#: config.c:2555
+#, c-format
+msgid "unable to parse '%s' from command-line config"
+msgstr ""
+
+#: config.c:2557
+#, c-format
+msgid "bad config variable '%s' in file '%s' at line %d"
+msgstr ""
+
+#: config.c:2641
+#, c-format
+msgid "invalid section name '%s'"
+msgstr ""
+
+#: config.c:2673
+#, c-format
+msgid "%s has multiple values"
+msgstr ""
+
+#: config.c:2702
+#, c-format
+msgid "failed to write new configuration file %s"
+msgstr ""
+
+#: config.c:2954 config.c:3280
+#, c-format
+msgid "could not lock config file %s"
+msgstr ""
+
+#: config.c:2965
+#, c-format
+msgid "opening %s"
+msgstr ""
+
+#: config.c:3002 builtin/config.c:361
+#, c-format
+msgid "invalid pattern: %s"
+msgstr ""
+
+#: config.c:3027
+#, c-format
+msgid "invalid config file %s"
+msgstr ""
+
+#: config.c:3040 config.c:3293
+#, c-format
+msgid "fstat on %s failed"
+msgstr ""
+
+#: config.c:3051
+#, c-format
+msgid "unable to mmap '%s'"
+msgstr ""
+
+#: config.c:3060 config.c:3298
+#, c-format
+msgid "chmod on %s failed"
+msgstr ""
+
+#: config.c:3145 config.c:3395
+#, c-format
+msgid "could not write config file %s"
+msgstr ""
+
+#: config.c:3179
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr ""
+
+#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#, c-format
+msgid "could not unset '%s'"
+msgstr ""
+
+#: config.c:3271
+#, c-format
+msgid "invalid section name: %s"
+msgstr ""
+
+#: config.c:3438
+#, c-format
+msgid "missing value for '%s'"
+msgstr ""
+
+#: 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 ""
+
+#: connect.c:81
+#, c-format
+msgid "server doesn't support '%s'"
+msgstr ""
+
+#: connect.c:118
+#, c-format
+msgid "server doesn't support feature '%s'"
+msgstr ""
+
+#: 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
+#, c-format
+msgid "protocol error: expected shallow sha-1, got '%s'"
+msgstr ""
+
+#: 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 ""
+
+#: connect.c:497
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr ""
+
+#: connect.c:526
+#, c-format
+msgid "invalid ls-refs response: %s"
+msgstr ""
+
+#: connect.c:530
+msgid "expected flush after ref listing"
+msgstr ""
+
+#: connect.c:533
+msgid "expected response end packet after ref listing"
+msgstr ""
+
+#: connect.c:666
+#, c-format
+msgid "protocol '%s' is not supported"
+msgstr ""
+
+#: connect.c:717
+msgid "unable to set SO_KEEPALIVE on socket"
+msgstr ""
+
+#: connect.c:757 connect.c:820
+#, c-format
+msgid "Looking up %s ... "
+msgstr ""
+
+#: connect.c:761
+#, c-format
+msgid "unable to look up %s (port %s) (%s)"
+msgstr ""
+
+#. TRANSLATORS: this is the end of "Looking up %s ... "
+#: connect.c:765 connect.c:836
+#, c-format
+msgid ""
+"done.\n"
+"Connecting to %s (port %s) ... "
+msgstr ""
+
+#: connect.c:787 connect.c:864
+#, c-format
+msgid ""
+"unable to connect to %s:\n"
+"%s"
+msgstr ""
+
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+#: connect.c:793 connect.c:870
+msgid "done."
+msgstr ""
+
+#: connect.c:824
+#, c-format
+msgid "unable to look up %s (%s)"
+msgstr ""
+
+#: connect.c:830
+#, c-format
+msgid "unknown port %s"
+msgstr ""
+
+#: connect.c:967 connect.c:1299
+#, c-format
+msgid "strange hostname '%s' blocked"
+msgstr ""
+
+#: connect.c:969
+#, c-format
+msgid "strange port '%s' blocked"
+msgstr ""
+
+#: connect.c:979
+#, c-format
+msgid "cannot start proxy %s"
+msgstr ""
+
+#: connect.c:1050
+msgid "no path specified; see 'git help pull' for valid url syntax"
+msgstr ""
+
+#: connect.c:1190
+msgid "newline is forbidden in git:// hosts and repo paths"
+msgstr ""
+
+#: connect.c:1247
+msgid "ssh variant 'simple' does not support -4"
+msgstr ""
+
+#: connect.c:1259
+msgid "ssh variant 'simple' does not support -6"
+msgstr ""
+
+#: connect.c:1276
+msgid "ssh variant 'simple' does not support setting port"
+msgstr ""
+
+#: connect.c:1388
+#, c-format
+msgid "strange pathname '%s' blocked"
+msgstr ""
+
+#: connect.c:1436
+msgid "unable to fork"
+msgstr ""
+
+#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45
+msgid "Checking connectivity"
+msgstr ""
+
+#: connected.c:120
+msgid "Could not run 'git rev-list'"
+msgstr ""
+
+#: connected.c:144
+msgid "failed write to rev-list"
+msgstr ""
+
+#: connected.c:149
+msgid "failed to close rev-list's stdin"
+msgstr ""
+
+#: convert.c:194
+#, c-format
+msgid "illegal crlf_action %d"
+msgstr ""
+
+#: convert.c:207
+#, c-format
+msgid "CRLF would be replaced by LF in %s"
+msgstr ""
+
+#: 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:217
+#, c-format
+msgid "LF would be replaced by CRLF in %s"
+msgstr ""
+
+#: 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:284
+#, c-format
+msgid "BOM is prohibited in '%s' if encoded as %s"
+msgstr ""
+
+#: 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
+#, c-format
+msgid "failed to encode '%s' from %s to %s"
+msgstr ""
+
+#: convert.c:462
+#, c-format
+msgid "encoding '%s' from %s to %s and back is not the same"
+msgstr ""
+
+#: convert.c:665
+#, c-format
+msgid "cannot fork to run external filter '%s'"
+msgstr ""
+
+#: convert.c:685
+#, c-format
+msgid "cannot feed the input to external filter '%s'"
+msgstr ""
+
+#: convert.c:692
+#, c-format
+msgid "external filter '%s' failed %d"
+msgstr ""
+
+#: convert.c:727 convert.c:730
+#, c-format
+msgid "read from external filter '%s' failed"
+msgstr ""
+
+#: convert.c:733 convert.c:788
+#, c-format
+msgid "external filter '%s' failed"
+msgstr ""
+
+#: 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 ""
+
+#: convert.c:1240
+msgid "true/false are no valid working-tree-encodings"
+msgstr ""
+
+#: convert.c:1428 convert.c:1462
+#, c-format
+msgid "%s: clean filter '%s' failed"
+msgstr ""
+
+#: convert.c:1508
+#, c-format
+msgid "%s: smudge filter %s failed"
+msgstr ""
+
+#: 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:144
+#, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:151
+#, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:158
+#, c-format
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:165
+#, c-format
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:171
+#, c-format
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:178
+#, c-format
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:189
+#, c-format
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANSLATORS: "%s" is "<n> years"
+#: date.c:192
+#, c-format
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:197 date.c:202
+#, c-format
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: delta-islands.c:272
+msgid "Propagating island marks"
+msgstr ""
+
+#: delta-islands.c:290
+#, c-format
+msgid "bad tree object %s"
+msgstr ""
+
+#: delta-islands.c:334
+#, c-format
+msgid "failed to load island regex for '%s': %s"
+msgstr ""
+
+#: delta-islands.c:390
+#, c-format
+msgid "island regex from config has too many capture groups (max=%d)"
+msgstr ""
+
+#: delta-islands.c:467
+#, c-format
+msgid "Marked %d islands, done.\n"
+msgstr ""
+
+#: diff-merges.c:70
+#, c-format
+msgid "unknown value for --diff-merges: %s"
+msgstr ""
+
+#: diff-lib.c:534
+msgid "--merge-base does not work with ranges"
+msgstr ""
+
+#: diff-lib.c:536
+msgid "--merge-base only works with commits"
+msgstr ""
+
+#: diff-lib.c:553
+msgid "unable to get HEAD"
+msgstr ""
+
+#: diff-lib.c:560
+msgid "no merge base found"
+msgstr ""
+
+#: diff-lib.c:562
+msgid "multiple merge bases found"
+msgstr ""
+
+#: diff-no-index.c:238
+msgid "git diff --no-index [<options>] <path> <path>"
+msgstr ""
+
+#: 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 ""
+
+#: diff.c:161
+#, c-format
+msgid " Unknown dirstat parameter '%s'\n"
+msgstr ""
+
+#: 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 ""
+
+#: diff.c:470
+#, c-format
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
+msgstr ""
+
+#: diff.c:4276
+#, c-format
+msgid "external diff died, stopping at %s"
+msgstr ""
+
+#: diff.c:4628
+msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+msgstr ""
+
+#: diff.c:4631
+msgid "-G, -S and --find-object are mutually exclusive"
+msgstr ""
+
+#: diff.c:4710
+msgid "--follow requires exactly one pathspec"
+msgstr ""
+
+#: diff.c:4758
+#, c-format
+msgid "invalid --stat value: %s"
+msgstr ""
+
+#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306
+#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#, c-format
+msgid "%s expects a numerical value"
+msgstr ""
+
+#: diff.c:4795
+#, c-format
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
+msgstr ""
+
+#: diff.c:4880
+#, c-format
+msgid "unknown change class '%c' in --diff-filter=%s"
+msgstr ""
+
+#: diff.c:4904
+#, c-format
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr ""
+
+#: diff.c:4918
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr ""
+
+#: diff.c:4968 diff.c:4974
+#, c-format
+msgid "%s expects <n>/<m> form"
+msgstr ""
+
+#: diff.c:4986
+#, c-format
+msgid "%s expects a character, got '%s'"
+msgstr ""
+
+#: diff.c:5007
+#, c-format
+msgid "bad --color-moved argument: %s"
+msgstr ""
+
+#: diff.c:5026
+#, c-format
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr ""
+
+#: diff.c:5066
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+msgstr ""
+
+#: diff.c:5102 diff.c:5122
+#, c-format
+msgid "invalid argument to %s"
+msgstr ""
+
+#: diff.c:5226
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr ""
+
+#: diff.c:5275
+#, c-format
+msgid "failed to parse --submodule option parameter: '%s'"
+msgstr ""
+
+#: diff.c:5331
+#, c-format
+msgid "bad --word-diff argument: %s"
+msgstr ""
+
+#: diff.c:5367
+msgid "Diff output format options"
+msgstr ""
+
+#: diff.c:5369 diff.c:5375
+msgid "generate patch"
+msgstr ""
+
+#: diff.c:5372 builtin/log.c:179
+msgid "suppress diff output"
+msgstr ""
+
+#: diff.c:5377 diff.c:5491 diff.c:5498
+msgid "<n>"
+msgstr ""
+
+#: diff.c:5378 diff.c:5381
+msgid "generate diffs with <n> lines context"
+msgstr ""
+
+#: diff.c:5383
+msgid "generate the diff in raw format"
+msgstr ""
+
+#: diff.c:5386
+msgid "synonym for '-p --raw'"
+msgstr ""
+
+#: diff.c:5390
+msgid "synonym for '-p --stat'"
+msgstr ""
+
+#: diff.c:5394
+msgid "machine friendly --stat"
+msgstr ""
+
+#: diff.c:5397
+msgid "output only the last line of --stat"
+msgstr ""
+
+#: diff.c:5399 diff.c:5407
+msgid "<param1,param2>..."
+msgstr ""
+
+#: diff.c:5400
+msgid ""
+"output the distribution of relative amount of changes for each sub-directory"
+msgstr ""
+
+#: diff.c:5404
+msgid "synonym for --dirstat=cumulative"
+msgstr ""
+
+#: diff.c:5408
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr ""
+
+#: diff.c:5412
+msgid "warn if changes introduce conflict markers or whitespace errors"
+msgstr ""
+
+#: diff.c:5415
+msgid "condensed summary such as creations, renames and mode changes"
+msgstr ""
+
+#: diff.c:5418
+msgid "show only names of changed files"
+msgstr ""
+
+#: diff.c:5421
+msgid "show only names and status of changed files"
+msgstr ""
+
+#: diff.c:5423
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr ""
+
+#: diff.c:5424
+msgid "generate diffstat"
+msgstr ""
+
+#: diff.c:5426 diff.c:5429 diff.c:5432
+msgid "<width>"
+msgstr ""
+
+#: diff.c:5427
+msgid "generate diffstat with a given width"
+msgstr ""
+
+#: diff.c:5430
+msgid "generate diffstat with a given name width"
+msgstr ""
+
+#: diff.c:5433
+msgid "generate diffstat with a given graph width"
+msgstr ""
+
+#: diff.c:5435
+msgid "<count>"
+msgstr ""
+
+#: diff.c:5436
+msgid "generate diffstat with limited lines"
+msgstr ""
+
+#: diff.c:5439
+msgid "generate compact summary in diffstat"
+msgstr ""
+
+#: diff.c:5442
+msgid "output a binary diff that can be applied"
+msgstr ""
+
+#: diff.c:5445
+msgid "show full pre- and post-image object names on the \"index\" lines"
+msgstr ""
+
+#: diff.c:5447
+msgid "show colored diff"
+msgstr ""
+
+#: diff.c:5448
+msgid "<kind>"
+msgstr ""
+
+#: diff.c:5449
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
+msgstr ""
+
+#: diff.c:5452
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+
+#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570
+msgid "<prefix>"
+msgstr ""
+
+#: diff.c:5456
+msgid "show the given source prefix instead of \"a/\""
+msgstr ""
+
+#: diff.c:5459
+msgid "show the given destination prefix instead of \"b/\""
+msgstr ""
+
+#: diff.c:5462
+msgid "prepend an additional prefix to every line of output"
+msgstr ""
+
+#: diff.c:5465
+msgid "do not show any source or destination prefix"
+msgstr ""
+
+#: diff.c:5468
+msgid "show context between diff hunks up to the specified number of lines"
+msgstr ""
+
+#: diff.c:5472 diff.c:5477 diff.c:5482
+msgid "<char>"
+msgstr ""
+
+#: diff.c:5473
+msgid "specify the character to indicate a new line instead of '+'"
+msgstr ""
+
+#: diff.c:5478
+msgid "specify the character to indicate an old line instead of '-'"
+msgstr ""
+
+#: diff.c:5483
+msgid "specify the character to indicate a context instead of ' '"
+msgstr ""
+
+#: diff.c:5486
+msgid "Diff rename options"
+msgstr ""
+
+#: diff.c:5487
+msgid "<n>[/<m>]"
+msgstr ""
+
+#: diff.c:5488
+msgid "break complete rewrite changes into pairs of delete and create"
+msgstr ""
+
+#: diff.c:5492
+msgid "detect renames"
+msgstr ""
+
+#: diff.c:5496
+msgid "omit the preimage for deletes"
+msgstr ""
+
+#: diff.c:5499
+msgid "detect copies"
+msgstr ""
+
+#: diff.c:5503
+msgid "use unmodified files as source to find copies"
+msgstr ""
+
+#: diff.c:5505
+msgid "disable rename detection"
+msgstr ""
+
+#: diff.c:5508
+msgid "use empty blobs as rename source"
+msgstr ""
+
+#: diff.c:5510
+msgid "continue listing the history of a file beyond renames"
+msgstr ""
+
+#: diff.c:5513
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
+msgstr ""
+
+#: diff.c:5515
+msgid "Diff algorithm options"
+msgstr ""
+
+#: diff.c:5517
+msgid "produce the smallest possible diff"
+msgstr ""
+
+#: diff.c:5520
+msgid "ignore whitespace when comparing lines"
+msgstr ""
+
+#: diff.c:5523
+msgid "ignore changes in amount of whitespace"
+msgstr ""
+
+#: diff.c:5526
+msgid "ignore changes in whitespace at EOL"
+msgstr ""
+
+#: diff.c:5529
+msgid "ignore carrier-return at the end of line"
+msgstr ""
+
+#: diff.c:5532
+msgid "ignore changes whose lines are all blank"
+msgstr ""
+
+#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604
+msgid "<regex>"
+msgstr ""
+
+#: diff.c:5535
+msgid "ignore changes whose all lines match <regex>"
+msgstr ""
+
+#: diff.c:5538
+msgid "heuristic to shift diff hunk boundaries for easy reading"
+msgstr ""
+
+#: diff.c:5541
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr ""
+
+#: diff.c:5545
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr ""
+
+#: diff.c:5547
+msgid "<algorithm>"
+msgstr ""
+
+#: diff.c:5548
+msgid "choose a diff algorithm"
+msgstr ""
+
+#: diff.c:5550
+msgid "<text>"
+msgstr ""
+
+#: diff.c:5551
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr ""
+
+#: diff.c:5553 diff.c:5562 diff.c:5565
+msgid "<mode>"
+msgstr ""
+
+#: diff.c:5554
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr ""
+
+#: diff.c:5557
+msgid "use <regex> to decide what a word is"
+msgstr ""
+
+#: diff.c:5560
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr ""
+
+#: diff.c:5563
+msgid "moved lines of code are colored differently"
+msgstr ""
+
+#: diff.c:5566
+msgid "how white spaces are ignored in --color-moved"
+msgstr ""
+
+#: diff.c:5569
+msgid "Other diff options"
+msgstr ""
+
+#: diff.c:5571
+msgid "when run from subdir, exclude changes outside and show relative paths"
+msgstr ""
+
+#: diff.c:5575
+msgid "treat all files as text"
+msgstr ""
+
+#: diff.c:5577
+msgid "swap two inputs, reverse the diff"
+msgstr ""
+
+#: diff.c:5579
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr ""
+
+#: diff.c:5581
+msgid "disable all output of the program"
+msgstr ""
+
+#: diff.c:5583
+msgid "allow an external diff helper to be executed"
+msgstr ""
+
+#: diff.c:5585
+msgid "run external text conversion filters when comparing binary files"
+msgstr ""
+
+#: diff.c:5587
+msgid "<when>"
+msgstr ""
+
+#: diff.c:5588
+msgid "ignore changes to submodules in the diff generation"
+msgstr ""
+
+#: diff.c:5591
+msgid "<format>"
+msgstr ""
+
+#: diff.c:5592
+msgid "specify how differences in submodules are shown"
+msgstr ""
+
+#: diff.c:5596
+msgid "hide 'git add -N' entries from the index"
+msgstr ""
+
+#: diff.c:5599
+msgid "treat 'git add -N' entries as real in the index"
+msgstr ""
+
+#: diff.c:5601
+msgid "<string>"
+msgstr ""
+
+#: diff.c:5602
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"string"
+msgstr ""
+
+#: diff.c:5605
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
+msgstr ""
+
+#: diff.c:5608
+msgid "show all changes in the changeset with -S or -G"
+msgstr ""
+
+#: diff.c:5611
+msgid "treat <string> in -S as extended POSIX regular expression"
+msgstr ""
+
+#: diff.c:5614
+msgid "control the order in which files appear in the output"
+msgstr ""
+
+#: diff.c:5615 diff.c:5618
+msgid "<path>"
+msgstr ""
+
+#: diff.c:5616
+msgid "show the change in the specified path first"
+msgstr ""
+
+#: diff.c:5619
+msgid "skip the output to the specified path"
+msgstr ""
+
+#: diff.c:5621
+msgid "<object-id>"
+msgstr ""
+
+#: diff.c:5622
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"object"
+msgstr ""
+
+#: diff.c:5624
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr ""
+
+#: diff.c:5625
+msgid "select files by diff type"
+msgstr ""
+
+#: diff.c:5627
+msgid "<file>"
+msgstr ""
+
+#: diff.c:5628
+msgid "Output to a specific file"
+msgstr ""
+
+#: diff.c:6285
+msgid "inexact rename detection was skipped due to too many files."
+msgstr ""
+
+#: diff.c:6288
+msgid "only found copies from modified paths due to too many files."
+msgstr ""
+
+#: diff.c:6291
+#, c-format
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr ""
+
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr ""
+
+#: diffcore-rename.c:786
+msgid "Performing inexact rename detection"
+msgstr ""
+
+#: diffcore-rotate.c:29
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr ""
+
+#: dir.c:578
+#, c-format
+msgid "pathspec '%s' did not match any file(s) known to git"
+msgstr ""
+
+#: 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:2305
+#, c-format
+msgid "could not open directory '%s'"
+msgstr ""
+
+#: 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:3534
+#, c-format
+msgid "index file corrupt in repo %s"
+msgstr ""
+
+#: dir.c:3579 dir.c:3584
+#, c-format
+msgid "could not create directories for %s"
+msgstr ""
+
+#: dir.c:3613
+#, c-format
+msgid "could not migrate git directory from '%s' to '%s'"
+msgstr ""
+
+#: editor.c:74
+#, c-format
+msgid "hint: Waiting for your editor to close the file...%c"
+msgstr ""
+
+#: entry.c:177
+msgid "Filtering content"
+msgstr ""
+
+#: entry.c:478
+#, c-format
+msgid "could not stat file '%s'"
+msgstr ""
+
+#: environment.c:152
+#, c-format
+msgid "bad git namespace path \"%s\""
+msgstr ""
+
+#: environment.c:335
+#, c-format
+msgid "could not set GIT_DIR to '%s'"
+msgstr ""
+
+#: exec-cmd.c:363
+#, c-format
+msgid "too many args to run %s"
+msgstr ""
+
+#: fetch-pack.c:177
+msgid "git fetch-pack: expected shallow list"
+msgstr ""
+
+#: fetch-pack.c:180
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr ""
+
+#: fetch-pack.c:191
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+msgstr ""
+
+#: fetch-pack.c:211
+#, c-format
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr ""
+
+#: fetch-pack.c:222
+msgid "unable to write to remote"
+msgstr ""
+
+#: fetch-pack.c:283
+msgid "--stateless-rpc requires multi_ack_detailed"
+msgstr ""
+
+#: fetch-pack.c:378 fetch-pack.c:1457
+#, c-format
+msgid "invalid shallow line: %s"
+msgstr ""
+
+#: fetch-pack.c:384 fetch-pack.c:1463
+#, c-format
+msgid "invalid unshallow line: %s"
+msgstr ""
+
+#: fetch-pack.c:386 fetch-pack.c:1465
+#, c-format
+msgid "object not found: %s"
+msgstr ""
+
+#: fetch-pack.c:389 fetch-pack.c:1468
+#, c-format
+msgid "error in object: %s"
+msgstr ""
+
+#: fetch-pack.c:391 fetch-pack.c:1470
+#, c-format
+msgid "no shallow found: %s"
+msgstr ""
+
+#: fetch-pack.c:394 fetch-pack.c:1474
+#, c-format
+msgid "expected shallow/unshallow, got %s"
+msgstr ""
+
+#: fetch-pack.c:434
+#, c-format
+msgid "got %s %d %s"
+msgstr ""
+
+#: fetch-pack.c:451
+#, c-format
+msgid "invalid commit %s"
+msgstr ""
+
+#: fetch-pack.c:482
+msgid "giving up"
+msgstr ""
+
+#: fetch-pack.c:495 progress.c:339
+msgid "done"
+msgstr ""
+
+#: fetch-pack.c:507
+#, c-format
+msgid "got %s (%d) %s"
+msgstr ""
+
+#: fetch-pack.c:543
+#, c-format
+msgid "Marking %s as complete"
+msgstr ""
+
+#: fetch-pack.c:758
+#, c-format
+msgid "already have %s (%s)"
+msgstr ""
+
+#: fetch-pack.c:844
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr ""
+
+#: fetch-pack.c:852
+msgid "protocol error: bad pack header"
+msgstr ""
+
+#: fetch-pack.c:946
+#, c-format
+msgid "fetch-pack: unable to fork off %s"
+msgstr ""
+
+#: fetch-pack.c:952
+msgid "fetch-pack: invalid index-pack output"
+msgstr ""
+
+#: fetch-pack.c:969
+#, c-format
+msgid "%s failed"
+msgstr ""
+
+#: fetch-pack.c:971
+msgid "error in sideband demultiplexer"
+msgstr ""
+
+#: fetch-pack.c:1031
+#, c-format
+msgid "Server version is %.*s"
+msgstr ""
+
+#: fetch-pack.c:1039 fetch-pack.c:1045 fetch-pack.c:1048 fetch-pack.c:1054
+#: fetch-pack.c:1058 fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070
+#: fetch-pack.c:1074 fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086
+#: fetch-pack.c:1092 fetch-pack.c:1098 fetch-pack.c:1103 fetch-pack.c:1108
+#, c-format
+msgid "Server supports %s"
+msgstr ""
+
+#: fetch-pack.c:1041
+msgid "Server does not support shallow clients"
+msgstr ""
+
+#: fetch-pack.c:1101
+msgid "Server does not support --shallow-since"
+msgstr ""
+
+#: fetch-pack.c:1106
+msgid "Server does not support --shallow-exclude"
+msgstr ""
+
+#: fetch-pack.c:1110
+msgid "Server does not support --deepen"
+msgstr ""
+
+#: fetch-pack.c:1112
+msgid "Server does not support this repository's object format"
+msgstr ""
+
+#: fetch-pack.c:1125
+msgid "no common commits"
+msgstr ""
+
+#: fetch-pack.c:1138 fetch-pack.c:1682
+msgid "git fetch-pack: fetch failed."
+msgstr ""
+
+#: fetch-pack.c:1265
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr ""
+
+#: fetch-pack.c:1269
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr ""
+
+#: fetch-pack.c:1289
+msgid "Server does not support shallow requests"
+msgstr ""
+
+#: fetch-pack.c:1296
+msgid "Server supports filter"
+msgstr ""
+
+#: fetch-pack.c:1335
+msgid "unable to write request to remote"
+msgstr ""
+
+#: fetch-pack.c:1353
+#, c-format
+msgid "error reading section header '%s'"
+msgstr ""
+
+#: fetch-pack.c:1359
+#, c-format
+msgid "expected '%s', received '%s'"
+msgstr ""
+
+#: fetch-pack.c:1420
+#, c-format
+msgid "unexpected acknowledgment line: '%s'"
+msgstr ""
+
+#: fetch-pack.c:1425
+#, c-format
+msgid "error processing acks: %d"
+msgstr ""
+
+#: fetch-pack.c:1435
+msgid "expected packfile to be sent after 'ready'"
+msgstr ""
+
+#: fetch-pack.c:1437
+msgid "expected no other sections to be sent after no 'ready'"
+msgstr ""
+
+#: fetch-pack.c:1479
+#, c-format
+msgid "error processing shallow info: %d"
+msgstr ""
+
+#: fetch-pack.c:1526
+#, c-format
+msgid "expected wanted-ref, got '%s'"
+msgstr ""
+
+#: fetch-pack.c:1531
+#, c-format
+msgid "unexpected wanted-ref: '%s'"
+msgstr ""
+
+#: fetch-pack.c:1536
+#, c-format
+msgid "error processing wanted refs: %d"
+msgstr ""
+
+#: fetch-pack.c:1566
+msgid "git fetch-pack: expected response end packet"
+msgstr ""
+
+#: fetch-pack.c:1960
+msgid "no matching remote head"
+msgstr ""
+
+#: fetch-pack.c:1983 builtin/clone.c:693
+msgid "remote did not send all necessary objects"
+msgstr ""
+
+#: fetch-pack.c:2010
+#, c-format
+msgid "no such remote ref %s"
+msgstr ""
+
+#: fetch-pack.c:2013
+#, c-format
+msgid "Server does not allow request for unadvertised object %s"
+msgstr ""
+
+#: gpg-interface.c:273
+msgid "could not create temporary file"
+msgstr ""
+
+#: gpg-interface.c:276
+#, c-format
+msgid "failed writing detached signature to '%s'"
+msgstr ""
+
+#: gpg-interface.c:470
+msgid "gpg failed to sign the data"
+msgstr ""
+
+#: graph.c:98
+#, c-format
+msgid "ignore invalid color '%.*s' in log.graphColors"
+msgstr ""
+
+#: grep.c:543
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
+msgstr ""
+
+#: grep.c:1906
+#, c-format
+msgid "'%s': unable to read %s"
+msgstr ""
+
+#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90
+#: builtin/rm.c:135
+#, c-format
+msgid "failed to stat '%s'"
+msgstr ""
+
+#: grep.c:1934
+#, c-format
+msgid "'%s': short read"
+msgstr ""
+
+#: help.c:23
+msgid "start a working area (see also: git help tutorial)"
+msgstr ""
+
+#: help.c:24
+msgid "work on the current change (see also: git help everyday)"
+msgstr ""
+
+#: help.c:25
+msgid "examine the history and state (see also: git help revisions)"
+msgstr ""
+
+#: help.c:26
+msgid "grow, mark and tweak your common history"
+msgstr ""
+
+#: help.c:27
+msgid "collaborate (see also: git help workflows)"
+msgstr ""
+
+#: 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 ""
+
+#: help.c:307
+msgid "git commands available from elsewhere on your $PATH"
+msgstr ""
+
+#: help.c:316
+msgid "These are common Git commands used in various situations:"
+msgstr ""
+
+#: help.c:365 git.c:100
+#, c-format
+msgid "unsupported command listing type '%s'"
+msgstr ""
+
+#: help.c:405
+msgid "The Git concept guides are:"
+msgstr ""
+
+#: help.c:429
+msgid "See 'git help <command>' to read about a specific subcommand"
+msgstr ""
+
+#: help.c:434
+msgid "External commands"
+msgstr ""
+
+#: help.c:449
+msgid "Command aliases"
+msgstr ""
+
+#: help.c:527
+#, 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:543 help.c:631
+#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr ""
+
+#: help.c:591
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr ""
+
+#: help.c:613
+#, c-format
+msgid "WARNING: You called a Git command named '%s', which does not exist."
+msgstr ""
+
+#: help.c:618
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr ""
+
+#: help.c:623
+#, c-format
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgstr ""
+
+#: help.c:635
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] ""
+msgstr[1] ""
+
+#: help.c:675
+msgid "git version [<options>]"
+msgstr ""
+
+#: help.c:730
+#, c-format
+msgid "%s: %s - %s"
+msgstr ""
+
+#: help.c:734
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+msgstr[1] ""
+
+#: 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"
+"\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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: ident.c:433
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr ""
+
+#: ident.c:439
+#, c-format
+msgid "name consists only of disallowed characters: %s"
+msgstr ""
+
+#: ident.c:454 builtin/commit.c:634
+#, c-format
+msgid "invalid date format: %s"
+msgstr ""
+
+#: 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
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr ""
+
+#: 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
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr ""
+
+#: list-objects-filter.c:495
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr ""
+
+#: 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
+#, 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"
+"\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 ""
+
+#: lockfile.c:160
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr ""
+
+#: ls-refs.c:37
+#, c-format
+msgid "invalid value '%s' for lsrefs.unborn"
+msgstr ""
+
+#: ls-refs.c:167
+msgid "expected flush after ls-refs arguments"
+msgstr ""
+
+#: merge-ort.c:888 merge-recursive.c:1191
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr ""
+
+#: merge-ort.c:897 merge-recursive.c:1198
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr ""
+
+#: merge-ort.c:906 merge-recursive.c:1205
+#, c-format
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
+msgstr ""
+
+#: merge-ort.c:916 merge-ort.c:923
+#, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr ""
+
+#: merge-ort.c:944
+msgid "Failed to merge submodule %s"
+msgstr ""
+
+#: merge-ort.c:951
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but a possible merge resolution exists:\n"
+"%s\n"
+msgstr ""
+
+#: merge-ort.c:955 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-ort.c:968
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but multiple possible merges exist:\n"
+"%s"
+msgstr ""
+
+#: merge-ort.c:1127 merge-recursive.c:1341
+msgid "Failed to execute internal merge"
+msgstr ""
+
+#: merge-ort.c:1132 merge-recursive.c:1346
+#, c-format
+msgid "Unable to add %s to database"
+msgstr ""
+
+#: merge-ort.c:1139 merge-recursive.c:1378
+#, c-format
+msgid "Auto-merging %s"
+msgstr ""
+
+#: merge-ort.c:1278 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-ort.c:1288 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-ort.c:1471
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
+"renamed to multiple other directories, with no destination getting a "
+"majority of the files."
+msgstr ""
+
+#: merge-ort.c:1637 merge-recursive.c:2447
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr ""
+
+#: merge-ort.c:1781 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-ort.c:1788 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-ort.c:1801 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-ort.c:1809 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-ort.c:1952
+#, c-format
+msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
+msgstr ""
+
+#: merge-ort.c:2047
+#, c-format
+msgid ""
+"CONFLICT (rename involved in collision): rename of %s -> %s has content "
+"conflicts AND collides with another path; this may result in nested conflict "
+"markers."
+msgstr ""
+
+#: merge-ort.c:2066 merge-ort.c:2090
+#, c-format
+msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
+msgstr ""
+
+#: merge-ort.c:2735
+#, c-format
+msgid ""
+"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
+"%s instead."
+msgstr ""
+
+#: merge-ort.c:2808
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed %s "
+"of them so each can be recorded somewhere."
+msgstr ""
+
+#: merge-ort.c:2812
+msgid "both"
+msgstr ""
+
+#: merge-ort.c:2812
+msgid "one"
+msgstr ""
+
+#: merge-ort.c:2907 merge-recursive.c:3052
+msgid "content"
+msgstr ""
+
+#: merge-ort.c:2909 merge-recursive.c:3056
+msgid "add/add"
+msgstr ""
+
+#: merge-ort.c:2911 merge-recursive.c:3101
+msgid "submodule"
+msgstr ""
+
+#: merge-ort.c:2913 merge-recursive.c:3102
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr ""
+
+#: merge-ort.c:2938
+#, c-format
+msgid ""
+"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
+"of %s left in tree."
+msgstr ""
+
+#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
+#. base, and 2-3) the trees for the two trees we're merging.
+#.
+#: merge-ort.c:3406
+#, c-format
+msgid "collecting merge info failed for trees %s, %s, %s"
+msgstr ""
+
+#: merge-ort-wrappers.c:13 merge-recursive.c:3661
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+" %s"
+msgstr ""
+
+#: merge-ort-wrappers.c:33 merge-recursive.c:3436
+#, c-format
+msgid "Already up to date!"
+msgstr ""
+
+#: merge-recursive.c:356
+msgid "(bad commit)\n"
+msgstr ""
+
+#: merge-recursive.c:379
+#, c-format
+msgid "add_cacheinfo failed for path '%s'; merge aborting."
+msgstr ""
+
+#: merge-recursive.c:388
+#, c-format
+msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
+msgstr ""
+
+#: merge-recursive.c:874
+#, c-format
+msgid "failed to create path '%s'%s"
+msgstr ""
+
+#: merge-recursive.c:885
+#, c-format
+msgid "Removing %s to make room for subdirectory\n"
+msgstr ""
+
+#: 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 ""
+
+#: merge-recursive.c:949 builtin/cat-file.c:41
+#, c-format
+msgid "cannot read object %s '%s'"
+msgstr ""
+
+#: merge-recursive.c:954
+#, c-format
+msgid "blob expected for %s '%s'"
+msgstr ""
+
+#: merge-recursive.c:979
+#, c-format
+msgid "failed to open '%s': %s"
+msgstr ""
+
+#: merge-recursive.c:990
+#, c-format
+msgid "failed to symlink '%s': %s"
+msgstr ""
+
+#: merge-recursive.c:995
+#, c-format
+msgid "do not know what to do with %06o %s '%s'"
+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
+#, c-format
+msgid "Fast-forwarding submodule %s"
+msgstr ""
+
+#: merge-recursive.c:1251
+#, c-format
+msgid "Failed to merge submodule %s (merge following commits not found)"
+msgstr ""
+
+#: merge-recursive.c:1255
+#, c-format
+msgid "Failed to merge submodule %s (not fast-forward)"
+msgstr ""
+
+#: merge-recursive.c:1256
+msgid "Found a possible merge resolution for the submodule:\n"
+msgstr ""
+
+#: merge-recursive.c:1268
+#, c-format
+msgid "Failed to merge submodule %s (multiple merges found)"
+msgstr ""
+
+#: merge-recursive.c:1402
+#, c-format
+msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
+msgstr ""
+
+#: 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: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: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: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: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 ""
+
+#: 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:1645
+#, c-format
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
+msgstr ""
+
+#: merge-recursive.c:1676
+#, c-format
+msgid "%s is a directory in %s adding as %s instead"
+msgstr ""
+
+#: merge-recursive.c:1681
+#, c-format
+msgid "Refusing to lose untracked file at %s; adding as %s instead"
+msgstr ""
+
+#: 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: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 ""
+
+#: 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 ""
+
+#: 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:2973
+#, c-format
+msgid "cannot read object %s"
+msgstr ""
+
+#: merge-recursive.c:2976
+#, c-format
+msgid "object %s is not a blob"
+msgstr ""
+
+#: merge-recursive.c:3040
+msgid "modify"
+msgstr ""
+
+#: merge-recursive.c:3040
+msgid "modified"
+msgstr ""
+
+#: merge-recursive.c:3079
+#, c-format
+msgid "Skipped %s (merged same as existing)"
+msgstr ""
+
+#: merge-recursive.c:3132
+#, c-format
+msgid "Adding as %s instead"
+msgstr ""
+
+#: merge-recursive.c:3339
+#, c-format
+msgid "Removing %s"
+msgstr ""
+
+#: 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 ""
+
+#: merge-recursive.c:3383
+#, c-format
+msgid "Adding %s"
+msgstr ""
+
+#: merge-recursive.c:3392
+#, c-format
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr ""
+
+#: merge-recursive.c:3445
+#, c-format
+msgid "merging of trees %s and %s failed"
+msgstr ""
+
+#: merge-recursive.c:3539
+msgid "Merging:"
+msgstr ""
+
+#: merge-recursive.c:3552
+#, c-format
+msgid "found %u common ancestor:"
+msgid_plural "found %u common ancestors:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: merge-recursive.c:3602
+msgid "merge returned no commit"
+msgstr ""
+
+#: merge-recursive.c:3758
+#, c-format
+msgid "Could not parse object '%s'"
+msgstr ""
+
+#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896
+#: builtin/stash.c:471
+msgid "Unable to write index."
+msgstr ""
+
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr ""
+
+#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917
+#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817
+#: builtin/stash.c:265
+msgid "unable to write new index file"
+msgstr ""
+
+#: midx.c:62
+msgid "multi-pack-index OID fanout is of the wrong size"
+msgstr ""
+
+#: midx.c:93
+#, c-format
+msgid "multi-pack-index file %s is too small"
+msgstr ""
+
+#: midx.c:109
+#, c-format
+msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
+msgstr ""
+
+#: midx.c:114
+#, c-format
+msgid "multi-pack-index version %d not recognized"
+msgstr ""
+
+#: midx.c:119
+#, c-format
+msgid "multi-pack-index hash version %u does not match version %u"
+msgstr ""
+
+#: midx.c:136
+msgid "multi-pack-index missing required pack-name chunk"
+msgstr ""
+
+#: midx.c:138
+msgid "multi-pack-index missing required OID fanout chunk"
+msgstr ""
+
+#: midx.c:140
+msgid "multi-pack-index missing required OID lookup chunk"
+msgstr ""
+
+#: midx.c:142
+msgid "multi-pack-index missing required object offsets chunk"
+msgstr ""
+
+#: midx.c:158
+#, c-format
+msgid "multi-pack-index pack names out of order: '%s' before '%s'"
+msgstr ""
+
+#: midx.c:202
+#, c-format
+msgid "bad pack-int-id: %u (%u total packs)"
+msgstr ""
+
+#: midx.c:252
+msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
+msgstr ""
+
+#: midx.c:467
+#, c-format
+msgid "failed to add packfile '%s'"
+msgstr ""
+
+#: midx.c:473
+#, c-format
+msgid "failed to open pack-index '%s'"
+msgstr ""
+
+#: midx.c:533
+#, c-format
+msgid "failed to locate object %d in packfile"
+msgstr ""
+
+#: midx.c:821
+msgid "Adding packfiles to multi-pack-index"
+msgstr ""
+
+#: midx.c:855
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr ""
+
+#: midx.c:904
+msgid "no pack files to index."
+msgstr ""
+
+#: midx.c:965
+#, c-format
+msgid "failed to clear multi-pack-index at %s"
+msgstr ""
+
+#: midx.c:1021
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr ""
+
+#: midx.c:1029
+msgid "Looking for referenced packfiles"
+msgstr ""
+
+#: midx.c:1044
+#, c-format
+msgid ""
+"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+msgstr ""
+
+#: midx.c:1049
+msgid "the midx contains no oid"
+msgstr ""
+
+#: midx.c:1058
+msgid "Verifying OID order in multi-pack-index"
+msgstr ""
+
+#: midx.c:1067
+#, c-format
+msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
+msgstr ""
+
+#: midx.c:1087
+msgid "Sorting objects by packfile"
+msgstr ""
+
+#: midx.c:1094
+msgid "Verifying object offsets"
+msgstr ""
+
+#: midx.c:1110
+#, c-format
+msgid "failed to load pack entry for oid[%d] = %s"
+msgstr ""
+
+#: midx.c:1116
+#, c-format
+msgid "failed to load pack-index for packfile %s"
+msgstr ""
+
+#: midx.c:1125
+#, c-format
+msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+msgstr ""
+
+#: midx.c:1150
+msgid "Counting referenced objects"
+msgstr ""
+
+#: midx.c:1160
+msgid "Finding and deleting unreferenced packfiles"
+msgstr ""
+
+#: midx.c:1351
+msgid "could not start pack-objects"
+msgstr ""
+
+#: midx.c:1371
+msgid "could not finish pack-objects"
+msgstr ""
+
+#: name-hash.c:538
+#, c-format
+msgid "unable to create lazy_dir thread: %s"
+msgstr ""
+
+#: name-hash.c:560
+#, c-format
+msgid "unable to create lazy_name thread: %s"
+msgstr ""
+
+#: name-hash.c:566
+#, c-format
+msgid "unable to join lazy_name thread: %s"
+msgstr ""
+
+#: 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 ""
+
+#: notes-merge.c:284
+#, c-format
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr ""
+
+#: 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-utils.c:115
+#, c-format
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr ""
+
+#. 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 ""
+
+#: object-file.c:480
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr ""
+
+#: object-file.c:531
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr ""
+
+#: object-file.c:603
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr ""
+
+#: object-file.c:610
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr ""
+
+#: object-file.c:653
+msgid "unable to fdopen alternates lockfile"
+msgstr ""
+
+#: object-file.c:671
+msgid "unable to read alternates file"
+msgstr ""
+
+#: object-file.c:678
+msgid "unable to move new alternates file into place"
+msgstr ""
+
+#: object-file.c:713
+#, c-format
+msgid "path '%s' does not exist"
+msgstr ""
+
+#: object-file.c:734
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr ""
+
+#: object-file.c:740
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr ""
+
+#: object-file.c:746
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr ""
+
+#: object-file.c:754
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr ""
+
+#: object-file.c:814
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr ""
+
+#: object-file.c:964
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr ""
+
+#: object-file.c:985
+msgid "mmap failed"
+msgstr ""
+
+#: object-file.c:1149
+#, c-format
+msgid "object file %s is empty"
+msgstr ""
+
+#: object-file.c:1284 object-file.c:2477
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr ""
+
+#: object-file.c:1286 object-file.c:2481
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr ""
+
+#: object-file.c:1328
+msgid "invalid object type"
+msgstr ""
+
+#: object-file.c:1412
+#, c-format
+msgid "unable to unpack %s header with --allow-unknown-type"
+msgstr ""
+
+#: object-file.c:1415
+#, c-format
+msgid "unable to unpack %s header"
+msgstr ""
+
+#: object-file.c:1421
+#, c-format
+msgid "unable to parse %s header with --allow-unknown-type"
+msgstr ""
+
+#: object-file.c:1424
+#, c-format
+msgid "unable to parse %s header"
+msgstr ""
+
+#: object-file.c:1651
+#, c-format
+msgid "failed to read object %s"
+msgstr ""
+
+#: object-file.c:1655
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr ""
+
+#: object-file.c:1659
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr ""
+
+#: object-file.c:1663
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr ""
+
+#: object-file.c:1768
+#, c-format
+msgid "unable to write file %s"
+msgstr ""
+
+#: object-file.c:1775
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr ""
+
+#: object-file.c:1782
+msgid "file write error"
+msgstr ""
+
+#: object-file.c:1802
+msgid "error when closing loose object file"
+msgstr ""
+
+#: object-file.c:1867
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
+msgstr ""
+
+#: object-file.c:1869
+msgid "unable to create temporary file"
+msgstr ""
+
+#: object-file.c:1893
+msgid "unable to write loose object file"
+msgstr ""
+
+#: object-file.c:1899
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr ""
+
+#: object-file.c:1903
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr ""
+
+#: object-file.c:1907
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr ""
+
+#: object-file.c:1917 builtin/pack-objects.c:1097
+#, c-format
+msgid "failed utime() on %s"
+msgstr ""
+
+#: object-file.c:1994
+#, c-format
+msgid "cannot read object for %s"
+msgstr ""
+
+#: object-file.c:2045
+msgid "corrupt commit"
+msgstr ""
+
+#: object-file.c:2053
+msgid "corrupt tag"
+msgstr ""
+
+#: object-file.c:2153
+#, c-format
+msgid "read error while indexing %s"
+msgstr ""
+
+#: object-file.c:2156
+#, c-format
+msgid "short read while indexing %s"
+msgstr ""
+
+#: object-file.c:2229 object-file.c:2239
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr ""
+
+#: object-file.c:2245
+#, c-format
+msgid "%s: unsupported file type"
+msgstr ""
+
+#: object-file.c:2269
+#, c-format
+msgid "%s is not a valid object"
+msgstr ""
+
+#: object-file.c:2271
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr ""
+
+#: object-file.c:2298 builtin/index-pack.c:192
+#, c-format
+msgid "unable to open %s"
+msgstr "tidak dapat membuka %s"
+
+#: object-file.c:2488 object-file.c:2541
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr ""
+
+#: object-file.c:2512
+#, c-format
+msgid "unable to mmap %s"
+msgstr ""
+
+#: object-file.c:2517
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr ""
+
+#: object-file.c:2523
+#, c-format
+msgid "unable to parse header of %s"
+msgstr ""
+
+#: object-file.c:2534
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr ""
+
+#: object-name.c:486
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr ""
+
+#: object-name.c:497
+msgid "The candidates are:"
+msgstr ""
+
+#: object-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 ""
+
+#: object-name.c:916
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr ""
+
+#: object-name.c:924
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr ""
+
+#: object-name.c:1702
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr ""
+
+#: object-name.c:1708
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+msgstr ""
+
+#: object-name.c:1717
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr ""
+
+#: object-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 ""
+
+#: object-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 ""
+
+#: object-name.c:1769
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr ""
+
+#: object-name.c:1771
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr ""
+
+#: object-name.c:1784
+msgid "relative path syntax can't be used outside working tree"
+msgstr ""
+
+#: object-name.c:1922
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr ""
+
+#: object.c:53
+#, c-format
+msgid "invalid object type \"%s\""
+msgstr ""
+
+#: object.c:173
+#, c-format
+msgid "object %s is a %s, not a %s"
+msgstr ""
+
+#: object.c:233
+#, c-format
+msgid "object %s has unknown type id %d"
+msgstr ""
+
+#: object.c:246
+#, c-format
+msgid "unable to parse object: %s"
+msgstr ""
+
+#: object.c:266 object.c:278
+#, c-format
+msgid "hash mismatch %s"
+msgstr ""
+
+#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226
+#, c-format
+msgid "unable to get size of %s"
+msgstr ""
+
+#: pack-bitmap.c:1489 builtin/rev-list.c:92
+msgid "unable to get disk usage of %s"
+msgstr ""
+
+#: pack-revindex.c:220
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr ""
+
+#: pack-revindex.c:225
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr ""
+
+#: pack-revindex.c:233
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr ""
+
+#: pack-revindex.c:237
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr ""
+
+#: pack-revindex.c:242
+#, c-format
+msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
+msgstr ""
+
+#: pack-write.c:236
+msgid "cannot both write and verify reverse index"
+msgstr ""
+
+#: pack-write.c:257
+msgid "could not stat: %s"
+msgstr ""
+
+#: pack-write.c:269
+#, c-format
+msgid "failed to make %s readable"
+msgstr ""
+
+#: pack-write.c:508
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr ""
+
+#: packfile.c:625
+msgid "offset before end of packfile (broken .idx?)"
+msgstr ""
+
+#: packfile.c:1934
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr ""
+
+#: packfile.c:1938
+#, 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"
+msgstr ""
+
+#: parse-options.c:73
+#, c-format
+msgid "%s is incompatible with %s"
+msgstr ""
+
+#: parse-options.c:78
+#, c-format
+msgid "%s : incompatible with something else"
+msgstr ""
+
+#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#, c-format
+msgid "%s takes no value"
+msgstr ""
+
+#: parse-options.c:94
+#, c-format
+msgid "%s isn't available"
+msgstr ""
+
+#: 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
+#, c-format
+msgid "unknown option `%s'"
+msgstr ""
+
+#: parse-options.c:864
+#, c-format
+msgid "unknown switch `%c'"
+msgstr ""
+
+#: parse-options.c:866
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
+msgstr ""
+
+#: parse-options.c:890
+msgid "..."
+msgstr ""
+
+#: parse-options.c:909
+#, c-format
+msgid "usage: %s"
+msgstr ""
+
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
+#.
+#: parse-options.c:915
+#, c-format
+msgid " or: %s"
+msgstr ""
+
+#: parse-options.c:918
+#, c-format
+msgid " %s"
+msgstr ""
+
+#: parse-options.c:957
+msgid "-NUM"
+msgstr ""
+
+#: path.c:915
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr ""
+
+#: 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 ""
+
+#: pathspec.c:151
+msgid "attr spec must not be empty"
+msgstr ""
+
+#: pathspec.c:194
+#, c-format
+msgid "invalid attribute name %s"
+msgstr ""
+
+#: pathspec.c:259
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr ""
+
+#: pathspec.c:266
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr ""
+
+#: pathspec.c:306
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr ""
+
+#: pathspec.c:327
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr ""
+
+#: pathspec.c:332
+#, c-format
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr ""
+
+#: pathspec.c:370
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr ""
+
+#: pathspec.c:429
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr ""
+
+#: pathspec.c:445
+#, c-format
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr ""
+
+#: pathspec.c:521
+#, c-format
+msgid "'%s' (mnemonic: '%c')"
+msgstr ""
+
+#: pathspec.c:531
+#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr ""
+
+#: 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 ""
+
+#: pkt-line.c:99
+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: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 ""
+
+#: pkt-line.c:352 pkt-line.c:357
+#, c-format
+msgid "protocol error: bad line length %d"
+msgstr ""
+
+#: pkt-line.c:373 sideband.c:165
+#, c-format
+msgid "remote error: %s"
+msgstr ""
+
+#: preload-index.c:125
+msgid "Refreshing index"
+msgstr ""
+
+#: preload-index.c:144
+#, c-format
+msgid "unable to create threaded lstat: %s"
+msgstr ""
+
+#: pretty.c:984
+msgid "unable to parse --pretty format"
+msgstr ""
+
+#: 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:78
+msgid "could not start `log`"
+msgstr ""
+
+#: range-diff.c:80
+msgid "could not read `log` output"
+msgstr ""
+
+#: range-diff.c:101 sequencer.c:5318
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr ""
+
+#: range-diff.c:115
+#, c-format
+msgid ""
+"could not parse first line of `log` output: did not start with 'commit ': "
+"'%s'"
+msgstr ""
+
+#: range-diff.c:140
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr ""
+
+#: range-diff.c:306
+msgid "failed to generate diff"
+msgstr ""
+
+#: range-diff.c:558
+msgid "--left-only and --right-only are mutually exclusive"
+msgstr ""
+
+#: range-diff.c:561 range-diff.c:563
+#, c-format
+msgid "could not parse log for '%s'"
+msgstr ""
+
+#: read-cache.c:682
+#, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
+msgstr ""
+
+#: 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 ""
+
+#: read-cache.c:725
+#, c-format
+msgid "'%s' does not have a commit checked out"
+msgstr ""
+
+#: read-cache.c:777
+#, c-format
+msgid "unable to index file '%s'"
+msgstr ""
+
+#: read-cache.c:796
+#, c-format
+msgid "unable to add '%s' to index"
+msgstr ""
+
+#: read-cache.c:807
+#, c-format
+msgid "unable to stat '%s'"
+msgstr ""
+
+#: read-cache.c:1318
+#, c-format
+msgid "'%s' appears as both a file and as a directory"
+msgstr ""
+
+#: read-cache.c:1532
+msgid "Refresh index"
+msgstr ""
+
+#: read-cache.c:1657
+#, c-format
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+
+#: read-cache.c:1667
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+
+#: read-cache.c:1723
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr ""
+
+#: read-cache.c:1726
+#, c-format
+msgid "bad index version %d"
+msgstr ""
+
+#: read-cache.c:1735
+msgid "bad index file sha1 signature"
+msgstr ""
+
+#: read-cache.c:1765
+#, c-format
+msgid "index uses %.4s extension, which we do not understand"
+msgstr ""
+
+#: read-cache.c:1767
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr ""
+
+#: read-cache.c:1804
+#, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr ""
+
+#: read-cache.c:1820
+#, c-format
+msgid "malformed name field in the index, near path '%s'"
+msgstr ""
+
+#: read-cache.c:1877
+msgid "unordered stage entries in index"
+msgstr ""
+
+#: read-cache.c:1880
+#, c-format
+msgid "multiple stage entries for merged file '%s'"
+msgstr ""
+
+#: read-cache.c:1883
+#, c-format
+msgid "unordered stage entries for '%s'"
+msgstr ""
+
+#: read-cache.c:1989 read-cache.c:2280 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181
+#: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991
+#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505
+#: 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:2133
+#, c-format
+msgid "unable to create load_cache_entries thread: %s"
+msgstr ""
+
+#: read-cache.c:2146
+#, c-format
+msgid "unable to join load_cache_entries thread: %s"
+msgstr ""
+
+#: read-cache.c:2179
+#, c-format
+msgid "%s: index file open failed"
+msgstr ""
+
+#: read-cache.c:2183
+#, c-format
+msgid "%s: cannot stat the open index"
+msgstr ""
+
+#: read-cache.c:2187
+#, c-format
+msgid "%s: index file smaller than expected"
+msgstr ""
+
+#: read-cache.c:2191
+#, c-format
+msgid "%s: unable to map index file"
+msgstr ""
+
+#: read-cache.c:2233
+#, c-format
+msgid "unable to create load_index_extensions thread: %s"
+msgstr ""
+
+#: read-cache.c:2260
+#, c-format
+msgid "unable to join load_index_extensions thread: %s"
+msgstr ""
+
+#: read-cache.c:2292
+#, c-format
+msgid "could not freshen shared index '%s'"
+msgstr ""
+
+#: read-cache.c:2339
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
+msgstr ""
+
+#: read-cache.c:3035 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141
+#, c-format
+msgid "could not close '%s'"
+msgstr ""
+
+#: read-cache.c:3138 sequencer.c:2487 sequencer.c:4239
+#, c-format
+msgid "could not stat '%s'"
+msgstr ""
+
+#: read-cache.c:3151
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr ""
+
+#: read-cache.c:3163
+#, c-format
+msgid "unable to unlink: %s"
+msgstr ""
+
+#: read-cache.c:3188
+#, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr ""
+
+#: read-cache.c:3337
+#, c-format
+msgid "%s: cannot drop to stage #0"
+msgstr ""
+
+#: rebase-interactive.c:11
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+
+#: rebase-interactive.c:33
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+
+#: 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 ""
+
+#: 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: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: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: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 ""
+
+#: 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:110 rerere.c:469 rerere.c:676 sequencer.c:3615
+#: sequencer.c:3641 sequencer.c:5424 builtin/fsck.c:329 builtin/rebase.c:272
+#, c-format
+msgid "could not write '%s'"
+msgstr ""
+
+#: rebase-interactive.c:116 builtin/rebase.c:204 builtin/rebase.c:230
+#: builtin/rebase.c:254
+#, c-format
+msgid "could not write '%s'."
+msgstr ""
+
+#: 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: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 ""
+
+#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2402
+#: builtin/rebase.c:190 builtin/rebase.c:215 builtin/rebase.c:241
+#: builtin/rebase.c:266
+#, c-format
+msgid "could not read '%s'."
+msgstr ""
+
+#: ref-filter.c:42 wt-status.c:1975
+msgid "gone"
+msgstr ""
+
+#: ref-filter.c:43
+#, c-format
+msgid "ahead %d"
+msgstr ""
+
+#: ref-filter.c:44
+#, c-format
+msgid "behind %d"
+msgstr ""
+
+#: ref-filter.c:45
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr ""
+
+#: ref-filter.c:175
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr ""
+
+#: ref-filter.c:177
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
+msgstr ""
+
+#: ref-filter.c:199
+#, c-format
+msgid "Integer value expected refname:lstrip=%s"
+msgstr ""
+
+#: ref-filter.c:203
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr ""
+
+#: ref-filter.c:205
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr ""
+
+#: ref-filter.c:260
+#, c-format
+msgid "%%(objecttype) does not take arguments"
+msgstr ""
+
+#: ref-filter.c:282
+#, c-format
+msgid "unrecognized %%(objectsize) argument: %s"
+msgstr ""
+
+#: ref-filter.c:290
+#, c-format
+msgid "%%(deltabase) does not take arguments"
+msgstr ""
+
+#: ref-filter.c:302
+#, c-format
+msgid "%%(body) does not take arguments"
+msgstr ""
+
+#: ref-filter.c:315
+#, c-format
+msgid "unrecognized %%(subject) argument: %s"
+msgstr ""
+
+#: ref-filter.c:334
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr ""
+
+#: ref-filter.c:336
+#, c-format
+msgid "unknown %%(trailers) argument: %s"
+msgstr ""
+
+#: ref-filter.c:367
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr ""
+
+#: ref-filter.c:369
+#, c-format
+msgid "unrecognized %%(contents) argument: %s"
+msgstr ""
+
+#: ref-filter.c:384
+#, c-format
+msgid "positive value expected '%s' in %%(%s)"
+msgstr ""
+
+#: ref-filter.c:388
+#, c-format
+msgid "unrecognized argument '%s' in %%(%s)"
+msgstr ""
+
+#: ref-filter.c:402
+#, c-format
+msgid "unrecognized email option: %s"
+msgstr ""
+
+#: ref-filter.c:432
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr ""
+
+#: ref-filter.c:444
+#, c-format
+msgid "unrecognized position:%s"
+msgstr ""
+
+#: ref-filter.c:451
+#, c-format
+msgid "unrecognized width:%s"
+msgstr ""
+
+#: ref-filter.c:460
+#, c-format
+msgid "unrecognized %%(align) argument: %s"
+msgstr ""
+
+#: ref-filter.c:468
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr ""
+
+#: ref-filter.c:486
+#, c-format
+msgid "unrecognized %%(if) argument: %s"
+msgstr ""
+
+#: ref-filter.c:588
+#, c-format
+msgid "malformed field name: %.*s"
+msgstr ""
+
+#: ref-filter.c:615
+#, c-format
+msgid "unknown field name: %.*s"
+msgstr ""
+
+#: ref-filter.c:619
+#, c-format
+msgid ""
+"not a git repository, but the field '%.*s' requires access to object data"
+msgstr ""
+
+#: ref-filter.c:743
+#, c-format
+msgid "format: %%(if) atom used without a %%(then) atom"
+msgstr ""
+
+#: ref-filter.c:806
+#, c-format
+msgid "format: %%(then) atom used without an %%(if) atom"
+msgstr ""
+
+#: ref-filter.c:808
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr ""
+
+#: ref-filter.c:810
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr ""
+
+#: ref-filter.c:838
+#, c-format
+msgid "format: %%(else) atom used without an %%(if) atom"
+msgstr ""
+
+#: ref-filter.c:840
+#, c-format
+msgid "format: %%(else) atom used without a %%(then) atom"
+msgstr ""
+
+#: ref-filter.c:842
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr ""
+
+#: ref-filter.c:857
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr ""
+
+#: ref-filter.c:914
+#, c-format
+msgid "malformed format string %s"
+msgstr ""
+
+#: ref-filter.c:1555
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr ""
+
+#: ref-filter.c:1558
+#, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr ""
+
+#: ref-filter.c:1561
+msgid "(no branch, bisect started on %s)"
+msgstr ""
+
+#: ref-filter.c:1565
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr ""
+
+#: ref-filter.c:1568
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr ""
+
+#: ref-filter.c:1571
+msgid "(no branch)"
+msgstr ""
+
+#: ref-filter.c:1603 ref-filter.c:1812
+#, c-format
+msgid "missing object %s for %s"
+msgstr ""
+
+#: ref-filter.c:1613
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
+msgstr ""
+
+#: ref-filter.c:1996
+#, c-format
+msgid "malformed object at '%s'"
+msgstr ""
+
+#: ref-filter.c:2085
+#, c-format
+msgid "ignoring ref with broken name %s"
+msgstr ""
+
+#: ref-filter.c:2090 refs.c:676
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr ""
+
+#: ref-filter.c:2430
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr ""
+
+#: ref-filter.c:2529
+#, c-format
+msgid "malformed object name %s"
+msgstr ""
+
+#: ref-filter.c:2534
+#, c-format
+msgid "option `%s' must point to a commit"
+msgstr ""
+
+#: refs.c:264
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr ""
+
+#: refs.c:566
+#, c-format
+msgid ""
+"Using '%s' as the name for the initial branch. This default branch name\n"
+"is subject to change. To configure the initial branch name to use in all\n"
+"of your new repositories, which will suppress this warning, call:\n"
+"\n"
+"\tgit config --global init.defaultBranch <name>\n"
+"\n"
+"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"'development'. The just-created branch can be renamed via this command:\n"
+"\n"
+"\tgit branch -m <name>\n"
+msgstr ""
+
+#: refs.c:588
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr ""
+
+#: refs.c:598
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr ""
+
+#: refs.c:674
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr ""
+
+#: refs.c:922
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr ""
+
+#: refs.c:929
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr ""
+
+#: refs.c:994
+#, c-format
+msgid "log for %s is empty"
+msgstr ""
+
+#: refs.c:1086
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr ""
+
+#: refs.c:1157
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr ""
+
+#: refs.c:2051
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr ""
+
+#: refs.c:2131
+msgid "ref updates forbidden inside quarantine environment"
+msgstr ""
+
+#: refs.c:2142
+msgid "ref updates aborted by hook"
+msgstr ""
+
+#: refs.c:2242 refs.c:2272
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr ""
+
+#: refs.c:2248 refs.c:2283
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
+msgstr ""
+
+#: refs/files-backend.c:1228
+#, c-format
+msgid "could not remove reference %s"
+msgstr ""
+
+#: 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 ""
+
+#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#, c-format
+msgid "could not delete references: %s"
+msgstr ""
+
+#: refspec.c:170
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr ""
+
+#: remote.c:351
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr "pintasan konfigurasi remote tidak dapat diawali dengan '/': %s"
+
+#: remote.c:399
+msgid "more than one receivepack given, using the first"
+msgstr "lebih dari satu paket terima diberikan, gunakan yang pertama"
+
+#: remote.c:407
+msgid "more than one uploadpack given, using the first"
+msgstr "lebih dari satu paket unggah diberikan, gunakan yang pertama"
+
+#: remote.c:590
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "tidak dapat mengambil baik %s dan %s ke %s"
+
+#: remote.c:594
+#, c-format
+msgid "%s usually tracks %s, not %s"
+msgstr "%s biasanya melacak %s, bukan %s"
+
+#: remote.c:598
+#, c-format
+msgid "%s tracks both %s and %s"
+msgstr "%s melacak baik %s dan %s"
+
+#: remote.c:666
+#, c-format
+msgid "key '%s' of pattern had no '*'"
+msgstr "kunci '%s' dari pola tidak ada '*'"
+
+#: remote.c:676
+#, c-format
+msgid "value '%s' of pattern has no '*'"
+msgstr "nilai '%s' dari pola tidak ada '*'"
+
+#: remote.c:1083
+#, c-format
+msgid "src refspec %s does not match any"
+msgstr "spek referensi sumber %s tidak cocok dengan apapun"
+
+#: remote.c:1088
+#, c-format
+msgid "src refspec %s matches more than one"
+msgstr "spek referensi sumber %s cocok dengan lebih dari satu"
+
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#: remote.c:1103
+#, 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 ""
+"Tujuan yang Anda berikan bukan nama referensi penuh (seperti \n"
+"dimulai dengan \"refs/\"). Kami mencoba menebak maksud Anda dengan:\n"
+"- Cari referensi yang cocok dengan '%s' pada sisi remote.\n"
+"- Perika apakah <src> yang sedang didorong ('%s') adalah \n"
+" referensi pada \"refs/{heads,tags}\". Bila demikian kami \n"
+" menambahkan awalan refs/{heads,tags}/ yang bersesuaian pada sisi \n"
+" remote.\n"
+"\n"
+"Kedua-duanya tidak bekerja, jadi kami menyerah. Anda harus kualifikasi\n"
+"penuh referensi."
+
+#: remote.c:1123
+#, 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 ""
+"Bagian <src> dari spek referensi adalah objek komit.\n"
+"Apakah maksud Anda buat cabang baru dengan mendorong ke\n"
+"'%s:refs/heads/%s'?"
+
+#: remote.c:1128
+#, 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 ""
+"Bagian <src> dari spek referensi adalah objek tag.\n"
+"Apakah maksud Anda buat tag baru dengan mendorong ke\n"
+"'%s:refs/tags/%s'?"
+
+#: remote.c:1133
+#, 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 ""
+"Bagian <src> dari spek referensi adalah objek pohon.\n"
+"Apakah maksud Anda tag pohon dengan mendorong ke\n"
+"'%s:refs/tags/%s'?"
+
+#: remote.c:1138
+#, 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 ""
+"Bagian <src> dari spek referensi adalah objek blob.\n"
+"Apakah maksud Anda tag blob baru dengan mendorong ke\n"
+"'%s:refs/tags/%s'?"
+
+#: remote.c:1174
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr "%s tidak dapat diselesaikan ke cabang"
+
+#: remote.c:1185
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr "tidak dapat menghapus '%s': referensi remote tidak ada"
+
+#: remote.c:1197
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr "spek referensi tujuan %s cocok dengan lebih dari satu"
+
+#: remote.c:1204
+#, c-format
+msgid "dst ref %s receives from more than one src"
+msgstr "referensi tujuan %s menerima dari lebih dari satu sumber"
+
+#: remote.c:1724 remote.c:1825
+msgid "HEAD does not point to a branch"
+msgstr "HEAD tidak menunjuk ke cabang"
+
+#: remote.c:1733
+#, c-format
+msgid "no such branch: '%s'"
+msgstr "tidak ada cabang seperti: '%s'"
+
+#: remote.c:1736
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr "tidak ada hulu yang terkonfigurasi untuk cabang '%s'"
+
+#: remote.c:1742
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgstr "cabang hulu '%s' tidak disimpan sebagai cabang pelacak remote"
+
+#: remote.c:1757
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgstr "tujuan dorong '%s' pada remote '%s' tidak ada cabang pelacak lokal"
+
+#: remote.c:1769
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr "cabang '%s' tidak ada remote untuk didorong"
+
+#: remote.c:1779
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "spek referensi dorong untuk '%s' tidak termasuk '%s'"
+
+#: remote.c:1792
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "dorong tidak ada tujuan (push.default yaitu 'nothing')"
+
+#: remote.c:1814
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "tidak dapat menyelesaikan dorongan 'sederhana' ke satu tujuan"
+
+#: remote.c:1943
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr "tidak dapat menemukan referensi remote %s"
+
+#: remote.c:1956
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr "* Abaikan referensi lucu '%s' secara lokal"
+
+#: remote.c:2119
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr "Cabang Anda didasarkan pada '%s', tapi hulu sudah tiada.\n"
+
+#: remote.c:2123
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr " (gunakan \"git branch --unset-upstream\" untuk perbaiki)\n"
+
+#: remote.c:2126
+#, c-format
+msgid "Your branch is up to date with '%s'.\n"
+msgstr "Cabang Anda mutakhir dengan '%s'.\n"
+
+#: remote.c:2130
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr "Cabang Anda dan '%s' merujuk pada komit yang berbeda.\n"
+
+#: remote.c:2133
+#, c-format
+msgid " (use \"%s\" for details)\n"
+msgstr " (gunakan \"%s\" untuk selengkapnya)\n"
+
+#: remote.c:2137
+#, 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:2143
+msgid " (use \"git push\" to publish your local commits)\n"
+msgstr " (gunakan \"git push\" untuk terbitkan komit lokal Anda)\n"
+
+#: remote.c:2146
+#, 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] ""
+msgstr[1] ""
+
+#: remote.c:2154
+msgid " (use \"git pull\" to update your local branch)\n"
+msgstr " (gunakan \"git pull\" untuk perbarui cabang lokal Anda)\n"
+
+#: remote.c:2157
+#, 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] ""
+msgstr[1] ""
+
+#: remote.c:2167
+msgid " (use \"git pull\" to merge the remote branch into yours)\n"
+msgstr " (gunakan \"git pull\" untuk gabungkan cabang remote ke milik Anda)\n"
+
+#: remote.c:2359
+#, c-format
+msgid "cannot parse expected object name '%s'"
+msgstr "tidak dapat mengurai nama object yang diharapkan '%s'"
+
+#: replace-object.c:21
+#, c-format
+msgid "bad replace ref name: %s"
+msgstr ""
+
+#: replace-object.c:30
+#, c-format
+msgid "duplicate replace ref: %s"
+msgstr ""
+
+#: replace-object.c:82
+#, c-format
+msgid "replace depth too high for object %s"
+msgstr ""
+
+#: rerere.c:201 rerere.c:210 rerere.c:213
+msgid "corrupt MERGE_RR"
+msgstr ""
+
+#: rerere.c:248 rerere.c:253
+msgid "unable to write rerere record"
+msgstr ""
+
+#: rerere.c:479
+#, c-format
+msgid "there were errors while writing '%s' (%s)"
+msgstr ""
+
+#: rerere.c:482
+#, c-format
+msgid "failed to flush '%s'"
+msgstr ""
+
+#: rerere.c:487 rerere.c:1023
+#, c-format
+msgid "could not parse conflict hunks in '%s'"
+msgstr ""
+
+#: rerere.c:668
+#, c-format
+msgid "failed utime() on '%s'"
+msgstr ""
+
+#: rerere.c:678
+#, c-format
+msgid "writing '%s' failed"
+msgstr ""
+
+#: rerere.c:698
+#, c-format
+msgid "Staged '%s' using previous resolution."
+msgstr ""
+
+#: rerere.c:737
+#, c-format
+msgid "Recorded resolution for '%s'."
+msgstr ""
+
+#: rerere.c:772
+#, c-format
+msgid "Resolved '%s' using previous resolution."
+msgstr ""
+
+#: rerere.c:787
+#, c-format
+msgid "cannot unlink stray '%s'"
+msgstr ""
+
+#: rerere.c:791
+#, c-format
+msgid "Recorded preimage for '%s'"
+msgstr ""
+
+#: rerere.c:865 submodule.c:2088 builtin/log.c:1991
+#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890
+#, c-format
+msgid "could not create directory '%s'"
+msgstr ""
+
+#: rerere.c:1041
+#, c-format
+msgid "failed to update conflicted state in '%s'"
+msgstr ""
+
+#: rerere.c:1052 rerere.c:1059
+#, c-format
+msgid "no remembered resolution for '%s'"
+msgstr ""
+
+#: rerere.c:1061
+#, c-format
+msgid "cannot unlink '%s'"
+msgstr ""
+
+#: rerere.c:1071
+#, c-format
+msgid "Updated preimage for '%s'"
+msgstr ""
+
+#: rerere.c:1080
+#, c-format
+msgid "Forgot resolution for '%s'\n"
+msgstr ""
+
+#: rerere.c:1191
+msgid "unable to open rr-cache directory"
+msgstr ""
+
+#: reset.c:42
+msgid "could not determine HEAD revision"
+msgstr ""
+
+#: reset.c:70 reset.c:76 sequencer.c:3468
+#, c-format
+msgid "failed to find tree of %s"
+msgstr ""
+
+#: revision.c:2338
+msgid "--unpacked=<packfile> no longer supported"
+msgstr ""
+
+#: revision.c:2668
+msgid "your current branch appears to be broken"
+msgstr ""
+
+#: revision.c:2671
+#, c-format
+msgid "your current branch '%s' does not have any commits yet"
+msgstr ""
+
+#: revision.c:2877
+msgid "-L does not yet support diff formats besides -p and -s"
+msgstr ""
+
+#: run-command.c:767
+msgid "open /dev/null failed"
+msgstr ""
+
+#: run-command.c:1274
+#, c-format
+msgid "cannot create async thread: %s"
+msgstr ""
+
+#: run-command.c:1338
+#, 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:146
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr ""
+
+#: send-pack.c:148
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr ""
+
+#: send-pack.c:150
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr ""
+
+#: send-pack.c:374
+msgid "failed to sign the push certificate"
+msgstr ""
+
+#: send-pack.c:467
+msgid "the receiving end does not support this repository's hash algorithm"
+msgstr ""
+
+#: send-pack.c:476
+msgid "the receiving end does not support --signed push"
+msgstr ""
+
+#: send-pack.c:478
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
+msgstr ""
+
+#: send-pack.c:490
+msgid "the receiving end does not support --atomic push"
+msgstr ""
+
+#: send-pack.c:495
+msgid "the receiving end does not support push options"
+msgstr ""
+
+#: sequencer.c:195
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr ""
+
+#: sequencer.c:323
+#, c-format
+msgid "could not delete '%s'"
+msgstr ""
+
+#: sequencer.c:343 builtin/rebase.c:757 builtin/rebase.c:1602 builtin/rm.c:385
+#, c-format
+msgid "could not remove '%s'"
+msgstr ""
+
+#: sequencer.c:353
+msgid "revert"
+msgstr ""
+
+#: sequencer.c:355
+msgid "cherry-pick"
+msgstr ""
+
+#: sequencer.c:357
+msgid "rebase"
+msgstr ""
+
+#: sequencer.c:359
+#, c-format
+msgid "unknown action: %d"
+msgstr ""
+
+#: sequencer.c:418
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
+msgstr ""
+
+#: sequencer.c:421
+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:434 sequencer.c:3070
+#, c-format
+msgid "could not lock '%s'"
+msgstr ""
+
+#: sequencer.c:436 sequencer.c:2869 sequencer.c:3074 sequencer.c:3088
+#: sequencer.c:3345 sequencer.c:5334 strbuf.c:1168 wrapper.c:631
+#, c-format
+msgid "could not write to '%s'"
+msgstr ""
+
+#: sequencer.c:441
+#, c-format
+msgid "could not write eol to '%s'"
+msgstr ""
+
+#: sequencer.c:446 sequencer.c:2874 sequencer.c:3076 sequencer.c:3090
+#: sequencer.c:3353
+#, c-format
+msgid "failed to finalize '%s'"
+msgstr ""
+
+#: sequencer.c:485
+#, c-format
+msgid "your local changes would be overwritten by %s."
+msgstr ""
+
+#: sequencer.c:489
+msgid "commit your changes or stash them to proceed."
+msgstr ""
+
+#: sequencer.c:521
+#, c-format
+msgid "%s: fast-forward"
+msgstr ""
+
+#: sequencer.c:560 builtin/tag.c:598
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr ""
+
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase".
+#.
+#: sequencer.c:670
+#, c-format
+msgid "%s: Unable to write new index file"
+msgstr ""
+
+#: sequencer.c:684
+msgid "unable to update cache tree"
+msgstr ""
+
+#: sequencer.c:698
+msgid "could not resolve HEAD commit"
+msgstr ""
+
+#: sequencer.c:778
+#, c-format
+msgid "no key present in '%.*s'"
+msgstr ""
+
+#: sequencer.c:789
+#, c-format
+msgid "unable to dequote value of '%s'"
+msgstr ""
+
+#: sequencer.c:826 wrapper.c:201 wrapper.c:371 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1136 builtin/rebase.c:910
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr ""
+
+#: sequencer.c:836
+msgid "'GIT_AUTHOR_NAME' already given"
+msgstr ""
+
+#: sequencer.c:841
+msgid "'GIT_AUTHOR_EMAIL' already given"
+msgstr ""
+
+#: sequencer.c:846
+msgid "'GIT_AUTHOR_DATE' already given"
+msgstr ""
+
+#: sequencer.c:850
+#, c-format
+msgid "unknown variable '%s'"
+msgstr ""
+
+#: sequencer.c:855
+msgid "missing 'GIT_AUTHOR_NAME'"
+msgstr ""
+
+#: sequencer.c:857
+msgid "missing 'GIT_AUTHOR_EMAIL'"
+msgstr ""
+
+#: sequencer.c:859
+msgid "missing 'GIT_AUTHOR_DATE'"
+msgstr ""
+
+#: sequencer.c:924
+#, 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 ""
+
+#: sequencer.c:1211
+msgid "'prepare-commit-msg' hook failed"
+msgstr ""
+
+#: sequencer.c:1217
+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 ""
+
+#: sequencer.c:1230
+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 ""
+
+#: sequencer.c:1272
+msgid "couldn't look up newly created commit"
+msgstr ""
+
+#: sequencer.c:1274
+msgid "could not parse newly created commit"
+msgstr ""
+
+#: sequencer.c:1320
+msgid "unable to resolve HEAD after creating commit"
+msgstr ""
+
+#: sequencer.c:1322
+msgid "detached HEAD"
+msgstr ""
+
+#: sequencer.c:1326
+msgid " (root-commit)"
+msgstr ""
+
+#: sequencer.c:1347
+msgid "could not parse HEAD"
+msgstr ""
+
+#: sequencer.c:1349
+#, c-format
+msgid "HEAD %s is not a commit!"
+msgstr ""
+
+#: sequencer.c:1353 sequencer.c:1431 builtin/commit.c:1577
+msgid "could not parse HEAD commit"
+msgstr ""
+
+#: sequencer.c:1409 sequencer.c:2108
+msgid "unable to parse commit author"
+msgstr ""
+
+#: sequencer.c:1420 builtin/am.c:1566 builtin/merge.c:702
+msgid "git write-tree failed to write a tree"
+msgstr ""
+
+#: sequencer.c:1453 sequencer.c:1573
+#, c-format
+msgid "unable to read commit message from '%s'"
+msgstr ""
+
+#: sequencer.c:1484 sequencer.c:1516
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr ""
+
+#: sequencer.c:1490
+msgid "corrupt author: missing date information"
+msgstr ""
+
+#: sequencer.c:1529 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:905
+#: builtin/merge.c:930 t/helper/test-fast-rebase.c:78
+msgid "failed to write commit object"
+msgstr ""
+
+#: sequencer.c:1556 sequencer.c:4291 t/helper/test-fast-rebase.c:198
+#, c-format
+msgid "could not update %s"
+msgstr ""
+
+#: sequencer.c:1605
+#, c-format
+msgid "could not parse commit %s"
+msgstr ""
+
+#: sequencer.c:1610
+#, c-format
+msgid "could not parse parent commit %s"
+msgstr ""
+
+#: sequencer.c:1693 sequencer.c:1804
+#, c-format
+msgid "unknown command: %d"
+msgstr ""
+
+#: sequencer.c:1751 sequencer.c:1776
+#, c-format
+msgid "This is a combination of %d commits."
+msgstr ""
+
+#: sequencer.c:1761
+msgid "need a HEAD to fixup"
+msgstr ""
+
+#: sequencer.c:1763 sequencer.c:3380
+msgid "could not read HEAD"
+msgstr ""
+
+#: sequencer.c:1765
+msgid "could not read HEAD's commit message"
+msgstr ""
+
+#: sequencer.c:1771
+#, c-format
+msgid "cannot write '%s'"
+msgstr ""
+
+#: sequencer.c:1778 git-rebase--preserve-merges.sh:486
+msgid "This is the 1st commit message:"
+msgstr ""
+
+#: sequencer.c:1786
+#, c-format
+msgid "could not read commit message of %s"
+msgstr ""
+
+#: sequencer.c:1793
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr ""
+
+#: sequencer.c:1799
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr ""
+
+#: sequencer.c:1887
+msgid "your index file is unmerged."
+msgstr ""
+
+#: sequencer.c:1894
+msgid "cannot fixup root commit"
+msgstr ""
+
+#: sequencer.c:1913
+#, c-format
+msgid "commit %s is a merge but no -m option was given."
+msgstr ""
+
+#: sequencer.c:1921 sequencer.c:1929
+#, c-format
+msgid "commit %s does not have parent %d"
+msgstr ""
+
+#: sequencer.c:1935
+#, 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:1954
+#, c-format
+msgid "%s: cannot parse parent commit %s"
+msgstr ""
+
+#: sequencer.c:2019
+#, c-format
+msgid "could not rename '%s' to '%s'"
+msgstr ""
+
+#: sequencer.c:2079
+#, c-format
+msgid "could not revert %s... %s"
+msgstr ""
+
+#: sequencer.c:2080
+#, c-format
+msgid "could not apply %s... %s"
+msgstr ""
+
+#: sequencer.c:2100
+#, c-format
+msgid "dropping %s %s -- patch contents already upstream\n"
+msgstr ""
+
+#: sequencer.c:2158
+#, c-format
+msgid "git %s: failed to read the index"
+msgstr ""
+
+#: sequencer.c:2165
+#, c-format
+msgid "git %s: failed to refresh the index"
+msgstr ""
+
+#: sequencer.c:2242
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr ""
+
+#: sequencer.c:2251
+#, c-format
+msgid "missing arguments for %s"
+msgstr ""
+
+#: sequencer.c:2282
+#, c-format
+msgid "could not parse '%s'"
+msgstr ""
+
+#: sequencer.c:2343
+#, c-format
+msgid "invalid line %d: %.*s"
+msgstr ""
+
+#: sequencer.c:2354
+#, c-format
+msgid "cannot '%s' without a previous commit"
+msgstr ""
+
+#: sequencer.c:2440
+msgid "cancelling a cherry picking in progress"
+msgstr ""
+
+#: sequencer.c:2449
+msgid "cancelling a revert in progress"
+msgstr ""
+
+#: sequencer.c:2493
+msgid "please fix this using 'git rebase --edit-todo'."
+msgstr ""
+
+#: sequencer.c:2495
+#, c-format
+msgid "unusable instruction sheet: '%s'"
+msgstr ""
+
+#: sequencer.c:2500
+msgid "no commits parsed."
+msgstr ""
+
+#: sequencer.c:2511
+msgid "cannot cherry-pick during a revert."
+msgstr ""
+
+#: sequencer.c:2513
+msgid "cannot revert during a cherry-pick."
+msgstr ""
+
+#: sequencer.c:2591
+#, c-format
+msgid "invalid value for %s: %s"
+msgstr ""
+
+#: sequencer.c:2698
+msgid "unusable squash-onto"
+msgstr ""
+
+#: sequencer.c:2718
+#, c-format
+msgid "malformed options sheet: '%s'"
+msgstr ""
+
+#: sequencer.c:2811 sequencer.c:4644
+msgid "empty commit set passed"
+msgstr ""
+
+#: sequencer.c:2828
+msgid "revert is already in progress"
+msgstr ""
+
+#: sequencer.c:2830
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr ""
+
+#: sequencer.c:2833
+msgid "cherry-pick is already in progress"
+msgstr ""
+
+#: sequencer.c:2835
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr ""
+
+#: sequencer.c:2849
+#, c-format
+msgid "could not create sequencer directory '%s'"
+msgstr ""
+
+#: sequencer.c:2864
+msgid "could not lock HEAD"
+msgstr ""
+
+#: sequencer.c:2924 sequencer.c:4379
+msgid "no cherry-pick or revert in progress"
+msgstr ""
+
+#: sequencer.c:2926 sequencer.c:2937
+msgid "cannot resolve HEAD"
+msgstr ""
+
+#: sequencer.c:2928 sequencer.c:2972
+msgid "cannot abort from a branch yet to be born"
+msgstr ""
+
+#: sequencer.c:2958 builtin/grep.c:757
+#, c-format
+msgid "cannot open '%s'"
+msgstr ""
+
+#: sequencer.c:2960
+#, c-format
+msgid "cannot read '%s': %s"
+msgstr ""
+
+#: sequencer.c:2961
+msgid "unexpected end of file"
+msgstr ""
+
+#: sequencer.c:2967
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgstr ""
+
+#: sequencer.c:2978
+msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
+msgstr ""
+
+#: sequencer.c:3019
+msgid "no revert in progress"
+msgstr ""
+
+#: sequencer.c:3028
+msgid "no cherry-pick in progress"
+msgstr ""
+
+#: sequencer.c:3038
+msgid "failed to skip the commit"
+msgstr ""
+
+#: sequencer.c:3045
+msgid "there is nothing to skip"
+msgstr ""
+
+#: sequencer.c:3048
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+
+#: sequencer.c:3210 sequencer.c:4271
+msgid "cannot read HEAD"
+msgstr ""
+
+#: sequencer.c:3227
+#, c-format
+msgid "unable to copy '%s' to '%s'"
+msgstr ""
+
+#: sequencer.c:3235
+#, 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 ""
+
+#: sequencer.c:3245
+#, c-format
+msgid "Could not apply %s... %.*s"
+msgstr ""
+
+#: sequencer.c:3252
+#, c-format
+msgid "Could not merge %.*s"
+msgstr ""
+
+#: sequencer.c:3266 sequencer.c:3270 builtin/difftool.c:640
+#, c-format
+msgid "could not copy '%s' to '%s'"
+msgstr ""
+
+#: sequencer.c:3282
+#, c-format
+msgid "Executing: %s\n"
+msgstr ""
+
+#: sequencer.c:3297
+#, c-format
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+" git rebase --continue\n"
+"\n"
+msgstr ""
+
+#: sequencer.c:3303
+msgid "and made changes to the index and/or the working tree\n"
+msgstr ""
+
+#: sequencer.c:3309
+#, 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 ""
+
+#: sequencer.c:3370
+#, c-format
+msgid "illegal label name: '%.*s'"
+msgstr ""
+
+#: sequencer.c:3424
+msgid "writing fake root commit"
+msgstr ""
+
+#: sequencer.c:3429
+msgid "writing squash-onto"
+msgstr ""
+
+#: sequencer.c:3513
+#, c-format
+msgid "could not resolve '%s'"
+msgstr ""
+
+#: sequencer.c:3546
+msgid "cannot merge without a current revision"
+msgstr ""
+
+#: sequencer.c:3568
+#, c-format
+msgid "unable to parse '%.*s'"
+msgstr ""
+
+#: sequencer.c:3577
+#, c-format
+msgid "nothing to merge: '%.*s'"
+msgstr ""
+
+#: sequencer.c:3589
+msgid "octopus merge cannot be executed on top of a [new root]"
+msgstr ""
+
+#: sequencer.c:3605
+#, c-format
+msgid "could not get commit message of '%s'"
+msgstr ""
+
+#: sequencer.c:3788
+#, c-format
+msgid "could not even attempt to merge '%.*s'"
+msgstr ""
+
+#: sequencer.c:3804
+msgid "merge: Unable to write new index file"
+msgstr ""
+
+#: sequencer.c:3878
+msgid "Cannot autostash"
+msgstr ""
+
+#: sequencer.c:3881
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr ""
+
+#: sequencer.c:3887
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr ""
+
+#: sequencer.c:3890
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr ""
+
+#: sequencer.c:3894
+msgid "could not reset --hard"
+msgstr ""
+
+#: sequencer.c:3919
+#, c-format
+msgid "Applied autostash.\n"
+msgstr ""
+
+#: sequencer.c:3931
+#, c-format
+msgid "cannot store %s"
+msgstr ""
+
+#: sequencer.c:3934
+#, 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 ""
+
+#: sequencer.c:3939
+msgid "Applying autostash resulted in conflicts."
+msgstr ""
+
+#: sequencer.c:3940
+msgid "Autostash exists; creating a new stash entry."
+msgstr ""
+
+#: sequencer.c:4033 git-rebase--preserve-merges.sh:769
+msgid "could not detach HEAD"
+msgstr ""
+
+#: sequencer.c:4048
+#, c-format
+msgid "Stopped at HEAD\n"
+msgstr ""
+
+#: sequencer.c:4050
+#, c-format
+msgid "Stopped at %s\n"
+msgstr ""
+
+#: sequencer.c:4058
+#, 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:4104
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr ""
+
+#: sequencer.c:4149
+#, c-format
+msgid "Stopped at %s... %.*s\n"
+msgstr ""
+
+#: sequencer.c:4220
+#, c-format
+msgid "unknown command %d"
+msgstr ""
+
+#: sequencer.c:4279
+msgid "could not read orig-head"
+msgstr ""
+
+#: sequencer.c:4284
+msgid "could not read 'onto'"
+msgstr ""
+
+#: sequencer.c:4298
+#, c-format
+msgid "could not update HEAD to %s"
+msgstr ""
+
+#: sequencer.c:4358
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr ""
+
+#: sequencer.c:4391
+msgid "cannot rebase: You have unstaged changes."
+msgstr ""
+
+#: sequencer.c:4400
+msgid "cannot amend non-existing commit"
+msgstr ""
+
+#: sequencer.c:4402
+#, c-format
+msgid "invalid file: '%s'"
+msgstr ""
+
+#: sequencer.c:4404
+#, c-format
+msgid "invalid contents: '%s'"
+msgstr ""
+
+#: sequencer.c:4407
+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:4443 sequencer.c:4482
+#, c-format
+msgid "could not write file: '%s'"
+msgstr ""
+
+#: sequencer.c:4498
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr ""
+
+#: sequencer.c:4505
+msgid "could not commit staged changes."
+msgstr ""
+
+#: sequencer.c:4621
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr ""
+
+#: sequencer.c:4625
+#, c-format
+msgid "%s: bad revision"
+msgstr ""
+
+#: sequencer.c:4660
+msgid "can't revert as initial commit"
+msgstr ""
+
+#: sequencer.c:5137
+msgid "make_script: unhandled options"
+msgstr ""
+
+#: sequencer.c:5140
+msgid "make_script: error preparing revisions"
+msgstr ""
+
+#: sequencer.c:5382 sequencer.c:5399
+msgid "nothing to do"
+msgstr ""
+
+#: sequencer.c:5418
+msgid "could not skip unnecessary pick commands"
+msgstr ""
+
+#: sequencer.c:5512
+msgid "the script was already rearranged."
+msgstr ""
+
+#: setup.c:133
+#, c-format
+msgid "'%s' is outside repository at '%s'"
+msgstr ""
+
+#: 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: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 ""
+
+#: setup.c:264
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: setup.c:669
+msgid "unknown repository extensions found:"
+msgstr ""
+
+#: 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:702
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr ""
+
+#: setup.c:704
+#, c-format
+msgid "error reading %s"
+msgstr ""
+
+#: setup.c:706
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr ""
+
+#: setup.c:708
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr ""
+
+#: setup.c:710
+#, c-format
+msgid "not a git repository: %s"
+msgstr ""
+
+#: setup.c:812
+#, c-format
+msgid "'$%s' too big"
+msgstr ""
+
+#: setup.c:826
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr ""
+
+#: setup.c:855 setup.c:857 setup.c:888
+#, c-format
+msgid "cannot chdir to '%s'"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: setup.c:1245
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr ""
+
+#: 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: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:1409
+msgid "open /dev/null or dup failed"
+msgstr ""
+
+#: setup.c:1424
+msgid "fork failed"
+msgstr ""
+
+#: setup.c:1429
+msgid "setsid failed"
+msgstr ""
+
+#. 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
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#: strbuf.c:877
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719
+#: builtin/rebase.c:866
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr ""
+
+#: strbuf.c:1175
+#, c-format
+msgid "could not edit '%s'"
+msgstr ""
+
+#: submodule-config.c:237
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr ""
+
+#: submodule-config.c:304
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr ""
+
+#: 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 ""
+
+#: submodule-config.c:766
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr ""
+
+#: submodule.c:114 submodule.c:143
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr ""
+
+#: submodule.c:118 submodule.c:147
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr ""
+
+#: submodule.c:154
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr ""
+
+#: submodule.c:165
+msgid "staging updated .gitmodules failed"
+msgstr ""
+
+#: submodule.c:327
+#, c-format
+msgid "in unpopulated submodule '%s'"
+msgstr ""
+
+#: submodule.c:358
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr ""
+
+#: submodule.c:435
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr ""
+
+#: submodule.c:817
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr ""
+
+#: submodule.c:920
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr ""
+
+#: submodule.c:1005
+#, c-format
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
+msgstr ""
+
+#: submodule.c:1128
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr ""
+
+#: submodule.c:1157 builtin/branch.c:689 builtin/submodule--helper.c:2469
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr ""
+
+#: submodule.c:1168
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr ""
+
+#: submodule.c:1171
+#, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr ""
+
+#: submodule.c:1463
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr ""
+
+#: submodule.c:1497
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr ""
+
+#: submodule.c:1652
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+
+#: submodule.c:1677
+#, c-format
+msgid "'%s' not recognized as a git repository"
+msgstr ""
+
+#: submodule.c:1694
+#, c-format
+msgid "Could not run 'git status --porcelain=2' in submodule %s"
+msgstr ""
+
+#: submodule.c:1735
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr ""
+
+#: submodule.c:1810
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
+msgstr ""
+
+#: submodule.c:1823
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
+msgstr ""
+
+#: submodule.c:1838
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
+msgstr ""
+
+#: submodule.c:1865 submodule.c:2175
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr ""
+
+#: submodule.c:1886
+msgid "could not reset submodule index"
+msgstr ""
+
+#: submodule.c:1928
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr ""
+
+#: submodule.c:1980
+#, c-format
+msgid "Submodule '%s' could not be updated."
+msgstr ""
+
+#: submodule.c:2048
+#, c-format
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
+msgstr ""
+
+#: submodule.c:2069
+#, c-format
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+msgstr ""
+
+#: submodule.c:2081 submodule.c:2140
+#, c-format
+msgid "could not lookup name for submodule '%s'"
+msgstr ""
+
+#: submodule.c:2085
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr ""
+
+#: submodule.c:2092
+#, c-format
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
+msgstr ""
+
+#: submodule.c:2220
+msgid "could not start ls-files in .."
+msgstr ""
+
+#: submodule.c:2260
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr ""
+
+#: trailer.c:236
+#, c-format
+msgid "running trailer command '%s' failed"
+msgstr ""
+
+#: 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 ""
+
+#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324
+#, c-format
+msgid "more than one %s"
+msgstr ""
+
+#: trailer.c:728
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr ""
+
+#: trailer.c:748
+#, c-format
+msgid "could not read input file '%s'"
+msgstr ""
+
+#: trailer.c:751 builtin/mktag.c:91
+msgid "could not read from stdin"
+msgstr ""
+
+#: trailer.c:1009 wrapper.c:676
+#, c-format
+msgid "could not stat %s"
+msgstr ""
+
+#: trailer.c:1011
+#, c-format
+msgid "file %s is not a regular file"
+msgstr ""
+
+#: trailer.c:1013
+#, c-format
+msgid "file %s is not writable by user"
+msgstr ""
+
+#: trailer.c:1025
+msgid "could not open temporary file"
+msgstr ""
+
+#: trailer.c:1065
+#, c-format
+msgid "could not rename temporary file to %s"
+msgstr ""
+
+#: 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 ""
+
+#: 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
+#, c-format
+msgid "%s unexpectedly said: '%s'"
+msgstr ""
+
+#: transport-helper.c:417
+#, c-format
+msgid "%s also locked %s"
+msgstr ""
+
+#: transport-helper.c:497
+msgid "couldn't run fast-import"
+msgstr ""
+
+#: transport-helper.c:520
+msgid "error while running fast-import"
+msgstr ""
+
+#: transport-helper.c:549 transport-helper.c:1237
+#, c-format
+msgid "could not read ref %s"
+msgstr ""
+
+#: transport-helper.c:594
+#, c-format
+msgid "unknown response to connect: %s"
+msgstr ""
+
+#: 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:1447
+msgid "operation not supported by protocol"
+msgstr ""
+
+#: 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
+#, c-format
+msgid "expected ok/error, helper said '%s'"
+msgstr ""
+
+#: transport-helper.c:845
+#, c-format
+msgid "helper reported unexpected status of %s"
+msgstr ""
+
+#: transport-helper.c:928
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr ""
+
+#: transport-helper.c:931
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr ""
+
+#: transport-helper.c:934
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr ""
+
+#: transport-helper.c:939
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr ""
+
+#: transport-helper.c:943
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr ""
+
+#: transport-helper.c:950
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr ""
+
+#: transport-helper.c:1050
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr ""
+
+#: transport-helper.c:1055
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr ""
+
+#: transport-helper.c:1102
+msgid "couldn't run fast-export"
+msgstr ""
+
+#: transport-helper.c:1107
+msgid "error while running fast-export"
+msgstr ""
+
+#: transport-helper.c:1132
+#, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch.\n"
+msgstr ""
+
+#: transport-helper.c:1214
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr ""
+
+#: transport-helper.c:1223
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr ""
+
+#: transport-helper.c:1375
+#, c-format
+msgid "read(%s) failed"
+msgstr ""
+
+#: transport-helper.c:1402
+#, c-format
+msgid "write(%s) failed"
+msgstr ""
+
+#: transport-helper.c:1451
+#, c-format
+msgid "%s thread failed"
+msgstr ""
+
+#: transport-helper.c:1455
+#, c-format
+msgid "%s thread failed to join: %s"
+msgstr ""
+
+#: transport-helper.c:1474 transport-helper.c:1478
+#, c-format
+msgid "can't start thread for copying data: %s"
+msgstr ""
+
+#: transport-helper.c:1515
+#, c-format
+msgid "%s process failed to wait"
+msgstr ""
+
+#: transport-helper.c:1519
+#, c-format
+msgid "%s process failed"
+msgstr ""
+
+#: transport-helper.c:1537 transport-helper.c:1546
+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 ""
+
+#: 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:727
+msgid "could not parse transport.color.* config"
+msgstr ""
+
+#: transport.c:802
+msgid "support for protocol v2 not implemented yet"
+msgstr ""
+
+#: transport.c:936
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr ""
+
+#: transport.c:1002
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr ""
+
+#: transport.c:1055
+msgid "git-over-rsync is no longer supported"
+msgstr ""
+
+#: transport.c:1157
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+
+#: transport.c:1161
+#, 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:1169
+msgid "Aborting."
+msgstr ""
+
+#: transport.c:1316
+msgid "failed to push all needed submodules"
+msgstr ""
+
+#: tree-walk.c:33
+msgid "too-short tree object"
+msgstr ""
+
+#: tree-walk.c:39
+msgid "malformed mode in tree entry"
+msgstr ""
+
+#: tree-walk.c:43
+msgid "empty filename in tree entry"
+msgstr ""
+
+#: tree-walk.c:118
+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 ""
+
+#: 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: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:120
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+
+#: 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:125
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:130
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
+msgstr ""
+
+#: 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:136
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+
+#: 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:141
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+
+#: 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:146
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+
+#: 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 ""
+
+#: unpack-trees.c:154
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+
+#: 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:159
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+
+#: 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:164
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:172
+#, c-format
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgstr ""
+
+#: unpack-trees.c:175
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:178
+#, c-format
+msgid ""
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:180
+#, c-format
+msgid ""
+"The following paths are unmerged and were left despite sparse patterns:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:182
+#, c-format
+msgid ""
+"The following paths were already present and thus not updated despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:262
+#, c-format
+msgid "Aborting\n"
+msgstr ""
+
+#: 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:1543
+msgid "expected flush after fetch arguments"
+msgstr ""
+
+#: urlmatch.c:163
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr ""
+
+#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr ""
+
+#: urlmatch.c:215
+msgid "missing host and scheme is not 'file:'"
+msgstr ""
+
+#: urlmatch.c:232
+msgid "a 'file:' URL may not have a port number"
+msgstr ""
+
+#: 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:238 builtin/am.c:2103
+#, c-format
+msgid "failed to read '%s'"
+msgstr ""
+
+#: worktree.c:304
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr ""
+
+#: worktree.c:315
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr ""
+
+#: worktree.c:327
+#, c-format
+msgid "'%s' does not exist"
+msgstr ""
+
+#: worktree.c:333
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr ""
+
+#: worktree.c:342
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr ""
+
+#: worktree.c:608
+msgid "not a directory"
+msgstr ""
+
+#: worktree.c:617
+msgid ".git is not a file"
+msgstr ""
+
+#: worktree.c:619
+msgid ".git file broken"
+msgstr ""
+
+#: worktree.c:621
+msgid ".git file incorrect"
+msgstr ""
+
+#: worktree.c:727
+msgid "not a valid path"
+msgstr ""
+
+#: worktree.c:733
+msgid "unable to locate repository; .git is not a file"
+msgstr ""
+
+#: worktree.c:737
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr ""
+
+#: worktree.c:741
+msgid "unable to locate repository; .git file broken"
+msgstr ""
+
+#: worktree.c:747
+msgid "gitdir unreadable"
+msgstr ""
+
+#: worktree.c:751
+msgid "gitdir incorrect"
+msgstr ""
+
+#: worktree.c:776
+msgid "not a valid directory"
+msgstr ""
+
+#: worktree.c:782
+msgid "gitdir file does not exist"
+msgstr ""
+
+#: worktree.c:787 worktree.c:796
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr ""
+
+#: worktree.c:806
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr ""
+
+#: worktree.c:814
+msgid "invalid gitdir file"
+msgstr ""
+
+#: worktree.c:822
+msgid "gitdir file points to non-existent location"
+msgstr ""
+
+#: wrapper.c:197 wrapper.c:367
+#, c-format
+msgid "could not open '%s' for reading and writing"
+msgstr ""
+
+#: wrapper.c:398 wrapper.c:599
+#, c-format
+msgid "unable to access '%s'"
+msgstr ""
+
+#: wrapper.c:607
+msgid "unable to get current working directory"
+msgstr ""
+
+#: wt-status.c:158
+msgid "Unmerged paths:"
+msgstr "Jalur yang tak tergabung:"
+
+#: wt-status.c:187 wt-status.c:219
+msgid " (use \"git restore --staged <file>...\" to unstage)"
+msgstr " (gunakan \"git restore --staged <berkas>...\" untuk menggelar balik)"
+
+#: wt-status.c:190 wt-status.c:222
+#, c-format
+msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr ""
+" (gunakan \"git restore --source=%s --staged <berkas>..\" untuk menggelar "
+"balik)"
+
+#: wt-status.c:193 wt-status.c:225
+msgid " (use \"git rm --cached <file>...\" to unstage)"
+msgstr " (gunakan \"git rm --cached <berkas>...\" untuk menggelar balik)"
+
+#: wt-status.c:197
+msgid " (use \"git add <file>...\" to mark resolution)"
+msgstr " (gunakan \"git add <berkas>...\" untuk menandai penyelesaian)"
+
+#: wt-status.c:199 wt-status.c:203
+msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr ""
+" (gunakan \"git add.rm <berkas>...\" sebagaimana mestinya untuk menandai "
+"penyelesaian)"
+
+#: wt-status.c:201
+msgid " (use \"git rm <file>...\" to mark resolution)"
+msgstr " (gunakan \"git rm <berkas>\" untuk menandai penyelesaian)"
+
+#: wt-status.c:211 wt-status.c:1072
+msgid "Changes to be committed:"
+msgstr "Perubahan yang akan dikomit:"
+
+#: wt-status.c:234 wt-status.c:1081
+msgid "Changes not staged for commit:"
+msgstr "Perubahan yang tidak digelar untuk komit:"
+
+#: wt-status.c:238
+msgid " (use \"git add <file>...\" to update what will be committed)"
+msgstr ""
+" (gunakan \"git add <berkas>...\" untuk memperbarui apa yang akan dikomit)"
+
+#: wt-status.c:240
+msgid " (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr ""
+" (gunakan \"git add/rm <berkas>...\" untuk memperbarui apa yang akan "
+"dikomit)"
+
+#: wt-status.c:241
+msgid ""
+" (use \"git restore <file>...\" to discard changes in working directory)"
+msgstr ""
+" (gunakan \"git restore <berkas>...\" untuk membuang perubahan di direktori "
+"kerja)"
+
+#: wt-status.c:243
+msgid " (commit or discard the untracked or modified content in submodules)"
+msgstr ""
+" (komit atau buang konten yang tak dilacak atau diubah dalam submodul)"
+
+#: wt-status.c:254
+#, c-format
+msgid " (use \"git %s <file>...\" to include in what will be committed)"
+msgstr " (use \"git %s <berkas>...\" untuk menyertakan apa yang akan dikomit)"
+
+#: wt-status.c:266
+msgid "both deleted:"
+msgstr "kedua-duanya dihapus:"
+
+#: wt-status.c:268
+msgid "added by us:"
+msgstr "ditambahkan oleh kami:"
+
+#: wt-status.c:270
+msgid "deleted by them:"
+msgstr "dihapus oleh mereka:"
+
+#: wt-status.c:272
+msgid "added by them:"
+msgstr "ditambahkan oleh mereka:"
+
+#: wt-status.c:274
+msgid "deleted by us:"
+msgstr "dihapus oleh kami:"
+
+#: wt-status.c:276
+msgid "both added:"
+msgstr "kedua-duanya ditambah:"
+
+#: wt-status.c:278
+msgid "both modified:"
+msgstr "kedua-duanya diubah:"
+
+#: wt-status.c:288
+msgid "new file:"
+msgstr "berkas baru:"
+
+#: wt-status.c:290
+msgid "copied:"
+msgstr "tersalin:"
+
+#: wt-status.c:292
+msgid "deleted:"
+msgstr "terhapus:"
+
+#: wt-status.c:294
+msgid "modified:"
+msgstr "terubah:"
+
+#: wt-status.c:296
+msgid "renamed:"
+msgstr "terganti nama:"
+
+#: wt-status.c:298
+msgid "typechange:"
+msgstr "tipe perubahan:"
+
+#: wt-status.c:300
+msgid "unknown:"
+msgstr "tidak diketahui:"
+
+#: wt-status.c:302
+msgid "unmerged:"
+msgstr "tidak digabung:"
+
+#: wt-status.c:382
+msgid "new commits, "
+msgstr "komit baru, "
+
+#: wt-status.c:384
+msgid "modified content, "
+msgstr "konten yang dimodifikasi, "
+
+#: wt-status.c:386
+msgid "untracked content, "
+msgstr "konten yang tak dilacak, "
+
+#: wt-status.c:905
+#, c-format
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] "Simpanan Anda saat ini ada %d entri"
+msgstr[1] "Simpanan Anda saat ini ada %d entri"
+
+#: wt-status.c:936
+msgid "Submodules changed but not updated:"
+msgstr "Submodul berubah tapi tak diperbarui:"
+
+#: wt-status.c:938
+msgid "Submodule changes to be committed:"
+msgstr "Perubahan submodul yang akan dikomit:"
+
+#: wt-status.c:1020
+msgid ""
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
+msgstr ""
+"Jangan ubah atau hapus baris diatas.\n"
+"Semua dibawahnya akan diabaikan."
+
+#: wt-status.c:1112
+#, 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"
+"Butuh %.2f detik untuk menghitung cabang di depan/di belakang nilai.\n"
+"Anda bisa gunakan '--no-ahead-behind' untuk menghindari hal tersebut.\n"
+
+#: wt-status.c:1142
+msgid "You have unmerged paths."
+msgstr "Anda punya jalur yang tak tergabung."
+
+#: wt-status.c:1145
+msgid " (fix conflicts and run \"git commit\")"
+msgstr " (selesaikan konflik dan jalankan \"git commit\")"
+
+#: wt-status.c:1147
+msgid " (use \"git merge --abort\" to abort the merge)"
+msgstr " (gunakan \"git merge --abort\" untuk membatalkan penggabungan)"
+
+#: wt-status.c:1151
+msgid "All conflicts fixed but you are still merging."
+msgstr "Semua konflik sudah selesai tapi Anda masih menggabungkan."
+
+#: wt-status.c:1154
+msgid " (use \"git commit\" to conclude merge)"
+msgstr " (gunakan \"git commit\" untuk mengakhiri penggabungan)"
+
+#: wt-status.c:1163
+msgid "You are in the middle of an am session."
+msgstr "Anda berada ditengah-tengah sesi am."
+
+#: wt-status.c:1166
+msgid "The current patch is empty."
+msgstr "Jalur saat ini kosong"
+
+#: wt-status.c:1170
+msgid " (fix conflicts and then run \"git am --continue\")"
+msgstr " (selesaikan konflik lalu jalankan \"git am --continue\")"
+
+#: wt-status.c:1172
+msgid " (use \"git am --skip\" to skip this patch)"
+msgstr " (gunakan \"git am --skip\" untuk lewati tambalan ini)"
+
+#: wt-status.c:1174
+msgid " (use \"git am --abort\" to restore the original branch)"
+msgstr " (gunakan \"git am --abort\" untuk mengembalikan cabang asal)"
+
+#: wt-status.c:1307
+msgid "git-rebase-todo is missing."
+msgstr "git-rebase-todo hilang."
+
+#: wt-status.c:1309
+msgid "No commands done."
+msgstr "Tidak ada perintah selesai."
+
+#: wt-status.c:1312
+#, c-format
+msgid "Last command done (%d command done):"
+msgid_plural "Last commands done (%d commands done):"
+msgstr[0] "Perintah yang selesai (%d perintah):"
+msgstr[1] "Perintah yang selesai (%d perintah):"
+
+#: wt-status.c:1323
+#, c-format
+msgid " (see more in file %s)"
+msgstr " (lihat lebih lanjut di berkas %s)"
+
+#: wt-status.c:1328
+msgid "No commands remaining."
+msgstr "Tidak ada perintah yang tersisa."
+
+#: 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] "Perintah berikutnya (%d perintah tersisa):"
+msgstr[1] "Perintah berikutnya (%d perintah tersisa):"
+
+#: wt-status.c:1339
+msgid " (use \"git rebase --edit-todo\" to view and edit)"
+msgstr " (gunakan \"git rebase --edit-todo\" untuk lihat dan sunting)"
+
+#: wt-status.c:1351
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "Anda sedang mendasarkan ulang cabang '%s' pada '%s'."
+
+#: wt-status.c:1356
+msgid "You are currently rebasing."
+msgstr "Anda sedang mendasarkan ulang."
+
+#: wt-status.c:1369
+msgid " (fix conflicts and then run \"git rebase --continue\")"
+msgstr " (selesaikan konflik lalu jalankan \"git rebase --continue\")"
+
+#: wt-status.c:1371
+msgid " (use \"git rebase --skip\" to skip this patch)"
+msgstr " (gunakan \"git rebase --skip\" untuk lewati tambalan ini)"
+
+#: wt-status.c:1373
+msgid " (use \"git rebase --abort\" to check out the original branch)"
+msgstr " (gunakan \"git rebase --abort\" untuk check out cabang asal)"
+
+#: wt-status.c:1380
+msgid " (all conflicts fixed: run \"git rebase --continue\")"
+msgstr " (semua konflik sudah selesai: jalankan \"git rebase --continue\")"
+
+#: wt-status.c:1384
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"Anda sedang membelah komit saat mendasarkan ulang cabang '%s' pada '%s'."
+
+#: wt-status.c:1389
+msgid "You are currently splitting a commit during a rebase."
+msgstr "Anda sedang membelah komit saat mendasarkan ulang."
+
+#: wt-status.c:1392
+msgid " (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr ""
+" (Setelah direktori kerja Anda bersih, jalankan \"git rebase --continue\")"
+
+#: wt-status.c:1396
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"Anda sedang menyunting komit saat mendasarkan ulang cabang '%s' pada '%s'."
+
+#: wt-status.c:1401
+msgid "You are currently editing a commit during a rebase."
+msgstr "Anda sedang menyunting komit saat mendasarkan ulang."
+
+#: wt-status.c:1404
+msgid " (use \"git commit --amend\" to amend the current commit)"
+msgstr " (gunakan \"git commit --amend\" untuk mengubah komit saat ini)"
+
+#: wt-status.c:1406
+msgid ""
+" (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr ""
+" (gunakan \"git rebase --continue\" begitu Anda puas dengan perubahan Anda)"
+
+#: wt-status.c:1417
+msgid "Cherry-pick currently in progress."
+msgstr "Petik ceri sedang berjalan."
+
+#: wt-status.c:1420
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "Anda sedang memetik ceri komit %s."
+
+#: wt-status.c:1427
+msgid " (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr " (selesaikan konflik dan jalankan \"git cherry-pick --continue\")"
+
+#: wt-status.c:1430
+msgid " (run \"git cherry-pick --continue\" to continue)"
+msgstr " (jalankan \"git cherry-pick --continue\" untuk melanjutkan)"
+
+#: wt-status.c:1433
+msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr ""
+" (semua konflik sudah selesai: jalankan \"git cherry-pick --continue\")"
+
+#: wt-status.c:1435
+msgid " (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr " (gunakan \"git cherry-pick --skip\" untuk lewati tambalan ini)"
+
+#: wt-status.c:1437
+msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr ""
+" (gunakan \"git cherry-pick --abort\" untuk membatalkan operasi petik ceri)"
+
+#: wt-status.c:1447
+msgid "Revert currently in progress."
+msgstr "Pengembalian sedang berjalang."
+
+#: wt-status.c:1450
+#, c-format
+msgid "You are currently reverting commit %s."
+msgstr "Anda sedang mengembalikan komit %s."
+
+#: wt-status.c:1456
+msgid " (fix conflicts and run \"git revert --continue\")"
+msgstr " (selesaikan konflik dan jalankan \"git revert --continue\")"
+
+#: wt-status.c:1459
+msgid " (run \"git revert --continue\" to continue)"
+msgstr " (jalankan \"git revert --continue\" untuk melanjutkan)"
+
+#: wt-status.c:1462
+msgid " (all conflicts fixed: run \"git revert --continue\")"
+msgstr " (semua konflik sudah selesai: jalankan \"git revert --continue\")"
+
+#: wt-status.c:1464
+msgid " (use \"git revert --skip\" to skip this patch)"
+msgstr " (gunakan \"git revert --skip\" untuk lewati tambalan ini)"
+
+#: wt-status.c:1466
+msgid " (use \"git revert --abort\" to cancel the revert operation)"
+msgstr ""
+" (gunakan \"git revert --abort\" untuk membatalkan operasi pengembalian)"
+
+#: wt-status.c:1476
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "Anda sedang membagi dua, dimulai dari cabang '%s'."
+
+#: wt-status.c:1480
+msgid "You are currently bisecting."
+msgstr "Anda sedang membagi dua."
+
+#: wt-status.c:1483
+msgid " (use \"git bisect reset\" to get back to the original branch)"
+msgstr " (gunakan \"git bisect reset\" untuk kembali ke cabang asal)"
+
+#: wt-status.c:1494
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr "Anda berada dalam checkout tipis dengan %d%% berkas terlacak ada."
+
+#: wt-status.c:1733
+msgid "On branch "
+msgstr "Pada cabang "
+
+#: wt-status.c:1740
+msgid "interactive rebase in progress; onto "
+msgstr "sedang mendasarkan ulang interaktif; ke "
+
+#: wt-status.c:1742
+msgid "rebase in progress; onto "
+msgstr "sedang mendasarkan ulang; ke "
+
+#: wt-status.c:1747
+msgid "HEAD detached at "
+msgstr ""
+
+#: wt-status.c:1749
+msgid "HEAD detached from "
+msgstr ""
+
+#: wt-status.c:1752
+msgid "Not currently on any branch."
+msgstr "Tidak sedang berada pada cabang apapun."
+
+#: wt-status.c:1769
+msgid "Initial commit"
+msgstr "Komit awal"
+
+#: wt-status.c:1770
+msgid "No commits yet"
+msgstr "Tidak ada komit"
+
+#: wt-status.c:1784
+msgid "Untracked files"
+msgstr "Berkas tak terlacak"
+
+#: wt-status.c:1786
+msgid "Ignored files"
+msgstr "Berkas yang diabaikan"
+
+#: wt-status.c:1790
+#, 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 ""
+"Butuh %.2f detik untuk menghitung berkas tak terlacak. 'status -uno'\n"
+"mungkin bisa mempercepat, tapi Anda harus berhati-hati jangan sampai lupa\n"
+"untuk tambahkan berkas baru sendiri (lihat 'git help status')."
+
+#: wt-status.c:1796
+#, c-format
+msgid "Untracked files not listed%s"
+msgstr "Berkas tak terlacak yang tak disebutkan%s"
+
+#: wt-status.c:1798
+msgid " (use -u option to show untracked files)"
+msgstr " (gunakan opsi -u untuk melihat berkas yang tak terlacak)"
+
+#: wt-status.c:1804
+msgid "No changes"
+msgstr "Tidak ada perubahan"
+
+#: wt-status.c:1809
+#, c-format
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgstr ""
+"tidak ada perubahan untuk dikomit (gunakan \"git add\" dan/atau \"git commit "
+"-a\")\n"
+
+#: wt-status.c:1813
+#, c-format
+msgid "no changes added to commit\n"
+msgstr "tidak ada perubahan untuk dikomit\n"
+
+#: wt-status.c:1817
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
+msgstr ""
+"tidak ada perubahan untuk dikomit tapi berkas yang tak terlacak ada(gunakan "
+"\"git add\" untuk lacak)\n"
+
+#: wt-status.c:1821
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
+msgstr "tidak ada perubahan untuk dikomit tapi berkas yang tak terlacak ada\n"
+
+#: wt-status.c:1825
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgstr ""
+"tidak ada yang dikomit (buat/salin berkas dan gunakan \"git add\" untuk "
+"lacak)\n"
+
+#: wt-status.c:1829 wt-status.c:1835
+#, c-format
+msgid "nothing to commit\n"
+msgstr "tidak ada yang dikomit\n"
+
+#: wt-status.c:1832
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
+msgstr "tidak ada yang dikomit (gunakan -u untuk lihat berkas tak terlacak)\n"
+
+#: wt-status.c:1837
+#, c-format
+msgid "nothing to commit, working tree clean\n"
+msgstr "tidak ada yang dikomit, pohon kerja bersih\n"
+
+#: wt-status.c:1942
+msgid "No commits yet on "
+msgstr "Tidak ada komit apapun pada "
+
+#: wt-status.c:1946
+msgid "HEAD (no branch)"
+msgstr "HEAD (tanpa cabang)"
+
+#: wt-status.c:1977
+msgid "different"
+msgstr "berbeda"
+
+#: wt-status.c:1979 wt-status.c:1987
+msgid "behind "
+msgstr "di belakang "
+
+#: wt-status.c:1982 wt-status.c:1985
+msgid "ahead "
+msgstr "di depan "
+
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2507
+#, c-format
+msgid "cannot %s: You have unstaged changes."
+msgstr "tidak dapat %s: Anda punya perubahan yang tidak digelar."
+
+#: wt-status.c:2513
+msgid "additionally, your index contains uncommitted changes."
+msgstr "juga indeks Anda berisi perubahan yang belum dikomit."
+
+#: wt-status.c:2515
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr "tidak dapat %s: indeks Anda berisi perubahan yang belum dikomit."
+
+#: compat/precompose_utf8.c:58 builtin/clone.c:457
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr ""
+
+#: builtin/add.c:26
+msgid "git add [<options>] [--] <pathspec>..."
+msgstr ""
+
+#: builtin/add.c:58
+msgid "cannot chmod %cx '%s'"
+msgstr ""
+
+#: builtin/add.c:96
+#, c-format
+msgid "unexpected diff status %c"
+msgstr ""
+
+#: builtin/add.c:101 builtin/commit.c:285
+msgid "updating files failed"
+msgstr ""
+
+#: builtin/add.c:111
+#, c-format
+msgid "remove '%s'\n"
+msgstr ""
+
+#: builtin/add.c:186
+msgid "Unstaged changes after refreshing the index:"
+msgstr ""
+
+#: builtin/add.c:280 builtin/rev-parse.c:991
+msgid "Could not read the index"
+msgstr ""
+
+#: builtin/add.c:291
+#, c-format
+msgid "Could not open '%s' for writing."
+msgstr ""
+
+#: builtin/add.c:295
+msgid "Could not write patch"
+msgstr ""
+
+#: builtin/add.c:298
+msgid "editing patch failed"
+msgstr ""
+
+#: builtin/add.c:301
+#, c-format
+msgid "Could not stat '%s'"
+msgstr ""
+
+#: builtin/add.c:303
+msgid "Empty patch. Aborted."
+msgstr ""
+
+#: builtin/add.c:308
+#, c-format
+msgid "Could not apply '%s'"
+msgstr ""
+
+#: builtin/add.c:316
+msgid "The following paths are ignored by one of your .gitignore files:\n"
+msgstr ""
+
+#: builtin/add.c:336 builtin/clean.c:904 builtin/fetch.c:169 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559
+#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190
+msgid "dry run"
+msgstr "latihan"
+
+#: builtin/add.c:339
+msgid "interactive picking"
+msgstr ""
+
+#: builtin/add.c:340 builtin/checkout.c:1546 builtin/reset.c:308
+msgid "select hunks interactively"
+msgstr ""
+
+#: builtin/add.c:341
+msgid "edit current diff and apply"
+msgstr ""
+
+#: builtin/add.c:342
+msgid "allow adding otherwise ignored files"
+msgstr ""
+
+#: builtin/add.c:343
+msgid "update tracked files"
+msgstr ""
+
+#: builtin/add.c:344
+msgid "renormalize EOL of tracked files (implies -u)"
+msgstr ""
+
+#: builtin/add.c:345
+msgid "record only the fact that the path will be added later"
+msgstr ""
+
+#: builtin/add.c:346
+msgid "add changes from all tracked and untracked files"
+msgstr ""
+
+#: builtin/add.c:349
+msgid "ignore paths removed in the working tree (same as --no-all)"
+msgstr ""
+
+#: builtin/add.c:351
+msgid "don't add, only refresh the index"
+msgstr ""
+
+#: builtin/add.c:352
+msgid "just skip files which cannot be added because of errors"
+msgstr ""
+
+#: builtin/add.c:353
+msgid "check if - even missing - files are ignored in dry run"
+msgstr ""
+
+#: builtin/add.c:355 builtin/update-index.c:1004
+msgid "override the executable bit of the listed files"
+msgstr ""
+
+#: builtin/add.c:357
+msgid "warn when adding an embedded repository"
+msgstr ""
+
+#: builtin/add.c:359
+msgid "backend for `git stash -p`"
+msgstr ""
+
+#: builtin/add.c:377
+#, 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 ""
+
+#: builtin/add.c:405
+#, c-format
+msgid "adding embedded git repository: %s"
+msgstr ""
+
+#: builtin/add.c:424
+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:433
+msgid "adding files failed"
+msgstr ""
+
+#: builtin/add.c:461 builtin/commit.c:345
+msgid "--pathspec-from-file is incompatible with --interactive/--patch"
+msgstr ""
+
+#: builtin/add.c:478
+msgid "--pathspec-from-file is incompatible with --edit"
+msgstr ""
+
+#: builtin/add.c:490
+msgid "-A and -u are mutually incompatible"
+msgstr ""
+
+#: builtin/add.c:493
+msgid "Option --ignore-missing can only be used together with --dry-run"
+msgstr ""
+
+#: builtin/add.c:497
+#, c-format
+msgid "--chmod param '%s' must be either -x or +x"
+msgstr ""
+
+#: builtin/add.c:515 builtin/checkout.c:1714 builtin/commit.c:351
+#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1569
+msgid "--pathspec-from-file is incompatible with pathspec arguments"
+msgstr ""
+
+#: builtin/add.c:522 builtin/checkout.c:1726 builtin/commit.c:357
+#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1575
+msgid "--pathspec-file-nul requires --pathspec-from-file"
+msgstr ""
+
+#: builtin/add.c:526
+#, c-format
+msgid "Nothing specified, nothing added.\n"
+msgstr ""
+
+#: builtin/add.c:528
+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:352
+msgid "could not parse author script"
+msgstr ""
+
+#: builtin/am.c:436
+#, c-format
+msgid "'%s' was deleted by the applypatch-msg hook"
+msgstr ""
+
+#: builtin/am.c:478
+#, c-format
+msgid "Malformed input line: '%s'."
+msgstr ""
+
+#: builtin/am.c:516
+#, c-format
+msgid "Failed to copy notes from '%s' to '%s'"
+msgstr ""
+
+#: builtin/am.c:542
+msgid "fseek failed"
+msgstr ""
+
+#: builtin/am.c:730
+#, c-format
+msgid "could not parse patch '%s'"
+msgstr ""
+
+#: builtin/am.c:795
+msgid "Only one StGIT patch series can be applied at once"
+msgstr ""
+
+#: builtin/am.c:843
+msgid "invalid timestamp"
+msgstr ""
+
+#: builtin/am.c:848 builtin/am.c:860
+msgid "invalid Date line"
+msgstr ""
+
+#: builtin/am.c:855
+msgid "invalid timezone offset"
+msgstr ""
+
+#: builtin/am.c:948
+msgid "Patch format detection failed."
+msgstr ""
+
+#: builtin/am.c:953 builtin/clone.c:410
+#, c-format
+msgid "failed to create directory '%s'"
+msgstr ""
+
+#: builtin/am.c:958
+msgid "Failed to split patches."
+msgstr ""
+
+#: builtin/am.c:1089
+#, c-format
+msgid "When you have resolved this problem, run \"%s --continue\"."
+msgstr ""
+
+#: builtin/am.c:1090
+#, c-format
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+msgstr ""
+
+#: builtin/am.c:1091
+#, c-format
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+msgstr ""
+
+#: builtin/am.c:1174
+msgid "Patch sent with format=flowed; space at the end of lines might be lost."
+msgstr ""
+
+#: builtin/am.c:1202
+msgid "Patch is empty."
+msgstr ""
+
+#: builtin/am.c:1267
+#, c-format
+msgid "missing author line in commit %s"
+msgstr ""
+
+#: builtin/am.c:1270
+#, c-format
+msgid "invalid ident line: %.*s"
+msgstr ""
+
+#: builtin/am.c:1489
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+msgstr ""
+
+#: builtin/am.c:1491
+msgid "Using index info to reconstruct a base tree..."
+msgstr ""
+
+#: builtin/am.c:1510
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
+msgstr ""
+
+#: builtin/am.c:1516
+msgid "Falling back to patching base and 3-way merge..."
+msgstr ""
+
+#: builtin/am.c:1542
+msgid "Failed to merge in the changes."
+msgstr ""
+
+#: builtin/am.c:1574
+msgid "applying to an empty history"
+msgstr ""
+
+#: builtin/am.c:1626 builtin/am.c:1630
+#, c-format
+msgid "cannot resume: %s does not exist."
+msgstr ""
+
+#: builtin/am.c:1648
+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:1658
+#, c-format
+msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
+msgstr ""
+
+#: builtin/am.c:1704 builtin/commit.c:395
+msgid "unable to write index file"
+msgstr ""
+
+#: builtin/am.c:1708
+#, c-format
+msgid "Dirty index: cannot apply patches (dirty: %s)"
+msgstr ""
+
+#: builtin/am.c:1748 builtin/am.c:1816
+#, c-format
+msgid "Applying: %.*s"
+msgstr ""
+
+#: builtin/am.c:1765
+msgid "No changes -- Patch already applied."
+msgstr ""
+
+#: builtin/am.c:1771
+#, c-format
+msgid "Patch failed at %s %.*s"
+msgstr ""
+
+#: builtin/am.c:1775
+msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
+msgstr ""
+
+#: builtin/am.c:1819
+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:1826
+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 ""
+
+#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 builtin/reset.c:347
+#: builtin/reset.c:355
+#, c-format
+msgid "Could not parse object '%s'."
+msgstr "Tidak dapat mengurai objek '%s'."
+
+#: builtin/am.c:1985
+msgid "failed to clean index"
+msgstr ""
+
+#: builtin/am.c:2029
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
+msgstr ""
+
+#: builtin/am.c:2136
+#, c-format
+msgid "Invalid value for --patch-format: %s"
+msgstr ""
+
+#: builtin/am.c:2178
+#, c-format
+msgid "Invalid value for --show-current-patch: %s"
+msgstr ""
+
+#: builtin/am.c:2182
+#, c-format
+msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
+msgstr ""
+
+#: builtin/am.c:2213
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+msgstr ""
+
+#: builtin/am.c:2214
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr ""
+
+#: builtin/am.c:2220
+msgid "run interactively"
+msgstr ""
+
+#: builtin/am.c:2222
+msgid "historical option -- no-op"
+msgstr ""
+
+#: builtin/am.c:2224
+msgid "allow fall back on 3way merging if needed"
+msgstr ""
+
+#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16
+#: builtin/repack.c:334 builtin/stash.c:882
+msgid "be quiet"
+msgstr ""
+
+#: builtin/am.c:2227
+msgid "add a Signed-off-by trailer to the commit message"
+msgstr ""
+
+#: builtin/am.c:2230
+msgid "recode into utf8 (default)"
+msgstr ""
+
+#: builtin/am.c:2232
+msgid "pass -k flag to git-mailinfo"
+msgstr ""
+
+#: builtin/am.c:2234
+msgid "pass -b flag to git-mailinfo"
+msgstr ""
+
+#: builtin/am.c:2236
+msgid "pass -m flag to git-mailinfo"
+msgstr ""
+
+#: builtin/am.c:2238
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+msgstr ""
+
+#: builtin/am.c:2241
+msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
+msgstr ""
+
+#: builtin/am.c:2244
+msgid "strip everything before a scissors line"
+msgstr ""
+
+#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
+#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
+#: builtin/am.c:2273
+msgid "pass it through git-apply"
+msgstr ""
+
+#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:904 builtin/merge.c:261
+#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
+#: builtin/rebase.c:1347 builtin/repack.c:345 builtin/repack.c:349
+#: builtin/repack.c:351 builtin/show-branch.c:650 builtin/show-ref.c:172
+#: builtin/tag.c:436 parse-options.h:154 parse-options.h:175
+#: parse-options.h:316
+msgid "n"
+msgstr ""
+
+#: builtin/am.c:2269 builtin/branch.c:670 builtin/bugreport.c:136
+#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:470
+#: builtin/verify-tag.c:38
+msgid "format"
+msgstr ""
+
+#: builtin/am.c:2270
+msgid "format the patch(es) are in"
+msgstr ""
+
+#: builtin/am.c:2276
+msgid "override error message when patch failure occurs"
+msgstr ""
+
+#: builtin/am.c:2278
+msgid "continue applying patches after resolving a conflict"
+msgstr ""
+
+#: builtin/am.c:2281
+msgid "synonyms for --continue"
+msgstr ""
+
+#: builtin/am.c:2284
+msgid "skip the current patch"
+msgstr ""
+
+#: builtin/am.c:2287
+msgid "restore the original branch and abort the patching operation"
+msgstr ""
+
+#: builtin/am.c:2290
+msgid "abort the patching operation but keep HEAD where it is"
+msgstr ""
+
+#: builtin/am.c:2294
+msgid "show the patch being applied"
+msgstr ""
+
+#: builtin/am.c:2299
+msgid "lie about committer date"
+msgstr ""
+
+#: builtin/am.c:2301
+msgid "use current timestamp for author date"
+msgstr ""
+
+#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515
+#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:538
+#: builtin/rebase.c:1400 builtin/revert.c:117 builtin/tag.c:451
+msgid "key-id"
+msgstr ""
+
+#: builtin/am.c:2304 builtin/rebase.c:539 builtin/rebase.c:1401
+msgid "GPG-sign commits"
+msgstr ""
+
+#: builtin/am.c:2307
+msgid "(internal use for git-rebase)"
+msgstr ""
+
+#: builtin/am.c:2325
+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:2332
+msgid "failed to read the index"
+msgstr ""
+
+#: builtin/am.c:2347
+#, c-format
+msgid "previous rebase directory %s still exists but mbox given."
+msgstr ""
+
+#: builtin/am.c:2371
+#, c-format
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
+msgstr ""
+
+#: builtin/am.c:2377
+msgid "Resolve operation not in progress, we are not resuming."
+msgstr ""
+
+#: builtin/am.c:2387
+msgid "interactive mode requires patches on the command line"
+msgstr ""
+
+#: builtin/apply.c:8
+msgid "git apply [<options>] [<patch>...]"
+msgstr ""
+
+#: builtin/archive.c:17
+#, c-format
+msgid "could not create archive file '%s'"
+msgstr ""
+
+#: builtin/archive.c:20
+msgid "could not redirect output"
+msgstr ""
+
+#: builtin/archive.c:37
+msgid "git archive: Remote with no URL"
+msgstr ""
+
+#: builtin/archive.c:61
+msgid "git archive: expected ACK/NAK, got a flush packet"
+msgstr ""
+
+#: builtin/archive.c:64
+#, c-format
+msgid "git archive: NACK %s"
+msgstr ""
+
+#: builtin/archive.c:65
+msgid "git archive: protocol error"
+msgstr ""
+
+#: builtin/archive.c:69
+msgid "git archive: expected a flush"
+msgstr ""
+
+#: builtin/bisect--helper.c:23
+msgid "git bisect--helper --bisect-reset [<commit>]"
+msgstr ""
+
+#: builtin/bisect--helper.c:24
+msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+msgstr ""
+
+#: builtin/bisect--helper.c:25
+msgid ""
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
+msgstr ""
+
+#: builtin/bisect--helper.c:26
+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:28
+msgid "git bisect--helper --bisect-next"
+msgstr ""
+
+#: builtin/bisect--helper.c:29
+msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
+msgstr ""
+
+#: builtin/bisect--helper.c:30
+msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
+msgstr ""
+
+#: builtin/bisect--helper.c:31
+msgid "git bisect--helper --bisect-replay <filename>"
+msgstr ""
+
+#: builtin/bisect--helper.c:32
+msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
+msgstr ""
+
+#: builtin/bisect--helper.c:107
+#, c-format
+msgid "cannot open file '%s' in mode '%s'"
+msgstr ""
+
+#: builtin/bisect--helper.c:114
+#, c-format
+msgid "could not write to file '%s'"
+msgstr ""
+
+#: builtin/bisect--helper.c:153
+#, c-format
+msgid "'%s' is not a valid term"
+msgstr ""
+
+#: builtin/bisect--helper.c:157
+#, c-format
+msgid "can't use the builtin command '%s' as a term"
+msgstr ""
+
+#: builtin/bisect--helper.c:167
+#, c-format
+msgid "can't change the meaning of the term '%s'"
+msgstr ""
+
+#: builtin/bisect--helper.c:177
+msgid "please use two different terms"
+msgstr ""
+
+#: builtin/bisect--helper.c:193
+#, c-format
+msgid "We are not bisecting.\n"
+msgstr ""
+
+#: builtin/bisect--helper.c:201
+#, c-format
+msgid "'%s' is not a valid commit"
+msgstr ""
+
+#: builtin/bisect--helper.c:210
+#, c-format
+msgid ""
+"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
+msgstr ""
+
+#: builtin/bisect--helper.c:254
+#, c-format
+msgid "Bad bisect_write argument: %s"
+msgstr ""
+
+#: builtin/bisect--helper.c:259
+#, c-format
+msgid "couldn't get the oid of the rev '%s'"
+msgstr ""
+
+#: builtin/bisect--helper.c:271
+#, c-format
+msgid "couldn't open the file '%s'"
+msgstr ""
+
+#: builtin/bisect--helper.c:297
+#, c-format
+msgid "Invalid command: you're currently in a %s/%s bisect"
+msgstr ""
+
+#: builtin/bisect--helper.c:324
+#, 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:328
+#, 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 ""
+
+#: builtin/bisect--helper.c:348
+#, c-format
+msgid "bisecting only with a %s commit"
+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:356
+msgid "Are you sure [Y/n]? "
+msgstr ""
+
+#: builtin/bisect--helper.c:417
+msgid "no terms defined"
+msgstr ""
+
+#: builtin/bisect--helper.c:420
+#, 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:430
+#, 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:497 builtin/bisect--helper.c:1014
+msgid "revision walk setup failed\n"
+msgstr ""
+
+#: builtin/bisect--helper.c:519
+#, c-format
+msgid "could not open '%s' for appending"
+msgstr ""
+
+#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651
+msgid "'' is not a valid term"
+msgstr ""
+
+#: builtin/bisect--helper.c:661
+#, c-format
+msgid "unrecognized option: '%s'"
+msgstr ""
+
+#: builtin/bisect--helper.c:665
+#, c-format
+msgid "'%s' does not appear to be a valid revision"
+msgstr ""
+
+#: builtin/bisect--helper.c:696
+msgid "bad HEAD - I need a HEAD"
+msgstr ""
+
+#: builtin/bisect--helper.c:711
+#, c-format
+msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
+msgstr ""
+
+#: builtin/bisect--helper.c:732
+msgid "won't bisect on cg-seek'ed tree"
+msgstr ""
+
+#: builtin/bisect--helper.c:735
+msgid "bad HEAD - strange symbolic ref"
+msgstr ""
+
+#: builtin/bisect--helper.c:755
+#, c-format
+msgid "invalid ref: '%s'"
+msgstr ""
+
+#: builtin/bisect--helper.c:813
+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:824
+msgid "Do you want me to do it for you [Y/n]? "
+msgstr ""
+
+#: builtin/bisect--helper.c:842
+msgid "Please call `--bisect-state` with at least one argument"
+msgstr ""
+
+#: builtin/bisect--helper.c:855
+#, c-format
+msgid "'git bisect %s' can take only one argument."
+msgstr ""
+
+#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:878
+#, c-format
+msgid "Bad rev input: %s"
+msgstr ""
+
+#: builtin/bisect--helper.c:912
+msgid "We are not bisecting."
+msgstr ""
+
+#: builtin/bisect--helper.c:962
+#, c-format
+msgid "'%s'?? what are you talking about?"
+msgstr ""
+
+#: builtin/bisect--helper.c:974
+msgid "cannot read file '%s' for replaying"
+msgstr ""
+
+#: builtin/bisect--helper.c:1047
+msgid "reset the bisection state"
+msgstr ""
+
+#: builtin/bisect--helper.c:1049
+msgid "check whether bad or good terms exist"
+msgstr ""
+
+#: builtin/bisect--helper.c:1051
+msgid "print out the bisect terms"
+msgstr ""
+
+#: builtin/bisect--helper.c:1053
+msgid "start the bisect session"
+msgstr ""
+
+#: builtin/bisect--helper.c:1055
+msgid "find the next bisection commit"
+msgstr ""
+
+#: builtin/bisect--helper.c:1057
+msgid "mark the state of ref (or refs)"
+msgstr ""
+
+#: builtin/bisect--helper.c:1059
+msgid "list the bisection steps so far"
+msgstr ""
+
+#: builtin/bisect--helper.c:1061
+msgid "replay the bisection process from the given file"
+msgstr ""
+
+#: builtin/bisect--helper.c:1063
+msgid "skip some commits for checkout"
+msgstr ""
+
+#: builtin/bisect--helper.c:1065
+msgid "no log for BISECT_WRITE"
+msgstr ""
+
+#: builtin/bisect--helper.c:1080
+msgid "--bisect-reset requires either no argument or a commit"
+msgstr ""
+
+#: builtin/bisect--helper.c:1085
+msgid "--bisect-next-check requires 2 or 3 arguments"
+msgstr ""
+
+#: builtin/bisect--helper.c:1091
+msgid "--bisect-terms requires 0 or 1 argument"
+msgstr ""
+
+#: builtin/bisect--helper.c:1100
+msgid "--bisect-next requires 0 arguments"
+msgstr ""
+
+#: builtin/bisect--helper.c:1111
+msgid "--bisect-log requires 0 arguments"
+msgstr ""
+
+#: builtin/bisect--helper.c:1116
+msgid "no logfile given"
+msgstr ""
+
+#: builtin/blame.c:32
+msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
+msgstr ""
+
+#: builtin/blame.c:37
+msgid "<rev-opts> are documented in git-rev-list(1)"
+msgstr ""
+
+#: builtin/blame.c:410
+#, c-format
+msgid "expecting a color: %s"
+msgstr ""
+
+#: builtin/blame.c:417
+msgid "must end with a color"
+msgstr ""
+
+#: builtin/blame.c:728
+#, c-format
+msgid "invalid color '%s' in color.blame.repeatedLines"
+msgstr ""
+
+#: builtin/blame.c:746
+msgid "invalid value for blame.coloring"
+msgstr ""
+
+#: builtin/blame.c:845
+#, c-format
+msgid "cannot find revision %s to ignore"
+msgstr ""
+
+#: builtin/blame.c:867
+msgid "show blame entries as we find them, incrementally"
+msgstr ""
+
+#: builtin/blame.c:868
+msgid "do not show object names of boundary commits (Default: off)"
+msgstr ""
+
+#: 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 builtin/checkout.c:1503 builtin/clone.c:92
+#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:175
+#: builtin/merge.c:297 builtin/multi-pack-index.c:27 builtin/pull.c:119
+#: builtin/push.c:575 builtin/send-pack.c:198
+msgid "force progress reporting"
+msgstr "paksa laporkan perkembangan"
+
+#: builtin/blame.c:872
+msgid "show output score for blame entries"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/blame.c:878
+msgid "show raw timestamp (Default: off)"
+msgstr ""
+
+#: builtin/blame.c:879
+msgid "show long commit SHA1 (Default: off)"
+msgstr ""
+
+#: 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:1812
+msgid "rev"
+msgstr ""
+
+#: builtin/blame.c:883
+msgid "ignore <rev> when blaming"
+msgstr ""
+
+#: 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 ""
+
+#: 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 "range"
+msgstr ""
+
+#: builtin/blame.c:893
+msgid "process only line range <start>,<end> or function :<funcname>"
+msgstr ""
+
+#: builtin/blame.c:945
+msgid "--progress can't be used with --incremental or porcelain formats"
+msgstr ""
+
+#. 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:996
+msgid "4 years, 11 months ago"
+msgstr ""
+
+#: builtin/blame.c:1112
+#, c-format
+msgid "file %s has only %lu line"
+msgid_plural "file %s has only %lu lines"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/blame.c:1157
+msgid "Blaming lines"
+msgstr ""
+
+#: builtin/branch.c:29
+msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
+msgstr ""
+
+#: builtin/branch.c:30
+msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
+msgstr ""
+
+#: builtin/branch.c:31
+msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
+msgstr ""
+
+#: builtin/branch.c:32
+msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
+msgstr ""
+
+#: builtin/branch.c:33
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr ""
+
+#: builtin/branch.c:34
+msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgstr ""
+
+#: builtin/branch.c:35
+msgid "git branch [<options>] [-r | -a] [--format]"
+msgstr ""
+
+#: builtin/branch.c:154
+#, c-format
+msgid ""
+"deleting branch '%s' that has been merged to\n"
+" '%s', but not yet merged to HEAD."
+msgstr ""
+
+#: 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 ""
+
+#: builtin/branch.c:172
+#, c-format
+msgid "Couldn't look up commit object for '%s'"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/branch.c:189
+msgid "Update of config-file failed"
+msgstr ""
+
+#: builtin/branch.c:223
+msgid "cannot use -a with -d"
+msgstr ""
+
+#: builtin/branch.c:230
+msgid "Couldn't look up commit object for HEAD"
+msgstr ""
+
+#: builtin/branch.c:244
+#, c-format
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr ""
+
+#: builtin/branch.c:259
+#, c-format
+msgid "remote-tracking branch '%s' not found."
+msgstr ""
+
+#: builtin/branch.c:260
+#, c-format
+msgid "branch '%s' not found."
+msgstr ""
+
+#: builtin/branch.c:291
+#, c-format
+msgid "Deleted remote-tracking branch %s (was %s).\n"
+msgstr ""
+
+#: builtin/branch.c:292
+#, c-format
+msgid "Deleted branch %s (was %s).\n"
+msgstr ""
+
+#: builtin/branch.c:438 builtin/tag.c:61
+msgid "unable to parse format string"
+msgstr ""
+
+#: builtin/branch.c:469
+msgid "could not resolve HEAD"
+msgstr ""
+
+#: builtin/branch.c:475
+#, c-format
+msgid "HEAD (%s) points outside of refs/heads/"
+msgstr ""
+
+#: builtin/branch.c:490
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr ""
+
+#: builtin/branch.c:494
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr ""
+
+#: builtin/branch.c:511
+msgid "cannot copy the current branch while not on any."
+msgstr ""
+
+#: builtin/branch.c:513
+msgid "cannot rename the current branch while not on any."
+msgstr ""
+
+#: builtin/branch.c:524
+#, c-format
+msgid "Invalid branch name: '%s'"
+msgstr ""
+
+#: builtin/branch.c:553
+msgid "Branch rename failed"
+msgstr ""
+
+#: builtin/branch.c:555
+msgid "Branch copy failed"
+msgstr ""
+
+#: builtin/branch.c:559
+#, c-format
+msgid "Created a copy of a misnamed branch '%s'"
+msgstr ""
+
+#: builtin/branch.c:562
+#, c-format
+msgid "Renamed a misnamed branch '%s' away"
+msgstr ""
+
+#: builtin/branch.c:568
+#, c-format
+msgid "Branch renamed to %s, but HEAD is not updated!"
+msgstr ""
+
+#: builtin/branch.c:577
+msgid "Branch is renamed, but update of config-file failed"
+msgstr ""
+
+#: builtin/branch.c:579
+msgid "Branch is copied, but update of config-file failed"
+msgstr ""
+
+#: builtin/branch.c:595
+#, c-format
+msgid ""
+"Please edit the description for the branch\n"
+" %s\n"
+"Lines starting with '%c' will be stripped.\n"
+msgstr ""
+
+#: builtin/branch.c:629
+msgid "Generic options"
+msgstr ""
+
+#: builtin/branch.c:631
+msgid "show hash and subject, give twice for upstream branch"
+msgstr ""
+
+#: builtin/branch.c:632
+msgid "suppress informational messages"
+msgstr ""
+
+#: builtin/branch.c:633
+msgid "set up tracking mode (see git-pull(1))"
+msgstr ""
+
+#: builtin/branch.c:635
+msgid "do not use"
+msgstr ""
+
+#: builtin/branch.c:637 builtin/rebase.c:534
+msgid "upstream"
+msgstr ""
+
+#: builtin/branch.c:637
+msgid "change the upstream info"
+msgstr ""
+
+#: builtin/branch.c:638
+msgid "unset the upstream info"
+msgstr ""
+
+#: builtin/branch.c:639
+msgid "use colored output"
+msgstr ""
+
+#: builtin/branch.c:640
+msgid "act on remote-tracking branches"
+msgstr ""
+
+#: builtin/branch.c:642 builtin/branch.c:644
+msgid "print only branches that contain the commit"
+msgstr ""
+
+#: builtin/branch.c:643 builtin/branch.c:645
+msgid "print only branches that don't contain the commit"
+msgstr ""
+
+#: builtin/branch.c:648
+msgid "Specific git-branch actions:"
+msgstr ""
+
+#: builtin/branch.c:649
+msgid "list both remote-tracking and local branches"
+msgstr ""
+
+#: builtin/branch.c:651
+msgid "delete fully merged branch"
+msgstr ""
+
+#: builtin/branch.c:652
+msgid "delete branch (even if not merged)"
+msgstr ""
+
+#: builtin/branch.c:653
+msgid "move/rename a branch and its reflog"
+msgstr ""
+
+#: builtin/branch.c:654
+msgid "move/rename a branch, even if target exists"
+msgstr ""
+
+#: builtin/branch.c:655
+msgid "copy a branch and its reflog"
+msgstr ""
+
+#: builtin/branch.c:656
+msgid "copy a branch, even if target exists"
+msgstr ""
+
+#: builtin/branch.c:657
+msgid "list branch names"
+msgstr ""
+
+#: builtin/branch.c:658
+msgid "show current branch name"
+msgstr ""
+
+#: builtin/branch.c:659
+msgid "create the branch's reflog"
+msgstr ""
+
+#: builtin/branch.c:661
+msgid "edit the description for the branch"
+msgstr ""
+
+#: builtin/branch.c:662
+msgid "force creation, move/rename, deletion"
+msgstr ""
+
+#: builtin/branch.c:663
+msgid "print only branches that are merged"
+msgstr ""
+
+#: builtin/branch.c:664
+msgid "print only branches that are not merged"
+msgstr ""
+
+#: builtin/branch.c:665
+msgid "list branches in columns"
+msgstr ""
+
+#: builtin/branch.c:667 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:466
+msgid "object"
+msgstr ""
+
+#: builtin/branch.c:668
+msgid "print only branches of the object"
+msgstr ""
+
+#: builtin/branch.c:669 builtin/for-each-ref.c:48 builtin/tag.c:473
+msgid "sorting and filtering are case insensitive"
+msgstr ""
+
+#: builtin/branch.c:670 builtin/for-each-ref.c:38 builtin/tag.c:471
+#: builtin/verify-tag.c:38
+msgid "format to use for the output"
+msgstr ""
+
+#: builtin/branch.c:693 builtin/clone.c:790
+msgid "HEAD not found below refs/heads!"
+msgstr ""
+
+#: builtin/branch.c:717
+msgid "--column and --verbose are incompatible"
+msgstr ""
+
+#: builtin/branch.c:732 builtin/branch.c:788 builtin/branch.c:797
+msgid "branch name required"
+msgstr ""
+
+#: builtin/branch.c:764
+msgid "Cannot give description to detached HEAD"
+msgstr ""
+
+#: builtin/branch.c:769
+msgid "cannot edit description of more than one branch"
+msgstr ""
+
+#: builtin/branch.c:776
+#, c-format
+msgid "No commit on branch '%s' yet."
+msgstr ""
+
+#: builtin/branch.c:779
+#, c-format
+msgid "No branch named '%s'."
+msgstr ""
+
+#: builtin/branch.c:794
+msgid "too many branches for a copy operation"
+msgstr ""
+
+#: builtin/branch.c:803
+msgid "too many arguments for a rename operation"
+msgstr ""
+
+#: builtin/branch.c:808
+msgid "too many arguments to set new upstream"
+msgstr ""
+
+#: builtin/branch.c:812
+#, c-format
+msgid ""
+"could not set upstream of HEAD to %s when it does not point to any branch."
+msgstr ""
+
+#: builtin/branch.c:815 builtin/branch.c:838
+#, c-format
+msgid "no such branch '%s'"
+msgstr ""
+
+#: builtin/branch.c:819
+#, c-format
+msgid "branch '%s' does not exist"
+msgstr ""
+
+#: builtin/branch.c:832
+msgid "too many arguments to unset upstream"
+msgstr ""
+
+#: builtin/branch.c:836
+msgid "could not unset upstream of HEAD when it does not point to any branch."
+msgstr ""
+
+#: builtin/branch.c:842
+#, c-format
+msgid "Branch '%s' has no upstream information"
+msgstr ""
+
+#: builtin/branch.c:852
+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:856
+msgid ""
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
+msgstr ""
+
+#: builtin/bugreport.c:15
+msgid "git version:\n"
+msgstr ""
+
+#: 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"
+"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:135
+msgid "specify a destination for the bugreport file"
+msgstr ""
+
+#: builtin/bugreport.c:137
+msgid "specify a strftime format suffix for the filename"
+msgstr ""
+
+#: builtin/bugreport.c:159
+#, c-format
+msgid "could not create leading directories for '%s'"
+msgstr ""
+
+#: builtin/bugreport.c:166
+msgid "System Info"
+msgstr ""
+
+#: builtin/bugreport.c:169
+msgid "Enabled Hooks"
+msgstr ""
+
+#: builtin/bugreport.c:176
+#, c-format
+msgid "couldn't create a new file at '%s'"
+msgstr ""
+
+#: builtin/bugreport.c:179
+#, c-format
+msgid "unable to write to %s"
+msgstr ""
+
+#: builtin/bugreport.c:189
+#, 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:3495
+msgid "do not show progress meter"
+msgstr ""
+
+#: builtin/bundle.c:69 builtin/pack-objects.c:3497
+msgid "show progress meter"
+msgstr ""
+
+#: builtin/bundle.c:71 builtin/pack-objects.c:3499
+msgid "show progress meter during object writing phase"
+msgstr ""
+
+#: builtin/bundle.c:74 builtin/pack-objects.c:3502
+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: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/bundle.c:171 builtin/remote.c:1700
+msgid "be verbose; must be placed before a subcommand"
+msgstr ""
+
+#: builtin/bundle.c:193 builtin/remote.c:1731
+#, 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:599
+msgid ""
+"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
+"symlinks] [--textconv | --filters]"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: builtin/cat-file.c:649
+msgid "use a specific path for --textconv/--filters"
+msgstr ""
+
+#: builtin/cat-file.c:651
+msgid "allow -s and -t to work with broken/corrupt objects"
+msgstr ""
+
+#: builtin/cat-file.c:652
+msgid "buffer --batch output"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/cat-file.c:664
+msgid "show all objects with --batch or --batch-check"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/check-attr.c:14
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: builtin/check-ignore.c:21 builtin/checkout.c:1499 builtin/gc.c:549
+#: builtin/worktree.c:489
+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 ""
+
+#: builtin/check-ignore.c:166
+msgid "-z only makes sense with --stdin"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/check-ignore.c:174
+msgid "cannot have both --quiet and --verbose"
+msgstr ""
+
+#: builtin/check-ignore.c:177
+msgid "--non-matching is only valid with --verbose"
+msgstr ""
+
+#: builtin/check-mailmap.c:9
+msgid "git check-mailmap [<options>] <contact>..."
+msgstr ""
+
+#: 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 ""
+
+#: builtin/check-mailmap.c:48
+msgid "no contacts specified"
+msgstr ""
+
+#: builtin/checkout-index.c:152
+msgid "git checkout-index [<options>] [--] [<file>...]"
+msgstr ""
+
+#: builtin/checkout-index.c:169
+msgid "stage should be between 1 and 3 or all"
+msgstr ""
+
+#: builtin/checkout-index.c:186
+msgid "check out all files in the index"
+msgstr ""
+
+#: builtin/checkout-index.c:187
+msgid "force overwrite of existing files"
+msgstr ""
+
+#: builtin/checkout-index.c:189
+msgid "no warning for existing files and files not in index"
+msgstr ""
+
+#: builtin/checkout-index.c:191
+msgid "don't checkout new files"
+msgstr ""
+
+#: builtin/checkout-index.c:193
+msgid "update stat information in the index file"
+msgstr ""
+
+#: builtin/checkout-index.c:197
+msgid "read list of paths from the standard input"
+msgstr ""
+
+#: builtin/checkout-index.c:199
+msgid "write the content to temporary files"
+msgstr ""
+
+#: builtin/checkout-index.c:200 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:717
+msgid "string"
+msgstr ""
+
+#: builtin/checkout-index.c:201
+msgid "when creating files, prepend <string>"
+msgstr ""
+
+#: builtin/checkout-index.c:203
+msgid "copy out the files from named stage"
+msgstr ""
+
+#: builtin/checkout.c:31
+msgid "git checkout [<options>] <branch>"
+msgstr "git checkout [<opsi>] <cabang>"
+
+#: builtin/checkout.c:32
+msgid "git checkout [<options>] [<branch>] -- <file>..."
+msgstr "git checkout [<opsi>] [<cabang>] -- <berkas>..."
+
+#: builtin/checkout.c:37
+msgid "git switch [<options>] [<branch>]"
+msgstr "git switch [<opsi>] [<cabang>]"
+
+#: builtin/checkout.c:42
+msgid "git restore [<options>] [--source=<branch>] <file>..."
+msgstr "git restore [<opsi>] [--source=<cabang>] <berkas>..."
+
+#: builtin/checkout.c:188 builtin/checkout.c:227
+#, c-format
+msgid "path '%s' does not have our version"
+msgstr "jalur '%s' tidak punya versi kami"
+
+#: builtin/checkout.c:190 builtin/checkout.c:229
+#, c-format
+msgid "path '%s' does not have their version"
+msgstr "jalur '%s' tidak punya versi mereka"
+
+#: builtin/checkout.c:206
+#, c-format
+msgid "path '%s' does not have all necessary versions"
+msgstr "jalur '%s' tidak punya semua versi yang diperlukan"
+
+#: builtin/checkout.c:258
+#, c-format
+msgid "path '%s' does not have necessary versions"
+msgstr "jalur '%s' tidak punya versi yang diperlukan"
+
+#: builtin/checkout.c:275
+#, c-format
+msgid "path '%s': cannot merge"
+msgstr "jalur '%s': tidak dapat gabung"
+
+#: builtin/checkout.c:291
+#, c-format
+msgid "Unable to add merge result for '%s'"
+msgstr "Tidak dapat menambahkan hasil penggabungan untuk '%s'"
+
+#: builtin/checkout.c:396
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] "Konflik penggabungan %d dibuat ulang"
+msgstr[1] "Konflik penggabungan %d dibuat ulang"
+
+#: builtin/checkout.c:401
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] "%d jalur diperbarui dari %s"
+msgstr[1] "%d jalur diperbarui dari %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 jalur diperbarui dari indeks"
+msgstr[1] "%d jalur diperbarui dari indeks"
+
+#: 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' tidak dapat digunakan untuk memperbarui jalur"
+
+#: builtin/checkout.c:444 builtin/checkout.c:447
+#, c-format
+msgid "'%s' cannot be used with %s"
+msgstr "'%s' tidak dapat digunakan untuk %s"
+
+#: builtin/checkout.c:451
+#, c-format
+msgid "Cannot update paths and switch to branch '%s' at the same time."
+msgstr ""
+"Tidak dapat memperbarui jalur dan mengganti ke cabang '%s' dalam waktu yang "
+"bersamaan."
+
+#: builtin/checkout.c:455
+#, c-format
+msgid "neither '%s' or '%s' is specified"
+msgstr "baik '%s' atau '%s' tidak disebutkan"
+
+#: builtin/checkout.c:459
+#, c-format
+msgid "'%s' must be used when '%s' is not specified"
+msgstr "'%s' harus disebutkan ketika '%s' tidak disebutkan"
+
+#: builtin/checkout.c:464 builtin/checkout.c:469
+#, c-format
+msgid "'%s' or '%s' cannot be used with %s"
+msgstr "'%s' atau '%s' tidak dapat digunakan untuk %s"
+
+#: builtin/checkout.c:543 builtin/checkout.c:550
+#, c-format
+msgid "path '%s' is unmerged"
+msgstr "jalur '%s' tak tergabung"
+
+#: builtin/checkout.c:718
+msgid "you need to resolve your current index first"
+msgstr "Anda perlu selesaikan dulu indeks Anda saat ini"
+
+#: builtin/checkout.c:772
+#, c-format
+msgid ""
+"cannot continue with staged changes in the following files:\n"
+"%s"
+msgstr ""
+"tidak dapat melanjutkan dengan perubahan yang tergelar dalam berkas "
+"berikut:\n"
+"%s"
+
+#: builtin/checkout.c:865
+#, c-format
+msgid "Can not do reflog for '%s': %s\n"
+msgstr "Tidak dapat melakukan reflog untuk '%s': %s\n"
+
+#: builtin/checkout.c:907
+msgid "HEAD is now at"
+msgstr "HEAD sekarang berada di"
+
+#: builtin/checkout.c:911 builtin/clone.c:721 t/helper/test-fast-rebase.c:202
+msgid "unable to update HEAD"
+msgstr "tidak dapat memperbarui HEAD"
+
+#: builtin/checkout.c:915
+#, c-format
+msgid "Reset branch '%s'\n"
+msgstr "Ganti ulang cabang '%s'\n"
+
+#: builtin/checkout.c:918
+#, c-format
+msgid "Already on '%s'\n"
+msgstr "Sudah berada pada '%s'\n"
+
+#: builtin/checkout.c:922
+#, c-format
+msgid "Switched to and reset branch '%s'\n"
+msgstr "Ganti ke dan ganti cabang '%s'\n"
+
+#: builtin/checkout.c:924 builtin/checkout.c:1355
+#, c-format
+msgid "Switched to a new branch '%s'\n"
+msgstr "Ganti ke cabang baru '%s'\n"
+
+#: builtin/checkout.c:926
+#, c-format
+msgid "Switched to branch '%s'\n"
+msgstr "Ganti ke cabang '%s'\n"
+
+#: builtin/checkout.c:977
+#, c-format
+msgid " ... and %d more.\n"
+msgstr "... dan %d lainnya.\n"
+
+#: builtin/checkout.c:983
+#, 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] ""
+"Peringatan: Anda meninggalkan %d komit di belakang, tidak terhubung ke\n"
+"cabang Anda manapun:\n"
+"\n"
+"%s\n"
+msgstr[1] ""
+"Peringatan: Anda meninggalkan %d komit di belakang, tidak terhubung ke\n"
+"cabang Anda manapun:\n"
+"\n"
+"%s\n"
+
+#: builtin/checkout.c:1002
+#, 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] ""
+"Jika Anda ingin memelihara itu dengan membuat cabang baru, ini mungkin\n"
+"saat yang tepat untuk dilakukan dengan:\n"
+"git branch <nama-cabang-baru> %s\n"
+msgstr[1] ""
+"Jika Anda ingin memelihara itu dengan membuat cabang baru, ini mungkin\n"
+"saat yang tepat untuk dilakukan dengan:\n"
+"git branch <nama-cabang-baru> %s\n"
+
+#: builtin/checkout.c:1037
+msgid "internal error in revision walk"
+msgstr "kesalahan internal dalam jalan revisi"
+
+#: builtin/checkout.c:1041
+msgid "Previous HEAD position was"
+msgstr "Posisi HEAD sebelumnya adalah"
+
+#: builtin/checkout.c:1081 builtin/checkout.c:1350
+msgid "You are on a branch yet to be born"
+msgstr "Anda berada pada cabang yang belum lahir"
+
+#: builtin/checkout.c:1163
+#, 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' bisa jadi berkas lokal dan cabang pelacak.\n"
+"Mohon gunakan -- (dan secara opsional --no-guess) untuk disambiguasi"
+
+#: builtin/checkout.c:1170
+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 ""
+"Jika maksud Anda check out cabang pelacak remote, seperti 'origin',\n"
+"Anda bisa lakukan dengan kualifikasi penuh nama dengan opsi --track:\n"
+"\n"
+" git checkout --track origin/<nama>\n"
+"\n"
+"Jika Anda ingin checkout <nama> ambigu selalu memilih satu remote,\n"
+"seperti remote 'origin', pertimbangkan untuk menyetel\n"
+"checkout.defaultRemote=origin di konfigurasi Anda"
+
+#: builtin/checkout.c:1180
+#, c-format
+msgid "'%s' matched multiple (%d) remote tracking branches"
+msgstr "'%s' cocok dengan banyak (%d) cabang pelacak remote"
+
+#: builtin/checkout.c:1246
+msgid "only one reference expected"
+msgstr "hanya satu referensi yang diharapkan"
+
+#: builtin/checkout.c:1263
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "hanya satu referensi yang diharapkan, %d diberikan"
+
+#: builtin/checkout.c:1309 builtin/worktree.c:270 builtin/worktree.c:438
+#, c-format
+msgid "invalid reference: %s"
+msgstr "referensi tidak valid: %s"
+
+#: builtin/checkout.c:1322 builtin/checkout.c:1688
+#, c-format
+msgid "reference is not a tree: %s"
+msgstr "referensi bukan pohon: %s"
+
+#: builtin/checkout.c:1369
+#, c-format
+msgid "a branch is expected, got tag '%s'"
+msgstr "sebuah cabang diharapkan, dapat tag '%s'"
+
+#: builtin/checkout.c:1371
+#, c-format
+msgid "a branch is expected, got remote branch '%s'"
+msgstr "sebuah cabang diharapkan, dapat cabang remote '%s'"
+
+#: builtin/checkout.c:1372 builtin/checkout.c:1380
+#, c-format
+msgid "a branch is expected, got '%s'"
+msgstr "sebuah cabang diharapkan, dapat '%s'"
+
+#: builtin/checkout.c:1375
+#, c-format
+msgid "a branch is expected, got commit '%s'"
+msgstr "sebuah cabang diharapkan, dapat komit '%s'"
+
+#: builtin/checkout.c:1391
+msgid ""
+"cannot switch branch while merging\n"
+"Consider \"git merge --quit\" or \"git worktree add\"."
+msgstr ""
+"tidak dapat mengganti cabang saat penggabungan\n"
+"Pertimbangkan untuk menggunakan \"git merge --quit\" atau \"git worktree add"
+"\"."
+
+#: builtin/checkout.c:1395
+msgid ""
+"cannot switch branch in the middle of an am session\n"
+"Consider \"git am --quit\" or \"git worktree add\"."
+msgstr ""
+"tidak dapat mengganti cabang di tengah sesi am\n"
+"Pertimbangkan untuk menggunakan \"git am --quit\" atau \"git worktree add\"."
+
+#: builtin/checkout.c:1399
+msgid ""
+"cannot switch branch while rebasing\n"
+"Consider \"git rebase --quit\" or \"git worktree add\"."
+msgstr ""
+"tidak dapat mengganti cabang saat pendasaran ulang\n"
+"Pertimbangkan untuk menggunakan \"git rebase --quit\" atau \"git worktree add"
+"\"."
+
+#: builtin/checkout.c:1403
+msgid ""
+"cannot switch branch while cherry-picking\n"
+"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
+msgstr ""
+"tidak dapat mengganti cabang saat pemetikan ceri\n"
+"Pertimbangkan untuk menggunakan \"git cherry-pick --quit\" atau \"git "
+"worktree add\"."
+
+#: builtin/checkout.c:1407
+msgid ""
+"cannot switch branch while reverting\n"
+"Consider \"git revert --quit\" or \"git worktree add\"."
+msgstr ""
+"tidak dapat mengganti cabang saat pembalikan\n"
+"Pertimbangkan untuk menggunakan \"git cherry-pick --quit\" atau \"git "
+"worktree add\"."
+
+#: builtin/checkout.c:1411
+msgid "you are switching branch while bisecting"
+msgstr "Anda mengganti cabang saat pembagian dua"
+
+#: builtin/checkout.c:1418
+msgid "paths cannot be used with switching branches"
+msgstr "jalur tidak dapat digunakan dengan mengganti cabang"
+
+#: builtin/checkout.c:1421 builtin/checkout.c:1425 builtin/checkout.c:1429
+#, c-format
+msgid "'%s' cannot be used with switching branches"
+msgstr "'%s' tidak dapat digunakan dengan mengganti cabang"
+
+#: builtin/checkout.c:1433 builtin/checkout.c:1436 builtin/checkout.c:1439
+#: builtin/checkout.c:1444 builtin/checkout.c:1449
+#, c-format
+msgid "'%s' cannot be used with '%s'"
+msgstr "'%s' tidak dapat digunakan dengan '%s'"
+
+#: builtin/checkout.c:1446
+#, c-format
+msgid "'%s' cannot take <start-point>"
+msgstr "'%s' tidak bisa mengambil <titik-awal>"
+
+#: builtin/checkout.c:1454
+#, c-format
+msgid "Cannot switch branch to a non-commit '%s'"
+msgstr "Tidak dapat mengganti cabang ke bukan komit '%s'"
+
+#: builtin/checkout.c:1461
+msgid "missing branch or commit argument"
+msgstr "kehilangan argumen cabang atau komit"
+
+#: builtin/checkout.c:1504
+msgid "perform a 3-way merge with the new branch"
+msgstr "lakukan penggabungan 3 arah dengan cabang baru"
+
+#: builtin/checkout.c:1505 builtin/log.c:1799 parse-options.h:322
+msgid "style"
+msgstr "gaya"
+
+#: builtin/checkout.c:1506
+msgid "conflict style (merge or diff3)"
+msgstr "gaya konflik (merge atau diff3)"
+
+#: builtin/checkout.c:1518 builtin/worktree.c:486
+msgid "detach HEAD at named commit"
+msgstr "lepas HEAD pada komit bernama"
+
+#: builtin/checkout.c:1519
+msgid "set upstream info for new branch"
+msgstr "setel info hulu untuk cabang baru"
+
+#: builtin/checkout.c:1521
+msgid "force checkout (throw away local modifications)"
+msgstr "paksa checkout (buang modifikasi lokal)"
+
+#: builtin/checkout.c:1523
+msgid "new-branch"
+msgstr "cabang baru"
+
+#: builtin/checkout.c:1523
+msgid "new unparented branch"
+msgstr "cabang baru tanpa induk"
+
+#: builtin/checkout.c:1525 builtin/merge.c:301
+msgid "update ignored files (default)"
+msgstr "perbarui berkas yang diabaikan (default)"
+
+#: builtin/checkout.c:1528
+msgid "do not check if another worktree is holding the given ref"
+msgstr ""
+"jangan periksa jika pohon kerja yang lain mempunyai referensi yang diberikan"
+
+#: builtin/checkout.c:1541
+msgid "checkout our version for unmerged files"
+msgstr "checkout versi kami untuk berkas yang tak tergabung"
+
+#: builtin/checkout.c:1544
+msgid "checkout their version for unmerged files"
+msgstr "checkout versi mereka untuk berkas yang tak tergabung"
+
+#: builtin/checkout.c:1548
+msgid "do not limit pathspecs to sparse entries only"
+msgstr "jangan batasi jalur spek hanya ke entri tipis"
+
+#: builtin/checkout.c:1603
+#, c-format
+msgid "-%c, -%c and --orphan are mutually exclusive"
+msgstr "-%c, -%c dan --orphan saling eksklusif"
+
+#: builtin/checkout.c:1607
+msgid "-p and --overlay are mutually exclusive"
+msgstr "-p dan --overlay saling eksklusif"
+
+#: builtin/checkout.c:1644
+msgid "--track needs a branch name"
+msgstr "--track butuh nama cabang"
+
+#: builtin/checkout.c:1649
+#, c-format
+msgid "missing branch name; try -%c"
+msgstr "kehilangan nama cabang; coba -%c"
+
+#: builtin/checkout.c:1681
+#, c-format
+msgid "could not resolve %s"
+msgstr "tidak dapat menyelesaikan %s"
+
+#: builtin/checkout.c:1697
+msgid "invalid path specification"
+msgstr "spesifikasi jalur tidak valid"
+
+#: builtin/checkout.c:1704
+#, c-format
+msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
+msgstr "'%s' bukanlah commit dan cabang '%s' tidak dapat dibuat dari itu"
+
+#: builtin/checkout.c:1708
+#, c-format
+msgid "git checkout: --detach does not take a path argument '%s'"
+msgstr "git checkout: --detach tidak mengambil argumen jalur '%s'"
+
+#: builtin/checkout.c:1717
+msgid "--pathspec-from-file is incompatible with --detach"
+msgstr "--pathspec-from-file tidak kompatible dengan --detach"
+
+#: builtin/checkout.c:1720 builtin/reset.c:325 builtin/stash.c:1566
+msgid "--pathspec-from-file is incompatible with --patch"
+msgstr "--pathspec-from-file tidak kompatibel dengan --patch"
+
+#: builtin/checkout.c:1733
+msgid ""
+"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
+"checking out of the index."
+msgstr ""
+"git checkout: --ours/theirs, --force dan --merge tidak kompatibel saat\n"
+"men-checkout index"
+
+#: builtin/checkout.c:1738
+msgid "you must specify path(s) to restore"
+msgstr "Anda harus sebutkan jalur untuk dipulihkan"
+
+#: builtin/checkout.c:1764 builtin/checkout.c:1766 builtin/checkout.c:1815
+#: builtin/checkout.c:1817 builtin/clone.c:122 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:482
+#: builtin/worktree.c:484
+msgid "branch"
+msgstr "cabang"
+
+#: builtin/checkout.c:1765
+msgid "create and checkout a new branch"
+msgstr "buat dan checkout cabang baru"
+
+#: builtin/checkout.c:1767
+msgid "create/reset and checkout a branch"
+msgstr "buat/setel ulang dan checkout cabang"
+
+#: builtin/checkout.c:1768
+msgid "create reflog for new branch"
+msgstr "buat reflog untuk cabang baru"
+
+#: builtin/checkout.c:1770
+msgid "second guess 'git checkout <no-such-branch>' (default)"
+msgstr "tebakan kedua 'git checkout <tidak-ada-cabang-seperti-itu>' (default)"
+
+#: builtin/checkout.c:1771
+msgid "use overlay mode (default)"
+msgstr "gunakan mode hamparan (default)"
+
+#: builtin/checkout.c:1816
+msgid "create and switch to a new branch"
+msgstr "buat dan ganti ke cabang baru"
+
+#: builtin/checkout.c:1818
+msgid "create/reset and switch to a branch"
+msgstr "buat/setel ulang dan ganti ke cabang"
+
+#: builtin/checkout.c:1820
+msgid "second guess 'git switch <no-such-branch>'"
+msgstr "tebakan kedua 'git switch <tidak-ada-cabang-seperti-itu>'"
+
+#: builtin/checkout.c:1822
+msgid "throw away local modifications"
+msgstr "buang modifikasi lokal"
+
+#: builtin/checkout.c:1856
+msgid "which tree-ish to checkout from"
+msgstr "mana mirip-cabang untuk di-checkout"
+
+#: builtin/checkout.c:1858
+msgid "restore the index"
+msgstr "pulihkan indeks"
+
+#: builtin/checkout.c:1860
+msgid "restore the working tree (default)"
+msgstr "pulihkan pohon kerja (default)"
+
+#: builtin/checkout.c:1862
+msgid "ignore unmerged entries"
+msgstr "abaikan entri yang tak tergabung"
+
+#: builtin/checkout.c:1863
+msgid "use overlay mode"
+msgstr "gunakan mode hamparan"
+
+#: builtin/clean.c:29
+msgid ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
+msgstr ""
+
+#: builtin/clean.c:33
+#, c-format
+msgid "Removing %s\n"
+msgstr ""
+
+#: builtin/clean.c:34
+#, c-format
+msgid "Would remove %s\n"
+msgstr ""
+
+#: builtin/clean.c:35
+#, c-format
+msgid "Skipping repository %s\n"
+msgstr ""
+
+#: builtin/clean.c:36
+#, c-format
+msgid "Would skip repository %s\n"
+msgstr ""
+
+#: builtin/clean.c:37
+#, c-format
+msgid "failed to remove %s"
+msgstr ""
+
+#: builtin/clean.c:38
+#, c-format
+msgid "could not lstat %s\n"
+msgstr ""
+
+#: builtin/clean.c:302 git-add--interactive.perl:593
+#, 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 ""
+
+#: builtin/clean.c:306 git-add--interactive.perl:602
+#, 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 ""
+
+#: builtin/clean.c:521 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
+#, c-format, perl-format
+msgid "Huh (%s)?\n"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: builtin/clean.c:825
+msgid "Would remove the following item:"
+msgid_plural "Would remove the following items:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: 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:922 builtin/log.c:184 builtin/log.c:186
+#: builtin/ls-files.c:573 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 ""
+
+#: builtin/clean.c:932
+msgid ""
+"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
+"refusing to clean"
+msgstr ""
+
+#: builtin/clean.c:944
+msgid "-x and -X cannot be used together"
+msgstr ""
+
+#: builtin/clone.c:45
+msgid "git clone [<options>] [--] <repo> [<dir>]"
+msgstr "git clone [<opsi>] [--] <repo> [<direktori>]"
+
+#: builtin/clone.c:94
+msgid "don't create a checkout"
+msgstr "jangan buat checkout"
+
+#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:555
+msgid "create a bare repository"
+msgstr "buat repositori bare"
+
+#: builtin/clone.c:99
+msgid "create a mirror repository (implies bare)"
+msgstr "buat repositori cermin (implikasikan bare)"
+
+#: builtin/clone.c:101
+msgid "to clone from a local repository"
+msgstr "kloning dari repositori lokal"
+
+#: builtin/clone.c:103
+msgid "don't use local hardlinks, always copy"
+msgstr "jangan gunakan tautan keras lokal, selalu salin"
+
+#: builtin/clone.c:105
+msgid "setup as shared repository"
+msgstr "siapkan sebagai repositori berbagi"
+
+#: builtin/clone.c:107
+msgid "pathspec"
+msgstr "spek jalur"
+
+#: builtin/clone.c:107
+msgid "initialize submodules in the clone"
+msgstr "inisialisasi submodul dalam klon"
+
+#: builtin/clone.c:111
+msgid "number of submodules cloned in parallel"
+msgstr "jumlah submodul yang diklon secara paralel"
+
+#: builtin/clone.c:112 builtin/init-db.c:552
+msgid "template-directory"
+msgstr "direktori templat"
+
+#: builtin/clone.c:113 builtin/init-db.c:553
+msgid "directory from which templates will be used"
+msgstr "direktori dimana templat akan digunakan"
+
+#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831
+#: builtin/submodule--helper.c:2336
+msgid "reference repository"
+msgstr "repositori rujukan"
+
+#: builtin/clone.c:119 builtin/submodule--helper.c:1833
+#: builtin/submodule--helper.c:2338
+msgid "use --reference only while cloning"
+msgstr "gunakan --reference hanya pada saat kloning"
+
+#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3561 builtin/repack.c:357
+msgid "name"
+msgstr "nama"
+
+#: builtin/clone.c:121
+msgid "use <name> instead of 'origin' to track upstream"
+msgstr "gunakan <nama> daripada 'origin' untuk lacak hulu"
+
+#: builtin/clone.c:123
+msgid "checkout <branch> instead of the remote's HEAD"
+msgstr "checkout <cabang> daripada HEAD remote"
+
+#: builtin/clone.c:125
+msgid "path to git-upload-pack on the remote"
+msgstr "jalur ke git-upload-pack pada remote"
+
+#: builtin/clone.c:126 builtin/fetch.c:176 builtin/grep.c:861
+#: builtin/pull.c:208
+msgid "depth"
+msgstr "kedalaman"
+
+#: builtin/clone.c:127
+msgid "create a shallow clone of that depth"
+msgstr "buat klon dangkal sedalam kedalaman tersebut"
+
+#: builtin/clone.c:128 builtin/fetch.c:178 builtin/pack-objects.c:3550
+#: builtin/pull.c:211
+msgid "time"
+msgstr "waktu"
+
+#: builtin/clone.c:129
+msgid "create a shallow clone since a specific time"
+msgstr "buat klon dangkal sejak waktu yang disebutkan"
+
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/fetch.c:203
+#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1323
+msgid "revision"
+msgstr "revisi"
+
+#: builtin/clone.c:131 builtin/fetch.c:181 builtin/pull.c:215
+msgid "deepen history of shallow clone, excluding rev"
+msgstr "perdalam riwayat klon dangkal, tidak termasuk rev"
+
+#: builtin/clone.c:133 builtin/submodule--helper.c:1843
+#: builtin/submodule--helper.c:2352
+msgid "clone only one branch, HEAD or --branch"
+msgstr "klon hanya satu cabang, HEAD atau --branch"
+
+#: builtin/clone.c:135
+msgid "don't clone any tags, and make later fetches not to follow them"
+msgstr "jangan klon tag apapun, dan buat pengambilan nanti tidak mengikutinya"
+
+#: builtin/clone.c:137
+msgid "any cloned submodules will be shallow"
+msgstr "submodul yang diklon akan dangkal"
+
+#: builtin/clone.c:138 builtin/init-db.c:561
+msgid "gitdir"
+msgstr "direktori git"
+
+#: builtin/clone.c:139 builtin/init-db.c:562
+msgid "separate git dir from working tree"
+msgstr "pisahkan direktori git dari pohon kerja"
+
+#: builtin/clone.c:140
+msgid "key=value"
+msgstr "kunci=nilai"
+
+#: builtin/clone.c:141
+msgid "set config inside the new repository"
+msgstr "setel konfigurasi di dalam repositori baru"
+
+#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77
+#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
+msgid "server-specific"
+msgstr "spesifik ke server"
+
+#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77
+#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
+msgid "option to transmit"
+msgstr "opsi untuk transmisi"
+
+#: builtin/clone.c:144 builtin/fetch.c:199 builtin/pull.c:234
+#: builtin/push.c:585
+msgid "use IPv4 addresses only"
+msgstr "gunakan hanya alamat IPv4"
+
+#: builtin/clone.c:146 builtin/fetch.c:201 builtin/pull.c:237
+#: builtin/push.c:587
+msgid "use IPv6 addresses only"
+msgstr "gunakan hanya alamat IPv6"
+
+#: builtin/clone.c:150
+msgid "any cloned submodules will use their remote-tracking branch"
+msgstr "submodul yang diklon akan menggunakan cabang yang melacak remotenya"
+
+#: builtin/clone.c:152
+msgid "initialize sparse-checkout file to include only files at root"
+msgstr ""
+"inisialisasi berkas checkout tipis agar memasukkan hanya berkas pada akar"
+
+#: builtin/clone.c:288
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"Nama direktori tidak dapat ditebak.\n"
+"Mohon sebutkan direktori pada baris perintah"
+
+#: builtin/clone.c:341
+#, c-format
+msgid "info: Could not add alternate for '%s': %s\n"
+msgstr "info: Tidak dapat menambahkan alternatif untuk '%s': %s\n"
+
+#: builtin/clone.c:414
+#, c-format
+msgid "%s exists and is not a directory"
+msgstr "%s ada dan bukan direktori"
+
+#: builtin/clone.c:432
+#, c-format
+msgid "failed to start iterator over '%s'"
+msgstr "gagal memulai iterator pada '%s'"
+
+#: builtin/clone.c:463
+#, c-format
+msgid "failed to create link '%s'"
+msgstr "gagal membuat tautan '%s'"
+
+#: builtin/clone.c:467
+#, c-format
+msgid "failed to copy file to '%s'"
+msgstr "gagal menyalin berkas ke '%s'"
+
+#: builtin/clone.c:472
+#, c-format
+msgid "failed to iterate over '%s'"
+msgstr "gagal iterasi pada '%s'"
+
+#: builtin/clone.c:499
+#, c-format
+msgid "done.\n"
+msgstr "selesai.\n"
+
+#: builtin/clone.c:513
+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 ""
+"Klon sukses, tapi checkout gagal.\n"
+"Anda dapat periksa apa yang dicheckout dengan 'git status'\n"
+"dan coba lagi dengan 'git restore --source=HEAD :/'\n"
+
+#: builtin/clone.c:590
+#, c-format
+msgid "Could not find remote branch %s to clone."
+msgstr "Tidak dapat menemukan cabang remote %s untuk diklon."
+
+#: builtin/clone.c:709
+#, c-format
+msgid "unable to update %s"
+msgstr "tidak dapat memperbarui %s"
+
+#: builtin/clone.c:757
+msgid "failed to initialize sparse-checkout"
+msgstr "gagal menginisalisasi checkout tipis"
+
+#: builtin/clone.c:780
+msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+msgstr ""
+"HEAD remote merujuk pada ref yang tidak ada, tidak dapat men-checkout.\n"
+
+#: builtin/clone.c:812
+msgid "unable to checkout working tree"
+msgstr "tidak dapat men-checkout pohon kerja"
+
+#: builtin/clone.c:887
+msgid "unable to write parameters to config file"
+msgstr "tidak dapat menulis parameter ke berkas konfigurasi"
+
+#: builtin/clone.c:950
+msgid "cannot repack to clean up"
+msgstr "tidak dapat memaket ulang untuk pembersihan"
+
+#: builtin/clone.c:952
+msgid "cannot unlink temporary alternates file"
+msgstr "tidak dapat batal-taut berkas alternatif sementara"
+
+#: builtin/clone.c:993 builtin/receive-pack.c:2493
+msgid "Too many arguments."
+msgstr "Terlalu banyak argumen."
+
+#: builtin/clone.c:997
+msgid "You must specify a repository to clone."
+msgstr "Anda harus sebutkan repositori untuk diklon."
+
+#: builtin/clone.c:1010
+#, c-format
+msgid "--bare and --origin %s options are incompatible."
+msgstr "--bare dan --origin %s tidak kompatibel."
+
+#: builtin/clone.c:1013
+msgid "--bare and --separate-git-dir are incompatible."
+msgstr "--bare dan --separate-git-dir tidak kompatibel."
+
+#: builtin/clone.c:1026
+#, c-format
+msgid "repository '%s' does not exist"
+msgstr "repositori '%s' tidak ada"
+
+#: builtin/clone.c:1030 builtin/fetch.c:1951
+#, c-format
+msgid "depth %s is not a positive number"
+msgstr "kedalaman %s bukan bilangan positif"
+
+#: builtin/clone.c:1040
+#, c-format
+msgid "destination path '%s' already exists and is not an empty directory."
+msgstr "jalur tujuan '%s' sudah ada dan bukan direktori kosong"
+
+#: builtin/clone.c:1046
+#, c-format
+msgid "repository path '%s' already exists and is not an empty directory."
+msgstr "jalur repositori '%s' sudah ada dan bukan direktori kosong"
+
+#: builtin/clone.c:1060
+#, c-format
+msgid "working tree '%s' already exists."
+msgstr "pohon kerja '%s' sudah ada."
+
+#: builtin/clone.c:1075 builtin/clone.c:1096 builtin/difftool.c:271
+#: builtin/log.c:1986 builtin/worktree.c:282 builtin/worktree.c:314
+#, c-format
+msgid "could not create leading directories of '%s'"
+msgstr "tidak dapat membuat direktori pendahulu '%s'"
+
+#: builtin/clone.c:1080
+#, c-format
+msgid "could not create work tree dir '%s'"
+msgstr "tidak dapat membuat direktori pohon kerja '%s'"
+
+#: builtin/clone.c:1100
+#, c-format
+msgid "Cloning into bare repository '%s'...\n"
+msgstr "Kloning ke repositori bare '%s'...\n"
+
+#: builtin/clone.c:1102
+#, c-format
+msgid "Cloning into '%s'...\n"
+msgstr "Kloning ke '%s'...\n"
+
+#: builtin/clone.c:1126
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
+msgstr ""
+"clone --recursive tidak kompatibel dengan baik --reference dan --reference-"
+"if-able"
+
+#: builtin/clone.c:1170 builtin/remote.c:200 builtin/remote.c:705
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr "'%s' bukan nama remote yang valid"
+
+#: builtin/clone.c:1211
+msgid "--depth is ignored in local clones; use file:// instead."
+msgstr "--depth diabaikan di klon lokal; gunakan file:// sebagai gantinya."
+
+#: builtin/clone.c:1213
+msgid "--shallow-since is ignored in local clones; use file:// instead."
+msgstr ""
+"--shallow-since diabaikan di klon lokal; gunakan file:// sebagai gantinya."
+
+#: builtin/clone.c:1215
+msgid "--shallow-exclude is ignored in local clones; use file:// instead."
+msgstr ""
+"--shallow-exclude diabaikan di klon lokal; gunakan file:// sebagai gantinya."
+
+#: builtin/clone.c:1217
+msgid "--filter is ignored in local clones; use file:// instead."
+msgstr "--filter diabaikan di klon lokal; gunakan file:// sebagai gantinya."
+
+#: builtin/clone.c:1220
+msgid "source repository is shallow, ignoring --local"
+msgstr "repositori sumber dangkal, abaikan --local"
+
+#: builtin/clone.c:1225
+msgid "--local is ignored"
+msgstr "--local diabaikan"
+
+#: builtin/clone.c:1315 builtin/clone.c:1323
+#, c-format
+msgid "Remote branch %s not found in upstream %s"
+msgstr "Cabang remote %s tidak ditemukan di hulu %s"
+
+#: builtin/clone.c:1326
+msgid "You appear to have cloned an empty repository."
+msgstr "Anda tampaknya mengklon repositori kosong."
+
+#: builtin/column.c:10
+msgid "git column [<options>]"
+msgstr ""
+
+#: 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 ""
+
+#: 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:187 builtin/log.c:1768
+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 "
+"<file>)...] <tree>"
+msgstr ""
+
+#: builtin/commit-tree.c:31
+#, c-format
+msgid "duplicate parent %s ignored"
+msgstr ""
+
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:557
+#, c-format
+msgid "not a valid object name %s"
+msgstr ""
+
+#: builtin/commit-tree.c:93
+#, c-format
+msgid "git commit-tree: failed to open '%s'"
+msgstr ""
+
+#: builtin/commit-tree.c:96
+#, c-format
+msgid "git commit-tree: failed to read '%s'"
+msgstr ""
+
+#: builtin/commit-tree.c:98
+#, c-format
+msgid "git commit-tree: failed to close '%s'"
+msgstr ""
+
+#: builtin/commit-tree.c:111
+msgid "parent"
+msgstr ""
+
+#: builtin/commit-tree.c:112
+msgid "id of a parent commit object"
+msgstr ""
+
+#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:282
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1537
+#: builtin/tag.c:445
+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:299
+#: builtin/pull.c:176 builtin/revert.c:118
+msgid "GPG sign commit"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/commit.c:41
+msgid "git commit [<options>] [--] <pathspec>..."
+msgstr ""
+
+#: builtin/commit.c:46
+msgid "git status [<options>] [--] <pathspec>..."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: builtin/commit.c:63
+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"
+" 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 ""
+
+#: builtin/commit.c:312
+msgid "failed to unpack HEAD tree object"
+msgstr ""
+
+#: 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: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 ""
+
+#: 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 ""
+
+#: builtin/commit.c:607
+#, c-format
+msgid "commit '%s' has malformed author line"
+msgstr ""
+
+#: builtin/commit.c:626
+msgid "malformed --author parameter"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/commit.c:729 builtin/shortlog.c:413
+#, c-format
+msgid "(reading log message from standard input)\n"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/commit.c:766 builtin/commit.c:782
+msgid "could not read SQUASH_MSG"
+msgstr ""
+
+#: builtin/commit.c:773
+msgid "could not read MERGE_MSG"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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: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 ""
+
+#: builtin/commit.c:893
+#, c-format
+msgid "%sAuthor: %.*s <%.*s>"
+msgstr ""
+
+#: builtin/commit.c:901
+#, c-format
+msgid "%sDate: %s"
+msgstr ""
+
+#: builtin/commit.c:908
+#, c-format
+msgid "%sCommitter: %.*s <%.*s>"
+msgstr ""
+
+#: 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:308
+#, c-format
+msgid "Please supply the message using either -m or -F option.\n"
+msgstr ""
+
+#: builtin/commit.c:1055
+#, c-format
+msgid "--author '%s' is not 'Name <email>' and matches no existing author"
+msgstr ""
+
+#: builtin/commit.c:1069
+#, c-format
+msgid "Invalid ignored mode '%s'"
+msgstr ""
+
+#: builtin/commit.c:1087 builtin/commit.c:1331
+#, c-format
+msgid "Invalid untracked files mode '%s'"
+msgstr ""
+
+#: builtin/commit.c:1127
+msgid "--long and -z are incompatible"
+msgstr ""
+
+#: builtin/commit.c:1171
+msgid "Using both --reset-author and --author does not make sense"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/commit.c:1200
+msgid "Only one of -c/-C/-F/--fixup can be used."
+msgstr ""
+
+#: builtin/commit.c:1202
+msgid "Option -m cannot be combined with -c/-C/-F."
+msgstr ""
+
+#: builtin/commit.c:1211
+msgid "--reset-author can be used only with -C, -c or --amend."
+msgstr ""
+
+#: builtin/commit.c:1229
+msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
+msgstr ""
+
+#: builtin/commit.c:1235
+#, c-format
+msgid "paths '%s ...' with -a does not make sense"
+msgstr ""
+
+#: 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:560
+#: builtin/worktree.c:679
+msgid "machine-readable output"
+msgstr "keluaran yang dapat dibaca mesin"
+
+#: 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 ""
+
+#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541
+#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
+#: builtin/fast-export.c:1204 builtin/rebase.c:1412 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 ""
+
+#: builtin/commit.c:1387
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
+msgstr ""
+
+#: 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 ""
+
+#: 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:286 builtin/tag.c:447
+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:550
+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:90
+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 ""
+
+#: builtin/commit.c:1508
+msgid "use autosquash formatted message to squash specified commit"
+msgstr ""
+
+#: builtin/commit.c:1509
+msgid "the commit is authored by me now (used with -C/-c/--amend)"
+msgstr ""
+
+#: builtin/commit.c:1510 builtin/log.c:1743 builtin/merge.c:302
+#: builtin/pull.c:145 builtin/revert.c:110
+msgid "add a Signed-off-by trailer"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: builtin/commit.c:1629
+msgid "could not read MERGE_MODE"
+msgstr ""
+
+#: builtin/commit.c:1650
+#, c-format
+msgid "could not read commit message: %s"
+msgstr ""
+
+#: builtin/commit.c:1657
+#, c-format
+msgid "Aborting commit due to empty commit message.\n"
+msgstr ""
+
+#: builtin/commit.c:1662
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr ""
+
+#: 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/config.c:11
+msgid "git config [<options>]"
+msgstr ""
+
+#: builtin/config.c:109 builtin/env--helper.c:27
+#, c-format
+msgid "unrecognized --type argument, %s"
+msgstr ""
+
+#: builtin/config.c:121
+msgid "only one type at a time"
+msgstr ""
+
+#: builtin/config.c:130
+msgid "Config file location"
+msgstr ""
+
+#: builtin/config.c:131
+msgid "use global config file"
+msgstr ""
+
+#: builtin/config.c:132
+msgid "use system config file"
+msgstr ""
+
+#: builtin/config.c:133
+msgid "use repository config file"
+msgstr ""
+
+#: builtin/config.c:134
+msgid "use per-worktree config file"
+msgstr ""
+
+#: builtin/config.c:135
+msgid "use given config file"
+msgstr ""
+
+#: builtin/config.c:136
+msgid "blob-id"
+msgstr ""
+
+#: builtin/config.c:136
+msgid "read config from given blob object"
+msgstr ""
+
+#: builtin/config.c:137
+msgid "Action"
+msgstr ""
+
+#: builtin/config.c:138
+msgid "get value: name [value-pattern]"
+msgstr ""
+
+#: builtin/config.c:139
+msgid "get all values: key [value-pattern]"
+msgstr ""
+
+#: builtin/config.c:140
+msgid "get values for regexp: name-regex [value-pattern]"
+msgstr ""
+
+#: builtin/config.c:141
+msgid "get value specific for the URL: section[.var] URL"
+msgstr ""
+
+#: builtin/config.c:142
+msgid "replace all matching variables: name value [value-pattern]"
+msgstr ""
+
+#: builtin/config.c:143
+msgid "add a new variable: name value"
+msgstr ""
+
+#: builtin/config.c:144
+msgid "remove a variable: name [value-pattern]"
+msgstr ""
+
+#: builtin/config.c:145
+msgid "remove all matches: name [value-pattern]"
+msgstr ""
+
+#: builtin/config.c:146
+msgid "rename section: old-name new-name"
+msgstr ""
+
+#: builtin/config.c:147
+msgid "remove a section: name"
+msgstr ""
+
+#: builtin/config.c:148
+msgid "list all"
+msgstr ""
+
+#: builtin/config.c:149
+msgid "use string equality when comparing values to 'value-pattern'"
+msgstr ""
+
+#: builtin/config.c:150
+msgid "open an editor"
+msgstr ""
+
+#: builtin/config.c:151
+msgid "find the color configured: slot [default]"
+msgstr ""
+
+#: builtin/config.c:152
+msgid "find the color setting: slot [stdout-is-tty]"
+msgstr ""
+
+#: builtin/config.c:153
+msgid "Type"
+msgstr ""
+
+#: builtin/config.c:154 builtin/env--helper.c:43
+msgid "value is given this type"
+msgstr ""
+
+#: builtin/config.c:155
+msgid "value is \"true\" or \"false\""
+msgstr ""
+
+#: builtin/config.c:156
+msgid "value is decimal number"
+msgstr ""
+
+#: builtin/config.c:157
+msgid "value is --bool or --int"
+msgstr ""
+
+#: builtin/config.c:158
+msgid "value is --bool or string"
+msgstr ""
+
+#: builtin/config.c:159
+msgid "value is a path (file or directory name)"
+msgstr ""
+
+#: builtin/config.c:160
+msgid "value is an expiry date"
+msgstr ""
+
+#: builtin/config.c:161
+msgid "Other"
+msgstr ""
+
+#: builtin/config.c:162
+msgid "terminate values with NUL byte"
+msgstr ""
+
+#: builtin/config.c:163
+msgid "show variable names only"
+msgstr ""
+
+#: builtin/config.c:164
+msgid "respect include directives on lookup"
+msgstr ""
+
+#: builtin/config.c:165
+msgid "show origin of config (file, standard input, blob, command line)"
+msgstr ""
+
+#: builtin/config.c:166
+msgid "show scope of config (worktree, local, global, system, command)"
+msgstr ""
+
+#: builtin/config.c:167 builtin/env--helper.c:45
+msgid "value"
+msgstr ""
+
+#: builtin/config.c:167
+msgid "with --get, use default value when missing entry"
+msgstr ""
+
+#: builtin/config.c:181
+#, c-format
+msgid "wrong number of arguments, should be %d"
+msgstr ""
+
+#: builtin/config.c:183
+#, c-format
+msgid "wrong number of arguments, should be from %d to %d"
+msgstr ""
+
+#: builtin/config.c:339
+#, c-format
+msgid "invalid key pattern: %s"
+msgstr ""
+
+#: builtin/config.c:377
+#, c-format
+msgid "failed to format default config value: %s"
+msgstr ""
+
+#: builtin/config.c:441
+#, c-format
+msgid "cannot parse color '%s'"
+msgstr ""
+
+#: builtin/config.c:483
+msgid "unable to parse default color value"
+msgstr ""
+
+#: builtin/config.c:536 builtin/config.c:833
+msgid "not in a git directory"
+msgstr ""
+
+#: builtin/config.c:539
+msgid "writing to stdin is not supported"
+msgstr ""
+
+#: builtin/config.c:542
+msgid "writing config blobs is not supported"
+msgstr ""
+
+#: builtin/config.c:627
+#, 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 ""
+
+#: builtin/config.c:652
+msgid "only one config file at a time"
+msgstr ""
+
+#: builtin/config.c:658
+msgid "--local can only be used inside a git repository"
+msgstr ""
+
+#: builtin/config.c:660
+msgid "--blob can only be used inside a git repository"
+msgstr ""
+
+#: builtin/config.c:662
+msgid "--worktree can only be used inside a git repository"
+msgstr ""
+
+#: builtin/config.c:684
+msgid "$HOME not set"
+msgstr ""
+
+#: builtin/config.c:708
+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:743
+msgid "--get-color and variable type are incoherent"
+msgstr ""
+
+#: builtin/config.c:748
+msgid "only one action at a time"
+msgstr ""
+
+#: builtin/config.c:761
+msgid "--name-only is only applicable to --list or --get-regexp"
+msgstr ""
+
+#: builtin/config.c:767
+msgid ""
+"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
+"list"
+msgstr ""
+
+#: builtin/config.c:773
+msgid "--default is only applicable to --get"
+msgstr ""
+
+#: builtin/config.c:806
+msgid "--fixed-value only applies with 'value-pattern'"
+msgstr ""
+
+#: builtin/config.c:822
+#, c-format
+msgid "unable to read config file '%s'"
+msgstr ""
+
+#: builtin/config.c:825
+msgid "error processing config file(s)"
+msgstr ""
+
+#: builtin/config.c:835
+msgid "editing stdin is not supported"
+msgstr ""
+
+#: builtin/config.c:837
+msgid "editing blobs is not supported"
+msgstr ""
+
+#: builtin/config.c:851
+#, c-format
+msgid "cannot create configuration file %s"
+msgstr ""
+
+#: builtin/config.c:864
+#, 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:943 builtin/config.c:954
+#, c-format
+msgid "no such section: %s"
+msgstr ""
+
+#: builtin/count-objects.c:90
+msgid "git count-objects [-v] [-H | --human-readable]"
+msgstr ""
+
+#: 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 ""
+
+#: 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/credential-store.c:66
+#, c-format
+msgid "unable to get credential storage lock in %d ms"
+msgstr ""
+
+#: builtin/describe.c:26
+msgid "git describe [<options>] [<commit-ish>...]"
+msgstr ""
+
+#: builtin/describe.c:27
+msgid "git describe [<options>] --dirty"
+msgstr ""
+
+#: builtin/describe.c:63
+msgid "head"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/describe.c:281
+#, c-format
+msgid "tag '%s' is externally known as '%s'"
+msgstr ""
+
+#: builtin/describe.c:328
+#, c-format
+msgid "no tag exactly matches '%s'"
+msgstr ""
+
+#: builtin/describe.c:330
+#, c-format
+msgid "No exact match on refs or tags, searching to describe\n"
+msgstr ""
+
+#: builtin/describe.c:397
+#, c-format
+msgid "finished search at %s\n"
+msgstr ""
+
+#: 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:428
+#, c-format
+msgid ""
+"No tags can describe '%s'.\n"
+"Try --always, or create some tags."
+msgstr ""
+
+#: builtin/describe.c:458
+#, c-format
+msgid "traversed %lu commits\n"
+msgstr ""
+
+#: 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:529
+#, c-format
+msgid "describe %s\n"
+msgstr ""
+
+#: builtin/describe.c:532
+#, c-format
+msgid "Not a valid object name %s"
+msgstr ""
+
+#: builtin/describe.c:540
+#, c-format
+msgid "%s is neither a commit nor blob"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: builtin/describe.c:575
+msgid "append <mark> on broken working tree (default: \"-broken\")"
+msgstr ""
+
+#: builtin/describe.c:593
+msgid "--long is incompatible with --abbrev=0"
+msgstr ""
+
+#: builtin/describe.c:622
+msgid "No names found, cannot describe anything."
+msgstr ""
+
+#: builtin/describe.c:673
+msgid "--dirty is incompatible with commit-ishes"
+msgstr ""
+
+#: builtin/describe.c:675
+msgid "--broken is incompatible with commit-ishes"
+msgstr ""
+
+#: builtin/diff-tree.c:155
+msgid "--stdin and --merge-base are mutually exclusive"
+msgstr ""
+
+#: builtin/diff-tree.c:157
+msgid "--merge-base only works with two commits"
+msgstr ""
+
+#: builtin/diff.c:92
+#, c-format
+msgid "'%s': not a regular file or symlink"
+msgstr ""
+
+#: builtin/diff.c:259
+#, c-format
+msgid "invalid option: %s"
+msgstr ""
+
+#: builtin/diff.c:376
+#, c-format
+msgid "%s...%s: no merge base"
+msgstr ""
+
+#: builtin/diff.c:486
+msgid "Not a git repository"
+msgstr ""
+
+#: builtin/diff.c:532 builtin/grep.c:682
+#, c-format
+msgid "invalid object '%s' given."
+msgstr ""
+
+#: builtin/diff.c:543
+#, c-format
+msgid "more than two blobs given: '%s'"
+msgstr ""
+
+#: builtin/diff.c:548
+#, c-format
+msgid "unhandled object '%s' given."
+msgstr ""
+
+#: builtin/diff.c:582
+#, 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:260
+#, c-format
+msgid "failed: %d"
+msgstr ""
+
+#: builtin/difftool.c:302
+#, c-format
+msgid "could not read symlink %s"
+msgstr ""
+
+#: builtin/difftool.c:304
+#, c-format
+msgid "could not read symlink file %s"
+msgstr ""
+
+#: builtin/difftool.c:312
+#, c-format
+msgid "could not read object %s for symlink %s"
+msgstr ""
+
+#: builtin/difftool.c:412
+msgid ""
+"combined diff formats('-c' and '--cc') are not supported in\n"
+"directory diff mode('-d' and '--dir-diff')."
+msgstr ""
+
+#: builtin/difftool.c:633
+#, c-format
+msgid "both files modified: '%s' and '%s'."
+msgstr ""
+
+#: builtin/difftool.c:635
+msgid "working tree file has been left."
+msgstr ""
+
+#: builtin/difftool.c:646
+#, c-format
+msgid "temporary files exist in '%s'."
+msgstr ""
+
+#: builtin/difftool.c:647
+msgid "you may want to cleanup or recover these."
+msgstr ""
+
+#: builtin/difftool.c:696
+msgid "use `diff.guitool` instead of `diff.tool`"
+msgstr ""
+
+#: builtin/difftool.c:698
+msgid "perform a full-directory diff"
+msgstr ""
+
+#: builtin/difftool.c:700
+msgid "do not prompt before launching a diff tool"
+msgstr ""
+
+#: builtin/difftool.c:705
+msgid "use symlinks in dir-diff mode"
+msgstr ""
+
+#: builtin/difftool.c:706
+msgid "tool"
+msgstr ""
+
+#: builtin/difftool.c:707
+msgid "use the specified diff tool"
+msgstr ""
+
+#: builtin/difftool.c:709
+msgid "print a list of diff tools that may be used with `--tool`"
+msgstr ""
+
+#: builtin/difftool.c:712
+msgid ""
+"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"code"
+msgstr ""
+
+#: builtin/difftool.c:715
+msgid "specify a custom command for viewing diffs"
+msgstr ""
+
+#: builtin/difftool.c:716
+msgid "passed to `diff`"
+msgstr ""
+
+#: builtin/difftool.c:731
+msgid "difftool requires worktree or --no-index"
+msgstr ""
+
+#: builtin/difftool.c:738
+msgid "--dir-diff is incompatible with --no-index"
+msgstr ""
+
+#: builtin/difftool.c:741
+msgid "--gui, --tool and --extcmd are mutually exclusive"
+msgstr ""
+
+#: builtin/difftool.c:749
+msgid "no <tool> given for --tool=<tool>"
+msgstr ""
+
+#: builtin/difftool.c:756
+msgid "no <cmd> given for --extcmd=<cmd>"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: builtin/fast-export.c:868
+msgid "Error: Cannot export nested tags unless --mark-tags is specified."
+msgstr ""
+
+#: builtin/fast-export.c:1177
+msgid "--anonymize-map token cannot be empty"
+msgstr ""
+
+#: builtin/fast-export.c:1197
+msgid "show progress after <n> objects"
+msgstr ""
+
+#: builtin/fast-export.c:1199
+msgid "select handling of signed tags"
+msgstr ""
+
+#: builtin/fast-export.c:1202
+msgid "select handling of tags that tag filtered objects"
+msgstr ""
+
+#: builtin/fast-export.c:1205
+msgid "select handling of commit messages in an alternate encoding"
+msgstr ""
+
+#: builtin/fast-export.c:1208
+msgid "dump marks to this file"
+msgstr ""
+
+#: builtin/fast-export.c:1210
+msgid "import marks from this file"
+msgstr ""
+
+#: builtin/fast-export.c:1214
+msgid "import marks from this file if it exists"
+msgstr ""
+
+#: builtin/fast-export.c:1216
+msgid "fake a tagger when tags lack one"
+msgstr ""
+
+#: builtin/fast-export.c:1218
+msgid "output full tree for each commit"
+msgstr ""
+
+#: builtin/fast-export.c:1220
+msgid "use the done feature to terminate the stream"
+msgstr ""
+
+#: builtin/fast-export.c:1221
+msgid "skip output of blob data"
+msgstr ""
+
+#: builtin/fast-export.c:1222 builtin/log.c:1815
+msgid "refspec"
+msgstr ""
+
+#: builtin/fast-export.c:1223
+msgid "apply refspec to exported refs"
+msgstr ""
+
+#: builtin/fast-export.c:1224
+msgid "anonymize output"
+msgstr ""
+
+#: builtin/fast-export.c:1225
+msgid "from:to"
+msgstr ""
+
+#: builtin/fast-export.c:1226
+msgid "convert <from> to <to> in anonymized output"
+msgstr ""
+
+#: builtin/fast-export.c:1229
+msgid "reference parents which are not in fast-export stream by object id"
+msgstr ""
+
+#: builtin/fast-export.c:1231
+msgid "show original object ids of blobs/commits"
+msgstr ""
+
+#: builtin/fast-export.c:1233
+msgid "label tags with mark ids"
+msgstr ""
+
+#: builtin/fast-export.c:1256
+msgid "--anonymize-map without --anonymize does not make sense"
+msgstr ""
+
+#: builtin/fast-export.c:1271
+msgid "Cannot pass both --import-marks and --import-marks-if-exists"
+msgstr ""
+
+#: builtin/fast-import.c:3088
+#, c-format
+msgid "Missing from marks for submodule '%s'"
+msgstr ""
+
+#: builtin/fast-import.c:3090
+#, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr ""
+
+#: builtin/fast-import.c:3225
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr ""
+
+#: builtin/fast-import.c:3230
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr ""
+
+#: builtin/fast-import.c:3322
+msgid "Expected format name:filename for submodule rewrite option"
+msgstr ""
+
+#: builtin/fast-import.c:3377
+#, c-format
+msgid "feature '%s' forbidden in input without --allow-unsafe-features"
+msgstr ""
+
+#: builtin/fetch-pack.c:242
+#, c-format
+msgid "Lockfile created but not reported: %s"
+msgstr ""
+
+#: builtin/fetch.c:35
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+msgstr "git fetch [<opsi>] [<repositori> [<spek referensi>...]]"
+
+#: builtin/fetch.c:36
+msgid "git fetch [<options>] <group>"
+msgstr "git fetch [<opsi>] <grup>"
+
+#: builtin/fetch.c:37
+msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+msgstr "git fetch --multiple [<opsi>] [(<repositori> | <grup>)]"
+
+#: builtin/fetch.c:38
+msgid "git fetch --all [<options>]"
+msgstr "git fetch --all [<opsi>]"
+
+#: builtin/fetch.c:120
+msgid "fetch.parallel cannot be negative"
+msgstr "fetch.parallel tidak dapat bernilai negatif"
+
+#: builtin/fetch.c:143 builtin/pull.c:185
+msgid "fetch from all remotes"
+msgstr "ambil dari semua remote"
+
+#: builtin/fetch.c:145 builtin/pull.c:245
+msgid "set upstream for git pull/fetch"
+msgstr "setel hulu untuk git pull/fetch"
+
+#: builtin/fetch.c:147 builtin/pull.c:188
+msgid "append to .git/FETCH_HEAD instead of overwriting"
+msgstr "tambah ke .git/FETCH_HEAD daripada timpa"
+
+#: builtin/fetch.c:149
+msgid "use atomic transaction to update references"
+msgstr ""
+
+#: builtin/fetch.c:151 builtin/pull.c:191
+msgid "path to upload pack on remote end"
+msgstr "jalur ke paket unggah pada sisi remote"
+
+#: builtin/fetch.c:152
+msgid "force overwrite of local reference"
+msgstr "paksa timpa referensi lokal"
+
+#: builtin/fetch.c:154
+msgid "fetch from multiple remotes"
+msgstr "ambil dari banyak remote"
+
+#: builtin/fetch.c:156 builtin/pull.c:195
+msgid "fetch all tags and associated objects"
+msgstr "ambil semua tag dan objek yang bersesuaian"
+
+#: builtin/fetch.c:158
+msgid "do not fetch all tags (--no-tags)"
+msgstr "jangan ambil semua tag (--no-tags)"
+
+#: builtin/fetch.c:160
+msgid "number of submodules fetched in parallel"
+msgstr "jumlah submodul yang diambil secara bersamaan"
+
+#: builtin/fetch.c:162 builtin/pull.c:198
+msgid "prune remote-tracking branches no longer on remote"
+msgstr "buang cabang pelacak remote yang tidak ada pada remote"
+
+#: builtin/fetch.c:164
+msgid "prune local tags no longer on remote and clobber changed tags"
+msgstr "buang tag lokal yang tidak ada pada remote dan klob tag yang berubah"
+
+#: builtin/fetch.c:165 builtin/fetch.c:190 builtin/pull.c:122
+msgid "on-demand"
+msgstr "sesuai permintaan"
+
+#: builtin/fetch.c:166
+msgid "control recursive fetching of submodules"
+msgstr "kontrol pengambilan submodul rekursif"
+
+#: builtin/fetch.c:171
+msgid "write fetched references to the FETCH_HEAD file"
+msgstr "tulis referensi yang diambil ke berkas FETCH_HEAD"
+
+#: builtin/fetch.c:172 builtin/pull.c:206
+msgid "keep downloaded pack"
+msgstr "simpan paket yang diunduh"
+
+#: builtin/fetch.c:174
+msgid "allow updating of HEAD ref"
+msgstr "bolehkan perbarui referensi HEAD"
+
+#: builtin/fetch.c:177 builtin/fetch.c:183 builtin/pull.c:209
+#: builtin/pull.c:218
+msgid "deepen history of shallow clone"
+msgstr "perdalam riwayat klon dangkal"
+
+#: builtin/fetch.c:179 builtin/pull.c:212
+msgid "deepen history of shallow repository based on time"
+msgstr "perdalam riwayat repositori dangkal berdasarkan waktu"
+
+#: builtin/fetch.c:185 builtin/pull.c:221
+msgid "convert to a complete repository"
+msgstr "ubah ke repositori penuh"
+
+#: builtin/fetch.c:188
+msgid "prepend this to submodule path output"
+msgstr "tambahkan ini ke jalur keluaran submodul"
+
+#: builtin/fetch.c:191
+msgid ""
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
+msgstr ""
+"default untuk ambil submodul secara rekursif (prioritas lebih rendah "
+"dariberkas konfigurasi)"
+
+#: builtin/fetch.c:195 builtin/pull.c:224
+msgid "accept refs that update .git/shallow"
+msgstr "terima referensi yang memperbarui .git/shallow"
+
+#: builtin/fetch.c:196 builtin/pull.c:226
+msgid "refmap"
+msgstr "peta referensi"
+
+#: builtin/fetch.c:197 builtin/pull.c:227
+msgid "specify fetch refmap"
+msgstr "sebutkan ambil peta referensi"
+
+#: builtin/fetch.c:204 builtin/pull.c:240
+msgid "report that we have only objects reachable from this object"
+msgstr ""
+"laporkan bahwa kami hanya punya object yang bisa dicapai dari objek ini"
+
+#: builtin/fetch.c:207 builtin/fetch.c:209
+msgid "run 'maintenance --auto' after fetching"
+msgstr "lakukan 'maintenance --auto' setelah pengambilan"
+
+#: builtin/fetch.c:211 builtin/pull.c:243
+msgid "check for forced-updates on all updated branches"
+msgstr "periksa pembaruan terpaksa pada semua cabang"
+
+#: builtin/fetch.c:213
+msgid "write the commit-graph after fetching"
+msgstr "tulis grafik komit setelah pengambilan"
+
+#: builtin/fetch.c:215
+msgid "accept refspecs from stdin"
+msgstr "terima spek referensi dari masukan standar"
+
+#: builtin/fetch.c:526
+msgid "Couldn't find remote ref HEAD"
+msgstr "tidak dapat menemukan referensi remote HEAD"
+
+#: builtin/fetch.c:697
+#, c-format
+msgid "configuration fetch.output contains invalid value %s"
+msgstr "konfigurasi fetch.output berisi nilai tidak valid %s"
+
+#: builtin/fetch.c:796
+#, c-format
+msgid "object %s not found"
+msgstr "objek %s tidak ditemukan"
+
+#: builtin/fetch.c:800
+msgid "[up to date]"
+msgstr "[terkini]"
+
+#: builtin/fetch.c:813 builtin/fetch.c:829 builtin/fetch.c:901
+msgid "[rejected]"
+msgstr "[tertolak]"
+
+#: builtin/fetch.c:814
+msgid "can't fetch in current branch"
+msgstr "tidak dapat mengambil di cabang saat ini"
+
+#: builtin/fetch.c:824
+msgid "[tag update]"
+msgstr "[pembaruan tag]"
+
+#: builtin/fetch.c:825 builtin/fetch.c:862 builtin/fetch.c:884
+#: builtin/fetch.c:896
+msgid "unable to update local ref"
+msgstr "tidak dapat memperbarui referensi lokal"
+
+#: builtin/fetch.c:829
+msgid "would clobber existing tag"
+msgstr "akan klob tag yang ada"
+
+#: builtin/fetch.c:851
+msgid "[new tag]"
+msgstr "[tag baru]"
+
+#: builtin/fetch.c:854
+msgid "[new branch]"
+msgstr "[cabang baru]"
+
+#: builtin/fetch.c:857
+msgid "[new ref]"
+msgstr "[referensi baru]"
+
+#: builtin/fetch.c:896
+msgid "forced update"
+msgstr "pembaruan terpaksa"
+
+#: builtin/fetch.c:901
+msgid "non-fast-forward"
+msgstr "bukan-maju-cepat"
+
+#: builtin/fetch.c:1005
+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 ""
+"Ambil secara normal mengindikasikan cabang mana ada pembaruan terpaksa,\n"
+"tapi pemeriksaan tersebut dinonaktifkan. Untuk aktifkan kembali, gunakan\n"
+"'--show-forced-updates' atau jalankan 'git config fetch.showForcedUpdates "
+"true'."
+
+#: builtin/fetch.c:1009
+#, 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 ""
+"Butuh waktu %2.f detik untuk periksa pembaruan terpaksa. Anda dapat\n"
+"menggunakan '--no-show-forced-updates' atau jalankan\n"
+"'git config fetch.showForcedUpdates false'\n"
+" untuk menghindari pemeriksaan ini.\n"
+
+#: builtin/fetch.c:1041
+#, c-format
+msgid "%s did not send all necessary objects\n"
+msgstr "%s tidak mengirim semua objek yang diperlukan\n"
+
+#: builtin/fetch.c:1069
+#, c-format
+msgid "reject %s because shallow roots are not allowed to be updated"
+msgstr "tolak %s karena akar dangkal tidak diperkenankan untuk diperbarui"
+
+#: builtin/fetch.c:1146 builtin/fetch.c:1297
+#, c-format
+msgid "From %.*s\n"
+msgstr "Dari %.*s\n"
+
+#: builtin/fetch.c:1168
+#, c-format
+msgid ""
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
+msgstr ""
+"beberapa referensi lokal tidak dapat diperbarui; coba jalankan\n"
+" 'git remote prune %s' untuk hapus cabang yang lama dan berkonflik"
+
+#: builtin/fetch.c:1267
+#, c-format
+msgid " (%s will become dangling)"
+msgstr " (%s akan menjadi terjuntai)"
+
+#: builtin/fetch.c:1268
+#, c-format
+msgid " (%s has become dangling)"
+msgstr " (%s telah menjadi terjuntai)"
+
+#: builtin/fetch.c:1300
+msgid "[deleted]"
+msgstr "[dihapus]"
+
+#: builtin/fetch.c:1301 builtin/remote.c:1118
+msgid "(none)"
+msgstr "(tidak ada)"
+
+#: builtin/fetch.c:1324
+#, c-format
+msgid "Refusing to fetch into current branch %s of non-bare repository"
+msgstr "Tolak mengambil ke cabang saat ini %s dari repositori non-bare"
+
+#: builtin/fetch.c:1343
+#, c-format
+msgid "Option \"%s\" value \"%s\" is not valid for %s"
+msgstr "Opsi \"%s\" nilai \"%s\" tidak valid untuk %s"
+
+#: builtin/fetch.c:1346
+#, c-format
+msgid "Option \"%s\" is ignored for %s\n"
+msgstr "Opsi \"%s\" diabaikan untuk %s\n"
+
+#: builtin/fetch.c:1558
+msgid "multiple branches detected, incompatible with --set-upstream"
+msgstr "banyak cabang terdeteksi, tidak kompatibel dengan --set-upstream"
+
+#: builtin/fetch.c:1573
+msgid "not setting upstream for a remote remote-tracking branch"
+msgstr "tidak setel hulu untuk cabang remote pelacak remote"
+
+#: builtin/fetch.c:1575
+msgid "not setting upstream for a remote tag"
+msgstr "tidak setel hulu untuk tag remote"
+
+#: builtin/fetch.c:1577
+msgid "unknown branch type"
+msgstr "tipe cabang tidak diketahui"
+
+#: builtin/fetch.c:1579
+msgid ""
+"no source branch found.\n"
+"you need to specify exactly one branch with the --set-upstream option."
+msgstr ""
+"cabang sumber tidak ditemukan.\n"
+"Anda harus sebutkan tepat satu cabang dengan opsi --set-upstream."
+
+#: builtin/fetch.c:1708 builtin/fetch.c:1771
+#, c-format
+msgid "Fetching %s\n"
+msgstr "Mengambil %s\n"
+
+#: builtin/fetch.c:1718 builtin/fetch.c:1773 builtin/remote.c:101
+#, c-format
+msgid "Could not fetch %s"
+msgstr "Tidak dapat mengambil %s"
+
+#: builtin/fetch.c:1730
+#, c-format
+msgid "could not fetch '%s' (exit code: %d)\n"
+msgstr "tidak dapat mengambil '%s' (kode keluar: %d)\n"
+
+#: builtin/fetch.c:1834
+msgid ""
+"No remote repository specified. Please, specify either a URL or a\n"
+"remote name from which new revisions should be fetched."
+msgstr ""
+"Repositori remot tidak disebutkan. Mohon sebutkan baik URL atau nama\n"
+"cabang yang mana revisi baru sebaiknya diambil."
+
+#: builtin/fetch.c:1870
+msgid "You need to specify a tag name."
+msgstr "Anda perlu sebutkan nama tag"
+
+#: builtin/fetch.c:1935
+msgid "Negative depth in --deepen is not supported"
+msgstr "Kedalaman negatif di --deepen tidak didukung"
+
+#: builtin/fetch.c:1937
+msgid "--deepen and --depth are mutually exclusive"
+msgstr "--deepen dan --depth saling eksklusif"
+
+#: builtin/fetch.c:1942
+msgid "--depth and --unshallow cannot be used together"
+msgstr "--depth dan --unshallow tidak dapat digunakan bersamaan"
+
+#: builtin/fetch.c:1944
+msgid "--unshallow on a complete repository does not make sense"
+msgstr "--unshallow pada repositori penuh tidak masuk akal"
+
+#: builtin/fetch.c:1961
+msgid "fetch --all does not take a repository argument"
+msgstr "fetch --all tidak mengambil argumen repositori"
+
+#: builtin/fetch.c:1963
+msgid "fetch --all does not make sense with refspecs"
+msgstr "fetch --all tidak masuk akal dengan spek referensi"
+
+#: builtin/fetch.c:1972
+#, c-format
+msgid "No such remote or remote group: %s"
+msgstr "tidak ada remote atau grup remote seperti itu: %s"
+
+#: builtin/fetch.c:1979
+msgid "Fetching a group and specifying refspecs does not make sense"
+msgstr "Ambil grup dan sebutkan spek referensi tidak masuk akal"
+
+#: builtin/fetch.c:1997
+msgid ""
+"--filter can only be used with the remote configured in extensions."
+"partialclone"
+msgstr ""
+"--filter hanya dapat digunakan dengan remote yang terkonfigurasi di "
+"extensions.partialclone"
+
+#: builtin/fetch.c:2001
+msgid "--atomic can only be used when fetching from one remote"
+msgstr "--atomic hanya dapat digunakan saat mengambil dari satu remote"
+
+#: builtin/fetch.c:2005
+msgid "--stdin can only be used when fetching from one remote"
+msgstr "--stdin hanya dapat digunakan saat mengambil dari satu remote"
+
+#: 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:18
+msgid "populate log with at most <n> entries from shortlog"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:21
+msgid "alias for --log (deprecated)"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [--points-at <object>]"
+msgstr ""
+
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
+msgstr ""
+
+#: builtin/for-each-ref.c:13
+msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
+msgstr ""
+
+#: builtin/for-each-ref.c:28
+msgid "quote placeholders suitably for shells"
+msgstr ""
+
+#: builtin/for-each-ref.c:30
+msgid "quote placeholders suitably for perl"
+msgstr ""
+
+#: builtin/for-each-ref.c:32
+msgid "quote placeholders suitably for python"
+msgstr ""
+
+#: builtin/for-each-ref.c:34
+msgid "quote placeholders suitably for Tcl"
+msgstr ""
+
+#: builtin/for-each-ref.c:37
+msgid "show only <n> matched refs"
+msgstr ""
+
+#: builtin/for-each-ref.c:39 builtin/tag.c:472
+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/for-each-repo.c:9
+msgid "git for-each-repo --config=<config> <command-args>"
+msgstr ""
+
+#: builtin/for-each-repo.c:37
+msgid "config"
+msgstr ""
+
+#: builtin/for-each-repo.c:38
+msgid "config key storing a list of repository paths"
+msgstr ""
+
+#: builtin/for-each-repo.c:46
+msgid "missing --config=<config>"
+msgstr ""
+
+#: builtin/fsck.c:69 builtin/fsck.c:130 builtin/fsck.c:131
+msgid "unknown"
+msgstr ""
+
+#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
+#: builtin/fsck.c:83 builtin/fsck.c:103
+#, c-format
+msgid "error in %s %s: %s"
+msgstr ""
+
+#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
+#: builtin/fsck.c:97
+#, c-format
+msgid "warning in %s %s: %s"
+msgstr ""
+
+#: builtin/fsck.c:126 builtin/fsck.c:129
+#, c-format
+msgid "broken link from %7s %s"
+msgstr ""
+
+#: builtin/fsck.c:138
+msgid "wrong object type in link"
+msgstr ""
+
+#: builtin/fsck.c:154
+#, c-format
+msgid ""
+"broken link from %7s %s\n"
+" to %7s %s"
+msgstr ""
+
+#: builtin/fsck.c:265
+#, c-format
+msgid "missing %s %s"
+msgstr ""
+
+#: builtin/fsck.c:292
+#, c-format
+msgid "unreachable %s %s"
+msgstr ""
+
+#: builtin/fsck.c:312
+#, c-format
+msgid "dangling %s %s"
+msgstr ""
+
+#: builtin/fsck.c:322
+msgid "could not create lost-found"
+msgstr ""
+
+#: builtin/fsck.c:333
+#, c-format
+msgid "could not finish '%s'"
+msgstr ""
+
+#: builtin/fsck.c:350
+#, c-format
+msgid "Checking %s"
+msgstr ""
+
+#: builtin/fsck.c:388
+#, c-format
+msgid "Checking connectivity (%d objects)"
+msgstr ""
+
+#: builtin/fsck.c:407
+#, c-format
+msgid "Checking %s %s"
+msgstr ""
+
+#: builtin/fsck.c:412
+msgid "broken links"
+msgstr ""
+
+#: builtin/fsck.c:421
+#, c-format
+msgid "root %s"
+msgstr ""
+
+#: builtin/fsck.c:429
+#, c-format
+msgid "tagged %s %s (%s) in %s"
+msgstr ""
+
+#: builtin/fsck.c:458
+#, c-format
+msgid "%s: object corrupt or missing"
+msgstr ""
+
+#: builtin/fsck.c:483
+#, c-format
+msgid "%s: invalid reflog entry %s"
+msgstr ""
+
+#: builtin/fsck.c:497
+#, c-format
+msgid "Checking reflog %s->%s"
+msgstr ""
+
+#: builtin/fsck.c:531
+#, c-format
+msgid "%s: invalid sha1 pointer %s"
+msgstr ""
+
+#: builtin/fsck.c:538
+#, c-format
+msgid "%s: not a commit"
+msgstr ""
+
+#: builtin/fsck.c:592
+msgid "notice: No default references"
+msgstr ""
+
+#: builtin/fsck.c:607
+#, c-format
+msgid "%s: object corrupt or missing: %s"
+msgstr ""
+
+#: builtin/fsck.c:620
+#, c-format
+msgid "%s: object could not be parsed: %s"
+msgstr ""
+
+#: builtin/fsck.c:640
+#, c-format
+msgid "bad sha1 file: %s"
+msgstr ""
+
+#: builtin/fsck.c:655
+msgid "Checking object directory"
+msgstr ""
+
+#: builtin/fsck.c:658
+msgid "Checking object directories"
+msgstr ""
+
+#: builtin/fsck.c:673
+#, c-format
+msgid "Checking %s link"
+msgstr ""
+
+#: builtin/fsck.c:678 builtin/index-pack.c:865
+#, c-format
+msgid "invalid %s"
+msgstr "%s tidak valid"
+
+#: builtin/fsck.c:685
+#, c-format
+msgid "%s points to something strange (%s)"
+msgstr ""
+
+#: builtin/fsck.c:691
+#, c-format
+msgid "%s: detached HEAD points at nothing"
+msgstr ""
+
+#: builtin/fsck.c:695
+#, c-format
+msgid "notice: %s points to an unborn branch (%s)"
+msgstr ""
+
+#: builtin/fsck.c:707
+msgid "Checking cache tree"
+msgstr ""
+
+#: builtin/fsck.c:712
+#, c-format
+msgid "%s: invalid sha1 pointer in cache-tree"
+msgstr ""
+
+#: builtin/fsck.c:721
+msgid "non-tree in cache-tree"
+msgstr ""
+
+#: builtin/fsck.c:752
+msgid "git fsck [<options>] [<object>...]"
+msgstr ""
+
+#: builtin/fsck.c:758
+msgid "show unreachable objects"
+msgstr ""
+
+#: builtin/fsck.c:759
+msgid "show dangling objects"
+msgstr ""
+
+#: builtin/fsck.c:760
+msgid "report tags"
+msgstr ""
+
+#: builtin/fsck.c:761
+msgid "report root nodes"
+msgstr ""
+
+#: builtin/fsck.c:762
+msgid "make index objects head nodes"
+msgstr ""
+
+#: builtin/fsck.c:763
+msgid "make reflogs head nodes (default)"
+msgstr ""
+
+#: builtin/fsck.c:764
+msgid "also consider packs and alternate objects"
+msgstr ""
+
+#: builtin/fsck.c:765
+msgid "check only connectivity"
+msgstr ""
+
+#: builtin/fsck.c:766 builtin/mktag.c:78
+msgid "enable more strict checking"
+msgstr ""
+
+#: builtin/fsck.c:768
+msgid "write dangling objects in .git/lost-found"
+msgstr ""
+
+#: builtin/fsck.c:769 builtin/prune.c:134
+msgid "show progress"
+msgstr ""
+
+#: builtin/fsck.c:770
+msgid "show verbose names for reachable objects"
+msgstr ""
+
+#: builtin/fsck.c:829 builtin/index-pack.c:261
+msgid "Checking objects"
+msgstr "Memeriksa objek"
+
+#: builtin/fsck.c:857
+#, c-format
+msgid "%s: object missing"
+msgstr ""
+
+#: builtin/fsck.c:868
+#, c-format
+msgid "invalid parameter: expected sha1, got '%s'"
+msgstr ""
+
+#: builtin/gc.c:39
+msgid "git gc [<options>]"
+msgstr ""
+
+#: builtin/gc.c:93
+#, c-format
+msgid "Failed to fstat %s: %s"
+msgstr ""
+
+#: builtin/gc.c:129
+#, c-format
+msgid "failed to parse '%s' value '%s'"
+msgstr ""
+
+#: builtin/gc.c:487 builtin/init-db.c:58
+#, c-format
+msgid "cannot stat '%s'"
+msgstr ""
+
+#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:562
+#, c-format
+msgid "cannot read '%s'"
+msgstr ""
+
+#: builtin/gc.c:503
+#, 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 ""
+
+#: builtin/gc.c:551
+msgid "prune unreferenced objects"
+msgstr ""
+
+#: builtin/gc.c:553
+msgid "be more thorough (increased runtime)"
+msgstr ""
+
+#: builtin/gc.c:554
+msgid "enable auto-gc mode"
+msgstr ""
+
+#: builtin/gc.c:557
+msgid "force running gc even if there may be another gc running"
+msgstr ""
+
+#: builtin/gc.c:560
+msgid "repack all other packs except the largest pack"
+msgstr ""
+
+#: builtin/gc.c:576
+#, c-format
+msgid "failed to parse gc.logexpiry value %s"
+msgstr ""
+
+#: builtin/gc.c:587
+#, c-format
+msgid "failed to parse prune expiry value %s"
+msgstr ""
+
+#: builtin/gc.c:607
+#, c-format
+msgid "Auto packing the repository in background for optimum performance.\n"
+msgstr ""
+
+#: builtin/gc.c:609
+#, c-format
+msgid "Auto packing the repository for optimum performance.\n"
+msgstr ""
+
+#: builtin/gc.c:610
+#, c-format
+msgid "See \"git help gc\" for manual housekeeping.\n"
+msgstr ""
+
+#: builtin/gc.c:650
+#, c-format
+msgid ""
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+msgstr ""
+
+#: builtin/gc.c:705
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove them."
+msgstr ""
+
+#: builtin/gc.c:715
+msgid ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
+msgstr ""
+
+#: builtin/gc.c:745
+msgid "--no-schedule is not allowed"
+msgstr ""
+
+#: builtin/gc.c:750
+#, c-format
+msgid "unrecognized --schedule argument '%s'"
+msgstr ""
+
+#: builtin/gc.c:869
+msgid "failed to write commit-graph"
+msgstr ""
+
+#: builtin/gc.c:914
+msgid "failed to fill remotes"
+msgstr ""
+
+#: builtin/gc.c:1037
+msgid "failed to start 'git pack-objects' process"
+msgstr ""
+
+#: builtin/gc.c:1054
+msgid "failed to finish 'git pack-objects' process"
+msgstr ""
+
+#: builtin/gc.c:1106
+msgid "failed to write multi-pack-index"
+msgstr ""
+
+#: builtin/gc.c:1124
+msgid "'git multi-pack-index expire' failed"
+msgstr ""
+
+#: builtin/gc.c:1185
+msgid "'git multi-pack-index repack' failed"
+msgstr ""
+
+#: builtin/gc.c:1194
+msgid ""
+"skipping incremental-repack task because core.multiPackIndex is disabled"
+msgstr ""
+
+#: builtin/gc.c:1298
+#, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr ""
+
+#: builtin/gc.c:1328
+#, c-format
+msgid "task '%s' failed"
+msgstr ""
+
+#: builtin/gc.c:1410
+#, c-format
+msgid "'%s' is not a valid task"
+msgstr ""
+
+#: builtin/gc.c:1415
+#, c-format
+msgid "task '%s' cannot be selected multiple times"
+msgstr ""
+
+#: builtin/gc.c:1430
+msgid "run tasks based on the state of the repository"
+msgstr ""
+
+#: builtin/gc.c:1431
+msgid "frequency"
+msgstr ""
+
+#: builtin/gc.c:1432
+msgid "run tasks based on frequency"
+msgstr ""
+
+#: builtin/gc.c:1435
+msgid "do not report progress or other information over stderr"
+msgstr ""
+
+#: builtin/gc.c:1436
+msgid "task"
+msgstr ""
+
+#: builtin/gc.c:1437
+msgid "run a specific task"
+msgstr ""
+
+#: builtin/gc.c:1454
+msgid "use at most one of --auto and --schedule=<frequency>"
+msgstr ""
+
+#: builtin/gc.c:1497
+msgid "failed to run 'git config'"
+msgstr ""
+
+#: builtin/gc.c:1562
+msgid "failed to expand path '%s'"
+msgstr ""
+
+#: builtin/gc.c:1591
+msgid "failed to start launchctl"
+msgstr ""
+
+#: builtin/gc.c:1628
+msgid "failed to create directories for '%s'"
+msgstr ""
+
+#: builtin/gc.c:1689
+msgid "failed to bootstrap service %s"
+msgstr ""
+
+#: builtin/gc.c:1760
+msgid "failed to create temp xml file"
+msgstr ""
+
+#: builtin/gc.c:1850
+msgid "failed to start schtasks"
+msgstr ""
+
+#: builtin/gc.c:1894
+msgid "failed to run 'crontab -l'; your system might not support 'cron'"
+msgstr ""
+
+#: builtin/gc.c:1911
+msgid "failed to run 'crontab'; your system might not support 'cron'"
+msgstr ""
+
+#: builtin/gc.c:1915
+msgid "failed to open stdin of 'crontab'"
+msgstr ""
+
+#: builtin/gc.c:1956
+msgid "'crontab' died"
+msgstr ""
+
+#: builtin/gc.c:1990
+msgid "another process is scheduling background maintenance"
+msgstr ""
+
+#: builtin/gc.c:2009
+msgid "failed to add repo to global config"
+msgstr ""
+
+#: builtin/gc.c:2019
+msgid "git maintenance <subcommand> [<options>]"
+msgstr ""
+
+#: builtin/gc.c:2038
+#, c-format
+msgid "invalid subcommand: %s"
+msgstr ""
+
+#: builtin/grep.c:30
+msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
+msgstr ""
+
+#: builtin/grep.c:223
+#, c-format
+msgid "grep: failed to create thread: %s"
+msgstr ""
+
+#: builtin/grep.c:277
+#, c-format
+msgid "invalid number of threads specified (%d) for %s"
+msgstr ""
+
+#. TRANSLATORS: %s is the configuration
+#. variable for tweaking threads, currently
+#. grep.threads
+#.
+#: builtin/grep.c:285 builtin/index-pack.c:1589 builtin/index-pack.c:1808
+#: builtin/pack-objects.c:2944
+#, c-format
+msgid "no threads support, ignoring %s"
+msgstr "tidak ada dukungan utas, abaikan %s"
+
+#: builtin/grep.c:473 builtin/grep.c:601 builtin/grep.c:641
+#, c-format
+msgid "unable to read tree (%s)"
+msgstr ""
+
+#: builtin/grep.c:656
+#, c-format
+msgid "unable to grep from object of type %s"
+msgstr ""
+
+#: builtin/grep.c:737
+#, c-format
+msgid "switch `%c' expects a numerical value"
+msgstr ""
+
+#: builtin/grep.c:836
+msgid "search in index instead of in the work tree"
+msgstr ""
+
+#: builtin/grep.c:838
+msgid "find in contents not managed by git"
+msgstr ""
+
+#: builtin/grep.c:840
+msgid "search in both tracked and untracked files"
+msgstr ""
+
+#: builtin/grep.c:842
+msgid "ignore files specified via '.gitignore'"
+msgstr ""
+
+#: builtin/grep.c:844
+msgid "recursively search in each submodule"
+msgstr ""
+
+#: builtin/grep.c:847
+msgid "show non-matching lines"
+msgstr ""
+
+#: builtin/grep.c:849
+msgid "case insensitive matching"
+msgstr ""
+
+#: builtin/grep.c:851
+msgid "match patterns only at word boundaries"
+msgstr ""
+
+#: builtin/grep.c:853
+msgid "process binary files as text"
+msgstr ""
+
+#: builtin/grep.c:855
+msgid "don't match patterns in binary files"
+msgstr ""
+
+#: builtin/grep.c:858
+msgid "process binary files with textconv filters"
+msgstr ""
+
+#: builtin/grep.c:860
+msgid "search in subdirectories (default)"
+msgstr ""
+
+#: builtin/grep.c:862
+msgid "descend at most <depth> levels"
+msgstr ""
+
+#: builtin/grep.c:866
+msgid "use extended POSIX regular expressions"
+msgstr ""
+
+#: builtin/grep.c:869
+msgid "use basic POSIX regular expressions (default)"
+msgstr ""
+
+#: builtin/grep.c:872
+msgid "interpret patterns as fixed strings"
+msgstr ""
+
+#: builtin/grep.c:875
+msgid "use Perl-compatible regular expressions"
+msgstr ""
+
+#: builtin/grep.c:878
+msgid "show line numbers"
+msgstr ""
+
+#: builtin/grep.c:879
+msgid "show column number of first match"
+msgstr ""
+
+#: builtin/grep.c:880
+msgid "don't show filenames"
+msgstr ""
+
+#: builtin/grep.c:881
+msgid "show filenames"
+msgstr ""
+
+#: builtin/grep.c:883
+msgid "show filenames relative to top directory"
+msgstr ""
+
+#: builtin/grep.c:885
+msgid "show only filenames instead of matching lines"
+msgstr ""
+
+#: builtin/grep.c:887
+msgid "synonym for --files-with-matches"
+msgstr ""
+
+#: builtin/grep.c:890
+msgid "show only the names of files without match"
+msgstr ""
+
+#: builtin/grep.c:892
+msgid "print NUL after filenames"
+msgstr ""
+
+#: builtin/grep.c:895
+msgid "show only matching parts of a line"
+msgstr ""
+
+#: builtin/grep.c:897
+msgid "show the number of matches instead of matching lines"
+msgstr ""
+
+#: builtin/grep.c:898
+msgid "highlight matches"
+msgstr ""
+
+#: builtin/grep.c:900
+msgid "print empty line between matches from different files"
+msgstr ""
+
+#: builtin/grep.c:902
+msgid "show filename only once above matches from same file"
+msgstr ""
+
+#: builtin/grep.c:905
+msgid "show <n> context lines before and after matches"
+msgstr ""
+
+#: builtin/grep.c:908
+msgid "show <n> context lines before matches"
+msgstr ""
+
+#: builtin/grep.c:910
+msgid "show <n> context lines after matches"
+msgstr ""
+
+#: builtin/grep.c:912
+msgid "use <n> worker threads"
+msgstr ""
+
+#: builtin/grep.c:913
+msgid "shortcut for -C NUM"
+msgstr ""
+
+#: builtin/grep.c:916
+msgid "show a line with the function name before matches"
+msgstr ""
+
+#: builtin/grep.c:918
+msgid "show the surrounding function"
+msgstr ""
+
+#: builtin/grep.c:921
+msgid "read patterns from file"
+msgstr ""
+
+#: builtin/grep.c:923
+msgid "match <pattern>"
+msgstr ""
+
+#: builtin/grep.c:925
+msgid "combine patterns specified with -e"
+msgstr ""
+
+#: builtin/grep.c:937
+msgid "indicate hit with exit status without output"
+msgstr ""
+
+#: builtin/grep.c:939
+msgid "show only matches from files that match all patterns"
+msgstr ""
+
+#: builtin/grep.c:942
+msgid "pager"
+msgstr ""
+
+#: builtin/grep.c:942
+msgid "show matching files in the pager"
+msgstr ""
+
+#: builtin/grep.c:946
+msgid "allow calling of grep(1) (ignored by this build)"
+msgstr ""
+
+#: builtin/grep.c:1012
+msgid "no pattern given"
+msgstr ""
+
+#: builtin/grep.c:1048
+msgid "--no-index or --untracked cannot be used with revs"
+msgstr ""
+
+#: builtin/grep.c:1056
+#, c-format
+msgid "unable to resolve revision: %s"
+msgstr ""
+
+#: builtin/grep.c:1086
+msgid "--untracked not supported with --recurse-submodules"
+msgstr ""
+
+#: builtin/grep.c:1090
+msgid "invalid option combination, ignoring --threads"
+msgstr ""
+
+#: builtin/grep.c:1093 builtin/pack-objects.c:3672
+msgid "no threads support, ignoring --threads"
+msgstr ""
+
+#: builtin/grep.c:1096 builtin/index-pack.c:1586 builtin/pack-objects.c:2941
+#, c-format
+msgid "invalid number of threads specified (%d)"
+msgstr "jumlah utas tersebut (%d) tidak valid"
+
+#: builtin/grep.c:1130
+msgid "--open-files-in-pager only works on the worktree"
+msgstr ""
+
+#: builtin/grep.c:1156
+msgid "--cached or --untracked cannot be used with --no-index"
+msgstr ""
+
+#: builtin/grep.c:1159
+msgid "--untracked cannot be used with --cached"
+msgstr ""
+
+#: builtin/grep.c:1165
+msgid "--[no-]exclude-standard cannot be used for tracked contents"
+msgstr ""
+
+#: builtin/grep.c:1173
+msgid "both --cached and trees are given"
+msgstr ""
+
+#: builtin/hash-object.c:85
+msgid ""
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
+"[--] <file>..."
+msgstr ""
+
+#: builtin/hash-object.c:86
+msgid "git hash-object --stdin-paths"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: builtin/help.c:53
+msgid "show manual in web browser"
+msgstr ""
+
+#: builtin/help.c:55
+msgid "show info page"
+msgstr ""
+
+#: builtin/help.c:57
+msgid "print command description"
+msgstr ""
+
+#: builtin/help.c:62
+msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
+msgstr ""
+
+#: builtin/help.c:163
+#, c-format
+msgid "unrecognized help format '%s'"
+msgstr ""
+
+#: builtin/help.c:190
+msgid "Failed to start emacsclient."
+msgstr ""
+
+#: builtin/help.c:203
+msgid "Failed to parse emacsclient version."
+msgstr ""
+
+#: builtin/help.c:211
+#, c-format
+msgid "emacsclient version '%d' too old (< 22)."
+msgstr ""
+
+#: 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:307
+#, c-format
+msgid ""
+"'%s': path for unsupported man viewer.\n"
+"Please consider using 'man.<tool>.cmd' instead."
+msgstr ""
+
+#: 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:436
+#, c-format
+msgid "'%s': unknown man viewer."
+msgstr ""
+
+#: builtin/help.c:453
+msgid "no man viewer handled the request"
+msgstr ""
+
+#: builtin/help.c:461
+msgid "no info viewer handled the request"
+msgstr ""
+
+#: builtin/help.c:520 builtin/help.c:531 git.c:340
+#, c-format
+msgid "'%s' is aliased to '%s'"
+msgstr ""
+
+#: builtin/help.c:534 git.c:372
+#, c-format
+msgid "bad alias.%s string: %s"
+msgstr ""
+
+#: builtin/help.c:563 builtin/help.c:593
+#, c-format
+msgid "usage: %s%s"
+msgstr ""
+
+#: builtin/help.c:577
+msgid "'git help config' for more information"
+msgstr ""
+
+#: builtin/index-pack.c:221
+#, c-format
+msgid "object type mismatch at %s"
+msgstr "tipe objek tidak cocok pada %s"
+
+#: builtin/index-pack.c:241
+#, c-format
+msgid "did not receive expected object %s"
+msgstr "tidak menerima objek yang diharapkan %s"
+
+#: builtin/index-pack.c:244
+#, c-format
+msgid "object %s: expected type %s, found %s"
+msgstr "objek %s: yang diharapkan %s, yang didapat %s"
+
+#: 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:304
+msgid "early EOF"
+msgstr "EOF awal"
+
+#: builtin/index-pack.c:305
+msgid "read error on input"
+msgstr "kesalahan baca pada masukan"
+
+#: builtin/index-pack.c:317
+msgid "used more bytes than were available"
+msgstr "gunakan lebih banyak pita dari pada yang tersedia"
+
+#: builtin/index-pack.c:324 builtin/pack-objects.c:624
+msgid "pack too large for current definition of off_t"
+msgstr "paket terlalu besar untuk definisi off_t saat ini"
+
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
+msgid "pack exceeds maximum allowed size"
+msgstr "paket melebihi ukuran maksimum yang diperbolehkan"
+
+#: builtin/index-pack.c:342
+#, c-format
+msgid "unable to create '%s'"
+msgstr "tidak dapat membuat '%s'"
+
+#: builtin/index-pack.c:348
+#, c-format
+msgid "cannot open packfile '%s'"
+msgstr "tidak dapat membuka berkas paket '%s'"
+
+#: builtin/index-pack.c:362
+msgid "pack signature mismatch"
+msgstr "tanda tangan paket tidak cocok"
+
+#: builtin/index-pack.c:364
+#, c-format
+msgid "pack version %<PRIu32> unsupported"
+msgstr "versi paket %<PRIu32> tidak didukung"
+
+#: builtin/index-pack.c:382
+#, c-format
+msgid "pack has bad object at offset %<PRIuMAX>: %s"
+msgstr "paket ada objek jelek pada offset %<PRIuMAX>: %s"
+
+#: builtin/index-pack.c:488
+#, c-format
+msgid "inflate returned %d"
+msgstr "inflate mengembalikan %d"
+
+#: builtin/index-pack.c:537
+msgid "offset value overflow for delta base object"
+msgstr "nilai offset meluap untuk objek basis delta"
+
+#: builtin/index-pack.c:545
+msgid "delta base offset is out of bound"
+msgstr "offset basis delta di luar jangkauan"
+
+#: builtin/index-pack.c:553
+#, c-format
+msgid "unknown object type %d"
+msgstr "tipe objek tidak diketahui %d"
+
+#: builtin/index-pack.c:584
+msgid "cannot pread pack file"
+msgstr "tidak dapat pread berkas paket"
+
+#: 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:612
+msgid "serious inflate inconsistency"
+msgstr "inkonsistensi inflate serius"
+
+#: 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 "TUMBUKAN SHA1 DITEMUKAN DENGAN %s !"
+
+#: 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 "tidak dapat membaca %s"
+
+#: builtin/index-pack.c:824
+#, c-format
+msgid "cannot read existing object info %s"
+msgstr "tidak dapat membaca info objek yang ada %s"
+
+#: builtin/index-pack.c:832
+#, c-format
+msgid "cannot read existing object %s"
+msgstr "tidak dapat membaca objek yang ada %s"
+
+#: builtin/index-pack.c:846
+#, c-format
+msgid "invalid blob object %s"
+msgstr "objek blob tidak valid %s"
+
+#: builtin/index-pack.c:849 builtin/index-pack.c:868
+msgid "fsck error in packed object"
+msgstr "kesalahan fsck dalam objek terpaket"
+
+#: builtin/index-pack.c:870
+#, c-format
+msgid "Not all child objects of %s are reachable"
+msgstr "Tidak semua objek anak dari %s bisa dicapai"
+
+#: builtin/index-pack.c:931 builtin/index-pack.c:978
+msgid "failed to apply delta"
+msgstr "gagal menerapkan delta"
+
+#: builtin/index-pack.c:1161
+msgid "Receiving objects"
+msgstr "Menerima objek"
+
+#: builtin/index-pack.c:1161
+msgid "Indexing objects"
+msgstr "Mengindeks objek"
+
+#: builtin/index-pack.c:1195
+msgid "pack is corrupted (SHA1 mismatch)"
+msgstr "paket rusak (SHA1 tidak cocok)"
+
+#: builtin/index-pack.c:1200
+msgid "cannot fstat packfile"
+msgstr "tidak dapat fstat berkas paket"
+
+#: builtin/index-pack.c:1203
+msgid "pack has junk at the end"
+msgstr "paket memiliki sampah pada ujung"
+
+#: builtin/index-pack.c:1215
+msgid "confusion beyond insanity in parse_pack_objects()"
+msgstr "bingung di luar kegilaan di parse_pack_objects()"
+
+#: builtin/index-pack.c:1238
+msgid "Resolving deltas"
+msgstr "Menguraikan delta"
+
+#: builtin/index-pack.c:1249 builtin/pack-objects.c:2707
+#, c-format
+msgid "unable to create thread: %s"
+msgstr "tidak dapat membuat utas: %s"
+
+#: builtin/index-pack.c:1282
+msgid "confusion beyond insanity"
+msgstr "bingung di luar kegilaan"
+
+#: 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:1300
+#, c-format
+msgid "Unexpected tail checksum for %s (disk corruption?)"
+msgstr "Checksum ekor tidak diharapkan untuk %s (kerusakan disk?)"
+
+#: 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:1328
+#, c-format
+msgid "unable to deflate appended object (%d)"
+msgstr "tidak dapat menggemboskan objek tertambah (%d)"
+
+#: builtin/index-pack.c:1424
+#, c-format
+msgid "local object %s is corrupt"
+msgstr "objek lokal %s rusak"
+
+#: builtin/index-pack.c:1445
+#, c-format
+msgid "packfile name '%s' does not end with '.%s'"
+msgstr "nama berkas paket '%s' tidak diakhiri dengan '.%s'"
+
+#: builtin/index-pack.c:1469
+#, c-format
+msgid "cannot write %s file '%s'"
+msgstr "tidak dapat menulis %s berkas '%s'"
+
+#: builtin/index-pack.c:1477
+#, c-format
+msgid "cannot close written %s file '%s'"
+msgstr "tidak dapat menutup %s berkas tertulis '%s'"
+
+#: builtin/index-pack.c:1503
+msgid "error while closing pack file"
+msgstr "kesalahan menutup berkas paket"
+
+#: builtin/index-pack.c:1517
+msgid "cannot store pack file"
+msgstr "tidak dapat menyimpan berkas paket"
+
+#: builtin/index-pack.c:1525
+msgid "cannot store index file"
+msgstr "tidak dapat menyimpan berkas indeks"
+
+#: builtin/index-pack.c:1534
+msgid "cannot store reverse index file"
+msgstr "tidak dapat menyimpan berkas indeks balik"
+
+#: builtin/index-pack.c:1580 builtin/pack-objects.c:2952
+#, c-format
+msgid "bad pack.indexversion=%<PRIu32>"
+msgstr "pack.indexversion=%<PRIu32> jelek"
+
+#: builtin/index-pack.c:1650
+#, c-format
+msgid "Cannot open existing pack file '%s'"
+msgstr "tidak dapat membuka berkas paket yang ada '%s'"
+
+#: builtin/index-pack.c:1652
+#, c-format
+msgid "Cannot open existing pack idx file for '%s'"
+msgstr "tidak dapat membuka berkas indeks paket untuk '%s'"
+
+#: builtin/index-pack.c:1700
+#, c-format
+msgid "non delta: %d object"
+msgid_plural "non delta: %d objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1707
+#, c-format
+msgid "chain length = %d: %lu object"
+msgid_plural "chain length = %d: %lu objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1765
+msgid "Cannot come back to cwd"
+msgstr "tidak dapat kembali ke direktori kerja saat ini"
+
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1822
+#: builtin/index-pack.c:1838 builtin/index-pack.c:1842
+#, c-format
+msgid "bad %s"
+msgstr "%s jelek"
+
+#: builtin/index-pack.c:1848 builtin/init-db.c:392 builtin/init-db.c:625
+#, c-format
+msgid "unknown hash algorithm '%s'"
+msgstr "algoritma hash tak dikenal '%s'"
+
+#: builtin/index-pack.c:1867
+msgid "--fix-thin cannot be used without --stdin"
+msgstr "--fix-thin tidak dapat digunakan tanpa --stdin"
+
+#: builtin/index-pack.c:1869
+msgid "--stdin requires a git repository"
+msgstr "--stdin memerlukan repositori git"
+
+#: builtin/index-pack.c:1871
+msgid "--object-format cannot be used with --stdin"
+msgstr "--object-format tidak dapat digunakan dengan --stdin"
+
+#: builtin/index-pack.c:1886
+msgid "--verify with no packfile name given"
+msgstr "--verify tanpa nama berkas paket diberikan"
+
+#: builtin/index-pack.c:1956 builtin/unpack-objects.c:582
+msgid "fsck error in pack objects"
+msgstr "kesalahan fsck dalam objek paket"
+
+#: builtin/init-db.c:64
+#, c-format
+msgid "cannot stat template '%s'"
+msgstr "tidak dapat men-stat templat '%s'"
+
+#: builtin/init-db.c:69
+#, c-format
+msgid "cannot opendir '%s'"
+msgstr "tidak dapat membuka direktori '%s'"
+
+#: builtin/init-db.c:81
+#, c-format
+msgid "cannot readlink '%s'"
+msgstr "tidak dapat membaca tautan '%s'"
+
+#: builtin/init-db.c:83
+#, c-format
+msgid "cannot symlink '%s' '%s'"
+msgstr "tidak dapat menautkan simbolik '%s' '%s'"
+
+#: builtin/init-db.c:89
+#, c-format
+msgid "cannot copy '%s' to '%s'"
+msgstr "tidak dapat menyalin '%s' ke '%s'"
+
+#: builtin/init-db.c:93
+#, c-format
+msgid "ignoring template %s"
+msgstr "mengabaikan templat %s"
+
+#: builtin/init-db.c:124
+#, c-format
+msgid "templates not found in %s"
+msgstr "templat tidak ditemukan di %s"
+
+#: builtin/init-db.c:139
+#, c-format
+msgid "not copying templates from '%s': %s"
+msgstr "tidak menyalin templat dari '%s': %s"
+
+#: builtin/init-db.c:275
+#, c-format
+msgid "invalid initial branch name: '%s'"
+msgstr "nama cabang asal salah: '%s'"
+
+#: builtin/init-db.c:367
+#, c-format
+msgid "unable to handle file type %d"
+msgstr "tidak dapat menangani tipe berkas %d"
+
+#: builtin/init-db.c:370
+#, c-format
+msgid "unable to move %s to %s"
+msgstr "tidak dapat memindahkan %s ke %s"
+
+#: builtin/init-db.c:386
+msgid "attempt to reinitialize repository with different hash"
+msgstr "mencoba menginisialisasi ulang repositori dengan hash yang berbeda"
+
+#: builtin/init-db.c:410 builtin/init-db.c:413
+#, c-format
+msgid "%s already exists"
+msgstr "%s sudah ada"
+
+#: builtin/init-db.c:445
+#, c-format
+msgid "re-init: ignored --initial-branch=%s"
+msgstr "re-init: --initial-branch=%s diabaikan"
+
+#: builtin/init-db.c:476
+#, c-format
+msgid "Reinitialized existing shared Git repository in %s%s\n"
+msgstr "Repositori berbagi Git yang sudah ada diinisialisasi ulang di %s%s\n"
+
+#: builtin/init-db.c:477
+#, c-format
+msgid "Reinitialized existing Git repository in %s%s\n"
+msgstr "Repositori Git diinisialisasi ulang di %s%s\n"
+
+#: builtin/init-db.c:481
+#, c-format
+msgid "Initialized empty shared Git repository in %s%s\n"
+msgstr "Repositori berbagi Git kosong diinisialisasi di %s%s\n"
+
+#: builtin/init-db.c:482
+#, c-format
+msgid "Initialized empty Git repository in %s%s\n"
+msgstr "Repositori Git kosong dinisialisasi di %s%s\n"
+
+#: builtin/init-db.c:531
+msgid ""
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
+"shared[=<permissions>]] [<directory>]"
+msgstr ""
+"git init [-q | --quiet] [--bare] [--template=<direktori-templat>][--"
+"shared[=<perizinan>]] [<direktori>]"
+
+#: builtin/init-db.c:557
+msgid "permissions"
+msgstr "perizinan"
+
+#: builtin/init-db.c:558
+msgid "specify that the git repository is to be shared amongst several users"
+msgstr ""
+"tentukan bahwa repositori git untuk dibagikan di antara beberapa pengguna"
+
+#: builtin/init-db.c:564
+msgid "override the name of the initial branch"
+msgstr "timpa nama cabang asal"
+
+#: builtin/init-db.c:565 builtin/verify-pack.c:74
+msgid "hash"
+msgstr ""
+
+#: builtin/init-db.c:566 builtin/show-index.c:22 builtin/verify-pack.c:75
+msgid "specify the hash algorithm to use"
+msgstr "tentukan algoritma hash yang akan digunakan"
+
+#: builtin/init-db.c:573
+msgid "--separate-git-dir and --bare are mutually exclusive"
+msgstr "--separate-git-dir dan --bare saling eksklusif"
+
+#: builtin/init-db.c:602 builtin/init-db.c:607
+#, c-format
+msgid "cannot mkdir %s"
+msgstr "tidak dapat membuat direktori %s"
+
+#: builtin/init-db.c:611 builtin/init-db.c:666
+#, c-format
+msgid "cannot chdir to %s"
+msgstr "tidak dapat mengganti direktori ke %s"
+
+#: builtin/init-db.c:638
+#, c-format
+msgid ""
+"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
+"dir=<directory>)"
+msgstr ""
+"%s (atau --work-tree=<direktori>) tidak diperbolehkan tanpa sebutkan %s "
+"(atau--git-dir=<direktori>)"
+
+#: builtin/init-db.c:690
+#, c-format
+msgid "Cannot access work tree '%s'"
+msgstr "Tidak dapat mengakses pohon kerja '%s'"
+
+#: builtin/init-db.c:695
+msgid "--separate-git-dir incompatible with bare repository"
+msgstr "--separate-git-dir tidak kompatibel dengan repositori bare"
+
+#: builtin/interpret-trailers.c:16
+msgid ""
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"<token>[(=|:)<value>])...] [<file>...]"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/interpret-trailers.c:133
+msgid "no input file given for in-place editing"
+msgstr ""
+
+#: builtin/log.c:59
+msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
+msgstr ""
+
+#: builtin/log.c:60
+msgid "git show [<options>] <object>..."
+msgstr ""
+
+#: builtin/log.c:113
+#, c-format
+msgid "invalid --decorate option: %s"
+msgstr ""
+
+#: builtin/log.c:180
+msgid "show source"
+msgstr ""
+
+#: builtin/log.c:181
+msgid "use mail map file"
+msgstr ""
+
+#: builtin/log.c:184
+msgid "only decorate refs that match <pattern>"
+msgstr ""
+
+#: builtin/log.c:186
+msgid "do not decorate refs that match <pattern>"
+msgstr ""
+
+#: builtin/log.c:187
+msgid "decorate options"
+msgstr ""
+
+#: builtin/log.c:190
+msgid ""
+"trace the evolution of line range <start>,<end> or function :<funcname> in "
+"<file>"
+msgstr ""
+
+#: builtin/log.c:213
+msgid "-L<range>:<file> cannot be used with pathspec"
+msgstr ""
+
+#: builtin/log.c:303
+#, c-format
+msgid "Final output: %d %s\n"
+msgstr ""
+
+#: builtin/log.c:566
+#, c-format
+msgid "git show %s: bad file"
+msgstr ""
+
+#: builtin/log.c:581 builtin/log.c:671
+#, c-format
+msgid "could not read object %s"
+msgstr ""
+
+#: builtin/log.c:696
+#, c-format
+msgid "unknown type: %d"
+msgstr ""
+
+#: builtin/log.c:841
+#, c-format
+msgid "%s: invalid cover from description mode"
+msgstr ""
+
+#: builtin/log.c:848
+msgid "format.headers without value"
+msgstr ""
+
+#: builtin/log.c:977
+#, c-format
+msgid "cannot open patch file %s"
+msgstr ""
+
+#: builtin/log.c:994
+msgid "need exactly one range"
+msgstr ""
+
+#: builtin/log.c:1004
+msgid "not a range"
+msgstr ""
+
+#: builtin/log.c:1168
+msgid "cover letter needs email format"
+msgstr ""
+
+#: builtin/log.c:1174
+msgid "failed to create cover-letter file"
+msgstr ""
+
+#: builtin/log.c:1261
+#, c-format
+msgid "insane in-reply-to: %s"
+msgstr ""
+
+#: builtin/log.c:1288
+msgid "git format-patch [<options>] [<since> | <revision-range>]"
+msgstr ""
+
+#: builtin/log.c:1346
+msgid "two output directories?"
+msgstr ""
+
+#: builtin/log.c:1497 builtin/log.c:2317 builtin/log.c:2319 builtin/log.c:2331
+#, c-format
+msgid "unknown commit %s"
+msgstr ""
+
+#: builtin/log.c:1508 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:1517
+msgid "could not find exact merge base"
+msgstr ""
+
+#: builtin/log.c:1527
+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:1550
+msgid "failed to find exact merge base"
+msgstr ""
+
+#: builtin/log.c:1567
+msgid "base commit should be the ancestor of revision list"
+msgstr ""
+
+#: builtin/log.c:1577
+msgid "base commit shouldn't be in revision list"
+msgstr ""
+
+#: builtin/log.c:1635
+msgid "cannot get patch id"
+msgstr ""
+
+#: builtin/log.c:1692
+msgid "failed to infer range-diff origin of current series"
+msgstr ""
+
+#: builtin/log.c:1694
+#, c-format
+msgid "using '%s' as range-diff origin of current series"
+msgstr ""
+
+#: builtin/log.c:1738
+msgid "use [PATCH n/m] even with a single patch"
+msgstr ""
+
+#: builtin/log.c:1741
+msgid "use [PATCH] even with multiple patches"
+msgstr ""
+
+#: builtin/log.c:1745
+msgid "print patches to standard out"
+msgstr ""
+
+#: builtin/log.c:1747
+msgid "generate a cover letter"
+msgstr ""
+
+#: builtin/log.c:1749
+msgid "use simple number sequence for output file names"
+msgstr ""
+
+#: builtin/log.c:1750
+msgid "sfx"
+msgstr ""
+
+#: builtin/log.c:1751
+msgid "use <sfx> instead of '.patch'"
+msgstr ""
+
+#: builtin/log.c:1753
+msgid "start numbering patches at <n> instead of 1"
+msgstr ""
+
+#: builtin/log.c:1755
+msgid "mark the series as Nth re-roll"
+msgstr ""
+
+#: builtin/log.c:1757
+msgid "max length of output filename"
+msgstr ""
+
+#: builtin/log.c:1759
+msgid "use [RFC PATCH] instead of [PATCH]"
+msgstr ""
+
+#: builtin/log.c:1762
+msgid "cover-from-description-mode"
+msgstr ""
+
+#: builtin/log.c:1763
+msgid "generate parts of a cover letter based on a branch's description"
+msgstr ""
+
+#: builtin/log.c:1765
+msgid "use [<prefix>] instead of [PATCH]"
+msgstr ""
+
+#: builtin/log.c:1768
+msgid "store resulting files in <dir>"
+msgstr ""
+
+#: builtin/log.c:1771
+msgid "don't strip/add [PATCH]"
+msgstr ""
+
+#: builtin/log.c:1774
+msgid "don't output binary diffs"
+msgstr ""
+
+#: builtin/log.c:1776
+msgid "output all-zero hash in From header"
+msgstr ""
+
+#: builtin/log.c:1778
+msgid "don't include a patch matching a commit upstream"
+msgstr ""
+
+#: builtin/log.c:1780
+msgid "show patch format instead of default (patch + stat)"
+msgstr ""
+
+#: builtin/log.c:1782
+msgid "Messaging"
+msgstr ""
+
+#: builtin/log.c:1783
+msgid "header"
+msgstr ""
+
+#: builtin/log.c:1784
+msgid "add email header"
+msgstr ""
+
+#: builtin/log.c:1785 builtin/log.c:1786
+msgid "email"
+msgstr ""
+
+#: builtin/log.c:1785
+msgid "add To: header"
+msgstr ""
+
+#: builtin/log.c:1786
+msgid "add Cc: header"
+msgstr ""
+
+#: builtin/log.c:1787
+msgid "ident"
+msgstr ""
+
+#: builtin/log.c:1788
+msgid "set From address to <ident> (or committer ident if absent)"
+msgstr ""
+
+#: builtin/log.c:1790
+msgid "message-id"
+msgstr ""
+
+#: builtin/log.c:1791
+msgid "make first mail a reply to <message-id>"
+msgstr ""
+
+#: builtin/log.c:1792 builtin/log.c:1795
+msgid "boundary"
+msgstr ""
+
+#: builtin/log.c:1793
+msgid "attach the patch"
+msgstr ""
+
+#: builtin/log.c:1796
+msgid "inline the patch"
+msgstr ""
+
+#: builtin/log.c:1800
+msgid "enable message threading, styles: shallow, deep"
+msgstr ""
+
+#: builtin/log.c:1802
+msgid "signature"
+msgstr ""
+
+#: builtin/log.c:1803
+msgid "add a signature"
+msgstr ""
+
+#: builtin/log.c:1804
+msgid "base-commit"
+msgstr ""
+
+#: builtin/log.c:1805
+msgid "add prerequisite tree info to the patch series"
+msgstr ""
+
+#: builtin/log.c:1808
+msgid "add a signature from a file"
+msgstr ""
+
+#: builtin/log.c:1809
+msgid "don't print the patch filenames"
+msgstr ""
+
+#: builtin/log.c:1811
+msgid "show progress while generating patches"
+msgstr ""
+
+#: builtin/log.c:1813
+msgid "show changes against <rev> in cover letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1816
+msgid "show changes against <refspec> in cover letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1818
+msgid "percentage by which creation is weighted"
+msgstr ""
+
+#: builtin/log.c:1904
+#, c-format
+msgid "invalid ident line: %s"
+msgstr ""
+
+#: builtin/log.c:1919
+msgid "-n and -k are mutually exclusive"
+msgstr ""
+
+#: builtin/log.c:1921
+msgid "--subject-prefix/--rfc and -k are mutually exclusive"
+msgstr ""
+
+#: builtin/log.c:1929
+msgid "--name-only does not make sense"
+msgstr ""
+
+#: builtin/log.c:1931
+msgid "--name-status does not make sense"
+msgstr ""
+
+#: builtin/log.c:1933
+msgid "--check does not make sense"
+msgstr ""
+
+#: builtin/log.c:1955
+msgid "--stdout, --output, and --output-directory are mutually exclusive"
+msgstr ""
+
+#: builtin/log.c:2078
+msgid "--interdiff requires --cover-letter or single patch"
+msgstr ""
+
+#: builtin/log.c:2082
+msgid "Interdiff:"
+msgstr ""
+
+#: builtin/log.c:2083
+#, c-format
+msgid "Interdiff against v%d:"
+msgstr ""
+
+#: builtin/log.c:2089
+msgid "--creation-factor requires --range-diff"
+msgstr ""
+
+#: builtin/log.c:2093
+msgid "--range-diff requires --cover-letter or single patch"
+msgstr ""
+
+#: builtin/log.c:2101
+msgid "Range-diff:"
+msgstr ""
+
+#: builtin/log.c:2102
+#, c-format
+msgid "Range-diff against v%d:"
+msgstr ""
+
+#: builtin/log.c:2113
+#, c-format
+msgid "unable to read signature file '%s'"
+msgstr ""
+
+#: builtin/log.c:2149
+msgid "Generating patches"
+msgstr ""
+
+#: builtin/log.c:2193
+msgid "failed to create output files"
+msgstr ""
+
+#: builtin/log.c:2252
+msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+msgstr ""
+
+#: builtin/log.c:2306
+#, c-format
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgstr ""
+
+#: builtin/ls-files.c:486
+msgid "git ls-files [<options>] [<file>...]"
+msgstr ""
+
+#: builtin/ls-files.c:542
+msgid "identify the file status with tags"
+msgstr ""
+
+#: builtin/ls-files.c:544
+msgid "use lowercase letters for 'assume unchanged' files"
+msgstr ""
+
+#: builtin/ls-files.c:546
+msgid "use lowercase letters for 'fsmonitor clean' files"
+msgstr ""
+
+#: builtin/ls-files.c:548
+msgid "show cached files in the output (default)"
+msgstr ""
+
+#: builtin/ls-files.c:550
+msgid "show deleted files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:552
+msgid "show modified files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:554
+msgid "show other files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:556
+msgid "show ignored files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:559
+msgid "show staged contents' object name in the output"
+msgstr ""
+
+#: builtin/ls-files.c:561
+msgid "show files on the filesystem that need to be removed"
+msgstr ""
+
+#: builtin/ls-files.c:563
+msgid "show 'other' directories' names only"
+msgstr ""
+
+#: builtin/ls-files.c:565
+msgid "show line endings of files"
+msgstr ""
+
+#: builtin/ls-files.c:567
+msgid "don't show empty directories"
+msgstr ""
+
+#: builtin/ls-files.c:570
+msgid "show unmerged files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:572
+msgid "show resolve-undo information"
+msgstr ""
+
+#: builtin/ls-files.c:574
+msgid "skip files matching pattern"
+msgstr ""
+
+#: builtin/ls-files.c:577
+msgid "exclude patterns are read from <file>"
+msgstr ""
+
+#: builtin/ls-files.c:580
+msgid "read additional per-directory exclude patterns in <file>"
+msgstr ""
+
+#: builtin/ls-files.c:582
+msgid "add the standard git exclusions"
+msgstr ""
+
+#: builtin/ls-files.c:586
+msgid "make the output relative to the project top directory"
+msgstr ""
+
+#: builtin/ls-files.c:589
+msgid "recurse through submodules"
+msgstr ""
+
+#: builtin/ls-files.c:591
+msgid "if any <file> is not in the index, treat this as an error"
+msgstr ""
+
+#: builtin/ls-files.c:592
+msgid "tree-ish"
+msgstr ""
+
+#: builtin/ls-files.c:593
+msgid "pretend that paths removed since <tree-ish> are still present"
+msgstr ""
+
+#: builtin/ls-files.c:595
+msgid "show debugging data"
+msgstr ""
+
+#: builtin/ls-files.c:597
+msgid "suppress duplicate entries"
+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 ""
+
+#: builtin/ls-remote.c:60
+msgid "do not print remote URL"
+msgstr ""
+
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1404
+msgid "exec"
+msgstr ""
+
+#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
+msgid "path of git-upload-pack on the remote host"
+msgstr ""
+
+#: builtin/ls-remote.c:66
+msgid "limit to tags"
+msgstr ""
+
+#: builtin/ls-remote.c:67
+msgid "limit to heads"
+msgstr ""
+
+#: builtin/ls-remote.c:68
+msgid "do not show peeled tags"
+msgstr ""
+
+#: builtin/ls-remote.c:70
+msgid "take url.<base>.insteadOf into account"
+msgstr ""
+
+#: builtin/ls-remote.c:73
+msgid "exit with exit code 2 if no matching refs are found"
+msgstr ""
+
+#: builtin/ls-remote.c:76
+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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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:58
+msgid "git merge [<options>] [<commit>...]"
+msgstr ""
+
+#: builtin/merge.c:59
+msgid "git merge --abort"
+msgstr ""
+
+#: builtin/merge.c:60
+msgid "git merge --continue"
+msgstr ""
+
+#: builtin/merge.c:123
+msgid "switch `m' requires a value"
+msgstr ""
+
+#: builtin/merge.c:146
+#, c-format
+msgid "option `%s' requires a value"
+msgstr ""
+
+#: builtin/merge.c:199
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr ""
+
+#: builtin/merge.c:200
+#, c-format
+msgid "Available strategies are:"
+msgstr ""
+
+#: builtin/merge.c:205
+#, c-format
+msgid "Available custom strategies are:"
+msgstr ""
+
+#: builtin/merge.c:256 builtin/pull.c:133
+msgid "do not show a diffstat at the end of the merge"
+msgstr ""
+
+#: builtin/merge.c:259 builtin/pull.c:136
+msgid "show a diffstat at the end of the merge"
+msgstr ""
+
+#: builtin/merge.c:260 builtin/pull.c:139
+msgid "(synonym to --stat)"
+msgstr ""
+
+#: builtin/merge.c:262 builtin/pull.c:142
+msgid "add (at most <n>) entries from shortlog to merge commit message"
+msgstr ""
+
+#: builtin/merge.c:265 builtin/pull.c:148
+msgid "create a single commit instead of doing a merge"
+msgstr ""
+
+#: builtin/merge.c:267 builtin/pull.c:151
+msgid "perform a commit if the merge succeeds (default)"
+msgstr ""
+
+#: builtin/merge.c:269 builtin/pull.c:154
+msgid "edit message before committing"
+msgstr ""
+
+#: builtin/merge.c:271
+msgid "allow fast-forward (default)"
+msgstr ""
+
+#: builtin/merge.c:273 builtin/pull.c:161
+msgid "abort if fast-forward is not possible"
+msgstr ""
+
+#: builtin/merge.c:277 builtin/pull.c:164
+msgid "verify that the named commit has a valid GPG signature"
+msgstr ""
+
+#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
+#: builtin/rebase.c:541 builtin/rebase.c:1418 builtin/revert.c:114
+msgid "strategy"
+msgstr ""
+
+#: builtin/merge.c:279 builtin/pull.c:169
+msgid "merge strategy to use"
+msgstr ""
+
+#: builtin/merge.c:280 builtin/pull.c:172
+msgid "option=value"
+msgstr ""
+
+#: builtin/merge.c:281 builtin/pull.c:173
+msgid "option for selected merge strategy"
+msgstr ""
+
+#: builtin/merge.c:283
+msgid "merge commit message (for a non-fast-forward merge)"
+msgstr ""
+
+#: builtin/merge.c:290
+msgid "abort the current in-progress merge"
+msgstr ""
+
+#: builtin/merge.c:292
+msgid "--abort but leave index and working tree alone"
+msgstr ""
+
+#: builtin/merge.c:294
+msgid "continue the current in-progress merge"
+msgstr ""
+
+#: builtin/merge.c:296 builtin/pull.c:180
+msgid "allow merging unrelated histories"
+msgstr ""
+
+#: builtin/merge.c:303
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr ""
+
+#: builtin/merge.c:320
+msgid "could not run stash."
+msgstr ""
+
+#: builtin/merge.c:325
+msgid "stash failed"
+msgstr ""
+
+#: builtin/merge.c:330
+#, c-format
+msgid "not a valid object: %s"
+msgstr ""
+
+#: builtin/merge.c:352 builtin/merge.c:369
+msgid "read-tree failed"
+msgstr ""
+
+#: builtin/merge.c:399
+msgid " (nothing to squash)"
+msgstr ""
+
+#: builtin/merge.c:410
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr ""
+
+#: builtin/merge.c:460
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr ""
+
+#: builtin/merge.c:511
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr ""
+
+#: builtin/merge.c:598
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr ""
+
+#: builtin/merge.c:724
+msgid "Not handling anything other than two heads merge."
+msgstr ""
+
+#: builtin/merge.c:737
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr ""
+
+#: builtin/merge.c:756 t/helper/test-fast-rebase.c:209
+#, c-format
+msgid "unable to write %s"
+msgstr ""
+
+#: builtin/merge.c:808
+#, c-format
+msgid "Could not read from '%s'"
+msgstr ""
+
+#: builtin/merge.c:817
+#, c-format
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+msgstr ""
+
+#: builtin/merge.c:823
+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:828
+msgid "An empty message aborts the commit.\n"
+msgstr ""
+
+#: builtin/merge.c:831
+#, c-format
+msgid ""
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
+
+#: builtin/merge.c:884
+msgid "Empty commit message."
+msgstr ""
+
+#: builtin/merge.c:899
+#, c-format
+msgid "Wonderful.\n"
+msgstr ""
+
+#: builtin/merge.c:960
+#, c-format
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgstr ""
+
+#: builtin/merge.c:999
+msgid "No current branch."
+msgstr ""
+
+#: builtin/merge.c:1001
+msgid "No remote for the current branch."
+msgstr ""
+
+#: builtin/merge.c:1003
+msgid "No default upstream defined for the current branch."
+msgstr ""
+
+#: builtin/merge.c:1008
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
+msgstr ""
+
+#: builtin/merge.c:1065
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr ""
+
+#: builtin/merge.c:1168
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr ""
+
+#: builtin/merge.c:1202
+msgid "not something we can merge"
+msgstr ""
+
+#: builtin/merge.c:1312
+msgid "--abort expects no arguments"
+msgstr ""
+
+#: builtin/merge.c:1316
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr ""
+
+#: builtin/merge.c:1334
+msgid "--quit expects no arguments"
+msgstr ""
+
+#: builtin/merge.c:1347
+msgid "--continue expects no arguments"
+msgstr ""
+
+#: builtin/merge.c:1351
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr ""
+
+#: builtin/merge.c:1367
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+
+#: builtin/merge.c:1374
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+
+#: builtin/merge.c:1377
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+msgstr ""
+
+#: builtin/merge.c:1391
+msgid "You cannot combine --squash with --no-ff."
+msgstr ""
+
+#: builtin/merge.c:1393
+msgid "You cannot combine --squash with --commit."
+msgstr ""
+
+#: builtin/merge.c:1409
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr ""
+
+#: builtin/merge.c:1426
+msgid "Squash commit into empty head not supported yet"
+msgstr ""
+
+#: builtin/merge.c:1428
+msgid "Non-fast-forward commit does not make sense into an empty head"
+msgstr ""
+
+#: builtin/merge.c:1433
+#, c-format
+msgid "%s - not something we can merge"
+msgstr ""
+
+#: builtin/merge.c:1435
+msgid "Can merge only exactly one commit into empty head"
+msgstr ""
+
+#: builtin/merge.c:1516
+msgid "refusing to merge unrelated histories"
+msgstr ""
+
+#: builtin/merge.c:1525
+msgid "Already up to date."
+msgstr ""
+
+#: builtin/merge.c:1535
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr ""
+
+#: builtin/merge.c:1581
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr ""
+
+#: builtin/merge.c:1588
+#, c-format
+msgid "Nope.\n"
+msgstr ""
+
+#: builtin/merge.c:1613
+msgid "Already up to date. Yeeah!"
+msgstr ""
+
+#: builtin/merge.c:1619
+msgid "Not possible to fast-forward, aborting."
+msgstr ""
+
+#: builtin/merge.c:1647 builtin/merge.c:1712
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr ""
+
+#: builtin/merge.c:1651
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr ""
+
+#: builtin/merge.c:1703
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr ""
+
+#: builtin/merge.c:1705
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr ""
+
+#: builtin/merge.c:1714
+#, c-format
+msgid "Using the %s to prepare resolving by hand.\n"
+msgstr ""
+
+#: builtin/merge.c:1728
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
+msgstr ""
+
+#: builtin/mktag.c:10
+msgid "git mktag"
+msgstr ""
+
+#: builtin/mktag.c:30
+#, c-format
+msgid "warning: tag input does not pass fsck: %s"
+msgstr ""
+
+#: builtin/mktag.c:41
+#, c-format
+msgid "error: tag input does not pass fsck: %s"
+msgstr ""
+
+#: builtin/mktag.c:44
+#, c-format
+msgid "%d (FSCK_IGNORE?) should never trigger this callback"
+msgstr ""
+
+#: builtin/mktag.c:59
+msgid "could not read tagged object '%s'"
+msgstr ""
+
+#: builtin/mktag.c:62
+#, c-format
+msgid "object '%s' tagged as '%s', but is a '%s' type"
+msgstr ""
+
+#: builtin/mktag.c:99
+msgid "tag on stdin did not pass our strict fsck check"
+msgstr ""
+
+#: builtin/mktag.c:102
+msgid "tag on stdin did not refer to a valid object"
+msgstr ""
+
+#: builtin/mktag.c:105 builtin/tag.c:232
+msgid "unable to write tag file"
+msgstr ""
+
+#: builtin/mktree.c:66
+msgid "git mktree [-z] [--missing] [--batch]"
+msgstr ""
+
+#: builtin/mktree.c:154
+msgid "input is NUL terminated"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/multi-pack-index.c:26
+msgid "object directory containing set of packfile and pack-index pairs"
+msgstr ""
+
+#: 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:50 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 builtin/prune-packed.c:25 builtin/tag.c:575
+msgid "too many arguments"
+msgstr ""
+
+#: builtin/multi-pack-index.c:60
+msgid "--batch-size option is only for 'repack' subcommand"
+msgstr ""
+
+#: builtin/multi-pack-index.c:69
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr ""
+
+#: builtin/mv.c:18
+msgid "git mv [<options>] <source>... <destination>"
+msgstr ""
+
+#: builtin/mv.c:83
+#, c-format
+msgid "Directory %s is in index and no submodule?"
+msgstr ""
+
+#: builtin/mv.c:85
+msgid "Please stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+
+#: builtin/mv.c:103
+#, c-format
+msgid "%.*s is in index"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/mv.c:181
+#, c-format
+msgid "Checking rename of '%s' to '%s'\n"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: builtin/mv.c:274
+#, c-format
+msgid "Renaming %s to %s\n"
+msgstr ""
+
+#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:483
+#, c-format
+msgid "renaming '%s' failed"
+msgstr ""
+
+#: builtin/name-rev.c:465
+msgid "git name-rev [<options>] <commit>..."
+msgstr ""
+
+#: builtin/name-rev.c:466
+msgid "git name-rev [<options>] --all"
+msgstr ""
+
+#: builtin/name-rev.c:467
+msgid "git name-rev [<options>] --stdin"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/notes.c:29
+msgid ""
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
+"| (-c | -C) <object>] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:30
+msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
+msgstr ""
+
+#: builtin/notes.c:31
+msgid ""
+"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
+"(-c | -C) <object>] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:32
+msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:33
+msgid "git notes [--ref <notes-ref>] show [<object>]"
+msgstr ""
+
+#: builtin/notes.c:34
+msgid ""
+"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+msgstr ""
+
+#: builtin/notes.c:35
+msgid "git notes merge --commit [-v | -q]"
+msgstr ""
+
+#: builtin/notes.c:36
+msgid "git notes merge --abort [-v | -q]"
+msgstr ""
+
+#: builtin/notes.c:37
+msgid "git notes [--ref <notes-ref>] remove [<object>...]"
+msgstr ""
+
+#: builtin/notes.c:38
+msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
+msgstr ""
+
+#: builtin/notes.c:39
+msgid "git notes [--ref <notes-ref>] get-ref"
+msgstr ""
+
+#: builtin/notes.c:44
+msgid "git notes [list [<object>]]"
+msgstr ""
+
+#: builtin/notes.c:49
+msgid "git notes add [<options>] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:54
+msgid "git notes copy [<options>] <from-object> <to-object>"
+msgstr ""
+
+#: builtin/notes.c:55
+msgid "git notes copy --stdin [<from-object> <to-object>]..."
+msgstr ""
+
+#: builtin/notes.c:60
+msgid "git notes append [<options>] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:65
+msgid "git notes edit [<object>]"
+msgstr ""
+
+#: builtin/notes.c:70
+msgid "git notes show [<object>]"
+msgstr ""
+
+#: builtin/notes.c:75
+msgid "git notes merge [<options>] <notes-ref>"
+msgstr ""
+
+#: builtin/notes.c:76
+msgid "git notes merge --commit [<options>]"
+msgstr ""
+
+#: builtin/notes.c:77
+msgid "git notes merge --abort [<options>]"
+msgstr ""
+
+#: builtin/notes.c:82
+msgid "git notes remove [<object>]"
+msgstr ""
+
+#: builtin/notes.c:87
+msgid "git notes prune [<options>]"
+msgstr ""
+
+#: builtin/notes.c:92
+msgid "git notes get-ref"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/notes.c:154
+msgid "could not read 'show' output"
+msgstr ""
+
+#: builtin/notes.c:162
+#, c-format
+msgid "failed to finish 'show' for object '%s'"
+msgstr ""
+
+#: builtin/notes.c:197
+msgid "please supply the note contents using either -m or -F option"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/notes.c:242 builtin/tag.c:565
+#, c-format
+msgid "could not open or read '%s'"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/notes.c:265
+#, c-format
+msgid "failed to read object '%s'."
+msgstr ""
+
+#: builtin/notes.c:268
+#, c-format
+msgid "cannot read note data from non-blob object '%s'."
+msgstr ""
+
+#: builtin/notes.c:309
+#, c-format
+msgid "malformed input line: '%s'."
+msgstr ""
+
+#: builtin/notes.c:324
+#, c-format
+msgid "failed to copy notes from '%s' to '%s'"
+msgstr ""
+
+#. 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 ""
+
+#: builtin/notes.c:389 builtin/notes.c:678
+#, c-format
+msgid "no note found for object %s."
+msgstr ""
+
+#: 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 ""
+
+#: builtin/notes.c:463 builtin/notes.c:544
+#, c-format
+msgid "Overwriting existing notes for object %s\n"
+msgstr ""
+
+#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#, c-format
+msgid "Removing note for object %s\n"
+msgstr ""
+
+#: builtin/notes.c:497
+msgid "read objects from stdin"
+msgstr ""
+
+#: builtin/notes.c:499
+msgid "load rewriting config for <command> (implies --stdin)"
+msgstr ""
+
+#: builtin/notes.c:517
+msgid "too few arguments"
+msgstr ""
+
+#: builtin/notes.c:538
+#, c-format
+msgid ""
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr ""
+
+#: builtin/notes.c:550
+#, c-format
+msgid "missing notes on source object %s. Cannot copy."
+msgstr ""
+
+#: 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 ""
+
+#: builtin/notes.c:698
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+msgstr ""
+
+#: builtin/notes.c:700
+msgid "failed to delete ref NOTES_MERGE_REF"
+msgstr ""
+
+#: builtin/notes.c:702
+msgid "failed to remove 'git notes merge' worktree"
+msgstr ""
+
+#: builtin/notes.c:722
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr ""
+
+#: builtin/notes.c:724
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
+msgstr ""
+
+#: builtin/notes.c:726
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+msgstr ""
+
+#: builtin/notes.c:739
+msgid "failed to resolve NOTES_MERGE_REF"
+msgstr ""
+
+#: builtin/notes.c:742
+msgid "failed to finalize notes merge"
+msgstr ""
+
+#: builtin/notes.c:768
+#, c-format
+msgid "unknown notes merge strategy %s"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: builtin/notes.c:873
+#, c-format
+msgid "a notes merge into %s is already in-progress at %s"
+msgstr ""
+
+#: builtin/notes.c:876
+#, c-format
+msgid "failed to store link to current notes ref (%s)"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/notes.c:897 builtin/tag.c:578
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr ""
+
+#: builtin/notes.c:900
+#, c-format
+msgid "Object %s has no note\n"
+msgstr ""
+
+#: 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:148
+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:1671
+#, c-format
+msgid "unknown subcommand: %s"
+msgstr ""
+
+#: builtin/pack-objects.c:54
+msgid ""
+"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
+msgstr ""
+
+#: builtin/pack-objects.c:55
+msgid ""
+"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
+msgstr ""
+
+#: builtin/pack-objects.c:440
+#, c-format
+msgid ""
+"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
+"pack %s"
+msgstr ""
+
+#: builtin/pack-objects.c:448
+#, c-format
+msgid "bad packed object CRC for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:459
+#, c-format
+msgid "corrupt packed object for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:590
+#, c-format
+msgid "recursive delta detected for object %s"
+msgstr ""
+
+#: builtin/pack-objects.c:801
+#, c-format
+msgid "ordered %u objects, expected %<PRIu32>"
+msgstr ""
+
+#: builtin/pack-objects.c:896
+#, c-format
+msgid "expected object at offset %<PRIuMAX> in pack %s"
+msgstr ""
+
+#: builtin/pack-objects.c:1015
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr ""
+
+#: builtin/pack-objects.c:1028
+msgid "Writing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:1089 builtin/update-index.c:90
+#, c-format
+msgid "failed to stat %s"
+msgstr ""
+
+#: builtin/pack-objects.c:1141
+#, c-format
+msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
+msgstr ""
+
+#: builtin/pack-objects.c:1358
+msgid "disabling bitmap writing, as some objects are not being packed"
+msgstr ""
+
+#: builtin/pack-objects.c:1806
+#, c-format
+msgid "delta base offset overflow in pack for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:1815
+#, c-format
+msgid "delta base offset out of bound for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2096
+msgid "Counting objects"
+msgstr ""
+
+#: builtin/pack-objects.c:2241
+#, c-format
+msgid "unable to parse object header of %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2311 builtin/pack-objects.c:2327
+#: builtin/pack-objects.c:2337
+#, c-format
+msgid "object %s cannot be read"
+msgstr ""
+
+#: builtin/pack-objects.c:2314 builtin/pack-objects.c:2341
+#, c-format
+msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
+msgstr ""
+
+#: builtin/pack-objects.c:2351
+msgid "suboptimal pack - out of memory"
+msgstr ""
+
+#: builtin/pack-objects.c:2666
+#, c-format
+msgid "Delta compression using up to %d threads"
+msgstr ""
+
+#: builtin/pack-objects.c:2805
+#, c-format
+msgid "unable to pack objects reachable from tag %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2891
+msgid "Compressing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:2897
+msgid "inconsistency with delta count"
+msgstr ""
+
+#: builtin/pack-objects.c:2976
+#, c-format
+msgid ""
+"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
+"hash> <uri>' (got '%s')"
+msgstr ""
+
+#: builtin/pack-objects.c:2979
+#, c-format
+msgid ""
+"object already configured in another uploadpack.blobpackfileuri (got '%s')"
+msgstr ""
+
+#: builtin/pack-objects.c:3008
+#, c-format
+msgid ""
+"expected edge object ID, got garbage:\n"
+" %s"
+msgstr ""
+
+#: builtin/pack-objects.c:3014
+#, c-format
+msgid ""
+"expected object ID, got garbage:\n"
+" %s"
+msgstr ""
+
+#: builtin/pack-objects.c:3112
+msgid "invalid value for --missing"
+msgstr ""
+
+#: builtin/pack-objects.c:3171 builtin/pack-objects.c:3279
+msgid "cannot open pack index"
+msgstr ""
+
+#: builtin/pack-objects.c:3202
+#, c-format
+msgid "loose object at %s could not be examined"
+msgstr ""
+
+#: builtin/pack-objects.c:3287
+msgid "unable to force loose object"
+msgstr ""
+
+#: builtin/pack-objects.c:3380
+#, c-format
+msgid "not a rev '%s'"
+msgstr ""
+
+#: builtin/pack-objects.c:3383
+#, c-format
+msgid "bad revision '%s'"
+msgstr ""
+
+#: builtin/pack-objects.c:3408
+msgid "unable to add recent objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3461
+#, c-format
+msgid "unsupported index version %s"
+msgstr ""
+
+#: builtin/pack-objects.c:3465
+#, c-format
+msgid "bad index version '%s'"
+msgstr ""
+
+#: builtin/pack-objects.c:3503
+msgid "<version>[,<offset>]"
+msgstr ""
+
+#: builtin/pack-objects.c:3504
+msgid "write the pack index file in the specified idx format version"
+msgstr ""
+
+#: builtin/pack-objects.c:3507
+msgid "maximum size of each output pack file"
+msgstr ""
+
+#: builtin/pack-objects.c:3509
+msgid "ignore borrowed objects from alternate object store"
+msgstr ""
+
+#: builtin/pack-objects.c:3511
+msgid "ignore packed objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3513
+msgid "limit pack window by objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3515
+msgid "limit pack window by memory in addition to object limit"
+msgstr ""
+
+#: builtin/pack-objects.c:3517
+msgid "maximum length of delta chain allowed in the resulting pack"
+msgstr ""
+
+#: builtin/pack-objects.c:3519
+msgid "reuse existing deltas"
+msgstr ""
+
+#: builtin/pack-objects.c:3521
+msgid "reuse existing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3523
+msgid "use OFS_DELTA objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3525
+msgid "use threads when searching for best delta matches"
+msgstr ""
+
+#: builtin/pack-objects.c:3527
+msgid "do not create an empty pack output"
+msgstr ""
+
+#: builtin/pack-objects.c:3529
+msgid "read revision arguments from standard input"
+msgstr ""
+
+#: builtin/pack-objects.c:3531
+msgid "limit the objects to those that are not yet packed"
+msgstr ""
+
+#: builtin/pack-objects.c:3534
+msgid "include objects reachable from any reference"
+msgstr ""
+
+#: builtin/pack-objects.c:3537
+msgid "include objects referred by reflog entries"
+msgstr ""
+
+#: builtin/pack-objects.c:3540
+msgid "include objects referred to by the index"
+msgstr ""
+
+#: builtin/pack-objects.c:3543
+msgid "output pack to stdout"
+msgstr ""
+
+#: builtin/pack-objects.c:3545
+msgid "include tag objects that refer to objects to be packed"
+msgstr ""
+
+#: builtin/pack-objects.c:3547
+msgid "keep unreachable objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3549
+msgid "pack loose unreachable objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3551
+msgid "unpack unreachable objects newer than <time>"
+msgstr ""
+
+#: builtin/pack-objects.c:3554
+msgid "use the sparse reachability algorithm"
+msgstr ""
+
+#: builtin/pack-objects.c:3556
+msgid "create thin packs"
+msgstr ""
+
+#: builtin/pack-objects.c:3558
+msgid "create packs suitable for shallow fetches"
+msgstr ""
+
+#: builtin/pack-objects.c:3560
+msgid "ignore packs that have companion .keep file"
+msgstr ""
+
+#: builtin/pack-objects.c:3562
+msgid "ignore this pack"
+msgstr ""
+
+#: builtin/pack-objects.c:3564
+msgid "pack compression level"
+msgstr ""
+
+#: builtin/pack-objects.c:3566
+msgid "do not hide commits by grafts"
+msgstr ""
+
+#: builtin/pack-objects.c:3568
+msgid "use a bitmap index if available to speed up counting objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3570
+msgid "write a bitmap index together with the pack index"
+msgstr ""
+
+#: builtin/pack-objects.c:3574
+msgid "write a bitmap index if possible"
+msgstr ""
+
+#: builtin/pack-objects.c:3578
+msgid "handling for missing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3581
+msgid "do not pack objects in promisor packfiles"
+msgstr ""
+
+#: builtin/pack-objects.c:3583
+msgid "respect islands during delta compression"
+msgstr ""
+
+#: builtin/pack-objects.c:3585
+msgid "protocol"
+msgstr ""
+
+#: builtin/pack-objects.c:3586
+msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
+msgstr ""
+
+#: builtin/pack-objects.c:3617
+#, c-format
+msgid "delta chain depth %d is too deep, forcing %d"
+msgstr ""
+
+#: builtin/pack-objects.c:3622
+#, c-format
+msgid "pack.deltaCacheLimit is too high, forcing %d"
+msgstr ""
+
+#: builtin/pack-objects.c:3676
+msgid "--max-pack-size cannot be used to build a pack for transfer"
+msgstr ""
+
+#: builtin/pack-objects.c:3678
+msgid "minimum pack size limit is 1 MiB"
+msgstr ""
+
+#: builtin/pack-objects.c:3683
+msgid "--thin cannot be used to build an indexable pack"
+msgstr ""
+
+#: builtin/pack-objects.c:3686
+msgid "--keep-unreachable and --unpack-unreachable are incompatible"
+msgstr ""
+
+#: builtin/pack-objects.c:3692
+msgid "cannot use --filter without --stdout"
+msgstr ""
+
+#: builtin/pack-objects.c:3752
+msgid "Enumerating objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3783
+#, c-format
+msgid ""
+"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
+"reused %<PRIu32>"
+msgstr ""
+
+#: builtin/pack-redundant.c:601
+msgid ""
+"'git pack-redundant' is nominated for removal.\n"
+"If you still use this command, please add an extra\n"
+"option, '--i-still-use-this', on the command line\n"
+"and let us know you still use it by sending an e-mail\n"
+"to <git@vger.kernel.org>. Thanks.\n"
+msgstr ""
+
+#: builtin/pack-refs.c:8
+msgid "git pack-refs [<options>]"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/prune.c:14
+msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: builtin/pull.c:67
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
+msgstr ""
+
+#: 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:492 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 ""
+
+#: builtin/pull.c:445
+msgid ""
+"There is no candidate for rebasing against among the refs that you just "
+"fetched."
+msgstr ""
+
+#: builtin/pull.c:447
+msgid ""
+"There are no candidates for merging among the refs that you just fetched."
+msgstr ""
+
+#: builtin/pull.c:448
+msgid ""
+"Generally this means that you provided a wildcard refspec which had no\n"
+"matches on the remote end."
+msgstr ""
+
+#: builtin/pull.c:451
+#, 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 ""
+
+#: builtin/pull.c:456 builtin/rebase.c:1253
+msgid "You are not currently on a branch."
+msgstr ""
+
+#: builtin/pull.c:458 builtin/pull.c:473
+msgid "Please specify which branch you want to rebase against."
+msgstr ""
+
+#: builtin/pull.c:460 builtin/pull.c:475
+msgid "Please specify which branch you want to merge with."
+msgstr ""
+
+#: builtin/pull.c:461 builtin/pull.c:476
+msgid "See git-pull(1) for details."
+msgstr ""
+
+#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
+#: builtin/rebase.c:1259
+msgid "<remote>"
+msgstr ""
+
+#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
+msgid "<branch>"
+msgstr ""
+
+#: builtin/pull.c:471 builtin/rebase.c:1251
+msgid "There is no tracking information for the current branch."
+msgstr ""
+
+#: builtin/pull.c:480
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:"
+msgstr ""
+
+#: builtin/pull.c:485
+#, 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:596
+#, c-format
+msgid "unable to access commit %s"
+msgstr ""
+
+#: builtin/pull.c:902
+msgid "ignoring --verify-signatures for rebase"
+msgstr ""
+
+#: builtin/pull.c:930
+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:991
+msgid "Updating an unborn branch with changes added to the index."
+msgstr ""
+
+#: builtin/pull.c:995
+msgid "pull with rebase"
+msgstr ""
+
+#: builtin/pull.c:996
+msgid "please commit or stash them."
+msgstr ""
+
+#: builtin/pull.c:1021
+#, c-format
+msgid ""
+"fetch updated the current branch head.\n"
+"fast-forwarding your working tree from\n"
+"commit %s."
+msgstr ""
+
+#: builtin/pull.c:1027
+#, 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 ""
+
+#: builtin/pull.c:1042
+msgid "Cannot merge multiple branches into empty head."
+msgstr ""
+
+#: builtin/pull.c:1046
+msgid "Cannot rebase onto multiple branches."
+msgstr ""
+
+#: builtin/pull.c:1067
+msgid "cannot rebase with locally recorded submodule modifications"
+msgstr ""
+
+#: builtin/push.c:19
+msgid "git push [<options>] [<repository> [<refspec>...]]"
+msgstr "git push [<opsi>] [<repositori> [<spek referensi>...]]"
+
+#: builtin/push.c:111
+msgid "tag shorthand without <tag>"
+msgstr "pintasan tag tanpa <tag>"
+
+#: builtin/push.c:119
+msgid "--delete only accepts plain target ref names"
+msgstr "--delete hanya terima nama target referensi polos"
+
+#: builtin/push.c:164
+msgid ""
+"\n"
+"To choose either option permanently, see push.default in 'git help config'."
+msgstr ""
+"\n"
+"Untuk memilih salah satu opsi secara permanen, lihat push.default di 'git "
+"help config'."
+
+#: 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 ""
+"Cabang hulu dari cabang Anda saat ini tidak cocok dengan \n"
+"nama cabang Anda saat ini. Untuk dorong ke cabang hulu pada remote,\n"
+"gunakan\n"
+"\n"
+" git push %s HEAD:%s\n"
+"\n"
+"Untuk dorong ke cabang bernama sama pada remote, gunakan\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 ""
+"Anda tidak berada pada cabang.\n"
+"Untuk dorong riwayat hingga kondisi saat ini (HEAD terlepas)\n"
+"sekarang, gunakan\n"
+"\n"
+" git push %s HEAD:<nama-cabang-remote>\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 ""
+"Cabang saat ini %s tidak punya cabang hulu.\n"
+"Untuk dorong cabang saat ini dan setel remote sebagai hulu, gunakan\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 "Cabang saat ini %s punya banyak cabang hulu, tolak dorong. "
+
+#: 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 ""
+"Anda sedang mendorong ke remote '%s', yang bukan hulu dari\n"
+"cabang Anda saat ini '%s', tanpa beri tahu saya apa yang harus\n"
+"didorong untuk perbarui cabang remote yang mana."
+
+#: builtin/push.c:260
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+"Anda tidak sebutkan spek referensi apapun untuk didorong, dan push.default "
+"yaitu \"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 ""
+"Pembaruan ditolak karena ujung dari cabang Anda saat ini di belakang\n"
+"pasangan remotenya. Integrasikan perubahan remote (seperti\n"
+"'git pull') sebelum dorong lagi.\n"
+"Lihat 'Note about fast-forwards' di 'git push --help' untuk selengkapnya."
+
+#: 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 ""
+"Pembaruan ditolak karena ujung dari cabang yang didorong di belakang\n"
+"pasangan remotenya. Check out cabang itu dan integrasikan perubahan\n"
+"remote (seperti 'git pull') sebelum dorong lagi.\n"
+"Lihat 'Note about fast-forwards' di 'git push --help' untuk selengkapnya."
+
+#: 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 ""
+"Pembaruan ditolak karena remote berisi kerja yang Anda tidak punya\n"
+"di lokal. Ini biasanya disebabkan repositori yang lain dorong ke\n"
+"referensi yang sama. Mungkin Anda ingin integrasikan terlebih dahulu\n"
+"perubahan remote (seperti 'git pull') sebelum dorong lagi.\n"
+"Lihat 'Note about fast-forwards' di 'git push --help' untuk selengkapnya."
+
+#: builtin/push.c:286
+msgid "Updates were rejected because the tag already exists in the remote."
+msgstr "Pembaruan ditolak karena tag sudah ada di remote."
+
+#: 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 ""
+"Anda tidak dapat memperbarui referensi remote yang menunjuk ke objek\n"
+"non komit atau memperbarui referensi remote agar itu memnunjuk ke\n"
+"objek non komit, tanpa menggunakan opsi '--force'.\n"
+
+#: builtin/push.c:294
+msgid ""
+"Updates were rejected because the tip of the remote-tracking\n"
+"branch has been updated since the last checkout. You may want\n"
+"to integrate those changes locally (e.g., 'git pull ...')\n"
+"before forcing an update.\n"
+msgstr ""
+"Pembaruan ditolak karena ujung dari cabang pelacak remote\n"
+"sudah diperbarui sejak checkout terakhir. Mungkin Anda ingin\n"
+"integrasikan perubahan tersebut ke lokal (seperti 'git pull...')\n"
+"sebelum memaksa pembaruan.\n"
+
+#: builtin/push.c:364
+#, c-format
+msgid "Pushing to %s\n"
+msgstr "Mendorong ke %s\n"
+
+#: builtin/push.c:371
+#, c-format
+msgid "failed to push some refs to '%s'"
+msgstr "gagal dorong beberapa referensi ke '%s'"
+
+#: builtin/push.c:553
+msgid "repository"
+msgstr "repositori"
+
+#: builtin/push.c:554 builtin/send-pack.c:189
+msgid "push all refs"
+msgstr "dorong semua referensi"
+
+#: builtin/push.c:555 builtin/send-pack.c:191
+msgid "mirror all refs"
+msgstr "cermin semua referensi"
+
+#: builtin/push.c:557
+msgid "delete refs"
+msgstr "hapus referensi"
+
+#: builtin/push.c:558
+msgid "push tags (can't be used with --all or --mirror)"
+msgstr "dorong tag (tidak dapat digunakan dengan --all atau --mirror)"
+
+#: builtin/push.c:561 builtin/send-pack.c:192
+msgid "force updates"
+msgstr "paksa pembaruan"
+
+#: builtin/push.c:562 builtin/send-pack.c:204
+msgid "<refname>:<expect>"
+msgstr "<nama referensi>:<harapan>"
+
+#: builtin/push.c:563 builtin/send-pack.c:205
+msgid "require old value of ref to be at this value"
+msgstr "memerlukan nilai lama referensi berada pada nilai saat ini"
+
+#: builtin/push.c:566 builtin/send-pack.c:208
+msgid "require remote updates to be integrated locally"
+msgstr "memerlukan pembaruan remote diintegrasikan ke lokal"
+
+#: builtin/push.c:569
+msgid "control recursive pushing of submodules"
+msgstr "kontrol dorong rekursif submodul"
+
+#: builtin/push.c:570 builtin/send-pack.c:199
+msgid "use thin pack"
+msgstr "gunakan paket tipis"
+
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
+#: builtin/send-pack.c:187
+msgid "receive pack program"
+msgstr "program terima paket"
+
+#: builtin/push.c:573
+msgid "set upstream for git pull/status"
+msgstr "setel hulu untuk git pull/status"
+
+#: builtin/push.c:576
+msgid "prune locally removed refs"
+msgstr "buang referensi terhapus lokal"
+
+#: builtin/push.c:578
+msgid "bypass pre-push hook"
+msgstr "lewati kait pra-dorong"
+
+#: builtin/push.c:579
+msgid "push missing but relevant tags"
+msgstr "dorong tag yang hilang tapi relevan"
+
+#: builtin/push.c:581 builtin/send-pack.c:193
+msgid "GPG sign the push"
+msgstr "Tandatangan GPG dorong"
+
+#: builtin/push.c:583 builtin/send-pack.c:200
+msgid "request atomic transaction on remote side"
+msgstr "minta transaksi atomik pada sisi remote"
+
+#: builtin/push.c:601
+msgid "--delete is incompatible with --all, --mirror and --tags"
+msgstr "--delete tidak kompatibel dengan --all, --mirror dan --tags "
+
+#: builtin/push.c:603
+msgid "--delete doesn't make sense without any refs"
+msgstr "--delete tidak masuk akal tanpa referensi"
+
+#: builtin/push.c:623
+#, c-format
+msgid "bad repository '%s'"
+msgstr "repositori jelek '%s'"
+
+#: builtin/push.c:624
+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 ""
+"Tidak ada tujuan dorong terkonfigurasi.\n"
+"Baik sebutkan URL dari baris perintah atau konfigurasikan repositori remote "
+"dengan menggunakan\n"
+"\n"
+" git remote add <nama> <url>\n"
+"\n"
+"dan dorong dengan menggunakan nama remote\n"
+"\n"
+" git push <nama>\n"
+
+#: builtin/push.c:639
+msgid "--all and --tags are incompatible"
+msgstr "--all dan --tags tidak kompatibel"
+
+#: builtin/push.c:641
+msgid "--all can't be combined with refspecs"
+msgstr "--all tidak dapat digabung dengan spek referensi"
+
+#: builtin/push.c:645
+msgid "--mirror and --tags are incompatible"
+msgstr "--mirror dan --tags tidak kompatibel"
+
+#: builtin/push.c:647
+msgid "--mirror can't be combined with refspecs"
+msgstr "--mirror tidak dapat digabungkan dengan spek referensi"
+
+#: builtin/push.c:650
+msgid "--all and --mirror are incompatible"
+msgstr "--all dan --mirror tidak kompatibel"
+
+#: builtin/push.c:657
+msgid "push options must not have new line characters"
+msgstr "opsi dorong harus tidak ada karakter baris baru"
+
+#: builtin/range-diff.c:9
+msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
+msgstr ""
+
+#: builtin/range-diff.c:10
+msgid "git range-diff [<options>] <old-tip>...<new-tip>"
+msgstr ""
+
+#: builtin/range-diff.c:11
+msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
+msgstr ""
+
+#: builtin/range-diff.c:28
+msgid "Percentage by which creation is weighted"
+msgstr ""
+
+#: builtin/range-diff.c:30
+msgid "use simple diff colors"
+msgstr ""
+
+#: builtin/range-diff.c:32
+msgid "notes"
+msgstr ""
+
+#: builtin/range-diff.c:32
+msgid "passed to 'git log'"
+msgstr ""
+
+#: builtin/range-diff.c:35
+msgid "only emit output related to the first range"
+msgstr ""
+
+#: builtin/range-diff.c:37
+msgid "only emit output related to the second range"
+msgstr ""
+
+#: builtin/range-diff.c:60 builtin/range-diff.c:64
+#, c-format
+msgid "not a commit range: '%s'"
+msgstr ""
+
+#: builtin/range-diff.c:74
+msgid "single arg format must be symmetric range"
+msgstr ""
+
+#: builtin/range-diff.c:89
+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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: builtin/rebase.c:37
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
+msgstr ""
+
+#: builtin/rebase.c:39
+msgid "git rebase --continue | --abort | --skip | --edit-todo"
+msgstr ""
+
+#: builtin/rebase.c:195 builtin/rebase.c:219 builtin/rebase.c:246
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr ""
+
+#: builtin/rebase.c:312
+#, c-format
+msgid "could not create temporary %s"
+msgstr ""
+
+#: builtin/rebase.c:318
+msgid "could not mark as interactive"
+msgstr ""
+
+#: builtin/rebase.c:371
+msgid "could not generate todo list"
+msgstr ""
+
+#: builtin/rebase.c:413
+msgid "a base commit must be provided with --upstream or --onto"
+msgstr ""
+
+#: builtin/rebase.c:482
+msgid "git rebase--interactive [<options>]"
+msgstr ""
+
+#: builtin/rebase.c:495 builtin/rebase.c:1394
+msgid "keep commits which start empty"
+msgstr ""
+
+#: builtin/rebase.c:499 builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr ""
+
+#: builtin/rebase.c:501
+msgid "rebase merge commits"
+msgstr ""
+
+#: builtin/rebase.c:503
+msgid "keep original branch points of cousins"
+msgstr ""
+
+#: builtin/rebase.c:505
+msgid "move commits that begin with squash!/fixup!"
+msgstr ""
+
+#: builtin/rebase.c:506
+msgid "sign commits"
+msgstr ""
+
+#: builtin/rebase.c:508 builtin/rebase.c:1333
+msgid "display a diffstat of what changed upstream"
+msgstr ""
+
+#: builtin/rebase.c:510
+msgid "continue rebase"
+msgstr ""
+
+#: builtin/rebase.c:512
+msgid "skip commit"
+msgstr ""
+
+#: builtin/rebase.c:513
+msgid "edit the todo list"
+msgstr ""
+
+#: builtin/rebase.c:515
+msgid "show the current patch"
+msgstr ""
+
+#: builtin/rebase.c:518
+msgid "shorten commit ids in the todo list"
+msgstr ""
+
+#: builtin/rebase.c:520
+msgid "expand commit ids in the todo list"
+msgstr ""
+
+#: builtin/rebase.c:522
+msgid "check the todo list"
+msgstr ""
+
+#: builtin/rebase.c:524
+msgid "rearrange fixup/squash lines"
+msgstr ""
+
+#: builtin/rebase.c:526
+msgid "insert exec commands in todo list"
+msgstr ""
+
+#: builtin/rebase.c:527
+msgid "onto"
+msgstr ""
+
+#: builtin/rebase.c:530
+msgid "restrict-revision"
+msgstr ""
+
+#: builtin/rebase.c:530
+msgid "restrict revision"
+msgstr ""
+
+#: builtin/rebase.c:532
+msgid "squash-onto"
+msgstr ""
+
+#: builtin/rebase.c:533
+msgid "squash onto"
+msgstr ""
+
+#: builtin/rebase.c:535
+msgid "the upstream commit"
+msgstr ""
+
+#: builtin/rebase.c:537
+msgid "head-name"
+msgstr ""
+
+#: builtin/rebase.c:537
+msgid "head name"
+msgstr ""
+
+#: builtin/rebase.c:542
+msgid "rebase strategy"
+msgstr ""
+
+#: builtin/rebase.c:543
+msgid "strategy-opts"
+msgstr ""
+
+#: builtin/rebase.c:544
+msgid "strategy options"
+msgstr ""
+
+#: builtin/rebase.c:545
+msgid "switch-to"
+msgstr ""
+
+#: builtin/rebase.c:546
+msgid "the branch or commit to checkout"
+msgstr ""
+
+#: builtin/rebase.c:547
+msgid "onto-name"
+msgstr ""
+
+#: builtin/rebase.c:547
+msgid "onto name"
+msgstr ""
+
+#: builtin/rebase.c:548
+msgid "cmd"
+msgstr ""
+
+#: builtin/rebase.c:548
+msgid "the command to run"
+msgstr ""
+
+#: builtin/rebase.c:551 builtin/rebase.c:1427
+msgid "automatically re-schedule any `exec` that fails"
+msgstr ""
+
+#: builtin/rebase.c:567
+msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+msgstr ""
+
+#: builtin/rebase.c:583
+#, c-format
+msgid "%s requires the merge backend"
+msgstr ""
+
+#: builtin/rebase.c:626
+#, c-format
+msgid "could not get 'onto': '%s'"
+msgstr ""
+
+#: builtin/rebase.c:643
+#, c-format
+msgid "invalid orig-head: '%s'"
+msgstr ""
+
+#: builtin/rebase.c:668
+#, c-format
+msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
+msgstr ""
+
+#: builtin/rebase.c:813 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 ""
+
+#: builtin/rebase.c:896
+#, 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:1227
+#, c-format
+msgid ""
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
+"\"."
+msgstr ""
+
+#: builtin/rebase.c:1245
+#, 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 ""
+
+#: builtin/rebase.c:1261
+#, 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 ""
+
+#: builtin/rebase.c:1291
+msgid "exec commands cannot contain newlines"
+msgstr ""
+
+#: builtin/rebase.c:1295
+msgid "empty exec command"
+msgstr ""
+
+#: builtin/rebase.c:1324
+msgid "rebase onto given branch instead of upstream"
+msgstr ""
+
+#: builtin/rebase.c:1326
+msgid "use the merge-base of upstream and branch as the current base"
+msgstr ""
+
+#: builtin/rebase.c:1328
+msgid "allow pre-rebase hook to run"
+msgstr ""
+
+#: builtin/rebase.c:1330
+msgid "be quiet. implies --no-stat"
+msgstr ""
+
+#: builtin/rebase.c:1336
+msgid "do not show diffstat of what changed upstream"
+msgstr ""
+
+#: builtin/rebase.c:1339
+msgid "add a Signed-off-by trailer to each commit"
+msgstr ""
+
+#: builtin/rebase.c:1342
+msgid "make committer date match author date"
+msgstr ""
+
+#: builtin/rebase.c:1344
+msgid "ignore author date and use current date"
+msgstr ""
+
+#: builtin/rebase.c:1346
+msgid "synonym of --reset-author-date"
+msgstr ""
+
+#: builtin/rebase.c:1348 builtin/rebase.c:1352
+msgid "passed to 'git apply'"
+msgstr ""
+
+#: builtin/rebase.c:1350
+msgid "ignore changes in whitespace"
+msgstr ""
+
+#: builtin/rebase.c:1354 builtin/rebase.c:1357
+msgid "cherry-pick all commits, even if unchanged"
+msgstr ""
+
+#: builtin/rebase.c:1359
+msgid "continue"
+msgstr ""
+
+#: builtin/rebase.c:1362
+msgid "skip current patch and continue"
+msgstr ""
+
+#: builtin/rebase.c:1364
+msgid "abort and check out the original branch"
+msgstr ""
+
+#: builtin/rebase.c:1367
+msgid "abort but keep HEAD where it is"
+msgstr ""
+
+#: builtin/rebase.c:1368
+msgid "edit the todo list during an interactive rebase"
+msgstr ""
+
+#: builtin/rebase.c:1371
+msgid "show the patch file being applied or merged"
+msgstr ""
+
+#: builtin/rebase.c:1374
+msgid "use apply strategies to rebase"
+msgstr ""
+
+#: builtin/rebase.c:1378
+msgid "use merging strategies to rebase"
+msgstr ""
+
+#: builtin/rebase.c:1382
+msgid "let the user edit the list of commits to rebase"
+msgstr ""
+
+#: builtin/rebase.c:1386
+msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
+msgstr ""
+
+#: builtin/rebase.c:1391
+msgid "how to handle commits that become empty"
+msgstr ""
+
+#: builtin/rebase.c:1398
+msgid "move commits that begin with squash!/fixup! under -i"
+msgstr ""
+
+#: builtin/rebase.c:1405
+msgid "add exec lines after each commit of the editable list"
+msgstr ""
+
+#: builtin/rebase.c:1409
+msgid "allow rebasing commits with empty messages"
+msgstr ""
+
+#: builtin/rebase.c:1413
+msgid "try to rebase merges instead of skipping them"
+msgstr ""
+
+#: builtin/rebase.c:1416
+msgid "use 'merge-base --fork-point' to refine upstream"
+msgstr ""
+
+#: builtin/rebase.c:1418
+msgid "use the given merge strategy"
+msgstr ""
+
+#: builtin/rebase.c:1420 builtin/revert.c:115
+msgid "option"
+msgstr ""
+
+#: builtin/rebase.c:1421
+msgid "pass the argument through to the merge strategy"
+msgstr ""
+
+#: builtin/rebase.c:1424
+msgid "rebase all reachable commits up to the root(s)"
+msgstr ""
+
+#: builtin/rebase.c:1429
+msgid "apply all changes, even those already present upstream"
+msgstr ""
+
+#: builtin/rebase.c:1446
+msgid ""
+"the rebase.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
+msgstr ""
+
+#: builtin/rebase.c:1452
+msgid "It looks like 'git am' is in progress. Cannot rebase."
+msgstr ""
+
+#: builtin/rebase.c:1493
+msgid ""
+"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
+msgstr ""
+
+#: builtin/rebase.c:1498
+msgid "cannot combine '--keep-base' with '--onto'"
+msgstr ""
+
+#: builtin/rebase.c:1500
+msgid "cannot combine '--keep-base' with '--root'"
+msgstr ""
+
+#: builtin/rebase.c:1504
+msgid "cannot combine '--root' with '--fork-point'"
+msgstr ""
+
+#: builtin/rebase.c:1507
+msgid "No rebase in progress?"
+msgstr ""
+
+#: builtin/rebase.c:1511
+msgid "The --edit-todo action can only be used during interactive rebase."
+msgstr ""
+
+#: builtin/rebase.c:1534 t/helper/test-fast-rebase.c:123
+msgid "Cannot read HEAD"
+msgstr ""
+
+#: builtin/rebase.c:1546
+msgid ""
+"You must edit all merge conflicts and then\n"
+"mark them as resolved using git add"
+msgstr ""
+
+#: builtin/rebase.c:1565
+msgid "could not discard worktree changes"
+msgstr ""
+
+#: builtin/rebase.c:1584
+#, c-format
+msgid "could not move back to %s"
+msgstr ""
+
+#: builtin/rebase.c:1630
+#, 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 ""
+
+#: builtin/rebase.c:1658
+msgid "switch `C' expects a numerical value"
+msgstr ""
+
+#: builtin/rebase.c:1700
+#, c-format
+msgid "Unknown mode: %s"
+msgstr ""
+
+#: builtin/rebase.c:1739
+msgid "--strategy requires --merge or --interactive"
+msgstr ""
+
+#: builtin/rebase.c:1769
+msgid "cannot combine apply options with merge options"
+msgstr ""
+
+#: builtin/rebase.c:1782
+#, c-format
+msgid "Unknown rebase backend: %s"
+msgstr ""
+
+#: builtin/rebase.c:1812
+msgid "--reschedule-failed-exec requires --exec or --interactive"
+msgstr ""
+
+#: builtin/rebase.c:1832
+msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+msgstr ""
+
+#: builtin/rebase.c:1836
+msgid ""
+"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
+msgstr ""
+
+#: builtin/rebase.c:1860
+#, c-format
+msgid "invalid upstream '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1866
+msgid "Could not create new root commit"
+msgstr ""
+
+#: builtin/rebase.c:1892
+#, c-format
+msgid "'%s': need exactly one merge base with branch"
+msgstr ""
+
+#: builtin/rebase.c:1895
+#, c-format
+msgid "'%s': need exactly one merge base"
+msgstr ""
+
+#: builtin/rebase.c:1903
+#, c-format
+msgid "Does not point to a valid commit '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1931
+#, c-format
+msgid "fatal: no such branch/commit '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1939 builtin/submodule--helper.c:40
+#: builtin/submodule--helper.c:2414
+#, c-format
+msgid "No such ref: %s"
+msgstr ""
+
+#: builtin/rebase.c:1950
+msgid "Could not resolve HEAD to a revision"
+msgstr ""
+
+#: builtin/rebase.c:1971
+msgid "Please commit or stash them."
+msgstr ""
+
+#: builtin/rebase.c:2007
+#, c-format
+msgid "could not switch to %s"
+msgstr ""
+
+#: builtin/rebase.c:2018
+msgid "HEAD is up to date."
+msgstr ""
+
+#: builtin/rebase.c:2020
+#, c-format
+msgid "Current branch %s is up to date.\n"
+msgstr ""
+
+#: builtin/rebase.c:2028
+msgid "HEAD is up to date, rebase forced."
+msgstr ""
+
+#: builtin/rebase.c:2030
+#, c-format
+msgid "Current branch %s is up to date, rebase forced.\n"
+msgstr ""
+
+#: builtin/rebase.c:2038
+msgid "The pre-rebase hook refused to rebase."
+msgstr ""
+
+#: builtin/rebase.c:2045
+#, c-format
+msgid "Changes to %s:\n"
+msgstr ""
+
+#: builtin/rebase.c:2048
+#, c-format
+msgid "Changes from %s to %s:\n"
+msgstr ""
+
+#: builtin/rebase.c:2073
+#, c-format
+msgid "First, rewinding head to replay your work on top of it...\n"
+msgstr ""
+
+#: builtin/rebase.c:2082
+msgid "Could not detach HEAD"
+msgstr ""
+
+#: builtin/rebase.c:2091
+#, c-format
+msgid "Fast-forwarded %s to %s.\n"
+msgstr ""
+
+#: builtin/receive-pack.c:34
+msgid "git receive-pack <git-dir>"
+msgstr ""
+
+#: builtin/receive-pack.c:1276
+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 ""
+
+#: builtin/receive-pack.c:1296
+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 ""
+
+#: builtin/receive-pack.c:2481
+msgid "quiet"
+msgstr ""
+
+#: builtin/receive-pack.c:2495
+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 ""
+
+#: builtin/reflog.c:22
+msgid ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"<refs>..."
+msgstr ""
+
+#: 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 ""
+
+#: builtin/reflog.c:609
+#, c-format
+msgid "Marking reachable objects..."
+msgstr ""
+
+#: builtin/reflog.c:647
+#, c-format
+msgid "%s points nowhere!"
+msgstr ""
+
+#: builtin/reflog.c:699
+msgid "no reflog specified to delete"
+msgstr ""
+
+#: builtin/reflog.c:708
+#, c-format
+msgid "not a reflog: %s"
+msgstr ""
+
+#: builtin/reflog.c:713
+#, c-format
+msgid "no reflog for '%s'"
+msgstr ""
+
+#: builtin/reflog.c:759
+#, c-format
+msgid "invalid ref format: %s"
+msgstr ""
+
+#: builtin/reflog.c:768
+msgid "git reflog [ show | expire | delete | exists ]"
+msgstr ""
+
+#: builtin/remote.c:17
+msgid "git remote [-v | --verbose]"
+msgstr ""
+
+#: 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:19 builtin/remote.c:39
+msgid "git remote rename <old> <new>"
+msgstr ""
+
+#: builtin/remote.c:20 builtin/remote.c:44
+msgid "git remote remove <name>"
+msgstr ""
+
+#: builtin/remote.c:21 builtin/remote.c:49
+msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+msgstr ""
+
+#: builtin/remote.c:22
+msgid "git remote [-v | --verbose] show [-n] <name>"
+msgstr ""
+
+#: builtin/remote.c:23
+msgid "git remote prune [-n | --dry-run] <name>"
+msgstr ""
+
+#: builtin/remote.c:24
+msgid ""
+"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+msgstr ""
+
+#: builtin/remote.c:25
+msgid "git remote set-branches [--add] <name> <branch>..."
+msgstr ""
+
+#: builtin/remote.c:26 builtin/remote.c:75
+msgid "git remote get-url [--push] [--all] <name>"
+msgstr ""
+
+#: builtin/remote.c:27 builtin/remote.c:80
+msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+msgstr ""
+
+#: builtin/remote.c:28 builtin/remote.c:81
+msgid "git remote set-url --add <name> <newurl>"
+msgstr ""
+
+#: builtin/remote.c:29 builtin/remote.c:82
+msgid "git remote set-url --delete <name> <url>"
+msgstr ""
+
+#: builtin/remote.c:34
+msgid "git remote add [<options>] <name> <url>"
+msgstr ""
+
+#: builtin/remote.c:54
+msgid "git remote set-branches <name> <branch>..."
+msgstr ""
+
+#: builtin/remote.c:55
+msgid "git remote set-branches --add <name> <branch>..."
+msgstr ""
+
+#: builtin/remote.c:60
+msgid "git remote show [<options>] <name>"
+msgstr ""
+
+#: builtin/remote.c:65
+msgid "git remote prune [<options>] <name>"
+msgstr ""
+
+#: builtin/remote.c:70
+msgid "git remote update [<options>] [<group> | <remote>]..."
+msgstr ""
+
+#: builtin/remote.c:99
+#, c-format
+msgid "Updating %s"
+msgstr ""
+
+#: builtin/remote.c:131
+msgid ""
+"--mirror is dangerous and deprecated; please\n"
+"\t use --mirror=fetch or --mirror=push instead"
+msgstr ""
+
+#: builtin/remote.c:148
+#, c-format
+msgid "unknown mirror argument: %s"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/remote.c:171
+msgid "branch(es) to track"
+msgstr ""
+
+#: builtin/remote.c:172
+msgid "master branch"
+msgstr ""
+
+#: builtin/remote.c:174
+msgid "set up remote as a mirror to push to or fetch from"
+msgstr ""
+
+#: builtin/remote.c:186
+msgid "specifying a master branch makes no sense with --mirror"
+msgstr ""
+
+#: builtin/remote.c:188
+msgid "specifying branches to track makes sense only with fetch mirrors"
+msgstr ""
+
+#: builtin/remote.c:195 builtin/remote.c:700
+#, c-format
+msgid "remote %s already exists."
+msgstr ""
+
+#: builtin/remote.c:240
+#, c-format
+msgid "Could not setup master '%s'"
+msgstr ""
+
+#: builtin/remote.c:355
+#, c-format
+msgid "Could not get fetch map for refspec %s"
+msgstr ""
+
+#: builtin/remote.c:454 builtin/remote.c:462
+msgid "(matching)"
+msgstr ""
+
+#: builtin/remote.c:466
+msgid "(delete)"
+msgstr ""
+
+#: builtin/remote.c:655
+#, c-format
+msgid "could not set '%s'"
+msgstr ""
+
+#: builtin/remote.c:660
+#, 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:691 builtin/remote.c:836 builtin/remote.c:946
+#, c-format
+msgid "No such remote: '%s'"
+msgstr ""
+
+#: builtin/remote.c:710
+#, c-format
+msgid "Could not rename config section '%s' to '%s'"
+msgstr ""
+
+#: builtin/remote.c:730
+#, c-format
+msgid ""
+"Not updating non-default fetch refspec\n"
+"\t%s\n"
+"\tPlease update the configuration manually if necessary."
+msgstr ""
+
+#: builtin/remote.c:770
+#, c-format
+msgid "deleting '%s' failed"
+msgstr ""
+
+#: builtin/remote.c:804
+#, c-format
+msgid "creating '%s' failed"
+msgstr ""
+
+#: builtin/remote.c:882
+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] ""
+msgstr[1] ""
+
+#: builtin/remote.c:896
+#, c-format
+msgid "Could not remove config section '%s'"
+msgstr ""
+
+#: builtin/remote.c:999
+#, c-format
+msgid " new (next fetch will store in remotes/%s)"
+msgstr ""
+
+#: builtin/remote.c:1002
+msgid " tracked"
+msgstr ""
+
+#: builtin/remote.c:1004
+msgid " stale (use 'git remote prune' to remove)"
+msgstr ""
+
+#: builtin/remote.c:1006
+msgid " ???"
+msgstr ""
+
+#: builtin/remote.c:1047
+#, c-format
+msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
+msgstr ""
+
+#: builtin/remote.c:1056
+#, c-format
+msgid "rebases interactively onto remote %s"
+msgstr ""
+
+#: builtin/remote.c:1058
+#, c-format
+msgid "rebases interactively (with merges) onto remote %s"
+msgstr ""
+
+#: builtin/remote.c:1061
+#, c-format
+msgid "rebases onto remote %s"
+msgstr ""
+
+#: builtin/remote.c:1065
+#, c-format
+msgid " merges with remote %s"
+msgstr ""
+
+#: builtin/remote.c:1068
+#, c-format
+msgid "merges with remote %s"
+msgstr ""
+
+#: builtin/remote.c:1071
+#, c-format
+msgid "%-*s and with remote %s\n"
+msgstr ""
+
+#: builtin/remote.c:1114
+msgid "create"
+msgstr ""
+
+#: builtin/remote.c:1117
+msgid "delete"
+msgstr ""
+
+#: builtin/remote.c:1121
+msgid "up to date"
+msgstr ""
+
+#: builtin/remote.c:1124
+msgid "fast-forwardable"
+msgstr ""
+
+#: builtin/remote.c:1127
+msgid "local out of date"
+msgstr ""
+
+#: builtin/remote.c:1134
+#, c-format
+msgid " %-*s forces to %-*s (%s)"
+msgstr ""
+
+#: builtin/remote.c:1137
+#, c-format
+msgid " %-*s pushes to %-*s (%s)"
+msgstr ""
+
+#: builtin/remote.c:1141
+#, c-format
+msgid " %-*s forces to %s"
+msgstr ""
+
+#: builtin/remote.c:1144
+#, c-format
+msgid " %-*s pushes to %s"
+msgstr ""
+
+#: builtin/remote.c:1212
+msgid "do not query remotes"
+msgstr ""
+
+#: builtin/remote.c:1239
+#, c-format
+msgid "* remote %s"
+msgstr ""
+
+#: builtin/remote.c:1240
+#, c-format
+msgid " Fetch URL: %s"
+msgstr ""
+
+#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+msgid "(no URL)"
+msgstr ""
+
+#. TRANSLATORS: the colon ':' should align
+#. with the one in " Fetch URL: %s"
+#. translation.
+#.
+#: builtin/remote.c:1255 builtin/remote.c:1257
+#, c-format
+msgid " Push URL: %s"
+msgstr ""
+
+#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#, c-format
+msgid " HEAD branch: %s"
+msgstr ""
+
+#: builtin/remote.c:1259
+msgid "(not queried)"
+msgstr ""
+
+#: builtin/remote.c:1261
+msgid "(unknown)"
+msgstr ""
+
+#: builtin/remote.c:1265
+#, c-format
+msgid ""
+" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+msgstr ""
+
+#: builtin/remote.c:1277
+#, c-format
+msgid " Remote branch:%s"
+msgid_plural " Remote branches:%s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/remote.c:1280 builtin/remote.c:1306
+msgid " (status not queried)"
+msgstr ""
+
+#: builtin/remote.c:1289
+msgid " Local branch configured for 'git pull':"
+msgid_plural " Local branches configured for 'git pull':"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/remote.c:1297
+msgid " Local refs will be mirrored by 'git push'"
+msgstr ""
+
+#: builtin/remote.c:1303
+#, 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:1324
+msgid "set refs/remotes/<name>/HEAD according to remote"
+msgstr ""
+
+#: builtin/remote.c:1326
+msgid "delete refs/remotes/<name>/HEAD"
+msgstr ""
+
+#: builtin/remote.c:1341
+msgid "Cannot determine remote HEAD"
+msgstr ""
+
+#: builtin/remote.c:1343
+msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
+msgstr ""
+
+#: builtin/remote.c:1353
+#, c-format
+msgid "Could not delete %s"
+msgstr ""
+
+#: builtin/remote.c:1361
+#, c-format
+msgid "Not a valid ref: %s"
+msgstr ""
+
+#: builtin/remote.c:1363
+#, c-format
+msgid "Could not setup %s"
+msgstr ""
+
+#: builtin/remote.c:1381
+#, c-format
+msgid " %s will become dangling!"
+msgstr ""
+
+#: builtin/remote.c:1382
+#, c-format
+msgid " %s has become dangling!"
+msgstr ""
+
+#: builtin/remote.c:1392
+#, c-format
+msgid "Pruning %s"
+msgstr ""
+
+#: builtin/remote.c:1393
+#, c-format
+msgid "URL: %s"
+msgstr ""
+
+#: builtin/remote.c:1409
+#, c-format
+msgid " * [would prune] %s"
+msgstr ""
+
+#: builtin/remote.c:1412
+#, c-format
+msgid " * [pruned] %s"
+msgstr ""
+
+#: builtin/remote.c:1457
+msgid "prune remotes after fetching"
+msgstr ""
+
+#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#, c-format
+msgid "No such remote '%s'"
+msgstr ""
+
+#: builtin/remote.c:1539
+msgid "add branch"
+msgstr ""
+
+#: builtin/remote.c:1546
+msgid "no remote specified"
+msgstr ""
+
+#: builtin/remote.c:1563
+msgid "query push URLs rather than fetch URLs"
+msgstr ""
+
+#: builtin/remote.c:1565
+msgid "return all URLs"
+msgstr ""
+
+#: builtin/remote.c:1595
+#, c-format
+msgid "no URLs configured for remote '%s'"
+msgstr ""
+
+#: builtin/remote.c:1621
+msgid "manipulate push URLs"
+msgstr ""
+
+#: builtin/remote.c:1623
+msgid "add URL"
+msgstr ""
+
+#: builtin/remote.c:1625
+msgid "delete URLs"
+msgstr ""
+
+#: builtin/remote.c:1632
+msgid "--add --delete doesn't make sense"
+msgstr ""
+
+#: builtin/remote.c:1673
+#, c-format
+msgid "Invalid old URL pattern: %s"
+msgstr ""
+
+#: builtin/remote.c:1681
+#, c-format
+msgid "No such URL found: %s"
+msgstr ""
+
+#: builtin/remote.c:1683
+msgid "Will not delete all non-push URLs"
+msgstr ""
+
+#: builtin/repack.c:26
+msgid "git repack [<options>]"
+msgstr ""
+
+#: builtin/repack.c:31
+msgid ""
+"Incremental repacks are incompatible with bitmap indexes. Use\n"
+"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
+msgstr ""
+
+#: builtin/repack.c:198
+msgid "could not start pack-objects to repack promisor objects"
+msgstr ""
+
+#: builtin/repack.c:270 builtin/repack.c:446
+msgid "repack: Expecting full hex object ID lines only from pack-objects."
+msgstr ""
+
+#: builtin/repack.c:294
+msgid "could not finish pack-objects to repack promisor objects"
+msgstr ""
+
+#: builtin/repack.c:322
+msgid "pack everything in a single pack"
+msgstr ""
+
+#: builtin/repack.c:324
+msgid "same as -a, and turn unreachable objects loose"
+msgstr ""
+
+#: builtin/repack.c:327
+msgid "remove redundant packs, and run git-prune-packed"
+msgstr ""
+
+#: builtin/repack.c:329
+msgid "pass --no-reuse-delta to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:331
+msgid "pass --no-reuse-object to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:333
+msgid "do not run git-update-server-info"
+msgstr ""
+
+#: builtin/repack.c:336
+msgid "pass --local to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:338
+msgid "write bitmap index"
+msgstr ""
+
+#: builtin/repack.c:340
+msgid "pass --delta-islands to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:341
+msgid "approxidate"
+msgstr ""
+
+#: builtin/repack.c:342
+msgid "with -A, do not loosen objects older than this"
+msgstr ""
+
+#: builtin/repack.c:344
+msgid "with -a, repack unreachable objects"
+msgstr ""
+
+#: builtin/repack.c:346
+msgid "size of the window used for delta compression"
+msgstr ""
+
+#: builtin/repack.c:347 builtin/repack.c:353
+msgid "bytes"
+msgstr ""
+
+#: builtin/repack.c:348
+msgid "same as the above, but limit memory size instead of entries count"
+msgstr ""
+
+#: builtin/repack.c:350
+msgid "limits the maximum delta depth"
+msgstr ""
+
+#: builtin/repack.c:352
+msgid "limits the maximum number of threads"
+msgstr ""
+
+#: builtin/repack.c:354
+msgid "maximum size of each packfile"
+msgstr ""
+
+#: builtin/repack.c:356
+msgid "repack objects in packs marked with .keep"
+msgstr ""
+
+#: builtin/repack.c:358
+msgid "do not repack this pack"
+msgstr ""
+
+#: builtin/repack.c:368
+msgid "cannot delete packs in a precious-objects repo"
+msgstr ""
+
+#: builtin/repack.c:372
+msgid "--keep-unreachable and -A are incompatible"
+msgstr ""
+
+#: builtin/repack.c:455
+msgid "Nothing new to pack."
+msgstr ""
+
+#: builtin/repack.c:485
+#, c-format
+msgid "missing required file: %s"
+msgstr ""
+
+#: builtin/repack.c:487
+#, c-format
+msgid "could not unlink: %s"
+msgstr ""
+
+#: builtin/replace.c:22
+msgid "git replace [-f] <object> <replacement>"
+msgstr ""
+
+#: builtin/replace.c:23
+msgid "git replace [-f] --edit <object>"
+msgstr ""
+
+#: builtin/replace.c:24
+msgid "git replace [-f] --graft <commit> [<parent>...]"
+msgstr ""
+
+#: builtin/replace.c:25
+msgid "git replace [-f] --convert-graft-file"
+msgstr ""
+
+#: builtin/replace.c:26
+msgid "git replace -d <object>..."
+msgstr ""
+
+#: builtin/replace.c:27
+msgid "git replace [--format=<format>] [-l [<pattern>]]"
+msgstr ""
+
+#: builtin/replace.c:90
+#, c-format
+msgid ""
+"invalid replace format '%s'\n"
+"valid formats are 'short', 'medium' and 'long'"
+msgstr ""
+
+#: builtin/replace.c:125
+#, c-format
+msgid "replace ref '%s' not found"
+msgstr ""
+
+#: builtin/replace.c:141
+#, c-format
+msgid "Deleted replace ref '%s'"
+msgstr ""
+
+#: builtin/replace.c:153
+#, c-format
+msgid "'%s' is not a valid ref name"
+msgstr ""
+
+#: builtin/replace.c:158
+#, c-format
+msgid "replace ref '%s' already exists"
+msgstr ""
+
+#: 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
+#, c-format
+msgid "unable to open %s for writing"
+msgstr ""
+
+#: builtin/replace.c:242
+msgid "cat-file reported failure"
+msgstr ""
+
+#: builtin/replace.c:258
+#, c-format
+msgid "unable to open %s for reading"
+msgstr ""
+
+#: builtin/replace.c:272
+msgid "unable to spawn mktree"
+msgstr ""
+
+#: builtin/replace.c:276
+msgid "unable to read from mktree"
+msgstr ""
+
+#: builtin/replace.c:285
+msgid "mktree reported failure"
+msgstr ""
+
+#: builtin/replace.c:289
+msgid "mktree did not return an object name"
+msgstr ""
+
+#: builtin/replace.c:298
+#, c-format
+msgid "unable to fstat %s"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/replace.c:326
+#, c-format
+msgid "unable to get object type for %s"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/replace.c:384
+#, c-format
+msgid "could not parse %s as a commit"
+msgstr ""
+
+#: builtin/replace.c:416
+#, c-format
+msgid "bad mergetag in commit '%s'"
+msgstr ""
+
+#: builtin/replace.c:418
+#, c-format
+msgid "malformed mergetag in commit '%s'"
+msgstr ""
+
+#: 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:469
+#, c-format
+msgid "the original commit '%s' has a gpg signature"
+msgstr ""
+
+#: 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 ""
+
+#: 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
+#, c-format
+msgid ""
+"could not convert the following graft(s):\n"
+"%s"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/replace.c:556
+msgid "use this format"
+msgstr ""
+
+#: builtin/replace.c:569
+msgid "--format cannot be used when not listing"
+msgstr ""
+
+#: builtin/replace.c:577
+msgid "-f only makes sense when writing a replacement"
+msgstr ""
+
+#: builtin/replace.c:581
+msgid "--raw only makes sense with --edit"
+msgstr ""
+
+#: 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
+msgid "-e needs exactly one argument"
+msgstr ""
+
+#: builtin/replace.c:605
+msgid "-g needs at least one argument"
+msgstr ""
+
+#: builtin/replace.c:611
+msgid "--convert-graft-file takes no argument"
+msgstr ""
+
+#: builtin/replace.c:617
+msgid "only one pattern can be given with -l"
+msgstr ""
+
+#: builtin/rerere.c:13
+msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
+msgstr ""
+
+#: builtin/rerere.c:60
+msgid "register clean resolutions in index"
+msgstr ""
+
+#: builtin/rerere.c:79
+msgid "'git rerere forget' without paths is deprecated"
+msgstr ""
+
+#: builtin/rerere.c:113
+#, c-format
+msgid "unable to generate diff for '%s'"
+msgstr ""
+
+#: builtin/reset.c:32
+msgid ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+msgstr ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<komit>]"
+
+#: builtin/reset.c:33
+msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
+msgstr "git reset [-q] [<mirip-pohon>] [--] <spek jalur>..."
+
+#: 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]] [<mirip-pohon>]"
+
+#: builtin/reset.c:35
+msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
+msgstr "git reset --patch [<mirip-pohon>] [--] [<pathspec>...]"
+
+#: builtin/reset.c:41
+msgid "mixed"
+msgstr "campuran"
+
+#: builtin/reset.c:41
+msgid "soft"
+msgstr "lunak"
+
+#: builtin/reset.c:41
+msgid "hard"
+msgstr "keras"
+
+#: builtin/reset.c:41
+msgid "merge"
+msgstr "gabungan"
+
+#: builtin/reset.c:41
+msgid "keep"
+msgstr "simpan"
+
+#: builtin/reset.c:83
+msgid "You do not have a valid HEAD."
+msgstr "Anda tidak punya HEAD yang valid."
+
+#: builtin/reset.c:85
+msgid "Failed to find tree of HEAD."
+msgstr "Gagal menemukan pohon HEAD."
+
+#: builtin/reset.c:91
+#, c-format
+msgid "Failed to find tree of %s."
+msgstr "Gagal menemukan pohon dari %s."
+
+#: builtin/reset.c:116
+#, c-format
+msgid "HEAD is now at %s"
+msgstr "HEAD sekarang pada %s"
+
+#: builtin/reset.c:195
+#, c-format
+msgid "Cannot do a %s reset in the middle of a merge."
+msgstr "Tidak dapat lakukan reset %s di tengah-tengah penggabungan."
+
+#: builtin/reset.c:295 builtin/stash.c:587 builtin/stash.c:661
+#: builtin/stash.c:685
+msgid "be quiet, only report errors"
+msgstr "diam, hanya laporkan kesalahan"
+
+#: builtin/reset.c:297
+msgid "reset HEAD and index"
+msgstr "setel ulang HEAD dan indeks"
+
+#: builtin/reset.c:298
+msgid "reset only HEAD"
+msgstr "hanya setel ulang HEAD"
+
+#: builtin/reset.c:300 builtin/reset.c:302
+msgid "reset HEAD, index and working tree"
+msgstr "setel ulang HEAD, indeks dan pohon kerja"
+
+#: builtin/reset.c:304
+msgid "reset HEAD but keep local changes"
+msgstr "setel ulang HEAD tapi simpan perubahan lokal"
+
+#: builtin/reset.c:310
+msgid "record only the fact that removed paths will be added later"
+msgstr "hanya rekam fakta bahwa jalur yang terhapus akan ditambahkan nanti"
+
+#: builtin/reset.c:344
+#, c-format
+msgid "Failed to resolve '%s' as a valid revision."
+msgstr "Gagal menguraikan '%s' sebagai revisi yang valid."
+
+#: builtin/reset.c:352
+#, c-format
+msgid "Failed to resolve '%s' as a valid tree."
+msgstr "Gagal menguraikan '%s' sebagaikan pohon yang valid."
+
+#: builtin/reset.c:361
+msgid "--patch is incompatible with --{hard,mixed,soft}"
+msgstr "--patch tidak kompatibel dengan --{hard,mixed,soft}"
+
+#: builtin/reset.c:371
+msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
+msgstr ""
+"--mixed dengan jalur usang; sebagai gantinya gunakan 'git reset --<jalur>'."
+
+#: builtin/reset.c:373
+#, c-format
+msgid "Cannot do %s reset with paths."
+msgstr "Tidak dapat lakukan reset %s dengan jalur."
+
+#: builtin/reset.c:388
+#, c-format
+msgid "%s reset is not allowed in a bare repository"
+msgstr "Reset %s tidak diperbolehkan dalam repositori bare"
+
+#: builtin/reset.c:392
+msgid "-N can only be used with --mixed"
+msgstr "-N hanya dapat digunakan dengan --mixed"
+
+#: builtin/reset.c:413
+msgid "Unstaged changes after reset:"
+msgstr "Perubahan tak tergelar setelah setel ulang:"
+
+#: 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"
+"Butuh %.2f detik untuk daftar perubahan tak tergelar setelah setel ulang.\n"
+"Anda dapat menggunakan '--quiet' untuk hindari hal ini. Setel konfigurasi\n"
+"reset.quiet ke true untuk membuat hal tersebut asali.\n"
+
+#: builtin/reset.c:434
+#, c-format
+msgid "Could not reset index file to revision '%s'."
+msgstr "Tidak dapat menyetel ulang berkas indeks ke revisi '%s'."
+
+#: builtin/reset.c:439
+msgid "Could not write new index file."
+msgstr "Tidak dapat menulis berkas indeks baru."
+
+#: builtin/rev-list.c:534
+msgid "cannot combine --exclude-promisor-objects and --missing"
+msgstr ""
+
+#: builtin/rev-list.c:595
+msgid "object filtering requires --objects"
+msgstr ""
+
+#: builtin/rev-list.c:651
+msgid "rev-list does not support display of notes"
+msgstr ""
+
+#: builtin/rev-list.c:656
+msgid "marked counting is incompatible with --objects"
+msgstr ""
+
+#: builtin/rev-parse.c:409
+msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/revert.c:24
+msgid "git revert [<options>] <commit-ish>..."
+msgstr ""
+
+#: builtin/revert.c:25
+msgid "git revert <subcommand>"
+msgstr ""
+
+#: builtin/revert.c:30
+msgid "git cherry-pick [<options>] <commit-ish>..."
+msgstr ""
+
+#: builtin/revert.c:31
+msgid "git cherry-pick <subcommand>"
+msgstr ""
+
+#: builtin/revert.c:72
+#, c-format
+msgid "option `%s' expects a number greater than zero"
+msgstr ""
+
+#: builtin/revert.c:92
+#, c-format
+msgid "%s: %s cannot be used with %s"
+msgstr ""
+
+#: 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:239
+msgid "revert failed"
+msgstr ""
+
+#: builtin/revert.c:252
+msgid "cherry-pick failed"
+msgstr ""
+
+#: builtin/rm.c:19
+msgid "git rm [<options>] [--] <file>..."
+msgstr ""
+
+#: 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] ""
+msgstr[1] ""
+
+#: builtin/rm.c:212
+msgid ""
+"\n"
+"(use -f to force removal)"
+msgstr ""
+
+#: 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] ""
+msgstr[1] ""
+
+#: builtin/rm.c:220 builtin/rm.c:229
+msgid ""
+"\n"
+"(use --cached to keep the file, or -f to force removal)"
+msgstr ""
+
+#: builtin/rm.c:226
+msgid "the following file has local modifications:"
+msgid_plural "the following files have local modifications:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: 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 ""
+
+#: builtin/rm.c:323
+#, c-format
+msgid "not removing '%s' recursively without -r"
+msgstr ""
+
+#: builtin/rm.c:362
+#, c-format
+msgid "git rm: unable to remove %s"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/send-pack.c:188
+msgid "remote name"
+msgstr ""
+
+#: builtin/send-pack.c:201
+msgid "use stateless RPC protocol"
+msgstr ""
+
+#: builtin/send-pack.c:202
+msgid "read refs from stdin"
+msgstr ""
+
+#: builtin/send-pack.c:203
+msgid "print status from remote helper"
+msgstr ""
+
+#: builtin/shortlog.c:16
+msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
+msgstr ""
+
+#: builtin/shortlog.c:17
+msgid "git log --pretty=short | git shortlog [<options>]"
+msgstr ""
+
+#: builtin/shortlog.c:123
+msgid "using multiple --group options with stdin is not supported"
+msgstr ""
+
+#: builtin/shortlog.c:133
+msgid "using --group=trailer with stdin is not supported"
+msgstr ""
+
+#: builtin/shortlog.c:323
+#, c-format
+msgid "unknown group type: %s"
+msgstr ""
+
+#: builtin/shortlog.c:351
+msgid "group by committer rather than author"
+msgstr ""
+
+#: builtin/shortlog.c:354
+msgid "sort output according to the number of commits per author"
+msgstr ""
+
+#: builtin/shortlog.c:356
+msgid "suppress commit descriptions, only provides commit count"
+msgstr ""
+
+#: builtin/shortlog.c:358
+msgid "show the email address of each author"
+msgstr ""
+
+#: builtin/shortlog.c:359
+msgid "<w>[,<i1>[,<i2>]]"
+msgstr ""
+
+#: builtin/shortlog.c:360
+msgid "linewrap output"
+msgstr ""
+
+#: builtin/shortlog.c:362
+msgid "field"
+msgstr ""
+
+#: builtin/shortlog.c:363
+msgid "group by field"
+msgstr ""
+
+#: builtin/shortlog.c:391
+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 ""
+
+#: builtin/show-branch.c:17
+msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
+msgstr ""
+
+#: 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] ""
+msgstr[1] ""
+
+#: builtin/show-branch.c:548
+#, c-format
+msgid "no matching refs with %s"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/show-branch.c:653
+msgid "synonym to more=-1"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/show-branch.c:675
+msgid "show <n> most recent ref-log entries starting at base"
+msgstr ""
+
+#: builtin/show-branch.c:711
+msgid ""
+"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+msgstr ""
+
+#: builtin/show-branch.c:735
+msgid "no branches given, and HEAD is not valid"
+msgstr ""
+
+#: builtin/show-branch.c:738
+msgid "--reflog option needs one branch name"
+msgstr ""
+
+#: 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] ""
+msgstr[1] ""
+
+#: builtin/show-branch.c:745
+#, c-format
+msgid "no such ref %s"
+msgstr ""
+
+#: builtin/show-branch.c:831
+#, c-format
+msgid "cannot handle more than %d rev."
+msgid_plural "cannot handle more than %d revs."
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/show-branch.c:835
+#, c-format
+msgid "'%s' is not a valid ref."
+msgstr ""
+
+#: builtin/show-branch.c:838
+#, c-format
+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 | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
+msgstr ""
+
+#: builtin/show-ref.c:13
+msgid "git show-ref --exclude-existing[=<pattern>]"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/show-ref.c:171
+msgid "dereference tags into object IDs"
+msgstr ""
+
+#: builtin/show-ref.c:173
+msgid "only show SHA1 hash using <n> digits"
+msgstr ""
+
+#: builtin/show-ref.c:177
+msgid "do not print results to stdout (useful with --verify)"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/sparse-checkout.c:45
+msgid "git sparse-checkout list"
+msgstr ""
+
+#: builtin/sparse-checkout.c:71
+msgid "this worktree is not sparse (sparse-checkout file may not exist)"
+msgstr ""
+
+#: builtin/sparse-checkout.c:223
+msgid "failed to create directory for sparse-checkout file"
+msgstr ""
+
+#: builtin/sparse-checkout.c:264
+msgid "unable to upgrade repository format to enable worktreeConfig"
+msgstr ""
+
+#: builtin/sparse-checkout.c:266
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr ""
+
+#: builtin/sparse-checkout.c:283
+msgid "git sparse-checkout init [--cone]"
+msgstr ""
+
+#: builtin/sparse-checkout.c:302
+msgid "initialize the sparse-checkout in cone mode"
+msgstr ""
+
+#: builtin/sparse-checkout.c:339
+#, c-format
+msgid "failed to open '%s'"
+msgstr ""
+
+#: builtin/sparse-checkout.c:396
+#, c-format
+msgid "could not normalize path %s"
+msgstr ""
+
+#: builtin/sparse-checkout.c:408
+msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
+msgstr ""
+
+#: builtin/sparse-checkout.c:433
+#, c-format
+msgid "unable to unquote C-style string '%s'"
+msgstr ""
+
+#: builtin/sparse-checkout.c:487 builtin/sparse-checkout.c:511
+msgid "unable to load existing sparse-checkout patterns"
+msgstr ""
+
+#: builtin/sparse-checkout.c:556
+msgid "read patterns from standard in"
+msgstr ""
+
+#: builtin/sparse-checkout.c:571
+msgid "git sparse-checkout reapply"
+msgstr ""
+
+#: builtin/sparse-checkout.c:590
+msgid "git sparse-checkout disable"
+msgstr ""
+
+#: builtin/sparse-checkout.c:618
+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:43
+msgid "git stash show [<options>] [<stash>]"
+msgstr ""
+
+#: 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
+msgid "git stash branch <branchname> [<stash>]"
+msgstr ""
+
+#: 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
+#, c-format
+msgid "'%s' is not a stash-like commit"
+msgstr ""
+
+#: builtin/stash.c:148
+#, c-format
+msgid "Too many revisions specified:%s"
+msgstr ""
+
+#: builtin/stash.c:162
+msgid "No stash entries found."
+msgstr ""
+
+#: builtin/stash.c:176
+#, c-format
+msgid "%s is not a valid reference"
+msgstr ""
+
+#: builtin/stash.c:225
+msgid "git stash clear with arguments is unimplemented"
+msgstr ""
+
+#: builtin/stash.c:429
+#, c-format
+msgid ""
+"WARNING: Untracked file in way of tracked file! Renaming\n"
+" %s -> %s\n"
+" to make room.\n"
+msgstr ""
+
+#: builtin/stash.c:490
+msgid "cannot apply a stash in the middle of a merge"
+msgstr ""
+
+#: builtin/stash.c:501
+#, c-format
+msgid "could not generate diff %s^!."
+msgstr ""
+
+#: builtin/stash.c:508
+msgid "conflicts in index. Try without --index."
+msgstr ""
+
+#: builtin/stash.c:514
+msgid "could not save index tree"
+msgstr ""
+
+#: builtin/stash.c:523
+msgid "could not restore untracked files from stash"
+msgstr ""
+
+#: builtin/stash.c:537
+#, c-format
+msgid "Merging %s with %s"
+msgstr ""
+
+#: builtin/stash.c:547
+msgid "Index was not unstashed."
+msgstr ""
+
+#: builtin/stash.c:589 builtin/stash.c:687
+msgid "attempt to recreate the index"
+msgstr ""
+
+#: builtin/stash.c:633
+#, c-format
+msgid "Dropped %s (%s)"
+msgstr ""
+
+#: builtin/stash.c:636
+#, c-format
+msgid "%s: Could not drop stash entry"
+msgstr ""
+
+#: builtin/stash.c:649
+#, c-format
+msgid "'%s' is not a stash reference"
+msgstr ""
+
+#: builtin/stash.c:699
+msgid "The stash entry is kept in case you need it again."
+msgstr ""
+
+#: builtin/stash.c:722
+msgid "No branch name specified"
+msgstr ""
+
+#: builtin/stash.c:866 builtin/stash.c:903
+#, c-format
+msgid "Cannot update %s with %s"
+msgstr ""
+
+#: builtin/stash.c:884 builtin/stash.c:1538 builtin/stash.c:1603
+msgid "stash message"
+msgstr ""
+
+#: builtin/stash.c:894
+msgid "\"git stash store\" requires one <commit> argument"
+msgstr ""
+
+#: builtin/stash.c:1109
+msgid "No changes selected"
+msgstr ""
+
+#: builtin/stash.c:1209
+msgid "You do not have the initial commit yet"
+msgstr ""
+
+#: builtin/stash.c:1236
+msgid "Cannot save the current index state"
+msgstr ""
+
+#: builtin/stash.c:1245
+msgid "Cannot save the untracked files"
+msgstr ""
+
+#: builtin/stash.c:1256 builtin/stash.c:1265
+msgid "Cannot save the current worktree state"
+msgstr ""
+
+#: builtin/stash.c:1293
+msgid "Cannot record working tree state"
+msgstr ""
+
+#: builtin/stash.c:1342
+msgid "Can't use --patch and --include-untracked or --all at the same time"
+msgstr ""
+
+#: builtin/stash.c:1358
+msgid "Did you forget to 'git add'?"
+msgstr ""
+
+#: builtin/stash.c:1373
+msgid "No local changes to save"
+msgstr ""
+
+#: builtin/stash.c:1380
+msgid "Cannot initialize stash"
+msgstr ""
+
+#: builtin/stash.c:1395
+msgid "Cannot save the current status"
+msgstr ""
+
+#: builtin/stash.c:1400
+#, c-format
+msgid "Saved working directory and index state %s"
+msgstr ""
+
+#: builtin/stash.c:1490
+msgid "Cannot remove worktree changes"
+msgstr ""
+
+#: builtin/stash.c:1529 builtin/stash.c:1594
+msgid "keep index"
+msgstr ""
+
+#: builtin/stash.c:1531 builtin/stash.c:1596
+msgid "stash in patch mode"
+msgstr ""
+
+#: builtin/stash.c:1532 builtin/stash.c:1597
+msgid "quiet mode"
+msgstr ""
+
+#: builtin/stash.c:1534 builtin/stash.c:1599
+msgid "include untracked files in stash"
+msgstr ""
+
+#: builtin/stash.c:1536 builtin/stash.c:1601
+msgid "include ignore files"
+msgstr ""
+
+#: builtin/stash.c:1636
+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 ""
+
+#: builtin/stripspace.c:19
+msgid "git stripspace [-c | --comment-lines]"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819
+msgid "alternative anchor for relative paths"
+msgstr ""
+
+#: builtin/submodule--helper.c:415
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr ""
+
+#: 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:524
+#, c-format
+msgid "Entering '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:527
+#, c-format
+msgid ""
+"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
+msgid "suppress output of entering each submodule command"
+msgstr ""
+
+#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888
+#: 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 ""
+
+#: 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:666
+#, c-format
+msgid "Failed to register url for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:670
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:680
+#, c-format
+msgid "warning: command update mode suggested for submodule '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:687
+#, c-format
+msgid "Failed to register update mode for submodule path '%s'"
+msgstr ""
+
+#: 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 ""
+
+#: 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:835
+#, c-format
+msgid "could not resolve HEAD ref inside the submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457
+#, c-format
+msgid "failed to recurse into submodule '%s'"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/submodule--helper.c:893
+msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
+msgstr ""
+
+#: builtin/submodule--helper.c:917
+msgid "git submodule--helper name <path>"
+msgstr ""
+
+#: 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:1413
+#, c-format
+msgid "failed to register url for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1427
+#, c-format
+msgid "failed to get the default remote for submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1438
+#, c-format
+msgid "failed to update remote for submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1485
+msgid "suppress output of synchronizing submodule url"
+msgstr ""
+
+#: builtin/submodule--helper.c:1492
+msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
+msgstr ""
+
+#: 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:1558
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains local modifications; use '-f' to discard "
+"them"
+msgstr ""
+
+#: builtin/submodule--helper.c:1566
+#, c-format
+msgid "Cleared directory '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:1568
+#, c-format
+msgid "Could not remove submodule work tree '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:1579
+#, c-format
+msgid "could not create empty submodule directory %s"
+msgstr ""
+
+#: builtin/submodule--helper.c:1595
+#, c-format
+msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/submodule--helper.c:1644
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr ""
+
+#: 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:1791
+#, c-format
+msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
+msgstr ""
+
+#: builtin/submodule--helper.c:1798
+#, c-format
+msgid "Value '%s' for submodule.alternateLocation is not recognized"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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: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:1936
+#, c-format
+msgid "Invalid update mode '%s' for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1940
+#, c-format
+msgid "Invalid update mode '%s' configured for submodule path '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:2041
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr ""
+
+#: builtin/submodule--helper.c:2045
+msgid "Maybe you want to use 'update --init'?"
+msgstr ""
+
+#: builtin/submodule--helper.c:2075
+#, c-format
+msgid "Skipping unmerged submodule %s"
+msgstr ""
+
+#: builtin/submodule--helper.c:2104
+#, c-format
+msgid "Skipping submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:2254
+#, c-format
+msgid "Failed to clone '%s'. Retry scheduled"
+msgstr ""
+
+#: builtin/submodule--helper.c:2265
+#, c-format
+msgid "Failed to clone '%s' a second time, aborting"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: builtin/submodule--helper.c:2370
+msgid "bad value for update parameter"
+msgstr ""
+
+#: 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:2541
+#, c-format
+msgid "could not get a repository handle for submodule '%s'"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/submodule--helper.c:2636
+msgid "check if it is safe to write to the .gitmodules file"
+msgstr ""
+
+#: builtin/submodule--helper.c:2639
+msgid "unset the config in the .gitmodules file"
+msgstr ""
+
+#: builtin/submodule--helper.c:2644
+msgid "git submodule--helper config <name> [<value>]"
+msgstr ""
+
+#: builtin/submodule--helper.c:2645
+msgid "git submodule--helper config --unset <name>"
+msgstr ""
+
+#: builtin/submodule--helper.c:2646
+msgid "git submodule--helper config --check-writeable"
+msgstr ""
+
+#: builtin/submodule--helper.c:2665 git-submodule.sh:150
+#, sh-format
+msgid "please make sure that the .gitmodules file is in the working tree"
+msgstr ""
+
+#: 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:441 git.c:714
+#, c-format
+msgid "%s doesn't support --super-prefix"
+msgstr ""
+
+#: builtin/submodule--helper.c:2798
+#, c-format
+msgid "'%s' is not a valid submodule--helper subcommand"
+msgstr ""
+
+#: builtin/symbolic-ref.c:8
+msgid "git symbolic-ref [<options>] <name> [<ref>]"
+msgstr ""
+
+#: builtin/symbolic-ref.c:9
+msgid "git symbolic-ref -d [-q] <name>"
+msgstr ""
+
+#: 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:499
+msgid "reason"
+msgstr ""
+
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
+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 ""
+
+#: builtin/tag.c:27
+msgid "git tag -d <tagname>..."
+msgstr ""
+
+#: 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 ""
+
+#: builtin/tag.c:30
+msgid "git tag -v [--format=<format>] <tagname>..."
+msgstr ""
+
+#: builtin/tag.c:89
+#, c-format
+msgid "tag '%s' not found."
+msgstr ""
+
+#: builtin/tag.c:124
+#, c-format
+msgid "Deleted tag '%s' (was %s)\n"
+msgstr ""
+
+#: builtin/tag.c:159
+#, c-format
+msgid ""
+"\n"
+"Write a message for tag:\n"
+" %s\n"
+"Lines starting with '%c' will be ignored.\n"
+msgstr ""
+
+#: builtin/tag.c:163
+#, 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 ""
+
+#: builtin/tag.c:230
+msgid "unable to sign the tag"
+msgstr ""
+
+#: builtin/tag.c:248
+#, 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:264
+msgid "bad object type."
+msgstr ""
+
+#: builtin/tag.c:317
+msgid "no tag message?"
+msgstr ""
+
+#: builtin/tag.c:324
+#, c-format
+msgid "The tag message has been left in %s\n"
+msgstr ""
+
+#: builtin/tag.c:435
+msgid "list tag names"
+msgstr ""
+
+#: builtin/tag.c:437
+msgid "print <n> lines of each tag message"
+msgstr ""
+
+#: builtin/tag.c:439
+msgid "delete tags"
+msgstr ""
+
+#: builtin/tag.c:440
+msgid "verify tags"
+msgstr ""
+
+#: builtin/tag.c:442
+msgid "Tag creation options"
+msgstr ""
+
+#: builtin/tag.c:444
+msgid "annotated tag, needs a message"
+msgstr ""
+
+#: builtin/tag.c:446
+msgid "tag message"
+msgstr ""
+
+#: builtin/tag.c:448
+msgid "force edit of tag message"
+msgstr ""
+
+#: builtin/tag.c:449
+msgid "annotated and GPG-signed tag"
+msgstr ""
+
+#: builtin/tag.c:452
+msgid "use another key to sign the tag"
+msgstr ""
+
+#: builtin/tag.c:453
+msgid "replace the tag if exists"
+msgstr ""
+
+#: builtin/tag.c:454 builtin/update-ref.c:505
+msgid "create a reflog"
+msgstr ""
+
+#: builtin/tag.c:456
+msgid "Tag listing options"
+msgstr ""
+
+#: builtin/tag.c:457
+msgid "show tag list in columns"
+msgstr ""
+
+#: builtin/tag.c:458 builtin/tag.c:460
+msgid "print only tags that contain the commit"
+msgstr ""
+
+#: builtin/tag.c:459 builtin/tag.c:461
+msgid "print only tags that don't contain the commit"
+msgstr ""
+
+#: builtin/tag.c:462
+msgid "print only tags that are merged"
+msgstr ""
+
+#: builtin/tag.c:463
+msgid "print only tags that are not merged"
+msgstr ""
+
+#: builtin/tag.c:467
+msgid "print only tags of the object"
+msgstr ""
+
+#: builtin/tag.c:515
+msgid "--column and -n are incompatible"
+msgstr ""
+
+#: builtin/tag.c:537
+msgid "-n option is only allowed in list mode"
+msgstr ""
+
+#: builtin/tag.c:539
+msgid "--contains option is only allowed in list mode"
+msgstr ""
+
+#: builtin/tag.c:541
+msgid "--no-contains option is only allowed in list mode"
+msgstr ""
+
+#: builtin/tag.c:543
+msgid "--points-at option is only allowed in list mode"
+msgstr ""
+
+#: builtin/tag.c:545
+msgid "--merged and --no-merged options are only allowed in list mode"
+msgstr ""
+
+#: builtin/tag.c:556
+msgid "only one -F or -m option is allowed."
+msgstr ""
+
+#: builtin/tag.c:581
+#, c-format
+msgid "'%s' is not a valid tag name."
+msgstr ""
+
+#: builtin/tag.c:586
+#, c-format
+msgid "tag '%s' already exists"
+msgstr ""
+
+#: builtin/tag.c:617
+#, c-format
+msgid "Updated tag '%s' (was %s)\n"
+msgstr ""
+
+#: builtin/unpack-objects.c:502
+msgid "Unpacking objects"
+msgstr ""
+
+#: builtin/update-index.c:84
+#, c-format
+msgid "failed to create directory %s"
+msgstr ""
+
+#: builtin/update-index.c:100
+#, c-format
+msgid "failed to create file %s"
+msgstr ""
+
+#: builtin/update-index.c:108
+#, c-format
+msgid "failed to delete file %s"
+msgstr ""
+
+#: builtin/update-index.c:115 builtin/update-index.c:221
+#, c-format
+msgid "failed to delete directory %s"
+msgstr ""
+
+#: builtin/update-index.c:140
+#, c-format
+msgid "Testing mtime in '%s' "
+msgstr ""
+
+#: 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 ""
+
+#: builtin/update-index.c:591
+msgid "git update-index [<options>] [--] [<file>...]"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: builtin/update-index.c:1014
+msgid "mark files as \"index-only\""
+msgstr ""
+
+#: builtin/update-index.c:1017
+msgid "clear skip-worktree bit"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: builtin/update-index.c:1040
+msgid "only update entries that differ from HEAD"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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"
+msgstr ""
+
+#: 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: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: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 ""
+
+#: builtin/update-index.c:1210
+#, c-format
+msgid "Untracked cache enabled for '%s'"
+msgstr ""
+
+#: builtin/update-index.c:1218
+msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
+msgstr ""
+
+#: builtin/update-index.c:1222
+msgid "fsmonitor enabled"
+msgstr ""
+
+#: builtin/update-index.c:1225
+msgid ""
+"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
+msgstr ""
+
+#: builtin/update-index.c:1229
+msgid "fsmonitor disabled"
+msgstr ""
+
+#: builtin/update-ref.c:10
+msgid "git update-ref [<options>] -d <refname> [<old-val>]"
+msgstr ""
+
+#: builtin/update-ref.c:11
+msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
+msgstr ""
+
+#: builtin/update-ref.c:12
+msgid "git update-ref [<options>] --stdin [-z]"
+msgstr ""
+
+#: builtin/update-ref.c:500
+msgid "delete the reference"
+msgstr ""
+
+#: builtin/update-ref.c:502
+msgid "update <refname> not the one it points to"
+msgstr ""
+
+#: builtin/update-ref.c:503
+msgid "stdin has NUL-terminated arguments"
+msgstr ""
+
+#: builtin/update-ref.c:504
+msgid "read updates from stdin"
+msgstr ""
+
+#: builtin/update-server-info.c:7
+msgid "git update-server-info [--force]"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: builtin/upload-pack.c:29
+msgid "interrupt transfer after <n> seconds of inactivity"
+msgstr ""
+
+#: builtin/verify-commit.c:19
+msgid "git verify-commit [-v | --verbose] <commit>..."
+msgstr ""
+
+#: 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 ""
+
+#: builtin/verify-pack.c:59
+msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
+msgstr ""
+
+#: 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 ""
+
+#: builtin/verify-tag.c:36
+msgid "print tag contents"
+msgstr ""
+
+#: builtin/worktree.c:18
+msgid "git worktree add [<options>] <path> [<commit-ish>]"
+msgstr ""
+
+#: builtin/worktree.c:19
+msgid "git worktree list [<options>]"
+msgstr ""
+
+#: builtin/worktree.c:20
+msgid "git worktree lock [<options>] <path>"
+msgstr ""
+
+#: builtin/worktree.c:21
+msgid "git worktree move <worktree> <new-path>"
+msgstr ""
+
+#: builtin/worktree.c:22
+msgid "git worktree prune [<options>]"
+msgstr ""
+
+#: builtin/worktree.c:23
+msgid "git worktree remove [<options>] <worktree>"
+msgstr ""
+
+#: builtin/worktree.c:24
+msgid "git worktree unlock <path>"
+msgstr ""
+
+#: builtin/worktree.c:61 builtin/worktree.c:933
+#, c-format
+msgid "failed to delete '%s'"
+msgstr ""
+
+#: builtin/worktree.c:74
+#, c-format
+msgid "Removing %s/%s: %s"
+msgstr ""
+
+#: builtin/worktree.c:149
+msgid "report pruned working trees"
+msgstr ""
+
+#: builtin/worktree.c:151
+msgid "expire working trees older than <time>"
+msgstr ""
+
+#: builtin/worktree.c:221
+#, c-format
+msgid "'%s' already exists"
+msgstr ""
+
+#: builtin/worktree.c:230
+#, c-format
+msgid "unusable worktree destination '%s'"
+msgstr ""
+
+#: builtin/worktree.c:235
+#, 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:237
+#, 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:288
+#, c-format
+msgid "could not create directory of '%s'"
+msgstr ""
+
+#: builtin/worktree.c:422 builtin/worktree.c:428
+#, c-format
+msgid "Preparing worktree (new branch '%s')"
+msgstr ""
+
+#: builtin/worktree.c:424
+#, c-format
+msgid "Preparing worktree (resetting branch '%s'; was at %s)"
+msgstr ""
+
+#: builtin/worktree.c:433
+#, c-format
+msgid "Preparing worktree (checking out '%s')"
+msgstr ""
+
+#: builtin/worktree.c:439
+#, c-format
+msgid "Preparing worktree (detached HEAD %s)"
+msgstr ""
+
+#: builtin/worktree.c:480
+msgid "checkout <branch> even if already checked out in other worktree"
+msgstr ""
+
+#: builtin/worktree.c:483
+msgid "create a new branch"
+msgstr ""
+
+#: builtin/worktree.c:485
+msgid "create or reset a branch"
+msgstr ""
+
+#: builtin/worktree.c:487
+msgid "populate the new working tree"
+msgstr ""
+
+#: builtin/worktree.c:488
+msgid "keep the new working tree locked"
+msgstr ""
+
+#: builtin/worktree.c:491
+msgid "set up tracking mode (see git-branch(1))"
+msgstr ""
+
+#: builtin/worktree.c:494
+msgid "try to match the new branch name with a remote-tracking branch"
+msgstr ""
+
+#: builtin/worktree.c:502
+msgid "-b, -B, and --detach are mutually exclusive"
+msgstr ""
+
+#: builtin/worktree.c:563
+msgid "--[no-]track can only be used if a new branch is created"
+msgstr ""
+
+#: builtin/worktree.c:680
+msgid "show extended annotations and reasons, if available"
+msgstr ""
+
+#: builtin/worktree.c:682
+msgid "add 'prunable' annotation to worktrees older than <time>"
+msgstr ""
+
+#: builtin/worktree.c:691
+msgid "--verbose and --porcelain are mutually exclusive"
+msgstr ""
+
+#: builtin/worktree.c:718
+msgid "reason for locking"
+msgstr ""
+
+#: builtin/worktree.c:730 builtin/worktree.c:763 builtin/worktree.c:837
+#: builtin/worktree.c:961
+#, c-format
+msgid "'%s' is not a working tree"
+msgstr ""
+
+#: builtin/worktree.c:732 builtin/worktree.c:765
+msgid "The main working tree cannot be locked or unlocked"
+msgstr ""
+
+#: builtin/worktree.c:737
+#, c-format
+msgid "'%s' is already locked, reason: %s"
+msgstr ""
+
+#: builtin/worktree.c:739
+#, c-format
+msgid "'%s' is already locked"
+msgstr ""
+
+#: builtin/worktree.c:767
+#, c-format
+msgid "'%s' is not locked"
+msgstr ""
+
+#: builtin/worktree.c:808
+msgid "working trees containing submodules cannot be moved or removed"
+msgstr ""
+
+#: builtin/worktree.c:816
+msgid "force move even if worktree is dirty or locked"
+msgstr ""
+
+#: builtin/worktree.c:839 builtin/worktree.c:963
+#, c-format
+msgid "'%s' is a main working tree"
+msgstr ""
+
+#: builtin/worktree.c:844
+#, c-format
+msgid "could not figure out destination name from '%s'"
+msgstr ""
+
+#: builtin/worktree.c:857
+#, 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:859
+msgid ""
+"cannot move a locked working tree;\n"
+"use 'move -f -f' to override or unlock first"
+msgstr ""
+
+#: builtin/worktree.c:862
+#, c-format
+msgid "validation failed, cannot move working tree: %s"
+msgstr ""
+
+#: builtin/worktree.c:867
+#, c-format
+msgid "failed to move '%s' to '%s'"
+msgstr ""
+
+#: builtin/worktree.c:913
+#, c-format
+msgid "failed to run 'git status' on '%s'"
+msgstr ""
+
+#: builtin/worktree.c:917
+#, c-format
+msgid "'%s' contains modified or untracked files, use --force to delete it"
+msgstr ""
+
+#: builtin/worktree.c:922
+#, c-format
+msgid "failed to run 'git status' on '%s', code %d"
+msgstr ""
+
+#: builtin/worktree.c:945
+msgid "force removal even if worktree is dirty or locked"
+msgstr ""
+
+#: builtin/worktree.c:968
+#, 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:970
+msgid ""
+"cannot remove a locked working tree;\n"
+"use 'remove -f -f' to override or unlock first"
+msgstr ""
+
+#: builtin/worktree.c:973
+#, c-format
+msgid "validation failed, cannot remove working tree: %s"
+msgstr ""
+
+#: builtin/worktree.c:997
+#, c-format
+msgid "repair: %s: %s"
+msgstr ""
+
+#: builtin/worktree.c:1000
+#, c-format
+msgid "error: %s: %s"
+msgstr ""
+
+#: builtin/write-tree.c:15
+msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
+msgstr ""
+
+#: 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:118
+#, c-format
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr ""
+
+#: http-fetch.c:128
+msgid "not a git repository"
+msgstr ""
+
+#: http-fetch.c:134
+msgid "--packfile requires --index-pack-args"
+msgstr ""
+
+#: http-fetch.c:143
+msgid "--index-pack-args can only be used with --packfile"
+msgstr ""
+
+#: t/helper/test-fast-rebase.c:141
+msgid "unhandled options"
+msgstr ""
+
+#: t/helper/test-fast-rebase.c:146
+msgid "error preparing revisions"
+msgstr ""
+
+#: t/helper/test-reach.c:154
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr ""
+
+#: 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 ""
+
+#: 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"
+" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
+" <command> [<args>]"
+msgstr ""
+
+#: git.c:36
+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.c:188
+#, c-format
+msgid "no directory given for --git-dir\n"
+msgstr ""
+
+#: git.c:202
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr ""
+
+#: git.c:216
+#, c-format
+msgid "no directory given for --work-tree\n"
+msgstr ""
+
+#: git.c:230
+#, c-format
+msgid "no prefix given for --super-prefix\n"
+msgstr ""
+
+#: git.c:252
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr ""
+
+#: git.c:292
+#, c-format
+msgid "no directory given for -C\n"
+msgstr ""
+
+#: git.c:318
+#, c-format
+msgid "unknown option: %s\n"
+msgstr ""
+
+#: git.c:367
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr ""
+
+#: git.c:376
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+
+#: git.c:383
+#, c-format
+msgid "empty alias for %s"
+msgstr ""
+
+#: git.c:386
+#, c-format
+msgid "recursive alias: %s"
+msgstr ""
+
+#: git.c:468
+msgid "write failure on standard output"
+msgstr ""
+
+#: git.c:470
+msgid "unknown write failure on standard output"
+msgstr ""
+
+#: git.c:472
+msgid "close failed on standard output"
+msgstr ""
+
+#: git.c:823
+#, c-format
+msgid "alias loop detected: expansion of '%s' does not terminate:%s"
+msgstr ""
+
+#: git.c:873
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr ""
+
+#: git.c:886
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+
+#: git.c:906
+#, c-format
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
+msgstr ""
+
+#: git.c:918
+#, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr ""
+
+#: 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 ""
+
+#: http.c:429
+msgid "Public key pinning not supported with cURL < 7.44.0"
+msgstr ""
+
+#: http.c:910
+msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
+msgstr ""
+
+#: http.c:989
+msgid "Protocol restrictions not supported with cURL < 7.19.4"
+msgstr ""
+
+#: 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
+#, c-format
+msgid "Could not set SSL backend to '%s': already set"
+msgstr ""
+
+#: http.c:2025
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+" asked for: %s\n"
+" redirect: %s"
+msgstr ""
+
+#: remote-curl.c:183
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr ""
+
+#: remote-curl.c:307
+#, c-format
+msgid "%sinfo/refs not valid: is this a git repository?"
+msgstr ""
+
+#: remote-curl.c:408
+msgid "invalid server response; expected service, got flush packet"
+msgstr ""
+
+#: remote-curl.c:439
+#, c-format
+msgid "invalid server response; got '%s'"
+msgstr ""
+
+#: remote-curl.c:499
+#, c-format
+msgid "repository '%s' not found"
+msgstr ""
+
+#: remote-curl.c:503
+#, c-format
+msgid "Authentication failed for '%s'"
+msgstr ""
+
+#: remote-curl.c:507
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr ""
+
+#: remote-curl.c:513
+#, c-format
+msgid "redirecting to %s"
+msgstr ""
+
+#: remote-curl.c:642
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr ""
+
+#: remote-curl.c:654
+msgid "remote server sent stateless separator"
+msgstr ""
+
+#: remote-curl.c:724
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr ""
+
+#: remote-curl.c:754
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr ""
+
+#: remote-curl.c:756
+msgid "remote-curl: unexpected response end packet"
+msgstr ""
+
+#: remote-curl.c:832
+#, c-format
+msgid "RPC failed; %s"
+msgstr ""
+
+#: remote-curl.c:872
+msgid "cannot handle pushes this big"
+msgstr ""
+
+#: remote-curl.c:987
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr ""
+
+#: remote-curl.c:991
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr ""
+
+#: remote-curl.c:1041
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr ""
+
+#: remote-curl.c:1043
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr ""
+
+#: remote-curl.c:1132
+msgid "dumb http transport does not support shallow capabilities"
+msgstr ""
+
+#: remote-curl.c:1147
+msgid "fetch failed."
+msgstr ""
+
+#: remote-curl.c:1193
+msgid "cannot fetch by sha1 over smart http"
+msgstr ""
+
+#: remote-curl.c:1237 remote-curl.c:1243
+#, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr ""
+
+#: remote-curl.c:1255 remote-curl.c:1373
+#, c-format
+msgid "http transport does not support %s"
+msgstr ""
+
+#: remote-curl.c:1291
+msgid "git-http-push failed"
+msgstr ""
+
+#: remote-curl.c:1479
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr ""
+
+#: remote-curl.c:1511
+msgid "remote-curl: error reading command stream from git"
+msgstr ""
+
+#: remote-curl.c:1518
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr ""
+
+#: remote-curl.c:1559
+#, 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
+msgid "no libc information available\n"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: ref-filter.h:99
+msgid "key"
+msgstr ""
+
+#: ref-filter.h:99
+msgid "field name to sort on"
+msgstr ""
+
+#: rerere.h:44
+msgid "update the index with reused conflict resolution if possible"
+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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: command-list.h:63
+msgid "Debug gitignore / exclude files"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 "Run a Git command on a list of repositories"
+msgstr ""
+
+#: command-list.h:100
+msgid "Prepare patches for e-mail submission"
+msgstr ""
+
+#: command-list.h:101
+msgid "Verifies the connectivity and validity of the objects in the database"
+msgstr ""
+
+#: command-list.h:102
+msgid "Cleanup unnecessary files and optimize the local repository"
+msgstr ""
+
+#: command-list.h:103
+msgid "Extract commit ID from an archive created using git-archive"
+msgstr ""
+
+#: command-list.h:104
+msgid "Print lines matching a pattern"
+msgstr ""
+
+#: command-list.h:105
+msgid "A portable graphical interface to Git"
+msgstr ""
+
+#: command-list.h:106
+msgid "Compute object ID and optionally creates a blob from a file"
+msgstr ""
+
+#: command-list.h:107
+msgid "Display help information about Git"
+msgstr ""
+
+#: command-list.h:108
+msgid "Server side implementation of Git over HTTP"
+msgstr ""
+
+#: command-list.h:109
+msgid "Download from a remote Git repository via HTTP"
+msgstr ""
+
+#: command-list.h:110
+msgid "Push objects over HTTP/DAV to another repository"
+msgstr ""
+
+#: command-list.h:111
+msgid "Send a collection of patches from stdin to an IMAP folder"
+msgstr ""
+
+#: command-list.h:112
+msgid "Build pack index file for an existing packed archive"
+msgstr ""
+
+#: command-list.h:113
+msgid "Create an empty Git repository or reinitialize an existing one"
+msgstr ""
+
+#: command-list.h:114
+msgid "Instantly browse your working repository in gitweb"
+msgstr ""
+
+#: command-list.h:115
+msgid "Add or parse structured information in commit messages"
+msgstr ""
+
+#: command-list.h:116
+msgid "The Git repository browser"
+msgstr ""
+
+#: command-list.h:117
+msgid "Show commit logs"
+msgstr ""
+
+#: command-list.h:118
+msgid "Show information about files in the index and the working tree"
+msgstr ""
+
+#: command-list.h:119
+msgid "List references in a remote repository"
+msgstr ""
+
+#: command-list.h:120
+msgid "List the contents of a tree object"
+msgstr ""
+
+#: command-list.h:121
+msgid "Extracts patch and authorship from a single e-mail message"
+msgstr ""
+
+#: command-list.h:122
+msgid "Simple UNIX mbox splitter program"
+msgstr ""
+
+#: command-list.h:123
+msgid "Run tasks to optimize Git repository data"
+msgstr ""
+
+#: command-list.h:124
+msgid "Join two or more development histories together"
+msgstr ""
+
+#: command-list.h:125
+msgid "Find as good common ancestors as possible for a merge"
+msgstr ""
+
+#: command-list.h:126
+msgid "Run a three-way file merge"
+msgstr ""
+
+#: command-list.h:127
+msgid "Run a merge for files needing merging"
+msgstr ""
+
+#: command-list.h:128
+msgid "The standard helper program to use with git-merge-index"
+msgstr ""
+
+#: command-list.h:129
+msgid "Run merge conflict resolution tools to resolve merge conflicts"
+msgstr ""
+
+#: command-list.h:130
+msgid "Show three-way merge without touching index"
+msgstr ""
+
+#: command-list.h:131
+msgid "Write and verify multi-pack-indexes"
+msgstr ""
+
+#: command-list.h:132
+msgid "Creates a tag object with extra validation"
+msgstr ""
+
+#: command-list.h:133
+msgid "Build a tree-object from ls-tree formatted text"
+msgstr ""
+
+#: command-list.h:134
+msgid "Move or rename a file, a directory, or a symlink"
+msgstr ""
+
+#: command-list.h:135
+msgid "Find symbolic names for given revs"
+msgstr ""
+
+#: command-list.h:136
+msgid "Add or inspect object notes"
+msgstr ""
+
+#: command-list.h:137
+msgid "Import from and submit to Perforce repositories"
+msgstr ""
+
+#: command-list.h:138
+msgid "Create a packed archive of objects"
+msgstr ""
+
+#: command-list.h:139
+msgid "Find redundant pack files"
+msgstr ""
+
+#: command-list.h:140
+msgid "Pack heads and tags for efficient repository access"
+msgstr ""
+
+#: command-list.h:141
+msgid "Compute unique ID for a patch"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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
+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 ""
+
+#: 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 ""
+
+#: command-list.h:183
+msgid "Creates a temporary file with a blob's contents"
+msgstr ""
+
+#: 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 ""
+
+#: command-list.h:189
+msgid "Send objects packed back to git-fetch-pack"
+msgstr ""
+
+#: command-list.h:190
+msgid "Show a Git logical variable"
+msgstr ""
+
+#: command-list.h:191
+msgid "Check the GPG signature of commits"
+msgstr ""
+
+#: command-list.h:192
+msgid "Validate packed Git archive files"
+msgstr ""
+
+#: command-list.h:193
+msgid "Check the GPG signature of tags"
+msgstr ""
+
+#: command-list.h:194
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr ""
+
+#: 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 ""
+
+#: 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
+msgid "Tweaking diff output"
+msgstr ""
+
+#: 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
+msgid "A Git Glossary"
+msgstr ""
+
+#: command-list.h:207
+msgid "Hooks used by Git"
+msgstr ""
+
+#: command-list.h:208
+msgid "Specifies intentionally untracked files to ignore"
+msgstr ""
+
+#: command-list.h:209
+msgid "Map author/committer names and/or E-Mail addresses"
+msgstr ""
+
+#: command-list.h:210
+msgid "Defining submodule properties"
+msgstr ""
+
+#: command-list.h:211
+msgid "Git namespaces"
+msgstr ""
+
+#: command-list.h:212
+msgid "Helper programs to interact with remote repositories"
+msgstr ""
+
+#: command-list.h:213
+msgid "Git Repository Layout"
+msgstr ""
+
+#: command-list.h:214
+msgid "Specifying revisions and ranges for Git"
+msgstr ""
+
+#: command-list.h:215
+msgid "Mounting one repository inside another"
+msgstr ""
+
+#: command-list.h:216
+msgid "A tutorial introduction to Git: part two"
+msgstr ""
+
+#: command-list.h:217
+msgid "A tutorial introduction to Git"
+msgstr ""
+
+#: command-list.h:218
+msgid "An overview of recommended workflows with Git"
+msgstr ""
+
+#: git-bisect.sh:68
+msgid "bisect run failed: no command provided."
+msgstr ""
+
+#: git-bisect.sh:73
+#, sh-format
+msgid "running $command"
+msgstr ""
+
+#: git-bisect.sh:80
+#, sh-format
+msgid ""
+"bisect run failed:\n"
+"exit code $res from '$command' is < 0 or >= 128"
+msgstr ""
+
+#: git-bisect.sh:105
+msgid "bisect run cannot continue any more"
+msgstr ""
+
+#: git-bisect.sh:111
+#, sh-format
+msgid ""
+"bisect run failed:\n"
+"'bisect-state $state' exited with error code $res"
+msgstr ""
+
+#: git-bisect.sh:118
+msgid "bisect run success"
+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 ""
+
+#: git-merge-octopus.sh:77
+#, sh-format
+msgid "Already up to date with $pretty_name"
+msgstr ""
+
+#: git-merge-octopus.sh:89
+#, sh-format
+msgid "Fast-forwarding to: $pretty_name"
+msgstr ""
+
+#: git-merge-octopus.sh:97
+#, sh-format
+msgid "Trying simple merge with $pretty_name"
+msgstr ""
+
+#: git-merge-octopus.sh:102
+msgid "Simple merge did not work, trying automatic merge."
+msgstr ""
+
+#: git-submodule.sh:179
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr ""
+
+#: git-submodule.sh:189
+#, sh-format
+msgid "repo URL: '$repo' must be absolute or begin with ./|../"
+msgstr ""
+
+#: git-submodule.sh:208
+#, sh-format
+msgid "'$sm_path' already exists in the index"
+msgstr ""
+
+#: git-submodule.sh:211
+#, sh-format
+msgid "'$sm_path' already exists in the index and is not a submodule"
+msgstr ""
+
+#: git-submodule.sh:218
+#, sh-format
+msgid "'$sm_path' does not have a commit checked out"
+msgstr ""
+
+#: git-submodule.sh:249
+#, sh-format
+msgid "Adding existing repo at '$sm_path' to the index"
+msgstr ""
+
+#: git-submodule.sh:251
+#, sh-format
+msgid "'$sm_path' already exists and is not a valid git repo"
+msgstr ""
+
+#: git-submodule.sh:259
+#, sh-format
+msgid "A git directory for '$sm_name' is found locally with remote(s):"
+msgstr ""
+
+#: git-submodule.sh:261
+#, 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-submodule.sh:267
+#, sh-format
+msgid "Reactivating local git directory for submodule '$sm_name'."
+msgstr ""
+
+#: git-submodule.sh:279
+#, sh-format
+msgid "Unable to checkout submodule '$sm_path'"
+msgstr ""
+
+#: git-submodule.sh:284
+#, sh-format
+msgid "Failed to add submodule '$sm_path'"
+msgstr ""
+
+#: git-submodule.sh:293
+#, sh-format
+msgid "Failed to register submodule '$sm_path'"
+msgstr ""
+
+#: git-submodule.sh:568
+#, sh-format
+msgid "Unable to find current revision in submodule path '$displaypath'"
+msgstr ""
+
+#: git-submodule.sh:578
+#, sh-format
+msgid "Unable to fetch in submodule path '$sm_path'"
+msgstr ""
+
+#: git-submodule.sh:583
+#, sh-format
+msgid ""
+"Unable to find current ${remote_name}/${branch} revision in submodule path "
+"'$sm_path'"
+msgstr ""
+
+#: git-submodule.sh:601
+#, sh-format
+msgid ""
+"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
+"$sha1:"
+msgstr ""
+
+#: git-submodule.sh:607
+#, sh-format
+msgid ""
+"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
+"Direct fetching of that commit failed."
+msgstr ""
+
+#: git-submodule.sh:614
+#, sh-format
+msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
+msgstr ""
+
+#: git-submodule.sh:615
+#, sh-format
+msgid "Submodule path '$displaypath': checked out '$sha1'"
+msgstr ""
+
+#: git-submodule.sh:619
+#, sh-format
+msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
+msgstr ""
+
+#: git-submodule.sh:620
+#, sh-format
+msgid "Submodule path '$displaypath': rebased into '$sha1'"
+msgstr ""
+
+#: git-submodule.sh:625
+#, sh-format
+msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
+msgstr ""
+
+#: git-submodule.sh:626
+#, sh-format
+msgid "Submodule path '$displaypath': merged in '$sha1'"
+msgstr ""
+
+#: git-submodule.sh:631
+#, sh-format
+msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
+msgstr ""
+
+#: git-submodule.sh:632
+#, sh-format
+msgid "Submodule path '$displaypath': '$command $sha1'"
+msgstr ""
+
+#: git-submodule.sh:663
+#, sh-format
+msgid "Failed to recurse into submodule path '$displaypath'"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:109
+msgid "Applied autostash."
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:112
+#, sh-format
+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: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 ""
+
+#: 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 ""
+
+#: git-rebase--preserve-merges.sh:285
+#, sh-format
+msgid "$sha1: not a commit that can be picked"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:324
+#, sh-format
+msgid "Invalid commit name: $sha1"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:354
+msgid "Cannot write current commit's replacement sha1"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:405
+#, sh-format
+msgid "Fast-forward to $sha1"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:407
+#, sh-format
+msgid "Cannot fast-forward to $sha1"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:416
+#, sh-format
+msgid "Cannot move HEAD to $first_parent"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:421
+#, sh-format
+msgid "Refusing to squash a merge: $sha1"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:439
+#, sh-format
+msgid "Error redoing merge $sha1"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:448
+#, sh-format
+msgid "Could not pick $sha1"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:457
+#, sh-format
+msgid "This is the commit message #${n}:"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:462
+#, sh-format
+msgid "The commit message #${n} will be skipped:"
+msgstr ""
+
+#: 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:482
+#, sh-format
+msgid "Cannot write $fixup_msg"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:485
+msgid "This is a combination of 2 commits."
+msgstr ""
+
+#: 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: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 ""
+
+#: git-rebase--preserve-merges.sh:616
+#, sh-format
+msgid "Stopped at $sha1_abbrev... $rest"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:631
+#, sh-format
+msgid "Cannot '$squash_style' without a previous commit"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:673
+#, sh-format
+msgid "Executing: $rest"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:681
+#, sh-format
+msgid "Execution failed: $rest"
+msgstr ""
+
+#: 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 ""
+
+#. 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 ""
+
+#: git-rebase--preserve-merges.sh:709
+#, sh-format
+msgid "Unknown command: $command $sha1 $rest"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:710
+msgid "Please fix this using 'git rebase --edit-todo'."
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:745
+#, sh-format
+msgid "Successfully rebased and updated $head_name."
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:802
+msgid "Could not remove CHERRY_PICK_HEAD"
+msgstr ""
+
+#: 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 ""
+
+#: 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--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 ""
+
+#: git-rebase--preserve-merges.sh:897
+msgid "No HEAD?"
+msgstr ""
+
+#: git-rebase--preserve-merges.sh:898
+#, sh-format
+msgid "Could not create temporary $state_dir"
+msgstr ""
+
+#: 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] ""
+msgstr[1] ""
+
+#: 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 ""
+
+#: git-sh-setup.sh:191
+#, sh-format
+msgid "Cannot chdir to $cdup, the toplevel of the working tree"
+msgstr ""
+
+#: git-sh-setup.sh:200 git-sh-setup.sh:207
+#, sh-format
+msgid "fatal: $program_name cannot be used without a working tree."
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#. TRANSLATORS: you can adjust this to align "git add -i" status menu
+#: git-add--interactive.perl:212
+#, perl-format
+msgid "%12s %12s %s"
+msgstr ""
+
+#: git-add--interactive.perl:632
+#, perl-format
+msgid "touched %d path\n"
+msgid_plural "touched %d paths\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: git-add--interactive.perl:1056
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for staging."
+msgstr ""
+
+#: git-add--interactive.perl:1059
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for stashing."
+msgstr ""
+
+#: git-add--interactive.perl:1062
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for unstaging."
+msgstr ""
+
+#: git-add--interactive.perl:1065 git-add--interactive.perl:1074
+#: git-add--interactive.perl:1080
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for applying."
+msgstr ""
+
+#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
+#: git-add--interactive.perl:1077
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for discarding."
+msgstr ""
+
+#: git-add--interactive.perl:1114
+#, perl-format
+msgid "failed to open hunk edit file for writing: %s"
+msgstr ""
+
+#: git-add--interactive.perl:1121
+#, 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 ""
+
+#: git-add--interactive.perl:1143
+#, perl-format
+msgid "failed to open hunk edit file for reading: %s"
+msgstr ""
+
+#: git-add--interactive.perl:1251
+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 ""
+
+#: git-add--interactive.perl:1257
+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 ""
+
+#: git-add--interactive.perl:1263
+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 ""
+
+#: git-add--interactive.perl:1269
+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 ""
+
+#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
+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 ""
+
+#: git-add--interactive.perl:1281
+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 ""
+
+#: git-add--interactive.perl:1287
+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 ""
+
+#: git-add--interactive.perl:1299
+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 ""
+
+#: git-add--interactive.perl:1314
+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 ""
+
+#: git-add--interactive.perl:1345
+msgid "The selected hunks do not apply to the index!\n"
+msgstr ""
+
+#: git-add--interactive.perl:1360
+#, perl-format
+msgid "ignoring unmerged: %s\n"
+msgstr ""
+
+#: git-add--interactive.perl:1479
+#, perl-format
+msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1480
+#, perl-format
+msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1481
+#, perl-format
+msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1482
+#, perl-format
+msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1599
+msgid "No other hunks to goto\n"
+msgstr ""
+
+#: git-add--interactive.perl:1617
+#, perl-format
+msgid "Invalid number: '%s'\n"
+msgstr ""
+
+#: git-add--interactive.perl:1622
+#, 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:1657
+msgid "No other hunks to search\n"
+msgstr ""
+
+#: git-add--interactive.perl:1674
+#, perl-format
+msgid "Malformed search regexp %s: %s\n"
+msgstr ""
+
+#: git-add--interactive.perl:1684
+msgid "No hunk matches the given pattern\n"
+msgstr ""
+
+#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
+msgid "No previous hunk\n"
+msgstr ""
+
+#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
+msgid "No next hunk\n"
+msgstr ""
+
+#: git-add--interactive.perl:1730
+msgid "Sorry, cannot split this hunk\n"
+msgstr ""
+
+#: git-add--interactive.perl:1736
+#, perl-format
+msgid "Split into %d hunk.\n"
+msgid_plural "Split into %d hunks.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: git-add--interactive.perl:1746
+msgid "Sorry, cannot edit this hunk\n"
+msgstr ""
+
+#. TRANSLATORS: please do not translate the command names
+#. 'status', 'update', 'revert', etc.
+#: git-add--interactive.perl:1811
+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 ""
+
+#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
+#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
+#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
+#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
+msgid "missing --"
+msgstr ""
+
+#: git-add--interactive.perl:1866
+#, perl-format
+msgid "unknown --patch mode: %s"
+msgstr ""
+
+#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
+#, perl-format
+msgid "invalid argument %s, expecting --"
+msgstr ""
+
+#: git-send-email.perl:138
+msgid "local zone differs from GMT by a non-minute interval\n"
+msgstr ""
+
+#: git-send-email.perl:145 git-send-email.perl:151
+msgid "local time offset greater than or equal to 24 hours\n"
+msgstr ""
+
+#: 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 ""
+
+#: git-send-email.perl:317
+#, perl-format
+msgid "'%s.final' contains the composed email.\n"
+msgstr ""
+
+#: git-send-email.perl:410
+msgid "--dump-aliases incompatible with other options\n"
+msgstr ""
+
+#: 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: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 ""
+
+#: git-send-email.perl:536
+#, perl-format
+msgid "Unknown --confirm setting: '%s'\n"
+msgstr ""
+
+#: git-send-email.perl:564
+#, perl-format
+msgid "warning: sendmail alias with quotes is not supported: %s\n"
+msgstr ""
+
+#: git-send-email.perl:566
+#, perl-format
+msgid "warning: `:include:` not supported: %s\n"
+msgstr ""
+
+#: git-send-email.perl:568
+#, perl-format
+msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
+msgstr ""
+
+#: git-send-email.perl:573
+#, perl-format
+msgid "warning: sendmail line is not recognized: %s\n"
+msgstr ""
+
+#: 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 ""
+
+#: git-send-email.perl:678
+#, perl-format
+msgid "Failed to opendir %s: %s"
+msgstr ""
+
+#: git-send-email.perl:702
+#, perl-format
+msgid ""
+"fatal: %s: %s\n"
+"warning: no patches were sent\n"
+msgstr ""
+
+#: git-send-email.perl:713
+msgid ""
+"\n"
+"No patch files specified!\n"
+"\n"
+msgstr ""
+
+#: git-send-email.perl:726
+#, perl-format
+msgid "No subject line in %s?"
+msgstr ""
+
+#: git-send-email.perl:736
+#, perl-format
+msgid "Failed to open for writing %s: %s"
+msgstr ""
+
+#: 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-send-email.perl:771
+#, perl-format
+msgid "Failed to open %s: %s"
+msgstr ""
+
+#: git-send-email.perl:788
+#, perl-format
+msgid "Failed to open %s.final: %s"
+msgstr ""
+
+#: 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:866
+#, perl-format
+msgid "Are you sure you want to use <%s> [y/N]? "
+msgstr ""
+
+#: 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:926
+msgid "Which 8bit encoding should I declare [UTF-8]? "
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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:1041 git-send-email.perl:1049
+#, perl-format
+msgid "error: unable to extract a valid address from: %s\n"
+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:1053
+msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
+msgstr ""
+
+#: git-send-email.perl:1370
+#, perl-format
+msgid "CA path \"%s\" does not exist"
+msgstr ""
+
+#: 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 ""
+
+#. 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 ""
+
+#: 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 ""
+
+#: git-send-email.perl:1546
+#, perl-format
+msgid "Server does not support STARTTLS! %s"
+msgstr ""
+
+#: 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 ""
+
+#: git-send-email.perl:1582
+#, perl-format
+msgid "Failed to send %s\n"
+msgstr ""
+
+#: git-send-email.perl:1585
+#, perl-format
+msgid "Dry-Sent %s\n"
+msgstr ""
+
+#: git-send-email.perl:1585
+#, perl-format
+msgid "Sent %s\n"
+msgstr ""
+
+#: git-send-email.perl:1587
+msgid "Dry-OK. Log says:\n"
+msgstr ""
+
+#: git-send-email.perl:1587
+msgid "OK. Log says:\n"
+msgstr ""
+
+#: git-send-email.perl:1599
+msgid "Result: "
+msgstr ""
+
+#: git-send-email.perl:1602
+msgid "Result: OK\n"
+msgstr ""
+
+#: git-send-email.perl:1620
+#, perl-format
+msgid "can't open file %s"
+msgstr ""
+
+#: 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:1673
+#, perl-format
+msgid "(mbox) Adding to: %s from line '%s'\n"
+msgstr ""
+
+#: git-send-email.perl:1730
+#, perl-format
+msgid "(non-mbox) Adding cc: %s from line '%s'\n"
+msgstr ""
+
+#: git-send-email.perl:1765
+#, perl-format
+msgid "(body) Adding cc: %s from line '%s'\n"
+msgstr ""
+
+#: git-send-email.perl:1876
+#, perl-format
+msgid "(%s) Could not execute '%s'"
+msgstr ""
+
+#: git-send-email.perl:1883
+#, perl-format
+msgid "(%s) Adding %s: %s from: '%s'\n"
+msgstr ""
+
+#: git-send-email.perl:1887
+#, perl-format
+msgid "(%s) failed to close pipe to '%s'"
+msgstr ""
+
+#: git-send-email.perl:1917
+msgid "cannot send message as 7bit"
+msgstr ""
+
+#: 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 ""
+
+#: git-send-email.perl:1969
+#, perl-format
+msgid "%s: patch contains a line longer than 998 characters"
+msgstr ""
+
+#: 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:1990
+#, perl-format
+msgid "Do you really want to send %s? [y|N]: "
+msgstr ""
diff --git a/po/it.po b/po/it.po
index e9f596b..8f79365 100644
--- a/po/it.po
+++ b/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, 2020.
+# 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: 2020-03-11 15:26+0800\n"
-"PO-Revision-Date: 2020-03-12 07:52+0100\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,16 +20,16 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 19.12.3\n"
+"X-Generator: Lokalize 20.08.1\n"
#: add-interactive.c:368
#, c-format
msgid "Huh (%s)?"
msgstr "Eh (%s)?"
-#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124
-#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687
-#: builtin/rebase.c:2086 builtin/rebase.c:2130
+#: 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"
@@ -57,8 +57,7 @@
msgid "could not stage '%s'"
msgstr "impossibile aggiungere '%s' all'area di staging"
-#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317
-#: builtin/rebase.c:899
+#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3444
msgid "could not write index"
msgstr "impossibile scrivere l'indice"
@@ -74,8 +73,8 @@
msgid "note: %s is untracked now.\n"
msgstr "nota: %s ora non è tracciato.\n"
-#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281
-#: builtin/reset.c:144
+#: 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'"
@@ -116,21 +115,21 @@
msgid "ignoring unmerged: %s"
msgstr "ignoro ciò che non è stato sottoposto a merge: %s"
-#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366
+#: 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:1673 git-add--interactive.perl:1368
+#: 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:1376
+#: add-interactive.c:935 git-add--interactive.perl:1381
msgid "Patch update"
msgstr "Aggiornamento patch"
-#: add-interactive.c:974 git-add--interactive.perl:1754
+#: add-interactive.c:974 git-add--interactive.perl:1794
msgid "Review diff"
msgstr "Rivedi diff"
@@ -205,11 +204,11 @@
msgid "(empty) select nothing"
msgstr "(vuoto) non selezionare nulla"
-#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851
+#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1891
msgid "*** Commands ***"
msgstr "*** Comandi ***"
-#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848
+#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1888
msgid "What now"
msgstr "Cosa faccio ora"
@@ -221,12 +220,13 @@
msgid "unstaged"
msgstr "rimosso dall'area di staging"
-#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251
-#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144
-#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409
-#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
-#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
-#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
+#: 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"
@@ -234,27 +234,32 @@
msgid "could not refresh index"
msgstr "impossibile aggiornare l'indice"
-#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765
+#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1805
#, c-format
msgid "Bye.\n"
msgstr "Ciao.\n"
-#: add-patch.c:33 git-add--interactive.perl:1428
+#: 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:34 git-add--interactive.perl:1429
+#: 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:35 git-add--interactive.perl:1430
+#: 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:37
+#: add-patch.c:39
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"staging."
@@ -262,7 +267,7 @@
"Se la patch viene applicata senza problemi, l'hunk modificato sarà "
"contrassegnato immediatamente per l'aggiunta all'area di staging."
-#: add-patch.c:40
+#: add-patch.c:42
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -279,22 +284,27 @@
"d - non aggiungere né quest'hunk né quelli successivi nel file all'area di "
"staging\n"
-#: add-patch.c:54 git-add--interactive.perl:1433
+#: 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:55 git-add--interactive.perl:1434
+#: 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:56 git-add--interactive.perl:1435
+#: 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:58
+#: add-patch.c:61
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"stashing."
@@ -302,7 +312,7 @@
"Se la patch viene applicata senza problemi, l'hunk modificato sarà "
"contrassegnato immediatamente per lo stash."
-#: add-patch.c:61
+#: add-patch.c:64
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -316,22 +326,27 @@
"a - esegui lo stash di quest'hunk e di tutti quelli successivi nel file\n"
"d - non eseguire lo stash né di quest'hunk né di quelli successivi nel file\n"
-#: add-patch.c:77 git-add--interactive.perl:1438
+#: 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:78 git-add--interactive.perl:1439
+#: 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:79 git-add--interactive.perl:1440
+#: 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:81
+#: add-patch.c:85
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"unstaging."
@@ -339,7 +354,7 @@
"Se la patch viene applicata senza problemi, l'hunk modificato sarà "
"contrassegnato immediatamente per la rimozione dall'area di staging."
-#: add-patch.c:84
+#: add-patch.c:88
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -356,22 +371,27 @@
"d - non rimuovere né quest'hunk né quelli successivi nel file dall'area di "
"staging\n"
-#: add-patch.c:99 git-add--interactive.perl:1443
+#: 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:100 git-add--interactive.perl:1444
+#: 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:101 git-add--interactive.perl:1445
+#: 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:103 add-patch.c:168 add-patch.c:211
+#: 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."
@@ -379,7 +399,7 @@
"Se la patch viene applicata senza problemi, l'hunk modificato sarà "
"contrassegnato immediatamente per l'applicazione."
-#: add-patch.c:106
+#: add-patch.c:111
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -393,25 +413,31 @@
"a - applica quest'hunk e tutti quelli successivi nel file\n"
"d - non applicare né quest'hunk né quelli successivi nel file\n"
-#: add-patch.c:121 git-add--interactive.perl:1448
-#: git-add--interactive.perl:1463
+#: 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:122 git-add--interactive.perl:1449
-#: git-add--interactive.perl:1464
+#: 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:123 git-add--interactive.perl:1450
-#: git-add--interactive.perl:1465
+#: 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:125 add-patch.c:147 add-patch.c:190
+#: 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."
@@ -419,7 +445,7 @@
"Se la patch viene applicata senza problemi, l'hunk modificato sarà "
"contrassegnato immediatamente per la rimozione."
-#: add-patch.c:128 add-patch.c:193
+#: 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"
@@ -433,26 +459,32 @@
"a - rimuovi quest'hunk e tutti quelli successivi nel file\n"
"d - non rimuovere né quest'hunk né quelli successivi nel file\n"
-#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453
+#: 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:144 add-patch.c:187 git-add--interactive.perl:1454
+#: 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:145 add-patch.c:188 git-add--interactive.perl:1455
+#: 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:150
+#: 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"
@@ -466,26 +498,32 @@
"a - rimuovi quest'hunk e tutti quelli successivi nel file\n"
"d - non rimuovere né quest'hunk né quelli successivi nel file\n"
-#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458
+#: 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:165 add-patch.c:208 git-add--interactive.perl:1459
+#: 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:166 add-patch.c:209 git-add--interactive.perl:1460
+#: 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:171
+#: 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"
@@ -499,7 +537,7 @@
"a - applica quest'hunk e tutti quelli successivi nel file\n"
"d - non applicare né quest'hunk né quelli successivi nel file\n"
-#: add-patch.c:214
+#: add-patch.c:224
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -513,34 +551,34 @@
"a - applica quest'hunk e tutti quelli successivi nel file\n"
"d - non applicare né quest'hunk né quelli successivi nel file\n"
-#: add-patch.c:318
+#: add-patch.c:342
#, c-format
msgid "could not parse hunk header '%.*s'"
msgstr "impossibile analizzare l'header hunk '%.*s'"
-#: add-patch.c:337 add-patch.c:341
+#: 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:395
+#: add-patch.c:419
msgid "could not parse diff"
msgstr "impossibile analizzare il diff"
-#: add-patch.c:414
+#: add-patch.c:438
msgid "could not parse colored diff"
msgstr "impossibile analizzare il diff colorato"
-#: add-patch.c:428
+#: add-patch.c:452
#, c-format
msgid "failed to run '%s'"
msgstr "esecuzione di '%s' non riuscita"
-#: add-patch.c:587
+#: add-patch.c:611
msgid "mismatched output from interactive.diffFilter"
msgstr "output di interactive.diffFilter non corrispondente"
-#: add-patch.c:588
+#: add-patch.c:612
msgid ""
"Your filter must maintain a one-to-one correspondence\n"
"between its input and output lines."
@@ -548,7 +586,7 @@
"Il filtro deve mantenere una corrispondenza uno a uno\n"
"fra le righe di input e di output."
-#: add-patch.c:761
+#: add-patch.c:785
#, c-format
msgid ""
"expected context line #%d in\n"
@@ -557,7 +595,7 @@
"attesa riga contesto %d in\n"
"%.*s"
-#: add-patch.c:776
+#: add-patch.c:800
#, c-format
msgid ""
"hunks do not overlap:\n"
@@ -570,13 +608,13 @@
"\tnon termina con:\n"
"%.*s"
-#: add-patch.c:1052 git-add--interactive.perl:1112
+#: 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:1056
+#: add-patch.c:1080
#, c-format
msgid ""
"---\n"
@@ -590,7 +628,7 @@
"Le righe che iniziano con %c saranno rimosse.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1070 git-add--interactive.perl:1126
+#: 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"
@@ -600,11 +638,11 @@
"di modificarla di nuovo. Se tutte le righe dell'hunk saranno state\n"
"rimosse, la modifica sarà interrotta e l'hunk non sarà modificato.\n"
-#: add-patch.c:1103
+#: add-patch.c:1127
msgid "could not parse hunk header"
msgstr "impossibile analizzare l'header hunk"
-#: add-patch.c:1148
+#: add-patch.c:1172
msgid "'git apply --cached' failed"
msgstr "'git apply --cached' non riuscito"
@@ -620,26 +658,26 @@
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1218 git-add--interactive.perl:1239
+#: 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:1261
+#: 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:1262 git-add--interactive.perl:1343
+#: 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:1269 git-add--interactive.perl:1346
+#: add-patch.c:1292 git-add--interactive.perl:1351
msgid "Nothing was applied.\n"
msgstr "Non è stato applicato nulla.\n"
-#: add-patch.c:1326
+#: add-patch.c:1349
msgid ""
"j - leave this hunk undecided, see next undecided hunk\n"
"J - leave this hunk undecided, see next hunk\n"
@@ -663,115 +701,124 @@
"e - modifica manualmente l'hunk corrente\n"
"? - stampa una guida\n"
-#: add-patch.c:1447 add-patch.c:1457
+#: add-patch.c:1511 add-patch.c:1521
msgid "No previous hunk"
msgstr "Nessun hunk precedente"
-#: add-patch.c:1452 add-patch.c:1462
+#: add-patch.c:1516 add-patch.c:1526
msgid "No next hunk"
msgstr "Nessun hunk successivo"
-#: add-patch.c:1468
+#: add-patch.c:1532
msgid "No other hunks to goto"
msgstr "Nessun altro hunk a cui andare"
-#: add-patch.c:1479 git-add--interactive.perl:1577
+#: 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:1480 git-add--interactive.perl:1579
+#: add-patch.c:1544 git-add--interactive.perl:1610
msgid "go to which hunk? "
msgstr "a quale hunk desideri andare? "
-#: add-patch.c:1491
+#: add-patch.c:1555
#, c-format
msgid "Invalid number: '%s'"
msgstr "Numero non valido: '%s'"
-#: add-patch.c:1496
+#: 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:1505
+#: add-patch.c:1569
msgid "No other hunks to search"
msgstr "Nessun altro hunk in cui eseguire la ricerca"
-#: add-patch.c:1511 git-add--interactive.perl:1623
+#: add-patch.c:1575 git-add--interactive.perl:1663
msgid "search for regex? "
msgstr "cercare un'espressione regolare? "
-#: add-patch.c:1526
+#: add-patch.c:1590
#, c-format
msgid "Malformed search regexp %s: %s"
msgstr "Espressione regolare di ricerca %s malformata: %s"
-#: add-patch.c:1543
+#: add-patch.c:1607
msgid "No hunk matches the given pattern"
msgstr "Nessun hunk corrisponde al pattern fornito"
-#: add-patch.c:1550
+#: add-patch.c:1614
msgid "Sorry, cannot split this hunk"
msgstr "Mi dispiace, non posso suddividere quest'hunk"
-#: add-patch.c:1554
+#: add-patch.c:1618
#, c-format
msgid "Split into %d hunks."
msgstr "Suddiviso in %d hunk."
-#: add-patch.c:1558
+#: add-patch.c:1622
msgid "Sorry, cannot edit this hunk"
msgstr "Mi dispiace, non posso modificare quest'hunk"
-#: add-patch.c:1609
+#: add-patch.c:1674
msgid "'git apply' failed"
msgstr "'git apply' non riuscito"
-#: advice.c:115
+#: 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:168
+#: 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:170
+#: 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:172
+#: 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:174
+#: 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:176
+#: 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:178
+#: 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:186
+#: 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."
@@ -779,23 +826,23 @@
"Correggili nell'albero di lavoro, quindi usa 'git add/rm <file>...' come "
"appropriato per risolverli ed esegui un commit."
-#: advice.c:194
+#: advice.c:273
msgid "Exiting because of an unresolved conflict."
msgstr "Esco a causa di un conflitto non risolto."
-#: advice.c:199 builtin/merge.c:1335
+#: advice.c: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:201
+#: advice.c:280
msgid "Please, commit your changes before merging."
msgstr "Esegui il commit delle modifiche prima di eseguire il merge."
-#: advice.c:202
+#: advice.c:281
msgid "Exiting because of unfinished merge."
msgstr "Esco a causa di un merge non terminato."
-#: advice.c:208
+#: advice.c:287
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -1093,7 +1140,7 @@
msgid "cannot checkout %s"
msgstr "impossibile eseguire il checkout di '%s'"
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298
+#: apply.c: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"
@@ -1113,7 +1160,7 @@
msgid "%s: does not exist in index"
msgstr "%s: non esiste nell'indice"
-#: apply.c:3537 apply.c:3708
+#: apply.c:3537 apply.c:3708 apply.c:3953
#, c-format
msgid "%s: does not match index"
msgstr "%s: non corrisponde all'indice"
@@ -1162,321 +1209,365 @@
msgid "%s has type %o, expected %o"
msgstr "%s ha il tipo %o, atteso %o"
-#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856
-#: read-cache.c:1325
+#: apply.c: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:3936
+#: apply.c:3950
#, c-format
msgid "%s: already exists in index"
msgstr "%s: esiste già nell'indice"
-#: apply.c:3939
+#: apply.c:3956
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: esiste già nella directory di lavoro"
-#: apply.c:3959
+#: 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:3964
+#: 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:3984
+#: 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:3988
+#: apply.c:4005
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: la patch non si applica correttamente"
-#: apply.c:4003
+#: apply.c:4020
#, c-format
msgid "Checking patch %s..."
msgstr "Controllo della patch %s in corso..."
-#: apply.c:4095
+#: 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:4102
+#: 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:4105
+#: apply.c:4122
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "le informazioni SHA1 sono mancanti o inutili (%s)."
-#: apply.c:4114
+#: apply.c:4131
#, c-format
msgid "could not add %s to temporary index"
msgstr "impossibile aggiungere %s all'indice temporaneo"
-#: apply.c:4124
+#: apply.c:4141
#, c-format
msgid "could not write temporary index to %s"
msgstr "impossibile scrivere l'indice temporaneo in %s"
-#: apply.c:4262
+#: apply.c:4279
#, c-format
msgid "unable to remove %s from index"
msgstr "impossibile rimuovere %s dall'indice"
-#: apply.c:4296
+#: apply.c:4313
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "patch corrotta per il sottomodulo %s"
-#: apply.c:4302
+#: 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:4310
+#: 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:4316 apply.c:4461
+#: 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:4359
+#: apply.c:4376 builtin/bisect--helper.c:537
#, c-format
msgid "failed to write to '%s'"
msgstr "scrittura in '%s' non riuscita"
-#: apply.c:4363
+#: apply.c:4380
#, c-format
msgid "closing file '%s'"
msgstr "chiusura del file '%s' in corso"
-#: apply.c:4433
+#: apply.c:4450
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "impossibile scrivere il file '%s' con modo %o"
-#: apply.c:4531
+#: apply.c:4548
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Patch %s applicata correttamente."
-#: apply.c:4539
+#: apply.c:4556
msgid "internal error"
msgstr "errore interno"
-#: apply.c:4542
+#: 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:4553
+#: apply.c:4570
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "nome file .rej troncato a %.*s.rej"
-#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201
+#: apply.c:4578 builtin/fetch.c:927 builtin/fetch.c:1228
#, c-format
msgid "cannot open %s"
msgstr "impossibile aprire %s"
-#: apply.c:4575
+#: apply.c:4592
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Frammento %d applicato correttamente."
-#: apply.c:4579
+#: apply.c:4596
#, c-format
msgid "Rejected hunk #%d."
msgstr "Frammento %d respinto."
-#: apply.c:4698
+#: apply.c:4715
#, c-format
msgid "Skipped patch '%s'."
msgstr "Patch '%s' ignorata."
-#: apply.c:4706
+#: apply.c:4723
msgid "unrecognized input"
msgstr "input non riconosciuto"
-#: apply.c:4726
+#: apply.c:4743
msgid "unable to read index file"
msgstr "impossibile leggere il file index"
-#: apply.c:4883
+#: apply.c:4900
#, c-format
msgid "can't open patch '%s': %s"
msgstr "impossibile aprire la patch '%s': %s"
-#: apply.c:4910
+#: 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:4916 apply.c:4931
+#: 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:4924
+#: 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:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406
+#: 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:4968
+#: apply.c:4985
msgid "don't apply changes matching the given path"
msgstr "non applicare le modifiche corrispondenti al percorso specificato"
-#: apply.c:4971
+#: apply.c:4988
msgid "apply changes matching the given path"
msgstr "applica le modifiche corrispondenti al percorso specificato"
-#: apply.c:4973 builtin/am.c:2260
+#: apply.c:4990 builtin/am.c:2279
msgid "num"
msgstr "num"
-#: apply.c:4974
+#: apply.c:4991
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "rimuovi <num> barre iniziali dai percorsi diff tradizionali"
-#: apply.c:4977
+#: apply.c:4994
msgid "ignore additions made by the patch"
msgstr "ignora le aggiunte create dalla patch"
-#: apply.c:4979
+#: 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:4983
+#: 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:4985
+#: 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:4987
+#: 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:4989
+#: 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:4991
+#: 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:4993
+#: apply.c:5010
msgid "apply a patch without touching the working tree"
msgstr "applica una patch senza modificare l'albero di lavoro"
-#: apply.c:4995
+#: 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:4998
+#: 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:5000
+#: 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:5002
+#: 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:5005 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:5007
+#: apply.c:5024
msgid "ensure at least <n> lines of context match"
msgstr "assicura che almeno <n> righe di contesto corrispondano"
-#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98
+#: apply.c:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98
#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3457 builtin/rebase.c:1508
+#: builtin/pack-objects.c:3562 builtin/rebase.c:1340
msgid "action"
msgstr "azione"
-#: apply.c:5009
+#: 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:5012 apply.c:5015
+#: 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:5018
+#: apply.c:5035
msgid "apply the patch in reverse"
msgstr "applica la patch in maniera inversa"
-#: apply.c:5020
+#: apply.c:5037
msgid "don't expect at least one line of context"
msgstr "non aspettare almeno una riga di contesto"
-#: apply.c:5022
+#: apply.c:5039
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "lascia i frammenti respinti nei file *.rej corrispondenti"
-#: apply.c:5024
+#: apply.c:5041
msgid "allow overlapping hunks"
msgstr "consenti la sovrapposizione dei frammenti"
-#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22
-#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774
-#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c: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:5027
+#: 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:5030
+#: 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:5032 builtin/am.c:2248
+#: apply.c:5049 builtin/am.c:2267
msgid "root"
msgstr "radice"
-#: apply.c:5033
+#: 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>...]"
@@ -1496,171 +1587,152 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <repository> [--exec <comando>] --list"
-#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
-#, c-format
-msgid "pathspec '%s' did not match any files"
-msgstr "lo specificatore percorso '%s' non corrisponde ad alcun file"
-
-#: archive.c:396
-#, c-format
-msgid "no such ref: %.*s"
-msgstr "riferimento non esistente: %.*s"
-
-#: archive.c:401
-#, c-format
-msgid "not a valid object name: %s"
-msgstr "%s non è un nome oggetto valido"
-
-#: archive.c:414
-#, c-format
-msgid "not a tree object: %s"
-msgstr "%s non è un oggetto albero valido"
-
-#: archive.c:426
-msgid "current working directory is untracked"
-msgstr "la directory di lavoro corrente non è tracciata"
-
-#: archive.c:457
-msgid "fmt"
-msgstr "fmt"
-
-#: archive.c:457
-msgid "archive format"
-msgstr "formato archivio"
-
-#: archive.c:458 builtin/log.c:1653
-msgid "prefix"
-msgstr "prefisso"
-
-#: archive.c:459
-msgid "prepend prefix to each pathname in the archive"
-msgstr "anteponi <prefisso> a ogni nome percorso nell'archivio"
-
-#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
-#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
-#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887
-#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
-#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
-#: parse-options.h:190
-msgid "file"
-msgstr "file"
-
-#: archive.c:461 builtin/archive.c:90
-msgid "write the archive to this file"
-msgstr "scrivi l'archivio in questo file"
-
-#: archive.c:463
-msgid "read .gitattributes in working directory"
-msgstr "leggi il file .gitattributes nella directory di lavoro"
-
-#: archive.c:464
-msgid "report archived files on stderr"
-msgstr "elenca i file archiviati sullo standard error"
-
-#: archive.c:465
-msgid "store only"
-msgstr "salva solamente"
-
-#: archive.c:466
-msgid "compress faster"
-msgstr "comprimi più velocemente"
-
-#: archive.c:474
-msgid "compress better"
-msgstr "comprimi meglio"
-
-#: archive.c:477
-msgid "list supported archive formats"
-msgstr "elenca i formati archivio supportati"
-
-#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
-#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
-msgid "repo"
-msgstr "repository"
-
-#: archive.c:480 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:715
-#: builtin/notes.c:498
-msgid "command"
-msgstr "comando"
-
-#: archive.c:482 builtin/archive.c:94
-msgid "path to the remote git-upload-archive command"
-msgstr "percorso al comando remoto git-upload-archive"
-
-#: archive.c:489
-msgid "Unexpected option --remote"
-msgstr "Opzione --remote inattesa"
-
-#: archive.c:491
-msgid "Option --exec can only be used together with --remote"
-msgstr "L'opzione --exec può essere usata solo con --remote"
-
-#: archive.c:493
-msgid "Unexpected option --output"
-msgstr "Opzione --output inattesa"
-
-#: archive.c:515
-#, c-format
-msgid "Unknown archive format '%s'"
-msgstr "Formato archivio '%s' sconosciuto"
-
-#: archive.c:522
-#, 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:351
-#, c-format
-msgid "cannot stream blob %s"
-msgstr "impossibile eseguire lo streaming del blob %s"
-
-#: archive-tar.c:266 archive-zip.c:369
-#, c-format
-msgid "unsupported file mode: 0%o (SHA1: %s)"
-msgstr "modo file non supportato: 0%o (SHA1: %s)"
-
-#: archive-tar.c:293 archive-zip.c:359
+#: archive.c:192
#, c-format
msgid "cannot read %s"
msgstr "impossibile leggere %s"
-#: archive-tar.c:465
+#: 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 "unable to start '%s' filter"
-msgstr "impossibile avviare il filtro '%s'"
+msgid "could not read '%s'"
+msgstr "impossibile leggere '%s'"
-#: archive-tar.c:468
-msgid "unable to redirect descriptor"
-msgstr "impossibile ridirezionare il descrittore"
-
-#: archive-tar.c:475
+#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315
#, c-format
-msgid "'%s' filter reported error"
-msgstr "il filtro '%s' ha segnalato un errore"
+msgid "pathspec '%s' did not match any files"
+msgstr "lo specificatore percorso '%s' non corrisponde ad alcun file"
-#: archive-zip.c:319
+#: archive.c:454
#, c-format
-msgid "path is not valid UTF-8: %s"
-msgstr "il percorso non è codificato validamente in UTF-8: %s"
+msgid "no such ref: %.*s"
+msgstr "riferimento non esistente: %.*s"
-#: archive-zip.c:323
+#: archive.c:460
#, c-format
-msgid "path too long (%d chars, SHA1: %s): %s"
-msgstr "percorso troppo lungo (%d caratteri, SHA1: %s): %s"
+msgid "not a valid object name: %s"
+msgstr "%s non è un nome oggetto valido"
-#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
+#: archive.c:473
#, c-format
-msgid "deflate error (%d)"
-msgstr "errore deflate (%d)"
+msgid "not a tree object: %s"
+msgstr "%s non è un oggetto albero valido"
-#: archive-zip.c:615
+#: archive.c:485
+msgid "current working directory is untracked"
+msgstr "la directory di lavoro corrente non è tracciata"
+
+#: archive.c:526
#, c-format
-msgid "timestamp too large for this system: %<PRIuMAX>"
-msgstr "timestamp troppo grande per questo sistema: %<PRIuMAX>"
+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:553
+msgid "archive format"
+msgstr "formato archivio"
+
+#: archive.c:554 builtin/log.c:1760
+msgid "prefix"
+msgstr "prefisso"
+
+#: archive.c:555
+msgid "prepend prefix to each pathname in the archive"
+msgstr "anteponi <prefisso> a ogni nome percorso nell'archivio"
+
+#: 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: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:562
+msgid "read .gitattributes in working directory"
+msgstr "leggi il file .gitattributes nella directory di lavoro"
+
+#: archive.c:563
+msgid "report archived files on stderr"
+msgstr "elenca i file archiviati sullo standard error"
+
+#: archive.c:564
+msgid "store only"
+msgstr "salva solamente"
+
+#: archive.c:565
+msgid "compress faster"
+msgstr "comprimi più velocemente"
+
+#: archive.c:573
+msgid "compress better"
+msgstr "comprimi meglio"
+
+#: archive.c:576
+msgid "list supported archive formats"
+msgstr "elenca i formati archivio supportati"
+
+#: 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:579 builtin/archive.c:92
+msgid "retrieve the archive from remote repository <repo>"
+msgstr "recupera l'archivio dal repository remoto <repository>"
+
+#: archive.c:580 builtin/archive.c:93 builtin/difftool.c:715
+#: builtin/notes.c:498
+msgid "command"
+msgstr "comando"
+
+#: 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:588
+msgid "Unexpected option --remote"
+msgstr "Opzione --remote inattesa"
+
+#: 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:592
+msgid "Unexpected option --output"
+msgstr "Opzione --output inattesa"
+
+#: 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:623
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "Argomento non supportato per il formato '%s': -%d"
#: attr.c:212
#, c-format
@@ -1680,22 +1752,22 @@
"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:745
+#: bisect.c:753
#, c-format
msgid "Not a valid commit name %s"
msgstr "%s non è un nome commit valido"
-#: bisect.c:770
+#: bisect.c:778
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1704,7 +1776,7 @@
"La base del merge %s non funziona.\n"
"Ciò significa che il bug è stato corretto fra %s e [%s].\n"
-#: bisect.c:775
+#: bisect.c:783
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1713,7 +1785,7 @@
"La base del merge %s è nuova.\n"
"La proprietà è stata modificata fra %s e [%s].\n"
-#: bisect.c:780
+#: bisect.c:788
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1722,7 +1794,7 @@
"La base del merge %s è %s.\n"
"Ciò significa che il primo commit '%s' è fra %s e [%s].\n"
-#: bisect.c:788
+#: bisect.c:796
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1733,7 +1805,7 @@
"git bisect non può funzionare correttamente in questo caso.\n"
"Forse hai confuso le revisioni %s con quelle %s?\n"
-#: bisect.c:801
+#: bisect.c:809
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1744,36 +1816,36 @@
"Non è possibile essere sicuri che il primo commit %s sia fra %s e %s.\n"
"Continuo comunque."
-#: bisect.c:840
+#: 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:890
+#: bisect.c:898
#, c-format
msgid "a %s revision is needed"
msgstr "è richiesta una revisione %s"
-#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c: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:966 builtin/merge.c:149
+#: bisect.c:974 builtin/merge.c:150
#, c-format
msgid "could not read file '%s'"
msgstr "impossibile leggere il file '%s'"
-#: bisect.c:997
+#: bisect.c:1014
msgid "reading bisect refs failed"
msgstr "lettura riferimenti della bisezione non riuscita"
-#: bisect.c:1019
+#: bisect.c:1044
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s era sia %s sia %s\n"
-#: bisect.c:1028
+#: bisect.c:1053
#, c-format
msgid ""
"No testable commit found.\n"
@@ -1782,7 +1854,7 @@
"Nessun commit testabile trovato.\n"
"Forse hai iniziato il procedimento specificando parametri percorso errati?\n"
-#: bisect.c:1057
+#: bisect.c:1082
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1792,7 +1864,7 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1063
+#: 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"
@@ -1801,41 +1873,41 @@
msgstr[1] ""
"Bisezione in corso: %d revisioni rimanenti da testare dopo questa %s\n"
-#: blame.c:2700
+#: blame.c:2778
msgid "--contents and --reverse do not blend well."
msgstr "--contents e --reverse non sono compatibili."
-#: blame.c:2714
+#: 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:2735
+#: 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:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006
-#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388
-#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215
-#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290
-#: builtin/shortlog.c:192
+#: 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:2762
+#: 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:2773
+#: blame.c:2851
#, c-format
msgid "no such path %s in %s"
msgstr "il percorso %s in %s non esiste"
-#: blame.c:2784
+#: blame.c:2862
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "impossibile leggere il blob %s per il percorso %s"
@@ -1977,94 +2049,114 @@
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 "'%s' does not look like a v2 bundle file"
-msgstr "'%s' non sembra essere un file bundle v2"
+msgid "unrecognized bundle hash algorithm: %s"
+msgstr "algoritmo hash bundle non riconosciuto: %s"
-#: bundle.c:64
+#: bundle.c:45
+#, c-format
+msgid "unknown capability '%s'"
+msgstr "capacità '%s' sconosciuta"
+
+#: 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:2258 sequencer.c:3016
-#: builtin/commit.c:815
+#: 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:273
+#: bundle.c:319
msgid "unable to dup bundle descriptor"
msgstr "impossibile duplicare il descrittore bundle"
-#: bundle.c:280
+#: bundle.c:326
msgid "Could not spawn pack-objects"
msgstr "Impossibile avviare pack-objects"
-#: bundle.c:291
+#: bundle.c:337
msgid "pack-objects died"
msgstr "comando pack-objects morto"
-#: bundle.c:333
+#: bundle.c:379
msgid "rev-list died"
msgstr "comando rev-list morto"
-#: bundle.c:382
+#: 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:461 builtin/log.c:203 builtin/log.c:1814 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:469
+#: bundle.c:530
msgid "Refusing to create empty bundle."
msgstr "Mi rifiuto di creare un bundle vuoto."
-#: bundle.c:479
+#: bundle.c:540
#, c-format
msgid "cannot create '%s'"
msgstr "impossibile creare '%s'"
-#: bundle.c:504
+#: bundle.c:565
msgid "index-pack died"
msgstr "comando index-pack morto"
@@ -2073,18 +2165,292 @@
msgid "invalid color value: %.*s"
msgstr "valore colore non valido: %.*s"
-#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403
-#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457
+#: commit-graph.c:188 midx.c:46
+msgid "invalid hash version"
+msgstr "versione hash non valida"
+
+#: commit-graph.c:246
+msgid "commit-graph file is too small"
+msgstr "il file grafo dei commit %s è troppo piccolo"
+
+#: 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: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: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: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:361
+#, c-format
+msgid "commit-graph improper chunk offset %08x%08x"
+msgstr "offset blocco grafo dei commit improprio %08x%08x"
+
+#: 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:499
+msgid "commit-graph has no base graphs chunk"
+msgstr "il grafo dei commit non ha un blocco grafi di base"
+
+#: commit-graph.c:509
+msgid "commit-graph chain does not match"
+msgstr "la catena del grafo dei commit non corrisponde"
+
+#: 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:581
+msgid "unable to find all commit-graph files"
+msgstr "impossibile trovare tutti i file grafo dei commit"
+
+#: 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:742
+#, c-format
+msgid "could not find commit %s"
+msgstr "impossibile trovare il commit %s"
+
+#: 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:1301
+msgid "Loading known commits in commit graph"
+msgstr "Caricamento commit noti nel grafo dei commit in corso"
+
+#: 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:1338
+msgid "Clearing commit marks in commit graph"
+msgstr "Rimozione dei contrassegni commit nel grafo dei commit in corso"
+
+#: commit-graph.c:1357
+msgid "Computing commit graph generation numbers"
+msgstr "Calcolo numeri generazione del grafo dei commit in corso"
+
+#: 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:1539
+#, c-format
+msgid "error adding pack %s"
+msgstr "errore durante l'aggiunta del pack %s"
+
+#: commit-graph.c:1543
+#, c-format
+msgid "error opening index for %s"
+msgstr "errore durante l'apertura dell'indice per %s"
+
+#: 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:1597
+msgid "Counting distinct commits in commit graph"
+msgstr "Conteggio commit distinti nel grafo dei commit in corso"
+
+#: 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: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: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:1733
+msgid "unable to create temporary graph layer"
+msgstr "impossibile creare il livello grafico temporaneo"
+
+#: commit-graph.c:1738
+#, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "impossibile modificare i permessi condivisi per '%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] "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:1853
+msgid "unable to open commit-graph chain file"
+msgstr "impossibile aprire il file catena grafo dei commit"
+
+#: 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:1889
+msgid "failed to rename temporary commit-graph file"
+msgstr "impossibile ridenominare il file temporaneo grafo dei commit"
+
+#: commit-graph.c:2015
+msgid "Scanning merged commits"
+msgstr "Scansione dei commit sottoposti a merge in corso"
+
+#: commit-graph.c:2026
+#, c-format
+msgid "unexpected duplicate commit id %s"
+msgstr "ID commit duplicato inatteso: %s"
+
+#: commit-graph.c:2049
+msgid "Merging commit-graph"
+msgstr "Merge del grafo dei commit in corso"
+
+#: 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:2270
+msgid "too many commits to write graph"
+msgstr "troppi commit da scrivere nel grafo"
+
+#: 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: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: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: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:2408
+msgid "Verifying commits in commit graph"
+msgstr "Verifica dei commit nel grafo dei commit in corso"
+
+#: 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: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: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: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: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:2468
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+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:2472
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+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: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: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:53
+#: commit.c:54
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s non è un commit!"
-#: commit.c:193
+#: commit.c:194
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -2104,27 +2470,27 @@
"Per disabilitare questo messaggio, esegui\n"
"\"git config advice.graftFileDeprecated false\""
-#: commit.c:1153
+#: 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:1157
+#: 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:1160
+#: 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:1163
+#: 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:1417
+#: 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"
@@ -2135,283 +2501,11 @@
"la variabile di configurazione i18n.commitencoding alla codifica usata\n"
"dal tuo progetto.\n"
-#: commit-graph.c:122
-msgid "commit-graph file is too small"
-msgstr "il file grafo dei commit %s è troppo piccolo"
-
-#: commit-graph.c:189
-#, c-format
-msgid "commit-graph signature %X does not match signature %X"
-msgstr "la firma del grafo dei commit %X non corrisponde alla firma %X"
-
-#: commit-graph.c:196
-#, c-format
-msgid "commit-graph version %X does not match version %X"
-msgstr "la versione del grafo dei commit %X non corrisponde alla versione %X"
-
-#: commit-graph.c:203
-#, c-format
-msgid "commit-graph hash version %X does not match version %X"
-msgstr ""
-"la versione hash del grafo dei commit %X non corrisponde alla versione %X"
-
-#: commit-graph.c:226
-msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
-msgstr ""
-"voce blocco grafo dei commit mancante nella tabella di ricerca; il file "
-"potrebbe non essere completo"
-
-#: commit-graph.c:237
-#, c-format
-msgid "commit-graph improper chunk offset %08x%08x"
-msgstr "offset blocco grafo dei commit improprio %08x%08x"
-
-#: commit-graph.c:280
-#, c-format
-msgid "commit-graph chunk id %08x appears multiple times"
-msgstr "l'ID del blocco grafo dei commit %08x compare più volte"
-
-#: commit-graph.c:343
-msgid "commit-graph has no base graphs chunk"
-msgstr "il grafo dei commit non ha un blocco grafi di base"
-
-#: commit-graph.c:353
-msgid "commit-graph chain does not match"
-msgstr "la catena del grafo dei commit non corrisponde"
-
-#: commit-graph.c:401
-#, c-format
-msgid "invalid commit-graph chain: line '%s' not a hash"
-msgstr "catena grafo dei commit non valida: la riga '%s' non è un hash"
-
-#: commit-graph.c:425
-msgid "unable to find all commit-graph files"
-msgstr "impossibile trovare tutti i file grafo dei commit"
-
-#: commit-graph.c:558 commit-graph.c:618
-msgid "invalid commit position. commit-graph is likely corrupt"
-msgstr ""
-"posizione commit non valida. Il grafo dei commit è probabilmente corrotto"
-
-#: commit-graph.c:579
-#, c-format
-msgid "could not find commit %s"
-msgstr "impossibile trovare il commit %s"
-
-#: commit-graph.c:852 builtin/am.c:1292
-#, c-format
-msgid "unable to parse commit %s"
-msgstr "impossibile analizzare il commit %s"
-
-#: commit-graph.c:1011 builtin/pack-objects.c:2782
-#, c-format
-msgid "unable to get type of object %s"
-msgstr "impossibile recuperare il tipo dell'oggetto %s"
-
-#: commit-graph.c:1043
-msgid "Loading known commits in commit graph"
-msgstr "Caricamento commit noti nel grafo dei commit in corso"
-
-#: commit-graph.c:1060
-msgid "Expanding reachable commits in commit graph"
-msgstr "Espansione dei commit raggiungibili nel grafo dei commit in corso"
-
-#: commit-graph.c:1079
-msgid "Clearing commit marks in commit graph"
-msgstr "Rimozione dei contrassegni commit nel grafo dei commit in corso"
-
-#: commit-graph.c:1098
-msgid "Computing commit graph generation numbers"
-msgstr "Calcolo numeri generazione del grafo dei commit in corso"
-
-#: commit-graph.c:1173
-#, c-format
-msgid "Finding commits for commit graph in %d pack"
-msgid_plural "Finding commits for commit graph in %d packs"
-msgstr[0] "Ricerca dei commit per il grafo dei commit in %d pack in corso"
-msgstr[1] "Ricerca dei commit per il grafo dei commit in %d pack in corso"
-
-#: commit-graph.c:1186
-#, c-format
-msgid "error adding pack %s"
-msgstr "errore durante l'aggiunta del pack %s"
-
-#: commit-graph.c:1190
-#, c-format
-msgid "error opening index for %s"
-msgstr "errore durante l'apertura dell'indice per %s"
-
-#: commit-graph.c:1214
-#, c-format
-msgid "Finding commits for commit graph from %d ref"
-msgid_plural "Finding commits for commit graph from %d refs"
-msgstr[0] ""
-"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:1234
-#, c-format
-msgid "invalid commit object id: %s"
-msgstr "ID oggetto commit non valido: %s"
-
-#: commit-graph.c:1249
-msgid "Finding commits for commit graph among packed objects"
-msgstr ""
-"Ricerca dei commit per il grafo dei commit fra gli oggetti nei pack in corso"
-
-#: commit-graph.c:1264
-msgid "Counting distinct commits in commit graph"
-msgstr "Conteggio commit distinti nel grafo dei commit in corso"
-
-#: commit-graph.c:1294
-msgid "Finding extra edges in commit graph"
-msgstr "Ricerca degli archi aggiuntivi nel grafo dei commit in corso"
-
-#: commit-graph.c:1340
-msgid "failed to write correct number of base graph ids"
-msgstr "impossibile scrivere il numero esatto degli ID grafo di base"
-
-#: commit-graph.c:1373 midx.c:814
-#, c-format
-msgid "unable to create leading directories of %s"
-msgstr "impossibile creare le prime directory di %s"
-
-#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248
-#, c-format
-msgid "unable to create '%s'"
-msgstr "impossibile creare '%s'"
-
-#: commit-graph.c:1445
-#, c-format
-msgid "Writing out commit graph in %d pass"
-msgid_plural "Writing out commit graph in %d passes"
-msgstr[0] "Scrittura in %d passaggio del grafo dei commit in corso"
-msgstr[1] "Scrittura in %d passaggi del grafo dei commit in corso"
-
-#: commit-graph.c:1486
-msgid "unable to open commit-graph chain file"
-msgstr "impossibile aprire il file catena grafo dei commit"
-
-#: commit-graph.c:1498
-msgid "failed to rename base commit-graph file"
-msgstr "impossibile ridenominare il file di base grafo dei commit"
-
-#: commit-graph.c:1518
-msgid "failed to rename temporary commit-graph file"
-msgstr "impossibile ridenominare il file temporaneo grafo dei commit"
-
-#: commit-graph.c:1631
-msgid "Scanning merged commits"
-msgstr "Scansione dei commit sottoposti a merge in corso"
-
-#: commit-graph.c:1642
-#, c-format
-msgid "unexpected duplicate commit id %s"
-msgstr "ID commit duplicato inatteso: %s"
-
-#: commit-graph.c:1665
-msgid "Merging commit-graph"
-msgstr "Merge del grafo dei commit in corso"
-
-#: commit-graph.c:1844
-#, 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
-msgid "too many commits to write graph"
-msgstr "troppi commit da scrivere nel grafo"
-
-#: commit-graph.c:1944
-msgid "the commit-graph file has incorrect checksum and is likely corrupt"
-msgstr ""
-"il file del grafo dei commit ha un checksum non corretto e probabilmente è "
-"corrotto"
-
-#: commit-graph.c:1954
-#, c-format
-msgid "commit-graph has incorrect OID order: %s then %s"
-msgstr "il grafo dei commit ha un ordine OID non corretto: %s seguito da %s"
-
-#: commit-graph.c:1964 commit-graph.c:1979
-#, c-format
-msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
-msgstr ""
-"il grafo dei commit ha un valore fanout non corretto: fanout[%d] = %u != %u"
-
-#: commit-graph.c:1971
-#, 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
-msgid "Verifying commits in commit graph"
-msgstr "Verifica dei commit nel grafo dei commit in corso"
-
-#: commit-graph.c:2003
-#, c-format
-msgid "failed to parse commit %s from object database for commit-graph"
-msgstr ""
-"impossibile analizzare il commit %s dal database oggetti per il grafo dei "
-"commit"
-
-#: commit-graph.c:2010
-#, c-format
-msgid "root tree OID for commit %s in commit-graph is %s != %s"
-msgstr ""
-"l'OID dell'albero radice per il commit %s nel grafo dei commit è %s != %s"
-
-#: commit-graph.c:2020
-#, c-format
-msgid "commit-graph parent list for commit %s is too long"
-msgstr "l'elenco genitori nel grafo dei commit per il commit %s è troppo lungo"
-
-#: commit-graph.c:2029
-#, c-format
-msgid "commit-graph parent for %s is %s != %s"
-msgstr "il genitore nel grafo dei commit per %s è %s != %s"
-
-#: commit-graph.c:2042
-#, c-format
-msgid "commit-graph parent list for commit %s terminates early"
-msgstr ""
-"l'elenco genitori nel grafo dei commit per il commit %s è finito prima del "
-"previsto"
-
-#: commit-graph.c:2047
-#, c-format
-msgid ""
-"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
-msgstr ""
-"il grafo dei commit ha un numero generazione zero per il commit %s ma non "
-"pari a zero per gli altri"
-
-#: commit-graph.c:2051
-#, c-format
-msgid ""
-"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
-msgstr ""
-"il grafo dei commit ha un numero generazione non pari a zero per il commit "
-"%s ma pari a zero per gli altri"
-
-#: commit-graph.c:2066
-#, c-format
-msgid "commit-graph generation for commit %s is %u != %u"
-msgstr "il numero generazione nel grafo dei commit per il commit %s è %u != %u"
-
-#: commit-graph.c:2072
-#, 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>"
-
#: 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"
@@ -2426,299 +2520,299 @@
"\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:2444
+#: 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:3541
+#: 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:1743
+#: config.c:1759
msgid "unable to parse command-line config"
msgstr "impossibile analizzare la configurazione a riga di comando"
-#: config.c:2097
+#: 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:2267
+#: config.c:2296
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s non valido: '%s'"
-#: config.c:2312
+#: 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:2358
+#: 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:2360
+#: 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:2441
+#: config.c:2470
#, c-format
msgid "invalid section name '%s'"
msgstr "nome sezione '%s' non valido"
-#: config.c:2473
+#: config.c:2502
#, c-format
msgid "%s has multiple values"
msgstr "%s ha più valori"
-#: config.c:2502
+#: 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:2754 config.c:3078
+#: 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:2765
+#: config.c:2794
#, c-format
msgid "opening %s"
msgstr "apertura di %s in corso"
-#: config.c:2800 builtin/config.c:344
+#: config.c:2829 builtin/config.c:354
#, c-format
msgid "invalid pattern: %s"
msgstr "pattern non valido: %s"
-#: config.c:2825
+#: config.c:2854
#, c-format
msgid "invalid config file %s"
msgstr "file di configurazione %s non valido"
-#: config.c:2838 config.c:3091
+#: config.c:2867 config.c:3120
#, c-format
msgid "fstat on %s failed"
msgstr "fstat di %s non riuscita"
-#: config.c:2849
+#: config.c:2878
#, c-format
msgid "unable to mmap '%s'"
msgstr "impossibile eseguire mmap su '%s'"
-#: config.c:2858 config.c:3096
+#: config.c:2887 config.c:3125
#, c-format
msgid "chmod on %s failed"
msgstr "esecuzione chmod su %s non riuscita"
-#: config.c:2943 config.c:3193
+#: 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:2977
+#: config.c:3006
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "impossibile impostare '%s' a '%s'"
-#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
+#: config.c: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:3069
+#: config.c:3098
#, c-format
msgid "invalid section name: %s"
msgstr "nome sezione non valido: %s"
-#: config.c:3236
+#: config.c:3265
#, c-format
msgid "missing value for '%s'"
msgstr "valore mancante per '%s'"
@@ -2745,72 +2839,81 @@
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"
@@ -2819,7 +2922,7 @@
"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"
@@ -2829,75 +2932,75 @@
"%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:1175
+#: 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:928
+#: 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:1123
+#: connect.c:1219
msgid "ssh variant 'simple' does not support -4"
msgstr "la variante SSH 'simple' non supporta -4"
-#: connect.c:1135
+#: connect.c:1231
msgid "ssh variant 'simple' does not support -6"
msgstr "la variante SSH 'simple' non supporta -6"
-#: connect.c:1152
+#: 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:1264
+#: connect.c:1360
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "percorso strano '%s' bloccato"
-#: connect.c:1311
+#: connect.c:1408
msgid "unable to fork"
msgstr "impossibile eseguire fork"
-#: connected.c:98 builtin/fsck.c:208 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:110
+#: connected.c:120
msgid "Could not run 'git rev-list'"
msgstr "Impossibile eseguire 'git-rev-list'"
-#: connected.c:130
+#: connected.c:144
msgid "failed write to rev-list"
msgstr "scrittura nella rev-list non riuscita"
-#: connected.c:137
+#: connected.c:149
msgid "failed to close rev-list's stdin"
msgstr "chiusura standard input della rev-list non riuscita"
@@ -2974,40 +3077,40 @@
msgstr ""
"il risultato della codifica di '%s' da %s a %s e viceversa non è lo stesso"
-#: convert.c:668
+#: 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:688
+#: 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:695
+#: convert.c:692
#, c-format
msgid "external filter '%s' failed %d"
msgstr "esecuzione del filtro esterno '%s' non riuscita: %d"
-#: convert.c:730 convert.c:733
+#: convert.c:727 convert.c:730
#, c-format
msgid "read from external filter '%s' failed"
msgstr "lettura dal filtro esterno '%s' non riuscita"
-#: convert.c:736 convert.c:791
+#: convert.c:733 convert.c:788
#, c-format
msgid "external filter '%s' failed"
msgstr "esecuzione del filtro esterno '%s' non riuscita"
-#: convert.c:839
+#: convert.c:837
msgid "unexpected filter type"
msgstr "tipo filtro inatteso"
-#: convert.c:850
+#: convert.c:848
msgid "path name too long for external filter"
msgstr "nome percorso troppo lungo per il filtro esterno"
-#: convert.c:924
+#: convert.c:940
#, c-format
msgid ""
"external filter '%s' is not available anymore although not all paths have "
@@ -3016,20 +3119,49 @@
"il filtro esterno '%s' non è più disponibile nonostante non tutti i percorsi "
"siano stati filtrati"
-#: convert.c:1223
+#: 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:1411 convert.c:1445
+#: 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:1489
+#: convert.c:1508
#, c-format
msgid "%s: smudge filter %s failed"
msgstr "%s: esecuzione del filtro smudge '%s' non riuscita"
+#: 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"
@@ -3125,15 +3257,6 @@
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:543
-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>"
@@ -3146,19 +3269,19 @@
"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'"
@@ -3166,7 +3289,7 @@
"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', "
@@ -3176,7 +3299,7 @@
"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"
@@ -3184,13 +3307,13 @@
"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"
@@ -3199,36 +3322,36 @@
"Trovati errori nella variabile di configurazione 'diff.dirstat':\n"
"%s"
-#: diff.c:4202
+#: diff.c:4269
#, c-format
msgid "external diff died, stopping at %s"
msgstr "processo esterno diff morto, mi fermo a %s"
-#: diff.c:4547
+#: 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:4550
+#: 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:4628
+#: diff.c:4699
msgid "--follow requires exactly one pathspec"
msgstr "--follow richiede esattamente uno specificatore percorso"
-#: diff.c:4676
+#: diff.c:4747
#, c-format
msgid "invalid --stat value: %s"
msgstr "valore non valido per --stat: %s"
-#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
-#: parse-options.c:197 parse-options.c:201
+#: diff.c: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:4713
+#: diff.c:4784
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3237,42 +3360,42 @@
"Analisi del parametro dell'opzione --dirstat/-X non riuscita:\n"
"%s"
-#: diff.c:4798
+#: 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:4822
+#: diff.c:4893
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "valore sconosciuto dopo ws-error-highlight=%.*s"
-#: diff.c:4836
+#: diff.c:4907
#, c-format
msgid "unable to resolve '%s'"
msgstr "impossibile risolvere '%s'"
-#: diff.c:4886 diff.c:4892
+#: diff.c:4957 diff.c:4963
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s richiede il formato <n>/<m>"
-#: diff.c:4904
+#: diff.c:4975
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s richiede un carattere, ricevuto '%s'"
-#: diff.c:4925
+#: diff.c:4996
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "argomento --color-moved errato: %s"
-#: diff.c:4944
+#: diff.c:5015
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "modo non valido '%s' in --color-moved-ws"
-#: diff.c:4984
+#: diff.c:5055
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
@@ -3280,151 +3403,151 @@
"l'opzione diff-algorithm accetta i valori \"myers\", \"minimal\", \"patience"
"\" e \"histogram\""
-#: diff.c:5020 diff.c:5040
+#: diff.c:5091 diff.c:5111
#, c-format
msgid "invalid argument to %s"
msgstr "argomento non valido per %s"
-#: diff.c:5178
+#: 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:5234
+#: diff.c:5304
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "argomento --word-diff errato: %s"
-#: diff.c:5257
+#: diff.c:5327
msgid "Diff output format options"
msgstr "Opzioni formato output diff"
-#: diff.c:5259 diff.c:5265
+#: diff.c:5329 diff.c:5335
msgid "generate patch"
msgstr "genera patch"
-#: diff.c:5262 builtin/log.c:173
+#: diff.c:5332 builtin/log.c:176
msgid "suppress diff output"
msgstr "non visualizzare l'output del diff"
-#: diff.c:5267 diff.c:5381 diff.c:5388
+#: diff.c:5337 diff.c:5451 diff.c:5458
msgid "<n>"
msgstr "<n>"
-#: diff.c:5268 diff.c:5271
+#: diff.c:5338 diff.c:5341
msgid "generate diffs with <n> lines context"
msgstr "genera diff con <n> righe di contesto"
-#: diff.c:5273
+#: diff.c:5343
msgid "generate the diff in raw format"
msgstr "genera il diff in formato grezzo"
-#: diff.c:5276
+#: diff.c:5346
msgid "synonym for '-p --raw'"
msgstr "sinonimo di '-p --raw'"
-#: diff.c:5280
+#: diff.c:5350
msgid "synonym for '-p --stat'"
msgstr "sinonimo di '-p --stat'"
-#: diff.c:5284
+#: diff.c:5354
msgid "machine friendly --stat"
msgstr "--stat leggibile da una macchina"
-#: diff.c:5287
+#: diff.c:5357
msgid "output only the last line of --stat"
msgstr "emetti in output solo l'ultima riga di --stat"
-#: diff.c:5289 diff.c:5297
+#: diff.c:5359 diff.c:5367
msgid "<param1,param2>..."
msgstr "<parametro1,parametro2>..."
-#: diff.c:5290
+#: 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:5294
+#: diff.c:5364
msgid "synonym for --dirstat=cumulative"
msgstr "sinonimo di --dirstat=cumulative"
-#: diff.c:5298
+#: diff.c:5368
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "sinonimo di --dirstat=files,parametro1,parametro2..."
-#: diff.c:5302
+#: 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:5305
+#: 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:5308
+#: diff.c:5378
msgid "show only names of changed files"
msgstr "visualizza solo i nomi dei file modificati"
-#: diff.c:5311
+#: 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:5313
+#: diff.c:5383
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<ampiezza>[,<ampiezza nome>[,<numero>]]"
-#: diff.c:5314
+#: diff.c:5384
msgid "generate diffstat"
msgstr "genera diffstat"
-#: diff.c:5316 diff.c:5319 diff.c:5322
+#: diff.c:5386 diff.c:5389 diff.c:5392
msgid "<width>"
msgstr "<ampiezza>"
-#: diff.c:5317
+#: diff.c:5387
msgid "generate diffstat with a given width"
msgstr "genera il diffstat con un'ampiezza specificata"
-#: diff.c:5320
+#: diff.c:5390
msgid "generate diffstat with a given name width"
msgstr "genera il diffstat con un'ampiezza nomi specificata"
-#: diff.c:5323
+#: diff.c:5393
msgid "generate diffstat with a given graph width"
msgstr "genera il diffstat con un'ampiezza grafo specificata"
-#: diff.c:5325
+#: diff.c:5395
msgid "<count>"
msgstr "<numero>"
-#: diff.c:5326
+#: diff.c:5396
msgid "generate diffstat with limited lines"
msgstr "genera il diffstat con righe limitate"
-#: diff.c:5329
+#: diff.c:5399
msgid "generate compact summary in diffstat"
msgstr "genera riassunto conciso nel diffstat"
-#: diff.c:5332
+#: 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:5335
+#: 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:5337
+#: diff.c:5407
msgid "show colored diff"
msgstr "visualizza diff colorato"
-#: diff.c:5338
+#: diff.c:5408
msgid "<kind>"
msgstr "<tipo>"
-#: diff.c:5339
+#: diff.c:5409
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
@@ -3432,7 +3555,7 @@
"evidenzia gli errori di spazi bianchi nelle righe 'contesto', 'vecchie' o "
"'nuove' nel diff"
-#: diff.c:5342
+#: diff.c:5412
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3440,91 +3563,91 @@
"non rimuovere i nomi percorso e usare caratteri NUL come terminatori campo "
"in --raw o --numstat"
-#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457
+#: diff.c:5415 diff.c:5418 diff.c:5421 diff.c:5527
msgid "<prefix>"
msgstr "<prefisso>"
-#: diff.c:5346
+#: diff.c:5416
msgid "show the given source prefix instead of \"a/\""
msgstr "visualizza il prefisso sorgente specificato invece di \"a/\""
-#: diff.c:5349
+#: diff.c:5419
msgid "show the given destination prefix instead of \"b/\""
msgstr "visualizza il prefisso destinazione specificato invece di \"b/\""
-#: diff.c:5352
+#: 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:5355
+#: diff.c:5425
msgid "do not show any source or destination prefix"
msgstr "non visualizzare alcun prefisso sorgente o destinazione"
-#: diff.c:5358
+#: 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:5362 diff.c:5367 diff.c:5372
+#: diff.c:5432 diff.c:5437 diff.c:5442
msgid "<char>"
msgstr "<carattere>"
-#: diff.c:5363
+#: 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:5368
+#: 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:5373
+#: 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:5376
+#: diff.c:5446
msgid "Diff rename options"
msgstr "Opzioni rinominazione diff"
-#: diff.c:5377
+#: diff.c:5447
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5378
+#: 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:5382
+#: diff.c:5452
msgid "detect renames"
msgstr "rileva le ridenominazioni"
-#: diff.c:5386
+#: diff.c:5456
msgid "omit the preimage for deletes"
msgstr "ometti la preimmagine per le eliminazioni"
-#: diff.c:5389
+#: diff.c:5459
msgid "detect copies"
msgstr "rileva le copie"
-#: diff.c:5393
+#: diff.c:5463
msgid "use unmodified files as source to find copies"
msgstr "usa file non modificati come sorgente per trovare copie"
-#: diff.c:5395
+#: diff.c:5465
msgid "disable rename detection"
msgstr "disabilita rilevamento ridenominazione"
-#: diff.c:5398
+#: diff.c:5468
msgid "use empty blobs as rename source"
msgstr "usa blob vuoti come sorgente ridenominazione"
-#: diff.c:5400
+#: 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:5403
+#: diff.c:5473
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
@@ -3532,159 +3655,159 @@
"impedisci il rilevamento ridenominazione/copia se il numero delle "
"destinazioni ridenominazione/copia eccede il limite specificato"
-#: diff.c:5405
+#: diff.c:5475
msgid "Diff algorithm options"
msgstr "Opzioni algoritmo diff"
-#: diff.c:5407
+#: diff.c:5477
msgid "produce the smallest possible diff"
msgstr "produci il diff più piccolo possibile"
-#: diff.c:5410
+#: diff.c:5480
msgid "ignore whitespace when comparing lines"
msgstr "ignora gli spazi bianchi durante il confronto delle righe"
-#: diff.c:5413
+#: diff.c:5483
msgid "ignore changes in amount of whitespace"
msgstr "ignora le modifiche al numero degli spazi bianchi"
-#: diff.c:5416
+#: diff.c:5486
msgid "ignore changes in whitespace at EOL"
msgstr "ignora modifiche agli spazi bianchi a fine riga"
-#: diff.c:5419
+#: diff.c:5489
msgid "ignore carrier-return at the end of line"
msgstr "ignora carattere ritorno a capo a fine riga"
-#: diff.c:5422
+#: diff.c:5492
msgid "ignore changes whose lines are all blank"
msgstr "ignora modifiche che riguardano solo righe vuote"
-#: diff.c:5425
+#: 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:5428
+#: diff.c:5498
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "genera il diff usando l'algoritmo \"patience diff\""
-#: diff.c:5432
+#: diff.c:5502
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "genera il diff usando l'algoritmo \"histogram diff\""
-#: diff.c:5434
+#: diff.c:5504
msgid "<algorithm>"
msgstr "<algoritmo>"
-#: diff.c:5435
+#: diff.c:5505
msgid "choose a diff algorithm"
msgstr "seleziona un algoritmo diff"
-#: diff.c:5437
+#: diff.c:5507
msgid "<text>"
msgstr "<testo>"
-#: diff.c:5438
+#: diff.c:5508
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "genera il diff usando l'algoritmo \"anchored diff\""
-#: diff.c:5440 diff.c:5449 diff.c:5452
+#: diff.c:5510 diff.c:5519 diff.c:5522
msgid "<mode>"
msgstr "<modalità>"
-#: diff.c:5441
+#: 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:5443 diff.c:5446 diff.c:5491
+#: diff.c:5513 diff.c:5516 diff.c:5561
msgid "<regex>"
msgstr "<espressione regolare>"
-#: diff.c:5444
+#: diff.c:5514
msgid "use <regex> to decide what a word is"
msgstr "usa <espressione regolare> per decidere cosa costituisce una parola"
-#: diff.c:5447
+#: 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:5450
+#: diff.c:5520
msgid "moved lines of code are colored differently"
msgstr "le righe di codice spostate sono colorate in modo diverso"
-#: diff.c:5453
+#: 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:5456
+#: diff.c:5526
msgid "Other diff options"
msgstr "Altre opzioni diff"
-#: diff.c:5458
+#: 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:5462
+#: diff.c:5532
msgid "treat all files as text"
msgstr "tratta tutti i file come se fossero di testo"
-#: diff.c:5464
+#: diff.c:5534
msgid "swap two inputs, reverse the diff"
msgstr "scambia i due input, genera un diff al contrario"
-#: diff.c:5466
+#: 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:5468
+#: diff.c:5538
msgid "disable all output of the program"
msgstr "disabilita l'intero output del programma"
-#: diff.c:5470
+#: diff.c:5540
msgid "allow an external diff helper to be executed"
msgstr "consenti l'esecuzione di un helper diff esterno"
-#: diff.c:5472
+#: 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:5474
+#: diff.c:5544
msgid "<when>"
msgstr "<quando>"
-#: diff.c:5475
+#: 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:5478
+#: diff.c:5548
msgid "<format>"
msgstr "<formato>"
-#: diff.c:5479
+#: diff.c:5549
msgid "specify how differences in submodules are shown"
msgstr "specifica come verranno visualizzate le differenze nei sottomoduli"
-#: diff.c:5483
+#: diff.c:5553
msgid "hide 'git add -N' entries from the index"
msgstr "nascondi le voci 'git add -N' nell'indice"
-#: diff.c:5486
+#: 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:5488
+#: diff.c:5558
msgid "<string>"
msgstr "<stringa>"
-#: diff.c:5489
+#: diff.c:5559
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
@@ -3692,7 +3815,7 @@
"cerca differenze che modificano il numero di occorrenze della stringa "
"specificata"
-#: diff.c:5492
+#: diff.c:5562
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
@@ -3700,24 +3823,24 @@
"cerca differenze che modificano il numero di occorrenze dell'espressione "
"regolare specificata"
-#: diff.c:5495
+#: 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:5498
+#: 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:5501
+#: 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:5502
+#: diff.c:5572
msgid "<object-id>"
msgstr "<ID oggetto>"
-#: diff.c:5503
+#: diff.c:5573
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
@@ -3725,34 +3848,34 @@
"cerca differenze che modificano il numero di occorrenze dell'oggetto "
"specificato"
-#: diff.c:5505
+#: 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:5506
+#: diff.c:5576
msgid "select files by diff type"
msgstr "seleziona file in base al tipo diff"
-#: diff.c:5508
+#: diff.c:5578
msgid "<file>"
msgstr "<file>"
-#: diff.c:5509
+#: diff.c:5579
msgid "Output to a specific file"
msgstr "Salva l'output in un file specifico"
-#: diff.c:6164
+#: 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:6167
+#: 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:6170
+#: diff.c:6242
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -3760,87 +3883,96 @@
"potresti voler impostare la variabile %s ad almeno %d e riprovare ad "
"eseguire il comando."
-#: dir.c:555
+#: 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:695 dir.c:724 dir.c:737
+#: dir.c:718 dir.c:747 dir.c:760
#, c-format
msgid "unrecognized pattern: '%s'"
msgstr "pattern non riconosciuto: '%s'"
-#: dir.c:754 dir.c:768
+#: dir.c:777 dir.c:791
#, c-format
msgid "unrecognized negative pattern: '%s'"
msgstr "pattern negativo non riconosciuto: '%s'"
-#: dir.c:786
+#: 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:796
+#: dir.c:819
msgid "disabling cone pattern matching"
msgstr "disabilito il pattern matching di tipo cone"
-#: dir.c:1173
+#: dir.c:1198
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "impossibile usare %s come file di esclusione"
-#: dir.c:2144
+#: dir.c:2305
#, c-format
msgid "could not open directory '%s'"
msgstr "impossibile aprire la directory '%s'"
-#: dir.c:2479
+#: dir.c:2605
msgid "failed to get kernel name and information"
msgstr "impossibile ottenere il nome e le informazioni sul kernel"
-#: dir.c:2603
+#: 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:3407
+#: dir.c:3520
#, c-format
msgid "index file corrupt in repo %s"
msgstr "file index corrotto nel repository %s"
-#: dir.c:3452 dir.c:3457
+#: dir.c:3565 dir.c:3570
#, c-format
msgid "could not create directories for %s"
msgstr "impossibile creare le directory per %s"
-#: dir.c:3486
+#: 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'"
-#: environment.c:149
+#: environment.c:150
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "percorso spazio dei nomi git \"%s\" non valido"
-#: environment.c:331
+#: environment.c:337
#, c-format
msgid "could not set GIT_DIR to '%s'"
msgstr "impossibile impostare GIT_DIR a '%s'"
@@ -3850,247 +3982,265 @@
msgid "too many args to run %s"
msgstr "troppi argomenti per eseguire %s"
-#: fetch-pack.c:150
+#: fetch-pack.c:176
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: attesa lista shallow"
-#: fetch-pack.c:153
+#: 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:164
+#: 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:184
+#: 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:195
+#: fetch-pack.c:221
msgid "unable to write to remote"
msgstr "impossibile scrivere sul remoto"
-#: fetch-pack.c:257
+#: fetch-pack.c:282
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc richiede multi_ack_detailed"
-#: fetch-pack.c:356 fetch-pack.c:1340
+#: fetch-pack.c:375 fetch-pack.c:1397
#, c-format
msgid "invalid shallow line: %s"
msgstr "riga shallow non valida: '%s'"
-#: fetch-pack.c:362 fetch-pack.c:1346
+#: fetch-pack.c:381 fetch-pack.c:1403
#, c-format
msgid "invalid unshallow line: %s"
msgstr "riga unshallow non valida: '%s'"
-#: fetch-pack.c:364 fetch-pack.c:1348
+#: fetch-pack.c:383 fetch-pack.c:1405
#, c-format
msgid "object not found: %s"
msgstr "oggetto non trovato: %s"
-#: fetch-pack.c:367 fetch-pack.c:1351
+#: fetch-pack.c:386 fetch-pack.c:1408
#, c-format
msgid "error in object: %s"
msgstr "errore nell'oggetto: %s"
-#: fetch-pack.c:369 fetch-pack.c:1353
+#: fetch-pack.c:388 fetch-pack.c:1410
#, c-format
msgid "no shallow found: %s"
msgstr "nessuno shallow trovato: %s"
-#: fetch-pack.c:372 fetch-pack.c:1357
+#: 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:414
+#: fetch-pack.c:431
#, c-format
msgid "got %s %d %s"
msgstr "ricevuto %s %d %s"
-#: fetch-pack.c:431
+#: fetch-pack.c:448
#, c-format
msgid "invalid commit %s"
msgstr "commit non valido: %s"
-#: fetch-pack.c:462
+#: fetch-pack.c:479
msgid "giving up"
msgstr "smetto di provare"
-#: fetch-pack.c:475 progress.c:323
+#: fetch-pack.c:492 progress.c:339
msgid "done"
msgstr "fatto"
-#: fetch-pack.c:487
+#: fetch-pack.c:504
#, c-format
msgid "got %s (%d) %s"
msgstr "ricevuto %s (%d) %s"
-#: fetch-pack.c:533
+#: fetch-pack.c:540
#, c-format
msgid "Marking %s as complete"
msgstr "Contrassegno %s come completo"
-#: fetch-pack.c:754
+#: fetch-pack.c:755
#, c-format
msgid "already have %s (%s)"
msgstr "ho già %s (%s)"
-#: fetch-pack.c:818
+#: 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:826
+#: fetch-pack.c:832
msgid "protocol error: bad pack header"
msgstr "errore protocollo: intestazione pack non valida"
-#: fetch-pack.c:900
+#: 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:916
+#: fetch-pack.c:933
#, c-format
msgid "%s failed"
msgstr "%s non riuscito"
-#: fetch-pack.c:918
+#: fetch-pack.c:935
msgid "error in sideband demultiplexer"
msgstr "errore nel demultiplexer della banda laterale"
-#: fetch-pack.c:965
+#: fetch-pack.c:978
#, c-format
msgid "Server version is %.*s"
msgstr "La versione del server è %.*s"
-#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985
-#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001
-#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017
-#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039
+#: fetch-pack.c: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:972
+#: fetch-pack.c:985
msgid "Server does not support shallow clients"
msgstr "Il server non supporta client shallow"
-#: fetch-pack.c:1032
+#: fetch-pack.c:1045
msgid "Server does not support --shallow-since"
msgstr "Il server non supporta --shallow-since"
-#: fetch-pack.c:1037
+#: fetch-pack.c:1050
msgid "Server does not support --shallow-exclude"
msgstr "Il server non supporta --shallow-exclude"
-#: fetch-pack.c:1041
+#: fetch-pack.c:1054
msgid "Server does not support --deepen"
msgstr "Il server non supporta --deepen"
-#: fetch-pack.c:1058
+#: 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:1070 fetch-pack.c:1536
+#: fetch-pack.c:1081 fetch-pack.c:1619
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: recupero non riuscito."
+#: 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:1216
+#: fetch-pack.c:1236
msgid "Server supports filter"
msgstr "Il server supporta filter"
-#: fetch-pack.c:1239
+#: fetch-pack.c:1275
msgid "unable to write request to remote"
msgstr "impossibile scrivere la richiesta sul remoto"
-#: fetch-pack.c:1257
+#: 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:1263
+#: fetch-pack.c:1299
#, c-format
msgid "expected '%s', received '%s'"
msgstr "atteso '%s', ricevuto '%s'"
-#: fetch-pack.c:1303
+#: fetch-pack.c:1360
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "riga di conferma inattesa: '%s'"
-#: fetch-pack.c:1308
+#: fetch-pack.c:1365
#, c-format
msgid "error processing acks: %d"
msgstr "errore durante l'elaborazione degli ack: %d"
-#: fetch-pack.c:1318
+#: 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:1320
+#: 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:1362
+#: fetch-pack.c:1419
#, c-format
msgid "error processing shallow info: %d"
msgstr "errore durante l'elaborazione delle informazioni shallow: %d"
-#: fetch-pack.c:1409
+#: fetch-pack.c:1466
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "atteso wanted-ref, ricevuto '%s'"
-#: fetch-pack.c:1414
+#: fetch-pack.c:1471
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "wanted-ref inatteso: '%s'"
-#: fetch-pack.c:1419
+#: fetch-pack.c:1476
#, c-format
msgid "error processing wanted refs: %d"
msgstr "errore durante l'elaborazione dei riferimenti desiderati: %d"
-#: fetch-pack.c:1762
+#: 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:1785 builtin/clone.c:689
+#: 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:1812
+#: fetch-pack.c:1937
#, c-format
msgid "no such remote ref %s"
msgstr "riferimento remoto non esistente: %s"
-#: fetch-pack.c:1815
+#: 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:408
-msgid "gpg failed to sign the data"
-msgstr "gpg non è riuscito a firmare i dati"
-
-#: gpg-interface.c:434
+#: gpg-interface.c:272
msgid "could not create temporary file"
msgstr "impossibile creare il file temporaneo"
-#: gpg-interface.c:437
+#: gpg-interface.c:275
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "scrittura della firma separata in '%s' non riuscita"
+#: 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"
@@ -4109,7 +4259,7 @@
msgid "'%s': unable to read %s"
msgstr "'%s': impossibile leggere %s"
-#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82
+#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
@@ -4172,42 +4322,42 @@
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"
@@ -4216,31 +4366,31 @@
"'%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"
@@ -4254,16 +4404,16 @@
"\n"
"I comandi maggiormente simili sono"
-#: help.c:714
+#: help.c:656
msgid "git version [<options>]"
msgstr "git version [<opzioni>]"
-#: help.c:783
+#: help.c:711
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:787
+#: help.c:715
msgid ""
"\n"
"Did you mean this?"
@@ -4277,7 +4427,15 @@
"\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"
@@ -4303,41 +4461,84 @@
"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:635
+#: ident.c:454 builtin/commit.c:634
#, c-format
msgid "invalid date format: %s"
msgstr "formato data non valido: %s"
+#: list-objects-filter-options.c:81
+msgid "expected 'tree:<depth>'"
+msgstr "atteso 'tree:<profondità>'"
+
+#: 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 "invalid filter-spec '%s'"
+msgstr "specificatore filtro '%s' non valido"
+
+#: list-objects-filter-options.c:125
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr ""
+"è necessario eseguire l'escape del carattere nello specificatore del "
+"sottofiltro: '%c'"
+
+#: list-objects-filter-options.c:167
+msgid "expected something after combine:"
+msgstr "atteso qualcosa dopo la ricombinazione:"
+
+#: 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: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.c:492
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "impossibile accedere al blob sparse in '%s'"
+
+#: list-objects-filter.c:495
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "impossibile analizzare i dati filtro sparse in %s"
+
#: list-objects.c:127
#, c-format
msgid "entry '%s' in tree %s has tree mode, but is not a tree"
@@ -4353,45 +4554,7 @@
msgid "unable to load root tree for commit %s"
msgstr "impossibile caricare l'albero radice per il commit %s"
-#: list-objects-filter.c:492
-#, c-format
-msgid "unable to access sparse blob in '%s'"
-msgstr "impossibile accedere al blob sparse in '%s'"
-
-#: list-objects-filter.c:495
-#, c-format
-msgid "unable to parse sparse filter data in %s"
-msgstr "impossibile analizzare i dati filtro sparse in %s"
-
-#: list-objects-filter-options.c:58
-msgid "expected 'tree:<depth>'"
-msgstr "atteso 'tree:<profondità>'"
-
-#: list-objects-filter-options.c:73
-msgid "sparse:path filters support has been dropped"
-msgstr "il supporto per i filtri sparse:percorso è stato rimosso"
-
-#: list-objects-filter-options.c:86
-#, c-format
-msgid "invalid filter-spec '%s'"
-msgstr "specificatore filtro '%s' non valido"
-
-#: list-objects-filter-options.c:102
-#, c-format
-msgid "must escape char in sub-filter-spec: '%c'"
-msgstr ""
-"è necessario eseguire l'escape del carattere nello specificatore del "
-"sottofiltro: '%c'"
-
-#: list-objects-filter-options.c:144
-msgid "expected something after combine:"
-msgstr "atteso qualcosa dopo la ricombinazione:"
-
-#: list-objects-filter-options.c:226
-msgid "multiple filter-specs cannot be combined"
-msgstr "non è possibile combinare più specificatori filtro"
-
-#: lockfile.c:151
+#: lockfile.c:152
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
@@ -4411,20 +4574,14 @@
"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"
-
-#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913
-#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810
-#: builtin/stash.c:265
-msgid "unable to write new index file"
-msgstr "impossibile scrivere il nuovo file index"
+#: ls-refs.c:109
+msgid "expected flush after ls-refs arguments"
+msgstr "atteso flush dopo argomenti ls-refs"
#: merge-recursive.c:356
msgid "(bad commit)\n"
@@ -4614,7 +4771,7 @@
msgid "renamed"
msgstr "rinominato"
-#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117
+#: 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"
@@ -4655,14 +4812,14 @@
msgid " (left unresolved)"
msgstr " (lasciato irrisolto)"
-#: merge-recursive.c:1793
+#: 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:2056
+#: merge-recursive.c:2068
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -4673,7 +4830,7 @@
"perché la directory %s è stata ridenominata in più directory diverse e "
"nessuna directory di destinazione contiene la maggior parte dei file."
-#: merge-recursive.c:2088
+#: merge-recursive.c:2100
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -4683,7 +4840,7 @@
"%s è d'ostacolo alle seguenti ridenominazioni directory che spostano in tale "
"posizione i seguenti percorsi: %s."
-#: merge-recursive.c:2098
+#: merge-recursive.c:2110
#, c-format
msgid ""
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -4693,7 +4850,7 @@
"un percorso in %s; delle ridenominazioni directory implicite hanno tentato "
"di spostare in tale posizione i seguenti percorsi: %s"
-#: merge-recursive.c:2190
+#: merge-recursive.c:2202
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -4702,7 +4859,7 @@
"CONFLITTO (ridenominazione/ridenominazione): directory ridenominata %s->%s "
"in %s. Directory ridenominata %s->%s in %s"
-#: merge-recursive.c:2435
+#: merge-recursive.c:2447
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -4711,52 +4868,52 @@
"ATTENZIONE: evito di applicare la ridenominazione %s -> %s a %s perché %s "
"stesso è stato ridenominato."
-#: merge-recursive.c:2961
+#: merge-recursive.c:2973
#, c-format
msgid "cannot read object %s"
msgstr "impossibile leggere l'oggetto %s"
-#: merge-recursive.c:2964
+#: merge-recursive.c:2976
#, c-format
msgid "object %s is not a blob"
msgstr "l'oggetto %s non è un blob"
-#: merge-recursive.c:3028
+#: merge-recursive.c:3040
msgid "modify"
msgstr "modifica"
-#: merge-recursive.c:3028
+#: merge-recursive.c:3040
msgid "modified"
msgstr "modificato"
-#: merge-recursive.c:3040
+#: merge-recursive.c:3052
msgid "content"
msgstr "contenuto"
-#: merge-recursive.c:3044
+#: merge-recursive.c:3056
msgid "add/add"
msgstr "aggiunta/aggiunta"
-#: merge-recursive.c:3067
+#: 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:3089 git-submodule.sh:1003
+#: merge-recursive.c:3101
msgid "submodule"
msgstr "sottomodulo"
-#: merge-recursive.c:3090
+#: merge-recursive.c:3102
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLITTO (%s): conflitto di merge in %s"
-#: merge-recursive.c:3120
+#: merge-recursive.c:3132
#, c-format
msgid "Adding as %s instead"
msgstr "Lo aggiungo come %s"
-#: merge-recursive.c:3203
+#: merge-recursive.c:3215
#, c-format
msgid ""
"Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4765,7 +4922,7 @@
"Percorso aggiornato: %s aggiunto in %s in una directory ridenominata in %s; "
"lo sposto in %s."
-#: merge-recursive.c:3206
+#: merge-recursive.c:3218
#, c-format
msgid ""
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4774,7 +4931,7 @@
"CONFLITTO (posizione file): %s aggiunto in %s in una directory ridenominata "
"in %s, il che suggerisce che forse dovrebbe essere spostato in %s."
-#: merge-recursive.c:3210
+#: merge-recursive.c:3222
#, c-format
msgid ""
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4783,7 +4940,7 @@
"Percorso aggiornato: %s ridenominato in %s in %s in una directory "
"ridenominata in %s; lo sposto in %s."
-#: merge-recursive.c:3213
+#: merge-recursive.c:3225
#, c-format
msgid ""
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4793,61 +4950,61 @@
"ridenominata in %s, il che suggerisce che forse dovrebbe essere spostato in "
"%s."
-#: merge-recursive.c:3327
+#: merge-recursive.c:3339
#, c-format
msgid "Removing %s"
msgstr "Rimozione di %s"
-#: merge-recursive.c:3350
+#: merge-recursive.c:3362
msgid "file/directory"
msgstr "file/directory"
-#: merge-recursive.c:3355
+#: merge-recursive.c:3367
msgid "directory/file"
msgstr "directory/file"
-#: merge-recursive.c:3362
+#: 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:3371
+#: merge-recursive.c:3383
#, c-format
msgid "Adding %s"
msgstr "Aggiunta %s"
-#: merge-recursive.c:3380
+#: 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:3424
+#: merge-recursive.c:3436
msgid "Already up to date!"
msgstr "Già aggiornato!"
-#: merge-recursive.c:3433
+#: 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:3537
+#: merge-recursive.c:3550
msgid "Merging:"
msgstr "Merge in corso:"
-#: merge-recursive.c:3550
+#: 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:3600
+#: merge-recursive.c:3613
msgid "merge returned no commit"
msgstr "il merge non ha restituito alcun commit"
-#: merge-recursive.c:3659
+#: merge-recursive.c:3672
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -4856,167 +5013,191 @@
"Le tue modifiche locali ai seguenti file sarebbero sovrascritte dal merge:\n"
" %s"
-#: merge-recursive.c:3756
+#: merge-recursive.c:3769
#, c-format
msgid "Could not parse object '%s'"
msgstr "Impossibile analizzare l'oggetto '%s'"
-#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877
+#: merge-recursive.c:3787 builtin/merge.c:702 builtin/merge.c:881
msgid "Unable to write index."
msgstr "Impossibile scrivere l'indice."
-#: midx.c:68
+#: 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:84
+#: 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:89
+#: midx.c:100
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "versione %d multi-pack-index non riconosciuta"
-#: midx.c:94
+#: 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:108
+#: midx.c:122
msgid "invalid chunk offset (too large)"
msgstr "offset blocco non valido (troppo grande)"
-#: midx.c:132
+#: 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:145
+#: 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:147
+#: 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:149
+#: 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:151
+#: 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:165
+#: 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:210
+#: 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:260
+#: 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:288
+#: midx.c:300
msgid "error preparing packfile from multi-pack-index"
msgstr "errore durante la preparazione del packfile dal multi-pack-index"
-#: midx.c:472
+#: midx.c:485
#, c-format
msgid "failed to add packfile '%s'"
msgstr "aggiunta del packfile '%s' non riuscita"
-#: midx.c:478
+#: midx.c:491
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "apertura del pack-index '%s' non riuscita"
-#: midx.c:538
+#: midx.c:551
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "ricerca dell'oggetto %d nel packfile non riuscita"
-#: midx.c:842
+#: midx.c:853
msgid "Adding packfiles to multi-pack-index"
msgstr "Aggiunta dei file pack al multi-pack-index in corso"
-#: midx.c:875
+#: 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:973
+#: 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:1052
+#: 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:1108
+#: 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:1123
+#: 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:1128
+#: midx.c:1152
+msgid "the midx contains no oid"
+msgstr "il midx non contiene alcun OID"
+
+#: midx.c:1161
msgid "Verifying OID order in multi-pack-index"
msgstr "Verifica ordine OID nel multi-pack-index in corso"
-#: midx.c:1137
+#: 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:1157
+#: midx.c:1190
msgid "Sorting objects by packfile"
msgstr "Ordinamento degli oggetti nel packfile in corso"
-#: midx.c:1164
+#: midx.c:1197
msgid "Verifying object offsets"
msgstr "Verifica offset oggetti in corso"
-#: midx.c:1180
+#: 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:1186
+#: 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:1195
+#: 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:1220
+#: midx.c:1253
msgid "Counting referenced objects"
msgstr "Conteggio degli oggetti referenziati in corso"
-#: midx.c:1230
+#: midx.c:1263
msgid "Finding and deleting unreferenced packfiles"
msgstr "Ricerca ed eliminazione dei file pack non referenziati in corso"
-#: midx.c:1388
+#: midx.c:1454
msgid "could not start pack-objects"
msgstr "impossibile avviare pack-objects"
-#: midx.c:1407
+#: midx.c:1474
msgid "could not finish pack-objects"
msgstr "impossibile finire pack-objects"
@@ -5102,26 +5283,46 @@
msgid "hash mismatch %s"
msgstr "hash non corrispondente: %s"
-#: packfile.c:629
+#: 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?)"
-#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134
+#: parse-options-cb.c:20 parse-options-cb.c:24
#, c-format
-msgid "unable to get size of %s"
-msgstr "impossibile recuperare le dimensioni di %s"
+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
@@ -5164,26 +5365,31 @@
msgid "did you mean `--%s` (with two dashes)?"
msgstr "forse intendevi `--%s` (con due trattini)?"
-#: parse-options.c:857
+#: 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:859
+#: parse-options.c:864
#, c-format
msgid "unknown switch `%c'"
msgstr "opzione `%c` sconosciuta"
-#: parse-options.c:861
+#: 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:885
+#: parse-options.c:890
msgid "..."
msgstr "..."
-#: parse-options.c:904
+#: parse-options.c:909
#, c-format
msgid "usage: %s"
msgstr "uso: %s"
@@ -5191,45 +5397,20 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:910
+#: parse-options.c:915
#, c-format
msgid " or: %s"
msgstr " oppure: %s"
-#: parse-options.c:913
+#: parse-options.c:918
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:952
+#: parse-options.c:957
msgid "-NUM"
msgstr "-NUM"
-#: parse-options.c:966
-#, 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:915
#, c-format
msgid "Could not make %s writable by group"
@@ -5292,28 +5473,28 @@
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: 'literal' e 'glob' non sono compatibili"
-#: pathspec.c:442
+#: pathspec.c:445
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr "%s: '%s' è al di fuori del repository in '%s'"
-#: pathspec.c:517
+#: pathspec.c:521
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s' (opzione mnemonica: '%c')"
-#: pathspec.c:527
+#: 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:594
+#: 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:639
+#: pathspec.c:643
#, c-format
msgid "line is badly quoted: %s"
msgstr "la riga non è ben racchiusa tra virgolette: %s"
@@ -5327,46 +5508,50 @@
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"
@@ -5380,92 +5565,116 @@
msgid "unable to create threaded lstat: %s"
msgstr "impossibile creare lstat in versione threaded: %s"
-#: pretty.c:981
+#: pretty.c:983
msgid "unable to parse --pretty format"
msgstr "impossibile analizzare il formato --pretty"
-#: promisor-remote.c:23
-msgid "Remote with no URL"
-msgstr "Remoto senza URL"
+#: promisor-remote.c:30
+msgid "promisor-remote: unable to fork off fetch subprocess"
+msgstr ""
+"promisor-remote: impossibile eseguire il fork del sottoprocesso di fetch"
-#: promisor-remote.c:58
+#: 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"
-#: range-diff.c:75
+#: 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:77
+#: range-diff.c:79
msgid "could not read `log` output"
msgstr "impossibile leggere l'output di `log`"
-#: range-diff.c:96 sequencer.c:5020
+#: range-diff.c:98 sequencer.c:5283
#, c-format
msgid "could not parse commit '%s'"
msgstr "impossibile analizzare il commit '%s'"
-#: range-diff.c:122
+#: 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:285
+#: range-diff.c:301
msgid "failed to generate diff"
msgstr "generazione del diff non riuscita"
-#: range-diff.c:518 range-diff.c:520
+#: 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:1330
+#: 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:1536
+#: read-cache.c:1524
msgid "Refresh index"
msgstr "Aggiornamento indice"
-#: read-cache.c:1651
+#: read-cache.c:1639
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -5474,7 +5683,7 @@
"index.version impostato, ma il valore non è valido.\n"
"Uso la versione %i"
-#: read-cache.c:1661
+#: read-cache.c:1649
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -5483,139 +5692,139 @@
"GIT_INDEX_VERSION impostato, ma il valore non è valido.\n"
"Uso la versione %i"
-#: read-cache.c:1717
+#: read-cache.c:1705
#, c-format
msgid "bad signature 0x%08x"
msgstr "firma non valida: 0x%08x"
-#: read-cache.c:1720
+#: read-cache.c:1708
#, c-format
msgid "bad index version %d"
msgstr "versione indice non valida: %d"
-#: read-cache.c:1729
+#: read-cache.c:1717
msgid "bad index file sha1 signature"
msgstr "firma SHA1 file indice non valida"
-#: read-cache.c:1759
+#: 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:1761
+#: read-cache.c:1749
#, c-format
msgid "ignoring %.4s extension"
msgstr "estensione %.4s ignorata"
-#: read-cache.c:1798
+#: read-cache.c:1786
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "formato voce indice sconosciuto: 0x%08x"
-#: read-cache.c:1814
+#: 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:1871
+#: read-cache.c:1859
msgid "unordered stage entries in index"
msgstr "voci stage non ordinate nell'indice"
-#: read-cache.c:1874
+#: 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:1877
+#: read-cache.c:1865
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "voci stage non ordinate per '%s'"
-#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
-#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
-#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
-#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
-#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
+#: 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:2124
+#: 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:2137
+#: 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:2170
+#: read-cache.c:2161
#, c-format
msgid "%s: index file open failed"
msgstr "%s: apertura del file indice non riuscita"
-#: read-cache.c:2174
+#: read-cache.c:2165
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s: impossibile eseguire stat sull'indice aperto"
-#: read-cache.c:2178
+#: 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:2182
+#: read-cache.c:2173
#, c-format
msgid "%s: unable to map index file"
msgstr "%s: impossibile mappare il file indice"
-#: read-cache.c:2224
+#: 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:2251
+#: 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:2283
+#: read-cache.c:2274
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "impossibile aggiornare l'indice condiviso '%s'"
-#: read-cache.c:2330
+#: 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:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122
+#: 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:3129 sequencer.c:2343 sequencer.c:3959
+#: 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:3142
+#: read-cache.c:3133
#, c-format
msgid "unable to open git dir: %s"
msgstr "impossibile aprire la directory git: %s"
-#: read-cache.c:3154
+#: read-cache.c:3145
#, c-format
msgid "unable to unlink: %s"
msgstr "impossibile eseguire unlink: %s"
-#: read-cache.c:3179
+#: read-cache.c:3170
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "impossibile correggere i permessi di '%s'"
-#: read-cache.c:3328
+#: read-cache.c:3319
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s: impossibile ripiegare sullo stadio 0"
@@ -5690,7 +5899,7 @@
msgstr[0] "Rebase di %s su %s (%d comando)"
msgstr[1] "Rebase di %s su %s (%d comandi)"
-#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228
+#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -5699,7 +5908,7 @@
"Non eliminare alcuna riga. Usa esplicitamente 'drop' per rimuovere un "
"commit.\n"
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232
+#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -5707,7 +5916,7 @@
"\n"
"Rimuovendo una riga da qui IL COMMIT CORRISPONDENTE ANDRÀ PERDUTO.\n"
-#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871
+#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -5721,7 +5930,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:86 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"
@@ -5731,14 +5940,14 @@
"Ciò nonostante, se rimuovi tutto, il rebase sarà annullato.\n"
"\n"
-#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444
-#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252
+#: rebase-interactive.c: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:116 builtin/rebase.c:184 builtin/rebase.c:210
-#: builtin/rebase.c:234
+#: rebase-interactive.c:116 builtin/rebase.c:196 builtin/rebase.c:222
+#: builtin/rebase.c:246
#, c-format
msgid "could not write '%s'."
msgstr "impossibile scrivere '%s'."
@@ -5771,132 +5980,14 @@
"I comportamenti possibili sono ignore, warn, error.\n"
"\n"
-#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262
-#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221
-#: builtin/rebase.c:246
+#: 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 "impossibile leggere '%s'."
-#: refs.c:262
-#, 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:2098
-#, 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:407 sequencer.c:2701 sequencer.c:2905
-#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157
-#: wrapper.c:620
-#, c-format
-msgid "could not write to '%s'"
-msgstr "impossibile scrivere su '%s'"
-
-#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719
-#: builtin/rebase.c:1029
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "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:2023
-#, c-format
-msgid "multiple updates for ref '%s' not allowed"
-msgstr "aggiornamenti multipli per il riferimento '%s' non consentiti"
-
-#: refs.c:2055
-msgid "ref updates forbidden inside quarantine environment"
-msgstr "aggiornamenti riferimento vietati nell'ambiente quarantena"
-
-#: refs.c:2151 refs.c:2181
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr "'%s' esiste già; impossibile creare '%s'"
-
-#: refs.c:2157 refs.c:2192
-#, c-format
-msgid "cannot process '%s' and '%s' at the same time"
-msgstr "impossibile gestire '%s' e '%s' contemporaneamente"
-
-#: refs/files-backend.c:1233
-#, c-format
-msgid "could not remove reference %s"
-msgstr "impossibile rimuovere il riferimento %s"
-
-#: refs/files-backend.c:1247 refs/packed-backend.c:1541
-#: refs/packed-backend.c:1551
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "impossibile eliminare il riferimento %s: %s"
-
-#: refs/files-backend.c:1250 refs/packed-backend.c:1554
-#, 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"
-
-#: ref-filter.c:42 wt-status.c:1938
+#: ref-filter.c:42 wt-status.c:1973
msgid "gone"
msgstr "sparito"
@@ -5915,122 +6006,127 @@
msgid "ahead %d, behind %d"
msgstr "dopo %d, prima di %d"
-#: ref-filter.c:165
+#: ref-filter.c:169
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "formato atteso: %%(color:<colore>)"
-#: ref-filter.c:167
+#: ref-filter.c:171
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "colore non riconosciuto: %%(color:%s)"
-#: ref-filter.c:189
+#: ref-filter.c:193
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Atteso valore intero: refname:lstrip=%s"
-#: ref-filter.c:193
+#: ref-filter.c:197
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Atteso valore intero: refname:rstrip=%s"
-#: ref-filter.c:195
+#: ref-filter.c:199
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "argomento %%(%s) non riconosciuto: %s"
-#: ref-filter.c:250
+#: ref-filter.c:254
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) non accetta argomenti"
-#: ref-filter.c:272
+#: ref-filter.c:276
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr "argomento %%(objectsize) non riconosciuto: %s"
-#: ref-filter.c:280
+#: ref-filter.c:284
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) non accetta argomenti"
-#: ref-filter.c:292
+#: ref-filter.c:296
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) non accetta argomenti"
-#: ref-filter.c:301
+#: 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:323
+#: ref-filter.c:330
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "argomento %%(trailers) sconosciuto: %s"
-#: ref-filter.c:352
+#: ref-filter.c:363
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "atteso valore positivo in contents:lines=%s"
-#: ref-filter.c:354
+#: ref-filter.c:365
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "argomento %%(contents) non riconosciuto: %s"
-#: ref-filter.c:369
+#: 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:373
+#: 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:403
+#: 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:415
+#: ref-filter.c:440
#, c-format
msgid "unrecognized position:%s"
msgstr "valore non riconosciuto: position:%s"
-#: ref-filter.c:422
+#: ref-filter.c:447
#, c-format
msgid "unrecognized width:%s"
msgstr "valore non riconosciuto: width:%s"
-#: ref-filter.c:431
+#: ref-filter.c:456
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "argomento %%(align) non riconosciuto: %s"
-#: ref-filter.c:439
+#: 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:457
+#: ref-filter.c:482
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "argomento %%(if) non riconosciuto: %s"
-#: ref-filter.c:559
+#: ref-filter.c:584
#, c-format
msgid "malformed field name: %.*s"
msgstr "nome campo malformato: %.*s"
-#: ref-filter.c:586
+#: ref-filter.c:611
#, c-format
msgid "unknown field name: %.*s"
msgstr "nome campo sconosciuto: %.*s"
-#: ref-filter.c:590
+#: ref-filter.c:615
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
@@ -6038,160 +6134,244 @@
"non è un repository git, ma il campo '%.*s' richiede l'accesso ai dati "
"oggetto"
-#: ref-filter.c:714
+#: 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:777
+#: 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:779
+#: 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:781
+#: ref-filter.c:806
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "formato: atomo %%(then) usato dopo %%(else)"
-#: ref-filter.c:809
+#: 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:811
+#: 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:813
+#: 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:828
+#: 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:885
+#: ref-filter.c:910
#, c-format
msgid "malformed format string %s"
msgstr "stringa di formato %s malformata"
-#: ref-filter.c:1488
+#: ref-filter.c:1541
#, c-format
msgid "no branch, rebasing %s"
msgstr "nessun branch, eseguo il rebase di %s"
-#: ref-filter.c:1491
+#: 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:1494
+#: ref-filter.c:1547
#, c-format
msgid "no branch, bisect started on %s"
msgstr "nessun branch, bisezione avviata su %s"
-#: ref-filter.c:1504
+#: ref-filter.c:1557
msgid "no branch"
msgstr "nessun branch"
-#: ref-filter.c:1540 ref-filter.c:1749
+#: 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:1550
+#: 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:2004
+#: ref-filter.c:2054
#, c-format
msgid "malformed object at '%s'"
msgstr "oggetto malformato in '%s'"
-#: ref-filter.c:2093
+#: 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:2389
+#: ref-filter.c:2148 refs.c:657
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "ignoro il riferimento rotto %s"
+
+#: ref-filter.c:2464
#, c-format
msgid "format: %%(end) atom missing"
msgstr "formato: atomo %%(end) mancante"
-#: ref-filter.c:2489
-#, c-format
-msgid "option `%s' is incompatible with --merged"
-msgstr "l'opzione `%s' non è compatibile con --merged"
-
-#: ref-filter.c:2492
-#, c-format
-msgid "option `%s' is incompatible with --no-merged"
-msgstr "l'opzione `%s' non è compatibile con --no-merged"
-
-#: ref-filter.c:2502
+#: ref-filter.c:2563
#, c-format
msgid "malformed object name %s"
msgstr "nome dell'oggetto %s malformato"
-#: ref-filter.c:2507
+#: 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:366
+#: 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:414
+#: 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:422
+#: 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:612
+#: 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:616
+#: remote.c:594
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s solitamente traccia %s, non %s"
-#: remote.c:620
+#: remote.c:598
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s traccia sia %s sia %s"
-#: remote.c:688
+#: remote.c:666
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr "la chiave '%s' del pattern non aveva un '*'"
-#: remote.c:698
+#: remote.c:676
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr "il valore '%s' del pattern non ha un '*'"
-#: remote.c:1004
+#: remote.c:1073
#, c-format
msgid "src refspec %s does not match any"
msgstr "nessuna corrispondenza per lo specificatore riferimento sorgente %s"
-#: remote.c:1009
+#: remote.c:1078
#, c-format
msgid "src refspec %s matches more than one"
msgstr ""
@@ -6202,7 +6382,7 @@
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1024
+#: remote.c:1093
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
@@ -6228,7 +6408,7 @@
"Nessuna delle due opzioni ha funzionato, quindi ci siamo arresi.\n"
"Devi specificare un riferimento completamente qualificato."
-#: remote.c:1044
+#: remote.c:1113
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
@@ -6239,7 +6419,7 @@
"è un oggetto tag. Forse intendevi creare un nuovo\n"
"branch eseguendo il push a '%s:refs/heads/%s'?"
-#: remote.c:1049
+#: remote.c:1118
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
@@ -6250,7 +6430,7 @@
"è un oggetto tag. Forse intendevi creare un nuovo\n"
"branch eseguendo il push a '%s:refs/tags/%s'?"
-#: remote.c:1054
+#: remote.c:1123
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
@@ -6262,7 +6442,7 @@
"tag a un nuovo albero eseguendo il push a\n"
"'%s:refs/tags/%s'?"
-#: remote.c:1059
+#: remote.c:1128
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
@@ -6274,121 +6454,121 @@
"tag a un nuovo blob eseguendo il push a\n"
"'%s:refs/tags/%s'?"
-#: remote.c:1095
+#: remote.c:1164
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "%s non può essere risolto in un branch"
-#: remote.c:1106
+#: 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:1118
+#: 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:1125
+#: 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:1628 remote.c:1729
+#: remote.c:1703 remote.c:1804
msgid "HEAD does not point to a branch"
msgstr "HEAD non punta ad un branch"
-#: remote.c:1637
+#: remote.c:1712
#, c-format
msgid "no such branch: '%s'"
msgstr "branch '%s' non esistente"
-#: remote.c:1640
+#: remote.c:1715
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "nessun upstream configurato per il branch '%s'"
-#: remote.c:1646
+#: 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:1661
+#: 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:1673
+#: 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:1683
+#: 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:1696
+#: remote.c:1771
msgid "push has no destination (push.default is 'nothing')"
msgstr "il push non ha una destinazione (push.default è 'nothing')"
-#: remote.c:1718
+#: remote.c:1793
msgid "cannot resolve 'simple' push to a single destination"
msgstr "impossibile risolvere il push 'simple' a una singola destinazione"
-#: remote.c:1844
+#: remote.c:1922
#, c-format
msgid "couldn't find remote ref %s"
msgstr "impossibile trovare il riferimento remoto %s"
-#: remote.c:1857
+#: remote.c:1935
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "* Ignoro localmente il riferimento strano '%s'"
-#: remote.c:2020
+#: 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:2024
+#: 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:2027
+#: 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:2031
+#: 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:2034
+#: remote.c:2112
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (usa \"%s\" per visualizzare i dettagli)\n"
-#: remote.c:2038
+#: 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:2044
+#: 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:2047
+#: remote.c:2125
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -6400,11 +6580,11 @@
"Il tuo branch, rispetto a '%s', è indietro di %d commit e ne posso eseguire "
"il fast forward.\n"
-#: remote.c:2055
+#: 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:2058
+#: remote.c:2136
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -6419,11 +6599,11 @@
"Il tuo branch e '%s' sono diventati divergenti\n"
"e hanno rispettivamente %d e %d commit differenti.\n"
-#: remote.c:2068
+#: 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:2251
+#: remote.c:2337
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "impossibile analizzare il nome oggetto atteso '%s'"
@@ -6501,8 +6681,8 @@
msgid "Recorded preimage for '%s'"
msgstr "Salvata preimmagine di '%s'"
-#: rerere.c:881 submodule.c:2078 builtin/log.c:1871
-#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
+#: rerere.c:881 submodule.c: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'"
@@ -6536,20 +6716,34 @@
msgid "unable to open rr-cache directory"
msgstr "impossibile aprire la directory cache rr"
-#: revision.c:2497
+#: 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:2500
+#: 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:2708
-msgid "--first-parent is incompatible with --bisect"
-msgstr "--first-parent non è compatibile con --bisect"
-
-#: revision.c:2712
+#: 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"
@@ -6557,12 +6751,12 @@
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"
@@ -6571,31 +6765,35 @@
"L'hook '%s' è stato ignorato perché non è impostato come eseguibile.\n"
"Puoi disabilitare quest'avviso con `git config advice.ignoredHook false`."
-#: send-pack.c:144
+#: send-pack.c: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:146
+#: 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:148
+#: send-pack.c:149
#, c-format
msgid "remote unpack failed: %s"
msgstr "decompressione sul remoto non riuscita: %s"
-#: send-pack.c:309
+#: send-pack.c:372
msgid "failed to sign the push certificate"
msgstr "firma del certificato per il push non riuscita"
-#: send-pack.c:423
+#: 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:425
+#: send-pack.c:471
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -6603,47 +6801,47 @@
"non invio un certificato push perché il ricevente non supporta i push --"
"signed"
-#: send-pack.c:437
+#: send-pack.c:483
msgid "the receiving end does not support --atomic push"
msgstr "il ricevente non supporta i push --atomic"
-#: send-pack.c:442
+#: send-pack.c:488
msgid "the receiving end does not support push options"
msgstr "il ricevente non supporta le opzioni push"
-#: sequencer.c:191
+#: sequencer.c:194
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "modalità pulizia messaggio commit non valida: '%s'"
-#: sequencer.c:296
+#: sequencer.c:308
#, c-format
msgid "could not delete '%s'"
msgstr "impossibile eliminare '%s'"
-#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385
+#: sequencer.c: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:325
+#: sequencer.c:339
msgid "revert"
msgstr "revert"
-#: sequencer.c:327
+#: sequencer.c:341
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:329
+#: sequencer.c:343
msgid "rebase"
msgstr "rebase"
-#: sequencer.c:331
+#: sequencer.c:345
#, c-format
msgid "unknown action: %d"
msgstr "azione sconosciuta: %d"
-#: sequencer.c:389
+#: sequencer.c:404
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -6651,7 +6849,7 @@
"dopo aver risolto i conflitti, contrassegna i percorsi corretti\n"
"con 'git add <path>' o 'git rm <path>'"
-#: sequencer.c:392
+#: sequencer.c:407
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -6661,44 +6859,43 @@
"con 'git add <path>' o 'git rm <path>' ed esegui\n"
"il commit del risultato con 'git commit'"
-#: sequencer.c:405 sequencer.c:2901
+#: sequencer.c:420 sequencer.c:3028
#, c-format
msgid "could not lock '%s'"
msgstr "impossibile bloccare '%s'"
-#: sequencer.c:412
+#: 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:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921
-#: sequencer.c:3185
+#: 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:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
-#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
-#: builtin/rebase.c:593
-#, c-format
-msgid "could not read '%s'"
-msgstr "impossibile leggere '%s'"
-
-#: sequencer.c:466
+#: 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:470
+#: 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:502
+#: sequencer.c:507
#, c-format
msgid "%s: fast-forward"
msgstr "%s: fast forward"
-#: sequencer.c:541 builtin/tag.c:565
+#: sequencer.c:546 builtin/tag.c:566
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Modalità pulizia non valida: %s"
@@ -6706,65 +6903,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:635
+#: sequencer.c:640
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: impossibile scrivere il nuovo file indice"
-#: sequencer.c:652
+#: sequencer.c:657
msgid "unable to update cache tree"
msgstr "impossibile aggiornare l'albero cache"
-#: sequencer.c:666
+#: sequencer.c:671
msgid "could not resolve HEAD commit"
msgstr "impossibile risolvere il commit HEAD"
-#: sequencer.c:746
+#: sequencer.c:751
#, c-format
msgid "no key present in '%.*s'"
msgstr "nessuna chiave presente in '%.*s'"
-#: sequencer.c:757
+#: sequencer.c:762
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "impossibile rimuovere gli apici dal valore di '%s'"
-#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710
-#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072
+#: sequencer.c: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:804
+#: sequencer.c:809
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "'GIT_AUTHOR_NAME' già specificato"
-#: sequencer.c:809
+#: sequencer.c:814
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "'GIT_AUTHOR_EMAIL' già specificato"
-#: sequencer.c:814
+#: sequencer.c:819
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "'GIT_AUTHOR_DATE' già specificato"
-#: sequencer.c:818
+#: sequencer.c:823
#, c-format
msgid "unknown variable '%s'"
msgstr "variabile '%s' sconosciuta"
-#: sequencer.c:823
+#: sequencer.c:828
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "'GIT_AUTHOR_NAME' mancante"
-#: sequencer.c:825
+#: sequencer.c:830
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "'GIT_AUTHOR_EMAIL' mancante"
-#: sequencer.c:827
+#: sequencer.c:832
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "'GIT_AUTHOR_DATE' mancante"
-#: sequencer.c:876
+#: sequencer.c:897
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -6794,11 +6991,11 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:1148
+#: sequencer.c:1178
msgid "'prepare-commit-msg' hook failed"
msgstr "hook 'prepare-commit-msg' non riuscito"
-#: sequencer.c:1154
+#: 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"
@@ -6825,7 +7022,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1167
+#: 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"
@@ -6851,328 +7048,342 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1209
+#: sequencer.c:1239
msgid "couldn't look up newly created commit"
msgstr "impossibile trovare il commit appena creato"
-#: sequencer.c:1211
+#: sequencer.c:1241
msgid "could not parse newly created commit"
msgstr "impossibile analizzare il commit appena creato"
-#: sequencer.c:1257
+#: sequencer.c:1287
msgid "unable to resolve HEAD after creating commit"
msgstr "impossibile risolvere HEAD dopo la creazione del commit"
-#: sequencer.c:1259
+#: sequencer.c:1289
msgid "detached HEAD"
msgstr "HEAD scollegato"
-#: sequencer.c:1263
+#: sequencer.c:1293
msgid " (root-commit)"
msgstr " (commit radice)"
-#: sequencer.c:1284
+#: sequencer.c:1314
msgid "could not parse HEAD"
msgstr "impossibile analizzare HEAD"
-#: sequencer.c:1286
+#: sequencer.c:1316
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "L'HEAD %s non è un commit!"
-#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574
+#: sequencer.c:1320 sequencer.c:1395 builtin/commit.c:1577
msgid "could not parse HEAD commit"
msgstr "impossibile analizzare il commit HEAD"
-#: sequencer.c:1342 sequencer.c:1968
+#: sequencer.c:1373 sequencer.c:2067
msgid "unable to parse commit author"
msgstr "impossibile analizzare l'autore del commit"
-#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687
+#: sequencer.c: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:1386 sequencer.c:1447
+#: 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:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886
-#: builtin/merge.c:911
+#: 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:1474
+#: 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:1479
+#: sequencer.c:1572
#, c-format
msgid "could not parse parent commit %s"
msgstr "impossibile analizzare il commit genitore %s"
-#: sequencer.c:1562 sequencer.c:1673
+#: sequencer.c:1655 sequencer.c:1766
#, c-format
msgid "unknown command: %d"
msgstr "comando sconosciuto: %d"
-#: sequencer.c:1620 sequencer.c:1645
+#: 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:1630
+#: sequencer.c:1723
msgid "need a HEAD to fixup"
msgstr "è necessaria un'HEAD per il fixup"
-#: sequencer.c:1632 sequencer.c:3212
+#: sequencer.c:1725 sequencer.c:3338
msgid "could not read HEAD"
msgstr "impossibile leggere l'HEAD"
-#: sequencer.c:1634
+#: sequencer.c:1727
msgid "could not read HEAD's commit message"
msgstr "impossibile leggere il messaggio di commit dell'HEAD"
-#: sequencer.c:1640
+#: sequencer.c:1733
#, c-format
msgid "cannot write '%s'"
msgstr "impossibile scrivere '%s'"
-#: sequencer.c:1647 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:1655
+#: sequencer.c:1748
#, c-format
msgid "could not read commit message of %s"
msgstr "impossibile leggere il messaggio di commit di %s"
-#: sequencer.c:1662
+#: sequencer.c:1755
#, c-format
msgid "This is the commit message #%d:"
msgstr "Questo è il messaggio di commit numero %d:"
-#: sequencer.c:1668
+#: sequencer.c:1761
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Il messaggio di commit numero %d sarà saltato:"
-#: sequencer.c:1756
+#: sequencer.c:1849
msgid "your index file is unmerged."
msgstr "il file indice non è stato sottoposto a merge."
-#: sequencer.c:1763
+#: sequencer.c:1856
msgid "cannot fixup root commit"
msgstr "impossibile eseguire il fixup sul commit radice"
-#: sequencer.c:1782
+#: 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:1790 sequencer.c:1798
+#: 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:1804
+#: 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:1823
+#: sequencer.c:1916
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: impossibile analizzare il commit genitore %s"
-#: sequencer.c:1888
+#: sequencer.c:1981
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "impossibile ridenominare '%s' in '%s'"
-#: sequencer.c:1943
+#: sequencer.c:2038
#, c-format
msgid "could not revert %s... %s"
msgstr "non è stato possibile eseguire il revert di %s... %s"
-#: sequencer.c:1944
+#: sequencer.c:2039
#, c-format
msgid "could not apply %s... %s"
msgstr "non è stato possibile applicare %s... %s"
-#: sequencer.c:1961
+#: 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:2018
+#: sequencer.c:2117
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: lettura dell'indice non riuscita"
-#: sequencer.c:2025
+#: sequencer.c:2124
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: aggiornamento dell'indice non riuscito"
-#: sequencer.c:2102
+#: sequencer.c:2201
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s non accetta argomenti: '%s'"
-#: sequencer.c:2111
+#: sequencer.c:2210
#, c-format
msgid "missing arguments for %s"
msgstr "argomenti mancanti per %s"
-#: sequencer.c:2142
+#: sequencer.c:2241
#, c-format
msgid "could not parse '%s'"
msgstr "impossibile analizzare '%s'"
-#: sequencer.c:2203
+#: sequencer.c:2302
#, c-format
msgid "invalid line %d: %.*s"
msgstr "riga %d non valida: %.*s"
-#: sequencer.c:2214
+#: sequencer.c:2313
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "impossibile eseguire '%s' senza un commit precedente"
-#: sequencer.c:2298
+#: sequencer.c:2399
msgid "cancelling a cherry picking in progress"
msgstr "annullo un'operazione di cherry-pick in corso"
-#: sequencer.c:2305
+#: sequencer.c:2408
msgid "cancelling a revert in progress"
msgstr "annullo un'operazione di revert in corso"
-#: sequencer.c:2349
+#: sequencer.c:2452
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "correggi la situazione usando 'git rebase --edit-todo'."
-#: sequencer.c:2351
+#: sequencer.c:2454
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "foglio istruzioni inutilizzabile: '%s'"
-#: sequencer.c:2356
+#: sequencer.c:2459
msgid "no commits parsed."
msgstr "nessun commit analizzato."
-#: sequencer.c:2367
+#: sequencer.c:2470
msgid "cannot cherry-pick during a revert."
msgstr "impossibile eseguire un cherry-pick durante un revert."
-#: sequencer.c:2369
+#: sequencer.c:2472
msgid "cannot revert during a cherry-pick."
msgstr "impossibile eseguire un revert durante un cherry-pick."
-#: sequencer.c:2447
+#: sequencer.c:2550
#, c-format
msgid "invalid value for %s: %s"
msgstr "valore non valido per %s: %s"
-#: sequencer.c:2540
+#: sequencer.c:2657
msgid "unusable squash-onto"
msgstr "squash-onto inutilizzabile"
-#: sequencer.c:2556
+#: sequencer.c:2677
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "foglio opzioni malformati: '%s'"
-#: sequencer.c:2644 sequencer.c:4361
+#: sequencer.c:2769 sequencer.c:4609
msgid "empty commit set passed"
msgstr "è stato passato un insieme di commit vuoto"
-#: sequencer.c:2660
+#: sequencer.c:2786
msgid "revert is already in progress"
msgstr "un'operazione di revert è già in corso"
-#: sequencer.c:2662
+#: sequencer.c:2788
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "prova \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:2665
+#: sequencer.c:2791
msgid "cherry-pick is already in progress"
msgstr "un'operazione di cherry-pick è già in corso"
-#: sequencer.c:2667
+#: 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:2681
+#: sequencer.c:2807
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "impossibile creare la directory sequencer '%s'"
-#: sequencer.c:2696
+#: sequencer.c:2822
msgid "could not lock HEAD"
msgstr "impossibile bloccare HEAD"
-#: sequencer.c:2756 sequencer.c:4099
+#: 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:2758 sequencer.c:2769
+#: sequencer.c:2884 sequencer.c:2895
msgid "cannot resolve HEAD"
msgstr "impossibile risolvere HEAD"
-#: sequencer.c:2760 sequencer.c:2804
+#: 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:2790 builtin/grep.c:724
+#: sequencer.c:2916 builtin/grep.c:745
#, c-format
msgid "cannot open '%s'"
msgstr "impossibile aprire '%s'"
-#: sequencer.c:2792
+#: sequencer.c:2918
#, c-format
msgid "cannot read '%s': %s"
msgstr "impossibile leggere '%s': %s"
-#: sequencer.c:2793
+#: sequencer.c:2919
msgid "unexpected end of file"
msgstr "fine del file inattesa"
-#: sequencer.c:2799
+#: 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:2810
+#: 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:2851
+#: sequencer.c:2977
msgid "no revert in progress"
msgstr "nessun revert in corso"
-#: sequencer.c:2859
+#: sequencer.c:2986
msgid "no cherry-pick in progress"
msgstr "nessun cherry-pick in corso"
-#: sequencer.c:2869
+#: sequencer.c:2996
msgid "failed to skip the commit"
msgstr "salto del commit non riuscito"
-#: sequencer.c:2876
+#: sequencer.c:3003
msgid "there is nothing to skip"
msgstr "non c'è nulla da saltare"
-#: sequencer.c:2879
+#: sequencer.c:3006
#, c-format
msgid ""
"have you committed already?\n"
@@ -7181,21 +7392,16 @@
"hai già eseguito il commit?\n"
"prova \"git %s --continue\""
-#: sequencer.c:3003 sequencer.c:4011
-#, c-format
-msgid "could not update %s"
-msgstr "impossibile aggiornare %s"
-
-#: sequencer.c:3042 sequencer.c:3991
+#: sequencer.c:3168 sequencer.c:4217
msgid "cannot read HEAD"
msgstr "impossibile leggere l'HEAD"
-#: sequencer.c:3059
+#: sequencer.c:3185
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "impossibile copiare '%s' in '%s'"
-#: sequencer.c:3067
+#: sequencer.c:3193
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -7214,22 +7420,27 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:3077
+#: sequencer.c:3203
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "Impossibile applicare %s... %.*s"
-#: sequencer.c:3084
+#: sequencer.c:3210
#, c-format
msgid "Could not merge %.*s"
msgstr "Impossibile eseguire il merge di %.*s"
-#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641
+#: sequencer.c: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:3129
+#: sequencer.c:3240
+#, c-format
+msgid "Executing: %s\n"
+msgstr "Eseguo %s\n"
+
+#: sequencer.c:3255
#, c-format
msgid ""
"execution failed: %s\n"
@@ -7244,11 +7455,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3135
+#: 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:3141
+#: sequencer.c:3267
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -7265,102 +7476,128 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3202
+#: sequencer.c:3328
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "nome etichetta illecito: '%.*s'"
-#: sequencer.c:3256
+#: sequencer.c:3382
msgid "writing fake root commit"
msgstr "scrittura commit radice falso in corso"
-#: sequencer.c:3261
+#: sequencer.c:3387
msgid "writing squash-onto"
msgstr "scrittura squash-onto in corso"
-#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886
-#, c-format
-msgid "failed to find tree of %s"
-msgstr "impossibile trovare l'albero di %s"
-
-#: sequencer.c:3344
+#: sequencer.c:3471
#, c-format
msgid "could not resolve '%s'"
msgstr "impossibile risolvere '%s'"
-#: sequencer.c:3375
+#: sequencer.c:3502
msgid "cannot merge without a current revision"
msgstr "impossibile eseguire il merge senza una revisione corrente"
-#: sequencer.c:3397
+#: sequencer.c:3524
#, c-format
msgid "unable to parse '%.*s'"
msgstr "impossibile analizzare '%.*s'"
-#: sequencer.c:3406
+#: sequencer.c:3533
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "non c'è nulla di cui eseguire il merge: '%.*s'"
-#: sequencer.c:3418
+#: 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:3434
+#: sequencer.c:3561
#, c-format
msgid "could not get commit message of '%s'"
msgstr "impossibile ottenere il messaggio di commit per '%s'"
-#: sequencer.c:3594
+#: 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:3610
+#: sequencer.c:3746
msgid "merge: Unable to write new index file"
msgstr "merge: impossibile scrivere il nuovo file indice"
-#: sequencer.c:3679 builtin/rebase.c:737
+#: sequencer.c: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:3691
+#: sequencer.c:3873
#, c-format
msgid "cannot store %s"
msgstr "impossibile memorizzare %s"
-#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113
+#: sequencer.c: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:3755
+#: sequencer.c:3881
+msgid "Applying autostash resulted in conflicts."
+msgstr "L'applicazione dello stash automatico ha generato dei conflitti."
+
+#: 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:3760 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:3775
+#: sequencer.c:3994
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Fermato a HEAD\n"
-#: sequencer.c:3777
+#: sequencer.c:3996
#, c-format
msgid "Stopped at %s\n"
msgstr "Fermato a %s\n"
-#: sequencer.c:3785
+#: sequencer.c:4004
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -7382,49 +7619,59 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:3869
+#: 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:3940
+#: sequencer.c:4166
#, c-format
msgid "unknown command %d"
msgstr "comando %d sconosciuto"
-#: sequencer.c:3999
+#: sequencer.c:4225
msgid "could not read orig-head"
msgstr "impossibile leggere orig-head"
-#: sequencer.c:4004
+#: sequencer.c:4230
msgid "could not read 'onto'"
msgstr "impossibile leggere 'onto'"
-#: sequencer.c:4018
+#: sequencer.c:4244
#, c-format
msgid "could not update HEAD to %s"
msgstr "impossibile aggiornare l'HEAD a %s"
-#: sequencer.c:4111
+#: 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:4120
+#: sequencer.c:4346
msgid "cannot amend non-existing commit"
msgstr "impossibile modificare un commit inesistente"
-#: sequencer.c:4122
+#: sequencer.c:4348
#, c-format
msgid "invalid file: '%s'"
msgstr "file non valido: '%s'"
-#: sequencer.c:4124
+#: sequencer.c:4350
#, c-format
msgid "invalid contents: '%s'"
msgstr "contenuti non validi: '%s'"
-#: sequencer.c:4127
+#: sequencer.c:4353
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -7435,59 +7682,64 @@
"di lavoro. Eseguine prima il commit e quindi esegui nuovamente 'git rebase\n"
"--continue'."
-#: sequencer.c:4163 sequencer.c:4202
+#: sequencer.c:4389 sequencer.c:4428
#, c-format
msgid "could not write file: '%s'"
msgstr "impossibile scrivere il file: '%s'"
-#: sequencer.c:4217
+#: sequencer.c:4444
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "impossibile rimuovere CHERRY_PICK_HEAD"
-#: sequencer.c:4224
+#: sequencer.c:4451
msgid "could not commit staged changes."
msgstr "impossibile eseguire il commit delle modifiche in staging."
-#: sequencer.c:4338
+#: 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:4342
+#: sequencer.c:4590
#, c-format
msgid "%s: bad revision"
msgstr "%s: revisione non valida"
-#: sequencer.c:4377
+#: sequencer.c:4625
msgid "can't revert as initial commit"
msgstr "impossibile eseguire il revert come commit iniziale"
-#: sequencer.c:4846
+#: sequencer.c:5102
msgid "make_script: unhandled options"
msgstr "make_script: opzioni non gestite"
-#: sequencer.c:4849
+#: sequencer.c:5105
msgid "make_script: error preparing revisions"
msgstr "make_script: errore durante la preparazione delle revisioni"
-#: sequencer.c:5083 sequencer.c:5100
+#: sequencer.c:5347 sequencer.c:5364
msgid "nothing to do"
msgstr "nulla da fare"
-#: sequencer.c:5119
+#: sequencer.c:5383
msgid "could not skip unnecessary pick commands"
msgstr "impossibile saltare i comandi pick non necessari"
-#: sequencer.c:5213
+#: sequencer.c:5480
msgid "the script was already rearranged."
msgstr "lo script è già stato riordinato."
-#: setup.c:124
+#: setup.c:133
#, c-format
msgid "'%s' is outside repository at '%s'"
msgstr "'%s' è al di fuori del repository in '%s'"
-#: setup.c:175
+#: setup.c:185
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
@@ -7497,7 +7749,7 @@
"Usa 'git <comando> -- <percorso>...' per specificare percorsi non esistenti "
"localmente."
-#: setup.c:188
+#: setup.c:198
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -7509,14 +7761,14 @@
"Usa '--' per separare i percorsi dalle revisioni, come segue:\n"
"'git <comando> [<revisione>...] -- [<file>...]'"
-#: setup.c:254
+#: 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:273
+#: setup.c:283
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -7527,93 +7779,99 @@
"Usa '--' per separare i percorsi dalle revisioni, come segue:\n"
"'git <comando> [<revisione>...] -- [<file>...]'"
-#: setup.c:409
+#: 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:413
+#: 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:559
+#: setup.c:661
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Attesa versione repository Git <= %d, trovata %d"
-#: setup.c:567
+#: setup.c:669
msgid "unknown repository extensions found:"
msgstr "trovate estensioni repository sconosciute:"
-#: setup.c:586
+#: 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:588
+#: 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:590
+#: setup.c:704
#, c-format
msgid "error reading %s"
msgstr "errore durante la lettura di %s"
-#: setup.c:592
+#: setup.c:706
#, c-format
msgid "invalid gitfile format: %s"
msgstr "formato file Git non valido: %s"
-#: setup.c:594
+#: setup.c:708
#, c-format
msgid "no path in gitfile: %s"
msgstr "nessun percorso presente nel file Git: %s"
-#: setup.c:596
+#: setup.c:710
#, c-format
msgid "not a git repository: %s"
msgstr "%s non è un repository Git"
-#: setup.c:695
+#: setup.c:812
#, c-format
msgid "'$%s' too big"
msgstr "'$%s' è troppo grande"
-#: setup.c:709
+#: setup.c:826
#, c-format
msgid "not a git repository: '%s'"
msgstr "'%s' non è un repository Git"
-#: setup.c:738 setup.c:740 setup.c:771
+#: setup.c:855 setup.c:857 setup.c:888
#, c-format
msgid "cannot chdir to '%s'"
msgstr "impossibile modificare la directory corrente in '%s'"
-#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856
+#: setup.c: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:870
+#: setup.c:987
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "stat di '%*s%s%s' non riuscito"
-#: setup.c:1108
+#: setup.c:1225
msgid "Unable to read current working directory"
msgstr "Impossibile leggere la directory di lavoro corrente"
-#: setup.c:1117 setup.c:1123
+#: setup.c:1234 setup.c:1240
#, c-format
msgid "cannot change to '%s'"
msgstr "impossibile entrare in '%s'"
-#: setup.c:1128
+#: 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:1134
+#: setup.c:1251
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
@@ -7623,7 +7881,7 @@
"Mi fermo al limite del filesystem (l'opzione GIT_DISCOVERY_ACROSS_FILESYSTEM "
"non è impostata)."
-#: setup.c:1245
+#: setup.c:1362
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -7633,275 +7891,275 @@
"(0%.3o).\n"
"Il proprietario dei file deve avere sempre i permessi di lettura e scrittura."
-#: setup.c:1289
+#: setup.c:1409
msgid "open /dev/null or dup failed"
msgstr "apertura di /dev/null o dup non riuscita"
-#: setup.c:1304
+#: setup.c:1424
msgid "fork failed"
msgstr "fork non riuscita"
-#: setup.c:1309
+#: setup.c:1429
msgid "setsid failed"
msgstr "setsid non riuscita"
-#: sha1-file.c:452
+#: 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:503
+#: 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:575
+#: 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:582
+#: sha1-file.c:600
#, c-format
msgid "unable to normalize object directory: %s"
msgstr "impossibile normalizzare la directory oggetti: %s"
-#: sha1-file.c:625
+#: sha1-file.c:643
msgid "unable to fdopen alternates lockfile"
msgstr "impossibile eseguire fdopen sul file di lock alternates"
-#: sha1-file.c:643
+#: sha1-file.c:661
msgid "unable to read alternates file"
msgstr "impossibile leggere il file alternates"
-#: sha1-file.c:650
+#: 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:685
+#: sha1-file.c:703
#, c-format
msgid "path '%s' does not exist"
msgstr "il percorso '%s' non esiste"
-#: sha1-file.c:711
+#: 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:717
+#: 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:723
+#: sha1-file.c:736
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "il repository di riferimento '%s' è shallow"
-#: sha1-file.c:731
+#: sha1-file.c:744
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "il repository di riferimento '%s' è un graft"
-#: sha1-file.c:791
+#: 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:943
+#: 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:964
+#: sha1-file.c:975
msgid "mmap failed"
msgstr "mmap non riuscita"
-#: sha1-file.c:1128
+#: sha1-file.c:1139
#, c-format
msgid "object file %s is empty"
msgstr "l'oggetto %s è vuoto"
-#: sha1-file.c:1263 sha1-file.c:2443
+#: sha1-file.c:1274 sha1-file.c:2467
#, c-format
msgid "corrupt loose object '%s'"
msgstr "oggetto sciolto '%s' corrotto"
-#: sha1-file.c:1265 sha1-file.c:2447
+#: 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:1307
+#: sha1-file.c:1318
msgid "invalid object type"
msgstr "tipo oggetto non valido"
-#: sha1-file.c:1391
+#: 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:1394
+#: sha1-file.c:1405
#, c-format
msgid "unable to unpack %s header"
msgstr "impossibile decomprimere l'intestazione %s"
-#: sha1-file.c:1400
+#: 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:1403
+#: sha1-file.c:1414
#, c-format
msgid "unable to parse %s header"
msgstr "impossibile analizzare l'intestazione %s"
-#: sha1-file.c:1629
+#: sha1-file.c:1641
#, c-format
msgid "failed to read object %s"
msgstr "lettura dell'oggetto %s non riuscita"
-#: sha1-file.c:1633
+#: sha1-file.c:1645
#, c-format
msgid "replacement %s not found for %s"
msgstr "%s sostitutivo non trovato per %s"
-#: sha1-file.c:1637
+#: 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:1641
+#: 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:1746
+#: sha1-file.c:1758
#, c-format
msgid "unable to write file %s"
msgstr "impossibile scrivere il file %s"
-#: sha1-file.c:1753
+#: sha1-file.c:1765
#, c-format
msgid "unable to set permission to '%s'"
msgstr "impossibile impostare i permessi a '%s'"
-#: sha1-file.c:1760
+#: sha1-file.c:1772
msgid "file write error"
msgstr "errore di scrittura del file"
-#: sha1-file.c:1780
+#: sha1-file.c:1792
msgid "error when closing loose object file"
msgstr "errore durante la chiusura del file oggetto sciolto"
-#: sha1-file.c:1845
+#: 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:1847
+#: sha1-file.c:1859
msgid "unable to create temporary file"
msgstr "impossibile creare il file temporaneo"
-#: sha1-file.c:1871
+#: sha1-file.c:1883
msgid "unable to write loose object file"
msgstr "impossibile scrivere il file oggetto sciolto"
-#: sha1-file.c:1877
+#: 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:1881
+#: sha1-file.c:1893
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr "deflateEnd non riuscita sull'oggetto %s (%d)"
-#: sha1-file.c:1885
+#: 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:1895 builtin/pack-objects.c:1054
+#: 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:1972
+#: sha1-file.c:1984
#, c-format
msgid "cannot read object for %s"
msgstr "impossibile leggere l'oggetto per %s"
-#: sha1-file.c:2011
+#: sha1-file.c:2035
msgid "corrupt commit"
msgstr "commit corrotto"
-#: sha1-file.c:2019
+#: sha1-file.c:2043
msgid "corrupt tag"
msgstr "tag corrotto"
-#: sha1-file.c:2119
+#: sha1-file.c:2143
#, c-format
msgid "read error while indexing %s"
msgstr "errore di lettura durante l'indicizzazione di %s"
-#: sha1-file.c:2122
+#: sha1-file.c:2146
#, c-format
msgid "short read while indexing %s"
msgstr "lettura troppo breve durante l'indicizzazione di %s"
-#: sha1-file.c:2195 sha1-file.c:2205
+#: sha1-file.c: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:2211
+#: sha1-file.c:2235
#, c-format
msgid "%s: unsupported file type"
msgstr "%s: tipo di file non supportato"
-#: sha1-file.c:2235
+#: sha1-file.c:2259
#, c-format
msgid "%s is not a valid object"
msgstr "%s non è un oggetto valido"
-#: sha1-file.c:2237
+#: sha1-file.c:2261
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s non è un oggetto '%s' valido"
-#: sha1-file.c:2264 builtin/index-pack.c:155
+#: sha1-file.c:2288 builtin/index-pack.c:192
#, c-format
msgid "unable to open %s"
msgstr "impossibile aprire %s"
-#: sha1-file.c:2454 sha1-file.c:2507
+#: 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:2478
+#: sha1-file.c:2502
#, c-format
msgid "unable to mmap %s"
msgstr "impossibile eseguire mmap su %s"
-#: sha1-file.c:2483
+#: sha1-file.c:2507
#, c-format
msgid "unable to unpack header of %s"
msgstr "impossibile decomprimere l'intestazione di %s"
-#: sha1-file.c:2489
+#: sha1-file.c:2513
#, c-format
msgid "unable to parse header of %s"
msgstr "impossibile analizzare l'intestazione di %s"
-#: sha1-file.c:2500
+#: sha1-file.c:2524
#, c-format
msgid "unable to unpack contents of %s"
msgstr "impossibile decomprimere i contenuti di %s"
@@ -7949,12 +8207,12 @@
msgid "log for '%.*s' only has %d entries"
msgstr "il log per '%.*s' ha solo %d voci"
-#: sha1-name.c:1689
+#: 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:1695
+#: sha1-name.c:1708
#, c-format
msgid ""
"path '%s' exists, but not '%s'\n"
@@ -7963,12 +8221,12 @@
"il percorso '%s' esiste, ma non '%s'\n"
"suggerimento: forse intendevi '%.*s:%s' ossia '%.*s:./%s'?"
-#: sha1-name.c:1704
+#: 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:1732
+#: sha1-name.c:1745
#, c-format
msgid ""
"path '%s' is in the index, but not at stage %d\n"
@@ -7977,7 +8235,7 @@
"il percorso '%s' è nell'indice, ma non nel passo %d\n"
"suggerimento: Forse intendevi ':%d:%s'?"
-#: sha1-name.c:1748
+#: sha1-name.c:1761
#, c-format
msgid ""
"path '%s' is in the index, but not '%s'\n"
@@ -7986,65 +8244,65 @@
"il percorso '%s' è nell'indice, ma non '%s'\n"
"suggerimento: Forse intendevi ':%d:%s' ossia ':%d:./%s'?"
-#: sha1-name.c:1756
+#: 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:1758
+#: 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:1771
+#: 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:1909
+#: 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:837
+#: strbuf.c:848
#, c-format
msgid "%u.%2.2u GiB"
msgstr "%u.%2.2u GiB"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:839
+#: 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:847
+#: strbuf.c:858
#, c-format
msgid "%u.%2.2u MiB"
msgstr "%u.%2.2u MiB"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:849
+#: 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:856
+#: strbuf.c:867
#, c-format
msgid "%u.%2.2u KiB"
msgstr "%u.%2.2u KiB"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:858
+#: 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:864
+#: strbuf.c:875
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
@@ -8052,18 +8310,50 @@
msgstr[1] "%u byte"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:866
+#: 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:1164
+#: 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 ""
@@ -8099,7 +8389,7 @@
msgid "bad --ignore-submodules argument: %s"
msgstr "argomento --ignore-submodules errato: %s"
-#: submodule.c:815
+#: submodule.c:816
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
@@ -8108,12 +8398,12 @@
"Il sottomodulo nel commit %s e nel percorso '%s' collide con un sottomodulo "
"con lo stesso nome. Lo salto."
-#: submodule.c:910
+#: 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:995
+#: submodule.c:1004
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
@@ -8122,36 +8412,36 @@
"Impossibile eseguire il comando 'git rev-list <commit> --not --remotes -n 1' "
"nel sottomodulo %s"
-#: submodule.c:1118
+#: submodule.c:1127
#, c-format
msgid "process for submodule '%s' failed"
msgstr "il processo per il sottomodulo '%s' non è uscito con successo"
-#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045
+#: submodule.c: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:1158
+#: submodule.c:1167
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr "Push del sottomodulo '%s' in corso\n"
-#: submodule.c:1161
+#: submodule.c:1170
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "Impossibile eseguire il push del sottomodulo '%s'\n"
-#: submodule.c:1453
+#: submodule.c:1462
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr "Recupero del sottomodulo %s%s in corso\n"
-#: submodule.c:1483
+#: submodule.c:1492
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr "Impossibile accedere al sottomodulo '%s'\n"
-#: submodule.c:1637
+#: submodule.c:1646
#, c-format
msgid ""
"Errors during submodule fetch:\n"
@@ -8160,66 +8450,66 @@
"Errore durante il recupero del sottomodulo:\n"
"%s"
-#: submodule.c:1662
+#: submodule.c:1671
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "'%s' non riconosciuto come repository Git"
-#: submodule.c:1679
+#: 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:1720
+#: 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:1800
+#: submodule.c:1804
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "impossibile avviare 'git status' nel sottomodulo '%s'"
-#: submodule.c:1813
+#: submodule.c:1817
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "impossibile eseguire 'git status' nel sottomodulo '%s'"
-#: submodule.c:1828
+#: 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:1855 submodule.c:2165
+#: 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:1876
+#: submodule.c:1880
msgid "could not reset submodule index"
msgstr "impossibile ripristinare l'indice del sottomodulo"
-#: submodule.c:1918
+#: submodule.c:1922
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "il sottomodulo '%s' ha l'indice sporco"
-#: submodule.c:1970
+#: submodule.c:1974
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "Impossibile aggiornare il sottomodulo '%s'."
-#: submodule.c:2038
+#: 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:2059
+#: submodule.c:2063
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -8227,17 +8517,17 @@
"relocate_gitdir non è supportata per il sottomodulo '%s' con più di un "
"albero di lavoro"
-#: submodule.c:2071 submodule.c:2130
+#: 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:2075
+#: 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:2082
+#: submodule.c:2086
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -8248,95 +8538,258 @@
"'%s' a\n"
"'%s'\n"
-#: submodule.c:2209
+#: submodule.c:2214
msgid "could not start ls-files in .."
msgstr "impossibile avviare ls-files in .."
-#: submodule.c:2248
+#: 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:236
-#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "ignoro un nome sottomodulo sospetto: %s"
-
-#: submodule-config.c:303
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "i valori negativi non sono consentiti per submodule.fetchjobs"
-
-#: submodule-config.c:401
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr ""
-"ignoro '%s' che potrebbe essere interpretato come argomento della riga di "
-"comando: %s"
-
-#: submodule-config.c:498
-#, c-format
-msgid "invalid value for %s"
-msgstr "valore non valido per %s"
-
-#: submodule-config.c:765
-#, 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:298 builtin/remote.c:323
+#: 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:665
+#: 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-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:145
+#, c-format
+msgid "unable to find remote helper for '%s'"
+msgstr "impossibile trovare l'helper remoto per '%s'"
+
+#: 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:214
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
+msgstr ""
+"capability necessaria %s sconosciuta; quest'helper remoto probabilmente "
+"richiede una versione di Git più recente"
+
+#: transport-helper.c:220
+msgid "this remote helper should implement refspec capability"
+msgstr "questo helper remoto dovrebbe implementare la capability refspec"
+
+#: 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:417
+#, c-format
+msgid "%s also locked %s"
+msgstr "%s ha bloccato anche %s"
+
+#: transport-helper.c:497
+msgid "couldn't run fast-import"
+msgstr "impossibile eseguire fast-import"
+
+#: transport-helper.c:520
+msgid "error while running fast-import"
+msgstr "errore durante l'esecuzione di fast-import"
+
+#: 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:594
+#, c-format
+msgid "unknown response to connect: %s"
+msgstr "risposta inattesa a connect: %s"
+
+#: 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:618
+msgid "invalid remote service path"
+msgstr "percorso servizio remoto non valido"
+
+#: 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: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:841
+#, c-format
+msgid "helper reported unexpected status of %s"
+msgstr "l'helper ha segnalato uno stato inatteso di %s"
+
+#: 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:927
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr "l'helper %s non supporta --signed"
+
+#: 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: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: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:1045
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr "l'helper %s non supporta 'force'"
+
+#: transport-helper.c:1092
+msgid "couldn't run fast-export"
+msgstr "impossibile eseguire fast-export"
+
+#: transport-helper.c:1097
+msgid "error while running fast-export"
+msgstr "errore durante l'esecuzione di 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 ""
+"Nessun riferimento in comune e nessuno specificato; non eseguo nulla.\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:1212
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr "risposta malformata nell'elenco riferimenti: %s"
+
+#: transport-helper.c:1364
+#, c-format
+msgid "read(%s) failed"
+msgstr "read(%s) non riuscita"
+
+#: transport-helper.c:1391
+#, c-format
+msgid "write(%s) failed"
+msgstr "write(%s) non riuscita"
+
+#: transport-helper.c:1440
+#, c-format
+msgid "%s thread failed"
+msgstr "thread %s non riuscito"
+
+#: 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: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:1504
+#, c-format
+msgid "%s process failed to wait"
+msgstr "wait non riuscita per il processo %s"
+
+#: transport-helper.c:1508
+#, c-format
+msgid "%s process failed"
+msgstr "processo %s non riuscito"
+
+#: 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"
+
#: transport.c:116
#, c-format
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
@@ -8347,42 +8800,42 @@
msgid "could not read bundle '%s'"
msgstr "impossibile leggere il bundle '%s'"
-#: transport.c:214
+#: transport.c:220
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "trasporto: opzione profondità '%s' non valida"
-#: transport.c:266
+#: 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:267
+#: 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:632
+#: transport.c:712
msgid "could not parse transport.color.* config"
msgstr "impossibile analizzare la configurazione transport.color.*"
-#: transport.c:705
+#: transport.c:785
msgid "support for protocol v2 not implemented yet"
msgstr "supporto alla versione 2 del protocollo non ancora implementato"
-#: transport.c:831
+#: transport.c:919
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "valore sconosciuto per la configurazione '%s': %s"
-#: transport.c:897
+#: transport.c:985
#, c-format
msgid "transport '%s' not allowed"
msgstr "trasporto '%s' non consentito"
-#: transport.c:949
+#: transport.c:1038
msgid "git-over-rsync is no longer supported"
msgstr "git-over-rsync non è più supportato"
-#: transport.c:1044
+#: transport.c:1140
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -8391,7 +8844,7 @@
"I seguenti percorsi sottomodulo contengono modifiche\n"
"non trovate su nessun remoto:\n"
-#: transport.c:1048
+#: transport.c:1144
#, c-format
msgid ""
"\n"
@@ -8418,194 +8871,14 @@
"per eseguirne il push a un remoto.\n"
"\n"
-#: transport.c:1056
+#: transport.c:1152
msgid "Aborting."
msgstr "Interrompo l'operazione."
-#: transport.c:1201
+#: transport.c:1297
msgid "failed to push all needed submodules"
msgstr "push di tutti i sottomoduli richiesti non riuscito"
-#: transport.c:1345 transport-helper.c:657
-msgid "operation not supported by protocol"
-msgstr "operazione non supportata dal protocollo"
-
-#: transport-helper.c:61 transport-helper.c:90
-msgid "full write to remote helper failed"
-msgstr "scrittura completa verso l'helper remoto non riuscita"
-
-#: transport-helper.c:144
-#, c-format
-msgid "unable to find remote helper for '%s'"
-msgstr "impossibile trovare l'helper remoto per '%s'"
-
-#: transport-helper.c:160 transport-helper.c:571
-msgid "can't dup helper output fd"
-msgstr "impossibile duplicare il descrittore file dell'output helper"
-
-#: transport-helper.c:211
-#, c-format
-msgid ""
-"unknown mandatory capability %s; this remote helper probably needs newer "
-"version of Git"
-msgstr ""
-"capability necessaria %s sconosciuta; quest'helper remoto probabilmente "
-"richiede una versione di Git più recente"
-
-#: transport-helper.c:217
-msgid "this remote helper should implement refspec capability"
-msgstr "questo helper remoto dovrebbe implementare la capability refspec"
-
-#: transport-helper.c:284 transport-helper.c:425
-#, c-format
-msgid "%s unexpectedly said: '%s'"
-msgstr "%s ha inviato un messaggio inatteso: '%s'"
-
-#: transport-helper.c:414
-#, c-format
-msgid "%s also locked %s"
-msgstr "%s ha bloccato anche %s"
-
-#: transport-helper.c:493
-msgid "couldn't run fast-import"
-msgstr "impossibile eseguire fast-import"
-
-#: transport-helper.c:516
-msgid "error while running fast-import"
-msgstr "errore durante l'esecuzione di fast-import"
-
-#: transport-helper.c:545 transport-helper.c:1134
-#, c-format
-msgid "could not read ref %s"
-msgstr "impossibile leggere il riferimento %s"
-
-#: transport-helper.c:590
-#, c-format
-msgid "unknown response to connect: %s"
-msgstr "risposta inattesa a connect: %s"
-
-#: transport-helper.c:612
-msgid "setting remote service path not supported by protocol"
-msgstr ""
-"l'impostazione del percorso del servizio remoto non è supportata dal "
-"protocollo"
-
-#: transport-helper.c:614
-msgid "invalid remote service path"
-msgstr "percorso servizio remoto non valido"
-
-#: transport-helper.c:660
-#, c-format
-msgid "can't connect to subservice %s"
-msgstr "impossibile connettersi al sottoservizio %s"
-
-#: transport-helper.c:736
-#, c-format
-msgid "expected ok/error, helper said '%s'"
-msgstr "attesi ok/error, l'helper ha inviato '%s'"
-
-#: transport-helper.c:789
-#, c-format
-msgid "helper reported unexpected status of %s"
-msgstr "l'helper ha segnalato uno stato inatteso di %s"
-
-#: transport-helper.c:850
-#, c-format
-msgid "helper %s does not support dry-run"
-msgstr "l'helper %s non supporta dry-run"
-
-#: transport-helper.c:853
-#, c-format
-msgid "helper %s does not support --signed"
-msgstr "l'helper %s non supporta --signed"
-
-#: transport-helper.c:856
-#, c-format
-msgid "helper %s does not support --signed=if-asked"
-msgstr "l'helper %s non supporta --signed=if-asked"
-
-#: transport-helper.c:861
-#, c-format
-msgid "helper %s does not support --atomic"
-msgstr "l'helper %s non supporta --atomic"
-
-#: transport-helper.c:867
-#, c-format
-msgid "helper %s does not support 'push-option'"
-msgstr "l'helper %s non supporta 'push-option'"
-
-#: transport-helper.c:965
-msgid "remote-helper doesn't support push; refspec needed"
-msgstr ""
-"l'helper remoto non supporta il push; è necessario uno specificatore "
-"riferimento"
-
-#: transport-helper.c:970
-#, c-format
-msgid "helper %s does not support 'force'"
-msgstr "l'helper %s non supporta 'force'"
-
-#: transport-helper.c:1017
-msgid "couldn't run fast-export"
-msgstr "impossibile eseguire fast-export"
-
-#: transport-helper.c:1022
-msgid "error while running fast-export"
-msgstr "errore durante l'esecuzione di fast-export"
-
-#: transport-helper.c:1047
-#, c-format
-msgid ""
-"No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch such as 'master'.\n"
-msgstr ""
-"Nessun riferimento in comune e nessuno specificato; non eseguo nulla.\n"
-"Forse dovresti specificare un branch come 'master'.\n"
-
-#: transport-helper.c:1120
-#, c-format
-msgid "malformed response in ref list: %s"
-msgstr "risposta malformata nell'elenco riferimenti: %s"
-
-#: transport-helper.c:1272
-#, c-format
-msgid "read(%s) failed"
-msgstr "read(%s) non riuscita"
-
-#: transport-helper.c:1299
-#, c-format
-msgid "write(%s) failed"
-msgstr "write(%s) non riuscita"
-
-#: transport-helper.c:1348
-#, c-format
-msgid "%s thread failed"
-msgstr "thread %s non riuscito"
-
-#: transport-helper.c:1352
-#, c-format
-msgid "%s thread failed to join: %s"
-msgstr "join non riuscita per il thread %s: %s"
-
-#: transport-helper.c:1371 transport-helper.c:1375
-#, c-format
-msgid "can't start thread for copying data: %s"
-msgstr "impossibile avviare il thread per la copia dei dati: %s"
-
-#: transport-helper.c:1412
-#, c-format
-msgid "%s process failed to wait"
-msgstr "wait non riuscita per il processo %s"
-
-#: transport-helper.c:1416
-#, c-format
-msgid "%s process failed"
-msgstr "processo %s non riuscito"
-
-#: transport-helper.c:1434 transport-helper.c:1443
-msgid "can't start thread for copying data"
-msgstr "impossibile avviare il thread per la copia dei dati"
-
#: tree-walk.c:32
msgid "too-short tree object"
msgstr "oggetto albero troppo corto"
@@ -8622,7 +8895,7 @@
msgid "too-short tree file"
msgstr "file alber troppo corto"
-#: unpack-trees.c:110
+#: unpack-trees.c:113
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -8632,7 +8905,7 @@
"checkout:\n"
"%%sEsegui il commit o lo stash delle modifiche prima di cambiare branch."
-#: unpack-trees.c:112
+#: unpack-trees.c:115
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -8642,7 +8915,7 @@
"checkout:\n"
"%%s"
-#: unpack-trees.c:115
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -8652,7 +8925,7 @@
"merge:\n"
"%%sEsegui il commit o lo stash delle modifiche prima di eseguire il merge."
-#: unpack-trees.c:117
+#: unpack-trees.c:120
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -8662,7 +8935,7 @@
"merge:\n"
"%%s"
-#: unpack-trees.c:120
+#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -8673,7 +8946,7 @@
"%%sEsegui il commit o lo stash delle modifiche prima di eseguire "
"l'operazione di %s."
-#: unpack-trees.c:122
+#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -8683,7 +8956,7 @@
"l'operazione di %s:\n"
"%%s"
-#: unpack-trees.c:127
+#: unpack-trees.c:130
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -8693,7 +8966,7 @@
"tracciati in esse contenuti vengano persi:\n"
"%s"
-#: unpack-trees.c:131
+#: unpack-trees.c:134
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -8703,19 +8976,19 @@
"eliminati con il checkout:\n"
"%%sSpostali o eliminali prima di cambiare branch."
-#: unpack-trees.c:133
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
-msgstr ""
-"I seguenti file non tracciati presenti nell'albero di lavoro sarebbero "
-"eliminati con il checkout:\n"
-"%%s"
-
#: unpack-trees.c:136
#, c-format
msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"I seguenti file non tracciati presenti nell'albero di lavoro sarebbero "
+"eliminati con il checkout:\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 ""
@@ -8723,7 +8996,7 @@
"eliminati dal merge:\n"
"%%sSpostali o eliminali prima di eseguire il merge."
-#: unpack-trees.c:138
+#: unpack-trees.c:141
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -8733,7 +9006,7 @@
"eliminati dal merge:\n"
"%%s"
-#: unpack-trees.c:141
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -8743,7 +9016,7 @@
"eliminati con l'operazione di %s:\n"
"%%sSpostali o eliminali prima di eseguire l'operazione di %s."
-#: unpack-trees.c:143
+#: unpack-trees.c:146
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -8753,7 +9026,7 @@
"eliminati con l'operazione di %s:\n"
"%%s"
-#: unpack-trees.c:149
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -8764,7 +9037,7 @@
"sovrascritti con il checkout:\n"
"%%sSpostali o eliminali prima di cambiare branch."
-#: unpack-trees.c:151
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -8775,7 +9048,7 @@
"sovrascritti con il checkout:\n"
"%%s"
-#: unpack-trees.c:154
+#: unpack-trees.c:157
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -8785,7 +9058,7 @@
"sovrascritti dal merge:\n"
"%%sSpostali o eliminali prima di eseguire il merge."
-#: unpack-trees.c:156
+#: unpack-trees.c:159
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -8795,7 +9068,7 @@
"sovrascritti dal merge:\n"
"%%s"
-#: unpack-trees.c:159
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -8805,7 +9078,7 @@
"sovrascritti con l'operazione di %s:\n"
"%%sSpostali o eliminali prima di eseguire l'operazione di %s."
-#: unpack-trees.c:161
+#: unpack-trees.c:164
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -8815,45 +9088,13 @@
"sovrascritti con l'operazione di %s:\n"
"%%s"
-#: unpack-trees.c:169
+#: 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:172
-#, 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"
-
-#: unpack-trees.c:174
-#, 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"
-
-#: unpack-trees.c:176
-#, 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"
-
-#: unpack-trees.c:178
+#: unpack-trees.c:175
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -8862,16 +9103,57 @@
"Impossibile aggiornare il sottomodulo:\n"
"%s"
-#: unpack-trees.c:255
+#: unpack-trees.c:178
+#, c-format
+msgid ""
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+"I seguenti percorsi non sono aggiornati e sono stati mantenuti nonostante vi "
+"siano dei pattern sparse:\n"
+"%s"
+
+#: unpack-trees.c:180
+#, c-format
+msgid ""
+"The following paths are unmerged and were left despite sparse patterns:\n"
+"%s"
+msgstr ""
+"I seguenti percorsi non sono stati sottoposti a merge e sono stati mantenuti "
+"nonostante vi siano dei pattern sparse:\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 ""
+"I seguenti percorsi erano già presenti e pertanto non sono stati aggiornati "
+"nonostante vi siano dei pattern sparse:\n"
+"%s"
+
+#: unpack-trees.c:262
#, c-format
msgid "Aborting\n"
msgstr "Interrompo l'operazione\n"
-#: unpack-trees.c:317
+#: 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:349
+#: 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"
@@ -8882,10 +9164,14 @@
"su un filesystem non sensibile a tale differenza) e solo uno\n"
"per gruppo in conflitto è nell'albero di lavoro:\n"
-#: unpack-trees.c:1445
+#: 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"
@@ -8919,50 +9205,86 @@
msgid "Fetching objects"
msgstr "Recupero oggetti in corso"
-#: worktree.c:259 builtin/am.c:2099
+#: worktree.c:236 builtin/am.c:2116
#, c-format
msgid "failed to read '%s'"
msgstr "lettura di '%s' non riuscita"
-#: worktree.c:305
+#: 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:316
+#: 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:328
+#: worktree.c:306
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' non esiste"
-#: worktree.c:334
+#: 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:342
+#: worktree.c:321
#, c-format
msgid "'%s' does not point back to '%s'"
msgstr "'%s' non punta a '%s'"
-#: wrapper.c:186 wrapper.c:356
+#: 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:387 wrapper.c:588
+#: wrapper.c:398 wrapper.c:599
#, c-format
msgid "unable to access '%s'"
msgstr "impossibile accedere a '%s'"
-#: wrapper.c:596
+#: wrapper.c:607
msgid "unable to get current working directory"
msgstr "impossibile ottenere la directory di lavoro corrente"
@@ -9005,11 +9327,11 @@
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:"
@@ -9045,94 +9367,94 @@
" (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."
@@ -9140,7 +9462,7 @@
"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"
@@ -9152,111 +9474,111 @@
"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'."
@@ -9264,145 +9586,151 @@
"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:1439
+#: 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:1449
+#: wt-status.c:1445
msgid "Revert currently in progress."
msgstr "Revert in corso."
-#: wt-status.c:1452
+#: 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:1458
+#: wt-status.c:1454
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (risolvi i conflitti ed esegui \"git revert --continue\")"
-#: wt-status.c:1461
+#: wt-status.c:1457
msgid " (run \"git revert --continue\" to continue)"
msgstr " (esegui \"git revert --continue\" per continuare)"
-#: wt-status.c:1464
+#: 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:1466
+#: 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:1468
+#: wt-status.c:1464
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (usa \"git revert --abort\" per annullare l'operazione di revert)"
-#: wt-status.c:1478
+#: wt-status.c:1474
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Attualmente stai eseguendo una bisezione partendo dal branch '%s'."
-#: wt-status.c:1482
+#: wt-status.c:1478
msgid "You are currently bisecting."
msgstr "Attualmente stai eseguendo una bisezione."
-#: wt-status.c:1485
+#: wt-status.c:1481
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (usa \"git bisect reset\" per tornare al branch originario)"
-#: wt-status.c:1694
+#: wt-status.c: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:1701
+#: wt-status.c:1738
msgid "interactive rebase in progress; onto "
msgstr "rebase interattivo in corso su "
-#: wt-status.c:1703
+#: wt-status.c:1740
msgid "rebase in progress; onto "
msgstr "rebase in corso su "
-#: wt-status.c:1713
+#: wt-status.c:1750
msgid "Not currently on any branch."
msgstr "Attualmente non sei su alcun branch."
-#: wt-status.c:1730
+#: wt-status.c:1767
msgid "Initial commit"
msgstr "Commit iniziale"
-#: wt-status.c:1731
+#: wt-status.c:1768
msgid "No commits yet"
msgstr "Non ci sono ancora commit"
-#: wt-status.c:1745
+#: wt-status.c:1782
msgid "Untracked files"
msgstr "File non tracciati"
-#: wt-status.c:1747
+#: wt-status.c:1784
msgid "Ignored files"
msgstr "File ignorati"
-#: wt-status.c:1751
+#: wt-status.c:1788
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -9414,31 +9742,31 @@
"ma devi stare attento a non dimenticarti di aggiungere\n"
"autonomamente i file nuovi (vedi 'git help status')."
-#: wt-status.c:1757
+#: wt-status.c:1794
#, c-format
msgid "Untracked files not listed%s"
msgstr "File non tracciati non elencati%s"
-#: wt-status.c:1759
+#: 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:1765
+#: wt-status.c:1802
msgid "No changes"
msgstr "Nessuna modifica"
-#: wt-status.c:1770
+#: 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:1773
+#: wt-status.c:1811
#, c-format
msgid "no changes added to commit\n"
msgstr "nessuna modifica aggiunta al commit\n"
-#: wt-status.c:1776
+#: wt-status.c:1815
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -9447,75 +9775,75 @@
"non è stato aggiunto nulla al commit ma sono presenti file non tracciati "
"(usa \"git add\" per tracciarli)\n"
-#: wt-status.c:1779
+#: wt-status.c: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:1782
+#: 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:1785 wt-status.c:1790
+#: 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:1788
+#: 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:1792
+#: 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:1905
+#: wt-status.c:1940
msgid "No commits yet on "
msgstr "Non ci sono ancora commit su"
-#: wt-status.c:1909
+#: wt-status.c:1944
msgid "HEAD (no branch)"
msgstr "HEAD (nessun branch)"
-#: wt-status.c:1940
+#: wt-status.c:1975
msgid "different"
msgstr "differente"
-#: wt-status.c:1942 wt-status.c:1950
+#: wt-status.c:1977 wt-status.c:1985
msgid "behind "
msgstr "indietro "
-#: wt-status.c:1945 wt-status.c:1948
+#: wt-status.c:1980 wt-status.c:1983
msgid "ahead "
msgstr "avanti "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2470
+#: 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:2476
+#: 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:2478
+#: 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."
-#: compat/precompose_utf8.c:58 builtin/clone.c:455
+#: compat/precompose_utf8.c:58 builtin/clone.c:456
#, c-format
msgid "failed to unlink '%s'"
msgstr "unlink di '%s' non riuscito"
@@ -9529,7 +9857,7 @@
msgid "unexpected diff status %c"
msgstr "stato diff inatteso %c"
-#: builtin/add.c:93 builtin/commit.c:288
+#: builtin/add.c:93 builtin/commit.c:285
msgid "updating files failed"
msgstr "aggiornamento dei file non riuscito"
@@ -9542,111 +9870,111 @@
msgid "Unstaged changes after refreshing the index:"
msgstr "Modifiche non nell'area di staging dopo l'aggiornamento dell'indice:"
-#: builtin/add.c:266 builtin/rev-parse.c:899
+#: builtin/add.c:272 builtin/rev-parse.c:904
msgid "Could not read the index"
msgstr "Impossibile leggere l'indice"
-#: builtin/add.c:277
+#: builtin/add.c:283
#, c-format
msgid "Could not open '%s' for writing."
msgstr "Impossibile aprire '%s' in scrittura."
-#: builtin/add.c:281
+#: builtin/add.c:287
msgid "Could not write patch"
msgstr "Impossibile scrivere la patch"
-#: builtin/add.c:284
+#: builtin/add.c:290
msgid "editing patch failed"
msgstr "modifica della patch non riuscita"
-#: builtin/add.c:287
+#: builtin/add.c:293
#, c-format
msgid "Could not stat '%s'"
msgstr "Impossibile eseguire lo stat di '%s'"
-#: builtin/add.c:289
+#: builtin/add.c:295
msgid "Empty patch. Aborted."
msgstr "Patch vuota. Operazione interrotta."
-#: builtin/add.c:294
+#: builtin/add.c:300
#, c-format
msgid "Could not apply '%s'"
msgstr "Impossibile applicare '%s'"
-#: builtin/add.c:302
+#: 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:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548
-#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
+#: builtin/add.c: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:325
+#: builtin/add.c:331
msgid "interactive picking"
msgstr "scelta interattiva"
-#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307
+#: 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:327
+#: builtin/add.c:333
msgid "edit current diff and apply"
msgstr "modifica il diff corrente e applicalo"
-#: builtin/add.c:328
+#: builtin/add.c:334
msgid "allow adding otherwise ignored files"
msgstr "consenti l'aggiunta di file altrimenti ignorati"
-#: builtin/add.c:329
+#: builtin/add.c:335
msgid "update tracked files"
msgstr "aggiorna i file tracciati"
-#: builtin/add.c:330
+#: 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:331
+#: 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:332
+#: 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:335
+#: 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:337
+#: builtin/add.c:343
msgid "don't add, only refresh the index"
msgstr "non eseguire l'aggiunta, aggiorna solo l'indice"
-#: builtin/add.c:338
+#: 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:339
+#: 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:341 builtin/update-index.c:1004
+#: 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:343
+#: builtin/add.c:349
msgid "warn when adding an embedded repository"
msgstr "emetti un avviso quando si aggiunge un repository incorporato"
-#: builtin/add.c:345
+#: builtin/add.c:351
msgid "backend for `git stash -p`"
msgstr "backend per `git stash -p`"
-#: builtin/add.c:363
+#: builtin/add.c:369
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -9677,12 +10005,12 @@
"\n"
"Vedi \"git help submodule\" per ulteriori informazioni."
-#: builtin/add.c:391
+#: builtin/add.c:397
#, c-format
msgid "adding embedded git repository: %s"
msgstr "aggiunta repository Git incorporato in corso: %s"
-#: builtin/add.c:410
+#: builtin/add.c:416
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
@@ -9692,49 +10020,49 @@
"Per disabilitare questo messaggio, esegui\n"
"\"git config advice.addIgnoredFile false\""
-#: builtin/add.c:419
+#: builtin/add.c:425
msgid "adding files failed"
msgstr "aggiunta dei file non riuscita"
-#: builtin/add.c:447 builtin/commit.c:348
+#: 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:464
+#: builtin/add.c:470
msgid "--pathspec-from-file is incompatible with --edit"
msgstr "--pathspec-from-file non è compatibile con --edit"
-#: builtin/add.c:476
+#: builtin/add.c:482
msgid "-A and -u are mutually incompatible"
msgstr "-A e -u non sono compatibili fra loro"
-#: builtin/add.c:479
+#: 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:483
+#: 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:501 builtin/checkout.c:1675 builtin/commit.c:354
-#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509
+#: 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:508 builtin/checkout.c:1687 builtin/commit.c:360
-#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515
+#: 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:512
+#: 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:514
+#: builtin/add.c:520
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
@@ -9744,111 +10072,116 @@
"Per disabilitare questo messaggio, esegui\n"
"\"git config advice.addEmptyPathspec false\""
-#: builtin/am.c:352
+#: builtin/am.c:160
+#, c-format
+msgid "invalid committer: %s"
+msgstr "autore commit non valido: %s"
+
+#: builtin/am.c:366
msgid "could not parse author script"
msgstr "impossibile analizzare lo script author"
-#: builtin/am.c:436
+#: 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:478
+#: builtin/am.c:492
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Riga di input malformata: '%s'."
-#: builtin/am.c:516
+#: 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:542
+#: builtin/am.c:556
msgid "fseek failed"
msgstr "fseek non riuscita"
-#: builtin/am.c:730
+#: builtin/am.c:744
#, c-format
msgid "could not parse patch '%s'"
msgstr "impossibile analizzare la patch '%s'"
-#: builtin/am.c:795
+#: 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:843
+#: builtin/am.c:857
msgid "invalid timestamp"
msgstr "timestamp non valido"
-#: builtin/am.c:848 builtin/am.c:860
+#: builtin/am.c:862 builtin/am.c:874
msgid "invalid Date line"
msgstr "riga Date non valida"
-#: builtin/am.c:855
+#: builtin/am.c:869
msgid "invalid timezone offset"
msgstr "offset fuso orario non valido"
-#: builtin/am.c:948
+#: builtin/am.c:962
msgid "Patch format detection failed."
msgstr "Rilevamento del formato della patch non riuscito."
-#: builtin/am.c:953 builtin/clone.c:409
+#: 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:958
+#: builtin/am.c:972
msgid "Failed to split patches."
msgstr "Divisione delle patch non riuscita."
-#: builtin/am.c:1089
+#: 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:1090
+#: 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:1091
+#: 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:1174
+#: 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:1202
+#: builtin/am.c:1216
msgid "Patch is empty."
msgstr "La patch è vuota."
-#: builtin/am.c:1267
+#: builtin/am.c:1281
#, c-format
msgid "missing author line in commit %s"
msgstr "riga autore mancante nel commit %s"
-#: builtin/am.c:1270
+#: builtin/am.c:1284
#, c-format
msgid "invalid ident line: %.*s"
msgstr "riga ident non valida: %.*s"
-#: builtin/am.c:1489
+#: 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:1491
+#: 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:1510
+#: builtin/am.c:1524
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -9856,24 +10189,24 @@
"Hai modificato manualmente la patch?\n"
"Non può essere applicata ai blob registrati nel suo indice."
-#: builtin/am.c:1516
+#: 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:1542
+#: builtin/am.c:1556
msgid "Failed to merge in the changes."
msgstr "Merge delle modifiche non riuscito."
-#: builtin/am.c:1574
+#: builtin/am.c:1588
msgid "applying to an empty history"
msgstr "applicazione a una cronologia vuota"
-#: builtin/am.c:1621 builtin/am.c:1625
+#: 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:1643
+#: builtin/am.c:1661
msgid "Commit Body is:"
msgstr "Il corpo del commit è:"
@@ -9881,41 +10214,41 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1653
+#: 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:1700 builtin/commit.c:398
+#: builtin/am.c:1717 builtin/commit.c:395
msgid "unable to write index file"
msgstr "impossibile scrivere il file indice"
-#: builtin/am.c:1704
+#: 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:1744 builtin/am.c:1812
+#: builtin/am.c:1761 builtin/am.c:1829
#, c-format
msgid "Applying: %.*s"
msgstr "Applicazione in corso: %.*s"
-#: builtin/am.c:1761
+#: builtin/am.c:1778
msgid "No changes -- Patch already applied."
msgstr "Nessuna modifica -- patch già applicata."
-#: builtin/am.c:1767
+#: builtin/am.c:1784
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Patch non riuscita a %s %.*s"
-#: builtin/am.c:1771
+#: builtin/am.c:1788
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr ""
"Usa 'git am --show-current-patch=diff' per visualizzare la patch non riuscita"
-#: builtin/am.c:1815
+#: 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"
@@ -9925,7 +10258,7 @@
"Se non rimane nulla da aggiungere all'area di staging, forse qualcos'altro\n"
"ha già introdotto le stesse modifiche; potresti voler saltare questa patch."
-#: builtin/am.c:1822
+#: builtin/am.c:1839
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -9938,17 +10271,17 @@
"Potresti eseguire `git rm` su un file per accettarne la risoluzione "
"\"eliminato da loro\"."
-#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346
-#: builtin/reset.c:354
+#: builtin/am.c: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:1981
+#: builtin/am.c:1998
msgid "failed to clean index"
msgstr "pulizia dell'indice non riuscita"
-#: builtin/am.c:2025
+#: builtin/am.c:2042
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -9957,158 +10290,160 @@
"'am'.\n"
"Non ritorno indietro a ORIG_HEAD"
-#: builtin/am.c:2132
+#: builtin/am.c:2149
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valore non valido per --patch-format: %s"
-#: builtin/am.c:2172
+#: 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:2176
+#: 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:2207
+#: builtin/am.c:2226
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<opzioni>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2208
+#: builtin/am.c:2227
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<opzioni>] (--continue | --skip | --abort)"
-#: builtin/am.c:2214
+#: builtin/am.c:2233
msgid "run interactively"
msgstr "esegui in modalità interattiva"
-#: builtin/am.c:2216
+#: builtin/am.c:2235
msgid "historical option -- no-op"
msgstr "opzione storica -- non esegue nulla"
-#: builtin/am.c:2218
+#: 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:2219 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:304 builtin/stash.c:812
+#: 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:2221
+#: 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:2224
+#: builtin/am.c:2243
msgid "recode into utf8 (default)"
msgstr "converti codifica in UTF-8 (impostazione predefinita)"
-#: builtin/am.c:2226
+#: builtin/am.c:2245
msgid "pass -k flag to git-mailinfo"
msgstr "fornisci l'argomento -k a git-mailinfo"
-#: builtin/am.c:2228
+#: builtin/am.c:2247
msgid "pass -b flag to git-mailinfo"
msgstr "fornisci l'argomento -b a git-mailinfo"
-#: builtin/am.c:2230
+#: builtin/am.c:2249
msgid "pass -m flag to git-mailinfo"
msgstr "fornisci l'argomento -m a git-mailinfo"
-#: builtin/am.c:2232
+#: 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:2235
+#: 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:2238
+#: 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:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249
-#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261
-#: builtin/am.c:2267
+#: builtin/am.c: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:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670
-#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250
-#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505
-#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321
-#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:154 parse-options.h:175 parse-options.h:316
+#: 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:2263 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38
+#: builtin/am.c: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:2264
+#: builtin/am.c:2283
msgid "format the patch(es) are in"
msgstr "il formato delle patch"
-#: builtin/am.c:2270
+#: 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:2272
+#: 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:2275
+#: builtin/am.c:2294
msgid "synonyms for --continue"
msgstr "sinonimi di --continue"
-#: builtin/am.c:2278
+#: builtin/am.c:2297
msgid "skip the current patch"
msgstr "salta la patch corrente"
-#: builtin/am.c:2281
+#: 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:2284
+#: 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:2288
+#: builtin/am.c:2307
msgid "show the patch being applied"
msgstr "visualizza la patch in fase di applicazione"
-#: builtin/am.c:2293
+#: builtin/am.c:2312
msgid "lie about committer date"
msgstr "menti sulla data del commit"
-#: builtin/am.c:2295
+#: builtin/am.c:2314
msgid "use current timestamp for author date"
msgstr "usa il timestamp corrente come data autore"
-#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512
-#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517
-#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418
+#: builtin/am.c: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:2298 builtin/rebase.c:518 builtin/rebase.c:1557
+#: 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:2301
+#: builtin/am.c:2320
msgid "(internal use for git-rebase)"
msgstr "(a uso interno per git-rebase)"
-#: builtin/am.c:2319
+#: 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."
@@ -10116,18 +10451,18 @@
"L'opzione -b/--binary non esegue nulla da molto tempo e\n"
"sarà rimossa. Non usarla più."
-#: builtin/am.c:2326
+#: builtin/am.c:2345
msgid "failed to read the index"
msgstr "lettura dell'indice non riuscita"
-#: builtin/am.c:2341
+#: 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:2365
+#: builtin/am.c:2384
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -10136,11 +10471,11 @@
"Trovata directory smarrita %s.\n"
"Usa \"git am --abort\" per eliminarla."
-#: builtin/am.c:2371
+#: 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:2381
+#: 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 "
@@ -10180,25 +10515,25 @@
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>"
@@ -10206,7 +10541,7 @@
"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>"
@@ -10214,63 +10549,82 @@
"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
-msgid ""
-"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
-"term-new]"
-msgstr ""
-"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
-"term-new]"
-
#: builtin/bisect--helper.c:30
msgid ""
-"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
-"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
msgstr ""
-"git bisect--helper --bisect-start [--term-{old,good}=<termine> --term-{new,"
-"bad}=<termine>][--no-checkout] [<non funzionante> [<funzionante>...]] [--] "
-"[<percorsi>...]"
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
-#: builtin/bisect--helper.c:86
+#: 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}=<termine> --term-{old,"
+"good}=<termine>] [--no-checkout] [--first-parent] [<non funzionante> "
+"[<funzionante>...]] [--] [<percorsi>...]"
+
+#: 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:172
+#: builtin/bisect--helper.c:224
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -10278,27 +10632,27 @@
"impossibile eseguire il checkout dell'HEAD originario '%s'. Prova con 'git "
"bisect reset <commit>'."
-#: builtin/bisect--helper.c:216
+#: builtin/bisect--helper.c:268
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr "Argomento bisect_write errato: %s"
-#: builtin/bisect--helper.c:221
+#: 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:233
+#: builtin/bisect--helper.c:285
#, c-format
msgid "couldn't open the file '%s'"
msgstr "impossibile aprire il file '%s'"
-#: builtin/bisect--helper.c:259
+#: 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:286
+#: builtin/bisect--helper.c:338
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
@@ -10307,7 +10661,7 @@
"Devi specificare almeno una revisione %s ed una %s.\n"
"Puoi usare \"git bisect %s\" e \"git bisect %s\" per questo scopo."
-#: builtin/bisect--helper.c:290
+#: builtin/bisect--helper.c:342
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -10318,7 +10672,7 @@
"Quindi devi specificare almeno una revisione %s ed una %s.\n"
"Puoi usare \"git bisect %s\" e \"git bisect %s\" a questo scopo."
-#: builtin/bisect--helper.c:310
+#: builtin/bisect--helper.c:362
#, c-format
msgid "bisecting only with a %s commit"
msgstr "eseguo la bisezione solo con un commit %s"
@@ -10327,15 +10681,15 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:318
+#: builtin/bisect--helper.c:370
msgid "Are you sure [Y/n]? "
msgstr "Sei sicuro? [Y/n] "
-#: builtin/bisect--helper.c:379
+#: builtin/bisect--helper.c:431
msgid "no terms defined"
msgstr "nessun termine definito"
-#: builtin/bisect--helper.c:382
+#: builtin/bisect--helper.c:434
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
@@ -10344,7 +10698,7 @@
"I tuoi termini correnti sono %s per lo stato vecchio\n"
"e %s per lo stato nuovo.\n"
-#: builtin/bisect--helper.c:392
+#: builtin/bisect--helper.c:444
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
@@ -10353,282 +10707,329 @@
"argomento %s non valido per 'git bisect terms'.\n"
"Le opzioni supportate sono: --term-good|--term-old e --term-bad|--term-new."
-#: builtin/bisect--helper.c:478
+#: builtin/bisect--helper.c: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:482
+#: 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:514
+#: 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:529
+#: 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:550
+#: 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:553
+#: builtin/bisect--helper.c:748
msgid "bad HEAD - strange symbolic ref"
msgstr "head non valida - riferimento simbolico strano"
-#: builtin/bisect--helper.c:577
+#: builtin/bisect--helper.c:775
#, c-format
msgid "invalid ref: '%s'"
msgstr "riferimento non valido: '%s'"
-#: builtin/bisect--helper.c:633
+#: 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:635
+#: 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:637
+#: builtin/bisect--helper.c:870
msgid "cleanup the bisection state"
msgstr "pulisci lo stato bisezione"
-#: builtin/bisect--helper.c:639
+#: builtin/bisect--helper.c:872
msgid "check for expected revs"
msgstr "controlla se le revisioni attese sono presenti"
-#: builtin/bisect--helper.c:641
+#: builtin/bisect--helper.c:874
msgid "reset the bisection state"
msgstr "reimposta lo stato della bisezione"
-#: builtin/bisect--helper.c:643
+#: 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:645
+#: 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:647
+#: 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:649
+#: builtin/bisect--helper.c:882
msgid "print out the bisect terms"
msgstr "stampa i termini della bisezione"
-#: builtin/bisect--helper.c:651
+#: builtin/bisect--helper.c:884
msgid "start the bisect session"
msgstr "inizia la sessione di bisezione"
-#: builtin/bisect--helper.c:653
-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:655
+#: 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:673
+#: builtin/bisect--helper.c:910
msgid "--write-terms requires two arguments"
msgstr "--write-terms richiede due argomenti"
-#: builtin/bisect--helper.c:677
+#: builtin/bisect--helper.c:914
msgid "--bisect-clean-state requires no arguments"
msgstr "--bisect-clean-state non richiede argomenti"
-#: builtin/bisect--helper.c:684
+#: 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:688
+#: 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:694
+#: 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:700
+#: 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:706
+#: builtin/bisect--helper.c:943
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms richiede zero o un argomento"
-#: builtin/blame.c:31
+#: 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>"
-#: builtin/blame.c:36
+#: builtin/blame.c:37
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "le <opzioni revisione> sono documentate in git-rev-list(1)"
-#: builtin/blame.c:409
+#: builtin/blame.c:410
#, c-format
msgid "expecting a color: %s"
msgstr "atteso colore: %s"
-#: builtin/blame.c:416
+#: builtin/blame.c:417
msgid "must end with a color"
msgstr "deve terminare con un colore"
-#: builtin/blame.c:729
+#: builtin/blame.c:730
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "colore '%s' non valido in color.blame.repeatedLines"
-#: builtin/blame.c:747
+#: builtin/blame.c:748
msgid "invalid value for blame.coloring"
msgstr "valore non valido per blame.coloring"
-#: builtin/blame.c:822
+#: builtin/blame.c:845
#, c-format
msgid "cannot find revision %s to ignore"
msgstr "impossibile trovare la revisione %s da ignorare"
-#: builtin/blame.c:844
+#: 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:845
-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:846
+#: 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:847
+#: builtin/blame.c:870
msgid "Show work cost statistics"
msgstr "Visualizza le statistiche sul costo dell'operazione"
-#: builtin/blame.c:848
+#: builtin/blame.c:871
msgid "Force progress reporting"
msgstr "Forza l'indicazione d'avanzamento dell'operazione"
-#: builtin/blame.c:849
+#: builtin/blame.c:872
msgid "Show output score for blame entries"
msgstr "Visualizza il punteggio di output per le voci blame"
-#: builtin/blame.c:850
+#: builtin/blame.c:873
msgid "Show original filename (Default: auto)"
msgstr ""
"Visualizza il nome file originario (impostazione predefinita: automatico)"
-#: builtin/blame.c:851
+#: builtin/blame.c:874
msgid "Show original linenumber (Default: off)"
msgstr ""
"Visualizza il numero di riga originario (impostazione predefinita: off)"
-#: builtin/blame.c:852
+#: 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:853
+#: 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:854
+#: 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:855
+#: builtin/blame.c:878
msgid "Show raw timestamp (Default: off)"
msgstr "Visualizza il timestamp grezzo (impostazione predefinita: off)"
-#: builtin/blame.c:856
+#: 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:857
+#: 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:858
+#: 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:859
+#: builtin/blame.c:882
msgid "Ignore whitespace differences"
msgstr "Ignora le differenze relative agli spazi bianchi"
-#: builtin/blame.c:860 builtin/log.c:1702
+#: builtin/blame.c:883 builtin/log.c:1808
msgid "rev"
msgstr "revisione"
-#: builtin/blame.c:860
+#: builtin/blame.c:883
msgid "Ignore <rev> when blaming"
msgstr "Ignora <revisione> durante l'esecuzione del blame"
-#: builtin/blame.c:861
+#: builtin/blame.c:884
msgid "Ignore revisions from <file>"
msgstr "Ignora le revisioni specificate in <file>"
-#: builtin/blame.c:862
+#: 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:863
+#: builtin/blame.c:886
msgid "color lines by age"
msgstr "colora le righe in base all'età"
-#: builtin/blame.c:864
+#: builtin/blame.c:887
msgid "Spend extra cycles to find better match"
msgstr "Usa cicli extra per trovare una corrispondenza migliore"
-#: builtin/blame.c:865
+#: 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:866
+#: 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:867 builtin/blame.c:868
+#: builtin/blame.c:890 builtin/blame.c:891
msgid "score"
msgstr "punteggio"
-#: builtin/blame.c:867
+#: 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:868
+#: builtin/blame.c:891
msgid "Find line movements within and across files"
msgstr "Trova righe spostate all'interno e fra file"
-#: builtin/blame.c:869
+#: builtin/blame.c:892
msgid "n,m"
msgstr "n,m"
-#: builtin/blame.c:869
+#: 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:921
+#: 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"
@@ -10641,24 +11042,24 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:972
+#: builtin/blame.c:995
msgid "4 years, 11 months ago"
msgstr "4 anni, 11 giorni fa"
-#: builtin/blame.c:1079
+#: 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:1125
+#: 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>]"
@@ -10870,7 +11271,7 @@
msgid "do not use"
msgstr "non usare"
-#: builtin/branch.c:626 builtin/rebase.c:513
+#: builtin/branch.c:626 builtin/rebase.c:526
msgid "upstream"
msgstr "upstream"
@@ -10962,73 +11363,73 @@
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:785
+#: 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."
@@ -11036,33 +11437,33 @@
"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>?"
@@ -11070,7 +11471,7 @@
"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."
@@ -11078,6 +11479,106 @@
"l'opzione '--set-upstream' non è più supportata. Usa '--track' o '--set-"
"upstream-to'."
+#: builtin/bugreport.c:15
+msgid "git version:\n"
+msgstr "versione di git:\n"
+
+#: builtin/bugreport.c:21
+#, c-format
+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>"
@@ -11094,51 +11595,55 @@
msgid "git bundle unbundle <file> [<refname>...]"
msgstr "git bundle unbundle <file> [<nome riferimento>...]"
-#: builtin/bundle.c:66 builtin/pack-objects.c:3375
+#: 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:68 builtin/pack-objects.c:3377
+#: builtin/bundle.c:69 builtin/pack-objects.c:3482
msgid "show progress meter"
msgstr "visualizza la barra di avanzamento"
-#: builtin/bundle.c:70 builtin/pack-objects.c:3379
+#: 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:73 builtin/pack-objects.c:3382
+#: 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:93
+#: 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:104
+#: builtin/bundle.c:107
msgid "do not show bundle details"
msgstr "non visualizzare i dettagli sul bundle"
-#: builtin/bundle.c:119
+#: builtin/bundle.c:122
#, c-format
msgid "%s is okay\n"
msgstr "%s è corretto\n"
-#: builtin/bundle.c:160
+#: builtin/bundle.c:163
msgid "Need a repository to unbundle."
msgstr "Per decomprimere un bundle è necessario un repository."
-#: builtin/bundle.c:168 builtin/remote.c:1686
+#: 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:190 builtin/remote.c:1717
+#: builtin/bundle.c:193 builtin/remote.c:1718
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Sottocomando sconosciuto: %s"
-#: builtin/cat-file.c:595
+#: 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>"
@@ -11146,83 +11651,83 @@
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <tipo> | --textconv | --filters) [--path=<percorso>] <oggetto>"
-#: builtin/cat-file.c:596
+#: builtin/cat-file.c: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:617
+#: 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:635
+#: 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:636
+#: builtin/cat-file.c:639
msgid "show object type"
msgstr "visualizza tipo oggetto"
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:640
msgid "show object size"
msgstr "visualizza dimensioni oggetto"
-#: builtin/cat-file.c:639
+#: 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:640
+#: 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:642
+#: 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:644
+#: 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:645 git-submodule.sh:1002
+#: builtin/cat-file.c:648
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:646
+#: 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:648
+#: 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:649
+#: builtin/cat-file.c:652
msgid "buffer --batch output"
msgstr "esegui il buffering dell'output di --batch"
-#: builtin/cat-file.c:651
+#: 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:655
+#: 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:659
+#: 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:661
+#: 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:663
+#: builtin/cat-file.c:666
msgid "do not order --batch-all-objects output"
msgstr "non ordinare l'output di --batch-all-objects"
@@ -11250,8 +11755,8 @@
msgid "terminate input and output records by a NUL character"
msgstr "termina i record di input e output con un carattere NUL"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537
-#: builtin/worktree.c:499
+#: builtin/check-ignore.c:21 builtin/checkout.c:1482 builtin/gc.c:538
+#: builtin/worktree.c:561
msgid "suppress progress reporting"
msgstr "non visualizzare l'avanzamento dell'operazione"
@@ -11341,9 +11846,9 @@
msgstr "scrivi il contenuto in file temporanei"
#: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403
-#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909
-#: builtin/worktree.c:672
+#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827
+#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333
+#: builtin/worktree.c:754
msgid "string"
msgstr "stringa"
@@ -11371,100 +11876,100 @@
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git restore [<opzioni>] [--source=<branch>] <file>..."
-#: builtin/checkout.c:175 builtin/checkout.c:214
+#: builtin/checkout.c: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:177 builtin/checkout.c:216
+#: 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:193
+#: 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:243
+#: 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:261
+#: builtin/checkout.c:275
#, c-format
msgid "path '%s': cannot merge"
msgstr "percorso '%s': impossibile eseguire il merge"
-#: builtin/checkout.c:277
+#: 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:377
+#: 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:382
+#: 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:389
+#: 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:412 builtin/checkout.c:415 builtin/checkout.c:418
-#: builtin/checkout.c:422
+#: 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:425 builtin/checkout.c:428
+#: 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:432
+#: 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:436
+#: builtin/checkout.c:455
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "né '%s' né '%s' sono stati specificati"
-#: builtin/checkout.c:440
+#: 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:445 builtin/checkout.c:450
+#: 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:509 builtin/checkout.c:516
+#: 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:684 builtin/sparse-checkout.c:106
+#: builtin/checkout.c:703
msgid "you need to resolve your current index first"
msgstr "prima devi risolvere l'indice corrente"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:757
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -11473,50 +11978,50 @@
"impossibile continuare con modifiche in stage nei file seguenti:\n"
"%s"
-#: builtin/checkout.c:837
+#: 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:879
+#: builtin/checkout.c:895
msgid "HEAD is now at"
msgstr "HEAD si trova ora a"
-#: builtin/checkout.c:883 builtin/clone.c:717
+#: builtin/checkout.c:899 builtin/clone.c:720
msgid "unable to update HEAD"
msgstr "impossibile aggiornare HEAD"
-#: builtin/checkout.c:887
+#: builtin/checkout.c:903
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Ripristina il branch '%s'\n"
-#: builtin/checkout.c:890
+#: builtin/checkout.c:906
#, c-format
msgid "Already on '%s'\n"
msgstr "Si è già su '%s'\n"
-#: builtin/checkout.c:894
+#: 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:896 builtin/checkout.c:1320
+#: 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:898
+#: builtin/checkout.c:914
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Si è passati al branch '%s'\n"
-#: builtin/checkout.c:949
+#: builtin/checkout.c:965
#, c-format
msgid " ... and %d more.\n"
msgstr " ...e altri %d.\n"
-#: builtin/checkout.c:955
+#: builtin/checkout.c:971
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -11539,7 +12044,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:974
+#: 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"
@@ -11566,19 +12071,19 @@
" git branch <nome del nuovo branch> %s\n"
"\n"
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1025
msgid "internal error in revision walk"
msgstr "errore interno durante la visita delle revisioni"
-#: builtin/checkout.c:1013
+#: builtin/checkout.c:1029
msgid "Previous HEAD position was"
msgstr "La precedente posizione di HEAD era"
-#: builtin/checkout.c:1053 builtin/checkout.c:1315
+#: 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:1128
+#: builtin/checkout.c:1146
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -11587,7 +12092,7 @@
"'%s' potrebbe essere sia un file locale, sia un branch da tracciare.\n"
"Usa -- (e facoltativamente --no-guess) per rimuovere l'ambiguità"
-#: builtin/checkout.c:1135
+#: 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"
@@ -11608,51 +12113,51 @@
"rispetto a un particolare remoto, ad es. 'origin', potresti voler\n"
"impostare checkout.defaultRemote=origin nel tuo file di configurazione."
-#: builtin/checkout.c:1145
+#: 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:1211
+#: builtin/checkout.c:1229
msgid "only one reference expected"
msgstr "atteso solo un riferimento"
-#: builtin/checkout.c:1228
+#: builtin/checkout.c:1246
#, c-format
msgid "only one reference expected, %d given."
msgstr "atteso solo un riferimento, %d specificati."
-#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448
+#: builtin/checkout.c:1292 builtin/worktree.c:342 builtin/worktree.c:510
#, c-format
msgid "invalid reference: %s"
msgstr "riferimento non valido: %s"
-#: builtin/checkout.c:1287 builtin/checkout.c:1649
+#: 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:1334
+#: builtin/checkout.c:1352
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "atteso branch, ricevuto tag '%s'"
-#: builtin/checkout.c:1336
+#: 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:1337 builtin/checkout.c:1345
+#: 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:1340
+#: builtin/checkout.c:1358
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "atteso branch, ricevuto commit '%s'"
-#: builtin/checkout.c:1356
+#: builtin/checkout.c:1374
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -11660,7 +12165,7 @@
"impossibile cambiare branch durante un merge\n"
"Considera l'uso di \"git merge --quit\" o di \"git worktree add\"."
-#: builtin/checkout.c:1360
+#: builtin/checkout.c:1378
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -11668,7 +12173,7 @@
"impossibile cambiare branch nel bel mezzo di una sessione am\n"
"Considera l'uso di \"git am --quit\" o di \"git worktree add\"."
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1382
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -11676,7 +12181,7 @@
"impossibile cambiare branch durante un rebase\n"
"Considera l'uso di \"git rebase --quit\" o di \"git worktree add\"."
-#: builtin/checkout.c:1368
+#: builtin/checkout.c:1386
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -11684,7 +12189,7 @@
"impossibile cambiare branch durante un cherry-pick\n"
"Considera l'uso di \"git cherry-pick --quit\" o di \"git worktree add\"."
-#: builtin/checkout.c:1372
+#: builtin/checkout.c:1390
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -11692,147 +12197,149 @@
"impossibile cambiare branch durante un revert\n"
"Considera l'uso di \"git revert --quit\" o di \"git worktree add\"."
-#: builtin/checkout.c:1376
+#: builtin/checkout.c:1394
msgid "you are switching branch while bisecting"
msgstr "stai cambiando branch durante una bisezione"
-#: builtin/checkout.c:1383
+#: 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:1386 builtin/checkout.c:1390 builtin/checkout.c:1394
+#: 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:1398 builtin/checkout.c:1401 builtin/checkout.c:1404
-#: builtin/checkout.c:1409 builtin/checkout.c:1414
+#: 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:1411
+#: builtin/checkout.c:1429
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s' non accetta l'argomento <punto di partenza>"
-#: builtin/checkout.c:1419
+#: 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:1426
+#: builtin/checkout.c:1444
msgid "missing branch or commit argument"
msgstr "argomento branch o commit mancante"
-#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72
-#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286
-#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563
-#: builtin/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:1469
+#: 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:1470 builtin/log.c:1690 parse-options.h:322
+#: builtin/checkout.c:1488 builtin/log.c:1795 parse-options.h:322
msgid "style"
msgstr "stile"
-#: builtin/checkout.c:1471
+#: builtin/checkout.c:1489
msgid "conflict style (merge or diff3)"
msgstr "stile conflitti (merge o diff3)"
-#: builtin/checkout.c:1483 builtin/worktree.c:496
+#: builtin/checkout.c:1501 builtin/worktree.c:558
msgid "detach HEAD at named commit"
msgstr "scollega l'HEAD al commit specificato"
-#: builtin/checkout.c:1484
+#: builtin/checkout.c:1502
msgid "set upstream info for new branch"
msgstr "imposta le informazioni sull'upstream per il nuovo branch"
-#: builtin/checkout.c:1486
+#: builtin/checkout.c:1504
msgid "force checkout (throw away local modifications)"
msgstr "esegui forzatamente il checkout (scarta le modifiche locali)"
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1506
msgid "new-branch"
msgstr "nuovo branch"
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1506
msgid "new unparented branch"
msgstr "nuovo branch senza genitore"
-#: builtin/checkout.c:1490 builtin/merge.c:289
+#: builtin/checkout.c:1508 builtin/merge.c:291
msgid "update ignored files (default)"
msgstr "aggiorna i file ignorati (impostazione predefinita)"
-#: builtin/checkout.c:1493
+#: 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:1506
+#: 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:1509
+#: 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:1513
+#: 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:1565
-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:1568
+#: builtin/checkout.c:1590
msgid "-p and --overlay are mutually exclusive"
msgstr "le opzioni -p e --overlay sono mutualmente esclusive"
-#: builtin/checkout.c:1605
+#: builtin/checkout.c:1627
msgid "--track needs a branch name"
msgstr "--track richiede il nome di un branch"
-#: builtin/checkout.c:1610
-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:1642
+#: builtin/checkout.c:1664
#, c-format
msgid "could not resolve %s"
msgstr "impossibile risolvere %s"
-#: builtin/checkout.c:1658
+#: builtin/checkout.c:1680
msgid "invalid path specification"
msgstr "specificatore percorso non valido"
-#: builtin/checkout.c:1665
+#: 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:1669
+#: 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:1678
+#: builtin/checkout.c:1700
msgid "--pathspec-from-file is incompatible with --detach"
msgstr "--pathspec-from-file non è compatibile con --detach"
-#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506
+#: 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:1692
+#: builtin/checkout.c:1716
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -11840,110 +12347,111 @@
"git checkout: --ours/--theirs, --force e --merge sono incompatibili quando\n"
"si esegue il checkout dell'indice."
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1721
msgid "you must specify path(s) to restore"
msgstr "devi specificare il percorso/i percorsi da ripristinare"
-#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774
-#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494
+#: builtin/checkout.c: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:1724
+#: builtin/checkout.c:1748
msgid "create and checkout a new branch"
msgstr "crea un nuovo branch ed eseguine il checkout"
-#: builtin/checkout.c:1726
+#: builtin/checkout.c:1750
msgid "create/reset and checkout a branch"
msgstr "crea/reimposta un branch ed eseguine il checkout"
-#: builtin/checkout.c:1727
+#: builtin/checkout.c:1751
msgid "create reflog for new branch"
msgstr "crea il registro dei riferimenti per il nuovo branch"
-#: builtin/checkout.c:1729
+#: builtin/checkout.c:1753
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "prevedi 'git checkout <branch inesistente>' (impostazione predefinita)"
-#: builtin/checkout.c:1730
+#: builtin/checkout.c:1754
msgid "use overlay mode (default)"
msgstr "usa modalità overlay (impostazione predefinita)"
-#: builtin/checkout.c:1775
+#: 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:1777
+#: 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:1779
+#: builtin/checkout.c:1803
msgid "second guess 'git switch <no-such-branch>'"
msgstr "prevedi 'git switch <branch inesistente>'"
-#: builtin/checkout.c:1781
+#: builtin/checkout.c:1805
msgid "throw away local modifications"
msgstr "scarta le modifiche locali"
-#: builtin/checkout.c:1813
+#: builtin/checkout.c:1839
msgid "which tree-ish to checkout from"
msgstr "albero da cui eseguire il checkout"
-#: builtin/checkout.c:1815
+#: builtin/checkout.c:1841
msgid "restore the index"
msgstr "ripristina l'indice"
-#: builtin/checkout.c:1817
+#: builtin/checkout.c:1843
msgid "restore the working tree (default)"
msgstr "ripristina l'albero di lavoro (impostazione predefinita)"
-#: builtin/checkout.c:1819
+#: builtin/checkout.c:1845
msgid "ignore unmerged entries"
msgstr "ignora voci non sottoposte a merge"
-#: builtin/checkout.c:1820
+#: 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:301 git-add--interactive.perl:595
+#: builtin/clean.c:302 git-add--interactive.perl:595
#, c-format
msgid ""
"Prompt help:\n"
@@ -11956,7 +12464,7 @@
"pippo - seleziona un elemento basandoti su un prefisso univoco\n"
" - (vuoto) non selezionare niente\n"
-#: builtin/clean.c:305 git-add--interactive.perl:604
+#: builtin/clean.c:306 git-add--interactive.perl:604
#, c-format
msgid ""
"Prompt help:\n"
@@ -11983,27 +12491,27 @@
msgid "Huh (%s)?\n"
msgstr "Eh (%s)?\n"
-#: builtin/clean.c:663
+#: builtin/clean.c:661
#, c-format
msgid "Input ignore patterns>> "
msgstr "Immetti i pattern da ignorare>> "
-#: builtin/clean.c:700
+#: 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:721
+#: 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:762
+#: builtin/clean.c:758
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Eliminare %s [y/N]? "
-#: builtin/clean.c:795
+#: builtin/clean.c:789
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -12022,56 +12530,52 @@
"help - visualizza questa schermata\n"
"? - guida al prompt di selezione"
-#: builtin/clean.c:831
+#: 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:847
+#: builtin/clean.c:841
msgid "No more files to clean, exiting."
msgstr "Non ci sono più file da ripulire, esco."
-#: builtin/clean.c:909
+#: builtin/clean.c:903
msgid "do not print names of files removed"
msgstr "non stampare i nomi dei file eliminati"
-#: builtin/clean.c:911
+#: builtin/clean.c:905
msgid "force"
msgstr "forza l'operazione"
-#: builtin/clean.c:912
+#: builtin/clean.c:906
msgid "interactive cleaning"
msgstr "pulizia interattiva"
-#: builtin/clean.c:914
+#: builtin/clean.c:908
msgid "remove whole directories"
msgstr "rimuovi intere directory"
-#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564
-#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179
-#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/clean.c: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:916
+#: builtin/clean.c:910
msgid "add <pattern> to ignore rules"
msgstr "aggiungi <pattern> alle regole usate per ignorare i file"
-#: builtin/clean.c:917
+#: builtin/clean.c:911
msgid "remove ignored files, too"
msgstr "elimina anche i file ignorati"
-#: builtin/clean.c:919
+#: builtin/clean.c:913
msgid "remove only ignored files"
msgstr "elimina solo i file ignorati"
-#: builtin/clean.c:937
-msgid "-x and -X cannot be used together"
-msgstr "-x e -X non possono essere usati insieme"
-
-#: builtin/clean.c:941
+#: builtin/clean.c:929
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -12079,7 +12583,7 @@
"clean.requireForce è impostato a true e né -i, né -n, né -f sono stati "
"specificati; mi rifiuto di eseguire la pulizia"
-#: builtin/clean.c:944
+#: builtin/clean.c:932
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -12087,6 +12591,10 @@
"clean.requireForce è true per impostazione predefinita e né -i, né -n, né -f "
"sono stati specificati; mi rifiuto di eseguire la pulizia"
+#: 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>]"
@@ -12095,7 +12603,7 @@
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"
@@ -12115,11 +12623,11 @@
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"
@@ -12127,26 +12635,26 @@
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:1407
-#: builtin/submodule--helper.c:1912
+#: 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:1409
-#: builtin/submodule--helper.c:1914
+#: 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:3441 builtin/repack.c:327
+#: 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"
@@ -12162,8 +12670,8 @@
msgid "path to git-upload-pack on the remote"
msgstr "percorso al comando remoto git-upload-pack"
-#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828
-#: builtin/pull.c:207
+#: builtin/clone.c:125 builtin/fetch.c:173 builtin/grep.c:849
+#: builtin/pull.c:208
msgid "depth"
msgstr "profondità"
@@ -12171,7 +12679,8 @@
msgid "create a shallow clone of that depth"
msgstr "crea un clone shallow con questa profondità"
-#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430
+#: builtin/clone.c:127 builtin/fetch.c:175 builtin/pack-objects.c:3535
+#: builtin/pull.c:211
msgid "time"
msgstr "tempo"
@@ -12179,19 +12688,19 @@
msgid "create a shallow clone since a specific time"
msgstr "crea un clone shallow a partire dall'istante specificato"
-#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195
-#: builtin/rebase.c:1480
+#: builtin/clone.c:129 builtin/fetch.c: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:173
+#: 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/submodule--helper.c:1419
-#: builtin/submodule--helper.c:1928
+#: 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"
@@ -12203,11 +12712,11 @@
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"
@@ -12219,23 +12728,23 @@
msgid "set config inside the new repository"
msgstr "imposta la configurazione nel nuovo repository"
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
-#: builtin/push.c:573 builtin/send-pack.c:172
+#: builtin/clone.c:142 builtin/fetch.c: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:190 builtin/ls-remote.c:76
-#: builtin/push.c:573 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:191 builtin/pull.c:220
-#: builtin/push.c:574
+#: 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:193 builtin/pull.c:223
-#: builtin/push.c:576
+#: 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"
@@ -12269,32 +12778,32 @@
msgid "%s exists and is not a directory"
msgstr "%s esiste e non è una directory"
-#: builtin/clone.c:430
+#: builtin/clone.c:431
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "impossibile avviare l'iteratore su '%s'"
-#: builtin/clone.c:460
+#: builtin/clone.c:462
#, c-format
msgid "failed to create link '%s'"
msgstr "creazione del collegamento '%s' non riuscita"
-#: builtin/clone.c:464
+#: builtin/clone.c:466
#, c-format
msgid "failed to copy file to '%s'"
msgstr "copia del file in '%s' non riuscita"
-#: builtin/clone.c:469
+#: builtin/clone.c:471
#, c-format
msgid "failed to iterate over '%s'"
msgstr "iterazione su '%s' non riuscita"
-#: builtin/clone.c:494
+#: builtin/clone.c:498
#, c-format
msgid "done.\n"
msgstr "fatto.\n"
-#: builtin/clone.c:508
+#: builtin/clone.c:512
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -12305,102 +12814,108 @@
"con 'git status' e riprovare ad eseguire il checkout con\n"
"'git restore --source=HEAD :/'\n"
-#: builtin/clone.c:585
+#: 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:705
+#: builtin/clone.c:708
#, c-format
msgid "unable to update %s"
msgstr "impossibile aggiornare %s"
-#: builtin/clone.c:753
+#: builtin/clone.c:756
msgid "failed to initialize sparse-checkout"
msgstr "inizializzazione del file sparse-checkout non riuscita"
-#: builtin/clone.c:776
+#: 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:807
+#: builtin/clone.c:811
msgid "unable to checkout working tree"
msgstr "impossibile eseguire il checkout dell'albero di lavoro"
-#: builtin/clone.c:862
+#: builtin/clone.c:868
msgid "unable to write parameters to config file"
msgstr "impossibile scrivere i parametri nel file di configurazione"
-#: builtin/clone.c:925
+#: builtin/clone.c:931
msgid "cannot repack to clean up"
msgstr "impossibile eseguire il repack per pulire l'area di lavoro"
-#: builtin/clone.c:927
+#: builtin/clone.c:933
msgid "cannot unlink temporary alternates file"
msgstr "impossibile eseguire l'unlink del file alternates temporaneo"
-#: builtin/clone.c:965 builtin/receive-pack.c:1950
+#: builtin/clone.c:970 builtin/receive-pack.c:2434
msgid "Too many arguments."
msgstr "Troppi argomenti."
-#: builtin/clone.c:969
+#: builtin/clone.c:974
msgid "You must specify a repository to clone."
msgstr "Devi specificare un repository da clonare."
-#: builtin/clone.c:982
+#: 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:985
+#: 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:998
+#: builtin/clone.c:1006
#, c-format
msgid "repository '%s' does not exist"
msgstr "il repository '%s' non esiste"
-#: builtin/clone.c:1004 builtin/fetch.c:1796
+#: builtin/clone.c: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:1014
+#: 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:1024
+#: 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:1039 builtin/clone.c:1060 builtin/difftool.c:271
-#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327
+#: 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:1044
+#: 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:1064
+#: 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:1066
+#: builtin/clone.c:1082
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Clone in '%s' in corso...\n"
-#: builtin/clone.c:1090
+#: builtin/clone.c:1106
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -12408,36 +12923,36 @@
"il clone --recursive non è compatibile né con --reference né con --reference-"
"if-able"
-#: builtin/clone.c:1154
+#: 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:1156
+#: 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:1158
+#: 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:1160
+#: 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:1163
+#: builtin/clone.c:1179
msgid "source repository is shallow, ignoring --local"
msgstr "il repository sorgente è shallow, ignoro l'opzione --local"
-#: builtin/clone.c:1168
+#: builtin/clone.c:1184
msgid "--local is ignored"
msgstr "l'opzione --local è ignorata"
-#: builtin/clone.c:1243 builtin/clone.c:1251
+#: 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:1254
+#: builtin/clone.c:1279
msgid "You appear to have cloned an empty repository."
msgstr "Sembra che tu abbia clonato un repository vuoto."
@@ -12473,6 +12988,112 @@
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 "
@@ -12486,7 +13107,7 @@
msgid "duplicate parent %s ignored"
msgstr "genitore duplicato %s ignorato"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:546
#, c-format
msgid "not a valid object name %s"
msgstr "%s non è un nome oggetto valido"
@@ -12514,13 +13135,13 @@
msgid "id of a parent commit object"
msgstr "ID di un oggetto commit genitore"
-#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477
-#: builtin/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:1501
+#: builtin/commit-tree.c:115 builtin/commit.c:1504
msgid "commit message"
msgstr "messaggio di commit"
@@ -12528,8 +13149,8 @@
msgid "read commit log message from file"
msgstr "leggi il messaggio di log del commit da un file"
-#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288
-#: builtin/pull.c:175 builtin/revert.c:118
+#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:289
+#: builtin/pull.c:176 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "firma il commit con GPG"
@@ -12576,10 +13197,14 @@
"\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"
@@ -12601,70 +13226,74 @@
" 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:351
+#: 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:364
+#: 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:376
+#: builtin/commit.c:373
msgid "unable to create temporary index"
msgstr "impossibile creare l'indice temporaneo"
-#: builtin/commit.c:385
+#: builtin/commit.c:382
msgid "interactive add failed"
msgstr "aggiunta interattiva non riuscita"
-#: builtin/commit.c:400
+#: builtin/commit.c:397
msgid "unable to update temporary index"
msgstr "impossibile aggiornare l'indice temporaneo"
-#: builtin/commit.c:402
+#: builtin/commit.c:399
msgid "Failed to update main cache tree"
msgstr "Impossibile aggiornare l'albero cache principale"
-#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496
+#: builtin/commit.c: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:479
+#: 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:481
+#: 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:489
+#: 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:508
+#: builtin/commit.c:507
msgid "unable to write temporary index file"
msgstr "impossibile scrivere il file indice temporaneo"
-#: builtin/commit.c:606
+#: builtin/commit.c:605
#, c-format
msgid "commit '%s' lacks author header"
msgstr "dal commit '%s' manca l'intestazione autore"
-#: builtin/commit.c:608
+#: 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:627
+#: builtin/commit.c:626
msgid "malformed --author parameter"
msgstr "parametro --author malformato"
-#: builtin/commit.c:680
+#: builtin/commit.c:679
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -12672,68 +13301,66 @@
"impossibile selezionare un carattere commento non usato\n"
"nel messaggio di commit corrente"
-#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097
+#: builtin/commit.c: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:730 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:732
+#: builtin/commit.c:731
msgid "could not read log from standard input"
msgstr "impossibile leggere il log dallo standard input"
-#: builtin/commit.c:736
+#: builtin/commit.c:735
#, c-format
msgid "could not read log file '%s'"
msgstr "impossibile leggere il file di log '%s'"
-#: builtin/commit.c:767 builtin/commit.c:783
+#: builtin/commit.c:766 builtin/commit.c:782
msgid "could not read SQUASH_MSG"
msgstr "impossibile leggere SQUASH_MSG"
-#: builtin/commit.c:774
+#: builtin/commit.c:773
msgid "could not read MERGE_MSG"
msgstr "impossibile leggere MERGE_MSG"
-#: builtin/commit.c:834
+#: builtin/commit.c:833
msgid "could not write commit template"
msgstr "impossibile scrivere il modello di commit"
#: builtin/commit.c:853
-#, c-format
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
+"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:858
-#, c-format
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
+"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:871
+#: builtin/commit.c:868
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -12742,7 +13369,7 @@
"Immetti il messaggio di commit per le modifiche. Le righe che iniziano\n"
"con '%c' saranno ignorate e un messaggio vuoto interromperà il commit.\n"
-#: builtin/commit.c:879
+#: builtin/commit.c:876
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -12753,22 +13380,22 @@
"con '%c' saranno mantenute; puoi rimuoverle autonomamente se lo desideri.\n"
"Un messaggio vuoto interromperà il commit.\n"
-#: builtin/commit.c:896
+#: builtin/commit.c:893
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutore: %.*s <%.*s>"
-#: builtin/commit.c:904
+#: builtin/commit.c:901
#, c-format
msgid "%sDate: %s"
msgstr "%sData: %s"
-#: builtin/commit.c:911
+#: builtin/commit.c:908
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sEsecutore commit: %.*s <%.*s>"
-#: builtin/commit.c:929
+#: builtin/commit.c:926
msgid "Cannot read index"
msgstr "Impossibile leggere l'indice"
@@ -12776,7 +13403,7 @@
msgid "Error building trees"
msgstr "Errore durante la costruzione degli alberi"
-#: builtin/commit.c:1011 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"
@@ -12793,7 +13420,7 @@
msgid "Invalid ignored mode '%s'"
msgstr "Modo non valido ignorato: '%s'"
-#: builtin/commit.c:1087 builtin/commit.c:1327
+#: builtin/commit.c:1087 builtin/commit.c:1331
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Modo file non tracciati non valido: '%s'"
@@ -12818,79 +13445,83 @@
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Sei nel bel mezzo di un cherry-pick - impossibile eseguire l'amend."
-#: builtin/commit.c:1188
+#: builtin/commit.c: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:1198
+#: 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:1200
+#: 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:1208
+#: 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:1225
+#: 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:1231
+#: 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:1362 builtin/commit.c:1524
+#: builtin/commit.c:1366 builtin/commit.c:1527
msgid "show status concisely"
msgstr "visualizza concisamente lo stato"
-#: builtin/commit.c:1364 builtin/commit.c:1526
+#: builtin/commit.c:1368 builtin/commit.c:1529
msgid "show branch information"
msgstr "visualizza le informazioni sul branch"
-#: builtin/commit.c:1366
+#: builtin/commit.c:1370
msgid "show stash information"
msgstr "visualizza le informazioni sullo stash"
-#: builtin/commit.c:1368 builtin/commit.c:1528
+#: 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:1370
+#: builtin/commit.c:1374
msgid "version"
msgstr "versione"
-#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549
-#: builtin/worktree.c:643
+#: 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:1373 builtin/commit.c:1532
+#: 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:1376 builtin/commit.c:1535
+#: builtin/commit.c:1380 builtin/commit.c:1538
msgid "terminate entries with NUL"
msgstr "termina le voci con NUL"
-#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538
-#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
-#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336
+#: builtin/commit.c: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:1379 builtin/commit.c:1538
+#: 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:1383
+#: builtin/commit.c:1387
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -12898,11 +13529,11 @@
"visualizza file ignorati, modalità facoltative: traditional, matching, no. "
"(Impostazione predefinita: traditional)"
-#: builtin/commit.c:1385 parse-options.h:192
+#: builtin/commit.c:1389 parse-options.h:192
msgid "when"
msgstr "quando"
-#: builtin/commit.c:1386
+#: builtin/commit.c:1390
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -12910,175 +13541,175 @@
"ignora modifiche ai sottomoduli, opzione facoltativa \"quando\": all, dirty, "
"untracked. (Impostazione predefinita: all)"
-#: builtin/commit.c:1388
+#: builtin/commit.c:1392
msgid "list untracked files in columns"
msgstr "elenca i file non tracciati in colonne"
-#: builtin/commit.c:1389
+#: builtin/commit.c:1393
msgid "do not detect renames"
msgstr "non rilevare le ridenominazioni"
-#: builtin/commit.c:1391
+#: builtin/commit.c:1395
msgid "detect renames, optionally set similarity index"
msgstr ""
"rileva le ridenominazioni, imposta facoltativamente l'indice di similarità"
-#: builtin/commit.c:1411
+#: 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:1494
+#: 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:1495
+#: builtin/commit.c:1498
msgid "show diff in commit message template"
msgstr "visualizza il diff nel modello del messaggio di commit"
-#: builtin/commit.c:1497
+#: builtin/commit.c:1500
msgid "Commit message options"
msgstr "Opzioni messaggio di commit"
-#: builtin/commit.c:1498 builtin/merge.c:275 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:1499
+#: builtin/commit.c:1502
msgid "author"
msgstr "autore"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1502
msgid "override author for commit"
msgstr "sovrascrivi l'autore per il commit"
-#: builtin/commit.c:1500 builtin/gc.c:538
+#: builtin/commit.c:1503 builtin/gc.c:539
msgid "date"
msgstr "data"
-#: builtin/commit.c:1500
+#: builtin/commit.c:1503
msgid "override date for commit"
msgstr "sovrascrivi la data per il commit"
-#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504
-#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92
+#: builtin/commit.c: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:1502
+#: 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:1503
+#: builtin/commit.c:1506
msgid "reuse message from specified commit"
msgstr "riusa il messaggio del commit specificato"
-#: builtin/commit.c:1504
+#: 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:1505
+#: 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:1506
+#: 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:1507 builtin/log.c:1634 builtin/merge.c:290
-#: builtin/pull.c:144 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:1508
+#: builtin/commit.c:1511
msgid "use specified template file"
msgstr "usa il file modello specificato"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1512
msgid "force edit of commit"
msgstr "forza la modifica del commit"
-#: builtin/commit.c:1511
+#: builtin/commit.c:1514
msgid "include status in commit message template"
msgstr "includi lo stato nel modello del messaggio di commit"
-#: builtin/commit.c:1516
+#: builtin/commit.c:1519
msgid "Commit contents options"
msgstr "Opzioni contenuto commit"
-#: builtin/commit.c:1517
+#: builtin/commit.c:1520
msgid "commit all changed files"
msgstr "esegui il commit di tutti i file modificati"
-#: builtin/commit.c:1518
+#: 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:1519
+#: builtin/commit.c:1522
msgid "interactively add files"
msgstr "aggiungi i file in modalità interattiva"
-#: builtin/commit.c:1520
+#: builtin/commit.c:1523
msgid "interactively add changes"
msgstr "aggiungi le modifiche in modalità interattiva"
-#: builtin/commit.c:1521
+#: builtin/commit.c:1524
msgid "commit only specified files"
msgstr "esegui il commit solo dei file specificati"
-#: builtin/commit.c:1522
+#: builtin/commit.c:1525
msgid "bypass pre-commit and commit-msg hooks"
msgstr "ignora gli hook pre-commit e commit-msg"
-#: builtin/commit.c:1523
+#: builtin/commit.c:1526
msgid "show what would be committed"
msgstr "visualizza gli elementi di cui sarebbe eseguito il commit"
-#: builtin/commit.c:1536
+#: builtin/commit.c:1539
msgid "amend previous commit"
msgstr "modifica il commit precedente"
-#: builtin/commit.c:1537
+#: builtin/commit.c:1540
msgid "bypass post-rewrite hook"
msgstr "ignora l'hook post-rewrite"
-#: builtin/commit.c:1544
+#: builtin/commit.c:1547
msgid "ok to record an empty change"
msgstr "accetta di registrare una modifica vuota"
-#: builtin/commit.c:1546
+#: 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:1619
+#: builtin/commit.c:1622
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "File MERGE_HEAD corrotto (%s)"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1629
msgid "could not read MERGE_MODE"
msgstr "impossibile leggere MERGE_MODE"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1650
#, c-format
msgid "could not read commit message: %s"
msgstr "impossibile leggere il messaggio di commit: %s"
-#: builtin/commit.c:1652
+#: 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:1657
+#: 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:1691
+#: 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"
@@ -13090,294 +13721,226 @@
"superata, quindi esegui \"git restore --staged :/\" per\n"
"procedere al ripristino."
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:17
-msgid ""
-"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
-msgstr ""
-"git commit-graph verify [--object-dir <directory oggetti>] [--shallow] [--"
-"[no-]progress]"
-
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:22
-msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
-msgstr ""
-"git commit-graph write [--object-dir <directory oggetti>] [--append|--split] "
-"[--reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <opzioni split>"
-
-#: builtin/commit-graph.c:52
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "impossibile trovare la directory oggetti corrispondente a %s"
-
-#: builtin/commit-graph.c:68 builtin/commit-graph.c:125
-#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657
-msgid "dir"
-msgstr "directory"
-
-#: builtin/commit-graph.c:69 builtin/commit-graph.c:126
-#: builtin/commit-graph.c:211
-msgid "The object directory to store the graph"
-msgstr "La directory oggetti in cui memorizzare il grafo"
-
-#: builtin/commit-graph.c:71
-msgid "if the commit-graph is split, only verify the tip file"
-msgstr "se il grafo dei commit è diviso, verifica solo l'ultimo file"
-
-#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23
-#, c-format
-msgid "Could not open commit-graph '%s'"
-msgstr "Impossibile aprire il grafo dei commit '%s'"
-
-#: builtin/commit-graph.c:128
-msgid "start walk at all refs"
-msgstr "inizia la visita da tutti i riferimenti"
-
-#: builtin/commit-graph.c:130
-msgid "scan pack-indexes listed by stdin for commits"
-msgstr ""
-"esamina i pack-index elencati sullo standard input alla ricerca di commit"
-
-#: builtin/commit-graph.c:132
-msgid "start walk at commits listed by stdin"
-msgstr "inizia la visita ai commit elencati sullo standard input"
-
-#: builtin/commit-graph.c:134
-msgid "include all commits already in the commit-graph file"
-msgstr "includi tutti i commit già presenti nel file commit-graph"
-
-#: builtin/commit-graph.c:137
-msgid "allow writing an incremental commit-graph file"
-msgstr "consenti la scrittura di un file grafo dei commit incrementale"
-
-#: builtin/commit-graph.c:139 builtin/commit-graph.c:143
-msgid "maximum number of commits in a non-base split commit-graph"
-msgstr "numero massimo di commit in un grafo dei commit diviso non di base"
-
-#: builtin/commit-graph.c:141
-msgid "maximum ratio between two levels of a split commit-graph"
-msgstr "rapporto massimo fra due livelli di un grafo dei commit diviso"
-
-#: builtin/commit-graph.c:159
-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:104 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:116
+#: builtin/config.c:119
msgid "only one type at a time"
msgstr "solo un tipo per volta"
-#: builtin/config.c:125
+#: builtin/config.c:128
msgid "Config file location"
msgstr "Percorso file di configurazione"
-#: builtin/config.c:126
+#: builtin/config.c:129
msgid "use global config file"
msgstr "usa il file di configurazione globale"
-#: builtin/config.c:127
+#: builtin/config.c:130
msgid "use system config file"
msgstr "usa il file di configurazione di sistema"
-#: builtin/config.c:128
+#: builtin/config.c:131
msgid "use repository config file"
msgstr "usa il file di configurazione del repository"
-#: builtin/config.c:129
+#: builtin/config.c:132
msgid "use per-worktree config file"
msgstr "usa il file di configurazione per albero di lavoro"
-#: builtin/config.c:130
+#: builtin/config.c:133
msgid "use given config file"
msgstr "usa il file di configurazione specificato"
-#: builtin/config.c:131
+#: builtin/config.c:134
msgid "blob-id"
msgstr "ID blob"
-#: builtin/config.c:131
+#: builtin/config.c:134
msgid "read config from given blob object"
msgstr "leggi la configurazione dall'oggetto blob specificato"
-#: builtin/config.c:132
+#: builtin/config.c:135
msgid "Action"
msgstr "Azione"
-#: builtin/config.c:133
+#: builtin/config.c:136
msgid "get value: name [value-regex]"
msgstr "ottieni valore: nome [espressione-regolare-valore]"
-#: builtin/config.c:134
+#: builtin/config.c:137
msgid "get all values: key [value-regex]"
msgstr "ottieni tutti i valori: chiave [espressione-regolare-valore]"
-#: builtin/config.c:135
+#: 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:136
+#: 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:137
+#: 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:138
+#: builtin/config.c:141
msgid "add a new variable: name value"
msgstr "aggiungi una nuova variabile: nome valore"
-#: builtin/config.c:139
+#: builtin/config.c:142
msgid "remove a variable: name [value-regex]"
msgstr "rimuovi una variabile: nome [espressione-regolare-valore]"
-#: builtin/config.c:140
+#: builtin/config.c:143
msgid "remove all matches: name [value-regex]"
msgstr "rimuovi tutte le corrispondenze: nome [espressione-regolare-valore]"
-#: builtin/config.c:141
+#: builtin/config.c:144
msgid "rename section: old-name new-name"
msgstr "rinomina sezione: vecchio-nome nuovo-nome"
-#: builtin/config.c:142
+#: builtin/config.c:145
msgid "remove a section: name"
msgstr "rimuovi una sezione: nome"
-#: builtin/config.c:143
+#: builtin/config.c:146
msgid "list all"
msgstr "elenca tutti"
-#: builtin/config.c:144
+#: builtin/config.c:147
msgid "open an editor"
msgstr "apri un editor"
-#: builtin/config.c:145
+#: builtin/config.c:148
msgid "find the color configured: slot [default]"
msgstr "trova il colore configurato: slot [valore-predefinito]"
-#: builtin/config.c:146
+#: 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:147
+#: builtin/config.c:150
msgid "Type"
msgstr "Tipo"
-#: builtin/config.c:148 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:149
+#: builtin/config.c:152
msgid "value is \"true\" or \"false\""
msgstr "il valore è \"true\" o \"false\""
-#: builtin/config.c:150
+#: builtin/config.c:153
msgid "value is decimal number"
msgstr "il valore è un numero decimale"
-#: builtin/config.c:151
+#: builtin/config.c:154
msgid "value is --bool or --int"
msgstr "il valore è --bool o --int"
-#: builtin/config.c:152
+#: 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:153
+#: builtin/config.c:157
msgid "value is an expiry date"
msgstr "il valore è una data di scadenza"
-#: builtin/config.c:154
+#: builtin/config.c:158
msgid "Other"
msgstr "Altro"
-#: builtin/config.c:155
+#: builtin/config.c:159
msgid "terminate values with NUL byte"
msgstr "termina i valori con un byte NUL"
-#: builtin/config.c:156
+#: builtin/config.c:160
msgid "show variable names only"
msgstr "visualizza solo i nomi delle variabili"
-#: builtin/config.c:157
+#: builtin/config.c:161
msgid "respect include directives on lookup"
msgstr ""
"rispetta le directory di inclusione durante il recupero delle variabili"
-#: builtin/config.c:158
+#: 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:159
+#: 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:160 builtin/env--helper.c:40
+#: builtin/config.c:164 builtin/env--helper.c:45
msgid "value"
msgstr "valore"
-#: builtin/config.c:160
+#: 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:174
+#: 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:176
+#: 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:324
+#: builtin/config.c:334
#, c-format
msgid "invalid key pattern: %s"
msgstr "pattern chiave non valido: %s"
-#: builtin/config.c:360
+#: 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:417
+#: builtin/config.c:434
#, c-format
msgid "cannot parse color '%s'"
msgstr "impossibile analizzare il colore '%s'"
-#: builtin/config.c:459
+#: builtin/config.c:476
msgid "unable to parse default color value"
msgstr "impossibile analizzare il valore colore predefinito"
-#: builtin/config.c:512 builtin/config.c:768
+#: builtin/config.c:529 builtin/config.c:789
msgid "not in a git directory"
msgstr "non si è in una directory git"
-#: builtin/config.c:515
+#: builtin/config.c:532
msgid "writing to stdin is not supported"
msgstr "la scrittura su standard input non è supportata"
-#: builtin/config.c:518
+#: builtin/config.c:535
msgid "writing config blobs is not supported"
msgstr "la scrittura di blob di configurazione non è supportata"
-#: builtin/config.c:603
+#: builtin/config.c:620
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -13392,23 +13955,27 @@
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:627
+#: builtin/config.c:644
msgid "only one config file at a time"
msgstr "solo un file di configurazione per volta"
-#: builtin/config.c:632
+#: 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:635
+#: 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:655
+#: 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:679
+#: 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"
@@ -13419,52 +13986,52 @@
"Leggi la sezione \"FILE DI CONFIGURAZIONE\" in \"git help worktree\" per\n"
"i dettagli"
-#: builtin/config.c:714
+#: 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:719
+#: builtin/config.c:740
msgid "only one action at a time"
msgstr "solo un'azione per volta"
-#: builtin/config.c:732
+#: 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:738
+#: 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:744
+#: builtin/config.c:765
msgid "--default is only applicable to --get"
msgstr "--default è applicabile solo a --get"
-#: builtin/config.c:757
+#: builtin/config.c:778
#, c-format
msgid "unable to read config file '%s'"
msgstr "impossibile leggere il file di configurazione '%s'"
-#: builtin/config.c:760
+#: builtin/config.c:781
msgid "error processing config file(s)"
msgstr "errore durante l'elaborazione del/dei file di configurazione"
-#: builtin/config.c:770
+#: builtin/config.c:791
msgid "editing stdin is not supported"
msgstr "la modifica dello standard input non è supportata"
-#: builtin/config.c:772
+#: builtin/config.c:793
msgid "editing blobs is not supported"
msgstr "la modifica dei blob non è supportata"
-#: builtin/config.c:786
+#: builtin/config.c:807
#, c-format
msgid "cannot create configuration file %s"
msgstr "impossibile creare il file di configurazione %s"
-#: builtin/config.c:799
+#: builtin/config.c:820
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -13473,7 +14040,7 @@
"impossibile sovrascrivere valori multipli con un singolo valore\n"
" Usa un'espressione regolare, --add o --replace-all per modificare %s."
-#: builtin/config.c:873 builtin/config.c:884
+#: builtin/config.c:894 builtin/config.c:905
#, c-format
msgid "no such section: %s"
msgstr "sezione %s non esistente"
@@ -13486,6 +14053,33 @@
msgid "print sizes in human readable format"
msgstr "stampa le dimensioni in un formato leggibile"
+#: 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>...]"
@@ -13494,51 +14088,46 @@
msgid "git describe [<options>] --dirty"
msgstr "git describe [<opzioni>] --dirty"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "head"
msgstr "head"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "lightweight"
msgstr "leggero"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "annotated"
msgstr "annotato"
-#: builtin/describe.c:275
+#: builtin/describe.c:277
#, c-format
msgid "annotated tag %s not available"
msgstr "il tag annotato %s non è disponibile"
-#: builtin/describe.c:279
-#, c-format
-msgid "annotated tag %s has no embedded name"
-msgstr "il tag annotato %s non ha un nome incorporato"
-
#: builtin/describe.c:281
#, c-format
-msgid "tag '%s' is really '%s' here"
-msgstr "il tag '%s' in realtà qui è '%s'"
+msgid "tag '%s' is externally known as '%s'"
+msgstr "il tag '%s' è noto all'esterno come '%s'"
-#: builtin/describe.c:325
+#: builtin/describe.c:328
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "nessun tag corrisponde esattamente a '%s'"
-#: builtin/describe.c:327
+#: 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:394
+#: builtin/describe.c:397
#, c-format
msgid "finished search at %s\n"
msgstr "ricerca terminata in %s\n"
-#: builtin/describe.c:421
+#: builtin/describe.c:424
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -13547,7 +14136,7 @@
"Nessun tag annotato può descrivere '%s'.\n"
"Ciò nonostante, c'erano dei tag non annotati: prova con --tags."
-#: builtin/describe.c:425
+#: builtin/describe.c:428
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -13556,12 +14145,12 @@
"Nessun tag può descrivere '%s'.\n"
"Prova con --always o crea dei tag."
-#: builtin/describe.c:455
+#: builtin/describe.c:458
#, c-format
msgid "traversed %lu commits\n"
msgstr "ho attraversato %lu commit\n"
-#: builtin/describe.c:458
+#: builtin/describe.c:461
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -13570,126 +14159,136 @@
"trovati più di %i tag; ho elencato i %i più recenti\n"
"ho terminato la ricerca in %s\n"
-#: builtin/describe.c:526
+#: builtin/describe.c:529
#, c-format
msgid "describe %s\n"
msgstr "descrivi %s\n"
-#: builtin/describe.c:529
+#: builtin/describe.c:532
#, c-format
msgid "Not a valid object name %s"
msgstr "%s non è un nome oggetto valido"
-#: builtin/describe.c:537
+#: 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:551
+#: builtin/describe.c:554
msgid "find the tag that comes after the commit"
msgstr "trova il tag successivo al commit"
-#: builtin/describe.c:552
+#: builtin/describe.c:555
msgid "debug search strategy on stderr"
msgstr "esegui il debug della strategia di ricerca sullo standard error"
-#: builtin/describe.c:553
+#: builtin/describe.c:556
msgid "use any ref"
msgstr "usa qualunque riferimento"
-#: builtin/describe.c:554
+#: builtin/describe.c:557
msgid "use any tag, even unannotated"
msgstr "usa qualunque tag, anche quelli non annotati"
-#: builtin/describe.c:555
+#: builtin/describe.c:558
msgid "always use long format"
msgstr "usa sempre il formato lungo"
-#: builtin/describe.c:556
+#: builtin/describe.c:559
msgid "only follow first parent"
msgstr "segui solo il primo genitore"
-#: builtin/describe.c:559
+#: builtin/describe.c:562
msgid "only output exact matches"
msgstr "visualizza solo le corrispondenze esatte"
-#: builtin/describe.c:561
+#: 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:563
+#: builtin/describe.c:566
msgid "only consider tags matching <pattern>"
msgstr "considera solo i tag corrispondenti al <pattern>"
-#: builtin/describe.c:565
+#: builtin/describe.c:568
msgid "do not consider tags matching <pattern>"
msgstr "non considerare i tag corrispondenti al <pattern>"
-#: builtin/describe.c:567 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:535
msgid "show abbreviated commit object as fallback"
msgstr "visualizza l'oggetto commit abbreviato come fallback"
-#: builtin/describe.c:568 builtin/describe.c:571
+#: builtin/describe.c:571 builtin/describe.c:574
msgid "mark"
msgstr "contrassegno"
-#: builtin/describe.c:569
+#: 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:572
+#: 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:590
+#: builtin/describe.c:593
msgid "--long is incompatible with --abbrev=0"
msgstr "--long non è compatibile con --abbrev=0"
-#: builtin/describe.c:619
+#: builtin/describe.c:622
msgid "No names found, cannot describe anything."
msgstr "Nessun nome trovato, non è possibile descrivere nulla."
-#: builtin/describe.c:670
+#: builtin/describe.c:673
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty non è compatibile con le espressioni commit"
-#: builtin/describe.c:672
+#: 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>...]"
@@ -13809,28 +14408,28 @@
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 `"
@@ -13843,189 +14442,246 @@
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [opzioni-elenco-rev]"
-#: builtin/fast-export.c:853
+#: 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:1152
+#: 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:1154
+#: builtin/fast-export.c:1200
msgid "select handling of signed tags"
msgstr "seleziona la gestione dei tag firmati"
-#: builtin/fast-export.c:1157
+#: 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:1160
+#: 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:1163
+#: builtin/fast-export.c:1209
msgid "Dump marks to this file"
msgstr "Esegui il dump dei contrassegni in questo file"
-#: builtin/fast-export.c:1165
+#: builtin/fast-export.c:1211
msgid "Import marks from this file"
msgstr "Importa i contrassegni da questo file"
-#: builtin/fast-export.c:1169
+#: 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:1171
+#: 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:1173
+#: 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:1175
+#: 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:1176
+#: builtin/fast-export.c:1222
msgid "Skip output of blob data"
msgstr "Ometti l'output dei dati dei blob"
-#: builtin/fast-export.c:1177 builtin/log.c:1705
+#: builtin/fast-export.c:1223 builtin/log.c:1811
msgid "refspec"
msgstr "specificatore riferimento"
-#: builtin/fast-export.c:1178
+#: builtin/fast-export.c:1224
msgid "Apply refspec to exported refs"
msgstr "Applica lo specificatore riferimento ai riferimenti esportati"
-#: builtin/fast-export.c:1179
+#: builtin/fast-export.c:1225
msgid "anonymize output"
msgstr "rendi anonimo l'output"
-#: builtin/fast-export.c:1181
+#: 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:1183
+#: builtin/fast-export.c:1232
msgid "Show original object ids of blobs/commits"
msgstr "Visualizza gli ID oggetto originari dei blob/commit"
-#: builtin/fast-export.c:1185
+#: builtin/fast-export.c:1234
msgid "Label tags with mark ids"
msgstr "Etichetta i tag con ID contrassegno"
-#: builtin/fast-export.c:1220
+#: 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/fetch.c:34
+#: 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:35
+#: builtin/fetch.c:36
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<opzioni>] <gruppo>"
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<opzioni>] [(<repository> | <gruppo>)...]"
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<opzioni>]"
-#: builtin/fetch.c:116
+#: builtin/fetch.c:119
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel non può essere negativo"
-#: builtin/fetch.c:139 builtin/pull.c:184
+#: builtin/fetch.c:142 builtin/pull.c:185
msgid "fetch from all remotes"
msgstr "esegui il fetch da tutti i remoti"
-#: builtin/fetch.c:141 builtin/pull.c:228
+#: 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:143 builtin/pull.c:187
+#: 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:145 builtin/pull.c:190
+#: 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:146
+#: builtin/fetch.c:149
msgid "force overwrite of local reference"
msgstr "forza la sovrascrittura del riferimento locale"
-#: builtin/fetch.c:148
+#: builtin/fetch.c:151
msgid "fetch from multiple remotes"
msgstr "esegui il fetch da più remoti"
-#: builtin/fetch.c:150 builtin/pull.c:194
+#: 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:152
+#: 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:154
+#: builtin/fetch.c:157
msgid "number of submodules fetched in parallel"
msgstr "numero di sottomoduli recuperati in parallelo"
-#: builtin/fetch.c:156 builtin/pull.c:197
+#: builtin/fetch.c: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:158
+#: 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:159 builtin/fetch.c:182 builtin/pull.c:121
+#: builtin/fetch.c:162 builtin/fetch.c:187 builtin/pull.c:122
msgid "on-demand"
msgstr "a richiesta"
-#: builtin/fetch.c:160
+#: builtin/fetch.c:163
msgid "control recursive fetching of submodules"
msgstr "controlla il recupero ricorsivo dei sottomoduli"
-#: builtin/fetch.c:164 builtin/pull.c:205
+#: 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:166
+#: builtin/fetch.c:171
msgid "allow updating of HEAD ref"
msgstr "consenti l'aggiornamento del riferimento HEAD"
-#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208
+#: builtin/fetch.c: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:171
+#: 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:177 builtin/pull.c:211
+#: builtin/fetch.c:182 builtin/pull.c:221
msgid "convert to a complete repository"
msgstr "converti in un repository completo"
-#: builtin/fetch.c:180
+#: builtin/fetch.c:185
msgid "prepend this to submodule path output"
msgstr "anteponi questo prefisso all'output del percorso del sottomodulo"
-#: builtin/fetch.c:183
+#: builtin/fetch.c:188
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
@@ -14033,94 +14689,98 @@
"impostazione predefinita per il recupero ricorsivo dei sottomoduli (a "
"priorità minore rispetto ai file di configurazione)"
-#: builtin/fetch.c:187 builtin/pull.c:214
+#: builtin/fetch.c:192 builtin/pull.c:224
msgid "accept refs that update .git/shallow"
msgstr "accetta i riferimenti che aggiornano .git/shallow"
-#: builtin/fetch.c:188 builtin/pull.c:216
+#: builtin/fetch.c:193 builtin/pull.c:226
msgid "refmap"
msgstr "mappa riferimenti"
-#: builtin/fetch.c:189 builtin/pull.c:217
+#: builtin/fetch.c:194 builtin/pull.c:227
msgid "specify fetch refmap"
msgstr "specifica la mappa dei riferimenti per il fetch"
-#: builtin/fetch.c:196
+#: 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:199
-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:201 builtin/pull.c:226
+#: 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:203
+#: builtin/fetch.c:210
msgid "write the commit-graph after fetching"
msgstr "scrivi il grafo dei commit dopo il fetch"
-#: builtin/fetch.c:513
+#: 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:653
+#: 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:751
+#: builtin/fetch.c:775
#, c-format
msgid "object %s not found"
msgstr "oggetto %s non trovato"
-#: builtin/fetch.c:755
+#: builtin/fetch.c:779
msgid "[up to date]"
msgstr "[aggiornato]"
-#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
+#: builtin/fetch.c:792 builtin/fetch.c:808 builtin/fetch.c:880
msgid "[rejected]"
msgstr "[rifiutato]"
-#: builtin/fetch.c:769
+#: builtin/fetch.c:793
msgid "can't fetch in current branch"
msgstr "impossibile eseguire il fetch nel branch corrente"
-#: builtin/fetch.c:779
+#: builtin/fetch.c:803
msgid "[tag update]"
msgstr "[tag aggiornato]"
-#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839
-#: builtin/fetch.c:851
+#: builtin/fetch.c: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:784
+#: builtin/fetch.c:808
msgid "would clobber existing tag"
msgstr "sovrascriverebbe il tag esistente"
-#: builtin/fetch.c:806
+#: builtin/fetch.c:830
msgid "[new tag]"
msgstr "[nuovo tag]"
-#: builtin/fetch.c:809
+#: builtin/fetch.c:833
msgid "[new branch]"
msgstr "[nuovo branch]"
-#: builtin/fetch.c:812
+#: builtin/fetch.c:836
msgid "[new ref]"
msgstr "[nuovo riferimento]"
-#: builtin/fetch.c:851
+#: builtin/fetch.c:875
msgid "forced update"
msgstr "aggiornamento forzato"
-#: builtin/fetch.c:856
+#: builtin/fetch.c:880
msgid "non-fast-forward"
msgstr "non fast forward"
-#: builtin/fetch.c:877
+#: 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"
@@ -14131,7 +14791,7 @@
"riabilitarlo, usa l'opzione '--show-forced-updates' o esegui 'git config\n"
"fetch.showForcedUpdates true'."
-#: builtin/fetch.c:881
+#: builtin/fetch.c:905
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
@@ -14143,22 +14803,22 @@
"aggiornamenti forzati. Puoi usare '--no-show-forced-updates' o eseguire\n"
"'git config fetch.showForcedUpdates false' per omettere questo controllo.\n"
-#: builtin/fetch.c:920
+#: builtin/fetch.c: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:941
+#: 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:1026 builtin/fetch.c:1164
+#: builtin/fetch.c:1053 builtin/fetch.c:1191
#, c-format
msgid "From %.*s\n"
msgstr "Da %.*s\n"
-#: builtin/fetch.c:1037
+#: builtin/fetch.c:1064
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -14168,58 +14828,58 @@
"eseguire\n"
" 'git remote prune %s' per rimuovere ogni branch vecchio in conflitto"
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1161
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s diventerà pendente)"
-#: builtin/fetch.c:1135
+#: builtin/fetch.c:1162
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s è diventato pendente)"
-#: builtin/fetch.c:1167
+#: builtin/fetch.c:1194
msgid "[deleted]"
msgstr "[eliminato]"
-#: builtin/fetch.c:1168 builtin/remote.c:1112
+#: builtin/fetch.c:1195 builtin/remote.c:1113
msgid "(none)"
msgstr "(nessuno)"
-#: builtin/fetch.c:1191
+#: 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:1210
+#: 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:1213
+#: 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:1421
+#: builtin/fetch.c:1448
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "rilevati branch multipli, stato incompatibile con --set-upstream"
-#: builtin/fetch.c:1436
+#: 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:1438
+#: builtin/fetch.c:1465
msgid "not setting upstream for a remote tag"
msgstr "non imposto l'upstream per un tag remoto"
-#: builtin/fetch.c:1440
+#: builtin/fetch.c:1467
msgid "unknown branch type"
msgstr "tipo branch sconosciuto"
-#: builtin/fetch.c:1442
+#: builtin/fetch.c:1469
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
@@ -14227,22 +14887,22 @@
"nessun branch sorgente trovato.\n"
"devi specificare esattamente un branch con l'opzione --set-upstream."
-#: builtin/fetch.c:1568 builtin/fetch.c:1631
+#: builtin/fetch.c:1598 builtin/fetch.c:1661
#, c-format
msgid "Fetching %s\n"
msgstr "Recupero di %s in corso\n"
-#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101
+#: builtin/fetch.c:1608 builtin/fetch.c:1663 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr "Impossibile recuperare %s"
-#: builtin/fetch.c:1590
+#: 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:1693
+#: 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."
@@ -14250,45 +14910,45 @@
"Non è stato specificato alcun repository remoto. Specifica un URL o il\n"
"nome di un remoto da cui dovranno essere recuperate le nuove revisioni."
-#: builtin/fetch.c:1730
+#: builtin/fetch.c:1760
msgid "You need to specify a tag name."
msgstr "Devi specificare il nome di un tag."
-#: builtin/fetch.c:1780
+#: builtin/fetch.c:1825
msgid "Negative depth in --deepen is not supported"
msgstr "Le profondità negative in --deepen non sono supportate"
-#: builtin/fetch.c:1782
+#: builtin/fetch.c:1827
msgid "--deepen and --depth are mutually exclusive"
msgstr "le opzioni --deepen e --depth sono mutualmente esclusive"
-#: builtin/fetch.c:1787
+#: builtin/fetch.c:1832
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth e --unshallow non possono essere usati insieme."
-#: builtin/fetch.c:1789
+#: 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:1805
+#: 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:1807
+#: 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:1816
+#: 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:1823
+#: 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:1841
+#: builtin/fetch.c:1887
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
@@ -14296,29 +14956,33 @@
"--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:671
+#: 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:674
+#: builtin/fmt-merge-msg.c:21
msgid "alias for --log (deprecated)"
msgstr "alias di --log (deprecato)"
-#: builtin/fmt-merge-msg.c:677
+#: builtin/fmt-merge-msg.c:24
msgid "text"
msgstr "testo"
-#: builtin/fmt-merge-msg.c:678
+#: 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:679
+#: builtin/fmt-merge-msg.c:26
msgid "file to read from"
msgstr "file da cui leggere"
@@ -14331,8 +14995,8 @@
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>]]"
@@ -14361,7 +15025,7 @@
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"
@@ -14385,32 +15049,32 @@
msgid "print only refs which don't contain the commit"
msgstr "stampa solo i riferimenti che non contengono il commit"
-#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148
+#: builtin/fsck.c: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:100 builtin/fsck.c:120
+#: 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:114
+#: builtin/fsck.c:115
#, c-format
msgid "warning in %s %s: %s"
msgstr "avviso in %s %s: %s"
-#: builtin/fsck.c:143 builtin/fsck.c:146
+#: builtin/fsck.c:144 builtin/fsck.c:147
#, c-format
msgid "broken link from %7s %s"
msgstr "collegamento rotto da %7s %s"
-#: builtin/fsck.c:155
+#: builtin/fsck.c:156
msgid "wrong object type in link"
msgstr "tipo oggetto errato nel collegamento"
-#: builtin/fsck.c:171
+#: builtin/fsck.c:172
#, c-format
msgid ""
"broken link from %7s %s\n"
@@ -14419,240 +15083,240 @@
"collegamento rotto da %7s %s\n"
" a %7s %s"
-#: builtin/fsck.c:282
+#: builtin/fsck.c:283
#, c-format
msgid "missing %s %s"
msgstr "%s mancante %s"
-#: builtin/fsck.c:309
+#: builtin/fsck.c:310
#, c-format
msgid "unreachable %s %s"
msgstr "%s non raggiungibile %s"
-#: builtin/fsck.c:329
+#: builtin/fsck.c:330
#, c-format
msgid "dangling %s %s"
msgstr "%s pendente %s"
-#: builtin/fsck.c:339
+#: builtin/fsck.c:340
msgid "could not create lost-found"
msgstr "impossibile creare lost-found"
-#: builtin/fsck.c:350
+#: builtin/fsck.c:351
#, c-format
msgid "could not finish '%s'"
msgstr "impossibile terminare '%s'"
-#: builtin/fsck.c:367
+#: builtin/fsck.c:368
#, c-format
msgid "Checking %s"
msgstr "Controllo di %s in corso"
-#: builtin/fsck.c:405
+#: builtin/fsck.c:406
#, c-format
msgid "Checking connectivity (%d objects)"
msgstr "Controllo connessione in corso (%d oggetti)"
-#: builtin/fsck.c:424
+#: builtin/fsck.c:425
#, c-format
msgid "Checking %s %s"
msgstr "Controllo di %s in corso %s"
-#: builtin/fsck.c:429
+#: builtin/fsck.c:430
msgid "broken links"
msgstr "collegamenti rotti"
-#: builtin/fsck.c:438
+#: builtin/fsck.c:439
#, c-format
msgid "root %s"
msgstr "radice %s"
-#: builtin/fsck.c:446
+#: 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:475
+#: builtin/fsck.c:476
#, c-format
msgid "%s: object corrupt or missing"
msgstr "%s: oggetto corrotto o mancante"
-#: builtin/fsck.c:500
+#: builtin/fsck.c:501
#, c-format
msgid "%s: invalid reflog entry %s"
msgstr "%s: voce registro riferimenti non valida: %s"
-#: builtin/fsck.c:514
+#: builtin/fsck.c:515
#, c-format
msgid "Checking reflog %s->%s"
msgstr "Controllo registro riferimenti %s->%s"
-#: builtin/fsck.c:548
+#: builtin/fsck.c:549
#, c-format
msgid "%s: invalid sha1 pointer %s"
msgstr "%s: puntatore SHA1 non valido: %s"
-#: builtin/fsck.c:555
+#: builtin/fsck.c:556
#, c-format
msgid "%s: not a commit"
msgstr "%s: non è un commit"
-#: builtin/fsck.c:609
+#: builtin/fsck.c:610
msgid "notice: No default references"
msgstr "avviso: nessun riferimento predefinito"
-#: builtin/fsck.c:624
+#: builtin/fsck.c:625
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s: oggetto corrotto o mancante: %s"
-#: builtin/fsck.c:637
+#: builtin/fsck.c:638
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s: impossibile analizzare l'oggetto: %s"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:658
#, c-format
msgid "bad sha1 file: %s"
msgstr "file SHA1 non valido: %s"
-#: builtin/fsck.c:672
+#: builtin/fsck.c:673
msgid "Checking object directory"
msgstr "Controllo directory oggetti in corso"
-#: builtin/fsck.c:675
+#: builtin/fsck.c:676
msgid "Checking object directories"
msgstr "Controllo directory oggetti in corso"
-#: builtin/fsck.c:690
+#: builtin/fsck.c:691
#, c-format
msgid "Checking %s link"
msgstr "Controllo collegamento %s"
-#: builtin/fsck.c:695 builtin/index-pack.c:843
+#: builtin/fsck.c:696 builtin/index-pack.c:865
#, c-format
msgid "invalid %s"
msgstr "%s non valido"
-#: builtin/fsck.c:702
+#: builtin/fsck.c:703
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s punta a qualcosa di strano (%s)"
-#: builtin/fsck.c:708
+#: 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:712
+#: 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:724
+#: builtin/fsck.c:725
msgid "Checking cache tree"
msgstr "Controllo cache albero in corso"
-#: builtin/fsck.c:729
+#: 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:738
+#: builtin/fsck.c:739
msgid "non-tree in cache-tree"
msgstr "oggetto non albero nella cache alberi"
-#: builtin/fsck.c:769
+#: builtin/fsck.c:770
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<opzioni>] [<oggetto>...]"
-#: builtin/fsck.c:775
+#: builtin/fsck.c:776
msgid "show unreachable objects"
msgstr "visualizza oggetti non raggiungibili"
-#: builtin/fsck.c:776
+#: builtin/fsck.c:777
msgid "show dangling objects"
msgstr "visualizza oggetti pendenti"
-#: builtin/fsck.c:777
+#: builtin/fsck.c:778
msgid "report tags"
msgstr "segnala i tag"
-#: builtin/fsck.c:778
+#: builtin/fsck.c:779
msgid "report root nodes"
msgstr "segnala i nodi radice"
-#: builtin/fsck.c:779
+#: builtin/fsck.c:780
msgid "make index objects head nodes"
msgstr "rendi gli oggetti indice nodi head"
-#: builtin/fsck.c:780
+#: builtin/fsck.c:781
msgid "make reflogs head nodes (default)"
msgstr "rendi i registri dei riferimenti nodi head (impostazione predefinita)"
-#: builtin/fsck.c:781
+#: builtin/fsck.c:782
msgid "also consider packs and alternate objects"
msgstr "considera anche i pack e gli oggetti alternativi"
-#: builtin/fsck.c:782
+#: builtin/fsck.c:783
msgid "check only connectivity"
msgstr "controlla solo la connessione"
-#: builtin/fsck.c:783
+#: builtin/fsck.c:784
msgid "enable more strict checking"
msgstr "abilita controlli più restrittivi"
-#: builtin/fsck.c:785
+#: builtin/fsck.c:786
msgid "write dangling objects in .git/lost-found"
msgstr "scrivi oggetti pendenti in .git/lost-found"
-#: builtin/fsck.c:786 builtin/prune.c:132
+#: builtin/fsck.c:787 builtin/prune.c:134
msgid "show progress"
msgstr "visualizza l'avanzamento"
-#: builtin/fsck.c:787
+#: builtin/fsck.c:788
msgid "show verbose names for reachable objects"
msgstr "visualizza nomi dettagliati per gli oggetti raggiungibili"
-#: builtin/fsck.c:846 builtin/index-pack.c:225
+#: builtin/fsck.c:847 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "Controllo oggetti in corso"
-#: builtin/fsck.c:874
+#: builtin/fsck.c:875
#, c-format
msgid "%s: object missing"
msgstr "%s: oggetto mancante"
-#: builtin/fsck.c:885
+#: builtin/fsck.c:886
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "parametro non valido: atteso SHA1, presente '%s'"
-#: builtin/gc.c:35
+#: 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:475 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:484 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'"
-#: builtin/gc.c:491
+#: builtin/gc.c:492
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -14668,56 +15332,56 @@
"\n"
"%s"
-#: builtin/gc.c:539
+#: builtin/gc.c:540
msgid "prune unreferenced objects"
msgstr "elimina oggetti non referenziati"
-#: builtin/gc.c:541
+#: builtin/gc.c:542
msgid "be more thorough (increased runtime)"
msgstr "sii più accurato (tempi di esecuzione maggiori)"
-#: builtin/gc.c:542
+#: builtin/gc.c:543
msgid "enable auto-gc mode"
msgstr "abilita modalità garbage collector automatica"
-#: builtin/gc.c:545
+#: builtin/gc.c:546
msgid "force running gc even if there may be another gc running"
msgstr ""
"forza l'esecuzione del garbage collector anche nel caso in cui ve ne "
"potrebbe essere un altro in esecuzione"
-#: builtin/gc.c:548
+#: builtin/gc.c:549
msgid "repack all other packs except the largest pack"
msgstr ""
"esegui il repack di tutti gli altri pack ad eccezione di quello più grande"
-#: builtin/gc.c:565
+#: builtin/gc.c:566
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "analisi del valore %s di gc.logexpiry non riuscita"
-#: builtin/gc.c:576
+#: builtin/gc.c:577
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr "analisi del valore %s per la scadenza delle eliminazioni non riuscita"
-#: builtin/gc.c:596
+#: builtin/gc.c:597
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"Comprimo il repository in background per ottenere le migliori prestazioni.\n"
-#: builtin/gc.c:598
+#: builtin/gc.c:599
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Comprimo il repository per ottenere le migliori prestazioni.\n"
-#: builtin/gc.c:599
+#: builtin/gc.c:600
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Vedi \"git help gc\" per le operazioni di manutenzione manuali.\n"
-#: builtin/gc.c:639
+#: builtin/gc.c:640
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -14725,13 +15389,67 @@
"gc è già in esecuzione sul computer '%s' con PID %<PRIuMAX> (usa --force se "
"non lo è)"
-#: builtin/gc.c:694
+#: builtin/gc.c:695
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Ci sono troppi oggetti sparsi non raggiungibili; esegui 'git prune' per "
"eliminarli."
+#: builtin/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 ""
@@ -14751,263 +15469,263 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731
-#: builtin/pack-objects.c:2854
+#: builtin/grep.c:287 builtin/index-pack.c: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:453 builtin/grep.c:578 builtin/grep.c:618
+#: 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:633
+#: 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:704
+#: builtin/grep.c:725
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "switch '%c' richiede un valore numerico"
-#: builtin/grep.c:803
+#: 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:805
+#: builtin/grep.c:826
msgid "find in contents not managed by git"
msgstr "la ricerca nei contenuti non è gestita da Git"
-#: builtin/grep.c:807
+#: 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:809
+#: builtin/grep.c:830
msgid "ignore files specified via '.gitignore'"
msgstr "ignora i file specificati in '.gitignore'"
-#: builtin/grep.c:811
+#: builtin/grep.c:832
msgid "recursively search in each submodule"
msgstr "cerca ricorsivamente in ogni sottomodulo"
-#: builtin/grep.c:814
+#: builtin/grep.c:835
msgid "show non-matching lines"
msgstr "visualizza le righe non corrispondenti"
-#: builtin/grep.c:816
+#: builtin/grep.c:837
msgid "case insensitive matching"
msgstr "ricerca corrispondenze senza differenze maiuscole/minuscole"
-#: builtin/grep.c:818
+#: builtin/grep.c:839
msgid "match patterns only at word boundaries"
msgstr "cerca corrispondenze ai pattern solo a inizio/fine parola"
-#: builtin/grep.c:820
+#: builtin/grep.c:841
msgid "process binary files as text"
msgstr "elabora i file binari come testuali"
-#: builtin/grep.c:822
+#: builtin/grep.c:843
msgid "don't match patterns in binary files"
msgstr "non cercare corrispondenze ai pattern nei file binari"
-#: builtin/grep.c:825
+#: 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:827
+#: builtin/grep.c:848
msgid "search in subdirectories (default)"
msgstr "cerca nelle sottodirectory (impostazione predefinita)"
-#: builtin/grep.c:829
+#: builtin/grep.c:850
msgid "descend at most <depth> levels"
msgstr "scendi al più di <profondità> livelli"
-#: builtin/grep.c:833
+#: builtin/grep.c:854
msgid "use extended POSIX regular expressions"
msgstr "usa espressioni regolari POSIX estese"
-#: builtin/grep.c:836
+#: builtin/grep.c:857
msgid "use basic POSIX regular expressions (default)"
msgstr "usa espressioni regolari POSIX di base (impostazione predefinita)"
-#: builtin/grep.c:839
+#: builtin/grep.c:860
msgid "interpret patterns as fixed strings"
msgstr "interpreta i pattern come stringhe fisse"
-#: builtin/grep.c:842
+#: builtin/grep.c:863
msgid "use Perl-compatible regular expressions"
msgstr "usa espressioni regolari compatibili con Perl"
-#: builtin/grep.c:845
+#: builtin/grep.c:866
msgid "show line numbers"
msgstr "visualizza numeri di riga"
-#: builtin/grep.c:846
+#: builtin/grep.c:867
msgid "show column number of first match"
msgstr "visualizza il numero di colonna della prima corrispondenza"
-#: builtin/grep.c:847
+#: builtin/grep.c:868
msgid "don't show filenames"
msgstr "non visualizzare i nomi file"
-#: builtin/grep.c:848
+#: builtin/grep.c:869
msgid "show filenames"
msgstr "visualizza i nomi file"
-#: builtin/grep.c:850
+#: 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:852
+#: 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:854
+#: builtin/grep.c:875
msgid "synonym for --files-with-matches"
msgstr "sinonimo di --files-with-matches"
-#: builtin/grep.c:857
+#: 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:859
+#: builtin/grep.c:880
msgid "print NUL after filenames"
msgstr "stampa NUL dopo i nomi file"
-#: builtin/grep.c:862
+#: builtin/grep.c:883
msgid "show only matching parts of a line"
msgstr "visualizza solo le parti corrispondenti di una riga"
-#: builtin/grep.c:864
+#: 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:865
+#: builtin/grep.c:886
msgid "highlight matches"
msgstr "evidenzia corrispondenze"
-#: builtin/grep.c:867
+#: 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:869
+#: 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:872
+#: 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:875
+#: builtin/grep.c:896
msgid "show <n> context lines before matches"
msgstr "visualizza <n> righe di contesto prima delle corrispondenze"
-#: builtin/grep.c:877
+#: builtin/grep.c:898
msgid "show <n> context lines after matches"
msgstr "visualizza <n> righe di contesto dopo le corrispondenze"
-#: builtin/grep.c:879
+#: builtin/grep.c:900
msgid "use <n> worker threads"
msgstr "usa <n> thread di lavoro"
-#: builtin/grep.c:880
+#: builtin/grep.c:901
msgid "shortcut for -C NUM"
msgstr "scorciatoia per -C NUM"
-#: builtin/grep.c:883
+#: 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:885
+#: builtin/grep.c:906
msgid "show the surrounding function"
msgstr "visualizza la funzione circostante"
-#: builtin/grep.c:888
+#: builtin/grep.c:909
msgid "read patterns from file"
msgstr "leggi le corrispondenze da un file"
-#: builtin/grep.c:890
+#: builtin/grep.c:911
msgid "match <pattern>"
msgstr "cerca corrispondenze con <pattern>"
-#: builtin/grep.c:892
+#: builtin/grep.c:913
msgid "combine patterns specified with -e"
msgstr "combina i pattern specificati con -e"
-#: builtin/grep.c:904
+#: 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:906
+#: 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:908
+#: builtin/grep.c:929
msgid "show parse tree for grep expression"
msgstr "visualizza l'albero di analisi per l'espressione grep"
-#: builtin/grep.c:912
+#: builtin/grep.c:933
msgid "pager"
msgstr "pager"
-#: builtin/grep.c:912
+#: builtin/grep.c:933
msgid "show matching files in the pager"
msgstr "visualizza i file corrispondenti nel pager"
-#: builtin/grep.c:916
+#: builtin/grep.c:937
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "consenti"
-#: builtin/grep.c:983
+#: builtin/grep.c:1004
msgid "no pattern given"
msgstr "nessun pattern specificato"
-#: builtin/grep.c:1019
+#: 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:1027
+#: builtin/grep.c:1048
#, c-format
msgid "unable to resolve revision: %s"
msgstr "impossibile risolvere la revisione %s"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1078
msgid "--untracked not supported with --recurse-submodules"
msgstr "l'opzione --untracked non è supportata con --recurse-submodules"
-#: builtin/grep.c:1061
+#: builtin/grep.c:1082
msgid "invalid option combination, ignoring --threads"
msgstr "combinazione di opzioni non valida, ignoro --threads"
-#: builtin/grep.c:1064 builtin/pack-objects.c:3547
+#: builtin/grep.c:1085 builtin/pack-objects.c:3655
msgid "no threads support, ignoring --threads"
msgstr "non vi è supporto per i thread, ignoro --threads"
-#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851
+#: builtin/grep.c: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:1101
+#: 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:1127
+#: 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:1133
+#: 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:1141
+#: builtin/grep.c:1162
msgid "both --cached and trees are given"
msgstr "sono specificati sia --cached sia degli alberi"
@@ -15050,66 +15768,66 @@
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"
@@ -15118,7 +15836,7 @@
"'%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"
@@ -15127,396 +15845,424 @@
"'%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:606
+#: 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:95
+#: 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:765
-#: builtin/index-pack.c:804 builtin/index-pack.c:813
+#: 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:158
-#: builtin/pack-objects.c:218 builtin/pack-objects.c:313
+#: 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:802
+#: 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:810
+#: 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:824
+#: builtin/index-pack.c:846
#, c-format
msgid "invalid blob object %s"
msgstr "oggetto blob %s non valido"
-#: builtin/index-pack.c:827 builtin/index-pack.c:846
+#: builtin/index-pack.c:849 builtin/index-pack.c:868
msgid "fsck error in packed object"
msgstr "errore fsck nell'oggetto sottoposto a pack"
-#: builtin/index-pack.c:848
+#: 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:920 builtin/index-pack.c:951
+#: 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:1121
+#: builtin/index-pack.c:1161
msgid "Receiving objects"
msgstr "Ricezione degli oggetti"
-#: builtin/index-pack.c:1121
+#: builtin/index-pack.c:1161
msgid "Indexing objects"
msgstr "Indicizzazione degli oggetti"
-#: builtin/index-pack.c:1155
+#: builtin/index-pack.c:1195
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "il pack è corrotto (SHA1 non corrisponde)"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1200
msgid "cannot fstat packfile"
msgstr "impossibile eseguire fstat sul file pack"
-#: builtin/index-pack.c:1163
+#: builtin/index-pack.c:1203
msgid "pack has junk at the end"
msgstr "il pack ha dati inutili alla fine"
-#: builtin/index-pack.c:1175
+#: 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:1198
+#: builtin/index-pack.c:1238
msgid "Resolving deltas"
msgstr "Risoluzione dei delta"
-#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615
+#: 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:1249
+#: builtin/index-pack.c:1282
msgid "confusion beyond insanity"
msgstr "confusione oltre ogni follia"
-#: builtin/index-pack.c:1255
+#: 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:1267
+#: 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:1271
+#: 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:1295
+#: 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:1392
+#: builtin/index-pack.c:1424
#, c-format
msgid "local object %s is corrupt"
msgstr "l'oggetto locale %s è corrotto"
-#: builtin/index-pack.c:1406
+#: 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:1431
+#: builtin/index-pack.c:1469
#, c-format
msgid "cannot write %s file '%s'"
msgstr "impossibile scrivere il file %s '%s'"
-#: builtin/index-pack.c:1439
+#: 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:1463
+#: builtin/index-pack.c:1501
msgid "error while closing pack file"
msgstr "errore nella chiusura del file pack"
-#: builtin/index-pack.c:1477
+#: builtin/index-pack.c:1515
msgid "cannot store pack file"
msgstr "impossibile archiviare il file pack"
-#: builtin/index-pack.c:1485
+#: builtin/index-pack.c:1523
msgid "cannot store index file"
msgstr "impossibile archiviare index file"
-#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862
+#: 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:1597
+#: 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:1599
+#: 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:1647
+#: 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:1654
+#: 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:1693
+#: builtin/index-pack.c:1728
msgid "Cannot come back to cwd"
msgstr "impossibile tornare alla directory di lavoro corrente"
-#: builtin/index-pack.c:1742 builtin/index-pack.c:1745
-#: builtin/index-pack.c:1761 builtin/index-pack.c:1765
+#: builtin/index-pack.c: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:1781
+#: 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:1783
+#: builtin/index-pack.c:1823
msgid "--stdin requires a git repository"
msgstr "--stdin richiede un repository Git"
-#: builtin/index-pack.c:1789
+#: 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:1837 builtin/unpack-objects.c:582
+#: 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>]"
@@ -15524,25 +16270,41 @@
"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-"
@@ -15551,11 +16313,15 @@
"%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 "
@@ -15633,113 +16399,113 @@
msgid "invalid --decorate option: %s"
msgstr "opzione --decorate non valida: %s"
-#: builtin/log.c:174
+#: builtin/log.c:177
msgid "show source"
msgstr "visualizza sorgente"
-#: builtin/log.c:175
+#: builtin/log.c:178
msgid "Use mail map file"
msgstr "Usa il file mappatura e-mail"
-#: builtin/log.c:177
+#: builtin/log.c:181
msgid "only decorate refs that match <pattern>"
msgstr "decora solo i riferimenti corrispondenti a <pattern>"
-#: builtin/log.c:179
+#: builtin/log.c:183
msgid "do not decorate refs that match <pattern>"
msgstr "non decorare i riferimenti corrispondenti a <pattern>"
-#: builtin/log.c:180
+#: builtin/log.c:184
msgid "decorate options"
msgstr "opzioni decorazione"
-#: builtin/log.c:183
+#: 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:281
+#: builtin/log.c:297
#, c-format
msgid "Final output: %d %s\n"
msgstr "Output finale: %d %s\n"
-#: builtin/log.c:535
+#: builtin/log.c:555
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: file non valido"
-#: builtin/log.c:550 builtin/log.c:645
+#: builtin/log.c:570 builtin/log.c:665
#, c-format
msgid "could not read object %s"
msgstr "impossibile leggere l'oggetto %s"
-#: builtin/log.c:670
+#: builtin/log.c:690
#, c-format
msgid "unknown type: %d"
msgstr "tipo sconosciuto: %d"
-#: builtin/log.c:814
+#: builtin/log.c:839
#, c-format
msgid "%s: invalid cover from description mode"
msgstr "%s: modo lettera da descrizione non valido"
-#: builtin/log.c:821
+#: builtin/log.c:846
msgid "format.headers without value"
msgstr "format.headers non ha alcun valore"
-#: builtin/log.c:936
+#: builtin/log.c:965
msgid "name of output directory is too long"
msgstr "il nome della directory di output è troppo lungo"
-#: builtin/log.c:952
+#: builtin/log.c:981
#, c-format
msgid "cannot open patch file %s"
msgstr "impossibile aprire il file patch %s"
-#: builtin/log.c:969
+#: builtin/log.c:998
msgid "need exactly one range"
msgstr "è necessario specificare esattamente un intervallo"
-#: builtin/log.c:979
+#: builtin/log.c:1008
msgid "not a range"
msgstr "il valore non è un intervallo"
-#: builtin/log.c:1143
+#: builtin/log.c:1172
msgid "cover letter needs email format"
msgstr "la lettera di accompagnamento dev'essere in formato e-mail"
-#: builtin/log.c:1149
+#: builtin/log.c:1178
msgid "failed to create cover-letter file"
msgstr "creazione del file lettera di accompagnamento non riuscita"
-#: builtin/log.c:1228
+#: builtin/log.c:1259
#, c-format
msgid "insane in-reply-to: %s"
msgstr "valore in-reply-to folle: %s"
-#: builtin/log.c:1255
+#: builtin/log.c:1286
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<opzioni>] [<da> | <intervallo revisioni>]"
-#: builtin/log.c:1313
+#: builtin/log.c:1344
msgid "two output directories?"
msgstr "due directory di output?"
-#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211
+#: builtin/log.c: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:1434 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:1439
+#: builtin/log.c:1515
msgid "could not find exact merge base"
msgstr "impossibile trovare esattamente la base del merge"
-#: builtin/log.c:1443
+#: 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"
@@ -15751,288 +16517,293 @@
"In alternativa puoi specificare manualmente il commit di base con\n"
"--base=<ID commit di base>"
-#: builtin/log.c:1463
+#: builtin/log.c:1548
msgid "failed to find exact merge base"
msgstr "impossibile trovare esattamente la base del merge"
-#: builtin/log.c:1474
+#: 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:1478
+#: 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:1531
+#: builtin/log.c:1633
msgid "cannot get patch id"
msgstr "impossibile ottenere l'ID della patch"
-#: builtin/log.c:1583
-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:1629
+#: 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:1736
msgid "use [PATCH n/m] even with a single patch"
msgstr "usa [PATCH n/m] anche con una singola patch"
-#: builtin/log.c:1632
+#: builtin/log.c:1739
msgid "use [PATCH] even with multiple patches"
msgstr "usa [PATCH] anche con più patch"
-#: builtin/log.c:1636
+#: builtin/log.c:1743
msgid "print patches to standard out"
msgstr "stampa le patch sullo standard output"
-#: builtin/log.c:1638
+#: builtin/log.c:1745
msgid "generate a cover letter"
msgstr "genera una lettera di accompagnamento"
-#: builtin/log.c:1640
+#: 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:1641
+#: builtin/log.c:1748
msgid "sfx"
msgstr "suff"
-#: builtin/log.c:1642
+#: builtin/log.c:1749
msgid "use <sfx> instead of '.patch'"
msgstr "usa <suff> anziché '.patch'"
-#: builtin/log.c:1644
+#: 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:1646
+#: 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:1648
+#: builtin/log.c:1755
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "Usa [RFC PATCH] anziché [PATCH]"
-#: builtin/log.c:1651
+#: builtin/log.c:1758
msgid "cover-from-description-mode"
msgstr "modo-lettera-da-descrizione"
-#: builtin/log.c:1652
+#: 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:1654
+#: builtin/log.c:1761
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Usa [<prefisso>] anziché [PATCH]"
-#: builtin/log.c:1657
+#: builtin/log.c:1764
msgid "store resulting files in <dir>"
msgstr "salva i file risultanti in <dir>"
-#: builtin/log.c:1660
+#: builtin/log.c:1767
msgid "don't strip/add [PATCH]"
msgstr "non eliminare/aggiungere [PATCH]"
-#: builtin/log.c:1663
+#: builtin/log.c:1770
msgid "don't output binary diffs"
msgstr "non mandare in output diff binari"
-#: builtin/log.c:1665
+#: 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:1667
+#: 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:1669
+#: 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:1671
+#: builtin/log.c:1778
msgid "Messaging"
msgstr "Messaggistica"
-#: builtin/log.c:1672
+#: builtin/log.c:1779
msgid "header"
msgstr "intestazione"
-#: builtin/log.c:1673
+#: builtin/log.c:1780
msgid "add email header"
msgstr "aggiungi intestazione e-mail"
-#: builtin/log.c:1674 builtin/log.c:1676
+#: builtin/log.c:1781 builtin/log.c:1782
msgid "email"
msgstr "e-mail"
-#: builtin/log.c:1674
+#: builtin/log.c:1781
msgid "add To: header"
msgstr "aggiungi intestazione A:"
-#: builtin/log.c:1676
+#: builtin/log.c:1782
msgid "add Cc: header"
msgstr "aggiungi intestazione Cc:"
-#: builtin/log.c:1678
+#: builtin/log.c:1783
msgid "ident"
msgstr "identità"
-#: builtin/log.c:1679
+#: 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:1681
+#: builtin/log.c:1786
msgid "message-id"
msgstr "ID messaggio"
-#: builtin/log.c:1682
+#: 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:1683 builtin/log.c:1686
+#: builtin/log.c:1788 builtin/log.c:1791
msgid "boundary"
msgstr "delimitatore"
-#: builtin/log.c:1684
+#: builtin/log.c:1789
msgid "attach the patch"
msgstr "allega la patch"
-#: builtin/log.c:1687
+#: builtin/log.c:1792
msgid "inline the patch"
msgstr "includi la patch nel messaggio"
-#: builtin/log.c:1691
+#: builtin/log.c:1796
msgid "enable message threading, styles: shallow, deep"
msgstr ""
"abilita il raggruppamento messaggi per conversazione, stili: superficiale, "
"profondo"
-#: builtin/log.c:1693
+#: builtin/log.c:1798
msgid "signature"
msgstr "firma"
-#: builtin/log.c:1694
+#: builtin/log.c:1799
msgid "add a signature"
msgstr "aggiungi una firma"
-#: builtin/log.c:1695
+#: builtin/log.c:1800
msgid "base-commit"
msgstr "commit di base"
-#: builtin/log.c:1696
+#: 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:1698
+#: builtin/log.c:1804
msgid "add a signature from a file"
msgstr "aggiungi una firma da file"
-#: builtin/log.c:1699
+#: builtin/log.c:1805
msgid "don't print the patch filenames"
msgstr "non stampare i nomi file delle patch"
-#: builtin/log.c:1701
+#: builtin/log.c:1807
msgid "show progress while generating patches"
msgstr "visualizza l'avanzamento dell'operazione di generazione patch"
-#: builtin/log.c:1703
+#: 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:1706
+#: 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:1708
+#: builtin/log.c:1814
msgid "percentage by which creation is weighted"
msgstr "percentuale in base a cui viene pesata la creazione"
-#: builtin/log.c:1792
+#: builtin/log.c:1896
#, c-format
msgid "invalid ident line: %s"
msgstr "riga ident non valida: %s"
-#: builtin/log.c:1807
+#: builtin/log.c:1911
msgid "-n and -k are mutually exclusive"
msgstr "le opzioni -n e -k sono mutuamente esclusive"
-#: builtin/log.c:1809
+#: 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:1817
+#: builtin/log.c:1921
msgid "--name-only does not make sense"
msgstr "--name-only non ha senso"
-#: builtin/log.c:1819
+#: builtin/log.c:1923
msgid "--name-status does not make sense"
msgstr "--name-status non ha senso"
-#: builtin/log.c:1821
+#: builtin/log.c:1925
msgid "--check does not make sense"
msgstr "--check non ha senso"
-#: builtin/log.c:1854
+#: builtin/log.c:1958
msgid "standard output, or directory, which one?"
msgstr "standard output, o directory, quale dei due?"
-#: builtin/log.c:1958
+#: builtin/log.c:2062
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff richiede --cover-letter o una singola patch"
-#: builtin/log.c:1962
+#: builtin/log.c:2066
msgid "Interdiff:"
msgstr "Interdiff:"
-#: builtin/log.c:1963
+#: builtin/log.c:2067
#, c-format
msgid "Interdiff against v%d:"
msgstr "Interdiff rispetto alla versione %d:"
-#: builtin/log.c:1969
+#: builtin/log.c:2073
msgid "--creation-factor requires --range-diff"
msgstr "--creation-factor richiede --range-diff"
-#: builtin/log.c:1973
+#: 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:1981
+#: builtin/log.c:2085
msgid "Range-diff:"
msgstr "Range-diff:"
-#: builtin/log.c:1982
+#: builtin/log.c:2086
#, c-format
msgid "Range-diff against v%d:"
msgstr "Range-diff rispetto alla versione %d:"
-#: builtin/log.c:1993
+#: builtin/log.c:2097
#, c-format
msgid "unable to read signature file '%s'"
msgstr "impossibile leggere il file firma '%s'"
-#: builtin/log.c:2029
+#: builtin/log.c:2133
msgid "Generating patches"
msgstr "Generazione delle patch in corso"
-#: builtin/log.c:2073
+#: builtin/log.c:2177
msgid "failed to create output files"
msgstr "creazione dei file di output non riuscita"
-#: builtin/log.c:2132
+#: builtin/log.c:2236
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<upstream> [<head> [<limite>]]]"
-#: builtin/log.c:2186
+#: builtin/log.c:2290
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -16040,113 +16811,113 @@
"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"
@@ -16164,7 +16935,7 @@
msgid "do not print remote URL"
msgstr "non stampare l'URL del remoto"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1392
msgid "exec"
msgstr "eseguibile"
@@ -16240,394 +17011,6 @@
msgid "empty mbox: '%s'"
msgstr "mbox vuota: '%s'"
-#: builtin/merge.c:55
-msgid "git merge [<options>] [<commit>...]"
-msgstr "git merge [<opzioni>] [<commit>...]"
-
-#: builtin/merge.c:56
-msgid "git merge --abort"
-msgstr "git merge --abort"
-
-#: builtin/merge.c:57
-msgid "git merge --continue"
-msgstr "git merge --continue"
-
-#: builtin/merge.c:119
-msgid "switch `m' requires a value"
-msgstr "lo switch 'm' richiede un valore"
-
-#: builtin/merge.c:142
-#, c-format
-msgid "option `%s' requires a value"
-msgstr "l'opzione `%s' richiede un valore"
-
-#: builtin/merge.c:188
-#, c-format
-msgid "Could not find merge strategy '%s'.\n"
-msgstr "Non è stato possibile trovare la strategia di merge '%s'.\n"
-
-#: builtin/merge.c:189
-#, c-format
-msgid "Available strategies are:"
-msgstr "Le strategie disponibili sono:"
-
-#: builtin/merge.c:194
-#, c-format
-msgid "Available custom strategies are:"
-msgstr "Le strategie personalizzate disponibili sono:"
-
-#: builtin/merge.c:245 builtin/pull.c:132
-msgid "do not show a diffstat at the end of the merge"
-msgstr "non visualizzare un diffstat al termine del merge"
-
-#: builtin/merge.c:248 builtin/pull.c:135
-msgid "show a diffstat at the end of the merge"
-msgstr "visualizza un diffstat al termine del merge"
-
-#: builtin/merge.c:249 builtin/pull.c:138
-msgid "(synonym to --stat)"
-msgstr "(sinonimo di --stat)"
-
-#: builtin/merge.c:251 builtin/pull.c:141
-msgid "add (at most <n>) entries from shortlog to merge commit message"
-msgstr ""
-"aggiungi (al più <n>) voci dal registro breve al messaggio di commit del "
-"merge"
-
-#: builtin/merge.c:254 builtin/pull.c:147
-msgid "create a single commit instead of doing a merge"
-msgstr "crea un singolo commit anziché eseguire un merge"
-
-#: builtin/merge.c:256 builtin/pull.c:150
-msgid "perform a commit if the merge succeeds (default)"
-msgstr "esegui un commit se il merge ha successo (impostazione predefinita)"
-
-#: builtin/merge.c:258 builtin/pull.c:153
-msgid "edit message before committing"
-msgstr "modifica il messaggio prima di eseguire il commit"
-
-#: builtin/merge.c:260
-msgid "allow fast-forward (default)"
-msgstr "consenti fast forward (impostazione predefinita)"
-
-#: builtin/merge.c:262 builtin/pull.c:160
-msgid "abort if fast-forward is not possible"
-msgstr "interrompi se il fast forward non è possibile"
-
-#: builtin/merge.c:266 builtin/pull.c:163
-msgid "verify that the named commit has a valid GPG signature"
-msgstr "verifica che il commit specificato abbia una firma GPG valida"
-
-#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167
-#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114
-msgid "strategy"
-msgstr "strategia"
-
-#: builtin/merge.c:268 builtin/pull.c:168
-msgid "merge strategy to use"
-msgstr "strategia di merge da usare"
-
-#: builtin/merge.c:269 builtin/pull.c:171
-msgid "option=value"
-msgstr "opzione=valore"
-
-#: builtin/merge.c:270 builtin/pull.c:172
-msgid "option for selected merge strategy"
-msgstr "opzione per la strategia di merge selezionata"
-
-#: builtin/merge.c:272
-msgid "merge commit message (for a non-fast-forward merge)"
-msgstr "messaggio di commit del merge (per un merge non fast forward)"
-
-#: builtin/merge.c:279
-msgid "abort the current in-progress merge"
-msgstr "interrompi il merge attualmente in corso"
-
-#: builtin/merge.c:281
-msgid "--abort but leave index and working tree alone"
-msgstr "esegui --abort ma mantieni immutati l'indice e l'albero di lavoro"
-
-#: builtin/merge.c:283
-msgid "continue the current in-progress merge"
-msgstr "continua il merge attualmente in corso"
-
-#: builtin/merge.c:285 builtin/pull.c:179
-msgid "allow merging unrelated histories"
-msgstr "consenti di unire cronologie non correlate"
-
-#: builtin/merge.c:291
-msgid "bypass pre-merge-commit and commit-msg hooks"
-msgstr "ignora gli hook pre-merge-commit e commit-msg"
-
-#: builtin/merge.c:308
-msgid "could not run stash."
-msgstr "non è stato possibile eseguire stash."
-
-#: builtin/merge.c:313
-msgid "stash failed"
-msgstr "esecuzione di stash non riuscita"
-
-#: builtin/merge.c:318
-#, c-format
-msgid "not a valid object: %s"
-msgstr "non è un oggetto valido: %s"
-
-#: builtin/merge.c:340 builtin/merge.c:357
-msgid "read-tree failed"
-msgstr "read-tree non riuscito"
-
-#: builtin/merge.c:387
-msgid " (nothing to squash)"
-msgstr " (nulla di cui eseguire lo squash)"
-
-#: builtin/merge.c:398
-#, c-format
-msgid "Squash commit -- not updating HEAD\n"
-msgstr "Commit di squash -- non aggiorno HEAD\n"
-
-#: builtin/merge.c:448
-#, c-format
-msgid "No merge message -- not updating HEAD\n"
-msgstr "Nessun messaggio di merge -- HEAD non viene aggiornato\n"
-
-#: builtin/merge.c:499
-#, c-format
-msgid "'%s' does not point to a commit"
-msgstr "'%s' non punta ad un commit"
-
-#: builtin/merge.c:586
-#, c-format
-msgid "Bad branch.%s.mergeoptions string: %s"
-msgstr "Stringa branch.%s.mergeoptions errata: %s"
-
-#: builtin/merge.c:708
-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
-#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Opzione sconosciuta per merge-recursive: -X%s"
-
-#: builtin/merge.c:737
-#, c-format
-msgid "unable to write %s"
-msgstr "impossibile scrivere %s"
-
-#: builtin/merge.c:789
-#, c-format
-msgid "Could not read from '%s'"
-msgstr "Non è stato possibile leggere da '%s'"
-
-#: builtin/merge.c:798
-#, 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
-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 ""
-"Inserisci un messaggio di commit per spiegare perché è necessario\n"
-"questo merge, in particolare se si esegue il merge di un upstream\n"
-"aggiornato in un topic branch.\n"
-"\n"
-
-#: builtin/merge.c:809
-msgid "An empty message aborts the commit.\n"
-msgstr "Un messaggio vuoto interromperà il commit.\n"
-
-#: builtin/merge.c:812
-#, c-format
-msgid ""
-"Lines starting with '%c' will be ignored, and an empty message aborts\n"
-"the commit.\n"
-msgstr ""
-"Le righe che iniziano con '%c' saranno ignorate e un messaggio vuoto\n"
-"interromperà il commit.\n"
-
-#: builtin/merge.c:865
-msgid "Empty commit message."
-msgstr "Messaggio di commit vuoto."
-
-#: builtin/merge.c:880
-#, c-format
-msgid "Wonderful.\n"
-msgstr "Splendido.\n"
-
-#: builtin/merge.c:941
-#, c-format
-msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
-msgstr ""
-"Merge automatico fallito; risolvi i conflitti ed esegui il commit\n"
-"del risultato.\n"
-
-#: builtin/merge.c:980
-msgid "No current branch."
-msgstr "Nessun branch corrente."
-
-#: builtin/merge.c:982
-msgid "No remote for the current branch."
-msgstr "Nessun remote per il branch corrente."
-
-#: builtin/merge.c:984
-msgid "No default upstream defined for the current branch."
-msgstr "Nessun upstream di default definito per il branch corrente."
-
-#: builtin/merge.c:989
-#, c-format
-msgid "No remote-tracking branch for %s from %s"
-msgstr "Nessun branch che tracci un remoto per %s da %s"
-
-#: builtin/merge.c:1046
-#, c-format
-msgid "Bad value '%s' in environment '%s'"
-msgstr "Valore errato '%s' nell'ambiente '%s'"
-
-#: builtin/merge.c:1149
-#, c-format
-msgid "not something we can merge in %s: %s"
-msgstr "non è qualcosa di cui possiamo eseguire il merge in %s: %s"
-
-#: builtin/merge.c:1183
-msgid "not something we can merge"
-msgstr "non è qualcosa di cui possiamo eseguire il merge"
-
-#: builtin/merge.c:1286
-msgid "--abort expects no arguments"
-msgstr "--abort non richiede argomenti"
-
-#: builtin/merge.c:1290
-msgid "There is no merge to abort (MERGE_HEAD missing)."
-msgstr "Non c'è nessun merge da interrompere (MERGE_HEAD mancante)."
-
-#: builtin/merge.c:1299
-msgid "--quit expects no arguments"
-msgstr "--quit non richiede argomenti"
-
-#: builtin/merge.c:1312
-msgid "--continue expects no arguments"
-msgstr "--continue non richiede argomenti"
-
-#: builtin/merge.c:1316
-msgid "There is no merge in progress (MERGE_HEAD missing)."
-msgstr "Non c'è nessun merge in corso (MERGE_HEAD mancante)."
-
-#: builtin/merge.c:1332
-msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you merge."
-msgstr ""
-"Non hai concluso il merge (MERGE_HEAD esiste).\n"
-"Esegui il commit delle modifiche prima di eseguire il merge."
-
-#: builtin/merge.c:1339
-msgid ""
-"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
-"Please, commit your changes before you merge."
-msgstr ""
-"Non hai concluso il cherry-pick (CHERRY_PICK_HEAD esiste).\n"
-"Esegui il commit delle modifiche prima di eseguire il merge."
-
-#: builtin/merge.c:1342
-msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
-msgstr "Il cherry-pick non è stato concluso (CHERRY_PICK_HEAD esiste)."
-
-#: builtin/merge.c:1356
-msgid "You cannot combine --squash with --no-ff."
-msgstr "Non è possibile combinare --squash con --no-ff."
-
-#: builtin/merge.c:1358
-msgid "You cannot combine --squash with --commit."
-msgstr "Non è possibile combinare --squash con --commit."
-
-#: builtin/merge.c:1374
-msgid "No commit specified and merge.defaultToUpstream not set."
-msgstr "Nessun commit specificato e merge.defaultToUpstream non impostato."
-
-#: builtin/merge.c:1391
-msgid "Squash commit into empty head not supported yet"
-msgstr "Lo squash di un commit in un'head vuota non è ancora supportato"
-
-#: builtin/merge.c:1393
-msgid "Non-fast-forward commit does not make sense into an empty head"
-msgstr "Un commit non fast forward non ha senso in un'head vuota"
-
-#: builtin/merge.c:1398
-#, c-format
-msgid "%s - not something we can merge"
-msgstr "%s - non è qualcosa per cui possiamo eseguire il merge"
-
-#: builtin/merge.c:1400
-msgid "Can merge only exactly one commit into empty head"
-msgstr "Si può eseguire solo il merge di uno e un solo commit in un'head vuota"
-
-#: builtin/merge.c:1481
-msgid "refusing to merge unrelated histories"
-msgstr "mi rifiuto di eseguire il merge di cronologie non correlate"
-
-#: builtin/merge.c:1490
-msgid "Already up to date."
-msgstr "Già aggiornato."
-
-#: builtin/merge.c:1500
-#, c-format
-msgid "Updating %s..%s\n"
-msgstr "Aggiornamento di %s..%s\n"
-
-#: builtin/merge.c:1542
-#, c-format
-msgid "Trying really trivial in-index merge...\n"
-msgstr "Provo con un merge veramente banale dentro l'indice...\n"
-
-#: builtin/merge.c:1549
-#, c-format
-msgid "Nope.\n"
-msgstr "No.\n"
-
-#: builtin/merge.c:1574
-msgid "Already up to date. Yeeah!"
-msgstr "Già aggiornato. Oh sì!"
-
-#: builtin/merge.c:1580
-msgid "Not possible to fast-forward, aborting."
-msgstr "Fast forward non possibile, interrompo l'operazione."
-
-#: builtin/merge.c:1603 builtin/merge.c:1668
-#, c-format
-msgid "Rewinding the tree to pristine...\n"
-msgstr "Ripristino l'albero in uno stato pulito...\n"
-
-#: builtin/merge.c:1607
-#, c-format
-msgid "Trying merge strategy %s...\n"
-msgstr "Tentativo con la strategia di merge %s...\n"
-
-#: builtin/merge.c:1659
-#, c-format
-msgid "No merge strategy handled the merge.\n"
-msgstr "Nessuna strategia di merge ha gestito il merge.\n"
-
-#: builtin/merge.c:1661
-#, c-format
-msgid "Merge with strategy %s failed.\n"
-msgstr "Merge con la strategia %s fallito.\n"
-
-#: builtin/merge.c:1670
-#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
-msgstr "Uso %s per preparare una risoluzione manuale.\n"
-
-#: builtin/merge.c:1682
-#, 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>..."
@@ -16648,23 +17031,23 @@
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <riferimento> [<commit>]"
-#: builtin/merge-base.c:153
+#: builtin/merge-base.c:143
msgid "output all common ancestors"
msgstr "manda in output tutti gli antenati comuni"
-#: builtin/merge-base.c:155
+#: 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:157
+#: builtin/merge-base.c:147
msgid "list revs not reachable from others"
msgstr "elenca le revisioni non raggiungibili dalle altre"
-#: builtin/merge-base.c:159
+#: 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:161
+#: 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 "
@@ -16741,6 +17124,394 @@
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: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 "lo switch 'm' richiede un valore"
+
+#: builtin/merge.c:143
+#, c-format
+msgid "option `%s' requires a value"
+msgstr "l'opzione `%s' richiede un valore"
+
+#: 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:190
+#, c-format
+msgid "Available strategies are:"
+msgstr "Le strategie disponibili sono:"
+
+#: builtin/merge.c:195
+#, c-format
+msgid "Available custom strategies are:"
+msgstr "Le strategie personalizzate disponibili sono:"
+
+#: 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: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:250 builtin/pull.c:139
+msgid "(synonym to --stat)"
+msgstr "(sinonimo di --stat)"
+
+#: 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: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: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:259 builtin/pull.c:154
+msgid "edit message before committing"
+msgstr "modifica il messaggio prima di eseguire il commit"
+
+#: builtin/merge.c:261
+msgid "allow fast-forward (default)"
+msgstr "consenti fast forward (impostazione predefinita)"
+
+#: 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: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: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:269 builtin/pull.c:169
+msgid "merge strategy to use"
+msgstr "strategia di merge da usare"
+
+#: builtin/merge.c:270 builtin/pull.c:172
+msgid "option=value"
+msgstr "opzione=valore"
+
+#: 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: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:280
+msgid "abort the current in-progress merge"
+msgstr "interrompi il merge attualmente in corso"
+
+#: 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:284
+msgid "continue the current in-progress merge"
+msgstr "continua il merge attualmente in corso"
+
+#: builtin/merge.c:286 builtin/pull.c:180
+msgid "allow merging unrelated histories"
+msgstr "consenti di unire cronologie non correlate"
+
+#: 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:310
+msgid "could not run stash."
+msgstr "non è stato possibile eseguire stash."
+
+#: builtin/merge.c:315
+msgid "stash failed"
+msgstr "esecuzione di stash non riuscita"
+
+#: builtin/merge.c:320
+#, c-format
+msgid "not a valid object: %s"
+msgstr "non è un oggetto valido: %s"
+
+#: builtin/merge.c:342 builtin/merge.c:359
+msgid "read-tree failed"
+msgstr "read-tree non riuscito"
+
+#: builtin/merge.c:389
+msgid " (nothing to squash)"
+msgstr " (nulla di cui eseguire lo squash)"
+
+#: builtin/merge.c:400
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr "Commit di squash -- non aggiorno HEAD\n"
+
+#: 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:501
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr "'%s' non punta ad un commit"
+
+#: builtin/merge.c:588
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr "Stringa branch.%s.mergeoptions errata: %s"
+
+#: 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:726
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr "Opzione sconosciuta per merge-recursive: -X%s"
+
+#: builtin/merge.c:741
+#, c-format
+msgid "unable to write %s"
+msgstr "impossibile scrivere %s"
+
+#: builtin/merge.c:793
+#, c-format
+msgid "Could not read from '%s'"
+msgstr "Non è stato possibile leggere da '%s'"
+
+#: 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: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 ""
+"Inserisci un messaggio di commit per spiegare perché è necessario\n"
+"questo merge, in particolare se si esegue il merge di un upstream\n"
+"aggiornato in un topic branch.\n"
+"\n"
+
+#: builtin/merge.c:813
+msgid "An empty message aborts the commit.\n"
+msgstr "Un messaggio vuoto interromperà il commit.\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 ""
+"Le righe che iniziano con '%c' saranno ignorate e un messaggio vuoto\n"
+"interromperà il commit.\n"
+
+#: builtin/merge.c:869
+msgid "Empty commit message."
+msgstr "Messaggio di commit vuoto."
+
+#: builtin/merge.c:884
+#, c-format
+msgid "Wonderful.\n"
+msgstr "Splendido.\n"
+
+#: 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:984
+msgid "No current branch."
+msgstr "Nessun branch corrente."
+
+#: builtin/merge.c:986
+msgid "No remote for the current branch."
+msgstr "Nessun remote per il branch corrente."
+
+#: 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: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:1050
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "Valore errato '%s' nell'ambiente '%s'"
+
+#: 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:1187
+msgid "not something we can merge"
+msgstr "non è qualcosa di cui possiamo eseguire il merge"
+
+#: builtin/merge.c:1291
+msgid "--abort expects no arguments"
+msgstr "--abort non richiede argomenti"
+
+#: 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:1313
+msgid "--quit expects no arguments"
+msgstr "--quit non richiede argomenti"
+
+#: builtin/merge.c:1326
+msgid "--continue expects no arguments"
+msgstr "--continue non richiede argomenti"
+
+#: 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:1346
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+"Non hai concluso il merge (MERGE_HEAD esiste).\n"
+"Esegui il commit delle modifiche prima di eseguire il merge."
+
+#: 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 ""
+"Non hai concluso il cherry-pick (CHERRY_PICK_HEAD esiste).\n"
+"Esegui il commit delle modifiche prima di eseguire il merge."
+
+#: 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:1370
+msgid "You cannot combine --squash with --no-ff."
+msgstr "Non è possibile combinare --squash con --no-ff."
+
+#: builtin/merge.c:1372
+msgid "You cannot combine --squash with --commit."
+msgstr "Non è possibile combinare --squash con --commit."
+
+#: 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: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: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:1412
+#, c-format
+msgid "%s - not something we can merge"
+msgstr "%s - non è qualcosa per cui possiamo eseguire il merge"
+
+#: 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:1495
+msgid "refusing to merge unrelated histories"
+msgstr "mi rifiuto di eseguire il merge di cronologie non correlate"
+
+#: builtin/merge.c:1504
+msgid "Already up to date."
+msgstr "Già aggiornato."
+
+#: builtin/merge.c:1514
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr "Aggiornamento di %s..%s\n"
+
+#: 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:1567
+#, c-format
+msgid "Nope.\n"
+msgstr "No.\n"
+
+#: builtin/merge.c:1592
+msgid "Already up to date. Yeeah!"
+msgstr "Già aggiornato. Oh sì!"
+
+#: builtin/merge.c:1598
+msgid "Not possible to fast-forward, aborting."
+msgstr "Fast forward non possibile, interrompo l'operazione."
+
+#: 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:1630
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr "Tentativo con la strategia di merge %s...\n"
+
+#: 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:1684
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr "Merge con la strategia %s fallito.\n"
+
+#: 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: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/mktree.c:66
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
@@ -16778,7 +17549,7 @@
"durante il repack, raccogli i file pack di dimensioni più piccole in un "
"gruppo più grande di queste dimensioni"
-#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67
+#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:25
msgid "too many arguments"
msgstr "troppi argomenti"
@@ -16819,68 +17590,72 @@
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:781 builtin/repack.c:518
+#: builtin/mv.c:280 builtin/remote.c:782 builtin/repack.c:518
#, c-format
msgid "renaming '%s' failed"
msgstr "rinomina di '%s' non riuscita"
@@ -16898,8 +17673,8 @@
msgstr "git name-rev [<opzioni>] --stdin"
#: builtin/name-rev.c:524
-msgid "print only names (no SHA-1)"
-msgstr "stampa solo i nomi (non lo SHA-1)"
+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:525
msgid "only use tags to name the commits"
@@ -17073,7 +17848,7 @@
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'"
@@ -17311,7 +18086,7 @@
"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."
@@ -17329,7 +18104,7 @@
msgid "read object names from the standard input"
msgstr "leggi i nomi degli oggetti dallo standard input"
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220
msgid "do not remove, show only"
msgstr "non rimuovere, limitati a visualizzare"
@@ -17345,125 +18120,142 @@
msgid "use notes from <notes-ref>"
msgstr "usa le note in <riferimento note>"
-#: builtin/notes.c:1034 builtin/stash.c:1643
+#: builtin/notes.c:1034 builtin/stash.c: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:430
+#: 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:441
+#: builtin/pack-objects.c:454
#, c-format
msgid "corrupt packed object for %s"
msgstr "oggetto sottoposto a pack %s corrotto"
-#: builtin/pack-objects.c:572
+#: 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:783
+#: builtin/pack-objects.c:796
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "%u oggetti ordinati, attesi %<PRIu32>"
-#: builtin/pack-objects.c:972
+#: 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:985
+#: builtin/pack-objects.c:1017
msgid "Writing objects"
msgstr "Scrittura degli oggetti in corso"
-#: builtin/pack-objects.c:1046 builtin/update-index.c:90
+#: 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:1099
+#: 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:1297
+#: 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:1724
+#: 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:1733
+#: 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:2004
+#: builtin/pack-objects.c:2086
msgid "Counting objects"
msgstr "Conteggio degli oggetti in corso"
-#: builtin/pack-objects.c:2149
+#: 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:2219 builtin/pack-objects.c:2235
-#: builtin/pack-objects.c:2245
+#: 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:2222 builtin/pack-objects.c:2249
+#: 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:2259
+#: builtin/pack-objects.c:2341
msgid "suboptimal pack - out of memory"
msgstr "pack subottimo - memoria esaurita"
-#: builtin/pack-objects.c:2574
+#: 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:2713
+#: 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:2801
+#: builtin/pack-objects.c:2883
msgid "Compressing objects"
msgstr "Compressione oggetti in corso"
-#: builtin/pack-objects.c:2807
+#: builtin/pack-objects.c:2889
msgid "inconsistency with delta count"
msgstr "inconsistenza con il numero dei delta"
-#: builtin/pack-objects.c:2888
+#: 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"
@@ -17472,7 +18264,7 @@
"atteso ID oggetto arco, ricevuti dati errati:\n"
" %s"
-#: builtin/pack-objects.c:2894
+#: builtin/pack-objects.c:2999
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -17481,234 +18273,244 @@
"atteso ID oggetto, ricevuti dati errati:\n"
" %s"
-#: builtin/pack-objects.c:2992
+#: builtin/pack-objects.c:3097
msgid "invalid value for --missing"
msgstr "valore non valido per --missing"
-#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159
+#: builtin/pack-objects.c:3156 builtin/pack-objects.c:3264
msgid "cannot open pack index"
msgstr "impossibile aprire l'indice pack"
-#: builtin/pack-objects.c:3082
+#: 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:3167
+#: builtin/pack-objects.c:3272
msgid "unable to force loose object"
msgstr "impossibile forzare l'oggetto sciolto"
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3365
#, c-format
msgid "not a rev '%s'"
msgstr "'%s' non è una revisione"
-#: builtin/pack-objects.c:3263
+#: builtin/pack-objects.c:3368
#, c-format
msgid "bad revision '%s'"
msgstr "revisione '%s' errata"
-#: builtin/pack-objects.c:3288
+#: builtin/pack-objects.c:3393
msgid "unable to add recent objects"
msgstr "impossibile aggiungere gli oggetti recenti"
-#: builtin/pack-objects.c:3341
+#: builtin/pack-objects.c:3446
#, c-format
msgid "unsupported index version %s"
msgstr "versione %s di index non supportata"
-#: builtin/pack-objects.c:3345
+#: builtin/pack-objects.c:3450
#, c-format
msgid "bad index version '%s'"
msgstr "versione '%s' di index errata"
-#: builtin/pack-objects.c:3383
+#: builtin/pack-objects.c:3488
msgid "<version>[,<offset>]"
msgstr "<versione>[,<offset>]"
-#: builtin/pack-objects.c:3384
+#: 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:3387
+#: 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:3389
+#: 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:3391
+#: builtin/pack-objects.c:3496
msgid "ignore packed objects"
msgstr "ignora gli oggetti sottoposti a pack"
-#: builtin/pack-objects.c:3393
+#: 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:3395
+#: 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:3397
+#: 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:3399
+#: builtin/pack-objects.c:3504
msgid "reuse existing deltas"
msgstr "riusa i delta esistenti"
-#: builtin/pack-objects.c:3401
+#: builtin/pack-objects.c:3506
msgid "reuse existing objects"
msgstr "riusa gli oggetti esistenti"
-#: builtin/pack-objects.c:3403
+#: builtin/pack-objects.c:3508
msgid "use OFS_DELTA objects"
msgstr "usa oggetti OFS_DELTA"
-#: builtin/pack-objects.c:3405
+#: 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:3407
+#: builtin/pack-objects.c:3512
msgid "do not create an empty pack output"
msgstr "non creare un output pack vuoto"
-#: builtin/pack-objects.c:3409
+#: builtin/pack-objects.c:3514
msgid "read revision arguments from standard input"
msgstr "leggi gli argomenti revisione dallo standard input"
-#: builtin/pack-objects.c:3411
+#: 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:3414
+#: builtin/pack-objects.c:3519
msgid "include objects reachable from any reference"
msgstr "includi gli oggetti raggiungibili da qualunque riferimento"
-#: builtin/pack-objects.c:3417
+#: 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:3420
+#: builtin/pack-objects.c:3525
msgid "include objects referred to by the index"
msgstr "includi gli oggetti referenziati dall'indice"
-#: builtin/pack-objects.c:3423
+#: builtin/pack-objects.c:3528
msgid "output pack to stdout"
msgstr "invia il pack in output sullo standard output"
-#: builtin/pack-objects.c:3425
+#: 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:3427
+#: builtin/pack-objects.c:3532
msgid "keep unreachable objects"
msgstr "mantieni gli oggetti non raggiungibili"
-#: builtin/pack-objects.c:3429
+#: builtin/pack-objects.c:3534
msgid "pack loose unreachable objects"
msgstr "esegui il pack degli oggetti non raggiungibili sciolti"
-#: builtin/pack-objects.c:3431
+#: 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:3434
+#: builtin/pack-objects.c:3539
msgid "use the sparse reachability algorithm"
msgstr "usa l'algoritmo di raggiungibilità sparse"
-#: builtin/pack-objects.c:3436
+#: builtin/pack-objects.c:3541
msgid "create thin packs"
msgstr "crea pack thin"
-#: builtin/pack-objects.c:3438
+#: builtin/pack-objects.c:3543
msgid "create packs suitable for shallow fetches"
msgstr "crea pack adatti per fetch shallow"
-#: builtin/pack-objects.c:3440
+#: 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:3442
+#: builtin/pack-objects.c:3547
msgid "ignore this pack"
msgstr "ignora questo pack"
-#: builtin/pack-objects.c:3444
+#: builtin/pack-objects.c:3549
msgid "pack compression level"
msgstr "livello compressione pack"
-#: builtin/pack-objects.c:3446
+#: builtin/pack-objects.c:3551
msgid "do not hide commits by grafts"
msgstr "non nascondere i commit innestati"
-#: builtin/pack-objects.c:3448
+#: 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:3450
+#: 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:3454
+#: builtin/pack-objects.c:3559
msgid "write a bitmap index if possible"
msgstr "scrivi un indice bitmap se possibile"
-#: builtin/pack-objects.c:3458
+#: builtin/pack-objects.c:3563
msgid "handling for missing objects"
msgstr "azione da eseguire sugli oggetti mancanti"
-#: builtin/pack-objects.c:3461
+#: 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:3463
+#: builtin/pack-objects.c:3568
msgid "respect islands during delta compression"
msgstr "rispetta le isole durante la compressione delta"
-#: builtin/pack-objects.c:3492
+#: 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:3497
+#: 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:3551
+#: 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:3553
+#: 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:3558
+#: 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:3561
+#: 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:3567
+#: builtin/pack-objects.c:3675
msgid "cannot use --filter without --stdout"
msgstr "impossibile usare --filter senza --stdout"
-#: builtin/pack-objects.c:3627
+#: builtin/pack-objects.c:3735
msgid "Enumerating objects"
msgstr "Enumerazione degli oggetti in corso"
-#: builtin/pack-objects.c:3657
+#: builtin/pack-objects.c:3766
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -17729,31 +18531,27 @@
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'"
@@ -17767,44 +18565,75 @@
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<opzioni>] [<repository> [<specificatore riferimento>...]]"
-#: builtin/pull.c:122
+#: builtin/pull.c:123
msgid "control for recursive fetching of submodules"
msgstr "controlla il recupero ricorsivo dei sottomoduli"
-#: builtin/pull.c:126
+#: builtin/pull.c:127
msgid "Options related to merging"
msgstr "Opzioni relative al merge"
-#: builtin/pull.c:129
+#: 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:157 builtin/rebase.c:471 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:166
-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:182
+#: builtin/pull.c:183
msgid "Options related to fetching"
msgstr "Opzioni relative al fetch"
-#: builtin/pull.c:192
+#: builtin/pull.c:193
msgid "force overwrite of local branch"
msgstr "forza la sovrascrittura del branch locale"
-#: builtin/pull.c:200
+#: builtin/pull.c:201
msgid "number of submodules pulled in parallel"
msgstr "numero di sottomoduli recuperati in parallelo"
-#: builtin/pull.c:300
+#: builtin/pull.c:317
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Valore non valido per pull.ff: %s"
-#: builtin/pull.c:426
+#: 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."
@@ -17812,14 +18641,14 @@
"Non ci sono candidati in base ai quali eseguire il rebase fra i riferimenti "
"appena recuperati."
-#: builtin/pull.c:428
+#: 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:429
+#: builtin/pull.c:461
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -17827,7 +18656,7 @@
"In generale, questo significa che hai fornito uno specificatore\n"
"riferimento che non aveva corrispondenze nel remoto."
-#: builtin/pull.c:432
+#: builtin/pull.c:464
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -17839,44 +18668,44 @@
"configurato come predefinito per il branch corrente, devi\n"
"specificare un branch sulla riga di comando."
-#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73
+#: builtin/pull.c: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:439 builtin/pull.c:454 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:441 builtin/pull.c:456 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:442 builtin/pull.c:457
+#: 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:444 builtin/pull.c:450 builtin/pull.c:459
-#: builtin/rebase.c:1415 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:444 builtin/pull.c:459 builtin/pull.c:464
+#: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<branch>"
-#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75
+#: builtin/pull.c: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:461 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:466
+#: builtin/pull.c:498
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -17886,32 +18715,28 @@
"il merge con il riferimento '%s' del remoto, ma un tale\n"
"riferimento non è stato recuperato."
-#: builtin/pull.c:576
+#: builtin/pull.c:609
#, c-format
msgid "unable to access commit %s"
msgstr "impossibile accedere al commit %s"
-#: builtin/pull.c:857
+#: builtin/pull.c:894
msgid "ignoring --verify-signatures for rebase"
msgstr "ignoro --verify-signature per il rebase"
-#: builtin/pull.c:912
-msgid "--[no-]autostash option is only valid with --rebase."
-msgstr "l'opzione --[no-]autostash option è valida solo con --rebase."
-
-#: builtin/pull.c:920
+#: builtin/pull.c: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:924
+#: builtin/pull.c:958
msgid "pull with rebase"
msgstr "pull con rebase"
-#: builtin/pull.c:925
+#: builtin/pull.c:959
msgid "please commit or stash them."
msgstr "eseguine il commit o lo stash."
-#: builtin/pull.c:950
+#: builtin/pull.c:984
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -17923,7 +18748,7 @@
"Eseguo il fast forward dell'albero\n"
"di lavoro dal commit %s."
-#: builtin/pull.c:956
+#: builtin/pull.c:990
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -17942,15 +18767,15 @@
"$ git reset --hard\n"
"per eseguire il ripristino."
-#: builtin/pull.c:971
+#: 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:975
+#: builtin/pull.c:1009
msgid "Cannot rebase onto multiple branches."
msgstr "Impossibile eseguire il rebase su più branch."
-#: builtin/pull.c:982
+#: builtin/pull.c:1017
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"impossibile eseguire il rebase se ci sono delle modifiche registrate "
@@ -17960,15 +18785,15 @@
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<opzioni>] [<repository> [<specificatore riferimento>...]]"
-#: builtin/push.c:112
+#: builtin/push.c:111
msgid "tag shorthand without <tag>"
msgstr "esegui il tag della forma breve senza <tag>"
-#: builtin/push.c:122
+#: builtin/push.c:119
msgid "--delete only accepts plain target ref names"
msgstr "--delete accetta solo nomi dei ref di destinazione in chiaro"
-#: builtin/push.c:168
+#: builtin/push.c:164
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -17977,7 +18802,7 @@
"Per scegliere permanentemente una delle due opzioni, vedi push.default in "
"'git help config'."
-#: builtin/push.c:171
+#: builtin/push.c:167
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -18002,7 +18827,7 @@
" git push %s HEAD\n"
"%s"
-#: builtin/push.c:186
+#: builtin/push.c:182
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -18017,7 +18842,7 @@
"\n"
" git push %s HEAD:<nome del branch remoto>\n"
-#: builtin/push.c:200
+#: builtin/push.c:194
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -18031,13 +18856,13 @@
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:208
+#: 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:211
+#: builtin/push.c:205
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -18048,14 +18873,14 @@
"branch corrente '%s', senza dirmi di cosa devo eseguire il push\n"
"per aggiornare quale branch remoto."
-#: builtin/push.c:270
+#: 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:277
+#: 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"
@@ -18069,7 +18894,7 @@
"Vedi la 'Nota sui fast forward' in 'git push --help' per ulteriori\n"
"dettagli."
-#: builtin/push.c:283
+#: 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"
@@ -18084,7 +18909,7 @@
"Vedi la 'Nota sui fast forward' in 'git push --help' per ulteriori\n"
"dettagli."
-#: builtin/push.c:289
+#: 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"
@@ -18100,12 +18925,12 @@
"Vedi la 'Nota sui fast forward' in 'git push --help' per ulteriori\n"
"dettagli."
-#: builtin/push.c:296
+#: 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:299
+#: 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"
@@ -18116,100 +18941,100 @@
"puntare a un oggetto diverso da un commit senza usare l'opzione\n"
"'--force'.\n"
-#: builtin/push.c:360
+#: builtin/push.c:351
#, c-format
msgid "Pushing to %s\n"
msgstr "Push su %s in corso\n"
-#: builtin/push.c:367
+#: 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:542
+#: builtin/push.c:532
msgid "repository"
msgstr "repository"
-#: builtin/push.c:543 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:544 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:546
+#: builtin/push.c:536
msgid "delete refs"
msgstr "elimina riferimenti"
-#: builtin/push.c:547
+#: 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:550 builtin/send-pack.c:167
+#: builtin/push.c:540 builtin/send-pack.c:186
msgid "force updates"
msgstr "forza gli aggiornamenti"
-#: builtin/push.c:552 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:553 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:556
+#: builtin/push.c:545
msgid "control recursive pushing of submodules"
msgstr "controlla il push ricorsivo dei sottomoduli"
-#: builtin/push.c:558 builtin/send-pack.c:175
+#: builtin/push.c:546 builtin/send-pack.c:193
msgid "use thin pack"
msgstr "usa un thin pack"
-#: builtin/push.c:559 builtin/push.c:560 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:561
+#: builtin/push.c:549
msgid "set upstream for git pull/status"
msgstr "imposta l'upstream per git pull/status"
-#: builtin/push.c:564
+#: builtin/push.c:552
msgid "prune locally removed refs"
msgstr "elimina i riferimenti rimossi localmente"
-#: builtin/push.c:566
+#: builtin/push.c:554
msgid "bypass pre-push hook"
msgstr "ignora l'hook pre-push"
-#: builtin/push.c:567
+#: builtin/push.c:555
msgid "push missing but relevant tags"
msgstr "esegui il push dei tag mancanti ma rilevanti"
-#: builtin/push.c:570 builtin/send-pack.c:169
+#: builtin/push.c:557 builtin/send-pack.c:187
msgid "GPG sign the push"
msgstr "firma il push con GPG"
-#: builtin/push.c:572 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:590
+#: 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:592
+#: builtin/push.c:579
msgid "--delete doesn't make sense without any refs"
msgstr "--delete non ha senso senza alcun ref"
-#: builtin/push.c:612
+#: builtin/push.c:599
#, c-format
msgid "bad repository '%s'"
msgstr "repository '%s' errato"
-#: builtin/push.c:613
+#: builtin/push.c:600
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -18231,27 +19056,27 @@
"\n"
" git push <nome>\n"
-#: builtin/push.c:628
+#: builtin/push.c:615
msgid "--all and --tags are incompatible"
msgstr "--all e --tags non sono compatibili"
-#: builtin/push.c:630
+#: 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:634
+#: builtin/push.c:621
msgid "--mirror and --tags are incompatible"
msgstr "--mirror e --tags non sono compatibili"
-#: builtin/push.c:636
+#: 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:639
+#: builtin/push.c:626
msgid "--all and --mirror are incompatible"
msgstr "--all e --mirror non sono compatibili"
-#: builtin/push.c:643
+#: builtin/push.c:630
msgid "push options must not have new line characters"
msgstr "le opzioni push non devono avere caratteri di fine riga"
@@ -18384,7 +19209,7 @@
msgid "You need to resolve your current index first"
msgstr "Prima devi risolvere l'indice corrente"
-#: builtin/rebase.c:32
+#: builtin/rebase.c:35
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
"[<upstream> [<branch>]]"
@@ -18392,219 +19217,205 @@
"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:175 builtin/rebase.c:199 builtin/rebase.c:226
+#: 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:292
+#: builtin/rebase.c:304
#, c-format
msgid "could not create temporary %s"
msgstr "impossibile creare un %s temporaneo"
-#: builtin/rebase.c:298
+#: builtin/rebase.c:310
msgid "could not mark as interactive"
msgstr "impossibile contrassegnare come interattivo"
-#: builtin/rebase.c:352
+#: builtin/rebase.c:364
msgid "could not generate todo list"
msgstr "impossibile generare l'elenco todo"
-#: builtin/rebase.c:391
+#: 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:461
+#: builtin/rebase.c:474
msgid "git rebase--interactive [<options>]"
msgstr "git rebase --interactive [<opzioni>]"
-#: builtin/rebase.c:474 builtin/rebase.c:1550
-msgid "(DEPRECATED) keep empty commits"
-msgstr "(DEPRECATO) mantieni i commit vuoti"
+#: builtin/rebase.c:487 builtin/rebase.c:1382
+msgid "keep commits which start empty"
+msgstr "mantieni i commit che iniziano vuoti"
-#: builtin/rebase.c:478 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:480
+#: builtin/rebase.c:493
msgid "rebase merge commits"
msgstr "esegui il rebase dei commit di merge"
-#: builtin/rebase.c:482
+#: builtin/rebase.c:495
msgid "keep original branch points of cousins"
msgstr "mantieni i punti di branch originali dei cugini"
-#: builtin/rebase.c:484
+#: builtin/rebase.c:497
msgid "move commits that begin with squash!/fixup!"
msgstr "sposta i commit che iniziano con squash!/fixup!"
-#: builtin/rebase.c:485
+#: builtin/rebase.c:498
msgid "sign commits"
msgstr "firma i commit"
-#: builtin/rebase.c:487 builtin/rebase.c:1490
+#: 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:489
+#: builtin/rebase.c:502
msgid "continue rebase"
msgstr "continua il rebase"
-#: builtin/rebase.c:491
+#: builtin/rebase.c:504
msgid "skip commit"
msgstr "salta il commit"
-#: builtin/rebase.c:492
+#: builtin/rebase.c:505
msgid "edit the todo list"
msgstr "modifica l'elenco todo"
-#: builtin/rebase.c:494
+#: builtin/rebase.c:507
msgid "show the current patch"
msgstr "visualizza la patch corrente"
-#: builtin/rebase.c:497
+#: builtin/rebase.c:510
msgid "shorten commit ids in the todo list"
msgstr "abbrevia gli ID dei commit nell'elenco todo"
-#: builtin/rebase.c:499
+#: builtin/rebase.c:512
msgid "expand commit ids in the todo list"
msgstr "espandi gli ID dei commit nell'elenco todo"
-#: builtin/rebase.c:501
+#: builtin/rebase.c:514
msgid "check the todo list"
msgstr "controlla l'elenco todo"
-#: builtin/rebase.c:503
+#: builtin/rebase.c:516
msgid "rearrange fixup/squash lines"
msgstr "ridisponi le righe fixup/squash"
-#: builtin/rebase.c:505
+#: builtin/rebase.c:518
msgid "insert exec commands in todo list"
msgstr "inserisci i comandi exec nell'elenco todo"
-#: builtin/rebase.c:506
+#: builtin/rebase.c:519
msgid "onto"
msgstr "su"
-#: builtin/rebase.c:509
+#: builtin/rebase.c:522
msgid "restrict-revision"
msgstr "revisioni-limite"
-#: builtin/rebase.c:509
+#: builtin/rebase.c:522
msgid "restrict revision"
msgstr "limita la revisione"
-#: builtin/rebase.c:511
+#: builtin/rebase.c:524
msgid "squash-onto"
msgstr "squash-su"
-#: builtin/rebase.c:512
+#: builtin/rebase.c:525
msgid "squash onto"
msgstr "esegui lo squash su"
-#: builtin/rebase.c:514
+#: builtin/rebase.c:527
msgid "the upstream commit"
msgstr "il commit upstream"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:529
msgid "head-name"
msgstr "nome head"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:529
msgid "head name"
msgstr "nome head"
-#: builtin/rebase.c:521
+#: builtin/rebase.c:534
msgid "rebase strategy"
msgstr "strategia di rebase"
-#: builtin/rebase.c:522
+#: builtin/rebase.c:535
msgid "strategy-opts"
msgstr "opzioni strategia"
-#: builtin/rebase.c:523
+#: builtin/rebase.c:536
msgid "strategy options"
msgstr "opzioni strategia"
-#: builtin/rebase.c:524
+#: builtin/rebase.c:537
msgid "switch-to"
msgstr "passa a"
-#: builtin/rebase.c:525
+#: 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:526
+#: builtin/rebase.c:539
msgid "onto-name"
msgstr "nome"
-#: builtin/rebase.c:526
+#: builtin/rebase.c:539
msgid "onto name"
msgstr "sul nome"
-#: builtin/rebase.c:527
+#: builtin/rebase.c:540
msgid "cmd"
msgstr "comando"
-#: builtin/rebase.c:527
+#: builtin/rebase.c:540
msgid "the command to run"
msgstr "il comando da eseguire"
-#: builtin/rebase.c:530 builtin/rebase.c:1584
+#: 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:546
+#: 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:562
+#: 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:612
+#: builtin/rebase.c:618
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "impossibile ottenere 'onto': '%s'"
-#: builtin/rebase.c:627
+#: builtin/rebase.c:635
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "orig-head non valida: '%s'"
-#: builtin/rebase.c:652
+#: 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:728
-#, c-format
-msgid "Could not read '%s'"
-msgstr "Impossibile leggere '%s'"
-
-#: builtin/rebase.c:746
-#, c-format
-msgid "Cannot store %s"
-msgstr "Impossibile memorizzare %s"
-
-#: builtin/rebase.c:853
-msgid "could not determine HEAD revision"
-msgstr "impossibile determinare la revisione HEAD"
-
-#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c: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"
@@ -18620,7 +19431,7 @@
"Per interrompere l'operazione e tornare allo stato precedente\n"
"il \"git rebase\", esegui \"git rebase --abort\"."
-#: builtin/rebase.c:1058
+#: builtin/rebase.c:888
#, c-format
msgid ""
"\n"
@@ -18639,7 +19450,7 @@
"\n"
"Di conseguenza, Git non può eseguirne il rebase."
-#: builtin/rebase.c:1383
+#: builtin/rebase.c:1214
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -18648,7 +19459,7 @@
"tipo vuoto '%s' non riconosciuto; i valori validi sono \"drop\", \"keep\" e "
"\"ask\"."
-#: builtin/rebase.c:1401
+#: builtin/rebase.c:1232
#, c-format
msgid ""
"%s\n"
@@ -18665,7 +19476,7 @@
" git rebase '<branch>'\n"
"\n"
-#: builtin/rebase.c:1417
+#: builtin/rebase.c:1248
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -18679,139 +19490,153 @@
" git branch --set-upstream-to=%s/<branch> %s\n"
"\n"
-#: builtin/rebase.c:1447
+#: builtin/rebase.c:1278
msgid "exec commands cannot contain newlines"
msgstr "i comandi exec non possono contenere caratteri di fine riga"
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1282
msgid "empty exec command"
msgstr "comando exec vuoto"
-#: builtin/rebase.c:1481
+#: 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:1483
+#: 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:1485
+#: builtin/rebase.c:1316
msgid "allow pre-rebase hook to run"
msgstr "consenti l'esecuzione dell'hook pre-rebase"
-#: builtin/rebase.c:1487
+#: builtin/rebase.c:1318
msgid "be quiet. implies --no-stat"
msgstr "sii silenzioso. implica --no-stat"
-#: builtin/rebase.c:1493
+#: builtin/rebase.c:1324
msgid "do not show diffstat of what changed upstream"
msgstr "non visualizzare un diffstat delle modifiche upstream"
-#: builtin/rebase.c:1496
+#: 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:1498 builtin/rebase.c:1502 builtin/rebase.c:1504
-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:1506 builtin/rebase.c:1508
+#: 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:1336 builtin/rebase.c:1340
msgid "passed to 'git apply'"
msgstr "passato a 'git apply'"
-#: builtin/rebase.c:1510 builtin/rebase.c:1513
+#: 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:1515
+#: builtin/rebase.c:1347
msgid "continue"
msgstr "continua"
-#: builtin/rebase.c:1518
+#: builtin/rebase.c:1350
msgid "skip current patch and continue"
msgstr "salta la patch corrente e continua"
-#: builtin/rebase.c:1520
+#: builtin/rebase.c:1352
msgid "abort and check out the original branch"
msgstr "interrompi ed esegui il checkout del branch originario"
-#: builtin/rebase.c:1523
+#: builtin/rebase.c:1355
msgid "abort but keep HEAD where it is"
msgstr "interrompi ma mantieni l'HEAD dov'è"
-#: builtin/rebase.c:1524
+#: 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:1527
+#: 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:1530
+#: builtin/rebase.c:1362
msgid "use apply strategies to rebase"
msgstr "usa le strategie di apply per eseguire il rebase"
-#: builtin/rebase.c:1534
+#: builtin/rebase.c:1366
msgid "use merging strategies to rebase"
msgstr "usa le strategie di merge per eseguire il rebase"
-#: builtin/rebase.c:1538
+#: 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:1542
+#: 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:1547
+#: builtin/rebase.c:1379
msgid "how to handle commits that become empty"
msgstr "come gestire i commit che diventano vuoti"
-#: builtin/rebase.c:1554
+#: 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:1560
-msgid "automatically stash/stash pop before and after"
-msgstr "esegui stash/stash pop automaticamente prima e dopo"
-
-#: builtin/rebase.c:1562
+#: 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:1566
+#: builtin/rebase.c:1397
msgid "allow rebasing commits with empty messages"
msgstr "consenti il rebase di commit con messaggi vuoti"
-#: builtin/rebase.c:1570
+#: 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:1573
+#: 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:1575
+#: builtin/rebase.c:1406
msgid "use the given merge strategy"
msgstr "usa la strategia di merge specificata"
-#: builtin/rebase.c:1577 builtin/revert.c:115
+#: builtin/rebase.c:1408 builtin/revert.c:115
msgid "option"
msgstr "opzione"
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1409
msgid "pass the argument through to the merge strategy"
msgstr "passa l'argomento alla strategia di merge"
-#: builtin/rebase.c:1581
+#: 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:1598
+#: 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."
@@ -18819,37 +19644,41 @@
"il supporto per rebase.useBuiltin è stato rimosso!\n"
"Vedi la voce relativa in 'git help config' per i dettagli."
-#: builtin/rebase.c:1604
+#: builtin/rebase.c: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:1645
+#: 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:1650
+#: builtin/rebase.c:1486
msgid "cannot combine '--keep-base' with '--onto'"
msgstr "impossibile combinare '--keep-base' con '--onto'"
-#: builtin/rebase.c:1652
+#: builtin/rebase.c:1488
msgid "cannot combine '--keep-base' with '--root'"
msgstr "impossibile combinare '--keep-base' con '--root'"
-#: builtin/rebase.c:1656
+#: 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:1660
+#: 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:1683
+#: builtin/rebase.c:1522
msgid "Cannot read HEAD"
msgstr "Impossibile leggere l'HEAD"
-#: builtin/rebase.c:1695
+#: builtin/rebase.c:1534
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -18858,16 +19687,16 @@
"quindi contrassegnarli come risolti usando\n"
"git add"
-#: builtin/rebase.c:1714
+#: builtin/rebase.c:1553
msgid "could not discard worktree changes"
msgstr "impossibile scartare le modifiche all'albero di lavoro"
-#: builtin/rebase.c:1733
+#: builtin/rebase.c:1572
#, c-format
msgid "could not move back to %s"
msgstr "impossibile ritornare a %s"
-#: builtin/rebase.c:1778
+#: builtin/rebase.c:1618
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -18888,169 +19717,146 @@
"ed eseguimi di nuovo. Mi fermo nel caso in cui tu abbia ancora\n"
"salvato qualcosa di importante lì.\n"
-#: builtin/rebase.c:1806
+#: builtin/rebase.c:1646
msgid "switch `C' expects a numerical value"
msgstr "l'opzione `C` richiede un valore numerico"
-#: builtin/rebase.c:1847
+#: builtin/rebase.c:1688
#, c-format
msgid "Unknown mode: %s"
msgstr "Modo sconosciuto: %s"
-#: builtin/rebase.c:1869
+#: builtin/rebase.c:1727
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy richiede --merge o --interactive"
-#: builtin/rebase.c:1899
+#: 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:1912
+#: builtin/rebase.c:1770
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "Backend di rebase sconosciuto: %s"
-#: builtin/rebase.c:1937
+#: builtin/rebase.c:1795
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec richiede --exec o --interactive"
-#: builtin/rebase.c:1957
+#: builtin/rebase.c:1815
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr "impossibile combinare '--preserve-merges' con '--rebase-merges'"
-#: builtin/rebase.c:1961
+#: 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:1985
+#: builtin/rebase.c:1843
#, c-format
msgid "invalid upstream '%s'"
msgstr "upstream non valido: '%s'"
-#: builtin/rebase.c:1991
+#: builtin/rebase.c:1849
msgid "Could not create new root commit"
msgstr "Impossibile creare il nuovo commit radice"
-#: builtin/rebase.c:2017
+#: 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:2020
+#: 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:2028
+#: 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:2054
+#: builtin/rebase.c:1912
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "errore fatale: branch/commit '%s' inesistente"
-#: builtin/rebase.c:2062 builtin/submodule--helper.c:40
-#: builtin/submodule--helper.c:1990
+#: builtin/rebase.c: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:2073
+#: builtin/rebase.c:1931
msgid "Could not resolve HEAD to a revision"
msgstr "Impossibile risolvere HEAD come revisione"
-#: builtin/rebase.c:2111
-msgid "Cannot autostash"
-msgstr "Impossibile eseguire lo stash automatico"
-
-#: builtin/rebase.c:2114
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr "Risposta stash non attesa: '%s'"
-
-#: builtin/rebase.c:2120
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr "Impossibile creare la directory '%s'"
-
-#: builtin/rebase.c:2123
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr "Stash automatico creato: %s\n"
-
-#: builtin/rebase.c:2126
-msgid "could not reset --hard"
-msgstr "impossibile eseguire reset --hard"
-
-#: builtin/rebase.c:2135
+#: builtin/rebase.c:1952
msgid "Please commit or stash them."
msgstr "Eseguine il commit o lo stash."
-#: builtin/rebase.c:2169
+#: builtin/rebase.c:1988
#, c-format
msgid "could not switch to %s"
msgstr "impossibile passare a %s"
-#: builtin/rebase.c:2180
+#: builtin/rebase.c:1999
msgid "HEAD is up to date."
msgstr "HEAD è aggiornato."
-#: builtin/rebase.c:2182
+#: 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:2190
+#: builtin/rebase.c:2009
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD è aggiornato, forzo il rebase."
-#: builtin/rebase.c:2192
+#: 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:2200
+#: 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:2207
+#: builtin/rebase.c:2026
#, c-format
msgid "Changes to %s:\n"
msgstr "Modifiche a %s:\n"
-#: builtin/rebase.c:2210
+#: builtin/rebase.c:2029
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Modifiche da %s a %s:\n"
-#: builtin/rebase.c:2235
+#: 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:2244
+#: builtin/rebase.c:2063
msgid "Could not detach HEAD"
msgstr "Impossibile scollegare l'HEAD"
-#: builtin/rebase.c:2253
+#: 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:33
+#: builtin/receive-pack.c:34
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <directory Git>"
-#: builtin/receive-pack.c:821
+#: 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"
@@ -19083,7 +19889,7 @@
"il comportamento predefinito, imposta la variabile di\n"
"configurazione 'receive.denyCurrentBranch' a 'refuse'."
-#: builtin/receive-pack.c:841
+#: 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"
@@ -19106,11 +19912,11 @@
"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."
@@ -19309,12 +20115,12 @@
"specificare i branch da tracciare ha senso solo con i mirror da cui "
"recuperare dati"
-#: builtin/remote.c:195 builtin/remote.c:696
+#: builtin/remote.c:195 builtin/remote.c:697
#, c-format
msgid "remote %s already exists."
msgstr "il remoto %s esiste già."
-#: builtin/remote.c:199 builtin/remote.c:700
+#: 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"
@@ -19338,12 +20144,12 @@
msgid "(delete)"
msgstr "(elimina)"
-#: builtin/remote.c:653
+#: builtin/remote.c:654
#, c-format
msgid "could not set '%s'"
msgstr "impossibile impostare '%s'"
-#: builtin/remote.c:658
+#: builtin/remote.c:659
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
@@ -19354,19 +20160,19 @@
"\t%s:%d\n"
"ora dà il nome al remoto inesistente '%s'"
-#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940
+#: builtin/remote.c:690 builtin/remote.c:833 builtin/remote.c:941
#, c-format
msgid "No such remote: '%s'"
msgstr "Remoto non esistente: '%s'"
-#: builtin/remote.c:706
+#: 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:726
+#: builtin/remote.c:727
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -19377,17 +20183,17 @@
"\t%s\n"
"\tAggiorna la configurazione manualmente se necessario."
-#: builtin/remote.c:766
+#: builtin/remote.c:767
#, c-format
msgid "deleting '%s' failed"
msgstr "eliminazione di '%s' non riuscita"
-#: builtin/remote.c:800
+#: builtin/remote.c:801
#, c-format
msgid "creating '%s' failed"
msgstr "creazione di '%s' non riuscita"
-#: builtin/remote.c:876
+#: builtin/remote.c:877
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -19403,120 +20209,120 @@
"eliminati;\n"
"per eliminarli, usa:"
-#: builtin/remote.c:890
+#: builtin/remote.c:891
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Impossibile rimuovere la sezione di configurazione '%s'"
-#: builtin/remote.c:993
+#: 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:996
+#: builtin/remote.c:997
msgid " tracked"
msgstr " tracciato"
-#: builtin/remote.c:998
+#: builtin/remote.c:999
msgid " stale (use 'git remote prune' to remove)"
msgstr " vecchio (usa 'git remote prune' per rimuoverlo)"
-#: builtin/remote.c:1000
+#: builtin/remote.c:1001
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:1041
+#: 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:1050
+#: builtin/remote.c:1051
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "rebase interattivo sul remoto %s"
-#: builtin/remote.c:1052
+#: 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:1055
+#: builtin/remote.c:1056
#, c-format
msgid "rebases onto remote %s"
msgstr "rebase sul remoto %s"
-#: builtin/remote.c:1059
+#: builtin/remote.c:1060
#, c-format
msgid " merges with remote %s"
msgstr " merge con il remote %s"
-#: builtin/remote.c:1062
+#: builtin/remote.c:1063
#, c-format
msgid "merges with remote %s"
msgstr "merge con il remote %s"
-#: builtin/remote.c:1065
+#: builtin/remote.c:1066
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s e con il remoto %s\n"
-#: builtin/remote.c:1108
+#: builtin/remote.c:1109
msgid "create"
msgstr "crea"
-#: builtin/remote.c:1111
+#: builtin/remote.c:1112
msgid "delete"
msgstr "elimina"
-#: builtin/remote.c:1115
+#: builtin/remote.c:1116
msgid "up to date"
msgstr "aggiornato"
-#: builtin/remote.c:1118
+#: builtin/remote.c:1119
msgid "fast-forwardable"
msgstr "fast forward possibile"
-#: builtin/remote.c:1121
+#: builtin/remote.c:1122
msgid "local out of date"
msgstr "locale non aggiornato"
-#: builtin/remote.c:1128
+#: builtin/remote.c:1129
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s esegue un aggiornamento forzato su %-*s (%s)"
-#: builtin/remote.c:1131
+#: builtin/remote.c:1132
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s esegue il push su %-*s (%s)"
-#: builtin/remote.c:1135
+#: builtin/remote.c:1136
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s esegue un aggiornamento forzato su %s"
-#: builtin/remote.c:1138
+#: builtin/remote.c:1139
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s esegue il push su %s"
-#: builtin/remote.c:1206
+#: builtin/remote.c:1207
msgid "do not query remotes"
msgstr "non interrogare i remoti"
-#: builtin/remote.c:1233
+#: builtin/remote.c:1234
#, c-format
msgid "* remote %s"
msgstr "* remoto %s"
-#: builtin/remote.c:1234
+#: builtin/remote.c:1235
#, c-format
msgid " Fetch URL: %s"
msgstr " URL recupero: %s"
-#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390
+#: builtin/remote.c:1236 builtin/remote.c:1252 builtin/remote.c:1391
msgid "(no URL)"
msgstr "(nessun URL)"
@@ -19524,185 +20330,185 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1249 builtin/remote.c:1251
+#: builtin/remote.c:1250 builtin/remote.c:1252
#, c-format
msgid " Push URL: %s"
msgstr " URL push: %s"
-#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1254 builtin/remote.c:1256 builtin/remote.c:1258
#, c-format
msgid " HEAD branch: %s"
msgstr " branch HEAD: %s"
-#: builtin/remote.c:1253
+#: builtin/remote.c:1254
msgid "(not queried)"
msgstr "(non interrogato)"
-#: builtin/remote.c:1255
+#: builtin/remote.c:1256
msgid "(unknown)"
msgstr "(sconosciuto)"
-#: builtin/remote.c:1259
+#: 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:1271
+#: 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:1274 builtin/remote.c:1300
+#: builtin/remote.c:1275 builtin/remote.c:1301
msgid " (status not queried)"
msgstr " (stato non richiesto)"
-#: builtin/remote.c:1283
+#: 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:1291
+#: 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:1297
+#: 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:1318
+#: 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:1320
+#: builtin/remote.c:1321
msgid "delete refs/remotes/<name>/HEAD"
msgstr "elimina refs/remotes/<nome>/HEAD"
-#: builtin/remote.c:1335
+#: builtin/remote.c:1336
msgid "Cannot determine remote HEAD"
msgstr "Impossibile determinare l'HEAD remoto"
-#: builtin/remote.c:1337
+#: 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:1347
+#: builtin/remote.c:1348
#, c-format
msgid "Could not delete %s"
msgstr "Non è stato possibile eliminare %s"
-#: builtin/remote.c:1355
+#: builtin/remote.c:1356
#, c-format
msgid "Not a valid ref: %s"
msgstr "Non è un ref valido: %s"
-#: builtin/remote.c:1357
+#: builtin/remote.c:1358
#, c-format
msgid "Could not setup %s"
msgstr "Non è stato possibile configurare %s"
-#: builtin/remote.c:1375
+#: builtin/remote.c:1376
#, c-format
msgid " %s will become dangling!"
msgstr " %s diventerà pendente!"
-#: builtin/remote.c:1376
+#: builtin/remote.c:1377
#, c-format
msgid " %s has become dangling!"
msgstr " %s è diventato pendente!"
-#: builtin/remote.c:1386
+#: builtin/remote.c:1387
#, c-format
msgid "Pruning %s"
msgstr "Eliminazione di %s in corso"
-#: builtin/remote.c:1387
+#: builtin/remote.c:1388
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1403
+#: builtin/remote.c:1404
#, c-format
msgid " * [would prune] %s"
msgstr " * [sarebbe eliminato] %s"
-#: builtin/remote.c:1406
+#: builtin/remote.c:1407
#, c-format
msgid " * [pruned] %s"
msgstr " * [eliminato] %s"
-#: builtin/remote.c:1451
+#: builtin/remote.c:1452
msgid "prune remotes after fetching"
msgstr "elimina remoti dopo il fetch"
-#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636
+#: builtin/remote.c:1515 builtin/remote.c:1569 builtin/remote.c:1637
#, c-format
msgid "No such remote '%s'"
msgstr "Remote '%s' non esistente"
-#: builtin/remote.c:1530
+#: builtin/remote.c:1531
msgid "add branch"
msgstr "aggiungi branch"
-#: builtin/remote.c:1537
+#: builtin/remote.c:1538
msgid "no remote specified"
msgstr "nessun remote specificato"
-#: builtin/remote.c:1554
+#: 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:1556
+#: builtin/remote.c:1557
msgid "return all URLs"
msgstr "restituisci tutti gli URL"
-#: builtin/remote.c:1584
+#: builtin/remote.c:1585
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "nessun URL configurato per il remoto '%s'"
-#: builtin/remote.c:1610
+#: builtin/remote.c:1611
msgid "manipulate push URLs"
msgstr "manipola gli URL per il push"
-#: builtin/remote.c:1612
+#: builtin/remote.c:1613
msgid "add URL"
msgstr "aggiungi URL"
-#: builtin/remote.c:1614
+#: builtin/remote.c:1615
msgid "delete URLs"
msgstr "elimina URL"
-#: builtin/remote.c:1621
+#: builtin/remote.c:1622
msgid "--add --delete doesn't make sense"
msgstr "--add --delete non ha senso"
-#: builtin/remote.c:1660
+#: builtin/remote.c:1661
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Pattern URL vecchio non valido: %s"
-#: builtin/remote.c:1668
+#: builtin/remote.c:1669
#, c-format
msgid "No such URL found: %s"
msgstr "Nessuna URL trovata: %s"
-#: builtin/remote.c:1670
+#: builtin/remote.c:1671
msgid "Will not delete all non-push URLs"
msgstr "Non eliminerò tutti gli URL non push"
-#: builtin/repack.c:23
+#: builtin/repack.c:25
msgid "git repack [<options>]"
msgstr "git repack [<opzioni>]"
-#: builtin/repack.c:28
+#: builtin/repack.c:30
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -19711,114 +20517,114 @@
"Usa --no-write-bitmap-index o disabilita l'opzione di configurazione\n"
"pack.writebitmaps."
-#: builtin/repack.c:191
+#: 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:230 builtin/repack.c:416
+#: 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:254
+#: 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:292
+#: builtin/repack.c:297
msgid "pack everything in a single pack"
msgstr "esegui il pack di tutto in un singolo pack"
-#: builtin/repack.c:294
+#: 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:297
+#: 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:299
+#: 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:301
+#: 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:303
+#: builtin/repack.c:308
msgid "do not run git-update-server-info"
msgstr "non eseguire git-update-server-info"
-#: builtin/repack.c:306
+#: builtin/repack.c:311
msgid "pass --local to git-pack-objects"
msgstr "fornisci l'opzione --local a git-pack-objects"
-#: builtin/repack.c:308
+#: builtin/repack.c:313
msgid "write bitmap index"
msgstr "scrivi l'indice bitmap"
-#: builtin/repack.c:310
+#: 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:311
+#: builtin/repack.c:316
msgid "approxidate"
msgstr "data approssimativa"
-#: builtin/repack.c:312
+#: 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:314
+#: builtin/repack.c:319
msgid "with -a, repack unreachable objects"
msgstr "con -a, esegui il repack degli oggetti non raggiungibili"
-#: builtin/repack.c:316
+#: 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:317 builtin/repack.c:323
+#: builtin/repack.c:322 builtin/repack.c:328
msgid "bytes"
msgstr "byte"
-#: builtin/repack.c:318
+#: 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:320
+#: builtin/repack.c:325
msgid "limits the maximum delta depth"
msgstr "limita la profondità massima dei delta"
-#: builtin/repack.c:322
+#: builtin/repack.c:327
msgid "limits the maximum number of threads"
msgstr "limita il numero massimo di thread"
-#: builtin/repack.c:324
+#: builtin/repack.c:329
msgid "maximum size of each packfile"
msgstr "dimensione massima di ogni file pack"
-#: builtin/repack.c:326
+#: 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:328
+#: builtin/repack.c:333
msgid "do not repack this pack"
msgstr "non eseguire il repack di questo pack"
-#: builtin/repack.c:338
+#: 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:342
+#: builtin/repack.c:347
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable e -A non sono compatibili"
-#: builtin/repack.c:425
+#: builtin/repack.c:430
msgid "Nothing new to pack."
msgstr "Non ci sono oggetti nuovi di cui eseguire il pack."
@@ -20155,92 +20961,92 @@
msgid "keep"
msgstr "keep"
-#: builtin/reset.c:82
+#: builtin/reset.c:83
msgid "You do not have a valid HEAD."
msgstr "Non hai un HEAD valido."
-#: builtin/reset.c:84
+#: builtin/reset.c:85
msgid "Failed to find tree of HEAD."
msgstr "Impossibile trovare l'albero di HEAD."
-#: builtin/reset.c:90
+#: builtin/reset.c:91
#, c-format
msgid "Failed to find tree of %s."
msgstr "Impossibile trovare l'albero di %s."
-#: builtin/reset.c:115
+#: builtin/reset.c:116
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD ora si trova a %s"
-#: builtin/reset.c:194
+#: 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:294 builtin/stash.c:520 builtin/stash.c:595
+#: 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:296
+#: builtin/reset.c:297
msgid "reset HEAD and index"
msgstr "reimposta l'HEAD e l'indice"
-#: builtin/reset.c:297
+#: builtin/reset.c:298
msgid "reset only HEAD"
msgstr "reimposta solo l'HEAD"
-#: builtin/reset.c:299 builtin/reset.c:301
+#: 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:303
+#: builtin/reset.c:304
msgid "reset HEAD but keep local changes"
msgstr "reimposta l'HEAD ma mantieni le modifiche locali"
-#: builtin/reset.c:309
+#: 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:343
+#: 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:351
+#: 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:360
+#: builtin/reset.c:361
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch non è compatibile con --{hard,mixed,soft}"
-#: builtin/reset.c:370
+#: 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:372
+#: 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:387
+#: 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:391
+#: builtin/reset.c:392
msgid "-N can only be used with --mixed"
msgstr "-N può essere usato solo con --mixed"
-#: builtin/reset.c:412
+#: builtin/reset.c:413
msgid "Unstaged changes after reset:"
msgstr "Modifiche non nell'area di staging dopo il reset:"
-#: builtin/reset.c:415
+#: builtin/reset.c:416
#, c-format
msgid ""
"\n"
@@ -20254,12 +21060,12 @@
"messaggio. Imposta l'opzione di configurazione reset.quiet a true per\n"
"rendere tale comportamento quello predefinito.\n"
-#: builtin/reset.c:425
+#: builtin/reset.c:434
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Impossibile ripristinare il file indice alla revisione '%s'."
-#: builtin/reset.c:429
+#: builtin/reset.c:439
msgid "Could not write new index file."
msgstr "Impossibile scrivere il nuovo file indice."
@@ -20279,24 +21085,24 @@
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"
@@ -20499,55 +21305,77 @@
"[<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"
@@ -20689,6 +21517,14 @@
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 | --"
@@ -20738,71 +21574,76 @@
"repository locale"
#: builtin/sparse-checkout.c:21
-msgid "git sparse-checkout (init|list|set|add|disable) <options>"
-msgstr "git sparse-checkout (init|list|set|add|disable) <opzioni>"
+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:64
+#: 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:225
+#: 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:266
+#: 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:283
+#: builtin/sparse-checkout.c:288
msgid "git sparse-checkout init [--cone]"
msgstr "git sparse-checkout init [--cone]"
-#: builtin/sparse-checkout.c:302
+#: 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:308
-msgid "initialize sparse-checkout"
-msgstr "inizializza sparse-checkout"
-
-#: builtin/sparse-checkout.c:341
+#: builtin/sparse-checkout.c:344
#, c-format
msgid "failed to open '%s'"
msgstr "apertura di '%s' non riuscita"
-#: builtin/sparse-checkout.c:398
+#: builtin/sparse-checkout.c:401
#, c-format
msgid "could not normalize path %s"
msgstr "impossibile normalizzare il percorso '%s'"
-#: builtin/sparse-checkout.c:410
+#: 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:435
+#: 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:489 builtin/sparse-checkout.c:513
+#: 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:558
+#: builtin/sparse-checkout.c:561
msgid "read patterns from standard in"
msgstr "leggi i pattern dallo standard input"
-#: builtin/sparse-checkout.c:564
-msgid "set sparse-checkout patterns"
-msgstr "imposta i pattern sparse-checkout"
+#: builtin/sparse-checkout.c:576
+msgid "git sparse-checkout reapply"
+msgstr "git sparse-checkout reapply"
-#: builtin/sparse-checkout.c:581
-msgid "disable sparse-checkout"
-msgstr "disabilita sparse-checkout"
+#: builtin/sparse-checkout.c:595
+msgid "git sparse-checkout disable"
+msgstr "git sparse-checkout disable"
-#: builtin/sparse-checkout.c:593
+#: builtin/sparse-checkout.c:623
msgid "error while refreshing working directory"
msgstr "errore durante l'aggiornamento della directory di lavoro"
@@ -20882,7 +21723,7 @@
msgid "Too many revisions specified:%s"
msgstr "Troppe revisioni specificate:%s"
-#: builtin/stash.c:162 git-legacy-stash.sh:549
+#: builtin/stash.c:162
msgid "No stash entries found."
msgstr "Nessuna voce di stash trovata."
@@ -20891,7 +21732,7 @@
msgid "%s is not a valid reference"
msgstr "%s non è un riferimento valido"
-#: builtin/stash.c:225 git-legacy-stash.sh:75
+#: builtin/stash.c:225
msgid "git stash clear with parameters is unimplemented"
msgstr "git stash clear con parametri non è implementato"
@@ -20921,7 +21762,7 @@
msgid "Merging %s with %s"
msgstr "Merge di %s con %s in corso"
-#: builtin/stash.c:461 git-legacy-stash.sh:681
+#: builtin/stash.c:461
msgid "Index was not unstashed."
msgstr "L'indice non è stato rimosso dallo stash."
@@ -20944,107 +21785,109 @@
msgid "'%s' is not a stash reference"
msgstr "'%s' non è un riferimento stash"
-#: builtin/stash.c:633 git-legacy-stash.sh:695
+#: builtin/stash.c: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:656 git-legacy-stash.sh:713
+#: builtin/stash.c:656
msgid "No branch name specified"
msgstr "Nome del branch non specificato"
-#: builtin/stash.c:796 builtin/stash.c:833
+#: 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:814 builtin/stash.c:1478 builtin/stash.c:1543
+#: builtin/stash.c:818 builtin/stash.c:1472 builtin/stash.c:1537
msgid "stash message"
msgstr "messaggio di stash"
-#: builtin/stash.c:824
+#: builtin/stash.c:828
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" richiede un argomento <commit>"
-#: builtin/stash.c:1049 git-legacy-stash.sh:218
+#: builtin/stash.c:1043
msgid "No changes selected"
msgstr "Nessuna modifica selezionata"
-#: builtin/stash.c:1149 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:1176 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:1185 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:1196 builtin/stash.c:1205 git-legacy-stash.sh:201
-#: git-legacy-stash.sh:214
+#: 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:1233 git-legacy-stash.sh:234
+#: builtin/stash.c:1227
msgid "Cannot record working tree state"
msgstr "Impossibile registrare lo stato dell'albero di lavoro"
-#: builtin/stash.c:1282 git-legacy-stash.sh:338
+#: builtin/stash.c: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:1298
+#: builtin/stash.c:1292
msgid "Did you forget to 'git add'?"
msgstr "Ti sei scordato di eseguire 'git add'?"
-#: builtin/stash.c:1313 git-legacy-stash.sh:346
+#: builtin/stash.c:1307
msgid "No local changes to save"
msgstr "Nessuna modifica locale da salvare"
-#: builtin/stash.c:1320 git-legacy-stash.sh:351
+#: builtin/stash.c:1314
msgid "Cannot initialize stash"
msgstr "Impossibile inizializzare stash"
-#: builtin/stash.c:1335 git-legacy-stash.sh:355
+#: builtin/stash.c:1329
msgid "Cannot save the current status"
msgstr "Impossibile salvare lo stato attuale"
-#: builtin/stash.c:1340
+#: 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:1430 git-legacy-stash.sh:385
+#: builtin/stash.c:1424
msgid "Cannot remove worktree changes"
msgstr "Impossibile rimuovere le modifiche all'albero di lavoro"
-#: builtin/stash.c:1469 builtin/stash.c:1534
+#: builtin/stash.c:1463 builtin/stash.c:1528
msgid "keep index"
msgstr "mantieni l'indice"
-#: builtin/stash.c:1471 builtin/stash.c:1536
+#: builtin/stash.c:1465 builtin/stash.c:1530
msgid "stash in patch mode"
msgstr "esegui lo stash in modalità patch"
-#: builtin/stash.c:1472 builtin/stash.c:1537
+#: builtin/stash.c:1466 builtin/stash.c:1531
msgid "quiet mode"
msgstr "modalità silenziosa"
-#: builtin/stash.c:1474 builtin/stash.c:1539
+#: 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:1476 builtin/stash.c:1541
+#: builtin/stash.c:1470 builtin/stash.c:1535
msgid "include ignore files"
msgstr "includi i file ignorati"
-#: builtin/stash.c:1600
-#, 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]"
@@ -21062,7 +21905,7 @@
msgid "prepend comment character and space to each line"
msgstr "anteponi il carattere commento e uno spazio a ogni riga"
-#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999
+#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Atteso nome riferimento completo, ricevuto %s"
@@ -21076,7 +21919,7 @@
msgid "cannot strip one component off url '%s'"
msgstr "impossibile rimuovere un componente dall'URL '%s'"
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819
msgid "alternative anchor for relative paths"
msgstr "ancoraggio alternativo per i percorsi relativi"
@@ -21084,8 +21927,8 @@
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<percorso>] [<percorso>...]"
-#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c: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'"
@@ -21119,7 +21962,7 @@
msgid "Suppress output of entering each submodule command"
msgstr "Non visualizzare l'output dei comandi eseguiti in ogni sottomodulo"
-#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063
+#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1487
msgid "Recurse into nested submodules"
msgstr "Esegui ricorsivamente sui sottomoduli innestati"
@@ -21136,56 +21979,56 @@
"impossibile trovare la configurazione '%s'. Assumo che questo repository sia "
"il proprio repository autoritativo upstream."
-#: builtin/submodule--helper.c:667
+#: 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:671
+#: 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:681
+#: 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:688
+#: 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:710
+#: 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:715
+#: builtin/submodule--helper.c:714
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<opzioni>] [<percorso>]"
-#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
+#: builtin/submodule--helper.c: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:837
+#: 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:864 builtin/submodule--helper.c:1033
+#: 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:888 builtin/submodule--helper.c:1199
+#: 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:889
+#: builtin/submodule--helper.c:887
msgid ""
"Use commit stored in the index instead of the one stored in the submodule "
"HEAD"
@@ -21193,49 +22036,107 @@
"Usa il commit salvato nell'indice anziché quello salvato nell'HEAD del "
"sottomodulo"
-#: builtin/submodule--helper.c:890
+#: builtin/submodule--helper.c:888
msgid "recurse into nested submodules"
msgstr "esegui ricorsivamente sui sottomoduli innestati"
-#: builtin/submodule--helper.c:895
+#: 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:919
+#: builtin/submodule--helper.c:917
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <percorso>"
-#: builtin/submodule--helper.c:983
+#: 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:989
+#: 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:1003
+#: 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:1014
+#: 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:1061
+#: 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:1068
+#: 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:1122
+#: builtin/submodule--helper.c:1546
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -21244,7 +22145,7 @@
"L'albero di lavoro del sottomodulo ('%s') contiene una directory .git (usa "
"'rm -rf' se vuoi veramente rimuoverla, inclusa l'intera sua cronologia)"
-#: builtin/submodule--helper.c:1134
+#: builtin/submodule--helper.c:1558
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -21253,47 +22154,47 @@
"L'albero di lavoro del sottomodulo ('%s') contiene modifiche locali; usa '-"
"f' per scartarle"
-#: builtin/submodule--helper.c:1142
+#: builtin/submodule--helper.c:1566
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Directory '%s' ripulita\n"
-#: builtin/submodule--helper.c:1144
+#: 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:1155
+#: 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:1171
+#: 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:1200
+#: 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:1201
+#: builtin/submodule--helper.c:1625
msgid "Unregister all submodules"
msgstr "Annulla la registrazione di tutti i sottomoduli"
-#: builtin/submodule--helper.c:1206
+#: 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:1220
+#: 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:1289
+#: 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"
@@ -21308,46 +22209,46 @@
"clone\n"
"con l'opzione '--reference-if-able' anziché '--reference'."
-#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331
+#: 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:1367
+#: 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:1374
+#: 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:1398
+#: 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:1401
+#: builtin/submodule--helper.c:1825
msgid "name of the new submodule"
msgstr "nome del nuovo sottomodulo"
-#: builtin/submodule--helper.c:1404
+#: builtin/submodule--helper.c:1828
msgid "url where to clone the submodule from"
msgstr "URL da cui clonare il sottomodulo"
-#: builtin/submodule--helper.c:1412
+#: builtin/submodule--helper.c:1836
msgid "depth for shallow clones"
msgstr "profondità per i cloni shallow"
-#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924
+#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348
msgid "force cloning progress"
msgstr "forza l'indicazione d'avanzamento della clonazione"
-#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926
+#: 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:1424
+#: builtin/submodule--helper.c:1848
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -21357,109 +22258,109 @@
"<repository>] [--name <nome>] [--depth <profondità>] [--single-branch] --url "
"<URL> --path <percorso>"
-#: builtin/submodule--helper.c:1449
+#: 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:1460
+#: 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:1464
+#: builtin/submodule--helper.c:1888
#, c-format
msgid "directory not empty: '%s'"
msgstr "directory non vuota: '%s'"
-#: builtin/submodule--helper.c:1476
+#: 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:1512
+#: 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:1516
+#: 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:1617
+#: builtin/submodule--helper.c:2041
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Percorso del sottomodulo ('%s') non inizializzato"
-#: builtin/submodule--helper.c:1621
+#: builtin/submodule--helper.c:2045
msgid "Maybe you want to use 'update --init'?"
msgstr "Potresti voler usare 'update --init'."
-#: builtin/submodule--helper.c:1651
+#: 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:1680
+#: builtin/submodule--helper.c:2104
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Ignoro il sottomodulo '%s'"
-#: builtin/submodule--helper.c:1830
+#: 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:1841
+#: 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:1903 builtin/submodule--helper.c:2149
+#: 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:1906
+#: 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:1910
+#: builtin/submodule--helper.c:2334
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout o none"
-#: builtin/submodule--helper.c:1916
+#: 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:1919
+#: builtin/submodule--helper.c:2343
msgid "parallel jobs"
msgstr "processi da eseguire in parallelo"
-#: builtin/submodule--helper.c:1921
+#: 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:1922
+#: builtin/submodule--helper.c:2346
msgid "don't print cloning progress"
msgstr "non stampare l'indicazione di avanzamento della clonazione"
-#: builtin/submodule--helper.c:1933
+#: builtin/submodule--helper.c:2357
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
msgstr ""
"git submodule--helper update-clone [--prefix=<percorso>] [<percorso>...]"
-#: builtin/submodule--helper.c:1946
+#: builtin/submodule--helper.c:2370
msgid "bad value for update parameter"
msgstr "valore parametro aggiornamento errato"
-#: builtin/submodule--helper.c:1994
+#: builtin/submodule--helper.c:2418
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -21468,50 +22369,86 @@
"Il branch del sottomodulo (%s) è configurato in modo da ereditare il branch "
"dal progetto al livello superiore, ma questo non è su alcun branch"
-#: builtin/submodule--helper.c:2117
+#: builtin/submodule--helper.c: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:2150
+#: builtin/submodule--helper.c:2574
msgid "recurse into submodules"
msgstr "esegui ricorsivamente sui sottomoduli"
-#: builtin/submodule--helper.c:2156
+#: 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:2212
+#: 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:2215
+#: builtin/submodule--helper.c:2639
msgid "unset the config in the .gitmodules file"
msgstr "rimuovi la configurazione nel file .gitmodules"
-#: builtin/submodule--helper.c:2220
+#: builtin/submodule--helper.c:2644
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config <nome> [<valore>]"
-#: builtin/submodule--helper.c:2221
+#: builtin/submodule--helper.c:2645
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <nome>"
-#: builtin/submodule--helper.c:2222
+#: builtin/submodule--helper.c:2646
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2241 git-submodule.sh:174
+#: builtin/submodule--helper.c: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:2291 git.c:433 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:2297
+#: builtin/submodule--helper.c:2798
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' non è un sottocomando submodule--helper valido"
@@ -21538,11 +22475,11 @@
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"
@@ -21562,11 +22499,13 @@
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>..."
@@ -21636,135 +22575,135 @@
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"
@@ -22060,19 +22999,19 @@
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"
@@ -22118,15 +23057,15 @@
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"
@@ -22166,205 +23105,197 @@
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <percorso>"
-#: builtin/worktree.c:60 builtin/worktree.c:891
+#: builtin/worktree.c:60 builtin/worktree.c:970
#, c-format
msgid "failed to delete '%s'"
msgstr "eliminazione di '%s' non riuscita"
-#: builtin/worktree.c:79
-#, c-format
-msgid "Removing worktrees/%s: not a valid directory"
-msgstr "Rimuovo worktrees/%s: non è una directory valida"
-
#: builtin/worktree.c:85
-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
-msgstr "Rimuovo worktrees/%s: il file gitdir non esiste"
+msgid "not a valid directory"
+msgstr "directory non valida"
-#: builtin/worktree.c:90 builtin/worktree.c:99
-#, c-format
-msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
-msgstr "Rimuovo worktrees/%s: impossibile leggere il file gitdir (%s)"
+#: builtin/worktree.c:91
+msgid "gitdir file does not exist"
+msgstr "il file gitdir non esiste"
-#: builtin/worktree.c:109
+#: builtin/worktree.c:96 builtin/worktree.c:105
#, 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 "unable to read gitdir file (%s)"
+msgstr "impossibile leggere il file gitdir (%s)"
-#: builtin/worktree.c:117
+#: builtin/worktree.c:115
#, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
-msgstr "Rimuovo worktrees/%s: file gitdir non valido"
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr "lettura troppo breve (attesi %<PRIuMAX> byte, letti %<PRIuMAX>)"
-#: builtin/worktree.c:126
+#: builtin/worktree.c:123
+msgid "invalid gitdir file"
+msgstr "file gitdir non valido"
+
+#: 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:165
+#: builtin/worktree.c:221
msgid "report pruned working trees"
msgstr "segnala gli alberi di lavoro eliminati"
-#: builtin/worktree.c:167
+#: 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:234
+#: builtin/worktree.c:293
#, c-format
msgid "'%s' already exists"
msgstr "'%s' esiste già"
-#: builtin/worktree.c:244
+#: 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:249
+#: 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:251
+#: 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:301
+#: builtin/worktree.c:360
#, c-format
msgid "could not create directory of '%s'"
msgstr "impossibile creare la directory di '%s'"
-#: builtin/worktree.c:432 builtin/worktree.c:438
+#: builtin/worktree.c: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:434
+#: 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:443
+#: 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:449
+#: 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:490
+#: 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:493
+#: builtin/worktree.c:555
msgid "create a new branch"
msgstr "crea un nuovo branch"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:557
msgid "create or reset a branch"
msgstr "crea o reimposta un branch"
-#: builtin/worktree.c:497
+#: builtin/worktree.c:559
msgid "populate the new working tree"
msgstr "popola il nuovo albero di lavoro"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:560
msgid "keep the new working tree locked"
msgstr "mantieni bloccato il nuovo albero di lavoro"
-#: builtin/worktree.c:501
+#: 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:504
+#: 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:512
+#: 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:573
+#: 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:673
+#: builtin/worktree.c:755
msgid "reason for locking"
msgstr "motivo di blocco"
-#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
-#: builtin/worktree.c:919
+#: builtin/worktree.c: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:687 builtin/worktree.c:720
+#: 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:692
+#: builtin/worktree.c:774
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' è già bloccato per questo motivo: %s"
-#: builtin/worktree.c:694
+#: builtin/worktree.c:776
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' è già bloccato"
-#: builtin/worktree.c:722
+#: builtin/worktree.c:804
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' non è bloccato"
-#: builtin/worktree.c:763
+#: 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:771
+#: 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:794 builtin/worktree.c:921
+#: 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:799
+#: 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:805
-#, c-format
-msgid "target '%s' already exists"
-msgstr "la destinazione '%s' esiste già"
-
-#: builtin/worktree.c:813
+#: builtin/worktree.c:894
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -22374,7 +23305,7 @@
"usa 'move -f -f' per eseguirne l'override o sbloccalo prima di eseguire "
"l'operazione"
-#: builtin/worktree.c:815
+#: builtin/worktree.c:896
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -22383,37 +23314,37 @@
"usa 'move -f -f' per eseguirne l'override o sbloccalo prima di eseguire "
"l'operazione"
-#: builtin/worktree.c:818
+#: 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:823
+#: builtin/worktree.c:904
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "spostamento di '%s' in '%s' non riuscito"
-#: builtin/worktree.c:871
+#: 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:875
+#: builtin/worktree.c:954
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
"'%s' contiene file modificati o non tracciati, usa --force per eliminarlo"
-#: builtin/worktree.c:880
+#: 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:903
+#: 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:926
+#: builtin/worktree.c:1005
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -22423,7 +23354,7 @@
"usa 'remove -f -f' per eseguirne l'override o sbloccalo prima di eseguire "
"l'operazione"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:1007
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -22432,11 +23363,21 @@
"usa 'remove -f -f' per eseguirne l'override o sbloccalo prima di eseguire "
"l'operazione"
-#: builtin/worktree.c:931
+#: 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>/]"
@@ -22453,45 +23394,21 @@
msgid "only useful for debugging"
msgstr "utile solo per il debug"
-#: fast-import.c:3125
+#: http-fetch.c:114
#, c-format
-msgid "Expected 'mark' command, got %s"
-msgstr "Atteso comando 'mark', ricevuto %s"
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr "l'argomento di --packfile dev'essere un hash valido (ricevuto '%s')"
-#: fast-import.c:3130
-#, c-format
-msgid "Expected 'to' command, got %s"
-msgstr "Atteso comando 'to', ricevuto %s"
+#: http-fetch.c:122
+msgid "not a git repository"
+msgstr "non è un repository Git"
-#: fast-import.c:3254
-#, c-format
-msgid "feature '%s' forbidden in input without --allow-unsafe-features"
-msgstr "funzionalità '%s' vietata nell'input senza --allow-unsafe-features"
-
-#: credential-cache--daemon.c:223
-#, c-format
-msgid ""
-"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"
-
-#: credential-cache--daemon.c:272
-msgid "print debugging messages to stderr"
-msgstr "stampa i messaggi di debug sullo standard error"
-
-#: 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"
@@ -22503,7 +23420,7 @@
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"
@@ -22521,7 +23438,7 @@
"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"
@@ -22534,47 +23451,47 @@
"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"
@@ -22583,39 +23500,39 @@
"l'alias '%s' modifica le variabili d'ambiente.\n"
"Puoi usare '!git' nell'alias per farlo"
-#: git.c:376
+#: git.c:380
#, c-format
msgid "empty alias for %s"
msgstr "alias vuoto per %s"
-#: git.c:379
+#: git.c:383
#, c-format
msgid "recursive alias: %s"
msgstr "alias ricorsivo: %s"
-#: git.c:459
+#: git.c:465
msgid "write failure on standard output"
msgstr "errore di scrittura sullo standard output"
-#: git.c:461
+#: git.c:467
msgid "unknown write failure on standard output"
msgstr "errore di scrittura sconosciuto sullo standard output"
-#: git.c:463
+#: 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"
@@ -22624,55 +23541,55 @@
"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:1086
+#: http.c:1132
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "Backend SSL '%s' non supportato. Backend SSL supportati:"
-#: http.c:1093
+#: 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:1097
+#: 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:1966
+#: http.c:2025
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -22683,128 +23600,159 @@
" richiesta: %s\n"
" redirect: %s"
-#: remote-curl.c:166
+#: 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:263
+#: 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:364
+#: 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:395
+#: remote-curl.c:430
#, c-format
msgid "invalid server response; got '%s'"
msgstr "risposta del server non valida; ricevuto '%s'"
-#: remote-curl.c:455
+#: remote-curl.c:490
#, c-format
msgid "repository '%s' not found"
msgstr "repository '%s' non trovato"
-#: remote-curl.c:459
+#: remote-curl.c:494
#, c-format
msgid "Authentication failed for '%s'"
msgstr "Autenticazione non riuscita per '%s'"
-#: remote-curl.c:463
+#: remote-curl.c:498
#, c-format
msgid "unable to access '%s': %s"
msgstr "impossibile accedere a '%s': %s"
-#: remote-curl.c:469
+#: remote-curl.c:504
#, c-format
msgid "redirecting to %s"
msgstr "redirezione a %s in corso"
-#: remote-curl.c:593
+#: 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:673
+#: 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:733
+#: 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:773
+#: remote-curl.c:863
msgid "cannot handle pushes this big"
msgstr "impossibile gestire push così grandi"
-#: remote-curl.c:888
+#: 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:892
+#: 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:1023
+#: 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:1038
+#: remote-curl.c:1138
msgid "fetch failed."
msgstr "recupero non riuscito."
-#: remote-curl.c:1086
+#: 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:1130 remote-curl.c:1136
+#: 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:1148 remote-curl.c:1263
+#: 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:1184
+#: remote-curl.c:1282
msgid "git-http-push failed"
msgstr "git-http-push non riuscito"
-#: remote-curl.c:1369
+#: 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:1401
+#: 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:1408
+#: 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:1448
+#: 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:85
+#: 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:86
+#: list-objects-filter-options.h:92
msgid "object filtering"
msgstr "filtraggio oggetti"
@@ -22825,8 +23773,8 @@
msgstr "visualizza meno dettagli"
#: parse-options.h:317
-msgid "use <n> digits to display SHA-1s"
-msgstr "usa <n> cifre per mostrare gli hash SHA-1"
+msgid "use <n> digits to display object names"
+msgstr "usa <n> cifre per mostrare i nomi oggetto"
#: parse-options.h:336
msgid "how to strip spaces and #comments from message"
@@ -22843,11 +23791,11 @@
"con --pathspec-from-file gli elementi specificatori percorso sono separati "
"da un carattere NUL"
-#: ref-filter.h:101
+#: 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"
@@ -22857,11 +23805,11 @@
"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 "
@@ -22904,696 +23852,707 @@
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:172
+#: 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:173
+#: 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:174
+#: command-list.h:176
msgid "Show the working tree status"
msgstr "Visualizza lo stato dell'albero di lavoro"
-#: command-list.h:175
+#: command-list.h:177
msgid "Remove unnecessary whitespace"
msgstr "Rimuove spazi bianchi non necessari"
-#: command-list.h:176
+#: command-list.h:178
msgid "Initialize, update or inspect submodules"
msgstr "Inizializza, aggiorna o esamina sottomoduli"
-#: command-list.h:177
+#: 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:178
+#: command-list.h:180
msgid "Switch branches"
msgstr "Passa da un branch a un altro"
-#: command-list.h:179
+#: command-list.h:181
msgid "Read, modify and delete symbolic refs"
msgstr "Legge, modifica ed elimina riferimenti simbolici"
-#: command-list.h:180
+#: 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:181
+#: 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:182
+#: command-list.h:184
msgid "Unpack objects from a packed archive"
msgstr "Decomprime gli oggetti da un archivio sottoposto a pack"
-#: command-list.h:183
+#: 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:184
+#: 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:185
+#: 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:186
+#: command-list.h:188
msgid "Send archive back to git-archive"
msgstr "Reinvia l'archivio a git-archive"
-#: command-list.h:187
+#: 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:188
+#: command-list.h:190
msgid "Show a Git logical variable"
msgstr "Visualizza una variabile logica di Git"
-#: command-list.h:189
+#: command-list.h:191
msgid "Check the GPG signature of commits"
msgstr "Verifica la firma GPG dei commit"
-#: command-list.h:190
+#: command-list.h:192
msgid "Validate packed Git archive files"
msgstr "Convalida i file archivio sottoposti a pack di Git"
-#: command-list.h:191
+#: command-list.h:193
msgid "Check the GPG signature of tags"
msgstr "Verifica la firma GPG dei tag"
-#: command-list.h:192
+#: 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:193
+#: 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:194
+#: command-list.h:196
msgid "Manage multiple working trees"
msgstr "Gestisce alberi di lavoro multipli"
-#: command-list.h:195
+#: command-list.h:197
msgid "Create a tree object from the current index"
msgstr "Crea un oggetto albero dall'indice corrente"
-#: command-list.h:196
+#: command-list.h:198
msgid "Defining attributes per path"
msgstr "Definizione di attributi per percorso"
-#: command-list.h:197
+#: command-list.h:199
msgid "Git command-line interface and conventions"
msgstr "Interfaccia a riga di comando di Git e convenzioni"
-#: command-list.h:198
+#: command-list.h:200
msgid "A Git core tutorial for developers"
msgstr "Un tutorial Git di base per gli sviluppatori"
-#: command-list.h:199
+#: 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:200
+#: command-list.h:203
msgid "Tweaking diff output"
msgstr "Messa a punto dell'output di diff"
-#: command-list.h:201
+#: 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:202
+#: 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:203
+#: command-list.h:207
msgid "Hooks used by Git"
msgstr "Hook usati da Git"
-#: command-list.h:204
+#: command-list.h:208
msgid "Specifies intentionally untracked files to ignore"
msgstr "Specifica i file intenzionalmente non tracciati da ignorare"
-#: command-list.h:205
+#: command-list.h:209
msgid "Defining submodule properties"
msgstr "Definizione proprietà sottomodulo"
-#: command-list.h:206
+#: command-list.h:210
msgid "Git namespaces"
msgstr "Spazi dei nomi Git"
-#: command-list.h:207
+#: 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:208
+#: command-list.h:213
msgid "Specifying revisions and ranges for Git"
msgstr "Come specificare revisioni e intervalli in Git"
-#: command-list.h:209
+#: command-list.h:214
msgid "Mounting one repository inside another"
msgstr "Monto un repository dentro un altro"
-#: command-list.h:210
+#: command-list.h:215
msgid "A tutorial introduction to Git: part two"
msgstr "Un tutorial introduttivo per Git: seconda parte"
-#: command-list.h:211
+#: command-list.h:216
msgid "A tutorial introduction to Git"
msgstr "Un tutorial introduttivo per Git"
-#: command-list.h:212
+#: 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"
@@ -23602,11 +24561,11 @@
"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"
@@ -23615,11 +24574,11 @@
"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."
@@ -23663,133 +24622,50 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "Il merge semplice non ha funzionato, provo il merge automatico."
-#: git-legacy-stash.sh:221
-msgid "Cannot remove temporary index (can't happen)"
-msgstr "Impossibile rimuovere l'indice temporaneo (non può succedere)"
-
-#: git-legacy-stash.sh:272
-#, sh-format
-msgid "Cannot update $ref_stash with $w_commit"
-msgstr "Impossibile aggiornare $ref_stash con $w_commit"
-
-#: git-legacy-stash.sh:324
-#, sh-format
-msgid "error: unknown option for 'stash push': $option"
-msgstr "errore: opzione sconosciuta per 'stash push': $option"
-
-#: git-legacy-stash.sh:356
-#, sh-format
-msgid "Saved working directory and index state $stash_msg"
-msgstr "Directory di lavoro e stato indice salvati: $stash_msg"
-
-#: git-legacy-stash.sh:536
-#, sh-format
-msgid "unknown option: $opt"
-msgstr "opzione sconosciuta: $opt"
-
-#: git-legacy-stash.sh:556
-#, sh-format
-msgid "Too many revisions specified: $REV"
-msgstr "Troppe revisioni specificate: $REV"
-
-#: git-legacy-stash.sh:571
-#, sh-format
-msgid "$reference is not a valid reference"
-msgstr "$reference non è un riferimento valido"
-
-#: git-legacy-stash.sh:599
-#, sh-format
-msgid "'$args' is not a stash-like commit"
-msgstr "'$args' non è un commit di tipo stash"
-
-#: git-legacy-stash.sh:610
-#, sh-format
-msgid "'$args' is not a stash reference"
-msgstr "'$args' non è un riferimento a uno stash"
-
-#: git-legacy-stash.sh:618
-msgid "unable to refresh index"
-msgstr "impossibile aggiornare l'indice"
-
-#: git-legacy-stash.sh:622
-msgid "Cannot apply a stash in the middle of a merge"
-msgstr "Impossibile applicare uno stash nel mezzo di un merge"
-
-#: git-legacy-stash.sh:630
-msgid "Conflicts in index. Try without --index."
-msgstr "Ci sono conflitti in index. Prova senza --index."
-
-#: git-legacy-stash.sh:632
-msgid "Could not save index tree"
-msgstr "Non è stato possibile salvare l'albero indice"
-
-#: git-legacy-stash.sh:641
-msgid "Could not restore untracked files from stash entry"
-msgstr ""
-"Non è stato possibile ripristinare i file non tracciati dalla voce stash"
-
-#: git-legacy-stash.sh:666
-msgid "Cannot unstage modified files"
-msgstr "Non è stato possibile rimuovere i file modificati dall'area di staging"
-
-#: git-legacy-stash.sh:704
-#, sh-format
-msgid "Dropped ${REV} ($s)"
-msgstr "${REV} eliminata ($s)"
-
-#: git-legacy-stash.sh:705
-#, sh-format
-msgid "${REV}: Could not drop stash entry"
-msgstr "${REV}: non è stato possibile rimuovere la voce di stash"
-
-#: git-legacy-stash.sh:792
-msgid "(To restore them type \"git stash apply\")"
-msgstr "(Per ripristinarli digita \"git stash apply\")"
-
-#: git-submodule.sh:203
+#: 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:213
+#: 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:232
+#: git-submodule.sh:209
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' esiste già nell'indice"
-#: git-submodule.sh:235
+#: 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:242
+#: 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:273
+#: 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:275
+#: 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:283
+#: 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:285
+#: git-submodule.sh:262
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -23806,39 +24682,39 @@
"altro\n"
"nome con l'opzione '--name'."
-#: git-submodule.sh:291
+#: 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:303
+#: 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:308
+#: git-submodule.sh:285
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Aggiunta del sottomodulo '$sm_path' non riuscita"
-#: git-submodule.sh:317
+#: git-submodule.sh:294
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Registrazione del sottomodulo '$sm_path' non riuscita"
-#: git-submodule.sh:590
+#: 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:600
+#: 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:605
+#: git-submodule.sh:582
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -23847,7 +24723,7 @@
"Impossibile trovare la revisione corrente per ${remote_name}/${branch} nel "
"percorso del sottomodulo '$sm_path'"
-#: git-submodule.sh:623
+#: git-submodule.sh:600
#, sh-format
msgid ""
"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
@@ -23856,7 +24732,7 @@
"Impossibile eseguire il fetch nel percorso del sottomodulo '$displaypath'; "
"provo a recuperare direttamente $sha1:"
-#: git-submodule.sh:629
+#: git-submodule.sh:606
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -23865,84 +24741,59 @@
"Fetch eseguito nel percorso del sottomodulo '$displaypath', ma non conteneva "
"$sha1. Fetch diretto di tale commit non riuscito."
-#: git-submodule.sh:636
+#: git-submodule.sh: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:637
+#: 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:641
+#: 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:642
+#: 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:647
+#: 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:648
+#: 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:653
+#: 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:654
+#: git-submodule.sh:631
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Percorso del sottomodulo '$displaypath': '$command $sha1'"
-#: git-submodule.sh:685
+#: 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:896
-msgid "The --cached option cannot be used with the --files option"
-msgstr "L'opzione --cached non può essere usata con l'opzione --files"
-
-#: git-submodule.sh:948
-#, sh-format
-msgid "unexpected mode $mod_dst"
-msgstr "modalità $mod_dst inattesa"
-
-#: git-submodule.sh:968
-#, sh-format
-msgid " Warn: $display_name doesn't contain commit $sha1_src"
-msgstr " Attenzione: $display_name non contiene il commit $sha1_src"
-
-#: git-submodule.sh:971
-#, sh-format
-msgid " Warn: $display_name doesn't contain commit $sha1_dst"
-msgstr " Attenzione: $display_name non contiene il commit $sha1_dst"
-
-#: git-submodule.sh:974
-#, 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."
@@ -23957,12 +24808,22 @@
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"
@@ -24004,7 +24865,7 @@
"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"
@@ -24023,85 +24884,85 @@
"\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"
@@ -24116,31 +24977,31 @@
"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"
@@ -24151,7 +25012,7 @@
"\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"
@@ -24166,25 +25027,25 @@
"\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"
@@ -24215,13 +25076,13 @@
"\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."
@@ -24230,44 +25091,44 @@
"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:955
+#: 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: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 "Impossibile inizializzare i commit riscritti"
@@ -24355,7 +25216,7 @@
msgstr[0] "eseguito touch su %d percorso\n"
msgstr[1] "eseguito touch su %d percorsi\n"
-#: git-add--interactive.perl:1053
+#: git-add--interactive.perl:1058
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
@@ -24363,7 +25224,7 @@
"Se la patch viene applicata senza problemi, l'hunk modificato sarà\n"
"contrassegnato immediatamente per l'aggiunta all'area di staging."
-#: git-add--interactive.perl:1056
+#: git-add--interactive.perl:1061
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
@@ -24371,7 +25232,7 @@
"Se la patch viene applicata senza problemi, l'hunk modificato sarà\n"
"contrassegnato immediatamente per lo stash."
-#: git-add--interactive.perl:1059
+#: git-add--interactive.perl:1064
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
@@ -24379,8 +25240,8 @@
"Se la patch viene applicata senza problemi, l'hunk modificato sarà\n"
"contrassegnato immediatamente per la rimozione dall'area di staging."
-#: git-add--interactive.perl:1062 git-add--interactive.perl:1071
-#: git-add--interactive.perl:1077
+#: git-add--interactive.perl: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."
@@ -24388,8 +25249,8 @@
"Se la patch viene applicata senza problemi, l'hunk modificato sarà\n"
"contrassegnato immediatamente per l'applicazione."
-#: git-add--interactive.perl:1065 git-add--interactive.perl:1068
-#: git-add--interactive.perl:1074
+#: git-add--interactive.perl: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."
@@ -24397,12 +25258,12 @@
"Se la patch viene applicata senza problemi, l'hunk modificato sarà\n"
"contrassegnato immediatamente per la rimozione."
-#: git-add--interactive.perl:1111
+#: git-add--interactive.perl: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:1118
+#: git-add--interactive.perl:1123
#, perl-format
msgid ""
"---\n"
@@ -24415,12 +25276,12 @@
"Per rimuovere '%s' righe, eliminale.\n"
"Le righe che iniziano con %s saranno rimosse.\n"
-#: git-add--interactive.perl:1140
+#: 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"
-#: git-add--interactive.perl:1248
+#: git-add--interactive.perl:1253
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -24437,7 +25298,7 @@
"d - non aggiungere né quest'hunk né quelli successivi nel file all'area di "
"staging"
-#: git-add--interactive.perl:1254
+#: git-add--interactive.perl:1259
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -24451,7 +25312,7 @@
"a - esegui lo stash di quest'hunk e di tutti quelli successivi nel file\n"
"d - non eseguire lo stash né di quest'hunk né di quelli successivi nel file"
-#: git-add--interactive.perl:1260
+#: git-add--interactive.perl:1265
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -24468,7 +25329,7 @@
"d - non rimuovere né quest'hunk né quelli successivi nel file dall'area di "
"staging"
-#: git-add--interactive.perl:1266
+#: git-add--interactive.perl:1271
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -24482,7 +25343,7 @@
"a - applica quest'hunk e tutti quelli successivi nel file\n"
"d - non applicare né quest'hunk né quelli successivi nel file"
-#: git-add--interactive.perl:1272 git-add--interactive.perl:1290
+#: git-add--interactive.perl:1277 git-add--interactive.perl:1295
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -24496,7 +25357,7 @@
"a - rimuovi quest'hunk e tutti quelli successivi nel file\n"
"d - non rimuovere né quest'hunk né quelli successivi nel file"
-#: git-add--interactive.perl:1278
+#: git-add--interactive.perl:1283
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -24510,7 +25371,7 @@
"a - rimuovi quest'hunk e tutti quelli successivi nel file\n"
"d - non rimuovere né quest'hunk né quelli successivi nel file"
-#: git-add--interactive.perl:1284
+#: git-add--interactive.perl:1289
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -24524,7 +25385,7 @@
"a - applica quest'hunk e tutti quelli successivi nel file\n"
"d - non applicare né quest'hunk né quelli successivi nel file"
-#: git-add--interactive.perl:1296
+#: git-add--interactive.perl:1301
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -24538,7 +25399,7 @@
"a - applica quest'hunk e tutti quelli successivi nel file\n"
"d - non applicare né quest'hunk né quelli successivi nel file"
-#: git-add--interactive.perl:1311
+#: git-add--interactive.perl:1316
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -24562,85 +25423,90 @@
"e - modifica manualmente l'hunk corrente\n"
"? - stampa una guida\n"
-#: git-add--interactive.perl:1342
+#: 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:1357
+#: 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:1468
+#: 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:1469
+#: 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:1470
+#: 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:1570
+#: git-add--interactive.perl:1601
msgid "No other hunks to goto\n"
msgstr "Nessun altro hunk a cui andare\n"
-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1619
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Numero non valido: '%s'\n"
-#: git-add--interactive.perl:1593
+#: 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:1619
+#: git-add--interactive.perl:1659
msgid "No other hunks to search\n"
msgstr "Nessun altro hunk in cui ricercare\n"
-#: git-add--interactive.perl:1636
+#: 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:1646
+#: 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:1658 git-add--interactive.perl:1680
+#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
msgid "No previous hunk\n"
msgstr "Nessun hunk precedente\n"
-#: git-add--interactive.perl:1667 git-add--interactive.perl:1686
+#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
msgid "No next hunk\n"
msgstr "Nessun hunk successivo\n"
-#: git-add--interactive.perl:1692
+#: 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:1698
+#: 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:1708
+#: git-add--interactive.perl:1748
msgid "Sorry, cannot edit this hunk\n"
msgstr "Mi dispiace, non posso modificare quest'hunk\n"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1773
+#: git-add--interactive.perl:1813
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
@@ -24660,19 +25526,19 @@
"add untracked - aggiunge i contenuti dei file non tracciati all'insieme di\n"
" modifiche nell'area di staging\n"
-#: git-add--interactive.perl:1790 git-add--interactive.perl:1795
-#: git-add--interactive.perl:1798 git-add--interactive.perl:1805
-#: git-add--interactive.perl:1808 git-add--interactive.perl:1815
-#: git-add--interactive.perl:1819 git-add--interactive.perl:1825
+#: git-add--interactive.perl: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:1821
+#: git-add--interactive.perl:1861
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "modalità --patch sconosciuta: %s"
-#: git-add--interactive.perl:1827 git-add--interactive.perl:1833
+#: git-add--interactive.perl:1867 git-add--interactive.perl:1873
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "argomento %s non valido, atteso --"
@@ -24691,27 +25557,38 @@
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"
@@ -24719,37 +25596,37 @@
"`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"
@@ -24766,12 +25643,12 @@
" * ...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"
@@ -24780,7 +25657,7 @@
"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"
@@ -24790,17 +25667,17 @@
"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"
@@ -24814,27 +25691,27 @@
"\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"
@@ -24842,11 +25719,11 @@
"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"
@@ -24859,24 +25736,24 @@
"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"
@@ -24884,17 +25761,17 @@
#. 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"
@@ -24923,135 +25800,391 @@
#. 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}"
@@ -25097,9 +26230,6 @@
#~ msgid "malformed ident line"
#~ msgstr "riga ident malformata"
-#~ msgid "corrupted author without date information"
-#~ msgstr "informazioni sull'autore corrotte (senza data)"
-
#, c-format
#~ msgid "could not parse '%.*s'"
#~ msgstr "impossibile analizzare '%.*s'"
@@ -25137,20 +26267,6 @@
#~ msgid "no HEAD?"
#~ msgstr "nessun'HEAD?"
-#~ msgid "make committer date match author date"
-#~ msgstr ""
-#~ "fai corrispondere la data della persona che ha eseguito il commit alla "
-#~ "data autore"
-
-#~ msgid "ignore author date and use current date"
-#~ msgstr "ignora la data autore e usa la data corrente"
-
-#~ msgid "synonym of --reset-author-date"
-#~ msgstr "sinonimo di --reset-author-date"
-
-#~ msgid "ignore changes in whitespace"
-#~ msgstr "ignora modifiche agli spazi bianchi"
-
#~ msgid "preserve empty commits during rebase"
#~ msgstr "mantieni i commit vuoti durante il rebase"
@@ -25315,9 +26431,6 @@
#~ 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"
@@ -25400,9 +26513,6 @@
#~ 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/po/pl.po b/po/pl.po
new file mode 100644
index 0000000..6bb665e
--- /dev/null
+++ b/po/pl.po
@@ -0,0 +1,26403 @@
+# Polish translations for Git.
+# Copyright (C) 2017 m4sk1n, m4sk1n@vivaldi.net
+# Copyright (C) 2020 Arusekk <arek_koz@o2.pl>
+# This file is distributed under the same license as the Git package.
+#
+# Stosowana jest następująca terminologia dla kluczowych terminów:
+# commit - zapis, złożyć - uzasadnienie niżej
+# commit message - komunikat zapisu
+# tag - tag
+# email - e-mail
+# merge - scalenie, scalić
+# push - wypchnąć
+# pull - zaciągnąć
+# checkout - wybrać
+# stash - przenieść do schowka
+# stashed - ze schowka
+# rebase - przestawić
+# stage, unstage - przygotować, wycofać
+# branch - gałąź
+# patch - łatka
+# hunk - skrawek
+# hook - skrypt (skrypt repozytorium)
+# property - właściwość
+# notes - uwagi
+# bare (repo) - suche (repozytorium)
+# hash algorithm - algorytm skrótu
+#
+# Terminologia inspirowana tłumaczeniem do subversion, którego kluczowe terminy
+# wybrał Marcin Kasperski <Marcin.Kasperski@acn.waw.pl>.
+#
+# Ponieważ commit nie ma naturalnie doskonałego tłumaczenia, przytoczę kilka
+# możliwych par rzeczownik-czasownik (w kolejności od najlepiej oddającego
+# znaczenie do najszkaradniejszych):
+# - zapis, zapisać (record, synonim)
+# - odprawa, odprawić (check in, synonim)
+# - skład/złożenie, złożyć (inter, submit, put together, synonimy)
+# - osadzenie, osadzić (bardziej embed, deposit, put)
+# - rewizja, zrewidować (bardziej revise, return, search)
+# - odnotowanie, odnotować (bardziej note, make note)
+# - umieszczenie, umieścić (bardziej emplace)
+# - zatwierdzenie, zatwierdzić (bardziej confirm) - użyte w subversion, ale tam znaczy to co innego
+# - oddanie, oddać (bardziej commitment, devotion)
+# - zapamiętanie, zapamiętać (bardziej remember, memorize)
+# - przeznaczenie, przeznaczyć (bardziej destine, intend, designate, allocate)
+# - zakomitować (nie jest słowem)
+# Zdecydowałem się na zapis, bo zdaje się najlepiej oddawać znaczenie,
+# ponadto brzmi dosyć zręcznie i nie ma utartego użycia.
+#
+# Myślę, że wybierając to słowo w języku angielskim (a nie było wcześniej aż tak
+# powszechne) twórcy kontroli wielu wersji mieć na myśli właśnie jakiś zapis,
+# który dokumentuje rozwój.
+# Powstawanie gita najlepiej widać w wątku "Kernel SCM saga.." w archiwach.
+# Nie podoba się? Bardzo chętnie zobaczę lepsze tłumaczenie.
+#
+# m4sk1n, m4sk1n@vivaldi.net, 2017.
+# Arusekk <arek_koz@o2.pl>, 2020, 2021.
+msgid ""
+msgstr ""
+"Project-Id-Version: git\n"
+"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
+"POT-Creation-Date: 2021-02-26 22:09+0800\n"
+"PO-Revision-Date: 2021-02-27 17:10+0100\n"
+"Last-Translator: Arusekk <arek_koz@o2.pl>\n"
+"Language-Team: Polish\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10"
+" || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Lokalize 20.12.2\n"
+
+#: add-interactive.c:376
+#, c-format
+msgid "Huh (%s)?"
+msgstr "Hę (%s)?"
+
+#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292
+#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538
+#: builtin/rebase.c:1963
+msgid "could not read index"
+msgstr "nie można odczytać indeksu"
+
+#: add-interactive.c:584 git-add--interactive.perl:269
+#: git-add--interactive.perl:294
+msgid "binary"
+msgstr "binarne"
+
+#: add-interactive.c:642 git-add--interactive.perl:278
+#: git-add--interactive.perl:332
+msgid "nothing"
+msgstr "nic"
+
+#: add-interactive.c:643 git-add--interactive.perl:314
+#: git-add--interactive.perl:329
+msgid "unchanged"
+msgstr "brak zmian"
+
+#: add-interactive.c:680 git-add--interactive.perl:641
+msgid "Update"
+msgstr "Aktualizacja"
+
+#: add-interactive.c:697 add-interactive.c:885
+#, c-format
+msgid "could not stage '%s'"
+msgstr "nie można przygotować „%s”"
+
+#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486
+msgid "could not write index"
+msgstr "nie można zapisać indeksu"
+
+#: add-interactive.c:706 git-add--interactive.perl:626
+#, c-format, perl-format
+msgid "updated %d path\n"
+msgid_plural "updated %d paths\n"
+msgstr[0] "zaktualizowano %d ścieżkę\n"
+msgstr[1] "zaktualizowano %d ścieżki\n"
+msgstr[2] "zaktualizowano %d ścieżek\n"
+
+#: add-interactive.c:724 git-add--interactive.perl:676
+#, c-format, perl-format
+msgid "note: %s is untracked now.\n"
+msgstr "uwaga: %s jest teraz nieśledzony.\n"
+
+#: add-interactive.c:729 apply.c:4125 builtin/checkout.c:295
+#: builtin/reset.c:145
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr "make_cache_entry nie powiodło się na ścieżce „%s”"
+
+# odwoływanie / wycofywanie
+#: add-interactive.c:759 git-add--interactive.perl:653
+msgid "Revert"
+msgstr "Odwracanie"
+
+#: add-interactive.c:775
+msgid "Could not parse HEAD^{tree}"
+msgstr "Nie można przetworzyć HEAD^{tree}"
+
+#: add-interactive.c:813 git-add--interactive.perl:629
+#, c-format, perl-format
+msgid "reverted %d path\n"
+msgid_plural "reverted %d paths\n"
+msgstr[0] "odwrócono %d ścieżkę\n"
+msgstr[1] "odwrócono %d ścieżki\n"
+msgstr[2] "odwrócono %d ścieżek\n"
+
+#: add-interactive.c:864 git-add--interactive.perl:693
+#, c-format
+msgid "No untracked files.\n"
+msgstr "Brak nieśledzonych plików.\n"
+
+#: add-interactive.c:868 git-add--interactive.perl:687
+msgid "Add untracked"
+msgstr "Dodaj nieśledzone"
+
+#: add-interactive.c:895 git-add--interactive.perl:623
+#, c-format, perl-format
+msgid "added %d path\n"
+msgid_plural "added %d paths\n"
+msgstr[0] "dodano %d ścieżkę\n"
+msgstr[1] "dodano %d ścieżki\n"
+msgstr[2] "dodano %d ścieżek\n"
+
+#: add-interactive.c:925
+#, c-format
+msgid "ignoring unmerged: %s"
+msgstr "pomijanie niescalonego: %s"
+
+#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369
+#, c-format
+msgid "Only binary files changed.\n"
+msgstr "Zmiany tylko w plikach binarnych.\n"
+
+#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371
+#, c-format
+msgid "No changes.\n"
+msgstr "Brak zmian.\n"
+
+#: add-interactive.c:943 git-add--interactive.perl:1379
+msgid "Patch update"
+msgstr "Aktualizacja łatki"
+
+#: add-interactive.c:982 git-add--interactive.perl:1792
+msgid "Review diff"
+msgstr "Przejrzyj zmiany"
+
+#: add-interactive.c:1010
+msgid "show paths with changes"
+msgstr "pokaż ścieżkę ze zmianami"
+
+#: add-interactive.c:1012
+msgid "add working tree state to the staged set of changes"
+msgstr "dodaj stan drzewa roboczego do przygotowanego zestawu zmian"
+
+#: add-interactive.c:1014
+msgid "revert staged set of changes back to the HEAD version"
+msgstr "przywróć przygotowany zestaw zmian do wersji HEAD"
+
+#: add-interactive.c:1016
+msgid "pick hunks and update selectively"
+msgstr "wybierz skrawki i zaktualizuj wybiórczo"
+
+#: add-interactive.c:1018
+msgid "view diff between HEAD and index"
+msgstr "wyświetl różnice między HEAD i indeksem"
+
+#: add-interactive.c:1020
+msgid "add contents of untracked files to the staged set of changes"
+msgstr "dodaj zawartość nieśledzonych plików do przygotowanego zestawu zmian"
+
+#: add-interactive.c:1028 add-interactive.c:1077
+msgid "Prompt help:"
+msgstr "Pomoc do zachęty:"
+
+#: add-interactive.c:1030
+msgid "select a single item"
+msgstr "wybierz pojedynczy element"
+
+#: add-interactive.c:1032
+msgid "select a range of items"
+msgstr "wybierz zakres elementów"
+
+#: add-interactive.c:1034
+msgid "select multiple ranges"
+msgstr "wybierz wiele zakresów"
+
+#: add-interactive.c:1036 add-interactive.c:1081
+msgid "select item based on unique prefix"
+msgstr "wybierz element na podstawie jednoznacznego początku"
+
+#: add-interactive.c:1038
+msgid "unselect specified items"
+msgstr "odznacz podane elementy"
+
+#: add-interactive.c:1040
+msgid "choose all items"
+msgstr "wybierz wszystkie elementy"
+
+#: add-interactive.c:1042
+msgid "(empty) finish selecting"
+msgstr "(puste) zakończ zaznaczanie"
+
+#: add-interactive.c:1079
+msgid "select a numbered item"
+msgstr "wybierz kolejny element"
+
+#: add-interactive.c:1083
+msgid "(empty) select nothing"
+msgstr "(puste) nic nie wybieraj"
+
+#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
+msgid "*** Commands ***"
+msgstr "*** Polecenia ***"
+
+#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
+msgid "What now"
+msgstr "Co teraz"
+
+#: add-interactive.c:1144 git-add--interactive.perl:213
+msgid "staged"
+msgstr "przygotowane"
+
+#: add-interactive.c:1144 git-add--interactive.perl:213
+msgid "unstaged"
+msgstr "nieprzygotowane"
+
+#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257
+#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124
+#: builtin/fetch.c:150 builtin/merge.c:285 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 "ścieżka"
+
+#: add-interactive.c:1151
+msgid "could not refresh index"
+msgstr "nie można odświeżyć indeksu"
+
+#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803
+#, c-format
+msgid "Bye.\n"
+msgstr "Do zobaczenia.\n"
+
+#: add-patch.c:34 git-add--interactive.perl:1431
+#, c-format, perl-format
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
+msgstr "Przygotować zmianę trybu [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:35 git-add--interactive.perl:1432
+#, c-format, perl-format
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
+msgstr "Przygotować usunięcie [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:36 git-add--interactive.perl:1433
+#, c-format, perl-format
+msgid "Stage addition [y,n,q,a,d%s,?]? "
+msgstr "Przygotować dodanie [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:37 git-add--interactive.perl:1434
+#, c-format, perl-format
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Przygotować ten skrawek [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 ""
+"Jeśli łatka stosuje się gładko, zmieniony skrawek zostanie natychmiast "
+"oznaczony do przygotowania."
+
+#: 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 - przygotuj ten skrawek\n"
+"n - nie przygotowuj tego skrawka\n"
+"q - wyjdź; nie przygotowuj tego skrawka, ani żadnych kolejnych\n"
+"a - przygotuj ten skrawek i wszystkie kolejne w tym pliku\n"
+"d - nie przygotowuj tego skrawka ani żadnych kolejnych w tym pliku\n"
+
+#: add-patch.c:56 git-add--interactive.perl:1437
+#, c-format, perl-format
+msgid "Stash mode change [y,n,q,a,d%s,?]? "
+msgstr "Dodać zmianę trybu do schowka [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:57 git-add--interactive.perl:1438
+#, c-format, perl-format
+msgid "Stash deletion [y,n,q,a,d%s,?]? "
+msgstr "Dodać usunięcie do schowka [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:58 git-add--interactive.perl:1439
+#, c-format, perl-format
+msgid "Stash addition [y,n,q,a,d%s,?]? "
+msgstr "Dodać dodanie do schowka [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:59 git-add--interactive.perl:1440
+#, c-format, perl-format
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
+msgstr "Dodać ten skrawek do schowka [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 ""
+"Jeśli łatka stosuje się gładko, zmieniony skrawek zostanie natychmiast "
+"oznaczony do dodania do schowka."
+
+#: 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 - dodaj ten skrawek do schowka\n"
+"n - nie dodawaj tego skrawka do schowka\n"
+"q - wyjdź; nie dodawaj tego skrawka, ani żadnych kolejnych\n"
+"a - dodaj ten skrawek i wszystkie kolejne w tym pliku\n"
+"d - nie dodawaj tego skrawka ani żadnych kolejnych w tym pliku\n"
+
+#: add-patch.c:80 git-add--interactive.perl:1443
+#, c-format, perl-format
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
+msgstr "Wycofać zmianę trybu [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:81 git-add--interactive.perl:1444
+#, c-format, perl-format
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
+msgstr "Wycofać usunięcie [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:82 git-add--interactive.perl:1445
+#, c-format, perl-format
+msgid "Unstage addition [y,n,q,a,d%s,?]? "
+msgstr "Wycofać dodanie [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:83 git-add--interactive.perl:1446
+#, c-format, perl-format
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Wycofać ten skrawek [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 ""
+"Jeśli łatka stosuje się gładko, zmieniony skrawek zostanie natychmiast "
+"oznaczony do wycofania."
+
+#: 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 - wycofaj ten skrawek\n"
+"n - nie wycofuj tego skrawka\n"
+"q - wyjdź; nie wycofuj tego skrawka, ani żadnych kolejnych\n"
+"a - wycofaj ten skrawek i wszystkie kolejne w tym pliku\n"
+"d - nie wycofuj tego skrawka ani żadnych kolejnych w tym pliku\n"
+
+#: add-patch.c:103 git-add--interactive.perl:1449
+#, c-format, perl-format
+msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
+msgstr "Zastosować zmianę trybu do indeksu [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:104 git-add--interactive.perl:1450
+#, c-format, perl-format
+msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
+msgstr "Zastosować usunięcie do indeksu [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:105 git-add--interactive.perl:1451
+#, c-format, perl-format
+msgid "Apply addition to index [y,n,q,a,d%s,?]? "
+msgstr "Zastosować dodanie do indeksu [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:106 git-add--interactive.perl:1452
+#, c-format, perl-format
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
+msgstr "Zastosować ten skrawek do indeksu [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 ""
+"Jeśli łatka stosuje się gładko, zmieniony skrawek zostanie natychmiast "
+"oznaczony do zastosowania."
+
+#: 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 - zastosuj ten skrawek do indeksu\n"
+"n - nie stosuj tego skrawka do indeksu\n"
+"q - wyjdź; nie stosuj tego skrawka, ani żadnych kolejnych\n"
+"a - zastosuj ten skrawek i wszystkie kolejne w tym pliku\n"
+"d - nie stosuj tego skrawka ani żadnych kolejnych w tym pliku\n"
+
+#: add-patch.c:126 git-add--interactive.perl:1455
+#: git-add--interactive.perl:1473
+#, c-format, perl-format
+msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
+msgstr "Odrzucić zmianę trybu z drzewa roboczego [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:127 git-add--interactive.perl:1456
+#: git-add--interactive.perl:1474
+#, c-format, perl-format
+msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
+msgstr "Odrzucić usunięcie z drzewa roboczego [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:128 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
+#, c-format, perl-format
+msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
+msgstr "Odrzucić dodanie z drzewa roboczego [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:129 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
+#, c-format, perl-format
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
+msgstr "Odrzucić ten skrawek z drzewa roboczego [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 ""
+"Jeśli łatka stosuje się gładko, zmieniony skrawek zostanie natychmiast "
+"oznaczony do odrzucenia."
+
+#: 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 - odrzuć ten skrawek z drzewa roboczego\n"
+"n - nie odrzucaj tego skrawka z drzewa roboczego\n"
+"q - wyjdź; nie odrzucaj tego skrawka, ani żadnych pozostałych\n"
+"a - odrzuć ten skrawek i wszystkie kolejne w tym pliku\n"
+"d - nie odrzucaj tego skrawka ani żadnych kolejnych w tym pliku\n"
+
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#, c-format, perl-format
+msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Odrzucić zmianę trybu z indeksu i drzewa roboczego [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
+#, c-format, perl-format
+msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Odrzucić usunięcie z indeksu i drzewa roboczego [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#, c-format, perl-format
+msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Odrzucić dodanie z indeksu i drzewa roboczego [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
+#, c-format, perl-format
+msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Odrzucić ten skrawek z indeksu i drzewa roboczego [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 - odrzuć ten skrawek z indeksu i drzewa roboczego\n"
+"n - nie odrzucaj tego skrawka z indeksu i drzewa roboczego\n"
+"q - wyjdź; nie odrzucaj tego skrawka, ani żadnych pozostałych\n"
+"a - odrzuć ten skrawek i wszystkie kolejne w tym pliku\n"
+"d - nie odrzucaj tego skrawka ani żadnych kolejnych w tym pliku\n"
+
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
+#, c-format, perl-format
+msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Zastosować zmianę trybu do indeksu i drzewa roboczego [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
+#, c-format, perl-format
+msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Zastosować usunięcie do indeksu i drzewa roboczego [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#, c-format, perl-format
+msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Zastosować dodanie do indeksu i drzewa roboczego [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
+#, c-format, perl-format
+msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Zastosować ten skrawek do indeksu i drzewa roboczego [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 - zastosuj ten skrawek do indeksu i drzewa roboczego\n"
+"n - nie stosuj tego skrawka do indeksu i drzewa roboczego\n"
+"q - wyjdź; nie stosuj tego skrawka, ani żadnych kolejnych\n"
+"a - zastosuj ten skrawek i wszystkie kolejne w tym pliku\n"
+"d - nie stosuj tego skrawka ani żadnych kolejnych w tym pliku\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 - zastosuj ten skrawek do drzewa roboczego\n"
+"n - nie stosuj tego skrawka do drzewa roboczego\n"
+"q - wyjdź; nie stosuj tego skrawka, ani żadnych kolejnych\n"
+"a - zastosuj ten skrawek i wszystkie kolejne w tym pliku\n"
+"d - nie stosuj tego skrawka ani żadnych kolejnych w tym pliku\n"
+
+#: add-patch.c:342
+#, c-format
+msgid "could not parse hunk header '%.*s'"
+msgstr "nie można przetworzyć nagłówka skrawka „%.*s”"
+
+#: add-patch.c:361 add-patch.c:365
+#, c-format
+msgid "could not parse colored hunk header '%.*s'"
+msgstr "nie można przetworzyć nagłówka kolorowego skrawka „%.*s”"
+
+#: add-patch.c:419
+msgid "could not parse diff"
+msgstr "nie można przetworzyć różnic"
+
+#: add-patch.c:438
+msgid "could not parse colored diff"
+msgstr "nie można przetworzyć kolorowych różnic"
+
+#: add-patch.c:452
+#, c-format
+msgid "failed to run '%s'"
+msgstr "nie można wykonać „%s”"
+
+#: add-patch.c:611
+msgid "mismatched output from interactive.diffFilter"
+msgstr "błędne wyjście z interactive.diffFilter"
+
+#: add-patch.c:612
+msgid ""
+"Your filter must maintain a one-to-one correspondence\n"
+"between its input and output lines."
+msgstr ""
+"Twój filtr musi zachować odpowiedniość jeden do jednego\n"
+"między wierszami z wejścia i wyjścia."
+
+#: add-patch.c:790
+#, c-format
+msgid ""
+"expected context line #%d in\n"
+"%.*s"
+msgstr ""
+"oczekiwano wiersza kontekstu nr %d w\n"
+"%.*s"
+
+#: add-patch.c:805
+#, c-format
+msgid ""
+"hunks do not overlap:\n"
+"%.*s\n"
+"\tdoes not end with:\n"
+"%.*s"
+msgstr ""
+"skrawki się nie nachodzą:\n"
+"%.*s\n"
+"\tnie kończy się na:\n"
+"%.*s"
+
+#: add-patch.c:1081 git-add--interactive.perl:1115
+msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
+msgstr "Tryb ręcznej edycji skrawka — zobacz szybki przewodnik na dole.\n"
+
+#: add-patch.c:1085
+#, 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"
+"Aby usunąć wiersze „%c”, zmień je w wiersze „ ” (kontekstu).\n"
+"Aby usunąć wiersze „%c”, usuń je.\n"
+"Wiersze zaczynające się od %c zostaną usunięte.\n"
+
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
+#: add-patch.c:1099 git-add--interactive.perl:1129
+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 ""
+"Jeśli nie stosuje się gładko, nadarzy się jeszcze szansa, żeby ją\n"
+"zmienić. Jeśli wszystkie wiersze skrawka zostaną usunięte, edycja\n"
+"będzie przerwana, a skrawek niezmieniony.\n"
+
+#: add-patch.c:1132
+msgid "could not parse hunk header"
+msgstr "nie można przetworzyć nagłówka skrawka"
+
+#: add-patch.c:1177
+msgid "'git apply --cached' failed"
+msgstr "„git apply --cached” nie powiodło się"
+
+#. 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:1246 git-add--interactive.perl:1242
+msgid ""
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+msgstr ""
+"Zmieniony skrawek się nie stosuje. Edytować ponownie (odpowiedź „nie” go "
+"porzuci!) [y/n]? "
+
+#: add-patch.c:1289
+msgid "The selected hunks do not apply to the index!"
+msgstr "Wybrane skrawki nie stosują się do indeksu!"
+
+#: add-patch.c:1290 git-add--interactive.perl:1346
+msgid "Apply them to the worktree anyway? "
+msgstr "Zastosować je do drzewa roboczego mimo to? "
+
+#: add-patch.c:1297 git-add--interactive.perl:1349
+msgid "Nothing was applied.\n"
+msgstr "Nic nie zastosowano.\n"
+
+#: add-patch.c:1354
+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 - pozostaw ten skrawek nierozstrzygniętym, zobacz następny "
+"nierozstrzygnięty skrawek\n"
+"J - pozostaw ten skrawek nierozstrzygniętym, zobacz następny skrawek\n"
+"k - pozostaw ten skrawek nierozstrzygniętym, zobacz poprzedni "
+"nierozstrzygnięty skrawek\n"
+"K - pozostaw ten skrawek nierozstrzygniętym, zobacz poprzedni skrawek\n"
+"g - wybierz skrawek, to którego przejść\n"
+"/ - wyszukaj skrawek pasujący do podanego wyrażenia regularnego\n"
+"s - podziel ten skrawek na mniejsze\n"
+"e - ręcznie zmień bieżący skrawek\n"
+"? - wypisz pomoc\n"
+
+#: add-patch.c:1516 add-patch.c:1526
+msgid "No previous hunk"
+msgstr "Nie ma poprzedniego skrawka"
+
+#: add-patch.c:1521 add-patch.c:1531
+msgid "No next hunk"
+msgstr "Nie ma następnego skrawka"
+
+#: add-patch.c:1537
+msgid "No other hunks to goto"
+msgstr "Nie ma innych skrawków do przejścia"
+
+#: add-patch.c:1548 git-add--interactive.perl:1606
+msgid "go to which hunk (<ret> to see more)? "
+msgstr "przejść do którego skrawka (<enter> aby zobaczyć więcej)? "
+
+#: add-patch.c:1549 git-add--interactive.perl:1608
+msgid "go to which hunk? "
+msgstr "przejść do którego skrawka? "
+
+#: add-patch.c:1560
+#, c-format
+msgid "Invalid number: '%s'"
+msgstr "Nieprawidłowa liczba: „%s”"
+
+#: add-patch.c:1565
+#, c-format
+msgid "Sorry, only %d hunk available."
+msgid_plural "Sorry, only %d hunks available."
+msgstr[0] "Niestety dostępny jest tylko %d skrawek."
+msgstr[1] "Niestety dostępne są tylko %d skrawki."
+msgstr[2] "Niestety dostępnych jest tylko %d skrawków."
+
+#: add-patch.c:1574
+msgid "No other hunks to search"
+msgstr "Nie ma innych skrawków do wyszukania"
+
+#: add-patch.c:1580 git-add--interactive.perl:1661
+msgid "search for regex? "
+msgstr "wyszukaj wyrażenie regularne? "
+
+#: add-patch.c:1595
+#, c-format
+msgid "Malformed search regexp %s: %s"
+msgstr "Nieprawidłowe wyrażenie regularne %s: %s"
+
+#: add-patch.c:1612
+msgid "No hunk matches the given pattern"
+msgstr "Żaden skrawek nie pasuje do podanego wzorca"
+
+#: add-patch.c:1619
+msgid "Sorry, cannot split this hunk"
+msgstr "Niestety nie można podzielić tego skrawka"
+
+#: add-patch.c:1623
+#, c-format
+msgid "Split into %d hunks."
+msgstr "Podzielono na %d skrawków."
+
+#: add-patch.c:1627
+msgid "Sorry, cannot edit this hunk"
+msgstr "Niestety nie można zmienić tego skrawka"
+
+#: add-patch.c:1679
+msgid "'git apply' failed"
+msgstr "„git apply” nie powiodło się"
+
+#: advice.c:143
+#, c-format
+msgid ""
+"\n"
+"Disable this message with \"git config advice.%s false\""
+msgstr ""
+"\n"
+"Wyłącz ten komunikat przez „git config advice.%s false”"
+
+#: advice.c:159
+#, c-format
+msgid "%shint: %.*s%s\n"
+msgstr "%spodpowiedź: %.*s%s\n"
+
+#: advice.c:250
+msgid "Cherry-picking is not possible because you have unmerged files."
+msgstr "Dobieranie nie jest możliwe, ponieważ istnieją niescalone pliki."
+
+#: advice.c:252
+msgid "Committing is not possible because you have unmerged files."
+msgstr "Składanie nie jest możliwe, ponieważ istnieją niescalone pliki."
+
+#: advice.c:254
+msgid "Merging is not possible because you have unmerged files."
+msgstr "Scalanie jest możliwe, ponieważ istnieją niescalone pliki."
+
+#: advice.c:256
+msgid "Pulling is not possible because you have unmerged files."
+msgstr "Zaciąganie jest możliwe, ponieważ istnieją niescalone pliki."
+
+#: advice.c:258
+msgid "Reverting is not possible because you have unmerged files."
+msgstr "Odwracanie jest możliwe, ponieważ istnieją niescalone pliki."
+
+#: advice.c:260
+#, c-format
+msgid "It is not possible to %s because you have unmerged files."
+msgstr "Nie można wykonać %s, ponieważ istnieją niescalone pliki."
+
+#: advice.c:268
+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 ""
+"Napraw je w drzewie roboczym, i użyj odpowiednio „git add/rm <plik>”,\n"
+"aby oznaczyć rozwiązanie i złożyć zapis."
+
+#: advice.c:276
+msgid "Exiting because of an unresolved conflict."
+msgstr "Wyjście z powodu nierozwiązanego konfliktu."
+
+#: advice.c:281 builtin/merge.c:1370
+msgid "You have not concluded your merge (MERGE_HEAD exists)."
+msgstr "Nie zwieńczono scalania (MERGE_HEAD istnieje)."
+
+#: advice.c:283
+msgid "Please, commit your changes before merging."
+msgstr "Złóż swoje zmiany przez scalaniem."
+
+#: advice.c:284
+msgid "Exiting because of unfinished merge."
+msgstr "Wyjście z powodu niedokończonego scalania."
+
+#: advice.c:290
+#, 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 ""
+"Uwaga: przełączanie na „%s”.\n"
+"\n"
+"Jesteś w stanie „odłączonego HEAD”. Możesz się rozglądać, tworzyć\n"
+"eksperymentalne zmiany i je składać, i możesz odrzucić wszystkie zapisy,\n"
+"które złożysz w tym stanie, bez wpływu na żadną gałąź, przełączając z "
+"powrotem na jakąś gałąź.\n"
+"\n"
+"Jeśli chcesz utworzyć nową gałąź, która zachowa zapisy, które złożysz,\n"
+"możesz to zrobić (teraz lub później) używając -c w ponownym poleceniu "
+"przełączenia.\n"
+"Przykład:\n"
+"\n"
+" git switch -c <nazwa-nowej-gałęzi>\n"
+"\n"
+"Lub cofnąć tę operację przez:\n"
+"\n"
+" git switch -\n"
+"\n"
+"Wyłącz tę poradę ustawiając zmienną konfiguracji advice.detachedHead na "
+"false\n"
+"\n"
+
+#: alias.c:50
+msgid "cmdline ends with \\"
+msgstr "wiersz poleceń kończy się na \\"
+
+#: alias.c:51
+msgid "unclosed quote"
+msgstr "niezamknięty cudzysłów"
+
+#: apply.c:69
+#, c-format
+msgid "unrecognized whitespace option '%s'"
+msgstr "Nierozpoznana opcja z białych znaków: „%s”"
+
+#: apply.c:85
+#, c-format
+msgid "unrecognized whitespace ignore option '%s'"
+msgstr "nierozpoznana opcja ignorowania z białych znaków: „%s”"
+
+#: apply.c:135
+msgid "--reject and --3way cannot be used together."
+msgstr "--reject i --3way wykluczają się."
+
+#: apply.c:137
+msgid "--cached and --3way cannot be used together."
+msgstr "--cached i --3way wykluczają się."
+
+#: apply.c:140
+msgid "--3way outside a repository"
+msgstr "--3way poza repozytorium"
+
+#: apply.c:151
+msgid "--index outside a repository"
+msgstr "--index poza repozytorium"
+
+#: apply.c:154
+msgid "--cached outside a repository"
+msgstr "--cached poza repozytorium"
+
+#: apply.c:801
+#, c-format
+msgid "Cannot prepare timestamp regexp %s"
+msgstr "Nie można przygotować wyrażenia regularnego znacznika czasu %s"
+
+#: apply.c:810
+#, c-format
+msgid "regexec returned %d for input: %s"
+msgstr "regexec zwrócił %d dla wejścia: %s"
+
+#: apply.c:884
+#, c-format
+msgid "unable to find filename in patch at line %d"
+msgstr "nie znaleziono nazwy pliku w łatce w wierszu %d"
+
+#: apply.c:922
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
+msgstr ""
+"git apply: zły git-diff — oczekiwano /dev/null, znaleziono %s w wierszu %d"
+
+#: apply.c:928
+#, c-format
+msgid "git apply: bad git-diff - inconsistent new filename on line %d"
+msgstr "git apply: zły git-diff — niespójna nowa nazwa pliku w wierszu %d"
+
+#: apply.c:929
+#, c-format
+msgid "git apply: bad git-diff - inconsistent old filename on line %d"
+msgstr "git apply: zły git-diff — niespójna stara nazwa pliku w wierszu %d"
+
+#: apply.c:934
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null on line %d"
+msgstr "git apply: zły git-diff — oczekiwano /dev/null w wierszu %d"
+
+#: apply.c:963
+#, c-format
+msgid "invalid mode on line %d: %s"
+msgstr "błędny tryb w wierszu %d: %s"
+
+#: apply.c:1282
+#, c-format
+msgid "inconsistent header lines %d and %d"
+msgstr "niespójne wiersze nagłówka %d i %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] ""
+"w nagłówku git diff brakuje informacji o nazwach plików po usunięciu %d "
+"wiodącego komponentu ścieżki (wiersz %d)"
+msgstr[1] ""
+"w nagłówku git diff brakuje informacji o nazwach plików po usunięciu %d "
+"wiodących komponentów ścieżki (wiersz %d)"
+msgstr[2] ""
+"w nagłówku git diff brakuje informacji o nazwach plików po usunięciu %d "
+"wiodących komponentów ścieżki (wiersz %d)"
+
+#: apply.c:1385
+#, c-format
+msgid "git diff header lacks filename information (line %d)"
+msgstr "w nagłówku git diff brakuje informacji o nazwie pliku (wiersz %d)"
+
+#: apply.c:1481
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "przeliczanie: nieoczekiwany wiersz: %.*s"
+
+#: apply.c:1550
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "fragment łatki bez nagłówka w wierszu %d: %.*s"
+
+#: apply.c:1753
+msgid "new file depends on old contents"
+msgstr "nowy plik zależy od starej zawartości"
+
+#: apply.c:1755
+msgid "deleted file still has contents"
+msgstr "usunięty plik nadal ma zawartość"
+
+#: apply.c:1789
+#, c-format
+msgid "corrupt patch at line %d"
+msgstr "uszkodzona łatka w wierszu %d"
+
+#: apply.c:1826
+#, c-format
+msgid "new file %s depends on old contents"
+msgstr "nowy plik %s zależy od starej zawartości"
+
+#: apply.c:1828
+#, c-format
+msgid "deleted file %s still has contents"
+msgstr "usunięty plik %s nadal ma zawartość"
+
+#: apply.c:1831
+#, c-format
+msgid "** warning: file %s becomes empty but is not deleted"
+msgstr "** ostrzeżenie: plik %s staje się pusty, ale nie jest usunięty"
+
+#: apply.c:1978
+#, c-format
+msgid "corrupt binary patch at line %d: %.*s"
+msgstr "uszkodzona łatka binarna w wierszu %d: %.*s"
+
+#: apply.c:2015
+#, c-format
+msgid "unrecognized binary patch at line %d"
+msgstr "nierozpoznana łatka binarna w wierszu %d"
+
+#: apply.c:2177
+#, c-format
+msgid "patch with only garbage at line %d"
+msgstr "łatka z samymi śmieciami w wierszu %d"
+
+#: apply.c:2263
+#, c-format
+msgid "unable to read symlink %s"
+msgstr "nie można odczytać nawiązania symbolicznego %s"
+
+#: apply.c:2267
+#, c-format
+msgid "unable to open or read %s"
+msgstr "nie można otworzyć lub odczytać %s"
+
+#: apply.c:2936
+#, c-format
+msgid "invalid start of line: '%c'"
+msgstr "nieprawidłowy początek wiersza: „%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] "Skrawek nr %d dopasował się w %d (przesunięcie: %d wiersz)."
+msgstr[1] "Skrawek nr %d dopasował się w %d (przesunięcie: %d wiersze)."
+msgstr[2] "Skrawek nr %d dopasował się w %d (przesunięcie: %d wierszy)."
+
+#: apply.c:3069
+#, c-format
+msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
+msgstr "Kontekst zmniejszony do (%ld/%ld), aby zastosować fragment w %d"
+
+#: apply.c:3075
+#, c-format
+msgid ""
+"while searching for:\n"
+"%.*s"
+msgstr ""
+"podczas wyszukiwania:\n"
+"%.*s"
+
+#: apply.c:3097
+#, c-format
+msgid "missing binary patch data for '%s'"
+msgstr "brakujące dane łatki binarnej w „%s”"
+
+#: apply.c:3105
+#, c-format
+msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
+msgstr ""
+"nie można odwrotnie zastosować łatki binarnej bez odwrotnego skrawka do „%s”"
+
+#: apply.c:3152
+#, c-format
+msgid "cannot apply binary patch to '%s' without full index line"
+msgstr ""
+"nie można zastosować łatki binarnej do „%s” bez pełnego wiersza indeksu"
+
+#: apply.c:3163
+#, c-format
+msgid ""
+"the patch applies to '%s' (%s), which does not match the current contents."
+msgstr ""
+"łatka stosuje się do „%s” (%s), które nie pasuje do bieżącej zawartości."
+
+#: apply.c:3171
+#, c-format
+msgid "the patch applies to an empty '%s' but it is not empty"
+msgstr "łatka stosuje się do pustego „%s”, ale nie jest pusty"
+
+#: apply.c:3189
+#, c-format
+msgid "the necessary postimage %s for '%s' cannot be read"
+msgstr "nie można odczytać potrzebnego obraz postimage %s dla „%s”"
+
+#: apply.c:3202
+#, c-format
+msgid "binary patch does not apply to '%s'"
+msgstr "łatka binarna nie stosuje się do „%s”"
+
+#: apply.c:3209
+#, c-format
+msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
+msgstr ""
+"łatka binarna do „%s” daje nieprawidłowy wynik (oczekiwane %s, daje %s)"
+
+#: apply.c:3230
+#, c-format
+msgid "patch failed: %s:%ld"
+msgstr "łatanie nie powiodło się: %s:%ld"
+
+#: apply.c:3353
+#, c-format
+msgid "cannot checkout %s"
+msgstr "nie można wybrać %s"
+
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 pack-revindex.c:213
+#: setup.c:308
+#, c-format
+msgid "failed to read %s"
+msgstr "nie można odczytać %s"
+
+#: apply.c:3413
+#, c-format
+msgid "reading from '%s' beyond a symbolic link"
+msgstr "czytanie z „%s” przechodzącego przez dowiązanie"
+
+#: apply.c:3442 apply.c:3685
+#, c-format
+msgid "path %s has been renamed/deleted"
+msgstr "ścieżka %s została przeniesiona/usunięta"
+
+#: apply.c:3528 apply.c:3700
+#, c-format
+msgid "%s: does not exist in index"
+msgstr "%s: brak w indeksie"
+
+#: apply.c:3537 apply.c:3708 apply.c:3952
+#, c-format
+msgid "%s: does not match index"
+msgstr "%s: nie pasuje do indeksu"
+
+#: apply.c:3572
+msgid "repository lacks the necessary blob to fall back on 3-way merge."
+msgstr ""
+"w repozytorium brakuje blobu, potrzebnego żeby uciec się do trójstronnego "
+"scalania."
+
+#: apply.c:3575
+#, c-format
+msgid "Falling back to three-way merge...\n"
+msgstr "Uciekanie się do trójstronnego scalania...\n"
+
+#: apply.c:3591 apply.c:3595
+#, c-format
+msgid "cannot read the current contents of '%s'"
+msgstr "nie można odczytać bieżącej zawartości „%s”"
+
+#: apply.c:3607
+#, c-format
+msgid "Failed to fall back on three-way merge...\n"
+msgstr "Nie można uciec się do trójstronnego scalania...\n"
+
+#: apply.c:3621
+#, c-format
+msgid "Applied patch to '%s' with conflicts.\n"
+msgstr "Zastosowano łatkę do „%s” z konfliktami\n"
+
+#: apply.c:3626
+#, c-format
+msgid "Applied patch to '%s' cleanly.\n"
+msgstr "Gładko zastosowano łatkę do „%s”.\n"
+
+#: apply.c:3652
+msgid "removal patch leaves file contents"
+msgstr "łatka usuwająca pozostawia zawartość pliku"
+
+#: apply.c:3725
+#, c-format
+msgid "%s: wrong type"
+msgstr "%s: nieprawidłowy rodzaj"
+
+#: apply.c:3727
+#, c-format
+msgid "%s has type %o, expected %o"
+msgstr "%s jest rodzaju %o, oczekiwano %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 "nieprawidłowa ścieżka „%s”"
+
+#: apply.c:3950
+#, c-format
+msgid "%s: already exists in index"
+msgstr "%s: już widnieje w indeksie"
+
+#: apply.c:3954
+#, c-format
+msgid "%s: already exists in working directory"
+msgstr "%s: już istnieje w katalogu roboczym"
+
+#: apply.c:3974
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o)"
+msgstr "nowy tryb (%o) %s nie pasuje do starego trybu (%o)"
+
+#: apply.c:3979
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o) of %s"
+msgstr "nowy tryb (%o) %s nie pasuje do starego trybu (%o) %s"
+
+#: apply.c:3999
+#, c-format
+msgid "affected file '%s' is beyond a symbolic link"
+msgstr "dotknięty plik „%s” jest pod dowiązaniem"
+
+#: apply.c:4003
+#, c-format
+msgid "%s: patch does not apply"
+msgstr "%s: łatka się nie stosuje"
+
+#: apply.c:4018
+#, c-format
+msgid "Checking patch %s..."
+msgstr "Sprawdzanie łatki %s..."
+
+#: apply.c:4110
+#, c-format
+msgid "sha1 information is lacking or useless for submodule %s"
+msgstr "brakuje informacji SHA-1 lub jest bezużyteczna w pod-module %s"
+
+#: apply.c:4117
+#, c-format
+msgid "mode change for %s, which is not in current HEAD"
+msgstr "zmiana trybu w %s, który nie jest w bieżącym HEAD"
+
+#: apply.c:4120
+#, c-format
+msgid "sha1 information is lacking or useless (%s)."
+msgstr "brakuje informacji SHA-1 lub jest bezużyteczna (%s)."
+
+#: apply.c:4129
+#, c-format
+msgid "could not add %s to temporary index"
+msgstr "nie można dodać %s do indeksu tymczasowego"
+
+#: apply.c:4139
+#, c-format
+msgid "could not write temporary index to %s"
+msgstr "nie można zapisać indeksu tymczasowego w %s"
+
+#: apply.c:4277
+#, c-format
+msgid "unable to remove %s from index"
+msgstr "nie można usunąć %s z indeksu"
+
+#: apply.c:4311
+#, c-format
+msgid "corrupt patch for submodule %s"
+msgstr "uszkodzona łatka pod-modułu %s"
+
+#: apply.c:4317
+#, c-format
+msgid "unable to stat newly created file '%s'"
+msgstr "nie można wykonać stat na nowo utworzonym pliku „%s”"
+
+#: apply.c:4325
+#, c-format
+msgid "unable to create backing store for newly created file %s"
+msgstr "nie można utworzyć wspierającego składu dla nowo utworzonego pliku %s"
+
+#: apply.c:4331 apply.c:4476
+#, c-format
+msgid "unable to add cache entry for %s"
+msgstr "nie można dodać %s do pamięci podręcznej"
+
+#: apply.c:4374 builtin/bisect--helper.c:523
+#, c-format
+msgid "failed to write to '%s'"
+msgstr "nie można pisać do „%s”"
+
+#: apply.c:4378
+#, c-format
+msgid "closing file '%s'"
+msgstr "zamykanie pliku „%s”"
+
+#: apply.c:4448
+#, c-format
+msgid "unable to write file '%s' mode %o"
+msgstr "nie można ustawić w pliku „%s” trybu %o"
+
+#: apply.c:4546
+#, c-format
+msgid "Applied patch %s cleanly."
+msgstr "Gładko zastosowano łatkę %s."
+
+#: apply.c:4554
+msgid "internal error"
+msgstr "wewnętrzny błąd"
+
+#: apply.c:4557
+#, c-format
+msgid "Applying patch %%s with %d reject..."
+msgid_plural "Applying patch %%s with %d rejects..."
+msgstr[0] "Stosowanie łatki %%s z %d odrzuceniem..."
+msgstr[1] "Stosowanie łatki %%s z %d odrzuceniami..."
+msgstr[2] "Stosowanie łatki %%s z %d odrzuceniami..."
+
+#: apply.c:4568
+#, c-format
+msgid "truncating .rej filename to %.*s.rej"
+msgstr "ucinanie nazwy pliku .rej do %.*s.rej"
+
+#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334
+#, c-format
+msgid "cannot open %s"
+msgstr "nie można otworzyć %s"
+
+#: apply.c:4590
+#, c-format
+msgid "Hunk #%d applied cleanly."
+msgstr "Skrawek nr %d gładko zastosowany."
+
+#: apply.c:4594
+#, c-format
+msgid "Rejected hunk #%d."
+msgstr "Odrzucono skrawek nr %d."
+
+#: apply.c:4718
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr "Pominięto łatkę „%s”."
+
+#: apply.c:4726
+msgid "unrecognized input"
+msgstr "nierozpoznawane wejście"
+
+#: apply.c:4746
+msgid "unable to read index file"
+msgstr "nie można odczytać pliku indeksu"
+
+#: apply.c:4903
+#, c-format
+msgid "can't open patch '%s': %s"
+msgstr "nie można otworzyć łatki „%s”: %s"
+
+#: apply.c:4930
+#, c-format
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] "zduszono %d błąd białych znaków"
+msgstr[1] "zduszono %d błędy białych znaków"
+msgstr[2] "zduszono %d błędów białych znaków"
+
+#: apply.c:4936 apply.c:4951
+#, c-format
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+msgstr[0] "%d wiersz dodaje błędy białych znaków."
+msgstr[1] "%d wiersze dodają błędy białych znaków."
+msgstr[2] "%d wierszy dodaje błędy białych znaków."
+
+#: apply.c:4944
+#, c-format
+msgid "%d line applied after fixing whitespace errors."
+msgid_plural "%d lines applied after fixing whitespace errors."
+msgstr[0] "Zastosowano %d wiersz po naprawieniu błędów białych znaków."
+msgstr[1] "Zastosowano %d wiersze po naprawieniu błędów białych znaków."
+msgstr[2] "Zastosowano %d wierszy po naprawieniu błędów białych znaków."
+
+#: apply.c:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406
+msgid "Unable to write new index file"
+msgstr "Nie można zapisać nowego pliku indeksu"
+
+#: apply.c:4988
+msgid "don't apply changes matching the given path"
+msgstr "nie stosuj zmian pasujących do podanej ścieżki"
+
+#: apply.c:4991
+msgid "apply changes matching the given path"
+msgstr "zastosuj zmiany pasujące do podanej ścieżki"
+
+#: apply.c:4993 builtin/am.c:2266
+msgid "num"
+msgstr "ile"
+
+#: apply.c:4994
+msgid "remove <num> leading slashes from traditional diff paths"
+msgstr "usuń <ile> początkowych ukośników z tradycyjnych ścieżek diff"
+
+#: apply.c:4997
+msgid "ignore additions made by the patch"
+msgstr "ignoruj wstawienia wykonywane przez łatkę"
+
+#: apply.c:4999
+msgid "instead of applying the patch, output diffstat for the input"
+msgstr "zamiast stosować łatkę, wypisz statystyki różnic dla wejścia"
+
+#: apply.c:5003
+msgid "show number of added and deleted lines in decimal notation"
+msgstr "pokazuj liczbę dodanych i usuniętych wierszy w systemie dziesiętnym"
+
+#: apply.c:5005
+msgid "instead of applying the patch, output a summary for the input"
+msgstr "zamiast stosować łatkę, wypisz podsumowanie dla wejścia"
+
+#: apply.c:5007
+msgid "instead of applying the patch, see if the patch is applicable"
+msgstr "zamiast stosować łatkę, zobacz, czy się stosuje"
+
+#: apply.c:5009
+msgid "make sure the patch is applicable to the current index"
+msgstr "upewnij się, że łatka ma zastosowanie do bieżącego indeksu"
+
+#: apply.c:5011
+msgid "mark new files with `git add --intent-to-add`"
+msgstr "oznacz nowe pliki przez „git add --intent-to-add”"
+
+#: apply.c:5013
+msgid "apply a patch without touching the working tree"
+msgstr "zastosuj łatkę bez dotykania drzewa roboczego"
+
+#: apply.c:5015
+msgid "accept a patch that touches outside the working area"
+msgstr "przyjmuj łatkę, która wychodzi poza obszar roboczy"
+
+#: apply.c:5018
+msgid "also apply the patch (use with --stat/--summary/--check)"
+msgstr "zastosuj też łatkę (do użycia z --stat/--summary/--check)"
+
+#: apply.c:5020
+msgid "attempt three-way merge if a patch does not apply"
+msgstr "spróbuj trójstronnego scalania, jeśli łatka się nie stosuje"
+
+#: apply.c:5022
+msgid "build a temporary index based on embedded index information"
+msgstr "zbuduj tymczasowy indeks oparty o wbudowane informacje indeksu"
+
+#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540
+msgid "paths are separated with NUL character"
+msgstr "ścieżki są rozdzielone znakiem NUL"
+
+#: apply.c:5027
+msgid "ensure at least <n> lines of context match"
+msgstr "zapewnij przynajmniej <n> wierszy dopasowanego kontekstu"
+
+#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
+#: builtin/pack-objects.c:3577 builtin/rebase.c:1352
+msgid "action"
+msgstr "działanie"
+
+#: apply.c:5029
+msgid "detect new or modified lines that have whitespace errors"
+msgstr "wykryj nowe i zmienione wiersze, które mają błędy białych znaków"
+
+#: apply.c:5032 apply.c:5035
+msgid "ignore changes in whitespace when finding context"
+msgstr "ignoruj zmiany w białych znakach przy znajdywaniu kontekstu"
+
+#: apply.c:5038
+msgid "apply the patch in reverse"
+msgstr "zastosuj łatkę na odwrót"
+
+#: apply.c:5040
+msgid "don't expect at least one line of context"
+msgstr "nie oczekuj przynajmniej jednego wiersza kontekstu"
+
+#: apply.c:5042
+msgid "leave the rejected hunks in corresponding *.rej files"
+msgstr "zostaw odrzucone skrawki w odpowiednich plikach *.rej"
+
+#: apply.c:5044
+msgid "allow overlapping hunks"
+msgstr "zezwól, by skrawki na siebie nachodziły"
+
+#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22
+#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757
+#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128
+msgid "be verbose"
+msgstr "więcej komunikatów"
+
+#: apply.c:5047
+msgid "tolerate incorrectly detected missing new-line at the end of file"
+msgstr ""
+"toleruj nieprawidłowo wykryte brakujące znaki końca wiersza na końcu pliku"
+
+#: apply.c:5050
+msgid "do not trust the line counts in the hunk headers"
+msgstr "nie ufaj liczbie wierszy w nagłówkach skrawków"
+
+#: apply.c:5052 builtin/am.c:2254
+msgid "root"
+msgstr "korzeń"
+
+#: apply.c:5053
+msgid "prepend <root> to all filenames"
+msgstr "dodaj <korzeń> przed wszystkimi nazwami plików"
+
+#: archive-tar.c:125 archive-zip.c:345
+#, c-format
+msgid "cannot stream blob %s"
+msgstr "nie można strumieniować blobu %s"
+
+#: archive-tar.c:265 archive-zip.c:358
+#, c-format
+msgid "unsupported file mode: 0%o (SHA1: %s)"
+msgstr "nieobsługiwany tryb pliku: 0%o (SHA-1: %s)"
+
+#: archive-tar.c:450
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr "nie można uruchomić filtra „%s”"
+
+#: archive-tar.c:453
+msgid "unable to redirect descriptor"
+msgstr "nie można przekierować deskryptora"
+
+#: archive-tar.c:460
+#, c-format
+msgid "'%s' filter reported error"
+msgstr "filtr „%s” zgłosił błąd"
+
+#: archive-zip.c:318
+#, c-format
+msgid "path is not valid UTF-8: %s"
+msgstr "ścieżka nie jest prawidłowym UTF-8: %s"
+
+#: archive-zip.c:322
+#, c-format
+msgid "path too long (%d chars, SHA1: %s): %s"
+msgstr "ścieżka za długa (%d znaków, SHA-1: %s): %s"
+
+#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247
+#, c-format
+msgid "deflate error (%d)"
+msgstr "błąd kompresji (%d)"
+
+#: archive-zip.c:603
+#, c-format
+msgid "timestamp too large for this system: %<PRIuMAX>"
+msgstr "znacznik czasu za duży na ten system: %<PRIuMAX>"
+
+#: archive.c:14
+msgid "git archive [<options>] <tree-ish> [<path>...]"
+msgstr "git archive [<opcje>] <drzewo> [<ścieżka>...]"
+
+#: 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 <repozytorium> [--exec <polecenie>] [<opcje>] <drzewo> "
+"[<ścieżka>...]"
+
+#: archive.c:17
+msgid "git archive --remote <repo> [--exec <cmd>] --list"
+msgstr "git archive --remote <repozytorium> [--exec <polecenie>] --list"
+
+#: archive.c:192
+#, c-format
+msgid "cannot read %s"
+msgstr "nie można odczytać %s"
+
+#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894
+#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786
+#: builtin/merge.c:1139
+#, c-format
+msgid "could not read '%s'"
+msgstr "nie można odczytać „%s”"
+
+#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315
+#, c-format
+msgid "pathspec '%s' did not match any files"
+msgstr "ścieżka „%s” nie pasuje do żadnych plików"
+
+#: archive.c:454
+#, c-format
+msgid "no such ref: %.*s"
+msgstr "nie ma takiej referencji: %*.s"
+
+#: archive.c:460
+#, c-format
+msgid "not a valid object name: %s"
+msgstr "nieprawidłowa nazwa obiektu: %s"
+
+#: archive.c:473
+#, c-format
+msgid "not a tree object: %s"
+msgstr "nie jest obiektem drzewa: %s"
+
+#: archive.c:485
+msgid "current working directory is untracked"
+msgstr "bieżący katalog roboczy jest nieśledzony"
+
+#: archive.c:526
+#, c-format
+msgid "File not found: %s"
+msgstr "Nie znaleziono pliku: %s"
+
+#: archive.c:528
+#, c-format
+msgid "Not a regular file: %s"
+msgstr "Nie jest zwykłym plikiem: %s"
+
+#: archive.c:555
+msgid "fmt"
+msgstr "fmt"
+
+#: archive.c:555
+msgid "archive format"
+msgstr "format archiwum"
+
+#: archive.c:556 builtin/log.c:1764
+msgid "prefix"
+msgstr "prefiks"
+
+#: archive.c:557
+msgid "prepend prefix to each pathname in the archive"
+msgstr "dodaj prefiks przed każdą ścieżką w archiwum"
+
+#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888
+#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
+#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
+#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105
+#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412
+#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190
+msgid "file"
+msgstr "plik"
+
+#: archive.c:559
+msgid "add untracked file to archive"
+msgstr "dodaj nieśledzony plik do archiwum"
+
+#: archive.c:562 builtin/archive.c:90
+msgid "write the archive to this file"
+msgstr "zapisz archiwum do tego pliku"
+
+#: archive.c:564
+msgid "read .gitattributes in working directory"
+msgstr "przeczytaj .gitattributes w katalogu roboczym"
+
+#: archive.c:565
+msgid "report archived files on stderr"
+msgstr "zgłaszaj zarchiwizowane pliki na standardowe wyjście diagnostyczne"
+
+#: archive.c:567
+msgid "set compression level"
+msgstr "ustaw stopień kompresji"
+
+#: archive.c:570
+msgid "list supported archive formats"
+msgstr "wypisz wspierane formaty archiwów"
+
+#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117
+#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
+msgid "repo"
+msgstr "repozytorium"
+
+#: archive.c:573 builtin/archive.c:92
+msgid "retrieve the archive from remote repository <repo>"
+msgstr "pobierz archiwum ze zdalnego <repozytorium>"
+
+#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714
+#: builtin/notes.c:498
+msgid "command"
+msgstr "polecenie"
+
+#: archive.c:575 builtin/archive.c:94
+msgid "path to the remote git-upload-archive command"
+msgstr "ścieżka do zdalnego polecenia git-upload-archive"
+
+#: archive.c:582
+msgid "Unexpected option --remote"
+msgstr "Nieoczekiwana opcja --remote"
+
+#: archive.c:584
+msgid "Option --exec can only be used together with --remote"
+msgstr "Opcja --exec może być użyta tylko z --remote"
+
+#: archive.c:586
+msgid "Unexpected option --output"
+msgstr "Nieoczekiwana opcja --output"
+
+#: archive.c:588
+msgid "Options --add-file and --remote cannot be used together"
+msgstr "Opcje --add-file i --remote się wykluczają"
+
+#: archive.c:610
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "Nieznany format archiwum „%s”"
+
+#: archive.c:619
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "Argument niewspierany w formacie „%s”: -%d"
+
+#: attr.c:202
+#, c-format
+msgid "%.*s is not a valid attribute name"
+msgstr "%*.s nie jest prawidłową nazwą atrybutu"
+
+#: attr.c:359
+#, c-format
+msgid "%s not allowed: %s:%d"
+msgstr "%s niedozwolone: %s:%d"
+
+#: attr.c:399
+msgid ""
+"Negative patterns are ignored in git attributes\n"
+"Use '\\!' for literal leading exclamation."
+msgstr ""
+"Negatywne wzorce są pomijane w atrybutach gita\n"
+"Użyj „\\!” dla dosłownego początkowego wykrzyknika."
+
+#: bisect.c:489
+#, c-format
+msgid "Badly quoted content in file '%s': %s"
+msgstr "Źle zacytowana zawartość w pliku „%s”: %s"
+
+#: bisect.c:699
+#, c-format
+msgid "We cannot bisect more!\n"
+msgstr "Nie można już przeszukiwać!\n"
+
+#: bisect.c:766
+#, c-format
+msgid "Not a valid commit name %s"
+msgstr "Nieprawidłowa nazwa zapisu %s"
+
+#: bisect.c:791
+#, c-format
+msgid ""
+"The merge base %s is bad.\n"
+"This means the bug has been fixed between %s and [%s].\n"
+msgstr ""
+"Podstawa scalania %s jest zła.\n"
+"To znaczy, że błąd naprawiono pomiędzy %s i [%s].\n"
+
+#: bisect.c:796
+#, c-format
+msgid ""
+"The merge base %s is new.\n"
+"The property has changed between %s and [%s].\n"
+msgstr ""
+"Podstawa scalenia %s jest nowa.\n"
+"Właściwość zmieniła się między %s i [%s].\n"
+
+#: bisect.c:801
+#, c-format
+msgid ""
+"The merge base %s is %s.\n"
+"This means the first '%s' commit is between %s and [%s].\n"
+msgstr ""
+"Podstawa scalania %s jest %s.\n"
+"To znaczy, że pierwszy zapis „%s” jest pomiędzy %s i [%s].\n"
+
+#: bisect.c:809
+#, 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 ""
+"Niektóre rewizje %s nie są przodkami rewizji %s.\n"
+"git bisect nie może w tym przypadku działać poprawnie.\n"
+"Może pomylono rewizje %s i %s?\n"
+
+#: bisect.c:822
+#, 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 ""
+"trzeba pominąć podstawę scalania pomiędzy %s i [%s].\n"
+"Nie możemy być więc pewni, że pierwszy zapis %s jest między %s i %s.\n"
+"Kontynuowanie mimo to."
+
+#: bisect.c:861
+#, c-format
+msgid "Bisecting: a merge base must be tested\n"
+msgstr "Przeszukiwanie: podstawa scalenia musi być sprawdzona\n"
+
+#: bisect.c:911
+#, c-format
+msgid "a %s revision is needed"
+msgstr "potrzebna jest rewizja %s"
+
+#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287
+#, c-format
+msgid "could not create file '%s'"
+msgstr "nie można utworzyć pliku „%s”"
+
+#: bisect.c:987 builtin/merge.c:153
+#, c-format
+msgid "could not read file '%s'"
+msgstr "nie można odczytać pliku „%s”"
+
+#: bisect.c:1027
+msgid "reading bisect refs failed"
+msgstr "nie można odczytać referencji przeszukiwania"
+
+#: bisect.c:1057
+#, c-format
+msgid "%s was both %s and %s\n"
+msgstr "%s był jednocześnie %s i %s\n"
+
+#: bisect.c:1066
+#, c-format
+msgid ""
+"No testable commit found.\n"
+"Maybe you started with bad path arguments?\n"
+msgstr ""
+"Nie znaleziono sprawdzalnego zapisu.\n"
+"Może zaczęto ze złymi argumentami ścieżek?\n"
+
+#: bisect.c:1095
+#, c-format
+msgid "(roughly %d step)"
+msgid_plural "(roughly %d steps)"
+msgstr[0] "(około %d krok)"
+msgstr[1] "(około %d kroki)"
+msgstr[2] "(około %d kroków)"
+
+#. TRANSLATORS: the last %s will be replaced with "(roughly %d
+#. steps)" translation.
+#.
+#: bisect.c:1101
+#, 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] "Przeszukiwanie: pozostała %d rewizja do sprawdzenia %s\n"
+msgstr[1] "Przeszukiwanie: pozostały %d rewizje do sprawdzenia %s\n"
+msgstr[2] "Przeszukiwanie: pozostało %d rewizji do sprawdzenia %s\n"
+
+#: blame.c:2777
+msgid "--contents and --reverse do not blend well."
+msgstr "--contents i --reverse się wykluczają."
+
+#: blame.c:2791
+msgid "cannot use --contents with final commit object name"
+msgstr "--contents i nazwa obiektu ostatniego zapisu wykluczają się"
+
+#: blame.c:2812
+msgid "--reverse and --first-parent together require specified latest commit"
+msgstr "--reverse i --first-parent razem wymagają podanego ostatniego zapisu"
+
+#: blame.c:2821 bundle.c:213 ref-filter.c:2202 remote.c:2041 sequencer.c:2146
+#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411
+#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335
+#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410
+#: builtin/shortlog.c:255
+msgid "revision walk setup failed"
+msgstr "nie udało się przygotować przejścia rewizji"
+
+#: blame.c:2839
+msgid ""
+"--reverse --first-parent together require range along first-parent chain"
+msgstr ""
+"--reverse --first-parent razem wymagają zakresu wzdłuż łańcucha pierwszych "
+"rodziców"
+
+#: blame.c:2850
+#, c-format
+msgid "no such path %s in %s"
+msgstr "nie ma ścieżki %s w %s"
+
+#: blame.c:2861
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr "nie można odczytać blobu %s ścieżki %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"
+"Po naprawieniu przyczyny błędu, możesz spróbować naprawić\n"
+"informacje o śledzeniu uruchamiając\n"
+"„git branch --set-upstream-to=%s%s%s”."
+
+#: branch.c:67
+#, c-format
+msgid "Not setting branch %s as its own upstream."
+msgstr "Nie ustawiam gałęzi %s jako nadrzędną jej samej."
+
+#: branch.c:93
+#, c-format
+msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+msgstr ""
+"Gałąź „%s” ustawiona na śledzenie zdalnej gałęzi „%s” z „%s” przez "
+"przestawianie."
+
+#: branch.c:94
+#, c-format
+msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
+msgstr "Gałąź „%s” ustawiona na śledzenie zdalnej gałęzi „%s” z „%s”."
+
+#: branch.c:98
+#, c-format
+msgid "Branch '%s' set up to track local branch '%s' by rebasing."
+msgstr ""
+"Gałąź „%s” ustawiona na śledzenie lokalnej gałęzi „%s” przez przestawianie."
+
+#: branch.c:99
+#, c-format
+msgid "Branch '%s' set up to track local branch '%s'."
+msgstr "Gałąź „%s” ustawiona na śledzenie lokalnej gałęzi „%s”."
+
+#: branch.c:104
+#, c-format
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+msgstr ""
+"Gałąź „%s” ustawiona na śledzenie zdalnej referencji „%s” przez "
+"przestawianie."
+
+#: branch.c:105
+#, c-format
+msgid "Branch '%s' set up to track remote ref '%s'."
+msgstr "Gałąź „%s” ustawiona na śledzenie zdalnej referencji „%s”."
+
+#: branch.c:109
+#, c-format
+msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgstr ""
+"Gałąź „%s” ustawiona na śledzenie lokalnej referencji „%s” przez "
+"przestawianie."
+
+#: branch.c:110
+#, c-format
+msgid "Branch '%s' set up to track local ref '%s'."
+msgstr "Gałąź „%s” ustawiona na śledzenie lokalnej referencji „%s”."
+
+#: branch.c:119
+msgid "Unable to write upstream branch configuration"
+msgstr "Nie można zapisać konfiguracji gałęzi nadrzędnej"
+
+#: branch.c:156
+#, c-format
+msgid "Not tracking: ambiguous information for ref %s"
+msgstr "Nie śledzenie: niejednoznaczna informacja dla referencji %s"
+
+#: branch.c:189
+#, c-format
+msgid "'%s' is not a valid branch name."
+msgstr "„%s” nie jest prawidłową nazwą gałęzi."
+
+#: branch.c:208
+#, c-format
+msgid "A branch named '%s' already exists."
+msgstr "Gałąź o nazwie „%s” już istnieje."
+
+#: branch.c:213
+msgid "Cannot force update the current branch."
+msgstr "Nie można zaktualizować bieżącej gałęzi."
+
+#: branch.c:233
+#, c-format
+msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgstr ""
+"Nie można ustawić informacji śledzenia; punkt początkowy „%s” nie jest "
+"gałęzią."
+
+#: branch.c:235
+#, c-format
+msgid "the requested upstream branch '%s' does not exist"
+msgstr "żądana zdalna gałąź „%s” nie istnieje"
+
+#: 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"
+"Jeśli planujesz oprzeć swoją pracę na zdalnej gałęzi, która\n"
+"już istnieje, możesz potrzebować uruchomić „git fetch”,\n"
+"aby ją pobrać.\n"
+"\n"
+"Jeśli planujesz wypchnąć nową lokalną gałąź, która będzie\n"
+"śledzić swój zdalny odpowiednik, możesz chcieć użyć\n"
+"„git push -u”, żeby ustawić gałąź nadrzędną przy wypychaniu."
+
+#: branch.c:281
+#, c-format
+msgid "Not a valid object name: '%s'."
+msgstr "Nieprawidłowa nazwa obiektu: „%s”."
+
+#: branch.c:301
+#, c-format
+msgid "Ambiguous object name: '%s'."
+msgstr "Niejednoznaczna nazwa obiektu: „%s”."
+
+#: branch.c:306
+#, c-format
+msgid "Not a valid branch point: '%s'."
+msgstr "Nieprawidłowy punkt rozgałęzienia: „%s”."
+
+#: branch.c:365
+#, c-format
+msgid "'%s' is already checked out at '%s'"
+msgstr "„%s” jest już wybrana w „%s”"
+
+#: branch.c:388
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr "nie zaktualizowano HEAD drzewa roboczego %s"
+
+#: bundle.c:41
+#, c-format
+msgid "unrecognized bundle hash algorithm: %s"
+msgstr "nierozpoznany algorytm skrótu wiązki: %s"
+
+#: bundle.c:45
+#, c-format
+msgid "unknown capability '%s'"
+msgstr "nieznana zdolność (capability) „%s”"
+
+#: bundle.c:71
+#, c-format
+msgid "'%s' does not look like a v2 or v3 bundle file"
+msgstr "„%s” nie wygląda jak plik wiązki v2 ani v3"
+
+#: bundle.c:110
+#, c-format
+msgid "unrecognized header: %s%s (%d)"
+msgstr "nierozpoznany nagłówek: %s%s (%d)"
+
+#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184
+#: builtin/commit.c:814
+#, c-format
+msgid "could not open '%s'"
+msgstr "nie można otworzyć „%s”"
+
+#: bundle.c:189
+msgid "Repository lacks these prerequisite commits:"
+msgstr "W repozytorium brakuje tych wymaganych zapisów:"
+
+#: bundle.c:192
+msgid "need a repository to verify a bundle"
+msgstr "należy podać repozytorium, aby sprawdzić wiązkę"
+
+#: bundle.c:243
+#, c-format
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %d refs:"
+msgstr[0] "Wiązka zawiera tę referencję:"
+msgstr[1] "Wiązka zawiera te %d referencje:"
+msgstr[2] "Wiązka zawiera tych %d referencji:"
+
+#: bundle.c:250
+msgid "The bundle records a complete history."
+msgstr "Wiązka zapisuje pełną historię."
+
+#: bundle.c:252
+#, c-format
+msgid "The bundle requires this ref:"
+msgid_plural "The bundle requires these %d refs:"
+msgstr[0] "Wiązka potrzebuje tej referencji:"
+msgstr[1] "Wiązka potrzebuje tych %d referencji:"
+msgstr[2] "Wiązka potrzebuje tych %d referencji:"
+
+#: bundle.c:319
+msgid "unable to dup bundle descriptor"
+msgstr "nie można wykonać dup deskryptora wiązki"
+
+#: bundle.c:326
+msgid "Could not spawn pack-objects"
+msgstr "Nie można uruchomić pack-objects"
+
+#: bundle.c:337
+msgid "pack-objects died"
+msgstr "pack-objects padł"
+
+#: bundle.c:386
+#, c-format
+msgid "ref '%s' is excluded by the rev-list options"
+msgstr "referencja „%s” jest wyłączona przez opcje listy rewizji"
+
+#: bundle.c:490
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr "nieobsługiwana wersja wiązki %d"
+
+#: bundle.c:492
+#, c-format
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr "nie można zapisać wersji wiązki %d z algorytmem %s"
+
+#: bundle.c:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr "nierozpoznany argument: %s"
+
+#: bundle.c:539
+msgid "Refusing to create empty bundle."
+msgstr "Odmawiam utworzenia pustej wiązki."
+
+#: bundle.c:549
+#, c-format
+msgid "cannot create '%s'"
+msgstr "nie można utworzyć „%s”"
+
+#: bundle.c:574
+msgid "index-pack died"
+msgstr "index-pack padł"
+
+#: color.c:329
+#, c-format
+msgid "invalid color value: %.*s"
+msgstr "nieprawidłowa wartość koloru: %.*s"
+
+#: commit-graph.c:198 midx.c:47
+msgid "invalid hash version"
+msgstr "nieprawidłowa wersja skrótu"
+
+#: commit-graph.c:219
+msgid "repository contains replace objects; skipping commit-graph"
+msgstr "repozytorium zawiera obiekty zamienne; pomijanie grafu zapisów"
+
+#: commit-graph.c:228
+msgid "repository contains (deprecated) grafts; skipping commit-graph"
+msgstr "repozytorium zawiera (przestarzałe) szczepki; pomijanie grafu zapisów"
+
+#: commit-graph.c:233
+msgid "repository is shallow; skipping commit-graph"
+msgstr "źródłowe repozytorium jest płytkie, pomijanie grafu zapisów"
+
+#: commit-graph.c:264
+msgid "commit-graph file is too small"
+msgstr "plik grafu zapisów jest za mały"
+
+#: commit-graph.c:329
+#, c-format
+msgid "commit-graph signature %X does not match signature %X"
+msgstr "podpis grafu zapisów %X nie zgadza się z podpisem %X"
+
+#: commit-graph.c:336
+#, c-format
+msgid "commit-graph version %X does not match version %X"
+msgstr "wersja grafu zapisów %X nie zgadza się z wersją %X"
+
+#: commit-graph.c:343
+#, c-format
+msgid "commit-graph hash version %X does not match version %X"
+msgstr "wersja skrótu grafu zapisów %X nie zgadza się z wersją %X"
+
+#: commit-graph.c:360
+#, c-format
+msgid "commit-graph file is too small to hold %u chunks"
+msgstr "plik grafu zapisów jest za mały, żeby przechować %u kawałków"
+
+#: commit-graph.c:379
+#, c-format
+msgid "commit-graph improper chunk offset %08x%08x"
+msgstr "nieprawidłowe przesunięcie kawałka grafu zapisów %08x%08x"
+
+#: commit-graph.c:465
+#, c-format
+msgid "commit-graph chunk id %08x appears multiple times"
+msgstr "identyfikator kawałka grafu zapisów %08x pojawia się wiele razy"
+
+#: commit-graph.c:531
+msgid "commit-graph has no base graphs chunk"
+msgstr "graf zapisów nie ma podstawowego kawałka grafów"
+
+#: commit-graph.c:541
+msgid "commit-graph chain does not match"
+msgstr "łańcuch grafu zapisów się nie zgadza"
+
+#: commit-graph.c:589
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr "nieprawidłowy łańcuch grafu zapisów: wiersz „%s” nie jest skrótem"
+
+#: commit-graph.c:613
+msgid "unable to find all commit-graph files"
+msgstr "nie znaleziono wszystkich plików grafu zapisów"
+
+#: commit-graph.c:794 commit-graph.c:831
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr ""
+"nieprawidłowa pozycja zapisu. Graf zapisów jest prawdopodobnie uszkodzony"
+
+#: commit-graph.c:815
+#, c-format
+msgid "could not find commit %s"
+msgstr "nie znaleziono zapisu %s"
+
+#: commit-graph.c:848
+msgid "commit-graph requires overflow generation data but has none"
+msgstr "graf zapisów wymaga danych przepełnionych pokoleń, ale ich nie ma"
+
+#: commit-graph.c:1121 builtin/am.c:1292
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "nie można przeanalizować zapisu %s"
+
+#: commit-graph.c:1378 builtin/pack-objects.c:2872
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "nie można uzyskać rodzaju obiektu %s"
+
+#: commit-graph.c:1409
+msgid "Loading known commits in commit graph"
+msgstr "Ładowanie znanych zapisów w graf zapisów"
+
+#: commit-graph.c:1426
+msgid "Expanding reachable commits in commit graph"
+msgstr "Rozwijanie osiągalnych zapisów w grafie zapisów"
+
+#: commit-graph.c:1446
+msgid "Clearing commit marks in commit graph"
+msgstr "Czyszczenie znamion zapisów w grafie zapisów"
+
+#: commit-graph.c:1465
+msgid "Computing commit graph topological levels"
+msgstr "Obliczanie topologicznych poziomów grafu zapisów"
+
+#: commit-graph.c:1518
+msgid "Computing commit graph generation numbers"
+msgstr "Obliczanie numerów pokoleń grafu zapisów"
+
+#: commit-graph.c:1599
+msgid "Computing commit changed paths Bloom filters"
+msgstr "Obliczanie filtrów Blooma zmienionych ścieżek zapisu"
+
+#: commit-graph.c:1676
+msgid "Collecting referenced commits"
+msgstr "Zbieranie wspominanych zapisów"
+
+#: commit-graph.c:1701
+#, c-format
+msgid "Finding commits for commit graph in %d pack"
+msgid_plural "Finding commits for commit graph in %d packs"
+msgstr[0] "Znajdywanie zapisów do grafu zapisów w %d paczce"
+msgstr[1] "Znajdywanie zapisów do grafu zapisów w %d paczkach"
+msgstr[2] "Znajdywanie zapisów do grafu zapisów w %d paczkach"
+
+#: commit-graph.c:1714
+#, c-format
+msgid "error adding pack %s"
+msgstr "błąd przy dodawaniu paczki %s"
+
+#: commit-graph.c:1718
+#, c-format
+msgid "error opening index for %s"
+msgstr "błąd otwierania indeksu dla %s"
+
+#: commit-graph.c:1755
+msgid "Finding commits for commit graph among packed objects"
+msgstr "Znajdywanie zapisów do grafu zapisów wśród spakowanych obiektów"
+
+#: commit-graph.c:1773
+msgid "Finding extra edges in commit graph"
+msgstr "Znajdywanie dodatkowych krawędzi w grafie zapisów"
+
+#: commit-graph.c:1821
+msgid "failed to write correct number of base graph ids"
+msgstr ""
+"nie można zapisać prawidłowej liczby podstawowych identyfikatorów grafu"
+
+#: commit-graph.c:1863 midx.c:819
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr "nie można utworzyć wiodących katalogów %s"
+
+#: commit-graph.c:1876
+msgid "unable to create temporary graph layer"
+msgstr "nie można utworzyć tymczasowej warstwy grafu"
+
+#: commit-graph.c:1881
+#, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "nie można dostroić współdzielonych uprawnień „%s”"
+
+#: commit-graph.c:1966
+#, c-format
+msgid "Writing out commit graph in %d pass"
+msgid_plural "Writing out commit graph in %d passes"
+msgstr[0] "Wypisywanie grafu zapisów w %d przebiegu"
+msgstr[1] "Wypisywanie grafu zapisów w %d przebiegach"
+msgstr[2] "Wypisywanie grafu zapisów w %d przebiegach"
+
+#: commit-graph.c:2011
+msgid "unable to open commit-graph chain file"
+msgstr "nie można otworzyć pliku łańcucha grafu zapisów"
+
+#: commit-graph.c:2027
+msgid "failed to rename base commit-graph file"
+msgstr "nie można zmienić nazwy podstawowego pliku grafu zapisów"
+
+#: commit-graph.c:2047
+msgid "failed to rename temporary commit-graph file"
+msgstr "nie można zmienić nazwy tymczasowego pliku grafu zapisów"
+
+#: commit-graph.c:2180
+msgid "Scanning merged commits"
+msgstr "Skanowanie scalonych zapisów"
+
+#: commit-graph.c:2224
+msgid "Merging commit-graph"
+msgstr "Scalanie grafu zapisów"
+
+#: commit-graph.c:2331
+msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
+msgstr "próba wypisania grafu zapisów, ale „core.commitGraph” jest wyłączone"
+
+#: commit-graph.c:2438
+msgid "too many commits to write graph"
+msgstr "za dużo zapisów, by wypisać graf"
+
+#: commit-graph.c:2536
+msgid "the commit-graph file has incorrect checksum and is likely corrupt"
+msgstr ""
+"plik grafu zapisów ma nieprawidłową sumę kontrolną i jest prawdopodobnie "
+"uszkodzony"
+
+#: commit-graph.c:2546
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr "graf zapisów ma nieprawidłową kolejność OID: %s i wtedy %s"
+
+#: commit-graph.c:2556 commit-graph.c:2571
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr "graf zapisów ma nieprawidłową wartość fanout: fanout[%d] = %u != %u"
+
+#: commit-graph.c:2563
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "nie można przetworzyć zapisu %s z grafu zapisów"
+
+#: commit-graph.c:2581
+msgid "Verifying commits in commit graph"
+msgstr "Sprawdzanie zapisów w grafie zapisów"
+
+#: commit-graph.c:2596
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr ""
+"nie można przetworzyć zapisu %s z bazy danych obiektów do grafu zapisów"
+
+#: commit-graph.c:2603
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr "OID korzenia drzewa w zapisie %s w grafie zapisów to %s != %s"
+
+#: commit-graph.c:2613
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr "lista rodziców grafu zapisów zapisu %s jest za długa"
+
+#: commit-graph.c:2622
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr "rodzic grafu zapisów zapisu %s to %s != %s"
+
+#: commit-graph.c:2636
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr "lista rodziców grafu zapisów zapisu %s kończy się przedwcześnie"
+
+#: commit-graph.c:2641
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr ""
+"graf zapisów ma numer pokolenia zerowy w zapisie %s, ale niezerowy gdzie "
+"indziej"
+
+#: commit-graph.c:2645
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr ""
+"graf zapisów ma numer pokolenia niezerowy w zapisie %s, ale zerowy gdzie "
+"indziej"
+
+#: commit-graph.c:2662
+#, c-format
+msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
+msgstr "pokolenie grafu zapisów zapisu %s to %<PRIuMAX> < %<PRIuMAX>"
+
+#: commit-graph.c:2668
+#, c-format
+msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
+msgstr ""
+"data złożenia w zapisie %s w grafie zapisów to %<PRIuMAX> != %<PRIuMAX>"
+
+#: commit.c:52 sequencer.c:2887 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457
+#, c-format
+msgid "could not parse %s"
+msgstr "nie można przetworzyć „%s”"
+
+#: commit.c:54
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr "%s %s nie jest zapisem!"
+
+#: 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 ""
+"Wsparcie dla <KATALOG_GITA>/info/grafts jest przestarzałe\n"
+"i zostanie usunięte w przyszłej wersji Gita.\n"
+"\n"
+"Użyj „git replace --convert-graft-file”\n"
+"aby zamienić szczepki w zastępcze referencje.\n"
+"\n"
+"Wyłącz ten komunikat uruchamiając\n"
+"„git config advice.graftFileDeprecated false”"
+
+#: commit.c:1223
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgstr "Zapis %s ma niezaufany podpis GPG rzekomo od %s."
+
+#: commit.c:1227
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr "Zapis %s ma zły podpis GPG rzekomo od %s."
+
+#: commit.c:1230
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "Zapis %s nie ma podpisu GPG."
+
+#: commit.c:1233
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr "Zapis %s ma dobry podpis GPG od %s\n"
+
+#: commit.c:1487
+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 ""
+"Ostrzeżenie: komunikat zapisu nie stosuje się do UTF-8.\n"
+"Możesz chcieć go poprawić po naprawieniu komunikatu, albo ustawić\n"
+"wartość konfiguracji i18n.commitencoding na kodowanie, którego\n"
+"używa projekt.\n"
+
+#: compat/obstack.c:406 compat/obstack.c:408
+msgid "memory exhausted"
+msgstr "pamięć wyczerpana"
+
+#: config.c:126
+#, 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 ""
+"przekroczono maksymalną głębokość załączania (%d) podczas załączania\n"
+"\t%s\n"
+"z\n"
+"\t%s\n"
+"Może to być spowodowane cyklicznymi załączeniami."
+
+#: config.c:142
+#, c-format
+msgid "could not expand include path '%s'"
+msgstr "nie można rozwinąć ścieżki załączeń (include) „%s”"
+
+#: config.c:153
+msgid "relative config includes must come from files"
+msgstr "względne załączenia konfiguracji muszą pochodzić z plików"
+
+#: config.c:199
+msgid "relative config include conditionals must come from files"
+msgstr "względne warunkowe załączenia konfiguracji muszą pochodzić z plików"
+
+#: config.c:396
+#, c-format
+msgid "invalid config format: %s"
+msgstr "nieprawidłowy format ustawień: %s"
+
+#: config.c:400
+#, c-format
+msgid "missing environment variable name for configuration '%.*s'"
+msgstr "brak nazwy zmiennej środowiska dla ustawienia „%.*s”"
+
+#: config.c:405
+#, c-format
+msgid "missing environment variable '%s' for configuration '%.*s'"
+msgstr "brak zmiennej środowiska „%s” dla ustawienia „%.*s”"
+
+#: config.c:442
+#, c-format
+msgid "key does not contain a section: %s"
+msgstr "klucz nie zawiera rozdziału: %s"
+
+#: config.c:448
+#, c-format
+msgid "key does not contain variable name: %s"
+msgstr "klucz nie zawiera nazwy zmiennej: %s"
+
+#: config.c:472 sequencer.c:2588
+#, c-format
+msgid "invalid key: %s"
+msgstr "nieprawidłowy klucz: %s"
+
+#: config.c:478
+#, c-format
+msgid "invalid key (newline): %s"
+msgstr "błędny klucz (nowy wiersz): %s"
+
+#: config.c:511
+msgid "empty config key"
+msgstr "pusty klucz ustawień"
+
+#: config.c:529 config.c:541
+#, c-format
+msgid "bogus config parameter: %s"
+msgstr "fałszywy parametr konfiguracji: %s"
+
+#: config.c:555 config.c:572 config.c:579 config.c:588
+#, c-format
+msgid "bogus format in %s"
+msgstr "fałszywy format %s"
+
+#: config.c:622
+#, c-format
+msgid "bogus count in %s"
+msgstr "fałszywy licznik w %s"
+
+#: config.c:626
+#, c-format
+msgid "too many entries in %s"
+msgstr "za dużo wpisów w %s"
+
+#: config.c:636
+#, c-format
+msgid "missing config key %s"
+msgstr "brak klucza ustawień %s"
+
+#: config.c:644
+#, c-format
+msgid "missing config value %s"
+msgstr "brakująca wartość ustawienia %s"
+
+#: config.c:995
+#, c-format
+msgid "bad config line %d in blob %s"
+msgstr "zły wiersz konfiguracji %d w blobie %s"
+
+#: config.c:999
+#, c-format
+msgid "bad config line %d in file %s"
+msgstr "zły wiersz konfiguracji %d w pliku %s"
+
+#: config.c:1003
+#, c-format
+msgid "bad config line %d in standard input"
+msgstr "zły wiersz konfiguracji %d na standardowym wejściu"
+
+#: config.c:1007
+#, c-format
+msgid "bad config line %d in submodule-blob %s"
+msgstr "zły wiersz konfiguracji %d w blobie pod-modułu %s"
+
+#: config.c:1011
+#, c-format
+msgid "bad config line %d in command line %s"
+msgstr "zły wiersz konfiguracji %d w wierszu poleceń %s"
+
+#: config.c:1015
+#, c-format
+msgid "bad config line %d in %s"
+msgstr "zły wiersz konfiguracji %d w %s"
+
+#: config.c:1152
+msgid "out of range"
+msgstr "poza zakresem"
+
+#: config.c:1152
+msgid "invalid unit"
+msgstr "nieprawidłowa jednostka"
+
+#: config.c:1153
+#, c-format
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr "zła liczbowa wartość konfiguracji „%s” dla „%s”: %s"
+
+#: config.c:1163
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
+msgstr "zła liczbowa wartość konfiguracji „%s” dla „%s” w blobie %s: %s"
+
+#: config.c:1166
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in file %s: %s"
+msgstr "zła liczbowa wartość konfiguracji „%s” dla „%s” w pliku %s: %s"
+
+#: config.c:1169
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgstr ""
+"zła liczbowa wartość konfiguracji „%s” dla „%s” na standardowym wejściu: %s"
+
+#: config.c:1172
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
+msgstr ""
+"zła liczbowa wartość konfiguracji „%s” dla „%s” w blobie pod-modułu %s: %s"
+
+#: config.c:1175
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
+msgstr ""
+"zła liczbowa wartość konfiguracji „%s” dla „%s” w wierszu poleceń %s: %s"
+
+#: config.c:1178
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr "zła liczbowa wartość konfiguracji „%s” dla „%s” w %s: %s"
+
+#: config.c:1194
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr "zła logiczna wartość konfiguracji „%s” w „%s”"
+
+#: config.c:1289
+#, c-format
+msgid "failed to expand user dir in: '%s'"
+msgstr "nie można rozwinąć katalogu użytkownika w: „%s”"
+
+#: config.c:1298
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr "„%s” do „%s” nie jest prawidłowym znacznikiem czasu"
+
+#: config.c:1391
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr "długość skrótu poza zakresem: %d"
+
+#: config.c:1405 config.c:1416
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "zły stopień kompresji zlib %d"
+
+#: config.c:1508
+msgid "core.commentChar should only be one character"
+msgstr "core.commentChar powinno być tylko jednym znakiem"
+
+#: config.c:1541
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "nieprawidłowy tryb utworzenia obiektu: %s"
+
+#: config.c:1613
+#, c-format
+msgid "malformed value for %s"
+msgstr "nieprawidłowa wartość %s"
+
+#: config.c:1639
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr "nieprawidłowa wartość %s: %s"
+
+#: config.c:1640
+msgid "must be one of nothing, matching, simple, upstream or current"
+msgstr "musi być jednym z nothing, matching, simple, upstream lub current"
+
+#: config.c:1701 builtin/pack-objects.c:3666
+#, c-format
+msgid "bad pack compression level %d"
+msgstr "zły stopień kompresji paczki %d"
+
+#: config.c:1823
+#, c-format
+msgid "unable to load config blob object '%s'"
+msgstr "nie można wczytać konfiguracyjnego obiektu blobu „%s”"
+
+#: config.c:1826
+#, c-format
+msgid "reference '%s' does not point to a blob"
+msgstr "referencja „%s” nie wskazuje blobu"
+
+#: config.c:1843
+#, c-format
+msgid "unable to resolve config blob '%s'"
+msgstr "nie można rozwiązać blobu konfiguracji „%s”"
+
+#: config.c:1873
+#, c-format
+msgid "failed to parse %s"
+msgstr "nie można przetworzyć %s"
+
+#: config.c:1927
+msgid "unable to parse command-line config"
+msgstr "nie można przeanalizować konfiguracji wiersza poleceń"
+
+#: config.c:2290
+msgid "unknown error occurred while reading the configuration files"
+msgstr "wystąpił nieznany błąd podczas odczytywania plików konfiguracyjnych"
+
+#: config.c:2464
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "Nieprawidłowy %s: „%s”"
+
+#: config.c:2509
+#, c-format
+msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
+msgstr "wartość splitIndex.maxPercentChange „%d” powinna być pomiędzy 0 a 100"
+
+#: config.c:2555
+#, c-format
+msgid "unable to parse '%s' from command-line config"
+msgstr "nie można przetworzyć „%s” z konfiguracji wiersza poleceń"
+
+#: config.c:2557
+#, c-format
+msgid "bad config variable '%s' in file '%s' at line %d"
+msgstr "zła zmienna konfiguracji „%s” w pliku „%s” w wierszu %d"
+
+#: config.c:2641
+#, c-format
+msgid "invalid section name '%s'"
+msgstr "nieprawidłowa nazwa rozdziału „%s”"
+
+#: config.c:2673
+#, c-format
+msgid "%s has multiple values"
+msgstr "%s ma wiele wartości"
+
+#: config.c:2702
+#, c-format
+msgid "failed to write new configuration file %s"
+msgstr "nie można zapisać nowego pliku konfiguracyjnego %s"
+
+#: config.c:2954 config.c:3280
+#, c-format
+msgid "could not lock config file %s"
+msgstr "nie można zablokować pliku konfiguracyjnego %s"
+
+#: config.c:2965
+#, c-format
+msgid "opening %s"
+msgstr "otwieranie %s"
+
+#: config.c:3002 builtin/config.c:361
+#, c-format
+msgid "invalid pattern: %s"
+msgstr "nieprawidłowy wzorzec: %s"
+
+#: config.c:3027
+#, c-format
+msgid "invalid config file %s"
+msgstr "nieprawidłowy plik konfiguracyjny %s"
+
+#: config.c:3040 config.c:3293
+#, c-format
+msgid "fstat on %s failed"
+msgstr "fstat na %s nie powiódł się"
+
+#: config.c:3051
+#, c-format
+msgid "unable to mmap '%s'"
+msgstr "nie można wykonać mmap „%s”"
+
+#: config.c:3060 config.c:3298
+#, c-format
+msgid "chmod on %s failed"
+msgstr "chmod na %s nie powiodło się"
+
+#: config.c:3145 config.c:3395
+#, c-format
+msgid "could not write config file %s"
+msgstr "nie można zapisać pliku konfiguracji %s"
+
+#: config.c:3179
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "nie można ustawić „%s” na „%s”"
+
+#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#, c-format
+msgid "could not unset '%s'"
+msgstr "nie można usunąć ustawienia „%s”"
+
+#: config.c:3271
+#, c-format
+msgid "invalid section name: %s"
+msgstr "nieprawidłowa nazwa rozdziału: %s"
+
+#: config.c:3438
+#, c-format
+msgid "missing value for '%s'"
+msgstr "brakująca wartość „%s”"
+
+#: connect.c:61
+msgid "the remote end hung up upon initial contact"
+msgstr "zdalna maszyna rozłączyła się po początkowym kontakcie"
+
+#: 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 ""
+"Nie można czytać ze zdalnego repozytorium.\n"
+"\n"
+"Upewnij się, że masz odpowiednie prawa dostępu\n"
+"i że repozytorium istnieje."
+
+#: connect.c:81
+#, c-format
+msgid "server doesn't support '%s'"
+msgstr "serwer nie wspiera „%s”"
+
+#: connect.c:118
+#, c-format
+msgid "server doesn't support feature '%s'"
+msgstr "serwer nie wspiera funkcji „%s”"
+
+#: connect.c:129
+msgid "expected flush after capabilities"
+msgstr "oczekiwano wypróżnienia po możliwościach (capabilities)"
+
+#: connect.c:263
+#, c-format
+msgid "ignoring capabilities after first line '%s'"
+msgstr "pomijanie możliwości (capabilities) po pierwszym wierszu „%s”"
+
+#: connect.c:284
+msgid "protocol error: unexpected capabilities^{}"
+msgstr "błąd protokołu: nieoczekiwane możliwości capabilities^{}"
+
+#: connect.c:306
+#, c-format
+msgid "protocol error: expected shallow sha-1, got '%s'"
+msgstr "błąd protokołu: oczekiwano płytkiego SHA-1, otrzymano „%s”"
+
+#: connect.c:308
+msgid "repository on the other end cannot be shallow"
+msgstr "repozytorium po drugiej stronie nie może być płytkie"
+
+#: connect.c:347
+msgid "invalid packet"
+msgstr "nieprawidłowy pakiet"
+
+#: connect.c:367
+#, c-format
+msgid "protocol error: unexpected '%s'"
+msgstr "błąd protokołu: nieoczekiwane „%s”"
+
+#: connect.c:497
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr "serwer podał nieznany format obiektu „%s”"
+
+#: connect.c:526
+#, c-format
+msgid "invalid ls-refs response: %s"
+msgstr "nieprawidłowa odpowiedź ls-refs: %s"
+
+#: connect.c:530
+msgid "expected flush after ref listing"
+msgstr "oczekiwano wypróżnienia po wypisaniu referencji"
+
+#: connect.c:533
+msgid "expected response end packet after ref listing"
+msgstr "oczekiwano pakietu końca odpowiedzi po wypisaniu referencji"
+
+#: connect.c:666
+#, c-format
+msgid "protocol '%s' is not supported"
+msgstr "protokół „%s” jest niewspierany"
+
+#: connect.c:717
+msgid "unable to set SO_KEEPALIVE on socket"
+msgstr "nie można ustawić w gnieździe SO_KEEPALIVE"
+
+#: connect.c:757 connect.c:820
+#, c-format
+msgid "Looking up %s ... "
+msgstr "Odnajdywanie %s ... "
+
+#: connect.c:761
+#, c-format
+msgid "unable to look up %s (port %s) (%s)"
+msgstr "nie można odnaleźć %s (port %s) (%s)"
+
+#. TRANSLATORS: this is the end of "Looking up %s ... "
+#: connect.c:765 connect.c:836
+#, c-format
+msgid ""
+"done.\n"
+"Connecting to %s (port %s) ... "
+msgstr ""
+"gotowe.\n"
+"Łączenie z %s (port %s) ... "
+
+#: connect.c:787 connect.c:864
+#, c-format
+msgid ""
+"unable to connect to %s:\n"
+"%s"
+msgstr ""
+"nie można połączyć z %s:\n"
+"%s"
+
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+#: connect.c:793 connect.c:870
+msgid "done."
+msgstr "gotowe."
+
+#: connect.c:824
+#, c-format
+msgid "unable to look up %s (%s)"
+msgstr "nie odnaleziono %s (%s)"
+
+#: connect.c:830
+#, c-format
+msgid "unknown port %s"
+msgstr "nieznany port %s"
+
+#: connect.c:967 connect.c:1299
+#, c-format
+msgid "strange hostname '%s' blocked"
+msgstr "zablokowano dziwną nazwę hosta „%s”"
+
+#: connect.c:969
+#, c-format
+msgid "strange port '%s' blocked"
+msgstr "zablokowano dziwny port „%s”"
+
+#: connect.c:979
+#, c-format
+msgid "cannot start proxy %s"
+msgstr "nie można uruchomić pośrednika %s"
+
+#: connect.c:1050
+msgid "no path specified; see 'git help pull' for valid url syntax"
+msgstr ""
+"nie podano ścieżki; zobacz składnię prawidłowych adresów w „git help pull”"
+
+#: connect.c:1190
+msgid "newline is forbidden in git:// hosts and repo paths"
+msgstr ""
+"nie można użyć znaku nowego wiersza w adresach git:// i ścieżkach repozytoriów"
+
+#: connect.c:1247
+msgid "ssh variant 'simple' does not support -4"
+msgstr "wariant SSH „simple” nie wspiera -4"
+
+#: connect.c:1259
+msgid "ssh variant 'simple' does not support -6"
+msgstr "wariant SSH „simple” nie wspiera -6"
+
+#: connect.c:1276
+msgid "ssh variant 'simple' does not support setting port"
+msgstr "wariant SSH „simple” nie wspiera ustawiania portu"
+
+#: connect.c:1388
+#, c-format
+msgid "strange pathname '%s' blocked"
+msgstr "zablokowano dziwną ścieżkę „%s”"
+
+#: connect.c:1436
+msgid "unable to fork"
+msgstr "nie można wykonać fork"
+
+#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45
+msgid "Checking connectivity"
+msgstr "Sprawdzanie spójności"
+
+#: connected.c:120
+msgid "Could not run 'git rev-list'"
+msgstr "Nie można wykonać „git rev-list”"
+
+#: connected.c:144
+msgid "failed write to rev-list"
+msgstr "nie można zapisać do rev-list"
+
+#: connected.c:149
+msgid "failed to close rev-list's stdin"
+msgstr "nie można zamknąć wejścia rev-list"
+
+#: convert.c:194
+#, c-format
+msgid "illegal crlf_action %d"
+msgstr "błędne działanie crlf_action %d"
+
+#: convert.c:207
+#, c-format
+msgid "CRLF would be replaced by LF in %s"
+msgstr "CRLFy zostałyby zastąpione LFami w %s"
+
+#: 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 ""
+"CRLFy zostaną zastąpione LFami %s.\n"
+"Plik zachowa swoje pierwotne końce wiersza w katalogu roboczym"
+
+#: convert.c:217
+#, c-format
+msgid "LF would be replaced by CRLF in %s"
+msgstr "LFy zostałyby zastąpione CRLFami w %s"
+
+#: 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 ""
+"LFy zostaną zastąpione CRLFami %s.\n"
+"Plik zachowa swoje pierwotne końce wiersza w katalogu roboczym"
+
+#: convert.c:284
+#, c-format
+msgid "BOM is prohibited in '%s' if encoded as %s"
+msgstr "Znacznik kolejności bajtów zabroniony, jeśli „%s” zakodowano jako %s"
+
+#: convert.c:291
+#, c-format
+msgid ""
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
+"working-tree-encoding."
+msgstr ""
+"Plik „%s” zawiera znacznik kolejności bajtów (BOM). Użyj UTF-%.*s jako "
+"kodowania drzewa roboczego."
+
+#: convert.c:304
+#, c-format
+msgid "BOM is required in '%s' if encoded as %s"
+msgstr "Znacznik kolejności bajtów wymagany, jeśli „%s” zakodowano jako %s"
+
+#: 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 ""
+"W pliku „%s” brakuje znacznika kolejności bajtów (BOM). Użyj UTF-%sBE lub "
+"UTF-%sLE (zależnie od kolejności bajtów) jako kodowania drzewa roboczego."
+
+#: convert.c:419 convert.c:490
+#, c-format
+msgid "failed to encode '%s' from %s to %s"
+msgstr "nie można przekodować „%s” z %s na %s"
+
+#: convert.c:462
+#, c-format
+msgid "encoding '%s' from %s to %s and back is not the same"
+msgstr "kodowanie „%s” z %s na %s i z powrotem nie jest tym samym"
+
+#: convert.c:665
+#, c-format
+msgid "cannot fork to run external filter '%s'"
+msgstr "nie można wykonać fork, by uruchomić zewnętrzny filtr „%s”"
+
+#: convert.c:685
+#, c-format
+msgid "cannot feed the input to external filter '%s'"
+msgstr "nie można nakarmić wejściem zewnętrznego filtra „%s”"
+
+#: convert.c:692
+#, c-format
+msgid "external filter '%s' failed %d"
+msgstr "zewnętrzny filtr „%s” nie powiódł się %d"
+
+#: convert.c:727 convert.c:730
+#, c-format
+msgid "read from external filter '%s' failed"
+msgstr "odczyt z zewnętrznego filtra „%s” nie powiódł się"
+
+#: convert.c:733 convert.c:788
+#, c-format
+msgid "external filter '%s' failed"
+msgstr "zewnętrzny filtr „%s” nie powiódł się"
+
+#: convert.c:837
+msgid "unexpected filter type"
+msgstr "nieoczekiwany rodzaj filtra"
+
+#: convert.c:848
+msgid "path name too long for external filter"
+msgstr "ścieżka zewnętrznego filtra za długa"
+
+#: convert.c:940
+#, c-format
+msgid ""
+"external filter '%s' is not available anymore although not all paths have "
+"been filtered"
+msgstr ""
+"zewnętrzny filtr „%s” nie jest już dostępny, chociaż nie wszystkie ścieżki "
+"zostały przefiltrowane"
+
+#: convert.c:1240
+msgid "true/false are no valid working-tree-encodings"
+msgstr "true/false nie są prawidłowymi kodowaniami drzewa roboczego"
+
+#: convert.c:1428 convert.c:1462
+#, c-format
+msgid "%s: clean filter '%s' failed"
+msgstr "%s: filtr czyszczenia „%s” zawiódł"
+
+#: convert.c:1508
+#, c-format
+msgid "%s: smudge filter %s failed"
+msgstr "%s: filtr smarowania %s zawiódł"
+
+#: credential.c:96
+#, c-format
+msgid "skipping credential lookup for key: credential.%s"
+msgstr "pomijanie odnajdywania poświadczeń dla klucza: credential.%s"
+
+#: credential.c:112
+msgid "refusing to work with credential missing host field"
+msgstr "odmawiam pracy z poświadczeniem bez pola maszyny (hosta)"
+
+#: credential.c:114
+msgid "refusing to work with credential missing protocol field"
+msgstr "odmawiam pracy z poświadczeniem bez pola protokołu"
+
+#: credential.c:394
+#, c-format
+msgid "url contains a newline in its %s component: %s"
+msgstr "adres URL zawiera znak nowego wiersza w komponencie %s: %s"
+
+#: credential.c:438
+#, c-format
+msgid "url has no scheme: %s"
+msgstr "adres URL nie ma schematu: %s"
+
+#: credential.c:511
+#, c-format
+msgid "credential url cannot be parsed: %s"
+msgstr "nie można przetworzyć poświadczenia adresu URL: %s"
+
+#: date.c:138
+msgid "in the future"
+msgstr "w przyszłości"
+
+#: date.c:144
+#, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] "%<PRIuMAX> sekundę temu"
+msgstr[1] "%<PRIuMAX> sekundy temu"
+msgstr[2] "%<PRIuMAX> sekund temu"
+
+#: date.c:151
+#, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] "%<PRIuMAX> minutę temu"
+msgstr[1] "%<PRIuMAX> minuty temu"
+msgstr[2] "%<PRIuMAX> minut temu"
+
+#: date.c:158
+#, c-format
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] "%<PRIuMAX> godzinę temu"
+msgstr[1] "%<PRIuMAX> godziny temu"
+msgstr[2] "%<PRIuMAX> godzin temu"
+
+#: date.c:165
+#, c-format
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] "%<PRIuMAX> dzień temu"
+msgstr[1] "%<PRIuMAX> dni temu"
+msgstr[2] "%<PRIuMAX> dni temu"
+
+#: date.c:171
+#, c-format
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] "%<PRIuMAX> tydzień temu"
+msgstr[1] "%<PRIuMAX> tygodnie temu"
+msgstr[2] "%<PRIuMAX> tygodni temu"
+
+#: date.c:178
+#, c-format
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] "%<PRIuMAX> miesiąc temu"
+msgstr[1] "%<PRIuMAX> miesiące temu"
+msgstr[2] "%<PRIuMAX> miesięcy temu"
+
+#: date.c:189
+#, c-format
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] "%<PRIuMAX> rok"
+msgstr[1] "%<PRIuMAX> lata"
+msgstr[2] "%<PRIuMAX> lat"
+
+#. 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> miesiąc temu"
+msgstr[1] "%s, %<PRIuMAX> miesiące temu"
+msgstr[2] "%s, %<PRIuMAX> miesięcy temu"
+
+#: date.c:197 date.c:202
+#, c-format
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] "%<PRIuMAX> rok temu"
+msgstr[1] "%<PRIuMAX> lata temu"
+msgstr[2] "%<PRIuMAX> lat temu"
+
+#: delta-islands.c:272
+msgid "Propagating island marks"
+msgstr "Propagowanie znaczników wyspy"
+
+#: delta-islands.c:290
+#, c-format
+msgid "bad tree object %s"
+msgstr "zły obiekt drzewa %s"
+
+#: delta-islands.c:334
+#, c-format
+msgid "failed to load island regex for '%s': %s"
+msgstr "nie można wczytać wyrażenia wyspy dla „%s”: %s"
+
+#: delta-islands.c:390
+#, c-format
+msgid "island regex from config has too many capture groups (max=%d)"
+msgstr ""
+"wyrażenie wyspy z konfiguracji ma za dużo grup przechwytujących (max=%d)"
+
+#: delta-islands.c:467
+#, c-format
+msgid "Marked %d islands, done.\n"
+msgstr "Oznaczono %d wysp, gotowe.\n"
+
+#: diff-merges.c:70
+#, c-format
+msgid "unknown value for --diff-merges: %s"
+msgstr "nierozpoznana wartość --diff-merges: %s"
+
+#: diff-lib.c:534
+msgid "--merge-base does not work with ranges"
+msgstr "--merge-base nie działa z zakresami"
+
+#: diff-lib.c:536
+msgid "--merge-base only works with commits"
+msgstr "--merge-base działa tylko z zapisami"
+
+#: diff-lib.c:553
+msgid "unable to get HEAD"
+msgstr "nie można uzyskać HEAD"
+
+#: diff-lib.c:560
+msgid "no merge base found"
+msgstr "nie znaleziono podstawy scalenia"
+
+#: diff-lib.c:562
+msgid "multiple merge bases found"
+msgstr "znaleziono wiele podstaw scalenia"
+
+#: diff-no-index.c:238
+msgid "git diff --no-index [<options>] <path> <path>"
+msgstr "git diff --no-index [<opcje>] <ścieżka> <ścieżka>"
+
+#: diff-no-index.c:263
+msgid ""
+"Not a git repository. Use --no-index to compare two paths outside a working "
+"tree"
+msgstr ""
+"To nie jest repozytorium gita. Użyj --no-index, aby porównać dwie ścieżki "
+"poza drzewem roboczym"
+
+#: diff.c:156
+#, c-format
+msgid " Failed to parse dirstat cut-off percentage '%s'\n"
+msgstr " Nie można przetworzyć procentu odcięcia dirstat „%s”\n"
+
+#: diff.c:161
+#, c-format
+msgid " Unknown dirstat parameter '%s'\n"
+msgstr " Nieznany parametr dirstat „%s”\n"
+
+#: diff.c:297
+msgid ""
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
+msgstr ""
+"ustawienie kolorowania przeniesień musi być jednym z „no”, „default”, "
+"„blocks”, „zebra”, „dimmed-zebra” czy „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 ""
+"nieznany tryb color-moved-ws „%s”, możliwe wartości to „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 nie może być łączone z innymi "
+"trybami białych znaków"
+
+#: diff.c:410
+#, c-format
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgstr "Nierozpoznana wartość zmiennej konfiguracji „diff.submodule”: „%s”"
+
+#: diff.c:470
+#, c-format
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
+msgstr ""
+"Znaleziono błędy w zmiennej konfiguracji „diff.dirstat”:\n"
+"%s"
+
+#: diff.c:4276
+#, c-format
+msgid "external diff died, stopping at %s"
+msgstr "zewnętrzny diff padł, zatrzymano na %s"
+
+#: diff.c:4628
+msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+msgstr "--name-only, --name-status, --check i -s się wykluczają"
+
+#: diff.c:4631
+msgid "-G, -S and --find-object are mutually exclusive"
+msgstr "-G, -S i --find-object się wykluczają"
+
+#: diff.c:4710
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow wymaga dokładnie jednej ścieżki"
+
+#: diff.c:4758
+#, c-format
+msgid "invalid --stat value: %s"
+msgstr "nieprawidłowa wartość --stat: %s"
+
+#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306
+#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
+#, c-format
+msgid "%s expects a numerical value"
+msgstr "%s oczekuje wartości liczbowej"
+
+#: diff.c:4795
+#, c-format
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
+msgstr ""
+"Nie można przetworzyć parametru opcji --dirstat/-X:\n"
+"%s"
+
+#: diff.c:4880
+#, c-format
+msgid "unknown change class '%c' in --diff-filter=%s"
+msgstr "nieznana klasa zmian „%c” w --diff-filter=%s"
+
+#: diff.c:4904
+#, c-format
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr "nieznana wartość po ws-error-highlight=%.*s"
+
+#: diff.c:4918
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "nie można rozwiązać „%s”"
+
+#: diff.c:4968 diff.c:4974
+#, c-format
+msgid "%s expects <n>/<m> form"
+msgstr "%s oczekuje postaci <n>/<m>"
+
+#: diff.c:4986
+#, c-format
+msgid "%s expects a character, got '%s'"
+msgstr "%s oczekuje znaku, otrzymano „%s”"
+
+#: diff.c:5007
+#, c-format
+msgid "bad --color-moved argument: %s"
+msgstr "zły argument --color-moved: %s"
+
+#: diff.c:5026
+#, c-format
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr "nieprawidłowy tryb „%s” w --color-moved-ws"
+
+#: diff.c:5066
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+msgstr ""
+"opcja diff-algorithm przyjmuje „myers”, „minimal”, „patience” i „histogram”"
+
+#: diff.c:5102 diff.c:5122
+#, c-format
+msgid "invalid argument to %s"
+msgstr "nieprawidłowy argument do %s"
+
+#: diff.c:5226
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr "w -I podano nieprawidłowe wyrażenie regularne: „%s”"
+
+#: diff.c:5275
+#, c-format
+msgid "failed to parse --submodule option parameter: '%s'"
+msgstr "nie można przetworzyć parametru opcji --submodule: „%s”"
+
+#: diff.c:5331
+#, c-format
+msgid "bad --word-diff argument: %s"
+msgstr "zły argument --word-diff: %s"
+
+#: diff.c:5367
+msgid "Diff output format options"
+msgstr "Opcje formatu wyjściowego różnic"
+
+#: diff.c:5369 diff.c:5375
+msgid "generate patch"
+msgstr "wygeneruj łatkę"
+
+#: diff.c:5372 builtin/log.c:179
+msgid "suppress diff output"
+msgstr "nie wypisuj różnic"
+
+#: diff.c:5377 diff.c:5491 diff.c:5498
+msgid "<n>"
+msgstr "<n>"
+
+#: diff.c:5378 diff.c:5381
+msgid "generate diffs with <n> lines context"
+msgstr "wygeneruj różnice z <n> wierszami kontekstu"
+
+#: diff.c:5383
+msgid "generate the diff in raw format"
+msgstr "wygeneruj różnice w surowym formacie"
+
+#: diff.c:5386
+msgid "synonym for '-p --raw'"
+msgstr "synonim do „-p --raw”"
+
+#: diff.c:5390
+msgid "synonym for '-p --stat'"
+msgstr "synonim do „-p --stat”"
+
+#: diff.c:5394
+msgid "machine friendly --stat"
+msgstr "--stat czytelne dla maszyny"
+
+#: diff.c:5397
+msgid "output only the last line of --stat"
+msgstr "wypisz tylko ostatni wiersz --stat"
+
+#: diff.c:5399 diff.c:5407
+msgid "<param1,param2>..."
+msgstr "<param1,param2>..."
+
+#: diff.c:5400
+msgid ""
+"output the distribution of relative amount of changes for each sub-directory"
+msgstr "wypisz rozkład względnej ilości zmian w każdym podkatalogu"
+
+#: diff.c:5404
+msgid "synonym for --dirstat=cumulative"
+msgstr "zamiennik na --dirstat=cumulative"
+
+#: diff.c:5408
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr "synonim do --dirstat=files,param1,param2..."
+
+#: diff.c:5412
+msgid "warn if changes introduce conflict markers or whitespace errors"
+msgstr ""
+"ostrzegaj, jeśli zmiany wprowadzają znaczniki konfliktów lub błędy białych "
+"znaków"
+
+#: diff.c:5415
+msgid "condensed summary such as creations, renames and mode changes"
+msgstr "zwarte podsumowanie takie jak utworzenia czy zmiany nazw i trybów"
+
+#: diff.c:5418
+msgid "show only names of changed files"
+msgstr "pokazuj tylko nazwy zmienionych plików"
+
+#: diff.c:5421
+msgid "show only names and status of changed files"
+msgstr "pokazuj tylko nazwy i stan zmienionych plików"
+
+#: diff.c:5423
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr "<szerokość>[,<szerokość-nazwy>[,<liczba>]]"
+
+#: diff.c:5424
+msgid "generate diffstat"
+msgstr "wygeneruj statystyki różnic"
+
+#: diff.c:5426 diff.c:5429 diff.c:5432
+msgid "<width>"
+msgstr "<szerokość>"
+
+#: diff.c:5427
+msgid "generate diffstat with a given width"
+msgstr "wygeneruj statystyki różnic o podanej szerokości"
+
+#: diff.c:5430
+msgid "generate diffstat with a given name width"
+msgstr "wygeneruj statystyki różnic o podanej szerokości nazw"
+
+#: diff.c:5433
+msgid "generate diffstat with a given graph width"
+msgstr "wygeneruj statystyki różnic o podanej szerokości grafu"
+
+#: diff.c:5435
+msgid "<count>"
+msgstr "<liczba>"
+
+#: diff.c:5436
+msgid "generate diffstat with limited lines"
+msgstr "wygeneruj statystyki różnic o ograniczonych wierszach"
+
+#: diff.c:5439
+msgid "generate compact summary in diffstat"
+msgstr "wygeneruj zwięzłe podsumowanie w statystykach różnic"
+
+#: diff.c:5442
+msgid "output a binary diff that can be applied"
+msgstr "wypisz binarne różnice, które mogą być zastosowane"
+
+#: diff.c:5445
+msgid "show full pre- and post-image object names on the \"index\" lines"
+msgstr ""
+"pokaż pełne nazwy obiektów wstępnego i końcowego obrazu w wierszach „index”"
+
+#: diff.c:5447
+msgid "show colored diff"
+msgstr "pokaż kolorowe różnice"
+
+#: diff.c:5448
+msgid "<kind>"
+msgstr "<rodzaj>"
+
+#: diff.c:5449
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
+msgstr ""
+"podświetl błędy białych znaków w rodzaju wierszy różnic: „context”, „old” "
+"lub „new”"
+
+#: diff.c:5452
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+"nie męcz ścieżek i użyj znaków NUL do rozdzielenia pól w --raw lub --numstat"
+
+#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570
+msgid "<prefix>"
+msgstr "<prefiks>"
+
+#: diff.c:5456
+msgid "show the given source prefix instead of \"a/\""
+msgstr "pokaż podany prefiks źródła zamiast „a/”"
+
+#: diff.c:5459
+msgid "show the given destination prefix instead of \"b/\""
+msgstr "pokaż podany prefiks celu zamiast „b/”"
+
+#: diff.c:5462
+msgid "prepend an additional prefix to every line of output"
+msgstr "dodatkowy prefiks do dodania przed każdym wierszem wyjścia"
+
+#: diff.c:5465
+msgid "do not show any source or destination prefix"
+msgstr "nie pokazuj żadnego prefiksu źródła ani celu"
+
+#: diff.c:5468
+msgid "show context between diff hunks up to the specified number of lines"
+msgstr "pokaż kontekst między skrawkami różnic do podanej liczby wierszy"
+
+#: diff.c:5472 diff.c:5477 diff.c:5482
+msgid "<char>"
+msgstr "<znak>"
+
+#: diff.c:5473
+msgid "specify the character to indicate a new line instead of '+'"
+msgstr "podaj znak wskazujący nowy wiersz zamiast „+”"
+
+#: diff.c:5478
+msgid "specify the character to indicate an old line instead of '-'"
+msgstr "podaj znak wskazujący stary wiersz zamiast „-”"
+
+#: diff.c:5483
+msgid "specify the character to indicate a context instead of ' '"
+msgstr "podaj znak wskazujący kontekst zamiast odstępu „ ”"
+
+#: diff.c:5486
+msgid "Diff rename options"
+msgstr "Opcje zmiany nazw różnic"
+
+#: diff.c:5487
+msgid "<n>[/<m>]"
+msgstr "<n>[/<m>]"
+
+#: diff.c:5488
+msgid "break complete rewrite changes into pairs of delete and create"
+msgstr "rozbij zmiany zupełnego przepisania na pary usunięć i utworzeń"
+
+#: diff.c:5492
+msgid "detect renames"
+msgstr "wykrywaj zmiany nazw"
+
+#: diff.c:5496
+msgid "omit the preimage for deletes"
+msgstr "omiń wstępny obraz przy usunięciach"
+
+#: diff.c:5499
+msgid "detect copies"
+msgstr "wykrywaj kopie"
+
+#: diff.c:5503
+msgid "use unmodified files as source to find copies"
+msgstr "użyj niezmodyfikowanych plików jako źródła do znalezienia kopii"
+
+#: diff.c:5505
+msgid "disable rename detection"
+msgstr "wyłącz wykrywanie zmian nazw"
+
+#: diff.c:5508
+msgid "use empty blobs as rename source"
+msgstr "użyj pustych blobów jako źródła zmiany nazwy"
+
+#: diff.c:5510
+msgid "continue listing the history of a file beyond renames"
+msgstr "kontynuuj wypisywanie historii pliku poza zmianami nazw"
+
+#: diff.c:5513
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
+msgstr ""
+"powstrzymaj wykrywanie zmian nazw i kopii, jeśli liczba zmian nazw / kopii "
+"przekracza podaną granicę"
+
+#: diff.c:5515
+msgid "Diff algorithm options"
+msgstr "Opcje algorytmu różnic"
+
+#: diff.c:5517
+msgid "produce the smallest possible diff"
+msgstr "wyprodukuj najmniejsze możliwe różnice"
+
+#: diff.c:5520
+msgid "ignore whitespace when comparing lines"
+msgstr "ignoruj zmiany w białych znakach przy porównywaniu plików"
+
+#: diff.c:5523
+msgid "ignore changes in amount of whitespace"
+msgstr "ignoruj zmiany w liczbie białych znaków"
+
+#: diff.c:5526
+msgid "ignore changes in whitespace at EOL"
+msgstr "ignoruj zmiany w białych znakach na końcu wiersza"
+
+#: diff.c:5529
+msgid "ignore carrier-return at the end of line"
+msgstr "ignoruj powrót karetki (CR) na końcu wiersza"
+
+#: diff.c:5532
+msgid "ignore changes whose lines are all blank"
+msgstr "ignoruj zmiany, których wszystkie wiersze są puste"
+
+#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604
+msgid "<regex>"
+msgstr "<wyr-reg>"
+
+#: diff.c:5535
+msgid "ignore changes whose all lines match <regex>"
+msgstr "ignoruj zmiany, których wszystkie wiersze pasują do <wyr-reg>"
+
+#: diff.c:5538
+msgid "heuristic to shift diff hunk boundaries for easy reading"
+msgstr ""
+"heurystyka do przesunięcia granic skrawków różnic, aby ułatwić czytanie"
+
+#: diff.c:5541
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr "wygeneruj różnice używając algorytmu „cierpliwych różnic”"
+
+#: diff.c:5545
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr "wygeneruj różnice używając algorytmu „histogramu różnic”"
+
+#: diff.c:5547
+msgid "<algorithm>"
+msgstr "<algorytm>"
+
+#: diff.c:5548
+msgid "choose a diff algorithm"
+msgstr "wybierz algorytm różnic"
+
+#: diff.c:5550
+msgid "<text>"
+msgstr "<tekst>"
+
+#: diff.c:5551
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr "wygeneruj różnice używając algorytmu „zakotwiczonych różnic”"
+
+#: diff.c:5553 diff.c:5562 diff.c:5565
+msgid "<mode>"
+msgstr "<tryb>"
+
+#: diff.c:5554
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr "pokaż różnice słów, używając <trybu> do rozdzielenia zmienionych słów"
+
+#: diff.c:5557
+msgid "use <regex> to decide what a word is"
+msgstr "użyj <wyr-reg>, aby zdecydować, czym jest słowo"
+
+#: diff.c:5560
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr "równoważne --word-diff=color --word-diff-regex=<wyr-reg>"
+
+#: diff.c:5563
+msgid "moved lines of code are colored differently"
+msgstr "przeniesione wiersze kodu są kolorowane inaczej"
+
+#: diff.c:5566
+msgid "how white spaces are ignored in --color-moved"
+msgstr "jak są ignorowane białe znaki w --color-moved"
+
+#: diff.c:5569
+msgid "Other diff options"
+msgstr "Inne opcje różnic"
+
+#: diff.c:5571
+msgid "when run from subdir, exclude changes outside and show relative paths"
+msgstr ""
+"kiedy uruchomione z podkatalogu, pomiń zmiany poza nim i pokaż względne "
+"ścieżki"
+
+#: diff.c:5575
+msgid "treat all files as text"
+msgstr "traktuj wszystkie pliki jako tekstowe"
+
+#: diff.c:5577
+msgid "swap two inputs, reverse the diff"
+msgstr "zamień dwa wejścia, odwróć różnice"
+
+#: diff.c:5579
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr "wyjdź z 1 jeśli nie ma różnic, 0 w przeciwnym wypadku"
+
+#: diff.c:5581
+msgid "disable all output of the program"
+msgstr "wyłącz całe wyjście programu"
+
+#: diff.c:5583
+msgid "allow an external diff helper to be executed"
+msgstr "pozwól wykonać zewnętrzny pomocnik różnic"
+
+#: diff.c:5585
+msgid "run external text conversion filters when comparing binary files"
+msgstr ""
+"wykonaj zewnętrzne filtry konwersji tekstu przy porównywaniu plików binarnych"
+
+#: diff.c:5587
+msgid "<when>"
+msgstr "<kiedy>"
+
+#: diff.c:5588
+msgid "ignore changes to submodules in the diff generation"
+msgstr "ignoruj zmiany w pod-modułach przy generowaniu różnic"
+
+#: diff.c:5591
+msgid "<format>"
+msgstr "<format>"
+
+#: diff.c:5592
+msgid "specify how differences in submodules are shown"
+msgstr "podaj, jak będą pokazywane różnice w pod-modułach"
+
+#: diff.c:5596
+msgid "hide 'git add -N' entries from the index"
+msgstr "ukryj elementy „git add -N” z indeksu"
+
+#: diff.c:5599
+msgid "treat 'git add -N' entries as real in the index"
+msgstr "traktuj elementy „git add -N” jako prawdziwe w indeksie"
+
+#: diff.c:5601
+msgid "<string>"
+msgstr "<łańcuch>"
+
+#: diff.c:5602
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"string"
+msgstr "szukaj różnic, które zmieniają liczbę wystąpień podanego łańcucha"
+
+#: diff.c:5605
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
+msgstr ""
+"szukaj różnic, które zmieniają liczbę wystąpień podanego wyrażenia "
+"regularnego"
+
+#: diff.c:5608
+msgid "show all changes in the changeset with -S or -G"
+msgstr "pokaż wszystkie zmiany w zestawie z -S lub -G"
+
+#: diff.c:5611
+msgid "treat <string> in -S as extended POSIX regular expression"
+msgstr "traktuj <łańcuch> w -S jako rozszerzone wyrażenie regularne POSIX"
+
+#: diff.c:5614
+msgid "control the order in which files appear in the output"
+msgstr "ustaw kolejność, w jakiej pliki pojawią się na wyjściu"
+
+#: diff.c:5615 diff.c:5618
+msgid "<path>"
+msgstr "<ścieżka>"
+
+#: diff.c:5616
+msgid "show the change in the specified path first"
+msgstr "pokaż najpierw zmianę w podanej ścieżce"
+
+#: diff.c:5619
+msgid "skip the output to the specified path"
+msgstr "pomiń wyjście do podanej ścieżki"
+
+#: diff.c:5621
+msgid "<object-id>"
+msgstr "<id-obiektu>"
+
+#: diff.c:5622
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"object"
+msgstr "szukaj różnic, które zmieniają liczbę wystąpień podanego obiektu"
+
+#: diff.c:5624
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
+
+#: diff.c:5625
+msgid "select files by diff type"
+msgstr "wybierz pliki według rodzaju różnic"
+
+#: diff.c:5627
+msgid "<file>"
+msgstr "<plik>"
+
+#: diff.c:5628
+msgid "Output to a specific file"
+msgstr "Wyjście do podanego pliku"
+
+#: diff.c:6285
+msgid "inexact rename detection was skipped due to too many files."
+msgstr ""
+"pominięto wykrywanie niedokładnych zmian nazw z powodu zbyt wielu plików."
+
+#: diff.c:6288
+msgid "only found copies from modified paths due to too many files."
+msgstr ""
+"znaleziono kopie tylko ze zmienionych ścieżek z powodu zbyt wielu plików."
+
+#: diff.c:6291
+#, c-format
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr ""
+"możesz chcieć ustawić zmienną %s na przynajmniej %d i ponowić polecenie."
+
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "nie można odczytać pliku kolejności „%s”"
+
+#: diffcore-rename.c:555
+msgid "Performing inexact rename detection"
+msgstr "Wykrywanie niedokładnych zmian nazw"
+
+#: diffcore-rotate.c:29
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr "W różnicy nie ma ścieżki „%s”"
+
+#: dir.c:578
+#, c-format
+msgid "pathspec '%s' did not match any file(s) known to git"
+msgstr "ścieżka „%s” nie pasuje do żadnych plików znanych gitowi"
+
+#: dir.c:718 dir.c:747 dir.c:760
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr "nierozpoznany wzorzec: %s"
+
+#: dir.c:777 dir.c:791
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr "nierozpoznany antywzorzec: „%s”"
+
+#: dir.c:809
+#, c-format
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
+msgstr ""
+"twój plik rzadkiego wybrania może mieć problemy: wzorzec „%s” jest powtórzony"
+
+#: dir.c:819
+msgid "disabling cone pattern matching"
+msgstr "wyłączanie stożkowego dopasowania wzorca"
+
+#: dir.c:1198
+#, c-format
+msgid "cannot use %s as an exclude file"
+msgstr "nie można użyć %s jako pliku wyłączeń"
+
+#: dir.c:2305
+#, c-format
+msgid "could not open directory '%s'"
+msgstr "nie można otworzyć katalogu „%s”"
+
+#: dir.c:2605
+msgid "failed to get kernel name and information"
+msgstr "nie można uzyskać nazwy i informacji jądra"
+
+#: dir.c:2729
+msgid "untracked cache is disabled on this system or location"
+msgstr "pamięć o nieśledzonych jest wyłączona w tym systemie lub położeniu"
+
+#: dir.c:3537
+#, c-format
+msgid "index file corrupt in repo %s"
+msgstr "uszkodzony plik indeksu w repozytorium %s"
+
+#: dir.c:3582 dir.c:3587
+#, c-format
+msgid "could not create directories for %s"
+msgstr "nie można utworzyć katalogów dla %s"
+
+#: dir.c:3616
+#, c-format
+msgid "could not migrate git directory from '%s' to '%s'"
+msgstr "nie można zmigrować katalogu gita z „%s” do „%s”"
+
+#: editor.c:74
+#, c-format
+msgid "hint: Waiting for your editor to close the file...%c"
+msgstr "wskazówka: Czekanie, aż edytor zamknie plik...%c"
+
+#: entry.c:177
+msgid "Filtering content"
+msgstr "Filtrowanie zawartości"
+
+#: entry.c:478
+#, c-format
+msgid "could not stat file '%s'"
+msgstr "nie można wykonać stat na pliku „%s”"
+
+#: environment.c:152
+#, c-format
+msgid "bad git namespace path \"%s\""
+msgstr "zła ścieżka przestrzeni nazw gita „%s”"
+
+#: environment.c:335
+#, c-format
+msgid "could not set GIT_DIR to '%s'"
+msgstr "nie można ustawić GIT_DIR na „%s”"
+
+#: exec-cmd.c:363
+#, c-format
+msgid "too many args to run %s"
+msgstr "za dużo argumentów, aby wykonać %s"
+
+#: fetch-pack.c:177
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack: oczekiwano listy shallow"
+
+#: fetch-pack.c:180
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr "git fetch-pack: oczekiwano pakietu wypróżnienia po płytkiej liście"
+
+#: fetch-pack.c:191
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+msgstr "git fetch-pack: oczekiwano ACK/NAK, otrzymano pakiet wypróżnienia"
+
+#: fetch-pack.c:211
+#, c-format
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr "git fetch-pack: oczekiwano ACK/NAK, otrzymano „%s”"
+
+#: fetch-pack.c:222
+msgid "unable to write to remote"
+msgstr "nie można pisać do zdalnego repozytorium"
+
+#: fetch-pack.c:283
+msgid "--stateless-rpc requires multi_ack_detailed"
+msgstr "--stateless-rpc wymaga multi_ack_detailed"
+
+#: fetch-pack.c:378 fetch-pack.c:1400
+#, c-format
+msgid "invalid shallow line: %s"
+msgstr "nieprawidłowy wiersz shallow: %s"
+
+#: fetch-pack.c:384 fetch-pack.c:1406
+#, c-format
+msgid "invalid unshallow line: %s"
+msgstr "nieprawidłowy wiersz unshallow: %s"
+
+#: fetch-pack.c:386 fetch-pack.c:1408
+#, c-format
+msgid "object not found: %s"
+msgstr "nie znaleziono obiektu: %s"
+
+#: fetch-pack.c:389 fetch-pack.c:1411
+#, c-format
+msgid "error in object: %s"
+msgstr "błąd w obiekcie: %s"
+
+#: fetch-pack.c:391 fetch-pack.c:1413
+#, c-format
+msgid "no shallow found: %s"
+msgstr "nie znaleziono shallow: %s"
+
+#: fetch-pack.c:394 fetch-pack.c:1417
+#, c-format
+msgid "expected shallow/unshallow, got %s"
+msgstr "oczekiwano shallow/unshallow, otrzymano %s"
+
+#: fetch-pack.c:434
+#, c-format
+msgid "got %s %d %s"
+msgstr "dostałem %s %d %s"
+
+#: fetch-pack.c:451
+#, c-format
+msgid "invalid commit %s"
+msgstr "nieprawidłowy zapis %s"
+
+#: fetch-pack.c:482
+msgid "giving up"
+msgstr "poddaję się"
+
+#: fetch-pack.c:495 progress.c:339
+msgid "done"
+msgstr "gotowe"
+
+#: fetch-pack.c:507
+#, c-format
+msgid "got %s (%d) %s"
+msgstr "dostałem %s (%d) %s"
+
+#: fetch-pack.c:543
+#, c-format
+msgid "Marking %s as complete"
+msgstr "Oznaczam %s jako gotowe"
+
+#: fetch-pack.c:758
+#, c-format
+msgid "already have %s (%s)"
+msgstr "już mam %s (%s)"
+
+#: fetch-pack.c:821
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr "fetch-pack: nie można uruchomić rozdzielania pasma bocznego"
+
+#: fetch-pack.c:829
+msgid "protocol error: bad pack header"
+msgstr "błąd protokołu: zły nagłówek paczki"
+
+#: fetch-pack.c:913
+#, c-format
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack: nie można uruchomić %s"
+
+#: fetch-pack.c:931
+#, c-format
+msgid "%s failed"
+msgstr "%s nie powiodło się"
+
+#: fetch-pack.c:933
+msgid "error in sideband demultiplexer"
+msgstr "błąd rozdzielania pasma bocznego"
+
+#: fetch-pack.c:976
+#, c-format
+msgid "Server version is %.*s"
+msgstr "Wersja serwera to %.*s"
+
+#: fetch-pack.c:984 fetch-pack.c:990 fetch-pack.c:993 fetch-pack.c:999
+#: fetch-pack.c:1003 fetch-pack.c:1007 fetch-pack.c:1011 fetch-pack.c:1015
+#: fetch-pack.c:1019 fetch-pack.c:1023 fetch-pack.c:1027 fetch-pack.c:1031
+#: fetch-pack.c:1037 fetch-pack.c:1043 fetch-pack.c:1048 fetch-pack.c:1053
+#, c-format
+msgid "Server supports %s"
+msgstr "Serwer wspiera %s"
+
+#: fetch-pack.c:986
+msgid "Server does not support shallow clients"
+msgstr "Serwer nie wspiera płytkich klientów"
+
+#: fetch-pack.c:1046
+msgid "Server does not support --shallow-since"
+msgstr "Serwer nie wspiera --shallow-since"
+
+#: fetch-pack.c:1051
+msgid "Server does not support --shallow-exclude"
+msgstr "Serwer nie wspiera --shallow-exclude"
+
+#: fetch-pack.c:1055
+msgid "Server does not support --deepen"
+msgstr "Serwer nie wspiera --deepen"
+
+#: fetch-pack.c:1057
+msgid "Server does not support this repository's object format"
+msgstr "Serwer nie wspiera formatu obiektów z tego repozytorium"
+
+#: fetch-pack.c:1070
+msgid "no common commits"
+msgstr "brak wspólnych zapisów"
+
+#: fetch-pack.c:1082 fetch-pack.c:1622
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack: pobieranie nie powiodło się."
+
+#: fetch-pack.c:1208
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "niezgodne algorytmy: klient %s; serwer %s"
+
+#: fetch-pack.c:1212
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "serwer nie wspiera algorytmu „%s”"
+
+#: fetch-pack.c:1232
+msgid "Server does not support shallow requests"
+msgstr "Serwer nie wspiera płytkich żądań"
+
+#: fetch-pack.c:1239
+msgid "Server supports filter"
+msgstr "Serwer wspiera filtrowanie"
+
+#: fetch-pack.c:1278
+msgid "unable to write request to remote"
+msgstr "nie można pisać żądania do zdalnej maszyny"
+
+#: fetch-pack.c:1296
+#, c-format
+msgid "error reading section header '%s'"
+msgstr "błąd odczytu nagłówka rozdziału „%s”"
+
+#: fetch-pack.c:1302
+#, c-format
+msgid "expected '%s', received '%s'"
+msgstr "oczekiwano „%s”, odebrano „%s”"
+
+#: fetch-pack.c:1363
+#, c-format
+msgid "unexpected acknowledgment line: '%s'"
+msgstr "nieoczekiwany wiersz potwierdzenia: „%s”"
+
+#: fetch-pack.c:1368
+#, c-format
+msgid "error processing acks: %d"
+msgstr "błąd przetwarzania potwierdzeń: %d"
+
+#: fetch-pack.c:1378
+msgid "expected packfile to be sent after 'ready'"
+msgstr "oczekiwano pliku paczki wysłanego po „ready”"
+
+#: fetch-pack.c:1380
+msgid "expected no other sections to be sent after no 'ready'"
+msgstr "nie oczekiwano innych rozdziałów wysłanych po braku „ready”"
+
+#: fetch-pack.c:1422
+#, c-format
+msgid "error processing shallow info: %d"
+msgstr "błąd przetwarzania płytkich informacji: %d"
+
+#: fetch-pack.c:1469
+#, c-format
+msgid "expected wanted-ref, got '%s'"
+msgstr "oczekiwano wanted-ref, otrzymano %s"
+
+#: fetch-pack.c:1474
+#, c-format
+msgid "unexpected wanted-ref: '%s'"
+msgstr "nieoczekiwana wanted-ref: „%s”"
+
+#: fetch-pack.c:1479
+#, c-format
+msgid "error processing wanted refs: %d"
+msgstr "błąd przetwarzania chcianych referencji: %d"
+
+#: fetch-pack.c:1509
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack: oczekiwano pakietu końca odpowiedzi"
+
+#: fetch-pack.c:1891
+msgid "no matching remote head"
+msgstr "brak pasującego zdalnego czoła"
+
+#: fetch-pack.c:1914 builtin/clone.c:693
+msgid "remote did not send all necessary objects"
+msgstr "zdalna maszyna nie przysłała wszystkich potrzebnych obiektów"
+
+#: fetch-pack.c:1941
+#, c-format
+msgid "no such remote ref %s"
+msgstr "nie ma takiej zdalnej referencji %s"
+
+#: fetch-pack.c:1944
+#, c-format
+msgid "Server does not allow request for unadvertised object %s"
+msgstr "Serwer nie pozwala na żądanie o nieogłoszony obiekt %s"
+
+#: gpg-interface.c:273
+msgid "could not create temporary file"
+msgstr "nie można utworzyć pliku tymczasowego"
+
+#: gpg-interface.c:276
+#, c-format
+msgid "failed writing detached signature to '%s'"
+msgstr "nie można zapisać oddzielonego podpisu do „%s”"
+
+#: gpg-interface.c:470
+msgid "gpg failed to sign the data"
+msgstr "gpg nie może podpisać danych"
+
+#: graph.c:98
+#, c-format
+msgid "ignore invalid color '%.*s' in log.graphColors"
+msgstr "ignoruj nieprawidłowy kolor „%.*s” w log.graphColors"
+
+#: grep.c:543
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
+msgstr ""
+"podany wzorzec zawiera znak NUL (przez -f <plik>). To jest wspierane tylko z "
+"-P pod PCRE v2"
+
+#: grep.c:1906
+#, c-format
+msgid "'%s': unable to read %s"
+msgstr "„%s”: nie można przeczytać %s"
+
+#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90
+#: builtin/rm.c:135
+#, c-format
+msgid "failed to stat '%s'"
+msgstr "nie można wykonać stat na „%s”'"
+
+#: grep.c:1934
+#, c-format
+msgid "'%s': short read"
+msgstr "„%s”: przeczytano mniej niż powinno być"
+
+#: help.c:23
+msgid "start a working area (see also: git help tutorial)"
+msgstr "przyszykuj obszar do pracy (zobacz też: git help tutorial)"
+
+#: help.c:24
+msgid "work on the current change (see also: git help everyday)"
+msgstr "pracuj nad bieżącą zmianą (zobacz też: git help everyday)"
+
+#: help.c:25
+msgid "examine the history and state (see also: git help revisions)"
+msgstr "badaj historię i stan (zobacz też: git help revisions)"
+
+#: help.c:26
+msgid "grow, mark and tweak your common history"
+msgstr "poszerzaj, oznaczaj i dostosowuj wspólną historię"
+
+#: help.c:27
+msgid "collaborate (see also: git help workflows)"
+msgstr "współpracuj (zobacz też: git help workflows)"
+
+#: help.c:31
+msgid "Main Porcelain Commands"
+msgstr "Główne porcelanowe polecenia"
+
+#: help.c:32
+msgid "Ancillary Commands / Manipulators"
+msgstr "Polecenia pomocnicze / manipulatory"
+
+#: help.c:33
+msgid "Ancillary Commands / Interrogators"
+msgstr "Polecenia pomocnicze / odpytywanie"
+
+#: help.c:34
+msgid "Interacting with Others"
+msgstr "Interakcje z innymi"
+
+#: help.c:35
+msgid "Low-level Commands / Manipulators"
+msgstr "Polecenia niskopoziomowe / manipulatory"
+
+#: help.c:36
+msgid "Low-level Commands / Interrogators"
+msgstr "Polecenia niskopoziomowe / odpytywanie"
+
+#: help.c:37
+msgid "Low-level Commands / Syncing Repositories"
+msgstr "Polecenia niskopoziomowe / synchronizacja repozytoriów"
+
+#: help.c:38
+msgid "Low-level Commands / Internal Helpers"
+msgstr "Polecenia niskopoziomowe / wewnętrzne pomocniki"
+
+#: help.c:300
+#, c-format
+msgid "available git commands in '%s'"
+msgstr "dostępne polecenia gita w „%s”"
+
+#: help.c:307
+msgid "git commands available from elsewhere on your $PATH"
+msgstr "polecenia gita dostępne gdzie indziej w ścieżce $PATH"
+
+#: help.c:316
+msgid "These are common Git commands used in various situations:"
+msgstr "Oto częste polecenia Gita używane w różnych sytuacjach:"
+
+#: help.c:365 git.c:100
+#, c-format
+msgid "unsupported command listing type '%s'"
+msgstr "nieobsługiwany rodzaj spisu poleceń „%s”"
+
+#: help.c:405
+msgid "The Git concept guides are:"
+msgstr "Podręczniki pojęć Gita to:"
+
+#: help.c:429
+msgid "See 'git help <command>' to read about a specific subcommand"
+msgstr ""
+"Zobacz „git help <polecenie>”, aby przeczytać o konkretnym pod-poleceniu"
+
+#: help.c:434
+msgid "External commands"
+msgstr "Zewnętrzne polecenia"
+
+#: help.c:449
+msgid "Command aliases"
+msgstr "Skróty poleceń"
+
+#: help.c:527
+#, 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” wydaje się być poleceniem gita, ale nie udało się\n"
+"go wykonać. Może git-%s się zepsuł?"
+
+#: help.c:543 help.c:631
+#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr "git: „%s” nie jest poleceniem gita. Zobacz „git --help”."
+
+#: help.c:591
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "O jejciu. Twój system w ogóle nie zgłasza żadnych poleceń gita."
+
+#: help.c:613
+#, c-format
+msgid "WARNING: You called a Git command named '%s', which does not exist."
+msgstr "Ostrzeżenie: Wywołano polecenie Gita „%s”, które nie istnieje."
+
+#: help.c:618
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr "Zakładam dalej, że chodziło o „%s”."
+
+#: help.c:623
+#, c-format
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgstr "Kontynuowanie za %0.1f sekundy, zakładam, że chodziło o „%s”."
+
+#: help.c:635
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] ""
+"\n"
+"Najpodobniejsze polecenie to"
+msgstr[1] ""
+"\n"
+"Najpodobniejsze polecenia to"
+msgstr[2] ""
+"\n"
+"Najpodobniejsze polecenia to"
+
+#: help.c:675
+msgid "git version [<options>]"
+msgstr "git version [<opcje>]"
+
+#: help.c:730
+#, c-format
+msgid "%s: %s - %s"
+msgstr "%s: %s — %s"
+
+#: help.c:734
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+"\n"
+"Czy chodziło o to?"
+msgstr[1] ""
+"\n"
+"Czy chodziło o któreś z tych?"
+msgstr[2] ""
+"\n"
+"Czy chodziło o któreś z tych?"
+
+#: ident.c:353
+msgid "Author identity unknown\n"
+msgstr "Nieznana tożsamość autora\n"
+
+#: ident.c:356
+msgid "Committer identity unknown\n"
+msgstr "Nieznana tożsamość składającego\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"
+"*** Powiedz mi, kim jesteś.\n"
+"\n"
+"Wykonaj\n"
+"\n"
+" git config --global user.email \"toja@example.com\"\n"
+" git config --global user.name \"Twoje Imię Nazwisko\"\n"
+"\n"
+"by ustawić domyślną tożsamość swojego konta.\n"
+"Pomiń --global, żeby ustawić tożsamość tylko w tym repozytorium.\n"
+"\n"
+
+#: ident.c:397
+msgid "no email was given and auto-detection is disabled"
+msgstr "nie podano adresu e-mail, a automatyczne wykrywanie jest wyłączone"
+
+#: ident.c:402
+#, c-format
+msgid "unable to auto-detect email address (got '%s')"
+msgstr "nie można wykryć automatycznie adresu e-mail (otrzymano „%s”)"
+
+#: ident.c:419
+msgid "no name was given and auto-detection is disabled"
+msgstr "nie podano nazwiska, a automatyczne wykrywanie jest wyłączone"
+
+#: ident.c:425
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr "nie można wykryć nazwy (otrzymano „%s”)"
+
+#: ident.c:433
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "puste nazwisko (do <%s>) niedozwolone"
+
+#: ident.c:439
+#, c-format
+msgid "name consists only of disallowed characters: %s"
+msgstr "nazwisko składa się wyłącznie z niedozwolonych znaków: %s"
+
+#: ident.c:454 builtin/commit.c:634
+#, c-format
+msgid "invalid date format: %s"
+msgstr "nieprawidłowy format daty: %s"
+
+#: list-objects-filter-options.c:81
+msgid "expected 'tree:<depth>'"
+msgstr "oczekiwano „tree:<głębokość>”"
+
+#: list-objects-filter-options.c:96
+msgid "sparse:path filters support has been dropped"
+msgstr "wsparcie filtrów sparse:path zostało porzucone"
+
+#: list-objects-filter-options.c:109
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "nieprawidłowy filtr: %s"
+
+#: list-objects-filter-options.c:125
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr "trzeba zacytować znak w podfiltrze: „%c”"
+
+#: list-objects-filter-options.c:167
+msgid "expected something after combine:"
+msgstr "oczekiwano czegoś po combine:"
+
+#: list-objects-filter-options.c:249
+msgid "multiple filter-specs cannot be combined"
+msgstr "nie można łączyć podania wielu filtrów"
+
+#: list-objects-filter-options.c:361
+msgid "unable to upgrade repository format to support partial clone"
+msgstr "nie można podnieść formatu repozytorium, aby wspierać częściowy klon"
+
+#: list-objects-filter.c:492
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "brak dostępu do rzadkiego bloba w „%s”"
+
+#: list-objects-filter.c:495
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "nie można przetworzyć danych rzadkiego filtra w %s"
+
+#: list-objects.c:127
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr "element „%s” drzewa %s ma tryb drzewa, ale nie jest drzewem"
+
+#: list-objects.c:140
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr "element „%s” drzewa %s ma tryb blobu, ale nie jest blobem"
+
+#: list-objects.c:375
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "nie można wczytać drzewa korzenia dla zapisu %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 ""
+"Nie można utworzyć „%s.lock”: %s.\n"
+"\n"
+"Inny proces gita wydaje się działać na tym repozytorium, np.\n"
+"edytor otwarty przez „git commit”. Upewnij się, że wszystkie procesy\n"
+"są zakończone i spróbuj ponownie. Jeśli nadal się nie uda, proces\n"
+"gita mógł się wcześniej zepsuć w tym repozytorium:\n"
+"usuń ten plik ręcznie, aby kontynuować."
+
+#: lockfile.c:160
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "Nie można utworzyć „%s.lock”: %s"
+
+#: ls-refs.c:37
+#, c-format
+msgid "invalid value '%s' for lsrefs.unborn"
+msgstr "nieprawidłowa wartość „%s” lsrefs.unborn"
+
+#: ls-refs.c:167
+msgid "expected flush after ls-refs arguments"
+msgstr "oczekiwano wypróżnienia po argumentach ls-refs"
+
+#: merge-ort.c:855 merge-recursive.c:1191
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr "Nie można scalić pod-modułu %s (nie wybrano)"
+
+#: merge-ort.c:864 merge-recursive.c:1198
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr "Nie można scalić pod-modułu %s (brak zapisów)"
+
+#: merge-ort.c:873 merge-recursive.c:1205
+#, c-format
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
+msgstr "Nie można scalić pod-modułu %s (zapisy nie śledzą podstawy scalania)"
+
+#: merge-ort.c:883 merge-ort.c:890
+#, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr "Uwaga: Przewinięcie pod-modułu %s do %s"
+
+#: merge-ort.c:911
+#, c-format
+msgid "Failed to merge submodule %s"
+msgstr "Nie można scalić pod-modułu %s"
+
+#: merge-ort.c:918
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but a possible merge resolution exists:\n"
+"%s\n"
+msgstr ""
+"Nie można scalić pod-modułu %s, ale istnieje możliwe rozwiązanie:\n"
+"%s\n"
+
+#: merge-ort.c:922 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 ""
+"Jeśli tak ma być, po prostu dodaj go do indeksu, na przykład\n"
+"przez:\n"
+"\n"
+" git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"które przyjmie tylko tę sugestię.\n"
+
+#: merge-ort.c:935
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but multiple possible merges exist:\n"
+"%s"
+msgstr ""
+"Nie można scalić pod-modułu %s, ale istnieją możliwe scalenia:\n"
+"%s"
+
+#: merge-ort.c:1094 merge-recursive.c:1341
+msgid "Failed to execute internal merge"
+msgstr "Nie można wykonać wewnętrznego scalenia"
+
+#: merge-ort.c:1099 merge-recursive.c:1346
+#, c-format
+msgid "Unable to add %s to database"
+msgstr "Nie można dodać %s do bazy danych"
+
+#: merge-ort.c:1106 merge-recursive.c:1378
+#, c-format
+msgid "Auto-merging %s"
+msgstr "Auto-scalanie %s"
+
+#: merge-ort.c:1245 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 ""
+"KONFLIKT (domyślna zmiana nazwy katalogu): Istniejący plik/katalog %s "
+"zawadza domyślnej zmianie nazwy wstawiając tam następujące ścieżki: %s."
+
+#: merge-ort.c:1255 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 ""
+"KONFLIKT (domyślna zmiana nazwy katalogu): Nie można dopasować więcej niż "
+"jednej ścieżki do %s; domyślna zmiana nazwy próbowała wstawić tam "
+"następujące ścieżki: %s"
+
+#: merge-ort.c:1438
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
+"renamed to multiple other directories, with no destination getting a "
+"majority of the files."
+msgstr ""
+"KONFLIKT (podział zmiany nazwy katalogu): Nie ma pewności, jak zmienić nazwę "
+"%s; jego nazwa została zmieniona na wiele innych katalogów, a "
+"żaden z celów nie dostał większości plików."
+
+#: merge-ort.c:1604 merge-recursive.c:2447
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr ""
+"Ostrzeżenie: unikam zastosowania zmiany nazwy %s -> %s na %s, bo %s sam "
+"zmienił nazwę."
+
+#: merge-ort.c:1748 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 ""
+"Zaktualizowano ścieżkę: %s dodano w %s w katalogu, którego nazwa została "
+"zmieniona w %s; przenoszenie go do %s."
+
+#: merge-ort.c:1755 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 ""
+"Zaktualizowano ścieżkę: zmieniono nazwę %s na %s w %s w katalogu, którego "
+"nazwa została zmieniona w %s; przenoszenie go do %s."
+
+#: merge-ort.c:1768 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 ""
+"KONFLIKT (położenie pliku): %s dodano w %s w katalogu, którego nazwa została "
+"zmieniona w %s, co sugeruje, że być może powinien trafić do %s."
+
+#: merge-ort.c:1776 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 ""
+"KONFLIKT (położenie pliku): zmieniono nazwę %s na %s w %s, w katalogu, "
+"którego nazwa została zmieniona w %s, co sugeruje, że być może powinien "
+"trafić do %s."
+
+#: merge-ort.c:1919
+#, c-format
+msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
+msgstr ""
+"KONFLIKT (zmiana nazwy/zmiana nazwy): zmieniono nazwę %s na %s w %s, a na %s"
+" w %s."
+
+#: merge-ort.c:2014
+#, c-format
+msgid ""
+"CONFLICT (rename involved in collision): rename of %s -> %s has content "
+"conflicts AND collides with another path; this may result in nested conflict "
+"markers."
+msgstr ""
+"KONFLIKT (zmiana nazwy związana z kolizją): zmiana nazwy %s -> %s miała "
+"konflikty zawartości A TAKŻE koliduje z inną ścieżką; może to skutkować"
+" zagnieżdżonymi "
+"znacznikami konfliktu."
+
+#: merge-ort.c:2033 merge-ort.c:2057
+#, c-format
+msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
+msgstr ""
+"KONFLIKT (zmiana nazwy/usunięcie): zmieniono nazwę %s na %s w %s, ale"
+" skasowano w %s."
+
+#: merge-ort.c:2683
+#, c-format
+msgid ""
+"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
+"%s instead."
+msgstr ""
+"KONFLIKT (plik/katalog): katalog zawadza %s z %s; zamiast tego przenoszenie "
+"do %s."
+
+#: merge-ort.c:2756
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed %s "
+"of them so each can be recorded somewhere."
+msgstr ""
+"KONFLIKT (różne typy): %s był różnego typu z każdej strony; zmieniono nazwę "
+"%s "
+"z nich, więc każdy może być gdzieś odnotowany."
+
+#: merge-ort.c:2760
+msgid "both"
+msgstr "obu"
+
+#: merge-ort.c:2760
+msgid "one"
+msgstr "jednej"
+
+#: merge-ort.c:2855 merge-recursive.c:3052
+msgid "content"
+msgstr "zawartość"
+
+#: merge-ort.c:2857 merge-recursive.c:3056
+msgid "add/add"
+msgstr "dodano/dodano"
+
+#: merge-ort.c:2859 merge-recursive.c:3101
+msgid "submodule"
+msgstr "pod-moduł"
+
+#: merge-ort.c:2861 merge-recursive.c:3102
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "KONFLIKT (%s): Konflikt scalania w %s"
+
+#: merge-ort.c:2886
+#, c-format
+msgid ""
+"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
+"of %s left in tree."
+msgstr ""
+"KONFLIKT (zmiana/usunięcie): %s usunięto w %s a zmieniono w %s. Wersja %s "
+"pliku %s pozostaje w drzewie."
+
+#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
+#. base, and 2-3) the trees for the two trees we're merging.
+#.
+#: merge-ort.c:3354
+#, c-format
+msgid "collecting merge info failed for trees %s, %s, %s"
+msgstr "nie można zebrać informacji o scaleniu w drzewach %s, %s, %s"
+
+#: merge-ort-wrappers.c:13 merge-recursive.c:3661
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+" %s"
+msgstr ""
+"Twoje lokalne zmiany następujących plików zostaną zastąpione przez "
+"scalenie:\n"
+" %s"
+
+#: merge-ort-wrappers.c:33 merge-recursive.c:3436
+#, c-format
+msgid "Already up to date!"
+msgstr "Już aktualne!"
+
+#: merge-recursive.c:356
+msgid "(bad commit)\n"
+msgstr "(zły zapis)\n"
+
+#: merge-recursive.c:379
+#, c-format
+msgid "add_cacheinfo failed for path '%s'; merge aborting."
+msgstr "add_cacheinfo nie powiodło się na ścieżce „%s”; przerywanie scalania."
+
+#: merge-recursive.c:388
+#, c-format
+msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
+msgstr ""
+"add_cacheinfo nie udało się odświeżyć na ścieżce „%s”; przerywanie scalania."
+
+#: merge-recursive.c:874
+#, c-format
+msgid "failed to create path '%s'%s"
+msgstr "nie można utworzyć ścieżki „%s”%s"
+
+#: merge-recursive.c:885
+#, c-format
+msgid "Removing %s to make room for subdirectory\n"
+msgstr "Usuwanie %s, aby zrobić miejsce na podkatalog\n"
+
+#: merge-recursive.c:899 merge-recursive.c:918
+msgid ": perhaps a D/F conflict?"
+msgstr ": Może konflikt plik/katalog?"
+
+#: merge-recursive.c:908
+#, c-format
+msgid "refusing to lose untracked file at '%s'"
+msgstr "Odmawiam utraty nieśledzonego pliku w „%s”"
+
+#: merge-recursive.c:949 builtin/cat-file.c:41
+#, c-format
+msgid "cannot read object %s '%s'"
+msgstr "nie można odczytać obiektu %s „%s”"
+
+#: merge-recursive.c:954
+#, c-format
+msgid "blob expected for %s '%s'"
+msgstr "oczekiwano blobu w %s „%s”"
+
+#: merge-recursive.c:979
+#, c-format
+msgid "failed to open '%s': %s"
+msgstr "nie można otworzyć „%s”: %s"
+
+#: merge-recursive.c:990
+#, c-format
+msgid "failed to symlink '%s': %s"
+msgstr "nie można dowiązać „%s”: „%s”"
+
+#: merge-recursive.c:995
+#, c-format
+msgid "do not know what to do with %06o %s '%s'"
+msgstr "nie wiem, co zrobić z %06o %s „%s”"
+
+#: merge-recursive.c:1213 merge-recursive.c:1225
+#, c-format
+msgid "Fast-forwarding submodule %s to the following commit:"
+msgstr "Przewinięcie pod-modułu %s do następującego zapisu:"
+
+#: merge-recursive.c:1216 merge-recursive.c:1228
+#, c-format
+msgid "Fast-forwarding submodule %s"
+msgstr "Przewinięcie pod-modułu %s"
+
+#: merge-recursive.c:1251
+#, c-format
+msgid "Failed to merge submodule %s (merge following commits not found)"
+msgstr "Nie można scalić pod-modułu %s (nie znaleziono scalenia po zapisie)"
+
+#: merge-recursive.c:1255
+#, c-format
+msgid "Failed to merge submodule %s (not fast-forward)"
+msgstr "Nie można scalić pod-modułu %s (nie przewija się)"
+
+#: merge-recursive.c:1256
+msgid "Found a possible merge resolution for the submodule:\n"
+msgstr "Znaleziono możliwe rozwiązanie scalenia dla pod-modułu:\n"
+
+#: merge-recursive.c:1268
+#, c-format
+msgid "Failed to merge submodule %s (multiple merges found)"
+msgstr "Nie można scalić pod-modułu %s (znaleziono wiele scaleń)"
+
+#: merge-recursive.c:1402
+#, c-format
+msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
+msgstr ""
+"Błąd: Odmawiam utraty nieśledzonego pliku w %s; zamiast tego zapisywanie do "
+"%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 ""
+"KONFLIKT (%s/usunięcie): %s usunięto w %s a %s w %s. Wersja %s pliku %s "
+"pozostaje w drzewie."
+
+#: 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 ""
+"KONFLIKT (%s/usunięcie): %s usunięto w %s a %s do %s w %s. Wersja %s pliku "
+"%s pozostaje w drzewie."
+
+#: 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 ""
+"KONFLIKT (%s/usunięcie): %s usunięto w %s a %s w %s. Wersja %s pliku %s "
+"pozostaje w drzewie na %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 ""
+"KONFLIKT (%s/usunięcie): %s usunięto w %s a %s do %s w %s. Wersja %s pliku "
+"%s pozostaje w drzewie na %s."
+
+#: merge-recursive.c:1526
+msgid "rename"
+msgstr "zmiana nazwy"
+
+#: merge-recursive.c:1526
+msgid "renamed"
+msgstr "zmieniono nazwę"
+
+#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129
+#, c-format
+msgid "Refusing to lose dirty file at %s"
+msgstr "Odmawiam utraty brudnego pliku w %s"
+
+#: merge-recursive.c:1587
+#, c-format
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
+msgstr "Odmawiam utraty nieśledzonego pliku w %s, mimo że nie zawadza."
+
+#: merge-recursive.c:1645
+#, c-format
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
+msgstr ""
+"KONFLIKT (zmiana nazwy/dodanie): Zmiana nazwy %s->%s w %s. Dodano %s w %s"
+
+#: merge-recursive.c:1676
+#, c-format
+msgid "%s is a directory in %s adding as %s instead"
+msgstr "%s jest katalogiem w %s dodawanie zamiast tego jako %s"
+
+#: merge-recursive.c:1681
+#, c-format
+msgid "Refusing to lose untracked file at %s; adding as %s instead"
+msgstr ""
+"Odmawiam utraty nieśledzonego pliku w %s; dodawanie zamiast tego jako %s"
+
+#: merge-recursive.c:1708
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
+msgstr ""
+"KONFLIKT (zmiana nazwy/zmiana nazwy): Zmiana nazwy „%s”->„%s” w gałęzi „%s” "
+"zmiana nazwy „%s”->„%s” w „%s”%s"
+
+#: merge-recursive.c:1713
+msgid " (left unresolved)"
+msgstr " (nierozwiązane)"
+
+#: merge-recursive.c:1805
+#, c-format
+msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
+msgstr ""
+"KONFLIKT (zmiana nazwy/zmiana nazwy): Zmiana nazwy %s->%s w %s. Zmiana nazwy "
+"%s->%s w %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 ""
+"KONFLIKT (podział zmiany nazwy katalogu): Nie ma pewności, gdzie umieścić "
+"%s, bo nazwa katalogu %s została zmieniona na wiele innych katalogów, a "
+"żaden z celów nie dostał większości plików."
+
+#: merge-recursive.c:2202
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
+msgstr ""
+"KONFLIKT (zmiana nazwy/zmiana nazwy): Zmiana nazwy katalogu %s->%s w %s. "
+"Zmiana nazwy katalogu %s->%s w %s"
+
+#: merge-recursive.c:2973
+#, c-format
+msgid "cannot read object %s"
+msgstr "nie można odczytać obiektu %s"
+
+#: merge-recursive.c:2976
+#, c-format
+msgid "object %s is not a blob"
+msgstr "obiekt %s nie jest blobem"
+
+#: merge-recursive.c:3040
+msgid "modify"
+msgstr "zmiana"
+
+#: merge-recursive.c:3040
+msgid "modified"
+msgstr "zmieniono"
+
+#: merge-recursive.c:3079
+#, c-format
+msgid "Skipped %s (merged same as existing)"
+msgstr "Pominięto %s (scalono tak samo jak istniejące)"
+
+#: merge-recursive.c:3132
+#, c-format
+msgid "Adding as %s instead"
+msgstr "Dodawanie zamiast tego jako %s"
+
+#: merge-recursive.c:3339
+#, c-format
+msgid "Removing %s"
+msgstr "Usuwanie %s"
+
+#: merge-recursive.c:3362
+msgid "file/directory"
+msgstr "plik/katalog"
+
+#: merge-recursive.c:3367
+msgid "directory/file"
+msgstr "katalog/plik"
+
+#: 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): Jest już katalog o nazwie %s w %s. Dodawanie %s jako %s"
+
+#: merge-recursive.c:3383
+#, c-format
+msgid "Adding %s"
+msgstr "Dodawanie %s"
+
+#: merge-recursive.c:3392
+#, c-format
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr "KONFLIKT (dodanie/dodanie): Konflikt scalania w %s"
+
+#: merge-recursive.c:3445
+#, c-format
+msgid "merging of trees %s and %s failed"
+msgstr "nie można scalić drzew %s i %s"
+
+#: merge-recursive.c:3539
+msgid "Merging:"
+msgstr "Scalanie:"
+
+#: merge-recursive.c:3552
+#, c-format
+msgid "found %u common ancestor:"
+msgid_plural "found %u common ancestors:"
+msgstr[0] "znaleziono %u wspólnego przodka:"
+msgstr[1] "znaleziono %u wspólnych przodków:"
+msgstr[2] "znaleziono %u wspólnych przodków:"
+
+#: merge-recursive.c:3602
+msgid "merge returned no commit"
+msgstr "scalenie nie zwróciło żadnych zapisów"
+
+#: merge-recursive.c:3758
+#, c-format
+msgid "Could not parse object '%s'"
+msgstr "Nie można przetworzyć obiektu „%s”"
+
+#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896
+#: builtin/stash.c:471
+msgid "Unable to write index."
+msgstr "Nie można zapisać indeksu."
+
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "nie można odczytać pamięci podręcznej"
+
+#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917
+#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817
+#: builtin/stash.c:265
+msgid "unable to write new index file"
+msgstr "nie można zapisać nowego pliku indeksu"
+
+#: midx.c:80
+#, c-format
+msgid "multi-pack-index file %s is too small"
+msgstr "plik indeksu wielu paczek %s jest za mały"
+
+#: midx.c:96
+#, c-format
+msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
+msgstr "podpis indeksu wielu paczek 0x%08x nie zgadza się z podpisem 0x%08x"
+
+#: midx.c:101
+#, c-format
+msgid "multi-pack-index version %d not recognized"
+msgstr "nie rozpoznano wersji %d indeksu wielu paczek"
+
+#: midx.c:106
+#, c-format
+msgid "multi-pack-index hash version %u does not match version %u"
+msgstr "wersja skrótu indeksu wielu paczek %u nie zgadza się z wersją %u"
+
+#: midx.c:123
+msgid "invalid chunk offset (too large)"
+msgstr "nieprawidłowe przesunięcie kawałka (za duże)"
+
+#: midx.c:147
+msgid "terminating multi-pack-index chunk id appears earlier than expected"
+msgstr "kończący identyfikator indeksu wielu paczek występuje przedwcześnie"
+
+#: midx.c:160
+msgid "multi-pack-index missing required pack-name chunk"
+msgstr ""
+"w indeksie wielu paczek brakuje wymaganego kawałka nazwy paczki (pack-name)"
+
+#: midx.c:162
+msgid "multi-pack-index missing required OID fanout chunk"
+msgstr "w indeksie wielu paczek brakuje wymaganego kawałka fanout OID"
+
+#: midx.c:164
+msgid "multi-pack-index missing required OID lookup chunk"
+msgstr "w indeksie wielu paczek brakuje wymaganego kawałka odnajdywania OID"
+
+#: midx.c:166
+msgid "multi-pack-index missing required object offsets chunk"
+msgstr "w indeksie wielu paczek brakuje wymaganego kawałka przesunięć obiektów"
+
+#: midx.c:180
+#, c-format
+msgid "multi-pack-index pack names out of order: '%s' before '%s'"
+msgstr "nazwy paczek indeksu wielu paczek poza kolejnością: „%s” przed „%s”"
+
+#: midx.c:223
+#, c-format
+msgid "bad pack-int-id: %u (%u total packs)"
+msgstr "złe pack-int-id: %u (razem %u paczek)"
+
+#: midx.c:273
+msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
+msgstr ""
+"indeks wielu paczek przechowuje 64-bitowe przesunięcie, ale off_t jest za "
+"małe"
+
+#: midx.c:480
+#, c-format
+msgid "failed to add packfile '%s'"
+msgstr "nie można dodać pliku paczki „%s”"
+
+#: midx.c:486
+#, c-format
+msgid "failed to open pack-index '%s'"
+msgstr "nie można otworzyć indeksu paczki „%s”"
+
+#: midx.c:546
+#, c-format
+msgid "failed to locate object %d in packfile"
+msgstr "nie można odnaleźć obiektu %d w pliku paczki"
+
+#: midx.c:846
+msgid "Adding packfiles to multi-pack-index"
+msgstr "Dodawanie plików paczek do indeksu wielu paczek"
+
+#: midx.c:879
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "nie widać pliku paczki %s do porzucenia"
+
+#: midx.c:931
+msgid "no pack files to index."
+msgstr "brak plików paczek do zaindeksowania."
+
+#: midx.c:982
+msgid "Writing chunks to multi-pack-index"
+msgstr "Zapisywanie kawałków do indeksu wielu paczek"
+
+#: midx.c:1060
+#, c-format
+msgid "failed to clear multi-pack-index at %s"
+msgstr "nie można wyczyścić indeksu wielu paczek w %s"
+
+#: midx.c:1116
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr "plik indeksu wielu paczek istnieje, ale nie udało się go przetworzyć"
+
+#: midx.c:1124
+msgid "Looking for referenced packfiles"
+msgstr "Szukanie wskazywanych plików paczek"
+
+#: midx.c:1139
+#, c-format
+msgid ""
+"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+msgstr ""
+"fanout oid poza kolejnością: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+
+#: midx.c:1144
+msgid "the midx contains no oid"
+msgstr "midx nie zawiera oid"
+
+#: midx.c:1153
+msgid "Verifying OID order in multi-pack-index"
+msgstr "Weryfikowanie zamówienia OID w indeksie wielu paczek"
+
+#: midx.c:1162
+#, c-format
+msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
+msgstr "odnajdywanie oid poza kolejnością: oid[%d] = %s >= %s = oid[%d]"
+
+#: midx.c:1182
+msgid "Sorting objects by packfile"
+msgstr "Sortowanie obiektów według plików paczek"
+
+#: midx.c:1189
+msgid "Verifying object offsets"
+msgstr "Weryfikowanie przesunięć obiektów"
+
+#: midx.c:1205
+#, c-format
+msgid "failed to load pack entry for oid[%d] = %s"
+msgstr "nie można wczytać elementu paczki w oid[%d] = %s"
+
+#: midx.c:1211
+#, c-format
+msgid "failed to load pack-index for packfile %s"
+msgstr "nie można wczytać indeksu paczki z pliku paczki %s"
+
+#: midx.c:1220
+#, c-format
+msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+msgstr ""
+"nieprawidłowe przesunięcie obiektu w oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+
+#: midx.c:1245
+msgid "Counting referenced objects"
+msgstr "Zliczanie osiągalnych obiektów"
+
+#: midx.c:1255
+msgid "Finding and deleting unreferenced packfiles"
+msgstr "Znajdywanie i usuwanie niewskazywanych plików paczek"
+
+#: midx.c:1446
+msgid "could not start pack-objects"
+msgstr "nie można uruchomić pack-objects"
+
+#: midx.c:1466
+msgid "could not finish pack-objects"
+msgstr "nie można zakończyć pack-objects"
+
+#: name-hash.c:538
+#, c-format
+msgid "unable to create lazy_dir thread: %s"
+msgstr "nie można utworzyć wątku lazy_dir: %s"
+
+#: name-hash.c:560
+#, c-format
+msgid "unable to create lazy_name thread: %s"
+msgstr "nie można utworzyć wątku lazy_name: %s"
+
+#: name-hash.c:566
+#, c-format
+msgid "unable to join lazy_name thread: %s"
+msgstr "nie można dołączyć do wątku lazy_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 ""
+"Nie zwieńczono poprzedniego scalania uwag (%s istnieje).\n"
+"Użyj „git notes merge --commit” lub „git notes merge --abort”, aby złożyć/"
+"przerwać poprzednie scalenie zanim zaczniesz nowe."
+
+#: notes-merge.c:284
+#, c-format
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr "Nie zwieńczono scalania uwag (%s istnieje)."
+
+#: notes-utils.c:46
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr "Nie można złożyć niezainicjowanego/niewskazywanego drzewa uwag"
+
+#: notes-utils.c:105
+#, c-format
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "Zła wartość notes.rewriteMode: „%s”"
+
+#: notes-utils.c:115
+#, c-format
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr "Odmawiam przepisania uwag w %s (poza 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 "Zła wartość %s: „%s”"
+
+#: object-file.c:480
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr "katalog obiektów %s nie istnieje; sprawdź .git/objects/info/alternates"
+
+#: object-file.c:531
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "nie można znormalizować ścieżki alternatywnego obiektu: %s"
+
+#: object-file.c:603
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr ""
+"%s: ignorowanie alternatywnych magazynów obiektów, zagnieżdżenie za głębokie"
+
+#: object-file.c:610
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "nie można znormalizować katalogu obiektu: %s"
+
+#: object-file.c:653
+msgid "unable to fdopen alternates lockfile"
+msgstr "nie można wykonać fdopen na pliku blokady alternatywnych obiektów"
+
+#: object-file.c:671
+msgid "unable to read alternates file"
+msgstr "nie można odczytać pliku alternatywnych obiektów"
+
+#: object-file.c:678
+msgid "unable to move new alternates file into place"
+msgstr "nie można przenieść na miejsce nowego pliku alternatywnych obiektów"
+
+#: object-file.c:713
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "ścieżka „%s” nie istnieje"
+
+#: object-file.c:734
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr ""
+"repozytorium odniesienia „%s” jako łączone wybranie nie jest jeszcze "
+"wspierane."
+
+#: object-file.c:740
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "repozytorium odniesienia „%s” nie jest lokalnym repozytorium."
+
+#: object-file.c:746
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "repozytorium odniesienia „%s” jest płytkie"
+
+#: object-file.c:754
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "repozytorium odniesienia „%s” jest szczepione"
+
+#: object-file.c:814
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "błędny wiersz przy przetwarzaniu alternatywnych referencji: %s"
+
+#: object-file.c:964
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr "próba mmap %<PRIuMAX> ponad ograniczeniem %<PRIuMAX>"
+
+#: object-file.c:985
+msgid "mmap failed"
+msgstr "mmap nie powiodło się"
+
+#: object-file.c:1149
+#, c-format
+msgid "object file %s is empty"
+msgstr "plik obiektu %s jest pusty"
+
+#: object-file.c:1284 object-file.c:2477
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "uszkodzony wolny obiekt „%s”"
+
+#: object-file.c:1286 object-file.c:2481
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "śmieci na końcu wolnego obiektu „%s”"
+
+#: object-file.c:1328
+msgid "invalid object type"
+msgstr "zły rodzaj obiektu"
+
+#: object-file.c:1412
+#, c-format
+msgid "unable to unpack %s header with --allow-unknown-type"
+msgstr "nie można rozpakować nagłówka %s z --allow-unknown-type"
+
+#: object-file.c:1415
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "nie można rozpakować nagłówka %s"
+
+#: object-file.c:1421
+#, c-format
+msgid "unable to parse %s header with --allow-unknown-type"
+msgstr "nie można przetworzyć nagłówka %s z --allow-unknown-type"
+
+#: object-file.c:1424
+#, c-format
+msgid "unable to parse %s header"
+msgstr "nie można przetworzyć nagłówka %s"
+
+#: object-file.c:1651
+#, c-format
+msgid "failed to read object %s"
+msgstr "nie można odczytać obiektu %s"
+
+#: object-file.c:1655
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "nie znaleziono zastępstwa %s dla %s"
+
+#: object-file.c:1659
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "wolny obiekt %s (przechowywany w %s) jest uszkodzony"
+
+#: object-file.c:1663
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "spakowany obiekt %s (przechowywany w %s) jest uszkodzony"
+
+#: object-file.c:1768
+#, c-format
+msgid "unable to write file %s"
+msgstr "nie można zapisać pliku %s"
+
+#: object-file.c:1775
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "nie można ustawić uprawnień na „%s”"
+
+#: object-file.c:1782
+msgid "file write error"
+msgstr "błąd zapisu pliku"
+
+#: object-file.c:1802
+msgid "error when closing loose object file"
+msgstr "błąd podczas zamykania pliku wolnego obiektu"
+
+#: object-file.c:1867
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
+msgstr ""
+"niewystarczające uprawnienia, aby dodać obiekt do bazy danych repozytorium %s"
+
+#: object-file.c:1869
+msgid "unable to create temporary file"
+msgstr "nie można utworzyć tymczasowego pliku"
+
+#: object-file.c:1893
+msgid "unable to write loose object file"
+msgstr "nie można zapisać pliku wolnego obiektu"
+
+#: object-file.c:1899
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "nie można skompresować nowego obiektu %s (%d)"
+
+#: object-file.c:1903
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "deflateEnd w obiekcie %s nie powiodło się (%d)"
+
+#: object-file.c:1907
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "zamieszanie przez dane źródłowe niestabilnego obiektu dla %s"
+
+#: object-file.c:1917 builtin/pack-objects.c:1097
+#, c-format
+msgid "failed utime() on %s"
+msgstr "nie można wykonać utime() na %s"
+
+#: object-file.c:1994
+#, c-format
+msgid "cannot read object for %s"
+msgstr "nie można odczytać obiektu do %s"
+
+#: object-file.c:2045
+msgid "corrupt commit"
+msgstr "uszkodzony zapis"
+
+#: object-file.c:2053
+msgid "corrupt tag"
+msgstr "uszkodzony tag"
+
+#: object-file.c:2153
+#, c-format
+msgid "read error while indexing %s"
+msgstr "błąd odczytu podczas indeksowania %s"
+
+#: object-file.c:2156
+#, c-format
+msgid "short read while indexing %s"
+msgstr "przeczytano mniej niż oczekiwano przy indeksowaniu %s"
+
+#: object-file.c:2229 object-file.c:2239
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr "%s: nie można wstawić do bazy danych"
+
+#: object-file.c:2245
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s: niewspierany typ pliku"
+
+#: object-file.c:2269
+#, c-format
+msgid "%s is not a valid object"
+msgstr "%s nie jest prawidłowym obiektem"
+
+#: object-file.c:2271
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s nie jest prawidłowym obiektem „%s”"
+
+#: object-file.c:2298 builtin/index-pack.c:192
+#, c-format
+msgid "unable to open %s"
+msgstr "nie można otworzyć %s"
+
+#: object-file.c:2488 object-file.c:2541
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "niezgodne skróty %s (oczekiwano %s)"
+
+#: object-file.c:2512
+#, c-format
+msgid "unable to mmap %s"
+msgstr "nie można wykonać mmap %s"
+
+#: object-file.c:2517
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "nie można rozpakować nagłówka %s"
+
+#: object-file.c:2523
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "nie można przetworzyć nagłówka %s"
+
+#: object-file.c:2534
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "nie można rozpakować zawartości %s"
+
+#: object-name.c:486
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr "krótki identyfikator %s jest niejednoznaczny"
+
+#: object-name.c:497
+msgid "The candidates are:"
+msgstr "Kandydaci to:"
+
+#: object-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 normalnie nigdy nie tworzy referencji kończącej się czterdziestoma\n"
+"heksadecymalnymi znakami, bo byłyby ignorowane zawsze, gdy podasz\n"
+"tylko tych czterdzieści znaków. Te referencje mogą być utworzone przez\n"
+"pomyłkę. Na przykład\n"
+"\n"
+" git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"gdzie „$br” jakoś okazuje się puste i tworzona jest taka nietypowa "
+"referencja.\n"
+"Sprawdź te referencje i może je usuń. Wyłącz ten komunikat za pomocą\n"
+"„git config advice.objectNameWarning false”"
+
+#: object-name.c:916
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "dziennik „%.*s” sięga tylko %s"
+
+#: object-name.c:924
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "dziennik „%.*s” ma tylko %d wpisów"
+
+#: object-name.c:1702
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr "ścieżka „%s” istnieje na dysku, ale nie w „%.*s”"
+
+#: object-name.c:1708
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+msgstr ""
+"ścieżka „%s” istnieje, ale nie „%s”\n"
+"wskazówka: Czy chodziło o „%.*s:%s” czyli „%.*s:./%s”?"
+
+#: object-name.c:1717
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "ścieżka „%s” nie istnieje w „%.*s”"
+
+#: object-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 ""
+"ścieżka „%s” jest w indeksie, ale nie na etapie %d\n"
+"wskazówka: Czy chodziło o „:%d:%s”?"
+
+#: object-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 ""
+"ścieżka „%s” jest w indeksie, ale nie „%s”\n"
+"wskazówka: Czy chodziło o „:%d:%s” czyli „:%d:./%s”?"
+
+#: object-name.c:1769
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr "ścieżka „%s” istnieje na dysku, ale nie w indeksie"
+
+#: object-name.c:1771
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr "ścieżka „%s” nie istnieje (ani na dysku, ani w indeksie)"
+
+#: object-name.c:1784
+msgid "relative path syntax can't be used outside working tree"
+msgstr "składnia ścieżki względnej nie może być użyta poza drzewem roboczym"
+
+#: object-name.c:1922
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "nieprawidłowa nazwa obiektu: „%.*s”."
+
+#: object.c:53
+#, c-format
+msgid "invalid object type \"%s\""
+msgstr "nieprawidłowy rodzaj obiektu „%s”"
+
+#: object.c:173
+#, c-format
+msgid "object %s is a %s, not a %s"
+msgstr "obiekt %s to %s, nie %s"
+
+#: object.c:233
+#, c-format
+msgid "object %s has unknown type id %d"
+msgstr "obiekt %s ma nieznany identyfikator rodzaju %d"
+
+#: object.c:246
+#, c-format
+msgid "unable to parse object: %s"
+msgstr "nie można przetworzyć obiektu: %s"
+
+#: object.c:266 object.c:278
+#, c-format
+msgid "hash mismatch %s"
+msgstr "niezgodne skróty %s"
+
+#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226
+#, c-format
+msgid "unable to get size of %s"
+msgstr "nie można uzyskać rozmiaru %s"
+
+#: pack-bitmap.c:1489 builtin/rev-list.c:92
+#, c-format
+msgid "unable to get disk usage of %s"
+msgstr "nie można uzyskać użycia dysku %s"
+
+#: pack-revindex.c:220
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr "plik odwrotnego indeksu %s jest za mały"
+
+#: pack-revindex.c:225
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr "plik odwrotnego indeksu %s jest uszkodzony"
+
+#: pack-revindex.c:233
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr "plik odwrotnego indeksu %s ma nieznaną sygnaturę"
+
+#: pack-revindex.c:237
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr "plik odwrotnego indeksu %s ma niewspieraną wersję %<PRIu32>"
+
+#: pack-revindex.c:242
+#, c-format
+msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
+msgstr ""
+"plik odwrotnego indeksu %s ma niewspierany identyfikator skrótu %<PRIu32>"
+
+#: pack-write.c:236
+msgid "cannot both write and verify reverse index"
+msgstr "nie można i zapisać, i sprawdzić odwrotnego indeksu"
+
+#: pack-write.c:257
+#, c-format
+msgid "could not stat: %s"
+msgstr "nie można wykonać stat: %s"
+
+#: pack-write.c:269
+#, c-format
+msgid "failed to make %s readable"
+msgstr "nie można dodać praw do odczytu %s"
+
+#: pack-write.c:502
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr "nie można pisać do obiecującego pliku „%s”"
+
+#: packfile.c:625
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "pozycja przed końcem pliku paczki (zepsuty .idx?)"
+
+#: packfile.c:1934
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr "pozycja przed początkiem indeksu paczki dla %s (uszkodzony indeks?)"
+
+#: packfile.c:1938
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr "pozycja za końcem indeksu paczki dla %s (ucięty indeks?)"
+
+#: parse-options-cb.c:20 parse-options-cb.c:24
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr "opcja „%s” oczekuje wartości liczbowej"
+
+#: parse-options-cb.c:41
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr "nieprawidłowa data wygaśnięcia „%s”"
+
+#: parse-options-cb.c:54
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr "opcja „%s” oczekuje „always”, „auto” lub „never”"
+
+#: parse-options-cb.c:132 parse-options-cb.c:149
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "nieprawidłowa nazwa obiektu „%s”"
+
+#: parse-options.c:38
+#, c-format
+msgid "%s requires a value"
+msgstr "%s wymaga wartości"
+
+#: parse-options.c:73
+#, c-format
+msgid "%s is incompatible with %s"
+msgstr "%s i %s się wykluczają"
+
+#: parse-options.c:78
+#, c-format
+msgid "%s : incompatible with something else"
+msgstr "%s : wyklucza się z czymś innym"
+
+#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#, c-format
+msgid "%s takes no value"
+msgstr "%s nie przyjmuje wartości"
+
+#: parse-options.c:94
+#, c-format
+msgid "%s isn't available"
+msgstr "%s niedostępny"
+
+#: parse-options.c:217
+#, c-format
+msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
+msgstr ""
+"%s oczekuje nieujemnej wartości całkowitej z nieobowiązkowym sufiksem k/m/g"
+
+#: parse-options.c:386
+#, c-format
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
+msgstr "niejednoznaczna opcja: %s (może być --%s%s or --%s%s)"
+
+#: parse-options.c:420 parse-options.c:428
+#, c-format
+msgid "did you mean `--%s` (with two dashes)?"
+msgstr "czy chodziło o „--%s” (z dwoma myślnikami)?"
+
+#: parse-options.c:666 parse-options.c:971
+#, c-format
+msgid "alias of --%s"
+msgstr "synonim do --%s"
+
+#: parse-options.c:862
+#, c-format
+msgid "unknown option `%s'"
+msgstr "nieznana opcja „%s”"
+
+#: parse-options.c:864
+#, c-format
+msgid "unknown switch `%c'"
+msgstr "nieznany przełącznik „%c”"
+
+#: parse-options.c:866
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
+msgstr "nieznana opcja spoza zakresu ASCII w łańcuchu: „%s”"
+
+#: parse-options.c:890
+msgid "..."
+msgstr "..."
+
+#: parse-options.c:909
+#, c-format
+msgid "usage: %s"
+msgstr "użycie: %s"
+
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
+#.
+#: parse-options.c:915
+#, c-format
+msgid " or: %s"
+msgstr " lub: %s"
+
+#: parse-options.c:918
+#, c-format
+msgid " %s"
+msgstr " %s"
+
+#: parse-options.c:957
+msgid "-NUM"
+msgstr "-ILE"
+
+#: path.c:915
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr "Nie można pozwolić grupie zapisywać do %s"
+
+#: pathspec.c:130
+msgid "Escape character '\\' not allowed as last character in attr value"
+msgstr "Znak ucieczki „\\” niedozwolony jako ostatni znak w wartości atrybutu"
+
+#: pathspec.c:148
+msgid "Only one 'attr:' specification is allowed."
+msgstr "Wolno użyć tylko jednego „attr:”."
+
+#: pathspec.c:151
+msgid "attr spec must not be empty"
+msgstr "atrybut nie może być pusty"
+
+#: pathspec.c:194
+#, c-format
+msgid "invalid attribute name %s"
+msgstr "błędna nazwa atrybutu %s"
+
+#: pathspec.c:259
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr "globalne ustawienia ścieżek „glob” i „noglob” się wykluczają"
+
+#: pathspec.c:266
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr ""
+"globalne ustawienia ścieżek „literal” i wszystkie inne globalne wykluczają "
+"się"
+
+#: pathspec.c:306
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr "nieprawidłowy parametr magicznej ścieżki „prefix:”"
+
+#: pathspec.c:327
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "Nieprawidłowy magiczny numer ścieżki „%.*s” w „%s”"
+
+#: pathspec.c:332
+#, c-format
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr "Brakujący „)” pod koniec magicznej ścieżki w „%s”"
+
+#: pathspec.c:370
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "Niezaimplementowany magiczny numer ścieżki „%c” w „%s”"
+
+#: pathspec.c:429
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s: „literal” i „glob” się wykluczają"
+
+#: pathspec.c:445
+#, c-format
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s: „%s” jest poza repozytorium w „%s”"
+
+#: pathspec.c:521
+#, c-format
+msgid "'%s' (mnemonic: '%c')"
+msgstr "'%s' (skrót: '%c')"
+
+#: pathspec.c:531
+#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr "%s: magiczna ścieżka niewspierana przez to polecenie: %s"
+
+#: pathspec.c:598
+#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr "ścieżka „%s” przechodzi przez dowiązanie"
+
+#: pathspec.c:643
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr "wiersz jest źle zacytowany: %s"
+
+#: pkt-line.c:92
+msgid "unable to write flush packet"
+msgstr "nie można zapisać pakietu wypróżnienia"
+
+#: pkt-line.c:99
+msgid "unable to write delim packet"
+msgstr "nie można zapisać pakietu oddzielającego"
+
+#: pkt-line.c:106
+msgid "unable to write stateless separator packet"
+msgstr "nie można zapisać bezstanowego pakietu separatora"
+
+#: pkt-line.c:113
+msgid "flush packet write failed"
+msgstr "nie można zapisać pakietu wypróżnienia"
+
+#: pkt-line.c:153 pkt-line.c:239
+msgid "protocol error: impossibly long line"
+msgstr "błąd protokołu: niemożliwie długi wiersz"
+
+#: pkt-line.c:169 pkt-line.c:171
+msgid "packet write with format failed"
+msgstr "nie można zapisać pakietu z formatem"
+
+#: pkt-line.c:203
+msgid "packet write failed - data exceeds max packet size"
+msgstr ""
+"zapis pakietu nie powiódł się — dane przekraczają maksymalny rozmiar pakietu"
+
+#: pkt-line.c:210 pkt-line.c:217
+msgid "packet write failed"
+msgstr "nie można zapisać pakietu"
+
+#: pkt-line.c:302
+msgid "read error"
+msgstr "błąd odczytu"
+
+#: pkt-line.c:310
+msgid "the remote end hung up unexpectedly"
+msgstr "zdalna maszyna nieoczekiwanie się rozłączyła"
+
+#: pkt-line.c:338
+#, c-format
+msgid "protocol error: bad line length character: %.4s"
+msgstr "błąd protokołu: zły znak długości wiersza: %.4s"
+
+#: pkt-line.c:352 pkt-line.c:357
+#, c-format
+msgid "protocol error: bad line length %d"
+msgstr "błąd protokołu: zła długość wiersza %d"
+
+#: pkt-line.c:373 sideband.c:165
+#, c-format
+msgid "remote error: %s"
+msgstr "błąd serwera: %s"
+
+#: preload-index.c:119
+msgid "Refreshing index"
+msgstr "Odświeżanie indeksu"
+
+#: preload-index.c:138
+#, c-format
+msgid "unable to create threaded lstat: %s"
+msgstr "nie można utworzyć wątkowanego lstat: %s"
+
+#: pretty.c:984
+msgid "unable to parse --pretty format"
+msgstr "nie można przetworzyć formatu --pretty"
+
+#: promisor-remote.c:30
+msgid "promisor-remote: unable to fork off fetch subprocess"
+msgstr "promisor-remote: nie można oddzielić pod-procesu pobierania"
+
+#: promisor-remote.c:35 promisor-remote.c:37
+msgid "promisor-remote: could not write to fetch subprocess"
+msgstr "promisor-remote: nie można zapisać do pod-procesu pobierania"
+
+#: promisor-remote.c:41
+msgid "promisor-remote: could not close stdin to fetch subprocess"
+msgstr ""
+"promisor-remote: nie można zamknąć standardowego wejścia do pod-procesu "
+"pobierania"
+
+#: promisor-remote.c:53
+#, c-format
+msgid "promisor remote name cannot begin with '/': %s"
+msgstr "obiecująca zdalna nazwa nie może zaczynać się od „/”: %s"
+
+#: prune-packed.c:35
+msgid "Removing duplicate objects"
+msgstr "Usuwanie zduplikowanych obiektów"
+
+#: range-diff.c:78
+msgid "could not start `log`"
+msgstr "nie można uruchomić „log”"
+
+#: range-diff.c:80
+msgid "could not read `log` output"
+msgstr "nie można odczytać wyjścia „log”"
+
+#: range-diff.c:101 sequencer.c:5318
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "nie można przetworzyć zapisu „%s”"
+
+#: range-diff.c:115
+#, c-format
+msgid ""
+"could not parse first line of `log` output: did not start with 'commit ': "
+"'%s'"
+msgstr ""
+"nie można przetworzyć pierwszego wiersza wyjścia „log”: nie zaczynał się od "
+"„zapis”: „%s”"
+
+#: range-diff.c:140
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr "nie można przetworzyć nagłówka gita „%.*s”"
+
+#: range-diff.c:306
+msgid "failed to generate diff"
+msgstr "nie można wygenerować różnic"
+
+#: range-diff.c:558
+msgid "--left-only and --right-only are mutually exclusive"
+msgstr "--left-only i --right-only się wykluczają"
+
+#: range-diff.c:561 range-diff.c:563
+#, c-format
+msgid "could not parse log for '%s'"
+msgstr "nie można przetworzyć dziennika do „%s”"
+
+#: read-cache.c:682
+#, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
+msgstr "nie dodam skrótu pliku „%s” („%s” już widnieje w indeksie)"
+
+#: read-cache.c:698
+msgid "cannot create an empty blob in the object database"
+msgstr "nie można utworzyć pustego blobu w bazie danych obiektów"
+
+#: read-cache.c:720
+#, c-format
+msgid "%s: can only add regular files, symbolic links or git-directories"
+msgstr "%s: można dodać tylko zwykłe pliki, dowiązania i katalogi gita"
+
+#: read-cache.c:725
+#, c-format
+msgid "'%s' does not have a commit checked out"
+msgstr "„%s” nie ma wybranego zapisu"
+
+#: read-cache.c:777
+#, c-format
+msgid "unable to index file '%s'"
+msgstr "nie można zaindeksować pliku „%s”"
+
+#: read-cache.c:796
+#, c-format
+msgid "unable to add '%s' to index"
+msgstr "nie można dodać „%s” do indeksu"
+
+#: read-cache.c:807
+#, c-format
+msgid "unable to stat '%s'"
+msgstr "nie można wykonać stat na „%s”"
+
+#: read-cache.c:1318
+#, c-format
+msgid "'%s' appears as both a file and as a directory"
+msgstr "„%s” widnieje jako i plik, i katalog"
+
+#: read-cache.c:1524
+msgid "Refresh index"
+msgstr "Odśwież indeks"
+
+#: read-cache.c:1639
+#, c-format
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"ustawiono index.version, ale wartość jest nieprawidłowa.\n"
+"Używanie wersji %i"
+
+#: read-cache.c:1649
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"ustawiono GIT_INDEX_VERSION, ale wartość jest nieprawidłowa.\n"
+"Używanie wersji %i"
+
+#: read-cache.c:1705
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr "zły podpis 0x%08x"
+
+#: read-cache.c:1708
+#, c-format
+msgid "bad index version %d"
+msgstr "zła wersja indeksu %d"
+
+#: read-cache.c:1717
+msgid "bad index file sha1 signature"
+msgstr "zły skrót SHA-1 pliku indeksu"
+
+#: read-cache.c:1747
+#, c-format
+msgid "index uses %.4s extension, which we do not understand"
+msgstr "indeks używa rozszerzenia %.4s, którego nie rozumiemy"
+
+#: read-cache.c:1749
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr "pomijanie rozszerzenia %.4s"
+
+#: read-cache.c:1786
+#, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr "nieznany format elementu indeksu 0x%08x"
+
+#: read-cache.c:1802
+#, c-format
+msgid "malformed name field in the index, near path '%s'"
+msgstr "nieprawidłowe pole nazwy w indeksie, blisko ścieżki „%s”"
+
+#: read-cache.c:1859
+msgid "unordered stage entries in index"
+msgstr "nieuporządkowane elementy przygotowane w indeksie"
+
+#: read-cache.c:1862
+#, c-format
+msgid "multiple stage entries for merged file '%s'"
+msgstr "wiele elementów w przygotowaniu dla scalonego pliku „%s”"
+
+#: read-cache.c:1865
+#, c-format
+msgid "unordered stage entries for '%s'"
+msgstr "nieuporządkowane elementy przygotowane w „%s”"
+
+#: read-cache.c:1971 read-cache.c:2262 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181
+#: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991
+#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505
+#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290
+#: builtin/submodule--helper.c:332
+msgid "index file corrupt"
+msgstr "uszkodzony plik indeksu"
+
+#: read-cache.c:2115
+#, c-format
+msgid "unable to create load_cache_entries thread: %s"
+msgstr "nie można utworzyć wątku load_cache_entries: %s"
+
+#: read-cache.c:2128
+#, c-format
+msgid "unable to join load_cache_entries thread: %s"
+msgstr "nie można dołączyć do wątku load_cache_entries: %s"
+
+#: read-cache.c:2161
+#, c-format
+msgid "%s: index file open failed"
+msgstr "%s: nie można otworzyć pliku indeksu"
+
+#: read-cache.c:2165
+#, c-format
+msgid "%s: cannot stat the open index"
+msgstr "%s: nie można wykonać stat na otwartym indeksie"
+
+#: read-cache.c:2169
+#, c-format
+msgid "%s: index file smaller than expected"
+msgstr "%s: plik indeksu mniejszy niż oczekiwano"
+
+#: read-cache.c:2173
+#, c-format
+msgid "%s: unable to map index file"
+msgstr "%s: nie można wykonać mapowania pliku indeksu"
+
+#: read-cache.c:2215
+#, c-format
+msgid "unable to create load_index_extensions thread: %s"
+msgstr "nie można utworzyć wątku load_index_extensions: %s"
+
+#: read-cache.c:2242
+#, c-format
+msgid "unable to join load_index_extensions thread: %s"
+msgstr "nie można złączyć wątku load_index_extensions: %s"
+
+#: read-cache.c:2274
+#, c-format
+msgid "could not freshen shared index '%s'"
+msgstr "nie można odświeżyć wspólnego indeksu „%s”"
+
+#: read-cache.c:2321
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
+msgstr "zepsuty indeks, oczekiwano %s w %s, otrzymano %s"
+
+#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141
+#, c-format
+msgid "could not close '%s'"
+msgstr "nie można zamknąć „%s”"
+
+#: read-cache.c:3120 sequencer.c:2487 sequencer.c:4239
+#, c-format
+msgid "could not stat '%s'"
+msgstr "nie można wykonać stat na „%s”"
+
+#: read-cache.c:3133
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr "nie można otworzyć katalogu gita: %s"
+
+#: read-cache.c:3145
+#, c-format
+msgid "unable to unlink: %s"
+msgstr "nie można wykonać unlink: „%s”"
+
+#: read-cache.c:3170
+#, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr "nie można naprawić bitów uprawnień w „%s”"
+
+#: read-cache.c:3319
+#, c-format
+msgid "%s: cannot drop to stage #0"
+msgstr "%s: nie można zrzucić do etapu nr 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 ""
+"Możesz to naprawić używając „git rebase --edit-todo” i uruchamiając później "
+"„git rebase --continue”.\n"
+"Albo możesz przerwać przestawianie przez „git rebase --abort”.\n"
+
+#: rebase-interactive.c:33
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr "nieznane ustawienie %s opcji rebase.missingCommitsCheck. Ignorowanie."
+
+#: 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"
+"Polecenia:\n"
+"p, pick <zapis> = dobierz zapis\n"
+"r, reword <zapis> = użyj zapisu, ale przeredaguj jego komunikat\n"
+"e, edit <zapis> = użyj zapisu, ale zatrzymaj się, żeby go poprawić\n"
+"s, squash <zapis> = użyj zapisu, ale połącz go z poprzednim (spłaszcz)\n"
+"f, fixup <zapis> = jak „squash”, ale odrzuć komunikat tego zapisu\n"
+"x, exec <polecenie> = wykonaj polecenie (resztę wiersza) w powłoce\n"
+"b, break = zatrzymaj się tu (kontynuuj przestawianie przez „git rebase --"
+"continue”)\n"
+"d, drop <zapis> = usuń zapis\n"
+"l, label <etykietka> = nazwij bieżące HEAD\n"
+"t, reset <etykietka> = zresetuj HEAD do etykietki\n"
+"m, merge [-C <zapis> | -c <zapis>] <etykietka> [# <wiersz>]\n"
+". utwórz zapis scalenia używając pierwotnego komunikatu scalenia\n"
+". (albo <wiersza>, jeśli nie podano pierwotnego zapisu scalenia.\n"
+". Użyj -c <zapis>, aby przeredagować komunikat zapisu.\n"
+"Kolejność wierszy może być zmieniona; są wykonywane z góry na dół.\n"
+
+#: rebase-interactive.c:63
+#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+msgstr[0] "Przestawianie %s na %s (%d polecenie)"
+msgstr[1] "Przestawianie %s na %s (%d polecenia)"
+msgstr[2] "Przestawianie %s na %s (%d poleceń)"
+
+#: 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"
+"Nie usuwaj żadnego wiersza. Użyj jawnie „drop”, żeby usunąć wpis.\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"
+"Jeśli usuniesz tutaj wiersz, TEN ZAPIS BĘDZIE STRACONY.\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"
+"Edytujesz plik z poleceniami trwającego interaktywnego przestawienia.\n"
+"Aby kontynuować przestawienie po edycji, wykonaj:\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"
+"Jeśli jednak usuniesz wszystko, przestawianie zostanie przerwane.\n"
+"\n"
+
+#: rebase-interactive.c:110 rerere.c:469 rerere.c:676 sequencer.c:3615
+#: sequencer.c:3641 sequencer.c:5424 builtin/fsck.c:329 builtin/rebase.c:272
+#, c-format
+msgid "could not write '%s'"
+msgstr "nie można pisać do „%s”"
+
+#: rebase-interactive.c:116 builtin/rebase.c:204 builtin/rebase.c:230
+#: builtin/rebase.c:254
+#, c-format
+msgid "could not write '%s'."
+msgstr "nie można pisać do „%s”."
+
+#: rebase-interactive.c:193
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Ostrzeżenie: niektóre zapisy mogły zostać omyłkowo porzucone.\n"
+"Porzucone zapisy (od najnowszych do najstarszych):\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 ""
+"Aby uniknąć tego komunikatu, użyj „drop”, aby wyraźnie jawnie usunąć zapis.\n"
+"\n"
+"Użyj „git config rebase.missingCommitsCheck”, aby zmienić poziom ostrzeżeń.\n"
+"Możliwe zachowania to: ignore, warn, error.\n"
+"\n"
+
+#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2402
+#: builtin/rebase.c:190 builtin/rebase.c:215 builtin/rebase.c:241
+#: builtin/rebase.c:266
+#, c-format
+msgid "could not read '%s'."
+msgstr "nie można odczytać „%s”."
+
+#: ref-filter.c:42 wt-status.c:1975
+msgid "gone"
+msgstr "nie ma"
+
+#: ref-filter.c:43
+#, c-format
+msgid "ahead %d"
+msgstr "do przodu %d"
+
+#: ref-filter.c:44
+#, c-format
+msgid "behind %d"
+msgstr "w tyle %d"
+
+#: ref-filter.c:45
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr "do przodu %d, w tyle %d"
+
+#: ref-filter.c:169
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "oczekiwany format: %%(color:<kolor>)"
+
+#: ref-filter.c:171
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
+msgstr "nierozpoznany kolor: %%(kolor:%s)"
+
+#: ref-filter.c:193
+#, c-format
+msgid "Integer value expected refname:lstrip=%s"
+msgstr "Oczekiwano wartości całkowitej refname:lstrip=%s"
+
+#: ref-filter.c:197
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr "Oczekiwano wartości całkowitej refname:rstrip=%s"
+
+#: ref-filter.c:199
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "nierozpoznany argument %%(%s): %s"
+
+#: ref-filter.c:254
+#, c-format
+msgid "%%(objecttype) does not take arguments"
+msgstr "%%(objecttype) nie przyjmuje argumentów"
+
+#: ref-filter.c:276
+#, c-format
+msgid "unrecognized %%(objectsize) argument: %s"
+msgstr "nierozpoznany argument %%(objectsize): %s"
+
+#: ref-filter.c:284
+#, c-format
+msgid "%%(deltabase) does not take arguments"
+msgstr "%%(deltabase) nie przyjmuje argumentów"
+
+#: ref-filter.c:296
+#, c-format
+msgid "%%(body) does not take arguments"
+msgstr "%%(body) nie przyjmuje argumentów"
+
+#: ref-filter.c:309
+#, c-format
+msgid "unrecognized %%(subject) argument: %s"
+msgstr "nierozpoznany argument %%(subject): %s"
+
+#: ref-filter.c:330
+#, c-format
+msgid "unknown %%(trailers) argument: %s"
+msgstr "nieznany argument %%(trailers): %s"
+
+#: ref-filter.c:363
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "oczekiwano wartości dodatniej contents:lines=%s"
+
+#: ref-filter.c:365
+#, c-format
+msgid "unrecognized %%(contents) argument: %s"
+msgstr "nierozpoznany argument %%(contents): %s"
+
+#: ref-filter.c:380
+#, c-format
+msgid "positive value expected '%s' in %%(%s)"
+msgstr "oczekiwano wartości dodatniej „%s” w %%(%s)"
+
+#: ref-filter.c:384
+#, c-format
+msgid "unrecognized argument '%s' in %%(%s)"
+msgstr "nierozpoznany argument „%s” w %%(%s)"
+
+#: ref-filter.c:398
+#, c-format
+msgid "unrecognized email option: %s"
+msgstr "nierozpoznawana opcja e-mail: %s"
+
+#: ref-filter.c:428
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "oczekiwany format: %%(align:<szerokość>,<pozycja>)"
+
+#: ref-filter.c:440
+#, c-format
+msgid "unrecognized position:%s"
+msgstr "nierozpoznawana pozycja:%s"
+
+#: ref-filter.c:447
+#, c-format
+msgid "unrecognized width:%s"
+msgstr "nierozpoznawana szerokość:%s"
+
+#: ref-filter.c:456
+#, c-format
+msgid "unrecognized %%(align) argument: %s"
+msgstr "nierozpoznany argument %%(align): %s"
+
+#: ref-filter.c:464
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr "oczekiwano dodatniej szerokości z atomem %%(align)"
+
+#: ref-filter.c:482
+#, c-format
+msgid "unrecognized %%(if) argument: %s"
+msgstr "nierozpoznany argument %%(if): %s"
+
+#: ref-filter.c:584
+#, c-format
+msgid "malformed field name: %.*s"
+msgstr "nieprawidłowa nazwa pola %.*s"
+
+#: ref-filter.c:611
+#, c-format
+msgid "unknown field name: %.*s"
+msgstr "nieznana nazwa pola: %.*s"
+
+#: ref-filter.c:615
+#, c-format
+msgid ""
+"not a git repository, but the field '%.*s' requires access to object data"
+msgstr ""
+"to nie jest repozytorium gita, ale pole „%.*s” wymaga dostępu do danych "
+"obiektów"
+
+#: ref-filter.c:739
+#, c-format
+msgid "format: %%(if) atom used without a %%(then) atom"
+msgstr "format: atom %%(if) użyty bez atomu %%(then)"
+
+#: ref-filter.c:802
+#, c-format
+msgid "format: %%(then) atom used without an %%(if) atom"
+msgstr "format: atom %%(then) użyty bez atomu %%(if)"
+
+#: ref-filter.c:804
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr "format: atom %%(then) użyty więcej niż raz"
+
+#: ref-filter.c:806
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr "format: atom %%(then) użyty po %%(else)"
+
+#: ref-filter.c:834
+#, c-format
+msgid "format: %%(else) atom used without an %%(if) atom"
+msgstr "format: atom %%(else) użyty bez atomu %%(if)"
+
+#: ref-filter.c:836
+#, c-format
+msgid "format: %%(else) atom used without a %%(then) atom"
+msgstr "format: atom %%(else) użyty bez atomu %%(then)"
+
+#: ref-filter.c:838
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr "format: atom %%(else) użyty więcej niż raz"
+
+#: ref-filter.c:853
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "format: atom %%(end) użyty bez odpowiadającego atomu"
+
+#: ref-filter.c:910
+#, c-format
+msgid "malformed format string %s"
+msgstr "nieprawidłowy format %s"
+
+#: ref-filter.c:1551
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr "(brak gałęzi, przestawianie %s)"
+
+#: ref-filter.c:1554
+#, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "(brak gałęzi, przestawianie odłączonego HEAD %s)"
+
+#: ref-filter.c:1557
+#, c-format
+msgid "(no branch, bisect started on %s)"
+msgstr "(brak gałęzi, przeszukiwanie rozpoczęte od %s)"
+
+#: ref-filter.c:1561
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD odłączone na %s)"
+
+#: ref-filter.c:1564
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD odłączone od %s)"
+
+#: ref-filter.c:1567
+msgid "(no branch)"
+msgstr "(brak gałęzi)"
+
+#: ref-filter.c:1599 ref-filter.c:1808
+#, c-format
+msgid "missing object %s for %s"
+msgstr "brakujący obiekt %s do %s"
+
+#: ref-filter.c:1609
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
+msgstr "parse_object_buffer nie powiodło się na %s do %s"
+
+#: ref-filter.c:1992
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "uszkodzony obiekt w „%s”"
+
+#: ref-filter.c:2081
+#, c-format
+msgid "ignoring ref with broken name %s"
+msgstr "ignorowanie referencji z zepsutą nazwą %s"
+
+#: ref-filter.c:2086 refs.c:676
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "ignorowanie zepsutej referencji %s"
+
+#: ref-filter.c:2426
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "format: brakuje atomu %%(end)"
+
+#: ref-filter.c:2525
+#, c-format
+msgid "malformed object name %s"
+msgstr "nieprawidłowa nazwa obiektu %s"
+
+#: ref-filter.c:2530
+#, c-format
+msgid "option `%s' must point to a commit"
+msgstr "opcja „%s” musi wskazywać na zapis"
+
+#: refs.c:264
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr "%s nie wskazuje na prawidłowy obiekt!"
+
+#: refs.c:566
+#, c-format
+msgid ""
+"Using '%s' as the name for the initial branch. This default branch name\n"
+"is subject to change. To configure the initial branch name to use in all\n"
+"of your new repositories, which will suppress this warning, call:\n"
+"\n"
+"\tgit config --global init.defaultBranch <name>\n"
+"\n"
+"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"'development'. The just-created branch can be renamed via this command:\n"
+"\n"
+"\tgit branch -m <name>\n"
+msgstr ""
+"Użycie „%s” jako nawy początkowej gałęzi. Ta domyślna nazwa gałęzi\n"
+"może się zmienić. Aby ustawić nazwę początkowej gałęzi do użycia we\n"
+"wszystkich nowych repozytoriach, co uciszy ten komunikat, wykonaj:\n"
+"\n"
+"\tgit config --global init.defaultBranch <nazwa>\n"
+"\n"
+"Tradycyjnie było „master”, a inne popularne to „main”, „trunk”\n"
+"i „development”. Nazwę właśnie utworzonej gałęzi można zmienić tym "
+"poleceniem:\n"
+"\n"
+"\tgit branch -m <nazwa>\n"
+
+#: refs.c:588
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "nie można odebrać „%s”"
+
+#: refs.c:598
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "nieprawidłowa nazwa gałęzi: %s = %s"
+
+#: refs.c:674
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "ignorowanie wiszącej referencji symbolicznej %s"
+
+#: refs.c:922
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr "dziennik referencji %s ma lukę po %s"
+
+#: refs.c:929
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr "dziennik referencji %s nieoczekiwanie się skończył na %s"
+
+#: refs.c:994
+#, c-format
+msgid "log for %s is empty"
+msgstr "dziennik dla %s jest pusty"
+
+#: refs.c:1086
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "odmawiam zaktualizowania referencji ze złą nazwą „%s”"
+
+#: refs.c:1157
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "update_ref nie powiodło się dla referencji „%s”: %s"
+
+#: refs.c:2051
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "wiele aktualizacji referencji „%s” niedozwolone"
+
+#: refs.c:2131
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "aktualizacje referencji zabronione w środowisku kwarantanny"
+
+#: refs.c:2142
+msgid "ref updates aborted by hook"
+msgstr "aktualizacje referencji przerwane przez skrypt repozytorium"
+
+#: refs.c:2242 refs.c:2272
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "„%s” istnieje; nie można utworzyć „%s”"
+
+#: refs.c:2248 refs.c:2283
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
+msgstr "nie można przetworzyć jednocześnie „%s” i „%s”"
+
+#: refs/files-backend.c:1228
+#, c-format
+msgid "could not remove reference %s"
+msgstr "nie można usunąć referencji %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 "nie można usunąć referencji %s: %s"
+
+#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#, c-format
+msgid "could not delete references: %s"
+msgstr "nie można usunąć referencji: %s"
+
+#: refspec.c:170
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr "nieprawidłowa referencja „%s”"
+
+#: remote.c:351
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr "zdalny skrót konfiguracji nie może zaczynać się od „/”: %s"
+
+#: remote.c:399
+msgid "more than one receivepack given, using the first"
+msgstr "podano więcej niż jedną paczkę odbiorczą, użycie pierwszej"
+
+#: remote.c:407
+msgid "more than one uploadpack given, using the first"
+msgstr "podano więcej niż jedną paczkę nadawczą, użycie pierwszej"
+
+#: remote.c:590
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "Nie można pobrać jednocześnie %s i %s do %s"
+
+#: remote.c:594
+#, c-format
+msgid "%s usually tracks %s, not %s"
+msgstr "%s zwykle śledzi %s, nie %s"
+
+#: remote.c:598
+#, c-format
+msgid "%s tracks both %s and %s"
+msgstr "%s śledzi jednocześnie %s i %s"
+
+#: remote.c:666
+#, c-format
+msgid "key '%s' of pattern had no '*'"
+msgstr "klucz „%s” z wzorca nie miał „*”"
+
+#: remote.c:676
+#, c-format
+msgid "value '%s' of pattern has no '*'"
+msgstr "wartość „%s” z wzorca nie miała „*”"
+
+#: remote.c:1083
+#, c-format
+msgid "src refspec %s does not match any"
+msgstr "źródłowa referencja %s nie pasuje do żadnej"
+
+#: remote.c:1088
+#, c-format
+msgid "src refspec %s matches more than one"
+msgstr "źródłowa ścieżka %s pasuje do więcej niż jednej"
+
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#: remote.c:1103
+#, 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 ""
+"Podany cel nie jest pełną nazwą referencji (tj.\n"
+"nie zaczyna się od „refs/”). Próbowaliśmy zgadnąć, o co chodzi:\n"
+"\n"
+"- Szukając referencji pasującej do „%s” po zdalnej stronie.\n"
+"- Sprawdzając, czy wypychane <źródło> („%s”)\n"
+" jest referencją w „refs/{heads,tags}/”. Jeśli tak, dodajemy odpowiedni\n"
+" prefiks refs/{heads,tags}/ po zdalnej stronie.\n"
+"\n"
+"Żadne nie zadziałało, więc się poddaliśmy. Musisz uzupełnić pełną postać "
+"referencji."
+
+#: remote.c:1123
+#, 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 ""
+"Część <źródła> referencji jest obiektem zapisu.\n"
+"Czy chodziło o utworzenie nowej gałęzi przez wypchnięcie na\n"
+"„%s:refs/heads/%s”?"
+
+#: remote.c:1128
+#, 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 ""
+"Część <źródła> referencji jest obiektem tagu.\n"
+"Czy chodziło o utworzenie nowego tagu przez wypchnięcie na\n"
+"„%s:refs/tags/%s”?"
+
+#: remote.c:1133
+#, 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 ""
+"Część <źródła> referencji jest obiektem drzewa.\n"
+"Czy chodziło o utworzenie nowego drzewa przez wypchnięcie na\n"
+"„%s:refs/tags/%s”?"
+
+#: remote.c:1138
+#, 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 ""
+"Część <źródła> referencji jest obiektem blobu.\n"
+"Czy chodziło o utworzenie nowego blobu przez wypchnięcie na\n"
+"„%s:refs/tags/%s”?"
+
+#: remote.c:1174
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr "nie można rozwiązać %s jako gałęzi"
+
+#: remote.c:1185
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr "nie można usunąć „%s”: zdalna referencja nie istnieje"
+
+#: remote.c:1197
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr "docelowa referencja %s pasuje do więcej niż jednej"
+
+#: remote.c:1204
+#, c-format
+msgid "dst ref %s receives from more than one src"
+msgstr "docelowa referencja %s pobiera z więcej niż jednego źródła"
+
+#: remote.c:1724 remote.c:1825
+msgid "HEAD does not point to a branch"
+msgstr "HEAD nie wskazuje gałęzi"
+
+#: remote.c:1733
+#, c-format
+msgid "no such branch: '%s'"
+msgstr "nie ma takiej gałęzi: „%s”"
+
+#: remote.c:1736
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr "gałąź „%s” nie ma ustawionej gałęzi nadrzędnej"
+
+#: remote.c:1742
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgstr "gałąź nadrzędna „%s” nie jest przechowana jako gałąź śledząca"
+
+#: remote.c:1757
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgstr ""
+"cel wypchnięcia „%s” na zdalnym repozytorium „%s” nie ma lokalnej gałęzi "
+"śledzącej"
+
+#: remote.c:1769
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr "Gałąź „%s” nie ma zdalnego repozytorium do wypychania"
+
+#: remote.c:1779
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "referencje wypychania do „%s” nie zawierają „%s”"
+
+#: remote.c:1792
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "wypchnięcie nie ma celu (push.default ma wartość „nothing”)"
+
+#: remote.c:1814
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "nie można rozwiązać „prostego” wypchnięcia do pojedynczego celu"
+
+#: remote.c:1943
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr "nie znaleziono zdalnej referencji %s"
+
+#: remote.c:1956
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr "* Pomijanie zabawnej referencji „%s” lokalnie"
+
+#: remote.c:2119
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr "Twoja gałąź jest oparta na „%s”, ale jej nadrzędna zniknęła.\n"
+
+#: remote.c:2123
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr " (użyj „git branch --unset-upstream”, aby naprawić)\n"
+
+#: remote.c:2126
+#, c-format
+msgid "Your branch is up to date with '%s'.\n"
+msgstr "Twoja gałąź jest na bieżąco z „%s”.\n"
+
+#: remote.c:2130
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr "Twoja gałąź i „%s” odnoszą się do innych zapisów.\n"
+
+#: remote.c:2133
+#, c-format
+msgid " (use \"%s\" for details)\n"
+msgstr " (więcej szczegółów w „%s”)\n"
+
+#: remote.c:2137
+#, 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] "Twoja gałąź jest do przodu względem „%s” o %d zapis.\n"
+msgstr[1] "Twoja gałąź jest do przodu względem „%s” o %d zapisy.\n"
+msgstr[2] "Twoja gałąź jest do przodu względem „%s” o %d zapisów.\n"
+
+#: remote.c:2143
+msgid " (use \"git push\" to publish your local commits)\n"
+msgstr " (użyj „git push”, aby opublikować swoje zapisy)\n"
+
+#: remote.c:2146
+#, 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] "Twoja gałąź jest za „%s” o %d zapis i może zostać przewinięta.\n"
+msgstr[1] "Twoja gałąź jest za „%s” o %d zapisy i może zostać przewinięta.\n"
+msgstr[2] "Twoja gałąź jest za „%s” o %d zapisów i może zostać przewinięta.\n"
+
+#: remote.c:2154
+msgid " (use \"git pull\" to update your local branch)\n"
+msgstr " (użyj „git pull”, aby zaktualizować lokalną gałąź)\n"
+
+#: remote.c:2157
+#, 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] ""
+"Twoja gałąź i „%s” się rozeszły\n"
+"i mają odpowiednio %d i %d różny zapis.\n"
+msgstr[1] ""
+"Twoja gałąź i „%s” się rozeszły\n"
+"i mają odpowiednio %d i %d różne zapisy.\n"
+msgstr[2] ""
+"Twoja gałąź i „%s” się rozeszły\n"
+"i mają odpowiednio %d i %d różnych zapisów.\n"
+
+#: remote.c:2167
+msgid " (use \"git pull\" to merge the remote branch into yours)\n"
+msgstr " (użyj „git pull”, aby scalić zdalną gałąź w swoją)\n"
+
+#: remote.c:2359
+#, c-format
+msgid "cannot parse expected object name '%s'"
+msgstr "nie można przetworzyć nazwy obiektu „%s”"
+
+#: replace-object.c:21
+#, c-format
+msgid "bad replace ref name: %s"
+msgstr "zła nazwa zastępczej referencji: %s"
+
+#: replace-object.c:30
+#, c-format
+msgid "duplicate replace ref: %s"
+msgstr "podwójna referencja zastępcza: %s"
+
+#: replace-object.c:82
+#, c-format
+msgid "replace depth too high for object %s"
+msgstr "zamień głębokość za dużą dla obiektu %s"
+
+#: rerere.c:201 rerere.c:210 rerere.c:213
+msgid "corrupt MERGE_RR"
+msgstr "uszkodzone MERGE_RR"
+
+#: rerere.c:248 rerere.c:253
+msgid "unable to write rerere record"
+msgstr "nie można zapisać wpisu rerere"
+
+#: rerere.c:479
+#, c-format
+msgid "there were errors while writing '%s' (%s)"
+msgstr "wystąpiły błędy przy zapisywaniu „%s” (%s)"
+
+#: rerere.c:482
+#, c-format
+msgid "failed to flush '%s'"
+msgstr "nie można wypróżnić „%s”'"
+
+#: rerere.c:487 rerere.c:1023
+#, c-format
+msgid "could not parse conflict hunks in '%s'"
+msgstr "nie można przetworzyć skrawków konfliktu w „%s”"
+
+#: rerere.c:668
+#, c-format
+msgid "failed utime() on '%s'"
+msgstr "nie można wykonać utime() na „%s”"
+
+#: rerere.c:678
+#, c-format
+msgid "writing '%s' failed"
+msgstr "nie można zapisać „%s”"
+
+#: rerere.c:698
+#, c-format
+msgid "Staged '%s' using previous resolution."
+msgstr "Przygotowano „%s” używając poprzedniego rozwiązania."
+
+#: rerere.c:737
+#, c-format
+msgid "Recorded resolution for '%s'."
+msgstr "Zapamiętano rozwiązanie dla „%s”."
+
+#: rerere.c:772
+#, c-format
+msgid "Resolved '%s' using previous resolution."
+msgstr "Rozwiązano „%s” przy użyciu poprzedniego rozwiązania."
+
+#: rerere.c:787
+#, c-format
+msgid "cannot unlink stray '%s'"
+msgstr "nie można usunąć bezpańskiego „%s”"
+
+#: rerere.c:791
+#, c-format
+msgid "Recorded preimage for '%s'"
+msgstr "Zapamiętano wstępny obraz „%s”"
+
+#: rerere.c:865 submodule.c:2088 builtin/log.c:1991
+#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "nie można utworzyć katalogu „%s”"
+
+#: rerere.c:1041
+#, c-format
+msgid "failed to update conflicted state in '%s'"
+msgstr "nie można zaktualizować skonfliktowanego stanu w „%s”"
+
+#: rerere.c:1052 rerere.c:1059
+#, c-format
+msgid "no remembered resolution for '%s'"
+msgstr "brak zapamiętanego wyniku scalenia dla „%s”"
+
+#: rerere.c:1061
+#, c-format
+msgid "cannot unlink '%s'"
+msgstr "nie można usunąć „%s”"
+
+#: rerere.c:1071
+#, c-format
+msgid "Updated preimage for '%s'"
+msgstr "Zaktualizowano wstępny obraz „%s”"
+
+#: rerere.c:1080
+#, c-format
+msgid "Forgot resolution for '%s'\n"
+msgstr "Zapomniano rozwiązanie dla „%s”\n"
+
+#: rerere.c:1191
+msgid "unable to open rr-cache directory"
+msgstr "nie można otworzyć katalogu pamięci podręcznej rr-cache"
+
+#: reset.c:42
+msgid "could not determine HEAD revision"
+msgstr "nie można ustalić rewizji HEAD"
+
+#: reset.c:70 reset.c:76 sequencer.c:3468
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "nie znaleziono drzewa %s"
+
+#: revision.c:2338
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "--unpacked=<plik-paczki> nie jest już wspierany"
+
+#: revision.c:2668
+msgid "your current branch appears to be broken"
+msgstr "twoja obecna gałąź wydaje się być uszkodzona"
+
+#: revision.c:2671
+#, c-format
+msgid "your current branch '%s' does not have any commits yet"
+msgstr "twoja obecna gałąź „%s” nie ma jeszcze żadnych zapisów"
+
+#: revision.c:2877
+msgid "-L does not yet support diff formats besides -p and -s"
+msgstr "-L nie wspiera jeszcze formatów różnic oprócz -p i -s"
+
+#: run-command.c:767
+msgid "open /dev/null failed"
+msgstr "otwarcie /dev/null nie powiodło się"
+
+#: run-command.c:1274
+#, c-format
+msgid "cannot create async thread: %s"
+msgstr "nie można utworzyć asynchronicznego wątku: %s"
+
+#: run-command.c:1338
+#, 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 ""
+"Skrypt repozytorium „%s” został zignorowany, bo nie jest wykonywalny.\n"
+"Możesz wyłączyć to ostrzeżenie przez „git config advice.ignoredHook false”."
+
+#: send-pack.c:146
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr ""
+"nieoczekiwany pakiet wypróżnienia podczas odczytu stanu zdalnego rozpakowania"
+
+#: send-pack.c:148
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr "nie można przetworzyć zdalnego stanu rozpakowania: %s"
+
+#: send-pack.c:150
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr "zdalne rozpakowanie nie powiodło się: %s"
+
+#: send-pack.c:374
+msgid "failed to sign the push certificate"
+msgstr "nie można podpisać certyfikatu wypychania"
+
+#: send-pack.c:467
+msgid "the receiving end does not support this repository's hash algorithm"
+msgstr "odbierający koniec nie wspiera algorytmu skrótu tego repozytorium"
+
+#: send-pack.c:476
+msgid "the receiving end does not support --signed push"
+msgstr "odbierający koniec nie wspiera podpisanych wypchnięć"
+
+#: send-pack.c:478
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
+msgstr ""
+"nie wysyłanie certyfikatu wypchnięcia, bo odbierający koniec nie wspiera "
+"podpisanego wypychania"
+
+#: send-pack.c:490
+msgid "the receiving end does not support --atomic push"
+msgstr "odbierający koniec nie wspiera atomowych wypchnięć"
+
+#: send-pack.c:495
+msgid "the receiving end does not support push options"
+msgstr "odbierający koniec nie wspiera opcji wypychania"
+
+#: sequencer.c:195
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr "nieprawidłowy tryb czyszczenia komunikatu zapisu „%s”"
+
+#: sequencer.c:323
+#, c-format
+msgid "could not delete '%s'"
+msgstr "nie można usunąć „%s”"
+
+#: sequencer.c:343 builtin/rebase.c:757 builtin/rebase.c:1602 builtin/rm.c:385
+#, c-format
+msgid "could not remove '%s'"
+msgstr "nie można usunąć „%s”"
+
+#: sequencer.c:353
+msgid "revert"
+msgstr "odwracanie"
+
+#: sequencer.c:355
+msgid "cherry-pick"
+msgstr "dobieranie"
+
+#: sequencer.c:357
+msgid "rebase"
+msgstr "przestawianie"
+
+#: sequencer.c:359
+#, c-format
+msgid "unknown action: %d"
+msgstr "nieznane działanie: %d"
+
+#: sequencer.c:418
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
+msgstr ""
+"po rozwiązaniu konfliktów oznacz poprawione ścieżki\n"
+"z „git add <ścieżki>” lub „git rm <ścieżki>”"
+
+#: sequencer.c:421
+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 ""
+"po rozwiązaniu konfliktów oznacz poprawione ścieżki\n"
+"z „git add <ścieżki>” lub „git rm <ścieżki>”\n"
+"i złóż wynik za pomocą „git commit”"
+
+#: sequencer.c:434 sequencer.c:3070
+#, c-format
+msgid "could not lock '%s'"
+msgstr "nie można zablokować „%s”"
+
+#: sequencer.c:436 sequencer.c:2869 sequencer.c:3074 sequencer.c:3088
+#: sequencer.c:3345 sequencer.c:5334 strbuf.c:1168 wrapper.c:631
+#, c-format
+msgid "could not write to '%s'"
+msgstr "nie można pisać do „%s”"
+
+#: sequencer.c:441
+#, c-format
+msgid "could not write eol to '%s'"
+msgstr "nie można pisać końca wiersza do „%s”"
+
+#: sequencer.c:446 sequencer.c:2874 sequencer.c:3076 sequencer.c:3090
+#: sequencer.c:3353
+#, c-format
+msgid "failed to finalize '%s'"
+msgstr "nie można sfinalizować „%s”"
+
+#: sequencer.c:485
+#, c-format
+msgid "your local changes would be overwritten by %s."
+msgstr "twoje lokalne zmiany zostaną nadpisane przez %s."
+
+#: sequencer.c:489
+msgid "commit your changes or stash them to proceed."
+msgstr "złóż swoje zmiany lub dodaj do schowka, aby kontynuować."
+
+#: sequencer.c:521
+#, c-format
+msgid "%s: fast-forward"
+msgstr "%s: przewijanie"
+
+#: sequencer.c:560 builtin/tag.c:598
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "Nieprawidłowy tryb czyszczenia %s"
+
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase".
+#.
+#: sequencer.c:670
+#, c-format
+msgid "%s: Unable to write new index file"
+msgstr "%s: Nie można zapisać nowego pliku indeksu"
+
+#: sequencer.c:684
+msgid "unable to update cache tree"
+msgstr "nie można zaktualizować drzewa pamięci podręcznej"
+
+#: sequencer.c:698
+msgid "could not resolve HEAD commit"
+msgstr "nie można rozwiązać zapisu HEAD"
+
+#: sequencer.c:778
+#, c-format
+msgid "no key present in '%.*s'"
+msgstr "nie ma żadnego klucza w „%.*s”"
+
+#: sequencer.c:789
+#, c-format
+msgid "unable to dequote value of '%s'"
+msgstr "nie można odcytować wartości „%s”"
+
+#: sequencer.c:826 wrapper.c:201 wrapper.c:371 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1136 builtin/rebase.c:910
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "nie można otworzyć „%s” do odczytu"
+
+#: sequencer.c:836
+msgid "'GIT_AUTHOR_NAME' already given"
+msgstr "już podano „GIT_AUTHOR_NAME”"
+
+#: sequencer.c:841
+msgid "'GIT_AUTHOR_EMAIL' already given"
+msgstr "już podano „GIT_AUTHOR_EMAIL”"
+
+#: sequencer.c:846
+msgid "'GIT_AUTHOR_DATE' already given"
+msgstr "już podano „GIT_AUTHOR_DATE”"
+
+#: sequencer.c:850
+#, c-format
+msgid "unknown variable '%s'"
+msgstr "nieznana zmienna „%s”"
+
+#: sequencer.c:855
+msgid "missing 'GIT_AUTHOR_NAME'"
+msgstr "brak „GIT_AUTHOR_NAME”"
+
+#: sequencer.c:857
+msgid "missing 'GIT_AUTHOR_EMAIL'"
+msgstr "brak „GIT_AUTHOR_EMAIL”"
+
+#: sequencer.c:859
+msgid "missing 'GIT_AUTHOR_DATE'"
+msgstr "brak „GIT_AUTHOR_DATE”"
+
+#: sequencer.c:924
+#, 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 ""
+"w drzewie roboczym masz przygotowane zmiany\n"
+"Jeśli te zmiany mają być spłaszczone z poprzednim zapisem, wykonaj:\n"
+"\n"
+" git commit --amend %s\n"
+"\n"
+"Jeśli mają być złożone w nowym zapisie, wykonaj:\n"
+"\n"
+" git commit %s\n"
+"\n"
+"W obu przypadkach, gdy zakończysz, kontynuuj przez:\n"
+"\n"
+" git rebase --continue\n"
+
+#: sequencer.c:1211
+msgid "'prepare-commit-msg' hook failed"
+msgstr "skrypt „prepare-commit-msg” się nie powiódł"
+
+#: sequencer.c:1217
+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 ""
+"Twoja nazwa i adres e-mail zostały automatycznie skonfigurowane na "
+"podstawie\n"
+"twojej nazwy użytkownika i nazwy hosta. Sprawdź, czy są one prawidłowe.\n"
+"Możesz ukryć tą wiadomość ustawiając je samodzielnie. Uruchom\n"
+"następującą komendę i postępuj zgodnie z instrukcjami w edytorze, aby "
+"edytować\n"
+"twój plik konfiguracyjny:\n"
+"\n"
+" git config --global --edit\n"
+"\n"
+"Po tym możesz poprawić podpis użyty w tym zapisie używając:\n"
+"\n"
+" git commit --amend --reset-author\n"
+
+#: sequencer.c:1230
+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 ""
+"Twoja nazwa i adres e-mail zostały automatycznie skonfigurowane na "
+"podstawie\n"
+" twojej nazwy użytkownika i nazwy hosta. Sprawdź, czy są one prawidłowe.\n"
+"Możesz ukryć tą wiadomość ustawiając je samodzielnie:\n"
+"\n"
+" git config --global user.email \"toja@example.com\"\n"
+" git config --global user.name \"Twoje Imię Nazwisko\"\n"
+"\n"
+"Po tym możesz poprawić podpis użyty w tym zapisie używając:\n"
+"\n"
+" git commit --amend --reset-author\n"
+
+#: sequencer.c:1272
+msgid "couldn't look up newly created commit"
+msgstr "nie odnaleziono nowo utworzonego zapisu"
+
+#: sequencer.c:1274
+msgid "could not parse newly created commit"
+msgstr "nie można przetworzyć nowo utworzonego zapisu"
+
+#: sequencer.c:1320
+msgid "unable to resolve HEAD after creating commit"
+msgstr "nie można rozwiązać HEAD po utworzeniu zapisu"
+
+#: sequencer.c:1322
+msgid "detached HEAD"
+msgstr "oddzielone HEAD"
+
+#: sequencer.c:1326
+msgid " (root-commit)"
+msgstr " (zapis-korzeń)"
+
+#: sequencer.c:1347
+msgid "could not parse HEAD"
+msgstr "nie można przetworzyć HEAD"
+
+#: sequencer.c:1349
+#, c-format
+msgid "HEAD %s is not a commit!"
+msgstr "HEAD %s nie jest zapisem!"
+
+#: sequencer.c:1353 sequencer.c:1431 builtin/commit.c:1577
+msgid "could not parse HEAD commit"
+msgstr "nie można przetworzyć zapisu HEAD"
+
+#: sequencer.c:1409 sequencer.c:2108
+msgid "unable to parse commit author"
+msgstr "nie można przetworzyć autora zapisu %s"
+
+#: sequencer.c:1420 builtin/am.c:1566 builtin/merge.c:702
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree nie może zapisać drzewa"
+
+#: sequencer.c:1453 sequencer.c:1573
+#, c-format
+msgid "unable to read commit message from '%s'"
+msgstr "nie można odczytać komunikatu zapisu z „%s”"
+
+#: sequencer.c:1484 sequencer.c:1516
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr "nieprawidłowa tożsamość autora „%s”"
+
+#: sequencer.c:1490
+msgid "corrupt author: missing date information"
+msgstr "uszkodzony autor: brakuje informacji o dacie"
+
+#: sequencer.c:1529 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:905
+#: builtin/merge.c:930 t/helper/test-fast-rebase.c:78
+msgid "failed to write commit object"
+msgstr "nie można zapisać obiektu zapisu"
+
+#: sequencer.c:1556 sequencer.c:4291 t/helper/test-fast-rebase.c:198
+#, c-format
+msgid "could not update %s"
+msgstr "nie można zaktualizować „%s”"
+
+#: sequencer.c:1605
+#, c-format
+msgid "could not parse commit %s"
+msgstr "nie można przetworzyć zapisu %s"
+
+#: sequencer.c:1610
+#, c-format
+msgid "could not parse parent commit %s"
+msgstr "nie można przetworzyć zapisu rodzica %s"
+
+#: sequencer.c:1693 sequencer.c:1804
+#, c-format
+msgid "unknown command: %d"
+msgstr "nieznane pod-polecenie: %d"
+
+#: sequencer.c:1751 sequencer.c:1776
+#, c-format
+msgid "This is a combination of %d commits."
+msgstr "To jest połączenie %d zapisów."
+
+#: sequencer.c:1761
+msgid "need a HEAD to fixup"
+msgstr "potrzeba HEAD do naprawienia"
+
+#: sequencer.c:1763 sequencer.c:3380
+msgid "could not read HEAD"
+msgstr "nie można odczytać HEAD"
+
+#: sequencer.c:1765
+msgid "could not read HEAD's commit message"
+msgstr "nie można odczytać komunikatu zapisu czoła HEAD"
+
+#: sequencer.c:1771
+#, c-format
+msgid "cannot write '%s'"
+msgstr "nie można pisać do „%s”"
+
+#: sequencer.c:1778 git-rebase--preserve-merges.sh:486
+msgid "This is the 1st commit message:"
+msgstr "To jest komunikat pierwszego zapisu:"
+
+#: sequencer.c:1786
+#, c-format
+msgid "could not read commit message of %s"
+msgstr "nie można odczytać komunikatu zapisu %s"
+
+#: sequencer.c:1793
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr "To jest komunikat zapisu nr %d:"
+
+#: sequencer.c:1799
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr "Komunikat zapisu nr %d zostanie pominięty:"
+
+#: sequencer.c:1887
+msgid "your index file is unmerged."
+msgstr "plik indeksu jest niescalony."
+
+#: sequencer.c:1894
+msgid "cannot fixup root commit"
+msgstr "nie można poprawić zapisu korzenia"
+
+#: sequencer.c:1913
+#, c-format
+msgid "commit %s is a merge but no -m option was given."
+msgstr "zapis %s jest scaleniem, a nie podano opcji -m."
+
+#: sequencer.c:1921 sequencer.c:1929
+#, c-format
+msgid "commit %s does not have parent %d"
+msgstr "zapis %s nie ma rodzica %d"
+
+#: sequencer.c:1935
+#, c-format
+msgid "cannot get commit message for %s"
+msgstr "nie można uzyskać komunikatu zapisu dla %s"
+
+#. TRANSLATORS: The first %s will be a "todo" command like
+#. "revert" or "pick", the second %s a SHA1.
+#: sequencer.c:1954
+#, c-format
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s: nie można przetworzyć rodzica zapisu %s"
+
+#: sequencer.c:2019
+#, c-format
+msgid "could not rename '%s' to '%s'"
+msgstr "nie można zmienić nazwy „%s” na „%s”"
+
+#: sequencer.c:2079
+#, c-format
+msgid "could not revert %s... %s"
+msgstr "nie można odwrócić %s... %s"
+
+#: sequencer.c:2080
+#, c-format
+msgid "could not apply %s... %s"
+msgstr "nie można zastosować %s... %s"
+
+#: sequencer.c:2100
+#, c-format
+msgid "dropping %s %s -- patch contents already upstream\n"
+msgstr "gubienie %s %s — zawartość łatki już wcielona w głównym nurcie\n"
+
+#: sequencer.c:2158
+#, c-format
+msgid "git %s: failed to read the index"
+msgstr "git %s: nie można odczytać indeksu"
+
+#: sequencer.c:2165
+#, c-format
+msgid "git %s: failed to refresh the index"
+msgstr "git %s: nie można odświeżyć indeksu"
+
+#: sequencer.c:2242
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "%s nie przyjmuje argumentów: „%s”"
+
+#: sequencer.c:2251
+#, c-format
+msgid "missing arguments for %s"
+msgstr "brakujące argumenty dla %s"
+
+#: sequencer.c:2282
+#, c-format
+msgid "could not parse '%s'"
+msgstr "nie można przetworzyć „%s”"
+
+#: sequencer.c:2343
+#, c-format
+msgid "invalid line %d: %.*s"
+msgstr "nieprawidłowy wiersz %d: %.*s"
+
+#: sequencer.c:2354
+#, c-format
+msgid "cannot '%s' without a previous commit"
+msgstr "nie można użyć „%s” bez poprzedniego zapisu"
+
+#: sequencer.c:2440
+msgid "cancelling a cherry picking in progress"
+msgstr "przerywanie trwającego dobierania"
+
+#: sequencer.c:2449
+msgid "cancelling a revert in progress"
+msgstr "przerywanie trwającego odwracania"
+
+#: sequencer.c:2493
+msgid "please fix this using 'git rebase --edit-todo'."
+msgstr "napraw to używając „git rebase --edit-todo”."
+
+#: sequencer.c:2495
+#, c-format
+msgid "unusable instruction sheet: '%s'"
+msgstr "plik z instrukcjami się nie nadaje: „%s”"
+
+#: sequencer.c:2500
+msgid "no commits parsed."
+msgstr "nie przetworzono żadnego zapisu."
+
+#: sequencer.c:2511
+msgid "cannot cherry-pick during a revert."
+msgstr "nie można dobierać w czasie odwracania."
+
+#: sequencer.c:2513
+msgid "cannot revert during a cherry-pick."
+msgstr "nie można odwrócić w czasie dobierania."
+
+#: sequencer.c:2591
+#, c-format
+msgid "invalid value for %s: %s"
+msgstr "nieprawidłowa wartość %s: %s"
+
+#: sequencer.c:2698
+msgid "unusable squash-onto"
+msgstr "spłaszcz-na się nie nadaje"
+
+#: sequencer.c:2718
+#, c-format
+msgid "malformed options sheet: '%s'"
+msgstr "nieprawidłowy plik opcji: „%s”"
+
+#: sequencer.c:2811 sequencer.c:4644
+msgid "empty commit set passed"
+msgstr "podano pusty zbiór zapisów"
+
+#: sequencer.c:2828
+msgid "revert is already in progress"
+msgstr "już trwa dobieranie"
+
+#: sequencer.c:2830
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr "spróbuj „git revert (--continue | %s--abort | --quit)”"
+
+#: sequencer.c:2833
+msgid "cherry-pick is already in progress"
+msgstr "już trwa dobieranie"
+
+#: sequencer.c:2835
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "spróbuj „git cherry-pick (--continue | %s--abort | --quit)”"
+
+#: sequencer.c:2849
+#, c-format
+msgid "could not create sequencer directory '%s'"
+msgstr "nie można utworzyć katalogu sekwencjonowania „%s”"
+
+#: sequencer.c:2864
+msgid "could not lock HEAD"
+msgstr "nie można zablokować HEAD"
+
+#: sequencer.c:2924 sequencer.c:4379
+msgid "no cherry-pick or revert in progress"
+msgstr "nie trwa dobieranie ani odwracanie"
+
+#: sequencer.c:2926 sequencer.c:2937
+msgid "cannot resolve HEAD"
+msgstr "nie można rozwiązać HEAD"
+
+#: sequencer.c:2928 sequencer.c:2972
+msgid "cannot abort from a branch yet to be born"
+msgstr "nie można przerwać z gałęzi, która dopiero ma powstać"
+
+#: sequencer.c:2958 builtin/grep.c:757
+#, c-format
+msgid "cannot open '%s'"
+msgstr "nie można otworzyć „%s”"
+
+#: sequencer.c:2960
+#, c-format
+msgid "cannot read '%s': %s"
+msgstr "nie można odczytać „%s”: %s"
+
+#: sequencer.c:2961
+msgid "unexpected end of file"
+msgstr "nieoczekiwany koniec pliku"
+
+#: sequencer.c:2967
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgstr "zapisany plik HEAD sprzed dobierania „%s” jest uszkodzony"
+
+#: sequencer.c:2978
+msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
+msgstr ""
+"Wydaje się, że czoło HEAD się przesunęło.\n"
+"Nie cofam, sprawdź swoje HEAD!"
+
+#: sequencer.c:3019
+msgid "no revert in progress"
+msgstr "nie trwa żadne odwracanie"
+
+#: sequencer.c:3028
+msgid "no cherry-pick in progress"
+msgstr "nie trwa żadne dobieranie"
+
+#: sequencer.c:3038
+msgid "failed to skip the commit"
+msgstr "nie udało się pominąć zapisu"
+
+#: sequencer.c:3045
+msgid "there is nothing to skip"
+msgstr "nie ma nic do pominięcia"
+
+#: sequencer.c:3048
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+"zapis już złożony?\n"
+"spróbuj „git %s --continue”"
+
+#: sequencer.c:3210 sequencer.c:4271
+msgid "cannot read HEAD"
+msgstr "nie można odczytać HEAD"
+
+#: sequencer.c:3227
+#, c-format
+msgid "unable to copy '%s' to '%s'"
+msgstr "nie można skopiować „%s” do „%s”"
+
+#: sequencer.c:3235
+#, 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 ""
+"Możesz teraz poprawić zapis przez\n"
+"\n"
+"\tgit commit --amend %s\n"
+"\n"
+"Kiedy zadowolisz się swoimi zmianami, wykonaj\n"
+"\n"
+"\tgit rebase --continue\n"
+
+#: sequencer.c:3245
+#, c-format
+msgid "Could not apply %s... %.*s"
+msgstr "Nie można zastosować %s... %.*s"
+
+#: sequencer.c:3252
+#, c-format
+msgid "Could not merge %.*s"
+msgstr "Nie można scalić %.*s"
+
+#: sequencer.c:3266 sequencer.c:3270 builtin/difftool.c:640
+#, c-format
+msgid "could not copy '%s' to '%s'"
+msgstr "nie można skopiować „%s” do „%s”"
+
+#: sequencer.c:3282
+#, c-format
+msgid "Executing: %s\n"
+msgstr "Wykonywanie: %s\n"
+
+#: sequencer.c:3297
+#, c-format
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+" git rebase --continue\n"
+"\n"
+msgstr ""
+"wykonanie nie powiodło się: %s\n"
+"%sMożesz naprawić problem i uruchomić\n"
+"\n"
+" git rebase --continue\n"
+"\n"
+
+#: sequencer.c:3303
+msgid "and made changes to the index and/or the working tree\n"
+msgstr "i pozostały zmiany w indeksie i/lub drzewie roboczym\n"
+
+#: sequencer.c:3309
+#, 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 ""
+"wykonanie powiodło się: %s\n"
+"ale pozostały zmiany w indeksie i/lub drzewie roboczym.\n"
+"Złóż swoje zmiany lub dodaj do schowka, i wtedy wykonaj:\n"
+"\n"
+" git rebase --continue\n"
+"\n"
+
+#: sequencer.c:3370
+#, c-format
+msgid "illegal label name: '%.*s'"
+msgstr "nieprawidłowa nazwa etykietki „%.*s”"
+
+#: sequencer.c:3424
+msgid "writing fake root commit"
+msgstr "zapisywanie fałszywego zapisu korzenia"
+
+#: sequencer.c:3429
+msgid "writing squash-onto"
+msgstr "zapisywanie spłaszcz-na"
+
+#: sequencer.c:3513
+#, c-format
+msgid "could not resolve '%s'"
+msgstr "nie można rozwiązać „%s”"
+
+#: sequencer.c:3546
+msgid "cannot merge without a current revision"
+msgstr "nie można scalić bez bieżącej rewizji"
+
+#: sequencer.c:3568
+#, c-format
+msgid "unable to parse '%.*s'"
+msgstr "nie można przetworzyć „%.*s”"
+
+#: sequencer.c:3577
+#, c-format
+msgid "nothing to merge: '%.*s'"
+msgstr "nic do scalenia: „%.*s”"
+
+#: sequencer.c:3589
+msgid "octopus merge cannot be executed on top of a [new root]"
+msgstr "nie można wykonać ośmiorniczego scalenia na szczycie [nowego korzenia]"
+
+#: sequencer.c:3605
+#, c-format
+msgid "could not get commit message of '%s'"
+msgstr "nie można uzyskać komunikatu zapisu „%s”"
+
+#: sequencer.c:3788
+#, c-format
+msgid "could not even attempt to merge '%.*s'"
+msgstr "nie można nawet spróbować scalić „%.*s”"
+
+#: sequencer.c:3804
+msgid "merge: Unable to write new index file"
+msgstr "scalanie: Nie można zapisać nowego pliku indeksu"
+
+#: sequencer.c:3878
+msgid "Cannot autostash"
+msgstr "Nie można automatycznie dodać do schowka"
+
+#: sequencer.c:3881
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "Nieoczekiwana odpowiedź schowka: „%s”"
+
+#: sequencer.c:3887
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "Nie można utworzyć katalogu dla „%s”"
+
+#: sequencer.c:3890
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "Automatycznie zapisano w schowku: %s\n"
+
+#: sequencer.c:3894
+msgid "could not reset --hard"
+msgstr "nie można zresetować --hard"
+
+#: sequencer.c:3919
+#, c-format
+msgid "Applied autostash.\n"
+msgstr "Zastosowano zmiany z automatycznego schowka.\n"
+
+#: sequencer.c:3931
+#, c-format
+msgid "cannot store %s"
+msgstr "nie można zapisać %s"
+
+#: sequencer.c:3934
+#, 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"
+"Twoje zmiany są bezpieczne w schowku.\n"
+"Możesz w każdej chwili wykonać „git stash pop” lub „git stash drop”.\n"
+
+#: sequencer.c:3939
+msgid "Applying autostash resulted in conflicts."
+msgstr "Stosowanie zmian z automatycznego schowka spowodowało konflikty."
+
+#: sequencer.c:3940
+msgid "Autostash exists; creating a new stash entry."
+msgstr ""
+"W schowku istnieje automatyczny wpis; tworzenie nowego wpisu w schowku."
+
+#: sequencer.c:4033 git-rebase--preserve-merges.sh:769
+msgid "could not detach HEAD"
+msgstr "nie można odłączyć HEAD"
+
+#: sequencer.c:4048
+#, c-format
+msgid "Stopped at HEAD\n"
+msgstr "Zatrzymano przy HEAD\n"
+
+#: sequencer.c:4050
+#, c-format
+msgid "Stopped at %s\n"
+msgstr "Zatrzymano przy %s\n"
+
+#: sequencer.c:4058
+#, 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 ""
+"Nie można wykonać polecenia z zadań do zrobienia\n"
+"\n"
+" %.*s\n"
+"Zostało przeplanowane; Aby zmienić polecenie przed kontynuowaniem,\n"
+"zmień najpierw listę zadań do zrobienia:\n"
+"\n"
+" git rebase --edit-todo\n"
+" git rebase --continue\n"
+
+#: sequencer.c:4104
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "Przestawianie (%d/%d)%s"
+
+#: sequencer.c:4149
+#, c-format
+msgid "Stopped at %s... %.*s\n"
+msgstr "Zatrzymano na %s... %.*s\n"
+
+#: sequencer.c:4220
+#, c-format
+msgid "unknown command %d"
+msgstr "nieznane polecenie %d"
+
+#: sequencer.c:4279
+msgid "could not read orig-head"
+msgstr "nie można odczytać pierwotnego czoła"
+
+#: sequencer.c:4284
+msgid "could not read 'onto'"
+msgstr "nie można odczytać „onto”"
+
+#: sequencer.c:4298
+#, c-format
+msgid "could not update HEAD to %s"
+msgstr "nie można zapisać HEAD do %s"
+
+#: sequencer.c:4358
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "Pomyślnie przestawiono i zaktualizowano %s.\n"
+
+#: sequencer.c:4391
+msgid "cannot rebase: You have unstaged changes."
+msgstr "nie można przestawić: Masz nieprzygotowane zmiany."
+
+#: sequencer.c:4400
+msgid "cannot amend non-existing commit"
+msgstr "nie można poprawić nieistniejącego obiektu"
+
+#: sequencer.c:4402
+#, c-format
+msgid "invalid file: '%s'"
+msgstr "nieprawidłowy plik: „%s”"
+
+#: sequencer.c:4404
+#, c-format
+msgid "invalid contents: '%s'"
+msgstr "nieprawidłowa zawartość: „%s”"
+
+#: sequencer.c:4407
+msgid ""
+"\n"
+"You have uncommitted changes in your working tree. Please, commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr ""
+"\n"
+"Masz niezłożone zmiany w drzewie roboczym. Najpierw je złóż\n"
+"i wtedy ponownie wykonaj „git rebase --continue”."
+
+#: sequencer.c:4443 sequencer.c:4482
+#, c-format
+msgid "could not write file: '%s'"
+msgstr "nie można zapisać pliku: „%s”"
+
+#: sequencer.c:4498
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr "nie można usunąć CHERRY_PICK_HEAD"
+
+#: sequencer.c:4505
+msgid "could not commit staged changes."
+msgstr "nie udało się złożyć zmian ze schowka."
+
+#: sequencer.c:4621
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s: nie można dobrać %s"
+
+#: sequencer.c:4625
+#, c-format
+msgid "%s: bad revision"
+msgstr "%s: zła rewizja"
+
+#: sequencer.c:4660
+msgid "can't revert as initial commit"
+msgstr "nie można odwrócić jako pierwszy zapis"
+
+#: sequencer.c:5137
+msgid "make_script: unhandled options"
+msgstr "make_script: nieobsłużone opcje"
+
+#: sequencer.c:5140
+msgid "make_script: error preparing revisions"
+msgstr "make_script: błąd przygotowania rewizji"
+
+#: sequencer.c:5382 sequencer.c:5399
+msgid "nothing to do"
+msgstr "nic do zrobienia"
+
+#: sequencer.c:5418
+msgid "could not skip unnecessary pick commands"
+msgstr "nie można pominąć niepotrzebnych poleceń pick"
+
+#: sequencer.c:5512
+msgid "the script was already rearranged."
+msgstr "kolejność skryptu została już zmieniona."
+
+#: setup.c:133
+#, c-format
+msgid "'%s' is outside repository at '%s'"
+msgstr "„%s” jest poza repozytorium w „%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: nie ma takiej ścieżki w drzewie roboczym.\n"
+"Użyj „git <polecenie> -- <ścieżka>...”, aby podać nieistniejące lokalnie "
+"ścieżki."
+
+#: 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 ""
+"niejednoznaczny argument „%s”: nieznana rewizja lub ścieżka niebędąca\n"
+"w drzewie roboczym. Użyj „--” do oddzielenia ścieżek od rewizji:\n"
+"„git <polecenie> [<rewizja>...] -- [<plik>...]”"
+
+#: setup.c:264
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr "opcja „%s” musi się znaleźć przed argumentami, nie licząc innych opcji"
+
+#: 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 ""
+"niejednoznaczny argument „%s”: jednocześnie rewizja i nazwa pliku\n"
+"Użyj „--”, aby rozdzielić ścieżki od rewizji:\n"
+"„git <polecenie> [<rewizja>...] -- [<plik>...]”"
+
+#: setup.c:419
+msgid "unable to set up work tree using invalid config"
+msgstr ""
+"nie można ustawić drzewa roboczego przy użyciu nieprawidłowej konfiguracji"
+
+#: setup.c:423
+msgid "this operation must be run in a work tree"
+msgstr "to działanie musi być wykonane w drzewie roboczym"
+
+#: setup.c:661
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "Oczekiwano wersji repozytorium gita <= %d, znaleziono %d"
+
+#: setup.c:669
+msgid "unknown repository extensions found:"
+msgstr "znaleziono nieznane rozszerzenia repozytorium:"
+
+#: setup.c:681
+msgid "repo version is 0, but v1-only extensions found:"
+msgstr "wersja repozytorium to 0, ale znaleziono rozszerzenia typowe dla v1"
+
+#: setup.c:700
+#, c-format
+msgid "error opening '%s'"
+msgstr "nie można otworzyć „%s”"
+
+#: setup.c:702
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr "za duży jak na plik .git: „%s”"
+
+#: setup.c:704
+#, c-format
+msgid "error reading %s"
+msgstr "błąd odczytu %s"
+
+#: setup.c:706
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr "nieprawidłowy format pliku gitfile: %s"
+
+#: setup.c:708
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr "brak ścieżki w pliku gitfile %s"
+
+#: setup.c:710
+#, c-format
+msgid "not a git repository: %s"
+msgstr "to nie jest repozytorium gita: %s"
+
+#: setup.c:812
+#, c-format
+msgid "'$%s' too big"
+msgstr "„$%s” za duże"
+
+#: setup.c:826
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr "to nie jest repozytorium gita: „%s”"
+
+#: setup.c:855 setup.c:857 setup.c:888
+#, c-format
+msgid "cannot chdir to '%s'"
+msgstr "nie można wejść do „%s”"
+
+#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973
+msgid "cannot come back to cwd"
+msgstr "nie można wrócić do cwd"
+
+#: setup.c:987
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr "nie można wykonać stat na „%*s%s%s”"
+
+#: setup.c:1225
+msgid "Unable to read current working directory"
+msgstr "Nie można odczytać obecnego katalogu roboczego"
+
+#: setup.c:1234 setup.c:1240
+#, c-format
+msgid "cannot change to '%s'"
+msgstr "nie można zmienić na „%s”"
+
+#: setup.c:1245
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr "to nie jest repozytorium gita (ani żaden z katalogów nadrzędnych): %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 ""
+"to nie jest repozytorium gita (ani żaden katalog nadrzędny aż do punktu "
+"montowania %s)\n"
+"Zatrzymano na granicy systemu plików (nie ustawiono "
+"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 ""
+"problem z wartością trybu pliku core.sharedRepository (0%.3o).\n"
+"Właściciel plików musi zawsze mieć prawa do odczytu i zapisu."
+
+#: setup.c:1409
+msgid "open /dev/null or dup failed"
+msgstr "otwarcie /dev/null lub dup() nie powiodło się"
+
+#: setup.c:1424
+msgid "fork failed"
+msgstr "fork nie powiódł się"
+
+#: setup.c:1429
+msgid "setsid failed"
+msgstr "setsid nie powiodło się"
+
+#. 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 bajt"
+msgstr[1] "%u bajty"
+msgstr[2] "%u bajtów"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#: strbuf.c:877
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] "%u bajt/s"
+msgstr[1] "%u bajty/s"
+msgstr[2] "%u bajtów/s"
+
+#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719
+#: builtin/rebase.c:866
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "nie można otworzyć „%s” do zapisywania"
+
+#: strbuf.c:1175
+#, c-format
+msgid "could not edit '%s'"
+msgstr "nie można edytować „%s”"
+
+#: submodule-config.c:237
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr "ignorowanie podejrzanej nazwy pod-modułu: %s"
+
+#: submodule-config.c:304
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "ujemne wartości niedozwolone w submodule.fetchjobs"
+
+#: submodule-config.c:402
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr ""
+"pomijanie „%s”, które można zinterpretować jako opcję wiersza polecenia: %s"
+
+#: submodule-config.c:499
+#, c-format
+msgid "invalid value for %s"
+msgstr "nieprawidłowa wartość %s"
+
+#: submodule-config.c:766
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "Nie można zaktualizować wpisu .gitmodules %s"
+
+#: submodule.c:114 submodule.c:143
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr "Nie można zmienić niescalonego .gitmodules, najpierw scal konflikty"
+
+#: submodule.c:118 submodule.c:147
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr "Nie znaleziono rozdziału w .gitmodules, gdzie path=%s"
+
+#: submodule.c:154
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "Nie można usunąć wpisu .gitmodules dla %s"
+
+#: submodule.c:165
+msgid "staging updated .gitmodules failed"
+msgstr "przygotowanie zaktualizowanego .gitmodules nie powiodło się"
+
+#: submodule.c:327
+#, c-format
+msgid "in unpopulated submodule '%s'"
+msgstr "w niezapełnionym pod-module „%s”"
+
+#: submodule.c:358
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "Ścieżka „%s” jest w pod-module „%.*s”"
+
+#: submodule.c:435
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "zły argument --ignore-submodules: %s"
+
+#: submodule.c:817
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr ""
+"Pod-moduł w zapisie %s w ścieżce „%s” zderzył się z pod-modułem o tej samej "
+"nazwie. Pomijanie."
+
+#: submodule.c:920
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr "element pod-modułu „%s” (%s) nie jest zapisem, jest rodzaju %s"
+
+#: submodule.c:1005
+#, c-format
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
+msgstr ""
+"Nie można wykonać polecenia „git rev-list <zapisy> --not --remotes -n 1” w "
+"pod-module %s"
+
+#: submodule.c:1128
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "proces dla pod-modułu „%s” nie powiódł się"
+
+#: submodule.c:1157 builtin/branch.c:689 builtin/submodule--helper.c:2469
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "Nie można rozwiązać HEAD jako prawidłowej referencji."
+
+#: submodule.c:1168
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "Wypychanie pod-modułu „%s”\n"
+
+#: submodule.c:1171
+#, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr "Nie można wypchnąć pod-modułu „%s”\n"
+
+#: submodule.c:1463
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "Pobieranie pod-modułu %s%s\n"
+
+#: submodule.c:1497
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr "Nie można się dostać do pod-modułu „%s”\n"
+
+#: submodule.c:1652
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"Błędy podczas pobierania pod-modułów:\n"
+"%s"
+
+#: submodule.c:1677
+#, c-format
+msgid "'%s' not recognized as a git repository"
+msgstr "nie rozpoznano „%s” jako repozytorium gita"
+
+#: submodule.c:1694
+#, c-format
+msgid "Could not run 'git status --porcelain=2' in submodule %s"
+msgstr "Nie można wykonać „git status --porcelain=2” w pod-module %s"
+
+#: submodule.c:1735
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr "„git status --porcelain=2” nie powiódł się w pod-module %s"
+
+#: submodule.c:1810
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
+msgstr "nie można uruchomić „git status” w pod-module „%s”"
+
+#: submodule.c:1823
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
+msgstr "nie można wykonać „git status” w pod-module „%s”"
+
+#: submodule.c:1838
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
+msgstr "Nie można usunąć ustawienia core.worktree w pod-module „%s”"
+
+#: submodule.c:1865 submodule.c:2175
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "nie można zejść do pod-modułu „%s”"
+
+#: submodule.c:1886
+msgid "could not reset submodule index"
+msgstr "nie można zresetować indeksu pod-modułu"
+
+#: submodule.c:1928
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "pod-moduł „%s” ma brudny indeks"
+
+#: submodule.c:1980
+#, c-format
+msgid "Submodule '%s' could not be updated."
+msgstr "Nie można zaktualizować pod-modułu „%s”."
+
+#: submodule.c:2048
+#, c-format
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
+msgstr "katalog gita pod-modułu „%s” jest w katalogu gita „%.*s”"
+
+#: submodule.c:2069
+#, c-format
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+msgstr ""
+"relocate_gitdir dla pod-modułu „%s” z ponad jednym drzewem roboczym "
+"niewspierane"
+
+#: submodule.c:2081 submodule.c:2140
+#, c-format
+msgid "could not lookup name for submodule '%s'"
+msgstr "nie odnaleziono nazwy pod-modułu „%s”"
+
+#: submodule.c:2085
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr "odmawiam przeniesienia „%s” do istniejącego katalogu gita"
+
+#: submodule.c:2092
+#, c-format
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
+msgstr ""
+"Migrowanie katalogu gita „%s%s” z\n"
+"„%s” do\n"
+"„%s”\n"
+
+#: submodule.c:2220
+msgid "could not start ls-files in .."
+msgstr "nie można uruchomić ls-files w .."
+
+#: submodule.c:2260
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr "ls-tree zwróciło nieoczekiwany kod wyjścia %d"
+
+#: trailer.c:236
+#, c-format
+msgid "running trailer command '%s' failed"
+msgstr "wykonanie polecenia końcówki „%s” nie powiodło się"
+
+#: 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 "nierozpoznana wartość „%s” klucza „%s”"
+
+#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324
+#, c-format
+msgid "more than one %s"
+msgstr "więcej niż jeden %s"
+
+#: trailer.c:728
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "pusty klucz w końcówce „%.*s”"
+
+#: trailer.c:748
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "nie można odczytać pliku „%s”"
+
+#: trailer.c:751 builtin/mktag.c:91
+msgid "could not read from stdin"
+msgstr "nie można czytać ze standardowego wejścia"
+
+#: trailer.c:1009 wrapper.c:676
+#, c-format
+msgid "could not stat %s"
+msgstr "nie można wykonać stat na %s"
+
+#: trailer.c:1011
+#, c-format
+msgid "file %s is not a regular file"
+msgstr "plik %s nie jest zwykłym plikiem"
+
+#: trailer.c:1013
+#, c-format
+msgid "file %s is not writable by user"
+msgstr "plik %s nie może być zapisany przez użytkownika"
+
+#: trailer.c:1025
+msgid "could not open temporary file"
+msgstr "nie można otworzyć pliku tymczasowego"
+
+#: trailer.c:1065
+#, c-format
+msgid "could not rename temporary file to %s"
+msgstr "nie można zmienić nazwy pliku tymczasowego na %s"
+
+#: transport-helper.c:62 transport-helper.c:91
+msgid "full write to remote helper failed"
+msgstr "pełny zapis do zdalnego pomocnika nie powiódł się"
+
+#: transport-helper.c:145
+#, c-format
+msgid "unable to find remote helper for '%s'"
+msgstr "nie znaleziono zdalnego pomocnika do „%s”"
+
+#: transport-helper.c:161 transport-helper.c:575
+msgid "can't dup helper output fd"
+msgstr "nie można zduplikować wyjściowego deskryptora pliku"
+
+#: transport-helper.c:214
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
+msgstr ""
+"nieznana obowiązkowa zdolność %s; ten zdalny pomocnik zapewne potrzebuje "
+"nowszej wersji Gita"
+
+#: transport-helper.c:220
+msgid "this remote helper should implement refspec capability"
+msgstr ""
+"ten zdalny pomocnik powinien zaimplementować zdolność referencji refspec"
+
+#: transport-helper.c:287 transport-helper.c:429
+#, c-format
+msgid "%s unexpectedly said: '%s'"
+msgstr "%s nieoczekiwanie odpowiedział: „%s”"
+
+#: transport-helper.c:417
+#, c-format
+msgid "%s also locked %s"
+msgstr "%s zablokował także %s"
+
+#: transport-helper.c:497
+msgid "couldn't run fast-import"
+msgstr "nie można wykonać fast-import"
+
+#: transport-helper.c:520
+msgid "error while running fast-import"
+msgstr "błąd wykonywania fast-import"
+
+#: transport-helper.c:549 transport-helper.c:1237
+#, c-format
+msgid "could not read ref %s"
+msgstr "nie można odczytać referencji %s"
+
+#: transport-helper.c:594
+#, c-format
+msgid "unknown response to connect: %s"
+msgstr "nieznana odpowiedź na połączenie: %s"
+
+#: transport-helper.c:616
+msgid "setting remote service path not supported by protocol"
+msgstr "ustawianie ścieżki zdalnej usługi niewspierane przez protokół"
+
+#: transport-helper.c:618
+msgid "invalid remote service path"
+msgstr "nieprawidłowa ścieżka zdalnej usługi"
+
+#: transport-helper.c:661 transport.c:1447
+msgid "operation not supported by protocol"
+msgstr "operacja niewspierana przez protokół"
+
+#: transport-helper.c:664
+#, c-format
+msgid "can't connect to subservice %s"
+msgstr "nie można połączyć z pod-usługą %s"
+
+#: transport-helper.c:745
+msgid "'option' without a matching 'ok/error' directive"
+msgstr "„option” bez pasującej dyrektywy „ok/error”"
+
+#: transport-helper.c:788
+#, c-format
+msgid "expected ok/error, helper said '%s'"
+msgstr "oczekiwano ok/error pomocnik powiedział „%s”"
+
+#: transport-helper.c:845
+#, c-format
+msgid "helper reported unexpected status of %s"
+msgstr "pomocnik zwrócił nieoczekiwany stan %s"
+
+#: transport-helper.c:928
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr "pomocnik %s nie wspiera wykonania na sucho (dry-run)"
+
+#: transport-helper.c:931
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr "pomocnik %s nie wspiera --signed"
+
+#: transport-helper.c:934
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr "pomocnik %s nie wspiera --signed=if-asked"
+
+#: transport-helper.c:939
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr "pomocnik %s nie wspiera --atomic"
+
+#: transport-helper.c:943
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr "pomocnik %s nie wspiera --%s"
+
+#: transport-helper.c:950
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr "pomocnik %s nie wspiera „push-option”"
+
+#: transport-helper.c:1050
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr "zdalny pomocnik nie wspiera wypychania; potrzeba referencji"
+
+#: transport-helper.c:1055
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr "pomocnik %s nie wspiera „force”"
+
+#: transport-helper.c:1102
+msgid "couldn't run fast-export"
+msgstr "nie można wykonać fast-export"
+
+#: transport-helper.c:1107
+msgid "error while running fast-export"
+msgstr "błąd wykonywania fast-export"
+
+#: transport-helper.c:1132
+#, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch.\n"
+msgstr ""
+"Brak wspólnych referencji lub żadnych nie podano; brak działania.\n"
+"Pewnie należy podać jakąś gałąź.\n"
+
+#: transport-helper.c:1214
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr "niewspierany format obiektu „%s”"
+
+#: transport-helper.c:1223
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr "nieprawidłowa odpowiedź na liście referencji: %s"
+
+#: transport-helper.c:1375
+#, c-format
+msgid "read(%s) failed"
+msgstr "read(%s) nie powiodło się"
+
+#: transport-helper.c:1402
+#, c-format
+msgid "write(%s) failed"
+msgstr "write(%s) nie powiodło się"
+
+#: transport-helper.c:1451
+#, c-format
+msgid "%s thread failed"
+msgstr "wątek %s nie powiódł się"
+
+#: transport-helper.c:1455
+#, c-format
+msgid "%s thread failed to join: %s"
+msgstr "wątek %s nie może się złączyć: %s"
+
+#: transport-helper.c:1474 transport-helper.c:1478
+#, c-format
+msgid "can't start thread for copying data: %s"
+msgstr "nie można uruchomić wątku do kopiowania danych: %s"
+
+#: transport-helper.c:1515
+#, c-format
+msgid "%s process failed to wait"
+msgstr "procesowi %s nie udało się zaczekać"
+
+#: transport-helper.c:1519
+#, c-format
+msgid "%s process failed"
+msgstr "proces %s nie powiódł się"
+
+#: transport-helper.c:1537 transport-helper.c:1546
+msgid "can't start thread for copying data"
+msgstr "nie można uruchomić wątku do kopiowania danych"
+
+#: transport.c:116
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "Ustawiłoby gałąź nadrzędną „%s” na „%s” z „%s”\n"
+
+#: transport.c:145
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "nie można odczytać wiązki „%s”"
+
+#: transport.c:220
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transport: nieprawidłowa opcja głębokości „%s”"
+
+#: transport.c:269
+msgid "see protocol.version in 'git help config' for more details"
+msgstr "więcej szczegółów pod protocol.version w „git help config”"
+
+#: transport.c:270
+msgid "server options require protocol version 2 or later"
+msgstr "opcje serwera wymagają wersji protokołu 2 lub późniejszej"
+
+#: transport.c:727
+msgid "could not parse transport.color.* config"
+msgstr "nie można przetworzyć ustawienia transport.color.*"
+
+#: transport.c:802
+msgid "support for protocol v2 not implemented yet"
+msgstr "wsparcie dla protokołu v2 jeszcze niezaimplementowane"
+
+#: transport.c:936
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "nierozpoznana wartość klucza „%s”: %s"
+
+#: transport.c:1002
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "transport „%s” niedozwolony"
+
+#: transport.c:1055
+msgid "git-over-rsync is no longer supported"
+msgstr "git-over-rsync nie jest już wspierany"
+
+#: transport.c:1157
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"Następujące ścieżki pod-modułów zawierają zmiany, których nie można\n"
+"znaleźć w żadnym zdalnym repozytorium:\n"
+
+#: transport.c:1161
+#, 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"
+"Spróbuj\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"lub wejść cd do ścieżki i użyć\n"
+"\n"
+"\tgit push\n"
+"\n"
+"żeby wypchnąć je do zdalnego repozytorium.\n"
+"\n"
+
+#: transport.c:1169
+msgid "Aborting."
+msgstr "Przerywanie."
+
+#: transport.c:1316
+msgid "failed to push all needed submodules"
+msgstr "nie można wypchnąć wszystkich potrzebnych zagnieżdżonych pod-modułów"
+
+#: tree-walk.c:33
+msgid "too-short tree object"
+msgstr "za krótki obiekt drzewa"
+
+#: tree-walk.c:39
+msgid "malformed mode in tree entry"
+msgstr "nieprawidłowy tryb w elemencie drzewa"
+
+#: tree-walk.c:43
+msgid "empty filename in tree entry"
+msgstr "pusta nazwa pliku w elemencie drzewa"
+
+#: tree-walk.c:118
+msgid "too-short tree file"
+msgstr "za krótki plik drzewa"
+
+#: 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 ""
+"Wybranie gałęzi nadpisałoby lokalne zmiany w następujących plikach:\n"
+"%%sZłóż swoje zmiany lub dodaj do schowka zanim zmienisz gałąź."
+
+#: unpack-trees.c:115
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"Wybranie nadpisałoby lokalne zmiany w następujących plikach:\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 ""
+"Scalenie nadpisałoby zmiany w następujących plikach:\n"
+"%%sZłóż swoje zmiany lub dodaj do schowka zanim je scalisz."
+
+#: unpack-trees.c:120
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Twoje lokalne zmiany do następujących plików zostaną zastąpione przez "
+"scalenie:\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 nadpisałoby zmiany w następujących plikach:\n"
+"%%sZłóż swoje zmiany lub dodaj do schowka zanim wykonasz %s."
+
+#: unpack-trees.c:125
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Twoje lokalne zmiany do następujących plików zostaną zastąpione przez %s:\n"
+"%%s"
+
+#: unpack-trees.c:130
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
+msgstr ""
+"Aktualizowanie następujących katalogów postradałoby nieśledzone pliki:\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 ""
+"Wybranie usunęłoby następujące nieśledzone pliki drzewa roboczego:\n"
+"%%sPrzenieś je lub usuń przed przełączeniem gałęzi."
+
+#: unpack-trees.c:136
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"Następujące nieśledzone pliki drzewa roboczego zostałyby usunięte przez "
+"wybranie:\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 ""
+"Scalenie usunęłoby następujące nieśledzone pliki drzewa roboczego:\n"
+"%%sPrzenieś je lub usuń przed scalaniem."
+
+#: unpack-trees.c:141
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"Następujące nieśledzone pliki drzewa roboczego zostałyby usunięte przez "
+"scalenie:\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 usunęłoby następujące nieśledzone pliki drzewa roboczego:\n"
+"%%sPrzenieś je lub usuń przed %s."
+
+#: unpack-trees.c:146
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"Następujące nieśledzone pliki drzewa roboczego zostałyby usunięte przez %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 ""
+"Wybranie nadpisałoby następujące nieśledzone pliki drzewa roboczego:\n"
+"%%sPrzenieś je lub usuń przed przełączeniem gałęzi."
+
+#: unpack-trees.c:154
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"Wybranie nadpisałoby następujące nieśledzone pliki drzewa roboczego:\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 ""
+"Scalenie nadpisałoby następujące nieśledzone pliki drzewa roboczego:\n"
+"%%sPrzenieś je lub usuń przed scalaniem."
+
+#: unpack-trees.c:159
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Scalenie nadpisałoby następujące nieśledzone pliki drzewa roboczego:\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 nadpisałoby następujące nieśledzone pliki drzewa roboczego:\n"
+"%%sPrzenieś je lub usuń przed %s."
+
+#: unpack-trees.c:164
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"%s nadpisałoby następujące nieśledzone pliki drzewa roboczego:\n"
+"%%s"
+
+#: unpack-trees.c:172
+#, c-format
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgstr "Element „%s” pokrywa się z „%s”. Nie można związać."
+
+#: unpack-trees.c:175
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+"Nie można zaktualizować pod-modułu:\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 ""
+"Następujące ścieżki nie są aktualne i zostały mimo rzadkich wzorców:\n"
+"%s"
+
+#: unpack-trees.c:180
+#, c-format
+msgid ""
+"The following paths are unmerged and were left despite sparse patterns:\n"
+"%s"
+msgstr ""
+"Następujące ścieżki są niescalone i zostały mimo rzadkich wzorców:\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 ""
+"Następujące ścieżki już istniały i nie są zaktualizowane mimo rzadkich "
+"wzorców:\n"
+"%s"
+
+#: unpack-trees.c:262
+#, c-format
+msgid "Aborting\n"
+msgstr "Przerywanie\n"
+
+#: unpack-trees.c:289
+#, c-format
+msgid ""
+"After fixing the above paths, you may want to run `git sparse-checkout "
+"reapply`.\n"
+msgstr ""
+"Po naprawieniu powyższych ścieżek możesz chcieć wykonać „git sparse-checkout "
+"reapply”.\n"
+
+#: unpack-trees.c:350
+msgid "Updating files"
+msgstr "Aktualizowanie plików"
+
+#: 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 ""
+"następujące ścieżki się zderzyły (np. ścieżki różniące się wielkością\n"
+"liter w systemie plików, który wielkości nie rozróżnia) i tylko jedna\n"
+"z grupy jest w drzewie roboczym:\n"
+
+#: unpack-trees.c:1498
+msgid "Updating index flags"
+msgstr "Aktualizowanie flag indeksu"
+
+#: upload-pack.c:1543
+msgid "expected flush after fetch arguments"
+msgstr "oczekiwano wypróżnienia po argumentach pobrania"
+
+#: urlmatch.c:163
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "nieprawidłowa nazwa schematu w adresie URL lub brakujące „://”"
+
+#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr "błędna sekwencja %XX"
+
+#: urlmatch.c:215
+msgid "missing host and scheme is not 'file:'"
+msgstr "brakuje maszyny, a schemat nie jest „file:”"
+
+#: urlmatch.c:232
+msgid "a 'file:' URL may not have a port number"
+msgstr "adres „file:” nie może mieć numeru portu"
+
+#: urlmatch.c:247
+msgid "invalid characters in host name"
+msgstr "nieprawidłowe znaki w nazwie maszyny"
+
+#: urlmatch.c:292 urlmatch.c:303
+msgid "invalid port number"
+msgstr "nieprawidłowy numer portu"
+
+#: urlmatch.c:371
+msgid "invalid '..' path segment"
+msgstr "nieprawidłowy segment ścieżki „..”"
+
+#: walker.c:170
+msgid "Fetching objects"
+msgstr "Pobieranie obiektów"
+
+#: worktree.c:238 builtin/am.c:2103
+#, c-format
+msgid "failed to read '%s'"
+msgstr "nie można odczytać „%s”"
+
+#: worktree.c:304
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr "„%s” w głównym drzewie roboczym nie jest katalogiem repozytorium"
+
+#: worktree.c:315
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr ""
+"plik „%s” nie zawiera ścieżki bezwzględnej do położenia drzewa roboczego"
+
+#: worktree.c:327
+#, c-format
+msgid "'%s' does not exist"
+msgstr "„%s” nie istnieje"
+
+#: worktree.c:333
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr "„%s” nie jest plikiem .git, kod błędu %d"
+
+#: worktree.c:342
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr "„%s” nie wskazuje z powrotem na „%s”"
+
+#: worktree.c:608
+msgid "not a directory"
+msgstr "nie jest katalogiem"
+
+#: worktree.c:617
+msgid ".git is not a file"
+msgstr ".git nie jest plikiem"
+
+#: worktree.c:619
+msgid ".git file broken"
+msgstr "plik .git zepsuty"
+
+#: worktree.c:621
+msgid ".git file incorrect"
+msgstr "plik .git nieprawidłowy"
+
+#: worktree.c:727
+msgid "not a valid path"
+msgstr "nieprawidłowa ścieżka"
+
+#: worktree.c:733
+msgid "unable to locate repository; .git is not a file"
+msgstr "nie odnaleziono repozytorium; .git nie jest plikiem"
+
+#: worktree.c:737
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr "nie odnaleziono repozytorium; plik .git nie odnosi się do repozytorium"
+
+#: worktree.c:741
+msgid "unable to locate repository; .git file broken"
+msgstr "nie odnaleziono repozytorium; plik .git zepsuty"
+
+#: worktree.c:747
+msgid "gitdir unreadable"
+msgstr "katalog gita nie do odczytania"
+
+#: worktree.c:751
+msgid "gitdir incorrect"
+msgstr "katalog gita nieprawidłowy"
+
+#: worktree.c:776
+msgid "not a valid directory"
+msgstr "nie jest prawidłowym katalogiem"
+
+#: worktree.c:782
+msgid "gitdir file does not exist"
+msgstr "plik gitdir nie istnieje"
+
+#: worktree.c:787 worktree.c:796
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "nie można odczytać pliku gitdir (%s)"
+
+#: worktree.c:806
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr "przykrótki odczyt (oczekiwano %<PRIuMAX> bajtów, odczytano %<PRIuMAX>)"
+
+#: worktree.c:814
+msgid "invalid gitdir file"
+msgstr "nieprawidłowy plik gitdir"
+
+#: worktree.c:822
+msgid "gitdir file points to non-existent location"
+msgstr "plik gitdir wskazuje nieistniejące położenie"
+
+#: wrapper.c:197 wrapper.c:367
+#, c-format
+msgid "could not open '%s' for reading and writing"
+msgstr "nie można otworzyć „%s” do odczytu i zapisu"
+
+#: wrapper.c:398 wrapper.c:599
+#, c-format
+msgid "unable to access '%s'"
+msgstr "brak dostępu do „%s”"
+
+#: wrapper.c:607
+msgid "unable to get current working directory"
+msgstr "Nie można uzyskać obecnego katalogu roboczego"
+
+#: wt-status.c:158
+msgid "Unmerged paths:"
+msgstr "Niescalone ścieżki"
+
+#: wt-status.c:187 wt-status.c:219
+msgid " (use \"git restore --staged <file>...\" to unstage)"
+msgstr " (użyj „git restore --staged <plik>...”, aby wycofać)"
+
+#: wt-status.c:190 wt-status.c:222
+#, c-format
+msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr " (użyj „git restore --source=%s --staged <plik>...”, aby wycofać)"
+
+#: wt-status.c:193 wt-status.c:225
+msgid " (use \"git rm --cached <file>...\" to unstage)"
+msgstr " (użyj „git rm --cached <plik>...”, aby wycofać)"
+
+#: wt-status.c:197
+msgid " (use \"git add <file>...\" to mark resolution)"
+msgstr " (użyj „git add <plik>...” aby zaznaczyć rozwiązanie)"
+
+#: wt-status.c:199 wt-status.c:203
+msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr " (użyj odpowiednio „git add/rm <plik>...” aby zaznaczyć rozwiązanie)"
+
+#: wt-status.c:201
+msgid " (use \"git rm <file>...\" to mark resolution)"
+msgstr " (użyj „git rm <plik>...” aby zaznaczyć rozwiązanie)"
+
+#: wt-status.c:211 wt-status.c:1072
+msgid "Changes to be committed:"
+msgstr "Zmiany do złożenia:"
+
+#: wt-status.c:234 wt-status.c:1081
+msgid "Changes not staged for commit:"
+msgstr "Zmiany nie przygotowane do złożenia:"
+
+#: wt-status.c:238
+msgid " (use \"git add <file>...\" to update what will be committed)"
+msgstr " (użyj „git add <plik>...”, żeby zmienić, co zostanie złożone)"
+
+#: wt-status.c:240
+msgid " (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr " (użyj „git add/rm <plik>...”, żeby zmienić, co zostanie złożone)"
+
+#: wt-status.c:241
+msgid ""
+" (use \"git restore <file>...\" to discard changes in working directory)"
+msgstr ""
+" (użyj „git restore <plik>...”, aby odrzucić zmiany w katalogu roboczym)"
+
+#: wt-status.c:243
+msgid " (commit or discard the untracked or modified content in submodules)"
+msgstr " (złóż lub odrzuć nieśledzoną lub zmienioną zawartość pod-modułów)"
+
+#: wt-status.c:254
+#, c-format
+msgid " (use \"git %s <file>...\" to include in what will be committed)"
+msgstr " (użyj „git %s <plik>...”, żeby uwzględnić, co zostanie złożone)"
+
+#: wt-status.c:266
+msgid "both deleted:"
+msgstr "oba usunięte:"
+
+#: wt-status.c:268
+msgid "added by us:"
+msgstr "dodane przez nas:"
+
+#: wt-status.c:270
+msgid "deleted by them:"
+msgstr "usunięte przez nich:"
+
+#: wt-status.c:272
+msgid "added by them:"
+msgstr "dodane przez nich:"
+
+#: wt-status.c:274
+msgid "deleted by us:"
+msgstr "usunięte przez nas:"
+
+#: wt-status.c:276
+msgid "both added:"
+msgstr "oba dodane:"
+
+#: wt-status.c:278
+msgid "both modified:"
+msgstr "oba zmienione:"
+
+#: wt-status.c:288
+msgid "new file:"
+msgstr "nowy plik:"
+
+#: wt-status.c:290
+msgid "copied:"
+msgstr "skopiowano:"
+
+#: wt-status.c:292
+msgid "deleted:"
+msgstr "usunięto:"
+
+#: wt-status.c:294
+msgid "modified:"
+msgstr "zmieniono:"
+
+#: wt-status.c:296
+msgid "renamed:"
+msgstr "zmieniono nazwę:"
+
+#: wt-status.c:298
+msgid "typechange:"
+msgstr "zmiana typu:"
+
+#: wt-status.c:300
+msgid "unknown:"
+msgstr "nieznane:"
+
+#: wt-status.c:302
+msgid "unmerged:"
+msgstr "niescalone:"
+
+#: wt-status.c:382
+msgid "new commits, "
+msgstr "nowe zapisy, "
+
+#: wt-status.c:384
+msgid "modified content, "
+msgstr "zmieniona zawartość, "
+
+#: wt-status.c:386
+msgid "untracked content, "
+msgstr "nieśledzona zawartość, "
+
+#: wt-status.c:905
+#, c-format
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] "W schowku jest obecnie %d element"
+msgstr[1] "W schowku są obecnie %d elementy"
+msgstr[2] "W schowku jest obecnie %d elementów"
+
+#: wt-status.c:936
+msgid "Submodules changed but not updated:"
+msgstr "Pod-moduły zmienione, ale nie zaktualizowane:"
+
+#: wt-status.c:938
+msgid "Submodule changes to be committed:"
+msgstr "Zmiany w pod-modułach do złożenia:"
+
+#: wt-status.c:1020
+msgid ""
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
+msgstr ""
+"Nie zmieniaj ani nie usuwaj wiersza powyżej.\n"
+"Wszystko po nim będzie pominięte."
+
+#: wt-status.c:1112
+#, 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"
+"Obliczenie wartości gałęzi przed/w tyle zajęło %.2f sekund.\n"
+"Możesz użyć „--no-ahead-behind”, aby tego uniknąć.\n"
+
+#: wt-status.c:1142
+msgid "You have unmerged paths."
+msgstr "Masz niescalone ścieżki."
+
+#: wt-status.c:1145
+msgid " (fix conflicts and run \"git commit\")"
+msgstr " (napraw konflikty i wykonaj „git commit”)"
+
+#: wt-status.c:1147
+msgid " (use \"git merge --abort\" to abort the merge)"
+msgstr " (użyj „git merge --abort”, aby przerwać scalanie)"
+
+#: wt-status.c:1151
+msgid "All conflicts fixed but you are still merging."
+msgstr "Wszystkie konflikty naprawione, ale wciąż trwa scalanie."
+
+#: wt-status.c:1154
+msgid " (use \"git commit\" to conclude merge)"
+msgstr " (użyj „git commit”, żeby zwieńczyć scalanie)"
+
+#: wt-status.c:1163
+msgid "You are in the middle of an am session."
+msgstr "Jesteś w trakcie sesji am."
+
+#: wt-status.c:1166
+msgid "The current patch is empty."
+msgstr "Obecna ścieżka jest pusta."
+
+#: wt-status.c:1170
+msgid " (fix conflicts and then run \"git am --continue\")"
+msgstr " (napraw konflikty i wykonaj „git am --continue”)"
+
+#: wt-status.c:1172
+msgid " (use \"git am --skip\" to skip this patch)"
+msgstr " (użyj „git am --skip” aby pominąć tę łatkę)"
+
+#: wt-status.c:1174
+msgid " (use \"git am --abort\" to restore the original branch)"
+msgstr " (użyj „git am --abort”, aby przywrócić pierwotną gałąź)"
+
+#: wt-status.c:1307
+msgid "git-rebase-todo is missing."
+msgstr "brakuje git-rebase-todo."
+
+#: wt-status.c:1309
+msgid "No commands done."
+msgstr "Nie wykonano żadnych poleceń."
+
+#: wt-status.c:1312
+#, c-format
+msgid "Last command done (%d command done):"
+msgid_plural "Last commands done (%d commands done):"
+msgstr[0] "Ostatnie polecenie wykonane (wykonano %d polecenie):"
+msgstr[1] "Ostatnie polecenia wykonane (wykonano %d polecenia):"
+msgstr[2] "Ostatnie polecenia wykonane (wykonano %d poleceń):"
+
+#: wt-status.c:1323
+#, c-format
+msgid " (see more in file %s)"
+msgstr " (zobacz więcej w pliku %s)"
+
+#: wt-status.c:1328
+msgid "No commands remaining."
+msgstr "Brak pozostałych poleceń."
+
+#: 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] "Następne polecenie do wykonania (pozostało %d polecenie):"
+msgstr[1] "Następne polecenia do wykonania (pozostały %d polecenia):"
+msgstr[2] "Następne polecenia do wykonania (pozostało %d poleceń):"
+
+#: wt-status.c:1339
+msgid " (use \"git rebase --edit-todo\" to view and edit)"
+msgstr " (użyj „git rebase --edit-todo”, aby wyświetlić i edytować)"
+
+#: wt-status.c:1351
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "Przestawiasz właśnie gałąź „%s” na „%s”."
+
+#: wt-status.c:1356
+msgid "You are currently rebasing."
+msgstr "Jesteś w trakcie przestawiania."
+
+#: wt-status.c:1369
+msgid " (fix conflicts and then run \"git rebase --continue\")"
+msgstr " (napraw konflikty i wykonaj „git rebase --continue”)"
+
+#: wt-status.c:1371
+msgid " (use \"git rebase --skip\" to skip this patch)"
+msgstr " (użyj „git rebase --skip” aby pominąć tę łatkę)"
+
+#: wt-status.c:1373
+msgid " (use \"git rebase --abort\" to check out the original branch)"
+msgstr " (użyj „git rebase --abort”, aby wybrać pierwotną gałąź)"
+
+#: wt-status.c:1380
+msgid " (all conflicts fixed: run \"git rebase --continue\")"
+msgstr " (wszystkie konflikty naprawione: wykonaj „git rebase --continue”)"
+
+#: wt-status.c:1384
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr "Dzielisz właśnie zapis podczas przestawiania gałęzi „%s” na „%s”."
+
+#: wt-status.c:1389
+msgid "You are currently splitting a commit during a rebase."
+msgstr "Dzielisz właśnie zapis podczas przestawiania."
+
+#: wt-status.c:1392
+msgid " (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr ""
+" (Kiedy katalog roboczy będzie czysty, wykonaj „git rebase --continue”)"
+
+#: wt-status.c:1396
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgstr "Edytujesz właśnie zapis podczas przestawiania gałęzi „%s” na „%s”."
+
+#: wt-status.c:1401
+msgid "You are currently editing a commit during a rebase."
+msgstr "Edytujesz właśnie zapis podczas przestawiania."
+
+#: wt-status.c:1404
+msgid " (use \"git commit --amend\" to amend the current commit)"
+msgstr " (użyj „git commit --amend”, aby poprawić bieżący zapis)"
+
+#: wt-status.c:1406
+msgid ""
+" (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr " (użyj „git rebase --continue”, kiedy zadowolisz się swoimi zmianami)"
+
+#: wt-status.c:1417
+msgid "Cherry-pick currently in progress."
+msgstr "Trwa właśnie dobieranie."
+
+#: wt-status.c:1420
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "Dobierasz właśnie zapis %s."
+
+#: wt-status.c:1427
+msgid " (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr " (napraw konflikty i wykonaj „git cherry-pick --continue”)"
+
+#: wt-status.c:1430
+msgid " (run \"git cherry-pick --continue\" to continue)"
+msgstr " (wykonaj „git cherry-pick --continue”, aby kontynuować)"
+
+#: wt-status.c:1433
+msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr ""
+" (wszystkie konflikty naprawione: wykonaj „git cherry-pick --continue”)"
+
+#: wt-status.c:1435
+msgid " (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr " (użyj „git cherry-pick --skip”, aby pominąć tę łatkę)"
+
+#: wt-status.c:1437
+msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr " (użyj „git cherry-pick --abort”, aby przerwać dobieranie)"
+
+#: wt-status.c:1447
+msgid "Revert currently in progress."
+msgstr "Trwa właśnie odwracanie."
+
+#: wt-status.c:1450
+#, c-format
+msgid "You are currently reverting commit %s."
+msgstr "Odwracasz właśnie zapis %s."
+
+#: wt-status.c:1456
+msgid " (fix conflicts and run \"git revert --continue\")"
+msgstr " (napraw konflikty i wykonaj „git revert --continue”)"
+
+#: wt-status.c:1459
+msgid " (run \"git revert --continue\" to continue)"
+msgstr " (wykonaj „git revert --continue”, aby kontynuować)"
+
+#: wt-status.c:1462
+msgid " (all conflicts fixed: run \"git revert --continue\")"
+msgstr " (wszystkie konflikty naprawione: wykonaj „git revert --continue”)"
+
+#: wt-status.c:1464
+msgid " (use \"git revert --skip\" to skip this patch)"
+msgstr " (użyj „git revert --skip” aby pominąć tę łatkę)"
+
+#: wt-status.c:1466
+msgid " (use \"git revert --abort\" to cancel the revert operation)"
+msgstr " (użyj „git revert --abort”, aby przerwać odwracanie)"
+
+#: wt-status.c:1476
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "Jesteś w trakcie przeszukiwania, począwszy od gałęzi „%s”."
+
+#: wt-status.c:1480
+msgid "You are currently bisecting."
+msgstr "Jesteś w trakcie przeszukiwania."
+
+#: wt-status.c:1483
+msgid " (use \"git bisect reset\" to get back to the original branch)"
+msgstr " (użyj „git bisect reset”, aby powrócić na pierwotną gałąź)"
+
+#: wt-status.c:1494
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr "Jesteś w rzadkim wybraniu z obecnym %d%% śledzonych plików."
+
+#: wt-status.c:1733
+msgid "On branch "
+msgstr "Na gałęzi "
+
+#: wt-status.c:1740
+msgid "interactive rebase in progress; onto "
+msgstr "trwa interaktywne przestawianie na "
+
+#: wt-status.c:1742
+msgid "rebase in progress; onto "
+msgstr "trwa przestawianie na "
+
+#: wt-status.c:1747
+msgid "HEAD detached at "
+msgstr "HEAD odłączone na "
+
+#: wt-status.c:1749
+msgid "HEAD detached from "
+msgstr "HEAD odłączone od "
+
+#: wt-status.c:1752
+msgid "Not currently on any branch."
+msgstr "Nie jesteś na żadnej gałęzi."
+
+#: wt-status.c:1769
+msgid "Initial commit"
+msgstr "Pierwszy zapis"
+
+#: wt-status.c:1770
+msgid "No commits yet"
+msgstr "Jeszcze nie ma zapisów"
+
+#: wt-status.c:1784
+msgid "Untracked files"
+msgstr "Nieśledzone pliki"
+
+#: wt-status.c:1786
+msgid "Ignored files"
+msgstr "Ignorowane pliki"
+
+#: wt-status.c:1790
+#, 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 ""
+"Sprawdzenie nieśledzonych plików zajęło %.2f sekund. „status -uno”\n"
+"może to przyspieszyć, ale musisz wtedy pilnować dodawania\n"
+"nowych plików (zobacz „git help status”)."
+
+#: wt-status.c:1796
+#, c-format
+msgid "Untracked files not listed%s"
+msgstr "Nie wypisano nieśledzonych plików%s"
+
+#: wt-status.c:1798
+msgid " (use -u option to show untracked files)"
+msgstr " (użyj opcji -u, aby pokazać nieśledzone pliki)"
+
+#: wt-status.c:1804
+msgid "No changes"
+msgstr "Brak zmian"
+
+#: wt-status.c:1809
+#, c-format
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgstr "brak zmian dodanych do zapisu (użyj „git add” i/lub „git commit -a”)\n"
+
+#: wt-status.c:1813
+#, c-format
+msgid "no changes added to commit\n"
+msgstr "brak zmian dodanych do zapisu\n"
+
+#: wt-status.c:1817
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
+msgstr ""
+"nie dodano nic do złożenia, ale są nieśledzone pliki (użyj „git add”, aby "
+"śledzić)\n"
+
+#: wt-status.c:1821
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
+msgstr "nie dodano nic do złożenia, ale są nieśledzone pliki\n"
+
+#: wt-status.c:1825
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgstr "nic do złożenia (utwórz/wkopiuj pliki i użyj „git add”, aby śledzić)\n"
+
+#: wt-status.c:1829 wt-status.c:1835
+#, c-format
+msgid "nothing to commit\n"
+msgstr "nic do złożenia\n"
+
+#: wt-status.c:1832
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
+msgstr "nic do złożenia (użyj -u, aby pokazać nieśledzone pliki)\n"
+
+#: wt-status.c:1837
+#, c-format
+msgid "nothing to commit, working tree clean\n"
+msgstr "nic do złożenia, drzewo robocze czyste\n"
+
+#: wt-status.c:1942
+msgid "No commits yet on "
+msgstr "Jeszcze nie ma zapisów na "
+
+#: wt-status.c:1946
+msgid "HEAD (no branch)"
+msgstr "HEAD (brak gałęzi)"
+
+#: wt-status.c:1977
+msgid "different"
+msgstr "różne"
+
+#: wt-status.c:1979 wt-status.c:1987
+msgid "behind "
+msgstr "wstecz "
+
+#: wt-status.c:1982 wt-status.c:1985
+msgid "ahead "
+msgstr "do przodu "
+
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2507
+#, c-format
+msgid "cannot %s: You have unstaged changes."
+msgstr "nie można wykonać %s: masz nieprzygotowane zmiany."
+
+#: wt-status.c:2513
+msgid "additionally, your index contains uncommitted changes."
+msgstr "dodatkowo, twój indeks zawiera nieoddane zmiany."
+
+#: wt-status.c:2515
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr "nie można wykonać %s: Twój indeks zawiera niezłożone zmiany."
+
+#: compat/precompose_utf8.c:58 builtin/clone.c:457
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "nie można wykonać unlink na „%s”"
+
+#: builtin/add.c:26
+msgid "git add [<options>] [--] <pathspec>..."
+msgstr "git add [<opcje>] [--] <ścieżka>..."
+
+#: builtin/add.c:58
+#, c-format
+msgid "cannot chmod %cx '%s'"
+msgstr "nie można wykonać chmod %cx „%s”"
+
+#: builtin/add.c:96
+#, c-format
+msgid "unexpected diff status %c"
+msgstr "niespodziewany stan diff %c"
+
+#: builtin/add.c:101 builtin/commit.c:285
+msgid "updating files failed"
+msgstr "aktualizacja plików nie powiodła się"
+
+#: builtin/add.c:111
+#, c-format
+msgid "remove '%s'\n"
+msgstr "usuń „%s”\n"
+
+#: builtin/add.c:186
+msgid "Unstaged changes after refreshing the index:"
+msgstr "Wycofane zmiany po odświeżeniu indeksu:"
+
+#: builtin/add.c:280 builtin/rev-parse.c:991
+msgid "Could not read the index"
+msgstr "Nie można odczytać indeksu"
+
+#: builtin/add.c:291
+#, c-format
+msgid "Could not open '%s' for writing."
+msgstr "Nie można otworzyć „%s” do zapisywania."
+
+#: builtin/add.c:295
+msgid "Could not write patch"
+msgstr "Nie można zapisać łatki"
+
+#: builtin/add.c:298
+msgid "editing patch failed"
+msgstr "edycja łatki nie powiodła się"
+
+#: builtin/add.c:301
+#, c-format
+msgid "Could not stat '%s'"
+msgstr "Nie można wykonać stat na „%s”"
+
+#: builtin/add.c:303
+msgid "Empty patch. Aborted."
+msgstr "Pusta łatka. Przerwano."
+
+#: builtin/add.c:308
+#, c-format
+msgid "Could not apply '%s'"
+msgstr "Nie można zastosować „%s”"
+
+#: builtin/add.c:316
+msgid "The following paths are ignored by one of your .gitignore files:\n"
+msgstr "Poniższe ścieżki są ignorowane przez jeden z plików .gitignore:\n"
+
+#: builtin/add.c:336 builtin/clean.c:904 builtin/fetch.c:169 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559
+#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190
+msgid "dry run"
+msgstr "na sucho"
+
+#: builtin/add.c:339
+msgid "interactive picking"
+msgstr "interaktywne wybieranie"
+
+#: builtin/add.c:340 builtin/checkout.c:1546 builtin/reset.c:308
+msgid "select hunks interactively"
+msgstr "wybierz skrawki interaktywnie"
+
+#: builtin/add.c:341
+msgid "edit current diff and apply"
+msgstr "zmień bieżące różnice i zastosuj"
+
+#: builtin/add.c:342
+msgid "allow adding otherwise ignored files"
+msgstr "pozwól na dodawanie inaczej ignorowanych plików"
+
+#: builtin/add.c:343
+msgid "update tracked files"
+msgstr "aktualizuj śledzone pliki"
+
+#: builtin/add.c:344
+msgid "renormalize EOL of tracked files (implies -u)"
+msgstr "znormalizuj ponownie końce wierszy w śledzonych plikach (zakłada -u)"
+
+#: builtin/add.c:345
+msgid "record only the fact that the path will be added later"
+msgstr "zapisz tylko, że ścieżka zostanie dodana później"
+
+#: builtin/add.c:346
+msgid "add changes from all tracked and untracked files"
+msgstr "dodaj zmiany z plików śledzonych i nieśledzonych"
+
+#: builtin/add.c:349
+msgid "ignore paths removed in the working tree (same as --no-all)"
+msgstr "pomiń ścieżki usunięte w drzewie roboczym (to samo, co --no-all)"
+
+#: builtin/add.c:351
+msgid "don't add, only refresh the index"
+msgstr "nie dodawaj, tylko odśwież indeks"
+
+#: builtin/add.c:352
+msgid "just skip files which cannot be added because of errors"
+msgstr "po prostu pomiń pliki, których nie można dodać z powodu błędów"
+
+#: builtin/add.c:353
+msgid "check if - even missing - files are ignored in dry run"
+msgstr "sprawdź na sucho, czy pliki o takich ścieżkach byłyby ignorowane"
+
+#: builtin/add.c:355 builtin/update-index.c:1004
+msgid "override the executable bit of the listed files"
+msgstr "wymuś bit wykonywalności podanych plików"
+
+#: builtin/add.c:357
+msgid "warn when adding an embedded repository"
+msgstr "ostrzegaj przed dodawaniem wbudowanego repozytorium"
+
+#: builtin/add.c:359
+msgid "backend for `git stash -p`"
+msgstr "silnik do „git stash -p”"
+
+#: builtin/add.c:377
+#, 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 ""
+"Dodano inne repozytorium wewnątrz bieżącego repozytorium.\n"
+"Klony zewnętrznego repozytorium nie będą zawierać zawartości\n"
+"zawartego repozytorium i nie będą wiedziały, jak ją uzyskać.\n"
+"Jeśli chodziło o dodanie pod-modułu, użyj:\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"Jeśli dodano tę ścieżkę przez pomyłkę, można ją usunąć\n"
+"z indeksu przez:\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"Więcej informacji w „git help submodule”."
+
+#: builtin/add.c:405
+#, c-format
+msgid "adding embedded git repository: %s"
+msgstr "dodawanie wbudowanego repozytorium gita: %s"
+
+#: builtin/add.c:424
+msgid ""
+"Use -f if you really want to add them.\n"
+"Turn this message off by running\n"
+"\"git config advice.addIgnoredFile false\""
+msgstr ""
+"Użyj -f, jeśli rzeczywiście chcesz je dodać.\n"
+"Wyłącz ten komunikat wykonując\n"
+"„git config advice.addIgnoredFile false”"
+
+#: builtin/add.c:433
+msgid "adding files failed"
+msgstr "dodawanie plików nie powiodło się"
+
+#: builtin/add.c:461 builtin/commit.c:345
+msgid "--pathspec-from-file is incompatible with --interactive/--patch"
+msgstr "--pathspec-from-file i --interactive/--patch się wykluczają"
+
+#: builtin/add.c:478
+msgid "--pathspec-from-file is incompatible with --edit"
+msgstr "--pathspec-from-file i --edit się wykluczają"
+
+#: builtin/add.c:490
+msgid "-A and -u are mutually incompatible"
+msgstr "-A i -u się wykluczają"
+
+#: builtin/add.c:493
+msgid "Option --ignore-missing can only be used together with --dry-run"
+msgstr "Opcja --ignore-missing może być użyta tylko z --dry-run"
+
+#: builtin/add.c:497
+#, c-format
+msgid "--chmod param '%s' must be either -x or +x"
+msgstr "parametr --chmod „%s” musi być „-x” albo „+x”"
+
+#: builtin/add.c:515 builtin/checkout.c:1714 builtin/commit.c:351
+#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1569
+msgid "--pathspec-from-file is incompatible with pathspec arguments"
+msgstr "--pathspec-from-file i argumenty ze ścieżkami się wykluczają"
+
+#: builtin/add.c:522 builtin/checkout.c:1726 builtin/commit.c:357
+#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1575
+msgid "--pathspec-file-nul requires --pathspec-from-file"
+msgstr "--pathspec-file-nul wymaga --pathspec-from-file"
+
+#: builtin/add.c:526
+#, c-format
+msgid "Nothing specified, nothing added.\n"
+msgstr "Nic nie podano, nic nie dodano.\n"
+
+#: builtin/add.c:528
+msgid ""
+"Maybe you wanted to say 'git add .'?\n"
+"Turn this message off by running\n"
+"\"git config advice.addEmptyPathspec false\""
+msgstr ""
+"Może chodziło o „git add .”?\n"
+"Wyłącz ten komunikat wykonując\n"
+"„git config advice.addEmptyPathspec false”"
+
+#: builtin/am.c:352
+msgid "could not parse author script"
+msgstr "nie można przetworzyć skryptu autorstwa"
+
+#: builtin/am.c:436
+#, c-format
+msgid "'%s' was deleted by the applypatch-msg hook"
+msgstr "skrypt applypatch-msg usunął „%s”"
+
+#: builtin/am.c:478
+#, c-format
+msgid "Malformed input line: '%s'."
+msgstr "Uszkodzony wiersz wejścia: „%s”."
+
+#: builtin/am.c:516
+#, c-format
+msgid "Failed to copy notes from '%s' to '%s'"
+msgstr "Nie można skopiować uwag z „%s” do „%s”"
+
+#: builtin/am.c:542
+msgid "fseek failed"
+msgstr "fseek nie powiodło się"
+
+#: builtin/am.c:730
+#, c-format
+msgid "could not parse patch '%s'"
+msgstr "nie można przetworzyć łatki „%s”"
+
+#: builtin/am.c:795
+msgid "Only one StGIT patch series can be applied at once"
+msgstr "Tylko jedna seria łatek StGIT może być nałożona jednocześnie"
+
+#: builtin/am.c:843
+msgid "invalid timestamp"
+msgstr "nieprawidłowy znacznik czasu"
+
+#: builtin/am.c:848 builtin/am.c:860
+msgid "invalid Date line"
+msgstr "nieprawidłowy wiersz Date"
+
+#: builtin/am.c:855
+msgid "invalid timezone offset"
+msgstr "nieprawidłowe przesunięcie strefy czasowej"
+
+#: builtin/am.c:948
+msgid "Patch format detection failed."
+msgstr "Nie można wykryć formatu łatki."
+
+#: builtin/am.c:953 builtin/clone.c:410
+#, c-format
+msgid "failed to create directory '%s'"
+msgstr "nie można utworzyć katalogu „%s”"
+
+#: builtin/am.c:958
+msgid "Failed to split patches."
+msgstr "Nie można rozdzielić łatek."
+
+#: builtin/am.c:1089
+#, c-format
+msgid "When you have resolved this problem, run \"%s --continue\"."
+msgstr "Kiedy rozwiążesz problem, wykonaj „%s --continue”."
+
+#: builtin/am.c:1090
+#, c-format
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+msgstr "Jeśli wolisz pominąć tę łatkę, wykonaj zamiast tego „%s --skip”."
+
+#: builtin/am.c:1091
+#, c-format
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+msgstr ""
+"Aby przywrócić pierwotną gałąź i przerwać łatanie, uruchom „%s --abort”."
+
+#: builtin/am.c:1174
+msgid "Patch sent with format=flowed; space at the end of lines might be lost."
+msgstr ""
+"Wysłano łatkę z formatem=flowed; odstępy na końcach wierszy mogą zostać "
+"stracone."
+
+#: builtin/am.c:1202
+msgid "Patch is empty."
+msgstr "Łatka jest pusta."
+
+#: builtin/am.c:1267
+#, c-format
+msgid "missing author line in commit %s"
+msgstr "brakuje wiersza autorstwa w zapisie %s"
+
+#: builtin/am.c:1270
+#, c-format
+msgid "invalid ident line: %.*s"
+msgstr "błędny wiersz tożsamości: %.*s"
+
+#: builtin/am.c:1489
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+msgstr ""
+"W repozytorium brakuje blobów, potrzebnych żeby uciec się do trójstronnego "
+"scalania."
+
+#: builtin/am.c:1491
+msgid "Using index info to reconstruct a base tree..."
+msgstr "Używanie informacji z indeksu do odtworzenia drzewa podstawy..."
+
+#: builtin/am.c:1510
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
+msgstr ""
+"Czy łatka była zmieniana ręcznie?\n"
+"Nie stosuje się do plików zapisanych w swoim indeksie."
+
+#: builtin/am.c:1516
+msgid "Falling back to patching base and 3-way merge..."
+msgstr "Uciekanie się do podstawy łatania i trójstronnego scalania..."
+
+#: builtin/am.c:1542
+msgid "Failed to merge in the changes."
+msgstr "Nie można scalić zmian."
+
+#: builtin/am.c:1574
+msgid "applying to an empty history"
+msgstr "stosowanie na pustej historii"
+
+#: builtin/am.c:1626 builtin/am.c:1630
+#, c-format
+msgid "cannot resume: %s does not exist."
+msgstr "nie można wznowić: %s nie istnieje."
+
+#: builtin/am.c:1648
+msgid "Commit Body is:"
+msgstr "Zawartość zapisu to:"
+
+#. 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:1658
+#, c-format
+msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
+msgstr ""
+"Zastosować? tak [y]/[n]ie/[e]dycja/wyświetl łatkę [v]/za[a]kceptuj "
+"wszystkie: "
+
+#: builtin/am.c:1704 builtin/commit.c:395
+msgid "unable to write index file"
+msgstr "nie można zapisać pliku indeksu"
+
+#: builtin/am.c:1708
+#, c-format
+msgid "Dirty index: cannot apply patches (dirty: %s)"
+msgstr "Brudny indeks: nie można zastosować łatek (brudny: %s)"
+
+#: builtin/am.c:1748 builtin/am.c:1816
+#, c-format
+msgid "Applying: %.*s"
+msgstr "Stosowanie: %.*s"
+
+#: builtin/am.c:1765
+msgid "No changes -- Patch already applied."
+msgstr "Brak zmian -- łatka już zastosowana."
+
+#: builtin/am.c:1771
+#, c-format
+msgid "Patch failed at %s %.*s"
+msgstr "Łatanie nie powiodło się przy %s %.*s"
+
+#: builtin/am.c:1775
+msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
+msgstr "Użyj „git am --show-current-patch=diff”, aby zobaczyć zawodną łatkę"
+
+#: builtin/am.c:1819
+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 ""
+"Brak zmian - czy zapomniano użyć „git add”?\n"
+"Jeśli nic nie zostało do przygotowania, jest szansa, że coś innego\n"
+"już wprowadziło te same zmiany; możesz chcieć pominąć tę łatkę."
+
+#: builtin/am.c:1826
+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 ""
+"W indeksie nadal są niescalone ścieżki.\n"
+"Należy dodać każdy plik „git add” z rozwiązanymi konfliktami, aby je tak "
+"oznaczyć.\n"
+"Możesz chcieć wykonać „git rm” na pliku, aby zaakceptować na nim „usunięcie "
+"przez nich”."
+
+#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 builtin/reset.c:347
+#: builtin/reset.c:355
+#, c-format
+msgid "Could not parse object '%s'."
+msgstr "Nie można przetworzyć obiektu „%s”."
+
+#: builtin/am.c:1985
+msgid "failed to clean index"
+msgstr "nie można wyczyścić indeksu"
+
+#: builtin/am.c:2029
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
+msgstr ""
+"Wydaje się, że HEAD się przesunęło od ostatniego niepowodzenia „am”.\n"
+"Nie cofanie do ORIG_HEAD"
+
+#: builtin/am.c:2136
+#, c-format
+msgid "Invalid value for --patch-format: %s"
+msgstr "Nieprawidłowa wartość --patch-format: %s"
+
+#: builtin/am.c:2178
+#, c-format
+msgid "Invalid value for --show-current-patch: %s"
+msgstr "Nieprawidłowa wartość --show-current-patch: %s"
+
+#: builtin/am.c:2182
+#, c-format
+msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
+msgstr "--show-current-patch=%s i --show-current-patch=%s się wykluczają"
+
+#: builtin/am.c:2213
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+msgstr "git am [<opcje>] [(<mbox> | <Maildir>)...]"
+
+#: builtin/am.c:2214
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr "git am [<opcje>] (--continue | --skip | --abort)"
+
+#: builtin/am.c:2220
+msgid "run interactively"
+msgstr "uruchom interaktywnie"
+
+#: builtin/am.c:2222
+msgid "historical option -- no-op"
+msgstr "opcja historyczna — nic nie robi"
+
+#: builtin/am.c:2224
+msgid "allow fall back on 3way merging if needed"
+msgstr "zezwól na uciekanie się do trójstronnego scalania, jeśli potrzebne"
+
+#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16
+#: builtin/repack.c:334 builtin/stash.c:882
+msgid "be quiet"
+msgstr "mniej komunikatów"
+
+#: builtin/am.c:2227
+msgid "add a Signed-off-by trailer to the commit message"
+msgstr "dodaj końcówkę Signed-off-by do komunikatu zapisu"
+
+#: builtin/am.c:2230
+msgid "recode into utf8 (default)"
+msgstr "przekoduj na utf8 (domyślnie)"
+
+#: builtin/am.c:2232
+msgid "pass -k flag to git-mailinfo"
+msgstr "przekaż flagę -k do git-mailinfo"
+
+#: builtin/am.c:2234
+msgid "pass -b flag to git-mailinfo"
+msgstr "przekaż flagę -b do git-mailinfo"
+
+#: builtin/am.c:2236
+msgid "pass -m flag to git-mailinfo"
+msgstr "przekaż flagę -m do git-mailinfo"
+
+#: builtin/am.c:2238
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+msgstr "przekaż flagę --keep-cr do git-mailsplit przy formacie mbox"
+
+#: builtin/am.c:2241
+msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
+msgstr ""
+"nie przekazuj flagi --keep-cr do git-mailsplit, niezależnie od am.keepcr"
+
+#: builtin/am.c:2244
+msgid "strip everything before a scissors line"
+msgstr "odetnij wszystko przed wierszem nożyczek"
+
+#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
+#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
+#: builtin/am.c:2273
+msgid "pass it through git-apply"
+msgstr "przepuść przez git-apply"
+
+#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:904 builtin/merge.c:261
+#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
+#: builtin/rebase.c:1347 builtin/repack.c:345 builtin/repack.c:349
+#: builtin/repack.c:351 builtin/show-branch.c:650 builtin/show-ref.c:172
+#: builtin/tag.c:436 parse-options.h:154 parse-options.h:175
+#: parse-options.h:316
+msgid "n"
+msgstr "n"
+
+#: builtin/am.c:2269 builtin/branch.c:670 builtin/bugreport.c:136
+#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:470
+#: builtin/verify-tag.c:38
+msgid "format"
+msgstr "format"
+
+#: builtin/am.c:2270
+msgid "format the patch(es) are in"
+msgstr "format, w którym są łatki"
+
+#: builtin/am.c:2276
+msgid "override error message when patch failure occurs"
+msgstr "zastąp komunikat błędu, kiedy wystąpi błąd łatania"
+
+#: builtin/am.c:2278
+msgid "continue applying patches after resolving a conflict"
+msgstr "kontynuuj stosowanie łatek po rozwiązaniu konfliktu"
+
+#: builtin/am.c:2281
+msgid "synonyms for --continue"
+msgstr "zamienniki dla --continue"
+
+#: builtin/am.c:2284
+msgid "skip the current patch"
+msgstr "pomiń obecną ścieżkę"
+
+#: builtin/am.c:2287
+msgid "restore the original branch and abort the patching operation"
+msgstr "przywróć pierwotną gałąź i przerwij łatanie"
+
+#: builtin/am.c:2290
+msgid "abort the patching operation but keep HEAD where it is"
+msgstr "przerwij operację łatania, ale zostaw HEAD, gdzie jest"
+
+#: builtin/am.c:2294
+msgid "show the patch being applied"
+msgstr "pokaż właśnie stosowaną łatkę"
+
+#: builtin/am.c:2299
+msgid "lie about committer date"
+msgstr "zmyśl datę zapisu"
+
+#: builtin/am.c:2301
+msgid "use current timestamp for author date"
+msgstr "użyj bieżącego znacznika czasu jako daty utworzenia"
+
+#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515
+#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:538
+#: builtin/rebase.c:1400 builtin/revert.c:117 builtin/tag.c:451
+msgid "key-id"
+msgstr "id-klucza"
+
+#: builtin/am.c:2304 builtin/rebase.c:539 builtin/rebase.c:1401
+msgid "GPG-sign commits"
+msgstr "podpisuj zapisy GPG"
+
+#: builtin/am.c:2307
+msgid "(internal use for git-rebase)"
+msgstr "(użycie wewnętrzne w git-rebase)"
+
+#: builtin/am.c:2325
+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 ""
+"Opcja -b/--binary nic nie robi od dłuższego czasu i zostanie\n"
+"usunięta. Nie używaj jej już."
+
+#: builtin/am.c:2332
+msgid "failed to read the index"
+msgstr "nie można odczytać indeksu"
+
+#: builtin/am.c:2347
+#, c-format
+msgid "previous rebase directory %s still exists but mbox given."
+msgstr ""
+"poprzedni katalog przestawiania %s nadal istnieje, ale podano skrzynkę mbox."
+
+#: builtin/am.c:2371
+#, c-format
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
+msgstr ""
+"Znaleziono bezpański katalog %s.\n"
+"Użyj „git am --abort” aby go usunąć."
+
+#: builtin/am.c:2377
+msgid "Resolve operation not in progress, we are not resuming."
+msgstr "Nie trwa operacja rozwiązywania, nie wznawiamy."
+
+#: builtin/am.c:2387
+msgid "interactive mode requires patches on the command line"
+msgstr "tryb interaktywny wymaga łatek w wierszu poleceń"
+
+#: builtin/apply.c:8
+msgid "git apply [<options>] [<patch>...]"
+msgstr "git apply [<opcje>] [<łatka>...]"
+
+#: builtin/archive.c:17
+#, c-format
+msgid "could not create archive file '%s'"
+msgstr "nie można utworzyć pliku archiwum „%s”"
+
+#: builtin/archive.c:20
+msgid "could not redirect output"
+msgstr "nie można przekierować wyjścia"
+
+#: builtin/archive.c:37
+msgid "git archive: Remote with no URL"
+msgstr "git archive: Zdalne repozytorium bez adresu"
+
+#: builtin/archive.c:61
+msgid "git archive: expected ACK/NAK, got a flush packet"
+msgstr "git archive: oczekiwano ACK/NAK, otrzymano pakiet wypróżnienia"
+
+#: 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: błąd protokołu"
+
+#: builtin/archive.c:69
+msgid "git archive: expected a flush"
+msgstr "git archive: oczekiwano wypróżnienia"
+
+#: builtin/bisect--helper.c:23
+msgid "git bisect--helper --bisect-reset [<commit>]"
+msgstr "git bisect--helper --bisect-reset [<zapis>]"
+
+#: builtin/bisect--helper.c:24
+msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+msgstr ""
+"git bisect--helper --bisect-next-check <dobre_określenie> <złe_określenie> "
+"[<określenie>]"
+
+#: builtin/bisect--helper.c:25
+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:26
+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}=<określenie> --term-{old,"
+"good}=<określenie>] [--no-checkout] [--first-parent] [<złe> [<dobre>...]] "
+"[--] [<ścieżki>...]"
+
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next"
+msgstr "git bisect--helper --bisect-next"
+
+#: builtin/bisect--helper.c:29
+msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
+msgstr "git bisect--helper --bisect-state (bad|new) [<rewizja>]"
+
+#: builtin/bisect--helper.c:30
+msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
+msgstr "git bisect--helper --bisect-state (good|old) [<rewizja>...]"
+
+#: builtin/bisect--helper.c:31
+msgid "git bisect--helper --bisect-replay <filename>"
+msgstr "git bisect--helper --bisect-replay <nazwa-pliku>"
+
+#: builtin/bisect--helper.c:32
+msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
+msgstr "git bisect--helper --bisect-skip [(<rewizja>|<zakres>)...]"
+
+#: builtin/bisect--helper.c:107
+#, c-format
+msgid "cannot open file '%s' in mode '%s'"
+msgstr "nie można otworzyć pliku „%s” w trybie „%s”"
+
+#: builtin/bisect--helper.c:114
+#, c-format
+msgid "could not write to file '%s'"
+msgstr "nie można pisać do pliku „%s”"
+
+#: builtin/bisect--helper.c:153
+#, c-format
+msgid "'%s' is not a valid term"
+msgstr "„%s” nie jest prawidłowym sformułowaniem"
+
+#: builtin/bisect--helper.c:157
+#, c-format
+msgid "can't use the builtin command '%s' as a term"
+msgstr "nie można użyć wbudowanego polecenia „%s” jako sformułowania"
+
+#: builtin/bisect--helper.c:167
+#, c-format
+msgid "can't change the meaning of the term '%s'"
+msgstr "nie można zmienić znaczenia sformułowania „%s”"
+
+#: builtin/bisect--helper.c:177
+msgid "please use two different terms"
+msgstr "użyj dwóch różnych sformułowań"
+
+#: builtin/bisect--helper.c:193
+#, c-format
+msgid "We are not bisecting.\n"
+msgstr "Teraz nie przeszukujemy.\n"
+
+#: builtin/bisect--helper.c:201
+#, c-format
+msgid "'%s' is not a valid commit"
+msgstr "„%s” nie jest prawidłowym zapisem"
+
+#: builtin/bisect--helper.c:210
+#, c-format
+msgid ""
+"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
+msgstr ""
+"nie można wybrać pierwotnego HEAD „%s”. Spróbuj „git bisect reset <zapis>”."
+
+#: builtin/bisect--helper.c:254
+#, c-format
+msgid "Bad bisect_write argument: %s"
+msgstr "Błędny argument bisect_write: %s"
+
+#: builtin/bisect--helper.c:259
+#, c-format
+msgid "couldn't get the oid of the rev '%s'"
+msgstr "nie można uzyskać oid rewizji „%s”"
+
+#: builtin/bisect--helper.c:271
+#, c-format
+msgid "couldn't open the file '%s'"
+msgstr "nie można otworzyć pliku „%s”"
+
+#: builtin/bisect--helper.c:297
+#, c-format
+msgid "Invalid command: you're currently in a %s/%s bisect"
+msgstr "Nieprawidłowe polecenie: przeszukujesz teraz %s/%s"
+
+#: builtin/bisect--helper.c:324
+#, 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 ""
+"Wtedy podaj przynajmniej jedną rewizję %s i jedną %s.\n"
+"Możesz użyć do tego „git bisect %s” i „git bisect %s”."
+
+#: builtin/bisect--helper.c:328
+#, 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 ""
+"Należy zacząć przez „git bisect start”.\n"
+"Wtedy podaj przynajmniej jedną rewizję %s i jedną %s.\n"
+"Możesz użyć do tego „git bisect %s” i „git bisect %s”."
+
+#: builtin/bisect--helper.c:348
+#, c-format
+msgid "bisecting only with a %s commit"
+msgstr "przeszukiwanie tylko z zapisem %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:356
+msgid "Are you sure [Y/n]? "
+msgstr "Czy na pewno [Y/n]? "
+
+#: builtin/bisect--helper.c:417
+msgid "no terms defined"
+msgstr "nie zdefiniowano sformułowań"
+
+#: builtin/bisect--helper.c:420
+#, c-format
+msgid ""
+"Your current terms are %s for the old state\n"
+"and %s for the new state.\n"
+msgstr ""
+"Bieżące sformułowania to %s na stary stan\n"
+"i %s na nowy stan.\n"
+
+#: builtin/bisect--helper.c:430
+#, c-format
+msgid ""
+"invalid argument %s for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+msgstr ""
+"nieprawidłowy argument %s do „git bisect terms”.\n"
+"Wspierane opcje to: --term-good | --term-old i --term-bad | --term-new."
+
+#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1014
+msgid "revision walk setup failed\n"
+msgstr "nie udało się przygotować przejścia rewizji\n"
+
+#: builtin/bisect--helper.c:519
+#, c-format
+msgid "could not open '%s' for appending"
+msgstr "nie można otworzyć „%s” do dopisywania"
+
+#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651
+msgid "'' is not a valid term"
+msgstr "„” nie jest prawidłowym sformułowaniem"
+
+#: builtin/bisect--helper.c:661
+#, c-format
+msgid "unrecognized option: '%s'"
+msgstr "nierozpoznana opcja: „%s”"
+
+#: builtin/bisect--helper.c:665
+#, c-format
+msgid "'%s' does not appear to be a valid revision"
+msgstr "„%s” nie wydaje się być prawidłową rewizją"
+
+#: builtin/bisect--helper.c:696
+msgid "bad HEAD - I need a HEAD"
+msgstr "złe HEAD — potrzeba HEAD"
+
+#: builtin/bisect--helper.c:711
+#, c-format
+msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
+msgstr ""
+"wybieranie „%s” nie powiodło się. Spróbuj „git bisect start <prawidłowa-"
+"gałąź>”."
+
+#: builtin/bisect--helper.c:732
+msgid "won't bisect on cg-seek'ed tree"
+msgstr "nie przeszukam na drzewie cg-seek'owanym"
+
+#: builtin/bisect--helper.c:735
+msgid "bad HEAD - strange symbolic ref"
+msgstr "złe HEAD — dziwna referencja symboliczna"
+
+#: builtin/bisect--helper.c:755
+#, c-format
+msgid "invalid ref: '%s'"
+msgstr "nieprawidłowa referencja: „%s”"
+
+#: builtin/bisect--helper.c:813
+msgid "You need to start by \"git bisect start\"\n"
+msgstr "Musisz rozpocząć przez „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:824
+msgid "Do you want me to do it for you [Y/n]? "
+msgstr "Chcesz, żeby to teraz zrobić [Y/n]? "
+
+#: builtin/bisect--helper.c:842
+msgid "Please call `--bisect-state` with at least one argument"
+msgstr "Wywołaj „--bisect-state” z przynajmniej jednym argumentem"
+
+#: builtin/bisect--helper.c:855
+#, c-format
+msgid "'git bisect %s' can take only one argument."
+msgstr "„git bisect %s” przyjmuje tylko jeden argument."
+
+#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:878
+#, c-format
+msgid "Bad rev input: %s"
+msgstr "Błędne wejście rev: %s"
+
+#: builtin/bisect--helper.c:912
+msgid "We are not bisecting."
+msgstr "Teraz nie przeszukujemy."
+
+#: builtin/bisect--helper.c:962
+#, c-format
+msgid "'%s'?? what are you talking about?"
+msgstr "„%s”?? o czym ty w ogóle mówisz?"
+
+#: builtin/bisect--helper.c:974
+#, c-format
+msgid "cannot read file '%s' for replaying"
+msgstr "nie można odczytać „%s” do odtwarzania"
+
+#: builtin/bisect--helper.c:1047
+msgid "reset the bisection state"
+msgstr "zresetuj stan przeszukiwania"
+
+#: builtin/bisect--helper.c:1049
+msgid "check whether bad or good terms exist"
+msgstr "sprawdź, czy istnieją złe lub dobre określenia"
+
+#: builtin/bisect--helper.c:1051
+msgid "print out the bisect terms"
+msgstr "wypisz tylko określenia przeszukiwania"
+
+#: builtin/bisect--helper.c:1053
+msgid "start the bisect session"
+msgstr "rozpocznij sesję przeszukiwania"
+
+#: builtin/bisect--helper.c:1055
+msgid "find the next bisection commit"
+msgstr "znajdź kolejny zapis do przeszukiwania"
+
+#: builtin/bisect--helper.c:1057
+msgid "mark the state of ref (or refs)"
+msgstr "oznacz stan referencji"
+
+#: builtin/bisect--helper.c:1059
+msgid "list the bisection steps so far"
+msgstr "wypisz dotychczasowe kroki przeszukiwania"
+
+#: builtin/bisect--helper.c:1061
+msgid "replay the bisection process from the given file"
+msgstr "odtwórz proces przeszukiwania z podanego pliku"
+
+#: builtin/bisect--helper.c:1063
+msgid "skip some commits for checkout"
+msgstr "pomiń niektóre zapisy do wybrania"
+
+#: builtin/bisect--helper.c:1065
+msgid "no log for BISECT_WRITE"
+msgstr "brak dziennika do BISECT_WRITE"
+
+#: builtin/bisect--helper.c:1080
+msgid "--bisect-reset requires either no argument or a commit"
+msgstr "--bisect-reset wymaga jako argumentu albo niczego albo zapisu"
+
+#: builtin/bisect--helper.c:1085
+msgid "--bisect-next-check requires 2 or 3 arguments"
+msgstr "--bisect-next-check wymaga 2 albo 3 argumentów"
+
+#: builtin/bisect--helper.c:1091
+msgid "--bisect-terms requires 0 or 1 argument"
+msgstr "--bisect-terms wymaga maksymalnie jednego argumentu"
+
+#: builtin/bisect--helper.c:1100
+msgid "--bisect-next requires 0 arguments"
+msgstr "--bisect-next wymaga braku argumentów"
+
+#: builtin/bisect--helper.c:1111
+msgid "--bisect-log requires 0 arguments"
+msgstr "--bisect-log wymaga braku argumentów"
+
+#: builtin/bisect--helper.c:1116
+msgid "no logfile given"
+msgstr "nie podano pliku dziennika"
+
+#: builtin/blame.c:32
+msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
+msgstr "git blame [<opcje>] [<opcje-rewizji>] [<rewizja>] [--] <plik>"
+
+#: builtin/blame.c:37
+msgid "<rev-opts> are documented in git-rev-list(1)"
+msgstr "<opcje-rewizji> są opisane w git-rev-list(1)"
+
+#: builtin/blame.c:410
+#, c-format
+msgid "expecting a color: %s"
+msgstr "oczekiwano koloru: %s"
+
+#: builtin/blame.c:417
+msgid "must end with a color"
+msgstr "musi się kończyć kolorem"
+
+#: builtin/blame.c:728
+#, c-format
+msgid "invalid color '%s' in color.blame.repeatedLines"
+msgstr "błędny kolor „%s” w color.blame.repeatedLines"
+
+#: builtin/blame.c:746
+msgid "invalid value for blame.coloring"
+msgstr "nieprawidłowa wartość blame.coloring"
+
+#: builtin/blame.c:845
+#, c-format
+msgid "cannot find revision %s to ignore"
+msgstr "nie znaleziono rewizji %s do pominięcia"
+
+#: builtin/blame.c:867
+msgid "show blame entries as we find them, incrementally"
+msgstr "pokaż elementy oskarżenia w miarę znajdywania, przyrostowo"
+
+#: builtin/blame.c:868
+msgid "do not show object names of boundary commits (Default: off)"
+msgstr "nie pokazuj nazw obiektów w brzegowych zapisach (domyślnie wyłączone)"
+
+#: builtin/blame.c:869
+msgid "do not treat root commits as boundaries (Default: off)"
+msgstr "nie traktuj zapisów-korzeni jako granic (domyślnie wyłączone)"
+
+#: builtin/blame.c:870
+msgid "show work cost statistics"
+msgstr "pokaż statystyki kosztu pracy"
+
+#: builtin/blame.c:871 builtin/checkout.c:1503 builtin/clone.c:92
+#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:175
+#: builtin/merge.c:297 builtin/multi-pack-index.c:27 builtin/pull.c:119
+#: builtin/push.c:575 builtin/send-pack.c:198
+msgid "force progress reporting"
+msgstr "wymuś zgłaszanie postępu"
+
+#: builtin/blame.c:872
+msgid "show output score for blame entries"
+msgstr "pokaż wynik wyjściowy elementów oskarżenia"
+
+#: builtin/blame.c:873
+msgid "show original filename (Default: auto)"
+msgstr "pokazuj pierwotną nazwę pliku (Domyślnie: automatycznie)"
+
+#: builtin/blame.c:874
+msgid "show original linenumber (Default: off)"
+msgstr "pokaż pierwotny numer wiersza (domyślnie wyłączone)"
+
+#: builtin/blame.c:875
+msgid "show in a format designed for machine consumption"
+msgstr "pokaż w formacie zaprojektowanym do przetwarzania maszynowego"
+
+#: builtin/blame.c:876
+msgid "show porcelain format with per-line commit information"
+msgstr "pokaż w porcelanowym formacie z informacją o zapisie w każdym wierszu"
+
+#: builtin/blame.c:877
+msgid "use the same output mode as git-annotate (Default: off)"
+msgstr "użyj tego samego trybu wyjścia, co git-annotate (domyślnie wyłączone)"
+
+#: builtin/blame.c:878
+msgid "show raw timestamp (Default: off)"
+msgstr "pokaż surowy znacznik czasu (domyślnie wyłączone)"
+
+#: builtin/blame.c:879
+msgid "show long commit SHA1 (Default: off)"
+msgstr "pokaż długie SHA-1 zapisu (domyślnie wyłączone)"
+
+#: builtin/blame.c:880
+msgid "suppress author name and timestamp (Default: off)"
+msgstr "nie wypisuj nazwiska autora i znacznika czasu (domyślnie wyłączone)"
+
+#: builtin/blame.c:881
+msgid "show author email instead of name (Default: off)"
+msgstr "pokaż adres e-mail autora zamiast nazwiska (domyślnie wyłączone)"
+
+#: builtin/blame.c:882
+msgid "ignore whitespace differences"
+msgstr "ignoruj różnice w białych znakach"
+
+#: builtin/blame.c:883 builtin/log.c:1812
+msgid "rev"
+msgstr "rewizja"
+
+#: builtin/blame.c:883
+msgid "ignore <rev> when blaming"
+msgstr "pomiń <rewizję> przy obwinianiu"
+
+#: builtin/blame.c:884
+msgid "ignore revisions from <file>"
+msgstr "pomiń rewizje z <pliku>"
+
+#: builtin/blame.c:885
+msgid "color redundant metadata from previous line differently"
+msgstr "koloruj inaczej zbędne metadane z poprzedniego wiersza"
+
+#: builtin/blame.c:886
+msgid "color lines by age"
+msgstr "koloruj wiersze według wieku"
+
+#: builtin/blame.c:887
+msgid "spend extra cycles to find better match"
+msgstr "poświęć dodatkowe cykle, aby znaleźć lepsze dopasowanie"
+
+#: builtin/blame.c:888
+msgid "use revisions from <file> instead of calling git-rev-list"
+msgstr "użyj rewizji z <pliku> zamiast wołać git-rev-list"
+
+#: builtin/blame.c:889
+msgid "use <file>'s contents as the final image"
+msgstr "użyj zawartości <pliku> jako ostatecznego obrazu"
+
+#: builtin/blame.c:890 builtin/blame.c:891
+msgid "score"
+msgstr "wynik"
+
+#: builtin/blame.c:890
+msgid "find line copies within and across files"
+msgstr "znajdź kopie wierszy w plikach i pomiędzy nimi"
+
+#: builtin/blame.c:891
+msgid "find line movements within and across files"
+msgstr "znajdź ruchy wierszy w plikach i pomiędzy nimi"
+
+#: builtin/blame.c:892
+msgid "range"
+msgstr "zakres"
+
+#: builtin/blame.c:893
+msgid "process only line range <start>,<end> or function :<funcname>"
+msgstr "przetwórz tylko zakres <start>,<end> lub funkcję :<nazwa-funkcji>"
+
+#: builtin/blame.c:945
+msgid "--progress can't be used with --incremental or porcelain formats"
+msgstr "nie można użyć --progress z --incremental ani formatami porcelanowymi"
+
+#. 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:996
+msgid "4 years, 11 months ago"
+msgstr "4 lata, 11 miesięcy temu"
+
+#: builtin/blame.c:1112
+#, c-format
+msgid "file %s has only %lu line"
+msgid_plural "file %s has only %lu lines"
+msgstr[0] "plik %s ma tylko %lu wiersz"
+msgstr[1] "plik %s ma tylko %lu wiersze"
+msgstr[2] "plik %s ma tylko %lu wierszy"
+
+#: builtin/blame.c:1157
+msgid "Blaming lines"
+msgstr "Obwinianie wierszy"
+
+#: builtin/branch.c:29
+msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
+msgstr "git branch [<opcje>] [-r | -a] [--merged] [--no-merged]"
+
+#: builtin/branch.c:30
+msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
+msgstr "git branch [<opcje>] [-l] [-f] <nazwa-gałęzi> [<początek>]"
+
+#: builtin/branch.c:31
+msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
+msgstr "git branch [<opcje>] [-r] (-d | -D) <nazwa-gałęzi>..."
+
+#: builtin/branch.c:32
+msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
+msgstr "git branch [<opcje>] (-m | -M) [<stara-gałąż>] <nowa-gałąź>"
+
+#: builtin/branch.c:33
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr "git branch [<opcje>] (-c | -C) [<stara-gałąż>] <nowa-gałąź>"
+
+#: builtin/branch.c:34
+msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgstr "git branch [<opcje>] [-r | -a] [--points-at]"
+
+#: builtin/branch.c:35
+msgid "git branch [<options>] [-r | -a] [--format]"
+msgstr "git branch [<opcje>] [-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 ""
+"usuwanie gałęzi „%s” scalonej z\n"
+" „%s”, ale jeszcze nie scalonej z HEAD."
+
+#: 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 ""
+"nie usuwam gałęzi „%s”, która nie jest jeszcze scalona z\n"
+" „%s”, mimo że jest scalona z HEAD."
+
+#: builtin/branch.c:172
+#, c-format
+msgid "Couldn't look up commit object for '%s'"
+msgstr "Nie odnaleziono obiektu zapisu „%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 ""
+"Gałąź „%s” nie jest w pełni scalona.\n"
+"Jeżeli na pewno chcesz ją usunąć, użyj „git branch -D %s”."
+
+#: builtin/branch.c:189
+msgid "Update of config-file failed"
+msgstr "Aktualizacja pliku konfiguracyjnego nie powiodła się"
+
+#: builtin/branch.c:223
+msgid "cannot use -a with -d"
+msgstr "-a i -d się wykluczają"
+
+#: builtin/branch.c:230
+msgid "Couldn't look up commit object for HEAD"
+msgstr "Nie odnaleziono obiektu zapisu HEAD"
+
+#: builtin/branch.c:244
+#, c-format
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr "Nie można usunąć gałęzi „%s” wybranej w „%s”"
+
+#: builtin/branch.c:259
+#, c-format
+msgid "remote-tracking branch '%s' not found."
+msgstr "Nie znaleziono gałęzi śledzącej „%s”"
+
+#: builtin/branch.c:260
+#, c-format
+msgid "branch '%s' not found."
+msgstr "nie znaleziono gałęzi „%s”."
+
+#: builtin/branch.c:291
+#, c-format
+msgid "Deleted remote-tracking branch %s (was %s).\n"
+msgstr "Usunięto gałąź śledzącą %s (wskazywała %s).\n"
+
+#: builtin/branch.c:292
+#, c-format
+msgid "Deleted branch %s (was %s).\n"
+msgstr "Usunięto gałąź %s (wskazywała %s).\n"
+
+#: builtin/branch.c:438 builtin/tag.c:61
+msgid "unable to parse format string"
+msgstr "nie można przetworzyć łańcucha formatu"
+
+#: builtin/branch.c:469
+msgid "could not resolve HEAD"
+msgstr "nie można rozwiązać HEAD"
+
+#: builtin/branch.c:475
+#, c-format
+msgid "HEAD (%s) points outside of refs/heads/"
+msgstr "HEAD (%s) wskazuje poza refs/heads/"
+
+#: builtin/branch.c:490
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr "Gałąź %s jest przestawiana na %s"
+
+#: builtin/branch.c:494
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr "Gałąź %s jest przeszukiwana w %s"
+
+#: builtin/branch.c:511
+msgid "cannot copy the current branch while not on any."
+msgstr "nie można skopiować bieżącej gałęzi, gdy nie ma żadnej bieżącej."
+
+#: builtin/branch.c:513
+msgid "cannot rename the current branch while not on any."
+msgstr "nie można zmienić nazwy bieżącej gałęzi, gdy nie ma żadnej bieżącej."
+
+#: builtin/branch.c:524
+#, c-format
+msgid "Invalid branch name: '%s'"
+msgstr "Nieprawidłowa nazwa gałęzi: „%s”"
+
+#: builtin/branch.c:553
+msgid "Branch rename failed"
+msgstr "Zmiana nazwy gałęzi nie powiodła się"
+
+#: builtin/branch.c:555
+msgid "Branch copy failed"
+msgstr "Kopiowanie gałęzi nie powiodło się"
+
+#: builtin/branch.c:559
+#, c-format
+msgid "Created a copy of a misnamed branch '%s'"
+msgstr "Skopiowano źle nazwaną gałąź „%s”"
+
+#: builtin/branch.c:562
+#, c-format
+msgid "Renamed a misnamed branch '%s' away"
+msgstr "Poprawiono nazwę gałęzi „%s”"
+
+#: builtin/branch.c:568
+#, c-format
+msgid "Branch renamed to %s, but HEAD is not updated!"
+msgstr "Nazwa gałęzi zmieniona na %s, ale czoło HEAD nie jest zaktualizowane!"
+
+#: builtin/branch.c:577
+msgid "Branch is renamed, but update of config-file failed"
+msgstr ""
+"Zmieniono nazwę gałęzi, ale aktualizacja pliku konfiguracyjnego nie powiodła "
+"się"
+
+#: builtin/branch.c:579
+msgid "Branch is copied, but update of config-file failed"
+msgstr ""
+"Skopiowano gałąź, ale aktualizacja pliku konfiguracyjnego nie powiodła się"
+
+#: builtin/branch.c:595
+#, c-format
+msgid ""
+"Please edit the description for the branch\n"
+" %s\n"
+"Lines starting with '%c' will be stripped.\n"
+msgstr ""
+"Edytuj opis gałęzi\n"
+" %s\n"
+"Wiersze zaczynające się od „%c” zostaną wycięte.\n"
+
+#: builtin/branch.c:629
+msgid "Generic options"
+msgstr "Opcje ogólne"
+
+#: builtin/branch.c:631
+msgid "show hash and subject, give twice for upstream branch"
+msgstr "pokaż skrót i temat; podaj dwukrotnie, aby wypisać gałąź nadrzędną"
+
+#: builtin/branch.c:632
+msgid "suppress informational messages"
+msgstr "pomiń komunikaty informacyjne"
+
+#: builtin/branch.c:633
+msgid "set up tracking mode (see git-pull(1))"
+msgstr "ustaw tryb śledzenia (zobacz git-pull(1))"
+
+#: builtin/branch.c:635
+msgid "do not use"
+msgstr "nie używaj"
+
+#: builtin/branch.c:637 builtin/rebase.c:534
+msgid "upstream"
+msgstr "zdalne-repozytorium"
+
+#: builtin/branch.c:637
+msgid "change the upstream info"
+msgstr "zmień gałąź nadrzędną"
+
+#: builtin/branch.c:638
+msgid "unset the upstream info"
+msgstr "usuń informacje o gałęzi nadrzędnej"
+
+#: builtin/branch.c:639
+msgid "use colored output"
+msgstr "użyj kolorowego wyjścia"
+
+#: builtin/branch.c:640
+msgid "act on remote-tracking branches"
+msgstr "działaj na gałęziach śledzących"
+
+#: builtin/branch.c:642 builtin/branch.c:644
+msgid "print only branches that contain the commit"
+msgstr "wypisz tylko gałęzie zawierające ten zapis"
+
+#: builtin/branch.c:643 builtin/branch.c:645
+msgid "print only branches that don't contain the commit"
+msgstr "wypisz tylko gałęzie nie zawierające tego zapisu"
+
+#: builtin/branch.c:648
+msgid "Specific git-branch actions:"
+msgstr "Działania typowe dla git-branch:"
+
+#: builtin/branch.c:649
+msgid "list both remote-tracking and local branches"
+msgstr "wypisz i śledzące i lokalne gałęzie"
+
+#: builtin/branch.c:651
+msgid "delete fully merged branch"
+msgstr "usuń całkowicie scaloną gałąź"
+
+#: builtin/branch.c:652
+msgid "delete branch (even if not merged)"
+msgstr "usuń gałąź (nawet niescaloną)"
+
+#: builtin/branch.c:653
+msgid "move/rename a branch and its reflog"
+msgstr "przenieś gałąź i jej dziennik referencji / zmień ich nazwę"
+
+#: builtin/branch.c:654
+msgid "move/rename a branch, even if target exists"
+msgstr "przenieś gałąź / zmień jej nazwę, nawet jeśli cel istnieje"
+
+#: builtin/branch.c:655
+msgid "copy a branch and its reflog"
+msgstr "skopiuj gałąź i jej dziennik referencji"
+
+#: builtin/branch.c:656
+msgid "copy a branch, even if target exists"
+msgstr "skopiuj gałąź, nawet jeśli cel istnieje"
+
+#: builtin/branch.c:657
+msgid "list branch names"
+msgstr "wypisz nazwy gałęzi"
+
+#: builtin/branch.c:658
+msgid "show current branch name"
+msgstr "pokaż nazwę bieżącej gałęzi"
+
+#: builtin/branch.c:659
+msgid "create the branch's reflog"
+msgstr "utwórz dziennik referencji gałęzi"
+
+#: builtin/branch.c:661
+msgid "edit the description for the branch"
+msgstr "edytuj opis gałęzi"
+
+#: builtin/branch.c:662
+msgid "force creation, move/rename, deletion"
+msgstr "wymuś utworzenie, przeniesienie/zmianę nazwy, usunięcie"
+
+#: builtin/branch.c:663
+msgid "print only branches that are merged"
+msgstr "wypisz tylko scalone gałęzie"
+
+#: builtin/branch.c:664
+msgid "print only branches that are not merged"
+msgstr "wypisz tylko niescalone gałęzie"
+
+#: builtin/branch.c:665
+msgid "list branches in columns"
+msgstr "wypisz gałęzie w kolumnach"
+
+#: builtin/branch.c:667 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:466
+msgid "object"
+msgstr "obiekt"
+
+#: builtin/branch.c:668
+msgid "print only branches of the object"
+msgstr "wypisz tylko gałęzie obiektu"
+
+#: builtin/branch.c:669 builtin/for-each-ref.c:48 builtin/tag.c:473
+msgid "sorting and filtering are case insensitive"
+msgstr "sortowanie i filtrowanie nie uwzględniają wielkości liter"
+
+#: builtin/branch.c:670 builtin/for-each-ref.c:38 builtin/tag.c:471
+#: builtin/verify-tag.c:38
+msgid "format to use for the output"
+msgstr "format do użycia na wyjściu"
+
+#: builtin/branch.c:693 builtin/clone.c:790
+msgid "HEAD not found below refs/heads!"
+msgstr "nie znaleziono HEAD w refs/heads!"
+
+#: builtin/branch.c:717
+msgid "--column and --verbose are incompatible"
+msgstr "--column i --verbose się wykluczają"
+
+#: builtin/branch.c:732 builtin/branch.c:788 builtin/branch.c:797
+msgid "branch name required"
+msgstr "wymagana nazwa gałęzi"
+
+#: builtin/branch.c:764
+msgid "Cannot give description to detached HEAD"
+msgstr "Nie można nadać opisu odłączonemu HEAD"
+
+#: builtin/branch.c:769
+msgid "cannot edit description of more than one branch"
+msgstr "nie można edytować opisu więcej niż jednej gałęzi"
+
+#: builtin/branch.c:776
+#, c-format
+msgid "No commit on branch '%s' yet."
+msgstr "Jeszcze nie ma zapisów na gałęzi „%s”."
+
+#: builtin/branch.c:779
+#, c-format
+msgid "No branch named '%s'."
+msgstr "Nie ma gałęzi „%s”."
+
+#: builtin/branch.c:794
+msgid "too many branches for a copy operation"
+msgstr "za dużo gałęzi do operacji kopiowania"
+
+#: builtin/branch.c:803
+msgid "too many arguments for a rename operation"
+msgstr "za dużo argumentów do operacji zmiany nazwy"
+
+#: builtin/branch.c:808
+msgid "too many arguments to set new upstream"
+msgstr "za dużo argumentów do ustawienia nadrzędnej gałęzi"
+
+#: builtin/branch.c:812
+#, c-format
+msgid ""
+"could not set upstream of HEAD to %s when it does not point to any branch."
+msgstr ""
+"nie można ustawić gałęzi nadrzędnej HEAD na %s, kiedy nie wskazuje ono na "
+"gałąź."
+
+#: builtin/branch.c:815 builtin/branch.c:838
+#, c-format
+msgid "no such branch '%s'"
+msgstr "nie ma takiej gałęzi „%s”"
+
+#: builtin/branch.c:819
+#, c-format
+msgid "branch '%s' does not exist"
+msgstr "gałąź „%s” nie istnieje"
+
+#: builtin/branch.c:832
+msgid "too many arguments to unset upstream"
+msgstr "za dużo argumentów do usunięcia nadrzędnej gałęzi"
+
+#: builtin/branch.c:836
+msgid "could not unset upstream of HEAD when it does not point to any branch."
+msgstr ""
+"nie można usunąć ustawienia gałęzi nadrzędnej HEAD, kiedy nie wskazuje ono "
+"żadnej gałęzi."
+
+#: builtin/branch.c:842
+#, c-format
+msgid "Branch '%s' has no upstream information"
+msgstr "Gałąź „%s” nie ma informacji o gałęzi nadrzędnej"
+
+#: builtin/branch.c:852
+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 ""
+"Opcje -a i -r do „git branch” nie przyjmują nazwy gałęzi.\n"
+"Czy chodziło o: -a | -r --list <wzorzec>?"
+
+#: builtin/branch.c:856
+msgid ""
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
+msgstr ""
+"opcja „--set-upstream” jest przestarzała i nie jest już wspierana. Użyj "
+"zamiast tego „--track” lub ”--set-upstream-to”."
+
+#: builtin/bugreport.c:15
+msgid "git version:\n"
+msgstr "wersja gita:\n"
+
+#: builtin/bugreport.c:21
+#, c-format
+msgid "uname() failed with error '%s' (%d)\n"
+msgstr "uname() zawiodło z błędem „%s” (%d)\n"
+
+#: builtin/bugreport.c:31
+msgid "compiler info: "
+msgstr "informacje o kompilacji: "
+
+#: builtin/bugreport.c:34
+msgid "libc info: "
+msgstr "informacje o bibliotece libc: "
+
+#: builtin/bugreport.c:80
+msgid "not run from a git repository - no hooks to show\n"
+msgstr "nie uruchomiono z repozytorium gita — brak skryptów do pokazania\n"
+
+#: builtin/bugreport.c:90
+msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
+msgstr "git bugreport [-o|--output-directory <plik>] [-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 ""
+"Dziękujemy za wypełnienie zgłoszenia o błędzie Gita!\n"
+"Odpowiedz na następujące pytania, aby pomóc nam zrozumieć problem.\n"
+"\n"
+"Co robiłeś/-aś zanim pojawił się błąd? (Kroki, aby odtworzyć problem)\n"
+"\n"
+"Co powinno się stać? (Oczekiwane zachowanie)\n"
+"\n"
+"Co stało się zamiast tego? (Rzeczywiste zachowanie)\n"
+"\n"
+"Jaka jest różnica między tym, co powinno się stać, a tym, co się stało?\n"
+"\n"
+"Inne cenne uwagi:\n"
+"\n"
+"Przejrzyj resztę zgłoszenia błędu poniżej.\n"
+"Możesz usunąć wiersze, którymi nie chcesz się dzielić.\n"
+
+#: builtin/bugreport.c:135
+msgid "specify a destination for the bugreport file"
+msgstr "podaj cel pliku ze zgłoszeniem błędu"
+
+#: builtin/bugreport.c:137
+msgid "specify a strftime format suffix for the filename"
+msgstr "podaj sufiks w formacie strftime do nazwy pliku"
+
+#: builtin/bugreport.c:159
+#, c-format
+msgid "could not create leading directories for '%s'"
+msgstr "nie można utworzyć wiodących katalogów „%s”"
+
+#: builtin/bugreport.c:166
+msgid "System Info"
+msgstr "Informacje o systemie"
+
+#: builtin/bugreport.c:169
+msgid "Enabled Hooks"
+msgstr "Włączone skrypty Gita"
+
+#: builtin/bugreport.c:176
+#, c-format
+msgid "couldn't create a new file at '%s'"
+msgstr "nie można utworzyć nowego pliku w „%s”"
+
+#: builtin/bugreport.c:179
+#, c-format
+msgid "unable to write to %s"
+msgstr "nie można pisać do %s"
+
+#: builtin/bugreport.c:189
+#, c-format
+msgid "Created new report at '%s'.\n"
+msgstr "Utworzono nowe zgłoszenie w „%s”.\n"
+
+#: builtin/bundle.c:15 builtin/bundle.c:23
+msgid "git bundle create [<options>] <file> <git-rev-list args>"
+msgstr "git bundle create [<opcje>] <plik> <argumenty git-rev-list>"
+
+#: builtin/bundle.c:16 builtin/bundle.c:28
+msgid "git bundle verify [<options>] <file>"
+msgstr "git bundle verify [<opcje>] <plik>"
+
+#: builtin/bundle.c:17 builtin/bundle.c:33
+msgid "git bundle list-heads <file> [<refname>...]"
+msgstr "git bundle list-heads <plik> [<referencja>...]"
+
+#: builtin/bundle.c:18 builtin/bundle.c:38
+msgid "git bundle unbundle <file> [<refname>...]"
+msgstr "git bundle unbundle <plik> [<referencja>...]"
+
+#: builtin/bundle.c:67 builtin/pack-objects.c:3495
+msgid "do not show progress meter"
+msgstr "nie pokazuj wskaźnika postępu"
+
+#: builtin/bundle.c:69 builtin/pack-objects.c:3497
+msgid "show progress meter"
+msgstr "pokazuj wskaźnik postępu"
+
+#: builtin/bundle.c:71 builtin/pack-objects.c:3499
+msgid "show progress meter during object writing phase"
+msgstr "pokaż miernik postępu podczas fazy zapisywania obiektów"
+
+#: builtin/bundle.c:74 builtin/pack-objects.c:3502
+msgid "similar to --all-progress when progress meter is shown"
+msgstr "podobne do --all-progress, kiedy pokazany jest wskaźnik postępu"
+
+#: builtin/bundle.c:76
+msgid "specify bundle format version"
+msgstr "podaj wersję formatu wiązki"
+
+#: builtin/bundle.c:96
+msgid "Need a repository to create a bundle."
+msgstr "Należy podać repozytorium, aby utworzyć wiązkę."
+
+#: builtin/bundle.c:107
+msgid "do not show bundle details"
+msgstr "nie pokazuj szczegółów wiązki"
+
+#: builtin/bundle.c:122
+#, c-format
+msgid "%s is okay\n"
+msgstr "%s jest w porządku\n"
+
+#: builtin/bundle.c:163
+msgid "Need a repository to unbundle."
+msgstr "Potrzebne repozytorium do podzielenia."
+
+#: builtin/bundle.c:171 builtin/remote.c:1700
+msgid "be verbose; must be placed before a subcommand"
+msgstr "więcej komunikatów; musi być umieszczone przed pod-poleceniem"
+
+#: builtin/bundle.c:193 builtin/remote.c:1731
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "Nieznane pod-polecenie: %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 | <rodzaj> | --textconv | --filters) [--path=<ścieżka>] <obiekt>"
+
+#: 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 "można podać tylko jedną opcję wsadową „batch”"
+
+#: builtin/cat-file.c:638
+msgid "<type> can be one of: blob, tree, commit, tag"
+msgstr "<rodzaj> może być jednym z: blob, tree, commit, tag"
+
+#: builtin/cat-file.c:639
+msgid "show object type"
+msgstr "pokaż typ obiektu"
+
+#: builtin/cat-file.c:640
+msgid "show object size"
+msgstr "pokaż rozmiar obiektu"
+
+#: builtin/cat-file.c:642
+msgid "exit with zero when there's no error"
+msgstr "zwróć zero, kiedy nie ma błędu"
+
+#: builtin/cat-file.c:643
+msgid "pretty-print object's content"
+msgstr "ładnie wypisz zawartość obiektu"
+
+#: builtin/cat-file.c:645
+msgid "for blob objects, run textconv on object's content"
+msgstr "dla obiektów blob, wykonaj textconv na zawartości obiektu"
+
+#: builtin/cat-file.c:647
+msgid "for blob objects, run filters on object's content"
+msgstr "dla obiektów blob, wykonaj filtry na zawartości obiektu"
+
+#: builtin/cat-file.c:648
+msgid "blob"
+msgstr "blob"
+
+#: builtin/cat-file.c:649
+msgid "use a specific path for --textconv/--filters"
+msgstr "użyj podanej ścieżki do --textconv/--filters"
+
+#: builtin/cat-file.c:651
+msgid "allow -s and -t to work with broken/corrupt objects"
+msgstr "zezwól, aby -s i -t działały z uszkodzonymi obiektami"
+
+#: builtin/cat-file.c:652
+msgid "buffer --batch output"
+msgstr "buforuj wyjście --batch"
+
+#: builtin/cat-file.c:654
+msgid "show info and content of objects fed from the standard input"
+msgstr ""
+"pokaż informacje i zawartość obiektów pobranych ze standardowego wejścia"
+
+#: builtin/cat-file.c:658
+msgid "show info about objects fed from the standard input"
+msgstr "pokaż informacje o obiektach pobranych ze standardowego wejścia"
+
+#: builtin/cat-file.c:662
+msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+msgstr ""
+"podążaj za dowiązaniami w drzewie (do użycia z --batch lub --batch-check)"
+
+#: builtin/cat-file.c:664
+msgid "show all objects with --batch or --batch-check"
+msgstr "pokaż wszystkie obiekty z --batch lub --batch-check"
+
+#: builtin/cat-file.c:666
+msgid "do not order --batch-all-objects output"
+msgstr "nie porządkuj wyjścia --batch-all-objects"
+
+#: builtin/check-attr.c:13
+msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
+msgstr "git check-attr [-a | --all | <atrybut>...] [--] <ścieżka>..."
+
+#: builtin/check-attr.c:14
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+msgstr "git check-attr --stdin [-z] [-a | --all | <atrybut>...]"
+
+#: builtin/check-attr.c:21
+msgid "report all attributes set on file"
+msgstr "zgłaszaj wszystkie atrybuty ustawione na pliku"
+
+#: builtin/check-attr.c:22
+msgid "use .gitattributes only from the index"
+msgstr "użyj .gitattributes tylko z indeksu"
+
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+msgid "read file names from stdin"
+msgstr "wczytaj nazwy plików ze standardowego wejścia"
+
+#: builtin/check-attr.c:25 builtin/check-ignore.c:27
+msgid "terminate input and output records by a NUL character"
+msgstr "zakończ wpisy wejścia i wyjścia znakiem NUL"
+
+#: builtin/check-ignore.c:21 builtin/checkout.c:1499 builtin/gc.c:549
+#: builtin/worktree.c:489
+msgid "suppress progress reporting"
+msgstr "nie zgłaszaj postępu"
+
+#: builtin/check-ignore.c:29
+msgid "show non-matching input paths"
+msgstr "pokaż niepasujące ścieżki wejściowe"
+
+#: builtin/check-ignore.c:31
+msgid "ignore index when checking"
+msgstr "pomiń indeks przy sprawdzaniu"
+
+#: builtin/check-ignore.c:163
+msgid "cannot specify pathnames with --stdin"
+msgstr "nie można podać ścieżek z --stdin"
+
+#: builtin/check-ignore.c:166
+msgid "-z only makes sense with --stdin"
+msgstr "-z ma sens tylko z --stdin"
+
+#: builtin/check-ignore.c:168
+msgid "no path specified"
+msgstr "nie podano ścieżki"
+
+#: builtin/check-ignore.c:172
+msgid "--quiet is only valid with a single pathname"
+msgstr "--quiet ma sens tylko z pojedynczą ścieżką"
+
+#: builtin/check-ignore.c:174
+msgid "cannot have both --quiet and --verbose"
+msgstr "--quiet i --verbose się wykluczają"
+
+#: builtin/check-ignore.c:177
+msgid "--non-matching is only valid with --verbose"
+msgstr "--non-matching ma sens tylko z --verbose"
+
+#: builtin/check-mailmap.c:9
+msgid "git check-mailmap [<options>] <contact>..."
+msgstr "git check-mailmap [<opcje>] <kontakt>..."
+
+#: builtin/check-mailmap.c:14
+msgid "also read contacts from stdin"
+msgstr "wczytaj kontakty także ze standardowego wejścia"
+
+#: builtin/check-mailmap.c:25
+#, c-format
+msgid "unable to parse contact: %s"
+msgstr "nie można przetworzyć kontaktu: %s"
+
+#: builtin/check-mailmap.c:48
+msgid "no contacts specified"
+msgstr "nie podano kontaktów"
+
+#: builtin/checkout-index.c:152
+msgid "git checkout-index [<options>] [--] [<file>...]"
+msgstr "git checkout-index [<opcje>] [--] [<plik>...]"
+
+#: builtin/checkout-index.c:169
+msgid "stage should be between 1 and 3 or all"
+msgstr "przygotowanie powinno być pomiędzy 1 a 3 lub „all”"
+
+#: builtin/checkout-index.c:186
+msgid "check out all files in the index"
+msgstr "wybierz wszystkie pliki z indeksu"
+
+#: builtin/checkout-index.c:187
+msgid "force overwrite of existing files"
+msgstr "wymuś nadpisanie istniejących plików"
+
+#: builtin/checkout-index.c:189
+msgid "no warning for existing files and files not in index"
+msgstr "nie ostrzegaj przed istniejącymi plikami i plikami nie w indeksie"
+
+#: builtin/checkout-index.c:191
+msgid "don't checkout new files"
+msgstr "nie wybieraj nowych plików"
+
+#: builtin/checkout-index.c:193
+msgid "update stat information in the index file"
+msgstr "zaktualizuj informacje stat w pliku indeksu"
+
+#: builtin/checkout-index.c:197
+msgid "read list of paths from the standard input"
+msgstr "odczytaj listę ścieżek ze standardowego wejścia"
+
+#: builtin/checkout-index.c:199
+msgid "write the content to temporary files"
+msgstr "zapisz zawartość do plików tymczasowych"
+
+#: builtin/checkout-index.c:200 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:717
+msgid "string"
+msgstr "ciąg znaków"
+
+#: builtin/checkout-index.c:201
+msgid "when creating files, prepend <string>"
+msgstr "przy tworzeniu plików, dodaj <łańcuch> z przodu"
+
+#: builtin/checkout-index.c:203
+msgid "copy out the files from named stage"
+msgstr "wykopiuj pliki z nazwanego przygotowania"
+
+#: builtin/checkout.c:31
+msgid "git checkout [<options>] <branch>"
+msgstr "git checkout [<opcje>] <gałąź>"
+
+#: builtin/checkout.c:32
+msgid "git checkout [<options>] [<branch>] -- <file>..."
+msgstr "git checkout [<opcje>] [<gałąź>] -- <plik>..."
+
+#: builtin/checkout.c:37
+msgid "git switch [<options>] [<branch>]"
+msgstr "git switch [<opcje>] <gałąź>"
+
+#: builtin/checkout.c:42
+msgid "git restore [<options>] [--source=<branch>] <file>..."
+msgstr "git restore [<opcje>] [--source=<gałąź>] <plik>..."
+
+#: builtin/checkout.c:188 builtin/checkout.c:227
+#, c-format
+msgid "path '%s' does not have our version"
+msgstr "ścieżka „%s” nie ma „naszej” wersji"
+
+#: builtin/checkout.c:190 builtin/checkout.c:229
+#, c-format
+msgid "path '%s' does not have their version"
+msgstr "ścieżka „%s” nie ma „ich” wersji"
+
+#: builtin/checkout.c:206
+#, c-format
+msgid "path '%s' does not have all necessary versions"
+msgstr "ścieżka „%s” nie ma wszystkich potrzebnych wersji"
+
+#: builtin/checkout.c:258
+#, c-format
+msgid "path '%s' does not have necessary versions"
+msgstr "ścieżka „%s” nie ma potrzebnych wersji"
+
+#: builtin/checkout.c:275
+#, c-format
+msgid "path '%s': cannot merge"
+msgstr "ścieżka „%s”: nie można scalić"
+
+#: builtin/checkout.c:291
+#, c-format
+msgid "Unable to add merge result for '%s'"
+msgstr "Nie można dodać wyniku scalenia dla „%s”"
+
+#: builtin/checkout.c:396
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] "Odtworzono %d konflikt scalenia"
+msgstr[1] "Odtworzono %d konflikty scalenia"
+msgstr[2] "Odtworzono %d konfliktów scalenia"
+
+#: builtin/checkout.c:401
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] "Zaktualizowano %d ścieżkę z %s"
+msgstr[1] "Zaktualizowano %d ścieżki z %s"
+msgstr[2] "Zaktualizowano %d ścieżek z %s"
+
+#: builtin/checkout.c:408
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] "Zaktualizowano %d ścieżkę z indeksu"
+msgstr[1] "Zaktualizowano %d ścieżki z indeksu"
+msgstr[2] "Zaktualizowano %d ścieżek z indeksu"
+
+#: 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 "Nie można użyć „%s” przy aktualizowaniu ścieżek"
+
+#: builtin/checkout.c:444 builtin/checkout.c:447
+#, c-format
+msgid "'%s' cannot be used with %s"
+msgstr "„%s” i %s wykluczają się"
+
+#: builtin/checkout.c:451
+#, c-format
+msgid "Cannot update paths and switch to branch '%s' at the same time."
+msgstr ""
+"Nie można jednocześnie zaktualizować ścieżek i przełączyć na gałąź „%s”."
+
+#: builtin/checkout.c:455
+#, c-format
+msgid "neither '%s' or '%s' is specified"
+msgstr "nie podano ani „%s” ani „%s”"
+
+#: builtin/checkout.c:459
+#, c-format
+msgid "'%s' must be used when '%s' is not specified"
+msgstr "należy użyć „%s”, jeśli nie podano „%s”"
+
+#: builtin/checkout.c:464 builtin/checkout.c:469
+#, c-format
+msgid "'%s' or '%s' cannot be used with %s"
+msgstr "nie można użyć „%s” ani „%s” z %s"
+
+#: builtin/checkout.c:543 builtin/checkout.c:550
+#, c-format
+msgid "path '%s' is unmerged"
+msgstr "ścieżka „%s” jest niescalona"
+
+#: builtin/checkout.c:718
+msgid "you need to resolve your current index first"
+msgstr "musisz najpierw rozwiązać bieżący indeks"
+
+#: builtin/checkout.c:772
+#, c-format
+msgid ""
+"cannot continue with staged changes in the following files:\n"
+"%s"
+msgstr ""
+"nie można kontynuować z przygotowanymi zmianami w następujących plikach:\n"
+"%s"
+
+#: builtin/checkout.c:865
+#, c-format
+msgid "Can not do reflog for '%s': %s\n"
+msgstr "nie można wykonać reflog na „%s”: %s\n"
+
+#: builtin/checkout.c:907
+msgid "HEAD is now at"
+msgstr "HEAD wskazuje teraz na"
+
+#: builtin/checkout.c:911 builtin/clone.c:721 t/helper/test-fast-rebase.c:202
+msgid "unable to update HEAD"
+msgstr "nie można zaktualizować HEAD"
+
+#: builtin/checkout.c:915
+#, c-format
+msgid "Reset branch '%s'\n"
+msgstr "Zresetuj gałąź „%s”\n"
+
+#: builtin/checkout.c:918
+#, c-format
+msgid "Already on '%s'\n"
+msgstr "Już jesteś na „%s”\n"
+
+#: builtin/checkout.c:922
+#, c-format
+msgid "Switched to and reset branch '%s'\n"
+msgstr "Przełączono na gałąź „%s” i zresetowano ją\n"
+
+#: builtin/checkout.c:924 builtin/checkout.c:1355
+#, c-format
+msgid "Switched to a new branch '%s'\n"
+msgstr "Przełączono na nową gałąź „%s”\n"
+
+#: builtin/checkout.c:926
+#, c-format
+msgid "Switched to branch '%s'\n"
+msgstr "Przełączono na gałąź „%s”\n"
+
+#: builtin/checkout.c:977
+#, c-format
+msgid " ... and %d more.\n"
+msgstr " ... i %d innych.\n"
+
+#: builtin/checkout.c:983
+#, 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] ""
+"Ostrzeżenie: zostawiasz za sobą %d zapis, niepowiązany z żadną\n"
+"z gałęzi:\n"
+"\n"
+"%s\n"
+msgstr[1] ""
+"Ostrzeżenie: zostawiasz za sobą %d zapisy, niepowiązane z żadną\n"
+"z gałęzi:\n"
+"\n"
+"%s\n"
+msgstr[2] ""
+"Ostrzeżenie: zostawiasz za sobą %d zapisów, niepowiązanych z żadną\n"
+"z gałęzi:\n"
+"\n"
+"%s\n"
+
+#: builtin/checkout.c:1002
+#, 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] ""
+"Jeśli chcesz go zachować tworząc nową gałąź, to może być dobry moment\n"
+"na zrobienie tego:\n"
+"\n"
+" git branch <nazwa-nowej-gałęzi> %s\n"
+"\n"
+msgstr[1] ""
+"Jeśli chcesz je zachować tworząc nową gałąź, to może być dobry moment\n"
+"na zrobienie tego:\n"
+"\n"
+" git branch <nazwa-nowej-gałęzi> %s\n"
+"\n"
+msgstr[2] ""
+"Jeśli chcesz je zachować tworząc nową gałąź, to może być dobry moment\n"
+"na zrobienie tego:\n"
+"\n"
+" git branch <nazwa-nowej-gałęzi> %s\n"
+"\n"
+
+#: builtin/checkout.c:1037
+msgid "internal error in revision walk"
+msgstr "wewnętrzny błąd w przechodzeniu rewizji"
+
+#: builtin/checkout.c:1041
+msgid "Previous HEAD position was"
+msgstr "Poprzednim wskazaniem HEAD było"
+
+#: builtin/checkout.c:1081 builtin/checkout.c:1350
+msgid "You are on a branch yet to be born"
+msgstr "Jesteś na gałęzi, która dopiero ma powstać"
+
+#: builtin/checkout.c:1163
+#, 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” może być jednocześnie lokalnym plikiem i gałęzią śledzącą.\n"
+"Użyj -- (i opcjonalnie --no-guess), żeby ujednoznacznić"
+
+#: builtin/checkout.c:1170
+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 ""
+"Jeśli chodziło o wybranie gałęzi śledzącej, np. na „origin”,\n"
+"możesz to zrobić podając pełną nazwę z opcją --track:\n"
+"\n"
+" git checkout --track origin/<nazwa>\n"
+"\n"
+"Jeśli chcesz, żeby wybrania wszystkich niejednoznacznych\n"
+"<nazw> preferowały jedno zdalne repozytorium, rozważ ustawienie\n"
+"checkout.defaultRemote=origin w swoich ustawieniach."
+
+#: builtin/checkout.c:1180
+#, c-format
+msgid "'%s' matched multiple (%d) remote tracking branches"
+msgstr "„%s” pasuje do wielu (%d) gałęzi śledzących"
+
+#: builtin/checkout.c:1246
+msgid "only one reference expected"
+msgstr "oczekiwano tylko jednej referencji"
+
+#: builtin/checkout.c:1263
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "oczekiwano tylko jednej referencji, podano %d."
+
+#: builtin/checkout.c:1309 builtin/worktree.c:270 builtin/worktree.c:438
+#, c-format
+msgid "invalid reference: %s"
+msgstr "nieprawidłowa referencja: %s"
+
+#: builtin/checkout.c:1322 builtin/checkout.c:1688
+#, c-format
+msgid "reference is not a tree: %s"
+msgstr "referencja nie jest drzewem: %s"
+
+#: builtin/checkout.c:1369
+#, c-format
+msgid "a branch is expected, got tag '%s'"
+msgstr "oczekiwano gałęzi, otrzymano tag „%s”"
+
+#: builtin/checkout.c:1371
+#, c-format
+msgid "a branch is expected, got remote branch '%s'"
+msgstr "oczekiwano gałęzi, otrzymano zdalną gałąź „%s”"
+
+#: builtin/checkout.c:1372 builtin/checkout.c:1380
+#, c-format
+msgid "a branch is expected, got '%s'"
+msgstr "oczekiwano gałęzi, otrzymano „%s”"
+
+#: builtin/checkout.c:1375
+#, c-format
+msgid "a branch is expected, got commit '%s'"
+msgstr "oczekiwano gałęzi, otrzymano zapis „%s”"
+
+#: builtin/checkout.c:1391
+msgid ""
+"cannot switch branch while merging\n"
+"Consider \"git merge --quit\" or \"git worktree add\"."
+msgstr ""
+"Nie można przełączyć gałęzi w trakcie scalania\n"
+"Rozważ „git merge --quit” lub „git worktree add”."
+
+#: builtin/checkout.c:1395
+msgid ""
+"cannot switch branch in the middle of an am session\n"
+"Consider \"git am --quit\" or \"git worktree add\"."
+msgstr ""
+"Nie można przełączyć gałęzi w trakcie sesji am\n"
+"Rozważ „git am --quit” lub „git worktree add”."
+
+#: builtin/checkout.c:1399
+msgid ""
+"cannot switch branch while rebasing\n"
+"Consider \"git rebase --quit\" or \"git worktree add\"."
+msgstr ""
+"Nie można przełączyć gałęzi w trakcie przestawiania\n"
+"Rozważ „git rebase --quit” lub „git worktree add”."
+
+#: builtin/checkout.c:1403
+msgid ""
+"cannot switch branch while cherry-picking\n"
+"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
+msgstr ""
+"Nie można przełączyć gałęzi w trakcie dobierania\n"
+"Rozważ „git cherry-pick --quit” lub „git worktree add”."
+
+#: builtin/checkout.c:1407
+msgid ""
+"cannot switch branch while reverting\n"
+"Consider \"git revert --quit\" or \"git worktree add\"."
+msgstr ""
+"Nie można przełączyć gałęzi w trakcie odwracania\n"
+"Rozważ „git revert --quit” lub „git worktree add”."
+
+#: builtin/checkout.c:1411
+msgid "you are switching branch while bisecting"
+msgstr "zmiana gałęzi w trakcie przeszukiwania"
+
+#: builtin/checkout.c:1418
+msgid "paths cannot be used with switching branches"
+msgstr "ścieżki nie mogą być podane z przełączaniem gałęzi"
+
+#: builtin/checkout.c:1421 builtin/checkout.c:1425 builtin/checkout.c:1429
+#, c-format
+msgid "'%s' cannot be used with switching branches"
+msgstr "„%s” nie może być użyte z przełączaniem gałęzi"
+
+#: builtin/checkout.c:1433 builtin/checkout.c:1436 builtin/checkout.c:1439
+#: builtin/checkout.c:1444 builtin/checkout.c:1449
+#, c-format
+msgid "'%s' cannot be used with '%s'"
+msgstr "„%s” i „%s” wykluczają się"
+
+#: builtin/checkout.c:1446
+#, c-format
+msgid "'%s' cannot take <start-point>"
+msgstr "„%s” nie może przyjąć <punktu-startowego>"
+
+#: builtin/checkout.c:1454
+#, c-format
+msgid "Cannot switch branch to a non-commit '%s'"
+msgstr "Nie można przełączyć gałęzi na nie-zapis „%s”"
+
+#: builtin/checkout.c:1461
+msgid "missing branch or commit argument"
+msgstr "brakuje argumentu gałęzi lub zapisu"
+
+#: builtin/checkout.c:1504
+msgid "perform a 3-way merge with the new branch"
+msgstr "dokonaj trójstronnego scalenia z nową gałęzią"
+
+#: builtin/checkout.c:1505 builtin/log.c:1799 parse-options.h:322
+msgid "style"
+msgstr "styl"
+
+#: builtin/checkout.c:1506
+msgid "conflict style (merge or diff3)"
+msgstr "styl konfliktów (merge lub diff3)"
+
+#: builtin/checkout.c:1518 builtin/worktree.c:486
+msgid "detach HEAD at named commit"
+msgstr "odłącz HEAD na podanym zapisie"
+
+#: builtin/checkout.c:1519
+msgid "set upstream info for new branch"
+msgstr "ustaw gałąź nadrzędną nowej gałęzi"
+
+#: builtin/checkout.c:1521
+msgid "force checkout (throw away local modifications)"
+msgstr "wymuś wybranie (wyrzuć lokalne zmiany)"
+
+#: builtin/checkout.c:1523
+msgid "new-branch"
+msgstr "nowa-gałąź"
+
+#: builtin/checkout.c:1523
+msgid "new unparented branch"
+msgstr "nowa gałąź bez rodzica"
+
+#: builtin/checkout.c:1525 builtin/merge.c:301
+msgid "update ignored files (default)"
+msgstr "aktualizuj ignorowane pliki (domyślnie)"
+
+#: builtin/checkout.c:1528
+msgid "do not check if another worktree is holding the given ref"
+msgstr "nie sprawdzaj, czy inne drzewo robocze trzyma podaną referencję"
+
+#: builtin/checkout.c:1541
+msgid "checkout our version for unmerged files"
+msgstr "wybierz „naszą” wersję niescalonych plików"
+
+#: builtin/checkout.c:1544
+msgid "checkout their version for unmerged files"
+msgstr "wybierz „ich” wersję niescalonych plików"
+
+#: builtin/checkout.c:1548
+msgid "do not limit pathspecs to sparse entries only"
+msgstr "nie ograniczaj ścieżek tylko do rzadkich elementów"
+
+#: builtin/checkout.c:1603
+#, c-format
+msgid "-%c, -%c and --orphan are mutually exclusive"
+msgstr "-%c, -%c i --orphan się wykluczają"
+
+#: builtin/checkout.c:1607
+msgid "-p and --overlay are mutually exclusive"
+msgstr "-p i --overlay się wykluczają"
+
+#: builtin/checkout.c:1644
+msgid "--track needs a branch name"
+msgstr "--track potrzebuje nazwy gałęzi"
+
+#: builtin/checkout.c:1649
+#, c-format
+msgid "missing branch name; try -%c"
+msgstr "brakuje nazwy gałęzi; spróbuj -%c"
+
+#: builtin/checkout.c:1681
+#, c-format
+msgid "could not resolve %s"
+msgstr "nie można rozwiązać %s"
+
+#: builtin/checkout.c:1697
+msgid "invalid path specification"
+msgstr "nieprawidłowa ścieżka"
+
+#: builtin/checkout.c:1704
+#, c-format
+msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
+msgstr "„%s” nie jest zapisem, a nie można z niego utworzyć gałęzi „%s”"
+
+#: builtin/checkout.c:1708
+#, c-format
+msgid "git checkout: --detach does not take a path argument '%s'"
+msgstr "git checkout: --detach nie przyjmuje argumentu ścieżki „%s”"
+
+#: builtin/checkout.c:1717
+msgid "--pathspec-from-file is incompatible with --detach"
+msgstr "--pathspec-from-file i --detach się wykluczają"
+
+#: builtin/checkout.c:1720 builtin/reset.c:325 builtin/stash.c:1566
+msgid "--pathspec-from-file is incompatible with --patch"
+msgstr "--pathspec-from-file i --patch się wykluczają"
+
+#: builtin/checkout.c:1733
+msgid ""
+"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
+"checking out of the index."
+msgstr ""
+"git checkout: --ours/--theirs, --force i --merge się wykluczają, gdy\n"
+"wybieranie z indeksu."
+
+#: builtin/checkout.c:1738
+msgid "you must specify path(s) to restore"
+msgstr "musisz podać ścieżkę (ścieżki) do przywrócenia"
+
+#: builtin/checkout.c:1764 builtin/checkout.c:1766 builtin/checkout.c:1815
+#: builtin/checkout.c:1817 builtin/clone.c:122 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:482
+#: builtin/worktree.c:484
+msgid "branch"
+msgstr "gałąź"
+
+#: builtin/checkout.c:1765
+msgid "create and checkout a new branch"
+msgstr "utwórz i wybierz nową gałąź"
+
+#: builtin/checkout.c:1767
+msgid "create/reset and checkout a branch"
+msgstr "utwórz/zresetuj i wybierz gałąź"
+
+#: builtin/checkout.c:1768
+msgid "create reflog for new branch"
+msgstr "utwórz dziennik referencji nowej gałęzi"
+
+#: builtin/checkout.c:1770
+msgid "second guess 'git checkout <no-such-branch>' (default)"
+msgstr "spróbuj zgadnąć „git checkout <nieistniejąca-gałąź>” (domyślnie)"
+
+#: builtin/checkout.c:1771
+msgid "use overlay mode (default)"
+msgstr "użyj trybu nakładki (domyślnie)"
+
+#: builtin/checkout.c:1816
+msgid "create and switch to a new branch"
+msgstr "utwórz i przełącz na nową gałąź"
+
+#: builtin/checkout.c:1818
+msgid "create/reset and switch to a branch"
+msgstr "utwórz/zresetuj i przełącz na gałąź"
+
+#: builtin/checkout.c:1820
+msgid "second guess 'git switch <no-such-branch>'"
+msgstr "spróbuj zgadnąć „git switch <nieistniejąca-gałąź>”"
+
+#: builtin/checkout.c:1822
+msgid "throw away local modifications"
+msgstr "wyrzuć lokalne zmiany"
+
+#: builtin/checkout.c:1856
+msgid "which tree-ish to checkout from"
+msgstr "z którego drzewa wybrać"
+
+#: builtin/checkout.c:1858
+msgid "restore the index"
+msgstr "przywróć indeks"
+
+#: builtin/checkout.c:1860
+msgid "restore the working tree (default)"
+msgstr "przywróć drzewo robocze (domyślnie)"
+
+#: builtin/checkout.c:1862
+msgid "ignore unmerged entries"
+msgstr "pomiń niescalone elementy"
+
+#: builtin/checkout.c:1863
+msgid "use overlay mode"
+msgstr "użyj trybu nakładki"
+
+#: 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 <wzorzec>] [-x | -X] [--] <ścieżki>..."
+
+#: builtin/clean.c:33
+#, c-format
+msgid "Removing %s\n"
+msgstr "Usuwanie %s\n"
+
+#: builtin/clean.c:34
+#, c-format
+msgid "Would remove %s\n"
+msgstr "Usunięto by %s\n"
+
+#: builtin/clean.c:35
+#, c-format
+msgid "Skipping repository %s\n"
+msgstr "Pomijanie repozytorium %s\n"
+
+#: builtin/clean.c:36
+#, c-format
+msgid "Would skip repository %s\n"
+msgstr "Pominięto by repozytorium %s\n"
+
+#: builtin/clean.c:37
+#, c-format
+msgid "failed to remove %s"
+msgstr "nie można usunąć %s"
+
+#: builtin/clean.c:38
+#, c-format
+msgid "could not lstat %s\n"
+msgstr "nie można wykonać lstat na %s\n"
+
+#: builtin/clean.c:302 git-add--interactive.perl:593
+#, 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 ""
+"Pomoc do zachęty:\n"
+"1 - wybierz kolejny element\n"
+"foo - wybierz element po unikatowym początku\n"
+" - (puste) nic nie wybiera\n"
+
+#: builtin/clean.c:306 git-add--interactive.perl:602
+#, 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 ""
+"Pomoc do zachęty:\n"
+"1 - wybierz jeden element\n"
+"3-5 - wybierz zakres elementów\n"
+"2-3,6-9 - wybierz wiele zakresów\n"
+"foo - wybierz element po unikatowym początku\n"
+"-... - nie wybieraj elementów\n"
+"* - wybierz wszystko\n"
+" - (puste) zakończ zaznaczanie\n"
+
+#: builtin/clean.c:521 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
+#, c-format, perl-format
+msgid "Huh (%s)?\n"
+msgstr "Hę (%s)?\n"
+
+#: builtin/clean.c:661
+#, c-format
+msgid "Input ignore patterns>> "
+msgstr "Wprowadź wzorce ignorowania>> "
+
+#: builtin/clean.c:696
+#, c-format
+msgid "WARNING: Cannot find items matched by: %s"
+msgstr "Ostrzeżenie: Nie znaleziono elementów pasujących do: %s"
+
+#: builtin/clean.c:717
+msgid "Select items to delete"
+msgstr "Wybierz elementy do skasowania"
+
+#. TRANSLATORS: Make sure to keep [y/N] as is
+#: builtin/clean.c:758
+#, c-format
+msgid "Remove %s [y/N]? "
+msgstr "Usunąć %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 - rozpocznij czyszczenie\n"
+"filter by pattern - pomiń elementy przy usuwaniu\n"
+"select by numbers - wybierz elementy do usunięcia według numerów\n"
+"ask each - potwierdź każde usunięcie (jak „rm -i”)\n"
+"quit - przestań czyścić\n"
+"help - ten ekran\n"
+"? - pomoc do zachęty wyboru"
+
+#: builtin/clean.c:825
+msgid "Would remove the following item:"
+msgid_plural "Would remove the following items:"
+msgstr[0] "Usunięto by następujący element:"
+msgstr[1] "Usunięto by następujące elementy:"
+msgstr[2] "Usunięto by następujące elementy:"
+
+#: builtin/clean.c:841
+msgid "No more files to clean, exiting."
+msgstr "Brak plików do wyczyszczenia, wyjście."
+
+#: builtin/clean.c:903
+msgid "do not print names of files removed"
+msgstr "nie wypisuj nazw usuwanym plików"
+
+#: builtin/clean.c:905
+msgid "force"
+msgstr "wymuś"
+
+#: builtin/clean.c:906
+msgid "interactive cleaning"
+msgstr "interaktywne czyszczenie"
+
+#: builtin/clean.c:908
+msgid "remove whole directories"
+msgstr "usuwaj całe katalogi"
+
+#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/grep.c:922 builtin/log.c:184 builtin/log.c:186
+#: builtin/ls-files.c:573 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/show-ref.c:179
+msgid "pattern"
+msgstr "wzorzec"
+
+#: builtin/clean.c:910
+msgid "add <pattern> to ignore rules"
+msgstr "dodaj <wzorzec> do reguł ignorowania"
+
+#: builtin/clean.c:911
+msgid "remove ignored files, too"
+msgstr "usuń też ignorowane pliki"
+
+#: builtin/clean.c:913
+msgid "remove only ignored files"
+msgstr "usuń tylko ignorowane pliki"
+
+#: builtin/clean.c:929
+msgid ""
+"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
+"clean"
+msgstr ""
+"clean.requireForce ustawione na true, a nie podano -i, -n ani -f; odmawiam "
+"czyszczenia"
+
+#: builtin/clean.c:932
+msgid ""
+"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
+"refusing to clean"
+msgstr ""
+"clean.requireForce to domyślnie true, a nie podano -i, -n ani -f; odmawiam "
+"czyszczenia"
+
+#: builtin/clean.c:944
+msgid "-x and -X cannot be used together"
+msgstr "-x i -X wykluczają się"
+
+#: builtin/clone.c:45
+msgid "git clone [<options>] [--] <repo> [<dir>]"
+msgstr "git clone [<opcje>] [--] <repozytorium> [<katalog>]"
+
+#: builtin/clone.c:94
+msgid "don't create a checkout"
+msgstr "nie wybieraj plików"
+
+#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:555
+msgid "create a bare repository"
+msgstr "utwórz suche repozytorium"
+
+#: builtin/clone.c:99
+msgid "create a mirror repository (implies bare)"
+msgstr "utwórz lustrzane repozytorium (zakłada suche)"
+
+#: builtin/clone.c:101
+msgid "to clone from a local repository"
+msgstr "aby sklonować z lokalnego repozytorium"
+
+#: builtin/clone.c:103
+msgid "don't use local hardlinks, always copy"
+msgstr "nie używaj twardych dowiązań, zawsze kopiuj"
+
+#: builtin/clone.c:105
+msgid "setup as shared repository"
+msgstr "ustaw jako repozytorium dzielone"
+
+#: builtin/clone.c:107
+msgid "pathspec"
+msgstr "ścieżka"
+
+#: builtin/clone.c:107
+msgid "initialize submodules in the clone"
+msgstr "zainicjuj pod-moduły w klonie"
+
+#: builtin/clone.c:111
+msgid "number of submodules cloned in parallel"
+msgstr "liczba pod-modułów klonowanych równolegle"
+
+#: builtin/clone.c:112 builtin/init-db.c:552
+msgid "template-directory"
+msgstr "katalog-szablonów"
+
+#: builtin/clone.c:113 builtin/init-db.c:553
+msgid "directory from which templates will be used"
+msgstr "katalog, z którego zostaną użyte szablony"
+
+#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831
+#: builtin/submodule--helper.c:2336
+msgid "reference repository"
+msgstr "repozytorium odniesienia"
+
+#: builtin/clone.c:119 builtin/submodule--helper.c:1833
+#: builtin/submodule--helper.c:2338
+msgid "use --reference only while cloning"
+msgstr "użyj --reference tylko podczas klonowania"
+
+#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3561 builtin/repack.c:357
+msgid "name"
+msgstr "nazwa"
+
+#: builtin/clone.c:121
+msgid "use <name> instead of 'origin' to track upstream"
+msgstr "użyj <nazwy> zamiast „origin”, żeby śledzić zdalne repozytorium"
+
+#: builtin/clone.c:123
+msgid "checkout <branch> instead of the remote's HEAD"
+msgstr "wybierz <gałąź> zamiast zdalnego HEAD"
+
+#: builtin/clone.c:125
+msgid "path to git-upload-pack on the remote"
+msgstr "ścieżka do git-upload-pack na zdalnej maszynie"
+
+#: builtin/clone.c:126 builtin/fetch.c:176 builtin/grep.c:861
+#: builtin/pull.c:208
+msgid "depth"
+msgstr "głębokość"
+
+#: builtin/clone.c:127
+msgid "create a shallow clone of that depth"
+msgstr "utwórz płytki klon o tej głębokości"
+
+#: builtin/clone.c:128 builtin/fetch.c:178 builtin/pack-objects.c:3550
+#: builtin/pull.c:211
+msgid "time"
+msgstr "czas"
+
+#: builtin/clone.c:129
+msgid "create a shallow clone since a specific time"
+msgstr "utwórz płytki klon od podanego czasu"
+
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/fetch.c:203
+#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1323
+msgid "revision"
+msgstr "rewizja"
+
+#: builtin/clone.c:131 builtin/fetch.c:181 builtin/pull.c:215
+msgid "deepen history of shallow clone, excluding rev"
+msgstr "pogłęb historię płytkiego klonu pomijając rewizję"
+
+#: builtin/clone.c:133 builtin/submodule--helper.c:1843
+#: builtin/submodule--helper.c:2352
+msgid "clone only one branch, HEAD or --branch"
+msgstr "sklonuj tylko jedną gałąź, HEAD lub --branch"
+
+#: builtin/clone.c:135
+msgid "don't clone any tags, and make later fetches not to follow them"
+msgstr ""
+"nie klonuj żadnych tagów, i spraw, by późniejsze pobrania za nimi nie "
+"podążały"
+
+#: builtin/clone.c:137
+msgid "any cloned submodules will be shallow"
+msgstr "wszystkie sklonowane pod-moduły będą płytkie"
+
+#: builtin/clone.c:138 builtin/init-db.c:561
+msgid "gitdir"
+msgstr "katalog-gita"
+
+#: builtin/clone.c:139 builtin/init-db.c:562
+msgid "separate git dir from working tree"
+msgstr "oddziel katalog gita od drzewa roboczego"
+
+#: builtin/clone.c:140
+msgid "key=value"
+msgstr "klucz=wartość"
+
+#: builtin/clone.c:141
+msgid "set config inside the new repository"
+msgstr "ustaw konfigurację w nowym repozytorium"
+
+#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77
+#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
+msgid "server-specific"
+msgstr "zależne-od-serwera"
+
+#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77
+#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
+msgid "option to transmit"
+msgstr "nadaj opcję"
+
+#: builtin/clone.c:144 builtin/fetch.c:199 builtin/pull.c:234
+#: builtin/push.c:585
+msgid "use IPv4 addresses only"
+msgstr "używaj tylko adresów IPv4"
+
+#: builtin/clone.c:146 builtin/fetch.c:201 builtin/pull.c:237
+#: builtin/push.c:587
+msgid "use IPv6 addresses only"
+msgstr "używaj tylko adresów IPv6"
+
+#: builtin/clone.c:150
+msgid "any cloned submodules will use their remote-tracking branch"
+msgstr "wszystkie sklonowane pod-moduły będą używały swoich gałęzi śledzących"
+
+#: builtin/clone.c:152
+msgid "initialize sparse-checkout file to include only files at root"
+msgstr ""
+"zainicjuj plik rzadkiego wybrania, żeby zawierał tylko pliki w korzeniu"
+
+#: builtin/clone.c:288
+msgid ""
+"No directory name could be guessed.\n"
+"Please specify a directory on the command line"
+msgstr ""
+"Nie można zgadnąć nazwy katalogu.\n"
+"Podaj katalog w wierszu poleceń"
+
+#: builtin/clone.c:341
+#, c-format
+msgid "info: Could not add alternate for '%s': %s\n"
+msgstr "info: Nie można dodać alternatywnego obiektu do „%s”: %s\n"
+
+#: builtin/clone.c:414
+#, c-format
+msgid "%s exists and is not a directory"
+msgstr "%s istnieje i nie jest katalogiem"
+
+#: builtin/clone.c:432
+#, c-format
+msgid "failed to start iterator over '%s'"
+msgstr "nie można rozpocząć iteracji po „%s”"
+
+#: builtin/clone.c:463
+#, c-format
+msgid "failed to create link '%s'"
+msgstr "nie można utworzyć dowiązania „%s”"
+
+#: builtin/clone.c:467
+#, c-format
+msgid "failed to copy file to '%s'"
+msgstr "nie można skopiować pliku do „%s”"
+
+#: builtin/clone.c:472
+#, c-format
+msgid "failed to iterate over '%s'"
+msgstr "nie można iterować po „%s”"
+
+#: builtin/clone.c:499
+#, c-format
+msgid "done.\n"
+msgstr "gotowe.\n"
+
+#: builtin/clone.c:513
+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 ""
+"Klonowanie powiodło się, ale już nie wybieranie.\n"
+"Możesz zobaczyć, co zostało wybrane w „git status”\n"
+"i ponowić przez „git restore --source=HEAD :/”\n"
+
+#: builtin/clone.c:590
+#, c-format
+msgid "Could not find remote branch %s to clone."
+msgstr "Nie znaleziono zdalnej gałęzi %s do sklonowania."
+
+#: builtin/clone.c:709
+#, c-format
+msgid "unable to update %s"
+msgstr "nie można zaktualizować %s"
+
+#: builtin/clone.c:757
+msgid "failed to initialize sparse-checkout"
+msgstr "nie można zainicjować rzadkiego wybrania"
+
+#: builtin/clone.c:780
+msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+msgstr "zdalne HEAD wskazuje nieistniejącą referencję, nie można wybrać.\n"
+
+#: builtin/clone.c:812
+msgid "unable to checkout working tree"
+msgstr "nie można wybrać drzewa roboczego"
+
+#: builtin/clone.c:887
+msgid "unable to write parameters to config file"
+msgstr "nie można zapisać parametrów do pliku konfiguracyjnego"
+
+#: builtin/clone.c:950
+msgid "cannot repack to clean up"
+msgstr "nie można przepakować, żeby posprzątać"
+
+#: builtin/clone.c:952
+msgid "cannot unlink temporary alternates file"
+msgstr "nie można wykonać unlink na tymczasowym pliku alternatywnych położeń"
+
+#: builtin/clone.c:993 builtin/receive-pack.c:2493
+msgid "Too many arguments."
+msgstr "Zbyt dużo argumentów."
+
+#: builtin/clone.c:997
+msgid "You must specify a repository to clone."
+msgstr "Musisz określić repozytorium do sklonowania."
+
+#: builtin/clone.c:1010
+#, c-format
+msgid "--bare and --origin %s options are incompatible."
+msgstr "opcje --bare i --origin %s wykluczają się."
+
+#: builtin/clone.c:1013
+msgid "--bare and --separate-git-dir are incompatible."
+msgstr "--bare i --separate-git-dir się wykluczają."
+
+#: builtin/clone.c:1026
+#, c-format
+msgid "repository '%s' does not exist"
+msgstr "repozytorium „%s” nie istnieje"
+
+#: builtin/clone.c:1030 builtin/fetch.c:1951
+#, c-format
+msgid "depth %s is not a positive number"
+msgstr "głębokość %s nie jest liczbą dodatnią"
+
+#: builtin/clone.c:1040
+#, c-format
+msgid "destination path '%s' already exists and is not an empty directory."
+msgstr "docelowa ścieżka „%s” już istnieje i nie jest pustym katalogiem."
+
+#: builtin/clone.c:1046
+#, c-format
+msgid "repository path '%s' already exists and is not an empty directory."
+msgstr "ścieżka repozytorium „%s” już istnieje i nie jest pustym katalogiem."
+
+#: builtin/clone.c:1060
+#, c-format
+msgid "working tree '%s' already exists."
+msgstr "drzewo robocze „%s” już istnieje."
+
+#: builtin/clone.c:1075 builtin/clone.c:1096 builtin/difftool.c:271
+#: builtin/log.c:1986 builtin/worktree.c:282 builtin/worktree.c:314
+#, c-format
+msgid "could not create leading directories of '%s'"
+msgstr "nie można utworzyć wiodących katalogów „%s”"
+
+#: builtin/clone.c:1080
+#, c-format
+msgid "could not create work tree dir '%s'"
+msgstr "nie można utworzyć katalogu drzewa roboczego „%s”"
+
+#: builtin/clone.c:1100
+#, c-format
+msgid "Cloning into bare repository '%s'...\n"
+msgstr "Klonowanie do suchego repozytorium „%s”...\n"
+
+#: builtin/clone.c:1102
+#, c-format
+msgid "Cloning into '%s'...\n"
+msgstr "Klonowanie do „%s”...\n"
+
+#: builtin/clone.c:1126
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
+msgstr "clone --recursive nie pasuje do --reference ani do --reference-if-able"
+
+#: builtin/clone.c:1170 builtin/remote.c:200 builtin/remote.c:705
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr "„%s” nie jest prawidłową nazwą zdalnego repozytorium"
+
+#: builtin/clone.c:1211
+msgid "--depth is ignored in local clones; use file:// instead."
+msgstr "--depth jest ignorowana w lokalnych klonach; użyj zamiast tego file://"
+
+#: builtin/clone.c:1213
+msgid "--shallow-since is ignored in local clones; use file:// instead."
+msgstr ""
+"--shallow-since jest ignorowana w lokalnych klonach; użyj zamiast tego "
+"file://"
+
+#: builtin/clone.c:1215
+msgid "--shallow-exclude is ignored in local clones; use file:// instead."
+msgstr ""
+"--shallow-exclude jest ignorowane w lokalnych klonach; użyj zamiast tego "
+"file://"
+
+#: builtin/clone.c:1217
+msgid "--filter is ignored in local clones; use file:// instead."
+msgstr ""
+"--filter jest ignorowany w lokalnych klonach; użyj zamiast tego file://"
+
+#: builtin/clone.c:1220
+msgid "source repository is shallow, ignoring --local"
+msgstr "źródłowe repozytorium jest płytkie, ignorowanie --local"
+
+#: builtin/clone.c:1225
+msgid "--local is ignored"
+msgstr "--local jest ignorowane"
+
+#: builtin/clone.c:1315 builtin/clone.c:1323
+#, c-format
+msgid "Remote branch %s not found in upstream %s"
+msgstr "Nie znaleziono zdalnej gałęzi %s w repozytorium %s"
+
+#: builtin/clone.c:1326
+msgid "You appear to have cloned an empty repository."
+msgstr "Wygląda na to, że sklonowano puste repozytorium."
+
+#: builtin/column.c:10
+msgid "git column [<options>]"
+msgstr "git column [<opcje>]"
+
+#: builtin/column.c:27
+msgid "lookup config vars"
+msgstr "odczytaj wartości konfiguracji"
+
+#: builtin/column.c:28 builtin/column.c:29
+msgid "layout to use"
+msgstr "układ do użycia"
+
+#: builtin/column.c:30
+msgid "Maximum width"
+msgstr "Maksymalna szerokość"
+
+#: builtin/column.c:31
+msgid "Padding space on left border"
+msgstr "Wyrównawczy odstęp przy lewej krawędzi"
+
+#: builtin/column.c:32
+msgid "Padding space on right border"
+msgstr "Wyrównawczy odstęp przy prawej krawędzi"
+
+#: builtin/column.c:33
+msgid "Padding space between columns"
+msgstr "Wyrównawczy odstęp między kolumnami"
+
+#: builtin/column.c:51
+msgid "--command must be the first argument"
+msgstr "--command musi być pierwszym argumentem"
+
+#: 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 <katalog-obiektów>] [--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 <katalog-obiektów>] [--append] [--"
+"split[=<strategia>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
+"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <opcje podziału>"
+
+#: builtin/commit-graph.c:64
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "nie znaleziono katalogu obiektów pasującego do „%s”"
+
+#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
+#: builtin/commit-graph.c:316 builtin/fetch.c:187 builtin/log.c:1768
+msgid "dir"
+msgstr "katalog"
+
+#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
+#: builtin/commit-graph.c:317
+msgid "the object directory to store the graph"
+msgstr "katalog obiektów do przechowania grafu"
+
+#: builtin/commit-graph.c:83
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr "jeśli graf zapisów jest podzielony, zweryfikuj tylko plik czubka"
+
+#: builtin/commit-graph.c:106
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "Nie można otworzyć grafu zapisów „%s”"
+
+#: builtin/commit-graph.c:142
+#, c-format
+msgid "unrecognized --split argument, %s"
+msgstr "nierozpoznany argument --split, %s"
+
+#: builtin/commit-graph.c:155
+#, c-format
+msgid "unexpected non-hex object ID: %s"
+msgstr "nieoczekiwany nieszesnastkowy identyfikator obiektu: %s"
+
+#: builtin/commit-graph.c:160
+#, c-format
+msgid "invalid object: %s"
+msgstr "nieprawidłowy obiekt: %s"
+
+#: builtin/commit-graph.c:213
+msgid "start walk at all refs"
+msgstr "zacznij przechodzenie po wszystkich referencjach"
+
+#: builtin/commit-graph.c:215
+msgid "scan pack-indexes listed by stdin for commits"
+msgstr "przeskanuj indeksy paczek wymienione na wejściu dla zapisów"
+
+#: builtin/commit-graph.c:217
+msgid "start walk at commits listed by stdin"
+msgstr "zacznij przechodzenie od zapisów wypisanych na standardowym wejściu"
+
+#: builtin/commit-graph.c:219
+msgid "include all commits already in the commit-graph file"
+msgstr "uwzględnij wszystkie zapisy już w pliku grafu zapisów"
+
+#: builtin/commit-graph.c:221
+msgid "enable computation for changed paths"
+msgstr "włącz obliczanie zmienionych ścieżek"
+
+#: builtin/commit-graph.c:224
+msgid "allow writing an incremental commit-graph file"
+msgstr "pozwól zapisać przyrostowy plik grafu zapisów"
+
+#: builtin/commit-graph.c:228
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr "maksymalna liczba zapisów w niepodstawowym rozdzieleniu grafu zapisów"
+
+#: builtin/commit-graph.c:230
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr ""
+"maksymalny stosunek pomiędzy dwoma poziomami rozdzielonego grafu zapisów"
+
+#: builtin/commit-graph.c:232
+msgid "only expire files older than a given date-time"
+msgstr "wygaś tylko obiekty starsze niż podany czas"
+
+#: builtin/commit-graph.c:234
+msgid "maximum number of changed-path Bloom filters to compute"
+msgstr "maksymalna liczba filtrów Blooma zmienionych ścieżek do obliczenia"
+
+#: builtin/commit-graph.c:255
+msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
+msgstr "--reachable, --stdin-commits i --stdin-packs wykluczają się"
+
+#: builtin/commit-graph.c:287
+msgid "Collecting commits from input"
+msgstr "Zbieranie zapisów z wejścia"
+
+#: builtin/commit-tree.c:18
+msgid ""
+"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
+"<file>)...] <tree>"
+msgstr ""
+"git commit-tree [(-p <rodzic>)...] [-S[<id-klucza>]] [(-m <komunikat>)...] "
+"[(-F <plik>)...] <drzewo>"
+
+#: builtin/commit-tree.c:31
+#, c-format
+msgid "duplicate parent %s ignored"
+msgstr "zignorowano powtórzonego rodzica %s"
+
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:557
+#, c-format
+msgid "not a valid object name %s"
+msgstr "nieprawidłowa nazwa obiektu %s"
+
+#: builtin/commit-tree.c:93
+#, c-format
+msgid "git commit-tree: failed to open '%s'"
+msgstr "git commit-tree: nie można otworzyć „%s”"
+
+#: builtin/commit-tree.c:96
+#, c-format
+msgid "git commit-tree: failed to read '%s'"
+msgstr "git commit-tree: nie można odczytać „%s”"
+
+#: builtin/commit-tree.c:98
+#, c-format
+msgid "git commit-tree: failed to close '%s'"
+msgstr "git commit-tree: nie można zamknąć „%s”"
+
+#: builtin/commit-tree.c:111
+msgid "parent"
+msgstr "rodzic"
+
+#: builtin/commit-tree.c:112
+msgid "id of a parent commit object"
+msgstr "identyfikator obiektu zapisu rodzica"
+
+#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:282
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1537
+#: builtin/tag.c:445
+msgid "message"
+msgstr "komunikat"
+
+#: builtin/commit-tree.c:115 builtin/commit.c:1504
+msgid "commit message"
+msgstr "komunikat zapisu"
+
+#: builtin/commit-tree.c:118
+msgid "read commit log message from file"
+msgstr "odczytaj komunikat dziennika zapisu z pliku"
+
+#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:299
+#: builtin/pull.c:176 builtin/revert.c:118
+msgid "GPG sign commit"
+msgstr "podpisz zapis GPG"
+
+#: builtin/commit-tree.c:133
+msgid "must give exactly one tree"
+msgstr "należy podać tylko jedno drzewo"
+
+#: builtin/commit-tree.c:140
+msgid "git commit-tree: failed to read"
+msgstr "git commit-tree: nie można odczytać"
+
+#: builtin/commit.c:41
+msgid "git commit [<options>] [--] <pathspec>..."
+msgstr "git commit [<opcje>] [--] <ścieżka>..."
+
+#: builtin/commit.c:46
+msgid "git status [<options>] [--] <pathspec>..."
+msgstr "git status [<opcje>] [--] <ścieżka>..."
+
+#: 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 ""
+"Kazano poprawić najnowszy zapis, ale stałby się on przez to pusty.\n"
+"Możesz powtórzyć polecenie z --allow-empty, lub usunąć ten zapis\n"
+"całkowicie przez „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 ""
+"Poprzednie dobranie (cherry-pick) jest teraz puste — możliwe, że przez "
+"rozwiązane konflikty.\n"
+"Jeśli i tak chcesz je złożyć, użyj:\n"
+"\n"
+" git commit --allow-empty\n"
+"\n"
+
+#: builtin/commit.c:63
+msgid "Otherwise, please use 'git rebase --skip'\n"
+msgstr "W przeciwnym wypadku użyj „git rebase --skip”\n"
+
+#: builtin/commit.c:66
+msgid "Otherwise, please use 'git cherry-pick --skip'\n"
+msgstr "W przeciwnym wypadku użyj „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 ""
+"a wtedy użyj:\n"
+"\n"
+" git cherry-pick --continue\n"
+"\n"
+"aby wznowić dobieranie pozostałych zapisów.\n"
+"Jeśli chcesz pominąć ten zapis, użyj:\n"
+"\n"
+" git cherry-pick --skip\n"
+"\n"
+
+#: builtin/commit.c:312
+msgid "failed to unpack HEAD tree object"
+msgstr "nie można rozpakować obiektu drzewa HEAD"
+
+#: builtin/commit.c:348
+msgid "--pathspec-from-file with -a does not make sense"
+msgstr "--pathspec-from-file i -a wykluczają się"
+
+#: builtin/commit.c:361
+msgid "No paths with --include/--only does not make sense."
+msgstr "Brak ścieżek z --include/--only nie ma sensu."
+
+#: builtin/commit.c:373
+msgid "unable to create temporary index"
+msgstr "nie można utworzyć tymczasowego indeksu"
+
+#: builtin/commit.c:382
+msgid "interactive add failed"
+msgstr "interaktywne dodawanie nie powiodło się"
+
+#: builtin/commit.c:397
+msgid "unable to update temporary index"
+msgstr "nie można zaktualizować tymczasowego indeksu"
+
+#: builtin/commit.c:399
+msgid "Failed to update main cache tree"
+msgstr "Nie można zaktualizować głównego drzewa pamięci podręcznej"
+
+#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495
+msgid "unable to write new_index file"
+msgstr "nie można zapisać pliku new_index"
+
+#: builtin/commit.c:476
+msgid "cannot do a partial commit during a merge."
+msgstr "nie można złożyć częściowego zapisu w czasie scalania."
+
+#: builtin/commit.c:478
+msgid "cannot do a partial commit during a cherry-pick."
+msgstr "nie można złożyć częściowego zapisu w czasie dobierania."
+
+#: builtin/commit.c:480
+msgid "cannot do a partial commit during a rebase."
+msgstr "nie można złożyć częściowego zapisu w czasie przestawiania."
+
+#: builtin/commit.c:488
+msgid "cannot read the index"
+msgstr "nie można odczytać indeksu"
+
+#: builtin/commit.c:507
+msgid "unable to write temporary index file"
+msgstr "nie można zapisać tymczasowego pliku indeksu"
+
+#: builtin/commit.c:605
+#, c-format
+msgid "commit '%s' lacks author header"
+msgstr "zapis „%s” nie ma nagłówka autora"
+
+#: builtin/commit.c:607
+#, c-format
+msgid "commit '%s' has malformed author line"
+msgstr "zapis „%s” ma nieprawidłowy wiersz autorstwa"
+
+#: builtin/commit.c:626
+msgid "malformed --author parameter"
+msgstr "nieprawidłowy parametr --author"
+
+#: builtin/commit.c:679
+msgid ""
+"unable to select a comment character that is not used\n"
+"in the current commit message"
+msgstr ""
+"nie można wybrać znaku komentarza, który nie jest użyty\n"
+"w bieżącym komunikacie zapisu"
+
+#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097
+#, c-format
+msgid "could not lookup commit %s"
+msgstr "nie odnaleziono zapisu %s"
+
+#: builtin/commit.c:729 builtin/shortlog.c:413
+#, c-format
+msgid "(reading log message from standard input)\n"
+msgstr "(czytanie komunikatu dziennika ze standardowego wejścia)\n"
+
+#: builtin/commit.c:731
+msgid "could not read log from standard input"
+msgstr "nie można odczytać dziennika ze standardowego wejścia"
+
+#: builtin/commit.c:735
+#, c-format
+msgid "could not read log file '%s'"
+msgstr "nie można odczytać pliku dziennika „%s”"
+
+#: builtin/commit.c:766 builtin/commit.c:782
+msgid "could not read SQUASH_MSG"
+msgstr "nie można odczytać SQUASH_MSG"
+
+#: builtin/commit.c:773
+msgid "could not read MERGE_MSG"
+msgstr "nie czytaj MERGE_MSG"
+
+#: builtin/commit.c:833
+msgid "could not write commit template"
+msgstr "nie można zapisać szablonu zapisu"
+
+#: 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"
+"Wygląda, że składasz scalenie.\n"
+"Jeśli tak nie jest, wykonaj\n"
+"\tgit update-ref -d MERGE_HEAD\n"
+"i spróbuj ponownie.\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"
+"Wygląda, że składasz dobranie (cherry-pick).\n"
+"Jeśli tak nie jest, wykonaj\n"
+"\tgit update-ref -d CHERRY_PICK_HEAD\n"
+"i spróbuj ponownie.\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 ""
+"Podaj komunikat zapisu swoich zmian. Wiersze zaczynające się\n"
+"od „%c” będą ignorowane, a pusty komunikat przerwie zapis.\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 ""
+"Podaj komunikat zapisu swoich zmian. Wiersze zaczynające się\n"
+"od „%c” będą zachowane; możesz je sam(a) usunąć, jeśli chcesz.\n"
+"Pusty komunikat przerwie zapis.\n"
+
+#: builtin/commit.c:893
+#, c-format
+msgid "%sAuthor: %.*s <%.*s>"
+msgstr "%sAutor: %.*s <%.*s>"
+
+#: builtin/commit.c:901
+#, c-format
+msgid "%sDate: %s"
+msgstr "%sData: %s"
+
+#: builtin/commit.c:908
+#, c-format
+msgid "%sCommitter: %.*s <%.*s>"
+msgstr "%sSkładający: %.*s <%.*s>"
+
+#: builtin/commit.c:926
+msgid "Cannot read index"
+msgstr "Nie można odczytać indeksu"
+
+#: builtin/commit.c:997
+msgid "Error building trees"
+msgstr "Błąd budowania drzew"
+
+#: builtin/commit.c:1011 builtin/tag.c:308
+#, c-format
+msgid "Please supply the message using either -m or -F option.\n"
+msgstr "Należy podać komunikat przy użyciu opcji -m lub -F.\n"
+
+#: builtin/commit.c:1055
+#, c-format
+msgid "--author '%s' is not 'Name <email>' and matches no existing author"
+msgstr ""
+"--author „%s” nie jest postaci „Nazwa <e-mail>” i nie pasuje do istniejących "
+"twórców"
+
+#: builtin/commit.c:1069
+#, c-format
+msgid "Invalid ignored mode '%s'"
+msgstr "Nieprawidłowy tryb pomijanych plików „%s”"
+
+#: builtin/commit.c:1087 builtin/commit.c:1331
+#, c-format
+msgid "Invalid untracked files mode '%s'"
+msgstr "Nieprawidłowy tryb nieśledzonych plików „%s”"
+
+#: builtin/commit.c:1127
+msgid "--long and -z are incompatible"
+msgstr "--long i -z się wykluczają"
+
+#: builtin/commit.c:1171
+msgid "Using both --reset-author and --author does not make sense"
+msgstr "Użycie jednoczenie --reset-author i --author nie ma sensu"
+
+#: builtin/commit.c:1180
+msgid "You have nothing to amend."
+msgstr "Nie masz nic do poprawienia."
+
+#: builtin/commit.c:1183
+msgid "You are in the middle of a merge -- cannot amend."
+msgstr "Jesteś w trakcie scalania — nie można poprawiać."
+
+#: builtin/commit.c:1185
+msgid "You are in the middle of a cherry-pick -- cannot amend."
+msgstr "Jesteś w trakcie dobierania — nie można poprawiać."
+
+#: builtin/commit.c:1187
+msgid "You are in the middle of a rebase -- cannot amend."
+msgstr "Jesteś w trakcie przestawiania — nie można poprawiać."
+
+#: builtin/commit.c:1190
+msgid "Options --squash and --fixup cannot be used together"
+msgstr "Opcje --squash i --fixup się wykluczają"
+
+#: builtin/commit.c:1200
+msgid "Only one of -c/-C/-F/--fixup can be used."
+msgstr "-c, -C, -F i --fixup się wykluczają."
+
+#: builtin/commit.c:1202
+msgid "Option -m cannot be combined with -c/-C/-F."
+msgstr "Opcje -m, -c, -C i -F się wykluczają."
+
+#: builtin/commit.c:1211
+msgid "--reset-author can be used only with -C, -c or --amend."
+msgstr "--reset-author może być użyte tylko z -C, -c lub --amend."
+
+#: builtin/commit.c:1229
+msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
+msgstr "--include, --only, --all, --interactive i --patch się wykluczają."
+
+#: builtin/commit.c:1235
+#, c-format
+msgid "paths '%s ...' with -a does not make sense"
+msgstr "ścieżki „%s ...” z -a nie mają sensu"
+
+#: builtin/commit.c:1366 builtin/commit.c:1527
+msgid "show status concisely"
+msgstr "pokaż stan zwięźle"
+
+#: builtin/commit.c:1368 builtin/commit.c:1529
+msgid "show branch information"
+msgstr "pokaż informacje o gałęzi"
+
+#: builtin/commit.c:1370
+msgid "show stash information"
+msgstr "pokaż informacje o schowku"
+
+#: builtin/commit.c:1372 builtin/commit.c:1531
+msgid "compute full ahead/behind values"
+msgstr "oblicz pełne wartości przed/w tyle"
+
+#: builtin/commit.c:1374
+msgid "version"
+msgstr "wersja"
+
+#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560
+#: builtin/worktree.c:679
+msgid "machine-readable output"
+msgstr "wyjście czytelne dla maszyny"
+
+#: builtin/commit.c:1377 builtin/commit.c:1535
+msgid "show status in long format (default)"
+msgstr "pokazuj stan w długim formacie (domyślnie)"
+
+#: builtin/commit.c:1380 builtin/commit.c:1538
+msgid "terminate entries with NUL"
+msgstr "rozdziel elementy znakiem NUL"
+
+#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541
+#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
+#: builtin/fast-export.c:1204 builtin/rebase.c:1412 parse-options.h:336
+msgid "mode"
+msgstr "tryb"
+
+#: builtin/commit.c:1383 builtin/commit.c:1541
+msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
+msgstr ""
+"pokaż nieśledzone pliki, dodatkowe tryby: all, normal, no. (domyślnie all)"
+
+#: builtin/commit.c:1387
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
+msgstr ""
+"pokaż pomijane pliki, dodatkowe tryby: traditional, matching, no. (domyślnie "
+"traditional)"
+
+#: builtin/commit.c:1389 parse-options.h:192
+msgid "when"
+msgstr "kiedy"
+
+#: builtin/commit.c:1390
+msgid ""
+"ignore changes to submodules, optional when: all, dirty, untracked. "
+"(Default: all)"
+msgstr ""
+"pomiń zmiany w pod-modułach, możliwe <kiedy>: all, dirty, untracked. "
+"(domyślnie all)"
+
+#: builtin/commit.c:1392
+msgid "list untracked files in columns"
+msgstr "wypisz nieśledzone pliki w kolumnach"
+
+#: builtin/commit.c:1393
+msgid "do not detect renames"
+msgstr "nie wykrywaj zmian nazw"
+
+#: builtin/commit.c:1395
+msgid "detect renames, optionally set similarity index"
+msgstr "wykryj zmiany nazw, opcjonalnie ustaw wskaźnik podobieństwa"
+
+#: builtin/commit.c:1415
+msgid "Unsupported combination of ignored and untracked-files arguments"
+msgstr ""
+"Niewspierane połączenie argumentów o plikach nieśledzonych i pomijanych"
+
+#: builtin/commit.c:1497
+msgid "suppress summary after successful commit"
+msgstr "pomiń podsumowanie po udanym zapisie"
+
+#: builtin/commit.c:1498
+msgid "show diff in commit message template"
+msgstr "pokaż różnice w szablonie komunikatu zapisu"
+
+#: builtin/commit.c:1500
+msgid "Commit message options"
+msgstr "Opcje komunikatu zapisu"
+
+#: builtin/commit.c:1501 builtin/merge.c:286 builtin/tag.c:447
+msgid "read message from file"
+msgstr "odczytaj komunikat z pliku"
+
+#: builtin/commit.c:1502
+msgid "author"
+msgstr "autor"
+
+#: builtin/commit.c:1502
+msgid "override author for commit"
+msgstr "nadpisz autora w zapisie"
+
+#: builtin/commit.c:1503 builtin/gc.c:550
+msgid "date"
+msgstr "data"
+
+#: builtin/commit.c:1503
+msgid "override date for commit"
+msgstr "nadpisz datę zapisu"
+
+#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507
+#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:90
+msgid "commit"
+msgstr "zapis"
+
+#: builtin/commit.c:1505
+msgid "reuse and edit message from specified commit"
+msgstr "użyj komunikatu jak w podanym zapisie i edytuj go"
+
+#: builtin/commit.c:1506
+msgid "reuse message from specified commit"
+msgstr "użyj komunikatu jak w podanym zapisie"
+
+#: builtin/commit.c:1507
+msgid "use autosquash formatted message to fixup specified commit"
+msgstr ""
+"użyj komunikatu automatycznego spłaszczania, mówiącego, aby naprawić podany "
+"zapis"
+
+#: builtin/commit.c:1508
+msgid "use autosquash formatted message to squash specified commit"
+msgstr ""
+"użyj komunikatu automatycznego spłaszczania, mówiącego, aby spłaszczyć "
+"podany zapis"
+
+#: builtin/commit.c:1509
+msgid "the commit is authored by me now (used with -C/-c/--amend)"
+msgstr "ten zapis jest teraz mojego autorstwa (do użycia z -C/-c/--amend)"
+
+#: builtin/commit.c:1510 builtin/log.c:1743 builtin/merge.c:302
+#: builtin/pull.c:145 builtin/revert.c:110
+msgid "add a Signed-off-by trailer"
+msgstr "dodaj końcówkę Signed-off-by"
+
+#: builtin/commit.c:1511
+msgid "use specified template file"
+msgstr "użyj określonego pliku szablonu"
+
+#: builtin/commit.c:1512
+msgid "force edit of commit"
+msgstr "wymuś edycję zapisu"
+
+#: builtin/commit.c:1514
+msgid "include status in commit message template"
+msgstr "uwzględnij status w szablonie komunikatu zapisu"
+
+#: builtin/commit.c:1519
+msgid "Commit contents options"
+msgstr "Opcje zawartości zapisu"
+
+#: builtin/commit.c:1520
+msgid "commit all changed files"
+msgstr "złóż wszystkie zmienione pliki"
+
+#: builtin/commit.c:1521
+msgid "add specified files to index for commit"
+msgstr "dodaj podane pliki do indeksu do złożenia"
+
+#: builtin/commit.c:1522
+msgid "interactively add files"
+msgstr "interaktywnie dodaj pliki"
+
+#: builtin/commit.c:1523
+msgid "interactively add changes"
+msgstr "interaktywnie dodaj zmiany"
+
+#: builtin/commit.c:1524
+msgid "commit only specified files"
+msgstr "złóż tylko podane pliki"
+
+#: builtin/commit.c:1525
+msgid "bypass pre-commit and commit-msg hooks"
+msgstr "omiń skrypty pre-commit i commit-msg"
+
+#: builtin/commit.c:1526
+msgid "show what would be committed"
+msgstr "pokaż, co byłoby złożone"
+
+#: builtin/commit.c:1539
+msgid "amend previous commit"
+msgstr "popraw poprzedni zapis"
+
+#: builtin/commit.c:1540
+msgid "bypass post-rewrite hook"
+msgstr "omiń skrypt post-rewrite"
+
+#: builtin/commit.c:1547
+msgid "ok to record an empty change"
+msgstr "pozwól złożyć pustą zmianę"
+
+#: builtin/commit.c:1549
+msgid "ok to record a change with an empty message"
+msgstr "pozwól złożyć zmianę z pustym komunikatem"
+
+#: builtin/commit.c:1622
+#, c-format
+msgid "Corrupt MERGE_HEAD file (%s)"
+msgstr "Uszkodzony plik MERGE_HEAD (%s)"
+
+#: builtin/commit.c:1629
+msgid "could not read MERGE_MODE"
+msgstr "nie można odczytać MERGE_MODE"
+
+#: builtin/commit.c:1650
+#, c-format
+msgid "could not read commit message: %s"
+msgstr "nie można odczytać komunikatu zapisu: %s"
+
+#: builtin/commit.c:1657
+#, c-format
+msgid "Aborting commit due to empty commit message.\n"
+msgstr "Przerwano składanie z powodu pustego komunikatu zapisu.\n"
+
+#: builtin/commit.c:1662
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr "Przerywanie zapisu; nie wpisano komunikatu.\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 ""
+"repozytorium zostało zaktualizowane, ale nie można zapisać\n"
+"pliku new_index. Sprawdź, czy jest jeszcze miejsce na dysku\n"
+"i nie jest przekroczony przydział, i wykonaj „git restore --staged :/”, by "
+"się pozbierać."
+
+#: builtin/config.c:11
+msgid "git config [<options>]"
+msgstr "git config [<opcje>]"
+
+#: builtin/config.c:109 builtin/env--helper.c:27
+#, c-format
+msgid "unrecognized --type argument, %s"
+msgstr "nierozpoznany argument --type, %s"
+
+#: builtin/config.c:121
+msgid "only one type at a time"
+msgstr "tylko jeden rodzaj na raz"
+
+#: builtin/config.c:130
+msgid "Config file location"
+msgstr "Położenie pliku konfiguracyjnego"
+
+#: builtin/config.c:131
+msgid "use global config file"
+msgstr "użyj globalnego pliku konfiguracyjnego"
+
+#: builtin/config.c:132
+msgid "use system config file"
+msgstr "użyj pliku konfiguracyjnego systemu"
+
+#: builtin/config.c:133
+msgid "use repository config file"
+msgstr "użyj pliku konfiguracyjnego repozytorium"
+
+#: builtin/config.c:134
+msgid "use per-worktree config file"
+msgstr "użyj pliku konfiguracyjnego drzewa roboczego"
+
+#: builtin/config.c:135
+msgid "use given config file"
+msgstr "użyj podanego pliku konfiguracyjnego"
+
+#: builtin/config.c:136
+msgid "blob-id"
+msgstr "id-blobu"
+
+#: builtin/config.c:136
+msgid "read config from given blob object"
+msgstr "odczytaj ustawienia z podanego obiektu blob"
+
+#: builtin/config.c:137
+msgid "Action"
+msgstr "Działanie"
+
+#: builtin/config.c:138
+msgid "get value: name [value-pattern]"
+msgstr "pobierz wartość: nazwa [wzorzec-wartości]"
+
+#: builtin/config.c:139
+msgid "get all values: key [value-pattern]"
+msgstr "pobierz wszystkie wartości: klucz [wzorzec-wartości]"
+
+#: builtin/config.c:140
+msgid "get values for regexp: name-regex [value-pattern]"
+msgstr ""
+"pobierz wartości wyrażenia regularnego: wyr-reg-nazwy [wzorzec-wartości]"
+
+#: builtin/config.c:141
+msgid "get value specific for the URL: section[.var] URL"
+msgstr "pobierz wartość typową dla adresu URL: rozdział[.zmienna] adres"
+
+#: builtin/config.c:142
+msgid "replace all matching variables: name value [value-pattern]"
+msgstr "zastąp wszystkie pasujące zmienne: nazwa wartość [wzorzec-wartości]"
+
+#: builtin/config.c:143
+msgid "add a new variable: name value"
+msgstr "dodaj nową zmienną: nazwa wartość"
+
+#: builtin/config.c:144
+msgid "remove a variable: name [value-pattern]"
+msgstr "usuń zmienną: nazwa [wzorzec-wartości]"
+
+#: builtin/config.c:145
+msgid "remove all matches: name [value-pattern]"
+msgstr "usuń wszystkie dopasowania: nazwa [wzorzec-wartości]"
+
+#: builtin/config.c:146
+msgid "rename section: old-name new-name"
+msgstr "zmień nazwę rozdziału: stara-nazwa nowa-nazwa"
+
+#: builtin/config.c:147
+msgid "remove a section: name"
+msgstr "usuń rozdział: nazwa"
+
+#: builtin/config.c:148
+msgid "list all"
+msgstr "wypisz wszystko"
+
+#: builtin/config.c:149
+msgid "use string equality when comparing values to 'value-pattern'"
+msgstr ""
+"użyj równości łańcuchów przy porównywaniu wartości do „wzorca-wartości”"
+
+#: builtin/config.c:150
+msgid "open an editor"
+msgstr "otwórz edytor"
+
+#: builtin/config.c:151
+msgid "find the color configured: slot [default]"
+msgstr "znajdź ustawiony kolor: nazwa [domyślny]"
+
+#: builtin/config.c:152
+msgid "find the color setting: slot [stdout-is-tty]"
+msgstr "znajdź ustawienie koloru: nazwa [stdout-jest-tty]"
+
+#: builtin/config.c:153
+msgid "Type"
+msgstr "Rodzaj"
+
+#: builtin/config.c:154 builtin/env--helper.c:43
+msgid "value is given this type"
+msgstr "wartość dostaje ten typ"
+
+#: builtin/config.c:155
+msgid "value is \"true\" or \"false\""
+msgstr "wartość to \"true\" lub \"false\""
+
+#: builtin/config.c:156
+msgid "value is decimal number"
+msgstr "wartość jest liczbą dziesiętną"
+
+#: builtin/config.c:157
+msgid "value is --bool or --int"
+msgstr "wartość to --bool lub --int"
+
+#: builtin/config.c:158
+msgid "value is --bool or string"
+msgstr "wartość to --bool lub łańcuch"
+
+#: builtin/config.c:159
+msgid "value is a path (file or directory name)"
+msgstr "wartość jest ścieżką (nazwą pliku lub katalogu)"
+
+#: builtin/config.c:160
+msgid "value is an expiry date"
+msgstr "wartość jest datą wygaśnięcia"
+
+#: builtin/config.c:161
+msgid "Other"
+msgstr "Inne"
+
+#: builtin/config.c:162
+msgid "terminate values with NUL byte"
+msgstr "zakończ wartości znakiem NUL"
+
+#: builtin/config.c:163
+msgid "show variable names only"
+msgstr "pokazuj tylko nazwy zmiennych"
+
+#: builtin/config.c:164
+msgid "respect include directives on lookup"
+msgstr "uszanuj dyrektywy załączające (include) przy wyszukaniu"
+
+#: builtin/config.c:165
+msgid "show origin of config (file, standard input, blob, command line)"
+msgstr ""
+"pokaż pochodzenie konfiguracji (plik, standardowe wejście, blob, wiersz "
+"poleceń)"
+
+#: builtin/config.c:166
+msgid "show scope of config (worktree, local, global, system, command)"
+msgstr ""
+"pokaż zasięg konfiguracji (drzewo robocze, lokalny, globalny, system, "
+"polecenie)"
+
+#: builtin/config.c:167 builtin/env--helper.c:45
+msgid "value"
+msgstr "wartość"
+
+#: builtin/config.c:167
+msgid "with --get, use default value when missing entry"
+msgstr "przy --get użyj domyślnej wartości, jeśli wpisu nie ma"
+
+#: builtin/config.c:181
+#, c-format
+msgid "wrong number of arguments, should be %d"
+msgstr "zła liczba argumentów, powinna być %d"
+
+#: builtin/config.c:183
+#, c-format
+msgid "wrong number of arguments, should be from %d to %d"
+msgstr "zła liczba argumentów, powinna być od %d do %d"
+
+#: builtin/config.c:339
+#, c-format
+msgid "invalid key pattern: %s"
+msgstr "nieprawidłowy wzorzec klucza: %s"
+
+#: builtin/config.c:377
+#, c-format
+msgid "failed to format default config value: %s"
+msgstr "nie można sformatować domyślnej wartości ustawienia: %s"
+
+#: builtin/config.c:441
+#, c-format
+msgid "cannot parse color '%s'"
+msgstr "nie można przetworzyć koloru „%s”"
+
+#: builtin/config.c:483
+msgid "unable to parse default color value"
+msgstr "nie można przetworzyć domyślnej wartości koloru"
+
+#: builtin/config.c:536 builtin/config.c:833
+msgid "not in a git directory"
+msgstr "nie jesteśmy w katalogu gita"
+
+#: builtin/config.c:539
+msgid "writing to stdin is not supported"
+msgstr "pisanie na standardowe wejście nie jest wspierane"
+
+#: builtin/config.c:542
+msgid "writing config blobs is not supported"
+msgstr "zapisywanie blobów konfiguracji nie jest wspierane"
+
+#: builtin/config.c:627
+#, 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 ""
+"# To jest plik konfiguracyjny użytkownika Gita.\n"
+"[user]\n"
+"# Dostosuj i odkomentuj poniższe wiersze:\n"
+"#\tname = %s\n"
+"#\temail = %s\n"
+
+#: builtin/config.c:652
+msgid "only one config file at a time"
+msgstr "tylko jeden plik konfiguracyjny na raz"
+
+#: builtin/config.c:658
+msgid "--local can only be used inside a git repository"
+msgstr "--local może być użyty tylko w repozytorium gita"
+
+#: builtin/config.c:660
+msgid "--blob can only be used inside a git repository"
+msgstr "--blob może być użyty tylko w repozytorium gita"
+
+#: builtin/config.c:662
+msgid "--worktree can only be used inside a git repository"
+msgstr "--worktree może być użyte tylko w repozytorium gita"
+
+#: builtin/config.c:684
+msgid "$HOME not set"
+msgstr "nie ustawiono $HOME"
+
+#: builtin/config.c:708
+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 ""
+"nie można użyć --worktree z wieloma drzewami roboczymi, chyba że włączono\n"
+"rozszerzenie konfiguracji worktreeConfig. Więcej szczegółów w rozdziale\n"
+"„CONFIGURATION FILE” w „git help worktree”"
+
+#: builtin/config.c:743
+msgid "--get-color and variable type are incoherent"
+msgstr "--get-color i typ zmiennej się wykluczają"
+
+#: builtin/config.c:748
+msgid "only one action at a time"
+msgstr "tylko jedno działanie na raz"
+
+#: builtin/config.c:761
+msgid "--name-only is only applicable to --list or --get-regexp"
+msgstr "--name-only stosuje się tylko do --list lub --get-regexp"
+
+#: builtin/config.c:767
+msgid ""
+"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
+"list"
+msgstr ""
+"--show-origin stosuje się tylko do --get, --get-all, --get-regexp i --list"
+
+#: builtin/config.c:773
+msgid "--default is only applicable to --get"
+msgstr "--default stosuje się tylko do --get"
+
+#: builtin/config.c:806
+msgid "--fixed-value only applies with 'value-pattern'"
+msgstr "--fixed-value stosuje się tylko do „wzorca-wartości”"
+
+#: builtin/config.c:822
+#, c-format
+msgid "unable to read config file '%s'"
+msgstr "nie można odczytać pliku ustawień „%s”"
+
+#: builtin/config.c:825
+msgid "error processing config file(s)"
+msgstr "błąd przetwarzania plików konfiguracyjnych"
+
+#: builtin/config.c:835
+msgid "editing stdin is not supported"
+msgstr "edycja standardowego wejścia jest niewspierana"
+
+#: builtin/config.c:837
+msgid "editing blobs is not supported"
+msgstr "edycja blobów jest niewspierana"
+
+#: builtin/config.c:851
+#, c-format
+msgid "cannot create configuration file %s"
+msgstr "nie można utworzyć pliku konfiguracyjnego %s"
+
+#: builtin/config.c:864
+#, c-format
+msgid ""
+"cannot overwrite multiple values with a single value\n"
+" Use a regexp, --add or --replace-all to change %s."
+msgstr ""
+"nie można nadpisać wielu wartości jedną wartością\n"
+" Użyj wyrażenia regularnego, --add lub --replace-all, aby zmienić %s."
+
+#: builtin/config.c:943 builtin/config.c:954
+#, c-format
+msgid "no such section: %s"
+msgstr "nie ma takiego rozdziału: %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 "wypisz rozmiary w formacie czytelnym dla człowieka"
+
+#: 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 ""
+"Uprawnienia do twojego katalogu gniazd są zbyt swobodne; inni\n"
+"użytkownicy mogą odczytać twoje przechowywane poświadczenia. Rozważ użycie:\n"
+"\n"
+"\tchmod 0700 %s"
+
+#: builtin/credential-cache--daemon.c:275
+msgid "print debugging messages to stderr"
+msgstr "wypisuj informacje diagnostyczne na stderr"
+
+#: builtin/credential-cache--daemon.c:315
+msgid "credential-cache--daemon unavailable; no unix socket support"
+msgstr "credential-cache--daemon niedostępny; brak wsparcia dla gniazd uniksa"
+
+#: builtin/credential-cache.c:154
+msgid "credential-cache unavailable; no unix socket support"
+msgstr "credential-cache niedostępna; brak wsparcia dla gniazd uniksa"
+
+#: builtin/credential-store.c:66
+#, c-format
+msgid "unable to get credential storage lock in %d ms"
+msgstr "nie można uzyskać blokady magazynu poświadczeń w %d ms"
+
+#: builtin/describe.c:26
+msgid "git describe [<options>] [<commit-ish>...]"
+msgstr "git describe [<opcje>] [<zapis>...]"
+
+#: builtin/describe.c:27
+msgid "git describe [<options>] --dirty"
+msgstr "git describe [<opcje>] --dirty"
+
+#: builtin/describe.c:63
+msgid "head"
+msgstr "czoło"
+
+#: builtin/describe.c:63
+msgid "lightweight"
+msgstr "lekkie"
+
+#: builtin/describe.c:63
+msgid "annotated"
+msgstr "opisany"
+
+#: builtin/describe.c:277
+#, c-format
+msgid "annotated tag %s not available"
+msgstr "opisany tag %s niedostępny"
+
+#: builtin/describe.c:281
+#, c-format
+msgid "tag '%s' is externally known as '%s'"
+msgstr "tag „%s” jest znany na zewnątrz jako „%s”"
+
+#: builtin/describe.c:328
+#, c-format
+msgid "no tag exactly matches '%s'"
+msgstr "żaden tag nie pasuje dokładnie do „%s”"
+
+#: builtin/describe.c:330
+#, c-format
+msgid "No exact match on refs or tags, searching to describe\n"
+msgstr ""
+"Brak dokładnych dopasowań do referencji i tagów, szukanie, aby opisać\n"
+
+#: builtin/describe.c:397
+#, c-format
+msgid "finished search at %s\n"
+msgstr "zakończono wyszukiwanie na %s\n"
+
+#: builtin/describe.c:424
+#, c-format
+msgid ""
+"No annotated tags can describe '%s'.\n"
+"However, there were unannotated tags: try --tags."
+msgstr ""
+"Żaden opisany tag nie może opisać „%s”.\n"
+"Ale są jeszcze nieopisane: spróbuj --tags."
+
+#: builtin/describe.c:428
+#, c-format
+msgid ""
+"No tags can describe '%s'.\n"
+"Try --always, or create some tags."
+msgstr ""
+"Żaden tag nie może opisać „%s”.\n"
+"Spróbuj --always, lub utwórz jakieś tagi."
+
+#: builtin/describe.c:458
+#, c-format
+msgid "traversed %lu commits\n"
+msgstr "przebyto %lu zapisów\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 ""
+"znaleziono ponad %i tagów; wypisano %i najświeższych\n"
+"poddano się przy %s\n"
+
+#: builtin/describe.c:529
+#, c-format
+msgid "describe %s\n"
+msgstr "opisywanie %s\n"
+
+#: builtin/describe.c:532
+#, c-format
+msgid "Not a valid object name %s"
+msgstr "Nieprawidłowa nazwa obiektu %s"
+
+#: builtin/describe.c:540
+#, c-format
+msgid "%s is neither a commit nor blob"
+msgstr "%s nie jest ani zapisem, ani blobem"
+
+#: builtin/describe.c:554
+msgid "find the tag that comes after the commit"
+msgstr "znajdź tag, który następuje po tym zapisie"
+
+#: builtin/describe.c:555
+msgid "debug search strategy on stderr"
+msgstr "strategia wyszukiwania na standardowe wyjście diagnostyczne"
+
+#: builtin/describe.c:556
+msgid "use any ref"
+msgstr "użyj dowolnej referencji"
+
+#: builtin/describe.c:557
+msgid "use any tag, even unannotated"
+msgstr "użyj dowolnego tagu, nawet nieopisanego"
+
+#: builtin/describe.c:558
+msgid "always use long format"
+msgstr "zawsze używaj długiego formatu"
+
+#: builtin/describe.c:559
+msgid "only follow first parent"
+msgstr "pokaż tylko pierwszego rodzica"
+
+#: builtin/describe.c:562
+msgid "only output exact matches"
+msgstr "zwracaj tylko dokładne dopasowania"
+
+#: builtin/describe.c:564
+msgid "consider <n> most recent tags (default: 10)"
+msgstr "uwzględnij <n> najświeższych tagów (domyślnie: 10)"
+
+#: builtin/describe.c:566
+msgid "only consider tags matching <pattern>"
+msgstr "uwzględnij tylko tagi pasujące do <wzorca>"
+
+#: builtin/describe.c:568
+msgid "do not consider tags matching <pattern>"
+msgstr "nie uwzględniaj tagów pasujących do <wzorca>"
+
+#: builtin/describe.c:570 builtin/name-rev.c:535
+msgid "show abbreviated commit object as fallback"
+msgstr "pokaż skrócony obiekt zapisu w razie braku"
+
+#: builtin/describe.c:571 builtin/describe.c:574
+msgid "mark"
+msgstr "znamię"
+
+#: builtin/describe.c:572
+msgid "append <mark> on dirty working tree (default: \"-dirty\")"
+msgstr "dodaj <znamię> do brudnego drzewa roboczego (domyślnie „-dirty”)"
+
+#: builtin/describe.c:575
+msgid "append <mark> on broken working tree (default: \"-broken\")"
+msgstr "dodaj <znamię> do zepsutego drzewa roboczego (domyślnie „-broken”)"
+
+#: builtin/describe.c:593
+msgid "--long is incompatible with --abbrev=0"
+msgstr "--long i --abbrev=0 się wykluczają"
+
+#: builtin/describe.c:622
+msgid "No names found, cannot describe anything."
+msgstr "Nie znaleziono nazw, nie można nic opisać."
+
+#: builtin/describe.c:673
+msgid "--dirty is incompatible with commit-ishes"
+msgstr "--dirty i zapisy się wykluczają"
+
+#: builtin/describe.c:675
+msgid "--broken is incompatible with commit-ishes"
+msgstr "--broken i zapisy się wykluczają"
+
+#: builtin/diff-tree.c:155
+msgid "--stdin and --merge-base are mutually exclusive"
+msgstr "--stdin i --merge-base się wykluczają"
+
+#: builtin/diff-tree.c:157
+msgid "--merge-base only works with two commits"
+msgstr "--merge-base działa tylko z dwoma zapisami"
+
+#: builtin/diff.c:92
+#, c-format
+msgid "'%s': not a regular file or symlink"
+msgstr "„%s”: nie jest zwykłym plikiem ani dowiązaniem"
+
+#: builtin/diff.c:259
+#, c-format
+msgid "invalid option: %s"
+msgstr "nieprawidłowa opcja: %s"
+
+#: builtin/diff.c:376
+#, c-format
+msgid "%s...%s: no merge base"
+msgstr "%s...%s: brak podstawy scalenia"
+
+#: builtin/diff.c:486
+msgid "Not a git repository"
+msgstr "To nie jest repozytorium gita"
+
+#: builtin/diff.c:532 builtin/grep.c:682
+#, c-format
+msgid "invalid object '%s' given."
+msgstr "podano nieprawidłowy obiekt „%s”."
+
+#: builtin/diff.c:543
+#, c-format
+msgid "more than two blobs given: '%s'"
+msgstr "podano ponad dwa bloby: „%s”"
+
+#: builtin/diff.c:548
+#, c-format
+msgid "unhandled object '%s' given."
+msgstr "otrzymano nieobsługiwany obiekt „%s”."
+
+#: builtin/diff.c:582
+#, c-format
+msgid "%s...%s: multiple merge bases, using %s"
+msgstr "%s...%s: wiele podstaw scalenia, używanie %s"
+
+#: builtin/difftool.c:30
+msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
+msgstr "git difftool [<opcje>] [<zapis> [<zapis>]] [--] [<ścieżka>...]"
+
+#: builtin/difftool.c:260
+#, c-format
+msgid "failed: %d"
+msgstr "nie powiodło się: %d"
+
+#: builtin/difftool.c:302
+#, c-format
+msgid "could not read symlink %s"
+msgstr "nie można odczytać dowiązania symbolicznego %s"
+
+#: builtin/difftool.c:304
+#, c-format
+msgid "could not read symlink file %s"
+msgstr "nie można odczytać pliku dowiązania symbolicznego %s"
+
+#: builtin/difftool.c:312
+#, c-format
+msgid "could not read object %s for symlink %s"
+msgstr "nie można odczytać obiektu %s dowiązania symbolicznego %s"
+
+#: builtin/difftool.c:412
+msgid ""
+"combined diff formats('-c' and '--cc') are not supported in\n"
+"directory diff mode('-d' and '--dir-diff')."
+msgstr ""
+"złączone formaty różnic („-c” i „--cc”) nie są wspierane w\n"
+"trybie różnic katalogu („-d” i „--dir-diff”)."
+
+#: builtin/difftool.c:633
+#, c-format
+msgid "both files modified: '%s' and '%s'."
+msgstr "oba pliki zmienione: „%s” i „%s”."
+
+#: builtin/difftool.c:635
+msgid "working tree file has been left."
+msgstr "plik z drzewem roboczym został opuszczony."
+
+#: builtin/difftool.c:646
+#, c-format
+msgid "temporary files exist in '%s'."
+msgstr "istnieją tymczasowe pliki w „%s”."
+
+#: builtin/difftool.c:647
+msgid "you may want to cleanup or recover these."
+msgstr "możesz chcieć je wyczyścić lub odzyskać."
+
+#: builtin/difftool.c:696
+msgid "use `diff.guitool` instead of `diff.tool`"
+msgstr "użyj „diff.guitool” zamiast „diff.tool”"
+
+#: builtin/difftool.c:698
+msgid "perform a full-directory diff"
+msgstr "zbadaj różnice całych katalogów"
+
+#: builtin/difftool.c:700
+msgid "do not prompt before launching a diff tool"
+msgstr "nie pytaj przed uruchomieniem narzędzia różnic"
+
+#: builtin/difftool.c:705
+msgid "use symlinks in dir-diff mode"
+msgstr "użyj dowiązań symbolicznych w trybie różnic katalogów"
+
+#: builtin/difftool.c:706
+msgid "tool"
+msgstr "narzędzie"
+
+#: builtin/difftool.c:707
+msgid "use the specified diff tool"
+msgstr "użyj podanego narzędzia różnic"
+
+#: builtin/difftool.c:709
+msgid "print a list of diff tools that may be used with `--tool`"
+msgstr "wypisz listę narzędzi różnic możliwych do użycia z „--tool”"
+
+#: builtin/difftool.c:712
+msgid ""
+"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"code"
+msgstr ""
+"niech „git-difftool” wyjdzie, kiedy wywołane narzędzie różnic zwróci "
+"niezerowy kod wyjścia"
+
+#: builtin/difftool.c:715
+msgid "specify a custom command for viewing diffs"
+msgstr "podaj niestandardowe polecenie do wyświetlania różnic"
+
+#: builtin/difftool.c:716
+msgid "passed to `diff`"
+msgstr "przekazywane do „diff”"
+
+#: builtin/difftool.c:731
+msgid "difftool requires worktree or --no-index"
+msgstr "difftool wymaga drzewa roboczego lub --no-index"
+
+#: builtin/difftool.c:738
+msgid "--dir-diff is incompatible with --no-index"
+msgstr "--dir-diff i --no-index się wykluczają"
+
+#: builtin/difftool.c:741
+msgid "--gui, --tool and --extcmd are mutually exclusive"
+msgstr "--gui, --tool i --extcmd się wykluczają"
+
+#: builtin/difftool.c:749
+msgid "no <tool> given for --tool=<tool>"
+msgstr "nie podano <narzędzia> do --tool=<narzędzie>"
+
+#: builtin/difftool.c:756
+msgid "no <cmd> given for --extcmd=<cmd>"
+msgstr "nie podano <polecenia> do --extcmd=<polecenie>"
+
+#: builtin/env--helper.c:6
+msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
+msgstr "git env--helper --type=[bool|ulong] <opcje> <zmienna-środ>"
+
+#: builtin/env--helper.c:42 builtin/hash-object.c:98
+msgid "type"
+msgstr "rodzaj"
+
+#: builtin/env--helper.c:46
+msgid "default for git_env_*(...) to fall back on"
+msgstr "domyślna wartość git_env_*(...), do której się uciec"
+
+#: builtin/env--helper.c:48
+msgid "be quiet only use git_env_*() value as exit code"
+msgstr "bądź cicho, użyj tylko wartości git_env_*() jako kodu wyjścia"
+
+#: builtin/env--helper.c:67
+#, c-format
+msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
+msgstr ""
+"opcja „--default” oczekuje przy „--type=bool” wartości logicznej, nie „%s”"
+
+#: builtin/env--helper.c:82
+#, c-format
+msgid ""
+"option `--default' expects an unsigned long value with `--type=ulong`, not `"
+"%s`"
+msgstr ""
+"opcja „--default” oczekuje przy „--type=ulong” długiej wartości bez znaku, "
+"nie „%s”"
+
+#: builtin/fast-export.c:29
+msgid "git fast-export [rev-list-opts]"
+msgstr "git fast-export [opcje-listy-rewizji]"
+
+#: builtin/fast-export.c:868
+msgid "Error: Cannot export nested tags unless --mark-tags is specified."
+msgstr ""
+"Błąd: Nie można wyeksportować zagnieżdżonych tagów, jeśli nie podano --mark-"
+"tags."
+
+#: builtin/fast-export.c:1177
+msgid "--anonymize-map token cannot be empty"
+msgstr "żeton --anonymize-map nie może być pusty"
+
+#: builtin/fast-export.c:1197
+msgid "show progress after <n> objects"
+msgstr "pokaż wskaźnik postępu po <n> obiektach"
+
+#: builtin/fast-export.c:1199
+msgid "select handling of signed tags"
+msgstr "wybierz traktowanie podpisanych tagów"
+
+#: builtin/fast-export.c:1202
+msgid "select handling of tags that tag filtered objects"
+msgstr "wybierz traktowanie tagów przypisanych do filtrowanych obiektów"
+
+#: builtin/fast-export.c:1205
+msgid "select handling of commit messages in an alternate encoding"
+msgstr "wybierz traktowanie komunikatów zapisów w alternatywnym kodowaniu"
+
+#: builtin/fast-export.c:1208
+msgid "dump marks to this file"
+msgstr "zrzuć znaczniki to tego pliku"
+
+#: builtin/fast-export.c:1210
+msgid "import marks from this file"
+msgstr "wczytaj znaczniki z tego pliku"
+
+#: builtin/fast-export.c:1214
+msgid "import marks from this file if it exists"
+msgstr "wczytaj znaczniki z tego pliku, jeśli istnieje"
+
+#: builtin/fast-export.c:1216
+msgid "fake a tagger when tags lack one"
+msgstr "zmyśl tagującego w tagach, które go nie mają"
+
+#: builtin/fast-export.c:1218
+msgid "output full tree for each commit"
+msgstr "wypisz pełne drzewo dla każdego zapisu"
+
+#: builtin/fast-export.c:1220
+msgid "use the done feature to terminate the stream"
+msgstr "użyj funkcji done, żeby zakończyć strumień"
+
+#: builtin/fast-export.c:1221
+msgid "skip output of blob data"
+msgstr "pomiń wypisywanie danych binarnych"
+
+#: builtin/fast-export.c:1222 builtin/log.c:1815
+msgid "refspec"
+msgstr "referencja"
+
+#: builtin/fast-export.c:1223
+msgid "apply refspec to exported refs"
+msgstr "zastosuj referencję do wyeksportowanych referencji"
+
+#: builtin/fast-export.c:1224
+msgid "anonymize output"
+msgstr "anonimizuj wyjście"
+
+#: builtin/fast-export.c:1225
+msgid "from:to"
+msgstr "od:do"
+
+#: builtin/fast-export.c:1226
+msgid "convert <from> to <to> in anonymized output"
+msgstr "zamień <z> na <na> w zanonimizowanym wyjściu"
+
+#: builtin/fast-export.c:1229
+msgid "reference parents which are not in fast-export stream by object id"
+msgstr ""
+"odwołaj się do rodziców, którzy nie są w strumieniu szybkiego eksportu, "
+"według identyfikatora obiektu"
+
+#: builtin/fast-export.c:1231
+msgid "show original object ids of blobs/commits"
+msgstr "pokaż pierwotne identyfikatory obiektów blobów/zapisów"
+
+#: builtin/fast-export.c:1233
+msgid "label tags with mark ids"
+msgstr "oznacz tagi identyfikatorami znaczników"
+
+#: builtin/fast-export.c:1256
+msgid "--anonymize-map without --anonymize does not make sense"
+msgstr "--anonymize nie ma sensu bez --anonymize"
+
+#: builtin/fast-export.c:1271
+msgid "Cannot pass both --import-marks and --import-marks-if-exists"
+msgstr "Nie można przekazać i --import-marks i --import-marks-if-exists"
+
+#: builtin/fast-import.c:3088
+#, c-format
+msgid "Missing from marks for submodule '%s'"
+msgstr "Brakujące znaczniki od z pod-modułu „%s”"
+
+#: builtin/fast-import.c:3090
+#, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr "Brakujące znaczniki do z pod-modułu „%s”"
+
+#: builtin/fast-import.c:3225
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr "Oczekiwano polecenia „mark”, otrzymano %s"
+
+#: builtin/fast-import.c:3230
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr "Oczekiwano polecenia „do”, otrzymano %s"
+
+#: builtin/fast-import.c:3322
+msgid "Expected format name:filename for submodule rewrite option"
+msgstr ""
+"W opcji przeredagowania pod-modułu oczekiwano formatu nazwa:nazwa-pliku"
+
+#: builtin/fast-import.c:3377
+#, c-format
+msgid "feature '%s' forbidden in input without --allow-unsafe-features"
+msgstr "funkcja „%s” zabroniona na wejściu bez --allow-unsafe-features"
+
+#: builtin/fetch-pack.c:242
+#, c-format
+msgid "Lockfile created but not reported: %s"
+msgstr "Utworzono plik blokady, ale go nie zgłoszono: %s"
+
+#: builtin/fetch.c:35
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+msgstr "git fetch [<opcje>] [<repozytorium> [<referencja>...]]"
+
+#: builtin/fetch.c:36
+msgid "git fetch [<options>] <group>"
+msgstr "git fetch [<opcje>] <grupa>"
+
+#: builtin/fetch.c:37
+msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+msgstr "git fetch --multiple [<opcje>] [(<repozytorium> | <grupa>)...]"
+
+#: builtin/fetch.c:38
+msgid "git fetch --all [<options>]"
+msgstr "git fetch --all [<opcje>]"
+
+#: builtin/fetch.c:120
+msgid "fetch.parallel cannot be negative"
+msgstr "fetch.parallel nie może być ujemne"
+
+#: builtin/fetch.c:143 builtin/pull.c:185
+msgid "fetch from all remotes"
+msgstr "pobierz ze wszystkich zdalnych repozytoriów"
+
+#: builtin/fetch.c:145 builtin/pull.c:245
+msgid "set upstream for git pull/fetch"
+msgstr "ustaw gałąź nadrzędną do git pull/fetch"
+
+#: builtin/fetch.c:147 builtin/pull.c:188
+msgid "append to .git/FETCH_HEAD instead of overwriting"
+msgstr "dopisz do .git/FETCH_HEAD zamiast nadpisywać"
+
+#: builtin/fetch.c:149
+msgid "use atomic transaction to update references"
+msgstr "zażądaj atomowej transakcji do aktualizacji referencji"
+
+#: builtin/fetch.c:151 builtin/pull.c:191
+msgid "path to upload pack on remote end"
+msgstr "ścieżka do wysyłania paczki po zdalnej stronie"
+
+#: builtin/fetch.c:152
+msgid "force overwrite of local reference"
+msgstr "wymuś nadpisanie lokalnej referencji"
+
+#: builtin/fetch.c:154
+msgid "fetch from multiple remotes"
+msgstr "pobierz z wielu zdalnych repozytoriów"
+
+#: builtin/fetch.c:156 builtin/pull.c:195
+msgid "fetch all tags and associated objects"
+msgstr "pobierz wszystkie tagi i powiązane obiekty"
+
+#: builtin/fetch.c:158
+msgid "do not fetch all tags (--no-tags)"
+msgstr "nie pobieraj wszystkich tagów (--no-tags)"
+
+#: builtin/fetch.c:160
+msgid "number of submodules fetched in parallel"
+msgstr "liczba pod-modułów pobieranych równolegle"
+
+#: builtin/fetch.c:162 builtin/pull.c:198
+msgid "prune remote-tracking branches no longer on remote"
+msgstr "przytnij gałęzie śledzące usunięte ze zdalnego repozytorium"
+
+#: builtin/fetch.c:164
+msgid "prune local tags no longer on remote and clobber changed tags"
+msgstr ""
+"przytnij lokalne tagi, których już nie ma w zdalnym repozytorium, i nadpisz "
+"zmienione tagi"
+
+#: builtin/fetch.c:165 builtin/fetch.c:190 builtin/pull.c:122
+msgid "on-demand"
+msgstr "on-demand"
+
+#: builtin/fetch.c:166
+msgid "control recursive fetching of submodules"
+msgstr "steruj rekurencyjnym pobieraniem pod-modułów"
+
+#: builtin/fetch.c:171
+msgid "write fetched references to the FETCH_HEAD file"
+msgstr "zapisz pobrane referencje do pliku FETCH_HEAD"
+
+#: builtin/fetch.c:172 builtin/pull.c:206
+msgid "keep downloaded pack"
+msgstr "zachowaj pobraną paczkę"
+
+#: builtin/fetch.c:174
+msgid "allow updating of HEAD ref"
+msgstr "zezwól na aktualizację referencji HEAD"
+
+#: builtin/fetch.c:177 builtin/fetch.c:183 builtin/pull.c:209
+#: builtin/pull.c:218
+msgid "deepen history of shallow clone"
+msgstr "pogłęb historię płytkiego klonu"
+
+#: builtin/fetch.c:179 builtin/pull.c:212
+msgid "deepen history of shallow repository based on time"
+msgstr "pogłęb historię płytkiego repozytorium według czasu"
+
+#: builtin/fetch.c:185 builtin/pull.c:221
+msgid "convert to a complete repository"
+msgstr "przekształć w pełne repozytorium"
+
+#: builtin/fetch.c:188
+msgid "prepend this to submodule path output"
+msgstr "dodaj to przed wyjściem ścieżki pod-modułu"
+
+#: builtin/fetch.c:191
+msgid ""
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
+msgstr ""
+"domyślnie w rekurencyjnym pobieraniu pod-modułów (niższy priorytet niż pliki "
+"konfiguracji)"
+
+#: builtin/fetch.c:195 builtin/pull.c:224
+msgid "accept refs that update .git/shallow"
+msgstr "przyjmuj referencje, które aktualizują .git/shallow"
+
+#: builtin/fetch.c:196 builtin/pull.c:226
+msgid "refmap"
+msgstr "mapowanie"
+
+#: builtin/fetch.c:197 builtin/pull.c:227
+msgid "specify fetch refmap"
+msgstr "podaj mapę referencji do pobrania"
+
+#: builtin/fetch.c:204 builtin/pull.c:240
+msgid "report that we have only objects reachable from this object"
+msgstr "zgłaszaj, że mamy tylko obiekty osiągalne z tego obiektu"
+
+#: builtin/fetch.c:207 builtin/fetch.c:209
+msgid "run 'maintenance --auto' after fetching"
+msgstr "wykonaj „maintenance --auto” po pobraniu"
+
+#: builtin/fetch.c:211 builtin/pull.c:243
+msgid "check for forced-updates on all updated branches"
+msgstr ""
+"sprawdź na wszystkich zaktualizowanych gałęziach, czy wystąpiły wymuszone "
+"aktualizacje"
+
+#: builtin/fetch.c:213
+msgid "write the commit-graph after fetching"
+msgstr "wypisz graf zapisów po pobraniu"
+
+#: builtin/fetch.c:215
+msgid "accept refspecs from stdin"
+msgstr "przyjmuj referencje ze standardowego wejścia"
+
+#: builtin/fetch.c:526
+msgid "Couldn't find remote ref HEAD"
+msgstr "Nie znaleziono zdalnej referencji HEAD"
+
+#: builtin/fetch.c:697
+#, c-format
+msgid "configuration fetch.output contains invalid value %s"
+msgstr "ustawienie fetch.output zawiera nieprawidłową wartość %s"
+
+#: builtin/fetch.c:796
+#, c-format
+msgid "object %s not found"
+msgstr "nie znaleziono obiektu %s"
+
+#: builtin/fetch.c:800
+msgid "[up to date]"
+msgstr "[aktualne]"
+
+#: builtin/fetch.c:813 builtin/fetch.c:829 builtin/fetch.c:901
+msgid "[rejected]"
+msgstr "[odrzucono]"
+
+#: builtin/fetch.c:814
+msgid "can't fetch in current branch"
+msgstr "nie można pobrać na bieżącej gałęzi"
+
+#: builtin/fetch.c:824
+msgid "[tag update]"
+msgstr "[aktualizacja tagu]"
+
+#: builtin/fetch.c:825 builtin/fetch.c:862 builtin/fetch.c:884
+#: builtin/fetch.c:896
+msgid "unable to update local ref"
+msgstr "nie można zaktualizować lokalnej referencji"
+
+#: builtin/fetch.c:829
+msgid "would clobber existing tag"
+msgstr "nadpisałoby istniejący tag"
+
+#: builtin/fetch.c:851
+msgid "[new tag]"
+msgstr "[nowy tag]"
+
+#: builtin/fetch.c:854
+msgid "[new branch]"
+msgstr "[nowa gałąź]"
+
+#: builtin/fetch.c:857
+msgid "[new ref]"
+msgstr "[nowa referencja]"
+
+#: builtin/fetch.c:896
+msgid "forced update"
+msgstr "wymuszona aktualizacja"
+
+#: builtin/fetch.c:901
+msgid "non-fast-forward"
+msgstr "nieprzewinięte"
+
+#: builtin/fetch.c:1005
+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 ""
+"Pobranie zwykle wskazuje, które gałęzie miały wymuszoną aktualizację,\n"
+"ale to sprawdzenie zostało wyłączone. Aby włączyć je ponownie,\n"
+"użyj flagi „--show-forced-updates” lub wykonaj\n"
+"„git fetch.showForcedUpdates true”."
+
+#: builtin/fetch.c:1009
+#, 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 ""
+"Sprawdzenie wymuszonych aktualizacji zajęło %.2f sekund. Możesz użyć\n"
+"„--no-show-forced-updates” lub wykonać „git config fetch.showForcedUpdates "
+"false”\n"
+" aby uniknąć tego sprawdzenia.\n"
+
+#: builtin/fetch.c:1041
+#, c-format
+msgid "%s did not send all necessary objects\n"
+msgstr "%s nie wysłał wszystkich potrzebnych obiektów\n"
+
+#: builtin/fetch.c:1069
+#, c-format
+msgid "reject %s because shallow roots are not allowed to be updated"
+msgstr "odrzucanie %s, bo nie można aktualizować płytkich korzeni"
+
+#: builtin/fetch.c:1146 builtin/fetch.c:1297
+#, c-format
+msgid "From %.*s\n"
+msgstr "Z %.*s\n"
+
+#: builtin/fetch.c:1168
+#, c-format
+msgid ""
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
+msgstr ""
+"nie można zaktualizować niektórych lokalnych referencji;\n"
+" spróbuj wykonać „git remote prune %s”, aby usunąć stare niepasujące gałęzie"
+
+#: builtin/fetch.c:1267
+#, c-format
+msgid " (%s will become dangling)"
+msgstr " (%s będzie wiszący)"
+
+#: builtin/fetch.c:1268
+#, c-format
+msgid " (%s has become dangling)"
+msgstr " (%s stał się wiszący)"
+
+#: builtin/fetch.c:1300
+msgid "[deleted]"
+msgstr "[usunięto]"
+
+#: builtin/fetch.c:1301 builtin/remote.c:1118
+msgid "(none)"
+msgstr "(brak)"
+
+#: builtin/fetch.c:1324
+#, c-format
+msgid "Refusing to fetch into current branch %s of non-bare repository"
+msgstr "Odmawiam pobrania na bieżącą gałąź %s nie-suchego repozytorium"
+
+#: builtin/fetch.c:1343
+#, c-format
+msgid "Option \"%s\" value \"%s\" is not valid for %s"
+msgstr "W opcji „%s” wartość „%s” jest nieprawidłowa przy %s"
+
+#: builtin/fetch.c:1346
+#, c-format
+msgid "Option \"%s\" is ignored for %s\n"
+msgstr "Opcja „%s” jest ignorowana przez %s\n"
+
+#: builtin/fetch.c:1558
+msgid "multiple branches detected, incompatible with --set-upstream"
+msgstr "wykryto wiele gałęzi, wyklucza się to z --set-upstream"
+
+#: builtin/fetch.c:1573
+msgid "not setting upstream for a remote remote-tracking branch"
+msgstr "nie ustawiam gałęzi nadrzędnej w gałęzi śledzącej"
+
+#: builtin/fetch.c:1575
+msgid "not setting upstream for a remote tag"
+msgstr "nie ustawiam głównego nurtu w zdalnym tagu"
+
+#: builtin/fetch.c:1577
+msgid "unknown branch type"
+msgstr "nieznany rodzaj gałęzi"
+
+#: builtin/fetch.c:1579
+msgid ""
+"no source branch found.\n"
+"you need to specify exactly one branch with the --set-upstream option."
+msgstr ""
+"nie znaleziono gałęzi źródłowej.\n"
+"należy podać dokładnie jedną gałąź z opcją --set-upstream."
+
+#: builtin/fetch.c:1708 builtin/fetch.c:1771
+#, c-format
+msgid "Fetching %s\n"
+msgstr "Pobieranie %s\n"
+
+#: builtin/fetch.c:1718 builtin/fetch.c:1773 builtin/remote.c:101
+#, c-format
+msgid "Could not fetch %s"
+msgstr "Nie można pobrać %s"
+
+#: builtin/fetch.c:1730
+#, c-format
+msgid "could not fetch '%s' (exit code: %d)\n"
+msgstr "nie można pobrać „%s” (kod wyjścia: %d)\n"
+
+#: builtin/fetch.c:1834
+msgid ""
+"No remote repository specified. Please, specify either a URL or a\n"
+"remote name from which new revisions should be fetched."
+msgstr ""
+"Nie ustawiono zdalnego repozytorium. Podaj adres URL lub\n"
+"nazwę zdalnego repozytorium, z którego mają być pobrane nowe rewizje."
+
+#: builtin/fetch.c:1870
+msgid "You need to specify a tag name."
+msgstr "Musisz określić nazwę tagu."
+
+#: builtin/fetch.c:1935
+msgid "Negative depth in --deepen is not supported"
+msgstr "ujemna głębokość w --deepen nie jest wspierana"
+
+#: builtin/fetch.c:1937
+msgid "--deepen and --depth are mutually exclusive"
+msgstr "--deepend i --depth się wykluczają"
+
+#: builtin/fetch.c:1942
+msgid "--depth and --unshallow cannot be used together"
+msgstr "--depth i --unshallow wykluczają się"
+
+#: builtin/fetch.c:1944
+msgid "--unshallow on a complete repository does not make sense"
+msgstr "--unshallow w pełnym repozytorium nie ma sensu"
+
+#: builtin/fetch.c:1961
+msgid "fetch --all does not take a repository argument"
+msgstr "fetch --all nie przyjmuje argumentów z repozytoriów"
+
+#: builtin/fetch.c:1963
+msgid "fetch --all does not make sense with refspecs"
+msgstr "--all i referencje się wykluczają"
+
+#: builtin/fetch.c:1972
+#, c-format
+msgid "No such remote or remote group: %s"
+msgstr "Nie ma takiego zdalnego repozytorium ani ich grupy: %s"
+
+#: builtin/fetch.c:1979
+msgid "Fetching a group and specifying refspecs does not make sense"
+msgstr "pobieranie grupy i podanie referencji nie ma sensu"
+
+#: builtin/fetch.c:1997
+msgid ""
+"--filter can only be used with the remote configured in extensions."
+"partialclone"
+msgstr ""
+"można użyć --filter tylko ze zdalnym repozytorium ustawionym w extensions."
+"partialclone"
+
+#: builtin/fetch.c:2001
+msgid "--atomic can only be used when fetching from one remote"
+msgstr ""
+"można użyć --atomic tylko przy pobieraniu z jednego zdalnego repozytorium"
+
+#: builtin/fetch.c:2005
+msgid "--stdin can only be used when fetching from one remote"
+msgstr ""
+"można użyć --stdin tylko przy pobieraniu z jednego zdalnego repozytorium"
+
+#: 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 <komunikat>] [--log[=<n>] | --no-log] [--file <plik>]"
+
+#: builtin/fmt-merge-msg.c:18
+msgid "populate log with at most <n> entries from shortlog"
+msgstr "zapełnij dziennik co najwyżej <n> wpisami z krótkiego dziennika"
+
+#: builtin/fmt-merge-msg.c:21
+msgid "alias for --log (deprecated)"
+msgstr "synonim do --log (przestarzały)"
+
+#: builtin/fmt-merge-msg.c:24
+msgid "text"
+msgstr "tekst"
+
+#: builtin/fmt-merge-msg.c:25
+msgid "use <text> as start of message"
+msgstr "użyj <tekstu> jako początku komunikatu"
+
+#: builtin/fmt-merge-msg.c:26
+msgid "file to read from"
+msgstr "plik do przeczytania"
+
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [<options>] [<pattern>]"
+msgstr "git for-each-ref [<opcje>] [<wzorzec>]"
+
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [--points-at <object>]"
+msgstr "git for-each-ref [--points-at <obiekt>]"
+
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
+msgstr "git for-each-ref [--merged [<zapis>]] [--no-merged [<zapis>]]"
+
+#: builtin/for-each-ref.c:13
+msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
+msgstr "git for-each-ref [--contains [<zapis>]] [--no-contains [<zapis>]]"
+
+#: builtin/for-each-ref.c:28
+msgid "quote placeholders suitably for shells"
+msgstr "użyj cytowania jak w powłokach"
+
+#: builtin/for-each-ref.c:30
+msgid "quote placeholders suitably for perl"
+msgstr "użyj cytowania jak w perlu"
+
+#: builtin/for-each-ref.c:32
+msgid "quote placeholders suitably for python"
+msgstr "użyj cytowania jak w pythonie"
+
+#: builtin/for-each-ref.c:34
+msgid "quote placeholders suitably for Tcl"
+msgstr "użyj cytowania jak w Tclu"
+
+#: builtin/for-each-ref.c:37
+msgid "show only <n> matched refs"
+msgstr "pokazuj tylko <n> pasujących referencji"
+
+#: builtin/for-each-ref.c:39 builtin/tag.c:472
+msgid "respect format colors"
+msgstr "uszanuj kolory formatu"
+
+#: builtin/for-each-ref.c:42
+msgid "print only refs which points at the given object"
+msgstr "wypisz tylko referencje wskazujące ten obiekt"
+
+#: builtin/for-each-ref.c:44
+msgid "print only refs that are merged"
+msgstr "wypisz tylko scalone referencje"
+
+#: builtin/for-each-ref.c:45
+msgid "print only refs that are not merged"
+msgstr "wypisz tylko niescalone referencje"
+
+#: builtin/for-each-ref.c:46
+msgid "print only refs which contain the commit"
+msgstr "wypisz tylko referencje zawierające ten zapis"
+
+#: builtin/for-each-ref.c:47
+msgid "print only refs which don't contain the commit"
+msgstr "wypisz tylko referencje nie zawierające tego zapisu"
+
+#: builtin/for-each-repo.c:9
+msgid "git for-each-repo --config=<config> <command-args>"
+msgstr "git for-each-repo --config=<konfiguracja> <argumenty-polecenia>"
+
+#: builtin/for-each-repo.c:37
+msgid "config"
+msgstr "konfiguracja"
+
+#: builtin/for-each-repo.c:38
+msgid "config key storing a list of repository paths"
+msgstr "klucz konfiguracji przechowujący listę ścieżek repozytoriów"
+
+#: builtin/for-each-repo.c:46
+msgid "missing --config=<config>"
+msgstr "brakuje --config=<konfiguracja>"
+
+#: builtin/fsck.c:69 builtin/fsck.c:130 builtin/fsck.c:131
+msgid "unknown"
+msgstr "nieznane"
+
+#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
+#: builtin/fsck.c:83 builtin/fsck.c:103
+#, c-format
+msgid "error in %s %s: %s"
+msgstr "błąd w %s %s: %s"
+
+#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
+#: builtin/fsck.c:97
+#, c-format
+msgid "warning in %s %s: %s"
+msgstr "ostrzeżenie w %s %s:%s"
+
+#: builtin/fsck.c:126 builtin/fsck.c:129
+#, c-format
+msgid "broken link from %7s %s"
+msgstr "zepsute łącze z %7s %s"
+
+#: builtin/fsck.c:138
+msgid "wrong object type in link"
+msgstr "zły rodzaj obiektu w łączu"
+
+#: builtin/fsck.c:154
+#, c-format
+msgid ""
+"broken link from %7s %s\n"
+" to %7s %s"
+msgstr ""
+"zepsute łącze z %7s %s\n"
+" do %7s %s"
+
+#: builtin/fsck.c:265
+#, c-format
+msgid "missing %s %s"
+msgstr "brakujący %s %s"
+
+#: builtin/fsck.c:292
+#, c-format
+msgid "unreachable %s %s"
+msgstr "nieosiągalny %s %s"
+
+#: builtin/fsck.c:312
+#, c-format
+msgid "dangling %s %s"
+msgstr "wiszące %s %s"
+
+#: builtin/fsck.c:322
+msgid "could not create lost-found"
+msgstr "nie można utworzyć biura obiektów znalezionych"
+
+#: builtin/fsck.c:333
+#, c-format
+msgid "could not finish '%s'"
+msgstr "nie można zakończyć „%s”"
+
+#: builtin/fsck.c:350
+#, c-format
+msgid "Checking %s"
+msgstr "Sprawdzanie %s"
+
+#: builtin/fsck.c:388
+#, c-format
+msgid "Checking connectivity (%d objects)"
+msgstr "Sprawdzanie spójności (%d obiektów)"
+
+#: builtin/fsck.c:407
+#, c-format
+msgid "Checking %s %s"
+msgstr "Sprawdzanie %s %s"
+
+#: builtin/fsck.c:412
+msgid "broken links"
+msgstr "zepsute łącza"
+
+#: builtin/fsck.c:421
+#, c-format
+msgid "root %s"
+msgstr "korzeń %s"
+
+#: builtin/fsck.c:429
+#, c-format
+msgid "tagged %s %s (%s) in %s"
+msgstr "otagowano %s %s (%s) w %s"
+
+#: builtin/fsck.c:458
+#, c-format
+msgid "%s: object corrupt or missing"
+msgstr "%s: brakujący lub uszkodzony obiekt"
+
+#: builtin/fsck.c:483
+#, c-format
+msgid "%s: invalid reflog entry %s"
+msgstr "%s: nieprawidłowy element dziennika referencji %s"
+
+#: builtin/fsck.c:497
+#, c-format
+msgid "Checking reflog %s->%s"
+msgstr "Sprawdzanie dziennika referencji %s->%s"
+
+#: builtin/fsck.c:531
+#, c-format
+msgid "%s: invalid sha1 pointer %s"
+msgstr "%s: nieprawidłowy wskaźnik SHA-1 %s"
+
+#: builtin/fsck.c:538
+#, c-format
+msgid "%s: not a commit"
+msgstr "%s: nie jest zapisem"
+
+#: builtin/fsck.c:592
+msgid "notice: No default references"
+msgstr "uwaga: Brak domyślnych referencji"
+
+#: builtin/fsck.c:607
+#, c-format
+msgid "%s: object corrupt or missing: %s"
+msgstr "%s: brakujący lub uszkodzony obiekt: %s"
+
+#: builtin/fsck.c:620
+#, c-format
+msgid "%s: object could not be parsed: %s"
+msgstr "%s: nie można przetworzyć obiektu: %s"
+
+#: builtin/fsck.c:640
+#, c-format
+msgid "bad sha1 file: %s"
+msgstr "zły plik SHA-1: %s"
+
+#: builtin/fsck.c:655
+msgid "Checking object directory"
+msgstr "Sprawdzanie katalogu obiektów"
+
+#: builtin/fsck.c:658
+msgid "Checking object directories"
+msgstr "Sprawdzanie katalogów obiektów"
+
+#: builtin/fsck.c:673
+#, c-format
+msgid "Checking %s link"
+msgstr "Sprawdzanie połączenia %s"
+
+#: builtin/fsck.c:678 builtin/index-pack.c:865
+#, c-format
+msgid "invalid %s"
+msgstr "błędny %s"
+
+#: builtin/fsck.c:685
+#, c-format
+msgid "%s points to something strange (%s)"
+msgstr "%s wskazuje na coś dziwnego (%s)"
+
+#: builtin/fsck.c:691
+#, c-format
+msgid "%s: detached HEAD points at nothing"
+msgstr "%s: oddzielone HEAD niczego nie wskazuje"
+
+#: builtin/fsck.c:695
+#, c-format
+msgid "notice: %s points to an unborn branch (%s)"
+msgstr "uwaga: %s wskazuje nienarodzoną gałąź (%s)"
+
+#: builtin/fsck.c:707
+msgid "Checking cache tree"
+msgstr "Sprawdzanie drzewa pamięci podręcznej"
+
+#: builtin/fsck.c:712
+#, c-format
+msgid "%s: invalid sha1 pointer in cache-tree"
+msgstr "%s: nieprawidłowy wskaźnik SHA-1 w drzewie pamięci podręcznej"
+
+#: builtin/fsck.c:721
+msgid "non-tree in cache-tree"
+msgstr "nie-drzewo w drzewie pamięci podręcznej"
+
+#: builtin/fsck.c:752
+msgid "git fsck [<options>] [<object>...]"
+msgstr "git fsck [<opcje>] [<obiekt>...]"
+
+#: builtin/fsck.c:758
+msgid "show unreachable objects"
+msgstr "pokazuj nieosiągalne obiekty"
+
+#: builtin/fsck.c:759
+msgid "show dangling objects"
+msgstr "pokaż wiszące obiekty"
+
+#: builtin/fsck.c:760
+msgid "report tags"
+msgstr "zgłaszaj tagi"
+
+#: builtin/fsck.c:761
+msgid "report root nodes"
+msgstr "zgłaszaj węzły korzenia"
+
+#: builtin/fsck.c:762
+msgid "make index objects head nodes"
+msgstr "dodaj obiekty indeksu do naczelnych węzłów"
+
+#: builtin/fsck.c:763
+msgid "make reflogs head nodes (default)"
+msgstr "dodaj dzienniki referencji do węzłów naczelnych (domyślnie)"
+
+#: builtin/fsck.c:764
+msgid "also consider packs and alternate objects"
+msgstr "przejrzyj też paczki i obiekty alternatywne"
+
+#: builtin/fsck.c:765
+msgid "check only connectivity"
+msgstr "sprawdź tylko spójność"
+
+#: builtin/fsck.c:766 builtin/mktag.c:78
+msgid "enable more strict checking"
+msgstr "włącz ściślejsze sprawdzanie"
+
+#: builtin/fsck.c:768
+msgid "write dangling objects in .git/lost-found"
+msgstr "zapisz wiszące obiekty w .git/lost-found"
+
+#: builtin/fsck.c:769 builtin/prune.c:134
+msgid "show progress"
+msgstr "pokazuj postęp"
+
+#: builtin/fsck.c:770
+msgid "show verbose names for reachable objects"
+msgstr "pokaż rozwlekłe nazwy osiągalnych obiektów"
+
+#: builtin/fsck.c:829 builtin/index-pack.c:261
+msgid "Checking objects"
+msgstr "Sprawdzanie obiektów"
+
+#: builtin/fsck.c:857
+#, c-format
+msgid "%s: object missing"
+msgstr "%s: brakujący obiekt"
+
+#: builtin/fsck.c:868
+#, c-format
+msgid "invalid parameter: expected sha1, got '%s'"
+msgstr "nieprawidłowy parametr: oczekiwano SHA-1, otrzymano „%s”"
+
+#: builtin/gc.c:39
+msgid "git gc [<options>]"
+msgstr "git gc [<opcje>]"
+
+#: builtin/gc.c:93
+#, c-format
+msgid "Failed to fstat %s: %s"
+msgstr "Nie można wykonać fstat na %s: %s"
+
+#: builtin/gc.c:129
+#, c-format
+msgid "failed to parse '%s' value '%s'"
+msgstr "nie można przetworzyć wartości „%s” „%s”"
+
+#: builtin/gc.c:487 builtin/init-db.c:58
+#, c-format
+msgid "cannot stat '%s'"
+msgstr "nie można wykonać stat na „%s”"
+
+#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:562
+#, c-format
+msgid "cannot read '%s'"
+msgstr "nie można odczytać „%s”"
+
+#: builtin/gc.c:503
+#, 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 ""
+"Ostatnie wykonanie gc zgłosiło, co następuje. Napraw główną przyczynę\n"
+"i usuń %s.\n"
+"Automatyczne czyszczenie nie zostanie przeprowadzone, póki ten plik nie "
+"zniknie.\n"
+"\n"
+"%s"
+
+#: builtin/gc.c:551
+msgid "prune unreferenced objects"
+msgstr "przytnij niewskazywane obiekty"
+
+#: builtin/gc.c:553
+msgid "be more thorough (increased runtime)"
+msgstr "bądź dokładniejszy (dłuższy czas działania)"
+
+#: builtin/gc.c:554
+msgid "enable auto-gc mode"
+msgstr "włącz automatyczne zbieranie śmieci"
+
+#: builtin/gc.c:557
+msgid "force running gc even if there may be another gc running"
+msgstr "wymuś uruchomienie gc, nawet jeśli inne może być właśnie w trakcie"
+
+#: builtin/gc.c:560
+msgid "repack all other packs except the largest pack"
+msgstr "przepakuj wszystkie pozostałe paczki oprócz największej"
+
+#: builtin/gc.c:576
+#, c-format
+msgid "failed to parse gc.logexpiry value %s"
+msgstr "nie można przetworzyć wartości gc.logexpiry %s"
+
+#: builtin/gc.c:587
+#, c-format
+msgid "failed to parse prune expiry value %s"
+msgstr "nie można przetworzyć wartości wygaśnięcia przycięć %s"
+
+#: builtin/gc.c:607
+#, c-format
+msgid "Auto packing the repository in background for optimum performance.\n"
+msgstr "Automatyczne pakowanie repozytorium w tle dla optymalnej wydajności.\n"
+
+#: builtin/gc.c:609
+#, c-format
+msgid "Auto packing the repository for optimum performance.\n"
+msgstr "Automatyczne pakowanie repozytorium dla optymalnej wydajności.\n"
+
+#: builtin/gc.c:610
+#, c-format
+msgid "See \"git help gc\" for manual housekeeping.\n"
+msgstr "Zobacz „git help gc”, aby utrzymywać repozytorium ręcznie.\n"
+
+#: builtin/gc.c:650
+#, c-format
+msgid ""
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+msgstr ""
+"gc już działa na maszynie „%s” pid %<PRIuMAX> (użyj --force, jeśli nie)"
+
+#: builtin/gc.c:705
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove them."
+msgstr ""
+"Jest za dużo nieosiągalnych luźnych obiektów; wykonaj „git prune”, aby je "
+"usunąć."
+
+#: builtin/gc.c:715
+msgid ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
+msgstr ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<zadanie>] [--schedule]"
+
+#: builtin/gc.c:745
+msgid "--no-schedule is not allowed"
+msgstr "--no-schedule nie jest dozwolone"
+
+#: builtin/gc.c:750
+#, c-format
+msgid "unrecognized --schedule argument '%s'"
+msgstr "nierozpoznany argument --schedule „%s”"
+
+#: builtin/gc.c:869
+msgid "failed to write commit-graph"
+msgstr "nie można wypisać grafu zapisów"
+
+#: builtin/gc.c:914
+msgid "failed to fill remotes"
+msgstr "nie można wypełnić zdalnych repozytoriów"
+
+#: builtin/gc.c:1037
+msgid "failed to start 'git pack-objects' process"
+msgstr "nie można uruchomić procesu „git pack-objects”"
+
+#: builtin/gc.c:1054
+msgid "failed to finish 'git pack-objects' process"
+msgstr "nie można ukończyć procesu „git pack-objects”"
+
+#: builtin/gc.c:1106
+msgid "failed to write multi-pack-index"
+msgstr "nie można zapisać indeksu wielu paczek"
+
+#: builtin/gc.c:1124
+msgid "'git multi-pack-index expire' failed"
+msgstr "„git multi-pack-index expire” nie powiodło się"
+
+#: builtin/gc.c:1185
+msgid "'git multi-pack-index repack' failed"
+msgstr "„git multi-pack-index repack” nie powiodło się"
+
+#: builtin/gc.c:1194
+msgid ""
+"skipping incremental-repack task because core.multiPackIndex is disabled"
+msgstr ""
+"pomijanie zadania przyrostowego przepakowania, bo core.multiPackIndex jest "
+"wyłączone"
+
+#: builtin/gc.c:1298
+#, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr "istnieje plik blokady „%s”, pomijanie porządków"
+
+#: builtin/gc.c:1328
+#, c-format
+msgid "task '%s' failed"
+msgstr "zadanie „%s” nie powiodło się"
+
+#: builtin/gc.c:1410
+#, c-format
+msgid "'%s' is not a valid task"
+msgstr "„%s” nie jest prawidłowym zadaniem"
+
+#: builtin/gc.c:1415
+#, c-format
+msgid "task '%s' cannot be selected multiple times"
+msgstr "nie można wybrać wiele razy zadania „%s”"
+
+#: builtin/gc.c:1430
+msgid "run tasks based on the state of the repository"
+msgstr "uruchamiaj zadania w oparciu o stan repozytorium"
+
+#: builtin/gc.c:1431
+msgid "frequency"
+msgstr "częstotliwość"
+
+#: builtin/gc.c:1432
+msgid "run tasks based on frequency"
+msgstr "uruchamiaj zadania w oparciu o częstotliwość"
+
+#: builtin/gc.c:1435
+msgid "do not report progress or other information over stderr"
+msgstr ""
+"nie zgłaszaj postępu ani innych informacji na standardowe wyjście "
+"diagnostyczne"
+
+#: builtin/gc.c:1436
+msgid "task"
+msgstr "zadanie"
+
+#: builtin/gc.c:1437
+msgid "run a specific task"
+msgstr "uruchom konkretne zadanie"
+
+#: builtin/gc.c:1454
+msgid "use at most one of --auto and --schedule=<frequency>"
+msgstr "--auto i --schedule=<frequency> się wykluczają"
+
+#: builtin/gc.c:1497
+msgid "failed to run 'git config'"
+msgstr "nie można wykonać „git config”"
+
+#: builtin/gc.c:1562
+#, c-format
+msgid "failed to expand path '%s'"
+msgstr "nie można rozwinąć ścieżki „%s”"
+
+#: builtin/gc.c:1591
+msgid "failed to start launchctl"
+msgstr "nie można uruchomić launchctl"
+
+#: builtin/gc.c:1628
+#, c-format
+msgid "failed to create directories for '%s'"
+msgstr "nie można utworzyć katalogów na „%s”"
+
+#: builtin/gc.c:1689
+#, c-format
+msgid "failed to bootstrap service %s"
+msgstr "nie można wydostać usługi %s"
+
+#: builtin/gc.c:1760
+msgid "failed to create temp xml file"
+msgstr "nie można utworzyć tymczasowego pliku XML"
+
+#: builtin/gc.c:1850
+msgid "failed to start schtasks"
+msgstr "nie można uruchomić schtasks"
+
+#: builtin/gc.c:1894
+msgid "failed to run 'crontab -l'; your system might not support 'cron'"
+msgstr "nie można wykonać „crontab -l”; ten system może nie wspierać crona"
+
+#: builtin/gc.c:1911
+msgid "failed to run 'crontab'; your system might not support 'cron'"
+msgstr "nie można wykonać „crontab”; ten system może nie wspierać crona"
+
+#: builtin/gc.c:1915
+msgid "failed to open stdin of 'crontab'"
+msgstr "nie można otworzyć standardowego wejścia „crontab”"
+
+#: builtin/gc.c:1956
+msgid "'crontab' died"
+msgstr "„crontab” padł"
+
+#: builtin/gc.c:1990
+msgid "another process is scheduling background maintenance"
+msgstr "inny proces planuje porządki w tle"
+
+#: builtin/gc.c:2009
+msgid "failed to add repo to global config"
+msgstr "nie można dodać repozytorium do globalnej konfiguracji"
+
+#: builtin/gc.c:2019
+msgid "git maintenance <subcommand> [<options>]"
+msgstr "git maintenance <pod-polecenie> [<opcje>]"
+
+#: builtin/gc.c:2038
+#, c-format
+msgid "invalid subcommand: %s"
+msgstr "nieprawidłowe pod-polecenie: %s"
+
+#: builtin/grep.c:30
+msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
+msgstr "git grep [<opcje>] [-e] <wzorzec> [<rewizja>...] [[--] <ścieżka>...]"
+
+#: builtin/grep.c:223
+#, c-format
+msgid "grep: failed to create thread: %s"
+msgstr "grep: nie można utworzyć wątku: %s"
+
+#: builtin/grep.c:277
+#, c-format
+msgid "invalid number of threads specified (%d) for %s"
+msgstr "podano nieprawidłową liczbę wątków (%d) do %s"
+
+#. TRANSLATORS: %s is the configuration
+#. variable for tweaking threads, currently
+#. grep.threads
+#.
+#: builtin/grep.c:285 builtin/index-pack.c:1589 builtin/index-pack.c:1792
+#: builtin/pack-objects.c:2944
+#, c-format
+msgid "no threads support, ignoring %s"
+msgstr "brak obsługi wątków, ignorowanie %s"
+
+#: builtin/grep.c:473 builtin/grep.c:601 builtin/grep.c:641
+#, c-format
+msgid "unable to read tree (%s)"
+msgstr "nie można odczytać drzewa (%s)"
+
+#: builtin/grep.c:656
+#, c-format
+msgid "unable to grep from object of type %s"
+msgstr "nie można przeprowadzić grep z obiektu rodzaju %s"
+
+#: builtin/grep.c:737
+#, c-format
+msgid "switch `%c' expects a numerical value"
+msgstr "przełącznik „%c” oczekuje wartości liczbowej"
+
+#: builtin/grep.c:836
+msgid "search in index instead of in the work tree"
+msgstr "wyszukaj w indeksie zamiast w drzewie roboczym"
+
+#: builtin/grep.c:838
+msgid "find in contents not managed by git"
+msgstr "znajdź w zawartości nie zarządzanej przez gita"
+
+#: builtin/grep.c:840
+msgid "search in both tracked and untracked files"
+msgstr "szukaj i w plikach śledzonych i nieśledzonych"
+
+#: builtin/grep.c:842
+msgid "ignore files specified via '.gitignore'"
+msgstr "pomiń pliki wymienione w „.gitignore”"
+
+#: builtin/grep.c:844
+msgid "recursively search in each submodule"
+msgstr "wyszukaj rekurencyjnie w każdym pod-module"
+
+#: builtin/grep.c:847
+msgid "show non-matching lines"
+msgstr "pokaż niepasujące wiersze"
+
+#: builtin/grep.c:849
+msgid "case insensitive matching"
+msgstr "ignorowanie wielkości liter przy dopasowaniu"
+
+#: builtin/grep.c:851
+msgid "match patterns only at word boundaries"
+msgstr "dopasuj wzorce tylko na brzegach słów"
+
+#: builtin/grep.c:853
+msgid "process binary files as text"
+msgstr "przetwarzaj pliki binarne jako tekst"
+
+#: builtin/grep.c:855
+msgid "don't match patterns in binary files"
+msgstr "nie dopasowuj wzorców w plikach binarnych"
+
+#: builtin/grep.c:858
+msgid "process binary files with textconv filters"
+msgstr "przetwarzaj pliki binarne filtrami textconv"
+
+#: builtin/grep.c:860
+msgid "search in subdirectories (default)"
+msgstr "wyszukaj w pod-katalogach (domyślnie)"
+
+#: builtin/grep.c:862
+msgid "descend at most <depth> levels"
+msgstr "zejdź o co najwyżej <głębokość> poziomów"
+
+#: builtin/grep.c:866
+msgid "use extended POSIX regular expressions"
+msgstr "użyj rozszerzonych wyrażeń regularnych POSIX"
+
+#: builtin/grep.c:869
+msgid "use basic POSIX regular expressions (default)"
+msgstr "użyj podstawowych wyrażeń regularnych POSIX (domyślnie)"
+
+#: builtin/grep.c:872
+msgid "interpret patterns as fixed strings"
+msgstr "interpretuj wzorce jako stałe łańcuchy"
+
+#: builtin/grep.c:875
+msgid "use Perl-compatible regular expressions"
+msgstr "użyj wyrażeń regularnych kompatybilnych z Perlem"
+
+#: builtin/grep.c:878
+msgid "show line numbers"
+msgstr "pokaż numery wierszy"
+
+#: builtin/grep.c:879
+msgid "show column number of first match"
+msgstr "pokaż numer kolumny pierwszego dopasowania"
+
+#: builtin/grep.c:880
+msgid "don't show filenames"
+msgstr "nie pokazuj nazw plików"
+
+#: builtin/grep.c:881
+msgid "show filenames"
+msgstr "pokaż nazwy plików"
+
+#: builtin/grep.c:883
+msgid "show filenames relative to top directory"
+msgstr "pokaż nazwy plików względem głównego katalogu"
+
+#: builtin/grep.c:885
+msgid "show only filenames instead of matching lines"
+msgstr "pokazuj tylko nazwy plików zamiast pasujących wierszy"
+
+#: builtin/grep.c:887
+msgid "synonym for --files-with-matches"
+msgstr "zamiennik na --files-with-matches"
+
+#: builtin/grep.c:890
+msgid "show only the names of files without match"
+msgstr "pokazuj tylko nazwy plików bez trafień"
+
+#: builtin/grep.c:892
+msgid "print NUL after filenames"
+msgstr "wypisuj NUL po nazwach plików"
+
+#: builtin/grep.c:895
+msgid "show only matching parts of a line"
+msgstr "pokaż tylko pasujące fragmenty wiersza"
+
+#: builtin/grep.c:897
+msgid "show the number of matches instead of matching lines"
+msgstr "pokaż liczbę dopasowań zamiast pasujących wierszy"
+
+#: builtin/grep.c:898
+msgid "highlight matches"
+msgstr "podświetl dopasowania"
+
+#: builtin/grep.c:900
+msgid "print empty line between matches from different files"
+msgstr "wypisz pusty wiersz pomiędzy dopasowaniami z różnych plików"
+
+#: builtin/grep.c:902
+msgid "show filename only once above matches from same file"
+msgstr "pokaż nazwę pliku tylko raz nad dopasowaniami z jednego pliku"
+
+#: builtin/grep.c:905
+msgid "show <n> context lines before and after matches"
+msgstr "pokaż <n> wierszy kontekstu przed dopasowaniami i po nich"
+
+#: builtin/grep.c:908
+msgid "show <n> context lines before matches"
+msgstr "pokaż <n> wierszy kontekstu przed dopasowaniami"
+
+#: builtin/grep.c:910
+msgid "show <n> context lines after matches"
+msgstr "pokaż <n> wierszy kontekstu po dopasowaniach"
+
+#: builtin/grep.c:912
+msgid "use <n> worker threads"
+msgstr "użyj <n> wątków roboczych"
+
+#: builtin/grep.c:913
+msgid "shortcut for -C NUM"
+msgstr "skrót na -C ILE"
+
+#: builtin/grep.c:916
+msgid "show a line with the function name before matches"
+msgstr "pokaż wiersz z nazwą funkcji przed dopasowaniami"
+
+#: builtin/grep.c:918
+msgid "show the surrounding function"
+msgstr "pokaż okalającą funkcję"
+
+#: builtin/grep.c:921
+msgid "read patterns from file"
+msgstr "wczytaj wzorce z pliku"
+
+#: builtin/grep.c:923
+msgid "match <pattern>"
+msgstr "dopasuj <wzorzec>"
+
+#: builtin/grep.c:925
+msgid "combine patterns specified with -e"
+msgstr "łącz wzorce podane przez -e"
+
+#: builtin/grep.c:937
+msgid "indicate hit with exit status without output"
+msgstr "zgłoś trafienie kodem wyjścia bez wypisywania"
+
+#: builtin/grep.c:939
+msgid "show only matches from files that match all patterns"
+msgstr "pokaż tylko dopasowania z plików, które pasują do wszystkich wzorców"
+
+#: builtin/grep.c:942
+msgid "pager"
+msgstr "czytnik"
+
+#: builtin/grep.c:942
+msgid "show matching files in the pager"
+msgstr "pokaż pasujące pliki w czytniku"
+
+#: builtin/grep.c:946
+msgid "allow calling of grep(1) (ignored by this build)"
+msgstr "pozwól wykonać grep(1) (ignorowane w tej wersji)"
+
+#: builtin/grep.c:1012
+msgid "no pattern given"
+msgstr "nie podano wzorca"
+
+#: builtin/grep.c:1048
+msgid "--no-index or --untracked cannot be used with revs"
+msgstr "--no-index i --untracked wykluczają się z rewizjami"
+
+#: builtin/grep.c:1056
+#, c-format
+msgid "unable to resolve revision: %s"
+msgstr "nie można rozwiązać rewizji: %s"
+
+#: builtin/grep.c:1086
+msgid "--untracked not supported with --recurse-submodules"
+msgstr "--untracked niewspierane z --recurse-submodules"
+
+#: builtin/grep.c:1090
+msgid "invalid option combination, ignoring --threads"
+msgstr "nieprawidłowe połączenie opcji, pomijanie --threads"
+
+#: builtin/grep.c:1093 builtin/pack-objects.c:3672
+msgid "no threads support, ignoring --threads"
+msgstr "brak obsługi wątków, ignorowanie --threads"
+
+#: builtin/grep.c:1096 builtin/index-pack.c:1586 builtin/pack-objects.c:2941
+#, c-format
+msgid "invalid number of threads specified (%d)"
+msgstr "podano nieprawidłową liczbę wątków (%d)"
+
+#: builtin/grep.c:1130
+msgid "--open-files-in-pager only works on the worktree"
+msgstr "--open-files-in-pager działa tylko w drzewie roboczym"
+
+#: builtin/grep.c:1156
+msgid "--cached or --untracked cannot be used with --no-index"
+msgstr "--cached i --untracked wykluczają się z --no-index"
+
+#: builtin/grep.c:1159
+msgid "--untracked cannot be used with --cached"
+msgstr "--untracked i --cached się wykluczają"
+
+#: builtin/grep.c:1165
+msgid "--[no-]exclude-standard cannot be used for tracked contents"
+msgstr "Nie można użyć --[no-]exclude-standard do śledzonej zawartości"
+
+#: builtin/grep.c:1173
+msgid "both --cached and trees are given"
+msgstr "podano jednocześnie --cached i drzewa"
+
+#: builtin/hash-object.c:85
+msgid ""
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
+"[--] <file>..."
+msgstr ""
+"git hash-object [-t <rodzaj>] [-w] [--path=<ścieżka> | --no-filters] [--"
+"stdin] [--] <plik>..."
+
+#: 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 "rodzaj obiektu"
+
+#: builtin/hash-object.c:99
+msgid "write the object into the object database"
+msgstr "zapisz obiekt do bazy danych obiektu"
+
+#: builtin/hash-object.c:101
+msgid "read the object from stdin"
+msgstr "wczytaj obiekt ze standardowego wejścia"
+
+#: builtin/hash-object.c:103
+msgid "store file as is without filters"
+msgstr "przechowaj plik jak jest, bez filtrów"
+
+#: builtin/hash-object.c:104
+msgid ""
+"just hash any random garbage to create corrupt objects for debugging Git"
+msgstr ""
+"skróć po prostu jakieś losowe śmieci, żeby utworzyć uszkodzone obiekty do "
+"odpluskwiania Gita"
+
+#: builtin/hash-object.c:105
+msgid "process file as it were from this path"
+msgstr "przetwórz plik, jakby był z tej ścieżki"
+
+#: builtin/help.c:47
+msgid "print all available commands"
+msgstr "wypisz wszystkie dostępne polecenia"
+
+#: builtin/help.c:48
+msgid "exclude guides"
+msgstr "pomiń przewodniki"
+
+#: builtin/help.c:49
+msgid "print list of useful guides"
+msgstr "wypisz listę przydatnych podręczników"
+
+#: builtin/help.c:50
+msgid "print all configuration variable names"
+msgstr "wypisz wszystkie nazwy zmiennych konfiguracji"
+
+#: builtin/help.c:52
+msgid "show man page"
+msgstr "pokaż podręcznik użytkowania"
+
+#: builtin/help.c:53
+msgid "show manual in web browser"
+msgstr "pokaż podręcznik w przeglądarce"
+
+#: builtin/help.c:55
+msgid "show info page"
+msgstr "pokaż stronę podręcznika info"
+
+#: builtin/help.c:57
+msgid "print command description"
+msgstr "wypisz opis polecenia"
+
+#: builtin/help.c:62
+msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
+msgstr "git help [--all] [--guides] [--man | --web | --info] [<polecenie>]"
+
+#: builtin/help.c:163
+#, c-format
+msgid "unrecognized help format '%s'"
+msgstr "nierozpoznany format pomocy „%s”"
+
+#: builtin/help.c:190
+msgid "Failed to start emacsclient."
+msgstr "Nie można uruchomić emacsclient."
+
+#: builtin/help.c:203
+msgid "Failed to parse emacsclient version."
+msgstr "Nie można przetworzyć wersji emacsclienta."
+
+#: builtin/help.c:211
+#, c-format
+msgid "emacsclient version '%d' too old (< 22)."
+msgstr "wersja emacsclienta „%d” za stara (< 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 "nie można wykonać „%s”"
+
+#: builtin/help.c:307
+#, c-format
+msgid ""
+"'%s': path for unsupported man viewer.\n"
+"Please consider using 'man.<tool>.cmd' instead."
+msgstr ""
+"„%s”: ścieżka do niewspieranego czytnika podręcznika.\n"
+"Rozważ zamiast tego użycie „man.<narzędzie>.cmd”."
+
+#: builtin/help.c:319
+#, c-format
+msgid ""
+"'%s': cmd for supported man viewer.\n"
+"Please consider using 'man.<tool>.path' instead."
+msgstr ""
+"„%s”: polecenie niewspieranego czytnika podręcznika.\n"
+"Rozważ zamiast tego użycie „man.<narzędzie>.path”."
+
+#: builtin/help.c:436
+#, c-format
+msgid "'%s': unknown man viewer."
+msgstr "„%s”: nieznany czytnik podręcznika."
+
+#: builtin/help.c:453
+msgid "no man viewer handled the request"
+msgstr "żaden czytnik podręcznika nie obsłużył żądania"
+
+#: builtin/help.c:461
+msgid "no info viewer handled the request"
+msgstr "żaden czytnik podręcznika info nie obsłużył żądania"
+
+#: builtin/help.c:520 builtin/help.c:531 git.c:340
+#, c-format
+msgid "'%s' is aliased to '%s'"
+msgstr "„%s” jest skrótem na „%s”"
+
+#: builtin/help.c:534 git.c:372
+#, c-format
+msgid "bad alias.%s string: %s"
+msgstr "zły łańcuch alias.%s: %s"
+
+#: builtin/help.c:563 builtin/help.c:593
+#, c-format
+msgid "usage: %s%s"
+msgstr "użycie: %s%s"
+
+#: builtin/help.c:577
+msgid "'git help config' for more information"
+msgstr "więcej informacji w „git help config”"
+
+#: builtin/index-pack.c:221
+#, c-format
+msgid "object type mismatch at %s"
+msgstr "niezgodność rodzajów obiektów w %s"
+
+#: builtin/index-pack.c:241
+#, c-format
+msgid "did not receive expected object %s"
+msgstr "nie odebrano oczekiwanego obiektu %s"
+
+#: builtin/index-pack.c:244
+#, c-format
+msgid "object %s: expected type %s, found %s"
+msgstr "obiekt %s: oczekiwano rodzaju %s, znaleziono %s"
+
+#: builtin/index-pack.c:294
+#, c-format
+msgid "cannot fill %d byte"
+msgid_plural "cannot fill %d bytes"
+msgstr[0] "nie można wypełnić %d bajtu"
+msgstr[1] "nie można wypełnić %d bajtów"
+msgstr[2] "nie można wypełnić %d bajtów"
+
+#: builtin/index-pack.c:304
+msgid "early EOF"
+msgstr "przedwczesny koniec pliku"
+
+#: builtin/index-pack.c:305
+msgid "read error on input"
+msgstr "błąd odczytu na wejściu"
+
+#: builtin/index-pack.c:317
+msgid "used more bytes than were available"
+msgstr "użyto więcej bajtów niż było dostępnych"
+
+#: builtin/index-pack.c:324 builtin/pack-objects.c:624
+msgid "pack too large for current definition of off_t"
+msgstr "paczka za duża na obecną definicję off_t"
+
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
+msgid "pack exceeds maximum allowed size"
+msgstr "paczka przekracza maksymalny dozwolony rozmiar"
+
+#: builtin/index-pack.c:342
+#, c-format
+msgid "unable to create '%s'"
+msgstr "nie można utworzyć „%s”"
+
+#: builtin/index-pack.c:348
+#, c-format
+msgid "cannot open packfile '%s'"
+msgstr "nie można otworzyć pliku paczki „%s”"
+
+#: builtin/index-pack.c:362
+msgid "pack signature mismatch"
+msgstr "niezgodność podpisu paczki"
+
+#: builtin/index-pack.c:364
+#, c-format
+msgid "pack version %<PRIu32> unsupported"
+msgstr "wersja paczki %<PRIu32> niewspierana"
+
+#: builtin/index-pack.c:382
+#, c-format
+msgid "pack has bad object at offset %<PRIuMAX>: %s"
+msgstr "paczka ma zły obiekt na pozycji %<PRIuMAX>: %s"
+
+#: builtin/index-pack.c:488
+#, c-format
+msgid "inflate returned %d"
+msgstr "dekompresja zwróciła %d"
+
+#: builtin/index-pack.c:537
+msgid "offset value overflow for delta base object"
+msgstr "przepełnienie wartości przesunięcia dla obiektu podstawowego delty"
+
+#: builtin/index-pack.c:545
+msgid "delta base offset is out of bound"
+msgstr "podstawowe przesunięcie delty jest poza zakresem"
+
+#: builtin/index-pack.c:553
+#, c-format
+msgid "unknown object type %d"
+msgstr "nieznany typ obiektu %d"
+
+#: builtin/index-pack.c:584
+msgid "cannot pread pack file"
+msgstr "nie można wykonać pread na pliku paczki"
+
+#: 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] "przedwczesny koniec pliku paczki, brakuje %<PRIuMAX> bajtu"
+msgstr[1] "przedwczesny koniec pliku paczki, brakuje %<PRIuMAX> bajtów"
+msgstr[2] "przedwczesny koniec pliku paczki, brakuje %<PRIuMAX> bajtów"
+
+#: builtin/index-pack.c:612
+msgid "serious inflate inconsistency"
+msgstr "poważna niespójność dekompresji"
+
+#: 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 "ZNALEZIONO KOLIZJĘ SHA1 Z %s !"
+
+#: 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 "nie można odczytać %s"
+
+#: builtin/index-pack.c:824
+#, c-format
+msgid "cannot read existing object info %s"
+msgstr "nie można odczytać informacji istniejącego obiektu %s"
+
+#: builtin/index-pack.c:832
+#, c-format
+msgid "cannot read existing object %s"
+msgstr "nie można odczytać istniejącego obiektu %s"
+
+#: builtin/index-pack.c:846
+#, c-format
+msgid "invalid blob object %s"
+msgstr "nieprawidłowy obiekt blob %s"
+
+#: builtin/index-pack.c:849 builtin/index-pack.c:868
+msgid "fsck error in packed object"
+msgstr "błąd fsck w spakowanym obiekcie"
+
+#: builtin/index-pack.c:870
+#, c-format
+msgid "Not all child objects of %s are reachable"
+msgstr "Nie wszystkie obiekty potomne %s są osiągalne"
+
+#: builtin/index-pack.c:931 builtin/index-pack.c:978
+msgid "failed to apply delta"
+msgstr "nie można zastosować delty"
+
+#: builtin/index-pack.c:1161
+msgid "Receiving objects"
+msgstr "Pobieranie obiektów"
+
+#: builtin/index-pack.c:1161
+msgid "Indexing objects"
+msgstr "Indeksowanie obiektów"
+
+#: builtin/index-pack.c:1195
+msgid "pack is corrupted (SHA1 mismatch)"
+msgstr "paczka jest uszkodzona (różnica w SHA1)"
+
+#: builtin/index-pack.c:1200
+msgid "cannot fstat packfile"
+msgstr "nie można wykonać fstat na pliku paczki"
+
+#: builtin/index-pack.c:1203
+msgid "pack has junk at the end"
+msgstr "paczka ma śmieci na końcu"
+
+#: builtin/index-pack.c:1215
+msgid "confusion beyond insanity in parse_pack_objects()"
+msgstr "dezorientacja ponad szaleństwo w parse_pack_objects()"
+
+#: builtin/index-pack.c:1238
+msgid "Resolving deltas"
+msgstr "Rozwiązywanie delt"
+
+#: builtin/index-pack.c:1249 builtin/pack-objects.c:2707
+#, c-format
+msgid "unable to create thread: %s"
+msgstr "nie można utworzyć wątku: %s"
+
+#: builtin/index-pack.c:1282
+msgid "confusion beyond insanity"
+msgstr "dezorientacja ponad szaleństwo"
+
+#: builtin/index-pack.c:1288
+#, c-format
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] "wykonano z %d lokalnym obiektem"
+msgstr[1] "wykonano z %d lokalnymi obiektami"
+msgstr[2] "wykonano z %d lokalnymi obiektami"
+
+#: builtin/index-pack.c:1300
+#, c-format
+msgid "Unexpected tail checksum for %s (disk corruption?)"
+msgstr "Nieoczekiwana końcowa suma kontrolna %s (uszkodzenie dysku?)"
+
+#: builtin/index-pack.c:1304
+#, c-format
+msgid "pack has %d unresolved delta"
+msgid_plural "pack has %d unresolved deltas"
+msgstr[0] "paczka ma %d nierozwiązaną deltę"
+msgstr[1] "paczka ma %d nierozwiązane delty"
+msgstr[2] "paczka ma %d nierozwiązanych delt"
+
+#: builtin/index-pack.c:1328
+#, c-format
+msgid "unable to deflate appended object (%d)"
+msgstr "nie można skompresować dodanego obiektu (%d)"
+
+#: builtin/index-pack.c:1424
+#, c-format
+msgid "local object %s is corrupt"
+msgstr "lokalny obiekt %s jest uszkodzony"
+
+#: builtin/index-pack.c:1445
+#, c-format
+msgid "packfile name '%s' does not end with '.%s'"
+msgstr "nazwa pliku paczki „%s” nie kończy się na „.%s”"
+
+#: builtin/index-pack.c:1469
+#, c-format
+msgid "cannot write %s file '%s'"
+msgstr "nie można zapisać pliku %s „%s”"
+
+#: builtin/index-pack.c:1477
+#, c-format
+msgid "cannot close written %s file '%s'"
+msgstr "nie można zamknąć zapisanego pliku %s „%s”"
+
+#: builtin/index-pack.c:1503
+msgid "error while closing pack file"
+msgstr "błąd podczas zamykania pliku paczki"
+
+#: builtin/index-pack.c:1517
+msgid "cannot store pack file"
+msgstr "nie można zapisać pliku paczki"
+
+#: builtin/index-pack.c:1525
+msgid "cannot store index file"
+msgstr "nie można zapisać pliku indeksu"
+
+#: builtin/index-pack.c:1534
+msgid "cannot store reverse index file"
+msgstr "nie można zapisać pliku odwrotnego indeksu"
+
+#: builtin/index-pack.c:1580 builtin/pack-objects.c:2952
+#, c-format
+msgid "bad pack.indexversion=%<PRIu32>"
+msgstr "zła wartość pack.indexversion=%<PRIu32>"
+
+#: builtin/index-pack.c:1650
+#, c-format
+msgid "Cannot open existing pack file '%s'"
+msgstr "Nie można otworzyć istniejącego pliku paczki „%s”"
+
+#: builtin/index-pack.c:1652
+#, c-format
+msgid "Cannot open existing pack idx file for '%s'"
+msgstr "Nie można otworzyć istniejącego pliku idx paczki dla „%s”"
+
+#: builtin/index-pack.c:1700
+#, c-format
+msgid "non delta: %d object"
+msgid_plural "non delta: %d objects"
+msgstr[0] "nie delta: %d obiekt"
+msgstr[1] "nie delta: %d obiekty"
+msgstr[2] "nie delta: %d obiektów"
+
+#: builtin/index-pack.c:1707
+#, c-format
+msgid "chain length = %d: %lu object"
+msgid_plural "chain length = %d: %lu objects"
+msgstr[0] "długość łańcucha = %d: %lu obiekt"
+msgstr[1] "długość łańcucha = %d: %lu obiekty"
+msgstr[2] "długość łańcucha = %d: %lu obiektów"
+
+#: builtin/index-pack.c:1749
+msgid "Cannot come back to cwd"
+msgstr "Nie można wrócić do cwd"
+
+#: builtin/index-pack.c:1803 builtin/index-pack.c:1806
+#: builtin/index-pack.c:1822 builtin/index-pack.c:1826
+#, c-format
+msgid "bad %s"
+msgstr "błędny %s"
+
+#: builtin/index-pack.c:1832 builtin/init-db.c:392 builtin/init-db.c:625
+#, c-format
+msgid "unknown hash algorithm '%s'"
+msgstr "nieznany algorytm skrótu „%s”"
+
+#: builtin/index-pack.c:1851
+msgid "--fix-thin cannot be used without --stdin"
+msgstr "--fix-thin i --stdin wykluczają się"
+
+#: builtin/index-pack.c:1853
+msgid "--stdin requires a git repository"
+msgstr "--stdin wymaga repozytorium gita"
+
+#: builtin/index-pack.c:1855
+msgid "--object-format cannot be used with --stdin"
+msgstr "--object-format i --stdin wykluczają się"
+
+#: builtin/index-pack.c:1870
+msgid "--verify with no packfile name given"
+msgstr "--verify bez podanej nazwy pliku paczki"
+
+#: builtin/index-pack.c:1936 builtin/unpack-objects.c:582
+msgid "fsck error in pack objects"
+msgstr "błąd fsck w obiektach paczek"
+
+#: builtin/init-db.c:64
+#, c-format
+msgid "cannot stat template '%s'"
+msgstr "nie można wykonać stat na szablonie „%s”"
+
+#: builtin/init-db.c:69
+#, c-format
+msgid "cannot opendir '%s'"
+msgstr "nie można otworzyć katalogu „%s”"
+
+#: builtin/init-db.c:81
+#, c-format
+msgid "cannot readlink '%s'"
+msgstr "nie można wykonać readlink na „%s”"
+
+#: builtin/init-db.c:83
+#, c-format
+msgid "cannot symlink '%s' '%s'"
+msgstr "nie można wykonać symlink na „%s” „%s”"
+
+#: builtin/init-db.c:89
+#, c-format
+msgid "cannot copy '%s' to '%s'"
+msgstr "nie można skopiować „%s” do „%s”"
+
+#: builtin/init-db.c:93
+#, c-format
+msgid "ignoring template %s"
+msgstr "pomijanie szablonu %s"
+
+#: builtin/init-db.c:124
+#, c-format
+msgid "templates not found in %s"
+msgstr "nie znaleziono szablonów w %s"
+
+#: builtin/init-db.c:139
+#, c-format
+msgid "not copying templates from '%s': %s"
+msgstr "nie kopiowanie szablonów z „%s”: %s"
+
+#: builtin/init-db.c:275
+#, c-format
+msgid "invalid initial branch name: '%s'"
+msgstr "nieprawidłowa początkowa nazwa gałęzi: „%s”"
+
+#: builtin/init-db.c:367
+#, c-format
+msgid "unable to handle file type %d"
+msgstr "nie można obsłużyć typu pliku %d"
+
+#: builtin/init-db.c:370
+#, c-format
+msgid "unable to move %s to %s"
+msgstr "nie można przenieść %s do %s"
+
+#: builtin/init-db.c:386
+msgid "attempt to reinitialize repository with different hash"
+msgstr "próba ponownego zainicjowania repozytorium innym skrótem"
+
+#: builtin/init-db.c:410 builtin/init-db.c:413
+#, c-format
+msgid "%s already exists"
+msgstr "%s już istnieje"
+
+#: builtin/init-db.c:445
+#, c-format
+msgid "re-init: ignored --initial-branch=%s"
+msgstr "re-init: pominięto --initial-branch=%s"
+
+#: builtin/init-db.c:476
+#, c-format
+msgid "Reinitialized existing shared Git repository in %s%s\n"
+msgstr "Przeinicjowano istniejące współdzielone repozytorium Gita w %s%s\n"
+
+#: builtin/init-db.c:477
+#, c-format
+msgid "Reinitialized existing Git repository in %s%s\n"
+msgstr "Przeinicjowano istniejące repozytorium Gita w %s%s\n"
+
+#: builtin/init-db.c:481
+#, c-format
+msgid "Initialized empty shared Git repository in %s%s\n"
+msgstr "Zainicjowano puste współdzielone repozytorium Gita w %s%s\n"
+
+#: builtin/init-db.c:482
+#, c-format
+msgid "Initialized empty Git repository in %s%s\n"
+msgstr "Zainicjowano puste repozytorium Gita w %s%s\n"
+
+#: builtin/init-db.c:531
+msgid ""
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
+"shared[=<permissions>]] [<directory>]"
+msgstr ""
+"git init [-q | --quiet] [--bare] [--template=<katalog-szablonu>] [--"
+"shared[=<uprawnienia>]] [<katalog>]"
+
+#: builtin/init-db.c:557
+msgid "permissions"
+msgstr "uprawnienia"
+
+#: builtin/init-db.c:558
+msgid "specify that the git repository is to be shared amongst several users"
+msgstr ""
+"podaj, że repozytorium gita ma być współdzielone pomiędzy użytkownikami"
+
+#: builtin/init-db.c:564
+msgid "override the name of the initial branch"
+msgstr "wymuś nazwę początkowej gałęzi"
+
+#: builtin/init-db.c:565 builtin/verify-pack.c:74
+msgid "hash"
+msgstr "skrót"
+
+#: builtin/init-db.c:566 builtin/show-index.c:22 builtin/verify-pack.c:75
+msgid "specify the hash algorithm to use"
+msgstr "podaj algorytm skrótu do użycia"
+
+#: builtin/init-db.c:573
+msgid "--separate-git-dir and --bare are mutually exclusive"
+msgstr "--separate-git-dir i --bare się wykluczają"
+
+#: builtin/init-db.c:602 builtin/init-db.c:607
+#, c-format
+msgid "cannot mkdir %s"
+msgstr "nie można utworzyć katalogu %s"
+
+#: builtin/init-db.c:611 builtin/init-db.c:666
+#, c-format
+msgid "cannot chdir to %s"
+msgstr "nie można wejść do %s"
+
+#: builtin/init-db.c:638
+#, c-format
+msgid ""
+"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
+"dir=<directory>)"
+msgstr ""
+"%s (lub --work-tree=<katalog>) niedozwolone bez podania %s (lub --git-"
+"dir=<katalog>)"
+
+#: builtin/init-db.c:690
+#, c-format
+msgid "Cannot access work tree '%s'"
+msgstr "Nie można dostać się do drzewa roboczego „%s”"
+
+#: builtin/init-db.c:695
+msgid "--separate-git-dir incompatible with bare repository"
+msgstr "--separate-git-dir i suche repozytorium się wykluczają"
+
+#: 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 "
+"<klucz>[(=|:)<wartość>])...] [<plik>...]"
+
+#: builtin/interpret-trailers.c:95
+msgid "edit files in place"
+msgstr "edytuj pliki w miejscu"
+
+#: builtin/interpret-trailers.c:96
+msgid "trim empty trailers"
+msgstr "obcinaj puste końcówki"
+
+#: builtin/interpret-trailers.c:99
+msgid "where to place the new trailer"
+msgstr "gdzie umieścić nową końcówkę"
+
+#: builtin/interpret-trailers.c:101
+msgid "action if trailer already exists"
+msgstr "działanie, jeśli końcówka już istnieje"
+
+#: builtin/interpret-trailers.c:103
+msgid "action if trailer is missing"
+msgstr "działanie, jeśli brakuje końcówki"
+
+#: builtin/interpret-trailers.c:105
+msgid "output only the trailers"
+msgstr "wypisz tylko końcówki"
+
+#: builtin/interpret-trailers.c:106
+msgid "do not apply config rules"
+msgstr "nie stosuj reguł konfiguracji"
+
+#: builtin/interpret-trailers.c:107
+msgid "join whitespace-continued values"
+msgstr "złącz wartości kontynuowane od białych znaków"
+
+#: builtin/interpret-trailers.c:108
+msgid "set parsing options"
+msgstr "ustaw opcje przetwarzania"
+
+#: builtin/interpret-trailers.c:110
+msgid "do not treat --- specially"
+msgstr "nie traktuj specjalnie ---"
+
+#: builtin/interpret-trailers.c:111
+msgid "trailer"
+msgstr "końcówka"
+
+#: builtin/interpret-trailers.c:112
+msgid "trailer(s) to add"
+msgstr "końcówka(-i) do dodania"
+
+#: builtin/interpret-trailers.c:123
+msgid "--trailer with --only-input does not make sense"
+msgstr "--trailer i --only-input wykluczają się"
+
+#: builtin/interpret-trailers.c:133
+msgid "no input file given for in-place editing"
+msgstr "nie podano pliku wejściowego do edycji w miejscu"
+
+#: builtin/log.c:59
+msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git log [<opcje>] [<zakres-rewizji>] [[--] <ścieżka>...]"
+
+#: builtin/log.c:60
+msgid "git show [<options>] <object>..."
+msgstr "git show [<opcje>] <obiekt>..."
+
+#: builtin/log.c:113
+#, c-format
+msgid "invalid --decorate option: %s"
+msgstr "nieprawidłowa opcja --decorate: %s"
+
+#: builtin/log.c:180
+msgid "show source"
+msgstr "pokaż źródło"
+
+#: builtin/log.c:181
+msgid "use mail map file"
+msgstr "użyj pliku mapy adresów"
+
+#: builtin/log.c:184
+msgid "only decorate refs that match <pattern>"
+msgstr "dekoruj tylko referencje pasujące do <wzorca>"
+
+#: builtin/log.c:186
+msgid "do not decorate refs that match <pattern>"
+msgstr "nie dekoruj referencji pasujących do <wzorca>"
+
+#: builtin/log.c:187
+msgid "decorate options"
+msgstr "opcje dekoracyjne"
+
+#: builtin/log.c:190
+msgid ""
+"trace the evolution of line range <start>,<end> or function :<funcname> in "
+"<file>"
+msgstr ""
+"śledź ewolucję zakresu wierszy <start>,<end> lub funkcji :<nazwa-funkcji> w "
+"<pliku>"
+
+#: builtin/log.c:213
+msgid "-L<range>:<file> cannot be used with pathspec"
+msgstr "-L<zakres>:<plik> i ścieżki się wykluczają"
+
+#: builtin/log.c:303
+#, c-format
+msgid "Final output: %d %s\n"
+msgstr "Ostateczne wyjście: %d %s\n"
+
+#: builtin/log.c:566
+#, c-format
+msgid "git show %s: bad file"
+msgstr "git show %s: zły plik"
+
+#: builtin/log.c:581 builtin/log.c:671
+#, c-format
+msgid "could not read object %s"
+msgstr "nie można odczytać obiektu %s"
+
+#: builtin/log.c:696
+#, c-format
+msgid "unknown type: %d"
+msgstr "nieznany rodzaj: %d"
+
+#: builtin/log.c:841
+#, c-format
+msgid "%s: invalid cover from description mode"
+msgstr "%s: nieprawidłowy tryb listu motywacyjnego z opisu"
+
+#: builtin/log.c:848
+msgid "format.headers without value"
+msgstr "format.headers bez wartości"
+
+#: builtin/log.c:977
+#, c-format
+msgid "cannot open patch file %s"
+msgstr "nie można otworzyć pliku łatki %s"
+
+#: builtin/log.c:994
+msgid "need exactly one range"
+msgstr "potrzeba dokładnie jednego zakresu"
+
+#: builtin/log.c:1004
+msgid "not a range"
+msgstr "to nie jest zakres"
+
+#: builtin/log.c:1168
+msgid "cover letter needs email format"
+msgstr "list motywacyjny wymaga formatu e-mail"
+
+#: builtin/log.c:1174
+msgid "failed to create cover-letter file"
+msgstr "nie można utworzyć pliku z listem motywacyjnym"
+
+#: builtin/log.c:1261
+#, c-format
+msgid "insane in-reply-to: %s"
+msgstr "szalone in-reply-to: %s"
+
+#: builtin/log.c:1288
+msgid "git format-patch [<options>] [<since> | <revision-range>]"
+msgstr "git format-patch [<opcje>] [<od-kiedy> | <zakres-rewizji>]"
+
+#: builtin/log.c:1346
+msgid "two output directories?"
+msgstr "dwa katalogi wyjściowe?"
+
+#: builtin/log.c:1497 builtin/log.c:2317 builtin/log.c:2319 builtin/log.c:2331
+#, c-format
+msgid "unknown commit %s"
+msgstr "nieznany zapis %s"
+
+#: builtin/log.c:1508 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/replace.c:210
+#, c-format
+msgid "failed to resolve '%s' as a valid ref"
+msgstr "nie można rozwiązać „%s” jako prawidłowej referencji"
+
+#: builtin/log.c:1517
+msgid "could not find exact merge base"
+msgstr "nie znaleziono dokładnej podstawy scalania"
+
+#: builtin/log.c:1527
+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 ""
+"nie udało się uzyskać nadrzędnego repozytorium, jeśli chcesz automatycznie\n"
+"zapisać zapis podstawy, użyj git branch --set-upstream-to, aby śledzić "
+"zdalną gałąź.\n"
+"Albo możesz podać zapis podstawy ręcznie przez --base=<id-zapisu-podstawy>"
+
+#: builtin/log.c:1550
+msgid "failed to find exact merge base"
+msgstr "nie znaleziono dokładnej podstawy scalania"
+
+#: builtin/log.c:1567
+msgid "base commit should be the ancestor of revision list"
+msgstr "podstawowy zapis powinien być przodkiem listy rewizji"
+
+#: builtin/log.c:1577
+msgid "base commit shouldn't be in revision list"
+msgstr "podstawowy zapis nie powinien być na liście rewizji"
+
+#: builtin/log.c:1635
+msgid "cannot get patch id"
+msgstr "nie można uzyskać identyfikatora łatki"
+
+#: builtin/log.c:1692
+msgid "failed to infer range-diff origin of current series"
+msgstr "nie można wywnioskować źródła różnic zakresów z bieżącej serii"
+
+#: builtin/log.c:1694
+#, c-format
+msgid "using '%s' as range-diff origin of current series"
+msgstr "użycie „%s” jako źródła różnic zakresów z bieżącej serii"
+
+#: builtin/log.c:1738
+msgid "use [PATCH n/m] even with a single patch"
+msgstr "użyj [PATCH n/m] nawet przy pojedynczej łatce"
+
+#: builtin/log.c:1741
+msgid "use [PATCH] even with multiple patches"
+msgstr "użyj [PATCH] nawet przy wielu łatkach"
+
+#: builtin/log.c:1745
+msgid "print patches to standard out"
+msgstr "wypisz łatki na standardowe wyjście"
+
+#: builtin/log.c:1747
+msgid "generate a cover letter"
+msgstr "wygeneruj list motywacyjny"
+
+#: builtin/log.c:1749
+msgid "use simple number sequence for output file names"
+msgstr "użyj tylko numerów w nazwach wynikowych plików"
+
+#: builtin/log.c:1750
+msgid "sfx"
+msgstr "sfx"
+
+#: builtin/log.c:1751
+msgid "use <sfx> instead of '.patch'"
+msgstr "użyj <sfx> zamiast „.patch”"
+
+#: builtin/log.c:1753
+msgid "start numbering patches at <n> instead of 1"
+msgstr "zacznij numerować łatki od <n> zamiast od 1"
+
+#: builtin/log.c:1755
+msgid "mark the series as Nth re-roll"
+msgstr "oznacz serię jako N-te podejście"
+
+#: builtin/log.c:1757
+msgid "max length of output filename"
+msgstr "maksymalna długość nazwy wynikowego pliku"
+
+#: builtin/log.c:1759
+msgid "use [RFC PATCH] instead of [PATCH]"
+msgstr "użyj [RFC PATCH] zamiast [PATCH]"
+
+#: builtin/log.c:1762
+msgid "cover-from-description-mode"
+msgstr "tryb-listu-z-opisu"
+
+#: builtin/log.c:1763
+msgid "generate parts of a cover letter based on a branch's description"
+msgstr "wygeneruj części listu motywacyjnego w oparciu o opis gałęzi"
+
+#: builtin/log.c:1765
+msgid "use [<prefix>] instead of [PATCH]"
+msgstr "użyj [<prefiksu>] zamiast [PATCH]"
+
+#: builtin/log.c:1768
+msgid "store resulting files in <dir>"
+msgstr "zachowaj wynikowe pliki w <katalogu>"
+
+#: builtin/log.c:1771
+msgid "don't strip/add [PATCH]"
+msgstr "nie usuwaj/nie dodawaj [PATCH]"
+
+#: builtin/log.c:1774
+msgid "don't output binary diffs"
+msgstr "nie wypisuj binarnych różnic"
+
+#: builtin/log.c:1776
+msgid "output all-zero hash in From header"
+msgstr "wypisz skrót z samych zer w nagłówku Od"
+
+#: builtin/log.c:1778
+msgid "don't include a patch matching a commit upstream"
+msgstr "nie uwzględniaj łatki pasującej do już istniejącego zapisu"
+
+#: builtin/log.c:1780
+msgid "show patch format instead of default (patch + stat)"
+msgstr "pokaż format łatki zamiast domyślnego (łatka + statystyki)"
+
+#: builtin/log.c:1782
+msgid "Messaging"
+msgstr "Wiadomości"
+
+#: builtin/log.c:1783
+msgid "header"
+msgstr "nagłówek"
+
+#: builtin/log.c:1784
+msgid "add email header"
+msgstr "dodaj nagłówek e-maila"
+
+#: builtin/log.c:1785 builtin/log.c:1786
+msgid "email"
+msgstr "e-mail"
+
+#: builtin/log.c:1785
+msgid "add To: header"
+msgstr "dodaj pole Do:"
+
+#: builtin/log.c:1786
+msgid "add Cc: header"
+msgstr "dodaj pole DW:"
+
+#: builtin/log.c:1787
+msgid "ident"
+msgstr "tożsamość"
+
+#: builtin/log.c:1788
+msgid "set From address to <ident> (or committer ident if absent)"
+msgstr ""
+"ustaw adres Od na <tożsamość> (lub tożsamość składającego, jeśli nie podano)"
+
+#: builtin/log.c:1790
+msgid "message-id"
+msgstr "id-wiadomości"
+
+#: builtin/log.c:1791
+msgid "make first mail a reply to <message-id>"
+msgstr "niech pierwszy list będzie odpowiedzią na <id-wiadomości>"
+
+#: builtin/log.c:1792 builtin/log.c:1795
+msgid "boundary"
+msgstr "granica/boundary"
+
+#: builtin/log.c:1793
+msgid "attach the patch"
+msgstr "załącz łatkę"
+
+#: builtin/log.c:1796
+msgid "inline the patch"
+msgstr "umieść łatkę w treści"
+
+#: builtin/log.c:1800
+msgid "enable message threading, styles: shallow, deep"
+msgstr "zezwól na wątkowanie komunikatów, style: shallow, deep"
+
+#: builtin/log.c:1802
+msgid "signature"
+msgstr "podpis"
+
+#: builtin/log.c:1803
+msgid "add a signature"
+msgstr "dodaj podpis"
+
+#: builtin/log.c:1804
+msgid "base-commit"
+msgstr "zapis-podstawy"
+
+#: builtin/log.c:1805
+msgid "add prerequisite tree info to the patch series"
+msgstr "dodaj informacje o wymaganym początkowym drzewie do serii łatek"
+
+#: builtin/log.c:1808
+msgid "add a signature from a file"
+msgstr "dodaj podpis z pliku"
+
+#: builtin/log.c:1809
+msgid "don't print the patch filenames"
+msgstr "nie wypisuj nazw plików łatek"
+
+#: builtin/log.c:1811
+msgid "show progress while generating patches"
+msgstr "pokaż postęp podczas generowania łatek"
+
+#: builtin/log.c:1813
+msgid "show changes against <rev> in cover letter or single patch"
+msgstr ""
+"pokaż zmiany względem <rewizji> w liście motywacyjnym lub pojedynczej łatce"
+
+#: builtin/log.c:1816
+msgid "show changes against <refspec> in cover letter or single patch"
+msgstr ""
+"pokaż zmiany względem <referencji> w liście motywacyjnym lub pojedynczej "
+"łatce"
+
+#: builtin/log.c:1818
+msgid "percentage by which creation is weighted"
+msgstr "procent, według jakiego ważone jest tworzenie"
+
+#: builtin/log.c:1904
+#, c-format
+msgid "invalid ident line: %s"
+msgstr "błędny wiersz tożsamości: %s"
+
+#: builtin/log.c:1919
+msgid "-n and -k are mutually exclusive"
+msgstr "-n i -k się wykluczają"
+
+#: builtin/log.c:1921
+msgid "--subject-prefix/--rfc and -k are mutually exclusive"
+msgstr "--subject-prefix/--rfc i -k się wykluczają"
+
+#: builtin/log.c:1929
+msgid "--name-only does not make sense"
+msgstr "--name-only nie ma sensu"
+
+#: builtin/log.c:1931
+msgid "--name-status does not make sense"
+msgstr "--name-status nie ma sensu"
+
+#: builtin/log.c:1933
+msgid "--check does not make sense"
+msgstr "--check nie ma sensu"
+
+#: builtin/log.c:1955
+msgid "--stdout, --output, and --output-directory are mutually exclusive"
+msgstr "--stdout, --output i --output-directory się wykluczają"
+
+#: builtin/log.c:2078
+msgid "--interdiff requires --cover-letter or single patch"
+msgstr "--interdiff wymaga --cover-letter lub pojedynczej łatki"
+
+#: builtin/log.c:2082
+msgid "Interdiff:"
+msgstr "Różnice w różnicach:"
+
+#: builtin/log.c:2083
+#, c-format
+msgid "Interdiff against v%d:"
+msgstr "Różnice w różnicach względem v%d:"
+
+#: builtin/log.c:2089
+msgid "--creation-factor requires --range-diff"
+msgstr "--creation-factor wymaga --range-diff"
+
+#: builtin/log.c:2093
+msgid "--range-diff requires --cover-letter or single patch"
+msgstr "--range-diff wymaga --cover-letter lub pojedynczej łatki"
+
+#: builtin/log.c:2101
+msgid "Range-diff:"
+msgstr "Różnice zakresów:"
+
+#: builtin/log.c:2102
+#, c-format
+msgid "Range-diff against v%d:"
+msgstr "Różnice zakresów względem v%d:"
+
+#: builtin/log.c:2113
+#, c-format
+msgid "unable to read signature file '%s'"
+msgstr "nie można odczytać pliku podpisu „%s”"
+
+#: builtin/log.c:2149
+msgid "Generating patches"
+msgstr "Generowanie łatek"
+
+#: builtin/log.c:2193
+msgid "failed to create output files"
+msgstr "nie można utworzyć plików wyjściowych"
+
+#: builtin/log.c:2252
+msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+msgstr "git cherry [-v] [<nadrzędna> [<czoło> [<limit>]]]"
+
+#: builtin/log.c:2306
+#, c-format
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgstr ""
+"Nie znaleziono śledzonej zdalnej gałęzi, podaj ręcznie <zdalne-"
+"repozytorium>.\n"
+
+#: builtin/ls-files.c:486
+msgid "git ls-files [<options>] [<file>...]"
+msgstr "git ls-files [<opcje>] [<plik>...]"
+
+#: builtin/ls-files.c:542
+msgid "identify the file status with tags"
+msgstr "opisz stan pliku tagami"
+
+#: builtin/ls-files.c:544
+msgid "use lowercase letters for 'assume unchanged' files"
+msgstr "użyj małych liter do plików o „założonej niezmienności”"
+
+#: builtin/ls-files.c:546
+msgid "use lowercase letters for 'fsmonitor clean' files"
+msgstr "użyj małych liter do plików „prawidłowo monitorowanych”"
+
+#: builtin/ls-files.c:548
+msgid "show cached files in the output (default)"
+msgstr "pokaż w wyjściu zapamiętane pliki (domyślnie)"
+
+#: builtin/ls-files.c:550
+msgid "show deleted files in the output"
+msgstr "pokaż w wyjściu usunięte pliki"
+
+#: builtin/ls-files.c:552
+msgid "show modified files in the output"
+msgstr "pokaż w wyjściu zmienione pliki"
+
+#: builtin/ls-files.c:554
+msgid "show other files in the output"
+msgstr "pokazuj pliki innego typu w wyjściu"
+
+#: builtin/ls-files.c:556
+msgid "show ignored files in the output"
+msgstr "pokaż w wyjściu ignorowane pliki"
+
+#: builtin/ls-files.c:559
+msgid "show staged contents' object name in the output"
+msgstr "pokaż w wyjściu nazwę obiektu przygotowanej zawartości"
+
+#: builtin/ls-files.c:561
+msgid "show files on the filesystem that need to be removed"
+msgstr "pokaż pliki w systemie plików, które należy skasować"
+
+#: builtin/ls-files.c:563
+msgid "show 'other' directories' names only"
+msgstr "pokaż tylko nazwy nieśledzonych katalogów"
+
+#: builtin/ls-files.c:565
+msgid "show line endings of files"
+msgstr "pokaż zakończenia wierszy w plikach"
+
+#: builtin/ls-files.c:567
+msgid "don't show empty directories"
+msgstr "nie pokazuj pustych katalogów"
+
+#: builtin/ls-files.c:570
+msgid "show unmerged files in the output"
+msgstr "pokaż niescalone pliki w wyjściu"
+
+#: builtin/ls-files.c:572
+msgid "show resolve-undo information"
+msgstr "pokaż informacje o resolve-undo"
+
+#: builtin/ls-files.c:574
+msgid "skip files matching pattern"
+msgstr "pomiń pliki spełniające kryteria"
+
+#: builtin/ls-files.c:577
+msgid "exclude patterns are read from <file>"
+msgstr "wzorce wyłączające czytane są z <pliku>"
+
+#: builtin/ls-files.c:580
+msgid "read additional per-directory exclude patterns in <file>"
+msgstr ""
+"odczytaj dodatkowe wzorce wyłączające z poszczególnych katalogów w <pliku>"
+
+#: builtin/ls-files.c:582
+msgid "add the standard git exclusions"
+msgstr "dodaj standardowe wyjątki gita"
+
+#: builtin/ls-files.c:586
+msgid "make the output relative to the project top directory"
+msgstr "podawaj wyjście względem głównego katalogu projektu"
+
+#: builtin/ls-files.c:589
+msgid "recurse through submodules"
+msgstr "schodź do pod-modułów"
+
+#: builtin/ls-files.c:591
+msgid "if any <file> is not in the index, treat this as an error"
+msgstr "jeśli którykolwiek <plik> nie jest w indeksie, potraktuj to jako błąd"
+
+#: builtin/ls-files.c:592
+msgid "tree-ish"
+msgstr "drzewo"
+
+#: builtin/ls-files.c:593
+msgid "pretend that paths removed since <tree-ish> are still present"
+msgstr "udawaj, że ścieżki usunięte po <drzewie> są nadal obecne"
+
+#: builtin/ls-files.c:595
+msgid "show debugging data"
+msgstr "pokaż dane diagnostyczne"
+
+#: builtin/ls-files.c:597
+msgid "suppress duplicate entries"
+msgstr "ukryj podwójne wpisy"
+
+#: 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=<program>]\n"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repozytorium> [<referencje>...]]"
+
+#: builtin/ls-remote.c:60
+msgid "do not print remote URL"
+msgstr "nie wyświetlaj adresu repozytorium"
+
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1404
+msgid "exec"
+msgstr "program"
+
+#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
+msgid "path of git-upload-pack on the remote host"
+msgstr "ścieżka git-upload-pack na zdalnej maszynie"
+
+#: builtin/ls-remote.c:66
+msgid "limit to tags"
+msgstr "ogranicz do tagów"
+
+#: builtin/ls-remote.c:67
+msgid "limit to heads"
+msgstr "ogranicz do głównych gałęzi"
+
+#: builtin/ls-remote.c:68
+msgid "do not show peeled tags"
+msgstr "nie pokazuj obranych tagów"
+
+#: builtin/ls-remote.c:70
+msgid "take url.<base>.insteadOf into account"
+msgstr "weź pod uwagę url.<podstawa>.insteadOf"
+
+#: builtin/ls-remote.c:73
+msgid "exit with exit code 2 if no matching refs are found"
+msgstr "zwróć kod wyjścia 2, jeśli nie znaleziono pasujących referencji"
+
+#: builtin/ls-remote.c:76
+msgid "show underlying ref in addition to the object pointed by it"
+msgstr "pokaż referencję podłoża oprócz obiektu wskazywanego przez nią"
+
+#: builtin/ls-tree.c:30
+msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
+msgstr "git ls-tree [<opcje>] <drzewo> [<ścieżka>...]"
+
+#: builtin/ls-tree.c:128
+msgid "only show trees"
+msgstr "pokaż tylko drzewa"
+
+#: builtin/ls-tree.c:130
+msgid "recurse into subtrees"
+msgstr "schodź do pod-modułów"
+
+#: builtin/ls-tree.c:132
+msgid "show trees when recursing"
+msgstr "pokaż drzewa podczas schodzenia"
+
+#: builtin/ls-tree.c:135
+msgid "terminate entries with NUL byte"
+msgstr "rozdziel elementy znakiem NUL"
+
+#: builtin/ls-tree.c:136
+msgid "include object size"
+msgstr "uwzględnij rozmiar obiektu"
+
+#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
+msgid "list only filenames"
+msgstr "wypisz tylko nazwy plików"
+
+#: builtin/ls-tree.c:143
+msgid "use full path names"
+msgstr "użyj pełnych nazw ścieżek"
+
+#: builtin/ls-tree.c:145
+msgid "list entire tree; not just current directory (implies --full-name)"
+msgstr "wypisz całe drzewo; nie tylko bieżący katalog (zakłada --full-name)"
+
+#: builtin/mailsplit.c:241
+#, c-format
+msgid "empty mbox: '%s'"
+msgstr "pusta skrzynka mbox: „%s”"
+
+#: builtin/merge-base.c:32
+msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgstr "git merge-base [-a | --all] <zapis> <zapis>..."
+
+#: builtin/merge-base.c:33
+msgid "git merge-base [-a | --all] --octopus <commit>..."
+msgstr "git merge-base [-a | --all] --octopus <zapis>..."
+
+#: builtin/merge-base.c:34
+msgid "git merge-base --independent <commit>..."
+msgstr "git merge-base --independent <zapis>..."
+
+#: builtin/merge-base.c:35
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr "git merge-base --is-ancestor <zapis> <zapis>"
+
+#: builtin/merge-base.c:36
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr "git merge-base --fork-point <referencja> [<zapis>]"
+
+#: builtin/merge-base.c:143
+msgid "output all common ancestors"
+msgstr "wypisz wszystkich wspólnych przodków"
+
+#: builtin/merge-base.c:145
+msgid "find ancestors for a single n-way merge"
+msgstr "znajdź przodków pojedynczego n-stronnego scalenia"
+
+#: builtin/merge-base.c:147
+msgid "list revs not reachable from others"
+msgstr "wypisz referencje nieosiągalne z innych"
+
+#: builtin/merge-base.c:149
+msgid "is the first one ancestor of the other?"
+msgstr "czy pierwszy jest przodkiem drugiego?"
+
+#: builtin/merge-base.c:151
+msgid "find where <commit> forked from reflog of <ref>"
+msgstr "znajdź, gdzie <zapis> odgałęził się od dziennika referencji <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 [<opcje>] [-L <nazwa1> [-L <oryg> [-L <nazwa2>]]] <plik1> "
+"<plik-pierw> <plik2>"
+
+#: builtin/merge-file.c:35
+msgid "send results to standard output"
+msgstr "wyślij wynik na standardowe wyjście"
+
+#: builtin/merge-file.c:36
+msgid "use a diff3 based merge"
+msgstr "użyj scalenia opartego o diff3"
+
+#: builtin/merge-file.c:37
+msgid "for conflicts, use our version"
+msgstr "przy konfliktach użyj „naszej” wersji"
+
+#: builtin/merge-file.c:39
+msgid "for conflicts, use their version"
+msgstr "przy konfliktach użyj „ich” wersji"
+
+#: builtin/merge-file.c:41
+msgid "for conflicts, use a union version"
+msgstr "przy konfliktach użyj sumy obu wersji"
+
+#: builtin/merge-file.c:44
+msgid "for conflicts, use this marker size"
+msgstr "przy konfliktach użyj tylu ==/>>/<< w znaczniku"
+
+#: builtin/merge-file.c:45
+msgid "do not warn about conflicts"
+msgstr "nie ostrzegaj o konfliktach"
+
+#: builtin/merge-file.c:47
+msgid "set labels for file1/orig-file/file2"
+msgstr "ustaw etykiety do file1/orig-file/file2"
+
+#: builtin/merge-recursive.c:47
+#, c-format
+msgid "unknown option %s"
+msgstr "nieznana opcja %s"
+
+#: builtin/merge-recursive.c:53
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "nie można przetworzyć obiektu „%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] "nie można obsłużyć więcej niż %d podstawy. Pomijanie %s."
+msgstr[1] "nie można obsłużyć więcej niż %d podstaw. Pomijanie %s."
+msgstr[2] "nie można obsłużyć więcej niż %d podstaw. Pomijanie %s."
+
+#: builtin/merge-recursive.c:65
+msgid "not handling anything other than two heads merge."
+msgstr "nie rozpatrywanie niczego poza scalaniem dwóch czół."
+
+#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "nie można rozwiązać referencji „%s”"
+
+#: builtin/merge-recursive.c:82
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "Scalanie %s z %s\n"
+
+#: builtin/merge.c:58
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<opcje>] [<zapis>...]"
+
+#: builtin/merge.c:59
+msgid "git merge --abort"
+msgstr "git merge --abort"
+
+#: builtin/merge.c:60
+msgid "git merge --continue"
+msgstr "git merge --continue"
+
+#: builtin/merge.c:123
+msgid "switch `m' requires a value"
+msgstr "przełącznik „m” wymaga wartości"
+
+#: builtin/merge.c:146
+#, c-format
+msgid "option `%s' requires a value"
+msgstr "opcja „%s” wymaga wartości"
+
+#: builtin/merge.c:199
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr "Nie znaleziono strategii scalania „%s”.\n"
+
+#: builtin/merge.c:200
+#, c-format
+msgid "Available strategies are:"
+msgstr "Dostępne strategie:"
+
+#: builtin/merge.c:205
+#, c-format
+msgid "Available custom strategies are:"
+msgstr "Dostępne niestandardowe strategie:"
+
+#: builtin/merge.c:256 builtin/pull.c:133
+msgid "do not show a diffstat at the end of the merge"
+msgstr "nie pokazuj statystyk różnic pod koniec scalenia"
+
+#: builtin/merge.c:259 builtin/pull.c:136
+msgid "show a diffstat at the end of the merge"
+msgstr "pokaż statystyki różnic pod koniec scalenia"
+
+#: builtin/merge.c:260 builtin/pull.c:139
+msgid "(synonym to --stat)"
+msgstr "(synonim do --stat)"
+
+#: builtin/merge.c:262 builtin/pull.c:142
+msgid "add (at most <n>) entries from shortlog to merge commit message"
+msgstr ""
+"dodaj (co najwyżej <n>) wpisy z krótkiego dziennika do komunikatu zapisu "
+"scalenia"
+
+#: builtin/merge.c:265 builtin/pull.c:148
+msgid "create a single commit instead of doing a merge"
+msgstr "utwórz pojedynczy zapis zamiast scalać"
+
+#: builtin/merge.c:267 builtin/pull.c:151
+msgid "perform a commit if the merge succeeds (default)"
+msgstr "złóż zapis, jeśli scalenie się powiedzie (domyślnie)"
+
+#: builtin/merge.c:269 builtin/pull.c:154
+msgid "edit message before committing"
+msgstr "edytuj komunikat przed złożeniem"
+
+#: builtin/merge.c:271
+msgid "allow fast-forward (default)"
+msgstr "zezwól na przewijanie (domyślne)"
+
+#: builtin/merge.c:273 builtin/pull.c:161
+msgid "abort if fast-forward is not possible"
+msgstr "przerwij, jeśli przewinięcie nie jest możliwe"
+
+#: builtin/merge.c:277 builtin/pull.c:164
+msgid "verify that the named commit has a valid GPG signature"
+msgstr "zweryfikuj, czy podany zapis ma prawidłowy podpis GPG"
+
+#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
+#: builtin/rebase.c:541 builtin/rebase.c:1418 builtin/revert.c:114
+msgid "strategy"
+msgstr "strategia"
+
+#: builtin/merge.c:279 builtin/pull.c:169
+msgid "merge strategy to use"
+msgstr "strategia scalania"
+
+#: builtin/merge.c:280 builtin/pull.c:172
+msgid "option=value"
+msgstr "opcja=wartość"
+
+#: builtin/merge.c:281 builtin/pull.c:173
+msgid "option for selected merge strategy"
+msgstr "opcja wybranej strategii scalania"
+
+#: builtin/merge.c:283
+msgid "merge commit message (for a non-fast-forward merge)"
+msgstr "komunikat zapisu scalenia (do nieprzewiniętego scalenia)"
+
+#: builtin/merge.c:290
+msgid "abort the current in-progress merge"
+msgstr "przerwij bieżące trwające scalanie"
+
+#: builtin/merge.c:292
+msgid "--abort but leave index and working tree alone"
+msgstr "jak --abort, ale zostaw w spokoju indeks i drzewo robocze"
+
+#: builtin/merge.c:294
+msgid "continue the current in-progress merge"
+msgstr "kontynuuj bieżące trwające scalanie"
+
+#: builtin/merge.c:296 builtin/pull.c:180
+msgid "allow merging unrelated histories"
+msgstr "zezwól na scalenie niepowiązanych historii"
+
+#: builtin/merge.c:303
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr "omiń skrypty pre-merge-commit i commit-msg"
+
+#: builtin/merge.c:320
+msgid "could not run stash."
+msgstr "nie można wykonać dodania do schowka."
+
+#: builtin/merge.c:325
+msgid "stash failed"
+msgstr "dodanie zmian do schowka nie powiodło się"
+
+#: builtin/merge.c:330
+#, c-format
+msgid "not a valid object: %s"
+msgstr "nieprawidłowy obiekt: %s"
+
+#: builtin/merge.c:352 builtin/merge.c:369
+msgid "read-tree failed"
+msgstr "read-tree nie powiodło się"
+
+#: builtin/merge.c:399
+msgid " (nothing to squash)"
+msgstr " (nic do spłaszczenia)"
+
+#: builtin/merge.c:410
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr "Spłaszczony zapis — nie aktualizowanie HEAD\n"
+
+#: builtin/merge.c:460
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr "Brak komunikatu scalenia — nie aktualizowanie HEAD\n"
+
+#: builtin/merge.c:511
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr "„%s” nie wskazuje na zapis"
+
+#: builtin/merge.c:598
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr "Zły łańcuch branch.%s.mergeoptions: %s"
+
+#: builtin/merge.c:724
+msgid "Not handling anything other than two heads merge."
+msgstr "Nie rozpatrywanie niczego poza scalaniem dwóch czół."
+
+#: builtin/merge.c:737
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr "Nieznana opcja merge-recursive: -X%s"
+
+#: builtin/merge.c:756 t/helper/test-fast-rebase.c:209
+#, c-format
+msgid "unable to write %s"
+msgstr "nie można zapisać %s"
+
+#: builtin/merge.c:808
+#, c-format
+msgid "Could not read from '%s'"
+msgstr "Nie można odczytać „%s”"
+
+#: builtin/merge.c:817
+#, c-format
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+msgstr "Nie składanie scalenia; użyj „git commit”, aby ukończyć scalanie.\n"
+
+#: builtin/merge.c:823
+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 ""
+"Podaj komunikat zapisu, żeby wyjaśnić, dlaczego to scalenie jest konieczne,\n"
+"zwłaszcza jeśli scala zaktualizowaną gałąź nadrzędną z gałęzią tematyczną.\n"
+"\n"
+
+#: builtin/merge.c:828
+msgid "An empty message aborts the commit.\n"
+msgstr "Pusty komunikat przerywa zapis.\n"
+
+#: builtin/merge.c:831
+#, c-format
+msgid ""
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
+"Wiersze zaczynające się od „%c” będą ignorowane, a pusty komunikat\n"
+"przerwie zapis.\n"
+
+#: builtin/merge.c:884
+msgid "Empty commit message."
+msgstr "Pusty komunikat zapisu."
+
+#: builtin/merge.c:899
+#, c-format
+msgid "Wonderful.\n"
+msgstr "Wspaniale.\n"
+
+#: builtin/merge.c:960
+#, c-format
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgstr ""
+"Automatyczne scalanie nie powiodło się; napraw konflikty i złóż wynik.\n"
+
+#: builtin/merge.c:999
+msgid "No current branch."
+msgstr "Nie ma bieżącej gałęzi."
+
+#: builtin/merge.c:1001
+msgid "No remote for the current branch."
+msgstr "Bieżąca gałąź nie ma zdalnego repozytorium."
+
+#: builtin/merge.c:1003
+msgid "No default upstream defined for the current branch."
+msgstr "Nie zdefiniowano gałęzi nadrzędnej wobec bieżącej."
+
+#: builtin/merge.c:1008
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
+msgstr "Brak gałęzi śledzącej dla %s z %s"
+
+#: builtin/merge.c:1065
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "Błędna wartość „%s” w środowisku „%s”"
+
+#: builtin/merge.c:1168
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr "to nie jest coś, co można scalić w %s: %s"
+
+#: builtin/merge.c:1202
+msgid "not something we can merge"
+msgstr "to nie jest coś, co można scalić"
+
+#: builtin/merge.c:1312
+msgid "--abort expects no arguments"
+msgstr "--abort nie przyjmuje argumentów"
+
+#: builtin/merge.c:1316
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr "Nie ma scalenia, które można by przerwać (brak MERGE_HEAD)."
+
+#: builtin/merge.c:1334
+msgid "--quit expects no arguments"
+msgstr "--quit nie przyjmuje argumentów"
+
+#: builtin/merge.c:1347
+msgid "--continue expects no arguments"
+msgstr "--continue nie przyjmuje argumentów"
+
+#: builtin/merge.c:1351
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr "Nie trwa żadne scalenie (brak MERGE_HEAD)."
+
+#: builtin/merge.c:1367
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+"Nie zwieńczono scalania (MERGE_HEAD istnieje).\n"
+"Złóż swoje zmiany przed scaleniem."
+
+#: builtin/merge.c:1374
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+"Nie zwieńczono dobierania (CHERRY_PICK_HEAD istnieje).\n"
+"Złóż swoje zmiany przed scaleniem."
+
+#: builtin/merge.c:1377
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+msgstr "Nie zwieńczono dobierania (CHERRY_PICK_HEAD istnieje)."
+
+#: builtin/merge.c:1391
+msgid "You cannot combine --squash with --no-ff."
+msgstr "--squash i --no-ff się wykluczają."
+
+#: builtin/merge.c:1393
+msgid "You cannot combine --squash with --commit."
+msgstr "--squash i --commit się wykluczają."
+
+#: builtin/merge.c:1409
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr "Nie podano zapisu, a nie ustawiono merge.defaultToUpstream."
+
+#: builtin/merge.c:1426
+msgid "Squash commit into empty head not supported yet"
+msgstr "Spłaszczenie zapisu w puste czoło nie jest jeszcze wspierane"
+
+#: builtin/merge.c:1428
+msgid "Non-fast-forward commit does not make sense into an empty head"
+msgstr "Nieprzewinięty zapis nie ma sensu przy pustym czele (HEAD) gałęzi"
+
+#: builtin/merge.c:1433
+#, c-format
+msgid "%s - not something we can merge"
+msgstr "%s — nie jest czymś, co możemy scalić"
+
+#: builtin/merge.c:1435
+msgid "Can merge only exactly one commit into empty head"
+msgstr "Można scalić tylko dokładnie jeden zapis w puste czoło"
+
+#: builtin/merge.c:1516
+msgid "refusing to merge unrelated histories"
+msgstr "odmawiam scalenia niepowiązanych historii"
+
+#: builtin/merge.c:1525
+msgid "Already up to date."
+msgstr "Już aktualne."
+
+#: builtin/merge.c:1535
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr "Aktualizowanie %s..%s\n"
+
+#: builtin/merge.c:1581
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr "Próba naprawdę trywialnego scalenia w indeksie...\n"
+
+#: builtin/merge.c:1588
+#, c-format
+msgid "Nope.\n"
+msgstr "O nie.\n"
+
+#: builtin/merge.c:1613
+msgid "Already up to date. Yeeah!"
+msgstr "Już aktualne. Hurra!"
+
+#: builtin/merge.c:1619
+msgid "Not possible to fast-forward, aborting."
+msgstr "Nie da się przewinąć, przerywanie."
+
+#: builtin/merge.c:1647 builtin/merge.c:1712
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr "Cofanie drzewa do nieskalanego stanu...\n"
+
+#: builtin/merge.c:1651
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr "Próba strategii scalania %s...\n"
+
+#: builtin/merge.c:1703
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr "Żadna strategia scalania nie podołała temu scalaniu.\n"
+
+#: builtin/merge.c:1705
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr "Scalanie ze strategią %s nie powiodło się.\n"
+
+#: builtin/merge.c:1714
+#, c-format
+msgid "Using the %s to prepare resolving by hand.\n"
+msgstr "Użycie %s, żeby przygotować ręczne rozwiązywanie.\n"
+
+#: builtin/merge.c:1728
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
+msgstr ""
+"Automatyczne scalanie powiodło się; zatrzymano przez złożeniem, jak "
+"polecono\n"
+
+#: builtin/mktag.c:10
+msgid "git mktag"
+msgstr "git mktag"
+
+#: builtin/mktag.c:30
+#, c-format
+msgid "warning: tag input does not pass fsck: %s"
+msgstr "ostrzeżenie: wejście tagu nie przechodzi sprawdzenia fsck: %s"
+
+#: builtin/mktag.c:41
+#, c-format
+msgid "error: tag input does not pass fsck: %s"
+msgstr "błąd: wejście tagu nie przechodzi sprawdzenia fsck: %s"
+
+#: builtin/mktag.c:44
+#, c-format
+msgid "%d (FSCK_IGNORE?) should never trigger this callback"
+msgstr "%d (FSCK_IGNORE?) nie powinno nigdy wyzwolić tej funkcji zwrotnej"
+
+#: builtin/mktag.c:59
+#, c-format
+msgid "could not read tagged object '%s'"
+msgstr "nie można odczytać otagowanego obiektu „%s”"
+
+#: builtin/mktag.c:62
+#, c-format
+msgid "object '%s' tagged as '%s', but is a '%s' type"
+msgstr "obiekt „%s” otagowany jako „%s”, ale jest rodzaju „%s”"
+
+#: builtin/mktag.c:99
+msgid "tag on stdin did not pass our strict fsck check"
+msgstr ""
+"tag na standardowym wejściu nie przeszedł naszego ścisłego sprawdzenia fsck"
+
+#: builtin/mktag.c:102
+msgid "tag on stdin did not refer to a valid object"
+msgstr "tag na standardowym wejściu nie odnosił się do prawidłowego obiektu"
+
+#: builtin/mktag.c:105 builtin/tag.c:232
+msgid "unable to write tag file"
+msgstr "nie można zapisać pliku tagu"
+
+#: 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 "wejście jest zakończone znakiem NUL"
+
+#: builtin/mktree.c:155 builtin/write-tree.c:26
+msgid "allow missing objects"
+msgstr "zezwól na brakujące obiekty"
+
+#: builtin/mktree.c:156
+msgid "allow creation of more than one tree"
+msgstr "pozwól na tworzenie więcej niż jednego drzewa"
+
+#: builtin/multi-pack-index.c:9
+msgid ""
+"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
+"size=<size>)"
+msgstr ""
+"git multi-pack-index [<opcje>] (write|verify|expire|repack --batch-"
+"size=<rozmiar>)"
+
+#: builtin/multi-pack-index.c:26
+msgid "object directory containing set of packfile and pack-index pairs"
+msgstr "katalog obiektu ze zbiorem par pliku paczki i indeksu paczki"
+
+#: 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 ""
+"podczas przepakowania zbierz pliki paczek mniejszego rozmiaru w porcję "
+"większą niż ten rozmiar"
+
+#: builtin/multi-pack-index.c:50 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 builtin/prune-packed.c:25 builtin/tag.c:575
+msgid "too many arguments"
+msgstr "za dużo argumentów"
+
+#: builtin/multi-pack-index.c:60
+msgid "--batch-size option is only for 'repack' subcommand"
+msgstr "opcja --batch-size jest tylko do pod-polecenia „repack”"
+
+#: builtin/multi-pack-index.c:69
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "nieznane pod-polecenie: %s"
+
+#: builtin/mv.c:18
+msgid "git mv [<options>] <source>... <destination>"
+msgstr "git mv [<opcje>] <źródło>... <cel>"
+
+#: builtin/mv.c:83
+#, c-format
+msgid "Directory %s is in index and no submodule?"
+msgstr "Katalog %s jest w indeksie i brak pod-modułu?"
+
+#: builtin/mv.c:85
+msgid "Please stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+"Przygotuj swoje zmiany w .gitmodules lub dodaj do schowka, aby kontynuować"
+
+#: builtin/mv.c:103
+#, c-format
+msgid "%.*s is in index"
+msgstr "%.*s jest w indeksie"
+
+#: builtin/mv.c:125
+msgid "force move/rename even if target exists"
+msgstr "wymuś przeniesienie/zmianę nazwy nawet jeśli cel istnieje"
+
+#: builtin/mv.c:127
+msgid "skip move/rename errors"
+msgstr "pomiń błędy przenoszenia/zmiany nazwy"
+
+#: builtin/mv.c:170
+#, c-format
+msgid "destination '%s' is not a directory"
+msgstr "cel „%s” nie jest katalogiem"
+
+#: builtin/mv.c:181
+#, c-format
+msgid "Checking rename of '%s' to '%s'\n"
+msgstr "Sprawdzanie zmiany nazwy „%s” na „%s”\n"
+
+#: builtin/mv.c:185
+msgid "bad source"
+msgstr "złe źródło"
+
+#: builtin/mv.c:188
+msgid "can not move directory into itself"
+msgstr "nie można przenieść katalogu do niego samego"
+
+#: builtin/mv.c:191
+msgid "cannot move directory over file"
+msgstr "nie można przesunąć katalogu na plik"
+
+#: builtin/mv.c:200
+msgid "source directory is empty"
+msgstr "katalog źródłowy jest pusty"
+
+#: builtin/mv.c:225
+msgid "not under version control"
+msgstr "nie podlega kontroli wersji"
+
+#: builtin/mv.c:227
+msgid "conflicted"
+msgstr "skonfliktowane"
+
+#: builtin/mv.c:230
+msgid "destination exists"
+msgstr "cel istnieje"
+
+#: builtin/mv.c:238
+#, c-format
+msgid "overwriting '%s'"
+msgstr "nadpisywanie „%s”"
+
+#: builtin/mv.c:241
+msgid "Cannot overwrite"
+msgstr "Nie można nadpisać"
+
+#: builtin/mv.c:244
+msgid "multiple sources for the same target"
+msgstr "wiele źródeł do tego samego celu"
+
+#: builtin/mv.c:246
+msgid "destination directory does not exist"
+msgstr "katalog docelowy nie istnieje"
+
+#: builtin/mv.c:253
+#, c-format
+msgid "%s, source=%s, destination=%s"
+msgstr "%s, źródło=%s, cel=%s"
+
+#: builtin/mv.c:274
+#, c-format
+msgid "Renaming %s to %s\n"
+msgstr "Zmiana nazwy z %s na %s\n"
+
+#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:483
+#, c-format
+msgid "renaming '%s' failed"
+msgstr "nie można zmienić nazwy „%s”"
+
+#: builtin/name-rev.c:465
+msgid "git name-rev [<options>] <commit>..."
+msgstr "git name-rev [<opcje>] <zapis>..."
+
+#: builtin/name-rev.c:466
+msgid "git name-rev [<options>] --all"
+msgstr "git name-rev [<opcje>] --all"
+
+#: builtin/name-rev.c:467
+msgid "git name-rev [<options>] --stdin"
+msgstr "git name-rev [<opcje>] --stdin"
+
+#: builtin/name-rev.c:524
+msgid "print only ref-based names (no object names)"
+msgstr "wypisz tylko nazwy oparte o referencje (bez nazw obiektów)"
+
+#: builtin/name-rev.c:525
+msgid "only use tags to name the commits"
+msgstr "użyj tagów tylko do nazwania zapisów"
+
+#: builtin/name-rev.c:527
+msgid "only use refs matching <pattern>"
+msgstr "użyj tylko referencji pasujących do <wzorca>"
+
+#: builtin/name-rev.c:529
+msgid "ignore refs matching <pattern>"
+msgstr "pomiń referencje pasujące do <wzorca>"
+
+#: builtin/name-rev.c:531
+msgid "list all commits reachable from all refs"
+msgstr "wypisz wszystkie zapisy osiągalne ze wszystkich referencji"
+
+#: builtin/name-rev.c:532
+msgid "read from stdin"
+msgstr "czytaj ze standardowego wejścia"
+
+#: builtin/name-rev.c:533
+msgid "allow to print `undefined` names (default)"
+msgstr "pozwól wypisać „niezdefiniowane” nazwy (domyślnie)"
+
+#: builtin/name-rev.c:539
+msgid "dereference tags in the input (internal use)"
+msgstr "zaglądaj do tagów z wejścia (użycie wewnętrzne)"
+
+#: builtin/notes.c:28
+msgid "git notes [--ref <notes-ref>] [list [<object>]]"
+msgstr "git notes [--ref <ref-uwagi>] [list [<obiekt>]]"
+
+#: 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 <ref-uwagi>] add [-f] [--allow-empty] [-m <komunikat> | -F "
+"<plik> | (-c | -C) <obiekt>] [<obiekt>]"
+
+#: builtin/notes.c:30
+msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
+msgstr "git notes [--ref <ref-uwagi>] copy [-f] <obiekt-z> <obiekt-do>"
+
+#: 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 <ref-uwagi>] append [--allow-empty] [-m <komunikat> | -F "
+"<plik> | (-c | -C) <obiekt>] [<obiekt>]"
+
+#: builtin/notes.c:32
+msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
+msgstr "git notes [--ref <ref-uwagi>] edit [--allow-empty] [<obiekt>]"
+
+#: builtin/notes.c:33
+msgid "git notes [--ref <notes-ref>] show [<object>]"
+msgstr "git notes [--ref <ref-uwagi>] show [<obiekt>]"
+
+#: builtin/notes.c:34
+msgid ""
+"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+msgstr ""
+"git notes [--ref <referencja-uwag>] merge [-v | -q] [-s <strategia>] "
+"<referencja-uwag>"
+
+#: 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 <ref-uwagi>] remove [<obiekt>...]"
+
+#: builtin/notes.c:38
+msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
+msgstr "git notes [--ref <ref-uwag>] prune [-n] [-v]"
+
+#: builtin/notes.c:39
+msgid "git notes [--ref <notes-ref>] get-ref"
+msgstr "git notes [--ref <referencja-uwagi>] get-ref"
+
+#: builtin/notes.c:44
+msgid "git notes [list [<object>]]"
+msgstr "git notes [list [<obiekt>]]"
+
+#: builtin/notes.c:49
+msgid "git notes add [<options>] [<object>]"
+msgstr "git notes add [<opcje>] [<obiekt>]"
+
+#: builtin/notes.c:54
+msgid "git notes copy [<options>] <from-object> <to-object>"
+msgstr "git notes copy [<opcje>] <obiekt-z> <obiekt-do>"
+
+#: builtin/notes.c:55
+msgid "git notes copy --stdin [<from-object> <to-object>]..."
+msgstr "git notes copy --stdin [<obiekt-z> <obiekt-do>]..."
+
+#: builtin/notes.c:60
+msgid "git notes append [<options>] [<object>]"
+msgstr "git notes append [<opcje>] [<obiekt>]"
+
+#: builtin/notes.c:65
+msgid "git notes edit [<object>]"
+msgstr "git notes edit [<obiekt>]"
+
+#: builtin/notes.c:70
+msgid "git notes show [<object>]"
+msgstr "git notes show [<obiekt>]"
+
+#: builtin/notes.c:75
+msgid "git notes merge [<options>] <notes-ref>"
+msgstr "git notes merge [<opcje>] <ref-uwagi>"
+
+#: builtin/notes.c:76
+msgid "git notes merge --commit [<options>]"
+msgstr "git notes merge --commit [<opcje>]"
+
+#: builtin/notes.c:77
+msgid "git notes merge --abort [<options>]"
+msgstr "git notes merge --abort [<opcje>]"
+
+#: builtin/notes.c:82
+msgid "git notes remove [<object>]"
+msgstr "git notes remove [<obiekt>]"
+
+#: builtin/notes.c:87
+msgid "git notes prune [<options>]"
+msgstr "git notes prune [<opcje>]"
+
+#: 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 "Zapisz/edytuj uwagi do następującego obiektu:"
+
+#: builtin/notes.c:150
+#, c-format
+msgid "unable to start 'show' for object '%s'"
+msgstr "nie można uruchomić „show” na obiekcie „%s”"
+
+#: builtin/notes.c:154
+msgid "could not read 'show' output"
+msgstr "nie można odczytać wyjścia „show”"
+
+#: builtin/notes.c:162
+#, c-format
+msgid "failed to finish 'show' for object '%s'"
+msgstr "nie można ukończyć „show” na obiekcie „%s”"
+
+#: builtin/notes.c:197
+msgid "please supply the note contents using either -m or -F option"
+msgstr "należy podać zawartość notatki przy użyciu opcji -m lub -F"
+
+#: builtin/notes.c:206
+msgid "unable to write note object"
+msgstr "nie można zapisać obiektu uwagi"
+
+#: builtin/notes.c:208
+#, c-format
+msgid "the note contents have been left in %s"
+msgstr "pozostawiono zawartość uwagi w %s"
+
+#: builtin/notes.c:242 builtin/tag.c:565
+#, c-format
+msgid "could not open or read '%s'"
+msgstr "nie można otworzyć lub odczytać „%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 "nie można rozwiązać „%s” jako prawidłowej referencji."
+
+#: builtin/notes.c:265
+#, c-format
+msgid "failed to read object '%s'."
+msgstr "nie można odczytać obiektu „%s”."
+
+#: builtin/notes.c:268
+#, c-format
+msgid "cannot read note data from non-blob object '%s'."
+msgstr "nie można odczytać danych uwagi z obiektu „%s” niebędącego blobem."
+
+#: builtin/notes.c:309
+#, c-format
+msgid "malformed input line: '%s'."
+msgstr "uszkodzony wiersz wejścia: „%s”."
+
+#: builtin/notes.c:324
+#, c-format
+msgid "failed to copy notes from '%s' to '%s'"
+msgstr "nie można skopiować uwag z „%s” do „%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 "notes %s: odmawiam wykonania w %s (poza refs/notes/)"
+
+#: builtin/notes.c:389 builtin/notes.c:678
+#, c-format
+msgid "no note found for object %s."
+msgstr "brak uwag do obiektu %s."
+
+#: builtin/notes.c:410 builtin/notes.c:576
+msgid "note contents as a string"
+msgstr "zawartość uwagi jako łańcuch"
+
+#: builtin/notes.c:413 builtin/notes.c:579
+msgid "note contents in a file"
+msgstr "zawartość uwag w pliku"
+
+#: builtin/notes.c:416 builtin/notes.c:582
+msgid "reuse and edit specified note object"
+msgstr "użyj ponownie i edytuj podany obiekt uwagi"
+
+#: builtin/notes.c:419 builtin/notes.c:585
+msgid "reuse specified note object"
+msgstr "odrzuć podany obiekt węzła"
+
+#: builtin/notes.c:422 builtin/notes.c:588
+msgid "allow storing empty note"
+msgstr "pozwól zachować pustą uwagę"
+
+#: builtin/notes.c:423 builtin/notes.c:496
+msgid "replace existing notes"
+msgstr "zastąp istniejące uwagi"
+
+#: builtin/notes.c:448
+#, c-format
+msgid ""
+"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr ""
+"Nie można dodać uwag. Znaleziono istniejące uwagi do obiektu %s. Użyj „-f”, "
+"aby nadpisać istniejące uwagi"
+
+#: builtin/notes.c:463 builtin/notes.c:544
+#, c-format
+msgid "Overwriting existing notes for object %s\n"
+msgstr "Nadpisywanie istniejących uwag do obiektu %s\n"
+
+#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#, c-format
+msgid "Removing note for object %s\n"
+msgstr "Usuwanie uwagi do obiektu %s\n"
+
+#: builtin/notes.c:497
+msgid "read objects from stdin"
+msgstr "wczytaj obiekty ze standardowego wejścia"
+
+#: builtin/notes.c:499
+msgid "load rewriting config for <command> (implies --stdin)"
+msgstr "wczytaj ustawienia przepisywania dla <polecenia> (zakłada --stdin)"
+
+#: builtin/notes.c:517
+msgid "too few arguments"
+msgstr "za mało argumentów"
+
+#: builtin/notes.c:538
+#, c-format
+msgid ""
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr ""
+"Nie można skopiować uwag. Znaleziono istniejące uwagi do obiektu %s. Użyj „-"
+"f”, aby nadpisać istniejące uwagi"
+
+#: builtin/notes.c:550
+#, c-format
+msgid "missing notes on source object %s. Cannot copy."
+msgstr "brakuje uwag do obiektu źródłowego %s. Nie można skopiować."
+
+#: 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 ""
+"Opcje -m/-F/-c/-C są przestarzałe w pod-poleceniu „edit”.\n"
+"użyj zamiast tego „git notes add -f -m/-F/-c/-C”.\n"
+
+#: builtin/notes.c:698
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+msgstr "nie można usunąć referencji NOTES_MERGE_PARTIAL"
+
+#: builtin/notes.c:700
+msgid "failed to delete ref NOTES_MERGE_REF"
+msgstr "nie można usunąć referencji NOTES_MERGE_REF"
+
+#: builtin/notes.c:702
+msgid "failed to remove 'git notes merge' worktree"
+msgstr "nie można usunąć drzewa roboczego „git notes merge”"
+
+#: builtin/notes.c:722
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr "nie można odczytać referencji NOTES_MERGE_PARTIAL"
+
+#: builtin/notes.c:724
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
+msgstr "nie znaleziono zapisu z NOTES_MERGE_PARTIAL."
+
+#: builtin/notes.c:726
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+msgstr "nie można przetworzyć zapisu z NOTES_MERGE_PARTIAL."
+
+#: builtin/notes.c:739
+msgid "failed to resolve NOTES_MERGE_REF"
+msgstr "nie można rozwiązać NOTES_MERGE_REF"
+
+#: builtin/notes.c:742
+msgid "failed to finalize notes merge"
+msgstr "nie można zwieńczyć scalenia uwag"
+
+#: builtin/notes.c:768
+#, c-format
+msgid "unknown notes merge strategy %s"
+msgstr "nieznana strategia scalenia uwag %s"
+
+#: builtin/notes.c:784
+msgid "General options"
+msgstr "Opcje ogólne"
+
+#: builtin/notes.c:786
+msgid "Merge options"
+msgstr "Opcje scalania"
+
+#: builtin/notes.c:788
+msgid ""
+"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
+"cat_sort_uniq)"
+msgstr ""
+"rozwiąż konflikty uwag używając podanej strategii (manual/ours/theirs/union/"
+"cat_sort_uniq)"
+
+#: builtin/notes.c:790
+msgid "Committing unmerged notes"
+msgstr "Składanie niescalonych uwag"
+
+#: builtin/notes.c:792
+msgid "finalize notes merge by committing unmerged notes"
+msgstr "zwieńcz scalenie uwag składając niescalone uwagi"
+
+#: builtin/notes.c:794
+msgid "Aborting notes merge resolution"
+msgstr "Przerywanie rozwiązania scalenia uwag"
+
+#: builtin/notes.c:796
+msgid "abort notes merge"
+msgstr "przerwij scalanie uwag"
+
+#: builtin/notes.c:807
+msgid "cannot mix --commit, --abort or -s/--strategy"
+msgstr "--commit, --abort i -s/--strategy wykluczają się"
+
+#: builtin/notes.c:812
+msgid "must specify a notes ref to merge"
+msgstr "należy podać referencję uwag do scalenia"
+
+#: builtin/notes.c:836
+#, c-format
+msgid "unknown -s/--strategy: %s"
+msgstr "nieznana wartość -s/--strategy: %s"
+
+#: builtin/notes.c:873
+#, c-format
+msgid "a notes merge into %s is already in-progress at %s"
+msgstr "scalenie uwag do %s już trwa w %s"
+
+#: builtin/notes.c:876
+#, c-format
+msgid "failed to store link to current notes ref (%s)"
+msgstr "nie można zapisać dowiązania do bieżącej referencji uwag (%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 ""
+"Automatyczne scalanie uwag nie powiodło się. Napraw konflikty w %s i złóż "
+"wynik przez „git notes merge --commit”, lub przerwij scalanie przez „git "
+"notes merge --abort”.\n"
+
+#: builtin/notes.c:897 builtin/tag.c:578
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "Nie można rozwiązać „%s” jako prawidłowej referencji."
+
+#: builtin/notes.c:900
+#, c-format
+msgid "Object %s has no note\n"
+msgstr "Obiekt %s nie ma uwag\n"
+
+#: builtin/notes.c:912
+msgid "attempt to remove non-existent note is not an error"
+msgstr "próba usunięcia nieistniejącej uwagi nie jest błędem"
+
+#: builtin/notes.c:915
+msgid "read object names from the standard input"
+msgstr "odczytaj nazwy obiektów ze standardowego wejścia"
+
+#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148
+msgid "do not remove, show only"
+msgstr "nie usuwaj, tylko pokaż"
+
+#: builtin/notes.c:955
+msgid "report pruned notes"
+msgstr "zgłaszaj przycięte uwagi"
+
+#: builtin/notes.c:998
+msgid "notes-ref"
+msgstr "ref-uwagi"
+
+#: builtin/notes.c:999
+msgid "use notes from <notes-ref>"
+msgstr "użyj uwag z <referencja-uwagi>"
+
+#: builtin/notes.c:1034 builtin/stash.c:1671
+#, c-format
+msgid "unknown subcommand: %s"
+msgstr "nieznana podkomenda: %s"
+
+#: builtin/pack-objects.c:54
+msgid ""
+"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
+msgstr ""
+"git pack-objects --stdout [<opcje>...] [< <lista-referencji> | < <lista-"
+"obiektów>]"
+
+#: builtin/pack-objects.c:55
+msgid ""
+"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
+msgstr ""
+"git pack-objects [<opcje>...] <baza> [< <lista-referencji> | < <lista-"
+"obiektów>]"
+
+#: builtin/pack-objects.c:440
+#, c-format
+msgid ""
+"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
+"pack %s"
+msgstr ""
+"write_reuse_object: nie odnaleziono %s, oczekiwano na pozycji %<PRIuMAX> w "
+"paczce %s"
+
+#: builtin/pack-objects.c:448
+#, c-format
+msgid "bad packed object CRC for %s"
+msgstr "zły CRC spakowanego obiektu dla %s"
+
+#: builtin/pack-objects.c:459
+#, c-format
+msgid "corrupt packed object for %s"
+msgstr "uszkodzony spakowany obiekt dla %s"
+
+#: builtin/pack-objects.c:590
+#, c-format
+msgid "recursive delta detected for object %s"
+msgstr "wykryto rekurencyjną deltę dla obiektu %s"
+
+#: builtin/pack-objects.c:801
+#, c-format
+msgid "ordered %u objects, expected %<PRIu32>"
+msgstr "zamówiono %u obiektów, oczekiwano %<PRIu32>"
+
+#: builtin/pack-objects.c:896
+#, c-format
+msgid "expected object at offset %<PRIuMAX> in pack %s"
+msgstr "oczekiwano obiektu na pozycji %<PRIuMAX> w paczce %s"
+
+#: builtin/pack-objects.c:1015
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr ""
+"wyłączone zapisywanie bitmapy, paczki są dzielone według pack.packSizeLimit"
+
+#: builtin/pack-objects.c:1028
+msgid "Writing objects"
+msgstr "Zapisywanie obiektów"
+
+#: builtin/pack-objects.c:1089 builtin/update-index.c:90
+#, c-format
+msgid "failed to stat %s"
+msgstr "nie można wykonać stat na „%s”"
+
+#: builtin/pack-objects.c:1141
+#, c-format
+msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
+msgstr "wypisano %<PRIu32> obiektów, a oczekiwano %<PRIu32>"
+
+#: builtin/pack-objects.c:1358
+msgid "disabling bitmap writing, as some objects are not being packed"
+msgstr "wyłączanie zapisywania bitmapy, niektóre obiekty nie są pakowane"
+
+#: builtin/pack-objects.c:1806
+#, c-format
+msgid "delta base offset overflow in pack for %s"
+msgstr "przepełnienie podstawowego przesunięcia delty w paczce w %s"
+
+#: builtin/pack-objects.c:1815
+#, c-format
+msgid "delta base offset out of bound for %s"
+msgstr "podstawowe przesunięcie delty poza zakresem w %s"
+
+#: builtin/pack-objects.c:2096
+msgid "Counting objects"
+msgstr "Zliczanie obiektów"
+
+#: builtin/pack-objects.c:2241
+#, c-format
+msgid "unable to parse object header of %s"
+msgstr "nie można przetworzyć nagłówka obiektu %s"
+
+#: builtin/pack-objects.c:2311 builtin/pack-objects.c:2327
+#: builtin/pack-objects.c:2337
+#, c-format
+msgid "object %s cannot be read"
+msgstr "nie można odczytać obiektu %s"
+
+#: builtin/pack-objects.c:2314 builtin/pack-objects.c:2341
+#, c-format
+msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
+msgstr "niespójna długość obiektu %s (%<PRIuMAX> vs %<PRIuMAX>)"
+
+#: builtin/pack-objects.c:2351
+msgid "suboptimal pack - out of memory"
+msgstr "nieoptymalna paczka — brak pamięci"
+
+#: builtin/pack-objects.c:2666
+#, c-format
+msgid "Delta compression using up to %d threads"
+msgstr "Kompresja delt z użyciem do %d wątków"
+
+#: builtin/pack-objects.c:2805
+#, c-format
+msgid "unable to pack objects reachable from tag %s"
+msgstr "nie można spakować obiektów osiągalnych z tagu %s"
+
+#: builtin/pack-objects.c:2891
+msgid "Compressing objects"
+msgstr "Kompresowanie obiektów"
+
+#: builtin/pack-objects.c:2897
+msgid "inconsistency with delta count"
+msgstr "niespójność z liczbą delt"
+
+#: builtin/pack-objects.c:2976
+#, c-format
+msgid ""
+"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
+"hash> <uri>' (got '%s')"
+msgstr ""
+"wartość uploadpack.blobpackfileuri musi być postaci „<skrót-obiektu> <skrót-"
+"paczki> <uri>” (otrzymano „%s”)"
+
+#: builtin/pack-objects.c:2979
+#, c-format
+msgid ""
+"object already configured in another uploadpack.blobpackfileuri (got '%s')"
+msgstr ""
+"już ustawiono obiekt w innym uploadpack.blobpackfileuri (otrzymano „%s”)"
+
+#: builtin/pack-objects.c:3008
+#, c-format
+msgid ""
+"expected edge object ID, got garbage:\n"
+" %s"
+msgstr ""
+"oczekiwano identyfikatora obiektu krawędzi, otrzymano śmieci:\n"
+"%s"
+
+#: builtin/pack-objects.c:3014
+#, c-format
+msgid ""
+"expected object ID, got garbage:\n"
+" %s"
+msgstr ""
+"oczekiwano identyfikatora obiektu, otrzymano śmieci:\n"
+"%s"
+
+#: builtin/pack-objects.c:3112
+msgid "invalid value for --missing"
+msgstr "nieprawidłowa wartość --missing"
+
+#: builtin/pack-objects.c:3171 builtin/pack-objects.c:3279
+msgid "cannot open pack index"
+msgstr "nie można otworzyć indeksu paczki"
+
+#: builtin/pack-objects.c:3202
+#, c-format
+msgid "loose object at %s could not be examined"
+msgstr "nie można przebadać wolnego obiektu w %s"
+
+#: builtin/pack-objects.c:3287
+msgid "unable to force loose object"
+msgstr "nie można wymusić wolnego obiektu"
+
+#: builtin/pack-objects.c:3380
+#, c-format
+msgid "not a rev '%s'"
+msgstr "nie jest rewizją „%s”"
+
+#: builtin/pack-objects.c:3383
+#, c-format
+msgid "bad revision '%s'"
+msgstr "zła rewizja „%s”"
+
+#: builtin/pack-objects.c:3408
+msgid "unable to add recent objects"
+msgstr "nie można dodać ostatnich obiektów"
+
+#: builtin/pack-objects.c:3461
+#, c-format
+msgid "unsupported index version %s"
+msgstr "nieobsługiwana wersja indeksu %s"
+
+#: builtin/pack-objects.c:3465
+#, c-format
+msgid "bad index version '%s'"
+msgstr "zła wersja indeksu „%s”"
+
+#: builtin/pack-objects.c:3503
+msgid "<version>[,<offset>]"
+msgstr "<wersja>[,<pozycja>]"
+
+#: builtin/pack-objects.c:3504
+msgid "write the pack index file in the specified idx format version"
+msgstr "zapisz plik indeksu paczek w podanej wersji formatu indeksu"
+
+#: builtin/pack-objects.c:3507
+msgid "maximum size of each output pack file"
+msgstr "maksymalny rozmiar pojedynczego wyjściowego pliku paczki"
+
+#: builtin/pack-objects.c:3509
+msgid "ignore borrowed objects from alternate object store"
+msgstr "pomiń pożyczone obiekty z alternatywnych zbiorów obiektów"
+
+#: builtin/pack-objects.c:3511
+msgid "ignore packed objects"
+msgstr "ignoruj spakowane obiekty"
+
+#: builtin/pack-objects.c:3513
+msgid "limit pack window by objects"
+msgstr "ogranicz okno paczki w obiektach"
+
+#: builtin/pack-objects.c:3515
+msgid "limit pack window by memory in addition to object limit"
+msgstr "ogranicz okno paczki w pamięci oprócz limitu w obiektach"
+
+#: builtin/pack-objects.c:3517
+msgid "maximum length of delta chain allowed in the resulting pack"
+msgstr "maksymalna długość łańcucha delt dopuszczona w wynikowej paczce"
+
+#: builtin/pack-objects.c:3519
+msgid "reuse existing deltas"
+msgstr "użyj ponownie istniejących delt"
+
+#: builtin/pack-objects.c:3521
+msgid "reuse existing objects"
+msgstr "użyj ponownie istniejących obiektów"
+
+#: builtin/pack-objects.c:3523
+msgid "use OFS_DELTA objects"
+msgstr "użyj obiektów OFS_DELTA"
+
+#: builtin/pack-objects.c:3525
+msgid "use threads when searching for best delta matches"
+msgstr "użyj wątków przy wyszukiwaniu najlepiej dopasowanych delt"
+
+#: builtin/pack-objects.c:3527
+msgid "do not create an empty pack output"
+msgstr "nie można utworzyć pustej paczki na wyjściu"
+
+#: builtin/pack-objects.c:3529
+msgid "read revision arguments from standard input"
+msgstr "odczytaj argumenty rewizji ze standardowego wejścia"
+
+#: builtin/pack-objects.c:3531
+msgid "limit the objects to those that are not yet packed"
+msgstr "ogranicz obiekty do jeszcze nie spakowanych"
+
+#: builtin/pack-objects.c:3534
+msgid "include objects reachable from any reference"
+msgstr "uwzględnij obiekty osiągalne z dowolnej referencji"
+
+#: builtin/pack-objects.c:3537
+msgid "include objects referred by reflog entries"
+msgstr "uwzględnij obiekty z odniesieniami z wpisów dziennika referencji"
+
+#: builtin/pack-objects.c:3540
+msgid "include objects referred to by the index"
+msgstr "uwzględnij obiekty z odniesieniami z indeksu"
+
+#: builtin/pack-objects.c:3543
+msgid "output pack to stdout"
+msgstr "wypisz paczkę na standardowe wyjście"
+
+#: builtin/pack-objects.c:3545
+msgid "include tag objects that refer to objects to be packed"
+msgstr "uwzględnij obiekty tagów odnoszące się do pakowanych obiektów"
+
+#: builtin/pack-objects.c:3547
+msgid "keep unreachable objects"
+msgstr "zachowaj nieosiągalne obiekty"
+
+#: builtin/pack-objects.c:3549
+msgid "pack loose unreachable objects"
+msgstr "spakuj luźnie nieosiągalne obiekty"
+
+#: builtin/pack-objects.c:3551
+msgid "unpack unreachable objects newer than <time>"
+msgstr "rozpakuj nieosiągalne obiekty nowsze niż <czas>"
+
+#: builtin/pack-objects.c:3554
+msgid "use the sparse reachability algorithm"
+msgstr "użyj rzadkiego algorytmu osiągalności"
+
+#: builtin/pack-objects.c:3556
+msgid "create thin packs"
+msgstr "twórz wąskie paczki"
+
+#: builtin/pack-objects.c:3558
+msgid "create packs suitable for shallow fetches"
+msgstr "utwórz paczki odpowiednie do płytkich pobrań"
+
+#: builtin/pack-objects.c:3560
+msgid "ignore packs that have companion .keep file"
+msgstr "pomiń paczki, którym towarzyszy plik .keep"
+
+#: builtin/pack-objects.c:3562
+msgid "ignore this pack"
+msgstr "pomiń tę paczkę"
+
+#: builtin/pack-objects.c:3564
+msgid "pack compression level"
+msgstr "stopień kompresji paczki"
+
+#: builtin/pack-objects.c:3566
+msgid "do not hide commits by grafts"
+msgstr "nie ukrywaj przeszczepionych zapisów"
+
+#: builtin/pack-objects.c:3568
+msgid "use a bitmap index if available to speed up counting objects"
+msgstr ""
+"użyj indeksu bitmapy, jeśli dostępny, żeby przyspieszyć zliczanie obiektów"
+
+#: builtin/pack-objects.c:3570
+msgid "write a bitmap index together with the pack index"
+msgstr "zapisz indeks bitmapy razem z indeksem paczek"
+
+#: builtin/pack-objects.c:3574
+msgid "write a bitmap index if possible"
+msgstr "zapisz indeks bitmapy jeśli możliwe"
+
+#: builtin/pack-objects.c:3578
+msgid "handling for missing objects"
+msgstr "traktowanie brakujących obiektów"
+
+#: builtin/pack-objects.c:3581
+msgid "do not pack objects in promisor packfiles"
+msgstr "nie pakuj obiektów w obiecujące pliki paczek"
+
+#: builtin/pack-objects.c:3583
+msgid "respect islands during delta compression"
+msgstr "uszanuj wyspy podczas kompresji delt"
+
+#: builtin/pack-objects.c:3585
+msgid "protocol"
+msgstr "protokół"
+
+#: builtin/pack-objects.c:3586
+msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
+msgstr "wyłącz w tym protokole wszystkie ustawione uploadpack.blobpackfileuri"
+
+#: builtin/pack-objects.c:3617
+#, c-format
+msgid "delta chain depth %d is too deep, forcing %d"
+msgstr "łańcuch delt za głęboki: %d, wymuszanie %d"
+
+#: builtin/pack-objects.c:3622
+#, c-format
+msgid "pack.deltaCacheLimit is too high, forcing %d"
+msgstr "pack.deltaCacheLimit za wysoki, wymuszanie %d"
+
+#: builtin/pack-objects.c:3676
+msgid "--max-pack-size cannot be used to build a pack for transfer"
+msgstr "nie można użyć --max-pack-size do budowania paczki do przesyłu"
+
+#: builtin/pack-objects.c:3678
+msgid "minimum pack size limit is 1 MiB"
+msgstr "minimalna granica rozmiaru paczki to 1 MiB"
+
+#: builtin/pack-objects.c:3683
+msgid "--thin cannot be used to build an indexable pack"
+msgstr "nie można użyć --thin, aby zbudować indeksowalną paczkę"
+
+#: builtin/pack-objects.c:3686
+msgid "--keep-unreachable and --unpack-unreachable are incompatible"
+msgstr "--keep-unreachable i --unpack-unreachable się wykluczają"
+
+#: builtin/pack-objects.c:3692
+msgid "cannot use --filter without --stdout"
+msgstr "nie można użyć --filter bez --stdout"
+
+#: builtin/pack-objects.c:3752
+msgid "Enumerating objects"
+msgstr "Wymienianie obiektów"
+
+#: builtin/pack-objects.c:3783
+#, c-format
+msgid ""
+"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
+"reused %<PRIu32>"
+msgstr ""
+"Razem %<PRIu32> (delty %<PRIu32>), użyte ponownie %<PRIu32> (delty "
+"%<PRIu32>), paczki użyte ponownie %<PRIu32>"
+
+#: builtin/pack-redundant.c:601
+msgid ""
+"'git pack-redundant' is nominated for removal.\n"
+"If you still use this command, please add an extra\n"
+"option, '--i-still-use-this', on the command line\n"
+"and let us know you still use it by sending an e-mail\n"
+"to <git@vger.kernel.org>. Thanks.\n"
+msgstr ""
+"„git pack-redundant” naznaczono do usunięcia.\n"
+"Jeśli nadal używasz tego polecenia, dodaj dodatkową\n"
+"opcję, „--i-still-use-this”, w wierszu poleceń\n"
+"i daj znać, że nadal jej używasz wysyłając list e-mail\n"
+"na <git@vger.kernel.org>. Dzięki.\n"
+
+#: builtin/pack-refs.c:8
+msgid "git pack-refs [<options>]"
+msgstr "git pack-refs [<opcje>]"
+
+#: builtin/pack-refs.c:16
+msgid "pack everything"
+msgstr "spakuj wszystko"
+
+#: builtin/pack-refs.c:17
+msgid "prune loose refs (default)"
+msgstr "przytnij luźne referencje"
+
+#: 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 <czas>] [--] [<czoło>...]"
+
+#: builtin/prune.c:133
+msgid "report pruned objects"
+msgstr "zgłaszaj przycięte obiekty"
+
+#: builtin/prune.c:136
+msgid "expire objects older than <time>"
+msgstr "wygaś obiekty starsze niż <czas>"
+
+#: builtin/prune.c:138
+msgid "limit traversal to objects outside promisor packfiles"
+msgstr "ogranicz przejście do obiektów poza obiecującymi plikami paczek"
+
+#: builtin/prune.c:152
+msgid "cannot prune in a precious-objects repo"
+msgstr "nie można przyciąć repozytorium o cennych obiektach"
+
+#: builtin/pull.c:45 builtin/pull.c:47
+#, c-format
+msgid "Invalid value for %s: %s"
+msgstr "Nieprawidłowa wartość %s: %s"
+
+#: builtin/pull.c:67
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
+msgstr "git pull [<opcje>] [<repozytorium> [<referencja>...]]"
+
+#: builtin/pull.c:123
+msgid "control for recursive fetching of submodules"
+msgstr "sterowanie rekurencyjnym pobieraniem pod-modułów"
+
+#: builtin/pull.c:127
+msgid "Options related to merging"
+msgstr "Opcje związane ze scalaniem"
+
+#: builtin/pull.c:130
+msgid "incorporate changes by rebasing rather than merging"
+msgstr "wciel zmiany przez przestawienie, a nie scalanie"
+
+#: builtin/pull.c:158 builtin/rebase.c:492 builtin/revert.c:126
+msgid "allow fast-forward"
+msgstr "zezwól na przewijanie"
+
+#: builtin/pull.c:167 parse-options.h:339
+msgid "automatically stash/stash pop before and after"
+msgstr "automatycznie dodaj zmiany do schowka przed i przywróć je po"
+
+#: builtin/pull.c:183
+msgid "Options related to fetching"
+msgstr "Opcje związane z pobieraniem"
+
+#: builtin/pull.c:193
+msgid "force overwrite of local branch"
+msgstr "wymuś nadpisanie lokalnej gałęzi"
+
+#: builtin/pull.c:201
+msgid "number of submodules pulled in parallel"
+msgstr "liczba pod-modułów zaciąganych równolegle"
+
+#: builtin/pull.c:317
+#, c-format
+msgid "Invalid value for pull.ff: %s"
+msgstr "Nieprawidłowa wartość pull.ff: %s"
+
+#: builtin/pull.c:445
+msgid ""
+"There is no candidate for rebasing against among the refs that you just "
+"fetched."
+msgstr "Wśród właśnie pobranych referencji nie ma kandydata na przestawianie."
+
+#: builtin/pull.c:447
+msgid ""
+"There are no candidates for merging among the refs that you just fetched."
+msgstr "Wśród właśnie pobranych referencji nie ma kandydatów na scalanie."
+
+#: builtin/pull.c:448
+msgid ""
+"Generally this means that you provided a wildcard refspec which had no\n"
+"matches on the remote end."
+msgstr ""
+"Zwykle oznacza to, że podano referencję z globem bez dopasowań\n"
+"po zdalnej stronie."
+
+#: builtin/pull.c:451
+#, 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 ""
+"Kazano zaciągnąć zmiany ze zdalnego repozytorium „%s”, ale nie podano\n"
+"gałęzi. Ponieważ nie jest to domyślne ustawione repozytorium zdalne\n"
+"dla bieżącej gałęzi, musisz podać gałąź w wierszu poleceń."
+
+#: builtin/pull.c:456 builtin/rebase.c:1253
+msgid "You are not currently on a branch."
+msgstr "Nie jesteś obecnie w gałęzi."
+
+#: builtin/pull.c:458 builtin/pull.c:473
+msgid "Please specify which branch you want to rebase against."
+msgstr "Podaj, względem jakiej gałęzi przestawić."
+
+#: builtin/pull.c:460 builtin/pull.c:475
+msgid "Please specify which branch you want to merge with."
+msgstr "Podaj, z jaką gałęzią scalić."
+
+#: builtin/pull.c:461 builtin/pull.c:476
+msgid "See git-pull(1) for details."
+msgstr "Więcej szczegółów w git-pull(1)."
+
+#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
+#: builtin/rebase.c:1259
+msgid "<remote>"
+msgstr "<zdalne-repozytorium>"
+
+#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
+msgid "<branch>"
+msgstr "<gałąź>"
+
+#: builtin/pull.c:471 builtin/rebase.c:1251
+msgid "There is no tracking information for the current branch."
+msgstr "Bieżąca gałąź nie ma informacji o śledzeniu."
+
+#: builtin/pull.c:480
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:"
+msgstr ""
+"Jeśli chcesz ustawić informacje o śledzeniu w tej gałęzi, możesz to zrobić "
+"przez:"
+
+#: builtin/pull.c:485
+#, c-format
+msgid ""
+"Your configuration specifies to merge with the ref '%s'\n"
+"from the remote, but no such ref was fetched."
+msgstr ""
+"Konfiguracja podaje, żeby scalić z referencją „%s”\n"
+"ze zdalnego repozytorium, ale nie pobrano stamtąd żadnej takiej."
+
+#: builtin/pull.c:596
+#, c-format
+msgid "unable to access commit %s"
+msgstr "brak dostępu do zapisu %s"
+
+#: builtin/pull.c:902
+msgid "ignoring --verify-signatures for rebase"
+msgstr "pomijanie --verify-signatures przy przestawianiu"
+
+#: builtin/pull.c:930
+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 ""
+"Odradza się zaciągania bez podania, jak pogodzić rozbieżne gałęzie.\n"
+"Można uciszyć ten komunikat wykonując jedno z poniższych\n"
+"poleceń kiedyś przed następnym zaciągnięciem:\n"
+"\n"
+" git config pull.rebase false # scalenie (domyślna strategia)\n"
+" git config pull.rebase true # przestawienie\n"
+" git config pull.ff only # tylko przewinięcie\n"
+"\n"
+"Można zamienić „git config” na „git config --global”, aby ustawić domyślny\n"
+"wybór do wszystkich repozytoriów. Można też przekazać --rebase, --no-rebase\n"
+"lub --ff-only w wierszu poleceń, aby zmienić ustawione zachowanie\n"
+"w jednym wywołaniu.\n"
+
+#: builtin/pull.c:991
+msgid "Updating an unborn branch with changes added to the index."
+msgstr "Aktualizowanie nienarodzonej gałęzi o zmiany dodane do indeksu."
+
+#: builtin/pull.c:995
+msgid "pull with rebase"
+msgstr "zaciągnij z przestawieniem"
+
+#: builtin/pull.c:996
+msgid "please commit or stash them."
+msgstr "złóż je lub dodaj do schowka."
+
+#: builtin/pull.c:1021
+#, c-format
+msgid ""
+"fetch updated the current branch head.\n"
+"fast-forwarding your working tree from\n"
+"commit %s."
+msgstr ""
+"pobranie zaktualizowało czoło bieżącej gałęzi.\n"
+"przewijanie drzewa roboczego\n"
+"z zapisu %s."
+
+#: builtin/pull.c:1027
+#, 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 ""
+"Nie można przewinąć drzewa roboczego.\n"
+"Po upewnieniu się, że zapiszesz wszystko cenne z wyjścia\n"
+"$ git diff %s\n"
+"wykonaj\n"
+"$ git reset --hard\n"
+"by się pozbierać."
+
+#: builtin/pull.c:1042
+msgid "Cannot merge multiple branches into empty head."
+msgstr "Nie można scalić wielu gałęzi w puste czoło."
+
+#: builtin/pull.c:1046
+msgid "Cannot rebase onto multiple branches."
+msgstr "Nie można przestawić na wiele gałęzi."
+
+#: builtin/pull.c:1067
+msgid "cannot rebase with locally recorded submodule modifications"
+msgstr "nie można przestawić z lokalnie zapisanymi zmianami pod-modułów"
+
+#: builtin/push.c:19
+msgid "git push [<options>] [<repository> [<refspec>...]]"
+msgstr "git push [<opcje>] [<repozytorium> [<referencja>...]]"
+
+#: builtin/push.c:111
+msgid "tag shorthand without <tag>"
+msgstr "skrót tagu bez <tagu>"
+
+#: builtin/push.c:119
+msgid "--delete only accepts plain target ref names"
+msgstr "--delete przyjmuje tylko zwykłe docelowe nazwy referencji"
+
+#: builtin/push.c:164
+msgid ""
+"\n"
+"To choose either option permanently, see push.default in 'git help config'."
+msgstr ""
+"\n"
+"Aby wybrać którąś opcję na zawsze, zobacz push.default w „git help config”."
+
+#: 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 ""
+"Nadrzędna gałąź bieżącej gałęzi nie pasuje do jej nazwy.\n"
+"Aby wypchnąć zmiany na zdalną nadrzędną gałąź, użyj\n"
+"\n"
+" git push %s HEAD:%s\n"
+"\n"
+"Aby wypchnąć je do zdalnej gałęzi o tej samej nazwie, użyj\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 ""
+"Nie jesteś teraz na gałęzi.\n"
+"Żeby wypchnąć historię wiodącą do bieżącego stanu\n"
+"(odłączonego HEAD), użyj\n"
+"\n"
+" git push %s HEAD:<nazwa-zdalnej-gałęzi>\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 ""
+"Bieżąca gałąź %s nie ma gałęzi nadrzędnej.\n"
+"Aby wypchnąć bieżącą gałąź i ustawić zdalne repozytorium jako nadrzędne, "
+"użyj\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 "Bieżąca gałąź %s ma wiele gałęzi nadrzędnych, odmawiam wypchnięcia."
+
+#: 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 ""
+"Wypychasz do zdalnego repozytorium „%s”, które nie jest nadrzędne dla\n"
+"bieżącej gałęzi „%s”, bez podania, co wypchnąć i na jaką\n"
+"zdalną gałąź."
+
+#: builtin/push.c:260
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+"Nie podano żadnych referencji do wypchnięcia, a push.default ma wartość "
+"„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 ""
+"Aktualizacje zostały odrzucone, ponieważ czubek bieżącej gałęzi jest\n"
+"w tyle za swoim zdalnym odpowiednikiem. Zintegruj zdalne zmiany (np.\n"
+"„git pull ...”) przed kolejnym wypchnięciem.\n"
+"Zobacz szczegóły w „Uwadze o przewijaniu” w „git push --help”."
+
+#: 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 ""
+"Aktualizacje zostały odrzucone, ponieważ czubek wypychanej gałęzi jest\n"
+"w tyle za swoim zdalnym odpowiednikiem. Wybierz tę gałąź i zintegruj\n"
+"zdalne zmiany (np. „git pull ...”) przed kolejnym wypchnięciem.\n"
+"Zobacz szczegóły w „Uwadze o przewijaniu” w „git push --help”."
+
+#: 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 ""
+"Aktualizacje zostały odrzucone, ponieważ zdalne repozytorium zawiera\n"
+"pracę, której nie ma u ciebie lokalnie. Jest to zwykle spowodowane innym\n"
+"repozytorium wypychającym na tę samą referencję. Możesz najpierw chcieć\n"
+"zintegrować zdalne zmiany (np. „git pull ...”) przed kolejnym wypchnięciem.\n"
+"Zobacz szczegóły w „Uwadze o przewijaniu” w „git push --help”."
+
+#: builtin/push.c:286
+msgid "Updates were rejected because the tag already exists in the remote."
+msgstr ""
+"Aktualizacje zostały odrzucone, bo tag już istnieje w zdalnym repozytorium."
+
+#: 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 ""
+"Nie możesz zaktualizować zdalnej referencji, która wskazuje na obiekt\n"
+"nie będący zapisem, ani sprawić, żeby wskazywała na taki obiekt,\n"
+"chyba że użyjesz opcji „--force”.\n"
+
+#: builtin/push.c:294
+msgid ""
+"Updates were rejected because the tip of the remote-tracking\n"
+"branch has been updated since the last checkout. You may want\n"
+"to integrate those changes locally (e.g., 'git pull ...')\n"
+"before forcing an update.\n"
+msgstr ""
+"Aktualizacje zostały odrzucone, ponieważ czubek śledzącej gałęzi\n"
+"został zaktualizowany od ostatniego wybrania. Możesz chcieć\n"
+"zintegrować te zmiany lokalnie (np. „git pull ...”)\n"
+"przed wymuszeniem wypchnięcia.\n"
+
+#: builtin/push.c:364
+#, c-format
+msgid "Pushing to %s\n"
+msgstr "Wypychanie do %s\n"
+
+#: builtin/push.c:371
+#, c-format
+msgid "failed to push some refs to '%s'"
+msgstr "nie można wypchnąć niektórych referencji do „%s”"
+
+#: builtin/push.c:553
+msgid "repository"
+msgstr "repozytorium"
+
+#: builtin/push.c:554 builtin/send-pack.c:189
+msgid "push all refs"
+msgstr "wypchnij wszystkie referencje"
+
+#: builtin/push.c:555 builtin/send-pack.c:191
+msgid "mirror all refs"
+msgstr "odwzoruj wszystkie referencje"
+
+#: builtin/push.c:557
+msgid "delete refs"
+msgstr "usuń referencje"
+
+#: builtin/push.c:558
+msgid "push tags (can't be used with --all or --mirror)"
+msgstr "wypchnij tagi (nie może być użyte z --all ani --mirror)"
+
+#: builtin/push.c:561 builtin/send-pack.c:192
+msgid "force updates"
+msgstr "wymuszone aktualizacje"
+
+#: builtin/push.c:562 builtin/send-pack.c:204
+msgid "<refname>:<expect>"
+msgstr "<referencja>:<oczekiwana>"
+
+#: builtin/push.c:563 builtin/send-pack.c:205
+msgid "require old value of ref to be at this value"
+msgstr "wymagaj, żeby stara wartość referencji wskazywała tę wartość"
+
+#: builtin/push.c:566 builtin/send-pack.c:208
+msgid "require remote updates to be integrated locally"
+msgstr "wymagaj, by zdalne aktualizacje były wcielone lokalnie"
+
+#: builtin/push.c:569
+msgid "control recursive pushing of submodules"
+msgstr "steruj rekurencyjnym wypychaniem pod-modułów"
+
+#: builtin/push.c:570 builtin/send-pack.c:199
+msgid "use thin pack"
+msgstr "użyj wąskiej paczki"
+
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
+#: builtin/send-pack.c:187
+msgid "receive pack program"
+msgstr "program do odbierania paczek"
+
+#: builtin/push.c:573
+msgid "set upstream for git pull/status"
+msgstr "ustaw gałąź nadrzędną do git pull/status"
+
+#: builtin/push.c:576
+msgid "prune locally removed refs"
+msgstr "przytnij lokalnie usunięte referencje"
+
+#: builtin/push.c:578
+msgid "bypass pre-push hook"
+msgstr "omiń skrypt pre-push"
+
+#: builtin/push.c:579
+msgid "push missing but relevant tags"
+msgstr "wypchnij brakujące, ale mające związek tagi"
+
+#: builtin/push.c:581 builtin/send-pack.c:193
+msgid "GPG sign the push"
+msgstr "podpisz wypchnięcie GPG"
+
+#: builtin/push.c:583 builtin/send-pack.c:200
+msgid "request atomic transaction on remote side"
+msgstr "zażądaj atomowej transakcji po stronie zdalnej"
+
+#: builtin/push.c:601
+msgid "--delete is incompatible with --all, --mirror and --tags"
+msgstr "--delete wyklucza się z --all, --mirror i --tags"
+
+#: builtin/push.c:603
+msgid "--delete doesn't make sense without any refs"
+msgstr "--delete nie ma sensu bez żadnych referencji"
+
+#: builtin/push.c:623
+#, c-format
+msgid "bad repository '%s'"
+msgstr "złe repozytorium „%s”"
+
+#: builtin/push.c:624
+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 ""
+"Nie ustawiono celu wypychania.\n"
+"Albo podaj adres w wierszu poleceń, albo skonfiguruj zdalne repozytorium "
+"używając\n"
+"\n"
+" git remote add <nazwa> <adres>\n"
+"\n"
+"i wtedy wypchnij używając tej nazwy\n"
+"\n"
+" git push <nazwa>\n"
+
+#: builtin/push.c:639
+msgid "--all and --tags are incompatible"
+msgstr "--all i --tags się wykluczają"
+
+#: builtin/push.c:641
+msgid "--all can't be combined with refspecs"
+msgstr "--all i referencje wykluczają się"
+
+#: builtin/push.c:645
+msgid "--mirror and --tags are incompatible"
+msgstr "--mirror i --tags się wykluczają"
+
+#: builtin/push.c:647
+msgid "--mirror can't be combined with refspecs"
+msgstr "--mirror i referencje wykluczają się"
+
+#: builtin/push.c:650
+msgid "--all and --mirror are incompatible"
+msgstr "--all i --mirror się wykluczają"
+
+#: builtin/push.c:657
+msgid "push options must not have new line characters"
+msgstr "opcje wypychania nie mogą zawierać znaków końca wiersza"
+
+#: builtin/range-diff.c:9
+msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
+msgstr ""
+"git range-diff [<opcje>] <stara-podstawa>..<stary-czubek> <nowa-podstawa>.."
+"<nowy-czubek>"
+
+#: builtin/range-diff.c:10
+msgid "git range-diff [<options>] <old-tip>...<new-tip>"
+msgstr "git range-diff [<opcje>] <stary-czubek>...<nowy-czubek>"
+
+#: builtin/range-diff.c:11
+msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
+msgstr "git range-diff [<opcje>] <podstawa> <stary-czubek> <nowy-czubek>"
+
+#: builtin/range-diff.c:28
+msgid "Percentage by which creation is weighted"
+msgstr "Procent, według jakiego ważone jest tworzenie"
+
+#: builtin/range-diff.c:30
+msgid "use simple diff colors"
+msgstr "użyj prostych kolorów zmian"
+
+#: builtin/range-diff.c:32
+msgid "notes"
+msgstr "uwagi"
+
+#: builtin/range-diff.c:32
+msgid "passed to 'git log'"
+msgstr "przekazywane do „git log”"
+
+#: builtin/range-diff.c:35
+msgid "only emit output related to the first range"
+msgstr "daj tylko wyjście powiązane z pierwszym zakresem"
+
+#: builtin/range-diff.c:37
+msgid "only emit output related to the second range"
+msgstr "daj tylko wyjście powiązane z drugim zakresem"
+
+#: builtin/range-diff.c:60 builtin/range-diff.c:64
+#, c-format
+msgid "not a commit range: '%s'"
+msgstr "nie jest zakresem zapisów: „%s”"
+
+#: builtin/range-diff.c:74
+msgid "single arg format must be symmetric range"
+msgstr "format w pojedynczym argumencie musi być symetrycznym zakresem"
+
+#: builtin/range-diff.c:89
+msgid "need two commit ranges"
+msgstr "potrzeba dwóch zakresów zapisów"
+
+#: 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=<prefix>) "
+"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
+"index-output=<plik>] (--empty | <drzewo1> [<drzewo2> [<drzewo3>]])"
+
+#: builtin/read-tree.c:124
+msgid "write resulting index to <file>"
+msgstr "zapisz wynikowy indeks w <pliku>"
+
+#: builtin/read-tree.c:127
+msgid "only empty the index"
+msgstr "tylko opróżnij indeks"
+
+#: builtin/read-tree.c:129
+msgid "Merging"
+msgstr "Scalanie"
+
+#: builtin/read-tree.c:131
+msgid "perform a merge in addition to a read"
+msgstr "dokonaj scalenia oprócz odczytu"
+
+#: builtin/read-tree.c:133
+msgid "3-way merge if no file level merging required"
+msgstr "trójstronne scalanie jeśli nie trzeba scalać na poziomie plików"
+
+#: builtin/read-tree.c:135
+msgid "3-way merge in presence of adds and removes"
+msgstr "trójstronne scalanie w obecności dodań i usunięć"
+
+#: builtin/read-tree.c:137
+msgid "same as -m, but discard unmerged entries"
+msgstr "to samo, co -m, ale odrzuć niescalone elementy"
+
+#: builtin/read-tree.c:138
+msgid "<subdirectory>/"
+msgstr "<podkatalog>/"
+
+#: builtin/read-tree.c:139
+msgid "read the tree into the index under <subdirectory>/"
+msgstr "wczytaj drzewo do indeksu w <podkatalogu>/"
+
+#: builtin/read-tree.c:142
+msgid "update working tree with merge result"
+msgstr "zaktualizuj drzewo robocze wynikiem scalenia"
+
+#: builtin/read-tree.c:144
+msgid "gitignore"
+msgstr "gitignore"
+
+#: builtin/read-tree.c:145
+msgid "allow explicitly ignored files to be overwritten"
+msgstr "zezwól na nadpisywanie jawnie ignorowanych plików"
+
+#: builtin/read-tree.c:148
+msgid "don't check the working tree after merging"
+msgstr "nie sprawdzaj drzewa roboczego po scaleniu"
+
+#: builtin/read-tree.c:149
+msgid "don't update the index or the work tree"
+msgstr "nie aktualizuj indeksu ani drzewa roboczego"
+
+#: builtin/read-tree.c:151
+msgid "skip applying sparse checkout filter"
+msgstr "pomiń stosowanie filtru rzadkiego wybrania"
+
+#: builtin/read-tree.c:153
+msgid "debug unpack-trees"
+msgstr "odpluskwianie unpack-trees"
+
+#: builtin/read-tree.c:157
+msgid "suppress feedback messages"
+msgstr "pomiń komunikaty zwrotne"
+
+#: builtin/read-tree.c:188
+msgid "You need to resolve your current index first"
+msgstr "Musisz najpierw rozwiązać bieżący indeks"
+
+#: builtin/rebase.c:35
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
+"[<upstream> [<branch>]]"
+msgstr ""
+"git rebase [-i] [options] [--exec <polecenie>] [--onto <nowa-podstawa> | --"
+"keep-base] [<gałąź-nadrzędna> [<gałąź>]]"
+
+#: builtin/rebase.c:37
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
+msgstr ""
+"git rebase [-i] [options] [--exec <polecenie>] [--onto <nowa-podstawa>] --"
+"root [<gałąź>]"
+
+#: builtin/rebase.c:39
+msgid "git rebase --continue | --abort | --skip | --edit-todo"
+msgstr "git rebase --continue | --abort | --skip | --edit-todo"
+
+#: builtin/rebase.c:195 builtin/rebase.c:219 builtin/rebase.c:246
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "lista zadań do zrobienia się nie nadaje: „%s”"
+
+#: builtin/rebase.c:312
+#, c-format
+msgid "could not create temporary %s"
+msgstr "nie można utworzyć tymczasowego %s"
+
+#: builtin/rebase.c:318
+msgid "could not mark as interactive"
+msgstr "nie można oznaczyć jako interaktywne"
+
+#: builtin/rebase.c:371
+msgid "could not generate todo list"
+msgstr "nie można wygenerować listy zadań do zrobienia"
+
+#: builtin/rebase.c:413
+msgid "a base commit must be provided with --upstream or --onto"
+msgstr "zapis podstawy należy podać z --upstream lub --onto"
+
+#: builtin/rebase.c:482
+msgid "git rebase--interactive [<options>]"
+msgstr "git rebase--interactive [<opcje>]"
+
+#: builtin/rebase.c:495 builtin/rebase.c:1394
+msgid "keep commits which start empty"
+msgstr "zachowaj zapisy, które zaczynają puste"
+
+#: builtin/rebase.c:499 builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "pozwól na zapisy z pustymi komunikatami"
+
+#: builtin/rebase.c:501
+msgid "rebase merge commits"
+msgstr "przestawiaj zapisy scaleń"
+
+#: builtin/rebase.c:503
+msgid "keep original branch points of cousins"
+msgstr "zachowaj pierwotne rozgałęzienia kuzynów"
+
+#: builtin/rebase.c:505
+msgid "move commits that begin with squash!/fixup!"
+msgstr "przenieś zapisy, które zaczynają się od squash!/fixup!"
+
+#: builtin/rebase.c:506
+msgid "sign commits"
+msgstr "podpisuj zapisy"
+
+#: builtin/rebase.c:508 builtin/rebase.c:1333
+msgid "display a diffstat of what changed upstream"
+msgstr "wyświetl statystyki zmian nadrzędnych"
+
+#: builtin/rebase.c:510
+msgid "continue rebase"
+msgstr "kontynuuj przestawianie"
+
+#: builtin/rebase.c:512
+msgid "skip commit"
+msgstr "pomiń zapis"
+
+#: builtin/rebase.c:513
+msgid "edit the todo list"
+msgstr "edytuj listę zadań do zrobienia"
+
+#: builtin/rebase.c:515
+msgid "show the current patch"
+msgstr "pokaż bieżącą łatkę"
+
+#: builtin/rebase.c:518
+msgid "shorten commit ids in the todo list"
+msgstr "skróć identyfikatory zapisów na liście zadań do zrobienia"
+
+#: builtin/rebase.c:520
+msgid "expand commit ids in the todo list"
+msgstr "rozwiń identyfikatory zapisów na liście zadań do zrobienia"
+
+#: builtin/rebase.c:522
+msgid "check the todo list"
+msgstr "sprawdź listę zadań do zrobienia"
+
+#: builtin/rebase.c:524
+msgid "rearrange fixup/squash lines"
+msgstr "zmień kolejność wierszy fixup/squash"
+
+#: builtin/rebase.c:526
+msgid "insert exec commands in todo list"
+msgstr "wstaw polecenia exec na listę zadań do zrobienia"
+
+#: builtin/rebase.c:527
+msgid "onto"
+msgstr "na"
+
+#: builtin/rebase.c:530
+msgid "restrict-revision"
+msgstr "ogranicz-rewizję"
+
+#: builtin/rebase.c:530
+msgid "restrict revision"
+msgstr "ogranicz rewizję"
+
+#: builtin/rebase.c:532
+msgid "squash-onto"
+msgstr "spłaszcz-na"
+
+#: builtin/rebase.c:533
+msgid "squash onto"
+msgstr "spłaszcz na"
+
+#: builtin/rebase.c:535
+msgid "the upstream commit"
+msgstr "zapis głównego nurtu"
+
+#: builtin/rebase.c:537
+msgid "head-name"
+msgstr "nazwa-czoła"
+
+#: builtin/rebase.c:537
+msgid "head name"
+msgstr "nazwa czoła"
+
+#: builtin/rebase.c:542
+msgid "rebase strategy"
+msgstr "strategia przestawiania"
+
+#: builtin/rebase.c:543
+msgid "strategy-opts"
+msgstr "opcje-strategii"
+
+#: builtin/rebase.c:544
+msgid "strategy options"
+msgstr "opcje strategii"
+
+#: builtin/rebase.c:545
+msgid "switch-to"
+msgstr "przełącz-na"
+
+#: builtin/rebase.c:546
+msgid "the branch or commit to checkout"
+msgstr "gałąź lub zapis do wybrania"
+
+#: builtin/rebase.c:547
+msgid "onto-name"
+msgstr "nazwa-na"
+
+#: builtin/rebase.c:547
+msgid "onto name"
+msgstr "nazwa rewizji „na”"
+
+#: builtin/rebase.c:548
+msgid "cmd"
+msgstr "polecenie"
+
+#: builtin/rebase.c:548
+msgid "the command to run"
+msgstr "polecenie do wykonania"
+
+#: builtin/rebase.c:551 builtin/rebase.c:1427
+msgid "automatically re-schedule any `exec` that fails"
+msgstr "automatycznie przeplanuj każdy nieudany „exec”"
+
+#: builtin/rebase.c:567
+msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+msgstr "--[no-]rebase-cousins nic nie robi bez --rebase-merges"
+
+#: builtin/rebase.c:583
+#, c-format
+msgid "%s requires the merge backend"
+msgstr "%s wymaga silnika scalenia"
+
+#: builtin/rebase.c:626
+#, c-format
+msgid "could not get 'onto': '%s'"
+msgstr "nie można uzyskać „onto”: „%s”"
+
+#: builtin/rebase.c:643
+#, c-format
+msgid "invalid orig-head: '%s'"
+msgstr "nieprawidłowe pierwotne czoło: „%s”"
+
+#: builtin/rebase.c:668
+#, c-format
+msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
+msgstr "pomijanie błędnego allow_rerere_autoupdate: „%s”"
+
+#: builtin/rebase.c:813 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 ""
+"Rozwiąż ręcznie wszystkie konflikty, oznacz je jako rozwiązane przez\n"
+"„git add/rm <skonfliktowane_pliki>” i wykonaj „git rebase --continue”.\n"
+"Możesz zamiast tego pominąć ten zapis: wykonaj „git rebase --skip”.\n"
+"Aby przerwać i powrócić do stanu sprzed „git rebase”, wykonaj „git rebase --"
+"abort”."
+
+#: builtin/rebase.c:896
+#, 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 napotkał błąd podczas przygotowania łatek do odtworzenia\n"
+"tych rewizji:\n"
+"\n"
+" %s\n"
+"\n"
+"Z tego powodu git nie może ich przestawić."
+
+#: builtin/rebase.c:1227
+#, c-format
+msgid ""
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
+"\"."
+msgstr ""
+"nierozpoznany pusty rodzaj „%s”; prawidłowe wartości to „drop”, „keep” i "
+"„ask”."
+
+#: builtin/rebase.c:1245
+#, 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"
+"Podaj, względem jakiej gałęzi chcesz przestawiać.\n"
+"Więcej szczegółów w git-rebase(1).\n"
+"\n"
+" git rebase '<gałąź>'\n"
+"\n"
+
+#: builtin/rebase.c:1261
+#, 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 ""
+"Jeśli chcesz ustawić informacje o śledzeniu w tej gałęzi, możesz to zrobić "
+"przez:\n"
+" git branch --set-upstream-to=%s/<gałąź> %s\n"
+"\n"
+
+#: builtin/rebase.c:1291
+msgid "exec commands cannot contain newlines"
+msgstr "polecenia exec nie mogą zawierać znaków nowego wiersza"
+
+#: builtin/rebase.c:1295
+msgid "empty exec command"
+msgstr "puste polecenie exec"
+
+#: builtin/rebase.c:1324
+msgid "rebase onto given branch instead of upstream"
+msgstr "przestaw na podaną gałąź zamiast na główny nurt"
+
+#: builtin/rebase.c:1326
+msgid "use the merge-base of upstream and branch as the current base"
+msgstr "użyj podstawy scalania głównego nurtu i gałęzi jako bieżącej podstawy"
+
+#: builtin/rebase.c:1328
+msgid "allow pre-rebase hook to run"
+msgstr "pozwól wykonać skrypt pre-rebase"
+
+#: builtin/rebase.c:1330
+msgid "be quiet. implies --no-stat"
+msgstr "bądź cicho. zakłada --no-stat"
+
+#: builtin/rebase.c:1336
+msgid "do not show diffstat of what changed upstream"
+msgstr "nie pokazuj statystyk różnic ze zmian głównego nurtu"
+
+#: builtin/rebase.c:1339
+msgid "add a Signed-off-by trailer to each commit"
+msgstr "dodaj końcówkę Signed-off-by do każdego zapisu"
+
+#: builtin/rebase.c:1342
+msgid "make committer date match author date"
+msgstr "ustaw datę złożenia na datę utworzenia"
+
+#: builtin/rebase.c:1344
+msgid "ignore author date and use current date"
+msgstr "pomiń datę utworzenia i użyj bieżącej"
+
+#: builtin/rebase.c:1346
+msgid "synonym of --reset-author-date"
+msgstr "zamiennik na --reset-author-date"
+
+#: builtin/rebase.c:1348 builtin/rebase.c:1352
+msgid "passed to 'git apply'"
+msgstr "przekaż do „git apply”"
+
+#: builtin/rebase.c:1350
+msgid "ignore changes in whitespace"
+msgstr "ignoruj zmiany w białych znakach"
+
+#: builtin/rebase.c:1354 builtin/rebase.c:1357
+msgid "cherry-pick all commits, even if unchanged"
+msgstr "dobierz wszystkie zapisy, nawet jeśli niezmienione"
+
+#: builtin/rebase.c:1359
+msgid "continue"
+msgstr "kontynuuj"
+
+#: builtin/rebase.c:1362
+msgid "skip current patch and continue"
+msgstr "pomiń obecną łatkę i kontynuuj"
+
+#: builtin/rebase.c:1364
+msgid "abort and check out the original branch"
+msgstr "przerwij i wybierz pierwotną gałąź"
+
+#: builtin/rebase.c:1367
+msgid "abort but keep HEAD where it is"
+msgstr "przerwij, ale zostaw HEAD, gdzie jest"
+
+#: builtin/rebase.c:1368
+msgid "edit the todo list during an interactive rebase"
+msgstr "edytuj listę zadań do zrobienia podczas interaktywnego przestawiania"
+
+#: builtin/rebase.c:1371
+msgid "show the patch file being applied or merged"
+msgstr "pokaż plik łatki właśnie stosowanej lub scalanej"
+
+#: builtin/rebase.c:1374
+msgid "use apply strategies to rebase"
+msgstr "użyj strategii stosowania do przestawiania"
+
+#: builtin/rebase.c:1378
+msgid "use merging strategies to rebase"
+msgstr "użyj strategii scalania do przestawiania"
+
+#: builtin/rebase.c:1382
+msgid "let the user edit the list of commits to rebase"
+msgstr "pozwól użytkownikowi edytować listę zapisów do przestawienia"
+
+#: builtin/rebase.c:1386
+msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
+msgstr "(PRZESTARZAŁE) spróbuj odtworzyć scalenia zamiast je pomijać"
+
+#: builtin/rebase.c:1391
+msgid "how to handle commits that become empty"
+msgstr "jak traktować zapisy, które staną się puste"
+
+#: builtin/rebase.c:1398
+msgid "move commits that begin with squash!/fixup! under -i"
+msgstr "przenieś zapisy, które zaczynają się od squash!/fixup! pod -i"
+
+#: builtin/rebase.c:1405
+msgid "add exec lines after each commit of the editable list"
+msgstr "dodaj wiersz exec po każdym zapisie z edytowalnej listy"
+
+#: builtin/rebase.c:1409
+msgid "allow rebasing commits with empty messages"
+msgstr "pozwól przestawiać zapisy z pustymi komunikatami"
+
+#: builtin/rebase.c:1413
+msgid "try to rebase merges instead of skipping them"
+msgstr "spróbuj przestawić scalenia zamiast je pomijać"
+
+#: builtin/rebase.c:1416
+msgid "use 'merge-base --fork-point' to refine upstream"
+msgstr "użyj „git merge-base --fork-point”, aby poprawić gałąź nadrzędną"
+
+#: builtin/rebase.c:1418
+msgid "use the given merge strategy"
+msgstr "użyj podanej strategii scalania"
+
+#: builtin/rebase.c:1420 builtin/revert.c:115
+msgid "option"
+msgstr "opcja"
+
+#: builtin/rebase.c:1421
+msgid "pass the argument through to the merge strategy"
+msgstr "przekaż argument do strategii scalania"
+
+#: builtin/rebase.c:1424
+msgid "rebase all reachable commits up to the root(s)"
+msgstr "przestaw wszystkie osiągalne zapisy aż do korzenia"
+
+#: builtin/rebase.c:1429
+msgid "apply all changes, even those already present upstream"
+msgstr "zastosuj wszystkie zmiany, nawet te już obecne w głównym nurcie"
+
+#: builtin/rebase.c:1446
+msgid ""
+"the rebase.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
+msgstr ""
+"wsparcie rebase.useBuiltin zostało usunięte!\n"
+"Zobacz szczegóły pod jego opisem w „git help config”."
+
+#: builtin/rebase.c:1452
+msgid "It looks like 'git am' is in progress. Cannot rebase."
+msgstr "Wygląda, że trwa „git am”. Nie można przestawić."
+
+#: builtin/rebase.c:1493
+msgid ""
+"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
+msgstr ""
+"git rebase --preserve-merges jest przestarzałe. Użyj zamiast tego --rebase-"
+"merges."
+
+#: builtin/rebase.c:1498
+msgid "cannot combine '--keep-base' with '--onto'"
+msgstr "„--keep-base” i „--onto” się wykluczają."
+
+#: builtin/rebase.c:1500
+msgid "cannot combine '--keep-base' with '--root'"
+msgstr "„--keep-base” i „--root” się wykluczają."
+
+#: builtin/rebase.c:1504
+msgid "cannot combine '--root' with '--fork-point'"
+msgstr "„--keep-base” i „--fork-point” się wykluczają."
+
+#: builtin/rebase.c:1507
+msgid "No rebase in progress?"
+msgstr "Nie trwa żadne przestawianie?"
+
+#: builtin/rebase.c:1511
+msgid "The --edit-todo action can only be used during interactive rebase."
+msgstr ""
+"Akcja --edit-todo może być użyta tylko podczas interaktywnego przestawiania."
+
+#: builtin/rebase.c:1534 t/helper/test-fast-rebase.c:123
+msgid "Cannot read HEAD"
+msgstr "Nie można odczytać HEAD"
+
+#: builtin/rebase.c:1546
+msgid ""
+"You must edit all merge conflicts and then\n"
+"mark them as resolved using git add"
+msgstr ""
+"Musisz edytować wszystkie konflikty scalania\n"
+"i oznaczyć je jako rozwiązane przy pomocy git add"
+
+#: builtin/rebase.c:1565
+msgid "could not discard worktree changes"
+msgstr "nie można odrzucić zmian w drzewie roboczym"
+
+#: builtin/rebase.c:1584
+#, c-format
+msgid "could not move back to %s"
+msgstr "nie można cofnąć do %s"
+
+#: builtin/rebase.c:1630
+#, 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 ""
+"Wygląda na to, że już jest katalog %s,\n"
+"i zastanawiam się, czy nie jesteś w trakcie innego przestawienia.\n"
+"Jeśli tak jest, spróbuj\n"
+"\t%s\n"
+"A jeśli tak nie jest,\n"
+"\t%s\n"
+"i wykonaj mnie ponownie. Przerywam na wypadek, gdyby było tam\n"
+"coś cennego.\n"
+
+#: builtin/rebase.c:1658
+msgid "switch `C' expects a numerical value"
+msgstr "przełącznik „C” oczekuje wartości liczbowej"
+
+#: builtin/rebase.c:1700
+#, c-format
+msgid "Unknown mode: %s"
+msgstr "Nieznany tryb: %s"
+
+#: builtin/rebase.c:1739
+msgid "--strategy requires --merge or --interactive"
+msgstr "--strategy wymaga --merge lub --interactive"
+
+#: builtin/rebase.c:1769
+msgid "cannot combine apply options with merge options"
+msgstr "nie można łączyć opcji stosowania z opcjami scalania"
+
+#: builtin/rebase.c:1782
+#, c-format
+msgid "Unknown rebase backend: %s"
+msgstr "Nieznany silnik przestawiania: %s"
+
+#: builtin/rebase.c:1812
+msgid "--reschedule-failed-exec requires --exec or --interactive"
+msgstr "--reschedule-failed wymaga --exec lub --interactive"
+
+#: builtin/rebase.c:1832
+msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+msgstr "„--preserve-merges” i „--rebase-merges” się wykluczają"
+
+#: builtin/rebase.c:1836
+msgid ""
+"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
+msgstr "błąd: „--preserve-merges” i „--reschedule-failed-exec” się wykluczają"
+
+#: builtin/rebase.c:1860
+#, c-format
+msgid "invalid upstream '%s'"
+msgstr "nieprawidłowa gałąź nadrzędna „%s”"
+
+#: builtin/rebase.c:1866
+msgid "Could not create new root commit"
+msgstr "Nie można utworzyć nowego zapisu korzenia"
+
+#: builtin/rebase.c:1892
+#, c-format
+msgid "'%s': need exactly one merge base with branch"
+msgstr "„%s”: potrzeba dokładnie jednej podstawy scalania z gałęzią"
+
+#: builtin/rebase.c:1895
+#, c-format
+msgid "'%s': need exactly one merge base"
+msgstr "„%s”: potrzeba dokładnie jednej podstawy scalania"
+
+#: builtin/rebase.c:1903
+#, c-format
+msgid "Does not point to a valid commit '%s'"
+msgstr "Nie wskazuje na prawidłowy zapis „%s”"
+
+#: builtin/rebase.c:1931
+#, c-format
+msgid "fatal: no such branch/commit '%s'"
+msgstr "błąd krytyczny: brak gałęzi/zapisu „%s”"
+
+#: builtin/rebase.c:1939 builtin/submodule--helper.c:40
+#: builtin/submodule--helper.c:2414
+#, c-format
+msgid "No such ref: %s"
+msgstr "Nie ma takiej referencji: %s"
+
+#: builtin/rebase.c:1950
+msgid "Could not resolve HEAD to a revision"
+msgstr "Nie można rozwiązać HEAD do rewizji"
+
+#: builtin/rebase.c:1971
+msgid "Please commit or stash them."
+msgstr "Złóż je lub dodaj do schowka."
+
+#: builtin/rebase.c:2007
+#, c-format
+msgid "could not switch to %s"
+msgstr "nie można przełączyć na %s"
+
+#: builtin/rebase.c:2018
+msgid "HEAD is up to date."
+msgstr "HEAD jest aktualne."
+
+#: builtin/rebase.c:2020
+#, c-format
+msgid "Current branch %s is up to date.\n"
+msgstr "Obecna gałąź %s jest aktualna.\n"
+
+#: builtin/rebase.c:2028
+msgid "HEAD is up to date, rebase forced."
+msgstr "HEAD jest aktualne, wymuszono przestawianie."
+
+#: builtin/rebase.c:2030
+#, c-format
+msgid "Current branch %s is up to date, rebase forced.\n"
+msgstr "Bieżąca gałąź %s jest aktualna, wymuszono przestawianie.\n"
+
+#: builtin/rebase.c:2038
+msgid "The pre-rebase hook refused to rebase."
+msgstr "Skrypt pre-rebase odmówił przestawiania."
+
+#: builtin/rebase.c:2045
+#, c-format
+msgid "Changes to %s:\n"
+msgstr "Zmiany w %s:\n"
+
+#: builtin/rebase.c:2048
+#, c-format
+msgid "Changes from %s to %s:\n"
+msgstr "Zmiany z %s na %s:\n"
+
+#: builtin/rebase.c:2073
+#, c-format
+msgid "First, rewinding head to replay your work on top of it...\n"
+msgstr "Najpierw cofanie czoła gałęzi, aby odtworzyć na nim pracę...\n"
+
+#: builtin/rebase.c:2082
+msgid "Could not detach HEAD"
+msgstr "Nie można odłączyć HEAD"
+
+#: builtin/rebase.c:2091
+#, c-format
+msgid "Fast-forwarded %s to %s.\n"
+msgstr "Przewinięto %s do %s.\n"
+
+#: builtin/receive-pack.c:34
+msgid "git receive-pack <git-dir>"
+msgstr "git receive-pack <katalog-gita>"
+
+#: builtin/receive-pack.c:1276
+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 ""
+"Domyślnie aktualizacja bieżącej gałęzi w nie-suchym repozytorium\n"
+"jest zabroniona, bo rozspójni indeks i drzewo robocze z tym,\n"
+"co wypchnięto, i będzie wymagać „git reset --hard”, żeby dopasować\n"
+"drzewo robocze do HEAD.\n"
+"\n"
+"Możesz ustawić wartość konfiguracji „receive.denyCurrentBranch”\n"
+"w zdalnym repozytorium na „ignore” lub „warn”, aby zezwolić na\n"
+"wypychanie na jego bieżącą gałąź; nie jest to jednak zalecane, chyba że\n"
+"umiesz zaktualizować jego drzewo robocze do wypychanych zmian\n"
+"w jakiś inny sposób.\n"
+"\n"
+"Aby wyciszyć tę wiadomość i utrzymać domyślne zachowanie, ustaw\n"
+"wartość konfiguracji „receive.denyCurrentBranch” na „refuse”."
+
+#: builtin/receive-pack.c:1296
+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 ""
+"Domyślnie usuwanie bieżącej gałęzi jest zabronione, ponieważ kolejny\n"
+"„git clone” nie wybrałby żadnego pliku, wprowadzając zamieszanie.\n"
+"\n"
+"Możesz ustawić wartość konfiguracji „receive.denyDeleteCurrent”\n"
+"w zdalnym repozytorium na „warn” lub „ignore”, żeby zezwolić na\n"
+"usuwanie bieżącej gałęzi, z ostrzeżeniem lub bez niego.\n"
+"\n"
+"Żeby wyciszyć ten komunikat, możesz ustawić ją na „refuse”."
+
+#: builtin/receive-pack.c:2481
+msgid "quiet"
+msgstr "cicho"
+
+#: builtin/receive-pack.c:2495
+msgid "You must specify a directory."
+msgstr "Musisz określić katalog."
+
+#: 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=<czas>] [--expire-unreachable=<czas>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<referencje>..."
+
+#: 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] "
+"<referencje>..."
+
+#: builtin/reflog.c:25
+msgid "git reflog exists <ref>"
+msgstr "git reflog exists <referencja>"
+
+#: builtin/reflog.c:568 builtin/reflog.c:573
+#, c-format
+msgid "'%s' is not a valid timestamp"
+msgstr "„%s” nie jest prawidłowym znacznikiem czasu"
+
+#: builtin/reflog.c:609
+#, c-format
+msgid "Marking reachable objects..."
+msgstr "Oznaczanie osiągalnych obiektów..."
+
+#: builtin/reflog.c:647
+#, c-format
+msgid "%s points nowhere!"
+msgstr "%s nigdzie nie wskazuje!"
+
+#: builtin/reflog.c:699
+msgid "no reflog specified to delete"
+msgstr "nie podano dziennika referencji do skasowania"
+
+#: builtin/reflog.c:708
+#, c-format
+msgid "not a reflog: %s"
+msgstr "nie jest dziennikiem referencji: %s"
+
+#: builtin/reflog.c:713
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "„%s” nie ma dziennika referencji"
+
+#: builtin/reflog.c:759
+#, c-format
+msgid "invalid ref format: %s"
+msgstr "nieprawidłowy format referencji: %s"
+
+#: builtin/reflog.c:768
+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 <gałąź>] [-m <główna>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <nazwa> <adres>"
+
+#: builtin/remote.c:19 builtin/remote.c:39
+msgid "git remote rename <old> <new>"
+msgstr "git remote rename <stare> <nowe>"
+
+#: builtin/remote.c:20 builtin/remote.c:44
+msgid "git remote remove <name>"
+msgstr "git remote remove <nazwa>"
+
+#: builtin/remote.c:21 builtin/remote.c:49
+msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+msgstr "git remote set-head <nazwa> (-a | --auto | -d | --delete | <gałąź>)"
+
+#: builtin/remote.c:22
+msgid "git remote [-v | --verbose] show [-n] <name>"
+msgstr "git remote [-v | --verbose] show [-n] <nazwa>"
+
+#: builtin/remote.c:23
+msgid "git remote prune [-n | --dry-run] <name>"
+msgstr "git remote prune [-n | --dry-run] <nazwa>"
+
+#: builtin/remote.c:24
+msgid ""
+"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+msgstr ""
+"git remote [-v | --verbose] update [-p | --prune] [(<grupa> | <zdalne-"
+"repozytorium>)...]"
+
+#: builtin/remote.c:25
+msgid "git remote set-branches [--add] <name> <branch>..."
+msgstr "git remote set-branches [--add] <nazwa> <gałąź>..."
+
+#: builtin/remote.c:26 builtin/remote.c:75
+msgid "git remote get-url [--push] [--all] <name>"
+msgstr "git remote get-url [--push] [--all] <nazwa>"
+
+#: builtin/remote.c:27 builtin/remote.c:80
+msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+msgstr "git remote set-url [--push] <nazwa> <nowy-adres> [<stary-adres>]"
+
+#: builtin/remote.c:28 builtin/remote.c:81
+msgid "git remote set-url --add <name> <newurl>"
+msgstr "git remote set-url --add <nazwa> <nowy-adres>"
+
+#: builtin/remote.c:29 builtin/remote.c:82
+msgid "git remote set-url --delete <name> <url>"
+msgstr "git remote set-url --delete <nazwa> <adres>"
+
+#: builtin/remote.c:34
+msgid "git remote add [<options>] <name> <url>"
+msgstr "git remote add [<opcje>] <nazwa> <adres>"
+
+#: builtin/remote.c:54
+msgid "git remote set-branches <name> <branch>..."
+msgstr "git remote set-branches <nazwa> <gałąź>..."
+
+#: builtin/remote.c:55
+msgid "git remote set-branches --add <name> <branch>..."
+msgstr "git remote set-branches --add <nazwa> <gałąź>..."
+
+#: builtin/remote.c:60
+msgid "git remote show [<options>] <name>"
+msgstr "git remote show [<opcje>] <nazwa>"
+
+#: builtin/remote.c:65
+msgid "git remote prune [<options>] <name>"
+msgstr "git remote prune [<opcje>] <nazwa>"
+
+#: builtin/remote.c:70
+msgid "git remote update [<options>] [<group> | <remote>]..."
+msgstr "git remote update [<opcje>] [<grupa> | <zdalne-repozytorium>]..."
+
+#: builtin/remote.c:99
+#, c-format
+msgid "Updating %s"
+msgstr "Aktualizowanie %s"
+
+#: builtin/remote.c:131
+msgid ""
+"--mirror is dangerous and deprecated; please\n"
+"\t use --mirror=fetch or --mirror=push instead"
+msgstr ""
+"--mirror jest niebezpieczne i przestarzałe;\n"
+"\t użyj zamiast tego --mirror=fetch lub --mirror=push"
+
+#: builtin/remote.c:148
+#, c-format
+msgid "unknown mirror argument: %s"
+msgstr "nieznany argument lustrzany: %s"
+
+#: builtin/remote.c:164
+msgid "fetch the remote branches"
+msgstr "pobierz zdalne gałęzie"
+
+#: builtin/remote.c:166
+msgid "import all tags and associated objects when fetching"
+msgstr "załaduj wszystkie tagi i powiązane obiekty przy ściąganiu"
+
+#: builtin/remote.c:169
+msgid "or do not fetch any tag at all (--no-tags)"
+msgstr "albo nie pobieraj w ogóle żadnego tagu (--no-tags)"
+
+#: builtin/remote.c:171
+msgid "branch(es) to track"
+msgstr "gałąź (gałęzie) do śledzenia"
+
+#: builtin/remote.c:172
+msgid "master branch"
+msgstr "główna gałąź"
+
+#: builtin/remote.c:174
+msgid "set up remote as a mirror to push to or fetch from"
+msgstr "ustaw zdalne repozytorium jako zwierciadło do wypychania i pobierania"
+
+#: builtin/remote.c:186
+msgid "specifying a master branch makes no sense with --mirror"
+msgstr "podanie głównej gałęzi nie ma sensu z --mirror"
+
+#: builtin/remote.c:188
+msgid "specifying branches to track makes sense only with fetch mirrors"
+msgstr "podanie gałęzi do śledzenia ma sens tylko ze zwierciadłami pobierania"
+
+#: builtin/remote.c:195 builtin/remote.c:700
+#, c-format
+msgid "remote %s already exists."
+msgstr "zdalne repozytorium %s już istnieje."
+
+#: builtin/remote.c:240
+#, c-format
+msgid "Could not setup master '%s'"
+msgstr "Nie można ustawić głównej gałęzi „%s”"
+
+#: builtin/remote.c:355
+#, c-format
+msgid "Could not get fetch map for refspec %s"
+msgstr "Nie można pobrać mapy do referencji %s"
+
+#: builtin/remote.c:454 builtin/remote.c:462
+msgid "(matching)"
+msgstr "(pasujące)"
+
+#: builtin/remote.c:466
+msgid "(delete)"
+msgstr "(usunięcie)"
+
+#: builtin/remote.c:655
+#, c-format
+msgid "could not set '%s'"
+msgstr "nie można ustawić „%s”"
+
+#: builtin/remote.c:660
+#, c-format
+msgid ""
+"The %s configuration remote.pushDefault in:\n"
+"\t%s:%d\n"
+"now names the non-existent remote '%s'"
+msgstr ""
+"Konfiguracja remote.pushDefault %s w:\n"
+"\t%s:%d\n"
+"wskazuje teraz nieistniejące zdalne repozytorium „%s”"
+
+#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946
+#, c-format
+msgid "No such remote: '%s'"
+msgstr "Nie ma takiego zdalnego repozytorium: „%s”"
+
+#: builtin/remote.c:710
+#, c-format
+msgid "Could not rename config section '%s' to '%s'"
+msgstr "Nie można zmienić nazwy rozdziału konfiguracji „%s” na „%s”"
+
+#: builtin/remote.c:730
+#, c-format
+msgid ""
+"Not updating non-default fetch refspec\n"
+"\t%s\n"
+"\tPlease update the configuration manually if necessary."
+msgstr ""
+"Nie aktualizowanie referencji pobierania innej niż domyślna\n"
+"\t%s\n"
+"\tJeśli to konieczne, zaktualizuj ustawienia ręcznie."
+
+#: builtin/remote.c:770
+#, c-format
+msgid "deleting '%s' failed"
+msgstr "nie można usunąć „%s”"
+
+#: builtin/remote.c:804
+#, c-format
+msgid "creating '%s' failed"
+msgstr "nie można utworzyć „%s”"
+
+#: builtin/remote.c:882
+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] ""
+"Uwaga: nie usuwam gałęzi poza hierarchią refs/remotes/;\n"
+"aby ją usunąć, użyj:"
+msgstr[1] ""
+"Uwaga: nie usuwam gałęzi poza hierarchią refs/remotes/;\n"
+"aby je usunąć, użyj:"
+msgstr[2] ""
+"Uwaga: nie usuwam gałęzi poza hierarchią refs/remotes/;\n"
+"aby je usunąć, użyj:"
+
+#: builtin/remote.c:896
+#, c-format
+msgid "Could not remove config section '%s'"
+msgstr "Nie można usunąć rozdziału konfiguracji „%s”"
+
+#: builtin/remote.c:999
+#, c-format
+msgid " new (next fetch will store in remotes/%s)"
+msgstr " nowe (następne pobranie zapisze w remotes/%s)"
+
+#: builtin/remote.c:1002
+msgid " tracked"
+msgstr " śledzone"
+
+#: builtin/remote.c:1004
+msgid " stale (use 'git remote prune' to remove)"
+msgstr " zastała (użyj „git remote prune”, aby usunąć)"
+
+#: builtin/remote.c:1006
+msgid " ???"
+msgstr " ???"
+
+#: builtin/remote.c:1047
+#, c-format
+msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
+msgstr "złe branch.%s.merge; nie można przestawiać na > 1 gałąź"
+
+#: builtin/remote.c:1056
+#, c-format
+msgid "rebases interactively onto remote %s"
+msgstr "przestawia interaktywnie na zdalne repozytorium %s"
+
+#: builtin/remote.c:1058
+#, c-format
+msgid "rebases interactively (with merges) onto remote %s"
+msgstr "przestawia interaktywnie (ze scaleniami) na zdalne repozytorium %s"
+
+#: builtin/remote.c:1061
+#, c-format
+msgid "rebases onto remote %s"
+msgstr "przestawia się na zdalne repozytorium %s"
+
+#: builtin/remote.c:1065
+#, c-format
+msgid " merges with remote %s"
+msgstr " scala się ze zdalnym repozytorium %s"
+
+#: builtin/remote.c:1068
+#, c-format
+msgid "merges with remote %s"
+msgstr "scala się ze zdalnym repozytorium %s"
+
+#: builtin/remote.c:1071
+#, c-format
+msgid "%-*s and with remote %s\n"
+msgstr "%-*s i ze zdalnym repozytorium %s\n"
+
+#: builtin/remote.c:1114
+msgid "create"
+msgstr "utwórz"
+
+#: builtin/remote.c:1117
+msgid "delete"
+msgstr "usuń"
+
+#: builtin/remote.c:1121
+msgid "up to date"
+msgstr "aktualne"
+
+#: builtin/remote.c:1124
+msgid "fast-forwardable"
+msgstr "przewijalne"
+
+#: builtin/remote.c:1127
+msgid "local out of date"
+msgstr "lokalna nieaktualna"
+
+#: builtin/remote.c:1134
+#, c-format
+msgid " %-*s forces to %-*s (%s)"
+msgstr " %-*s wymusza na %-*s (%s)"
+
+#: builtin/remote.c:1137
+#, c-format
+msgid " %-*s pushes to %-*s (%s)"
+msgstr " %-*s wypycha na %-*s (%s)"
+
+#: builtin/remote.c:1141
+#, c-format
+msgid " %-*s forces to %s"
+msgstr " %-*s wymusza na %s"
+
+#: builtin/remote.c:1144
+#, c-format
+msgid " %-*s pushes to %s"
+msgstr " %-*s wypycha na %s"
+
+#: builtin/remote.c:1212
+msgid "do not query remotes"
+msgstr "nie odpytuj zdalnych repozytoriów"
+
+#: builtin/remote.c:1239
+#, c-format
+msgid "* remote %s"
+msgstr "* zdalne repozytorium %s"
+
+#: builtin/remote.c:1240
+#, c-format
+msgid " Fetch URL: %s"
+msgstr " Adres do pobierania: %s"
+
+#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+msgid "(no URL)"
+msgstr "(brak adresu URL)"
+
+#. TRANSLATORS: the colon ':' should align
+#. with the one in " Fetch URL: %s"
+#. translation.
+#.
+#: builtin/remote.c:1255 builtin/remote.c:1257
+#, c-format
+msgid " Push URL: %s"
+msgstr " Adres do wypychania: %s"
+
+#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#, c-format
+msgid " HEAD branch: %s"
+msgstr " gałąź HEAD: %s"
+
+#: builtin/remote.c:1259
+msgid "(not queried)"
+msgstr "(nie odpytano)"
+
+#: builtin/remote.c:1261
+msgid "(unknown)"
+msgstr "(nieznane)"
+
+#: builtin/remote.c:1265
+#, c-format
+msgid ""
+" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+msgstr ""
+" gałąź HEAD (zdalne HEAD jest niejednoznaczne, może być jednym z "
+"następujących):\n"
+
+#: builtin/remote.c:1277
+#, c-format
+msgid " Remote branch:%s"
+msgid_plural " Remote branches:%s"
+msgstr[0] " Zdalna gałąź:%s"
+msgstr[1] " Zdalne gałęzie:%s"
+msgstr[2] " Zdalne gałęzie:%s"
+
+#: builtin/remote.c:1280 builtin/remote.c:1306
+msgid " (status not queried)"
+msgstr " (nie odpytano stanu)"
+
+#: builtin/remote.c:1289
+msgid " Local branch configured for 'git pull':"
+msgid_plural " Local branches configured for 'git pull':"
+msgstr[0] " Lokalna gałąź ustawiona do „git pull”:"
+msgstr[1] " Lokalne gałęzie ustawione do „git pull”:"
+msgstr[2] " Lokalne gałęzie ustawione do „git pull”:"
+
+#: builtin/remote.c:1297
+msgid " Local refs will be mirrored by 'git push'"
+msgstr " Lokalne referencje będą odzwierciedlane przez „git push”"
+
+#: builtin/remote.c:1303
+#, c-format
+msgid " Local ref configured for 'git push'%s:"
+msgid_plural " Local refs configured for 'git push'%s:"
+msgstr[0] " Lokalna referencja ustawiona do „git push”%s:"
+msgstr[1] " Lokalne referencje ustawione do „git push”%s:"
+msgstr[2] " Lokalne referencje ustawione do „git push”%s:"
+
+#: builtin/remote.c:1324
+msgid "set refs/remotes/<name>/HEAD according to remote"
+msgstr "ustaw refs/remotes/<nazwa>/HEAD według zdalnego repozytorium"
+
+#: builtin/remote.c:1326
+msgid "delete refs/remotes/<name>/HEAD"
+msgstr "usuń refs/remotes/<nazwa>/HEAD"
+
+#: builtin/remote.c:1341
+msgid "Cannot determine remote HEAD"
+msgstr "Nie można ustalić zdalnego HEAD"
+
+#: builtin/remote.c:1343
+msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
+msgstr "Wiele gałęzi HEAD. Wybierz jedną jawnie przez:"
+
+#: builtin/remote.c:1353
+#, c-format
+msgid "Could not delete %s"
+msgstr "Nie można usunąć %s"
+
+#: builtin/remote.c:1361
+#, c-format
+msgid "Not a valid ref: %s"
+msgstr "Nieprawidłowa referencja: %s"
+
+#: builtin/remote.c:1363
+#, c-format
+msgid "Could not setup %s"
+msgstr "Nie można ustawić %s"
+
+#: builtin/remote.c:1381
+#, c-format
+msgid " %s will become dangling!"
+msgstr " %s będzie wiszący!"
+
+#: builtin/remote.c:1382
+#, c-format
+msgid " %s has become dangling!"
+msgstr " %s stał się wiszący!"
+
+#: builtin/remote.c:1392
+#, c-format
+msgid "Pruning %s"
+msgstr "Przycinanie %s"
+
+#: builtin/remote.c:1393
+#, c-format
+msgid "URL: %s"
+msgstr "Adres URL: %s"
+
+#: builtin/remote.c:1409
+#, c-format
+msgid " * [would prune] %s"
+msgstr " * [przycięto by] %s"
+
+#: builtin/remote.c:1412
+#, c-format
+msgid " * [pruned] %s"
+msgstr " * [przycięto] %s"
+
+#: builtin/remote.c:1457
+msgid "prune remotes after fetching"
+msgstr "przytnij zdalne repozytoria po pobraniu"
+
+#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#, c-format
+msgid "No such remote '%s'"
+msgstr "Nie ma takiego zdalnego repozytorium „%s”"
+
+#: builtin/remote.c:1539
+msgid "add branch"
+msgstr "dodaj gałąź"
+
+#: builtin/remote.c:1546
+msgid "no remote specified"
+msgstr "nie podano zdalnego repozytorium"
+
+#: builtin/remote.c:1563
+msgid "query push URLs rather than fetch URLs"
+msgstr "operuj na adresach wypychania zamiast pobierania"
+
+#: builtin/remote.c:1565
+msgid "return all URLs"
+msgstr "zwróć wszystkie adresy URL"
+
+#: builtin/remote.c:1595
+#, c-format
+msgid "no URLs configured for remote '%s'"
+msgstr "zdalne repozytorium „%s” nie ma skonfigurowanych adresów"
+
+#: builtin/remote.c:1621
+msgid "manipulate push URLs"
+msgstr "operuj na adresach wypychania"
+
+#: builtin/remote.c:1623
+msgid "add URL"
+msgstr "dodaj adres URL"
+
+#: builtin/remote.c:1625
+msgid "delete URLs"
+msgstr "usuń adresy URL"
+
+#: builtin/remote.c:1632
+msgid "--add --delete doesn't make sense"
+msgstr "--add --delete nie ma sensu"
+
+#: builtin/remote.c:1673
+#, c-format
+msgid "Invalid old URL pattern: %s"
+msgstr "Nieprawidłowy stary wzorzec adresu: %s"
+
+#: builtin/remote.c:1681
+#, c-format
+msgid "No such URL found: %s"
+msgstr "Nie znaleziono takiego adresu URL: %s"
+
+#: builtin/remote.c:1683
+msgid "Will not delete all non-push URLs"
+msgstr "Nie skasuje wszystkich adresów nie do wypychania"
+
+#: builtin/repack.c:26
+msgid "git repack [<options>]"
+msgstr "git repack [<opcje>]"
+
+#: builtin/repack.c:31
+msgid ""
+"Incremental repacks are incompatible with bitmap indexes. Use\n"
+"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
+msgstr ""
+"Przyrostowe przepakowania są niekompatybilne z indeksami bitmap. Użyj\n"
+"--no-write-bitmap-index lub wyłącz konfigurację pack.writebitmaps."
+
+#: builtin/repack.c:198
+msgid "could not start pack-objects to repack promisor objects"
+msgstr "nie można uruchomić pack-objects, żeby przepakować obiecujące obiekty"
+
+#: builtin/repack.c:270 builtin/repack.c:446
+msgid "repack: Expecting full hex object ID lines only from pack-objects."
+msgstr ""
+"repack: Oczekiwano tylko wierszy z pełnych szesnastkowych identyfikatorów "
+"obiektów z pack-objects."
+
+#: builtin/repack.c:294
+msgid "could not finish pack-objects to repack promisor objects"
+msgstr "nie można ukończyć pack-objects, żeby przepakować obiecujące obiekty"
+
+#: builtin/repack.c:322
+msgid "pack everything in a single pack"
+msgstr "spakuj wszystko w jedną paczkę"
+
+#: builtin/repack.c:324
+msgid "same as -a, and turn unreachable objects loose"
+msgstr "to samo, co -a, i zamień nieosiągalne obiekty w luźne"
+
+#: builtin/repack.c:327
+msgid "remove redundant packs, and run git-prune-packed"
+msgstr "usuń zbędne paczki i wykonaj git-prune-packed"
+
+#: builtin/repack.c:329
+msgid "pass --no-reuse-delta to git-pack-objects"
+msgstr "przekaż --no-reuse-delta do git-pack-objects"
+
+#: builtin/repack.c:331
+msgid "pass --no-reuse-object to git-pack-objects"
+msgstr "przekaż --no-reuse-object do git-pack-objects"
+
+#: builtin/repack.c:333
+msgid "do not run git-update-server-info"
+msgstr "nie wykonuj git-update-server-info"
+
+#: builtin/repack.c:336
+msgid "pass --local to git-pack-objects"
+msgstr "przekaż --local do git-pack-objects"
+
+#: builtin/repack.c:338
+msgid "write bitmap index"
+msgstr "zapisz indeks bitmapy"
+
+#: builtin/repack.c:340
+msgid "pass --delta-islands to git-pack-objects"
+msgstr "przekaż --delta-islands do git-pack-objects"
+
+#: builtin/repack.c:341
+msgid "approxidate"
+msgstr "przybliżona-data"
+
+#: builtin/repack.c:342
+msgid "with -A, do not loosen objects older than this"
+msgstr "z -A, nie luzuj obiektów starszych niż podana data"
+
+#: builtin/repack.c:344
+msgid "with -a, repack unreachable objects"
+msgstr "z -a przepakuj wszystkie nieosiągalne obiekty"
+
+#: builtin/repack.c:346
+msgid "size of the window used for delta compression"
+msgstr "rozmiar okna użytego do kompresji delt"
+
+#: builtin/repack.c:347 builtin/repack.c:353
+msgid "bytes"
+msgstr "bajty"
+
+#: builtin/repack.c:348
+msgid "same as the above, but limit memory size instead of entries count"
+msgstr "jak wyżej, ale ogranicz rozmiar pamięci zamiast liczby elementów"
+
+#: builtin/repack.c:350
+msgid "limits the maximum delta depth"
+msgstr "ogranicza maksymalną głębokość delty"
+
+#: builtin/repack.c:352
+msgid "limits the maximum number of threads"
+msgstr "ogranicza maksymalną liczbę wątków"
+
+#: builtin/repack.c:354
+msgid "maximum size of each packfile"
+msgstr "maksymalny rozmiar pojedynczego pliku paczki"
+
+#: builtin/repack.c:356
+msgid "repack objects in packs marked with .keep"
+msgstr "przepakuj obiekty w paczki oznaczone przez .keep"
+
+#: builtin/repack.c:358
+msgid "do not repack this pack"
+msgstr "nie przepakowuj tej paczki"
+
+#: builtin/repack.c:368
+msgid "cannot delete packs in a precious-objects repo"
+msgstr "nie można usuwać paczek w repozytorium o cennych obiektach"
+
+#: builtin/repack.c:372
+msgid "--keep-unreachable and -A are incompatible"
+msgstr "--keep-unreachable i -A się wykluczają"
+
+#: builtin/repack.c:455
+msgid "Nothing new to pack."
+msgstr "Nic nowego do spakowania."
+
+#: builtin/repack.c:485
+#, c-format
+msgid "missing required file: %s"
+msgstr "brakuje wymaganego pliku: %s"
+
+#: builtin/repack.c:487
+#, c-format
+msgid "could not unlink: %s"
+msgstr "nie można usunąć przez unlink: %s"
+
+#: builtin/replace.c:22
+msgid "git replace [-f] <object> <replacement>"
+msgstr "git replace [-f] <obiekt> <zamiennik>"
+
+#: builtin/replace.c:23
+msgid "git replace [-f] --edit <object>"
+msgstr "git replace [-f] --edit <obiekt>"
+
+#: builtin/replace.c:24
+msgid "git replace [-f] --graft <commit> [<parent>...]"
+msgstr "git replace [-f] --graft <zapis> [<rodzic>...]"
+
+#: 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 <obiekt>..."
+
+#: builtin/replace.c:27
+msgid "git replace [--format=<format>] [-l [<pattern>]]"
+msgstr "git replace [--format=<format>] [-l [<wzorzec>]]"
+
+#: builtin/replace.c:90
+#, c-format
+msgid ""
+"invalid replace format '%s'\n"
+"valid formats are 'short', 'medium' and 'long'"
+msgstr ""
+"nieprawidłowy format zamiany „%s”\n"
+"prawidłowe formaty to „short”, „medium” i „long”"
+
+#: builtin/replace.c:125
+#, c-format
+msgid "replace ref '%s' not found"
+msgstr "nie znaleziono zamiennej referencji „%s”"
+
+#: builtin/replace.c:141
+#, c-format
+msgid "Deleted replace ref '%s'"
+msgstr "Usunięto zastępczą referencję „%s”"
+
+#: builtin/replace.c:153
+#, c-format
+msgid "'%s' is not a valid ref name"
+msgstr "„%s” nie jest prawidłową nazwą referencji"
+
+#: builtin/replace.c:158
+#, c-format
+msgid "replace ref '%s' already exists"
+msgstr "referencja zastępcza „%s” już istnieje"
+
+#: 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 ""
+"Obiekty muszą być tego samego typu.\n"
+"„%s” wskazuje na zastąpiony obiekt „%s”,\n"
+"a „%s” wskazuje na zastępczy obiekt „%s”."
+
+#: builtin/replace.c:229
+#, c-format
+msgid "unable to open %s for writing"
+msgstr "nie można otworzyć „%s” do zapisywania"
+
+#: builtin/replace.c:242
+msgid "cat-file reported failure"
+msgstr "cat-file zgłosiło błąd"
+
+#: builtin/replace.c:258
+#, c-format
+msgid "unable to open %s for reading"
+msgstr "nie można otworzyć %s do odczytu"
+
+#: builtin/replace.c:272
+msgid "unable to spawn mktree"
+msgstr "nie można uruchomić mktree"
+
+#: builtin/replace.c:276
+msgid "unable to read from mktree"
+msgstr "nie można odczytać z mktree"
+
+#: builtin/replace.c:285
+msgid "mktree reported failure"
+msgstr "mktree zgłosiło błąd"
+
+#: builtin/replace.c:289
+msgid "mktree did not return an object name"
+msgstr "mktree nie zwróciło nazwy obiektu"
+
+#: builtin/replace.c:298
+#, c-format
+msgid "unable to fstat %s"
+msgstr "nie można wykonać fstat na %s"
+
+#: builtin/replace.c:303
+msgid "unable to write object to database"
+msgstr "nie można zapisać obiektu do bazy danych"
+
+#: 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 "nieprawidłowa nazwa obiektu: „%s”"
+
+#: builtin/replace.c:326
+#, c-format
+msgid "unable to get object type for %s"
+msgstr "nie można uzyskać rodzaju obiektu %s"
+
+#: builtin/replace.c:342
+msgid "editing object file failed"
+msgstr "edycja pliku obiektu nie powiodła się"
+
+#: builtin/replace.c:351
+#, c-format
+msgid "new object is the same as the old one: '%s'"
+msgstr "nowy obiekt jest tym samym, co stary: „%s”"
+
+#: builtin/replace.c:384
+#, c-format
+msgid "could not parse %s as a commit"
+msgstr "nie można przetworzyć %s jako zapisu"
+
+#: builtin/replace.c:416
+#, c-format
+msgid "bad mergetag in commit '%s'"
+msgstr "zły tag scalenia w zapisie „%s”"
+
+#: builtin/replace.c:418
+#, c-format
+msgid "malformed mergetag in commit '%s'"
+msgstr "nieprawidłowy tag scalenia w zapisie „%s”"
+
+#: builtin/replace.c:430
+#, c-format
+msgid ""
+"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
+"instead of --graft"
+msgstr ""
+"pierwotny zapis „%s” zawiera tag scalenia „%s”, który jest odrzucany; użyj --"
+"edit zamiast --graft"
+
+#: builtin/replace.c:469
+#, c-format
+msgid "the original commit '%s' has a gpg signature"
+msgstr "pierwotny zapis „%s” ma podpis GPG"
+
+#: builtin/replace.c:470
+msgid "the signature will be removed in the replacement commit!"
+msgstr "podpis zostanie usunięty w zastępczym zapisie!"
+
+#: builtin/replace.c:480
+#, c-format
+msgid "could not write replacement commit for: '%s'"
+msgstr "nie można zapisać zastępczego zapisu dla: „%s”"
+
+#: builtin/replace.c:488
+#, c-format
+msgid "graft for '%s' unnecessary"
+msgstr "szczepka w „%s” niepotrzebna"
+
+#: builtin/replace.c:492
+#, c-format
+msgid "new commit is the same as the old one: '%s'"
+msgstr "nowy zapis jest tym samym, co stary: „%s”"
+
+#: builtin/replace.c:527
+#, c-format
+msgid ""
+"could not convert the following graft(s):\n"
+"%s"
+msgstr ""
+"nie można skonwertować następujących szczepek:\n"
+"%s"
+
+#: builtin/replace.c:548
+msgid "list replace refs"
+msgstr "wypisz referencje replace"
+
+#: builtin/replace.c:549
+msgid "delete replace refs"
+msgstr "usuń zastępcze referencje"
+
+#: builtin/replace.c:550
+msgid "edit existing object"
+msgstr "edytuj istniejący obiekt"
+
+#: builtin/replace.c:551
+msgid "change a commit's parents"
+msgstr "zmień rodziców zapisu"
+
+#: builtin/replace.c:552
+msgid "convert existing graft file"
+msgstr "skonwertuj istniejący plik szczepek"
+
+#: builtin/replace.c:553
+msgid "replace the ref if it exists"
+msgstr "zastąp referencję, jeśli istnieje"
+
+#: builtin/replace.c:555
+msgid "do not pretty-print contents for --edit"
+msgstr "nie wypisuj ładnie zawartości do --edit"
+
+#: builtin/replace.c:556
+msgid "use this format"
+msgstr "użyj tego formatu"
+
+#: builtin/replace.c:569
+msgid "--format cannot be used when not listing"
+msgstr "nie można użyć --format bez wymieniania"
+
+#: builtin/replace.c:577
+msgid "-f only makes sense when writing a replacement"
+msgstr "-f ma sens tylko przy wypisywaniu zamiennika"
+
+#: builtin/replace.c:581
+msgid "--raw only makes sense with --edit"
+msgstr "--raw ma sens tylko z --edit"
+
+#: builtin/replace.c:587
+msgid "-d needs at least one argument"
+msgstr "-d potrzebuje przynajmniej jednego argumentu"
+
+#: builtin/replace.c:593
+msgid "bad number of arguments"
+msgstr "zła liczba argumentów"
+
+#: builtin/replace.c:599
+msgid "-e needs exactly one argument"
+msgstr "-e potrzebuje dokładnie jednego argumentu"
+
+#: builtin/replace.c:605
+msgid "-g needs at least one argument"
+msgstr "-g potrzebuje przynajmniej jednego argumentu"
+
+#: builtin/replace.c:611
+msgid "--convert-graft-file takes no argument"
+msgstr "--convert-graft-file nie przyjmuje argumentu"
+
+#: builtin/replace.c:617
+msgid "only one pattern can be given with -l"
+msgstr "z -l można podać tylko jeden wzorzec"
+
+#: builtin/rerere.c:13
+msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
+msgstr ""
+"git rerere [clear | forget <ścieżka>... | status | remaining | diff | gc]"
+
+#: builtin/rerere.c:60
+msgid "register clean resolutions in index"
+msgstr "zarejestruj gładkie rozwiązania w indeksie"
+
+#: builtin/rerere.c:79
+msgid "'git rerere forget' without paths is deprecated"
+msgstr "„git rerere forget” bez ścieżek jest przestarzałe"
+
+#: builtin/rerere.c:113
+#, c-format
+msgid "unable to generate diff for '%s'"
+msgstr "nie można wygenerować różnic dla „%s”"
+
+#: builtin/reset.c:32
+msgid ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+msgstr ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<zapis>]"
+
+#: builtin/reset.c:33
+msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
+msgstr "git reset [-q] [<drzewo>] [--] <ścieżka>..."
+
+#: 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]] [<drzewo>]"
+
+#: builtin/reset.c:35
+msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
+msgstr "git reset --patch [<drzewo>] [--] [<ścieżka>...]"
+
+#: builtin/reset.c:41
+msgid "mixed"
+msgstr "mieszany"
+
+#: builtin/reset.c:41
+msgid "soft"
+msgstr "miękki"
+
+#: builtin/reset.c:41
+msgid "hard"
+msgstr "twardy"
+
+#: builtin/reset.c:41
+msgid "merge"
+msgstr "scalenie"
+
+#: builtin/reset.c:41
+msgid "keep"
+msgstr "zachowaj"
+
+#: builtin/reset.c:83
+msgid "You do not have a valid HEAD."
+msgstr "HEAD jest nieprawidłowe."
+
+#: builtin/reset.c:85
+msgid "Failed to find tree of HEAD."
+msgstr "Nie znaleziono drzewa HEAD."
+
+#: builtin/reset.c:91
+#, c-format
+msgid "Failed to find tree of %s."
+msgstr "Nie znaleziono drzewa %s."
+
+#: builtin/reset.c:116
+#, c-format
+msgid "HEAD is now at %s"
+msgstr "HEAD wskazuje teraz %s"
+
+#: builtin/reset.c:195
+#, c-format
+msgid "Cannot do a %s reset in the middle of a merge."
+msgstr "Nie można wykonać resetu %s podczas scalania."
+
+#: builtin/reset.c:295 builtin/stash.c:587 builtin/stash.c:661
+#: builtin/stash.c:685
+msgid "be quiet, only report errors"
+msgstr "mniej komunikatów, wypisuj tylko błędy"
+
+#: builtin/reset.c:297
+msgid "reset HEAD and index"
+msgstr "zresetuj HEAD i indeks"
+
+#: builtin/reset.c:298
+msgid "reset only HEAD"
+msgstr "zresetuj tylko HEAD"
+
+#: builtin/reset.c:300 builtin/reset.c:302
+msgid "reset HEAD, index and working tree"
+msgstr "zresetuj HEAD, indeks i drzewo robocze"
+
+#: builtin/reset.c:304
+msgid "reset HEAD but keep local changes"
+msgstr "zresetuj HEAD, ale zachowaj lokalne zmiany"
+
+#: builtin/reset.c:310
+msgid "record only the fact that removed paths will be added later"
+msgstr "zapisz tylko, że usunięte ścieżki zostaną dodane później"
+
+#: builtin/reset.c:344
+#, c-format
+msgid "Failed to resolve '%s' as a valid revision."
+msgstr "Nie można rozwiązać „%s” jako prawidłowej rewizji."
+
+#: builtin/reset.c:352
+#, c-format
+msgid "Failed to resolve '%s' as a valid tree."
+msgstr "Nie można rozwiązać „%s” jako prawidłowego drzewa."
+
+#: builtin/reset.c:361
+msgid "--patch is incompatible with --{hard,mixed,soft}"
+msgstr "--patch i --{hard,mixed,soft} się wykluczają"
+
+#: builtin/reset.c:371
+msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
+msgstr ""
+"--mixed ze ścieżkami jest przestarzałe; użyj zamiast tego „git reset -- "
+"<ścieżki>”."
+
+#: builtin/reset.c:373
+#, c-format
+msgid "Cannot do %s reset with paths."
+msgstr "Nie można wykonać resetu %s ze ścieżkami."
+
+#: builtin/reset.c:388
+#, c-format
+msgid "%s reset is not allowed in a bare repository"
+msgstr "resetowanie %s nie jest dozwolone w suchym repozytorium"
+
+#: builtin/reset.c:392
+msgid "-N can only be used with --mixed"
+msgstr "-N może być użyte tylko z --mixed"
+
+#: builtin/reset.c:413
+msgid "Unstaged changes after reset:"
+msgstr "Nieprzygotowane zmiany po resecie:"
+
+#: 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"
+"Przejrzenie nieprzygotowanych zmian po resecie zajęło %.2f sekund.\n"
+"Możesz użyć „--quiet”, żeby tego uniknąć. Ustaw konfigurację reset.quiet\n"
+"na true, aby było to domyślne.\n"
+
+#: builtin/reset.c:434
+#, c-format
+msgid "Could not reset index file to revision '%s'."
+msgstr "Nie można zresetować pliku indeksu do rewizji „%s”."
+
+#: builtin/reset.c:439
+msgid "Could not write new index file."
+msgstr "Nie można zapisać nowego pliku indeksu."
+
+#: builtin/rev-list.c:534
+msgid "cannot combine --exclude-promisor-objects and --missing"
+msgstr "--exclude-promisor-objects i --missing się wykluczają"
+
+#: builtin/rev-list.c:595
+msgid "object filtering requires --objects"
+msgstr "filtrowanie obiektów wymaga --objects"
+
+#: builtin/rev-list.c:651
+msgid "rev-list does not support display of notes"
+msgstr "rev-list nie wspiera wyświetlania uwag"
+
+#: builtin/rev-list.c:656
+msgid "marked counting is incompatible with --objects"
+msgstr "znaczone zliczanie i --objects się wykluczają"
+
+#: builtin/rev-parse.c:409
+msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
+msgstr "git rev-parse --parseopt [<opcje>] -- [<argumenty>...]"
+
+#: builtin/rev-parse.c:414
+msgid "keep the `--` passed as an arg"
+msgstr "przekaż „--” dalej jako argument"
+
+#: builtin/rev-parse.c:416
+msgid "stop parsing after the first non-option argument"
+msgstr "przerwij przetwarzanie po pierwszym argumencie, który nie jest opcją"
+
+#: builtin/rev-parse.c:419
+msgid "output in stuck long form"
+msgstr "wypisz w zbitej długiej postaci"
+
+#: 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 [<opcje>] -- [<argumenty>...]\n"
+" lub: git rev-parse --sq-quote [<arg>...]\n"
+" lub: git rev-parse [<opcje>] [<arg>...]\n"
+"\n"
+"Wykonaj „git rev-parse --parseopt -h”, aby uzyskać więcej informacji o "
+"pierwszym użyciu."
+
+#: builtin/revert.c:24
+msgid "git revert [<options>] <commit-ish>..."
+msgstr "git revert [<opcje>] <zmiana>..."
+
+#: builtin/revert.c:25
+msgid "git revert <subcommand>"
+msgstr "git revert <pod-polecenie>"
+
+#: builtin/revert.c:30
+msgid "git cherry-pick [<options>] <commit-ish>..."
+msgstr "git cherry-pick [<opcje>] <zmiana>..."
+
+#: builtin/revert.c:31
+msgid "git cherry-pick <subcommand>"
+msgstr "git cherry-pick <pod-polecenie>"
+
+#: builtin/revert.c:72
+#, c-format
+msgid "option `%s' expects a number greater than zero"
+msgstr "opcja „%s” oczekuje liczby większej niż zero"
+
+#: builtin/revert.c:92
+#, c-format
+msgid "%s: %s cannot be used with %s"
+msgstr "%s: %s i %s wykluczają się"
+
+#: builtin/revert.c:102
+msgid "end revert or cherry-pick sequence"
+msgstr "zakończ sekwencję odwracania lub dobierania"
+
+#: builtin/revert.c:103
+msgid "resume revert or cherry-pick sequence"
+msgstr "wznów sekwencję odwracania lub dobierania"
+
+#: builtin/revert.c:104
+msgid "cancel revert or cherry-pick sequence"
+msgstr "anuluj sekwencję odwracania lub dobierania"
+
+#: builtin/revert.c:105
+msgid "skip current commit and continue"
+msgstr "pomiń bieżący zapis i kontynuuj"
+
+#: builtin/revert.c:107
+msgid "don't automatically commit"
+msgstr "nie składaj zapisów automatycznie"
+
+#: builtin/revert.c:108
+msgid "edit the commit message"
+msgstr "edytuj komunikat zapisu"
+
+#: builtin/revert.c:111
+msgid "parent-number"
+msgstr "numer-rodzica"
+
+#: builtin/revert.c:112
+msgid "select mainline parent"
+msgstr "wybierz rodzica w głównym nurcie"
+
+#: builtin/revert.c:114
+msgid "merge strategy"
+msgstr "strategia scalania"
+
+#: builtin/revert.c:116
+msgid "option for merge strategy"
+msgstr "opcja strategii scalania"
+
+#: builtin/revert.c:125
+msgid "append commit name"
+msgstr "dodaj nazwę zapisu"
+
+#: builtin/revert.c:127
+msgid "preserve initially empty commits"
+msgstr "zachowaj początkowo puste zapisy"
+
+#: builtin/revert.c:129
+msgid "keep redundant, empty commits"
+msgstr "zachowaj zbędne puste zapisy"
+
+#: builtin/revert.c:239
+msgid "revert failed"
+msgstr "odwrócenie nie powiodło się"
+
+#: builtin/revert.c:252
+msgid "cherry-pick failed"
+msgstr "dobieranie nie powiodło się"
+
+#: builtin/rm.c:19
+msgid "git rm [<options>] [--] <file>..."
+msgstr "git rm [<opcje>] [--] <plik>..."
+
+#: 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] ""
+"następujący plik ma przygotowaną zawartość różną i od pliku\n"
+"i od HEAD:"
+msgstr[1] ""
+"następujące pliki ma przygotowaną zawartość różną i od pliku\n"
+"i od HEAD:"
+msgstr[2] ""
+"następujące pliki ma przygotowaną zawartość różną i od pliku\n"
+"i od HEAD:"
+
+#: builtin/rm.c:212
+msgid ""
+"\n"
+"(use -f to force removal)"
+msgstr ""
+"\n"
+"(użyj -f, by wymusić usunięcie)"
+
+#: 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] "następujący plik ma zmiany przygotowane w indeksie:"
+msgstr[1] "następujące pliki mają zmiany przygotowane w indeksie:"
+msgstr[2] "następujące pliki mają zmiany przygotowane w indeksie:"
+
+#: builtin/rm.c:220 builtin/rm.c:229
+msgid ""
+"\n"
+"(use --cached to keep the file, or -f to force removal)"
+msgstr ""
+"\n"
+"(użyj --cached, aby zachować plik, lub -f, by wymusić usunięcie)"
+
+#: builtin/rm.c:226
+msgid "the following file has local modifications:"
+msgid_plural "the following files have local modifications:"
+msgstr[0] "następujący plik ma lokalne zmiany:"
+msgstr[1] "następujące pliki mają lokalne zmiany:"
+msgstr[2] "następujące pliki mają lokalne zmiany:"
+
+#: builtin/rm.c:243
+msgid "do not list removed files"
+msgstr "nie wypisuj usuniętych plików"
+
+#: builtin/rm.c:244
+msgid "only remove from the index"
+msgstr "tylko usuń z indeksu"
+
+#: builtin/rm.c:245
+msgid "override the up-to-date check"
+msgstr "wyłącz sprawdzenie aktualności"
+
+#: builtin/rm.c:246
+msgid "allow recursive removal"
+msgstr "zezwól na usuwanie rekurencyjne"
+
+#: builtin/rm.c:248
+msgid "exit with a zero status even if nothing matched"
+msgstr "zwróć zero, nawet jeśli nic nie dopasowano"
+
+#: builtin/rm.c:282
+msgid "No pathspec was given. Which files should I remove?"
+msgstr "Nie podano żadnych ścieżek. Które pliki usunąć?"
+
+#: builtin/rm.c:305
+msgid "please stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+"przygotuj swoje zmiany w .gitmodules lub dodaj do schowka, aby kontynuować"
+
+#: builtin/rm.c:323
+#, c-format
+msgid "not removing '%s' recursively without -r"
+msgstr "nie usuwanie „%s” rekurencyjne bez -r"
+
+#: builtin/rm.c:362
+#, c-format
+msgid "git rm: unable to remove %s"
+msgstr "git rm: nie można usunąć %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] [<host>:]<katalog> "
+"[<referencja>...]\n"
+" --all i podanie konkretnych <referencji> wykluczają się."
+
+#: builtin/send-pack.c:188
+msgid "remote name"
+msgstr "nazwa zdalnego repozytorium"
+
+#: builtin/send-pack.c:201
+msgid "use stateless RPC protocol"
+msgstr "użyj bezstanowego protokołu RPC"
+
+#: builtin/send-pack.c:202
+msgid "read refs from stdin"
+msgstr "wczytaj referencje ze standardowego wejścia"
+
+#: builtin/send-pack.c:203
+msgid "print status from remote helper"
+msgstr "wypisuj stan zdalnego pomocnika"
+
+#: builtin/shortlog.c:16
+msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git shortlog [<opcje>] [<zakres-rewizji>] [[--] <ścieżka>...]"
+
+#: builtin/shortlog.c:17
+msgid "git log --pretty=short | git shortlog [<options>]"
+msgstr "git log --pretty=short | git shortlog [<opcje>]"
+
+#: builtin/shortlog.c:123
+msgid "using multiple --group options with stdin is not supported"
+msgstr "użycie wielu opcji --group ze standardowym wejściem nie jest wspierane"
+
+#: builtin/shortlog.c:133
+msgid "using --group=trailer with stdin is not supported"
+msgstr "użycie --group=trailer ze standardowym wejściem nie jest wspierane"
+
+#: builtin/shortlog.c:323
+#, c-format
+msgid "unknown group type: %s"
+msgstr "nieznany rodzaj grupy: %s"
+
+#: builtin/shortlog.c:351
+msgid "group by committer rather than author"
+msgstr "grupuj według składającego, a nie autora"
+
+#: builtin/shortlog.c:354
+msgid "sort output according to the number of commits per author"
+msgstr "posortuj wyjście według liczby zapisów na autora"
+
+#: builtin/shortlog.c:356
+msgid "suppress commit descriptions, only provides commit count"
+msgstr "pomiń opisy zapisów, podaje tylko liczbę zapisów"
+
+#: builtin/shortlog.c:358
+msgid "show the email address of each author"
+msgstr "pokazuj adres e-mail każdego autora"
+
+#: builtin/shortlog.c:359
+msgid "<w>[,<i1>[,<i2>]]"
+msgstr "<w>[,<i1>[,<i2>]]"
+
+#: builtin/shortlog.c:360
+msgid "linewrap output"
+msgstr "zawijaj wiersze wyjścia"
+
+#: builtin/shortlog.c:362
+msgid "field"
+msgstr "pole"
+
+#: builtin/shortlog.c:363
+msgid "group by field"
+msgstr "grupuj według pola"
+
+#: builtin/shortlog.c:391
+msgid "too many arguments given outside repository"
+msgstr "podano zbyt wiele argumentów poza repozytorium"
+
+#: 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[=<kiedy>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<rewizja> | <glob>)...]"
+
+#: builtin/show-branch.c:17
+msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
+msgstr ""
+"git show-branch (-g | --reflog)[=<n>[,<podstawa>]] [--list] [<referencja>]"
+
+#: 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] "pomijanie %s; nie można obsłużyć więcej niż %d referencji"
+msgstr[1] "pomijanie %s; nie można obsłużyć więcej niż %d referencji"
+msgstr[2] "pomijanie %s; nie można obsłużyć więcej niż %d referencji"
+
+#: builtin/show-branch.c:548
+#, c-format
+msgid "no matching refs with %s"
+msgstr "brak pasujących referencji z %s"
+
+#: builtin/show-branch.c:645
+msgid "show remote-tracking and local branches"
+msgstr "pokaż śledzące i lokalne gałęzie"
+
+#: builtin/show-branch.c:647
+msgid "show remote-tracking branches"
+msgstr "wypisz gałęzie śledzące"
+
+#: builtin/show-branch.c:649
+msgid "color '*!+-' corresponding to the branch"
+msgstr "koloruj „*!+-” odpowiednio do gałęzi"
+
+#: builtin/show-branch.c:651
+msgid "show <n> more commits after the common ancestor"
+msgstr "pokaż <n> dodatkowych zapisów po wspólnym przodku"
+
+#: builtin/show-branch.c:653
+msgid "synonym to more=-1"
+msgstr "zamiennik na more=-1"
+
+#: builtin/show-branch.c:654
+msgid "suppress naming strings"
+msgstr "ukryj nazwy"
+
+#: builtin/show-branch.c:656
+msgid "include the current branch"
+msgstr "uwzględnij bieżącą gałąź"
+
+#: builtin/show-branch.c:658
+msgid "name commits with their object names"
+msgstr "nazwij zapisy ich nazwami obiektów"
+
+#: builtin/show-branch.c:660
+msgid "show possible merge bases"
+msgstr "pokaż możliwe podstawy scalenia"
+
+#: builtin/show-branch.c:662
+msgid "show refs unreachable from any other ref"
+msgstr "pokaż referencje nieosiągalne z żadnej innej"
+
+#: builtin/show-branch.c:664
+msgid "show commits in topological order"
+msgstr "pokaż zapisy w kolejności topologicznej"
+
+#: builtin/show-branch.c:667
+msgid "show only commits not on the first branch"
+msgstr "pokaż tylko zapisy spoza pierwszej gałęzi"
+
+#: builtin/show-branch.c:669
+msgid "show merges reachable from only one tip"
+msgstr "pokaż scalenia osiągalne z tylko jednego czubka"
+
+#: builtin/show-branch.c:671
+msgid "topologically sort, maintaining date order where possible"
+msgstr "posortuj topologicznie, zachowując kolejność dat, gdzie się da"
+
+#: builtin/show-branch.c:674
+msgid "<n>[,<base>]"
+msgstr "<n>[,<podstawa>]"
+
+#: builtin/show-branch.c:675
+msgid "show <n> most recent ref-log entries starting at base"
+msgstr ""
+"pokaż <n> najświeższych elementów dziennika referencji poczynając od podstawy"
+
+#: builtin/show-branch.c:711
+msgid ""
+"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+msgstr ""
+"--reflog wyklucza się z --all, --remotes, --independent lub --merge-base"
+
+#: builtin/show-branch.c:735
+msgid "no branches given, and HEAD is not valid"
+msgstr "nie podano gałęzi, a HEAD jest nieprawidłowe"
+
+#: builtin/show-branch.c:738
+msgid "--reflog option needs one branch name"
+msgstr "opcja --reflog potrzebuje nazwy gałęzi"
+
+#: 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] "można pokazać tylko %d element na raz."
+msgstr[1] "można pokazać tylko %d elementy na raz."
+msgstr[2] "można pokazać tylko %d elementów na raz."
+
+#: builtin/show-branch.c:745
+#, c-format
+msgid "no such ref %s"
+msgstr "nie ma takiej referencji %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] "nie można obsłużyć więcej niż %d rewizji."
+msgstr[1] "nie można obsłużyć więcej niż %d rewizji."
+msgstr[2] "nie można obsłużyć więcej niż %d rewizji."
+
+#: builtin/show-branch.c:835
+#, c-format
+msgid "'%s' is not a valid ref."
+msgstr "„%s” nie jest prawidłową referencją."
+
+#: builtin/show-branch.c:838
+#, c-format
+msgid "cannot find commit %s (%s)"
+msgstr "nie odnaleziono zapisu %s (%s)"
+
+#: builtin/show-index.c:21
+msgid "hash-algorithm"
+msgstr "algorytm-skrótu"
+
+#: builtin/show-index.c:31
+msgid "Unknown hash algorithm"
+msgstr "Nieznany algorytm skrótu"
+
+#: 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] [--] [<wzorzec>...]"
+
+#: builtin/show-ref.c:13
+msgid "git show-ref --exclude-existing[=<pattern>]"
+msgstr "git show-ref --exclude-existing[=<wzorzec>]"
+
+#: builtin/show-ref.c:162
+msgid "only show tags (can be combined with heads)"
+msgstr "pokazuj tylko tagi (może być połączone z czołami)"
+
+#: builtin/show-ref.c:163
+msgid "only show heads (can be combined with tags)"
+msgstr "pokazuj tylko czoła (może być połączone z tagami)"
+
+#: builtin/show-ref.c:164
+msgid "stricter reference checking, requires exact ref path"
+msgstr ""
+"ściślejsze sprawdzanie referencji, wymaga dokładnej ścieżki do referencji"
+
+#: builtin/show-ref.c:167 builtin/show-ref.c:169
+msgid "show the HEAD reference, even if it would be filtered out"
+msgstr "pokaż referencję HEAD, nawet jeśli byłaby odfiltrowana"
+
+#: builtin/show-ref.c:171
+msgid "dereference tags into object IDs"
+msgstr "odczytaj z tagów identyfikatory obiektów"
+
+#: builtin/show-ref.c:173
+msgid "only show SHA1 hash using <n> digits"
+msgstr "nie pokazuj nazwy, a SHA-1 skróć do <n> cyfr"
+
+#: builtin/show-ref.c:177
+msgid "do not print results to stdout (useful with --verify)"
+msgstr "nie wypisuj wyników na wyjście (przydatne do --verify)"
+
+#: builtin/show-ref.c:179
+msgid "show refs from stdin that aren't in local repository"
+msgstr ""
+"pokaż referencje ze standardowego wejścia, których nie ma w lokalnym "
+"repozytorium"
+
+#: 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) <opcje>"
+
+#: builtin/sparse-checkout.c:45
+msgid "git sparse-checkout list"
+msgstr "git sparse-checkout list"
+
+#: builtin/sparse-checkout.c:71
+msgid "this worktree is not sparse (sparse-checkout file may not exist)"
+msgstr ""
+"to drzewo robocze nie jest rzadkie (plik rzadkiego wybrania może nie istnieć)"
+
+#: builtin/sparse-checkout.c:223
+msgid "failed to create directory for sparse-checkout file"
+msgstr "nie można utworzyć katalogu dla pliku rzadkiego wybrania"
+
+#: builtin/sparse-checkout.c:264
+msgid "unable to upgrade repository format to enable worktreeConfig"
+msgstr "nie można podnieść formatu repozytorium, aby włączyć worktreeConfig"
+
+#: builtin/sparse-checkout.c:266
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "nie można ustawić konfiguracji extensions.worktreeConfig"
+
+#: builtin/sparse-checkout.c:283
+msgid "git sparse-checkout init [--cone]"
+msgstr "git sparse-checkout init [--cone]"
+
+#: builtin/sparse-checkout.c:302
+msgid "initialize the sparse-checkout in cone mode"
+msgstr "zainicjuj rzadkie wybranie w trybie stożka"
+
+#: builtin/sparse-checkout.c:339
+#, c-format
+msgid "failed to open '%s'"
+msgstr "nie można otworzyć „%s”"
+
+#: builtin/sparse-checkout.c:396
+#, c-format
+msgid "could not normalize path %s"
+msgstr "nie można unormować ścieżki %s"
+
+#: builtin/sparse-checkout.c:408
+msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
+msgstr "git sparse-checkout (set|add) (--stdin | <wzorce>)"
+
+#: builtin/sparse-checkout.c:433
+#, c-format
+msgid "unable to unquote C-style string '%s'"
+msgstr "nie można odcytować łańcucha w stylu C „%s”"
+
+#: builtin/sparse-checkout.c:487 builtin/sparse-checkout.c:511
+msgid "unable to load existing sparse-checkout patterns"
+msgstr "nie można załadować istniejących wzorców rzadkiego wybrania"
+
+#: builtin/sparse-checkout.c:556
+msgid "read patterns from standard in"
+msgstr "wczytaj wzorce ze standardowego wejścia"
+
+#: builtin/sparse-checkout.c:571
+msgid "git sparse-checkout reapply"
+msgstr "git sparse-checkout reapply"
+
+#: builtin/sparse-checkout.c:590
+msgid "git sparse-checkout disable"
+msgstr "git sparse-checkout disable"
+
+#: builtin/sparse-checkout.c:618
+msgid "error while refreshing working directory"
+msgstr "błąd podczas odświeżania katalogu roboczego"
+
+#: builtin/stash.c:22 builtin/stash.c:38
+msgid "git stash list [<options>]"
+msgstr "git stash list [<opcje>]"
+
+#: builtin/stash.c:23 builtin/stash.c:43
+msgid "git stash show [<options>] [<stash>]"
+msgstr "git stash show [<opcje>] [<schowek>]"
+
+#: builtin/stash.c:24 builtin/stash.c:48
+msgid "git stash drop [-q|--quiet] [<stash>]"
+msgstr "git stash drop [-q|--quiet] [<schowek>]"
+
+#: builtin/stash.c:25
+msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<schowek>]"
+
+#: builtin/stash.c:26 builtin/stash.c:63
+msgid "git stash branch <branchname> [<stash>]"
+msgstr "git stash branch <gałąź> [<schowek>]"
+
+#: 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 <komunikat>]\n"
+" [--pathspec-from-file=<plik> [--pathspec-file-nul]]\n"
+" [--] [<ścieżka>...]]"
+
+#: 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] [<komunikat>]"
+
+#: builtin/stash.c:53
+msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash pop [--index] [-q|--quiet] [<schowek>]"
+
+#: builtin/stash.c:58
+msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash apply [--index] [-q|--quiet] [<schowek>]"
+
+#: builtin/stash.c:73
+msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
+msgstr "git stash store [-m|--message <komunikat>] [-q|--quiet] <zapis>"
+
+#: 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 <komunikat>]\n"
+" [--] [<ścieżka>...]]"
+
+#: builtin/stash.c:128
+#, c-format
+msgid "'%s' is not a stash-like commit"
+msgstr "„%s” nie jest zapisem ze zmianami ze schowka"
+
+#: builtin/stash.c:148
+#, c-format
+msgid "Too many revisions specified:%s"
+msgstr "Podano za dużo rewizji: %s"
+
+#: builtin/stash.c:162
+msgid "No stash entries found."
+msgstr "Brak zmian w schowku."
+
+#: builtin/stash.c:176
+#, c-format
+msgid "%s is not a valid reference"
+msgstr "%s nie jest prawidłową referencją."
+
+#: builtin/stash.c:225
+msgid "git stash clear with arguments is unimplemented"
+msgstr "nie zaimplementowano parametrów w git stash clear"
+
+#: builtin/stash.c:429
+#, c-format
+msgid ""
+"WARNING: Untracked file in way of tracked file! Renaming\n"
+" %s -> %s\n"
+" to make room.\n"
+msgstr ""
+"OSTRZEŻENIE: Nieśledzony plik zawadza śledzonemu plikowi! Zmienianie nazwy\n"
+" %s -> %s\n"
+" aby zwolnić miejsce.\n"
+
+#: builtin/stash.c:490
+msgid "cannot apply a stash in the middle of a merge"
+msgstr "nie można zastosować zmian ze schowka podczas scalania"
+
+#: builtin/stash.c:501
+#, c-format
+msgid "could not generate diff %s^!."
+msgstr "nie można wygenerować zmian %s^!."
+
+#: builtin/stash.c:508
+msgid "conflicts in index. Try without --index."
+msgstr "konflikty w indeksie. Spróbuj bez --index."
+
+#: builtin/stash.c:514
+msgid "could not save index tree"
+msgstr "nie można zapisać drzewa indeksu"
+
+#: builtin/stash.c:523
+msgid "could not restore untracked files from stash"
+msgstr "nie można przywrócić nieśledzonych plików ze schowka"
+
+#: builtin/stash.c:537
+#, c-format
+msgid "Merging %s with %s"
+msgstr "Scalanie %s z %s"
+
+#: builtin/stash.c:547
+msgid "Index was not unstashed."
+msgstr "Indeks nie został wyjęty ze schowka."
+
+#: builtin/stash.c:589 builtin/stash.c:687
+msgid "attempt to recreate the index"
+msgstr "spróbuj odtworzyć indeks"
+
+#: builtin/stash.c:633
+#, c-format
+msgid "Dropped %s (%s)"
+msgstr "Porzucono %s (%s)"
+
+#: builtin/stash.c:636
+#, c-format
+msgid "%s: Could not drop stash entry"
+msgstr "%s: Nie można porzucić wpisu ze schowka"
+
+#: builtin/stash.c:649
+#, c-format
+msgid "'%s' is not a stash reference"
+msgstr "„%s” nie wskazuje na zmiany ze schowka"
+
+#: builtin/stash.c:699
+msgid "The stash entry is kept in case you need it again."
+msgstr "Wpis pozostaje w schowku w razie, gdyby miał być znów potrzebny."
+
+#: builtin/stash.c:722
+msgid "No branch name specified"
+msgstr "Nie określono nazwy gałęzi"
+
+#: builtin/stash.c:866 builtin/stash.c:903
+#, c-format
+msgid "Cannot update %s with %s"
+msgstr "Nie można zaktualizować %s o %s"
+
+#: builtin/stash.c:884 builtin/stash.c:1538 builtin/stash.c:1603
+msgid "stash message"
+msgstr "komunikat skrytki"
+
+#: builtin/stash.c:894
+msgid "\"git stash store\" requires one <commit> argument"
+msgstr "„git stash store” wymaga jednego argumentu z <zapisem>"
+
+#: builtin/stash.c:1109
+msgid "No changes selected"
+msgstr "Nie wybrano zmian"
+
+#: builtin/stash.c:1209
+msgid "You do not have the initial commit yet"
+msgstr "Nie masz jeszcze początkowego zapisu"
+
+#: builtin/stash.c:1236
+msgid "Cannot save the current index state"
+msgstr "Nie można zapisać bieżącego stanu indeksu"
+
+#: builtin/stash.c:1245
+msgid "Cannot save the untracked files"
+msgstr "Nie można zapisać nieśledzonych plików"
+
+#: builtin/stash.c:1256 builtin/stash.c:1265
+msgid "Cannot save the current worktree state"
+msgstr "Nie można zapisać bieżącego stanu drzewa roboczego"
+
+#: builtin/stash.c:1293
+msgid "Cannot record working tree state"
+msgstr "Nie można zapisać stanu drzewa roboczego"
+
+#: builtin/stash.c:1342
+msgid "Can't use --patch and --include-untracked or --all at the same time"
+msgstr "Nie można jednocześnie użyć --patch i --include-untracked lub --all"
+
+#: builtin/stash.c:1358
+msgid "Did you forget to 'git add'?"
+msgstr "Czyżby zabrakło „git add”?"
+
+#: builtin/stash.c:1373
+msgid "No local changes to save"
+msgstr "Brak lokalnych zmian do zapisania"
+
+#: builtin/stash.c:1380
+msgid "Cannot initialize stash"
+msgstr "Nie można zainicjować schowka"
+
+#: builtin/stash.c:1395
+msgid "Cannot save the current status"
+msgstr "Nie można zachować bieżącego stanu"
+
+#: builtin/stash.c:1400
+#, c-format
+msgid "Saved working directory and index state %s"
+msgstr "Zapisano katalog roboczy i stan indeksu %s"
+
+#: builtin/stash.c:1490
+msgid "Cannot remove worktree changes"
+msgstr "Nie można usunąć zmian w drzewie roboczym"
+
+#: builtin/stash.c:1529 builtin/stash.c:1594
+msgid "keep index"
+msgstr "zachowaj indeks"
+
+#: builtin/stash.c:1531 builtin/stash.c:1596
+msgid "stash in patch mode"
+msgstr "dodaj do schowka w trybie łatki"
+
+#: builtin/stash.c:1532 builtin/stash.c:1597
+msgid "quiet mode"
+msgstr "tryb cichy"
+
+#: builtin/stash.c:1534 builtin/stash.c:1599
+msgid "include untracked files in stash"
+msgstr "uwzględnij nieśledzone pliki w schowku"
+
+#: builtin/stash.c:1536 builtin/stash.c:1601
+msgid "include ignore files"
+msgstr "uwzględnij pomijane pliki"
+
+#: builtin/stash.c:1636
+msgid ""
+"the stash.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
+msgstr ""
+"wsparcie stash.useBuiltin zostało usunięte!\n"
+"Zobacz szczegóły pod jego opisem w „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 "pomiń i usuń wszystkie wiersze rozpoczynające się znakiem komentarza"
+
+#: builtin/stripspace.c:40
+msgid "prepend comment character and space to each line"
+msgstr "dodaj znak komentarza i odstęp przed każdym wierszem"
+
+#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "Oczekiwano pełnej nazwy referencji, otrzymano %s"
+
+#: builtin/submodule--helper.c:64
+msgid "submodule--helper print-default-remote takes no arguments"
+msgstr "submodule--helper print-default-remote nie przyjmuje argumentów"
+
+#: builtin/submodule--helper.c:102
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "nie można odciąć jednego komponentu z adresu „%s”"
+
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819
+msgid "alternative anchor for relative paths"
+msgstr "alternatywne zakotwiczenie ścieżek względnych"
+
+#: builtin/submodule--helper.c:415
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper list [--prefix=<ścieżka>] [<ścieżka>...]"
+
+#: 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 "Nie znaleziono adresu dla ścieżki pod-modułu „%s” w .gitmodules"
+
+#: builtin/submodule--helper.c:524
+#, c-format
+msgid "Entering '%s'\n"
+msgstr "Otwieranie „%s”\n"
+
+#: builtin/submodule--helper.c:527
+#, c-format
+msgid ""
+"run_command returned non-zero status for %s\n"
+"."
+msgstr ""
+"run_command zwróciło niezerowy kod wyjścia z %s\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 zwróciło niezerowy kod wyjścia podczas przechodzenia "
+"zagnieżdżonych pod-modułów %s\n"
+"."
+
+#: builtin/submodule--helper.c:565
+msgid "suppress output of entering each submodule command"
+msgstr "powstrzymaj wyjście przy podawaniu każdego polecenia pod-modułu"
+
+#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888
+#: builtin/submodule--helper.c:1487
+msgid "recurse into nested submodules"
+msgstr "schodź do zagnieżdżonych pod-modułów"
+
+#: builtin/submodule--helper.c:572
+msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
+msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <polecenie>"
+
+#: builtin/submodule--helper.c:599
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr ""
+"nie odnaleziono konfiguracji „%s”. Zakładam, że to repozytorium jest samo "
+"sobie nadrzędnym."
+
+#: builtin/submodule--helper.c:666
+#, c-format
+msgid "Failed to register url for submodule path '%s'"
+msgstr "Nie można zarejestrować adresu do ścieżki pod-modułu „%s”"
+
+#: builtin/submodule--helper.c:670
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
+msgstr "Zarejestrowano pod-moduł „%s” (%s) w „%s”\n"
+
+#: builtin/submodule--helper.c:680
+#, c-format
+msgid "warning: command update mode suggested for submodule '%s'\n"
+msgstr ""
+"ostrzeżenie: zaproponowano tryb aktualizowania polecenia w pod-module „%s”\n"
+
+#: builtin/submodule--helper.c:687
+#, c-format
+msgid "Failed to register update mode for submodule path '%s'"
+msgstr "Nie można zarejestrować trybu aktualizacji do ścieżki pod-modułu „%s”"
+
+#: builtin/submodule--helper.c:709
+msgid "suppress output for initializing a submodule"
+msgstr "powstrzymaj wyjście przy inicjalizacji pod-modułu"
+
+#: builtin/submodule--helper.c:714
+msgid "git submodule--helper init [<options>] [<path>]"
+msgstr "git submodule--helper init [<opcje>] [<ścieżka>]"
+
+#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922
+#, c-format
+msgid "no submodule mapping found in .gitmodules for path '%s'"
+msgstr "nie znaleziono w .gitmodules przypisania pod-modułów dla ścieżki „%s”"
+
+#: builtin/submodule--helper.c:835
+#, c-format
+msgid "could not resolve HEAD ref inside the submodule '%s'"
+msgstr "nie można rozwiązać referencji HEAD w pod-module „%s”"
+
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457
+#, c-format
+msgid "failed to recurse into submodule '%s'"
+msgstr "Nie można zejść do pod-modułu „%s”"
+
+#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623
+msgid "suppress submodule status output"
+msgstr "powstrzymaj wyjście stanu pod-modułów"
+
+#: builtin/submodule--helper.c:887
+msgid ""
+"use commit stored in the index instead of the one stored in the submodule "
+"HEAD"
+msgstr "użyj zapisu z indeksu zamiast tego z HEAD pod-modułu"
+
+#: builtin/submodule--helper.c:893
+msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
+msgstr "git submodule status [--quiet] [--cached] [--recursive] [<ścieżka>...]"
+
+#: builtin/submodule--helper.c:917
+msgid "git submodule--helper name <path>"
+msgstr "git submodule--helper name <ścieżka>"
+
+#: builtin/submodule--helper.c:989
+#, c-format
+msgid "* %s %s(blob)->%s(submodule)"
+msgstr "* %s %s(blob)->%s(pod-moduł)"
+
+#: builtin/submodule--helper.c:992
+#, c-format
+msgid "* %s %s(submodule)->%s(blob)"
+msgstr "* %s %s(pod-moduł)->%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 "nie można skrócić obiektu z „%s”"
+
+#: builtin/submodule--helper.c:1059
+#, c-format
+msgid "unexpected mode %o\n"
+msgstr "nieoczekiwany tryb %o\n"
+
+#: builtin/submodule--helper.c:1300
+msgid "use the commit stored in the index instead of the submodule HEAD"
+msgstr "użyj zapisu z indeksu zamiast z HEAD pod-modułu"
+
+#: builtin/submodule--helper.c:1302
+msgid "to compare the commit in the index with that in the submodule HEAD"
+msgstr "aby porównać zapis w indeksie z tym z HEAD pod-modułu"
+
+#: builtin/submodule--helper.c:1304
+msgid "skip submodules with 'ignore_config' value set to 'all'"
+msgstr "pomiń pod-moduły z wartością „ignore_config” ustawioną na „all”"
+
+#: builtin/submodule--helper.c:1306
+msgid "limit the summary size"
+msgstr "ogranicz rozmiar podsumowania"
+
+#: builtin/submodule--helper.c:1311
+msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
+msgstr "git submodule--helper summary [<opcje>] [<zapis>] [--] [<ścieżka>]"
+
+#: builtin/submodule--helper.c:1335
+msgid "could not fetch a revision for HEAD"
+msgstr "nie można pobrać rewizji dla HEAD"
+
+#: builtin/submodule--helper.c:1340
+msgid "--cached and --files are mutually exclusive"
+msgstr "--cached i --files się wykluczają"
+
+#: builtin/submodule--helper.c:1407
+#, c-format
+msgid "Synchronizing submodule url for '%s'\n"
+msgstr "Synchronizowanie adresu URL pod-modułu w „%s”\n"
+
+#: builtin/submodule--helper.c:1413
+#, c-format
+msgid "failed to register url for submodule path '%s'"
+msgstr "nie można zarejestrować adresu do ścieżki pod-modułu „%s”"
+
+#: builtin/submodule--helper.c:1427
+#, c-format
+msgid "failed to get the default remote for submodule '%s'"
+msgstr "nie można uzyskać domyślnego zdalnego repozytorium pod-modułu „%s”"
+
+#: builtin/submodule--helper.c:1438
+#, c-format
+msgid "failed to update remote for submodule '%s'"
+msgstr "nie można zaktualizować zdalnego repozytorium pod-modułu „%s”"
+
+#: builtin/submodule--helper.c:1485
+msgid "suppress output of synchronizing submodule url"
+msgstr "powstrzymaj wyjście przy synchronizacji adresu pod-modułu"
+
+#: builtin/submodule--helper.c:1492
+msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
+msgstr "git submodule--helper sync [--quiet] [--recursive] [<ścieżka>]"
+
+#: 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 ""
+"Drzewo robocze pod-modułu „%s” zawiera katalog .git (użyj „rm -rf” jeśli na "
+"pewno chcesz je usunąć wraz z całą jego historią)"
+
+#: builtin/submodule--helper.c:1558
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains local modifications; use '-f' to discard "
+"them"
+msgstr ""
+"Drzewo robocze pod-modułu „%s” zawiera lokalne zmiany; użyj „-f”, aby je "
+"odrzucić"
+
+#: builtin/submodule--helper.c:1566
+#, c-format
+msgid "Cleared directory '%s'\n"
+msgstr "Wyczyszczono katalog „%s”\n"
+
+#: builtin/submodule--helper.c:1568
+#, c-format
+msgid "Could not remove submodule work tree '%s'\n"
+msgstr "Nie można usunąć drzewa roboczego pod-modułu „%s”\n"
+
+#: builtin/submodule--helper.c:1579
+#, c-format
+msgid "could not create empty submodule directory %s"
+msgstr "nie można utworzyć pustego katalogu pod-modułu „%s”"
+
+#: builtin/submodule--helper.c:1595
+#, c-format
+msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
+msgstr "Wyrejestrowano pod-moduł „%s” (%s) ze ścieżki „%s”\n"
+
+#: builtin/submodule--helper.c:1624
+msgid "remove submodule working trees even if they contain local changes"
+msgstr "usuń drzewa robocze pod-modułów, nawet jeśli zawierają lokalne zmiany"
+
+#: builtin/submodule--helper.c:1625
+msgid "unregister all submodules"
+msgstr "wyrejestruj wszystkie pod-moduły"
+
+#: builtin/submodule--helper.c:1630
+msgid ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
+msgstr ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<ścieżka>...]]"
+
+#: builtin/submodule--helper.c:1644
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr ""
+"Użyj „--all” jeśli na pewno chcesz odinicjalizować wszystkie podmoduły."
+
+#: 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 ""
+"Alternatywa obliczona z alternatywy nad-projektu jest nieprawidłowa.\n"
+"Aby pozwolić Gitowi w takim wypadku klonować bez alternatywy, ustaw\n"
+"submodule.alternateErrorStrategy na „info” lub, równoważnie, sklonuj\n"
+"z „--reference-if-able” zamiast „--reference”."
+
+#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755
+#, c-format
+msgid "submodule '%s' cannot add alternate: %s"
+msgstr "pod-moduł „%s” nie może dodać alternatywnego położenia: %s"
+
+#: builtin/submodule--helper.c:1791
+#, c-format
+msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
+msgstr ""
+"Wartość „%s” dla submodule.alternateErrorStrategy nie jest rozpoznawana"
+
+#: builtin/submodule--helper.c:1798
+#, c-format
+msgid "Value '%s' for submodule.alternateLocation is not recognized"
+msgstr "Wartość „%s” dla submodule.alternateLocation nie jest rozpoznawana"
+
+#: builtin/submodule--helper.c:1822
+msgid "where the new submodule will be cloned to"
+msgstr "dokąd zostanie sklonowany nowy pod-moduł"
+
+#: builtin/submodule--helper.c:1825
+msgid "name of the new submodule"
+msgstr "nazwa nowego pod-modułu"
+
+#: builtin/submodule--helper.c:1828
+msgid "url where to clone the submodule from"
+msgstr "adres, skąd sklonować pod-moduł"
+
+#: builtin/submodule--helper.c:1836
+msgid "depth for shallow clones"
+msgstr "głębokość płytkich klonów"
+
+#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348
+msgid "force cloning progress"
+msgstr "wymuś postęp klonowania"
+
+#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350
+msgid "disallow cloning into non-empty directory"
+msgstr "nie pozwól sklonować do niepustego katalogu"
+
+#: 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=<ścieżka>] [--quiet] [--reference "
+"<repozytorium>] [--name <nazwa>] [--depth <głębokość>] [--single-branch] --"
+"url <adres> --path <ścieżka>"
+
+#: builtin/submodule--helper.c:1873
+#, c-format
+msgid "refusing to create/use '%s' in another submodule's git dir"
+msgstr "odmawiam utworzenia/użyj „%s” w katalogu gita innego pod-modułu"
+
+#: builtin/submodule--helper.c:1884
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "klonowanie „%s” do ścieżki pod-modułu „%s” nie powiodło się"
+
+#: builtin/submodule--helper.c:1888
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "katalog nie jest pusty: „%s”"
+
+#: builtin/submodule--helper.c:1900
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr "nie można uzyskać katalogu pod-modułu dla „%s”"
+
+#: builtin/submodule--helper.c:1936
+#, c-format
+msgid "Invalid update mode '%s' for submodule path '%s'"
+msgstr "Nieprawidłowy tryb aktualizacji „%s” do ścieżki pod-modułu „%s”"
+
+#: builtin/submodule--helper.c:1940
+#, c-format
+msgid "Invalid update mode '%s' configured for submodule path '%s'"
+msgstr ""
+"Nieprawidłowy tryb aktualizacji „%s” ustawiony w ścieżce pod-modułu „%s”"
+
+#: builtin/submodule--helper.c:2041
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr "Ścieżka pod-modułu „%s” niezainicjowana"
+
+#: builtin/submodule--helper.c:2045
+msgid "Maybe you want to use 'update --init'?"
+msgstr "Może chcesz użyć „update --init”?"
+
+#: builtin/submodule--helper.c:2075
+#, c-format
+msgid "Skipping unmerged submodule %s"
+msgstr "Pomijanie niescalonego pod-modułu %s"
+
+#: builtin/submodule--helper.c:2104
+#, c-format
+msgid "Skipping submodule '%s'"
+msgstr "Pomijanie pod-modułu „%s”"
+
+#: builtin/submodule--helper.c:2254
+#, c-format
+msgid "Failed to clone '%s'. Retry scheduled"
+msgstr "Nie można sklonować „%s”. Zaplanowano ponowienie"
+
+#: builtin/submodule--helper.c:2265
+#, c-format
+msgid "Failed to clone '%s' a second time, aborting"
+msgstr "Nie można sklonować „%s” drugi raz, przerywanie"
+
+#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573
+msgid "path into the working tree"
+msgstr "ścieżka w drzewie roboczym"
+
+#: builtin/submodule--helper.c:2330
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr "ścieżka w drzewie roboczym, przez granice zagnieżdżonych pod-modułów"
+
+#: builtin/submodule--helper.c:2334
+msgid "rebase, merge, checkout or none"
+msgstr "rebase, merge, checkout lub none"
+
+#: builtin/submodule--helper.c:2340
+msgid "create a shallow clone truncated to the specified number of revisions"
+msgstr "utwórz płytki klon ucięty do podanej liczby rewizji"
+
+#: builtin/submodule--helper.c:2343
+msgid "parallel jobs"
+msgstr "równoległe zadania"
+
+#: builtin/submodule--helper.c:2345
+msgid "whether the initial clone should follow the shallow recommendation"
+msgstr "czy początkowy klon powinien zgadzać się z zaleceniem płytkości"
+
+#: builtin/submodule--helper.c:2346
+msgid "don't print cloning progress"
+msgstr "nie wypisuj postępu klonowania"
+
+#: builtin/submodule--helper.c:2357
+msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper update-clone [--prefix=<ścieżka>] [<ścieżka>...]"
+
+#: builtin/submodule--helper.c:2370
+msgid "bad value for update parameter"
+msgstr "zła wartość parametru aktualizacji"
+
+#: 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 ""
+"Gałąź pod-modułu (%s) ustawiono, by dziedziczyła gałąź z nad-projektu, ale "
+"nad-projekt nie jest na żadnej gałęzi"
+
+#: builtin/submodule--helper.c:2541
+#, c-format
+msgid "could not get a repository handle for submodule '%s'"
+msgstr "nie można uzyskać uchwytu repozytorium pod-modułu dla „%s”"
+
+#: builtin/submodule--helper.c:2574
+msgid "recurse into submodules"
+msgstr "schodź do pod-modułów"
+
+#: builtin/submodule--helper.c:2580
+msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
+msgstr "git submodule--helper absorb-git-dirs [<opcje>] [<ścieżka>...]"
+
+#: builtin/submodule--helper.c:2636
+msgid "check if it is safe to write to the .gitmodules file"
+msgstr "sprawdź, czy bezpiecznie jest zapisać plik .gitmodules"
+
+#: builtin/submodule--helper.c:2639
+msgid "unset the config in the .gitmodules file"
+msgstr "usuń konfigurację z pliku .gitmodules"
+
+#: builtin/submodule--helper.c:2644
+msgid "git submodule--helper config <name> [<value>]"
+msgstr "git submodule--helper config <nazwa> [<wartość>]"
+
+#: builtin/submodule--helper.c:2645
+msgid "git submodule--helper config --unset <name>"
+msgstr "git submodule--helper config --unset <nazwa>"
+
+#: 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:150
+#, sh-format
+msgid "please make sure that the .gitmodules file is in the working tree"
+msgstr "upewnij się, że plik .gitmodules jest w drzewie roboczym"
+
+#: builtin/submodule--helper.c:2681
+msgid "suppress output for setting url of a submodule"
+msgstr "powstrzymaj wyjście przy ustawianiu adresu pod-modułu"
+
+#: builtin/submodule--helper.c:2685
+msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
+msgstr "git submodule--helper set-url [--quiet] <ścieżka> <nowy-adres>"
+
+#: builtin/submodule--helper.c:2718
+msgid "set the default tracking branch to master"
+msgstr "ustaw domyślną gałąź śledzącą na master"
+
+#: builtin/submodule--helper.c:2720
+msgid "set the default tracking branch"
+msgstr "ustaw domyślną gałąź śledzącą"
+
+#: 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) <ścieżka>"
+
+#: 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) <gałąź> <ścieżka>"
+
+#: builtin/submodule--helper.c:2732
+msgid "--branch or --default required"
+msgstr "wymagane --branch lub --default"
+
+#: builtin/submodule--helper.c:2735
+msgid "--branch and --default are mutually exclusive"
+msgstr "--branch i --default się wykluczają"
+
+#: builtin/submodule--helper.c:2792 git.c:441 git.c:714
+#, c-format
+msgid "%s doesn't support --super-prefix"
+msgstr "%s nie wspiera --super-prefix"
+
+#: builtin/submodule--helper.c:2798
+#, c-format
+msgid "'%s' is not a valid submodule--helper subcommand"
+msgstr "„%s” nie jest prawidłowym pod-poleceniem submodule--helper"
+
+#: builtin/symbolic-ref.c:8
+msgid "git symbolic-ref [<options>] <name> [<ref>]"
+msgstr "git symbolic-ref [<opcje>] <nazwa> [<referencja>]"
+
+#: builtin/symbolic-ref.c:9
+msgid "git symbolic-ref -d [-q] <name>"
+msgstr "git symbolic-ref -d [-q] <nazwa>"
+
+#: builtin/symbolic-ref.c:40
+msgid "suppress error message for non-symbolic (detached) refs"
+msgstr "nie wypisuj błędów przy nie-symbolicznych (odłączonych) referencjach"
+
+#: builtin/symbolic-ref.c:41
+msgid "delete symbolic ref"
+msgstr "usuń referencję symboliczną"
+
+#: builtin/symbolic-ref.c:42
+msgid "shorten ref output"
+msgstr "skróć wyjściową referencję"
+
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
+msgid "reason"
+msgstr "powód"
+
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
+msgid "reason of the update"
+msgstr "powód aktualizacji"
+
+#: 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 <id-klucza>] [-f] [-m <komunikat> | -F <plik>]\n"
+"\t\t<tag> [<czoło>]"
+
+#: builtin/tag.c:27
+msgid "git tag -d <tagname>..."
+msgstr "git tag -d <nazwa-tagu>..."
+
+#: 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[<num>]] [--contains <zapis>] [--no-contains <zapis>] [--"
+"points-at <obiekt>]\n"
+"\t\t[--format=<format>] [--merged <zapis>] [--no-merged <zapis>] "
+"[<wzorzec>...]"
+
+#: builtin/tag.c:30
+msgid "git tag -v [--format=<format>] <tagname>..."
+msgstr "git tag -v [--format=<format>] <nazwa-tagu>..."
+
+#: builtin/tag.c:89
+#, c-format
+msgid "tag '%s' not found."
+msgstr "nie znaleziono tagu „%s”."
+
+#: builtin/tag.c:124
+#, c-format
+msgid "Deleted tag '%s' (was %s)\n"
+msgstr "Usunięto tag „%s” (wskazywał %s)\n"
+
+#: builtin/tag.c:159
+#, c-format
+msgid ""
+"\n"
+"Write a message for tag:\n"
+" %s\n"
+"Lines starting with '%c' will be ignored.\n"
+msgstr ""
+"\n"
+"Napisz komunikat do tagu:\n"
+" %s\n"
+"Wiersze zaczynające się od „%c” zostaną zignorowane.\n"
+
+#: builtin/tag.c:163
+#, 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"
+"Napisz komunikat do tagu:\n"
+" %s\n"
+"Wiersze zaczynające się od „%c” będą zachowane; możesz je sam(a) usunąć, "
+"jeśli chcesz.\n"
+
+#: builtin/tag.c:230
+msgid "unable to sign the tag"
+msgstr "nie można podpisać tagu"
+
+#: builtin/tag.c:248
+#, 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 ""
+"Utworzono zagnieżdżony tag. Obiekt wskazywany przez nowy tag sam jest\n"
+"tagiem. Jeśli chodziło o otagowanie obiektu, na który wskazuje, użyj:\n"
+"\n"
+"\tgit tag -f %s %s^{}"
+
+#: builtin/tag.c:264
+msgid "bad object type."
+msgstr "zły rodzaj obiektu."
+
+#: builtin/tag.c:317
+msgid "no tag message?"
+msgstr "brak komunikatu tagu?"
+
+#: builtin/tag.c:324
+#, c-format
+msgid "The tag message has been left in %s\n"
+msgstr "Pozostawiono komunikat tagu w %s\n"
+
+#: builtin/tag.c:435
+msgid "list tag names"
+msgstr "wypisz nazwy tagów"
+
+#: builtin/tag.c:437
+msgid "print <n> lines of each tag message"
+msgstr "wypisz <n> wierszy każdego komunikatu tagu"
+
+#: builtin/tag.c:439
+msgid "delete tags"
+msgstr "usuń tagi"
+
+#: builtin/tag.c:440
+msgid "verify tags"
+msgstr "weryfikuj tagi"
+
+#: builtin/tag.c:442
+msgid "Tag creation options"
+msgstr "Opcje tworzenia tagów"
+
+#: builtin/tag.c:444
+msgid "annotated tag, needs a message"
+msgstr "opisz tag, potrzebuje komunikatu"
+
+#: builtin/tag.c:446
+msgid "tag message"
+msgstr "wiadomość tagu"
+
+#: builtin/tag.c:448
+msgid "force edit of tag message"
+msgstr "wymuś edycję komunikatu tagu"
+
+#: builtin/tag.c:449
+msgid "annotated and GPG-signed tag"
+msgstr "tag opisany i podpisany GPG"
+
+#: builtin/tag.c:452
+msgid "use another key to sign the tag"
+msgstr "użyj innego klucza do podpisania tagu"
+
+#: builtin/tag.c:453
+msgid "replace the tag if exists"
+msgstr "zamień tag, jeśli istnieje"
+
+#: builtin/tag.c:454 builtin/update-ref.c:505
+msgid "create a reflog"
+msgstr "utwórz dziennik referencji"
+
+#: builtin/tag.c:456
+msgid "Tag listing options"
+msgstr "Opcje wypisywania tagów"
+
+#: builtin/tag.c:457
+msgid "show tag list in columns"
+msgstr "pokaż listę tagów w kolumnach"
+
+#: builtin/tag.c:458 builtin/tag.c:460
+msgid "print only tags that contain the commit"
+msgstr "wypisz tylko tagi zawierające ten zapis"
+
+#: builtin/tag.c:459 builtin/tag.c:461
+msgid "print only tags that don't contain the commit"
+msgstr "wypisz tylko tagi nie zawierające tego zapisu"
+
+#: builtin/tag.c:462
+msgid "print only tags that are merged"
+msgstr "wypisz tylko scalone tagi"
+
+#: builtin/tag.c:463
+msgid "print only tags that are not merged"
+msgstr "wypisz tylko niescalone tagi"
+
+#: builtin/tag.c:467
+msgid "print only tags of the object"
+msgstr "wypisz tylko tagi tego obiektu"
+
+#: builtin/tag.c:515
+msgid "--column and -n are incompatible"
+msgstr "--column i -n się wykluczają"
+
+#: builtin/tag.c:537
+msgid "-n option is only allowed in list mode"
+msgstr "opcja -n może być użyta tylko w trybie wymieniania"
+
+#: builtin/tag.c:539
+msgid "--contains option is only allowed in list mode"
+msgstr "opcja --contains może być użyta tylko w trybie wymieniania"
+
+#: builtin/tag.c:541
+msgid "--no-contains option is only allowed in list mode"
+msgstr "opcja --no-contains może być użyta tylko w trybie wymieniania"
+
+#: builtin/tag.c:543
+msgid "--points-at option is only allowed in list mode"
+msgstr "opcja --points-at może być użyta tylko w trybie wymieniania"
+
+#: builtin/tag.c:545
+msgid "--merged and --no-merged options are only allowed in list mode"
+msgstr "opcje --merged i --no-merged mogą być użyte tylko w trybie wymieniania"
+
+#: builtin/tag.c:556
+msgid "only one -F or -m option is allowed."
+msgstr "-F i -m się wykluczają."
+
+#: builtin/tag.c:581
+#, c-format
+msgid "'%s' is not a valid tag name."
+msgstr "„%s” nie jest prawidłową nazwą tagu."
+
+#: builtin/tag.c:586
+#, c-format
+msgid "tag '%s' already exists"
+msgstr "tag „%s” już istnieje"
+
+#: builtin/tag.c:617
+#, c-format
+msgid "Updated tag '%s' (was %s)\n"
+msgstr "Zaktualizowano tag „%s” (wskazywał %s)\n"
+
+#: builtin/unpack-objects.c:502
+msgid "Unpacking objects"
+msgstr "Rozpakowywanie obiektów"
+
+#: builtin/update-index.c:84
+#, c-format
+msgid "failed to create directory %s"
+msgstr "nie można utworzyć katalogu %s"
+
+#: builtin/update-index.c:100
+#, c-format
+msgid "failed to create file %s"
+msgstr "nie można utworzyć pliku %s"
+
+#: builtin/update-index.c:108
+#, c-format
+msgid "failed to delete file %s"
+msgstr "nie można usunąć pliku %s"
+
+#: builtin/update-index.c:115 builtin/update-index.c:221
+#, c-format
+msgid "failed to delete directory %s"
+msgstr "nie można usunąć katalogu %s"
+
+#: builtin/update-index.c:140
+#, c-format
+msgid "Testing mtime in '%s' "
+msgstr "Sprawdzanie czasu modyfikacji „%s” "
+
+#: builtin/update-index.c:154
+msgid "directory stat info does not change after adding a new file"
+msgstr "informacje stat katalogu nie zmieniają się po dodaniu nowego pliku"
+
+#: builtin/update-index.c:167
+msgid "directory stat info does not change after adding a new directory"
+msgstr "informacje stat katalogu nie zmieniają się po dodaniu nowego katalogu"
+
+#: builtin/update-index.c:180
+msgid "directory stat info changes after updating a file"
+msgstr "informacje stat katalogu zmieniają się po zaktualizowaniu pliku"
+
+#: builtin/update-index.c:191
+msgid "directory stat info changes after adding a file inside subdirectory"
+msgstr ""
+"informacje stat katalogu zmieniają się po usunięciu pliku w podkatalogu"
+
+#: builtin/update-index.c:202
+msgid "directory stat info does not change after deleting a file"
+msgstr "informacje stat katalogu nie zmieniają się po usunięciu pliku"
+
+#: builtin/update-index.c:215
+msgid "directory stat info does not change after deleting a directory"
+msgstr "informacje stat katalogu nie zmieniają się po usunięciu katalogu"
+
+#: builtin/update-index.c:222
+msgid " OK"
+msgstr " OK"
+
+#: builtin/update-index.c:591
+msgid "git update-index [<options>] [--] [<file>...]"
+msgstr "git update-index [<opcje>] [--] [<plik>...]"
+
+#: builtin/update-index.c:974
+msgid "continue refresh even when index needs update"
+msgstr "kontynuuj odświeżanie, nawet jeśli indeks potrzebuje aktualizacji"
+
+#: builtin/update-index.c:977
+msgid "refresh: ignore submodules"
+msgstr "odświeżanie: ignoruj pod-moduły"
+
+#: builtin/update-index.c:980
+msgid "do not ignore new files"
+msgstr "nie ignoruj nowych plików"
+
+#: builtin/update-index.c:982
+msgid "let files replace directories and vice-versa"
+msgstr "pozwól plikom zastępować katalogi i na odwrót"
+
+#: builtin/update-index.c:984
+msgid "notice files missing from worktree"
+msgstr "zauważaj pliki, których brakuje w drzewie roboczym"
+
+#: builtin/update-index.c:986
+msgid "refresh even if index contains unmerged entries"
+msgstr "odśwież, nawet jeśli indeks zawiera niescalone elementy"
+
+#: builtin/update-index.c:989
+msgid "refresh stat information"
+msgstr "odśwież informacje stat"
+
+#: builtin/update-index.c:993
+msgid "like --refresh, but ignore assume-unchanged setting"
+msgstr "jak --refresh, ale pomiń ustawienie założenia niezmienności"
+
+#: builtin/update-index.c:997
+msgid "<mode>,<object>,<path>"
+msgstr "<tryb>,<obiekt>,<ścieżka>"
+
+#: builtin/update-index.c:998
+msgid "add the specified entry to the index"
+msgstr "dodaj podany element do indeksu"
+
+#: builtin/update-index.c:1008
+msgid "mark files as \"not changing\""
+msgstr "oznacz pliki jako „bez zmian”"
+
+#: builtin/update-index.c:1011
+msgid "clear assumed-unchanged bit"
+msgstr "wyczyść bit założenia niezmienności"
+
+#: builtin/update-index.c:1014
+msgid "mark files as \"index-only\""
+msgstr "oznacz pliki jako „tylko do indeksu”"
+
+#: builtin/update-index.c:1017
+msgid "clear skip-worktree bit"
+msgstr "wyczyść bit pominięcia drzewa roboczego"
+
+#: builtin/update-index.c:1020
+msgid "do not touch index-only entries"
+msgstr "nie dotykaj elementów będących tylko w indeksie"
+
+#: builtin/update-index.c:1022
+msgid "add to index only; do not add content to object database"
+msgstr "tylko dodaj do indeksu; nie dodawaj zawartości do bazy obiektów"
+
+#: builtin/update-index.c:1024
+msgid "remove named paths even if present in worktree"
+msgstr "usuń nazwane ścieżki, nawet jeśli występują w drzewie roboczym"
+
+#: builtin/update-index.c:1026
+msgid "with --stdin: input lines are terminated by null bytes"
+msgstr "z --stdin: wiersze wejścia są zakończone znakami NUL"
+
+#: builtin/update-index.c:1028
+msgid "read list of paths to be updated from standard input"
+msgstr "odczytaj listę ścieżek do zaktualizowania ze standardowego wejścia"
+
+#: builtin/update-index.c:1032
+msgid "add entries from standard input to the index"
+msgstr "dodaj elementy ze standardowego wejścia do indeksu"
+
+#: builtin/update-index.c:1036
+msgid "repopulate stages #2 and #3 for the listed paths"
+msgstr "ponownie zapełnij etapy nr 2 i 3 dla wymienionych ścieżek"
+
+#: builtin/update-index.c:1040
+msgid "only update entries that differ from HEAD"
+msgstr "zaktualizuj tylko elementy, które różnią się od HEAD"
+
+#: builtin/update-index.c:1044
+msgid "ignore files missing from worktree"
+msgstr "ignoruj pliki, których brakuje w drzewie roboczym"
+
+#: builtin/update-index.c:1047
+msgid "report actions to standard output"
+msgstr "zgłaszaj działania na standardowe wyjście"
+
+#: builtin/update-index.c:1049
+msgid "(for porcelains) forget saved unresolved conflicts"
+msgstr "(do porcelany) zapomnij zachowane nierozwiązane konflikty"
+
+#: builtin/update-index.c:1053
+msgid "write index in this format"
+msgstr "wypisz indeks w tym formacie"
+
+#: builtin/update-index.c:1055
+msgid "enable or disable split index"
+msgstr "włącz lub wyłącz podzielony indeks"
+
+#: builtin/update-index.c:1057
+msgid "enable/disable untracked cache"
+msgstr "włącz/wyłącz pamięć o nieśledzonych"
+
+#: builtin/update-index.c:1059
+msgid "test if the filesystem supports untracked cache"
+msgstr "sprawdź, czy system plików wspiera pamięć o nieśledzonych"
+
+#: builtin/update-index.c:1061
+msgid "enable untracked cache without testing the filesystem"
+msgstr "włącz pamięć o nieśledzonych bez sprawdzania systemu plików"
+
+#: builtin/update-index.c:1063
+msgid "write out the index even if is not flagged as changed"
+msgstr "wypisz indeks, nawet jeśli nie oznaczony jako zmieniony"
+
+#: builtin/update-index.c:1065
+msgid "enable or disable file system monitor"
+msgstr "włącz lub wyłącz monitorowanie systemu plików"
+
+#: builtin/update-index.c:1067
+msgid "mark files as fsmonitor valid"
+msgstr "oznacz pliki jako prawidłowo monitorowane"
+
+#: builtin/update-index.c:1070
+msgid "clear fsmonitor valid bit"
+msgstr "wyczyść bit prawidłowego monitorowania"
+
+#: 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 ""
+"ustawiono core.splitIndex na false; usuń to lub zmień, jeśli rzeczywiście "
+"chcesz włączyć rozdzielony indeks"
+
+#: 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 ""
+"ustawiono core.splitIndex na true; usuń to lub zmień, jeśli rzeczywiście "
+"chcesz wyłączyć rozdzielony indeks"
+
+#: 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 ""
+"ustawiono core.untrackedCache na true; usuń to lub zmień, jeśli rzeczywiście "
+"chcesz wyłączyć pamięć o nieśledzonych"
+
+#: builtin/update-index.c:1198
+msgid "Untracked cache disabled"
+msgstr "wyłączona pamięć o nieśledzonych"
+
+#: 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 ""
+"ustawiono core.untrackedCache na false; usuń to lub zmień, jeśli "
+"rzeczywiście chcesz włączyć pamięć o nieśledzonych"
+
+#: builtin/update-index.c:1210
+#, c-format
+msgid "Untracked cache enabled for '%s'"
+msgstr "Włączono pamięć nieśledzonych w „%s”"
+
+#: builtin/update-index.c:1218
+msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
+msgstr ""
+"nie ustawiono core.fsmonitor; ustaw je, jeśli rzeczywiście chcesz włączyć "
+"monitorowanie systemu plików"
+
+#: builtin/update-index.c:1222
+msgid "fsmonitor enabled"
+msgstr "włączone monitorowanie systemu plików"
+
+#: builtin/update-index.c:1225
+msgid ""
+"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
+msgstr ""
+"ustawiono core.fsmonitor; usuń je, jeśli rzeczywiście chcesz wyłączyć "
+"monitorowanie systemu plików"
+
+#: builtin/update-index.c:1229
+msgid "fsmonitor disabled"
+msgstr "wyłączone monitorowanie systemu plików"
+
+#: builtin/update-ref.c:10
+msgid "git update-ref [<options>] -d <refname> [<old-val>]"
+msgstr "git update-ref [<opcje>] -d <referencja> [<stara-wartość>]"
+
+#: builtin/update-ref.c:11
+msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
+msgstr ""
+"git update-ref [<opcje>] <referencja> <nowa-wartość> [<stara-wartość>]"
+
+#: builtin/update-ref.c:12
+msgid "git update-ref [<options>] --stdin [-z]"
+msgstr "git update-ref [<opcje>] --stdin [-z]"
+
+#: builtin/update-ref.c:500
+msgid "delete the reference"
+msgstr "usuń referencję"
+
+#: builtin/update-ref.c:502
+msgid "update <refname> not the one it points to"
+msgstr "zaktualizuj <referencję>, a nie tę, na którą wskazuje"
+
+#: builtin/update-ref.c:503
+msgid "stdin has NUL-terminated arguments"
+msgstr "wejście ma argumenty rozdzielone NULami"
+
+#: builtin/update-ref.c:504
+msgid "read updates from stdin"
+msgstr "wczytaj aktualizacje ze standardowego wejścia"
+
+#: 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 "zaktualizuj pliki informacji od zera"
+
+#: builtin/upload-pack.c:11
+msgid "git upload-pack [<options>] <dir>"
+msgstr "git upload-pack [<opcje>] <katalog>"
+
+#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+msgid "quit after a single request/response exchange"
+msgstr "wyjdź po pojedynczej wymianie żądania/odpowiedzi"
+
+#: builtin/upload-pack.c:25
+msgid "exit immediately after initial ref advertisement"
+msgstr "wyjdź natychmiast po początkowym ogłoszeniu referencji"
+
+#: builtin/upload-pack.c:27
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+msgstr "nie sprawdzaj <katalog>/.git/ jeśli <katalog> nie jest katalogiem Gita"
+
+#: builtin/upload-pack.c:29
+msgid "interrupt transfer after <n> seconds of inactivity"
+msgstr "przerwij przesyłanie po <n> sekundach nieaktywności"
+
+#: builtin/verify-commit.c:19
+msgid "git verify-commit [-v | --verbose] <commit>..."
+msgstr "git verify-commit [-v | --verbose] <zapis>..."
+
+#: builtin/verify-commit.c:68
+msgid "print commit contents"
+msgstr "wypisz zawartość zapisu"
+
+#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
+msgid "print raw gpg status output"
+msgstr "wypisz surowe wyjście stanu 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] <paczka>..."
+
+#: builtin/verify-pack.c:70
+msgid "verbose"
+msgstr "gadatliwy"
+
+#: builtin/verify-pack.c:72
+msgid "show statistics only"
+msgstr "pokazuj tylko statystyki"
+
+#: builtin/verify-tag.c:18
+msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
+msgstr "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
+
+#: builtin/verify-tag.c:36
+msgid "print tag contents"
+msgstr "wypisz zawartość tagu"
+
+#: builtin/worktree.c:18
+msgid "git worktree add [<options>] <path> [<commit-ish>]"
+msgstr "git worktree add [<opcje>] <ścieżka> [<zapis>]"
+
+#: builtin/worktree.c:19
+msgid "git worktree list [<options>]"
+msgstr "git worktree list [<opcje>]"
+
+#: builtin/worktree.c:20
+msgid "git worktree lock [<options>] <path>"
+msgstr "git worktree lock [<opcje>] <ścieżka>"
+
+#: builtin/worktree.c:21
+msgid "git worktree move <worktree> <new-path>"
+msgstr "git worktree move <drzewo-robocze> <nowa-ścieżka>"
+
+#: builtin/worktree.c:22
+msgid "git worktree prune [<options>]"
+msgstr "git worktree prune [<opcje>]"
+
+#: builtin/worktree.c:23
+msgid "git worktree remove [<options>] <worktree>"
+msgstr "git worktree remove [<opcje>] <drzewo-robocze>"
+
+#: builtin/worktree.c:24
+msgid "git worktree unlock <path>"
+msgstr "git worktree unlock <ścieżka>"
+
+#: builtin/worktree.c:61 builtin/worktree.c:933
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "nie można skasować „%s”"
+
+#: builtin/worktree.c:74
+#, c-format
+msgid "Removing %s/%s: %s"
+msgstr "Usuwanie %s/%s: %s"
+
+#: builtin/worktree.c:149
+msgid "report pruned working trees"
+msgstr "zgłaszaj przycięte drzewa robocze"
+
+#: builtin/worktree.c:151
+msgid "expire working trees older than <time>"
+msgstr "wygaś drzewa robocze starsze niż <czas>"
+
+#: builtin/worktree.c:221
+#, c-format
+msgid "'%s' already exists"
+msgstr "„%s” już istnieje"
+
+#: builtin/worktree.c:230
+#, c-format
+msgid "unusable worktree destination '%s'"
+msgstr "cel drzewa roboczego „%s” nie nadaje się do użytku"
+
+#: builtin/worktree.c:235
+#, 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” jest brakującym, ale zablokowanym drzewem roboczym;\n"
+"użyj „%s -f -f”, aby wymusić, lub „unlock” i „prune” lub „remove”, aby "
+"wyczyścić"
+
+#: builtin/worktree.c:237
+#, 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” jest brakującym, ale już zarejestrowanym drzewem roboczym;\n"
+"użyj „%s -f”, aby wymusić, bądź „prune” lub „remove”, aby wyczyścić"
+
+#: builtin/worktree.c:288
+#, c-format
+msgid "could not create directory of '%s'"
+msgstr "nie można utworzyć katalogu „%s”"
+
+#: builtin/worktree.c:422 builtin/worktree.c:428
+#, c-format
+msgid "Preparing worktree (new branch '%s')"
+msgstr "Przygotowywanie drzewa roboczego (nowa gałąź „%s”)"
+
+#: builtin/worktree.c:424
+#, c-format
+msgid "Preparing worktree (resetting branch '%s'; was at %s)"
+msgstr "Przygotowywanie drzewa roboczego (resetowanie gałęzi „%s”; była na %s)"
+
+#: builtin/worktree.c:433
+#, c-format
+msgid "Preparing worktree (checking out '%s')"
+msgstr "Przygotowywanie drzewa roboczego (wybieranie „%s”)"
+
+#: builtin/worktree.c:439
+#, c-format
+msgid "Preparing worktree (detached HEAD %s)"
+msgstr "Przygotowywanie drzewa roboczego (oddzielone HEAD %s)"
+
+#: builtin/worktree.c:480
+msgid "checkout <branch> even if already checked out in other worktree"
+msgstr "wybierz <gałąź> nawet jeśli już jest wybrana w innym drzewie roboczym"
+
+#: builtin/worktree.c:483
+msgid "create a new branch"
+msgstr "utwórz nową gałąź"
+
+#: builtin/worktree.c:485
+msgid "create or reset a branch"
+msgstr "utwórz lub zresetuj gałąź"
+
+#: builtin/worktree.c:487
+msgid "populate the new working tree"
+msgstr "wypełnij nowe drzewo robocze"
+
+#: builtin/worktree.c:488
+msgid "keep the new working tree locked"
+msgstr "pozostaw nowe drzewo robocze zablokowane"
+
+#: builtin/worktree.c:491
+msgid "set up tracking mode (see git-branch(1))"
+msgstr "ustaw tryb śledzenia (zobacz git-branch(1))"
+
+#: builtin/worktree.c:494
+msgid "try to match the new branch name with a remote-tracking branch"
+msgstr "spróbuj dopasować nazwę nowej gałęzi do gałęzi śledzącej"
+
+#: builtin/worktree.c:502
+msgid "-b, -B, and --detach are mutually exclusive"
+msgstr "-b, -B i --detach się wykluczają"
+
+#: builtin/worktree.c:563
+msgid "--[no-]track can only be used if a new branch is created"
+msgstr "--[no-]track można użyć tylko przy tworzeniu nowej gałęzi"
+
+#: builtin/worktree.c:680
+msgid "show extended annotations and reasons, if available"
+msgstr "pokaż rozszerzone adnotacje i powody, jeśli dostępne"
+
+#: builtin/worktree.c:682
+msgid "add 'prunable' annotation to worktrees older than <time>"
+msgstr "oznacz drzewa robocze starsze niż <czas> jako „do przycięcia”"
+
+#: builtin/worktree.c:691
+msgid "--verbose and --porcelain are mutually exclusive"
+msgstr "--verbose i --porcelain się wykluczają"
+
+#: builtin/worktree.c:718
+msgid "reason for locking"
+msgstr "powód blokady"
+
+#: builtin/worktree.c:730 builtin/worktree.c:763 builtin/worktree.c:837
+#: builtin/worktree.c:961
+#, c-format
+msgid "'%s' is not a working tree"
+msgstr "„%s” nie jest drzewem roboczym"
+
+#: builtin/worktree.c:732 builtin/worktree.c:765
+msgid "The main working tree cannot be locked or unlocked"
+msgstr "Główne drzewo robocze nie może być blokowane ani odblokowywane"
+
+#: builtin/worktree.c:737
+#, c-format
+msgid "'%s' is already locked, reason: %s"
+msgstr "„%s” już jest zablokowany, powód: %s"
+
+#: builtin/worktree.c:739
+#, c-format
+msgid "'%s' is already locked"
+msgstr "„%s” już jest zablokowany"
+
+#: builtin/worktree.c:767
+#, c-format
+msgid "'%s' is not locked"
+msgstr "„%s” nie jest zablokowany"
+
+#: builtin/worktree.c:808
+msgid "working trees containing submodules cannot be moved or removed"
+msgstr ""
+"nie można przenosić ani usuwać drzew roboczych zawierających pod-moduły"
+
+#: builtin/worktree.c:816
+msgid "force move even if worktree is dirty or locked"
+msgstr ""
+"wymuś przeniesienie, nawet jeśli drzewo robocze jest brudne lub zablokowane"
+
+#: builtin/worktree.c:839 builtin/worktree.c:963
+#, c-format
+msgid "'%s' is a main working tree"
+msgstr "„%s” jest głównym drzewem roboczym"
+
+#: builtin/worktree.c:844
+#, c-format
+msgid "could not figure out destination name from '%s'"
+msgstr "nie można uzyskać nazwy celu z „%s”"
+
+#: builtin/worktree.c:857
+#, c-format
+msgid ""
+"cannot move a locked working tree, lock reason: %s\n"
+"use 'move -f -f' to override or unlock first"
+msgstr ""
+"nie można przenieść zablokowanego drzewa roboczego, powód blokady: %s\n"
+"użyj „move -f -f”, żeby to wymusić lub najpierw odblokować"
+
+#: builtin/worktree.c:859
+msgid ""
+"cannot move a locked working tree;\n"
+"use 'move -f -f' to override or unlock first"
+msgstr ""
+"nie można przenieść zablokowanego drzewa roboczego;\n"
+"użyj „move -f -f”, żeby to wymusić lub najpierw odblokować"
+
+#: builtin/worktree.c:862
+#, c-format
+msgid "validation failed, cannot move working tree: %s"
+msgstr "sprawdzenie nie powiodło się, nie można przenieść drzewa roboczego: %s"
+
+#: builtin/worktree.c:867
+#, c-format
+msgid "failed to move '%s' to '%s'"
+msgstr "nie można przenieść „%s” do „%s”"
+
+#: builtin/worktree.c:913
+#, c-format
+msgid "failed to run 'git status' on '%s'"
+msgstr "nie można wykonać „git status” na „%s”"
+
+#: builtin/worktree.c:917
+#, c-format
+msgid "'%s' contains modified or untracked files, use --force to delete it"
+msgstr ""
+"„%s” zawiera zmienione lub nieśledzone pliki, użyj --force, aby skasować"
+
+#: builtin/worktree.c:922
+#, c-format
+msgid "failed to run 'git status' on '%s', code %d"
+msgstr "nie można wykonać „git status” na „%s”, kod %d"
+
+#: builtin/worktree.c:945
+msgid "force removal even if worktree is dirty or locked"
+msgstr ""
+"wymuś usunięcie, nawet jeśli drzewo robocze jest brudne lub zablokowane"
+
+#: builtin/worktree.c:968
+#, c-format
+msgid ""
+"cannot remove a locked working tree, lock reason: %s\n"
+"use 'remove -f -f' to override or unlock first"
+msgstr ""
+"nie można usunąć zablokowanego drzewa roboczego, powód blokady: %s\n"
+"użyj „remove -f -f”, żeby to wymusić lub najpierw odblokować"
+
+#: builtin/worktree.c:970
+msgid ""
+"cannot remove a locked working tree;\n"
+"use 'remove -f -f' to override or unlock first"
+msgstr ""
+"nie można usunąć zablokowanego drzewa roboczego;\n"
+"użyj „remove -f -f”, żeby to wymusić lub najpierw odblokować"
+
+#: builtin/worktree.c:973
+#, c-format
+msgid "validation failed, cannot remove working tree: %s"
+msgstr "sprawdzenie nie powiodło się, nie można usunąć drzewa roboczego: %s"
+
+#: builtin/worktree.c:997
+#, c-format
+msgid "repair: %s: %s"
+msgstr "naprawa: %s: %s"
+
+#: builtin/worktree.c:1000
+#, c-format
+msgid "error: %s: %s"
+msgstr "błąd: %s: %s"
+
+#: builtin/write-tree.c:15
+msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
+msgstr "git write-tree [--missing-ok] [--prefix=<prefiks>/]"
+
+#: builtin/write-tree.c:28
+msgid "<prefix>/"
+msgstr "<prefiks>/"
+
+#: builtin/write-tree.c:29
+msgid "write tree object for a subdirectory <prefix>"
+msgstr "zapisz obiekt drzewa katalogu <prefiks>"
+
+#: builtin/write-tree.c:31
+msgid "only useful for debugging"
+msgstr "przydatne tylko do odpluskwiania"
+
+#: http-fetch.c:114
+#, c-format
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr "argument --packfile musi być prawidłowym skrótem (otrzymano „%s”)"
+
+#: http-fetch.c:122
+msgid "not a git repository"
+msgstr "to nie jest repozytorium gita"
+
+#: t/helper/test-fast-rebase.c:141
+msgid "unhandled options"
+msgstr "nieprzetworzone opcje"
+
+#: t/helper/test-fast-rebase.c:146
+msgid "error preparing revisions"
+msgstr "błąd w przygotowywaniu rewizji"
+
+#: t/helper/test-reach.c:154
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr "zapis %s nie jest oznaczony jako osiągalny"
+
+#: t/helper/test-reach.c:164
+msgid "too many commits marked reachable"
+msgstr "za dużo zapisów oznaczono jako osiągalne"
+
+#: t/helper/test-serve-v2.c:7
+msgid "test-tool serve-v2 [<options>]"
+msgstr "test-tool serve-v2 [<opcje>]"
+
+#: t/helper/test-serve-v2.c:19
+msgid "exit immediately after advertising capabilities"
+msgstr "wyjdź natychmiast po początkowym ogłoszeniu możliwości"
+
+#: 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"
+" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
+" <command> [<args>]"
+msgstr ""
+"git [--version] [--help] [-C <ścieżka>] [-c <nazwa>=<wartość>]\n"
+" [--exec-path[=<ścieżka>]] [--html-path] [--man-path]"
+" [--info-path]\n"
+" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"
+" [--git-dir=<ścieżka>] [--work-tree=<ścieżka>] [--namespace=<nazwa"
+">]\n"
+" [--super-prefix=<ścieżka>] [--config-env=<nazwa>=<zmśrod>]\n"
+" <polecenie> [<argumenty>]"
+
+#: git.c:36
+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” i „git help -g” wypisują dostępne polecenia gita i "
+"wyjaśnienia\n"
+"niektórych koncepcji. Zobacz „git help <polecenie>” lub „git help "
+"<pojęcie>”,\n"
+"aby poczytać o konkretnym poleceniu lub pojęciu.\n"
+"W „git help git” znajdziesz przegląd systemu."
+
+#: git.c:188
+#, c-format
+msgid "no directory given for --git-dir\n"
+msgstr "nie podano katalogu do --git-dir\n"
+
+#: git.c:202
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr "nie podano przestrzeni nazw do --namespace\n"
+
+#: git.c:216
+#, c-format
+msgid "no directory given for --work-tree\n"
+msgstr "nie podano katalogu do --work-tree\n"
+
+#: git.c:230
+#, c-format
+msgid "no prefix given for --super-prefix\n"
+msgstr "nie podano prefiksu do --super-prefix\n"
+
+#: git.c:252
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr "-c oczekuje łańcucha konfiguracji\n"
+
+#: git.c:292
+#, c-format
+msgid "no directory given for -C\n"
+msgstr "nie podano katalogu do -C\n"
+
+#: git.c:318
+#, c-format
+msgid "unknown option: %s\n"
+msgstr "nieznana opcja: %s\n"
+
+#: git.c:367
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr "podczas rozszerzania skrótu „%s”: „%s”"
+
+#: git.c:376
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+"skrót „%s” zmienia zmienne środowiska.\n"
+"Aby to zrobić, możesz użyć w skrócie „!git”"
+
+#: git.c:383
+#, c-format
+msgid "empty alias for %s"
+msgstr "pusty skrót dla %s"
+
+#: git.c:386
+#, c-format
+msgid "recursive alias: %s"
+msgstr "rekurencyjny skrót: %s"
+
+#: git.c:468
+msgid "write failure on standard output"
+msgstr "błąd wypisywania na standardowe wyjście"
+
+#: git.c:470
+msgid "unknown write failure on standard output"
+msgstr "nieznany błąd wypisywania na standardowe wyjście"
+
+#: git.c:472
+msgid "close failed on standard output"
+msgstr "nie można zamknąć standardowego wyjścia"
+
+#: git.c:823
+#, c-format
+msgid "alias loop detected: expansion of '%s' does not terminate:%s"
+msgstr "wykryto pętlę skrótów: rozwijanie „%s” nie kończy się: %s"
+
+#: git.c:873
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr "nie można obsłużyć %s jako polecenia wbudowanego"
+
+#: git.c:886
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+"użycie: %s\n"
+"\n"
+
+#: git.c:906
+#, c-format
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
+msgstr ""
+"rozwinięcie skrótu „%s” nie powiodło się; „%s” nie jest poleceniem gita\n"
+
+#: git.c:918
+#, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr "nie można wykonać polecenia „%s”: %s\n"
+
+#: http.c:399
+#, c-format
+msgid "negative value for http.postbuffer; defaulting to %d"
+msgstr "ujemna wartość http.postbuffer; użycie domyślnej %d"
+
+#: http.c:420
+msgid "Delegation control is not supported with cURL < 7.22.0"
+msgstr "Kontrola powierzania niewspierana z cURLem < 7.22.0"
+
+#: http.c:429
+msgid "Public key pinning not supported with cURL < 7.44.0"
+msgstr "Klucz publiczny niewspierany z cURLem < 7.44.0"
+
+#: http.c:910
+msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
+msgstr "CURLSSLOPT_NO_REVOKE niewspierane z cURLem < 7.44.0"
+
+#: http.c:989
+msgid "Protocol restrictions not supported with cURL < 7.19.4"
+msgstr "Ograniczenia protokołów niewspierane z cURLem < 7.19.4"
+
+#: http.c:1132
+#, c-format
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
+msgstr "Niewspierany silnik SSL „%s”. Wspierane silniki SSL:"
+
+#: http.c:1139
+#, c-format
+msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
+msgstr "Nie można ustawić silnika SSL na „%s”: cURL zbudowano bez silników SSL"
+
+#: http.c:1143
+#, c-format
+msgid "Could not set SSL backend to '%s': already set"
+msgstr "Nie można ustawić silnika SSL na „%s”: już ustawiono"
+
+#: http.c:2025
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+" asked for: %s\n"
+" redirect: %s"
+msgstr ""
+"nie można zaktualizować podstawy adresu do przekierowania:\n"
+" poproszono o: %s\n"
+" przekierowanie: %s"
+
+#: remote-curl.c:183
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr "nieprawidłowe cytowanie w wartości opcji wypchnięcia: „%s”"
+
+#: remote-curl.c:307
+#, c-format
+msgid "%sinfo/refs not valid: is this a git repository?"
+msgstr "%sinfo/refs nieprawidłowe: czy to jest repozytorium gita?"
+
+#: remote-curl.c:408
+msgid "invalid server response; expected service, got flush packet"
+msgstr ""
+"nieprawidłowa odpowiedź serwera; oczekiwano usługi, otrzymano pakiet "
+"wypróżnienia"
+
+#: remote-curl.c:439
+#, c-format
+msgid "invalid server response; got '%s'"
+msgstr "nieprawidłowa odpowiedź serwera; otrzymano „%s”"
+
+#: remote-curl.c:499
+#, c-format
+msgid "repository '%s' not found"
+msgstr "nie znaleziono repozytorium „%s”"
+
+#: remote-curl.c:503
+#, c-format
+msgid "Authentication failed for '%s'"
+msgstr "Uwierzytelnienie nie powiodło się dla „%s”"
+
+#: remote-curl.c:507
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr "brak dostępu do „%s”: %s"
+
+#: remote-curl.c:513
+#, c-format
+msgid "redirecting to %s"
+msgstr "przekierowanie do %s"
+
+#: remote-curl.c:642
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr ""
+"nie powinno być końca pliku, kiedy koniec pliku nie jest gładko obsługiwany"
+
+#: remote-curl.c:654
+msgid "remote server sent stateless separator"
+msgstr "zdalna maszyna wysłała bezstanowy separator"
+
+#: remote-curl.c:724
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr ""
+"nie można cofnąć danych formularza rpc — spróbuj zwiększyć http.postBuffer"
+
+#: remote-curl.c:754
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr "remote-curl: zły znak długości wiersza: %.4s"
+
+#: remote-curl.c:756
+msgid "remote-curl: unexpected response end packet"
+msgstr "remote-curl: nieoczekiwany pakiet końca odpowiedzi"
+
+#: remote-curl.c:832
+#, c-format
+msgid "RPC failed; %s"
+msgstr "wywołanie RPC nie powiodło się; %s"
+
+#: remote-curl.c:872
+msgid "cannot handle pushes this big"
+msgstr "nie można obsłużyć tak dużych wypchnięć"
+
+#: remote-curl.c:987
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr "nie można skompresować żądania; błąd deflate zlib %d"
+
+#: remote-curl.c:991
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr "nie można skompresować żądania; błąd end zlib %d"
+
+#: remote-curl.c:1041
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr "otrzymano nagłówek długości %d bajtów"
+
+#: remote-curl.c:1043
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr "nadal oczekuję na %d bajtów ciała"
+
+#: remote-curl.c:1132
+msgid "dumb http transport does not support shallow capabilities"
+msgstr "tępy transport http nie wspiera płytkich możliwości"
+
+#: remote-curl.c:1147
+msgid "fetch failed."
+msgstr "pobieranie nie powiodło się."
+
+#: remote-curl.c:1193
+msgid "cannot fetch by sha1 over smart http"
+msgstr "nie można pobrać SHA-1 przez inteligentne http"
+
+#: remote-curl.c:1237 remote-curl.c:1243
+#, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr "błąd protokołu: oczekiwano SHA/referencji, otrzymano „%s”"
+
+#: remote-curl.c:1255 remote-curl.c:1373
+#, c-format
+msgid "http transport does not support %s"
+msgstr "transport http nie wspiera %s"
+
+#: remote-curl.c:1291
+msgid "git-http-push failed"
+msgstr "git-http-push nie powiodło się"
+
+#: remote-curl.c:1479
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr "remote-curl: użycie: git remote-curl <zdalne-repozytorium> [<adres>]"
+
+#: remote-curl.c:1511
+msgid "remote-curl: error reading command stream from git"
+msgstr "remote-curl: błąd odczytu strumienia poleceń od gita"
+
+#: remote-curl.c:1518
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr "remote-curl: próba pobrania bez lokalnego repozytorium"
+
+#: remote-curl.c:1559
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
+msgstr "remote-curl: nieznane polecenie „%s” z gita"
+
+#: compat/compiler.h:26
+msgid "no compiler information available\n"
+msgstr "brak dostępnych informacji o kompilatorze\n"
+
+#: compat/compiler.h:38
+msgid "no libc information available\n"
+msgstr "brak dostępnych informacji o bibliotece standardowej\n"
+
+#: list-objects-filter-options.h:91
+msgid "args"
+msgstr "argumenty"
+
+#: list-objects-filter-options.h:92
+msgid "object filtering"
+msgstr "filtrowanie obiektów"
+
+#: parse-options.h:183
+msgid "expiry-date"
+msgstr "data wygaśnięcia"
+
+#: parse-options.h:197
+msgid "no-op (backward compatibility)"
+msgstr "nic nie robi (kompatybilność wsteczna)"
+
+#: parse-options.h:309
+msgid "be more verbose"
+msgstr "więcej komunikatów"
+
+#: parse-options.h:311
+msgid "be more quiet"
+msgstr "mniej komunikatów"
+
+#: parse-options.h:317
+msgid "use <n> digits to display object names"
+msgstr "użyj <n> cyfr, aby wyświetlić nazwy obiektów"
+
+#: parse-options.h:336
+msgid "how to strip spaces and #comments from message"
+msgstr "jak usuwać odstępy i #komentarze z komunikatu"
+
+#: parse-options.h:337
+msgid "read pathspec from file"
+msgstr "wczytaj ścieżki z pliku"
+
+#: parse-options.h:338
+msgid ""
+"with --pathspec-from-file, pathspec elements are separated with NUL character"
+msgstr "przy --pathspec-from-file ścieżki są rozdzielone znakiem NUL"
+
+#: ref-filter.h:99
+msgid "key"
+msgstr "klucz"
+
+#: ref-filter.h:99
+msgid "field name to sort on"
+msgstr "nazwa pola, według którego należy posortować"
+
+#: rerere.h:44
+msgid "update the index with reused conflict resolution if possible"
+msgstr ""
+"jeśli to możliwe, zaktualizuj indeks używając ponownie starych rozwiązań "
+"konfliktów"
+
+#: command-list.h:50
+msgid "Add file contents to the index"
+msgstr "Dodaj zawartość pliku do indeksu"
+
+#: command-list.h:51
+msgid "Apply a series of patches from a mailbox"
+msgstr "Zastosuj serię łatek ze skrzynki pocztowej"
+
+#: command-list.h:52
+msgid "Annotate file lines with commit information"
+msgstr "Dodaj przypisy do wierszy pliku z informacjami o zapisach"
+
+#: command-list.h:53
+msgid "Apply a patch to files and/or to the index"
+msgstr "Zastosuj łatkę do plików i/lub indeksu"
+
+#: command-list.h:54
+msgid "Import a GNU Arch repository into Git"
+msgstr "Zaimportuj repozytorium GNU Arch do Gita"
+
+#: command-list.h:55
+msgid "Create an archive of files from a named tree"
+msgstr "Utwórz archiwum plików z nazwanego drzewa"
+
+#: command-list.h:56
+msgid "Use binary search to find the commit that introduced a bug"
+msgstr "Użyj wyszukiwania binarnego, aby znaleźć zapis, który wprowadził błędy"
+
+#: command-list.h:57
+msgid "Show what revision and author last modified each line of a file"
+msgstr "Obwiń, kto i w jakiej rewizji ostatnio zmienił każdy wiersz pliku"
+
+#: command-list.h:58
+msgid "List, create, or delete branches"
+msgstr "Wypisz, utwórz lub usuń gałęzie"
+
+#: command-list.h:59
+msgid "Collect information for user to file a bug report"
+msgstr "Zbierz za użytkownika informacje, żeby zgłosić błąd"
+
+#: command-list.h:60
+msgid "Move objects and refs by archive"
+msgstr "Przenoś obiekty i referencje po archiwach"
+
+#: command-list.h:61
+msgid "Provide content or type and size information for repository objects"
+msgstr ""
+"Dostarcz informacje o zawartości lub rodzaju i rozmiarze obiektów "
+"repozytorium"
+
+#: command-list.h:62
+msgid "Display gitattributes information"
+msgstr "Wypisz informacje gitattributes"
+
+#: command-list.h:63
+msgid "Debug gitignore / exclude files"
+msgstr "Diagnozuj pliki pomijania gitignore / exclude"
+
+#: command-list.h:64
+msgid "Show canonical names and email addresses of contacts"
+msgstr "Pokaż kanoniczne nazwy i adresy e-mail kontaktów"
+
+#: command-list.h:65
+msgid "Switch branches or restore working tree files"
+msgstr "Przełącz gałąź lub przywróć pliki drzewa roboczego"
+
+#: command-list.h:66
+msgid "Copy files from the index to the working tree"
+msgstr "Skopiuj pliki z indeksu do drzewa roboczego"
+
+#: command-list.h:67
+msgid "Ensures that a reference name is well formed"
+msgstr "Zapewnia, że nazwa referencji jest prawidłowa"
+
+#: command-list.h:68
+msgid "Find commits yet to be applied to upstream"
+msgstr "Znajdź zapisy jeszcze do zastosowania w górnym biegu"
+
+#: command-list.h:69
+msgid "Apply the changes introduced by some existing commits"
+msgstr "Zastosuj zmiany wprowadzone niektórymi istniejącymi zapisami"
+
+#: command-list.h:70
+msgid "Graphical alternative to git-commit"
+msgstr "Graficzna alternatywa git-commit"
+
+#: command-list.h:71
+msgid "Remove untracked files from the working tree"
+msgstr "Usuń nieśledzone pliki z drzewa roboczego"
+
+#: command-list.h:72
+msgid "Clone a repository into a new directory"
+msgstr "Sklonuj repozytorium do nowego katalogu"
+
+#: command-list.h:73
+msgid "Display data in columns"
+msgstr "Wyświetl dane w kolumnach"
+
+#: command-list.h:74
+msgid "Record changes to the repository"
+msgstr "Zapisz zmiany w repozytorium"
+
+#: command-list.h:75
+msgid "Write and verify Git commit-graph files"
+msgstr "Zapisz i zweryfikuj pliki grafu zapisów Gita"
+
+#: command-list.h:76
+msgid "Create a new commit object"
+msgstr "Utwórz nowy obiekt zapisu"
+
+#: command-list.h:77
+msgid "Get and set repository or global options"
+msgstr "Podaj lub ustaw opcje repozytorium lub globalne"
+
+#: command-list.h:78
+msgid "Count unpacked number of objects and their disk consumption"
+msgstr "Zlicz rozpakowane obiekty i ich zużycie dysku"
+
+#: command-list.h:79
+msgid "Retrieve and store user credentials"
+msgstr "Uzyskaj i przechowaj poświadczenia użytkownika"
+
+#: command-list.h:80
+msgid "Helper to temporarily store passwords in memory"
+msgstr "Pomocnik do tymczasowego przechowania haseł w pamięci"
+
+#: command-list.h:81
+msgid "Helper to store credentials on disk"
+msgstr "Pomocnik do przechowania poświadczeń na dysku"
+
+#: command-list.h:82
+msgid "Export a single commit to a CVS checkout"
+msgstr "Wyeksportuj pojedynczy zapis do poboru CVS"
+
+#: command-list.h:83
+msgid "Salvage your data out of another SCM people love to hate"
+msgstr ""
+"Ocal swoje dane przed innym systemem kontroli wersji, który ludzie "
+"uwielbiają nienawidzić"
+
+#: command-list.h:84
+msgid "A CVS server emulator for Git"
+msgstr "Emulator serwera CVS w Gicie"
+
+#: command-list.h:85
+msgid "A really simple server for Git repositories"
+msgstr "Naprawdę prosty serwer do repozytoriów Gita"
+
+#: command-list.h:86
+msgid "Give an object a human readable name based on an available ref"
+msgstr ""
+"Nadaj obiektowi nazwę czytelną dla człowieka opartą o dostępną referencję"
+
+#: command-list.h:87
+msgid "Show changes between commits, commit and working tree, etc"
+msgstr "Pokaż zmiany pomiędzy zapisami, zapisem i drzewem roboczym itp."
+
+#: command-list.h:88
+msgid "Compares files in the working tree and the index"
+msgstr "Porównuje pliki w drzewie roboczym i indeksie"
+
+#: command-list.h:89
+msgid "Compare a tree to the working tree or index"
+msgstr "Porównaj drzewo do drzewa roboczego lub indeksu"
+
+#: command-list.h:90
+msgid "Compares the content and mode of blobs found via two tree objects"
+msgstr ""
+"Porównuje zawartość i tryb blobów znalezionych przez dwa obiekty drzewa"
+
+#: command-list.h:91
+msgid "Show changes using common diff tools"
+msgstr "Pokaż zmiany używając zwykłych narzędzi różnic"
+
+#: command-list.h:92
+msgid "Git data exporter"
+msgstr "Eksporter danych Gita"
+
+#: command-list.h:93
+msgid "Backend for fast Git data importers"
+msgstr "Silnik dla szybkich importerów danych Gita"
+
+#: command-list.h:94
+msgid "Download objects and refs from another repository"
+msgstr "Pobierz obiekty i referencje z innego repozytorium"
+
+#: command-list.h:95
+msgid "Receive missing objects from another repository"
+msgstr "Odbierz brakujące obiekty z innego repozytorium"
+
+#: command-list.h:96
+msgid "Rewrite branches"
+msgstr "Przerób gałęzie"
+
+#: command-list.h:97
+msgid "Produce a merge commit message"
+msgstr "Wytwórz komunikat zapisu scalenia"
+
+#: command-list.h:98
+msgid "Output information on each ref"
+msgstr "Wypisz informacje o każdej referencji"
+
+#: command-list.h:99
+msgid "Run a Git command on a list of repositories"
+msgstr "Wykonaj polecenie Gita na liście repozytoriów"
+
+#: command-list.h:100
+msgid "Prepare patches for e-mail submission"
+msgstr "Przygotuj łatki do wysłania pocztą e-mail"
+
+#: command-list.h:101
+msgid "Verifies the connectivity and validity of the objects in the database"
+msgstr "Sprawdza spójność i poprawność obiektów w bazie danych"
+
+#: command-list.h:102
+msgid "Cleanup unnecessary files and optimize the local repository"
+msgstr "Wyczyść niepotrzebne pliki i zoptymalizuj lokalne repozytorium"
+
+#: command-list.h:103
+msgid "Extract commit ID from an archive created using git-archive"
+msgstr "Wydobądź identyfikator zapisu z archiwum utworzonego z git-archive"
+
+#: command-list.h:104
+msgid "Print lines matching a pattern"
+msgstr "Wypisz wiersze pasujące do wzorca"
+
+#: command-list.h:105
+msgid "A portable graphical interface to Git"
+msgstr "Przenośny interfejs graficzny do Gita"
+
+#: command-list.h:106
+msgid "Compute object ID and optionally creates a blob from a file"
+msgstr "Oblicz identyfikator obiektu i opcjonalnie utwórz blob z pliku"
+
+#: command-list.h:107
+msgid "Display help information about Git"
+msgstr "Wyświetl pomocne informacje o Gicie"
+
+#: command-list.h:108
+msgid "Server side implementation of Git over HTTP"
+msgstr "Implementacja Gita po HTTP po stronie serwera"
+
+#: command-list.h:109
+msgid "Download from a remote Git repository via HTTP"
+msgstr "Pobierz obiekty ze zdalnego repozytorium przez HTTP"
+
+#: command-list.h:110
+msgid "Push objects over HTTP/DAV to another repository"
+msgstr "Wypchnij obiekty po HTTP/DAV do innego repozytorium"
+
+#: command-list.h:111
+msgid "Send a collection of patches from stdin to an IMAP folder"
+msgstr "Wyślij zbiór łatek ze standardowego wejścia do katalogu IMAP"
+
+#: command-list.h:112
+msgid "Build pack index file for an existing packed archive"
+msgstr "Zbuduj plik indeksu paczki istniejącemu spakowanemu archiwum"
+
+#: command-list.h:113
+msgid "Create an empty Git repository or reinitialize an existing one"
+msgstr "Utwórz puste repozytorium Gita lub przeinicjuj istniejące"
+
+#: command-list.h:114
+msgid "Instantly browse your working repository in gitweb"
+msgstr "Przeglądaj na miejscu swoje robocze repozytorium w gitweb"
+
+#: command-list.h:115
+msgid "Add or parse structured information in commit messages"
+msgstr "Dodaj lub przetwórz ustrukturyzowane informacje z komunikatów zapisów"
+
+#: command-list.h:116
+msgid "The Git repository browser"
+msgstr "Przeglądarka repozytorium Gita"
+
+#: command-list.h:117
+msgid "Show commit logs"
+msgstr "Pokaż dziennik zapisów"
+
+#: command-list.h:118
+msgid "Show information about files in the index and the working tree"
+msgstr "Pokaż informacje o plikach w indeksie i drzewie roboczym"
+
+#: command-list.h:119
+msgid "List references in a remote repository"
+msgstr "Wypisz referencje w zdalnym repozytorium"
+
+#: command-list.h:120
+msgid "List the contents of a tree object"
+msgstr "Wypisz zawartość obiektu drzewa"
+
+#: command-list.h:121
+msgid "Extracts patch and authorship from a single e-mail message"
+msgstr "Wydobądź łatkę i autorstwo z pojedynczego listu e-mail"
+
+#: command-list.h:122
+msgid "Simple UNIX mbox splitter program"
+msgstr "Prosty program do dzielenia Uniksowej skrzynki mbox"
+
+#: command-list.h:123
+msgid "Run tasks to optimize Git repository data"
+msgstr "Wykonuj zadania, by zoptymalizować dane repozytorium Gita"
+
+#: command-list.h:124
+msgid "Join two or more development histories together"
+msgstr "Połącz ze sobą dwie lub więcej historii rozwoju"
+
+#: command-list.h:125
+msgid "Find as good common ancestors as possible for a merge"
+msgstr "Znajdź najlepszych możliwych przodków scalenia"
+
+#: command-list.h:126
+msgid "Run a three-way file merge"
+msgstr "Wykonaj trójstronne scalenie pliku"
+
+#: command-list.h:127
+msgid "Run a merge for files needing merging"
+msgstr "Wykonaj scalenie w plikach wymagających scalenia"
+
+#: command-list.h:128
+msgid "The standard helper program to use with git-merge-index"
+msgstr "Standardowy program pomocniczy do użycia z git-merge-index"
+
+#: command-list.h:129
+msgid "Run merge conflict resolution tools to resolve merge conflicts"
+msgstr ""
+"Uruchom narzędzia do rozwiązywania konfliktów, aby rozwiązać konflikty "
+"scalania"
+
+#: command-list.h:130
+msgid "Show three-way merge without touching index"
+msgstr "Pokaż trójstronne scalenie bez dotykania indeksu"
+
+#: command-list.h:131
+msgid "Write and verify multi-pack-indexes"
+msgstr "Wypisz i sprawdź indeksy multi-pack"
+
+#: command-list.h:132
+msgid "Creates a tag object with extra validation"
+msgstr "Tworzy obiekt tagu z dodatkowymi sprawdzeniami"
+
+#: command-list.h:133
+msgid "Build a tree-object from ls-tree formatted text"
+msgstr "Zbuduj obiekt drzewa z tekstu sformatowanego jak ls-tree"
+
+#: command-list.h:134
+msgid "Move or rename a file, a directory, or a symlink"
+msgstr "Przenieś plik, katalog lub dowiązanie albo zmień jego nazwę"
+
+#: command-list.h:135
+msgid "Find symbolic names for given revs"
+msgstr "Znajdź nazwy symboliczne dla podanych rewizji"
+
+#: command-list.h:136
+msgid "Add or inspect object notes"
+msgstr "Dodaj lub zbadaj uwagi do obiektów"
+
+#: command-list.h:137
+msgid "Import from and submit to Perforce repositories"
+msgstr "Importuj z repozytoriów Perforce i przesyłaj do nich"
+
+#: command-list.h:138
+msgid "Create a packed archive of objects"
+msgstr "Utwórz spakowane archiwum obiektów"
+
+#: command-list.h:139
+msgid "Find redundant pack files"
+msgstr "Znajdź zbędne pliki paczek"
+
+#: command-list.h:140
+msgid "Pack heads and tags for efficient repository access"
+msgstr "Spakuj czoła i tagi do wydajnego dostępu do repozytorium"
+
+#: command-list.h:141
+msgid "Compute unique ID for a patch"
+msgstr "Oblicz unikatowy identyfikator łatki"
+
+#: command-list.h:142
+msgid "Prune all unreachable objects from the object database"
+msgstr "Przytnij wszystkie nieosiągalne obiekty z bazy danych obiektów"
+
+#: command-list.h:143
+msgid "Remove extra objects that are already in pack files"
+msgstr "Usuń dodatkowe obiekty, które już są w plikach paczek"
+
+#: command-list.h:144
+msgid "Fetch from and integrate with another repository or a local branch"
+msgstr "Pobierz i zintegruj zmiany z innego repozytorium lub lokalnej gałęzi"
+
+#: command-list.h:145
+msgid "Update remote refs along with associated objects"
+msgstr "Zaktualizuj zdalne referencje razem z przypisanymi obiektami"
+
+#: command-list.h:146
+msgid "Applies a quilt patchset onto the current branch"
+msgstr "Stosuje zestaw łatek quilta na bieżącą gałąź"
+
+#: command-list.h:147
+msgid "Compare two commit ranges (e.g. two versions of a branch)"
+msgstr "Porównaj dwa zakresy zapisów (np. dwie wersje gałęzi)"
+
+#: command-list.h:148
+msgid "Reads tree information into the index"
+msgstr "Wczytuje informacje o drzewie do indeksu"
+
+#: command-list.h:149
+msgid "Reapply commits on top of another base tip"
+msgstr "Ponownie zastosuj zapisy na czubku innej gałęzi"
+
+#: command-list.h:150
+msgid "Receive what is pushed into the repository"
+msgstr "Odbierz to, co zostało wypchnięte do repozytorium"
+
+#: command-list.h:151
+msgid "Manage reflog information"
+msgstr "Zarządzaj informacjami o dzienniku referencji"
+
+#: command-list.h:152
+msgid "Manage set of tracked repositories"
+msgstr "Zarządzaj zestawem śledzonych repozytoriów"
+
+#: command-list.h:153
+msgid "Pack unpacked objects in a repository"
+msgstr "Spakuj rozpakowane obiekty w repozytorium"
+
+#: command-list.h:154
+msgid "Create, list, delete refs to replace objects"
+msgstr "Utwórz, wypisz, usuń referencje do obiektów zamiennych"
+
+#: command-list.h:155
+msgid "Generates a summary of pending changes"
+msgstr "Generuje podsumowanie trwających zmian"
+
+#: command-list.h:156
+msgid "Reuse recorded resolution of conflicted merges"
+msgstr "Użyj ponownie zapisanego rozwiązania skonfliktowanych scaleń"
+
+#: command-list.h:157
+msgid "Reset current HEAD to the specified state"
+msgstr "Zresetuj bieżący HEAD do podanego stanu"
+
+#: command-list.h:158
+msgid "Restore working tree files"
+msgstr "Przywróć pliki drzewa roboczego"
+
+#: command-list.h:159
+msgid "Revert some existing commits"
+msgstr "Odwróć niektóre istniejące zapisy"
+
+#: command-list.h:160
+msgid "Lists commit objects in reverse chronological order"
+msgstr "Wypisz zapisy w odwrotnej kolejności chronologicznej"
+
+#: command-list.h:161
+msgid "Pick out and massage parameters"
+msgstr "Dobierz i wymasuj parametry"
+
+#: command-list.h:162
+msgid "Remove files from the working tree and from the index"
+msgstr "Usuń pliki z drzewa roboczego i z indeksu"
+
+#: command-list.h:163
+msgid "Send a collection of patches as emails"
+msgstr "Wyślij zbiór łatek jako e-mail"
+
+#: command-list.h:164
+msgid "Push objects over Git protocol to another repository"
+msgstr "Wypchnij obiekty po protokole Gita do innego repozytorium"
+
+#: command-list.h:165
+msgid "Restricted login shell for Git-only SSH access"
+msgstr "Ograniczona powłoka logowania do dostępu przez SSH tylko do Gita"
+
+#: command-list.h:166
+msgid "Summarize 'git log' output"
+msgstr "Podsumuj wyjście „git log”"
+
+#: command-list.h:167
+msgid "Show various types of objects"
+msgstr "Pokazuj różne typy obiektów"
+
+#: command-list.h:168
+msgid "Show branches and their commits"
+msgstr "Pokaż gałęzie i ich zapisy"
+
+#: command-list.h:169
+msgid "Show packed archive index"
+msgstr "Pokaż indeks spakowanych archiwów"
+
+#: command-list.h:170
+msgid "List references in a local repository"
+msgstr "Wypisz referencje w lokalnym repozytorium"
+
+#: command-list.h:171
+msgid "Git's i18n setup code for shell scripts"
+msgstr "Kod międzynarodowy Gita w skryptach powłoki"
+
+#: command-list.h:172
+msgid "Common Git shell script setup code"
+msgstr "Wspólny kod przygotowania Gita w skryptach powłoki"
+
+#: command-list.h:173
+msgid "Initialize and modify the sparse-checkout"
+msgstr "Inicjuj i zmieniaj rzadkie wybranie"
+
+#: command-list.h:174
+msgid "Stash the changes in a dirty working directory away"
+msgstr "Przenieś do schowka zmiany z brudnego drzewa roboczego"
+
+#: command-list.h:175
+msgid "Add file contents to the staging area"
+msgstr "Dodaj zawartość pliku do obszaru przygotowania"
+
+#: command-list.h:176
+msgid "Show the working tree status"
+msgstr "Pokaż stan drzewa roboczego"
+
+#: command-list.h:177
+msgid "Remove unnecessary whitespace"
+msgstr "Usuń niepotrzebne białe znaki"
+
+#: command-list.h:178
+msgid "Initialize, update or inspect submodules"
+msgstr "Zainicjuj, zaktualizuj lub zbadaj pod-moduły"
+
+#: command-list.h:179
+msgid "Bidirectional operation between a Subversion repository and Git"
+msgstr "Dwukierunkowa operacja między repozytorium Subversion i Gita"
+
+#: command-list.h:180
+msgid "Switch branches"
+msgstr "Przełączaj gałęzie"
+
+#: command-list.h:181
+msgid "Read, modify and delete symbolic refs"
+msgstr "Czytaj, zmieniaj lub kasuj referencje symboliczne"
+
+#: command-list.h:182
+msgid "Create, list, delete or verify a tag object signed with GPG"
+msgstr "Utwórz, wypisz, usuń lub zweryfikuj obiekt tagu podpisany GPG"
+
+#: command-list.h:183
+msgid "Creates a temporary file with a blob's contents"
+msgstr "Utwórz tymczasowy plik z zawartością blobu"
+
+#: command-list.h:184
+msgid "Unpack objects from a packed archive"
+msgstr "Rozpakuj obiekty ze spakowanego archiwum"
+
+#: command-list.h:185
+msgid "Register file contents in the working tree to the index"
+msgstr "Zarejestruj zawartość pliku z drzewa roboczego w indeksie"
+
+#: command-list.h:186
+msgid "Update the object name stored in a ref safely"
+msgstr "Zaktualizuj bezpiecznie nazwę obiektu zapisaną w referencji"
+
+#: command-list.h:187
+msgid "Update auxiliary info file to help dumb servers"
+msgstr "Zaktualizuj pomocnicze informacje, aby pomóc tępym serwerom"
+
+#: command-list.h:188
+msgid "Send archive back to git-archive"
+msgstr "Wyślij archiwum z powrotem do git-archive"
+
+#: command-list.h:189
+msgid "Send objects packed back to git-fetch-pack"
+msgstr "Wyślij spakowane obiekty z powrotem do git-fetch-pack"
+
+#: command-list.h:190
+msgid "Show a Git logical variable"
+msgstr "Pokaż logiczną zmienną Gita"
+
+#: command-list.h:191
+msgid "Check the GPG signature of commits"
+msgstr "Sprawdź podpisy GPG zapisów"
+
+#: command-list.h:192
+msgid "Validate packed Git archive files"
+msgstr "Sprawdź spakowane pliki archiwów Gita"
+
+#: command-list.h:193
+msgid "Check the GPG signature of tags"
+msgstr "Sprawdź podpisy GPG tagów"
+
+#: command-list.h:194
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Interfejs www Gita (przeglądarkowy wgląd w repozytoria Gita)"
+
+#: command-list.h:195
+msgid "Show logs with difference each commit introduces"
+msgstr "Pokaż dzienniki z różnicami, które wprowadza każdy zapis"
+
+#: command-list.h:196
+msgid "Manage multiple working trees"
+msgstr "Zarządzaj wieloma drzewami roboczymi"
+
+#: command-list.h:197
+msgid "Create a tree object from the current index"
+msgstr "Utwórz obiekt drzewa z bieżącego indeksu"
+
+#: command-list.h:198
+msgid "Defining attributes per path"
+msgstr "Definiowanie atrybutów ścieżek"
+
+#: command-list.h:199
+msgid "Git command-line interface and conventions"
+msgstr "Interfejs wiersza poleceń i konwencje Gita"
+
+#: command-list.h:200
+msgid "A Git core tutorial for developers"
+msgstr "Samouczek podstaw Gita dla deweloperów"
+
+#: command-list.h:201
+msgid "Providing usernames and passwords to Git"
+msgstr "Podawanie Gitowi nazw użytkownika i haseł"
+
+#: command-list.h:202
+msgid "Git for CVS users"
+msgstr "Git dla użytkowników CVS"
+
+#: command-list.h:203
+msgid "Tweaking diff output"
+msgstr "Dostrajanie wyjścia różnic"
+
+#: command-list.h:204
+msgid "A useful minimum set of commands for Everyday Git"
+msgstr "Użyteczny podstawowy zbiór poleceń do Codziennego Gita"
+
+#: command-list.h:205
+msgid "Frequently asked questions about using Git"
+msgstr "Często zadawane pytania o użyciu Gita"
+
+#: command-list.h:206
+msgid "A Git Glossary"
+msgstr "Słowniczek Gita"
+
+#: command-list.h:207
+msgid "Hooks used by Git"
+msgstr "Skrypty używane przez Gita"
+
+#: command-list.h:208
+msgid "Specifies intentionally untracked files to ignore"
+msgstr "Podaje celowo nieśledzone pliki do pomijania"
+
+#: command-list.h:209
+msgid "Map author/committer names and/or E-Mail addresses"
+msgstr ""
+"Przypisz nazwiska autorów/składających i/lub ich adresy poczty elektronicznej"
+
+#: command-list.h:210
+msgid "Defining submodule properties"
+msgstr "Definiowanie właściwości pod-modułów"
+
+#: command-list.h:211
+msgid "Git namespaces"
+msgstr "Przestrzenie nazw Gita"
+
+#: command-list.h:212
+msgid "Helper programs to interact with remote repositories"
+msgstr "Pomocnicze programy do interakcji ze zdalnymi repozytoriami"
+
+#: command-list.h:213
+msgid "Git Repository Layout"
+msgstr "Układ repozytorium Gita"
+
+#: command-list.h:214
+msgid "Specifying revisions and ranges for Git"
+msgstr "Podawanie Gitowi rewizji i zakresów"
+
+#: command-list.h:215
+msgid "Mounting one repository inside another"
+msgstr "Montowanie jednego repozytorium w drugim"
+
+#: command-list.h:216
+msgid "A tutorial introduction to Git: part two"
+msgstr "Samouczek wprowadzenia do Gita: część druga"
+
+#: command-list.h:217
+msgid "A tutorial introduction to Git"
+msgstr "Samouczek wprowadzenia do Gita"
+
+#: command-list.h:218
+msgid "An overview of recommended workflows with Git"
+msgstr "Przegląd zalecanych przepływów pracy z Gitem"
+
+#: git-bisect.sh:68
+msgid "bisect run failed: no command provided."
+msgstr "przeszukanie nie powiodło się: nie podano polecenia."
+
+#: git-bisect.sh:73
+#, sh-format
+msgid "running $command"
+msgstr "wykonywanie $command"
+
+#: git-bisect.sh:80
+#, sh-format
+msgid ""
+"bisect run failed:\n"
+"exit code $res from '$command' is < 0 or >= 128"
+msgstr ""
+"przeszukanie nie powiodło się:\n"
+"kod wyjścia $res z „$command” jest <0 lub >= 128"
+
+#: git-bisect.sh:105
+msgid "bisect run cannot continue any more"
+msgstr "przeszukanie nie może już kontynuować"
+
+#: git-bisect.sh:111
+#, sh-format
+msgid ""
+"bisect run failed:\n"
+"'bisect-state $state' exited with error code $res"
+msgstr ""
+"przeszukanie nie powiodło się:\n"
+"„bisect-state $state” zakończyło się z kodem błędu $res"
+
+#: git-bisect.sh:118
+msgid "bisect run success"
+msgstr "przeszukanie pomyślne"
+
+#: git-merge-octopus.sh:46
+msgid ""
+"Error: Your local changes to the following files would be overwritten by "
+"merge"
+msgstr "Błąd: Scalenie nadpisałoby lokalne zmiany w następujących plikach"
+
+#: git-merge-octopus.sh:61
+msgid "Automated merge did not work."
+msgstr "Automatyczne scalenie nie zadziałało."
+
+#: git-merge-octopus.sh:62
+msgid "Should not be doing an octopus."
+msgstr "Nie powinna się robić ośmiornica."
+
+#: git-merge-octopus.sh:73
+#, sh-format
+msgid "Unable to find common commit with $pretty_name"
+msgstr "Nie znaleziono wspólnego zapisu z $pretty_name"
+
+#: git-merge-octopus.sh:77
+#, sh-format
+msgid "Already up to date with $pretty_name"
+msgstr "Już aktualne z $pretty_name"
+
+#: git-merge-octopus.sh:89
+#, sh-format
+msgid "Fast-forwarding to: $pretty_name"
+msgstr "Przewijanie do: $pretty_name"
+
+#: git-merge-octopus.sh:97
+#, sh-format
+msgid "Trying simple merge with $pretty_name"
+msgstr "Próba prostego scalenia z $pretty_name"
+
+#: git-merge-octopus.sh:102
+msgid "Simple merge did not work, trying automatic merge."
+msgstr "Proste scalenie nie zadziałało, próba automatycznego scalenia."
+
+#: git-submodule.sh:179
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr "Ścieżka względna może być użyta tylko ze szczytu drzewa roboczego"
+
+#: git-submodule.sh:189
+#, sh-format
+msgid "repo URL: '$repo' must be absolute or begin with ./|../"
+msgstr ""
+"URL repozytorium: „$repo” musi być ścieżką bezwzględną lub zaczynać się "
+"od ./|../"
+
+#: git-submodule.sh:208
+#, sh-format
+msgid "'$sm_path' already exists in the index"
+msgstr "„$sm_path” już widnieje w indeksie"
+
+#: git-submodule.sh:211
+#, sh-format
+msgid "'$sm_path' already exists in the index and is not a submodule"
+msgstr "„$sm_path” już widnieje w indeksie i nie jest pod-modułem"
+
+#: git-submodule.sh:218
+#, sh-format
+msgid "'$sm_path' does not have a commit checked out"
+msgstr "„$sm_path” nie ma wybranego zapisu"
+
+#: git-submodule.sh:249
+#, sh-format
+msgid "Adding existing repo at '$sm_path' to the index"
+msgstr "Dodawanie istniejącego repozytorium z „$sm_path” do indeksu"
+
+#: git-submodule.sh:251
+#, sh-format
+msgid "'$sm_path' already exists and is not a valid git repo"
+msgstr "„$sm_path” już istnieje i nie jest prawidłowym repozytorium gita"
+
+#: git-submodule.sh:259
+#, sh-format
+msgid "A git directory for '$sm_name' is found locally with remote(s):"
+msgstr ""
+"Katalog gita podmodułu „$sm_name” znaleziono lokalnie na zdalnych "
+"repozytoriach:"
+
+#: git-submodule.sh:261
+#, 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 ""
+"Jeśli chcesz ponownie użyć tego lokalnego katalogu gita zamiast ponownie "
+"klonować z\n"
+" $realrepo\n"
+"użyj opcji „--force”. Jeśli lokalny katalog gita nie leży w prawidłowym "
+"repozytorium\n"
+"lub nie jesteś pewien, co to znaczy, wybierz inną nazwę za pomocą opcji „--"
+"name”."
+
+#: git-submodule.sh:267
+#, sh-format
+msgid "Reactivating local git directory for submodule '$sm_name'."
+msgstr "Reaktywacja lokalnego katalogu gita w podmodule „$sm_name”."
+
+#: git-submodule.sh:279
+#, sh-format
+msgid "Unable to checkout submodule '$sm_path'"
+msgstr "Nie można wybrać podmodułu „$sm_path”"
+
+#: git-submodule.sh:284
+#, sh-format
+msgid "Failed to add submodule '$sm_path'"
+msgstr "Nie można dodać podmodułu „$sm_path”"
+
+#: git-submodule.sh:293
+#, sh-format
+msgid "Failed to register submodule '$sm_path'"
+msgstr "Nie można zarejestrować podmodułu „$sm_path”"
+
+#: git-submodule.sh:568
+#, sh-format
+msgid "Unable to find current revision in submodule path '$displaypath'"
+msgstr "Nie znaleziono aktualnej rewizji w ścieżce podmodułu „$displaypath”"
+
+#: git-submodule.sh:578
+#, sh-format
+msgid "Unable to fetch in submodule path '$sm_path'"
+msgstr "Nie można pobrać w ścieżce podmodułu „$sm_path”"
+
+#: git-submodule.sh:583
+#, sh-format
+msgid ""
+"Unable to find current ${remote_name}/${branch} revision in submodule path "
+"'$sm_path'"
+msgstr ""
+"Nie znaleziono aktualnej rewizji ${remote_name}/${branch} w ścieżce pod-"
+"modułu „$sm_path”"
+
+#: git-submodule.sh:601
+#, sh-format
+msgid ""
+"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
+"$sha1:"
+msgstr ""
+"Nie można pobrać w ścieżce podmodułu „$displaypath”; próba bezpośredniego "
+"pobrania $sha1:"
+
+#: git-submodule.sh:607
+#, sh-format
+msgid ""
+"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
+"Direct fetching of that commit failed."
+msgstr ""
+"Pobrano w ścieżce podmodułu „$displaypath”, ale nie zawierał $sha1. "
+"Bezpośrednie pobieranie tego zapisu nie powiodło się."
+
+#: git-submodule.sh:614
+#, sh-format
+msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
+msgstr "Nie można wybrać „$sha1” w ścieżce podmodułu „$displaypath”"
+
+#: git-submodule.sh:615
+#, sh-format
+msgid "Submodule path '$displaypath': checked out '$sha1'"
+msgstr "Ścieżka podmodułu „$displaypath”: wybrano „$sha1”"
+
+#: git-submodule.sh:619
+#, sh-format
+msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
+msgstr "Nie można przestawić „$sha1” w ścieżce podmodułu „$displaypath”"
+
+#: git-submodule.sh:620
+#, sh-format
+msgid "Submodule path '$displaypath': rebased into '$sha1'"
+msgstr "Ścieżka podmodułu „$displaypath”: przestawiono na „$sha1”"
+
+#: git-submodule.sh:625
+#, sh-format
+msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
+msgstr "Nie można scalić „$sha1” w ścieżce podmodułu „$displaypath”"
+
+#: git-submodule.sh:626
+#, sh-format
+msgid "Submodule path '$displaypath': merged in '$sha1'"
+msgstr "Ścieżka podmodułu „$displaypath”: scalono w „$sha1”"
+
+#: git-submodule.sh:631
+#, sh-format
+msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
+msgstr ""
+"Wykonanie „$command $sha1” nie powiodło się w ścieżce podmodułu "
+"„$displaypath”"
+
+#: git-submodule.sh:632
+#, sh-format
+msgid "Submodule path '$displaypath': '$command $sha1'"
+msgstr "Ścieżka podmodułu „$displaypath”: „$command $sha1”"
+
+#: git-submodule.sh:663
+#, sh-format
+msgid "Failed to recurse into submodule path '$displaypath'"
+msgstr "Nie można zejść do ścieżki pod-modułu „$displaypath”"
+
+#: git-rebase--preserve-merges.sh:109
+msgid "Applied autostash."
+msgstr "Zastosowano zmiany z automatycznego schowka."
+
+#: git-rebase--preserve-merges.sh:112
+#, sh-format
+msgid "Cannot store $stash_sha1"
+msgstr "Nie można zachować $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 ""
+"Stosowanie zmian z automatycznej skrytki spowodowało konflikty.\n"
+"Twoje zmiany są bezpieczne w schowku.\n"
+"Możesz w każdej chwili wykonać „git stash pop” lub „git stash drop”.\n"
+
+#: git-rebase--preserve-merges.sh:191
+#, sh-format
+msgid "Rebasing ($new_count/$total)"
+msgstr "Przestawianie ($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"
+"Polecenia:\n"
+"p, pick <zapis> = dobierz zapis\n"
+"r, reword <zapis> = użyj zapisu, ale przeredaguj jego komunikat\n"
+"e, edit <zapis> = użyj zapisu, ale zatrzymaj się, żeby go poprawić\n"
+"s, squash <zapis> = użyj zapisu, ale połącz go z poprzednim (spłaszcz)\n"
+"f, fixup <zapis> = jak „squash”, ale odrzuć komunikat tego zapisu\n"
+"x, exec <polecenie> = wykonaj polecenie (resztę wiersza) w powłoce\n"
+"d, drop <zapis> = usuń zapis\n"
+"l, label <etykietka> = nazwij bieżące HEAD\n"
+"t, reset <etykietka> = zresetuj HEAD do etykietki\n"
+"m, merge [-C <zapis> | -c <zapis>] <etykietka> [# <wiersz>]\n"
+". utwórz zapis scalenia używając pierwotnego komunikatu scalenia\n"
+". (albo <wiersza>, jeśli nie podano pierwotnego zapisu scalenia.\n"
+". Użyj -c <zapis>, aby przeredagować komunikat zapisu.\n"
+"Kolejność wierszy może być zmieniona; są wykonywane z góry na dół.\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 ""
+"Możesz teraz poprawić zapis przez\n"
+"\n"
+"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Kiedy zadowolisz się swoimi zmianami, wykonaj\n"
+"\n"
+"\tgit rebase --continue"
+
+#: git-rebase--preserve-merges.sh:285
+#, sh-format
+msgid "$sha1: not a commit that can be picked"
+msgstr "$sha1: nie jest to zapis, który można dobrać"
+
+#: git-rebase--preserve-merges.sh:324
+#, sh-format
+msgid "Invalid commit name: $sha1"
+msgstr "Nieprawidłowa nazwa zapisu: $sha1"
+
+#: git-rebase--preserve-merges.sh:354
+msgid "Cannot write current commit's replacement sha1"
+msgstr "Nie można wpisać zamiennego sha1 bieżącego zapisu"
+
+#: git-rebase--preserve-merges.sh:405
+#, sh-format
+msgid "Fast-forward to $sha1"
+msgstr "Przewinięcie do $sha1"
+
+#: git-rebase--preserve-merges.sh:407
+#, sh-format
+msgid "Cannot fast-forward to $sha1"
+msgstr "Nie można przewinąć do $sha1"
+
+#: git-rebase--preserve-merges.sh:416
+#, sh-format
+msgid "Cannot move HEAD to $first_parent"
+msgstr "Nie można przesunąć HEAD na $first_parent"
+
+#: git-rebase--preserve-merges.sh:421
+#, sh-format
+msgid "Refusing to squash a merge: $sha1"
+msgstr "Odmawiam spłaszczenia scalenia: $sha1"
+
+#: git-rebase--preserve-merges.sh:439
+#, sh-format
+msgid "Error redoing merge $sha1"
+msgstr "Błąd ponowienia scalenia $sha1"
+
+#: git-rebase--preserve-merges.sh:448
+#, sh-format
+msgid "Could not pick $sha1"
+msgstr "Nie można dobrać $sha1"
+
+#: git-rebase--preserve-merges.sh:457
+#, sh-format
+msgid "This is the commit message #${n}:"
+msgstr "To jest komunikat zapisu nr ${n}:"
+
+#: git-rebase--preserve-merges.sh:462
+#, sh-format
+msgid "The commit message #${n} will be skipped:"
+msgstr "Komunikat zapisu nr ${n} zostanie pominięty:"
+
+#: 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] "To jest połączenie $count zapisu."
+msgstr[1] "To jest połączenie $count zapisów."
+msgstr[2] "To jest połączenie $count zapisów."
+
+#: git-rebase--preserve-merges.sh:482
+#, sh-format
+msgid "Cannot write $fixup_msg"
+msgstr "Nie można zapisać $fixup_msg"
+
+#: git-rebase--preserve-merges.sh:485
+msgid "This is a combination of 2 commits."
+msgstr "To jest połączenie dwóch zapisów."
+
+#: 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 "Nie można zastosować $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 ""
+"Nie udało się poprawić zapisu po pomyślnym dobraniu $sha1... $rest\n"
+"Jest to najpewniej spowodowane pustym komunikatem zapisu, albo "
+"niepowodzeniem\n"
+"skryptu pre-commit. Jeśli to on zawiódł, być może trzeba naprawić ten "
+"problem zanim\n"
+"uda się przeredagować zapis."
+
+#: git-rebase--preserve-merges.sh:616
+#, sh-format
+msgid "Stopped at $sha1_abbrev... $rest"
+msgstr "Zatrzymano na $sha1_abbrev... $rest"
+
+#: git-rebase--preserve-merges.sh:631
+#, sh-format
+msgid "Cannot '$squash_style' without a previous commit"
+msgstr "Nie można użyć „$squash_style” bez poprzedniego zapisu"
+
+#: git-rebase--preserve-merges.sh:673
+#, sh-format
+msgid "Executing: $rest"
+msgstr "Wykonywanie: $rest"
+
+#: git-rebase--preserve-merges.sh:681
+#, sh-format
+msgid "Execution failed: $rest"
+msgstr "Wykonywanie nie powiodło się: $rest"
+
+#: git-rebase--preserve-merges.sh:683
+msgid "and made changes to the index and/or the working tree"
+msgstr "i pozostały zmiany w indeksie i/lub drzewie roboczym"
+
+#: git-rebase--preserve-merges.sh:685
+msgid ""
+"You can fix the problem, and then run\n"
+"\n"
+"\tgit rebase --continue"
+msgstr ""
+"Możesz naprawić problem i uruchomić\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 ""
+"Wykonanie powiodło się: $rest\n"
+"ale pozostały zmiany w indeksie i/lub drzewie roboczym.\n"
+"Złóż swoje zmiany lub dodaj do schowka, i wtedy wykonaj:\n"
+"\n"
+"\tgit rebase --continue"
+
+#: git-rebase--preserve-merges.sh:709
+#, sh-format
+msgid "Unknown command: $command $sha1 $rest"
+msgstr "Nieznane polecenie: $command $sha1 $rest"
+
+#: git-rebase--preserve-merges.sh:710
+msgid "Please fix this using 'git rebase --edit-todo'."
+msgstr "Napraw to używając „git rebase --edit-todo”."
+
+#: git-rebase--preserve-merges.sh:745
+#, sh-format
+msgid "Successfully rebased and updated $head_name."
+msgstr "Pomyślnie przestawiono i zaktualizowano $head_name."
+
+#: git-rebase--preserve-merges.sh:802
+msgid "Could not remove CHERRY_PICK_HEAD"
+msgstr "Nie można usunąć 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 ""
+"W drzewie roboczym są przygotowane zmiany.\n"
+"Jeśli mają być one spłaszczone\n"
+"z poprzednim zapisem, wykonaj:\n"
+"\n"
+" git commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Jeśli mają się znaleźć w nowym zapisie, wykonaj:\n"
+" git commit $gpg_sign_opt_quoted\n"
+"\n"
+"W obu przypadkach po zakończeniu, kontynuuj przez:\n"
+"\n"
+" git rebase --continue\n"
+
+#: git-rebase--preserve-merges.sh:824
+msgid "Error trying to find the author identity to amend commit"
+msgstr "Błąd podczas próby znalezienia tożsamości autora w poprawionym zapisie"
+
+#: 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 ""
+"Masz niezłożone zmiany w drzewie roboczym. Najpierw je złóż\n"
+"i wtedy ponownie wykonaj „git rebase --continue”."
+
+#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
+msgid "Could not commit staged changes."
+msgstr "Nie udało się złożyć zmian ze schowka."
+
+#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
+msgid "Could not execute editor"
+msgstr "Nie można uruchomić edytora"
+
+#: git-rebase--preserve-merges.sh:890
+#, sh-format
+msgid "Could not checkout $switch_to"
+msgstr "Nie można wybrać $switch_to"
+
+#: git-rebase--preserve-merges.sh:897
+msgid "No HEAD?"
+msgstr "Brak HEAD?"
+
+#: git-rebase--preserve-merges.sh:898
+#, sh-format
+msgid "Could not create temporary $state_dir"
+msgstr "Nie można utworzyć tymczasowego $state_dir"
+
+#: git-rebase--preserve-merges.sh:901
+msgid "Could not mark as interactive"
+msgstr "Nie można oznaczyć jako interaktywne"
+
+#: 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] "Przestawianie $shortrevisions na $shortonto ($todocount polecenie)"
+msgstr[1] "Przestawianie $shortrevisions na $shortonto ($todocount polecenia)"
+msgstr[2] "Przestawianie $shortrevisions na $shortonto ($todocount poleceń)"
+
+#: git-rebase--preserve-merges.sh:945
+msgid "Note that empty commits are commented out"
+msgstr "Zważ, że puste zapisy są wykomentowane"
+
+#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
+msgid "Could not init rewritten commits"
+msgstr "Nie można zainicjować przerobionych zapisów"
+
+#: git-sh-setup.sh:89 git-sh-setup.sh:94
+#, sh-format
+msgid "usage: $dashless $USAGE"
+msgstr "użycie: $dashless $USAGE"
+
+#: git-sh-setup.sh:191
+#, sh-format
+msgid "Cannot chdir to $cdup, the toplevel of the working tree"
+msgstr "Nie można przejść chdir do $cdup, szczytu drzewa roboczego"
+
+#: git-sh-setup.sh:200 git-sh-setup.sh:207
+#, sh-format
+msgid "fatal: $program_name cannot be used without a working tree."
+msgstr "krytyczny błąd: nie można użyć $program_name bez drzewa roboczego."
+
+#: git-sh-setup.sh:221
+msgid "Cannot rebase: You have unstaged changes."
+msgstr "Nie można przestawić: Masz nieprzygotowane zmiany."
+
+#: git-sh-setup.sh:224
+msgid "Cannot rewrite branches: You have unstaged changes."
+msgstr "Nie można przerobić gałęzi: Masz nieprzygotowane zmiany."
+
+#: git-sh-setup.sh:227
+msgid "Cannot pull with rebase: You have unstaged changes."
+msgstr "Nie można zaciągnąć z przestawieniem: Masz nieprzygotowane zmiany."
+
+#: git-sh-setup.sh:230
+#, sh-format
+msgid "Cannot $action: You have unstaged changes."
+msgstr "Nie można wykonać $action: Masz nieprzygotowane zmiany."
+
+#: git-sh-setup.sh:243
+msgid "Cannot rebase: Your index contains uncommitted changes."
+msgstr "Nie można przestawić: Twój indeks zawiera niezłożone zmiany."
+
+#: git-sh-setup.sh:246
+msgid "Cannot pull with rebase: Your index contains uncommitted changes."
+msgstr ""
+"Nie można zaciągnąć z przestawieniem: Twój indeks zawiera niezłożone zmiany."
+
+#: git-sh-setup.sh:249
+#, sh-format
+msgid "Cannot $action: Your index contains uncommitted changes."
+msgstr "Nie można wykonać $action: Twój indeks zawiera niezłożone zmiany."
+
+#: git-sh-setup.sh:253
+msgid "Additionally, your index contains uncommitted changes."
+msgstr "Dodatkowo, twój indeks zawiera niezłożone zmiany."
+
+#: git-sh-setup.sh:373
+msgid "You need to run this command from the toplevel of the working tree."
+msgstr "Musisz uruchomić to polecenie ze szczytu drzewa roboczego."
+
+#: git-sh-setup.sh:378
+msgid "Unable to determine absolute path of git directory"
+msgstr "Nie można określić bezwzględnej ścieżki katalogu gita"
+
+#. TRANSLATORS: you can adjust this to align "git add -i" status menu
+#: git-add--interactive.perl:212
+#, perl-format
+msgid "%12s %12s %s"
+msgstr "%20s %20s %s"
+
+#: git-add--interactive.perl:632
+#, perl-format
+msgid "touched %d path\n"
+msgid_plural "touched %d paths\n"
+msgstr[0] "dotknięto %d ścieżkę\n"
+msgstr[1] "dotknięto %d ścieżki\n"
+msgstr[2] "dotknięto %d ścieżek\n"
+
+#: git-add--interactive.perl:1056
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for staging."
+msgstr ""
+"Jeśli łatka stosuje się gładko, zmieniony skrawek zostanie natychmiast\n"
+"oznaczony do przygotowania."
+
+#: git-add--interactive.perl:1059
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for stashing."
+msgstr ""
+"Jeśli łatka stosuje się gładko, zmieniony skrawek zostanie natychmiast\n"
+"oznaczony do dodania do schowka."
+
+#: git-add--interactive.perl:1062
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for unstaging."
+msgstr ""
+"Jeśli łatka stosuje się gładko, zmieniony skrawek zostanie natychmiast\n"
+"oznaczony do wycofania."
+
+#: git-add--interactive.perl:1065 git-add--interactive.perl:1074
+#: git-add--interactive.perl:1080
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for applying."
+msgstr ""
+"Jeśli łatka stosuje się gładko, zmieniony skrawek zostanie natychmiast\n"
+"oznaczony do zastosowania."
+
+#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
+#: git-add--interactive.perl:1077
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for discarding."
+msgstr ""
+"Jeśli łatka stosuje się gładko, zmieniony skrawek zostanie natychmiast\n"
+"oznaczony do odrzucenia."
+
+#: git-add--interactive.perl:1114
+#, perl-format
+msgid "failed to open hunk edit file for writing: %s"
+msgstr "nie można otworzyć do zapisu pliku edycji skrawka: %s"
+
+#: git-add--interactive.perl:1121
+#, 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"
+"Aby usunąć wiersze „%s”, oznacz je jako wiersze „ ” lines (kontekst).\n"
+"Aby usunąć wiersze „%s”, usuń je.\n"
+"Wiersze zaczynające się od %s zostaną usunięte.\n"
+
+#: git-add--interactive.perl:1143
+#, perl-format
+msgid "failed to open hunk edit file for reading: %s"
+msgstr "nie można otworzyć do odczytu pliku edycji skrawka: %s"
+
+#: git-add--interactive.perl:1251
+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 - przygotuj ten skrawek\n"
+"n - nie przygotowuj tego skrawka\n"
+"q - wyjdź; nie przygotowuj tego skrawka, ani żadnych kolejnych\n"
+"a - przygotuj ten skrawek i wszystkie kolejne w tym pliku\n"
+"d - nie przygotowuj tego skrawka ani żadnych kolejnych w tym pliku"
+
+#: git-add--interactive.perl:1257
+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 - dodaj ten skrawek do schowka\n"
+"n - nie dodawaj tego skrawka do schowka\n"
+"q - wyjdź; nie dodawaj tego skrawka, ani żadnych kolejnych\n"
+"a - dodaj ten skrawek i wszystkie kolejne w tym pliku\n"
+"d - nie dodawaj tego skrawka ani żadnych kolejnych w tym pliku"
+
+#: git-add--interactive.perl:1263
+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 - wycofaj ten skrawek\n"
+"n - nie wycofuj tego skrawka\n"
+"q - wyjdź; nie wycofuj tego skrawka, ani żadnych kolejnych\n"
+"a - wycofaj ten skrawek i wszystkie kolejne w tym pliku\n"
+"d - nie wycofuj tego skrawka ani żadnych kolejnych w tym pliku"
+
+#: git-add--interactive.perl:1269
+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 - zastosuj ten skrawek do indeksu\n"
+"n - nie stosuj tego skrawka do indeksu\n"
+"q - wyjdź; nie stosuj tego skrawka, ani żadnych kolejnych\n"
+"a - zastosuj ten skrawek i wszystkie kolejne w tym pliku\n"
+"d - nie stosuj tego skrawka ani żadnych kolejnych w tym pliku"
+
+#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
+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 - odrzuć ten skrawek z drzewa roboczego\n"
+"n - nie odrzucaj tego skrawka z drzewa roboczego\n"
+"q - wyjdź; nie odrzucaj tego skrawka, ani żadnych pozostałych\n"
+"a - odrzuć ten skrawek i wszystkie kolejne w tym pliku\n"
+"d - nie odrzucaj tego skrawka ani żadnych kolejnych w tym pliku"
+
+#: git-add--interactive.perl:1281
+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 - odrzuć ten skrawek z indeksu i drzewa roboczego\n"
+"n - nie odrzucaj tego skrawka z indeksu i drzewa roboczego\n"
+"q - wyjdź; nie odrzucaj tego skrawka, ani żadnych pozostałych\n"
+"a - odrzuć ten skrawek i wszystkie kolejne w tym pliku\n"
+"d - nie odrzucaj tego skrawka ani żadnych kolejnych w tym pliku"
+
+#: git-add--interactive.perl:1287
+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 - zastosuj ten skrawek do indeksu i drzewa roboczego\n"
+"n - nie stosuj tego skrawka do indeksu i drzewa roboczego\n"
+"q - wyjdź; nie stosuj tego skrawka, ani żadnych kolejnych\n"
+"a - zastosuj ten skrawek i wszystkie kolejne w tym pliku\n"
+"d - nie stosuj tego skrawka ani żadnych kolejnych w tym pliku"
+
+#: git-add--interactive.perl:1299
+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 - zastosuj ten skrawek do drzewa roboczego\n"
+"n - nie stosuj tego skrawka do drzewa roboczego\n"
+"q - wyjdź; nie stosuj tego skrawka, ani żadnych kolejnych\n"
+"a - zastosuj ten skrawek i wszystkie kolejne w tym pliku\n"
+"d - nie stosuj tego skrawka ani żadnych kolejnych w tym pliku"
+
+#: git-add--interactive.perl:1314
+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 - wybierz skrawek, to którego przejść\n"
+"/ - wyszukaj skrawek pasujący do podanego wyrażenia regularnego\n"
+"j - pozostaw ten skrawek nierozstrzygniętym, zobacz następny "
+"nierozstrzygnięty skrawek\n"
+"J - pozostaw ten skrawek nierozstrzygniętym, zobacz następny skrawek\n"
+"k - pozostaw ten skrawek nierozstrzygniętym, zobacz poprzedni "
+"nierozstrzygnięty skrawek\n"
+"K - pozostaw ten skrawek nierozstrzygniętym, zobacz poprzedni skrawek\n"
+"s - podziel ten skrawek na mniejsze\n"
+"e - ręcznie zmień bieżący skrawek\n"
+"? - wypisz pomoc\n"
+
+#: git-add--interactive.perl:1345
+msgid "The selected hunks do not apply to the index!\n"
+msgstr "Wybrane skrawki nie stosują się do indeksu!\n"
+
+#: git-add--interactive.perl:1360
+#, perl-format
+msgid "ignoring unmerged: %s\n"
+msgstr "pomijanie niescalonego: %s\n"
+
+#: git-add--interactive.perl:1479
+#, perl-format
+msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
+msgstr "Zastosować zmianę trybu do drzewa roboczego [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1480
+#, perl-format
+msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
+msgstr "Zastosować usunięcie do drzewa roboczego [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1481
+#, perl-format
+msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
+msgstr "Zastosować dodanie do drzewa roboczego [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1482
+#, perl-format
+msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
+msgstr "Zastosować ten skrawek do drzewa roboczego [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1599
+msgid "No other hunks to goto\n"
+msgstr "Nie ma innych skrawków do przejścia\n"
+
+#: git-add--interactive.perl:1617
+#, perl-format
+msgid "Invalid number: '%s'\n"
+msgstr "Nieprawidłowa liczba: „%s”\n"
+
+#: git-add--interactive.perl:1622
+#, perl-format
+msgid "Sorry, only %d hunk available.\n"
+msgid_plural "Sorry, only %d hunks available.\n"
+msgstr[0] "Niestety dostępny jest tylko %d skrawek.\n"
+msgstr[1] "Niestety dostępne są tylko %d skrawki.\n"
+msgstr[2] "Niestety dostępnych jest tylko %d skrawków.\n"
+
+#: git-add--interactive.perl:1657
+msgid "No other hunks to search\n"
+msgstr "Nie ma innych skrawków do wyszukania\n"
+
+#: git-add--interactive.perl:1674
+#, perl-format
+msgid "Malformed search regexp %s: %s\n"
+msgstr "Nieprawidłowe wyrażenie regularne %s: %s\n"
+
+#: git-add--interactive.perl:1684
+msgid "No hunk matches the given pattern\n"
+msgstr "Żaden skrawek nie pasuje do podanego wzorca\n"
+
+#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
+msgid "No previous hunk\n"
+msgstr "Nie ma poprzedniego skrawka\n"
+
+#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
+msgid "No next hunk\n"
+msgstr "Nie ma następnego skrawka\n"
+
+#: git-add--interactive.perl:1730
+msgid "Sorry, cannot split this hunk\n"
+msgstr "Niestety nie można podzielić tego skrawka\n"
+
+#: git-add--interactive.perl:1736
+#, perl-format
+msgid "Split into %d hunk.\n"
+msgid_plural "Split into %d hunks.\n"
+msgstr[0] "Podzielono na %d skrawek.\n"
+msgstr[1] "Podzielono na %d skrawki.\n"
+msgstr[2] "Podzielono na %d skrawków.\n"
+
+#: git-add--interactive.perl:1746
+msgid "Sorry, cannot edit this hunk\n"
+msgstr "Niestety nie można zmienić tego skrawka\n"
+
+#. TRANSLATORS: please do not translate the command names
+#. 'status', 'update', 'revert', etc.
+#: git-add--interactive.perl:1811
+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 - pokaż ścieżki ze zmianami\n"
+"update - dodaj stan drzewa roboczego do przygotowanego zestawu zmian\n"
+"revert - przywróć przygotowany zestaw zmian z powrotem do wersji "
+"HEAD\n"
+"patch - wybierz skrawki i zaktualizuj wybiórczo\n"
+"diff - pokaż różnice między HEAD i indeksem\n"
+"add untracked - dodaj zawartość nieśledzonych plików do przygotowanego "
+"zestawu zmian\n"
+
+#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
+#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
+#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
+#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
+msgid "missing --"
+msgstr "brakujące --"
+
+#: git-add--interactive.perl:1866
+#, perl-format
+msgid "unknown --patch mode: %s"
+msgstr "nieznany tryb --patch: %s"
+
+#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
+#, perl-format
+msgid "invalid argument %s, expecting --"
+msgstr "nieprawidłowy argument %s, oczekiwano --"
+
+#: git-send-email.perl:138
+msgid "local zone differs from GMT by a non-minute interval\n"
+msgstr "lokalna strefa różni się od GMT o odstęp niepodzielny przez minutę\n"
+
+#: git-send-email.perl:145 git-send-email.perl:151
+msgid "local time offset greater than or equal to 24 hours\n"
+msgstr "przesunięcie czasu lokalnego większe lub równe 24 godzin\n"
+
+#: git-send-email.perl:223 git-send-email.perl:229
+msgid "the editor exited uncleanly, aborting everything"
+msgstr "edytor nie wyszedł gładko, przerywanie wszystkiego"
+
+#: git-send-email.perl:312
+#, perl-format
+msgid ""
+"'%s' contains an intermediate version of the email you were composing.\n"
+msgstr "„%s” zawiera pośrednią wersję listu e-mail, który pisałeś/-aś.\n"
+
+#: git-send-email.perl:317
+#, perl-format
+msgid "'%s.final' contains the composed email.\n"
+msgstr "„%s.final” zawiera napisany list e-mail.\n"
+
+#: git-send-email.perl:410
+msgid "--dump-aliases incompatible with other options\n"
+msgstr "--dump-aliases i inne opcje się wykluczają\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 ""
+"błąd krytyczny: znaleziono opcje konfiguracji do „sendmail”\n"
+"git-send-email jest skonfigurowany z opcjami sendemail.* — uwaga na „e”.\n"
+"Ustaw sendemail.forbidSendmailVariables na false, aby wyłączyć to "
+"sprawdzenie.\n"
+
+#: git-send-email.perl:489 git-send-email.perl:691
+msgid "Cannot run git format-patch from outside a repository\n"
+msgstr "Nie można wykonać git format-patch poza repozytorium\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” i „relogin” muszą być podane razem (z wiersza poleceń lub opcji "
+"konfiguracji)\n"
+
+#: git-send-email.perl:505
+#, perl-format
+msgid "Unknown --suppress-cc field: '%s'\n"
+msgstr "Nieznane pole --suppress-cc: „%s”\n"
+
+#: git-send-email.perl:536
+#, perl-format
+msgid "Unknown --confirm setting: '%s'\n"
+msgstr "Nieznane ustawienie --confirm: „%s”\n"
+
+#: git-send-email.perl:564
+#, perl-format
+msgid "warning: sendmail alias with quotes is not supported: %s\n"
+msgstr "ostrzeżenie: skrót sendmaila z cudzysłowami niewspierany: %s\n"
+
+#: git-send-email.perl:566
+#, perl-format
+msgid "warning: `:include:` not supported: %s\n"
+msgstr "ostrzeżenie: „:include:” niewspierane: %s\n"
+
+#: git-send-email.perl:568
+#, perl-format
+msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
+msgstr "ostrzeżenie: przekierowania „/plik” i „|potok” niewspierane: %s\n"
+
+#: git-send-email.perl:573
+#, perl-format
+msgid "warning: sendmail line is not recognized: %s\n"
+msgstr "ostrzeżenie: nie rozpoznano wiersza sendmaila: %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 ""
+"Plik „%s” istnieje, ale to mógłby być też zakres zapisów,\n"
+"do wytworzenia łatek. Ujednoznacznij...\n"
+"\n"
+" * mówiąc „./%s” jeśli masz na myśli plik; lub\n"
+" * podając opcję --format-patch jeśli masz na myśli zakres.\n"
+
+#: git-send-email.perl:678
+#, perl-format
+msgid "Failed to opendir %s: %s"
+msgstr "Nie można wykonać opendir na %s: %s"
+
+#: git-send-email.perl:702
+#, perl-format
+msgid ""
+"fatal: %s: %s\n"
+"warning: no patches were sent\n"
+msgstr ""
+"błąd krytyczny: %s: %s\n"
+"ostrzeżenie: nie wysłano żadnych łatek\n"
+
+#: git-send-email.perl:713
+msgid ""
+"\n"
+"No patch files specified!\n"
+"\n"
+msgstr ""
+"\n"
+"Nie podano plików łatek!\n"
+"\n"
+
+#: git-send-email.perl:726
+#, perl-format
+msgid "No subject line in %s?"
+msgstr "Brak wiersza tematu w %s?"
+
+#: git-send-email.perl:736
+#, perl-format
+msgid "Failed to open for writing %s: %s"
+msgstr "Nie można otworzyć %s do zapisu: %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 ""
+"Wiersze zaczynające się od „GIT:” zostaną usunięte.\n"
+"Rozważ uwzględnienie ogólnych statystyk różnic lub spisu treści\n"
+"w łatce, którą piszesz.\n"
+"\n"
+"Wyczyść zawartość treści, jeśli chcesz wysłać podsumowanie.\n"
+
+#: git-send-email.perl:771
+#, perl-format
+msgid "Failed to open %s: %s"
+msgstr "Nie można otworzyć %s: %s"
+
+#: git-send-email.perl:788
+#, perl-format
+msgid "Failed to open %s.final: %s"
+msgstr "Nie można otworzyć %s.final: %s"
+
+#: git-send-email.perl:831
+msgid "Summary email is empty, skipping it\n"
+msgstr "Podsumowanie listu e-mail jest puste, pomijanie\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 "Czy na pewno użyć <%s> [y/N]? "
+
+#: git-send-email.perl:921
+msgid ""
+"The following files are 8bit, but do not declare a Content-Transfer-"
+"Encoding.\n"
+msgstr ""
+"Następujące pliki są ośmiobitowe, ale nie deklarują kodowania Content-"
+"Transfer-Encoding.\n"
+
+#: git-send-email.perl:926
+msgid "Which 8bit encoding should I declare [UTF-8]? "
+msgstr "Jakie ośmiobitowe kodowanie zadeklarować [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 ""
+"Odmawiam wysłania, bo łatka\n"
+"\t%s\n"
+"ma temat z szablonu „*** SUBJECT HERE ***”. Przekaż --force, jeśli naprawdę "
+"chcesz to wysłać.\n"
+
+#: git-send-email.perl:953
+msgid "To whom should the emails be sent (if anyone)?"
+msgstr "Do kogo mają być wysłane listy e-mail (jeśli w ogóle)?"
+
+#: git-send-email.perl:971
+#, perl-format
+msgid "fatal: alias '%s' expands to itself\n"
+msgstr "błąd krytyczny: skrót „%s” rozwija się do siebie samego\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 do użycia w In-Reply-To w pierwszym liście e-mail (jeśli w "
+"ogóle)? "
+
+#: git-send-email.perl:1041 git-send-email.perl:1049
+#, perl-format
+msgid "error: unable to extract a valid address from: %s\n"
+msgstr "błąd: nie można wydobyć prawidłowego adresu z: %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 "Co zrobić z tym adresem? (wyjdź [q] | porzuć [d] | [e]dytuj): "
+
+#: git-send-email.perl:1370
+#, perl-format
+msgid "CA path \"%s\" does not exist"
+msgstr "ścieżka CA „%s” nie istnieje"
+
+#: 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 ""
+" Lista DW powyżej została poszerzona o dodatkowe\n"
+" adresy znalezione w komunikacie zapisu łatki. Domyślnie\n"
+" send-email pyta przed wysłaniem, kiedy to się dzieje.\n"
+" To zachowanie jest sterowane przez ustawienie\n"
+" sendemail.confirm.\n"
+"\n"
+" Więcej informacji w „git send-email --help”.\n"
+" Aby zachować obecne zachowanie, ale uciszyć ten komunikat,\n"
+" wykonaj „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:1468
+msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
+msgstr ""
+"Wysłać ten list e-mail? (tak [y]|[n]ie|[e]dytuj|wyjdź [q]|wszystkie [a]):"
+
+#: git-send-email.perl:1471
+msgid "Send this email reply required"
+msgstr "Wyślij ten list e-mail z wymaganą odpowiedzią"
+
+#: git-send-email.perl:1499
+msgid "The required SMTP server is not properly defined."
+msgstr "Wymagany serwer SMTP nie jest prawidłowo zdefiniowany."
+
+#: git-send-email.perl:1546
+#, perl-format
+msgid "Server does not support STARTTLS! %s"
+msgstr "Serwer nie wspiera STARTTLS! %s"
+
+#: git-send-email.perl:1551 git-send-email.perl:1555
+#, perl-format
+msgid "STARTTLS failed! %s"
+msgstr "nie można wykonać STARTTLS! %s"
+
+#: git-send-email.perl:1564
+msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
+msgstr ""
+"Nie można prawidłowo zainicjować SMTP. Sprawdź konfigurację i użyj --smtp-"
+"debug."
+
+#: git-send-email.perl:1582
+#, perl-format
+msgid "Failed to send %s\n"
+msgstr "Nie można wysłać %s\n"
+
+#: git-send-email.perl:1585
+#, perl-format
+msgid "Dry-Sent %s\n"
+msgstr "Wysłano na sucho %s\n"
+
+#: git-send-email.perl:1585
+#, perl-format
+msgid "Sent %s\n"
+msgstr "Wysłano %s\n"
+
+#: git-send-email.perl:1587
+msgid "Dry-OK. Log says:\n"
+msgstr "OK na sucho. Dziennik mówi:\n"
+
+#: git-send-email.perl:1587
+msgid "OK. Log says:\n"
+msgstr "OK. Dziennik mówi:\n"
+
+#: git-send-email.perl:1599
+msgid "Result: "
+msgstr "Wynik:"
+
+#: git-send-email.perl:1602
+msgid "Result: OK\n"
+msgstr "Wynik: OK\n"
+
+#: git-send-email.perl:1620
+#, perl-format
+msgid "can't open file %s"
+msgstr "nie można otworzyć pliku %s"
+
+#: git-send-email.perl:1667 git-send-email.perl:1687
+#, perl-format
+msgid "(mbox) Adding cc: %s from line '%s'\n"
+msgstr "(mbox) Dodawanie DW: %s z wiersza „%s”\n"
+
+#: git-send-email.perl:1673
+#, perl-format
+msgid "(mbox) Adding to: %s from line '%s'\n"
+msgstr "(mbox) Dodawanie Do: %s z wiersza „%s”\n"
+
+#: git-send-email.perl:1730
+#, perl-format
+msgid "(non-mbox) Adding cc: %s from line '%s'\n"
+msgstr "(nie mbox) Dodawanie DW: %s z wiersza „%s”\n"
+
+#: git-send-email.perl:1765
+#, perl-format
+msgid "(body) Adding cc: %s from line '%s'\n"
+msgstr "(treść) Dodawanie DW: %s z wiersza „%s”\n"
+
+#: git-send-email.perl:1876
+#, perl-format
+msgid "(%s) Could not execute '%s'"
+msgstr "(%s) Nie można wykonać „%s”"
+
+#: git-send-email.perl:1883
+#, perl-format
+msgid "(%s) Adding %s: %s from: '%s'\n"
+msgstr "(%s) Dodawanie %s: %s z: „%s”\n"
+
+#: git-send-email.perl:1887
+#, perl-format
+msgid "(%s) failed to close pipe to '%s'"
+msgstr "(%s) nie można zamknąć potoku do „%s”"
+
+#: git-send-email.perl:1917
+msgid "cannot send message as 7bit"
+msgstr "nie można wysłać wiadomości jako siedmiobitowej"
+
+#: git-send-email.perl:1925
+msgid "invalid transfer encoding"
+msgstr "nieprawidłowe kodowanie przesyłu"
+
+#: 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 "nie można otworzyć %s: %s\n"
+
+#: git-send-email.perl:1969
+#, perl-format
+msgid "%s: patch contains a line longer than 998 characters"
+msgstr "%s: łatka zawiera wiersz dłuższy niż 998 znaków"
+
+#: git-send-email.perl:1986
+#, perl-format
+msgid "Skipping %s with backup suffix '%s'.\n"
+msgstr "Pomijanie %s z zapasowym sufiksem „%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 "Czy na pewno wysłać %s? [y | N]: "
+
+#~ msgid "rev-list died"
+#~ msgstr "rev-list padło"
+
+#~ msgid ""
+#~ "git bisect--helper --bisect-write [--no-log] <state> <revision> "
+#~ "<good_term> <bad_term>"
+#~ msgstr ""
+#~ "git bisect--helper --bisect-write [--no-log] <stan> <rewizja> "
+#~ "<dobre_określenie> <złe_określenie>"
+
+#~ msgid ""
+#~ "git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
+#~ "<bad_term>"
+#~ msgstr ""
+#~ "git bisect--helper --bisect-check-and-set-terms <polecenie> "
+#~ "<dobre_określenie> <złe_określenie>"
+
+#~ msgid "git bisect--helper --bisect-auto-next"
+#~ msgstr "git bisect--helper --bisect-auto-next"
+
+#~ msgid "write out the bisection state in BISECT_LOG"
+#~ msgstr "wypisz stan przeszukiwania w BISECT_LOG"
+
+#~ msgid "check and set terms in a bisection state"
+#~ msgstr "sprawdź i ustaw określenia w stanie przeszukiwania"
+
+#~ msgid ""
+#~ "verify the next bisection state then checkout the next bisection commit"
+#~ msgstr ""
+#~ "sprawdź kolejny stan przeszukiwania, i wtedy wybierz kolejny zapis do "
+#~ "przeszukiwania"
+
+#~ msgid "--bisect-write requires either 4 or 5 arguments"
+#~ msgstr "--bisect-write wymaga 4 albo 5 argumentów"
+
+#~ msgid "--check-and-set-terms requires 3 arguments"
+#~ msgstr "--check-and-set-terms wymaga 3 argumentów"
+
+#~ msgid "--bisect-auto-next requires 0 arguments"
+#~ msgstr "--bisect-auto-next wymaga braku argumentów"
+
+#~ msgid "Force progress reporting"
+#~ msgstr "Wymuś zgłaszanie postępu"
+
+#, c-format
+#~ msgid "Error deleting remote-tracking branch '%s'"
+#~ msgstr "Błąd usuwania śledzącej gałęzi „%s”"
+
+#, c-format
+#~ msgid "Error deleting branch '%s'"
+#~ msgstr "Błąd usuwania gałęzi „%s”"
+
+#~ msgid "show parse tree for grep expression"
+#~ msgstr "pokaż drzewo przetwarzania w wyrażeniu grepa"
+
+#~ msgid "too many parameters"
+#~ msgstr "zbyt wiele parametrów"
+
+#~ msgid "too few parameters"
+#~ msgstr "zbyt mało argumentów"
+
+#~ msgid "Recurse into nested submodules"
+#~ msgstr "Schodź do zagnieżdżonych pod-modułów"
+
+#~ msgid "too many params"
+#~ msgstr "zbyt wiele parametrów"
+
+#, sh-format
+#~ msgid "Bad rev input: $arg"
+#~ msgstr "Błędne wejście rev: $arg"
+
+#~ msgid "Counting distinct commits in commit graph"
+#~ msgstr "Zliczanie rozróżnialnych zapisów w grafie zapisów"
+
+#, c-format
+#~ msgid "the commit graph format cannot write %d commits"
+#~ msgstr "format grafu zapisów nie może wypisać %d zapisów"
+
+#~ msgid "Or you can abort the rebase with 'git rebase --abort'."
+#~ msgstr "Możesz też przerwać przestawianie przez „git rebase --abort”."
+
+#~ msgid ""
+#~ "Warning: the command isn't recognized in the following line:\n"
+#~ " - $line"
+#~ msgstr ""
+#~ "Ostrzeżenie: komenda nie jest rozpoznawana w poniższym wierszu:\n"
+#~ " - $line"
+
+#~ msgid ""
+#~ "Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
+#~ " - $line"
+#~ msgstr ""
+#~ "Ostrzeżenie: brak skrótu SHA-1 lub nie jest zapisem w następującym "
+#~ "wierszu:\n"
+#~ " - $line"
+
+#~ msgid "See git-${cmd}(1) for details."
+#~ msgstr "Zobacz git-${cmd}(1) aby uzyskać szczegółowe informacje."
+
+#~ msgid ""
+#~ " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
+#~ msgstr ""
+#~ " Ostrzeżenie: $display_name nie zawiera zapisów $sha1_src ani $sha1_dst"
+
+#~ msgid " Warn: $display_name doesn't contain commit $sha1_dst"
+#~ msgstr " Ostrzeżenie: $display_name nie zawiera zapisu $sha1_dst"
+
+#~ msgid " Warn: $display_name doesn't contain commit $sha1_src"
+#~ msgstr " Ostrzeżenie: $display_name nie zawiera zapisu $sha1_src"
+
+#~ msgid "The --cached option cannot be used with the --files option"
+#~ msgstr "Opcja --cached nie może być użyta z opcją --files"
+
+#~ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
+#~ msgstr "Podmoduł „$name” ($url) wyrejestrowany ze ścieżki „$displaypath”"
+
+#~ msgid "pathspec and --all are incompatible"
+#~ msgstr "ścieżka i --all się wykluczają"
+
+#~ msgid "Stopping at '$displaypath'; script returned non-zero status."
+#~ msgstr "Przerwano na „$displaypath”; skrypt zwrócił niezerowy kod."
+
+#~ msgid "Entering '$displaypath'"
+#~ msgstr "Otwieranie „$displaypath”"
+
+#~ 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 ""
+#~ "Poniższa ścieżka jest ignorowana przez jeden z plików .gitignore:\n"
+#~ "$sm_path\n"
+#~ "Użyj -f jeśli na pewno chcesz ją dodać."
+
+#~ msgid "(To restore them type \"git stash apply\")"
+#~ msgstr "(Aby je przywrócić, użyj „git stash apply”)"
+
+#~ msgid "Cannot unstage modified files"
+#~ msgstr "Nie można wycofać zmienionych plików"
+
+#~ msgid "$reference is not a valid reference"
+#~ msgstr "$reference nie jest prawidłową referencją"
+
+#~ msgid "unknown option: $opt"
+#~ msgstr "nieznana opcja: $opt"
+
+#~ msgid ""
+#~ "error: unknown option for 'stash save': $option\n"
+#~ " To provide a message, use git stash save -- '$option'"
+#~ msgstr ""
+#~ "błąd: nieznana opcja „stash save”: $option\n"
+#~ " Aby podać komunikat, użyj git stash save -- „$option”"
+
+#~ msgid "Cannot remove temporary index (can't happen)"
+#~ msgstr "Nie można usunąć tymczasowego indeksu (nie może się to zdarzyć)"
+
+#~ msgid "Fast-forwarded $branch_name to $onto_name."
+#~ msgstr "Przewinięto $branch_name do $onto_name."
+
+#~ msgid "fatal: no such branch: $branch_name"
+#~ msgstr "błąd krytyczny: brak gałęzi $branch_name"
+
+#~ msgid "$onto_name: there is no merge base"
+#~ msgstr "$onto_name: brak podstawy scalenia"
+
+#~ msgid "$onto_name: there are more than one merge bases"
+#~ msgstr "$onto_name: jest wiele podstaw scalenia"
+
+#~ msgid "invalid upstream $upstream_name"
+#~ msgstr "nieprawidłowa gałąź nadrzędna $upstream_name"
+
+#~ msgid "'$invalid' is not a valid commit"
+#~ msgstr "„$invalid” nie jest prawidłowym zapisem"
+
+#~ msgid "Bad rev input: $bisected_head"
+#~ msgstr "Błędne wejście rev: $bisected_head"
+
+#~ msgid "unrecognised option: '$arg'"
+#~ msgstr "nierozpoznana opcja: „$arg”"
+
+#~ msgid "Removing worktrees/%s: invalid gitdir file"
+#~ msgstr "Usuwanie drzew roboczych/%s: nieprawidłowy plik gitdir"
+
+#~ msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
+#~ msgstr "Usuwanie drzew roboczych/%s: nie można przeczytać pliku gitdir (%s)"
+
+#~ msgid "Removing worktrees/%s: not a valid directory"
+#~ msgstr "Usuwanie drzew roboczych/%s: nie jest prawidłowym katalogiem"
+
+#~ msgid "tag header too big."
+#~ msgstr "Zbyt duży nagłówek tagu."
+
+#~ msgid "tag name too long: %.*s..."
+#~ msgstr "zbyt długa nazwa tagu: %.*s..."
+
+#~ msgid "submodule--helper subcommand must be called with a subcommand"
+#~ msgstr "pod-polecenie submodule--helper musi być wywołane z pod-poleceniem"
+
+#~ msgid "w[,i1[,i2]]"
+#~ msgstr "w[,i1[,i2]]"
+
+#~ msgid ""
+#~ "\n"
+#~ "(use 'rm -rf' if you really want to remove it including all of its "
+#~ "history)"
+#~ msgstr ""
+#~ "\n"
+#~ "(użyj „rm -rf” jeśli na pewno chcesz je usunąć wraz z całą jego historią)"
+
+#~ msgid ""
+#~ "the following submodule (or one of its nested submodules)\n"
+#~ "uses a .git directory:"
+#~ msgid_plural ""
+#~ "the following submodules (or one of their nested submodules)\n"
+#~ "use a .git directory:"
+#~ msgstr[0] ""
+#~ "następujący pod-moduł (lub jeden z jego zagnieżdżonych pod-modułów)\n"
+#~ "używa katalogu .git:"
+#~ msgstr[1] ""
+#~ "następujące pod-moduły (lub jeden z jego zagnieżdżonych pod-modułów)\n"
+#~ "używają katalogu .git:"
+#~ msgstr[2] ""
+#~ "następujące pod-moduły (lub jeden z jego zagnieżdżonych pod-modułów)\n"
+#~ "używają katalogu .git:"
+
+#~ msgid "push|fetch"
+#~ msgstr "push|fetch"
+
+#~ msgid "--[no-]autostash option is only valid with --rebase."
+#~ msgstr "--[no-]autostash ma sens tylko z --rebase."
+
+#~ msgid "print only names (no SHA-1)"
+#~ msgstr "wypisz same nazwy (bez SHA-1)"
+
+#~ msgid "git merge [<options>] <msg> HEAD <commit>"
+#~ msgstr "git merge [<opcje>] <komunikat> HEAD <zapis>"
+
+#~ msgid "standard output, or directory, which one?"
+#~ msgstr "standardowe wyjście, lub katalog — które?"
+
+#~ msgid "name of output directory is too long"
+#~ msgstr "nazwa wyjściowego katalogu jest za długa"
+
+#~ msgid "Process line range n,m in file, counting from 1"
+#~ msgstr "Przetwórz zakres wierszy n,m w pliku, licząc od 1"
+
+#~ msgid "Error in object"
+#~ msgstr "Błąd w obiekcie"
+
+#~ msgid "Everyday Git With 20 Commands Or So"
+#~ msgstr "Codzienny Git w 20 poleceniach dla opornych"
+
+#~ msgid "insanely long object directory %.*s"
+#~ msgstr "szalenie długi katalog obiektów %.*s"
+
+#~ msgid "Don't know how to fetch from %s"
+#~ msgstr "Nie wiem, jak pobrać z %s"
+
+#~ msgid "default mode for recursion"
+#~ msgstr "domyślny tryb rekurencji"
+
+#~ msgid "annotated tag %s has no embedded name"
+#~ msgstr "opisany tag %s nie ma wbudowanej nazwy"
+
+#~ msgid "default"
+#~ msgstr "default"
+
+#~ msgid "Explicit paths specified without -i or -o; assuming --only paths..."
+#~ msgstr "Podane jawne ścieżki bez -i czy -o; zakładanie --only..."
+
+#~ msgid "Clever... amending the last one with dirty index."
+#~ msgstr "Sprytnie... poprawianie ostatniego z brudnym indeksem."
+
+#~ 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 ""
+#~ "Jeśli chcesz pominąć ten zapis, użyj:\n"
+#~ "\n"
+#~ " git reset\n"
+#~ "\n"
+#~ "Wtedy „git cherry-pick --continue” wznowi dobieranie\n"
+#~ "pozostałych zapisów.\n"
+
+#~ msgid "failed to stat %s\n"
+#~ msgstr "nie można wykonać stat na %s\n"
+
+#~ 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 ""
+#~ "Nie można jednocześnie zaktualizować ścieżek i przełączyć na gałąź „%s”.\n"
+#~ "Czy chodziło o wybranie „%s”, którego nie można rozwiązać jako zapis?"
+
+#~ msgid ""
+#~ "\n"
+#~ "If you wanted to make '%s' track '%s', do this:\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Jeśli chcesz, żeby „%s” śledziło „%s”, wykonaj to:\n"
+#~ "\n"
+
+#~ msgid "it does not make sense to create 'HEAD' manually"
+#~ msgstr "nie ma sensu ręcznie tworzyć „HEAD”"
+
+#~ msgid "change upstream info"
+#~ msgstr "zmień gałąź nadrzędną"
+
+#~ msgid " **** invalid ref ****"
+#~ msgstr " **** nieprawidłowa referencja ****"
+
+#~ msgid "[%s: ahead %d, behind %d]"
+#~ msgstr "[%s: do przodu %d, w tyle %d]"
+
+#~ msgid "[%s: ahead %d]"
+#~ msgstr "[%s: do przodu %d]"
+
+#~ msgid "[%s: behind %d]"
+#~ msgstr "[%s: w tyle za %d]"
+
+#~ msgid "[%s: gone]"
+#~ msgstr "[%s: brak]"
+
+#~ msgid "n,m"
+#~ msgstr "n,m"
+
+#~ msgid "Use an experimental blank-line-based heuristic to improve diffs"
+#~ msgstr ""
+#~ "Użyj eksperymentalnej heurystyki opartej o puste wiersze, aby poprawić "
+#~ "różnice"
+
+#~ msgid "Use an experimental indent-based heuristic to improve diffs"
+#~ msgstr ""
+#~ "Użyj eksperymentalnej heurystyki opartej o wcięcia, aby poprawić różnice"
+
+#~ msgid "update BISECT_HEAD instead of checking out the current commit"
+#~ msgstr "zaktualizuj BISECT_HEAD zamiast wybierania bieżącego zapisu"
+
+#~ msgid "perform 'git bisect next'"
+#~ msgstr "wykonaj „git bisect next”"
+
+#~ msgid ""
+#~ "You still have unmerged paths in your index.\n"
+#~ "Did you forget to use 'git add'?"
+#~ msgstr ""
+#~ "Nadal są w indeksie niescalone ścieżki.\n"
+#~ "Czyżby zabrakło „git add”?"
+
+#~ msgid "The copy of the patch that failed is found in: %s"
+#~ msgstr "Kopia łatki, która się nie powiodła, znajduje się w: %s"
+
+#~ msgid "cannot be interactive without stdin connected to a terminal."
+#~ msgstr ""
+#~ "nie można wykonać interaktywnie bez stdin podłączonego do terminala."
+
+#~ msgid "Patch is empty. Was it split wrong?"
+#~ msgstr "Łatka jest pusta. Czy została źle podzielona?"
+
+#~ msgid "Use -f if you really want to add them.\n"
+#~ msgstr "Użyj -f jeżeli na pewno chcesz je dodać.\n"
+
+#~ msgid "(+/-)x"
+#~ msgstr "(+/-)x"
+
+#~ msgid "Initial commit on "
+#~ msgstr "Pierwszy zapis na "
+
+#~ msgid "git fetch-pack: expected ACK/NAK, got EOF"
+#~ msgstr "git fetch-pack: oczekiwano ACK/NAK, dostałem EOF"
+
+#~ msgid "Server supports multi_ack_detailed"
+#~ msgstr "Serwer wspiera multi_ack_detailed"
+
+#~ msgid "Server supports no-done"
+#~ msgstr "Serwer wspiera no-done"
+
+#~ msgid "Server supports multi_ack"
+#~ msgstr "Serwer wspiera multi_ack"
+
+#~ msgid "Server supports side-band-64k"
+#~ msgstr "Serwer wspiera side-band-64k"
+
+#~ msgid "Server supports allow-tip-sha1-in-want"
+#~ msgstr "Serwer wspiera allow-tip-sha1-in-want"
+
+#~ msgid "Server supports allow-reachable-sha1-in-want"
+#~ msgstr "Serwer wspiera allow-reachable-sha1-in-want"
+
+#~ msgid "in %0.1f seconds automatically..."
+#~ msgstr "za %0.1f sekundy automatycznie..."
+
+#~ msgid "Renaming %s to %s and %s to %s instead"
+#~ msgstr "Zamiast tego zmiana nazwy z %s na %s i z %s na %s"
+
+#~ msgid ""
+#~ "empty strings as pathspecs will be made invalid in upcoming releases. "
+#~ "please use . instead if you meant to match all paths"
+#~ msgstr ""
+#~ "puste łańcuchy jako ścieżki będą uznane za niepoprawne w przyszłych "
+#~ "wydaniach. użyj zamiast tego . jeśli chodzi o wszystkie ścieżki"
+
+#~ msgid ""
+#~ "There is nothing to exclude from by :(exclude) patterns.\n"
+#~ "Perhaps you forgot to add either ':/' or '.' ?"
+#~ msgstr ""
+#~ "Nie ma z czego wyłączać w wzorcach :(exclude).\n"
+#~ "Może brakuje „:/” albo „.”?"
+
+#~ msgid "unrecognized format: %%(%s)"
+#~ msgstr "nierozpoznany format: %%(%s)"
+
+#~ msgid "ref '%s' does not have %ld components to :strip"
+#~ msgstr "referencja „%s” nie ma %ld komponentów do odcięcia :strip="
+
+#~ msgid "Internal error"
+#~ msgstr "Wewnętrzny błąd"
+
+#~ msgid "dup2(%d,%d) failed"
+#~ msgstr "dup2(%d,%d) nie powiodło się"
+
+#~ msgid "mainline was specified but commit %s is not a merge."
+#~ msgstr "podano główny nurt, ale zapis %s nie jest scaleniem."
+
+#~ msgid ""
+#~ "Cannot update sparse checkout: the following entries are not up-to-date:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nie można zaktualizować rzadkiego wybrania: następujące elementy nie są "
+#~ "aktualne:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "The following working tree files would be overwritten by sparse checkout "
+#~ "update:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Rzadkie wybranie nadpisałoby następujące pliki drzewa roboczego:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "The following working tree files would be removed by sparse checkout "
+#~ "update:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Aktualizacja rzadkiego wybrania usunęłaby następujące pliki drzewa "
+#~ "roboczego:\n"
+#~ "%s"
+
+#~ msgid "could not close %s"
+#~ msgstr "nie można zamknąć %s"
+
+#~ msgid "store only"
+#~ msgstr "bez kompresji"
+
+#~ msgid "compress faster"
+#~ msgstr "szybsza kompresja"
+
+#~ msgid "compress better"
+#~ msgstr "lepsza kompresja"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 8a2d55a..c76a5fa 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -1,189 +1,1092 @@
-# Portuguese translations for Git package.
-# Copyright (C) 2012 Marco Sousa <marcomsousa AT gmail.com>
-# Copyright (C) 2016 Vasco Almeida <vascomalmeida@sapo.pt>
+# Portugual's Portuguese translations for Git package.
+# Copyright (C) 2020 Daniel Santos <hello@brighterdan.com>
# This file is distributed under the same license as the Git package.
# Contributors:
-# - Marco Sousa <marcomsousa AT gmail.com>
-# Vasco Almeida <vascomalmeida@sapo.pt>, 2016, 2017.
+# - Daniel Santos <hello@brighterdan.com>
+# Past Contributors:
+# - Marco Sousa <marcomsousa AT gmail.com>
+# - Vasco Almeida <vascomalmeida@sapo.pt>, 2016, 2017.
+#
+# Git glossary for Portuguese translators
+#
+# English | Portuguese
+# ---------------------------------+--------------------------------------
+# 3-way merge | junção-de-3
+# abbreviate |
+# alternate object database |
+# amend |
+# ancestor |
+# annotated tag |
+# bare repository |
+# bisect |
+# blob object |
+# bloom filter |
+# branch | ramo
+# bundle |
+# bypass |
+# cache | index
+# chain |
+# changeset |
+# checkout |
+# checksum |
+# cherry-picking |
+# clean |
+# clone |
+# commit | memorizar
+# commit message | mensagem de memória
+# commit object | objeto da memória
+# commit-ish (also committish) | mnemónica
+# conflict | conflito
+# core Git |
+# cover letter |
+# DAG |
+# dangling object | DAG
+# detached HEAD | HEAD solta
+# directory | pasta
+# dirty |
+# dumb HTTP protocol |
+# evil merge |
+# fast-forward |
+# fetch |
+# file system |
+# fork |
+# Git archive |
+# gitfile |
+# grafts |
+# hash |
+# HEAD | HEAD
+# head |
+# head ref |
+# header | início
+# hook |
+# hunk | pedaço
+# index |
+# index entry |
+# loose object |
+# loose refs |
+# master |
+# merge | junção
+# object |
+# object database |
+# object identifier |
+# object name |
+# object type |
+# octopus |
+# origin |
+# pack |
+# pack index |
+# packfile |
+# parent |
+# patch |
+# pathspec |
+# pattern |
+# pickaxe |
+# plumbing |
+# porcelain |
+# precious-objects repo |
+# prune |
+# pull | agarrar
+# push | atirar
+# reachable |
+# rebase |
+# ref |
+# reflog |
+# refspec |
+# remote |
+# remote-tracking branch |
+# replay |
+# repo | repo
+# repository | repositório
+# resolve |
+# revert | reverter
+# revision | revisão
+# rewind |
+# SCM |
+# SHA-1 | SHA-1
+# shallow repository |
+# signed tag |
+# smart HTTP protocol |
+# squash |
+# stage |
+# stash | arrumos
+# submodule |
+# symref |
+# tag |
+# tag object |
+# tagger |
+# topic branch |
+# track |
+# trailer |
+# tree |
+# tree object |
+# tree-ish (also treeish) |
+# unmerged index |
+# unpack |
+# unreachable object |
+# unstage |
+# upstream | upstream
+# upstream branch | ramo upstream
+# working tree |
+#
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"
-"PO-Revision-Date: 2017-05-01 21:17+0000\n"
-"Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
-"Language-Team: Portuguese\n"
-"Language: pt\n"
+"POT-Creation-Date: 2020-12-15 16:27+0800\n"
+"PO-Revision-Date: 2020-10-14 11:43+0100\n"
+"Last-Translator: Daniel Santos <hello@brighterdan.com>\n"
+"Language-Team: Git L10N Português <https://github.com/git-l10n-pt-PT/>\n"
+"Language: pt-PT\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"
-"X-Generator: Virtaal 0.7.1\n"
-#: advice.c:55
+#: add-interactive.c:376
+#, fuzzy, c-format
+msgid "Huh (%s)?"
+msgstr "O quê (%s)?"
+
+#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3284
+#: sequencer.c:3735 sequencer.c:3890 builtin/rebase.c:1532
+#: builtin/rebase.c:1955
+msgid "could not read index"
+msgstr "incapaz de ler index"
+
+#: add-interactive.c:584 git-add--interactive.perl:269
+#: git-add--interactive.perl:294
+msgid "binary"
+msgstr "binário"
+
+#: add-interactive.c:642 git-add--interactive.perl:278
+#: git-add--interactive.perl:332
+msgid "nothing"
+msgstr "nada"
+
+#: add-interactive.c:643 git-add--interactive.perl:314
+#: git-add--interactive.perl:329
+msgid "unchanged"
+msgstr "inalterado"
+
+#: add-interactive.c:680 git-add--interactive.perl:641
+msgid "Update"
+msgstr "Atualizar"
+
+#: add-interactive.c:697 add-interactive.c:885
+#, fuzzy, c-format
+msgid "could not stage '%s'"
+msgstr "inacapaz de stage '%s'"
+
+#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3478
+#, fuzzy
+msgid "could not write index"
+msgstr "incapaz de escrever index"
+
+#: add-interactive.c:706 git-add--interactive.perl:626
+#, c-format, perl-format
+msgid "updated %d path\n"
+msgid_plural "updated %d paths\n"
+msgstr[0] "actualizou %d path\n"
+msgstr[1] "actualizou %d paths\n"
+
+#: add-interactive.c:724 git-add--interactive.perl:676
+#, c-format, perl-format
+msgid "note: %s is untracked now.\n"
+msgstr "nota: %s agora está untracked.\n"
+
+#: add-interactive.c:729 apply.c:4127 builtin/checkout.c:295
+#: builtin/reset.c:145
#, c-format
-msgid "hint: %.*s\n"
-msgstr "dica: %.*s\n"
+msgid "make_cache_entry failed for path '%s'"
+msgstr "make_cache_entry falhou para path '%s'"
-#: advice.c:83
-msgid "Cherry-picking is not possible because you have unmerged files."
+#: add-interactive.c:759 git-add--interactive.perl:653
+msgid "Revert"
+msgstr "Reverter"
+
+#: add-interactive.c:775
+#, fuzzy
+msgid "Could not parse HEAD^{tree}"
+msgstr "Incapaz de parse HEAD^{tree}"
+
+#: add-interactive.c:813 git-add--interactive.perl:629
+#, c-format, perl-format
+msgid "reverted %d path\n"
+msgid_plural "reverted %d paths\n"
+msgstr[0] "reverti %d path\n"
+msgstr[1] "reverti %d paths\n"
+
+#: add-interactive.c:864 git-add--interactive.perl:693
+#, c-format
+msgid "No untracked files.\n"
+msgstr "Nenhuns ficheiros untracked.\n"
+
+#: add-interactive.c:868 git-add--interactive.perl:687
+msgid "Add untracked"
+msgstr "Adiciona untracked"
+
+#: add-interactive.c:895 git-add--interactive.perl:623
+#, c-format, perl-format
+msgid "added %d path\n"
+msgid_plural "added %d paths\n"
+msgstr[0] "adicionei %d path\n"
+msgstr[1] "adicionei %d paths\n"
+
+#: add-interactive.c:925
+#, fuzzy, c-format
+msgid "ignoring unmerged: %s"
+msgstr "ignorando unmerged: %s"
+
+#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369
+#, c-format
+msgid "Only binary files changed.\n"
+msgstr "Apenas ficheiros binários mudaram.\n"
+
+#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371
+#, c-format
+msgid "No changes.\n"
+msgstr "Sem modificação.\n"
+
+#: add-interactive.c:943 git-add--interactive.perl:1379
+msgid "Patch update"
+msgstr "Atualizar patch"
+
+#: add-interactive.c:982 git-add--interactive.perl:1792
+msgid "Review diff"
+msgstr "Rever diff"
+
+#: add-interactive.c:1010
+#, fuzzy
+msgid "show paths with changes"
+msgstr "mostrar paths modificados"
+
+#: add-interactive.c:1012
+msgid "add working tree state to the staged set of changes"
+msgstr "adicionar estado de working tree para conjunto das modificações staged"
+
+#: add-interactive.c:1014
+msgid "revert staged set of changes back to the HEAD version"
+msgstr "reverter conjunto das modificações staged de volta para a versão HEAD"
+
+#: add-interactive.c:1016
+#, fuzzy
+msgid "pick hunks and update selectively"
+msgstr "apanha os pedaços e atualiza selectivamente"
+
+#: add-interactive.c:1018
+#, fuzzy
+msgid "view diff between HEAD and index"
+msgstr "ver diff entre HEAD e índex"
+
+#: add-interactive.c:1020
+msgid "add contents of untracked files to the staged set of changes"
msgstr ""
-"Não é possível efetuar cherry-pick porque tem ficheiros não integrados."
+"adiciona conteúdo de ficheiros untracked para conjunto das modificações "
+"staged"
-#: advice.c:85
+#: add-interactive.c:1028 add-interactive.c:1077
+msgid "Prompt help:"
+msgstr "Prompt ajuda:"
+
+#: add-interactive.c:1030
+#, fuzzy
+msgid "select a single item"
+msgstr "seleciona um único item"
+
+#: add-interactive.c:1032
+#, fuzzy
+msgid "select a range of items"
+msgstr "seleciona um conjunto de items"
+
+#: add-interactive.c:1034
+#, fuzzy
+msgid "select multiple ranges"
+msgstr "seleciona múltiplos conjuntos"
+
+#: add-interactive.c:1036 add-interactive.c:1081
+msgid "select item based on unique prefix"
+msgstr "seleciona item tendo base o prefixo único"
+
+#: add-interactive.c:1038
+#, fuzzy
+msgid "unselect specified items"
+msgstr "tira a seleção de items especificados"
+
+#: add-interactive.c:1040
+msgid "choose all items"
+msgstr "escolhe todos items"
+
+#: add-interactive.c:1042
+msgid "(empty) finish selecting"
+msgstr "(vazio) acaba de selecionar"
+
+#: add-interactive.c:1079
+msgid "select a numbered item"
+msgstr "seleciona item numerado"
+
+#: add-interactive.c:1083
+msgid "(empty) select nothing"
+msgstr "(vazio) seleciona nada"
+
+#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
+msgid "*** Commands ***"
+msgstr "*** Comandos ***"
+
+#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
+msgid "What now"
+msgstr "E agora"
+
+#: add-interactive.c:1144 git-add--interactive.perl:213
+msgid "staged"
+msgstr "staged"
+
+#: add-interactive.c:1144 git-add--interactive.perl:213
+msgid "unstaged"
+msgstr "unstaged"
+
+#: add-interactive.c:1144 apply.c:4989 apply.c:4992 builtin/am.c:2257
+#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124
+#: builtin/fetch.c:147 builtin/merge.c:284 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 "path"
+
+#: add-interactive.c:1151
+#, fuzzy
+msgid "could not refresh index"
+msgstr "incapaz de reactualizar o index"
+
+#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803
+#, c-format
+msgid "Bye.\n"
+msgstr "Adeus.\n"
+
+#: add-patch.c:34 git-add--interactive.perl:1431
+#, fuzzy, c-format, perl-format
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
+msgstr "Stage modo de modificação [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:35 git-add--interactive.perl:1432
+#, fuzzy, c-format, perl-format
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
+msgstr "Eliminação stage [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:36 git-add--interactive.perl:1433
+#, fuzzy, c-format, perl-format
+msgid "Stage addition [y,n,q,a,d%s,?]? "
+msgstr "Adição stage [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:37 git-add--interactive.perl:1434
+#, fuzzy, c-format, perl-format
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Stage este pedaço [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 submete-se corretamente, o pedaço editado será marcado para stage "
+"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 - stage este pedaço\n"
+"n - o stage deste pedaço será retirado\n"
+"q - sair; retirar de stage este pedaço e qualquer um dos que permaneçam\n"
+"a - stage este pedaço e qualquer próximo pedaço neste ficheiro\n"
+"d - retirar o stage deste pedaço e qualquer próximo pedaço neste ficheiro\n"
+
+#: add-patch.c:56 git-add--interactive.perl:1437
+#, fuzzy, c-format, perl-format
+msgid "Stash mode change [y,n,q,a,d%s,?]? "
+msgstr "Esconder modo de modificação [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:57 git-add--interactive.perl:1438
+#, fuzzy, c-format, perl-format
+msgid "Stash deletion [y,n,q,a,d%s,?]? "
+msgstr "Eliminação da arrumação [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:58 git-add--interactive.perl:1439
+#, fuzzy, c-format, perl-format
+msgid "Stash addition [y,n,q,a,d%s,?]? "
+msgstr "Adição da arrumação [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:59 git-add--interactive.perl:1440
+#, fuzzy, c-format, perl-format
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
+msgstr "Esconde este pedaço [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 submete-se corretamente, o pedaço editado será marcado para "
+"arrumação 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 - arrumar este pedaço\n"
+"n - mostrar este pedaço\n"
+"q - sair; mostrar este pedaço e qualquer outro restante\n"
+"a - arrumar este pedaço e qualquer próximo deste ficheiro\n"
+"d - mostrar este pedaço e qualquer próximo deste ficheiro\n"
+
+#: add-patch.c:80 git-add--interactive.perl:1443
+#, fuzzy, c-format, perl-format
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
+msgstr "Unstage modo de modificação [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:81 git-add--interactive.perl:1444
+#, fuzzy, c-format, perl-format
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
+msgstr "Eliminação do unstage [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:82 git-add--interactive.perl:1445
+#, fuzzy, c-format, perl-format
+msgid "Unstage addition [y,n,q,a,d%s,?]? "
+msgstr "Adição do unstage [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:83 git-add--interactive.perl:1446
+#, fuzzy, c-format, perl-format
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Unstage este pedaço [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 patch submete-se corretamente, o pedaço editado será imediatamente "
+"marcado para unstage."
+
+#: 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 - unstage este pedaço\n"
+"n - o unstage deste pedaço será retirado\n"
+"q - sair; retirar de unstage este pedaço e qualquer outro restante\n"
+"a - unstage este pedaço e todos próximos pedaços deste ficheiro\n"
+"d - retirar este pedaço da arrumação e qualquer próximo pedaço deste "
+"ficheiro\n"
+
+#: add-patch.c:103 git-add--interactive.perl:1449
+#, fuzzy, c-format, perl-format
+msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
+msgstr "Submeter modo de modificação para index [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:104 git-add--interactive.perl:1450
+#, fuzzy, c-format, perl-format
+msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
+msgstr "Submeter eliminação para index [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:105 git-add--interactive.perl:1451
+#, fuzzy, c-format, perl-format
+msgid "Apply addition to index [y,n,q,a,d%s,?]? "
+msgstr "Submeter adição para index [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:106 git-add--interactive.perl:1452
+#, fuzzy, c-format, perl-format
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
+msgstr "Submeter este pedaço para index [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 aplica-se corretamente, o pedaço editado será marcado para a "
+"submissão 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 - submeter este pedaço para index\n"
+"n - declinar este pedaço para index\n"
+"q - sair; declinar este pedaço e qualquer outro restante\n"
+"a - submeter este pedaço e qualquer próximo deste ficheiro\n"
+"d - declinar este pedaço e qualquer próximo deste ficheiro\n"
+
+#: add-patch.c:126 git-add--interactive.perl:1455
+#: git-add--interactive.perl:1473
+#, fuzzy, c-format, perl-format
+msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
+msgstr "Descartar modo de modificação da worktree [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:127 git-add--interactive.perl:1456
+#: git-add--interactive.perl:1474
+#, fuzzy, c-format, perl-format
+msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
+msgstr "Descartar eliminação da worktree [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:128 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
+#, fuzzy, c-format, perl-format
+msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
+msgstr "Descartar adição da worktree [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:129 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
+#, fuzzy, c-format, perl-format
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
+msgstr "Descartar este pedaço da worktree [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 aplica-se corretamente, o pedaço editado será marcado 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 pedaço de worktree\n"
+"n - aceitar este pedaço de worktree\n"
+"q - sair; aceitar este pedaço e qualquer outro restante\n"
+"a - descartar este pedaço e qualquer próximo deste ficheiro\n"
+"d - aceitar este pedaço e qualquer próximo deste ficheiro\n"
+
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#, fuzzy, c-format, perl-format
+msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Descartar modo de modficação de index e worktree [y,n,q,a,d%s,?]?"
+
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
+#, fuzzy, c-format, perl-format
+msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Descartar eliminação de index e worktree [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#, fuzzy, c-format, perl-format
+msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Descartar adição de index e worktree [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
+#, fuzzy, c-format, perl-format
+msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Descartar este pedaço de index e worktree [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 pedaço de index e worktree\n"
+"n - aceitar este pedaço de index e worktree\n"
+"q - sair; aceitar este pedaço e qualquer outro restante\n"
+"a - descartar este pedaço e qualquer próximo deste ficheiro\n"
+"d - aceitar este pedaço e qualquer próximo deste ficheiro\n"
+
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
+#, fuzzy, c-format, perl-format
+msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Submeter modo de modificação para index e worktree [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
+#, fuzzy, c-format, perl-format
+msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Submeter eliminação para index e worktree [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#, fuzzy, c-format, perl-format
+msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Submeter adição para index e worktree [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
+#, fuzzy, c-format, perl-format
+msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Submeter este pedaço para index e worktree [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 - submeter este pedaço para index e worktree\n"
+"n - declinar este pedaço para index e worktree\n"
+"q - sair; declinar este pedaço e qualquer outro restante\n"
+"a - submeter este pedaço e qualquer próximo deste ficheiro\n"
+"d - declinar este pedaço e qualquer próximo deste ficheiro\n"
+
+#: 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 - submeter este pedaço para worktree\n"
+"n - declinar este pedaço para worktree\n"
+"q - sair; declinar este pedaço e qualquer outro restantes\n"
+"a - submeter este pedaço e qualquer próximo deste ficheiro\n"
+"d - declinar este pedaço e qualquer próximo deste ficheiro\n"
+
+#: add-patch.c:342
+#, fuzzy, c-format
+msgid "could not parse hunk header '%.*s'"
+msgstr "incapaz de analisar ínicio de pedaço '%s'"
+
+#: add-patch.c:361 add-patch.c:365
+#, fuzzy, c-format
+msgid "could not parse colored hunk header '%.*s'"
+msgstr "incapaz de analizar início de pedaço colorido '%.*s'"
+
+#: add-patch.c:419
+#, fuzzy
+msgid "could not parse diff"
+msgstr "incapaz de analisar diff"
+
+#: add-patch.c:438
+#, fuzzy
+msgid "could not parse colored diff"
+msgstr "incapaz de analisar diff colorido"
+
+#: add-patch.c:452
+#, fuzzy, c-format
+msgid "failed to run '%s'"
+msgstr "falha ao executar '%s'"
+
+#: add-patch.c:611
+msgid "mismatched output from interactive.diffFilter"
+msgstr "sem match de output de interactive.diffFilter"
+
+#: add-patch.c:612
+msgid ""
+"Your filter must maintain a one-to-one correspondence\n"
+"between its input and output lines."
+msgstr ""
+"O teu filtro tem de manter uma correspondência exata\n"
+"entre seu input e linhas output."
+
+#: add-patch.c:790
+#, fuzzy, c-format
+msgid ""
+"expected context line #%d in\n"
+"%.*s"
+msgstr ""
+"linha de contexto esperada #%d em\n"
+"%.*s"
+
+#: add-patch.c:805
+#, c-format
+msgid ""
+"hunks do not overlap:\n"
+"%.*s\n"
+"\tdoes not end with:\n"
+"%.*s"
+msgstr ""
+"pedaços sem overlap:\n"
+"%.*s\n"
+"\ttermina sem:\n"
+"%.*s"
+
+#: add-patch.c:1081 git-add--interactive.perl:1115
+msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
+msgstr "Modo de edição manual de pedaço -- ver final para guia rápido.\n"
+
+#: add-patch.c:1085
+#, 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 '%c' linhas, torna-as linhas ' ' (contexto).\n"
+"Para remover '%c' linhas, elimina-as.\n"
+"Linhas começadas com %c serão removidas.\n"
+
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
+#: add-patch.c:1099 git-add--interactive.perl:1129
+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 falha na submissão correta, ser-lhe-á dada nova oportunidade para\n"
+"editar. Se todas as linhas deste pedaço forem removidas, então a edição\n"
+"é abortada e este pedaço é deixado inalterado.\n"
+
+#: add-patch.c:1132
+#, fuzzy
+msgid "could not parse hunk header"
+msgstr "incapaz interpretar início de pedaço"
+
+#: add-patch.c:1177
+msgid "'git apply --cached' failed"
+msgstr "'git apply --cached' falhou"
+
+#. 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:1246 git-add--interactive.perl:1242
+msgid ""
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+msgstr ""
+"Problema na submissão de pedaço editado. Editar de novo (responder \"não\" descarta!) "
+"[y/n]? "
+
+#: add-patch.c:1289
+#, fuzzy
+msgid "The selected hunks do not apply to the index!"
+msgstr "Submissão incorreta de pedaços selecionados para index!"
+
+#: add-patch.c:1290 git-add--interactive.perl:1346
+msgid "Apply them to the worktree anyway? "
+msgstr "Submetê-los para worktree mesmo assim? "
+
+#: add-patch.c:1297 git-add--interactive.perl:1349
+msgid "Nothing was applied.\n"
+msgstr "Nada foi submetido.\n"
+
+#: add-patch.c:1354
+#, 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 ""
+"j - deixar este pedaço indecidido, ver próximo pedaço indecidido\n"
+"J - deixar este pedaço indecidido, ver próximo pedaço\n"
+"k - deixar este pedaço indecidido, ver pedaço indecidido anterior\n"
+"K - deixar este pedaço indecidido, ver pedaço anterior\n"
+"g - selecionar próximo pedaço\n"
+"/ - procurar por pedaço correspondendo à regex\n"
+"s - dividir o pedaço atual em pedaços mais pequenos\n"
+"e - editar manualmente o pedaço atual\n"
+"? - mostrar ajuda\n"
+
+#: add-patch.c:1516 add-patch.c:1526
+#, fuzzy
+msgid "No previous hunk"
+msgstr "Sem pedaço anterior"
+
+#: add-patch.c:1521 add-patch.c:1531
+#, fuzzy
+msgid "No next hunk"
+msgstr "Sem próximo pedaço"
+
+#: add-patch.c:1537
+msgid "No other hunks to goto"
+msgstr "Sem qualquer outro pedaço"
+
+#: add-patch.c:1548 git-add--interactive.perl:1606
+msgid "go to which hunk (<ret> to see more)? "
+msgstr "ir para qual pedaço (<ret> para ver mais)? "
+
+#: add-patch.c:1549 git-add--interactive.perl:1608
+msgid "go to which hunk? "
+msgstr "ir para qual pedaço? "
+
+#: add-patch.c:1560
+#, fuzzy, c-format
+msgid "Invalid number: '%s'"
+msgstr "Número inválido: '%s'"
+
+#: add-patch.c:1565
+#, fuzzy, c-format
+msgid "Sorry, only %d hunk available."
+msgid_plural "Sorry, only %d hunks available."
+msgstr[0] "Lamento, apenas %d pedaço disponível."
+msgstr[1] "Lamento, apenas %d pedaços disponíveis."
+
+#: add-patch.c:1574
+msgid "No other hunks to search"
+msgstr "Sem outro pedaço a procurar"
+
+#: add-patch.c:1580 git-add--interactive.perl:1661
+msgid "search for regex? "
+msgstr "procurar por regex? "
+
+#: add-patch.c:1595
+#, fuzzy, c-format
+msgid "Malformed search regexp %s: %s"
+msgstr "Pesquisa regexp deformada %s: %s"
+
+#: add-patch.c:1612
+#, fuzzy
+msgid "No hunk matches the given pattern"
+msgstr "Sem pedaço correspondente ao padrão fornecido"
+
+#: add-patch.c:1619
+msgid "Sorry, cannot split this hunk"
+msgstr "Lamento, incapaz de dividir este pedaço"
+
+#: add-patch.c:1623
+#, fuzzy, c-format
+msgid "Split into %d hunks."
+msgstr "Dividir em %d pedaços."
+
+#: add-patch.c:1627
+msgid "Sorry, cannot edit this hunk"
+msgstr "Lamento, incapaz de editar este pedaço"
+
+#: add-patch.c:1679
+#, fuzzy
+msgid "'git apply' failed"
+msgstr "'git apply' falhou"
+
+#: advice.c:143
+#, c-format
+msgid ""
+"\n"
+"Disable this message with \"git config advice.%s false\""
+msgstr ""
+"\n"
+"Desative este mensagem com \"git config advice.%s false\""
+
+#: advice.c:159
+#, fuzzy, c-format
+msgid "%shint: %.*s%s\n"
+msgstr "%sdica: %.*s%s\n"
+
+#: advice.c:250
+msgid "Cherry-picking is not possible because you have unmerged files."
+msgstr "Cherry-picking é impossível porque tem ficheiros em separado."
+
+#: advice.c:252
msgid "Committing is not possible because you have unmerged files."
-msgstr "Não é possível submeter porque tem ficheiros não integrados."
+msgstr "Cometer é impossível porque tem ficheiros em separado."
-#: advice.c:87
+#: advice.c:254
msgid "Merging is not possible because you have unmerged files."
-msgstr "Não é possível integrar porque tem ficheiros não integrados."
+msgstr "Juntar é impossível porque tem ficheiros em separado."
-#: advice.c:89
+#: advice.c:256
msgid "Pulling is not possible because you have unmerged files."
-msgstr "Não é possível puxar porque tem ficheiros não integrados."
+msgstr "Puxar é impossível porque tem ficheiros em separado."
-#: advice.c:91
+#: advice.c:258
msgid "Reverting is not possible because you have unmerged files."
-msgstr "Não é possível reverte porque tem ficheiros não integrados."
+msgstr "Reverter é impossível porque tem ficheiros em separado."
-#: advice.c:93
+#: advice.c:260
#, 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."
+msgstr "É impossível fazer %s porque tem ficheiros em separado."
-#: advice.c:101
+#: advice.c:268
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 ""
-"Corrija-os na árvore de trabalho e use 'git add/rm <ficheiro>'\n"
-"conforme apropriado para marcá-los como resolvidos e submeta."
+"Corrija-os em worktree, e use 'git add/rm <ficheiro>' apropriadamente\n"
+"para marcar resolução e fazer uma memória."
-#: advice.c:109
+#: advice.c:276
msgid "Exiting because of an unresolved conflict."
-msgstr "A terminar devido a conflito não resolvido."
+msgstr "Saindo devido a conflito por resolver."
-#: advice.c:114 builtin/merge.c:1185
+#: advice.c:281 builtin/merge.c:1369
msgid "You have not concluded your merge (MERGE_HEAD exists)."
-msgstr "Não concluído a integração (MERGE_HEAD presente)."
+msgstr "O teu juntar ficou por concluír (MERGE_HEAD presente)."
-#: advice.c:116
+#: advice.c:283
msgid "Please, commit your changes before merging."
-msgstr "Submeta as suas alterações antes de integrar."
+msgstr "Por favor, memoriza as tuas modificações antes de juntar."
-#: advice.c:117
+#: advice.c:284
msgid "Exiting because of unfinished merge."
-msgstr "A terminar devido a integração incompleta."
+msgstr "Saindo devido a juntar inacabado."
-#: advice.c:123
-#, c-format
+#: advice.c:290
+#, 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 checkout -b <new-branch-name>\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 ""
-"Nota: a extrair '%s'.\n"
+"Nota: trocando para '%s'.\n"
"\n"
-"Encontra-se em estado 'HEAD destacada'. Pode inspecionar, fazer alterações\n"
-"experimentais e submetê-las e pode descartar qualquer commit que faça neste\n"
-"estado sem interferir outro ramo se extrair outro ramo.\n"
+"Está em 'HEAD solta'. Podes olhar, fazer mudanças experimentais e\n"
+"memorizá-las, e, neste estado, podes descartar qualquer memória que faças\n"
+"sem interferir em qualquer ramo fazendo um switch de ramos.\n"
"\n"
-"Se deseja criar um novo ramo para reter os commits que criou, pode fazê-lo\n"
-"(agora ou mais tarde) usando -b com o comando checkout outra vez. Exemplo:\n"
+"Se queres criar um novo ramo para reter as memórias que criaste, podes\n"
+"fazer (agora ou mais tarde) usando -c com o comando switch. Exemplo:\n"
"\n"
-" git checkout -b <novo-nome-ramo>\n"
+" git switch -c <novo-nome-de-branch>\n"
+"\n"
+"Ou desfazer esta operação com:\n"
+"\n"
+" git switch -\n"
+"\n"
+"Desliga este conselho pondo a variável de config advice.detachedHead em"
+"false\n"
"\n"
-#: apply.c:57
+#: alias.c:50
+#, fuzzy
+msgid "cmdline ends with \\"
+msgstr "cmdline termina com \\"
+
+#: alias.c:51
+msgid "unclosed quote"
+msgstr "aspa aberta"
+
+#: apply.c:69
#, c-format
msgid "unrecognized whitespace option '%s'"
-msgstr "opção de espaço em branco não reconhecida '%s'"
+msgstr "opção de whitespace desconhecida '%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'"
+msgstr "opção de ignorar whitespace desconhecida '%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."
+msgstr "--reject e --3way só podem ser usados separadamente."
-#: apply.c:127
+#: apply.c:137
msgid "--cached and --3way cannot be used together."
-msgstr "--cached e --3way não podem ser usados juntos."
+msgstr "--cached e --3way só podem ser usados separadamente."
-#: 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"
+msgstr "Incapaz preparar timestamp de regexp %s"
-#: apply.c:854
+#: apply.c:810
#, c-format
msgid "regexec returned %d for input: %s"
-msgstr "regexec retornou %d para a entra: %s"
+msgstr "regexec devolveu %d para input: %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"
+msgstr "incapaz de encontrar o nome do ficheiro no patch da 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 "
+msgstr "git apply: git-diff incorreto - esperava /dev/null, tive %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"
+msgstr "git apply: git-diff incorreto - novo nome de ficheiro inconsistente "
+"na linha %d"
-#: 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"
+msgstr "git apply: git-diff incorreto - antigo nome de ficheiro inconsistente "
+"na linha %d"
-#: 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"
+msgstr "git apply: git-diff incorreto - esperava /dev/null na linha %d"
-#: apply.c:1488
+#: apply.c:963
+#, fuzzy, c-format
+msgid "invalid mode on line %d: %s"
+msgstr "modo inválido na linha %d: %s"
+
+#: apply.c:1282
#, c-format
-msgid "recount: unexpected line: %.*s"
-msgstr "recontagem: linha inesperada: %.*s"
+msgid "inconsistent header lines %d and %d"
+msgstr "linhas de cabeçalho %d e %d inconsistentes"
-#: apply.c:1557
-#, c-format
-msgid "patch fragment without header at line %d: %.*s"
-msgstr "fragmento de patch sem cabeçalho na linha %d: %.*s"
-
-#: apply.c:1577
+#: apply.c:1372
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -192,663 +1095,758 @@
"git diff header lacks filename information when removing %d leading pathname "
"components (line %d)"
msgstr[0] ""
-"o cabeçalho do git diff não revelou o nome do ficheiro depois de se remover "
-"%d componente do caminho (linha %d)"
+"cabeçalho do git diff falta informação de nome de ficheiro quando removendo"
+"%d componente do pathname (linha %d)"
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)"
+"cabeçalho do git diff falta informação de nome de ficheiro quando removendo "
+"%d componentes do pathname (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)"
+msgstr "cabeçalho do git diff falta informação de nome de 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"
+msgstr "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"
+msgstr "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"
+msgstr "patch roto 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"
+msgstr "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"
+msgstr "ficheiro apagado %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"
+msgstr "** aviso: ficheiro %s fica vazio e mantêm-se"
-#: 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"
+msgstr "patch binário roto 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"
+msgstr "patch binário irreconhecível 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"
+msgstr "patch com apenas lixo 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"
+msgstr "incapaz de ler 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"
+msgstr "incapaz de 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)."
+msgstr[0] "Pedaço #%d apareceu em %d (%d offset de linha)."
+msgstr[1] "Pedaço #%d apareceu em %d (%d offset de linhas)."
-#: 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"
+msgstr "Contexto reduzido a (%ld/%ld) para submeter fragmento em %d"
-#: apply.c:3059
+#: apply.c:3075
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
-"ao procura por:\n"
+"procurando 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'"
+msgstr "faltando patch binário para '%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"
+msgstr "incapaz submeter-inversamente patch binário sem pedaço "
+"inverso a '%s'"
-#: 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"
+msgstr "incapaz submeter patch binário a '%s' sem a linha completa de index"
-#: 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
-#, 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"
+"o patch submete-se a '%s' (%s), que corresponde a conteúdo actual nenhum."
#: apply.c:3171
#, 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'"
+msgid "the patch applies to an empty '%s' but it is not empty"
+msgstr "o patch submete-se a um '%s' vazio mas tem conteúdo"
-#: apply.c:3184
+#: apply.c:3189
+#, c-format
+msgid "the necessary postimage %s for '%s' cannot be read"
+msgstr "incapaz ler a postimage necessária %s para '%s'"
+
+#: 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'"
+msgstr "path binário submete-se a '%s' de maneira nenhuma"
-#: 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)"
+msgstr "patch binário para '%s' cria resultado incorreto (esperei %s, "
+"recebi %s)"
-#: apply.c:3211
+#: apply.c:3230
#, c-format
msgid "patch failed: %s:%ld"
-msgstr "falha ao aplicar o patch: %s:%ld"
+msgstr "patch falhou: %s:%ld"
-#: apply.c:3333
+#: apply.c:3353
#, c-format
msgid "cannot checkout %s"
-msgstr "não é possível extrair %s"
+msgstr "incapaz de checkout %s"
-#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 setup.c:308
#, c-format
msgid "failed to read %s"
-msgstr "falha ao ler %s"
+msgstr "falha a 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"
+msgstr "lendo '%s' além de 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"
+msgstr "path %s mudou de nome ou foi eliminado"
-#: 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"
+msgstr "%s: tem inexistência no index"
-#: 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"
+msgstr "%s: tem correspondência nenhuma no index"
-#: 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."
+msgstr "repositório falta o blob necessário para recorrer à junção-de-3."
-#: 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:524
#, 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:4720
#, c-format
msgid "Skipped patch '%s'."
msgstr "Patch '%s' ignorado."
-#: apply.c:4667
+#: apply.c:4728
msgid "unrecognized input"
msgstr "entrada não reconhecida"
-#: apply.c:4686
+#: apply.c:4748
msgid "unable to read index file"
msgstr "não foi possível ler o ficheiro de índice"
-#: apply.c:4823
+#: apply.c:4905
#, c-format
msgid "can't open patch '%s': %s"
msgstr "não é possível abrir o patch '%s': %s"
-#: apply.c:4850
+#: apply.c:4932
#, 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:4938 apply.c:4953
#, 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:4946
#, 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:4962 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:4990
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:4993
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:4995 builtin/am.c:2266
msgid "num"
msgstr "num"
-#: apply.c:4918
+#: apply.c:4996
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "remover <num> barras à esquerda dos caminhos de diff tradicional"
-#: apply.c:4921
+#: apply.c:4999
msgid "ignore additions made by the patch"
msgstr "ignorar adições feitas pelo patch"
-#: apply.c:4923
+#: apply.c:5001
msgid "instead of applying the patch, output diffstat for the input"
-msgstr "em vez de aplicar o patch, mostrar o diffstat da entrada"
+msgstr "invés aplicada patch, output diffstat para "
-#: apply.c:4927
+#: apply.c:5005
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:5007
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:5009
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:5011
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:5013
+msgid "mark new files with `git add --intent-to-add`"
+msgstr ""
+
+#: apply.c:5015
msgid "apply a patch without touching the working tree"
msgstr "aplicar um patch sem tocar na árvore de trabalho"
-#: apply.c:4937
+#: apply.c:5017
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:5020
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:5022
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:5024
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:5027 builtin/checkout-index.c:182 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:5029
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:5030 builtin/am.c:2245 builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
+#: builtin/pack-objects.c:3562 builtin/rebase.c:1346
msgid "action"
msgstr "ação"
-#: apply.c:4950
+#: apply.c:5031
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:5034 apply.c:5037
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:5040
msgid "apply the patch in reverse"
msgstr "aplicar o patch em reverso"
-#: apply.c:4961
+#: apply.c:5042
msgid "don't expect at least one line of context"
-msgstr "não esperar nenhuma linha de contexto"
+msgstr "conta com linha de contexto nenhuma"
-#: apply.c:4963
+#: apply.c:5044
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "deixar os excertos rejeitados nos respetivos ficheiros *.rej"
-#: apply.c:4965
+#: apply.c:5046
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:5047 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:2287 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "ser verboso"
-#: apply.c:4968
+#: apply.c:5049
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:5052
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:5054 builtin/am.c:2254
msgid "root"
msgstr "raiz"
-#: apply.c:4974
+#: apply.c:5055
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:450
+#, fuzzy, c-format
+msgid "unable to start '%s' filter"
+msgstr "não foi possível criar '%s'"
+
+#: archive-tar.c:453
+#, fuzzy
+msgid "unable to redirect descriptor"
+msgstr "não foi possível refrescar o índice"
+
+#: archive-tar.c:460
+#, 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:459 sequencer.c:1736 sequencer.c:2886
+#: sequencer.c:3327 sequencer.c:3436 builtin/am.c:249 builtin/commit.c:786
+#: builtin/merge.c:1138
+#, 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"
+msgstr "especificador de path '%s' correspondeu a ficheiro nenhum"
-#: 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:555
msgid "fmt"
msgstr "fmt"
-#: archive.c:417
+#: archive.c:555
msgid "archive format"
msgstr "formato do arquivo"
-#: archive.c:418 builtin/log.c:1436
+#: archive.c:556 builtin/log.c:1765
msgid "prefix"
msgstr "prefixo"
-#: archive.c:419
+#: archive.c:557
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:558 archive.c:561 builtin/blame.c:886 builtin/blame.c:890
+#: builtin/blame.c:891 builtin/commit-tree.c:117 builtin/config.c:135
+#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
+#: builtin/fast-export.c:1214 builtin/grep.c:919 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:559
+#, fuzzy
+msgid "add untracked file to archive"
+msgstr "Modo inválido de ficheiros não controlados '%s'"
+
+#: archive.c:562 builtin/archive.c:90
msgid "write the archive to this file"
msgstr "escrever o arquivo para este ficheiro"
-#: archive.c:423
+#: archive.c:564
msgid "read .gitattributes in working directory"
msgstr "ler .gitattributes do diretório de trabalho"
-#: archive.c:424
+#: archive.c:565
msgid "report archived files on stderr"
msgstr "listar ficheiros arquivados para stderr"
-#: archive.c:425
-msgid "store only"
-msgstr "armazenar apenas"
+#: archive.c:567
+#, fuzzy
+msgid "set compression level"
+msgstr "nível de compactação do pacote"
-#: archive.c:426
-msgid "compress faster"
-msgstr "compressão rápida"
-
-#: archive.c:434
-msgid "compress better"
-msgstr "compressão ótima"
-
-#: archive.c:437
+#: archive.c:570
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:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117
+#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
msgid "repo"
msgstr "repo"
-#: archive.c:440 builtin/archive.c:91
+#: archive.c:573 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:574 builtin/archive.c:93 builtin/difftool.c:714
+#: builtin/notes.c:498
msgid "command"
msgstr "comando"
-#: archive.c:442 builtin/archive.c:93
+#: archive.c:575 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:582
msgid "Unexpected option --remote"
msgstr "Opção inesperada --remote"
-#: archive.c:451
+#: archive.c:584
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:586
msgid "Unexpected option --output"
msgstr "Opção inesperada --output"
-#: archive.c:475
+#: archive.c:588
+#, 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:610
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Formato de arquivo desconhecido '%s'"
-#: archive.c:482
+#: archive.c:619
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argumento não suportado para o formato '%s': -%d"
-#: attr.c:212
+#: attr.c:202
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s não é um nome de atributo válido"
-#: attr.c:408
+#: attr.c:359
+#, fuzzy, c-format
+msgid "%s not allowed: %s:%d"
+msgstr "falha ao aplicar o patch: %s:%ld"
+
+#: attr.c:399
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -856,27 +1854,22 @@
"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:489
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Conteúdo incorretamente citado no ficheiro '%s': %s"
-#: bisect.c:656
+#: bisect.c:699
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Não se está a bissetar mais!\n"
-#: bisect.c:709
+#: bisect.c:766
#, c-format
msgid "Not a valid commit name %s"
msgstr "%s não é um nome de commit válido"
-#: bisect.c:733
+#: bisect.c:791
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -885,7 +1878,7 @@
"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:796
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -894,7 +1887,7 @@
"A base de integração %s é nova (new).\n"
"A propriedade foi mudada entre %s e [%s].\n"
-#: bisect.c:743
+#: bisect.c:801
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -903,7 +1896,7 @@
"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:809
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -914,7 +1907,7 @@
"git bisect não pode funcionar corretamente nesta situação.\n"
"Talvez confundiu revisões %s e %s?\n"
-#: bisect.c:764
+#: bisect.c:822
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -926,36 +1919,36 @@
"%s.\n"
"Continua-se de qualquer maneira."
-#: bisect.c:799
+#: bisect.c:861
#, 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:911
#, 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:941 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:987 builtin/merge.c:152
#, c-format
msgid "could not read file '%s'"
msgstr "não foi possível ler o ficheiro '%s'"
-#: bisect.c:948
+#: bisect.c:1027
msgid "reading bisect refs failed"
msgstr "falha ao ler referências bissetadas"
-#: bisect.c:968
+#: bisect.c:1057
#, 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:1066
#, c-format
msgid ""
"No testable commit found.\n"
@@ -964,22 +1957,60 @@
"Nenhum commit testável encontrado.\n"
"Talvez tenha começado com parâmetros de caminho incorretos?\n"
-#: bisect.c:995
+#: bisect.c:1095
#, 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:1101
#, 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:2777
+msgid "--contents and --reverse do not blend well."
+msgstr "--contents e --reverse não se misturam bem."
+
+#: blame.c:2791
+msgid "cannot use --contents with final commit object name"
+msgstr "não é possível usar --contents com nome de objeto commit final"
+
+#: blame.c:2812
+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:2821 bundle.c:213 ref-filter.c:2272 remote.c:2031 sequencer.c:2138
+#: sequencer.c:4633 submodule.c:855 builtin/commit.c:1045 builtin/log.c:409
+#: builtin/log.c:1023 builtin/log.c:1625 builtin/log.c:2046 builtin/log.c:2336
+#: builtin/merge.c:423 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395
+#: builtin/shortlog.c:267
+msgid "revision walk setup failed"
+msgstr "falha ao configurar percurso de revisões"
+
+#: blame.c:2839
+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:2850
+#, c-format
+msgid "no such path %s in %s"
+msgstr "o caminho %s não existe em %s"
+
+#: blame.c:2861
+#, 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 +2030,43 @@
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 +2078,32 @@
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"
@@ -1088,131 +2119,454 @@
"a montante que já existe no remoto, pode ser necessário\n"
"executar \"git fetch\" para obtê-lo.\n"
"\n"
-"Se pretende publicar um novo ramo local que irá seguir\n"
+"Se pretende atirar um novo ramo local que irá seguir\n"
"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:2390 sequencer.c:3176
+#: 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:209 builtin/log.c:1927 builtin/shortlog.c:408
#, 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:47
+#, 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"
+
+#: commit-graph.c:1042 builtin/am.c:1292
+#, 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:819
+#, 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:2059
+msgid "Merging commit-graph"
+msgstr ""
+
+#: commit-graph.c:2165
+msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
+msgstr ""
+
+#: commit-graph.c:2274
+#, c-format
+msgid "the commit graph format cannot write %d commits"
+msgstr ""
+
+#: commit-graph.c:2285
+#, fuzzy
+msgid "too many commits to write graph"
+msgstr "mostrar apenas commits não presentes no primeiro ramo"
+
+#: commit-graph.c:2378
+msgid "the commit-graph file has incorrect checksum and is likely corrupt"
+msgstr ""
+
+#: commit-graph.c:2388
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr ""
+
+#: commit-graph.c:2398 commit-graph.c:2413
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr ""
+
+#: commit-graph.c:2405
+#, 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:2423
+msgid "Verifying commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:2438
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr ""
+
+#: commit-graph.c:2445
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr ""
+
+#: commit-graph.c:2455
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr ""
+
+#: commit-graph.c:2464
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr ""
+
+#: commit-graph.c:2478
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr ""
+
+#: commit-graph.c:2483
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr ""
+
+#: commit-graph.c:2487
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr ""
+
+#: commit-graph.c:2503
+#, c-format
+msgid "commit-graph generation for commit %s is %u != %u"
+msgstr ""
+
+#: commit-graph.c:2509
+#, c-format
+msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
+msgstr ""
+
+#: commit.c:52 sequencer.c:2879 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2018 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 +2581,317 @@
msgid "memory exhausted"
msgstr "memória esgotada"
-#: config.c:191
-msgid "relative config include conditionals must come from files"
-msgstr "configuração relativa com inclusão condicional deve provir de ficheiros"
+#: 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:701
+#: 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"
+
+#: 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:408 sequencer.c:2580
+#, 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:2473
+#, fuzzy, c-format
+msgid "invalid section name '%s'"
+msgstr "conteúdo inválido: '%s'"
+
+#: config.c:2505
#, c-format
msgid "%s has multiple values"
msgstr "%s tem múltiplos valores"
-#: config.c:2384 config.c:2609
+#: config.c:2534
+#, 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:2786 config.c:3112
+#, fuzzy, c-format
+msgid "could not lock config file %s"
+msgstr "não é possível fechar o ficheiro %s"
+
+#: config.c:2797
+#, fuzzy, c-format
+msgid "opening %s"
+msgstr "A eliminar %s"
+
+#: config.c:2834 builtin/config.c:361
+#, fuzzy, c-format
+msgid "invalid pattern: %s"
+msgstr "opção inválida: %s"
+
+#: config.c:2859
+#, fuzzy, c-format
+msgid "invalid config file %s"
+msgstr "ficheiro inválido: '%s'"
+
+#: config.c:2872 config.c:3125
#, c-format
msgid "fstat on %s failed"
msgstr "falha de fstat de %s"
-#: config.c:2502
+#: config.c:2883
+#, fuzzy, c-format
+msgid "unable to mmap '%s'"
+msgstr "não é possível aceder a '%s'"
+
+#: config.c:2892 config.c:3130
+#, fuzzy, c-format
+msgid "chmod on %s failed"
+msgstr "falha de fstat de %s"
+
+#: config.c:2977 config.c:3227
+#, fuzzy, c-format
+msgid "could not write config file %s"
+msgstr "não é possível ler o ficheiro de log '%s'"
+
+#: config.c:3011
#, 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:3013 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
#, 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:3103
+#, fuzzy, c-format
+msgid "invalid section name: %s"
+msgstr "opção inválida: %s"
+
+#: config.c:3270
+#, 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 +2903,485 @@
"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 "objeto desconhecido '%s' pelo formato em servidor."
+
+#: 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 ""
+"impossível conetar a %s:\n"
+"%s"
+
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+#: connect.c:767 connect.c:844
+#, fuzzy
+msgid "done."
+msgstr "concluído."
+
+#: connect.c:798
+#, fuzzy, c-format
+msgid "unable to look up %s (%s)"
+msgstr "não é possível abrir %s: %s"
+
+#: 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
-#, c-format
-msgid "CRLF would be replaced by LF in %s."
-msgstr "CRLF será substituído por LF em %s."
-
-#: convert.c:211
-#, 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 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:217
#, c-format
msgid "LF would be replaced by CRLF in %s"
msgstr "LF será substituído por CRLF em %s."
-#: date.c:97
+#: 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"
+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:284
+#, c-format
+msgid "BOM is prohibited in '%s' if encoded as %s"
+msgstr ""
+
+#: 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
+#: delta-islands.c:272
+msgid "Propagating island marks"
+msgstr ""
+
+#: 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"
+
+#: delta-islands.c:390
#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "falha ao ler o ficheiro de comando '%s'"
+msgid "island regex from config has too many capture groups (max=%d)"
+msgstr ""
-#: diffcore-rename.c:536
-msgid "Performing inexact rename detection"
-msgstr "Deteção de mudança de nome inexata em curso"
-
-#: diff.c:62
+#: delta-islands.c:467
#, c-format
-msgid "option '%s' requires a value"
-msgstr "a opção '%s' requer um valor"
+msgid "Marked %d islands, done.\n"
+msgstr ""
-#: diff.c:124
+#: diff-lib.c:534
+msgid "--merge-base does not work with ranges"
+msgstr ""
+
+#: diff-lib.c:536
+msgid "--merge-base only works with commits"
+msgstr ""
+
+#: diff-lib.c:553
+#, fuzzy
+msgid "unable to get HEAD"
+msgstr "não foi possível atualizar HEAD"
+
+#: diff-lib.c:560
+msgid "no merge base found"
+msgstr ""
+
+#: diff-lib.c:562
+msgid "multiple merge bases found"
+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 +3390,36 @@
"Erros encontrados na variável de configuração 'diff.dirstat':\n"
"%s"
-#: diff.c:3102
+#: diff.c:4276
#, c-format
msgid "external diff died, stopping at %s"
msgstr "o diff externo terminou inesperadamente, interrompido em %s"
-#: diff.c:3428
+#: diff.c:4625
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:4628
+#, fuzzy
+msgid "-G, -S and --find-object are mutually exclusive"
+msgstr "-b, -B e --detach são mutuamente exclusivos"
+
+#: diff.c:4706
msgid "--follow requires exactly one pathspec"
msgstr "--follow requer exatamente um único especificador de caminho"
-#: diff.c:3681
+#: diff.c:4754
+#, fuzzy, c-format
+msgid "invalid --stat value: %s"
+msgstr "valor de cor inválido: %.*s"
+
+#: diff.c:4759 diff.c:4764 diff.c:4769 diff.c:4774 diff.c:5302
+#: 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:4791
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -1571,276 +3428,1023 @@
"Falha ao analisar parâmetro da opção --dirstat/-X:\n"
"%s"
-#: diff.c:3695
+#: diff.c:4876
#, c-format
-msgid "Failed to parse --submodule option parameter: '%s'"
+msgid "unknown change class '%c' in --diff-filter=%s"
+msgstr ""
+
+#: diff.c:4900
+#, c-format
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr ""
+
+#: diff.c:4914
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "não foi possível criar '%s'"
+
+#: diff.c:4964 diff.c:4970
+#, c-format
+msgid "%s expects <n>/<m> form"
+msgstr ""
+
+#: diff.c:4982
+#, c-format
+msgid "%s expects a character, got '%s'"
+msgstr ""
+
+#: diff.c:5003
+#, fuzzy, c-format
+msgid "bad --color-moved argument: %s"
+msgstr "argumento não reconhecido: %s"
+
+#: diff.c:5022
+#, fuzzy, c-format
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr "objeto inválido '%s' fornecido."
+
+#: diff.c:5062
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+msgstr ""
+
+#: diff.c:5098 diff.c:5118
+#, fuzzy, c-format
+msgid "invalid argument to %s"
+msgstr "valor inválido de %s"
+
+#: diff.c:5222
+#, fuzzy, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr "valor inválido de %s"
+
+#: diff.c:5271
+#, 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:5327
+#, c-format
+msgid "bad --word-diff argument: %s"
+msgstr ""
+
+#: diff.c:5350
+msgid "Diff output format options"
+msgstr ""
+
+#: diff.c:5352 diff.c:5358
+#, fuzzy
+msgid "generate patch"
+msgstr "incorporar o patch"
+
+#: diff.c:5355 builtin/log.c:178
+msgid "suppress diff output"
+msgstr "suprimir saída do diff"
+
+#: diff.c:5360 diff.c:5474 diff.c:5481
+msgid "<n>"
+msgstr ""
+
+#: diff.c:5361 diff.c:5364
+#, fuzzy
+msgid "generate diffs with <n> lines context"
+msgstr "garantir que, pelo menos, <n> linhas de contexto coincidem"
+
+#: diff.c:5366
+msgid "generate the diff in raw format"
+msgstr ""
+
+#: diff.c:5369
+#, fuzzy
+msgid "synonym for '-p --raw'"
+msgstr "(sinónimo de --stat)"
+
+#: diff.c:5373
+#, fuzzy
+msgid "synonym for '-p --stat'"
+msgstr "(sinónimo de --stat)"
+
+#: diff.c:5377
+#, fuzzy
+msgid "machine friendly --stat"
+msgstr "saída inteligível por máquina"
+
+#: diff.c:5380
+msgid "output only the last line of --stat"
+msgstr ""
+
+#: diff.c:5382 diff.c:5390
+msgid "<param1,param2>..."
+msgstr ""
+
+#: diff.c:5383
+msgid ""
+"output the distribution of relative amount of changes for each sub-directory"
+msgstr ""
+
+#: diff.c:5387
+#, fuzzy
+msgid "synonym for --dirstat=cumulative"
+msgstr "sinónimo de --files-with-matches"
+
+#: diff.c:5391
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr ""
+
+#: diff.c:5395
+msgid "warn if changes introduce conflict markers or whitespace errors"
+msgstr ""
+
+#: diff.c:5398
+msgid "condensed summary such as creations, renames and mode changes"
+msgstr ""
+
+#: diff.c:5401
+#, fuzzy
+msgid "show only names of changed files"
+msgstr "mostrar apenas nomes de ficheiro em vez de linhas correspondidas"
+
+#: diff.c:5404
+#, fuzzy
+msgid "show only names and status of changed files"
+msgstr "mostrar apenas nomes de ficheiro em vez de linhas correspondidas"
+
+#: diff.c:5406
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr ""
+
+#: diff.c:5407
+#, fuzzy
+msgid "generate diffstat"
+msgstr "diff status inesperado %c"
+
+#: diff.c:5409 diff.c:5412 diff.c:5415
+msgid "<width>"
+msgstr ""
+
+#: diff.c:5410
+msgid "generate diffstat with a given width"
+msgstr ""
+
+#: diff.c:5413
+msgid "generate diffstat with a given name width"
+msgstr ""
+
+#: diff.c:5416
+msgid "generate diffstat with a given graph width"
+msgstr ""
+
+#: diff.c:5418
+msgid "<count>"
+msgstr ""
+
+#: diff.c:5419
+msgid "generate diffstat with limited lines"
+msgstr ""
+
+#: diff.c:5422
+msgid "generate compact summary in diffstat"
+msgstr ""
+
+#: diff.c:5425
+msgid "output a binary diff that can be applied"
+msgstr ""
+
+#: diff.c:5428
+msgid "show full pre- and post-image object names on the \"index\" lines"
+msgstr ""
+
+#: diff.c:5430
+#, fuzzy
+msgid "show colored diff"
+msgstr "mostrar ficheiros ignorados"
+
+#: diff.c:5431
+msgid "<kind>"
+msgstr ""
+
+#: diff.c:5432
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
+msgstr ""
+
+#: diff.c:5435
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+
+#: diff.c:5438 diff.c:5441 diff.c:5444 diff.c:5553
+#, fuzzy
+msgid "<prefix>"
+msgstr "<prefixo>/"
+
+#: diff.c:5439
+msgid "show the given source prefix instead of \"a/\""
+msgstr ""
+
+#: diff.c:5442
+msgid "show the given destination prefix instead of \"b/\""
+msgstr ""
+
+#: diff.c:5445
+#, fuzzy
+msgid "prepend an additional prefix to every line of output"
+msgstr "preceder o nomebase do projeto pai na saída"
+
+#: diff.c:5448
+msgid "do not show any source or destination prefix"
+msgstr ""
+
+#: diff.c:5451
+#, 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:5455 diff.c:5460 diff.c:5465
+msgid "<char>"
+msgstr ""
+
+#: diff.c:5456
+msgid "specify the character to indicate a new line instead of '+'"
+msgstr ""
+
+#: diff.c:5461
+msgid "specify the character to indicate an old line instead of '-'"
+msgstr ""
+
+#: diff.c:5466
+msgid "specify the character to indicate a context instead of ' '"
+msgstr ""
+
+#: diff.c:5469
+#, fuzzy
+msgid "Diff rename options"
+msgstr "Opções genéricas"
+
+#: diff.c:5470
+#, fuzzy
+msgid "<n>[/<m>]"
+msgstr "<n>[,<base>]"
+
+#: diff.c:5471
+msgid "break complete rewrite changes into pairs of delete and create"
+msgstr ""
+
+#: diff.c:5475
+#, fuzzy
+msgid "detect renames"
+msgstr "nome do remoto"
+
+#: diff.c:5479
+msgid "omit the preimage for deletes"
+msgstr ""
+
+#: diff.c:5482
+msgid "detect copies"
+msgstr ""
+
+#: diff.c:5486
+msgid "use unmodified files as source to find copies"
+msgstr ""
+
+#: diff.c:5488
+#, fuzzy
+msgid "disable rename detection"
+msgstr "Deteção de mudança de nome inexata em curso"
+
+#: diff.c:5491
+msgid "use empty blobs as rename source"
+msgstr ""
+
+#: diff.c:5493
+msgid "continue listing the history of a file beyond renames"
+msgstr ""
+
+#: diff.c:5496
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
+msgstr ""
+
+#: diff.c:5498
+#, fuzzy
+msgid "Diff algorithm options"
+msgstr "opção inválida: %s"
+
+#: diff.c:5500
+msgid "produce the smallest possible diff"
+msgstr ""
+
+#: diff.c:5503
+#, fuzzy
+msgid "ignore whitespace when comparing lines"
+msgstr "ignorar alterações de espaço em branco ao procurar contexto"
+
+#: diff.c:5506
+#, fuzzy
+msgid "ignore changes in amount of whitespace"
+msgstr "ignorar alterações de espaço em branco ao procurar contexto"
+
+#: diff.c:5509
+#, fuzzy
+msgid "ignore changes in whitespace at EOL"
+msgstr "ignorar alterações de espaço em branco ao procurar contexto"
+
+#: diff.c:5512
+msgid "ignore carrier-return at the end of line"
+msgstr ""
+
+#: diff.c:5515
+msgid "ignore changes whose lines are all blank"
+msgstr ""
+
+#: diff.c:5517 diff.c:5539 diff.c:5542 diff.c:5587
+msgid "<regex>"
+msgstr ""
+
+#: diff.c:5518
+#, fuzzy
+msgid "ignore changes whose all lines match <regex>"
+msgstr "ignorar alterações de espaço em branco ao procurar contexto"
+
+#: diff.c:5521
+msgid "heuristic to shift diff hunk boundaries for easy reading"
+msgstr ""
+
+#: diff.c:5524
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr ""
+
+#: diff.c:5528
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr ""
+
+#: diff.c:5530
+msgid "<algorithm>"
+msgstr ""
+
+#: diff.c:5531
+msgid "choose a diff algorithm"
+msgstr ""
+
+#: diff.c:5533
+#, fuzzy
+msgid "<text>"
+msgstr "texto"
+
+#: diff.c:5534
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr ""
+
+#: diff.c:5536 diff.c:5545 diff.c:5548
+#, fuzzy
+msgid "<mode>"
+msgstr "modo"
+
+#: diff.c:5537
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr ""
+
+#: diff.c:5540
+msgid "use <regex> to decide what a word is"
+msgstr ""
+
+#: diff.c:5543
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr ""
+
+#: diff.c:5546
+msgid "moved lines of code are colored differently"
+msgstr ""
+
+#: diff.c:5549
+msgid "how white spaces are ignored in --color-moved"
+msgstr ""
+
+#: diff.c:5552
+#, fuzzy
+msgid "Other diff options"
+msgstr "Opções genéricas"
+
+#: diff.c:5554
+msgid "when run from subdir, exclude changes outside and show relative paths"
+msgstr ""
+
+#: diff.c:5558
+#, fuzzy
+msgid "treat all files as text"
+msgstr "processar ficheiros binários como texto"
+
+#: diff.c:5560
+msgid "swap two inputs, reverse the diff"
+msgstr ""
+
+#: diff.c:5562
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr ""
+
+#: diff.c:5564
+msgid "disable all output of the program"
+msgstr ""
+
+#: diff.c:5566
+msgid "allow an external diff helper to be executed"
+msgstr ""
+
+#: diff.c:5568
+msgid "run external text conversion filters when comparing binary files"
+msgstr ""
+
+#: diff.c:5570
+#, fuzzy
+msgid "<when>"
+msgstr "quando"
+
+#: diff.c:5571
+#, 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:5574
+#, fuzzy
+msgid "<format>"
+msgstr "formato"
+
+#: diff.c:5575
+msgid "specify how differences in submodules are shown"
+msgstr ""
+
+#: diff.c:5579
+#, fuzzy
+msgid "hide 'git add -N' entries from the index"
+msgstr "usar .gitattributes apenas a partir do índice"
+
+#: diff.c:5582
+msgid "treat 'git add -N' entries as real in the index"
+msgstr ""
+
+#: diff.c:5584
+#, fuzzy
+msgid "<string>"
+msgstr "cadeia"
+
+#: diff.c:5585
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"string"
+msgstr ""
+
+#: diff.c:5588
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
+msgstr ""
+
+#: diff.c:5591
+#, fuzzy
+msgid "show all changes in the changeset with -S or -G"
+msgstr "mostrar ficheiros com correspondências no paginador"
+
+#: diff.c:5594
+#, fuzzy
+msgid "treat <string> in -S as extended POSIX regular expression"
+msgstr "usar expressões regulares estendidas do POSIX"
+
+#: diff.c:5597
+#, fuzzy
+msgid "control the order in which files appear in the output"
+msgstr "mostrar outros ficheiros na saída"
+
+#: diff.c:5598
+#, fuzzy
+msgid "<object-id>"
+msgstr "objeto"
+
+#: diff.c:5599
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"object"
+msgstr ""
+
+#: diff.c:5601
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr ""
+
+#: diff.c:5602
+msgid "select files by diff type"
+msgstr ""
+
+#: diff.c:5604
+#, fuzzy
+msgid "<file>"
+msgstr "ficheiro"
+
+#: diff.c:5605
+#, fuzzy
+msgid "Output to a specific file"
+msgstr "submeter somente os ficheiros especificados"
+
+#: diff.c:6262
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:6265
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:6268
#, 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 "especificador de path '%s' correspondeu a ficheiro nenhum "
+"conhecido pelo git"
+
+#: 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:177
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:180
+#, fuzzy
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr "git fetch-pack: esperava-se lista rasa"
-#: fetch-pack.c:279
+#: fetch-pack.c:191
+#, 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:211
#, 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:222
+#, fuzzy
+msgid "unable to write to remote"
+msgstr "não foi possível escrever o ficheiro da tag"
+
+#: fetch-pack.c:283
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc requer multi_ack_detailed"
-#: fetch-pack.c:417
+#: fetch-pack.c:378 fetch-pack.c:1406
#, c-format
msgid "invalid shallow line: %s"
msgstr "linha rasa inválida: %s"
-#: fetch-pack.c:423
+#: fetch-pack.c:384 fetch-pack.c:1412
#, c-format
msgid "invalid unshallow line: %s"
msgstr "linha para aprofundar inválida: %s"
-#: fetch-pack.c:425
+#: fetch-pack.c:386 fetch-pack.c:1414
#, c-format
msgid "object not found: %s"
msgstr "objeto não encontrado: %s"
-#: fetch-pack.c:428
+#: fetch-pack.c:389 fetch-pack.c:1417
#, c-format
msgid "error in object: %s"
msgstr "erro no objeto: %s"
-#: fetch-pack.c:430
+#: fetch-pack.c:391 fetch-pack.c:1419
#, c-format
msgid "no shallow found: %s"
msgstr "raso não encontrado: %s"
-#: fetch-pack.c:433
+#: fetch-pack.c:394 fetch-pack.c:1423
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "esperava-se raso/aprofundar, obteve-se %s"
-#: fetch-pack.c:472
+#: fetch-pack.c:434
#, c-format
msgid "got %s %d %s"
msgstr "obteve-se %s %d %s"
-#: fetch-pack.c:486
+#: fetch-pack.c:451
#, c-format
msgid "invalid commit %s"
msgstr "commit inválido %s"
-#: fetch-pack.c:519
+#: fetch-pack.c:482
msgid "giving up"
msgstr "desistência"
-#: fetch-pack.c:529 progress.c:235
+#: fetch-pack.c:495 progress.c:339
msgid "done"
msgstr "concluído"
-#: fetch-pack.c:541
+#: fetch-pack.c:507
#, c-format
msgid "got %s (%d) %s"
msgstr "obteve-se %s (%d) %s"
-#: fetch-pack.c:587
+#: fetch-pack.c:543
#, c-format
msgid "Marking %s as complete"
msgstr "Marcado %s como completo"
-#: fetch-pack.c:735
+#: fetch-pack.c:758
#, c-format
msgid "already have %s (%s)"
msgstr "já se tem %s (%s)"
-#: fetch-pack.c:773
+#: fetch-pack.c:827
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:835
msgid "protocol error: bad pack header"
msgstr "erro de protocolo: cabeçalho de pacote incorreto"
-#: fetch-pack.c:837
+#: fetch-pack.c:919
#, 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:937
#, c-format
msgid "%s failed"
msgstr "%s falhou"
-#: fetch-pack.c:855
+#: fetch-pack.c:939
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:982
#, c-format
msgid "Server version is %.*s"
msgstr "A versão do servidor é %.*s"
-#: fetch-pack.c:934
+#: fetch-pack.c:990 fetch-pack.c:996 fetch-pack.c:999 fetch-pack.c:1005
+#: fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 fetch-pack.c:1021
+#: fetch-pack.c:1025 fetch-pack.c:1029 fetch-pack.c:1033 fetch-pack.c:1037
+#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1054 fetch-pack.c:1059
+#, fuzzy, c-format
+msgid "Server supports %s"
+msgstr "O servidor suporta side-band"
+
+#: fetch-pack.c:992
+msgid "Server does not support shallow clients"
+msgstr "O servidor não suporta clientes rasos"
+
+#: fetch-pack.c:1052
msgid "Server does not support --shallow-since"
msgstr "O servidor não suporta --shallow-since"
-#: fetch-pack.c:938
+#: fetch-pack.c:1057
msgid "Server does not support --shallow-exclude"
msgstr "O servidor não suporta --shallow-exclude"
-#: fetch-pack.c:940
+#: fetch-pack.c:1061
msgid "Server does not support --deepen"
msgstr "O servidor não suporta --deepen"
-#: fetch-pack.c:951
-msgid "no common commits"
-msgstr "nenhum commit em comum"
+#: fetch-pack.c:1063
+#, fuzzy
+msgid "Server does not support this repository's object format"
+msgstr "O servidor não suporta --deepen"
-#: fetch-pack.c:963
+#: fetch-pack.c:1076
+msgid "no common commits"
+msgstr "commits comuns nenhuns"
+
+#: fetch-pack.c:1088 fetch-pack.c:1628
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: falha ao obter."
-#: fetch-pack.c:1125
-msgid "no matching remote head"
-msgstr "nenhuma cabeça remota correspondente"
+#: fetch-pack.c:1214
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr ""
-#: fetch-pack.c:1147
+#: fetch-pack.c:1218
+#, fuzzy, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "O servidor não suporta clientes rasos"
+
+#: fetch-pack.c:1238
+#, fuzzy
+msgid "Server does not support shallow requests"
+msgstr "O servidor não suporta clientes rasos"
+
+#: fetch-pack.c:1245
+#, fuzzy
+msgid "Server supports filter"
+msgstr "O servidor suporta ofs-delta"
+
+#: fetch-pack.c:1284
+#, 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:1302
+#, c-format
+msgid "error reading section header '%s'"
+msgstr ""
+
+#: fetch-pack.c:1308
+#, fuzzy, c-format
+msgid "expected '%s', received '%s'"
+msgstr "blob para %s '%s' esperado"
+
+#: fetch-pack.c:1369
+#, c-format
+msgid "unexpected acknowledgment line: '%s'"
+msgstr ""
+
+#: fetch-pack.c:1374
+#, c-format
+msgid "error processing acks: %d"
+msgstr ""
+
+#: fetch-pack.c:1384
+msgid "expected packfile to be sent after 'ready'"
+msgstr ""
+
+#: fetch-pack.c:1386
+msgid "expected no other sections to be sent after no 'ready'"
+msgstr ""
+
+#: fetch-pack.c:1428
+#, c-format
+msgid "error processing shallow info: %d"
+msgstr ""
+
+#: fetch-pack.c:1475
+#, fuzzy, c-format
+msgid "expected wanted-ref, got '%s'"
+msgstr "esperava-se raso/aprofundar, obteve-se %s"
+
+#: fetch-pack.c:1480
+#, fuzzy, c-format
+msgid "unexpected wanted-ref: '%s'"
+msgstr "fim de ficheiro inesperado"
+
+#: fetch-pack.c:1485
+#, c-format
+msgid "error processing wanted refs: %d"
+msgstr ""
+
+#: fetch-pack.c:1515
+#, fuzzy
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack: esperava-se lista rasa"
+
+#: fetch-pack.c:1897
+msgid "no matching remote head"
+msgstr "remote head nenhuma que corresponda"
+
+#: fetch-pack.c:1920 builtin/clone.c:693
+msgid "remote did not send all necessary objects"
+msgstr "o remoto não enviou todos os objetos necessários"
+
+#: fetch-pack.c:1947
#, c-format
msgid "no such remote ref %s"
msgstr "referência remota %s inexistente"
-#: fetch-pack.c:1150
+#: fetch-pack.c:1950
#, 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:640
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
+msgstr ""
+
+#: grep.c:2100
#, 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:2117 setup.c:176 builtin/clone.c:412 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:2128
#, 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:"
+
+#: 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:527
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -1849,30 +4453,51 @@
"'%s' parece ser um comando do git, mas não é possível\n"
"executá-lo. Talvez git-%s esteja danificado?"
-#: help.c:376
-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'"
-msgstr ""
-"AVISO: Invocou um comando do Git designado '%s' que não existe.\n"
-"Continuando, assumindo que queria dizer '%s'"
-
-#: help.c:403
-#, c-format
-msgid "in %0.1f seconds automatically..."
-msgstr "automaticamente em %0.1f..."
-
-#: help.c:410
+#: help.c:543 help.c:631
#, 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:591
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "Oh não. Teu sistema de reporta comando nenhum de Git."
+
+#: help.c:613
+#, 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."
+
+#: help.c:618
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr ""
+
+#: help.c:623
+#, c-format
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgstr ""
+
+#: help.c:635
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] ""
+msgstr[1] ""
+
+#: help.c:675
+#, fuzzy
+msgid "git version [<options>]"
+msgstr "git column [<opções>]"
+
+#: help.c:730
+#, c-format
+msgid "%s: %s - %s"
+msgstr "%s: %s - %s"
+
+#: help.c:734
msgid ""
"\n"
"Did you mean this?"
@@ -1886,12 +4511,15 @@
"\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 +4545,95 @@
"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"
+msgstr "foi dado email nenhum e 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"
+msgstr "foi dado nome nenhum e 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 +4658,158 @@
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"
+#: ls-refs.c:109
+msgid "expected flush after ls-refs arguments"
+msgstr ""
-#: 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"
+#: merge-ort-wrappers.c:13 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:209
+#: merge-ort-wrappers.c:33 merge-recursive.c:3436
+#, fuzzy, c-format
+msgid "Already up to date!"
+msgstr "Já está atualizado!"
+
+#: 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 +4818,7 @@
"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 +4827,7 @@
"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 +4836,7 @@
"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 +4845,42 @@
"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 +4889,379 @@
"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"
-
-#: merge-recursive.c:1528
-#, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
+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 ""
-"CONFLITO (mudar nome/adicionar): Mudar o nome %s->%s em %s. %s adicionado em "
-"%s"
-#: merge-recursive.c:1543
+#: merge-recursive.c:2100
#, c-format
-msgid "Adding merged %s"
-msgstr "A adicionar %s integrado"
+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:1550 merge-recursive.c:1780
+#: merge-recursive.c:2110
#, c-format
-msgid "Adding as %s instead"
-msgstr "A adicionar como %s, em alternativa."
+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:1607
+#: 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:2447
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr ""
+
+#: 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!"
-msgstr "Já está atualizado!"
+#: 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: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"
+msgstr "junção retornou commit nenhum"
-#: merge-recursive.c:2136
+#: 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:711 builtin/merge.c:895
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:1883 builtin/am.c:1917
+#: builtin/checkout.c:573 builtin/checkout.c:829 builtin/clone.c:817
+#: builtin/stash.c:265
+msgid "unable to write new index file"
+msgstr "não foi possível escrever novo ficheiro de índice"
+
+#: midx.c:80
+#, c-format
+msgid "multi-pack-index file %s is too small"
+msgstr ""
+
+#: midx.c:96
+#, c-format
+msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
+msgstr ""
+
+#: midx.c:101
+#, c-format
+msgid "multi-pack-index version %d not recognized"
+msgstr ""
+
+#: midx.c:106
+#, c-format
+msgid "multi-pack-index hash version %u does not match version %u"
+msgstr ""
+
+#: midx.c:123
+msgid "invalid chunk offset (too large)"
+msgstr ""
+
+#: midx.c:147
+msgid "terminating multi-pack-index chunk id appears earlier than expected"
+msgstr ""
+
+#: midx.c:160
+msgid "multi-pack-index missing required pack-name chunk"
+msgstr ""
+
+#: midx.c:162
+msgid "multi-pack-index missing required OID fanout chunk"
+msgstr ""
+
+#: midx.c:164
+msgid "multi-pack-index missing required OID lookup chunk"
+msgstr ""
+
+#: midx.c:166
+msgid "multi-pack-index missing required object offsets chunk"
+msgstr ""
+
+#: midx.c:180
+#, c-format
+msgid "multi-pack-index pack names out of order: '%s' before '%s'"
+msgstr ""
+
+#: midx.c:223
+#, c-format
+msgid "bad pack-int-id: %u (%u total packs)"
+msgstr ""
+
+#: midx.c:273
+msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
+msgstr ""
+
+#: midx.c:480
+#, fuzzy, c-format
+msgid "failed to add packfile '%s'"
+msgstr "falha ao ler o ficheiro de comando '%s'"
+
+#: midx.c:486
+#, fuzzy, c-format
+msgid "failed to open pack-index '%s'"
+msgstr "falha ao abrir '%s'"
+
+#: midx.c:546
+#, fuzzy, c-format
+msgid "failed to locate object %d in packfile"
+msgstr "Falha ao criar os ficheiros de saída"
+
+#: midx.c:846
+msgid "Adding packfiles to multi-pack-index"
+msgstr ""
+
+#: midx.c:879
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr ""
+
+#: midx.c:931
+#, fuzzy
+msgid "no pack files to index."
+msgstr "Não é possível escrever no índice."
+
+#: midx.c:982
+msgid "Writing chunks to multi-pack-index"
+msgstr ""
+
+#: midx.c:1060
+#, fuzzy, c-format
+msgid "failed to clear multi-pack-index at %s"
+msgstr "falha ao limpar o índice"
+
+#: midx.c:1116
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr ""
+
+#: midx.c:1124
+msgid "Looking for referenced packfiles"
+msgstr ""
+
+#: midx.c:1139
+#, c-format
+msgid ""
+"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+msgstr ""
+
+#: midx.c:1144
+msgid "the midx contains no oid"
+msgstr ""
+
+#: midx.c:1153
+msgid "Verifying OID order in multi-pack-index"
+msgstr ""
+
+#: midx.c:1162
+#, c-format
+msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
+msgstr ""
+
+#: midx.c:1182
+#, fuzzy
+msgid "Sorting objects by packfile"
+msgstr "A escrever objetos"
+
+#: midx.c:1189
+#, fuzzy
+msgid "Verifying object offsets"
+msgstr "A escrever objetos"
+
+#: midx.c:1205
+#, fuzzy, c-format
+msgid "failed to load pack entry for oid[%d] = %s"
+msgstr "não é possível adicionar %s à cache"
+
+#: midx.c:1211
+#, fuzzy, c-format
+msgid "failed to load pack-index for packfile %s"
+msgstr "falha ao ler o ficheiro de comando '%s'"
+
+#: midx.c:1220
+#, c-format
+msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+msgstr ""
+
+#: midx.c:1245
+#, fuzzy
+msgid "Counting referenced objects"
+msgstr "eliminar ficheiros não referenciados"
+
+#: midx.c:1255
+msgid "Finding and deleting unreferenced packfiles"
+msgstr ""
+
+#: midx.c:1446
+#, fuzzy
+msgid "could not start pack-objects"
+msgstr "Não foi possível lançar pack-objects"
+
+#: midx.c:1466
+#, 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 +5272,216 @@
"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:615
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "offset antes do fim do ficheiro de pacote (.idx danificado?)"
+
+#: packfile.c:1907
+#, 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:1911
+#, 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'"
+
+#: 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 +5489,237 @@
"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:165
+#, 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:5310
+#, fuzzy, c-format
+msgid "could not parse commit '%s'"
+msgstr "não foi possível analisar o commit %s"
+
+#: 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:299
+#, fuzzy
+msgid "failed to generate diff"
+msgstr "falha ao criar o ficheiro %s"
+
+#: range-diff.c:532 range-diff.c:534
+#, 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 +5728,7 @@
"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 +5737,837 @@
"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 "could not stat '%s"
+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:502 builtin/checkout.c:688 builtin/clean.c:991
+#: builtin/commit.c:364 builtin/diff-tree.c:122 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 "%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:1140
+#, c-format
+msgid "could not close '%s'"
+msgstr "não foi possível fechar '%s'"
+
+#: read-cache.c:3120 sequencer.c:2479 sequencer.c:4231
+#, 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'.\n"
-#: refs/files-backend.c:2543
-#, c-format
-msgid "could not remove reference %s"
-msgstr "não foi possível eliminar a referência %s"
+#: 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."
-#: ref-filter.c:35 wt-status.c:1780
+#: 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"
+"Remove linha nenhuma. Usa explicitamente 'drop' 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:3607
+#: sequencer.c:3633 sequencer.c:5416 builtin/fsck.c:347 builtin/rebase.c:270
+#, fuzzy, c-format
+msgid "could not write '%s'"
+msgstr "não foi possível escrever em '%s'"
+
+#: rebase-interactive.c:116 builtin/rebase.c:202 builtin/rebase.c:228
+#: builtin/rebase.c:252
+#, 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):\n"
+
+#: 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.\n"
+"\n"
+
+#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2394
+#: builtin/rebase.c:188 builtin/rebase.c:213 builtin/rebase.c:239
+#: builtin/rebase.c:264
+#, c-format
+msgid "could not read '%s'."
+msgstr "não foi possível ler '%s'."
+
+#: 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:245
+#: ref-filter.c:398
+#, fuzzy, c-format
+msgid "unrecognized email option: %s"
+msgstr "posição não reconhecida:%s"
+
+#: 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)"
-msgstr "(nenhum ramo, a efetuar rebase de %s)"
+#: ref-filter.c:1549
+#, fuzzy, c-format
+msgid "no branch, rebasing %s"
+msgstr "(ramo nenhum, rebaseando %s)"
-#: ref-filter.c:1250
-#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "(nenhum ramo, bissecção iniciada em %s)"
+#: ref-filter.c:1552
+#, fuzzy, c-format
+msgid "no branch, rebasing detached HEAD %s"
+msgstr "(ramo nenhum, rebaseando HEAD solta %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:1555
+#, fuzzy, c-format
+msgid "no branch, bisect started on %s"
+msgstr "(ramo nenhum, bisseção iniciada em %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:1565
+#, fuzzy
+msgid "no branch"
+msgstr "(ramo nenhum)"
-#: ref-filter.c:1265
-msgid "(no branch)"
-msgstr "(nenhum ramo)"
-
-#: ref-filter.c:1420 ref-filter.c:1451
+#: ref-filter.c:1599 ref-filter.c:1808
#, 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:1609
#, 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:2062
#, c-format
msgid "malformed object at '%s'"
msgstr "objeto malformado em '%s'"
-#: ref-filter.c:1759
+#: ref-filter.c:2151
#, 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:2156 refs.c:660
#, c-format
msgid "ignoring broken ref %s"
msgstr "a referência %s danificada foi ignorada"
-#: ref-filter.c:2028
+#: ref-filter.c:2472
#, c-format
msgid "format: %%(end) atom missing"
msgstr "formato: falta átomo %%(end)"
-#: ref-filter.c:2109
+#: ref-filter.c:2571
#, c-format
msgid "malformed object name %s"
msgstr "nome de objeto malformado %s"
-#: remote.c:754
+#: ref-filter.c:2576
+#, 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:575
+#, fuzzy, c-format
+msgid "could not retrieve `%s`"
+msgstr "não foi possível remover '%s'"
+
+#: refs.c:582
+#, fuzzy, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "Nome de ramo inválido: '%s'"
+
+#: refs.c:658
+#, fuzzy, c-format
+msgid "ignoring dangling symref %s"
+msgstr "a referência %s danificada foi ignorada"
+
+#: refs.c:895
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr ""
+
+#: refs.c:901
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr ""
+
+#: refs.c:960
+#, c-format
+msgid "log for %s is empty"
+msgstr ""
+
+#: refs.c:1052
+#, fuzzy, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "a referência %s com nome danificado foi ignorada"
+
+#: refs.c:1123
+#, fuzzy, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "falha ao abrir '%s': %s"
+
+#: refs.c:1947
+#, fuzzy, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "nome de identificação vazio (de <%s>) não é permitido"
+
+#: refs.c:2027
+msgid "ref updates forbidden inside quarantine environment"
+msgstr ""
+
+#: refs.c:2038
+msgid "ref updates aborted by hook"
+msgstr ""
+
+#: refs.c:2138 refs.c:2168
+#, fuzzy, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "não é possível criar '%s'"
+
+#: refs.c:2144 refs.c:2179
+#, 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:170
+#, 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:1685 remote.c:1787
+#: 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: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:1714 remote.c:1815
msgid "HEAD does not point to a branch"
msgstr "HEAD não aponta para um ramo"
-#: remote.c:1694
+#: remote.c:1723
#, c-format
msgid "no such branch: '%s'"
msgstr "ramo inexistente: '%s'"
-#: remote.c:1697
+#: remote.c:1726
#, c-format
msgid "no upstream configured for branch '%s'"
-msgstr "nenhum ramo a montante configurado para o ramo '%s'"
+msgstr "configurado upstream nenhum para ramo '%s'"
-#: remote.c:1703
+#: remote.c:1732
#, 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:1747
#, 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"
+msgstr "destino de atirar '%s' em remoto '%s' tem ramo de tracking local nenhum"
-#: remote.c:1730
+#: remote.c:1759
#, c-format
msgid "branch '%s' has no remote for pushing"
-msgstr "o ramo '%s' não tem nenhum remoto para publicar"
+msgstr "ramo '%s' tem remoto para atirar nenhum"
-#: remote.c:1741
+#: remote.c:1769
#, 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:1782
msgid "push has no destination (push.default is 'nothing')"
msgstr "publicação sem destino (push.default é 'nothing')"
-#: remote.c:1776
+#: remote.c:1804
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:1933
+#, fuzzy, c-format
+msgid "couldn't find remote ref %s"
+msgstr "Referência remota HEAD não encontrada"
+
+#: remote.c:1946
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr ""
+
+#: remote.c:2109
#, 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:2113
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:2116
+#, 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:2120
+#, 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:2123
+#, c-format
+msgid " (use \"%s\" for details)\n"
+msgstr ""
+
+#: remote.c:2127
#, 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:2133
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:2136
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -2799,11 +6579,11 @@
"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:2144
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:2147
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -2818,51 +6598,202 @@
"O seu ramo e '%s' divergiram,\n"
"tendo cada um %d e %d commits diferentes, respetivamente.\n"
-#: remote.c:2122
+#: remote.c:2157
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:2348
+#, 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:1992
+#: 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'\n"
+
+#: 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:3460
+#, fuzzy, c-format
+msgid "failed to find tree of %s"
+msgstr "Falha ao procurar árvore de %s."
+
+#: revision.c:2336
+msgid "--unpacked=<packfile> no longer supported"
+msgstr ""
+
+#: revision.c:2356
+#, fuzzy, c-format
+msgid "unknown value for --diff-merges: %s"
+msgstr "valor desconhecido '%s' da chave '%s'"
+
+#: revision.c:2694
msgid "your current branch appears to be broken"
msgstr "o ramo atual parece estar danificado"
-#: revision.c:2161
+#: revision.c:2697
#, 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"
+msgstr "teu ramo atual '%s' ainda contém commits nenhuns"
-#: revision.c:2355
-msgid "--first-parent is incompatible with --bisect"
-msgstr "--first-parent é incompatível com --bisect"
+#: revision.c:2907
+msgid "-L does not yet support diff formats besides -p and -s"
+msgstr ""
-#: run-command.c:125
+#: run-command.c:764
msgid "open /dev/null failed"
msgstr "falha ao abrir /dev/null"
-#: run-command.c:127
-#, c-format
-msgid "dup2(%d,%d) failed"
-msgstr "dup2(%d,%d) falhou"
+#: run-command.c:1271
+#, fuzzy, c-format
+msgid "cannot create async thread: %s"
+msgstr "não foi possível criar thread: %s"
-#: send-pack.c:150
+#: run-command.c:1335
+#, 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:146
+#, 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:148
#, 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:150
#, c-format
msgid "remote unpack failed: %s"
msgstr "descompactação remota falhou: %s"
-#: send-pack.c:315
+#: send-pack.c:374
msgid "failed to sign the push certificate"
msgstr "falha ao assinar o certificado de publicação"
-#: send-pack.c:428
+#: send-pack.c:467
+#, 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:476
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:478
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -2870,32 +6801,48 @@
"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:490
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:495
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:195
+#, fuzzy, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr "Modo de limpeza inválido %s"
+
+#: sequencer.c:323
+#, fuzzy, c-format
+msgid "could not delete '%s'"
+msgstr "Não foi possível eliminar %s"
+
+#: sequencer.c:343 builtin/rebase.c:755 builtin/rebase.c:1596 builtin/rm.c:385
+#, c-format
+msgid "could not remove '%s'"
+msgstr "não foi possível remover '%s'"
+
+#: sequencer.c:353
msgid "revert"
msgstr "reverter"
-#: sequencer.c:217
+#: sequencer.c:355
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:219
-msgid "rebase -i"
+#: sequencer.c:357
+#, fuzzy
+msgid "rebase"
msgstr "rebase -i"
-#: sequencer.c:221
-#, c-format
-msgid "Unknown action: %d"
+#: sequencer.c:359
+#, fuzzy, c-format
+msgid "unknown action: %d"
msgstr "Ação desconhecida: %d"
-#: sequencer.c:278
+#: sequencer.c:418
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -2903,7 +6850,7 @@
"depois de resolver os conflitos, marque os caminhos corrigidos\n"
"com 'git add <caminhos>' ou 'git rm <caminhos>'"
-#: sequencer.c:281
+#: sequencer.c:421
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -2913,63 +6860,111 @@
"com 'git add <caminhos>' ou 'git rm <caminhos>'\n"
"e submeta o resultado com 'git commit'"
-#: sequencer.c:294 sequencer.c:1675
+#: sequencer.c:434 sequencer.c:3062
#, 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:436 sequencer.c:2861 sequencer.c:3066 sequencer.c:3080
+#: sequencer.c:3337 sequencer.c:5326 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:441
#, 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:446 sequencer.c:2866 sequencer.c:3068 sequencer.c:3082
+#: sequencer.c:3345
+#, 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:485
#, 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:489
msgid "commit your changes or stash them to proceed."
msgstr "submeta ou esconda as suas alterações para continuar."
-#: sequencer.c:388
+#: sequencer.c:521
#, c-format
msgid "%s: fast-forward"
msgstr "%s: avanço rápido"
+#: sequencer.c:560 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:670
#, 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"
-msgstr "não foi possível resolver o commit HEAD\n"
+#: sequencer.c:687
+#, fuzzy
+msgid "unable to update cache tree"
+msgstr "não foi possível atualizar a árvore de cache"
-#: sequencer.c:509
-msgid "unable to update cache tree\n"
-msgstr "não foi possível atualizar a árvore de cache\n"
+#: sequencer.c:701
+#, fuzzy
+msgid "could not resolve HEAD commit"
+msgstr "não foi possível resolver o commit HEAD"
-#: sequencer.c:592
+#: sequencer.c:781
+#, c-format
+msgid "no key present in '%.*s'"
+msgstr ""
+
+#: sequencer.c:792
+#, fuzzy, c-format
+msgid "unable to dequote value of '%s'"
+msgstr "não é possível detetar automaticamente o nome (obteve-se '%s')"
+
+#: sequencer.c:829 wrapper.c:201 wrapper.c:371 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1135 builtin/rebase.c:908
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "não foi possível abrir '%s' para leitura"
+
+#: sequencer.c:839
+msgid "'GIT_AUTHOR_NAME' already given"
+msgstr ""
+
+#: sequencer.c:844
+msgid "'GIT_AUTHOR_EMAIL' already given"
+msgstr ""
+
+#: sequencer.c:849
+msgid "'GIT_AUTHOR_DATE' already given"
+msgstr ""
+
+#: sequencer.c:853
+#, fuzzy, c-format
+msgid "unknown variable '%s'"
+msgstr "Formato de arquivo desconhecido '%s'"
+
+#: sequencer.c:858
+msgid "missing 'GIT_AUTHOR_NAME'"
+msgstr ""
+
+#: sequencer.c:860
+msgid "missing 'GIT_AUTHOR_EMAIL'"
+msgstr ""
+
+#: sequencer.c:862
+msgid "missing 'GIT_AUTHOR_DATE'"
+msgstr ""
+
+#: sequencer.c:927
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -2998,262 +6993,458 @@
"\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:821
-#, c-format
-msgid ""
-"unexpected 1st line of squash message:\n"
-"\n"
-"\t%.*s"
+#: sequencer.c:1208
+msgid "'prepare-commit-msg' hook failed"
msgstr ""
-"1ª linha inesperada da mensagem de squash:\n"
-"\n"
-"\t%.*s"
-#: sequencer.c:827
-#, c-format
+#: sequencer.c:1214
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. 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 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. 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:833 sequencer.c:858
-#, c-format
-msgid "This is a combination of %d commits."
-msgstr "Isto é a combinação de %d commits."
+#: sequencer.c:1227
+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 ""
+"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"
-#: sequencer.c:842
-msgid "need a HEAD to fixup"
-msgstr "necessária uma HEAD para fixup"
+#: sequencer.c:1269
+msgid "couldn't look up newly created commit"
+msgstr "não foi possível consultar o commit recém-criado"
-#: sequencer.c:844
-msgid "could not read HEAD"
+#: sequencer.c:1271
+msgid "could not parse newly created commit"
+msgstr "não foi possível analisar o commit recém-criado"
+
+#: sequencer.c:1317
+#, fuzzy
+msgid "unable to resolve HEAD after creating commit"
+msgstr "não foi possível resolver o commit HEAD"
+
+#: sequencer.c:1319
+msgid "detached HEAD"
+msgstr "HEAD destacada"
+
+#: sequencer.c:1323
+msgid " (root-commit)"
+msgstr " (commit-raiz)"
+
+#: sequencer.c:1344
+#, fuzzy
+msgid "could not parse HEAD"
msgstr "não foi possível ler HEAD"
-#: sequencer.c:846
-msgid "could not read HEAD's commit message"
-msgstr "não foi possível ler a mensagem de commit de HEAD"
+#: sequencer.c:1346
+#, fuzzy, c-format
+msgid "HEAD %s is not a commit!"
+msgstr "%s %s não é um commit!"
-#: sequencer.c:852
-#, c-format
-msgid "cannot write '%s'"
-msgstr "não é possível escrever '%s'"
+#: sequencer.c:1350 sequencer.c:1425 builtin/commit.c:1577
+msgid "could not parse HEAD commit"
+msgstr "não foi possível analisar o commit HEAD"
-#: sequencer.c:861 git-rebase--interactive.sh:445
-msgid "This is the 1st commit message:"
-msgstr "Esta é a 1ª mensagem de commit:"
+#: sequencer.c:1403 sequencer.c:2100
+#, fuzzy
+msgid "unable to parse commit author"
+msgstr "não foi possível analisar o commit %s"
-#: sequencer.c:869
-#, c-format
-msgid "could not read commit message of %s"
+#: sequencer.c:1414 builtin/am.c:1566 builtin/merge.c:701
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree falhou ao escrever uma árvore"
+
+#: sequencer.c:1447 sequencer.c:1565
+#, 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:876
-#, c-format
-msgid "This is the commit message #%d:"
-msgstr "Esta é a mensagem de commit nº%d:"
+#: sequencer.c:1476 sequencer.c:1508
+#, fuzzy, c-format
+msgid "invalid author identity '%s'"
+msgstr "caminho inválido '%s'"
-#: sequencer.c:881
-#, c-format
-msgid "The commit message #%d will be skipped:"
-msgstr "A mensagem de commit #%d será ignorada:"
+#: sequencer.c:1482
+msgid "corrupt author: missing date information"
+msgstr ""
-#: sequencer.c:886
+#: sequencer.c:1521 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:904
+#: builtin/merge.c:929 t/helper/test-fast-rebase.c:78
+msgid "failed to write commit object"
+msgstr "falha ao escrever objeto de commit"
+
+#: sequencer.c:1548 sequencer.c:4283 t/helper/test-fast-rebase.c:198
+#, c-format
+msgid "could not update %s"
+msgstr "não foi possível atualizar %s"
+
+#: sequencer.c:1597
+#, fuzzy, c-format
+msgid "could not parse commit %s"
+msgstr "não foi possível analisar o commit %s\n"
+
+#: sequencer.c:1602
+#, fuzzy, c-format
+msgid "could not parse parent commit %s"
+msgstr "não foi possível analisar o commit pai %s\n"
+
+#: sequencer.c:1685 sequencer.c:1796
#, c-format
msgid "unknown command: %d"
msgstr "comando desconhecido: %d"
-#: sequencer.c:952
+#: sequencer.c:1743 sequencer.c:1768
+#, c-format
+msgid "This is a combination of %d commits."
+msgstr "Isto é a combinação de %d commits."
+
+#: sequencer.c:1753
+msgid "need a HEAD to fixup"
+msgstr "necessária uma HEAD para fixup"
+
+#: sequencer.c:1755 sequencer.c:3372
+msgid "could not read HEAD"
+msgstr "não foi possível ler HEAD"
+
+#: sequencer.c:1757
+msgid "could not read HEAD's commit message"
+msgstr "não foi possível ler a mensagem de commit de HEAD"
+
+#: sequencer.c:1763
+#, c-format
+msgid "cannot write '%s'"
+msgstr "não é possível escrever '%s'"
+
+#: sequencer.c:1770 git-rebase--preserve-merges.sh:486
+msgid "This is the 1st commit message:"
+msgstr "Esta é a 1ª mensagem de commit:"
+
+#: sequencer.c:1778
+#, 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:1785
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr "Esta é a mensagem de commit nº%d:"
+
+#: sequencer.c:1791
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr "A mensagem de commit #%d será ignorada:"
+
+#: sequencer.c:1879
msgid "your index file is unmerged."
msgstr "ficheiro de índice não integrado."
-#: sequencer.c:970
+#: sequencer.c:1886
+#, fuzzy
+msgid "cannot fixup root commit"
+msgstr "não é possível encontrar o commit %s (%s)"
+
+#: sequencer.c:1905
#, 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:1913 sequencer.c:1921
#, 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:1927
#, 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:1946
#, 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:2011
#, 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:2071
#, c-format
msgid "could not revert %s... %s"
msgstr "não foi possível reverter %s... %s"
-#: sequencer.c:1123
+#: sequencer.c:2072
#, 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:2092
+#, c-format
+msgid "dropping %s %s -- patch contents already upstream\n"
+msgstr ""
-#: sequencer.c:1175
+#: sequencer.c:2150
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: falha ao ler o índice"
-#: sequencer.c:1182
+#: sequencer.c:2157
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: falha ao atualizar o índice"
-#: sequencer.c:1302
+#: sequencer.c:2234
+#, fuzzy, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "%%(body) não leva argumentos"
+
+#: sequencer.c:2243
+#, fuzzy, c-format
+msgid "missing arguments for %s"
+msgstr "falta o objeto %s de %s"
+
+#: sequencer.c:2274
+#, fuzzy, c-format
+msgid "could not parse '%s'"
+msgstr "não foi possível analisar %s"
+
+#: sequencer.c:2335
#, c-format
msgid "invalid line %d: %.*s"
msgstr "linha %d inválida: %.*s"
-#: sequencer.c:1310
+#: sequencer.c:2346
#, 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:2432
+#, fuzzy
+msgid "cancelling a cherry picking in progress"
+msgstr "cancelando um cherry picking em curso"
-#: sequencer.c:1349
+#: sequencer.c:2441
+#, fuzzy
+msgid "cancelling a revert in progress"
+msgstr "cancelando uma reversão em curso"
+
+#: sequencer.c:2485
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "corrija-o usando 'git rebase --edit-todo'."
-#: sequencer.c:1351
+#: sequencer.c:2487
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "folha de instruções inutilizável: '%s'"
-#: sequencer.c:1356
+#: sequencer.c:2492
msgid "no commits parsed."
-msgstr "nenhum commit analisado."
+msgstr "commits nenhuns analisados."
-#: sequencer.c:1367
+#: sequencer.c:2503
msgid "cannot cherry-pick during a revert."
msgstr "não é possível efetuar cherry-pick durante uma reversão."
-#: sequencer.c:1369
+#: sequencer.c:2505
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:2583
#, c-format
msgid "invalid value for %s: %s"
msgstr "valor inválido de %s: %s"
-#: sequencer.c:1492
+#: sequencer.c:2690
+msgid "unusable squash-onto"
+msgstr ""
+
+#: sequencer.c:2710
#, 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:2803 sequencer.c:4636
+msgid "empty commit set passed"
+msgstr "o conjunto de commits especificado está vazio"
+
+#: sequencer.c:2820
+#, fuzzy
+msgid "revert is already in progress"
msgstr "cherry-pick ou revert em curso"
-#: sequencer.c:1531
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
+#: sequencer.c:2822
+#, fuzzy, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "tente \"git cherry-pick (--continue | --quit |--abort)\""
-#: sequencer.c:1534
+#: sequencer.c:2825
+#, fuzzy
+msgid "cherry-pick is already in progress"
+msgstr "cherry-pick ou revert em curso"
+
+#: sequencer.c:2827
+#, fuzzy, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "tente \"git cherry-pick (--continue | --quit |--abort)\""
+
+#: sequencer.c:2841
#, 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:2856
msgid "could not lock HEAD"
msgstr "não foi possível bloquear HEAD"
-#: sequencer.c:1604 sequencer.c:2159
+#: sequencer.c:2916 sequencer.c:4371
msgid "no cherry-pick or revert in progress"
-msgstr "nenhum cherry-pick ou revert em curso"
+msgstr "sem cherry-pick ou revert em curso"
-#: sequencer.c:1606
+#: sequencer.c:2918 sequencer.c:2929
msgid "cannot resolve HEAD"
msgstr "não é possível resolver HEAD"
-#: sequencer.c:1608 sequencer.c:1642
+#: sequencer.c:2920 sequencer.c:2964
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:2950 builtin/grep.c:756
#, c-format
msgid "cannot open '%s'"
msgstr "não é possível abrir '%s'"
-#: sequencer.c:1630
+#: sequencer.c:2952
#, c-format
msgid "cannot read '%s': %s"
msgstr "não é possível ler '%s': %s"
-#: sequencer.c:1631
+#: sequencer.c:2953
msgid "unexpected end of file"
msgstr "fim de ficheiro inesperado"
-#: sequencer.c:1637
+#: sequencer.c:2959
#, 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:2970
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:3011
+#, fuzzy
+msgid "no revert in progress"
+msgstr "Rebase não está em curso?"
+
+#: sequencer.c:3020
+#, fuzzy
+msgid "no cherry-pick in progress"
+msgstr "cherry-pick nenhum em curso"
+
+#: sequencer.c:3030
+#, fuzzy
+msgid "failed to skip the commit"
+msgstr "falha ao escrever objeto de commit"
+
+#: sequencer.c:3037
+msgid "there is nothing to skip"
+msgstr ""
+
+#: sequencer.c:3040
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+
+#: sequencer.c:3202 sequencer.c:4263
msgid "cannot read HEAD"
msgstr "não é possível ler HEAD"
-#: sequencer.c:1825 builtin/difftool.c:616
+#: sequencer.c:3219
+#, fuzzy, c-format
+msgid "unable to copy '%s' to '%s'"
+msgstr "não foi possível copiar '%s' para '%s'"
+
+#: sequencer.c:3227
+#, 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"
+" git commit --amend %s\n"
+"\n"
+"Assim que estiver satisfeito com as alterações, execute\n"
+"\n"
+" git rebase --continue\n"
+
+#: sequencer.c:3237
+#, fuzzy, c-format
+msgid "Could not apply %s... %.*s"
+msgstr "não foi possível aplicar %s... %s"
+
+#: sequencer.c:3244
+#, fuzzy, c-format
+msgid "Could not merge %.*s"
+msgstr "Não foi possível ler %s."
+
+#: sequencer.c:3258 sequencer.c:3262 builtin/difftool.c:640
#, 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:3274
+#, fuzzy, c-format
+msgid "Executing: %s\n"
+msgstr "A executar: %s\n"
-#: sequencer.c:1846
+#: sequencer.c:3289
#, c-format
msgid ""
"execution failed: %s\n"
@@ -3268,11 +7459,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:1852
+#: sequencer.c:3295
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:3301
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -3289,78 +7480,192 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:1913 git-rebase.sh:168
-#, c-format
-msgid "Applied autostash."
-msgstr "Pilha automática (autostash) aplicada."
+#: sequencer.c:3362
+#, fuzzy, c-format
+msgid "illegal label name: '%.*s'"
+msgstr "nome de ficheiro malformado: %.*s"
-#: sequencer.c:1925
+#: sequencer.c:3416
+#, fuzzy
+msgid "writing fake root commit"
+msgstr "não há nada para submeter"
+
+#: sequencer.c:3421
+msgid "writing squash-onto"
+msgstr ""
+
+#: sequencer.c:3505
+#, fuzzy, c-format
+msgid "could not resolve '%s'"
+msgstr "não foi possível remover '%s'"
+
+#: sequencer.c:3538
+#, fuzzy
+msgid "cannot merge without a current revision"
+msgstr "não é possível efetuar '%s' sem um commit anterior"
+
+#: sequencer.c:3560
+#, fuzzy, c-format
+msgid "unable to parse '%.*s'"
+msgstr "não foi possível criar '%s'"
+
+#: sequencer.c:3569
+#, fuzzy, c-format
+msgid "nothing to merge: '%.*s'"
+msgstr "ignorado não integrado: '%.*s'"
+
+#: sequencer.c:3581
+msgid "octopus merge cannot be executed on top of a [new root]"
+msgstr ""
+
+#: sequencer.c:3597
+#, 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:3780
+#, fuzzy, c-format
+msgid "could not even attempt to merge '%.*s'"
+msgstr "não foi possível validar a tag '%s'"
+
+#: sequencer.c:3796
+#, fuzzy
+msgid "merge: Unable to write new index file"
+msgstr "%s: Não foi possível escrever novo ficheiro de índice"
+
+#: sequencer.c:3870
+msgid "Cannot autostash"
+msgstr "Não é possível empilhar automaticamente (autostash)"
+
+#: sequencer.c:3873
+#, fuzzy, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "Resposta de squash inexperada: '%s'"
+
+#: sequencer.c:3879
+#, fuzzy, c-format
+msgid "Could not create directory for '%s'"
+msgstr "Não foi possível criar o diretório '%s'"
+
+#: sequencer.c:3882
+#, fuzzy, c-format
+msgid "Created autostash: %s\n"
+msgstr "Criado autostash: %s\n"
+
+#: sequencer.c:3886
+#, fuzzy
+msgid "could not reset --hard"
+msgstr "não foi possível ler orig-head"
+
+#: sequencer.c:3911
+#, fuzzy, c-format
+msgid "Applied autostash.\n"
+msgstr "Autostash aplicado.\n"
+
+#: sequencer.c:3923
#, c-format
msgid "cannot store %s"
msgstr "não é possível guardar %s"
-#: sequencer.c:1927 git-rebase.sh:172
-#, c-format
+#: sequencer.c:3926
+#, 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 ""
-"Surgiram conflitos ao aplicar a pilha automática (autostash).\n"
+"%s\n"
"As suas alterações estão guardadas na pilha.\n"
"Pode executar \"git stash pop\" ou \"git stash drop\" oportunamente.\n"
-#: sequencer.c:2009
-#, c-format
-msgid "Stopped at %s... %.*s\n"
+#: sequencer.c:3931
+#, fuzzy
+msgid "Applying autostash resulted in conflicts."
+msgstr "Patch aplicado a '%s' com conflitos."
+
+#: sequencer.c:3932
+msgid "Autostash exists; creating a new stash entry."
+msgstr ""
+
+#: sequencer.c:4025 git-rebase--preserve-merges.sh:769
+msgid "could not detach HEAD"
+msgstr "não foi possível destacar HEAD"
+
+#: sequencer.c:4040
+#, fuzzy, c-format
+msgid "Stopped at HEAD\n"
+msgstr "Parou no HEAD\n"
+
+#: sequencer.c:4042
+#, fuzzy, c-format
+msgid "Stopped at %s\n"
msgstr "Parou a %s... %.*s\n"
-#: sequencer.c:2036
+#: sequencer.c:4050
+#, 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:4096
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr ""
+
+#: sequencer.c:4141
+#, c-format
+msgid "Stopped at %s... %.*s\n"
+msgstr "Parou no %s... %.*s\n"
+
+#: sequencer.c:4212
#, c-format
msgid "unknown command %d"
msgstr "comando desconhecido %d"
-#: sequencer.c:2066
+#: sequencer.c:4271
msgid "could not read orig-head"
msgstr "não foi possível ler orig-head"
-#: sequencer.c:2070
+#: sequencer.c:4276
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:4290
#, c-format
msgid "could not update HEAD to %s"
msgstr "não foi possível atualizar HEAD para %s"
-#: sequencer.c:2168
+#: sequencer.c:4350
+#, fuzzy, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "O %s foi rebaseado e atualizado com sucesso.\n"
+
+#: sequencer.c:4383
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:4392
msgid "cannot amend non-existing commit"
msgstr "não é possível emendar commit não-existente"
-#: sequencer.c:2184
+#: sequencer.c:4394
#, c-format
msgid "invalid file: '%s'"
msgstr "ficheiro inválido: '%s'"
-#: sequencer.c:2186
+#: sequencer.c:4396
#, c-format
msgid "invalid contents: '%s'"
msgstr "conteúdo inválido: '%s'"
-#: sequencer.c:2189
+#: sequencer.c:4399
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3370,35 +7675,71 @@
"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:4435 sequencer.c:4474
+#, fuzzy, c-format
+msgid "could not write file: '%s'"
+msgstr "não foi possível criar o ficheiro '%s'"
+
+#: sequencer.c:4490
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr "não foi possível remover CHERRY_PICK_HEAD"
+
+#: sequencer.c:4497
msgid "could not commit staged changes."
msgstr "não foi possível submeter as alterações preparadas."
-#: sequencer.c:2279
+#: sequencer.c:4613
#, 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:4617
#, c-format
msgid "%s: bad revision"
msgstr "%s: revisão incorreta"
-#: sequencer.c:2316
+#: sequencer.c:4652
msgid "can't revert as initial commit"
msgstr "não é possível reverter como commit inicial"
-#: setup.c:165
+#: sequencer.c:5129
+msgid "make_script: unhandled options"
+msgstr ""
+
+#: sequencer.c:5132
+msgid "make_script: error preparing revisions"
+msgstr ""
+
+#: sequencer.c:5374 sequencer.c:5391
+#, fuzzy
+msgid "nothing to do"
+msgstr "há nada a fazer"
+
+#: sequencer.c:5410
+#, fuzzy
+msgid "could not skip unnecessary pick commands"
+msgstr "Não foi possível saltar comandos pick desnecessários"
+
+#: sequencer.c:5504
+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"
"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
msgstr ""
-"%s: não há tal caminho na árvore de trabalho.\n"
-"Use 'git <comando> -- <caminho>...' para especificar caminhos que não "
-"existem localmente."
+"%s: sem tal path na working tree.\n"
+"Use 'git <comando> -- <path>...' para especificar caminhos inexistentes "
+"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 +7751,12 @@
"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 +7767,416 @@
"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
-#, 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:681
+#, fuzzy
+msgid "repo version is 0, but v1-only extensions found:"
+msgstr "extensões de repositório desconhecidas encontradas:"
-#: setup.c:778 builtin/index-pack.c:1646
-msgid "Cannot come back to cwd"
+#: 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 "'$%s' too big"
+msgstr ""
+
+#: 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:480
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr ""
+
+#: sha1-file.c:531
+#, fuzzy, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "não foi possível analisar o objeto: %s"
+
+#: sha1-file.c:603
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr ""
+
+#: sha1-file.c:610
+#, fuzzy, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "não foi possível analisar o objeto: %s"
+
+#: sha1-file.c:653
+#, 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:671
+#, fuzzy
+msgid "unable to read alternates file"
+msgstr "não foi possível ler o ficheiro de índice"
+
+#: sha1-file.c:678
+#, fuzzy
+msgid "unable to move new alternates file into place"
+msgstr "não foi possível escrever novo ficheiro de índice"
+
+#: sha1-file.c:713
#, c-format
msgid "path '%s' does not exist"
msgstr "o caminho '%s' não existe"
-#: sha1_file.c:585
+#: sha1-file.c:734
#, 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:740
#, 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:746
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "o repositório de referência '%s' é raso"
-#: sha1_file.c:605
+#: sha1-file.c:754
#, 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:2721
+#: sha1-file.c:814
#, 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 "invalid line while parsing alternate refs: %s"
+msgstr ""
-#: sha1_file.c:2725
+#: sha1-file.c:964
#, 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 "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr ""
-#: sha1_name.c:409
+#: sha1-file.c:985
+#, fuzzy
+msgid "mmap failed"
+msgstr "%s falhou"
+
+#: sha1-file.c:1149
+#, fuzzy, c-format
+msgid "object file %s is empty"
+msgstr "objeto local %s corrompido"
+
+#: sha1-file.c:1284 sha1-file.c:2477
+#, fuzzy, c-format
+msgid "corrupt loose object '%s'"
+msgstr "não foi possível analisar o objeto '%s'"
+
+#: sha1-file.c:1286 sha1-file.c:2481
+#, fuzzy, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "não foi possível analisar o objeto: %s"
+
+#: sha1-file.c:1328
+#, fuzzy
+msgid "invalid object type"
+msgstr "tipo de objeto incorreto."
+
+#: sha1-file.c:1412
+#, c-format
+msgid "unable to unpack %s header with --allow-unknown-type"
+msgstr ""
+
+#: sha1-file.c:1415
+#, fuzzy, c-format
+msgid "unable to unpack %s header"
+msgstr "não foi possível atualizar %s"
+
+#: sha1-file.c:1421
+#, c-format
+msgid "unable to parse %s header with --allow-unknown-type"
+msgstr ""
+
+#: sha1-file.c:1424
+#, fuzzy, c-format
+msgid "unable to parse %s header"
+msgstr "não foi possível atualizar %s"
+
+#: sha1-file.c:1651
+#, fuzzy, c-format
+msgid "failed to read object %s"
+msgstr "falha ao ler o objeto '%s'."
+
+#: sha1-file.c:1655
+#, fuzzy, c-format
+msgid "replacement %s not found for %s"
+msgstr "modelos não encontrados em %s"
+
+#: sha1-file.c:1659
+#, fuzzy, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "objeto local %s corrompido"
+
+#: sha1-file.c:1663
+#, fuzzy, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "objeto local %s corrompido"
+
+#: sha1-file.c:1768
+#, fuzzy, c-format
+msgid "unable to write file %s"
+msgstr "não foi possível escrever %s"
+
+#: sha1-file.c:1775
+#, fuzzy, c-format
+msgid "unable to set permission to '%s'"
+msgstr "não foi possível resolver revisão: %s"
+
+#: sha1-file.c:1782
+#, fuzzy
+msgid "file write error"
+msgstr "falha ao escrever para rev-list"
+
+#: sha1-file.c:1802
+#, fuzzy
+msgid "error when closing loose object file"
+msgstr "erro ao fechar ficheiro de pacote"
+
+#: sha1-file.c:1867
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
+msgstr ""
+
+#: sha1-file.c:1869
+#, fuzzy
+msgid "unable to create temporary file"
+msgstr "não foi possível criar índice temporário"
+
+#: sha1-file.c:1893
+#, fuzzy
+msgid "unable to write loose object file"
+msgstr "não é possível escrever o objeto de nota"
+
+#: sha1-file.c:1899
+#, fuzzy, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "não é possível compactar objeto acrescentado (%d)"
+
+#: sha1-file.c:1903
+#, fuzzy, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "falha de fstat de %s"
+
+#: sha1-file.c:1907
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr ""
+
+#: sha1-file.c:1917 builtin/pack-objects.c:1086
+#, fuzzy, c-format
+msgid "failed utime() on %s"
+msgstr "falha ao abrir '%s'"
+
+#: sha1-file.c:1994
+#, fuzzy, c-format
+msgid "cannot read object for %s"
+msgstr "não foi possível ler o objeto %s"
+
+#: sha1-file.c:2045
+#, fuzzy
+msgid "corrupt commit"
+msgstr "substituir autor do commit"
+
+#: sha1-file.c:2053
+#, fuzzy
+msgid "corrupt tag"
+msgstr "mostrar tags"
+
+#: sha1-file.c:2153
+#, c-format
+msgid "read error while indexing %s"
+msgstr ""
+
+#: sha1-file.c:2156
+#, fuzzy, c-format
+msgid "short read while indexing %s"
+msgstr "não é possível ler o índice"
+
+#: sha1-file.c:2229 sha1-file.c:2239
+#, fuzzy, c-format
+msgid "%s: failed to insert into database"
+msgstr "gpg não assinou os dados"
+
+#: sha1-file.c:2245
+#, fuzzy, c-format
+msgid "%s: unsupported file type"
+msgstr "versão de índice %s não suportada"
+
+#: sha1-file.c:2269
+#, fuzzy, c-format
+msgid "%s is not a valid object"
+msgstr "%s não é um objeto '%s' válido"
+
+#: sha1-file.c:2271
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s não é um objeto '%s' válido"
+
+#: sha1-file.c:2298 builtin/index-pack.c:192
+#, c-format
+msgid "unable to open %s"
+msgstr "não foi possível abrir %s"
+
+#: sha1-file.c:2488 sha1-file.c:2541
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr ""
+
+#: sha1-file.c:2512
+#, fuzzy, c-format
+msgid "unable to mmap %s"
+msgstr "não foi possível abrir %s"
+
+#: sha1-file.c:2517
+#, fuzzy, c-format
+msgid "unable to unpack header of %s"
+msgstr "não foi possível atualizar %s"
+
+#: sha1-file.c:2523
+#, fuzzy, c-format
+msgid "unable to parse header of %s"
+msgstr "não foi possível ler %s"
+
+#: sha1-file.c:2534
+#, 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 +8195,305 @@
"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:719
+#: builtin/rebase.c:864
+#, 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:1194
+#: 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'\n"
+
+#: submodule.c:1170
+#, fuzzy, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr "Impossível enviar submódulo '%s'\n"
+
+#: submodule.c:1462
+#, fuzzy, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "Buscando submódulo %s%s\n"
+
+#: submodule.c:1492
+#, fuzzy, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr "Submódulo '%s' inacessível\n"
+
+#: submodule.c:1646
+#, fuzzy, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"Erros na busca do submódulo:\n"
+"%s"
+
+#: 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 +8501,17 @@
"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,103 +8522,318 @@
"'%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:299 builtin/remote.c:324
#, 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:1236
+#, 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:1446
+#, 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:845
+#, fuzzy, c-format
+msgid "helper reported unexpected status of %s"
+msgstr "ls-tree retornou código de retorno inesperado %d"
+
+#: transport-helper.c:928
+#, fuzzy, c-format
+msgid "helper %s does not support dry-run"
+msgstr "O servidor não suporta --deepen"
+
+#: transport-helper.c:931
+#, fuzzy, c-format
+msgid "helper %s does not support --signed"
+msgstr "O servidor não suporta --shallow-since"
+
+#: transport-helper.c:934
+#, 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:939
+#, fuzzy, c-format
+msgid "helper %s does not support --atomic"
+msgstr "O servidor não suporta --shallow-since"
+
+#: transport-helper.c:943
+#, fuzzy, c-format
+msgid "helper %s does not support --%s"
+msgstr "O servidor não suporta --shallow-since"
+
+#: transport-helper.c:950
+#, 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:1050
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr ""
+
+#: transport-helper.c:1055
+#, fuzzy, c-format
+msgid "helper %s does not support 'force'"
+msgstr "O servidor não suporta --deepen"
+
+#: transport-helper.c:1102
+#, fuzzy
+msgid "couldn't run fast-export"
+msgstr "não foi possível executar o comando stash."
+
+#: transport-helper.c:1107
+#, fuzzy
+msgid "error while running fast-export"
+msgstr "erro ao fechar ficheiro de pacote"
+
+#: transport-helper.c:1132
+#, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch.\n"
+msgstr ""
+
+#: transport-helper.c:1213
+#, fuzzy, c-format
+msgid "unsupported object format '%s'"
+msgstr "objeto malformado em '%s'"
+
+#: transport-helper.c:1222
+#, fuzzy, c-format
+msgid "malformed response in ref list: %s"
+msgstr "folha de opções malformada: '%s'"
+
+#: transport-helper.c:1374
+#, fuzzy, c-format
+msgid "read(%s) failed"
+msgstr "%s falhou"
+
+#: transport-helper.c:1401
+#, fuzzy, c-format
+msgid "write(%s) failed"
+msgstr "%s falhou"
+
+#: transport-helper.c:1450
+#, fuzzy, c-format
+msgid "%s thread failed"
+msgstr "%s falhou"
+
+#: transport-helper.c:1454
+#, fuzzy, c-format
+msgid "%s thread failed to join: %s"
+msgstr "falha ao abrir '%s'"
+
+#: transport-helper.c:1473 transport-helper.c:1477
+#, c-format
+msgid "can't start thread for copying data: %s"
+msgstr ""
+
+#: transport-helper.c:1514
+#, c-format
+msgid "%s process failed to wait"
+msgstr ""
+
+#: transport-helper.c:1518
+#, fuzzy, c-format
+msgid "%s process failed"
+msgstr "%s falhou"
+
+#: transport-helper.c:1536 transport-helper.c:1545
+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:727
+#, fuzzy
+msgid "could not parse transport.color.* config"
+msgstr "não foi possível analisar o autor do script"
+
+#: transport.c:802
+msgid "support for protocol v2 not implemented yet"
+msgstr ""
+
+#: transport.c:936
+#, fuzzy, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "valor desconhecido '%s' da chave '%s'"
+
+#: transport.c:1002
+#, fuzzy, c-format
+msgid "transport '%s' not allowed"
+msgstr "ramo '%s' não encontrado."
+
+#: transport.c:1055
+msgid "git-over-rsync is no longer supported"
+msgstr ""
+
+#: transport.c:1157
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr ""
-"Os seguintes caminhos de submódulo contêm alterações que\n"
-"não puderam ser encontradas a nenhum remoto:\n"
+"Os seguintes paths de submódulo contêm alterações que\n"
+"puderam ser encontradas em remoto nenhum:\n"
-#: transport.c:893
+#: transport.c:1161
#, c-format
msgid ""
"\n"
@@ -3744,32 +8860,32 @@
"para publicá-las no remoto.\n"
"\n"
-#: transport.c:901
+#: transport.c:1169
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:1315
+#, 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 +8895,7 @@
"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 +8905,7 @@
"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 +8915,7 @@
"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 +8925,7 @@
"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 +8935,7 @@
"%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 +8945,7 @@
"%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 +8955,7 @@
"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 +8965,7 @@
"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 +8975,7 @@
"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"
@@ -3867,9 +8983,9 @@
msgstr ""
"Os seguintes ficheiros não controlados na árvore de trabalho seriam "
"removidos ao integrar:\n"
-"%%sMova ou remova-os antes de integrar."
+"%%sPor favor, mova 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 +8995,7 @@
"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 +9005,7 @@
"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,51 +9015,51 @@
"removidos por %s:\n"
"%%s"
-#: unpack-trees.c:142
-#, 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 ""
-"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
-"substituídos ao extrair:\n"
-"%%sMova ou remova-os antes de trocar de ramos."
-
-#: unpack-trees.c:144
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by "
-"checkout:\n"
-"%%s"
-msgstr ""
-"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
-"substituídos ao extrair:\n"
-"%%s"
-
-#: unpack-trees.c:147
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you merge."
-msgstr ""
-"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
-"substituídos ao integrar:\n"
-"%%sMova ou remova-os antes de integrar."
-
-#: unpack-trees.c:149
-#, c-format
-msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%s"
-msgstr ""
-"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
-"substituídos ao integrar:\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 ""
+"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
+"substituídos ao extrair:\n"
+"%%sMova ou remova-os antes de trocar de ramos."
+
+#: unpack-trees.c:154
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
+"substituídos ao extrair:\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 ""
+"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
+"substituídos ao integrar:\n"
+"%%sMova ou remova-os antes de integrar."
+
+#: unpack-trees.c:159
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Os seguintes ficheiros não controlados da árvore de trabalho seriam "
+"substituídos ao integrar:\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 ""
@@ -3951,7 +9067,7 @@
"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,44 +9077,12 @@
"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
-#, 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"
-
-#: unpack-trees.c:166
-#, 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"
-
-#: unpack-trees.c:168
-#, 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"
-
-#: unpack-trees.c:170
+#: unpack-trees.c:175
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -4007,19 +9091,64 @@
"Não é possível atualizar submódulo:\n"
"%s"
-#: unpack-trees.c:247
+#: unpack-trees.c:178
+#, c-format
+msgid ""
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:180
+#, fuzzy, c-format
+msgid ""
+"The following paths are unmerged and were left despite sparse patterns:\n"
+"%s"
+msgstr ""
+"Os seguintes caminhos estão unmerged e foram abandonados, apesar de sparse "
+"patterns:\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 ""
+
+#: 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:1550
+msgid "expected flush after fetch arguments"
+msgstr ""
#: urlmatch.c:163
msgid "invalid URL scheme name or missing '://' suffix"
@@ -4050,299 +9179,371 @@
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:2103
#, c-format
msgid "failed to read '%s'"
msgstr "falha ao ler '%s'"
-#: wrapper.c:222 wrapper.c:392
+#: worktree.c:283
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr ""
+
+#: worktree.c:294
+#, c-format
+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"
+
+#: 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 and writing"
msgstr "não foi possível abrir '%s' para leitura e escrita"
-#: wrapper.c:224 wrapper.c:394 builtin/am.c:766
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "não foi possível abrir '%s' para escrita"
-
-#: 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
-#, c-format
-msgid "could not open '%s' for reading"
-msgstr "não foi possível abrir '%s' para leitura"
-
-#: 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:180 wt-status.c:207
+#: 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: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 +9551,158 @@
"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 "Cherry-pick atualmente 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."
+msgstr "Atualmente em ramo nenhum."
-#: wt-status.c:1579
+#: wt-status.c:1767
msgid "Initial commit"
-msgstr "Commit inicial"
+msgstr "Memória inicial"
-#: wt-status.c:1593
+#: wt-status.c:1768
+#, fuzzy
+msgid "No commits yet"
+msgstr "Ainda commits nenhuns"
+
+#: 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 +9714,31 @@
"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 "
+msgstr "alteração nenhuma adicionada a commit (usa \"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"
+msgstr "alteração nenhuma adicionada a commit\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 +9747,382 @@
"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"
+msgstr "nada adicionado para commit mas ficheiros untracked presentes\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"
+msgstr "nada a commit (cria/copia ficheiros e usa \"git add\" para track)\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"
+msgstr "nada a commit\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"
+msgstr "nada a commit (use -u para mostrar ficheiros untracked)\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)"
+msgstr "HEAD (ramo nenhum)"
-#: wt-status.c:1782 wt-status.c:1790
+#: wt-status.c:1975
+msgid "different"
+msgstr "diferente"
+
+#: 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:457
#, 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"
+msgstr "remove '%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:908
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:559
+#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190
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:1547 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
-#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr "Use -f se deseja mesmo adicioná-los.\n"
+#: builtin/add.c:349
+#, fuzzy
+msgid "warn when adding an embedded repository"
+msgstr "criar um repositório nu"
-#: builtin/add.c:312
+#: 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"
+"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: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:1715 builtin/commit.c:351
+#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1502
+#, 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:1727 builtin/commit.c:357
+#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1508
+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:414
+#: builtin/am.c:352
msgid "could not parse author script"
msgstr "não foi possível analisar o autor do script"
-#: builtin/am.c:491
+#: builtin/am.c:436
#, 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:478
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Linha de entrada malformada: '%s'."
-#: builtin/am.c:569
+#: builtin/am.c:516
#, 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:542
msgid "fseek failed"
msgstr "falha ao invocar fseek"
-#: builtin/am.c:775
+#: builtin/am.c:730
#, 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:795
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:843
msgid "invalid timestamp"
msgstr "carimbo de data/hora inválido"
-#: builtin/am.c:890 builtin/am.c:898
+#: builtin/am.c:848 builtin/am.c:860
msgid "invalid Date line"
msgstr "linha de Data inválida"
-#: builtin/am.c:895
+#: builtin/am.c:855
msgid "invalid timezone offset"
msgstr "mudança de fuso horário inválida"
-#: builtin/am.c:984
+#: builtin/am.c:948
msgid "Patch format detection failed."
msgstr "Falha ao detetar o formato do patch."
-#: builtin/am.c:989 builtin/clone.c:397
+#: builtin/am.c:953 builtin/clone.c:410
#, c-format
msgid "failed to create directory '%s'"
msgstr "falha ao criar o diretório '%s'"
-#: builtin/am.c:993
+#: builtin/am.c:958
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:1089
#, 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:1090
#, 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:1091
#, 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:1174
+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"
+#: builtin/am.c:1202
+#, fuzzy
+msgid "Patch is empty."
+msgstr "O patch atual está vazio."
+
+#: builtin/am.c:1267
+#, fuzzy, c-format
+msgid "missing author line in commit %s"
+msgstr "Autor em falta: %s"
+
+#: builtin/am.c:1270
+#, fuzzy, c-format
+msgid "invalid ident line: %.*s"
msgstr "linha de identidade inválida: %s"
-#: 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:1610
+#: builtin/am.c:1489
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:1491
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:1510
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -4848,41 +10130,26 @@
"Editou o patch manualmente?\n"
"Não é possível aplicá-lo aos blobs registados no índice."
-#: builtin/am.c:1637
+#: builtin/am.c:1516
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:1542
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:1574
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:1626 builtin/am.c:1630
#, 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:1648
msgid "Commit Body is:"
msgstr "Corpo do commit:"
@@ -4890,35 +10157,39 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1774
+#: builtin/am.c:1658
+#, 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:1704 builtin/commit.c:395
+msgid "unable to write index file"
+msgstr "não é possível escrever o ficheiro de índice"
+
+#: builtin/am.c:1708
#, 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:1748 builtin/am.c:1816
#, c-format
msgid "Applying: %.*s"
msgstr "A aplicar: %.*s"
-#: builtin/am.c:1877
+#: builtin/am.c:1765
msgid "No changes -- Patch already applied."
msgstr "Nenhuma alteração -- Já foi aplicado o patch."
-#: builtin/am.c:1885
+#: builtin/am.c:1771
#, 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:1775
+msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
+msgstr ""
-#: builtin/am.c:1936
+#: builtin/am.c:1819
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 +10199,25 @@
"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:1826
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:1933 builtin/am.c:1937 builtin/am.c:1949 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:1985
msgid "failed to clean index"
msgstr "falha ao limpar o índice"
-#: builtin/am.c:2137
+#: builtin/am.c:2029
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -4954,134 +10225,158 @@
"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:2136
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valor inválido de --patch-format: %s"
-#: builtin/am.c:2233
+#: builtin/am.c:2178
+#, fuzzy, c-format
+msgid "Invalid value for --show-current-patch: %s"
+msgstr "Valor inválido de --patch-format: %s"
+
+#: builtin/am.c:2182
+#, 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:2213
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<opções>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2234
+#: builtin/am.c:2214
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<opções>] (--continue | --skip | --abort)"
-#: builtin/am.c:2240
+#: builtin/am.c:2220
msgid "run interactively"
msgstr "executar interativamente"
-#: builtin/am.c:2242
+#: builtin/am.c:2222
msgid "historical option -- no-op"
msgstr "opção histórica -- sem-ação"
-#: builtin/am.c:2244
+#: builtin/am.c:2224
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:2225 builtin/init-db.c:558 builtin/prune-packed.c:16
+#: builtin/repack.c:335 builtin/stash.c:815
msgid "be quiet"
msgstr "silencioso"
-#: builtin/am.c:2247
-msgid "add a Signed-off-by line to the commit message"
+#: builtin/am.c:2227
+#, fuzzy
+msgid "add a Signed-off-by trailer 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:2230
msgid "recode into utf8 (default)"
msgstr "recodificar em utf8 (predefinição)"
-#: builtin/am.c:2252
+#: builtin/am.c:2232
msgid "pass -k flag to git-mailinfo"
msgstr "passar a opção -k ao git-mailinfo"
-#: builtin/am.c:2254
+#: builtin/am.c:2234
msgid "pass -b flag to git-mailinfo"
msgstr "passar a opção -b ao git-mailinfo"
-#: builtin/am.c:2256
+#: builtin/am.c:2236
msgid "pass -m flag to git-mailinfo"
msgstr "passar a opção -m ao git-mailinfo"
-#: builtin/am.c:2258
+#: builtin/am.c:2238
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:2241
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:2244
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:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
+#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
+#: builtin/am.c:2273
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:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:903 builtin/merge.c:260
+#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
+#: builtin/rebase.c:1341 builtin/repack.c:346 builtin/repack.c:350
+#: builtin/repack.c:352 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:2269 builtin/branch.c:659 builtin/bugreport.c:136
+#: 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:2270
msgid "format the patch(es) are in"
msgstr "formato de apresentação de patches"
-#: builtin/am.c:2296
+#: builtin/am.c:2276
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:2278
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:2281
msgid "synonyms for --continue"
msgstr "sinónimo de --continue"
-#: builtin/am.c:2304
+#: builtin/am.c:2284
msgid "skip the current patch"
msgstr "ignorar o patch atual"
-#: builtin/am.c:2307
+#: builtin/am.c:2287
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:2290
+msgid "abort the patching operation but keep HEAD where it is."
+msgstr ""
+
+#: builtin/am.c:2294
+#, fuzzy
+msgid "show the patch being applied"
+msgstr "mostrar linhas não correspondidas"
+
+#: builtin/am.c:2299
msgid "lie about committer date"
msgstr "mentir sobre a data de commit"
-#: builtin/am.c:2313
+#: builtin/am.c:2301
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:2303 builtin/commit-tree.c:120 builtin/commit.c:1515
+#: builtin/merge.c:297 builtin/pull.c:175 builtin/rebase.c:536
+#: builtin/rebase.c:1394 builtin/revert.c:117 builtin/tag.c:419
msgid "key-id"
msgstr "id-chave"
-#: builtin/am.c:2316
+#: builtin/am.c:2304 builtin/rebase.c:537 builtin/rebase.c:1395
msgid "GPG-sign commits"
msgstr "assinar os commits com GPG"
-#: builtin/am.c:2319
+#: builtin/am.c:2307
msgid "(internal use for git-rebase)"
msgstr "(uso interno de git-rebase)"
-#: builtin/am.c:2334
+#: builtin/am.c:2325
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 +10384,17 @@
"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:2332
msgid "failed to read the index"
msgstr "falha ao ler o índice"
-#: builtin/am.c:2356
+#: builtin/am.c:2347
#, 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:2371
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -5108,10 +10403,14 @@
"Diretório abandonado %s encontrado.\n"
"Use \"git am --abort\" para o remover."
-#: builtin/am.c:2386
+#: builtin/am.c:2377
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:2387
+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 +10428,569 @@
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 --bisect-reset [<commit>]"
msgstr "git bisect--helper --next-all [--no-checkout]"
-#: builtin/bisect--helper.c:17
-msgid "perform 'git bisect next'"
-msgstr "executar 'git bisect next'"
+#: builtin/bisect--helper.c:24
+msgid ""
+"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
+"<bad_term>"
+msgstr ""
-#: 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:25
+msgid ""
+"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
+"<bad_term>"
+msgstr ""
-#: builtin/blame.c:33
+#: builtin/bisect--helper.c:26
+msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+msgstr ""
+
+#: builtin/bisect--helper.c:27
+#, fuzzy
+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:28
+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:30
+#, fuzzy
+msgid "git bisect--helper --bisect-next"
+msgstr "git bisect--helper --next-all [--no-checkout]"
+
+#: builtin/bisect--helper.c:31
+#, fuzzy
+msgid "git bisect--helper --bisect-auto-next"
+msgstr "git bisect--helper --next-all [--no-checkout]"
+
+#: builtin/bisect--helper.c:32
+#, fuzzy
+msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
+msgstr "git bisect--helper --next-all [--no-checkout]"
+
+#: builtin/bisect--helper.c:33
+#, fuzzy
+msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
+msgstr "git bisect--helper --next-all [--no-checkout]"
+
+#: builtin/bisect--helper.c:108
+#, fuzzy, c-format
+msgid "cannot open file '%s' in mode '%s'"
+msgstr "não é possível abrir o ficheiro '%s'"
+
+#: builtin/bisect--helper.c:115
+#, fuzzy, c-format
+msgid "could not write to file '%s'"
+msgstr "não foi possível escrever em '%s'"
+
+#: builtin/bisect--helper.c:154
+#, fuzzy, c-format
+msgid "'%s' is not a valid term"
+msgstr "'%s' não é uma referência válida."
+
+#: builtin/bisect--helper.c:158
+#, 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:168
+#, 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:178
+msgid "please use two different terms"
+msgstr "por favor, usa dois termos diferentes"
+
+#: builtin/bisect--helper.c:194
+#, fuzzy, c-format
+msgid "We are not bisecting.\n"
+msgstr "Estamos bissetando nada.\n"
+
+#: builtin/bisect--helper.c:202
+#, fuzzy, c-format
+msgid "'%s' is not a valid commit"
+msgstr "'%s' não é um commit"
+
+#: builtin/bisect--helper.c:211
+#, fuzzy, c-format
+msgid ""
+"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
+msgstr ""
+"pude check out HEAD original '%s' nenhuma. Tenta 'git bisect reset <commit>'."
+
+#: builtin/bisect--helper.c:255
+#, fuzzy, c-format
+msgid "Bad bisect_write argument: %s"
+msgstr "Argumento de bisect_write incorreto: $state"
+
+#: builtin/bisect--helper.c:260
+#, 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:272
+#, fuzzy, c-format
+msgid "couldn't open the file '%s'"
+msgstr "Não foi possível abrir o ficheiro '%s'"
+
+#: builtin/bisect--helper.c:298
+#, 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:325
+#, 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:329
+#, 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:349
+#, 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:357
+msgid "Are you sure [Y/n]? "
+msgstr "Tem a certeza [Y/n]? "
+
+#: builtin/bisect--helper.c:418
+msgid "no terms defined"
+msgstr "termo nenhum definido"
+
+#: builtin/bisect--helper.c:421
+#, 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:431
+#, 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 %s para 'git bisect terms'.\n"
+"Opções suportadas: --term-good|--term-old e --term-bad|--term-new."
+
+#: builtin/bisect--helper.c:498
+#, fuzzy
+msgid "revision walk setup failed\n"
+msgstr "falha ao configurar percurso de revisões\n"
+
+#: builtin/bisect--helper.c:520
+#, fuzzy, c-format
+msgid "could not open '%s' for appending"
+msgstr "não foi possível abrir '%s' para leitura"
+
+#: builtin/bisect--helper.c:639 builtin/bisect--helper.c:652
+#, fuzzy
+msgid "'' is not a valid term"
+msgstr "'$term' não é um termo válido"
+
+#: builtin/bisect--helper.c:662
+#, fuzzy, c-format
+msgid "unrecognized option: '%s'"
+msgstr "posição não reconhecida:%s"
+
+#: builtin/bisect--helper.c:666
+#, 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:697
+#, fuzzy
+msgid "bad HEAD - I need a HEAD"
+msgstr "HEAD incorreta - é necessário uma HEAD"
+
+#: builtin/bisect--helper.c:712
+#, 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:733
+msgid "won't bisect on cg-seek'ed tree"
+msgstr "não é possível bissetar numa árvore \"cg-seek'ed\""
+
+#: builtin/bisect--helper.c:736
+#, fuzzy
+msgid "bad HEAD - strange symbolic ref"
+msgstr "HEAD incorreta - referência simbólica desconhecida"
+
+#: builtin/bisect--helper.c:756
+#, fuzzy, c-format
+msgid "invalid ref: '%s'"
+msgstr "ficheiro inválido: '%s'"
+
+#: builtin/bisect--helper.c:814
+#, fuzzy
+msgid "You need to start by \"git bisect start\"\n"
+msgstr "Deve começar por executar \"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:825
+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:843
+#, fuzzy
+msgid "Please call `--bisect-state` with at least one argument"
+msgstr "Invoque 'bisect_state' com pelo menos um argumento."
+
+#: builtin/bisect--helper.c:856
+#, fuzzy, c-format
+msgid "'git bisect %s' can take only one argument."
+msgstr "'git bisect $TERM_BAD' só leva um argumento."
+
+#: builtin/bisect--helper.c:868 builtin/bisect--helper.c:879
+#, fuzzy, c-format
+msgid "Bad rev input: %s"
+msgstr "Revisão incorreta na entrada: $arg"
+
+#: builtin/bisect--helper.c:924
+#, fuzzy
+msgid "reset the bisection state"
+msgstr "remover uma secção: nome"
+
+#: builtin/bisect--helper.c:926
+msgid "write out the bisection state in BISECT_LOG"
+msgstr ""
+
+#: builtin/bisect--helper.c:928
+msgid "check and set terms in a bisection state"
+msgstr ""
+
+#: builtin/bisect--helper.c:930
+msgid "check whether bad or good terms exist"
+msgstr ""
+
+#: builtin/bisect--helper.c:932
+#, fuzzy
+msgid "print out the bisect terms"
+msgstr "imprimir apenas as tags do objeto"
+
+#: builtin/bisect--helper.c:934
+msgid "start the bisect session"
+msgstr ""
+
+#: builtin/bisect--helper.c:936
+#, fuzzy
+msgid "find the next bisection commit"
+msgstr "não é possível emendar commit não-existente"
+
+#: builtin/bisect--helper.c:938
+msgid "verify the next bisection state then checkout the next bisection commit"
+msgstr ""
+
+#: builtin/bisect--helper.c:940
+msgid "mark the state of ref (or refs)"
+msgstr ""
+
+#: builtin/bisect--helper.c:942
+msgid "no log for BISECT_WRITE"
+msgstr ""
+
+#: builtin/bisect--helper.c:957
+msgid "--bisect-reset requires either no argument or a commit"
+msgstr ""
+
+#: builtin/bisect--helper.c:961
+#, fuzzy
+msgid "--bisect-write requires either 4 or 5 arguments"
+msgstr ":strip= requer um inteiro positivo como argumento"
+
+#: builtin/bisect--helper.c:967
+msgid "--check-and-set-terms requires 3 arguments"
+msgstr ""
+
+#: builtin/bisect--helper.c:973
+msgid "--bisect-next-check requires 2 or 3 arguments"
+msgstr ""
+
+#: builtin/bisect--helper.c:979
+#, fuzzy
+msgid "--bisect-terms requires 0 or 1 argument"
+msgstr ":strip= requer um inteiro positivo como argumento"
+
+#: builtin/bisect--helper.c:988
+#, fuzzy
+msgid "--bisect-next requires 0 arguments"
+msgstr "--continue não leva argumentos"
+
+#: builtin/bisect--helper.c:994
+#, fuzzy
+msgid "--bisect-auto-next requires 0 arguments"
+msgstr "--continue 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:2573
+#: 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:847
+#, c-format
+msgid "cannot find revision %s to ignore"
+msgstr ""
+
+#: builtin/blame.c:869
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:870
+#, 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:871
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:872
msgid "Show work cost statistics"
msgstr "Mostrar estatísticas de custo de atividade"
-#: builtin/blame.c:2577
+#: builtin/blame.c:873
msgid "Force progress reporting"
msgstr "Forçar informação de progresso"
-#: builtin/blame.c:2578
+#: builtin/blame.c:874
msgid "Show output score for blame entries"
msgstr "Mostrar a pontuação das entradas de culpa"
-#: builtin/blame.c:2579
+#: builtin/blame.c:875
msgid "Show original filename (Default: auto)"
msgstr "Mostrar o nome do ficheiro original (Predefinição: auto)"
-#: builtin/blame.c:2580
+#: builtin/blame.c:876
msgid "Show original linenumber (Default: off)"
msgstr "Mostrar números de linha originais (Predefinição: desativado)"
-#: builtin/blame.c:2581
+#: builtin/blame.c:877
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:878
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:879
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:880
msgid "Show raw timestamp (Default: off)"
msgstr "Mostrar carimbo de data/hora em bruto (Predefinição: desativado)"
-#: builtin/blame.c:2585
+#: builtin/blame.c:881
msgid "Show long commit SHA1 (Default: off)"
msgstr "Mostrar SHA1 longo de commit (Predefinição: desativado)"
-#: builtin/blame.c:2586
+#: builtin/blame.c:882
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:883
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:884
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:885 builtin/log.c:1813
+#, fuzzy
+msgid "rev"
+msgstr "reverter"
-#: builtin/blame.c:2597
+#: builtin/blame.c:885
+#, fuzzy
+msgid "Ignore <rev> when blaming"
+msgstr "ignorar o índice ao verificar"
+
+#: builtin/blame.c:886
+#, fuzzy
+msgid "Ignore revisions from <file>"
+msgstr "ler mensagem de um ficheiro"
+
+#: builtin/blame.c:887
+msgid "color redundant metadata from previous line differently"
+msgstr ""
+
+#: builtin/blame.c:888
+msgid "color lines by age"
+msgstr ""
+
+#: builtin/blame.c:889
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:890
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:891
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:892 builtin/blame.c:893
msgid "score"
msgstr "pontuação"
-#: builtin/blame.c:2600
+#: builtin/blame.c:892
msgid "Find line copies within and across files"
msgstr "Localizar linhas copiadas dentro e entre ficheiros"
-#: builtin/blame.c:2601
+#: builtin/blame.c:893
msgid "Find line movements within and across files"
msgstr "Localizar linhas movidas dentro e entre ficheiros"
-#: builtin/blame.c:2602
-msgid "n,m"
-msgstr "n,m"
+#: builtin/blame.c:894
+#, fuzzy
+msgid "range"
+msgstr "Não é um intervalo."
-#: builtin/blame.c:2602
-msgid "Process only line range n,m, counting from 1"
+#: builtin/blame.c:895
+#, fuzzy
+msgid "Process only line range <start>,<end> or function :<funcname>"
msgstr "Processar apenas o intervalo de linhas n,m, a cantar de 1"
-#: builtin/blame.c:2649
+#: builtin/blame.c:947
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:998
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:1114
#, 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:1159
+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 +10999,7 @@
"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 +11008,12 @@
"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 +11022,130 @@
"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"
+
+#: 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 +11156,188 @@
" %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:532
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:790
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'."
+msgstr "Ramo nenhum 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:712
-msgid "too many branches to set new upstream"
+#: 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: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 +11345,197 @@
"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"
-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:839
+#, fuzzy
msgid ""
-"The --set-upstream flag is deprecated and will be removed. Consider using --"
-"track or --set-upstream-to\n"
-msgstr ""
-"A opção --set-upstream é obsoleta e será removida. Considere o uso de --"
-"track ou --set-upstream-to\n"
+"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, em 'git branch' levam nome de branch nenhum.\n"
+"Quiseste utilizar: -a|-r --list <pattern>? "
-#: builtin/branch.c:785
-#, c-format
+#: builtin/branch.c:843
+#, fuzzy
msgid ""
-"\n"
-"If you wanted to make '%s' track '%s', do this:\n"
-"\n"
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
msgstr ""
-"\n"
-"Se quer que '%s' siga '%s', faça:\n"
-"\n"
+"A opção --set-upstream está obsoleta. Por favor, usa '--track' ou '--set-"
+"upstream-to' invés."
-#: builtin/bundle.c:45
+#: builtin/bugreport.c:15
+#, fuzzy
+msgid "git version:\n"
+msgstr "versão git:\n"
+
+#: builtin/bugreport.c:21
#, c-format
-msgid "%s is okay\n"
-msgstr "%s está correto\n"
+msgid "uname() failed with error '%s' (%d)\n"
+msgstr ""
-#: builtin/bundle.c:58
+#: 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"
+"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:135
+msgid "specify a destination for the bugreport file"
+msgstr ""
+
+#: builtin/bugreport.c:137
+msgid "specify a strftime format suffix for the filename"
+msgstr ""
+
+#: builtin/bugreport.c:159
+#, 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:166
+msgid "System Info"
+msgstr ""
+
+#: builtin/bugreport.c:169
+#, fuzzy
+msgid "Enabled Hooks"
+msgstr "não foi possível abrir %s"
+
+#: builtin/bugreport.c:176
+#, 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:179
+#, fuzzy, c-format
+msgid "unable to write to %s"
+msgstr "não foi possível escrever %s"
+
+#: builtin/bugreport.c:189
+#, c-format
+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: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á ok\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:1700
+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:1731
+#, 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 +11543,378 @@
"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:1500 builtin/gc.c:541
+#: 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"
+msgstr "path nenhum 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"
+msgstr "contato nenhum especificado"
-#: builtin/checkout-index.c:127
+#: builtin/checkout-index.c:139
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<opções>] [--] [<ficheiro>...]"
-#: builtin/checkout-index.c:144
+#: builtin/checkout-index.c:156
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:173
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:174
msgid "force overwrite of existing files"
msgstr "forçar substituição dos ficheiros existentes"
-#: builtin/checkout-index.c:163
+#: builtin/checkout-index.c:176
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:178
msgid "don't checkout new files"
msgstr "não extrair novos ficheiros"
-#: builtin/checkout-index.c:167
+#: builtin/checkout-index.c:180
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:184
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:186
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:187 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:757
msgid "string"
msgstr "cadeia"
-#: builtin/checkout-index.c:175
+#: builtin/checkout-index.c:188
msgid "when creating files, prepend <string>"
msgstr "preceder <cadeia> ao criar ficheiros"
-#: builtin/checkout-index.c:177
+#: builtin/checkout-index.c:190
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"
+msgstr[1] "%d caminhos atualizados"
+
+#: 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:541 builtin/checkout.c:548
#, c-format
msgid "path '%s' is unmerged"
msgstr "o caminho '%s' não foi integrado"
-#: builtin/checkout.c:513
+#: builtin/checkout.c:716
msgid "you need to resolve your current index first"
msgstr "primeiro deve resolver o índice atual"
-#: builtin/checkout.c:644
+#: builtin/checkout.c:770
+#, c-format
+msgid ""
+"cannot continue with staged changes in the following files:\n"
+"%s"
+msgstr ""
+
+#: builtin/checkout.c:866
#, 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:908
msgid "HEAD is now at"
msgstr "HEAD está agora em"
-#: builtin/checkout.c:689 builtin/clone.c:678
+#: builtin/checkout.c:912 builtin/clone.c:721 t/helper/test-fast-rebase.c:202
msgid "unable to update HEAD"
msgstr "não foi possível atualizar HEAD"
-#: builtin/checkout.c:693
+#: builtin/checkout.c:916
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Repor ramo '%s'\n"
-#: builtin/checkout.c:696
+#: builtin/checkout.c:919
#, c-format
msgid "Already on '%s'\n"
msgstr "Já em '%s'\n"
-#: builtin/checkout.c:700
+#: builtin/checkout.c:923
#, 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:925 builtin/checkout.c:1356
#, 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:927
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Mudou para o ramo '%s'\n"
-#: builtin/checkout.c:755
+#: builtin/checkout.c:978
#, c-format
msgid " ... and %d more.\n"
msgstr " ... e mais %d.\n"
-#: builtin/checkout.c:761
+#: builtin/checkout.c:984
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -6053,15 +11927,17 @@
"\n"
"%s\n"
msgstr[0] ""
-"Aviso: deixa %d commit para trás, não ligado a nenhum ramo:\n"
+"Aviso: estás deixando %d commit para trás, desconetado a qualquer dos "
+"teus ramos:\n"
"\n"
"%s\n"
msgstr[1] ""
-"Aviso: deixa %d commits para trás, não ligados a nenhum ramo:\n"
+"Aviso: estás deixando %d commits para trás, desconetado a qualquer "
+"dos teus ramos:\n"
"\n"
"%s\n"
-#: builtin/checkout.c:780
+#: builtin/checkout.c:1003
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -6088,166 +11964,256 @@
" git branch <nome-do-novo-ramo> %s\n"
"\n"
-#: builtin/checkout.c:816
+#: builtin/checkout.c:1038
msgid "internal error in revision walk"
msgstr "erro interno durante o curso de revisões"
-#: builtin/checkout.c:820
+#: builtin/checkout.c:1042
msgid "Previous HEAD position was"
msgstr "A posição anterior de HEAD era"
-#: builtin/checkout.c:847 builtin/checkout.c:1085
+#: builtin/checkout.c:1082 builtin/checkout.c:1351
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:1164
+#, 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:1171
+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:1181
+#, fuzzy, c-format
+msgid "'%s' matched multiple (%d) remote tracking branches"
+msgstr "atuar sobre ramos de monitorização remotos"
+
+#: builtin/checkout.c:1247
+#, fuzzy
+msgid "only one reference expected"
+msgstr "esperava-se apenas uma referência, %d fornecidas."
+
+#: builtin/checkout.c:1264
#, 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:1310 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:1323 builtin/checkout.c:1689
#, 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:1370
+#, 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:1372
+#, 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:1373 builtin/checkout.c:1381
+#, fuzzy, c-format
+msgid "a branch is expected, got '%s'"
+msgstr "O ramo %s está a ser bissetado em %s"
+
+#: builtin/checkout.c:1376
+#, fuzzy, c-format
+msgid "a branch is expected, got commit '%s'"
+msgstr "é suposto um branch, recebi um commit '%s'"
+
+#: builtin/checkout.c:1392
+msgid ""
+"cannot switch branch while merging\n"
+"Consider \"git merge --quit\" or \"git worktree add\"."
+msgstr ""
+
+#: builtin/checkout.c:1396
+msgid ""
+"cannot switch branch in the middle of an am session\n"
+"Consider \"git am --quit\" or \"git worktree add\"."
+msgstr ""
+
+#: builtin/checkout.c:1400
+msgid ""
+"cannot switch branch while rebasing\n"
+"Consider \"git rebase --quit\" or \"git worktree add\"."
+msgstr ""
+
+#: builtin/checkout.c:1404
+msgid ""
+"cannot switch branch while cherry-picking\n"
+"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
+msgstr ""
+
+#: builtin/checkout.c:1408
+msgid ""
+"cannot switch branch while reverting\n"
+"Consider \"git revert --quit\" or \"git worktree add\"."
+msgstr ""
+
+#: builtin/checkout.c:1412
+#, fuzzy
+msgid "you are switching branch while bisecting"
+msgstr "Está a bissetar neste momento."
+
+#: builtin/checkout.c:1419
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:1422 builtin/checkout.c:1426 builtin/checkout.c:1430
#, 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:1434 builtin/checkout.c:1437 builtin/checkout.c:1440
+#: builtin/checkout.c:1445 builtin/checkout.c:1450
#, 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:1447
+#, fuzzy, c-format
+msgid "'%s' cannot take <start-point>"
+msgstr "'%s' não pode ser usado com caminhos em atualização"
+
+#: builtin/checkout.c:1455
#, 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:1462
+#, 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:1504 builtin/clone.c:92 builtin/commit-graph.c:84
+#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:296
+#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:575
+#: builtin/send-pack.c:198
+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:1163
-msgid "create reflog for new branch"
-msgstr "criar reflog do novo ramo"
-
-#: builtin/checkout.c:1164 builtin/worktree.c:329
-msgid "detach HEAD at named commit"
-msgstr "destacar HEAD no commit indicado"
-
-#: builtin/checkout.c:1165
-msgid "set upstream info for new branch"
-msgstr "definir a informação do ramo a montante do novo ramo"
-
-#: builtin/checkout.c:1167
-msgid "new-branch"
-msgstr "novo-ramo"
-
-#: builtin/checkout.c:1167
-msgid "new unparented branch"
-msgstr "novo ramo sem pai"
-
-#: builtin/checkout.c:1168
-msgid "checkout our version for unmerged files"
-msgstr "extrair a nossa versão dos ficheiros não integrados"
-
-#: builtin/checkout.c:1170
-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
+#: builtin/checkout.c:1505
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
+#: builtin/checkout.c:1506 builtin/log.c:1800 parse-options.h:322
msgid "style"
msgstr "estilo"
-#: builtin/checkout.c:1176
+#: builtin/checkout.c:1507
msgid "conflict style (merge or diff3)"
msgstr "estilo de conflito (merge ou diff3)"
-#: builtin/checkout.c:1179
-msgid "do not limit pathspecs to sparse entries only"
-msgstr "não restringir especificadores de caminho a entradas esparsas"
+#: builtin/checkout.c:1519 builtin/worktree.c:558
+msgid "detach HEAD at named commit"
+msgstr "destacar HEAD no commit indicado"
-#: builtin/checkout.c:1181
-msgid "second guess 'git checkout <no-such-branch>'"
-msgstr "tentar adivinhar 'git checkout <ramo-inexistente>'"
+#: builtin/checkout.c:1520
+msgid "set upstream info for new branch"
+msgstr "definir a informação do ramo a montante do novo ramo"
-#: builtin/checkout.c:1183
+#: builtin/checkout.c:1522
+msgid "force checkout (throw away local modifications)"
+msgstr "forçar extração (descartar modificações locais)"
+
+#: builtin/checkout.c:1524
+msgid "new-branch"
+msgstr "novo-ramo"
+
+#: builtin/checkout.c:1524
+msgid "new unparented branch"
+msgstr "novo ramo sem pai"
+
+#: builtin/checkout.c:1526 builtin/merge.c:300
+msgid "update ignored files (default)"
+msgstr "atualizar ficheiros ignorados (predefinição)"
+
+#: builtin/checkout.c:1529
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:1542
+msgid "checkout our version for unmerged files"
+msgstr "extrair a nossa versão dos ficheiros não integrados"
-#: builtin/checkout.c:1224
-msgid "-b, -B and --orphan are mutually exclusive"
+#: builtin/checkout.c:1545
+msgid "checkout their version for unmerged files"
+msgstr "extrair a versão deles dos ficheiros não integrados"
+
+#: builtin/checkout.c:1549
+msgid "do not limit pathspecs to sparse entries only"
+msgstr "não restringir especificadores de caminho a entradas esparsas"
+
+#: builtin/checkout.c:1604
+#, fuzzy, c-format
+msgid "-%c, -%c and --orphan are mutually exclusive"
msgstr "-b, -B e --orphan são mutuamente exclusivos"
-#: builtin/checkout.c:1241
+#: builtin/checkout.c:1608
+#, fuzzy
+msgid "-p and --overlay are mutually exclusive"
+msgstr "-b, -B e --orphan são mutuamente exclusivos"
+
+#: builtin/checkout.c:1645
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:1650
+#, fuzzy, c-format
+msgid "missing branch name; try -%c"
msgstr "Falta um nome dum ramo; tente -b"
-#: builtin/checkout.c:1282
+#: builtin/checkout.c:1682
+#, fuzzy, c-format
+msgid "could not resolve %s"
+msgstr "não foi possível remover '%s'"
+
+#: builtin/checkout.c:1698
msgid "invalid path specification"
msgstr "especificação de caminho inválida"
-#: builtin/checkout.c:1289
+#: builtin/checkout.c:1705
#, 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:1709
#, 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:1718
+#, fuzzy
+msgid "--pathspec-from-file is incompatible with --detach"
+msgstr "--first-parent é incompatível com --bisect"
+
+#: builtin/checkout.c:1721 builtin/reset.c:325 builtin/stash.c:1499
+#, fuzzy
+msgid "--pathspec-from-file is incompatible with --patch"
+msgstr "--first-parent é incompatível com --bisect"
+
+#: builtin/checkout.c:1734
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -6255,38 +12221,120 @@
"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:1739
+#, fuzzy
+msgid "you must specify path(s) to restore"
+msgstr "Deve especificar um diretório."
+
+#: builtin/checkout.c:1765 builtin/checkout.c:1767 builtin/checkout.c:1816
+#: builtin/checkout.c:1818 builtin/clone.c:122 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:1766
+msgid "create and checkout a new branch"
+msgstr "criar e extrair um novo ramo"
+
+#: builtin/checkout.c:1768
+msgid "create/reset and checkout a branch"
+msgstr "criar/repor e extrair um ramo"
+
+#: builtin/checkout.c:1769
+msgid "create reflog for new branch"
+msgstr "criar reflog do novo ramo"
+
+#: builtin/checkout.c:1771
+#, fuzzy
+msgid "second guess 'git checkout <no-such-branch>' (default)"
+msgstr "tentar adivinhar 'git checkout <ramo-inexistente>'"
+
+#: builtin/checkout.c:1772
+#, fuzzy
+msgid "use overlay mode (default)"
+msgstr "eliminar referências soltas (predefinição)"
+
+#: builtin/checkout.c:1817
+#, fuzzy
+msgid "create and switch to a new branch"
+msgstr "criar e extrair um novo ramo"
+
+#: builtin/checkout.c:1819
+#, fuzzy
+msgid "create/reset and switch to a branch"
+msgstr "criar/repor e extrair um ramo"
+
+#: builtin/checkout.c:1821
+#, fuzzy
+msgid "second guess 'git switch <no-such-branch>'"
+msgstr "tentar adivinhar 'git checkout <ramo-inexistente>'"
+
+#: builtin/checkout.c:1823
+#, fuzzy
+msgid "throw away local modifications"
+msgstr "forçar extração (descartar modificações locais)"
+
+#: builtin/checkout.c:1857
+msgid "which tree-ish to checkout from"
+msgstr ""
+
+#: builtin/checkout.c:1859
+#, fuzzy
+msgid "restore the index"
+msgstr "falha ao ler o índice"
+
+#: builtin/checkout.c:1861
+#, fuzzy
+msgid "restore the working tree (default)"
+msgstr "Mostrar o estado da árvores de trabalho"
+
+#: builtin/checkout.c:1863
+#, fuzzy
+msgid "ignore unmerged entries"
+msgstr "ignora unmerged entries"
+
+#: builtin/checkout.c:1864
+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\n"
+
+#: builtin/clean.c:302 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -6297,9 +12345,9 @@
"Ajuda de linha de comandos:\n"
"1 - selecionar um item numerado\n"
"foo - selecionar item baseado no prefixo único\n"
-" - (vazio) não seleciona nada\n"
+" - (vazio) seleciona nada\n"
-#: builtin/clean.c:301 git-add--interactive.perl:623
+#: builtin/clean.c:306 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -6320,13 +12368,13 @@
"* - 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:568
+#: git-add--interactive.perl:573
#, 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 +12394,7 @@
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,210 +12412,232 @@
"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:921 builtin/log.c:183 builtin/log.c:185
+#: 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"
msgstr ""
"clean.requireForce definido como true e nenhum -i, -n, ou -f fornecido; "
-"limpeza recusada"
+"recusando limpar"
-#: builtin/clean.c:910
+#: builtin/clean.c:932
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
msgstr ""
"clean.requireForce predefinido como true e nenhum -i, -n, ou -f fornecido; "
-"limpeza recusada"
+"recusando limpar"
-#: 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:94
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:95 builtin/clone.c:97 builtin/init-db.c:553
msgid "create a bare repository"
msgstr "criar um repositório nu"
-#: builtin/clone.c:85
+#: builtin/clone.c:99
msgid "create a mirror repository (implies bare)"
msgstr "criar um repositório espelhado (implica repositório nu)"
-#: builtin/clone.c:87
+#: builtin/clone.c:101
msgid "to clone from a local repository"
msgstr "para clonar de um repositório local"
-#: builtin/clone.c:89
+#: builtin/clone.c:103
msgid "don't use local hardlinks, always copy"
msgstr "não usar ligações fixas, copiar sempre"
-#: builtin/clone.c:91
+#: builtin/clone.c:105
msgid "setup as shared repository"
msgstr "configurar como repositório partilhado"
-#: builtin/clone.c:93 builtin/clone.c:97
+#: builtin/clone.c:107
msgid "pathspec"
msgstr "pathspec"
-#: builtin/clone.c:93 builtin/clone.c:97
+#: builtin/clone.c:107
msgid "initialize submodules in the clone"
msgstr "inicializar submódulos no clone"
-#: builtin/clone.c:100
+#: builtin/clone.c:111
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:112 builtin/init-db.c:550
msgid "template-directory"
msgstr "diretório-modelo"
-#: builtin/clone.c:102 builtin/init-db.c:476
+#: builtin/clone.c:113 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:115 builtin/clone.c:117 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:119 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:120 builtin/column.c:27 builtin/init-db.c:561
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:358
msgid "name"
msgstr "nome"
-#: builtin/clone.c:110
+#: builtin/clone.c:121
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:123
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:125
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:126 builtin/fetch.c:173 builtin/grep.c:860
+#: builtin/pull.c:208
msgid "depth"
msgstr "profundidade"
-#: builtin/clone.c:116
+#: builtin/clone.c:127
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:128 builtin/fetch.c:175 builtin/pack-objects.c:3535
+#: builtin/pull.c:211
msgid "time"
msgstr "hora"
-#: builtin/clone.c:118
+#: builtin/clone.c:129
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:130 builtin/fetch.c:177 builtin/fetch.c:200
+#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1317
msgid "revision"
msgstr "revisão"
-#: builtin/clone.c:120 builtin/fetch.c:125
+#: builtin/clone.c:131 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:133 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:135
+msgid "don't clone any tags, and make later fetches not to follow them"
+msgstr ""
+
+#: builtin/clone.c:137
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:138 builtin/init-db.c:559
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:126 builtin/init-db.c:485
+#: builtin/clone.c:139 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:140
msgid "key=value"
msgstr "chave=valor"
-#: builtin/clone.c:128
+#: builtin/clone.c:141
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:143 builtin/fetch.c:195 builtin/ls-remote.c:76
+#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
+msgid "server-specific"
+msgstr "específico do servidor"
+
+#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76
+#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
+msgid "option to transmit"
+msgstr "opção para transmitir"
+
+#: builtin/clone.c:144 builtin/fetch.c:196 builtin/pull.c:234
+#: builtin/push.c:585
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:146 builtin/fetch.c:198 builtin/pull.c:237
+#: builtin/push.c:587
msgid "use IPv6 addresses only"
msgstr "usar apenas endereços IPv6"
-#: builtin/clone.c:268
+#: builtin/clone.c:150
+#, fuzzy
+msgid "any cloned submodules will use their remote-tracking branch"
+msgstr "qualquer submódulo clonado será raso"
+
+#: builtin/clone.c:152
+msgid "initialize sparse-checkout file to include only files at root"
+msgstr ""
+
+#: builtin/clone.c:288
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -6580,147 +12645,153 @@
"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:341
#, 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:414
#, 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:432
+#, fuzzy, c-format
+msgid "failed to start iterator over '%s'"
+msgstr "falha ao escrever para '%s'"
-#: builtin/clone.c:437
+#: builtin/clone.c:463
#, c-format
msgid "failed to create link '%s'"
msgstr "falha ao criar a ligação '%s'"
-#: builtin/clone.c:441
+#: builtin/clone.c:467
#, c-format
msgid "failed to copy file to '%s'"
msgstr "falha ao copiar o ficheiro para '%s'"
-#: builtin/clone.c:466
+#: builtin/clone.c:472
+#, fuzzy, c-format
+msgid "failed to iterate over '%s'"
+msgstr "falha ao remover '%s'"
+
+#: builtin/clone.c:499
#, c-format
msgid "done.\n"
msgstr "concluído.\n"
-#: builtin/clone.c:478
+#: builtin/clone.c:513
+#, 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:590
#, 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:709
#, c-format
msgid "unable to update %s"
msgstr "não foi possível atualizar %s"
-#: builtin/clone.c:715
+#: builtin/clone.c:757
+#, fuzzy
+msgid "failed to initialize sparse-checkout"
+msgstr "falha ao finalizar integração de notas"
+
+#: builtin/clone.c:780
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"
+"remote HEAD refere-se a referência inexistente, impossível fazer checkout.\n"
-#: builtin/clone.c:746
+#: builtin/clone.c:812
msgid "unable to checkout working tree"
msgstr "não foi possível extrair a árvore de trabalho"
-#: builtin/clone.c:786
+#: builtin/clone.c:887
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:950
msgid "cannot repack to clean up"
msgstr "não é possível reempacotar para limpar"
-#: builtin/clone.c:851
+#: builtin/clone.c:952
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:992 builtin/receive-pack.c:2493
msgid "Too many arguments."
msgstr "Demasiados argumentos."
-#: builtin/clone.c:888
+#: builtin/clone.c:996
msgid "You must specify a repository to clone."
msgstr "Deve especificar um repositório para clonar."
-#: builtin/clone.c:901
+#: builtin/clone.c:1009
#, 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:1012
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:1025
#, 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:1029 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:1039
#, 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:1045
+#, 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:1059
#, 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:1074 builtin/clone.c:1095 builtin/difftool.c:271
+#: builtin/log.c:1987 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:1079
#, 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:1099
#, 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:1101
#, c-format
msgid "Cloning into '%s'...\n"
-msgstr "A clonar em '%s'...\n"
+msgstr "Clonando em '%s'...\n"
-#: builtin/clone.c:999
+#: builtin/clone.c:1125
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -6728,65 +12799,70 @@
"clone --recursive não é compatível com ambos --reference e --reference-if-"
"able"
-#: builtin/clone.c:1055
+#: builtin/clone.c:1169 builtin/remote.c:200 builtin/remote.c:705
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr "'%s' não é um nome de remoto válido"
+
+#: builtin/clone.c:1210
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:1212
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:1214
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:1216
+#, fuzzy
+msgid "--filter is ignored in local clones; use file:// instead."
+msgstr "--depth é ignorado em clones locais; use file:// ."
+
+#: builtin/clone.c:1219
msgid "source repository is shallow, ignoring --local"
msgstr "o repositório de origem é raso, --local ignorado"
-#: builtin/clone.c:1067
+#: builtin/clone.c:1224
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:1308 builtin/clone.c:1316
#, 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:1319
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 +12870,186 @@
msgid "--command must be the first argument"
msgstr "--command deve ser o primeiro argumento"
-#: builtin/commit.c:38
+#: 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
+#, 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:1769
+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 ""
+
+#: 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 ""
+"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 ""
+
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:555
+#, 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:281
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1470
+#: 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:298
+#: 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:43
+#: builtin/commit.c:46
msgid "git status [<options>] [--] <pathspec>..."
msgstr "git status [<opções>] [--] <especificador-de-caminho>..."
-#: builtin/commit.c:48
-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 ""
-"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
-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 ""
-"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.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 +13059,7 @@
"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"
@@ -6871,87 +13068,104 @@
"\n"
msgstr ""
"O cherry-pick anterior está vazio, possivelmente devido a resolução de "
-"conflitos.\n"
-"Se deseja submeter de qualquer forma, use:\n"
+"conflito.\n"
+"Se ainda desejas commit, usa:\n"
"\n"
" 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:88
+#: 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: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 reset\n"
+" git cherry-pick --skip\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"
-#: 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,68 +13173,68 @@
"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:425
#, 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"
"Parece que está a submeter uma integração.\n"
"Se não for o caso, remova o ficheiro\n"
-"\t%s\n"
-"e tente de novo.\n"
+"\tgit update-ref -d MERGE_HEAD\n"
+"e tenta 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"
"Parece que está a submeter um cherry-pick.\n"
"Se não é o caso, remova o ficheiro\n"
-"\t%s\n"
-"e tente outra vez.\n"
+"\tgit update-ref -d CHERRY_PICK_HEAD\n"
+"e tenta de novo.\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 +13244,7 @@
"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 +13255,163 @@
"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"
+msgstr "Indique a mensagem usando apenas 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:560
+#: builtin/worktree.c:725
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:1406 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 +13419,414 @@
"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:1393
+#, fuzzy
+msgid "do not detect renames"
+msgstr "não consultar remotos"
-#: 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:1395
+msgid "detect renames, optionally set similarity index"
+msgstr ""
-#: builtin/commit.c:1482
-msgid "detached HEAD"
-msgstr "HEAD destacada"
+#: builtin/commit.c:1415
+msgid "Unsupported combination of ignored and untracked-files arguments"
+msgstr ""
-#: builtin/commit.c:1485
-msgid " (root-commit)"
-msgstr " (commit-raiz)"
-
-#: 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:285 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:542
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
-msgid "add Signed-off-by:"
+#: builtin/commit.c:1510 builtin/log.c:1744 builtin/merge.c:301
+#: builtin/pull.c:145 builtin/revert.c:110
+#, fuzzy
+msgid "add a Signed-off-by trailer"
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:109 builtin/env--helper.c:27
+#, fuzzy, c-format
+msgid "unrecognized --type argument, %s"
+msgstr "argumento não reconhecido: %s"
+
+#: builtin/config.c:121
+#, fuzzy
+msgid "only one type at a time"
+msgstr "imprimir apenas correspondências exatas"
+
+#: builtin/config.c:130
msgid "Config file location"
msgstr "Localização do ficheiro de configuração"
-#: builtin/config.c:56
+#: builtin/config.c:131
msgid "use global config file"
msgstr "usar ficheiro de configuração global"
-#: builtin/config.c:57
+#: builtin/config.c:132
msgid "use system config file"
msgstr "usar ficheiro de configuração do sistema"
-#: builtin/config.c:58
+#: builtin/config.c:133
msgid "use repository config file"
msgstr "usar ficheiro de configuração do repositório"
-#: builtin/config.c:59
+#: builtin/config.c:134
+#, fuzzy
+msgid "use per-worktree config file"
+msgstr "usar ficheiro de configuração do repositório"
+
+#: builtin/config.c:135
msgid "use given config file"
msgstr "usar ficheiro de configuração fornecido"
-#: builtin/config.c:60
+#: builtin/config.c:136
msgid "blob-id"
msgstr "id-blob"
-#: builtin/config.c:60
+#: builtin/config.c:136
msgid "read config from given blob object"
msgstr "ler configuração a partir do objeto blob fornecido"
-#: builtin/config.c:61
+#: builtin/config.c:137
msgid "Action"
msgstr "Ação"
-#: builtin/config.c:62
-msgid "get value: name [value-regex]"
+#: builtin/config.c:138
+#, fuzzy
+msgid "get value: name [value-pattern]"
msgstr "obter valor: nome [regex-do-valor]"
-#: builtin/config.c:63
-msgid "get all values: key [value-regex]"
+#: builtin/config.c:139
+#, fuzzy
+msgid "get all values: key [value-pattern]"
msgstr "obter todos os valores: chave [regex-do-valor]"
-#: builtin/config.c:64
-msgid "get values for regexp: name-regex [value-regex]"
+#: builtin/config.c:140
+#, fuzzy
+msgid "get values for regexp: name-regex [value-pattern]"
msgstr "obter valores para a regexp: regex-do-nome [regex-do-valor]"
-#: builtin/config.c:65
+#: builtin/config.c:141
msgid "get value specific for the URL: section[.var] URL"
msgstr "obter valor do URL especificado: section[.var] URL"
-#: builtin/config.c:66
-msgid "replace all matching variables: name value [value_regex]"
+#: builtin/config.c:142
+#, fuzzy
+msgid "replace all matching variables: name value [value-pattern]"
msgstr ""
"substituir todos as variáveis correspondentes: nome valor [regex-do-valor]"
-#: builtin/config.c:67
+#: builtin/config.c:143
msgid "add a new variable: name value"
msgstr "adicionar uma nova variável: nome valor"
-#: builtin/config.c:68
-msgid "remove a variable: name [value-regex]"
+#: builtin/config.c:144
+#, fuzzy
+msgid "remove a variable: name [value-pattern]"
msgstr "remover uma variável: nome [regex-do-valor]"
-#: builtin/config.c:69
-msgid "remove all matches: name [value-regex]"
+#: builtin/config.c:145
+#, fuzzy
+msgid "remove all matches: name [value-pattern]"
msgstr "remover todas as correspondências: nome [regex-do-valor]"
-#: builtin/config.c:70
+#: builtin/config.c:146
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:147
msgid "remove a section: name"
msgstr "remover uma secção: nome"
-#: builtin/config.c:72
+#: builtin/config.c:148
msgid "list all"
msgstr "listar todos"
-#: builtin/config.c:73
+#: builtin/config.c:149
+msgid "use string equality when comparing values to 'value-pattern'"
+msgstr ""
+
+#: builtin/config.c:150
msgid "open an editor"
msgstr "abrir um editor"
-#: builtin/config.c:74
+#: builtin/config.c:151
msgid "find the color configured: slot [default]"
msgstr "encontrar a cor configurada: slot [predefinição]"
-#: builtin/config.c:75
+#: builtin/config.c:152
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:153
msgid "Type"
msgstr "Tipo"
-#: builtin/config.c:77
+#: builtin/config.c:154 builtin/env--helper.c:43
+msgid "value is given this type"
+msgstr ""
+
+#: builtin/config.c:155
msgid "value is \"true\" or \"false\""
msgstr "o valor é \"true\" (verdadeiro) ou \"false\" (falso)"
-#: builtin/config.c:78
+#: builtin/config.c:156
msgid "value is decimal number"
msgstr "o valor é um número decimal"
-#: builtin/config.c:79
+#: builtin/config.c:157
msgid "value is --bool or --int"
msgstr "o valor é --bool ou --int"
-#: builtin/config.c:80
+#: builtin/config.c:158
+#, fuzzy
+msgid "value is --bool or string"
+msgstr "o valor é --bool ou --int"
+
+#: builtin/config.c:159
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:160
+msgid "value is an expiry date"
+msgstr ""
+
+#: builtin/config.c:161
msgid "Other"
msgstr "Outro"
-#: builtin/config.c:82
+#: builtin/config.c:162
msgid "terminate values with NUL byte"
msgstr "terminar valores com o byte NUL"
-#: builtin/config.c:83
+#: builtin/config.c:163
msgid "show variable names only"
msgstr "mostrar apenas os nomes das variáveis"
-#: builtin/config.c:84
+#: builtin/config.c:164
msgid "respect include directives on lookup"
msgstr "respeitar diretivas de inclusão ao pesquisar"
-#: builtin/config.c:85
+#: builtin/config.c:165
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:166
+msgid "show scope of config (worktree, local, global, system, command)"
+msgstr ""
+
+#: builtin/config.c:167 builtin/env--helper.c:45
+#, fuzzy
+msgid "value"
+msgstr "chave=valor"
+
+#: builtin/config.c:167
+msgid "with --get, use default value when missing entry"
+msgstr ""
+
+#: builtin/config.c:181
+#, c-format
+msgid "wrong number of arguments, should be %d"
+msgstr ""
+
+#: builtin/config.c:183
+#, c-format
+msgid "wrong number of arguments, should be from %d to %d"
+msgstr ""
+
+#: builtin/config.c:339
+#, fuzzy, c-format
+msgid "invalid key pattern: %s"
+msgstr "chave inválida: %s"
+
+#: builtin/config.c:377
+#, fuzzy, c-format
+msgid "failed to format default config value: %s"
+msgstr "falha ao criar o ficheiro %s"
+
+#: builtin/config.c:441
+#, fuzzy, c-format
+msgid "cannot parse color '%s'"
+msgstr "não é possível abrir o ficheiro '%s'"
+
+#: builtin/config.c:483
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:536 builtin/config.c:833
+#, fuzzy
+msgid "not in a git directory"
+msgstr "Não é um repositório git"
+
+#: builtin/config.c:539
+#, fuzzy
+msgid "writing to stdin is not supported"
+msgstr "Não é suportada profundidade negativa em --deepen"
+
+#: builtin/config.c:542
+#, fuzzy
+msgid "writing config blobs is not supported"
+msgstr "escrever config blobs tem suporte nenhum"
+
+#: builtin/config.c:627
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -7548,89 +13841,186 @@
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:611
+#: builtin/config.c:652
+msgid "only one config file at a time"
+msgstr ""
+
+#: builtin/config.c:658
+#, fuzzy
+msgid "--local can only be used inside a git repository"
+msgstr "--cached fora de um repositório"
+
+#: builtin/config.c:660
+#, fuzzy
+msgid "--blob can only be used inside a git repository"
+msgstr "--cached fora de um repositório"
+
+#: builtin/config.c:662
+#, fuzzy
+msgid "--worktree can only be used inside a git repository"
+msgstr "'%s' não é reconhecido como um repositório git"
+
+#: builtin/config.c:684
+msgid "$HOME not set"
+msgstr ""
+
+#: builtin/config.c:708
+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:743
+msgid "--get-color and variable type are incoherent"
+msgstr ""
+
+#: builtin/config.c:748
+msgid "only one action at a time"
+msgstr ""
+
+#: builtin/config.c:761
+msgid "--name-only is only applicable to --list or --get-regexp"
+msgstr ""
+
+#: builtin/config.c:767
+msgid ""
+"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
+"list"
+msgstr ""
+
+#: builtin/config.c:773
+msgid "--default is only applicable to --get"
+msgstr ""
+
+#: builtin/config.c:806
+msgid "--fixed-value only applies with 'value-pattern'"
+msgstr ""
+
+#: builtin/config.c:822
+#, fuzzy, c-format
+msgid "unable to read config file '%s'"
+msgstr "não é possível ler o ficheiro de assinatura '%s'"
+
+#: builtin/config.c:825
+#, fuzzy
+msgid "error processing config file(s)"
+msgstr "usar ficheiro de configuração do repositório"
+
+#: builtin/config.c:835
+#, fuzzy
+msgid "editing stdin is not supported"
+msgstr "Não é suportada profundidade negativa em --deepen"
+
+#: builtin/config.c:837
+#, fuzzy
+msgid "editing blobs is not supported"
+msgstr "Não é suportada profundidade negativa em --deepen"
+
+#: builtin/config.c:851
#, 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:864
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
" Use a regexp, --add or --replace-all to change %s."
msgstr ""
"não é possível substituir múltiplos valores por um único valor\n"
-"\tUse uma regexp, --add ou --replace-all para alterar %s."
+" Usa uma regexp, --add ou --replace-all para alterar %s."
-#: builtin/count-objects.c:86
+#: builtin/config.c:943 builtin/config.c:954
+#, 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/credential-store.c:66
+#, fuzzy, c-format
+msgid "unable to get credential storage lock in %d ms"
+msgstr "não é possível de obter o diretório de trabalho atual"
+
+#: 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'"
+msgstr "tag nenhuma 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 +14029,7 @@
"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 +14038,12 @@
"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 +14052,170 @@
"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-tree.c:155
+#, fuzzy
+msgid "--stdin and --merge-base are mutually exclusive"
+msgstr "-b, -B e --orphan são mutuamente exclusivos"
+
+#: builtin/diff-tree.c:157
+msgid "--merge-base only works with two commits"
+msgstr ""
+
+#: 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:258
#, c-format
msgid "invalid option: %s"
msgstr "opção inválida: %s"
-#: builtin/diff.c:358
+#: builtin/diff.c:375
+#, c-format
+msgid "%s...%s: no merge base"
+msgstr ""
+
+#: builtin/diff.c:485
msgid "Not a git repository"
msgstr "Não é um repositório git"
-#: builtin/diff.c:401
+#: builtin/diff.c:530 builtin/grep.c:681
#, c-format
msgid "invalid object '%s' given."
msgstr "objeto inválido '%s' fornecido."
-#: builtin/diff.c:410
+#: builtin/diff.c:541
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "mais do que dois blobs fornecidos: '%s'"
-#: builtin/diff.c:417
+#: builtin/diff.c:546
#, c-format
msgid "unhandled object '%s' given."
msgstr "objeto sem tratamento '%s' fornecido."
-#: builtin/difftool.c:28
+#: builtin/diff.c:580
+#, 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:412
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
@@ -7799,54 +14223,55 @@
"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:633
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "ambos os ficheiros modificados: '%s' e '%s'."
-#: builtin/difftool.c:611
+#: builtin/difftool.c:635
msgid "working tree file has been left."
msgstr "ficheiro de árvore de trabalho foi deixado."
-#: builtin/difftool.c:622
+#: builtin/difftool.c:646
#, c-format
msgid "temporary files exist in '%s'."
msgstr "existem ficheiros temporários em '%s'."
-#: builtin/difftool.c:623
+#: builtin/difftool.c:647
msgid "you may want to cleanup or recover these."
msgstr "pode querer limpar ou recuperá-los."
-#: builtin/difftool.c:669
+#: builtin/difftool.c:696
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "use 'diff.guitool' em vez de 'diff.tool'"
-#: builtin/difftool.c:671
+#: builtin/difftool.c:698
msgid "perform a full-directory diff"
msgstr "efetuar diff diretório completo"
-#: builtin/difftool.c:673
+#: builtin/difftool.c:700
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:705
msgid "use symlinks in dir-diff mode"
msgstr "usar symlinks no modi dir-diff"
-#: builtin/difftool.c:680
-msgid "<tool>"
+#: builtin/difftool.c:706
+#, fuzzy
+msgid "tool"
msgstr "<ferramenta>"
-#: builtin/difftool.c:681
+#: builtin/difftool.c:707
msgid "use the specified diff tool"
msgstr "usar a ferramenta diff especificada"
-#: builtin/difftool.c:683
+#: builtin/difftool.c:709
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:712
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
@@ -7854,251 +14279,435 @@
"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:715
msgid "specify a custom command for viewing diffs"
msgstr "especificar um comando personalizado para ver diffs"
-#: builtin/difftool.c:713
+#: builtin/difftool.c:716
+msgid "passed to `diff`"
+msgstr ""
+
+#: builtin/difftool.c:731
+msgid "difftool requires worktree or --no-index"
+msgstr ""
+
+#: builtin/difftool.c:738
+#, fuzzy
+msgid "--dir-diff is incompatible with --no-index"
+msgstr "--dirty é incompatível com commits ou semelhantes"
+
+#: builtin/difftool.c:741
+#, fuzzy
+msgid "--gui, --tool and --extcmd are mutually exclusive"
+msgstr "-b, -B e --detach são mutuamente exclusivos"
+
+#: builtin/difftool.c:749
msgid "no <tool> given for --tool=<tool>"
-msgstr "nenhuma <ferramenta> dada a --tool=<ferramenta>"
+msgstr "<ferramenta> nenhuma dada a --tool=<ferramenta>"
-#: builtin/difftool.c:720
+#: builtin/difftool.c:756
msgid "no <cmd> given for --extcmd=<cmd>"
-msgstr "nenhum <cmd> dado a --extcmd=<cmd>"
+msgstr "<cmd> nenhum 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:1816
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:3088
+#, fuzzy, c-format
+msgid "Missing from marks for submodule '%s'"
+msgstr "A ignorar submódulo '%s'"
+
+#: builtin/fast-import.c:3090
+#, fuzzy, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr "A ignorar submódulo '%s'"
+
+#: builtin/fast-import.c:3225
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr ""
+
+#: builtin/fast-import.c:3230
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr ""
+
+#: builtin/fast-import.c:3322
+msgid "Expected format name:filename for submodule rewrite option"
+msgstr ""
+
+#: builtin/fast-import.c:3377
+#, 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 +14716,81 @@
"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:1118
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 "fetch '%s' impossível (exit code: %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."
@@ -8163,204 +14798,434 @@
"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/for-each-repo.c:9
+msgid "git for-each-repo --config=<config> <command-args>"
+msgstr ""
+
+#: builtin/for-each-repo.c:37
+msgid "config"
+msgstr ""
+
+#: builtin/for-each-repo.c:38
+msgid "config key storing a list of repository paths"
+msgstr ""
+
+#: builtin/for-each-repo.c:46
+msgid "missing --config=<config>"
+msgstr ""
+
+#: 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 "balanceando %s %s"
+
+#: 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 "Verificando reflog %s->%s"
+
+#: 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:39
msgid "git gc [<options>]"
msgstr "git gc [<opções>]"
-#: builtin/gc.c:78
+#: builtin/gc.c:94
#, c-format
msgid "Failed to fstat %s: %s"
msgstr "falha ao invocar fstat sobre %s: %s"
-#: builtin/gc.c:306
-#, c-format
-msgid "Can't stat %s"
-msgstr "não é possível invocar stat sobre %s"
+#: builtin/gc.c:130
+#, fuzzy, c-format
+msgid "failed to parse '%s' value '%s'"
+msgstr "falha ao abrir '%s': %s"
-#: builtin/gc.c:315
+#: builtin/gc.c:479 builtin/init-db.c:58
+#, c-format
+msgid "cannot stat '%s'"
+msgstr "não é possível invocar stat sobre '%s'"
+
+#: builtin/gc.c:488 builtin/notes.c:240 builtin/tag.c:530
+#, c-format
+msgid "cannot read '%s'"
+msgstr "não é possível ler '%s'"
+
+#: builtin/gc.c:495
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -8375,45 +15240,53 @@
"\n"
"%s"
-#: builtin/gc.c:354
+#: builtin/gc.c:543
msgid "prune unreferenced objects"
msgstr "eliminar ficheiros não referenciados"
-#: builtin/gc.c:356
+#: builtin/gc.c:545
msgid "be more thorough (increased runtime)"
msgstr "ser mais minucioso (aumenta o tempo de execução)"
-#: builtin/gc.c:357
+#: builtin/gc.c:546
msgid "enable auto-gc mode"
msgstr "ativar modo auto-gc"
-#: builtin/gc.c:358
+#: builtin/gc.c:549
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:552
+msgid "repack all other packs except the largest pack"
+msgstr ""
+
+#: builtin/gc.c:569
+#, fuzzy, c-format
+msgid "failed to parse gc.logexpiry value %s"
msgstr "falha ao analisar o valor %s de gc.logexpiry"
-#: builtin/gc.c:403
+#: builtin/gc.c:580
+#, fuzzy, c-format
+msgid "failed to parse prune expiry value %s"
+msgstr "falha ao analisar o valor %s de gc.logexpiry"
+
+#: builtin/gc.c:600
#, 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"
+"Autocompactando o repositório para desempenho ótimizado, em segundo plano.\n"
-#: builtin/gc.c:405
+#: builtin/gc.c:602
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
-msgstr "A autocompactar o repositório para obter um melhor desempenho.\n"
+msgstr "Autocompactando o repositório para desempenho ótimizado.\n"
-#: builtin/gc.c:406
+#: builtin/gc.c:603
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
-msgstr "Consulte \"git help gc\" para ler sobre manutenção manual.\n"
+msgstr "Vê \"git help gc\" para manual de manutenção.\n"
-#: builtin/gc.c:427
+#: builtin/gc.c:643
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -8421,270 +15294,444 @@
"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:698
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:708
+msgid ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
+msgstr ""
+
+#: builtin/gc.c:738
+msgid "--no-schedule is not allowed"
+msgstr ""
+
+#: builtin/gc.c:743
+#, fuzzy, c-format
+msgid "unrecognized --schedule argument '%s'"
+msgstr "argumento não reconhecido: %s"
+
+#: builtin/gc.c:862
+#, fuzzy
+msgid "failed to write commit-graph"
+msgstr "falha ao escrever objeto de commit"
+
+#: builtin/gc.c:901
+#, fuzzy
+msgid "failed to fill remotes"
+msgstr "falha ao remover %s"
+
+#: builtin/gc.c:1024
+#, fuzzy
+msgid "failed to start 'git pack-objects' process"
+msgstr "Não foi possível lançar pack-objects"
+
+#: builtin/gc.c:1041
+#, fuzzy
+msgid "failed to finish 'git pack-objects' process"
+msgstr "Não foi possível lançar pack-objects"
+
+#: builtin/gc.c:1093
+#, fuzzy
+msgid "failed to write multi-pack-index"
+msgstr "falha ao limpar o índice"
+
+#: builtin/gc.c:1111
+msgid "'git multi-pack-index expire' failed"
+msgstr ""
+
+#: builtin/gc.c:1172
+#, fuzzy
+msgid "'git multi-pack-index repack' failed"
+msgstr "falha ao ler o ficheiro de comando '%s'"
+
+#: builtin/gc.c:1181
+msgid ""
+"skipping incremental-repack task because core.multiPackIndex is disabled"
+msgstr ""
+
+#: builtin/gc.c:1279
+#, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr ""
+
+#: builtin/gc.c:1309
+#, fuzzy, c-format
+msgid "task '%s' failed"
+msgstr "falha ao mudar o nome de '%s'"
+
+#: builtin/gc.c:1389
+#, fuzzy, c-format
+msgid "'%s' is not a valid task"
+msgstr "'%s' não é uma referência válida."
+
+#: builtin/gc.c:1394
+#, fuzzy, c-format
+msgid "task '%s' cannot be selected multiple times"
+msgstr "'%s' não pode ser usado com %s"
+
+#: builtin/gc.c:1409
+msgid "run tasks based on the state of the repository"
+msgstr ""
+
+#: builtin/gc.c:1410
+msgid "frequency"
+msgstr ""
+
+#: builtin/gc.c:1411
+msgid "run tasks based on frequency"
+msgstr ""
+
+#: builtin/gc.c:1414
+msgid "do not report progress or other information over stderr"
+msgstr ""
+
+#: builtin/gc.c:1415
+msgid "task"
+msgstr ""
+
+#: builtin/gc.c:1416
+#, fuzzy
+msgid "run a specific task"
+msgstr "corre uma tarefa específica"
+
+#: builtin/gc.c:1433
+msgid "use at most one of --auto and --schedule=<frequency>"
+msgstr ""
+
+#: builtin/gc.c:1467
+#, fuzzy
+msgid "failed to run 'git config'"
+msgstr "falha ao escrever para '%s'"
+
+#: builtin/gc.c:1512
+msgid "another process is scheduling background maintenance"
+msgstr ""
+
+#: builtin/gc.c:1525
+msgid "failed to run 'crontab -l'; your system might not support 'cron'"
+msgstr ""
+
+#: builtin/gc.c:1544
+msgid "failed to run 'crontab'; your system might not support 'cron'"
+msgstr ""
+
+#: builtin/gc.c:1550
+#, fuzzy
+msgid "failed to open stdin of 'crontab'"
+msgstr "falha ao abrir '%s'"
+
+#: builtin/gc.c:1592
+msgid "'crontab' died"
+msgstr ""
+
+#: builtin/gc.c:1605
+#, fuzzy
+msgid "failed to add repo to global config"
+msgstr "falha ao ler o ficheiro de comando '%s'"
+
+#: builtin/gc.c:1615
+#, fuzzy
+msgid "git maintenance <subcommand> [<options>]"
+msgstr "git notes prune [<opções>]"
+
+#: builtin/gc.c:1634
+#, 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:736
#, 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:835
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:837
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:839
msgid "search in both tracked and untracked files"
msgstr "procurar em ficheiros controlados e não controlados"
-#: builtin/grep.c:986
+#: builtin/grep.c:841
msgid "ignore files specified via '.gitignore'"
msgstr "ignorar ficheiros especificados via '.gitignore'"
-#: builtin/grep.c:988
+#: builtin/grep.c:843
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:846
msgid "show non-matching lines"
msgstr "mostrar linhas não correspondidas"
-#: builtin/grep.c:996
+#: builtin/grep.c:848
msgid "case insensitive matching"
msgstr "não diferenciar maiúsculas de minúsculas"
-#: builtin/grep.c:998
+#: builtin/grep.c:850
msgid "match patterns only at word boundaries"
msgstr "corresponder padrões apenas a palavras"
-#: builtin/grep.c:1000
+#: builtin/grep.c:852
msgid "process binary files as text"
msgstr "processar ficheiros binários como texto"
-#: builtin/grep.c:1002
+#: builtin/grep.c:854
msgid "don't match patterns in binary files"
msgstr "ignorar ficheiros binários"
-#: builtin/grep.c:1005
+#: builtin/grep.c:857
msgid "process binary files with textconv filters"
msgstr "processar ficheiros binários com filtros textconv"
-#: builtin/grep.c:1007
+#: builtin/grep.c:859
+#, fuzzy
+msgid "search in subdirectories (default)"
+msgstr "eliminar referências soltas (predefinição)"
+
+#: builtin/grep.c:861
msgid "descend at most <depth> levels"
msgstr "descer no máximo até <profundidade>"
-#: builtin/grep.c:1011
+#: builtin/grep.c:865
msgid "use extended POSIX regular expressions"
msgstr "usar expressões regulares estendidas do POSIX"
-#: builtin/grep.c:1014
+#: builtin/grep.c:868
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:871
msgid "interpret patterns as fixed strings"
msgstr "interpretar padrões como cadeias de caracteres fixas"
-#: builtin/grep.c:1020
+#: builtin/grep.c:874
msgid "use Perl-compatible regular expressions"
msgstr "usar expressões regulares compatíveis com Perl"
-#: builtin/grep.c:1023
+#: builtin/grep.c:877
msgid "show line numbers"
msgstr "mostrar números de linha"
-#: builtin/grep.c:1024
+#: builtin/grep.c:878
+#, fuzzy
+msgid "show column number of first match"
+msgstr "mostrar apenas nomes de ficheiro sem correspondência"
+
+#: builtin/grep.c:879
msgid "don't show filenames"
msgstr "não mostrar nomes de ficheiro"
-#: builtin/grep.c:1025
+#: builtin/grep.c:880
msgid "show filenames"
msgstr "mostrar nomes de ficheiro"
-#: builtin/grep.c:1027
+#: builtin/grep.c:882
msgid "show filenames relative to top directory"
msgstr "mostrar nomes de ficheiro relativamente ao diretório superior"
-#: builtin/grep.c:1029
+#: builtin/grep.c:884
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:886
msgid "synonym for --files-with-matches"
msgstr "sinónimo de --files-with-matches"
-#: builtin/grep.c:1034
+#: builtin/grep.c:889
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:891
msgid "print NUL after filenames"
msgstr "imprimir NUL depois dos nomes de ficheiro"
-#: builtin/grep.c:1038
+#: builtin/grep.c:894
+#, fuzzy
+msgid "show only matching parts of a line"
+msgstr "mostrar linhas não correspondidas"
+
+#: builtin/grep.c:896
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:897
msgid "highlight matches"
msgstr "realçar correspondências"
-#: builtin/grep.c:1041
+#: builtin/grep.c:899
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:901
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:904
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:907
msgid "show <n> context lines before matches"
msgstr "mostrar <n> linhas de contexto antes das correspondências"
-#: builtin/grep.c:1051
+#: builtin/grep.c:909
msgid "show <n> context lines after matches"
msgstr "mostrar <n> linhas de contexto depois das correspondências"
-#: builtin/grep.c:1053
+#: builtin/grep.c:911
msgid "use <n> worker threads"
msgstr "usar <n> threads de trabalho"
-#: builtin/grep.c:1054
+#: builtin/grep.c:912
msgid "shortcut for -C NUM"
msgstr "atalho para -C NUM"
-#: builtin/grep.c:1057
+#: builtin/grep.c:915
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:917
msgid "show the surrounding function"
msgstr "mostrar a função circundante"
-#: builtin/grep.c:1062
+#: builtin/grep.c:920
msgid "read patterns from file"
msgstr "ler padrões do ficheiro"
-#: builtin/grep.c:1064
+#: builtin/grep.c:922
msgid "match <pattern>"
msgstr "procurar <padrão>"
-#: builtin/grep.c:1066
+#: builtin/grep.c:924
msgid "combine patterns specified with -e"
msgstr "combinar padrões especificados com -e"
-#: builtin/grep.c:1078
+#: builtin/grep.c:936
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:938
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:940
msgid "show parse tree for grep expression"
msgstr "mostrar árvore de analise da expressões grep"
-#: builtin/grep.c:1086
+#: builtin/grep.c:944
msgid "pager"
msgstr "paginador"
-#: builtin/grep.c:1086
+#: builtin/grep.c:944
msgid "show matching files in the pager"
msgstr "mostrar ficheiros com correspondências no paginador"
-#: builtin/grep.c:1089
+#: builtin/grep.c:948
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."
-msgstr "nenhum padrão fornecido."
+#: builtin/grep.c:1014
+#, fuzzy
+msgid "no pattern given"
+msgstr "fornecido padrão nenhum"
-#: builtin/grep.c:1189
+#: builtin/grep.c:1050
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:1058
#, 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:1088
+#, fuzzy
+msgid "--untracked not supported with --recurse-submodules"
+msgstr "opção não suportada com --recurse-submodules."
+
+#: builtin/grep.c:1092
+msgid "invalid option combination, ignoring --threads"
+msgstr ""
+
+#: builtin/grep.c:1095 builtin/pack-objects.c:3655
+#, fuzzy
+msgid "no threads support, ignoring --threads"
+msgstr "sem suporte de threads, %s ignorado"
+
+#: builtin/grep.c:1098 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:1132
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:1158
+#, 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:1164
+#, 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:1172
+#, 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 +15739,99 @@
"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,450 +15840,436 @@
"'%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"
"Please consider using 'man.<tool>.path' instead."
msgstr ""
-"'%s': comando de visualizador de manual suportado.\n"
-"Considere usar 'man.<ferramenta>.path'."
+"'%s': comando para visualizador de man.\n"
+"Considera usar 'man.<ferramenta>.path' invés."
-#: 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"
+msgstr "atendeu ao pedido visualizador de manual nenhum"
-#: builtin/help.c:361
+#: builtin/help.c:461
msgid "no info viewer handled the request"
-msgstr "nenhum visualizador de info atendeu o pedido"
+msgstr "atendeu ao pedido visualizador de info nenhum"
-#: 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:286
#, 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:849 builtin/index-pack.c:868
+#, fuzzy
+msgid "fsck error in packed object"
+msgstr "ignorar objetos compactados"
-#: builtin/index-pack.c:853
-msgid "Error in object"
-msgstr "Erro no objeto"
-
-#: 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
+#: builtin/index-pack.c:1444
+#, 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: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: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:1501
msgid "error while closing pack file"
msgstr "erro ao fechar ficheiro de pacote"
-#: builtin/index-pack.c:1415
-#, c-format
-msgid "cannot write keep 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'"
-msgstr "não é possível fechar o ficheiro de conservação '%s' escrito"
-
-#: builtin/index-pack.c:1433
+#: 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"
+msgstr "Reiniciei respositório partilhado existente de Git 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"
+msgstr "Reiniciei repositório existente de Git 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"
+msgstr "Iniciei repositório vazio partilhado de Git 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"
+msgstr "Iniciei repositório vazio de Git 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 +16277,44 @@
"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 +16323,17 @@
"%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 +16341,500 @@
"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
-msgid "no input file given for in-place editing"
-msgstr "nenhum ficheiro de entrada fornecido para edição no local"
+#: builtin/interpret-trailers.c:123
+#, fuzzy
+msgid "--trailer with --only-input does not make sense"
+msgstr "--name-only não faz sentido"
-#: builtin/log.c:44
+#: builtin/interpret-trailers.c:133
+msgid "no input file given for in-place editing"
+msgstr "fornecido para edição no local ficheiro de entrada nenhum"
+
+#: builtin/log.c:58
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<opções>] [<intervalo-de-revisões>] [[--] <caminho>...]"
-#: builtin/log.c:45
+#: builtin/log.c:59
msgid "git show [<options>] <object>..."
msgstr "git show [<opções>] <objeto>..."
-#: builtin/log.c:89
+#: builtin/log.c:112
#, 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:179
msgid "show source"
msgstr "mostrar origem"
-#: builtin/log.c:146
+#: builtin/log.c:180
msgid "Use mail map file"
msgstr "usar ficheiro de mapeamento de correio"
-#: builtin/log.c:147
+#: builtin/log.c:183
+#, fuzzy
+msgid "only decorate refs that match <pattern>"
+msgstr "usar apenas referência que correspondam ao <padrão>"
+
+#: builtin/log.c:185
+#, fuzzy
+msgid "do not decorate refs that match <pattern>"
+msgstr "não considerar tags que correspondam ao <padrão>"
+
+#: builtin/log.c:186
msgid "decorate options"
msgstr "opções de decoração"
-#: builtin/log.c:150
-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:189
+msgid ""
+"Trace the evolution of line range <start>,<end> or function :<funcname> in "
+"<file>"
+msgstr ""
-#: builtin/log.c:246
+#: builtin/log.c:212
+#, fuzzy
+msgid "-L<range>:<file> cannot be used with pathspec"
+msgstr "%s: %s não pode ser usado com %s"
+
+#: builtin/log.c:302
#, c-format
msgid "Final output: %d %s\n"
msgstr "Resultado final: %d %s\n"
-#: builtin/log.c:493
+#: builtin/log.c:564
#, 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:579 builtin/log.c:674
+#, 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:699
+#, fuzzy, c-format
+msgid "unknown type: %d"
msgstr "Tipo desconhecido: %d"
-#: builtin/log.c:746
+#: builtin/log.c:848
+#, c-format
+msgid "%s: invalid cover from description mode"
+msgstr ""
+
+#: builtin/log.c:855
msgid "format.headers without value"
msgstr "format.headers sem valor"
-#: builtin/log.c:846
-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:984
+#, 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:1001
+#, fuzzy
+msgid "need exactly one range"
msgstr "É necessário exatamente um intervalo."
-#: builtin/log.c:885
-msgid "Not a range."
+#: builtin/log.c:1011
+#, fuzzy
+msgid "not a range"
msgstr "Não é um intervalo."
-#: builtin/log.c:991
-msgid "Cover letter needs email format"
+#: builtin/log.c:1175
+#, 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:1181
+#, fuzzy
+msgid "failed to create cover-letter file"
+msgstr "Falha ao criar os ficheiros de saída"
+
+#: builtin/log.c:1262
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to incorreto: %s"
-#: builtin/log.c:1098
+#: builtin/log.c:1289
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:1347
+#, 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:1498 builtin/log.c:2318 builtin/log.c:2320 builtin/log.c:2332
+#, 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:1509 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:1518
+#, 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:1528
+#, 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:1551
+#, fuzzy
+msgid "failed to find exact merge base"
msgstr "Falha ao procurar base exata de integração"
-#: builtin/log.c:1305
+#: builtin/log.c:1568
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:1578
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:1636
msgid "cannot get patch id"
msgstr "não é possível obter o id do patch"
-#: builtin/log.c:1415
+#: builtin/log.c:1693
+#, 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:1695
+#, c-format
+msgid "using '%s' as range-diff origin of current series"
+msgstr ""
+
+#: builtin/log.c:1739
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:1742
msgid "use [PATCH] even with multiple patches"
msgstr "usar [PATCH] mesmo com múltiplos patches"
-#: builtin/log.c:1422
+#: builtin/log.c:1746
msgid "print patches to standard out"
msgstr "imprimir patches para a saída padrão"
-#: builtin/log.c:1424
+#: builtin/log.c:1748
msgid "generate a cover letter"
msgstr "gerar uma carta de apresentação"
-#: builtin/log.c:1426
+#: builtin/log.c:1750
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:1751
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1428
+#: builtin/log.c:1752
msgid "use <sfx> instead of '.patch'"
msgstr "usar <sfx> em vez de '.patch'"
-#: builtin/log.c:1430
+#: builtin/log.c:1754
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:1756
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:1758
+#, fuzzy
+msgid "max length of output filename"
+msgstr "tamanho máximo de cada ficheiro de pacote gerado"
+
+#: builtin/log.c:1760
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "Usar [RFC PATCH] em vez de [PATCH]"
-#: builtin/log.c:1437
+#: builtin/log.c:1763
+msgid "cover-from-description-mode"
+msgstr ""
+
+#: builtin/log.c:1764
+msgid "generate parts of a cover letter based on a branch's description"
+msgstr ""
+
+#: builtin/log.c:1766
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "usar [<prefixo>] em vez de [PATCH]"
-#: builtin/log.c:1440
+#: builtin/log.c:1769
msgid "store resulting files in <dir>"
msgstr "guardar os ficheiros resultantes em <dir>"
-#: builtin/log.c:1443
+#: builtin/log.c:1772
msgid "don't strip/add [PATCH]"
msgstr "não tirar/inserir [PATCH]"
-#: builtin/log.c:1446
+#: builtin/log.c:1775
msgid "don't output binary diffs"
msgstr "não gerar diffs binários"
-#: builtin/log.c:1448
+#: builtin/log.c:1777
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:1779
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:1781
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:1783
msgid "Messaging"
msgstr "Mensagem"
-#: builtin/log.c:1455
+#: builtin/log.c:1784
msgid "header"
msgstr "cabeçalho"
-#: builtin/log.c:1456
+#: builtin/log.c:1785
msgid "add email header"
msgstr "adicionar cabeçalho de e-mail"
-#: builtin/log.c:1457 builtin/log.c:1459
+#: builtin/log.c:1786 builtin/log.c:1787
msgid "email"
msgstr "e-mail"
-#: builtin/log.c:1457
+#: builtin/log.c:1786
msgid "add To: header"
msgstr "adicionar cabeçalho To:"
-#: builtin/log.c:1459
+#: builtin/log.c:1787
msgid "add Cc: header"
msgstr "adicionar cabeçalho Cc:"
-#: builtin/log.c:1461
+#: builtin/log.c:1788
msgid "ident"
msgstr "identidade"
-#: builtin/log.c:1462
+#: builtin/log.c:1789
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:1791
msgid "message-id"
msgstr "id-mensagem"
-#: builtin/log.c:1465
+#: builtin/log.c:1792
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:1793 builtin/log.c:1796
msgid "boundary"
msgstr "limite"
-#: builtin/log.c:1467
+#: builtin/log.c:1794
msgid "attach the patch"
msgstr "anexar o patch"
-#: builtin/log.c:1470
+#: builtin/log.c:1797
msgid "inline the patch"
msgstr "incorporar o patch"
-#: builtin/log.c:1474
+#: builtin/log.c:1801
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:1803
msgid "signature"
msgstr "assinatura"
-#: builtin/log.c:1477
+#: builtin/log.c:1804
msgid "add a signature"
msgstr "adicionar uma assinatura"
-#: builtin/log.c:1478
+#: builtin/log.c:1805
msgid "base-commit"
msgstr "commit-base"
-#: builtin/log.c:1479
+#: builtin/log.c:1806
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:1809
msgid "add a signature from a file"
msgstr "adicionar uma assinatura de um ficheiro"
-#: builtin/log.c:1482
+#: builtin/log.c:1810
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:1812
+#, fuzzy
+msgid "show progress while generating patches"
+msgstr "mostrar medidor de progresso durante a fase de escrita de objetos"
+
+#: builtin/log.c:1814
+msgid "show changes against <rev> in cover letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1817
+msgid "show changes against <refspec> in cover letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1819
+msgid "percentage by which creation is weighted"
+msgstr ""
+
+#: builtin/log.c:1905
+#, c-format
+msgid "invalid ident line: %s"
+msgstr "linha de identidade inválida: %s"
+
+#: builtin/log.c:1920
+#, 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:1922
+#, 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:1930
msgid "--name-only does not make sense"
msgstr "--name-only não faz sentido"
-#: builtin/log.c:1584
+#: builtin/log.c:1932
msgid "--name-status does not make sense"
msgstr "--name-status não faz sentido"
-#: builtin/log.c:1586
+#: builtin/log.c:1934
msgid "--check does not make sense"
msgstr "--check não faz sentido"
-#: builtin/log.c:1616
-msgid "standard output, or directory, which one?"
-msgstr "saída padrão, ou diretório, qual deles?"
+#: builtin/log.c:1956
+#, fuzzy
+msgid "--stdout, --output, and --output-directory are mutually exclusive"
+msgstr "-b, -B e --detach são mutuamente exclusivos"
-#: builtin/log.c:1618
+#: builtin/log.c:2079
+msgid "--interdiff requires --cover-letter or single patch"
+msgstr ""
+
+#: builtin/log.c:2083
+msgid "Interdiff:"
+msgstr ""
+
+#: builtin/log.c:2084
#, 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:2090
+msgid "--creation-factor requires --range-diff"
+msgstr ""
+
+#: builtin/log.c:2094
+msgid "--range-diff requires --cover-letter or single patch"
+msgstr ""
+
+#: builtin/log.c:2102
+msgid "Range-diff:"
+msgstr ""
+
+#: builtin/log.c:2103
+#, c-format
+msgid "Range-diff against v%d:"
+msgstr ""
+
+#: builtin/log.c:2114
#, 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:2150
+#, fuzzy
+msgid "Generating patches"
+msgstr "falha ao editar patch"
+
+#: builtin/log.c:2194
+#, fuzzy
+msgid "failed to create output files"
msgstr "Falha ao criar os ficheiros de saída"
-#: builtin/log.c:1833
+#: builtin/log.c:2253
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<ramo-a-montante> [<head> [<limite>]]]"
-#: builtin/log.c:1887
+#: builtin/log.c:2307
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -9633,111 +16842,118 @@
"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,511 +16963,126 @@
" [-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:1398
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
-msgid "git merge [<options>] [<commit>...]"
-msgstr "git merge [<opções>] [<commit>...]"
-
-#: builtin/merge.c:47
-msgid "git merge --abort"
-msgstr "git merge --abort"
-
-#: builtin/merge.c:48
-msgid "git merge --continue"
-msgstr "git merge --continue"
-
-#: builtin/merge.c:103
-msgid "switch `m' requires a value"
-msgstr "a opção 'm' requer um valor"
-
-#: builtin/merge.c:140
+#: builtin/mailsplit.c:241
#, 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
-#, c-format
-msgid "Available strategies are:"
-msgstr "Estratégias disponíveis:"
-
-#: builtin/merge.c:146
-#, c-format
-msgid "Available custom strategies are:"
-msgstr "Estratégias personalizadas disponíveis:"
-
-#: builtin/merge.c:196 builtin/pull.c:127
-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
-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
-msgid "(synonym to --stat)"
-msgstr "(sinónimo de --stat)"
-
-#: builtin/merge.c:202 builtin/pull.c:136
-msgid "add (at most <n>) entries from shortlog to merge commit message"
+msgid "empty mbox: '%s'"
msgstr ""
-"adicionar (no máximo <n>) entradas do shortlog à mensagem de commit da "
-"integração"
-#: builtin/merge.c:205 builtin/pull.c:139
-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
-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
-msgid "edit message before committing"
-msgstr "editar a mensagem antes de submeter"
-
-#: builtin/merge.c:210
-msgid "allow fast-forward (default)"
-msgstr "permitir avanço rápido (predefinição)"
-
-#: builtin/merge.c:212 builtin/pull.c:151
-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
-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
-msgid "strategy"
-msgstr "estratégia"
-
-#: builtin/merge.c:218 builtin/pull.c:159
-msgid "merge strategy to use"
-msgstr "estratégia de integração a usar"
-
-#: builtin/merge.c:219 builtin/pull.c:162
-msgid "option=value"
-msgstr "opção=valor"
-
-#: builtin/merge.c:220 builtin/pull.c:163
-msgid "option for selected merge strategy"
-msgstr "opções da estratégia de integração selecionada"
-
-#: builtin/merge.c:222
-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
-msgid "abort the current in-progress merge"
-msgstr "abortar integração em curso"
-
-#: builtin/merge.c:228
-msgid "continue the current in-progress merge"
-msgstr "continuar a integração em curso"
-
-#: builtin/merge.c:230 builtin/pull.c:170
-msgid "allow merging unrelated histories"
-msgstr "permitir integração de históricos não relacionados"
-
-#: builtin/merge.c:258
-msgid "could not run stash."
-msgstr "não foi possível executar o comando stash."
-
-#: builtin/merge.c:263
-msgid "stash failed"
-msgstr "falha ao executar o comando stash"
-
-#: builtin/merge.c:268
-#, c-format
-msgid "not a valid object: %s"
-msgstr "nome de objeto inválido: %s"
-
-#: builtin/merge.c:287 builtin/merge.c:304
-msgid "read-tree failed"
-msgstr "falha ao executar o comando read-tree"
-
-#: builtin/merge.c:334
-msgid " (nothing to squash)"
-msgstr " (não há nada para esmagar)"
-
-#: builtin/merge.c:345
-#, c-format
-msgid "Squash commit -- not updating HEAD\n"
-msgstr "Commit esmagado -- HEAD não atualizada\n"
-
-#: builtin/merge.c:395
-#, 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
-#, c-format
-msgid "'%s' does not point to a commit"
-msgstr "'%s' não aponta para um commit"
-
-#: builtin/merge.c:536
-#, c-format
-msgid "Bad branch.%s.mergeoptions string: %s"
-msgstr "Valor de branch.%s.mergeoptions incorreto: %s"
-
-#: builtin/merge.c:656
-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
-#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Opção desconhecida de merge-recursive: -X%s"
-
-#: builtin/merge.c:685
-#, c-format
-msgid "unable to write %s"
-msgstr "não foi possível escrever %s"
-
-#: builtin/merge.c:737
-#, c-format
-msgid "Could not read from '%s'"
-msgstr "Não foi possível ler '%s'"
-
-#: builtin/merge.c:746
-#, 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
-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"
-"sobretudo se incorpora um ramo a montante atualizado, num ramo tópico.\n"
-"\n"
-"Linhas começadas com '%c' são ignoradas e uma mensagem vazia\n"
-"aborta o commit.\n"
-
-#: builtin/merge.c:776
-msgid "Empty commit message."
-msgstr "Mensagem de commit vazia."
-
-#: builtin/merge.c:796
-#, c-format
-msgid "Wonderful.\n"
-msgstr "Maravilhoso.\n"
-
-#: builtin/merge.c:851
-#, 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
-msgid "No current branch."
-msgstr "Nenhum ramo atual."
-
-#: builtin/merge.c:892
-msgid "No remote for the current branch."
-msgstr "Não há um remoto para o ramo atual."
-
-#: builtin/merge.c:894
-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
-#, 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
-#, 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
-#, c-format
-msgid "not something we can merge in %s: %s"
-msgstr "não se pode integrar em %s: %s"
-
-#: builtin/merge.c:1081
-msgid "not something we can merge"
-msgstr "não se pode integrar"
-
-#: builtin/merge.c:1146
-msgid "--abort expects no arguments"
-msgstr "--abort não leva argumentos"
-
-#: builtin/merge.c:1150
-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
-msgid "--continue expects no arguments"
-msgstr "--continue não leva argumentos"
-
-#: builtin/merge.c:1166
-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
-msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you merge."
-msgstr ""
-"Não concluiu a integração (MERGE_HEAD presente).\n"
-"Submeta as suas alterações antes de integrar."
-
-#: builtin/merge.c:1189
-msgid ""
-"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
-"Please, commit your changes before you merge."
-msgstr ""
-"Cherry-pick não concluído (CHERRY_PICK_HEAD presente).\n"
-"Submeta as suas alterações antes de integrar."
-
-#: builtin/merge.c:1192
-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
-msgid "You cannot combine --squash with --no-ff."
-msgstr "Não é possível combinar --squash e --no-ff."
-
-#: builtin/merge.c:1209
-msgid "No commit specified and merge.defaultToUpstream not set."
-msgstr "Nenhum commit especificado e merge.defaultToUpstream não definido."
-
-#: builtin/merge.c:1226
-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
-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
-#, c-format
-msgid "%s - not something we can merge"
-msgstr "%s - não é algo se possa integrar"
-
-#: builtin/merge.c:1235
-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
-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."
-msgstr "Já está atualizado."
-
-#: builtin/merge.c:1359
-#, c-format
-msgid "Updating %s..%s\n"
-msgstr "A atualizar %s..%s\n"
-
-#: builtin/merge.c:1400
-#, 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
-#, c-format
-msgid "Nope.\n"
-msgstr "Não.\n"
-
-#: builtin/merge.c:1432
-msgid "Already up-to-date. Yeeah!"
-msgstr "Já está atualizado. Sim!"
-
-#: builtin/merge.c:1438
-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
-#, c-format
-msgid "Rewinding the tree to pristine...\n"
-msgstr "A recuar a árvore ao seu estado original...\n"
-
-#: builtin/merge.c:1465
-#, c-format
-msgid "Trying merge strategy %s...\n"
-msgstr "A tentar a estratégia de integração %s...\n"
-
-#: builtin/merge.c:1531
-#, 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
-#, c-format
-msgid "Merge with strategy %s failed.\n"
-msgstr "Falha ao integrar com a estratégia %s.\n"
-
-#: builtin/merge.c:1542
-#, 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
-#, 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
+#: 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:30
+#: 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:31
+#: builtin/merge-base.c:34
msgid "git merge-base --independent <commit>..."
msgstr "git merge-base --independent <commit>..."
-#: builtin/merge-base.c:32
+#: 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:33
+#: 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:217
+#: builtin/merge-base.c:143
msgid "output all common ancestors"
msgstr "mostrar todos os antecessores"
-#: builtin/merge-base.c:219
+#: 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:221
+#: 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:223
+#: builtin/merge-base.c:149
msgid "is the first one ancestor of the other?"
msgstr "o primeiro é antecessor do segundo?"
-#: builtin/merge-base.c:225
+#: 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:8
+#: builtin/merge-file.c:9
msgid ""
"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
"<orig-file> <file2>"
@@ -10259,227 +17090,657 @@
"git merge-file [<opções>] [-L <nome1> [-L <orig> [-L <nome2>]]] <ficheiro1> "
"<ficheiro-orig> <ficheiro2>"
-#: builtin/merge-file.c:32
+#: builtin/merge-file.c:35
msgid "send results to standard output"
msgstr "enviar resultados para a saída padrão"
-#: builtin/merge-file.c:33
+#: builtin/merge-file.c:36
msgid "use a diff3 based merge"
msgstr "usar integração baseada em diff3"
-#: builtin/merge-file.c:34
+#: 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:36
+#: 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:38
+#: 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:41
+#: 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:42
+#: builtin/merge-file.c:45
msgid "do not warn about conflicts"
msgstr "não alertar sobre conflitos"
-#: builtin/merge-file.c:44
+#: 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:45
+#: builtin/merge-recursive.c:47
#, c-format
msgid "unknown option %s"
msgstr "opção desconhecido %s"
-#: builtin/merge-recursive.c:51
+#: 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:55
+#: 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:63
+#: 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:69 builtin/merge-recursive.c:71
+#: 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:77
+#: builtin/merge-recursive.c:82
#, c-format
msgid "Merging %s with %s\n"
msgstr "A integrar %s com %s\n"
-#: builtin/mktree.c:65
+#: builtin/merge.c:57
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<opções>] [<commit>...]"
+
+#: builtin/merge.c:58
+msgid "git merge --abort"
+msgstr "git merge --abort"
+
+#: builtin/merge.c:59
+msgid "git merge --continue"
+msgstr "git merge --continue"
+
+#: builtin/merge.c:122
+msgid "switch `m' requires a value"
+msgstr "a opção 'm' requer um valor"
+
+#: builtin/merge.c:145
+#, fuzzy, c-format
+msgid "option `%s' requires a value"
+msgstr "a opção '%s' requer um valor"
+
+#: builtin/merge.c:198
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr "Estratégia de integração '%s' não encontrada.\n"
+
+#: builtin/merge.c:199
+#, c-format
+msgid "Available strategies are:"
+msgstr "Estratégias disponíveis:"
+
+#: builtin/merge.c:204
+#, c-format
+msgid "Available custom strategies are:"
+msgstr "Estratégias personalizadas disponíveis:"
+
+#: builtin/merge.c:255 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:258 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:259 builtin/pull.c:139
+msgid "(synonym to --stat)"
+msgstr "(sinónimo de --stat)"
+
+#: builtin/merge.c:261 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:264 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:266 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:268 builtin/pull.c:154
+msgid "edit message before committing"
+msgstr "editar a mensagem antes de submeter"
+
+#: builtin/merge.c:270
+msgid "allow fast-forward (default)"
+msgstr "permitir avanço rápido (predefinição)"
+
+#: builtin/merge.c:272 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:276 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:277 builtin/notes.c:787 builtin/pull.c:168
+#: builtin/rebase.c:539 builtin/rebase.c:1412 builtin/revert.c:114
+msgid "strategy"
+msgstr "estratégia"
+
+#: builtin/merge.c:278 builtin/pull.c:169
+msgid "merge strategy to use"
+msgstr "estratégia de integração a usar"
+
+#: builtin/merge.c:279 builtin/pull.c:172
+msgid "option=value"
+msgstr "opção=valor"
+
+#: builtin/merge.c:280 builtin/pull.c:173
+msgid "option for selected merge strategy"
+msgstr "opções da estratégia de integração selecionada"
+
+#: builtin/merge.c:282
+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:289
+msgid "abort the current in-progress merge"
+msgstr "abortar integração em curso"
+
+#: builtin/merge.c:291
+#, fuzzy
+msgid "--abort but leave index and working tree alone"
+msgstr "repor HEAD, índice e árvore de trabalho"
+
+#: builtin/merge.c:293
+msgid "continue the current in-progress merge"
+msgstr "continuar a integração em curso"
+
+#: builtin/merge.c:295 builtin/pull.c:180
+msgid "allow merging unrelated histories"
+msgstr "permitir integração de históricos não relacionados"
+
+#: builtin/merge.c:302
+#, fuzzy
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr "ignorar pre-commit e commit-msg hooks"
+
+#: builtin/merge.c:319
+msgid "could not run stash."
+msgstr "não foi possível executar o comando stash."
+
+#: builtin/merge.c:324
+msgid "stash failed"
+msgstr "falha ao executar o comando stash"
+
+#: builtin/merge.c:329
+#, c-format
+msgid "not a valid object: %s"
+msgstr "nome de objeto inválido: %s"
+
+#: builtin/merge.c:351 builtin/merge.c:368
+msgid "read-tree failed"
+msgstr "falha ao executar o comando read-tree"
+
+#: builtin/merge.c:398
+msgid " (nothing to squash)"
+msgstr " (não há nada para esmagar)"
+
+#: builtin/merge.c:409
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr "Commit esmagado -- HEAD não atualizada\n"
+
+#: builtin/merge.c:459
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr "Nenhuma mensagem de integração -- HEAD não atualizada\n"
+
+#: builtin/merge.c:510
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr "'%s' não aponta para um commit"
+
+#: builtin/merge.c:597
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr "Valor de branch.%s.mergeoptions incorreto: %s"
+
+#: builtin/merge.c:723
+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:736
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr "Opção desconhecida de merge-recursive: -X%s"
+
+#: builtin/merge.c:755 t/helper/test-fast-rebase.c:209
+#, c-format
+msgid "unable to write %s"
+msgstr "não foi possível escrever %s"
+
+#: builtin/merge.c:807
+#, c-format
+msgid "Could not read from '%s'"
+msgstr "Não foi possível ler '%s'"
+
+#: builtin/merge.c:816
+#, c-format
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+msgstr "Usa 'git commit' para completar o merge. Committando merge nenhum.\n"
+
+#: builtin/merge.c:822
+#, 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 ""
+"Introduza uma mensagem de commit, explicando o porquê desta integração\n"
+"ser necessária, especialmente se é merge de updated stream para topic "
+"branch.\n"
+"\n"
+
+#: builtin/merge.c:827
+#, fuzzy
+msgid "An empty message aborts the commit.\n"
+msgstr "Uma mensagem vazia aborta o commit.\n"
+
+#: builtin/merge.c:830
+#, fuzzy, c-format
+msgid ""
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
+"Linhas começadas com '%c' são ignoradas, e uma messagem vazia aborta\n"
+"o commit.\n"
+
+#: builtin/merge.c:883
+msgid "Empty commit message."
+msgstr "Mensagem commit vazia."
+
+#: builtin/merge.c:898
+#, c-format
+msgid "Wonderful.\n"
+msgstr "Maravilhoso.\n"
+
+#: builtin/merge.c:959
+#, c-format
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgstr ""
+"Merge automático falhou; resolve os conflitos e depois podes commitar o "
+"resultado.\n"
+
+#: builtin/merge.c:998
+msgid "No current branch."
+msgstr "Nenhum ramo atual."
+
+#: builtin/merge.c:1000
+msgid "No remote for the current branch."
+msgstr "Não há um remoto para o ramo atual."
+
+#: builtin/merge.c:1002
+msgid "No default upstream defined for the current branch."
+msgstr "Ramo atual sem upstream default definido."
+
+#: builtin/merge.c:1007
+#, 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:1064
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "Valor '%s' incorreto no ambiente '%s'"
+
+#: builtin/merge.c:1167
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr "não se pode integrar em %s: %s"
+
+#: builtin/merge.c:1201
+msgid "not something we can merge"
+msgstr "não se pode integrar"
+
+#: builtin/merge.c:1311
+msgid "--abort expects no arguments"
+msgstr "--abort não leva argumentos"
+
+#: builtin/merge.c:1315
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr "Há junção nenhuma para abortar (MERGE_HEAD faltando)."
+
+#: builtin/merge.c:1333
+#, fuzzy
+msgid "--quit expects no arguments"
+msgstr "--abort não leva argumentos"
+
+#: builtin/merge.c:1346
+msgid "--continue expects no arguments"
+msgstr "--continue não leva argumentos"
+
+#: builtin/merge.c:1350
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr "Há junção nenhuma em curso (MERGE_HEAD faltando)."
+
+#: builtin/merge.c:1366
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+"Não concluiu a integração (MERGE_HEAD presente).\n"
+"Submeta as suas alterações antes de integrar."
+
+#: builtin/merge.c:1373
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+"Cherry-pick não concluído (CHERRY_PICK_HEAD presente).\n"
+"Submeta as suas alterações antes de integrar."
+
+#: builtin/merge.c:1376
+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:1390
+msgid "You cannot combine --squash with --no-ff."
+msgstr "Não é possível combinar --squash e --no-ff."
+
+#: builtin/merge.c:1392
+#, fuzzy
+msgid "You cannot combine --squash with --commit."
+msgstr "Não é possível combinar --squash e --no-ff."
+
+#: builtin/merge.c:1408
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr "Nenhum commit especificado e merge.defaultToUpstream não definido."
+
+#: builtin/merge.c:1425
+msgid "Squash commit into empty head not supported yet"
+msgstr "Esmagar um commit numa cabeça vazia ainda não é suportado"
+
+#: builtin/merge.c:1427
+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:1432
+#, c-format
+msgid "%s - not something we can merge"
+msgstr "%s - não é algo se possa integrar"
+
+#: builtin/merge.c:1434
+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:1515
+msgid "refusing to merge unrelated histories"
+msgstr "integração de históricos não relacionados recusada"
+
+#: builtin/merge.c:1524
+#, fuzzy
+msgid "Already up to date."
+msgstr "Já está atualizado."
+
+#: builtin/merge.c:1534
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr "Atualizando %s..%s\n"
+
+#: builtin/merge.c:1580
+#, 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:1587
+#, c-format
+msgid "Nope.\n"
+msgstr "Não.\n"
+
+#: builtin/merge.c:1612
+#, fuzzy
+msgid "Already up to date. Yeeah!"
+msgstr "Já está atualizado. Sim!"
+
+#: builtin/merge.c:1618
+msgid "Not possible to fast-forward, aborting."
+msgstr "Não é possível avançar rapidamente, a abortar."
+
+#: builtin/merge.c:1646 builtin/merge.c:1711
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr "Recuando a árvore para estado pristino...\n"
+
+#: builtin/merge.c:1650
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr "Tentando estratégia merge %s...\n"
+
+#: builtin/merge.c:1702
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr "A junção lidou com estratégia de junção nenhuma.\n"
+
+#: builtin/merge.c:1704
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr "Falha ao integrar com a estratégia %s.\n"
+
+#: builtin/merge.c:1713
+#, 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:1727
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
+msgstr "Merge automática correu bem; parei antes de commitar como pedido\n"
+
+#: builtin/mktree.c:66
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
-#: builtin/mktree.c:152
+#: builtin/mktree.c:154
msgid "input is NUL terminated"
msgstr "a entrada termina com NUL"
-#: builtin/mktree.c:153 builtin/write-tree.c:24
+#: builtin/mktree.c:155 builtin/write-tree.c:26
msgid "allow missing objects"
msgstr "permitir objetos não presentes"
-#: builtin/mktree.c:154
+#: builtin/mktree.c:156
msgid "allow creation of more than one tree"
msgstr "permitir a criação de mais do que uma árvore"
-#: builtin/mv.c:16
+#: builtin/multi-pack-index.c:9
+msgid ""
+"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
+"size=<size>)"
+msgstr ""
+
+#: builtin/multi-pack-index.c:26
+msgid "object directory containing set of packfile and pack-index pairs"
+msgstr ""
+
+#: 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:50 builtin/prune-packed.c:25
+#, fuzzy
+msgid "too many arguments"
+msgstr "Demasiados argumentos."
+
+#: builtin/multi-pack-index.c:60
+msgid "--batch-size option is only for 'repack' subcommand"
+msgstr ""
+
+#: builtin/multi-pack-index.c:69
+#, fuzzy, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "subcomando desconhecido: %s"
+
+#: 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?"
+msgstr "A pasta %s está no index 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
-msgid "not under version control"
-msgstr "não está no controlo de versões"
-
#: 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 "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:785 builtin/repack.c:484
#, 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 +17748,11 @@
"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 +17760,200 @@
"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."
+msgstr "Encontrada nota nenhuma para 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 +17962,29 @@
"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"
+msgstr "Gravando por cima, notas existentes para 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"
+msgstr "Removendo nota para objeto %s\n"
-#: builtin/notes.c:484
+#: builtin/notes.c:497
msgid "read objects from stdin"
-msgstr "ler objetos da entrada padrão"
+msgstr "ler objetos de stdin"
-#: 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 +17993,12 @@
"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 +18007,52 @@
"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 +18060,46 @@
"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,331 +18110,559 @@
"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"
+msgstr "O objeto %s tem nota nenhuma\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:1604
#, 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
-#, c-format
-msgid "deflate error (%d)"
-msgstr "erro ao compactar (%d)"
+#: builtin/pack-objects.c:443
+#, fuzzy, c-format
+msgid "bad packed object CRC for %s"
+msgstr "ignorar objetos compactados"
-#: builtin/pack-objects.c:770
+#: 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 "ordered %u objects, expected %<PRIu32>"
+msgstr ""
+
+#: 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 ""
+"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:2999
+#, c-format
+msgid ""
+"expected object ID, got garbage:\n"
+" %s"
+msgstr ""
+
+#: builtin/pack-objects.c:3097
+#, fuzzy
+msgid "invalid value for --missing"
+msgstr "valor inválido de %s"
+
+#: 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:2833
+#: builtin/pack-objects.c:3450
#, c-format
msgid "bad index version '%s'"
msgstr "versão de índice '%s' incorreta"
-#: builtin/pack-objects.c:2863
-msgid "do not show progress meter"
-msgstr "não mostrar medidor de progresso"
-
-#: builtin/pack-objects.c:2865
-msgid "show progress meter"
-msgstr "mostrar medidor de progresso"
-
-#: 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: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: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-refs.c:6
+#: 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-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:490 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
-msgid "number of submodules pulled in parallel"
-msgstr "número de submódulos puxados em paralelo"
+#: builtin/pull.c:193
+msgid "force overwrite of local branch"
+msgstr "forçar a substituição do ramo local"
-#: builtin/pull.c:284
+#: builtin/pull.c:201
+msgid "number of submodules pulled in parallel"
+msgstr "número de submódulos com pull em paralelo"
+
+#: 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."
msgstr ""
-"Não há nenhum candidato com o qual realizar rebase de entre as referências "
-"que se acabaram de obter."
+"As refs que obteste tem candidato nenhum para onde rebasear."
-#: 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."
+"As refs que obteste tem candidato nenhum para junção."
-#: 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."
msgstr ""
-"Geralmente, significa que forneceu um especificador de referência\n"
-"com um carácter universal (wildcard) que não corresponde a nenhum remoto."
+"Normalmente isto significa que forneceste um wildcard especificador de ref\n"
+"que tem correspondência nenhuma no lado do 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 +18673,43 @@
"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:1246
msgid "You are not currently on a branch."
-msgstr "Não se encontra em nenhum ramo de momento."
+msgstr "Atualmente estás em ramo nenhum."
-#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79
+#: builtin/pull.c:471 builtin/pull.c:486
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
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:1252
msgid "<remote>"
msgstr "<remoto>"
-#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455
-#: git-parse-remote.sh:65
+#: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496
msgid "<branch>"
msgstr "<ramo>"
-#: builtin/pull.c:423 git-parse-remote.sh:75
+#: builtin/pull.c:484 builtin/rebase.c:1244
msgid "There is no tracking information for the current branch."
-msgstr "O ramo atual não segue nenhum ramo."
+msgstr "O ramo atual tem informação de tracking nenhuma."
-#: builtin/pull.c:432 git-parse-remote.sh:95
+#: builtin/pull.c:493
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 +18718,30 @@
"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:915
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:972
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:976
msgid "pull with rebase"
-msgstr "puxar com rebase"
+msgstr "pull com rebase"
-#: builtin/pull.c:813
+#: builtin/pull.c:977
msgid "please commit or stash them."
msgstr "submeta ou esconda-as."
-#: builtin/pull.c:838
+#: builtin/pull.c:1002
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -11266,7 +18752,7 @@
"a avançar a árvore de trabalho a partir do\n"
"commit %s."
-#: builtin/pull.c:843
+#: builtin/pull.c:1008
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -11283,27 +18769,31 @@
"$ git reset --hard\n"
"para recuperar."
-#: builtin/pull.c:858
+#: builtin/pull.c:1023
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:1027
msgid "Cannot rebase onto multiple branches."
msgstr "Não é possível efetuar rebase sobre múltiplos ramos."
-#: builtin/push.c:16
+#: builtin/pull.c:1041
+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 +18802,8 @@
"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 +18813,7 @@
"\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 +18826,7 @@
" 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 +18841,7 @@
"\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 +18854,12 @@
"\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 +18870,14 @@
"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 +18889,7 @@
"'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 +18901,7 @@
"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"
@@ -11419,18 +18909,17 @@
"(e.g., 'git pull ...') before pushing again.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-"As atualizações foram rejeitadas porque o remoto contém alterações que\n"
-"não tem localmente. Habitualmente, acontece porque outro repositório "
-"publicou\n"
-"na mesma referência. Pode integrar primeiro as alterações remotas\n"
-"(e.g., 'git pull ...') antes de publicar de novo.\n"
-"Consulte 'Note about fast-forwards' em 'git push --help' para obter detalhes."
+"Atualizações foram rejeitadas porque o remoto contém trabalho diferente\n"
+"do teu trabalho local. A causa, normalmente, é um push para a mesma ref.\n"
+"Podes tentar integrar as diferenças remotas (p.e., 'git pull ...') antes\n"
+"de fazeres novo push.\n"
+"Vê a 'Note about fast-forwards' do 'git push --help' para 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,22 +18929,117 @@
"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:294
+#, fuzzy
+msgid ""
+"Updates were rejected because the tip of the remote-tracking\n"
+"branch has been updated since the last checkout. You may want\n"
+"to integrate those changes locally (e.g., 'git pull ...')\n"
+"before forcing an update.\n"
+msgstr ""
+"As atualizações foram rejeitadas porque a ponta do ramo atual está atrasada\n"
+"em relação ao homólogo remoto. Integre as alterações remotas (e.g.\n"
+"'git pull ...') antes de publicar de novo.\n"
+"Consulte 'Note about fast-forwards' em 'git push --help' para obter detalhes."
+
+#: builtin/push.c:364
#, c-format
msgid "Pushing to %s\n"
-msgstr "A publicar em %s\n"
+msgstr "Fazendo push para %s\n"
-#: builtin/push.c:338
+#: builtin/push.c:371
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "falha ao publicar algumas referências em '%s'"
-#: builtin/push.c:369
+#: builtin/push.c:553
+msgid "repository"
+msgstr "repositório"
+
+#: builtin/push.c:554 builtin/send-pack.c:189
+msgid "push all refs"
+msgstr "publicar todas as referências"
+
+#: builtin/push.c:555 builtin/send-pack.c:191
+msgid "mirror all refs"
+msgstr "replicar todas as referências"
+
+#: builtin/push.c:557
+msgid "delete refs"
+msgstr "eliminar referências"
+
+#: builtin/push.c:558
+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:561 builtin/send-pack.c:192
+msgid "force updates"
+msgstr "forçar atualização"
+
+#: builtin/push.c:562 builtin/send-pack.c:204
+#, fuzzy
+msgid "<refname>:<expect>"
+msgstr "nome da referência>:<esperado"
+
+#: builtin/push.c:563 builtin/send-pack.c:205
+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:566 builtin/send-pack.c:208
+msgid "require remote updates to be integrated locally"
+msgstr ""
+
+#: builtin/push.c:569
+msgid "control recursive pushing of submodules"
+msgstr "controlar a publicação recursiva de submódulos"
+
+#: builtin/push.c:570 builtin/send-pack.c:199
+msgid "use thin pack"
+msgstr "usar pacote fino"
+
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
+#: builtin/send-pack.c:187
+msgid "receive pack program"
+msgstr "programa receive pack"
+
+#: builtin/push.c:573
+msgid "set upstream for git pull/status"
+msgstr "definir o ramo a montante usado com git pull/status"
+
+#: builtin/push.c:576
+msgid "prune locally removed refs"
+msgstr "eliminar referências removidas localmente"
+
+#: builtin/push.c:578
+msgid "bypass pre-push hook"
+msgstr "ignorar pre-push hook"
+
+#: builtin/push.c:579
+msgid "push missing but relevant tags"
+msgstr "publicar tags perdidas mas relevantes"
+
+#: builtin/push.c:581 builtin/send-pack.c:193
+msgid "GPG sign the push"
+msgstr "assinar publicação com GPG"
+
+#: builtin/push.c:583 builtin/send-pack.c:200
+msgid "request atomic transaction on remote side"
+msgstr "solicitar transação atómica no servidor remoto"
+
+#: builtin/push.c:601
+msgid "--delete is incompatible with --all, --mirror and --tags"
+msgstr "--delete é incompatível com --all, --mirror e --tags"
+
+#: builtin/push.c:603
+msgid "--delete doesn't make sense without any refs"
+msgstr "--delete não faz sentido sem uma referência"
+
+#: builtin/push.c:623
#, c-format
msgid "bad repository '%s'"
msgstr "repositório '%s' incorreto"
-#: builtin/push.c:370
+#: builtin/push.c:624
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -11477,116 +19061,77 @@
"\n"
" git push <nome>\n"
-#: builtin/push.c:388
+#: builtin/push.c:639
msgid "--all and --tags are incompatible"
msgstr "--all e --tags são incompatíveis"
-#: builtin/push.c:389
+#: builtin/push.c:641
msgid "--all can't be combined with refspecs"
msgstr "--all não pode ser combinado com especificadores de referências"
-#: builtin/push.c:394
+#: builtin/push.c:645
msgid "--mirror and --tags are incompatible"
msgstr "--mirror e --tags são incompatíveis"
-#: builtin/push.c:395
+#: builtin/push.c:647
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror não pode ser combinado com especificadores de referências"
-#: builtin/push.c:400
+#: builtin/push.c:650
msgid "--all and --mirror are incompatible"
msgstr "--all e --mirror são incompatíveis"
-#: builtin/push.c:518
-msgid "repository"
-msgstr "repositório"
-
-#: builtin/push.c:519 builtin/send-pack.c:162
-msgid "push all refs"
-msgstr "publicar todas as referências"
-
-#: builtin/push.c:520 builtin/send-pack.c:164
-msgid "mirror all refs"
-msgstr "replicar todas as referências"
-
-#: builtin/push.c:522
-msgid "delete refs"
-msgstr "eliminar referências"
-
-#: builtin/push.c:523
-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
-msgid "force updates"
-msgstr "forçar atualização"
-
-#: builtin/push.c:528 builtin/send-pack.c:179
-msgid "refname>:<expect"
-msgstr "nome da referência>:<esperado"
-
-#: builtin/push.c:529 builtin/send-pack.c:180
-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
-msgid "control recursive pushing of submodules"
-msgstr "controlar a publicação recursiva de submódulos"
-
-#: builtin/push.c:534 builtin/send-pack.c:173
-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
-msgid "receive pack program"
-msgstr "programa receive pack"
-
-#: builtin/push.c:537
-msgid "set upstream for git pull/status"
-msgstr "definir o ramo a montante usado com git pull/status"
-
-#: builtin/push.c:540
-msgid "prune locally removed refs"
-msgstr "eliminar referências removidas localmente"
-
-#: builtin/push.c:542
-msgid "bypass pre-push hook"
-msgstr "ignorar pre-push hook"
-
-#: builtin/push.c:543
-msgid "push missing but relevant tags"
-msgstr "publicar tags perdidas mas relevantes"
-
-#: builtin/push.c:546 builtin/send-pack.c:167
-msgid "GPG sign the push"
-msgstr "assinar publicação com GPG"
-
-#: builtin/push.c:548 builtin/send-pack.c:174
-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
-msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "--delete é incompatível com --all, --mirror e --tags"
-
-#: builtin/push.c:565
-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:657
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 +19142,748 @@
"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:193 builtin/rebase.c:217 builtin/rebase.c:244
+#, fuzzy, c-format
+msgid "unusable todo list: '%s'"
+msgstr "não é possível invocar unlink: %s"
+
+#: builtin/rebase.c:310
+#, fuzzy, c-format
+msgid "could not create temporary %s"
+msgstr "não foi possível criar ficheiro temporário"
+
+#: builtin/rebase.c:316
+#, fuzzy
+msgid "could not mark as interactive"
+msgstr "Não foi possível marcar como interativo"
+
+#: builtin/rebase.c:369
+#, fuzzy
+msgid "could not generate todo list"
+msgstr "não foi possível escrever para %s"
+
+#: builtin/rebase.c:411
+msgid "a base commit must be provided with --upstream or --onto"
+msgstr ""
+
+#: builtin/rebase.c:480
+#, fuzzy
+msgid "git rebase--interactive [<options>]"
msgstr "git rebase--helper [<opções>]"
-#: builtin/rebase--helper.c:19
+#: builtin/rebase.c:493 builtin/rebase.c:1388
+msgid "keep commits which start empty"
+msgstr ""
+
+#: builtin/rebase.c:497 builtin/revert.c:128
+msgid "allow commits with empty messages"
+msgstr "permitir commits com mensagens vazias"
+
+#: builtin/rebase.c:499
+#, fuzzy
+msgid "rebase merge commits"
+msgstr "mergetag incorreta no commit '%s'"
+
+#: builtin/rebase.c:501
+msgid "keep original branch points of cousins"
+msgstr ""
+
+#: builtin/rebase.c:503
+msgid "move commits that begin with squash!/fixup!"
+msgstr ""
+
+#: builtin/rebase.c:504
+#, fuzzy
+msgid "sign commits"
+msgstr "assinar os commits com GPG"
+
+#: builtin/rebase.c:506 builtin/rebase.c:1327
+msgid "display a diffstat of what changed upstream"
+msgstr ""
+
+#: builtin/rebase.c:508
msgid "continue rebase"
msgstr "continuar rebase"
-#: builtin/rebase--helper.c:21
-msgid "abort rebase"
-msgstr "abortar rebase"
+#: builtin/rebase.c:510
+#, fuzzy
+msgid "skip commit"
+msgstr "commit"
-#: builtin/receive-pack.c:27
+#: builtin/rebase.c:511
+#, fuzzy
+msgid "edit the todo list"
+msgstr "falha ao escrever para rev-list"
+
+#: builtin/rebase.c:513
+#, fuzzy
+msgid "show the current patch"
+msgstr "ignorar o patch atual"
+
+#: builtin/rebase.c:516
+msgid "shorten commit ids in the todo list"
+msgstr ""
+
+#: builtin/rebase.c:518
+msgid "expand commit ids in the todo list"
+msgstr ""
+
+#: builtin/rebase.c:520
+msgid "check the todo list"
+msgstr ""
+
+#: builtin/rebase.c:522
+msgid "rearrange fixup/squash lines"
+msgstr ""
+
+#: builtin/rebase.c:524
+msgid "insert exec commands in todo list"
+msgstr ""
+
+#: builtin/rebase.c:525
+msgid "onto"
+msgstr ""
+
+#: builtin/rebase.c:528
+#, fuzzy
+msgid "restrict-revision"
+msgstr "revisão"
+
+#: builtin/rebase.c:528
+#, fuzzy
+msgid "restrict revision"
+msgstr "revisão"
+
+#: builtin/rebase.c:530
+msgid "squash-onto"
+msgstr ""
+
+#: builtin/rebase.c:531
+msgid "squash onto"
+msgstr ""
+
+#: builtin/rebase.c:533
+#, fuzzy
+msgid "the upstream commit"
+msgstr "Remover a informação do ramo a montante"
+
+#: builtin/rebase.c:535
+#, fuzzy
+msgid "head-name"
+msgstr "mudar nome"
+
+#: builtin/rebase.c:535
+#, fuzzy
+msgid "head name"
+msgstr "à frente "
+
+#: builtin/rebase.c:540
+#, fuzzy
+msgid "rebase strategy"
+msgstr "estratégia de integração"
+
+#: builtin/rebase.c:541
+#, fuzzy
+msgid "strategy-opts"
+msgstr "estratégia"
+
+#: builtin/rebase.c:542
+#, fuzzy
+msgid "strategy options"
+msgstr "opções de decoração"
+
+#: builtin/rebase.c:543
+msgid "switch-to"
+msgstr ""
+
+#: builtin/rebase.c:544
+msgid "the branch or commit to checkout"
+msgstr ""
+
+#: builtin/rebase.c:545
+#, fuzzy
+msgid "onto-name"
+msgstr "nome"
+
+#: builtin/rebase.c:545
+#, fuzzy
+msgid "onto name"
+msgstr "nome do remoto"
+
+#: builtin/rebase.c:546
+#, fuzzy
+msgid "cmd"
+msgstr "comando"
+
+#: builtin/rebase.c:546
+#, fuzzy
+msgid "the command to run"
+msgstr "Nenhum comando concluído."
+
+#: builtin/rebase.c:549 builtin/rebase.c:1421
+msgid "automatically re-schedule any `exec` that fails"
+msgstr ""
+
+#: builtin/rebase.c:565
+msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
+msgstr ""
+
+#: builtin/rebase.c:581
+#, c-format
+msgid "%s requires the merge backend"
+msgstr ""
+
+#: builtin/rebase.c:624
+#, fuzzy, c-format
+msgid "could not get 'onto': '%s'"
+msgstr "não foi possível definir '%s' como '%s'"
+
+#: builtin/rebase.c:641
+#, fuzzy, c-format
+msgid "invalid orig-head: '%s'"
+msgstr "ficheiro inválido: '%s'"
+
+#: builtin/rebase.c:666
+#, c-format
+msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
+msgstr ""
+
+#: builtin/rebase.c:811 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:894
+#, 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:1220
+#, c-format
+msgid ""
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
+"\"."
+msgstr ""
+
+#: builtin/rebase.c:1238
+#, 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 ""
+"%s\n"
+"Por favor, diz o branch sobre o qual queres rebasear.\n"
+"Vê git-rebase(1) para detalhes.\n"
+"\n"
+" git rebase '<branch>'\n"
+"\n"
+
+#: builtin/rebase.c:1254
+#, 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 desejas por tracking information neste branch, podes fazer com:\n"
+"\n"
+" git branch --set-upstream-to=%s/<branch> %s\n"
+"\n"
+
+#: builtin/rebase.c:1284
+msgid "exec commands cannot contain newlines"
+msgstr ""
+
+#: builtin/rebase.c:1288
+msgid "empty exec command"
+msgstr ""
+
+#: builtin/rebase.c:1318
+#, fuzzy
+msgid "rebase onto given branch instead of upstream"
+msgstr "demasiados ramos para remover a definição de ramo a montante"
+
+#: builtin/rebase.c:1320
+#, 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:1322
+#, fuzzy
+msgid "allow pre-rebase hook to run"
+msgstr "Rebase recusado pelo hook pre-rebase."
+
+#: builtin/rebase.c:1324
+msgid "be quiet. implies --no-stat"
+msgstr ""
+
+#: builtin/rebase.c:1330
+#, fuzzy
+msgid "do not show diffstat of what changed upstream"
+msgstr "não apresentar um diffstat ao fim da integração"
+
+#: builtin/rebase.c:1333
+#, fuzzy
+msgid "add a Signed-off-by trailer to each commit"
+msgstr "adicionar uma linha com Signed-of-by no fim da mensagem de commit"
+
+#: builtin/rebase.c:1336
+#, fuzzy
+msgid "make committer date match author date"
+msgstr "agrupar por committer em vez de autor"
+
+#: builtin/rebase.c:1338
+msgid "ignore author date and use current date"
+msgstr ""
+
+#: builtin/rebase.c:1340
+#, fuzzy
+msgid "synonym of --reset-author-date"
+msgstr "sinónimo de --files-with-matches"
+
+#: builtin/rebase.c:1342 builtin/rebase.c:1346
+#, fuzzy
+msgid "passed to 'git apply'"
+msgstr "transmitir ao git-apply"
+
+#: builtin/rebase.c:1344
+#, fuzzy
+msgid "ignore changes in whitespace"
+msgstr "ignorar alterações de espaço em branco ao procurar contexto"
+
+#: builtin/rebase.c:1348 builtin/rebase.c:1351
+msgid "cherry-pick all commits, even if unchanged"
+msgstr ""
+
+#: builtin/rebase.c:1353
+#, fuzzy
+msgid "continue"
+msgstr "continuar rebase"
+
+#: builtin/rebase.c:1356
+#, fuzzy
+msgid "skip current patch and continue"
+msgstr "ignorar o patch atual"
+
+#: builtin/rebase.c:1358
+#, fuzzy
+msgid "abort and check out the original branch"
+msgstr " (use \"git rebase --abort\" para restaurar o ramo original)"
+
+#: builtin/rebase.c:1361
+msgid "abort but keep HEAD where it is"
+msgstr ""
+
+#: builtin/rebase.c:1362
+#, 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:1365
+msgid "show the patch file being applied or merged"
+msgstr ""
+
+#: builtin/rebase.c:1368
+msgid "use apply strategies to rebase"
+msgstr ""
+
+#: builtin/rebase.c:1372
+#, fuzzy
+msgid "use merging strategies to rebase"
+msgstr "estratégia de integração a usar"
+
+#: builtin/rebase.c:1376
+msgid "let the user edit the list of commits to rebase"
+msgstr ""
+
+#: builtin/rebase.c:1380
+msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
+msgstr ""
+
+#: builtin/rebase.c:1385
+msgid "how to handle commits that become empty"
+msgstr ""
+
+#: builtin/rebase.c:1392
+msgid "move commits that begin with squash!/fixup! under -i"
+msgstr ""
+
+#: builtin/rebase.c:1399
+msgid "add exec lines after each commit of the editable list"
+msgstr ""
+
+#: builtin/rebase.c:1403
+#, fuzzy
+msgid "allow rebasing commits with empty messages"
+msgstr "permitir commits com mensagens vazias"
+
+#: builtin/rebase.c:1407
+msgid "try to rebase merges instead of skipping them"
+msgstr ""
+
+#: builtin/rebase.c:1410
+#, fuzzy
+msgid "use 'merge-base --fork-point' to refine upstream"
+msgstr "git merge-base --fork-point <referência> [<commit>]"
+
+#: builtin/rebase.c:1412
+#, fuzzy
+msgid "use the given merge strategy"
+msgstr "opção de estratégia de integração"
+
+#: builtin/rebase.c:1414 builtin/revert.c:115
+msgid "option"
+msgstr "opção"
+
+#: builtin/rebase.c:1415
+msgid "pass the argument through to the merge strategy"
+msgstr ""
+
+#: builtin/rebase.c:1418
+msgid "rebase all reachable commits up to the root(s)"
+msgstr ""
+
+#: builtin/rebase.c:1423
+msgid "apply all changes, even those already present upstream"
+msgstr ""
+
+#: builtin/rebase.c:1440
+msgid ""
+"the rebase.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
+msgstr ""
+"o suporte a rebase.useBuiltin foi removido!\n"
+"Vê essa entry em 'git help config' para detalhes."
+
+#: builtin/rebase.c:1446
+#, 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:1487
+msgid ""
+"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
+msgstr ""
+
+#: builtin/rebase.c:1492
+#, fuzzy
+msgid "cannot combine '--keep-base' with '--onto'"
+msgstr "Não é possível combinar --squash e --no-ff."
+
+#: builtin/rebase.c:1494
+#, fuzzy
+msgid "cannot combine '--keep-base' with '--root'"
+msgstr "Não é possível combinar --squash e --no-ff."
+
+#: builtin/rebase.c:1498
+#, fuzzy
+msgid "cannot combine '--root' with '--fork-point'"
+msgstr "Não é possível combinar --squash e --no-ff."
+
+#: builtin/rebase.c:1501
+msgid "No rebase in progress?"
+msgstr "Rebase não está em curso?"
+
+#: builtin/rebase.c:1505
+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:1528 t/helper/test-fast-rebase.c:123
+msgid "Cannot read HEAD"
+msgstr "Não é possível ler HEAD"
+
+#: builtin/rebase.c:1540
+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:1559
+#, fuzzy
+msgid "could not discard worktree changes"
+msgstr "Não é possível remover as alterações da árvore de trabalho"
+
+#: builtin/rebase.c:1578
+#, fuzzy, c-format
+msgid "could not move back to %s"
+msgstr "Não foi possível voltar para $head_name"
+
+#: builtin/rebase.c:1624
+#, 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 %s, e\n"
+"é possível que outro processo de rebase já esteja em curso.\n"
+"Se for o caso, tente\n"
+"\t%s\n"
+"Se não for o caso,\n"
+"\t%s\n"
+"e execute o comando de novo. A execução foi interrompida no caso de\n"
+"ainda ter algo importante nesse sítio.\n"
+
+#: builtin/rebase.c:1652
+#, fuzzy
+msgid "switch `C' expects a numerical value"
+msgstr "a opção '%c' espera um valor numérico"
+
+#: builtin/rebase.c:1694
+#, fuzzy, c-format
+msgid "Unknown mode: %s"
+msgstr "Mode de --patch desconhecido: %s"
+
+#: builtin/rebase.c:1733
+msgid "--strategy requires --merge or --interactive"
+msgstr ""
+
+#: builtin/rebase.c:1763
+msgid "cannot combine apply options with merge options"
+msgstr ""
+
+#: builtin/rebase.c:1776
+#, fuzzy, c-format
+msgid "Unknown rebase backend: %s"
+msgstr "Subcomando desconhecido: %s"
+
+#: builtin/rebase.c:1806
+msgid "--reschedule-failed-exec requires --exec or --interactive"
+msgstr ""
+
+#: builtin/rebase.c:1826
+msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+msgstr ""
+
+#: builtin/rebase.c:1830
+msgid ""
+"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
+msgstr ""
+
+#: builtin/rebase.c:1854
+#, fuzzy, c-format
+msgid "invalid upstream '%s'"
+msgstr "caminho inválido '%s'"
+
+#: builtin/rebase.c:1860
+#, fuzzy
+msgid "Could not create new root commit"
+msgstr "não foi possível analisar o commit recém-criado"
+
+#: builtin/rebase.c:1886
+#, c-format
+msgid "'%s': need exactly one merge base with branch"
+msgstr ""
+
+#: builtin/rebase.c:1889
+#, fuzzy, c-format
+msgid "'%s': need exactly one merge base"
+msgstr "É necessário exatamente um intervalo."
+
+#: builtin/rebase.c:1897
+#, 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:1923
+#, fuzzy, c-format
+msgid "fatal: no such branch/commit '%s'"
+msgstr "o ramo '%s' não existe"
+
+#: builtin/rebase.c:1931 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:1942
+#, fuzzy
+msgid "Could not resolve HEAD to a revision"
+msgstr "Foi impossível resolver HEAD para uma revisão"
+
+#: builtin/rebase.c:1963
+msgid "Please commit or stash them."
+msgstr "Submeta ou esconda-as."
+
+#: builtin/rebase.c:1999
+#, fuzzy, c-format
+msgid "could not switch to %s"
+msgstr "não foi possível escrever para %s"
+
+#: builtin/rebase.c:2010
+#, fuzzy
+msgid "HEAD is up to date."
+msgstr "HEAD está agora em"
+
+#: builtin/rebase.c:2012
+#, fuzzy, c-format
+msgid "Current branch %s is up to date.\n"
+msgstr "Branch atual %s está atualizado.\n"
+
+#: builtin/rebase.c:2020
+#, fuzzy
+msgid "HEAD is up to date, rebase forced."
+msgstr "O ramo atual $branch_name está atualizado, rebase forçado."
+
+#: builtin/rebase.c:2022
+#, fuzzy, c-format
+msgid "Current branch %s is up to date, rebase forced.\n"
+msgstr "Branch actual %s está atualizado, rebase forçado.\n"
+
+#: builtin/rebase.c:2030
+msgid "The pre-rebase hook refused to rebase."
+msgstr "Rebase recusado pelo hook pre-rebase."
+
+#: builtin/rebase.c:2037
+#, fuzzy, c-format
+msgid "Changes to %s:\n"
+msgstr "Modificações para %s:\n"
+
+#: builtin/rebase.c:2040
+#, fuzzy, c-format
+msgid "Changes from %s to %s:\n"
+msgstr "Modificações de %s para %s:\n"
+
+#: builtin/rebase.c:2065
+#, fuzzy, c-format
+msgid "First, rewinding head to replay your work on top of it...\n"
+msgstr "Primeiro, recuando head para refazer o teu trabalho em cima dela...\n"
+
+#: builtin/rebase.c:2074
+#, fuzzy
+msgid "Could not detach HEAD"
+msgstr "não foi possível destacar HEAD"
+
+#: builtin/rebase.c:2083
+#, fuzzy, c-format
+msgid "Fast-forwarded %s to %s.\n"
+msgstr "Avançei-rápido %s para %s.\n"
+
+#: 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:1276
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"
@@ -11706,10 +19910,10 @@
"consiga de outra forma atualizar a árvore de trabalho dele para\n"
"refletir o que publicou.\n"
"\n"
-"Para suprimir esta mensagem e manter o comportamento predefinido, defina a "
-"variável de configuração 'receive.denyCurrentBranch' como 'refuse'."
+"Para suprimir esta mensagem e manter o comportamento predefinido, defina\n"
+"a variável de configuração 'receive.denyCurrentBranch' como 'refuse'."
-#: builtin/receive-pack.c:816
+#: builtin/receive-pack.c:1296
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 +19933,75 @@
"\n"
"Para suprimir esta mensagem, pode definí-la como 'refuse'."
-#: builtin/receive-pack.c:1889
+#: builtin/receive-pack.c:2481
msgid "quiet"
msgstr "silencioso"
-#: builtin/receive-pack.c:1903
+#: builtin/receive-pack.c:2495
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:540 builtin/reflog.c:545
+#: builtin/reflog.c:22
+msgid ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"<refs>..."
+msgstr ""
+
+#: 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 "Impossível efetuar reflog de '%s'"
+
+#: 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,171 +20009,175 @@
"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"
msgstr ""
-"--mirror é perigoso e obsoleto;\n"
-"\t use --mirror=fetch ou --mirror=push"
+"--mirror é perigoso e obsoleto; por favor\n"
+"\t usa --mirror=fetch ou --mirror=push invés"
-#: 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:700
#, c-format
msgid "remote %s already exists."
msgstr "o remoto %s já existe."
-#: builtin/remote.c:194 builtin/remote.c:633
-#, 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:240
#, 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:355
#, 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:454 builtin/remote.c:462
msgid "(matching)"
msgstr "(correspondente)"
-#: builtin/remote.c:449
+#: builtin/remote.c:466
msgid "(delete)"
msgstr "(eliminado)"
-#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:856
-#, c-format
-msgid "No such remote: %s"
-msgstr "Remoto inexistente: %s"
+#: builtin/remote.c:655
+#, fuzzy, c-format
+msgid "could not set '%s'"
+msgstr "não foi possível reiniciar '%s'"
-#: builtin/remote.c:639
+#: builtin/remote.c:660
+#, 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:691 builtin/remote.c:836 builtin/remote.c:946
+#, fuzzy, c-format
+msgid "No such remote: '%s'"
+msgstr "Remoto inexistente '%s'"
+
+#: builtin/remote.c:710
#, 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:730
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -11935,17 +20189,17 @@
"\t%s\n"
"\tAtualize a configuração manualmente se necessário."
-#: builtin/remote.c:695
+#: builtin/remote.c:770
#, c-format
msgid "deleting '%s' failed"
msgstr "falha ao eliminar '%s'"
-#: builtin/remote.c:729
+#: builtin/remote.c:804
#, c-format
msgid "creating '%s' failed"
msgstr "falha ao criar '%s'"
-#: builtin/remote.c:794
+#: builtin/remote.c:882
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -11959,432 +20213,571 @@
"Nota: alguns ramos fora da hierarquia refs/remotes/ não foram removidos;\n"
"para os remover, use:"
-#: builtin/remote.c:808
+#: builtin/remote.c:896
#, 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:999
#, 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:1002
msgid " tracked"
msgstr " seguido"
-#: builtin/remote.c:914
+#: builtin/remote.c:1004
msgid " stale (use 'git remote prune' to remove)"
msgstr " obsoleto (use 'git remote prune' para remover)"
-#: builtin/remote.c:916
+#: builtin/remote.c:1006
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:957
+#: builtin/remote.c:1047
#, 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:1056
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "rebaseia interativamente sobre %s do remoto"
-#: builtin/remote.c:966
+#: builtin/remote.c:1058
+#, fuzzy, c-format
+msgid "rebases interactively (with merges) onto remote %s"
+msgstr "rebaseia interativamente sobre %s do remoto"
+
+#: builtin/remote.c:1061
#, c-format
msgid "rebases onto remote %s"
msgstr "rebaseia sobre %s do remoto"
-#: builtin/remote.c:969
+#: builtin/remote.c:1065
#, c-format
msgid " merges with remote %s"
msgstr " integra com %s do remoto"
-#: builtin/remote.c:972
+#: builtin/remote.c:1068
#, c-format
msgid "merges with remote %s"
msgstr "integra com %s do remoto"
-#: builtin/remote.c:975
+#: builtin/remote.c:1071
#, c-format
msgid "%-*s and with remote %s\n"
-msgstr "%-*s e com o %s do remoto\n"
+msgstr "%-*s e com o %s remote\n"
-#: builtin/remote.c:1018
+#: builtin/remote.c:1114
msgid "create"
msgstr "criado"
-#: builtin/remote.c:1021
+#: builtin/remote.c:1117
msgid "delete"
msgstr "eliminado"
-#: builtin/remote.c:1025
+#: builtin/remote.c:1121
msgid "up to date"
msgstr "atualizado"
-#: builtin/remote.c:1028
+#: builtin/remote.c:1124
msgid "fast-forwardable"
msgstr "pode ser avançado rapidamente"
-#: builtin/remote.c:1031
+#: builtin/remote.c:1127
msgid "local out of date"
msgstr "local desatualizado"
-#: builtin/remote.c:1038
+#: builtin/remote.c:1134
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s força em %-*s (%s)"
-#: builtin/remote.c:1041
+#: builtin/remote.c:1137
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s publica em %-*s (%s)"
-#: builtin/remote.c:1045
+#: builtin/remote.c:1141
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s força em %s"
-#: builtin/remote.c:1048
+#: builtin/remote.c:1144
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s publica em %s"
-#: builtin/remote.c:1116
+#: builtin/remote.c:1212
msgid "do not query remotes"
msgstr "não consultar remotos"
-#: builtin/remote.c:1143
+#: builtin/remote.c:1239
#, c-format
msgid "* remote %s"
msgstr "* remoto %s"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1240
#, 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:1241 builtin/remote.c:1257 builtin/remote.c:1396
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:1255 builtin/remote.c:1257
#, 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:1259 builtin/remote.c:1261 builtin/remote.c:1263
#, c-format
msgid " HEAD branch: %s"
msgstr " Ramo HEAD: %s"
-#: builtin/remote.c:1160
+#: builtin/remote.c:1259
msgid "(not queried)"
msgstr "(não consultado)"
-#: builtin/remote.c:1162
+#: builtin/remote.c:1261
msgid "(unknown)"
msgstr "(desconhecido)"
-#: builtin/remote.c:1166
+#: builtin/remote.c:1265
#, 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"
+msgstr " HEAD branch (HEAD remote é ambíguo, pode ser um dos seguintes):\n"
-#: builtin/remote.c:1178
+#: builtin/remote.c:1277
#, 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:1280 builtin/remote.c:1306
msgid " (status not queried)"
msgstr " (estado não consultado)"
-#: builtin/remote.c:1190
+#: builtin/remote.c:1289
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:1297
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:1303
#, 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:1324
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:1326
msgid "delete refs/remotes/<name>/HEAD"
msgstr "eliminar refs/remotes/<nome>/HEAD"
-#: builtin/remote.c:1242
+#: builtin/remote.c:1341
msgid "Cannot determine remote HEAD"
msgstr "Não é possível determinar o remoto HEAD"
-#: builtin/remote.c:1244
+#: builtin/remote.c:1343
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:1353
#, c-format
msgid "Could not delete %s"
msgstr "Não foi possível eliminar %s"
-#: builtin/remote.c:1262
+#: builtin/remote.c:1361
#, c-format
msgid "Not a valid ref: %s"
msgstr "Referência inválida: %s"
-#: builtin/remote.c:1264
+#: builtin/remote.c:1363
#, c-format
msgid "Could not setup %s"
msgstr "Não foi possível configurar %s"
-#: builtin/remote.c:1282
+#: builtin/remote.c:1381
#, c-format
msgid " %s will become dangling!"
msgstr " %s ficará suspenso!"
-#: builtin/remote.c:1283
+#: builtin/remote.c:1382
#, c-format
msgid " %s has become dangling!"
msgstr " %s ficou suspenso!"
-#: builtin/remote.c:1293
+#: builtin/remote.c:1392
#, c-format
msgid "Pruning %s"
msgstr "A eliminar %s"
-#: builtin/remote.c:1294
+#: builtin/remote.c:1393
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1310
+#: builtin/remote.c:1409
#, c-format
msgid " * [would prune] %s"
msgstr " * [eliminaria] %s"
-#: builtin/remote.c:1313
+#: builtin/remote.c:1412
#, c-format
msgid " * [pruned] %s"
msgstr " * [eliminado] %s"
-#: builtin/remote.c:1358
+#: builtin/remote.c:1457
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:1521 builtin/remote.c:1577 builtin/remote.c:1647
#, c-format
msgid "No such remote '%s'"
msgstr "Remoto inexistente '%s'"
-#: builtin/remote.c:1437
+#: builtin/remote.c:1539
msgid "add branch"
msgstr "adicionar ramo"
-#: builtin/remote.c:1444
+#: builtin/remote.c:1546
msgid "no remote specified"
msgstr "nenhum remoto especificado"
-#: builtin/remote.c:1461
+#: builtin/remote.c:1563
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:1565
msgid "return all URLs"
msgstr "retornar todos os URLs"
-#: builtin/remote.c:1491
+#: builtin/remote.c:1595
#, 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:1621
msgid "manipulate push URLs"
msgstr "manipular URLs de publicação"
-#: builtin/remote.c:1519
+#: builtin/remote.c:1623
msgid "add URL"
msgstr "adicionar URL"
-#: builtin/remote.c:1521
+#: builtin/remote.c:1625
msgid "delete URLs"
msgstr "eliminar URLs"
-#: builtin/remote.c:1528
+#: builtin/remote.c:1632
msgid "--add --delete doesn't make sense"
msgstr "--add --delete não faz sentido"
-#: builtin/remote.c:1569
+#: builtin/remote.c:1673
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Padrão de URL antigo inválido: %s"
-#: builtin/remote.c:1577
+#: builtin/remote.c:1681
#, c-format
msgid "No such URL found: %s"
msgstr "URL não encontrado: %s"
-#: builtin/remote.c:1579
+#: builtin/remote.c:1683
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."
msgstr ""
-"Repacks incrementais são incompatíveis com índices bitmap. Use\n"
+"Repacks incrementais são incompatíveis com bitmap indexes. Usa\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:268 builtin/repack.c:447
+msgid "repack: Expecting full hex object ID lines only from pack-objects."
+msgstr ""
+
+#: builtin/repack.c:295
+msgid "could not finish pack-objects to repack promisor objects"
+msgstr ""
+
+#: builtin/repack.c:323
msgid "pack everything in a single pack"
msgstr "compactar tudo num único pacote"
-#: builtin/repack.c:168
+#: builtin/repack.c:325
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:328
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:330
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:332
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:334
msgid "do not run git-update-server-info"
msgstr "não executar git-update-server-info"
-#: builtin/repack.c:180
+#: builtin/repack.c:337
msgid "pass --local to git-pack-objects"
msgstr "passar --local ao git-pack-objects"
-#: builtin/repack.c:182
+#: builtin/repack.c:339
msgid "write bitmap index"
msgstr "escrever índice de mapa de bits"
-#: builtin/repack.c:183
+#: builtin/repack.c:341
+#, fuzzy
+msgid "pass --delta-islands to git-pack-objects"
+msgstr "passar --local ao git-pack-objects"
+
+#: builtin/repack.c:342
msgid "approxidate"
msgstr "aproximar"
-#: builtin/repack.c:184
+#: builtin/repack.c:343
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:345
msgid "with -a, repack unreachable objects"
msgstr "com -a, reempacotar objetos inalcançáveis"
-#: builtin/repack.c:188
+#: builtin/repack.c:347
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:348 builtin/repack.c:354
msgid "bytes"
msgstr "bytes"
-#: builtin/repack.c:190
+#: builtin/repack.c:349
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:351
msgid "limits the maximum delta depth"
msgstr "limitar a profundidade máxima de delta"
-#: builtin/repack.c:194
+#: builtin/repack.c:353
+#, fuzzy
+msgid "limits the maximum number of threads"
+msgstr "limitar a profundidade máxima de delta"
+
+#: builtin/repack.c:355
msgid "maximum size of each packfile"
msgstr "tamanho máximo de cada ficheiro de pacote"
-#: builtin/repack.c:196
+#: builtin/repack.c:357
msgid "repack objects in packs marked with .keep"
msgstr "reempacotar objetos em pacotes marcados com .keep"
-#: builtin/repack.c:206
+#: builtin/repack.c:359
+#, fuzzy
+msgid "do not repack this pack"
+msgstr "criar pacotes finos"
+
+#: builtin/repack.c:369
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:373
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable e -A são incompatíveis"
-#: builtin/repack.c:400 builtin/worktree.c:115
-#, c-format
-msgid "failed to remove '%s'"
-msgstr "falha ao remover '%s'"
+#: builtin/repack.c:456
+msgid "Nothing new to pack."
+msgstr ""
-#: builtin/replace.c:19
+#: builtin/repack.c:486
+#, fuzzy, c-format
+msgid "missing required file: %s"
+msgstr "falta o objeto %s de %s"
+
+#: builtin/repack.c:488
+#, fuzzy, c-format
+msgid "could not unlink: %s"
+msgstr "não foi possível bloquear '%s'"
+
+#: 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 +20786,310 @@
"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 ""
+"Impossível converter os seguinte(s) graft(s):\n"
+"%s"
+
+#: 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:594
+#: builtin/stash.c:618
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"
@@ -12600,102 +21098,104 @@
"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
msgstr ""
"git rev-parse --parseopt [<opções>] -- [<argumentos>...]\n"
-" or: git rev-parse --sq-quote [<argumentos>...]\n"
-" or: git rev-parse [<opções>] [<argumentos>...]\n"
+" ou: git rev-parse --sq-quote [<argumentos>...]\n"
+" ou: git rev-parse [<opções>] [<argumentos>...]\n"
"\n"
-"Execute \"git rev-parse --parseopt -h\" para obter mais informação sobre a "
-"primeira utilização."
+"Execute \"git rev-parse --parseopt -h\" para mais informação com 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:239
msgid "revert failed"
msgstr "falha ao reverter"
-#: builtin/revert.c:224
+#: builtin/revert.c:252
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:"
@@ -12703,27 +21203,27 @@
"the following files have staged content different from both the\n"
"file and the HEAD:"
msgstr[0] ""
-"o seguinte ficheiro tem conteúdo preparado no índice diferente\n"
-"do conteúdo no ficheiro e em HEAD:"
+"o seguinte ficheiro tem staged content diferente quer no ficheiro\n"
+"quer em HEAD:"
msgstr[1] ""
-"os seguintes ficheiros têm conteúdo preparado no índice diferente\n"
-"do conteúdo no ficheiro e em HEAD:"
+"os seguintes ficheiros têm staged content diferente quer no ficheiro\n"
+"quer em HEAD:"
-#: builtin/rm.c:210
+#: builtin/rm.c:212
msgid ""
"\n"
"(use -f to force removal)"
msgstr ""
"\n"
-"(use -f para forçar remoção)"
+"(usa -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 +21231,53 @@
"\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> "
@@ -12781,56 +21286,87 @@
msgstr ""
"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<diretório> "
-"[<referência>...]\n"
-" --all e especificação explicita duma <referência> são mutuamente "
-"exclusivos."
+"[<ref>...]\n"
+" --all e <ref> explícito são mutuamente exclusivos."
-#: builtin/send-pack.c:161
+#: builtin/send-pack.c:188
msgid "remote name"
msgstr "nome do remoto"
-#: builtin/send-pack.c:175
+#: builtin/send-pack.c:201
msgid "use stateless RPC protocol"
msgstr "use protocolo RPC sem estado"
-#: builtin/send-pack.c:176
+#: builtin/send-pack.c:202
msgid "read refs from stdin"
msgstr "ler referências do stdin"
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:203
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:16
+#, 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:17
+#, fuzzy
+msgid "git log --pretty=short | git shortlog [<options>]"
+msgstr "git worktree list [<opções>]"
+
+#: builtin/shortlog.c:135
+msgid "using multiple --group options with stdin is not supported"
+msgstr ""
+
+#: builtin/shortlog.c:145
+msgid "using --group=trailer with stdin is not supported"
+msgstr ""
+
+#: builtin/shortlog.c:335
+#, fuzzy, c-format
+msgid "unknown group type: %s"
+msgstr "Tipo desconhecido: %d"
+
+#: builtin/shortlog.c:363
msgid "Group by committer rather than author"
msgstr "agrupar por committer em vez de autor"
-#: builtin/shortlog.c:250
+#: builtin/shortlog.c:366
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:368
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:370
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:371
+msgid "<w>[,<i1>[,<i2>]]"
+msgstr ""
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:372
msgid "Linewrap output"
msgstr "ajustar linhas"
-#: builtin/show-branch.c:10
+#: builtin/shortlog.c:374
+msgid "field"
+msgstr ""
+
+#: builtin/shortlog.c:375
+msgid "Group by field"
+msgstr ""
+
+#: builtin/shortlog.c:403
+#, 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 +21378,139 @@
"\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 +21518,825 @@
"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 fazer merge %s com %s"
+
+#: builtin/stash.c:461
+msgid "Index was not unstashed."
+msgstr "O índice não foi reposto."
+
+#: builtin/stash.c:522 builtin/stash.c:620
+#, fuzzy
+msgid "attempt to recreate the index"
+msgstr "falha ao ler o índice"
+
+#: builtin/stash.c:566
+#, fuzzy, c-format
+msgid "Dropped %s (%s)"
+msgstr "A descartar ${REV} ($s)"
+
+#: builtin/stash.c:569
+#, fuzzy, c-format
+msgid "%s: Could not drop stash entry"
+msgstr "${REV}: Não foi possível descartar elemento da pilha"
+
+#: builtin/stash.c:582
+#, fuzzy, c-format
+msgid "'%s' is not a stash reference"
+msgstr "'$args' não é uma referência de pilha"
+
+#: builtin/stash.c:632
+#, 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:655
+msgid "No branch name specified"
+msgstr "Nenhum nome de ramo especificado"
+
+#: builtin/stash.c:799 builtin/stash.c:836
+#, fuzzy, c-format
+msgid "Cannot update %s with %s"
+msgstr "Não é possível atualizar $ref_stash com $w_commit"
+
+#: builtin/stash.c:817 builtin/stash.c:1471 builtin/stash.c:1536
+#, fuzzy
+msgid "stash message"
+msgstr "mensagem da tag"
+
+#: builtin/stash.c:827
+msgid "\"git stash store\" requires one <commit> argument"
+msgstr ""
+
+#: builtin/stash.c:1042
+msgid "No changes selected"
+msgstr "Nenhuma alteração selecionada"
+
+#: builtin/stash.c:1142
+msgid "You do not have the initial commit yet"
+msgstr "O commit inicial ainda não existe"
+
+#: builtin/stash.c:1169
+msgid "Cannot save the current index state"
+msgstr "Não é possível guardar o estado atual do índice"
+
+#: builtin/stash.c:1178
+msgid "Cannot save the untracked files"
+msgstr "Não é possível guardar os ficheiros não controlados"
+
+#: builtin/stash.c:1189 builtin/stash.c:1198
+msgid "Cannot save the current worktree state"
+msgstr "Não é possível guardar o estado atual da árvore de trabalho"
+
+#: builtin/stash.c:1226
+msgid "Cannot record working tree state"
+msgstr "Não é possível gravar o estado da árvore de trabalho"
+
+#: builtin/stash.c:1275
+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:1291
+#, fuzzy
+msgid "Did you forget to 'git add'?"
+msgstr "Será que falta 'git add'?"
+
+#: builtin/stash.c:1306
+msgid "No local changes to save"
+msgstr "Não há alterações locais para guardar"
+
+#: builtin/stash.c:1313
+msgid "Cannot initialize stash"
+msgstr "Não é possível inicializar a pilha"
+
+#: builtin/stash.c:1328
+msgid "Cannot save the current status"
+msgstr "Não é possível guardar o estado atual"
+
+#: builtin/stash.c:1333
+#, 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:1423
+msgid "Cannot remove worktree changes"
+msgstr "Não é possível remover as alterações da árvore de trabalho"
+
+#: builtin/stash.c:1462 builtin/stash.c:1527
+msgid "keep index"
+msgstr ""
+
+#: builtin/stash.c:1464 builtin/stash.c:1529
+msgid "stash in patch mode"
+msgstr ""
+
+#: builtin/stash.c:1465 builtin/stash.c:1530
+#, fuzzy
+msgid "quiet mode"
+msgstr "silencioso"
+
+#: builtin/stash.c:1467 builtin/stash.c:1532
+#, fuzzy
+msgid "include untracked files in stash"
+msgstr "listar ficheiros não controlados em colunas"
+
+#: builtin/stash.c:1469 builtin/stash.c:1534
+#, fuzzy
+msgid "include ignore files"
+msgstr "mostrar ficheiros ignorados"
+
+#: builtin/stash.c:1569
+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 "Entrando em '%s'\n"
+
+#: 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"
+msgstr "Submódulo '%s' (%s) registado para path '%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"
+msgstr "aviso: modo command update sugerido para 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
-msgid "git submodule--helper name <path>"
-msgstr "git submodule--helper name <caminho>"
-
-#: builtin/submodule--helper.c:482
+#: 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:565 builtin/submodule--helper.c:568
+#: 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: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
+#, 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 "estou à espera de um modo diferente de %o\n"
+
+#: 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 "Sincronizando URL do submódule '%s'\n"
+
+#: 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 ""
+"Submodule work tree '%s' tem uma pasta .git (usa 'rm -rf' se queres mesmo "
+"removê-la e remover toda a história)"
+
+#: 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 "Pasta '%s' limpa\n"
+
+#: builtin/submodule--helper.c:1568
+#, fuzzy, c-format
+msgid "Could not remove submodule work tree '%s'\n"
+msgstr "Impossível remover submodule work tree '%s'\n"
+
+#: 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) unregistred para 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 +22345,106 @@
"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:1233
+#: 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:150
+#, 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: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:711
#, 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 +22461,55 @@
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:499
msgid "reason"
msgstr "razão"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
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>]"
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <ficheiro>]\n"
+"\t\t<tagname> [<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"
-"\t\t[--format=<formato>] [--[no-]merged [<commit>]] [<padrão>...]"
+"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
+"points-at <objeto>]\n"
+"\t\t[--format=<formato>] [--merged [<commit>] [--no-merged <commit>] "
+"[<pattern>...]"
-#: 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"
+msgstr "Apaguei tag '%s' (era %s)\n"
-#: builtin/tag.c:128
+#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
@@ -13329,11 +22518,11 @@
"Lines starting with '%c' will be ignored.\n"
msgstr ""
"\n"
-"Escreva a mensagem da tag:\n"
+"Escreve mensagem para tag:\n"
" %s\n"
"Linha começadas com '%c' serão ignoradas.\n"
-#: builtin/tag.c:132
+#: builtin/tag.c:139
#, c-format
msgid ""
"\n"
@@ -13343,369 +22532,376 @@
"want to.\n"
msgstr ""
"\n"
-"Escreva a mensagem da tag:\n"
+"Escreve mensagem para tag:\n"
" %s\n"
-"Linhas começadas com '%c' serão mantidas; pode removê-las se o desejar.\n"
+"Linhas começadas com '%c' serão mantidas; se queres, podes apagá-las.\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"
+msgstr "Deixei a mensagem da tag 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:505
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"
+msgstr "Atualizei tag '%s' (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 +22909,7 @@
"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 +22917,7 @@
"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 +22925,11 @@
"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 +22937,114 @@
"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:500
msgid "delete the reference"
msgstr "eliminar a referência"
-#: builtin/update-ref.c:365
+#: builtin/update-ref.c:502
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:503
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:504
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,539 +23056,1522 @@
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:973
+#, 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:758
msgid "reason for locking"
msgstr "razão de trancar"
-#: builtin/worktree.c:485 builtin/worktree.c:518
+#: builtin/worktree.c:770 builtin/worktree.c:803 builtin/worktree.c:877
+#: builtin/worktree.c:1001
#, 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:772 builtin/worktree.c:805
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:777
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' já está trancada, razão: %s"
-#: builtin/worktree.c:494
+#: builtin/worktree.c:779
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' já está trancada"
-#: builtin/worktree.c:522
+#: builtin/worktree.c:807
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' não está trancada"
-#: builtin/write-tree.c:13
+#: builtin/worktree.c:848
+msgid "working trees containing submodules cannot be moved or removed"
+msgstr ""
+
+#: builtin/worktree.c:856
+#, 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:879 builtin/worktree.c:1003
+#, fuzzy, c-format
+msgid "'%s' is a main working tree"
+msgstr "'%s' não é uma árvore de trabalho"
+
+#: builtin/worktree.c:884
+#, 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:897
+#, 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:899
+msgid ""
+"cannot move a locked working tree;\n"
+"use 'move -f -f' to override or unlock first"
+msgstr ""
+
+#: builtin/worktree.c:902
+#, c-format
+msgid "validation failed, cannot move working tree: %s"
+msgstr ""
+
+#: builtin/worktree.c:907
+#, fuzzy, c-format
+msgid "failed to move '%s' to '%s'"
+msgstr "falha ao abrir '%s': %s"
+
+#: builtin/worktree.c:953
+#, fuzzy, c-format
+msgid "failed to run 'git status' on '%s'"
+msgstr "falha ao escrever para '%s'"
+
+#: builtin/worktree.c:957
+#, c-format
+msgid "'%s' contains modified or untracked files, use --force to delete it"
+msgstr ""
+
+#: builtin/worktree.c:962
+#, 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:985
+msgid "force removal even if worktree is dirty or locked"
+msgstr ""
+
+#: builtin/worktree.c:1008
+#, 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:1010
+msgid ""
+"cannot remove a locked working tree;\n"
+"use 'remove -f -f' to override or unlock first"
+msgstr ""
+
+#: builtin/worktree.c:1013
+#, c-format
+msgid "validation failed, cannot remove working tree: %s"
+msgstr ""
+
+#: builtin/worktree.c:1037
+#, fuzzy, c-format
+msgid "repair: %s: %s"
+msgstr "%s: %s"
+
+#: builtin/worktree.c:1040
+#, 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"
+#: t/helper/test-fast-rebase.c:141
+#, fuzzy
+msgid "unhandled options"
+msgstr "Opções gerais"
+
+#: t/helper/test-fast-rebase.c:146
+#, fuzzy
+msgid "error preparing revisions"
+msgstr "Erro ao rematar %s."
+
+#: 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"
+
+#: t/helper/test-reach.c:164
+msgid "too many commits marked reachable"
+msgstr ""
+
+#: t/helper/test-serve-v2.c:7
+#, fuzzy
+msgid "test-tool serve-v2 [<options>]"
+msgstr "git rebase--helper [<opções>]"
+
+#: 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"
-#: 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"
-
-#: upload-pack.c:1046
-msgid "interrupt transfer after <n> seconds of inactivity"
-msgstr "interromper transferência depois de <n> segundos de inatividade"
-
-#: credential-cache--daemon.c:223
-#, c-format
+#: 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."
+"'git help -a' e 'git help -g' listam subcomandos disponíveis e alguns\n"
+"guias de conceitos. Consulta 'git help <comando>' ou 'git help <conceito>'\n"
+"para ler sobre um subcomando específico ou conceito específico.\n"
+"Vê 'git help git' para visão geral do sistema."
-#: 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 "--super-prefix recebeu prefixo nenhum\n"
+
+#: 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 "desconheço opção: %s\n"
+
+#: 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:820
+#, c-format
+msgid "alias loop detected: expansion of '%s' does not terminate:%s"
+msgstr ""
+
+#: git.c:870
+#, fuzzy, c-format
+msgid "cannot handle %s as a builtin"
+msgstr "não é possível enviar mensagem como 7bit"
+
+#: git.c:883
+#, fuzzy, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+"utilização: %s\n"
+"\n"
+
+#: git.c:903
+#, c-format
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
+msgstr ""
+
+#: git.c:915
+#, fuzzy, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr "incapaz de executar comando '%s': %s\n"
+
+#: 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"
" asked for: %s\n"
" redirect: %s"
msgstr ""
-"não é possível atualizar base de url de redireção:\n"
-" pedido para: %s\n"
-" redireção: %s"
+"incapaz de atualizar base url da redireção:\n"
+" pedi: %s\n"
+" redireção: %s"
-#: remote-curl.c:323
+#: remote-curl.c:183
+#, fuzzy, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr "opção inválida: %s"
+
+#: remote-curl.c:307
+#, 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:408
+msgid "invalid server response; expected service, got flush packet"
+msgstr ""
+
+#: remote-curl.c:439
+#, fuzzy, c-format
+msgid "invalid server response; got '%s'"
+msgstr "referência inválida: %s"
+
+#: remote-curl.c:499
+#, fuzzy, c-format
+msgid "repository '%s' not found"
+msgstr "o repositório '%s' não existe"
+
+#: remote-curl.c:503
+#, fuzzy, c-format
+msgid "Authentication failed for '%s'"
+msgstr "Falha ao executar: $rest"
+
+#: remote-curl.c:507
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr "não é possível aceder a '%s': %s"
+
+#: remote-curl.c:513
#, 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)"
-
-#: 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)"
-
-#: 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)"
-
-#: common-cmds.h:12
-msgid "grow, mark and tweak your common history"
-msgstr "aumentar, marcar e ajustar o seu histórico comum"
-
-#: common-cmds.h:13
-msgid "collaborate (see also: git help workflows)"
-msgstr "colaborar (consulte também: git help workflows)"
-
-#: common-cmds.h:17
-msgid "Add file contents to the index"
-msgstr "Adicionar conteúdos de ficheiros ao índice"
-
-#: common-cmds.h:18
-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
-msgid "List, create, or delete branches"
-msgstr "Listar, criar ou eliminar ramos"
-
-#: common-cmds.h:20
-msgid "Switch branches or restore working tree files"
-msgstr "Mudar de ramos ou restaurar os ficheiros da árvore de trabalho"
-
-#: common-cmds.h:21
-msgid "Clone a repository into a new directory"
-msgstr "Clonar um repositório num novo diretório"
-
-#: common-cmds.h:22
-msgid "Record changes to the repository"
-msgstr "Gravar alterações no repositório"
-
-#: common-cmds.h:23
-msgid "Show changes between commits, commit and working tree, etc"
+#: remote-curl.c:642
+msgid "shouldn't have EOF when not gentle on EOF"
msgstr ""
-"Mostrar alterações entre commits, entre commit e árvore de trabalho, etc"
-#: common-cmds.h:24
-msgid "Download objects and refs from another repository"
-msgstr "Transferir objetos e referências doutro repositório"
+#: remote-curl.c:654
+msgid "remote server sent stateless separator"
+msgstr ""
-#: common-cmds.h:25
-msgid "Print lines matching a pattern"
-msgstr "Imprimir linhas que correspondam a um padrão"
+#: remote-curl.c:724
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr ""
-#: common-cmds.h:26
-msgid "Create an empty Git repository or reinitialize an existing one"
-msgstr "Criar um repositório Git vazio ou reinicializar um já existente"
+#: remote-curl.c:754
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr ""
-#: common-cmds.h:27
-msgid "Show commit logs"
-msgstr "Mostrar histórico de commits"
+#: remote-curl.c:756
+msgid "remote-curl: unexpected response end packet"
+msgstr ""
-#: common-cmds.h:28
-msgid "Join two or more development histories together"
-msgstr "Juntar duas ou mais histórias de desenvolvimento numa só"
+#: remote-curl.c:832
+#, fuzzy, c-format
+msgid "RPC failed; %s"
+msgstr "falha: %d"
-#: common-cmds.h:29
-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"
+#: remote-curl.c:872
+#, fuzzy
+msgid "cannot handle pushes this big"
+msgstr "não é possível processar mais do que %d revisão."
-#: common-cmds.h:30
-msgid "Fetch from and integrate with another repository or a local branch"
-msgstr "Obter e integrar com outro repositório ou outro ramo local"
+#: remote-curl.c:987
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr ""
-#: common-cmds.h:31
-msgid "Update remote refs along with associated objects"
-msgstr "Atualizar referências remotas juntamente com objetos associados"
+#: remote-curl.c:991
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr ""
-#: common-cmds.h:32
-msgid "Reapply commits on top of another base tip"
-msgstr "Reaplicar commits no topo de outra base"
+#: remote-curl.c:1041
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr ""
-#: common-cmds.h:33
-msgid "Reset current HEAD to the specified state"
-msgstr "Repor a HEAD atual no estado especificado"
+#: remote-curl.c:1043
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr ""
-#: common-cmds.h:34
-msgid "Remove files from the working tree and from the index"
-msgstr "Remover ficheiros da árvore de trabalho e do índice"
+#: remote-curl.c:1132
+#, fuzzy
+msgid "dumb http transport does not support shallow capabilities"
+msgstr "O servidor não suporta clientes rasos"
-#: common-cmds.h:35
-msgid "Show various types of objects"
-msgstr "Mostrar vários tipos objetos"
+#: remote-curl.c:1147
+#, fuzzy
+msgid "fetch failed."
+msgstr "falha ao executar o comando stash"
-#: common-cmds.h:36
-msgid "Show the working tree status"
-msgstr "Mostrar o estado da árvores de trabalho"
+#: remote-curl.c:1193
+msgid "cannot fetch by sha1 over smart http"
+msgstr ""
-#: common-cmds.h:37
-msgid "Create, list, delete or verify a tag object signed with GPG"
-msgstr "Criar, listar, eliminar ou verificar um objeto tag assinado com GPG"
+#: remote-curl.c:1237 remote-curl.c:1243
+#, fuzzy, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr "erro de protocolo: cabeçalho de pacote incorreto"
-#: parse-options.h:145
+#: remote-curl.c:1255 remote-curl.c:1373
+#, fuzzy, c-format
+msgid "http transport does not support %s"
+msgstr "O servidor não suporta STARTTLS! %s"
+
+#: remote-curl.c:1291
+#, fuzzy
+msgid "git-http-push failed"
+msgstr "falha ao executar o comando stash"
+
+#: remote-curl.c:1479
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr ""
+
+#: remote-curl.c:1511
+msgid "remote-curl: error reading command stream from git"
+msgstr ""
+
+#: remote-curl.c:1518
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr ""
+
+#: remote-curl.c:1559
+#, 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 "informação libc indisponível\n"
+
+#: 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:160
+#: parse-options.h:197
msgid "no-op (backward compatibility)"
msgstr "sem-ação (retrocompatibilidade)"
-#: parse-options.h:238
+#: parse-options.h:309
msgid "be more verbose"
msgstr "ser mais verboso"
-#: parse-options.h:240
+#: parse-options.h:311
msgid "be more quiet"
msgstr "ser mais silencioso"
-#: parse-options.h:246
-msgid "use <n> digits to display SHA-1s"
+#: parse-options.h:317
+#, fuzzy
+msgid "use <n> digits to display object names"
msgstr "usar <n> dígitos para mostrar SHA-1s"
-#: rerere.h:40
+#: 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"
-#: git-bisect.sh:54
-msgid "You need to start by \"git bisect start\""
-msgstr "Deve começar por executar \"git bisect start\""
+#: wt-status.h:80
+msgid "HEAD detached at "
+msgstr "HEAD destacada em "
-#. 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]? "
+#: wt-status.h:81
+msgid "HEAD detached from "
+msgstr "HEAD destacada de "
-#: git-bisect.sh:121
-#, sh-format
-msgid "unrecognised option: '$arg'"
-msgstr "opção não reconhecida: '$arg'"
+#: command-list.h:50
+msgid "Add file contents to the index"
+msgstr "Adicionar conteúdos de ficheiros ao índice"
-#: 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"
-
-#: git-bisect.sh:154
-msgid "Bad HEAD - I need a HEAD"
-msgstr "HEAD incorreta - é necessário uma HEAD"
-
-#: git-bisect.sh:167
-#, sh-format
-msgid ""
-"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
+#: command-list.h:51
+msgid "Apply a series of patches from a mailbox"
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:52
+#, fuzzy
+msgid "Annotate file lines with commit information"
+msgstr "Mostrar em formato de porcelana com informações de commit por linha"
-#: git-bisect.sh:181
-msgid "Bad HEAD - strange symbolic ref"
-msgstr "HEAD incorreta - referência simbólica desconhecida"
+#: command-list.h:53
+#, fuzzy
+msgid "Apply a patch to files and/or to the index"
+msgstr "adicionar o elemento especificado ao índice"
-#: git-bisect.sh:233
-#, sh-format
-msgid "Bad bisect_write argument: $state"
-msgstr "Argumento de bisect_write incorreto: $state"
+#: command-list.h:54
+msgid "Import a GNU Arch repository into Git"
+msgstr ""
-#: git-bisect.sh:262
+#: 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"
+
+#: 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"
+
+#: 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"
+
+#: 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"
+
+#: 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"
+
+#: 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"
+
+#: 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"
+
+#: 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 "Run a Git command on a list of repositories"
+msgstr ""
+
+#: command-list.h:100
+msgid "Prepare patches for e-mail submission"
+msgstr ""
+
+#: command-list.h:101
+#, 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:102
+msgid "Cleanup unnecessary files and optimize the local repository"
+msgstr ""
+
+#: command-list.h:103
+msgid "Extract commit ID from an archive created using git-archive"
+msgstr ""
+
+#: command-list.h:104
+msgid "Print lines matching a pattern"
+msgstr "Imprimir linhas que correspondam a um padrão"
+
+#: command-list.h:105
+msgid "A portable graphical interface to Git"
+msgstr ""
+
+#: command-list.h:106
+msgid "Compute object ID and optionally creates a blob from a file"
+msgstr ""
+
+#: command-list.h:107
+msgid "Display help information about Git"
+msgstr ""
+
+#: command-list.h:108
+msgid "Server side implementation of Git over HTTP"
+msgstr ""
+
+#: command-list.h:109
+#, fuzzy
+msgid "Download from a remote Git repository via HTTP"
+msgstr "Transferir objetos e referências doutro repositório"
+
+#: command-list.h:110
+#, fuzzy
+msgid "Push objects over HTTP/DAV to another repository"
+msgstr "Transferir objetos e referências doutro repositório"
+
+#: command-list.h:111
+msgid "Send a collection of patches from stdin to an IMAP folder"
+msgstr ""
+
+#: command-list.h:112
+msgid "Build pack index file for an existing packed archive"
+msgstr ""
+
+#: command-list.h:113
+msgid "Create an empty Git repository or reinitialize an existing one"
+msgstr "Criar um repositório Git vazio ou reinicializar um já existente"
+
+#: command-list.h:114
+msgid "Instantly browse your working repository in gitweb"
+msgstr ""
+
+#: command-list.h:115
+msgid "Add or parse structured information in commit messages"
+msgstr ""
+
+#: command-list.h:116
+#, fuzzy
+msgid "The Git repository browser"
+msgstr "Não é um repositório git"
+
+#: command-list.h:117
+msgid "Show commit logs"
+msgstr "Mostrar histórico de commits"
+
+#: command-list.h:118
+#, 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:119
+#, fuzzy
+msgid "List references in a remote repository"
+msgstr "repositório de referência"
+
+#: command-list.h:120
+#, fuzzy
+msgid "List the contents of a tree object"
+msgstr "imprimir apenas as tags do objeto"
+
+#: command-list.h:121
+msgid "Extracts patch and authorship from a single e-mail message"
+msgstr ""
+
+#: command-list.h:122
+msgid "Simple UNIX mbox splitter program"
+msgstr ""
+
+#: command-list.h:123
+msgid "Run tasks to optimize Git repository data"
+msgstr ""
+
+#: command-list.h:124
+msgid "Join two or more development histories together"
+msgstr "Juntar duas ou mais histórias de desenvolvimento numa só"
+
+#: command-list.h:125
+#, 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:126
+#, fuzzy
+msgid "Run a three-way file merge"
+msgstr "Faz uma junção por três de ficheiro"
+
+#: command-list.h:127
+#, fuzzy
+msgid "Run a merge for files needing merging"
+msgstr "Faz um merge de ficheiros precisando de merge"
+
+#: command-list.h:128
+msgid "The standard helper program to use with git-merge-index"
+msgstr ""
+
+#: command-list.h:129
+msgid "Run merge conflict resolution tools to resolve merge conflicts"
+msgstr ""
+
+#: command-list.h:130
+msgid "Show three-way merge without touching index"
+msgstr ""
+
+#: command-list.h:131
+msgid "Write and verify multi-pack-indexes"
+msgstr ""
+
+#: command-list.h:132
+#, fuzzy
+msgid "Creates a tag object"
+msgstr "outro objeto tag"
+
+#: command-list.h:133
+msgid "Build a tree-object from ls-tree formatted text"
+msgstr ""
+
+#: command-list.h:134
+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"
+
+#: command-list.h:135
+msgid "Find symbolic names for given revs"
+msgstr ""
+
+#: command-list.h:136
+#, fuzzy
+msgid "Add or inspect object notes"
+msgstr "o objeto esperado %s não foi recebido"
+
+#: command-list.h:137
+msgid "Import from and submit to Perforce repositories"
+msgstr ""
+
+#: command-list.h:138
+#, fuzzy
+msgid "Create a packed archive of objects"
+msgstr "ignorar objetos compactados"
+
+#: command-list.h:139
+#, fuzzy
+msgid "Find redundant pack files"
+msgstr "não é possível invocar pread sobre o ficheiro de pacote"
+
+#: command-list.h:140
+msgid "Pack heads and tags for efficient repository access"
+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"
+
+#: command-list.h:145
+msgid "Update remote refs along with associated objects"
+msgstr "Atualizar referências remotas juntamente com objetos associados"
+
+#: 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"
+
+#: 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"
+
+#: 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"
+
+#: 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"
+
+#: 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"
+
+#: 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 "Troca branches"
+
+#: 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"
+
+#: command-list.h:183
+msgid "Creates a temporary file with a blob's contents"
+msgstr ""
+
+#: command-list.h:184
+msgid "Unpack objects from a packed archive"
+msgstr ""
+
+#: 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"
+
+#: 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 ""
+
+#: command-list.h:189
+msgid "Send objects packed back to git-fetch-pack"
+msgstr ""
+
+#: command-list.h:190
+msgid "Show a Git logical variable"
+msgstr ""
+
+#: command-list.h:191
+#, fuzzy
+msgid "Check the GPG signature of commits"
+msgstr "assinar o commit com GPG"
+
+#: command-list.h:192
+#, fuzzy
+msgid "Validate packed Git archive files"
+msgstr "não foi possível criar o ficheiro de arquivo '%s'"
+
+#: command-list.h:193
+msgid "Check the GPG signature of tags"
+msgstr ""
+
+#: command-list.h:194
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr ""
+
+#: command-list.h:195
+msgid "Show logs with difference each commit introduces"
+msgstr ""
+
+#: command-list.h:196
+#, fuzzy
+msgid "Manage multiple working trees"
+msgstr "caminho para a árvore de trabalho"
+
+#: 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 ""
+
+#: 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:48
#, sh-format
msgid "Bad rev input: $arg"
msgstr "Revisão incorreta na entrada: $arg"
-#: git-bisect.sh:281
-#, sh-format
-msgid "Bad rev input: $bisected_head"
-msgstr "Revisão incorreta na entrada: $bisected_head"
-
-#: git-bisect.sh:290
-#, sh-format
-msgid "Bad rev input: $rev"
-msgstr "Revisão incorreta na entrada: $rev"
-
-#: git-bisect.sh:299
-#, 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:82
msgid "No logfile given"
msgstr "Nenhum ficheiro de log fornecido"
-#: git-bisect.sh:459
+#: git-bisect.sh:83
#, sh-format
msgid "cannot read $file for replaying"
msgstr "não é possível ler $file para reproduzir"
-#: git-bisect.sh:480
+#: git-bisect.sh:105
msgid "?? what are you talking about?"
msgstr "?? do que é que está a falar?"
-#: git-bisect.sh:492
+#: git-bisect.sh:115
+msgid "bisect run failed: no command provided."
+msgstr ""
+
+#: git-bisect.sh:120
#, sh-format
msgid "running $command"
msgstr "a executar $command"
-#: git-bisect.sh:499
+#: git-bisect.sh:127
#, sh-format
msgid ""
"bisect run failed:\n"
"exit code $res from '$command' is < 0 or >= 128"
msgstr ""
-"falha ao bissetar:\n"
-"código de saída $res de '$command' é < 0 ou >= 128"
+"bissetar impossível:\n"
+"exit code $res de '$command' é < 0 ou >= 128"
-#: git-bisect.sh:525
+#: git-bisect.sh:152
msgid "bisect run cannot continue any more"
msgstr "não é possível continuar a bissetar"
-#: git-bisect.sh:531
-#, sh-format
+#: git-bisect.sh:158
+#, fuzzy, sh-format
msgid ""
"bisect run failed:\n"
-"'bisect_state $state' exited with error code $res"
+"'bisect-state $state' exited with error code $res"
msgstr ""
-"falha ao bissetar:\n"
-"'bisect_state $state' retornou com o código de erro $res"
+"bisseção impossível:\n"
+"'bisect_state $state' retornou código $res de erro"
-#: git-bisect.sh:538
+#: git-bisect.sh:165
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:173
+msgid "We are not bisecting."
+msgstr "Não se está a bissetar."
#: git-merge-octopus.sh:46
msgid ""
@@ -14373,8 +24595,8 @@
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 +24613,49 @@
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:179
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:189
#, 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:208
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' já existe no índice"
-#: git-submodule.sh:213
+#: git-submodule.sh:211
#, 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."
+#, 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:249
#, 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:251
#, 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:259
#, 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:261
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -14744,107 +24665,45 @@
"or you are unsure what this means choose another name with the '--name' "
"option."
msgstr ""
-"Se quer reutilizar este diretório git local em vez de clonar de novo de\n"
+"Se queres reutilizar esta past git local, em vez de voltares a clonar\n"
" $realrepo\n"
-"use a opção '--force'. Se o diretório git local não é o repo correto\n"
-"ou não tem a certeza o que isto significa escolha outro nome com a opção '--"
-"name'."
+"usa a opção --force. Se a pasta git local é o repo incorreto ou\n"
+"se tens pouca certeza sobre o que isto significa, podes mudar o nome com a "
+"opção '--name'."
-#: git-submodule.sh:254
+#: git-submodule.sh:267
#, 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:279
#, 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:284
#, 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:293
#, 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:568
#, 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:578
#, 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:583
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -14853,12 +24712,14 @@
"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:601
+#, 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:607
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -14867,141 +24728,118 @@
"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:614
#, 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:615
#, 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:619
#, 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:620
#, 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:625
#, 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:626
#, 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:631
#, 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:632
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Caminho de submódulo '$displaypath': '$command $sha1'"
-#: git-submodule.sh:732
+#: git-submodule.sh:663
#, 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-rebase--preserve-merges.sh:109
+msgid "Applied autostash."
+msgstr "Pilha automática (autostash) aplicada."
-#: git-submodule.sh:892
+#: git-rebase--preserve-merges.sh:112
#, sh-format
-msgid "unexpected mode $mod_dst"
-msgstr "modo inesperado $mod_dst"
+msgid "Cannot store $stash_sha1"
+msgstr "Não é possível guardar $stash_sha1"
-#: 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-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 ""
+"Realizando autostash existem sobreposições.\n"
+"As tuas mudanças estão salvas na stash.\n"
+"Podes executar \"git stash pop\" ou \"git stash drop\" oportunamente.\n"
-#: 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
-#, 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"
-
-#: 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-submodule.sh:1136
-#, sh-format
-msgid "Synchronizing submodule url for '$displaypath'"
-msgstr "A sincronizar o URL do submódulo '$displaypath'"
-
-#: 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--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 ""
"\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"
+"p, pick <commit> = usa commit\n"
+"r, reword <commit> = usa commit, editando a mensagem commit\n"
+"e, edit <commit> = usa commit, mas pára para emendar\n"
+"s, squash <commit> = usa commit, fundindo no commit anterior\n"
+"f, fixup <commit> = como \"squash\", mas descarta mensagem deste commit\n"
+"x, exec <commit> = executa comando (do resto da linha) usando a shell\n"
+"d, drop <commit> = larga commit\n"
+"l, label <label> = dá um label a HEAD atual\n"
+"t, reset <label> = reinicia a HEAD em label\n"
+"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+". cria merge commit usando a commit message original (a única\n"
+". linha também poderá ser utlilizada). Usa -c <commit> para \n"
+". modificar a commit message.\n"
"\n"
-"Estas linhas pode ser reordenadas; são executadas de cima para baixo.\n"
+"Estas linhas podem 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"
@@ -15012,91 +24850,91 @@
"\n"
"\tgit rebase --continue"
msgstr ""
-"Pode emendar o commit agora, com\n"
+"Podes 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"
+"Quando modificações estão correctas, executa\n"
"\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"
@@ -15105,50 +24943,47 @@
"before\n"
"you are able to reword the commit."
msgstr ""
-"Não foi possível emendar o commit depois de apanhar com sucesso $sha1... "
-"$rest\n"
-"Deve-se provavelmente a uma mensagem de commit vazia ou o pre-commit hook "
-"falhou.\n"
-"Se o pre-commit hook falhou, pode precisar de resolver o problema ante de "
-"poder\n"
-"reformular a mensagem do commit."
+"Impossível emendar commit pós um sucesso do picking $sha1... $rest\n"
+" devido a um commit message vazio, ou o pre-commit hook falhou. Se o \n"
+"pre-commit hook falhou, pode ser preciso resolver o issue antes de \n"
+"tentares modificar a mensagem 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"
"\tgit rebase --continue"
msgstr ""
-"Pode corrigir o problema e executar\n"
+"Podes resolver o problema, e executar\n"
"\n"
"\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"
@@ -15158,99 +24993,30 @@
"\tgit rebase --continue"
msgstr ""
"Executado com sucesso: $rest\n"
-"mas deixou alterações no índice e/ou na árvore de trabalho\n"
-"Submeta ou esconda as alterações e execute\n"
+"e tens alterações em índice e/ou em working tree\n"
+"Põe no commit ou stash, e corre\n"
"\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"
@@ -15267,25 +25033,25 @@
"\n"
" git rebase --continue\n"
msgstr ""
-"Tem alterações preparadas na árvore de trabalho.\n"
-"Se tenciona esmagar estas alterações\n"
-"no commit anterior, execute:\n"
+"Tens modificações staged na working tree.\n"
+"Se tenciona squash as modificações no último\n"
+"commit, execute:\n"
"\n"
" git commit --amend $gpg_sign_opt_quoted\n"
"\n"
-"Se tenciona pô-las num novo commit, execute:\n"
+"Se tenciona pô-las em novo commit, execute:\n"
"\n"
" git commit $gpg_sign_opt_quoted\n"
"\n"
-"Em ambos os casos, quando estiver pronto, continue com:\n"
+"Em ambos os casos, quando feito, continue com:\n"
"\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,258 +25059,170 @@
"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:632
#, 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:1056
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
msgstr ""
-"Se o patch se aplicar corretamente, o excerto editado será marcado\n"
-"como preparado imediatamente."
+"Se patch aplica-se correctamente, a edição do hunk será marcada\n"
+"imediatamente como preparado."
-#: git-add--interactive.perl:1033
+#: git-add--interactive.perl:1059
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
msgstr ""
-"Se o patch se aplicar corretamente, o excerto editado será marcado\n"
-"como escondido imediatamente."
+"Se patch aplica-se corretamente, a edição do hunk será marcada\n"
+"imediatamente como stashed."
-#: git-add--interactive.perl:1036
+#: git-add--interactive.perl:1062
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
msgstr ""
-"Se o patch se aplicar corretamente, o excerto editado será marcado\n"
-"como não preparado imediatamente."
+"Se patch aplica-se corretamente, a edição do hunk será marcada\n"
+"imediatamente como despreparada."
-#: git-add--interactive.perl:1039 git-add--interactive.perl:1048
+#: git-add--interactive.perl:1065 git-add--interactive.perl:1074
+#: git-add--interactive.perl:1080
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
msgstr ""
-"Se o patch se aplicar corretamente, o excerto editado será marcado\n"
-"para ser aplicado imediatamente."
+"Se patch aplica-se corretamente, a edição do hunk será marcada\n"
+"imediatamente como aplicada."
-#: git-add--interactive.perl:1042 git-add--interactive.perl:1045
+#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
+#: git-add--interactive.perl:1077
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
msgstr ""
-"Se o patch se aplicar corretamente, o excerto editado será marcado\n"
-"para ser descartado imediatamente."
+"Se patch aplica-se corretamente, a edição do hunk será marcada\n"
+"imediatamente como descartada."
-#: git-add--interactive.perl:1058
+#: git-add--interactive.perl:1114
#, 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:1121
#, perl-format
msgid ""
"---\n"
@@ -15553,41 +25231,17 @@
"Lines starting with %s will be removed.\n"
msgstr ""
"---\n"
-"Para remover linhas '%s', torne-as linhas ' ' (contexto).\n"
-"Para remover linhas '%s', elimine-as.\n"
+"Removendo linhas '%s', torna-as linhas ' ' (contexto).\n"
+"Removendo linhas '%s', elimina-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:1143
#, 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:1251
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -15601,7 +25255,7 @@
"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:1257
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -15615,7 +25269,7 @@
"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:1263
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -15629,7 +25283,7 @@
"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:1269
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -15643,7 +25297,7 @@
"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:1275 git-add--interactive.perl:1293
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -15657,7 +25311,7 @@
"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:1281
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -15671,7 +25325,7 @@
"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:1287
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -15685,7 +25339,22 @@
"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:1299
+#, 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:1314
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -15707,203 +25376,95 @@
"e - editar manualmente o excerto atual\n"
"? - imprimir ajuda\n"
-#: git-add--interactive.perl:1263
+#: git-add--interactive.perl:1345
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:1360
#, 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:1479
+#, 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:1480
+#, 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:1481
+#, fuzzy, perl-format
+msgid "Apply addition 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:1482
+#, 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:1484
-msgid "go to which hunk (<ret> to see more)? "
-msgstr "ir para que excerto (<ret> para ver mais)? "
+#: git-add--interactive.perl:1599
+msgid "No other hunks to goto\n"
+msgstr ""
-#: git-add--interactive.perl:1486
-msgid "go to which hunk? "
-msgstr "ir para que excerto? "
-
-#: git-add--interactive.perl:1495
+#: git-add--interactive.perl:1617
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Número inválido: '%s'\n"
-#: git-add--interactive.perl:1500
+#: git-add--interactive.perl:1622
#, 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:1657
+msgid "No other hunks to search\n"
+msgstr ""
-#: git-add--interactive.perl:1539
+#: git-add--interactive.perl:1674
#, 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:1684
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:1696 git-add--interactive.perl:1718
msgid "No previous hunk\n"
msgstr "Nenhum excerto anterior\n"
-#: git-add--interactive.perl:1570 git-add--interactive.perl:1589
+#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
msgid "No next hunk\n"
msgstr "Nenhum excerto seguinte\n"
-#: git-add--interactive.perl:1597
+#: git-add--interactive.perl:1730
+msgid "Sorry, cannot split this hunk\n"
+msgstr ""
+
+#: git-add--interactive.perl:1736
#, 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:1746
+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:1811
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
@@ -15923,84 +25484,98 @@
"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:1828 git-add--interactive.perl:1840
+#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
+#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
+#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
msgid "missing --"
msgstr "falta --"
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1866
#, 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:1872 git-add--interactive.perl:1878
#, 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 +25590,12 @@
" * 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 +25604,7 @@
"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 +25614,17 @@
"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 +25638,27 @@
"\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 +25666,11 @@
"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 +25683,22 @@
"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 +25706,16 @@
#. 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 +25739,617 @@
" 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]: "
+#~ msgid "store only"
+#~ msgstr "armazenar apenas"
+
+#~ msgid "compress faster"
+#~ msgstr "compressão rápida"
+
+#~ msgid "compress better"
+#~ msgstr "compressão ótima"
+
+#, fuzzy, c-format
+#~ msgid "unexpected duplicate commit id %s"
+#~ msgstr "não foi possível analisar o commit %s"
+
+#, fuzzy, c-format
+#~ msgid "%s: not a valid OID"
+#~ msgstr "'%s' não é uma referência válida."
+
+#, fuzzy, c-format
+#~ msgid "invalid committer '%s'"
+#~ msgstr "commit inválido %s"
+
+#, fuzzy, c-format
+#~ msgid "invalid committer: %s"
+#~ msgstr "commit inválido %s"
+
+#, fuzzy
+#~ msgid "git bisect--helper --next-all"
+#~ msgstr "git bisect--helper --next-all [--no-checkout]"
+
+#, fuzzy
+#~ msgid "git bisect--helper --bisect-clean-state"
+#~ msgstr "git bisect--helper --next-all [--no-checkout]"
+
+#, fuzzy
+#~ msgid "git bisect--helper --bisect-autostart"
+#~ msgstr "git bisect--helper --next-all [--no-checkout]"
+
+#~ msgid "perform 'git bisect next'"
+#~ msgstr "executar 'git bisect next'"
+
+#, fuzzy
+#~ msgid "--write-terms requires two arguments"
+#~ msgstr "--abort não leva argumentos"
+
+#, fuzzy
+#~ msgid "--bisect-clean-state requires no arguments"
+#~ msgstr "--continue não leva argumentos"
+
+#, fuzzy
+#~ msgid "--bisect-autostart does not accept arguments"
+#~ msgstr "%%(subject) não leva argumentos"
+
+#~ msgid "n,m"
+#~ msgstr "n,m"
+
+#~ msgid "Process line range n,m in file, counting from 1"
+#~ msgstr "processar intervalo de linhas n,m, a contar a partir de 1"
+
+#~ msgid "name of output directory is too long"
+#~ msgstr "o nome do diretório de saída é demasiado longo"
+
+#~ msgid "standard output, or directory, which one?"
+#~ msgstr "saída padrão, ou diretório, qual deles?"
+
+#, c-format
+#~ msgid "failed to remove '%s'"
+#~ msgstr "falha ao remover '%s'"
+
+#, sh-format
+#~ msgid "Bad rev input: $bisected_head"
+#~ msgstr "Revisão incorreta na entrada: $bisected_head"
+
+#, sh-format
+#~ msgid "Bad rev input: $rev"
+#~ msgstr "Revisão incorreta na entrada: $rev"
+
+#, sh-format
+#~ msgid "See git-${cmd}(1) for details."
+#~ msgstr "Consulte git-${cmd}(1) para obter mais detalhes."
+
+#, 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 ""
+#~ "Impossível actualizar sparse checkout: estas entradas estão "
+#~ "desactualizadas:\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 ""
+#~ " 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: desconheço opção de 'stash save': $option\n"
+#~ " Fornecendo mensagem, usa 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 +26360,12 @@
#~ 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 +26384,6 @@
#~ 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 +26443,12 @@
#~ "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 +26584,12 @@
#~ 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,12 +26629,6 @@
#~ 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."
-
#~ msgid ""
#~ "If you want to reuse this local git directory instead of cloning again "
#~ "from"
@@ -16648,9 +26662,6 @@
#~ 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 +26676,6 @@
#~ "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 +26689,9 @@
#~ "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 +26743,6 @@
#~ 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/po/ru.po b/po/ru.po
index a77b462..d04ebf1 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,16 +3,19 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Dimitriy Ryazantcev <DJm00n@mail.ru>, 2014-2019
-# insolor, 2014
-# insolor, 2014
+# Alexander Golubev <fatzer2@gmail.com>, 2020
+# Dimitriy Ryazantcev <DJm00n@mail.ru>, 2014-2021
+# Mike Manturov, 2014
+# Mike Manturov, 2014
+# Sergey Alyoshin <alyoshin.s@gmail.com>, 2020
+# Sergey Kuznetsov <votkinsk@gmail.com>, 2021
# Чук Таблицоменделеев <aurum444an@gmail.com>, 2019
msgid ""
msgstr ""
"Project-Id-Version: Git Russian Localization Project\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-06-04 08:24+0800\n"
-"PO-Revision-Date: 2019-06-21 17:28+0000\n"
+"POT-Creation-Date: 2020-12-21 07:10+0800\n"
+"PO-Revision-Date: 2021-01-29 19:33+0000\n"
"Last-Translator: Dimitriy Ryazantcev <DJm00n@mail.ru>\n"
"Language-Team: Russian (http://www.transifex.com/djm00n/git-po-ru/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -21,73 +24,736 @@
"Language: ru\n"
"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-#: advice.c:103
+#: add-interactive.c:376
+#, c-format
+msgid "Huh (%s)?"
+msgstr "Хм (%s)?"
+
+#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3284
+#: sequencer.c:3735 sequencer.c:3890 builtin/rebase.c:1532
+#: builtin/rebase.c:1955
+msgid "could not read index"
+msgstr "не удалось прочитать индекс"
+
+#: add-interactive.c:584 git-add--interactive.perl:269
+#: git-add--interactive.perl:294
+msgid "binary"
+msgstr "двоичный"
+
+#: add-interactive.c:642 git-add--interactive.perl:278
+#: git-add--interactive.perl:332
+msgid "nothing"
+msgstr "ничего"
+
+#: add-interactive.c:643 git-add--interactive.perl:314
+#: git-add--interactive.perl:329
+msgid "unchanged"
+msgstr "нет изменений"
+
+#: add-interactive.c:680 git-add--interactive.perl:641
+msgid "Update"
+msgstr "Обновить"
+
+#: add-interactive.c:697 add-interactive.c:885
+#, c-format
+msgid "could not stage '%s'"
+msgstr " не удалось проиндексировать «%s»"
+
+#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3478
+msgid "could not write index"
+msgstr "не удалось записать индекс"
+
+#: add-interactive.c:706 git-add--interactive.perl:626
+#, c-format, perl-format
+msgid "updated %d path\n"
+msgid_plural "updated %d paths\n"
+msgstr[0] "обновлён %d путь\n"
+msgstr[1] "обновлено %d пути\n"
+msgstr[2] "обновлено %d путей\n"
+msgstr[3] "обновлено %d пути\n"
+
+#: add-interactive.c:724 git-add--interactive.perl:676
+#, c-format, perl-format
+msgid "note: %s is untracked now.\n"
+msgstr "примечание: %s теперь неотслеживаемый.\n"
+
+#: add-interactive.c:729 apply.c:4125 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:759 git-add--interactive.perl:653
+msgid "Revert"
+msgstr "Обратить изменения"
+
+#: add-interactive.c:775
+msgid "Could not parse HEAD^{tree}"
+msgstr "Не удалось разобрать HEAD^{tree}"
+
+#: add-interactive.c:813 git-add--interactive.perl:629
+#, c-format, perl-format
+msgid "reverted %d path\n"
+msgid_plural "reverted %d paths\n"
+msgstr[0] "обращены изменения %d пути\n"
+msgstr[1] "обращены изменения %d путей\n"
+msgstr[2] "обращены изменения %d путей\n"
+msgstr[3] "обращены изменения %d путей\n"
+
+#: add-interactive.c:864 git-add--interactive.perl:693
+#, c-format
+msgid "No untracked files.\n"
+msgstr "Нет неотслеживаемых файлов.\n"
+
+#: add-interactive.c:868 git-add--interactive.perl:687
+msgid "Add untracked"
+msgstr "Добавить неотслеживаемый"
+
+#: add-interactive.c:895 git-add--interactive.perl:623
+#, c-format, perl-format
+msgid "added %d path\n"
+msgid_plural "added %d paths\n"
+msgstr[0] "добавлен %d путь\n"
+msgstr[1] "добавлено %d пути\n"
+msgstr[2] "добавлено %d путей\n"
+msgstr[3] "добавлено %d пути\n"
+
+#: add-interactive.c:925
+#, c-format
+msgid "ignoring unmerged: %s"
+msgstr "игнорирую не слитое: %s"
+
+#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369
+#, c-format
+msgid "Only binary files changed.\n"
+msgstr "Только изменения двоичных файлов.\n"
+
+#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371
+#, c-format
+msgid "No changes.\n"
+msgstr "Нет изменений.\n"
+
+#: add-interactive.c:943 git-add--interactive.perl:1379
+msgid "Patch update"
+msgstr "Обновление патча"
+
+#: add-interactive.c:982 git-add--interactive.perl:1792
+msgid "Review diff"
+msgstr "Просмотреть список изменений"
+
+#: add-interactive.c:1010
+msgid "show paths with changes"
+msgstr "показать пути с изменениями"
+
+#: add-interactive.c:1012
+msgid "add working tree state to the staged set of changes"
+msgstr "добавить содержимое рабочего каталога к списку проиндексированных изменений"
+
+#: add-interactive.c:1014
+msgid "revert staged set of changes back to the HEAD version"
+msgstr "вернуть проиндексированные изменения назад к HEAD-версии"
+
+#: add-interactive.c:1016
+msgid "pick hunks and update selectively"
+msgstr "выбрать отдельные блоки изменений и обновить выборочно"
+
+#: add-interactive.c:1018
+msgid "view diff between HEAD and index"
+msgstr "просмотреть список изменений между HEAD и индексом"
+
+#: add-interactive.c:1020
+msgid "add contents of untracked files to the staged set of changes"
+msgstr "добавить содержимое неотслеживаемых файлов к списку проиндексированных изменений"
+
+#: add-interactive.c:1028 add-interactive.c:1077
+msgid "Prompt help:"
+msgstr "Справка:"
+
+#: add-interactive.c:1030
+msgid "select a single item"
+msgstr "выбрать один элемент"
+
+#: add-interactive.c:1032
+msgid "select a range of items"
+msgstr "выбрать диапазон элементов"
+
+#: add-interactive.c:1034
+msgid "select multiple ranges"
+msgstr "выбрать несколько диапазонов"
+
+#: add-interactive.c:1036 add-interactive.c:1081
+msgid "select item based on unique prefix"
+msgstr "выбрать элемент на основе уникального префикса"
+
+#: add-interactive.c:1038
+msgid "unselect specified items"
+msgstr "убрать выбор указанных элементов"
+
+#: add-interactive.c:1040
+msgid "choose all items"
+msgstr "выбрать все элементы"
+
+#: add-interactive.c:1042
+msgid "(empty) finish selecting"
+msgstr "(пусто) закончить выбор"
+
+#: add-interactive.c:1079
+msgid "select a numbered item"
+msgstr "выбрать элемент по номеру"
+
+#: add-interactive.c:1083
+msgid "(empty) select nothing"
+msgstr "(пусто) ничего не выбирать"
+
+#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
+msgid "*** Commands ***"
+msgstr "*** Команды ***"
+
+#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
+msgid "What now"
+msgstr "Что теперь"
+
+#: add-interactive.c:1144 git-add--interactive.perl:213
+msgid "staged"
+msgstr "в индексе"
+
+#: add-interactive.c:1144 git-add--interactive.perl:213
+msgid "unstaged"
+msgstr "не в индексе"
+
+#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257
+#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124
+#: builtin/fetch.c:147 builtin/merge.c:284 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:1151
+msgid "could not refresh index"
+msgstr "не удалось обновить индекс"
+
+#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803
+#, c-format
+msgid "Bye.\n"
+msgstr "До свидания.\n"
+
+#: add-patch.c:34 git-add--interactive.perl:1431
+#, 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:1432
+#, 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:1433
+#, 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:1434
+#, 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 ""
+
+#: add-patch.c:56 git-add--interactive.perl:1437
+#, 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:1438
+#, 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:1439
+#, 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:1440
+#, 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 ""
+
+#: add-patch.c:80 git-add--interactive.perl:1443
+#, 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:1444
+#, 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:1445
+#, 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:1446
+#, 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 ""
+
+#: add-patch.c:103 git-add--interactive.perl:1449
+#, 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:1450
+#, 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:1451
+#, 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:1452
+#, 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 ""
+
+#: add-patch.c:126 git-add--interactive.perl:1455
+#: git-add--interactive.perl:1473
+#, 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:1456
+#: git-add--interactive.perl:1474
+#, 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:1457
+#: git-add--interactive.perl:1475
+#, 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:1458
+#: git-add--interactive.perl:1476
+#, 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 ""
+
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#, 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:1462
+#, 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:1463
+#, 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:1464
+#, 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 ""
+
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
+#, 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:1468
+#, 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:1469
+#, 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:1470
+#, 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 ""
+
+#: 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 "не удалось разобрать заголовок блока изменений «%.*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 ""
+
+#: 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:790
+#, c-format
+msgid ""
+"expected context line #%d in\n"
+"%.*s"
+msgstr "на %d строке ожидалась информация о контексте\n%.*s"
+
+#: add-patch.c:805
+#, 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:1081 git-add--interactive.perl:1115
+msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
+msgstr "Ручной режим редактирования блока изменений — смотрите ниже для небольшого руководства.\n"
+
+#: add-patch.c:1085
+#, 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:1099 git-add--interactive.perl:1129
+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и блок останется без изменений.\n"
+
+#: add-patch.c:1132
+msgid "could not parse hunk header"
+msgstr ""
+
+#: add-patch.c:1177
+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:1246 git-add--interactive.perl:1242
+msgid ""
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]?"
+" "
+msgstr "Изменённый вами блок не применяется. Редактировать снова (ответ «y» означает «нет»!) [y/n]? "
+
+#: add-patch.c:1289
+msgid "The selected hunks do not apply to the index!"
+msgstr ""
+
+#: add-patch.c:1290 git-add--interactive.perl:1346
+msgid "Apply them to the worktree anyway? "
+msgstr "Все равно применить их к рабочему каталогу? "
+
+#: add-patch.c:1297 git-add--interactive.perl:1349
+msgid "Nothing was applied.\n"
+msgstr "Ничего не применено.\n"
+
+#: add-patch.c:1354
+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:1516 add-patch.c:1526
+msgid "No previous hunk"
+msgstr ""
+
+#: add-patch.c:1521 add-patch.c:1531
+msgid "No next hunk"
+msgstr ""
+
+#: add-patch.c:1537
+msgid "No other hunks to goto"
+msgstr ""
+
+#: add-patch.c:1548 git-add--interactive.perl:1606
+msgid "go to which hunk (<ret> to see more)? "
+msgstr "на какой блок перейти (нажмите <ввод> чтобы увидеть еще)? "
+
+#: add-patch.c:1549 git-add--interactive.perl:1608
+msgid "go to which hunk? "
+msgstr "на какой блок перейти? "
+
+#: add-patch.c:1560
+#, c-format
+msgid "Invalid number: '%s'"
+msgstr ""
+
+#: add-patch.c:1565
+#, c-format
+msgid "Sorry, only %d hunk available."
+msgid_plural "Sorry, only %d hunks available."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: add-patch.c:1574
+msgid "No other hunks to search"
+msgstr ""
+
+#: add-patch.c:1580 git-add--interactive.perl:1661
+msgid "search for regex? "
+msgstr "искать с помощью регулярного выражения? "
+
+#: add-patch.c:1595
+#, c-format
+msgid "Malformed search regexp %s: %s"
+msgstr ""
+
+#: add-patch.c:1612
+msgid "No hunk matches the given pattern"
+msgstr ""
+
+#: add-patch.c:1619
+msgid "Sorry, cannot split this hunk"
+msgstr ""
+
+#: add-patch.c:1623
+#, c-format
+msgid "Split into %d hunks."
+msgstr ""
+
+#: add-patch.c:1627
+msgid "Sorry, cannot edit this hunk"
+msgstr ""
+
+#: add-patch.c:1679
+msgid "'git apply' failed"
+msgstr ""
+
+#: advice.c:143
+#, c-format
+msgid ""
+"\n"
+"Disable this message with \"git config advice.%s false\""
+msgstr ""
+
+#: advice.c:159
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sподсказка: %.*s%s\n"
-#: advice.c:156
+#: advice.c:250
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "Невозможно выполнить копирование коммита в текущую ветку, так как у вас имеются не слитые файлы."
-#: advice.c:158
+#: advice.c:252
msgid "Committing is not possible because you have unmerged files."
msgstr "Невозможно закоммитить, так как у вас имеются не слитые файлы."
-#: advice.c:160
+#: advice.c:254
msgid "Merging is not possible because you have unmerged files."
msgstr "Невозможно выполнить слияние, так как у вас имеются не слитые файлы."
-#: advice.c:162
+#: advice.c:256
msgid "Pulling is not possible because you have unmerged files."
msgstr "Невозможно выполнить получение, так как у вас имеются не слитые файлы."
-#: advice.c:164
+#: advice.c:258
msgid "Reverting is not possible because you have unmerged files."
msgstr "Невозможно обратить изменения, так как у вас имеются не слитые файлы."
-#: advice.c:166
+#: advice.c:260
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "Невозможно выполнить %s, так как у вас имеются не слитые файлы."
-#: advice.c:174
+#: advice.c:268
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:182
+#: advice.c:276
msgid "Exiting because of an unresolved conflict."
msgstr "Выход из-за неразрешенного конфликта."
-#: advice.c:187 builtin/merge.c:1320
+#: advice.c:281 builtin/merge.c:1369
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Вы не завершили слияние (присутствует файл MERGE_HEAD)."
-#: advice.c:189
+#: advice.c:283
msgid "Please, commit your changes before merging."
msgstr "Перед слиянием, выполните коммит ваших изменений."
-#: advice.c:190
+#: advice.c:284
msgid "Exiting because of unfinished merge."
msgstr "Выход из-за незавершенного слияния."
-#: advice.c:196
+#: advice.c:290
#, 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 checkout -b <new-branch-name>\n"
+" git switch -c <new-branch-name>\n"
"\n"
-msgstr "Примечание: переход на «%s».\n\nВы сейчас в состоянии «отделённого HEAD». Вы можете осмотреться, сделать\nэкспериментальные изменения и закоммитить их, также вы можете отменить\nизменения любых коммитов в этом состоянии не затрагивая любые ветки и\nне переходя на них.\n\nЕсли вы хотите создать новую ветку и сохранить свои коммиты, то вы\nможете сделать это (сейчас или позже) вызвав команду checkout снова,\nно с параметром -b. Например:\n\n git checkout -b <имя-новой-ветки>\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 ""
#: alias.c:50
msgid "cmdline ends with \\"
@@ -97,92 +763,82 @@
msgid "unclosed quote"
msgstr "пропущена закрывающая кавычка"
-#: apply.c:63
+#: apply.c:69
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "неопознанная опция для пробелов «%s»"
-#: apply.c:79
+#: apply.c:85
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "неопознанная опция для игнорирования пробелов «%s»"
-#: apply.c:129
+#: apply.c:135
msgid "--reject and --3way cannot be used together."
msgstr "--reject и --3way нельзя использовать одновременно."
-#: apply.c:131
+#: apply.c:137
msgid "--cached and --3way cannot be used together."
msgstr "--cached и --3way нельзя использовать одновременно."
-#: apply.c:134
+#: apply.c:140
msgid "--3way outside a repository"
msgstr "--3way вне репозитория"
-#: apply.c:145
+#: apply.c:151
msgid "--index outside a repository"
msgstr "--index вне репозитория"
-#: apply.c:148
+#: apply.c:154
msgid "--cached outside a repository"
msgstr "--cached вне репозитория"
-#: apply.c:829
+#: apply.c:801
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Не удалось подготовить регулярное выражение для метки времени %s"
-#: apply.c:838
+#: apply.c:810
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec возвратил %d для ввода: %s"
-#: apply.c:912
+#: apply.c:884
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "не удалось найти имя файла в строке патча %d"
-#: apply.c:950
+#: 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, получено %s на строке %d"
-#: apply.c:956
+#: 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:957
+#: 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:962
+#: apply.c:934
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: плохой git-diff — ожидалось /dev/null на строке %d"
-#: apply.c:991
+#: apply.c:963
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "недопустимый режим %d: %s"
-#: apply.c:1310
+#: apply.c:1282
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "противоречивые строки заголовка %d и %d"
-#: apply.c:1482
-#, c-format
-msgid "recount: unexpected line: %.*s"
-msgstr "recount: не ожидаемая строка: %.*s"
-
-#: apply.c:1551
-#, c-format
-msgid "patch fragment without header at line %d: %.*s"
-msgstr "фрагмент изменений без заголовка на строке %d: %.*s"
-
-#: apply.c:1571
+#: apply.c:1372
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname"
@@ -195,70 +851,80 @@
msgstr[2] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (строка %d)"
msgstr[3] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (строка %d)"
-#: apply.c:1584
+#: apply.c:1385
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr "заголовок git diff не содержит информации об имени файла (строка %d)"
-#: apply.c:1772
+#: 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:1774
+#: apply.c:1755
msgid "deleted file still has contents"
msgstr "удаленный файл все еще имеет содержимое"
-#: apply.c:1808
+#: apply.c:1789
#, c-format
msgid "corrupt patch at line %d"
msgstr "патч поврежден на строке %d"
-#: apply.c:1845
+#: apply.c:1826
#, c-format
msgid "new file %s depends on old contents"
msgstr "новый файл %s зависит от старого содержимого"
-#: apply.c:1847
+#: apply.c:1828
#, c-format
msgid "deleted file %s still has contents"
msgstr "удаленный файл %s все еще имеет содержимое"
-#: apply.c:1850
+#: apply.c:1831
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** предупреждение: файл %s становится пустым, но не удаляется"
-#: apply.c:1997
+#: apply.c:1978
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "поврежденный двоичный патч на строке %d: %.*s"
-#: apply.c:2034
+#: apply.c:2015
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "неопознанный двоичный патч на строке %d"
-#: apply.c:2196
+#: apply.c:2177
#, c-format
msgid "patch with only garbage at line %d"
msgstr "патч с мусором на строке %d"
-#: apply.c:2282
+#: apply.c:2263
#, c-format
msgid "unable to read symlink %s"
msgstr "не удалось прочитать символьную ссылку %s"
-#: apply.c:2286
+#: apply.c:2267
#, c-format
msgid "unable to open or read %s"
msgstr "не удалось открыть или прочесть %s"
-#: apply.c:2945
+#: apply.c:2936
#, c-format
msgid "invalid start of line: '%c'"
msgstr "неправильное начало строки: «%c»"
-#: apply.c:3066
+#: apply.c:3057
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -267,258 +933,253 @@
msgstr[2] "Часть #%d успешно применена на %d (со сдвигом в %d строк)."
msgstr[3] "Часть #%d успешно применена на %d (со сдвигом в %d строк)."
-#: apply.c:3078
+#: apply.c:3069
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Контекст сужен до (%ld/%ld), чтобы применить фрагмент на %d строке"
-#: apply.c:3084
+#: apply.c:3075
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr "при поиске:\n%.*s"
-#: apply.c:3106
+#: apply.c:3097
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "пропущены данные двоичного патча для «%s»"
-#: apply.c:3114
+#: apply.c:3105
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr "невозможно выполнить reverse-apply для двоичного патча, без обращения изменений блока «%s»"
-#: apply.c:3161
+#: apply.c:3152
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr "невозможно применить двоичный патч «%s» без строки с указанной полной версией индекса"
-#: apply.c:3171
+#: apply.c:3163
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr "патч применятся к файлу «%s» (%s), но его текущее содержимое не соотвествует ожидаемому."
-#: apply.c:3179
+#: apply.c:3171
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "патч применяется к пустому файлу «%s», но файл не пустой"
-#: apply.c:3197
+#: apply.c:3189
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "не удалось прочитать необходимую посылку %s для «%s»"
-#: apply.c:3210
+#: apply.c:3202
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "не удалось применить двоичный патч к «%s»"
-#: apply.c:3216
+#: apply.c:3209
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "после применения двоичного патча для «%s» был получен неправильный результат (ожидалось %s, получено %s)"
-#: apply.c:3237
+#: apply.c:3230
#, c-format
msgid "patch failed: %s:%ld"
msgstr "ошибка применения изменений: %s:%ld"
-#: apply.c:3360
+#: apply.c:3353
#, c-format
msgid "cannot checkout %s"
msgstr "не удалось переключить состояние на %s"
-#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:59 setup.c:279
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 setup.c:308
#, c-format
msgid "failed to read %s"
msgstr "не удалось прочитать %s"
-#: apply.c:3420
+#: apply.c:3413
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "чтение из «%s» за символической ссылкой"
-#: apply.c:3449 apply.c:3692
+#: apply.c:3442 apply.c:3685
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "путь %s был переименован/удален"
-#: apply.c:3535 apply.c:3707
+#: apply.c:3528 apply.c:3700
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: нет в индексе"
-#: apply.c:3544 apply.c:3715
+#: apply.c:3537 apply.c:3708 apply.c:3952
#, c-format
msgid "%s: does not match index"
msgstr "%s: не совпадает с индексом"
-#: apply.c:3579
+#: apply.c:3572
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr "в репозитории отсутствует необходимый двоичный объект для отката к трёхходовому слиянию."
-#: apply.c:3582
+#: apply.c:3575
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "Откат к трёхходовому слиянию…\n"
-#: apply.c:3598 apply.c:3602
+#: apply.c:3591 apply.c:3595
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "не удалось прочитать текущее содержимое «%s»"
-#: apply.c:3614
+#: apply.c:3607
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "Не удалось откатиться к трёхходовому слиянию…\n"
-#: apply.c:3628
+#: apply.c:3621
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Патч применен к «%s» с конфликтами.\n"
-#: apply.c:3633
+#: apply.c:3626
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Патч применен к «%s» без ошибок.\n"
-#: apply.c:3659
+#: apply.c:3652
msgid "removal patch leaves file contents"
msgstr "патч удаления не удалил содержимое файла"
-#: apply.c:3732
+#: apply.c:3725
#, c-format
msgid "%s: wrong type"
msgstr "%s: неправильный тип"
-#: apply.c:3734
+#: apply.c:3727
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s имеет тип %o, а ожидался %o"
-#: apply.c:3885 apply.c:3887 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:3943
+#: apply.c:3950
#, c-format
msgid "%s: already exists in index"
msgstr "%s: уже содержится в индексе"
-#: apply.c:3946
+#: apply.c:3954
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: уже содержится в рабочем каталоге"
-#: apply.c:3966
+#: apply.c:3974
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "новый режим доступа (%o) для %s не соответствует старому режиму доступа (%o)"
-#: apply.c:3971
+#: apply.c:3979
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "новый режим доступа (%o) для %s не соответствует старому режиму доступа (%o) для %s"
-#: apply.c:3991
+#: apply.c:3999
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "затронутый файл «%s» находится за символической ссылкой"
-#: apply.c:3995
+#: apply.c:4003
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: не удалось применить патч"
-#: apply.c:4010
+#: apply.c:4018
#, c-format
msgid "Checking patch %s..."
msgstr "Проверка патча %s…"
-#: apply.c:4102
+#: apply.c:4110
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "информация об sha1 отсутствует или бесполезна для подмодуля %s"
-#: apply.c:4109
+#: apply.c:4117
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "изменен режим для %s, который не находится в текущем HEAD"
-#: apply.c:4112
+#: apply.c:4120
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "информация об sha1 отсутствует или бесполезна (%s)."
-#: apply.c:4117 builtin/checkout.c:257 builtin/reset.c:143
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr "сбой make_cache_entry для пути «%s»"
-
-#: apply.c:4121
+#: apply.c:4129
#, c-format
msgid "could not add %s to temporary index"
msgstr "не удалось добавить %s во временный индекс"
-#: apply.c:4131
+#: apply.c:4139
#, c-format
msgid "could not write temporary index to %s"
msgstr "не удалось записать временный индкекс в %s"
-#: apply.c:4269
+#: apply.c:4277
#, c-format
msgid "unable to remove %s from index"
msgstr "не удалось удалить %s из индекса"
-#: apply.c:4303
+#: apply.c:4311
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "поврежденный патч для подмодуля %s"
-#: apply.c:4309
+#: apply.c:4317
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "не удалось выполнить stat для созданного файла «%s»"
-#: apply.c:4317
+#: apply.c:4325
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "не удалось создать вспомогательный файл для созданного файла %s"
-#: apply.c:4323 apply.c:4468
+#: apply.c:4331 apply.c:4476
#, c-format
msgid "unable to add cache entry for %s"
msgstr "не удалось создать запись в кэше для %s"
-#: apply.c:4366
+#: apply.c:4374 builtin/bisect--helper.c:524
#, c-format
msgid "failed to write to '%s'"
msgstr "не удалось записать в «%s»"
-#: apply.c:4370
+#: apply.c:4378
#, c-format
msgid "closing file '%s'"
msgstr "закрытие файла «%s»"
-#: apply.c:4440
+#: apply.c:4448
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "не удалось записать файл «%s» с режимом доступа %o"
-#: apply.c:4538
+#: apply.c:4546
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Патч %s применен без ошибок."
-#: apply.c:4546
+#: apply.c:4554
msgid "internal error"
msgstr "внутренняя ошибка"
-#: apply.c:4549
+#: apply.c:4557
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
@@ -527,45 +1188,45 @@
msgstr[2] "Применение патча %%s с %d отказами…"
msgstr[3] "Применение патча %%s с %d отказами…"
-#: apply.c:4560
+#: apply.c:4568
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "усечение имени .rej файла до %.*s.rej"
-#: apply.c:4568 builtin/fetch.c:837 builtin/fetch.c:1118
+#: apply.c:4576 builtin/fetch.c:927 builtin/fetch.c:1228
#, c-format
msgid "cannot open %s"
msgstr "не удалось открыть %s"
-#: apply.c:4582
+#: apply.c:4590
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Блок №%d применен без ошибок."
-#: apply.c:4586
+#: apply.c:4594
#, c-format
msgid "Rejected hunk #%d."
msgstr "Блок №%d отклонен."
-#: apply.c:4696
+#: apply.c:4718
#, c-format
msgid "Skipped patch '%s'."
msgstr "Патч «%s» пропущен."
-#: apply.c:4704
+#: apply.c:4726
msgid "unrecognized input"
msgstr "не распознанный ввод"
-#: apply.c:4724
+#: apply.c:4746
msgid "unable to read index file"
msgstr "не удалось прочитать файл индекса"
-#: apply.c:4879
+#: apply.c:4903
#, c-format
msgid "can't open patch '%s': %s"
msgstr "не удалось открыть патч «%s»: %s"
-#: apply.c:4906
+#: apply.c:4930
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
@@ -574,7 +1235,7 @@
msgstr[2] "пропущено %d ошибок в пробельных символах"
msgstr[3] "пропущено %d ошибок в пробельных символах"
-#: apply.c:4912 apply.c:4927
+#: apply.c:4936 apply.c:4951
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
@@ -583,7 +1244,7 @@
msgstr[2] "%d строк добавили ошибки в пробельных символах."
msgstr[3] "%d строк добавили ошибки в пробельных символах."
-#: apply.c:4920
+#: apply.c:4944
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
@@ -592,143 +1253,178 @@
msgstr[2] "%d строк добавлено после исправления ошибок в пробелах."
msgstr[3] "%d строки добавлено после исправления ошибок в пробелах."
-#: apply.c:4936 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4960 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406
msgid "Unable to write new index file"
msgstr "Не удалось записать новый файл индекса"
-#: apply.c:4963 apply.c:4966 builtin/am.c:2210 builtin/am.c:2213
-#: builtin/clone.c:120 builtin/fetch.c:118 builtin/merge.c:271
-#: builtin/pull.c:207 builtin/submodule--helper.c:407
-#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369
-#: builtin/submodule--helper.c:1849 builtin/submodule--helper.c:1852
-#: builtin/submodule--helper.c:2091 git-add--interactive.perl:197
-msgid "path"
-msgstr "путь"
-
-#: apply.c:4964
+#: apply.c:4988
msgid "don't apply changes matching the given path"
msgstr "не применять изменения по указанному пути"
-#: apply.c:4967
+#: apply.c:4991
msgid "apply changes matching the given path"
msgstr "применять изменения по указанному пути"
-#: apply.c:4969 builtin/am.c:2219
+#: apply.c:4993 builtin/am.c:2266
msgid "num"
msgstr "количество"
-#: apply.c:4970
+#: apply.c:4994
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "удалить <количество> ведущих косых черт из традиционных путей списка изменений"
-#: apply.c:4973
+#: apply.c:4997
msgid "ignore additions made by the patch"
msgstr "игнорировать добавления, сделанные этим патчем"
-#: apply.c:4975
+#: apply.c:4999
msgid "instead of applying the patch, output diffstat for the input"
msgstr "вместо применения патча вывести статистику добавлений и удалений для ввода"
-#: apply.c:4979
+#: apply.c:5003
msgid "show number of added and deleted lines in decimal notation"
msgstr "показать количество добавленных и удаленных строк в десятичном представлении"
-#: apply.c:4981
+#: apply.c:5005
msgid "instead of applying the patch, output a summary for the input"
msgstr "вместо применения патча вывести сводку изменений для ввода"
-#: apply.c:4983
+#: apply.c:5007
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "вместо применения патча проверить подходит ли он"
-#: apply.c:4985
+#: apply.c:5009
msgid "make sure the patch is applicable to the current index"
msgstr "проверить, что патч применяется к текущему индексу"
-#: apply.c:4987
+#: apply.c:5011
msgid "mark new files with `git add --intent-to-add`"
msgstr "помечать новые файлы с «git add --intent-to-add»"
-#: apply.c:4989
+#: apply.c:5013
msgid "apply a patch without touching the working tree"
msgstr "применить патч, не изменяя рабочий каталог"
-#: apply.c:4991
+#: apply.c:5015
msgid "accept a patch that touches outside the working area"
msgstr "принять патч, который затрагивает файлы за рабочим каталогом"
-#: apply.c:4994
+#: apply.c:5018
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "а также применить патч (используйте с --stat/--summary/--check)"
-#: apply.c:4996
+#: apply.c:5020
msgid "attempt three-way merge if a patch does not apply"
msgstr "попытаться сделать трехходовое слияние, если патч не применяется"
-#: apply.c:4998
+#: apply.c:5022
msgid "build a temporary index based on embedded index information"
msgstr "построить временный индекс, основанный на встроенной информации об индексе"
-#: apply.c:5001 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5025 builtin/checkout-index.c:182 builtin/ls-files.c:525
msgid "paths are separated with NUL character"
msgstr "пути, отделённые НУЛЕВЫМ символом"
-#: apply.c:5003
+#: apply.c:5027
msgid "ensure at least <n> lines of context match"
msgstr "удостовериться, что по крайней мере <n> строк контекста совпадают"
-#: apply.c:5004 builtin/am.c:2198 builtin/interpret-trailers.c:97
-#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
-#: builtin/pack-objects.c:3317 builtin/rebase.c:1415
+#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
+#: builtin/pack-objects.c:3562 builtin/rebase.c:1346
msgid "action"
msgstr "действие"
-#: apply.c:5005
+#: apply.c:5029
msgid "detect new or modified lines that have whitespace errors"
msgstr "определять новые или модифицированные строки, у которых есть ошибки в пробельных символах"
-#: apply.c:5008 apply.c:5011
+#: apply.c:5032 apply.c:5035
msgid "ignore changes in whitespace when finding context"
msgstr "игнорировать изменения в пробельных символах при поиске контекста"
-#: apply.c:5014
+#: apply.c:5038
msgid "apply the patch in reverse"
msgstr "применить патч с обращением изменений"
-#: apply.c:5016
+#: apply.c:5040
msgid "don't expect at least one line of context"
msgstr "не ожидать как минимум одной строки контекста"
-#: apply.c:5018
+#: apply.c:5042
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "оставить отклоненные блоки изменений в соответствующих *.rej файлах"
-#: apply.c:5020
+#: apply.c:5044
msgid "allow overlapping hunks"
msgstr "разрешить перекрывающиеся блоки изменений"
-#: apply.c:5021 builtin/add.c:291 builtin/check-ignore.c:22
-#: builtin/commit.c:1317 builtin/count-objects.c:98 builtin/fsck.c:786
-#: builtin/log.c:2045 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5045 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:2287 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "быть многословнее"
-#: apply.c:5023
+#: apply.c:5047
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "разрешить некорректно определенные пропущенные пустые строки в конце файла"
-#: apply.c:5026
+#: apply.c:5050
msgid "do not trust the line counts in the hunk headers"
msgstr "не доверять количеству строк из заголовка блока изменений"
-#: apply.c:5028 builtin/am.c:2207
+#: apply.c:5052 builtin/am.c:2254
msgid "root"
msgstr "корень"
-#: apply.c:5029
+#: apply.c:5053
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:450
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr "не удалось запустить фильтр «%s»"
+
+#: archive-tar.c:453
+msgid "unable to redirect descriptor"
+msgstr "не удалось перенаправить дескриптор"
+
+#: archive-tar.c:460
+#, 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 [<опции>] <указатель-дерева> [<путь>…]"
@@ -747,224 +1443,198 @@
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
-#, c-format
-msgid "pathspec '%s' did not match any files"
-msgstr "спецификатор пути «%s» не соответствует ни одному файлу"
-
-#: archive.c:396
-#, c-format
-msgid "no such ref: %.*s"
-msgstr "нет такой ссылки: %.*s"
-
-#: archive.c:401
-#, c-format
-msgid "not a valid object name: %s"
-msgstr "недопустимое имя объекта: %s"
-
-#: archive.c:414
-#, c-format
-msgid "not a tree object: %s"
-msgstr "недействительный объект дерева: %s"
-
-#: archive.c:424
-msgid "current working directory is untracked"
-msgstr "текущий рабочий каталог не отслеживается"
-
-#: archive.c:455
-msgid "fmt"
-msgstr "формат"
-
-#: archive.c:455
-msgid "archive format"
-msgstr "формат архива"
-
-#: archive.c:456 builtin/log.c:1557
-msgid "prefix"
-msgstr "префикс"
-
-#: archive.c:457
-msgid "prepend prefix to each pathname in the archive"
-msgstr "добавлять префикс перед каждым путем файла в архиве"
-
-#: archive.c:458 builtin/blame.c:821 builtin/blame.c:822
-#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1091
-#: builtin/fast-export.c:1093 builtin/grep.c:895 builtin/hash-object.c:105
-#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
-msgid "file"
-msgstr "файл"
-
-#: archive.c:459 builtin/archive.c:90
-msgid "write the archive to this file"
-msgstr "запись архива в этот файл"
-
-#: archive.c:461
-msgid "read .gitattributes in working directory"
-msgstr "читать .gitattributes в рабочем каталоге"
-
-#: archive.c:462
-msgid "report archived files on stderr"
-msgstr "отчет об архивированных файлах в stderr"
-
-#: archive.c:463
-msgid "store only"
-msgstr "только хранение"
-
-#: archive.c:464
-msgid "compress faster"
-msgstr "сжимать быстрее"
-
-#: archive.c:472
-msgid "compress better"
-msgstr "сжимать лучше"
-
-#: archive.c:475
-msgid "list supported archive formats"
-msgstr "перечислить поддерживаемые форматы архивов"
-
-#: archive.c:477 builtin/archive.c:91 builtin/clone.c:110 builtin/clone.c:113
-#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1858
-msgid "repo"
-msgstr "репозиторий"
-
-#: archive.c:478 builtin/archive.c:92
-msgid "retrieve the archive from remote repository <repo>"
-msgstr "получить архив из внешнего <репозитория>"
-
-#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:707
-#: builtin/notes.c:498
-msgid "command"
-msgstr "команда"
-
-#: archive.c:480 builtin/archive.c:94
-msgid "path to the remote git-upload-archive command"
-msgstr "путь к команде git-upload-archive на машине с внешним репозиторием"
-
-#: archive.c:487
-msgid "Unexpected option --remote"
-msgstr "Неожиданная опция --remote"
-
-#: archive.c:489
-msgid "Option --exec can only be used together with --remote"
-msgstr "Опция --exec может использоваться только вместе с --remote"
-
-#: archive.c:491
-msgid "Unexpected option --output"
-msgstr "Неожиданная опция --output"
-
-#: archive.c:513
-#, c-format
-msgid "Unknown archive format '%s'"
-msgstr "Неизвестный формат архива «%s»"
-
-#: archive.c:520
-#, 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
+#: archive.c:192
#, c-format
msgid "cannot read %s"
msgstr "не удалось прочитать %s"
-#: archive-tar.c:459
+#: archive.c:345 sequencer.c:459 sequencer.c:1736 sequencer.c:2886
+#: sequencer.c:3327 sequencer.c:3436 builtin/am.c:249 builtin/commit.c:786
+#: builtin/merge.c:1138
#, c-format
-msgid "unable to start '%s' filter"
-msgstr "не удалось запустить фильтр «%s»"
+msgid "could not read '%s'"
+msgstr "не удалось прочитать «%s»"
-#: archive-tar.c:462
-msgid "unable to redirect descriptor"
-msgstr "не удалось перенаправить дескриптор"
-
-#: archive-tar.c:469
+#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315
#, c-format
-msgid "'%s' filter reported error"
-msgstr "фильтр «%s» сообщил об ошибке"
+msgid "pathspec '%s' did not match any files"
+msgstr "спецификатор пути «%s» не соответствует ни одному файлу"
-#: archive-zip.c:314
+#: archive.c:454
#, c-format
-msgid "path is not valid UTF-8: %s"
-msgstr "путь не является действительным UTF-8: %s"
+msgid "no such ref: %.*s"
+msgstr "нет такой ссылки: %.*s"
-#: archive-zip.c:318
+#: archive.c:460
#, c-format
-msgid "path too long (%d chars, SHA1: %s): %s"
-msgstr "путь слишком длинный (%d символов, SHA1: %s): %s"
+msgid "not a valid object name: %s"
+msgstr "недопустимое имя объекта: %s"
-#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229
+#: archive.c:473
#, c-format
-msgid "deflate error (%d)"
-msgstr "ошибка сжатия (%d)"
+msgid "not a tree object: %s"
+msgstr "недействительный объект дерева: %s"
-#: archive-zip.c:609
+#: archive.c:485
+msgid "current working directory is untracked"
+msgstr "текущий рабочий каталог не отслеживается"
+
+#: archive.c:526
#, c-format
-msgid "timestamp too large for this system: %<PRIuMAX>"
-msgstr "отметка времени слишком большая для этой системы: %<PRIuMAX>"
+msgid "File not found: %s"
+msgstr ""
-#: attr.c:211
+#: archive.c:528
+#, c-format
+msgid "Not a regular file: %s"
+msgstr ""
+
+#: archive.c:555
+msgid "fmt"
+msgstr "формат"
+
+#: archive.c:555
+msgid "archive format"
+msgstr "формат архива"
+
+#: archive.c:556 builtin/log.c:1765
+msgid "prefix"
+msgstr "префикс"
+
+#: archive.c:557
+msgid "prepend prefix to each pathname in the archive"
+msgstr "добавлять префикс перед каждым путем файла в архиве"
+
+#: archive.c:558 archive.c:561 builtin/blame.c:886 builtin/blame.c:890
+#: builtin/blame.c:891 builtin/commit-tree.c:117 builtin/config.c:135
+#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
+#: builtin/fast-export.c:1213 builtin/grep.c:919 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:559
+msgid "add untracked file to archive"
+msgstr ""
+
+#: archive.c:562 builtin/archive.c:90
+msgid "write the archive to this file"
+msgstr "запись архива в этот файл"
+
+#: archive.c:564
+msgid "read .gitattributes in working directory"
+msgstr "читать .gitattributes в рабочем каталоге"
+
+#: archive.c:565
+msgid "report archived files on stderr"
+msgstr "отчет об архивированных файлах в stderr"
+
+#: archive.c:567
+msgid "set compression level"
+msgstr ""
+
+#: archive.c:570
+msgid "list supported archive formats"
+msgstr "перечислить поддерживаемые форматы архивов"
+
+#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117
+#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
+msgid "repo"
+msgstr "репозиторий"
+
+#: archive.c:573 builtin/archive.c:92
+msgid "retrieve the archive from remote repository <repo>"
+msgstr "получить архив из внешнего <репозитория>"
+
+#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714
+#: builtin/notes.c:498
+msgid "command"
+msgstr "команда"
+
+#: archive.c:575 builtin/archive.c:94
+msgid "path to the remote git-upload-archive command"
+msgstr "путь к команде git-upload-archive на машине с внешним репозиторием"
+
+#: archive.c:582
+msgid "Unexpected option --remote"
+msgstr "Неожиданная опция --remote"
+
+#: archive.c:584
+msgid "Option --exec can only be used together with --remote"
+msgstr "Опция --exec может использоваться только вместе с --remote"
+
+#: archive.c:586
+msgid "Unexpected option --output"
+msgstr "Неожиданная опция --output"
+
+#: archive.c:588
+msgid "Options --add-file and --remote cannot be used together"
+msgstr ""
+
+#: archive.c:610
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "Неизвестный формат архива «%s»"
+
+#: archive.c:619
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "Аргумент не поддерживается для формата «%s»: -%d"
+
+#: attr.c:202
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s не является допустимым именем атрибута"
-#: attr.c:368
+#: attr.c:359
#, c-format
msgid "%s not allowed: %s:%d"
msgstr "%s не разрешено: %s:%d"
-#: attr.c:408
+#: attr.c:399
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgstr "Отрицающие шаблоны в атрибутах git игнорируются.\nИспользуйте «\\!» для буквального использования символа в значении «восклицательный знак»."
-#: bisect.c:468
+#: bisect.c:489
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Плохое содержимое файла «%s»: %s"
-#: bisect.c:678
+#: bisect.c:699
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Невозможно продолжить бинарный поиск!\n"
-#: bisect.c:733
+#: bisect.c:766
#, c-format
msgid "Not a valid commit name %s"
msgstr "Недопустимое имя коммита %s"
-#: bisect.c:758
+#: bisect.c:791
#, 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].\n"
-#: bisect.c:763
+#: bisect.c:796
#, 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:768
+#: bisect.c:801
#, 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:776
+#: bisect.c:809
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -972,7 +1642,7 @@
"Maybe you mistook %s and %s revs?\n"
msgstr "Несколько %s коммитов не являются предками %s коммита.\nВ этом случае git bisect не может работать правильно.\nВозможно, вы перепутали редакции %s и %s местами?\n"
-#: bisect.c:789
+#: bisect.c:822
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -980,43 +1650,43 @@
"We continue anyway."
msgstr "База слияния между %s и [%s] должно быть пропущена.\nПоэтому мы не можем быть уверены, что первый %s коммит находится между %s и %s.\nНо все же продолжаем поиск."
-#: bisect.c:822
+#: bisect.c:861
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Бинарный поиск: база слияния должна быть проверена\n"
-#: bisect.c:865
+#: bisect.c:911
#, c-format
msgid "a %s revision is needed"
msgstr "нужно указать %s редакцию"
-#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:248
+#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:255
#, c-format
msgid "could not create file '%s'"
msgstr "не удалось создать файл «%s»"
-#: bisect.c:928 builtin/merge.c:146
+#: bisect.c:987 builtin/merge.c:152
#, c-format
msgid "could not read file '%s'"
msgstr "не удалось прочитать файл «%s»"
-#: bisect.c:958
+#: bisect.c:1027
msgid "reading bisect refs failed"
msgstr "сбой при чтении ссылок двоичного поиска"
-#: bisect.c:977
+#: bisect.c:1057
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s была одновременно и %s и %s\n"
-#: bisect.c:985
+#: bisect.c:1066
#, c-format
msgid ""
"No testable commit found.\n"
"Maybe you started with bad path parameters?\n"
msgstr "Тестируемый коммит не найден.\nВозможно, вы начали поиск с указанием неправильного параметра пути?\n"
-#: bisect.c:1004
+#: bisect.c:1095
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1027,7 +1697,7 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
-#: bisect.c:1010
+#: bisect.c:1101
#, 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"
@@ -1036,37 +1706,37 @@
msgstr[2] "Бинарный поиск: %d редакций осталось проверить после этой %s\n"
msgstr[3] "Бинарный поиск: %d редакций осталось проверить после этой %s\n"
-#: blame.c:1794
+#: blame.c:2777
msgid "--contents and --reverse do not blend well."
msgstr "--contents и --reverse не очень сочетаются."
-#: blame.c:1808
+#: blame.c:2791
msgid "cannot use --contents with final commit object name"
msgstr "нельзя использовать --contents с указанием финального имени объекта"
-#: blame.c:1829
+#: blame.c:2812
msgid "--reverse and --first-parent together require specified latest commit"
msgstr "при --reverse и --first-parent вместе нужно указывать конкретный последний коммит"
-#: blame.c:1838 bundle.c:164 ref-filter.c:2077 remote.c:1938 sequencer.c:2030
-#: sequencer.c:4224 builtin/commit.c:1017 builtin/log.c:382 builtin/log.c:940
-#: builtin/log.c:1428 builtin/log.c:1804 builtin/log.c:2094
-#: builtin/merge.c:415 builtin/pack-objects.c:3140 builtin/pack-objects.c:3155
-#: builtin/shortlog.c:192
+#: blame.c:2821 bundle.c:213 ref-filter.c:2272 remote.c:2031 sequencer.c:2138
+#: sequencer.c:4633 submodule.c:855 builtin/commit.c:1045 builtin/log.c:409
+#: builtin/log.c:1023 builtin/log.c:1625 builtin/log.c:2046 builtin/log.c:2336
+#: builtin/merge.c:423 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395
+#: builtin/shortlog.c:267
msgid "revision walk setup failed"
msgstr "сбой инициализации прохода по редакциям"
-#: blame.c:1856
+#: blame.c:2839
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr "при указании --reverse и --first-parent вместе, требуется также указать диапазон по цепочке первого родителя"
-#: blame.c:1867
+#: blame.c:2850
#, c-format
msgid "no such path %s in %s"
msgstr "нет такого пути %s в %s"
-#: blame.c:1878
+#: blame.c:2861
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "невозможно прочитать объект %s для пути %s"
@@ -1186,37 +1856,51 @@
msgid "Not a valid branch point: '%s'."
msgstr "Недопустимая точка ветки: «%s»."
-#: branch.c:359
+#: branch.c:365
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "«%s» уже находится на «%s»"
-#: branch.c:382
+#: 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» не похож на файл пакета версии 2"
+msgid "unrecognized bundle hash algorithm: %s"
+msgstr ""
-#: bundle.c:64
+#: bundle.c:45
+#, c-format
+msgid "unknown capability '%s'"
+msgstr ""
+
+#: bundle.c:71
+#, c-format
+msgid "'%s' does not look like a v2 or v3 bundle file"
+msgstr ""
+
+#: 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:2281 sequencer.c:2916
-#: builtin/commit.c:788
+#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2390 sequencer.c:3176
+#: 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:194
+#: 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:"
@@ -1225,11 +1909,11 @@
msgstr[2] "Пакет содержит эти %d ссылок:"
msgstr[3] "Пакет содержит эти %d ссылок:"
-#: bundle.c:201
+#: bundle.c:250
msgid "The bundle records a complete history."
msgstr "Пакет содержит полную историю."
-#: bundle.c:203
+#: bundle.c:252
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
@@ -1238,62 +1922,324 @@
msgstr[2] "Пакет требует эти %d ссылок:"
msgstr[3] "Пакет требует эти %d ссылок:"
-#: bundle.c:269
+#: bundle.c:319
msgid "unable to dup bundle descriptor"
msgstr "не удалось дублировать дескриптор пакета"
-#: bundle.c:276
+#: bundle.c:326
msgid "Could not spawn pack-objects"
msgstr "Не удалось создать объекты пакета"
-#: bundle.c:287
+#: bundle.c:337
msgid "pack-objects died"
msgstr "критическая ошибка pack-objects"
-#: bundle.c:329
+#: bundle.c:379
msgid "rev-list died"
msgstr "критическая ошибка rev-list"
-#: bundle.c:378
+#: bundle.c:428
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "ссылка «%s» исключена в соответствии с опциями rev-list"
-#: bundle.c:457 builtin/log.c:197 builtin/log.c:1709 builtin/shortlog.c:306
+#: bundle.c:498
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr ""
+
+#: bundle.c:500
+#, c-format
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr ""
+
+#: bundle.c:522 builtin/log.c:209 builtin/log.c:1927 builtin/shortlog.c:408
#, c-format
msgid "unrecognized argument: %s"
msgstr "неопознанный аргумент: %s"
-#: bundle.c:465
+#: bundle.c:530
msgid "Refusing to create empty bundle."
msgstr "Отклонение создания пустого пакета."
-#: bundle.c:475
+#: bundle.c:540
#, c-format
msgid "cannot create '%s'"
msgstr "не удалось создать «%s»"
-#: bundle.c:500
+#: 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:2697 builtin/am.c:355 builtin/am.c:399
-#: builtin/am.c:1377 builtin/am.c:2022 builtin/replace.c:455
+#: commit-graph.c:188 midx.c:47
+msgid "invalid hash version"
+msgstr ""
+
+#: commit-graph.c:246
+msgid "commit-graph file is too small"
+msgstr "файл commit-graph слишком маленький"
+
+#: commit-graph.c:311
+#, c-format
+msgid "commit-graph signature %X does not match signature %X"
+msgstr "подпись commit-graph файла %X не соотвествует подписи %X"
+
+#: commit-graph.c:318
+#, c-format
+msgid "commit-graph version %X does not match version %X"
+msgstr "версия commit-graph файла %X не соотвествует версии %X"
+
+#: commit-graph.c:325
+#, c-format
+msgid "commit-graph hash version %X does not match version %X"
+msgstr "версия хэш-функции commit-graph файла %X не соответствует версии %X"
+
+#: 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 файле %08x%08x"
+
+#: commit-graph.c:433
+#, c-format
+msgid "commit-graph chunk id %08x appears multiple times"
+msgstr "часть файла commit-graph с идентификатором %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 ""
+
+#: 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:1036 builtin/am.c:1292
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "не удалось разобрать коммит %s"
+
+#: commit-graph.c:1252 builtin/pack-objects.c:2864
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "не удалось получить тип объекта %s"
+
+#: commit-graph.c:1283
+msgid "Loading known commits in commit graph"
+msgstr "Загрузка известных коммитов на граф коммитов"
+
+#: commit-graph.c:1300
+msgid "Expanding reachable commits in commit graph"
+msgstr "Расширение достижимых коммитов на граф коммитов"
+
+#: commit-graph.c:1320
+msgid "Clearing commit marks in commit graph"
+msgstr "Очистка пометок коммитов на графе коммитов"
+
+#: commit-graph.c:1339
+msgid "Computing commit graph generation numbers"
+msgstr "Вычисление номеров поколений на графе коммитов"
+
+#: commit-graph.c:1406
+msgid "Computing commit changed paths Bloom filters"
+msgstr ""
+
+#: commit-graph.c:1483
+msgid "Collecting referenced commits"
+msgstr ""
+
+#: commit-graph.c:1508
+#, 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 пакетах"
+msgstr[2] "Поиск коммитов для графа коммитов в %d пакетах"
+msgstr[3] "Поиск коммитов для графа коммитов в %d пакетах"
+
+#: commit-graph.c:1521
+#, c-format
+msgid "error adding pack %s"
+msgstr "ошибка добавления пакета %s"
+
+#: commit-graph.c:1525
+#, c-format
+msgid "error opening index for %s"
+msgstr "ошибка открытия индекса для %s"
+
+#: commit-graph.c:1562
+msgid "Finding commits for commit graph among packed objects"
+msgstr "Поиск коммитов для графа коммитов среди упакованных объектов"
+
+#: commit-graph.c:1580
+msgid "Finding extra edges in commit graph"
+msgstr "Поиск дополнительных ребер на графе коммитов"
+
+#: commit-graph.c:1628
+msgid "failed to write correct number of base graph ids"
+msgstr ""
+
+#: commit-graph.c:1670 midx.c:819
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr "не удалось создать родительские каталоги для %s"
+
+#: commit-graph.c:1683
+msgid "unable to create temporary graph layer"
+msgstr ""
+
+#: commit-graph.c:1688
+#, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr ""
+
+#: commit-graph.c:1758
+#, 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 прохода"
+msgstr[2] "Запись графа коммитов в %d проходов"
+msgstr[3] "Запись графа коммитов в %d прохода"
+
+#: commit-graph.c:1803
+msgid "unable to open commit-graph chain file"
+msgstr ""
+
+#: commit-graph.c:1819
+msgid "failed to rename base commit-graph file"
+msgstr ""
+
+#: commit-graph.c:1839
+msgid "failed to rename temporary commit-graph file"
+msgstr ""
+
+#: commit-graph.c:1965
+msgid "Scanning merged commits"
+msgstr ""
+
+#: commit-graph.c:2009
+msgid "Merging commit-graph"
+msgstr ""
+
+#: commit-graph.c:2115
+msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
+msgstr ""
+
+#: commit-graph.c:2214
+msgid "too many commits to write graph"
+msgstr "слишком много коммитов для записи графа"
+
+#: commit-graph.c:2307
+msgid "the commit-graph file has incorrect checksum and is likely corrupt"
+msgstr "файл commit-graph содержит неправильную контрольную сумму и скорее всего поврежден"
+
+#: commit-graph.c:2317
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr "файл commit-graph содержит неправильный порядок OID: %s, а затем %s"
+
+#: commit-graph.c:2327 commit-graph.c:2342
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr "файл commit-graph содержит неправильное значение fanout: fanout[%d] = %u != %u"
+
+#: commit-graph.c:2334
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "не удалось разобрать коммит %s из файла commit-graph"
+
+#: commit-graph.c:2352
+msgid "Verifying commits in commit graph"
+msgstr "Проверка коммитов на графе коммитов"
+
+#: commit-graph.c:2367
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr "не удалось разобрать коммит %s из базы объектов файла commit-graph"
+
+#: commit-graph.c:2374
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr "в файле commit-graph OID корня дерева для коммита %s является %s != %s"
+
+#: commit-graph.c:2384
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr "слишком большой список родителей файле commit-graph для коммита %s"
+
+#: commit-graph.c:2393
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr "в файле commit-graph родитель для %s является %s != %s"
+
+#: commit-graph.c:2407
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr "в файле commit-graph список родителей для коммита %s закончился слишком рано"
+
+#: commit-graph.c:2412
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero "
+"elsewhere"
+msgstr "в файле commit-graph содержится нулевой номер поколения для коммита %s, но ненулевой в остальных случаях"
+
+#: commit-graph.c:2416
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero "
+"elsewhere"
+msgstr "в файле commit-graph содержится ненулевой номер поколения для коммита %s, но нулевой в остальных случаях"
+
+#: commit-graph.c:2432
+#, c-format
+msgid "commit-graph generation for commit %s is %u != %u"
+msgstr "в файле commit-graph номер поколения для коммита %s является %u != %u"
+
+#: commit-graph.c:2438
+#, c-format
+msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
+msgstr "в файле commit-graph дата коммита %s является %<PRIuMAX> != %<PRIuMAX>"
+
+#: commit.c:52 sequencer.c:2879 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr "не удалось разобрать %s"
-#: commit.c:52
+#: commit.c:54
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s не является коммитом!"
-#: commit.c:193
+#: commit.c:194
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -1305,232 +2251,38 @@
"\"git config advice.graftFileDeprecated false\""
msgstr "Поддержка <GIT_DIR>/info/grafts устарела и будет удалена в следующих версиях Git.\n\nИспользуйте «git replace --convert-graft-file» для конвертации сращений (grafts) на ссылки замены.\n\nЧтобы скрыть это сообщение запустите «git config advice.graftFileDeprecated false»"
-#: commit.c:1128
+#: commit.c:1172
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "Коммит %s содержит не доверенную GPG подпись, предположительно от %s."
-#: commit.c:1131
+#: commit.c:1176
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "Коммит %s содержит плохую GPG подпись, предположительно от %s."
-#: commit.c:1134
+#: commit.c:1179
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Коммит %s не содержит GPG подпись."
-#: commit.c:1137
+#: commit.c:1182
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Коммит %s содержит действительную GPG подпись, от %s.\n"
-#: commit.c:1391
+#: 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сообщений, которую использует ваш проект.\n"
-#: commit-graph.c:105
-msgid "commit-graph file is too small"
-msgstr "файл commit-graph слишком маленький"
-
-#: commit-graph.c:170
-#, c-format
-msgid "commit-graph signature %X does not match signature %X"
-msgstr "подпись commit-graph файла %X не соотвествует подписи %X"
-
-#: commit-graph.c:177
-#, c-format
-msgid "commit-graph version %X does not match version %X"
-msgstr "версия commit-graph файла %X не соотвествует версии %X"
-
-#: commit-graph.c:184
-#, c-format
-msgid "commit-graph hash version %X does not match version %X"
-msgstr "версия хеш-суммы commit-graph файла %X не соответствует версии %X"
-
-#: commit-graph.c:207
-msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
-msgstr "не найдена таблица расположения частей в файле commit-graph; возможно файл повреждён"
-
-#: commit-graph.c:218
-#, c-format
-msgid "commit-graph improper chunk offset %08x%08x"
-msgstr "некорректное смещение части в commit-graph файле %08x%08x"
-
-#: commit-graph.c:255
-#, c-format
-msgid "commit-graph chunk id %08x appears multiple times"
-msgstr "часть файла commit-graph с идентификатором %08x появляется несколько раз"
-
-#: commit-graph.c:390
-#, c-format
-msgid "could not find commit %s"
-msgstr "не удалось найти коммит %s"
-
-#: commit-graph.c:732 builtin/pack-objects.c:2649
-#, c-format
-msgid "unable to get type of object %s"
-msgstr "не удалось получить тип объекта %s"
-
-#: commit-graph.c:765
-msgid "Loading known commits in commit graph"
-msgstr "Загрузка известных коммитов на граф коммитов"
-
-#: commit-graph.c:781
-msgid "Expanding reachable commits in commit graph"
-msgstr "Расширение достижимых коммитов на граф коммитов"
-
-#: commit-graph.c:793
-msgid "Clearing commit marks in commit graph"
-msgstr "Очистка пометок коммитов на графе коммитов"
-
-#: commit-graph.c:813
-msgid "Computing commit graph generation numbers"
-msgstr "Вычисление номеров поколений на графе коммитов"
-
-#: commit-graph.c:930
-#, 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 пакетах"
-msgstr[2] "Поиск коммитов для графа коммитов в %d пакетах"
-msgstr[3] "Поиск коммитов для графа коммитов в %d пакетах"
-
-#: commit-graph.c:943
-#, c-format
-msgid "error adding pack %s"
-msgstr "ошибка добавления пакета %s"
-
-#: commit-graph.c:945
-#, c-format
-msgid "error opening index for %s"
-msgstr "ошибка открытия индекса для %s"
-
-#: commit-graph.c:959
-#, 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 ссылкам"
-msgstr[2] "Поиск коммитов для графа коммитов по %d ссылкам"
-msgstr[3] "Поиск коммитов для графа коммитов по %d ссылкам"
-
-#: commit-graph.c:991
-msgid "Finding commits for commit graph among packed objects"
-msgstr "Поиск коммитов для графа коммитов среди упакованных объектов"
-
-#: commit-graph.c:1004
-msgid "Counting distinct commits in commit graph"
-msgstr "Вычисление количества отдельных коммитов на графе коммитов"
-
-#: commit-graph.c:1017
-#, c-format
-msgid "the commit graph format cannot write %d commits"
-msgstr "программе форматирования графа коммитов не удалось записать %d коммитов"
-
-#: commit-graph.c:1026
-msgid "Finding extra edges in commit graph"
-msgstr "Поиск дополнительных ребер на графе коммитов"
-
-#: commit-graph.c:1050
-msgid "too many commits to write graph"
-msgstr "слишком много коммитов для записи графа"
-
-#: commit-graph.c:1057 midx.c:819
-#, c-format
-msgid "unable to create leading directories of %s"
-msgstr "не удалось создать родительские каталоги для %s"
-
-#: commit-graph.c:1097
-#, 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 прохода"
-msgstr[2] "Запись графа коммитов в %d проходов"
-msgstr[3] "Запись графа коммитов в %d прохода"
-
-#: commit-graph.c:1162
-msgid "the commit-graph file has incorrect checksum and is likely corrupt"
-msgstr "файл commit-graph содержит неправильную контрольную сумму и скорее всего поврежден"
-
-#: commit-graph.c:1172
-#, c-format
-msgid "commit-graph has incorrect OID order: %s then %s"
-msgstr "файл commit-graph содержит неправильный порядок OID: %s, а затем %s"
-
-#: commit-graph.c:1182 commit-graph.c:1197
-#, c-format
-msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
-msgstr "файл commit-graph содержит неправильное значение fanout: fanout[%d] = %u != %u"
-
-#: commit-graph.c:1189
-#, c-format
-msgid "failed to parse commit %s from commit-graph"
-msgstr "не удалось разобрать коммит %s из файла commit-graph"
-
-#: commit-graph.c:1206
-msgid "Verifying commits in commit graph"
-msgstr "Проверка коммитов на графе коммитов"
-
-#: commit-graph.c:1219
-#, c-format
-msgid "failed to parse commit %s from object database for commit-graph"
-msgstr "не удалось разобрать коммит %s из базы объектов файла commit-graph"
-
-#: commit-graph.c:1226
-#, c-format
-msgid "root tree OID for commit %s in commit-graph is %s != %s"
-msgstr " в файле commit-graph OID корня дерева для коммита %s является %s != %s"
-
-#: commit-graph.c:1236
-#, c-format
-msgid "commit-graph parent list for commit %s is too long"
-msgstr "слишком большой список родителей файле commit-graph для коммита %s"
-
-#: commit-graph.c:1242
-#, c-format
-msgid "commit-graph parent for %s is %s != %s"
-msgstr "в файле commit-graph родитель для %s является %s != %s"
-
-#: commit-graph.c:1255
-#, c-format
-msgid "commit-graph parent list for commit %s terminates early"
-msgstr "в файле commit-graph список родителей для коммита %s закончился слишком рано"
-
-#: commit-graph.c:1260
-#, c-format
-msgid ""
-"commit-graph has generation number zero for commit %s, but non-zero "
-"elsewhere"
-msgstr "в файле commit-graph содержится нулевой номер поколения для коммита %s, но ненулевой в остальных случаях"
-
-#: commit-graph.c:1264
-#, c-format
-msgid ""
-"commit-graph has non-zero generation number for commit %s, but zero "
-"elsewhere"
-msgstr "в файле commit-graph содержится ненулевой номер поколения для коммита %s, но нулевой в остальных случаях"
-
-#: commit-graph.c:1279
-#, c-format
-msgid "commit-graph generation for commit %s is %u != %u"
-msgstr "в файле commit-graph номер поколения для коммита %s является %u != %u"
-
-#: commit-graph.c:1285
-#, c-format
-msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
-msgstr "в файле commit-graph дата коммита %s является %<PRIuMAX> != %<PRIuMAX>"
-
#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "память исчерпана"
-#: config.c:123
+#: config.c:125
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -1540,294 +2292,290 @@
"This might be due to circular includes."
msgstr ""
-#: config.c:139
+#: config.c:141
#, c-format
msgid "could not expand include path '%s'"
msgstr "не удалось раскрыть путь включения «%s»"
-#: config.c:150
+#: config.c:152
msgid "relative config includes must come from files"
msgstr "относительные включения конфигурации должны исходить из файлов"
-#: config.c:190
+#: config.c:198
msgid "relative config include conditionals must come from files"
msgstr "относительные условные включения конфигурации должны исходить из файлов"
-#: config.c:348
+#: config.c:378
#, c-format
msgid "key does not contain a section: %s"
msgstr ""
-#: config.c:354
+#: config.c:384
#, c-format
msgid "key does not contain variable name: %s"
msgstr ""
-#: config.c:378 sequencer.c:2459
+#: config.c:408 sequencer.c:2580
#, c-format
msgid "invalid key: %s"
msgstr "недействительный ключ: %s"
-#: config.c:384
+#: config.c:414
#, c-format
msgid "invalid key (newline): %s"
msgstr ""
-#: config.c:420 config.c:432
+#: config.c:450 config.c:462
#, c-format
msgid "bogus config parameter: %s"
msgstr ""
-#: config.c:467
+#: config.c:497
#, c-format
msgid "bogus format in %s"
msgstr ""
-#: config.c:793
+#: config.c:836
#, c-format
msgid "bad config line %d in blob %s"
msgstr "ошибка в %d строке двоичного объекта %s"
-#: config.c:797
+#: config.c:840
#, c-format
msgid "bad config line %d in file %s"
msgstr "ошибка в %d строке файла %s"
-#: config.c:801
+#: config.c:844
#, c-format
msgid "bad config line %d in standard input"
msgstr "ошибка в %d строке стандартного ввода"
-#: config.c:805
+#: config.c:848
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "ошибка в %d строке двоичного объекта подмодуля %s"
-#: config.c:809
+#: config.c:852
#, c-format
msgid "bad config line %d in command line %s"
msgstr "ошибка в %d строке коммандной строки %s"
-#: config.c:813
+#: config.c:856
#, c-format
msgid "bad config line %d in %s"
msgstr "ошибка в %d строке в %s"
-#: config.c:952
+#: config.c:993
msgid "out of range"
msgstr "вне диапазона"
-#: config.c:952
+#: config.c:993
msgid "invalid unit"
msgstr "неправильное число"
-#: config.c:958
+#: config.c:994
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "неправильное числовое значение «%s» для «%s»: %s"
-#: config.c:963
+#: config.c:1013
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr "неправильное числовое значение «%s» для «%s» в двоичном объекте %s: %s"
-#: config.c:966
+#: config.c:1016
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr "неправильное числовое значение «%s» для «%s» в файле %s: %s"
-#: config.c:969
+#: config.c:1019
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr "неправильное числовое значение «%s» для «%s» на стандартном вводе: %s"
-#: config.c:972
+#: config.c:1022
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr "неправильное числовое значение «%s» для «%s» в двоичном объекте подмодуля %s: %s"
-#: config.c:975
+#: 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:978
+#: config.c:1028
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "неправильное числовое значение «%s» для «%s» в %s: %s"
-#: config.c:1073
+#: config.c:1123
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "сбой разворачивания пути каталога пользователя: «%s»"
-#: config.c:1082
+#: config.c:1132
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "«%s» для «%s» не является допустимой меткой даты/времени"
-#: config.c:1173
+#: config.c:1223
#, c-format
msgid "abbrev length out of range: %d"
msgstr ""
-#: config.c:1187 config.c:1198
+#: config.c:1237 config.c:1248
#, c-format
msgid "bad zlib compression level %d"
msgstr "неправильный уровень сжатия zlib %d"
-#: config.c:1290
+#: config.c:1340
msgid "core.commentChar should only be one character"
msgstr ""
-#: config.c:1323
+#: config.c:1373
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "недопустимый режим создания объекта: %s"
-#: config.c:1395
+#: config.c:1445
#, c-format
msgid "malformed value for %s"
msgstr ""
-#: config.c:1421
+#: config.c:1471
#, c-format
msgid "malformed value for %s: %s"
msgstr ""
-#: config.c:1422
+#: config.c:1472
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr ""
-#: config.c:1483 builtin/pack-objects.c:3397
+#: config.c:1533 builtin/pack-objects.c:3649
#, c-format
msgid "bad pack compression level %d"
msgstr "неправильный уровень сжатия пакета %d"
-#: config.c:1604
+#: config.c:1655
#, c-format
msgid "unable to load config blob object '%s'"
msgstr ""
-#: config.c:1607
+#: config.c:1658
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr ""
-#: config.c:1624
+#: config.c:1675
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr ""
-#: config.c:1654
+#: config.c:1705
#, c-format
msgid "failed to parse %s"
msgstr ""
-#: config.c:1710
+#: config.c:1759
msgid "unable to parse command-line config"
msgstr "не удалось разобрать конфигурацию из командной строки"
-#: config.c:2059
+#: config.c:2122
msgid "unknown error occurred while reading the configuration files"
msgstr "произошла неизвестная ошибка при чтении файлов конфигурации"
-#: config.c:2229
+#: config.c:2296
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Недействительный %s: «%s»"
-#: config.c:2272
-#, c-format
-msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
-msgstr "неизвестное значение «%s» для core.untrackedCache; использую стандартное значение «keep»"
-
-#: config.c:2298
+#: config.c:2341
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "значение «%d» для splitIndex.maxPercentChange должно быть от 0 до 100"
-#: config.c:2344
+#: config.c:2387
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "не удалось разобрать «%s» в конфигурации из командной строки"
-#: config.c:2346
+#: config.c:2389
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "неправильная переменная конфигурации «%s» в файле «%s» на строке %d"
-#: config.c:2427
+#: config.c:2473
#, c-format
msgid "invalid section name '%s'"
msgstr ""
-#: config.c:2459
+#: config.c:2505
#, c-format
msgid "%s has multiple values"
msgstr "%s имеет несколько значений"
-#: config.c:2488
+#: config.c:2534
#, c-format
msgid "failed to write new configuration file %s"
msgstr ""
-#: config.c:2740 config.c:3064
+#: config.c:2786 config.c:3112
#, c-format
msgid "could not lock config file %s"
msgstr ""
-#: config.c:2751
+#: config.c:2797
#, c-format
msgid "opening %s"
msgstr ""
-#: config.c:2786 builtin/config.c:328
+#: config.c:2834 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr ""
-#: config.c:2811
+#: config.c:2859
#, c-format
msgid "invalid config file %s"
msgstr ""
-#: config.c:2824 config.c:3077
+#: config.c:2872 config.c:3125
#, c-format
msgid "fstat on %s failed"
msgstr "сбой при выполнении fstat на файле %s"
-#: config.c:2835
+#: config.c:2883
#, c-format
msgid "unable to mmap '%s'"
msgstr ""
-#: config.c:2844 config.c:3082
+#: config.c:2892 config.c:3130
#, c-format
msgid "chmod on %s failed"
msgstr ""
-#: config.c:2929 config.c:3179
+#: config.c:2977 config.c:3227
#, c-format
msgid "could not write config file %s"
msgstr ""
-#: config.c:2963
+#: config.c:3011
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "не удалось установить «%s» в «%s»"
-#: config.c:2965 builtin/remote.c:782
+#: config.c:3013 builtin/remote.c:657 builtin/remote.c:855
+#: builtin/remote.c:863
#, c-format
msgid "could not unset '%s'"
msgstr "не удалось сбросить значение для «%s»"
-#: config.c:3055
+#: config.c:3103
#, c-format
msgid "invalid section name: %s"
msgstr ""
-#: config.c:3222
+#: config.c:3270
#, c-format
msgid "missing value for '%s'"
msgstr ""
@@ -1849,79 +2597,88 @@
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"
@@ -1929,116 +2686,116 @@
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:85 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:97
+#: connected.c:120
msgid "Could not run 'git rev-list'"
msgstr "Не удалось запустить «git rev-list»"
-#: connected.c:117
+#: connected.c:144
msgid "failed write to rev-list"
msgstr "сбой записи в rev-list"
-#: connected.c:124
+#: 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 ""
-#: 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 "LF будет заменен на CRLF в %s"
-#: 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 "BOM запрещен в «%s», если кодируется как %s"
-#: convert.c:286
+#: convert.c:291
#, c-format
msgid ""
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as "
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
"working-tree-encoding."
-msgstr "Файл «%s» содержит маркер последовательности байтов (BOM). Используйте UTF-%s как кодировку рабочего каталога."
+msgstr ""
#: convert.c:304
#, c-format
@@ -2052,75 +2809,103 @@
"UTF-%sLE (depending on the byte order) as working-tree-encoding."
msgstr "Файл «%s» не содержит маркер последовательности байтов (BOM). Используйте 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 ""
-#: 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 "true/false не является допустимым значением для working-tree-encoding"
-#: 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"
@@ -2129,7 +2914,7 @@
msgstr[2] "%<PRIuMAX> секунд назад"
msgstr[3] "%<PRIuMAX> секунды назад"
-#: date.c:150
+#: date.c:151
#, c-format
msgid "%<PRIuMAX> minute ago"
msgid_plural "%<PRIuMAX> minutes ago"
@@ -2138,7 +2923,7 @@
msgstr[2] "%<PRIuMAX> минут назад"
msgstr[3] "%<PRIuMAX> минуты назад"
-#: date.c:157
+#: date.c:158
#, c-format
msgid "%<PRIuMAX> hour ago"
msgid_plural "%<PRIuMAX> hours ago"
@@ -2147,7 +2932,7 @@
msgstr[2] "%<PRIuMAX> часов назад"
msgstr[3] "%<PRIuMAX> часа назад"
-#: date.c:164
+#: date.c:165
#, c-format
msgid "%<PRIuMAX> day ago"
msgid_plural "%<PRIuMAX> days ago"
@@ -2156,7 +2941,7 @@
msgstr[2] "%<PRIuMAX> дней назад"
msgstr[3] "%<PRIuMAX> дня назад"
-#: date.c:170
+#: date.c:171
#, c-format
msgid "%<PRIuMAX> week ago"
msgid_plural "%<PRIuMAX> weeks ago"
@@ -2165,7 +2950,7 @@
msgstr[2] "%<PRIuMAX> недель назад"
msgstr[3] "%<PRIuMAX> недели назад"
-#: date.c:177
+#: date.c:178
#, c-format
msgid "%<PRIuMAX> month ago"
msgid_plural "%<PRIuMAX> months ago"
@@ -2174,7 +2959,7 @@
msgstr[2] "%<PRIuMAX> месяцев назад"
msgstr[3] "%<PRIuMAX> месяца назад"
-#: date.c:188
+#: date.c:189
#, c-format
msgid "%<PRIuMAX> year"
msgid_plural "%<PRIuMAX> years"
@@ -2184,7 +2969,7 @@
msgstr[3] "%<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"
@@ -2193,7 +2978,7 @@
msgstr[2] "%s, %<PRIuMAX> месяцев назад"
msgstr[3] "%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"
@@ -2221,19 +3006,30 @@
msgid "island regex from config has too many capture groups (max=%d)"
msgstr ""
-#: delta-islands.c:466
+#: delta-islands.c:467
#, c-format
msgid "Marked %d islands, done.\n"
msgstr ""
-#: diffcore-order.c:24
-#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "сбой чтения orderfile «%s»"
+#: diff-lib.c:534
+msgid "--merge-base does not work with ranges"
+msgstr ""
-#: diffcore-rename.c:544
-msgid "Performing inexact rename detection"
-msgstr "Выполняется неточное определение переименования"
+#: diff-lib.c:536
+msgid "--merge-base only works with commits"
+msgstr ""
+
+#: diff-lib.c:553
+msgid "unable to get HEAD"
+msgstr ""
+
+#: diff-lib.c:560
+msgid "no merge base found"
+msgstr ""
+
+#: diff-lib.c:562
+msgid "multiple merge bases found"
+msgstr ""
#: diff-no-index.c:238
msgid "git diff --no-index [<options>] <path> <path>"
@@ -2245,615 +3041,652 @@
"tree"
msgstr ""
-#: diff.c:155
+#: diff.c:156
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " Сбой разбора величины среза (cut-off) у dirstat «%s»\n"
-#: diff.c:160
+#: diff.c:161
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
-msgstr "Неизвестный параметр dirstat: «%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'"
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.submodule»: «%s»"
-#: diff.c:465
+#: diff.c:470
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr "Найдены ошибки в переменной «diff.dirstat»:\n%s"
-#: diff.c:4210
+#: diff.c:4276
#, c-format
msgid "external diff died, stopping at %s"
msgstr "критическая ошибка при внешнем сравнении, останов на %s"
-#: diff.c:4555
+#: diff.c:4625
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check и -s нельзя использовать одновременно"
-#: diff.c:4558
+#: diff.c:4628
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G, -S и --find-object нельзя использовать одновременно"
-#: diff.c:4636
+#: diff.c:4707
msgid "--follow requires exactly one pathspec"
msgstr "--follow требует ровно одного спецификатора пути"
-#: diff.c:4684
+#: diff.c:4755
#, c-format
msgid "invalid --stat value: %s"
msgstr ""
-#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5217
-#: parse-options.c:199 parse-options.c:203
+#: diff.c:4760 diff.c:4765 diff.c:4770 diff.c:4775 diff.c:5303
+#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
#, c-format
msgid "%s expects a numerical value"
msgstr ""
-#: diff.c:4721
+#: diff.c:4792
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr "Сбой разбора параметра опции --dirstat/-X :\n%s"
-#: diff.c:4806
+#: diff.c:4877
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr ""
-#: diff.c:4830
+#: diff.c:4901
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr ""
-#: diff.c:4844
+#: diff.c:4915
#, c-format
msgid "unable to resolve '%s'"
msgstr ""
-#: diff.c:4894 diff.c:4900
+#: diff.c:4965 diff.c:4971
#, c-format
msgid "%s expects <n>/<m> form"
msgstr ""
-#: diff.c:4912
+#: diff.c:4983
#, c-format
msgid "%s expects a character, got '%s'"
msgstr ""
-#: diff.c:4933
+#: diff.c:5004
#, c-format
msgid "bad --color-moved argument: %s"
msgstr ""
-#: diff.c:4952
+#: diff.c:5023
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr ""
-#: diff.c:4992
+#: diff.c:5063
msgid "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and \"histogram\""
msgstr ""
-#: diff.c:5028 diff.c:5048
+#: diff.c:5099 diff.c:5119
#, c-format
msgid "invalid argument to %s"
msgstr ""
-#: diff.c:5186
+#: diff.c:5223
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr ""
+
+#: diff.c:5272
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr ""
-#: diff.c:5242
+#: diff.c:5328
#, c-format
msgid "bad --word-diff argument: %s"
msgstr ""
-#: diff.c:5265
+#: diff.c:5351
msgid "Diff output format options"
msgstr ""
-#: diff.c:5267 diff.c:5273
+#: diff.c:5353 diff.c:5359
msgid "generate patch"
msgstr ""
-#: diff.c:5270 builtin/log.c:167
+#: diff.c:5356 builtin/log.c:178
msgid "suppress diff output"
msgstr "не выводить список изменений"
-#: diff.c:5275 diff.c:5389 diff.c:5396
+#: diff.c:5361 diff.c:5475 diff.c:5482
msgid "<n>"
msgstr ""
-#: diff.c:5276 diff.c:5279
+#: diff.c:5362 diff.c:5365
msgid "generate diffs with <n> lines context"
msgstr ""
-#: diff.c:5281
+#: diff.c:5367
msgid "generate the diff in raw format"
msgstr ""
-#: diff.c:5284
+#: diff.c:5370
msgid "synonym for '-p --raw'"
msgstr ""
-#: diff.c:5288
+#: diff.c:5374
msgid "synonym for '-p --stat'"
msgstr ""
-#: diff.c:5292
+#: diff.c:5378
msgid "machine friendly --stat"
msgstr ""
-#: diff.c:5295
+#: diff.c:5381
msgid "output only the last line of --stat"
msgstr ""
-#: diff.c:5297 diff.c:5305
+#: diff.c:5383 diff.c:5391
msgid "<param1,param2>..."
msgstr ""
-#: diff.c:5298
+#: diff.c:5384
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
-#: diff.c:5302
+#: diff.c:5388
msgid "synonym for --dirstat=cumulative"
msgstr ""
-#: diff.c:5306
+#: diff.c:5392
msgid "synonym for --dirstat=files,param1,param2..."
msgstr ""
-#: diff.c:5310
+#: diff.c:5396
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
-#: diff.c:5313
+#: diff.c:5399
msgid "condensed summary such as creations, renames and mode changes"
msgstr "краткая сводка изменений, вроде созданий, переименований или изменений режима доступа"
-#: diff.c:5316
+#: diff.c:5402
msgid "show only names of changed files"
msgstr ""
-#: diff.c:5319
+#: diff.c:5405
msgid "show only names and status of changed files"
msgstr ""
-#: diff.c:5321
+#: diff.c:5407
msgid "<width>[,<name-width>[,<count>]]"
msgstr ""
-#: diff.c:5322
+#: diff.c:5408
msgid "generate diffstat"
msgstr ""
-#: diff.c:5324 diff.c:5327 diff.c:5330
+#: diff.c:5410 diff.c:5413 diff.c:5416
msgid "<width>"
msgstr ""
-#: diff.c:5325
+#: diff.c:5411
msgid "generate diffstat with a given width"
msgstr ""
-#: diff.c:5328
+#: diff.c:5414
msgid "generate diffstat with a given name width"
msgstr ""
-#: diff.c:5331
+#: diff.c:5417
msgid "generate diffstat with a given graph width"
msgstr ""
-#: diff.c:5333
+#: diff.c:5419
msgid "<count>"
msgstr ""
-#: diff.c:5334
+#: diff.c:5420
msgid "generate diffstat with limited lines"
msgstr ""
-#: diff.c:5337
+#: diff.c:5423
msgid "generate compact summary in diffstat"
-msgstr "генерация компактной сводки изменений в diffstat"
+msgstr "генерация компактной сводки в diffstat"
-#: diff.c:5340
+#: diff.c:5426
msgid "output a binary diff that can be applied"
msgstr ""
-#: diff.c:5343
+#: diff.c:5429
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
-#: diff.c:5345
+#: diff.c:5431
msgid "show colored diff"
msgstr ""
-#: diff.c:5346
+#: diff.c:5432
msgid "<kind>"
msgstr ""
-#: diff.c:5347
+#: diff.c:5433
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgstr ""
-#: diff.c:5350
+#: diff.c:5436
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
msgstr ""
-#: diff.c:5353 diff.c:5356 diff.c:5359 diff.c:5465
+#: diff.c:5439 diff.c:5442 diff.c:5445 diff.c:5554
msgid "<prefix>"
msgstr ""
-#: diff.c:5354
+#: diff.c:5440
msgid "show the given source prefix instead of \"a/\""
msgstr ""
-#: diff.c:5357
+#: diff.c:5443
msgid "show the given destination prefix instead of \"b/\""
msgstr ""
-#: diff.c:5360
+#: diff.c:5446
msgid "prepend an additional prefix to every line of output"
msgstr ""
-#: diff.c:5363
+#: diff.c:5449
msgid "do not show any source or destination prefix"
msgstr ""
-#: diff.c:5366
+#: diff.c:5452
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
-#: diff.c:5370 diff.c:5375 diff.c:5380
+#: diff.c:5456 diff.c:5461 diff.c:5466
msgid "<char>"
msgstr ""
-#: diff.c:5371
+#: diff.c:5457
msgid "specify the character to indicate a new line instead of '+'"
msgstr ""
-#: diff.c:5376
+#: diff.c:5462
msgid "specify the character to indicate an old line instead of '-'"
msgstr ""
-#: diff.c:5381
+#: diff.c:5467
msgid "specify the character to indicate a context instead of ' '"
msgstr ""
-#: diff.c:5384
+#: diff.c:5470
msgid "Diff rename options"
msgstr ""
-#: diff.c:5385
+#: diff.c:5471
msgid "<n>[/<m>]"
msgstr ""
-#: diff.c:5386
+#: diff.c:5472
msgid "break complete rewrite changes into pairs of delete and create"
msgstr ""
-#: diff.c:5390
+#: diff.c:5476
msgid "detect renames"
msgstr ""
-#: diff.c:5394
+#: diff.c:5480
msgid "omit the preimage for deletes"
msgstr ""
-#: diff.c:5397
+#: diff.c:5483
msgid "detect copies"
msgstr ""
-#: diff.c:5401
+#: diff.c:5487
msgid "use unmodified files as source to find copies"
msgstr ""
-#: diff.c:5403
+#: diff.c:5489
msgid "disable rename detection"
msgstr ""
-#: diff.c:5406
+#: diff.c:5492
msgid "use empty blobs as rename source"
msgstr ""
-#: diff.c:5408
+#: diff.c:5494
msgid "continue listing the history of a file beyond renames"
msgstr ""
-#: diff.c:5411
+#: diff.c:5497
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr ""
-#: diff.c:5413
+#: diff.c:5499
msgid "Diff algorithm options"
msgstr ""
-#: diff.c:5415
+#: diff.c:5501
msgid "produce the smallest possible diff"
msgstr ""
-#: diff.c:5418
+#: diff.c:5504
msgid "ignore whitespace when comparing lines"
msgstr ""
-#: diff.c:5421
+#: diff.c:5507
msgid "ignore changes in amount of whitespace"
msgstr ""
-#: diff.c:5424
+#: diff.c:5510
msgid "ignore changes in whitespace at EOL"
msgstr ""
-#: diff.c:5427
+#: diff.c:5513
msgid "ignore carrier-return at the end of line"
msgstr ""
-#: diff.c:5430
+#: diff.c:5516
msgid "ignore changes whose lines are all blank"
msgstr ""
-#: diff.c:5433
-msgid "heuristic to shift diff hunk boundaries for easy reading"
-msgstr ""
-
-#: diff.c:5436
-msgid "generate diff using the \"patience diff\" algorithm"
-msgstr ""
-
-#: diff.c:5440
-msgid "generate diff using the \"histogram diff\" algorithm"
-msgstr ""
-
-#: diff.c:5442
-msgid "<algorithm>"
-msgstr ""
-
-#: diff.c:5443
-msgid "choose a diff algorithm"
-msgstr ""
-
-#: diff.c:5445
-msgid "<text>"
-msgstr ""
-
-#: diff.c:5446
-msgid "generate diff using the \"anchored diff\" algorithm"
-msgstr ""
-
-#: diff.c:5448 diff.c:5457 diff.c:5460
-msgid "<mode>"
-msgstr ""
-
-#: diff.c:5449
-msgid "show word diff, using <mode> to delimit changed words"
-msgstr ""
-
-#: diff.c:5451 diff.c:5454 diff.c:5499
+#: diff.c:5518 diff.c:5540 diff.c:5543 diff.c:5588
msgid "<regex>"
msgstr ""
-#: diff.c:5452
+#: diff.c:5519
+msgid "ignore changes whose all lines match <regex>"
+msgstr ""
+
+#: diff.c:5522
+msgid "heuristic to shift diff hunk boundaries for easy reading"
+msgstr ""
+
+#: diff.c:5525
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr ""
+
+#: diff.c:5529
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr ""
+
+#: diff.c:5531
+msgid "<algorithm>"
+msgstr ""
+
+#: diff.c:5532
+msgid "choose a diff algorithm"
+msgstr ""
+
+#: diff.c:5534
+msgid "<text>"
+msgstr ""
+
+#: diff.c:5535
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr ""
+
+#: diff.c:5537 diff.c:5546 diff.c:5549
+msgid "<mode>"
+msgstr ""
+
+#: diff.c:5538
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr ""
+
+#: diff.c:5541
msgid "use <regex> to decide what a word is"
msgstr ""
-#: diff.c:5455
+#: diff.c:5544
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr ""
-#: diff.c:5458
+#: diff.c:5547
msgid "moved lines of code are colored differently"
msgstr ""
-#: diff.c:5461
+#: diff.c:5550
msgid "how white spaces are ignored in --color-moved"
msgstr ""
-#: diff.c:5464
+#: diff.c:5553
msgid "Other diff options"
msgstr ""
-#: diff.c:5466
+#: diff.c:5555
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
-#: diff.c:5470
+#: diff.c:5559
msgid "treat all files as text"
msgstr ""
-#: diff.c:5472
+#: diff.c:5561
msgid "swap two inputs, reverse the diff"
msgstr ""
-#: diff.c:5474
+#: diff.c:5563
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr ""
-#: diff.c:5476
+#: diff.c:5565
msgid "disable all output of the program"
msgstr ""
-#: diff.c:5478
+#: diff.c:5567
msgid "allow an external diff helper to be executed"
msgstr ""
-#: diff.c:5480
+#: diff.c:5569
msgid "run external text conversion filters when comparing binary files"
msgstr ""
-#: diff.c:5482
+#: diff.c:5571
msgid "<when>"
msgstr ""
-#: diff.c:5483
+#: diff.c:5572
msgid "ignore changes to submodules in the diff generation"
msgstr ""
-#: diff.c:5486
+#: diff.c:5575
msgid "<format>"
msgstr ""
-#: diff.c:5487
+#: diff.c:5576
msgid "specify how differences in submodules are shown"
msgstr ""
-#: diff.c:5491
+#: diff.c:5580
msgid "hide 'git add -N' entries from the index"
msgstr ""
-#: diff.c:5494
+#: diff.c:5583
msgid "treat 'git add -N' entries as real in the index"
msgstr ""
-#: diff.c:5496
+#: diff.c:5585
msgid "<string>"
msgstr ""
-#: diff.c:5497
+#: diff.c:5586
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr ""
-#: diff.c:5500
+#: diff.c:5589
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr ""
-#: diff.c:5503
+#: diff.c:5592
msgid "show all changes in the changeset with -S or -G"
msgstr ""
-#: diff.c:5506
+#: diff.c:5595
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr ""
-#: diff.c:5509
+#: diff.c:5598
msgid "control the order in which files appear in the output"
msgstr ""
-#: diff.c:5510
+#: diff.c:5599
msgid "<object-id>"
msgstr ""
-#: diff.c:5511
+#: diff.c:5600
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr ""
-#: diff.c:5513
+#: diff.c:5602
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr ""
-#: diff.c:5514
+#: diff.c:5603
msgid "select files by diff type"
msgstr ""
-#: diff.c:5516
+#: diff.c:5605
msgid "<file>"
msgstr ""
-#: diff.c:5517
+#: diff.c:5606
msgid "Output to a specific file"
msgstr ""
-#: diff.c:6150
+#: diff.c:6263
msgid "inexact rename detection was skipped due to too many files."
msgstr "неточное определение переименования было пропущено из-за слишком большого количества файлов."
-#: diff.c:6153
+#: diff.c:6266
msgid "only found copies from modified paths due to too many files."
msgstr "найдены только копии из измененных путей из-за слишком большого количества файлов."
-#: diff.c:6156
+#: diff.c:6269
#, 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 "сбой чтения orderfile «%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 ""
-#: 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 "не удалось открыть каталог «%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 ""
-#: 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»"
@@ -2863,7 +3696,7 @@
msgid "bad git namespace path \"%s\""
msgstr ""
-#: environment.c:332
+#: environment.c:337
#, c-format
msgid "could not set GIT_DIR to '%s'"
msgstr ""
@@ -2873,289 +3706,285 @@
msgid "too many args to run %s"
msgstr ""
-#: fetch-object.c:17
-msgid "Remote with no URL"
-msgstr "Внешний репозиторий без URL"
-
-#: fetch-pack.c:151
+#: fetch-pack.c:177
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: ожидается передача списка для получение части"
-#: fetch-pack.c:154
+#: fetch-pack.c:180
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr ""
-#: fetch-pack.c:165
+#: fetch-pack.c:191
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack: ожидается ACK/NAK, а получен пустой пакет"
-#: fetch-pack.c:185
+#: fetch-pack.c:211
#, 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:222
msgid "unable to write to remote"
msgstr ""
-#: fetch-pack.c:258
+#: fetch-pack.c:283
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc требует multi_ack_detailed"
-#: fetch-pack.c:360 fetch-pack.c:1271
+#: fetch-pack.c:378 fetch-pack.c:1406
#, c-format
msgid "invalid shallow line: %s"
msgstr "неправильная строка частичного получения: %s"
-#: fetch-pack.c:366 fetch-pack.c:1277
+#: fetch-pack.c:384 fetch-pack.c:1412
#, c-format
msgid "invalid unshallow line: %s"
msgstr "неправильная строка полного получения: %s"
-#: fetch-pack.c:368 fetch-pack.c:1279
+#: fetch-pack.c:386 fetch-pack.c:1414
#, c-format
msgid "object not found: %s"
msgstr "объект не найден: %s"
-#: fetch-pack.c:371 fetch-pack.c:1282
+#: fetch-pack.c:389 fetch-pack.c:1417
#, c-format
msgid "error in object: %s"
msgstr "ошибка в объекте: %s"
-#: fetch-pack.c:373 fetch-pack.c:1284
+#: fetch-pack.c:391 fetch-pack.c:1419
#, c-format
msgid "no shallow found: %s"
msgstr "частичный клон не найден: %s"
-#: fetch-pack.c:376 fetch-pack.c:1288
+#: fetch-pack.c:394 fetch-pack.c:1423
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "ожидалось shallow/unshallow, а получено %s"
-#: fetch-pack.c:417
+#: fetch-pack.c:434
#, c-format
msgid "got %s %d %s"
msgstr "получено %s %d %s"
-#: fetch-pack.c:434
+#: fetch-pack.c:451
#, c-format
msgid "invalid commit %s"
msgstr "недопустимый коммит %s"
-#: fetch-pack.c:465
+#: fetch-pack.c:482
msgid "giving up"
msgstr "останавливаю дальнейшие попытки"
-#: fetch-pack.c:477 progress.c:284
+#: fetch-pack.c:495 progress.c:339
msgid "done"
msgstr "готово"
-#: fetch-pack.c:489
+#: fetch-pack.c:507
#, c-format
msgid "got %s (%d) %s"
msgstr "получено %s (%d) %s"
-#: fetch-pack.c:535
+#: fetch-pack.c:543
#, c-format
msgid "Marking %s as complete"
msgstr "Помечаю %s как завершенный"
-#: fetch-pack.c:744
+#: fetch-pack.c:758
#, c-format
msgid "already have %s (%s)"
msgstr "уже есть %s (%s)"
-#: fetch-pack.c:783
+#: fetch-pack.c:827
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: не удалось запустить программу разбора данных"
-#: fetch-pack.c:791
+#: fetch-pack.c:835
msgid "protocol error: bad pack header"
msgstr "ошибка протокола: неправильный заголовок потока"
-#: fetch-pack.c:859
+#: fetch-pack.c:919
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: не удалось запустить программу %s"
-#: fetch-pack.c:875
+#: fetch-pack.c:937
#, c-format
msgid "%s failed"
msgstr "%s завершен с ошибкой"
-#: fetch-pack.c:877
+#: fetch-pack.c:939
msgid "error in sideband demultiplexer"
msgstr "произошла ошибка в программе разбора данных"
-#: fetch-pack.c:906
-msgid "Server does not support shallow clients"
-msgstr "Сервер не поддерживает клиентов с частичным клонированием"
-
-#: fetch-pack.c:910
-msgid "Server supports multi_ack_detailed"
-msgstr "Сервер поддерживает multi_ack_detailed"
-
-#: fetch-pack.c:913
-msgid "Server supports no-done"
-msgstr "Сервер поддерживает no-done"
-
-#: fetch-pack.c:919
-msgid "Server supports multi_ack"
-msgstr "Сервер поддерживает multi_ack"
-
-#: fetch-pack.c:923
-msgid "Server supports side-band-64k"
-msgstr "Сервер поддерживает side-band-64k"
-
-#: fetch-pack.c:927
-msgid "Server supports side-band"
-msgstr "Сервер поддерживает side-band"
-
-#: fetch-pack.c:931
-msgid "Server supports allow-tip-sha1-in-want"
-msgstr "Сервер поддерживает allow-tip-sha1-in-want"
-
-#: fetch-pack.c:935
-msgid "Server supports allow-reachable-sha1-in-want"
-msgstr "Сервер поддерживает allow-reachable-sha1-in-want"
-
-#: fetch-pack.c:945
-msgid "Server supports ofs-delta"
-msgstr "Сервер поддерживает ofs-delta"
-
-#: fetch-pack.c:951 fetch-pack.c:1144
-msgid "Server supports filter"
-msgstr "Сервер поддерживает фильтрацию"
-
-#: fetch-pack.c:959
+#: fetch-pack.c:982
#, c-format
msgid "Server version is %.*s"
msgstr "Версия сервера %.*s"
-#: fetch-pack.c:965
+#: fetch-pack.c:990 fetch-pack.c:996 fetch-pack.c:999 fetch-pack.c:1005
+#: fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 fetch-pack.c:1021
+#: fetch-pack.c:1025 fetch-pack.c:1029 fetch-pack.c:1033 fetch-pack.c:1037
+#: fetch-pack.c:1043 fetch-pack.c:1049 fetch-pack.c:1054 fetch-pack.c:1059
+#, c-format
+msgid "Server supports %s"
+msgstr ""
+
+#: fetch-pack.c:992
+msgid "Server does not support shallow clients"
+msgstr "Сервер не поддерживает клиентов с частичным клонированием"
+
+#: fetch-pack.c:1052
msgid "Server does not support --shallow-since"
msgstr "Сервер не поддерживает --shallow-since"
-#: fetch-pack.c:969
+#: fetch-pack.c:1057
msgid "Server does not support --shallow-exclude"
msgstr "Сервер не поддерживает --shallow-exclude"
-#: fetch-pack.c:971
+#: fetch-pack.c:1061
msgid "Server does not support --deepen"
msgstr "Сервер не поддерживает --deepen"
-#: fetch-pack.c:988
+#: fetch-pack.c:1063
+msgid "Server does not support this repository's object format"
+msgstr ""
+
+#: fetch-pack.c:1076
msgid "no common commits"
msgstr "не общих коммитов"
-#: fetch-pack.c:1000 fetch-pack.c:1449
+#: fetch-pack.c:1088 fetch-pack.c:1628
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: ошибка при получении данных."
-#: fetch-pack.c:1138
+#: fetch-pack.c:1214
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr ""
+
+#: fetch-pack.c:1218
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr ""
+
+#: fetch-pack.c:1238
msgid "Server does not support shallow requests"
msgstr "Сервер не поддерживает частичные запросы"
-#: fetch-pack.c:1171
+#: fetch-pack.c:1245
+msgid "Server supports filter"
+msgstr "Сервер поддерживает фильтрацию"
+
+#: fetch-pack.c:1284
msgid "unable to write request to remote"
msgstr ""
-#: fetch-pack.c:1189
+#: fetch-pack.c:1302
#, c-format
msgid "error reading section header '%s'"
msgstr ""
-#: fetch-pack.c:1195
+#: fetch-pack.c:1308
#, c-format
msgid "expected '%s', received '%s'"
msgstr ""
-#: fetch-pack.c:1234
+#: fetch-pack.c:1369
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr ""
-#: fetch-pack.c:1239
+#: fetch-pack.c:1374
#, c-format
msgid "error processing acks: %d"
msgstr ""
-#: fetch-pack.c:1249
+#: fetch-pack.c:1384
msgid "expected packfile to be sent after 'ready'"
msgstr ""
-#: fetch-pack.c:1251
+#: fetch-pack.c:1386
msgid "expected no other sections to be sent after no 'ready'"
msgstr ""
-#: fetch-pack.c:1293
+#: fetch-pack.c:1428
#, c-format
msgid "error processing shallow info: %d"
msgstr ""
-#: fetch-pack.c:1340
+#: fetch-pack.c:1475
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr ""
-#: fetch-pack.c:1345
+#: fetch-pack.c:1480
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr ""
-#: fetch-pack.c:1350
+#: fetch-pack.c:1485
#, c-format
msgid "error processing wanted refs: %d"
msgstr ""
-#: fetch-pack.c:1676
+#: fetch-pack.c:1515
+msgid "git fetch-pack: expected response end packet"
+msgstr ""
+
+#: fetch-pack.c:1897
msgid "no matching remote head"
msgstr "нет соотвествующего внешнего указателя на ветку"
-#: fetch-pack.c:1699 builtin/clone.c:673
+#: fetch-pack.c:1920 builtin/clone.c:693
msgid "remote did not send all necessary objects"
msgstr "внешний репозиторий прислал не все необходимые объекты"
-#: fetch-pack.c:1726
+#: fetch-pack.c:1947
#, c-format
msgid "no such remote ref %s"
msgstr "нет такой внешней ссылки %s"
-#: fetch-pack.c:1729
+#: fetch-pack.c:1950
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Сервер не поддерживает запрос необъявленного объекта %s"
-#: gpg-interface.c:318
-msgid "gpg failed to sign the data"
-msgstr "gpg не удалось подписать данные"
-
-#: gpg-interface.c:344
+#: gpg-interface.c:272
msgid "could not create temporary file"
msgstr "не удалось создать временный файл"
-#: gpg-interface.c:347
+#: 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:2113
+#: grep.c:640
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
+msgstr ""
+
+#: grep.c:2100
#, c-format
msgid "'%s': unable to read %s"
msgstr "«%s»: не удалось прочесть %s"
-#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82
+#: grep.c:2117 setup.c:176 builtin/clone.c:412 builtin/diff.c:89
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr "не удалось выполнить stat «%s»"
-#: grep.c:2141
+#: grep.c:2128
#, c-format
msgid "'%s': short read"
msgstr "«%s»: слишком мало данных прочитано"
@@ -3205,79 +4034,79 @@
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 "Низкоуровневые команды / Внутренние вспомогательные"
-#: 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:97
+#: 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 ""
-#: 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:527
#, 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, но нам не удалось ее запустить. Возможно, git-%s не работает?"
-#: help.c:655
-msgid "Uh oh. Your system reports no Git commands at all."
-msgstr "Ой-ёй! Ваша система не сообщает ни о каких командах Git вообще."
-
-#: help.c:677
-#, c-format
-msgid "WARNING: You called a Git command named '%s', which does not exist."
-msgstr "Внимание: Вы запустили не существующую команду Git «%s»."
-
-#: help.c:682
-#, c-format
-msgid "Continuing under the assumption that you meant '%s'."
-msgstr "Продолжаю, предполагая, что вы имели в виду «%s»."
-
-#: help.c:687
-#, c-format
-msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
-msgstr "Продолжу через %0.1f секунд, предполагая, что вы имели в виду «%s»."
-
-#: help.c:695
+#: help.c:543 help.c:631
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: «%s» не является командой git. Смотрите «git --help»."
-#: help.c:699
+#: help.c:591
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "Ой-ёй! Ваша система не сообщает ни о каких командах Git вообще."
+
+#: help.c:613
+#, c-format
+msgid "WARNING: You called a Git command named '%s', which does not exist."
+msgstr "Внимание: Вы запустили не существующую команду Git «%s»."
+
+#: help.c:618
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr "Продолжаю, предполагая, что вы имели в виду «%s»."
+
+#: help.c:623
+#, c-format
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgstr "Продолжу через %0.1f секунд, предполагая, что вы имели в виду «%s»."
+
+#: help.c:635
msgid ""
"\n"
"The most similar command is"
@@ -3289,16 +4118,16 @@
msgstr[2] "\nСамые похожие команды:"
msgstr[3] "\nСамые похожие команды:"
-#: help.c:714
+#: help.c:675
msgid "git version [<options>]"
msgstr "git version [<options>]"
-#: help.c:782
+#: help.c:730
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s — %s"
-#: help.c:786
+#: help.c:734
msgid ""
"\n"
"Did you mean this?"
@@ -3310,7 +4139,15 @@
msgstr[2] "\nВозможно, вы имели в виду что-то из этого?"
msgstr[3] "\nВозможно, вы имели в виду что-то из этого?"
-#: 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"
@@ -3325,71 +4162,95 @@
"\n"
msgstr "\n*** Пожалуйста, скажите мне кто вы есть.\n\nЗапустите\n\n git config --global user.email \"you@example.com\"\n git config --global user.name \"Ваше Имя\"\n\nдля указания идентификационных данных аккаунта по умолчанию.\nПропустите параметр --global для указания данных только для этого репозитория.\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:608
+#: ident.c:454 builtin/commit.c:634
#, c-format
msgid "invalid date format: %s"
msgstr "неправильный формат даты: %s"
-#: list-objects.c:129
+#: 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
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr ""
+
+#: 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
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr ""
+
+#: list-objects-filter.c:495
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr ""
+
+#: list-objects.c:127
#, c-format
msgid "entry '%s' in tree %s has tree mode, but is not a tree"
msgstr ""
-#: 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 ""
-#: list-objects.c:378
+#: list-objects.c:375
#, c-format
msgid "unable to load root tree for commit %s"
msgstr ""
-#: list-objects-filter-options.c:36
-msgid "multiple filter-specs cannot be combined"
-msgstr "невозможно объединять фильтрацию с помощью нескольких спецификаций"
-
-#: list-objects-filter-options.c:58
-msgid "expected 'tree:<depth>'"
-msgstr ""
-
-#: list-objects-filter-options.c:84
-msgid "sparse:path filters support has been dropped"
-msgstr ""
-
-#: list-objects-filter-options.c:158
-msgid "cannot change partial clone promisor remote"
-msgstr "нельзя изменить внешний репозиторий при частичном клонировании"
-
-#: lockfile.c:151
+#: lockfile.c:152
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
@@ -3401,123 +4262,125 @@
"remove the file manually to continue."
msgstr "Не удалось создать «%s.lock»: %s.\n\nПохоже, что другой процесс git запущен в этом репозитории,\nнапример редактор открыт из «git commit». Пожалуйста, убедитесь,\nчто все процессы были завершены и потом попробуйте снова.\nЕсли это не поможет, то возможно процесс git был ранее завершен\nс ошибкой в этом репозитории: \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 "сбой чтения кэша"
+#: ls-refs.c:109
+msgid "expected flush after ls-refs arguments"
+msgstr ""
-#: merge.c:107 rerere.c:720 builtin/am.c:1887 builtin/am.c:1921
-#: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:773
-#: builtin/stash.c:264
-msgid "unable to write new index file"
-msgstr "не удалось записать новый файл индекса"
+#: merge-ort-wrappers.c:13 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:322
+#: merge-ort-wrappers.c:33 merge-recursive.c:3436
+#, c-format
+msgid "Already up to date!"
+msgstr "Уже обновлено!"
+
+#: 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:861
+#: merge-recursive.c:874
#, c-format
msgid "failed to create path '%s'%s"
msgstr "не удалось создать путь «%s»%s"
-#: merge-recursive.c:872
+#: merge-recursive.c:885
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Удаление %s, чтобы освободить место для подкаталогов\n"
-#: merge-recursive.c:886 merge-recursive.c:905
+#: merge-recursive.c:899 merge-recursive.c:918
msgid ": perhaps a D/F conflict?"
msgstr ": возможно, конфликт каталогов/файлов?"
-#: merge-recursive.c:895
+#: merge-recursive.c:908
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "отказ потери неотслеживаемого файла в «%s»"
-#: merge-recursive.c:936 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:939
+#: merge-recursive.c:954
#, c-format
msgid "blob expected for %s '%s'"
msgstr "ожидается двоичный объект для %s «%s»"
-#: merge-recursive.c:963
+#: merge-recursive.c:979
#, c-format
msgid "failed to open '%s': %s"
msgstr "не удалось открыть «%s»: %s"
-#: merge-recursive.c:974
+#: merge-recursive.c:990
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "не удалось создать символьную ссылку «%s»: %s"
-#: merge-recursive.c:979
+#: merge-recursive.c:995
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "не понятно, что делать с %06o %s «%s»"
-#: merge-recursive.c:1175
+#: merge-recursive.c:1191
#, c-format
msgid "Failed to merge submodule %s (not checked out)"
msgstr "Не удалось слить подмодуль %s (состояние не забрано)"
-#: merge-recursive.c:1182
+#: merge-recursive.c:1198
#, c-format
msgid "Failed to merge submodule %s (commits not present)"
msgstr "Не удалось слить подмодуль %s (нет коммитов)"
-#: merge-recursive.c:1189
+#: merge-recursive.c:1205
#, c-format
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
msgstr "Не удалось слить подмодуль %s (у коммитов другая база слияния)"
-#: merge-recursive.c:1197 merge-recursive.c:1209
+#: merge-recursive.c:1213 merge-recursive.c:1225
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
msgstr "Перемотка вперед подмодуля %s до указанного коммита:"
-#: merge-recursive.c:1200 merge-recursive.c:1212
+#: merge-recursive.c:1216 merge-recursive.c:1228
#, c-format
msgid "Fast-forwarding submodule %s"
msgstr "Перемотка вперед подмодуля %s"
-#: merge-recursive.c:1235
+#: merge-recursive.c:1251
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr "Не удалось слить подмодуль %s (нет указанных коммитов для слияния)"
-#: merge-recursive.c:1239
+#: merge-recursive.c:1255
#, c-format
msgid "Failed to merge submodule %s (not fast-forward)"
msgstr "Не удалось слить подмодуль %s (нельзя сделать перемотку вперед)"
-#: merge-recursive.c:1240
+#: merge-recursive.c:1256
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "Найдено возможное разрешение слиятия для подмодуля:\n"
-#: merge-recursive.c:1243
+#: merge-recursive.c:1259
#, c-format
msgid ""
"If this is correct simply add it to the index for example\n"
@@ -3528,108 +4391,108 @@
"which will accept this suggestion.\n"
msgstr "Если оно верное, то просто добавьте его в индекс, например так:\n\n git update-index --cacheinfo 160000 %s \"%s\"\n\nтем самым принимая это предположение.\n"
-#: merge-recursive.c:1252
+#: merge-recursive.c:1268
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "Не удалось слить подмодуль %s (найдено несколько слияний)"
-#: merge-recursive.c:1325
+#: merge-recursive.c:1341
msgid "Failed to execute internal merge"
msgstr "Не удалось запустить внутреннее слияние"
-#: merge-recursive.c:1330
+#: merge-recursive.c:1346
#, c-format
msgid "Unable to add %s to database"
msgstr "Не удалось добавить %s в базу данных"
-#: merge-recursive.c:1362
+#: merge-recursive.c:1378
#, c-format
msgid "Auto-merging %s"
msgstr "Автослияние %s"
-#: merge-recursive.c:1385
+#: 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:1457
+#: 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 "КОНФЛИКТ (%s/удаление): %s удалено в %s и %s в %s. Версия %s из %s оставлена в дереве."
-#: merge-recursive.c:1462
+#: 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 "КОНФЛИКТ (%s/удаление): %s удалено в %s и от %s до %s в %s. Версия %s из %s оставлена в дереве."
-#: merge-recursive.c:1469
+#: 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 "КОНФЛИКТ (%s/удаление): %s удалено в %s и %s в %s. Версия %s из %s оставлена в дереве на %s."
-#: merge-recursive.c:1474
+#: 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 "КОНФЛИКТ (%s/удаление): %s удалено в %s и от %s до %s в %s. Версия %s из %s оставлена в дереве на %s."
-#: merge-recursive.c:1509
+#: merge-recursive.c:1526
msgid "rename"
msgstr "переименование"
-#: merge-recursive.c:1509
+#: merge-recursive.c:1526
msgid "renamed"
msgstr "переименовано"
-#: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085
+#: 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:1599
+#: 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:1657
+#: merge-recursive.c:1645
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
msgstr ""
-#: merge-recursive.c:1687
+#: merge-recursive.c:1676
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s — это каталог в %s, добавляем как %s вместо этого"
-#: merge-recursive.c:1692
+#: merge-recursive.c:1681
#, c-format
msgid "Refusing to lose untracked file at %s; adding as %s instead"
msgstr "Отказ потери неотслеживаемого файла %s; добавление как %s взамен."
-#: merge-recursive.c:1711
+#: merge-recursive.c:1708
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
"\"%s\"->\"%s\" in \"%s\"%s"
msgstr "КОНФЛИКТ (переименование/переименование): Переименование «%s»→«%s» в ветке «%s» и переименование «%s»→«%s» в ветке «%s»%s"
-#: merge-recursive.c:1716
+#: merge-recursive.c:1713
msgid " (left unresolved)"
msgstr " (оставлено неразрешенным)"
-#: merge-recursive.c:1825
+#: 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:2030
+#: merge-recursive.c:2068
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -3637,157 +4500,146 @@
"getting a majority of the files."
msgstr ""
-#: merge-recursive.c:2062
+#: 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:2072
+#: 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:2164
+#: 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:2408
+#: merge-recursive.c:2447
#, c-format
msgid ""
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
"renamed."
msgstr ""
-#: merge-recursive.c:2929
+#: merge-recursive.c:2973
#, c-format
msgid "cannot read object %s"
msgstr "невозможно прочитать объект «%s»"
-#: merge-recursive.c:2932
+#: merge-recursive.c:2976
#, c-format
msgid "object %s is not a blob"
msgstr "объект %s не является двоичным объектом"
-#: merge-recursive.c:2996
+#: merge-recursive.c:3040
msgid "modify"
msgstr "изменение"
-#: merge-recursive.c:2996
+#: merge-recursive.c:3040
msgid "modified"
msgstr "изменено"
-#: merge-recursive.c:3008
+#: merge-recursive.c:3052
msgid "content"
msgstr "содержимое"
-#: merge-recursive.c:3012
+#: merge-recursive.c:3056
msgid "add/add"
msgstr "добавление/добавление"
-#: merge-recursive.c:3035
+#: merge-recursive.c:3079
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Пропуск %s (слиты одинаковые изменения как существующие)"
-#: merge-recursive.c:3057 git-submodule.sh:937
+#: merge-recursive.c:3101
msgid "submodule"
msgstr "подмодуль"
-#: merge-recursive.c:3058
+#: merge-recursive.c:3102
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "КОНФЛИКТ (%s): Конфликт слияния в %s"
-#: merge-recursive.c:3088
+#: merge-recursive.c:3132
#, c-format
msgid "Adding as %s instead"
msgstr "Добавление вместо этого как %s"
-#: merge-recursive.c:3170
+#: 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:3173
+#: 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:3177
+#: 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:3180
+#: 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:3294
+#: merge-recursive.c:3339
#, c-format
msgid "Removing %s"
msgstr "Удаление %s"
-#: merge-recursive.c:3317
+#: merge-recursive.c:3362
msgid "file/directory"
msgstr "файл/каталог"
-#: merge-recursive.c:3322
+#: merge-recursive.c:3367
msgid "directory/file"
msgstr "каталог/файл"
-#: merge-recursive.c:3329
+#: 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:3338
+#: merge-recursive.c:3383
#, c-format
msgid "Adding %s"
msgstr "Добавление %s"
-#: merge-recursive.c:3347
+#: merge-recursive.c:3392
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr ""
-#: merge-recursive.c:3385
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-" %s"
-msgstr ""
-
-#: merge-recursive.c:3396
-msgid "Already up to date!"
-msgstr "Уже обновлено!"
-
-#: merge-recursive.c:3405
+#: merge-recursive.c:3445
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "сбой слияния деревьев «%s» и «%s»"
-#: merge-recursive.c:3504
+#: merge-recursive.c:3550
msgid "Merging:"
msgstr "Слияние:"
-#: merge-recursive.c:3517
+#: merge-recursive.c:3563
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
@@ -3796,154 +4648,201 @@
msgstr[2] "найдено %u общих предков:"
msgstr[3] "найдено %u общих предков:"
-#: merge-recursive.c:3556
+#: merge-recursive.c:3613
msgid "merge returned no commit"
msgstr "слияние не вернуло коммит"
-#: merge-recursive.c:3622
+#: merge-recursive.c:3769
#, c-format
msgid "Could not parse object '%s'"
msgstr "Не удалось разобрать объект «%s»"
-#: merge-recursive.c:3638 builtin/merge.c:702 builtin/merge.c:873
+#: merge-recursive.c:3787 builtin/merge.c:711 builtin/merge.c:895
msgid "Unable to write index."
msgstr "Не удается записать индекс."
-#: midx.c:66
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "сбой чтения кэша"
+
+#: merge.c:109 rerere.c:720 builtin/am.c:1883 builtin/am.c:1917
+#: builtin/checkout.c:573 builtin/checkout.c:829 builtin/clone.c:817
+#: builtin/stash.c:265
+msgid "unable to write new index file"
+msgstr "не удалось записать новый файл индекса"
+
+#: midx.c:80
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr ""
-#: midx.c:82
+#: midx.c:96
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr ""
-#: midx.c:87
+#: midx.c:101
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr ""
-#: midx.c:92
-#, c-format
-msgid "hash version %u does not match"
-msgstr "версия хеш-суммы %u не соответсвует"
-
#: midx.c:106
+#, c-format
+msgid "multi-pack-index hash version %u does not match version %u"
+msgstr ""
+
+#: midx.c:123
msgid "invalid chunk offset (too large)"
msgstr ""
-#: midx.c:130
+#: midx.c:147
msgid "terminating multi-pack-index chunk id appears earlier than expected"
msgstr ""
-#: midx.c:143
+#: midx.c:160
msgid "multi-pack-index missing required pack-name chunk"
msgstr ""
-#: midx.c:145
+#: midx.c:162
msgid "multi-pack-index missing required OID fanout chunk"
msgstr ""
-#: midx.c:147
+#: midx.c:164
msgid "multi-pack-index missing required OID lookup chunk"
msgstr ""
-#: midx.c:149
+#: midx.c:166
msgid "multi-pack-index missing required object offsets chunk"
msgstr ""
-#: midx.c:163
+#: midx.c:180
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr ""
-#: midx.c:208
+#: midx.c:223
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr ""
-#: midx.c:258
+#: midx.c:273
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr ""
-#: midx.c:286
-msgid "error preparing packfile from multi-pack-index"
-msgstr ""
-
-#: midx.c:457
+#: midx.c:480
#, c-format
msgid "failed to add packfile '%s'"
msgstr ""
-#: midx.c:463
+#: midx.c:486
#, c-format
msgid "failed to open pack-index '%s'"
msgstr ""
-#: midx.c:557
+#: midx.c:546
#, c-format
msgid "failed to locate object %d in packfile"
msgstr ""
-#: midx.c:993
+#: midx.c:846
+msgid "Adding packfiles to multi-pack-index"
+msgstr ""
+
+#: midx.c:879
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr ""
+
+#: midx.c:931
+msgid "no pack files to index."
+msgstr ""
+
+#: midx.c:982
+msgid "Writing chunks to multi-pack-index"
+msgstr ""
+
+#: midx.c:1060
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr ""
-#: midx.c:1048
+#: midx.c:1116
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr ""
+
+#: midx.c:1124
msgid "Looking for referenced packfiles"
msgstr ""
-#: midx.c:1063
+#: midx.c:1139
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
-#: midx.c:1067
-msgid "Verifying OID order in MIDX"
+#: midx.c:1144
+msgid "the midx contains no oid"
msgstr ""
-#: midx.c:1076
+#: midx.c:1153
+msgid "Verifying OID order in multi-pack-index"
+msgstr ""
+
+#: midx.c:1162
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr ""
-#: midx.c:1095
+#: midx.c:1182
msgid "Sorting objects by packfile"
msgstr ""
-#: midx.c:1101
+#: midx.c:1189
msgid "Verifying object offsets"
msgstr ""
-#: midx.c:1117
+#: midx.c:1205
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr ""
-#: midx.c:1123
+#: midx.c:1211
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr ""
-#: midx.c:1132
+#: midx.c:1220
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr ""
-#: name-hash.c:531
+#: midx.c:1245
+msgid "Counting referenced objects"
+msgstr ""
+
+#: midx.c:1255
+msgid "Finding and deleting unreferenced packfiles"
+msgstr ""
+
+#: midx.c:1446
+msgid "could not start pack-objects"
+msgstr ""
+
+#: midx.c:1466
+msgid "could not finish pack-objects"
+msgstr ""
+
+#: name-hash.c:537
#, c-format
msgid "unable to create lazy_dir thread: %s"
msgstr ""
-#: name-hash.c:553
+#: name-hash.c:559
#, c-format
msgid "unable to create lazy_name thread: %s"
msgstr ""
-#: name-hash.c:559
+#: name-hash.c:565
#, c-format
msgid "unable to join lazy_name thread: %s"
msgstr ""
@@ -3982,130 +4881,50 @@
msgid "Bad %s value: '%s'"
msgstr "Неправильное значение переменной %s: «%s»"
-#: 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 "не удалось разобрать объект: %s"
-#: object.c:267 object.c:278
+#: object.c:266 object.c:278
#, c-format
msgid "hash mismatch %s"
-msgstr "несоответствие хеш-суммы %s"
+msgstr "несоответствие хэш-кода %s"
-#: packfile.c:617
+#: 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:615
msgid "offset before end of packfile (broken .idx?)"
msgstr "сдвиг до конца файла пакета (возможно, повреждён файл .idx?)"
-#: packfile.c:1868
+#: packfile.c:1907
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "сдвиг до начала индекса пакета для %s (повреждён индекс?)"
-#: packfile.c:1872
+#: packfile.c:1911
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "сдвиг за пределами индекса пакета для %s (обрезан индекс?)"
-#: parse-options.c:38
-#, c-format
-msgid "%s requires a value"
-msgstr ""
-
-#: parse-options.c:73
-#, c-format
-msgid "%s is incompatible with %s"
-msgstr ""
-
-#: parse-options.c:78
-#, c-format
-msgid "%s : incompatible with something else"
-msgstr ""
-
-#: parse-options.c:92 parse-options.c:96 parse-options.c:319
-#, c-format
-msgid "%s takes no value"
-msgstr ""
-
-#: parse-options.c:94
-#, c-format
-msgid "%s isn't available"
-msgstr ""
-
-#: parse-options.c:219
-#, c-format
-msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
-msgstr ""
-
-#: parse-options.c:389
-#, c-format
-msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
-msgstr ""
-
-#: parse-options.c:423 parse-options.c:431
-#, c-format
-msgid "did you mean `--%s` (with two dashes ?)"
-msgstr ""
-
-#: parse-options.c:859
-#, c-format
-msgid "unknown option `%s'"
-msgstr ""
-
-#: parse-options.c:861
-#, c-format
-msgid "unknown switch `%c'"
-msgstr ""
-
-#: parse-options.c:863
-#, c-format
-msgid "unknown non-ascii option in string: `%s'"
-msgstr ""
-
-#: parse-options.c:887
-msgid "..."
-msgstr "…"
-
-#: parse-options.c:906
-#, c-format
-msgid "usage: %s"
-msgstr "использование: %s"
-
-#. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation.
-#: parse-options.c:912
-#, c-format
-msgid " or: %s"
-msgstr " или: %s"
-
-#: parse-options.c:915
-#, c-format
-msgid " %s"
-msgstr " %s"
-
-#: parse-options.c:954
-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"
@@ -4121,87 +4940,177 @@
msgid "option `%s' expects \"always\", \"auto\", or \"never\""
msgstr ""
-#: parse-options-cb.c:130 parse-options-cb.c:147
+#: parse-options-cb.c:132 parse-options-cb.c:149
#, c-format
msgid "malformed object name '%s'"
msgstr "Неправильное имя объекта «%s»"
-#: path.c:897
+#: parse-options.c:38
+#, c-format
+msgid "%s requires a value"
+msgstr ""
+
+#: parse-options.c:73
+#, c-format
+msgid "%s is incompatible with %s"
+msgstr ""
+
+#: parse-options.c:78
+#, c-format
+msgid "%s : incompatible with something else"
+msgstr ""
+
+#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#, c-format
+msgid "%s takes no value"
+msgstr ""
+
+#: parse-options.c:94
+#, c-format
+msgid "%s isn't available"
+msgstr ""
+
+#: 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
+#, c-format
+msgid "unknown option `%s'"
+msgstr ""
+
+#: parse-options.c:864
+#, c-format
+msgid "unknown switch `%c'"
+msgstr ""
+
+#: parse-options.c:866
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
+msgstr ""
+
+#: 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:128
+#: pathspec.c:130
msgid "Escape character '\\' not allowed as last character in attr value"
msgstr "Управляющий символ «\\» не разрешен как последний символ в значении attr"
-#: 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"
msgstr "глобальная опция спецификатора пути «literal» не совместима с другими глобальными спецификаторами доступа"
-#: pathspec.c:304
+#: pathspec.c:306
msgid "invalid parameter for pathspec magic 'prefix'"
-msgstr "неправильный параметр для магического слова «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 ""
-#: 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 ""
+
#: pkt-line.c:92
msgid "unable to write flush packet"
msgstr ""
@@ -4211,44 +5120,48 @@
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:165
#, c-format
msgid "remote error: %s"
msgstr "ошибка внешнего репозитория: %s"
@@ -4262,233 +5175,272 @@
msgid "unable to create threaded lstat: %s"
msgstr ""
-#: pretty.c:966
+#: pretty.c:983
msgid "unable to parse --pretty format"
msgstr "не удалось разобрать формат для --pretty"
-#: range-diff.c:56
+#: 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:59
+#: range-diff.c:79
msgid "could not read `log` output"
msgstr ""
-#: range-diff.c:74 sequencer.c:4897
+#: range-diff.c:98 sequencer.c:5310
#, c-format
msgid "could not parse commit '%s'"
msgstr "не удалось разобрать коммит «%s»"
-#: range-diff.c:224
+#: 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:299
msgid "failed to generate diff"
msgstr ""
-#: range-diff.c:455 range-diff.c:457
+#: range-diff.c:532 range-diff.c:534
#, 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 "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"
"Using version %i"
msgstr "GIT_INDEX_VERSION указан, но значение недействительное.\nИспользую версию %i"
-#: 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:358
-#: builtin/checkout.c:672 builtin/checkout.c:1060 builtin/clean.c:955
-#: builtin/commit.c:344 builtin/diff-tree.c:120 builtin/grep.c:498
-#: 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:502 builtin/checkout.c:688 builtin/clean.c:991
+#: builtin/commit.c:364 builtin/diff-tree.c:122 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:1117
+#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1140
#, c-format
msgid "could not close '%s'"
msgstr "не удалось закрыть «%s»"
-#: read-cache.c:3092 sequencer.c:2354 sequencer.c:3807
+#: read-cache.c:3120 sequencer.c:2479 sequencer.c:4231
#, 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 ""
-#: 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 "Вы можете исправить это с помощью «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 "нераспознанная настройка %s для опции rebase.missingCommitsCheck. Игнорирую."
-#: rebase-interactive.c:35
+#: rebase-interactive.c:42
msgid ""
"\n"
"Commands:\n"
@@ -4510,7 +5462,7 @@
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr "\nКоманды:\np, pick <коммит> = использовать коммит\nr, reword <коммит> = использовать коммит, но изменить сообщение коммита\ne, edit <коммит> = использовать коммит, но остановиться для исправления\ns, squash <коммит> = использовать коммит, но объединить с предыдущим коммитом\nf, fixup <коммит> = как «squash», но пропустить сообщение коммита\nx, exec <команда> = выполнить команду (остаток строки) с помощью командной оболочки\nb, break = остановиться здесь (продолжить с помощью «git rebase --continue»)\nd, drop <коммит> = удалить коммит\nl, label <метка> = дать имя текущему HEAD\nt, reset <метка> = сбросить HEAD к указанной метке\nm, merge [-C <коммит> | -c <коммит>] <метка> [# <строка>]\n. создать слияние используя сообщение коммита оригинального\n. слияния (или использовать указанную строку, если оригинальное\n. слияние не указано). Используйте -c <коммит> чтобы изменить\n. сообщение коммита.\n\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)"
@@ -4519,19 +5471,19 @@
msgstr[2] ""
msgstr[3] ""
-#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:173
+#: 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:68 git-rebase--preserve-merges.sh:177
+#: 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:74 git-rebase--preserve-merges.sh:816
+#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -4540,36 +5492,33 @@
"\n"
msgstr "\nВы сейчас редактируете файл со списком дел для интерактивного перемещения.\nДля продолжения перемещения, после редактирования файла запустите:\n git rebase --continue\n\n"
-#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:893
+#: 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:85 git-rebase--preserve-merges.sh:900
-msgid "Note that empty commits are commented out"
-msgstr "Заметьте, что пустые коммиты закомментированны"
-
-#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3339
-#: sequencer.c:3365 sequencer.c:4996 builtin/fsck.c:356 builtin/rebase.c:235
+#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3607
+#: sequencer.c:3633 sequencer.c:5416 builtin/fsck.c:347 builtin/rebase.c:270
#, c-format
msgid "could not write '%s'"
msgstr "не удалось записать «%s»"
-#: rebase-interactive.c:108
+#: rebase-interactive.c:116 builtin/rebase.c:202 builtin/rebase.c:228
+#: builtin/rebase.c:252
#, c-format
-msgid "could not copy '%s' to '%s'."
-msgstr ""
+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"
"Dropped commits (newer to older):\n"
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"
@@ -4579,430 +5528,410 @@
"\n"
msgstr "Чтобы избежать этого сообщения, используйте «drop» чтобы явно удалить коммит.\n\nИспользуйте опцию «git config rebase.missingCommitsCheck» для изменения количества предупреждений.\nВозможные значения: ignore, warn, error.\n\n"
-#: refs.c:192
+#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2394
+#: builtin/rebase.c:188 builtin/rebase.c:213 builtin/rebase.c:239
+#: builtin/rebase.c:264
#, c-format
-msgid "%s does not point to a valid object!"
-msgstr ""
+msgid "could not read '%s'."
+msgstr "не удалось прочитать «%s»."
-#: refs.c:597
-#, c-format
-msgid "ignoring dangling symref %s"
-msgstr ""
-
-#: refs.c:599 ref-filter.c:1982
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr "игнорирую неправильную ссылку %s"
-
-#: refs.c:734
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "не удалось открыть «%s» для записи: %s"
-
-#: refs.c:744 refs.c:795
-#, c-format
-msgid "could not read ref '%s'"
-msgstr ""
-
-#: refs.c:750
-#, c-format
-msgid "ref '%s' already exists"
-msgstr ""
-
-#: refs.c:755
-#, c-format
-msgid "unexpected object ID when writing '%s'"
-msgstr ""
-
-#: refs.c:763 sequencer.c:400 sequencer.c:2679 sequencer.c:2805
-#: sequencer.c:2819 sequencer.c:3076 sequencer.c:4913 wrapper.c:656
-#, c-format
-msgid "could not write to '%s'"
-msgstr "не удалось записать в «%s»"
-
-#: refs.c:790 wrapper.c:225 wrapper.c:395 builtin/am.c:715
-#: builtin/rebase.c:993
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "не удалось открыть «%s» для записи"
-
-#: refs.c:797
-#, c-format
-msgid "unexpected object ID when deleting '%s'"
-msgstr ""
-
-#: refs.c:928
-#, c-format
-msgid "log for ref %s has gap after %s"
-msgstr ""
-
-#: refs.c:934
-#, c-format
-msgid "log for ref %s unexpectedly ended on %s"
-msgstr ""
-
-#: refs.c:993
-#, c-format
-msgid "log for %s is empty"
-msgstr ""
-
-#: refs.c:1085
-#, c-format
-msgid "refusing to update ref with bad name '%s'"
-msgstr ""
-
-#: refs.c:1161
-#, c-format
-msgid "update_ref failed for ref '%s': %s"
-msgstr ""
-
-#: refs.c:1942
-#, c-format
-msgid "multiple updates for ref '%s' not allowed"
-msgstr ""
-
-#: refs.c:1974
-msgid "ref updates forbidden inside quarantine environment"
-msgstr "обновление ссылок запрещено в изолированном окружении"
-
-#: refs.c:2070 refs.c:2100
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr ""
-
-#: refs.c:2076 refs.c:2111
-#, c-format
-msgid "cannot process '%s' and '%s' at the same time"
-msgstr ""
-
-#: 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
-#, c-format
-msgid "could not delete references: %s"
-msgstr "не удалось удалить ссылки: %s"
-
-#: refspec.c:137
-#, c-format
-msgid "invalid refspec '%s'"
-msgstr ""
-
-#: ref-filter.c:39 wt-status.c:1909
+#: ref-filter.c:42 wt-status.c:1973
msgid "gone"
msgstr "исчез"
-#: ref-filter.c:40
+#: ref-filter.c:43
#, c-format
msgid "ahead %d"
msgstr "впереди %d"
-#: ref-filter.c:41
+#: ref-filter.c:44
#, c-format
msgid "behind %d"
msgstr "позади %d"
-#: ref-filter.c:42
+#: ref-filter.c:45
#, c-format
msgid "ahead %d, behind %d"
msgstr "впереди %d, позади %d"
-#: ref-filter.c:138
+#: ref-filter.c:169
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "ожидаемый формат: %%(color:<color>)"
-#: ref-filter.c:140
+#: ref-filter.c:171
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "неопознанный цвет: %%(color:%s)"
-#: ref-filter.c:162
+#: ref-filter.c:193
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Ожидается целочисленное значение refname:lstrip=%s"
-#: ref-filter.c:166
+#: ref-filter.c:197
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Ожидается целочисленное значение refname:rstrip=%s"
-#: ref-filter.c:168
+#: ref-filter.c:199
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "неопознанный аргумент %%(%s): %s"
-#: ref-filter.c:223
+#: ref-filter.c:254
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr ""
-#: ref-filter.c:245
+#: ref-filter.c:276
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr ""
-#: ref-filter.c:253
+#: ref-filter.c:284
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr ""
-#: ref-filter.c:265
+#: ref-filter.c:296
#, c-format
msgid "%%(body) does not take arguments"
msgstr "параметр %%(body) не принимает аргументы"
-#: ref-filter.c:274
+#: ref-filter.c:309
#, c-format
-msgid "%%(subject) does not take arguments"
-msgstr "параметр %%(subject) не принимает аргументы"
+msgid "unrecognized %%(subject) argument: %s"
+msgstr ""
-#: ref-filter.c:296
+#: ref-filter.c:330
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "неизвестный аргумент для %%(trailers): %s"
-#: ref-filter.c:325
+#: ref-filter.c:363
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "положительное значение ожидает contents:lines=%s"
-#: ref-filter.c:327
+#: ref-filter.c:365
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "неопознанный аргумент %%(contents): %s"
-#: ref-filter.c:342
+#: 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 ""
-#: ref-filter.c:346
+#: ref-filter.c:384
#, c-format
-msgid "unrecognized %%(objectname) argument: %s"
-msgstr "неопознанный аргумент %%(objectname): %s"
+msgid "unrecognized argument '%s' in %%(%s)"
+msgstr ""
-#: ref-filter.c:376
+#: ref-filter.c:398
+#, c-format
+msgid "unrecognized email option: %s"
+msgstr ""
+
+#: ref-filter.c:428
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "ожидаемый формат: %%(align:<width>,<position>)"
-#: ref-filter.c:388
+#: ref-filter.c:440
#, c-format
msgid "unrecognized position:%s"
msgstr "неопознанная позиция:%s"
-#: ref-filter.c:395
+#: ref-filter.c:447
#, c-format
msgid "unrecognized width:%s"
msgstr "неопознанная ширина:%s"
-#: ref-filter.c:404
+#: ref-filter.c:456
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "неопознанный аргумент %%(align): %s"
-#: ref-filter.c:412
+#: ref-filter.c:464
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "ожидается положительная ширина с указанием частицы %%(align)"
-#: ref-filter.c:430
+#: ref-filter.c:482
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "неопознанный аргумент %%(if): %s"
-#: ref-filter.c:531
+#: ref-filter.c:584
#, c-format
msgid "malformed field name: %.*s"
msgstr "неправильное имя поля: %.*s"
-#: ref-filter.c:558
+#: ref-filter.c:611
#, c-format
msgid "unknown field name: %.*s"
msgstr "неизвестное имя поля: %.*s"
-#: ref-filter.c:562
+#: ref-filter.c:615
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
-#: ref-filter.c:686
+#: ref-filter.c:739
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "формат: частица %%(if) использована без частицы %%(then)"
-#: ref-filter.c:749
+#: ref-filter.c:802
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "формат: частица %%(then) использована без частицы %%(if)"
-#: ref-filter.c:751
+#: ref-filter.c:804
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "формат: частица %%(then) использована более одного раза"
-#: ref-filter.c:753
+#: ref-filter.c:806
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "формат: частица %%(then) использована после %%(else)"
-#: ref-filter.c:781
+#: ref-filter.c:834
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "формат: частица %%(else) использована без частицы %%(if)"
-#: ref-filter.c:783
+#: ref-filter.c:836
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "формат: частица %%(else) использована без частицы %%(then)"
-#: ref-filter.c:785
+#: ref-filter.c:838
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "формат: частица %%(else) использована более одного раза"
-#: ref-filter.c:800
+#: ref-filter.c:853
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "формат: частица %%(end) использована без соответствующей частицы"
-#: ref-filter.c:857
+#: ref-filter.c:910
#, c-format
msgid "malformed format string %s"
msgstr "неправильная строка формата %s"
-#: ref-filter.c:1453
+#: ref-filter.c:1549
#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "(нет ветки, перемещение %s)"
+msgid "no branch, rebasing %s"
+msgstr ""
-#: ref-filter.c:1456
+#: ref-filter.c:1552
#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
-msgstr "(нет ветки перемещение отделённого HEAD %s)"
+msgid "no branch, rebasing detached HEAD %s"
+msgstr ""
-#: ref-filter.c:1459
+#: ref-filter.c:1555
#, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "(нет ветки, двоичный поиск начат на %s)"
+msgid "no branch, bisect started on %s"
+msgstr ""
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached at " in wt-status.c
-#: ref-filter.c:1467
-#, c-format
-msgid "(HEAD detached at %s)"
-msgstr "(HEAD отделён на %s)"
+#: ref-filter.c:1565
+msgid "no branch"
+msgstr ""
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached from " in wt-status.c
-#: ref-filter.c:1474
-#, c-format
-msgid "(HEAD detached from %s)"
-msgstr "(HEAD отделён начиная с %s)"
-
-#: ref-filter.c:1478
-msgid "(no branch)"
-msgstr "(нет ветки)"
-
-#: ref-filter.c:1512 ref-filter.c:1669
+#: ref-filter.c:1599 ref-filter.c:1808
#, c-format
msgid "missing object %s for %s"
msgstr "не найден объект %s для %s"
-#: ref-filter.c:1522
+#: ref-filter.c:1609
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "сбой при выполнении parse_object_buffer на %s для %s"
-#: ref-filter.c:1888
+#: ref-filter.c:2062
#, c-format
msgid "malformed object at '%s'"
msgstr "Повреждённый объект «%s»"
-#: ref-filter.c:1977
+#: ref-filter.c:2151
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "игнорирую ссылку с неправильным именем %s"
-#: ref-filter.c:2263
+#: ref-filter.c:2156 refs.c:676
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "игнорирую неправильную ссылку %s"
+
+#: ref-filter.c:2472
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: пропущена частица %%(end)"
-#: ref-filter.c:2363
-#, c-format
-msgid "option `%s' is incompatible with --merged"
-msgstr ""
-
-#: ref-filter.c:2366
-#, c-format
-msgid "option `%s' is incompatible with --no-merged"
-msgstr ""
-
-#: ref-filter.c:2376
+#: ref-filter.c:2571
#, c-format
msgid "malformed object name %s"
msgstr "неправильное имя объекта %s"
-#: ref-filter.c:2381
+#: ref-filter.c:2576
#, c-format
msgid "option `%s' must point to a commit"
msgstr ""
-#: remote.c:363
+#: refs.c:264
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr ""
+
+#: refs.c:566
+#, c-format
+msgid ""
+"Using '%s' as the name for the initial branch. This default branch name\n"
+"is subject to change. To configure the initial branch name to use in all\n"
+"of your new repositories, which will suppress this warning, call:\n"
+"\n"
+"\tgit config --global init.defaultBranch <name>\n"
+"\n"
+"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"'development'. The just-created branch can be renamed via this command:\n"
+"\n"
+"\tgit branch -m <name>\n"
+msgstr ""
+
+#: refs.c:588
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr ""
+
+#: refs.c:598
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr ""
+
+#: refs.c:674
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr ""
+
+#: refs.c:911
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr ""
+
+#: refs.c:917
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr ""
+
+#: refs.c:976
+#, c-format
+msgid "log for %s is empty"
+msgstr ""
+
+#: refs.c:1068
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr ""
+
+#: refs.c:1139
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr ""
+
+#: refs.c:1963
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr ""
+
+#: refs.c:2043
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "обновление ссылок запрещено в изолированном окружении"
+
+#: refs.c:2054
+msgid "ref updates aborted by hook"
+msgstr ""
+
+#: refs.c:2154 refs.c:2184
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr ""
+
+#: refs.c:2160 refs.c:2195
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
+msgstr ""
+
+#: 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:170
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr ""
+
+#: 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 "Нельзя извлечь одновременно %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 ""
-#: 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 ""
@@ -5010,7 +5939,7 @@
#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
#. <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"
@@ -5024,7 +5953,7 @@
"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"
@@ -5032,7 +5961,7 @@
"'%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"
@@ -5040,7 +5969,7 @@
"'%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"
@@ -5048,7 +5977,7 @@
"'%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"
@@ -5056,103 +5985,103 @@
"'%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:1714 remote.c:1815
msgid "HEAD does not point to a branch"
msgstr "HEAD не указывает на ветку"
-#: remote.c:1633
+#: remote.c:1723
#, c-format
msgid "no such branch: '%s'"
msgstr "нет такой ветки: «%s»"
-#: remote.c:1636
+#: remote.c:1726
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "вышестоящая ветка не настроена для ветки «%s»"
-#: remote.c:1642
+#: remote.c:1732
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "вышестоящая ветка «%s» не сохранена как отслеживаемая ветка"
-#: remote.c:1657
+#: remote.c:1747
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "назначение для отправки «%s» на внешнем сервере «%s» не имеет локальной отслеживаемой ветки"
-#: remote.c:1669
+#: remote.c:1759
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "ветка «%s» не имеет внешнего сервера для отправки"
-#: remote.c:1679
+#: remote.c:1769
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "спецификаторы пути для отправки «%s» не включают в себя «%s»"
-#: remote.c:1692
+#: remote.c:1782
msgid "push has no destination (push.default is 'nothing')"
msgstr "отправка не имеет точки назначения (push.default выставлен в «nothing»)"
-#: remote.c:1714
+#: remote.c:1804
msgid "cannot resolve 'simple' push to a single destination"
msgstr "не удалось выполнить «simple» отправку в единственную точку назначения"
-#: remote.c:1840
+#: remote.c:1933
#, c-format
msgid "couldn't find remote ref %s"
msgstr ""
-#: remote.c:1853
+#: remote.c:1946
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr ""
-#: remote.c:2016
+#: remote.c:2109
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "Ваша ветка базируется на «%s», но вышестоящий репозиторий исчез.\n"
-#: remote.c:2020
+#: remote.c:2113
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
-msgstr "(для исправления запустите «git branch --unset-upstream»)\n"
+msgstr " (для исправления запустите «git branch --unset-upstream»)\n"
-#: remote.c:2023
+#: remote.c:2116
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "Ваша ветка обновлена в соответствии с «%s».\n"
-#: remote.c:2027
+#: remote.c:2120
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "Ваша ветка и «%s» указывают на разные коммиты.\n"
-#: remote.c:2030
+#: remote.c:2123
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (используйте «%s» для просмотра описания)\n"
-#: remote.c:2034
+#: remote.c:2127
#, 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"
@@ -5161,11 +6090,11 @@
msgstr[2] "Ваша ветка опережает «%s» на %d коммитов.\n"
msgstr[3] "Ваша ветка опережает «%s» на %d коммитов.\n"
-#: remote.c:2040
+#: remote.c:2133
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (используйте «git push», чтобы опубликовать ваши локальные коммиты)\n"
-#: remote.c:2043
+#: remote.c:2136
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -5175,11 +6104,11 @@
msgstr[2] "Ваша ветка отстает от «%s» на %d коммитов и может быть перемотана вперед.\n"
msgstr[3] "Ваша ветка отстает от «%s» на %d коммитов и может быть перемотана вперед.\n"
-#: remote.c:2051
+#: remote.c:2144
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (используйте «git pull», чтобы обновить вашу локальную ветку)\n"
-#: remote.c:2054
+#: remote.c:2147
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -5192,11 +6121,11 @@
msgstr[2] "Ваша ветка и «%s» разделились\nи теперь имеют %d и %d разных коммитов в каждой соответственно.\n"
msgstr[3] "Ваша ветка и «%s» разделились\nи теперь имеют %d и %d разных коммитов в каждой соответственно.\n"
-#: remote.c:2064
+#: remote.c:2157
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (используйте «git pull», чтобы слить внешнюю ветку в вашу)\n"
-#: remote.c:2247
+#: remote.c:2349
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr ""
@@ -5211,7 +6140,7 @@
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 ""
@@ -5274,8 +6203,8 @@
msgid "Recorded preimage for '%s'"
msgstr ""
-#: rerere.c:881 submodule.c:2024 builtin/log.c:1750
-#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1427
+#: rerere.c:881 submodule.c:2082 builtin/log.c:1992
+#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890
#, c-format
msgid "could not create directory '%s'"
msgstr "не удалось создать каталог «%s»"
@@ -5309,223 +6238,240 @@
msgid "unable to open rr-cache directory"
msgstr ""
-#: revision.c:2476
+#: reset.c:42
+msgid "could not determine HEAD revision"
+msgstr ""
+
+#: reset.c:70 reset.c:76 sequencer.c:3460
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "не удалось найти дерево для %s"
+
+#: revision.c:2336
+msgid "--unpacked=<packfile> no longer supported"
+msgstr ""
+
+#: revision.c:2356
+#, c-format
+msgid "unknown value for --diff-merges: %s"
+msgstr ""
+
+#: revision.c:2694
msgid "your current branch appears to be broken"
msgstr "похоже, ваша текущая ветка повреждена"
-#: revision.c:2479
+#: revision.c:2697
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "ваша текущая ветка «%s» еще не содержит ни одного коммита"
-#: revision.c:2679
-msgid "--first-parent is incompatible with --bisect"
-msgstr "опцию --first-parent нельзя использовать одновременно с --bisect"
-
-#: revision.c:2683
+#: revision.c:2907
msgid "-L does not yet support diff formats besides -p and -s"
msgstr ""
-#: run-command.c:763
+#: run-command.c:764
msgid "open /dev/null failed"
msgstr "сбой открытия /dev/null"
-#: run-command.c:1269
+#: run-command.c:1271
#, c-format
msgid "cannot create async thread: %s"
msgstr ""
-#: run-command.c:1333
+#: run-command.c:1335
#, 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:141
+#: send-pack.c:146
msgid "unexpected flush packet while reading remote unpack status"
msgstr "неожиданный пустой пакет при чтении статуса внешней распаковки"
-#: send-pack.c:143
+#: send-pack.c:148
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "не удалось разобрать статус внешней распаковки: %s"
-#: send-pack.c:145
+#: send-pack.c:150
#, c-format
msgid "remote unpack failed: %s"
msgstr "сбой при внешней распаковке %s"
-#: send-pack.c:306
+#: send-pack.c:374
msgid "failed to sign the push certificate"
msgstr "сбой подписания сертификата отправки"
-#: send-pack.c:420
+#: send-pack.c:467
+msgid "the receiving end does not support this repository's hash algorithm"
+msgstr ""
+
+#: send-pack.c:476
msgid "the receiving end does not support --signed push"
msgstr "принимающая сторона не поддерживает отправку с опцией --signed"
-#: send-pack.c:422
+#: send-pack.c:478
msgid ""
"not sending a push certificate since the receiving end does not support "
"--signed push"
msgstr "не отправляем сертификат для отправки, так как принимающая сторона не поддерживает отправку с опцией --signed"
-#: send-pack.c:434
+#: send-pack.c:490
msgid "the receiving end does not support --atomic push"
msgstr "принимающая сторона не поддерживает отправку с опцией --atomic"
-#: send-pack.c:439
+#: send-pack.c:495
msgid "the receiving end does not support push options"
msgstr "принимающая сторона не поддерживает отправку с опциями"
-#: sequencer.c:187
+#: sequencer.c:195
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "неправильный режим очистки сообщения коммита «%s»"
-#: sequencer.c:292
+#: sequencer.c:323
#, c-format
msgid "could not delete '%s'"
msgstr "не удалось удалить «%s»"
-#: sequencer.c:318
+#: sequencer.c:343 builtin/rebase.c:755 builtin/rebase.c:1596 builtin/rm.c:385
+#, c-format
+msgid "could not remove '%s'"
+msgstr "не удалось удалить «%s»"
+
+#: sequencer.c:353
msgid "revert"
msgstr "обратить изменения"
-#: sequencer.c:320
+#: sequencer.c:355
msgid "cherry-pick"
msgstr "копировать коммит"
-#: sequencer.c:322
-msgid "rebase -i"
-msgstr "rebase -i"
+#: sequencer.c:357
+msgid "rebase"
+msgstr ""
-#: sequencer.c:324
+#: sequencer.c:359
#, c-format
msgid "unknown action: %d"
msgstr ""
-#: sequencer.c:382
+#: sequencer.c:418
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
msgstr "после разрешения конфликтов, пометьте исправленные пути\nс помощью «git add <пути>» или «git rm <пути>»"
-#: sequencer.c:385
+#: sequencer.c:421
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 "после разрешения конфликтов, пометьте исправленные пути\nс помощью «git add <пути>» или «git rm <пути>»\nи сделайте коммит с помощью «git commit»"
-#: sequencer.c:398 sequencer.c:2801
+#: sequencer.c:434 sequencer.c:3062
#, c-format
msgid "could not lock '%s'"
msgstr "не удалось заблокировать «%s»"
-#: sequencer.c:405
+#: sequencer.c:436 sequencer.c:2861 sequencer.c:3066 sequencer.c:3080
+#: sequencer.c:3337 sequencer.c:5326 strbuf.c:1168 wrapper.c:631
+#, c-format
+msgid "could not write to '%s'"
+msgstr "не удалось записать в «%s»"
+
+#: sequencer.c:441
#, c-format
msgid "could not write eol to '%s'"
msgstr "не удалось записать eol в «%s»"
-#: sequencer.c:410 sequencer.c:2684 sequencer.c:2807 sequencer.c:2821
-#: sequencer.c:3084
+#: sequencer.c:446 sequencer.c:2866 sequencer.c:3068 sequencer.c:3082
+#: sequencer.c:3345
#, c-format
msgid "failed to finalize '%s'"
msgstr "не удалось завершить «%s»"
-#: sequencer.c:433 sequencer.c:978 sequencer.c:1652 sequencer.c:2704
-#: sequencer.c:3066 sequencer.c:3175 builtin/am.c:245 builtin/commit.c:760
-#: builtin/merge.c:1115 builtin/rebase.c:567
-#, c-format
-msgid "could not read '%s'"
-msgstr "не удалось прочитать «%s»"
-
-#: sequencer.c:459
+#: sequencer.c:485
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "ваши локальные изменения будут перезаписаны %s."
-#: sequencer.c:463
+#: sequencer.c:489
msgid "commit your changes or stash them to proceed."
msgstr "для продолжения закоммитьте ваши изменения или спрячьте их."
-#: sequencer.c:495
+#: sequencer.c:521
#, c-format
msgid "%s: fast-forward"
msgstr "%s: перемотка вперед"
-#: sequencer.c:534 builtin/tag.c:555
+#: sequencer.c:560 builtin/tag.c:566
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Неправильное значение режима очистки %s"
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase -i".
-#: sequencer.c:629
+#. "rebase".
+#: sequencer.c:670
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Не удалось записать файл индекса"
-#: sequencer.c:646
+#: sequencer.c:687
msgid "unable to update cache tree"
msgstr "не удалось обновить дерево кэша"
-#: sequencer.c:660
+#: sequencer.c:701
msgid "could not resolve HEAD commit"
msgstr "не удалось распознать HEAD коммит"
-#: sequencer.c:740
+#: sequencer.c:781
#, c-format
msgid "no key present in '%.*s'"
msgstr ""
-#: sequencer.c:751
+#: sequencer.c:792
#, c-format
msgid "unable to dequote value of '%s'"
msgstr ""
-#: sequencer.c:788 wrapper.c:227 wrapper.c:397 builtin/am.c:706
-#: builtin/am.c:798 builtin/merge.c:1112 builtin/rebase.c:1035
+#: sequencer.c:829 wrapper.c:201 wrapper.c:371 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1135 builtin/rebase.c:908
#, c-format
msgid "could not open '%s' for reading"
msgstr "не удалось открыть «%s» для чтения"
-#: sequencer.c:798
+#: sequencer.c:839
msgid "'GIT_AUTHOR_NAME' already given"
msgstr ""
-#: sequencer.c:803
+#: sequencer.c:844
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr ""
-#: sequencer.c:808
+#: sequencer.c:849
msgid "'GIT_AUTHOR_DATE' already given"
msgstr ""
-#: sequencer.c:812
+#: sequencer.c:853
#, c-format
msgid "unknown variable '%s'"
msgstr ""
-#: sequencer.c:817
+#: sequencer.c:858
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr ""
-#: sequencer.c:819
+#: sequencer.c:860
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr ""
-#: sequencer.c:821
+#: sequencer.c:862
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr ""
-#: sequencer.c:881
-#, c-format
-msgid "invalid date format '%s' in '%s'"
-msgstr ""
-
-#: sequencer.c:898
+#: sequencer.c:927
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -5542,15 +6488,11 @@
" git rebase --continue\n"
msgstr "у вас имеются проиндексированные изменения в рабочем каталоге. Если эти изменения должны быть объеденены с предыдущим коммитом, то запустите:\n\n git commit --amend %s\n\nЕсли же они должны быть помещены в новый коммит, то запустите:\n\n git commit %s\n\nВ любом случае, после того как вы закончите, продолжить перемещение можно выполнив:\n\n git rebase --continue\n"
-#: sequencer.c:992
-msgid "writing root commit"
-msgstr "запись коневого коммита"
-
-#: sequencer.c:1213
+#: sequencer.c:1208
msgid "'prepare-commit-msg' hook failed"
msgstr "ошибка при вызове перехватчика «prepare-commit-msg»"
-#: sequencer.c:1220
+#: sequencer.c:1214
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -5565,7 +6507,7 @@
" git commit --amend --reset-author\n"
msgstr "Ваше имя или электронная почта настроены автоматически на основании вашего\nимени пользователя и имени машины. Пожалуйста, проверьте, что они \nопределены правильно.\nВы можете отключить это уведомление установив их напрямую. Запустите следующую\nкоманду и следуйте инструкциям вашего текстового редактора, для\nредактирования вашего файла конфигурации:\n\n git config --global --edit\n\nПосле этого, изменить авторство этой коммита можно будет с помощью команды:\n\n git commit --amend --reset-author\n"
-#: sequencer.c:1233
+#: sequencer.c:1227
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -5579,305 +6521,354 @@
" git commit --amend --reset-author\n"
msgstr "Ваше имя или электронная почта настроены автоматически на основании вашего\nимени пользователя и имени машины. Пожалуйста, проверьте, что они \nопределены правильно.\nВы можете отключить это уведомление установив их напрямую:\n\n git config --global user.name \"Ваше Имя\"\n git config --global user.email you@example.com\n\nПосле этого, изменить авторство этой коммита можно будет с помощью команды:\n\n git commit --amend --reset-author\n"
-#: sequencer.c:1275
+#: sequencer.c:1269
msgid "couldn't look up newly created commit"
msgstr "нельзя запросить новосозданный коммит"
-#: sequencer.c:1277
+#: sequencer.c:1271
msgid "could not parse newly created commit"
msgstr "нельзя разобрать новосозданный коммит"
-#: sequencer.c:1323
+#: sequencer.c:1317
msgid "unable to resolve HEAD after creating commit"
msgstr "не удалось найти HEAD после создания коммита"
-#: sequencer.c:1325
+#: sequencer.c:1319
msgid "detached HEAD"
msgstr "отделённый HEAD"
-#: sequencer.c:1329
+#: sequencer.c:1323
msgid " (root-commit)"
msgstr " (корневой коммит)"
-#: sequencer.c:1350
+#: sequencer.c:1344
msgid "could not parse HEAD"
msgstr "не удалось разобрать HEAD"
-#: sequencer.c:1352
+#: sequencer.c:1346
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s не является коммитом!"
-#: sequencer.c:1356 builtin/commit.c:1551
+#: sequencer.c:1350 sequencer.c:1425 builtin/commit.c:1577
msgid "could not parse HEAD commit"
msgstr "не удалось разобрать HEAD коммит"
-#: sequencer.c:1408 sequencer.c:2001
+#: sequencer.c:1403 sequencer.c:2100
msgid "unable to parse commit author"
msgstr "не удалось разобрать автора коммита"
-#: sequencer.c:1418 builtin/am.c:1572 builtin/merge.c:688
+#: sequencer.c:1414 builtin/am.c:1566 builtin/merge.c:701
msgid "git write-tree failed to write a tree"
msgstr "git write-tree не удалось записать дерево"
-#: sequencer.c:1435 sequencer.c:1496
+#: sequencer.c:1447 sequencer.c:1565
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "не удалось прочитать сообщение коммита из «%s»"
-#: sequencer.c:1462 builtin/am.c:1594 builtin/commit.c:1650
-#: builtin/merge.c:882 builtin/merge.c:906
+#: sequencer.c:1476 sequencer.c:1508
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr ""
+
+#: sequencer.c:1482
+msgid "corrupt author: missing date information"
+msgstr ""
+
+#: sequencer.c:1521 builtin/am.c:1593 builtin/commit.c:1678
+#: builtin/merge.c:904 builtin/merge.c:929 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "сбой записи объекта коммита"
-#: sequencer.c:1523
+#: sequencer.c:1548 sequencer.c:4283 t/helper/test-fast-rebase.c:198
+#, c-format
+msgid "could not update %s"
+msgstr "не удалось обновить %s"
+
+#: sequencer.c:1597
#, c-format
msgid "could not parse commit %s"
msgstr "не удалось разобрать коммит %s"
-#: sequencer.c:1528
+#: sequencer.c:1602
#, c-format
msgid "could not parse parent commit %s"
msgstr "не удалось разобрать родительский коммит %s"
-#: sequencer.c:1602 sequencer.c:1712
+#: sequencer.c:1685 sequencer.c:1796
#, c-format
msgid "unknown command: %d"
msgstr "неизвестная команда: %d"
-#: sequencer.c:1659 sequencer.c:1684
+#: sequencer.c:1743 sequencer.c:1768
#, c-format
msgid "This is a combination of %d commits."
msgstr "Это объединение %d коммитов."
-#: sequencer.c:1669
+#: sequencer.c:1753
msgid "need a HEAD to fixup"
msgstr "нужен HEAD для исправления"
-#: sequencer.c:1671 sequencer.c:3111
+#: sequencer.c:1755 sequencer.c:3372
msgid "could not read HEAD"
msgstr "не удалось прочитать HEAD"
-#: sequencer.c:1673
+#: sequencer.c:1757
msgid "could not read HEAD's commit message"
msgstr "не удалось прочитать сообщение коммита текущего HEAD"
-#: sequencer.c:1679
+#: sequencer.c:1763
#, c-format
msgid "cannot write '%s'"
msgstr "не удалось записать «%s»"
-#: sequencer.c:1686 git-rebase--preserve-merges.sh:441
+#: sequencer.c:1770 git-rebase--preserve-merges.sh:486
msgid "This is the 1st commit message:"
msgstr "Это 1-е сообщение коммита:"
-#: sequencer.c:1694
+#: sequencer.c:1778
#, c-format
msgid "could not read commit message of %s"
msgstr "не удалось прочитать сообщение коммита для %s"
-#: sequencer.c:1701
+#: sequencer.c:1785
#, c-format
msgid "This is the commit message #%d:"
msgstr "Это сообщение коммита номер #%d:"
-#: sequencer.c:1707
+#: sequencer.c:1791
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Сообщение коммита номер #%d будет пропущено:"
-#: sequencer.c:1795
+#: sequencer.c:1879
msgid "your index file is unmerged."
msgstr "ваш индекс не слит."
-#: sequencer.c:1802
+#: sequencer.c:1886
msgid "cannot fixup root commit"
msgstr "нельзя исправить корневой коммит"
-#: sequencer.c:1821
+#: sequencer.c:1905
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "коммит %s — это коммит-слияние, но опция -m не указана."
-#: sequencer.c:1829 sequencer.c:1837
+#: sequencer.c:1913 sequencer.c:1921
#, c-format
msgid "commit %s does not have parent %d"
msgstr "у коммита %s нет предка %d"
-#: sequencer.c:1843
+#: sequencer.c:1927
#, 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:1862
+#: sequencer.c:1946
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: не удалось разобрать родительский коммит для %s"
-#: sequencer.c:1927
+#: sequencer.c:2011
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "не удалось переименовать «%s» в «%s»"
-#: sequencer.c:1982
+#: sequencer.c:2071
#, c-format
msgid "could not revert %s... %s"
msgstr "не удалось обратить изменения коммита %s… %s"
-#: sequencer.c:1983
+#: sequencer.c:2072
#, c-format
msgid "could not apply %s... %s"
msgstr "не удалось применить коммит %s… %s"
-#: sequencer.c:2042
+#: sequencer.c:2092
+#, c-format
+msgid "dropping %s %s -- patch contents already upstream\n"
+msgstr ""
+
+#: sequencer.c:2150
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: сбой чтения индекса"
-#: sequencer.c:2049
+#: sequencer.c:2157
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: сбой обновления индекса"
-#: sequencer.c:2118
+#: sequencer.c:2234
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "параметр %s не принимает аргументы: «%s»"
-#: sequencer.c:2127
+#: sequencer.c:2243
#, c-format
msgid "missing arguments for %s"
msgstr "пропущены аргументы для %s"
-#: sequencer.c:2164
+#: sequencer.c:2274
#, c-format
-msgid "could not parse '%.*s'"
+msgid "could not parse '%s'"
msgstr ""
-#: sequencer.c:2226
+#: sequencer.c:2335
#, c-format
msgid "invalid line %d: %.*s"
msgstr "неправильная строка %d: %.*s"
-#: sequencer.c:2237
+#: sequencer.c:2346
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "нельзя выполнить «%s» без указания предыдущего коммита"
-#: sequencer.c:2285 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:2432
+msgid "cancelling a cherry picking in progress"
+msgstr ""
-#: sequencer.c:2360
+#: sequencer.c:2441
+msgid "cancelling a revert in progress"
+msgstr ""
+
+#: sequencer.c:2485
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "пожалуйста исправьте это с помощью «git rebase --edit-todo»."
-#: sequencer.c:2362
+#: sequencer.c:2487
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "непригодная для использования карта с инструкциями: «%s»"
-#: sequencer.c:2367
+#: sequencer.c:2492
msgid "no commits parsed."
msgstr "коммиты не разобраны."
-#: sequencer.c:2378
+#: sequencer.c:2503
msgid "cannot cherry-pick during a revert."
msgstr "нельзя скопировать коммит во время процесса обращения коммита."
-#: sequencer.c:2380
+#: sequencer.c:2505
msgid "cannot revert during a cherry-pick."
msgstr "нельзя обратить изменения коммита во время копирования коммита."
-#: sequencer.c:2462
+#: sequencer.c:2583
#, c-format
msgid "invalid value for %s: %s"
msgstr "неправильное значение %s: %s"
-#: sequencer.c:2549
+#: sequencer.c:2690
msgid "unusable squash-onto"
msgstr "непригодный для использования уплотнить-над"
-#: sequencer.c:2565
+#: sequencer.c:2710
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "испорченная карта с опциями: «%s»"
-#: sequencer.c:2648 sequencer.c:4227
+#: sequencer.c:2803 sequencer.c:4636
msgid "empty commit set passed"
msgstr "передан пустой набор коммитов"
-#: sequencer.c:2656
-msgid "a cherry-pick or revert is already in progress"
-msgstr "копирование или обращение изменений коммита уже выполняются"
+#: sequencer.c:2820
+msgid "revert is already in progress"
+msgstr ""
-#: sequencer.c:2657
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
-msgstr "попробуйте «git cherry-pick (--continue | --quit | --abort)»"
+#: sequencer.c:2822
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr ""
-#: sequencer.c:2660
+#: sequencer.c:2825
+msgid "cherry-pick is already in progress"
+msgstr ""
+
+#: sequencer.c:2827
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr ""
+
+#: sequencer.c:2841
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "не удалось создать каталог для указателя следования коммитов «%s»"
-#: sequencer.c:2674
+#: sequencer.c:2856
msgid "could not lock HEAD"
msgstr "не удалось заблокировать HEAD"
-#: sequencer.c:2729 sequencer.c:3979
+#: sequencer.c:2916 sequencer.c:4371
msgid "no cherry-pick or revert in progress"
msgstr "копирование или обращение изменений коммита уже выполняются"
-#: sequencer.c:2731
+#: sequencer.c:2918 sequencer.c:2929
msgid "cannot resolve HEAD"
msgstr "не удалось определить HEAD"
-#: sequencer.c:2733 sequencer.c:2768
+#: sequencer.c:2920 sequencer.c:2964
msgid "cannot abort from a branch yet to be born"
msgstr "нельзя отменить изменения с ветки, которая еще не создана"
-#: sequencer.c:2754 builtin/grep.c:732
+#: sequencer.c:2950 builtin/grep.c:756
#, c-format
msgid "cannot open '%s'"
msgstr "не удалось открыть «%s»"
-#: sequencer.c:2756
+#: sequencer.c:2952
#, c-format
msgid "cannot read '%s': %s"
msgstr "не удалось прочитать «%s»: %s"
-#: sequencer.c:2757
+#: sequencer.c:2953
msgid "unexpected end of file"
msgstr "неожиданный конец файла"
-#: sequencer.c:2763
+#: sequencer.c:2959
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "сохраненный файл с HEAD перед копированием коммита «%s» поврежден"
-#: sequencer.c:2774
+#: sequencer.c:2970
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "Похоже, что вы переместили HEAD. Перемотка не выполняется, проверьте свой указатель HEAD!"
-#: sequencer.c:2903 sequencer.c:3894
-#, c-format
-msgid "could not update %s"
-msgstr "не удалось обновить %s"
+#: sequencer.c:3011
+msgid "no revert in progress"
+msgstr ""
-#: sequencer.c:2941 sequencer.c:3874
+#: sequencer.c:3020
+msgid "no cherry-pick in progress"
+msgstr ""
+
+#: sequencer.c:3030
+msgid "failed to skip the commit"
+msgstr ""
+
+#: sequencer.c:3037
+msgid "there is nothing to skip"
+msgstr ""
+
+#: sequencer.c:3040
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+
+#: sequencer.c:3202 sequencer.c:4263
msgid "cannot read HEAD"
msgstr "не удалось прочитать HEAD"
-#: sequencer.c:2958
+#: sequencer.c:3219
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr ""
-#: sequencer.c:2966
+#: sequencer.c:3227
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -5889,27 +6880,27 @@
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:2976
+#: sequencer.c:3237
#, c-format
msgid "Could not apply %s... %.*s"
msgstr ""
-#: sequencer.c:2983
+#: sequencer.c:3244
#, c-format
msgid "Could not merge %.*s"
msgstr ""
-#: sequencer.c:2997 sequencer.c:3001 builtin/difftool.c:633
+#: sequencer.c:3258 sequencer.c:3262 builtin/difftool.c:640
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "не удалось скопировать «%s» в «%s»"
-#: sequencer.c:3023 sequencer.c:3446 builtin/rebase.c:839
-#: builtin/rebase.c:1580 builtin/rebase.c:1940 builtin/rebase.c:1995
-msgid "could not read index"
-msgstr "не удалось прочитать индекс"
+#: sequencer.c:3274
+#, c-format
+msgid "Executing: %s\n"
+msgstr ""
-#: sequencer.c:3028
+#: sequencer.c:3289
#, c-format
msgid ""
"execution failed: %s\n"
@@ -5919,11 +6910,11 @@
"\n"
msgstr "ошибка выполнения: %s\n%sВы можете исправить ошибку, а затем запустить\n\n git rebase --continue\n\n"
-#: sequencer.c:3034
+#: sequencer.c:3295
msgid "and made changes to the index and/or the working tree\n"
msgstr "и были сделаны изменения в индексе и/или в рабочем каталоге\n"
-#: sequencer.c:3040
+#: sequencer.c:3301
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -5934,108 +6925,120 @@
"\n"
msgstr "успешное выполнение: %s\nно остались изменения в индексе и/или в рабочем каталоге\nСделайте коммит или спрячьте ваши изменения, а затем выполните\n\n git rebase --continue\n\n"
-#: sequencer.c:3101
+#: sequencer.c:3362
#, c-format
msgid "illegal label name: '%.*s'"
msgstr ""
-#: sequencer.c:3155
+#: sequencer.c:3416
msgid "writing fake root commit"
msgstr "запись поддельного корневого коммита"
-#: sequencer.c:3160
+#: sequencer.c:3421
msgid "writing squash-onto"
msgstr "запить уплотнить-над"
-#: sequencer.c:3198 builtin/rebase.c:844 builtin/rebase.c:850
-#, c-format
-msgid "failed to find tree of %s"
-msgstr "не удалось найти дерево для %s"
-
-#: sequencer.c:3216 builtin/rebase.c:863
-msgid "could not write index"
-msgstr "не удалось записать индекс"
-
-#: sequencer.c:3243
+#: sequencer.c:3505
#, c-format
msgid "could not resolve '%s'"
msgstr "не удалось распознать «%s»"
-#: sequencer.c:3271
+#: sequencer.c:3538
msgid "cannot merge without a current revision"
msgstr "нельзя слить без текущей редакции"
-#: sequencer.c:3293
+#: sequencer.c:3560
#, c-format
msgid "unable to parse '%.*s'"
msgstr ""
-#: sequencer.c:3302
+#: sequencer.c:3569
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr ""
-#: sequencer.c:3314
+#: sequencer.c:3581
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr ""
-#: sequencer.c:3329
+#: sequencer.c:3597
#, c-format
msgid "could not get commit message of '%s'"
msgstr "не удалось получить сообщение коммита для «%s»"
-#: sequencer.c:3478
+#: sequencer.c:3780
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "не удалось даже попытаться слить «%.*s»"
-#: sequencer.c:3494
+#: sequencer.c:3796
msgid "merge: Unable to write new index file"
msgstr "слияние: Не удалось записать файл индекса"
-#: sequencer.c:3562 builtin/rebase.c:711
+#: sequencer.c:3870
+msgid "Cannot autostash"
+msgstr "Не удалось автоматически спрятать изменения"
+
+#: sequencer.c:3873
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr ""
+
+#: sequencer.c:3879
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr ""
+
+#: sequencer.c:3882
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr ""
+
+#: sequencer.c:3886
+msgid "could not reset --hard"
+msgstr ""
+
+#: sequencer.c:3911
#, c-format
msgid "Applied autostash.\n"
msgstr "Применены автоматически спрятанные изменения.\n"
-#: sequencer.c:3574
+#: sequencer.c:3923
#, c-format
msgid "cannot store %s"
msgstr "не удалось сохранить %s"
-#: sequencer.c:3577 builtin/rebase.c:727
+#: sequencer.c:3926
#, 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Ваши изменения спрятаны и в безопасности.\nВы можете выполнить «git stash pop» или «git stash drop» в любой момент.\n"
-
-#: sequencer.c:3638
-#, c-format
-msgid "could not checkout %s"
msgstr ""
-#: sequencer.c:3652
-#, c-format
-msgid "%s: not a valid OID"
+#: sequencer.c:3931
+msgid "Applying autostash resulted in conflicts."
msgstr ""
-#: sequencer.c:3657 git-rebase--preserve-merges.sh:724
+#: sequencer.c:3932
+msgid "Autostash exists; creating a new stash entry."
+msgstr ""
+
+#: sequencer.c:4025 git-rebase--preserve-merges.sh:769
msgid "could not detach HEAD"
msgstr "не удалось отделить HEAD"
-#: sequencer.c:3672
+#: sequencer.c:4040
#, c-format
msgid "Stopped at HEAD\n"
msgstr ""
-#: sequencer.c:3674
+#: sequencer.c:4042
#, c-format
msgid "Stopped at %s\n"
msgstr ""
-#: sequencer.c:3682
+#: sequencer.c:4050
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -6048,120 +7051,124 @@
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:3759
+#: sequencer.c:4096
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr ""
+
+#: sequencer.c:4141
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Остановлено на %s … %.*s\n"
-#: sequencer.c:3837
+#: sequencer.c:4212
#, c-format
msgid "unknown command %d"
msgstr "неизвестная команда %d"
-#: sequencer.c:3882
+#: sequencer.c:4271
msgid "could not read orig-head"
msgstr "не удалось прочитать orig-head"
-#: sequencer.c:3887
+#: sequencer.c:4276
msgid "could not read 'onto'"
msgstr "не удалось прочитать «onto»"
-#: sequencer.c:3901
+#: sequencer.c:4290
#, c-format
msgid "could not update HEAD to %s"
msgstr "не удалось обновить HEAD на %s"
-#: sequencer.c:3991
+#: sequencer.c:4350
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr ""
+
+#: sequencer.c:4383
msgid "cannot rebase: You have unstaged changes."
msgstr "не удалось выполнить перемещение коммитов: У вас есть непроиндексированные изменения."
-#: sequencer.c:4000
+#: sequencer.c:4392
msgid "cannot amend non-existing commit"
msgstr "не удалось исправить несуществующий коммит"
-#: sequencer.c:4002
+#: sequencer.c:4394
#, c-format
msgid "invalid file: '%s'"
msgstr "недопустимый файл: «%s»"
-#: sequencer.c:4004
+#: sequencer.c:4396
#, c-format
msgid "invalid contents: '%s'"
msgstr "недопустимое содержимое: «%s»"
-#: sequencer.c:4007
+#: sequencer.c:4399
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:4043 sequencer.c:4081
+#: sequencer.c:4435 sequencer.c:4474
#, c-format
msgid "could not write file: '%s'"
msgstr ""
-#: sequencer.c:4096
+#: sequencer.c:4490
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "не удалось удалить CHERRY_PICK_HEAD"
-#: sequencer.c:4103
+#: sequencer.c:4497
msgid "could not commit staged changes."
msgstr "не удалось закоммитить проиндексированные изменения."
-#: sequencer.c:4204
+#: sequencer.c:4613
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: не удалось скопировать коммит %s"
-#: sequencer.c:4208
+#: sequencer.c:4617
#, c-format
msgid "%s: bad revision"
msgstr "%s: плохая редакция"
-#: sequencer.c:4243
+#: sequencer.c:4652
msgid "can't revert as initial commit"
msgstr "нельзя возвратить изначальный коммит"
-#: sequencer.c:4686
+#: sequencer.c:5129
msgid "make_script: unhandled options"
msgstr "make_script: не обработанные опции"
-#: sequencer.c:4689
+#: sequencer.c:5132
msgid "make_script: error preparing revisions"
msgstr "make_script: ошибка при обновлении редакций"
-#: sequencer.c:4847
-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:4959 sequencer.c:4976
+#: sequencer.c:5374 sequencer.c:5391
msgid "nothing to do"
msgstr ""
-#: sequencer.c:4990
+#: sequencer.c:5410
msgid "could not skip unnecessary pick commands"
msgstr ""
-#: sequencer.c:5073
+#: sequencer.c:5504
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 ""
-#: 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 "%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"
@@ -6169,12 +7176,12 @@
"'git <command> [<revision>...] -- [<file>...]'"
msgstr "неоднозначный аргумент «%s»: неизвестная редакция или не путь в рабочем каталоге.\nИспользуйте «--» для отделения путей от редакций, вот так:\n«git <команда> [<редакция>…] -- [<файл>…]»"
-#: 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"
@@ -6182,387 +7189,547 @@
"'git <command> [<revision>...] -- [<file>...]'"
msgstr "неоднозначный аргумент «%s»: является одновременно и редакцией и именем файла.\nИспользуйте «--» для отделения путей от редакций, вот так:\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 ""
+
+#: 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 "не удалось выполнить 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 "не удалось вернуться в cwd"
-#: 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"
"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
msgstr "не найден 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"
"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 "сбой открытия /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:480
#, c-format
msgid "object directory %s does not exist; check .git/objects/info/alternates"
msgstr ""
-#: sha1-file.c:504
+#: sha1-file.c:531
#, c-format
msgid "unable to normalize alternate object path: %s"
msgstr ""
-#: sha1-file.c:576
+#: sha1-file.c:603
#, c-format
msgid "%s: ignoring alternate object stores, nesting too deep"
msgstr ""
-#: sha1-file.c:583
+#: sha1-file.c:610
#, c-format
msgid "unable to normalize object directory: %s"
msgstr ""
-#: sha1-file.c:626
+#: sha1-file.c:653
msgid "unable to fdopen alternates lockfile"
msgstr ""
-#: sha1-file.c:644
+#: sha1-file.c:671
msgid "unable to read alternates file"
msgstr ""
-#: sha1-file.c:651
+#: sha1-file.c:678
msgid "unable to move new alternates file into place"
msgstr ""
-#: sha1-file.c:686
+#: sha1-file.c:713
#, c-format
msgid "path '%s' does not exist"
msgstr "путь «%s» не существует"
-#: sha1-file.c:712
+#: sha1-file.c:734
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "ссылаемый репозиторий «%s» как связанное состояние, пока не поддерживается."
-#: sha1-file.c:718
+#: sha1-file.c:740
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "ссылаемый репозиторий «%s» не является локальным."
-#: sha1-file.c:724
+#: sha1-file.c:746
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "ссылаемый репозиторий «%s» является частичным"
-#: sha1-file.c:732
+#: sha1-file.c:754
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "ссылаемый репозиторий «%s» является сращенным"
-#: sha1-file.c:846
+#: sha1-file.c:814
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr ""
+
+#: sha1-file.c:964
#, c-format
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
msgstr ""
-#: sha1-file.c:871
+#: sha1-file.c:985
msgid "mmap failed"
msgstr ""
-#: sha1-file.c:1035
+#: sha1-file.c:1149
#, c-format
msgid "object file %s is empty"
msgstr ""
-#: sha1-file.c:1159 sha1-file.c:2297
+#: sha1-file.c:1284 sha1-file.c:2477
#, c-format
msgid "corrupt loose object '%s'"
msgstr ""
-#: sha1-file.c:1161 sha1-file.c:2301
+#: sha1-file.c:1286 sha1-file.c:2481
#, c-format
msgid "garbage at end of loose object '%s'"
msgstr ""
-#: sha1-file.c:1203
+#: sha1-file.c:1328
msgid "invalid object type"
msgstr ""
-#: sha1-file.c:1287
+#: sha1-file.c:1412
#, c-format
msgid "unable to unpack %s header with --allow-unknown-type"
msgstr ""
-#: sha1-file.c:1290
+#: sha1-file.c:1415
#, c-format
msgid "unable to unpack %s header"
msgstr ""
-#: sha1-file.c:1296
+#: sha1-file.c:1421
#, c-format
msgid "unable to parse %s header with --allow-unknown-type"
msgstr ""
-#: sha1-file.c:1299
+#: sha1-file.c:1424
#, c-format
msgid "unable to parse %s header"
msgstr ""
-#: sha1-file.c:1490
+#: sha1-file.c:1651
#, c-format
msgid "failed to read object %s"
msgstr ""
-#: sha1-file.c:1494
+#: sha1-file.c:1655
#, c-format
msgid "replacement %s not found for %s"
msgstr ""
-#: sha1-file.c:1498
+#: sha1-file.c:1659
#, c-format
msgid "loose object %s (stored in %s) is corrupt"
msgstr ""
-#: sha1-file.c:1502
+#: sha1-file.c:1663
#, c-format
msgid "packed object %s (stored in %s) is corrupt"
msgstr ""
-#: sha1-file.c:1604
+#: sha1-file.c:1768
#, c-format
msgid "unable to write file %s"
msgstr ""
-#: sha1-file.c:1611
+#: sha1-file.c:1775
#, c-format
msgid "unable to set permission to '%s'"
msgstr ""
-#: sha1-file.c:1618
+#: sha1-file.c:1782
msgid "file write error"
msgstr ""
-#: sha1-file.c:1637
+#: sha1-file.c:1802
msgid "error when closing loose object file"
msgstr ""
-#: sha1-file.c:1702
+#: sha1-file.c:1867
#, c-format
msgid "insufficient permission for adding an object to repository database %s"
msgstr ""
-#: sha1-file.c:1704
+#: sha1-file.c:1869
msgid "unable to create temporary file"
msgstr ""
-#: sha1-file.c:1728
+#: sha1-file.c:1893
msgid "unable to write loose object file"
msgstr ""
-#: sha1-file.c:1734
+#: sha1-file.c:1899
#, c-format
msgid "unable to deflate new object %s (%d)"
msgstr ""
-#: sha1-file.c:1738
+#: sha1-file.c:1903
#, c-format
msgid "deflateEnd on object %s failed (%d)"
msgstr ""
-#: sha1-file.c:1742
+#: sha1-file.c:1907
#, c-format
msgid "confused by unstable object source data for %s"
msgstr ""
-#: sha1-file.c:1752 builtin/pack-objects.c:920
+#: sha1-file.c:1917 builtin/pack-objects.c:1086
#, c-format
msgid "failed utime() on %s"
msgstr ""
-#: sha1-file.c:1827
+#: sha1-file.c:1994
#, c-format
msgid "cannot read object for %s"
msgstr ""
-#: sha1-file.c:1867
+#: sha1-file.c:2045
msgid "corrupt commit"
msgstr ""
-#: sha1-file.c:1875
+#: sha1-file.c:2053
msgid "corrupt tag"
msgstr ""
-#: sha1-file.c:1974
+#: sha1-file.c:2153
#, c-format
msgid "read error while indexing %s"
msgstr ""
-#: sha1-file.c:1977
+#: sha1-file.c:2156
#, c-format
msgid "short read while indexing %s"
msgstr ""
-#: sha1-file.c:2050 sha1-file.c:2059
+#: sha1-file.c:2229 sha1-file.c:2239
#, c-format
msgid "%s: failed to insert into database"
msgstr ""
-#: sha1-file.c:2065
+#: sha1-file.c:2245
#, c-format
msgid "%s: unsupported file type"
msgstr ""
-#: sha1-file.c:2089
+#: sha1-file.c:2269
#, c-format
msgid "%s is not a valid object"
msgstr ""
-#: sha1-file.c:2091
+#: sha1-file.c:2271
#, c-format
msgid "%s is not a valid '%s' object"
msgstr "%s не является действительным объектом «%s»"
-#: sha1-file.c:2118 builtin/index-pack.c:154
+#: sha1-file.c:2298 builtin/index-pack.c:192
#, c-format
msgid "unable to open %s"
msgstr "не удалось открыть %s"
-#: sha1-file.c:2308 sha1-file.c:2360
+#: sha1-file.c:2488 sha1-file.c:2541
#, c-format
msgid "hash mismatch for %s (expected %s)"
-msgstr "несоответствие хеш-суммы %s (ожидается %s)"
+msgstr "несоответствие хэш-кода %s (ожидается %s)"
-#: sha1-file.c:2332
+#: sha1-file.c:2512
#, c-format
msgid "unable to mmap %s"
msgstr ""
-#: sha1-file.c:2337
+#: sha1-file.c:2517
#, c-format
msgid "unable to unpack header of %s"
msgstr ""
-#: sha1-file.c:2343
+#: sha1-file.c:2523
#, c-format
msgid "unable to parse header of %s"
msgstr ""
-#: sha1-file.c:2354
+#: sha1-file.c:2534
#, 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 идентификатор %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"
"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"
"running \"git config advice.objectNameWarning false\""
-msgstr "Обычно Git не создает ссылки, оканчивающиеся на 40 шестнадцатеричных\nсимволов, потому, что они будут игнорироваться, когда вы просто\nукажете это 40-символьное шестнадцатеричное число. Такие ссылки\nмогли быть созданы по ошибке. Например, с помощью:\n\n git checkout -b $br $(git rev-parse …)\n\n, если «$br» оказался пустым, то ссылка с 40-символьным\nшестнадцатеричным числом будет создана. Пожалуйста, просмотрите эти\nссылки и, возможно, удалите их. Вы можете отключить это сообщение\nзапустив «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:848
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr "%u.%2.2u ГиБ"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#: strbuf.c:850
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr "%u.%2.2u ГиБ/с"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#: strbuf.c:858
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr "%u.%2.2u МиБ"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#: strbuf.c:860
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr "%u.%2.2u МиБ/с"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#: strbuf.c:867
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr "%u.%2.2u КиБ"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#: strbuf.c:869
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr "%u.%2.2u КиБ/с"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#: strbuf.c:875
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u байт"
+msgstr[1] "%u байта"
+msgstr[2] "%u байтов"
+msgstr[3] "%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 байт/с"
+msgstr[1] "%u байта/с"
+msgstr[2] "%u байтов/с"
+msgstr[3] "%u байта/с"
+
+#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719
+#: builtin/rebase.c:864
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "не удалось открыть «%s» для записи"
+
+#: strbuf.c:1175
+#, c-format
+msgid "could not edit '%s'"
+msgstr ""
+
+#: 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 ""
+
+#: 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"
@@ -6592,62 +7759,137 @@
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 ""
+
+#: 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
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "запись подмодуля «%s» (%s) является %s, а не является коммитом"
-#: submodule.c:1147 builtin/branch.c:672 builtin/submodule--helper.c:1988
+#: submodule.c:1004
+#, c-format
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
+msgstr ""
+
+#: submodule.c:1127
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr ""
+
+#: submodule.c:1156 builtin/branch.c:680 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'"
+msgid "Pushing submodule '%s'\n"
msgstr ""
-#: submodule.c:1651
+#: submodule.c:1170
+#, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr ""
+
+#: submodule.c:1462
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr ""
+
+#: submodule.c:1492
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr ""
+
+#: submodule.c:1646
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+
+#: 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 ""
+
+#: submodule.c:1729
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr ""
+
+#: 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 ""
-#: 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 ""
-#: submodule.c:2008
+#: 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"
msgstr "relocate_gitdir для подмодуля «%s» с указанием более одного рабочего дерева не поддерживается"
-#: submodule.c:2020 submodule.c:2076
+#: submodule.c:2075 submodule.c:2134
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "не удалось запросить имя подмодуля «%s»"
-#: submodule.c:2027
+#: submodule.c:2079
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr ""
+
+#: submodule.c:2086
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -6655,151 +7897,308 @@
"'%s'\n"
msgstr "Перемещение каталога git для «%s%s» из\n«%s» в\n«%s»\n"
-#: submodule.c:2111
-#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr "не удалось рекурсивно зайти в подмодуль «%s»"
-
-#: submodule.c:2155
+#: submodule.c:2214
msgid "could not start ls-files in .."
msgstr "не удалось выполнить stat ls-files в .."
-#: submodule.c:2194
+#: 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 ""
-
-#: 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 "сбой при запуске команды завершителя «%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:299 builtin/remote.c:324
#, 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-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 ""
+
+#: 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
+#, c-format
+msgid "%s unexpectedly said: '%s'"
+msgstr ""
+
+#: transport-helper.c:417
+#, c-format
+msgid "%s also locked %s"
+msgstr ""
+
+#: transport-helper.c:497
+msgid "couldn't run fast-import"
+msgstr ""
+
+#: transport-helper.c:520
+msgid "error while running fast-import"
+msgstr ""
+
+#: transport-helper.c:549 transport-helper.c:1236
+#, c-format
+msgid "could not read ref %s"
+msgstr ""
+
+#: transport-helper.c:594
+#, c-format
+msgid "unknown response to connect: %s"
+msgstr ""
+
+#: 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:1446
+msgid "operation not supported by protocol"
+msgstr ""
+
+#: 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
+#, c-format
+msgid "expected ok/error, helper said '%s'"
+msgstr ""
+
+#: transport-helper.c:845
+#, c-format
+msgid "helper reported unexpected status of %s"
+msgstr ""
+
+#: transport-helper.c:928
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr ""
+
+#: transport-helper.c:931
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr ""
+
+#: transport-helper.c:934
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr ""
+
+#: transport-helper.c:939
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr ""
+
+#: transport-helper.c:943
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr ""
+
+#: transport-helper.c:950
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr ""
+
+#: transport-helper.c:1050
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr ""
+
+#: transport-helper.c:1055
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr ""
+
+#: transport-helper.c:1102
+msgid "couldn't run fast-export"
+msgstr ""
+
+#: transport-helper.c:1107
+msgid "error while running fast-export"
+msgstr ""
+
+#: transport-helper.c:1132
+#, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch.\n"
+msgstr ""
+
+#: transport-helper.c:1213
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr ""
+
+#: transport-helper.c:1222
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr ""
+
+#: transport-helper.c:1374
+#, c-format
+msgid "read(%s) failed"
+msgstr ""
+
+#: transport-helper.c:1401
+#, c-format
+msgid "write(%s) failed"
+msgstr ""
+
+#: transport-helper.c:1450
+#, c-format
+msgid "%s thread failed"
+msgstr ""
+
+#: transport-helper.c:1454
+#, c-format
+msgid "%s thread failed to join: %s"
+msgstr ""
+
+#: transport-helper.c:1473 transport-helper.c:1477
+#, c-format
+msgid "can't start thread for copying data: %s"
+msgstr ""
+
+#: transport-helper.c:1514
+#, c-format
+msgid "%s process failed to wait"
+msgstr ""
+
+#: transport-helper.c:1518
+#, c-format
+msgid "%s process failed"
+msgstr ""
+
+#: transport-helper.c:1536 transport-helper.c:1545
+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 "Будет установлен вышестоящий репозиторий для «%s» на «%s» с «%s»\n"
-#: transport.c:142
+#: transport.c:145
#, c-format
msgid "could not read bundle '%s'"
msgstr ""
-#: transport.c:208
+#: transport.c:220
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "транспорт: неправильный параметр глубины «%s»"
-#: transport.c:259
+#: transport.c:269
msgid "see protocol.version in 'git help config' for more details"
msgstr ""
-#: transport.c:260
+#: transport.c:270
msgid "server options require protocol version 2 or later"
msgstr ""
-#: transport.c:625
+#: transport.c:727
msgid "could not parse transport.color.* config"
msgstr "не удалось разобрать опцию transport.color.*"
-#: transport.c:698
+#: transport.c:802
msgid "support for protocol v2 not implemented yet"
msgstr ""
-#: transport.c:825
+#: transport.c:936
#, c-format
msgid "unknown value for config '%s': %s"
msgstr ""
-#: transport.c:891
+#: transport.c:1002
#, c-format
msgid "transport '%s' not allowed"
msgstr ""
-#: transport.c:945
+#: transport.c:1055
msgid "git-over-rsync is no longer supported"
msgstr ""
-#: transport.c:1040
+#: transport.c:1157
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr "Подмодули по указанным путям содержат изменения, которые не найдены ни на одном из внешних репозиториев:\n"
-#: transport.c:1044
+#: transport.c:1161
#, c-format
msgid ""
"\n"
@@ -6815,384 +8214,227 @@
"\n"
msgstr "\nПопробуйте выполнить\n\n\tgit push --recurse-submodules=on-demand\n\nили перейти в каталог с помощью команды cd и выполнить\n\n\tgit push\n\nдля их отправки на внешний репозиторий.\n"
-#: transport.c:1052
+#: transport.c:1169
msgid "Aborting."
msgstr "Прерываю."
-#: transport.c:1193
+#: transport.c:1315
msgid "failed to push all needed submodules"
msgstr ""
-#: transport.c:1326 transport-helper.c:645
-msgid "operation not supported by protocol"
-msgstr ""
-
-#: transport.c:1430
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr ""
-
-#: transport-helper.c:51 transport-helper.c:80
-msgid "full write to remote helper failed"
-msgstr ""
-
-#: transport-helper.c:134
-#, c-format
-msgid "unable to find remote helper for '%s'"
-msgstr ""
-
-#: transport-helper.c:150 transport-helper.c:559
-msgid "can't dup helper output fd"
-msgstr ""
-
-#: transport-helper.c:201
-#, c-format
-msgid ""
-"unknown mandatory capability %s; this remote helper probably needs newer "
-"version of Git"
-msgstr ""
-
-#: transport-helper.c:207
-msgid "this remote helper should implement refspec capability"
-msgstr ""
-
-#: transport-helper.c:274 transport-helper.c:414
-#, c-format
-msgid "%s unexpectedly said: '%s'"
-msgstr ""
-
-#: transport-helper.c:403
-#, c-format
-msgid "%s also locked %s"
-msgstr ""
-
-#: transport-helper.c:481
-msgid "couldn't run fast-import"
-msgstr ""
-
-#: transport-helper.c:504
-msgid "error while running fast-import"
-msgstr ""
-
-#: transport-helper.c:533 transport-helper.c:1099
-#, c-format
-msgid "could not read ref %s"
-msgstr ""
-
-#: transport-helper.c:578
-#, c-format
-msgid "unknown response to connect: %s"
-msgstr ""
-
-#: transport-helper.c:600
-msgid "setting remote service path not supported by protocol"
-msgstr ""
-
-#: transport-helper.c:602
-msgid "invalid remote service path"
-msgstr ""
-
-#: transport-helper.c:648
-#, c-format
-msgid "can't connect to subservice %s"
-msgstr ""
-
-#: transport-helper.c:720
-#, c-format
-msgid "expected ok/error, helper said '%s'"
-msgstr ""
-
-#: transport-helper.c:773
-#, c-format
-msgid "helper reported unexpected status of %s"
-msgstr ""
-
-#: transport-helper.c:834
-#, c-format
-msgid "helper %s does not support dry-run"
-msgstr ""
-
-#: transport-helper.c:837
-#, c-format
-msgid "helper %s does not support --signed"
-msgstr ""
-
-#: transport-helper.c:840
-#, c-format
-msgid "helper %s does not support --signed=if-asked"
-msgstr ""
-
-#: transport-helper.c:847
-#, c-format
-msgid "helper %s does not support 'push-option'"
-msgstr ""
-
-#: transport-helper.c:939
-msgid "remote-helper doesn't support push; refspec needed"
-msgstr ""
-
-#: transport-helper.c:944
-#, c-format
-msgid "helper %s does not support 'force'"
-msgstr ""
-
-#: transport-helper.c:991
-msgid "couldn't run fast-export"
-msgstr ""
-
-#: transport-helper.c:996
-msgid "error while running fast-export"
-msgstr ""
-
-#: transport-helper.c:1021
-#, c-format
-msgid ""
-"No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch such as 'master'.\n"
-msgstr ""
-
-#: transport-helper.c:1085
-#, c-format
-msgid "malformed response in ref list: %s"
-msgstr ""
-
-#: transport-helper.c:1238
-#, c-format
-msgid "read(%s) failed"
-msgstr ""
-
-#: transport-helper.c:1265
-#, c-format
-msgid "write(%s) failed"
-msgstr ""
-
-#: transport-helper.c:1314
-#, c-format
-msgid "%s thread failed"
-msgstr ""
-
-#: transport-helper.c:1318
-#, c-format
-msgid "%s thread failed to join: %s"
-msgstr ""
-
-#: transport-helper.c:1337 transport-helper.c:1341
-#, c-format
-msgid "can't start thread for copying data: %s"
-msgstr ""
-
-#: transport-helper.c:1378
-#, c-format
-msgid "%s process failed to wait"
-msgstr ""
-
-#: transport-helper.c:1382
-#, c-format
-msgid "%s process failed"
-msgstr ""
-
-#: transport-helper.c:1400 transport-helper.c:1409
-msgid "can't start thread for copying data"
-msgstr ""
-
-#: tree-walk.c:33
+#: 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:116
+#: 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 "Ваши локальные изменения в указанных файлах будут перезаписаны при переключении на состояние:\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"
"%%s"
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"
"%%sPlease commit your changes or stash them before you merge."
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"
"%%s"
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"
"%%sPlease commit your changes or stash them before you %s."
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"
"%%s"
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"
"%s"
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"
"%%sPlease move or remove them before you switch branches."
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"
"%%s"
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"
"%%sPlease move or remove them before you merge."
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"
"%%s"
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"
"%%sPlease move or remove them before you %s."
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"
"%%s"
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 checkout:\n"
"%%sPlease move or remove them before you switch branches."
msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при переключении на состояние:\n%%sПереместите эти файлы или удалите их перед переключением веток."
-#: unpack-trees.c:152
+#: 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: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 "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при слиянии:\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"
"%%s"
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"
"%%sPlease move or remove them before you %s."
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"
"%%s"
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
-#, c-format
-msgid ""
-"Cannot update sparse checkout: the following entries are not up to date:\n"
-"%s"
-msgstr "Не удалось обновить частичное состояние: следующие элементы не последней версии:\n%s"
-
#: unpack-trees.c:175
#, c-format
msgid ""
-"The following working tree files would be overwritten by sparse checkout update:\n"
-"%s"
-msgstr "Указанные файлы из рабочего каталога будут перезаписаны при обновлении частичного состояния:\n%s"
-
-#: unpack-trees.c:177
-#, c-format
-msgid ""
-"The following working tree files would be removed by sparse checkout update:\n"
-"%s"
-msgstr "Указанные файлы из рабочего каталога будут удалены при обновлении частичного состояния:\n%s"
-
-#: unpack-trees.c:179
-#, c-format
-msgid ""
"Cannot update submodule:\n"
"%s"
msgstr "Не удолось обновить подмодуль:\n%s"
-#: unpack-trees.c:256
+#: unpack-trees.c:178
+#, c-format
+msgid ""
+"The following paths are not up to date and were left despite sparse patterns:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:180
+#, c-format
+msgid ""
+"The following paths are unmerged and were left despite sparse patterns:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:182
+#, c-format
+msgid ""
+"The following paths were already present and thus not updated despite sparse patterns:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:262
#, c-format
msgid "Aborting\n"
msgstr "Прерываю\n"
-#: unpack-trees.c:318
-msgid "Checking out files"
-msgstr "Распаковка файлов"
+#: 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 ""
+#: unpack-trees.c:1498
+msgid "Updating index flags"
+msgstr ""
+
+#: upload-pack.c:1550
+msgid "expected flush after fetch arguments"
+msgstr ""
+
#: urlmatch.c:163
msgid "invalid URL scheme name or missing '://' suffix"
msgstr "Неправильная имя URL схемы или пропущен суффикс «://»"
@@ -7222,179 +8464,221 @@
msgid "invalid '..' path segment"
msgstr "неправильная часть пути «..»"
-#: worktree.c:255 builtin/am.c:2097
+#: walker.c:170
+msgid "Fetching objects"
+msgstr ""
+
+#: worktree.c:236 builtin/am.c:2103
#, c-format
msgid "failed to read '%s'"
msgstr "не удалось прочитать «%s»"
-#: worktree.c:301
+#: worktree.c:283
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr ""
-#: worktree.c:312
+#: worktree.c:294
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
-#: worktree.c:324
+#: worktree.c:306
#, c-format
msgid "'%s' does not exist"
msgstr "«%s» не существует"
-#: worktree.c:330
+#: worktree.c:312
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr ""
-#: worktree.c:338
+#: 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 "не удалось открыть «%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 "не удалось получить текущий рабочий каталог"
-#: wt-status.c:156
+#: wt-status.c:158
msgid "Unmerged paths:"
msgstr "Не слитые пути:"
-#: wt-status.c:183 wt-status.c:210
-#, c-format
-msgid " (use \"git reset %s <file>...\" to unstage)"
-msgstr " (используйте «git reset %s <файл>…», чтобы убрать из индекса)"
+#: wt-status.c:187 wt-status.c:219
+msgid " (use \"git restore --staged <file>...\" to unstage)"
+msgstr " (используйте «git restore --staged <файл>…», чтобы убрать из индекса)"
-#: wt-status.c:185 wt-status.c:212
+#: 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:189
+#: wt-status.c:197
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (используйте «git add <файл>…», чтобы пометить разрешение конфликта)"
-#: wt-status.c:191 wt-status.c:195
+#: 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:193
+#: wt-status.c:201
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (используйте «git rm <файл>…», чтобы пометить разрешение конфликта)"
-#: wt-status.c:204 wt-status.c:1064
+#: wt-status.c:211 wt-status.c:1070
msgid "Changes to be committed:"
msgstr "Изменения, которые будут включены в коммит:"
-#: wt-status.c:222 wt-status.c:1073
+#: wt-status.c:234 wt-status.c:1079
msgid "Changes not staged for commit:"
msgstr "Изменения, которые не в индексе для коммита:"
-#: wt-status.c:226
+#: wt-status.c:238
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr " (используйте «git add <файл>…», чтобы добавить файл в индекс)"
-#: wt-status.c:228
+#: wt-status.c:240
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr " (используйте «git add/rm <файл>…», чтобы добавить или удалить файл из индекса)"
-#: wt-status.c:229
-msgid ""
-" (use \"git checkout -- <file>...\" to discard changes in working "
-"directory)"
-msgstr " (используйте «git checkout -- <файл>…», чтобы отменить изменения\n в рабочем каталоге)"
+#: wt-status.c:241
+msgid " (use \"git restore <file>...\" to discard changes in working directory)"
+msgstr " (используйте «git restore <файл>…», чтобы отменить изменения в рабочем каталоге)"
-#: wt-status.c:231
+#: wt-status.c:243
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr " (сделайте коммит или отмените изменения в неотслеживаемом или измененном содержимом в подмодулях)"
-#: wt-status.c:243
+#: wt-status.c:254
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr " (используйте «git %s <файл>…», чтобы добавить в то, что будет включено в коммит)"
-#: wt-status.c:258
+#: wt-status.c:266
msgid "both deleted:"
msgstr "оба удалены:"
-#: wt-status.c:260
+#: wt-status.c:268
msgid "added by us:"
msgstr "добавлено нами:"
-#: wt-status.c:262
+#: wt-status.c:270
msgid "deleted by them:"
msgstr "удалено ими:"
-#: wt-status.c:264
+#: wt-status.c:272
msgid "added by them:"
msgstr "добавлено ими:"
-#: wt-status.c:266
+#: wt-status.c:274
msgid "deleted by us:"
msgstr "удалено нами:"
-#: wt-status.c:268
+#: wt-status.c:276
msgid "both added:"
msgstr "оба добавлены:"
-#: wt-status.c:270
+#: wt-status.c:278
msgid "both modified:"
msgstr "оба изменены:"
-#: wt-status.c:280
+#: wt-status.c:288
msgid "new file:"
msgstr "новый файл:"
-#: wt-status.c:282
+#: wt-status.c:290
msgid "copied:"
msgstr "скопировано:"
-#: wt-status.c:284
+#: wt-status.c:292
msgid "deleted:"
msgstr "удалено:"
-#: wt-status.c:286
+#: wt-status.c:294
msgid "modified:"
msgstr "изменено:"
-#: wt-status.c:288
+#: wt-status.c:296
msgid "renamed:"
msgstr "переименовано:"
-#: wt-status.c:290
+#: wt-status.c:298
msgid "typechange:"
msgstr "изменен тип:"
-#: wt-status.c:292
+#: wt-status.c:300
msgid "unknown:"
msgstr "неизвестно:"
-#: wt-status.c:294
+#: wt-status.c:302
msgid "unmerged:"
msgstr "не слитые:"
-#: wt-status.c:374
+#: wt-status.c:382
msgid "new commits, "
msgstr "новые коммиты, "
-#: wt-status.c:376
+#: wt-status.c:384
msgid "modified content, "
msgstr "изменено содержимое, "
-#: wt-status.c:378
+#: wt-status.c:386
msgid "untracked content, "
msgstr "неотслеживаемое содержимое, "
-#: wt-status.c:896
+#: wt-status.c:903
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
@@ -7403,69 +8687,77 @@
msgstr[2] "У вас сейчас спрятано %d записей"
msgstr[3] "У вас сейчас спрятаны %d записи"
-#: wt-status.c:928
+#: wt-status.c:934
msgid "Submodules changed but not updated:"
msgstr "Измененные, но не обновленные подмодули:"
-#: wt-status.c:930
+#: wt-status.c:936
msgid "Submodule changes to be committed:"
msgstr "Изменения в подмодулях, которые будут закоммичены:"
-#: wt-status.c:1012
+#: 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:1119
+#: 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 "У вас есть не слитые пути."
-#: wt-status.c:1122
+#: wt-status.c:1143
msgid " (fix conflicts and run \"git commit\")"
msgstr " (разрешите конфликты, затем запустите «git commit»)"
-#: wt-status.c:1124
+#: wt-status.c:1145
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (используйте «git merge --abort», чтобы остановить операцию слияния)"
-#: wt-status.c:1128
+#: wt-status.c:1149
msgid "All conflicts fixed but you are still merging."
msgstr "Все конфликты исправлены, но вы все еще в процессе слияния."
-#: wt-status.c:1131
+#: wt-status.c:1152
msgid " (use \"git commit\" to conclude merge)"
msgstr " (используйте «git commit», чтобы завершить слияние)"
-#: wt-status.c:1140
+#: wt-status.c:1161
msgid "You are in the middle of an am session."
msgstr "Вы в процессе сессии am."
-#: wt-status.c:1143
+#: wt-status.c:1164
msgid "The current patch is empty."
msgstr "Текущий патч пустой."
-#: wt-status.c:1147
+#: wt-status.c:1168
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (разрешите конфликты, затем запустите «git am --continue»)"
-#: wt-status.c:1149
+#: wt-status.c:1170
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (используйте «git am --skip», чтобы пропустить этот патч)"
-#: wt-status.c:1151
+#: wt-status.c:1172
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (используйте «git am --abort», чтобы восстановить оригинальную ветку)"
-#: wt-status.c:1284
+#: wt-status.c:1305
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo отсутствует."
-#: wt-status.c:1286
+#: wt-status.c:1307
msgid "No commands done."
msgstr "Команды не выполнены."
-#: wt-status.c:1289
+#: wt-status.c:1310
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
@@ -7474,16 +8766,16 @@
msgstr[2] "Последняя команда выполнена (%d команд выполнено):"
msgstr[3] "Последняя команда выполнена (%d команд выполнено):"
-#: wt-status.c:1300
+#: wt-status.c:1321
#, c-format
msgid " (see more in file %s)"
msgstr " (смотрите дополнительно в файле %s)"
-#: wt-status.c:1305
+#: wt-status.c:1326
msgid "No commands remaining."
msgstr "Команд больше не осталось."
-#: wt-status.c:1308
+#: wt-status.c:1329
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
@@ -7492,170 +8784,175 @@
msgstr[2] "Следующая команда для выполнения (%d команд осталось):"
msgstr[3] "Следующая команда для выполнения (%d команд осталось):"
-#: wt-status.c:1316
+#: wt-status.c:1337
msgid " (use \"git rebase --edit-todo\" to view and edit)"
-msgstr " (используйте «git rebase --edit-todo», чтобы просмотреть и изменить)"
+msgstr " (используйте «git rebase --edit-todo», чтобы просмотреть или изменить их)"
-#: wt-status.c:1328
+#: wt-status.c:1349
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Вы сейчас перемещаете ветку «%s» над «%s»."
-#: wt-status.c:1333
+#: wt-status.c:1354
msgid "You are currently rebasing."
msgstr "Вы сейчас перемещаете ветку."
-#: wt-status.c:1346
+#: wt-status.c:1367
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (разрешите конфликты, затем запустите «git rebase --continue»)"
-#: wt-status.c:1348
+#: wt-status.c:1369
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (используйте «git rebase --skip», чтобы пропустить этот патч)"
-#: wt-status.c:1350
+#: wt-status.c:1371
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (используйте «git rebase --abort», чтобы перейти на оригинальную ветку)"
-#: wt-status.c:1357
+#: wt-status.c:1378
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (все конфликты разрешены: запустите «git rebase --continue»)"
-#: wt-status.c:1361
+#: 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:1366
+#: wt-status.c:1387
msgid "You are currently splitting a commit during a rebase."
msgstr "Вы сейчас разделяете коммит при перемещении ветки."
-#: wt-status.c:1369
+#: wt-status.c:1390
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
-msgstr "(Как только ваш рабочий каталог будет чистый, запустите «git rebase --continue»)"
+msgstr " (Как только ваш рабочий каталог будет чистый, запустите «git rebase --continue»)"
-#: wt-status.c:1373
+#: 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:1378
+#: wt-status.c:1399
msgid "You are currently editing a commit during a rebase."
msgstr "Вы сейчас редактируете коммит при перемещении ветки."
-#: wt-status.c:1381
+#: wt-status.c:1402
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (используйте «git commit --amend», чтобы исправить текущий коммит)"
-#: wt-status.c:1383
+#: wt-status.c:1404
msgid " (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " (используйте «git rebase --continue», когда будете довольны изменениями)"
-#: wt-status.c:1394
+#: wt-status.c:1415
msgid "Cherry-pick currently in progress."
msgstr ""
-#: wt-status.c:1397
+#: wt-status.c:1418
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Вы копируете коммит %s."
-#: wt-status.c:1404
+#: wt-status.c:1425
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (разрешите конфликты, затем запустите «git cherry-pick --continue»)"
-#: wt-status.c:1407
+#: wt-status.c:1428
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr ""
-#: wt-status.c:1410
+#: wt-status.c:1431
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr " (все конфликты разрешены: запустите «git cherry-pick --continue»)"
-#: wt-status.c:1412
+#: 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 " (используйте «git cherry-pick --abort», чтобы отменить копирования коммита)"
-#: wt-status.c:1422
+#: wt-status.c:1445
msgid "Revert currently in progress."
msgstr ""
-#: wt-status.c:1425
+#: wt-status.c:1448
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Вы сейчас обращаете изменения коммита %s."
-#: wt-status.c:1431
+#: wt-status.c:1454
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (разрешите конфликты, затем запустите «git revert --continue»)"
-#: wt-status.c:1434
+#: wt-status.c:1457
msgid " (run \"git revert --continue\" to continue)"
msgstr ""
-#: wt-status.c:1437
+#: wt-status.c:1460
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (все конфликты разрешены: запустите «git revert --continue»)"
-#: wt-status.c:1439
+#: 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 " (используйте «git revert --abort», чтобы отменить операцию обращения изменений коммита)"
-#: wt-status.c:1449
+#: wt-status.c:1474
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Вы сейчас в процессе двоичного поиска, начатого с ветки «%s»."
-#: wt-status.c:1453
+#: wt-status.c:1478
msgid "You are currently bisecting."
msgstr "Вы сейчас в процессе двоичного поиска."
-#: wt-status.c:1456
+#: wt-status.c:1481
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (используйте «git bisect reset», чтобы вернуться на исходную ветку)"
-#: wt-status.c:1665
+#: 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:1672
+#: wt-status.c:1738
msgid "interactive rebase in progress; onto "
msgstr "интерактивное перемещение в процессе; над "
-#: wt-status.c:1674
+#: wt-status.c:1740
msgid "rebase in progress; onto "
msgstr "перемещение в процессе; над "
-#: wt-status.c:1679
-msgid "HEAD detached at "
-msgstr "HEAD отделён на "
-
-#: wt-status.c:1681
-msgid "HEAD detached from "
-msgstr "HEAD отделён начиная с "
-
-#: wt-status.c:1684
+#: wt-status.c:1750
msgid "Not currently on any branch."
msgstr "Сейчас ни на одной из веток"
-#: wt-status.c:1701
+#: wt-status.c:1767
msgid "Initial commit"
msgstr "Начальный коммит"
-#: wt-status.c:1702
+#: wt-status.c:1768
msgid "No commits yet"
msgstr "Еще нет коммитов"
-#: wt-status.c:1716
+#: wt-status.c:1782
msgid "Untracked files"
msgstr "Неотслеживаемые файлы"
-#: wt-status.c:1718
+#: wt-status.c:1784
msgid "Ignored files"
msgstr "Игнорируемые файлы"
-#: wt-status.c:1722
+#: wt-status.c:1788
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -7663,216 +8960,225 @@
"new files yourself (see 'git help status')."
msgstr "%.2f секунды занял вывод списка неотслеживаемых файлов. «status -uno» возможно может ускорить это, но будьте внимательны, и не забудьте добавить новые файлы вручную (смотрите «git help status» для подробностей)."
-#: wt-status.c:1728
+#: wt-status.c:1794
#, c-format
msgid "Untracked files not listed%s"
msgstr "Неотслеживаемые файлы не показаны%s"
-#: wt-status.c:1730
+#: wt-status.c:1796
msgid " (use -u option to show untracked files)"
-msgstr "(используйте опцию «-u», чтобы показать неотслеживаемые файлы)"
+msgstr " (используйте опцию «-u», чтобы показать неотслеживаемые файлы)"
-#: wt-status.c:1736
+#: wt-status.c:1802
msgid "No changes"
msgstr "Нет изменений"
-#: wt-status.c:1741
+#: wt-status.c:1807
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr "нет изменений добавленных для коммита\n(используйте «git add» и/или «git commit -a»)\n"
-#: wt-status.c:1744
+#: wt-status.c:1811
#, c-format
msgid "no changes added to commit\n"
msgstr "нет изменений добавленных для коммита\n"
-#: wt-status.c:1747
+#: 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:1750
+#: wt-status.c:1819
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "ничего не добавлено в коммит, но есть неотслеживаемые файлы\n"
-#: wt-status.c:1753
+#: 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:1756 wt-status.c:1761
+#: wt-status.c:1827 wt-status.c:1833
#, c-format
msgid "nothing to commit\n"
msgstr "нечего коммитить\n"
-#: wt-status.c:1759
+#: wt-status.c:1830
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "нечего коммитить (используйте опцию «-u», чтобы показать неотслеживаемые файлы)\n"
-#: wt-status.c:1763
+#: wt-status.c:1835
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "нечего коммитить, нет изменений в рабочем каталоге\n"
-#: wt-status.c:1876
+#: wt-status.c:1940
msgid "No commits yet on "
-msgstr "Еще нет коммитов в"
+msgstr "Еще нет коммитов в "
-#: wt-status.c:1880
+#: wt-status.c:1944
msgid "HEAD (no branch)"
msgstr "HEAD (нет ветки)"
-#: wt-status.c:1911
+#: wt-status.c:1975
msgid "different"
msgstr "отличается"
-#: wt-status.c:1913 wt-status.c:1921
+#: wt-status.c:1977 wt-status.c:1985
msgid "behind "
-msgstr "позади"
+msgstr "позади "
-#: wt-status.c:1916 wt-status.c:1919
+#: wt-status.c:1980 wt-status.c:1983
msgid "ahead "
msgstr "впереди "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2443
+#: wt-status.c:2505
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "не удалось выполнить %s: У вас есть непроиндексированные изменения."
-#: wt-status.c:2449
+#: wt-status.c:2511
msgid "additionally, your index contains uncommitted changes."
msgstr "к тому же, в вашем индексе есть незакоммиченные изменения."
-#: wt-status.c:2451
+#: 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:457
+#, 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:285
+#: 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:908
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:908 builtin/fetch.c:137 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:221 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:559
+#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190
msgid "dry run"
msgstr "пробный запуск"
-#: builtin/add.c:293
+#: builtin/add.c:331
msgid "interactive picking"
msgstr "интерактивный выбор"
-#: builtin/add.c:294 builtin/checkout.c:1379 builtin/reset.c:306
+#: builtin/add.c:332 builtin/checkout.c:1547 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 "перенормализировать концы строк (EOL) отслеживаемых файлов (подразумевает -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 "предупреждать при добавлении встроенного git репозитория"
-#: 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"
@@ -7890,399 +9196,434 @@
"See \"git help submodule\" for more information."
msgstr "Вы добавили другой репозиторий git внутри текущего репозитория\nКлоны внешнего репозитория не будут содержать внутренний\nрепозиторий и не будут знать как его получить.\nЕсли вы хотели добавить подмодуль, то запустите:\n\n\tgit submodule add <url> %s\n\nЕсли бы добавили этот путь по ошибке, то вы можете удалить его\nиз индекса с помощью:\n\n\tgit rm --cached %s\n\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 ""
-#: 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 "-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:1715 builtin/commit.c:351
+#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1502
+msgid "--pathspec-from-file is incompatible with pathspec arguments"
+msgstr ""
+
+#: builtin/add.c:514 builtin/checkout.c:1727 builtin/commit.c:357
+#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1508
+msgid "--pathspec-file-nul requires --pathspec-from-file"
+msgstr ""
+
+#: builtin/add.c:518
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Ничего не указано, ничего не добавлено.\n"
-#: builtin/add.c:446
-#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "Возможно, вы имели в виду «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/am.c:348
+#: builtin/am.c:352
msgid "could not parse author script"
msgstr "не удалось разобрать сценарий авторства"
-#: builtin/am.c:432
+#: builtin/am.c:436
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "«%s» был удален перехватчиком applypatch-msg"
-#: builtin/am.c:474
+#: builtin/am.c:478
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Неправильная строка ввода: «%s»."
-#: builtin/am.c:512
+#: builtin/am.c:516
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Не удалось скопировать заметку из «%s» в «%s»"
-#: builtin/am.c:538
+#: builtin/am.c:542
msgid "fseek failed"
msgstr "сбой при выполнении fseek"
-#: builtin/am.c:726
+#: builtin/am.c:730
#, c-format
msgid "could not parse patch '%s'"
msgstr "не удалось разобрать патч «%s»"
-#: builtin/am.c:791
+#: builtin/am.c:795
msgid "Only one StGIT patch series can be applied at once"
msgstr "Только серия патчей StGIT может быть применена за раз"
-#: builtin/am.c:839
+#: builtin/am.c:843
msgid "invalid timestamp"
msgstr "недопустимая метка даты/времени"
-#: builtin/am.c:844 builtin/am.c:856
+#: builtin/am.c:848 builtin/am.c:860
msgid "invalid Date line"
msgstr "недопустимая строка даты"
-#: builtin/am.c:851
+#: builtin/am.c:855
msgid "invalid timezone offset"
msgstr "недопустимое смещение часового пояса"
-#: builtin/am.c:944
+#: builtin/am.c:948
msgid "Patch format detection failed."
msgstr "Сбой определения формата патча."
-#: builtin/am.c:949 builtin/clone.c:409
+#: builtin/am.c:953 builtin/clone.c:410
#, c-format
msgid "failed to create directory '%s'"
msgstr "не удалось создать каталог «%s»"
-#: builtin/am.c:954
+#: builtin/am.c:958
msgid "Failed to split patches."
msgstr "Не удалось разделить патчи на части."
-#: builtin/am.c:1084 builtin/commit.c:371
-msgid "unable to write index file"
-msgstr "не удалось записать индекс"
-
-#: builtin/am.c:1098
+#: builtin/am.c:1089
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Когда вы устраните эту проблему, запустите «%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 "Если вы хотите пропустить этот патч, то запустите «%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 "Чтобы вернуться на предыдущую ветку и остановить применение изменений, запустите «%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 ""
-#: builtin/am.c:1211
+#: builtin/am.c:1202
msgid "Patch is empty."
msgstr "Патч пустой."
-#: builtin/am.c:1277
+#: builtin/am.c:1267
+#, c-format
+msgid "missing author line in commit %s"
+msgstr ""
+
+#: builtin/am.c:1270
#, c-format
msgid "invalid ident line: %.*s"
msgstr "неправильная строка идентификации: %.*s"
-#: builtin/am.c:1299
-#, c-format
-msgid "unable to parse commit %s"
-msgstr "не удалось разобрать коммит %s"
-
-#: builtin/am.c:1495
+#: builtin/am.c:1489
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "В репозитории отсутствуют двоичные объекты, необходимые для отката к трехходовому слиянию."
-#: builtin/am.c:1497
+#: builtin/am.c:1491
msgid "Using index info to reconstruct a base tree..."
msgstr "Использую индекс для реконструкции базового дерева…"
-#: builtin/am.c:1516
+#: builtin/am.c:1510
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr "Вы вручную изменяли патч?\nОн не накладывается без ошибок на двоичные объекты, записанные в его заголовке."
-#: builtin/am.c:1522
+#: builtin/am.c:1516
msgid "Falling back to patching base and 3-way merge..."
msgstr "Откат к применению изменений к базовому коммиту с помощью трехходового слияния…"
-#: builtin/am.c:1548
+#: builtin/am.c:1542
msgid "Failed to merge in the changes."
msgstr "Не удалось слить изменения."
-#: builtin/am.c:1580
+#: builtin/am.c:1574
msgid "applying to an empty history"
msgstr "применение к пустой истории"
-#: builtin/am.c:1627 builtin/am.c:1631
+#: builtin/am.c:1626 builtin/am.c:1630
#, c-format
msgid "cannot resume: %s does not exist."
-msgstr "нельзя продолжнить: %s не существует "
+msgstr "нельзя продолжнить: %s не существует."
-#: builtin/am.c:1647
-msgid "cannot be interactive without stdin connected to a terminal."
-msgstr "не удалось использовать интерактивное поведение, без stdin подключенного к терминалу."
-
-#: builtin/am.c:1652
+#: builtin/am.c:1648
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:1662
+#: builtin/am.c:1658
+#, 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:1712
+#: builtin/am.c:1704 builtin/commit.c:395
+msgid "unable to write index file"
+msgstr "не удалось записать индекс"
+
+#: builtin/am.c:1708
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Индекс изменён: нельзя применять патчи (изменено: %s)"
-#: builtin/am.c:1752 builtin/am.c:1820
+#: builtin/am.c:1748 builtin/am.c:1816
#, c-format
msgid "Applying: %.*s"
msgstr "Применение: %.*s"
-#: builtin/am.c:1769
+#: builtin/am.c:1765
msgid "No changes -- Patch already applied."
msgstr "Нет изменений — Патч уже применен."
-#: builtin/am.c:1775
+#: builtin/am.c:1771
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Ошибка применения изменений на %s %.*s"
-#: builtin/am.c:1779
-msgid "Use 'git am --show-current-patch' to see the failed patch"
+#: builtin/am.c:1775
+msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr ""
-#: builtin/am.c:1823
+#: builtin/am.c:1819
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Если ничего не осталось для индексации, то, скорее всего, что-то другое уже сделало те же изменения; возможно, вам следует пропустить этот патч."
-#: builtin/am.c:1830
+#: builtin/am.c:1826
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:1937 builtin/am.c:1941 builtin/am.c:1953 builtin/reset.c:329
-#: builtin/reset.c:337
+#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 builtin/reset.c:347
+#: builtin/reset.c:355
#, c-format
msgid "Could not parse object '%s'."
msgstr "Не удалось разобрать объект «%s»."
-#: builtin/am.c:1989
+#: builtin/am.c:1985
msgid "failed to clean index"
msgstr "не удалось очистить индекс"
-#: builtin/am.c:2033
+#: builtin/am.c:2029
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr "Похоже, что вы переместили HEAD с момента последней ошибки выполнения «am».\nПеремотка на ORIG_HEAD не выполняется"
-#: builtin/am.c:2130
+#: builtin/am.c:2136
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Неправильное значение для --patch-format: %s"
-#: builtin/am.c:2166
+#: builtin/am.c:2178
+#, c-format
+msgid "Invalid value for --show-current-patch: %s"
+msgstr ""
+
+#: builtin/am.c:2182
+#, c-format
+msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
+msgstr ""
+
+#: builtin/am.c:2213
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<опции>] [(<mbox> | <Maildir>)…]"
-#: builtin/am.c:2167
+#: builtin/am.c:2214
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<опции>] (--continue | --skip | --abort)"
-#: builtin/am.c:2173
+#: builtin/am.c:2220
msgid "run interactively"
msgstr "запустить в интерактивном режиме"
-#: builtin/am.c:2175
+#: builtin/am.c:2222
msgid "historical option -- no-op"
msgstr "историческая опция — ничего не делает"
-#: builtin/am.c:2177
+#: builtin/am.c:2224
msgid "allow fall back on 3way merging if needed"
msgstr "разрешить откатиться к трехходовому слиянию, если нужно"
-#: builtin/am.c:2178 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:306 builtin/stash.c:805
+#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16
+#: builtin/repack.c:335 builtin/stash.c:815
msgid "be quiet"
msgstr "тихий режим"
-#: builtin/am.c:2180
-msgid "add a Signed-off-by line to the commit message"
-msgstr "добавить строку Signed-off-by к сообщению коммита"
+#: builtin/am.c:2227
+msgid "add a Signed-off-by trailer to the commit message"
+msgstr ""
-#: builtin/am.c:2183
+#: builtin/am.c:2230
msgid "recode into utf8 (default)"
msgstr "перекодировать в utf8 (по умолчанию)"
-#: builtin/am.c:2185
+#: builtin/am.c:2232
msgid "pass -k flag to git-mailinfo"
msgstr "передать флаг -k в git-mailinfo"
-#: builtin/am.c:2187
+#: builtin/am.c:2234
msgid "pass -b flag to git-mailinfo"
msgstr "передать флаг -b в git-mailinfo"
-#: builtin/am.c:2189
+#: builtin/am.c:2236
msgid "pass -m flag to git-mailinfo"
msgstr "передать флаг -m в git-mailinfo"
-#: builtin/am.c:2191
+#: builtin/am.c:2238
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "передать флаг --keep-cr в git-mailsplit для формата mbox"
-#: builtin/am.c:2194
+#: builtin/am.c:2241
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "не передавать --keep-cr флаг в git-mailsplit вне зависимости от am.keepcr"
-#: builtin/am.c:2197
+#: builtin/am.c:2244
msgid "strip everything before a scissors line"
msgstr "обрезать все до строки обрезки"
-#: builtin/am.c:2199 builtin/am.c:2202 builtin/am.c:2205 builtin/am.c:2208
-#: builtin/am.c:2211 builtin/am.c:2214 builtin/am.c:2217 builtin/am.c:2220
-#: builtin/am.c:2226
+#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
+#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
+#: builtin/am.c:2273
msgid "pass it through git-apply"
msgstr "передать его в git-apply"
-#: builtin/am.c:2216 builtin/commit.c:1348 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:879 builtin/merge.c:247
-#: builtin/pull.c:158 builtin/pull.c:217 builtin/rebase.c:1412
-#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
-#: builtin/show-branch.c:651 builtin/show-ref.c:172 builtin/tag.c:397
-#: parse-options.h:141 parse-options.h:162 parse-options.h:311
+#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:903 builtin/merge.c:260
+#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
+#: builtin/rebase.c:1341 builtin/repack.c:346 builtin/repack.c:350
+#: builtin/repack.c:352 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:2222 builtin/branch.c:653 builtin/for-each-ref.c:38
-#: builtin/replace.c:554 builtin/tag.c:431 builtin/verify-tag.c:39
+#: builtin/am.c:2269 builtin/branch.c:661 builtin/bugreport.c:136
+#: 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:2223
+#: builtin/am.c:2270
msgid "format the patch(es) are in"
msgstr "формат, в котором находятся патчи"
-#: builtin/am.c:2229
+#: builtin/am.c:2276
msgid "override error message when patch failure occurs"
msgstr "переопределить сообщение об ошибке, если не удалось наложить изменения"
-#: builtin/am.c:2231
+#: builtin/am.c:2278
msgid "continue applying patches after resolving a conflict"
msgstr "продолжить применение изменений после разрешения конфиликта"
-#: builtin/am.c:2234
+#: builtin/am.c:2281
msgid "synonyms for --continue"
msgstr "синоним для --continue"
-#: builtin/am.c:2237
+#: builtin/am.c:2284
msgid "skip the current patch"
msgstr "пропустить текущий патч"
-#: builtin/am.c:2240
+#: builtin/am.c:2287
msgid "restore the original branch and abort the patching operation."
msgstr "восстановить оригинальную ветку и отменить операцию применения изменений."
-#: builtin/am.c:2243
+#: builtin/am.c:2290
msgid "abort the patching operation but keep HEAD where it is."
msgstr ""
-#: builtin/am.c:2246
-msgid "show the patch being applied."
+#: builtin/am.c:2294
+msgid "show the patch being applied"
msgstr ""
-#: builtin/am.c:2250
+#: builtin/am.c:2299
msgid "lie about committer date"
msgstr "соврать о дате коммитера"
-#: builtin/am.c:2252
+#: builtin/am.c:2301
msgid "use current timestamp for author date"
msgstr "использовать текущее время как время авторства"
-#: builtin/am.c:2254 builtin/commit-tree.c:120 builtin/commit.c:1491
-#: builtin/merge.c:282 builtin/pull.c:192 builtin/rebase.c:489
-#: builtin/rebase.c:1453 builtin/revert.c:116 builtin/tag.c:412
+#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515
+#: builtin/merge.c:297 builtin/pull.c:175 builtin/rebase.c:536
+#: builtin/rebase.c:1394 builtin/revert.c:117 builtin/tag.c:419
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2255 builtin/rebase.c:490 builtin/rebase.c:1454
+#: builtin/am.c:2304 builtin/rebase.c:537 builtin/rebase.c:1395
msgid "GPG-sign commits"
msgstr "подписать коммиты с помощью GPG"
-#: builtin/am.c:2258
+#: builtin/am.c:2307
msgid "(internal use for git-rebase)"
msgstr "(внутреннее использование для git-rebase)"
-#: builtin/am.c:2276
+#: builtin/am.c:2325
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 уже долгое время ничего не делает и будет удалена с следующих версиях Git. Пожалуйста, не используйте ее."
-#: builtin/am.c:2283
+#: builtin/am.c:2332
msgid "failed to read the index"
msgstr "сбой чтения индекса"
-#: builtin/am.c:2298
+#: builtin/am.c:2347
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "предыдущий каталог перемещения %s еще существует, но передан mbox."
-#: builtin/am.c:2322
+#: builtin/am.c:2371
#, c-format
msgid ""
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr "Найден забытый каталог %s.\nИспользуйте «git am --abort», чтобы удалить его."
-#: builtin/am.c:2328
+#: builtin/am.c:2377
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Операция разрешения конфликтов не в процессе выполнения, не продолжаем."
+#: builtin/am.c:2387
+msgid "interactive mode requires patches on the command line"
+msgstr ""
+
#: builtin/apply.c:8
msgid "git apply [<options>] [<patch>...]"
msgstr "git apply [<опции>] [<патч>…]"
@@ -8317,118 +9658,128 @@
msgid "git archive: expected a flush"
msgstr "git archive: ожидался сброс буфера"
-#: builtin/bisect--helper.c:22
-msgid "git bisect--helper --next-all [--no-checkout]"
-msgstr "git bisect--helper --next-all [--no-checkout]"
-
#: builtin/bisect--helper.c:23
-msgid "git bisect--helper --write-terms <bad_term> <good_term>"
-msgstr "git bisect--helper --write-terms <плохое-определение> <хорошее-определение>"
-
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-clean-state"
-msgstr "git bisect--helper --bisect-clean-state"
-
-#: builtin/bisect--helper.c:25
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr ""
-#: builtin/bisect--helper.c:26
+#: builtin/bisect--helper.c:24
msgid ""
"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
"<bad_term>"
msgstr ""
-#: builtin/bisect--helper.c:27
+#: builtin/bisect--helper.c:25
msgid ""
"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
"<bad_term>"
msgstr ""
-#: builtin/bisect--helper.c:28
+#: builtin/bisect--helper.c:26
msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
msgstr ""
-#: builtin/bisect--helper.c:29
+#: builtin/bisect--helper.c:27
msgid ""
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | "
"--term-new]"
msgstr ""
-#: builtin/bisect--helper.c:30
+#: builtin/bisect--helper.c:28
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-{new,bad}=<термин> --term-{old,good}=<термин>] [--no-checkout] [--first-parent] [<плохая-редация> [<хорошая-редация>…]] [--] [<пути>…]"
+
+#: builtin/bisect--helper.c:30
+msgid "git bisect--helper --bisect-next"
msgstr ""
-#: builtin/bisect--helper.c:86
+#: builtin/bisect--helper.c:31
+msgid "git bisect--helper --bisect-auto-next"
+msgstr ""
+
+#: builtin/bisect--helper.c:32
+msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
+msgstr ""
+
+#: builtin/bisect--helper.c:33
+msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
+msgstr ""
+
+#: builtin/bisect--helper.c:108
+#, c-format
+msgid "cannot open file '%s' in mode '%s'"
+msgstr ""
+
+#: builtin/bisect--helper.c:115
+#, c-format
+msgid "could not write to file '%s'"
+msgstr ""
+
+#: builtin/bisect--helper.c:154
#, c-format
msgid "'%s' is not a valid term"
msgstr "«%s» не является допустимым определением"
-#: builtin/bisect--helper.c:90
+#: builtin/bisect--helper.c:158
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "нельзя использовать встроенную команду «%s» как определение"
-#: builtin/bisect--helper.c:100
+#: builtin/bisect--helper.c:168
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "нельзя изменить значение определения «%s»"
-#: builtin/bisect--helper.c:111
+#: builtin/bisect--helper.c:178
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:194
#, c-format
msgid "We are not bisecting.\n"
msgstr ""
-#: builtin/bisect--helper.c:163
+#: builtin/bisect--helper.c:202
#, c-format
msgid "'%s' is not a valid commit"
msgstr ""
-#: builtin/bisect--helper.c:174
+#: builtin/bisect--helper.c:211
#, 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:255
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr ""
-#: builtin/bisect--helper.c:220
+#: builtin/bisect--helper.c:260
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr ""
-#: builtin/bisect--helper.c:232
+#: builtin/bisect--helper.c:272
#, c-format
msgid "couldn't open the file '%s'"
msgstr ""
-#: builtin/bisect--helper.c:258
+#: builtin/bisect--helper.c:298
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr ""
-#: builtin/bisect--helper.c:285
+#: builtin/bisect--helper.c:325
#, 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:329
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -8436,7 +9787,7 @@
"You can use \"git bisect %s\" and \"git bisect %s\" for that."
msgstr ""
-#: builtin/bisect--helper.c:321
+#: builtin/bisect--helper.c:349
#, c-format
msgid "bisecting only with a %s commit"
msgstr ""
@@ -8444,131 +9795,167 @@
#. 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:357
msgid "Are you sure [Y/n]? "
msgstr "Вы уверены [Y - да/n - нет]? "
-#: builtin/bisect--helper.c:376
+#: builtin/bisect--helper.c:418
msgid "no terms defined"
msgstr "определения не заданы"
-#: builtin/bisect--helper.c:379
+#: builtin/bisect--helper.c:421
#, 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:431
#, 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:498
+msgid "revision walk setup failed\n"
+msgstr ""
+
+#: builtin/bisect--helper.c:520
+#, c-format
+msgid "could not open '%s' for appending"
+msgstr ""
+
+#: builtin/bisect--helper.c:639 builtin/bisect--helper.c:652
+msgid "'' is not a valid term"
+msgstr ""
+
+#: builtin/bisect--helper.c:662
#, c-format
msgid "unrecognized option: '%s'"
msgstr ""
-#: builtin/bisect--helper.c:479
+#: builtin/bisect--helper.c:666
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr ""
-#: builtin/bisect--helper.c:511
+#: builtin/bisect--helper.c:697
msgid "bad HEAD - I need a HEAD"
msgstr ""
-#: builtin/bisect--helper.c:526
+#: builtin/bisect--helper.c:712
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr ""
-#: builtin/bisect--helper.c:547
+#: builtin/bisect--helper.c:733
msgid "won't bisect on cg-seek'ed tree"
msgstr "нельзя выполнить двоичный поиск на дереве после cg-seek"
-#: builtin/bisect--helper.c:550
+#: builtin/bisect--helper.c:736
msgid "bad HEAD - strange symbolic ref"
msgstr ""
-#: builtin/bisect--helper.c:627
-msgid "perform 'git bisect next'"
-msgstr "выполнить «git bisect next»"
+#: builtin/bisect--helper.c:756
+#, c-format
+msgid "invalid ref: '%s'"
+msgstr ""
-#: builtin/bisect--helper.c:629
-msgid "write the terms to .git/BISECT_TERMS"
-msgstr "записать определения в .git/BISECT_TERMS"
+#: builtin/bisect--helper.c:814
+msgid "You need to start by \"git bisect start\"\n"
+msgstr ""
-#: builtin/bisect--helper.c:631
-msgid "cleanup the bisection state"
-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:825
+msgid "Do you want me to do it for you [Y/n]? "
+msgstr "Вы уверены, что хотите, чтобы я сделал это [Y] - да/[n] - нет? "
-#: builtin/bisect--helper.c:633
-msgid "check for expected revs"
-msgstr "проверить ожидаемые редакции"
+#: builtin/bisect--helper.c:843
+msgid "Please call `--bisect-state` with at least one argument"
+msgstr ""
-#: builtin/bisect--helper.c:635
+#: builtin/bisect--helper.c:856
+#, c-format
+msgid "'git bisect %s' can take only one argument."
+msgstr ""
+
+#: builtin/bisect--helper.c:868 builtin/bisect--helper.c:879
+#, c-format
+msgid "Bad rev input: %s"
+msgstr ""
+
+#: builtin/bisect--helper.c:924
msgid "reset the bisection state"
msgstr ""
-#: builtin/bisect--helper.c:637
+#: builtin/bisect--helper.c:926
msgid "write out the bisection state in BISECT_LOG"
msgstr ""
-#: builtin/bisect--helper.c:639
+#: builtin/bisect--helper.c:928
msgid "check and set terms in a bisection state"
msgstr ""
-#: builtin/bisect--helper.c:641
+#: builtin/bisect--helper.c:930
msgid "check whether bad or good terms exist"
msgstr ""
-#: builtin/bisect--helper.c:643
+#: builtin/bisect--helper.c:932
msgid "print out the bisect terms"
msgstr ""
-#: builtin/bisect--helper.c:645
+#: builtin/bisect--helper.c:934
msgid "start the bisect session"
msgstr ""
-#: builtin/bisect--helper.c:647
-msgid "update BISECT_HEAD instead of checking out the current commit"
-msgstr "обновить BISECT_HEAD вместо перехода на текущий коммит"
+#: builtin/bisect--helper.c:936
+msgid "find the next bisection commit"
+msgstr ""
-#: builtin/bisect--helper.c:649
+#: builtin/bisect--helper.c:938
+msgid ""
+"verify the next bisection state then checkout the next bisection commit"
+msgstr ""
+
+#: builtin/bisect--helper.c:940
+msgid "mark the state of ref (or refs)"
+msgstr ""
+
+#: builtin/bisect--helper.c:942
msgid "no log for BISECT_WRITE"
msgstr ""
-#: builtin/bisect--helper.c:666
-msgid "--write-terms requires two arguments"
-msgstr "--write-terms требует указания двух параметров"
-
-#: builtin/bisect--helper.c:670
-msgid "--bisect-clean-state requires no arguments"
-msgstr "--bisect-clean-state не требует указания параметров"
-
-#: builtin/bisect--helper.c:677
+#: builtin/bisect--helper.c:957
msgid "--bisect-reset requires either no argument or a commit"
msgstr ""
-#: builtin/bisect--helper.c:681
+#: builtin/bisect--helper.c:961
msgid "--bisect-write requires either 4 or 5 arguments"
msgstr ""
-#: builtin/bisect--helper.c:687
+#: builtin/bisect--helper.c:967
msgid "--check-and-set-terms requires 3 arguments"
msgstr ""
-#: builtin/bisect--helper.c:693
+#: builtin/bisect--helper.c:973
msgid "--bisect-next-check requires 2 or 3 arguments"
msgstr ""
-#: builtin/bisect--helper.c:699
+#: builtin/bisect--helper.c:979
msgid "--bisect-terms requires 0 or 1 argument"
msgstr ""
+#: builtin/bisect--helper.c:988
+msgid "--bisect-next requires 0 arguments"
+msgstr ""
+
+#: builtin/bisect--helper.c:994
+msgid "--bisect-auto-next requires 0 arguments"
+msgstr ""
+
#: builtin/blame.c:32
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr "git blame [<опции>] [<опции-редакции>] [<редакция>] [--] <файл>"
@@ -8577,133 +9964,146 @@
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<опции-rev-list> документированы в git-rev-list(1)"
-#: builtin/blame.c:407
+#: builtin/blame.c:410
#, c-format
msgid "expecting a color: %s"
msgstr "ожидается цвет: %s"
-#: builtin/blame.c:414
+#: builtin/blame.c:417
msgid "must end with a color"
msgstr "должно заканчиваться на цвет"
-#: builtin/blame.c:701
+#: builtin/blame.c:730
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr ""
-#: builtin/blame.c:719
+#: builtin/blame.c:748
msgid "invalid value for blame.coloring"
msgstr ""
-#: builtin/blame.c:794
+#: builtin/blame.c:847
+#, c-format
+msgid "cannot find revision %s to ignore"
+msgstr ""
+
+#: builtin/blame.c:869
msgid "Show blame entries as we find them, incrementally"
msgstr "Показать записи авторства постепенно, в процессе нахождения"
-#: builtin/blame.c:795
-msgid "Show blank SHA-1 for boundary commits (Default: off)"
-msgstr "Не показывать SHA-1 для коммитов, не входящих в границы запроса (По умолчанию: отключено)"
+#: builtin/blame.c:870
+msgid "Do not show object names of boundary commits (Default: off)"
+msgstr ""
-#: builtin/blame.c:796
+#: builtin/blame.c:871
msgid "Do not treat root commits as boundaries (Default: off)"
msgstr "Не воспринимать корневые коммиты как граничные (По умолчанию: отключено)"
-#: builtin/blame.c:797
+#: builtin/blame.c:872
msgid "Show work cost statistics"
msgstr "Показать статистику расходов на выполнение запроса"
-#: builtin/blame.c:798
+#: builtin/blame.c:873
msgid "Force progress reporting"
msgstr "Принудительно выводить прогресс выполнения"
-#: builtin/blame.c:799
+#: builtin/blame.c:874
msgid "Show output score for blame entries"
msgstr "Показать оценку для записей авторства"
-#: builtin/blame.c:800
+#: builtin/blame.c:875
msgid "Show original filename (Default: auto)"
msgstr "Показать оригинальное имя файла (По умолчанию: автоматически)"
-#: builtin/blame.c:801
+#: builtin/blame.c:876
msgid "Show original linenumber (Default: off)"
msgstr "Показать оригинальные номера строк (По умолчанию: отключено)"
-#: builtin/blame.c:802
+#: builtin/blame.c:877
msgid "Show in a format designed for machine consumption"
msgstr "Показать в формате для программного разбора"
-#: builtin/blame.c:803
+#: builtin/blame.c:878
msgid "Show porcelain format with per-line commit information"
msgstr "Показать в машиночитаемом формате, с построчной информацией о коммите"
-#: builtin/blame.c:804
+#: builtin/blame.c:879
msgid "Use the same output mode as git-annotate (Default: off)"
msgstr "Использовать такой же формат вывода, как и git-annotate (По умолчанию: отключено)"
-#: builtin/blame.c:805
+#: builtin/blame.c:880
msgid "Show raw timestamp (Default: off)"
msgstr "Показать необработанные временные метки (По умолчанию: отключено)"
-#: builtin/blame.c:806
+#: builtin/blame.c:881
msgid "Show long commit SHA1 (Default: off)"
msgstr "Показать длинный SHA1 идентификатор коммита (По умолчанию: отключено)"
-#: builtin/blame.c:807
+#: builtin/blame.c:882
msgid "Suppress author name and timestamp (Default: off)"
msgstr "Не показывать имя автора и временные метки (По умолчанию: отключено)"
-#: builtin/blame.c:808
+#: builtin/blame.c:883
msgid "Show author email instead of name (Default: off)"
msgstr "Показать почту автора вместо имени (По умолчанию: отключено)"
-#: builtin/blame.c:809
+#: builtin/blame.c:884
msgid "Ignore whitespace differences"
msgstr "Игнорировать различия в пробелах"
-#: builtin/blame.c:810
+#: builtin/blame.c:885 builtin/log.c:1813
+msgid "rev"
+msgstr ""
+
+#: builtin/blame.c:885
+msgid "Ignore <rev> when blaming"
+msgstr ""
+
+#: builtin/blame.c:886
+msgid "Ignore revisions from <file>"
+msgstr ""
+
+#: builtin/blame.c:887
msgid "color redundant metadata from previous line differently"
msgstr ""
-#: builtin/blame.c:811
+#: builtin/blame.c:888
msgid "color lines by age"
msgstr ""
-#: builtin/blame.c:818
-msgid "Use an experimental heuristic to improve diffs"
-msgstr "Использовать эксперементальную эвристику, чтобы улучшить файлы списка изменений"
-
-#: builtin/blame.c:820
+#: builtin/blame.c:889
msgid "Spend extra cycles to find better match"
msgstr "Потратить больше времени, для нахождения лучших совпадений"
-#: builtin/blame.c:821
+#: builtin/blame.c:890
msgid "Use revisions from <file> instead of calling git-rev-list"
msgstr "Использовать редакции из <файла> вместо вызова git-rev-list"
-#: builtin/blame.c:822
+#: builtin/blame.c:891
msgid "Use <file>'s contents as the final image"
msgstr "Использовать содержимое <файла> как финальный снимок"
-#: builtin/blame.c:823 builtin/blame.c:824
+#: builtin/blame.c:892 builtin/blame.c:893
msgid "score"
msgstr "мин-длина"
-#: builtin/blame.c:823
+#: builtin/blame.c:892
msgid "Find line copies within and across files"
msgstr "Найти копирование строк в пределах и между файлами"
-#: builtin/blame.c:824
+#: builtin/blame.c:893
msgid "Find line movements within and across files"
msgstr "Найти перемещения строк в пределах и между файлами"
-#: builtin/blame.c:825
-msgid "n,m"
-msgstr "начало,конец"
+#: builtin/blame.c:894
+msgid "range"
+msgstr ""
-#: builtin/blame.c:825
-msgid "Process only line range n,m, counting from 1"
-msgstr "Обработать только строки в диапазоне начало,конец, начиная с 1"
+#: builtin/blame.c:895
+msgid "Process only line range <start>,<end> or function :<funcname>"
+msgstr ""
-#: builtin/blame.c:876
+#: builtin/blame.c:947
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr "--progress нельзя использовать одновременно с --incremental или машиночитаемым (porcelain) форматом"
@@ -8714,11 +10114,11 @@
#. among various forms of relative timestamps, but
#. your language may need more or fewer display
#. columns.
-#: builtin/blame.c:927
+#: builtin/blame.c:998
msgid "4 years, 11 months ago"
msgstr "4 года и 11 месяцев назад"
-#: builtin/blame.c:1031
+#: builtin/blame.c:1114
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
@@ -8727,13 +10127,13 @@
msgstr[2] "файл %s содержит только %lu строк"
msgstr[3] "файл %s содержит только %lu строки"
-#: builtin/blame.c:1077
+#: builtin/blame.c:1159
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 ""
#: builtin/branch.c:30
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
@@ -8759,147 +10159,147 @@
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<опции>] [-r | -a] [--format]"
-#: builtin/branch.c:151
+#: 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."
-#: builtin/branch.c:155
+#: 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», которая еще не слита с\n «%s», хотя уже слита с HEAD."
-#: builtin/branch.c:169
+#: builtin/branch.c:172
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Не удалось найти объект коммита для «%s»"
-#: builtin/branch.c:173
+#: 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:186
+#: builtin/branch.c:189
msgid "Update of config-file failed"
msgstr "Не удалось обновить файл конфигурации"
-#: builtin/branch.c:217
+#: builtin/branch.c:220
msgid "cannot use -a with -d"
msgstr "нельзя использовать одновременно ключи -a и -d"
-#: builtin/branch.c:223
+#: builtin/branch.c:226
msgid "Couldn't look up commit object for HEAD"
msgstr "Не удалось найти объект коммита для HEAD"
-#: builtin/branch.c:237
+#: builtin/branch.c:240
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Нельзя удалить ветку «%s» т.к. она активна на «%s»"
-#: builtin/branch.c:252
+#: builtin/branch.c:255
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "внешняя отслеживаемая ветка «%s» не найдена."
-#: builtin/branch.c:253
+#: builtin/branch.c:256
#, c-format
msgid "branch '%s' not found."
msgstr "ветка «%s» не найдена."
-#: builtin/branch.c:268
+#: builtin/branch.c:271
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Ошибка удаления внешней отслеживаемой ветки «%s»"
-#: builtin/branch.c:269
+#: builtin/branch.c:272
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Ошибка удаления ветки «%s»"
-#: builtin/branch.c:276
+#: builtin/branch.c:279
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Внешняя отслеживаемая ветка %s удалена (была %s).\n"
-#: builtin/branch.c:277
+#: builtin/branch.c:280
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Ветка %s удалена (была %s).\n"
-#: builtin/branch.c:421 builtin/tag.c:60
+#: builtin/branch.c:429 builtin/tag.c:61
msgid "unable to parse format string"
msgstr "не удалось разобрать строку формата"
-#: builtin/branch.c:452
+#: builtin/branch.c:460
msgid "could not resolve HEAD"
-msgstr ""
+msgstr "не удалось получить HEAD"
-#: builtin/branch.c:458
+#: builtin/branch.c:466
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
-msgstr ""
+msgstr "HEAD (%s) указывает за пределы refs/heads/"
-#: builtin/branch.c:473
+#: builtin/branch.c:481
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Производится перемещение ветки %s на %s"
-#: builtin/branch.c:477
+#: builtin/branch.c:485
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Производится двоичный поиск в ветке %s на %s"
-#: builtin/branch.c:494
+#: builtin/branch.c:502
msgid "cannot copy the current branch while not on any."
msgstr "невозможно скопировать текущую ветку, если вы не находитесь ни на одной из веток."
-#: builtin/branch.c:496
+#: builtin/branch.c:504
msgid "cannot rename the current branch while not on any."
msgstr "невозможно переименовать текущую ветку, если вы не находитесь ни на одной из них."
-#: builtin/branch.c:507
+#: builtin/branch.c:515
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Недействительное имя ветки: «%s»"
-#: builtin/branch.c:534
+#: builtin/branch.c:544
msgid "Branch rename failed"
msgstr "Сбой переименования ветки"
-#: builtin/branch.c:536
+#: builtin/branch.c:546
msgid "Branch copy failed"
msgstr "Сбой копирования ветки"
-#: builtin/branch.c:540
+#: builtin/branch.c:550
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Создана копия неправильно названной ветки «%s»"
-#: builtin/branch.c:543
+#: builtin/branch.c:553
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Переименована неправильно названная ветка «%s»"
-#: builtin/branch.c:549
+#: builtin/branch.c:559
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Ветка переименована в %s, но HEAD не обновлен!"
-#: builtin/branch.c:558
+#: builtin/branch.c:568
msgid "Branch is renamed, but update of config-file failed"
msgstr "Ветка переименована, но произошел сбой обновления файла конфигурации"
-#: builtin/branch.c:560
+#: builtin/branch.c:570
msgid "Branch is copied, but update of config-file failed"
msgstr "Ветка скопирована, но произошел сбой обновления файла конфигурации"
-#: builtin/branch.c:576
+#: builtin/branch.c:586
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -8907,308 +10307,439 @@
"Lines starting with '%c' will be stripped.\n"
msgstr "Измените описание для ветки:\n %s\nСтроки, начинающиеся с «%c» будут вырезаны.\n"
-#: builtin/branch.c:610
+#: builtin/branch.c:620
msgid "Generic options"
msgstr "Общие параметры"
-#: builtin/branch.c:612
+#: builtin/branch.c:622
msgid "show hash and subject, give twice for upstream branch"
-msgstr "показывать хеш-сумму и тему, укажите дважды для вышестоящей ветки"
+msgstr "показывать хэш-код и тему, укажите дважды для вышестоящей ветки"
-#: builtin/branch.c:613
+#: builtin/branch.c:623
msgid "suppress informational messages"
msgstr "не выводить информационные сообщения"
-#: builtin/branch.c:614
+#: builtin/branch.c:624
msgid "set up tracking mode (see git-pull(1))"
msgstr "установить режим отслеживания вышестоящей ветки (см. git-pull(1))"
-#: builtin/branch.c:616
+#: builtin/branch.c:626
msgid "do not use"
msgstr "не используйте"
-#: builtin/branch.c:618 builtin/rebase.c:485
+#: builtin/branch.c:628 builtin/rebase.c:532
msgid "upstream"
msgstr "вышестоящая"
-#: builtin/branch.c:618
+#: builtin/branch.c:628
msgid "change the upstream info"
msgstr "изменить информацию о вышестоящей ветке"
-#: builtin/branch.c:619
-msgid "Unset the upstream info"
-msgstr "Убрать информацию о вышестоящей ветке"
+#: builtin/branch.c:629
+msgid "unset the upstream info"
+msgstr ""
-#: builtin/branch.c:620
+#: builtin/branch.c:630
msgid "use colored output"
msgstr "использовать цветной вывод"
-#: builtin/branch.c:621
+#: builtin/branch.c:631
msgid "act on remote-tracking branches"
msgstr "выполнить действия на отслеживаемых внешних ветках"
-#: builtin/branch.c:623 builtin/branch.c:625
+#: builtin/branch.c:633 builtin/branch.c:635
msgid "print only branches that contain the commit"
-msgstr "вывод только веток, которые содержат коммит"
+msgstr "вывести только ветки, которые содержат коммит"
-#: builtin/branch.c:624 builtin/branch.c:626
+#: builtin/branch.c:634 builtin/branch.c:636
msgid "print only branches that don't contain the commit"
-msgstr "вывод только веток, которые не содержат коммит"
+msgstr "вывести только ветки, которые не содержат коммит"
-#: builtin/branch.c:629
+#: builtin/branch.c:639
msgid "Specific git-branch actions:"
msgstr "Специфичные для git-branch действия:"
-#: builtin/branch.c:630
+#: builtin/branch.c:640
msgid "list both remote-tracking and local branches"
-msgstr "показать список и отслеживаемых и локальных веток"
+msgstr "вывести списки отслеживаемых и локальных веток"
-#: builtin/branch.c:632
+#: builtin/branch.c:642
msgid "delete fully merged branch"
msgstr "удалить полностью слитую ветку"
-#: builtin/branch.c:633
+#: builtin/branch.c:643
msgid "delete branch (even if not merged)"
msgstr "удалить ветку (даже никуда не слитую)"
-#: builtin/branch.c:634
+#: builtin/branch.c:644
msgid "move/rename a branch and its reflog"
msgstr "переместить/переименовать ветки и ее журнал ссылок"
-#: builtin/branch.c:635
+#: builtin/branch.c:645
msgid "move/rename a branch, even if target exists"
msgstr "переместить/переименовать ветку, даже если целевое имя уже существует"
-#: builtin/branch.c:636
+#: builtin/branch.c:646
msgid "copy a branch and its reflog"
msgstr "скопировать ветку и её журнал ссылок"
-#: builtin/branch.c:637
+#: builtin/branch.c:647
msgid "copy a branch, even if target exists"
msgstr "скопировать ветку, даже если целевое имя уже существует"
-#: builtin/branch.c:638
+#: builtin/branch.c:648
msgid "list branch names"
-msgstr "показать список имен веток"
+msgstr "показать список имён веток"
-#: builtin/branch.c:639
+#: builtin/branch.c:649
msgid "show current branch name"
-msgstr ""
+msgstr "вывести имя текущей ветки"
-#: builtin/branch.c:640
+#: builtin/branch.c:650
msgid "create the branch's reflog"
msgstr "создать журнал ссылок ветки"
-#: builtin/branch.c:642
+#: builtin/branch.c:652
msgid "edit the description for the branch"
msgstr "изменить описание ветки"
-#: builtin/branch.c:643
+#: builtin/branch.c:653
msgid "force creation, move/rename, deletion"
msgstr "принудительное создание, перемещение или удаление ветки"
-#: builtin/branch.c:644
+#: builtin/branch.c:654
msgid "print only branches that are merged"
msgstr "вывод только слитых веток"
-#: builtin/branch.c:645
+#: builtin/branch.c:655
msgid "print only branches that are not merged"
msgstr "вывод только не слитых веток"
-#: builtin/branch.c:646
+#: builtin/branch.c:656
msgid "list branches in columns"
msgstr "показать список веток по столбцам"
-#: builtin/branch.c:649 builtin/for-each-ref.c:42 builtin/notes.c:415
+#: builtin/branch.c:658 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:427
+#: builtin/tag.c:434
msgid "object"
msgstr "объект"
-#: builtin/branch.c:650
+#: builtin/branch.c:659
msgid "print only branches of the object"
msgstr "вывод только веток, определенного объекта"
-#: builtin/branch.c:652 builtin/for-each-ref.c:48 builtin/tag.c:434
+#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:441
msgid "sorting and filtering are case insensitive"
msgstr "сортировка и фильтрация не зависят от регистра"
-#: builtin/branch.c:653 builtin/for-each-ref.c:38 builtin/tag.c:432
-#: builtin/verify-tag.c:39
+#: builtin/branch.c:661 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:676 builtin/clone.c:748
+#: builtin/branch.c:684 builtin/clone.c:790
msgid "HEAD not found below refs/heads!"
msgstr "HEAD не найден в refs/heads!"
-#: builtin/branch.c:700
+#: builtin/branch.c:708
msgid "--column and --verbose are incompatible"
msgstr "--column и --verbose нельзя использовать одновременно"
-#: builtin/branch.c:715 builtin/branch.c:769 builtin/branch.c:778
+#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
msgid "branch name required"
msgstr "требуется имя ветки"
-#: builtin/branch.c:745
+#: builtin/branch.c:753
msgid "Cannot give description to detached HEAD"
msgstr "Нельзя дать описание отделённому HEAD"
-#: builtin/branch.c:750
+#: builtin/branch.c:758
msgid "cannot edit description of more than one branch"
msgstr "нельзя изменить описание более одной ветки за раз"
-#: builtin/branch.c:757
+#: builtin/branch.c:765
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Еще нет коммита на ветке «%s»."
-#: builtin/branch.c:760
+#: builtin/branch.c:768
#, c-format
msgid "No branch named '%s'."
msgstr "Нет ветки с именем «%s»."
-#: builtin/branch.c:775
+#: builtin/branch.c:783
msgid "too many branches for a copy operation"
msgstr "слишком много веток для операции копирования"
-#: builtin/branch.c:784
+#: builtin/branch.c:792
msgid "too many arguments for a rename operation"
msgstr "слишком много аргументов для операции переименования"
-#: builtin/branch.c:789
+#: builtin/branch.c:797
msgid "too many arguments to set new upstream"
msgstr "слишком много аргументов для указания новой вышестоящей ветки"
-#: builtin/branch.c:793
+#: builtin/branch.c:801
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr "невозможно установить вышестоящий репозиторий для HEAD на %s, так как он не указывает ни на одну ветку."
-#: builtin/branch.c:796 builtin/branch.c:819
+#: builtin/branch.c:804 builtin/branch.c:827
#, c-format
msgid "no such branch '%s'"
msgstr "нет такой ветки «%s»"
-#: builtin/branch.c:800
+#: builtin/branch.c:808
#, c-format
msgid "branch '%s' does not exist"
msgstr "ветка «%s» не существует"
-#: builtin/branch.c:813
+#: builtin/branch.c:821
msgid "too many arguments to unset upstream"
msgstr "слишком много аргументов для сброса указания вышестоящей ветки"
-#: builtin/branch.c:817
+#: builtin/branch.c:825
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr "невозможно убрать вышестоящий репозиторий для HEAD, так как он не указывает ни на одну ветку."
-#: builtin/branch.c:823
+#: builtin/branch.c:831
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Ветка «%s» не имеет информации о вышестоящей ветке"
-#: builtin/branch.c:833
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
-msgstr "параметры -a и -r для «git branch» не имеют смысла с указанием имени ветки"
+#: builtin/branch.c:841
+msgid ""
+"The -a, and -r, options to 'git branch' do not take a branch name.\n"
+"Did you mean to use: -a|-r --list <pattern>?"
+msgstr ""
-#: builtin/branch.c:836
+#: builtin/branch.c:845
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
msgstr "опция --set-upstream больше не поддерживается. Вместо неё используйте «--track» или «--set-upstream-to»"
-#: builtin/bundle.c:45
+#: builtin/bugreport.c:15
+msgid "git version:\n"
+msgstr ""
+
+#: 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"
+"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:135
+msgid "specify a destination for the bugreport file"
+msgstr ""
+
+#: builtin/bugreport.c:137
+msgid "specify a strftime format suffix for the filename"
+msgstr ""
+
+#: builtin/bugreport.c:159
+#, c-format
+msgid "could not create leading directories for '%s'"
+msgstr ""
+
+#: builtin/bugreport.c:166
+msgid "System Info"
+msgstr ""
+
+#: builtin/bugreport.c:169
+msgid "Enabled Hooks"
+msgstr ""
+
+#: builtin/bugreport.c:176
+#, c-format
+msgid "couldn't create a new file at '%s'"
+msgstr ""
+
+#: builtin/bugreport.c:179
+#, c-format
+msgid "unable to write to %s"
+msgstr ""
+
+#: builtin/bugreport.c:189
+#, 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 "похоже на --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 ""
+
+#: builtin/bundle.c:122
#, c-format
msgid "%s is okay\n"
msgstr "%s в порядке\n"
-#: builtin/bundle.c:58
-msgid "Need a repository to create a bundle."
-msgstr "Требуется репозиторий для создания пакета."
-
-#: builtin/bundle.c:62
+#: builtin/bundle.c:163
msgid "Need a repository to unbundle."
msgstr "Требуется репозиторий для распаковки."
-#: builtin/cat-file.c:593
+#: builtin/bundle.c:171 builtin/remote.c:1700
+msgid "be verbose; must be placed before a subcommand"
+msgstr "быть многословнее; должно стоять перед подкомандой"
+
+#: builtin/bundle.c:193 builtin/remote.c:1731
+#, 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:594
+#: builtin/cat-file.c:599
msgid ""
-"git cat-file (--batch | --batch-check) [--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]"
+msgstr ""
-#: builtin/cat-file.c:615
+#: builtin/cat-file.c:620
msgid "only one batch option may be specified"
msgstr ""
-#: builtin/cat-file.c:633
+#: builtin/cat-file.c:638
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<тип> может быть одним из: blob, tree, commit, tag"
-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:639
msgid "show object type"
msgstr "показать тип объекта"
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:640
msgid "show object size"
msgstr "показать размер объекта"
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:642
msgid "exit with zero when there's no error"
msgstr "выйти с нулевым кодом возврата, если нет ошибки"
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:643
msgid "pretty-print object's content"
msgstr "структурированный вывод содержимого объекта"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:645
msgid "for blob objects, run textconv on object's content"
-msgstr "запустить texconv на содержимом двоичных объектов "
+msgstr "запустить texconv на содержимом двоичных объектов"
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:647
msgid "for blob objects, run filters on object's content"
-msgstr "запуск фильтров на содержимом двоичных объектов "
+msgstr "запуск фильтров на содержимом двоичных объектов"
-#: builtin/cat-file.c:643 git-submodule.sh:936
+#: builtin/cat-file.c:648
msgid "blob"
msgstr "двоичный объект"
-#: builtin/cat-file.c:644
+#: builtin/cat-file.c:649
msgid "use a specific path for --textconv/--filters"
msgstr "использовать определенный путь для --textconv/--filters"
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:651
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "разрешить -s и -t работать с повреждёнными объектами"
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:652
msgid "buffer --batch output"
msgstr "буфферировать вывод --batch"
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:654
msgid "show info and content of objects fed from the standard input"
msgstr "показать информацию и содержимое объектов, переданных из стандартного ввода"
-#: builtin/cat-file.c:653
+#: builtin/cat-file.c:658
msgid "show info about objects fed from the standard input"
msgstr "показать информацию об объектах, переданных из стандартного ввода"
-#: builtin/cat-file.c:657
+#: builtin/cat-file.c:662
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr "переходить по символьным ссылкам внутри дерева (используется с опциями --batch и --batch-check)"
-#: builtin/cat-file.c:659
+#: builtin/cat-file.c:664
msgid "show all objects with --batch or --batch-check"
msgstr "показать все объекты с опциями --batch или --batch-check"
-#: builtin/cat-file.c:661
+#: builtin/cat-file.c:666
msgid "do not order --batch-all-objects output"
msgstr ""
@@ -9236,8 +10767,8 @@
msgid "terminate input and output records by a NUL character"
msgstr "окончание ввода и вывода записей по НУЛЕВОМУ символу"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1355 builtin/gc.c:538
-#: builtin/worktree.c:499
+#: builtin/check-ignore.c:21 builtin/checkout.c:1500 builtin/gc.c:541
+#: builtin/worktree.c:561
msgid "suppress progress reporting"
msgstr "не выводить прогресс выполнения"
@@ -9249,27 +10780,27 @@
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"
@@ -9290,117 +10821,104 @@
msgid "no contacts specified"
msgstr "не указаны контакты"
-#: builtin/checkout-index.c:131
+#: builtin/checkout-index.c:139
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<опции>] [--] [<файл>…]"
-#: builtin/checkout-index.c:148
+#: builtin/checkout-index.c:156
msgid "stage should be between 1 and 3 or all"
msgstr "индекс должен быть между 1 и 3 или all"
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:173
msgid "check out all files in the index"
msgstr "переключиться на состояние всех файлов из индекса"
-#: builtin/checkout-index.c:165
+#: builtin/checkout-index.c:174
msgid "force overwrite of existing files"
msgstr "принудительная перезапись существующих файлов"
-#: builtin/checkout-index.c:167
+#: builtin/checkout-index.c:176
msgid "no warning for existing files and files not in index"
msgstr "не выводить предупреждения для существующих и непроиндексированных файлов"
-#: builtin/checkout-index.c:169
+#: builtin/checkout-index.c:178
msgid "don't checkout new files"
msgstr "не создавать новые файлы"
-#: builtin/checkout-index.c:171
+#: builtin/checkout-index.c:180
msgid "update stat information in the index file"
msgstr "обновить статистику доступа в файле индекса"
-#: builtin/checkout-index.c:175
+#: builtin/checkout-index.c:184
msgid "read list of paths from the standard input"
msgstr "прочитать список путей из стандартного ввода"
-#: builtin/checkout-index.c:177
+#: builtin/checkout-index.c:186
msgid "write the content to temporary files"
msgstr "записать содержимое во временные файлы"
-#: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1375
-#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1856
-#: builtin/worktree.c:672
+#: builtin/checkout-index.c:187 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:757
msgid "string"
msgstr "строка"
-#: builtin/checkout-index.c:179
+#: builtin/checkout-index.c:188
msgid "when creating files, prepend <string>"
msgstr "добавить спереди <строку> при создании файлов"
-#: builtin/checkout-index.c:181
+#: builtin/checkout-index.c:190
msgid "copy out the files from named stage"
msgstr "копировать файлы из указанного индекса"
-#: builtin/checkout.c:32
+#: builtin/checkout.c:31
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<опции>] <ветка>"
-#: builtin/checkout.c:33
+#: builtin/checkout.c:32
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<опции>] [<ветка>] -- <файл>…"
-#: builtin/checkout.c:151 builtin/checkout.c:190
+#: builtin/checkout.c:37
+msgid "git switch [<options>] [<branch>]"
+msgstr ""
+
+#: 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:153 builtin/checkout.c:192
+#: builtin/checkout.c:190 builtin/checkout.c:229
#, c-format
msgid "path '%s' does not have their version"
msgstr "путь «%s» не имеет их версии"
-#: builtin/checkout.c:169
+#: builtin/checkout.c:206
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "путь «%s» не имеет всех необходимых версий"
-#: builtin/checkout.c:219
+#: builtin/checkout.c:258
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "путь «%s» не имеет необходимых версий"
-#: builtin/checkout.c:237
+#: builtin/checkout.c:275
#, c-format
msgid "path '%s': cannot merge"
msgstr "путь «%s»: не удалось слить"
-#: builtin/checkout.c:253
+#: builtin/checkout.c:291
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Не удалось добавить результат слияния «%s»"
-#: builtin/checkout.c:331 builtin/checkout.c:334 builtin/checkout.c:337
-#: builtin/checkout.c:340
-#, c-format
-msgid "'%s' cannot be used with updating paths"
-msgstr "«%s» нельзя использовать при обновлении путей"
-
-#: builtin/checkout.c:343 builtin/checkout.c:346
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "«%s» нельзя использовать одновременно с %s"
-
-#: builtin/checkout.c:349
-#, c-format
-msgid "Cannot update paths and switch to branch '%s' at the same time."
-msgstr "Нельзя обновлять пути и переключаться на ветку «%s» одновременно."
-
-#: builtin/checkout.c:396 builtin/checkout.c:403
-#, c-format
-msgid "path '%s' is unmerged"
-msgstr "путь «%s» не слит"
-
-#: builtin/checkout.c:442
+#: builtin/checkout.c:396
#, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
@@ -9409,7 +10927,7 @@
msgstr[2] ""
msgstr[3] ""
-#: builtin/checkout.c:447
+#: builtin/checkout.c:401
#, c-format
msgid "Updated %d path from %s"
msgid_plural "Updated %d paths from %s"
@@ -9418,7 +10936,7 @@
msgstr[2] ""
msgstr[3] ""
-#: builtin/checkout.c:454
+#: builtin/checkout.c:408
#, c-format
msgid "Updated %d path from the index"
msgid_plural "Updated %d paths from the index"
@@ -9427,66 +10945,97 @@
msgstr[2] ""
msgstr[3] ""
-#: builtin/checkout.c:695
+#: 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 ""
+
+#: builtin/checkout.c:459
+#, c-format
+msgid "'%s' must be used when '%s' is not specified"
+msgstr ""
+
+#: builtin/checkout.c:464 builtin/checkout.c:469
+#, c-format
+msgid "'%s' or '%s' cannot be used with %s"
+msgstr ""
+
+#: builtin/checkout.c:541 builtin/checkout.c:548
+#, c-format
+msgid "path '%s' is unmerged"
+msgstr "путь «%s» не слит"
+
+#: builtin/checkout.c:716
msgid "you need to resolve your current index first"
msgstr "сначала нужно разрешить конфликты в вашем текущем индексе"
-#: builtin/checkout.c:744
+#: builtin/checkout.c:770
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"%s"
msgstr ""
-#: builtin/checkout.c:751
-#, c-format
-msgid "staged changes in the following files may be lost: %s"
-msgstr ""
-
-#: builtin/checkout.c:848
+#: builtin/checkout.c:866
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Не удалось создать журнал ссылок для «%s»: %s\n"
-#: builtin/checkout.c:890
+#: builtin/checkout.c:908
msgid "HEAD is now at"
msgstr "HEAD сейчас на"
-#: builtin/checkout.c:894 builtin/clone.c:701
+#: builtin/checkout.c:912 builtin/clone.c:721 t/helper/test-fast-rebase.c:202
msgid "unable to update HEAD"
msgstr "не удалось обновить HEAD"
-#: builtin/checkout.c:898
+#: builtin/checkout.c:916
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Сброс ветки «%s»\n"
-#: builtin/checkout.c:901
+#: builtin/checkout.c:919
#, c-format
msgid "Already on '%s'\n"
msgstr "Уже на «%s»\n"
-#: builtin/checkout.c:905
+#: builtin/checkout.c:923
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Переключение и сброс ветки «%s»\n"
-#: builtin/checkout.c:907 builtin/checkout.c:1283
+#: builtin/checkout.c:925 builtin/checkout.c:1356
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Переключено на новую ветку «%s»\n"
-#: builtin/checkout.c:909
+#: builtin/checkout.c:927
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Переключено на ветку «%s»\n"
-#: builtin/checkout.c:960
+#: builtin/checkout.c:978
#, c-format
msgid " ... and %d more.\n"
msgstr " … и еще %d.\n"
-#: builtin/checkout.c:966
+#: builtin/checkout.c:984
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -9503,7 +11052,7 @@
msgstr[2] "Предупреждение: вы оставляете позади %d коммитов не соединенные ни с одной из ваших веток:\n\n%s\n"
msgstr[3] "Предупреждение: вы оставляете позади %d коммитов не соединенные ни с одной из ваших веток:\n\n%s\n"
-#: builtin/checkout.c:985
+#: builtin/checkout.c:1003
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -9522,187 +11071,27 @@
msgstr[2] "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n"
msgstr[3] "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n"
-#: builtin/checkout.c:1017
+#: builtin/checkout.c:1038
msgid "internal error in revision walk"
msgstr "внутренняя ошибка при хождении по редакциям"
-#: builtin/checkout.c:1021
+#: builtin/checkout.c:1042
msgid "Previous HEAD position was"
msgstr "Предыдущая позиция HEAD была"
-#: builtin/checkout.c:1052 builtin/checkout.c:1278
+#: builtin/checkout.c:1082 builtin/checkout.c:1351
msgid "You are on a branch yet to be born"
msgstr "Вы находитесь на еще не созданной ветке"
-#: builtin/checkout.c:1173
-#, c-format
-msgid "only one reference expected, %d given."
-msgstr "ожидается только одна ссылка, а передано %d."
-
-#: builtin/checkout.c:1209
+#: builtin/checkout.c:1164
#, 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:1222 builtin/worktree.c:290 builtin/worktree.c:448
-#, c-format
-msgid "invalid reference: %s"
-msgstr "неправильная ссылка: %s"
-
-#: builtin/checkout.c:1251
-#, c-format
-msgid "reference is not a tree: %s"
-msgstr "в дереве нет такой ссылки: %s"
-
-#: builtin/checkout.c:1292
-msgid "paths cannot be used with switching branches"
-msgstr "нельзя использовать пути при переключении веток"
-
-#: builtin/checkout.c:1295 builtin/checkout.c:1299 builtin/checkout.c:1303
-#, c-format
-msgid "'%s' cannot be used with switching branches"
-msgstr "нельзя использовать «%s» при переключении веток"
-
-#: builtin/checkout.c:1307 builtin/checkout.c:1310 builtin/checkout.c:1315
-#: builtin/checkout.c:1318
-#, c-format
-msgid "'%s' cannot be used with '%s'"
-msgstr "«%s» нельзя использовать одновременно с «%s»"
-
-#: builtin/checkout.c:1323
-#, c-format
-msgid "Cannot switch branch to a non-commit '%s'"
-msgstr "Нельзя переключить ветку на не коммит «%s»"
-
-#: builtin/checkout.c:1356 builtin/checkout.c:1358 builtin/clone.c:118
-#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:492
-#: builtin/worktree.c:494
-msgid "branch"
-msgstr "ветка"
-
-#: builtin/checkout.c:1357
-msgid "create and checkout a new branch"
-msgstr "создать и переключиться на новую ветку"
-
-#: builtin/checkout.c:1359
-msgid "create/reset and checkout a branch"
-msgstr "создать/сбросить и перключиться на новую ветку"
-
-#: builtin/checkout.c:1360
-msgid "create reflog for new branch"
-msgstr "создать журнал ссылок для новой ветки"
-
-#: builtin/checkout.c:1361 builtin/worktree.c:496
-msgid "detach HEAD at named commit"
-msgstr "отсоединить HEAD на указанном коммите"
-
-#: builtin/checkout.c:1362
-msgid "set upstream info for new branch"
-msgstr "установить информацию о вышестоящей ветке для новой ветки"
-
-#: builtin/checkout.c:1364
-msgid "new-branch"
-msgstr "новая-ветка"
-
-#: builtin/checkout.c:1364
-msgid "new unparented branch"
-msgstr "новая ветка без родителей"
-
-#: builtin/checkout.c:1366
-msgid "checkout our version for unmerged files"
-msgstr "переключиться на нашу версию для не слитых файлов"
-
-#: builtin/checkout.c:1369
-msgid "checkout their version for unmerged files"
-msgstr "переключиться на их версию для не слитых файлов"
-
-#: builtin/checkout.c:1371
-msgid "force checkout (throw away local modifications)"
-msgstr "принудительное переключение на состояние (отбрасывает все локальные изменения)"
-
-#: builtin/checkout.c:1373
-msgid "perform a 3-way merge with the new branch"
-msgstr "выполнить трехходовое слияние с новой веткой"
-
-#: builtin/checkout.c:1375 builtin/merge.c:284
-msgid "update ignored files (default)"
-msgstr "обновить игнорируемые файлы (по умолчанию)"
-
-#: builtin/checkout.c:1377 builtin/log.c:1594 parse-options.h:317
-msgid "style"
-msgstr "стиль"
-
-#: builtin/checkout.c:1378
-msgid "conflict style (merge or diff3)"
-msgstr "стиль конфликтов слияния (merge или diff3)"
-
-#: builtin/checkout.c:1381
-msgid "do not limit pathspecs to sparse entries only"
-msgstr "не ограничивать спецификаторы пути только частичными записями"
-
-#: builtin/checkout.c:1383
-msgid "do not second guess 'git checkout <no-such-branch>'"
-msgstr ""
-
-#: builtin/checkout.c:1385
-msgid "do not check if another worktree is holding the given ref"
-msgstr "не проверять, что другое дерево уже содержит указанную ссылку"
-
-#: builtin/checkout.c:1389 builtin/clone.c:88 builtin/fetch.c:141
-#: builtin/merge.c:281 builtin/pull.c:136 builtin/push.c:575
-#: builtin/send-pack.c:174
-msgid "force progress reporting"
-msgstr "принудительно выводить прогресс"
-
-#: builtin/checkout.c:1390
-msgid "use overlay mode (default)"
-msgstr ""
-
-#: builtin/checkout.c:1422
-msgid "-b, -B and --orphan are mutually exclusive"
-msgstr "-b, -B и --orphan нельзя использовать одновременно"
-
-#: builtin/checkout.c:1425
-msgid "-p and --overlay are mutually exclusive"
-msgstr ""
-
-#: builtin/checkout.c:1442
-msgid "--track needs a branch name"
-msgstr "--track требует имя ветки"
-
-#: builtin/checkout.c:1447
-msgid "missing branch name; try -b"
-msgstr "пропущено имя ветки; попробуйте -b"
-
-#: builtin/checkout.c:1484
-msgid "invalid path specification"
-msgstr "недопустимый спецификатор пути"
-
-#: builtin/checkout.c:1491
-#, c-format
-msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
-msgstr "«%s» не является коммитом, поэтому невозможно создать из него ветку «%s»"
-
-#: builtin/checkout.c:1495
-#, c-format
-msgid "git checkout: --detach does not take a path argument '%s'"
-msgstr "git checkout: --detach не принимает путь «%s» как аргумент"
-
-#: builtin/checkout.c:1499
+#: builtin/checkout.c:1171
msgid ""
-"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
-"checking out of the index."
-msgstr "git checkout: --ours/--theirs, --force and --merge нельзя использовать одновременно при применении состояния индекса."
-
-#: builtin/checkout.c:1519
-#, 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"
@@ -9713,37 +11102,326 @@
"checkout.defaultRemote=origin in your config."
msgstr ""
-#: builtin/clean.c:28
+#: builtin/checkout.c:1181
+#, c-format
+msgid "'%s' matched multiple (%d) remote tracking branches"
+msgstr ""
+
+#: builtin/checkout.c:1247
+msgid "only one reference expected"
+msgstr ""
+
+#: builtin/checkout.c:1264
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "ожидается только одна ссылка, а передано %d."
+
+#: builtin/checkout.c:1310 builtin/worktree.c:342 builtin/worktree.c:510
+#, c-format
+msgid "invalid reference: %s"
+msgstr "неправильная ссылка: %s"
+
+#: builtin/checkout.c:1323 builtin/checkout.c:1689
+#, c-format
+msgid "reference is not a tree: %s"
+msgstr "в дереве нет такой ссылки: %s"
+
+#: builtin/checkout.c:1370
+#, c-format
+msgid "a branch is expected, got tag '%s'"
+msgstr ""
+
+#: builtin/checkout.c:1372
+#, c-format
+msgid "a branch is expected, got remote branch '%s'"
+msgstr ""
+
+#: builtin/checkout.c:1373 builtin/checkout.c:1381
+#, c-format
+msgid "a branch is expected, got '%s'"
+msgstr ""
+
+#: builtin/checkout.c:1376
+#, c-format
+msgid "a branch is expected, got commit '%s'"
+msgstr ""
+
+#: builtin/checkout.c:1392
+msgid ""
+"cannot switch branch while merging\n"
+"Consider \"git merge --quit\" or \"git worktree add\"."
+msgstr ""
+
+#: builtin/checkout.c:1396
+msgid ""
+"cannot switch branch in the middle of an am session\n"
+"Consider \"git am --quit\" or \"git worktree add\"."
+msgstr ""
+
+#: builtin/checkout.c:1400
+msgid ""
+"cannot switch branch while rebasing\n"
+"Consider \"git rebase --quit\" or \"git worktree add\"."
+msgstr ""
+
+#: builtin/checkout.c:1404
+msgid ""
+"cannot switch branch while cherry-picking\n"
+"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
+msgstr ""
+
+#: builtin/checkout.c:1408
+msgid ""
+"cannot switch branch while reverting\n"
+"Consider \"git revert --quit\" or \"git worktree add\"."
+msgstr ""
+
+#: builtin/checkout.c:1412
+msgid "you are switching branch while bisecting"
+msgstr ""
+
+#: builtin/checkout.c:1419
+msgid "paths cannot be used with switching branches"
+msgstr "нельзя использовать пути при переключении веток"
+
+#: builtin/checkout.c:1422 builtin/checkout.c:1426 builtin/checkout.c:1430
+#, c-format
+msgid "'%s' cannot be used with switching branches"
+msgstr "нельзя использовать «%s» при переключении веток"
+
+#: builtin/checkout.c:1434 builtin/checkout.c:1437 builtin/checkout.c:1440
+#: builtin/checkout.c:1445 builtin/checkout.c:1450
+#, c-format
+msgid "'%s' cannot be used with '%s'"
+msgstr "«%s» нельзя использовать одновременно с «%s»"
+
+#: builtin/checkout.c:1447
+#, c-format
+msgid "'%s' cannot take <start-point>"
+msgstr ""
+
+#: builtin/checkout.c:1455
+#, c-format
+msgid "Cannot switch branch to a non-commit '%s'"
+msgstr "Нельзя переключить ветку на не коммит «%s»"
+
+#: builtin/checkout.c:1462
+msgid "missing branch or commit argument"
+msgstr ""
+
+#: builtin/checkout.c:1504 builtin/clone.c:92 builtin/commit-graph.c:84
+#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:296
+#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:575
+#: builtin/send-pack.c:198
+msgid "force progress reporting"
+msgstr "принудительно выводить прогресс"
+
+#: builtin/checkout.c:1505
+msgid "perform a 3-way merge with the new branch"
+msgstr "выполнить трехходовое слияние с новой веткой"
+
+#: builtin/checkout.c:1506 builtin/log.c:1800 parse-options.h:322
+msgid "style"
+msgstr "стиль"
+
+#: builtin/checkout.c:1507
+msgid "conflict style (merge or diff3)"
+msgstr "стиль конфликтов слияния (merge или diff3)"
+
+#: builtin/checkout.c:1519 builtin/worktree.c:558
+msgid "detach HEAD at named commit"
+msgstr "отсоединить HEAD на указанном коммите"
+
+#: builtin/checkout.c:1520
+msgid "set upstream info for new branch"
+msgstr "установить информацию о вышестоящей ветке для новой ветки"
+
+#: builtin/checkout.c:1522
+msgid "force checkout (throw away local modifications)"
+msgstr "принудительное переключение на состояние (отбрасывает все локальные изменения)"
+
+#: builtin/checkout.c:1524
+msgid "new-branch"
+msgstr "новая-ветка"
+
+#: builtin/checkout.c:1524
+msgid "new unparented branch"
+msgstr "новая ветка без родителей"
+
+#: builtin/checkout.c:1526 builtin/merge.c:300
+msgid "update ignored files (default)"
+msgstr "обновить игнорируемые файлы (по умолчанию)"
+
+#: builtin/checkout.c:1529
+msgid "do not check if another worktree is holding the given ref"
+msgstr "не проверять, что другое дерево уже содержит указанную ссылку"
+
+#: builtin/checkout.c:1542
+msgid "checkout our version for unmerged files"
+msgstr "переключиться на нашу версию для не слитых файлов"
+
+#: builtin/checkout.c:1545
+msgid "checkout their version for unmerged files"
+msgstr "переключиться на их версию для не слитых файлов"
+
+#: builtin/checkout.c:1549
+msgid "do not limit pathspecs to sparse entries only"
+msgstr "не ограничивать спецификаторы пути только частичными записями"
+
+#: builtin/checkout.c:1604
+#, c-format
+msgid "-%c, -%c and --orphan are mutually exclusive"
+msgstr ""
+
+#: builtin/checkout.c:1608
+msgid "-p and --overlay are mutually exclusive"
+msgstr ""
+
+#: builtin/checkout.c:1645
+msgid "--track needs a branch name"
+msgstr "--track требует имя ветки"
+
+#: builtin/checkout.c:1650
+#, c-format
+msgid "missing branch name; try -%c"
+msgstr ""
+
+#: builtin/checkout.c:1682
+#, c-format
+msgid "could not resolve %s"
+msgstr ""
+
+#: builtin/checkout.c:1698
+msgid "invalid path specification"
+msgstr "недопустимый спецификатор пути"
+
+#: builtin/checkout.c:1705
+#, c-format
+msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
+msgstr "«%s» не является коммитом, поэтому невозможно создать из него ветку «%s»"
+
+#: builtin/checkout.c:1709
+#, c-format
+msgid "git checkout: --detach does not take a path argument '%s'"
+msgstr "git checkout: --detach не принимает путь «%s» как аргумент"
+
+#: builtin/checkout.c:1718
+msgid "--pathspec-from-file is incompatible with --detach"
+msgstr ""
+
+#: builtin/checkout.c:1721 builtin/reset.c:325 builtin/stash.c:1499
+msgid "--pathspec-from-file is incompatible with --patch"
+msgstr ""
+
+#: builtin/checkout.c:1734
+msgid ""
+"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
+"checking out of the index."
+msgstr "git checkout: --ours/--theirs, --force and --merge нельзя использовать одновременно при применении состояния индекса."
+
+#: builtin/checkout.c:1739
+msgid "you must specify path(s) to restore"
+msgstr ""
+
+#: builtin/checkout.c:1765 builtin/checkout.c:1767 builtin/checkout.c:1816
+#: builtin/checkout.c:1818 builtin/clone.c:122 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:1766
+msgid "create and checkout a new branch"
+msgstr "создать и переключиться на новую ветку"
+
+#: builtin/checkout.c:1768
+msgid "create/reset and checkout a branch"
+msgstr "создать/сбросить и перключиться на новую ветку"
+
+#: builtin/checkout.c:1769
+msgid "create reflog for new branch"
+msgstr "создать журнал ссылок для новой ветки"
+
+#: builtin/checkout.c:1771
+msgid "second guess 'git checkout <no-such-branch>' (default)"
+msgstr ""
+
+#: builtin/checkout.c:1772
+msgid "use overlay mode (default)"
+msgstr ""
+
+#: builtin/checkout.c:1817
+msgid "create and switch to a new branch"
+msgstr ""
+
+#: builtin/checkout.c:1819
+msgid "create/reset and switch to a branch"
+msgstr ""
+
+#: builtin/checkout.c:1821
+msgid "second guess 'git switch <no-such-branch>'"
+msgstr ""
+
+#: builtin/checkout.c:1823
+msgid "throw away local modifications"
+msgstr ""
+
+#: builtin/checkout.c:1857
+msgid "which tree-ish to checkout from"
+msgstr ""
+
+#: builtin/checkout.c:1859
+msgid "restore the index"
+msgstr ""
+
+#: builtin/checkout.c:1861
+msgid "restore the working tree (default)"
+msgstr ""
+
+#: builtin/checkout.c:1863
+msgid "ignore unmerged entries"
+msgstr ""
+
+#: builtin/checkout.c:1864
+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: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:299 git-add--interactive.perl:579
+#: builtin/clean.c:38
+#, c-format
+msgid "could not lstat %s\n"
+msgstr ""
+
+#: builtin/clean.c:302 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -9752,7 +11430,7 @@
" - (empty) select nothing\n"
msgstr "Справка по выделению:\n1 - выбрать указанный элемент\nfoo - выбрать элемент с указанным префиксом\n - (пусто) не выбирать ничего\n"
-#: builtin/clean.c:303 git-add--interactive.perl:588
+#: builtin/clean.c:306 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -9765,8 +11443,8 @@
" - (empty) finish selecting\n"
msgstr "Справка по выделению:\n1 - выбрать один элемент\n3-5 - выбрать диапазон элементов\n2-3,6-9 - выбрать несколько диапазонов\nfoo - выбрать элемент с указанным префиксом\n-… - убрать выделение с указанных элементов\n* - выбрать все элементы\n - (пусто) завершить выделение\n"
-#: builtin/clean.c:519 git-add--interactive.perl:554
-#: git-add--interactive.perl:559
+#: builtin/clean.c:521 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Хм (%s)?\n"
@@ -9776,27 +11454,22 @@
msgid "Input ignore patterns>> "
msgstr "Шаблоны игнорирования ввода>> "
-#: builtin/clean.c:698
+#: builtin/clean.c:696
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "ПРЕДУПРЕЖДЕНИЕ: Не удалось найти элементы соответствующие: %s"
-#: builtin/clean.c:719
+#: builtin/clean.c:717
msgid "Select items to delete"
msgstr "Укажите элементы для удаления"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:760
+#: builtin/clean.c:758
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Удалить %s [y - да/N - нет]? "
-#: builtin/clean.c:785 git-add--interactive.perl:1717
-#, c-format
-msgid "Bye.\n"
-msgstr "До свидания.\n"
-
-#: builtin/clean.c:793
+#: builtin/clean.c:789
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -9807,15 +11480,7 @@
"? - help for prompt selection"
msgstr "clean - начать очистку\nfilter by pattern - исключить удаление элементов\nselect by numbers - исключить удаление элементов по номерам\nask each - запрашивать подтверждение на удаление каждого элемента (как «rm -i»)\nquit - прекратить очистку\nhelp - этот экран\n? - справка по выделению"
-#: builtin/clean.c:820 git-add--interactive.perl:1793
-msgid "*** Commands ***"
-msgstr "*** Команды ***"
-
-#: builtin/clean.c:821 git-add--interactive.perl:1790
-msgid "What now"
-msgstr "Что теперь"
-
-#: builtin/clean.c:829
+#: builtin/clean.c:825
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Удалить следующие элементы:"
@@ -9823,387 +11488,406 @@
msgstr[2] "Удалить следующие элементы:"
msgstr[3] "Удалить следующие элементы:"
-#: builtin/clean.c:845
+#: builtin/clean.c:841
msgid "No more files to clean, exiting."
msgstr "Больше нет файлов для очистки, выходим."
-#: builtin/clean.c:907
+#: builtin/clean.c:903
msgid "do not print names of files removed"
msgstr "не выводить имена удаляемых файлов"
-#: builtin/clean.c:909
+#: builtin/clean.c:905
msgid "force"
msgstr "принудительно"
-#: builtin/clean.c:910
+#: builtin/clean.c:906
msgid "interactive cleaning"
msgstr "интерактивная очистка"
-#: builtin/clean.c:912
+#: builtin/clean.c:908
msgid "remove whole directories"
msgstr "удалить каталоги полностью"
-#: builtin/clean.c:913 builtin/describe.c:546 builtin/describe.c:548
-#: builtin/grep.c:897 builtin/log.c:171 builtin/log.c:173
-#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419
+#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/grep.c:921 builtin/log.c:183 builtin/log.c:185
+#: 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:914
+#: builtin/clean.c:910
msgid "add <pattern> to ignore rules"
msgstr "добавить <шаблон> в правила игнорирования"
-#: builtin/clean.c:915
+#: builtin/clean.c:911
msgid "remove ignored files, too"
msgstr "также удалить игнорируемые файлы"
-#: builtin/clean.c:917
+#: builtin/clean.c:913
msgid "remove only ignored files"
msgstr "удалить только игнорируемые файлы"
-#: builtin/clean.c:935
-msgid "-x and -X cannot be used together"
-msgstr "нельзя использовать одновременно -x и -X"
-
-#: builtin/clean.c:939
+#: 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:942
+#: 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:44
+#: 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:90
+#: builtin/clone.c:94
msgid "don't create a checkout"
msgstr "не переключать рабочую копию на HEAD"
-#: builtin/clone.c:91 builtin/clone.c:93 builtin/init-db.c:489
+#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:555
msgid "create a bare repository"
msgstr "создать голый репозиторий"
-#: builtin/clone.c:95
+#: builtin/clone.c:99
msgid "create a mirror repository (implies bare)"
msgstr "создать зеркало репозитория (включает в себя и параметр bare)"
-#: builtin/clone.c:97
+#: builtin/clone.c:101
msgid "to clone from a local repository"
msgstr "для клонирования из локального репозитория"
-#: builtin/clone.c:99
+#: builtin/clone.c:103
msgid "don't use local hardlinks, always copy"
msgstr "не использовать жесткие ссылки, всегда копировать файлы"
-#: builtin/clone.c:101
+#: builtin/clone.c:105
msgid "setup as shared repository"
msgstr "настроить как общедоступный репозиторий"
-#: builtin/clone.c:104
+#: builtin/clone.c:107
msgid "pathspec"
msgstr "спецификатор-пути"
-#: builtin/clone.c:104
+#: builtin/clone.c:107
msgid "initialize submodules in the clone"
msgstr "инициализировать подмодули в клоне"
-#: builtin/clone.c:107
+#: builtin/clone.c:111
msgid "number of submodules cloned in parallel"
msgstr "количество подмодулей, которые будут клонированы парралельно"
-#: builtin/clone.c:108 builtin/init-db.c:486
+#: builtin/clone.c:112 builtin/init-db.c:552
msgid "template-directory"
msgstr "каталог-шаблонов"
-#: builtin/clone.c:109 builtin/init-db.c:487
+#: builtin/clone.c:113 builtin/init-db.c:553
msgid "directory from which templates will be used"
msgstr "каталог, шаблоны из которого будут использованы"
-#: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1379
-#: builtin/submodule--helper.c:1859
+#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831
+#: builtin/submodule--helper.c:2336
msgid "reference repository"
msgstr "ссылаемый репозиторий"
-#: builtin/clone.c:115 builtin/submodule--helper.c:1381
-#: builtin/submodule--helper.c:1861
+#: builtin/clone.c:119 builtin/submodule--helper.c:1833
+#: builtin/submodule--helper.c:2338
msgid "use --reference only while cloning"
msgstr "используйте --reference только при клонировании"
-#: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3306 builtin/repack.c:329
+#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:358
msgid "name"
msgstr "имя"
-#: builtin/clone.c:117
+#: builtin/clone.c:121
msgid "use <name> instead of 'origin' to track upstream"
msgstr "использовать <имя> вместо «origin» для отслеживания вышестоящего репозитория"
-#: builtin/clone.c:119
+#: builtin/clone.c:123
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "переключиться на <ветку>, вместо HEAD внешнего репозитория"
-#: builtin/clone.c:121
+#: builtin/clone.c:125
msgid "path to git-upload-pack on the remote"
msgstr "путь к git-upload-pack на внешнем репозитории"
-#: builtin/clone.c:122 builtin/fetch.c:142 builtin/grep.c:836
-#: builtin/pull.c:225
+#: builtin/clone.c:126 builtin/fetch.c:173 builtin/grep.c:860
+#: builtin/pull.c:208
msgid "depth"
msgstr "глубина"
-#: builtin/clone.c:123
+#: builtin/clone.c:127
msgid "create a shallow clone of that depth"
msgstr "сделать частичный клон указанной глубины"
-#: builtin/clone.c:124 builtin/fetch.c:144 builtin/pack-objects.c:3295
+#: builtin/clone.c:128 builtin/fetch.c:175 builtin/pack-objects.c:3535
+#: builtin/pull.c:211
msgid "time"
msgstr "время"
-#: builtin/clone.c:125
+#: builtin/clone.c:129
msgid "create a shallow clone since a specific time"
msgstr "сделать частичный клон до определенного времени"
-#: builtin/clone.c:126 builtin/fetch.c:146 builtin/fetch.c:169
-#: builtin/rebase.c:1389
+#: builtin/clone.c:130 builtin/fetch.c:177 builtin/fetch.c:200
+#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1317
msgid "revision"
msgstr "редакция"
-#: builtin/clone.c:127 builtin/fetch.c:147
+#: builtin/clone.c:131 builtin/fetch.c:178 builtin/pull.c:215
msgid "deepen history of shallow clone, excluding rev"
msgstr "углубить историю частичного клона исключая редакцию"
-#: builtin/clone.c:129
+#: builtin/clone.c:133 builtin/submodule--helper.c:1843
+#: builtin/submodule--helper.c:2352
msgid "clone only one branch, HEAD or --branch"
msgstr "клонировать только одну ветку, HEAD или --branch"
-#: builtin/clone.c:131
+#: builtin/clone.c:135
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr "не клонировать метки, а также настроить, чтобы не клонировались и в дальнейшем"
-#: builtin/clone.c:133
+#: builtin/clone.c:137
msgid "any cloned submodules will be shallow"
msgstr "все склонированные подмодули будут частичными клонами"
-#: builtin/clone.c:134 builtin/init-db.c:495
+#: builtin/clone.c:138 builtin/init-db.c:561
msgid "gitdir"
msgstr "каталог-git"
-#: builtin/clone.c:135 builtin/init-db.c:496
+#: builtin/clone.c:139 builtin/init-db.c:562
msgid "separate git dir from working tree"
msgstr "разместить каталог git отдельно от рабочей копии"
-#: builtin/clone.c:136
+#: builtin/clone.c:140
msgid "key=value"
msgstr "ключ=значение"
-#: builtin/clone.c:137
+#: builtin/clone.c:141
msgid "set config inside the new repository"
msgstr "установить параметры внутри нового репозитория"
-#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76
-#: builtin/push.c:585 builtin/send-pack.c:172
+#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76
+#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
msgid "server-specific"
msgstr "зависит-от-сервера"
-#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76
-#: builtin/push.c:585 builtin/send-pack.c:173
+#: builtin/clone.c:143 builtin/fetch.c:195 builtin/ls-remote.c:76
+#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
msgid "option to transmit"
msgstr "передаваемые опции"
-#: builtin/clone.c:140 builtin/fetch.c:165 builtin/pull.c:238
-#: builtin/push.c:586
+#: builtin/clone.c:144 builtin/fetch.c:196 builtin/pull.c:234
+#: builtin/push.c:585
msgid "use IPv4 addresses only"
msgstr "использовать только IPv4 адреса"
-#: builtin/clone.c:142 builtin/fetch.c:167 builtin/pull.c:241
-#: builtin/push.c:588
+#: builtin/clone.c:146 builtin/fetch.c:198 builtin/pull.c:237
+#: builtin/push.c:587
msgid "use IPv6 addresses only"
msgstr "использовать только IPv6 адреса"
-#: builtin/clone.c:280
+#: builtin/clone.c:150
+msgid "any cloned submodules will use their remote-tracking branch"
+msgstr ""
+
+#: builtin/clone.c:152
+msgid "initialize sparse-checkout file to include only files at root"
+msgstr ""
+
+#: builtin/clone.c:288
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
msgstr "Имя каталога не может быть угадано.\nУкажите имя каталога с помощью параметра командной строки"
-#: builtin/clone.c:333
+#: builtin/clone.c:341
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "информация: Не удалось добавить альтернативу для «%s»: %s\n"
-#: builtin/clone.c:405
-#, c-format
-msgid "failed to open '%s'"
-msgstr "не удалось открыть «%s»"
-
-#: builtin/clone.c:413
+#: builtin/clone.c:414
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s уже существует и не является каталогом"
-#: builtin/clone.c:427
+#: builtin/clone.c:432
#, c-format
-msgid "failed to stat %s\n"
-msgstr "не удалось выполнить stat %s\n"
+msgid "failed to start iterator over '%s'"
+msgstr ""
-#: builtin/clone.c:444
-#, c-format
-msgid "failed to unlink '%s'"
-msgstr "сбой отсоединения «%s»"
-
-#: builtin/clone.c:449
+#: builtin/clone.c:463
#, c-format
msgid "failed to create link '%s'"
msgstr "не удалось создать ссылку «%s»"
-#: builtin/clone.c:453
+#: builtin/clone.c:467
#, c-format
msgid "failed to copy file to '%s'"
msgstr "не удалось копировать файл в «%s»"
-#: builtin/clone.c:479
+#: builtin/clone.c:472
+#, c-format
+msgid "failed to iterate over '%s'"
+msgstr ""
+
+#: builtin/clone.c:499
#, c-format
msgid "done.\n"
msgstr "готово.\n"
-#: builtin/clone.c:493
+#: builtin/clone.c:513
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"
-msgstr "Клонирование прошло успешно, но во время переключения состояния произошла ошибка.\nС помощь команды «git status» вы можете просмотреть, какие файлы были обновлены,\nа с помощью «git checkout -f HEAD» можно повторить попытку переключения на ветку \n"
+"and retry with 'git restore --source=HEAD :/'\n"
+msgstr "Клонирование прошло успешно, но во время переключения на состояние произошла ошибка.\nС помощь команды «git status» вы можете просмотреть какие файлы были обновлены,\nа повторить попытку перехода на версию можно с помощью «git restore --source=HEAD :/»\n"
-#: builtin/clone.c:570
+#: builtin/clone.c:590
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Не удалось найти внешнюю ветку %s для клонирования."
-#: builtin/clone.c:689
+#: builtin/clone.c:709
#, c-format
msgid "unable to update %s"
msgstr "не удалось обновить %s"
-#: builtin/clone.c:739
-msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
-msgstr "внешний HEAD ссылается на несуществующую ссылку, нельзя переключиться на такую версию.\n"
+#: builtin/clone.c:757
+msgid "failed to initialize sparse-checkout"
+msgstr ""
-#: builtin/clone.c:770
+#: builtin/clone.c:780
+msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+msgstr "внешний HEAD ссылается на несуществующую ссылку, нельзя переключиться на такое состояние.\n"
+
+#: builtin/clone.c:812
msgid "unable to checkout working tree"
msgstr "не удалось переключиться на версию в рабочем каталоге"
-#: builtin/clone.c:815
+#: builtin/clone.c:887
msgid "unable to write parameters to config file"
msgstr "не удалось записать параметры в файл конфигурации"
-#: builtin/clone.c:878
+#: builtin/clone.c:950
msgid "cannot repack to clean up"
msgstr "не удалось выполнить перепаковку для очистки"
-#: builtin/clone.c:880
+#: builtin/clone.c:952
msgid "cannot unlink temporary alternates file"
msgstr "не удалось отсоединить временные альтернативные файлы"
-#: builtin/clone.c:920 builtin/receive-pack.c:1952
+#: builtin/clone.c:992 builtin/receive-pack.c:2493
msgid "Too many arguments."
msgstr "Слишком много аргументов."
-#: builtin/clone.c:924
+#: builtin/clone.c:996
msgid "You must specify a repository to clone."
msgstr "Вы должны указать репозиторий для клонирования."
-#: builtin/clone.c:937
+#: builtin/clone.c:1009
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare и --origin %s нельзя использовать одновременно."
-#: builtin/clone.c:940
+#: builtin/clone.c:1012
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare и --separate-git-dir нельзя использовать одновременно."
-#: builtin/clone.c:953
+#: builtin/clone.c:1025
#, c-format
msgid "repository '%s' does not exist"
msgstr "репозиторий «%s» не существует"
-#: builtin/clone.c:959 builtin/fetch.c:1610
+#: builtin/clone.c:1029 builtin/fetch.c:1841
#, c-format
msgid "depth %s is not a positive number"
msgstr "глубина %s не является положительным числом"
-#: builtin/clone.c:969
+#: builtin/clone.c:1039
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "целевой путь «%s» уже существует и не является пустым каталогом."
-#: builtin/clone.c:979
+#: builtin/clone.c:1045
+#, c-format
+msgid "repository path '%s' already exists and is not an empty directory."
+msgstr ""
+
+#: builtin/clone.c:1059
#, c-format
msgid "working tree '%s' already exists."
msgstr "рабочий каталог «%s» уже существует."
-#: builtin/clone.c:994 builtin/clone.c:1015 builtin/difftool.c:264
-#: builtin/worktree.c:296 builtin/worktree.c:328
+#: builtin/clone.c:1074 builtin/clone.c:1095 builtin/difftool.c:271
+#: builtin/log.c:1987 builtin/worktree.c:354 builtin/worktree.c:386
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "не удалось создать родительские каталоги для «%s»"
-#: builtin/clone.c:999
+#: builtin/clone.c:1079
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "не удалось создать рабочий каталог «%s»"
-#: builtin/clone.c:1019
+#: builtin/clone.c:1099
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Клонирование в голый репозиторий «%s»…\n"
-#: builtin/clone.c:1021
+#: builtin/clone.c:1101
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Клонирование в «%s»…\n"
-#: builtin/clone.c:1045
+#: builtin/clone.c:1125
msgid ""
"clone --recursive is not compatible with both --reference and --reference-"
"if-able"
msgstr "клонирование с параметром --recursive нельзя использовать одновременно ни с --reference, ни с --reference-if-able"
-#: builtin/clone.c:1106
+#: builtin/clone.c:1169 builtin/remote.c:200 builtin/remote.c:705
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr "«%s» не является допустимым именем внешнего репозитория."
+
+#: builtin/clone.c:1210
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth игнорируется на локальных клонах; вместо этого используйте file://."
-#: builtin/clone.c:1108
+#: builtin/clone.c:1212
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "--shallow-since игнорируется на локальных клонах; используйте file:// вместо этого."
-#: builtin/clone.c:1110
+#: builtin/clone.c:1214
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr "--shallow-exclude игнорируется на локальных клонах; используйте file:// вместо этого."
-#: builtin/clone.c:1112
+#: builtin/clone.c:1216
msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1115
+#: builtin/clone.c:1219
msgid "source repository is shallow, ignoring --local"
msgstr "исходный репозиторий является частичным, --local игнорируется"
-#: builtin/clone.c:1120
+#: builtin/clone.c:1224
msgid "--local is ignored"
msgstr "--local игнорируется"
-#: builtin/clone.c:1197 builtin/clone.c:1205
+#: builtin/clone.c:1311 builtin/clone.c:1319
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Внешняя ветка %s не найдена в вышестоящем репозитории %s"
-#: builtin/clone.c:1208
+#: builtin/clone.c:1322
msgid "You appear to have cloned an empty repository."
msgstr "Похоже, что вы клонировали пустой репозиторий."
@@ -10239,6 +11923,107 @@
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 ""
+
+#: 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:1769
+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 "Не удалось открыть файл commit-graph «%s»"
+
+#: 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 "искать коммиты в pack-indexes, перечисленных на стандартном вводе"
+
+#: 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 "
@@ -10250,7 +12035,7 @@
msgid "duplicate parent %s ignored"
msgstr ""
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:520
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:555
#, c-format
msgid "not a valid object name %s"
msgstr ""
@@ -10258,17 +12043,17 @@
#: builtin/commit-tree.c:93
#, c-format
msgid "git commit-tree: failed to open '%s'"
-msgstr ""
+msgstr "git commit-tree: сбой при открытии «%s»"
#: builtin/commit-tree.c:96
#, c-format
msgid "git commit-tree: failed to read '%s'"
-msgstr ""
+msgstr "git commit-tree: сбой при чтении «%s»"
#: builtin/commit-tree.c:98
#, c-format
msgid "git commit-tree: failed to close '%s'"
-msgstr ""
+msgstr "git commit-tree: сбой при закрытии «%s»"
#: builtin/commit-tree.c:111
msgid "parent"
@@ -10278,32 +12063,32 @@
msgid "id of a parent commit object"
msgstr ""
-#: builtin/commit-tree.c:114 builtin/commit.c:1480 builtin/merge.c:268
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1473
-#: builtin/tag.c:406
+#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:281
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1470
+#: builtin/tag.c:413
msgid "message"
msgstr "сообщение"
-#: builtin/commit-tree.c:115 builtin/commit.c:1480
+#: 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 ""
+msgstr "прочитать сообщение коммита из файла"
-#: builtin/commit-tree.c:121 builtin/commit.c:1492 builtin/merge.c:283
-#: builtin/pull.c:193 builtin/revert.c:117
+#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:298
+#: 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 ""
+msgstr "необходимо указать одно дерево"
#: builtin/commit-tree.c:140
msgid "git commit-tree: failed to read"
-msgstr ""
+msgstr "git commit-tree: сбой при чтении"
#: builtin/commit.c:41
msgid "git commit [<options>] [--] <pathspec>..."
@@ -10330,138 +12115,155 @@
msgstr "Копируемый коммит теперь пуст, возможно после разрешения конфликтов.\nЕсли вы все равно хотите сделать пустой коммит, используйте:\n\n git commit --allow-empty\n\n"
#: builtin/commit.c:63
-msgid "Otherwise, please use 'git reset'\n"
-msgstr "В противном случае, используйте «git reset»\n"
+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 ""
+
+#: 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 reset\n"
+" git cherry-pick --skip\n"
"\n"
-"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-"the remaining commits.\n"
-msgstr "Если вы хотите пропустит этот коммит, используйте команду:\n\n git reset\n\nПосле этого «git cherry-pick --continue» продолжит копирование оставшихся коммитов.\n"
+msgstr ""
#: builtin/commit.c:312
msgid "failed to unpack HEAD tree object"
msgstr "сбой распаковки объекта дерева HEAD"
-#: builtin/commit.c:353
+#: 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 "Указание путей каталогов с опциями --include/--only не имеет смысла."
+
+#: builtin/commit.c:373
msgid "unable to create temporary index"
msgstr "не удалось создать временный индекс"
-#: builtin/commit.c:359
+#: builtin/commit.c:382
msgid "interactive add failed"
msgstr "сбой интерактивного добавления"
-#: builtin/commit.c:373
+#: builtin/commit.c:397
msgid "unable to update temporary index"
msgstr "не удалось обновить временный индекс"
-#: builtin/commit.c:375
+#: builtin/commit.c:399
msgid "Failed to update main cache tree"
msgstr "Сбой при обновлении основного кэша дерева"
-#: builtin/commit.c:400 builtin/commit.c:423 builtin/commit.c:469
+#: 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:452
+#: builtin/commit.c:476
msgid "cannot do a partial commit during a merge."
msgstr "нельзя создать частичный коммит во время слияния."
-#: builtin/commit.c:454
+#: builtin/commit.c:478
msgid "cannot do a partial commit during a cherry-pick."
msgstr "нельзя создать частичный коммит во время копирования коммита."
-#: builtin/commit.c:462
+#: 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:481
+#: builtin/commit.c:507
msgid "unable to write temporary index file"
msgstr "не удалось записать временный файл индекса"
-#: builtin/commit.c:579
+#: builtin/commit.c:605
#, c-format
msgid "commit '%s' lacks author header"
msgstr "у коммита «%s» отсутствует автор в заголовке"
-#: builtin/commit.c:581
+#: builtin/commit.c:607
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "у коммита «%s» строка автора в неправильном формате"
-#: builtin/commit.c:600
+#: builtin/commit.c:626
msgid "malformed --author parameter"
msgstr "параметр --author в неправильном формате"
-#: builtin/commit.c:653
+#: builtin/commit.c:679
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr "нельзя выбрать символ комментария, который\nне используется в текущем сообщении коммита"
-#: builtin/commit.c:691 builtin/commit.c:724 builtin/commit.c:1069
+#: 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:703 builtin/shortlog.c:319
+#: builtin/commit.c:729 builtin/shortlog.c:425
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(чтение файла журнала из стандартного ввода)\n"
-#: builtin/commit.c:705
+#: builtin/commit.c:731
msgid "could not read log from standard input"
msgstr "не удалось прочитать файл журнала из стандартного ввода"
-#: builtin/commit.c:709
+#: builtin/commit.c:735
#, c-format
msgid "could not read log file '%s'"
msgstr "не удалось прочитать файл журнала «%s»"
-#: builtin/commit.c:740 builtin/commit.c:756
+#: builtin/commit.c:766 builtin/commit.c:782
msgid "could not read SQUASH_MSG"
msgstr "не удалось прочитать SQUASH_MSG"
-#: builtin/commit.c:747
+#: builtin/commit.c:773
msgid "could not read MERGE_MSG"
msgstr "не удалось прочитать MERGE_MSG"
-#: builtin/commit.c:807
+#: builtin/commit.c:833
msgid "could not write commit template"
msgstr "не удалось записать шаблон описания коммита"
-#: builtin/commit.c:826
-#, 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\t%s\nи попробуйте снова.\n"
+msgstr ""
-#: builtin/commit.c:831
-#, 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\t%s\nи попробуйте снова.\n"
+msgstr ""
-#: builtin/commit.c:844
+#: 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 "Пожалуйста, введите сообщение коммита для ваших изменений. Строки,\nначинающиеся с «%c» будут проигнорированы, а пустое сообщение\nотменяет процесс коммита.\n"
-#: builtin/commit.c:852
+#: builtin/commit.c:876
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -10469,583 +12271,541 @@
"An empty message aborts the commit.\n"
msgstr "Пожалуйста, введите сообщение коммита для ваших изменений. Строки,\nначинающиеся с «%c» будут оставлены; вы можете удалить их вручную,\nесли хотите. Пустое сообщение отменяет процесс коммита.\n"
-#: builtin/commit.c:869
+#: builtin/commit.c:893
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sАвтор: %.*s <%.*s>"
-#: builtin/commit.c:877
+#: builtin/commit.c:901
#, c-format
msgid "%sDate: %s"
msgstr "%sДата: %s"
-#: builtin/commit.c:884
+#: builtin/commit.c:908
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sКоммитер: %.*s <%.*s>"
-#: builtin/commit.c:902
+#: builtin/commit.c:926
msgid "Cannot read index"
msgstr "Не удалось прочитать индекс"
-#: builtin/commit.c:969
+#: builtin/commit.c:997
msgid "Error building trees"
msgstr "Ошибка при построении деревьев"
-#: builtin/commit.c:983 builtin/tag.c:269
+#: 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:1027
+#: builtin/commit.c:1055
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr "--author «%s» не в формате «Имя <почта>» и не совпадает с существующим автором"
-#: builtin/commit.c:1041
+#: builtin/commit.c:1069
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Недопустимый режим показа игнорируемых файлов «%s»"
-#: builtin/commit.c:1059 builtin/commit.c:1284
+#: builtin/commit.c:1087 builtin/commit.c:1331
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Неправильный режим неотслеживаемых файлов «%s»"
-#: builtin/commit.c:1097
+#: builtin/commit.c:1127
msgid "--long and -z are incompatible"
msgstr "--long и -z нельзя использовать одновременно"
-#: builtin/commit.c:1130
+#: builtin/commit.c:1171
msgid "Using both --reset-author and --author does not make sense"
msgstr "Указание одновременно опций --reset-author и --author не имеет смысла"
-#: builtin/commit.c:1139
+#: builtin/commit.c:1180
msgid "You have nothing to amend."
msgstr "Нечего исправлять."
-#: builtin/commit.c:1142
+#: builtin/commit.c:1183
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Вы в процессе слияния — сейчас нельзя исправлять."
-#: builtin/commit.c:1144
+#: builtin/commit.c:1185
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Вы в процессе копирования коммита — сейчас нельзя исправлять."
-#: builtin/commit.c:1147
+#: 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:1157
+#: builtin/commit.c:1200
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Может использоваться только одна из опций -c/-C/-F/--fixup."
-#: builtin/commit.c:1159
+#: builtin/commit.c:1202
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr ""
-#: builtin/commit.c:1167
+#: 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:1184
+#: 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:1186
-msgid "No paths with --include/--only does not make sense."
-msgstr "Указание путей каталогов с опциями --include/--only не имеет смысла."
-
-#: builtin/commit.c:1192
+#: builtin/commit.c:1235
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr ""
-#: builtin/commit.c:1319 builtin/commit.c:1503
+#: builtin/commit.c:1366 builtin/commit.c:1527
msgid "show status concisely"
msgstr "кратко показать статус"
-#: builtin/commit.c:1321 builtin/commit.c:1505
+#: builtin/commit.c:1368 builtin/commit.c:1529
msgid "show branch information"
msgstr "показать информацию о версии"
-#: builtin/commit.c:1323
+#: builtin/commit.c:1370
msgid "show stash information"
msgstr "показать информацию о спрятанном"
-#: builtin/commit.c:1325 builtin/commit.c:1507
+#: builtin/commit.c:1372 builtin/commit.c:1531
msgid "compute full ahead/behind values"
msgstr ""
-#: builtin/commit.c:1327
+#: builtin/commit.c:1374
msgid "version"
msgstr "версия"
-#: builtin/commit.c:1327 builtin/commit.c:1509 builtin/push.c:561
-#: builtin/worktree.c:643
+#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560
+#: builtin/worktree.c:725
msgid "machine-readable output"
msgstr "машиночитаемый вывод"
-#: builtin/commit.c:1330 builtin/commit.c:1511
+#: builtin/commit.c:1377 builtin/commit.c:1535
msgid "show status in long format (default)"
msgstr "показать статус в длинном формате (по умолчанию)"
-#: builtin/commit.c:1333 builtin/commit.c:1514
+#: builtin/commit.c:1380 builtin/commit.c:1538
msgid "terminate entries with NUL"
msgstr "завершать записи НУЛЕВЫМ байтом"
-#: builtin/commit.c:1335 builtin/commit.c:1339 builtin/commit.c:1517
-#: builtin/fast-export.c:1085 builtin/fast-export.c:1088 builtin/rebase.c:1465
-#: parse-options.h:331
+#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541
+#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
+#: builtin/fast-export.c:1204 builtin/rebase.c:1406 parse-options.h:336
msgid "mode"
msgstr "режим"
-#: builtin/commit.c:1336 builtin/commit.c:1517
+#: 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:1340
+#: builtin/commit.c:1387
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
msgstr "показывать игнорируемые файлы, с опциональным режимом: traditional (традиционный), matching (только совпадающие), no (не показывать). (По умолчанию: traditional)"
-#: builtin/commit.c:1342 parse-options.h:179
+#: builtin/commit.c:1389 parse-options.h:192
msgid "when"
msgstr "когда"
-#: builtin/commit.c:1343
+#: builtin/commit.c:1390
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr "игнорировать изменения в подмодулях, опционально когда: all (всегда), dirty (изменённые), untracked (неотслеживаемые). (По умолчанию: all)"
-#: builtin/commit.c:1345
+#: builtin/commit.c:1392
msgid "list untracked files in columns"
msgstr "показать неотслеживаемые файлы по столбцам"
-#: builtin/commit.c:1346
+#: builtin/commit.c:1393
msgid "do not detect renames"
msgstr "не определять переименования"
-#: builtin/commit.c:1348
+#: builtin/commit.c:1395
msgid "detect renames, optionally set similarity index"
msgstr "определять переименования, опционально устанавливать рейтинг сходства"
-#: builtin/commit.c:1368
+#: builtin/commit.c:1415
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr "Неподдерживаемая комбинация аргументов отображения игнорируемых и неотслеживаемых файлов"
-#: builtin/commit.c:1473
+#: builtin/commit.c:1497
msgid "suppress summary after successful commit"
msgstr "не выводить сводку изменений после успешного коммита"
-#: builtin/commit.c:1474
+#: builtin/commit.c:1498
msgid "show diff in commit message template"
msgstr "добавить список изменений в шаблон сообщения коммита"
-#: builtin/commit.c:1476
+#: builtin/commit.c:1500
msgid "Commit message options"
msgstr "Опции сообщения коммита"
-#: builtin/commit.c:1477 builtin/merge.c:272 builtin/tag.c:408
+#: builtin/commit.c:1501 builtin/merge.c:285 builtin/tag.c:415
msgid "read message from file"
msgstr "прочитать сообщение из файла"
-#: builtin/commit.c:1478
+#: builtin/commit.c:1502
msgid "author"
msgstr "автор"
-#: builtin/commit.c:1478
+#: builtin/commit.c:1502
msgid "override author for commit"
msgstr "подменить автора коммита"
-#: builtin/commit.c:1479 builtin/gc.c:539
+#: builtin/commit.c:1503 builtin/gc.c:542
msgid "date"
msgstr "дата"
-#: builtin/commit.c:1479
+#: builtin/commit.c:1503
msgid "override date for commit"
msgstr "подменить дату коммита"
-#: builtin/commit.c:1481 builtin/commit.c:1482 builtin/commit.c:1483
-#: builtin/commit.c:1484 parse-options.h:323 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:1481
+#: builtin/commit.c:1505
msgid "reuse and edit message from specified commit"
msgstr "использовать и отредактировать сообщение от указанного коммита"
-#: builtin/commit.c:1482
+#: builtin/commit.c:1506
msgid "reuse message from specified commit"
msgstr "использовать сообщение указанного коммита"
-#: builtin/commit.c:1483
+#: builtin/commit.c:1507
msgid "use autosquash formatted message to fixup specified commit"
msgstr "использовать форматированное сообщение автоуплотнения для исправления указанного коммита"
-#: builtin/commit.c:1484
+#: builtin/commit.c:1508
msgid "use autosquash formatted message to squash specified commit"
msgstr "использовать форматированное сообщение автоуплотнения для уплотнения указанного коммита"
-#: builtin/commit.c:1485
+#: builtin/commit.c:1509
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "коммит теперь за моим авторством (используется с -C/-c/--amend)"
-#: builtin/commit.c:1486 builtin/log.c:1541 builtin/merge.c:285
-#: builtin/pull.c:162 builtin/revert.c:109
-msgid "add Signed-off-by:"
-msgstr "добавить Signed-off-by:"
+#: builtin/commit.c:1510 builtin/log.c:1744 builtin/merge.c:301
+#: builtin/pull.c:145 builtin/revert.c:110
+msgid "add a Signed-off-by trailer"
+msgstr ""
-#: builtin/commit.c:1487
+#: builtin/commit.c:1511
msgid "use specified template file"
msgstr "использовать указанный файл шаблона"
-#: builtin/commit.c:1488
+#: builtin/commit.c:1512
msgid "force edit of commit"
msgstr "принудительно редактировать коммит"
-#: builtin/commit.c:1490
+#: builtin/commit.c:1514
msgid "include status in commit message template"
msgstr "включить статус файлов в шаблон сообщения коммита"
-#: builtin/commit.c:1495
+#: builtin/commit.c:1519
msgid "Commit contents options"
msgstr "Опции содержимого коммита"
-#: builtin/commit.c:1496
+#: builtin/commit.c:1520
msgid "commit all changed files"
msgstr "закоммитить все измененные файлы"
-#: builtin/commit.c:1497
+#: builtin/commit.c:1521
msgid "add specified files to index for commit"
msgstr "добавить указанные файлы в индекс для коммита"
-#: builtin/commit.c:1498
+#: builtin/commit.c:1522
msgid "interactively add files"
msgstr "интерактивное добавление файлов"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1523
msgid "interactively add changes"
msgstr "интерактивное добавление изменений"
-#: builtin/commit.c:1500
+#: builtin/commit.c:1524
msgid "commit only specified files"
msgstr "закоммитить только указанные файлы"
-#: builtin/commit.c:1501
+#: builtin/commit.c:1525
msgid "bypass pre-commit and commit-msg hooks"
msgstr "пропустить перехватчик pre-commit и commit-msg"
-#: builtin/commit.c:1502
+#: builtin/commit.c:1526
msgid "show what would be committed"
msgstr "показать, что будет закоммичено"
-#: builtin/commit.c:1515
+#: builtin/commit.c:1539
msgid "amend previous commit"
msgstr "исправить предыдущий коммит"
-#: builtin/commit.c:1516
+#: builtin/commit.c:1540
msgid "bypass post-rewrite hook"
msgstr "пропустить перехватчик post-rewrite"
-#: builtin/commit.c:1521
+#: builtin/commit.c:1547
msgid "ok to record an empty change"
msgstr "разрешить запись пустого коммита"
-#: builtin/commit.c:1523
+#: builtin/commit.c:1549
msgid "ok to record a change with an empty message"
msgstr "разрешить запись изменений с пустым сообщением"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1622
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Файл MERGE_HEAD поврежден (%s)"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1629
msgid "could not read MERGE_MODE"
msgstr "не удалось прочитать MERGE_MODE"
-#: builtin/commit.c:1622
+#: builtin/commit.c:1650
#, c-format
msgid "could not read commit message: %s"
msgstr "не удалось открыть сообщение коммита: %s"
-#: builtin/commit.c:1629
+#: builtin/commit.c:1657
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Отмена коммита из-за пустого сообщения коммита.\n"
-#: builtin/commit.c:1634
+#: builtin/commit.c:1662
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Отмена коммита; вы не изменили сообщение.\n"
-#: builtin/commit.c:1668
+#: 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 reset HEAD\" to recover."
-msgstr "репозиторий был обновлен, но не удалось записать файл new_index. Удостоверьтесь, что на диске есть свободное место и квота не исчерпана, а после этого запустите «git reset HEAD» для восстановления."
-
-#: builtin/commit-graph.c:10
-msgid "git commit-graph [--object-dir <objdir>]"
-msgstr "git commit-graph [--object-dir <каталог-объектов>]"
-
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
-msgid "git commit-graph read [--object-dir <objdir>]"
-msgstr "git commit-graph read [--object-dir <каталог-объектов>]"
-
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
-msgid "git commit-graph verify [--object-dir <objdir>]"
-msgstr "git commit-graph verify [--object-dir <каталог-объектов>]"
-
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
-msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append] [--reachable"
-"|--stdin-packs|--stdin-commits]"
-msgstr "git commit-graph write [--object-dir <каталог-объектов>] [--append] [--reachable|--stdin-packs|--stdin-commits]"
-
-#: builtin/commit-graph.c:51 builtin/commit-graph.c:89
-#: builtin/commit-graph.c:147 builtin/commit-graph.c:205 builtin/fetch.c:153
-#: builtin/log.c:1561
-msgid "dir"
-msgstr "каталог"
-
-#: builtin/commit-graph.c:52 builtin/commit-graph.c:90
-#: builtin/commit-graph.c:148 builtin/commit-graph.c:206
-msgid "The object directory to store the graph"
-msgstr "Каталог объектов для сохранения графа"
-
-#: builtin/commit-graph.c:68 builtin/commit-graph.c:105
-#, c-format
-msgid "Could not open commit-graph '%s'"
-msgstr "Не удалось открыть файл commit-graph «%s»"
-
-#: builtin/commit-graph.c:150
-msgid "start walk at all refs"
-msgstr "начать со всех ссылок"
-
-#: builtin/commit-graph.c:152
-msgid "scan pack-indexes listed by stdin for commits"
-msgstr "искать коммиты в pack-indexes, перечисленных на стандартном вводе"
-
-#: builtin/commit-graph.c:154
-msgid "start walk at commits listed by stdin"
-msgstr "начать с коммитов, перечисленных на стандартном вводе"
-
-#: builtin/commit-graph.c:156
-msgid "include all commits already in the commit-graph file"
-msgstr "включить все коммиты, которые уже есть в файле commit-graph"
-
-#: builtin/commit-graph.c:165
-msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
-msgstr "используйте что-то одно из --reachable, --stdin-commits и --stdin-packs"
+"not exceeded, and then \"git restore --staged :/\" to recover."
+msgstr "репозиторий был обновлен, но не удалось записать файл new_index. Удостоверьтесь, что на диске есть свободное место и квота не исчерпана, а после этого запустите «git restore --staged :/» для восстановления."
#: builtin/config.c:11
msgid "git config [<options>]"
msgstr "git config [<опции>]"
-#: builtin/config.c:103
+#: builtin/config.c:109 builtin/env--helper.c:27
#, c-format
msgid "unrecognized --type argument, %s"
msgstr ""
-#: builtin/config.c:115
+#: builtin/config.c:121
msgid "only one type at a time"
msgstr ""
-#: builtin/config.c:124
+#: builtin/config.c:130
msgid "Config file location"
msgstr "Размещение файла конфигурации"
-#: builtin/config.c:125
+#: builtin/config.c:131
msgid "use global config file"
msgstr "использовать глобальный файл конфигурации"
-#: builtin/config.c:126
+#: builtin/config.c:132
msgid "use system config file"
msgstr "использовать системный файл конфигурации"
-#: builtin/config.c:127
+#: builtin/config.c:133
msgid "use repository config file"
msgstr "использовать файл конфигурации репозитория"
-#: builtin/config.c:128
+#: builtin/config.c:134
msgid "use per-worktree config file"
msgstr ""
-#: builtin/config.c:129
+#: builtin/config.c:135
msgid "use given config file"
msgstr "использовать указанный файл конфигурации"
-#: builtin/config.c:130
+#: builtin/config.c:136
msgid "blob-id"
msgstr "идент-двоичн-объекта"
-#: builtin/config.c:130
+#: builtin/config.c:136
msgid "read config from given blob object"
msgstr "прочитать настройки из указанного двоичного объекта"
-#: builtin/config.c:131
+#: builtin/config.c:137
msgid "Action"
msgstr "Действие"
-#: builtin/config.c:132
-msgid "get value: name [value-regex]"
-msgstr "получить значение: имя [шаблон-значений]"
+#: builtin/config.c:138
+msgid "get value: name [value-pattern]"
+msgstr ""
-#: builtin/config.c:133
-msgid "get all values: key [value-regex]"
-msgstr "получить все значения: ключ [шаблон-значений]"
+#: builtin/config.c:139
+msgid "get all values: key [value-pattern]"
+msgstr ""
-#: builtin/config.c:134
-msgid "get values for regexp: name-regex [value-regex]"
-msgstr "получить значения по шаблону: шаблон-имен [шаблон-значений]"
+#: builtin/config.c:140
+msgid "get values for regexp: name-regex [value-pattern]"
+msgstr ""
-#: builtin/config.c:135
+#: builtin/config.c:141
msgid "get value specific for the URL: section[.var] URL"
msgstr "получить значение, специфичное для URL: раздел[.переменная] URL"
-#: builtin/config.c:136
-msgid "replace all matching variables: name value [value_regex]"
-msgstr "заменить все соответствующие переменные: имя значение [шаблон-значений]"
+#: builtin/config.c:142
+msgid "replace all matching variables: name value [value-pattern]"
+msgstr ""
-#: builtin/config.c:137
+#: builtin/config.c:143
msgid "add a new variable: name value"
msgstr "добавить новую переменную: имя значение"
-#: builtin/config.c:138
-msgid "remove a variable: name [value-regex]"
-msgstr "удалить переменную: имя [шаблон-значений]"
+#: builtin/config.c:144
+msgid "remove a variable: name [value-pattern]"
+msgstr ""
-#: builtin/config.c:139
-msgid "remove all matches: name [value-regex]"
-msgstr "удалить все совпадающие: имя [шаблон-значений]"
+#: builtin/config.c:145
+msgid "remove all matches: name [value-pattern]"
+msgstr ""
-#: builtin/config.c:140
+#: builtin/config.c:146
msgid "rename section: old-name new-name"
msgstr "переименовать раздел: старое-имя новое-имя"
-#: builtin/config.c:141
+#: builtin/config.c:147
msgid "remove a section: name"
msgstr "удалить раздел: имя"
-#: builtin/config.c:142
+#: builtin/config.c:148
msgid "list all"
msgstr "показать весь список"
-#: builtin/config.c:143
+#: builtin/config.c:149
+msgid "use string equality when comparing values to 'value-pattern'"
+msgstr ""
+
+#: builtin/config.c:150
msgid "open an editor"
msgstr "открыть в редакторе"
-#: builtin/config.c:144
+#: builtin/config.c:151
msgid "find the color configured: slot [default]"
msgstr "найти настроенный цвет: раздел [по-умолчанию]"
-#: builtin/config.c:145
+#: builtin/config.c:152
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "проверить, существует ли настроенный цвет: раздел [stdout-есть-tty]"
-#: builtin/config.c:146
+#: builtin/config.c:153
msgid "Type"
msgstr "Тип"
-#: builtin/config.c:147
+#: builtin/config.c:154 builtin/env--helper.c:43
msgid "value is given this type"
msgstr ""
-#: builtin/config.c:148
+#: builtin/config.c:155
msgid "value is \"true\" or \"false\""
msgstr "значение — это «true» (правда) или «false» (ложь)"
-#: builtin/config.c:149
+#: builtin/config.c:156
msgid "value is decimal number"
msgstr "значение — это десятичное число"
-#: builtin/config.c:150
+#: builtin/config.c:157
msgid "value is --bool or --int"
msgstr "значение — это --bool или --int"
-#: builtin/config.c:151
+#: builtin/config.c:158
+msgid "value is --bool or string"
+msgstr ""
+
+#: builtin/config.c:159
msgid "value is a path (file or directory name)"
msgstr "значение — это путь (к файлу или каталогу)"
-#: builtin/config.c:152
+#: builtin/config.c:160
msgid "value is an expiry date"
msgstr "значение - это дата окончания срока действия"
-#: builtin/config.c:153
+#: builtin/config.c:161
msgid "Other"
msgstr "Другое"
-#: builtin/config.c:154
+#: builtin/config.c:162
msgid "terminate values with NUL byte"
msgstr "завершать значения НУЛЕВЫМ байтом"
-#: builtin/config.c:155
+#: builtin/config.c:163
msgid "show variable names only"
msgstr "показывать только имена переменных"
-#: builtin/config.c:156
+#: builtin/config.c:164
msgid "respect include directives on lookup"
msgstr "учитывать директивы include (включения файлов) при запросе"
-#: builtin/config.c:157
+#: builtin/config.c:165
msgid "show origin of config (file, standard input, blob, command line)"
msgstr "показать источник настройки (файл, стандартный ввод, двоичный объект, командная строка)"
-#: builtin/config.c:158
+#: builtin/config.c:166
+msgid "show scope of config (worktree, local, global, system, command)"
+msgstr ""
+
+#: builtin/config.c:167 builtin/env--helper.c:45
msgid "value"
msgstr ""
-#: builtin/config.c:158
+#: builtin/config.c:167
msgid "with --get, use default value when missing entry"
msgstr ""
-#: builtin/config.c:172
+#: builtin/config.c:181
#, c-format
msgid "wrong number of arguments, should be %d"
msgstr ""
-#: builtin/config.c:174
+#: builtin/config.c:183
#, c-format
msgid "wrong number of arguments, should be from %d to %d"
msgstr ""
-#: builtin/config.c:308
+#: builtin/config.c:339
#, c-format
msgid "invalid key pattern: %s"
msgstr ""
-#: builtin/config.c:344
+#: builtin/config.c:377
#, c-format
msgid "failed to format default config value: %s"
msgstr ""
-#: builtin/config.c:401
+#: builtin/config.c:441
#, c-format
msgid "cannot parse color '%s'"
msgstr ""
-#: builtin/config.c:443
+#: builtin/config.c:483
msgid "unable to parse default color value"
msgstr "не удалось разобрать значение цвета по умолчанию"
-#: builtin/config.c:496 builtin/config.c:742
+#: builtin/config.c:536 builtin/config.c:833
msgid "not in a git directory"
msgstr ""
-#: builtin/config.c:499
+#: builtin/config.c:539
msgid "writing to stdin is not supported"
msgstr ""
-#: builtin/config.c:502
+#: builtin/config.c:542
msgid "writing config blobs is not supported"
msgstr ""
-#: builtin/config.c:587
+#: builtin/config.c:627
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -11055,81 +12815,89 @@
"#\temail = %s\n"
msgstr "# Это файл конфигурации пользователя Git.\n[user]\n# Пожалуйста, адаптируйте и раскомментируйте следующие строки:\n#\tuser = %s\n#\temail = %s\n"
-#: builtin/config.c:611
+#: builtin/config.c:652
msgid "only one config file at a time"
msgstr ""
-#: builtin/config.c:616
+#: builtin/config.c:658
msgid "--local can only be used inside a git repository"
msgstr "--local можно использовать только внутри git репозитория"
-#: builtin/config.c:619
+#: builtin/config.c:660
msgid "--blob can only be used inside a git repository"
msgstr ""
-#: builtin/config.c:638
+#: builtin/config.c:662
+msgid "--worktree can only be used inside a git repository"
+msgstr ""
+
+#: builtin/config.c:684
msgid "$HOME not set"
msgstr ""
-#: builtin/config.c:658
+#: builtin/config.c:708
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:743
msgid "--get-color and variable type are incoherent"
msgstr ""
-#: builtin/config.c:693
+#: builtin/config.c:748
msgid "only one action at a time"
msgstr ""
-#: builtin/config.c:706
+#: builtin/config.c:761
msgid "--name-only is only applicable to --list or --get-regexp"
msgstr ""
-#: builtin/config.c:712
+#: builtin/config.c:767
msgid ""
"--show-origin is only applicable to --get, --get-all, --get-regexp, and "
"--list"
msgstr ""
-#: builtin/config.c:718
+#: builtin/config.c:773
msgid "--default is only applicable to --get"
msgstr ""
-#: builtin/config.c:731
+#: builtin/config.c:806
+msgid "--fixed-value only applies with 'value-pattern'"
+msgstr ""
+
+#: builtin/config.c:822
#, c-format
msgid "unable to read config file '%s'"
msgstr ""
-#: builtin/config.c:734
+#: builtin/config.c:825
msgid "error processing config file(s)"
msgstr ""
-#: builtin/config.c:744
+#: builtin/config.c:835
msgid "editing stdin is not supported"
msgstr ""
-#: builtin/config.c:746
+#: builtin/config.c:837
msgid "editing blobs is not supported"
msgstr ""
-#: builtin/config.c:760
+#: builtin/config.c:851
#, c-format
msgid "cannot create configuration file %s"
msgstr "не удалось создать файл конфигурации %s"
-#: builtin/config.c:773
+#: builtin/config.c:864
#, 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:847 builtin/config.c:858
+#: builtin/config.c:943 builtin/config.c:954
#, c-format
msgid "no such section: %s"
msgstr ""
@@ -11142,11 +12910,37 @@
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\tchmod 0700 %s"
+
+#: builtin/credential-cache--daemon.c:275
+msgid "print debugging messages to stderr"
+msgstr "вывод отладочных сообщений на 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/credential-store.c:66
+#, c-format
+msgid "unable to get credential storage lock in %d ms"
+msgstr ""
+
+#: 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"
@@ -11162,659 +12956,840 @@
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
+#: builtin/describe.c:281
#, c-format
-msgid "annotated tag %s has no embedded name"
-msgstr "аннотированная метка %s не содержит встроенного названия"
+msgid "tag '%s' is externally known as '%s'"
+msgstr ""
-#: builtin/describe.c:279
-#, c-format
-msgid "tag '%s' is really '%s' here"
-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"
"However, there were unannotated tags: try --tags."
msgstr "Нет аннотированных меток, которые могут описать «%s».\nНо имеются неаннотированные метки: попробуйте добавить параметр --tags."
-#: builtin/describe.c:409
+#: 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: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"
"gave up search at %s\n"
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:426
+#: 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-tree.c:155
+msgid "--stdin and --merge-base are mutually exclusive"
+msgstr ""
+
+#: builtin/diff-tree.c:157
+msgid "--merge-base only works with two commits"
+msgstr ""
+
+#: builtin/diff.c:91
#, c-format
msgid "'%s': not a regular file or symlink"
msgstr "«%s»: не является обычным файлом или символьной ссылкой"
-#: builtin/diff.c:235
+#: builtin/diff.c:258
#, c-format
msgid "invalid option: %s"
msgstr "неправильный параметр: %s"
-#: builtin/diff.c:350
+#: builtin/diff.c:375
+#, c-format
+msgid "%s...%s: no merge base"
+msgstr ""
+
+#: builtin/diff.c:485
msgid "Not a git repository"
msgstr "Не найден git репозиторий"
-#: builtin/diff.c:394
+#: builtin/diff.c:530 builtin/grep.c:681
#, c-format
msgid "invalid object '%s' given."
msgstr "передан неправильный объект «%s»."
-#: builtin/diff.c:403
+#: builtin/diff.c:541
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "передано больше двух двоичных объектов: «%s»"
-#: builtin/diff.c:408
+#: builtin/diff.c:546
#, c-format
msgid "unhandled object '%s' given."
msgstr "передан необработанный объект «%s»."
+#: builtin/diff.c:580
+#, 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 [<опции>] [<коммит> [<коммит>]] [--] [<путь>…]"
-#: 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:412
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
msgstr "комбинированные форматы файлов списка изменений(«-c» и «--cc») не поддерживаются в режиме сравнения каталогов(«-d» и «--dir-diff»)."
-#: builtin/difftool.c:626
+#: builtin/difftool.c:633
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "оба файла изменены: «%s» и «%s»."
-#: builtin/difftool.c:628
+#: builtin/difftool.c:635
msgid "working tree file has been left."
msgstr "рабочий каталог был покинут."
-#: builtin/difftool.c:639
+#: builtin/difftool.c:646
#, c-format
msgid "temporary files exist in '%s'."
msgstr "временные файлы уже находятся в «%s»."
-#: builtin/difftool.c:640
+#: builtin/difftool.c:647
msgid "you may want to cleanup or recover these."
msgstr "возможно вы хотите их удалить или восстановить."
-#: builtin/difftool.c:689
+#: builtin/difftool.c:696
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "использовать «diff.guitool» вместо «diff.tool»"
-#: builtin/difftool.c:691
+#: builtin/difftool.c:698
msgid "perform a full-directory diff"
msgstr "выполнить пофайловое сравнение всего каталога"
-#: builtin/difftool.c:693
+#: builtin/difftool.c:700
msgid "do not prompt before launching a diff tool"
msgstr "не спрашивать перед запуском утилиты сравнения"
-#: builtin/difftool.c:698
+#: builtin/difftool.c:705
msgid "use symlinks in dir-diff mode"
msgstr "использовать символьные ссылки в режиме сравнения каталога"
-#: builtin/difftool.c:699
+#: builtin/difftool.c:706
msgid "tool"
msgstr ""
-#: builtin/difftool.c:700
+#: builtin/difftool.c:707
msgid "use the specified diff tool"
msgstr "использовать указанную утилиту сравнения"
-#: builtin/difftool.c:702
+#: builtin/difftool.c:709
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "вывести список утилит, которые можно использовать с параметром «--tool»"
-#: builtin/difftool.c:705
+#: builtin/difftool.c:712
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit"
" code"
msgstr "выходить из «git-difftool», если вызванная утилита сравнения вернула не нулевой код возврата"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:715
msgid "specify a custom command for viewing diffs"
msgstr "использовать особую команду для просмотра изменений"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:716
msgid "passed to `diff`"
msgstr ""
-#: builtin/difftool.c:724
+#: builtin/difftool.c:731
msgid "difftool requires worktree or --no-index"
msgstr ""
-#: builtin/difftool.c:731
+#: builtin/difftool.c:738
msgid "--dir-diff is incompatible with --no-index"
msgstr ""
-#: builtin/difftool.c:734
+#: builtin/difftool.c:741
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr ""
-#: builtin/difftool.c:742
+#: builtin/difftool.c:749
msgid "no <tool> given for --tool=<tool>"
msgstr "не передана <утилита> для --tool=<утилита>"
-#: builtin/difftool.c:749
+#: builtin/difftool.c:756
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 ""
+
+#: 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 ""
+
+#: 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 [опции-rev-list]"
-#: builtin/fast-export.c:1084
+#: builtin/fast-export.c:868
+msgid "Error: Cannot export nested tags unless --mark-tags is specified."
+msgstr ""
+
+#: builtin/fast-export.c:1177
+msgid "--anonymize-map token cannot be empty"
+msgstr ""
+
+#: builtin/fast-export.c:1197
msgid "show progress after <n> objects"
msgstr "показать прогресс после <n> объектов"
-#: builtin/fast-export.c:1086
+#: builtin/fast-export.c:1199
msgid "select handling of signed tags"
msgstr "выбор обработки подписанных меток"
-#: builtin/fast-export.c:1089
+#: builtin/fast-export.c:1202
msgid "select handling of tags that tag filtered objects"
msgstr "выбор обработки меток, которыми помечены отфильтрованные объекты"
-#: builtin/fast-export.c:1092
+#: builtin/fast-export.c:1205
+msgid "select handling of commit messages in an alternate encoding"
+msgstr ""
+
+#: builtin/fast-export.c:1208
msgid "Dump marks to this file"
msgstr "Записать пометки в этот файл"
-#: builtin/fast-export.c:1094
+#: builtin/fast-export.c:1210
msgid "Import marks from this file"
msgstr "Импортировать пометки из этого файла"
-#: builtin/fast-export.c:1096
+#: builtin/fast-export.c:1214
+msgid "Import marks from this file if it exists"
+msgstr ""
+
+#: builtin/fast-export.c:1216
msgid "Fake a tagger when tags lack one"
msgstr "Подделать автора метки, если у метки он отсутствует"
-#: builtin/fast-export.c:1098
+#: builtin/fast-export.c:1218
msgid "Output full tree for each commit"
msgstr "Вывести полное дерево для каждого коммита"
-#: builtin/fast-export.c:1100
+#: builtin/fast-export.c:1220
msgid "Use the done feature to terminate the stream"
msgstr "Использовать пометку завершения в конце потока"
-#: builtin/fast-export.c:1101
+#: builtin/fast-export.c:1221
msgid "Skip output of blob data"
msgstr "Пропустить вывод данных двоичных объектов"
-#: builtin/fast-export.c:1102 builtin/log.c:1609
+#: builtin/fast-export.c:1222 builtin/log.c:1816
msgid "refspec"
msgstr "спецификатор ссылки"
-#: builtin/fast-export.c:1103
+#: builtin/fast-export.c:1223
msgid "Apply refspec to exported refs"
msgstr "Применить спецификатор ссылки к экспортируемым ссылкам"
-#: builtin/fast-export.c:1104
+#: builtin/fast-export.c:1224
msgid "anonymize output"
msgstr "сделать вывод анонимным"
-#: builtin/fast-export.c:1106
+#: builtin/fast-export.c:1225
+msgid "from:to"
+msgstr ""
+
+#: builtin/fast-export.c:1226
+msgid "convert <from> to <to> in anonymized output"
+msgstr ""
+
+#: builtin/fast-export.c:1229
msgid "Reference parents which are not in fast-export stream by object id"
msgstr ""
-#: builtin/fast-export.c:1108
+#: builtin/fast-export.c:1231
msgid "Show original object ids of blobs/commits"
msgstr ""
-#: builtin/fetch.c:28
+#: builtin/fast-export.c:1233
+msgid "Label tags with mark ids"
+msgstr ""
+
+#: builtin/fast-export.c:1256
+msgid "--anonymize-map without --anonymize does not make sense"
+msgstr ""
+
+#: builtin/fast-export.c:1271
+msgid "Cannot pass both --import-marks and --import-marks-if-exists"
+msgstr ""
+
+#: builtin/fast-import.c:3088
+#, c-format
+msgid "Missing from marks for submodule '%s'"
+msgstr ""
+
+#: builtin/fast-import.c:3090
+#, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr ""
+
+#: builtin/fast-import.c:3225
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr ""
+
+#: builtin/fast-import.c:3230
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr ""
+
+#: builtin/fast-import.c:3322
+msgid "Expected format name:filename for submodule rewrite option"
+msgstr ""
+
+#: builtin/fast-import.c:3377
+#, 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 "git fetch [<опции>] [<репозиторий> [<спецификатор-ссылки>…]]"
-#: builtin/fetch.c:29
+#: builtin/fetch.c:36
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<опции>] <группа>"
-#: builtin/fetch.c:30
+#: builtin/fetch.c:37
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<опции>] [(<репозиторий> | <группа>)…]"
-#: builtin/fetch.c:31
+#: builtin/fetch.c:38
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<опции>]"
-#: builtin/fetch.c:115 builtin/pull.c:202
+#: 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:117 builtin/pull.c:205
+#: 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:119 builtin/pull.c:208
+#: builtin/fetch.c:148 builtin/pull.c:191
msgid "path to upload pack on remote end"
msgstr "путь к программе упаковки пакета на машине с внешним репозиторием"
-#: builtin/fetch.c:120
+#: builtin/fetch.c:149
msgid "force overwrite of local reference"
msgstr ""
-#: builtin/fetch.c:122
+#: builtin/fetch.c:151
msgid "fetch from multiple remotes"
msgstr "извлечь с нескольких внешних репозиториев"
-#: builtin/fetch.c:124 builtin/pull.c:212
+#: builtin/fetch.c:153 builtin/pull.c:195
msgid "fetch all tags and associated objects"
msgstr "извлечь все метки и связанные объекты"
-#: builtin/fetch.c:126
+#: builtin/fetch.c:155
msgid "do not fetch all tags (--no-tags)"
msgstr "не извлекать все метки (--no-tags)"
-#: builtin/fetch.c:128
+#: builtin/fetch.c:157
msgid "number of submodules fetched in parallel"
msgstr "количество подмодулей, которые будут скачаны парралельно"
-#: builtin/fetch.c:130 builtin/pull.c:215
+#: builtin/fetch.c:159 builtin/pull.c:198
msgid "prune remote-tracking branches no longer on remote"
msgstr "почистить отслеживаемые внешние ветки, которых уже нет на внешнем репозитории"
-#: builtin/fetch.c:132
+#: builtin/fetch.c:161
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
-#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:139
+#: builtin/fetch.c:162 builtin/fetch.c:187 builtin/pull.c:122
msgid "on-demand"
msgstr "по требованию"
-#: builtin/fetch.c:134
+#: builtin/fetch.c:163
msgid "control recursive fetching of submodules"
msgstr "управление рекурсивным извлечением подмодулей"
-#: builtin/fetch.c:138 builtin/pull.c:223
+#: 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:140
+#: builtin/fetch.c:171
msgid "allow updating of HEAD ref"
msgstr "разрешить обновление ссылки HEAD"
-#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:226
+#: 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:145
+#: builtin/fetch.c:176 builtin/pull.c:212
msgid "deepen history of shallow repository based on time"
msgstr "углубить историю частичного клона основываясь на времени"
-#: builtin/fetch.c:151 builtin/pull.c:229
+#: builtin/fetch.c:182 builtin/pull.c:221
msgid "convert to a complete repository"
msgstr "преобразовать в полный репозиторий"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:185
msgid "prepend this to submodule path output"
msgstr "присоединять это спереди к выводу путей подмодуля"
-#: builtin/fetch.c:157
+#: builtin/fetch.c:188
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr "настроить по умолчанию рекурсивное извлечение подмодулей (более низкий приоритет, чем файлы конфигурации)"
-#: builtin/fetch.c:161 builtin/pull.c:232
+#: builtin/fetch.c:192 builtin/pull.c:224
msgid "accept refs that update .git/shallow"
msgstr "принимать ссылки, которые обновляют .git/shallow"
-#: builtin/fetch.c:162 builtin/pull.c:234
+#: builtin/fetch.c:193 builtin/pull.c:226
msgid "refmap"
msgstr "соответствие-ссылок"
-#: builtin/fetch.c:163 builtin/pull.c:235
+#: builtin/fetch.c:194 builtin/pull.c:227
msgid "specify fetch refmap"
msgstr "указать соответствие ссылок при извлечении"
-#: builtin/fetch.c:170
+#: builtin/fetch.c:201 builtin/pull.c:240
msgid "report that we have only objects reachable from this object"
msgstr ""
-#: builtin/fetch.c:469
+#: builtin/fetch.c:204 builtin/fetch.c:206
+msgid "run 'maintenance --auto' after fetching"
+msgstr ""
+
+#: 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:608
+#: builtin/fetch.c:677
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "опция fetch.output содержит неправильное значение для %s"
-#: builtin/fetch.c:705
+#: builtin/fetch.c:775
#, c-format
msgid "object %s not found"
msgstr "объект %s не найден"
-#: builtin/fetch.c:709
+#: builtin/fetch.c:779
msgid "[up to date]"
msgstr "[актуально]"
-#: builtin/fetch.c:722 builtin/fetch.c:738 builtin/fetch.c:801
+#: builtin/fetch.c:792 builtin/fetch.c:808 builtin/fetch.c:880
msgid "[rejected]"
msgstr "[отклонено]"
-#: builtin/fetch.c:723
+#: builtin/fetch.c:793
msgid "can't fetch in current branch"
msgstr "нельзя извлечь текущую ветку"
-#: builtin/fetch.c:733
+#: builtin/fetch.c:803
msgid "[tag update]"
msgstr "[обновление метки]"
-#: builtin/fetch.c:734 builtin/fetch.c:771 builtin/fetch.c:784
-#: builtin/fetch.c:796
+#: 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:738
+#: builtin/fetch.c:808
msgid "would clobber existing tag"
msgstr ""
-#: builtin/fetch.c:760
+#: builtin/fetch.c:830
msgid "[new tag]"
msgstr "[новая метка]"
-#: builtin/fetch.c:763
+#: builtin/fetch.c:833
msgid "[new branch]"
msgstr "[новая ветка]"
-#: builtin/fetch.c:766
+#: builtin/fetch.c:836
msgid "[new ref]"
msgstr "[новая ссылка]"
-#: builtin/fetch.c:796
+#: builtin/fetch.c:875
msgid "forced update"
msgstr "принудительное обновление"
-#: builtin/fetch.c:801
+#: builtin/fetch.c:880
msgid "non-fast-forward"
msgstr "без перемотки вперед"
-#: builtin/fetch.c:847
+#: 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"
-#: builtin/fetch.c:868
+#: builtin/fetch.c:960
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "%s отклонено из-за того, что частичные корни не разрешено обновлять"
-#: builtin/fetch.c:959 builtin/fetch.c:1081
+#: builtin/fetch.c:1053 builtin/fetch.c:1191
#, c-format
msgid "From %.*s\n"
msgstr "Из %.*s\n"
-#: builtin/fetch.c:970
+#: 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 "не удалось обновить некоторые локальные ссылки; попробуйте запустить «git remote prune %s», чтобы почистить старые, конфликтующие ветки"
-#: builtin/fetch.c:1051
+#: builtin/fetch.c:1161
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s будет висящей веткой)"
-#: builtin/fetch.c:1052
+#: builtin/fetch.c:1162
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s стала висящей веткой)"
-#: builtin/fetch.c:1084
+#: builtin/fetch.c:1194
msgid "[deleted]"
msgstr "[удалено]"
-#: builtin/fetch.c:1085 builtin/remote.c:1036
+#: builtin/fetch.c:1195 builtin/remote.c:1118
msgid "(none)"
msgstr "(нет)"
-#: builtin/fetch.c:1108
+#: builtin/fetch.c:1218
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Отказ получения в текущую ветку %s не голого репозитория"
-#: builtin/fetch.c:1127
+#: 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:1130
+#: builtin/fetch.c:1240
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Параметр «%s» игнорируется для %s\n"
-#: builtin/fetch.c:1434
+#: 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 "Извлечение из %s\n"
-#: builtin/fetch.c:1436 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:1482
-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:1506
+#: 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:1543
+#: builtin/fetch.c:1760
msgid "You need to specify a tag name."
msgstr "Вам нужно указать имя метки."
-#: builtin/fetch.c:1594
+#: builtin/fetch.c:1825
msgid "Negative depth in --deepen is not supported"
msgstr "Отрицательная грубина для --deepen не поддерживается"
-#: builtin/fetch.c:1596
+#: builtin/fetch.c:1827
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen и --depth нельзя использовать одновременно"
-#: builtin/fetch.c:1601
+#: builtin/fetch.c:1832
msgid "--depth and --unshallow cannot be used together"
msgstr "нельзя использовать одновременно --depth и --unshallow"
-#: builtin/fetch.c:1603
+#: builtin/fetch.c:1834
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow не имеет смысла на полном репозитории"
-#: builtin/fetch.c:1619
+#: builtin/fetch.c:1851
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all не принимает имя репозитория как аргумент"
-#: builtin/fetch.c:1621
+#: builtin/fetch.c:1853
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all не имеет смысла при указании спецификаторов ссылок"
-#: builtin/fetch.c:1630
+#: builtin/fetch.c:1862
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Нет такого внешнего репозитория или группы: %s"
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1869
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Получение группы и указание спецификаций ссылок не имеет смысла"
-#: builtin/fetch.c:1653
+#: 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 "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 "отправить в журнал <n> записей из короткого журнала"
-#: 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 "файл для чтения"
@@ -11827,8 +13802,8 @@
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 ""
#: builtin/for-each-ref.c:13
msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
@@ -11854,7 +13829,7 @@
msgid "show only <n> matched refs"
msgstr "показать только <n> совпадающих ссылок"
-#: builtin/for-each-ref.c:39 builtin/tag.c:433
+#: builtin/for-each-ref.c:39 builtin/tag.c:440
msgid "respect format colors"
msgstr "использовать цвета из формата"
@@ -11878,272 +13853,288 @@
msgid "print only refs which don't contain the commit"
msgstr "вывод только ссылок, которые не содержат коммит"
-#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+#: builtin/for-each-repo.c:9
+msgid "git for-each-repo --config=<config> <command-args>"
+msgstr ""
+
+#: builtin/for-each-repo.c:37
+msgid "config"
+msgstr ""
+
+#: builtin/for-each-repo.c:38
+msgid "config key storing a list of repository paths"
+msgstr ""
+
+#: builtin/for-each-repo.c:46
+msgid "missing --config=<config>"
+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: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 "не удалось закончить '%s'"
-#: 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:841
+#: 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 ""
-#: 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 "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:224
+#: 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:39
msgid "git gc [<options>]"
msgstr "git gc [<опции>]"
-#: builtin/gc.c:90
+#: builtin/gc.c:94
#, c-format
msgid "Failed to fstat %s: %s"
msgstr "Не удалось выполнить fstat %s: %s"
-#: builtin/gc.c:126
+#: builtin/gc.c:130
#, c-format
msgid "failed to parse '%s' value '%s'"
msgstr ""
-#: builtin/gc.c:476 builtin/init-db.c:55
+#: builtin/gc.c:479 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:519
+#: builtin/gc.c:488 builtin/notes.c:240 builtin/tag.c:530
#, c-format
msgid "cannot read '%s'"
msgstr "не удалось прочитать «%s»"
-#: builtin/gc.c:492
+#: builtin/gc.c:495
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -12153,64 +14144,196 @@
"%s"
msgstr "Последний запуск gc сообщил следующее. Пожалуйста, исправьте ошибку и удалите %s.\nАвтоматическая очистка репозитория не будет производиться, пока этот файл не удалён.\n\n%s"
-#: builtin/gc.c:540
+#: builtin/gc.c:543
msgid "prune unreferenced objects"
msgstr "почистить объекты, на которые нет ссылок"
-#: builtin/gc.c:542
+#: builtin/gc.c:545
msgid "be more thorough (increased runtime)"
msgstr "проверять более внимательно (занимает больше времени)"
-#: builtin/gc.c:543
+#: builtin/gc.c:546
msgid "enable auto-gc mode"
msgstr "включить режим auto-gc"
-#: builtin/gc.c:546
+#: builtin/gc.c:549
msgid "force running gc even if there may be another gc running"
msgstr "принудительно запустить gc, даже есть другая копия gc уже запущена"
-#: builtin/gc.c:549
+#: builtin/gc.c:552
msgid "repack all other packs except the largest pack"
msgstr ""
-#: builtin/gc.c:566
+#: builtin/gc.c:569
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr ""
-#: builtin/gc.c:577
+#: builtin/gc.c:580
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr ""
-#: builtin/gc.c:597
+#: builtin/gc.c:600
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "Автоматическая упаковка репозитория в фоне, для оптимальной производительности.\n"
-#: builtin/gc.c:599
+#: builtin/gc.c:602
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Автоматическая упаковка репозитория, для оптимальной производительности.\n"
-#: builtin/gc.c:600
+#: builtin/gc.c:603
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Смотрите «git help gc» руководства по ручной очистке.\n"
-#: builtin/gc.c:640
+#: builtin/gc.c:643
#, 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:693
+#: builtin/gc.c:698
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove "
"them."
msgstr "Имеется слишком много объектов, на которые нет ссылок; запустите «git prune» для их удаления."
-#: builtin/grep.c:29
+#: builtin/gc.c:708
+msgid ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
+msgstr ""
+
+#: builtin/gc.c:738
+msgid "--no-schedule is not allowed"
+msgstr ""
+
+#: builtin/gc.c:743
+#, c-format
+msgid "unrecognized --schedule argument '%s'"
+msgstr ""
+
+#: builtin/gc.c:862
+msgid "failed to write commit-graph"
+msgstr ""
+
+#: builtin/gc.c:901
+msgid "failed to fill remotes"
+msgstr ""
+
+#: builtin/gc.c:1024
+msgid "failed to start 'git pack-objects' process"
+msgstr ""
+
+#: builtin/gc.c:1041
+msgid "failed to finish 'git pack-objects' process"
+msgstr ""
+
+#: builtin/gc.c:1093
+msgid "failed to write multi-pack-index"
+msgstr ""
+
+#: builtin/gc.c:1111
+msgid "'git multi-pack-index expire' failed"
+msgstr ""
+
+#: builtin/gc.c:1172
+msgid "'git multi-pack-index repack' failed"
+msgstr ""
+
+#: builtin/gc.c:1181
+msgid ""
+"skipping incremental-repack task because core.multiPackIndex is disabled"
+msgstr ""
+
+#: builtin/gc.c:1279
+#, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr ""
+
+#: builtin/gc.c:1309
+#, c-format
+msgid "task '%s' failed"
+msgstr ""
+
+#: builtin/gc.c:1389
+#, c-format
+msgid "'%s' is not a valid task"
+msgstr ""
+
+#: builtin/gc.c:1394
+#, c-format
+msgid "task '%s' cannot be selected multiple times"
+msgstr ""
+
+#: builtin/gc.c:1409
+msgid "run tasks based on the state of the repository"
+msgstr ""
+
+#: builtin/gc.c:1410
+msgid "frequency"
+msgstr ""
+
+#: builtin/gc.c:1411
+msgid "run tasks based on frequency"
+msgstr ""
+
+#: builtin/gc.c:1414
+msgid "do not report progress or other information over stderr"
+msgstr ""
+
+#: builtin/gc.c:1415
+msgid "task"
+msgstr ""
+
+#: builtin/gc.c:1416
+msgid "run a specific task"
+msgstr ""
+
+#: builtin/gc.c:1433
+msgid "use at most one of --auto and --schedule=<frequency>"
+msgstr ""
+
+#: builtin/gc.c:1467
+msgid "failed to run 'git config'"
+msgstr ""
+
+#: builtin/gc.c:1512
+msgid "another process is scheduling background maintenance"
+msgstr ""
+
+#: builtin/gc.c:1525
+msgid "failed to run 'crontab -l'; your system might not support 'cron'"
+msgstr ""
+
+#: builtin/gc.c:1544
+msgid "failed to run 'crontab'; your system might not support 'cron'"
+msgstr ""
+
+#: builtin/gc.c:1550
+msgid "failed to open stdin of 'crontab'"
+msgstr ""
+
+#: builtin/gc.c:1592
+msgid "'crontab' died"
+msgstr ""
+
+#: builtin/gc.c:1605
+msgid "failed to add repo to global config"
+msgstr ""
+
+#: builtin/gc.c:1615
+msgid "git maintenance <subcommand> [<options>]"
+msgstr ""
+
+#: builtin/gc.c:1634
+#, c-format
+msgid "invalid subcommand: %s"
+msgstr ""
+
+#: builtin/grep.c:30
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<опции>] [-e] <шаблон> [<редакция>…] [[--] <путь>…]"
@@ -12227,258 +14350,258 @@
#. TRANSLATORS: %s is the configuration
#. variable for tweaking threads, currently
#. grep.threads
-#: builtin/grep.c:287 builtin/index-pack.c:1514 builtin/index-pack.c:1705
-#: builtin/pack-objects.c:2720
+#: 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:466 builtin/grep.c:590 builtin/grep.c:631
+#: 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:646
+#: builtin/grep.c:655
#, c-format
msgid "unable to grep from object of type %s"
msgstr "не удалось выполнить grep из объекта типа %s"
-#: builtin/grep.c:712
+#: builtin/grep.c:736
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "параметр «%c» ожидает числовое значение"
-#: builtin/grep.c:811
+#: builtin/grep.c:835
msgid "search in index instead of in the work tree"
msgstr "искать в индексе, а не в рабочем каталоге"
-#: builtin/grep.c:813
+#: builtin/grep.c:837
msgid "find in contents not managed by git"
msgstr "искать в содержимом не управляемым git"
-#: builtin/grep.c:815
+#: builtin/grep.c:839
msgid "search in both tracked and untracked files"
msgstr "искать и в отслеживаемых, и в неотслеживаемых файлах"
-#: builtin/grep.c:817
+#: builtin/grep.c:841
msgid "ignore files specified via '.gitignore'"
msgstr "игнорировать файлы указанные в «.gitignore»"
-#: builtin/grep.c:819
+#: builtin/grep.c:843
msgid "recursively search in each submodule"
msgstr "рекурсивный поиск по всем подмодулям"
-#: builtin/grep.c:822
+#: builtin/grep.c:846
msgid "show non-matching lines"
msgstr "искать в несовпадающих строках"
-#: builtin/grep.c:824
+#: builtin/grep.c:848
msgid "case insensitive matching"
msgstr "без учета регистра"
-#: builtin/grep.c:826
+#: builtin/grep.c:850
msgid "match patterns only at word boundaries"
msgstr "искать совпадения шаблона только на границах слов"
-#: builtin/grep.c:828
+#: builtin/grep.c:852
msgid "process binary files as text"
msgstr "обработка двоичных файлов как текста"
-#: builtin/grep.c:830
+#: builtin/grep.c:854
msgid "don't match patterns in binary files"
msgstr "не искать совпадения шаблона в двоичных файлах"
-#: builtin/grep.c:833
+#: builtin/grep.c:857
msgid "process binary files with textconv filters"
msgstr "обрабатываться двоичные файлы с помощью фильтров textconv"
-#: builtin/grep.c:835
+#: builtin/grep.c:859
msgid "search in subdirectories (default)"
msgstr ""
-#: builtin/grep.c:837
+#: builtin/grep.c:861
msgid "descend at most <depth> levels"
msgstr "на глубине максиму <глубина> уровней"
-#: builtin/grep.c:841
+#: builtin/grep.c:865
msgid "use extended POSIX regular expressions"
msgstr "использовать расширенные регулярные выражения POSIX"
-#: builtin/grep.c:844
+#: builtin/grep.c:868
msgid "use basic POSIX regular expressions (default)"
msgstr "использовать базовые регулярные выражения POSIX (по умолчанию)"
-#: builtin/grep.c:847
+#: builtin/grep.c:871
msgid "interpret patterns as fixed strings"
msgstr "интерпретировать шаблоны как фиксированные строки"
-#: builtin/grep.c:850
+#: builtin/grep.c:874
msgid "use Perl-compatible regular expressions"
msgstr "использовать Perl-совместимые регулярные выражения"
-#: builtin/grep.c:853
+#: builtin/grep.c:877
msgid "show line numbers"
msgstr "вывести номера строк"
-#: builtin/grep.c:854
+#: builtin/grep.c:878
msgid "show column number of first match"
msgstr ""
-#: builtin/grep.c:855
+#: builtin/grep.c:879
msgid "don't show filenames"
msgstr "не выводить имена файлов"
-#: builtin/grep.c:856
+#: builtin/grep.c:880
msgid "show filenames"
msgstr "выводить имена файлов"
-#: builtin/grep.c:858
+#: builtin/grep.c:882
msgid "show filenames relative to top directory"
msgstr "выводить имена файлов относительно каталога репозитория"
-#: builtin/grep.c:860
+#: builtin/grep.c:884
msgid "show only filenames instead of matching lines"
msgstr "выводить только имена файлов, а не совпадающие строки"
-#: builtin/grep.c:862
+#: builtin/grep.c:886
msgid "synonym for --files-with-matches"
msgstr "синоним для --files-with-matches"
-#: builtin/grep.c:865
+#: builtin/grep.c:889
msgid "show only the names of files without match"
msgstr "выводить только несовпадающие имена файлов"
-#: builtin/grep.c:867
+#: builtin/grep.c:891
msgid "print NUL after filenames"
msgstr "выводить двоичный НОЛЬ после списка имен файлов"
-#: builtin/grep.c:870
+#: builtin/grep.c:894
msgid "show only matching parts of a line"
msgstr ""
-#: builtin/grep.c:872
+#: builtin/grep.c:896
msgid "show the number of matches instead of matching lines"
msgstr "выводить количество совпадений, а не совпадающие строки"
-#: builtin/grep.c:873
+#: builtin/grep.c:897
msgid "highlight matches"
msgstr "подсвечивать совпадения"
-#: builtin/grep.c:875
+#: builtin/grep.c:899
msgid "print empty line between matches from different files"
msgstr "выводить пустую строку после совпадений из разных файлов"
-#: builtin/grep.c:877
+#: builtin/grep.c:901
msgid "show filename only once above matches from same file"
msgstr "выводить имя файла только раз на несколько совпадений в одном файле"
-#: builtin/grep.c:880
+#: builtin/grep.c:904
msgid "show <n> context lines before and after matches"
msgstr "показать <n> строк контекста перед и после совпадения"
-#: builtin/grep.c:883
+#: builtin/grep.c:907
msgid "show <n> context lines before matches"
msgstr "показать <n> строк контекста перед совпадением"
-#: builtin/grep.c:885
+#: builtin/grep.c:909
msgid "show <n> context lines after matches"
msgstr "показать <n> строк контекста после совпадения"
-#: builtin/grep.c:887
+#: builtin/grep.c:911
msgid "use <n> worker threads"
msgstr "использовать <кол> рабочих потоков"
-#: builtin/grep.c:888
+#: builtin/grep.c:912
msgid "shortcut for -C NUM"
msgstr "тоже, что и -C КОЛИЧЕСТВО"
-#: builtin/grep.c:891
+#: builtin/grep.c:915
msgid "show a line with the function name before matches"
msgstr "показать строку с именем функции перед совпадением"
-#: builtin/grep.c:893
+#: builtin/grep.c:917
msgid "show the surrounding function"
msgstr "показать окружающую функцию"
-#: builtin/grep.c:896
+#: builtin/grep.c:920
msgid "read patterns from file"
msgstr "прочитать шаблоны из файла"
-#: builtin/grep.c:898
+#: builtin/grep.c:922
msgid "match <pattern>"
msgstr "поиск соответствий с <шаблоном>"
-#: builtin/grep.c:900
+#: builtin/grep.c:924
msgid "combine patterns specified with -e"
msgstr "объединить шаблоны указанные с помощью -e"
-#: builtin/grep.c:912
+#: builtin/grep.c:936
msgid "indicate hit with exit status without output"
msgstr "ничего не выводить, указать на совпадение с помощью кода выхода"
-#: builtin/grep.c:914
+#: builtin/grep.c:938
msgid "show only matches from files that match all patterns"
msgstr "показать только совпадения из файлов в которых совпадают все шаблоны"
-#: builtin/grep.c:916
+#: builtin/grep.c:940
msgid "show parse tree for grep expression"
msgstr "показать дерево разбора для выражения поиска"
-#: builtin/grep.c:920
+#: builtin/grep.c:944
msgid "pager"
msgstr "пейджер"
-#: builtin/grep.c:920
+#: builtin/grep.c:944
msgid "show matching files in the pager"
msgstr "показать совпадающие файлы с помощью программы-пейджера"
-#: builtin/grep.c:924
+#: builtin/grep.c:948
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "разрешить вызов grep(1) (игнорируется в этой сборке)"
-#: builtin/grep.c:988
+#: builtin/grep.c:1014
msgid "no pattern given"
msgstr ""
-#: builtin/grep.c:1024
+#: builtin/grep.c:1050
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index или --untracked нельзя использовать одновременно с указанием ревизии"
-#: builtin/grep.c:1032
+#: builtin/grep.c:1058
#, c-format
msgid "unable to resolve revision: %s"
msgstr "не удалось определить редакцию: %s"
-#: builtin/grep.c:1063
+#: builtin/grep.c:1088
+msgid "--untracked not supported with --recurse-submodules"
+msgstr ""
+
+#: builtin/grep.c:1092
msgid "invalid option combination, ignoring --threads"
msgstr ""
-#: builtin/grep.c:1066 builtin/pack-objects.c:3403
+#: builtin/grep.c:1095 builtin/pack-objects.c:3655
msgid "no threads support, ignoring --threads"
msgstr "нет поддержки потоков, игнорирование --threads"
-#: builtin/grep.c:1069 builtin/index-pack.c:1511 builtin/pack-objects.c:2717
+#: builtin/grep.c:1098 builtin/index-pack.c:1573 builtin/pack-objects.c:2933
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "указано неправильное количество потоков (%d)"
-#: builtin/grep.c:1092
+#: builtin/grep.c:1132
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager работает только в рабочем каталоге"
-#: builtin/grep.c:1115
-msgid "option not supported with --recurse-submodules"
-msgstr ""
-
-#: builtin/grep.c:1121
+#: builtin/grep.c:1158
msgid "--cached or --untracked cannot be used with --no-index"
msgstr ""
-#: builtin/grep.c:1127
+#: builtin/grep.c:1164
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr ""
-#: builtin/grep.c:1135
+#: builtin/grep.c:1172
msgid "both --cached and trees are given"
msgstr ""
@@ -12493,10 +14616,6 @@
msgstr "git hash-object --stdin-paths"
#: builtin/hash-object.c:98
-msgid "type"
-msgstr "тип"
-
-#: builtin/hash-object.c:98
msgid "object type"
msgstr "тип объекта"
@@ -12515,133 +14634,133 @@
#: builtin/hash-object.c:104
msgid ""
"just hash any random garbage to create corrupt objects for debugging Git"
-msgstr "хешировать любой мусор и создавать поврежденные объекты для отладки Git"
+msgstr "хэшировать любой мусор и создавать поврежденные объекты для отладки Git"
#: builtin/hash-object.c:105
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 "открыть руководство в веб-браузере"
-#: 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"
"Please consider using 'man.<tool>.cmd' instead."
msgstr "«%s»: путь для неподдерживаемой программы просмотра man.\nВместо этого используйте «man.<программа>.cmd»."
-#: 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»: команда для неподдерживаемой программы просмотра 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:335
+#: 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:364
+#: 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 "использование: %s%s"
-#: builtin/help.c:491
+#: builtin/help.c:577
msgid "'git help config' for more information"
msgstr ""
-#: builtin/index-pack.c:184
+#: builtin/index-pack.c:221
#, c-format
msgid "object type mismatch at %s"
msgstr "несоответствие типа объекта на %s"
-#: builtin/index-pack.c:204
+#: builtin/index-pack.c:241
#, c-format
msgid "did not receive expected object %s"
msgstr "ожидаемый объект не получен на %s"
-#: builtin/index-pack.c:207
+#: builtin/index-pack.c:244
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "объект %s: ожидаемый тип %s, получен %s"
-#: builtin/index-pack.c:257
+#: builtin/index-pack.c:294
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
@@ -12650,73 +14769,73 @@
msgstr[2] "не удалось заполнить %d байтов"
msgstr[3] "не удалось заполнить %d байтов"
-#: builtin/index-pack.c:267
+#: builtin/index-pack.c:304
msgid "early EOF"
msgstr "неожиданный конец файла"
-#: builtin/index-pack.c:268
+#: builtin/index-pack.c:305
msgid "read error on input"
msgstr "ошибка чтения ввода"
-#: builtin/index-pack.c:280
+#: builtin/index-pack.c:317
msgid "used more bytes than were available"
msgstr "использовано больше байт, чем было доступно"
-#: builtin/index-pack.c:287 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 "пакет слишком большой для текущего определения off_t"
-#: builtin/index-pack.c:290 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:305 builtin/repack.c:250
+#: builtin/index-pack.c:342 builtin/repack.c:286
#, c-format
msgid "unable to create '%s'"
msgstr "не удалось создать «%s»"
-#: builtin/index-pack.c:311
+#: builtin/index-pack.c:348
#, c-format
msgid "cannot open packfile '%s'"
msgstr "не удалось открыть файл пакета «%s»"
-#: builtin/index-pack.c:325
+#: builtin/index-pack.c:362
msgid "pack signature mismatch"
msgstr "несоответствие подписи пакета"
-#: builtin/index-pack.c:327
+#: builtin/index-pack.c:364
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "версия пакета %<PRIu32> не поддерживается"
-#: builtin/index-pack.c:345
+#: builtin/index-pack.c:382
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "пакет содержит плохой объект по смещению %<PRIuMAX>: %s"
-#: builtin/index-pack.c:465
+#: builtin/index-pack.c:488
#, c-format
msgid "inflate returned %d"
msgstr "программа сжатия вернула %d"
-#: builtin/index-pack.c:514
+#: builtin/index-pack.c:537
msgid "offset value overflow for delta base object"
msgstr "переполнение значения смещения у базового объекта дельты"
-#: builtin/index-pack.c:522
+#: builtin/index-pack.c:545
msgid "delta base offset is out of bound"
msgstr "смещение базовой дельты вышло за допустимые пределы"
-#: builtin/index-pack.c:530
+#: builtin/index-pack.c:553
#, c-format
msgid "unknown object type %d"
msgstr "неизвестный тип объекта %d"
-#: builtin/index-pack.c:561
+#: builtin/index-pack.c:584
msgid "cannot pread pack file"
msgstr "не удалось выполнить pread для файла пакета"
-#: builtin/index-pack.c:563
+#: 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"
@@ -12725,88 +14844,88 @@
msgstr[2] "преждевременное окончание файла пакета, %<PRIuMAX> байтов отсутствует"
msgstr[3] "преждевременное окончание файла пакета, %<PRIuMAX> байтов отсутствует"
-#: builtin/index-pack.c:589
+#: builtin/index-pack.c:612
msgid "serious inflate inconsistency"
msgstr "серьезное несоответствие при распаковке"
-#: builtin/index-pack.c:734 builtin/index-pack.c:740 builtin/index-pack.c:763
-#: builtin/index-pack.c:802 builtin/index-pack.c:811
+#: 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:737 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 "не удалось прочитать %s"
-#: builtin/index-pack.c:800
+#: builtin/index-pack.c:824
#, c-format
msgid "cannot read existing object info %s"
msgstr "не удалось прочитать информацию существующего объекта %s"
-#: builtin/index-pack.c:808
+#: builtin/index-pack.c:832
#, c-format
msgid "cannot read existing object %s"
msgstr "не удалось прочитать существующий объект %s"
-#: builtin/index-pack.c:822
+#: builtin/index-pack.c:846
#, c-format
msgid "invalid blob object %s"
msgstr "неправильный файл двоичного объекта %s"
-#: builtin/index-pack.c:825 builtin/index-pack.c:844
+#: builtin/index-pack.c:849 builtin/index-pack.c:868
msgid "fsck error in packed object"
msgstr ""
-#: builtin/index-pack.c:846
+#: builtin/index-pack.c:870
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Не все дочерние объекты %s достижимы"
-#: builtin/index-pack.c:918 builtin/index-pack.c:949
+#: builtin/index-pack.c:931 builtin/index-pack.c:978
msgid "failed to apply delta"
msgstr "сбой при применении дельты"
-#: builtin/index-pack.c:1117
+#: builtin/index-pack.c:1161
msgid "Receiving objects"
msgstr "Получение объектов"
-#: builtin/index-pack.c:1117
+#: builtin/index-pack.c:1161
msgid "Indexing objects"
msgstr "Индексирование объектов"
-#: builtin/index-pack.c:1151
+#: builtin/index-pack.c:1195
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "пакет поврежден (несоответствие SHA1)"
-#: builtin/index-pack.c:1156
+#: builtin/index-pack.c:1200
msgid "cannot fstat packfile"
msgstr "не удалось выполнить fstat для файла пакета"
-#: builtin/index-pack.c:1159
+#: builtin/index-pack.c:1203
msgid "pack has junk at the end"
msgstr "файл пакета содержит мусор в конце"
-#: builtin/index-pack.c:1171
+#: builtin/index-pack.c:1215
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "безумная путаница в parse_pack_objects()"
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1238
msgid "Resolving deltas"
msgstr "Определение изменений"
-#: builtin/index-pack.c:1204 builtin/pack-objects.c:2489
+#: builtin/index-pack.c:1249 builtin/pack-objects.c:2697
#, c-format
msgid "unable to create thread: %s"
msgstr "не удалось создать поток: %s"
-#: builtin/index-pack.c:1245
+#: builtin/index-pack.c:1282
msgid "confusion beyond insanity"
msgstr "безумная путаница"
-#: builtin/index-pack.c:1251
+#: builtin/index-pack.c:1288
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
@@ -12815,12 +14934,12 @@
msgstr[2] "завершено с %d локальными объектами"
msgstr[3] "завершено с %d локальными объектами"
-#: builtin/index-pack.c:1263
+#: builtin/index-pack.c:1300
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Неожиданная контрольная сумма в конце %s (диск поврежден?)"
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1304
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
@@ -12829,59 +14948,59 @@
msgstr[2] "пакет содержит %d неразрешенных дельт"
msgstr[3] "пакет содержит %d неразрешенных дельт"
-#: builtin/index-pack.c:1291
+#: builtin/index-pack.c:1328
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "нельзя сжать присоединенный объект (%d)"
-#: builtin/index-pack.c:1368
+#: builtin/index-pack.c:1424
#, c-format
msgid "local object %s is corrupt"
msgstr "локальный объект %s поврежден"
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1444
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "имя пакета «%s» не оканчивается на «.pack»"
-#: builtin/index-pack.c:1407
+#: builtin/index-pack.c:1469
#, c-format
msgid "cannot write %s file '%s'"
msgstr ""
-#: builtin/index-pack.c:1415
+#: builtin/index-pack.c:1477
#, c-format
msgid "cannot close written %s file '%s'"
msgstr ""
-#: builtin/index-pack.c:1439
+#: builtin/index-pack.c:1501
msgid "error while closing pack file"
msgstr "ошибка при закрытии файла пакета"
-#: builtin/index-pack.c:1453
+#: builtin/index-pack.c:1515
msgid "cannot store pack file"
msgstr "не удалось сохранить файл пакета"
-#: builtin/index-pack.c:1461
+#: builtin/index-pack.c:1523
msgid "cannot store index file"
msgstr "не удалось сохранить файл индекса"
-#: builtin/index-pack.c:1505 builtin/pack-objects.c:2728
+#: 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:1573
+#: builtin/index-pack.c:1631
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Не удалось открыть существующий файл пакета «%s»"
-#: builtin/index-pack.c:1575
+#: builtin/index-pack.c:1633
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Не удалось открыть существующий файл индекса для «%s»"
-#: builtin/index-pack.c:1623
+#: builtin/index-pack.c:1681
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
@@ -12890,7 +15009,7 @@
msgstr[2] "не дельты: %d объектов"
msgstr[3] "не дельты: %d объектов"
-#: builtin/index-pack.c:1630
+#: builtin/index-pack.c:1688
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
@@ -12899,698 +15018,761 @@
msgstr[2] "длина цепочки = %d: %lu объектов"
msgstr[3] "длина цепочки = %d: %lu объектов"
-#: builtin/index-pack.c:1667
+#: builtin/index-pack.c:1728
msgid "Cannot come back to cwd"
msgstr "Не удалось вернуться в текущий рабочий каталог"
-#: builtin/index-pack.c:1716 builtin/index-pack.c:1719
-#: builtin/index-pack.c:1735 builtin/index-pack.c:1739
+#: 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:1755
+#: builtin/index-pack.c:1806 builtin/init-db.c:392 builtin/init-db.c:625
+#, c-format
+msgid "unknown hash algorithm '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:1821
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin нельзя использовать без --stdin"
-#: builtin/index-pack.c:1757
+#: builtin/index-pack.c:1823
msgid "--stdin requires a git repository"
msgstr "опция --stdin требует наличия репозитория git"
-#: builtin/index-pack.c:1763
+#: 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 "--verify без указания имени файла пакета"
-#: builtin/index-pack.c:1811 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1892 builtin/unpack-objects.c:582
msgid "fsck error in pack objects"
-msgstr ""
+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 "не удалось выполнить opendir для «%s»"
-#: builtin/init-db.c:78
+#: builtin/init-db.c:81
#, c-format
msgid "cannot readlink '%s'"
msgstr "не удалось выполнить readlink для «%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 ""
-#: 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:275
+#, c-format
+msgid "invalid initial branch name: '%s'"
+msgstr ""
+
+#: builtin/init-db.c:367
#, c-format
msgid "unable to handle file type %d"
msgstr "не удается обработать файл типа %d"
-#: builtin/init-db.c:337
+#: builtin/init-db.c:370
#, 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:386
+msgid "attempt to reinitialize repository with different hash"
+msgstr ""
+
+#: builtin/init-db.c:410 builtin/init-db.c:413
#, c-format
msgid "%s already exists"
msgstr "%s уже существует"
-#: builtin/init-db.c:413
+#: builtin/init-db.c:445
+#, c-format
+msgid "re-init: ignored --initial-branch=%s"
+msgstr ""
+
+#: builtin/init-db.c:476
#, 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:477
#, 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:481
#, 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:482
#, 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:531
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] "
"[--shared[=<permissions>]] [<directory>]"
msgstr "git init [-q | --quiet] [--bare] [--template=<каталог-шаблонов>] [--shared[=<права-доступа>]] [<каталог>]"
-#: builtin/init-db.c:491
+#: builtin/init-db.c:557
msgid "permissions"
msgstr "права-доступа"
-#: builtin/init-db.c:492
+#: builtin/init-db.c:558
msgid "specify that the git repository is to be shared amongst several users"
msgstr "укажите, если репозиторий git будет использоваться несколькими пользователями"
-#: builtin/init-db.c:526 builtin/init-db.c:531
+#: builtin/init-db.c:564
+msgid "override the name of the initial branch"
+msgstr ""
+
+#: builtin/init-db.c:565 builtin/verify-pack.c:74
+msgid "hash"
+msgstr "хэш-код"
+
+#: builtin/init-db.c:566 builtin/show-index.c:22 builtin/verify-pack.c:75
+msgid "specify the hash algorithm to use"
+msgstr "указание какой алгоритм хэширования использовать"
+
+#: builtin/init-db.c:573
+msgid "--separate-git-dir and --bare are mutually exclusive"
+msgstr ""
+
+#: builtin/init-db.c:602 builtin/init-db.c:607
#, c-format
msgid "cannot mkdir %s"
msgstr "не удалось выполнить mkdir %s"
-#: builtin/init-db.c:535
+#: builtin/init-db.c:611 builtin/init-db.c:666
#, c-format
msgid "cannot chdir to %s"
msgstr "не удалось выполнить chdir в %s"
-#: builtin/init-db.c:556
+#: builtin/init-db.c:638
#, 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:584
+#: builtin/init-db.c:690
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Не удалось получить доступ к рабочему каталогу «%s»"
-#: builtin/interpret-trailers.c:15
+#: builtin/init-db.c:695
+msgid "--separate-git-dir incompatible with bare repository"
+msgstr ""
+
+#: 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:94
+#: builtin/interpret-trailers.c:95
msgid "edit files in place"
msgstr "редактировать файлы на месте"
-#: builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:96
msgid "trim empty trailers"
msgstr "удалять пустые завершители"
-#: builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:99
msgid "where to place the new trailer"
msgstr "где поместить новый завершитель"
-#: builtin/interpret-trailers.c:100
+#: builtin/interpret-trailers.c:101
msgid "action if trailer already exists"
msgstr "действие, если завершитель уже существует"
-#: builtin/interpret-trailers.c:102
+#: builtin/interpret-trailers.c:103
msgid "action if trailer is missing"
msgstr "действие, если завершитель не существует"
-#: builtin/interpret-trailers.c:104
+#: builtin/interpret-trailers.c:105
msgid "output only the trailers"
msgstr "вывести только завершители"
-#: builtin/interpret-trailers.c:105
+#: builtin/interpret-trailers.c:106
msgid "do not apply config rules"
msgstr "не применять правила из файла конфигурации"
-#: builtin/interpret-trailers.c:106
+#: builtin/interpret-trailers.c:107
msgid "join whitespace-continued values"
msgstr "объединить значения разделенные пробелом"
-#: builtin/interpret-trailers.c:107
+#: builtin/interpret-trailers.c:108
msgid "set parsing options"
msgstr "указание опций разбора"
-#: builtin/interpret-trailers.c:109
-msgid "do not treat --- specially"
-msgstr ""
-
#: builtin/interpret-trailers.c:110
+msgid "do not treat --- specially"
+msgstr "не воспринимать --- по-особенному"
+
+#: builtin/interpret-trailers.c:111
msgid "trailer"
msgstr "завершитель"
-#: builtin/interpret-trailers.c:111
+#: builtin/interpret-trailers.c:112
msgid "trailer(s) to add"
msgstr "завершители для добавления"
-#: builtin/interpret-trailers.c:120
+#: builtin/interpret-trailers.c:123
msgid "--trailer with --only-input does not make sense"
msgstr "--trailer одновременно с --only-input не имеет смысла"
-#: builtin/interpret-trailers.c:130
+#: builtin/interpret-trailers.c:133
msgid "no input file given for in-place editing"
msgstr "ничего не передано, для редактирования файлов на месте"
-#: builtin/log.c:55
+#: builtin/log.c:58
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<опции>] [<диапазон-редакций>] [[--] <путь>…]"
-#: builtin/log.c:56
+#: builtin/log.c:59
msgid "git show [<options>] <object>..."
msgstr "git show [<опции>] <объект>…"
-#: builtin/log.c:104
+#: builtin/log.c:112
#, c-format
msgid "invalid --decorate option: %s"
msgstr "неправильный параметр для --decorate: %s"
-#: builtin/log.c:168
+#: builtin/log.c:179
msgid "show source"
msgstr "показать источник"
-#: builtin/log.c:169
+#: builtin/log.c:180
msgid "Use mail map file"
msgstr "Использовать файл соответствия почтовых адресов"
-#: builtin/log.c:171
+#: builtin/log.c:183
msgid "only decorate refs that match <pattern>"
msgstr "декорировать только ссылки соответствующие <шаблону>"
-#: builtin/log.c:173
+#: builtin/log.c:185
msgid "do not decorate refs that match <pattern>"
msgstr "не декорировать ссылки соответствующие <шаблону>"
-#: builtin/log.c:174
+#: builtin/log.c:186
msgid "decorate options"
msgstr "опции формата вывода ссылок"
-#: builtin/log.c:177
-msgid "Process line range n,m in file, counting from 1"
-msgstr "Обработать диапазон строк n,m из файла, начиная с 1"
+#: builtin/log.c:189
+msgid ""
+"Trace the evolution of line range <start>,<end> or function :<funcname> in "
+"<file>"
+msgstr ""
-#: builtin/log.c:275
+#: builtin/log.c:212
+msgid "-L<range>:<file> cannot be used with pathspec"
+msgstr ""
+
+#: builtin/log.c:302
#, c-format
msgid "Final output: %d %s\n"
msgstr "Финальный вывод: %d %s\n"
-#: builtin/log.c:529
+#: builtin/log.c:564
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: плохой файл"
-#: builtin/log.c:544 builtin/log.c:638
+#: builtin/log.c:579 builtin/log.c:674
#, c-format
msgid "could not read object %s"
msgstr ""
-#: builtin/log.c:663
+#: builtin/log.c:699
#, c-format
msgid "unknown type: %d"
msgstr ""
-#: builtin/log.c:784
+#: builtin/log.c:848
+#, c-format
+msgid "%s: invalid cover from description mode"
+msgstr ""
+
+#: builtin/log.c:855
msgid "format.headers without value"
msgstr "в format.headers не указано значение"
-#: builtin/log.c:885
-msgid "name of output directory is too long"
-msgstr "слишком длинное имя выходного каталога"
-
-#: builtin/log.c:901
+#: builtin/log.c:984
#, c-format
msgid "cannot open patch file %s"
msgstr ""
-#: builtin/log.c:918
+#: builtin/log.c:1001
msgid "need exactly one range"
msgstr ""
-#: builtin/log.c:928
+#: builtin/log.c:1011
msgid "not a range"
msgstr ""
-#: builtin/log.c:1051
+#: builtin/log.c:1175
msgid "cover letter needs email format"
msgstr ""
-#: builtin/log.c:1057
+#: builtin/log.c:1181
msgid "failed to create cover-letter file"
msgstr ""
-#: builtin/log.c:1136
+#: builtin/log.c:1262
#, c-format
msgid "insane in-reply-to: %s"
msgstr "ошибка в поле in-reply-to: %s"
-#: builtin/log.c:1163
+#: builtin/log.c:1289
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<опции>] [<начиная-с> | <диапазон-редакций>]"
-#: builtin/log.c:1221
+#: builtin/log.c:1347
msgid "two output directories?"
msgstr ""
-#: builtin/log.c:1332 builtin/log.c:2076 builtin/log.c:2078 builtin/log.c:2090
+#: builtin/log.c:1498 builtin/log.c:2318 builtin/log.c:2320 builtin/log.c:2332
#, c-format
msgid "unknown commit %s"
msgstr ""
-#: builtin/log.c:1342 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1509 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:1347
+#: builtin/log.c:1518
msgid "could not find exact merge base"
msgstr ""
-#: builtin/log.c:1351
+#: builtin/log.c:1528
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:1371
+#: builtin/log.c:1551
msgid "failed to find exact merge base"
msgstr ""
-#: builtin/log.c:1382
+#: builtin/log.c:1568
msgid "base commit should be the ancestor of revision list"
msgstr "базовый коммит должен быть предком списка редакций"
-#: builtin/log.c:1386
+#: builtin/log.c:1578
msgid "base commit shouldn't be in revision list"
msgstr "базовый коммит не должен быть в списке редакций"
-#: builtin/log.c:1439
+#: builtin/log.c:1636
msgid "cannot get patch id"
msgstr "не удалось получить идентификатор патча"
-#: builtin/log.c:1491
-msgid "failed to infer range-diff ranges"
+#: builtin/log.c:1693
+msgid "failed to infer range-diff origin of current series"
msgstr ""
-#: builtin/log.c:1536
+#: builtin/log.c:1695
+#, c-format
+msgid "using '%s' as range-diff origin of current series"
+msgstr ""
+
+#: builtin/log.c:1739
msgid "use [PATCH n/m] even with a single patch"
msgstr "выводить [PATCH n/m] даже когда один патч"
-#: builtin/log.c:1539
+#: builtin/log.c:1742
msgid "use [PATCH] even with multiple patches"
msgstr "выводить [PATCH] даже когда несколько патчей"
-#: builtin/log.c:1543
+#: builtin/log.c:1746
msgid "print patches to standard out"
msgstr "выводить патчи на стандартный вывод"
-#: builtin/log.c:1545
+#: builtin/log.c:1748
msgid "generate a cover letter"
msgstr "создать сопроводительное письмо"
-#: builtin/log.c:1547
+#: builtin/log.c:1750
msgid "use simple number sequence for output file names"
msgstr "использовать простую последовательность чисел для имен выходных файлов"
-#: builtin/log.c:1548
+#: builtin/log.c:1751
msgid "sfx"
msgstr "суффикс"
-#: builtin/log.c:1549
+#: builtin/log.c:1752
msgid "use <sfx> instead of '.patch'"
msgstr "использовать суффикс <суффикс> вместо «.patch»"
-#: builtin/log.c:1551
+#: builtin/log.c:1754
msgid "start numbering patches at <n> instead of 1"
msgstr "начать нумерацию патчей с <n>, а не с 1"
-#: builtin/log.c:1553
+#: builtin/log.c:1756
msgid "mark the series as Nth re-roll"
msgstr "пометить серию как энную попытку"
-#: builtin/log.c:1555
+#: builtin/log.c:1758
+msgid "max length of output filename"
+msgstr ""
+
+#: builtin/log.c:1760
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "Использовать [RFC PATCH] вместо [PATCH]"
-#: builtin/log.c:1558
+#: builtin/log.c:1763
+msgid "cover-from-description-mode"
+msgstr ""
+
+#: builtin/log.c:1764
+msgid "generate parts of a cover letter based on a branch's description"
+msgstr ""
+
+#: builtin/log.c:1766
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Использовать [<префикс>] вместо [PATCH]"
-#: builtin/log.c:1561
+#: builtin/log.c:1769
msgid "store resulting files in <dir>"
msgstr "сохранить результирующие файлы в <каталог>"
-#: builtin/log.c:1564
+#: builtin/log.c:1772
msgid "don't strip/add [PATCH]"
msgstr "не обрезать/добавлять [PATCH]"
-#: builtin/log.c:1567
+#: builtin/log.c:1775
msgid "don't output binary diffs"
msgstr "не выводить двоичные изменения"
-#: builtin/log.c:1569
+#: builtin/log.c:1777
msgid "output all-zero hash in From header"
-msgstr "выводить нулевую хеш-сумму в заголовке From"
+msgstr "выводить нулевой хэш-код в заголовке From"
-#: builtin/log.c:1571
+#: builtin/log.c:1779
msgid "don't include a patch matching a commit upstream"
msgstr "не включать патч, если коммит уже есть в вышестоящей ветке"
-#: builtin/log.c:1573
+#: builtin/log.c:1781
msgid "show patch format instead of default (patch + stat)"
msgstr "выводить в формате патча, а не в стандартном (патч + статистика)"
-#: builtin/log.c:1575
+#: builtin/log.c:1783
msgid "Messaging"
msgstr "Передача сообщений"
-#: builtin/log.c:1576
+#: builtin/log.c:1784
msgid "header"
msgstr "заголовок"
-#: builtin/log.c:1577
+#: builtin/log.c:1785
msgid "add email header"
msgstr "добавить заголовок сообщения"
-#: builtin/log.c:1578 builtin/log.c:1580
+#: builtin/log.c:1786 builtin/log.c:1787
msgid "email"
msgstr "почта"
-#: builtin/log.c:1578
+#: builtin/log.c:1786
msgid "add To: header"
msgstr "добавить заголовок To:"
-#: builtin/log.c:1580
+#: builtin/log.c:1787
msgid "add Cc: header"
msgstr "добавить заголовок Cc:"
-#: builtin/log.c:1582
+#: builtin/log.c:1788
msgid "ident"
msgstr "идентификатор"
-#: builtin/log.c:1583
+#: builtin/log.c:1789
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "установить адрес отправителя на <идентификатор> (или на идентификатор коммитера, если отсутствует)"
-#: builtin/log.c:1585
+#: builtin/log.c:1791
msgid "message-id"
msgstr "идентификатор-сообщения"
-#: builtin/log.c:1586
+#: builtin/log.c:1792
msgid "make first mail a reply to <message-id>"
msgstr "сделать первое письмо ответом на <идентификатор-сообщения>"
-#: builtin/log.c:1587 builtin/log.c:1590
+#: builtin/log.c:1793 builtin/log.c:1796
msgid "boundary"
msgstr "вложение"
-#: builtin/log.c:1588
+#: builtin/log.c:1794
msgid "attach the patch"
msgstr "приложить патч"
-#: builtin/log.c:1591
+#: builtin/log.c:1797
msgid "inline the patch"
msgstr "включить патч в текст письма"
-#: builtin/log.c:1595
+#: builtin/log.c:1801
msgid "enable message threading, styles: shallow, deep"
msgstr "включить в письмах иерархичность, стили: shallow (частичную), deep (глубокую)"
-#: builtin/log.c:1597
+#: builtin/log.c:1803
msgid "signature"
msgstr "подпись"
-#: builtin/log.c:1598
+#: builtin/log.c:1804
msgid "add a signature"
msgstr "добавить подпись"
-#: builtin/log.c:1599
+#: builtin/log.c:1805
msgid "base-commit"
msgstr "базовый коммит"
-#: builtin/log.c:1600
+#: builtin/log.c:1806
msgid "add prerequisite tree info to the patch series"
msgstr "добавить информацию о требовании дерева к серии патчей"
-#: builtin/log.c:1602
+#: builtin/log.c:1809
msgid "add a signature from a file"
msgstr "добавить подпись из файла"
-#: builtin/log.c:1603
+#: builtin/log.c:1810
msgid "don't print the patch filenames"
msgstr "не выводить имена файлов патчей"
-#: builtin/log.c:1605
+#: builtin/log.c:1812
msgid "show progress while generating patches"
msgstr "показать прогресс выполнения во создания патчей"
-#: builtin/log.c:1606
-msgid "rev"
-msgstr ""
-
-#: builtin/log.c:1607
+#: builtin/log.c:1814
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
-#: builtin/log.c:1610
+#: builtin/log.c:1817
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
-#: builtin/log.c:1612
+#: builtin/log.c:1819
msgid "percentage by which creation is weighted"
msgstr ""
-#: builtin/log.c:1687
+#: builtin/log.c:1905
#, c-format
msgid "invalid ident line: %s"
msgstr "неправильная строка идентификации: %s"
-#: builtin/log.c:1702
+#: builtin/log.c:1920
msgid "-n and -k are mutually exclusive"
msgstr ""
-#: builtin/log.c:1704
+#: builtin/log.c:1922
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr ""
-#: builtin/log.c:1712
+#: builtin/log.c:1930
msgid "--name-only does not make sense"
msgstr "--name-only не имеет смысла"
-#: builtin/log.c:1714
+#: builtin/log.c:1932
msgid "--name-status does not make sense"
msgstr "--name-status не имеет смысла"
-#: builtin/log.c:1716
+#: builtin/log.c:1934
msgid "--check does not make sense"
msgstr "--check не имеет смысла"
-#: builtin/log.c:1748
-msgid "standard output, or directory, which one?"
-msgstr "стандартный вывод или каталог?"
+#: builtin/log.c:1956
+msgid "--stdout, --output, and --output-directory are mutually exclusive"
+msgstr ""
-#: builtin/log.c:1837
+#: builtin/log.c:2079
msgid "--interdiff requires --cover-letter or single patch"
msgstr ""
-#: builtin/log.c:1841
+#: builtin/log.c:2083
msgid "Interdiff:"
msgstr ""
-#: builtin/log.c:1842
+#: builtin/log.c:2084
#, c-format
msgid "Interdiff against v%d:"
msgstr ""
-#: builtin/log.c:1848
+#: builtin/log.c:2090
msgid "--creation-factor requires --range-diff"
msgstr ""
-#: builtin/log.c:1852
+#: builtin/log.c:2094
msgid "--range-diff requires --cover-letter or single patch"
msgstr ""
-#: builtin/log.c:1860
+#: builtin/log.c:2102
msgid "Range-diff:"
msgstr ""
-#: builtin/log.c:1861
+#: builtin/log.c:2103
#, c-format
msgid "Range-diff against v%d:"
msgstr ""
-#: builtin/log.c:1872
+#: builtin/log.c:2114
#, c-format
msgid "unable to read signature file '%s'"
msgstr "не удалось прочитать файл подписи «%s»"
-#: builtin/log.c:1908
+#: builtin/log.c:2150
msgid "Generating patches"
msgstr "Создание патчей"
-#: builtin/log.c:1952
+#: builtin/log.c:2194
msgid "failed to create output files"
msgstr ""
-#: builtin/log.c:2011
+#: builtin/log.c:2253
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<вышестоящая-ветка> [<редакция> [<ограничение>]]]"
-#: builtin/log.c:2065
+#: builtin/log.c:2307
#, 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 "показывать информации о разрешении конфликтов и отмене"
-#: 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 "показать отладочную информацию"
@@ -13605,7 +15787,7 @@
msgid "do not print remote URL"
msgstr "не выводить URL внешних репозиториев"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1458
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1398
msgid "exec"
msgstr "запуск"
@@ -13678,365 +15860,6 @@
msgid "empty mbox: '%s'"
msgstr "пустой mbox: «%s»"
-#: builtin/merge.c:54
-msgid "git merge [<options>] [<commit>...]"
-msgstr "git merge [<опции>] [<коммит>…]"
-
-#: builtin/merge.c:55
-msgid "git merge --abort"
-msgstr "git merge --abort"
-
-#: builtin/merge.c:56
-msgid "git merge --continue"
-msgstr "git merge --continue"
-
-#: builtin/merge.c:116
-msgid "switch `m' requires a value"
-msgstr "при указании параметра «m» требуется указать значение"
-
-#: builtin/merge.c:139
-#, c-format
-msgid "option `%s' requires a value"
-msgstr ""
-
-#: builtin/merge.c:185
-#, c-format
-msgid "Could not find merge strategy '%s'.\n"
-msgstr "Не удалось найти стратегию слияния «%s».\n"
-
-#: builtin/merge.c:186
-#, c-format
-msgid "Available strategies are:"
-msgstr "Доступные стратегии:"
-
-#: builtin/merge.c:191
-#, c-format
-msgid "Available custom strategies are:"
-msgstr "Доступные пользовательские стратегии:"
-
-#: builtin/merge.c:242 builtin/pull.c:150
-msgid "do not show a diffstat at the end of the merge"
-msgstr "не выводить статистику изменений после окончания слияния"
-
-#: builtin/merge.c:245 builtin/pull.c:153
-msgid "show a diffstat at the end of the merge"
-msgstr "вывести статистику изменений после окончания слияния"
-
-#: builtin/merge.c:246 builtin/pull.c:156
-msgid "(synonym to --stat)"
-msgstr "(синоним для --stat)"
-
-#: builtin/merge.c:248 builtin/pull.c:159
-msgid "add (at most <n>) entries from shortlog to merge commit message"
-msgstr "добавить (максимум <n>) записей из короткого журнала в сообщение коммита у слияния"
-
-#: builtin/merge.c:251 builtin/pull.c:165
-msgid "create a single commit instead of doing a merge"
-msgstr "создать один коммит, вместо выполнения слияния"
-
-#: builtin/merge.c:253 builtin/pull.c:168
-msgid "perform a commit if the merge succeeds (default)"
-msgstr "сделать коммит, если слияние прошло успешно (по умолчанию)"
-
-#: builtin/merge.c:255 builtin/pull.c:171
-msgid "edit message before committing"
-msgstr "отредактировать сообщение перед выполнением коммита"
-
-#: builtin/merge.c:257
-msgid "allow fast-forward (default)"
-msgstr "разрешить перемотку вперед (по умолчанию)"
-
-#: builtin/merge.c:259 builtin/pull.c:178
-msgid "abort if fast-forward is not possible"
-msgstr "отменить выполнение слияния, если перемотка вперед невозможна"
-
-#: builtin/merge.c:263 builtin/pull.c:181
-msgid "verify that the named commit has a valid GPG signature"
-msgstr "проверить, что указанный коммит имеет верную электронную подпись GPG"
-
-#: builtin/merge.c:264 builtin/notes.c:787 builtin/pull.c:185
-#: builtin/rebase.c:492 builtin/rebase.c:1471 builtin/revert.c:113
-msgid "strategy"
-msgstr "стратегия"
-
-#: builtin/merge.c:265 builtin/pull.c:186
-msgid "merge strategy to use"
-msgstr "используемая стратегия слияния"
-
-#: builtin/merge.c:266 builtin/pull.c:189
-msgid "option=value"
-msgstr "опция=значение"
-
-#: builtin/merge.c:267 builtin/pull.c:190
-msgid "option for selected merge strategy"
-msgstr "опции для выбранной стратегии слияния"
-
-#: builtin/merge.c:269
-msgid "merge commit message (for a non-fast-forward merge)"
-msgstr "сообщение коммита для слияния (для слияния без перемотки вперед)"
-
-#: builtin/merge.c:276
-msgid "abort the current in-progress merge"
-msgstr "отменить выполнение происходящего слияния"
-
-#: builtin/merge.c:278
-msgid "continue the current in-progress merge"
-msgstr "продолжить выполнение происходящего слияния"
-
-#: builtin/merge.c:280 builtin/pull.c:197
-msgid "allow merging unrelated histories"
-msgstr "разрешить слияние несвязанных историй изменений"
-
-#: builtin/merge.c:286
-msgid "verify commit-msg hook"
-msgstr "проверить перехватчик commit-msg"
-
-#: builtin/merge.c:311
-msgid "could not run stash."
-msgstr "не удалось выполнить stash."
-
-#: builtin/merge.c:316
-msgid "stash failed"
-msgstr "сбой при выполнении stash"
-
-#: builtin/merge.c:321
-#, c-format
-msgid "not a valid object: %s"
-msgstr "неправильный объект: %s"
-
-#: builtin/merge.c:343 builtin/merge.c:360
-msgid "read-tree failed"
-msgstr "сбой при выполнении read-tree"
-
-#: builtin/merge.c:390
-msgid " (nothing to squash)"
-msgstr " (нечего уплотнять)"
-
-#: builtin/merge.c:401
-#, c-format
-msgid "Squash commit -- not updating HEAD\n"
-msgstr "Уплотнение коммита — не обновляя HEAD\n"
-
-#: builtin/merge.c:451
-#, c-format
-msgid "No merge message -- not updating HEAD\n"
-msgstr "Нет сообщения слияния — не обновляем HEAD\n"
-
-#: builtin/merge.c:502
-#, c-format
-msgid "'%s' does not point to a commit"
-msgstr "«%s» не указывает на коммит"
-
-#: builtin/merge.c:589
-#, c-format
-msgid "Bad branch.%s.mergeoptions string: %s"
-msgstr "Неправильная строка branch.%s.mergeoptions: %s"
-
-#: builtin/merge.c:712
-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 ""
-
-#: builtin/merge.c:813
-msgid "An empty message aborts the commit.\n"
-msgstr ""
-
-#: 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:857
-msgid "Empty commit message."
-msgstr "Пустое сообщение коммита."
-
-#: builtin/merge.c:876
-#, c-format
-msgid "Wonderful.\n"
-msgstr "Прекрасно.\n"
-
-#: builtin/merge.c:936
-#, c-format
-msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
-msgstr "Не удалось провести автоматическое слияние; исправьте конфликты и сделайте коммит результата.\n"
-
-#: builtin/merge.c:975
-msgid "No current branch."
-msgstr "Нет текущей ветки."
-
-#: builtin/merge.c:977
-msgid "No remote for the current branch."
-msgstr "У текущей ветки нет внешнего репозитория."
-
-#: builtin/merge.c:979
-msgid "No default upstream defined for the current branch."
-msgstr "Для текущей ветки не указана вышестоящая ветка по умолчанию."
-
-#: builtin/merge.c:984
-#, c-format
-msgid "No remote-tracking branch for %s from %s"
-msgstr "Не указана внешняя отслеживаемая ветка для %s на %s"
-
-#: builtin/merge.c:1041
-#, c-format
-msgid "Bad value '%s' in environment '%s'"
-msgstr "Плохое значение «%s» в переменной окружения «%s»"
-
-#: builtin/merge.c:1144
-#, c-format
-msgid "not something we can merge in %s: %s"
-msgstr "не является тем, что можно слить в %s: %s"
-
-#: builtin/merge.c:1178
-msgid "not something we can merge"
-msgstr "не является тем, что можно слить"
-
-#: builtin/merge.c:1281
-msgid "--abort expects no arguments"
-msgstr "опция --abort не принимает аргументы"
-
-#: builtin/merge.c:1285
-msgid "There is no merge to abort (MERGE_HEAD missing)."
-msgstr "Нет слияния, которое можно отменить (отсутствует файл MERGE_HEAD)."
-
-#: builtin/merge.c:1297
-msgid "--continue expects no arguments"
-msgstr "опция --continue не принимает аргументы"
-
-#: builtin/merge.c:1301
-msgid "There is no merge in progress (MERGE_HEAD missing)."
-msgstr "Сейчас не происходит слияние (отсутствует файл MERGE_HEAD)."
-
-#: builtin/merge.c:1317
-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:1324
-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:1327
-msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
-msgstr "Вы не завершили копирование коммита (присутствует файл CHERRY_PICK_HEAD)."
-
-#: builtin/merge.c:1341
-msgid "You cannot combine --squash with --no-ff."
-msgstr "Нельзя использовать одновременно --squash и --no-ff."
-
-#: builtin/merge.c:1349
-msgid "No commit specified and merge.defaultToUpstream not set."
-msgstr "Коммит не указан и параметр merge.defaultToUpstream не установлен."
-
-#: builtin/merge.c:1366
-msgid "Squash commit into empty head not supported yet"
-msgstr "Уплотнение коммита в пустую ветку еще не поддерживается"
-
-#: builtin/merge.c:1368
-msgid "Non-fast-forward commit does not make sense into an empty head"
-msgstr "Коммит, не являющийся перемоткой вперед, нет смысла делать в пустую ветку."
-
-#: builtin/merge.c:1373
-#, c-format
-msgid "%s - not something we can merge"
-msgstr "%s не является тем, что можно слить"
-
-#: builtin/merge.c:1375
-msgid "Can merge only exactly one commit into empty head"
-msgstr "Можно только один коммит в пустую ветку."
-
-#: builtin/merge.c:1454
-msgid "refusing to merge unrelated histories"
-msgstr "отказ слияния несвязанных историй изменений"
-
-#: builtin/merge.c:1463
-msgid "Already up to date."
-msgstr "Уже обновлено."
-
-#: builtin/merge.c:1473
-#, c-format
-msgid "Updating %s..%s\n"
-msgstr "Обновление %s..%s\n"
-
-#: builtin/merge.c:1515
-#, c-format
-msgid "Trying really trivial in-index merge...\n"
-msgstr "Попытка тривиального слияния в индексе…\n"
-
-#: builtin/merge.c:1522
-#, c-format
-msgid "Nope.\n"
-msgstr "Не вышло.\n"
-
-#: builtin/merge.c:1547
-msgid "Already up to date. Yeeah!"
-msgstr "Уже обновлено. Круто!"
-
-#: builtin/merge.c:1553
-msgid "Not possible to fast-forward, aborting."
-msgstr "Перемотка вперед невозможна, отмена."
-
-#: builtin/merge.c:1576 builtin/merge.c:1655
-#, c-format
-msgid "Rewinding the tree to pristine...\n"
-msgstr "Перемотка дерева к исходному состоянию…\n"
-
-#: builtin/merge.c:1580
-#, c-format
-msgid "Trying merge strategy %s...\n"
-msgstr "Попытка слияния с помощью стратегии %s…\n"
-
-#: builtin/merge.c:1646
-#, c-format
-msgid "No merge strategy handled the merge.\n"
-msgstr "Ни одна стратегия слияния не обработала слияние.\n"
-
-#: builtin/merge.c:1648
-#, c-format
-msgid "Merge with strategy %s failed.\n"
-msgstr "Сбой при слиянии с помощью стратегии %s.\n"
-
-#: builtin/merge.c:1657
-#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
-msgstr "Использую %s для подготовки ручного разрешения конфликтов.\n"
-
-#: builtin/merge.c:1669
-#, 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] <коммит> <коммит>…"
@@ -14057,23 +15880,23 @@
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <ссылка> [<коммит>]"
-#: builtin/merge-base.c:153
+#: builtin/merge-base.c:143
msgid "output all common ancestors"
msgstr "вывести всех общих предков"
-#: builtin/merge-base.c:155
+#: builtin/merge-base.c:145
msgid "find ancestors for a single n-way merge"
msgstr "вывести предков для одного многоходового слияния"
-#: builtin/merge-base.c:157
+#: builtin/merge-base.c:147
msgid "list revs not reachable from others"
msgstr "вывести список редаций, которые не достижимы из друг друга"
-#: builtin/merge-base.c:159
+#: builtin/merge-base.c:149
msgid "is the first one ancestor of the other?"
msgstr "является первым предком второго указанного коммита?"
-#: builtin/merge-base.c:161
+#: builtin/merge-base.c:151
msgid "find where <commit> forked from reflog of <ref>"
msgstr "найти журнале ссылок <ссылка> где именно <коммит> разветвился"
@@ -14115,17 +15938,17 @@
msgid "set labels for file1/orig-file/file2"
msgstr "установить метки для файл1/ориг-файл/файл2"
-#: builtin/merge-recursive.c:46
+#: builtin/merge-recursive.c:47
#, c-format
msgid "unknown option %s"
msgstr "неизвестная опция %s"
-#: builtin/merge-recursive.c:52
+#: builtin/merge-recursive.c:53
#, c-format
msgid "could not parse object '%s'"
msgstr "не удалось разобрать объект «%s»"
-#: builtin/merge-recursive.c:56
+#: 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."
@@ -14134,20 +15957,391 @@
msgstr[2] "невозможно обработать больше %d баз. Игнорирую %s."
msgstr[3] "невозможно обработать больше %d базы. Игнорирую %s."
-#: builtin/merge-recursive.c:64
+#: builtin/merge-recursive.c:65
msgid "not handling anything other than two heads merge."
msgstr "не обрабатываю ничего, кроме слияния двух указателей на ветки."
-#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
+#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
#, c-format
msgid "could not resolve ref '%s'"
msgstr "не удалось распознать ссылку «%s»"
-#: builtin/merge-recursive.c:78
+#: builtin/merge-recursive.c:82
#, c-format
msgid "Merging %s with %s\n"
msgstr "Слияние %s и %s\n"
+#: builtin/merge.c:57
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<опции>] [<коммит>…]"
+
+#: builtin/merge.c:58
+msgid "git merge --abort"
+msgstr "git merge --abort"
+
+#: builtin/merge.c:59
+msgid "git merge --continue"
+msgstr "git merge --continue"
+
+#: builtin/merge.c:122
+msgid "switch `m' requires a value"
+msgstr "при указании параметра «m» требуется указать значение"
+
+#: builtin/merge.c:145
+#, c-format
+msgid "option `%s' requires a value"
+msgstr ""
+
+#: builtin/merge.c:198
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr "Не удалось найти стратегию слияния «%s».\n"
+
+#: builtin/merge.c:199
+#, c-format
+msgid "Available strategies are:"
+msgstr "Доступные стратегии:"
+
+#: builtin/merge.c:204
+#, c-format
+msgid "Available custom strategies are:"
+msgstr "Доступные пользовательские стратегии:"
+
+#: builtin/merge.c:255 builtin/pull.c:133
+msgid "do not show a diffstat at the end of the merge"
+msgstr "не выводить статистику изменений после окончания слияния"
+
+#: builtin/merge.c:258 builtin/pull.c:136
+msgid "show a diffstat at the end of the merge"
+msgstr "вывести статистику изменений после окончания слияния"
+
+#: builtin/merge.c:259 builtin/pull.c:139
+msgid "(synonym to --stat)"
+msgstr "(синоним для --stat)"
+
+#: builtin/merge.c:261 builtin/pull.c:142
+msgid "add (at most <n>) entries from shortlog to merge commit message"
+msgstr "добавить (максимум <n>) записей из короткого журнала в сообщение коммита у слияния"
+
+#: builtin/merge.c:264 builtin/pull.c:148
+msgid "create a single commit instead of doing a merge"
+msgstr "создать один коммит, вместо выполнения слияния"
+
+#: builtin/merge.c:266 builtin/pull.c:151
+msgid "perform a commit if the merge succeeds (default)"
+msgstr "сделать коммит, если слияние прошло успешно (по умолчанию)"
+
+#: builtin/merge.c:268 builtin/pull.c:154
+msgid "edit message before committing"
+msgstr "отредактировать сообщение перед выполнением коммита"
+
+#: builtin/merge.c:270
+msgid "allow fast-forward (default)"
+msgstr "разрешить перемотку вперед (по умолчанию)"
+
+#: builtin/merge.c:272 builtin/pull.c:161
+msgid "abort if fast-forward is not possible"
+msgstr "отменить выполнение слияния, если перемотка вперед невозможна"
+
+#: builtin/merge.c:276 builtin/pull.c:164
+msgid "verify that the named commit has a valid GPG signature"
+msgstr "проверить, что указанный коммит имеет верную электронную подпись GPG"
+
+#: builtin/merge.c:277 builtin/notes.c:787 builtin/pull.c:168
+#: builtin/rebase.c:539 builtin/rebase.c:1412 builtin/revert.c:114
+msgid "strategy"
+msgstr "стратегия"
+
+#: builtin/merge.c:278 builtin/pull.c:169
+msgid "merge strategy to use"
+msgstr "используемая стратегия слияния"
+
+#: builtin/merge.c:279 builtin/pull.c:172
+msgid "option=value"
+msgstr "опция=значение"
+
+#: builtin/merge.c:280 builtin/pull.c:173
+msgid "option for selected merge strategy"
+msgstr "опции для выбранной стратегии слияния"
+
+#: builtin/merge.c:282
+msgid "merge commit message (for a non-fast-forward merge)"
+msgstr "сообщение коммита для слияния (для слияния без перемотки вперед)"
+
+#: builtin/merge.c:289
+msgid "abort the current in-progress merge"
+msgstr "отменить выполнение происходящего слияния"
+
+#: builtin/merge.c:291
+msgid "--abort but leave index and working tree alone"
+msgstr ""
+
+#: builtin/merge.c:293
+msgid "continue the current in-progress merge"
+msgstr "продолжить выполнение происходящего слияния"
+
+#: builtin/merge.c:295 builtin/pull.c:180
+msgid "allow merging unrelated histories"
+msgstr "разрешить слияние несвязанных историй изменений"
+
+#: builtin/merge.c:302
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr ""
+
+#: builtin/merge.c:319
+msgid "could not run stash."
+msgstr "не удалось выполнить stash."
+
+#: builtin/merge.c:324
+msgid "stash failed"
+msgstr "сбой при выполнении stash"
+
+#: builtin/merge.c:329
+#, c-format
+msgid "not a valid object: %s"
+msgstr "неправильный объект: %s"
+
+#: builtin/merge.c:351 builtin/merge.c:368
+msgid "read-tree failed"
+msgstr "сбой при выполнении read-tree"
+
+#: builtin/merge.c:398
+msgid " (nothing to squash)"
+msgstr " (нечего уплотнять)"
+
+#: builtin/merge.c:409
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr "Уплотнение коммита — не обновляя HEAD\n"
+
+#: builtin/merge.c:459
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr "Нет сообщения слияния — не обновляем HEAD\n"
+
+#: builtin/merge.c:510
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr "«%s» не указывает на коммит"
+
+#: builtin/merge.c:597
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr "Неправильная строка branch.%s.mergeoptions: %s"
+
+#: builtin/merge.c:723
+msgid "Not handling anything other than two heads merge."
+msgstr "Не обрабатываю ничего, кроме слияния двух указателей на ветки."
+
+#: builtin/merge.c:736
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr "Неизвестный параметр merge-recursive: -X%s"
+
+#: builtin/merge.c:755 t/helper/test-fast-rebase.c:209
+#, c-format
+msgid "unable to write %s"
+msgstr "не удалось записать %s"
+
+#: builtin/merge.c:807
+#, c-format
+msgid "Could not read from '%s'"
+msgstr "Не удалось прочесть из «%s»"
+
+#: builtin/merge.c:816
+#, c-format
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+msgstr "Не выполняю коммит слияния; используйте «git commit» для завершения слияния.\n"
+
+#: builtin/merge.c:822
+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:827
+msgid "An empty message aborts the commit.\n"
+msgstr ""
+
+#: builtin/merge.c:830
+#, c-format
+msgid ""
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
+
+#: builtin/merge.c:883
+msgid "Empty commit message."
+msgstr "Пустое сообщение коммита."
+
+#: builtin/merge.c:898
+#, c-format
+msgid "Wonderful.\n"
+msgstr "Прекрасно.\n"
+
+#: builtin/merge.c:959
+#, c-format
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgstr "Не удалось провести автоматическое слияние; исправьте конфликты и сделайте коммит результата.\n"
+
+#: builtin/merge.c:998
+msgid "No current branch."
+msgstr "Нет текущей ветки."
+
+#: builtin/merge.c:1000
+msgid "No remote for the current branch."
+msgstr "У текущей ветки нет внешнего репозитория."
+
+#: builtin/merge.c:1002
+msgid "No default upstream defined for the current branch."
+msgstr "Для текущей ветки не указана вышестоящая ветка по умолчанию."
+
+#: builtin/merge.c:1007
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
+msgstr "Не указана внешняя отслеживаемая ветка для %s на %s"
+
+#: builtin/merge.c:1064
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "Плохое значение «%s» в переменной окружения «%s»"
+
+#: builtin/merge.c:1167
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr "не является тем, что можно слить в %s: %s"
+
+#: builtin/merge.c:1201
+msgid "not something we can merge"
+msgstr "не является тем, что можно слить"
+
+#: builtin/merge.c:1311
+msgid "--abort expects no arguments"
+msgstr "опция --abort не принимает аргументы"
+
+#: builtin/merge.c:1315
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr "Нет слияния, которое можно отменить (отсутствует файл MERGE_HEAD)."
+
+#: builtin/merge.c:1333
+msgid "--quit expects no arguments"
+msgstr ""
+
+#: builtin/merge.c:1346
+msgid "--continue expects no arguments"
+msgstr "опция --continue не принимает аргументы"
+
+#: builtin/merge.c:1350
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr "Сейчас не происходит слияние (отсутствует файл MERGE_HEAD)."
+
+#: builtin/merge.c:1366
+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:1373
+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:1376
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+msgstr "Вы не завершили копирование коммита (присутствует файл CHERRY_PICK_HEAD)."
+
+#: builtin/merge.c:1390
+msgid "You cannot combine --squash with --no-ff."
+msgstr "Нельзя использовать одновременно --squash и --no-ff."
+
+#: builtin/merge.c:1392
+msgid "You cannot combine --squash with --commit."
+msgstr ""
+
+#: builtin/merge.c:1408
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr "Коммит не указан и параметр merge.defaultToUpstream не установлен."
+
+#: builtin/merge.c:1425
+msgid "Squash commit into empty head not supported yet"
+msgstr "Уплотнение коммита в пустую ветку еще не поддерживается"
+
+#: builtin/merge.c:1427
+msgid "Non-fast-forward commit does not make sense into an empty head"
+msgstr "Коммит, не являющийся перемоткой вперед, нет смысла делать в пустую ветку."
+
+#: builtin/merge.c:1432
+#, c-format
+msgid "%s - not something we can merge"
+msgstr "%s не является тем, что можно слить"
+
+#: builtin/merge.c:1434
+msgid "Can merge only exactly one commit into empty head"
+msgstr "Можно только один коммит в пустую ветку."
+
+#: builtin/merge.c:1515
+msgid "refusing to merge unrelated histories"
+msgstr "отказ слияния несвязанных историй изменений"
+
+#: builtin/merge.c:1524
+msgid "Already up to date."
+msgstr "Уже обновлено."
+
+#: builtin/merge.c:1534
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr "Обновление %s..%s\n"
+
+#: builtin/merge.c:1580
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr "Попытка тривиального слияния в индексе…\n"
+
+#: builtin/merge.c:1587
+#, c-format
+msgid "Nope.\n"
+msgstr "Не вышло.\n"
+
+#: builtin/merge.c:1612
+msgid "Already up to date. Yeeah!"
+msgstr "Уже обновлено. Круто!"
+
+#: builtin/merge.c:1618
+msgid "Not possible to fast-forward, aborting."
+msgstr "Перемотка вперед невозможна, отмена."
+
+#: builtin/merge.c:1646 builtin/merge.c:1711
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr "Перемотка дерева к исходному состоянию…\n"
+
+#: builtin/merge.c:1650
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr "Попытка слияния с помощью стратегии %s…\n"
+
+#: builtin/merge.c:1702
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr "Ни одна стратегия слияния не обработала слияние.\n"
+
+#: builtin/merge.c:1704
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr "Сбой при слиянии с помощью стратегии %s.\n"
+
+#: builtin/merge.c:1713
+#, c-format
+msgid "Using the %s to prepare resolving by hand.\n"
+msgstr "Использую %s для подготовки ручного разрешения конфликтов.\n"
+
+#: builtin/merge.c:1727
+#, 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]"
@@ -14165,20 +16359,32 @@
msgstr "допустить создание более одного дерева"
#: builtin/multi-pack-index.c:9
-msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)"
+msgid ""
+"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
+"size=<size>)"
msgstr ""
-#: builtin/multi-pack-index.c:22
+#: builtin/multi-pack-index.c:26
msgid "object directory containing set of packfile and pack-index pairs"
msgstr ""
-#: builtin/multi-pack-index.c:40 builtin/prune-packed.c:67
+#: 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:50 builtin/prune-packed.c:25
msgid "too many arguments"
msgstr ""
-#: builtin/multi-pack-index.c:51
+#: builtin/multi-pack-index.c:60
+msgid "--batch-size option is only for 'repack' subcommand"
+msgstr ""
+
+#: builtin/multi-pack-index.c:69
#, c-format
-msgid "unrecognized verb: %s"
+msgid "unrecognized subcommand: %s"
msgstr ""
#: builtin/mv.c:18
@@ -14207,113 +16413,117 @@
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:516
+#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:484
#, c-format
msgid "renaming '%s' failed"
msgstr "сбой при переименовании «%s»"
-#: builtin/name-rev.c:355
+#: builtin/name-rev.c:465
msgid "git name-rev [<options>] <commit>..."
msgstr "git name-rev [<опции>] <коммит>…"
-#: builtin/name-rev.c:356
+#: builtin/name-rev.c:466
msgid "git name-rev [<options>] --all"
msgstr "git name-rev [<опции>] --all"
-#: builtin/name-rev.c:357
+#: builtin/name-rev.c:467
msgid "git name-rev [<options>] --stdin"
msgstr "git name-rev [<опции>] --stdin"
-#: builtin/name-rev.c:415
-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:416
+#: builtin/name-rev.c:525
msgid "only use tags to name the commits"
msgstr "использовать только метки для именования коммитов"
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:527
msgid "only use refs matching <pattern>"
-msgstr "использовать только ссылки, соответствующие <шаблону> "
+msgstr "использовать только ссылки, соответствующие <шаблону>"
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:529
msgid "ignore refs matching <pattern>"
msgstr "игнорировать ссылки, соответствующие <шаблону>"
-#: builtin/name-rev.c:422
+#: builtin/name-rev.c:531
msgid "list all commits reachable from all refs"
msgstr "вывести список всех коммитов, достижимых со всех ссылок"
-#: builtin/name-rev.c:423
+#: builtin/name-rev.c:532
msgid "read from stdin"
msgstr "прочитать из стандартного ввода"
-#: builtin/name-rev.c:424
+#: builtin/name-rev.c:533
msgid "allow to print `undefined` names (default)"
msgstr "разрешить вывод «undefined», если не найдено (по умолчанию)"
-#: builtin/name-rev.c:430
+#: builtin/name-rev.c:539
msgid "dereference tags in the input (internal use)"
msgstr "разыменовывать введенные метки (для внутреннего использования)"
@@ -14453,7 +16663,7 @@
msgid "the note contents have been left in %s"
msgstr "содержимое заметки осталось в %s"
-#: builtin/notes.c:242 builtin/tag.c:522
+#: builtin/notes.c:242 builtin/tag.c:533
#, c-format
msgid "could not open or read '%s'"
msgstr "не удалось открыть или прочитать «%s»"
@@ -14673,7 +16883,7 @@
"--abort'.\n"
msgstr "Не удалось автоматически слить заметки. Исправьте конфликты в %s и закоммитьте результат с помощью «git notes merge --commit», или прервите процесс слияния с помощью «git notes merge --abort».\n"
-#: builtin/notes.c:897 builtin/tag.c:535
+#: builtin/notes.c:897 builtin/tag.c:546
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Не удалось разрешить «%s» как ссылку."
@@ -14691,7 +16901,7 @@
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 "не удалять, только показать список"
@@ -14707,387 +16917,375 @@
msgid "use notes from <notes-ref>"
msgstr "использовать заметку из <ссылка-на-заметку>"
-#: builtin/notes.c:1034 builtin/stash.c:1611
+#: builtin/notes.c:1034 builtin/stash.c:1604
#, 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:424
+#: builtin/pack-objects.c:443
#, c-format
msgid "bad packed object CRC for %s"
msgstr ""
-#: builtin/pack-objects.c:435
+#: builtin/pack-objects.c:454
#, c-format
msgid "corrupt packed object for %s"
msgstr ""
-#: builtin/pack-objects.c:566
+#: builtin/pack-objects.c:585
#, c-format
msgid "recursive delta detected for object %s"
msgstr ""
-#: builtin/pack-objects.c:777
+#: builtin/pack-objects.c:796
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr ""
-#: builtin/pack-objects.c:790
-#, c-format
-msgid "packfile is invalid: %s"
-msgstr ""
-
-#: builtin/pack-objects.c:794
-#, c-format
-msgid "unable to open packfile for reuse: %s"
-msgstr ""
-
-#: builtin/pack-objects.c:798
-msgid "unable to seek in reused packfile"
-msgstr ""
-
-#: builtin/pack-objects.c:809
-msgid "unable to read from reused packfile"
-msgstr ""
-
-#: builtin/pack-objects.c:837
+#: builtin/pack-objects.c:1004
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr "отключение записи битовых карт, так как карты были разбиты на части из-за pack.packSizeLimit"
-#: builtin/pack-objects.c:850
+#: builtin/pack-objects.c:1017
msgid "Writing objects"
msgstr "Запись объектов"
-#: 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 "не удалось выполнить stat %s"
-#: builtin/pack-objects.c:965
+#: builtin/pack-objects.c:1131
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr ""
-#: builtin/pack-objects.c:1161
+#: builtin/pack-objects.c:1348
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "отключение записи битовых карт, так как некоторые объекты не были упакованы"
-#: builtin/pack-objects.c:1589
+#: builtin/pack-objects.c:1796
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr ""
-#: builtin/pack-objects.c:1598
+#: builtin/pack-objects.c:1805
#, c-format
msgid "delta base offset out of bound for %s"
msgstr ""
-#: builtin/pack-objects.c:1867
+#: builtin/pack-objects.c:2086
msgid "Counting objects"
msgstr "Подсчет объектов"
-#: builtin/pack-objects.c:1997
-#, c-format
-msgid "unable to get size of %s"
-msgstr "не удалось получить размер %s"
-
-#: builtin/pack-objects.c:2012
+#: builtin/pack-objects.c:2231
#, c-format
msgid "unable to parse object header of %s"
msgstr "не удалось разобрать заголовок объекта %s"
-#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2098
-#: builtin/pack-objects.c:2108
+#: 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:2085 builtin/pack-objects.c:2112
+#: 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:2122
+#: builtin/pack-objects.c:2341
msgid "suboptimal pack - out of memory"
msgstr ""
-#: builtin/pack-objects.c:2448
+#: builtin/pack-objects.c:2656
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "При сжатии изменений используется до %d потоков"
-#: builtin/pack-objects.c:2580
+#: builtin/pack-objects.c:2795
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr ""
-#: builtin/pack-objects.c:2667
+#: builtin/pack-objects.c:2883
msgid "Compressing objects"
msgstr "Сжатие объектов"
-#: builtin/pack-objects.c:2673
+#: builtin/pack-objects.c:2889
msgid "inconsistency with delta count"
msgstr ""
-#: builtin/pack-objects.c:2754
+#: 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:2760
+#: builtin/pack-objects.c:2999
#, c-format
msgid ""
"expected object ID, got garbage:\n"
" %s"
msgstr ""
-#: builtin/pack-objects.c:2858
+#: builtin/pack-objects.c:3097
msgid "invalid value for --missing"
msgstr "недопустимое значение для --missing"
-#: builtin/pack-objects.c:2917 builtin/pack-objects.c:3025
+#: builtin/pack-objects.c:3156 builtin/pack-objects.c:3264
msgid "cannot open pack index"
msgstr ""
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:3187
#, c-format
msgid "loose object at %s could not be examined"
msgstr ""
-#: builtin/pack-objects.c:3033
+#: builtin/pack-objects.c:3272
msgid "unable to force loose object"
msgstr ""
-#: builtin/pack-objects.c:3125
+#: builtin/pack-objects.c:3365
#, c-format
msgid "not a rev '%s'"
msgstr ""
-#: builtin/pack-objects.c:3128
+#: builtin/pack-objects.c:3368
#, c-format
msgid "bad revision '%s'"
msgstr ""
-#: builtin/pack-objects.c:3153
+#: builtin/pack-objects.c:3393
msgid "unable to add recent objects"
msgstr ""
-#: builtin/pack-objects.c:3206
+#: builtin/pack-objects.c:3446
#, c-format
msgid "unsupported index version %s"
msgstr "неподдерживаемая версия индекса %s"
-#: builtin/pack-objects.c:3210
+#: builtin/pack-objects.c:3450
#, c-format
msgid "bad index version '%s'"
msgstr "плохая версия индекса «%s»"
-#: builtin/pack-objects.c:3240
-msgid "do not show progress meter"
-msgstr "не выводить прогресс выполнения"
-
-#: builtin/pack-objects.c:3242
-msgid "show progress meter"
-msgstr "показать прогресс выполнения"
-
-#: builtin/pack-objects.c:3244
-msgid "show progress meter during object writing phase"
-msgstr "показать прогресс выполнения во время записи объектов"
-
-#: builtin/pack-objects.c:3247
-msgid "similar to --all-progress when progress meter is shown"
-msgstr "похоже на --all-progress при включенном прогрессе выполнения"
-
-#: builtin/pack-objects.c:3248
+#: builtin/pack-objects.c:3488
msgid "<version>[,<offset>]"
msgstr ""
-#: builtin/pack-objects.c:3249
+#: builtin/pack-objects.c:3489
msgid "write the pack index file in the specified idx format version"
msgstr "записать файл индекса пакета в указанной версии формата"
-#: builtin/pack-objects.c:3252
+#: builtin/pack-objects.c:3492
msgid "maximum size of each output pack file"
msgstr "максимальный размер каждого выходного файла пакета"
-#: builtin/pack-objects.c:3254
+#: builtin/pack-objects.c:3494
msgid "ignore borrowed objects from alternate object store"
msgstr "игнорировать чужие объекты, взятые из альтернативного хранилища объектов"
-#: builtin/pack-objects.c:3256
+#: builtin/pack-objects.c:3496
msgid "ignore packed objects"
msgstr "игнорировать упакованные объекты"
-#: builtin/pack-objects.c:3258
+#: builtin/pack-objects.c:3498
msgid "limit pack window by objects"
msgstr "ограничить окно пакета по количеству объектов"
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3500
msgid "limit pack window by memory in addition to object limit"
msgstr "дополнительно к количеству объектов ограничить окно пакета по памяти"
-#: builtin/pack-objects.c:3262
+#: builtin/pack-objects.c:3502
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "максимальная разрешенная длина цепочки дельт в результирующем пакете"
-#: builtin/pack-objects.c:3264
+#: builtin/pack-objects.c:3504
msgid "reuse existing deltas"
msgstr "использовать повторно существующие дельты"
-#: builtin/pack-objects.c:3266
+#: builtin/pack-objects.c:3506
msgid "reuse existing objects"
msgstr "использовать повторно существующие объекты"
-#: builtin/pack-objects.c:3268
+#: builtin/pack-objects.c:3508
msgid "use OFS_DELTA objects"
msgstr "использовать объекты OFS_DELTA"
-#: builtin/pack-objects.c:3270
+#: builtin/pack-objects.c:3510
msgid "use threads when searching for best delta matches"
msgstr "использовать многопоточность при поиске лучших совпадений дельт"
-#: builtin/pack-objects.c:3272
+#: builtin/pack-objects.c:3512
msgid "do not create an empty pack output"
msgstr "не создавать пустые выходные пакеты"
-#: builtin/pack-objects.c:3274
+#: builtin/pack-objects.c:3514
msgid "read revision arguments from standard input"
msgstr "прочитать аргументы редакций из стандартного ввода"
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3516
msgid "limit the objects to those that are not yet packed"
msgstr "ограничиться объектами, которые еще не упакованы"
-#: builtin/pack-objects.c:3279
+#: builtin/pack-objects.c:3519
msgid "include objects reachable from any reference"
msgstr "включить объекты, которые достижимы по любой из ссылок"
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3522
msgid "include objects referred by reflog entries"
msgstr "включить объекты, на которые ссылаются записи журнала ссылок"
-#: builtin/pack-objects.c:3285
+#: builtin/pack-objects.c:3525
msgid "include objects referred to by the index"
msgstr "включить объекты, на которые ссылается индекс"
-#: builtin/pack-objects.c:3288
+#: builtin/pack-objects.c:3528
msgid "output pack to stdout"
msgstr "вывести пакет на стандартный вывод"
-#: builtin/pack-objects.c:3290
+#: builtin/pack-objects.c:3530
msgid "include tag objects that refer to objects to be packed"
msgstr "включить объекты меток, которые ссылаются на упаковываемые объекты"
-#: builtin/pack-objects.c:3292
+#: builtin/pack-objects.c:3532
msgid "keep unreachable objects"
msgstr "сохранять ссылки на недоступные объекты"
-#: builtin/pack-objects.c:3294
+#: builtin/pack-objects.c:3534
msgid "pack loose unreachable objects"
msgstr "паковать недостижимые объекты"
-#: builtin/pack-objects.c:3296
+#: builtin/pack-objects.c:3536
msgid "unpack unreachable objects newer than <time>"
msgstr "распаковать недоступные объекты, которые новее, чем <время>"
-#: builtin/pack-objects.c:3299
+#: builtin/pack-objects.c:3539
msgid "use the sparse reachability algorithm"
msgstr ""
-#: builtin/pack-objects.c:3301
+#: builtin/pack-objects.c:3541
msgid "create thin packs"
msgstr "создавать тонкие пакеты"
-#: builtin/pack-objects.c:3303
+#: builtin/pack-objects.c:3543
msgid "create packs suitable for shallow fetches"
msgstr "создавать пакеты, подходящие для частичных извлечений"
-#: builtin/pack-objects.c:3305
+#: builtin/pack-objects.c:3545
msgid "ignore packs that have companion .keep file"
msgstr "игнорировать пакеты, рядом с которыми лежит .keep файл"
-#: builtin/pack-objects.c:3307
+#: builtin/pack-objects.c:3547
msgid "ignore this pack"
msgstr "игнорировать этот пакет"
-#: builtin/pack-objects.c:3309
+#: builtin/pack-objects.c:3549
msgid "pack compression level"
msgstr "уровень сжатия пакета"
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3551
msgid "do not hide commits by grafts"
msgstr "не скрывать коммиты сращениями"
-#: builtin/pack-objects.c:3313
+#: builtin/pack-objects.c:3553
msgid "use a bitmap index if available to speed up counting objects"
msgstr "по возможности использовать индекс в битовых картах, для ускорения подсчета объектов"
-#: builtin/pack-objects.c:3315
+#: builtin/pack-objects.c:3555
msgid "write a bitmap index together with the pack index"
msgstr "запись индекса в битовых картах вместе с индексом пакета"
-#: builtin/pack-objects.c:3318
+#: builtin/pack-objects.c:3559
+msgid "write a bitmap index if possible"
+msgstr ""
+
+#: builtin/pack-objects.c:3563
msgid "handling for missing objects"
msgstr "обработка отсутствующих объектов"
-#: builtin/pack-objects.c:3321
+#: builtin/pack-objects.c:3566
msgid "do not pack objects in promisor packfiles"
msgstr "не упаковывать объекты в promisor файлы пакетов"
-#: builtin/pack-objects.c:3323
+#: builtin/pack-objects.c:3568
msgid "respect islands during delta compression"
msgstr ""
-#: builtin/pack-objects.c:3348
+#: 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 "глубина цепочки изменений %d слишком большая, использую принудительно %d"
-#: builtin/pack-objects.c:3353
+#: builtin/pack-objects.c:3605
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "лисит pack.deltaCacheLimit слишком высокий, использую принудительно %d"
-#: builtin/pack-objects.c:3407
+#: builtin/pack-objects.c:3659
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
-#: builtin/pack-objects.c:3409
+#: builtin/pack-objects.c:3661
msgid "minimum pack size limit is 1 MiB"
msgstr ""
-#: builtin/pack-objects.c:3414
+#: builtin/pack-objects.c:3666
msgid "--thin cannot be used to build an indexable pack"
msgstr ""
-#: builtin/pack-objects.c:3417
+#: builtin/pack-objects.c:3669
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr ""
-#: builtin/pack-objects.c:3423
+#: builtin/pack-objects.c:3675
msgid "cannot use --filter without --stdout"
msgstr ""
-#: builtin/pack-objects.c:3484
+#: builtin/pack-objects.c:3735
msgid "Enumerating objects"
msgstr "Перечисление объектов"
-#: builtin/pack-objects.c:3514
+#: 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>]"
@@ -15101,98 +17299,110 @@
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 "удалить объекты старее чем <дата-окончания>"
-#: 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 "нельзя почистить неиспользуемые объекты в precious-objects репозитории"
-#: 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:140
+#: builtin/pull.c:123
msgid "control for recursive fetching of submodules"
msgstr "управление рекурсивным извлечением подмодулей"
-#: builtin/pull.c:144
+#: builtin/pull.c:127
msgid "Options related to merging"
msgstr "Опции, связанные со слиянием"
-#: builtin/pull.c:147
+#: builtin/pull.c:130
msgid "incorporate changes by rebasing rather than merging"
msgstr "забрать изменения с помощью перемещения, а не слияния"
-#: builtin/pull.c:175 builtin/rebase.c:447 builtin/revert.c:125
+#: builtin/pull.c:158 builtin/rebase.c:490 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "разрешить перемотку вперед"
-#: builtin/pull.c:184
-msgid "automatically stash/stash pop before and after rebase"
-msgstr "автоматически выполнять stash/stash pop до и после перемещения"
+#: builtin/pull.c:167 parse-options.h:339
+msgid "automatically stash/stash pop before and after"
+msgstr ""
-#: builtin/pull.c:200
+#: builtin/pull.c:183
msgid "Options related to fetching"
msgstr "Опции, связанные с извлечением изменений"
-#: builtin/pull.c:210
+#: builtin/pull.c:193
msgid "force overwrite of local branch"
msgstr "принудительная перезапись локальной ветки"
-#: builtin/pull.c:218
+#: builtin/pull.c:201
msgid "number of submodules pulled in parallel"
msgstr "количество подмодулей, которые будут получены парралельно"
-#: builtin/pull.c:313
+#: builtin/pull.c:317
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Неправильное значение для pull.ff: %s"
-#: builtin/pull.c:430
+#: 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:432
+#: builtin/pull.c:460
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr "Нет претендентов для слияния среди ссылок, которые вы только что получили."
-#: builtin/pull.c:433
+#: 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:436
+#: builtin/pull.c:464
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -15200,74 +17410,69 @@
"for your current branch, you must specify a branch on the command line."
msgstr "Вы попросили получить изменения со внешнего репозитория «%s», но не указали ветку. Так как это не репозиторий по умолчанию для вашей текущей ветки, вы должны указать ветку в командной строке."
-#: builtin/pull.c:441 builtin/rebase.c:1321 git-parse-remote.sh:73
+#: builtin/pull.c:469 builtin/rebase.c:1246
msgid "You are not currently on a branch."
msgstr "Вы сейчас ни на одной из веток."
-#: builtin/pull.c:443 builtin/pull.c:458 git-parse-remote.sh:79
+#: builtin/pull.c:471 builtin/pull.c:486
msgid "Please specify which branch you want to rebase against."
msgstr "Пожалуйста, укажите на какую ветку вы хотите переместить изменения."
-#: builtin/pull.c:445 builtin/pull.c:460 git-parse-remote.sh:82
+#: builtin/pull.c:473 builtin/pull.c:488
msgid "Please specify which branch you want to merge with."
msgstr "Пожалуйста, укажите с какой веткой вы хотите слить изменения."
-#: builtin/pull.c:446 builtin/pull.c:461
+#: builtin/pull.c:474 builtin/pull.c:489
msgid "See git-pull(1) for details."
msgstr "Для дополнительной информации, смотрите git-pull(1)."
-#: builtin/pull.c:448 builtin/pull.c:454 builtin/pull.c:463
-#: builtin/rebase.c:1327 git-parse-remote.sh:64
+#: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491
+#: builtin/rebase.c:1252
msgid "<remote>"
msgstr "<внешний-репозиторий>"
-#: builtin/pull.c:448 builtin/pull.c:463 builtin/pull.c:468
-#: git-parse-remote.sh:65
+#: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496
msgid "<branch>"
msgstr "<ветка>"
-#: builtin/pull.c:456 builtin/rebase.c:1319 git-parse-remote.sh:75
+#: builtin/pull.c:484 builtin/rebase.c:1244
msgid "There is no tracking information for the current branch."
msgstr "У текущей ветки нет информации об отслеживании."
-#: builtin/pull.c:465 git-parse-remote.sh:95
+#: builtin/pull.c:493
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr "Если вы хотите указать информацию о отслеживаемой ветке, выполните:"
-#: builtin/pull.c:470
+#: 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 "Ваша конфигурация указывает, что нужно слить изменения со ссылкой\n«%s» из внешнего репозитория, но такая ссылка не была получена."
-#: builtin/pull.c:574
+#: builtin/pull.c:609
#, c-format
msgid "unable to access commit %s"
msgstr ""
-#: builtin/pull.c:854
+#: builtin/pull.c:915
msgid "ignoring --verify-signatures for rebase"
msgstr "игнорирование --verify-signatures при перемещении"
-#: builtin/pull.c:909
-msgid "--[no-]autostash option is only valid with --rebase."
-msgstr "--[no-]autostash можно использовать только вместе с --rebase."
-
-#: builtin/pull.c:917
+#: builtin/pull.c:972
msgid "Updating an unborn branch with changes added to the index."
msgstr "Обновление еще не начавшейся ветки с изменениями, добавленными в индекс."
-#: builtin/pull.c:921
+#: builtin/pull.c:976
msgid "pull with rebase"
msgstr "получение с перемещением"
-#: builtin/pull.c:922
+#: builtin/pull.c:977
msgid "please commit or stash them."
msgstr "сделайте коммит или спрячьте их."
-#: builtin/pull.c:947
+#: builtin/pull.c:1002
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -15275,7 +17480,7 @@
"commit %s."
msgstr "извлечение обновило указатель на вашу текущую ветку.\nперемотка вашего рабочего каталога\nс коммита %s."
-#: builtin/pull.c:953
+#: builtin/pull.c:1008
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -15286,15 +17491,15 @@
"to recover."
msgstr "Не удалось перемотать вперёд изменения в вашем рабочем каталоге.\nПосле того, как вы убедитесь, что вы сохранили всё необходимое из вывода\n$ git diff %s\n, запустите\n$ git reset --hard\nдля восстановления исходного состояния."
-#: builtin/pull.c:968
+#: builtin/pull.c:1023
msgid "Cannot merge multiple branches into empty head."
msgstr "Нельзя слить несколько веток в пустой указатель на ветку."
-#: builtin/pull.c:972
+#: builtin/pull.c:1027
msgid "Cannot rebase onto multiple branches."
msgstr "Невозможно переместить над несколькими ветками."
-#: builtin/pull.c:979
+#: builtin/pull.c:1041
msgid "cannot rebase with locally recorded submodule modifications"
msgstr "невозможно выполнить перемещение с записанными локальными изменениями в подмодулях"
@@ -15306,17 +17511,17 @@
msgid "tag shorthand without <tag>"
msgstr "указано сокращение tag, но не указана сама <метка>"
-#: 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'."
msgstr "\nЧтобы выбрать любую из опций на постоянной основе, смотрите 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"
@@ -15331,7 +17536,7 @@
"%s"
msgstr ""
-#: builtin/push.c:185
+#: builtin/push.c:182
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -15341,7 +17546,7 @@
" git push %s HEAD:<name-of-remote-branch>\n"
msgstr "Вы сейчас не находитесь ни на одной из веток.\nЧтобы отправить историю, ведущую к текущему (отделённый HEAD) состоянию, используйте\n\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"
@@ -15350,13 +17555,13 @@
" git push --set-upstream %s %s\n"
msgstr "Текущая ветка %s не имеет вышестоящей ветки.\nЧтобы отправить текущую ветку и установить внешнюю ветку как вышестоящую для этой ветки, используйте\n\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"
@@ -15364,11 +17569,11 @@
"to update which remote branch."
msgstr "Вы сейчас отправляете изменения на внешний репозиторий «%s», который не является вышестоящим для вашей текущей ветки «%s», без указания того, что отправлять и в какую внешнюю ветку."
-#: 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"
@@ -15376,7 +17581,7 @@
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr "Обновления были отклонены, так как верхушка вашей текущей ветки\nпозади ее внешней части. Заберите и слейте внешние изменения \n(например, с помощью «git pull …») перед повторной попыткой отправки\nизменений.\nДля дополнительной информации, смотрите «Note about fast-forwards»\nв «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"
@@ -15384,7 +17589,7 @@
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr "Обновления были отклонены, так как верхушка отправляемой ветки\nпозади ее внешней части. Переключитесь на ветку и заберите внешние\nизменения (например, с помощью «git pull …») перед повторной\nпопыткой отправки изменений.\nДля дополнительной информации, смотрите «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"
@@ -15393,86 +17598,81 @@
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr "Обновления были отклонены, так как внешний репозиторий содержит\nизменения, которых у вас нет в вашем локальном репозитории.\nОбычно, это связанно с тем, что кто-то уже отправил изменения в \nто же место. Перед повторной отправкой ваших изменений, вам нужно\nзабрать и слить изменения из внешнего репозитория себе\n(например, с помощью «git pull …»).\nДля дополнительной информации, смотрите «Note about fast-forwards»\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 "Обновления были отклонены, так как метка уже существует во внешнем репозитории."
-#: 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 "Вы не можете обновить внешнюю ссылку, которая указывает на объект, не являющийся коммитом или обновить внешнюю ссылку так, чтобы она указывала на объект, не являющийся коммитом, без указания опции «--force».\n"
-#: builtin/push.c:359
+#: builtin/push.c:294
+msgid ""
+"Updates were rejected because the tip of the remote-tracking\n"
+"branch has been updated since the last checkout. You may want\n"
+"to integrate those changes locally (e.g., 'git pull ...')\n"
+"before forcing an update.\n"
+msgstr ""
+
+#: builtin/push.c:364
#, c-format
msgid "Pushing to %s\n"
msgstr "Отправка в %s\n"
-#: builtin/push.c:364
+#: builtin/push.c:371
#, 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:553
msgid "repository"
msgstr "репозиторий"
-#: builtin/push.c:555 builtin/send-pack.c:164
+#: builtin/push.c:554 builtin/send-pack.c:189
msgid "push all refs"
msgstr "отправить все ссылки"
-#: builtin/push.c:556 builtin/send-pack.c:166
+#: builtin/push.c:555 builtin/send-pack.c:191
msgid "mirror all refs"
msgstr "сделать зеркало всех ссылок"
-#: builtin/push.c:558
+#: builtin/push.c:557
msgid "delete refs"
msgstr "удалить ссылки"
-#: builtin/push.c:559
+#: builtin/push.c:558
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:561 builtin/send-pack.c:192
msgid "force updates"
msgstr "принудительное обновление"
-#: builtin/push.c:564 builtin/send-pack.c:181
+#: builtin/push.c:562 builtin/send-pack.c:204
msgid "<refname>:<expect>"
msgstr ""
-#: builtin/push.c:565 builtin/send-pack.c:182
+#: builtin/push.c:563 builtin/send-pack.c:205
msgid "require old value of ref to be at this value"
msgstr "требовать, чтобы старое значение ссылки было ожидаемым"
-#: builtin/push.c:568
+#: builtin/push.c:566 builtin/send-pack.c:208
+msgid "require remote updates to be integrated locally"
+msgstr ""
+
+#: builtin/push.c:569
msgid "control recursive pushing of submodules"
msgstr "управление рекурсивной отправкой подмодулей"
-#: builtin/push.c:570 builtin/send-pack.c:175
+#: builtin/push.c:570 builtin/send-pack.c:199
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:571 builtin/push.c:572 builtin/send-pack.c:186
+#: builtin/send-pack.c:187
msgid "receive pack program"
msgstr "путь к программе упаковки на сервере"
@@ -15492,43 +17692,60 @@
msgid "push missing but relevant tags"
msgstr "отправить пропущенные, но нужные метки"
-#: builtin/push.c:582 builtin/send-pack.c:169
+#: builtin/push.c:581 builtin/send-pack.c:193
msgid "GPG sign the push"
msgstr "подписать отправку с помощью GPG"
-#: builtin/push.c:584 builtin/send-pack.c:176
+#: builtin/push.c:583 builtin/send-pack.c:200
msgid "request atomic transaction on remote side"
msgstr "запросить выполнение атомарной транзакции на внешней стороне"
-#: builtin/push.c:602
+#: builtin/push.c:601
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete несовместимо с --all, --mirror и --tags"
-#: builtin/push.c:604
+#: builtin/push.c:603
msgid "--delete doesn't make sense without any refs"
msgstr "--delete не имеет смысла без указания ссылок"
-#: builtin/push.c:607
+#: builtin/push.c:623
+#, c-format
+msgid "bad repository '%s'"
+msgstr "плохой репозитория «%s»"
+
+#: builtin/push.c:624
+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:639
msgid "--all and --tags are incompatible"
msgstr "--all и --tags нельзя использовать одновременно"
-#: builtin/push.c:609
+#: builtin/push.c:641
msgid "--all can't be combined with refspecs"
msgstr "--all нельзя использовать вместе со спецификаторами ссылок"
-#: builtin/push.c:613
+#: builtin/push.c:645
msgid "--mirror and --tags are incompatible"
msgstr "--mirror и --tags нельзя использовать одновременно"
-#: builtin/push.c:615
+#: builtin/push.c:647
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror нельзя использовать вместе со спецификаторами ссылок"
-#: builtin/push.c:618
+#: builtin/push.c:650
msgid "--all and --mirror are incompatible"
msgstr "--all и --mirror нельзя использовать одновременно"
-#: builtin/push.c:637
+#: builtin/push.c:657
msgid "push options must not have new line characters"
msgstr "опции для отправки не должны содержать символы перевода строк"
@@ -15544,24 +17761,32 @@
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 ""
@@ -15640,232 +17865,213 @@
msgid "suppress feedback messages"
msgstr ""
-#: builtin/rebase.c:32
-msgid ""
-"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
-"[<branch>]"
+#: builtin/read-tree.c:188
+msgid "You need to resolve your current index first"
msgstr ""
-#: builtin/rebase.c:34
+#: 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: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:193 builtin/rebase.c:217 builtin/rebase.c:244
#, 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 ""
-
-#: builtin/rebase.c:252
-msgid "no HEAD?"
-msgstr ""
-
-#: builtin/rebase.c:279
+#: builtin/rebase.c:310
#, c-format
msgid "could not create temporary %s"
msgstr ""
-#: builtin/rebase.c:285
+#: builtin/rebase.c:316
msgid "could not mark as interactive"
msgstr ""
-#: builtin/rebase.c:343
+#: builtin/rebase.c:369
msgid "could not generate todo list"
msgstr ""
-#: builtin/rebase.c:382
+#: builtin/rebase.c:411
msgid "a base commit must be provided with --upstream or --onto"
msgstr ""
-#: builtin/rebase.c:437
+#: builtin/rebase.c:480
msgid "git rebase--interactive [<options>]"
msgstr ""
-#: builtin/rebase.c:449
-msgid "keep empty commits"
-msgstr "оставить пустые коммиты"
+#: builtin/rebase.c:493 builtin/rebase.c:1388
+msgid "keep commits which start empty"
+msgstr ""
-#: builtin/rebase.c:451 builtin/revert.c:127
+#: builtin/rebase.c:497 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr "разрешить коммиты с пустыми сообщениями"
-#: builtin/rebase.c:452
+#: builtin/rebase.c:499
msgid "rebase merge commits"
msgstr ""
-#: builtin/rebase.c:454
+#: builtin/rebase.c:501
msgid "keep original branch points of cousins"
msgstr ""
-#: builtin/rebase.c:456
+#: builtin/rebase.c:503
msgid "move commits that begin with squash!/fixup!"
msgstr ""
-#: builtin/rebase.c:457
+#: builtin/rebase.c:504
msgid "sign commits"
msgstr ""
-#: builtin/rebase.c:459 builtin/rebase.c:1397
+#: builtin/rebase.c:506 builtin/rebase.c:1327
msgid "display a diffstat of what changed upstream"
msgstr ""
-#: builtin/rebase.c:461
+#: builtin/rebase.c:508
msgid "continue rebase"
msgstr "продолжить перемещение"
-#: builtin/rebase.c:463
+#: builtin/rebase.c:510
msgid "skip commit"
msgstr ""
-#: builtin/rebase.c:464
+#: builtin/rebase.c:511
msgid "edit the todo list"
msgstr ""
-#: builtin/rebase.c:466
+#: builtin/rebase.c:513
msgid "show the current patch"
msgstr ""
-#: builtin/rebase.c:469
+#: builtin/rebase.c:516
msgid "shorten commit ids in the todo list"
msgstr "вывести короткие идентификаторы коммитов в списке действий"
-#: builtin/rebase.c:471
+#: builtin/rebase.c:518
msgid "expand commit ids in the todo list"
msgstr "вывести полные идентификаторы коммитов в списке действий"
-#: builtin/rebase.c:473
+#: builtin/rebase.c:520
msgid "check the todo list"
msgstr "проверить список дел"
-#: builtin/rebase.c:475
+#: builtin/rebase.c:522
msgid "rearrange fixup/squash lines"
msgstr "переставить строки fixup/squash"
-#: builtin/rebase.c:477
+#: builtin/rebase.c:524
msgid "insert exec commands in todo list"
msgstr "вставить команды исполнения коммитов в списке действий"
-#: builtin/rebase.c:478
+#: builtin/rebase.c:525
msgid "onto"
msgstr ""
-#: builtin/rebase.c:481
+#: builtin/rebase.c:528
msgid "restrict-revision"
msgstr ""
-#: builtin/rebase.c:481
+#: builtin/rebase.c:528
msgid "restrict revision"
msgstr ""
-#: builtin/rebase.c:483
+#: builtin/rebase.c:530
msgid "squash-onto"
msgstr ""
-#: builtin/rebase.c:484
+#: builtin/rebase.c:531
msgid "squash onto"
msgstr ""
-#: builtin/rebase.c:486
+#: builtin/rebase.c:533
msgid "the upstream commit"
msgstr ""
-#: builtin/rebase.c:488
+#: builtin/rebase.c:535
msgid "head-name"
msgstr ""
-#: builtin/rebase.c:488
+#: builtin/rebase.c:535
msgid "head name"
msgstr ""
-#: builtin/rebase.c:493
+#: builtin/rebase.c:540
msgid "rebase strategy"
msgstr ""
-#: builtin/rebase.c:494
+#: builtin/rebase.c:541
msgid "strategy-opts"
msgstr ""
-#: builtin/rebase.c:495
+#: builtin/rebase.c:542
msgid "strategy options"
msgstr ""
-#: builtin/rebase.c:496
+#: builtin/rebase.c:543
msgid "switch-to"
msgstr ""
-#: builtin/rebase.c:497
+#: builtin/rebase.c:544
msgid "the branch or commit to checkout"
msgstr ""
-#: builtin/rebase.c:498
+#: builtin/rebase.c:545
msgid "onto-name"
msgstr ""
-#: builtin/rebase.c:498
+#: builtin/rebase.c:545
msgid "onto name"
msgstr ""
-#: builtin/rebase.c:499
+#: builtin/rebase.c:546
msgid "cmd"
msgstr ""
-#: builtin/rebase.c:499
+#: builtin/rebase.c:546
msgid "the command to run"
msgstr ""
-#: builtin/rebase.c:502 builtin/rebase.c:1480
+#: builtin/rebase.c:549 builtin/rebase.c:1421
msgid "automatically re-schedule any `exec` that fails"
msgstr ""
-#: builtin/rebase.c:518
+#: builtin/rebase.c:565
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr "--[no-]rebase-cousins не имеет смысла без указания --rebase-merges"
-#: builtin/rebase.c:534 builtin/rebase.c:1787
+#: builtin/rebase.c:581
#, c-format
-msgid "%s requires an interactive rebase"
+msgid "%s requires the merge backend"
msgstr ""
-#: builtin/rebase.c:586
+#: builtin/rebase.c:624
#, c-format
msgid "could not get 'onto': '%s'"
msgstr ""
-#: builtin/rebase.c:601
+#: builtin/rebase.c:641
#, c-format
msgid "invalid orig-head: '%s'"
msgstr ""
-#: builtin/rebase.c:626
+#: builtin/rebase.c:666
#, 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:817
-msgid "could not determine HEAD revision"
-msgstr ""
-
-#: builtin/rebase.c:940
+#: builtin/rebase.c:811 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"
@@ -15873,7 +18079,7 @@
"To abort and get back to the state before \"git rebase\", run \"git rebase --abort\"."
msgstr "Разрешите все конфликты вручную, пометьте их разрешёнными с помощью «git add/rm <конфликтующие-файлы>», а затем запустите «git rebase --continue».\nЕсли вы хотите пропустить этот коммит, то запустите «git rebase --skip».\nЧтобы вернуться на состояние до «git rebase», запустите «git rebase --abort»."
-#: builtin/rebase.c:1021
+#: builtin/rebase.c:894
#, c-format
msgid ""
"\n"
@@ -15885,7 +18091,12 @@
"As a result, git cannot rebase them."
msgstr ""
-#: builtin/rebase.c:1313
+#: builtin/rebase.c:1220
+#, c-format
+msgid "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask\"."
+msgstr ""
+
+#: builtin/rebase.c:1238
#, c-format
msgid ""
"%s\n"
@@ -15896,7 +18107,7 @@
"\n"
msgstr ""
-#: builtin/rebase.c:1329
+#: builtin/rebase.c:1254
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -15905,174 +18116,201 @@
"\n"
msgstr ""
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1284
msgid "exec commands cannot contain newlines"
msgstr ""
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1288
msgid "empty exec command"
msgstr ""
-#: builtin/rebase.c:1390
+#: builtin/rebase.c:1318
msgid "rebase onto given branch instead of upstream"
msgstr ""
-#: builtin/rebase.c:1392
+#: builtin/rebase.c:1320
+msgid "use the merge-base of upstream and branch as the current base"
+msgstr ""
+
+#: builtin/rebase.c:1322
msgid "allow pre-rebase hook to run"
msgstr ""
-#: builtin/rebase.c:1394
+#: builtin/rebase.c:1324
msgid "be quiet. implies --no-stat"
msgstr ""
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1330
msgid "do not show diffstat of what changed upstream"
msgstr ""
-#: builtin/rebase.c:1403
-msgid "add a Signed-off-by: line to each commit"
+#: builtin/rebase.c:1333
+msgid "add a Signed-off-by trailer to each commit"
msgstr ""
-#: builtin/rebase.c:1405 builtin/rebase.c:1409 builtin/rebase.c:1411
-msgid "passed to 'git am'"
+#: builtin/rebase.c:1336
+msgid "make committer date match author date"
msgstr ""
-#: builtin/rebase.c:1413 builtin/rebase.c:1415
+#: builtin/rebase.c:1338
+msgid "ignore author date and use current date"
+msgstr ""
+
+#: builtin/rebase.c:1340
+msgid "synonym of --reset-author-date"
+msgstr ""
+
+#: builtin/rebase.c:1342 builtin/rebase.c:1346
msgid "passed to 'git apply'"
msgstr ""
-#: builtin/rebase.c:1417 builtin/rebase.c:1420
+#: builtin/rebase.c:1344
+msgid "ignore changes in whitespace"
+msgstr ""
+
+#: builtin/rebase.c:1348 builtin/rebase.c:1351
msgid "cherry-pick all commits, even if unchanged"
msgstr ""
-#: builtin/rebase.c:1422
+#: builtin/rebase.c:1353
msgid "continue"
msgstr ""
-#: builtin/rebase.c:1425
+#: builtin/rebase.c:1356
msgid "skip current patch and continue"
msgstr ""
-#: builtin/rebase.c:1427
+#: builtin/rebase.c:1358
msgid "abort and check out the original branch"
msgstr ""
-#: builtin/rebase.c:1430
+#: builtin/rebase.c:1361
msgid "abort but keep HEAD where it is"
msgstr ""
-#: builtin/rebase.c:1431
+#: builtin/rebase.c:1362
msgid "edit the todo list during an interactive rebase"
msgstr ""
-#: builtin/rebase.c:1434
+#: builtin/rebase.c:1365
msgid "show the patch file being applied or merged"
msgstr ""
-#: builtin/rebase.c:1437
+#: builtin/rebase.c:1368
+msgid "use apply strategies to rebase"
+msgstr ""
+
+#: builtin/rebase.c:1372
msgid "use merging strategies to rebase"
msgstr ""
-#: builtin/rebase.c:1441
+#: builtin/rebase.c:1376
msgid "let the user edit the list of commits to rebase"
msgstr ""
-#: builtin/rebase.c:1445
+#: builtin/rebase.c:1380
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr ""
-#: builtin/rebase.c:1449
-msgid "preserve empty commits during rebase"
+#: builtin/rebase.c:1385
+msgid "how to handle commits that become empty"
msgstr ""
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1392
msgid "move commits that begin with squash!/fixup! under -i"
msgstr ""
-#: builtin/rebase.c:1457
-msgid "automatically stash/stash pop before and after"
-msgstr ""
-
-#: builtin/rebase.c:1459
+#: builtin/rebase.c:1399
msgid "add exec lines after each commit of the editable list"
msgstr ""
-#: builtin/rebase.c:1463
+#: builtin/rebase.c:1403
msgid "allow rebasing commits with empty messages"
msgstr ""
-#: builtin/rebase.c:1466
+#: builtin/rebase.c:1407
msgid "try to rebase merges instead of skipping them"
msgstr ""
-#: builtin/rebase.c:1469
+#: builtin/rebase.c:1410
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr ""
-#: builtin/rebase.c:1471
+#: builtin/rebase.c:1412
msgid "use the given merge strategy"
msgstr ""
-#: builtin/rebase.c:1473 builtin/revert.c:114
+#: builtin/rebase.c:1414 builtin/revert.c:115
msgid "option"
msgstr "опция"
-#: builtin/rebase.c:1474
+#: builtin/rebase.c:1415
msgid "pass the argument through to the merge strategy"
msgstr ""
-#: builtin/rebase.c:1477
+#: builtin/rebase.c:1418
msgid "rebase all reachable commits up to the root(s)"
msgstr ""
-#: builtin/rebase.c:1498
+#: builtin/rebase.c:1423
+msgid "apply all changes, even those already present upstream"
+msgstr ""
+
+#: builtin/rebase.c:1440
msgid ""
"the rebase.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
msgstr ""
-#: builtin/rebase.c:1504
+#: builtin/rebase.c:1446
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "Похоже, что выполняется «git am». Невозможно выполнить перемещение."
-#: builtin/rebase.c:1545
+#: builtin/rebase.c:1487
msgid ""
"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr ""
-#: builtin/rebase.c:1549
+#: builtin/rebase.c:1492
+msgid "cannot combine '--keep-base' with '--onto'"
+msgstr ""
+
+#: builtin/rebase.c:1494
+msgid "cannot combine '--keep-base' with '--root'"
+msgstr ""
+
+#: builtin/rebase.c:1498
+msgid "cannot combine '--root' with '--fork-point'"
+msgstr ""
+
+#: builtin/rebase.c:1501
msgid "No rebase in progress?"
msgstr "Нет перемещения в процессе?"
-#: builtin/rebase.c:1553
+#: builtin/rebase.c:1505
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "Действие --edit-todo может использоваться только при интерактивном перемещении."
-#: builtin/rebase.c:1576
+#: builtin/rebase.c:1528 t/helper/test-fast-rebase.c:123
msgid "Cannot read HEAD"
msgstr "Не удалось прочитать HEAD"
-#: builtin/rebase.c:1588
+#: builtin/rebase.c:1540
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
msgstr "Вы должны отредактировать все\nконфликты слияния, а потом пометить\nих как разрешенные с помощью git add"
-#: builtin/rebase.c:1607
+#: builtin/rebase.c:1559
msgid "could not discard worktree changes"
msgstr ""
-#: builtin/rebase.c:1626
+#: builtin/rebase.c:1578
#, c-format
msgid "could not move back to %s"
msgstr ""
-#: builtin/rebase.c:1637 builtin/rm.c:369
-#, c-format
-msgid "could not remove '%s'"
-msgstr "не удалось удалить «%s»"
-
-#: builtin/rebase.c:1663
+#: builtin/rebase.c:1624
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -16085,167 +18323,140 @@
"valuable there.\n"
msgstr ""
-#: builtin/rebase.c:1684
+#: builtin/rebase.c:1652
msgid "switch `C' expects a numerical value"
msgstr ""
-#: builtin/rebase.c:1725
+#: builtin/rebase.c:1694
#, c-format
msgid "Unknown mode: %s"
msgstr ""
-#: builtin/rebase.c:1747
+#: builtin/rebase.c:1733
msgid "--strategy requires --merge or --interactive"
msgstr ""
-#: builtin/rebase.c:1796
-msgid "cannot combine am options with either interactive or merge options"
+#: builtin/rebase.c:1763
+msgid "cannot combine apply options with merge options"
msgstr ""
-#: builtin/rebase.c:1815
+#: builtin/rebase.c:1776
+#, c-format
+msgid "Unknown rebase backend: %s"
+msgstr ""
+
+#: builtin/rebase.c:1806
+msgid "--reschedule-failed-exec requires --exec or --interactive"
+msgstr ""
+
+#: builtin/rebase.c:1826
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr ""
-#: builtin/rebase.c:1819
+#: builtin/rebase.c:1830
msgid ""
"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
-#: builtin/rebase.c:1825
-msgid "cannot combine '--rebase-merges' with '--strategy-option'"
-msgstr ""
-
-#: builtin/rebase.c:1828
-msgid "cannot combine '--rebase-merges' with '--strategy'"
-msgstr ""
-
-#: builtin/rebase.c:1852
+#: builtin/rebase.c:1854
#, c-format
msgid "invalid upstream '%s'"
msgstr ""
-#: builtin/rebase.c:1858
+#: builtin/rebase.c:1860
msgid "Could not create new root commit"
msgstr ""
-#: builtin/rebase.c:1876
+#: builtin/rebase.c:1886
+#, c-format
+msgid "'%s': need exactly one merge base with branch"
+msgstr ""
+
+#: builtin/rebase.c:1889
#, c-format
msgid "'%s': need exactly one merge base"
msgstr ""
-#: builtin/rebase.c:1883
+#: builtin/rebase.c:1897
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr ""
-#: builtin/rebase.c:1908
+#: builtin/rebase.c:1923
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr ""
-#: builtin/rebase.c:1916 builtin/submodule--helper.c:38
-#: builtin/submodule--helper.c:1933
+#: builtin/rebase.c:1931 builtin/submodule--helper.c:40
+#: builtin/submodule--helper.c:2414
#, c-format
msgid "No such ref: %s"
msgstr "Нет такой ссылки: %s"
-#: builtin/rebase.c:1927
+#: builtin/rebase.c:1942
msgid "Could not resolve HEAD to a revision"
msgstr ""
-#: builtin/rebase.c:1968
-msgid "Cannot autostash"
-msgstr "Не удалось автоматически спрятать изменения"
-
-#: builtin/rebase.c:1971
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr ""
-
-#: builtin/rebase.c:1977
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr ""
-
-#: builtin/rebase.c:1980
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr ""
-
-#: builtin/rebase.c:1983
-msgid "could not reset --hard"
-msgstr ""
-
-#: builtin/rebase.c:1984 builtin/reset.c:114
-#, c-format
-msgid "HEAD is now at %s"
-msgstr "HEAD сейчас на %s"
-
-#: builtin/rebase.c:2000
+#: builtin/rebase.c:1963
msgid "Please commit or stash them."
msgstr "Сделайте коммит или спрячьте их."
-#: builtin/rebase.c:2027
-#, c-format
-msgid "could not parse '%s'"
-msgstr ""
-
-#: builtin/rebase.c:2040
+#: builtin/rebase.c:1999
#, c-format
msgid "could not switch to %s"
msgstr ""
-#: builtin/rebase.c:2051
+#: builtin/rebase.c:2010
msgid "HEAD is up to date."
msgstr "HEAD уже в актуальном состоянии."
-#: builtin/rebase.c:2053
+#: builtin/rebase.c:2012
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr ""
-#: builtin/rebase.c:2061
+#: builtin/rebase.c:2020
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD уже в актуальном состоянии, принудительное перемещение."
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:2022
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr ""
-#: builtin/rebase.c:2071
+#: builtin/rebase.c:2030
msgid "The pre-rebase hook refused to rebase."
msgstr "Перехватчик pre-rebase отказал в перемещении."
-#: builtin/rebase.c:2078
+#: builtin/rebase.c:2037
#, c-format
msgid "Changes to %s:\n"
msgstr ""
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:2040
#, c-format
msgid "Changes from %s to %s:\n"
msgstr ""
-#: builtin/rebase.c:2106
+#: builtin/rebase.c:2065
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
-#: builtin/rebase.c:2115
+#: builtin/rebase.c:2074
msgid "Could not detach HEAD"
msgstr ""
-#: builtin/rebase.c:2124
+#: builtin/rebase.c:2083
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr ""
-#: builtin/receive-pack.c:33
+#: builtin/receive-pack.c:34
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <каталог-git>"
-#: builtin/receive-pack.c:833
+#: builtin/receive-pack.c:1276
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"
@@ -16262,7 +18473,7 @@
"'receive.denyCurrentBranch' configuration variable to 'refuse'."
msgstr "По умолчанию, обновлять текущую ветку в репозитории с рабочей\nкопией (не голом) запрещено, так как это сделает состояние индекса\nи рабочего каталога противоречивым, и вам прийдется выполнить\n«git reset --hard», чтобы состояние рабочего каталога снова\nсоответствовало HEAD.\n\nВы можете установить значение опции «receive.denyCurrentBranch»\nв «ignore» или «warn» во внешнем репозитории, чтобы разрешить\nотправку в его текущую ветку; но это не рекомендуется, если только\nвы не намерены обновить его рабочий каталог способом подобным\nвышеописанному.\n\nЧтобы пропустить это сообщение и все равно оставить поведение\nпо умолчанию, установите значение опции «receive.denyCurrentBranch»\nв «refuse»."
-#: builtin/receive-pack.c:853
+#: builtin/receive-pack.c:1296
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"
@@ -16274,11 +18485,11 @@
"To squelch this message, you can set it to 'refuse'."
msgstr "По умолчанию, удаление текущей ветки запрещено, так как последующий\n«git clone» не сможет получить никаких файлов, что приведет к путанице.\n\nВы можете установить значение опции «receive.denyDeleteCurrent»\nв «warn» или «ignore», во внешнем репозитории, чтобы разрешить\nудаление текущей ветки с или без предупреждающего сообщения.\n\nЧтобы пропустить это сообщение, вы можете установить значение опции\nв «refuse»."
-#: builtin/receive-pack.c:1940
+#: builtin/receive-pack.c:2481
msgid "quiet"
msgstr "тихий режим"
-#: builtin/receive-pack.c:1954
+#: builtin/receive-pack.c:2495
msgid "You must specify a directory."
msgstr "Вы должны указать каталог."
@@ -16299,210 +18510,218 @@
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 "«%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 ""
-#: 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 "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>"
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] <имя> <новый-url> [<старый-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 <имя> <новый-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 <имя> <url>"
-#: builtin/remote.c:33
+#: builtin/remote.c:34
msgid "git remote add [<options>] <name> <url>"
msgstr "git remote add [<опции>] <имя> <url>"
-#: 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"
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:700
#, c-format
msgid "remote %s already exists."
msgstr "внешний репозиторий %s уже существует"
-#: builtin/remote.c:198 builtin/remote.c:640
-#, c-format
-msgid "'%s' is not a valid remote name"
-msgstr "«%s» не является допустимым именем внешнего репозитория."
-
-#: builtin/remote.c:238
+#: builtin/remote.c:240
#, c-format
msgid "Could not setup master '%s'"
msgstr "Не удалось настроить мастер ветку «%s»"
-#: builtin/remote.c:344
+#: builtin/remote.c:355
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "Не удалось извлечь карту для спецификатора ссылки %s"
-#: builtin/remote.c:443 builtin/remote.c:451
+#: builtin/remote.c:454 builtin/remote.c:462
msgid "(matching)"
msgstr "(соответствующая)"
-#: builtin/remote.c:455
+#: builtin/remote.c:466
msgid "(delete)"
msgstr "(удаленная)"
-#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
+#: builtin/remote.c:655
+#, c-format
+msgid "could not set '%s'"
+msgstr ""
+
+#: builtin/remote.c:660
+#, 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:691 builtin/remote.c:836 builtin/remote.c:946
#, c-format
msgid "No such remote: '%s'"
msgstr ""
-#: builtin/remote.c:646
+#: builtin/remote.c:710
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Не удалось переименовать секцию конфигурации с «%s» на «%s»"
-#: builtin/remote.c:666
+#: builtin/remote.c:730
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -16510,17 +18729,17 @@
"\tPlease update the configuration manually if necessary."
msgstr "Не обновляю нестандартную спецификатор ссылки для извлечения\n\t%s\n\tПожалуйста, если требуется, обновите конфигурацию вручную."
-#: builtin/remote.c:702
+#: builtin/remote.c:770
#, c-format
msgid "deleting '%s' failed"
msgstr "не удалось удалить «%s»"
-#: builtin/remote.c:736
+#: builtin/remote.c:804
#, c-format
msgid "creating '%s' failed"
msgstr "не удалось создать «%s»"
-#: builtin/remote.c:802
+#: builtin/remote.c:882
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -16532,148 +18751,148 @@
msgstr[2] "Примечание: Некоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, используйте:"
msgstr[3] "Примечание: Некоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, используйте:"
-#: builtin/remote.c:816
+#: builtin/remote.c:896
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Не удалось удалить секцию файла конфигурации «%s»"
-#: builtin/remote.c:917
+#: builtin/remote.c:999
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " новая (следующее извлечение сохранит ее в remotes/%s)"
-#: builtin/remote.c:920
+#: builtin/remote.c:1002
msgid " tracked"
msgstr " отслеживается"
-#: builtin/remote.c:922
+#: builtin/remote.c:1004
msgid " stale (use 'git remote prune' to remove)"
msgstr " недействительна (используйте «git remote prune», чтобы удалить)"
-#: builtin/remote.c:924
+#: builtin/remote.c:1006
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:965
+#: builtin/remote.c:1047
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "неправильный параметр конфигурации branch.%s.merge; невозможно переместить более чем над 1 веткой"
-#: builtin/remote.c:974
+#: builtin/remote.c:1056
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "перемещается интерактивно над внешней веткой %s"
-#: builtin/remote.c:976
+#: builtin/remote.c:1058
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr ""
-#: builtin/remote.c:979
+#: builtin/remote.c:1061
#, c-format
msgid "rebases onto remote %s"
msgstr "перемещается над внешней веткой %s"
-#: builtin/remote.c:983
+#: builtin/remote.c:1065
#, c-format
msgid " merges with remote %s"
msgstr " будет слита с внешней веткой %s"
-#: builtin/remote.c:986
+#: builtin/remote.c:1068
#, c-format
msgid "merges with remote %s"
msgstr "будет слита с внешней веткой %s"
-#: builtin/remote.c:989
+#: builtin/remote.c:1071
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s и с внешней веткой %s\n"
-#: builtin/remote.c:1032
+#: builtin/remote.c:1114
msgid "create"
msgstr "создана"
-#: builtin/remote.c:1035
+#: builtin/remote.c:1117
msgid "delete"
msgstr "удалена"
-#: builtin/remote.c:1039
+#: builtin/remote.c:1121
msgid "up to date"
msgstr "уже актуальна"
-#: builtin/remote.c:1042
+#: builtin/remote.c:1124
msgid "fast-forwardable"
msgstr "возможна перемотка вперед"
-#: builtin/remote.c:1045
+#: builtin/remote.c:1127
msgid "local out of date"
msgstr "локальная ветка устарела"
-#: builtin/remote.c:1052
+#: builtin/remote.c:1134
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s будет принудительно отправлена в %-*s (%s)"
-#: builtin/remote.c:1055
+#: builtin/remote.c:1137
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s будет отправлена в %-*s (%s)"
-#: builtin/remote.c:1059
+#: builtin/remote.c:1141
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s будет принудительно отправлена в %s"
-#: builtin/remote.c:1062
+#: builtin/remote.c:1144
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s будет отправлена в %s"
-#: builtin/remote.c:1130
+#: builtin/remote.c:1212
msgid "do not query remotes"
msgstr "не опрашивать внешние репозитории"
-#: builtin/remote.c:1157
+#: builtin/remote.c:1239
#, c-format
msgid "* remote %s"
msgstr "* внешний репозиторий %s"
-#: builtin/remote.c:1158
+#: builtin/remote.c:1240
#, c-format
msgid " Fetch URL: %s"
msgstr " URL для извлечения: %s"
-#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
+#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
msgid "(no URL)"
msgstr "(нет URL)"
#. TRANSLATORS: the colon ':' should align
#. with the one in " Fetch URL: %s"
#. translation.
-#: builtin/remote.c:1173 builtin/remote.c:1175
+#: builtin/remote.c:1255 builtin/remote.c:1257
#, c-format
msgid " Push URL: %s"
msgstr " URL для отправки: %s"
-#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
+#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD ветка: %s"
-#: builtin/remote.c:1177
+#: builtin/remote.c:1259
msgid "(not queried)"
msgstr "(не запрашивался)"
-#: builtin/remote.c:1179
+#: builtin/remote.c:1261
msgid "(unknown)"
msgstr "(неизвестно)"
-#: builtin/remote.c:1183
+#: builtin/remote.c:1265
#, 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:1277
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
@@ -16682,11 +18901,11 @@
msgstr[2] " Внешние ветки:%s"
msgstr[3] " Внешние ветки:%s"
-#: builtin/remote.c:1198 builtin/remote.c:1224
+#: builtin/remote.c:1280 builtin/remote.c:1306
msgid " (status not queried)"
msgstr " (статус не запрашивался)"
-#: builtin/remote.c:1207
+#: builtin/remote.c:1289
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Локальная ветка, настроенная для «git pull»:"
@@ -16694,11 +18913,11 @@
msgstr[2] " Локальные ветки, настроенные для «git pull»:"
msgstr[3] " Локальные ветки, настроенные для «git pull»:"
-#: builtin/remote.c:1215
+#: builtin/remote.c:1297
msgid " Local refs will be mirrored by 'git push'"
msgstr " Локальные ссылки, зеркалируемые с помощью «git push»"
-#: builtin/remote.c:1221
+#: builtin/remote.c:1303
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
@@ -16707,266 +18926,250 @@
msgstr[2] " Локальные ссылки, настроенные для «git push»%s:"
msgstr[3] " Локальные ссылки, настроенные для «git push»%s:"
-#: builtin/remote.c:1242
+#: builtin/remote.c:1324
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "установить refs/remotes/<имя>/HEAD в зависимости от внешнего репозитория"
-#: builtin/remote.c:1244
+#: builtin/remote.c:1326
msgid "delete refs/remotes/<name>/HEAD"
msgstr "удалить refs/remotes/<имя>/HEAD"
-#: builtin/remote.c:1259
+#: builtin/remote.c:1341
msgid "Cannot determine remote HEAD"
msgstr "Не удалось определить внешний HEAD"
-#: builtin/remote.c:1261
+#: builtin/remote.c:1343
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "Несколько внешних HEAD веток. Укажите явно одну из них:"
-#: builtin/remote.c:1271
+#: builtin/remote.c:1353
#, c-format
msgid "Could not delete %s"
msgstr "Не удалось удалить %s"
-#: builtin/remote.c:1279
+#: builtin/remote.c:1361
#, c-format
msgid "Not a valid ref: %s"
msgstr "Недопустимая ссылка: %s"
-#: builtin/remote.c:1281
+#: builtin/remote.c:1363
#, c-format
msgid "Could not setup %s"
msgstr "Не удалось настроить %s"
-#: builtin/remote.c:1299
+#: builtin/remote.c:1381
#, c-format
msgid " %s will become dangling!"
msgstr " %s будет висящей веткой!"
-#: builtin/remote.c:1300
+#: builtin/remote.c:1382
#, c-format
msgid " %s has become dangling!"
msgstr " %s стала висящей веткой!"
-#: builtin/remote.c:1310
+#: builtin/remote.c:1392
#, c-format
msgid "Pruning %s"
msgstr "Очистка %s"
-#: builtin/remote.c:1311
+#: builtin/remote.c:1393
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1327
+#: builtin/remote.c:1409
#, c-format
msgid " * [would prune] %s"
msgstr " * [будет удалена] %s"
-#: builtin/remote.c:1330
+#: builtin/remote.c:1412
#, c-format
msgid " * [pruned] %s"
msgstr " * [удалена] %s"
-#: builtin/remote.c:1375
+#: builtin/remote.c:1457
msgid "prune remotes after fetching"
msgstr "почистить внешние репозитории после извлечения"
-#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
+#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
#, c-format
msgid "No such remote '%s'"
msgstr "Нет такого внешнего репозитория «%s»"
-#: builtin/remote.c:1454
+#: builtin/remote.c:1539
msgid "add branch"
msgstr "добавить ветку"
-#: builtin/remote.c:1461
+#: builtin/remote.c:1546
msgid "no remote specified"
msgstr "не указан внешний репозиторий"
-#: builtin/remote.c:1478
+#: builtin/remote.c:1563
msgid "query push URLs rather than fetch URLs"
msgstr "запросить URL отправки, вместо URL извлечения"
-#: builtin/remote.c:1480
+#: builtin/remote.c:1565
msgid "return all URLs"
msgstr "вернуть все URL"
-#: builtin/remote.c:1508
+#: builtin/remote.c:1595
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "URL не настроены для внешнего репозитория «%s»"
-#: builtin/remote.c:1534
+#: builtin/remote.c:1621
msgid "manipulate push URLs"
msgstr "управление URL отправки"
-#: builtin/remote.c:1536
+#: builtin/remote.c:1623
msgid "add URL"
msgstr "добавить URL"
-#: builtin/remote.c:1538
+#: builtin/remote.c:1625
msgid "delete URLs"
msgstr "удалить URL"
-#: builtin/remote.c:1545
+#: builtin/remote.c:1632
msgid "--add --delete doesn't make sense"
msgstr "--add нельзя использовать одновременно с --delete"
-#: builtin/remote.c:1584
+#: builtin/remote.c:1673
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Неправильный шаблон старого URL: %s"
-#: builtin/remote.c:1592
+#: builtin/remote.c:1681
#, c-format
msgid "No such URL found: %s"
msgstr "Не найдены совпадения URL: %s"
-#: builtin/remote.c:1594
+#: builtin/remote.c:1683
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."
msgstr "Инкрементальные перепаковки не совместимы с индексами в битовых картах. Используйте опцию --no-write-bitmap-index или отключите параметр конфигурации pack.writebitmaps."
-#: builtin/repack.c:200
+#: builtin/repack.c:197
msgid "could not start pack-objects to repack promisor objects"
msgstr ""
-#: builtin/repack.c:239 builtin/repack.c:414
+#: builtin/repack.c:268 builtin/repack.c:447
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
-#: builtin/repack.c:256
+#: builtin/repack.c:295
msgid "could not finish pack-objects to repack promisor objects"
msgstr ""
-#: builtin/repack.c:294
+#: builtin/repack.c:323
msgid "pack everything in a single pack"
msgstr "упаковать всё в один пакет"
-#: builtin/repack.c:296
+#: builtin/repack.c:325
msgid "same as -a, and turn unreachable objects loose"
msgstr "тоже, что и -a, но дополнительно отбросить недостижимые объекты"
-#: builtin/repack.c:299
+#: builtin/repack.c:328
msgid "remove redundant packs, and run git-prune-packed"
msgstr "удалите лишние пакеты и запустите git-prune-packed"
-#: builtin/repack.c:301
+#: builtin/repack.c:330
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "передать опцию --no-reuse-delta в git-pack-objects"
-#: builtin/repack.c:303
+#: builtin/repack.c:332
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "передать опцию --no-reuse-object в git-pack-objects"
-#: builtin/repack.c:305
+#: builtin/repack.c:334
msgid "do not run git-update-server-info"
msgstr "не запускать git-update-server-info"
-#: builtin/repack.c:308
+#: builtin/repack.c:337
msgid "pass --local to git-pack-objects"
msgstr "передать опцию --local в git-pack-objects"
-#: builtin/repack.c:310
+#: builtin/repack.c:339
msgid "write bitmap index"
msgstr "запись индекса в битовых картах"
-#: builtin/repack.c:312
+#: builtin/repack.c:341
msgid "pass --delta-islands to git-pack-objects"
msgstr ""
-#: builtin/repack.c:313
+#: builtin/repack.c:342
msgid "approxidate"
msgstr "примерная-дата"
-#: builtin/repack.c:314
+#: builtin/repack.c:343
msgid "with -A, do not loosen objects older than this"
msgstr "с опцией -A, не отбрасывать объекты старее, чем указано"
-#: builtin/repack.c:316
+#: builtin/repack.c:345
msgid "with -a, repack unreachable objects"
msgstr "с параметром -a, перепаковать недоступные объекты"
-#: builtin/repack.c:318
+#: builtin/repack.c:347
msgid "size of the window used for delta compression"
msgstr "размер окна, используемый для компрессии дельт"
-#: builtin/repack.c:319 builtin/repack.c:325
+#: builtin/repack.c:348 builtin/repack.c:354
msgid "bytes"
msgstr "количество-байт"
-#: builtin/repack.c:320
+#: builtin/repack.c:349
msgid "same as the above, but limit memory size instead of entries count"
msgstr "тоже, что и выше, но ограничить размер памяти, а не количество записей"
-#: builtin/repack.c:322
+#: builtin/repack.c:351
msgid "limits the maximum delta depth"
msgstr "ограничение на максимальную глубину дельт"
-#: builtin/repack.c:324
+#: builtin/repack.c:353
msgid "limits the maximum number of threads"
msgstr "ограничение на максимальное количество потоков"
-#: builtin/repack.c:326
+#: builtin/repack.c:355
msgid "maximum size of each packfile"
msgstr "максимальный размер каждого из файлов пакета"
-#: builtin/repack.c:328
+#: builtin/repack.c:357
msgid "repack objects in packs marked with .keep"
msgstr "переупаковать объекты в пакеты, помеченные файлом .keep"
-#: builtin/repack.c:330
+#: builtin/repack.c:359
msgid "do not repack this pack"
msgstr ""
-#: builtin/repack.c:340
+#: builtin/repack.c:369
msgid "cannot delete packs in a precious-objects repo"
msgstr "нельзя удалять пакеты в precious-objects репозитории"
-#: builtin/repack.c:344
+#: builtin/repack.c:373
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable и -A нельзя использовать одновременно"
-#: builtin/repack.c:423
+#: builtin/repack.c:456
msgid "Nothing new to pack."
msgstr ""
-#: builtin/repack.c:484
+#: 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"
+msgid "missing required file: %s"
msgstr ""
-#: builtin/repack.c:532
+#: builtin/repack.c:488
#, c-format
-msgid "failed to remove '%s'"
-msgstr "сбой удаления «%s»"
+msgid "could not unlink: %s"
+msgstr ""
#: builtin/replace.c:22
msgid "git replace [-f] <object> <replacement>"
@@ -17066,8 +19269,8 @@
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 ""
@@ -17086,124 +19289,124 @@
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 "плохая метка слияния в коммите «%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 ""
-#: 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 ""
-#: 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 "не делать структурированный вывод содержимого для --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 ""
-#: 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 ""
@@ -17230,113 +19433,123 @@
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 ""
#: 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 ""
-#: 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 "У вас нет верного 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:594
+#: builtin/stash.c:618
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 -- <пути>» instead."
-#: 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"
-#: 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"
@@ -17345,53 +19558,48 @@
"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 "Не удалось сбросить файл индекса на редакцию «%s»."
-#: builtin/reset.c:412
+#: builtin/reset.c:439
msgid "Could not write new index file."
msgstr "Не удалось записать новый файл индекса."
-#: builtin/rev-list.c:405
+#: builtin/rev-list.c:499
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr ""
-#: builtin/rev-list.c:466
+#: builtin/rev-list.c:560
msgid "object filtering requires --objects"
msgstr "фильтрация объектов требует указания параметра --objects"
-#: builtin/rev-list.c:469
-#, c-format
-msgid "invalid sparse value '%s'"
-msgstr "недопустимое частичное значение «%s»"
-
-#: builtin/rev-list.c:510
+#: builtin/rev-list.c:610
msgid "rev-list does not support display of notes"
msgstr "rev-list не поддерживает отображение заметок"
-#: builtin/rev-list.c:513
-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 ""
-#: 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"
@@ -17438,47 +19646,51 @@
msgid "cancel revert or cherry-pick sequence"
msgstr "отмена последовательности копирования или обращения изменений коммитов"
-#: builtin/revert.c:106
+#: builtin/revert.c:105
+msgid "skip current commit and continue"
+msgstr ""
+
+#: builtin/revert.c:107
msgid "don't automatically commit"
msgstr "не коммитить автоматически"
-#: builtin/revert.c:107
+#: builtin/revert.c:108
msgid "edit the commit message"
msgstr "изменить сообщение коммита"
-#: builtin/revert.c:110
+#: builtin/revert.c:111
msgid "parent-number"
msgstr "номер-родителя"
-#: builtin/revert.c:111
+#: builtin/revert.c:112
msgid "select mainline parent"
msgstr "выбор основного родителя"
-#: builtin/revert.c:113
+#: builtin/revert.c:114
msgid "merge strategy"
msgstr "стратегия слияния"
-#: builtin/revert.c:115
+#: builtin/revert.c:116
msgid "option for merge strategy"
msgstr "опция для стратегии слияния"
-#: builtin/revert.c:124
+#: builtin/revert.c:125
msgid "append commit name"
msgstr "добавить имя коммита"
-#: builtin/revert.c:126
+#: builtin/revert.c:127
msgid "preserve initially empty commits"
msgstr "сохранить изначально пустые коммиты"
-#: builtin/revert.c:128
+#: builtin/revert.c:129
msgid "keep redundant, empty commits"
msgstr "оставить избыточные, пустые коммиты"
-#: builtin/revert.c:227
+#: builtin/revert.c:239
msgid "revert failed"
msgstr "сбой обращения изменений коммита"
-#: builtin/revert.c:240
+#: builtin/revert.c:252
msgid "cherry-pick failed"
msgstr "сбой при копировании коммита"
@@ -17526,36 +19738,40 @@
msgstr[2] "следующие файлы содержат локальные изменения:"
msgstr[3] "следующие файлы содержат локальные изменения:"
-#: 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 "не удаляю рекурсивно «%s» без указания опции -r"
-#: builtin/rm.c:346
+#: builtin/rm.c:362
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: не удалось удалить %s"
@@ -17566,55 +19782,76 @@
" --all and explicit <ref> specification are mutually exclusive."
msgstr "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [--atomic] [<сервер>:]<каталог> [<ссылка>…]\n --all и явный спецификатор <ссылки> взаимно исключающие."
-#: builtin/send-pack.c:163
+#: builtin/send-pack.c:188
msgid "remote name"
msgstr "имя внешнего репозитория"
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:201
msgid "use stateless RPC protocol"
msgstr "протокол без сохранения состояния для RPC"
-#: builtin/send-pack.c:178
+#: builtin/send-pack.c:202
msgid "read refs from stdin"
msgstr "прочитать ссылки из стандартного ввода"
-#: builtin/send-pack.c:179
+#: builtin/send-pack.c:203
msgid "print status from remote helper"
msgstr "вывести статус от скрипта внешнего сервера"
-#: builtin/shortlog.c:14
+#: builtin/shortlog.c:16
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git shortlog [<опции>] [<диапазон-редакций>] [[--] <путь>…]"
-#: builtin/shortlog.c:15
+#: builtin/shortlog.c:17
msgid "git log --pretty=short | git shortlog [<options>]"
msgstr "git log --pretty=short | git shortlog [<опции>]"
-#: builtin/shortlog.c:264
+#: builtin/shortlog.c:135
+msgid "using multiple --group options with stdin is not supported"
+msgstr ""
+
+#: builtin/shortlog.c:145
+msgid "using --group=trailer with stdin is not supported"
+msgstr ""
+
+#: builtin/shortlog.c:335
+#, c-format
+msgid "unknown group type: %s"
+msgstr ""
+
+#: builtin/shortlog.c:363
msgid "Group by committer rather than author"
msgstr "Группировать по коммитеру, а не по автору"
-#: builtin/shortlog.c:266
+#: builtin/shortlog.c:366
msgid "sort output according to the number of commits per author"
msgstr "отсортировать вывод по количеству коммитов у автора"
-#: builtin/shortlog.c:268
+#: builtin/shortlog.c:368
msgid "Suppress commit descriptions, only provides commit count"
msgstr "Не выводить описания коммитов, а только их количество"
-#: builtin/shortlog.c:270
+#: builtin/shortlog.c:370
msgid "Show the email address of each author"
msgstr "Показать почту каждого из авторов"
-#: builtin/shortlog.c:271
+#: builtin/shortlog.c:371
msgid "<w>[,<i1>[,<i2>]]"
msgstr "<w>[,<i1>[,<i2>]]"
-#: builtin/shortlog.c:272
+#: builtin/shortlog.c:372
msgid "Linewrap output"
msgstr "Перенос строк на выводе"
-#: builtin/shortlog.c:301
+#: builtin/shortlog.c:374
+msgid "field"
+msgstr ""
+
+#: builtin/shortlog.c:375
+msgid "Group by field"
+msgstr ""
+
+#: builtin/shortlog.c:403
msgid "too many arguments given outside repository"
msgstr ""
@@ -17639,90 +19876,90 @@
msgstr[2] "игнорирование %s; невозможно обработать больше %d ссылок"
msgstr[3] "игнорирование %s; невозможно обработать больше %d ссылки"
-#: builtin/show-branch.c:549
+#: builtin/show-branch.c:548
#, c-format
msgid "no matching refs with %s"
msgstr "нет совпадающих записей с %s"
-#: builtin/show-branch.c:646
+#: builtin/show-branch.c:645
msgid "show remote-tracking and local branches"
msgstr "показать список и отслеживаемых внешних и локальных веток"
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:647
msgid "show remote-tracking branches"
msgstr "показать список отслеживаемых внешних веток"
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:649
msgid "color '*!+-' corresponding to the branch"
msgstr "окрашивать «*!+-» в соответствии с веткой"
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:651
msgid "show <n> more commits after the common ancestor"
msgstr "показать <n> коммитов после общего предка"
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
msgid "synonym to more=-1"
msgstr "синоним для more=-1"
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:654
msgid "suppress naming strings"
msgstr "не выводить именованные строки"
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:656
msgid "include the current branch"
msgstr "включить в вывод текущую ветку"
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:658
msgid "name commits with their object names"
msgstr "именовать коммиты их именами объектов"
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:660
msgid "show possible merge bases"
msgstr "вывести возможные базы слияния"
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:662
msgid "show refs unreachable from any other ref"
msgstr "вывести ссылки, недоступные из любых других ссылок"
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:664
msgid "show commits in topological order"
msgstr "вывести коммиты в топологическом порядке"
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:667
msgid "show only commits not on the first branch"
msgstr "вывести только коммиты, отсутствующие в первой ветке"
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:669
msgid "show merges reachable from only one tip"
msgstr "вывести слияния, достижимые только из одной из верхушек"
-#: builtin/show-branch.c:672
+#: builtin/show-branch.c:671
msgid "topologically sort, maintaining date order where possible"
msgstr "топологическая сортировка, с сохранением порядка дат, если возможно"
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
msgid "<n>[,<base>]"
msgstr "<n>[,<база>]"
-#: builtin/show-branch.c:676
+#: builtin/show-branch.c:675
msgid "show <n> most recent ref-log entries starting at base"
msgstr "показать <n> последних записей в журнале ссылок, начиная с базы"
-#: builtin/show-branch.c:712
+#: 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:736
+#: builtin/show-branch.c:735
msgid "no branches given, and HEAD is not valid"
msgstr "не указаны ветки и HEAD не действительный"
-#: builtin/show-branch.c:739
+#: builtin/show-branch.c:738
msgid "--reflog option needs one branch name"
msgstr "параметр --reflog требует указания имени одной ветки"
-#: builtin/show-branch.c:742
+#: 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."
@@ -17731,12 +19968,12 @@
msgstr[2] "только %d записей могут быть показаны одновременно."
msgstr[3] "только %d записи могут быть показаны одновременно."
-#: builtin/show-branch.c:746
+#: builtin/show-branch.c:745
#, c-format
msgid "no such ref %s"
msgstr "нет такой ссылки %s"
-#: builtin/show-branch.c:832
+#: builtin/show-branch.c:831
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
@@ -17745,16 +19982,24 @@
msgstr[2] "невозможно обработать больше %d редакций."
msgstr[3] "невозможно обработать больше %d редакции."
-#: builtin/show-branch.c:836
+#: builtin/show-branch.c:835
#, c-format
msgid "'%s' is not a valid ref."
msgstr "«%s» не является допустимой ссылкой на коммит."
-#: builtin/show-branch.c:839
+#: 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 | "
@@ -17787,7 +20032,7 @@
#: builtin/show-ref.c:173
msgid "only show SHA1 hash using <n> digits"
-msgstr "использовать <n> символов для вывода SHA-1 хеш-суммы"
+msgstr "использовать <n> символов для вывода хэш-кода SHA-1"
#: builtin/show-ref.c:177
msgid "do not print results to stdout (useful with --verify)"
@@ -17797,15 +20042,86 @@
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 "не удалось открыть «%s»"
+
+#: 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 "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] [<спрятанные-изменения>]"
@@ -17813,209 +20129,217 @@
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 ""
+
+#: 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] [<спрятанные-изменения>]"
+
+#: builtin/stash.c:58
+msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash apply [--index] [-q|--quiet] [<спрятанные-изменения>]"
+
+#: 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:31 builtin/stash.c:84
-msgid ""
-"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
-" [-u|--include-untracked] [-a|--all] [<message>]"
-msgstr "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n [-u|--include-untracked] [-a|--all] [<сообщение>]"
-
-#: builtin/stash.c:52
-msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
-msgstr "git stash pop [--index] [-q|--quiet] [<спрятанные-изменения>]"
-
-#: builtin/stash.c:57
-msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
-msgstr "git stash apply [--index] [-q|--quiet] [<спрятанные-изменения>]"
-
-#: builtin/stash.c:72
-msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
-msgstr "git stash store [-m|--message <сообщение>] [-q|--quiet] <коммит>"
-
-#: builtin/stash.c:127
+#: 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 очистка с параметрами не реализована"
-#: 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
-msgid "conflicts in index.Try without --index."
-msgstr "конфликты в индексе. Попробуйте без --index."
+#: 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 "Слияние %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:620
msgid "attempt to recreate the index"
msgstr "попытка пересоздания индекса"
-#: builtin/stash.c:549
+#: builtin/stash.c:566
#, c-format
msgid "Dropped %s (%s)"
msgstr "Отброшено %s (%s)"
-#: builtin/stash.c:552
+#: builtin/stash.c:569
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s: Не удалось отбросить запись из спрятанных изменений"
-#: builtin/stash.c:577
+#: builtin/stash.c:582
#, c-format
msgid "'%s' is not a stash reference"
msgstr "«%s» не является ссылкой на спрятанные изменения"
-#: builtin/stash.c:627 git-legacy-stash.sh:694
+#: builtin/stash.c:632
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:655
msgid "No branch name specified"
msgstr "Не указано имя ветки"
-#: builtin/stash.c:789 builtin/stash.c:826
+#: builtin/stash.c:799 builtin/stash.c:836
#, c-format
msgid "Cannot update %s with %s"
msgstr "Не удолось обновить %s с %s"
-#: builtin/stash.c:807 builtin/stash.c:1474 builtin/stash.c:1510
+#: builtin/stash.c:817 builtin/stash.c:1471 builtin/stash.c:1536
msgid "stash message"
msgstr "описание спрятанных изменений"
-#: builtin/stash.c:817
+#: builtin/stash.c:827
msgid "\"git stash store\" requires one <commit> argument"
msgstr "«git stash store» требует указания одного аргумента <коммит>"
-#: builtin/stash.c:1039 git-legacy-stash.sh:217
+#: builtin/stash.c:1042
msgid "No changes selected"
msgstr "Изменения не выбраны"
-#: builtin/stash.c:1135 git-legacy-stash.sh:150
+#: builtin/stash.c:1142
msgid "You do not have the initial commit yet"
msgstr "У вас еще нет начального коммита"
-#: builtin/stash.c:1162 git-legacy-stash.sh:165
+#: builtin/stash.c:1169
msgid "Cannot save the current index state"
msgstr "Не удалось сохранить текущее состояние индекса"
-#: builtin/stash.c:1171 git-legacy-stash.sh:180
+#: builtin/stash.c:1178
msgid "Cannot save the untracked files"
msgstr "Невозможно сохранить неотслеживаемые файлы"
-#: builtin/stash.c:1182 builtin/stash.c:1191 git-legacy-stash.sh:200
-#: git-legacy-stash.sh:213
+#: builtin/stash.c:1189 builtin/stash.c:1198
msgid "Cannot save the current worktree state"
msgstr "Не удалось сохранить текущее состояние рабочего каталога"
-#: builtin/stash.c:1219 git-legacy-stash.sh:233
+#: builtin/stash.c:1226
msgid "Cannot record working tree state"
msgstr "Не удалось записать состояние рабочего каталога"
-#: builtin/stash.c:1268 git-legacy-stash.sh:337
+#: builtin/stash.c:1275
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "Нельзя использовать --patch и --include-untracked или --all одновременно"
-#: builtin/stash.c:1284
+#: builtin/stash.c:1291
msgid "Did you forget to 'git add'?"
msgstr "Возможно, вы забыли выполнить «git add»?"
-#: builtin/stash.c:1299 git-legacy-stash.sh:345
+#: builtin/stash.c:1306
msgid "No local changes to save"
msgstr "Нет локальных изменений для сохранения"
-#: builtin/stash.c:1306 git-legacy-stash.sh:350
+#: builtin/stash.c:1313
msgid "Cannot initialize stash"
msgstr "Не удалось инициализировать спрятанные изменения"
-#: builtin/stash.c:1321 git-legacy-stash.sh:354
+#: builtin/stash.c:1328
msgid "Cannot save the current status"
msgstr "Не удалось сохранить текущий статус"
-#: builtin/stash.c:1326
+#: builtin/stash.c:1333
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Рабочий каталог и состояние индекса сохранены %s"
-#: builtin/stash.c:1430 git-legacy-stash.sh:384
+#: builtin/stash.c:1423
msgid "Cannot remove worktree changes"
msgstr "Не удалось удалить изменения рабочего каталога"
-#: builtin/stash.c:1465 builtin/stash.c:1501
+#: builtin/stash.c:1462 builtin/stash.c:1527
msgid "keep index"
msgstr ""
-#: builtin/stash.c:1467 builtin/stash.c:1503
+#: builtin/stash.c:1464 builtin/stash.c:1529
msgid "stash in patch mode"
msgstr ""
-#: builtin/stash.c:1468 builtin/stash.c:1504
+#: builtin/stash.c:1465 builtin/stash.c:1530
msgid "quiet mode"
msgstr ""
-#: builtin/stash.c:1470 builtin/stash.c:1506
+#: builtin/stash.c:1467 builtin/stash.c:1532
msgid "include untracked files in stash"
msgstr ""
-#: builtin/stash.c:1472 builtin/stash.c:1508
+#: builtin/stash.c:1469 builtin/stash.c:1534
msgid "include ignore files"
msgstr ""
-#: builtin/stash.c:1568
-#, c-format
-msgid "could not exec %s"
+#: builtin/stash.c:1569
+msgid ""
+"the stash.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
msgstr ""
#: builtin/stripspace.c:18
@@ -18034,393 +20358,502 @@
msgid "prepend comment character and space to each line"
msgstr "добавить перед каждой строкой символ комметария и пробел"
-#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1942
+#: 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 ""
-#: 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:1367
+#: 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:627
-#: builtin/submodule--helper.c:650
+#: 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 для подмодуля по пути «%s» не найден в .gitmodules"
-#: 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:546
+#: 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:562
+#: builtin/submodule--helper.c:565
msgid "Suppress output of entering each submodule command"
msgstr ""
-#: builtin/submodule--helper.c:564 builtin/submodule--helper.c:1049
+#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1487
msgid "Recurse into nested submodules"
msgstr ""
-#: builtin/submodule--helper.c:569
+#: builtin/submodule--helper.c:572
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
msgstr ""
-#: builtin/submodule--helper.c:596
+#: 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:664
+#: builtin/submodule--helper.c:666
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Сбой регистрации адреса для пути подмодуля «%s»"
-#: builtin/submodule--helper.c:668
+#: 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:678
+#: builtin/submodule--helper.c:680
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "внимание: предполагаемый режим обновления для подмодуля «%s»\n"
-#: builtin/submodule--helper.c:685
+#: builtin/submodule--helper.c:687
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "Сбой регистрации режима обновления для пути подмодуля «%s»"
-#: builtin/submodule--helper.c:707
+#: builtin/submodule--helper.c:709
msgid "Suppress output for initializing a submodule"
msgstr "Не выводить информацию о инициализации подмодуля"
-#: builtin/submodule--helper.c:712
+#: builtin/submodule--helper.c:714
msgid "git submodule--helper init [<options>] [<path>]"
msgstr ""
-#: builtin/submodule--helper.c:784 builtin/submodule--helper.c:910
+#: 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:823
+#: builtin/submodule--helper.c:835
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "не удалось найти HEAD ссылку внутри подмодуля «%s»"
-#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1019
+#: 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:874 builtin/submodule--helper.c:1185
+#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623
msgid "Suppress submodule status output"
msgstr "Не выводить статус подмодуля"
-#: builtin/submodule--helper.c:875
+#: 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:876
+#: builtin/submodule--helper.c:888
msgid "recurse into nested submodules"
msgstr "проходить вглубь вложенных подмодулей"
-#: builtin/submodule--helper.c:881
+#: builtin/submodule--helper.c:893
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<путь>…]"
-#: builtin/submodule--helper.c:905
+#: builtin/submodule--helper.c:917
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <путь>"
-#: builtin/submodule--helper.c:969
+#: 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:975
+#: builtin/submodule--helper.c:1413
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:989
+#: builtin/submodule--helper.c:1427
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1000
+#: builtin/submodule--helper.c:1438
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1047
+#: builtin/submodule--helper.c:1485
msgid "Suppress output of synchronizing submodule url"
msgstr ""
-#: builtin/submodule--helper.c:1054
+#: builtin/submodule--helper.c:1492
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<путь>]"
-#: builtin/submodule--helper.c:1108
+#: 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:1120
+#: 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:1128
+#: builtin/submodule--helper.c:1566
#, c-format
msgid "Cleared directory '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1130
+#: builtin/submodule--helper.c:1568
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1141
+#: builtin/submodule--helper.c:1579
#, c-format
msgid "could not create empty submodule directory %s"
msgstr ""
-#: builtin/submodule--helper.c:1157
+#: builtin/submodule--helper.c:1595
#, c-format
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:1186
+#: builtin/submodule--helper.c:1624
msgid "Remove submodule working trees even if they contain local changes"
msgstr ""
-#: builtin/submodule--helper.c:1187
+#: builtin/submodule--helper.c:1625
msgid "Unregister all submodules"
msgstr ""
-#: builtin/submodule--helper.c:1192
+#: 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:1206
+#: builtin/submodule--helper.c:1644
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "Используйте «--all», если вы действительно хотите деинициализировать все подмодули"
-#: builtin/submodule--helper.c:1301 builtin/submodule--helper.c:1304
+#: 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 "подмодулю «%s» не удалось добавить альтернативу: %s"
-#: builtin/submodule--helper.c:1340
+#: builtin/submodule--helper.c:1791
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "Значение «%s» для параметра submodule.alternateErrorStrategy не рапознано"
-#: builtin/submodule--helper.c:1347
+#: builtin/submodule--helper.c:1798
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Значение «%s» для параметра submodule.alternateLocation не рапознано"
-#: builtin/submodule--helper.c:1370
+#: builtin/submodule--helper.c:1822
msgid "where the new submodule will be cloned to"
msgstr "куда должен быть склонирован новый подмодуль"
-#: builtin/submodule--helper.c:1373
+#: builtin/submodule--helper.c:1825
msgid "name of the new submodule"
msgstr "имя нового подмодуля"
-#: builtin/submodule--helper.c:1376
+#: builtin/submodule--helper.c:1828
msgid "url where to clone the submodule from"
msgstr "url откуда должен был склонирован новый подмодуль"
-#: builtin/submodule--helper.c:1384
+#: builtin/submodule--helper.c:1836
msgid "depth for shallow clones"
msgstr "глубина для частичного клона"
-#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1871
+#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348
msgid "force cloning progress"
msgstr "принудительно выводить прогресс клонирования"
-#: builtin/submodule--helper.c:1392
+#: 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>"
-msgstr "git submodule--helper clone [--prefix=<путь>] [--quiet] [--reference <репозиторий>] [--name <имя>] [--depth <глубина>] --url <url> --path <путь>"
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
+"<url> --path <path>"
+msgstr ""
-#: builtin/submodule--helper.c:1423
+#: 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 "не удалось клонировать «%s» в подмодуль по пути «%s»"
-#: builtin/submodule--helper.c:1437
+#: 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 "не удалось получить каталог для подмодуля «%s»"
-#: builtin/submodule--helper.c:1473
+#: builtin/submodule--helper.c:1936
#, c-format
msgid "Invalid update mode '%s' for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1477
+#: builtin/submodule--helper.c:1940
#, c-format
msgid "Invalid update mode '%s' configured for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:2041
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Подмодуль по пути «%s» не инициализирован"
-#: builtin/submodule--helper.c:1574
+#: builtin/submodule--helper.c:2045
msgid "Maybe you want to use 'update --init'?"
msgstr "Возможно, вы хотели использовать «update --init»?"
-#: builtin/submodule--helper.c:1604
+#: builtin/submodule--helper.c:2075
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Пропуск не слитого подмодуля %s"
-#: builtin/submodule--helper.c:1633
+#: builtin/submodule--helper.c:2104
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Пропуск подмодуля «%s»"
-#: builtin/submodule--helper.c:1777
+#: builtin/submodule--helper.c:2254
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Не удалось клонировать «%s». Запланирована повторная попытка"
-#: builtin/submodule--helper.c:1788
+#: builtin/submodule--helper.c:2265
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Не удалось клонировать «%s» со второй попытки, отмена"
-#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:2092
+#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573
msgid "path into the working tree"
msgstr "путь в рабочем каталоге"
-#: builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:2330
msgid "path into the working tree, across nested submodule boundaries"
msgstr "путь в рабочем каталоге, в пределах границ подмодуля"
-#: builtin/submodule--helper.c:1857
+#: builtin/submodule--helper.c:2334
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout или none"
-#: builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:2340
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "Создать частичный клон, ограниченный указанным количеством редакций"
-#: builtin/submodule--helper.c:1866
+#: builtin/submodule--helper.c:2343
msgid "parallel jobs"
msgstr "параллельные задачи"
-#: builtin/submodule--helper.c:1868
+#: builtin/submodule--helper.c:2345
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "должен ли изначальный процесс клонирования следовать рекомендации о частичности"
-#: builtin/submodule--helper.c:1869
+#: builtin/submodule--helper.c:2346
msgid "don't print cloning progress"
msgstr "вы выводить прогресс клонирования"
-#: builtin/submodule--helper.c:1876
-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 ""
-#: builtin/submodule--helper.c:1889
+#: builtin/submodule--helper.c:2370
msgid "bad value for update parameter"
msgstr "плохое значение для параметра update"
-#: builtin/submodule--helper.c:1937
+#: 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:2060
+#: builtin/submodule--helper.c:2541
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:2093
+#: builtin/submodule--helper.c:2574
msgid "recurse into submodules"
msgstr "рекурсивно по подмодулям"
-#: builtin/submodule--helper.c:2099
+#: 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 ""
-#: 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 "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:150
#, sh-format
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr ""
-#: builtin/submodule--helper.c:2235 git.c:433 git.c:685
+#: 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:711
#, 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"
@@ -18445,11 +20878,11 @@
msgid "shorten ref output"
msgstr "укороченный вывод ссылок"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
msgid "reason"
msgstr "причина"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
msgid "reason of the update"
msgstr "причина обновления"
@@ -18466,24 +20899,24 @@
#: builtin/tag.c:28
msgid ""
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--points-at <object>]\n"
-"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
-msgstr "git tag -l [-n[<количество>]] [--contains <коммит>] [--no-contains <коммит>] [--points-at <объект>]\n\t\t[--format=<формат>] [--[no-]merged [<коммит>]] [<шаблон>…]"
+"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] [<pattern>...]"
+msgstr ""
#: builtin/tag.c:30
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<формат>] <имя-метки>…"
-#: builtin/tag.c:88
+#: builtin/tag.c:89
#, c-format
msgid "tag '%s' not found."
msgstr "метка «%s» не найдена."
-#: builtin/tag.c:104
+#: builtin/tag.c:105
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Метка «%s» удалена (была %s)\n"
-#: builtin/tag.c:134
+#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
@@ -18492,7 +20925,7 @@
"Lines starting with '%c' will be ignored.\n"
msgstr "\nВведите сообщение для метки:\n %s\nСтроки, начинающиеся с «%c» будут проигнорированы.\n"
-#: builtin/tag.c:138
+#: builtin/tag.c:139
#, c-format
msgid ""
"\n"
@@ -18501,15 +20934,15 @@
"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:192
+#: builtin/tag.c:198
msgid "unable to sign the tag"
msgstr "не удалось подписать метку"
-#: builtin/tag.c:194
+#: builtin/tag.c:200
msgid "unable to write tag file"
msgstr "не удалось записать файл метки"
-#: builtin/tag.c:210
+#: builtin/tag.c:216
#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
@@ -18518,382 +20951,386 @@
"\tgit tag -f %s %s^{}"
msgstr ""
-#: builtin/tag.c:226
+#: builtin/tag.c:232
msgid "bad object type."
msgstr "неправильный тип объекта"
-#: builtin/tag.c:278
+#: builtin/tag.c:285
msgid "no tag message?"
msgstr "нет описания метки?"
-#: builtin/tag.c:285
+#: builtin/tag.c:292
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Сообщение метки было оставлено в %s\n"
-#: builtin/tag.c:396
+#: builtin/tag.c:403
msgid "list tag names"
msgstr "список названий меток"
-#: builtin/tag.c:398
+#: builtin/tag.c:405
msgid "print <n> lines of each tag message"
msgstr "печатать <n> строк описания от каждой метки"
-#: builtin/tag.c:400
+#: builtin/tag.c:407
msgid "delete tags"
msgstr "удалить метки"
-#: builtin/tag.c:401
+#: builtin/tag.c:408
msgid "verify tags"
msgstr "проверить метки"
-#: builtin/tag.c:403
+#: builtin/tag.c:410
msgid "Tag creation options"
msgstr "Настройки создания метки"
-#: builtin/tag.c:405
+#: builtin/tag.c:412
msgid "annotated tag, needs a message"
msgstr "для аннотированной метки нужно сообщение"
-#: builtin/tag.c:407
+#: builtin/tag.c:414
msgid "tag message"
msgstr "описание метки"
-#: builtin/tag.c:409
+#: builtin/tag.c:416
msgid "force edit of tag message"
msgstr ""
-#: builtin/tag.c:410
+#: builtin/tag.c:417
msgid "annotated and GPG-signed tag"
msgstr "аннотированная и подписанная с помощью GPG метка"
-#: builtin/tag.c:413
+#: builtin/tag.c:420
msgid "use another key to sign the tag"
msgstr "использовать другой ключ для подписания метки"
-#: builtin/tag.c:414
+#: builtin/tag.c:421
msgid "replace the tag if exists"
msgstr "замена метки, если она существует"
-#: builtin/tag.c:415 builtin/update-ref.c:369
+#: builtin/tag.c:422 builtin/update-ref.c:505
msgid "create a reflog"
msgstr "создать журнал ссылок"
-#: builtin/tag.c:417
+#: builtin/tag.c:424
msgid "Tag listing options"
msgstr "Настройки вывода списка меток"
-#: builtin/tag.c:418
+#: builtin/tag.c:425
msgid "show tag list in columns"
msgstr "показать список меток по столбцам"
-#: builtin/tag.c:419 builtin/tag.c:421
+#: builtin/tag.c:426 builtin/tag.c:428
msgid "print only tags that contain the commit"
msgstr "вывод только меток, которые содержат коммит"
-#: builtin/tag.c:420 builtin/tag.c:422
+#: builtin/tag.c:427 builtin/tag.c:429
msgid "print only tags that don't contain the commit"
msgstr "вывод только меток, которые не содержат коммит"
-#: builtin/tag.c:423
+#: builtin/tag.c:430
msgid "print only tags that are merged"
msgstr "вывод только слитых меток"
-#: builtin/tag.c:424
+#: builtin/tag.c:431
msgid "print only tags that are not merged"
msgstr "вывод только не слитых меток"
-#: builtin/tag.c:428
+#: builtin/tag.c:435
msgid "print only tags of the object"
msgstr "вывод только меток, определенного объекта"
-#: builtin/tag.c:472
+#: builtin/tag.c:483
msgid "--column and -n are incompatible"
msgstr "--column и -n нельзя использовать одновременно"
-#: builtin/tag.c:494
+#: builtin/tag.c:505
msgid "-n option is only allowed in list mode"
msgstr "опцию -n можно использовать только в режиме списка"
-#: builtin/tag.c:496
+#: builtin/tag.c:507
msgid "--contains option is only allowed in list mode"
msgstr "опцию --contains можно использовать только в режиме списка"
-#: builtin/tag.c:498
+#: builtin/tag.c:509
msgid "--no-contains option is only allowed in list mode"
msgstr "опцию --no-contains можно использовать только в режиме списка"
-#: builtin/tag.c:500
+#: builtin/tag.c:511
msgid "--points-at option is only allowed in list mode"
msgstr "опцию --points-at можно использовать только в режиме списка"
-#: builtin/tag.c:502
+#: builtin/tag.c:513
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "опции --merged и --no-merged можно использовать только в режиме списка"
-#: builtin/tag.c:513
+#: builtin/tag.c:524
msgid "only one -F or -m option is allowed."
msgstr "-F и -m нельзя использовать одновременно."
-#: builtin/tag.c:532
+#: builtin/tag.c:543
msgid "too many params"
msgstr "передано слишком много параметров"
-#: builtin/tag.c:538
+#: builtin/tag.c:549
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "«%s» не является допустимым именем метки."
-#: builtin/tag.c:543
+#: builtin/tag.c:554
#, c-format
msgid "tag '%s' already exists"
msgstr "метка «%s» уже существует"
-#: builtin/tag.c:574
+#: 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 "информация статистики каталога не изменяется после добавления нового файла"
-#: 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: строки на вводе отделяются НУЛЕВЫМ байтом"
-#: 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 "(для машинной обработки) забыть сохраненные неразрешенные конфликты"
-#: 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; удалите или измените его, если вы действительно хотите включить разделенный индекс"
-#: 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"
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; удалите или измените его, если вы действительно хотите включить кэш неотслеживаемых файлов"
-#: 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 "мониторинг файловой системы выключён"
@@ -18909,19 +21346,19 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<опции>] --stdin [-z]"
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:500
msgid "delete the reference"
msgstr "удалить ссылку"
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:502
msgid "update <refname> not the one it points to"
msgstr "обновить <имя-ссылки> а не то, на что она указывает"
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:503
msgid "stdin has NUL-terminated arguments"
msgstr "ввод отделённый НУЛЕВЫМИ символами"
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:504
msgid "read updates from stdin"
msgstr "прочитать обновления из стандартного ввода"
@@ -18953,308 +21390,312 @@
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "прервать передачу после <кол> секунд простоя"
-#: builtin/verify-commit.c:20
+#: builtin/verify-commit.c:19
msgid "git verify-commit [-v | --verbose] <commit>..."
msgstr "git verify-commit [-v | --verbose] <коммит>…"
-#: builtin/verify-commit.c:76
+#: builtin/verify-commit.c:68
msgid "print commit contents"
msgstr "вывести содержимое коммита"
-#: builtin/verify-commit.c:77 builtin/verify-tag.c:38
+#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
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 "вывести только статистику"
-#: 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=<формат>] <метка>…"
-#: builtin/verify-tag.c:37
+#: builtin/verify-tag.c:36
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:891
+#: builtin/worktree.c:60 builtin/worktree.c:973
#, 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 "Удаление рабочих каталогов/%s: файл gitdir не существует"
+#: 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)"
-msgstr "Удаление рабочих каталогов/%s: не удалось прочитать файл gitdir (%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>)"
-msgstr "Удаление рабочего каталога/%s: прочитано мало данных (ожидалось %<PRIuMAX> байт, прочитано %<PRIuMAX>)"
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr ""
-#: builtin/worktree.c:118
+#: builtin/worktree.c:123
+msgid "invalid gitdir file"
+msgstr ""
+
+#: builtin/worktree.c:131
+msgid "gitdir file points to non-existent location"
+msgstr ""
+
+#: builtin/worktree.c:146
#, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
-msgstr "Удаление рабочих каталогов/%s: недействительный файл gitdir"
+msgid "Removing %s/%s: %s"
+msgstr ""
-#: builtin/worktree.c:127
-#, c-format
-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
-msgstr "Удаление рабочих каталогов/%s: gitdir указывает на несуществующее расположение"
-
-#: 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'"
+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:302
+#: builtin/worktree.c:360
#, c-format
msgid "could not create directory of '%s'"
msgstr "не удалось создать каталог «%s»"
-#: builtin/worktree.c:432 builtin/worktree.c:438
+#: builtin/worktree.c:494 builtin/worktree.c:500
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr ""
-#: builtin/worktree.c:434
+#: builtin/worktree.c:496
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr ""
-#: builtin/worktree.c:443
+#: builtin/worktree.c:505
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr ""
-#: builtin/worktree.c:449
+#: builtin/worktree.c:511
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr ""
-#: builtin/worktree.c:490
+#: builtin/worktree.c:552
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "переключиться на <ветка> даже если она уже активна в другом рабочесм каталоге"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:555
msgid "create a new branch"
msgstr "создать новую ветку"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:557
msgid "create or reset a branch"
msgstr "создать или перейти на ветку"
-#: builtin/worktree.c:497
+#: builtin/worktree.c:559
msgid "populate the new working tree"
msgstr "наполнить новый рабочий каталог"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:560
msgid "keep the new working tree locked"
msgstr "держать рабочий каталог заблокированным"
-#: builtin/worktree.c:501
+#: builtin/worktree.c:563
msgid "set up tracking mode (see git-branch(1))"
msgstr "настроить режим отслеживания ветки (смотрите git-branch(1))"
-#: builtin/worktree.c:504
+#: builtin/worktree.c:566
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "пытаться найти соответствие имени новой ветки с именем внешней ветки"
-#: builtin/worktree.c:512
+#: builtin/worktree.c:574
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B и --detach нельзя использовать одновременно"
-#: builtin/worktree.c:573
+#: builtin/worktree.c:635
msgid "--[no-]track can only be used if a new branch is created"
msgstr "--[no-]track можно использовать только когда вы создаёте новую ветку"
-#: builtin/worktree.c:673
+#: builtin/worktree.c:758
msgid "reason for locking"
msgstr "причина блокировки"
-#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
-#: builtin/worktree.c:919
+#: builtin/worktree.c:770 builtin/worktree.c:803 builtin/worktree.c:877
+#: builtin/worktree.c:1001
#, c-format
msgid "'%s' is not a working tree"
msgstr "«%s» не является рабочим каталогом"
-#: builtin/worktree.c:687 builtin/worktree.c:720
+#: builtin/worktree.c:772 builtin/worktree.c:805
msgid "The main working tree cannot be locked or unlocked"
msgstr "Главный рабочий каталог не может быть заблокирован или разблокирован"
-#: builtin/worktree.c:692
+#: builtin/worktree.c:777
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "«%s» уже заблокирован, причина: %s"
-#: builtin/worktree.c:694
+#: builtin/worktree.c:779
#, c-format
msgid "'%s' is already locked"
msgstr "«%s» уже заблокирован"
-#: builtin/worktree.c:722
+#: builtin/worktree.c:807
#, c-format
msgid "'%s' is not locked"
msgstr "«%s» не заблокирован"
-#: builtin/worktree.c:763
+#: builtin/worktree.c:848
msgid "working trees containing submodules cannot be moved or removed"
msgstr ""
-#: builtin/worktree.c:771
+#: builtin/worktree.c:856
msgid "force move even if worktree is dirty or locked"
msgstr ""
-#: builtin/worktree.c:794 builtin/worktree.c:921
+#: builtin/worktree.c:879 builtin/worktree.c:1003
#, c-format
msgid "'%s' is a main working tree"
msgstr ""
-#: builtin/worktree.c:799
+#: builtin/worktree.c:884
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr ""
-#: builtin/worktree.c:805
-#, c-format
-msgid "target '%s' already exists"
-msgstr ""
-
-#: builtin/worktree.c:813
+#: builtin/worktree.c:897
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:815
+#: builtin/worktree.c:899
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:818
+#: builtin/worktree.c:902
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr ""
-#: builtin/worktree.c:823
+#: builtin/worktree.c:907
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr ""
-#: builtin/worktree.c:871
+#: builtin/worktree.c:953
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr ""
-#: builtin/worktree.c:875
+#: builtin/worktree.c:957
#, 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:880
+#: builtin/worktree.c:962
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr ""
-#: builtin/worktree.c:903
+#: builtin/worktree.c:985
msgid "force removal even if worktree is dirty or locked"
msgstr ""
-#: builtin/worktree.c:926
+#: builtin/worktree.c:1008
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:928
+#: builtin/worktree.c:1010
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
msgstr ""
-#: builtin/worktree.c:931
+#: builtin/worktree.c:1013
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr ""
+#: builtin/worktree.c:1037
+#, c-format
+msgid "repair: %s: %s"
+msgstr ""
+
+#: builtin/worktree.c:1040
+#, c-format
+msgid "error: %s: %s"
+msgstr ""
+
#: builtin/write-tree.c:15
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
msgstr "git write-tree [--missing-ok] [--prefix=<префикс>/]"
@@ -19271,25 +21712,29 @@
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\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"
-msgstr "вывод отладочных сообщений на stderr"
+#: http-fetch.c:122
+msgid "not a git repository"
+msgstr ""
-#: t/helper/test-reach.c:152
+#: t/helper/test-fast-rebase.c:141
+msgid "unhandled options"
+msgstr ""
+
+#: t/helper/test-fast-rebase.c:146
+msgid "error preparing revisions"
+msgstr ""
+
+#: 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 ""
@@ -19301,7 +21746,7 @@
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"
@@ -19310,146 +21755,147 @@
" <command> [<args>]"
msgstr "git [--version] [--help] [-C <путь>] [-c <имя>=<значение>]\n [--exec-path[=<путь>]] [--html-path] [--man-path] [--info-path]\n [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]\n [--git-dir=<путь>] [--work-tree=<путь>] [--namespace=<имя>]\n <команда> [<аргументы>]"
-#: git.c:34
+#: 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."
-msgstr "«git help -а» и «git help -g» выводит список доступных подкоманд и\nнекоторые руководства по темам. Запустите «git help <команда>» или\n«git help <термин>», чтобы прочесть о конкретных подкоманде или теме."
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
+msgstr ""
-#: git.c:185
+#: git.c:187
#, c-format
msgid "no directory given for --git-dir\n"
msgstr ""
-#: git.c:199
+#: git.c:201
#, c-format
msgid "no namespace given for --namespace\n"
msgstr ""
-#: git.c:213
+#: git.c:215
#, c-format
msgid "no directory given for --work-tree\n"
msgstr ""
-#: git.c:227
+#: git.c:229
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr ""
-#: git.c:249
+#: git.c:251
#, c-format
msgid "-c expects a configuration string\n"
msgstr ""
-#: git.c:287
+#: git.c:289
#, c-format
msgid "no directory given for -C\n"
msgstr ""
-#: git.c:313
+#: git.c:315
#, c-format
msgid "unknown option: %s\n"
msgstr ""
-#: git.c:359
+#: git.c:364
#, c-format
msgid "while expanding alias '%s': '%s'"
msgstr ""
-#: git.c:368
+#: 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:376
+#: git.c:380
#, c-format
msgid "empty alias for %s"
msgstr ""
-#: git.c:379
+#: git.c:383
#, c-format
msgid "recursive alias: %s"
msgstr ""
-#: git.c:459
+#: git.c:465
msgid "write failure on standard output"
msgstr ""
-#: git.c:461
+#: git.c:467
msgid "unknown write failure on standard output"
msgstr ""
-#: git.c:463
+#: git.c:469
msgid "close failed on standard output"
msgstr ""
-#: git.c:797
+#: git.c:820
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr ""
-#: git.c:847
+#: git.c:870
#, c-format
msgid "cannot handle %s as a builtin"
msgstr ""
-#: git.c:860
+#: git.c:883
#, c-format
msgid ""
"usage: %s\n"
"\n"
msgstr ""
-#: git.c:880
+#: git.c:903
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
-#: git.c:892
+#: git.c:915
#, 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.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 "Public key pinning не поддерживается с cURL < 7.44.0"
-#: 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"
@@ -19457,152 +21903,193 @@
" redirect: %s"
msgstr "не удалось обновить базовый url из переадресации:\n запрошено: %s\n переадресовано: %s"
-#: remote-curl.c:157
+#: remote-curl.c:183
#, c-format
msgid "invalid quoting in push-option value: '%s'"
msgstr ""
-#: remote-curl.c:254
+#: remote-curl.c:307
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr ""
-#: remote-curl.c:355
+#: remote-curl.c:408
msgid "invalid server response; expected service, got flush packet"
msgstr ""
-#: remote-curl.c:386
+#: remote-curl.c:439
#, c-format
msgid "invalid server response; got '%s'"
msgstr ""
-#: remote-curl.c:446
+#: remote-curl.c:499
#, c-format
msgid "repository '%s' not found"
msgstr ""
-#: remote-curl.c:450
+#: remote-curl.c:503
#, c-format
msgid "Authentication failed for '%s'"
msgstr ""
-#: remote-curl.c:454
+#: remote-curl.c:507
#, c-format
msgid "unable to access '%s': %s"
msgstr "«%s» недоступно: %s"
-#: remote-curl.c:460
+#: remote-curl.c:513
#, c-format
msgid "redirecting to %s"
msgstr "переадресация на %s"
-#: remote-curl.c:584
+#: remote-curl.c:642
msgid "shouldn't have EOF when not gentle on EOF"
msgstr ""
-#: remote-curl.c:664
-msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+#: remote-curl.c:654
+msgid "remote server sent stateless separator"
msgstr ""
#: remote-curl.c:724
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr ""
+
+#: remote-curl.c:754
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr ""
+
+#: remote-curl.c:756
+msgid "remote-curl: unexpected response end packet"
+msgstr ""
+
+#: remote-curl.c:832
#, c-format
msgid "RPC failed; %s"
msgstr ""
-#: remote-curl.c:764
+#: remote-curl.c:872
msgid "cannot handle pushes this big"
msgstr ""
-#: remote-curl.c:879
+#: remote-curl.c:987
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr ""
-#: remote-curl.c:883
+#: remote-curl.c:991
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr ""
-#: remote-curl.c:1014
+#: remote-curl.c:1041
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr ""
+
+#: remote-curl.c:1043
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr ""
+
+#: remote-curl.c:1132
msgid "dumb http transport does not support shallow capabilities"
msgstr ""
-#: remote-curl.c:1028
+#: remote-curl.c:1147
msgid "fetch failed."
msgstr ""
-#: remote-curl.c:1076
+#: remote-curl.c:1193
msgid "cannot fetch by sha1 over smart http"
msgstr ""
-#: remote-curl.c:1120 remote-curl.c:1126
+#: remote-curl.c:1237 remote-curl.c:1243
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr ""
-#: remote-curl.c:1138 remote-curl.c:1252
+#: remote-curl.c:1255 remote-curl.c:1373
#, c-format
msgid "http transport does not support %s"
msgstr ""
-#: remote-curl.c:1174
+#: remote-curl.c:1291
msgid "git-http-push failed"
msgstr ""
-#: remote-curl.c:1360
+#: remote-curl.c:1479
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr ""
-#: remote-curl.c:1392
+#: remote-curl.c:1511
msgid "remote-curl: error reading command stream from git"
msgstr ""
-#: remote-curl.c:1399
+#: remote-curl.c:1518
msgid "remote-curl: fetch attempted without a local repo"
msgstr ""
-#: remote-curl.c:1439
+#: remote-curl.c:1559
#, 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:304
+#: parse-options.h:309
msgid "be more verbose"
msgstr "быть многословнее"
-#: parse-options.h:306
+#: parse-options.h:311
msgid "be more quiet"
msgstr "тихий режим"
-#: parse-options.h:312
-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 ""
-#: parse-options.h:331
+#: 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 "имя поля, по которому выполнить сортировку"
@@ -19610,6 +22097,14 @@
msgid "update the index with reused conflict resolution if possible"
msgstr "обновить индекс с помощью переиспользования разрешения конфликта, если возможно"
+#: wt-status.h:80
+msgid "HEAD detached at "
+msgstr "HEAD отделён на "
+
+#: wt-status.h:81
+msgid "HEAD detached from "
+msgstr "HEAD отделён начиная с "
+
#: command-list.h:50
msgid "Add file contents to the index"
msgstr "Добавление содержимого файла в индекс"
@@ -19647,681 +22142,691 @@
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 "Запись и проверка commit-graph файлов 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 "Сравнение содержимого и режима двоичных объектов, найденных по двум объектам дерева"
-#: 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 "Run a Git command on a list of repositories"
+msgstr ""
+
+#: command-list.h:100
msgid "Prepare patches for e-mail submission"
msgstr "Подготовка патчей для отправки по электронной почте"
-#: command-list.h:99
+#: command-list.h:101
msgid "Verifies the connectivity and validity of the objects in the database"
msgstr "Проверка связности и валидности объектов в базе данных"
-#: command-list.h:100
+#: command-list.h:102
msgid "Cleanup unnecessary files and optimize the local repository"
msgstr "Очистка ненужных файлов и оптимизация локального репозитория"
-#: command-list.h:101
+#: command-list.h:103
msgid "Extract commit ID from an archive created using git-archive"
msgstr "Извлечение идентификатора коммита из архива, созданного с помощью git-archive"
-#: command-list.h:102
+#: command-list.h:104
msgid "Print lines matching a pattern"
msgstr "Вывод строк, соответствующих шаблону"
-#: command-list.h:103
+#: command-list.h:105
msgid "A portable graphical interface to Git"
msgstr "Портативный графический интерфейс для Git"
-#: command-list.h:104
+#: command-list.h:106
msgid "Compute object ID and optionally creates a blob from a file"
msgstr "Вычисление идентификатора объекта и возможное создание двоичного объекта из файла"
-#: command-list.h:105
+#: command-list.h:107
msgid "Display help information about Git"
msgstr "Отображение справочной информации о Git"
-#: command-list.h:106
+#: command-list.h:108
msgid "Server side implementation of Git over HTTP"
msgstr "Серверная реализация протокола Git над HTTP"
-#: command-list.h:107
+#: command-list.h:109
msgid "Download from a remote Git repository via HTTP"
msgstr "Загрузка из внешнего репозитория Git с помощью HTTP"
-#: command-list.h:108
+#: command-list.h:110
msgid "Push objects over HTTP/DAV to another repository"
msgstr "Отправка объектов в другой репозиторий с помощью HTTP/DAV"
-#: command-list.h:109
+#: command-list.h:111
msgid "Send a collection of patches from stdin to an IMAP folder"
msgstr "Отправка коллекции патчей из стандартного ввода в папку IMAP"
-#: command-list.h:110
+#: command-list.h:112
msgid "Build pack index file for an existing packed archive"
msgstr "Построение файла индекса для существующего упакованного архива"
-#: command-list.h:111
+#: command-list.h:113
msgid "Create an empty Git repository or reinitialize an existing one"
msgstr "Создание пустого репозитория Git или переинициализация существующего"
-#: command-list.h:112
+#: command-list.h:114
msgid "Instantly browse your working repository in gitweb"
msgstr "Мгновенный просмотр вашего рабочего репозитория в gitweb"
-#: command-list.h:113
+#: command-list.h:115
msgid "Add or parse structured information in commit messages"
msgstr "Добавление или разбор структурированной информации в сообщениях коммита"
-#: command-list.h:114
+#: command-list.h:116
msgid "The Git repository browser"
msgstr "Браузер репозитория Git"
-#: command-list.h:115
+#: command-list.h:117
msgid "Show commit logs"
msgstr "Вывод истории коммитов"
-#: command-list.h:116
+#: command-list.h:118
msgid "Show information about files in the index and the working tree"
msgstr "Вывод информации о файлах в индексе и в рабочем каталоге"
-#: command-list.h:117
+#: command-list.h:119
msgid "List references in a remote repository"
msgstr "Вывод списка ссылок во внешнем репозитории"
-#: command-list.h:118
+#: command-list.h:120
msgid "List the contents of a tree object"
msgstr "Вывод содержимого объекта дерева"
-#: command-list.h:119
+#: command-list.h:121
msgid "Extracts patch and authorship from a single e-mail message"
msgstr "Извлекает патч и авторство из одного сообщения электронной почты"
-#: command-list.h:120
+#: command-list.h:122
msgid "Simple UNIX mbox splitter program"
msgstr "Простая программа UNIX для разбора файла mbox"
-#: command-list.h:121
+#: command-list.h:123
+msgid "Run tasks to optimize Git repository data"
+msgstr ""
+
+#: command-list.h:124
msgid "Join two or more development histories together"
msgstr "Объединение одной или нескольких историй разработки вместе"
-#: command-list.h:122
+#: command-list.h:125
msgid "Find as good common ancestors as possible for a merge"
msgstr "Поиск подходящих общих предков для возможного слияния"
-#: command-list.h:123
+#: command-list.h:126
msgid "Run a three-way file merge"
msgstr "Запуск трёхходового слияния файлов"
-#: command-list.h:124
+#: command-list.h:127
msgid "Run a merge for files needing merging"
msgstr "Запуск слияния для файлов, которые требуют слияния"
-#: command-list.h:125
+#: command-list.h:128
msgid "The standard helper program to use with git-merge-index"
msgstr "Стандартная программа-помощник для использования совместно с git-merge-index"
-#: command-list.h:126
+#: command-list.h:129
msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr "Запуск инструментов разрешения конфликтов слияния"
-#: command-list.h:127
+#: command-list.h:130
msgid "Show three-way merge without touching index"
msgstr "Вывод трёхходового слияние без затрагивания индекса"
-#: command-list.h:128
+#: command-list.h:131
msgid "Write and verify multi-pack-indexes"
msgstr "Запись и проверка файлов multi-pack-index"
-#: command-list.h:129
+#: command-list.h:132
msgid "Creates a tag object"
msgstr "Создание объектов меток"
-#: command-list.h:130
+#: command-list.h:133
msgid "Build a tree-object from ls-tree formatted text"
msgstr "Построение объекта дерева из текста формата ls-tree"
-#: command-list.h:131
+#: command-list.h:134
msgid "Move or rename a file, a directory, or a symlink"
msgstr "Перемещение или переименование файла, каталога или символьной ссылки"
-#: command-list.h:132
+#: command-list.h:135
msgid "Find symbolic names for given revs"
msgstr "Поиск символьных имён для указанных редакций"
-#: command-list.h:133
+#: command-list.h:136
msgid "Add or inspect object notes"
msgstr "Добавление или просмотр заметок объекта"
-#: command-list.h:134
+#: command-list.h:137
msgid "Import from and submit to Perforce repositories"
msgstr "Импорт и отправка в репозитории Perforce"
-#: command-list.h:135
+#: command-list.h:138
msgid "Create a packed archive of objects"
msgstr "Создание упакованного архива объектов"
-#: command-list.h:136
+#: command-list.h:139
msgid "Find redundant pack files"
msgstr "Поиск избыточных файлов пакетов"
-#: command-list.h:137
+#: command-list.h:140
msgid "Pack heads and tags for efficient repository access"
msgstr "Упаковка указателей на ветки и меток для эффективного доступа к репозиторию"
-#: command-list.h:138
-msgid "Routines to help parsing remote repository access parameters"
-msgstr "Подпрограммы для помощи разбора параметров доступа внешнего репозитория"
-
-#: command-list.h:139
+#: 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 "Применение упорядоченного списка патчей над текущей веткой"
-#: 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:159
msgid "Revert some existing commits"
msgstr "Обращение изменений существующих коммитов"
-#: command-list.h:157
+#: command-list.h:160
msgid "Lists commit objects in reverse chronological order"
msgstr "Вывод списка объектов коммита в обратном хронологическом порядке"
-#: command-list.h:158
+#: command-list.h:161
msgid "Pick out and massage parameters"
msgstr "Разбор и обработка параметров"
-#: command-list.h:159
+#: command-list.h:162
msgid "Remove files from the working tree and from the index"
msgstr "Удаление файлов из рабочего каталога и индекса"
-#: command-list.h:160
+#: command-list.h:163
msgid "Send a collection of patches as emails"
msgstr "Отправка коллекции патчей на электронную почту"
-#: command-list.h:161
+#: command-list.h:164
msgid "Push objects over Git protocol to another repository"
msgstr "Отправка объектов в другой репозиторий с помощью протокола Git"
-#: command-list.h:162
+#: command-list.h:165
msgid "Restricted login shell for Git-only SSH access"
msgstr "Ограниченная оболочка входа в систему для доступа Git через SSH"
-#: command-list.h:163
+#: command-list.h:166
msgid "Summarize 'git log' output"
msgstr "Обобщение вывода «git log»"
-#: command-list.h:164
+#: command-list.h:167
msgid "Show various types of objects"
msgstr "Вывод различных типов объектов"
-#: command-list.h:165
+#: command-list.h:168
msgid "Show branches and their commits"
msgstr "Вывод веток и их коммитов"
-#: command-list.h:166
+#: command-list.h:169
msgid "Show packed archive index"
msgstr "Вывод индекса упакованного архива"
-#: command-list.h:167
+#: command-list.h:170
msgid "List references in a local repository"
msgstr "Вывод ссылок в локальном репозитории"
-#: command-list.h:168
+#: command-list.h:171
msgid "Git's i18n setup code for shell scripts"
msgstr "Код настройки интернационализации для сценариев оболочки Git"
-#: command-list.h:169
+#: command-list.h:172
msgid "Common Git shell script setup code"
msgstr "Общий код настройки для сценариев оболочки Git"
-#: command-list.h:170
+#: 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:171
+#: command-list.h:175
msgid "Add file contents to the staging area"
msgstr "Добавление содержимого файлов в индекс"
-#: command-list.h:172
+#: command-list.h:176
msgid "Show the working tree status"
msgstr "Вывод состояния рабочего каталога"
-#: command-list.h:173
+#: command-list.h:177
msgid "Remove unnecessary whitespace"
msgstr "Удаление ненужных пробелов"
-#: command-list.h:174
+#: command-list.h:178
msgid "Initialize, update or inspect submodules"
msgstr "Инициализация, обновление или просмотр подмодулей"
-#: command-list.h:175
+#: command-list.h:179
msgid "Bidirectional operation between a Subversion repository and Git"
msgstr "Двухсторонние операции между репозиториями Subversion и Git"
-#: command-list.h:176
+#: command-list.h:180
+msgid "Switch branches"
+msgstr ""
+
+#: command-list.h:181
msgid "Read, modify and delete symbolic refs"
msgstr "Чтение, изменение и удаление символических ссылок"
-#: command-list.h:177
+#: command-list.h:182
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr "Создание, вывод списка, удаление или проверка метки, подписанной с помощью GPG"
-#: command-list.h:178
+#: command-list.h:183
msgid "Creates a temporary file with a blob's contents"
msgstr "Создание временного файла с содержимым двоичного объекта"
-#: command-list.h:179
+#: command-list.h:184
msgid "Unpack objects from a packed archive"
msgstr "Распаковка объектов из упакованного архива"
-#: command-list.h:180
+#: command-list.h:185
msgid "Register file contents in the working tree to the index"
msgstr "Регистрация содержимого файла из рабочего каталога в индекс"
-#: command-list.h:181
+#: command-list.h:186
msgid "Update the object name stored in a ref safely"
msgstr "Безопасное обновление имени объекта хранящегося в ссылке"
-#: command-list.h:182
+#: command-list.h:187
msgid "Update auxiliary info file to help dumb servers"
msgstr "Обновление файла со вспомогательной информацией для глупых серверов"
-#: command-list.h:183
+#: command-list.h:188
msgid "Send archive back to git-archive"
msgstr "Отправка архива обратно в git-archive"
-#: command-list.h:184
+#: command-list.h:189
msgid "Send objects packed back to git-fetch-pack"
msgstr "Отправка упакованных объектов обратно в git-fetch-pack"
-#: command-list.h:185
+#: command-list.h:190
msgid "Show a Git logical variable"
msgstr "Вывод логической переменной Git"
-#: command-list.h:186
+#: command-list.h:191
msgid "Check the GPG signature of commits"
msgstr "Проверка подписи GPG коммитов"
-#: command-list.h:187
+#: command-list.h:192
msgid "Validate packed Git archive files"
msgstr "Проверка файлов упакованных архивов Git"
-#: command-list.h:188
+#: command-list.h:193
msgid "Check the GPG signature of tags"
msgstr "Проверка подписи GPG меток"
-#: command-list.h:189
+#: command-list.h:194
msgid "Git web interface (web frontend to Git repositories)"
msgstr "Веб интерфейс Git (веб-интерфейс для Git репозиториев)"
-#: command-list.h:190
+#: command-list.h:195
msgid "Show logs with difference each commit introduces"
msgstr "Вывод журнала с изменениями, которые вводил каждый из коммитов"
-#: command-list.h:191
+#: command-list.h:196
msgid "Manage multiple working trees"
msgstr "Управление несколькими рабочими каталогами"
-#: command-list.h:192
+#: command-list.h:197
msgid "Create a tree object from the current index"
msgstr "Создание объекта дерева из текущего индекса"
-#: command-list.h:193
+#: command-list.h:198
msgid "Defining attributes per path"
msgstr "Определение атрибутов для путей файлов или каталогов"
-#: command-list.h:194
+#: command-list.h:199
msgid "Git command-line interface and conventions"
msgstr "Интерфейс коммандной строки Git и соглашения"
-#: command-list.h:195
+#: command-list.h:200
msgid "A Git core tutorial for developers"
msgstr "Учебник по ядру Git для разработчиков"
-#: command-list.h:196
+#: command-list.h:201
+msgid "Providing usernames and passwords to Git"
+msgstr ""
+
+#: command-list.h:202
msgid "Git for CVS users"
msgstr "Git для пользователей CVS"
-#: command-list.h:197
+#: command-list.h:203
msgid "Tweaking diff output"
msgstr "Подстройка вывода списка изменений"
-#: command-list.h:198
+#: command-list.h:204
msgid "A useful minimum set of commands for Everyday Git"
msgstr "Полезный минимум команд для каждодневного использования Git"
-#: command-list.h:199
+#: command-list.h:205
+msgid "Frequently asked questions about using Git"
+msgstr ""
+
+#: command-list.h:206
msgid "A Git Glossary"
msgstr "Глоссарий Git"
-#: command-list.h:200
+#: command-list.h:207
msgid "Hooks used by Git"
msgstr "Перехватчики используемые Git"
-#: command-list.h:201
+#: command-list.h:208
msgid "Specifies intentionally untracked files to ignore"
msgstr "Указание специально игнорируемых файлов"
-#: command-list.h:202
+#: command-list.h:209
msgid "Defining submodule properties"
msgstr "Определение свойств подмодулей"
-#: command-list.h:203
+#: command-list.h:210
msgid "Git namespaces"
msgstr "Пространства имён Git"
-#: command-list.h:204
+#: 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:205
+#: command-list.h:213
msgid "Specifying revisions and ranges for Git"
msgstr "Указание редакций и диапазонов для Git"
-#: command-list.h:206
+#: 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:207
+#: command-list.h:216
msgid "A tutorial introduction to Git"
msgstr "Обучающее введение в Git"
-#: command-list.h:208
+#: 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:48
#, sh-format
msgid "Bad rev input: $arg"
msgstr "Плохой ввод номера редакции: $arg"
-#: git-bisect.sh:121
-#, sh-format
-msgid "Bad rev input: $bisected_head"
-msgstr "Плохой ввод номера редакции: $bisected_head"
-
-#: git-bisect.sh:130
-#, sh-format
-msgid "Bad rev input: $rev"
-msgstr "Плохой ввод номера редакции: $rev"
-
-#: git-bisect.sh:139
-#, sh-format
-msgid "'git bisect $TERM_BAD' can take only one argument."
-msgstr "«git bisect $TERM_BAD» может принимать только один аргумент."
-
-#: git-bisect.sh:209
+#: git-bisect.sh:82
msgid "No logfile given"
msgstr "Не передан файл журнала"
-#: git-bisect.sh:210
+#: git-bisect.sh:83
#, sh-format
msgid "cannot read $file for replaying"
msgstr "не удалось прочитать $file для повтора изменений"
-#: git-bisect.sh:232
+#: git-bisect.sh:105
msgid "?? what are you talking about?"
msgstr "?? вы о чем?"
-#: git-bisect.sh:241
+#: git-bisect.sh:115
msgid "bisect run failed: no command provided."
msgstr "сбой при выполнении двоичного поиска: не передана команда."
-#: git-bisect.sh:246
+#: git-bisect.sh:120
#, sh-format
msgid "running $command"
msgstr "запускаю $command"
-#: git-bisect.sh:253
+#: git-bisect.sh:127
#, sh-format
msgid ""
"bisect run failed:\n"
"exit code $res from '$command' is < 0 or >= 128"
msgstr "не удалось выполнить двоичный поиск:\nкод завершения $res от «$command» оказался < 0 или >= 128"
-#: git-bisect.sh:279
+#: git-bisect.sh:152
msgid "bisect run cannot continue any more"
msgstr "bisect run больше не может продолжать"
-#: git-bisect.sh:285
+#: git-bisect.sh:158
#, sh-format
msgid ""
"bisect run failed:\n"
-"'bisect_state $state' exited with error code $res"
-msgstr "не удалось выполнить двоичный поиск:\n«bisect_state $state» завершился с кодом ошибки $res"
+"'bisect-state $state' exited with error code $res"
+msgstr ""
-#: git-bisect.sh:292
+#: git-bisect.sh:165
msgid "bisect run success"
msgstr "bisect run выполнен успешно"
-#: git-bisect.sh:300
+#: git-bisect.sh:173
msgid "We are not bisecting."
msgstr "Вы сейчас не в процессе бинарного поиска."
@@ -20363,136 +22868,46 @@
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:179
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr "Относительный путь можно использовать только находясь на вершине рабочего каталога"
-#: git-submodule.sh:210
+#: git-submodule.sh:189
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "URL репозитория: «$repo» должен быть абсолютным или начинаться с ./|../"
-#: git-submodule.sh:229
+#: git-submodule.sh:208
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "«$sm_path» уже содержится в индексе"
-#: git-submodule.sh:232
+#: git-submodule.sh:211
#, 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:218
#, 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 "Следующие пути игнорируются одним из ваших файлов .gitignore:\n$sm_path\nИспользуйте опцию -f, если вы действительно хотите его добавить."
-
-#: git-submodule.sh:268
+#: git-submodule.sh:249
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Добавляю существующий репозиторий из «$sm_path» в индекс"
-#: git-submodule.sh:270
+#: git-submodule.sh:251
#, 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:259
#, 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:261
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -20501,137 +22916,124 @@
"or you are unsure what this means choose another name with the '--name' option."
msgstr "Если вы хотите повторно использовать локальный каталог git вместо повторного клонирования из\n $realrepo\nто используйте параметр «--force». Если же локальный каталог git не является нужным репозиторием или если вы не уверены, что это значит, то укажите другое имя для подмодуля с помощью параметра «--name»."
-#: git-submodule.sh:286
+#: git-submodule.sh:267
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "Восстановление локального каталога git для подмодуля «$sm_name»."
-#: git-submodule.sh:298
+#: git-submodule.sh:279
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Не удалось переключиться на состояние у подмодуля «$sm_path»"
-#: git-submodule.sh:303
+#: git-submodule.sh:284
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Сбой добавления подмодуля «$sm_path»"
-#: git-submodule.sh:312
+#: git-submodule.sh:293
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Не удалось зарегистрировать подмодуль «$sm_path»"
-#: git-submodule.sh:573
+#: git-submodule.sh:568
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "Не удалось найти текущую редакцию для подмодуля по пути «$displaypath»"
-#: git-submodule.sh:583
+#: git-submodule.sh:578
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Не удалось выполнить извлечение для подмодуля по пути «$sm_path»"
-#: git-submodule.sh:588
+#: git-submodule.sh:583
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr "Не удалось найти текущую редакцию ${remote_name}/${branch} для подмодуля по пути «$sm_path»"
-#: git-submodule.sh:606
+#: git-submodule.sh:601
#, sh-format
msgid ""
"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
"$sha1:"
msgstr ""
-#: git-submodule.sh:612
+#: git-submodule.sh:607
#, 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:619
+#: git-submodule.sh:614
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "Не удалось переключиться на состояние «$sha1» для подмодуля по пути «$displaypath»"
-#: git-submodule.sh:620
+#: git-submodule.sh:615
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Подмодуль по пути «$displaypath»: забрано состояние «$sha1»"
-#: git-submodule.sh:624
+#: git-submodule.sh:619
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "Не удалось переместить «$sha1» для подмодуля по пути «$displaypath»"
-#: git-submodule.sh:625
+#: git-submodule.sh:620
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Подмодуль по пути «$displaypath»: перемещен над «$sha1»"
-#: git-submodule.sh:630
+#: git-submodule.sh:625
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "Не удалось выполнить слияние с «$sha1» для подмодуля по пути «$displaypath»"
-#: git-submodule.sh:631
+#: git-submodule.sh:626
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Подмодуль по пути «$displaypath»: слито с «$sha1»"
-#: git-submodule.sh:636
+#: git-submodule.sh:631
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr "Сбой выполнения «$command $sha1» для подмодуля по пути «$displaypath»"
-#: git-submodule.sh:637
+#: git-submodule.sh:632
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Подмодуль по пути «$displaypath»: «$command $sha1»"
-#: git-submodule.sh:668
+#: git-submodule.sh:663
#, 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-rebase--preserve-merges.sh:109
+msgid "Applied autostash."
+msgstr "Применены автоматически спрятанные изменения."
-#: git-submodule.sh:882
+#: git-rebase--preserve-merges.sh:112
#, sh-format
-msgid "unexpected mode $mod_dst"
-msgstr "неизвестный режим $mod_dst"
+msgid "Cannot store $stash_sha1"
+msgstr "Не удалось сохранить $stash_sha1"
-#: git-submodule.sh:902
-#, sh-format
-msgid " Warn: $display_name doesn't contain commit $sha1_src"
-msgstr " Предупреждение: $display_name не содержит коммит $sha1_src"
+#: 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Ваши изменения спрятаны и в безопасности.\nВы можете выполнить «git stash pop» или «git stash drop» в любой момент.\n"
-#: 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."
-msgstr "Для дополнительной информации, смотрите git-${cmd}(1)."
-
-#: git-rebase--preserve-merges.sh:136
+#: git-rebase--preserve-merges.sh:191
#, sh-format
msgid "Rebasing ($new_count/$total)"
msgstr "Перемещение ($new_count/$total)"
-#: git-rebase--preserve-merges.sh:152
+#: git-rebase--preserve-merges.sh:197
msgid ""
"\n"
"Commands:\n"
@@ -20652,7 +23054,7 @@
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr "\nКоманды:\np, pick <коммит> = использовать коммит\nr, reword <коммит> = использовать коммит, но изменить сообщение коммита\ne, edit <коммит> = использовать коммит, но остановиться для исправления\ns, squash <коммит> = использовать коммит, но объединить с предыдущим коммитом\nf, fixup <коммит> = как «squash», но пропустить сообщение коммита\nx, exec <команда> = выполнить команду (остаток строки) с помощью командной оболочки\nd, drop <коммит> = удалить коммит\nl, label <метка> = дать имя текущему HEAD\nt, reset <метка> = сбросить HEAD к указанной метке\nm, merge [-C <коммит> | -c <коммит>] <метка> [# <строка>]\n. создать слияние используя сообщение коммита оригинального\n. слияния (или использовать указанную строку, если оригинальное\n. слияние не указано). Используйте -c <коммит> чтобы изменить\n. сообщение коммита.\n\nЭти строки можно перемещать; они будут выполнены сверху вниз.\n"
-#: git-rebase--preserve-merges.sh:215
+#: git-rebase--preserve-merges.sh:260
#, sh-format
msgid ""
"You can amend the commit now, with\n"
@@ -20664,61 +23066,61 @@
"\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:240
+#: git-rebase--preserve-merges.sh:285
#, sh-format
msgid "$sha1: not a commit that can be picked"
msgstr "$sha1: не является коммитом, который можно взять"
-#: git-rebase--preserve-merges.sh:279
+#: git-rebase--preserve-merges.sh:324
#, sh-format
msgid "Invalid commit name: $sha1"
msgstr "Недопустимое имя коммита: $sha1"
-#: git-rebase--preserve-merges.sh:309
+#: git-rebase--preserve-merges.sh:354
msgid "Cannot write current commit's replacement sha1"
msgstr "Не удалось записать замену sha1 текущего коммита"
-#: git-rebase--preserve-merges.sh:360
+#: git-rebase--preserve-merges.sh:405
#, sh-format
msgid "Fast-forward to $sha1"
msgstr "Перемотка вперед до $sha1"
-#: git-rebase--preserve-merges.sh:362
+#: git-rebase--preserve-merges.sh:407
#, sh-format
msgid "Cannot fast-forward to $sha1"
msgstr "Не удалось перемотать вперед до $sha1"
-#: git-rebase--preserve-merges.sh:371
+#: git-rebase--preserve-merges.sh:416
#, sh-format
msgid "Cannot move HEAD to $first_parent"
msgstr "Не удалось переместить HEAD на $first_parent"
-#: git-rebase--preserve-merges.sh:376
+#: git-rebase--preserve-merges.sh:421
#, sh-format
msgid "Refusing to squash a merge: $sha1"
msgstr "Нельзя уплотнить слияние: $sha1"
-#: git-rebase--preserve-merges.sh:394
+#: git-rebase--preserve-merges.sh:439
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "Ошибка при повторении слияния $sha1"
-#: git-rebase--preserve-merges.sh:403
+#: git-rebase--preserve-merges.sh:448
#, sh-format
msgid "Could not pick $sha1"
msgstr "Не удалось взять $sha1"
-#: git-rebase--preserve-merges.sh:412
+#: git-rebase--preserve-merges.sh:457
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "Это сообщение коммита номер #${n}:"
-#: git-rebase--preserve-merges.sh:417
+#: git-rebase--preserve-merges.sh:462
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "Сообщение коммита номер #${n} будет пропущено:"
-#: git-rebase--preserve-merges.sh:428
+#: 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."
@@ -20727,22 +23129,22 @@
msgstr[2] "Это объединение $count коммитов"
msgstr[3] "Это объединение $count коммитов"
-#: git-rebase--preserve-merges.sh:437
+#: git-rebase--preserve-merges.sh:482
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "Не удалось записать $fixup_msg"
-#: git-rebase--preserve-merges.sh:440
+#: git-rebase--preserve-merges.sh:485
msgid "This is a combination of 2 commits."
msgstr "Это объединение 2 коммитов"
-#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524
-#: git-rebase--preserve-merges.sh:527
+#: 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:556
+#: git-rebase--preserve-merges.sh:601
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
@@ -20751,31 +23153,31 @@
"you are able to reword the commit."
msgstr "Не удалось исправить коммит после успешного перехода на $sha1… $rest\nЭто произошло, скорее всего, из-за пустого сообщения коммита или из-за перехватчика перед коммитом. Если же это произошло из-за перехватчика перед коммитом, то вам нужно решить с ним проблему и повторить попытку снова."
-#: git-rebase--preserve-merges.sh:571
+#: git-rebase--preserve-merges.sh:616
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "Остановлено на $sha1_abbrev… $rest"
-#: git-rebase--preserve-merges.sh:586
+#: git-rebase--preserve-merges.sh:631
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "Нельзя сделать «$squash_style» без указания предыдущего коммита"
-#: git-rebase--preserve-merges.sh:628
+#: git-rebase--preserve-merges.sh:673
#, sh-format
msgid "Executing: $rest"
msgstr "Выполнение: $rest"
-#: git-rebase--preserve-merges.sh:636
+#: git-rebase--preserve-merges.sh:681
#, sh-format
msgid "Execution failed: $rest"
msgstr "Не удалось выполнить: $rest"
-#: git-rebase--preserve-merges.sh:638
+#: git-rebase--preserve-merges.sh:683
msgid "and made changes to the index and/or the working tree"
msgstr "и были сделаны изменения в индексе и/или в рабочем каталоге"
-#: git-rebase--preserve-merges.sh:640
+#: git-rebase--preserve-merges.sh:685
msgid ""
"You can fix the problem, and then run\n"
"\n"
@@ -20783,7 +23185,7 @@
msgstr "Вы можете исправить ошибку, а затем запустить\n\n\tgit rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:653
+#: git-rebase--preserve-merges.sh:698
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
@@ -20793,25 +23195,25 @@
"\tgit rebase --continue"
msgstr "Успешное выполнение: $rest\nно остались изменения в индексе и/или в рабочем каталоге\nСделайте коммит или спрячьте ваши изменения, а затем выполните\n\n\tgit rebase --continue"
-#: git-rebase--preserve-merges.sh:664
+#: git-rebase--preserve-merges.sh:709
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "Неопознанная команда: $command $sha1 $rest"
-#: git-rebase--preserve-merges.sh:665
+#: 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:700
+#: git-rebase--preserve-merges.sh:745
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "Успешно перемещён и обновлён $head_name."
-#: git-rebase--preserve-merges.sh:757
+#: git-rebase--preserve-merges.sh:802
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "Не удалось удалить CHERRY_PICK_HEAD"
-#: git-rebase--preserve-merges.sh:762
+#: git-rebase--preserve-merges.sh:807
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
@@ -20829,43 +23231,43 @@
" git rebase --continue\n"
msgstr "У вас имеются проиндексированные изменения в рабочем каталоге.\nЕсли эти изменения должны быть объеденены с предыдущим коммитом, то запустите:\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:779
+#: git-rebase--preserve-merges.sh:824
msgid "Error trying to find the author identity to amend commit"
msgstr "Произошла ошибка при поиске автора для исправления коммита"
-#: git-rebase--preserve-merges.sh:784
+#: 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:789 git-rebase--preserve-merges.sh:793
+#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
msgid "Could not commit staged changes."
msgstr "Не удалось закоммитить проиндексированные изменения."
-#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
+#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
msgid "Could not execute editor"
msgstr "Не удалось запустить редактор"
-#: git-rebase--preserve-merges.sh:845
+#: git-rebase--preserve-merges.sh:890
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "Не удалось перейти на версию $switch_to"
-#: git-rebase--preserve-merges.sh:852
+#: git-rebase--preserve-merges.sh:897
msgid "No HEAD?"
msgstr "Нет указателя HEAD?"
-#: git-rebase--preserve-merges.sh:853
+#: git-rebase--preserve-merges.sh:898
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "Не удалось создать временный каталог $state_dir"
-#: git-rebase--preserve-merges.sh:856
+#: git-rebase--preserve-merges.sh:901
msgid "Could not mark as interactive"
msgstr "Не удалось пометить как интерактивный"
-#: git-rebase--preserve-merges.sh:888
+#: git-rebase--preserve-merges.sh:933
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
@@ -20874,7 +23276,11 @@
msgstr[2] "Перемещение $shortrevisions над $shortonto ($todocount команд)"
msgstr[3] "Перемещение $shortrevisions над $shortonto ($todocount команд)"
-#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
+#: 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 "Не удалось инициализировать перезаписанные коммиты"
@@ -20936,59 +23342,12 @@
msgstr "Не удалось определить абсолютный путь к каталогу git"
#. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:196
+#: git-add--interactive.perl:212
#, perl-format
msgid "%12s %12s %s"
msgstr "%12s %12s %s"
-#: git-add--interactive.perl:197
-msgid "staged"
-msgstr "в индексе"
-
-#: git-add--interactive.perl:197
-msgid "unstaged"
-msgstr "не в индексе"
-
-#: git-add--interactive.perl:253 git-add--interactive.perl:278
-msgid "binary"
-msgstr "двоичный"
-
-#: git-add--interactive.perl:262 git-add--interactive.perl:316
-msgid "nothing"
-msgstr "ничего"
-
-#: git-add--interactive.perl:298 git-add--interactive.perl:313
-msgid "unchanged"
-msgstr "нет изменений"
-
-#: git-add--interactive.perl:609
-#, perl-format
-msgid "added %d path\n"
-msgid_plural "added %d paths\n"
-msgstr[0] "добавлен %d путь\n"
-msgstr[1] "добавлено %d пути\n"
-msgstr[2] "добавлено %d путей\n"
-msgstr[3] "добавлено %d пути\n"
-
-#: git-add--interactive.perl:612
-#, perl-format
-msgid "updated %d path\n"
-msgid_plural "updated %d paths\n"
-msgstr[0] "обновлён %d путь\n"
-msgstr[1] "обновлено %d пути\n"
-msgstr[2] "обновлено %d путей\n"
-msgstr[3] "обновлено %d пути\n"
-
-#: git-add--interactive.perl:615
-#, perl-format
-msgid "reverted %d path\n"
-msgid_plural "reverted %d paths\n"
-msgstr[0] "обращены изменения %d пути\n"
-msgstr[1] "обращены изменения %d путей\n"
-msgstr[2] "обращены изменения %d путей\n"
-msgstr[3] "обращены изменения %d путей\n"
-
-#: git-add--interactive.perl:618
+#: git-add--interactive.perl:632
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
@@ -20997,67 +23356,44 @@
msgstr[2] "тронуты %d путей\n"
msgstr[3] "тронуты %d пути\n"
-#: git-add--interactive.perl:627
-msgid "Update"
-msgstr "Обновить"
-
-#: git-add--interactive.perl:639
-msgid "Revert"
-msgstr "Обратить изменения"
-
-#: git-add--interactive.perl:662
-#, perl-format
-msgid "note: %s is untracked now.\n"
-msgstr "примечание: %s теперь неотслеживаемый.\n"
-
-#: git-add--interactive.perl:673
-msgid "Add untracked"
-msgstr "Добавить неотслеживаемый"
-
-#: git-add--interactive.perl:679
-msgid "No untracked files.\n"
-msgstr "Нет неотслеживаемых файлов.\n"
-
-#: git-add--interactive.perl:1033
+#: git-add--interactive.perl:1056
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
msgstr "Если патч применяется без ошибок, то изменённый блок будет сразу помечен для индексирования."
-#: git-add--interactive.perl:1036
+#: git-add--interactive.perl:1059
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
msgstr "Если патч применяется без ошибок, то изменённый блок будет сразу помечен для прятанья."
-#: git-add--interactive.perl:1039
+#: git-add--interactive.perl:1062
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
msgstr "Если патч применяется без ошибок, то изменённый блок будет сразу помечен для убирания из индекса."
-#: git-add--interactive.perl:1042 git-add--interactive.perl:1051
+#: git-add--interactive.perl:1065 git-add--interactive.perl:1074
+#: git-add--interactive.perl:1080
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
msgstr "Если патч применяется без ошибок, то изменённый блок будет сразу помечен для применения."
-#: git-add--interactive.perl:1045 git-add--interactive.perl:1048
+#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
+#: git-add--interactive.perl:1077
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
msgstr "Если патч применяется без ошибок, то изменённый блок будет сразу помечен для отмены изменений."
-#: git-add--interactive.perl:1085
+#: git-add--interactive.perl:1114
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr "не удалось открыть файл редактирования блока изменений для записи: %s"
-#: git-add--interactive.perl:1086
-msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
-msgstr "Ручной режим редактирования блока изменений — смотрите ниже для небольшого руководства.\n"
-
-#: git-add--interactive.perl:1092
+#: git-add--interactive.perl:1121
#, perl-format
msgid ""
"---\n"
@@ -21066,32 +23402,12 @@
"Lines starting with %s will be removed.\n"
msgstr "---\nЧтобы удалить «%s» строки, сделайте их ' ' строками (контекст).\nЧтобы удалить «%s» строки, удалите их.\nСтроки, начинающиеся с %s будут удалены.\n"
-#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1100
-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и блок останется без изменений.\n"
-
-#: git-add--interactive.perl:1114
+#: git-add--interactive.perl:1143
#, 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:1213
-msgid ""
-"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]?"
-" "
-msgstr "Изменённый вами блок не применяется. Редактировать снова (ответ «y» означает «нет»!) [y/n]? "
-
-#: git-add--interactive.perl:1222
+#: git-add--interactive.perl:1251
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -21100,7 +23416,7 @@
"d - do not stage this hunk or any of the later hunks in the file"
msgstr "y - проиндексировать блок изменений\nn - не индексировать этот блок изменений\nq - выход; не индексировать этот и последующие блоки\na - проиндексировать этот и все последующие блоки файла\nd - не индексировать этот и последующие блоки файла"
-#: git-add--interactive.perl:1228
+#: git-add--interactive.perl:1257
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -21109,7 +23425,7 @@
"d - do not stash this hunk or any of the later hunks in the file"
msgstr "y - спрятать изменения блока\nq - выход; не прятать изменения этого и последующих блоков\na - спрятать этот и все последующие блоки файла\nd - не прятать этот и последующие блоки файла"
-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1263
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -21118,7 +23434,7 @@
"d - do not unstage this hunk or any of the later hunks in the file"
msgstr "y - убрать из индекса этот блок изменений\nn - не убирать из индекса этот блок изменений\nq - выход; не убирать из индекса этот и последующие блоки\na - убрать из индекса этот и все последующие блоки файла\nd - не убирать из индекса этот и последующие блоки файла"
-#: git-add--interactive.perl:1240
+#: git-add--interactive.perl:1269
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -21127,7 +23443,7 @@
"d - do not apply this hunk or any of the later hunks in the file"
msgstr "y - применить блок изменений к индексу\nn - не применять этот блок изменений к индексу\nq - выход; не применять этот и последующие блоки\na - применить этот блок и все последующие блоки файла\nd - не применять этот и последующие блоки файла"
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -21136,7 +23452,7 @@
"d - do not discard this hunk or any of the later hunks in the file"
msgstr "y - отменить изменения этого блока в рабочем каталоге\nn - не отменять изменения этого блока в рабочем каталоге\nq - выход; не отменять изменения этого блока и всех последующих\na - отменить изменения этого и всех последующих блоков файла\nd - не отменять изменения этого и всех последующих блоков файла"
-#: git-add--interactive.perl:1252
+#: git-add--interactive.perl:1281
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -21145,7 +23461,7 @@
"d - do not discard this hunk or any of the later hunks in the file"
msgstr "y - отменить изменения этого блока в индексе и рабочем каталоге\nn - не отменять изменения этого блока в индексе и рабочем каталоге\nq - выход; не отменять изменения этого блока и всех последующих\na - отменить изменения этого и всех последующих блоков файла\nd - не отменять изменения этого и всех последующих блоков файла"
-#: git-add--interactive.perl:1258
+#: git-add--interactive.perl:1287
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -21154,7 +23470,16 @@
"d - do not apply this hunk or any of the later hunks in the file"
msgstr "y - применить блок изменений к индексу и рабочему каталогу\nn - не применять этот блок изменений к индексу и рабочему каталогу\nq - выход; не применять этот и последующие блоки\na - применить этот блок и все последующие блоки файла\nd - не применять этот и последующие блоки файла"
-#: git-add--interactive.perl:1273
+#: git-add--interactive.perl:1299
+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 ""
+
+#: git-add--interactive.perl:1314
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -21167,158 +23492,45 @@
"? - print help\n"
msgstr "g - выбрать блок изменений на который нужно перейти\n/ - поиск блока изменений с помощью регулярного выражения\nj - не принимать решение по этому блоку, перейти на следующий без решения\nJ - не принимать решение по этому блоку, перейти на следующий\nk - не принимать решение по этому блоку, перейти на предыдущий без решения\nK - не принимать решение по этому блоку, перейти на предыдущий\ns - разделить текущий блок на блоки меньшего размера\ne - вручную отредактировать текущий блок\n? - вывести справку\n"
-#: git-add--interactive.perl:1304
+#: git-add--interactive.perl:1345
msgid "The selected hunks do not apply to the index!\n"
msgstr "Выбранные блоки не применяются без ошибок к индексу!\n"
-#: git-add--interactive.perl:1305
-msgid "Apply them to the worktree anyway? "
-msgstr "Все равно применить их к рабочему каталогу?"
-
-#: git-add--interactive.perl:1308
-msgid "Nothing was applied.\n"
-msgstr "Ничего не применено.\n"
-
-#: git-add--interactive.perl:1319
+#: git-add--interactive.perl:1360
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "игнорирую не слитое: %s\n"
-#: git-add--interactive.perl:1328
-msgid "Only binary files changed.\n"
-msgstr "Только изменения двоичных файлов.\n"
-
-#: git-add--interactive.perl:1330
-msgid "No changes.\n"
-msgstr "Нет изменений.\n"
-
-#: git-add--interactive.perl:1338
-msgid "Patch update"
-msgstr "Обновление патча"
-
-#: git-add--interactive.perl:1390
+#: git-add--interactive.perl:1479
#, perl-format
-msgid "Stage mode change [y,n,q,a,d%s,?]? "
-msgstr "Проиндексировать изменение режима доступа [y,n,q,a,d%s,?]? "
+msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
+msgstr ""
-#: git-add--interactive.perl:1391
+#: git-add--interactive.perl:1480
#, perl-format
-msgid "Stage deletion [y,n,q,a,d%s,?]? "
-msgstr "Проиндексировать удаление [y,n,q,a,d%s,?]? "
+msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
+msgstr ""
-#: git-add--interactive.perl:1392
+#: git-add--interactive.perl:1481
#, perl-format
-msgid "Stage this hunk [y,n,q,a,d%s,?]? "
-msgstr "Проиндексировать этот блок изменений [y,n,q,a,d%s,?]? "
+msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
+msgstr ""
-#: git-add--interactive.perl:1395
+#: git-add--interactive.perl:1482
#, perl-format
-msgid "Stash mode change [y,n,q,a,d%s,?]? "
-msgstr "Спрятать изменение режима доступа [y,n,q,a,d%s,?]? "
+msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
+msgstr ""
-#: git-add--interactive.perl:1396
-#, perl-format
-msgid "Stash deletion [y,n,q,a,d%s,?]? "
-msgstr "Спрятать удаление файла [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1397
-#, perl-format
-msgid "Stash this hunk [y,n,q,a,d%s,?]? "
-msgstr "Спрятать этот блок изменений [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1400
-#, perl-format
-msgid "Unstage mode change [y,n,q,a,d%s,?]? "
-msgstr "Убрать изменения режима доступа из индекса [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1401
-#, perl-format
-msgid "Unstage deletion [y,n,q,a,d%s,?]? "
-msgstr "Убрать удаление из индекса [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1402
-#, perl-format
-msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
-msgstr "Убрать из индекса этот блок измений [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1405
-#, 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:1406
-#, perl-format
-msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
-msgstr "Применить удаление к индексу [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1407
-#, 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:1410
-#, 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:1411
-#, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
-msgstr "Отменить удаление в рабочем каталоге [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1412
-#, 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:1415
-#, 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:1416
-#, 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:1417
-#, 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:1420
-#, 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:1421
-#, 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:1422
-#, 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:1522
+#: git-add--interactive.perl:1599
msgid "No other hunks to goto\n"
msgstr ""
-#: git-add--interactive.perl:1529
-msgid "go to which hunk (<ret> to see more)? "
-msgstr "на какой блок перейти (нажмите <ввод> чтобы увидеть еще)? "
-
-#: git-add--interactive.perl:1531
-msgid "go to which hunk? "
-msgstr "на какой блок перейти? "
-
-#: git-add--interactive.perl:1540
+#: git-add--interactive.perl:1617
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Неверный номер: «%s»\n"
-#: git-add--interactive.perl:1545
+#: git-add--interactive.perl:1622
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
@@ -21327,36 +23539,32 @@
msgstr[2] "Простите, но только %d блоков изменений доступно.\n"
msgstr[3] "Простите, но только %d блока изменений доступно.\n"
-#: git-add--interactive.perl:1571
+#: git-add--interactive.perl:1657
msgid "No other hunks to search\n"
msgstr ""
-#: git-add--interactive.perl:1575
-msgid "search for regex? "
-msgstr "искать с помощью регулярного выражения? "
-
-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1674
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Регулярное выражение для поиска в неверном формате %s: %s\n"
-#: git-add--interactive.perl:1598
+#: git-add--interactive.perl:1684
msgid "No hunk matches the given pattern\n"
msgstr "Не найдены блоки, которые соответствуют указанному шаблону\n"
-#: git-add--interactive.perl:1610 git-add--interactive.perl:1632
+#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
msgid "No previous hunk\n"
msgstr "Нет предыдущего блока\n"
-#: git-add--interactive.perl:1619 git-add--interactive.perl:1638
+#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
msgid "No next hunk\n"
msgstr "Не следующего блока\n"
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1730
msgid "Sorry, cannot split this hunk\n"
msgstr ""
-#: git-add--interactive.perl:1650
+#: git-add--interactive.perl:1736
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
@@ -21365,17 +23573,13 @@
msgstr[2] "Разбито на %d блоков изменений.\n"
msgstr[3] "Разбито на %d блока изменений.\n"
-#: git-add--interactive.perl:1660
+#: git-add--interactive.perl:1746
msgid "Sorry, cannot edit this hunk\n"
msgstr ""
-#: git-add--interactive.perl:1706
-msgid "Review diff"
-msgstr "Просмотреть изменения"
-
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1725
+#: git-add--interactive.perl:1811
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
@@ -21385,18 +23589,19 @@
"add untracked - add contents of untracked files to the staged set of changes\n"
msgstr "status - показать пути с изменениями\nupdate - добавить состояние рабочего каталога индекс\nrevert - вернуть проиндексированный набор изменений к HEAD версии\npatch - выбрать и выборочно обновить блоки\ndiff - просмотреть изменения между HEAD и индексом\nadd untracked - добавить содержимое неотслеживаемых файлов в индекс\n"
-#: git-add--interactive.perl:1742 git-add--interactive.perl:1747
-#: git-add--interactive.perl:1750 git-add--interactive.perl:1757
-#: git-add--interactive.perl:1761 git-add--interactive.perl:1767
+#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
+#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
+#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
+#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
msgid "missing --"
msgstr "отсутствует --"
-#: git-add--interactive.perl:1763
+#: git-add--interactive.perl:1866
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "неизвестный режим для --patch: %s"
-#: git-add--interactive.perl:1769 git-add--interactive.perl:1775
+#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "недопустимый аргумент %s, ожидается --"
@@ -21409,65 +23614,72 @@
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "локальный сдвиг времени больше или равен 24 часа\n"
-#: git-send-email.perl:219 git-send-email.perl:225
+#: git-send-email.perl:223 git-send-email.perl:229
msgid "the editor exited uncleanly, aborting everything"
msgstr "редактор был завершен с ошибкой, отменяю всё"
-#: git-send-email.perl:302
+#: 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:307
+#: git-send-email.perl:317
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "«%s.final» содержит подготовленное письмо.\n"
-#: git-send-email.perl:326
+#: git-send-email.perl:410
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases не совместимо с другими опциями\n"
-#: git-send-email.perl:395 git-send-email.perl:656
+#: 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 format-patch вне репозитория\n"
-#: git-send-email.perl:398
+#: 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:470
+#: git-send-email.perl:505
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Неизвестное поле --suppress-cc: «%s»\n"
-#: git-send-email.perl:501
+#: git-send-email.perl:536
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Неизвестный параметр --confirm: «%s»\n"
-#: git-send-email.perl:529
+#: 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:531
+#: git-send-email.perl:566
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "предупреждение: «:include:» не поддерживается: %s\n"
-#: git-send-email.perl:533
+#: 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:538
+#: git-send-email.perl:573
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "предупреждение: строка sendmail не распознана: %s\n"
-#: git-send-email.perl:622
+#: git-send-email.perl:657
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -21477,36 +23689,36 @@
" * Giving --format-patch option if you mean a range.\n"
msgstr "Файл «%s» существует, но это также может быть и\nдиапазоном коммитов для которых нужно сделать патчи. \nУстраните неоднозначность…\n\n * Указав \"./%s\" если вы имеете в виду имя файла; или\n * Передав опцию --format-patch если вы имеете в виду диапазон коммитов.\n"
-#: git-send-email.perl:643
+#: git-send-email.perl:678
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Не удалось выполнить opendir %s: %s"
-#: git-send-email.perl:667
+#: 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:678
+#: git-send-email.perl:713
msgid ""
"\n"
"No patch files specified!\n"
"\n"
msgstr "\nФайл с патчем не указан!\n\n"
-#: git-send-email.perl:691
+#: git-send-email.perl:726
#, perl-format
msgid "No subject line in %s?"
msgstr "Нет строки с темой в %s?"
-#: git-send-email.perl:701
+#: git-send-email.perl:736
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "Не удалось открыть для записи %s: %s"
-#: git-send-email.perl:712
+#: git-send-email.perl:747
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -21515,37 +23727,37 @@
"Clear the body content if you don't wish to send a summary.\n"
msgstr "Строки, начинающиеся с «GIT:» будут удалены.\nВозможно будет полезно включить статистику добавлений\nи удалений или таблицу содержимого к создаваемому патчу.\n\nОчистите содержимое, если вы не хотите отправлять письмо со сводкой изменений.\n"
-#: git-send-email.perl:736
+#: git-send-email.perl:771
#, perl-format
msgid "Failed to open %s: %s"
msgstr "Не удалось открыть %s: %s"
-#: git-send-email.perl:753
+#: git-send-email.perl:788
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "Не удалось открыть %s.final: %s"
-#: git-send-email.perl:796
+#: 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:831
+#: 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:886
+#: git-send-email.perl:921
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
msgstr "Следующие файлы 8 битные, но не содержат Content-Transfer-Encoding.\n"
-#: git-send-email.perl:891
+#: git-send-email.perl:926
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Какую 8 битную кодировку нужно указать [UTF-8]? "
-#: git-send-email.perl:899
+#: git-send-email.perl:934
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -21553,20 +23765,20 @@
"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:918
+#: git-send-email.perl:953
msgid "To whom should the emails be sent (if anyone)?"
msgstr "Кому должны быть отправлены письма (если нужно)?"
-#: git-send-email.perl:936
+#: git-send-email.perl:971
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "критическая ошибка: сокращение «%s» раскрывается само в себя\n"
-#: git-send-email.perl:948
+#: 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:1006 git-send-email.perl:1014
+#: 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"
@@ -21574,16 +23786,16 @@
#. 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:1018
+#: 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:1335
+#: git-send-email.perl:1370
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "путь CA «%s» не существует"
-#: git-send-email.perl:1418
+#: 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"
@@ -21600,128 +23812,128 @@
#. 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:1433
+#: 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:1436
+#: git-send-email.perl:1471
msgid "Send this email reply required"
msgstr "Отправка этого ответа на письмо обязательна"
-#: git-send-email.perl:1464
+#: git-send-email.perl:1499
msgid "The required SMTP server is not properly defined."
msgstr "Требуемый SMTP сервер не был правильно объявлен."
-#: git-send-email.perl:1511
+#: git-send-email.perl:1546
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Сервер не поддерживает STARTTLS! %s"
-#: git-send-email.perl:1516 git-send-email.perl:1520
+#: git-send-email.perl:1551 git-send-email.perl:1555
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "Ошибка STARTTLS! %s"
-#: git-send-email.perl:1529
+#: 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:1547
+#: git-send-email.perl:1582
#, perl-format
msgid "Failed to send %s\n"
msgstr "Не удалось отправить %s\n"
-#: git-send-email.perl:1550
+#: git-send-email.perl:1585
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Имитация отправки %s\n"
-#: git-send-email.perl:1550
+#: git-send-email.perl:1585
#, perl-format
msgid "Sent %s\n"
msgstr "Отправлено %s\n"
-#: git-send-email.perl:1552
+#: git-send-email.perl:1587
msgid "Dry-OK. Log says:\n"
msgstr "Имитация OK. Журнал содержит:\n"
-#: git-send-email.perl:1552
+#: git-send-email.perl:1587
msgid "OK. Log says:\n"
msgstr "OK. Журнал содержит:\n"
-#: git-send-email.perl:1564
+#: git-send-email.perl:1599
msgid "Result: "
msgstr "Результат: "
-#: git-send-email.perl:1567
+#: git-send-email.perl:1602
msgid "Result: OK\n"
msgstr "Результат: OK\n"
-#: git-send-email.perl:1585
+#: git-send-email.perl:1620
#, perl-format
msgid "can't open file %s"
msgstr "не удалось открыть файл %s"
-#: git-send-email.perl:1632 git-send-email.perl:1652
+#: 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:1638
+#: 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:1691
+#: 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:1726
+#: 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:1837
+#: git-send-email.perl:1876
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Не удалось выполнить «%s»"
-#: git-send-email.perl:1844
+#: 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:1848
+#: git-send-email.perl:1887
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) не удалось закрыть поток к «%s»"
-#: git-send-email.perl:1878
+#: git-send-email.perl:1917
msgid "cannot send message as 7bit"
msgstr "не удалось отправить сообщение в 7 битной кодировке"
-#: git-send-email.perl:1886
+#: git-send-email.perl:1925
msgid "invalid transfer encoding"
msgstr "недопустимая кодировка передачи"
-#: git-send-email.perl:1927 git-send-email.perl:1979 git-send-email.perl:1989
+#: 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:1930
+#: git-send-email.perl:1969
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr "%s: патч содержит строку длиннее чем 998 символов"
-#: git-send-email.perl:1947
+#: 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:1951
+#: git-send-email.perl:1990
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
-msgstr "Вы действительно хотите отправить %s? [y - да|N - нет]: "
+msgstr "Вы действительно хотите отправить %s? [y] - да, [N] - нет: "
diff --git a/po/sv.po b/po/sv.po
index 06a586a..7270bae 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,14 +1,14 @@
# Swedish translations for Git.
-# Copyright (C) 2010-2020 Peter Krefting <peter@softwolves.pp.se>
+# Copyright (C) 2010-2021 Peter Krefting <peter@softwolves.pp.se>
# This file is distributed under the same license as the Git package.
-# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020.
+# Peter Krefting <peter@softwolves.pp.se>, 2010-2021.
#
msgid ""
msgstr ""
-"Project-Id-Version: git 2.26.0\n"
+"Project-Id-Version: git 2.31.0\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2020-03-11 15:26+0800\n"
-"PO-Revision-Date: 2020-03-17 18:30+0100\n"
+"POT-Creation-Date: 2021-03-04 22:41+0800\n"
+"PO-Revision-Date: 2021-03-04 19:06+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,234 +16,239 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Gtranslator 3.30.1\n"
-#: add-interactive.c:368
+#: add-interactive.c:376
#, c-format
msgid "Huh (%s)?"
msgstr "Vadå (%s)?"
-#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124
-#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687
-#: builtin/rebase.c:2086 builtin/rebase.c:2130
+#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292
+#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538
+#: builtin/rebase.c:1963
msgid "could not read index"
msgstr "kunde inte läsa indexet"
-#: add-interactive.c:576 git-add--interactive.perl:269
+#: add-interactive.c:584 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "binär"
-#: add-interactive.c:634 git-add--interactive.perl:278
+#: add-interactive.c:642 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "ingenting"
-#: add-interactive.c:635 git-add--interactive.perl:314
+#: add-interactive.c:643 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "oändrad"
-#: add-interactive.c:672 git-add--interactive.perl:643
+#: add-interactive.c:680 git-add--interactive.perl:641
msgid "Update"
msgstr "Uppdatera"
-#: add-interactive.c:689 add-interactive.c:877
+#: add-interactive.c:697 add-interactive.c:885
#, c-format
msgid "could not stage '%s'"
msgstr "kunde inte köa \"%s\""
-#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317
-#: builtin/rebase.c:899
+#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486
msgid "could not write index"
msgstr "kunde inte skriva indexet"
-#: add-interactive.c:698 git-add--interactive.perl:628
+#: add-interactive.c:706 git-add--interactive.perl:626
#, 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
+#: add-interactive.c:724 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "observera: %s spåras inte längre.\n"
-#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281
-#: builtin/reset.c:144
+#: add-interactive.c:729 apply.c:4125 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
+#: add-interactive.c:759 git-add--interactive.perl:653
msgid "Revert"
msgstr "Återställ"
-#: add-interactive.c:767
+#: add-interactive.c:775
msgid "Could not parse HEAD^{tree}"
msgstr "kunde inte tolka HEAD^{tree}"
-#: add-interactive.c:805 git-add--interactive.perl:631
+#: add-interactive.c:813 git-add--interactive.perl:629
#, 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
+#: add-interactive.c:864 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr "Inga ospårade filer.\n"
-#: add-interactive.c:860 git-add--interactive.perl:689
+#: add-interactive.c:868 git-add--interactive.perl:687
msgid "Add untracked"
msgstr "Lägg till ospårad"
-#: add-interactive.c:887 git-add--interactive.perl:625
+#: add-interactive.c:895 git-add--interactive.perl:623
#, 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
+#: add-interactive.c:925
#, c-format
msgid "ignoring unmerged: %s"
msgstr "ignorerar ej sammanslagen: %s"
-#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366
+#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369
#, c-format
msgid "Only binary files changed.\n"
msgstr "Endast binära filer ändrade.\n"
-#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368
+#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371
#, c-format
msgid "No changes.\n"
msgstr "Inga ändringar.\n"
-#: add-interactive.c:935 git-add--interactive.perl:1376
+#: add-interactive.c:943 git-add--interactive.perl:1379
msgid "Patch update"
msgstr "Uppdatera patch"
-#: add-interactive.c:974 git-add--interactive.perl:1754
+#: add-interactive.c:982 git-add--interactive.perl:1792
msgid "Review diff"
msgstr "Granska diff"
-#: add-interactive.c:1002
+#: add-interactive.c:1010
msgid "show paths with changes"
msgstr "visa sökvägar med ändringar"
-#: add-interactive.c:1004
+#: add-interactive.c:1012
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
+#: add-interactive.c:1014
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
+#: add-interactive.c:1016
msgid "pick hunks and update selectively"
msgstr "välj stycken och uppdatera selektivt"
-#: add-interactive.c:1010
+#: add-interactive.c:1018
msgid "view diff between HEAD and index"
msgstr "visa skillnad mellan HEAD och index"
-#: add-interactive.c:1012
+#: add-interactive.c:1020
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
+#: add-interactive.c:1028 add-interactive.c:1077
msgid "Prompt help:"
msgstr "Kommandoradshjälp:"
-#: add-interactive.c:1022
+#: add-interactive.c:1030
msgid "select a single item"
msgstr "markera en post"
-#: add-interactive.c:1024
+#: add-interactive.c:1032
msgid "select a range of items"
msgstr "markera intervall av poster"
-#: add-interactive.c:1026
+#: add-interactive.c:1034
msgid "select multiple ranges"
msgstr "markera flera intervall"
-#: add-interactive.c:1028 add-interactive.c:1073
+#: add-interactive.c:1036 add-interactive.c:1081
msgid "select item based on unique prefix"
msgstr "markera post baserad på unikt prefix"
-#: add-interactive.c:1030
+#: add-interactive.c:1038
msgid "unselect specified items"
msgstr "avmarkera angivna poster"
-#: add-interactive.c:1032
+#: add-interactive.c:1040
msgid "choose all items"
msgstr "välj alla poster"
-#: add-interactive.c:1034
+#: add-interactive.c:1042
msgid "(empty) finish selecting"
msgstr "(tomt) avsluta markering"
-#: add-interactive.c:1071
+#: add-interactive.c:1079
msgid "select a numbered item"
msgstr "markera en numrerad post"
-#: add-interactive.c:1075
+#: add-interactive.c:1083
msgid "(empty) select nothing"
msgstr "(tomt) markera ingenting"
-#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851
+#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
msgid "*** Commands ***"
msgstr "*** Kommandon ***"
-#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848
+#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
msgid "What now"
msgstr "Vad nu"
-#: add-interactive.c:1136 git-add--interactive.perl:213
+#: add-interactive.c:1144 git-add--interactive.perl:213
msgid "staged"
msgstr "köad"
-#: add-interactive.c:1136 git-add--interactive.perl:213
+#: add-interactive.c:1144 git-add--interactive.perl:213
msgid "unstaged"
msgstr "ej köad"
-#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251
-#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144
-#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409
-#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
-#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
-#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
+#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257
+#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124
+#: builtin/fetch.c:150 builtin/merge.c:285 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
+#: add-interactive.c:1151
msgid "could not refresh index"
msgstr "kunde inte uppdatera indexet"
-#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765
+#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803
#, c-format
msgid "Bye.\n"
msgstr "Hej då.\n"
-#: add-patch.c:33 git-add--interactive.perl:1428
+#: add-patch.c:34 git-add--interactive.perl:1431
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Köa ändrat läge [y,n,q,a,d%s,?]? "
-#: add-patch.c:34 git-add--interactive.perl:1429
+#: add-patch.c:35 git-add--interactive.perl:1432
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Köa borttagning [y,n,q,a,d%s,?]? "
-#: add-patch.c:35 git-add--interactive.perl:1430
+#: add-patch.c:36 git-add--interactive.perl:1433
+#, 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:1434
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "Köa stycket [y,n,q,a,d%s,?]? "
-#: add-patch.c:37
+#: add-patch.c:39
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"staging."
@@ -251,7 +256,7 @@
"Om patchen kan appliceras rent kommer det redigerade stycket att köas "
"omedelbart."
-#: add-patch.c:40
+#: add-patch.c:42
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -265,22 +270,27 @@
"a - köa stycket och alla följande i filen\n"
"d - köa inte stycket eller något av de följande i filen\n"
-#: add-patch.c:54 git-add--interactive.perl:1433
+#: add-patch.c:56 git-add--interactive.perl:1437
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Stash:a ändrat läge [y,n,q,a,d%s,?]? "
-#: add-patch.c:55 git-add--interactive.perl:1434
+#: add-patch.c:57 git-add--interactive.perl:1438
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Stash:a borttagning [y,n,q,a,d%s,?]? "
-#: add-patch.c:56 git-add--interactive.perl:1435
+#: add-patch.c:58 git-add--interactive.perl:1439
+#, 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:1440
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "Stash:a stycket [y,n,q,a,d%s,?]? "
-#: add-patch.c:58
+#: add-patch.c:61
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"stashing."
@@ -288,7 +298,7 @@
"Om patchen kan appliceras rent kommer det redigerade stycket att läggas till "
"i \"stash\" omedelbart."
-#: add-patch.c:61
+#: add-patch.c:64
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -302,22 +312,27 @@
"a - \"stash\":a stycket och alla följande i filen\n"
"d - \"stash\":a inte stycket eller något av de följande i filen\n"
-#: add-patch.c:77 git-add--interactive.perl:1438
+#: add-patch.c:80 git-add--interactive.perl:1443
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Ta bort ändrat läge från kön [y,n,q,a,d%s,?]? "
-#: add-patch.c:78 git-add--interactive.perl:1439
+#: add-patch.c:81 git-add--interactive.perl:1444
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Ta bort borttagning från kön [y,n,q,a,d%s,?]? "
-#: add-patch.c:79 git-add--interactive.perl:1440
+#: add-patch.c:82 git-add--interactive.perl:1445
+#, 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:1446
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "Ta bort stycket från kön [y,n,q,a,d%s,?]? "
-#: add-patch.c:81
+#: add-patch.c:85
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"unstaging."
@@ -325,7 +340,7 @@
"Om patchen kan appliceras rent kommer det redigerade stycket att tas bort "
"från kön omedelbart."
-#: add-patch.c:84
+#: add-patch.c:88
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -339,22 +354,27 @@
"a - ta bort stycket och alla följande i filen från kön\n"
"d - ta inte bort stycket eller något av de följande i filen från kön\n"
-#: add-patch.c:99 git-add--interactive.perl:1443
+#: add-patch.c:103 git-add--interactive.perl:1449
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "Applicera ändrat läge på indexet [y,n,q,a,d%s,?]? "
-#: add-patch.c:100 git-add--interactive.perl:1444
+#: add-patch.c:104 git-add--interactive.perl:1450
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Applicera borttagning på indexet [y,n,q,a,d%s,?]? "
-#: add-patch.c:101 git-add--interactive.perl:1445
+#: add-patch.c:105 git-add--interactive.perl:1451
+#, 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:1452
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "Applicera stycket på indexet [y,n,q,a,d%s,?]? "
-#: add-patch.c:103 add-patch.c:168 add-patch.c:211
+#: 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."
@@ -362,7 +382,7 @@
"Om patchen kan appliceras rent kommer det redigerade stycket att markeras "
"för applicering omedelbart."
-#: add-patch.c:106
+#: add-patch.c:111
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -376,25 +396,31 @@
"a - applicera stycket och alla följande i filen\n"
"d - applicera inte stycket eller något av de följande i filen\n"
-#: add-patch.c:121 git-add--interactive.perl:1448
-#: git-add--interactive.perl:1463
+#: add-patch.c:126 git-add--interactive.perl:1455
+#: git-add--interactive.perl:1473
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta ändrat läge från arbetskatalogen [y,n,q,a,d%s,?]? "
-#: add-patch.c:122 git-add--interactive.perl:1449
-#: git-add--interactive.perl:1464
+#: add-patch.c:127 git-add--interactive.perl:1456
+#: git-add--interactive.perl:1474
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta borttagning från arbetskatalogen [y,n,q,a,d%s,?]? "
-#: add-patch.c:123 git-add--interactive.perl:1450
-#: git-add--interactive.perl:1465
+#: add-patch.c:128 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
+#, 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:1458
+#: git-add--interactive.perl:1476
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta stycket från arbetskatalogen [y,n,q,a,d%s,?]? "
-#: add-patch.c:125 add-patch.c:147 add-patch.c:190
+#: 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."
@@ -402,7 +428,7 @@
"Om patchen kan appliceras rent kommer det redigerade stycket att markeras "
"för kasta omedelbart."
-#: add-patch.c:128 add-patch.c:193
+#: 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"
@@ -416,22 +442,27 @@
"a - förkasta stycket och alla följande i filen\n"
"d - förkasta inte stycket eller något av de följande i filen\n"
-#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta ändrat läge från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta borttagning från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#, 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:1464
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Kasta stycket från indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: add-patch.c:150
+#: 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"
@@ -445,22 +476,27 @@
"a - förkasta stycket och alla följande i filen\n"
"d - förkasta inte stycket eller något av de följande i filen\n"
-#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Applicera ändrat läge på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Applicera borttagning på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#, 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:1470
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Applicera stycket på indexet och arbetskatalogen [y,n,q,a,d%s,?]? "
-#: add-patch.c:171
+#: 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"
@@ -474,7 +510,7 @@
"a - applicera stycket och alla följande i filen\n"
"d - applicera inte stycket eller något av de följande i filen\n"
-#: add-patch.c:214
+#: add-patch.c:224
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -488,34 +524,34 @@
"a - applicera stycket och alla följande i filen\n"
"d - applicera inte stycket eller något av de följande i filen\n"
-#: add-patch.c:318
+#: add-patch.c:342
#, c-format
msgid "could not parse hunk header '%.*s'"
msgstr "kunde inte tolka styckehuvudet \"%.*s\""
-#: add-patch.c:337 add-patch.c:341
+#: 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:395
+#: add-patch.c:419
msgid "could not parse diff"
msgstr "kunde inte tolka diff"
-#: add-patch.c:414
+#: add-patch.c:438
msgid "could not parse colored diff"
msgstr "kunde inte tolka färgad diff"
-#: add-patch.c:428
+#: add-patch.c:452
#, c-format
msgid "failed to run '%s'"
msgstr "misslyckades att köra \"%s\""
-#: add-patch.c:587
+#: add-patch.c:611
msgid "mismatched output from interactive.diffFilter"
msgstr "omaka utdata från interactive.diffFilter"
-#: add-patch.c:588
+#: add-patch.c:612
msgid ""
"Your filter must maintain a one-to-one correspondence\n"
"between its input and output lines."
@@ -523,7 +559,7 @@
"Alla rader i indata måste ha en motsvarande rad i utdata från\n"
"ditt filter."
-#: add-patch.c:761
+#: add-patch.c:790
#, c-format
msgid ""
"expected context line #%d in\n"
@@ -532,7 +568,7 @@
"förväntade sammanhangsrad %d i\n"
"%.*s"
-#: add-patch.c:776
+#: add-patch.c:805
#, c-format
msgid ""
"hunks do not overlap:\n"
@@ -545,11 +581,11 @@
"\tavslutas inte med:\n"
"%.*s"
-#: add-patch.c:1052 git-add--interactive.perl:1112
+#: add-patch.c:1081 git-add--interactive.perl:1115
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "Manuellt styckeredigeringsläge -- se nederst för snabbguide.\n"
-#: add-patch.c:1056
+#: add-patch.c:1085
#, c-format
msgid ""
"---\n"
@@ -563,7 +599,7 @@
"Rader som börjar med %c kommer att tas bort.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1070 git-add--interactive.perl:1126
+#: add-patch.c:1099 git-add--interactive.perl:1129
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"
@@ -573,11 +609,11 @@
"redigera den igen. Om alla rader i ett stycke tas bort avbryts\n"
"redigeringen och stycket lämnas oförändrat.\n"
-#: add-patch.c:1103
+#: add-patch.c:1132
msgid "could not parse hunk header"
msgstr "kunde inte tolka styckehuvud"
-#: add-patch.c:1148
+#: add-patch.c:1177
msgid "'git apply --cached' failed"
msgstr "\"git apply --cached\" misslyckades"
@@ -593,26 +629,26 @@
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1218 git-add--interactive.perl:1239
+#: add-patch.c:1246 git-add--interactive.perl:1242
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
"Ditt redigerade stycke kan inte appliceras. Redigera igen (\"nej\" kastar!) "
"[y/n]? "
-#: add-patch.c:1261
+#: add-patch.c:1289
msgid "The selected hunks do not apply to the index!"
msgstr "Markerade stycken kan inte appliceras på indexet!"
-#: add-patch.c:1262 git-add--interactive.perl:1343
+#: add-patch.c:1290 git-add--interactive.perl:1346
msgid "Apply them to the worktree anyway? "
msgstr "Applicera dem på arbetskatalogen trots det? "
-#: add-patch.c:1269 git-add--interactive.perl:1346
+#: add-patch.c:1297 git-add--interactive.perl:1349
msgid "Nothing was applied.\n"
msgstr "Ingenting applicerades.\n"
-#: add-patch.c:1326
+#: add-patch.c:1354
msgid ""
"j - leave this hunk undecided, see next undecided hunk\n"
"J - leave this hunk undecided, see next hunk\n"
@@ -634,113 +670,122 @@
"e - redigera aktuellt stycke manuellt\n"
"? - visa hjälp\n"
-#: add-patch.c:1447 add-patch.c:1457
+#: add-patch.c:1516 add-patch.c:1526
msgid "No previous hunk"
msgstr "Inget föregående stycke"
-#: add-patch.c:1452 add-patch.c:1462
+#: add-patch.c:1521 add-patch.c:1531
msgid "No next hunk"
msgstr "Inget följande stycke"
-#: add-patch.c:1468
+#: add-patch.c:1537
msgid "No other hunks to goto"
msgstr "Inga andra stycken att gå till"
-#: add-patch.c:1479 git-add--interactive.perl:1577
+#: add-patch.c:1548 git-add--interactive.perl:1606
msgid "go to which hunk (<ret> to see more)? "
msgstr "gå till vilket stycke (<ret> för att se fler)? "
-#: add-patch.c:1480 git-add--interactive.perl:1579
+#: add-patch.c:1549 git-add--interactive.perl:1608
msgid "go to which hunk? "
msgstr "gå till vilket stycke? "
-#: add-patch.c:1491
+#: add-patch.c:1560
#, c-format
msgid "Invalid number: '%s'"
msgstr "Ogiltigt siffervärde: \"%s\""
-#: add-patch.c:1496
+#: add-patch.c:1565
#, c-format
msgid "Sorry, only %d hunk available."
msgid_plural "Sorry, only %d hunks available."
msgstr[0] "Beklagar, det finns bara %d stycke."
msgstr[1] "Beklagar, det finns bara %d stycken."
-#: add-patch.c:1505
+#: add-patch.c:1574
msgid "No other hunks to search"
msgstr "Inga andra stycken att söka efter"
-#: add-patch.c:1511 git-add--interactive.perl:1623
+#: add-patch.c:1580 git-add--interactive.perl:1661
msgid "search for regex? "
msgstr "sök efter reguljärt uttryck? "
-#: add-patch.c:1526
+#: add-patch.c:1595
#, c-format
msgid "Malformed search regexp %s: %s"
msgstr "Felaktigt format på reguljärt sökuttryck %s: %s"
-#: add-patch.c:1543
+#: add-patch.c:1612
msgid "No hunk matches the given pattern"
msgstr "Inga stycken motsvarar givet mönster"
-#: add-patch.c:1550
+#: add-patch.c:1619
msgid "Sorry, cannot split this hunk"
msgstr "Beklagar, kan inte dela stycket"
-#: add-patch.c:1554
+#: add-patch.c:1623
#, c-format
msgid "Split into %d hunks."
msgstr "Dela i %d stycken."
-#: add-patch.c:1558
+#: add-patch.c:1627
msgid "Sorry, cannot edit this hunk"
msgstr "Beklagar, kan inte redigera stycket"
-#: add-patch.c:1609
+#: add-patch.c:1679
msgid "'git apply' failed"
msgstr "\"git apply\" misslyckades"
-#: advice.c:115
+#: advice.c:143
+#, 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:159
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%stips: %.*s%s\n"
-#: advice.c:168
+#: advice.c:250
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
"Du kan inte utföra en cherry-pick eftersom du har filer som inte slagits "
"samman."
-#: advice.c:170
+#: advice.c:252
msgid "Committing is not possible because you have unmerged files."
msgstr ""
"Du kan inte utföra en incheckning eftersom du har filer som inte slagits "
"samman."
-#: advice.c:172
+#: advice.c:254
msgid "Merging is not possible because you have unmerged files."
msgstr ""
"Du kan inte utföra en sammanslagning eftersom du har filer som inte slagits "
"samman."
-#: advice.c:174
+#: advice.c:256
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
"Du kan inte utföra en \"pull\" eftersom du har filer som inte slagits samman."
-#: advice.c:176
+#: advice.c:258
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
"Du kan inte utföra en \"revert\" eftersom du har filer som inte slagits "
"samman."
-#: advice.c:178
+#: advice.c:260
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr ""
"Du kan inte utföra en \"%s\" eftersom du har filer som inte slagits samman."
-#: advice.c:186
+#: advice.c:268
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
@@ -748,23 +793,23 @@
"Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n"
"som lämpligt för att ange lösning och checka in."
-#: advice.c:194
+#: advice.c:276
msgid "Exiting because of an unresolved conflict."
msgstr "Avslutar på grund av olöst konflikgt."
-#: advice.c:199 builtin/merge.c:1335
+#: advice.c:281 builtin/merge.c:1370
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."
-#: advice.c:201
+#: advice.c:283
msgid "Please, commit your changes before merging."
msgstr "Checka in dina ändringar innan du utför sammanslagningen."
-#: advice.c:202
+#: advice.c:284
msgid "Exiting because of unfinished merge."
msgstr "Avslutar på grund av ofullbordad sammanslagning."
-#: advice.c:208
+#: advice.c:290
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -914,7 +959,7 @@
#: apply.c:1481
#, c-format
msgid "recount: unexpected line: %.*s"
-msgstr "recount: förväntade rad: %.*s"
+msgstr "recount: oväntad rad: %.*s"
#: apply.c:1550
#, c-format
@@ -1056,7 +1101,8 @@
msgid "cannot checkout %s"
msgstr "kan inte checka ut %s"
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:86 pack-revindex.c:213
+#: setup.c:308
#, c-format
msgid "failed to read %s"
msgstr "misslyckades läsa %s"
@@ -1076,7 +1122,7 @@
msgid "%s: does not exist in index"
msgstr "%s: finns inte i indexet"
-#: apply.c:3537 apply.c:3708
+#: apply.c:3537 apply.c:3708 apply.c:3952
#, c-format
msgid "%s: does not match index"
msgstr "%s: motsvarar inte indexet"
@@ -1126,315 +1172,359 @@
msgid "%s has type %o, expected %o"
msgstr "%s har typen %o, förväntade %o"
-#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856
-#: read-cache.c:1325
+#: apply.c: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:3936
+#: apply.c:3950
#, c-format
msgid "%s: already exists in index"
msgstr "%s: finns redan i indexet"
-#: apply.c:3939
+#: apply.c:3954
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: finns redan i arbetskatalogen"
-#: apply.c:3959
+#: apply.c:3974
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)"
-#: apply.c:3964
+#: apply.c:3979
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s"
-#: apply.c:3984
+#: apply.c:3999
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "den berörda filen \"%s\" är på andra sidan av en symbolisk länk"
-#: apply.c:3988
+#: apply.c:4003
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: patchen kan inte tillämpas"
-#: apply.c:4003
+#: apply.c:4018
#, c-format
msgid "Checking patch %s..."
msgstr "Kontrollerar patchen %s..."
-#: apply.c:4095
+#: apply.c:4110
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "sha1-informationen saknas eller är oanvändbar för undermodulen %s"
-#: apply.c:4102
+#: apply.c:4117
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "nytt läge för %s, som inte finns i nuvarande HEAD"
-#: apply.c:4105
+#: apply.c:4120
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1-informationen saknas eller är oanvändbar (%s)."
-#: apply.c:4114
+#: apply.c:4129
#, c-format
msgid "could not add %s to temporary index"
msgstr "kunde inte lägga till %s till temporärt index"
-#: apply.c:4124
+#: apply.c:4139
#, c-format
msgid "could not write temporary index to %s"
msgstr "kunde inte skriva temporärt index till %s"
-#: apply.c:4262
+#: apply.c:4277
#, c-format
msgid "unable to remove %s from index"
msgstr "kan inte ta bort %s från indexet"
-#: apply.c:4296
+#: apply.c:4311
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "trasig patch för undermodulen %s"
-#: apply.c:4302
+#: apply.c:4317
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "kan inte ta status på nyligen skapade filen \"%s\""
-#: apply.c:4310
+#: apply.c:4325
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s"
-#: apply.c:4316 apply.c:4461
+#: apply.c:4331 apply.c:4476
#, c-format
msgid "unable to add cache entry for %s"
msgstr "kan inte lägga till cachepost för %s"
-#: apply.c:4359
+#: apply.c:4374 builtin/bisect--helper.c:523
#, c-format
msgid "failed to write to '%s'"
msgstr "misslyckades skriva till \"%s\""
-#: apply.c:4363
+#: apply.c:4378
#, c-format
msgid "closing file '%s'"
msgstr "stänger filen \"%s\""
-#: apply.c:4433
+#: apply.c:4448
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "kan inte skriva filen \"%s\" läge %o"
-#: apply.c:4531
+#: apply.c:4546
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Tillämpade patchen %s rent."
-#: apply.c:4539
+#: apply.c:4554
msgid "internal error"
msgstr "internt fel"
-#: apply.c:4542
+#: apply.c:4557
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Tillämpade patchen %%s med %d refuserad..."
msgstr[1] "Tillämpade patchen %%s med %d refuserade..."
-#: apply.c:4553
+#: apply.c:4568
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "trunkerar .rej-filnamnet till %.*s.rej"
-#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201
+#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334
#, c-format
msgid "cannot open %s"
msgstr "kan inte öppna %s"
-#: apply.c:4575
+#: apply.c:4590
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Stycke %d tillämpades rent."
-#: apply.c:4579
+#: apply.c:4594
#, c-format
msgid "Rejected hunk #%d."
msgstr "Refuserar stycke %d."
-#: apply.c:4698
+#: apply.c:4718
#, c-format
msgid "Skipped patch '%s'."
msgstr "Ignorerar patch \"%s\"."
-#: apply.c:4706
+#: apply.c:4726
msgid "unrecognized input"
msgstr "indata känns inte igen"
-#: apply.c:4726
+#: apply.c:4746
msgid "unable to read index file"
msgstr "kan inte läsa indexfilen"
-#: apply.c:4883
+#: apply.c:4903
#, c-format
msgid "can't open patch '%s': %s"
msgstr "kan inte öppna patchen \"%s\": %s"
-#: apply.c:4910
+#: apply.c:4930
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "undertryckte %d fel i blanksteg"
msgstr[1] "undertryckte %d fel i blanksteg"
-#: apply.c:4916 apply.c:4931
+#: apply.c:4936 apply.c:4951
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d rad lägger till fel i blanksteg."
msgstr[1] "%d rader lägger till fel i blanksteg."
-#: apply.c:4924
+#: apply.c:4944
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "%d rad applicerade efter att ha rättat fel i blanksteg."
msgstr[1] "%d rader applicerade efter att ha rättat fel i blanksteg."
-#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406
+#: apply.c:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406
msgid "Unable to write new index file"
msgstr "Kunde inte skriva ny indexfil"
-#: apply.c:4968
+#: apply.c:4988
msgid "don't apply changes matching the given path"
msgstr "tillämpa inte ändringar som motsvarar given sökväg"
-#: apply.c:4971
+#: apply.c:4991
msgid "apply changes matching the given path"
msgstr "tillämpa ändringar som motsvarar given sökväg"
-#: apply.c:4973 builtin/am.c:2260
+#: apply.c:4993 builtin/am.c:2266
msgid "num"
msgstr "antal"
-#: apply.c:4974
+#: apply.c:4994
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar"
-#: apply.c:4977
+#: apply.c:4997
msgid "ignore additions made by the patch"
msgstr "ignorera tillägg gjorda av patchen"
-#: apply.c:4979
+#: apply.c:4999
msgid "instead of applying the patch, output diffstat for the input"
msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata"
-#: apply.c:4983
+#: apply.c:5003
msgid "show number of added and deleted lines in decimal notation"
msgstr "visa antal tillagda och borttagna rader decimalt"
-#: apply.c:4985
+#: apply.c:5005
msgid "instead of applying the patch, output a summary for the input"
msgstr "istället för att tillämpa patchen, skriv ut en summering av indata"
-#: apply.c:4987
+#: apply.c:5007
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas"
-#: apply.c:4989
+#: apply.c:5009
msgid "make sure the patch is applicable to the current index"
msgstr "se till att patchen kan tillämpas på aktuellt index"
-#: apply.c:4991
+#: apply.c:5011
msgid "mark new files with `git add --intent-to-add`"
msgstr "markera nya filer med \"git add --intent-to-add\""
-#: apply.c:4993
+#: apply.c:5013
msgid "apply a patch without touching the working tree"
msgstr "tillämpa en patch utan att röra arbetskatalogen"
-#: apply.c:4995
+#: apply.c:5015
msgid "accept a patch that touches outside the working area"
msgstr "godta en patch som rör filer utanför arbetskatalogen"
-#: apply.c:4998
+#: apply.c:5018
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "tillämpa också patchen (använd med --stat/--summary/--check)"
-#: apply.c:5000
+#: apply.c:5020
msgid "attempt three-way merge if a patch does not apply"
msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas"
-#: apply.c:5002
+#: apply.c:5022
msgid "build a temporary index based on embedded index information"
msgstr "bygg ett temporärt index baserat på inbyggd indexinformation"
-#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540
msgid "paths are separated with NUL character"
msgstr "sökvägar avdelas med NUL-tecken"
-#: apply.c:5007
+#: apply.c:5027
msgid "ensure at least <n> lines of context match"
msgstr "se till att åtminstone <n> rader sammanhang är lika"
-#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98
+#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98
#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3457 builtin/rebase.c:1508
+#: builtin/pack-objects.c:3577 builtin/rebase.c:1352
msgid "action"
msgstr "åtgärd"
-#: apply.c:5009
+#: apply.c:5029
msgid "detect new or modified lines that have whitespace errors"
msgstr "detektera nya eller ändrade rader som har fel i blanktecken"
-#: apply.c:5012 apply.c:5015
+#: apply.c:5032 apply.c:5035
msgid "ignore changes in whitespace when finding context"
msgstr "ignorera ändringar i blanktecken för sammanhang"
-#: apply.c:5018
+#: apply.c:5038
msgid "apply the patch in reverse"
msgstr "tillämpa patchen baklänges"
-#: apply.c:5020
+#: apply.c:5040
msgid "don't expect at least one line of context"
msgstr "förvänta inte minst en rad sammanhang"
-#: apply.c:5022
+#: apply.c:5042
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "lämna refuserade stycken i motsvarande *.rej-filer"
-#: apply.c:5024
+#: apply.c:5044
msgid "allow overlapping hunks"
msgstr "tillåt överlappande stycken"
-#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22
-#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774
-#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22
+#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757
+#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "var pratsam"
-#: apply.c:5027
+#: apply.c:5047
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"
-#: apply.c:5030
+#: apply.c:5050
msgid "do not trust the line counts in the hunk headers"
msgstr "lite inte på antalet linjer i styckehuvuden"
-#: apply.c:5032 builtin/am.c:2248
+#: apply.c:5052 builtin/am.c:2254
msgid "root"
msgstr "rot"
-#: apply.c:5033
+#: apply.c:5053
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:450
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr "kunde inte starta filtret \"%s\""
+
+#: archive-tar.c:453
+msgid "unable to redirect descriptor"
+msgstr "kan inte omdirigera handtag"
+
+#: archive-tar.c:460
+#, 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>...]"
@@ -1454,183 +1544,156 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <arkiv> [--exec <kmd>] --list"
-#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
-#, c-format
-msgid "pathspec '%s' did not match any files"
-msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer"
-
-#: archive.c:396
-#, c-format
-msgid "no such ref: %.*s"
-msgstr "ingen sådan referens: %.*s"
-
-#: archive.c:401
-#, c-format
-msgid "not a valid object name: %s"
-msgstr "objektnamnet är inte giltigt: %s"
-
-#: archive.c:414
-#, c-format
-msgid "not a tree object: %s"
-msgstr "inte ett trädobjekt: %s"
-
-#: archive.c:426
-msgid "current working directory is untracked"
-msgstr "aktuell arbetskatalog är inte spårad"
-
-#: archive.c:457
-msgid "fmt"
-msgstr "fmt"
-
-#: archive.c:457
-msgid "archive format"
-msgstr "arkivformat"
-
-#: archive.c:458 builtin/log.c:1653
-msgid "prefix"
-msgstr "prefix"
-
-#: archive.c:459
-msgid "prepend prefix to each pathname in the archive"
-msgstr "lägg till prefix till varje sökväg i arkivet"
-
-#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
-#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
-#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887
-#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
-#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
-#: parse-options.h:190
-msgid "file"
-msgstr "fil"
-
-#: archive.c:461 builtin/archive.c:90
-msgid "write the archive to this file"
-msgstr "skriv arkivet till filen"
-
-#: archive.c:463
-msgid "read .gitattributes in working directory"
-msgstr "läs .gitattributes i arbetskatalogen"
-
-#: archive.c:464
-msgid "report archived files on stderr"
-msgstr "rapportera arkiverade filer på standard fel"
-
-#: archive.c:465
-msgid "store only"
-msgstr "endast spara"
-
-#: archive.c:466
-msgid "compress faster"
-msgstr "komprimera snabbare"
-
-#: archive.c:474
-msgid "compress better"
-msgstr "komprimera bättre"
-
-#: archive.c:477
-msgid "list supported archive formats"
-msgstr "visa understödda arkivformat"
-
-#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
-#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
-msgid "repo"
-msgstr "arkiv"
-
-#: archive.c:480 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:715
-#: builtin/notes.c:498
-msgid "command"
-msgstr "kommando"
-
-#: archive.c:482 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
-msgid "Unexpected option --remote"
-msgstr "Oväntad flagga --remote"
-
-#: archive.c:491
-msgid "Option --exec can only be used together with --remote"
-msgstr "Flaggan --exec kan endast användas tillsammans med --remote"
-
-#: archive.c:493
-msgid "Unexpected option --output"
-msgstr "Oväntad flagga --output"
-
-#: archive.c:515
-#, c-format
-msgid "Unknown archive format '%s'"
-msgstr "Okänt arkivformat \"%s\""
-
-#: archive.c:522
-#, 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:351
-#, c-format
-msgid "cannot stream blob %s"
-msgstr "kan inte strömma blob:en %s"
-
-#: archive-tar.c:266 archive-zip.c:369
-#, c-format
-msgid "unsupported file mode: 0%o (SHA1: %s)"
-msgstr "filens läge stöds ej: 0%o (SHA1: %s)"
-
-#: archive-tar.c:293 archive-zip.c:359
+#: archive.c:192
#, c-format
msgid "cannot read %s"
msgstr "kan inte läsa %s"
-#: archive-tar.c:465
+#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894
+#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786
+#: builtin/merge.c:1139
#, c-format
-msgid "unable to start '%s' filter"
-msgstr "kunde inte starta filtret \"%s\""
+msgid "could not read '%s'"
+msgstr "kunde inte läsa \"%s\""
-#: archive-tar.c:468
-msgid "unable to redirect descriptor"
-msgstr "kan inte omdirigera handtag"
-
-#: archive-tar.c:475
+#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315
#, c-format
-msgid "'%s' filter reported error"
-msgstr "filtret \"%s\" rapporterade fel"
+msgid "pathspec '%s' did not match any files"
+msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer"
-#: archive-zip.c:319
+#: archive.c:454
#, c-format
-msgid "path is not valid UTF-8: %s"
-msgstr "sökvägen är inte giltig UTF-8: %s"
+msgid "no such ref: %.*s"
+msgstr "ingen sådan referens: %.*s"
-#: archive-zip.c:323
+#: archive.c:460
#, c-format
-msgid "path too long (%d chars, SHA1: %s): %s"
-msgstr "sökvägen för lång (%d tecken, SHA1: %s): %s"
+msgid "not a valid object name: %s"
+msgstr "objektnamnet är inte giltigt: %s"
-#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
+#: archive.c:473
#, c-format
-msgid "deflate error (%d)"
-msgstr "fel i deflate (%d)"
+msgid "not a tree object: %s"
+msgstr "inte ett trädobjekt: %s"
-#: archive-zip.c:615
+#: archive.c:485
+msgid "current working directory is untracked"
+msgstr "aktuell arbetskatalog är inte spårad"
+
+#: archive.c:526
#, c-format
-msgid "timestamp too large for this system: %<PRIuMAX>"
-msgstr "tidsstämpeln för stor för detta system: %<PRIuMAX>"
+msgid "File not found: %s"
+msgstr "Hittar inte filen: %s"
-#: attr.c:212
+#: archive.c:528
+#, c-format
+msgid "Not a regular file: %s"
+msgstr "Inte en vanlig fil: %s"
+
+#: archive.c:555
+msgid "fmt"
+msgstr "fmt"
+
+#: archive.c:555
+msgid "archive format"
+msgstr "arkivformat"
+
+#: archive.c:556 builtin/log.c:1764
+msgid "prefix"
+msgstr "prefix"
+
+#: archive.c:557
+msgid "prepend prefix to each pathname in the archive"
+msgstr "lägg till prefix till varje sökväg i arkivet"
+
+#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888
+#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
+#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
+#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105
+#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412
+#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190
+msgid "file"
+msgstr "fil"
+
+#: archive.c:559
+msgid "add untracked file to archive"
+msgstr "ta med ospårade filer i arkivet"
+
+#: archive.c:562 builtin/archive.c:90
+msgid "write the archive to this file"
+msgstr "skriv arkivet till filen"
+
+#: archive.c:564
+msgid "read .gitattributes in working directory"
+msgstr "läs .gitattributes i arbetskatalogen"
+
+#: archive.c:565
+msgid "report archived files on stderr"
+msgstr "rapportera arkiverade filer på standard fel"
+
+#: archive.c:567
+msgid "set compression level"
+msgstr "välj komprimeringsgrad"
+
+#: archive.c:570
+msgid "list supported archive formats"
+msgstr "visa understödda arkivformat"
+
+#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117
+#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
+msgid "repo"
+msgstr "arkiv"
+
+#: archive.c:573 builtin/archive.c:92
+msgid "retrieve the archive from remote repository <repo>"
+msgstr "hämta arkivet från fjärrarkivet <arkiv>"
+
+#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714
+#: builtin/notes.c:498
+msgid "command"
+msgstr "kommando"
+
+#: archive.c:575 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:582
+msgid "Unexpected option --remote"
+msgstr "Oväntad flagga --remote"
+
+#: archive.c:584
+msgid "Option --exec can only be used together with --remote"
+msgstr "Flaggan --exec kan endast användas tillsammans med --remote"
+
+#: archive.c:586
+msgid "Unexpected option --output"
+msgstr "Oväntad flagga --output"
+
+#: archive.c:588
+msgid "Options --add-file and --remote cannot be used together"
+msgstr "Flaggorna --add-file och --remote kan inte användas samtidigt"
+
+#: archive.c:610
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "Okänt arkivformat \"%s\""
+
+#: archive.c:619
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "Argumentet stöd inte för formatet \"%s\": -%d"
+
+#: attr.c:202
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%-*s är inte ett giltigt namn på attribut"
-#: attr.c:369
+#: attr.c:359
#, c-format
msgid "%s not allowed: %s:%d"
msgstr "%s inte tillåtet: %s:%d"
-#: attr.c:409
+#: attr.c:399
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -1638,22 +1701,22 @@
"Negativa mönster ignoreras i git-attribut\n"
"Använd '\\!' för att inleda med ett utropstecken."
-#: bisect.c:468
+#: bisect.c:489
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Felaktigt citerat innehåll i filen \"%s\": %s"
-#: bisect.c:678
+#: bisect.c:699
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Det finns inte mer att göra \"bisect\" på!\n"
-#: bisect.c:745
+#: bisect.c:766
#, c-format
msgid "Not a valid commit name %s"
msgstr "Namnet på incheckningen är inte giltigt: %s"
-#: bisect.c:770
+#: bisect.c:791
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1662,7 +1725,7 @@
"Sammanslagningsbasen %s är trasig.\n"
"Det betyder att felet har rättats mellan %s och [%s].\n"
-#: bisect.c:775
+#: bisect.c:796
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1671,7 +1734,7 @@
"Sammanslagningsbasen %s är ny.\n"
"Egenskapen har ändrats mellan %s och [%s].\n"
-#: bisect.c:780
+#: bisect.c:801
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1680,7 +1743,7 @@
"Sammanslagningsbasen %s är %s.\n"
"Det betyder att den första \"%s\" incheckningen är mellan %s och [%s].\n"
-#: bisect.c:788
+#: bisect.c:809
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1691,7 +1754,7 @@
"git bisect kan inte fungera korrekt i detta fall.\n"
"Kanske du skrev fel %s- och %s-revisioner?\n"
-#: bisect.c:801
+#: bisect.c:822
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1703,45 +1766,45 @@
"%s.\n"
"Vi fortsätter ändå."
-#: bisect.c:840
+#: bisect.c:861
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Bisect: en sammanslagningsbas måste testas\n"
-#: bisect.c:890
+#: bisect.c:911
#, c-format
msgid "a %s revision is needed"
msgstr "en %s-revision behövs"
-#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287
#, c-format
msgid "could not create file '%s'"
msgstr "kunde inte skapa filen \"%s\""
-#: bisect.c:966 builtin/merge.c:149
+#: bisect.c:987 builtin/merge.c:153
#, c-format
msgid "could not read file '%s'"
msgstr "kunde inte läsa filen \"%s\""
-#: bisect.c:997
+#: bisect.c:1027
msgid "reading bisect refs failed"
msgstr "misslyckades läsa bisect-referenser"
-#: bisect.c:1019
+#: bisect.c:1057
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s var både %s och %s\n"
-#: bisect.c:1028
+#: bisect.c:1066
#, c-format
msgid ""
"No testable commit found.\n"
-"Maybe you started with bad path parameters?\n"
+"Maybe you started with bad path arguments?\n"
msgstr ""
"Ingen testbar incheckning hittades.\n"
-"Kanske du startade med felaktiga sökvägsparametrar?\n"
+"Kanske du startade med felaktiga sökvägsargument?\n"
-#: bisect.c:1057
+#: bisect.c:1095
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1751,48 +1814,48 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1063
+#: bisect.c:1101
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[0] "Bisect: %d revision kvar att testa efter denna %s\n"
msgstr[1] "Bisect: %d revisioner kvar att testa efter denna %s\n"
-#: blame.c:2700
+#: blame.c:2777
msgid "--contents and --reverse do not blend well."
msgstr "--contents och --reverse fungerar inte så bra tillsammans."
-#: blame.c:2714
+#: blame.c:2791
msgid "cannot use --contents with final commit object name"
msgstr "kan inte använda --contents med namn på slutgiltigt incheckningsobjekt"
-#: blame.c:2735
+#: blame.c:2812
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
"--reverse och --first-parent tillsammans kräver att du anger senaste "
"incheckningen"
-#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006
-#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388
-#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215
-#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290
-#: builtin/shortlog.c:192
+#: blame.c:2821 bundle.c:213 ref-filter.c:2206 remote.c:2041 sequencer.c:2146
+#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411
+#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335
+#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410
+#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr "misslyckades skapa revisionstraversering"
-#: blame.c:2762
+#: blame.c:2839
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
"--reverse --first-parent tillsammans kräver ett intervall på första-förälder-"
"kedjan"
-#: blame.c:2773
+#: blame.c:2850
#, c-format
msgid "no such path %s in %s"
msgstr "sökvägen %s i %s finns inte"
-#: blame.c:2784
+#: blame.c:2861
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "kan inte läsa objektet %s för sökvägen %s"
@@ -1930,114 +1993,406 @@
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:2258 sequencer.c:3016
-#: builtin/commit.c:815
+#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184
+#: 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:273
+#: bundle.c:319
msgid "unable to dup bundle descriptor"
msgstr "kan inte duplicera pakethandtag"
-#: bundle.c:280
+#: bundle.c:326
msgid "Could not spawn pack-objects"
msgstr "Kunde inte starta pack-objects"
-#: bundle.c:291
+#: bundle.c:337
msgid "pack-objects died"
msgstr "pack-objects misslyckades"
-#: bundle.c:333
-msgid "rev-list died"
-msgstr "rev-list dog"
-
-#: bundle.c:382
+#: bundle.c:386
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "referensen \"%s\" exkluderas av argumenten till rev-list"
-#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306
+#: bundle.c:490
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr "version %d för paket (bundle) stöds ej"
+
+#: bundle.c:492
+#, 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:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396
#, c-format
msgid "unrecognized argument: %s"
msgstr "okänt argument: %s"
-#: bundle.c:469
+#: bundle.c:539
msgid "Refusing to create empty bundle."
msgstr "Vägrar skapa ett tomt paket (bundle)."
-#: bundle.c:479
+#: bundle.c:549
#, c-format
msgid "cannot create '%s'"
msgstr "kan inte skapa \"%s\""
-#: bundle.c:504
+#: bundle.c:574
msgid "index-pack died"
msgstr "index-pack dog"
+#: chunk-format.c:113
+msgid "terminating chunk id appears earlier than expected"
+msgstr "avslutande stycke-id förekommer tidigare än förväntat"
+
+#: chunk-format.c:122
+#, c-format
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr "felaktigt stycke-offset %<PRIx64> och %<PRIx64>"
+
+#: chunk-format.c:129
+#, c-format
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr "dubblerat stycke-ID %<PRIx32> upptäckt"
+
+#: chunk-format.c:143
+#, c-format
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr "avslutande stycke har id %<PRIx32> som inte är noll"
+
#: color.c:329
#, c-format
msgid "invalid color value: %.*s"
msgstr "felaktigt färgvärde: %.*s"
-#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403
-#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457
+#: commit-graph.c:197 midx.c:46
+msgid "invalid hash version"
+msgstr "felaktig hashnings-version"
+
+#: commit-graph.c:255
+msgid "commit-graph file is too small"
+msgstr "incheckningsgraffilen %s är för liten"
+
+#: commit-graph.c:348
+#, 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:355
+#, 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:362
+#, 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:379
+#, 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:472
+msgid "commit-graph has no base graphs chunk"
+msgstr "incheckningsgrafen har inga bas-graf-stycken"
+
+#: commit-graph.c:482
+msgid "commit-graph chain does not match"
+msgstr "incheckningsgrafens kedja stämmer inte"
+
+#: commit-graph.c:530
+#, 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:554
+msgid "unable to find all commit-graph files"
+msgstr "kan inte hitta alla incheckingsgraffiler"
+
+#: commit-graph.c:735 commit-graph.c:772
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig"
+
+#: commit-graph.c:756
+#, c-format
+msgid "could not find commit %s"
+msgstr "kunde inte hitta incheckningen %s"
+
+#: commit-graph.c:789
+msgid "commit-graph requires overflow generation data but has none"
+msgstr "incheckningsgraf kräver spillgenerationsdata, men har ingen"
+
+#: commit-graph.c:1065 builtin/am.c:1292
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "kunde inte tolka incheckningen %s"
+
+#: commit-graph.c:1327 builtin/pack-objects.c:2872
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "kunde inte hämta typ för objektet %s"
+
+#: commit-graph.c:1358
+msgid "Loading known commits in commit graph"
+msgstr "Läser in kända incheckningar i incheckningsgraf"
+
+#: commit-graph.c:1375
+msgid "Expanding reachable commits in commit graph"
+msgstr "Expanderar nåbara incheckningar i incheckningsgraf"
+
+#: commit-graph.c:1395
+msgid "Clearing commit marks in commit graph"
+msgstr "Rensar incheckningsmärken i incheckningsgraf"
+
+#: commit-graph.c:1414
+msgid "Computing commit graph topological levels"
+msgstr "Beräknar topografiska nivåer för incheckningsgraf"
+
+#: commit-graph.c:1467
+msgid "Computing commit graph generation numbers"
+msgstr "Beräknar generationsvärden för incheckningsgraf"
+
+#: commit-graph.c:1548
+msgid "Computing commit changed paths Bloom filters"
+msgstr "Beräknar Bloom-filter för sökvägar ändrade av incheckningen"
+
+#: commit-graph.c:1625
+msgid "Collecting referenced commits"
+msgstr "Samlar refererade incheckningar"
+
+#: commit-graph.c:1650
+#, 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:1663
+#, c-format
+msgid "error adding pack %s"
+msgstr "fel vid tillägg av paketet %s"
+
+#: commit-graph.c:1667
+#, c-format
+msgid "error opening index for %s"
+msgstr "fel vid öppning av indexet för %s"
+
+#: commit-graph.c:1704
+msgid "Finding commits for commit graph among packed objects"
+msgstr "Söker incheckningar för incheckingsgraf i packade objekt"
+
+#: commit-graph.c:1722
+msgid "Finding extra edges in commit graph"
+msgstr "Söker ytterligare kanter i incheckingsgraf"
+
+#: commit-graph.c:1771
+msgid "failed to write correct number of base graph ids"
+msgstr "kunde inte skriva korrekt antal bas-graf-id:n"
+
+#: commit-graph.c:1802 midx.c:794
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr "kunde inte skapa inledande kataloger för %s"
+
+#: commit-graph.c:1815
+msgid "unable to create temporary graph layer"
+msgstr "kan inte skapa temporärt graflager"
+
+#: commit-graph.c:1820
+#, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "kan inte justera delade behörigheter för \"%s\""
+
+#: commit-graph.c:1879
+#, 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:1915
+msgid "unable to open commit-graph chain file"
+msgstr "Kunde inte öppna incheckningsgrafkedjefilen"
+
+#: commit-graph.c:1931
+msgid "failed to rename base commit-graph file"
+msgstr "kunde inte byta namn på bas-incheckingsgraffilen"
+
+#: commit-graph.c:1951
+msgid "failed to rename temporary commit-graph file"
+msgstr "kunde inte byta namn på temporär incheckningsgraffil"
+
+#: commit-graph.c:2084
+msgid "Scanning merged commits"
+msgstr "Söker sammanslagna incheckningar"
+
+#: commit-graph.c:2128
+msgid "Merging commit-graph"
+msgstr "Slår ihop incheckningsgraf"
+
+#: commit-graph.c:2235
+msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
+msgstr ""
+"försöker skriva en incheckningsgraf, men \"core.commitGraph\" är inaktiverad"
+
+#: commit-graph.c:2342
+msgid "too many commits to write graph"
+msgstr "för många incheckningar för att skriva graf"
+
+#: commit-graph.c:2440
+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:2450
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr "incheckningsgrafen har felaktig OID-ordning: %s så %s"
+
+#: commit-graph.c:2460 commit-graph.c:2475
+#, 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:2467
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "kunde inte tolka incheckning %s från incheckningsgraf"
+
+#: commit-graph.c:2485
+msgid "Verifying commits in commit graph"
+msgstr "Bekräftar incheckningar i incheckningsgrafen"
+
+#: commit-graph.c:2500
+#, 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:2507
+#, 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:2517
+#, 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:2526
+#, 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:2540
+#, 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:2545
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr ""
+"incheckningsgrafen har generationsnummer noll för incheckningen %s, men icke-"
+"noll på annan plats"
+
+#: commit-graph.c:2549
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr ""
+"incheckningsgrafen har generationsnummer skilt från noll för incheckningen "
+"%s, men noll på annan plats"
+
+#: commit-graph.c:2566
+#, c-format
+msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
+msgstr ""
+"incheckningsgrafens generation för incheckningen %s är %<PRIuMAX> < "
+"%<PRIuMAX>"
+
+#: commit-graph.c:2572
+#, 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:2887 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr "kunde inte tolka %s"
-#: commit.c:53
+#: commit.c:54
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s är inte en incheckning!"
-#: commit.c:193
+#: commit.c:194
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -2057,29 +2412,29 @@
"Slå av detta meddelande genom att skriva\n"
"\"git config advice.graftFileDeprecated false\""
-#: commit.c:1153
+#: commit.c:1223
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"Incheckningen %s har en obetrodd GPG-signatur som påstås vara gjord av %s."
-#: commit.c:1157
+#: commit.c:1227
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
"Incheckningen %s har en felaktig GPG-signatur som påstås vara gjord av %s."
-#: commit.c:1160
+#: commit.c:1230
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Incheckning %s har inte någon GPG-signatur."
-#: commit.c:1163
+#: commit.c:1233
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n"
-#: commit.c:1417
+#: commit.c:1487
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
@@ -2089,274 +2444,11 @@
"Uppdatera det efter att ha rättat meddelandet, eller ändra variabeln\n"
"i18n.commitencoding till den teckenkodning som används i ditt projekt.\n"
-#: commit-graph.c:122
-msgid "commit-graph file is too small"
-msgstr "incheckningsgraffilen %s är för liten"
-
-#: commit-graph.c:189
-#, c-format
-msgid "commit-graph signature %X does not match signature %X"
-msgstr "incheckningsgrafens signatur %X stämmer inte med signaturen %X"
-
-#: commit-graph.c:196
-#, c-format
-msgid "commit-graph version %X does not match version %X"
-msgstr "incheckningsgrafens version %X stämmer inte med versionen %X"
-
-#: commit-graph.c:203
-#, c-format
-msgid "commit-graph hash version %X does not match version %X"
-msgstr "incheckningsgrafens hashversion %X stämmer inte med versionen %X"
-
-#: commit-graph.c:226
-msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
-msgstr ""
-"incheckningsgrafen saknar post i styckeuppslagningstabell; filen kan vara "
-"ofullständig"
-
-#: commit-graph.c:237
-#, c-format
-msgid "commit-graph improper chunk offset %08x%08x"
-msgstr "felaktigt offset för stycke %08x%08x i incheckningsgraffilen"
-
-#: commit-graph.c:280
-#, c-format
-msgid "commit-graph chunk id %08x appears multiple times"
-msgstr "incheckningsgrafens stycke-id %08x förekommer flera gånger"
-
-#: commit-graph.c:343
-msgid "commit-graph has no base graphs chunk"
-msgstr "incheckningsgrafen har inga bas-graf-stycken"
-
-#: commit-graph.c:353
-msgid "commit-graph chain does not match"
-msgstr "incheckningsgrafens kedja stämmer inte"
-
-#: commit-graph.c:401
-#, c-format
-msgid "invalid commit-graph chain: line '%s' not a hash"
-msgstr "ogiltig incheckingsgrafkedja: rad \"%s\" är inte ett hash-värde"
-
-#: commit-graph.c:425
-msgid "unable to find all commit-graph files"
-msgstr "kan inte hitta alla incheckingsgraffiler"
-
-#: commit-graph.c:558 commit-graph.c:618
-msgid "invalid commit position. commit-graph is likely corrupt"
-msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig"
-
-#: commit-graph.c:579
-#, c-format
-msgid "could not find commit %s"
-msgstr "kunde inte hitta incheckningen %s"
-
-#: commit-graph.c:852 builtin/am.c:1292
-#, c-format
-msgid "unable to parse commit %s"
-msgstr "kunde inte tolka incheckningen %s"
-
-#: commit-graph.c:1011 builtin/pack-objects.c:2782
-#, c-format
-msgid "unable to get type of object %s"
-msgstr "kunde inte hämta typ för objektet %s"
-
-#: commit-graph.c:1043
-msgid "Loading known commits in commit graph"
-msgstr "Läser in kända incheckningar i incheckningsgraf"
-
-#: commit-graph.c:1060
-msgid "Expanding reachable commits in commit graph"
-msgstr "Expanderar nåbara incheckningar i incheckningsgraf"
-
-#: commit-graph.c:1079
-msgid "Clearing commit marks in commit graph"
-msgstr "Rensar incheckningsmärken i incheckningsgraf"
-
-#: commit-graph.c:1098
-msgid "Computing commit graph generation numbers"
-msgstr "Beräknar generationsvärden för incheckningsgraf"
-
-#: commit-graph.c:1173
-#, c-format
-msgid "Finding commits for commit graph in %d pack"
-msgid_plural "Finding commits for commit graph in %d packs"
-msgstr[0] "Söker incheckningar för incheckingsgraf i %d paket"
-msgstr[1] "Söker incheckningar för incheckingsgraf i %d paket"
-
-#: commit-graph.c:1186
-#, c-format
-msgid "error adding pack %s"
-msgstr "fel vid tillägg av paketet %s"
-
-#: commit-graph.c:1190
-#, c-format
-msgid "error opening index for %s"
-msgstr "fel vid öppning av indexet för %s"
-
-#: commit-graph.c:1214
-#, c-format
-msgid "Finding commits for commit graph from %d ref"
-msgid_plural "Finding commits for commit graph from %d refs"
-msgstr[0] "Söker incheckningar för incheckingsgraf från %d referens"
-msgstr[1] "Söker incheckningar för incheckingsgraf från %d referenser"
-
-#: commit-graph.c:1234
-#, c-format
-msgid "invalid commit object id: %s"
-msgstr "ogiltigt inchecknings-objekt-id %s"
-
-#: commit-graph.c:1249
-msgid "Finding commits for commit graph among packed objects"
-msgstr "Söker incheckningar för incheckingsgraf i packade objekt"
-
-#: commit-graph.c:1264
-msgid "Counting distinct commits in commit graph"
-msgstr "Räknar olika incheckningar i incheckningsgraf"
-
-#: commit-graph.c:1294
-msgid "Finding extra edges in commit graph"
-msgstr "Söker ytterligare kanter i incheckingsgraf"
-
-#: commit-graph.c:1340
-msgid "failed to write correct number of base graph ids"
-msgstr "kunde inte skriva korrekt antal bas-graf-id:n"
-
-#: commit-graph.c:1373 midx.c:814
-#, c-format
-msgid "unable to create leading directories of %s"
-msgstr "kunde inte skapa inledande kataloger för %s"
-
-#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248
-#, c-format
-msgid "unable to create '%s'"
-msgstr "kunde inte skapa \"%s\""
-
-#: commit-graph.c:1445
-#, c-format
-msgid "Writing out commit graph in %d pass"
-msgid_plural "Writing out commit graph in %d passes"
-msgstr[0] "Skriver ut incheckningsgraf i %d pass"
-msgstr[1] "Skriver ut incheckningsgraf i %d pass"
-
-#: commit-graph.c:1486
-msgid "unable to open commit-graph chain file"
-msgstr "Kunde inte öppna incheckningsgrafkedjefilen"
-
-#: commit-graph.c:1498
-msgid "failed to rename base commit-graph file"
-msgstr "kunde inte byta namn på bas-incheckingsgraffilen"
-
-#: commit-graph.c:1518
-msgid "failed to rename temporary commit-graph file"
-msgstr "kunde inte byta namn på temporär incheckningsgraffil"
-
-#: commit-graph.c:1631
-msgid "Scanning merged commits"
-msgstr "Söker sammanslagna incheckningar"
-
-#: commit-graph.c:1642
-#, c-format
-msgid "unexpected duplicate commit id %s"
-msgstr "oväntat duplicerat inchecknings-id %s"
-
-#: commit-graph.c:1665
-msgid "Merging commit-graph"
-msgstr "Slår ihop incheckningsgraf"
-
-#: commit-graph.c:1844
-#, c-format
-msgid "the commit graph format cannot write %d commits"
-msgstr "formatet på incheckningsgrafen kan inte visa %d incheckningar"
-
-#: commit-graph.c:1855
-msgid "too many commits to write graph"
-msgstr "för många incheckningar för att skriva graf"
-
-#: commit-graph.c:1944
-msgid "the commit-graph file has incorrect checksum and is likely corrupt"
-msgstr ""
-"filen med incheckningsgraf har felaktig checksumma och är troligtvis trasig"
-
-#: commit-graph.c:1954
-#, c-format
-msgid "commit-graph has incorrect OID order: %s then %s"
-msgstr "incheckningsgrafen har felaktig OID-ordning: %s så %s"
-
-#: commit-graph.c:1964 commit-graph.c:1979
-#, c-format
-msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
-msgstr ""
-"incheckningsgrafen har felaktig utbredningsvärde: fanout[%d] = %u != %u"
-
-#: commit-graph.c:1971
-#, c-format
-msgid "failed to parse commit %s from commit-graph"
-msgstr "kunde inte tolka incheckning %s från incheckningsgraf"
-
-#: commit-graph.c:1989
-msgid "Verifying commits in commit graph"
-msgstr "Bekräftar incheckningar i incheckningsgrafen"
-
-#: commit-graph.c:2003
-#, c-format
-msgid "failed to parse commit %s from object database for commit-graph"
-msgstr ""
-"misslyckades tolka incheckning %s från objektdatabasen för incheckningsgraf"
-
-#: commit-graph.c:2010
-#, c-format
-msgid "root tree OID for commit %s in commit-graph is %s != %s"
-msgstr "rot-trädets OID för incheckningen %s i incheckningsgrafen är %s != %s"
-
-#: commit-graph.c:2020
-#, c-format
-msgid "commit-graph parent list for commit %s is too long"
-msgstr "incheckningsgrafens föräldralista för incheckningen %s är för lång"
-
-#: commit-graph.c:2029
-#, c-format
-msgid "commit-graph parent for %s is %s != %s"
-msgstr "incheckningsgrafens förälder för %s är %s != %s"
-
-#: commit-graph.c:2042
-#, c-format
-msgid "commit-graph parent list for commit %s terminates early"
-msgstr ""
-"incheckningsgrafens föräldralista för incheckningen %s avslutas för tidigt"
-
-#: commit-graph.c:2047
-#, c-format
-msgid ""
-"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
-msgstr ""
-"incheckningsgrafen har generationsnummer noll för incheckningen %s, men icke-"
-"noll på annan plats"
-
-#: commit-graph.c:2051
-#, c-format
-msgid ""
-"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
-msgstr ""
-"incheckningsgrafen har generationsnummer skilt från noll för incheckningen "
-"%s, men noll på annan plats"
-
-#: commit-graph.c:2066
-#, c-format
-msgid "commit-graph generation for commit %s is %u != %u"
-msgstr "incheckningsgrafens generation för incheckningen %s är %u != %u"
-
-#: commit-graph.c:2072
-#, 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>"
-
#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "minnet slut"
-#: config.c:124
+#: config.c:126
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2371,296 +2463,340 @@
"\t%s\n"
"Det kan bero på cirkulära inkluderingar."
-#: config.c:140
+#: config.c:142
#, c-format
msgid "could not expand include path '%s'"
msgstr "kunde inte expandera inkluderingssökväg \"%s\""
-#: config.c:151
+#: config.c:153
msgid "relative config includes must come from files"
msgstr "relativa konfigureringsinkluderingar måste komma från filer"
-#: config.c:197
+#: config.c:199
msgid "relative config include conditionals must come from files"
msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer"
-#: config.c:376
+#: config.c:396
+#, c-format
+msgid "invalid config format: %s"
+msgstr "felaktigt konfigurationsformat: %s"
+
+#: config.c:400
+#, c-format
+msgid "missing environment variable name for configuration '%.*s'"
+msgstr "miljövariabelnamn saknas för konfigurationen \"%.*s\""
+
+#: config.c:405
+#, c-format
+msgid "missing environment variable '%s' for configuration '%.*s'"
+msgstr "miljövariabeln \"%s\" saknas för konfigurationen \"%.*s\""
+
+#: config.c:442
#, c-format
msgid "key does not contain a section: %s"
msgstr "nyckeln innehåller inte ett stycke: %s"
-#: config.c:382
+#: config.c:448
#, c-format
msgid "key does not contain variable name: %s"
msgstr "nyckeln innehåller inte variabelnamn: %s"
-#: config.c:406 sequencer.c:2444
+#: config.c:472 sequencer.c:2588
#, c-format
msgid "invalid key: %s"
msgstr "felaktig nyckel: %s"
-#: config.c:412
+#: config.c:478
#, c-format
msgid "invalid key (newline): %s"
msgstr "ogiltig nyckel (nyradstecken): %s"
-#: config.c:448 config.c:460
+#: config.c:511
+msgid "empty config key"
+msgstr "tom konfigurationsnyckel"
+
+#: config.c:529 config.c:541
#, c-format
msgid "bogus config parameter: %s"
msgstr "falsk konfigureringsparameter: %s"
-#: config.c:495
+#: config.c:555 config.c:572 config.c:579 config.c:588
#, c-format
msgid "bogus format in %s"
msgstr "felaktigt format i %s"
-#: config.c:821
+#: config.c:622
+#, c-format
+msgid "bogus count in %s"
+msgstr "felaktigt antal i %s"
+
+#: config.c:626
+#, c-format
+msgid "too many entries in %s"
+msgstr "för många poster i %s"
+
+#: config.c:636
+#, c-format
+msgid "missing config key %s"
+msgstr "konfigurationsnyckel saknas för %s"
+
+#: config.c:644
+#, c-format
+msgid "missing config value %s"
+msgstr "konfigurationsvärde saknas för %s"
+
+#: config.c:995
#, c-format
msgid "bad config line %d in blob %s"
msgstr "felaktig konfigurationsfil rad %d i blob:en %s"
-#: config.c:825
+#: config.c:999
#, c-format
msgid "bad config line %d in file %s"
msgstr "felaktig konfigurationsfil rad %d i filen %s"
-#: config.c:829
+#: config.c:1003
#, c-format
msgid "bad config line %d in standard input"
msgstr "felaktig konfigurationsfil rad %d i standard in"
-#: config.c:833
+#: config.c:1007
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s"
-#: config.c:837
+#: config.c:1011
#, c-format
msgid "bad config line %d in command line %s"
msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s"
-#: config.c:841
+#: config.c:1015
#, c-format
msgid "bad config line %d in %s"
msgstr "felaktig konfigurationsfil rad %d i %s"
-#: config.c:978
+#: config.c:1152
msgid "out of range"
msgstr "utanför intervallet"
-#: config.c:978
+#: config.c:1152
msgid "invalid unit"
msgstr "ogiltig enhet"
-#: config.c:979
+#: config.c:1153
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s"
-#: config.c:998
+#: config.c:1163
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i blob:en %s: %s"
-#: config.c:1001
+#: config.c:1166
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i filen %s: %s"
-#: config.c:1004
+#: config.c:1169
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i standard in: %s"
-#: config.c:1007
+#: config.c:1172
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i undermodul-blob:"
"en %s: %s"
-#: config.c:1010
+#: config.c:1175
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i kommandoraden "
"%s: %s"
-#: config.c:1013
+#: config.c:1178
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s"
-#: config.c:1108
+#: config.c:1194
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr "felaktigt booleskt konfigurationsvärde \"%s\" för \"%s\""
+
+#: config.c:1289
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "misslyckades expandera användarkatalog i: \"%s\""
-#: config.c:1117
+#: config.c:1298
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel"
-#: config.c:1208
+#: config.c:1391
#, c-format
msgid "abbrev length out of range: %d"
msgstr "förkortningslängd utanför intervallet: %d"
-#: config.c:1222 config.c:1233
+#: config.c:1405 config.c:1416
#, c-format
msgid "bad zlib compression level %d"
msgstr "felaktigt zlib-komprimeringsgrad %d"
-#: config.c:1325
+#: config.c:1508
msgid "core.commentChar should only be one character"
msgstr "core.commentChar kan bara vara ett tecken"
-#: config.c:1358
+#: config.c:1541
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "felaktigt läge för skapande av objekt: %s"
-#: config.c:1430
+#: config.c:1613
#, c-format
msgid "malformed value for %s"
msgstr "felformat värde för %s"
-#: config.c:1456
+#: config.c:1639
#, c-format
msgid "malformed value for %s: %s"
msgstr "felformat värde för %s: %s"
-#: config.c:1457
+#: config.c:1640
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "måste vara en av nothing, matching, simple, upstream eller current"
-#: config.c:1518 builtin/pack-objects.c:3541
+#: config.c:1701 builtin/pack-objects.c:3666
#, c-format
msgid "bad pack compression level %d"
msgstr "felaktig paketkomprimeringsgrad %d"
-#: config.c:1639
+#: config.c:1823
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "kunde inte läsa konfigurerings-blobobjektet \"%s\""
-#: config.c:1642
+#: config.c:1826
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "referensen \"%s\" pekar inte på en blob"
-#: config.c:1659
+#: config.c:1843
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "kan inte slå upp konfigurerings-bloben \"%s\""
-#: config.c:1689
+#: config.c:1873
#, c-format
msgid "failed to parse %s"
msgstr "kunde inte tolka %s"
-#: config.c:1743
+#: config.c:1927
msgid "unable to parse command-line config"
msgstr "kan inte tolka kommandoradskonfiguration"
-#: config.c:2097
+#: config.c:2290
msgid "unknown error occurred while reading the configuration files"
msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"
-#: config.c:2267
+#: config.c:2464
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Felaktigt %s: \"%s\""
-#: config.c:2312
+#: config.c:2509
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "värdet \"%d\" för splitIndex.maxPercentage borde vara mellan 0 och 100"
-#: config.c:2358
+#: config.c:2555
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration"
-#: config.c:2360
+#: config.c:2557
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d"
-#: config.c:2441
+#: config.c:2641
#, c-format
msgid "invalid section name '%s'"
msgstr "felaktigt sektionsnamn \"%s\""
-#: config.c:2473
+#: config.c:2673
#, c-format
msgid "%s has multiple values"
msgstr "%s har flera värden"
-#: config.c:2502
+#: config.c:2702
#, c-format
msgid "failed to write new configuration file %s"
msgstr "kan inte skriva nya konfigurationsfilen \"%s\""
-#: config.c:2754 config.c:3078
+#: config.c:2954 config.c:3280
#, c-format
msgid "could not lock config file %s"
msgstr "kunde inte låsa konfigurationsfilen %s"
-#: config.c:2765
+#: config.c:2965
#, c-format
msgid "opening %s"
msgstr "öppnar %s"
-#: config.c:2800 builtin/config.c:344
+#: config.c:3002 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "ogiltigt mönster: %s"
-#: config.c:2825
+#: config.c:3027
#, c-format
msgid "invalid config file %s"
msgstr "ogiltig konfigurationsfil: \"%s\""
-#: config.c:2838 config.c:3091
+#: config.c:3040 config.c:3293
#, c-format
msgid "fstat on %s failed"
msgstr "fstat misslyckades på %s"
-#: config.c:2849
+#: config.c:3051
#, c-format
msgid "unable to mmap '%s'"
msgstr "kunde inte utföra mmap på \"%s\""
-#: config.c:2858 config.c:3096
+#: config.c:3060 config.c:3298
#, c-format
msgid "chmod on %s failed"
msgstr "chmod misslyckades på %s"
-#: config.c:2943 config.c:3193
+#: config.c:3145 config.c:3395
#, c-format
msgid "could not write config file %s"
msgstr "kunde inte skriva konfigurationsfilen %s"
-#: config.c:2977
+#: config.c:3179
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "kunde inte ställa in \"%s\" till \"%s\""
-#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
+#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
#, c-format
msgid "could not unset '%s'"
msgstr "kunde inte ta bort inställning för \"%s\""
-#: config.c:3069
+#: config.c:3271
#, c-format
msgid "invalid section name: %s"
msgstr "felaktigt namn på stycke: %s"
-#: config.c:3236
+#: config.c:3438
#, c-format
msgid "missing value for '%s'"
msgstr "värde saknas för \"%s\""
@@ -2686,72 +2822,81 @@
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:497
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr "okänt objektformat \"%s\" angavs av servern"
+
+#: connect.c:526
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "ogiltigt svar på ls-refs: %s"
-#: connect.c:445
+#: connect.c:530
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:533
+msgid "expected response end packet after ref listing"
+msgstr "förväntade svarsavslutningspaket efter ref-listan"
+
+#: connect.c:666
#, c-format
msgid "protocol '%s' is not supported"
msgstr "protokollet \"%s\" stöds inte"
-#: connect.c:595
+#: connect.c:717
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:757 connect.c:820
#, c-format
msgid "Looking up %s ... "
msgstr "Slår upp %s..."
-#: connect.c:639
+#: connect.c:761
#, 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:765 connect.c:836
#, c-format
msgid ""
"done.\n"
@@ -2760,7 +2905,7 @@
"klart.\n"
"Ansluter till %s (port %s)..."
-#: connect.c:665 connect.c:742
+#: connect.c:787 connect.c:864
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -2770,75 +2915,79 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:671 connect.c:748
+#: connect.c:793 connect.c:870
msgid "done."
msgstr "klart."
-#: connect.c:702
+#: connect.c:824
#, c-format
msgid "unable to look up %s (%s)"
msgstr "kunde inte slå upp %s (%s)"
-#: connect.c:708
+#: connect.c:830
#, c-format
msgid "unknown port %s"
msgstr "okänd port %s"
-#: connect.c:845 connect.c:1175
+#: connect.c:967 connect.c:1299
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "konstigt värdnamn \"%s\" blockerat"
-#: connect.c:847
+#: connect.c:969
#, c-format
msgid "strange port '%s' blocked"
msgstr "konstig port \"%s\" blockerad"
-#: connect.c:857
+#: connect.c:979
#, c-format
msgid "cannot start proxy %s"
msgstr "kan inte starta mellanserver (proxy) %s"
-#: connect.c:928
+#: connect.c:1050
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr "ingen sökväg angavs; se \"git help pull\" för giltig URL-syntax"
-#: connect.c:1123
+#: connect.c:1190
+msgid "newline is forbidden in git:// hosts and repo paths"
+msgstr "radbrytningar är förbjudna i git://-värdnamn och arkivsökvägar"
+
+#: connect.c:1247
msgid "ssh variant 'simple' does not support -4"
msgstr "ssh-varianten \"simple\" stöder inte -4"
-#: connect.c:1135
+#: connect.c:1259
msgid "ssh variant 'simple' does not support -6"
msgstr "ssh-varianten \"simple\" stöder inte -6"
-#: connect.c:1152
+#: connect.c:1276
msgid "ssh variant 'simple' does not support setting port"
msgstr "ssh-varianten \"simple\" stöder inte val av port"
-#: connect.c:1264
+#: connect.c:1388
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "konstigt sökvägsnamn \"%s\" blockerat"
-#: connect.c:1311
+#: connect.c:1436
msgid "unable to fork"
msgstr "kunde inte grena (fork)"
# Vague original, not networking-related, but rather related to the actual
# objects in the database.
-#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43
+#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45
msgid "Checking connectivity"
msgstr "Kontrollerar konnektivitet"
-#: connected.c:110
+#: connected.c:120
msgid "Could not run 'git rev-list'"
msgstr "Kunde inte köra \"git rev-list\""
-#: connected.c:130
+#: connected.c:144
msgid "failed write to rev-list"
msgstr "kunde inte skriva till rev-list"
-#: connected.c:137
+#: connected.c:149
msgid "failed to close rev-list's stdin"
msgstr "kunde inte stänga rev-list:s standard in"
@@ -2914,40 +3063,40 @@
msgstr ""
"omkodning av \"%s\" från %s till %s och tillbaka ger inte samma resultat"
-#: convert.c:668
+#: 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:688
+#: 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:695
+#: convert.c:692
#, c-format
msgid "external filter '%s' failed %d"
msgstr "externt filter \"%s\" misslyckades %d"
-#: convert.c:730 convert.c:733
+#: 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:736 convert.c:791
+#: convert.c:733 convert.c:788
#, c-format
msgid "external filter '%s' failed"
msgstr "externt filter \"%s\" misslyckades"
-#: convert.c:839
+#: convert.c:837
msgid "unexpected filter type"
msgstr "oväntad filtertyp"
-#: convert.c:850
+#: 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:924
+#: convert.c:940
#, c-format
msgid ""
"external filter '%s' is not available anymore although not all paths have "
@@ -2956,20 +3105,48 @@
"externt filter \"%s\" är inte längre tillgängligt trots att alla sökvägar "
"inte har filtrerats"
-#: convert.c:1223
+#: convert.c:1240
msgid "true/false are no valid working-tree-encodings"
msgstr "true/false är inte giltig teckenkodning för arbetskatalogen"
-#: convert.c:1411 convert.c:1445
+#: convert.c:1428 convert.c:1462
#, c-format
msgid "%s: clean filter '%s' failed"
msgstr "%s: \"clean\"-filtret \"%s\" misslyckades"
-#: convert.c:1489
+#: convert.c:1508
#, c-format
msgid "%s: smudge filter %s failed"
msgstr "%s: \"smudge\"-filtret \"%s\" misslyckades"
+#: 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"
@@ -3062,14 +3239,30 @@
msgid "Marked %d islands, done.\n"
msgstr "Markerade %d öar, klar.\n"
-#: diffcore-order.c:24
+#: diff-merges.c:70
#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "kunde inte läsa orderfilen \"%s\""
+msgid "unknown value for --diff-merges: %s"
+msgstr "okänt värde för --diff-merges: %s"
-#: diffcore-rename.c:543
-msgid "Performing inexact rename detection"
-msgstr "Utför onöjaktig namnbytesdetektering"
+#: diff-lib.c:534
+msgid "--merge-base does not work with ranges"
+msgstr "--merge-base fungerar inte med intervall"
+
+#: diff-lib.c:536
+msgid "--merge-base only works with commits"
+msgstr "--merge-base fungerar bara med incheckningar"
+
+#: diff-lib.c:553
+msgid "unable to get HEAD"
+msgstr "kan inte hämta HEAD"
+
+#: diff-lib.c:560
+msgid "no merge base found"
+msgstr "ingen sammanslagningsbas hittades"
+
+#: diff-lib.c:562
+msgid "multiple merge bases found"
+msgstr "flera sammanslagningsbaser hittades"
#: diff-no-index.c:238
msgid "git diff --no-index [<options>] <path> <path>"
@@ -3083,17 +3276,17 @@
"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'"
@@ -3101,7 +3294,7 @@
"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', "
@@ -3111,7 +3304,7 @@
"\", \"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"
@@ -3119,12 +3312,12 @@
"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"
@@ -3133,35 +3326,35 @@
"Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"
"%s"
-#: diff.c:4202
+#: diff.c:4276
#, c-format
msgid "external diff died, stopping at %s"
msgstr "extern diff dog, stannar vid %s"
-#: diff.c:4547
+#: diff.c:4628
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande"
-#: diff.c:4550
+#: diff.c:4631
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G, -S och --find-object är ömsesidigt uteslutande"
-#: diff.c:4628
+#: diff.c:4710
msgid "--follow requires exactly one pathspec"
msgstr "--follow kräver exakt en sökvägsangivelse"
-#: diff.c:4676
+#: diff.c:4758
#, c-format
msgid "invalid --stat value: %s"
msgstr "ogiltigt värde för --stat: %s"
-#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
-#: parse-options.c:197 parse-options.c:201
+#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306
+#: 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:4713
+#: diff.c:4795
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3170,42 +3363,42 @@
"Misslyckades tolka argument till flaggan --dirstat/-X;\n"
"%s"
-#: diff.c:4798
+#: diff.c:4880
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "okänd ändringsklass \"%c\" i --diff-filter=%s"
-#: diff.c:4822
+#: diff.c:4904
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "okänt värde efter ws-error-highlight=%.*s"
-#: diff.c:4836
+#: diff.c:4918
#, c-format
msgid "unable to resolve '%s'"
msgstr "kunde inte slå upp \"%s\""
-#: diff.c:4886 diff.c:4892
+#: diff.c:4968 diff.c:4974
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s förväntar formen <n>/<m>"
-#: diff.c:4904
+#: diff.c:4986
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s förväntar ett tecken, fick \"%s\""
-#: diff.c:4925
+#: diff.c:5007
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "felaktigt argument till --color-moved: %s"
-#: diff.c:4944
+#: diff.c:5026
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "ogiltigt läge %s\" i --color-moved-ws"
-#: diff.c:4984
+#: diff.c:5066
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
@@ -3213,149 +3406,154 @@
"flaggan diff-algorithm godtar\"myers\", \"minimal\", \"patience\" och "
"\"histogram\""
-#: diff.c:5020 diff.c:5040
+#: diff.c:5102 diff.c:5122
#, c-format
msgid "invalid argument to %s"
msgstr "ogiltigt argument för %s"
-#: diff.c:5178
+#: diff.c:5226
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr "ogiltigt reguljärt uttryck angavs för -I: \"%s\""
+
+#: diff.c:5275
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "misslyckades tolka argument till flaggan --submodule: \"%s\""
-#: diff.c:5234
+#: diff.c:5331
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "felaktigt argument --word-diff: %s"
-#: diff.c:5257
+#: diff.c:5367
msgid "Diff output format options"
msgstr "Formatflaggor för diff-utdata"
-#: diff.c:5259 diff.c:5265
+#: diff.c:5369 diff.c:5375
msgid "generate patch"
msgstr "skapar patch"
-#: diff.c:5262 builtin/log.c:173
+#: diff.c:5372 builtin/log.c:179
msgid "suppress diff output"
msgstr "undertryck diff-utdata"
-#: diff.c:5267 diff.c:5381 diff.c:5388
+#: diff.c:5377 diff.c:5491 diff.c:5498
msgid "<n>"
msgstr "<n>"
-#: diff.c:5268 diff.c:5271
+#: diff.c:5378 diff.c:5381
msgid "generate diffs with <n> lines context"
msgstr "skapa diffar med <n> rader sammanhang"
-#: diff.c:5273
+#: diff.c:5383
msgid "generate the diff in raw format"
msgstr "generera diff i råformat"
-#: diff.c:5276
+#: diff.c:5386
msgid "synonym for '-p --raw'"
msgstr "synonym till \"-p --raw\""
-#: diff.c:5280
+#: diff.c:5390
msgid "synonym for '-p --stat'"
msgstr "synonym till \"-p --stat\""
-#: diff.c:5284
+#: diff.c:5394
msgid "machine friendly --stat"
msgstr "maskinläsbar --stat"
-#: diff.c:5287
+#: diff.c:5397
msgid "output only the last line of --stat"
msgstr "skriv bara ut den sista raden för --stat"
-#: diff.c:5289 diff.c:5297
+#: diff.c:5399 diff.c:5407
msgid "<param1,param2>..."
msgstr "<param1,param2>..."
-#: diff.c:5290
+#: diff.c:5400
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
"skriv ut distributionen av relativa mängder ändringar för varje underkatalog"
-#: diff.c:5294
+#: diff.c:5404
msgid "synonym for --dirstat=cumulative"
msgstr "synonym för --dirstat=cumulative"
-#: diff.c:5298
+#: diff.c:5408
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "synonym för --dirstat=filer,param1,param2..."
-#: diff.c:5302
+#: diff.c:5412
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr "varna om ändringar introducerar konfliktmarkörer eller blankstegsfel"
-#: diff.c:5305
+#: diff.c:5415
msgid "condensed summary such as creations, renames and mode changes"
msgstr "kortfattad summering såsom skapade, namnbyten och ändrade lägen"
-#: diff.c:5308
+#: diff.c:5418
msgid "show only names of changed files"
msgstr "visa endast namnen på ändrade filer"
-#: diff.c:5311
+#: diff.c:5421
msgid "show only names and status of changed files"
msgstr "visa endast namn och status för ändrade filer"
-#: diff.c:5313
+#: diff.c:5423
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<bredd>[,<namn-bredd>[,<antal>]]"
-#: diff.c:5314
+#: diff.c:5424
msgid "generate diffstat"
msgstr "skapa diffstat"
-#: diff.c:5316 diff.c:5319 diff.c:5322
+#: diff.c:5426 diff.c:5429 diff.c:5432
msgid "<width>"
msgstr "<bredd>"
-#: diff.c:5317
+#: diff.c:5427
msgid "generate diffstat with a given width"
msgstr "generera en diffstat med given bredd"
-#: diff.c:5320
+#: diff.c:5430
msgid "generate diffstat with a given name width"
msgstr "generera en diffstat med given namnbredd"
-#: diff.c:5323
+#: diff.c:5433
msgid "generate diffstat with a given graph width"
msgstr "generera en diffstat med given grafbredd"
-#: diff.c:5325
+#: diff.c:5435
msgid "<count>"
msgstr "<antal>"
-#: diff.c:5326
+#: diff.c:5436
msgid "generate diffstat with limited lines"
msgstr "generera diffstat med begränsade rader"
-#: diff.c:5329
+#: diff.c:5439
msgid "generate compact summary in diffstat"
msgstr "skapa kompakt översikt i diffstat"
-#: diff.c:5332
+#: diff.c:5442
msgid "output a binary diff that can be applied"
msgstr "skapa en binärdiff som kan appliceras"
-#: diff.c:5335
+#: diff.c:5445
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
"visa fullständiga objektnamn i \"index\"-rader för läget både före och efter"
-#: diff.c:5337
+#: diff.c:5447
msgid "show colored diff"
msgstr "visa färgad diff"
-#: diff.c:5338
+#: diff.c:5448
msgid "<kind>"
msgstr "<typ>"
-#: diff.c:5339
+#: diff.c:5449
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
@@ -3363,7 +3561,7 @@
"ljusmarkera blankstegsfel i \"context\" (sammanhang), \"old\" (gamla) eller "
"\"new\" (nya) rader i diffen"
-#: diff.c:5342
+#: diff.c:5452
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3371,87 +3569,87 @@
"skriv inte om sökvägsnamn och använd NUL-tecken som fältseparerare i --raw "
"eller --numstat"
-#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457
+#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570
msgid "<prefix>"
msgstr "<prefix>"
-#: diff.c:5346
+#: diff.c:5456
msgid "show the given source prefix instead of \"a/\""
msgstr "visa givet källprefix istället för \"a/\""
-#: diff.c:5349
+#: diff.c:5459
msgid "show the given destination prefix instead of \"b/\""
msgstr "visa givet målprefix istället för \"b/\""
-#: diff.c:5352
+#: diff.c:5462
msgid "prepend an additional prefix to every line of output"
msgstr "lägg till ytterligare prefix på alla rader i utdata"
-#: diff.c:5355
+#: diff.c:5465
msgid "do not show any source or destination prefix"
msgstr "visa inte käll- eller målprefix"
-#: diff.c:5358
+#: diff.c:5468
msgid "show context between diff hunks up to the specified number of lines"
msgstr "visa sammnhang mellan diff-stycken upp till angivet antal rader"
-#: diff.c:5362 diff.c:5367 diff.c:5372
+#: diff.c:5472 diff.c:5477 diff.c:5482
msgid "<char>"
msgstr "<tecken>"
-#: diff.c:5363
+#: diff.c:5473
msgid "specify the character to indicate a new line instead of '+'"
msgstr "ange tecken för att ange ny rad istället för \"+\""
-#: diff.c:5368
+#: diff.c:5478
msgid "specify the character to indicate an old line instead of '-'"
msgstr "ange tecken för att ange gammal rad istället för \"-\""
-#: diff.c:5373
+#: diff.c:5483
msgid "specify the character to indicate a context instead of ' '"
msgstr "ange tecken för att ange sammanhang istället för \" \""
-#: diff.c:5376
+#: diff.c:5486
msgid "Diff rename options"
msgstr "Diff-namnbytesflaggor"
-#: diff.c:5377
+#: diff.c:5487
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5378
+#: diff.c:5488
msgid "break complete rewrite changes into pairs of delete and create"
msgstr "dela upp kompletta omskrivningar till ta bort och skapa-par"
-#: diff.c:5382
+#: diff.c:5492
msgid "detect renames"
msgstr "detektera namnändringar"
-#: diff.c:5386
+#: diff.c:5496
msgid "omit the preimage for deletes"
msgstr "ta bort för-version för borttagningar"
-#: diff.c:5389
+#: diff.c:5499
msgid "detect copies"
msgstr "detektera kopior"
-#: diff.c:5393
+#: diff.c:5503
msgid "use unmodified files as source to find copies"
msgstr "använd oförändrade som källa för att hitta kopior"
-#: diff.c:5395
+#: diff.c:5505
msgid "disable rename detection"
msgstr "inaktivera detektering av namnbyten"
-#: diff.c:5398
+#: diff.c:5508
msgid "use empty blobs as rename source"
msgstr "använd tomma blob:ar som namnändringskälla"
-#: diff.c:5400
+#: diff.c:5510
msgid "continue listing the history of a file beyond renames"
msgstr "fortsätt lista historiken för en fil bortom namnändringar"
-#: diff.c:5403
+#: diff.c:5513
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
@@ -3459,159 +3657,163 @@
"förhindra namnbyte/kopie-detektering om antalet namnbyten/kopior överskriver "
"given gräns"
-#: diff.c:5405
+#: diff.c:5515
msgid "Diff algorithm options"
msgstr "Alternativ för diff-algoritm"
-#: diff.c:5407
+#: diff.c:5517
msgid "produce the smallest possible diff"
msgstr "skapa minsta möjliga diff"
-#: diff.c:5410
+#: diff.c:5520
msgid "ignore whitespace when comparing lines"
msgstr "ignorera blanktecken vid radjämförelse"
-#: diff.c:5413
+#: diff.c:5523
msgid "ignore changes in amount of whitespace"
msgstr "ignorera ändringar i antal blanktecken vid radjämförelse"
-#: diff.c:5416
+#: diff.c:5526
msgid "ignore changes in whitespace at EOL"
msgstr "ignorera blanktecken vid radslut"
-#: diff.c:5419
+#: diff.c:5529
msgid "ignore carrier-return at the end of line"
msgstr "ignorera CR-tecken vid radslut"
-#: diff.c:5422
+#: diff.c:5532
msgid "ignore changes whose lines are all blank"
msgstr "ignorera ändringar i rader som är helt blanka"
-#: diff.c:5425
-msgid "heuristic to shift diff hunk boundaries for easy reading"
-msgstr "heuristik för att flytta diff-gränser för lättare läsning"
-
-#: diff.c:5428
-msgid "generate diff using the \"patience diff\" algorithm"
-msgstr "skapa diffar med algoritmen \"patience diff\""
-
-#: diff.c:5432
-msgid "generate diff using the \"histogram diff\" algorithm"
-msgstr "skapa diffar med algoritmen \"histogram diff\""
-
-#: diff.c:5434
-msgid "<algorithm>"
-msgstr "<algoritm>"
-
-#: diff.c:5435
-msgid "choose a diff algorithm"
-msgstr "välj en diff-algoritm"
-
-#: diff.c:5437
-msgid "<text>"
-msgstr "<text>"
-
-#: diff.c:5438
-msgid "generate diff using the \"anchored diff\" algorithm"
-msgstr "skapa diffar med algoritmen \"anchored diff\""
-
-#: diff.c:5440 diff.c:5449 diff.c:5452
-msgid "<mode>"
-msgstr "<läge>"
-
-#: diff.c:5441
-msgid "show word diff, using <mode> to delimit changed words"
-msgstr "visa orddiff, där <läge> avgränsar ändrade ord"
-
-#: diff.c:5443 diff.c:5446 diff.c:5491
+#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604
msgid "<regex>"
msgstr "<reguttr>"
-#: diff.c:5444
+#: diff.c:5535
+msgid "ignore changes whose all lines match <regex>"
+msgstr "ignorera ändringar där samtliga rader motsvarar <reguttr>"
+
+#: diff.c:5538
+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:5541
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr "skapa diffar med algoritmen \"patience diff\""
+
+#: diff.c:5545
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr "skapa diffar med algoritmen \"histogram diff\""
+
+#: diff.c:5547
+msgid "<algorithm>"
+msgstr "<algoritm>"
+
+#: diff.c:5548
+msgid "choose a diff algorithm"
+msgstr "välj en diff-algoritm"
+
+#: diff.c:5550
+msgid "<text>"
+msgstr "<text>"
+
+#: diff.c:5551
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr "skapa diffar med algoritmen \"anchored diff\""
+
+#: diff.c:5553 diff.c:5562 diff.c:5565
+msgid "<mode>"
+msgstr "<läge>"
+
+#: diff.c:5554
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr "visa orddiff, där <läge> avgränsar ändrade ord"
+
+#: diff.c:5557
msgid "use <regex> to decide what a word is"
msgstr "använd <reguttr> för att bestämma vad som är ett ord"
-#: diff.c:5447
+#: diff.c:5560
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "motsvarar --word-diff=color --word-diff-regex=<reguttr>"
-#: diff.c:5450
+#: diff.c:5563
msgid "moved lines of code are colored differently"
msgstr "flyttade kodrader färgas på annat sätt"
-#: diff.c:5453
+#: diff.c:5566
msgid "how white spaces are ignored in --color-moved"
msgstr "hur blanktecken ignoreras i --color-moved"
-#: diff.c:5456
+#: diff.c:5569
msgid "Other diff options"
msgstr "Andra diff-flaggor"
-#: diff.c:5458
+#: diff.c:5571
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
"vid start från underkatalog, uteslut ändringar utanför och visa relativa "
"sökvägar"
-#: diff.c:5462
+#: diff.c:5575
msgid "treat all files as text"
msgstr "hantera alla filer som text"
-#: diff.c:5464
+#: diff.c:5577
msgid "swap two inputs, reverse the diff"
msgstr "växla två indatafiler, vänd diffen"
-#: diff.c:5466
+#: diff.c:5579
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "avsluta med 1 vid ändringar, annars 0"
-#: diff.c:5468
+#: diff.c:5581
msgid "disable all output of the program"
msgstr "slå av alla utdata från programmet"
-#: diff.c:5470
+#: diff.c:5583
msgid "allow an external diff helper to be executed"
msgstr "tillåt köra en extern diff-hjälpare"
-#: diff.c:5472
+#: diff.c:5585
msgid "run external text conversion filters when comparing binary files"
msgstr "kör externt textkonverteringsfiler när binärfiler jämförs"
-#: diff.c:5474
+#: diff.c:5587
msgid "<when>"
msgstr "<när>"
-#: diff.c:5475
+#: diff.c:5588
msgid "ignore changes to submodules in the diff generation"
msgstr "ignorera ändringar i undermoduler när diffen skapas"
-#: diff.c:5478
+#: diff.c:5591
msgid "<format>"
msgstr "<format>"
-#: diff.c:5479
+#: diff.c:5592
msgid "specify how differences in submodules are shown"
msgstr "ange hur ändringar i undermoduler visas"
-#: diff.c:5483
+#: diff.c:5596
msgid "hide 'git add -N' entries from the index"
msgstr "dölj \"git add -N\"-poster från indexet"
-#: diff.c:5486
+#: diff.c:5599
msgid "treat 'git add -N' entries as real in the index"
msgstr "tolka \"git add -N\"-poster som äkta i indexet"
-#: diff.c:5488
+#: diff.c:5601
msgid "<string>"
msgstr "<sträng>"
-#: diff.c:5489
+#: diff.c:5602
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr "se efter ändringar som ändrar antalet förekomster av angiven sträng"
-#: diff.c:5492
+#: diff.c:5605
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
@@ -3619,139 +3821,165 @@
"se efter ändringar som ändrar antalet förekomster av angivet reguljärt "
"uttryck"
-#: diff.c:5495
+#: diff.c:5608
msgid "show all changes in the changeset with -S or -G"
msgstr "visa alla ändringar i ändringsuppsättningen med -S eller -G"
-#: diff.c:5498
+#: diff.c:5611
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "tolka <sträng> i -S som utökade POSIX-reguljära uttryck"
-#: diff.c:5501
+#: diff.c:5614
msgid "control the order in which files appear in the output"
msgstr "styr ordningen i vilken filer visas i utdata"
-#: diff.c:5502
+#: diff.c:5615 diff.c:5618
+msgid "<path>"
+msgstr "<sökväg>"
+
+#: diff.c:5616
+msgid "show the change in the specified path first"
+msgstr "visa ändringen i angiven sökväg först"
+
+#: diff.c:5619
+msgid "skip the output to the specified path"
+msgstr "hoppa över utdata fram till angiven sökväg"
+
+#: diff.c:5621
msgid "<object-id>"
msgstr "<objekt-id>"
-#: diff.c:5503
+#: diff.c:5622
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr "se efter ändringar som ändrar antalet förekomster av angivet objekt"
-#: diff.c:5505
+#: diff.c:5624
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5506
+#: diff.c:5625
msgid "select files by diff type"
msgstr "välj filter efter diff-typ"
-#: diff.c:5508
+#: diff.c:5627
msgid "<file>"
msgstr "<fil>"
-#: diff.c:5509
+#: diff.c:5628
msgid "Output to a specific file"
msgstr "Skriv utdata till en specifik fil"
-#: diff.c:6164
+#: diff.c:6285
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
"onöjaktig namnbytesdetektering utfördes inte på grund av för många filer."
-#: diff.c:6167
+#: diff.c:6288
msgid "only found copies from modified paths due to too many files."
msgstr "hittade bara kopior från ändrade sökvägar på grund av för många filer."
-#: diff.c:6170
+#: diff.c:6291
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr ""
"du kan sätta variabeln %s till åtminstone %d och försöka kommandot på nytt."
-#: dir.c:555
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "kunde inte läsa orderfilen \"%s\""
+
+#: diffcore-rename.c:786
+msgid "Performing inexact rename detection"
+msgstr "Utför onöjaktig namnbytesdetektering"
+
+#: diffcore-rotate.c:29
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr "Sökvägen \"%s\" finns inte i diffen"
+
+#: 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:695 dir.c:724 dir.c:737
+#: dir.c:718 dir.c:747 dir.c:760
#, c-format
msgid "unrecognized pattern: '%s'"
msgstr "okänt mönster: %s"
-#: dir.c:754 dir.c:768
+#: dir.c:777 dir.c:791
#, c-format
msgid "unrecognized negative pattern: '%s'"
msgstr "okänt negativt mönster: %s"
-#: dir.c:786
+#: 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:796
+#: dir.c:819
msgid "disabling cone pattern matching"
msgstr "inaktiverar konmönstermatchning"
-#: dir.c:1173
+#: dir.c:1198
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "kan inte använda %s som exkluderingsfil"
-#: dir.c:2144
+#: dir.c:2305
#, c-format
msgid "could not open directory '%s'"
msgstr "kunde inte öppna katalogen \"%s\""
-#: dir.c:2479
+#: dir.c:2605
msgid "failed to get kernel name and information"
msgstr "misslyckades hämta kärnans namn och information"
-#: dir.c:2603
+#: 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:3407
+#: dir.c:3534
#, c-format
msgid "index file corrupt in repo %s"
msgstr "indexfilen trasig i arkivet %s"
-#: dir.c:3452 dir.c:3457
+#: dir.c:3579 dir.c:3584
#, c-format
msgid "could not create directories for %s"
msgstr "kunde inte skapa kataloger för %s"
-#: dir.c:3486
+#: dir.c:3613
#, 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 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\""
-#: environment.c:149
+#: environment.c:152
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "felaktig git-namnrymdssökväg \"%s\""
-#: environment.c:331
+#: environment.c:335
#, c-format
msgid "could not set GIT_DIR to '%s'"
msgstr "kunde inte ställa in GIT_DIR till \"%s\""
@@ -3761,251 +3989,273 @@
msgid "too many args to run %s"
msgstr "för många flaggor för att köra %s"
-#: fetch-pack.c:150
+#: fetch-pack.c:177
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: förväntade grund lista"
-#: fetch-pack.c:153
+#: fetch-pack.c:180
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr "git fetch-pack: förväntade ett flush-paket efter grund lista"
-#: fetch-pack.c:164
+#: fetch-pack.c:191
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack: förväntade ACK/NAK, fick flush-paket"
-#: fetch-pack.c:184
+#: fetch-pack.c:211
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: förväntade ACK/NAK, fick \"%s\""
-#: fetch-pack.c:195
+#: fetch-pack.c:222
msgid "unable to write to remote"
msgstr "kunde inte skriva till fjärren"
-#: fetch-pack.c:257
+#: fetch-pack.c:283
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc kräver \"multi_ack_detailed\""
-#: fetch-pack.c:356 fetch-pack.c:1340
+#: fetch-pack.c:378 fetch-pack.c:1457
#, c-format
msgid "invalid shallow line: %s"
msgstr "ogiltig \"shallow\"-rad: %s"
-#: fetch-pack.c:362 fetch-pack.c:1346
+#: fetch-pack.c:384 fetch-pack.c:1463
#, c-format
msgid "invalid unshallow line: %s"
msgstr "ogiltig \"unshallow\"-rad: %s"
-#: fetch-pack.c:364 fetch-pack.c:1348
+#: fetch-pack.c:386 fetch-pack.c:1465
#, c-format
msgid "object not found: %s"
msgstr "objektet hittades inte: %s"
-#: fetch-pack.c:367 fetch-pack.c:1351
+#: fetch-pack.c:389 fetch-pack.c:1468
#, c-format
msgid "error in object: %s"
msgstr "fel i objekt: %s"
-#: fetch-pack.c:369 fetch-pack.c:1353
+#: fetch-pack.c:391 fetch-pack.c:1470
#, c-format
msgid "no shallow found: %s"
msgstr "ingen \"shallow\" hittades: %s"
-#: fetch-pack.c:372 fetch-pack.c:1357
+#: fetch-pack.c:394 fetch-pack.c:1474
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "förväntade shallow/unshallow, fick %s"
-#: fetch-pack.c:414
+#: fetch-pack.c:434
#, c-format
msgid "got %s %d %s"
msgstr "fick %s %d %s"
-#: fetch-pack.c:431
+#: fetch-pack.c:451
#, c-format
msgid "invalid commit %s"
msgstr "ogiltig incheckning %s"
-#: fetch-pack.c:462
+#: fetch-pack.c:482
msgid "giving up"
msgstr "ger upp"
-#: fetch-pack.c:475 progress.c:323
+#: fetch-pack.c:495 progress.c:339
msgid "done"
msgstr "klart"
-#: fetch-pack.c:487
+#: fetch-pack.c:507
#, c-format
msgid "got %s (%d) %s"
msgstr "fick %s (%d) %s"
-#: fetch-pack.c:533
+#: fetch-pack.c:543
#, c-format
msgid "Marking %s as complete"
msgstr "Markerar %s som komplett"
-#: fetch-pack.c:754
+#: fetch-pack.c:758
#, c-format
msgid "already have %s (%s)"
msgstr "har redan %s (%s)"
-#: fetch-pack.c:818
+#: fetch-pack.c:844
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare"
-#: fetch-pack.c:826
+#: fetch-pack.c:852
msgid "protocol error: bad pack header"
msgstr "protokollfel: felaktigt packhuvud"
-#: fetch-pack.c:900
+#: fetch-pack.c:946
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-patch: kunde inte grena av %s"
-#: fetch-pack.c:916
+#: fetch-pack.c:952
+msgid "fetch-pack: invalid index-pack output"
+msgstr "fetch-patch: ogiltig utdata från index-pack"
+
+#: fetch-pack.c:969
#, c-format
msgid "%s failed"
msgstr "%s misslyckades"
-#: fetch-pack.c:918
+#: fetch-pack.c:971
msgid "error in sideband demultiplexer"
msgstr "fel i sidbands-avmultiplexare"
-#: fetch-pack.c:965
+#: fetch-pack.c:1031
#, c-format
msgid "Server version is %.*s"
msgstr "Serverversionen är %.*s"
-#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985
-#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001
-#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017
-#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039
+#: fetch-pack.c:1039 fetch-pack.c:1045 fetch-pack.c:1048 fetch-pack.c:1054
+#: fetch-pack.c:1058 fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070
+#: fetch-pack.c:1074 fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086
+#: fetch-pack.c:1092 fetch-pack.c:1098 fetch-pack.c:1103 fetch-pack.c:1108
#, c-format
msgid "Server supports %s"
msgstr "Servern stöder %s"
-#: fetch-pack.c:972
+#: fetch-pack.c:1041
msgid "Server does not support shallow clients"
msgstr "Servern stöder inte klienter med grunda arkiv"
-#: fetch-pack.c:1032
+#: fetch-pack.c:1101
msgid "Server does not support --shallow-since"
msgstr "Servern stöder inte --shallow-since"
-#: fetch-pack.c:1037
+#: fetch-pack.c:1106
msgid "Server does not support --shallow-exclude"
msgstr "Servern stöder inte --shallow-exclude"
-#: fetch-pack.c:1041
+#: fetch-pack.c:1110
msgid "Server does not support --deepen"
msgstr "Servern stöder inte --deepen"
-#: fetch-pack.c:1058
+#: fetch-pack.c:1112
+msgid "Server does not support this repository's object format"
+msgstr "Servern stöder inte det här arkivets objektformat"
+
+#: fetch-pack.c:1125
msgid "no common commits"
msgstr "inga gemensamma incheckningar"
-#: fetch-pack.c:1070 fetch-pack.c:1536
+#: fetch-pack.c:1138 fetch-pack.c:1682
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-patch: hämtning misslyckades."
-#: fetch-pack.c:1209
+#: fetch-pack.c:1265
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "omaka algoritmer: klient %s; server %s"
+
+#: fetch-pack.c:1269
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "servern stöder inte algoritmen \"%s\""
+
+#: fetch-pack.c:1289
msgid "Server does not support shallow requests"
msgstr "Servern stöder inte grunda förfrågningar"
-#: fetch-pack.c:1216
+#: fetch-pack.c:1296
msgid "Server supports filter"
msgstr "Servern stöder filter"
-#: fetch-pack.c:1239
+#: fetch-pack.c:1335
msgid "unable to write request to remote"
msgstr "kunde inte skriva anrop till fjärren"
-#: fetch-pack.c:1257
+#: fetch-pack.c:1353
#, c-format
msgid "error reading section header '%s'"
msgstr "fel vid läsning av styckehuvudet \"%s\""
-#: fetch-pack.c:1263
+#: fetch-pack.c:1359
#, c-format
msgid "expected '%s', received '%s'"
msgstr "förväntade \"%s\", tog emot \"%s\""
-#: fetch-pack.c:1303
+#: fetch-pack.c:1420
#, c-format
msgid "unexpected acknowledgment line: '%s'"
-msgstr "förväntade bekräftelserad: \"%s\""
+msgstr "oväntad bekräftelserad: \"%s\""
-#: fetch-pack.c:1308
+#: fetch-pack.c:1425
#, c-format
msgid "error processing acks: %d"
msgstr "fel vid hantering av bekräftelser: %d"
-#: fetch-pack.c:1318
+#: fetch-pack.c:1435
msgid "expected packfile to be sent after 'ready'"
msgstr "väntade att paketfil skulle sändas efter \"ready\""
-#: fetch-pack.c:1320
+#: fetch-pack.c:1437
msgid "expected no other sections to be sent after no 'ready'"
msgstr ""
"väntade inte att några ytterligare sektioner skulle sändas efter \"ready\""
-#: fetch-pack.c:1362
+#: fetch-pack.c:1479
#, c-format
msgid "error processing shallow info: %d"
msgstr "fel vid hantering av grund (\"shallow\") info: %d"
-#: fetch-pack.c:1409
+#: fetch-pack.c:1526
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "förväntade wanted-ref, fick %s"
-#: fetch-pack.c:1414
+#: fetch-pack.c:1531
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "oväntad wanted-ref: \"%s\""
-#: fetch-pack.c:1419
+#: fetch-pack.c:1536
#, c-format
msgid "error processing wanted refs: %d"
msgstr "fel vid hantering av önskade referenser: %d"
-#: fetch-pack.c:1762
+#: fetch-pack.c:1566
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack: förväntade svarsavslutningspaket"
+
+#: fetch-pack.c:1960
msgid "no matching remote head"
msgstr "inget motsvarande fjärrhuvud"
-#: fetch-pack.c:1785 builtin/clone.c:689
+#: fetch-pack.c:1983 builtin/clone.c:693
msgid "remote did not send all necessary objects"
msgstr "fjärren sände inte alla nödvändiga objekt"
-#: fetch-pack.c:1812
+#: fetch-pack.c:2010
#, c-format
msgid "no such remote ref %s"
msgstr "ingen sådan fjärreferens: %s"
-#: fetch-pack.c:1815
+#: fetch-pack.c:2013
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Servern tillåter inte förfrågan om ej tillkännagivet objekt %s"
-#: gpg-interface.c:408
-msgid "gpg failed to sign the data"
-msgstr "gpg misslyckades signera data"
-
-#: gpg-interface.c:434
+#: gpg-interface.c:273
msgid "could not create temporary file"
msgstr "kunde inte skapa temporära fil"
-#: gpg-interface.c:437
+#: gpg-interface.c:276
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "misslyckades skriva fristående signatur till \"%s\""
+#: gpg-interface.c:470
+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:668
+#: grep.c:543
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
@@ -4013,18 +4263,18 @@
"angivet mönster innehåller NULL-byte (via -f <fil>). Detta stöds endast med -"
"P under PCRE v2"
-#: grep.c:2128
+#: grep.c:1906
#, c-format
msgid "'%s': unable to read %s"
msgstr "\"%s\" kunde inte läsa %s"
-#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82
+#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr "misslyckades ta status på \"%s\""
-#: grep.c:2156
+#: grep.c:1934
#, c-format
msgid "'%s': short read"
msgstr "\"%s\": kort läsning"
@@ -4081,41 +4331,41 @@
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:100
#, 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:527
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4124,32 +4374,32 @@
"\"%s\" verkar vara ett git-kommando, men vi kan inte\n"
"köra det. Kanske git-%s är trasigt?"
-#: help.c:655
+#: help.c:543 help.c:631
+#, 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:591
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:613
#, 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:618
#, 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:623
#, 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
-#, 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:635
msgid ""
"\n"
"The most similar command is"
@@ -4163,16 +4413,16 @@
"\n"
"Mest lika kommandon är"
-#: help.c:714
+#: help.c:675
msgid "git version [<options>]"
msgstr "git version [<flaggor>]"
-#: help.c:783
+#: help.c:730
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:787
+#: help.c:734
msgid ""
"\n"
"Did you mean this?"
@@ -4186,7 +4436,15 @@
"\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"
@@ -4212,39 +4470,79 @@
"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:635
+#: ident.c:454 builtin/commit.c:634
#, c-format
msgid "invalid date format: %s"
msgstr "felaktigt datumformat: %s"
+#: list-objects-filter-options.c:81
+msgid "expected 'tree:<depth>'"
+msgstr "förväntade \"tree:<djup>\""
+
+#: 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 "invalid filter-spec '%s'"
+msgstr "felaktig filterspecifikation: \"%s\""
+
+#: list-objects-filter-options.c:125
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr "måste använda specialsekvens i delfilter-spec: \"%c\""
+
+#: list-objects-filter-options.c: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: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.c:492
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "kunde inte nå gles blob på \"%s\""
+
+#: list-objects-filter.c:495
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "kunde inte tolka gles filterdata i %s"
+
#: list-objects.c:127
#, c-format
msgid "entry '%s' in tree %s has tree mode, but is not a tree"
@@ -4260,43 +4558,7 @@
msgid "unable to load root tree for commit %s"
msgstr "kunde inte läsa in rot-trädet för incheckningen %s"
-#: list-objects-filter.c:492
-#, c-format
-msgid "unable to access sparse blob in '%s'"
-msgstr "kunde inte nå gles blob på \"%s\""
-
-#: list-objects-filter.c:495
-#, c-format
-msgid "unable to parse sparse filter data in %s"
-msgstr "kunde inte tolka gles filterdata i %s"
-
-#: list-objects-filter-options.c:58
-msgid "expected 'tree:<depth>'"
-msgstr "förväntade \"tree:<djup>\""
-
-#: list-objects-filter-options.c:73
-msgid "sparse:path filters support has been dropped"
-msgstr "sparse:sökväg-filter stöds inte längre"
-
-#: list-objects-filter-options.c:86
-#, c-format
-msgid "invalid filter-spec '%s'"
-msgstr "felaktig filterspecifikation: \"%s\""
-
-#: list-objects-filter-options.c:102
-#, c-format
-msgid "must escape char in sub-filter-spec: '%c'"
-msgstr "måste använda specialsekvens i delfilter-spec: \"%c\""
-
-#: list-objects-filter-options.c:144
-msgid "expected something after combine:"
-msgstr "förväntade någonting efter combine:"
-
-#: list-objects-filter-options.c:226
-msgid "multiple filter-specs cannot be combined"
-msgstr "flera filterspecifikationer kan inte kombineras"
-
-#: lockfile.c:151
+#: lockfile.c:152
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
@@ -4316,20 +4578,268 @@
"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:37
+#, c-format
+msgid "invalid value '%s' for lsrefs.unborn"
+msgstr "ogiltigt värde \"%s\" för lsrefs.unborn"
-#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913
-#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810
-#: builtin/stash.c:265
-msgid "unable to write new index file"
-msgstr "kunde inte skriva ny indexfil"
+#: ls-refs.c:167
+msgid "expected flush after ls-refs arguments"
+msgstr "förväntade \"flush\" efter ls-refs-argument"
+
+#: merge-ort.c:888 merge-recursive.c:1191
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)"
+
+#: merge-ort.c:897 merge-recursive.c:1198
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)"
+
+#: merge-ort.c:906 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-ort.c:916 merge-ort.c:923
+#, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr "Obs: Snabbspolar undermodulen %s till %s"
+
+#: merge-ort.c:944
+#, c-format
+msgid "Failed to merge submodule %s"
+msgstr "Misslyckades slå ihop undermodulen %s"
+
+#: merge-ort.c:951
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but a possible merge resolution exists:\n"
+"%s\n"
+msgstr ""
+"Misslyckades slå ihop undermodulen %s, men en möjlig lösning finns:\n"
+"%s\n"
+
+#: merge-ort.c:955 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 ""
+"Om detta är riktigt lägger du bara till det i indexet, till\n"
+"exempel så här:\n"
+"\n"
+" git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"vilket godtar lösningen.\n"
+
+#: merge-ort.c:968
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but multiple possible merges exist:\n"
+"%s"
+msgstr ""
+"Misslyckades slå ihop undermodulen %s, men flera möjliga sammanslagningar "
+"finns:\n"
+"%s"
+
+#: merge-ort.c:1127 merge-recursive.c:1341
+msgid "Failed to execute internal merge"
+msgstr "Misslyckades exekvera intern sammanslagning"
+
+#: merge-ort.c:1132 merge-recursive.c:1346
+#, c-format
+msgid "Unable to add %s to database"
+msgstr "Kunde inte lägga till %s till databasen"
+
+#: merge-ort.c:1139 merge-recursive.c:1378
+#, c-format
+msgid "Auto-merging %s"
+msgstr "Slår ihop %s automatiskt"
+
+#: merge-ort.c:1278 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 ""
+"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-ort.c:1288 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 ""
+"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-ort.c:1471
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
+"renamed to multiple other directories, with no destination getting a "
+"majority of the files."
+msgstr ""
+"KONFLIKT (namnändrad delad katalog): Osäker på var %s ska namnbytas till; "
+"den har namnbytts till flera andra kataloger, utan att någon destination "
+"fick en majoritet av filerna."
+
+#: merge-ort.c:1637 merge-recursive.c:2447
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr ""
+"VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har "
+"bytt namn."
+
+#: merge-ort.c:1781 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 ""
+"Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; "
+"flyttar den till %s."
+
+#: merge-ort.c:1788 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 ""
+"Uppdaterad sökväg: %s bytte namn till %s i %s, inuti en katalog som bytte "
+"namn i %s; flyttar den till %s."
+
+#: merge-ort.c:1801 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 ""
+"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-ort.c:1809 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 ""
+"KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som "
+"bytte namn i %s; flyttar den till %s."
+
+#: merge-ort.c:1952
+#, c-format
+msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
+msgstr ""
+"KONFLIKT (namnbyte/namnbyte): %s namnbytt till %s i %s och till %s i %s."
+
+#: merge-ort.c:2047
+#, c-format
+msgid ""
+"CONFLICT (rename involved in collision): rename of %s -> %s has content "
+"conflicts AND collides with another path; this may result in nested conflict "
+"markers."
+msgstr ""
+"KONFLIKT (namnbyte involverad i krock): namnbyte av %s -> %s har "
+"innehållskonflikter OCH krockar med en annan sökväg; detta kan leda till "
+"nästlade konfliktmarkörer."
+
+#: merge-ort.c:2066 merge-ort.c:2090
+#, c-format
+msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
+msgstr ""
+"KONFLIKT (namnbyte/radera): %s namnbytt till %s i %s, men borttagen i %s."
+
+#: merge-ort.c:2735
+#, c-format
+msgid ""
+"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
+"%s instead."
+msgstr ""
+"KONFLIKT (fil/katalog): katalogen är i vägen för %s från %s; flyttar den "
+"till %s istället."
+
+#: merge-ort.c:2808
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed %s "
+"of them so each can be recorded somewhere."
+msgstr ""
+"KONFLIKT (olika typer): %s hade olika typer på varje sida; namnbytte %s så "
+"att de kan protokollföras någonstans."
+
+#: merge-ort.c:2812
+msgid "both"
+msgstr "båda"
+
+#: merge-ort.c:2812
+msgid "one"
+msgstr "en"
+
+#: merge-ort.c:2907 merge-recursive.c:3052
+msgid "content"
+msgstr "innehåll"
+
+#: merge-ort.c:2909 merge-recursive.c:3056
+msgid "add/add"
+msgstr "tillägg/tillägg"
+
+#: merge-ort.c:2911 merge-recursive.c:3101
+msgid "submodule"
+msgstr "undermodul"
+
+#: merge-ort.c:2913 merge-recursive.c:3102
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"
+
+#: merge-ort.c:2938
+#, c-format
+msgid ""
+"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
+"of %s left in tree."
+msgstr ""
+"KONFLIKT (ändra/radera): %s raderad i %s och ändrad i %s. Versionen %s av %s "
+"lämnad i trädet."
+
+#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
+#. base, and 2-3) the trees for the two trees we're merging.
+#.
+#: merge-ort.c:3406
+#, c-format
+msgid "collecting merge info failed for trees %s, %s, %s"
+msgstr "samling av sammanslagningsinfo misslyckades för träden %s, %s, %s"
+
+#: merge-ort-wrappers.c:13 merge-recursive.c:3661
+#, 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-ort-wrappers.c:33 merge-recursive.c:3436
+#, c-format
+msgid "Already up to date!"
+msgstr "Redan à jour!"
#: merge-recursive.c:356
msgid "(bad commit)\n"
@@ -4392,23 +4902,6 @@
msgid "do not know what to do with %06o %s '%s'"
msgstr "vet inte hur %06o %s \"%s\" ska hanteras"
-#: 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:1198
-#, c-format
-msgid "Failed to merge submodule %s (commits not present)"
-msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)"
-
-#: 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:1213 merge-recursive.c:1225
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
@@ -4435,43 +4928,12 @@
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "Hittade en möjlig lösning av sammanslagning för undermodulen:\n"
-#: merge-recursive.c:1259
-#, 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 ""
-"Om detta är riktigt lägger du bara till det i indexet, till\n"
-"exempel så här:\n"
-"\n"
-" git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"vilket godtar lösningen.\n"
-
#: 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:1341
-msgid "Failed to execute internal merge"
-msgstr "Misslyckades exekvera intern sammanslagning"
-
-#: 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:1378
-#, c-format
-msgid "Auto-merging %s"
-msgstr "Slår ihop %s automatiskt"
-
#: merge-recursive.c:1402
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
@@ -4521,7 +4983,7 @@
msgid "renamed"
msgstr "namnbytt"
-#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117
+#: 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\""
@@ -4559,13 +5021,13 @@
msgid " (left unresolved)"
msgstr " (lämnad olöst)"
-#: merge-recursive.c:1793
+#: 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:2056
+#: merge-recursive.c:2068
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -4576,25 +5038,7 @@
"katalogen %s bytte namn till flera andra kataloger, utan att någon "
"destination fick en majoritet av filerna."
-#: merge-recursive.c:2088
-#, c-format
-msgid ""
-"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
-"implicit directory rename(s) putting the following path(s) there: %s."
-msgstr ""
-"KONFLIKT (implicit nämnändrad kat): Befintlig fil/kat vid %s är i vägen för "
-"implicit namnändrad(e) katalog(er) som lägger dit följande sökväg(ar): %s."
-
-#: merge-recursive.c:2098
-#, 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 ""
-"KONFLIKT (implicit namnändrad kat): Kan inte koppla mer än en sökväg till "
-"%s; implicita katalognamnändringar försökte lägga följande sökvägar där: %s"
-
-#: merge-recursive.c:2190
+#: merge-recursive.c:2202
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -4603,333 +5047,268 @@
"KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog "
"%s->%s i %s"
-#: merge-recursive.c:2435
-#, c-format
-msgid ""
-"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
-"renamed."
-msgstr ""
-"VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har "
-"bytt namn."
-
-#: merge-recursive.c:2961
+#: merge-recursive.c:2973
#, c-format
msgid "cannot read object %s"
msgstr "kan inte läsa objektet %s"
-#: merge-recursive.c:2964
+#: merge-recursive.c:2976
#, c-format
msgid "object %s is not a blob"
msgstr "objektet %s är inte en blob"
-#: merge-recursive.c:3028
+#: merge-recursive.c:3040
msgid "modify"
msgstr "ändra"
-#: merge-recursive.c:3028
+#: merge-recursive.c:3040
msgid "modified"
msgstr "ändrad"
-#: merge-recursive.c:3040
-msgid "content"
-msgstr "innehåll"
-
-#: merge-recursive.c:3044
-msgid "add/add"
-msgstr "tillägg/tillägg"
-
-#: merge-recursive.c:3067
+#: merge-recursive.c:3079
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Hoppade över %s (sammanslagen samma som befintlig)"
-#: merge-recursive.c:3089 git-submodule.sh:1003
-msgid "submodule"
-msgstr "undermodul"
-
-#: merge-recursive.c:3090
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"
-
-#: merge-recursive.c:3120
+#: merge-recursive.c:3132
#, c-format
msgid "Adding as %s instead"
msgstr "Lägger till som %s istället"
-#: merge-recursive.c:3203
-#, c-format
-msgid ""
-"Path updated: %s added in %s inside a directory that was renamed in %s; "
-"moving it to %s."
-msgstr ""
-"Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; "
-"flyttar den till %s."
-
-#: merge-recursive.c:3206
-#, c-format
-msgid ""
-"CONFLICT (file location): %s added in %s inside a directory that was renamed "
-"in %s, suggesting it should perhaps be moved to %s."
-msgstr ""
-"KONFLIKT (filplacering): %s lade till %s inuti en katalog som bytte namn i "
-"%s, föreslår att den bör flyttas till%s."
-
-#: merge-recursive.c:3210
-#, c-format
-msgid ""
-"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
-"%s; moving it to %s."
-msgstr ""
-"Uppdaterad sökväg: %s bytte namn till %s i %s, inuti en katalog som bytte "
-"namn i %s; flyttar den till %s."
-
-#: merge-recursive.c:3213
-#, 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 ""
-"KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som "
-"bytte namn i %s; flyttar den till %s."
-
-#: merge-recursive.c:3327
+#: merge-recursive.c:3339
#, c-format
msgid "Removing %s"
msgstr "Tar bort %s"
-#: merge-recursive.c:3350
+#: merge-recursive.c:3362
msgid "file/directory"
msgstr "fil/katalog"
-#: merge-recursive.c:3355
+#: merge-recursive.c:3367
msgid "directory/file"
msgstr "katalog/fil"
-#: merge-recursive.c:3362
+#: 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:3371
+#: merge-recursive.c:3383
#, c-format
msgid "Adding %s"
msgstr "Lägger till %s"
-#: merge-recursive.c:3380
+#: 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:3424
-msgid "Already up to date!"
-msgstr "Redan à jour!"
-
-#: merge-recursive.c:3433
+#: 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:3537
+#: merge-recursive.c:3539
msgid "Merging:"
msgstr "Slår ihop:"
-#: merge-recursive.c:3550
+#: merge-recursive.c:3552
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "hittade %u gemensam förfader:"
msgstr[1] "hittade %u gemensamma förfäder:"
-#: merge-recursive.c:3600
+#: merge-recursive.c:3602
msgid "merge returned no commit"
msgstr "sammanslagningen returnerade ingen incheckning"
-#: merge-recursive.c:3659
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-" %s"
-msgstr ""
-"Dina lokala ändringar av följande filer skulle skrivas över av "
-"sammanslagning:\n"
-" %s"
-
-#: merge-recursive.c:3756
+#: merge-recursive.c:3758
#, c-format
msgid "Could not parse object '%s'"
msgstr "Kunde inte tolka objektet \"%s\""
-#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877
+#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896
+#: builtin/stash.c:471
msgid "Unable to write index."
msgstr "Kunde inte skriva indexet."
-#: midx.c:68
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "misslyckades läsa cachen"
+
+#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917
+#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817
+#: builtin/stash.c:265
+msgid "unable to write new index file"
+msgstr "kunde inte skriva ny indexfil"
+
+#: midx.c:62
+msgid "multi-pack-index OID fanout is of the wrong size"
+msgstr "multi-pack-indexets OID-utbredning har fel storlek"
+
+#: midx.c:93
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "multi-pack-indexfilen %s är för liten"
-#: midx.c:84
+#: midx.c:109
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "multi-pack-indexsignaturen 0x%08x stämmer inte med signaturen 0x%08x"
-#: midx.c:89
+#: midx.c:114
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "multi-pack-indexversionen %d stöds inte"
-#: midx.c:94
+#: midx.c:119
#, 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:108
-msgid "invalid chunk offset (too large)"
-msgstr "felaktigt offset för stycke (för stort)"
-
-#: midx.c:132
-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"
-
-#: midx.c:145
+#: midx.c:136
msgid "multi-pack-index missing required pack-name chunk"
msgstr "multi-pack-index saknar krävd paketnamn-stycke"
-#: midx.c:147
+#: midx.c:138
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "multi-pack-index saknar krävt OID-utbredningsstycke"
-#: midx.c:149
+#: midx.c:140
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "multi-pack-index saknar krävt OID-uppslagnignsstycke"
-#: midx.c:151
+#: midx.c:142
msgid "multi-pack-index missing required object offsets chunk"
msgstr "multi-pack-index saknar krävt objekt-offsetstycke"
-#: midx.c:165
+#: midx.c:158
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "multi-pack-index-paketnamn i fel ordning: \"%s\" före \"%s\""
-#: midx.c:210
+#: midx.c:202
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "bad pack-int-id: %u (%u paket totalt)"
-#: midx.c:260
+#: midx.c:252
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr "multi-pack-index skriver 64-bitars offset, men off_t är för liten"
-#: midx.c:288
-msgid "error preparing packfile from multi-pack-index"
-msgstr "fel när paketfiler från multi-pack-index skulle förberedas"
-
-#: midx.c:472
+#: midx.c:467
#, c-format
msgid "failed to add packfile '%s'"
msgstr "misslyckades läsa paketfilen \"%s\""
-#: midx.c:478
+#: midx.c:473
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "misslyckades öppna paketindexet \"%s\""
-#: midx.c:538
+#: midx.c:533
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "misslyckades hitta objekt %d i paketfilen"
-#: midx.c:842
+#: midx.c:821
msgid "Adding packfiles to multi-pack-index"
msgstr "Lägger till paketfiler till multi-pack-index"
-#: midx.c:875
+#: midx.c:855
#, c-format
msgid "did not see pack-file %s to drop"
msgstr "såg inte paketfilen %s som skulle kastas"
-#: midx.c:973
-msgid "Writing chunks to multi-pack-index"
-msgstr "Skriver stycken till multi-pack-index"
+#: midx.c:904
+msgid "no pack files to index."
+msgstr "inga paketfiler att indexera."
-#: midx.c:1052
+#: midx.c:965
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "misslyckades städa multi-pack-index på %s"
-#: midx.c:1108
+#: midx.c:1021
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr "multi-pack-indexfilen finns, men kunde inte tolkas"
+
+#: midx.c:1029
msgid "Looking for referenced packfiles"
msgstr "Ser efter refererade packfiler"
-#: midx.c:1123
+#: midx.c:1044
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr ""
"oid-utbredning i fel ordning: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:1128
+#: midx.c:1049
+msgid "the midx contains no oid"
+msgstr "midx saknar oid"
+
+#: midx.c:1058
msgid "Verifying OID order in multi-pack-index"
msgstr "Bekräftar OID-ordning i multi-pack-index"
-#: midx.c:1137
+#: midx.c:1067
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "oid-uppslagning i fel ordning: oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1157
+#: midx.c:1087
msgid "Sorting objects by packfile"
msgstr "Sorterar objekt efter packfil"
-#: midx.c:1164
+#: midx.c:1094
msgid "Verifying object offsets"
msgstr "Bekräftar offset för objekt"
-#: midx.c:1180
+#: midx.c:1110
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "misslyckades läsa paketpost för oid[%d] = %s"
-#: midx.c:1186
+#: midx.c:1116
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "misslyckades läsa paketindex för paketfil %s"
-#: midx.c:1195
+#: midx.c:1125
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "felaktigt objekt-offset för oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-#: midx.c:1220
+#: midx.c:1150
msgid "Counting referenced objects"
msgstr "Räknar refererade objekt"
-#: midx.c:1230
+#: midx.c:1160
msgid "Finding and deleting unreferenced packfiles"
msgstr "Ser efter och tar bort orefererade packfiler"
-#: midx.c:1388
+#: midx.c:1351
msgid "could not start pack-objects"
msgstr "kunde inte starta pack-objects"
-#: midx.c:1407
+#: midx.c:1371
msgid "could not finish pack-objects"
msgstr "kunde inte avsluta pack-objects"
-#: name-hash.c:537
+#: name-hash.c:538
#, c-format
msgid "unable to create lazy_dir thread: %s"
msgstr "misslyckades skapa lazy_dir-tråd: %s"
-#: name-hash.c:559
+#: name-hash.c:560
#, c-format
msgid "unable to create lazy_name thread: %s"
msgstr "misslyckades skapa lazy_name-tråd: %s"
-#: name-hash.c:565
+#: name-hash.c:566
#, c-format
msgid "unable to join lazy_name thread: %s"
msgstr "misslyckades utföra join på lazy_name-tråd: %s"
@@ -4974,6 +5353,358 @@
msgid "Bad %s value: '%s'"
msgstr "Felaktigt värde på %s: \"%s\""
+#: object-file.c:480
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr "objektkatalogen %s finns inte; se .git/objects/info/alternates"
+
+#: object-file.c:531
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "kunde inte normalisera supplerande objektsökväg: %s"
+
+#: object-file.c:603
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr "%s: ignorerar supplerande objektlager, för djup nästling"
+
+#: object-file.c:610
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "kan inte normalisera objektkatalogen: %s"
+
+#: object-file.c:653
+msgid "unable to fdopen alternates lockfile"
+msgstr "kan inte utföra \"fdopen\" på suppleantlåsfil"
+
+#: object-file.c:671
+msgid "unable to read alternates file"
+msgstr "kan inte läsa \"alternates\"-filen"
+
+#: object-file.c:678
+msgid "unable to move new alternates file into place"
+msgstr "kan inte flytta ny \"alternates\"-fil på plats"
+
+#: object-file.c:713
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "sökvägen \"%s\" finns inte"
+
+#: object-file.c:734
+#, 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."
+
+#: object-file.c:740
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."
+
+#: object-file.c:746
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "referensarkivet \"%s\" är grunt"
+
+#: object-file.c:754
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "referensarkivet \"%s\" är ympat"
+
+#: object-file.c:814
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "felaktig rad vid tolkning av supplerande referenser: %s"
+
+#: object-file.c:964
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr "försök att utföra \"mmap\" på %<PRIuMAX> över gränsen %<PRIuMAX>"
+
+#: object-file.c:985
+msgid "mmap failed"
+msgstr "mmap misslyckades"
+
+#: object-file.c:1149
+#, c-format
+msgid "object file %s is empty"
+msgstr "objektfilen %s är tom"
+
+#: object-file.c:1284 object-file.c:2477
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "trasigt löst objekt \"%s\""
+
+#: object-file.c:1286 object-file.c:2481
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "skräp i slutet av löst objekt \"%s\""
+
+#: object-file.c:1328
+msgid "invalid object type"
+msgstr "felaktig objekttyp"
+
+#: object-file.c:1412
+#, c-format
+msgid "unable to unpack %s header with --allow-unknown-type"
+msgstr "kan inte packa upp %s-huvud med --allow-unknown-type"
+
+#: object-file.c:1415
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "kan inte packa upp %s-huvudet"
+
+#: object-file.c:1421
+#, c-format
+msgid "unable to parse %s header with --allow-unknown-type"
+msgstr "kan inte tolka %s-huvud med --allow-unknown-type"
+
+#: object-file.c:1424
+#, c-format
+msgid "unable to parse %s header"
+msgstr "kan inte tolka %s-huvud"
+
+#: object-file.c:1651
+#, c-format
+msgid "failed to read object %s"
+msgstr "misslyckades läsa objektet %s"
+
+#: object-file.c:1655
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "ersättningen %s hittades inte för %s"
+
+#: object-file.c:1659
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "löst objekt %s (lagrat i %s) är trasigt"
+
+#: object-file.c:1663
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "packat objekt %s (lagrat i %s) är trasigt"
+
+#: object-file.c:1768
+#, c-format
+msgid "unable to write file %s"
+msgstr "kunde inte skriva filen %s"
+
+#: object-file.c:1775
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "kan inte sätta behörigheten till \"%s\""
+
+#: object-file.c:1782
+msgid "file write error"
+msgstr "fel vid skrivning av fil"
+
+#: object-file.c:1802
+msgid "error when closing loose object file"
+msgstr "fel vid stängning av fil för löst objekt"
+
+#: object-file.c:1867
+#, 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"
+
+#: object-file.c:1869
+msgid "unable to create temporary file"
+msgstr "kan inte skapa temporär fil"
+
+#: object-file.c:1893
+msgid "unable to write loose object file"
+msgstr "kunde inte skriva fil för löst objekt"
+
+#: object-file.c:1899
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "kan inte utföra \"deflate\" på nytt objekt %s (%d)"
+
+#: object-file.c:1903
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "\"deflateend\" på objektet %s misslyckades (%d)"
+
+#: object-file.c:1907
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "förvirrad av instabil objektkälldata för %s"
+
+#: object-file.c:1917 builtin/pack-objects.c:1097
+#, c-format
+msgid "failed utime() on %s"
+msgstr "\"utime()\" misslyckades på %s"
+
+#: object-file.c:1994
+#, c-format
+msgid "cannot read object for %s"
+msgstr "kan inte läsa objekt för %s"
+
+#: object-file.c:2045
+msgid "corrupt commit"
+msgstr "trasik incheckning"
+
+#: object-file.c:2053
+msgid "corrupt tag"
+msgstr "trasig tagg"
+
+#: object-file.c:2153
+#, c-format
+msgid "read error while indexing %s"
+msgstr "läsfel vid indexering av %s"
+
+#: object-file.c:2156
+#, c-format
+msgid "short read while indexing %s"
+msgstr "för lite lästes vid indexering av %s"
+
+#: object-file.c:2229 object-file.c:2239
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr "%s: misslyckades lägga in i databasen"
+
+#: object-file.c:2245
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s: filtypen stöds ej"
+
+#: object-file.c:2269
+#, c-format
+msgid "%s is not a valid object"
+msgstr "%s är inte ett giltigt objekt"
+
+#: object-file.c:2271
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s är inte ett giltigt \"%s\"-objekt"
+
+#: object-file.c:2298 builtin/index-pack.c:192
+#, c-format
+msgid "unable to open %s"
+msgstr "kan inte öppna %s"
+
+#: object-file.c:2488 object-file.c:2541
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "hash stämmer inte för %s (förväntade %s)"
+
+#: object-file.c:2512
+#, c-format
+msgid "unable to mmap %s"
+msgstr "kan inte utföra \"mmap\" för %s"
+
+#: object-file.c:2517
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "kan inte packa upp huvud för %s"
+
+#: object-file.c:2523
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "kan inte tolka huvud för %s"
+
+#: object-file.c:2534
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "kan inte tolka innehåll i %s"
+
+#: object-name.c:486
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr "kort objekt-ID %s är tvetydigt"
+
+#: object-name.c:497
+msgid "The candidates are:"
+msgstr "Kandidaterna är:"
+
+#: object-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 skapar normalt aldrig referenser som slutar med 40 hexadecimala\n"
+"tecken, då detta ignoreras när du anger 40-hex enbart. Dessa\n"
+"referenser kan skapas av misstag. Till exempel, för\n"
+"\n"
+" git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"där \"$br\" på något sätt blivit tomt och en 40-hex-referens skapats.\n"
+"Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n"
+"genom att köra \"git config advice.objectNameWarning false\""
+
+#: object-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"
+
+#: object-name.c:924
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "loggen för \"%.*s\" har bara %d poster"
+
+#: object-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\""
+
+#: object-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\"?"
+
+#: object-name.c:1717
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "sökvägen \"%s\" finns inte i \"%.*s\""
+
+#: object-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\"?"
+
+#: object-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\"?"
+
+#: object-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"
+
+#: object-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)"
+
+#: object-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"
+
+#: object-name.c:1922
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "felaktigt objektnamn \"%.*s\"."
+
#: object.c:53
#, c-format
msgid "invalid object type \"%s\""
@@ -4999,24 +5730,94 @@
msgid "hash mismatch %s"
msgstr "hashvärde stämmer inte överens %s"
-#: packfile.c:629
+#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226
+#, c-format
+msgid "unable to get size of %s"
+msgstr "kan inte hämta storlek på %s"
+
+#: pack-bitmap.c:1489 builtin/rev-list.c:92
+#, c-format
+msgid "unable to get disk usage of %s"
+msgstr "kan inte hämta diskanvändning för %s"
+
+#: pack-revindex.c:220
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr "reverse-index-filen %s är för liten"
+
+#: pack-revindex.c:225
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr "reverse-index-filen %s är trasig"
+
+#: pack-revindex.c:233
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr "reverse-index-filen %s har okänd signatur"
+
+#: pack-revindex.c:237
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr "reverse-index-filen %s har versionen %<PRIu32> som inte stöds"
+
+#: pack-revindex.c:242
+#, c-format
+msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
+msgstr "reverse-index-filen %s har hash-ID %<PRIu32> som inte stöds"
+
+#: pack-write.c:236
+msgid "cannot both write and verify reverse index"
+msgstr "kan inte både skriva och bekräfta reverse-index"
+
+#: pack-write.c:257
+#, c-format
+msgid "could not stat: %s"
+msgstr "kunde inte ta status: %s"
+
+#: pack-write.c:269
+#, c-format
+msgid "failed to make %s readable"
+msgstr "kunde inte göra %s läsbar"
+
+#: pack-write.c:508
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr "kunde inte skriva kontraktsfilen \"%s\""
+
+#: packfile.c:625
msgid "offset before end of packfile (broken .idx?)"
msgstr "offset före slutet av packfilen (trasig .idx?)"
-#: packfile.c:1899
+#: packfile.c:1934
#, 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:1938
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "offset borton slutet av packindex för %s (trunkerat index?)"
-#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134
+#: parse-options-cb.c:20 parse-options-cb.c:24
#, c-format
-msgid "unable to get size of %s"
-msgstr "kan inte hämta storlek på %s"
+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
@@ -5058,26 +5859,31 @@
msgid "did you mean `--%s` (with two dashes)?"
msgstr "menade du \"--%s\" (med två bindestreck)?"
-#: parse-options.c:857
+#: 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 "okänd flagga \"%s\""
-#: parse-options.c:859
+#: parse-options.c:864
#, c-format
msgid "unknown switch `%c'"
msgstr "okänd flagga \"%c\""
-#: parse-options.c:861
+#: 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:885
+#: parse-options.c:890
msgid "..."
msgstr "..."
-#: parse-options.c:904
+#: parse-options.c:909
#, c-format
msgid "usage: %s"
msgstr "användning: %s"
@@ -5085,46 +5891,20 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:910
+#: parse-options.c:915
#, c-format
msgid " or: %s"
msgstr " eller: %s"
-#: parse-options.c:913
+#: parse-options.c:918
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:952
+#: parse-options.c:957
msgid "-NUM"
msgstr "-TAL"
-#: parse-options.c:966
-#, 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:915
#, c-format
msgid "Could not make %s writable by group"
@@ -5184,27 +5964,27 @@
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: \"literal\" och \"glob\" är inkompatibla"
-#: pathspec.c:442
+#: pathspec.c:445
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr "%s: \"%s\" är utanför arkivet på \"%s\""
-#: pathspec.c:517
+#: pathspec.c:521
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "\"%s\" (minnesstöd: \"%c\")"
-#: pathspec.c:527
+#: 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:594
+#: 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:639
+#: pathspec.c:643
#, c-format
msgid "line is badly quoted: %s"
msgstr "linjen er felaktigt citerad: %s"
@@ -5218,142 +5998,172 @@
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:165
#, c-format
msgid "remote error: %s"
msgstr "fjärrfel: %s"
-#: preload-index.c:119
+#: preload-index.c:125
msgid "Refreshing index"
msgstr "Uppdaterar indexet"
-#: preload-index.c:138
+#: preload-index.c:144
#, c-format
msgid "unable to create threaded lstat: %s"
msgstr "kunde inte skapa trådad lstat: %s"
-#: pretty.c:981
+#: pretty.c:984
msgid "unable to parse --pretty format"
msgstr "kunde inte tolka format för --pretty"
-#: promisor-remote.c:23
-msgid "Remote with no URL"
-msgstr "Fjärr utan URL"
+#: promisor-remote.c:30
+msgid "promisor-remote: unable to fork off fetch subprocess"
+msgstr "promisor-remote: kunde inte starta (fork) underprocessen för fetch"
-#: promisor-remote.c:58
+#: 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"
-#: range-diff.c:75
+#: prune-packed.c:35
+msgid "Removing duplicate objects"
+msgstr "Tar bort duplicerade objekt"
+
+#: range-diff.c:78
msgid "could not start `log`"
msgstr "kunde inte starta \"log\""
-#: range-diff.c:77
+#: range-diff.c:80
msgid "could not read `log` output"
msgstr "kunde inte läsa utdata från \"log\""
-#: range-diff.c:96 sequencer.c:5020
+#: range-diff.c:101 sequencer.c:5318
#, c-format
msgid "could not parse commit '%s'"
msgstr "kunde inte tolka incheckningen \"%s\""
-#: range-diff.c:122
+#: range-diff.c:115
+#, 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:140
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "kunde inte tolka git-huvudet \"%.*s\""
-#: range-diff.c:285
+#: range-diff.c:306
msgid "failed to generate diff"
msgstr "misslyckades skapa diff"
-#: range-diff.c:518 range-diff.c:520
+#: range-diff.c:558
+msgid "--left-only and --right-only are mutually exclusive"
+msgstr "--left-only och --right-only är ömsesidigt uteslutande"
+
+#: range-diff.c:561 range-diff.c:563
#, 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:1330
+#: 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:1536
+#: read-cache.c:1532
msgid "Refresh index"
msgstr "Uppdatera indexet"
-#: read-cache.c:1651
+#: read-cache.c:1657
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -5362,7 +6172,7 @@
"index.version satt, men värdet är ogiltigt.\n"
"Använder version %i"
-#: read-cache.c:1661
+#: read-cache.c:1667
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -5371,139 +6181,139 @@
"GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n"
"Använder version %i"
-#: read-cache.c:1717
+#: read-cache.c:1723
#, c-format
msgid "bad signature 0x%08x"
msgstr "felaktig signatur 0x%08x"
-#: read-cache.c:1720
+#: read-cache.c:1726
#, c-format
msgid "bad index version %d"
msgstr "felaktig indexversion %d"
-#: read-cache.c:1729
+#: read-cache.c:1735
msgid "bad index file sha1 signature"
msgstr "felaktig sha1-signatur för indexfil"
-#: read-cache.c:1759
+#: read-cache.c:1765
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "index använder filtillägget %.4s, vilket vi inte förstår"
-#: read-cache.c:1761
+#: read-cache.c:1767
#, c-format
msgid "ignoring %.4s extension"
msgstr "ignorerar filtillägget %.4s"
-#: read-cache.c:1798
+#: read-cache.c:1804
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "okänt format 0x%08x på indexpost"
-#: read-cache.c:1814
+#: read-cache.c:1820
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "felformat namnfält i indexet, nära sökvägen \"%s\""
-#: read-cache.c:1871
+#: read-cache.c:1877
msgid "unordered stage entries in index"
msgstr "osorterade köposter i index"
-#: read-cache.c:1874
+#: read-cache.c:1880
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "flera köposter för den sammanslagna filen \"%s\""
-#: read-cache.c:1877
+#: read-cache.c:1883
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "osorterade köposter för \"%s\""
-#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
-#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
-#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
-#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
-#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
+#: read-cache.c:1989 read-cache.c:2280 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181
+#: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991
+#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505
+#: 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:2124
+#: read-cache.c:2133
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "kunde inte läsa in cache_entries-tråden: %s"
-#: read-cache.c:2137
+#: read-cache.c:2146
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "kunde inte utföra join på cache_entries-tråden: %s"
-#: read-cache.c:2170
+#: read-cache.c:2179
#, c-format
msgid "%s: index file open failed"
msgstr "%s: öppning av indexfilen misslyckades"
-#: read-cache.c:2174
+#: read-cache.c:2183
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s: kan inte ta startus på det öppna indexet"
-#: read-cache.c:2178
+#: read-cache.c:2187
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s: indexfilen mindre än förväntat"
-#: read-cache.c:2182
+#: read-cache.c:2191
#, c-format
msgid "%s: unable to map index file"
msgstr "%s: kan inte koppla indexfilen"
-#: read-cache.c:2224
+#: read-cache.c:2233
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "kunde inte skapa load_index_extensions-tråden: %s"
-#: read-cache.c:2251
+#: read-cache.c:2260
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "kunde inte utföra join på load_index_extensions-tråden: %s"
-#: read-cache.c:2283
+#: read-cache.c:2292
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "kunde inte uppdatera delat index \"%s\""
-#: read-cache.c:2330
+#: read-cache.c:2339
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "trasigt index, förväntade %s i %s, fick %s"
-#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122
+#: read-cache.c:3035 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141
#, c-format
msgid "could not close '%s'"
msgstr "kunde inte stänga \"%s\""
-#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959
+#: read-cache.c:3138 sequencer.c:2487 sequencer.c:4239
#, c-format
msgid "could not stat '%s'"
msgstr "kunde inte ta status på \"%s\""
-#: read-cache.c:3142
+#: read-cache.c:3151
#, c-format
msgid "unable to open git dir: %s"
msgstr "kunde inte öppna git-katalog: %s"
-#: read-cache.c:3154
+#: read-cache.c:3163
#, c-format
msgid "unable to unlink: %s"
msgstr "misslyckades ta bort länken: %s"
-#: read-cache.c:3179
+#: read-cache.c:3188
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "kan inte rätta behörighetsbitar på \"%s\""
-#: read-cache.c:3328
+#: read-cache.c:3337
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s: kan inte återgå till kö 0"
@@ -5576,7 +6386,7 @@
msgstr[0] "Ombasera %s på %s (%d kommando)"
msgstr[1] "Ombasera %s på %s (%d kommandon)"
-#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228
+#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -5585,7 +6395,7 @@
"Ta inte bort rader. Använd \"drop\" för att specifikt förkasta en "
"incheckning.\n"
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232
+#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -5593,7 +6403,7 @@
"\n"
"Om du tar bort en rad KOMMER DEN INCHECKNINGEN ATT FÖRLORAS.\n"
-#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871
+#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -5607,7 +6417,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:86 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"
@@ -5617,14 +6427,14 @@
"Ombaseringen kommer dock att avbrytas om du tar bort allting.\n"
"\n"
-#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444
-#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252
+#: rebase-interactive.c:110 rerere.c:469 rerere.c:676 sequencer.c:3615
+#: sequencer.c:3641 sequencer.c:5424 builtin/fsck.c:329 builtin/rebase.c:272
#, c-format
msgid "could not write '%s'"
msgstr "kunde inte skriva \"%s\""
-#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210
-#: builtin/rebase.c:234
+#: rebase-interactive.c:116 builtin/rebase.c:204 builtin/rebase.c:230
+#: builtin/rebase.c:254
#, c-format
msgid "could not write '%s'."
msgstr "kunde inte skriva \"%s\"."
@@ -5658,132 +6468,14 @@
"\" (fel).\n"
"\n"
-#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262
-#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221
-#: builtin/rebase.c:246
+#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2402
+#: builtin/rebase.c:190 builtin/rebase.c:215 builtin/rebase.c:241
+#: builtin/rebase.c:266
#, c-format
msgid "could not read '%s'."
msgstr "kunde inte läsa \"%s\"."
-#: refs.c:262
-#, c-format
-msgid "%s does not point to a valid object!"
-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:2098
-#, 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:407 sequencer.c:2701 sequencer.c:2905
-#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157
-#: wrapper.c:620
-#, c-format
-msgid "could not write to '%s'"
-msgstr "kunde inte skriva till \"%s\""
-
-#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719
-#: builtin/rebase.c:1029
-#, 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:2023
-#, c-format
-msgid "multiple updates for ref '%s' not allowed"
-msgstr "flera uppdateringar för referensen \"%s\" tillåts inte"
-
-#: refs.c:2055
-msgid "ref updates forbidden inside quarantine environment"
-msgstr "referensuppdateringar förbjudna i karantänmiljö"
-
-#: refs.c:2151 refs.c:2181
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr "\"%s\" finns; kan inte skapa \"%s\""
-
-#: refs.c:2157 refs.c:2192
-#, c-format
-msgid "cannot process '%s' and '%s' at the same time"
-msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt"
-
-#: refs/files-backend.c:1233
-#, c-format
-msgid "could not remove reference %s"
-msgstr "kunde inte ta bort referensen %s"
-
-#: refs/files-backend.c:1247 refs/packed-backend.c:1541
-#: refs/packed-backend.c:1551
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "kunde inte ta bort referensen %s: %s"
-
-#: refs/files-backend.c:1250 refs/packed-backend.c:1554
-#, 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\""
-
-#: ref-filter.c:42 wt-status.c:1938
+#: ref-filter.c:42 wt-status.c:1975
msgid "gone"
msgstr "försvunnen"
@@ -5802,281 +6494,410 @@
msgid "ahead %d, behind %d"
msgstr "före %d, bakom %d"
-#: ref-filter.c:165
+#: ref-filter.c:175
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "förväntat format: %%(color:<color>)"
-#: ref-filter.c:167
+#: ref-filter.c:177
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "okänd färg: %%(color:%s)"
-#: ref-filter.c:189
+#: ref-filter.c:199
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Heltalsvärde förväntades refname:lstrip=%s"
-#: ref-filter.c:193
+#: ref-filter.c:203
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Heltalsvärde förväntades refname:rstrip=%s"
-#: ref-filter.c:195
+#: ref-filter.c:205
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "okänt %%(%s)-argument: %s"
-#: ref-filter.c:250
+#: ref-filter.c:260
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) tar inte argument"
-#: ref-filter.c:272
+#: ref-filter.c:282
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr "okänt %%(objectsize)-argument: %s"
-#: ref-filter.c:280
+#: ref-filter.c:290
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) tar inte argument"
-#: ref-filter.c:292
+#: ref-filter.c:302
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) tar inte argument"
-#: ref-filter.c:301
+#: ref-filter.c:315
#, 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:323
+#: ref-filter.c:334
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr "förvändate %%(trailers:nyckel=<värde>)"
+
+#: ref-filter.c:336
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "okänt %%(trailers)-argument: %s"
-#: ref-filter.c:352
+#: ref-filter.c:367
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "positivt värde förväntat contents:lines=%s"
-#: ref-filter.c:354
+#: ref-filter.c:369
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "okänt %%(contents)-argument: %s"
-#: ref-filter.c:369
+#: ref-filter.c:384
#, 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:373
+#: ref-filter.c:388
#, 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:403
+#: ref-filter.c:402
+#, c-format
+msgid "unrecognized email option: %s"
+msgstr "okänd e-postalternativ: %s"
+
+#: ref-filter.c:432
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "förväntat format: %%(align:<bredd>,<position>)"
-#: ref-filter.c:415
+#: ref-filter.c:444
#, c-format
msgid "unrecognized position:%s"
msgstr "okänd position:%s"
-#: ref-filter.c:422
+#: ref-filter.c:451
#, c-format
msgid "unrecognized width:%s"
msgstr "okänd bredd:%s"
-#: ref-filter.c:431
+#: ref-filter.c:460
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "okänt %%(align)-argument: %s"
-#: ref-filter.c:439
+#: ref-filter.c:468
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "positiv bredd förväntad med atomen %%(align)"
-#: ref-filter.c:457
+#: ref-filter.c:486
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "okänt %%(if)-argument: %s"
-#: ref-filter.c:559
+#: ref-filter.c:588
#, c-format
msgid "malformed field name: %.*s"
msgstr "felformat fältnamn: %.*s"
-#: ref-filter.c:586
+#: ref-filter.c:615
#, c-format
msgid "unknown field name: %.*s"
msgstr "okänt fältnamn: %.*s"
-#: ref-filter.c:590
+#: ref-filter.c:619
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr ""
"inte ett git-arkiv, men fältet \"%.*s\" kräver tillgång till objektdata"
-#: ref-filter.c:714
+#: ref-filter.c:743
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "format: atomen %%(if) använd utan en %%(then)-atom"
-#: ref-filter.c:777
+#: ref-filter.c:806
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "format: atomen %%(then) använd utan en %%(if)-atom"
-#: ref-filter.c:779
+#: ref-filter.c:808
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "format: atomen %%(then) använd mer än en gång"
-#: ref-filter.c:781
+#: ref-filter.c:810
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "format: atomen %%(then) använd efter %%(else)"
-#: ref-filter.c:809
+#: ref-filter.c:838
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "format: atomen %%(else) använd utan en %%(if)-atom"
-#: ref-filter.c:811
+#: ref-filter.c:840
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "format: atomen %%(else) använd utan en %%(then)-atom"
-#: ref-filter.c:813
+#: ref-filter.c:842
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "format: atomen %%(else) använd mer än en gång"
-#: ref-filter.c:828
+#: ref-filter.c:857
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "format: atomen %%(end) använd utan motsvarande atom"
-#: ref-filter.c:885
+#: ref-filter.c:914
#, c-format
msgid "malformed format string %s"
msgstr "felformad formatsträng %s"
-#: ref-filter.c:1488
+#: ref-filter.c:1555
#, c-format
-msgid "no branch, rebasing %s"
-msgstr "ingen gren, ombaserar %s"
+msgid "(no branch, rebasing %s)"
+msgstr "(ingen gren, ombaserar %s)"
-#: ref-filter.c:1491
+#: ref-filter.c:1558
#, c-format
-msgid "no branch, rebasing detached HEAD %s"
-msgstr "ingen gren, ombaserar frånkopplat HEAD %s"
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "(ingen gren, ombaserar frånkopplat HEAD %s)"
-#: ref-filter.c:1494
+#: ref-filter.c:1561
#, c-format
-msgid "no branch, bisect started on %s"
-msgstr "ingen gren, \"bisect\" startad på %s"
+msgid "(no branch, bisect started on %s)"
+msgstr "(ingen gren, \"bisect\" startad på %s)"
-#: ref-filter.c:1504
-msgid "no branch"
-msgstr "ingen gren"
+#: ref-filter.c:1565
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD frånkopplat vid %s)"
-#: ref-filter.c:1540 ref-filter.c:1749
+#: ref-filter.c:1568
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD frånkopplat från %s)"
+
+#: ref-filter.c:1571
+msgid "(no branch)"
+msgstr "(ingen gren)"
+
+#: ref-filter.c:1603 ref-filter.c:1812
#, c-format
msgid "missing object %s for %s"
msgstr "objektet %s saknas för %s"
-#: ref-filter.c:1550
+#: ref-filter.c:1613
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer misslyckades på %s för %s"
-#: ref-filter.c:2004
+#: ref-filter.c:1996
#, c-format
msgid "malformed object at '%s'"
msgstr "felformat objekt vid \"%s\""
-#: ref-filter.c:2093
+#: ref-filter.c:2085
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "ignorerar referens med trasigt namn %s"
-#: ref-filter.c:2389
+#: ref-filter.c:2090 refs.c:676
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "ignorerar trasig referens %s"
+
+#: ref-filter.c:2430
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: atomen %%(end) saknas"
-#: ref-filter.c:2489
-#, c-format
-msgid "option `%s' is incompatible with --merged"
-msgstr "flaggan \"%s\" är inkompatibel med --merged"
-
-#: ref-filter.c:2492
-#, c-format
-msgid "option `%s' is incompatible with --no-merged"
-msgstr "flaggan \"%s\" är inkompatibel med --no-merged"
-
-#: ref-filter.c:2502
+#: ref-filter.c:2529
#, c-format
msgid "malformed object name %s"
msgstr "felformat objektnamn %s"
-#: ref-filter.c:2507
+#: ref-filter.c:2534
#, c-format
msgid "option `%s' must point to a commit"
msgstr "flaggan \"%s\" måste peka på en incheckning"
-#: remote.c:366
+#: refs.c:264
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr "\"%s\" pekar inte på ett giltigt objekt!"
+
+#: refs.c:566
+#, c-format
+msgid ""
+"Using '%s' as the name for the initial branch. This default branch name\n"
+"is subject to change. To configure the initial branch name to use in all\n"
+"of your new repositories, which will suppress this warning, call:\n"
+"\n"
+"\tgit config --global init.defaultBranch <name>\n"
+"\n"
+"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"'development'. The just-created branch can be renamed via this command:\n"
+"\n"
+"\tgit branch -m <name>\n"
+msgstr ""
+"Använder \"%s\" som namn för den inledande grenen. Detta förvalda grennamn\n"
+"kan ändras i framtiden. För att välja vilket namn som ska användas på\n"
+"den inledande grenen i alla nya arkiv, och dölja denna varning, kör du:\n"
+"\n"
+"\tgit config --global init.defaultBranch <namn>\n"
+"\n"
+"Namn som ofta används instället för \"master\" är \"main\", \"trunk\" och\n"
+"\"development\". Den nyskapade grenen kan ges nytt namn med kommandot:\n"
+"\n"
+"\tgit branch -m <namn>\n"
+
+#: refs.c:588
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "kunde inte hämta \"%s\""
+
+#: refs.c:598
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "felaktigt namn på gren: %s = %s"
+
+#: refs.c:674
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "ignorerar dinglande symbolisk referens %s"
+
+#: refs.c:922
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr "loggen för referensen %s har lucka efter %s"
+
+#: refs.c:929
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr "loggen för referensen %s slutade oväntat på %s"
+
+#: refs.c:994
+#, c-format
+msgid "log for %s is empty"
+msgstr "loggen för %s är tom"
+
+#: refs.c:1086
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "vägrar uppdatera referens med trasigt namn \"%s\""
+
+#: refs.c:1157
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "update_ref misslyckades för referensen \"%s\": %s"
+
+#: refs.c:2051
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "flera uppdateringar för referensen \"%s\" tillåts inte"
+
+#: refs.c:2131
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "referensuppdateringar förbjudna i karantänmiljö"
+
+#: refs.c:2142
+msgid "ref updates aborted by hook"
+msgstr "referensuppdateringar avbrutna av krok"
+
+#: refs.c:2242 refs.c:2272
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "\"%s\" finns; kan inte skapa \"%s\""
+
+#: refs.c:2248 refs.c:2283
+#, 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:170
+#, 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:414
+#: 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:422
+#: 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:612
+#: 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:616
+#: remote.c:594
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s spårar vanligtvis %s, inte %s"
-#: remote.c:620
+#: remote.c:598
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s spårar både %s och %s"
-#: remote.c:688
+#: remote.c:666
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr "nyckeln \"%s\" i mönstret innehåller ingen \"*\""
-#: remote.c:698
+#: remote.c:676
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr "värdet \"%s\" i mönstret innehåller ingen \"*\""
-#: remote.c:1004
+#: remote.c:1083
#, c-format
msgid "src refspec %s does not match any"
msgstr "käll-referensspecifikationen %s motsvarar ingen"
-#: remote.c:1009
+#: remote.c:1088
#, c-format
msgid "src refspec %s matches more than one"
msgstr "käll-referensspecifikationen %s motsvarar mer än en"
@@ -6085,7 +6906,7 @@
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1024
+#: remote.c:1103
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
@@ -6108,7 +6929,7 @@
"\n"
"Inget av dem fungerade, så vi gav upp. Ange fullständig referens."
-#: remote.c:1044
+#: remote.c:1123
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
@@ -6119,7 +6940,7 @@
"Var det meningen att skapa en ny gren genom att sända\n"
"till \"%s:refs/heads/%s\"?"
-#: remote.c:1049
+#: remote.c:1128
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
@@ -6130,7 +6951,7 @@
"Var det meningen att skapa en ny tagg genom att sända\n"
"till \"%s:refs/tags/%s\"?"
-#: remote.c:1054
+#: remote.c:1133
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
@@ -6141,7 +6962,7 @@
"Var det meningen att tagga ett nytt träd genom att sända\n"
"till \"%s:refs/tags/%s\"?"
-#: remote.c:1059
+#: remote.c:1138
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
@@ -6152,114 +6973,114 @@
"Var det meningen att tagga en ny blob genom att sända\n"
"till \"%s:refs/tags/%s\"?"
-#: remote.c:1095
+#: remote.c:1174
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "%s kan inte slås upp till en gren"
-#: remote.c:1106
+#: remote.c:1185
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "kan inte ta bort \"%s\": fjärreferensen finns inte"
-#: remote.c:1118
+#: remote.c:1197
#, c-format
msgid "dst refspec %s matches more than one"
msgstr "fjärr-referensspecifikationen \"%s\" motsvarar mer än en"
-#: remote.c:1125
+#: remote.c:1204
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr "fjärr-referensen \"%s\" hämtar från mer än en källa"
-#: remote.c:1628 remote.c:1729
+#: remote.c:1724 remote.c:1825
msgid "HEAD does not point to a branch"
msgstr "HEAD pekar inte på en gren"
-#: remote.c:1637
+#: remote.c:1733
#, c-format
msgid "no such branch: '%s'"
msgstr "okänd gren: \"%s\""
-#: remote.c:1640
+#: remote.c:1736
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "ingen standarduppström angiven för grenen \"%s\""
-#: remote.c:1646
+#: remote.c:1742
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren"
-#: remote.c:1661
+#: remote.c:1757
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "push-målet \"%s\" på fjärren \"%s\" har ingen lokalt spårande gren"
-#: remote.c:1673
+#: remote.c:1769
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "grenen \"%s\" har ingen fjärr för \"push\""
-#: remote.c:1683
+#: remote.c:1779
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\""
-#: remote.c:1696
+#: remote.c:1792
msgid "push has no destination (push.default is 'nothing')"
msgstr "\"push\" har inget mål (push.default är \"ingenting\")"
-#: remote.c:1718
+#: remote.c:1814
msgid "cannot resolve 'simple' push to a single destination"
msgstr "\"enkel push\" motsvarar flera olika mål"
-#: remote.c:1844
+#: remote.c:1943
#, c-format
msgid "couldn't find remote ref %s"
msgstr "Kunde inte hitta fjärr-referensen %s"
-#: remote.c:1857
+#: remote.c:1956
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "* Ignorerar märklig referens \"%s\" lokalt"
-#: remote.c:2020
+#: remote.c:2119
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "Din gren är baserad på \"%s\", men den har försvunnit uppströms.\n"
-#: remote.c:2024
+#: remote.c:2123
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n"
-#: remote.c:2027
+#: remote.c:2126
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "Din gren är à jour med \"%s\".\n"
-#: remote.c:2031
+#: remote.c:2130
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "Din gren och \"%s\" pekar på olika incheckningar.\n"
-#: remote.c:2034
+#: remote.c:2133
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (använd \"%s\" för detaljer)\n"
-#: remote.c:2038
+#: remote.c:2137
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "Din gren ligger före \"%s\" med %d incheckning.\n"
msgstr[1] "Din gren ligger före \"%s\" med %d incheckningar.\n"
-#: remote.c:2044
+#: remote.c:2143
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (använd \"git push\" för att publicera dina lokala incheckningar)\n"
-#: remote.c:2047
+#: remote.c:2146
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -6269,11 +7090,11 @@
msgstr[1] ""
"Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n"
-#: remote.c:2055
+#: remote.c:2154
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (använd \"git pull\" för att uppdatera din lokala gren)\n"
-#: remote.c:2058
+#: remote.c:2157
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -6288,11 +7109,11 @@
"Din gren och \"%s\" har divergerat,\n"
"och har %d respektive %d olika incheckningar.\n"
-#: remote.c:2068
+#: remote.c:2167
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n"
-#: remote.c:2251
+#: remote.c:2359
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "kan inte tolka förväntat objektnamn \"%s\""
@@ -6312,126 +7133,135 @@
msgid "replace depth too high for object %s"
msgstr "ersättningsdjupet för högt för objektet %s"
-#: rerere.c:217 rerere.c:226 rerere.c:229
+#: rerere.c:201 rerere.c:210 rerere.c:213
msgid "corrupt MERGE_RR"
msgstr "trasig MERGE_RR"
-#: rerere.c:264 rerere.c:269
+#: rerere.c:248 rerere.c:253
msgid "unable to write rerere record"
msgstr "kunde inte skriva rerere-post"
-#: rerere.c:495
+#: rerere.c:479
#, c-format
msgid "there were errors while writing '%s' (%s)"
msgstr "fel vid skrivning av \"%s\" (%s)"
-#: rerere.c:498
+#: rerere.c:482
#, c-format
msgid "failed to flush '%s'"
msgstr "misslyckades spola \"%s\""
-#: rerere.c:503 rerere.c:1039
+#: rerere.c:487 rerere.c:1023
#, c-format
msgid "could not parse conflict hunks in '%s'"
msgstr "kunde inte tolka konflikt-stycket i \"%s\""
-#: rerere.c:684
+#: rerere.c:668
#, c-format
msgid "failed utime() on '%s'"
msgstr "\"utime()\" misslyckades på \"%s\""
-#: rerere.c:694
+#: rerere.c:678
#, c-format
msgid "writing '%s' failed"
msgstr "misslyckades skriva \"%s\""
-#: rerere.c:714
+#: rerere.c:698
#, c-format
msgid "Staged '%s' using previous resolution."
msgstr "Köade \"%s\" med sparad lösning."
-#: rerere.c:753
+#: rerere.c:737
#, c-format
msgid "Recorded resolution for '%s'."
msgstr "Sparade lösning för \"%s\"."
-#: rerere.c:788
+#: rerere.c:772
#, c-format
msgid "Resolved '%s' using previous resolution."
msgstr "Löste \"%s\" med tidigare lösning."
-#: rerere.c:803
+#: rerere.c:787
#, c-format
msgid "cannot unlink stray '%s'"
msgstr "kan inte ta bort lös länk \"%s\""
-#: rerere.c:807
+#: rerere.c:791
#, c-format
msgid "Recorded preimage for '%s'"
msgstr "Sparade förhandsbild för \"%s\""
-#: rerere.c:881 submodule.c:2078 builtin/log.c:1871
-#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
+#: rerere.c:865 submodule.c:2088 builtin/log.c:1991
+#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890
#, c-format
msgid "could not create directory '%s'"
msgstr "kunde inte skapa katalogen \"%s\""
-#: rerere.c:1057
+#: rerere.c:1041
#, c-format
msgid "failed to update conflicted state in '%s'"
msgstr "misslyckades uppdatera tillstånd för sammanslagningsproblem i \"%s\""
-#: rerere.c:1068 rerere.c:1075
+#: rerere.c:1052 rerere.c:1059
#, c-format
msgid "no remembered resolution for '%s'"
msgstr "inget sparat sammanslagningsresultat för \"%s\""
-#: rerere.c:1077
+#: rerere.c:1061
#, c-format
msgid "cannot unlink '%s'"
msgstr "kan inte ta bort länken \"%s\""
-#: rerere.c:1087
+#: rerere.c:1071
#, c-format
msgid "Updated preimage for '%s'"
msgstr "Uppdaterade förhandsbild för \"%s\""
-#: rerere.c:1096
+#: rerere.c:1080
#, c-format
msgid "Forgot resolution for '%s'\n"
msgstr "Glömde lösning för \"%s\"\n"
-#: rerere.c:1199
+#: rerere.c:1191
msgid "unable to open rr-cache directory"
msgstr "kan inte uppdatera katalogen rr-cache"
-#: revision.c:2497
+#: reset.c:42
+msgid "could not determine HEAD revision"
+msgstr "kunde inte bestämma HEAD-revision"
+
+#: reset.c:70 reset.c:76 sequencer.c:3468
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "kunde inte hitta trädet för %s."
+
+#: revision.c:2338
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "--unpacked=<paketfil> stöds inte längre"
+
+#: revision.c:2668
msgid "your current branch appears to be broken"
msgstr "din nuvarande gren verkar vara trasig"
-#: revision.c:2500
+#: revision.c:2671
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar"
-#: revision.c:2708
-msgid "--first-parent is incompatible with --bisect"
-msgstr "--first-parent är inkompatibelt med --bisect"
-
-#: revision.c:2712
+#: revision.c:2877
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"
-#: run-command.c:763
+#: run-command.c:767
msgid "open /dev/null failed"
msgstr "misslyckades öppna /dev/null"
-#: run-command.c:1269
+#: run-command.c:1274
#, c-format
msgid "cannot create async thread: %s"
msgstr "kan inte skapa asynkron tråd: %s"
-#: run-command.c:1333
+#: run-command.c:1338
#, c-format
msgid ""
"The '%s' hook was ignored because it's not set as executable.\n"
@@ -6440,29 +7270,33 @@
"Kroken \"%s\" ignorerades eftersom den inte är markerad som körbar.\n"
"Du kan inaktivera varningen med \"git config advice.ignoredHook false\"."
-#: send-pack.c:144
+#: send-pack.c:146
msgid "unexpected flush packet while reading remote unpack status"
msgstr "oväntat flush-paket vid läsning av fjärruppackningsstatus"
-#: send-pack.c:146
+#: send-pack.c:148
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "kunde inte tolka fjärruppackningsstatus: %s"
-#: send-pack.c:148
+#: send-pack.c:150
#, c-format
msgid "remote unpack failed: %s"
msgstr "fjärruppackning misslyckades: %s"
-#: send-pack.c:309
+#: send-pack.c:374
msgid "failed to sign the push certificate"
msgstr "misslyckades underteckna push-certifikatet"
-#: send-pack.c:423
+#: send-pack.c:467
+msgid "the receiving end does not support this repository's hash algorithm"
+msgstr "mottagarsidan stöder inte arkivets hashningsalgoritm"
+
+#: send-pack.c:476
msgid "the receiving end does not support --signed push"
msgstr "mottagarsidan stöder inte push med --signed"
-#: send-pack.c:425
+#: send-pack.c:478
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -6470,47 +7304,47 @@
"sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --"
"signed"
-#: send-pack.c:437
+#: send-pack.c:490
msgid "the receiving end does not support --atomic push"
msgstr "mottagarsidan stöder inte push med --atomic"
-#: send-pack.c:442
+#: send-pack.c:495
msgid "the receiving end does not support push options"
msgstr "mottagarsidan stöder inte push-flaggor"
-#: sequencer.c:191
+#: sequencer.c:195
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\""
-#: sequencer.c:296
+#: sequencer.c:323
#, c-format
msgid "could not delete '%s'"
msgstr "kunde inte ta bort \"%s\""
-#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385
+#: sequencer.c:343 builtin/rebase.c:757 builtin/rebase.c:1602 builtin/rm.c:385
#, c-format
msgid "could not remove '%s'"
msgstr "kunde inte ta bort \"%s\""
-#: sequencer.c:325
+#: sequencer.c:353
msgid "revert"
msgstr "revert"
-#: sequencer.c:327
+#: sequencer.c:355
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:329
+#: sequencer.c:357
msgid "rebase"
msgstr "rebase"
-#: sequencer.c:331
+#: sequencer.c:359
#, c-format
msgid "unknown action: %d"
msgstr "okänd funktion: %d"
-#: sequencer.c:389
+#: sequencer.c:418
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -6518,7 +7352,7 @@
"efter att ha löst konflikterna, markera de rättade sökvägarna\n"
"med \"git add <sökvägar>\" eller \"git rm <sökvägar>\""
-#: sequencer.c:392
+#: sequencer.c:421
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -6528,44 +7362,43 @@
"med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n"
"och checka in resultatet med \"git commit\""
-#: sequencer.c:405 sequencer.c:2901
+#: sequencer.c:434 sequencer.c:3070
#, c-format
msgid "could not lock '%s'"
msgstr "kunde inte låsa \"%s\""
-#: sequencer.c:412
+#: sequencer.c:436 sequencer.c:2869 sequencer.c:3074 sequencer.c:3088
+#: sequencer.c:3345 sequencer.c:5334 strbuf.c:1168 wrapper.c:631
+#, c-format
+msgid "could not write to '%s'"
+msgstr "kunde inte skriva till \"%s\""
+
+#: sequencer.c:441
#, c-format
msgid "could not write eol to '%s'"
msgstr "kunde inte skriva radslut till \"%s\""
-#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921
-#: sequencer.c:3185
+#: sequencer.c:446 sequencer.c:2874 sequencer.c:3076 sequencer.c:3090
+#: sequencer.c:3353
#, c-format
msgid "failed to finalize '%s'"
msgstr "misslyckades färdigställa \"%s\""
-#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
-#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
-#: builtin/rebase.c:593
-#, c-format
-msgid "could not read '%s'"
-msgstr "kunde inte läsa \"%s\""
-
-#: sequencer.c:466
+#: sequencer.c:485
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "dina lokala ändringar skulle skrivas över av %s."
-#: sequencer.c:470
+#: sequencer.c:489
msgid "commit your changes or stash them to proceed."
msgstr "checka in dina ändringar eller använd \"stash\" för att fortsätta."
-#: sequencer.c:502
+#: sequencer.c:521
#, c-format
msgid "%s: fast-forward"
msgstr "%s: snabbspola"
-#: sequencer.c:541 builtin/tag.c:565
+#: sequencer.c:560 builtin/tag.c:598
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Felaktigt städningsläge %s"
@@ -6573,65 +7406,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:635
+#: sequencer.c:670
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Kunde inte skriva ny indexfil"
-#: sequencer.c:652
+#: sequencer.c:684
msgid "unable to update cache tree"
msgstr "kan inte uppdatera cacheträd"
-#: sequencer.c:666
+#: sequencer.c:698
msgid "could not resolve HEAD commit"
msgstr "kunde inte bestämma HEAD:s incheckning"
-#: sequencer.c:746
+#: sequencer.c:778
#, c-format
msgid "no key present in '%.*s'"
msgstr "ingen nyckel i \"%.*s\""
-#: sequencer.c:757
+#: sequencer.c:789
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "kan inte ta bort citering av värdet \"%s\""
-#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710
-#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072
+#: sequencer.c:826 wrapper.c:201 wrapper.c:371 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1136 builtin/rebase.c:910
#, c-format
msgid "could not open '%s' for reading"
msgstr "kunde inte öppna \"%s\" för läsning"
-#: sequencer.c:804
+#: sequencer.c:836
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "\"GIT_AUTHOR_NAME\" har redan angivits"
-#: sequencer.c:809
+#: sequencer.c:841
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "\"GIT_AUTHOR_EMAIL\" har redan angivits"
-#: sequencer.c:814
+#: sequencer.c:846
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "\"GIT_AUTHOR_DATE\" har redan angivits"
-#: sequencer.c:818
+#: sequencer.c:850
#, c-format
msgid "unknown variable '%s'"
msgstr "okänd variabel \"%s\""
-#: sequencer.c:823
+#: sequencer.c:855
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "\"GIT_AUTHOR_NAME\" saknas"
-#: sequencer.c:825
+#: sequencer.c:857
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "\"GIT_AUTHOR_EMAIL\" saknas"
-#: sequencer.c:827
+#: sequencer.c:859
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "\"GIT_AUTHOR_DATE\" saknas"
-#: sequencer.c:876
+#: sequencer.c:924
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -6660,11 +7493,11 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:1148
+#: sequencer.c:1211
msgid "'prepare-commit-msg' hook failed"
msgstr "kroken \"prepare-commit-msg\" misslyckades"
-#: sequencer.c:1154
+#: sequencer.c:1217
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6691,7 +7524,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1167
+#: sequencer.c:1230
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6716,326 +7549,340 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1209
+#: sequencer.c:1272
msgid "couldn't look up newly created commit"
msgstr "kunde inte slå upp en precis skapad incheckning"
-#: sequencer.c:1211
+#: sequencer.c:1274
msgid "could not parse newly created commit"
msgstr "kunde inte tolka en precis skapad incheckning"
-#: sequencer.c:1257
+#: sequencer.c:1320
msgid "unable to resolve HEAD after creating commit"
msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning"
-#: sequencer.c:1259
+#: sequencer.c:1322
msgid "detached HEAD"
msgstr "frånkopplad HEAD"
-#: sequencer.c:1263
+#: sequencer.c:1326
msgid " (root-commit)"
msgstr " (rotincheckning)"
-#: sequencer.c:1284
+#: sequencer.c:1347
msgid "could not parse HEAD"
msgstr "kunde inte tolka HEAD"
-#: sequencer.c:1286
+#: sequencer.c:1349
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s är inte en incheckning!"
-#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574
+#: sequencer.c:1353 sequencer.c:1431 builtin/commit.c:1577
msgid "could not parse HEAD commit"
msgstr "kunde inte tolka HEAD:s incheckning"
-#: sequencer.c:1342 sequencer.c:1968
+#: sequencer.c:1409 sequencer.c:2108
msgid "unable to parse commit author"
msgstr "kunde inte tolka incheckningens författare"
-#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687
+#: sequencer.c:1420 builtin/am.c:1566 builtin/merge.c:702
msgid "git write-tree failed to write a tree"
msgstr "git write-tree misslyckades skriva ett träd"
-#: sequencer.c:1386 sequencer.c:1447
+#: sequencer.c:1453 sequencer.c:1573
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "kunde inte läsa incheckningsmeddelande från \"%s\""
-#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886
-#: builtin/merge.c:911
+#: sequencer.c:1484 sequencer.c:1516
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr "ogiltig författar-identitet \"%s\""
+
+#: sequencer.c:1490
+msgid "corrupt author: missing date information"
+msgstr "trasig författare: saknar datuminformation"
+
+#: sequencer.c:1529 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:905
+#: builtin/merge.c:930 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "kunde inte skriva incheckningsobjekt"
-#: sequencer.c:1474
+#: sequencer.c:1556 sequencer.c:4291 t/helper/test-fast-rebase.c:198
+#, c-format
+msgid "could not update %s"
+msgstr "kunde inte uppdatera %s"
+
+#: sequencer.c:1605
#, c-format
msgid "could not parse commit %s"
msgstr "kunde inte tolka incheckningen %s"
-#: sequencer.c:1479
+#: sequencer.c:1610
#, c-format
msgid "could not parse parent commit %s"
msgstr "kunde inte tolka föräldraincheckningen %s"
-#: sequencer.c:1562 sequencer.c:1673
+#: sequencer.c:1693 sequencer.c:1804
#, c-format
msgid "unknown command: %d"
msgstr "okänt kommando: %d"
-#: sequencer.c:1620 sequencer.c:1645
+#: sequencer.c:1751 sequencer.c:1776
#, c-format
msgid "This is a combination of %d commits."
msgstr "Det här är en kombination av %d incheckningar."
-#: sequencer.c:1630
+#: sequencer.c:1761
msgid "need a HEAD to fixup"
msgstr "behöver en HEAD-incheckning att rätta"
-#: sequencer.c:1632 sequencer.c:3212
+#: sequencer.c:1763 sequencer.c:3380
msgid "could not read HEAD"
msgstr "kunde inte läsa HEAD"
-#: sequencer.c:1634
+#: sequencer.c:1765
msgid "could not read HEAD's commit message"
msgstr "kunde inte läsa HEAD:s incheckningsmeddelande"
-#: sequencer.c:1640
+#: sequencer.c:1771
#, c-format
msgid "cannot write '%s'"
msgstr "kan inte skriva \"%s\""
-#: sequencer.c:1647 git-rebase--preserve-merges.sh:496
+#: sequencer.c:1778 git-rebase--preserve-merges.sh:486
msgid "This is the 1st commit message:"
msgstr "Det här är 1:a incheckningsmeddelandet:"
-#: sequencer.c:1655
+#: sequencer.c:1786
#, c-format
msgid "could not read commit message of %s"
msgstr "kunde inte läsa incheckningsmeddelande för %s"
-#: sequencer.c:1662
+#: sequencer.c:1793
#, c-format
msgid "This is the commit message #%d:"
msgstr "Det här är incheckningsmeddelande %d:"
-#: sequencer.c:1668
+#: sequencer.c:1799
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Incheckningsmeddelande %d kommer hoppas över:"
-#: sequencer.c:1756
+#: sequencer.c:1887
msgid "your index file is unmerged."
msgstr "din indexfil har inte slagits ihop."
-#: sequencer.c:1763
+#: sequencer.c:1894
msgid "cannot fixup root commit"
msgstr "kan inte göra \"fixup\" på rotincheckning"
-#: sequencer.c:1782
+#: sequencer.c:1913
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "incheckning %s är en sammanslagning, men flaggan -m angavs inte."
-#: sequencer.c:1790 sequencer.c:1798
+#: sequencer.c:1921 sequencer.c:1929
#, c-format
msgid "commit %s does not have parent %d"
msgstr "incheckning %s har inte förälder %d"
-#: sequencer.c:1804
+#: sequencer.c:1935
#, c-format
msgid "cannot get commit message for %s"
msgstr "kan inte hämta incheckningsmeddelande för %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1823
+#: sequencer.c:1954
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: kan inte tolka föräldraincheckningen %s"
-#: sequencer.c:1888
+#: sequencer.c:2019
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "kunde inte byta namn på \"%s\" till \"%s\""
-#: sequencer.c:1943
+#: sequencer.c:2079
#, c-format
msgid "could not revert %s... %s"
msgstr "kunde inte ångra %s... %s"
-#: sequencer.c:1944
+#: sequencer.c:2080
#, c-format
msgid "could not apply %s... %s"
msgstr "kunde inte tillämpa %s... %s"
-#: sequencer.c:1961
+#: sequencer.c:2100
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "utelämnar %s %s -- patchinnehållet finns redan uppströms\n"
-#: sequencer.c:2018
+#: sequencer.c:2158
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: misslyckades läsa indexet"
-#: sequencer.c:2025
+#: sequencer.c:2165
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: misslyckades uppdatera indexet"
-#: sequencer.c:2102
+#: sequencer.c:2242
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s tar inte argument: \"%s\""
-#: sequencer.c:2111
+#: sequencer.c:2251
#, c-format
msgid "missing arguments for %s"
msgstr "argument saknas för %s"
-#: sequencer.c:2142
+#: sequencer.c:2282
#, c-format
msgid "could not parse '%s'"
msgstr "kunde inte tolka \"%s\""
-#: sequencer.c:2203
+#: sequencer.c:2343
#, c-format
msgid "invalid line %d: %.*s"
msgstr "ogiltig rad %d: %.*s"
-#: sequencer.c:2214
+#: sequencer.c:2354
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "kan inte utföra \"%s\" utan en föregående incheckning"
-#: sequencer.c:2298
+#: sequencer.c:2440
msgid "cancelling a cherry picking in progress"
msgstr "avbryter pågående \"cherry-pick\""
-#: sequencer.c:2305
+#: sequencer.c:2449
msgid "cancelling a revert in progress"
msgstr "avbryter pågående \"revert\""
-#: sequencer.c:2349
+#: sequencer.c:2493
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "rätta det med \"git rebase --edit-todo\"."
-#: sequencer.c:2351
+#: sequencer.c:2495
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "oanvändbart manus: \"%s\""
-#: sequencer.c:2356
+#: sequencer.c:2500
msgid "no commits parsed."
msgstr "inga incheckningar lästes."
-#: sequencer.c:2367
+#: sequencer.c:2511
msgid "cannot cherry-pick during a revert."
msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"."
-#: sequencer.c:2369
+#: sequencer.c:2513
msgid "cannot revert during a cherry-pick."
msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"."
-#: sequencer.c:2447
+#: sequencer.c:2591
#, c-format
msgid "invalid value for %s: %s"
msgstr "felaktigt värde för %s: %s"
-#: sequencer.c:2540
+#: sequencer.c:2698
msgid "unusable squash-onto"
msgstr "oanvändbar squash-onto"
-#: sequencer.c:2556
+#: sequencer.c:2718
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "trasigt manus: \"%s\""
-#: sequencer.c:2644 sequencer.c:4361
+#: sequencer.c:2811 sequencer.c:4644
msgid "empty commit set passed"
msgstr "den angivna uppsättningen incheckningar är tom"
-#: sequencer.c:2660
+#: sequencer.c:2828
msgid "revert is already in progress"
msgstr "en \"revert\" pågår redan"
-#: sequencer.c:2662
+#: sequencer.c:2830
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "testa \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:2665
+#: sequencer.c:2833
msgid "cherry-pick is already in progress"
msgstr "en \"cherry-pick\" pågår redan"
-#: sequencer.c:2667
+#: sequencer.c:2835
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "testa \"git cherry-pick (--continue | %s--abort | --quit)\""
-#: sequencer.c:2681
+#: sequencer.c:2849
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""
-#: sequencer.c:2696
+#: sequencer.c:2864
msgid "could not lock HEAD"
msgstr "kunde inte låsa HEAD"
-#: sequencer.c:2756 sequencer.c:4099
+#: sequencer.c:2924 sequencer.c:4379
msgid "no cherry-pick or revert in progress"
msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"
-#: sequencer.c:2758 sequencer.c:2769
+#: sequencer.c:2926 sequencer.c:2937
msgid "cannot resolve HEAD"
msgstr "kan inte bestämma HEAD"
-#: sequencer.c:2760 sequencer.c:2804
+#: sequencer.c:2928 sequencer.c:2972
msgid "cannot abort from a branch yet to be born"
msgstr "kan inte avbryta från en gren som ännu inte är född"
-#: sequencer.c:2790 builtin/grep.c:724
+#: sequencer.c:2958 builtin/grep.c:757
#, c-format
msgid "cannot open '%s'"
msgstr "kan inte öppna \"%s\""
-#: sequencer.c:2792
+#: sequencer.c:2960
#, c-format
msgid "cannot read '%s': %s"
msgstr "kan inte läsa \"%s\": %s"
-#: sequencer.c:2793
+#: sequencer.c:2961
msgid "unexpected end of file"
msgstr "oväntat filslut"
-#: sequencer.c:2799
+#: sequencer.c:2967
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig"
-#: sequencer.c:2810
+#: sequencer.c:2978
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Du verkar ha flyttat HEAD.\n"
"Spolar inte tillbaka, kontrollera HEAD!"
-#: sequencer.c:2851
+#: sequencer.c:3019
msgid "no revert in progress"
msgstr "ingen \"revers\" pågår"
-#: sequencer.c:2859
+#: sequencer.c:3028
msgid "no cherry-pick in progress"
msgstr "ingen \"cherry-pick\" pågår"
-#: sequencer.c:2869
+#: sequencer.c:3038
msgid "failed to skip the commit"
msgstr "kunde inte hoppa över incheckningen"
-#: sequencer.c:2876
+#: sequencer.c:3045
msgid "there is nothing to skip"
msgstr "ingenting att hoppa över"
-#: sequencer.c:2879
+#: sequencer.c:3048
#, c-format
msgid ""
"have you committed already?\n"
@@ -7044,21 +7891,16 @@
"har du redan checkat in?\n"
"testa \"git %s --continue\""
-#: sequencer.c:3003 sequencer.c:4011
-#, c-format
-msgid "could not update %s"
-msgstr "kunde inte uppdatera %s"
-
-#: sequencer.c:3042 sequencer.c:3991
+#: sequencer.c:3210 sequencer.c:4271
msgid "cannot read HEAD"
msgstr "kan inte läsa HEAD"
-#: sequencer.c:3059
+#: sequencer.c:3227
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "kan inte kopiera in \"%s\" till \"%s\""
-#: sequencer.c:3067
+#: sequencer.c:3235
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -7077,22 +7919,27 @@
"\n"
"\tgit rebase --continue\n"
-#: sequencer.c:3077
+#: sequencer.c:3245
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "Kunde inte tillämpa %s... %.*s"
-#: sequencer.c:3084
+#: sequencer.c:3252
#, c-format
msgid "Could not merge %.*s"
msgstr "Kunde inte slå ihop %.*s"
-#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641
+#: sequencer.c:3266 sequencer.c:3270 builtin/difftool.c:640
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "kunde inte kopiera in \"%s\" till \"%s\""
-#: sequencer.c:3129
+#: sequencer.c:3282
+#, c-format
+msgid "Executing: %s\n"
+msgstr "Kör: %s\n"
+
+#: sequencer.c:3297
#, c-format
msgid ""
"execution failed: %s\n"
@@ -7107,11 +7954,11 @@
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:3135
+#: sequencer.c:3303
msgid "and made changes to the index and/or the working tree\n"
msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen\n"
-#: sequencer.c:3141
+#: sequencer.c:3309
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -7128,102 +7975,123 @@
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:3202
+#: sequencer.c:3370
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "ogiltigt etikettnamn: \"%.*s\""
-#: sequencer.c:3256
+#: sequencer.c:3424
msgid "writing fake root commit"
msgstr "skriver fejkad rotincheckning"
-#: sequencer.c:3261
+#: sequencer.c:3429
msgid "writing squash-onto"
msgstr "skriver squash-onto"
-#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886
-#, c-format
-msgid "failed to find tree of %s"
-msgstr "kunde inte hitta trädet för %s."
-
-#: sequencer.c:3344
+#: sequencer.c:3513
#, c-format
msgid "could not resolve '%s'"
msgstr "kunde inte upplösa \"%s\""
-#: sequencer.c:3375
+#: sequencer.c:3546
msgid "cannot merge without a current revision"
msgstr "kan inte slå ihop utan en aktuell incheckning"
-#: sequencer.c:3397
+#: sequencer.c:3568
#, c-format
msgid "unable to parse '%.*s'"
msgstr "kan inte tolka \"%.*s\""
-#: sequencer.c:3406
+#: sequencer.c:3577
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "inget att slå samman: \"%.*s\""
-#: sequencer.c:3418
+#: sequencer.c:3589
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "\"octopus\"-sammanslagning kan inte köras ovanpå en [ny rot]"
-#: sequencer.c:3434
+#: sequencer.c:3605
#, c-format
msgid "could not get commit message of '%s'"
msgstr "kunde inte läsa incheckningsmeddelande för \"%s\""
-#: sequencer.c:3594
+#: sequencer.c:3788
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "kunde inte ens försöka slå ihop \"%.*s\""
-#: sequencer.c:3610
+#: sequencer.c:3804
msgid "merge: Unable to write new index file"
msgstr "sammanslagning: Kunde inte skriva ny indexfil"
-#: sequencer.c:3679 builtin/rebase.c:737
+#: sequencer.c:3878
+msgid "Cannot autostash"
+msgstr "Kan inte utföra \"autostash\""
+
+#: sequencer.c:3881
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "Oväntat svar från stash: \"%s\""
+
+#: sequencer.c:3887
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "Kunde inte skapa katalog för \"%s\""
+
+#: sequencer.c:3890
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "Skapade autostash: %s\n"
+
+#: sequencer.c:3894
+msgid "could not reset --hard"
+msgstr "kunde inte utföra \"reset --hard\""
+
+#: sequencer.c:3919
#, c-format
msgid "Applied autostash.\n"
msgstr "Tillämpade autostash.\n"
-#: sequencer.c:3691
+#: sequencer.c:3931
#, c-format
msgid "cannot store %s"
msgstr "kan inte spara %s"
-#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113
+#: sequencer.c:3934
#, 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:3755
-#, c-format
-msgid "%s: not a valid OID"
-msgstr "%s: inte ett giltigt OID"
+#: sequencer.c:3939
+msgid "Applying autostash resulted in conflicts."
+msgstr "Tillämpning av autostash gav konflikter."
-#: sequencer.c:3760 git-rebase--preserve-merges.sh:779
+#: sequencer.c:3940
+msgid "Autostash exists; creating a new stash entry."
+msgstr "Autostash finns; skapar ny stash-post."
+
+#: sequencer.c:4033 git-rebase--preserve-merges.sh:769
msgid "could not detach HEAD"
msgstr "kunde inte koppla från HEAD"
-#: sequencer.c:3775
+#: sequencer.c:4048
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Stoppade på HEAD\n"
-#: sequencer.c:3777
+#: sequencer.c:4050
#, c-format
msgid "Stopped at %s\n"
msgstr "Stoppade på %s\n"
-#: sequencer.c:3785
+#: sequencer.c:4058
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -7244,48 +8112,58 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:3869
+#: sequencer.c:4104
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "Ombaserar (%d/%d)%s"
+
+#: sequencer.c:4149
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Stoppade på %s... %.*s\n"
-#: sequencer.c:3940
+#: sequencer.c:4220
#, c-format
msgid "unknown command %d"
msgstr "okänt kommando %d"
-#: sequencer.c:3999
+#: sequencer.c:4279
msgid "could not read orig-head"
msgstr "kunde inte läsa orig-head"
-#: sequencer.c:4004
+#: sequencer.c:4284
msgid "could not read 'onto'"
msgstr "kunde inte läsa \"onto\""
-#: sequencer.c:4018
+#: sequencer.c:4298
#, c-format
msgid "could not update HEAD to %s"
msgstr "kunde inte uppdatera HEAD till %s"
-#: sequencer.c:4111
+#: sequencer.c:4358
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "Lyckades ombasera och uppdatera %s.\n"
+
+#: sequencer.c:4391
msgid "cannot rebase: You have unstaged changes."
msgstr "kan inte ombasera: Du har oköade ändringar."
-#: sequencer.c:4120
+#: sequencer.c:4400
msgid "cannot amend non-existing commit"
msgstr "kan inte lägga till incheckning som inte finns"
-#: sequencer.c:4122
+#: sequencer.c:4402
#, c-format
msgid "invalid file: '%s'"
msgstr "ogiltig fil: \"%s\""
-#: sequencer.c:4124
+#: sequencer.c:4404
#, c-format
msgid "invalid contents: '%s'"
msgstr "ogiltigt innehåll: \"%s\""
-#: sequencer.c:4127
+#: sequencer.c:4407
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -7295,59 +8173,59 @@
"Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"
"först och kör sedan \"git rebase --continue\" igen."
-#: sequencer.c:4163 sequencer.c:4202
+#: sequencer.c:4443 sequencer.c:4482
#, c-format
msgid "could not write file: '%s'"
msgstr "kunde inte skriva fil: \"%s\""
-#: sequencer.c:4217
+#: sequencer.c:4498
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "kunde inte ta bort CHERRY_PICK_HEAD"
-#: sequencer.c:4224
+#: sequencer.c:4505
msgid "could not commit staged changes."
msgstr "kunde inte checka in köade ändringar."
-#: sequencer.c:4338
+#: sequencer.c:4621
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\""
-#: sequencer.c:4342
+#: sequencer.c:4625
#, c-format
msgid "%s: bad revision"
msgstr "%s: felaktig revision"
-#: sequencer.c:4377
+#: sequencer.c:4660
msgid "can't revert as initial commit"
msgstr "kan inte ångra som första incheckning"
-#: sequencer.c:4846
+#: sequencer.c:5137
msgid "make_script: unhandled options"
msgstr "make_script: flaggor som inte stöds"
-#: sequencer.c:4849
+#: sequencer.c:5140
msgid "make_script: error preparing revisions"
msgstr "make_script: fel när revisioner skulle förberedas"
-#: sequencer.c:5083 sequencer.c:5100
+#: sequencer.c:5382 sequencer.c:5399
msgid "nothing to do"
msgstr "inget att göra"
-#: sequencer.c:5119
+#: sequencer.c:5418
msgid "could not skip unnecessary pick commands"
msgstr "kunde inte hoppa över onödiga \"pick\"-kommandon"
-#: sequencer.c:5213
+#: sequencer.c:5512
msgid "the script was already rearranged."
msgstr "skriptet har redan omordnats."
-#: setup.c:124
+#: setup.c:133
#, c-format
msgid "'%s' is outside repository at '%s'"
msgstr "\"%s\" är utanför arkivet på \"%s\""
-#: setup.c:175
+#: setup.c:185
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
@@ -7357,7 +8235,7 @@
"Använd \"git <kommando> -- <sökväg>..\" för att ange sökvägar som inte finns "
"lokalt."
-#: setup.c:188
+#: setup.c:198
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -7369,12 +8247,12 @@
"Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"
"\"git <kommando> [<revision>...] -- [<fil>...]\""
-#: setup.c:254
+#: setup.c: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:273
+#: setup.c:283
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -7385,92 +8263,96 @@
"Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"
"\"git <kommando> [<revision>...] -- [<fil>...]\""
-#: setup.c:409
+#: setup.c:419
msgid "unable to set up work tree using invalid config"
msgstr "kan inte skapa arbetskatalog med felaktig konfiguration"
-#: setup.c:413
+#: setup.c:423
msgid "this operation must be run in a work tree"
msgstr "funktionen måste köras i en arbetskatalog"
-#: setup.c:559
+#: setup.c:661
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Förväntade git-arkivversion <= %d, hittade %d"
-#: setup.c:567
+#: setup.c:669
msgid "unknown repository extensions found:"
msgstr "okända arkivutökningar hittades:"
-#: setup.c:586
+#: 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:588
+#: 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:590
+#: setup.c:704
#, c-format
msgid "error reading %s"
msgstr "fel vid läsning av %s"
-#: setup.c:592
+#: setup.c:706
#, c-format
msgid "invalid gitfile format: %s"
msgstr "ogiltigt gitfilformat: %s"
-#: setup.c:594
+#: setup.c:708
#, c-format
msgid "no path in gitfile: %s"
msgstr "ingen sökväg i gitfil: %s"
-#: setup.c:596
+#: setup.c:710
#, c-format
msgid "not a git repository: %s"
msgstr "inte ett git-arkiv: %s"
-#: setup.c:695
+#: setup.c:812
#, c-format
msgid "'$%s' too big"
msgstr "\"$%s\" för stor"
-#: setup.c:709
+#: setup.c:826
#, c-format
msgid "not a git repository: '%s'"
msgstr "inte ett git-arkiv: \"%s\""
-#: setup.c:738 setup.c:740 setup.c:771
+#: setup.c:855 setup.c:857 setup.c:888
#, c-format
msgid "cannot chdir to '%s'"
msgstr "kan inte byta katalog (chdir) till \"%s\""
-#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856
+#: setup.c: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:870
+#: setup.c:987
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "misslyckades ta status på \"%*ss%s%s\""
-#: setup.c:1108
+#: setup.c:1225
msgid "Unable to read current working directory"
msgstr "Kan inte läsa aktuell arbetskatalog"
-#: setup.c:1117 setup.c:1123
+#: setup.c:1234 setup.c:1240
#, c-format
msgid "cannot change to '%s'"
msgstr "kan inte byta till \"%s\""
-#: setup.c:1128
+#: 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:1134
+#: setup.c:1251
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
@@ -7480,7 +8362,7 @@
"monteringspunkten %s)\n"
"Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)."
-#: setup.c:1245
+#: setup.c:1362
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -7489,408 +8371,56 @@
"problem med filläges-värdet i core.sharedRepository (0%.3o).\n"
"Ägaren av filerna måste alltid ha läs- och skrivbehörighet."
-#: setup.c:1289
+#: setup.c:1409
msgid "open /dev/null or dup failed"
msgstr "misslyckades öppna /dev/null eller \"dup\""
-#: setup.c:1304
+#: setup.c:1424
msgid "fork failed"
msgstr "\"fork\" misslyckades"
-#: setup.c:1309
+#: setup.c:1429
msgid "setsid failed"
msgstr "\"setsid\" misslyckades"
-#: sha1-file.c:452
-#, c-format
-msgid "object directory %s does not exist; check .git/objects/info/alternates"
-msgstr "objektkatalogen %s finns inte; se .git/objects/info/alternates"
-
-#: sha1-file.c:503
-#, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr "kunde inte normalisera supplerande objektsökväg: %s"
-
-#: sha1-file.c:575
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr "%s: ignorerar supplerande objektlager, för djup nästling"
-
-#: sha1-file.c:582
-#, c-format
-msgid "unable to normalize object directory: %s"
-msgstr "kan inte normalisera objektkatalogen: %s"
-
-#: sha1-file.c:625
-msgid "unable to fdopen alternates lockfile"
-msgstr "kan inte utföra \"fdopen\" på suppleantlåsfil"
-
-#: sha1-file.c:643
-msgid "unable to read alternates file"
-msgstr "kan inte läsa \"alternates\"-filen"
-
-#: sha1-file.c:650
-msgid "unable to move new alternates file into place"
-msgstr "kan inte flytta ny \"alternates\"-fil på plats"
-
-#: sha1-file.c:685
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "sökvägen \"%s\" finns inte"
-
-#: sha1-file.c:711
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu."
-
-#: sha1-file.c:717
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."
-
-#: sha1-file.c:723
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "referensarkivet \"%s\" är grunt"
-
-#: sha1-file.c:731
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "referensarkivet \"%s\" är ympat"
-
-#: sha1-file.c:791
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "felaktig rad vid tolkning av supplerande referenser: %s"
-
-#: sha1-file.c:943
-#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
-msgstr "försök att utföra \"mmap\" på %<PRIuMAX> över gränsen %<PRIuMAX>"
-
-#: sha1-file.c:964
-msgid "mmap failed"
-msgstr "mmap misslyckades"
-
-#: sha1-file.c:1128
-#, c-format
-msgid "object file %s is empty"
-msgstr "objektfilen %s är tom"
-
-#: sha1-file.c:1263 sha1-file.c:2443
-#, c-format
-msgid "corrupt loose object '%s'"
-msgstr "trasigt löst objekt \"%s\""
-
-#: sha1-file.c:1265 sha1-file.c:2447
-#, c-format
-msgid "garbage at end of loose object '%s'"
-msgstr "skräp i slutet av löst objekt \"%s\""
-
-#: sha1-file.c:1307
-msgid "invalid object type"
-msgstr "felaktig objekttyp"
-
-#: sha1-file.c:1391
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "kan inte packa upp %s-huvud med --allow-unknown-type"
-
-#: sha1-file.c:1394
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "kan inte packa upp %s-huvudet"
-
-#: sha1-file.c:1400
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "kan inte tolka %s-huvud med --allow-unknown-type"
-
-#: sha1-file.c:1403
-#, c-format
-msgid "unable to parse %s header"
-msgstr "kan inte tolka %s-huvud"
-
-#: sha1-file.c:1629
-#, c-format
-msgid "failed to read object %s"
-msgstr "misslyckades läsa objektet %s"
-
-#: sha1-file.c:1633
-#, c-format
-msgid "replacement %s not found for %s"
-msgstr "ersättningen %s hittades inte för %s"
-
-#: sha1-file.c:1637
-#, c-format
-msgid "loose object %s (stored in %s) is corrupt"
-msgstr "löst objekt %s (lagrat i %s) är trasigt"
-
-#: sha1-file.c:1641
-#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "packat objekt %s (lagrat i %s) är trasigt"
-
-#: sha1-file.c:1746
-#, c-format
-msgid "unable to write file %s"
-msgstr "kunde inte skriva filen %s"
-
-#: sha1-file.c:1753
-#, c-format
-msgid "unable to set permission to '%s'"
-msgstr "kan inte sätta behörigheten till \"%s\""
-
-#: sha1-file.c:1760
-msgid "file write error"
-msgstr "fel vid skrivning av fil"
-
-#: sha1-file.c:1780
-msgid "error when closing loose object file"
-msgstr "fel vid stängning av fil för löst objekt"
-
-#: sha1-file.c:1845
-#, c-format
-msgid "insufficient permission for adding an object to repository database %s"
-msgstr ""
-"otillräcklig behörighet för att lägga till objekt till arkivdatabasen %s"
-
-#: sha1-file.c:1847
-msgid "unable to create temporary file"
-msgstr "kan inte skapa temporär fil"
-
-#: sha1-file.c:1871
-msgid "unable to write loose object file"
-msgstr "kunde inte skriva fil för löst objekt"
-
-#: sha1-file.c:1877
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr "kan inte utföra \"deflate\" på nytt objekt %s (%d)"
-
-#: sha1-file.c:1881
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr "\"deflateend\" på objektet %s misslyckades (%d)"
-
-#: sha1-file.c:1885
-#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr "förvirrad av instabil objektkälldata för %s"
-
-#: sha1-file.c:1895 builtin/pack-objects.c:1054
-#, c-format
-msgid "failed utime() on %s"
-msgstr "\"utime()\" misslyckades på %s"
-
-#: sha1-file.c:1972
-#, c-format
-msgid "cannot read object for %s"
-msgstr "kan inte läsa objekt för %s"
-
-#: sha1-file.c:2011
-msgid "corrupt commit"
-msgstr "trasik incheckning"
-
-#: sha1-file.c:2019
-msgid "corrupt tag"
-msgstr "trasig tagg"
-
-#: sha1-file.c:2119
-#, c-format
-msgid "read error while indexing %s"
-msgstr "läsfel vid indexering av %s"
-
-#: sha1-file.c:2122
-#, c-format
-msgid "short read while indexing %s"
-msgstr "för lite lästes vid indexering av %s"
-
-#: sha1-file.c:2195 sha1-file.c:2205
-#, c-format
-msgid "%s: failed to insert into database"
-msgstr "%s: misslyckades lägga in i databasen"
-
-#: sha1-file.c:2211
-#, c-format
-msgid "%s: unsupported file type"
-msgstr "%s: filtypen stöds ej"
-
-#: sha1-file.c:2235
-#, c-format
-msgid "%s is not a valid object"
-msgstr "%s är inte ett giltigt objekt"
-
-#: sha1-file.c:2237
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s är inte ett giltigt \"%s\"-objekt"
-
-#: sha1-file.c:2264 builtin/index-pack.c:155
-#, c-format
-msgid "unable to open %s"
-msgstr "kan inte öppna %s"
-
-#: sha1-file.c:2454 sha1-file.c:2507
-#, c-format
-msgid "hash mismatch for %s (expected %s)"
-msgstr "hash stämmer inte för %s (förväntade %s)"
-
-#: sha1-file.c:2478
-#, c-format
-msgid "unable to mmap %s"
-msgstr "kan inte utföra \"mmap\" för %s"
-
-#: sha1-file.c:2483
-#, c-format
-msgid "unable to unpack header of %s"
-msgstr "kan inte packa upp huvud för %s"
-
-#: sha1-file.c:2489
-#, c-format
-msgid "unable to parse header of %s"
-msgstr "kan inte tolka huvud för %s"
-
-#: sha1-file.c:2500
-#, c-format
-msgid "unable to unpack contents of %s"
-msgstr "kan inte tolka innehåll i %s"
-
-#: sha1-name.c:486
-#, c-format
-msgid "short SHA1 %s is ambiguous"
-msgstr "kort SHA1 %s är tvetydig"
-
-#: sha1-name.c:497
-msgid "The candidates are:"
-msgstr "Kandidaterna är:"
-
-#: 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 skapar normalt aldrig referenser som slutar med 40 hexadecimala\n"
-"tecken, då detta ignoreras när du anger 40-hex enbart. Dessa\n"
-"referenser kan skapas av misstag. Till exempel, för\n"
-"\n"
-" git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"där \"$br\" på något sätt blivit tomt och en 40-hex-referens skapats.\n"
-"Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n"
-"genom att köra \"git config advice.objectNameWarning false\""
-
-#: sha1-name.c:916
-#, c-format
-msgid "log for '%.*s' only goes back to %s"
-msgstr "loggen för \"%.*s\" räcker bara tillbaka till %s"
-
-#: sha1-name.c:924
-#, c-format
-msgid "log for '%.*s' only has %d entries"
-msgstr "loggen för \"%.*s\" har bara %d poster"
-
-#: sha1-name.c:1689
-#, c-format
-msgid "path '%s' exists on disk, but not in '%.*s'"
-msgstr "Sökvägen \"%s\" finns på disken, men inte i \"%.*s\""
-
-#: sha1-name.c:1695
-#, c-format
-msgid ""
-"path '%s' exists, but not '%s'\n"
-"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
-msgstr ""
-"sökvägen \"%s\" finns, men inte i \"%s\"\n"
-"tips: Menade du \"%.*s:%s\", även känd som \"%.*s:./%s\"?"
-
-#: sha1-name.c:1704
-#, c-format
-msgid "path '%s' does not exist in '%.*s'"
-msgstr "sökvägen \"%s\" finns inte i \"%.*s\""
-
-#: sha1-name.c:1732
-#, c-format
-msgid ""
-"path '%s' is in the index, but not at stage %d\n"
-"hint: Did you mean ':%d:%s'?"
-msgstr ""
-"sökvägen \"%s\" finns i indexet men inte i etapp %d\n"
-"tips: Menade du \":%d:%s\"?"
-
-#: sha1-name.c:1748
-#, c-format
-msgid ""
-"path '%s' is in the index, but not '%s'\n"
-"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
-msgstr ""
-"sökvägen \"%s\" finns i indexet, men inte i \"%s\"\n"
-"tips: Menade du \":%d:%s\", även känd som \":%d:./%s\"?"
-
-#: sha1-name.c:1756
-#, c-format
-msgid "path '%s' exists on disk, but not in the index"
-msgstr "sökvägen \"%s\" finns på disk, men inte i indexet"
-
-#: sha1-name.c:1758
-#, c-format
-msgid "path '%s' does not exist (neither on disk nor in the index)"
-msgstr "sökvägen \"%s\" finns inte (varken i disken eller i indexet)"
-
-#: sha1-name.c:1771
-msgid "relative path syntax can't be used outside working tree"
-msgstr "relativ sökväg kan inte användas utanför arbetskatalogen"
-
-#: sha1-name.c:1909
-#, c-format
-msgid "invalid object name '%.*s'."
-msgstr "felaktigt objektnamn \"%.*s\"."
-
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:837
+#: strbuf.c:848
#, c-format
msgid "%u.%2.2u GiB"
msgstr "%u,%2.2u GiB"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:839
+#: 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:847
+#: strbuf.c:858
#, c-format
msgid "%u.%2.2u MiB"
msgstr "%u,%2.2u MiB"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:849
+#: 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:856
+#: strbuf.c:867
#, c-format
msgid "%u.%2.2u KiB"
msgstr "%u,%2.2u KiB"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:858
+#: 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:864
+#: strbuf.c:875
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
@@ -7898,18 +8428,48 @@
msgstr[1] "%u bytes"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:866
+#: 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:1164
+#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719
+#: builtin/rebase.c:866
+#, 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 ""
@@ -7940,12 +8500,12 @@
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\""
-#: submodule.c:434
+#: submodule.c:435
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr "felaktigt argument till --ignore-submodules: %s"
-#: submodule.c:815
+#: submodule.c:817
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
@@ -7954,12 +8514,12 @@
"Undermodulen i incheckning %s på sökvägen: \"%s\" krockar med en undermodul "
"med samma namn. Hoppar över den."
-#: submodule.c:910
+#: submodule.c:920
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "undermodulposten \"%s\" (%s) är en %s, inte en incheckning"
-#: submodule.c:995
+#: submodule.c:1005
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
@@ -7968,36 +8528,36 @@
"kunde inte köra \"git rev-list <incheckningar> --not --remotes -n 1\" i "
"undermodulen \"%s\""
-#: submodule.c:1118
+#: submodule.c:1128
#, c-format
msgid "process for submodule '%s' failed"
msgstr "process för undermodulen \"%s\" misslyckades"
-#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045
+#: submodule.c:1157 builtin/branch.c:689 builtin/submodule--helper.c:2469
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Misslyckades slå upp HEAD som giltig referens."
-#: submodule.c:1158
+#: submodule.c:1168
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr "Sänder undermodulen \"%s\"\n"
-#: submodule.c:1161
+#: submodule.c:1171
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "Kunde inte sända undermodulen \"%s\"\n"
-#: submodule.c:1453
+#: submodule.c:1463
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr "Hämtar undermodulen %s%s\n"
-#: submodule.c:1483
+#: submodule.c:1497
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr "Kunde inte komma åt undermodulen \"%s\"\n"
-#: submodule.c:1637
+#: submodule.c:1652
#, c-format
msgid ""
"Errors during submodule fetch:\n"
@@ -8006,61 +8566,61 @@
"Fel vid hämtning av undermodul:\n"
"%s"
-#: submodule.c:1662
+#: submodule.c:1677
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "\"%s\" känns inte igen som ett git-arkiv"
-#: submodule.c:1679
+#: submodule.c:1694
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr "Kunde inte köra \"git status --porcelain=2\" i undermodulen \"%s\""
-#: submodule.c:1720
+#: submodule.c:1735
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr "\"git status --porcelain=2\" misslyckades i undermodulen \"%s\""
-#: submodule.c:1800
+#: submodule.c:1810
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "kunde inte starta \"git status\" i undermodulen \"%s\""
-#: submodule.c:1813
+#: submodule.c:1823
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "kunde inte köra \"git status\" i undermodulen \"%s\""
-#: submodule.c:1828
+#: submodule.c:1838
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "Kunde inte ta bort inställningen core.worktree i undermodulen \"%s\""
-#: submodule.c:1855 submodule.c:2165
+#: submodule.c:1865 submodule.c:2175
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "kunde inte rekursera in i undermodulen \"%s\""
-#: submodule.c:1876
+#: submodule.c:1886
msgid "could not reset submodule index"
msgstr "kunde inte återställa indexet i undermodul"
-#: submodule.c:1918
+#: submodule.c:1928
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "undermodulen \"%s\" har ett smutsigt index"
-#: submodule.c:1970
+#: submodule.c:1980
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "Undermoduler \"%s\" kunde inte uppdateras."
-#: submodule.c:2038
+#: submodule.c:2048
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr "undermodul-gitkatalogen \"%s\" är inuti gitkatalogen \"%.*s\""
-#: submodule.c:2059
+#: submodule.c:2069
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -8068,17 +8628,17 @@
"relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, "
"stöds ej"
-#: submodule.c:2071 submodule.c:2130
+#: submodule.c:2081 submodule.c:2140
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "kunde inte slå upp namnet för undermodulen \"%s\""
-#: submodule.c:2075
+#: submodule.c:2085
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr "vägrar flytta \"%s\" till en befintlig gitkatalog"
-#: submodule.c:2082
+#: submodule.c:2092
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -8089,93 +8649,261 @@
"\"%s\" till\n"
"\"%s\"\n"
-#: submodule.c:2209
+#: submodule.c:2220
msgid "could not start ls-files in .."
msgstr "kunde inte starta ls-files i .."
-#: submodule.c:2248
+#: submodule.c:2260
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree returnerade en oväntad returkod %d"
-#: submodule-config.c:236
-#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "ignorerar misstänkt undermodulnamn: %s"
-
-#: submodule-config.c:303
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "negativa värden är inte tillåtna för submodule.fetchjobs"
-
-#: submodule-config.c:401
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr "ignorerar \"%s\" som kan tolkas som en kommandoradsflagga: %s"
-
-#: submodule-config.c:498
-#, c-format
-msgid "invalid value for %s"
-msgstr "ogiltigt värde för %s"
-
-#: submodule-config.c:765
-#, 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\""
+msgstr "misslyckades utföra släpradskommandot \"%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:298 builtin/remote.c:323
+#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324
#, 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 builtin/mktag.c:91
msgid "could not read from stdin"
msgstr "kunde inte läsa från standard in"
-#: trailer.c:1011 wrapper.c:665
+#: 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-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:145
+#, c-format
+msgid "unable to find remote helper for '%s'"
+msgstr "kan inte hitta fjärrhjälpare för \"%s\""
+
+#: transport-helper.c:161 transport-helper.c:575
+msgid "can't dup helper output fd"
+msgstr "kunde inte duplicera utdata-filhandtag"
+
+#: transport-helper.c:214
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
+msgstr ""
+"okänd krävd förmåga (capability) %s; fjärrhjälparen behöver antagligen en "
+"nyare version av Git"
+
+#: 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:287 transport-helper.c:429
+#, c-format
+msgid "%s unexpectedly said: '%s'"
+msgstr "%s sade oväntat: \"%s\""
+
+#: transport-helper.c:417
+#, c-format
+msgid "%s also locked %s"
+msgstr "%s låste också %s"
+
+#: transport-helper.c:497
+msgid "couldn't run fast-import"
+msgstr "kunde inte köra fast-import"
+
+#: transport-helper.c:520
+msgid "error while running fast-import"
+msgstr "fel när fast-import kördes"
+
+#: transport-helper.c:549 transport-helper.c:1237
+#, c-format
+msgid "could not read ref %s"
+msgstr "kunde inte läsa referensen %s"
+
+#: transport-helper.c:594
+#, c-format
+msgid "unknown response to connect: %s"
+msgstr "okänt svar på ansluntning: %s"
+
+#: 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:618
+msgid "invalid remote service path"
+msgstr "felaktig sökväg till fjärrtjänst"
+
+#: transport-helper.c:661 transport.c:1447
+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:745
+msgid "'option' without a matching 'ok/error' directive"
+msgstr "\"option\" utan mostsvarande \"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:845
+#, c-format
+msgid "helper reported unexpected status of %s"
+msgstr "hjälparen returnerade oväntad status %s"
+
+#: transport-helper.c:928
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr "hjälparen %s stöder inte dry-run"
+
+#: transport-helper.c:931
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr "hjälparen %s stöder inte --signed"
+
+#: transport-helper.c:934
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr "hjälparen %s stöder inte --signed=if-asked"
+
+#: transport-helper.c:939
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr "hjälparen %s stöder inte --atomic"
+
+#: transport-helper.c:943
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr "hjälparen %s stöder inte --%s"
+
+#: transport-helper.c:950
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr "hjälparen %s stöder inte \"push-option\""
+
+#: transport-helper.c:1050
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr "fjärrhjälparen stöder inte push; referensspecifikation krävs"
+
+#: transport-helper.c:1055
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr "hjälparen %s stöder inte \"force\""
+
+#: transport-helper.c:1102
+msgid "couldn't run fast-export"
+msgstr "kunde inte köra fast-export"
+
+#: transport-helper.c:1107
+msgid "error while running fast-export"
+msgstr "fel vid körning av fast-export"
+
+#: transport-helper.c:1132
+#, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\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.\n"
+
+#: transport-helper.c:1214
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr "objektformatet \"%s\" stöds ej"
+
+#: transport-helper.c:1223
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr "felformat svar i referenslistan: %s"
+
+#: transport-helper.c:1375
+#, c-format
+msgid "read(%s) failed"
+msgstr "läs(%s) misslyckades"
+
+#: transport-helper.c:1402
+#, c-format
+msgid "write(%s) failed"
+msgstr "skriv(%s) misslyckades"
+
+#: transport-helper.c:1451
+#, c-format
+msgid "%s thread failed"
+msgstr "%s-tråden misslyckades"
+
+#: transport-helper.c:1455
+#, c-format
+msgid "%s thread failed to join: %s"
+msgstr "%s-tråden misslyckades ansluta: %s"
+
+#: transport-helper.c:1474 transport-helper.c:1478
+#, 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:1515
+#, c-format
+msgid "%s process failed to wait"
+msgstr "processen %s misslyckades vänta"
+
+#: transport-helper.c:1519
+#, c-format
+msgid "%s process failed"
+msgstr "processen %s misslyckades"
+
+#: transport-helper.c:1537 transport-helper.c:1546
+msgid "can't start thread for copying data"
+msgstr "kan inte skapa tråd för kopiering av data"
+
#: transport.c:116
#, c-format
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
@@ -8186,42 +8914,42 @@
msgid "could not read bundle '%s'"
msgstr "kunde inte läsa paketet (bundlen) \"%s\""
-#: transport.c:214
+#: transport.c:220
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "transport: ogiltig flagga för depth: \"%s\""
-#: transport.c:266
+#: 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:267
+#: transport.c:270
msgid "server options require protocol version 2 or later"
msgstr "serverflaggor kräver protokollversion 2 eller senare"
-#: transport.c:632
+#: transport.c:727
msgid "could not parse transport.color.* config"
msgstr "kunde inte tolka inställningen för transport.color.*"
-#: transport.c:705
+#: transport.c:802
msgid "support for protocol v2 not implemented yet"
msgstr "stöd för protokoll v2 ännu ej implementerat"
-#: transport.c:831
+#: transport.c:936
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "okänt värde för inställningen \"%s\": %s"
-#: transport.c:897
+#: transport.c:1002
#, c-format
msgid "transport '%s' not allowed"
msgstr "transporten \"%s\" tillåts inte"
-#: transport.c:949
+#: transport.c:1055
msgid "git-over-rsync is no longer supported"
msgstr "git-over-rsync stöds inte längre"
-#: transport.c:1044
+#: transport.c:1157
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -8230,7 +8958,7 @@
"Följande undermodulsökvägar innehåller ändringar som\n"
"inte kan hittas av fjärrarna:\n"
-#: transport.c:1048
+#: transport.c:1161
#, c-format
msgid ""
"\n"
@@ -8257,209 +8985,31 @@
"för att sända dem till fjärren.\n"
"\n"
-#: transport.c:1056
+#: transport.c:1169
msgid "Aborting."
msgstr "Avbryter."
-#: transport.c:1201
+#: transport.c:1316
msgid "failed to push all needed submodules"
msgstr "kunde inte sända alla nödvändiga undermoduler"
-#: transport.c:1345 transport-helper.c:657
-msgid "operation not supported by protocol"
-msgstr "funktionen stöds inte av protokollet"
-
-#: transport-helper.c:61 transport-helper.c:90
-msgid "full write to remote helper failed"
-msgstr "komplett skrivning till fjärrhjälpare misslyckades"
-
-#: transport-helper.c:144
-#, c-format
-msgid "unable to find remote helper for '%s'"
-msgstr "kan inte hitta fjärrhjälpare för \"%s\""
-
-#: transport-helper.c:160 transport-helper.c:571
-msgid "can't dup helper output fd"
-msgstr "kunde inte duplicera utdata-filhandtag"
-
-#: transport-helper.c:211
-#, c-format
-msgid ""
-"unknown mandatory capability %s; this remote helper probably needs newer "
-"version of Git"
-msgstr ""
-"okänd krävd förmåga (capability) %s; fjärrhjälparen behöver antagligen en "
-"nyare version av Git"
-
-#: transport-helper.c:217
-msgid "this remote helper should implement refspec capability"
-msgstr ""
-"fjärrhjälparen behöver implementera förmåga för referensspecifikationer "
-"(refspec)"
-
-#: transport-helper.c:284 transport-helper.c:425
-#, c-format
-msgid "%s unexpectedly said: '%s'"
-msgstr "%s sade oväntat: \"%s\""
-
-#: transport-helper.c:414
-#, c-format
-msgid "%s also locked %s"
-msgstr "%s låste också %s"
-
-#: transport-helper.c:493
-msgid "couldn't run fast-import"
-msgstr "kunde inte köra fast-import"
-
-#: transport-helper.c:516
-msgid "error while running fast-import"
-msgstr "fel när fast-import kördes"
-
-#: transport-helper.c:545 transport-helper.c:1134
-#, c-format
-msgid "could not read ref %s"
-msgstr "kunde inte läsa referensen %s"
-
-#: transport-helper.c:590
-#, c-format
-msgid "unknown response to connect: %s"
-msgstr "okänt svar på ansluntning: %s"
-
-#: transport-helper.c:612
-msgid "setting remote service path not supported by protocol"
-msgstr "protkollet stöder inte att sätta sökväg till fjärrtjänst"
-
-#: transport-helper.c:614
-msgid "invalid remote service path"
-msgstr "felaktig sökväg till fjärrtjänst"
-
-#: transport-helper.c:660
-#, c-format
-msgid "can't connect to subservice %s"
-msgstr "kan inte ansluta till undertjänsten %s"
-
-#: transport-helper.c:736
-#, c-format
-msgid "expected ok/error, helper said '%s'"
-msgstr "förväntade ok/error, hjälpprogrammet svarade \"%s\""
-
-#: transport-helper.c:789
-#, c-format
-msgid "helper reported unexpected status of %s"
-msgstr "hjälparen returnerade oväntad status %s"
-
-#: transport-helper.c:850
-#, c-format
-msgid "helper %s does not support dry-run"
-msgstr "hjälparen %s stöder inte dry-run"
-
-#: transport-helper.c:853
-#, c-format
-msgid "helper %s does not support --signed"
-msgstr "hjälparen %s stöder inte --signed"
-
-#: transport-helper.c:856
-#, c-format
-msgid "helper %s does not support --signed=if-asked"
-msgstr "hjälparen %s stöder inte --signed=if-asked"
-
-#: transport-helper.c:861
-#, c-format
-msgid "helper %s does not support --atomic"
-msgstr "hjälparen %s stöder inte --atomic"
-
-#: transport-helper.c:867
-#, c-format
-msgid "helper %s does not support 'push-option'"
-msgstr "hjälparen %s stöder inte \"push-option\""
-
-#: transport-helper.c:965
-msgid "remote-helper doesn't support push; refspec needed"
-msgstr "fjärrhjälparen stöder inte push; referensspecifikation krävs"
-
-#: transport-helper.c:970
-#, c-format
-msgid "helper %s does not support 'force'"
-msgstr "hjälparen %s stöder inte \"force\""
-
-#: transport-helper.c:1017
-msgid "couldn't run fast-export"
-msgstr "kunde inte köra fast-export"
-
-#: transport-helper.c:1022
-msgid "error while running fast-export"
-msgstr "fel vid körning av fast-export"
-
-#: transport-helper.c:1047
-#, c-format
-msgid ""
-"No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch such as 'master'.\n"
-msgstr ""
-"Inga gemensamma referenser och inga angavs; gör inget.\n"
-"Du kanske borde ange en gren såsom \"master\".\n"
-
-#: transport-helper.c:1120
-#, c-format
-msgid "malformed response in ref list: %s"
-msgstr "felformat svar i referenslistan: %s"
-
-#: transport-helper.c:1272
-#, c-format
-msgid "read(%s) failed"
-msgstr "läs(%s) misslyckades"
-
-#: transport-helper.c:1299
-#, c-format
-msgid "write(%s) failed"
-msgstr "skriv(%s) misslyckades"
-
-#: transport-helper.c:1348
-#, c-format
-msgid "%s thread failed"
-msgstr "%s-tråden misslyckades"
-
-#: transport-helper.c:1352
-#, c-format
-msgid "%s thread failed to join: %s"
-msgstr "%s-tråden misslyckades ansluta: %s"
-
-#: transport-helper.c:1371 transport-helper.c:1375
-#, c-format
-msgid "can't start thread for copying data: %s"
-msgstr "kan inte starta tråd för kopiering av data: %s"
-
-#: transport-helper.c:1412
-#, c-format
-msgid "%s process failed to wait"
-msgstr "processen %s misslyckades vänta"
-
-#: transport-helper.c:1416
-#, c-format
-msgid "%s process failed"
-msgstr "processen %s misslyckades"
-
-#: transport-helper.c:1434 transport-helper.c:1443
-msgid "can't start thread for copying data"
-msgstr "kan inte skapa tråd för kopiering av data"
-
-#: tree-walk.c:32
+#: tree-walk.c:33
msgid "too-short tree object"
msgstr "trädobjekt för kort"
-#: tree-walk.c:38
+#: tree-walk.c:39
msgid "malformed mode in tree entry"
msgstr "felformat läge i trädpost"
-#: tree-walk.c:42
+#: tree-walk.c:43
msgid "empty filename in tree entry"
msgstr "tomt filnamn i trädpost"
-#: tree-walk.c:117
+#: tree-walk.c:118
msgid "too-short tree file"
msgstr "trädfil för kort"
-#: unpack-trees.c:110
+#: unpack-trees.c:113
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -8468,7 +9018,7 @@
"Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"
"%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."
-#: unpack-trees.c:112
+#: unpack-trees.c:115
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -8477,7 +9027,7 @@
"Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"
"%%s"
-#: unpack-trees.c:115
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -8487,7 +9037,7 @@
"sammanslagning:\n"
"%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."
-#: unpack-trees.c:117
+#: unpack-trees.c:120
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -8497,7 +9047,7 @@
"sammanslagning:\n"
"%%s"
-#: unpack-trees.c:120
+#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -8506,7 +9056,7 @@
"Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"
"%%sChecka in dina ändringar eller använd \"stash\" innan du \"%s\"."
-#: unpack-trees.c:122
+#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -8515,7 +9065,7 @@
"Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"
"%%s"
-#: unpack-trees.c:127
+#: unpack-trees.c:130
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -8525,7 +9075,7 @@
"dem:\n"
"%s"
-#: unpack-trees.c:131
+#: unpack-trees.c:134
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -8534,7 +9084,7 @@
"Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"
"%%sFlytta eller ta bort dem innan du byter gren."
-#: unpack-trees.c:133
+#: unpack-trees.c:136
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -8543,7 +9093,7 @@
"Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"
"%%s"
-#: unpack-trees.c:136
+#: unpack-trees.c:139
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -8553,7 +9103,7 @@
"sammanslagningen:\n"
"%%sFlytta eller ta bort dem innan du slår samman."
-#: unpack-trees.c:138
+#: unpack-trees.c:141
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -8563,7 +9113,7 @@
"sammanslagningen:\n"
"%%s"
-#: unpack-trees.c:141
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -8572,7 +9122,7 @@
"Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"
"%%sFlytta eller ta bort dem innan du \"%s\"."
-#: unpack-trees.c:143
+#: unpack-trees.c:146
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -8581,7 +9131,7 @@
"Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"
"%%s"
-#: unpack-trees.c:149
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -8592,7 +9142,7 @@
"utcheckningen:\n"
"%%sFlytta eller ta bort dem innan du byter gren."
-#: unpack-trees.c:151
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -8603,7 +9153,7 @@
"utcheckningen:\n"
"%%s"
-#: unpack-trees.c:154
+#: unpack-trees.c:157
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -8613,7 +9163,7 @@
"sammanslagningen:\n"
"%%sFlytta eller ta bort dem innan du byter gren."
-#: unpack-trees.c:156
+#: unpack-trees.c:159
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -8623,7 +9173,7 @@
"sammanslagningen:\n"
"%%s"
-#: unpack-trees.c:159
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -8632,7 +9182,7 @@
"Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"
"%%sFlytta eller ta bort dem innan du \"%s\"."
-#: unpack-trees.c:161
+#: unpack-trees.c:164
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -8641,43 +9191,12 @@
"Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"
"%%s"
-#: unpack-trees.c:169
+#: 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:172
-#, c-format
-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"
-
-#: unpack-trees.c:174
-#, c-format
-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"
-
-#: unpack-trees.c:176
-#, c-format
-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"
-
-#: unpack-trees.c:178
+#: unpack-trees.c:175
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -8686,16 +9205,56 @@
"Kan inte uppdatera undermodul:\n"
"%s"
-#: unpack-trees.c:255
+#: unpack-trees.c:178
+#, c-format
+msgid ""
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+"Följande sökvägar är inte àjour och lämnades till trots för gles-mönster:\n"
+"%s"
+
+#: unpack-trees.c:180
+#, c-format
+msgid ""
+"The following paths are unmerged and were left despite sparse patterns:\n"
+"%s"
+msgstr ""
+"Följande sökvägar har inte slagits ihop och lämnades till trots för gles-"
+"mönster:\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 ""
+"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:262
#, c-format
msgid "Aborting\n"
msgstr "Avbryter\n"
-#: unpack-trees.c:317
+#: 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:349
+#: 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"
@@ -8705,10 +9264,14 @@
"sökvägar på ett okänsligt filsystem) och endast en från samma\n"
"kollisionsgrupp finns i arbetskatalogen:\n"
-#: unpack-trees.c:1445
+#: unpack-trees.c:1498
msgid "Updating index flags"
msgstr "Uppdaterar indexflaggor"
+#: upload-pack.c:1543
+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"
@@ -8742,27 +9305,27 @@
msgid "Fetching objects"
msgstr "Hämtar objekt"
-#: worktree.c:259 builtin/am.c:2099
+#: worktree.c:238 builtin/am.c:2103
#, c-format
msgid "failed to read '%s'"
msgstr "misslyckades läsa \"%s\""
-#: worktree.c:305
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "\"%s\" i huvudarbetskatalogen är inte arkivkatalogen"
-#: worktree.c:316
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr "filen \"%s\" innehåller inte absolut sökväg till arbetskatalogen"
-#: worktree.c:328
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "\"%s\" finns inte"
-#: worktree.c:334
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "\"%s\" är inte en .git-fil, felkod %d"
@@ -8772,17 +9335,83 @@
msgid "'%s' does not point back to '%s'"
msgstr "\"%s\" pekar inte tillbaka till \"%s\""
-#: wrapper.c:186 wrapper.c:356
+#: worktree.c:608
+msgid "not a directory"
+msgstr "inte en katalog"
+
+#: worktree.c:617
+msgid ".git is not a file"
+msgstr ".git är inte en fil"
+
+#: worktree.c:619
+msgid ".git file broken"
+msgstr ".git-filen är trasig"
+
+#: worktree.c:621
+msgid ".git file incorrect"
+msgstr ".git-filen är felaktig"
+
+#: worktree.c:727
+msgid "not a valid path"
+msgstr "inte en giltig sökväg"
+
+#: worktree.c:733
+msgid "unable to locate repository; .git is not a file"
+msgstr "hittar inte arkivet; .git är inte en fil"
+
+#: worktree.c:737
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr "hittar inte arkivet; .git-filen hänvisar inte till ett arkiv"
+
+#: worktree.c:741
+msgid "unable to locate repository; .git file broken"
+msgstr "hittar inte arkivet; .git-filen är trasig"
+
+#: worktree.c:747
+msgid "gitdir unreadable"
+msgstr "gitdir är oläsbar"
+
+#: worktree.c:751
+msgid "gitdir incorrect"
+msgstr "gitdir är felaktig"
+
+#: worktree.c:776
+msgid "not a valid directory"
+msgstr "inte i en giltig katalog"
+
+#: worktree.c:782
+msgid "gitdir file does not exist"
+msgstr "gitdir-filen existerar inte"
+
+#: worktree.c:787 worktree.c:796
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "kunde inte läsa gitdir-filen (%s)"
+
+#: worktree.c:806
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr "kort läsning (förväntade %<PRIuMAX> byte, läste %<PRIuMAX>)"
+
+#: worktree.c:814
+msgid "invalid gitdir file"
+msgstr "ogiltig gitdir-fil"
+
+#: worktree.c:822
+msgid "gitdir file points to non-existent location"
+msgstr "gitdir-filen pekar på en ickeexisterande plats"
+
+#: 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:387 wrapper.c:588
+#: wrapper.c:398 wrapper.c:599
#, c-format
msgid "unable to access '%s'"
msgstr "kan inte komma åt \"%s\""
-#: wrapper.c:596
+#: wrapper.c:607
msgid "unable to get current working directory"
msgstr "kan inte hämta aktuell arbetskatalog"
@@ -8817,11 +9446,11 @@
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:1072
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:1081
msgid "Changes not staged for commit:"
msgstr "Ändringar ej i incheckningskön:"
@@ -8850,97 +9479,96 @@
#: 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 ska 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:905
#, 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:936
msgid "Submodules changed but not updated:"
msgstr "Undermoduler ändrade men inte uppdaterade:"
-#: wt-status.c:940
+#: wt-status.c:938
msgid "Submodule changes to be committed:"
msgstr "Undermodulers ändringar att checka in:"
-#: wt-status.c:1022
+#: wt-status.c:1020
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
@@ -8948,7 +9576,7 @@
"Raden ovan får inte ändras eller tas bort.\n"
"Allt under den kommer tas bort."
-#: wt-status.c:1114
+#: wt-status.c:1112
#, c-format
msgid ""
"\n"
@@ -8959,107 +9587,107 @@
"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:1142
msgid "You have unmerged paths."
msgstr "Du har ej sammanslagna sökvägar."
-#: wt-status.c:1147
+#: wt-status.c:1145
msgid " (fix conflicts and run \"git commit\")"
msgstr " (rätta konflikter och kör \"git commit\")"
-#: wt-status.c:1149
+#: wt-status.c:1147
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:1151
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:1154
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:1163
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:1166
msgid "The current patch is empty."
msgstr "Aktuell patch är tom."
-#: wt-status.c:1172
+#: wt-status.c:1170
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:1172
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:1174
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:1307
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo saknas."
-#: wt-status.c:1311
+#: wt-status.c:1309
msgid "No commands done."
msgstr "Inga kommandon utförda."
-#: 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] "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:1323
#, c-format
msgid " (see more in file %s)"
msgstr " (se fler i filen %s)"
-#: wt-status.c:1330
+#: wt-status.c:1328
msgid "No commands remaining."
msgstr "Inga kommandon återstår."
-#: 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] "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:1339
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:1351
#, 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:1356
msgid "You are currently rebasing."
msgstr "Du håller på med en ombasering."
-#: wt-status.c:1371
+#: wt-status.c:1369
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:1371
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:1373
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:1380
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:1384
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -9067,142 +9695,155 @@
"Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" "
"ovanpå \"%s\"."
-#: wt-status.c:1391
+#: wt-status.c:1389
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:1392
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:1396
#, 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:1401
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:1404
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:1406
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:1417
msgid "Cherry-pick currently in progress."
msgstr "Cherry-pick pågår."
-#: wt-status.c:1422
+#: wt-status.c:1420
#, 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:1427
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:1430
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:1433
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:1435
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
msgstr " (använd \"git cherry-pick --skip\" för att hoppa över patchen)"
-#: wt-status.c:1439
+#: wt-status.c:1437
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-"
"operationen)"
-#: wt-status.c:1449
+#: wt-status.c:1447
msgid "Revert currently in progress."
msgstr "Ångring pågår."
-#: wt-status.c:1452
+#: wt-status.c:1450
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Du håller på med att ångra incheckningen %s."
-#: wt-status.c:1458
+#: wt-status.c:1456
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (rätta konflikter och kör sedan \"git revert --continue\")"
-#: wt-status.c:1461
+#: wt-status.c:1459
msgid " (run \"git revert --continue\" to continue)"
msgstr " (kör \"git revert --continue\" för att fortsätta)"
-#: wt-status.c:1464
+#: wt-status.c:1462
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (alla konflikter rättade: kör \"git revert --continue\")"
-#: wt-status.c:1466
+#: wt-status.c:1464
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr " (använd \"git revert --skip\" för att hoppa över patchen)"
-#: wt-status.c:1468
+#: wt-status.c:1466
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)"
-#: wt-status.c:1478
+#: wt-status.c:1476
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"."
-#: wt-status.c:1482
+#: wt-status.c:1480
msgid "You are currently bisecting."
msgstr "Du håller på med en \"bisect\"."
-#: wt-status.c:1485
+#: wt-status.c:1483
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
" (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)"
-#: wt-status.c:1694
+#: wt-status.c:1494
+#, 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:1733
msgid "On branch "
msgstr "På grenen "
-#: wt-status.c:1701
+#: wt-status.c:1740
msgid "interactive rebase in progress; onto "
msgstr "interaktiv ombasering pågår; ovanpå "
-#: wt-status.c:1703
+#: wt-status.c:1742
msgid "rebase in progress; onto "
msgstr "ombasering pågår; ovanpå "
-#: wt-status.c:1713
+#: wt-status.c:1747
+msgid "HEAD detached at "
+msgstr "HEAD frånkopplad vid "
+
+#: wt-status.c:1749
+msgid "HEAD detached from "
+msgstr "HEAD frånkopplad från "
+
+#: wt-status.c:1752
msgid "Not currently on any branch."
msgstr "Inte på någon gren för närvarande."
-#: wt-status.c:1730
+#: wt-status.c:1769
msgid "Initial commit"
msgstr "Första incheckning"
-#: wt-status.c:1731
+#: wt-status.c:1770
msgid "No commits yet"
msgstr "Inga incheckningar ännu"
-#: wt-status.c:1745
+#: wt-status.c:1784
msgid "Untracked files"
msgstr "Ospårade filer"
-#: wt-status.c:1747
+#: wt-status.c:1786
msgid "Ignored files"
msgstr "Ignorerade filer"
-#: wt-status.c:1751
+#: wt-status.c:1790
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -9214,32 +9855,32 @@
"lägga till nya filer själv (se \"git help status\")."
# %s är nästa sträng eller tom.
-#: wt-status.c:1757
+#: wt-status.c:1796
#, c-format
msgid "Untracked files not listed%s"
msgstr "Ospårade filer visas ej%s"
-#: wt-status.c:1759
+#: wt-status.c:1798
msgid " (use -u option to show untracked files)"
msgstr " (använd flaggan -u för att visa ospårade filer)"
-#: wt-status.c:1765
+#: wt-status.c:1804
msgid "No changes"
msgstr "Inga ändringar"
-#: wt-status.c:1770
+#: wt-status.c:1809
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a"
"\")\n"
-#: wt-status.c:1773
+#: wt-status.c:1813
#, c-format
msgid "no changes added to commit\n"
msgstr "inga ändringar att checka in\n"
-#: wt-status.c:1776
+#: wt-status.c:1817
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -9248,67 +9889,67 @@
"inget köat för incheckning, men ospårade filer finns (spåra med \"git add"
"\")\n"
-#: wt-status.c:1779
+#: wt-status.c:1821
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "inget köat för incheckning, men ospårade filer finns\n"
-#: wt-status.c:1782
+#: wt-status.c:1825
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n"
-#: wt-status.c:1785 wt-status.c:1790
+#: wt-status.c:1829 wt-status.c:1835
#, c-format
msgid "nothing to commit\n"
msgstr "inget att checka in\n"
-#: wt-status.c:1788
+#: wt-status.c:1832
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "inget att checka in (använd -u för att visa ospårade filer)\n"
-#: wt-status.c:1792
+#: wt-status.c:1837
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "inget att checka in, arbetskatalogen ren\n"
-#: wt-status.c:1905
+#: wt-status.c:1942
msgid "No commits yet on "
msgstr "Inga incheckningar ännu på "
-#: wt-status.c:1909
+#: wt-status.c:1946
msgid "HEAD (no branch)"
msgstr "HEAD (ingen gren)"
-#: wt-status.c:1940
+#: wt-status.c:1977
msgid "different"
msgstr "olika"
-#: wt-status.c:1942 wt-status.c:1950
+#: wt-status.c:1979 wt-status.c:1987
msgid "behind "
msgstr "efter "
-#: wt-status.c:1945 wt-status.c:1948
+#: wt-status.c:1982 wt-status.c:1985
msgid "ahead "
msgstr "före "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2470
+#: wt-status.c:2507
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "kan inte %s: Du har oköade ändringar."
-#: wt-status.c:2476
+#: wt-status.c:2513
msgid "additionally, your index contains uncommitted changes."
msgstr "dessutom innehåller dit index ändringar som inte har checkats in."
-#: wt-status.c:2478
+#: wt-status.c:2515
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in."
-#: compat/precompose_utf8.c:58 builtin/clone.c:455
+#: compat/precompose_utf8.c:58 builtin/clone.c:457
#, c-format
msgid "failed to unlink '%s'"
msgstr "misslyckades ta bort länken \"%s\""
@@ -9317,126 +9958,131 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<flaggor>] [--] <sökväg>..."
-#: builtin/add.c:88
+#: builtin/add.c:58
+#, c-format
+msgid "cannot chmod %cx '%s'"
+msgstr "kan inte utföra chmod %cx \"%s\""
+
+#: builtin/add.c:96
#, c-format
msgid "unexpected diff status %c"
msgstr "diff-status %c förväntades inte"
-#: builtin/add.c:93 builtin/commit.c:288
+#: builtin/add.c:101 builtin/commit.c:285
msgid "updating files failed"
msgstr "misslyckades uppdatera filer"
-#: builtin/add.c:103
+#: builtin/add.c:111
#, c-format
msgid "remove '%s'\n"
msgstr "ta bort \"%s\"\n"
-#: builtin/add.c:178
+#: builtin/add.c:186
msgid "Unstaged changes after refreshing the index:"
msgstr "Oköade ändringar efter att ha uppdaterat indexet:"
-#: builtin/add.c:266 builtin/rev-parse.c:899
+#: builtin/add.c:280 builtin/rev-parse.c:991
msgid "Could not read the index"
msgstr "Kunde inte läsa indexet"
-#: builtin/add.c:277
+#: builtin/add.c:291
#, c-format
msgid "Could not open '%s' for writing."
msgstr "Kunde inte öppna \"%s\" för skrivning."
-#: builtin/add.c:281
+#: builtin/add.c:295
msgid "Could not write patch"
msgstr "Kunde inte skriva patch"
-#: builtin/add.c:284
+#: builtin/add.c:298
msgid "editing patch failed"
msgstr "redigering av patch misslyckades"
-#: builtin/add.c:287
+#: builtin/add.c:301
#, c-format
msgid "Could not stat '%s'"
msgstr "Kunde inte ta status på \"%s\""
-#: builtin/add.c:289
+#: builtin/add.c:303
msgid "Empty patch. Aborted."
msgstr "Tom patch. Avbryter."
-#: builtin/add.c:294
+#: builtin/add.c:308
#, c-format
msgid "Could not apply '%s'"
msgstr "Kunde inte tillämpa \"%s\""
-#: builtin/add.c:302
+#: builtin/add.c:316
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"
-#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548
-#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
+#: builtin/add.c:336 builtin/clean.c:904 builtin/fetch.c:169 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559
+#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190
msgid "dry run"
msgstr "testkörning"
-#: builtin/add.c:325
+#: builtin/add.c:339
msgid "interactive picking"
msgstr "plocka interaktivt"
-#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307
+#: builtin/add.c:340 builtin/checkout.c:1546 builtin/reset.c:308
msgid "select hunks interactively"
msgstr "välj stycken interaktivt"
-#: builtin/add.c:327
+#: builtin/add.c:341
msgid "edit current diff and apply"
msgstr "redigera aktuell diff och applicera"
-#: builtin/add.c:328
+#: builtin/add.c:342
msgid "allow adding otherwise ignored files"
msgstr "tillåt lägga till annars ignorerade filer"
-#: builtin/add.c:329
+#: builtin/add.c:343
msgid "update tracked files"
msgstr "uppdatera spårade filer"
-#: builtin/add.c:330
+#: builtin/add.c:344
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "åternormalisera radslut i spårade filer (implicerar -u)"
-#: builtin/add.c:331
+#: builtin/add.c:345
msgid "record only the fact that the path will be added later"
msgstr "registrera endast att sökvägen kommer läggas till senare"
-#: builtin/add.c:332
+#: builtin/add.c:346
msgid "add changes from all tracked and untracked files"
msgstr "lägg till ändringar från alla spårade och ospårade filer"
-#: builtin/add.c:335
+#: builtin/add.c:349
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "ignorera sökvägar borttagna i arbetskatalogen (samma som --no-all)"
-#: builtin/add.c:337
+#: builtin/add.c:351
msgid "don't add, only refresh the index"
msgstr "lägg inte till, uppdatera endast indexet"
-#: builtin/add.c:338
+#: builtin/add.c:352
msgid "just skip files which cannot be added because of errors"
msgstr "hoppa bara över filer som inte kan läggas till på grund av fel"
-#: builtin/add.c:339
+#: builtin/add.c:353
msgid "check if - even missing - files are ignored in dry run"
msgstr "se om - även saknade - filer ignoreras i testkörning"
-#: builtin/add.c:341 builtin/update-index.c:1004
+#: builtin/add.c:355 builtin/update-index.c:1004
msgid "override the executable bit of the listed files"
msgstr "överstyr exekveringsbiten för angivna filer"
-#: builtin/add.c:343
+#: builtin/add.c:357
msgid "warn when adding an embedded repository"
msgstr "varna när ett inbyggt arkiv läggs till"
-#: builtin/add.c:345
+#: builtin/add.c:359
msgid "backend for `git stash -p`"
msgstr "bakända för \"git stash -p\""
-#: builtin/add.c:363
+#: builtin/add.c:377
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -9467,12 +10113,12 @@
"\n"
"Se \"git help submodule\" för ytterligare information."
-#: builtin/add.c:391
+#: builtin/add.c:405
#, c-format
msgid "adding embedded git repository: %s"
msgstr "lägger till inbäddat git-arkiv: %s"
-#: builtin/add.c:410
+#: builtin/add.c:424
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
@@ -9482,47 +10128,47 @@
"Slå av detta meddelande med\n"
"\"git config advice.addIgnoredFile false\""
-#: builtin/add.c:419
+#: builtin/add.c:433
msgid "adding files failed"
msgstr "misslyckades lägga till filer"
-#: builtin/add.c:447 builtin/commit.c:348
+#: builtin/add.c:461 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:464
+#: builtin/add.c:478
msgid "--pathspec-from-file is incompatible with --edit"
msgstr "--pathspec-from-file är inkompatibelt med --edit"
-#: builtin/add.c:476
+#: builtin/add.c:490
msgid "-A and -u are mutually incompatible"
msgstr "-A och -u är ömsesidigt inkompatibla"
-#: builtin/add.c:479
+#: builtin/add.c:493
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run"
-#: builtin/add.c:483
+#: builtin/add.c:497
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "--chmod-parametern \"%s\" måste antingen vara -x eller +x"
-#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354
-#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509
+#: builtin/add.c:515 builtin/checkout.c:1714 builtin/commit.c:351
+#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1569
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr "--pathspec-from-file är inkompatibelt med sökvägsangivelsesparametrar"
-#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360
-#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515
+#: builtin/add.c:522 builtin/checkout.c:1726 builtin/commit.c:357
+#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1575
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr "--pathspec-file-nul kräver --pathspec-from-file"
-#: builtin/add.c:512
+#: builtin/add.c:526
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Inget angivet, inget tillagt.\n"
-#: builtin/add.c:514
+#: builtin/add.c:528
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
@@ -9580,7 +10226,7 @@
msgid "Patch format detection failed."
msgstr "Misslyckades detektera patchformat."
-#: builtin/am.c:953 builtin/clone.c:409
+#: builtin/am.c:953 builtin/clone.c:410
#, c-format
msgid "failed to create directory '%s'"
msgstr "misslyckades skapa katalogen \"%s\""
@@ -9655,12 +10301,12 @@
msgid "applying to an empty history"
msgstr "tillämpar på en tom historik"
-#: builtin/am.c:1621 builtin/am.c:1625
+#: builtin/am.c:1626 builtin/am.c:1630
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "kan inte återuppta: %s finns inte."
-#: builtin/am.c:1643
+#: builtin/am.c:1648
msgid "Commit Body is:"
msgstr "Incheckningskroppen är:"
@@ -9668,41 +10314,41 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1653
+#: builtin/am.c:1658
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: "
-#: builtin/am.c:1700 builtin/commit.c:398
+#: builtin/am.c:1704 builtin/commit.c:395
msgid "unable to write index file"
msgstr "kan inte skriva indexfil"
-#: builtin/am.c:1704
+#: builtin/am.c:1708
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)"
-#: builtin/am.c:1744 builtin/am.c:1812
+#: builtin/am.c:1748 builtin/am.c:1816
#, c-format
msgid "Applying: %.*s"
msgstr "Tillämpar: %.*s"
-#: builtin/am.c:1761
+#: builtin/am.c:1765
msgid "No changes -- Patch already applied."
msgstr "Inga ändringar -- Patchen har redan tillämpats."
-#: builtin/am.c:1767
+#: builtin/am.c:1771
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Patch misslyckades på %s %.*s"
-#: builtin/am.c:1771
+#: builtin/am.c:1775
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr ""
"Använd \"git am --show-current-patch=diff\" för att se patchen som "
"misslyckades"
-#: builtin/am.c:1815
+#: builtin/am.c:1819
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -9712,7 +10358,7 @@
"Om det inte är något kvar att köa kan det hända att något annat redan\n"
"introducerat samma ändringar; kanske du bör hoppa över patchen."
-#: builtin/am.c:1822
+#: builtin/am.c:1826
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -9724,17 +10370,17 @@
"lösta.\n"
"Du kan köra \"git rm\" för att godta \"borttagen av dem\" för den."
-#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346
-#: builtin/reset.c:354
+#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 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:1981
+#: builtin/am.c:1985
msgid "failed to clean index"
msgstr "misslyckades städa upp indexet"
-#: builtin/am.c:2025
+#: builtin/am.c:2029
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -9742,153 +10388,155 @@
"Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"
"Återställer inte till ORIG_HEAD"
-#: builtin/am.c:2132
+#: builtin/am.c:2136
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Felaktigt värde för --patch-format: %s"
-#: builtin/am.c:2172
+#: builtin/am.c:2178
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr "Felaktigt värde för --show-current-patch: %s"
-#: builtin/am.c:2176
+#: builtin/am.c:2182
#, c-format
msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
msgstr "--show-current-patch=%s är inkompatibelt med --show-current-patch=%s"
-#: builtin/am.c:2207
+#: builtin/am.c:2213
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2208
+#: builtin/am.c:2214
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<flaggor>] (--continue | --skip | --abort)"
-#: builtin/am.c:2214
+#: builtin/am.c:2220
msgid "run interactively"
msgstr "kör interaktivt"
-#: builtin/am.c:2216
+#: builtin/am.c:2222
msgid "historical option -- no-op"
msgstr "historisk flagga -- no-op"
-#: builtin/am.c:2218
+#: builtin/am.c:2224
msgid "allow fall back on 3way merging if needed"
msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"
-#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:304 builtin/stash.c:812
+#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16
+#: builtin/repack.c:334 builtin/stash.c:882
msgid "be quiet"
msgstr "var tyst"
-#: builtin/am.c:2221
-msgid "add a Signed-off-by line to the commit message"
-msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet"
+#: builtin/am.c:2227
+msgid "add a Signed-off-by trailer to the commit message"
+msgstr "lägg till \"Signed-off-by\"-släprad i incheckningsmeddelandet"
-#: builtin/am.c:2224
+#: builtin/am.c:2230
msgid "recode into utf8 (default)"
msgstr "koda om till utf8 (standard)"
-#: builtin/am.c:2226
+#: builtin/am.c:2232
msgid "pass -k flag to git-mailinfo"
msgstr "sänd flaggan -k till git-mailinfo"
-#: builtin/am.c:2228
+#: builtin/am.c:2234
msgid "pass -b flag to git-mailinfo"
msgstr "sänd flaggan -b till git-mailinfo"
-#: builtin/am.c:2230
+#: builtin/am.c:2236
msgid "pass -m flag to git-mailinfo"
msgstr "sänd flaggan -m till git-mailinfo"
-#: builtin/am.c:2232
+#: builtin/am.c:2238
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet"
-#: builtin/am.c:2235
+#: builtin/am.c:2241
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "sänd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr"
-#: builtin/am.c:2238
+#: builtin/am.c:2244
msgid "strip everything before a scissors line"
msgstr "ta bort allting före en saxlinje"
-#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249
-#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261
-#: builtin/am.c:2267
+#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
+#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
+#: builtin/am.c:2273
msgid "pass it through git-apply"
msgstr "sänd det genom git-apply"
-#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670
-#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250
-#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505
-#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321
-#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:154 parse-options.h:175 parse-options.h:316
+#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:904 builtin/merge.c:261
+#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
+#: builtin/rebase.c:1347 builtin/repack.c:345 builtin/repack.c:349
+#: builtin/repack.c:351 builtin/show-branch.c:650 builtin/show-ref.c:172
+#: builtin/tag.c:436 parse-options.h:154 parse-options.h:175
+#: parse-options.h:316
msgid "n"
msgstr "n"
-#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38
+#: builtin/am.c:2269 builtin/branch.c:670 builtin/bugreport.c:136
+#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:470
+#: builtin/verify-tag.c:38
msgid "format"
msgstr "format"
-#: builtin/am.c:2264
+#: builtin/am.c:2270
msgid "format the patch(es) are in"
msgstr "format för patch(ar)"
-#: builtin/am.c:2270
+#: builtin/am.c:2276
msgid "override error message when patch failure occurs"
msgstr "överstyr felmeddelanden när patchfel uppstår"
-#: builtin/am.c:2272
+#: builtin/am.c:2278
msgid "continue applying patches after resolving a conflict"
msgstr "fortsätt applicera patchar efter att ha löst en konflikt"
-#: builtin/am.c:2275
+#: builtin/am.c:2281
msgid "synonyms for --continue"
msgstr "synonymer till --continue"
-#: builtin/am.c:2278
+#: builtin/am.c:2284
msgid "skip the current patch"
msgstr "hoppa över den aktuella grenen"
-#: builtin/am.c:2281
-msgid "restore the original branch and abort the patching operation."
-msgstr "återställ originalgrenen och avbryt patchningen."
+#: builtin/am.c:2287
+msgid "restore the original branch and abort the patching operation"
+msgstr "återställ originalgrenen och avbryt patchningen"
-#: builtin/am.c:2284
-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:2290
+msgid "abort the patching operation but keep HEAD where it is"
+msgstr "avbryt patchningen men behåll HEAD där det är"
-#: builtin/am.c:2288
+#: builtin/am.c:2294
msgid "show the patch being applied"
msgstr "visa patchen som tillämpas"
-#: builtin/am.c:2293
+#: builtin/am.c:2299
msgid "lie about committer date"
msgstr "ljug om incheckningsdatum"
-#: builtin/am.c:2295
+#: builtin/am.c:2301
msgid "use current timestamp for author date"
msgstr "använd nuvarande tidsstämpel för författardatum"
-#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512
-#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517
-#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418
+#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515
+#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:538
+#: builtin/rebase.c:1400 builtin/revert.c:117 builtin/tag.c:451
msgid "key-id"
msgstr "nyckel-id"
-#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
+#: builtin/am.c:2304 builtin/rebase.c:539 builtin/rebase.c:1401
msgid "GPG-sign commits"
msgstr "GPG-signera incheckningar"
-#: builtin/am.c:2301
+#: builtin/am.c:2307
msgid "(internal use for git-rebase)"
msgstr "(används internt av git-rebase)"
-#: builtin/am.c:2319
+#: builtin/am.c:2325
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
@@ -9896,16 +10544,16 @@
"Flaggan -b/--binary har varit utan funktion länge, och\n"
"kommer tas bort. Vi ber dig att inte använda den längre."
-#: builtin/am.c:2326
+#: builtin/am.c:2332
msgid "failed to read the index"
msgstr "misslyckades läsa indexet"
-#: builtin/am.c:2341
+#: builtin/am.c:2347
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs."
-#: builtin/am.c:2365
+#: builtin/am.c:2371
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -9914,11 +10562,11 @@
"Kvarbliven katalog %s hittades.\n"
"Använd \"git am --abort\" för att ta bort den."
-#: builtin/am.c:2371
+#: builtin/am.c:2377
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Lösningsoperation pågår inte, vi återupptar inte."
-#: builtin/am.c:2381
+#: builtin/am.c:2387
msgid "interactive mode requires patches on the command line"
msgstr "interaktivt läge kräver patchar på kommandoraden"
@@ -9956,44 +10604,16 @@
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 --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
-msgid "git bisect--helper --bisect-clean-state"
-msgstr "git bisect--helper --bisect-clean-state"
-
-#: builtin/bisect--helper.c:25
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --bisect-reset [<incheckning>]"
-#: builtin/bisect--helper.c:26
-msgid ""
-"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
-"<bad_term>"
-msgstr ""
-"git bisect--helper --bisect-write [--no-log] <tillstånd> <revision> <term-"
-"för-rätt> <term-för-fel>"
-
-#: builtin/bisect--helper.c:27
-msgid ""
-"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
-"<bad_term>"
-msgstr ""
-"git bisect--helper --bisect-check-and-set-terms <kommadno> <term-för-rätt> "
-"<term-för-fel>"
-
-#: builtin/bisect--helper.c:28
+#: builtin/bisect--helper.c:24
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:25
msgid ""
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
"term-new]"
@@ -10001,48 +10621,76 @@
"git-bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
"term-new]"
-#: builtin/bisect--helper.c:30
+#: builtin/bisect--helper.c:26
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:28
+msgid "git bisect--helper --bisect-next"
+msgstr "git bisect--helper --bisect-next"
+
+#: builtin/bisect--helper.c:29
+msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
+msgstr "git bisect--helper --bisect-state (bad|new) [<incheckning>]"
+
+#: builtin/bisect--helper.c:30
+msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
+msgstr "git bisect--helper --bisect-state (good|old) [<incheckning>...]"
+
+#: builtin/bisect--helper.c:31
+msgid "git bisect--helper --bisect-replay <filename>"
+msgstr "git bisect--helper --bisect-replay <filnamn>"
+
+#: builtin/bisect--helper.c:32
+msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
+msgstr "git bisect--helper --bisect-skip [(<incheckning>|<intervall>)...]"
+
+#: builtin/bisect--helper.c:107
+#, c-format
+msgid "cannot open file '%s' in mode '%s'"
+msgstr "kan inte kopiera filen \"%s\" i läget \"%s\""
+
+#: builtin/bisect--helper.c:114
+#, c-format
+msgid "could not write to file '%s'"
+msgstr "kunde inte skriva till filen \"%s\""
+
+#: builtin/bisect--helper.c:153
#, 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:157
#, 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:167
#, 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:177
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:193
#, 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:201
#, c-format
msgid "'%s' is not a valid commit"
msgstr "\"%s\" är inte en giltig incheckning"
-#: builtin/bisect--helper.c:172
+#: builtin/bisect--helper.c:210
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -10050,27 +10698,27 @@
"Kunde inte checka ut original-HEAD \"%s\". Försök \"git bisect reset "
"<incheckning>\"."
-#: builtin/bisect--helper.c:216
+#: builtin/bisect--helper.c:254
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr "Felaktigt argument till bisect_write: %s"
-#: builtin/bisect--helper.c:221
+#: builtin/bisect--helper.c:259
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "kan inte läsa oid för referensen \"%s\""
-#: builtin/bisect--helper.c:233
+#: builtin/bisect--helper.c:271
#, c-format
msgid "couldn't open the file '%s'"
msgstr "kunde inte öppna filen \"%s\""
-#: builtin/bisect--helper.c:259
+#: builtin/bisect--helper.c:297
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr "Ogiltigt kommando: du utför just nu en \"bisect\" med %s/%s."
-#: builtin/bisect--helper.c:286
+#: builtin/bisect--helper.c:324
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
@@ -10079,7 +10727,7 @@
"Du måste ange åtminstone en %s och en %s version.\n"
"(Du kan använda \"git bisect %s\" och \"git bisect %s\" för detta.)"
-#: builtin/bisect--helper.c:290
+#: builtin/bisect--helper.c:328
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -10090,7 +10738,7 @@
"Du måste sedan ange åtminstone en %s och en %s version.\n"
"(Du kan använda \"git bisect %s\" och \"git bisect %s\" för detta.)"
-#: builtin/bisect--helper.c:310
+#: builtin/bisect--helper.c:348
#, c-format
msgid "bisecting only with a %s commit"
msgstr "utför bisect med endast en %s incheckning"
@@ -10099,15 +10747,15 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:318
+#: builtin/bisect--helper.c:356
msgid "Are you sure [Y/n]? "
msgstr "Är du säker [Y=ja/N=nej]? "
-#: builtin/bisect--helper.c:379
+#: builtin/bisect--helper.c:417
msgid "no terms defined"
msgstr "inga termer angivna"
-#: builtin/bisect--helper.c:382
+#: builtin/bisect--helper.c:420
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
@@ -10116,7 +10764,7 @@
"Aktuella termer är %s för det gamla tillståndet\n"
"och %s för det nya tillståndet.\n"
-#: builtin/bisect--helper.c:392
+#: builtin/bisect--helper.c:430
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
@@ -10125,264 +10773,309 @@
"ogiltigt argument %s för \"git bisect terms\".\n"
"Flaggor som stöds är: --term-good|--term-old och --term-bad|--term-new."
-#: builtin/bisect--helper.c:478
+#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1014
+msgid "revision walk setup failed\n"
+msgstr "misslyckades starta revisionstraversering\n"
+
+#: builtin/bisect--helper.c:519
+#, c-format
+msgid "could not open '%s' for appending"
+msgstr "kunde inte öppna \"%s\" för tillägg"
+
+#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651
+msgid "'' is not a valid term"
+msgstr "\"\" är inte en giltig term"
+
+#: builtin/bisect--helper.c:661
#, c-format
msgid "unrecognized option: '%s'"
msgstr "okänd flagga: %s"
-#: builtin/bisect--helper.c:482
+#: builtin/bisect--helper.c:665
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "\"%s\" verkar inte vara en giltig revision"
-#: builtin/bisect--helper.c:514
+#: builtin/bisect--helper.c:696
msgid "bad HEAD - I need a HEAD"
msgstr "felaktigt HEAD - Jag behöver ett HEAD"
-#: builtin/bisect--helper.c:529
+#: builtin/bisect--helper.c:711
#, 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>\"."
# cogito-relaterat
-#: builtin/bisect--helper.c:550
+#: builtin/bisect--helper.c:732
msgid "won't bisect on cg-seek'ed tree"
msgstr "kör inte \"bisect\" på träd där \"cg-seek\" använts"
-#: builtin/bisect--helper.c:553
+#: builtin/bisect--helper.c:735
msgid "bad HEAD - strange symbolic ref"
msgstr "felaktigt HEAD - konstig symbolisk referens"
-#: builtin/bisect--helper.c:577
+#: builtin/bisect--helper.c:755
#, c-format
msgid "invalid ref: '%s'"
msgstr "ogiltig referens: \"%s\""
-#: builtin/bisect--helper.c:633
-msgid "perform 'git bisect next'"
-msgstr "utför 'git bisect next'"
+#: builtin/bisect--helper.c:813
+msgid "You need to start by \"git bisect start\"\n"
+msgstr "Du måste starta med \"git bisect start\"\n"
-#: builtin/bisect--helper.c:635
-msgid "write the terms to .git/BISECT_TERMS"
-msgstr "skriv termerna i .git/BISECT_TERMS"
+#. 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:824
+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:637
-msgid "cleanup the bisection state"
-msgstr "städar upp bisect-tillstånd"
+#: builtin/bisect--helper.c:842
+msgid "Please call `--bisect-state` with at least one argument"
+msgstr "Anropa \"--bisect-state\" med minst ett argument."
-#: builtin/bisect--helper.c:639
-msgid "check for expected revs"
-msgstr "kontrollera för förväntade versioner"
+#: builtin/bisect--helper.c:855
+#, c-format
+msgid "'git bisect %s' can take only one argument."
+msgstr "\"git bisect %s\" kan bara ta ett argument."
-#: builtin/bisect--helper.c:641
+#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:878
+#, c-format
+msgid "Bad rev input: %s"
+msgstr "Felaktig rev-indata: %s"
+
+#: builtin/bisect--helper.c:912
+msgid "We are not bisecting."
+msgstr "Vi utför ingen bisect för tillfället."
+
+#: builtin/bisect--helper.c:962
+#, c-format
+msgid "'%s'?? what are you talking about?"
+msgstr "\"%s\"?? vad menar du?"
+
+#: builtin/bisect--helper.c:974
+#, c-format
+msgid "cannot read file '%s' for replaying"
+msgstr "kan inte läsa filen \"%s\" för återuppspelning"
+
+#: builtin/bisect--helper.c:1047
msgid "reset the bisection state"
msgstr "återställ bisect-tillstånd"
-#: builtin/bisect--helper.c:643
-msgid "write out the bisection state in BISECT_LOG"
-msgstr "skriver bisect-tillståndet i BISECT_LOG"
-
-#: builtin/bisect--helper.c:645
-msgid "check and set terms in a bisection state"
-msgstr "visa och ange termer för bisect-tillstånd"
-
-#: builtin/bisect--helper.c:647
+#: builtin/bisect--helper.c:1049
msgid "check whether bad or good terms exist"
msgstr "se efter om termer för rätt och fel finns"
-#: builtin/bisect--helper.c:649
+#: builtin/bisect--helper.c:1051
msgid "print out the bisect terms"
msgstr "skriv ut termer för bisect"
-#: builtin/bisect--helper.c:651
+#: builtin/bisect--helper.c:1053
msgid "start the bisect session"
msgstr "påbörja bisect-körningen"
-#: builtin/bisect--helper.c:653
-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:1055
+msgid "find the next bisection commit"
+msgstr "hitta nästa incheckning i bisect"
-#: builtin/bisect--helper.c:655
+#: builtin/bisect--helper.c:1057
+msgid "mark the state of ref (or refs)"
+msgstr "markera tillståndet för en eller flera referenser"
+
+#: builtin/bisect--helper.c:1059
+msgid "list the bisection steps so far"
+msgstr "lista \"bisect\"-stegen som utförts så långt"
+
+#: builtin/bisect--helper.c:1061
+msgid "replay the bisection process from the given file"
+msgstr "spela upp \"bisect\"-processen från angiven fil"
+
+#: builtin/bisect--helper.c:1063
+msgid "skip some commits for checkout"
+msgstr "hoppa över ett par incheckningar"
+
+#: builtin/bisect--helper.c:1065
msgid "no log for BISECT_WRITE"
msgstr "ingen logg för BISECT_WRITE"
-#: builtin/bisect--helper.c:673
-msgid "--write-terms requires two arguments"
-msgstr "--write-terms kräver två argument"
-
-#: builtin/bisect--helper.c:677
-msgid "--bisect-clean-state requires no arguments"
-msgstr "--bisect-clean-state tar inga argument"
-
-#: builtin/bisect--helper.c:684
+#: builtin/bisect--helper.c:1080
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-reset kräver antingen inget argument eller en incheckning"
-#: builtin/bisect--helper.c:688
-msgid "--bisect-write requires either 4 or 5 arguments"
-msgstr "--bisect-write kräver antingen 4 eller 5 argument"
-
-#: builtin/bisect--helper.c:694
-msgid "--check-and-set-terms requires 3 arguments"
-msgstr "--check-and-set-terms kräver tre argument"
-
-#: builtin/bisect--helper.c:700
+#: builtin/bisect--helper.c:1085
msgid "--bisect-next-check requires 2 or 3 arguments"
msgstr "--bisect-next-check kräver 2 eller 3 argument"
-#: builtin/bisect--helper.c:706
+#: builtin/bisect--helper.c:1091
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms kräver noll eller ett argument"
-#: builtin/blame.c:31
+#: builtin/bisect--helper.c:1100
+msgid "--bisect-next requires 0 arguments"
+msgstr "--bisect-next kräver 0 argument"
+
+#: builtin/bisect--helper.c:1111
+msgid "--bisect-log requires 0 arguments"
+msgstr "--bisect-log kräver 0 argument"
+
+#: builtin/bisect--helper.c:1116
+msgid "no logfile given"
+msgstr "ingen loggfil angiven"
+
+#: builtin/blame.c:32
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>"
-#: builtin/blame.c:36
+#: builtin/blame.c:37
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)"
-#: builtin/blame.c:409
+#: builtin/blame.c:410
#, c-format
msgid "expecting a color: %s"
msgstr "förväntade en färg: %s"
-#: builtin/blame.c:416
+#: builtin/blame.c:417
msgid "must end with a color"
msgstr "måste sluta med en färg"
-#: builtin/blame.c:729
+#: builtin/blame.c:728
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "felaktig färg \"%s\" i color.blame.repeatedLines"
-#: builtin/blame.c:747
+#: builtin/blame.c:746
msgid "invalid value for blame.coloring"
msgstr "ogiltigt värde för blame.coloring"
-#: builtin/blame.c:822
+#: builtin/blame.c:845
#, c-format
msgid "cannot find revision %s to ignore"
msgstr "kan inte hitta revision %s att ignorera"
-#: builtin/blame.c:844
-msgid "Show blame entries as we find them, incrementally"
-msgstr "Visa klandringsposter när vi hittar dem, interaktivt"
+#: 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:845
-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:846
-msgid "Do not treat root commits as boundaries (Default: off)"
-msgstr "Behandla inte rotincheckningar som gränser (Standard: av)"
+#: builtin/blame.c:869
+msgid "do not treat root commits as boundaries (Default: off)"
+msgstr "vehandla inte rotincheckningar som gränser (Standard: av)"
-#: builtin/blame.c:847
-msgid "Show work cost statistics"
-msgstr "Visa statistik över arbetskostnad"
+#: builtin/blame.c:870
+msgid "show work cost statistics"
+msgstr "visa statistik över arbetskostnad"
-#: builtin/blame.c:848
-msgid "Force progress reporting"
-msgstr "Tvinga förloppsrapportering"
+#: builtin/blame.c:871 builtin/checkout.c:1503 builtin/clone.c:92
+#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:175
+#: builtin/merge.c:297 builtin/multi-pack-index.c:27 builtin/pull.c:119
+#: builtin/push.c:575 builtin/send-pack.c:198
+msgid "force progress reporting"
+msgstr "tvinga förloppsrapportering"
-#: builtin/blame.c:849
-msgid "Show output score for blame entries"
-msgstr "Visa utdatapoäng för klandringsposter"
+#: builtin/blame.c:872
+msgid "show output score for blame entries"
+msgstr "visa utdatapoäng för klandringsposter"
-#: builtin/blame.c:850
-msgid "Show original filename (Default: auto)"
-msgstr "Visa originalfilnamn (Standard: auto)"
+#: builtin/blame.c:873
+msgid "show original filename (Default: auto)"
+msgstr "visa originalfilnamn (Standard: auto)"
-#: builtin/blame.c:851
-msgid "Show original linenumber (Default: off)"
-msgstr "Visa ursprungligt radnummer (Standard: av)"
+#: builtin/blame.c:874
+msgid "show original linenumber (Default: off)"
+msgstr "visa ursprungligt radnummer (Standard: av)"
-#: builtin/blame.c:852
-msgid "Show in a format designed for machine consumption"
-msgstr "Visa i ett format avsett för maskinkonsumtion"
+#: 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:853
-msgid "Show porcelain format with per-line commit information"
-msgstr "Visa porslinsformat med per-rad-incheckningsinformation"
+#: builtin/blame.c:876
+msgid "show porcelain format with per-line commit information"
+msgstr "visa porslinsformat med per-rad-incheckningsinformation"
-#: builtin/blame.c:854
-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: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:855
-msgid "Show raw timestamp (Default: off)"
-msgstr "Visa rå tidsstämpel (Standard: av)"
+#: builtin/blame.c:878
+msgid "show raw timestamp (Default: off)"
+msgstr "visa rå tidsstämpel (Standard: av)"
-#: builtin/blame.c:856
-msgid "Show long commit SHA1 (Default: off)"
-msgstr "Visa lång inchecknings-SHA1 (Standard: av)"
+#: builtin/blame.c:879
+msgid "show long commit SHA1 (Default: off)"
+msgstr "visa lång inchecknings-SHA1 (Standard: av)"
-#: builtin/blame.c:857
-msgid "Suppress author name and timestamp (Default: off)"
-msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)"
+#: builtin/blame.c:880
+msgid "suppress author name and timestamp (Default: off)"
+msgstr "undertryck författarnamn och tidsstämpel (Standard: av)"
-#: builtin/blame.c:858
-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: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:859
-msgid "Ignore whitespace differences"
-msgstr "Ignorera ändringar i blanksteg"
+#: builtin/blame.c:882
+msgid "ignore whitespace differences"
+msgstr "ignorera ändringar i blanksteg"
-#: builtin/blame.c:860 builtin/log.c:1702
+#: builtin/blame.c:883 builtin/log.c:1812
msgid "rev"
-msgstr "rev"
+msgstr "incheckning"
-#: builtin/blame.c:860
-msgid "Ignore <rev> when blaming"
-msgstr "ignorera <rev> vid klandren"
+#: builtin/blame.c:883
+msgid "ignore <rev> when blaming"
+msgstr "ignorera <incheckning> vid klandringen"
-#: builtin/blame.c:861
-msgid "Ignore revisions from <file>"
-msgstr "ignorera revisioner från <fil>"
+#: builtin/blame.c:884
+msgid "ignore revisions from <file>"
+msgstr "ignorera incheckningar från <fil>"
-#: builtin/blame.c:862
+#: 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:863
+#: builtin/blame.c:886
msgid "color lines by age"
msgstr "färglägg rader efter ålder"
-#: builtin/blame.c:864
-msgid "Spend extra cycles to find better match"
-msgstr "Slösa extra cykler med att hitta bättre träff"
+#: 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:865
-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: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:866
-msgid "Use <file>'s contents as the final image"
-msgstr "Använd <fil>s innehåll som slutgiltig bild"
+#: 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:867 builtin/blame.c:868
+#: builtin/blame.c:890 builtin/blame.c:891
msgid "score"
msgstr "poäng"
-#: builtin/blame.c:867
-msgid "Find line copies within and across files"
-msgstr "Hitta kopierade rader inuti och mellan filer"
+#: builtin/blame.c:890
+msgid "find line copies within and across files"
+msgstr "hitta kopierade rader inuti och mellan filer"
-#: builtin/blame.c:868
-msgid "Find line movements within and across files"
-msgstr "Hitta flyttade rader inuti och mellan filer"
+#: builtin/blame.c:891
+msgid "find line movements within and across files"
+msgstr "hitta flyttade rader inuti och mellan filer"
-#: builtin/blame.c:869
-msgid "n,m"
-msgstr "n,m"
+#: builtin/blame.c:892
+msgid "range"
+msgstr "intervall"
-#: builtin/blame.c:869
-msgid "Process only line range n,m, counting from 1"
-msgstr "Behandla endast radintervallet n,m, med början på 1"
+#: builtin/blame.c:893
+msgid "process only line range <start>,<end> or function :<funcname>"
+msgstr ""
+"behandla endast intervallet <start>,<slut> eller funktionen :<funknamn>"
-#: builtin/blame.c:921
+#: builtin/blame.c:945
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr "--progress kan inte användas med --incremental eller porslinsformat"
@@ -10394,24 +11087,24 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:972
+#: builtin/blame.c:996
msgid "4 years, 11 months ago"
msgstr "4 år, 11 månader sedan"
-#: builtin/blame.c:1079
+#: builtin/blame.c:1112
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "filen %s har bara %lu rad"
msgstr[1] "filen %s har bara %lu rader"
-#: builtin/blame.c:1125
+#: builtin/blame.c:1157
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>]"
@@ -10473,118 +11166,108 @@
msgid "Update of config-file failed"
msgstr "Misslyckades uppdatera konfigurationsfil"
-#: builtin/branch.c:220
+#: builtin/branch.c:223
msgid "cannot use -a with -d"
msgstr "kan inte ange -a med -d"
-#: builtin/branch.c:226
+#: builtin/branch.c:230
msgid "Couldn't look up commit object for HEAD"
msgstr "Kunde inte slå upp incheckningsobjekt för HEAD"
-#: builtin/branch.c:240
+#: builtin/branch.c:244
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Kan inte ta bort grenen \"%s\" som är utcheckad på \"%s\""
-#: builtin/branch.c:255
+#: builtin/branch.c:259
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "fjärrspårande grenen \"%s\" hittades inte."
-#: builtin/branch.c:256
+#: builtin/branch.c:260
#, c-format
msgid "branch '%s' not found."
msgstr "grenen \"%s\" hittades inte."
-#: builtin/branch.c:271
-#, c-format
-msgid "Error deleting remote-tracking branch '%s'"
-msgstr "Fel vid borttagning av fjärrspårande grenen \"%s\""
-
-#: builtin/branch.c:272
-#, c-format
-msgid "Error deleting branch '%s'"
-msgstr "Fel vid borttagning av grenen \"%s\""
-
-#: builtin/branch.c:279
+#: builtin/branch.c:291
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Tog bort fjärrspårande grenen %s (var %s).\n"
-#: builtin/branch.c:280
+#: builtin/branch.c:292
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Tog bort grenen %s (var %s).\n"
-#: builtin/branch.c:429 builtin/tag.c:61
+#: builtin/branch.c:438 builtin/tag.c:61
msgid "unable to parse format string"
msgstr "kan inte tolka formatsträng"
-#: builtin/branch.c:460
+#: builtin/branch.c:469
msgid "could not resolve HEAD"
msgstr "kunde inte slå upp HEAD"
-#: builtin/branch.c:466
+#: builtin/branch.c:475
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) pekar utenför refs/heads/"
-#: builtin/branch.c:481
+#: builtin/branch.c:490
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Grenen %s ombaseras på %s"
-#: builtin/branch.c:485
+#: builtin/branch.c:494
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Grenen %s är i en \"bisect\" på %s"
-#: builtin/branch.c:502
+#: builtin/branch.c:511
msgid "cannot copy the current branch while not on any."
msgstr "kunde inte kopiera aktuell gren när du inte befinner dig på någon."
-#: builtin/branch.c:504
+#: builtin/branch.c:513
msgid "cannot rename the current branch while not on any."
msgstr ""
"kunde inte byta namn på aktuell gren när du inte befinner dig på någon."
-#: builtin/branch.c:515
+#: builtin/branch.c:524
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Felaktigt namn på gren: \"%s\""
-#: builtin/branch.c:542
+#: builtin/branch.c:553
msgid "Branch rename failed"
msgstr "Misslyckades byta namn på gren"
-#: builtin/branch.c:544
+#: builtin/branch.c:555
msgid "Branch copy failed"
msgstr "Misslyckades kopiera gren"
-#: builtin/branch.c:548
+#: builtin/branch.c:559
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Skapade kopia av felaktigt namngiven gren \"%s\""
-#: builtin/branch.c:551
+#: builtin/branch.c:562
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\""
-#: builtin/branch.c:557
+#: builtin/branch.c:568
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!"
-#: builtin/branch.c:566
+#: builtin/branch.c:577
msgid "Branch is renamed, but update of config-file failed"
msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"
-#: builtin/branch.c:568
+#: builtin/branch.c:579
msgid "Branch is copied, but update of config-file failed"
msgstr "Grenen kopierades, men misslyckades uppdatera konfigurationsfilen"
-#: builtin/branch.c:584
+#: builtin/branch.c:595
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -10595,211 +11278,211 @@
" %s\n"
"Rader som inleds med \"%c\" ignoreras.\n"
-#: builtin/branch.c:618
+#: builtin/branch.c:629
msgid "Generic options"
msgstr "Allmänna flaggor"
-#: builtin/branch.c:620
+#: builtin/branch.c:631
msgid "show hash and subject, give twice for upstream branch"
msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren"
-#: builtin/branch.c:621
+#: builtin/branch.c:632
msgid "suppress informational messages"
msgstr "undertryck informationsmeddelanden"
-#: builtin/branch.c:622
+#: builtin/branch.c:633
msgid "set up tracking mode (see git-pull(1))"
msgstr "ställ in spårningsläge (se git-pull(1))"
-#: builtin/branch.c:624
+#: builtin/branch.c:635
msgid "do not use"
msgstr "använd ej"
-#: builtin/branch.c:626 builtin/rebase.c:513
+#: builtin/branch.c:637 builtin/rebase.c:534
msgid "upstream"
msgstr "uppströms"
-#: builtin/branch.c:626
+#: builtin/branch.c:637
msgid "change the upstream info"
msgstr "ändra uppströmsinformationen"
-#: builtin/branch.c:627
+#: builtin/branch.c:638
msgid "unset the upstream info"
msgstr "ta bort uppströmsinformationen"
-#: builtin/branch.c:628
+#: builtin/branch.c:639
msgid "use colored output"
msgstr "använd färgad utdata"
-#: builtin/branch.c:629
+#: builtin/branch.c:640
msgid "act on remote-tracking branches"
msgstr "arbeta på fjärrspårande grenar"
-#: builtin/branch.c:631 builtin/branch.c:633
+#: builtin/branch.c:642 builtin/branch.c:644
msgid "print only branches that contain the commit"
msgstr "visa endast grenar som innehåller incheckningen"
-#: builtin/branch.c:632 builtin/branch.c:634
+#: builtin/branch.c:643 builtin/branch.c:645
msgid "print only branches that don't contain the commit"
msgstr "visa endast grenar som inte innehåller incheckningen"
-#: builtin/branch.c:637
+#: builtin/branch.c:648
msgid "Specific git-branch actions:"
msgstr "Specifika git-branch-åtgärder:"
-#: builtin/branch.c:638
+#: builtin/branch.c:649
msgid "list both remote-tracking and local branches"
msgstr "visa både fjärrspårande och lokala grenar"
-#: builtin/branch.c:640
+#: builtin/branch.c:651
msgid "delete fully merged branch"
msgstr "ta bort helt sammanslagen gren"
-#: builtin/branch.c:641
+#: builtin/branch.c:652
msgid "delete branch (even if not merged)"
msgstr "ta bort gren (även om inte helt sammanslagen)"
-#: builtin/branch.c:642
+#: builtin/branch.c:653
msgid "move/rename a branch and its reflog"
msgstr "flytta/ta bort en gren och dess reflogg"
-#: builtin/branch.c:643
+#: builtin/branch.c:654
msgid "move/rename a branch, even if target exists"
msgstr "flytta/ta bort en gren, även om målet finns"
-#: builtin/branch.c:644
+#: builtin/branch.c:655
msgid "copy a branch and its reflog"
msgstr "kopiera en gren och dess reflogg"
-#: builtin/branch.c:645
+#: builtin/branch.c:656
msgid "copy a branch, even if target exists"
msgstr "kopiera en gren, även om målet finns"
-#: builtin/branch.c:646
+#: builtin/branch.c:657
msgid "list branch names"
msgstr "lista namn på grenar"
-#: builtin/branch.c:647
+#: builtin/branch.c:658
msgid "show current branch name"
msgstr "visa namn på aktuell gren"
-#: builtin/branch.c:648
+#: builtin/branch.c:659
msgid "create the branch's reflog"
msgstr "skapa grenens reflogg"
-#: builtin/branch.c:650
+#: builtin/branch.c:661
msgid "edit the description for the branch"
msgstr "redigera beskrivning för grenen"
-#: builtin/branch.c:651
+#: builtin/branch.c:662
msgid "force creation, move/rename, deletion"
msgstr "tvinga skapande, flytt/namnändring, borttagande"
-#: builtin/branch.c:652
+#: builtin/branch.c:663
msgid "print only branches that are merged"
msgstr "visa endast sammanslagna grenar"
-#: builtin/branch.c:653
+#: builtin/branch.c:664
msgid "print only branches that are not merged"
msgstr "visa endast ej sammanslagna grenar"
-#: builtin/branch.c:654
+#: builtin/branch.c:665
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:667 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:466
msgid "object"
msgstr "objekt"
-#: builtin/branch.c:658
+#: builtin/branch.c:668
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:669 builtin/for-each-ref.c:48 builtin/tag.c:473
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/branch.c:670 builtin/for-each-ref.c:38 builtin/tag.c:471
#: 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:785
+#: builtin/branch.c:693 builtin/clone.c:790
msgid "HEAD not found below refs/heads!"
msgstr "HEAD hittades inte under refs/heads!"
-#: builtin/branch.c:708
+#: builtin/branch.c:717
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:732 builtin/branch.c:788 builtin/branch.c:797
msgid "branch name required"
msgstr "grennamn krävs"
-#: builtin/branch.c:753
+#: builtin/branch.c:764
msgid "Cannot give description to detached HEAD"
msgstr "Kan inte beskriva frånkopplad HEAD"
-#: builtin/branch.c:758
+#: builtin/branch.c:769
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:776
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Inga incheckningar på grenen \"%s\" ännu."
-#: builtin/branch.c:768
+#: builtin/branch.c:779
#, c-format
msgid "No branch named '%s'."
msgstr "Ingen gren vid namnet \"%s\"."
-#: builtin/branch.c:783
+#: builtin/branch.c:794
msgid "too many branches for a copy operation"
msgstr "för många grenar för kopiering"
-#: builtin/branch.c:792
+#: builtin/branch.c:803
msgid "too many arguments for a rename operation"
msgstr "för många flaggor för namnbyte"
-#: builtin/branch.c:797
+#: builtin/branch.c:808
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:812
#, 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:815 builtin/branch.c:838
#, c-format
msgid "no such branch '%s'"
msgstr "okänd gren \"%s\""
-#: builtin/branch.c:808
+#: builtin/branch.c:819
#, c-format
msgid "branch '%s' does not exist"
msgstr "grenen \"%s\" finns inte"
-#: builtin/branch.c:821
+#: builtin/branch.c:832
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:836
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:842
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Grenen \"%s\" har ingen uppströmsinformation"
-#: builtin/branch.c:841
+#: builtin/branch.c:852
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>?"
@@ -10807,7 +11490,7 @@
"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:856
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -10815,6 +11498,103 @@
"Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track "
"eller --set-upstream-to istället."
+#: builtin/bugreport.c:15
+msgid "git version:\n"
+msgstr "git version:\n"
+
+#: builtin/bugreport.c:21
+#, c-format
+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:135
+msgid "specify a destination for the bugreport file"
+msgstr "ange mål för buggrapporteringsfilen"
+
+#: builtin/bugreport.c:137
+msgid "specify a strftime format suffix for the filename"
+msgstr "ange ett filändelse i strftime-format"
+
+#: builtin/bugreport.c:159
+#, c-format
+msgid "could not create leading directories for '%s'"
+msgstr "kunde inte skapa inledande kataloger för \"%s\""
+
+#: builtin/bugreport.c:166
+msgid "System Info"
+msgstr "Systeminfo"
+
+#: builtin/bugreport.c:169
+msgid "Enabled Hooks"
+msgstr "Aktiverade krokar"
+
+#: builtin/bugreport.c:176
+#, c-format
+msgid "couldn't create a new file at '%s'"
+msgstr "kunde inte skapa filen på \"%s\""
+
+#: builtin/bugreport.c:179
+#, c-format
+msgid "unable to write to %s"
+msgstr "kunde inte skriva till %s"
+
+#: builtin/bugreport.c:189
+#, 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>"
@@ -10831,49 +11611,53 @@
msgid "git bundle unbundle <file> [<refname>...]"
msgstr "git bundle unbundle <fil> [<refnamn>...]"
-#: builtin/bundle.c:66 builtin/pack-objects.c:3375
+#: builtin/bundle.c:67 builtin/pack-objects.c:3495
msgid "do not show progress meter"
msgstr "visa inte förloppsindikator"
-#: builtin/bundle.c:68 builtin/pack-objects.c:3377
+#: builtin/bundle.c:69 builtin/pack-objects.c:3497
msgid "show progress meter"
msgstr "visa förloppsindikator"
-#: builtin/bundle.c:70 builtin/pack-objects.c:3379
+#: builtin/bundle.c:71 builtin/pack-objects.c:3499
msgid "show progress meter during object writing phase"
msgstr "visa förloppsindikator under objektskrivningsfasen"
-#: builtin/bundle.c:73 builtin/pack-objects.c:3382
+#: builtin/bundle.c:74 builtin/pack-objects.c:3502
msgid "similar to --all-progress when progress meter is shown"
msgstr "som --all-progress när förloppsindikatorn visas"
-#: builtin/bundle.c:93
+#: 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:104
+#: builtin/bundle.c:107
msgid "do not show bundle details"
msgstr "visa inte paketdetaljer"
-#: builtin/bundle.c:119
+#: builtin/bundle.c:122
#, c-format
msgid "%s is okay\n"
msgstr "%s är okej\n"
-#: builtin/bundle.c:160
+#: builtin/bundle.c:163
msgid "Need a repository to unbundle."
msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)."
-#: builtin/bundle.c:168 builtin/remote.c:1686
+#: builtin/bundle.c:171 builtin/remote.c:1700
msgid "be verbose; must be placed before a subcommand"
msgstr "var pratsam; måste skrivas före ett underkommando"
-#: builtin/bundle.c:190 builtin/remote.c:1717
+#: builtin/bundle.c:193 builtin/remote.c:1731
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Okänt underkommando: %s"
-#: builtin/cat-file.c:595
+#: 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>"
@@ -10881,80 +11665,80 @@
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <typ> | --textconv | --filters) [--path=<sökväg>] <objekt>"
-#: builtin/cat-file.c:596
+#: builtin/cat-file.c: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:617
+#: builtin/cat-file.c:620
msgid "only one batch option may be specified"
msgstr "endast en buntflagga kan anges"
-#: builtin/cat-file.c:635
+#: 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:636
+#: builtin/cat-file.c:639
msgid "show object type"
msgstr "visa objekttyp"
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:640
msgid "show object size"
msgstr "visa objektstorlek"
-#: builtin/cat-file.c:639
+#: 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:640
+#: builtin/cat-file.c:643
msgid "pretty-print object's content"
msgstr "visa objektets innehåll snyggt"
-#: builtin/cat-file.c:642
+#: 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:644
+#: 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:645 git-submodule.sh:1002
+#: builtin/cat-file.c:648
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:646
+#: 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:648
+#: 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:649
+#: builtin/cat-file.c:652
msgid "buffer --batch output"
msgstr "buffra utdata från --batch"
-#: builtin/cat-file.c:651
+#: 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:655
+#: 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:659
+#: 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:661
+#: 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:663
+#: builtin/cat-file.c:666
msgid "do not order --batch-all-objects output"
msgstr "ordna inte --batch-all-objects output"
@@ -10982,8 +11766,8 @@
msgid "terminate input and output records by a NUL character"
msgstr "avsluta in- och utdataposter med NUL-tecken"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537
-#: builtin/worktree.c:499
+#: builtin/check-ignore.c:21 builtin/checkout.c:1499 builtin/gc.c:549
+#: builtin/worktree.c:489
msgid "suppress progress reporting"
msgstr "undertryck förloppsrapportering"
@@ -11036,54 +11820,54 @@
msgid "no contacts specified"
msgstr "inga kontakter angavs"
-#: builtin/checkout-index.c:131
+#: builtin/checkout-index.c:152
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<flaggor>] [--] [<fil>...]"
-#: builtin/checkout-index.c:148
+#: builtin/checkout-index.c:169
msgid "stage should be between 1 and 3 or all"
msgstr "etapp måste vara mellan 1 och 3 eller \"all\""
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:186
msgid "check out all files in the index"
msgstr "checka ut alla filer i indexet"
-#: builtin/checkout-index.c:165
+#: builtin/checkout-index.c:187
msgid "force overwrite of existing files"
msgstr "tvinga överskrivning av befintliga filer"
-#: builtin/checkout-index.c:167
+#: builtin/checkout-index.c:189
msgid "no warning for existing files and files not in index"
msgstr "ingen varning för existerande filer och filer ej i indexet"
-#: builtin/checkout-index.c:169
+#: builtin/checkout-index.c:191
msgid "don't checkout new files"
msgstr "checka inte ut nya filer"
-#: builtin/checkout-index.c:171
+#: builtin/checkout-index.c:193
msgid "update stat information in the index file"
msgstr "uppdatera stat-information i indexfilen"
-#: builtin/checkout-index.c:175
+#: builtin/checkout-index.c:197
msgid "read list of paths from the standard input"
msgstr "läs listan över sökvägar från standard in"
-#: builtin/checkout-index.c:177
+#: builtin/checkout-index.c:199
msgid "write the content to temporary files"
msgstr "skriv innehåll till temporära filer"
-#: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403
-#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909
-#: builtin/worktree.c:672
+#: builtin/checkout-index.c:200 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:717
msgid "string"
msgstr "sträng"
-#: builtin/checkout-index.c:179
+#: builtin/checkout-index.c:201
msgid "when creating files, prepend <string>"
msgstr "när filer skapas, lägg till <sträng> först"
-#: builtin/checkout-index.c:181
+#: builtin/checkout-index.c:203
msgid "copy out the files from named stage"
msgstr "kopiera ut filer från namngiven etapp"
@@ -11103,98 +11887,98 @@
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git restore [<flaggor>] [--source=<gren>] <fil>..."
-#: builtin/checkout.c:175 builtin/checkout.c:214
+#: builtin/checkout.c: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:177 builtin/checkout.c:216
+#: 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:193
+#: 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:243
+#: 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:261
+#: builtin/checkout.c:275
#, c-format
msgid "path '%s': cannot merge"
msgstr "sökväg \"%s\": kan inte slå ihop"
-#: builtin/checkout.c:277
+#: 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:377
+#: 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:382
+#: 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:389
+#: 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:412 builtin/checkout.c:415 builtin/checkout.c:418
-#: builtin/checkout.c:422
+#: 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:425 builtin/checkout.c:428
+#: 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:432
+#: 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:436
+#: builtin/checkout.c:455
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "varken \"%s\" eller \"%s\" har angivits"
-#: builtin/checkout.c:440
+#: 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:445 builtin/checkout.c:450
+#: 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:509 builtin/checkout.c:516
+#: builtin/checkout.c:543 builtin/checkout.c:550
#, c-format
msgid "path '%s' is unmerged"
msgstr "sökvägen \"%s\" har inte slagits ihop"
-#: builtin/checkout.c:684 builtin/sparse-checkout.c:106
+#: builtin/checkout.c:718
msgid "you need to resolve your current index first"
msgstr "du måste lösa ditt befintliga index först"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:772
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -11203,50 +11987,50 @@
"kan inte fortsätta med köade ändringar i följande filer:\n"
"%s"
-#: builtin/checkout.c:837
+#: builtin/checkout.c:865
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Kan inte skapa referenslogg för \"%s\": %s\n"
-#: builtin/checkout.c:879
+#: builtin/checkout.c:907
msgid "HEAD is now at"
msgstr "HEAD är nu på"
-#: builtin/checkout.c:883 builtin/clone.c:717
+#: builtin/checkout.c:911 builtin/clone.c:721 t/helper/test-fast-rebase.c:202
msgid "unable to update HEAD"
msgstr "kan inte uppdatera HEAD"
-#: builtin/checkout.c:887
+#: builtin/checkout.c:915
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Återställ gren \"%s\"\n"
-#: builtin/checkout.c:890
+#: builtin/checkout.c:918
#, c-format
msgid "Already on '%s'\n"
msgstr "Redan på \"%s\"\n"
-#: builtin/checkout.c:894
+#: builtin/checkout.c:922
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Växlade till och nollställde grenen \"%s\"\n"
-#: builtin/checkout.c:896 builtin/checkout.c:1320
+#: builtin/checkout.c:924 builtin/checkout.c:1355
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Växlade till en ny gren \"%s\"\n"
-#: builtin/checkout.c:898
+#: builtin/checkout.c:926
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Växlade till grenen \"%s\"\n"
-#: builtin/checkout.c:949
+#: builtin/checkout.c:977
#, c-format
msgid " ... and %d more.\n"
msgstr " ... och %d till.\n"
-#: builtin/checkout.c:955
+#: builtin/checkout.c:983
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -11269,7 +12053,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:974
+#: builtin/checkout.c:1002
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -11296,19 +12080,19 @@
" git branch <nytt_grennamn> %s\n"
"\n"
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1037
msgid "internal error in revision walk"
msgstr "internt fel vid genomgång av revisioner (revision walk)"
-#: builtin/checkout.c:1013
+#: builtin/checkout.c:1041
msgid "Previous HEAD position was"
msgstr "Tidigare position för HEAD var"
-#: builtin/checkout.c:1053 builtin/checkout.c:1315
+#: builtin/checkout.c:1081 builtin/checkout.c:1350
msgid "You are on a branch yet to be born"
msgstr "Du är på en gren som ännu inte är född"
-#: builtin/checkout.c:1128
+#: builtin/checkout.c:1163
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -11317,7 +12101,7 @@
"\"%s\" kan vara både en lokal fil och en spårande gren.\n"
"Använd -- (och möjligen --no-guess) för att göra otvetydig"
-#: builtin/checkout.c:1135
+#: builtin/checkout.c:1170
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"
@@ -11337,51 +12121,51 @@
"föredra en fjärr, t.ex fjärren \"origin\" kan du ställa in\n"
"checkout.defaultRemote=origin i din konfiguration."
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1180
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "\"%s\" motsvarar flera (%d) spårade fjärrgrenar"
-#: builtin/checkout.c:1211
+#: builtin/checkout.c:1246
msgid "only one reference expected"
msgstr "endast en referens förväntades"
-#: builtin/checkout.c:1228
+#: builtin/checkout.c:1263
#, c-format
msgid "only one reference expected, %d given."
msgstr "endast en referens förväntades, %d gavs."
-#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448
+#: builtin/checkout.c:1309 builtin/worktree.c:270 builtin/worktree.c:438
#, c-format
msgid "invalid reference: %s"
msgstr "felaktig referens: %s"
-#: builtin/checkout.c:1287 builtin/checkout.c:1649
+#: builtin/checkout.c:1322 builtin/checkout.c:1688
#, c-format
msgid "reference is not a tree: %s"
msgstr "referensen är inte ett träd: %s"
-#: builtin/checkout.c:1334
+#: builtin/checkout.c:1369
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "förväntade gren, fick taggen \"%s\""
-#: builtin/checkout.c:1336
+#: builtin/checkout.c:1371
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "förväntade gren, fick fjärrgrenen \"%s\""
-#: builtin/checkout.c:1337 builtin/checkout.c:1345
+#: builtin/checkout.c:1372 builtin/checkout.c:1380
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "förväntade gren, fick \"%s\""
-#: builtin/checkout.c:1340
+#: builtin/checkout.c:1375
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "förväntade gren, fick incheckningen \"%s\""
-#: builtin/checkout.c:1356
+#: builtin/checkout.c:1391
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -11389,7 +12173,7 @@
"kan inte växla gren vid sammanslagning\n"
"Överväg \"git merge --quit\" eller \"git worktree add\"."
-#: builtin/checkout.c:1360
+#: builtin/checkout.c:1395
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -11397,7 +12181,7 @@
"kan inte växla gren mitt i en \"am\"-körning\n"
"Överväg \"git am --quit\" eller \"git worktree add\"."
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1399
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -11405,7 +12189,7 @@
"kan inte växla gren vid ombasering\n"
"Överväg \"git rebase --quit\" eller \"git worktree add\"."
-#: builtin/checkout.c:1368
+#: builtin/checkout.c:1403
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -11413,7 +12197,7 @@
"kan inte växla gren i en \"cherry-pick\"\n"
"Överväg \"git cherry-pick --quit\" eller \"git worktree add\"."
-#: builtin/checkout.c:1372
+#: builtin/checkout.c:1407
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -11421,144 +12205,139 @@
"kan inte växla gren i en \"revert\"\n"
"Överväg \"git revert --quit\" eller \"git worktree add\"."
-#: builtin/checkout.c:1376
+#: builtin/checkout.c:1411
msgid "you are switching branch while bisecting"
msgstr "då växlar grenar medan du gör en \"bisect\""
-#: builtin/checkout.c:1383
+#: builtin/checkout.c:1418
msgid "paths cannot be used with switching branches"
msgstr "sökvägar kan inte användas vid byte av gren"
-#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394
+#: builtin/checkout.c:1421 builtin/checkout.c:1425 builtin/checkout.c:1429
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "\"%s\" kan inte användas vid byte av gren"
-#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404
-#: builtin/checkout.c:1409 builtin/checkout.c:1414
+#: builtin/checkout.c:1433 builtin/checkout.c:1436 builtin/checkout.c:1439
+#: builtin/checkout.c:1444 builtin/checkout.c:1449
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "\"%s\" kan inte användas med \"%s\""
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1446
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "\"%s\" kan inte ta <startpunkt>"
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1454
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Kan inte växla gren till icke-incheckningen \"%s\""
-#: builtin/checkout.c:1426
+#: builtin/checkout.c:1461
msgid "missing branch or commit argument"
msgstr "saknar gren- eller incheckingsargument"
-#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72
-#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286
-#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563
-#: builtin/send-pack.c:174
-msgid "force progress reporting"
-msgstr "tvinga förloppsrapportering"
-
-#: builtin/checkout.c:1469
+#: builtin/checkout.c:1504
msgid "perform a 3-way merge with the new branch"
msgstr "utför en 3-vägssammanslagning för den nya grenen"
-#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322
+#: builtin/checkout.c:1505 builtin/log.c:1799 parse-options.h:322
msgid "style"
msgstr "stil"
-#: builtin/checkout.c:1471
+#: builtin/checkout.c:1506
msgid "conflict style (merge or diff3)"
msgstr "konfliktstil (merge eller diff3)"
-#: builtin/checkout.c:1483 builtin/worktree.c:496
+#: builtin/checkout.c:1518 builtin/worktree.c:486
msgid "detach HEAD at named commit"
msgstr "koppla från HEAD vid namngiven incheckning"
-#: builtin/checkout.c:1484
+#: builtin/checkout.c:1519
msgid "set upstream info for new branch"
msgstr "sätt uppströmsinformation för ny gren"
-#: builtin/checkout.c:1486
+#: builtin/checkout.c:1521
msgid "force checkout (throw away local modifications)"
msgstr "tvinga utcheckning (kasta bort lokala ändringar)"
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1523
msgid "new-branch"
msgstr "ny-gren"
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1523
msgid "new unparented branch"
msgstr "ny gren utan förälder"
-#: builtin/checkout.c:1490 builtin/merge.c:289
+#: builtin/checkout.c:1525 builtin/merge.c:301
msgid "update ignored files (default)"
msgstr "uppdatera ignorerade filer (standard)"
-#: builtin/checkout.c:1493
+#: builtin/checkout.c:1528
msgid "do not check if another worktree is holding the given ref"
msgstr ""
"kontrollera inte om en annan arbetskatalog håller den angivna referensen"
-#: builtin/checkout.c:1506
+#: builtin/checkout.c:1541
msgid "checkout our version for unmerged files"
msgstr "checka ut vår version för ej sammanslagna filer"
-#: builtin/checkout.c:1509
+#: builtin/checkout.c:1544
msgid "checkout their version for unmerged files"
msgstr "checka ut deras version för ej sammanslagna filer"
-#: builtin/checkout.c:1513
+#: builtin/checkout.c:1548
msgid "do not limit pathspecs to sparse entries only"
msgstr "begränsa inte sökvägar till endast glesa poster"
-#: builtin/checkout.c:1565
-msgid "-b, -B and --orphan are mutually exclusive"
-msgstr "-b, -B och --orphan är ömsesidigt uteslutande"
+#: builtin/checkout.c:1603
+#, c-format
+msgid "-%c, -%c and --orphan are mutually exclusive"
+msgstr "-%c, -%c och --orphan är ömsesidigt uteslutande"
-#: builtin/checkout.c:1568
+#: builtin/checkout.c:1607
msgid "-p and --overlay are mutually exclusive"
msgstr "-p och --overlay är ömsesidigt uteslutande"
-#: builtin/checkout.c:1605
+#: builtin/checkout.c:1644
msgid "--track needs a branch name"
msgstr "--track behöver ett namn på en gren"
-#: builtin/checkout.c:1610
-msgid "missing branch name; try -b"
-msgstr "grennamn saknas; försök med -b"
+#: builtin/checkout.c:1649
+#, c-format
+msgid "missing branch name; try -%c"
+msgstr "grennamn saknas; försök med -%c"
-#: builtin/checkout.c:1642
+#: builtin/checkout.c:1681
#, c-format
msgid "could not resolve %s"
msgstr "kunde inte upplösa %s"
-#: builtin/checkout.c:1658
+#: builtin/checkout.c:1697
msgid "invalid path specification"
msgstr "felaktig sökvägsangivelse"
-#: builtin/checkout.c:1665
+#: builtin/checkout.c:1704
#, 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"
-#: builtin/checkout.c:1669
+#: builtin/checkout.c:1708
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\""
-#: builtin/checkout.c:1678
+#: builtin/checkout.c:1717
msgid "--pathspec-from-file is incompatible with --detach"
msgstr "--pathspec-from-file är inkompatibelt med --detach"
-#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506
+#: builtin/checkout.c:1720 builtin/reset.c:325 builtin/stash.c:1566
msgid "--pathspec-from-file is incompatible with --patch"
msgstr "--pathspec-from-file är inkompatibelt med --patch"
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1733
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -11566,110 +12345,111 @@
"git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n"
"du checkar ut från indexet."
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1738
msgid "you must specify path(s) to restore"
msgstr "du måste ange katalog(er) att återställa"
-#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774
-#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494
+#: builtin/checkout.c:1764 builtin/checkout.c:1766 builtin/checkout.c:1815
+#: builtin/checkout.c:1817 builtin/clone.c:122 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:482
+#: builtin/worktree.c:484
msgid "branch"
msgstr "gren"
-#: builtin/checkout.c:1724
+#: builtin/checkout.c:1765
msgid "create and checkout a new branch"
msgstr "skapa och checka ut en ny gren"
-#: builtin/checkout.c:1726
+#: builtin/checkout.c:1767
msgid "create/reset and checkout a branch"
msgstr "skapa/nollställ och checka ut en gren"
-#: builtin/checkout.c:1727
+#: builtin/checkout.c:1768
msgid "create reflog for new branch"
msgstr "skapa reflogg för ny gren"
-#: builtin/checkout.c:1729
+#: builtin/checkout.c:1770
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "förutspå \"git checkout <gren-saknas>\" (förval)"
-#: builtin/checkout.c:1730
+#: builtin/checkout.c:1771
msgid "use overlay mode (default)"
msgstr "använd överläggsläge (standard)"
-#: builtin/checkout.c:1775
+#: builtin/checkout.c:1816
msgid "create and switch to a new branch"
msgstr "skapa och växla till en ny gren"
-#: builtin/checkout.c:1777
+#: builtin/checkout.c:1818
msgid "create/reset and switch to a branch"
msgstr "skapa/nollställ och växla till en gren"
-#: builtin/checkout.c:1779
+#: builtin/checkout.c:1820
msgid "second guess 'git switch <no-such-branch>'"
msgstr "förutspå \"git checkout <gren-saknas>\""
-#: builtin/checkout.c:1781
+#: builtin/checkout.c:1822
msgid "throw away local modifications"
msgstr "kasta bort lokala ändringar"
-#: builtin/checkout.c:1813
+#: builtin/checkout.c:1856
msgid "which tree-ish to checkout from"
msgstr "vilken träd-igt att checka ut från"
-#: builtin/checkout.c:1815
+#: builtin/checkout.c:1858
msgid "restore the index"
msgstr "återställ indexet"
-#: builtin/checkout.c:1817
+#: builtin/checkout.c:1860
msgid "restore the working tree (default)"
msgstr "återställ arbetskatalogen (förval)"
-#: builtin/checkout.c:1819
+#: builtin/checkout.c:1862
msgid "ignore unmerged entries"
msgstr "ignorera ej sammanslagna poster"
-#: builtin/checkout.c:1820
+#: builtin/checkout.c:1863
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:301 git-add--interactive.perl:595
+#: builtin/clean.c:302 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -11682,7 +12462,7 @@
"foo - markera post baserad på unikt prefix\n"
" - (tomt) markera ingenting\n"
-#: builtin/clean.c:305 git-add--interactive.perl:604
+#: builtin/clean.c:306 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -11703,33 +12483,33 @@
"* - välj alla poster\n"
" - (tomt) avsluta markering\n"
-#: builtin/clean.c:521 git-add--interactive.perl:570
-#: git-add--interactive.perl:575
+#: builtin/clean.c:521 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Vadå (%s)?\n"
-#: builtin/clean.c:663
+#: builtin/clean.c:661
#, c-format
msgid "Input ignore patterns>> "
msgstr "Ange ignoreringsmönster>>"
-#: builtin/clean.c:700
+#: 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:721
+#: 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:762
+#: builtin/clean.c:758
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Ta bort %s [Y=ja / N=nej]? "
-#: builtin/clean.c:795
+#: builtin/clean.c:789
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -11747,56 +12527,52 @@
"help - denna skärm\n"
"? - hjälp för kommandoval"
-#: builtin/clean.c:831
+#: 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:847
+#: builtin/clean.c:841
msgid "No more files to clean, exiting."
msgstr "Inga fler filer att städa, avslutar."
-#: builtin/clean.c:909
+#: builtin/clean.c:903
msgid "do not print names of files removed"
msgstr "skriv inte ut namn på borttagna filer"
-#: builtin/clean.c:911
+#: builtin/clean.c:905
msgid "force"
msgstr "tvinga"
-#: builtin/clean.c:912
+#: builtin/clean.c:906
msgid "interactive cleaning"
msgstr "städa interaktivt"
-#: builtin/clean.c:914
+#: builtin/clean.c:908
msgid "remove whole directories"
msgstr "ta bort hela kataloger"
-#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564
-#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179
-#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/grep.c:922 builtin/log.c:184 builtin/log.c:186
+#: builtin/ls-files.c:573 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "mönster"
-#: builtin/clean.c:916
+#: builtin/clean.c:910
msgid "add <pattern> to ignore rules"
msgstr "lägg till <mönster> till ignoreringsregler"
-#: builtin/clean.c:917
+#: builtin/clean.c:911
msgid "remove ignored files, too"
msgstr "ta även bort ignorerade filer"
-#: builtin/clean.c:919
+#: builtin/clean.c:913
msgid "remove only ignored files"
msgstr "ta endast bort ignorerade filer"
-#: builtin/clean.c:937
-msgid "-x and -X cannot be used together"
-msgstr "-x och -X kan inte användas samtidigt"
-
-#: builtin/clean.c:941
+#: builtin/clean.c:929
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -11804,7 +12580,7 @@
"clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar "
"städa"
-#: builtin/clean.c:944
+#: builtin/clean.c:932
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -11812,31 +12588,35 @@
"clean.requireForce har standardvärdet true och varken -i, -n eller -f "
"angavs; vägrar städa"
+#: 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>]"
-#: builtin/clone.c:93
+#: builtin/clone.c:94
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:95 builtin/clone.c:97 builtin/init-db.c:555
msgid "create a bare repository"
msgstr "skapa ett naket (\"bare\") arkiv"
-#: builtin/clone.c:98
+#: builtin/clone.c:99
msgid "create a mirror repository (implies bare)"
msgstr "skapa ett spegelarkiv (implicerar \"bare\")"
-#: builtin/clone.c:100
+#: builtin/clone.c:101
msgid "to clone from a local repository"
msgstr "för att klona från ett lokalt arkiv"
-#: builtin/clone.c:102
+#: builtin/clone.c:103
msgid "don't use local hardlinks, always copy"
msgstr "skapa inte lokala hårda länkar, kopiera alltid"
-#: builtin/clone.c:104
+#: builtin/clone.c:105
msgid "setup as shared repository"
msgstr "skapa som ett delat arkiv"
@@ -11848,131 +12628,132 @@
msgid "initialize submodules in the clone"
msgstr "initiera undermoduler i klonen"
-#: builtin/clone.c:110
+#: builtin/clone.c:111
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:112 builtin/init-db.c:552
msgid "template-directory"
msgstr "mallkatalog"
-#: builtin/clone.c:112 builtin/init-db.c:487
+#: builtin/clone.c:113 builtin/init-db.c:553
msgid "directory from which templates will be used"
msgstr "katalog att använda mallar från"
-#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407
-#: builtin/submodule--helper.c:1912
+#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831
+#: builtin/submodule--helper.c:2336
msgid "reference repository"
msgstr "referensarkiv"
-#: builtin/clone.c:118 builtin/submodule--helper.c:1409
-#: builtin/submodule--helper.c:1914
+#: builtin/clone.c:119 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:3441 builtin/repack.c:327
+#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3561 builtin/repack.c:357
msgid "name"
msgstr "namn"
-#: builtin/clone.c:120
+#: builtin/clone.c:121
msgid "use <name> instead of 'origin' to track upstream"
msgstr "använd <namn> istället för \"origin\" för att spåra uppströms"
-#: builtin/clone.c:122
+#: builtin/clone.c:123
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "checka ut <gren> istället för fjärrens HEAD"
-#: builtin/clone.c:124
+#: builtin/clone.c:125
msgid "path to git-upload-pack on the remote"
msgstr "sökväg till git-upload-pack på fjärren"
-#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828
-#: builtin/pull.c:207
+#: builtin/clone.c:126 builtin/fetch.c:176 builtin/grep.c:861
+#: builtin/pull.c:208
msgid "depth"
msgstr "djup"
-#: builtin/clone.c:126
+#: builtin/clone.c:127
msgid "create a shallow clone of that depth"
msgstr "skapa en grund klon på detta djup"
-#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430
+#: builtin/clone.c:128 builtin/fetch.c:178 builtin/pack-objects.c:3550
+#: builtin/pull.c:211
msgid "time"
msgstr "tid"
-#: builtin/clone.c:128
+#: builtin/clone.c:129
msgid "create a shallow clone since a specific time"
msgstr "skapa en grund klon från en angiven tidpunkt"
-#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195
-#: builtin/rebase.c:1480
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/fetch.c:203
+#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1323
msgid "revision"
msgstr "revision"
-#: builtin/clone.c:130 builtin/fetch.c:173
+#: builtin/clone.c:131 builtin/fetch.c:181 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/submodule--helper.c:1419
-#: builtin/submodule--helper.c:1928
+#: builtin/clone.c:133 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"
-#: builtin/clone.c:134
+#: builtin/clone.c:135
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr "klona inga taggar och gör att senare hämtningar inte följer dem"
-#: builtin/clone.c:136
+#: builtin/clone.c:137
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:138 builtin/init-db.c:561
msgid "gitdir"
msgstr "gitkat"
-#: builtin/clone.c:138 builtin/init-db.c:496
+#: builtin/clone.c:139 builtin/init-db.c:562
msgid "separate git dir from working tree"
msgstr "separera gitkatalogen från arbetskatalogen"
-#: builtin/clone.c:139
+#: builtin/clone.c:140
msgid "key=value"
msgstr "nyckel=värde"
-#: builtin/clone.c:140
+#: builtin/clone.c:141
msgid "set config inside the new repository"
msgstr "ställ in konfiguration i det nya arkivet"
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
-#: builtin/push.c:573 builtin/send-pack.c:172
+#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77
+#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
msgid "server-specific"
msgstr "serverspecifik"
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
-#: builtin/push.c:573 builtin/send-pack.c:173
+#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77
+#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
msgid "option to transmit"
msgstr ""
"inget att checka in\n"
"flagga att sända"
-#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220
-#: builtin/push.c:574
+#: builtin/clone.c:144 builtin/fetch.c:199 builtin/pull.c:234
+#: builtin/push.c:585
msgid "use IPv4 addresses only"
msgstr "använd endast IPv4-adresser"
-#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223
-#: builtin/push.c:576
+#: builtin/clone.c:146 builtin/fetch.c:201 builtin/pull.c:237
+#: builtin/push.c:587
msgid "use IPv6 addresses only"
msgstr "använd endast IPv6-adresser"
-#: builtin/clone.c:149
+#: builtin/clone.c:150
msgid "any cloned submodules will use their remote-tracking branch"
msgstr "klonade undermoduler kommer använda sin fjärrspårningsgren"
-#: builtin/clone.c:151
+#: builtin/clone.c:152
msgid "initialize sparse-checkout file to include only files at root"
msgstr "initiera sparse-checkout-filen till att bara inkludera filer i roten"
-#: builtin/clone.c:287
+#: builtin/clone.c:288
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -11980,42 +12761,42 @@
"Kunde inte gissa katalognamn.\n"
"Ange en katalog på kommandoraden"
-#: builtin/clone.c:340
+#: builtin/clone.c:341
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: Kan inte skapa suppleant för \"%s\": %s\n"
-#: builtin/clone.c:413
+#: builtin/clone.c:414
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s finns och är ingen katalog"
-#: builtin/clone.c:430
+#: builtin/clone.c:432
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "misslyckades starta iterator över \"%s\""
-#: builtin/clone.c:460
+#: builtin/clone.c:463
#, c-format
msgid "failed to create link '%s'"
msgstr "misslyckades skapa länken \"%s\""
-#: builtin/clone.c:464
+#: builtin/clone.c:467
#, c-format
msgid "failed to copy file to '%s'"
msgstr "misslyckades kopiera filen till \"%s\""
-#: builtin/clone.c:469
+#: builtin/clone.c:472
#, c-format
msgid "failed to iterate over '%s'"
msgstr "misslyckades iterera över \"%s\""
-#: builtin/clone.c:494
+#: builtin/clone.c:499
#, c-format
msgid "done.\n"
msgstr "klart.\n"
-#: builtin/clone.c:508
+#: builtin/clone.c:513
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -12025,137 +12806,147 @@
"Du kan inspektera det som checkades ut med \"git status\"\n"
"och försöka med \"git restore -source=HEAD :/\"\n"
-#: builtin/clone.c:585
+#: builtin/clone.c:590
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Kunde inte hitta fjärrgrenen %s för att klona."
-#: builtin/clone.c:705
+#: builtin/clone.c:709
#, c-format
msgid "unable to update %s"
msgstr "kan inte uppdatera %s"
-#: builtin/clone.c:753
+#: builtin/clone.c:757
msgid "failed to initialize sparse-checkout"
msgstr "misslyckades initiera sparse-checkout"
-#: builtin/clone.c:776
+#: builtin/clone.c:780
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n"
-#: builtin/clone.c:807
+#: builtin/clone.c:812
msgid "unable to checkout working tree"
msgstr "kunde inte checka ut arbetskatalogen"
-#: builtin/clone.c:862
+#: builtin/clone.c:887
msgid "unable to write parameters to config file"
msgstr "kunde inte skriva parametrar till konfigurationsfilen"
-#: builtin/clone.c:925
+#: builtin/clone.c:950
msgid "cannot repack to clean up"
msgstr "kan inte packa om för att städa upp"
-#: builtin/clone.c:927
+#: builtin/clone.c:952
msgid "cannot unlink temporary alternates file"
msgstr "kunde inte ta bort temporär \"alternates\"-fil"
-#: builtin/clone.c:965 builtin/receive-pack.c:1950
+#: builtin/clone.c:993 builtin/receive-pack.c:2493
msgid "Too many arguments."
msgstr "För många argument."
-#: builtin/clone.c:969
+#: builtin/clone.c:997
msgid "You must specify a repository to clone."
msgstr "Du måste ange ett arkiv att klona."
-#: builtin/clone.c:982
+#: builtin/clone.c:1010
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "flaggorna --bare och --origin %s är inkompatibla."
-#: builtin/clone.c:985
+#: builtin/clone.c:1013
msgid "--bare and --separate-git-dir are incompatible."
msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."
-#: builtin/clone.c:998
+#: builtin/clone.c:1026
#, c-format
msgid "repository '%s' does not exist"
msgstr "arkivet \"%s\" finns inte"
-#: builtin/clone.c:1004 builtin/fetch.c:1796
+#: builtin/clone.c:1030 builtin/fetch.c:1951
#, c-format
msgid "depth %s is not a positive number"
msgstr "djupet %s är inte ett positivt tal"
-#: builtin/clone.c:1014
+#: builtin/clone.c:1040
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog."
-#: builtin/clone.c:1024
+#: builtin/clone.c:1046
+#, 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:1060
#, c-format
msgid "working tree '%s' already exists."
msgstr "arbetsträdet \"%s\" finns redan."
-#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271
-#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327
+#: builtin/clone.c:1075 builtin/clone.c:1096 builtin/difftool.c:271
+#: builtin/log.c:1986 builtin/worktree.c:282 builtin/worktree.c:314
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "kunde inte skapa inledande kataloger för \"%s\""
-#: builtin/clone.c:1044
+#: builtin/clone.c:1080
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "kunde inte skapa arbetskatalogen \"%s\""
-#: builtin/clone.c:1064
+#: builtin/clone.c:1100
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Klonar till ett naket arkiv \"%s\"...\n"
-#: builtin/clone.c:1066
+#: builtin/clone.c:1102
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Klonar till \"%s\"...\n"
-#: builtin/clone.c:1090
+#: builtin/clone.c:1126
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr ""
"clone --recursive är inte kompatibel med --reference och --reference-if-able"
-#: builtin/clone.c:1154
+#: builtin/clone.c:1170 builtin/remote.c:200 builtin/remote.c:705
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv"
+
+#: builtin/clone.c:1211
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth ignoreras i lokala kloningar; använd file:// istället."
-#: builtin/clone.c:1156
+#: builtin/clone.c:1213
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "--shallow-since ignoreras i lokala kloningar; använd file:// istället."
-#: builtin/clone.c:1158
+#: builtin/clone.c:1215
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-exclude ignoreras i lokala kloningar; använd file:// istället."
-#: builtin/clone.c:1160
+#: builtin/clone.c:1217
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter ignoreras i lokala kloningar; använd file:// istället."
-#: builtin/clone.c:1163
+#: builtin/clone.c:1220
msgid "source repository is shallow, ignoring --local"
msgstr "källarkivet är grunt, ignorerar --local"
-#: builtin/clone.c:1168
+#: builtin/clone.c:1225
msgid "--local is ignored"
msgstr "--local ignoreras"
-#: builtin/clone.c:1243 builtin/clone.c:1251
+#: builtin/clone.c:1315 builtin/clone.c:1323
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"
-#: builtin/clone.c:1254
+#: builtin/clone.c:1326
msgid "You appear to have cloned an empty repository."
msgstr "Du verkar ha klonat ett tomt arkiv."
@@ -12191,6 +12982,110 @@
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:187 builtin/log.c:1768
+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 "
@@ -12204,7 +13099,7 @@
msgid "duplicate parent %s ignored"
msgstr "duplicerad förälder %s ignorerades"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:557
#, c-format
msgid "not a valid object name %s"
msgstr "objektnamnet är inte giltigt: %s"
@@ -12232,13 +13127,13 @@
msgid "id of a parent commit object"
msgstr "id på ett förälderincheckningsobjekt"
-#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477
-#: builtin/tag.c:412
+#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:282
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1537
+#: builtin/tag.c:445
msgid "message"
msgstr "meddelande"
-#: builtin/commit-tree.c:115 builtin/commit.c:1501
+#: builtin/commit-tree.c:115 builtin/commit.c:1504
msgid "commit message"
msgstr "incheckningsmeddelande"
@@ -12246,8 +13141,8 @@
msgid "read commit log message from file"
msgstr "läs incheckningsloggmeddelande från fil"
-#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288
-#: builtin/pull.c:175 builtin/revert.c:118
+#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:299
+#: builtin/pull.c:176 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "GPG-signera incheckning"
@@ -12292,10 +13187,14 @@
"\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"
@@ -12317,69 +13216,73 @@
" 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:351
+#: 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:364
+#: 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:376
+#: builtin/commit.c:373
msgid "unable to create temporary index"
msgstr "kunde inte skapa temporär indexfil"
-#: builtin/commit.c:385
+#: builtin/commit.c:382
msgid "interactive add failed"
msgstr "interaktiv tilläggning misslyckades"
-#: builtin/commit.c:400
+#: builtin/commit.c:397
msgid "unable to update temporary index"
msgstr "kan inte uppdatera temporärt index"
-#: builtin/commit.c:402
+#: builtin/commit.c:399
msgid "Failed to update main cache tree"
msgstr "Misslyckades uppdatera huvud-cacheträdet"
-#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496
+#: builtin/commit.c: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:479
+#: 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:481
+#: 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:489
+#: 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:508
+#: builtin/commit.c:507
msgid "unable to write temporary index file"
msgstr "kunde inte skriva temporär indexfil"
-#: builtin/commit.c:606
+#: builtin/commit.c:605
#, c-format
msgid "commit '%s' lacks author header"
msgstr "incheckningen \"%s\" saknar författarhuvud"
-#: builtin/commit.c:608
+#: builtin/commit.c:607
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "incheckningen \"%s\" har felformaterat författarhuvud"
-#: builtin/commit.c:627
+#: builtin/commit.c:626
msgid "malformed --author parameter"
msgstr "felformad \"--author\"-flagga"
-#: builtin/commit.c:680
+#: builtin/commit.c:679
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -12387,68 +13290,66 @@
"kunde inte välja ett kommentarstecken som inte använts\n"
"i det befintliga incheckningsmeddelandet"
-#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097
+#: builtin/commit.c: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:730 builtin/shortlog.c:319
+#: builtin/commit.c:729 builtin/shortlog.c:413
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(läser loggmeddelande från standard in)\n"
-#: builtin/commit.c:732
+#: builtin/commit.c:731
msgid "could not read log from standard input"
msgstr "kunde inte läsa logg från standard in"
-#: builtin/commit.c:736
+#: builtin/commit.c:735
#, c-format
msgid "could not read log file '%s'"
msgstr "kunde inte läsa loggfilen \"%s\""
-#: builtin/commit.c:767 builtin/commit.c:783
+#: builtin/commit.c:766 builtin/commit.c:782
msgid "could not read SQUASH_MSG"
msgstr "kunde inte läsa SQUASH_MSG"
-#: builtin/commit.c:774
+#: builtin/commit.c:773
msgid "could not read MERGE_MSG"
msgstr "kunde inte läsa MERGE_MSG"
-#: builtin/commit.c:834
+#: builtin/commit.c:833
msgid "could not write commit template"
msgstr "kunde inte skriva incheckningsmall"
#: builtin/commit.c:853
-#, c-format
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
+"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:858
-#, c-format
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
+"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:871
+#: builtin/commit.c:868
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -12458,7 +13359,7 @@
"med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "
"incheckningen.\n"
-#: builtin/commit.c:879
+#: builtin/commit.c:876
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -12469,22 +13370,22 @@
"med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n"
"Ett tomt meddelande avbryter incheckningen.\n"
-#: builtin/commit.c:896
+#: builtin/commit.c:893
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sFörfattare: %.*s <%.*s>"
-#: builtin/commit.c:904
+#: builtin/commit.c:901
#, c-format
msgid "%sDate: %s"
msgstr "%sDatum: %s"
-#: builtin/commit.c:911
+#: builtin/commit.c:908
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sIncheckare: %.*s <%.*s>"
-#: builtin/commit.c:929
+#: builtin/commit.c:926
msgid "Cannot read index"
msgstr "Kan inte läsa indexet"
@@ -12492,7 +13393,7 @@
msgid "Error building trees"
msgstr "Fel vid byggande av träd"
-#: builtin/commit.c:1011 builtin/tag.c:275
+#: builtin/commit.c:1011 builtin/tag.c:308
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Ange meddelandet en av flaggorna -m eller -F.\n"
@@ -12501,14 +13402,14 @@
#, 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"
+"--author '%s' är inte 'Namn <epost>' och motsvarar ingen befintlig författare"
#: builtin/commit.c:1069
#, c-format
msgid "Invalid ignored mode '%s'"
msgstr "Ogiltigt ignorerat läge \"%s\""
-#: builtin/commit.c:1087 builtin/commit.c:1327
+#: 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\""
@@ -12533,76 +13434,80 @@
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Du är i mitten av en cherry-pick -- kan inte utöka."
-#: builtin/commit.c:1188
+#: builtin/commit.c: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:1198
+#: 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:1200
+#: 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:1208
+#: 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:1225
+#: 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:1231
+#: 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:1362 builtin/commit.c:1524
+#: builtin/commit.c:1366 builtin/commit.c:1527
msgid "show status concisely"
msgstr "visa koncis status"
-#: builtin/commit.c:1364 builtin/commit.c:1526
+#: builtin/commit.c:1368 builtin/commit.c:1529
msgid "show branch information"
msgstr "visa information om gren"
-#: builtin/commit.c:1366
+#: builtin/commit.c:1370
msgid "show stash information"
msgstr "visa information om stash"
-#: builtin/commit.c:1368 builtin/commit.c:1528
+#: 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:1370
+#: builtin/commit.c:1374
msgid "version"
msgstr "version"
-#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549
-#: builtin/worktree.c:643
+#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560
+#: builtin/worktree.c:679
msgid "machine-readable output"
msgstr "maskinläsbar utdata"
-#: builtin/commit.c:1373 builtin/commit.c:1532
+#: 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:1376 builtin/commit.c:1535
+#: builtin/commit.c:1380 builtin/commit.c:1538
msgid "terminate entries with NUL"
msgstr "terminera poster med NUL"
-#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538
-#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
-#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336
+#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541
+#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
+#: builtin/fast-export.c:1204 builtin/rebase.c:1412 parse-options.h:336
msgid "mode"
msgstr "läge"
-#: builtin/commit.c:1379 builtin/commit.c:1538
+#: 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:1383
+#: builtin/commit.c:1387
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -12610,11 +13515,11 @@
"visa ignorerade filer, valfria lägen: traditional, matching, no (Standard: "
"traditional)"
-#: builtin/commit.c:1385 parse-options.h:192
+#: builtin/commit.c:1389 parse-options.h:192
msgid "when"
msgstr "när"
-#: builtin/commit.c:1386
+#: builtin/commit.c:1390
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -12622,172 +13527,172 @@
"ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "
"(Default: all)"
-#: builtin/commit.c:1388
+#: builtin/commit.c:1392
msgid "list untracked files in columns"
msgstr "visa ospårade filer i spalter"
-#: builtin/commit.c:1389
+#: builtin/commit.c:1393
msgid "do not detect renames"
msgstr "detektera inte namnändringar"
-#: builtin/commit.c:1391
+#: builtin/commit.c:1395
msgid "detect renames, optionally set similarity index"
msgstr "detektera namnändringar, möjligen sätt likhetsindex"
-#: builtin/commit.c:1411
+#: 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:1494
+#: builtin/commit.c:1497
msgid "suppress summary after successful commit"
msgstr "undertryck sammanfattning efter framgångsrik incheckning"
-#: builtin/commit.c:1495
+#: builtin/commit.c:1498
msgid "show diff in commit message template"
msgstr "visa diff i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:1497
+#: builtin/commit.c:1500
msgid "Commit message options"
msgstr "Alternativ för incheckningsmeddelande"
-#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414
+#: builtin/commit.c:1501 builtin/merge.c:286 builtin/tag.c:447
msgid "read message from file"
msgstr "läs meddelande från fil"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1502
msgid "author"
msgstr "författare"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1502
msgid "override author for commit"
msgstr "överstyr författare för incheckningen"
-#: builtin/commit.c:1500 builtin/gc.c:538
+#: builtin/commit.c:1503 builtin/gc.c:550
msgid "date"
msgstr "datum"
-#: builtin/commit.c:1500
+#: builtin/commit.c:1503
msgid "override date for commit"
msgstr "överstyr datum för incheckningen"
-#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504
-#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92
+#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507
+#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:90
msgid "commit"
msgstr "incheckning"
-#: builtin/commit.c:1502
+#: 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:1503
+#: builtin/commit.c:1506
msgid "reuse message from specified commit"
msgstr "återanvänd meddelande från angiven incheckning"
-#: builtin/commit.c:1504
+#: 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:1505
+#: 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:1506
+#: 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:1507 builtin/log.c:1634 builtin/merge.c:290
-#: builtin/pull.c:144 builtin/revert.c:110
-msgid "add Signed-off-by:"
-msgstr "lägg till Signed-off-by:"
+#: builtin/commit.c:1510 builtin/log.c:1743 builtin/merge.c:302
+#: builtin/pull.c:145 builtin/revert.c:110
+msgid "add a Signed-off-by trailer"
+msgstr "lägg till Signed-off-by-släprad"
-#: builtin/commit.c:1508
+#: builtin/commit.c:1511
msgid "use specified template file"
msgstr "använd angiven mallfil"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1512
msgid "force edit of commit"
msgstr "tvinga redigering av incheckning"
-#: builtin/commit.c:1511
+#: builtin/commit.c:1514
msgid "include status in commit message template"
msgstr "inkludera status i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:1516
+#: builtin/commit.c:1519
msgid "Commit contents options"
msgstr "Alternativ för incheckningens innehåll"
-#: builtin/commit.c:1517
+#: builtin/commit.c:1520
msgid "commit all changed files"
msgstr "checka in alla ändrade filer"
-#: builtin/commit.c:1518
+#: 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:1519
+#: builtin/commit.c:1522
msgid "interactively add files"
msgstr "lägg till filer interaktivt"
-#: builtin/commit.c:1520
+#: builtin/commit.c:1523
msgid "interactively add changes"
msgstr "lägg till ändringar interaktivt"
-#: builtin/commit.c:1521
+#: builtin/commit.c:1524
msgid "commit only specified files"
msgstr "checka endast in angivna filer"
-#: builtin/commit.c:1522
+#: builtin/commit.c:1525
msgid "bypass pre-commit and commit-msg hooks"
msgstr "förbigå pre-commit- och commit-msg-krokar"
-#: builtin/commit.c:1523
+#: builtin/commit.c:1526
msgid "show what would be committed"
msgstr "visa vad som skulle checkas in"
-#: builtin/commit.c:1536
+#: builtin/commit.c:1539
msgid "amend previous commit"
msgstr "lägg till föregående incheckning"
-#: builtin/commit.c:1537
+#: builtin/commit.c:1540
msgid "bypass post-rewrite hook"
msgstr "förbigå post-rewrite-krok"
-#: builtin/commit.c:1544
+#: builtin/commit.c:1547
msgid "ok to record an empty change"
msgstr "ok att registrera en tom ändring"
-#: builtin/commit.c:1546
+#: 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:1619
+#: builtin/commit.c:1622
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Trasig MERGE_HEAD-fil (%s)"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1629
msgid "could not read MERGE_MODE"
msgstr "kunde inte läsa MERGE_MODE"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1650
#, c-format
msgid "could not read commit message: %s"
msgstr "kunde inte läsa incheckningsmeddelande: %s"
-#: builtin/commit.c:1652
+#: 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:1657
+#: 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:1691
+#: 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"
@@ -12798,286 +13703,223 @@
"att kvoten inte har överskridits, och kör sedan\n"
"\"git restore --staged :/\" för att återställa."
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:17
-msgid ""
-"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
-msgstr ""
-"git commit-graph verify [--object-dir <objkat>] [--shallow] [--[no-]progress]"
-
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:22
-msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
-msgstr ""
-"git commit-graph write [--object-dir <objkat>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <delnings-flaggor>"
-
-#: builtin/commit-graph.c:52
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "kunde inte hitta objektkatalog för %s"
-
-#: builtin/commit-graph.c:68 builtin/commit-graph.c:125
-#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657
-msgid "dir"
-msgstr "kat"
-
-#: builtin/commit-graph.c:69 builtin/commit-graph.c:126
-#: builtin/commit-graph.c:211
-msgid "The object directory to store the graph"
-msgstr "Objektkatalogen där grafen ska lagras"
-
-#: builtin/commit-graph.c:71
-msgid "if the commit-graph is split, only verify the tip file"
-msgstr "om inchecknignsgrafen är delad, kontrollera bara spetsfilen"
-
-#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23
-#, c-format
-msgid "Could not open commit-graph '%s'"
-msgstr "Kunde inte öppna incheckningsgrafen \"%s\""
-
-#: builtin/commit-graph.c:128
-msgid "start walk at all refs"
-msgstr "starta traversering vid alla referenser"
-
-#: builtin/commit-graph.c:130
-msgid "scan pack-indexes listed by stdin for commits"
-msgstr "sök paketindex listade på standard in efter incheckningar"
-
-#: builtin/commit-graph.c:132
-msgid "start walk at commits listed by stdin"
-msgstr "börja gå genom incheckningar listade på standard in"
-
-#: builtin/commit-graph.c:134
-msgid "include all commits already in the commit-graph file"
-msgstr "ta med alla incheckningar redan i filen commit-graph"
-
-#: builtin/commit-graph.c:137
-msgid "allow writing an incremental commit-graph file"
-msgstr "tillåt skriva en inkrementell incheckningsgraffil"
-
-#: builtin/commit-graph.c:139 builtin/commit-graph.c:143
-msgid "maximum number of commits in a non-base split commit-graph"
-msgstr ""
-"maximalt antal incheckningar i en delad incheckingsgraf som inte är bad"
-
-#: builtin/commit-graph.c:141
-msgid "maximum ratio between two levels of a split commit-graph"
-msgstr "maximalt förhållande mellan två nivåer av en delad incheckningsgraf"
-
-#: builtin/commit-graph.c:159
-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:104 builtin/env--helper.c:23
+#: builtin/config.c:109 builtin/env--helper.c:27
#, c-format
msgid "unrecognized --type argument, %s"
msgstr "okänt argument för --type, %s"
-#: builtin/config.c:116
+#: builtin/config.c:121
msgid "only one type at a time"
msgstr "endast en typ åt gången"
-#: builtin/config.c:125
+#: builtin/config.c:130
msgid "Config file location"
msgstr "Konfigurationsfilens plats"
-#: builtin/config.c:126
+#: builtin/config.c:131
msgid "use global config file"
msgstr "använd global konfigurationsfil"
-#: builtin/config.c:127
+#: builtin/config.c:132
msgid "use system config file"
msgstr "använd systemets konfigurationsfil"
-#: builtin/config.c:128
+#: builtin/config.c:133
msgid "use repository config file"
msgstr "använd arkivets konfigurationsfil"
-#: builtin/config.c:129
+#: builtin/config.c:134
msgid "use per-worktree config file"
msgstr "använd arbetskatalogens konfigurationsfil"
-#: builtin/config.c:130
+#: builtin/config.c:135
msgid "use given config file"
msgstr "använd angiven konfigurationsfil"
-#: builtin/config.c:131
+#: builtin/config.c:136
msgid "blob-id"
msgstr "blob-id"
-#: builtin/config.c:131
+#: builtin/config.c:136
msgid "read config from given blob object"
msgstr "läs konfiguration från givet blob-objekt"
-#: builtin/config.c:132
+#: builtin/config.c:137
msgid "Action"
msgstr "Åtgärd"
-#: builtin/config.c:133
-msgid "get value: name [value-regex]"
-msgstr "hämta värde: namn [värde-reguttr]"
+#: builtin/config.c:138
+msgid "get value: name [value-pattern]"
+msgstr "hämta värde: namn [värde-mönster]"
-#: builtin/config.c:134
-msgid "get all values: key [value-regex]"
-msgstr "hämta alla värden: nyckel [värde-reguttr]"
+#: builtin/config.c:139
+msgid "get all values: key [value-pattern]"
+msgstr "hämta alla värden: nyckel [värde-mönster]"
-#: builtin/config.c:135
-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:140
+msgid "get values for regexp: name-regex [value-pattern]"
+msgstr "hämta värden för reguttr: namn-reguttr [värde-mönster]"
-#: builtin/config.c:136
+#: builtin/config.c:141
msgid "get value specific for the URL: section[.var] URL"
msgstr "hämta värde specifikt URL:en: sektion[.var] URL"
-#: builtin/config.c:137
-msgid "replace all matching variables: name value [value_regex]"
-msgstr "ersätt alla motsvarande variabler: namn värde [värde-reguttr]"
+#: builtin/config.c:142
+msgid "replace all matching variables: name value [value-pattern]"
+msgstr "ersätt alla motsvarande variabler: namn värde [värde-mönster]"
-#: builtin/config.c:138
+#: builtin/config.c:143
msgid "add a new variable: name value"
msgstr "lägg till en ny variabel: namn värde"
-#: builtin/config.c:139
-msgid "remove a variable: name [value-regex]"
-msgstr "ta bort en variabel: namn [värde-reguttr]"
+#: builtin/config.c:144
+msgid "remove a variable: name [value-pattern]"
+msgstr "ta bort en variabel: namn [värde-mönster]"
-#: builtin/config.c:140
-msgid "remove all matches: name [value-regex]"
-msgstr "ta bort alla träffar: namn [värde-reguttr]"
+#: builtin/config.c:145
+msgid "remove all matches: name [value-pattern]"
+msgstr "ta bort alla träffar: namn [värde-mönster]"
-#: builtin/config.c:141
+#: builtin/config.c:146
msgid "rename section: old-name new-name"
msgstr "byt namn på sektion: gammalt-namn nytt-namn"
-#: builtin/config.c:142
+#: builtin/config.c:147
msgid "remove a section: name"
msgstr "ta bort en sektion: namn"
-#: builtin/config.c:143
+#: builtin/config.c:148
msgid "list all"
msgstr "visa alla"
-#: builtin/config.c:144
+#: builtin/config.c:149
+msgid "use string equality when comparing values to 'value-pattern'"
+msgstr "använd stränglikhet vid när värden jämförs med \"värde-mönster\""
+
+#: builtin/config.c:150
msgid "open an editor"
msgstr "öppna textredigeringsprogram"
-#: builtin/config.c:145
+#: builtin/config.c:151
msgid "find the color configured: slot [default]"
msgstr "hitta den inställda färgen: slot [default]"
-#: builtin/config.c:146
+#: builtin/config.c:152
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "hitta färginställningen: slot [stdout-is-tty]"
-#: builtin/config.c:147
+#: builtin/config.c:153
msgid "Type"
msgstr "Typ"
-#: builtin/config.c:148 builtin/env--helper.c:38
+#: builtin/config.c:154 builtin/env--helper.c:43
msgid "value is given this type"
msgstr "värdet har givits denna typ"
-#: builtin/config.c:149
+#: builtin/config.c:155
msgid "value is \"true\" or \"false\""
msgstr "värdet är \"true\" eller \"false\""
-#: builtin/config.c:150
+#: builtin/config.c:156
msgid "value is decimal number"
msgstr "värdet är ett decimalt tal"
-#: builtin/config.c:151
+#: builtin/config.c:157
msgid "value is --bool or --int"
msgstr "värdet är --bool eller --int"
-#: builtin/config.c:152
+#: builtin/config.c:158
+msgid "value is --bool or string"
+msgstr "värdet är --bool eller sträng"
+
+#: builtin/config.c:159
msgid "value is a path (file or directory name)"
msgstr "värdet är en sökväg (fil- eller katalognamn)"
-#: builtin/config.c:153
+#: builtin/config.c:160
msgid "value is an expiry date"
msgstr "värdet är ett utgångsdatum"
-#: builtin/config.c:154
+#: builtin/config.c:161
msgid "Other"
msgstr "Andra"
-#: builtin/config.c:155
+#: builtin/config.c:162
msgid "terminate values with NUL byte"
msgstr "terminera värden med NUL-byte"
-#: builtin/config.c:156
+#: builtin/config.c:163
msgid "show variable names only"
msgstr "visa endast variabelnamn"
-#: builtin/config.c:157
+#: builtin/config.c:164
msgid "respect include directives on lookup"
msgstr "respektera inkluderingsdirektiv vid uppslag"
-#: builtin/config.c:158
+#: builtin/config.c:165
msgid "show origin of config (file, standard input, blob, command line)"
msgstr "visa konfigurationskälla (fil, standard in, blob, kommandorad)"
-#: builtin/config.c:159
+#: builtin/config.c:166
msgid "show scope of config (worktree, local, global, system, command)"
msgstr ""
"visa omfång för konfiguration (arbetskatalog, lokalt, globalt, system, "
"kommando)"
-#: builtin/config.c:160 builtin/env--helper.c:40
+#: builtin/config.c:167 builtin/env--helper.c:45
msgid "value"
msgstr "värde"
-#: builtin/config.c:160
+#: builtin/config.c:167
msgid "with --get, use default value when missing entry"
msgstr "med --get, använd standardvärde vid saknad post"
-#: builtin/config.c:174
+#: builtin/config.c:181
#, c-format
msgid "wrong number of arguments, should be %d"
msgstr "fel antal argument, skulle vara %d"
-#: builtin/config.c:176
+#: builtin/config.c:183
#, c-format
msgid "wrong number of arguments, should be from %d to %d"
msgstr "fel antal argument, skulle vara från %d till %d"
-#: builtin/config.c:324
+#: builtin/config.c:339
#, c-format
msgid "invalid key pattern: %s"
msgstr "felaktigt nyckelmönster: %s"
-#: builtin/config.c:360
+#: builtin/config.c:377
#, c-format
msgid "failed to format default config value: %s"
msgstr "misslyckades formatera standardkonfigurationsvärde: %s"
-#: builtin/config.c:417
+#: builtin/config.c:441
#, c-format
msgid "cannot parse color '%s'"
msgstr "kan inte tolka färgen \"%s\""
-#: builtin/config.c:459
+#: builtin/config.c:483
msgid "unable to parse default color value"
msgstr "kan inte tolka standardfärgvärde"
-#: builtin/config.c:512 builtin/config.c:768
+#: builtin/config.c:536 builtin/config.c:833
msgid "not in a git directory"
msgstr "inte i en git-katalog"
-#: builtin/config.c:515
+#: builtin/config.c:539
msgid "writing to stdin is not supported"
msgstr "skriva till standard in stöds inte"
-#: builtin/config.c:518
+#: builtin/config.c:542
msgid "writing config blobs is not supported"
msgstr "skriva konfigurations-blobbar stöds inte"
-#: builtin/config.c:603
+#: builtin/config.c:627
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -13092,23 +13934,27 @@
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:627
+#: builtin/config.c:652
msgid "only one config file at a time"
msgstr "endast en konfigurationsfil åt gången"
-#: builtin/config.c:632
+#: builtin/config.c:658
msgid "--local can only be used inside a git repository"
msgstr "--local kan bara användas inuti ett git-arkiv"
-#: builtin/config.c:635
+#: builtin/config.c:660
msgid "--blob can only be used inside a git repository"
msgstr "--blob kan bara användas inuti ett git-arkiv"
-#: builtin/config.c:655
+#: builtin/config.c:662
+msgid "--worktree can only be used inside a git repository"
+msgstr "--worktree kan bara användas inuti ett git-arkiv"
+
+#: builtin/config.c:684
msgid "$HOME not set"
msgstr "$HOME inte satt"
-#: builtin/config.c:679
+#: builtin/config.c:708
msgid ""
"--worktree cannot be used with multiple working trees unless the config\n"
"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -13118,52 +13964,56 @@
"konfigurationsutöknignen worktreeConfig har aktiverats. Läsa stycket\n"
"\"KONFIGURATIONSFIL\" i \"git help worktree\" för detaljer"
-#: builtin/config.c:714
+#: builtin/config.c:743
msgid "--get-color and variable type are incoherent"
msgstr "--get-color och variabeltyp stämmer inte överens"
-#: builtin/config.c:719
+#: builtin/config.c:748
msgid "only one action at a time"
msgstr "endast en åtgärd åt gången"
-#: builtin/config.c:732
+#: builtin/config.c:761
msgid "--name-only is only applicable to --list or --get-regexp"
msgstr "--name-only gäller bara för --list eller --get-regexp"
-#: builtin/config.c:738
+#: builtin/config.c:767
msgid ""
"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
"list"
msgstr ""
"--show-origin gäller bara för --get, --get-all, --get-regexp och --list"
-#: builtin/config.c:744
+#: builtin/config.c:773
msgid "--default is only applicable to --get"
msgstr "--default gäller bara för --get"
-#: builtin/config.c:757
+#: builtin/config.c:806
+msgid "--fixed-value only applies with 'value-pattern'"
+msgstr "--fixed-value gäller endast med \"värde-mönster\""
+
+#: builtin/config.c:822
#, c-format
msgid "unable to read config file '%s'"
msgstr "kan inte konfigurationsfil \"%s\""
-#: builtin/config.c:760
+#: builtin/config.c:825
msgid "error processing config file(s)"
msgstr "fel vid hantering av konfigurationsfil(er)"
-#: builtin/config.c:770
+#: builtin/config.c:835
msgid "editing stdin is not supported"
msgstr "redigering av standard in stöds ej"
-#: builtin/config.c:772
+#: builtin/config.c:837
msgid "editing blobs is not supported"
msgstr "redigering av blobbar stöds ej"
-#: builtin/config.c:786
+#: builtin/config.c:851
#, c-format
msgid "cannot create configuration file %s"
msgstr "kan inte skapa konfigurationsfilen \"%s\""
-#: builtin/config.c:799
+#: builtin/config.c:864
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -13172,7 +14022,7 @@
"kan inte skriva över flera värden med ett ensamt värde\n"
" Använd en regexp, --add eller --replace-all för att ändra %s."
-#: builtin/config.c:873 builtin/config.c:884
+#: builtin/config.c:943 builtin/config.c:954
#, c-format
msgid "no such section: %s"
msgstr "ingen sådan sektion: %s"
@@ -13185,6 +14035,37 @@
msgid "print sizes in human readable format"
msgstr "skriv storlekar i människoläsbart format"
+#: 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/credential-store.c:66
+#, c-format
+msgid "unable to get credential storage lock in %d ms"
+msgstr "kunde inte erhålla låset för lagring av inlogginsuppgifter på %d ms"
+
#: builtin/describe.c:26
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<flaggor>] [<incheckning-igt>...]"
@@ -13193,50 +14074,45 @@
msgid "git describe [<options>] --dirty"
msgstr "git describe [<flaggor>] --dirty"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "head"
msgstr "huvud"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "lightweight"
msgstr "lättviktig"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "annotated"
msgstr "annoterad"
-#: builtin/describe.c:275
+#: builtin/describe.c:277
#, c-format
msgid "annotated tag %s not available"
msgstr "den annoterade taggen %s inte tillgänglig"
-#: builtin/describe.c:279
-#, c-format
-msgid "annotated tag %s has no embedded name"
-msgstr "den annoterade taggen %s har inget inbäddat namn"
-
#: builtin/describe.c:281
#, c-format
-msgid "tag '%s' is really '%s' here"
-msgstr "taggen \"%s\" är i verkligheten \"%s\" här"
+msgid "tag '%s' is externally known as '%s'"
+msgstr "taggen \"%s\" är utanför känd som \"%s\""
-#: builtin/describe.c:325
+#: builtin/describe.c:328
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "ingen tagg motsvarar \"%s\" exakt"
-#: builtin/describe.c:327
+#: 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:394
+#: builtin/describe.c:397
#, c-format
msgid "finished search at %s\n"
msgstr "avslutade sökning på %s\n"
-#: builtin/describe.c:421
+#: builtin/describe.c:424
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -13245,7 +14121,7 @@
"Inga annoterade taggar kan beskriva \"%s\".\n"
"Det finns dock oannoterade taggar: testa --tags."
-#: builtin/describe.c:425
+#: builtin/describe.c:428
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -13254,12 +14130,12 @@
"Inga taggar kan beskriva \"%s\".\n"
"Testa --always, eller skapa några taggar."
-#: builtin/describe.c:455
+#: builtin/describe.c:458
#, c-format
msgid "traversed %lu commits\n"
msgstr "traverserade %lu incheckningar\n"
-#: builtin/describe.c:458
+#: builtin/describe.c:461
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -13268,122 +14144,140 @@
"mer än %i taggar hittades; listar de %i senaste\n"
"gav upp sökningen vid %s\n"
-#: builtin/describe.c:526
+#: builtin/describe.c:529
#, c-format
msgid "describe %s\n"
msgstr "beskriva %s\n"
-#: builtin/describe.c:529
+#: builtin/describe.c:532
#, c-format
msgid "Not a valid object name %s"
msgstr "Objektnamnet är inte giltigt: %s"
-#: builtin/describe.c:537
+#: builtin/describe.c:540
#, c-format
msgid "%s is neither a commit nor blob"
msgstr "%s är varken incheckning eller blob"
-#: builtin/describe.c:551
+#: builtin/describe.c:554
msgid "find the tag that comes after the commit"
msgstr "hitta taggen som kommer efter incheckningen"
-#: builtin/describe.c:552
+#: builtin/describe.c:555
msgid "debug search strategy on stderr"
msgstr "felsök sökstrategin på standard fel"
-#: builtin/describe.c:553
+#: builtin/describe.c:556
msgid "use any ref"
msgstr "använd alla referenser"
-#: builtin/describe.c:554
+#: builtin/describe.c:557
msgid "use any tag, even unannotated"
msgstr "använd alla taggar, även oannoterade"
-#: builtin/describe.c:555
+#: builtin/describe.c:558
msgid "always use long format"
msgstr "använd alltid långt format"
-#: builtin/describe.c:556
+#: builtin/describe.c:559
msgid "only follow first parent"
msgstr "följ endast första föräldern"
-#: builtin/describe.c:559
+#: builtin/describe.c:562
msgid "only output exact matches"
msgstr "skriv endast ut exakta träffar"
-#: builtin/describe.c:561
+#: builtin/describe.c:564
msgid "consider <n> most recent tags (default: 10)"
msgstr "överväg de <n> nyaste taggarna (standard: 10)"
-#: builtin/describe.c:563
+#: builtin/describe.c:566
msgid "only consider tags matching <pattern>"
msgstr "överväg endast taggar som motsvarar <mönster>"
-#: builtin/describe.c:565
+#: builtin/describe.c:568
msgid "do not consider tags matching <pattern>"
msgstr "överväg inte taggar som motsvarar <mönster>"
-#: builtin/describe.c:567 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:535
msgid "show abbreviated commit object as fallback"
msgstr "visa förkortade incheckningsobjekt som standard"
-#: builtin/describe.c:568 builtin/describe.c:571
+#: builtin/describe.c:571 builtin/describe.c:574
msgid "mark"
msgstr "märke"
-#: builtin/describe.c:569
+#: 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:572
+#: 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:590
+#: builtin/describe.c:593
msgid "--long is incompatible with --abbrev=0"
msgstr "--long är inkompatibel med --abbrev=0"
-#: builtin/describe.c:619
+#: builtin/describe.c:622
msgid "No names found, cannot describe anything."
msgstr "Inga namn hittades, kan inte beskriva något."
-#: builtin/describe.c:670
+#: builtin/describe.c:673
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden"
-#: builtin/describe.c:672
+#: 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-tree.c:155
+msgid "--stdin and --merge-base are mutually exclusive"
+msgstr "--stdin och --merge-base är ömsesidigt uteslutande"
+
+#: builtin/diff-tree.c:157
+msgid "--merge-base only works with two commits"
+msgstr "--merge-base fungerar endast med två incheckningar"
+
+#: builtin/diff.c:92
#, 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:259
#, c-format
msgid "invalid option: %s"
msgstr "ogiltig flagga: %s"
-#: builtin/diff.c:350
+#: builtin/diff.c:376
+#, c-format
+msgid "%s...%s: no merge base"
+msgstr "%s...%s: ingen sammanslagningsbas"
+
+#: builtin/diff.c:486
msgid "Not a git repository"
msgstr "Inte ett git-arkiv"
-#: builtin/diff.c:394
+#: builtin/diff.c:532 builtin/grep.c:682
#, c-format
msgid "invalid object '%s' given."
msgstr "objektet \"%s\" som angavs är felaktigt."
-#: builtin/diff.c:403
+#: builtin/diff.c:543
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "mer än två blobbar angavs: \"%s\""
-#: builtin/diff.c:408
+#: builtin/diff.c:548
#, c-format
msgid "unhandled object '%s' given."
msgstr "ej hanterat objekt \"%s\" angavs."
+#: builtin/diff.c:582
+#, 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 ""
@@ -13409,7 +14303,7 @@
msgid "could not read object %s for symlink %s"
msgstr "kunde inte läsa objektet %s för symboliska länken %s"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:412
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
@@ -13417,53 +14311,53 @@
"kombinerade diff-format (\"-c\" och \"--cc\") stöds inte i\n"
"katalogdiffläge (\"-d\" och \"--dir-diff\")."
-#: builtin/difftool.c:634
+#: builtin/difftool.c:633
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "bägge filerna ändrade: \"%s\" och \"%s\"."
-#: builtin/difftool.c:636
+#: builtin/difftool.c:635
msgid "working tree file has been left."
msgstr "filen i arbetskatalogen lämnades kvar."
-#: builtin/difftool.c:647
+#: builtin/difftool.c:646
#, c-format
msgid "temporary files exist in '%s'."
msgstr "temporära filer finns i \"%s\"."
-#: builtin/difftool.c:648
+#: builtin/difftool.c:647
msgid "you may want to cleanup or recover these."
msgstr "du kanske vill städa eller rädda dem."
-#: builtin/difftool.c:697
+#: builtin/difftool.c:696
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "använd \"diff.guitool\" istället för \"diff.tool\""
-#: builtin/difftool.c:699
+#: builtin/difftool.c:698
msgid "perform a full-directory diff"
msgstr "utför diff för hela katalogen"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:700
msgid "do not prompt before launching a diff tool"
msgstr "fråga inte vid start av diff-verktyg"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:705
msgid "use symlinks in dir-diff mode"
msgstr "använd symboliska länkar i katalogdiffläge"
-#: builtin/difftool.c:707
+#: builtin/difftool.c:706
msgid "tool"
msgstr "verktyg"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:707
msgid "use the specified diff tool"
msgstr "använd angivet diff-verktyg"
-#: builtin/difftool.c:710
+#: builtin/difftool.c:709
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "visa en lista över diff-verktyg som kan användas med \"--tool\""
-#: builtin/difftool.c:713
+#: builtin/difftool.c:712
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
@@ -13471,31 +14365,31 @@
"låt \"git-difftool\" avbryta när ett anropat diff-verktyg ger returvärde "
"skilt från noll"
-#: builtin/difftool.c:716
+#: builtin/difftool.c:715
msgid "specify a custom command for viewing diffs"
msgstr "ange eget kommando för att visa diffar"
-#: builtin/difftool.c:717
+#: builtin/difftool.c:716
msgid "passed to `diff`"
msgstr "sändes till \"diff\""
-#: builtin/difftool.c:732
+#: builtin/difftool.c:731
msgid "difftool requires worktree or --no-index"
msgstr "difftool kräver en arbetskatalog eller --no-index"
-#: builtin/difftool.c:739
+#: builtin/difftool.c:738
msgid "--dir-diff is incompatible with --no-index"
msgstr "--dir-diff är inkompatibelt med --no-index"
-#: builtin/difftool.c:742
+#: builtin/difftool.c:741
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr "--gui, --tool och --extcmd är ömsesidigt uteslutande"
-#: builtin/difftool.c:750
+#: builtin/difftool.c:749
msgid "no <tool> given for --tool=<tool>"
msgstr "inget <verktyg> angavs för --tool=<verktyg>"
-#: builtin/difftool.c:757
+#: builtin/difftool.c:756
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "inget <kommando> angavs för --extcmd=<kommando>"
@@ -13503,26 +14397,26 @@
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 `"
@@ -13535,180 +14429,239 @@
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-flaggor]"
-#: builtin/fast-export.c:853
+#: 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:1152
+#: builtin/fast-export.c:1177
+msgid "--anonymize-map token cannot be empty"
+msgstr "symbolen för --anonymize-map kan inte vara tom"
+
+#: builtin/fast-export.c:1197
msgid "show progress after <n> objects"
msgstr "visa förlopp efter <n> objekt"
-#: builtin/fast-export.c:1154
+#: builtin/fast-export.c:1199
msgid "select handling of signed tags"
msgstr "välj hantering av signerade taggar"
-#: builtin/fast-export.c:1157
+#: builtin/fast-export.c:1202
msgid "select handling of tags that tag filtered objects"
msgstr "välj hantering av taggar som har taggfiltrerade objekt"
-#: builtin/fast-export.c:1160
+#: builtin/fast-export.c:1205
msgid "select handling of commit messages in an alternate encoding"
msgstr "välj hantering av incheckningsmeddelanden i alternativ teckenkodning"
-#: builtin/fast-export.c:1163
-msgid "Dump marks to this file"
-msgstr "Dumpa märken till filen"
+#: builtin/fast-export.c:1208
+msgid "dump marks to this file"
+msgstr "dumpa märken till filen"
-#: builtin/fast-export.c:1165
-msgid "Import marks from this file"
-msgstr "Importera märken från filen"
+#: builtin/fast-export.c:1210
+msgid "import marks from this file"
+msgstr "importera märken från filen"
-#: builtin/fast-export.c:1169
-msgid "Import marks from this file if it exists"
-msgstr "Importera märken från filen, om den finns"
+#: builtin/fast-export.c:1214
+msgid "import marks from this file if it exists"
+msgstr "importera märken från filen, om den finns"
-#: builtin/fast-export.c:1171
-msgid "Fake a tagger when tags lack one"
-msgstr "Fejka taggare när taggen saknar en"
+#: builtin/fast-export.c:1216
+msgid "fake a tagger when tags lack one"
+msgstr "fejka taggare när taggen saknar en"
-#: builtin/fast-export.c:1173
-msgid "Output full tree for each commit"
-msgstr "Skriv ut hela trädet för varje incheckning"
+#: builtin/fast-export.c:1218
+msgid "output full tree for each commit"
+msgstr "skriv ut hela trädet för varje incheckning"
-#: builtin/fast-export.c:1175
-msgid "Use the done feature to terminate the stream"
-msgstr "Använd done-funktionen för att avsluta strömmen"
+#: builtin/fast-export.c:1220
+msgid "use the done feature to terminate the stream"
+msgstr "använd done-funktionen för att avsluta strömmen"
-#: builtin/fast-export.c:1176
-msgid "Skip output of blob data"
-msgstr "Hoppa över skrivning av blob-data"
+#: builtin/fast-export.c:1221
+msgid "skip output of blob data"
+msgstr "hoppa över skrivning av blob-data"
-#: builtin/fast-export.c:1177 builtin/log.c:1705
+#: builtin/fast-export.c:1222 builtin/log.c:1815
msgid "refspec"
msgstr "referensspecifikation"
-#: builtin/fast-export.c:1178
-msgid "Apply refspec to exported refs"
-msgstr "Applicera referensspecifikation på exporterade referenser"
+#: builtin/fast-export.c:1223
+msgid "apply refspec to exported refs"
+msgstr "applicera referensspecifikation på exporterade referenser"
-#: builtin/fast-export.c:1179
+#: builtin/fast-export.c:1224
msgid "anonymize output"
msgstr "anonymisera utdata"
-#: builtin/fast-export.c:1181
-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:1225
+msgid "from:to"
+msgstr "från:till"
-#: builtin/fast-export.c:1183
-msgid "Show original object ids of blobs/commits"
-msgstr "Visa ursprungliga objekt-id för blobbar/incheckningar"
+#: builtin/fast-export.c:1226
+msgid "convert <from> to <to> in anonymized output"
+msgstr "konvertera <från> till <till> i anonymiserad utdata"
-#: builtin/fast-export.c:1185
-msgid "Label tags with mark ids"
-msgstr "Märk taggar med märke-id"
+#: builtin/fast-export.c:1229
+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:1220
+#: builtin/fast-export.c:1231
+msgid "show original object ids of blobs/commits"
+msgstr "visa ursprungliga objekt-id för blobbar/incheckningar"
+
+#: builtin/fast-export.c:1233
+msgid "label tags with mark ids"
+msgstr "märk taggar med märke-id"
+
+#: builtin/fast-export.c:1256
+msgid "--anonymize-map without --anonymize does not make sense"
+msgstr "--anonymize-map utan --anonymize ger ingen mening"
+
+#: builtin/fast-export.c:1271
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
msgstr "Kan inte ange både --import-marks och --import-marks-if-exists"
-#: builtin/fetch.c:34
+#: builtin/fast-import.c:3088
+#, c-format
+msgid "Missing from marks for submodule '%s'"
+msgstr "Saknar från-märken för undermodulen \"%s\""
+
+#: builtin/fast-import.c:3090
+#, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr "Saknar till-märken för undermodulen \"%s\""
+
+#: builtin/fast-import.c:3225
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr "Förväntade \"mark\"-kommando, fick %s"
+
+#: builtin/fast-import.c:3230
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr "Förväntade \"to\"-kommando, fick %s"
+
+#: builtin/fast-import.c:3322
+msgid "Expected format name:filename for submodule rewrite option"
+msgstr "Förvändae formatet namn:filnamn för undermodul-omskrivningsflaggan"
+
+#: builtin/fast-import.c:3377
+#, 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:242
+#, 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:35
+#: builtin/fetch.c:36
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<flaggor>] <grupp>"
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]"
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<flaggor>]"
-#: builtin/fetch.c:116
+#: builtin/fetch.c:120
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel kan inte vara negativt"
-#: builtin/fetch.c:139 builtin/pull.c:184
+#: builtin/fetch.c:143 builtin/pull.c:185
msgid "fetch from all remotes"
msgstr "hämta från alla fjärrar"
-#: builtin/fetch.c:141 builtin/pull.c:228
+#: builtin/fetch.c:145 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:143 builtin/pull.c:187
+#: builtin/fetch.c:147 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:145 builtin/pull.c:190
+#: builtin/fetch.c:149
+msgid "use atomic transaction to update references"
+msgstr "använd atomiska transaktioner för att uppdatera referenser"
+
+#: builtin/fetch.c:151 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:146
+#: builtin/fetch.c:152
msgid "force overwrite of local reference"
msgstr "tvinga överskrivning av lokal referens"
-#: builtin/fetch.c:148
+#: builtin/fetch.c:154
msgid "fetch from multiple remotes"
msgstr "hämta från flera fjärrar"
-#: builtin/fetch.c:150 builtin/pull.c:194
+#: builtin/fetch.c:156 builtin/pull.c:195
msgid "fetch all tags and associated objects"
msgstr "hämta alla taggar och associerade objekt"
-#: builtin/fetch.c:152
+#: builtin/fetch.c:158
msgid "do not fetch all tags (--no-tags)"
msgstr "hämta inte alla taggar (--no-tags)"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:160
msgid "number of submodules fetched in parallel"
msgstr "antal undermoduler som hämtas parallellt"
-#: builtin/fetch.c:156 builtin/pull.c:197
+#: builtin/fetch.c:162 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:158
+#: builtin/fetch.c:164
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
"rensa lokala taggar inte längre på fjärren och skriv över ändrade taggar"
-#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121
+#: builtin/fetch.c:165 builtin/fetch.c:190 builtin/pull.c:122
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:160
+#: builtin/fetch.c:166
msgid "control recursive fetching of submodules"
msgstr "styr rekursiv hämtning av undermoduler"
-#: builtin/fetch.c:164 builtin/pull.c:205
+#: builtin/fetch.c:171
+msgid "write fetched references to the FETCH_HEAD file"
+msgstr "skriv hämtade referenser till FETCH_HEAD-filen"
+
+#: builtin/fetch.c:172 builtin/pull.c:206
msgid "keep downloaded pack"
msgstr "behåll hämtade paket"
-#: builtin/fetch.c:166
+#: builtin/fetch.c:174
msgid "allow updating of HEAD ref"
msgstr "tillåt uppdatering av HEAD-referens"
-#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208
+#: builtin/fetch.c:177 builtin/fetch.c:183 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:171
+#: builtin/fetch.c:179 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:177 builtin/pull.c:211
+#: builtin/fetch.c:185 builtin/pull.c:221
msgid "convert to a complete repository"
msgstr "konvertera till komplett arkiv"
-#: builtin/fetch.c:180
+#: builtin/fetch.c:188
msgid "prepend this to submodule path output"
msgstr "lägg till i början av undermodulens sökvägsutdata"
-#: builtin/fetch.c:183
+#: builtin/fetch.c:191
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
@@ -13716,94 +14669,98 @@
"standard för rekursiv hämtning av undermoduler (lägre prioritet än "
"konfigurationsfiler)"
-#: builtin/fetch.c:187 builtin/pull.c:214
+#: builtin/fetch.c:195 builtin/pull.c:224
msgid "accept refs that update .git/shallow"
msgstr "tar emot referenser som uppdaterar .git/shallow"
-#: builtin/fetch.c:188 builtin/pull.c:216
+#: builtin/fetch.c:196 builtin/pull.c:226
msgid "refmap"
msgstr "referenskarta"
-#: builtin/fetch.c:189 builtin/pull.c:217
+#: builtin/fetch.c:197 builtin/pull.c:227
msgid "specify fetch refmap"
msgstr "ange referenskarta för \"fetch\""
-#: builtin/fetch.c:196
+#: builtin/fetch.c:204 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:199
-msgid "run 'gc --auto' after fetching"
-msgstr "kör \"gc --auto\" efter hämtning"
+#: builtin/fetch.c:207 builtin/fetch.c:209
+msgid "run 'maintenance --auto' after fetching"
+msgstr "kör \"maintenance --auto\" efter hämtning"
-#: builtin/fetch.c:201 builtin/pull.c:226
+#: builtin/fetch.c:211 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:203
+#: builtin/fetch.c:213
msgid "write the commit-graph after fetching"
msgstr "skriv incheckingsgrafen efter hämtning"
-#: builtin/fetch.c:513
+#: builtin/fetch.c:215
+msgid "accept refspecs from stdin"
+msgstr "ta emot referenser från standard in"
+
+#: builtin/fetch.c:526
msgid "Couldn't find remote ref HEAD"
msgstr "Kunde inte hitta fjärr-referensen HEAD"
-#: builtin/fetch.c:653
+#: builtin/fetch.c:697
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "konfigurationen för fetch.output innehåller ogiltigt värde %s"
-#: builtin/fetch.c:751
+#: builtin/fetch.c:796
#, c-format
msgid "object %s not found"
msgstr "objektet %s hittades inte"
-#: builtin/fetch.c:755
+#: builtin/fetch.c:800
msgid "[up to date]"
msgstr "[àjour]"
-#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
+#: builtin/fetch.c:813 builtin/fetch.c:829 builtin/fetch.c:901
msgid "[rejected]"
msgstr "[refuserad]"
-#: builtin/fetch.c:769
+#: builtin/fetch.c:814
msgid "can't fetch in current branch"
msgstr "kan inte hämta i aktuell gren"
-#: builtin/fetch.c:779
+#: builtin/fetch.c:824
msgid "[tag update]"
msgstr "[uppdaterad tagg]"
-#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839
-#: builtin/fetch.c:851
+#: builtin/fetch.c:825 builtin/fetch.c:862 builtin/fetch.c:884
+#: builtin/fetch.c:896
msgid "unable to update local ref"
msgstr "kunde inte uppdatera lokal ref"
-#: builtin/fetch.c:784
+#: builtin/fetch.c:829
msgid "would clobber existing tag"
msgstr "skulle skriva över befintlig tagg"
-#: builtin/fetch.c:806
+#: builtin/fetch.c:851
msgid "[new tag]"
msgstr "[ny tagg]"
-#: builtin/fetch.c:809
+#: builtin/fetch.c:854
msgid "[new branch]"
msgstr "[ny gren]"
-#: builtin/fetch.c:812
+#: builtin/fetch.c:857
msgid "[new ref]"
msgstr "[ny ref]"
-#: builtin/fetch.c:851
+#: builtin/fetch.c:896
msgid "forced update"
msgstr "tvingad uppdatering"
-#: builtin/fetch.c:856
+#: builtin/fetch.c:901
msgid "non-fast-forward"
msgstr "ej snabbspolad"
-#: builtin/fetch.c:877
+#: builtin/fetch.c:1005
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"
@@ -13814,7 +14771,7 @@
"av. För att slå på igen, använd flaggan \"--show-forced-updates\" eller kör\n"
"\"git config fetch.showForcedUpdates true\"."
-#: builtin/fetch.c:881
+#: builtin/fetch.c:1009
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
@@ -13827,22 +14784,22 @@
"showForcedUpdates\n"
"false\" för att undvika testet.\n"
-#: builtin/fetch.c:920
+#: builtin/fetch.c:1041
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s sände inte alla nödvändiga objekt\n"
-#: builtin/fetch.c:941
+#: builtin/fetch.c:1069
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "avvisa %s då grunda rötter inte kan uppdateras"
-#: builtin/fetch.c:1026 builtin/fetch.c:1164
+#: builtin/fetch.c:1146 builtin/fetch.c:1297
#, c-format
msgid "From %.*s\n"
msgstr "Från %.*s\n"
-#: builtin/fetch.c:1037
+#: builtin/fetch.c:1168
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -13851,56 +14808,56 @@
"vissa lokala referenser kunde inte uppdateras; testa att köra\n"
" \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt"
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1267
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s kommer bli dinglande)"
-#: builtin/fetch.c:1135
+#: builtin/fetch.c:1268
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s har blivit dinglande)"
-#: builtin/fetch.c:1167
+#: builtin/fetch.c:1300
msgid "[deleted]"
msgstr "[borttagen]"
-#: builtin/fetch.c:1168 builtin/remote.c:1112
+#: builtin/fetch.c:1301 builtin/remote.c:1118
msgid "(none)"
msgstr "(ingen)"
-#: builtin/fetch.c:1191
+#: builtin/fetch.c:1324
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv"
-#: builtin/fetch.c:1210
+#: builtin/fetch.c:1343
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s"
-#: builtin/fetch.c:1213
+#: builtin/fetch.c:1346
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Flaggan \"%s\" ignoreras för %s\n"
-#: builtin/fetch.c:1421
+#: builtin/fetch.c:1558
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "flera grenar upptäcktes, inkompatibelt med --set-upstream"
-#: builtin/fetch.c:1436
+#: builtin/fetch.c:1573
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "ställer inte in uppströmsgren för en fjärrspårande gren på fjärren"
-#: builtin/fetch.c:1438
+#: builtin/fetch.c:1575
msgid "not setting upstream for a remote tag"
msgstr "ställer inte in uppström för en fjärrtag"
-#: builtin/fetch.c:1440
+#: builtin/fetch.c:1577
msgid "unknown branch type"
msgstr "okänd grentyp"
-#: builtin/fetch.c:1442
+#: builtin/fetch.c:1579
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
@@ -13908,22 +14865,22 @@
"hittade ingen källgren.\n"
"du måste ange exakt en gren med flaggan --set-upstream."
-#: builtin/fetch.c:1568 builtin/fetch.c:1631
+#: builtin/fetch.c:1708 builtin/fetch.c:1771
#, c-format
msgid "Fetching %s\n"
msgstr "Hämtar %s\n"
-#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101
+#: builtin/fetch.c:1718 builtin/fetch.c:1773 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr "Kunde inte hämta %s"
-#: builtin/fetch.c:1590
+#: builtin/fetch.c:1730
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "kunde inte hämta \"%s\" (felkod: %d)\n"
-#: builtin/fetch.c:1693
+#: builtin/fetch.c:1834
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -13931,44 +14888,44 @@
"Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n"
"fjärrarkiv som nya incheckningar ska hämtas från."
-#: builtin/fetch.c:1730
+#: builtin/fetch.c:1870
msgid "You need to specify a tag name."
msgstr "Du måste ange namnet på en tagg."
-#: builtin/fetch.c:1780
+#: builtin/fetch.c:1935
msgid "Negative depth in --deepen is not supported"
msgstr "Negativa djup stöds inte i --deepen"
-#: builtin/fetch.c:1782
+#: builtin/fetch.c:1937
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen och --depth är ömsesidigt uteslutande"
-#: builtin/fetch.c:1787
+#: builtin/fetch.c:1942
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth och --unshallow kan inte användas samtidigt"
-#: builtin/fetch.c:1789
+#: builtin/fetch.c:1944
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow kan inte användas på ett komplett arkiv"
-#: builtin/fetch.c:1805
+#: builtin/fetch.c:1961
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all tar inte namnet på ett arkiv som argument"
-#: builtin/fetch.c:1807
+#: builtin/fetch.c:1963
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all kan inte anges med referensspecifikationer"
-#: builtin/fetch.c:1816
+#: builtin/fetch.c:1972
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Fjärren eller fjärrgruppen finns inte: %s"
-#: builtin/fetch.c:1823
+#: builtin/fetch.c:1979
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Kan inte hämta från grupp och ange referensspecifikationer"
-#: builtin/fetch.c:1841
+#: builtin/fetch.c:1997
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
@@ -13976,29 +14933,37 @@
"--filter kan endast användas med fjärren konfigurerad i extensions."
"partialclone"
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fetch.c:2001
+msgid "--atomic can only be used when fetching from one remote"
+msgstr "--atomic kan bara användas vid hämtning från en fjärr"
+
+#: builtin/fetch.c:2005
+msgid "--stdin can only be used when fetching from one remote"
+msgstr "--stdin kan bara användas vid hämtning fårn 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:671
+#: 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:674
+#: builtin/fmt-merge-msg.c:21
msgid "alias for --log (deprecated)"
msgstr "alias för --log (avråds)"
-#: builtin/fmt-merge-msg.c:677
+#: builtin/fmt-merge-msg.c:24
msgid "text"
msgstr "text"
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:25
msgid "use <text> as start of message"
msgstr "inled meddelande med <text>"
-#: builtin/fmt-merge-msg.c:679
+#: builtin/fmt-merge-msg.c:26
msgid "file to read from"
msgstr "fil att läsa från"
@@ -14011,8 +14976,9 @@
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>]]"
@@ -14039,7 +15005,7 @@
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:472
msgid "respect format colors"
msgstr "använd formatfärger"
@@ -14063,32 +15029,48 @@
msgid "print only refs which don't contain the commit"
msgstr "visa endast referenser som inte innehåller incheckningen"
-#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148
+#: builtin/for-each-repo.c:9
+msgid "git for-each-repo --config=<config> <command-args>"
+msgstr "git for-each-repo --config=<konfig> <kommandoargument>"
+
+#: builtin/for-each-repo.c:37
+msgid "config"
+msgstr "konfig"
+
+#: builtin/for-each-repo.c:38
+msgid "config key storing a list of repository paths"
+msgstr "konfigurationsnyckel som innehåller en lista över arkivsökvägar"
+
+#: builtin/for-each-repo.c:46
+msgid "missing --config=<config>"
+msgstr "saknar --config=<konfig>"
+
+#: builtin/fsck.c:69 builtin/fsck.c:130 builtin/fsck.c:131
msgid "unknown"
msgstr "okänd"
#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:100 builtin/fsck.c:120
+#: builtin/fsck.c:83 builtin/fsck.c:103
#, c-format
msgid "error in %s %s: %s"
msgstr "fel i %s %s: %s"
#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:114
+#: builtin/fsck.c:97
#, c-format
msgid "warning in %s %s: %s"
msgstr "varning i %s %s: %s"
-#: builtin/fsck.c:143 builtin/fsck.c:146
+#: builtin/fsck.c:126 builtin/fsck.c:129
#, c-format
msgid "broken link from %7s %s"
msgstr "trasig länk från %7s %s"
-#: builtin/fsck.c:155
+#: builtin/fsck.c:138
msgid "wrong object type in link"
msgstr "fel objekttyp i länk"
-#: builtin/fsck.c:171
+#: builtin/fsck.c:154
#, c-format
msgid ""
"broken link from %7s %s\n"
@@ -14097,244 +15079,244 @@
"trasig länk från %7s %s\n"
" till %7s %s"
-#: builtin/fsck.c:282
+#: builtin/fsck.c:265
#, c-format
msgid "missing %s %s"
msgstr "saknat %s %s"
-#: builtin/fsck.c:309
+#: builtin/fsck.c:292
#, c-format
msgid "unreachable %s %s"
msgstr "onåbart %s %s"
-#: builtin/fsck.c:329
+#: builtin/fsck.c:312
#, c-format
msgid "dangling %s %s"
msgstr "hängande %s %s"
-#: builtin/fsck.c:339
+#: builtin/fsck.c:322
msgid "could not create lost-found"
msgstr "kunde inte skapa lost-found"
-#: builtin/fsck.c:350
+#: builtin/fsck.c:333
#, c-format
msgid "could not finish '%s'"
msgstr "kunde inte avsluta \"%s\""
-#: builtin/fsck.c:367
+#: builtin/fsck.c:350
#, c-format
msgid "Checking %s"
msgstr "Kontrollerar %s"
# Vague original, not networking-related, but rather related to the actual
# objects in the database.
-#: builtin/fsck.c:405
+#: builtin/fsck.c:388
#, c-format
msgid "Checking connectivity (%d objects)"
msgstr "Kontrollerar konnektivitet (%d objekt)"
-#: builtin/fsck.c:424
+#: builtin/fsck.c:407
#, c-format
msgid "Checking %s %s"
msgstr "Kontrollerar %s %s"
-#: builtin/fsck.c:429
+#: builtin/fsck.c:412
msgid "broken links"
msgstr "trasiga länkar"
-#: builtin/fsck.c:438
+#: builtin/fsck.c:421
#, c-format
msgid "root %s"
msgstr "roten %s"
-#: builtin/fsck.c:446
+#: builtin/fsck.c:429
#, c-format
msgid "tagged %s %s (%s) in %s"
msgstr "taggad %s %s (%s) i %s"
-#: builtin/fsck.c:475
+#: builtin/fsck.c:458
#, c-format
msgid "%s: object corrupt or missing"
msgstr "%s: objekt trasigt eller saknas"
-#: builtin/fsck.c:500
+#: builtin/fsck.c:483
#, c-format
msgid "%s: invalid reflog entry %s"
msgstr "%s: ogiltig reflog-post %s"
-#: builtin/fsck.c:514
+#: builtin/fsck.c:497
#, c-format
msgid "Checking reflog %s->%s"
msgstr "Kontrollerar reflog %s->%s"
-#: builtin/fsck.c:548
+#: builtin/fsck.c:531
#, c-format
msgid "%s: invalid sha1 pointer %s"
msgstr "%s: ogiltig sha1-pekare %s"
-#: builtin/fsck.c:555
+#: builtin/fsck.c:538
#, c-format
msgid "%s: not a commit"
msgstr "%s: inte en incheckning!"
-#: builtin/fsck.c:609
+#: builtin/fsck.c:592
msgid "notice: No default references"
msgstr "obs: Inga förvalda referenser"
-#: builtin/fsck.c:624
+#: builtin/fsck.c:607
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s: objektet trasigt eller saknas: %s"
-#: builtin/fsck.c:637
+#: builtin/fsck.c:620
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s: objektet kunde inte tolkas: %s"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:640
#, c-format
msgid "bad sha1 file: %s"
msgstr "ogiltig sha1-fil: %s"
-#: builtin/fsck.c:672
+#: builtin/fsck.c:655
msgid "Checking object directory"
msgstr "Kontrollerar objektkatalog"
-#: builtin/fsck.c:675
+#: builtin/fsck.c:658
msgid "Checking object directories"
msgstr "Kontrollerar objektkataloger"
-#: builtin/fsck.c:690
+#: builtin/fsck.c:673
#, c-format
msgid "Checking %s link"
msgstr "Kontrollerar %s-länk"
-#: builtin/fsck.c:695 builtin/index-pack.c:843
+#: builtin/fsck.c:678 builtin/index-pack.c:865
#, c-format
msgid "invalid %s"
msgstr "ogiltigt %s"
-#: builtin/fsck.c:702
+#: builtin/fsck.c:685
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s pekar på något konstigt (%s)"
-#: builtin/fsck.c:708
+#: builtin/fsck.c:691
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s: frånkopplat HEAD pekar på ingenting"
-#: builtin/fsck.c:712
+#: builtin/fsck.c:695
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "obs: %s pekar på en ofödd gren (%s)"
-#: builtin/fsck.c:724
+#: builtin/fsck.c:707
msgid "Checking cache tree"
msgstr "Kontrollerar cacheträd"
-#: builtin/fsck.c:729
+#: builtin/fsck.c:712
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "%s: ogiltig sha1-pekare i cacheträd"
-#: builtin/fsck.c:738
+#: builtin/fsck.c:721
msgid "non-tree in cache-tree"
msgstr "icke-träd i cacheträd"
-#: builtin/fsck.c:769
+#: builtin/fsck.c:752
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<flaggor>] [<objekt>...]"
-#: builtin/fsck.c:775
+#: builtin/fsck.c:758
msgid "show unreachable objects"
msgstr "visa onåbara objekt"
-#: builtin/fsck.c:776
+#: builtin/fsck.c:759
msgid "show dangling objects"
msgstr "visa dinglande objekt"
-#: builtin/fsck.c:777
+#: builtin/fsck.c:760
msgid "report tags"
msgstr "rapportera taggar"
-#: builtin/fsck.c:778
+#: builtin/fsck.c:761
msgid "report root nodes"
msgstr "rapportera rotnoder"
-#: builtin/fsck.c:779
+#: builtin/fsck.c:762
msgid "make index objects head nodes"
msgstr "gör indexojekt till huvudnoder"
-#: builtin/fsck.c:780
+#: builtin/fsck.c:763
msgid "make reflogs head nodes (default)"
msgstr "gör refloggar till huvudnoder (standard)"
-#: builtin/fsck.c:781
+#: builtin/fsck.c:764
msgid "also consider packs and alternate objects"
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:782
+#: builtin/fsck.c:765
msgid "check only connectivity"
msgstr "kontrollera endast konnektivitet"
-#: builtin/fsck.c:783
+#: builtin/fsck.c:766 builtin/mktag.c:78
msgid "enable more strict checking"
msgstr "aktivera striktare kontroll"
-#: builtin/fsck.c:785
+#: builtin/fsck.c:768
msgid "write dangling objects in .git/lost-found"
msgstr "skriv dinglande objekt i .git/lost-found"
-#: builtin/fsck.c:786 builtin/prune.c:132
+#: builtin/fsck.c:769 builtin/prune.c:134
msgid "show progress"
msgstr "visa förlopp"
-#: builtin/fsck.c:787
+#: builtin/fsck.c:770
msgid "show verbose names for reachable objects"
msgstr "visa ordrika namn för nåbara objekt"
-#: builtin/fsck.c:846 builtin/index-pack.c:225
+#: builtin/fsck.c:829 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "Kontrollerar objekt"
-#: builtin/fsck.c:874
+#: builtin/fsck.c:857
#, c-format
msgid "%s: object missing"
msgstr "%s: objekt saknas"
-#: builtin/fsck.c:885
+#: builtin/fsck.c:868
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "ogiltig parameter: förväntade sha1, fick \"%s\""
-#: builtin/gc.c:35
+#: builtin/gc.c:39
msgid "git gc [<options>]"
msgstr "git gc [<flaggor>]"
-#: builtin/gc.c:90
+#: builtin/gc.c:93
#, c-format
msgid "Failed to fstat %s: %s"
msgstr "Misslyckades ta status (fstat) på %s: %s"
-#: builtin/gc.c:126
+#: builtin/gc.c:129
#, c-format
msgid "failed to parse '%s' value '%s'"
msgstr "misslyckades tolka \"%s\" värde \"%s\""
-#: builtin/gc.c:475 builtin/init-db.c:55
+#: builtin/gc.c:487 builtin/init-db.c:58
#, c-format
msgid "cannot stat '%s'"
msgstr "kan inte ta status på \"%s\""
-#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
+#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:562
#, c-format
msgid "cannot read '%s'"
msgstr "kunde inte läsa \"%s\""
-#: builtin/gc.c:491
+#: builtin/gc.c:503
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -14349,52 +15331,52 @@
"\n"
"%s"
-#: builtin/gc.c:539
+#: builtin/gc.c:551
msgid "prune unreferenced objects"
msgstr "rensa ej refererade objekt"
-#: builtin/gc.c:541
+#: builtin/gc.c:553
msgid "be more thorough (increased runtime)"
msgstr "var mer grundlig (ökar körtiden)"
-#: builtin/gc.c:542
+#: builtin/gc.c:554
msgid "enable auto-gc mode"
msgstr "aktivera auto-gc-läge"
-#: builtin/gc.c:545
+#: builtin/gc.c:557
msgid "force running gc even if there may be another gc running"
msgstr "tvinga gc-körning även om en annan gc kanske körs"
-#: builtin/gc.c:548
+#: builtin/gc.c:560
msgid "repack all other packs except the largest pack"
msgstr "packa om alla paket förutom det största paketet"
-#: builtin/gc.c:565
+#: builtin/gc.c:576
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "kunde inte tolka värdet %s för gc.logexpiry"
-#: builtin/gc.c:576
+#: builtin/gc.c:587
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr "kunde inte tolka värdet %s för prune expiry"
-#: builtin/gc.c:596
+#: builtin/gc.c:607
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "Packar arkivet automatiskt i bakgrunden för optimal prestanda.\n"
-#: builtin/gc.c:598
+#: builtin/gc.c:609
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Packar arkivet automatiskt för optimal prestanda.\n"
-#: builtin/gc.c:599
+#: builtin/gc.c:610
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Se \"git help gc\" för manuell hushållning.\n"
-#: builtin/gc.c:639
+#: builtin/gc.c:650
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -14402,23 +15384,186 @@
"gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte "
"är fallet)"
-#: builtin/gc.c:694
+#: builtin/gc.c:705
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Det finns för många onåbara lösa objekt; kör \"git prune\" för att ta bort "
"dem."
+#: builtin/gc.c:715
+msgid ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
+msgstr ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<uppgift>] [--schedule]"
+
+#: builtin/gc.c:745
+msgid "--no-schedule is not allowed"
+msgstr "--no-schedule tillåts inte"
+
+#: builtin/gc.c:750
+#, c-format
+msgid "unrecognized --schedule argument '%s'"
+msgstr "okänt argument för --schedule, %s"
+
+#: builtin/gc.c:869
+msgid "failed to write commit-graph"
+msgstr "kunde inte skriva incheckningsgraf"
+
+#: builtin/gc.c:914
+msgid "failed to fill remotes"
+msgstr "kunde inte fylla fjärrar"
+
+#: builtin/gc.c:1037
+msgid "failed to start 'git pack-objects' process"
+msgstr "kunde inte starta \"git pack-objects\"-process"
+
+#: builtin/gc.c:1054
+msgid "failed to finish 'git pack-objects' process"
+msgstr "kunde inte avsluta \"git pack-objects\"-process"
+
+#: builtin/gc.c:1106
+msgid "failed to write multi-pack-index"
+msgstr "kunde inte skriva multi-pack-index"
+
+#: builtin/gc.c:1124
+msgid "'git multi-pack-index expire' failed"
+msgstr "\"git multi-pack-index expire\" misslyckades"
+
+#: builtin/gc.c:1185
+msgid "'git multi-pack-index repack' failed"
+msgstr "\"git multi-pack-index repack\" misslyckades"
+
+#: builtin/gc.c:1194
+msgid ""
+"skipping incremental-repack task because core.multiPackIndex is disabled"
+msgstr ""
+"hoppar över \"incremental-repack\"-uppgift eftersom core.multiPackIndex är "
+"inaktiverat"
+
+#: builtin/gc.c:1298
+#, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr "låsfilen \"%s\" finns, hoppar över underhåll"
+
+#: builtin/gc.c:1328
+#, c-format
+msgid "task '%s' failed"
+msgstr "uppgiften \"%s\" misslyckades"
+
+#: builtin/gc.c:1410
+#, c-format
+msgid "'%s' is not a valid task"
+msgstr "\"%s\" är inte en giltig uppgift"
+
+#: builtin/gc.c:1415
+#, c-format
+msgid "task '%s' cannot be selected multiple times"
+msgstr "uppgiften \"%s\" kan inte väljas flera gånger"
+
+#: builtin/gc.c:1430
+msgid "run tasks based on the state of the repository"
+msgstr "kör uppgifter baserad på arkivets tillstånd"
+
+#: builtin/gc.c:1431
+msgid "frequency"
+msgstr "frekvens"
+
+#: builtin/gc.c:1432
+msgid "run tasks based on frequency"
+msgstr "kör uppgifter baserat på frekvens"
+
+#: builtin/gc.c:1435
+msgid "do not report progress or other information over stderr"
+msgstr "rapportera inte framgång eller annan information över standard fel"
+
+#: builtin/gc.c:1436
+msgid "task"
+msgstr "uppgift"
+
+#: builtin/gc.c:1437
+msgid "run a specific task"
+msgstr "utför en specifik uppgift"
+
+#: builtin/gc.c:1454
+msgid "use at most one of --auto and --schedule=<frequency>"
+msgstr "använd som mest en av --auto och --schedule=<frekvens>"
+
+#: builtin/gc.c:1497
+msgid "failed to run 'git config'"
+msgstr "misslyckades köra \"git config\""
+
+#: builtin/gc.c:1562
+#, c-format
+msgid "failed to expand path '%s'"
+msgstr "misslyckades expandera sökvägen \"%s\""
+
+#: builtin/gc.c:1591
+msgid "failed to start launchctl"
+msgstr "misslyckades starta launchctl"
+
+#: builtin/gc.c:1628
+#, c-format
+msgid "failed to create directories for '%s'"
+msgstr "misslyckades skapa kataloger för \"%s\""
+
+#: builtin/gc.c:1689
+#, c-format
+msgid "failed to bootstrap service %s"
+msgstr "misslyckades starta tjänsten %s"
+
+#: builtin/gc.c:1760
+msgid "failed to create temp xml file"
+msgstr "misslyckades skapa temporär xml-fil"
+
+#: builtin/gc.c:1850
+msgid "failed to start schtasks"
+msgstr "misslyckades starta schtasks"
+
+#: builtin/gc.c:1894
+msgid "failed to run 'crontab -l'; your system might not support 'cron'"
+msgstr ""
+"kunde inte köra \"crontab -l\"; ditt system kanske inte stöder \"cron\""
+
+#: builtin/gc.c:1911
+msgid "failed to run 'crontab'; your system might not support 'cron'"
+msgstr "kunde inte köra \"crontab\"; ditt system kanske inte stöder \"cron\""
+
+#: builtin/gc.c:1915
+msgid "failed to open stdin of 'crontab'"
+msgstr "misslyckades öppna standard in för \"crontab\""
+
+#: builtin/gc.c:1956
+msgid "'crontab' died"
+msgstr "\"crontab\" dog"
+
+#: builtin/gc.c:1990
+msgid "another process is scheduling background maintenance"
+msgstr "en annan process schemalägger bakgrundsunderhåll"
+
+#: builtin/gc.c:2009
+msgid "failed to add repo to global config"
+msgstr "misslyckades lägga till arkiv till global konfiguration"
+
+#: builtin/gc.c:2019
+msgid "git maintenance <subcommand> [<options>]"
+msgstr "git maintenance <underkommando> [<flaggor>]"
+
+#: builtin/gc.c:2038
+#, 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>...]"
-#: builtin/grep.c:225
+#: builtin/grep.c:223
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: misslyckades skapa tråd. %s"
-#: builtin/grep.c:279
+#: builtin/grep.c:277
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "felaktigt antal trådar angivet (%d) för %s"
@@ -14427,258 +15572,258 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731
-#: builtin/pack-objects.c:2854
+#: builtin/grep.c:285 builtin/index-pack.c:1589 builtin/index-pack.c:1808
+#: builtin/pack-objects.c:2944
#, c-format
msgid "no threads support, ignoring %s"
msgstr "trådstöd saknas, ignorerar %s"
-#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618
+#: builtin/grep.c:473 builtin/grep.c:601 builtin/grep.c:641
#, c-format
msgid "unable to read tree (%s)"
msgstr "kunde inte läsa träd (%s)"
-#: builtin/grep.c:633
+#: builtin/grep.c:656
#, c-format
msgid "unable to grep from object of type %s"
msgstr "kunde inte \"grep\" från objekt av typen %s"
-#: builtin/grep.c:704
+#: builtin/grep.c:737
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "flaggan \"%c\" antar ett numeriskt värde"
-#: builtin/grep.c:803
+#: builtin/grep.c:836
msgid "search in index instead of in the work tree"
msgstr "sök i indexet istället för i arbetskatalogen"
-#: builtin/grep.c:805
+#: builtin/grep.c:838
msgid "find in contents not managed by git"
msgstr "sök i innehåll som inte hanteras av git"
-#: builtin/grep.c:807
+#: builtin/grep.c:840
msgid "search in both tracked and untracked files"
msgstr "sök i både spårade och ospårade filer"
-#: builtin/grep.c:809
+#: builtin/grep.c:842
msgid "ignore files specified via '.gitignore'"
msgstr "ignorera filer angivna i \".gitignore\""
-#: builtin/grep.c:811
+#: builtin/grep.c:844
msgid "recursively search in each submodule"
msgstr "sök varje undermodul rekursivt"
-#: builtin/grep.c:814
+#: builtin/grep.c:847
msgid "show non-matching lines"
msgstr "visa rader som inte träffas"
-#: builtin/grep.c:816
+#: builtin/grep.c:849
msgid "case insensitive matching"
msgstr "skiftlägesokänslig sökning"
-#: builtin/grep.c:818
+#: builtin/grep.c:851
msgid "match patterns only at word boundaries"
-msgstr "matcha endast mönster vid ordgränser"
+msgstr "träffa endast mönster vid ordgränser"
-#: builtin/grep.c:820
+#: builtin/grep.c:853
msgid "process binary files as text"
msgstr "hantera binärfiler som text"
-#: builtin/grep.c:822
+#: builtin/grep.c:855
msgid "don't match patterns in binary files"
msgstr "träffa inte mönster i binärfiler"
-#: builtin/grep.c:825
+#: builtin/grep.c:858
msgid "process binary files with textconv filters"
msgstr "hantera binärfiler med textconv-filter"
-#: builtin/grep.c:827
+#: builtin/grep.c:860
msgid "search in subdirectories (default)"
msgstr "sök i underkataloger (standard)"
-#: builtin/grep.c:829
+#: builtin/grep.c:862
msgid "descend at most <depth> levels"
msgstr "gå som mest ned <djup> nivåer"
-#: builtin/grep.c:833
+#: builtin/grep.c:866
msgid "use extended POSIX regular expressions"
msgstr "använd utökade POSIX-reguljära uttryck"
-#: builtin/grep.c:836
+#: builtin/grep.c:869
msgid "use basic POSIX regular expressions (default)"
msgstr "använd grundläggande POSIX-reguljära uttryck (standard)"
-#: builtin/grep.c:839
+#: builtin/grep.c:872
msgid "interpret patterns as fixed strings"
msgstr "tolka mönster som fixerade strängar"
-#: builtin/grep.c:842
+#: builtin/grep.c:875
msgid "use Perl-compatible regular expressions"
msgstr "använd Perlkompatibla reguljära uttryck"
-#: builtin/grep.c:845
+#: builtin/grep.c:878
msgid "show line numbers"
msgstr "visa radnummer"
-#: builtin/grep.c:846
+#: builtin/grep.c:879
msgid "show column number of first match"
msgstr "visa kolumnnummer för första träff"
-#: builtin/grep.c:847
+#: builtin/grep.c:880
msgid "don't show filenames"
msgstr "visa inte filnamn"
-#: builtin/grep.c:848
+#: builtin/grep.c:881
msgid "show filenames"
msgstr "visa filnamn"
-#: builtin/grep.c:850
+#: builtin/grep.c:883
msgid "show filenames relative to top directory"
msgstr "visa filnamn relativa till toppkatalogen"
-#: builtin/grep.c:852
+#: builtin/grep.c:885
msgid "show only filenames instead of matching lines"
msgstr "visa endast filnamn istället för träffade rader"
-#: builtin/grep.c:854
+#: builtin/grep.c:887
msgid "synonym for --files-with-matches"
msgstr "synonym för --files-with-matches"
-#: builtin/grep.c:857
+#: builtin/grep.c:890
msgid "show only the names of files without match"
msgstr "visa endast namn på filer utan träffar"
-#: builtin/grep.c:859
+#: builtin/grep.c:892
msgid "print NUL after filenames"
msgstr "skriv NUL efter filnamn"
-#: builtin/grep.c:862
+#: builtin/grep.c:895
msgid "show only matching parts of a line"
msgstr "visa endast träffade delar av rader"
-#: builtin/grep.c:864
+#: builtin/grep.c:897
msgid "show the number of matches instead of matching lines"
msgstr "visa antal träffar istället för träffade rader"
-#: builtin/grep.c:865
+#: builtin/grep.c:898
msgid "highlight matches"
msgstr "ljusmarkera träffar"
-#: builtin/grep.c:867
+#: builtin/grep.c:900
msgid "print empty line between matches from different files"
msgstr "skriv tomma rader mellan träffar från olika filer"
-#: builtin/grep.c:869
+#: builtin/grep.c:902
msgid "show filename only once above matches from same file"
msgstr "visa filnamn endast en gång ovanför träffar från samma fil"
-#: builtin/grep.c:872
+#: builtin/grep.c:905
msgid "show <n> context lines before and after matches"
msgstr "visa <n> rader sammanhang före och efter träffar"
-#: builtin/grep.c:875
+#: builtin/grep.c:908
msgid "show <n> context lines before matches"
msgstr "visa <n> rader sammanhang före träffar"
-#: builtin/grep.c:877
+#: builtin/grep.c:910
msgid "show <n> context lines after matches"
msgstr "visa <n> rader sammanhang efter träffar"
-#: builtin/grep.c:879
+#: builtin/grep.c:912
msgid "use <n> worker threads"
msgstr "använd <n> jobbtrådar"
-#: builtin/grep.c:880
+#: builtin/grep.c:913
msgid "shortcut for -C NUM"
msgstr "genväg för -C NUM"
-#: builtin/grep.c:883
+#: builtin/grep.c:916
msgid "show a line with the function name before matches"
msgstr "visa en rad med funktionsnamnet före träffen"
-#: builtin/grep.c:885
+#: builtin/grep.c:918
msgid "show the surrounding function"
msgstr "visa den omkringliggande funktionen"
-#: builtin/grep.c:888
+#: builtin/grep.c:921
msgid "read patterns from file"
msgstr "läs mönster från fil"
-#: builtin/grep.c:890
+#: builtin/grep.c:923
msgid "match <pattern>"
msgstr "träffa <mönster>"
-#: builtin/grep.c:892
+#: builtin/grep.c:925
msgid "combine patterns specified with -e"
msgstr "kombinera mönster som anges med -e"
-#: builtin/grep.c:904
+#: builtin/grep.c:937
msgid "indicate hit with exit status without output"
msgstr "ange träff med slutstatuskod utan utdata"
-#: builtin/grep.c:906
+#: builtin/grep.c:939
msgid "show only matches from files that match all patterns"
msgstr "visa endast träffar från filer som träffar alla mönster"
-#: builtin/grep.c:908
-msgid "show parse tree for grep expression"
-msgstr "visa analysträd för grep-uttryck"
-
-#: builtin/grep.c:912
+#: builtin/grep.c:942
msgid "pager"
msgstr "bläddrare"
-#: builtin/grep.c:912
+#: builtin/grep.c:942
msgid "show matching files in the pager"
msgstr "visa träffade filer i filbläddraren"
-#: builtin/grep.c:916
+#: builtin/grep.c:946
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)"
-#: builtin/grep.c:983
+#: builtin/grep.c:1012
msgid "no pattern given"
msgstr "inget mönster angavs"
-#: builtin/grep.c:1019
+#: builtin/grep.c:1048
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index och --untracked kan inte användas med revisioner"
-#: builtin/grep.c:1027
+#: builtin/grep.c:1056
#, c-format
msgid "unable to resolve revision: %s"
msgstr "kan inte slå upp revision: %s"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1086
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked stöds inte med --recurse-submodules"
-#: builtin/grep.c:1061
+#: builtin/grep.c:1090
msgid "invalid option combination, ignoring --threads"
msgstr "ogiltig kombination av flaggor, ignorerar --threads"
-#: builtin/grep.c:1064 builtin/pack-objects.c:3547
+#: builtin/grep.c:1093 builtin/pack-objects.c:3672
msgid "no threads support, ignoring --threads"
msgstr "trådstöd saknas, ignorerar --threads"
-#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851
+#: builtin/grep.c:1096 builtin/index-pack.c:1586 builtin/pack-objects.c:2941
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "felaktigt antal trådar angivet (%d)"
-#: builtin/grep.c:1101
+#: builtin/grep.c:1130
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager fungerar endast i arbetskatalogen"
-#: builtin/grep.c:1127
+#: builtin/grep.c:1156
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached och --untracked kan inte användas med --no-index"
-#: builtin/grep.c:1133
+#: builtin/grep.c:1159
+msgid "--untracked cannot be used with --cached"
+msgstr "--untracked kan inte användas med --cached"
+
+#: builtin/grep.c:1165
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll"
-#: builtin/grep.c:1141
+#: builtin/grep.c:1173
msgid "both --cached and trees are given"
msgstr "både --cached och träd angavs"
@@ -14720,66 +15865,66 @@
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"
@@ -14788,7 +15933,7 @@
"\"%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"
@@ -14797,396 +15942,428 @@
"\"%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:340
#, 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:372
#, 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:606
+#: builtin/index-pack.c:324 builtin/pack-objects.c:624
msgid "pack too large for current definition of off_t"
msgstr "paket för stort för nuvarande definition av off_t"
-#: builtin/index-pack.c:291 builtin/unpack-objects.c:95
+#: builtin/index-pack.c: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
+#, 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:765
-#: builtin/index-pack.c:804 builtin/index-pack.c:813
+#: 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:158
-#: builtin/pack-objects.c:218 builtin/pack-objects.c:313
+#: 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:802
+#: 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:810
+#: 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:824
+#: builtin/index-pack.c:846
#, c-format
msgid "invalid blob object %s"
msgstr "ogiltigt blob-objekt %s"
-#: builtin/index-pack.c:827 builtin/index-pack.c:846
+#: builtin/index-pack.c:849 builtin/index-pack.c:868
msgid "fsck error in packed object"
msgstr "fsck-fel i packat objekt"
-#: builtin/index-pack.c:848
+#: 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:920 builtin/index-pack.c:951
+#: builtin/index-pack.c:931 builtin/index-pack.c:978
msgid "failed to apply delta"
msgstr "misslyckades tillämpa delta"
-#: builtin/index-pack.c:1121
+#: builtin/index-pack.c:1161
msgid "Receiving objects"
msgstr "Tar emot objekt"
-#: builtin/index-pack.c:1121
+#: builtin/index-pack.c:1161
msgid "Indexing objects"
msgstr "Skapar index för objekt"
-#: builtin/index-pack.c:1155
+#: builtin/index-pack.c:1195
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "paketet är trasigt (SHA1 stämmer inte)"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1200
msgid "cannot fstat packfile"
msgstr "kan inte utföra \"fstat\" på paketfil"
-#: builtin/index-pack.c:1163
+#: builtin/index-pack.c:1203
msgid "pack has junk at the end"
msgstr "paket har skräp i slutet"
-#: builtin/index-pack.c:1175
+#: 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:1198
+#: builtin/index-pack.c:1238
msgid "Resolving deltas"
msgstr "Analyserar delta"
-#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615
+#: builtin/index-pack.c:1249 builtin/pack-objects.c:2707
#, c-format
msgid "unable to create thread: %s"
msgstr "kunde inte skapa tråd: %s"
-#: builtin/index-pack.c:1249
+#: builtin/index-pack.c:1282
msgid "confusion beyond insanity"
msgstr "förvirrad bortom vanvett"
-#: builtin/index-pack.c:1255
+#: 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:1267
+#: 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:1271
+#: 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:1295
+#: 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:1392
+#: builtin/index-pack.c:1424
#, c-format
msgid "local object %s is corrupt"
msgstr "lokalt objekt %s är trasigt"
-#: builtin/index-pack.c:1406
+#: builtin/index-pack.c:1445
#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""
+msgid "packfile name '%s' does not end with '.%s'"
+msgstr "paketfilnamnet \"%s\" slutar inte med \".%s\""
-#: builtin/index-pack.c:1431
+#: 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:1439
+#: 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:1463
+#: builtin/index-pack.c:1503
msgid "error while closing pack file"
msgstr "fel vid stängning av paketfil"
-#: builtin/index-pack.c:1477
+#: builtin/index-pack.c:1517
msgid "cannot store pack file"
msgstr "kan inte spara paketfil"
-#: builtin/index-pack.c:1485
+#: builtin/index-pack.c:1525
msgid "cannot store index file"
msgstr "kan inte spara indexfil"
-#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862
+#: builtin/index-pack.c:1534
+msgid "cannot store reverse index file"
+msgstr "kan inte spara reverse-index-fil"
+
+#: builtin/index-pack.c:1580 builtin/pack-objects.c:2952
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "felaktig pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1597
+#: builtin/index-pack.c:1650
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Kan inte öppna befintlig paketfil \"%s\""
-#: builtin/index-pack.c:1599
+#: builtin/index-pack.c:1652
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Kan inte öppna befintlig paket-idx-fil för \"%s\""
-#: builtin/index-pack.c:1647
+#: builtin/index-pack.c:1700
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "icke-delta: %d objekt"
msgstr[1] "icke-delta: %d objekt"
-#: builtin/index-pack.c:1654
+#: builtin/index-pack.c:1707
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "kedjelängd = %d: %lu objekt"
msgstr[1] "kedjelängd = %d: %lu objekt"
-#: builtin/index-pack.c:1693
+#: builtin/index-pack.c:1765
msgid "Cannot come back to cwd"
msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"
-#: builtin/index-pack.c:1742 builtin/index-pack.c:1745
-#: builtin/index-pack.c:1761 builtin/index-pack.c:1765
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1822
+#: builtin/index-pack.c:1838 builtin/index-pack.c:1842
#, c-format
msgid "bad %s"
msgstr "felaktig %s"
-#: builtin/index-pack.c:1781
+#: builtin/index-pack.c:1848 builtin/init-db.c:392 builtin/init-db.c:625
+#, c-format
+msgid "unknown hash algorithm '%s'"
+msgstr "okänd hashningsalgoritm \"%s\""
+
+#: builtin/index-pack.c:1867
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin kan inte användas med --stdin"
-#: builtin/index-pack.c:1783
+#: builtin/index-pack.c:1869
msgid "--stdin requires a git repository"
msgstr "--stdin kräver ett git-arkiv"
-#: builtin/index-pack.c:1789
+#: builtin/index-pack.c:1871
+msgid "--object-format cannot be used with --stdin"
+msgstr "--object-format kan inte användas med --stdin"
+
+#: builtin/index-pack.c:1886
msgid "--verify with no packfile name given"
msgstr "--verify angavs utan paketfilnamn"
-#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582
+#: builtin/index-pack.c:1956 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:275
+#, c-format
+msgid "invalid initial branch name: '%s'"
+msgstr "ogiltigt namn på första gren: \"%s\""
+
+#: builtin/init-db.c:367
#, c-format
msgid "unable to handle file type %d"
msgstr "kan inte hantera filtyp %d"
-#: builtin/init-db.c:337
+#: builtin/init-db.c:370
#, 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:386
+msgid "attempt to reinitialize repository with different hash"
+msgstr "försöker initiera arkivet på nytt med annan hash"
+
+#: builtin/init-db.c:410 builtin/init-db.c:413
#, c-format
msgid "%s already exists"
msgstr "%s finns redan"
-#: builtin/init-db.c:413
+#: builtin/init-db.c:445
+#, c-format
+msgid "re-init: ignored --initial-branch=%s"
+msgstr "re-init: ignorerade --initial-branch=%s"
+
+#: builtin/init-db.c:476
#, 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:477
#, 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:481
#, 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:482
#, 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:531
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -15194,25 +16371,41 @@
"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--"
"shared[=<behörigheter>]] [<katalog>]"
-#: builtin/init-db.c:491
+#: builtin/init-db.c:557
msgid "permissions"
msgstr "behörigheter"
-#: builtin/init-db.c:492
+#: builtin/init-db.c:558
msgid "specify that the git repository is to be shared amongst several users"
msgstr "ange att git-arkivet ska delas bland flera användare"
-#: builtin/init-db.c:529 builtin/init-db.c:534
+#: builtin/init-db.c:564
+msgid "override the name of the initial branch"
+msgstr "överstyr namnet på första gren"
+
+#: builtin/init-db.c:565 builtin/verify-pack.c:74
+msgid "hash"
+msgstr "hash"
+
+#: builtin/init-db.c:566 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:573
+msgid "--separate-git-dir and --bare are mutually exclusive"
+msgstr "--separate-git-dir och --bare är ömsesidigt uteslutande"
+
+#: builtin/init-db.c:602 builtin/init-db.c:607
#, c-format
msgid "cannot mkdir %s"
msgstr "kan inte skapa katalogen (mkdir) %s"
-#: builtin/init-db.c:538
+#: builtin/init-db.c:611 builtin/init-db.c:666
#, c-format
msgid "cannot chdir to %s"
msgstr "kan inte byta katalog (chdir) till %s"
-#: builtin/init-db.c:559
+#: builtin/init-db.c:638
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -15221,11 +16414,15 @@
"%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:690
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Kan inte komma åt arbetskatalogen \"%s\""
+#: builtin/init-db.c:695
+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 "
@@ -15290,126 +16487,130 @@
msgid "no input file given for in-place editing"
msgstr "ingen indatafil angiven för redigering på plats"
-#: builtin/log.c:56
+#: builtin/log.c:59
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]"
-#: builtin/log.c:57
+#: builtin/log.c:60
msgid "git show [<options>] <object>..."
msgstr "git show [<flaggor>] <objekt>..."
-#: builtin/log.c:110
+#: builtin/log.c:113
#, c-format
msgid "invalid --decorate option: %s"
msgstr "ogiltig flagga för --decorate: %s"
-#: builtin/log.c:174
+#: builtin/log.c:180
msgid "show source"
msgstr "visa källkod"
-#: builtin/log.c:175
-msgid "Use mail map file"
-msgstr "Använd e-postmappningsfil"
+#: builtin/log.c:181
+msgid "use mail map file"
+msgstr "använd e-postmappningsfil"
-#: builtin/log.c:177
+#: builtin/log.c:184
msgid "only decorate refs that match <pattern>"
msgstr "dekorera endast referenser som motsvarar <mönster>"
-#: builtin/log.c:179
+#: builtin/log.c:186
msgid "do not decorate refs that match <pattern>"
msgstr "dekorera inte referenser som motsvarar <mönster>"
-#: builtin/log.c:180
+#: builtin/log.c:187
msgid "decorate options"
msgstr "dekoreringsflaggor"
-#: builtin/log.c:183
-msgid "Process line range n,m in file, counting from 1"
-msgstr "Behandla radintervallet n,m i filen, med början på 1"
+#: builtin/log.c:190
+msgid ""
+"trace the evolution of line range <start>,<end> or function :<funcname> in "
+"<file>"
+msgstr ""
+"spåra utvecklingen av radintervallet <start>,<slut> eller funktionen :"
+"<funknamn> i <fil>"
-#: builtin/log.c:281
+#: builtin/log.c:213
+msgid "-L<range>:<file> cannot be used with pathspec"
+msgstr "-L<intervall>:<fil> kan inte användas med sökvägsspecifikation"
+
+#: builtin/log.c:303
#, c-format
msgid "Final output: %d %s\n"
msgstr "Slututdata: %d %s\n"
-#: builtin/log.c:535
+#: builtin/log.c:566
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: felaktig fil"
-#: builtin/log.c:550 builtin/log.c:645
+#: builtin/log.c:581 builtin/log.c:671
#, c-format
msgid "could not read object %s"
msgstr "kunde inte läsa objektet %s"
-#: builtin/log.c:670
+#: builtin/log.c:696
#, c-format
msgid "unknown type: %d"
msgstr "okänd typ: %d"
-#: builtin/log.c:814
+#: builtin/log.c:841
#, c-format
msgid "%s: invalid cover from description mode"
msgstr "%s: ogiltigt omslag från beskrivningsläge"
-#: builtin/log.c:821
+#: builtin/log.c:848
msgid "format.headers without value"
msgstr "format.headers utan värde"
-#: builtin/log.c:936
-msgid "name of output directory is too long"
-msgstr "namnet på utdatakatalogen är för långt"
-
-#: builtin/log.c:952
+#: builtin/log.c:977
#, c-format
msgid "cannot open patch file %s"
msgstr "kan inte öppna patchfilen %s"
-#: builtin/log.c:969
+#: builtin/log.c:994
msgid "need exactly one range"
msgstr "behöver precis ett intervall"
-#: builtin/log.c:979
+#: builtin/log.c:1004
msgid "not a range"
msgstr "inte ett intervall"
-#: builtin/log.c:1143
+#: builtin/log.c:1168
msgid "cover letter needs email format"
msgstr "omslagsbrevet behöver e-postformat"
-#: builtin/log.c:1149
+#: builtin/log.c:1174
msgid "failed to create cover-letter file"
msgstr "misslyckades skapa fil för omslagsbrev"
-#: builtin/log.c:1228
+#: builtin/log.c:1261
#, c-format
msgid "insane in-reply-to: %s"
msgstr "tokigt in-reply-to: %s"
-#: builtin/log.c:1255
+#: builtin/log.c:1288
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]"
-#: builtin/log.c:1313
+#: builtin/log.c:1346
msgid "two output directories?"
msgstr "två utdatakataloger?"
-#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211
+#: builtin/log.c:1497 builtin/log.c:2317 builtin/log.c:2319 builtin/log.c:2331
#, c-format
msgid "unknown commit %s"
msgstr "okänd incheckning %s"
-#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1508 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "misslyckades slå upp \"%s\" som en giltig referens"
-#: builtin/log.c:1439
+#: builtin/log.c:1517
msgid "could not find exact merge base"
msgstr "kunde inte hitta exakt sammanslagningsbas"
-#: builtin/log.c:1443
+#: builtin/log.c:1527
msgid ""
"failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
@@ -15419,384 +16620,397 @@
"använd git branch --set-upstream-to för att spåra en fjärrgren.\n"
"Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> manuellt"
-#: builtin/log.c:1463
+#: builtin/log.c:1550
msgid "failed to find exact merge base"
msgstr "kunde inte hitta exakt sammanslagningsbas"
-#: builtin/log.c:1474
+#: builtin/log.c:1567
msgid "base commit should be the ancestor of revision list"
msgstr "basincheckningen bör vara förfader till revisionslistan"
-#: builtin/log.c:1478
+#: builtin/log.c:1577
msgid "base commit shouldn't be in revision list"
msgstr "basincheckningen bör inte vara i revisionslistan"
-#: builtin/log.c:1531
+#: builtin/log.c:1635
msgid "cannot get patch id"
msgstr "kan inte hämta patch-id"
-#: builtin/log.c:1583
-msgid "failed to infer range-diff ranges"
-msgstr "misslyckades räkna ut intervall range-diff"
+#: builtin/log.c:1692
+msgid "failed to infer range-diff origin of current series"
+msgstr "misslyckades räkna ut intervalldiff-ursprung för aktuell serie"
-#: builtin/log.c:1629
+#: builtin/log.c:1694
+#, 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:1738
msgid "use [PATCH n/m] even with a single patch"
msgstr "använd [PATCH n/m] även för en ensam patch"
-#: builtin/log.c:1632
+#: builtin/log.c:1741
msgid "use [PATCH] even with multiple patches"
msgstr "använd [PATCH] även för flera patchar"
-#: builtin/log.c:1636
+#: builtin/log.c:1745
msgid "print patches to standard out"
msgstr "skriv patcharna på standard ut"
-#: builtin/log.c:1638
+#: builtin/log.c:1747
msgid "generate a cover letter"
msgstr "generera ett följebrev"
-#: builtin/log.c:1640
+#: builtin/log.c:1749
msgid "use simple number sequence for output file names"
msgstr "använd enkel nummersekvens för utdatafilnamn"
-#: builtin/log.c:1641
+#: builtin/log.c:1750
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1642
+#: builtin/log.c:1751
msgid "use <sfx> instead of '.patch'"
msgstr "använd <sfx> istället för \".patch\""
-#: builtin/log.c:1644
+#: builtin/log.c:1753
msgid "start numbering patches at <n> instead of 1"
msgstr "börja numrera patchar på <n> istället för 1"
-#: builtin/log.c:1646
+#: builtin/log.c:1755
msgid "mark the series as Nth re-roll"
msgstr "markera serien som N:te försök"
-#: builtin/log.c:1648
-msgid "Use [RFC PATCH] instead of [PATCH]"
-msgstr "Använd [RFC PATCH] istället för [PATCH]"
+#: builtin/log.c:1757
+msgid "max length of output filename"
+msgstr "maximal längd för utdatafilnamn"
-#: builtin/log.c:1651
+#: builtin/log.c:1759
+msgid "use [RFC PATCH] instead of [PATCH]"
+msgstr "använd [RFC PATCH] istället för [PATCH]"
+
+#: builtin/log.c:1762
msgid "cover-from-description-mode"
msgstr "cover-from-description-läge"
-#: builtin/log.c:1652
+#: builtin/log.c:1763
msgid "generate parts of a cover letter based on a branch's description"
msgstr "skapa delar av omslagsbrevet baserat på grenbeskrivelsen"
-#: builtin/log.c:1654
-msgid "Use [<prefix>] instead of [PATCH]"
-msgstr "Använd [<prefix>] istället för [PATCH]"
+#: builtin/log.c:1765
+msgid "use [<prefix>] instead of [PATCH]"
+msgstr "använd [<prefix>] istället för [PATCH]"
-#: builtin/log.c:1657
+#: builtin/log.c:1768
msgid "store resulting files in <dir>"
msgstr "spara filerna i <katalog>"
-#: builtin/log.c:1660
+#: builtin/log.c:1771
msgid "don't strip/add [PATCH]"
msgstr "ta inte bort eller lägg till [PATCH]"
-#: builtin/log.c:1663
+#: builtin/log.c:1774
msgid "don't output binary diffs"
msgstr "skriv inte binära diffar"
-#: builtin/log.c:1665
+#: builtin/log.c:1776
msgid "output all-zero hash in From header"
msgstr "använd hashvärde med nollor i From-huvud"
-#: builtin/log.c:1667
+#: builtin/log.c:1778
msgid "don't include a patch matching a commit upstream"
msgstr "ta inte med patchar som motsvarar en uppströmsincheckning"
-#: builtin/log.c:1669
+#: builtin/log.c:1780
msgid "show patch format instead of default (patch + stat)"
msgstr "visa patchformat istället för standard (patch + stat)"
-#: builtin/log.c:1671
+#: builtin/log.c:1782
msgid "Messaging"
msgstr "E-post"
-#: builtin/log.c:1672
+#: builtin/log.c:1783
msgid "header"
msgstr "huvud"
-#: builtin/log.c:1673
+#: builtin/log.c:1784
msgid "add email header"
msgstr "lägg till e-posthuvud"
-#: builtin/log.c:1674 builtin/log.c:1676
+#: builtin/log.c:1785 builtin/log.c:1786
msgid "email"
msgstr "epost"
-#: builtin/log.c:1674
+#: builtin/log.c:1785
msgid "add To: header"
msgstr "lägg till mottagarhuvud (\"To:\")"
-#: builtin/log.c:1676
+#: builtin/log.c:1786
msgid "add Cc: header"
msgstr "lägg till kopiehuvud (\"Cc:\")"
-#: builtin/log.c:1678
+#: builtin/log.c:1787
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1679
+#: builtin/log.c:1788
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "sätt Från-adress till <ident> (eller incheckare om ident saknas)"
-#: builtin/log.c:1681
+#: builtin/log.c:1790
msgid "message-id"
msgstr "meddelande-id"
-#: builtin/log.c:1682
+#: builtin/log.c:1791
msgid "make first mail a reply to <message-id>"
msgstr "gör det första brevet ett svar till <meddelande-id>"
-#: builtin/log.c:1683 builtin/log.c:1686
+#: builtin/log.c:1792 builtin/log.c:1795
msgid "boundary"
msgstr "gräns"
-#: builtin/log.c:1684
+#: builtin/log.c:1793
msgid "attach the patch"
msgstr "bifoga patchen"
-#: builtin/log.c:1687
+#: builtin/log.c:1796
msgid "inline the patch"
msgstr "gör patchen ett inline-objekt"
-#: builtin/log.c:1691
+#: builtin/log.c:1800
msgid "enable message threading, styles: shallow, deep"
msgstr "aktivera brevtrådning, typer: shallow, deep"
-#: builtin/log.c:1693
+#: builtin/log.c:1802
msgid "signature"
msgstr "signatur"
-#: builtin/log.c:1694
+#: builtin/log.c:1803
msgid "add a signature"
msgstr "lägg till signatur"
-#: builtin/log.c:1695
+#: builtin/log.c:1804
msgid "base-commit"
msgstr "basincheckning"
-#: builtin/log.c:1696
+#: builtin/log.c:1805
msgid "add prerequisite tree info to the patch series"
msgstr "lägg till förhandskrävd trädinfo i patchserien"
-#: builtin/log.c:1698
+#: builtin/log.c:1808
msgid "add a signature from a file"
msgstr "lägg till signatur från fil"
-#: builtin/log.c:1699
+#: builtin/log.c:1809
msgid "don't print the patch filenames"
msgstr "visa inte filnamn för patchar"
-#: builtin/log.c:1701
+#: builtin/log.c:1811
msgid "show progress while generating patches"
msgstr "visa förloppsindikator medan patchar skapas"
-#: builtin/log.c:1703
+#: builtin/log.c:1813
msgid "show changes against <rev> in cover letter or single patch"
msgstr "visa ändringar mot <rev> i omslagsbrev eller ensam patch"
-#: builtin/log.c:1706
+#: builtin/log.c:1816
msgid "show changes against <refspec> in cover letter or single patch"
msgstr "visa ändringar mot <refspec> i omslagsbrev eller ensam patch"
-#: builtin/log.c:1708
+#: builtin/log.c:1818
msgid "percentage by which creation is weighted"
msgstr "procent som skapelse vägs med"
-#: builtin/log.c:1792
+#: builtin/log.c:1904
#, c-format
msgid "invalid ident line: %s"
msgstr "ogiltig ident-rad: %s"
-#: builtin/log.c:1807
+#: builtin/log.c:1919
msgid "-n and -k are mutually exclusive"
msgstr "-n och -k kan inte användas samtidigt"
-#: builtin/log.c:1809
+#: builtin/log.c:1921
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt"
-#: builtin/log.c:1817
+#: builtin/log.c:1929
msgid "--name-only does not make sense"
msgstr "kan inte använda --name-only"
-#: builtin/log.c:1819
+#: builtin/log.c:1931
msgid "--name-status does not make sense"
msgstr "kan inte använda --name-status"
-#: builtin/log.c:1821
+#: builtin/log.c:1933
msgid "--check does not make sense"
msgstr "kan inte använda --check"
-#: builtin/log.c:1854
-msgid "standard output, or directory, which one?"
-msgstr "standard ut, eller katalog, vilken ska det vara?"
+#: builtin/log.c:1955
+msgid "--stdout, --output, and --output-directory are mutually exclusive"
+msgstr "--stdout, --output, och --output-directory är ömsesidigt uteslutande"
-#: builtin/log.c:1958
+#: builtin/log.c:2078
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff kräver --cover-letter eller ensam patch"
-#: builtin/log.c:1962
+#: builtin/log.c:2082
msgid "Interdiff:"
msgstr "Interdiff:"
-#: builtin/log.c:1963
+#: builtin/log.c:2083
#, c-format
msgid "Interdiff against v%d:"
msgstr "Interdiff mot v%d:"
-#: builtin/log.c:1969
+#: builtin/log.c:2089
msgid "--creation-factor requires --range-diff"
msgstr "--creation-factor kräver --range-diff"
-#: builtin/log.c:1973
+#: builtin/log.c:2093
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff kräver --cover-letter eller ensam patch"
-#: builtin/log.c:1981
+#: builtin/log.c:2101
msgid "Range-diff:"
msgstr "Intervall-diff:"
-#: builtin/log.c:1982
+#: builtin/log.c:2102
#, c-format
msgid "Range-diff against v%d:"
msgstr "Intervall-diff mot v%d:"
-#: builtin/log.c:1993
+#: builtin/log.c:2113
#, c-format
msgid "unable to read signature file '%s'"
msgstr "kunde inte läsa signaturfil \"%s\""
-#: builtin/log.c:2029
+#: builtin/log.c:2149
msgid "Generating patches"
msgstr "Skapar patchar"
-#: builtin/log.c:2073
+#: builtin/log.c:2193
msgid "failed to create output files"
msgstr "misslyckades skapa utdatafiler"
-#: builtin/log.c:2132
+#: builtin/log.c:2252
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]"
-#: builtin/log.c:2186
+#: builtin/log.c:2306
#, 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:486
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<flaggor>] [<fil>...]"
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:542
msgid "identify the file status with tags"
msgstr "identifiera filstatus med taggar"
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:544
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:546
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:548
msgid "show cached files in the output (default)"
msgstr "visa cachade filer i utdata (standard)"
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:550
msgid "show deleted files in the output"
msgstr "visa borttagna filer i utdata"
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:552
msgid "show modified files in the output"
msgstr "visa modifierade filer i utdata"
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:554
msgid "show other files in the output"
msgstr "visa andra filer i utdata"
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:556
msgid "show ignored files in the output"
msgstr "visa ignorerade filer i utdata"
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:559
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:561
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:563
msgid "show 'other' directories' names only"
msgstr "visa endast namn för \"andra\" kataloger"
-#: builtin/ls-files.c:549
+#: builtin/ls-files.c:565
msgid "show line endings of files"
msgstr "visa radslut i filer"
-#: builtin/ls-files.c:551
+#: builtin/ls-files.c:567
msgid "don't show empty directories"
msgstr "visa inte tomma kataloger"
-#: builtin/ls-files.c:554
+#: builtin/ls-files.c:570
msgid "show unmerged files in the output"
msgstr "visa ej sammanslagna filer i utdata"
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:572
msgid "show resolve-undo information"
msgstr "visa \"resolve-undo\"-information"
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:574
msgid "skip files matching pattern"
msgstr "hoppa över filer som motsvarar mönster"
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:577
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:580
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:582
msgid "add the standard git exclusions"
msgstr "lägg till git:s standardexkluderingar"
-#: builtin/ls-files.c:570
+#: builtin/ls-files.c:586
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:589
msgid "recurse through submodules"
msgstr "rekursera ner i undermoduler"
-#: builtin/ls-files.c:575
+#: builtin/ls-files.c:591
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:592
msgid "tree-ish"
msgstr "träd-igt"
-#: builtin/ls-files.c:577
+#: builtin/ls-files.c:593
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:595
msgid "show debugging data"
msgstr "visa felsökningsutdata"
+#: builtin/ls-files.c:597
+msgid "suppress duplicate entries"
+msgstr "undertyck dublettposter"
+
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
@@ -15807,39 +17021,39 @@
" [-q | --quiet] [--exit-code] [--get-url]\n"
" [--symref] [<arkiv> [<referenser>...]]"
-#: builtin/ls-remote.c:59
+#: builtin/ls-remote.c:60
msgid "do not print remote URL"
msgstr "visa inte fjärr-URL"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1404
msgid "exec"
msgstr "exec"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
+#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
msgid "path of git-upload-pack on the remote host"
msgstr "sökväg till git-upload-pack på fjärren"
-#: builtin/ls-remote.c:65
+#: builtin/ls-remote.c:66
msgid "limit to tags"
msgstr "begränsa till taggar"
-#: builtin/ls-remote.c:66
+#: builtin/ls-remote.c:67
msgid "limit to heads"
msgstr "begränsa till huvuden"
-#: builtin/ls-remote.c:67
+#: builtin/ls-remote.c:68
msgid "do not show peeled tags"
msgstr "visa inte avskalade taggar"
-#: builtin/ls-remote.c:69
+#: builtin/ls-remote.c:70
msgid "take url.<base>.insteadOf into account"
msgstr "ta hänsyn till url.<bas>.insteadOf"
-#: builtin/ls-remote.c:72
+#: builtin/ls-remote.c:73
msgid "exit with exit code 2 if no matching refs are found"
msgstr "avsluta med felkod 2 om motsvarande referenser inte hittas"
-#: builtin/ls-remote.c:75
+#: builtin/ls-remote.c:76
msgid "show underlying ref in addition to the object pointed by it"
msgstr "visa underliggande referens och objektet det pekar på"
@@ -15884,392 +17098,6 @@
msgid "empty mbox: '%s'"
msgstr "tom mbox: \"%s\""
-#: builtin/merge.c:55
-msgid "git merge [<options>] [<commit>...]"
-msgstr "git merge [<flaggor>] [<incheckning>...]"
-
-#: builtin/merge.c:56
-msgid "git merge --abort"
-msgstr "git merge --abort"
-
-#: builtin/merge.c:57
-msgid "git merge --continue"
-msgstr "git merge --continue"
-
-#: builtin/merge.c:119
-msgid "switch `m' requires a value"
-msgstr "flaggan \"m\" behöver ett värde"
-
-#: builtin/merge.c:142
-#, c-format
-msgid "option `%s' requires a value"
-msgstr "flaggan \"%s\" behöver ett värde"
-
-#: builtin/merge.c:188
-#, c-format
-msgid "Could not find merge strategy '%s'.\n"
-msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n"
-
-#: builtin/merge.c:189
-#, c-format
-msgid "Available strategies are:"
-msgstr "Tillgängliga strategier är:"
-
-#: builtin/merge.c:194
-#, c-format
-msgid "Available custom strategies are:"
-msgstr "Tillgängliga skräddarsydda strategier är:"
-
-#: builtin/merge.c:245 builtin/pull.c:132
-msgid "do not show a diffstat at the end of the merge"
-msgstr "visa inte en diffstat när sammanslagningen är färdig"
-
-#: builtin/merge.c:248 builtin/pull.c:135
-msgid "show a diffstat at the end of the merge"
-msgstr "visa en diffstat när sammanslagningen är färdig"
-
-#: builtin/merge.c:249 builtin/pull.c:138
-msgid "(synonym to --stat)"
-msgstr "(synonym till --stat)"
-
-#: builtin/merge.c:251 builtin/pull.c:141
-msgid "add (at most <n>) entries from shortlog to merge commit message"
-msgstr ""
-"lägg till (som mest <n>) poster från shortlog till incheckningsmeddelandet"
-
-#: builtin/merge.c:254 builtin/pull.c:147
-msgid "create a single commit instead of doing a merge"
-msgstr "skapa en ensam incheckning istället för en sammanslagning"
-
-#: builtin/merge.c:256 builtin/pull.c:150
-msgid "perform a commit if the merge succeeds (default)"
-msgstr "utför en incheckning om sammanslagningen lyckades (standard)"
-
-#: builtin/merge.c:258 builtin/pull.c:153
-msgid "edit message before committing"
-msgstr "redigera meddelande innan incheckning"
-
-#: builtin/merge.c:260
-msgid "allow fast-forward (default)"
-msgstr "tillåt snabbspolning (standard)"
-
-#: builtin/merge.c:262 builtin/pull.c:160
-msgid "abort if fast-forward is not possible"
-msgstr "avbryt om snabbspolning inte är möjlig"
-
-#: builtin/merge.c:266 builtin/pull.c:163
-msgid "verify that the named commit has a valid GPG signature"
-msgstr "bekräfta att den namngivna incheckningen har en giltig GPG-signatur"
-
-#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167
-#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114
-msgid "strategy"
-msgstr "strategi"
-
-#: builtin/merge.c:268 builtin/pull.c:168
-msgid "merge strategy to use"
-msgstr "sammanslagningsstrategi att använda"
-
-#: builtin/merge.c:269 builtin/pull.c:171
-msgid "option=value"
-msgstr "alternativ=värde"
-
-#: builtin/merge.c:270 builtin/pull.c:172
-msgid "option for selected merge strategy"
-msgstr "alternativ för vald sammanslagningsstrategi"
-
-#: builtin/merge.c:272
-msgid "merge commit message (for a non-fast-forward merge)"
-msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning"
-
-#: builtin/merge.c:279
-msgid "abort the current in-progress merge"
-msgstr "avbryt den pågående sammanslagningen"
-
-#: builtin/merge.c:281
-msgid "--abort but leave index and working tree alone"
-msgstr "--abort men lämna index och arbetskatalog ensamma"
-
-#: builtin/merge.c:283
-msgid "continue the current in-progress merge"
-msgstr "fortsätt den pågående sammanslagningen"
-
-#: builtin/merge.c:285 builtin/pull.c:179
-msgid "allow merging unrelated histories"
-msgstr "tillåt sammanslagning av orelaterade historier"
-
-#: builtin/merge.c:291
-msgid "bypass pre-merge-commit and commit-msg hooks"
-msgstr "förbigå pre-merge-commit- och commit-msg-krokar"
-
-#: builtin/merge.c:308
-msgid "could not run stash."
-msgstr "kunde köra stash."
-
-#: builtin/merge.c:313
-msgid "stash failed"
-msgstr "stash misslyckades"
-
-#: builtin/merge.c:318
-#, c-format
-msgid "not a valid object: %s"
-msgstr "inte ett giltigt objekt: %s"
-
-#: builtin/merge.c:340 builtin/merge.c:357
-msgid "read-tree failed"
-msgstr "read-tree misslyckades"
-
-#: builtin/merge.c:387
-msgid " (nothing to squash)"
-msgstr " (inget att platta till)"
-
-#: builtin/merge.c:398
-#, c-format
-msgid "Squash commit -- not updating HEAD\n"
-msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n"
-
-#: builtin/merge.c:448
-#, c-format
-msgid "No merge message -- not updating HEAD\n"
-msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n"
-
-#: builtin/merge.c:499
-#, c-format
-msgid "'%s' does not point to a commit"
-msgstr "\"%s\" verkar inte peka på en incheckning"
-
-#: builtin/merge.c:586
-#, c-format
-msgid "Bad branch.%s.mergeoptions string: %s"
-msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"
-
-#: builtin/merge.c:708
-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
-#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "Felaktig flagga för merge-recursive: -X%s"
-
-#: builtin/merge.c:737
-#, c-format
-msgid "unable to write %s"
-msgstr "kunde inte skriva %s"
-
-#: builtin/merge.c:789
-#, c-format
-msgid "Could not read from '%s'"
-msgstr "Kunde inte läsa från \"%s\""
-
-#: builtin/merge.c:798
-#, 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
-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 ""
-"Ange ett incheckningsmeddelande för att förklara varför sammanslagningen\n"
-"är nödvändig, speciellt om den slår in en uppdaterad uppström i en\n"
-"temagren.\n"
-"\n"
-
-#: builtin/merge.c:809
-msgid "An empty message aborts the commit.\n"
-msgstr "Ett tomt meddelande avbryter incheckningen.\n"
-
-#: builtin/merge.c:812
-#, c-format
-msgid ""
-"Lines starting with '%c' will be ignored, and an empty message aborts\n"
-"the commit.\n"
-msgstr ""
-"Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n"
-"avbryter incheckningen.\n"
-
-#: builtin/merge.c:865
-msgid "Empty commit message."
-msgstr "Tomt incheckningsmeddelande."
-
-#: builtin/merge.c:880
-#, c-format
-msgid "Wonderful.\n"
-msgstr "Underbart.\n"
-
-#: builtin/merge.c:941
-#, c-format
-msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
-msgstr ""
-"Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n"
-
-#: builtin/merge.c:980
-msgid "No current branch."
-msgstr "Inte på någon gren."
-
-#: builtin/merge.c:982
-msgid "No remote for the current branch."
-msgstr "Ingen fjärr för aktuell gren."
-
-#: builtin/merge.c:984
-msgid "No default upstream defined for the current branch."
-msgstr "Ingen standarduppström angiven för aktuell gren."
-
-#: builtin/merge.c:989
-#, c-format
-msgid "No remote-tracking branch for %s from %s"
-msgstr "Ingen fjärrspårande gren för %s från %s"
-
-#: builtin/merge.c:1046
-#, c-format
-msgid "Bad value '%s' in environment '%s'"
-msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\""
-
-#: builtin/merge.c:1149
-#, c-format
-msgid "not something we can merge in %s: %s"
-msgstr "inte något vi kan slå ihop med %s: %s"
-
-#: builtin/merge.c:1183
-msgid "not something we can merge"
-msgstr "inte något vi kan slå ihop"
-
-#: builtin/merge.c:1286
-msgid "--abort expects no arguments"
-msgstr "--abort tar inga argument"
-
-#: builtin/merge.c:1290
-msgid "There is no merge to abort (MERGE_HEAD missing)."
-msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)."
-
-#: builtin/merge.c:1299
-msgid "--quit expects no arguments"
-msgstr "--quit tar inga argument"
-
-#: builtin/merge.c:1312
-msgid "--continue expects no arguments"
-msgstr "--continue tar inga argument"
-
-#: builtin/merge.c:1316
-msgid "There is no merge in progress (MERGE_HEAD missing)."
-msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)."
-
-#: builtin/merge.c:1332
-msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you merge."
-msgstr ""
-"Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"
-"Checka in dina ändringar innan du slår ihop."
-
-#: builtin/merge.c:1339
-msgid ""
-"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
-"Please, commit your changes before you merge."
-msgstr ""
-"Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n"
-"Checka in dina ändringar innan du slår ihop."
-
-#: builtin/merge.c:1342
-msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
-msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)."
-
-#: builtin/merge.c:1356
-msgid "You cannot combine --squash with --no-ff."
-msgstr "Du kan inte kombinera --squash med --no-ff."
-
-#: builtin/merge.c:1358
-msgid "You cannot combine --squash with --commit."
-msgstr "Du kan inte kombinera --squash med --commit."
-
-#: builtin/merge.c:1374
-msgid "No commit specified and merge.defaultToUpstream not set."
-msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."
-
-#: builtin/merge.c:1391
-msgid "Squash commit into empty head not supported yet"
-msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"
-
-#: builtin/merge.c:1393
-msgid "Non-fast-forward commit does not make sense into an empty head"
-msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud"
-
-#: builtin/merge.c:1398
-#, c-format
-msgid "%s - not something we can merge"
-msgstr "%s - inte något vi kan slå ihop"
-
-#: builtin/merge.c:1400
-msgid "Can merge only exactly one commit into empty head"
-msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud"
-
-#: builtin/merge.c:1481
-msgid "refusing to merge unrelated histories"
-msgstr "vägrar slå samman orelaterad historik"
-
-#: builtin/merge.c:1490
-msgid "Already up to date."
-msgstr "Redan à jour."
-
-#: builtin/merge.c:1500
-#, c-format
-msgid "Updating %s..%s\n"
-msgstr "Uppdaterar %s..%s\n"
-
-#: builtin/merge.c:1542
-#, c-format
-msgid "Trying really trivial in-index merge...\n"
-msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"
-
-#: builtin/merge.c:1549
-#, c-format
-msgid "Nope.\n"
-msgstr "Nej.\n"
-
-#: builtin/merge.c:1574
-msgid "Already up to date. Yeeah!"
-msgstr "Redan à jour. Toppen!"
-
-#: builtin/merge.c:1580
-msgid "Not possible to fast-forward, aborting."
-msgstr "Kan inte snabbspola, avbryter."
-
-#: builtin/merge.c:1603 builtin/merge.c:1668
-#, c-format
-msgid "Rewinding the tree to pristine...\n"
-msgstr "Återspolar trädet till orört...\n"
-
-#: builtin/merge.c:1607
-#, c-format
-msgid "Trying merge strategy %s...\n"
-msgstr "Försöker sammanslagningsstrategin %s...\n"
-
-#: builtin/merge.c:1659
-#, c-format
-msgid "No merge strategy handled the merge.\n"
-msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"
-
-#: builtin/merge.c:1661
-#, c-format
-msgid "Merge with strategy %s failed.\n"
-msgstr "Sammanslagning med strategin %s misslyckades.\n"
-
-#: builtin/merge.c:1670
-#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
-msgstr "Använder %s för att förbereda lösning för hand.\n"
-
-#: builtin/merge.c:1682
-#, 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>..."
@@ -16290,23 +17118,23 @@
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <ref> [<incheckning>]"
-#: builtin/merge-base.c:153
+#: builtin/merge-base.c:143
msgid "output all common ancestors"
msgstr "skriv ut alla gemensamma anfäder"
-#: builtin/merge-base.c:155
+#: 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:157
+#: 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:159
+#: 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:161
+#: 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>"
@@ -16381,6 +17209,433 @@
msgid "Merging %s with %s\n"
msgstr "Slår ihop %s med %s\n"
+#: builtin/merge.c:58
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<flaggor>] [<incheckning>...]"
+
+#: builtin/merge.c:59
+msgid "git merge --abort"
+msgstr "git merge --abort"
+
+#: builtin/merge.c:60
+msgid "git merge --continue"
+msgstr "git merge --continue"
+
+#: builtin/merge.c:123
+msgid "switch `m' requires a value"
+msgstr "flaggan \"m\" behöver ett värde"
+
+#: builtin/merge.c:146
+#, c-format
+msgid "option `%s' requires a value"
+msgstr "flaggan \"%s\" behöver ett värde"
+
+#: builtin/merge.c:199
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n"
+
+#: builtin/merge.c:200
+#, c-format
+msgid "Available strategies are:"
+msgstr "Tillgängliga strategier är:"
+
+#: builtin/merge.c:205
+#, c-format
+msgid "Available custom strategies are:"
+msgstr "Tillgängliga skräddarsydda strategier är:"
+
+#: builtin/merge.c:256 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:259 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:260 builtin/pull.c:139
+msgid "(synonym to --stat)"
+msgstr "(synonym till --stat)"
+
+#: builtin/merge.c:262 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:265 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:267 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:269 builtin/pull.c:154
+msgid "edit message before committing"
+msgstr "redigera meddelande innan incheckning"
+
+#: builtin/merge.c:271
+msgid "allow fast-forward (default)"
+msgstr "tillåt snabbspolning (standard)"
+
+#: builtin/merge.c:273 builtin/pull.c:161
+msgid "abort if fast-forward is not possible"
+msgstr "avbryt om snabbspolning inte är möjlig"
+
+#: builtin/merge.c:277 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:278 builtin/notes.c:787 builtin/pull.c:168
+#: builtin/rebase.c:541 builtin/rebase.c:1418 builtin/revert.c:114
+msgid "strategy"
+msgstr "strategi"
+
+#: builtin/merge.c:279 builtin/pull.c:169
+msgid "merge strategy to use"
+msgstr "sammanslagningsstrategi att använda"
+
+#: builtin/merge.c:280 builtin/pull.c:172
+msgid "option=value"
+msgstr "alternativ=värde"
+
+#: builtin/merge.c:281 builtin/pull.c:173
+msgid "option for selected merge strategy"
+msgstr "alternativ för vald sammanslagningsstrategi"
+
+#: builtin/merge.c:283
+msgid "merge commit message (for a non-fast-forward merge)"
+msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning"
+
+#: builtin/merge.c:290
+msgid "abort the current in-progress merge"
+msgstr "avbryt den pågående sammanslagningen"
+
+#: builtin/merge.c:292
+msgid "--abort but leave index and working tree alone"
+msgstr "--abort men lämna index och arbetskatalog ensamma"
+
+#: builtin/merge.c:294
+msgid "continue the current in-progress merge"
+msgstr "fortsätt den pågående sammanslagningen"
+
+#: builtin/merge.c:296 builtin/pull.c:180
+msgid "allow merging unrelated histories"
+msgstr "tillåt sammanslagning av orelaterade historier"
+
+#: builtin/merge.c:303
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr "förbigå pre-merge-commit- och commit-msg-krokar"
+
+#: builtin/merge.c:320
+msgid "could not run stash."
+msgstr "kunde köra stash."
+
+#: builtin/merge.c:325
+msgid "stash failed"
+msgstr "stash misslyckades"
+
+#: builtin/merge.c:330
+#, c-format
+msgid "not a valid object: %s"
+msgstr "inte ett giltigt objekt: %s"
+
+#: builtin/merge.c:352 builtin/merge.c:369
+msgid "read-tree failed"
+msgstr "read-tree misslyckades"
+
+#: builtin/merge.c:399
+msgid " (nothing to squash)"
+msgstr " (inget att platta till)"
+
+#: builtin/merge.c:410
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n"
+
+#: builtin/merge.c:460
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n"
+
+#: builtin/merge.c:511
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr "\"%s\" verkar inte peka på en incheckning"
+
+#: builtin/merge.c:598
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"
+
+#: builtin/merge.c:724
+msgid "Not handling anything other than two heads merge."
+msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."
+
+#: builtin/merge.c:737
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr "Felaktig flagga för merge-recursive: -X%s"
+
+#: builtin/merge.c:756 t/helper/test-fast-rebase.c:209
+#, c-format
+msgid "unable to write %s"
+msgstr "kunde inte skriva %s"
+
+#: builtin/merge.c:808
+#, c-format
+msgid "Could not read from '%s'"
+msgstr "Kunde inte läsa från \"%s\""
+
+#: builtin/merge.c:817
+#, 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:823
+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 ""
+"Ange ett incheckningsmeddelande för att förklara varför sammanslagningen\n"
+"är nödvändig, speciellt om den slår in en uppdaterad uppström i en\n"
+"temagren.\n"
+"\n"
+
+#: builtin/merge.c:828
+msgid "An empty message aborts the commit.\n"
+msgstr "Ett tomt meddelande avbryter incheckningen.\n"
+
+#: builtin/merge.c:831
+#, c-format
+msgid ""
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
+"Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n"
+"avbryter incheckningen.\n"
+
+#: builtin/merge.c:884
+msgid "Empty commit message."
+msgstr "Tomt incheckningsmeddelande."
+
+#: builtin/merge.c:899
+#, c-format
+msgid "Wonderful.\n"
+msgstr "Underbart.\n"
+
+#: builtin/merge.c:960
+#, 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:999
+msgid "No current branch."
+msgstr "Inte på någon gren."
+
+#: builtin/merge.c:1001
+msgid "No remote for the current branch."
+msgstr "Ingen fjärr för aktuell gren."
+
+#: builtin/merge.c:1003
+msgid "No default upstream defined for the current branch."
+msgstr "Ingen standarduppström angiven för aktuell gren."
+
+#: builtin/merge.c:1008
+#, 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:1065
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\""
+
+#: builtin/merge.c:1168
+#, 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:1202
+msgid "not something we can merge"
+msgstr "inte något vi kan slå ihop"
+
+#: builtin/merge.c:1312
+msgid "--abort expects no arguments"
+msgstr "--abort tar inga argument"
+
+#: builtin/merge.c:1316
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)."
+
+#: builtin/merge.c:1334
+msgid "--quit expects no arguments"
+msgstr "--quit tar inga argument"
+
+#: builtin/merge.c:1347
+msgid "--continue expects no arguments"
+msgstr "--continue tar inga argument"
+
+#: builtin/merge.c:1351
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)."
+
+#: builtin/merge.c:1367
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+"Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"
+"Checka in dina ändringar innan du slår ihop."
+
+#: builtin/merge.c:1374
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
+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:1377
+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:1391
+msgid "You cannot combine --squash with --no-ff."
+msgstr "Du kan inte kombinera --squash med --no-ff."
+
+#: builtin/merge.c:1393
+msgid "You cannot combine --squash with --commit."
+msgstr "Du kan inte kombinera --squash med --commit."
+
+#: builtin/merge.c:1409
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."
+
+#: builtin/merge.c:1426
+msgid "Squash commit into empty head not supported yet"
+msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"
+
+#: builtin/merge.c:1428
+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:1433
+#, c-format
+msgid "%s - not something we can merge"
+msgstr "%s - inte något vi kan slå ihop"
+
+#: builtin/merge.c:1435
+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:1516
+msgid "refusing to merge unrelated histories"
+msgstr "vägrar slå samman orelaterad historik"
+
+#: builtin/merge.c:1525
+msgid "Already up to date."
+msgstr "Redan à jour."
+
+#: builtin/merge.c:1535
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr "Uppdaterar %s..%s\n"
+
+#: builtin/merge.c:1581
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"
+
+#: builtin/merge.c:1588
+#, c-format
+msgid "Nope.\n"
+msgstr "Nej.\n"
+
+#: builtin/merge.c:1613
+msgid "Already up to date. Yeeah!"
+msgstr "Redan à jour. Toppen!"
+
+#: builtin/merge.c:1619
+msgid "Not possible to fast-forward, aborting."
+msgstr "Kan inte snabbspola, avbryter."
+
+#: builtin/merge.c:1647 builtin/merge.c:1712
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr "Återspolar trädet till orört...\n"
+
+#: builtin/merge.c:1651
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr "Försöker sammanslagningsstrategin %s...\n"
+
+#: builtin/merge.c:1703
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"
+
+#: builtin/merge.c:1705
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr "Sammanslagning med strategin %s misslyckades.\n"
+
+#: builtin/merge.c:1714
+#, 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:1728
+#, 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/mktag.c:10
+msgid "git mktag"
+msgstr "git mktag"
+
+#: builtin/mktag.c:30
+#, c-format
+msgid "warning: tag input does not pass fsck: %s"
+msgstr "varning: taggindata godkänns inte av fsck: %s"
+
+#: builtin/mktag.c:41
+#, c-format
+msgid "error: tag input does not pass fsck: %s"
+msgstr "fel: taggindata godkänns inte av fsck: %s"
+
+#: builtin/mktag.c:44
+#, c-format
+msgid "%d (FSCK_IGNORE?) should never trigger this callback"
+msgstr "%d (FSCK_IGNORE?) skulle aldrig utlösa detta återanrop"
+
+#: builtin/mktag.c:59
+#, c-format
+msgid "could not read tagged object '%s'"
+msgstr "kunde inte läsa det taggade objektet \"%s\""
+
+#: builtin/mktag.c:62
+#, c-format
+msgid "object '%s' tagged as '%s', but is a '%s' type"
+msgstr "objektet \"%s\" taggat som \"%s\", men är av typen \"%s\""
+
+#: builtin/mktag.c:99
+msgid "tag on stdin did not pass our strict fsck check"
+msgstr "tagg på stdin godkänns inte av vår strikta fsck-kontroll"
+
+#: builtin/mktag.c:102
+msgid "tag on stdin did not refer to a valid object"
+msgstr "taggen på stdin pekar inte på ett giltigt objekt"
+
+#: builtin/mktag.c:105 builtin/tag.c:232
+msgid "unable to write tag file"
+msgstr "kunde inte skriva tagg-filen"
+
#: builtin/mktree.c:66
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
@@ -16417,7 +17672,10 @@
"vid ompackning, samla mindre paketfiler i en bunt som är större än denna "
"storlekt"
-#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67
+#: builtin/multi-pack-index.c:50 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 builtin/prune-packed.c:25 builtin/tag.c:575
msgid "too many arguments"
msgstr "för många argument"
@@ -16457,68 +17715,72 @@
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:781 builtin/repack.c:518
+#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:483
#, c-format
msgid "renaming '%s' failed"
msgstr "misslyckades byta namn på \"%s\""
@@ -16536,8 +17798,8 @@
msgstr "git name-rev [<flaggor>] --stdin"
#: builtin/name-rev.c:524
-msgid "print only names (no SHA-1)"
-msgstr "skriv endast namn (ingen SHA-1)"
+msgid "print only ref-based names (no object names)"
+msgstr "skriv endast referensbaserade namn (inga objektnamn)"
#: builtin/name-rev.c:525
msgid "only use tags to name the commits"
@@ -16710,7 +17972,7 @@
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:565
#, c-format
msgid "could not open or read '%s'"
msgstr "kunde inte öppna eller läsa \"%s\""
@@ -16750,12 +18012,6 @@
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "vägrar utföra \"%s\" på anteckningar i %s (utanför refs/notes/)"
-#: 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 "för många parametrar"
-
#: builtin/notes.c:389 builtin/notes.c:678
#, c-format
msgid "no note found for object %s."
@@ -16813,8 +18069,8 @@
msgstr "läs omskrivningsinställning för <kommando> (implicerar --stdin)"
#: builtin/notes.c:517
-msgid "too few parameters"
-msgstr "för få parametrar"
+msgid "too few arguments"
+msgstr "för få argument"
#: builtin/notes.c:538
#, c-format
@@ -16944,7 +18200,7 @@
"%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:578
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Kunde inte slå upp \"%s\" som en giltig referens."
@@ -16962,7 +18218,7 @@
msgid "read object names from the standard input"
msgstr "läs objektnamn från standard in"
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148
msgid "do not remove, show only"
msgstr "ta inte bort, bara visa"
@@ -16978,119 +18234,149 @@
msgid "use notes from <notes-ref>"
msgstr "använd anteckningar från <anteckningsref>"
-#: builtin/notes.c:1034 builtin/stash.c:1643
+#: builtin/notes.c:1034 builtin/stash.c:1671
#, 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:430
+#: builtin/pack-objects.c:440
+#, c-format
+msgid ""
+"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
+"pack %s"
+msgstr ""
+"write_reuse_object: kunde inte hitta %s, förväntat på position %<PRIuMAX> i "
+"paketet %s"
+
+#: builtin/pack-objects.c:448
#, c-format
msgid "bad packed object CRC for %s"
msgstr "felaktig CRC för packat objekt %s"
-#: builtin/pack-objects.c:441
+#: builtin/pack-objects.c:459
#, c-format
msgid "corrupt packed object for %s"
msgstr "trasigt packat objekt för %s"
-#: builtin/pack-objects.c:572
+#: builtin/pack-objects.c:590
#, c-format
msgid "recursive delta detected for object %s"
msgstr "rekursivt delta upptäcktes för objektet %s"
-#: builtin/pack-objects.c:783
+#: builtin/pack-objects.c:801
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "ordnade %u objekt, förväntade %<PRIu32>"
-#: builtin/pack-objects.c:972
+#: builtin/pack-objects.c:896
+#, c-format
+msgid "expected object at offset %<PRIuMAX> in pack %s"
+msgstr "förväntade objekt på position %<PRIuMAX> i paketet %s"
+
+#: builtin/pack-objects.c:1015
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"inaktiverar skrivning av bitkarta, paket delas på grund av pack.packSizeLimit"
-#: builtin/pack-objects.c:985
+#: builtin/pack-objects.c:1028
msgid "Writing objects"
msgstr "Skriver objekt"
-#: builtin/pack-objects.c:1046 builtin/update-index.c:90
+#: builtin/pack-objects.c:1089 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "misslyckades ta status på %s"
-#: builtin/pack-objects.c:1099
+#: builtin/pack-objects.c:1141
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "skrev %<PRIu32> objekt medan %<PRIu32> förväntades"
-#: builtin/pack-objects.c:1297
+#: builtin/pack-objects.c:1358
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "inaktiverar skrivning av bitkarta då några objekt inte packas"
-#: builtin/pack-objects.c:1724
+#: builtin/pack-objects.c:1806
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "deltabasoffset utanför gränsen i pack för %s"
-#: builtin/pack-objects.c:1733
+#: builtin/pack-objects.c:1815
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "deltabasoffset utanför gränsvärden för %s"
-#: builtin/pack-objects.c:2004
+#: builtin/pack-objects.c:2096
msgid "Counting objects"
msgstr "Räknar objekt"
-#: builtin/pack-objects.c:2149
+#: builtin/pack-objects.c:2241
#, c-format
msgid "unable to parse object header of %s"
msgstr "kunde inte tolka objekthuvud för %s"
-#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235
-#: builtin/pack-objects.c:2245
+#: builtin/pack-objects.c:2311 builtin/pack-objects.c:2327
+#: builtin/pack-objects.c:2337
#, c-format
msgid "object %s cannot be read"
msgstr "objektet %s kunde inte läsas"
-#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249
+#: builtin/pack-objects.c:2314 builtin/pack-objects.c:2341
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr "objektet %s har inkonsistent objektlängd (%<PRIuMAX> mot %<PRIuMAX>)"
-#: builtin/pack-objects.c:2259
+#: builtin/pack-objects.c:2351
msgid "suboptimal pack - out of memory"
msgstr "icke-optimalt pack - minnet slut"
-#: builtin/pack-objects.c:2574
+#: builtin/pack-objects.c:2666
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Deltakomprimering använder upp till %d trådar"
-#: builtin/pack-objects.c:2713
+#: builtin/pack-objects.c:2805
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "kan inte packa objekt nåbara från taggen %s"
-#: builtin/pack-objects.c:2801
+#: builtin/pack-objects.c:2891
msgid "Compressing objects"
msgstr "Komprimerar objekt"
-#: builtin/pack-objects.c:2807
+#: builtin/pack-objects.c:2897
msgid "inconsistency with delta count"
msgstr "deltaräknaren är inkonsekvent"
-#: builtin/pack-objects.c:2888
+#: builtin/pack-objects.c:2976
+#, 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:2979
+#, 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:3008
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -17099,7 +18385,7 @@
"förväntade kant-objekt-id, fick skräp:\n"
" %s"
-#: builtin/pack-objects.c:2894
+#: builtin/pack-objects.c:3014
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -17108,227 +18394,236 @@
"förväntade objekt-id, fick skräp:\n"
" %s"
-#: builtin/pack-objects.c:2992
+#: builtin/pack-objects.c:3112
msgid "invalid value for --missing"
msgstr "ogiltigt värde för --missing"
-#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159
+#: builtin/pack-objects.c:3171 builtin/pack-objects.c:3279
msgid "cannot open pack index"
msgstr "kan inte öppna paketfilen"
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3202
#, c-format
msgid "loose object at %s could not be examined"
msgstr "lösa objekt på %s kunde inte underökas"
-#: builtin/pack-objects.c:3167
+#: builtin/pack-objects.c:3287
msgid "unable to force loose object"
msgstr "kan inte tvinga lösa objekt"
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3380
#, c-format
msgid "not a rev '%s'"
msgstr "inte en referens \"%s\""
-#: builtin/pack-objects.c:3263
+#: builtin/pack-objects.c:3383
#, c-format
msgid "bad revision '%s'"
msgstr "felaktig revision \"%s\""
-#: builtin/pack-objects.c:3288
+#: builtin/pack-objects.c:3408
msgid "unable to add recent objects"
msgstr "kan inte lägga till nya objekt"
-#: builtin/pack-objects.c:3341
+#: builtin/pack-objects.c:3461
#, c-format
msgid "unsupported index version %s"
msgstr "indexversionen %s stöds ej"
-#: builtin/pack-objects.c:3345
+#: builtin/pack-objects.c:3465
#, c-format
msgid "bad index version '%s'"
msgstr "felaktig indexversion \"%s\""
-#: builtin/pack-objects.c:3383
+#: builtin/pack-objects.c:3503
msgid "<version>[,<offset>]"
msgstr "<version>[,<offset>]"
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3504
msgid "write the pack index file in the specified idx format version"
msgstr "skriv paketindexfilen i angiven indexformatversion"
-#: builtin/pack-objects.c:3387
+#: builtin/pack-objects.c:3507
msgid "maximum size of each output pack file"
msgstr "maximal storlek på varje utdatapaketfil"
-#: builtin/pack-objects.c:3389
+#: builtin/pack-objects.c:3509
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorera lånade objekt från supplerande objektlager"
-#: builtin/pack-objects.c:3391
+#: builtin/pack-objects.c:3511
msgid "ignore packed objects"
msgstr "ignorera packade objekt"
-#: builtin/pack-objects.c:3393
+#: builtin/pack-objects.c:3513
msgid "limit pack window by objects"
msgstr "begränsa paketfönster efter objekt"
-#: builtin/pack-objects.c:3395
+#: builtin/pack-objects.c:3515
msgid "limit pack window by memory in addition to object limit"
msgstr "begränsa paketfönster efter minne förutom objektgräns"
-#: builtin/pack-objects.c:3397
+#: builtin/pack-objects.c:3517
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "maximal längd på deltakedja tillåten i slutligt paket"
-#: builtin/pack-objects.c:3399
+#: builtin/pack-objects.c:3519
msgid "reuse existing deltas"
msgstr "återanvänd befintliga delta"
-#: builtin/pack-objects.c:3401
+#: builtin/pack-objects.c:3521
msgid "reuse existing objects"
msgstr "återanvänd befintliga objekt"
-#: builtin/pack-objects.c:3403
+#: builtin/pack-objects.c:3523
msgid "use OFS_DELTA objects"
msgstr "använd OFS_DELTA-objekt"
-#: builtin/pack-objects.c:3405
+#: builtin/pack-objects.c:3525
msgid "use threads when searching for best delta matches"
msgstr "använd trådar vid sökning efter bästa deltaträffar"
-#: builtin/pack-objects.c:3407
+#: builtin/pack-objects.c:3527
msgid "do not create an empty pack output"
msgstr "försök inte skapa tom paketutdata"
-#: builtin/pack-objects.c:3409
+#: builtin/pack-objects.c:3529
msgid "read revision arguments from standard input"
msgstr "läs revisionsargument från standard in"
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:3531
msgid "limit the objects to those that are not yet packed"
msgstr "begränsa objekt till dem som ännu inte packats"
-#: builtin/pack-objects.c:3414
+#: builtin/pack-objects.c:3534
msgid "include objects reachable from any reference"
msgstr "inkludera objekt som kan nås från någon referens"
-#: builtin/pack-objects.c:3417
+#: builtin/pack-objects.c:3537
msgid "include objects referred by reflog entries"
msgstr "inkludera objekt som refereras från referensloggposter"
-#: builtin/pack-objects.c:3420
+#: builtin/pack-objects.c:3540
msgid "include objects referred to by the index"
msgstr "inkludera objekt som refereras från indexet"
-#: builtin/pack-objects.c:3423
+#: builtin/pack-objects.c:3543
msgid "output pack to stdout"
msgstr "skriv paket på standard ut"
-#: builtin/pack-objects.c:3425
+#: builtin/pack-objects.c:3545
msgid "include tag objects that refer to objects to be packed"
msgstr "inkludera taggobjekt som refererar objekt som ska packas"
-#: builtin/pack-objects.c:3427
+#: builtin/pack-objects.c:3547
msgid "keep unreachable objects"
msgstr "behåll onåbara objekt"
-#: builtin/pack-objects.c:3429
+#: builtin/pack-objects.c:3549
msgid "pack loose unreachable objects"
msgstr "packa lösa onåbara objekt"
-#: builtin/pack-objects.c:3431
+#: builtin/pack-objects.c:3551
msgid "unpack unreachable objects newer than <time>"
msgstr "packa upp onåbara objekt nyare än <tid>"
-#: builtin/pack-objects.c:3434
+#: builtin/pack-objects.c:3554
msgid "use the sparse reachability algorithm"
msgstr "använd gles-nåbarhetsalgoritmen"
-#: builtin/pack-objects.c:3436
+#: builtin/pack-objects.c:3556
msgid "create thin packs"
msgstr "skapa tunna paket"
-#: builtin/pack-objects.c:3438
+#: builtin/pack-objects.c:3558
msgid "create packs suitable for shallow fetches"
msgstr "skapa packfiler lämpade för grunda hämtningar"
-#: builtin/pack-objects.c:3440
+#: builtin/pack-objects.c:3560
msgid "ignore packs that have companion .keep file"
msgstr "ignorera paket som har tillhörande .keep-fil"
-#: builtin/pack-objects.c:3442
+#: builtin/pack-objects.c:3562
msgid "ignore this pack"
msgstr "ignorera detta paket"
-#: builtin/pack-objects.c:3444
+#: builtin/pack-objects.c:3564
msgid "pack compression level"
msgstr "komprimeringsgrad för paket"
-#: builtin/pack-objects.c:3446
+#: builtin/pack-objects.c:3566
msgid "do not hide commits by grafts"
msgstr "göm inte incheckningar med ympningar (\"grafts\")"
-#: builtin/pack-objects.c:3448
+#: builtin/pack-objects.c:3568
msgid "use a bitmap index if available to speed up counting objects"
msgstr "använd bitkartindex om tillgängligt för att räkna objekt snabbare"
-#: builtin/pack-objects.c:3450
+#: builtin/pack-objects.c:3570
msgid "write a bitmap index together with the pack index"
msgstr "använd bitkartindex tillsammans med packindexet"
-#: builtin/pack-objects.c:3454
+#: builtin/pack-objects.c:3574
msgid "write a bitmap index if possible"
msgstr "skriv bitkartindex om möjligt"
-#: builtin/pack-objects.c:3458
+#: builtin/pack-objects.c:3578
msgid "handling for missing objects"
msgstr "hantering av saknade objekt"
-#: builtin/pack-objects.c:3461
+#: builtin/pack-objects.c:3581
msgid "do not pack objects in promisor packfiles"
msgstr "packa inte objekt i kontraktspackfiler"
-#: builtin/pack-objects.c:3463
+#: builtin/pack-objects.c:3583
msgid "respect islands during delta compression"
msgstr "respektera öar under deltakomprimering"
-#: builtin/pack-objects.c:3492
+#: builtin/pack-objects.c:3585
+msgid "protocol"
+msgstr "protokoll"
+
+#: builtin/pack-objects.c:3586
+msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
+msgstr ""
+"uteslut redan konfigurerade uploadpack.blobpackfileuri med detta protokoll"
+
+#: builtin/pack-objects.c:3617
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "deltakedjedjupet %d är för djupt, påtvingar %d"
-#: builtin/pack-objects.c:3497
+#: builtin/pack-objects.c:3622
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "pack.deltaCacheLimit är för högt, påtvingar %d"
-#: builtin/pack-objects.c:3551
+#: builtin/pack-objects.c:3676
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
"--max-pack-size kan inte användas för att bygga ett paket som ska överföras"
-#: builtin/pack-objects.c:3553
+#: builtin/pack-objects.c:3678
msgid "minimum pack size limit is 1 MiB"
msgstr "minsta packstorlek är 1 MiB"
-#: builtin/pack-objects.c:3558
+#: builtin/pack-objects.c:3683
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin kan inte användas för att bygga ett indexerbart paket"
-#: builtin/pack-objects.c:3561
+#: builtin/pack-objects.c:3686
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable och -unpack-unreachable kan inte användas samtidigt"
-#: builtin/pack-objects.c:3567
+#: builtin/pack-objects.c:3692
msgid "cannot use --filter without --stdout"
msgstr "kan inte använda --filter utan --stdout"
-#: builtin/pack-objects.c:3627
+#: builtin/pack-objects.c:3752
msgid "Enumerating objects"
msgstr "Räknar upp objekt"
-#: builtin/pack-objects.c:3657
+#: builtin/pack-objects.c:3783
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -17337,6 +18632,20 @@
"Totalt %<PRIu32> (delta %<PRIu32>), återanvände %<PRIu32> (delta %<PRIu32>), "
"paket-återanvända %<PRIu32>"
+#: builtin/pack-redundant.c:601
+msgid ""
+"'git pack-redundant' is nominated for removal.\n"
+"If you still use this command, please add an extra\n"
+"option, '--i-still-use-this', on the command line\n"
+"and let us know you still use it by sending an e-mail\n"
+"to <git@vger.kernel.org>. Thanks.\n"
+msgstr ""
+"\"git pack-redundant\" har nominerats för borttagning.\n"
+"Om du fortfarande använder kommandot, lägg till flaggan\n"
+"\"--i-still-use-this\" på kommandoraden och berätta för\n"
+"oss att du fortfarande använder det på e-post till\n"
+"<git@vger.kernel.org>. Tack.\n"
+
#: builtin/pack-refs.c:8
msgid "git pack-refs [<options>]"
msgstr "git pack-refs [<flaggor>]"
@@ -17349,31 +18658,27 @@
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"
@@ -17386,44 +18691,44 @@
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<flaggor>] [<arkiv> [<refspec>...]]"
-#: builtin/pull.c:122
+#: builtin/pull.c:123
msgid "control for recursive fetching of submodules"
msgstr "styrning för rekursiv hämtning av undermoduler"
-#: builtin/pull.c:126
+#: builtin/pull.c:127
msgid "Options related to merging"
msgstr "Alternativ gällande sammanslagning"
-#: builtin/pull.c:129
+#: 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:157 builtin/rebase.c:471 builtin/revert.c:126
+#: builtin/pull.c:158 builtin/rebase.c:492 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "tillåt snabbspolning"
-#: builtin/pull.c:166
-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:182
+#: builtin/pull.c:183
msgid "Options related to fetching"
msgstr "Alternativ gällande hämtningar"
-#: builtin/pull.c:192
+#: builtin/pull.c:193
msgid "force overwrite of local branch"
msgstr "tvinga överskrivning av lokal gren"
-#: builtin/pull.c:200
+#: builtin/pull.c:201
msgid "number of submodules pulled in parallel"
msgstr "antal undermoduler som hämtas parallellt"
-#: builtin/pull.c:300
+#: 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:426
+#: builtin/pull.c:445
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -17431,14 +18736,14 @@
"Det finns ingen kandidat för ombasering bland referenserna du precis har "
"hämtat."
-#: builtin/pull.c:428
+#: builtin/pull.c:447
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"Det finns ingen kandidat för sammanslagning bland referenserna du precis har "
"hämtat."
-#: builtin/pull.c:429
+#: builtin/pull.c:448
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -17446,7 +18751,7 @@
"Det betyder vanligtvis att du använt en jokertecken-refspec som inte\n"
"motsvarade något i fjärränden."
-#: builtin/pull.c:432
+#: builtin/pull.c:451
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -17457,42 +18762,41 @@
"gren. Eftersom det inte är den fjärr som är konfigurerad som\n"
"standard för aktuell gren måste du ange en gren på kommandoraden."
-#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73
+#: builtin/pull.c:456 builtin/rebase.c:1253
msgid "You are not currently on a branch."
msgstr "Du är inte på någon gren för närvarande."
-#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79
+#: builtin/pull.c:458 builtin/pull.c:473
msgid "Please specify which branch you want to rebase against."
msgstr "Ange vilken gren du vill ombasera mot."
-#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82
+#: builtin/pull.c:460 builtin/pull.c:475
msgid "Please specify which branch you want to merge with."
msgstr "Ange vilken gren du vill slå samman med."
-#: builtin/pull.c:442 builtin/pull.c:457
+#: builtin/pull.c:461 builtin/pull.c:476
msgid "See git-pull(1) for details."
msgstr "Se git-pull(1) för detaljer."
-#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459
-#: builtin/rebase.c:1415 git-parse-remote.sh:64
+#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
+#: builtin/rebase.c:1259
msgid "<remote>"
msgstr "<fjärr>"
-#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464
-#: git-parse-remote.sh:65
+#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
msgid "<branch>"
msgstr "<gren>"
-#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75
+#: builtin/pull.c:471 builtin/rebase.c:1251
msgid "There is no tracking information for the current branch."
msgstr "Det finns ingen spårningsinformation för aktuell gren."
-#: builtin/pull.c:461 git-parse-remote.sh:95
+#: builtin/pull.c:480
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr "Om du vill ange spårningsinformation för grenen kan du göra det med:"
-#: builtin/pull.c:466
+#: builtin/pull.c:485
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -17501,32 +18805,57 @@
"Dina inställningar anger sammanslagning med referensen \"%s\"\n"
"från fjärren, men någon sådan referens togs inte emot."
-#: builtin/pull.c:576
+#: builtin/pull.c:596
#, c-format
msgid "unable to access commit %s"
msgstr "kunde inte komma åt incheckningen %s"
-#: builtin/pull.c:857
+#: builtin/pull.c:902
msgid "ignoring --verify-signatures for rebase"
msgstr "ignorera --verify-signatures för ombasering"
-#: builtin/pull.c:912
-msgid "--[no-]autostash option is only valid with --rebase."
-msgstr "--[no-]autostash är endast giltig med --rebase."
+#: builtin/pull.c:930
+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:920
+#: builtin/pull.c:991
msgid "Updating an unborn branch with changes added to the index."
msgstr "Uppdaterar en ofödd gren med ändringar som lagts till i indexet."
-#: builtin/pull.c:924
+#: builtin/pull.c:995
msgid "pull with rebase"
msgstr "pull med ombasering"
-#: builtin/pull.c:925
+#: builtin/pull.c:996
msgid "please commit or stash them."
msgstr "checka in eller använd \"stash\" på dem."
-#: builtin/pull.c:950
+#: builtin/pull.c:1021
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -17537,7 +18866,7 @@
"snabbspolar din arbetskatalog från\n"
"incheckningen %s."
-#: builtin/pull.c:956
+#: builtin/pull.c:1027
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -17554,15 +18883,15 @@
"$ git reset --hard\n"
"för att återgå."
-#: builtin/pull.c:971
+#: builtin/pull.c:1042
msgid "Cannot merge multiple branches into empty head."
msgstr "Kan inte slå ihop flera grenar i ett tomt huvud."
-#: builtin/pull.c:975
+#: builtin/pull.c:1046
msgid "Cannot rebase onto multiple branches."
msgstr "Kan inte ombasera ovanpå flera grenar."
-#: builtin/pull.c:982
+#: builtin/pull.c:1067
msgid "cannot rebase with locally recorded submodule modifications"
msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful"
@@ -17570,15 +18899,15 @@
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<flaggor>] [<arkiv> [<refspec>...]]"
-#: builtin/push.c:112
+#: builtin/push.c:111
msgid "tag shorthand without <tag>"
msgstr "taggförkortning utan <tagg>"
-#: builtin/push.c:122
+#: builtin/push.c:119
msgid "--delete only accepts plain target ref names"
msgstr "--delete godtar endast enkla målreferensnamn"
-#: builtin/push.c:168
+#: builtin/push.c:164
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -17587,7 +18916,7 @@
"För att välja ett av alternativen permanent, se push.default i \"git help "
"config\"."
-#: builtin/push.c:171
+#: builtin/push.c:167
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -17612,7 +18941,7 @@
" git push %s HEAD\n"
"%s"
-#: builtin/push.c:186
+#: builtin/push.c:182
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -17627,7 +18956,7 @@
"\n"
" git push %s HEAD:<namn-på-fjärrgren>\n"
-#: builtin/push.c:200
+#: builtin/push.c:194
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -17640,12 +18969,12 @@
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:208
+#: 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:211
+#: builtin/push.c:205
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -17656,14 +18985,14 @@
"aktuella grenen \"%s\", utan att tala om för mig vad som\n"
"ska sändas för att uppdatera fjärrgrenen."
-#: builtin/push.c:270
+#: 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:277
+#: 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"
@@ -17675,7 +19004,7 @@
"\"git pull ....\") innan du sänder igen.\n"
"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer."
-#: builtin/push.c:283
+#: builtin/push.c: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"
@@ -17687,7 +19016,7 @@
"\"git pull ...\") innan du sänder igen.\n"
"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer."
-#: builtin/push.c:289
+#: builtin/push.c: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"
@@ -17701,11 +19030,11 @@
"(t.ex. \"git pull ...\") innan du sänder igen.\n"
"Se avsnittet \"Note about fast-forwards\" i \"git push --help\" för detaljer."
-#: builtin/push.c:296
+#: builtin/push.c: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:299
+#: 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"
@@ -17716,99 +19045,115 @@
"pekar på något som inte är en incheckning, utan att använda flaggan\n"
"\"--force\".\n"
-#: builtin/push.c:360
+#: builtin/push.c:294
+msgid ""
+"Updates were rejected because the tip of the remote-tracking\n"
+"branch has been updated since the last checkout. You may want\n"
+"to integrate those changes locally (e.g., 'git pull ...')\n"
+"before forcing an update.\n"
+msgstr ""
+"Uppdateringar avvisades då änden på den fjärrspårande grenen\n"
+"har uppdaterats sedan senaste utcheckning. Integrera\n"
+"fjärrändringarna lokalt (t.ex \"git pull ....\") innan du\n"
+"tvingar en uppdatering.\n"
+
+#: builtin/push.c:364
#, c-format
msgid "Pushing to %s\n"
msgstr "Sänder till %s\n"
-#: builtin/push.c:367
+#: builtin/push.c:371
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "misslyckades sända vissa referenser till \"%s\""
-#: builtin/push.c:542
+#: builtin/push.c:553
msgid "repository"
msgstr "arkiv"
-#: builtin/push.c:543 builtin/send-pack.c:164
+#: builtin/push.c:554 builtin/send-pack.c:189
msgid "push all refs"
msgstr "sänd alla referenser"
-#: builtin/push.c:544 builtin/send-pack.c:166
+#: builtin/push.c:555 builtin/send-pack.c:191
msgid "mirror all refs"
msgstr "spegla alla referenser"
-#: builtin/push.c:546
+#: builtin/push.c:557
msgid "delete refs"
msgstr "ta bort referenser"
-#: builtin/push.c:547
+#: builtin/push.c:558
msgid "push tags (can't be used with --all or --mirror)"
msgstr "sänd taggar (kan inte användas med --all eller --mirror)"
-#: builtin/push.c:550 builtin/send-pack.c:167
+#: builtin/push.c:561 builtin/send-pack.c:192
msgid "force updates"
msgstr "tvinga uppdateringar"
-#: builtin/push.c:552 builtin/send-pack.c:181
+#: builtin/push.c:562 builtin/send-pack.c:204
msgid "<refname>:<expect>"
msgstr "<refnamn>:<förvänta>"
-#: builtin/push.c:553 builtin/send-pack.c:182
+#: builtin/push.c:563 builtin/send-pack.c:205
msgid "require old value of ref to be at this value"
msgstr "kräv att ref:s tidigare värde är detta"
-#: builtin/push.c:556
+#: builtin/push.c:566 builtin/send-pack.c:208
+msgid "require remote updates to be integrated locally"
+msgstr "kräv att fjärruppdateringar har integrerats lokalt"
+
+#: builtin/push.c:569
msgid "control recursive pushing of submodules"
msgstr "styr rekursiv insändning av undermoduler"
-#: builtin/push.c:558 builtin/send-pack.c:175
+#: builtin/push.c:570 builtin/send-pack.c:199
msgid "use thin pack"
msgstr "använd tunna paket"
-#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161
-#: builtin/send-pack.c:162
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
+#: builtin/send-pack.c:187
msgid "receive pack program"
msgstr "program för att ta emot paket"
-#: builtin/push.c:561
+#: builtin/push.c:573
msgid "set upstream for git pull/status"
msgstr "ställ in uppström för git pull/status"
-#: builtin/push.c:564
+#: builtin/push.c:576
msgid "prune locally removed refs"
msgstr "ta bort lokalt borttagna referenser"
-#: builtin/push.c:566
+#: builtin/push.c:578
msgid "bypass pre-push hook"
msgstr "förbigå pre-push-krok"
-#: builtin/push.c:567
+#: builtin/push.c:579
msgid "push missing but relevant tags"
msgstr "sänd in saknade men relevanta taggar"
-#: builtin/push.c:570 builtin/send-pack.c:169
+#: builtin/push.c:581 builtin/send-pack.c:193
msgid "GPG sign the push"
msgstr "GPG-signera insändningen"
-#: builtin/push.c:572 builtin/send-pack.c:176
+#: builtin/push.c:583 builtin/send-pack.c:200
msgid "request atomic transaction on remote side"
msgstr "begär atomiska transaktioner på fjärrsidan"
-#: builtin/push.c:590
+#: builtin/push.c:601
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete är inkompatibel med --all, --mirror och --tags"
-#: builtin/push.c:592
+#: builtin/push.c:603
msgid "--delete doesn't make sense without any refs"
msgstr "--delete kan inte användas utan referenser"
-#: builtin/push.c:612
+#: builtin/push.c:623
#, c-format
msgid "bad repository '%s'"
msgstr "felaktigt arkiv \"%s\""
-#: builtin/push.c:613
+#: builtin/push.c:624
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -17829,69 +19174,77 @@
"\n"
" git push <namn>\n"
-#: builtin/push.c:628
+#: builtin/push.c:639
msgid "--all and --tags are incompatible"
msgstr "--all och --tags är inkompatibla"
-#: builtin/push.c:630
+#: builtin/push.c:641
msgid "--all can't be combined with refspecs"
msgstr "--all kan inte kombineras med referensspecifikationer"
-#: builtin/push.c:634
+#: builtin/push.c:645
msgid "--mirror and --tags are incompatible"
msgstr "--mirror och --tags är inkompatibla"
-#: builtin/push.c:636
+#: builtin/push.c:647
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror kan inte kombineras med referensspecifikationer"
-#: builtin/push.c:639
+#: builtin/push.c:650
msgid "--all and --mirror are incompatible"
msgstr "--all och --mirror är inkompatibla"
-#: builtin/push.c:643
+#: builtin/push.c:657
msgid "push options must not have new line characters"
msgstr "push-flaggor kan inte innehålla radbrytning"
-#: builtin/range-diff.c:8
+#: builtin/range-diff.c:9
msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
msgstr ""
"git range-diff [<flaggor>] <gammal-bas>..<gammal-ända> <ny-bas>..<ny-ända>"
-#: builtin/range-diff.c:9
+#: builtin/range-diff.c:10
msgid "git range-diff [<options>] <old-tip>...<new-tip>"
msgstr "git range-diff [<flaggor>] <gammal-bas>..<ny-ända>"
-#: builtin/range-diff.c:10
+#: builtin/range-diff.c:11
msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
msgstr "git range-diff [<flaggor>] <bas> <gammal-ända> <ny-ända>"
-#: builtin/range-diff.c:22
+#: builtin/range-diff.c:28
msgid "Percentage by which creation is weighted"
msgstr "Procent som skapelse vägs med"
-#: builtin/range-diff.c:24
+#: builtin/range-diff.c:30
msgid "use simple diff colors"
msgstr "använd enkla diff-färger"
-#: builtin/range-diff.c:26
+#: builtin/range-diff.c:32
msgid "notes"
msgstr "anteckningar"
-#: builtin/range-diff.c:26
+#: builtin/range-diff.c:32
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:35
+msgid "only emit output related to the first range"
+msgstr "visa endast utdata för det första intervallet"
-#: builtin/range-diff.c:64
+#: builtin/range-diff.c:37
+msgid "only emit output related to the second range"
+msgstr "visa endast utdata för det andra intervallet"
+
+#: builtin/range-diff.c:60 builtin/range-diff.c:64
+#, c-format
+msgid "not a commit range: '%s'"
+msgstr "inte ett incheckningsintervall: \"%s\""
+
+#: builtin/range-diff.c:74
msgid "single arg format must be symmetric range"
msgstr "ensamt argument måste vara symmetriskt intervall"
-#: builtin/range-diff.c:79
+#: builtin/range-diff.c:89
msgid "need two commit ranges"
msgstr "behöver två incheckningsintervall"
@@ -17977,7 +19330,7 @@
msgid "You need to resolve your current index first"
msgstr "Du måste lösa ditt befintliga index först"
-#: builtin/rebase.c:32
+#: builtin/rebase.c:35
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
"[<upstream> [<branch>]]"
@@ -17985,217 +19338,203 @@
"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:175 builtin/rebase.c:199 builtin/rebase.c:226
+#: builtin/rebase.c:195 builtin/rebase.c:219 builtin/rebase.c:246
#, c-format
msgid "unusable todo list: '%s'"
msgstr "oanvändbar todo-lista: %s"
-#: builtin/rebase.c:292
+#: builtin/rebase.c:312
#, c-format
msgid "could not create temporary %s"
msgstr "kunde inte skapa temporär %s"
-#: builtin/rebase.c:298
+#: builtin/rebase.c:318
msgid "could not mark as interactive"
msgstr "kunde inte markera som interaktiv"
-#: builtin/rebase.c:352
+#: builtin/rebase.c:371
msgid "could not generate todo list"
msgstr "Kunde inte skapa attgöra-lista"
-#: builtin/rebase.c:391
+#: builtin/rebase.c:413
msgid "a base commit must be provided with --upstream or --onto"
msgstr "en basincheckning måste anges med --upstream eller --onto"
-#: builtin/rebase.c:461
+#: builtin/rebase.c:482
msgid "git rebase--interactive [<options>]"
msgstr "git rebase--interactive [<flaggor>]"
-#: builtin/rebase.c:474 builtin/rebase.c:1550
-msgid "(DEPRECATED) keep empty commits"
-msgstr "(FÖRÅLDRAD) behåll tomma incheckningar"
+#: builtin/rebase.c:495 builtin/rebase.c:1394
+msgid "keep commits which start empty"
+msgstr "behåller incheckningar som är tomma från början"
-#: builtin/rebase.c:478 builtin/revert.c:128
+#: builtin/rebase.c:499 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr "tillåt incheckningar med tomt meddelande"
-#: builtin/rebase.c:480
+#: builtin/rebase.c:501
msgid "rebase merge commits"
msgstr "ombasera sammanslagningar"
-#: builtin/rebase.c:482
+#: builtin/rebase.c:503
msgid "keep original branch points of cousins"
msgstr "behåll ursprungliga förgreningspunkter för kusiner"
-#: builtin/rebase.c:484
+#: builtin/rebase.c:505
msgid "move commits that begin with squash!/fixup!"
msgstr "flytta incheckningar som inleds med squash!/fixup!"
-#: builtin/rebase.c:485
+#: builtin/rebase.c:506
msgid "sign commits"
msgstr "signera incheckningar"
-#: builtin/rebase.c:487 builtin/rebase.c:1490
+#: builtin/rebase.c:508 builtin/rebase.c:1333
msgid "display a diffstat of what changed upstream"
msgstr "vis diffstat för vad som ändrats uppströms"
-#: builtin/rebase.c:489
+#: builtin/rebase.c:510
msgid "continue rebase"
msgstr "fortsätt ombasering"
-#: builtin/rebase.c:491
+#: builtin/rebase.c:512
msgid "skip commit"
msgstr "hoppa över incheckning"
-#: builtin/rebase.c:492
+#: builtin/rebase.c:513
msgid "edit the todo list"
msgstr "redigera attgöra-listan"
-#: builtin/rebase.c:494
+#: builtin/rebase.c:515
msgid "show the current patch"
msgstr "visa nuvarande patch"
-#: builtin/rebase.c:497
+#: builtin/rebase.c:518
msgid "shorten commit ids in the todo list"
msgstr "förkorta inchecknings-id i todo-listan"
-#: builtin/rebase.c:499
+#: builtin/rebase.c:520
msgid "expand commit ids in the todo list"
msgstr "utöka inchecknings-id i todo-listan"
-#: builtin/rebase.c:501
+#: builtin/rebase.c:522
msgid "check the todo list"
msgstr "kontrollera todo-listan"
-#: builtin/rebase.c:503
+#: builtin/rebase.c:524
msgid "rearrange fixup/squash lines"
msgstr "ordna om fixup-/squash-rader"
-#: builtin/rebase.c:505
+#: builtin/rebase.c:526
msgid "insert exec commands in todo list"
msgstr "lägg in exec-kommandon i todo-listan"
-#: builtin/rebase.c:506
+#: builtin/rebase.c:527
msgid "onto"
msgstr "ovanpå"
-#: builtin/rebase.c:509
+#: builtin/rebase.c:530
msgid "restrict-revision"
msgstr "restrict-revision"
-#: builtin/rebase.c:509
+#: builtin/rebase.c:530
msgid "restrict revision"
msgstr "begränsa revision"
-#: builtin/rebase.c:511
+#: builtin/rebase.c:532
msgid "squash-onto"
msgstr "squash-onto"
-#: builtin/rebase.c:512
+#: builtin/rebase.c:533
msgid "squash onto"
msgstr "tryck ihop ovanpå"
-#: builtin/rebase.c:514
+#: builtin/rebase.c:535
msgid "the upstream commit"
msgstr "uppströmsincheckningen"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:537
msgid "head-name"
msgstr "head-name"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:537
msgid "head name"
msgstr "namn på huvud"
-#: builtin/rebase.c:521
+#: builtin/rebase.c:542
msgid "rebase strategy"
msgstr "sammanslagningsstrategi"
-#: builtin/rebase.c:522
+#: builtin/rebase.c:543
msgid "strategy-opts"
msgstr "strategy-opts"
-#: builtin/rebase.c:523
+#: builtin/rebase.c:544
msgid "strategy options"
msgstr "strategiflaggor"
-#: builtin/rebase.c:524
+#: builtin/rebase.c:545
msgid "switch-to"
msgstr "switch-to"
-#: builtin/rebase.c:525
+#: builtin/rebase.c:546
msgid "the branch or commit to checkout"
msgstr "gren eller inchecking att checka ut"
-#: builtin/rebase.c:526
+#: builtin/rebase.c:547
msgid "onto-name"
msgstr "onto-name"
-#: builtin/rebase.c:526
+#: builtin/rebase.c:547
msgid "onto name"
msgstr "på-namn"
-#: builtin/rebase.c:527
+#: builtin/rebase.c:548
msgid "cmd"
msgstr "kmd"
-#: builtin/rebase.c:527
+#: builtin/rebase.c:548
msgid "the command to run"
msgstr "kommando att köra"
-#: builtin/rebase.c:530 builtin/rebase.c:1584
+#: builtin/rebase.c:551 builtin/rebase.c:1427
msgid "automatically re-schedule any `exec` that fails"
msgstr "kör automatiskt alla \"exec\" som misslyckas på nytt"
-#: builtin/rebase.c:546
+#: builtin/rebase.c:567
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr "--[no-]rebase-cousins har ingen effekt utan --rebase-merges"
-#: builtin/rebase.c:562
+#: builtin/rebase.c:583
#, 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:612
+#: builtin/rebase.c:626
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "kunde inte hämta \"onto\": \"%s\""
-#: builtin/rebase.c:627
+#: builtin/rebase.c:643
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "ogiltigt orig-head: \"%s\""
-#: builtin/rebase.c:652
+#: builtin/rebase.c:668
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "ignorera ogiltigt allow_rerere_autoupdate: \"%s\""
-#: builtin/rebase.c:728
-#, c-format
-msgid "Could not read '%s'"
-msgstr "Kunde inte läsa \"%s\""
-
-#: builtin/rebase.c:746
-#, c-format
-msgid "Cannot store %s"
-msgstr "Kan inte spara %s"
-
-#: builtin/rebase.c:853
-msgid "could not determine HEAD revision"
-msgstr "kunde inte bestämma HEAD-revision"
-
-#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -18209,7 +19548,7 @@
"För att avbryta och återgå till där du var före ombaseringen, kör \"git "
"rebase --abort\"."
-#: builtin/rebase.c:1058
+#: builtin/rebase.c:896
#, c-format
msgid ""
"\n"
@@ -18228,7 +19567,7 @@
"\n"
"Därför kan inte git ombasera dessa."
-#: builtin/rebase.c:1383
+#: builtin/rebase.c:1227
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -18236,7 +19575,7 @@
msgstr ""
"okänd tom-typ \"%s\"; giltiga värden är \"drop\", \"keep\" och \"ask\"."
-#: builtin/rebase.c:1401
+#: builtin/rebase.c:1245
#, c-format
msgid ""
"%s\n"
@@ -18253,7 +19592,7 @@
" git rebase '<gren>'\n"
"\n"
-#: builtin/rebase.c:1417
+#: builtin/rebase.c:1261
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -18266,136 +19605,148 @@
" git branch --set-upstream-to=%s/<gren> %s\n"
"\n"
-#: builtin/rebase.c:1447
+#: builtin/rebase.c:1291
msgid "exec commands cannot contain newlines"
msgstr "exec-kommandon kan inte innehålla nyradstecken"
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1295
msgid "empty exec command"
msgstr "tomt exec-kommando"
-#: builtin/rebase.c:1481
+#: builtin/rebase.c:1324
msgid "rebase onto given branch instead of upstream"
msgstr "ombasera mot given grenen istället för uppström"
-#: builtin/rebase.c:1483
+#: builtin/rebase.c:1326
msgid "use the merge-base of upstream and branch as the current base"
msgstr "använd sammanslagningsbasen mellan uppströms och gren som aktuell bas"
-#: builtin/rebase.c:1485
+#: builtin/rebase.c:1328
msgid "allow pre-rebase hook to run"
msgstr "tillåt pre-rebase-krok att köra"
-#: builtin/rebase.c:1487
+#: builtin/rebase.c:1330
msgid "be quiet. implies --no-stat"
msgstr "var tyst. implicerar --no-stat"
-#: builtin/rebase.c:1493
+#: builtin/rebase.c:1336
msgid "do not show diffstat of what changed upstream"
msgstr "visa inte en diffstat för vad som ändrats uppströms"
-#: builtin/rebase.c:1496
-msgid "add a Signed-off-by: line to each commit"
-msgstr "lägg \"Signed-off-by:\"-rad till varje incheckning"
+#: builtin/rebase.c:1339
+msgid "add a Signed-off-by trailer to each commit"
+msgstr "lägg \"Signed-off-by:\"-släprad till varje incheckning"
-#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504
-msgid "passed to 'git am'"
-msgstr "sänds till \"git am\""
+#: builtin/rebase.c:1342
+msgid "make committer date match author date"
+msgstr "sätt incheckningsdatum till författardatum"
-#: builtin/rebase.c:1506 builtin/rebase.c:1508
+#: builtin/rebase.c:1344
+msgid "ignore author date and use current date"
+msgstr "ignorera författardatum och använd nuvarande"
+
+#: builtin/rebase.c:1346
+msgid "synonym of --reset-author-date"
+msgstr "synonym för --reset-author-date"
+
+#: builtin/rebase.c:1348 builtin/rebase.c:1352
msgid "passed to 'git apply'"
msgstr "sänds till \"git apply\""
-#: builtin/rebase.c:1510 builtin/rebase.c:1513
+#: builtin/rebase.c:1350
+msgid "ignore changes in whitespace"
+msgstr "ignorera ändringar i blanksteg"
+
+#: builtin/rebase.c:1354 builtin/rebase.c:1357
msgid "cherry-pick all commits, even if unchanged"
msgstr "utför cherry-pick på alla incheckningar, även om oändrad"
-#: builtin/rebase.c:1515
+#: builtin/rebase.c:1359
msgid "continue"
msgstr "fortsätt"
-#: builtin/rebase.c:1518
+#: builtin/rebase.c:1362
msgid "skip current patch and continue"
msgstr "hoppa över nuvarande patch och fortsätt"
-#: builtin/rebase.c:1520
+#: builtin/rebase.c:1364
msgid "abort and check out the original branch"
msgstr "avbryt och checka ut ursprungsgrenen"
-#: builtin/rebase.c:1523
+#: builtin/rebase.c:1367
msgid "abort but keep HEAD where it is"
msgstr "avbryt men behåll HEAD där det är"
-#: builtin/rebase.c:1524
+#: builtin/rebase.c:1368
msgid "edit the todo list during an interactive rebase"
msgstr "redigera attgöra-listan under interaktiv ombasering."
-#: builtin/rebase.c:1527
+#: builtin/rebase.c:1371
msgid "show the patch file being applied or merged"
msgstr "visa patchen som tillämpas eller slås samman"
-#: builtin/rebase.c:1530
+#: builtin/rebase.c:1374
msgid "use apply strategies to rebase"
msgstr "använd appliceringstrategier för ombasering"
-#: builtin/rebase.c:1534
+#: builtin/rebase.c:1378
msgid "use merging strategies to rebase"
msgstr "använd sammanslagningsstrategier för ombasering"
-#: builtin/rebase.c:1538
+#: builtin/rebase.c:1382
msgid "let the user edit the list of commits to rebase"
msgstr "låt användaren redigera listan över incheckningar att ombasera"
-#: builtin/rebase.c:1542
+#: builtin/rebase.c:1386
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr ""
"(AVRÅDS) försök återskapa sammanslagningar istället för att ignorera dem"
-#: builtin/rebase.c:1547
+#: builtin/rebase.c:1391
msgid "how to handle commits that become empty"
msgstr "hur incheckningar som blir tomma ska hanteras"
-#: builtin/rebase.c:1554
+#: builtin/rebase.c:1398
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "flytta incheckningar som börjar med squash!/fixup! under -i"
-#: builtin/rebase.c:1560
-msgid "automatically stash/stash pop before and after"
-msgstr "utför automatiskt stash/stash pop före och efter"
-
-#: builtin/rebase.c:1562
+#: builtin/rebase.c:1405
msgid "add exec lines after each commit of the editable list"
msgstr "lägg till exec-rader efter varje incheckning i den redigerbara listan"
-#: builtin/rebase.c:1566
+#: builtin/rebase.c:1409
msgid "allow rebasing commits with empty messages"
msgstr "tillåt ombasering av incheckningar med tomt meddelande"
-#: builtin/rebase.c:1570
+#: builtin/rebase.c:1413
msgid "try to rebase merges instead of skipping them"
msgstr "försök ombasera sammanslagningar istället för att ignorera dem"
-#: builtin/rebase.c:1573
+#: builtin/rebase.c:1416
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "använd \"merge-base --fork-point\" för att förfina uppström"
-#: builtin/rebase.c:1575
+#: builtin/rebase.c:1418
msgid "use the given merge strategy"
msgstr "använd angiven sammanslagningsstrategi"
-#: builtin/rebase.c:1577 builtin/revert.c:115
+#: builtin/rebase.c:1420 builtin/revert.c:115
msgid "option"
msgstr "alternativ"
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1421
msgid "pass the argument through to the merge strategy"
msgstr "sänd flaggan till sammanslagningsstrategin"
-#: builtin/rebase.c:1581
+#: builtin/rebase.c:1424
msgid "rebase all reachable commits up to the root(s)"
msgstr "ombasera alla nåbara incheckningar upp till roten/rötterna"
-#: builtin/rebase.c:1598
+#: builtin/rebase.c:1429
+msgid "apply all changes, even those already present upstream"
+msgstr "applicera alla ändringar, även de som redan finns uppströms"
+
+#: builtin/rebase.c:1446
msgid ""
"the rebase.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
@@ -18403,37 +19754,41 @@
"stödet för rebase.useBuiltin har tagits bort!\n"
"Se posten för det i \"git help config\" för detaljer."
-#: builtin/rebase.c:1604
+#: builtin/rebase.c:1452
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "Det verkar som en \"git am\" körs. Kan inte ombasera."
-#: builtin/rebase.c:1645
+#: builtin/rebase.c:1493
msgid ""
"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr ""
"git rebase --preserve-merges avråds från. Använd --rebase-merges istället."
-#: builtin/rebase.c:1650
+#: builtin/rebase.c:1498
msgid "cannot combine '--keep-base' with '--onto'"
msgstr "kan inte kombinera \"--keep-base\" med \"--onto\""
-#: builtin/rebase.c:1652
+#: builtin/rebase.c:1500
msgid "cannot combine '--keep-base' with '--root'"
msgstr "kan inte kombinera \"--keep-base\" med \"--root\""
-#: builtin/rebase.c:1656
+#: builtin/rebase.c:1504
+msgid "cannot combine '--root' with '--fork-point'"
+msgstr "kan inte kombinera \"--root\" med \"--fork-point\""
+
+#: builtin/rebase.c:1507
msgid "No rebase in progress?"
msgstr "Ingen ombasering pågår?"
-#: builtin/rebase.c:1660
+#: builtin/rebase.c:1511
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering."
-#: builtin/rebase.c:1683
+#: builtin/rebase.c:1534 t/helper/test-fast-rebase.c:123
msgid "Cannot read HEAD"
msgstr "Kan inte läsa HEAD"
-#: builtin/rebase.c:1695
+#: builtin/rebase.c:1546
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -18441,16 +19796,16 @@
"Du måste redigera alla sammanslagningskonflikter och\n"
"därefter markera dem som lösta med git add"
-#: builtin/rebase.c:1714
+#: builtin/rebase.c:1565
msgid "could not discard worktree changes"
msgstr "kunde inte kasta ändringar i arbetskatalogen"
-#: builtin/rebase.c:1733
+#: builtin/rebase.c:1584
#, c-format
msgid "could not move back to %s"
msgstr "kunde inte flytta tillbaka till %s"
-#: builtin/rebase.c:1778
+#: builtin/rebase.c:1630
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -18471,166 +19826,143 @@
"och kör programmet igen. Jag avslutar ifall du fortfarande har\n"
"något av värde där.\n"
-#: builtin/rebase.c:1806
+#: builtin/rebase.c:1658
msgid "switch `C' expects a numerical value"
msgstr "flaggan \"C\" förväntar ett numeriskt värde"
-#: builtin/rebase.c:1847
+#: builtin/rebase.c:1700
#, c-format
msgid "Unknown mode: %s"
msgstr "Okänt läge: %s"
-#: builtin/rebase.c:1869
+#: builtin/rebase.c:1739
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy kräver --merge eller --interactive"
-#: builtin/rebase.c:1899
+#: builtin/rebase.c:1769
msgid "cannot combine apply options with merge options"
msgstr "kan inte kombinera apply-flaggor med merge-flaggor"
-#: builtin/rebase.c:1912
+#: builtin/rebase.c:1782
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "Okänd rebase-bakända: %s"
-#: builtin/rebase.c:1937
+#: builtin/rebase.c:1812
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec kräver --exec eller --interactive"
-#: builtin/rebase.c:1957
+#: builtin/rebase.c:1832
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr "kan inte kombinera \"--preserve-merges\" med \"--rebase-merges\""
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1836
msgid ""
"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
"fel: kan inte kombinera \"--preserve-merges\" med \"--reschedule-failed-exec"
"\""
-#: builtin/rebase.c:1985
+#: builtin/rebase.c:1860
#, c-format
msgid "invalid upstream '%s'"
msgstr "felaktig uppström \"%s\""
-#: builtin/rebase.c:1991
+#: builtin/rebase.c:1866
msgid "Could not create new root commit"
msgstr "kunde inte skapa ny rotincheckning"
-#: builtin/rebase.c:2017
+#: builtin/rebase.c:1892
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "\"%s\": behöver precis en sammanslagningsbas med gren"
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1895
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "\"%s\": behöver precis en sammanslagningsbas"
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1903
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "Pekar inte på en giltig incheckning: \"%s\""
-#: builtin/rebase.c:2054
+#: builtin/rebase.c:1931
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "ödesdigert: ingen sådan gren/incheckning: \"%s\""
-#: builtin/rebase.c:2062 builtin/submodule--helper.c:40
-#: builtin/submodule--helper.c:1990
+#: builtin/rebase.c:1939 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:2073
+#: builtin/rebase.c:1950
msgid "Could not resolve HEAD to a revision"
msgstr "Kunde inte bestämma HEAD:s incheckning"
-#: builtin/rebase.c:2111
-msgid "Cannot autostash"
-msgstr "Kan inte utföra \"autostash\""
-
-#: builtin/rebase.c:2114
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr "Oväntat svar från stash: \"%s\""
-
-#: builtin/rebase.c:2120
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr "Kunde inte skapa katalog för \"%s\""
-
-#: builtin/rebase.c:2123
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr "Skapade autostash: %s\n"
-
-#: builtin/rebase.c:2126
-msgid "could not reset --hard"
-msgstr "kunde inte utföra \"reset --hard\""
-
-#: builtin/rebase.c:2135
+#: builtin/rebase.c:1971
msgid "Please commit or stash them."
msgstr "Checka in eller använd \"stash\" på dem."
-#: builtin/rebase.c:2169
+#: builtin/rebase.c:2007
#, c-format
msgid "could not switch to %s"
msgstr "kunde inte växla till %s"
-#: builtin/rebase.c:2180
+#: builtin/rebase.c:2018
msgid "HEAD is up to date."
msgstr "HEAD är à jour."
-#: builtin/rebase.c:2182
+#: builtin/rebase.c:2020
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "Aktuell gren %s är à jour.\n"
-#: builtin/rebase.c:2190
+#: builtin/rebase.c:2028
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD är à jour, ombasering framtvingad."
-#: builtin/rebase.c:2192
+#: builtin/rebase.c:2030
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "Aktuell gren %s är à jour, ombasering framtvingad.\n"
-#: builtin/rebase.c:2200
+#: builtin/rebase.c:2038
msgid "The pre-rebase hook refused to rebase."
msgstr "Kroken pre-rebase vägrade ombaseringen."
-#: builtin/rebase.c:2207
+#: builtin/rebase.c:2045
#, c-format
msgid "Changes to %s:\n"
msgstr "Ändringar till %s:\n"
-#: builtin/rebase.c:2210
+#: builtin/rebase.c:2048
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Ändringar från %s till %s:\n"
-#: builtin/rebase.c:2235
+#: builtin/rebase.c:2073
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det...\n"
-#: builtin/rebase.c:2244
+#: builtin/rebase.c:2082
msgid "Could not detach HEAD"
msgstr "Kunde inte koppla från HEAD"
-#: builtin/rebase.c:2253
+#: builtin/rebase.c:2091
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Snabbspolade %s till %s.\n"
-#: builtin/receive-pack.c:33
+#: builtin/receive-pack.c:34
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-katalog>"
-#: builtin/receive-pack.c:821
+#: builtin/receive-pack.c:1276
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
@@ -18660,7 +19992,7 @@
"För att undvika detta meddelande och fortfarande behålla det\n"
"normala beteendet, sätt \"receive.denyCurrentBranch\" till \"refuse\"."
-#: builtin/receive-pack.c:841
+#: builtin/receive-pack.c:1296
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"
@@ -18681,11 +20013,11 @@
"\n"
"För att undvika detta meddelande kan du sätta det till \"refuse\"."
-#: builtin/receive-pack.c:1938
+#: builtin/receive-pack.c:2481
msgid "quiet"
msgstr "tyst"
-#: builtin/receive-pack.c:1952
+#: builtin/receive-pack.c:2495
msgid "You must specify a directory."
msgstr "Du måste ange en katalog."
@@ -18716,36 +20048,36 @@
msgid "'%s' is not a valid timestamp"
msgstr "\"%s\" är inte en giltig tidsstämpel"
-#: builtin/reflog.c:606
+#: builtin/reflog.c:609
#, c-format
msgid "Marking reachable objects..."
msgstr "Markerar nåbara objekt..."
-#: builtin/reflog.c:644
+#: builtin/reflog.c:647
#, c-format
msgid "%s points nowhere!"
msgstr "%s pekar ingenstans!"
-#: builtin/reflog.c:696
+#: builtin/reflog.c:699
msgid "no reflog specified to delete"
msgstr "ingen referenslogg att ta bort angavs"
-#: builtin/reflog.c:705
+#: builtin/reflog.c:708
#, c-format
msgid "not a reflog: %s"
msgstr "inte en referenslogg: %s"
-#: builtin/reflog.c:710
+#: builtin/reflog.c:713
#, c-format
msgid "no reflog for '%s'"
msgstr "ingen referenslogg för \"%s\""
-#: builtin/reflog.c:756
+#: builtin/reflog.c:759
#, c-format
msgid "invalid ref format: %s"
msgstr "felaktigt referensformat: %s"
-#: builtin/reflog.c:765
+#: builtin/reflog.c:768
msgid "git reflog [ show | expire | delete | exists ]"
msgstr "git reflog [ show | expire | delete | exists ]"
@@ -18881,40 +20213,35 @@
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "att ange grenar att spåra ger mening bara med hämtningsspeglar"
-#: builtin/remote.c:195 builtin/remote.c:696
+#: builtin/remote.c:195 builtin/remote.c:700
#, c-format
msgid "remote %s already exists."
msgstr "fjärrarkivet %s finns redan."
-#: builtin/remote.c:199 builtin/remote.c:700
-#, c-format
-msgid "'%s' is not a valid remote name"
-msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv"
-
-#: builtin/remote.c:239
+#: builtin/remote.c:240
#, c-format
msgid "Could not setup master '%s'"
msgstr "Kunde inte skapa master \"%s\""
-#: builtin/remote.c:354
+#: builtin/remote.c:355
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "Kunde inte hämta mappning för referensspecifikation %s"
-#: builtin/remote.c:453 builtin/remote.c:461
+#: builtin/remote.c:454 builtin/remote.c:462
msgid "(matching)"
-msgstr "(matchande)"
+msgstr "(träffande)"
-#: builtin/remote.c:465
+#: builtin/remote.c:466
msgid "(delete)"
msgstr "(ta bort)"
-#: builtin/remote.c:653
+#: builtin/remote.c:655
#, c-format
msgid "could not set '%s'"
msgstr "kunde inte ställa in \"%s\""
-#: builtin/remote.c:658
+#: builtin/remote.c:660
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
@@ -18925,17 +20252,17 @@
"\t%s:%d\n"
"anger nu den icke-existerande fjärren \"%s\""
-#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940
+#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946
#, c-format
msgid "No such remote: '%s'"
msgstr "Ingen sådan fjärr: \"%s\""
-#: builtin/remote.c:706
+#: builtin/remote.c:710
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Kunde inte byta namn på konfigurationssektionen \"%s\" till \"%s\""
-#: builtin/remote.c:726
+#: builtin/remote.c:730
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -18946,17 +20273,17 @@
"\t%s\n"
"\tUppdatera konfigurationen manuellt om nödvändigt."
-#: builtin/remote.c:766
+#: builtin/remote.c:770
#, c-format
msgid "deleting '%s' failed"
msgstr "misslyckades ta bort \"%s\""
-#: builtin/remote.c:800
+#: builtin/remote.c:804
#, c-format
msgid "creating '%s' failed"
msgstr "misslyckades skapa \"%s\""
-#: builtin/remote.c:876
+#: builtin/remote.c:882
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -18970,118 +20297,118 @@
"Observera: Några grenar utanför hierarkin refs/remotes/ togs inte bort;\n"
"för att ta bort dem, använd:"
-#: builtin/remote.c:890
+#: builtin/remote.c:896
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Kunde inte ta bort konfigurationssektionen \"%s\""
-#: builtin/remote.c:993
+#: builtin/remote.c:999
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " ny (nästa hämtning sparar i remotes/%s)"
-#: builtin/remote.c:996
+#: builtin/remote.c:1002
msgid " tracked"
msgstr " spårad"
-#: builtin/remote.c:998
+#: builtin/remote.c:1004
msgid " stale (use 'git remote prune' to remove)"
msgstr " förlegad (använd \"git remote prune\" för att ta bort)"
-#: builtin/remote.c:1000
+#: builtin/remote.c:1006
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:1041
+#: builtin/remote.c:1047
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "ogiltig branch.%s.merge; kan inte ombasera över > 1 gren"
-#: builtin/remote.c:1050
+#: builtin/remote.c:1056
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "ombaseras interaktivt på fjärren %s"
-#: builtin/remote.c:1052
+#: builtin/remote.c:1058
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr "ombaseras interaktivt (med sammanslagningar) på fjärren %s"
-#: builtin/remote.c:1055
+#: builtin/remote.c:1061
#, c-format
msgid "rebases onto remote %s"
msgstr "ombaseras på fjärren %s"
-#: builtin/remote.c:1059
+#: builtin/remote.c:1065
#, c-format
msgid " merges with remote %s"
msgstr " sammanslås med fjärren %s"
-#: builtin/remote.c:1062
+#: builtin/remote.c:1068
#, c-format
msgid "merges with remote %s"
msgstr "sammanslås med fjärren %s"
-#: builtin/remote.c:1065
+#: builtin/remote.c:1071
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s och med fjärren %s\n"
-#: builtin/remote.c:1108
+#: builtin/remote.c:1114
msgid "create"
msgstr "skapa"
-#: builtin/remote.c:1111
+#: builtin/remote.c:1117
msgid "delete"
msgstr "ta bort"
-#: builtin/remote.c:1115
+#: builtin/remote.c:1121
msgid "up to date"
msgstr "àjour"
-#: builtin/remote.c:1118
+#: builtin/remote.c:1124
msgid "fast-forwardable"
msgstr "kan snabbspolas"
-#: builtin/remote.c:1121
+#: builtin/remote.c:1127
msgid "local out of date"
msgstr "lokal föråldrad"
-#: builtin/remote.c:1128
+#: builtin/remote.c:1134
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s tvingar till %-*s (%s)"
-#: builtin/remote.c:1131
+#: builtin/remote.c:1137
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s sänder till %-*s (%s)"
-#: builtin/remote.c:1135
+#: builtin/remote.c:1141
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s tvingar till %s"
-#: builtin/remote.c:1138
+#: builtin/remote.c:1144
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s sänder till %s"
-#: builtin/remote.c:1206
+#: builtin/remote.c:1212
msgid "do not query remotes"
msgstr "fråga inte fjärrar"
-#: builtin/remote.c:1233
+#: builtin/remote.c:1239
#, c-format
msgid "* remote %s"
msgstr "* fjärr %s"
-#: builtin/remote.c:1234
+#: builtin/remote.c:1240
#, c-format
msgid " Fetch URL: %s"
msgstr " Hämt-URL: %s"
-#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390
+#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
msgid "(no URL)"
msgstr "(ingen URL)"
@@ -19089,184 +20416,184 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1249 builtin/remote.c:1251
+#: builtin/remote.c:1255 builtin/remote.c:1257
#, c-format
msgid " Push URL: %s"
msgstr " Sänd-URL: %s"
-#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD-gren: %s"
-#: builtin/remote.c:1253
+#: builtin/remote.c:1259
msgid "(not queried)"
msgstr "(inte förfrågad)"
-#: builtin/remote.c:1255
+#: builtin/remote.c:1261
msgid "(unknown)"
msgstr "(okänd)"
-#: builtin/remote.c:1259
+#: builtin/remote.c:1265
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " HEAD-gren (HEAD på fjärr är tvetydig, kan vara en av följande):\n"
-#: builtin/remote.c:1271
+#: builtin/remote.c:1277
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Fjärrgren:%s"
msgstr[1] " Fjärrgrenar:%s"
-#: builtin/remote.c:1274 builtin/remote.c:1300
+#: builtin/remote.c:1280 builtin/remote.c:1306
msgid " (status not queried)"
msgstr " (status inte förfrågad)"
-#: builtin/remote.c:1283
+#: builtin/remote.c:1289
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Lokal gren konfigurerad för \"git pull\":"
msgstr[1] " Lokala grenar konfigurerade för \"git pull\":"
-#: builtin/remote.c:1291
+#: builtin/remote.c:1297
msgid " Local refs will be mirrored by 'git push'"
msgstr " Lokala referenser speglas av \"git push\""
-#: builtin/remote.c:1297
+#: builtin/remote.c:1303
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Lokal referens konfigurerad för \"git push\"%s:"
msgstr[1] " Lokala referenser konfigurerade för \"git push\"%s:"
-#: builtin/remote.c:1318
+#: builtin/remote.c:1324
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren"
-#: builtin/remote.c:1320
+#: builtin/remote.c:1326
msgid "delete refs/remotes/<name>/HEAD"
msgstr "ta bort refs/remotes/<namn>/HEAD"
-#: builtin/remote.c:1335
+#: builtin/remote.c:1341
msgid "Cannot determine remote HEAD"
msgstr "Kan inte bestämma HEAD på fjärren"
-#: builtin/remote.c:1337
+#: builtin/remote.c:1343
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "Flera HEAD-grenar på fjärren. Välj en explicit med:"
-#: builtin/remote.c:1347
+#: builtin/remote.c:1353
#, c-format
msgid "Could not delete %s"
msgstr "Kunde inte ta bort %s"
-#: builtin/remote.c:1355
+#: builtin/remote.c:1361
#, c-format
msgid "Not a valid ref: %s"
msgstr "Inte en giltig referens: %s"
-#: builtin/remote.c:1357
+#: builtin/remote.c:1363
#, c-format
msgid "Could not setup %s"
msgstr "Kunde inte ställa in %s"
-#: builtin/remote.c:1375
+#: builtin/remote.c:1381
#, c-format
msgid " %s will become dangling!"
msgstr " %s kommer bli dinglande!"
-#: builtin/remote.c:1376
+#: builtin/remote.c:1382
#, c-format
msgid " %s has become dangling!"
msgstr " %s har blivit dinglande!"
-#: builtin/remote.c:1386
+#: builtin/remote.c:1392
#, c-format
msgid "Pruning %s"
msgstr "Rensar %s"
-#: builtin/remote.c:1387
+#: builtin/remote.c:1393
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1403
+#: builtin/remote.c:1409
#, c-format
msgid " * [would prune] %s"
msgstr " * [skulle rensa] %s"
-#: builtin/remote.c:1406
+#: builtin/remote.c:1412
#, c-format
msgid " * [pruned] %s"
msgstr " * [rensad] %s"
-#: builtin/remote.c:1451
+#: builtin/remote.c:1457
msgid "prune remotes after fetching"
msgstr "rensa fjärrar efter hämtning"
-#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636
+#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
#, c-format
msgid "No such remote '%s'"
msgstr "Ingen sådan fjärr \"%s\""
-#: builtin/remote.c:1530
+#: builtin/remote.c:1539
msgid "add branch"
msgstr "lägg till gren"
-#: builtin/remote.c:1537
+#: builtin/remote.c:1546
msgid "no remote specified"
msgstr "ingen fjärr angavs"
-#: builtin/remote.c:1554
+#: builtin/remote.c:1563
msgid "query push URLs rather than fetch URLs"
msgstr "fråga sänd-URL:er istället för hämta-URL:er"
-#: builtin/remote.c:1556
+#: builtin/remote.c:1565
msgid "return all URLs"
msgstr "returnera alla URL:er"
-#: builtin/remote.c:1584
+#: builtin/remote.c:1595
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "ingen URL:er angivna för fjärren \"%s\""
-#: builtin/remote.c:1610
+#: builtin/remote.c:1621
msgid "manipulate push URLs"
msgstr "manipulera URL:ar för sändning"
-#: builtin/remote.c:1612
+#: builtin/remote.c:1623
msgid "add URL"
msgstr "lägg till URL"
-#: builtin/remote.c:1614
+#: builtin/remote.c:1625
msgid "delete URLs"
msgstr "ta bort URL:ar"
-#: builtin/remote.c:1621
+#: builtin/remote.c:1632
msgid "--add --delete doesn't make sense"
msgstr "--add --delete ger ingen mening"
-#: builtin/remote.c:1660
+#: builtin/remote.c:1673
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Felaktig gammalt URL-mönster: %s"
-#: builtin/remote.c:1668
+#: builtin/remote.c:1681
#, c-format
msgid "No such URL found: %s"
msgstr "Ingen sådan URL hittades: %s"
-#: builtin/remote.c:1670
+#: builtin/remote.c:1683
msgid "Will not delete all non-push URLs"
msgstr "Kommer inte ta bort alla icke-sänd-URL:er"
-#: builtin/repack.c:23
+#: builtin/repack.c:26
msgid "git repack [<options>]"
msgstr "git repack [<flaggor>]"
-#: builtin/repack.c:28
+#: builtin/repack.c:31
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -19275,134 +20602,120 @@
"Använd --no-write-bitmap-index eller inaktivera inställningen\n"
"pack.writebitmaps"
-#: builtin/repack.c:191
+#: builtin/repack.c:198
msgid "could not start pack-objects to repack promisor objects"
msgstr "kunde inte starta pack-objects för att packa om kontraktsobjekt"
-#: builtin/repack.c:230 builtin/repack.c:416
+#: builtin/repack.c:270 builtin/repack.c:446
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."
-#: builtin/repack.c:254
+#: builtin/repack.c:294
msgid "could not finish pack-objects to repack promisor objects"
msgstr "kunde inte avsluta pack-objects för att packa om kontraktsobjekt"
-#: builtin/repack.c:292
+#: builtin/repack.c:322
msgid "pack everything in a single pack"
msgstr "packa allt i ett enda paket"
-#: builtin/repack.c:294
+#: builtin/repack.c:324
msgid "same as -a, and turn unreachable objects loose"
msgstr "samma som -a, och gör onåbara objekt lösa"
-#: builtin/repack.c:297
+#: builtin/repack.c:327
msgid "remove redundant packs, and run git-prune-packed"
msgstr "ta bort överflödiga paket, och kör git-prune-packed"
-#: builtin/repack.c:299
+#: builtin/repack.c:329
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "sänd --no-reuse-delta till git-pack-objects"
-#: builtin/repack.c:301
+#: builtin/repack.c:331
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "sänd --no-reuse-object till git-pack-objects"
-#: builtin/repack.c:303
+#: builtin/repack.c:333
msgid "do not run git-update-server-info"
msgstr "kör inte git-update-server-info"
-#: builtin/repack.c:306
+#: builtin/repack.c:336
msgid "pass --local to git-pack-objects"
msgstr "sänd --local till git-pack-objects"
-#: builtin/repack.c:308
+#: builtin/repack.c:338
msgid "write bitmap index"
msgstr "skriv bitkartindex"
-#: builtin/repack.c:310
+#: builtin/repack.c:340
msgid "pass --delta-islands to git-pack-objects"
msgstr "sänd --delta-islands till git-pack-objects"
-#: builtin/repack.c:311
+#: builtin/repack.c:341
msgid "approxidate"
msgstr "cirkadatum"
-#: builtin/repack.c:312
+#: builtin/repack.c:342
msgid "with -A, do not loosen objects older than this"
msgstr "med -A, lös inte upp objekt äldre än detta"
-#: builtin/repack.c:314
+#: builtin/repack.c:344
msgid "with -a, repack unreachable objects"
msgstr "med -a, packa om onåbara objekt"
-#: builtin/repack.c:316
+#: builtin/repack.c:346
msgid "size of the window used for delta compression"
msgstr "storlek på fönster använt för deltakomprimering"
-#: builtin/repack.c:317 builtin/repack.c:323
+#: builtin/repack.c:347 builtin/repack.c:353
msgid "bytes"
msgstr "byte"
-#: builtin/repack.c:318
+#: builtin/repack.c:348
msgid "same as the above, but limit memory size instead of entries count"
msgstr "samma som ovan, men begränsa minnesstorleken istället för postantal"
-#: builtin/repack.c:320
+#: builtin/repack.c:350
msgid "limits the maximum delta depth"
msgstr "begränsa maximalt deltadjup"
-#: builtin/repack.c:322
+#: builtin/repack.c:352
msgid "limits the maximum number of threads"
msgstr "begränsar maximalt antal trådar"
-#: builtin/repack.c:324
+#: builtin/repack.c:354
msgid "maximum size of each packfile"
msgstr "maximal storlek på varje paketfil"
-#: builtin/repack.c:326
+#: builtin/repack.c:356
msgid "repack objects in packs marked with .keep"
msgstr "packa om objekt i paket märkta med .keep"
-#: builtin/repack.c:328
+#: builtin/repack.c:358
msgid "do not repack this pack"
msgstr "packa inte om detta paket"
-#: builtin/repack.c:338
+#: builtin/repack.c:368
msgid "cannot delete packs in a precious-objects repo"
msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv"
-#: builtin/repack.c:342
+#: builtin/repack.c:372
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable och -A kan inte användas samtidigt"
-#: builtin/repack.c:425
+#: builtin/repack.c:455
msgid "Nothing new to pack."
msgstr "Inget nytt att packa."
-#: builtin/repack.c:486
+#: builtin/repack.c:485
#, 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 ""
-"VARNING: Namnen på några paket har bytts genom att\n"
-"VARNING: lägga till old- före namnen, för att byta\n"
-"VARNING: dem mot den nya versionen av filen. Men\n"
-"VARNING: operationen misslyckades, och försöket att\n"
-"VARNING: byta tillbaka till det ursprungliga\n"
-"VARNING: namnet misslyckades också.\n"
-"VARNING: Byt namn på dem i %s manuellt:\n"
+msgid "missing required file: %s"
+msgstr "nödvändig fil saknas: %s"
-#: builtin/repack.c:534
+#: builtin/repack.c:487
#, c-format
-msgid "failed to remove '%s'"
-msgstr "misslyckades ta bort \"%s\""
+msgid "could not unlink: %s"
+msgstr "kunde inte ta bort: \"%s\""
#: builtin/replace.c:22
msgid "git replace [-f] <object> <replacement>"
@@ -19709,92 +21022,92 @@
msgid "keep"
msgstr "behåll"
-#: builtin/reset.c:82
+#: builtin/reset.c:83
msgid "You do not have a valid HEAD."
msgstr "Du har inte en giltig HEAD."
-#: builtin/reset.c:84
+#: builtin/reset.c:85
msgid "Failed to find tree of HEAD."
msgstr "Kunde inte hitta trädet för HEAD."
-#: builtin/reset.c:90
+#: 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:115
+#: builtin/reset.c:116
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD är nu på %s"
-#: builtin/reset.c:194
+#: 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:294 builtin/stash.c:520 builtin/stash.c:595
-#: builtin/stash.c:619
+#: builtin/reset.c:295 builtin/stash.c:587 builtin/stash.c:661
+#: builtin/stash.c:685
msgid "be quiet, only report errors"
msgstr "var tyst, rapportera endast fel"
-#: builtin/reset.c:296
+#: builtin/reset.c:297
msgid "reset HEAD and index"
msgstr "återställ HEAD och index"
-#: builtin/reset.c:297
+#: builtin/reset.c:298
msgid "reset only HEAD"
msgstr "återställ endast HEAD"
-#: builtin/reset.c:299 builtin/reset.c:301
+#: 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:303
+#: builtin/reset.c:304
msgid "reset HEAD but keep local changes"
msgstr "återställ HEAD men behåll lokala ändringar"
-#: builtin/reset.c:309
+#: 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:343
+#: 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:351
+#: 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:360
+#: builtin/reset.c:361
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch är inkompatibel med --{hard,mixed,soft}"
-#: builtin/reset.c:370
+#: 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:372
+#: 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:387
+#: 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:391
+#: builtin/reset.c:392
msgid "-N can only be used with --mixed"
msgstr "-N kan endast användas med --mixed"
-#: builtin/reset.c:412
+#: builtin/reset.c:413
msgid "Unstaged changes after reset:"
msgstr "Oköade ändringar efter återställning:"
-#: builtin/reset.c:415
+#: builtin/reset.c:416
#, c-format
msgid ""
"\n"
@@ -19808,48 +21121,48 @@
"konfigurationsvariabeln\n"
"reset.quiet till true för att göra detta till förval.\n"
-#: builtin/reset.c:425
+#: 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:429
+#: builtin/reset.c:439
msgid "Could not write new index file."
msgstr "Kunde inte skriva ny indexfil."
-#: builtin/rev-list.c:499
+#: builtin/rev-list.c:534
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr "kan inte kombinera --exclude-promisor-objects och --missing"
-#: builtin/rev-list.c:560
+#: builtin/rev-list.c:595
msgid "object filtering requires --objects"
msgstr "objektfiltrering kräver --objects"
-#: builtin/rev-list.c:610
+#: builtin/rev-list.c:651
msgid "rev-list does not support display of notes"
msgstr "rev-list stöder inte visning av anteckningar"
-#: builtin/rev-list.c:615
+#: builtin/rev-list.c:656
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"
@@ -19942,11 +21255,11 @@
msgid "keep redundant, empty commits"
msgstr "behåll redundanta, tomma incheckningar"
-#: builtin/revert.c:232
+#: builtin/revert.c:239
msgid "revert failed"
msgstr "\"revert\" misslyckades"
-#: builtin/revert.c:245
+#: builtin/revert.c:252
msgid "cherry-pick failed"
msgstr "\"cherry-pick\" misslyckades"
@@ -20045,55 +21358,76 @@
"[<ref>...]\n"
" --all och explicit angiven <ref> är ömsesidigt uteslutande."
-#: builtin/send-pack.c:163
+#: builtin/send-pack.c:188
msgid "remote name"
msgstr "fjärrnamn"
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:201
msgid "use stateless RPC protocol"
msgstr "använd tillståndslöst RPC-protokoll"
-#: builtin/send-pack.c:178
+#: builtin/send-pack.c:202
msgid "read refs from stdin"
msgstr "läs referenser från standard in"
-#: builtin/send-pack.c:179
+#: builtin/send-pack.c:203
msgid "print status from remote helper"
msgstr "visa status från fjärrhjälpare"
-#: builtin/shortlog.c:14
+#: builtin/shortlog.c:16
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git shortlog [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]"
-#: builtin/shortlog.c:15
+#: builtin/shortlog.c:17
msgid "git log --pretty=short | git shortlog [<options>]"
msgstr "git log --pretty=short | git shortlog [<flaggor>]"
-#: builtin/shortlog.c:264
-msgid "Group by committer rather than author"
-msgstr "Gruppera efter incheckare istället för författare"
+#: builtin/shortlog.c:123
+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:266
+#: builtin/shortlog.c:133
+msgid "using --group=trailer with stdin is not supported"
+msgstr "att använda --group=trailer stöds inte med standard in"
+
+#: builtin/shortlog.c:323
+#, c-format
+msgid "unknown group type: %s"
+msgstr "okänd grupptyp: %s"
+
+#: builtin/shortlog.c:351
+msgid "group by committer rather than author"
+msgstr "gruppera efter incheckare istället för författare"
+
+#: builtin/shortlog.c:354
msgid "sort output according to the number of commits per author"
msgstr "sortera utdata enligt antal incheckningar per författare"
-#: builtin/shortlog.c:268
-msgid "Suppress commit descriptions, only provides commit count"
-msgstr "Undertryck beskrivningar, visa bara antal incheckningar"
+#: builtin/shortlog.c:356
+msgid "suppress commit descriptions, only provides commit count"
+msgstr "undertryck beskrivningar, visa bara antal incheckningar"
-#: builtin/shortlog.c:270
-msgid "Show the email address of each author"
-msgstr "Visa e-postadress för varje författare"
+#: builtin/shortlog.c:358
+msgid "show the email address of each author"
+msgstr "visa e-postadress för varje författare"
-#: builtin/shortlog.c:271
+#: builtin/shortlog.c:359
msgid "<w>[,<i1>[,<i2>]]"
msgstr "<w>[,<i1>[,<i2>]]"
-#: builtin/shortlog.c:272
-msgid "Linewrap output"
-msgstr "Radbryt utdata"
+#: builtin/shortlog.c:360
+msgid "linewrap output"
+msgstr "radbryt utdata"
-#: builtin/shortlog.c:301
+#: builtin/shortlog.c:362
+msgid "field"
+msgstr "föt"
+
+#: builtin/shortlog.c:363
+msgid "group by field"
+msgstr "gruppera efter fält"
+
+#: builtin/shortlog.c:391
msgid "too many arguments given outside repository"
msgstr "för många flaggor givna utanför arkivet"
@@ -20233,6 +21567,14 @@
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 | --"
@@ -20278,18 +21620,26 @@
msgstr "visa referenser från standard in som inte finns i lokalt arkiv"
#: builtin/sparse-checkout.c:21
-msgid "git sparse-checkout (init|list|set|add|disable) <options>"
-msgstr "git sparse-checkout (init|list|set|add|disable) <flaggor>"
+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:64
+#: builtin/sparse-checkout.c:45
+msgid "git sparse-checkout list"
+msgstr "git sparse-checkout list"
+
+#: builtin/sparse-checkout.c:71
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr ""
"arbetskatalogen är inte glest (sparse-checkout-filen kanske inte finns)"
-#: builtin/sparse-checkout.c:225
+#: builtin/sparse-checkout.c:223
msgid "failed to create directory for sparse-checkout file"
msgstr "misslyckades skapa katalog för \"sparse-checkout\"-filen"
+#: builtin/sparse-checkout.c:264
+msgid "unable to upgrade repository format to enable worktreeConfig"
+msgstr "kunde inte uppgradera arkivformat för att aktivera worktreeConfig"
+
#: builtin/sparse-checkout.c:266
msgid "failed to set extensions.worktreeConfig setting"
msgstr "misslyckades ändra inställningen extensions.worktreeConfig"
@@ -20302,46 +21652,42 @@
msgid "initialize the sparse-checkout in cone mode"
msgstr "initiera sparse-checkout i konläge"
-#: builtin/sparse-checkout.c:308
-msgid "initialize sparse-checkout"
-msgstr "initiera sparse-checkout"
-
-#: builtin/sparse-checkout.c:341
+#: builtin/sparse-checkout.c:339
#, c-format
msgid "failed to open '%s'"
msgstr "misslyckades öppna \"%s\""
-#: builtin/sparse-checkout.c:398
+#: builtin/sparse-checkout.c:396
#, c-format
msgid "could not normalize path %s"
msgstr "kunde inte normalisera sökvägen \"%s\""
-#: builtin/sparse-checkout.c:410
+#: builtin/sparse-checkout.c:408
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
msgstr "git sparse-checkout (set|add) (--stdin | <mönster>)"
-#: builtin/sparse-checkout.c:435
+#: builtin/sparse-checkout.c:433
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "kan inte ta bort citering av C-sträng \"%s\""
-#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513
+#: builtin/sparse-checkout.c:487 builtin/sparse-checkout.c:511
msgid "unable to load existing sparse-checkout patterns"
msgstr "kunde inte läsa in existerande mönster för gles utcheckning"
-#: builtin/sparse-checkout.c:558
+#: builtin/sparse-checkout.c:556
msgid "read patterns from standard in"
msgstr "läs mönster från standard in"
-#: builtin/sparse-checkout.c:564
-msgid "set sparse-checkout patterns"
-msgstr "ställ in filter för gles utcheckning"
+#: builtin/sparse-checkout.c:571
+msgid "git sparse-checkout reapply"
+msgstr "git sparse-checkout reapply"
-#: builtin/sparse-checkout.c:581
-msgid "disable sparse-checkout"
-msgstr "inaktivera gles utcheckning"
+#: builtin/sparse-checkout.c:590
+msgid "git sparse-checkout disable"
+msgstr "git sparse-checkout disable"
-#: builtin/sparse-checkout.c:593
+#: builtin/sparse-checkout.c:618
msgid "error while refreshing working directory"
msgstr "fel vid uppdatering av arbetskatalog"
@@ -20421,7 +21767,7 @@
msgid "Too many revisions specified:%s"
msgstr "För många revisioner angivna:%s"
-#: builtin/stash.c:162 git-legacy-stash.sh:549
+#: builtin/stash.c:162
msgid "No stash entries found."
msgstr "Inga \"stash\"-poster hittades."
@@ -20430,158 +21776,171 @@
msgid "%s is not a valid reference"
msgstr "%s är inte en giltigt referens"
-#: builtin/stash.c:225 git-legacy-stash.sh:75
-msgid "git stash clear with parameters is unimplemented"
-msgstr "\"git stash clear\" med parametrar har inte implementerats"
+#: builtin/stash.c:225
+msgid "git stash clear with arguments is unimplemented"
+msgstr "\"git stash clear\" med argument har inte implementerats"
-#: builtin/stash.c:404
+#: builtin/stash.c:429
+#, c-format
+msgid ""
+"WARNING: Untracked file in way of tracked file! Renaming\n"
+" %s -> %s\n"
+" to make room.\n"
+msgstr ""
+"VARNING: En ospårad fil är i vägen för en spårad fil! Byter namn\n"
+" %s -> %s\n"
+" för att lämna plats.\n"
+
+#: builtin/stash.c:490
msgid "cannot apply a stash in the middle of a merge"
msgstr "kan inte tillämpa en \"stash\" mitt i en sammanslagning"
-#: builtin/stash.c:415
+#: builtin/stash.c:501
#, c-format
msgid "could not generate diff %s^!."
msgstr "kunde inte skapa diff %s^!."
-#: builtin/stash.c:422
-msgid "conflicts in index.Try without --index."
+#: builtin/stash.c:508
+msgid "conflicts in index. Try without --index."
msgstr "konflikter i indexet. Testa utan --index."
-#: builtin/stash.c:428
+#: builtin/stash.c:514
msgid "could not save index tree"
msgstr "kunde inte spara indexträd"
-#: builtin/stash.c:437
+#: builtin/stash.c:523
msgid "could not restore untracked files from stash"
msgstr "kunde inte återställa ospårade filer från stash-post"
-#: builtin/stash.c:451
+#: builtin/stash.c:537
#, c-format
msgid "Merging %s with %s"
msgstr "Slår ihop %s med %s"
-#: builtin/stash.c:461 git-legacy-stash.sh:681
+#: builtin/stash.c:547
msgid "Index was not unstashed."
msgstr "Indexet har inte tagits upp ur \"stash\":en"
-#: builtin/stash.c:522 builtin/stash.c:621
+#: builtin/stash.c:589 builtin/stash.c:687
msgid "attempt to recreate the index"
msgstr "försök återskapa indexet"
-#: builtin/stash.c:555
+#: builtin/stash.c:633
#, c-format
msgid "Dropped %s (%s)"
msgstr "Kastade %s (%s)"
-#: builtin/stash.c:558
+#: builtin/stash.c:636
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s: Kunde inte kasta \"stash\"-post"
-#: builtin/stash.c:583
+#: builtin/stash.c:649
#, c-format
msgid "'%s' is not a stash reference"
msgstr "\"%s\" är inte en \"stash\"-referens"
-#: builtin/stash.c:633 git-legacy-stash.sh:695
+#: builtin/stash.c:699
msgid "The stash entry is kept in case you need it again."
msgstr "Stash-posten behålls ifall du behöver den igen."
-#: builtin/stash.c:656 git-legacy-stash.sh:713
+#: builtin/stash.c:722
msgid "No branch name specified"
msgstr "Inget grennamn angavs"
-#: builtin/stash.c:796 builtin/stash.c:833
+#: builtin/stash.c:866 builtin/stash.c:903
#, c-format
msgid "Cannot update %s with %s"
msgstr "Kan inte uppdatera %s med %s"
-#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
+#: builtin/stash.c:884 builtin/stash.c:1538 builtin/stash.c:1603
msgid "stash message"
msgstr "\"stash\"-meddelande"
-#: builtin/stash.c:824
+#: builtin/stash.c:894
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" kräver ett <incheckning>-argument"
-#: builtin/stash.c:1049 git-legacy-stash.sh:218
+#: builtin/stash.c:1109
msgid "No changes selected"
msgstr "Inga ändringar valda"
-#: builtin/stash.c:1149 git-legacy-stash.sh:150
+#: builtin/stash.c:1209
msgid "You do not have the initial commit yet"
msgstr "Du har inte den första incheckningen ännu"
-#: builtin/stash.c:1176 git-legacy-stash.sh:165
+#: builtin/stash.c:1236
msgid "Cannot save the current index state"
msgstr "Kan inte spara aktuellt tillstånd för indexet"
-#: builtin/stash.c:1185 git-legacy-stash.sh:180
+#: builtin/stash.c:1245
msgid "Cannot save the untracked files"
msgstr "Kan inte spara ospårade filer"
-#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201
-#: git-legacy-stash.sh:214
+#: builtin/stash.c:1256 builtin/stash.c:1265
msgid "Cannot save the current worktree state"
msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen"
-#: builtin/stash.c:1233 git-legacy-stash.sh:234
+#: builtin/stash.c:1293
msgid "Cannot record working tree state"
msgstr "Kan inte registrera tillstånd för arbetskatalog"
-#: builtin/stash.c:1282 git-legacy-stash.sh:338
+#: builtin/stash.c:1342
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "Kan inte använda --patch och --include-untracked eller --all samtidigt"
-#: builtin/stash.c:1298
+#: builtin/stash.c:1358
msgid "Did you forget to 'git add'?"
msgstr "Glömde du använda \"git add\"?"
-#: builtin/stash.c:1313 git-legacy-stash.sh:346
+#: builtin/stash.c:1373
msgid "No local changes to save"
msgstr "Inga lokala ändringar att spara"
-#: builtin/stash.c:1320 git-legacy-stash.sh:351
+#: builtin/stash.c:1380
msgid "Cannot initialize stash"
msgstr "Kan inte initiera \"stash\""
-#: builtin/stash.c:1335 git-legacy-stash.sh:355
+#: builtin/stash.c:1395
msgid "Cannot save the current status"
msgstr "Kan inte spara aktuell status"
-#: builtin/stash.c:1340
+#: builtin/stash.c:1400
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Sparade arbetskatalogen och indexstatus %s"
-#: builtin/stash.c:1430 git-legacy-stash.sh:385
+#: builtin/stash.c:1490
msgid "Cannot remove worktree changes"
msgstr "Kan inte ta bort ändringar i arbetskatalogen"
-#: builtin/stash.c:1469 builtin/stash.c:1534
+#: builtin/stash.c:1529 builtin/stash.c:1594
msgid "keep index"
msgstr "behåll indexet"
-#: builtin/stash.c:1471 builtin/stash.c:1536
+#: builtin/stash.c:1531 builtin/stash.c:1596
msgid "stash in patch mode"
msgstr "\"stash\" i \"patch\"-läge"
-#: builtin/stash.c:1472 builtin/stash.c:1537
+#: builtin/stash.c:1532 builtin/stash.c:1597
msgid "quiet mode"
msgstr "tyst läge"
-#: builtin/stash.c:1474 builtin/stash.c:1539
+#: builtin/stash.c:1534 builtin/stash.c:1599
msgid "include untracked files in stash"
msgstr "ta med ospårade filer i \"stash\""
-#: builtin/stash.c:1476 builtin/stash.c:1541
+#: builtin/stash.c:1536 builtin/stash.c:1601
msgid "include ignore files"
msgstr "ta med ignorerade filer"
-#: builtin/stash.c:1600
-#, c-format
-msgid "could not exec %s"
-msgstr "kunde inte köra %s"
+#: builtin/stash.c:1636
+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]"
@@ -20599,7 +21958,7 @@
msgid "prepend comment character and space to each line"
msgstr "lägg in kommentarstecken och blanksteg först på varje rad"
-#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999
+#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Förväntade fullt referensnamn, fick %s"
@@ -20613,7 +21972,7 @@
msgid "cannot strip one component off url '%s'"
msgstr "kan inte ta bort en komponent från url:en \"%s\""
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819
msgid "alternative anchor for relative paths"
msgstr "alternativa ankare för relativa sökvägar"
@@ -20621,8 +21980,8 @@
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]"
-#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c: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"
@@ -20653,12 +22012,13 @@
"."
#: 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"
+msgid "suppress output of entering each submodule command"
+msgstr "dölj utdata från för varje undermodulskommando som startas"
-#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063
-msgid "Recurse into nested submodules"
-msgstr "Rekursera in i nästlade undermoduler"
+#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888
+#: builtin/submodule--helper.c:1487
+msgid "recurse into nested submodules"
+msgstr "rekursera in i nästlade undermoduler"
#: builtin/submodule--helper.c:572
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
@@ -20673,102 +22033,155 @@
"kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sin eget "
"officiella uppström."
-#: builtin/submodule--helper.c:667
+#: 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:671
+#: 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:681
+#: 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:688
+#: 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:710
-msgid "Suppress output for initializing a submodule"
-msgstr "Dölj utdata från initiering av undermodul"
+#: 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:715
+#: 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:789 builtin/submodule--helper.c:924
+#: 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:837
+#: 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:864 builtin/submodule--helper.c:1033
+#: 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:888 builtin/submodule--helper.c:1199
-msgid "Suppress submodule status output"
-msgstr "Hindra statusutskrift för undermodul"
+#: 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:889
+#: builtin/submodule--helper.c:887
msgid ""
-"Use commit stored in the index instead of the one stored in the submodule "
+"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr ""
-"Visa incheckning från indexet istället för den som lagrats i undermodulens "
+"visa incheckning från indexet istället för den som lagrats i undermodulens "
"HEAD"
-#: builtin/submodule--helper.c:890
-msgid "recurse into nested submodules"
-msgstr "rekursera in i nästlade undermoduler"
-
-#: builtin/submodule--helper.c:895
+#: 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:919
+#: builtin/submodule--helper.c:917
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <sökväg>"
-#: builtin/submodule--helper.c:983
+#: 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:989
+#: 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:1003
+#: 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:1014
+#: 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:1061
-msgid "Suppress output of synchronizing submodule url"
-msgstr "Dölj utdata från synkroniering av undermodul-url"
+#: builtin/submodule--helper.c:1485
+msgid "suppress output of synchronizing submodule url"
+msgstr "dölj utdata från synkronisering av undermodul-url"
-#: builtin/submodule--helper.c:1068
+#: 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:1122
+#: builtin/submodule--helper.c:1546
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -20777,7 +22190,7 @@
"Undermodulsarbetskatalogen \"%s\" innehåller en .git-katalog (använd \"rm -rf"
"\" om du verkligen vill ta bort den och all dess historik)"
-#: builtin/submodule--helper.c:1134
+#: builtin/submodule--helper.c:1558
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -20786,46 +22199,46 @@
"Undermodulens arbetskatalog \"%s\" har lokala ändringar; \"-f\" kastar bort "
"dem"
-#: builtin/submodule--helper.c:1142
+#: builtin/submodule--helper.c:1566
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Rensade katalogen \"%s\"\n"
-#: builtin/submodule--helper.c:1144
+#: 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:1155
+#: 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:1171
+#: 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:1200
-msgid "Remove submodule working trees even if they contain local changes"
+#: 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"
+"ta bort undermodulers arbetskataloger även om de innehåller lokala ändringar"
-#: builtin/submodule--helper.c:1201
-msgid "Unregister all submodules"
-msgstr "Avregistrera alla undermoduler"
+#: builtin/submodule--helper.c:1625
+msgid "unregister all submodules"
+msgstr "avregistrera alla undermoduler"
-#: builtin/submodule--helper.c:1206
+#: 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:1220
+#: 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:1289
+#: 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"
@@ -20837,46 +22250,46 @@
"submodule.alternateErrorStrategy till \"info\" eller, likvärdigt, klona\n"
"med \"--reference-if-able\" istället för \"--reference\"."
-#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331
+#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "undermodulen \"%s\" kan inte lägga till suppleant: %s"
-#: builtin/submodule--helper.c:1367
+#: 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:1374
+#: 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:1398
+#: builtin/submodule--helper.c:1822
msgid "where the new submodule will be cloned to"
msgstr "var den nya undermodulen ska klonas till"
-#: builtin/submodule--helper.c:1401
+#: builtin/submodule--helper.c:1825
msgid "name of the new submodule"
msgstr "namn på den nya undermodulen"
-#: builtin/submodule--helper.c:1404
+#: builtin/submodule--helper.c:1828
msgid "url where to clone the submodule from"
msgstr "URL att klona undermodulen från"
-#: builtin/submodule--helper.c:1412
+#: builtin/submodule--helper.c:1836
msgid "depth for shallow clones"
msgstr "djup för grunda kloner"
-#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924
+#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348
msgid "force cloning progress"
msgstr "tvinga kloningsförlopp"
-#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926
+#: 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:1424
+#: builtin/submodule--helper.c:1848
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -20886,103 +22299,103 @@
"<arkiv>] [--name <namn>] [--depth <djup>] [--single-branch] --url <url> --"
"path <sökväg>"
-#: builtin/submodule--helper.c:1449
+#: 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:1460
+#: 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:1464
+#: builtin/submodule--helper.c:1888
#, c-format
msgid "directory not empty: '%s'"
msgstr "katalogen inte tom: \"%s\""
-#: builtin/submodule--helper.c:1476
+#: 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:1512
+#: 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:1516
+#: 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:1617
+#: 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:1621
+#: 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:1651
+#: builtin/submodule--helper.c:2075
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Hoppar över ej sammanslagen undermodul %s"
-#: builtin/submodule--helper.c:1680
+#: builtin/submodule--helper.c:2104
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Hoppar över undermodulen \"%s\""
-#: builtin/submodule--helper.c:1830
+#: 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:1841
+#: 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:1903 builtin/submodule--helper.c:2149
+#: 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:1906
+#: 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:1910
+#: builtin/submodule--helper.c:2334
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout eller none"
-#: builtin/submodule--helper.c:1916
-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: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:1919
+#: builtin/submodule--helper.c:2343
msgid "parallel jobs"
msgstr "parallella jobb"
-#: builtin/submodule--helper.c:1921
+#: builtin/submodule--helper.c:2345
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "om den första klonen ska följa rekommendation för grund kloning"
-#: builtin/submodule--helper.c:1922
+#: builtin/submodule--helper.c:2346
msgid "don't print cloning progress"
msgstr "skriv inte klonförlopp"
-#: builtin/submodule--helper.c:1933
+#: 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:1946
+#: builtin/submodule--helper.c:2370
msgid "bad value for update parameter"
msgstr "felaktigt värde för parametern update"
-#: builtin/submodule--helper.c:1994
+#: builtin/submodule--helper.c:2418
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -20991,50 +22404,84 @@
"Undermodulens (%s) gren inställd på att ärva gren från huvudprojektet, men "
"huvudprojektet är inte på någon gren"
-#: builtin/submodule--helper.c:2117
+#: builtin/submodule--helper.c: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:2150
+#: builtin/submodule--helper.c:2574
msgid "recurse into submodules"
msgstr "rekursera ner i undermoduler"
-#: builtin/submodule--helper.c:2156
+#: 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:2212
+#: 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:2215
+#: 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:2220
+#: builtin/submodule--helper.c:2644
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config <namn> [<värde>]"
-#: builtin/submodule--helper.c:2221
+#: builtin/submodule--helper.c:2645
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <namn>"
-#: builtin/submodule--helper.c:2222
+#: builtin/submodule--helper.c:2646
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2241 git-submodule.sh:174
+#: builtin/submodule--helper.c:2665 git-submodule.sh:150
#, sh-format
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "se till att .gitmodules finns i arbetskatalogen"
-#: builtin/submodule--helper.c:2291 git.c:433 git.c:684
+#: builtin/submodule--helper.c: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:441 git.c:714
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s stöder inte --super-prefix"
-#: builtin/submodule--helper.c:2297
+#: builtin/submodule--helper.c:2798
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper"
@@ -21060,11 +22507,11 @@
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:499
msgid "reason"
msgstr "skäl"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
msgid "reason of the update"
msgstr "skäl till uppdateringen"
@@ -21084,11 +22531,13 @@
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>..."
@@ -21099,12 +22548,12 @@
msgid "tag '%s' not found."
msgstr "taggen \"%s\" hittades inte."
-#: builtin/tag.c:105
+#: builtin/tag.c:124
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Tog bort tagg \"%s\" (var %s)\n"
-#: builtin/tag.c:135
+#: builtin/tag.c:159
#, c-format
msgid ""
"\n"
@@ -21117,7 +22566,7 @@
" %s\n"
"Rader som inleds med \"%c\" ignoreras.\n"
-#: builtin/tag.c:139
+#: builtin/tag.c:163
#, c-format
msgid ""
"\n"
@@ -21132,15 +22581,11 @@
"Rader som inleds med \"%c\" kommer behållas; du kan själv ta bort dem om\n"
"du vill.\n"
-#: builtin/tag.c:198
+#: builtin/tag.c:230
msgid "unable to sign the tag"
msgstr "kunde inte signera taggen"
-#: builtin/tag.c:200
-msgid "unable to write tag file"
-msgstr "kunde inte skriva tagg-filen"
-
-#: builtin/tag.c:216
+#: builtin/tag.c:248
#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
@@ -21153,138 +22598,134 @@
"\n"
"\tgit tag -f %s %s^{}"
-#: builtin/tag.c:232
+#: builtin/tag.c:264
msgid "bad object type."
msgstr "felaktig objekttyp."
-#: builtin/tag.c:284
+#: builtin/tag.c:317
msgid "no tag message?"
msgstr "inget taggmeddelande?"
-#: builtin/tag.c:291
+#: builtin/tag.c:324
#, 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:435
msgid "list tag names"
msgstr "lista taggnamn"
-#: builtin/tag.c:404
+#: builtin/tag.c:437
msgid "print <n> lines of each tag message"
msgstr "visa <n> rader från varje taggmeddelande"
-#: builtin/tag.c:406
+#: builtin/tag.c:439
msgid "delete tags"
msgstr "ta bort taggar"
-#: builtin/tag.c:407
+#: builtin/tag.c:440
msgid "verify tags"
msgstr "verifiera taggar"
-#: builtin/tag.c:409
+#: builtin/tag.c:442
msgid "Tag creation options"
msgstr "Alternativ för att skapa taggar"
-#: builtin/tag.c:411
+#: builtin/tag.c:444
msgid "annotated tag, needs a message"
msgstr "annoterad tagg, behöver meddelande"
-#: builtin/tag.c:413
+#: builtin/tag.c:446
msgid "tag message"
msgstr "taggmeddelande"
-#: builtin/tag.c:415
+#: builtin/tag.c:448
msgid "force edit of tag message"
msgstr "tvinga redigering av incheckningsmeddelande"
-#: builtin/tag.c:416
+#: builtin/tag.c:449
msgid "annotated and GPG-signed tag"
msgstr "annoterad och GPG-signerad tagg"
-#: builtin/tag.c:419
+#: builtin/tag.c:452
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:453
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:454 builtin/update-ref.c:505
msgid "create a reflog"
msgstr "skapa en reflog"
-#: builtin/tag.c:423
+#: builtin/tag.c:456
msgid "Tag listing options"
msgstr "Alternativ för listning av taggar"
-#: builtin/tag.c:424
+#: builtin/tag.c:457
msgid "show tag list in columns"
msgstr "lista taggar i spalter"
-#: builtin/tag.c:425 builtin/tag.c:427
+#: builtin/tag.c:458 builtin/tag.c:460
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:459 builtin/tag.c:461
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:462
msgid "print only tags that are merged"
msgstr "visa endast taggar som slagits samman"
-#: builtin/tag.c:430
+#: builtin/tag.c:463
msgid "print only tags that are not merged"
msgstr "visa endast taggar som ej slagits samman"
-#: builtin/tag.c:434
+#: builtin/tag.c:467
msgid "print only tags of the object"
msgstr "visa endast taggar för objektet"
-#: builtin/tag.c:482
+#: builtin/tag.c:515
msgid "--column and -n are incompatible"
msgstr "--column och -n är inkompatibla"
-#: builtin/tag.c:504
+#: builtin/tag.c:537
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:539
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:541
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:543
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:545
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:556
msgid "only one -F or -m option is allowed."
msgstr "endast en av flaggorna -F eller -m tillåts."
-#: builtin/tag.c:542
-msgid "too many params"
-msgstr "för många parametrar"
-
-#: builtin/tag.c:548
+#: builtin/tag.c:581
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "\"%s\" är inte ett giltigt taggnamn."
-#: builtin/tag.c:553
+#: builtin/tag.c:586
#, c-format
msgid "tag '%s' already exists"
msgstr "taggen \"%s\" finns redan"
-#: builtin/tag.c:584
+#: builtin/tag.c:617
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Uppdaterad tagg \"%s\" (var %s)\n"
@@ -21560,19 +23001,19 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<flaggor>] --stdin [-z]"
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:500
msgid "delete the reference"
msgstr "ta bort referensen"
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:502
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:503
msgid "stdin has NUL-terminated arguments"
msgstr "standard in har NUL-terminerade argument"
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:504
msgid "read updates from stdin"
msgstr "läs uppdateringar från standard in"
@@ -21616,15 +23057,15 @@
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"
@@ -21636,226 +23077,205 @@
msgid "print tag contents"
msgstr "visa innehåll för tag"
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<flaggor>] <sökväg> [<incheckning-igt>]"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree list [<options>]"
msgstr "git worktree list [<flaggor>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<flaggor>] <sökväg>"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <arbetskatalog> <ny-sökväg>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<flaggor>]"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<flaggor>] <arbetskatalog>"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <sökväg>"
-#: builtin/worktree.c:60 builtin/worktree.c:891
+#: builtin/worktree.c:61 builtin/worktree.c:933
#, c-format
msgid "failed to delete '%s'"
msgstr "misslyckades ta bort \"%s\""
-#: builtin/worktree.c:79
+#: builtin/worktree.c:74
#, c-format
-msgid "Removing worktrees/%s: not a valid directory"
-msgstr "Tar bort worktrees/%s: inte en giltig katalog"
+msgid "Removing %s/%s: %s"
+msgstr "Tar bort %s/%s: %s"
-#: builtin/worktree.c:85
-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
-msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte"
-
-#: builtin/worktree.c:90 builtin/worktree.c:99
-#, c-format
-msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
-msgstr "Tar bort worktrees/%s: kan inte läsa gitdir-filen (%s)"
-
-#: builtin/worktree.c:109
-#, 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>)"
-
-#: builtin/worktree.c:117
-#, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
-msgstr "Tar bort worktrees/%s: felaktig gitdir-fil"
-
-#: builtin/worktree.c:126
-#, c-format
-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
-msgstr "Tar bort worktrees/%s: gitdir-filen pekar på en ickeexisterande plats"
-
-#: builtin/worktree.c:165
+#: builtin/worktree.c:149
msgid "report pruned working trees"
msgstr "rapportera borttagna arbetskataloger"
-#: builtin/worktree.c:167
+#: builtin/worktree.c:151
msgid "expire working trees older than <time>"
msgstr "låt tid gå ut för arbetskataloger äldre än <tid>"
-#: builtin/worktree.c:234
+#: builtin/worktree.c:221
#, c-format
msgid "'%s' already exists"
msgstr "\"%s\" finns redan"
-#: builtin/worktree.c:244
+#: builtin/worktree.c:230
#, 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:249
+#: builtin/worktree.c:235
#, 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:251
+#: builtin/worktree.c:237
#, 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:301
+#: builtin/worktree.c:288
#, c-format
msgid "could not create directory of '%s'"
msgstr "kunde inte skapa katalogen \"%s\""
-#: builtin/worktree.c:432 builtin/worktree.c:438
+#: builtin/worktree.c:422 builtin/worktree.c:428
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Förbereder arbetskatalog (ny gren \"%s\")"
-#: builtin/worktree.c:434
+#: builtin/worktree.c:424
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "Förbereder arbetskatalog (återställer gren \"%s\"; var på %s)"
-#: builtin/worktree.c:443
+#: builtin/worktree.c:433
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Förbereder arbetskatalog (checkar ut \"%s\")"
-#: builtin/worktree.c:449
+#: builtin/worktree.c:439
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Förbereder arbetskatalog (frånkopplat HEAD %s)"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:480
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
"checka ut <gren> även om den redan är utcheckad i en annan arbetskatalog"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:483
msgid "create a new branch"
msgstr "skapa en ny gren"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:485
msgid "create or reset a branch"
msgstr "skapa eller återställ en gren"
-#: builtin/worktree.c:497
+#: builtin/worktree.c:487
msgid "populate the new working tree"
msgstr "befolka den nya arbetskatalogen"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:488
msgid "keep the new working tree locked"
msgstr "låt arbetskatalogen förbli låst"
-#: builtin/worktree.c:501
+#: builtin/worktree.c:491
msgid "set up tracking mode (see git-branch(1))"
msgstr "ställ in spårningsläge (se git-branch(1))"
-#: builtin/worktree.c:504
+#: builtin/worktree.c:494
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"
+msgstr "försök träffa namn på ny gren mot en fjärrspårande gren"
-#: builtin/worktree.c:512
+#: builtin/worktree.c:502
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B och --detach är ömsesidigt uteslutande"
-#: builtin/worktree.c:573
+#: builtin/worktree.c:563
msgid "--[no-]track can only be used if a new branch is created"
msgstr "--[no-]track kan endast användas när ny gran skapas"
-#: builtin/worktree.c:673
+#: builtin/worktree.c:680
+msgid "show extended annotations and reasons, if available"
+msgstr "visa utökade annoteringar och grunder, om tillgängliga"
+
+#: builtin/worktree.c:682
+msgid "add 'prunable' annotation to worktrees older than <time>"
+msgstr ""
+"lägg till \"prunable\"-annoteringar till arbetskataloger äldre än <tid>"
+
+#: builtin/worktree.c:691
+msgid "--verbose and --porcelain are mutually exclusive"
+msgstr "--verbose och --porcelain är ömsesidigt uteslutande"
+
+#: builtin/worktree.c:718
msgid "reason for locking"
msgstr "orsak till lås"
-#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
-#: builtin/worktree.c:919
+#: builtin/worktree.c:730 builtin/worktree.c:763 builtin/worktree.c:837
+#: builtin/worktree.c:961
#, c-format
msgid "'%s' is not a working tree"
msgstr "\"%s\" är inte en arbetskatalog"
-#: builtin/worktree.c:687 builtin/worktree.c:720
+#: builtin/worktree.c:732 builtin/worktree.c:765
msgid "The main working tree cannot be locked or unlocked"
msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp"
-#: builtin/worktree.c:692
+#: builtin/worktree.c:737
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "\"%s\" är redan låst, orsak: %s"
-#: builtin/worktree.c:694
+#: builtin/worktree.c:739
#, c-format
msgid "'%s' is already locked"
msgstr "\"%s\" är redan låst"
-#: builtin/worktree.c:722
+#: builtin/worktree.c:767
#, c-format
msgid "'%s' is not locked"
msgstr "\"%s\" är inte låst"
-#: builtin/worktree.c:763
+#: builtin/worktree.c:808
msgid "working trees containing submodules cannot be moved or removed"
msgstr "arbetskataloger med undermoduler kan inte flyttas eller tas bort"
-#: builtin/worktree.c:771
+#: builtin/worktree.c:816
msgid "force move even if worktree is dirty or locked"
msgstr "tvinga flyttning även om arbetskatalogen är smutsig eller låst"
-#: builtin/worktree.c:794 builtin/worktree.c:921
+#: builtin/worktree.c:839 builtin/worktree.c:963
#, c-format
msgid "'%s' is a main working tree"
msgstr "\"%s\" är inte en huvudarbetskatalog"
-#: builtin/worktree.c:799
+#: builtin/worktree.c:844
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "kunde inte lista ut målnamn från \"%s\""
-#: builtin/worktree.c:805
-#, c-format
-msgid "target '%s' already exists"
-msgstr "målet \"%s\" finns redan"
-
-#: builtin/worktree.c:813
+#: builtin/worktree.c:857
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -21864,7 +23284,7 @@
"kan inte flytta en låst arbetskatalog, orsak till lås: %s\n"
"använd \"move -f -f\" för att överstyra, eller lås upp först"
-#: builtin/worktree.c:815
+#: builtin/worktree.c:859
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -21872,38 +23292,38 @@
"kan inte flytta en låst arbetskatalog;\n"
"använd \"move -f -f\" för att överstyra, eller lås upp först"
-#: builtin/worktree.c:818
+#: builtin/worktree.c:862
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "kontroll misslyckades, kan inte flytta arbetskatalog: %s"
-#: builtin/worktree.c:823
+#: builtin/worktree.c:867
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "misslyckades flytta \"%s\" till \"%s\""
-#: builtin/worktree.c:871
+#: builtin/worktree.c:913
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "misslyckades köra \"git status\" på \"%s\""
-#: builtin/worktree.c:875
+#: builtin/worktree.c:917
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
"\"%s\" innehåller ändrade eller ospårade filer, använd --force för att ta "
"bort det"
-#: builtin/worktree.c:880
+#: builtin/worktree.c:922
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "misslyckades köra \"git status\" på \"%s\", kod %d"
-#: builtin/worktree.c:903
+#: builtin/worktree.c:945
msgid "force removal even if worktree is dirty or locked"
msgstr "tvinga ta bort även om arbetskatalogen är smutsig eller låst"
-#: builtin/worktree.c:926
+#: builtin/worktree.c:968
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -21912,7 +23332,7 @@
"kan inte ta bort en låst arbetskatalog, orsak till låset: %s\n"
"använd \"remove -f -f\" för att överstyra, eller lås upp först"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:970
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -21920,11 +23340,21 @@
"kan inte ta bort en låst arbetskatalog;\n"
"använd \"remove -f -f\" för att överstyra, eller lås upp först"
-#: builtin/worktree.c:931
+#: builtin/worktree.c:973
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "kontroll misslyckades, kan inte ta bort arbetskatalog: %s"
+#: builtin/worktree.c:997
+#, c-format
+msgid "repair: %s: %s"
+msgstr "reparera: %s: %s"
+
+#: builtin/worktree.c:1000
+#, 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>/]"
@@ -21941,44 +23371,38 @@
msgid "only useful for debugging"
msgstr "endast användbart vid felsökning"
-#: fast-import.c:3125
+#: http-fetch.c:118
#, c-format
-msgid "Expected 'mark' command, got %s"
-msgstr "Förväntade \"mark\"-kommando, fick %s"
-
-#: fast-import.c:3130
-#, c-format
-msgid "Expected 'to' command, got %s"
-msgstr "Förväntade \"to\"-kommando, fick %s"
-
-#: fast-import.c:3254
-#, c-format
-msgid "feature '%s' forbidden in input without --allow-unsafe-features"
-msgstr "funktionen \"%s\" förbjuden i indata utan --allow-unsafe-features"
-
-#: credential-cache--daemon.c:223
-#, c-format
-msgid ""
-"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:128
+msgid "not a git repository"
+msgstr "inte ett git-arkiv"
-#: t/helper/test-reach.c:152
+#: http-fetch.c:134
+msgid "--packfile requires --index-pack-args"
+msgstr "--packfile kräver --index-pack-args"
+
+#: http-fetch.c:143
+msgid "--index-pack-args can only be used with --packfile"
+msgstr "--index-pack-args kan endast användas med --packfile"
+
+#: t/helper/test-fast-rebase.c:141
+msgid "unhandled options"
+msgstr "flaggor som inte hanterats"
+
+#: t/helper/test-fast-rebase.c:146
+msgid "error preparing revisions"
+msgstr "fel när revisioner skulle förberedas"
+
+#: 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"
@@ -21990,13 +23414,14 @@
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"
" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
"bare]\n"
" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
" <command> [<args>]"
msgstr ""
"git [--version] [--help] [-C <sökväg>] [-c <namn>=<värde>]\n"
@@ -22005,9 +23430,10 @@
" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
"bare]\n"
" [--git-dir=<sökväg>] [--work-tree=<sökväg>] [--namespace=<namn>]\n"
+" [--super-prefix=<sökväg>] [--config-env=<namn>=<miljövar>]\n"
" <kommando> [<flaggor>]"
-#: git.c:34
+#: git.c:36
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"
@@ -22019,47 +23445,47 @@
"<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:188
#, c-format
msgid "no directory given for --git-dir\n"
msgstr "ingen katalog angavs för --git-dir\n"
-#: git.c:200
+#: git.c:202
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "ingen namnrymd angavs för --namespace\n"
-#: git.c:214
+#: git.c:216
#, c-format
msgid "no directory given for --work-tree\n"
msgstr "ingen katalog angavs för --work-tree\n"
-#: git.c:228
+#: git.c:230
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr "inget prefix angavs för --super-prefix\n"
-#: git.c:250
+#: git.c:252
#, c-format
msgid "-c expects a configuration string\n"
msgstr "-c förväntar en konfigurationssträng\n"
-#: git.c:288
+#: git.c:292
#, c-format
msgid "no directory given for -C\n"
msgstr "ingen katalog angavs för -C\n"
-#: git.c:314
+#: git.c:318
#, c-format
msgid "unknown option: %s\n"
msgstr "okänd flagga: %s\n"
-#: git.c:360
+#: git.c:367
#, c-format
msgid "while expanding alias '%s': '%s'"
msgstr "vid expandering av aliaset \"%s\": \"%s\""
-#: git.c:369
+#: git.c:376
#, c-format
msgid ""
"alias '%s' changes environment variables.\n"
@@ -22068,39 +23494,39 @@
"aliaset \"%s\" ändrar miljövariabler.\n"
"Du kan använda \"!git\" i aliaset för att göra det"
-#: git.c:376
+#: git.c:383
#, c-format
msgid "empty alias for %s"
msgstr "tomt alias för %s"
-#: git.c:379
+#: git.c:386
#, c-format
msgid "recursive alias: %s"
msgstr "rekursivt alias: %s"
-#: git.c:459
+#: git.c:468
msgid "write failure on standard output"
msgstr "skrivfel på standard ut"
-#: git.c:461
+#: git.c:470
msgid "unknown write failure on standard output"
msgstr "okänt skrivfel på standard ut"
-#: git.c:463
+#: git.c:472
msgid "close failed on standard output"
msgstr "stäng misslyckades på standard ut"
-#: git.c:793
+#: git.c:823
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "alias-slinga detekterades: expansionen av \"%s\" avslutas aldrig:%s"
-#: git.c:843
+#: git.c:873
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "kan inte hantera %s som inbyggd"
-#: git.c:856
+#: git.c:886
#, c-format
msgid ""
"usage: %s\n"
@@ -22109,54 +23535,54 @@
"användning: %s\n"
"\n"
-#: git.c:876
+#: git.c:906
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
"expandering av alias \"%s\" misslyckades; \"%s\" är inte ett git-kommando\n"
-#: git.c:888
+#: git.c:918
#, 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:1086
+#: 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:1093
+#: 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:1097
+#: 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:1966
+#: http.c:2025
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -22167,120 +23593,151 @@
" bad om: %s\n"
" omdirigering: %s"
-#: remote-curl.c:166
+#: remote-curl.c:183
#, c-format
msgid "invalid quoting in push-option value: '%s'"
msgstr "felaktig citering på värde för push-option: \"%s\""
-#: remote-curl.c:263
+#: remote-curl.c:307
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "%sinfo/refs inte giltig: är detta ett git-arkiv?"
-#: remote-curl.c:364
+#: remote-curl.c:408
msgid "invalid server response; expected service, got flush packet"
msgstr "ogiltigt svar från servern; förväntade tjänst, fick flush-paket"
-#: remote-curl.c:395
+#: remote-curl.c:439
#, c-format
msgid "invalid server response; got '%s'"
msgstr "ogiltigt svar från servern; fick \"%s\""
-#: remote-curl.c:455
+#: remote-curl.c:499
#, c-format
msgid "repository '%s' not found"
msgstr "arkivet \"%s\" hittades inte"
-#: remote-curl.c:459
+#: remote-curl.c:503
#, c-format
msgid "Authentication failed for '%s'"
msgstr "Autentisering misslyckades \"%s\""
-#: remote-curl.c:463
+#: remote-curl.c:507
#, c-format
msgid "unable to access '%s': %s"
msgstr "kan inte komma åt \"%s\": %s"
-#: remote-curl.c:469
+#: remote-curl.c:513
#, c-format
msgid "redirecting to %s"
msgstr "omdirigerar till %s"
-#: remote-curl.c:593
+#: remote-curl.c:642
msgid "shouldn't have EOF when not gentle on EOF"
msgstr "borde inte ha EOF när inte försiktig på EOF"
-#: remote-curl.c:673
+#: remote-curl.c:654
+msgid "remote server sent stateless separator"
+msgstr "fjärrservern sände tillståndslös avdelare"
+
+#: remote-curl.c:724
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr "kunde inte spola tillbaka rpc-postdata - försök öka http.postBuffer"
-#: remote-curl.c:733
+#: remote-curl.c:754
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr "remote-curl: felaktig radlängdstecken: %.4s"
+
+#: remote-curl.c:756
+msgid "remote-curl: unexpected response end packet"
+msgstr "remote-curl: oväntat svarsavslutningspaketet"
+
+#: remote-curl.c:832
#, c-format
msgid "RPC failed; %s"
msgstr "RPC misslyckades; %s"
-#: remote-curl.c:773
+#: remote-curl.c:872
msgid "cannot handle pushes this big"
msgstr "kan inte hantera så stora sändningar"
-#: remote-curl.c:888
+#: remote-curl.c:987
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr "kan inte packa upp anrop; zlib-deflate-fel %d"
-#: remote-curl.c:892
+#: remote-curl.c:991
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr "kan inte packa upp anrop; zlib-slutfel %d"
-#: remote-curl.c:1023
+#: remote-curl.c:1041
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr "%d byte av längd-huvudet togs emot"
+
+#: remote-curl.c:1043
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr "%d byte av kroppen väntas fortfarande"
+
+#: remote-curl.c:1132
msgid "dumb http transport does not support shallow capabilities"
msgstr "dum http-transport stöder inte grunda arkiv"
-#: remote-curl.c:1038
+#: remote-curl.c:1147
msgid "fetch failed."
msgstr "mottagning misslyckades."
-#: remote-curl.c:1086
+#: remote-curl.c:1193
msgid "cannot fetch by sha1 over smart http"
msgstr "kan inte hämta med sha1 över smart http"
-#: remote-curl.c:1130 remote-curl.c:1136
+#: remote-curl.c:1237 remote-curl.c:1243
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "protokollfel: förväntade sha/ref, fick \"%s\""
-#: remote-curl.c:1148 remote-curl.c:1263
+#: remote-curl.c:1255 remote-curl.c:1373
#, c-format
msgid "http transport does not support %s"
msgstr "http-transporten stöder inte %s"
-#: remote-curl.c:1184
+#: remote-curl.c:1291
msgid "git-http-push failed"
msgstr "git-http-push misslyckades"
-#: remote-curl.c:1369
+#: remote-curl.c:1479
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl: användning: git remote-curl <fjärr> [<url>]"
-#: remote-curl.c:1401
+#: remote-curl.c:1511
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl: fel vid läsning av kommandoström från git"
-#: remote-curl.c:1408
+#: remote-curl.c:1518
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl: försökte ta emot utan lokalt arkiv"
-#: remote-curl.c:1448
+#: remote-curl.c:1559
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl: okänt kommando \"%s\" från git"
-#: list-objects-filter-options.h:85
+#: 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:86
+#: list-objects-filter-options.h:92
msgid "object filtering"
msgstr "objektfiltrering"
@@ -22301,8 +23758,8 @@
msgstr "var mer tyst"
#: parse-options.h:317
-msgid "use <n> digits to display SHA-1s"
-msgstr "använd <n> siffror för att visa SHA-1:or"
+msgid "use <n> digits to display object names"
+msgstr "använd <n> siffror för att visa objektnamn"
#: parse-options.h:336
msgid "how to strip spaces and #comments from message"
@@ -22317,11 +23774,11 @@
"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:101
+#: ref-filter.h:99
msgid "key"
msgstr "nyckel"
-#: ref-filter.h:101
+#: ref-filter.h:99
msgid "field name to sort on"
msgstr "fältnamn att sortera på"
@@ -22329,14 +23786,6 @@
msgid "update the index with reused conflict resolution if possible"
msgstr "uppdatera indexet med återanvänd konfliktlösning om möjligt"
-#: wt-status.h:67
-msgid "HEAD detached at "
-msgstr "HEAD frånkopplad vid "
-
-#: wt-status.h:68
-msgid "HEAD detached from "
-msgstr "HEAD frånkopplad från "
-
#: command-list.h:50
msgid "Add file contents to the index"
msgstr "Lägg filinnehåll till indexet"
@@ -22374,678 +23823,657 @@
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 "Run a Git command on a list of repositories"
+msgstr "Kör ett Git-kommando på en lista över arkiv"
+
+#: command-list.h:100
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:101
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:102
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:103
msgid "Extract commit ID from an archive created using git-archive"
msgstr "Hämta inchecknings-id från ett arkiv skapat med git-archive"
-#: command-list.h:102
+#: command-list.h:104
msgid "Print lines matching a pattern"
msgstr "Visa rader som motsvarar mönster"
-#: command-list.h:103
+#: command-list.h:105
msgid "A portable graphical interface to Git"
msgstr "Ett portabelt grafiskt gränssnitt för Git"
-#: command-list.h:104
+#: command-list.h:106
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"
-#: command-list.h:105
+#: command-list.h:107
msgid "Display help information about Git"
msgstr "Visa hjälpinformation om Git"
-#: command-list.h:106
+#: command-list.h:108
msgid "Server side implementation of Git over HTTP"
msgstr "Serversideimplementation av Git över HTTP"
-#: command-list.h:107
+#: command-list.h:109
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:110
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:111
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:112
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:113
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:114
msgid "Instantly browse your working repository in gitweb"
msgstr "Omedelbart bläddra i din arbetskatalog med gitweb"
-#: command-list.h:113
+#: command-list.h:115
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:116
msgid "The Git repository browser"
msgstr "Bläddraren för Git-arkiv"
-#: command-list.h:115
+#: command-list.h:117
msgid "Show commit logs"
msgstr "Visa incheckningsloggar"
-#: command-list.h:116
+#: command-list.h:118
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:119
msgid "List references in a remote repository"
msgstr "Lista referenser i ett fjärrarkiv"
-#: command-list.h:118
+#: command-list.h:120
msgid "List the contents of a tree object"
msgstr "Visa innehållet i ett trädobjekt"
-#: command-list.h:119
+#: command-list.h:121
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:122
msgid "Simple UNIX mbox splitter program"
msgstr "Enkelt program för att dela en UNIX mbox"
-#: command-list.h:121
+#: command-list.h:123
+msgid "Run tasks to optimize Git repository data"
+msgstr "Utför uppgifter för att optimera Git-arkivdata"
+
+#: command-list.h:124
msgid "Join two or more development histories together"
msgstr "Slå ihop två eller flera utvecklingshistorier"
-#: command-list.h:122
+#: command-list.h:125
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:126
msgid "Run a three-way file merge"
msgstr "Kör en trevägs-filsammanslagning"
-#: command-list.h:124
+#: command-list.h:127
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:128
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:129
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:130
msgid "Show three-way merge without touching index"
msgstr "Visa trevägssammanslagning utan att röra indexet"
-#: command-list.h:128
+#: command-list.h:131
msgid "Write and verify multi-pack-indexes"
msgstr "Skriv och verifiera multi-pack-index"
-#: command-list.h:129
-msgid "Creates a tag object"
-msgstr "Skapar ett taggobjekt"
+#: command-list.h:132
+msgid "Creates a tag object with extra validation"
+msgstr "skapar ett taggobjekt med extra validering"
-#: command-list.h:130
+#: command-list.h:133
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:134
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:135
msgid "Find symbolic names for given revs"
msgstr "Hitta symboliska namn för givna referenser"
-#: command-list.h:133
+#: command-list.h:136
msgid "Add or inspect object notes"
msgstr "Lägg till eller inspektera objektanteckningar"
-#: command-list.h:134
+#: command-list.h:137
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:138
msgid "Create a packed archive of objects"
msgstr "Skapa ett packat arkiv med objekt"
-#: command-list.h:136
+#: command-list.h:139
msgid "Find redundant pack files"
msgstr "Hitta redundanta pack-filer"
-#: command-list.h:137
+#: command-list.h:140
msgid "Pack heads and tags for efficient repository access"
msgstr "Packa huvuden och taggar för effektiv arkivåtkomst"
-#: command-list.h:138
-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:172
+#: 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:173
+#: command-list.h:175
msgid "Add file contents to the staging area"
msgstr "Lägg filinnehållet till indexet"
-#: command-list.h:174
+#: command-list.h:176
msgid "Show the working tree status"
msgstr "Visa status för arbetskatalogen"
-#: command-list.h:175
+#: command-list.h:177
msgid "Remove unnecessary whitespace"
msgstr "Ta bort onödiga blanksteg"
-#: command-list.h:176
+#: command-list.h:178
msgid "Initialize, update or inspect submodules"
msgstr "Initiera, uppdatera eller inspektera undermoduler"
-#: command-list.h:177
+#: 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:178
+#: command-list.h:180
msgid "Switch branches"
msgstr "Byt gren"
-#: command-list.h:179
+#: command-list.h:181
msgid "Read, modify and delete symbolic refs"
msgstr "Läs, modifiera eller ta bort symbolisk referens"
-#: command-list.h:180
+#: 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:181
+#: 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:182
+#: command-list.h:184
msgid "Unpack objects from a packed archive"
msgstr "Packa upp objekt från ett pakat arkiv"
-#: command-list.h:183
+#: 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:184
+#: 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:185
+#: 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:186
+#: command-list.h:188
msgid "Send archive back to git-archive"
msgstr "Sänd arkivet tillbaka till git-archive"
-#: command-list.h:187
+#: 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:188
+#: command-list.h:190
msgid "Show a Git logical variable"
msgstr "Visa en logisk Git-variabel"
-#: command-list.h:189
+#: command-list.h:191
msgid "Check the GPG signature of commits"
msgstr "Kontrollera GPG-signaturer för incheckningar"
-#: command-list.h:190
+#: command-list.h:192
msgid "Validate packed Git archive files"
msgstr "Bekräfta packade Git-arkivfiler"
-#: command-list.h:191
+#: command-list.h:193
msgid "Check the GPG signature of tags"
msgstr "Kontrollera GPG-signaturer i taggar"
-#: command-list.h:192
+#: 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:193
+#: command-list.h:195
msgid "Show logs with difference each commit introduces"
msgstr "Visa loggar med differenser varje incheckning introducerar"
-#: command-list.h:194
+#: command-list.h:196
msgid "Manage multiple working trees"
msgstr "Hantera ytterligare arbetskataloger"
-#: command-list.h:195
+#: 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:196
+#: command-list.h:198
msgid "Defining attributes per path"
msgstr "Definierar attribut per sökväg"
-#: command-list.h:197
+#: command-list.h:199
msgid "Git command-line interface and conventions"
msgstr "Gits kommandoradsgränssnitt och -konventioner"
-#: command-list.h:198
+#: command-list.h:200
msgid "A Git core tutorial for developers"
msgstr "Grundläggande Git-handledning för utvecklare"
-#: command-list.h:199
+#: 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:200
+#: command-list.h:203
msgid "Tweaking diff output"
msgstr "Justrea diff-utdata"
-#: command-list.h:201
+#: 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:202
+#: 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:203
+#: command-list.h:207
msgid "Hooks used by Git"
msgstr "Krokar som används av Git"
-#: command-list.h:204
+#: command-list.h:208
msgid "Specifies intentionally untracked files to ignore"
msgstr "Ange avsiktligen ospårade filer att ignorera"
-#: command-list.h:205
+#: command-list.h:209
+msgid "Map author/committer names and/or E-Mail addresses"
+msgstr "Mappa författar-/incheckarnamn och/eller -e-postadresser"
+
+#: command-list.h:210
msgid "Defining submodule properties"
msgstr "Ange egenskaper för undermoduler"
-#: command-list.h:206
+#: command-list.h:211
msgid "Git namespaces"
msgstr "Git-namnrymder"
-#: command-list.h:207
+#: command-list.h:212
+msgid "Helper programs to interact with remote repositories"
+msgstr "Hjälpprogram för att interagera med fjärrarkiv"
+
+#: command-list.h:213
msgid "Git Repository Layout"
msgstr "Gits arkivlayout"
-#: command-list.h:208
+#: command-list.h:214
msgid "Specifying revisions and ranges for Git"
msgstr "Ange versioner och intervall i Git"
-#: command-list.h:209
+#: command-list.h:215
msgid "Mounting one repository inside another"
msgstr "Monterar ett arkiv inuti ett annat"
-#: command-list.h:210
+#: command-list.h:216
msgid "A tutorial introduction to Git: part two"
msgstr "Introduktion till Git: del två"
-#: command-list.h:211
+#: command-list.h:217
msgid "A tutorial introduction to Git"
msgstr "Introduktion till Git"
-#: command-list.h:212
+#: command-list.h:218
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
-#, sh-format
-msgid "Bad rev input: $arg"
-msgstr "Felaktig rev-indata: $arg"
-
-#: git-bisect.sh:121
-#, sh-format
-msgid "Bad rev input: $bisected_head"
-msgstr "Felaktig rev-indata: $bisected_head"
-
-#: git-bisect.sh:130
-#, sh-format
-msgid "Bad rev input: $rev"
-msgstr "Felaktig rev-indata: $rev"
-
-#: git-bisect.sh:139
-#, 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
-msgid "No logfile given"
-msgstr "Ingen loggfil angiven"
-
-#: git-bisect.sh:210
-#, sh-format
-msgid "cannot read $file for replaying"
-msgstr "kan inte läsa $file för uppspelning"
-
-#: git-bisect.sh:232
-msgid "?? what are you talking about?"
-msgstr "?? vad menar du?"
-
-#: git-bisect.sh:241
+#: git-bisect.sh:68
msgid "bisect run failed: no command provided."
msgstr "bisect-körning misslyckades: inget kommando gavs."
-#: git-bisect.sh:246
+#: git-bisect.sh:73
#, sh-format
msgid "running $command"
msgstr "kör $command"
-#: git-bisect.sh:253
+#: git-bisect.sh:80
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -23054,27 +24482,23 @@
"\"bisect\"-körningen misslyckades:\n"
"felkod $res från \"$command\" är < 0 eller >= 128"
-#: git-bisect.sh:279
+#: git-bisect.sh:105
msgid "bisect run cannot continue any more"
msgstr "\"bisect\"-körningen kan inte fortsätta längre"
-#: git-bisect.sh:285
+#: git-bisect.sh:111
#, sh-format
msgid ""
"bisect run failed:\n"
-"'bisect_state $state' exited with error code $res"
+"'bisect-state $state' exited with error code $res"
msgstr ""
"\"bisect\"-körningen misslyckades:\n"
-"\"bisect_state $state\" avslutades med felkoden $res"
+"\"bisect-state $state\" avslutades med felkoden $res"
-#: git-bisect.sh:292
+#: git-bisect.sh:118
msgid "bisect run success"
msgstr "\"bisect\"-körningen lyckades"
-#: git-bisect.sh:300
-msgid "We are not bisecting."
-msgstr "Vi utför ingen bisect för tillfället."
-
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
@@ -23115,128 +24539,46 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "Enkel sammanslagning misslyckades, försöker automatisk sammanslagning."
-#: git-legacy-stash.sh:221
-msgid "Cannot remove temporary index (can't happen)"
-msgstr "Kan inte ta bort temporärt index (kan inte inträffa)"
-
-#: git-legacy-stash.sh:272
-#, sh-format
-msgid "Cannot update $ref_stash with $w_commit"
-msgstr "Kan inte uppdatera $ref_stash med $w_commit"
-
-#: git-legacy-stash.sh:324
-#, sh-format
-msgid "error: unknown option for 'stash push': $option"
-msgstr "fel: okänd flagga för \"stash push\": $option"
-
-#: git-legacy-stash.sh:356
-#, sh-format
-msgid "Saved working directory and index state $stash_msg"
-msgstr "Sparade arbetskatalogen och indexstatus $stash_msg"
-
-#: git-legacy-stash.sh:536
-#, sh-format
-msgid "unknown option: $opt"
-msgstr "okänd flagga: $opt"
-
-#: git-legacy-stash.sh:556
-#, sh-format
-msgid "Too many revisions specified: $REV"
-msgstr "För många revisioner angivna: $REV"
-
-#: git-legacy-stash.sh:571
-#, sh-format
-msgid "$reference is not a valid reference"
-msgstr "$reference är inte en giltig referens"
-
-#: git-legacy-stash.sh:599
-#, sh-format
-msgid "'$args' is not a stash-like commit"
-msgstr "\"$args\" är inte en \"stash\"-liknande incheckning"
-
-#: git-legacy-stash.sh:610
-#, sh-format
-msgid "'$args' is not a stash reference"
-msgstr "\"$args\" är inte en \"stash\"-referens"
-
-#: git-legacy-stash.sh:618
-msgid "unable to refresh index"
-msgstr "kan inte uppdatera indexet"
-
-#: git-legacy-stash.sh:622
-msgid "Cannot apply a stash in the middle of a merge"
-msgstr "Kan inte tillämpa en \"stash\" mitt i en sammanslagning"
-
-#: git-legacy-stash.sh:630
-msgid "Conflicts in index. Try without --index."
-msgstr "Konflikter i indexet. Testa utan --index."
-
-#: git-legacy-stash.sh:632
-msgid "Could not save index tree"
-msgstr "Kunde inte spara indexträd"
-
-#: git-legacy-stash.sh:641
-msgid "Could not restore untracked files from stash entry"
-msgstr "Kunde inte återställa ospårade filer från stash-post"
-
-#: git-legacy-stash.sh:666
-msgid "Cannot unstage modified files"
-msgstr "Kan inte ta bort ändrade filer ur kön"
-
-#: git-legacy-stash.sh:704
-#, sh-format
-msgid "Dropped ${REV} ($s)"
-msgstr "Kastade ${REV} ($s)"
-
-#: git-legacy-stash.sh:705
-#, sh-format
-msgid "${REV}: Could not drop stash entry"
-msgstr "${REV}: Kunde inte kasta \"stash\"-post"
-
-#: git-legacy-stash.sh:792
-msgid "(To restore them type \"git stash apply\")"
-msgstr "(För att återställa dem, skriv \"git stash apply\")"
-
-#: git-submodule.sh:203
+#: git-submodule.sh:179
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr "Relativ sökväg kan endast användas från arbetskatalogens toppnivå"
-#: git-submodule.sh:213
+#: git-submodule.sh:189
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "arkiv-URL: \"$repo\" måste vara absolut eller börja med ./|../"
-#: git-submodule.sh:232
+#: git-submodule.sh:208
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "\"$sm_path\" finns redan i indexet"
-#: git-submodule.sh:235
+#: git-submodule.sh:211
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr "\"$sm_path\" finns redan i indexet och är inte en undermodul"
-#: git-submodule.sh:242
+#: git-submodule.sh:218
#, sh-format
msgid "'$sm_path' does not have a commit checked out"
msgstr "\"$sm_path\" har inte någon utcheckad incheckning"
-#: git-submodule.sh:273
+#: git-submodule.sh:249
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Lägger till befintligt arkiv i \"$sm_path\" i indexet"
-#: git-submodule.sh:275
+#: git-submodule.sh:251
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "\"$sm_path\" finns redan och är inte ett giltigt git-arkiv"
-#: git-submodule.sh:283
+#: git-submodule.sh:259
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr "En git-katalog för \"$sm_name\" hittades lokalt med fjärr(ar):"
-#: git-submodule.sh:285
+#: git-submodule.sh:261
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -23254,37 +24596,37 @@
"arkiv eller om du är osäker på vad det här betyder, välj ett annat namn med\n"
"flaggan \"--name\"."
-#: git-submodule.sh:291
+#: git-submodule.sh:267
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "Aktiverar lokal git-katalog för undermodulen \"$sm_name\" på nytt."
-#: git-submodule.sh:303
+#: git-submodule.sh:279
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Kan inte checka ut undermodulen \"$sm_path\""
-#: git-submodule.sh:308
+#: git-submodule.sh:284
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Misslyckades lägga till undermodulen \"$sm_path\""
-#: git-submodule.sh:317
+#: git-submodule.sh:293
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Misslyckades registrera undermodulen \"$sm_path\""
-#: git-submodule.sh:590
+#: git-submodule.sh:568
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "Kan inte hitta aktuell revision i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:600
+#: git-submodule.sh:578
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\""
-#: git-submodule.sh:605
+#: git-submodule.sh:583
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -23293,7 +24635,7 @@
"Kan inte hitta aktuell revision för ${remote_name}/${branch} i "
"undermodulsökvägen \"$sm_path\""
-#: git-submodule.sh:623
+#: git-submodule.sh:601
#, sh-format
msgid ""
"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
@@ -23302,7 +24644,7 @@
"Kan inte hämta i undermodulsökväg \"$displaypath\"; försökte hämta $sha1 "
"direkt:"
-#: git-submodule.sh:629
+#: git-submodule.sh:607
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -23311,83 +24653,52 @@
"Hämtade i undermodulssökvägen \"$displaypath\", men den innehöll inte $sha1. "
"Direkt hämtning av incheckningen misslyckades."
-#: git-submodule.sh:636
+#: git-submodule.sh:614
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:637
+#: git-submodule.sh:615
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\""
-#: git-submodule.sh:641
+#: git-submodule.sh:619
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:642
+#: git-submodule.sh:620
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\""
-#: git-submodule.sh:647
+#: git-submodule.sh:625
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:648
+#: git-submodule.sh:626
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\""
-#: git-submodule.sh:653
+#: git-submodule.sh:631
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"Misslyckades köra \"$command $sha1\" i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:654
+#: git-submodule.sh:632
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\""
-#: git-submodule.sh:685
+#: git-submodule.sh:663
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:896
-msgid "The --cached option cannot be used with the --files option"
-msgstr "Flaggan --cached kan inte användas med flaggan --files"
-
-#: git-submodule.sh:948
-#, sh-format
-msgid "unexpected mode $mod_dst"
-msgstr "oväntat läge $mod_dst"
-
-#: git-submodule.sh:968
-#, sh-format
-msgid " Warn: $display_name doesn't contain commit $sha1_src"
-msgstr " Varning: $display_name innehåller inte incheckningen $sha1_src"
-
-#: git-submodule.sh:971
-#, sh-format
-msgid " Warn: $display_name doesn't contain commit $sha1_dst"
-msgstr " Varning: $display_name innehåller inte incheckningen $sha1_dst"
-
-#: git-submodule.sh:974
-#, 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."
-msgstr "Se git-${cmd}(1) för detaljer."
-
#: git-rebase--preserve-merges.sh:109
msgid "Applied autostash."
msgstr "Tillämpade autostash."
@@ -23397,12 +24708,22 @@
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"
@@ -23443,7 +24764,7 @@
"\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"
@@ -23462,83 +24783,83 @@
"\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"
@@ -23552,31 +24873,31 @@
"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"
@@ -23587,7 +24908,7 @@
"\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"
@@ -23602,25 +24923,25 @@
"\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"
@@ -23651,11 +24972,11 @@
"\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."
@@ -23663,44 +24984,44 @@
"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:955
+#: 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: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 "Kunde inte initiera omskrivna incheckningar"
@@ -23770,14 +25091,14 @@
msgid "%12s %12s %s"
msgstr "%12s %12s %s"
-#: git-add--interactive.perl:634
+#: git-add--interactive.perl:632
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] "rörde %d sökväg\n"
msgstr[1] "rörde %d sökvägar\n"
-#: git-add--interactive.perl:1053
+#: git-add--interactive.perl:1056
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
@@ -23785,7 +25106,7 @@
"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
"köas omedelbart."
-#: git-add--interactive.perl:1056
+#: git-add--interactive.perl:1059
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
@@ -23793,7 +25114,7 @@
"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
"läggas till i \"stash\" omedelbart."
-#: git-add--interactive.perl:1059
+#: git-add--interactive.perl:1062
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
@@ -23801,8 +25122,8 @@
"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
"tas bort från kön omedelbart."
-#: git-add--interactive.perl:1062 git-add--interactive.perl:1071
-#: git-add--interactive.perl:1077
+#: git-add--interactive.perl:1065 git-add--interactive.perl:1074
+#: git-add--interactive.perl:1080
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
@@ -23810,8 +25131,8 @@
"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
"markeras för applicering omedelbart."
-#: git-add--interactive.perl:1065 git-add--interactive.perl:1068
-#: git-add--interactive.perl:1074
+#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
+#: git-add--interactive.perl:1077
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
@@ -23819,12 +25140,12 @@
"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
"markeras för kasta omedelbart."
-#: git-add--interactive.perl:1111
+#: git-add--interactive.perl:1114
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr "misslyckades öppna styckeredigeringsfil för skrivning: %s"
-#: git-add--interactive.perl:1118
+#: git-add--interactive.perl:1121
#, perl-format
msgid ""
"---\n"
@@ -23837,12 +25158,12 @@
"Ta bort \"%s\" rader genom att radera dem.\n"
"Rader som börjar med %s kommer att tas bort.\n"
-#: git-add--interactive.perl:1140
+#: git-add--interactive.perl:1143
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr "misslyckades öppna styckesredigeringsfil för läsning: %s"
-#: git-add--interactive.perl:1248
+#: git-add--interactive.perl:1251
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -23856,7 +25177,7 @@
"a - köa stycket och alla följande i filen\n"
"d - köa inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1254
+#: git-add--interactive.perl:1257
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -23870,7 +25191,7 @@
"a - \"stash\":a stycket och alla följande i filen\n"
"d - \"stash\":a inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1260
+#: git-add--interactive.perl:1263
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -23884,7 +25205,7 @@
"a - ta bort stycket och alla följande i filen från kön\n"
"d - ta inte bort stycket eller något av de följande i filen från kön"
-#: git-add--interactive.perl:1266
+#: git-add--interactive.perl:1269
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -23898,7 +25219,7 @@
"a - applicera stycket och alla följande i filen\n"
"d - applicera inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1272 git-add--interactive.perl:1290
+#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -23912,7 +25233,7 @@
"a - förkasta stycket och alla följande i filen\n"
"d - förkasta inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1278
+#: git-add--interactive.perl:1281
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -23926,7 +25247,7 @@
"a - förkasta stycket och alla följande i filen\n"
"d - förkasta inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1284
+#: git-add--interactive.perl:1287
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -23940,7 +25261,7 @@
"a - applicera stycket och alla följande i filen\n"
"d - applicera inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1296
+#: git-add--interactive.perl:1299
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -23954,7 +25275,7 @@
"a - applicera stycket och alla följande i filen\n"
"d - applicera inte stycket eller något av de följande i filen"
-#: git-add--interactive.perl:1311
+#: git-add--interactive.perl:1314
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -23976,85 +25297,90 @@
"e - redigera aktuellt stycke manuellt\n"
"? - visa hjälp\n"
-#: git-add--interactive.perl:1342
+#: git-add--interactive.perl:1345
msgid "The selected hunks do not apply to the index!\n"
msgstr "Markerade stycken kan inte appliceras på indexet!\n"
-#: git-add--interactive.perl:1357
+#: git-add--interactive.perl:1360
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "ignorerar ej sammanslagen: %s\n"
-#: git-add--interactive.perl:1468
+#: git-add--interactive.perl:1479
#, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr "Applicera ändrat läge på arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1469
+#: git-add--interactive.perl:1480
#, perl-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
msgstr "Applicera borttagning på arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1470
+#: git-add--interactive.perl:1481
+#, 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:1482
#, perl-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr "Applicera stycket på arbetskatalogen [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1570
+#: git-add--interactive.perl:1599
msgid "No other hunks to goto\n"
msgstr "Inga andra stycken att gå till\n"
-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1617
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Ogiltigt siffervärde: \"%s\"\n"
-#: git-add--interactive.perl:1593
+#: git-add--interactive.perl:1622
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "Beklagar, det finns bara %d stycke.\n"
msgstr[1] "Beklagar, det finns bara %d stycken.\n"
-#: git-add--interactive.perl:1619
+#: git-add--interactive.perl:1657
msgid "No other hunks to search\n"
msgstr "Inga andra stycken att söka efter\n"
-#: git-add--interactive.perl:1636
+#: git-add--interactive.perl:1674
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Felaktigt format på reguljärt sökuttryck %s: %s\n"
-#: git-add--interactive.perl:1646
+#: git-add--interactive.perl:1684
msgid "No hunk matches the given pattern\n"
msgstr "Inga stycken motsvarar givet mönster\n"
-#: git-add--interactive.perl:1658 git-add--interactive.perl:1680
+#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
msgid "No previous hunk\n"
msgstr "Inget föregående stycke\n"
-#: git-add--interactive.perl:1667 git-add--interactive.perl:1686
+#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
msgid "No next hunk\n"
msgstr "Inget följande stycke\n"
-#: git-add--interactive.perl:1692
+#: git-add--interactive.perl:1730
msgid "Sorry, cannot split this hunk\n"
msgstr "Beklagar, kan inte dela stycket\n"
-#: git-add--interactive.perl:1698
+#: git-add--interactive.perl:1736
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "Dela i %d stycke.\n"
msgstr[1] "Dela i %d stycken.\n"
-#: git-add--interactive.perl:1708
+#: git-add--interactive.perl:1746
msgid "Sorry, cannot edit this hunk\n"
msgstr "Beklagar, kan inte redigera stycket\n"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1773
+#: git-add--interactive.perl:1811
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
@@ -24071,19 +25397,19 @@
"diff - visa diff mellan HEAD och index\n"
"add untracked - lägg till innehåll i ospårade filer till köade ändringar\n"
-#: git-add--interactive.perl:1790 git-add--interactive.perl:1795
-#: git-add--interactive.perl:1798 git-add--interactive.perl:1805
-#: git-add--interactive.perl:1808 git-add--interactive.perl:1815
-#: git-add--interactive.perl:1819 git-add--interactive.perl:1825
+#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
+#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
+#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
+#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
msgid "missing --"
msgstr "saknad --"
-#: git-add--interactive.perl:1821
+#: git-add--interactive.perl:1866
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "okänt läge för --patch: %s"
-#: git-add--interactive.perl:1827 git-add--interactive.perl:1833
+#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "felaktigt argument %s, förväntar --"
@@ -24100,27 +25426,39 @@
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"
@@ -24128,37 +25466,37 @@
"\"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"
@@ -24173,12 +25511,12 @@
" * 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"
@@ -24187,7 +25525,7 @@
"ö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"
@@ -24197,17 +25535,17 @@
"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"
@@ -24221,38 +25559,38 @@
"\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 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"
@@ -24265,21 +25603,21 @@
"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 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"
@@ -24287,16 +25625,16 @@
#. 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"
@@ -24323,124 +25661,124 @@
#. 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 ""
@@ -24448,11 +25786,421 @@
"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 "repository contains replace objects; skipping commit-graph"
+#~ msgstr "arkivet innehåller replace-objekt; hoppar över incheckningsgraf"
+
+#~ msgid "repository contains (deprecated) grafts; skipping commit-graph"
+#~ msgstr ""
+#~ "arkivet innehåller ympningar (avråds från); hoppar över incheckningsgraf"
+
+#~ msgid "repository is shallow; skipping commit-graph"
+#~ msgstr "källarkivet är grunt; hoppar över incheckningsgraf"
+
+#~ msgid "commit-graph improper chunk offset %08x%08x"
+#~ msgstr "felaktigt offset för stycke %08x%08x i incheckningsgraffilen"
+
+#~ msgid "commit-graph chunk id %08x appears multiple times"
+#~ msgstr "incheckningsgrafens stycke-id %08x förekommer flera gånger"
+
+#~ msgid "invalid chunk offset (too large)"
+#~ msgstr "felaktigt offset för stycke (för stort)"
+
+#~ msgid "Writing chunks to multi-pack-index"
+#~ msgstr "Skriver stycken till multi-pack-index"
+
+#~ msgid "rev-list died"
+#~ msgstr "rev-list dog"
+
+#~ msgid ""
+#~ "git bisect--helper --bisect-write [--no-log] <state> <revision> "
+#~ "<good_term> <bad_term>"
+#~ msgstr ""
+#~ "git bisect--helper --bisect-write [--no-log] <tillstånd> <revision> <term-"
+#~ "för-rätt> <term-för-fel>"
+
+#~ msgid ""
+#~ "git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
+#~ "<bad_term>"
+#~ msgstr ""
+#~ "git bisect--helper --bisect-check-and-set-terms <kommadno> <term-för-"
+#~ "rätt> <term-för-fel>"
+
+#~ msgid "git bisect--helper --bisect-auto-next"
+#~ msgstr "git bisect--helper --bisect-auto-next"
+
+#~ msgid "write out the bisection state in BISECT_LOG"
+#~ msgstr "skriver bisect-tillståndet i BISECT_LOG"
+
+#~ msgid "check and set terms in a bisection state"
+#~ msgstr "visa och ange termer för bisect-tillstånd"
+
+#~ 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"
+
+#~ msgid "--bisect-write requires either 4 or 5 arguments"
+#~ msgstr "--bisect-write kräver antingen 4 eller 5 argument"
+
+#~ msgid "--check-and-set-terms requires 3 arguments"
+#~ msgstr "--check-and-set-terms kräver tre argument"
+
+#~ msgid "--bisect-auto-next requires 0 arguments"
+#~ msgstr "--bisect-auto-next kräver 0 argument"
+
+#~ msgid "Force progress reporting"
+#~ msgstr "Tvinga förloppsrapportering"
+
+#~ msgid "Error deleting remote-tracking branch '%s'"
+#~ msgstr "Fel vid borttagning av fjärrspårande grenen \"%s\""
+
+#~ msgid "Error deleting branch '%s'"
+#~ msgstr "Fel vid borttagning av grenen \"%s\""
+
+#~ msgid "show parse tree for grep expression"
+#~ msgstr "visa analysträd för grep-uttryck"
+
+#~ msgid "too many parameters"
+#~ msgstr "för många parametrar"
+
+#~ msgid "too few parameters"
+#~ msgstr "för få parametrar"
+
+#~ msgid "Recurse into nested submodules"
+#~ msgstr "Rekursera in i nästlade undermoduler"
+
+#~ msgid "too many params"
+#~ msgstr "för många parametrar"
+
+#~ msgid "Bad rev input: $arg"
+#~ msgstr "Felaktig rev-indata: $arg"
+
+#~ msgid "Counting distinct commits in commit graph"
+#~ msgstr "Räknar olika incheckningar i incheckningsgraf"
+
+#~ msgid "the commit graph format cannot write %d commits"
+#~ msgstr "formatet på incheckningsgrafen kan inte visa %d incheckningar"
+
+#~ msgid "store only"
+#~ msgstr "endast spara"
+
+#~ msgid "compress faster"
+#~ msgstr "komprimera snabbare"
+
+#~ msgid "compress better"
+#~ msgstr "komprimera bättre"
+
+#~ msgid "unexpected duplicate commit id %s"
+#~ msgstr "oväntat duplicerat inchecknings-id %s"
+
+#~ msgid "error preparing packfile from multi-pack-index"
+#~ msgstr "fel när paketfiler från multi-pack-index skulle förberedas"
+
+#~ msgid "%s: not a valid OID"
+#~ msgstr "%s: inte ett giltigt OID"
+
+#~ msgid "invalid committer '%s'"
+#~ msgstr "ogiltig incheckare %s"
+
+#~ msgid "invalid committer: %s"
+#~ msgstr "ogiltig incheckare: %s"
+
+#~ msgid "git bisect--helper --next-all"
+#~ msgstr "git bisect--helper --next-all"
+
+#~ 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>"
+
+#~ msgid "git bisect--helper --bisect-autostart"
+#~ msgstr "git bisect--helper --bisect-autostart"
+
+#~ msgid "perform 'git bisect next'"
+#~ msgstr "utför 'git bisect next'"
+
+#~ msgid "write the terms to .git/BISECT_TERMS"
+#~ msgstr "skriv termerna i .git/BISECT_TERMS"
+
+#~ msgid "cleanup the bisection state"
+#~ msgstr "städar upp bisect-tillstånd"
+
+#~ msgid "check for expected revs"
+#~ msgstr "kontrollera för förväntade versioner"
+
+#~ msgid "start the bisection if it has not yet been started"
+#~ msgstr "påbörja bisect om det inte redan har startats"
+
+#~ msgid "--write-terms requires two arguments"
+#~ msgstr "--write-terms kräver två argument"
+
+#~ msgid "--bisect-clean-state requires no arguments"
+#~ msgstr "--bisect-clean-state tar inga argument"
+
+#~ msgid "--bisect-autostart does not accept arguments"
+#~ msgstr "--bisect-autostart tar inga argument"
+
+#~ msgid "n,m"
+#~ msgstr "n,m"
+
+#~ msgid "Process line range n,m in file, counting from 1"
+#~ msgstr "Behandla radintervallet n,m i filen, med början på 1"
+
+#~ msgid "name of output directory is too long"
+#~ msgstr "namnet på utdatakatalogen är för långt"
+
+#~ msgid "standard output, or directory, which one?"
+#~ msgstr "standard ut, eller katalog, vilken ska det vara?"
+
+#~ 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 ""
+#~ "VARNING: Namnen på några paket har bytts genom att\n"
+#~ "VARNING: lägga till old- före namnen, för att byta\n"
+#~ "VARNING: dem mot den nya versionen av filen. Men\n"
+#~ "VARNING: operationen misslyckades, och försöket att\n"
+#~ "VARNING: byta tillbaka till det ursprungliga\n"
+#~ "VARNING: namnet misslyckades också.\n"
+#~ "VARNING: Byt namn på dem i %s manuellt:\n"
+
+#~ msgid "failed to remove '%s'"
+#~ msgstr "misslyckades ta bort \"%s\""
+
+#~ 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"
+
+#~ msgid "Bad rev input: $bisected_head"
+#~ msgstr "Felaktig rev-indata: $bisected_head"
+
+#~ msgid "Bad rev input: $rev"
+#~ msgstr "Felaktig rev-indata: $rev"
+
+#~ msgid "See git-${cmd}(1) for details."
+#~ msgstr "Se git-${cmd}(1) för detaljer."
+
+#~ 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}"
@@ -24491,9 +26239,6 @@
#~ msgid "malformed ident line"
#~ msgstr "felaktig ident-rad"
-#~ msgid "corrupted author without date information"
-#~ msgstr "trasig författare utan datuminformation"
-
#~ msgid "could not parse '%.*s'"
#~ msgstr "kunde inte tolka \"%.*s\""
@@ -24524,18 +26269,6 @@
#~ msgid "no HEAD?"
#~ msgstr "inget HEAD?"
-#~ msgid "make committer date match author date"
-#~ msgstr "sätt incheckningsdatum till författardatum"
-
-#~ msgid "ignore author date and use current date"
-#~ msgstr "ignorera författardatum och använd nuvarande"
-
-#~ msgid "synonym of --reset-author-date"
-#~ msgstr "synonym för --reset-author-date"
-
-#~ msgid "ignore changes in whitespace"
-#~ msgstr "ignorera ändringar i blanksteg"
-
#~ msgid "preserve empty commits during rebase"
#~ msgstr "behåll tomma incheckningar under ombasering"
@@ -24551,9 +26284,6 @@
#~ "$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"
@@ -24656,12 +26386,6 @@
#~ msgid "Server supports ofs-delta"
#~ msgstr "Servern stöder \"ofs-delta\""
-#~ msgid "(HEAD detached at %s)"
-#~ msgstr "(HEAD frånkopplat vid %s)"
-
-#~ msgid "(HEAD detached from %s)"
-#~ msgstr "(HEAD frånkopplat från %s)"
-
#~ msgid "Checking out files"
#~ msgstr "Checkar ut filer"
@@ -24690,9 +26414,6 @@
#~ 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"
@@ -24855,9 +26576,6 @@
#~ 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"
@@ -24923,7 +26641,7 @@
#~ "\t%.*s"
#~ msgid "BUG: returned path string doesn't match cwd?"
-#~ msgstr "BUG: returnerad sökvägssträng matchar inte cwd?"
+#~ msgstr "BUG: returnerad sökvägssträng motsvarar inte cwd?"
#~ msgid "Error in object"
#~ msgstr "Fel i objekt"
@@ -24993,11 +26711,6 @@
#~ 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. %"
@@ -25191,9 +26904,6 @@
#~ 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"
@@ -25386,9 +27096,6 @@
#~ msgid "removing '%s' failed"
#~ msgstr "misslyckades ta bort \"%s\""
-#~ msgid "Please call 'bisect_state' with at least one argument."
-#~ msgstr "Anropa \"bisect_state\" med minst ett argument."
-
#~ msgid ""
#~ "If you want to reuse this local git directory instead of cloning again "
#~ "from"
@@ -25540,9 +27247,6 @@
#~ 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"
@@ -25886,15 +27590,9 @@
#~ msgid "--detach cannot be used with -b/-B/--orphan"
#~ msgstr "--detcah kan inte användas med -b/-B/--orphan"
-#~ msgid "--detach cannot be used with -t"
-#~ msgstr "--detach kan inte användas med -t"
-
#~ msgid "--orphan and -b|-B are mutually exclusive"
#~ msgstr "--orphan och -b|-B kan inte användas samtidigt"
-#~ msgid "--orphan cannot be used with -t"
-#~ msgstr "--orphan kan inte användas med -t"
-
#~ msgid "git checkout: -f and -m are incompatible"
#~ msgstr "git checkout: -f och -m är inkompatibla"
diff --git a/po/tr.po b/po/tr.po
index 1748297..388258f 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,8 +1,8 @@
# Turkish translations for Git
# Git Türkçe çevirileri
-# Copyright (C) 2020 Emir SARI <bitigchi@me.com>
+# Copyright (C) 2020-2021 Emir SARI <bitigchi@me.com>
# This file is distributed under the same license as the Git package.
-# Emir SARI <bitigchi@me.com>, 2020
+# Emir SARI <bitigchi@me.com>, 2020-2021
#
# ######################################################### #
# Git Türkçe kavramlar dizini / Git Turkish Glossary #
@@ -11,15 +11,16 @@
# ––––––––––––––––––––––––––––––––––––––––––––––––––––––––––#
# 3-way merge | 3 yönlü birleştirme #
# bare repository | çıplak depo #
+# blame | genel bakış
# blob object | ikili nesne #
# branch | dal #
# bundle | demet #
# checkout | çıkış yapım/yapmak #
# chunk | iri parça #
# clone | klon(lamak) #
-# commit (ad) | gönderi #
-# commit (eyl.) | göndermek #
-# commitish | gönderimsi #
+# commit (ad) | işleme #
+# commit (eyl.) | işlemek #
+# commitish | işlememsi #
# conflict | çakışma #
# dangling object | sallanan nesne #
# detached HEAD | ayrık HEAD #
@@ -67,7 +68,7 @@
# sparse-checkout | aralıklı çıkış #
# squash | tıkıştır(mak) #
# stage | hazırla(mak) #
-# staging area | (gönderi) hazırlama alanı #
+# staging area | (işleme) hazırlama alanı #
# stash | zula(lamak) #
# string | dizi #
# subdirectory | altdizin #
@@ -89,8 +90,8 @@
msgstr ""
"Project-Id-Version: Git Turkish Localization Project\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2020-03-11 15:26+0800\n"
-"PO-Revision-Date: 2020-03-10 23:00+0300\n"
+"POT-Creation-Date: 2021-03-04 22:41+0800\n"
+"PO-Revision-Date: 2020-02/27 16:00+0300\n"
"Last-Translator: Emir SARI <bitigchi@me.com>\n"
"Language-Team: Turkish (https://github.com/bitigchi/git-po/)\n"
"Language: tr\n"
@@ -99,232 +100,237 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: add-interactive.c:368
+#: add-interactive.c:376
#, c-format
msgid "Huh (%s)?"
msgstr "Pardon (%s)?"
-#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124
-#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687
-#: builtin/rebase.c:2086 builtin/rebase.c:2130
+#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292
+#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538
+#: builtin/rebase.c:1963
msgid "could not read index"
msgstr "indeks okunamadı"
-#: add-interactive.c:576 git-add--interactive.perl:269
+#: add-interactive.c:584 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "ikili"
-#: add-interactive.c:634 git-add--interactive.perl:278
+#: add-interactive.c:642 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
+#: add-interactive.c:643 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
+#: add-interactive.c:680 git-add--interactive.perl:641
msgid "Update"
msgstr "Güncelle"
-#: add-interactive.c:689 add-interactive.c:877
+#: add-interactive.c:697 add-interactive.c:885
#, c-format
msgid "could not stage '%s'"
msgstr "'%s' hazırlanamadı"
-#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317
-#: builtin/rebase.c:899
+#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486
msgid "could not write index"
msgstr "indeks yazılamadı"
-#: add-interactive.c:698 git-add--interactive.perl:628
+#: add-interactive.c:706 git-add--interactive.perl:626
#, 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
+#: add-interactive.c:724 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "not: %s artık izlenmiyor.\n"
-#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281
-#: builtin/reset.c:144
+#: add-interactive.c:729 apply.c:4125 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
+#: add-interactive.c:759 git-add--interactive.perl:653
msgid "Revert"
msgstr "Geri al"
-#: add-interactive.c:767
+#: add-interactive.c:775
msgid "Could not parse HEAD^{tree}"
msgstr "HEAD^{tree} ayrıştırılamadı"
-#: add-interactive.c:805 git-add--interactive.perl:631
+#: add-interactive.c:813 git-add--interactive.perl:629
#, 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
+#: add-interactive.c:864 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr "İzlenmeyen dosya yok.\n"
-#: add-interactive.c:860 git-add--interactive.perl:689
+#: add-interactive.c:868 git-add--interactive.perl:687
msgid "Add untracked"
msgstr "İzlenmeyenleri ekle"
-#: add-interactive.c:887 git-add--interactive.perl:625
+#: add-interactive.c:895 git-add--interactive.perl:623
#, 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
+#: add-interactive.c:925
#, c-format
msgid "ignoring unmerged: %s"
msgstr "birleştirilmeyenler yok sayılıyor: %s"
-#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366
+#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369
#, c-format
msgid "Only binary files changed.\n"
msgstr "Yalnızca ikili dosyalar değiştirildi.\n"
-#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368
+#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371
#, c-format
msgid "No changes.\n"
msgstr "Değişiklik yok.\n"
-#: add-interactive.c:935 git-add--interactive.perl:1376
+#: add-interactive.c:943 git-add--interactive.perl:1379
msgid "Patch update"
msgstr "Yama güncellemesi"
-#: add-interactive.c:974 git-add--interactive.perl:1754
+#: add-interactive.c:982 git-add--interactive.perl:1792
msgid "Review diff"
msgstr "diff'i gözden geçir"
-#: add-interactive.c:1002
+#: add-interactive.c:1010
msgid "show paths with changes"
msgstr "değiştirilmiş yolları göster"
-#: add-interactive.c:1004
+#: add-interactive.c:1012
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
+#: add-interactive.c:1014
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
+#: add-interactive.c:1016
msgid "pick hunks and update selectively"
msgstr "parçaları seç ve seçerek güncelle"
-#: add-interactive.c:1010
+#: add-interactive.c:1018
msgid "view diff between HEAD and index"
msgstr "HEAD ve indeks arasındaki diff'i gör"
-#: add-interactive.c:1012
+#: add-interactive.c:1020
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
+#: add-interactive.c:1028 add-interactive.c:1077
msgid "Prompt help:"
msgstr "İstem yardımı:"
-#: add-interactive.c:1022
+#: add-interactive.c:1030
msgid "select a single item"
msgstr "tek bir öge seç"
-#: add-interactive.c:1024
+#: add-interactive.c:1032
msgid "select a range of items"
msgstr "bir öge erimi seç"
-#: add-interactive.c:1026
+#: add-interactive.c:1034
msgid "select multiple ranges"
msgstr "birden çok erim seç"
-#: add-interactive.c:1028 add-interactive.c:1073
+#: add-interactive.c:1036 add-interactive.c:1081
msgid "select item based on unique prefix"
msgstr "benzersiz öneke dayanarak öge seç"
-#: add-interactive.c:1030
+#: add-interactive.c:1038
msgid "unselect specified items"
msgstr "belirtilen ögelerin seçimini kaldır"
-#: add-interactive.c:1032
+#: add-interactive.c:1040
msgid "choose all items"
msgstr "tüm ögeleri seç"
-#: add-interactive.c:1034
+#: add-interactive.c:1042
msgid "(empty) finish selecting"
msgstr "(boş) seçimi bitir"
-#: add-interactive.c:1071
+#: add-interactive.c:1079
msgid "select a numbered item"
msgstr "numaralandırılmış bir öge seç"
-#: add-interactive.c:1075
+#: add-interactive.c:1083
msgid "(empty) select nothing"
msgstr "(boş) hiçbir şey seçme"
-#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851
+#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
msgid "*** Commands ***"
msgstr "*** Komutlar ***"
-#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848
+#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
msgid "What now"
-msgstr "Şimdi ne"
+msgstr "Şimdi ne olacak"
-#: add-interactive.c:1136 git-add--interactive.perl:213
+#: add-interactive.c:1144 git-add--interactive.perl:213
msgid "staged"
msgstr "hazırlanmış"
-#: add-interactive.c:1136 git-add--interactive.perl:213
+#: add-interactive.c:1144 git-add--interactive.perl:213
msgid "unstaged"
msgstr "hazırlanmamış"
-#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251
-#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144
-#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409
-#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
-#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
-#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
+#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257
+#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124
+#: builtin/fetch.c:150 builtin/merge.c:285 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
+#: add-interactive.c:1151
msgid "could not refresh index"
msgstr "indeks yenilenemedi"
-#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765
+#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803
#, c-format
msgid "Bye.\n"
-msgstr "Hoşça kal.\n"
+msgstr "Güle güle.\n"
-#: add-patch.c:33 git-add--interactive.perl:1428
+#: add-patch.c:34 git-add--interactive.perl:1431
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Kip değişimi hazırlansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:34 git-add--interactive.perl:1429
+#: add-patch.c:35 git-add--interactive.perl:1432
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Silme hazırlansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:35 git-add--interactive.perl:1430
+#: add-patch.c:36 git-add--interactive.perl:1433
+#, 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:1434
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "Bu parça hazırlansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:37
+#: add-patch.c:39
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"staging."
@@ -332,7 +338,7 @@
"Eğer yama sorunsuzca uygulanırsa düzenlenen parça derhal hazırlama için "
"imlenecektir."
-#: add-patch.c:40
+#: add-patch.c:42
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -346,22 +352,27 @@
"a - bu parçayı ve sonraki tüm parçaları hazırla\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini hazırlama\n"
-#: add-patch.c:54 git-add--interactive.perl:1433
+#: add-patch.c:56 git-add--interactive.perl:1437
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Kip değişimi zulalansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:55 git-add--interactive.perl:1434
+#: add-patch.c:57 git-add--interactive.perl:1438
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Silme zulalansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:56 git-add--interactive.perl:1435
+#: add-patch.c:58 git-add--interactive.perl:1439
+#, 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:1440
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "Bu parça zulalansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:58
+#: add-patch.c:61
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"stashing."
@@ -369,7 +380,7 @@
"Eğer yama sorunsuzca uygulanırsa düzenlenen parça derhal zulalama için "
"imlenecektir."
-#: add-patch.c:61
+#: add-patch.c:64
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -383,22 +394,27 @@
"a - bu parçayı ve sonraki tüm parçaları zulala\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini zulalama\n"
-#: add-patch.c:77 git-add--interactive.perl:1438
+#: add-patch.c:80 git-add--interactive.perl:1443
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Kip değişimi hazırlıktan çıkarılsın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:78 git-add--interactive.perl:1439
+#: add-patch.c:81 git-add--interactive.perl:1444
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Silme hazırlıktan çıkarılsın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:79 git-add--interactive.perl:1440
+#: add-patch.c:82 git-add--interactive.perl:1445
+#, 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:1446
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "Bu parça hazırlıktan çıkarılsın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:81
+#: add-patch.c:85
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"unstaging."
@@ -406,7 +422,7 @@
"Eğer yama sorunsuzca uygulanırsa, düzenlenen parça derhal hazırlıktan "
"çıkarım için imlenecektir."
-#: add-patch.c:84
+#: add-patch.c:88
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -420,22 +436,27 @@
"a - bu parçayı ve sonraki tüm parçaları hazırlıktan çıkar\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini hazırlıktan çıkarma\n"
-#: add-patch.c:99 git-add--interactive.perl:1443
+#: add-patch.c:103 git-add--interactive.perl:1449
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "Kip değişimi indekse uygulansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:100 git-add--interactive.perl:1444
+#: add-patch.c:104 git-add--interactive.perl:1450
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Silme indekse uygulansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:101 git-add--interactive.perl:1445
+#: add-patch.c:105 git-add--interactive.perl:1451
+#, 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:1452
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "Bu parça indekse uygulansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:103 add-patch.c:168 add-patch.c:211
+#: 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."
@@ -443,7 +464,7 @@
"Eğer yama sorunsuzca uygulanırsa düzenlenen parça derhal uygulama için "
"imlenecektir."
-#: add-patch.c:106
+#: add-patch.c:111
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -457,25 +478,31 @@
"a - bu parçayı ve sonraki tüm parçaları uygula\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini uygulama\n"
-#: add-patch.c:121 git-add--interactive.perl:1448
-#: git-add--interactive.perl:1463
+#: add-patch.c:126 git-add--interactive.perl:1455
+#: git-add--interactive.perl:1473
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "Kip değişimi çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:122 git-add--interactive.perl:1449
-#: git-add--interactive.perl:1464
+#: add-patch.c:127 git-add--interactive.perl:1456
+#: git-add--interactive.perl:1474
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Silme çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:123 git-add--interactive.perl:1450
-#: git-add--interactive.perl:1465
+#: add-patch.c:128 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
+#, 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:1458
+#: git-add--interactive.perl:1476
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "Bu parça çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:125 add-patch.c:147 add-patch.c:190
+#: 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."
@@ -483,7 +510,7 @@
"Eğer yama sorunsuzca uygulanırsa düzenlenen parça derhal ıskartaya çıkarım "
"için imlenecektir."
-#: add-patch.c:128 add-patch.c:193
+#: 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"
@@ -497,23 +524,28 @@
"a - bu parçayı ve sonraki tüm parçaları at\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini atma\n"
-#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Kip değişimi indeksten ve çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Silme indeksten ve çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#, 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:1464
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Bu parça indeksten ve çalışma ağacından atılsın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:150
+#: 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"
@@ -527,23 +559,28 @@
"a - bu parçayı ve sonraki tüm parçaları at\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini atma\n"
-#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr ""
"Kip değişimi indekse ve çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Silme indekse ve çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#, 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:1470
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Bu parça indekse ve çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
-#: add-patch.c:171
+#: 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"
@@ -557,7 +594,7 @@
"a - bu parçayı ve sonraki tüm parçaları uygula\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini uygulama\n"
-#: add-patch.c:214
+#: add-patch.c:224
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -571,34 +608,34 @@
"a - bu parçayı ve sonraki tüm parçaları uygula\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini uygulama\n"
-#: add-patch.c:318
+#: 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:337 add-patch.c:341
+#: 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:395
+#: add-patch.c:419
msgid "could not parse diff"
msgstr "diff ayrıştırılamadı"
-#: add-patch.c:414
+#: add-patch.c:438
msgid "could not parse colored diff"
msgstr "renklendirilmiş diff ayrıştırılamadı"
-#: add-patch.c:428
+#: add-patch.c:452
#, c-format
msgid "failed to run '%s'"
msgstr "'%s' çalıştırılamadı"
-#: add-patch.c:587
+#: add-patch.c:611
msgid "mismatched output from interactive.diffFilter"
msgstr "interactive.diffFilter ögesinden eşleşmeyen çıktı"
-#: add-patch.c:588
+#: add-patch.c:612
msgid ""
"Your filter must maintain a one-to-one correspondence\n"
"between its input and output lines."
@@ -606,7 +643,7 @@
"Süzgeciniz kendisinin girdi ve çıktı satırları arasında\n"
"birebir karşılık sağlamalıdır."
-#: add-patch.c:761
+#: add-patch.c:790
#, c-format
msgid ""
"expected context line #%d in\n"
@@ -615,7 +652,7 @@
"şurada bağlam satırı #%d bekleniyordu:\n"
"%.*s"
-#: add-patch.c:776
+#: add-patch.c:805
#, c-format
msgid ""
"hunks do not overlap:\n"
@@ -628,11 +665,11 @@
"\tşununla bitmiyor:\n"
"%.*s"
-#: add-patch.c:1052 git-add--interactive.perl:1112
+#: add-patch.c:1081 git-add--interactive.perl:1115
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "El ile parça düzenleme kipi -- hızlıca öğrenmek için aşağıya bakın.\n"
-#: add-patch.c:1056
+#: add-patch.c:1085
#, c-format
msgid ""
"---\n"
@@ -646,7 +683,7 @@
"%c kaldırılacak.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1070 git-add--interactive.perl:1126
+#: add-patch.c:1099 git-add--interactive.perl:1129
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"
@@ -656,11 +693,11 @@
"sunulacaktır. Parçanın tüm satırları kaldırılırsa düzenleme durdurulur\n"
"ve parça değiştirilmeden bırakılır.\n"
-#: add-patch.c:1103
+#: add-patch.c:1132
msgid "could not parse hunk header"
msgstr "parça üstbilgisi ayrıştırılamadı"
-#: add-patch.c:1148
+#: add-patch.c:1177
msgid "'git apply --cached' failed"
msgstr "'git apply --cached' başarısız oldu"
@@ -676,26 +713,26 @@
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1218 git-add--interactive.perl:1239
+#: add-patch.c:1246 git-add--interactive.perl:1242
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
"Düzenlediğiniz parça uygulanamıyor. Yeniden düzenlensin mi (\"n (hayır)\" "
-"demek iptal eder!) [y/n]? "
+"ıskartaya çıkarır!) [y/n]? "
-#: add-patch.c:1261
+#: add-patch.c:1289
msgid "The selected hunks do not apply to the index!"
msgstr "Seçili parçalar indekse uygulanamıyor!"
-#: add-patch.c:1262 git-add--interactive.perl:1343
+#: add-patch.c:1290 git-add--interactive.perl:1346
msgid "Apply them to the worktree anyway? "
msgstr "Çalışma ağacına yine de uygulansın mı? "
-#: add-patch.c:1269 git-add--interactive.perl:1346
+#: add-patch.c:1297 git-add--interactive.perl:1349
msgid "Nothing was applied.\n"
msgstr "Hiçbir şey uygulanmadı.\n"
-#: add-patch.c:1326
+#: add-patch.c:1354
msgid ""
"j - leave this hunk undecided, see next undecided hunk\n"
"J - leave this hunk undecided, see next hunk\n"
@@ -717,127 +754,136 @@
"e - geçerli parçayı el ile düzenle\n"
"? - yardımı yazdır\n"
-#: add-patch.c:1447 add-patch.c:1457
+#: add-patch.c:1516 add-patch.c:1526
msgid "No previous hunk"
msgstr "Öncesinde parça yok"
-#: add-patch.c:1452 add-patch.c:1462
+#: add-patch.c:1521 add-patch.c:1531
msgid "No next hunk"
msgstr "Sonrasında parça yok"
-#: add-patch.c:1468
+#: add-patch.c:1537
msgid "No other hunks to goto"
msgstr "Gidilecek başka bir parça yok"
-#: add-patch.c:1479 git-add--interactive.perl:1577
+#: add-patch.c:1548 git-add--interactive.perl:1606
msgid "go to which hunk (<ret> to see more)? "
msgstr "hangi parçaya gidilsin (daha fazla görmek için <ret>)? "
-#: add-patch.c:1480 git-add--interactive.perl:1579
+#: add-patch.c:1549 git-add--interactive.perl:1608
msgid "go to which hunk? "
msgstr "hangi parçaya gidilsin? "
-#: add-patch.c:1491
+#: add-patch.c:1560
#, c-format
msgid "Invalid number: '%s'"
msgstr "Geçersiz sayı: '%s'"
-#: add-patch.c:1496
+#: add-patch.c:1565
#, c-format
msgid "Sorry, only %d hunk available."
msgid_plural "Sorry, only %d hunks available."
msgstr[0] "Üzgünüm, yalnızca %d parça kullanılabilir."
msgstr[1] "Üzgünüm, yalnızca %d parça kullanılabilir."
-#: add-patch.c:1505
+#: add-patch.c:1574
msgid "No other hunks to search"
msgstr "Aranacak başka parça yok"
-#: add-patch.c:1511 git-add--interactive.perl:1623
+#: add-patch.c:1580 git-add--interactive.perl:1661
msgid "search for regex? "
msgstr "düzenli ifade aransın mı? "
-#: add-patch.c:1526
+#: add-patch.c:1595
#, c-format
msgid "Malformed search regexp %s: %s"
msgstr "Hatalı oluşturulmuş düzenli ifade %s: %s"
-#: add-patch.c:1543
+#: add-patch.c:1612
msgid "No hunk matches the given pattern"
msgstr "Verilen dizgi ile eşleşen bir parça yok"
-#: add-patch.c:1550
+#: add-patch.c:1619
msgid "Sorry, cannot split this hunk"
msgstr "Üzgünüm, bu parça bölünemiyor"
-#: add-patch.c:1554
+#: add-patch.c:1623
#, c-format
msgid "Split into %d hunks."
msgstr "%d parçaya bölündü."
-#: add-patch.c:1558
+#: add-patch.c:1627
msgid "Sorry, cannot edit this hunk"
msgstr "Üzgünüm, bu parça düzenlenemiyor"
-#: add-patch.c:1609
+#: add-patch.c:1679
msgid "'git apply' failed"
msgstr "'git apply' başarısız oldu"
-#: advice.c:115
+#: advice.c:143
+#, 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:159
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sipucu: %.*s%s\n"
-#: advice.c:168
+#: advice.c:250
msgid "Cherry-picking is not possible because you have unmerged files."
-msgstr "Seç-al yapılamıyor çünkü birleştirilmemiş dosyalarınız var."
+msgstr "Seç-al yapılamaz; birleştirmesi tamamlanmamış dosyalarınız var."
-#: advice.c:170
+#: advice.c:252
msgid "Committing is not possible because you have unmerged files."
-msgstr "Gönderi yapılamıyor çünkü birleştirilmemiş dosyalarınız var."
+msgstr "İşleme yapılamaz; birleştirmesi tamamlanmamış dosyalarınız var."
-#: advice.c:172
+#: advice.c:254
msgid "Merging is not possible because you have unmerged files."
-msgstr "Birleştirme yapılamıyor çünkü birleştirilmemiş dosyalarınız var."
+msgstr "Birleştirme yapılamaz; birleştirmesi tamamlanmamış dosyalarınız var."
-#: advice.c:174
+#: advice.c:256
msgid "Pulling is not possible because you have unmerged files."
-msgstr "Çekme yapılamıyor çünkü birleştirilmemiş dosyalarınız var."
+msgstr "Çekme yapılamaz; birleştirmesi tamamlanmamış dosyalarınız var."
-#: advice.c:176
+#: advice.c:258
msgid "Reverting is not possible because you have unmerged files."
-msgstr "Geriye alma yapılamıyor çünkü birleştirilmemiş dosyalarınız var."
+msgstr "Geriye al yapılamaz; birleştirmesi tamamlanmamış dosyalarınız var."
-#: advice.c:178
+#: advice.c:260
#, c-format
msgid "It is not possible to %s because you have unmerged files."
-msgstr "%s yapılamıyor çünkü birleştirilmemiş dosyalarınız var."
+msgstr "%s yapılamıyor; birleştirmesi tamamlanmamış dosyalarınız var."
-#: advice.c:186
+#: advice.c:268
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
msgstr ""
"Onları çalışma ağacında onarın, ardından hazırlığı bitirmek için uygun\n"
-"görüldüğü biçimde 'git add/rm <dosya>' yaptıktan sonra bir gönderi yapın."
+"görüldüğü biçimde 'git add/rm <dosya>' yaptıktan sonra işleyin."
-#: advice.c:194
+#: advice.c:276
msgid "Exiting because of an unresolved conflict."
msgstr "Çözüme kavuşturulmamış bir çakışmadan dolayı çıkılıyor."
-#: advice.c:199 builtin/merge.c:1335
+#: advice.c:281 builtin/merge.c:1370
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Birleştirmenizi sonuçlandırmadınız (MERGE_HEAD mevcut)."
-#: advice.c:201
+#: advice.c:283
msgid "Please, commit your changes before merging."
-msgstr "Birleştirme öncesinde değişikliklerinizi gönderin."
+msgstr "Birleştirme öncesinde değişikliklerinizi işleyin."
-#: advice.c:202
+#: advice.c:284
msgid "Exiting because of unfinished merge."
msgstr "Tamamlanmamış birleştirmeden dolayı çıkılıyor."
-#: advice.c:208
+#: advice.c:290
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -863,9 +909,9 @@
"\n"
"Şu anda 'ayrık HEAD' durumundasınız. Oraya buraya bakabilir, deneysel\n"
"değişiklikler yapıp gönderebilir veya başka bir dala geçerek yaptığınız\n"
-"tüm gönderileri başka hiçbir dala etki etmeden geri alabilirsiniz.\n"
+"tüm işlemeleri başka hiçbir dala etki etmeden geri alabilirsiniz.\n"
"\n"
-"Yaptığınız gönderileri tutmak için yeni bir dal oluşturmak isterseniz bunu\n"
+"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"
@@ -994,7 +1040,7 @@
#: apply.c:1753
msgid "new file depends on old contents"
-msgstr "yeni dosya eski içeriğe gereksinim duyuyor"
+msgstr "yeni dosyanın eski içeriğe bağımlılığı var"
#: apply.c:1755
msgid "deleted file still has contents"
@@ -1008,7 +1054,7 @@
#: apply.c:1826
#, c-format
msgid "new file %s depends on old contents"
-msgstr "%s yeni dosyası eski içeriğe gereksinim duyuyor"
+msgstr "%s yeni dosyasının eski içeriğe bağımlılığı var"
#: apply.c:1828
#, c-format
@@ -1018,7 +1064,7 @@
#: apply.c:1831
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
-msgstr "** uyarı: %s dosyası boş duruma gelir ancak silinmez"
+msgstr "** uyarı: %s dosyası boş duruma gelir; ancak silinmez"
#: apply.c:1978
#, c-format
@@ -1096,7 +1142,7 @@
#: 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"
+msgstr "yama boş bir '%s' üzerine uygulanır; ancak o boş değil"
#: apply.c:3189
#, c-format
@@ -1124,7 +1170,8 @@
msgid "cannot checkout %s"
msgstr "%s çıkışı yapılamıyor"
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:86 pack-revindex.c:213
+#: setup.c:308
#, c-format
msgid "failed to read %s"
msgstr "%s okunamadı"
@@ -1144,7 +1191,7 @@
msgid "%s: does not exist in index"
msgstr "%s: indekste bulunmuyor"
-#: apply.c:3537 apply.c:3708
+#: apply.c:3537 apply.c:3708 apply.c:3952
#, c-format
msgid "%s: does not match index"
msgstr "%s: indeks ile eşleşmiyor"
@@ -1194,315 +1241,359 @@
msgid "%s has type %o, expected %o"
msgstr "%s, %o türüne iye, %o bekleniyordu"
-#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856
-#: read-cache.c:1325
+#: 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:3936
+#: apply.c:3950
#, c-format
msgid "%s: already exists in index"
msgstr "%s: indekste halihazırda var"
-#: apply.c:3939
+#: apply.c:3954
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: çalışma dizininde halihazırda var"
-#: apply.c:3959
+#: apply.c:3974
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "şunun yeni kipi (%o): %s, eski kip (%o) ile eşleşmiyor "
-#: apply.c:3964
+#: apply.c:3979
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "şunun yeni kipi (%o): %s, şunun eski kipi (%o): %s, ile eşleşmiyor"
-#: apply.c:3984
+#: apply.c:3999
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "etkilenen dosya '%s' bir sembolik bağın ötesinde"
-#: apply.c:3988
+#: apply.c:4003
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: yama uygulanamıyor"
-#: apply.c:4003
+#: apply.c:4018
#, c-format
msgid "Checking patch %s..."
msgstr "%s yaması denetleniyor..."
-#: apply.c:4095
+#: apply.c:4110
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "%s altmodülü için sha1 bilgisi eksik veya yararsız"
-#: apply.c:4102
+#: apply.c:4117
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "geçerli HEAD'de olmayan %s için kip değişimi"
-#: apply.c:4105
+#: apply.c:4120
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1 bilgisi eksik veya yararsız (%s)."
-#: apply.c:4114
+#: apply.c:4129
#, c-format
msgid "could not add %s to temporary index"
msgstr "%s geçici indekse eklenemedi"
-#: apply.c:4124
+#: apply.c:4139
#, c-format
msgid "could not write temporary index to %s"
msgstr "geçici indeks şuraya yazılamadı: %s"
-#: apply.c:4262
+#: apply.c:4277
#, c-format
msgid "unable to remove %s from index"
msgstr "%s indeksten kaldırılamıyor"
-#: apply.c:4296
+#: apply.c:4311
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "%s altmodülü için hasarlı yama"
-#: apply.c:4302
+#: apply.c:4317
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "yeni oluşturulan '%s' dosyasının bilgileri alınamıyor"
-#: apply.c:4310
+#: apply.c:4325
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "yeni oluşturulan %s dosyası için yardımcı bellek oluşturulamıyor"
-#: apply.c:4316 apply.c:4461
+#: apply.c:4331 apply.c:4476
#, c-format
msgid "unable to add cache entry for %s"
msgstr "%s için önbellek girdisi eklenemiyor"
-#: apply.c:4359
+#: apply.c:4374 builtin/bisect--helper.c:523
#, c-format
msgid "failed to write to '%s'"
msgstr "şuraya yazılamadı: '%s'"
-#: apply.c:4363
+#: apply.c:4378
#, c-format
msgid "closing file '%s'"
msgstr "'%s' dosyası kapatılıyor"
-#: apply.c:4433
+#: apply.c:4448
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "'%s' dosyası yazılamıyor, %o kipi"
-#: apply.c:4531
+#: apply.c:4546
#, c-format
msgid "Applied patch %s cleanly."
msgstr "%s yaması sorunsuzca uygulandı."
-#: apply.c:4539
+#: apply.c:4554
msgid "internal error"
msgstr "iç hata"
-#: apply.c:4542
+#: apply.c:4557
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "%%s yaması %d geri çevirme ile uygulanıyor..."
msgstr[1] "%%s yaması %d geri çevirme ile uygulanıyor..."
-#: apply.c:4553
+#: apply.c:4568
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ".rej dosya adı %.*s.rej olarak kısaltılıyor"
-#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201
+#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334
#, c-format
msgid "cannot open %s"
msgstr "%s açılamıyor"
-#: apply.c:4575
+#: apply.c:4590
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Parça #%d sorunsuzca uygulandı."
-#: apply.c:4579
+#: apply.c:4594
#, c-format
msgid "Rejected hunk #%d."
msgstr "Parça %d geri çevrildi."
-#: apply.c:4698
+#: apply.c:4718
#, c-format
msgid "Skipped patch '%s'."
msgstr "'%s' yaması atlandı."
-#: apply.c:4706
+#: apply.c:4726
msgid "unrecognized input"
msgstr "tanımlanamayan girdi"
-#: apply.c:4726
+#: apply.c:4746
msgid "unable to read index file"
msgstr "indeks dosyası okunamıyor"
-#: apply.c:4883
+#: apply.c:4903
#, c-format
msgid "can't open patch '%s': %s"
msgstr "'%s' yaması açılamıyor: %s"
-#: apply.c:4910
+#: apply.c:4930
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "%d boşluk hatası susturuldu"
msgstr[1] "%d boşluk hatası susturuldu"
-#: apply.c:4916 apply.c:4931
+#: apply.c:4936 apply.c:4951
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d satır boşluk hatası ekliyor."
msgstr[1] "%d satır boşluk hatası ekliyor."
-#: apply.c:4924
+#: apply.c:4944
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "Boşluk hataları düzeltildikten sonra %d satır uygulandı."
msgstr[1] "Boşluk hataları düzeltildikten sonra %d satır uygulandı."
-#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406
+#: apply.c:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406
msgid "Unable to write new index file"
msgstr "Yeni indeks dosyası yazılamıyor"
-#: apply.c:4968
+#: apply.c:4988
msgid "don't apply changes matching the given path"
msgstr "verilen yol ile eşleşen değişiklikleri uygulama"
-#: apply.c:4971
+#: apply.c:4991
msgid "apply changes matching the given path"
msgstr "verilen yol ile eşleşen değişiklikleri uygula"
-#: apply.c:4973 builtin/am.c:2260
+#: apply.c:4993 builtin/am.c:2266
msgid "num"
msgstr "sayı"
-#: apply.c:4974
+#: apply.c:4994
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "geleneksel diff yollarından <sayı> öncü eğik çizgiyi kaldır"
-#: apply.c:4977
+#: apply.c:4997
msgid "ignore additions made by the patch"
msgstr "yamanın yaptığı eklemeleri yok say"
-#: apply.c:4979
+#: apply.c:4999
msgid "instead of applying the patch, output diffstat for the input"
-msgstr "yamayı uygulama yerine girdi için diffstat'ı çıktı ver"
+msgstr "yamayı uygulama yerine girdi için diffstat çıktısı ver"
-#: apply.c:4983
+#: apply.c:5003
msgid "show number of added and deleted lines in decimal notation"
msgstr "eklenen ve silinen satırların sayısını onluk birimde göster"
-#: apply.c:4985
+#: apply.c:5005
msgid "instead of applying the patch, output a summary for the input"
msgstr "yamayı uygulama yerine girdi için bir özet çıktısı ver"
-#: apply.c:4987
+#: apply.c:5007
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "yamayı uygulama yerine yamanın uygulanabilir olup olmadığına bak"
-#: apply.c:4989
+#: apply.c:5009
msgid "make sure the patch is applicable to the current index"
msgstr "yamanın geçerli indekse uygulanabilir olduğundan emin ol"
-#: apply.c:4991
+#: apply.c:5011
msgid "mark new files with `git add --intent-to-add`"
msgstr "yeni dosyaları `git add --intent-to-add` ile imle"
-#: apply.c:4993
+#: apply.c:5013
msgid "apply a patch without touching the working tree"
msgstr "çalışma ağacına dokunmadan bir yama uygula"
-#: apply.c:4995
+#: apply.c:5015
msgid "accept a patch that touches outside the working area"
msgstr "çalışma ağacının dışına dokunan bir yamayı kabul et"
-#: apply.c:4998
+#: apply.c:5018
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "ek olarak yamayı da uygula (--stat/--summary/--check ile kullan)"
-#: apply.c:5000
+#: apply.c:5020
msgid "attempt three-way merge if a patch does not apply"
msgstr "bir yama uygulanamıyorsa 3 yönlü birleştirme dene"
-#: apply.c:5002
+#: apply.c:5022
msgid "build a temporary index based on embedded index information"
msgstr "gömülü indeks bilgisini temel alan geçici bir indeks oluştur"
-#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540
msgid "paths are separated with NUL character"
msgstr "yollar NUL karakteri ile ayrılır"
-#: apply.c:5007
+#: apply.c:5027
msgid "ensure at least <n> lines of context match"
msgstr "en az <n> bağlam satırının eşleştiğinden emin ol"
-#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98
+#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98
#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3457 builtin/rebase.c:1508
+#: builtin/pack-objects.c:3577 builtin/rebase.c:1352
msgid "action"
msgstr "eylem"
-#: apply.c:5009
+#: apply.c:5029
msgid "detect new or modified lines that have whitespace errors"
msgstr "boşluk hatası içeren yeni veya değiştirilmiş satırları algıla"
-#: apply.c:5012 apply.c:5015
+#: apply.c:5032 apply.c:5035
msgid "ignore changes in whitespace when finding context"
msgstr "bağlam bulurken boşluk değişikliklerini yok say"
-#: apply.c:5018
+#: apply.c:5038
msgid "apply the patch in reverse"
msgstr "yamayı tersten uygula"
-#: apply.c:5020
+#: apply.c:5040
msgid "don't expect at least one line of context"
msgstr "en az bir satır bağlam bekleme"
-#: apply.c:5022
+#: apply.c:5042
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "reddedilmiş parçaları ilgili *.rej dosyalarında bırak"
-#: apply.c:5024
+#: apply.c:5044
msgid "allow overlapping hunks"
msgstr "üst üste binen parçalara izin ver"
-#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22
-#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774
-#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22
+#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757
+#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "ayrıntı ver"
-#: apply.c:5027
+#: apply.c:5047
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "dosya sonunda yanlışlıkla algılanan eksik yenisatırı hoş gör"
-#: apply.c:5030
+#: apply.c:5050
msgid "do not trust the line counts in the hunk headers"
msgstr "parça üstbilgisindeki satır sayımına güvenme"
-#: apply.c:5032 builtin/am.c:2248
+#: apply.c:5052 builtin/am.c:2254
msgid "root"
msgstr "kök"
-#: apply.c:5033
+#: apply.c:5053
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:450
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr "'%s' süzgeci başlatılamıyor"
+
+#: archive-tar.c:453
+msgid "unable to redirect descriptor"
+msgstr "açıklayıcı yeniden yönlendirilemiyor"
+
+#: archive-tar.c:460
+#, 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>...]"
@@ -1521,183 +1612,156 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <depo> [--exec <komut>] --list"
-#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
-#, c-format
-msgid "pathspec '%s' did not match any files"
-msgstr "yol belirteci '%s' hiçbir dosya ile eşleşmedi"
-
-#: archive.c:396
-#, c-format
-msgid "no such ref: %.*s"
-msgstr "böyle bir başvuru yok: %.*s"
-
-#: archive.c:401
-#, c-format
-msgid "not a valid object name: %s"
-msgstr "geçerli bir nesne adı değil: %s"
-
-#: archive.c:414
-#, c-format
-msgid "not a tree object: %s"
-msgstr "bir ağaç nesnesi değil: %s"
-
-#: archive.c:426
-msgid "current working directory is untracked"
-msgstr "geçerli çalışma dizini izlenmiyor"
-
-#: archive.c:457
-msgid "fmt"
-msgstr "biçim"
-
-#: archive.c:457
-msgid "archive format"
-msgstr "arşiv biçimi"
-
-#: archive.c:458 builtin/log.c:1653
-msgid "prefix"
-msgstr "önek"
-
-#: archive.c:459
-msgid "prepend prefix to each pathname in the archive"
-msgstr "öneki arşivdeki tüm yol adlarının başına ekle"
-
-#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
-#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
-#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887
-#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
-#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
-#: parse-options.h:190
-msgid "file"
-msgstr "dosya"
-
-#: archive.c:461 builtin/archive.c:90
-msgid "write the archive to this file"
-msgstr "arşivi bu dosyaya yaz"
-
-#: archive.c:463
-msgid "read .gitattributes in working directory"
-msgstr "çalışma dizinindeki .gitattributes'u oku"
-
-#: archive.c:464
-msgid "report archived files on stderr"
-msgstr "arşivlenmiş dosyaları stderr'de raporla"
-
-#: archive.c:465
-msgid "store only"
-msgstr "yalnızca depola"
-
-#: archive.c:466
-msgid "compress faster"
-msgstr "daha hızlı sıkıştır"
-
-#: archive.c:474
-msgid "compress better"
-msgstr "daha iyi sıkıştır"
-
-#: archive.c:477
-msgid "list supported archive formats"
-msgstr "desteklenen arşiv biçimlerini listele"
-
-#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
-#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
-msgid "repo"
-msgstr "depo"
-
-#: archive.c:480 builtin/archive.c:92
-msgid "retrieve the archive from remote repository <repo>"
-msgstr "arşivi uzak konum deposu <depo>'dan al"
-
-#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
-#: builtin/notes.c:498
-msgid "command"
-msgstr "komut"
-
-#: archive.c:482 builtin/archive.c:94
-msgid "path to the remote git-upload-archive command"
-msgstr "uzak konum komutu git-upload-archive'e olan yol"
-
-#: archive.c:489
-msgid "Unexpected option --remote"
-msgstr "Beklenmedik seçenek --remote"
-
-#: archive.c:491
-msgid "Option --exec can only be used together with --remote"
-msgstr "--exec seçeneği yalnızca --remote ile birlikte kullanılabilir"
-
-#: archive.c:493
-msgid "Unexpected option --output"
-msgstr "Beklenmedik seçenek --output"
-
-#: archive.c:515
-#, c-format
-msgid "Unknown archive format '%s'"
-msgstr "Bilinmeyen arşiv biçimi '%s'"
-
-#: archive.c:522
-#, c-format
-msgid "Argument not supported for format '%s': -%d"
-msgstr "'%s' biçimi için desteklenmeyen değişken: -%d"
-
-#: archive-tar.c:125 archive-zip.c:351
-#, c-format
-msgid "cannot stream blob %s"
-msgstr "%s ikili nesnesi akıtılamıyor"
-
-#: archive-tar.c:266 archive-zip.c:369
-#, c-format
-msgid "unsupported file mode: 0%o (SHA1: %s)"
-msgstr "desteklenmeyen dosya kipi: 0%o (SHA1: %s)"
-
-#: archive-tar.c:293 archive-zip.c:359
+#: archive.c:192
#, c-format
msgid "cannot read %s"
msgstr "%s okunamıyor"
-#: archive-tar.c:465
+#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894
+#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786
+#: builtin/merge.c:1139
#, c-format
-msgid "unable to start '%s' filter"
-msgstr "'%s' süzgeci başlatılamıyor"
+msgid "could not read '%s'"
+msgstr "'%s' okunamadı"
-#: archive-tar.c:468
-msgid "unable to redirect descriptor"
-msgstr "açıklayıcı yeniden yönlendirilemiyor"
-
-#: archive-tar.c:475
+#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315
#, c-format
-msgid "'%s' filter reported error"
-msgstr "'%s' süzgeci hata bildirdi"
+msgid "pathspec '%s' did not match any files"
+msgstr "yol belirteci '%s' hiçbir dosya ile eşleşmedi"
-#: archive-zip.c:319
+#: archive.c:454
#, c-format
-msgid "path is not valid UTF-8: %s"
-msgstr "yol geçerli UTF-8 değil: %s"
+msgid "no such ref: %.*s"
+msgstr "böyle bir başvuru yok: %.*s"
-#: archive-zip.c:323
+#: archive.c:460
#, c-format
-msgid "path too long (%d chars, SHA1: %s): %s"
-msgstr "yol çok uzun (%d karakter, SHA1: %s): %s"
+msgid "not a valid object name: %s"
+msgstr "geçerli bir nesne adı değil: %s"
-#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
+#: archive.c:473
#, c-format
-msgid "deflate error (%d)"
-msgstr "söndürme hatası (%d)"
+msgid "not a tree object: %s"
+msgstr "bir ağaç nesnesi değil: %s"
-#: archive-zip.c:615
+#: archive.c:485
+msgid "current working directory is untracked"
+msgstr "geçerli çalışma dizini izlenmiyor"
+
+#: archive.c:526
#, c-format
-msgid "timestamp too large for this system: %<PRIuMAX>"
-msgstr "zaman damgası bu sistem için çok büyük: %<PRIuMAX>"
+msgid "File not found: %s"
+msgstr "Dosya bulunamadı: %s"
-#: attr.c:212
+#: archive.c:528
+#, c-format
+msgid "Not a regular file: %s"
+msgstr "Normal bir dosya değil: %s"
+
+#: archive.c:555
+msgid "fmt"
+msgstr "biçim"
+
+#: archive.c:555
+msgid "archive format"
+msgstr "arşiv biçimi"
+
+#: archive.c:556 builtin/log.c:1764
+msgid "prefix"
+msgstr "önek"
+
+#: archive.c:557
+msgid "prepend prefix to each pathname in the archive"
+msgstr "öneki arşivdeki tüm yol adlarının başına ekle"
+
+#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888
+#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
+#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
+#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105
+#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412
+#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190
+msgid "file"
+msgstr "dosya"
+
+#: archive.c:559
+msgid "add untracked file to archive"
+msgstr "izlenmeyen dosyaları arşive ekle"
+
+#: archive.c:562 builtin/archive.c:90
+msgid "write the archive to this file"
+msgstr "arşivi bu dosyaya yaz"
+
+#: archive.c:564
+msgid "read .gitattributes in working directory"
+msgstr "çalışma dizinindeki .gitattributes'u oku"
+
+#: archive.c:565
+msgid "report archived files on stderr"
+msgstr "arşivlenmiş dosyaları stderr'de raporla"
+
+#: archive.c:567
+msgid "set compression level"
+msgstr "sıkıştırma düzeyini ayarla"
+
+#: archive.c:570
+msgid "list supported archive formats"
+msgstr "desteklenen arşiv biçimlerini listele"
+
+#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117
+#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
+msgid "repo"
+msgstr "depo"
+
+#: archive.c:573 builtin/archive.c:92
+msgid "retrieve the archive from remote repository <repo>"
+msgstr "arşivi uzak konum deposu <depo>'dan al"
+
+#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714
+#: builtin/notes.c:498
+msgid "command"
+msgstr "komut"
+
+#: archive.c:575 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:582
+msgid "Unexpected option --remote"
+msgstr "Beklenmedik seçenek --remote"
+
+#: archive.c:584
+msgid "Option --exec can only be used together with --remote"
+msgstr "--exec seçeneği yalnızca --remote ile birlikte kullanılabilir"
+
+#: archive.c:586
+msgid "Unexpected option --output"
+msgstr "Beklenmedik seçenek --output"
+
+#: archive.c:588
+msgid "Options --add-file and --remote cannot be used together"
+msgstr "--add-file ve --remote seçenekleri birlikte kullanılamaz"
+
+#: archive.c:610
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "Bilinmeyen arşiv biçimi '%s'"
+
+#: archive.c:619
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "'%s' biçimi için desteklenmeyen argüman: -%d"
+
+#: attr.c:202
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s geçerli bir öznitelik adı değil"
-#: attr.c:369
+#: attr.c:359
#, c-format
msgid "%s not allowed: %s:%d"
msgstr "%s izin verilmiyor: %s:%d"
-#: attr.c:409
+#: attr.c:399
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -1705,22 +1769,22 @@
"Negatif dizgiler git özniteliklerinde yok sayılır.\n"
"Gerçek öncü ünlem için '\\!' kullanın."
-#: bisect.c:468
+#: bisect.c:489
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "'%s' dosyasında hatalı tırnağa alınmış içerik: %s"
-#: bisect.c:678
+#: bisect.c:699
#, c-format
msgid "We cannot bisect more!\n"
-msgstr "Daha fazla ikili arama yapamıyoruz!\n"
+msgstr "Daha fazla ikili arama yapılamıyor!\n"
-#: bisect.c:745
+#: bisect.c:766
#, c-format
msgid "Not a valid commit name %s"
-msgstr "Geçerli bir gönderi adı değil: %s"
+msgstr "Geçerli bir işleme adı değil: %s"
-#: bisect.c:770
+#: bisect.c:791
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1729,7 +1793,7 @@
"Birleştirme temeli %s hatalı.\n"
"Bu demek oluyor ki hata %s ve [%s] arasında düzeltilmiş.\n"
-#: bisect.c:775
+#: bisect.c:796
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1738,16 +1802,16 @@
"Birleştirme temeli %s yeni.\n"
"Özellik %s ve [%s] arasında değişmiş.\n"
-#: bisect.c:780
+#: bisect.c:801
#, c-format
msgid ""
"The merge base %s is %s.\n"
"This means the first '%s' commit is between %s and [%s].\n"
msgstr ""
-"Birleştirme temeli %s %s.\n"
-"Bu demek oluyor ki ilk '%s' gönderisi %s ve [%s] arasında.\n"
+"Birleştirme temeli %s, %s.\n"
+"Bu demek oluyor ki ilk '%s' işlemesi %s ve [%s] arasında.\n"
-#: bisect.c:788
+#: bisect.c:809
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1758,7 +1822,7 @@
"git bisect bu durumda düzgünce çalışamaz.\n"
"%s ve %s revizyonlarını birbirine mi karıştırdınız?\n"
-#: bisect.c:801
+#: bisect.c:822
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1766,48 +1830,48 @@
"We continue anyway."
msgstr ""
"%s ve [%s] arasındaki birleştirme temeli atlanmalı.\n"
-"%s gönderisinin %s ve [%s] arasında olduğundan emin olamıyoruz.\n"
+"%s işlemesinin %s ve [%s] arasında olduğundan emin olamıyoruz.\n"
"Yine de sürdüreceğiz."
-#: bisect.c:840
+#: bisect.c:861
#, c-format
msgid "Bisecting: a merge base must be tested\n"
-msgstr "İkili arama: Bir birleştirme temeli sınanmalı\n"
+msgstr "İkili arama: Birleştirme temelleri sınanmalı\n"
-#: bisect.c:890
+#: bisect.c:911
#, c-format
msgid "a %s revision is needed"
msgstr "bir %s revizyonu gerekiyor"
-#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287
#, c-format
msgid "could not create file '%s'"
msgstr "'%s' dosyası oluşturulamadı"
-#: bisect.c:966 builtin/merge.c:149
+#: bisect.c:987 builtin/merge.c:153
#, c-format
msgid "could not read file '%s'"
msgstr "'%s' dosyası okunamadı"
-#: bisect.c:997
+#: bisect.c:1027
msgid "reading bisect refs failed"
msgstr "ikili arama başvurularını okuma başarısız oldu"
-#: bisect.c:1019
+#: bisect.c:1057
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s hem %s hem %s idi\n"
-#: bisect.c:1028
+#: bisect.c:1066
#, c-format
msgid ""
"No testable commit found.\n"
-"Maybe you started with bad path parameters?\n"
+"Maybe you started with bad path arguments?\n"
msgstr ""
-"Sınanabilir bir gönderi bulunamadı.\n"
-"Hatalı yol parametreleri ile mi başladınız?\n"
+"Sınanabilir bir işleme bulunamadı.\n"
+"Hatalı yol argümanları ile mi başladınız?\n"
-#: bisect.c:1057
+#: bisect.c:1095
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1817,47 +1881,48 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1063
+#: bisect.c:1101
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[0] "İkili arama: Şundan sonra sınanacak %d revizyon kaldı: %s\n"
msgstr[1] "İkili arama: Şundan sonra sınanacak %d revizyon kaldı: %s\n"
-#: blame.c:2700
+#: blame.c:2777
msgid "--contents and --reverse do not blend well."
msgstr "--contents ve --reverse birlikte pek iyi gitmiyor."
-#: blame.c:2714
+#: blame.c:2791
msgid "cannot use --contents with final commit object name"
-msgstr "--contents son gönderi nesnesi adı ile kullanılamıyor"
+msgstr "--contents son işleme nesnesi adı ile kullanılamıyor"
-#: blame.c:2735
+#: blame.c:2812
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
-"--reverse ve --first-parent birlikte en son gönderinin belirtilmesi gerek"
+"--reverse ve --first-parent birlikte en son işlemenin belirtilmesini "
+"gerektiriyor"
-#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006
-#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388
-#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215
-#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290
-#: builtin/shortlog.c:192
+#: blame.c:2821 bundle.c:213 ref-filter.c:2206 remote.c:2041 sequencer.c:2146
+#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411
+#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335
+#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410
+#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr "revizyonda gezinme ayarlaması başarısız oldu"
-#: blame.c:2762
+#: blame.c:2839
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
"--reverse --first-parent birlikte ilk üst öge zincirinin yanında erim "
"gerektiriyor"
-#: blame.c:2773
+#: blame.c:2850
#, c-format
msgid "no such path %s in %s"
msgstr "şurada %s yolu bulunamadı: %s"
-#: blame.c:2784
+#: blame.c:2861
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "%s ikili nesnesi %s yolunda okunamıyor"
@@ -1995,114 +2060,404 @@
msgid "Not a valid branch point: '%s'."
msgstr "Geçerli bir dal noktası değil: '%s'."
-#: branch.c:364
+#: branch.c:365
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' çıkışı '%s' konumunda halihazırda yapılmış"
-#: branch.c:387
+#: 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:36
+#: bundle.c:41
#, c-format
-msgid "'%s' does not look like a v2 bundle file"
-msgstr "'%s' bir v2 demet dosyası gibi görünmüyor"
+msgid "unrecognized bundle hash algorithm: %s"
+msgstr "bilinmeyen demet sağlama algoritması: %s"
-#: bundle.c:64
+#: 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:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016
-#: builtin/commit.c:815
+#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184
+#: builtin/commit.c:814
#, c-format
msgid "could not open '%s'"
msgstr "'%s' açılamadı"
-#: bundle.c:143
+#: bundle.c:189
msgid "Repository lacks these prerequisite commits:"
-msgstr "Depo aşağıdaki önceden gereken gönderilere iye değil:"
+msgstr "Depo aşağıdaki önkoşul işlemelere iye değil:"
-#: bundle.c:146
+#: bundle.c:192
msgid "need a repository to verify a bundle"
msgstr "bir demeti doğrulamak için bir depo gerekiyor"
-#: bundle.c:197
+#: 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:204
+#: bundle.c:250
msgid "The bundle records a complete history."
msgstr "Demet tam bir geçmiş kaydını yazar."
-#: bundle.c:206
+#: bundle.c:252
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
-msgstr[0] "Demet şu gönderiyi gerektiriyor:"
-msgstr[1] "Demet şu %d gönderiyi gerektiriyor:"
+msgstr[0] "Demet şu işlemeyi gerektiriyor:"
+msgstr[1] "Demet şu %d işlemeyi gerektiriyor:"
-#: bundle.c:273
+#: bundle.c:319
msgid "unable to dup bundle descriptor"
msgstr "demet açıklayıcısı çoğaltılamıyor"
-#: bundle.c:280
+#: bundle.c:326
msgid "Could not spawn pack-objects"
msgstr "pack-objects ortaya çıkarılamadı"
-#: bundle.c:291
+#: bundle.c:337
msgid "pack-objects died"
msgstr "pack-objects sonlandı"
-#: bundle.c:333
-msgid "rev-list died"
-msgstr "rev-list sonlandı"
-
-#: bundle.c:382
+#: bundle.c:386
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "'%s' başvurusu revizyon listesi seçenekleri tarafından dışlandı"
-#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306
+#: bundle.c:490
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr "desteklenmeyen demet sürümü %d"
+
+#: bundle.c:492
+#, 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:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396
#, c-format
msgid "unrecognized argument: %s"
-msgstr "tanımlanamayan değişken: %s"
+msgstr "tanımlanamayan argüman: %s"
-#: bundle.c:469
+#: bundle.c:539
msgid "Refusing to create empty bundle."
msgstr "Boş demet oluşturma reddediliyor."
-#: bundle.c:479
+#: bundle.c:549
#, c-format
msgid "cannot create '%s'"
msgstr "'%s' oluşturulamıyor"
-#: bundle.c:504
+#: bundle.c:574
msgid "index-pack died"
msgstr "index-pack sonlandı"
+#: chunk-format.c:113
+msgid "terminating chunk id appears earlier than expected"
+msgstr "iri parça numarası sonlandırması beklenenden önce ortaya çıkıyor"
+
+#: chunk-format.c:122
+#, c-format
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr "düzgün olmayan iri parça ofseti %<PRIx64> ve %<PRIx64>"
+
+#: chunk-format.c:129
+#, c-format
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr "yinelenmiş iri parça numarası %<PRIx32> bulundu"
+
+#: chunk-format.c:143
+#, c-format
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr "en son iri parçanın numarası sıfır olmayan %<PRIx32>"
+
#: color.c:329
#, c-format
msgid "invalid color value: %.*s"
msgstr "geçersiz renk değeri: %.*s"
-#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403
-#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457
+#: commit-graph.c:197 midx.c:46
+msgid "invalid hash version"
+msgstr "geçersiz sağlama sürümü"
+
+#: commit-graph.c:255
+msgid "commit-graph file is too small"
+msgstr "commit-graph dosyası pek küçük"
+
+#: commit-graph.c:348
+#, 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:355
+#, 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:362
+#, 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:379
+#, 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:472
+msgid "commit-graph has no base graphs chunk"
+msgstr "commit-graph temel grafiği iri parçasına iye değil"
+
+#: commit-graph.c:482
+msgid "commit-graph chain does not match"
+msgstr "commit-graph zinciri eşleşmiyor"
+
+#: commit-graph.c:530
+#, 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:554
+msgid "unable to find all commit-graph files"
+msgstr "tüm commit-graph dosyaları bulunamıyor"
+
+#: commit-graph.c:735 commit-graph.c:772
+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:756
+#, c-format
+msgid "could not find commit %s"
+msgstr "%s işlemesi bulunamadı"
+
+#: commit-graph.c:789
+msgid "commit-graph requires overflow generation data but has none"
+msgstr "commit-graph, taşım oluşturma verisi gerektiriyor; ancak hiç yok"
+
+#: commit-graph.c:1065 builtin/am.c:1292
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "%s işlemesi ayrıştırılamıyor"
+
+#: commit-graph.c:1327 builtin/pack-objects.c:2872
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "%s nesnesinin türü alınamıyor"
+
+#: commit-graph.c:1358
+msgid "Loading known commits in commit graph"
+msgstr "İşleme grafiğindeki bilinen işlemeler yükleniyor"
+
+#: commit-graph.c:1375
+msgid "Expanding reachable commits in commit graph"
+msgstr "İşleme grafiğindeki ulaşılabilir işlemeler genişletiliyor"
+
+#: commit-graph.c:1395
+msgid "Clearing commit marks in commit graph"
+msgstr "İşleme grafiğindeki işleme imleri temizleniyor"
+
+#: commit-graph.c:1414
+msgid "Computing commit graph topological levels"
+msgstr "İşleme grafiği ilingesel düzeyleri hesaplanıyor"
+
+#: commit-graph.c:1467
+msgid "Computing commit graph generation numbers"
+msgstr "İşleme grafiği kuşak sayıları hesaplanıyor"
+
+#: commit-graph.c:1548
+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:1625
+msgid "Collecting referenced commits"
+msgstr "Başvurulmuş işlemeler toplanıyor"
+
+#: commit-graph.c:1650
+#, 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:1663
+#, c-format
+msgid "error adding pack %s"
+msgstr "%s paketi eklenirken hata"
+
+#: commit-graph.c:1667
+#, c-format
+msgid "error opening index for %s"
+msgstr "%s için indeks açılırken hata"
+
+#: commit-graph.c:1704
+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:1722
+msgid "Finding extra edges in commit graph"
+msgstr "İşleme grafiğindeki ek sınırlar bulunuyor"
+
+#: commit-graph.c:1771
+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:1802 midx.c:794
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr "%s öncü dizinleri oluşturulamıyor"
+
+#: commit-graph.c:1815
+msgid "unable to create temporary graph layer"
+msgstr "geçici grafik katmanı oluşturulamıyor"
+
+#: commit-graph.c:1820
+#, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "'%s' için paylaşılan izinler ayarlanamıyor"
+
+#: commit-graph.c:1879
+#, 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:1915
+msgid "unable to open commit-graph chain file"
+msgstr "commit-graph zincir dosyası açılamıyor"
+
+#: commit-graph.c:1931
+msgid "failed to rename base commit-graph file"
+msgstr "temel commit-graph dosyası yeniden adlandırılamadı"
+
+#: commit-graph.c:1951
+msgid "failed to rename temporary commit-graph file"
+msgstr "geçici commit-graph dosyası yeniden adlandırılamadı"
+
+#: commit-graph.c:2084
+msgid "Scanning merged commits"
+msgstr "Birleştirilen işlemeler taranıyor"
+
+#: commit-graph.c:2128
+msgid "Merging commit-graph"
+msgstr "commit-graph birleştiriliyor"
+
+#: commit-graph.c:2235
+msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
+msgstr ""
+"bir commit-graph yazılmaya çalışılıyor; ancak 'core.commitGraph' devre dışı"
+
+#: commit-graph.c:2342
+msgid "too many commits to write graph"
+msgstr "grafik yazımı için çok fazla işleme"
+
+#: commit-graph.c:2440
+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:2450
+#, 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:2460 commit-graph.c:2475
+#, 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:2467
+#, 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:2485
+msgid "Verifying commits in commit graph"
+msgstr "İşleme grafiğindeki işlemeler doğrulanıyor"
+
+#: commit-graph.c:2500
+#, 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:2507
+#, 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:2517
+#, 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:2526
+#, 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:2540
+#, 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:2545
+#, 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:2549
+#, 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:2566
+#, c-format
+msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
+msgstr "%s işlemesi için commit-graph kuşağı %<PRIuMAX> < %<PRIuMAX>"
+
+#: commit-graph.c:2572
+#, 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:2887 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr "%s ayrıştırılamadı"
-#: commit.c:53
+#: commit.c:54
#, c-format
msgid "%s %s is not a commit!"
-msgstr "%s %s bir gönderi değil!"
+msgstr "%s %s bir işleme değil!"
-#: commit.c:193
+#: commit.c:194
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -2113,7 +2468,7 @@
"Turn this message off by running\n"
"\"git config advice.graftFileDeprecated false\""
msgstr ""
-"<GIT_DIR>/info/grafts desteği artık kullanım dışı\n"
+"<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"
@@ -2122,308 +2477,43 @@
"\"git config advice.graftFileDeprecated false\"\n"
"kullanarak bu iletiyi kapatabilirsiniz."
-#: commit.c:1153
+#: commit.c:1223
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
-"%s gönderisinin güvenilmeyen bir GPG imzası var, iddiaya göre %s tarafından."
+"%s işlemesinin güvenilmeyen bir GPG imzası var, iddiaya göre %s tarafından."
-#: commit.c:1157
+#: commit.c:1227
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
-msgstr "%s gönderisinin hatalı bir GPG imzası var, iddiaya göre %s tarafından."
+msgstr "%s işlemesinin hatalı bir GPG imzası var, iddiaya göre %s tarafından."
-#: commit.c:1160
+#: commit.c:1230
#, c-format
msgid "Commit %s does not have a GPG signature."
-msgstr "%s gönderisinin bir GPG imzası yok."
+msgstr "%s işlemesinin bir GPG imzası yok."
-#: commit.c:1163
+#: commit.c:1233
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
-msgstr "%s gönderisinin %s tarafından sağlanan düzgün bir GPG imzası var\n"
+msgstr "%s işlemesinin %s tarafından sağlanan düzgün bir GPG imzası var\n"
-#: commit.c:1417
+#: commit.c:1487
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
"variable i18n.commitencoding to the encoding your project uses.\n"
msgstr ""
-"Uyarı: Gönderi iletisi UTF-8'e uymadı.\n"
+"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"
-#: commit-graph.c:122
-msgid "commit-graph file is too small"
-msgstr "commit-graph dosyası pek küçük"
-
-#: commit-graph.c:189
-#, c-format
-msgid "commit-graph signature %X does not match signature %X"
-msgstr "commit-graph imzası %X, %X ile eşleşmiyor"
-
-#: commit-graph.c:196
-#, c-format
-msgid "commit-graph version %X does not match version %X"
-msgstr "commit-graph sürümü %x, %X ile eşleşmiyor"
-
-#: commit-graph.c:203
-#, c-format
-msgid "commit-graph hash version %X does not match version %X"
-msgstr "commit-graph sağlama sürümü %X, %X ile eşleşmiyor"
-
-#: commit-graph.c:226
-msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
-msgstr ""
-"commit-graph iri parça arama tablosu girdisi eksik; dosya tam olmayabilir"
-
-#: commit-graph.c:237
-#, c-format
-msgid "commit-graph improper chunk offset %08x%08x"
-msgstr "commit-graph biçimsiz iri parça ofseti %08x%08x"
-
-#: commit-graph.c:280
-#, c-format
-msgid "commit-graph chunk id %08x appears multiple times"
-msgstr "commit-graph iri parça numarası %08x birden çok görünüyor"
-
-#: commit-graph.c:343
-msgid "commit-graph has no base graphs chunk"
-msgstr "commit-graph temel grafiği iri parçasına iye değil"
-
-#: commit-graph.c:353
-msgid "commit-graph chain does not match"
-msgstr "commit-graph zinciri eşleşmiyor"
-
-#: commit-graph.c:401
-#, c-format
-msgid "invalid commit-graph chain: line '%s' not a hash"
-msgstr "geçersiz commit-graph zinciri: '%s'. satır bir sağlama değil"
-
-#: commit-graph.c:425
-msgid "unable to find all commit-graph files"
-msgstr "tüm commit-graph dosyaları bulunamıyor"
-
-#: commit-graph.c:558 commit-graph.c:618
-msgid "invalid commit position. commit-graph is likely corrupt"
-msgstr "geçersiz gönderi konumu. commit-graph büyük olasılıkla hasar görmüş"
-
-#: commit-graph.c:579
-#, c-format
-msgid "could not find commit %s"
-msgstr "%s gönderisi bulunamadı"
-
-#: commit-graph.c:852 builtin/am.c:1292
-#, c-format
-msgid "unable to parse commit %s"
-msgstr "%s gönderisi ayrıştırılamıyor"
-
-#: commit-graph.c:1011 builtin/pack-objects.c:2782
-#, c-format
-msgid "unable to get type of object %s"
-msgstr "%s nesnesinin türü alınamıyor"
-
-#: commit-graph.c:1043
-msgid "Loading known commits in commit graph"
-msgstr "Gönderi grafiğindeki bilinen gönderiler yükleniyor"
-
-#: commit-graph.c:1060
-msgid "Expanding reachable commits in commit graph"
-msgstr "Gönderi grafiğindeki ulaşılabilir gönderiler genişletiliyor"
-
-#: commit-graph.c:1079
-msgid "Clearing commit marks in commit graph"
-msgstr "Gönderi grafiğindeki gönderi imleri temizleniyor"
-
-#: commit-graph.c:1098
-msgid "Computing commit graph generation numbers"
-msgstr "Gönderi grafiği kuşak sayıları hesaplanıyor"
-
-#: commit-graph.c:1173
-#, c-format
-msgid "Finding commits for commit graph in %d pack"
-msgid_plural "Finding commits for commit graph in %d packs"
-msgstr[0] "Gönderi grafiği için gönderiler %d pakette bulunuyor"
-msgstr[1] "Gönderi grafiği için gönderiler %d pakette bulunuyor"
-
-#: commit-graph.c:1186
-#, c-format
-msgid "error adding pack %s"
-msgstr "%s paketi eklenirken hata"
-
-#: commit-graph.c:1190
-#, c-format
-msgid "error opening index for %s"
-msgstr "%s için indeks açılırken hata"
-
-#: commit-graph.c:1214
-#, c-format
-msgid "Finding commits for commit graph from %d ref"
-msgid_plural "Finding commits for commit graph from %d refs"
-msgstr[0] "Gönderi grafiği için gönderiler %d başvurudan bulunuyor"
-msgstr[1] "Gönderi grafiği için gönderiler %d başvurudan bulunuyor"
-
-#: commit-graph.c:1234
-#, c-format
-msgid "invalid commit object id: %s"
-msgstr "geçersiz gönderi nesne numarası: %s"
-
-#: commit-graph.c:1249
-msgid "Finding commits for commit graph among packed objects"
-msgstr ""
-"Gönderi grafiği için gönderiler paketlenmiş nesneler arasından bulunuyor"
-
-#: commit-graph.c:1264
-msgid "Counting distinct commits in commit graph"
-msgstr "Gönderi grafiğindeki belirgin gönderiler sayılıyor"
-
-#: commit-graph.c:1294
-msgid "Finding extra edges in commit graph"
-msgstr "Gönderi grafiğindeki ek sınırlar bulunuyor"
-
-#: commit-graph.c:1340
-msgid "failed to write correct number of base graph ids"
-msgstr "temel grafiği numaralarının doğru sayısı yazılamadı"
-
-#: commit-graph.c:1373 midx.c:814
-#, c-format
-msgid "unable to create leading directories of %s"
-msgstr "%s öncü dizinleri oluşturulamıyor"
-
-#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248
-#, c-format
-msgid "unable to create '%s'"
-msgstr "'%s' oluşturulamıyor"
-
-#: commit-graph.c:1445
-#, c-format
-msgid "Writing out commit graph in %d pass"
-msgid_plural "Writing out commit graph in %d passes"
-msgstr[0] "Gönderi grafiği %d geçişte yazılıyor"
-msgstr[1] "Gönderi grafiği %d geçişte yazılıyor"
-
-#: commit-graph.c:1486
-msgid "unable to open commit-graph chain file"
-msgstr "commit-graph zincir dosyası açılamıyor"
-
-#: commit-graph.c:1498
-msgid "failed to rename base commit-graph file"
-msgstr "temel commit-graph dosyası yeniden adlandırılamadı"
-
-#: commit-graph.c:1518
-msgid "failed to rename temporary commit-graph file"
-msgstr "geçici commit-graph dosyası yeniden adlandırılamadı"
-
-#: commit-graph.c:1631
-msgid "Scanning merged commits"
-msgstr "Birleştirilen gönderiler taranıyor"
-
-#: commit-graph.c:1642
-#, c-format
-msgid "unexpected duplicate commit id %s"
-msgstr "beklenmedik yinelenmiş gönderi numarası %s"
-
-#: commit-graph.c:1665
-msgid "Merging commit-graph"
-msgstr "commit-graph birleştiriliyor"
-
-#: commit-graph.c:1844
-#, c-format
-msgid "the commit graph format cannot write %d commits"
-msgstr "gönderi grafiği biçimi %d gönderiyi yazamıyor"
-
-#: commit-graph.c:1855
-msgid "too many commits to write graph"
-msgstr "grafik yazabilmek için çok fazla gönderi"
-
-#: commit-graph.c:1944
-msgid "the commit-graph file has incorrect checksum and is likely corrupt"
-msgstr ""
-"commit-graph dosyasının sağlama toplamı yanlış ve büyük olasılıkla hasar "
-"görmüş"
-
-#: commit-graph.c:1954
-#, c-format
-msgid "commit-graph has incorrect OID order: %s then %s"
-msgstr "commit-graph hatalı nesne tanımlayıcı sırasına iye: %s, sonra %s"
-
-#: commit-graph.c:1964 commit-graph.c:1979
-#, c-format
-msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
-msgstr "commit-graph hatalı fanout değerine iye: fanout[%d] = %u != %u"
-
-#: commit-graph.c:1971
-#, c-format
-msgid "failed to parse commit %s from commit-graph"
-msgstr "%s gönderisi commit-graph'tan ayrıştırılamadı"
-
-#: commit-graph.c:1989
-msgid "Verifying commits in commit graph"
-msgstr "Gönderi grafiğindeki gönderiler doğrulanıyor"
-
-#: commit-graph.c:2003
-#, c-format
-msgid "failed to parse commit %s from object database for commit-graph"
-msgstr ""
-"%s gönderisi commit-graph için olan nesne veritabanından ayrıştırılamadı"
-
-#: commit-graph.c:2010
-#, c-format
-msgid "root tree OID for commit %s in commit-graph is %s != %s"
-msgstr ""
-"commit-graph'teki %s gönderisi için olan kök ağaç nesne tanımlayıcısı %s != "
-"%s"
-
-#: commit-graph.c:2020
-#, c-format
-msgid "commit-graph parent list for commit %s is too long"
-msgstr "%s gönderisi için olan commit-graph üst öge listesi çok uzun"
-
-#: commit-graph.c:2029
-#, c-format
-msgid "commit-graph parent for %s is %s != %s"
-msgstr "%s için olan commit-graph üst ögesi %s != %s"
-
-#: commit-graph.c:2042
-#, c-format
-msgid "commit-graph parent list for commit %s terminates early"
-msgstr ""
-"%s gönderisi için olan commit-graph üst öge listesi erkenden sonlanıyor"
-
-#: commit-graph.c:2047
-#, c-format
-msgid ""
-"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
-msgstr ""
-"%s gönderisi için commit-graph kuşak sayısı sıfır ancak başka yerlerde "
-"sıfırdan farklı"
-
-#: commit-graph.c:2051
-#, c-format
-msgid ""
-"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
-msgstr ""
-"%s gönderisi için commit-graph kuşak sayısı sıfırdan farklı, ancak başka "
-"yerlerde sıfır"
-
-#: commit-graph.c:2066
-#, c-format
-msgid "commit-graph generation for commit %s is %u != %u"
-msgstr "%s gönderisi için commit-graph kuşağı %u != %u"
-
-#: commit-graph.c:2072
-#, c-format
-msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
-msgstr ""
-"%s gönderisi için commit-graph içindeki gönderi tarihi %<PRIuMAX> != "
-"%<PRIuMAX>"
-
#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "bellek tükendi"
-#: config.c:124
+#: config.c:126
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2432,303 +2522,347 @@
"\t%s\n"
"This might be due to circular includes."
msgstr ""
-"şu içerilirken olabilecek en çok içerme derinliği (%d) aşıldı\n"
+"aşağıdaki içerilirken olabilecek en çok içerme derinliği (%d) aşıldı:\n"
"\t%s\n"
-"şuradan:\n"
+"içerme konumu:\n"
"\t%s\n"
"Bu dairesel içermelerden dolayı olabilir."
-#: config.c:140
+#: config.c:142
#, c-format
msgid "could not expand include path '%s'"
msgstr "içerme yolu '%s' genişletilemedi"
-#: config.c:151
+#: config.c:153
msgid "relative config includes must come from files"
msgstr "göreceli yapılandırma içermeleri dosyalardan gelmeli"
-#: config.c:197
+#: config.c:199
msgid "relative config include conditionals must come from files"
msgstr "göreceli yapılandırma içerme koşulluları dosyalardan gelmeli"
-#: config.c:376
+#: config.c:396
+#, c-format
+msgid "invalid config format: %s"
+msgstr "geçersiz yapılandırma biçimi: %s"
+
+#: config.c:400
+#, c-format
+msgid "missing environment variable name for configuration '%.*s'"
+msgstr "'%.*s' yapılandırması için ortam değişkeni adı eksik"
+
+#: config.c:405
+#, c-format
+msgid "missing environment variable '%s' for configuration '%.*s'"
+msgstr "şu yapılandırma için '%s' ortam değişkeni eksik: '%.*s'"
+
+#: config.c:442
#, c-format
msgid "key does not contain a section: %s"
-msgstr "anahtar bir bölüm içermiyor: %s"
+msgstr "anahtar, bir bölüm içermiyor: %s"
-#: config.c:382
+#: config.c:448
#, c-format
msgid "key does not contain variable name: %s"
-msgstr "anahtar bir değişken adı içermiyor: %s"
+msgstr "anahtar, bir değişken adı içermiyor: %s"
-#: config.c:406 sequencer.c:2444
+#: config.c:472 sequencer.c:2588
#, c-format
msgid "invalid key: %s"
msgstr "geçersiz anahtar: %s"
-#: config.c:412
+#: config.c:478
#, c-format
msgid "invalid key (newline): %s"
msgstr "geçersiz anahtar (yenisatır): %s"
-#: config.c:448 config.c:460
+#: config.c:511
+msgid "empty config key"
+msgstr "boş yapılandırma anahtarı"
+
+#: config.c:529 config.c:541
#, c-format
msgid "bogus config parameter: %s"
msgstr "düzmece yapılandırma parametresi: %s"
-#: config.c:495
+#: config.c:555 config.c:572 config.c:579 config.c:588
#, c-format
msgid "bogus format in %s"
msgstr "%s içinde düzmece biçim"
-#: config.c:821
+#: config.c:622
+#, c-format
+msgid "bogus count in %s"
+msgstr "%s içinde düzmece sayım"
+
+#: config.c:626
+#, c-format
+msgid "too many entries in %s"
+msgstr "%s içinde çok fazla girdi"
+
+#: config.c:636
+#, c-format
+msgid "missing config key %s"
+msgstr "%s yapılandırma anahtarı eksik"
+
+#: config.c:644
+#, c-format
+msgid "missing config value %s"
+msgstr "%s yapılandırma değeri eksik"
+
+#: config.c:995
#, c-format
msgid "bad config line %d in blob %s"
msgstr "hatalı yapılandırma satırı %d, %s ikili nesnesi içinde"
-#: config.c:825
+#: config.c:999
#, c-format
msgid "bad config line %d in file %s"
msgstr "hatalı yapılandırma satırı %d, %s dosyası içinde"
-#: config.c:829
+#: config.c:1003
#, c-format
msgid "bad config line %d in standard input"
msgstr "standart girdi içinde hatalı yapılandırma satırı %d"
-#: config.c:833
+#: config.c:1007
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "hatalı yapılandırma satırı %d, %s altmodül ikili nesnesi içinde"
-#: config.c:837
+#: config.c:1011
#, c-format
msgid "bad config line %d in command line %s"
msgstr "hatalı yapılandırma satırı %d, %s komut satırı içinde"
-#: config.c:841
+#: config.c:1015
#, c-format
msgid "bad config line %d in %s"
msgstr "hatalı yapılandırma satırı %d, %s içinde"
-#: config.c:978
+#: config.c:1152
msgid "out of range"
msgstr "erim dışı"
-#: config.c:978
+#: config.c:1152
msgid "invalid unit"
msgstr "geçersiz birim"
-#: config.c:979
+#: config.c:1153
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "hatalı sayısal yapılandırma değeri '%s', '%s' için: %s"
-#: config.c:998
+#: config.c:1163
#, c-format
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
msgstr ""
"hatalı sayısal yapılandırma değeri '%s', '%s' için, %s ikili nesnesi içinde: "
"%s"
-#: config.c:1001
+#: config.c:1166
#, c-format
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
msgstr ""
"hatalı sayısal yapılandırma değeri '%s', '%s' için, %s dosyası içinde: %s"
-#: config.c:1004
+#: config.c:1169
#, c-format
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
msgstr ""
"hatalı sayısal yapılandırma değeri '%s', '%s' için, standart girdi içinde: %s"
-#: config.c:1007
+#: config.c:1172
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
"hatalı sayısal yapılandırma değeri '%s', '%s' için, %s altmodül ikili "
"nesnesi içinde: %s"
-#: config.c:1010
+#: config.c:1175
#, c-format
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
msgstr ""
"hatalı sayısal yapılandırma değeri '%s', '%s' için, %s komut satırı içinde: "
"%s"
-#: config.c:1013
+#: config.c:1178
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
msgstr "hatalı sayısal yapılandırma değeri '%s', '%s' için, %s içinde: %s"
-#: config.c:1108
+#: config.c:1194
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr "hatalı Boole yapılandırma değeri '%s', '%s' için"
+
+#: config.c:1289
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "şuradaki kullanıcı dizini genişletilemedi: '%s'"
-#: config.c:1117
+#: config.c:1298
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "%s', '%s' için geçerli bir zaman damgası değil"
-#: config.c:1208
+#: config.c:1391
#, c-format
msgid "abbrev length out of range: %d"
msgstr "kısaltma uzunluğu erim dışında: %d"
-#: config.c:1222 config.c:1233
+#: config.c:1405 config.c:1416
#, c-format
msgid "bad zlib compression level %d"
msgstr "hatalı zlib sıkıştırma düzeyi %d"
-#: config.c:1325
+#: config.c:1508
msgid "core.commentChar should only be one character"
msgstr "core.commentChar yalnızca bir karakter olmalı"
-#: config.c:1358
+#: config.c:1541
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "nesne oluşturma için geçersiz kip: %s"
-#: config.c:1430
+#: config.c:1613
#, c-format
msgid "malformed value for %s"
msgstr "%s için hatalı oluşturulmuş değer"
-#: config.c:1456
+#: config.c:1639
#, c-format
msgid "malformed value for %s: %s"
msgstr "%s için hatalı oluşturulmuş değer: %s"
-#: config.c:1457
+#: config.c:1640
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "nothing, matching, simple, upstream veya current içinden biri olmalı"
-#: config.c:1518 builtin/pack-objects.c:3541
+#: config.c:1701 builtin/pack-objects.c:3666
#, c-format
msgid "bad pack compression level %d"
msgstr "hatalı paket sıkıştırma düzeyi %d"
-#: config.c:1639
+#: config.c:1823
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "'%s' yapılandırma ikili nesnesi yüklenemiyor"
-#: config.c:1642
+#: config.c:1826
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "'%s' başvurusu ikili bir nesneye işaret etmiyor"
-#: config.c:1659
+#: config.c:1843
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "'%s' yapılandırma ikili nesnesi çözülemiyor"
-#: config.c:1689
+#: config.c:1873
#, c-format
msgid "failed to parse %s"
msgstr "%s ayrıştırılamadı"
-#: config.c:1743
+#: config.c:1927
msgid "unable to parse command-line config"
msgstr "komut satırı yapılandırması ayrıştırılamıyor"
-#: config.c:2097
+#: config.c:2290
msgid "unknown error occurred while reading the configuration files"
msgstr "yapılandırma dosyaları okunurken beklenmedik bir hata oluştu"
-#: config.c:2267
+#: config.c:2464
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Geçersiz %s: '%s'"
-#: config.c:2312
+#: config.c:2509
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "splitIndex.maxPercentChange değeri '%d' 0 ve 100 arasında olmalı"
-#: config.c:2358
+#: config.c:2555
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "'%s' komut satırı yapılandırmasından ayrıştırılamıyor"
-#: config.c:2360
+#: config.c:2557
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "hatalı yapılandırma değişkeni '%s', '%s' dosyası %d. satırda"
-#: config.c:2441
+#: config.c:2641
#, c-format
msgid "invalid section name '%s'"
msgstr "geçersiz bölüm adı '%s'"
-#: config.c:2473
+#: config.c:2673
#, c-format
msgid "%s has multiple values"
msgstr "%s birden çok değere iye"
-#: config.c:2502
+#: config.c:2702
#, c-format
msgid "failed to write new configuration file %s"
msgstr "yeni yapılandırma dosyası %s yazılamadı"
-#: config.c:2754 config.c:3078
+#: config.c:2954 config.c:3280
#, c-format
msgid "could not lock config file %s"
msgstr "%s yapılandırma dosyası kilitlenemedi"
-#: config.c:2765
+#: config.c:2965
#, c-format
msgid "opening %s"
msgstr "%s açılıyor"
-#: config.c:2800 builtin/config.c:344
+#: config.c:3002 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "geçersiz dizgi: %s"
-#: config.c:2825
+#: config.c:3027
#, c-format
msgid "invalid config file %s"
msgstr "geçersiz yapılandırma dosyası %s"
-#: config.c:2838 config.c:3091
+#: config.c:3040 config.c:3293
#, c-format
msgid "fstat on %s failed"
msgstr "%s üzerinde fstat başarısız oldu"
-#: config.c:2849
+#: config.c:3051
#, c-format
msgid "unable to mmap '%s'"
msgstr "'%s' mmap yapılamıyor"
-#: config.c:2858 config.c:3096
+#: config.c:3060 config.c:3298
#, c-format
msgid "chmod on %s failed"
msgstr "%s üzerinde chmod başarısız oldu"
-#: config.c:2943 config.c:3193
+#: config.c:3145 config.c:3395
#, c-format
msgid "could not write config file %s"
msgstr "%s yapılandırma dosyası yazılamadı"
-#: config.c:2977
+#: config.c:3179
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "'%s', '%s' olarak ayarlanamadı"
-#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
+#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
#, c-format
msgid "could not unset '%s'"
-msgstr "'%s' ayarı geri alınamadı"
+msgstr "'%s' ayarı kapatılamadı"
-#: config.c:3069
+#: config.c:3271
#, c-format
msgid "invalid section name: %s"
msgstr "geçersiz bölüm adı: %s"
-#: config.c:3236
+#: config.c:3438
#, c-format
msgid "missing value for '%s'"
msgstr "'%s' için değer eksik"
@@ -2754,157 +2888,170 @@
msgid "server doesn't support '%s'"
msgstr "sunucu '%s' desteklemiyor"
-#: connect.c:103
+#: connect.c:118
#, c-format
msgid "server doesn't support feature '%s'"
msgstr "sunucu '%s' özelliğini desteklemiyor"
-#: connect.c:114
+#: connect.c:129
msgid "expected flush after capabilities"
msgstr "yeteneklerden sonra floş bekleniyordu"
-#: connect.c:233
+#: 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:252
+#: connect.c:284
msgid "protocol error: unexpected capabilities^{}"
msgstr "protokol hatası: beklenmedik yetenekler^{}"
-#: connect.c:273
+#: 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:275
+#: connect.c:308
msgid "repository on the other end cannot be shallow"
msgstr "diğer uçtaki depo sığ olamaz"
-#: connect.c:313
+#: connect.c:347
msgid "invalid packet"
msgstr "geçersiz paket"
-#: connect.c:333
+#: connect.c:367
#, c-format
msgid "protocol error: unexpected '%s'"
msgstr "protokol hatası: beklenmedik '%s'"
-#: connect.c:441
+#: connect.c:497
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr "sunucu tarafından bilinmeyen nesne biçimi '%s' belirtildi"
+
+#: connect.c:526
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "geçersiz ls-refs yanıtı: %s"
-#: connect.c:445
+#: connect.c:530
msgid "expected flush after ref listing"
msgstr "başvuru listelemesinden sonra floş bekleniyordu"
-#: connect.c:544
+#: connect.c:533
+msgid "expected response end packet after ref listing"
+msgstr "başvuru listelemesinden sonra yanıt sonu paketi bekleniyordu"
+
+#: connect.c:666
#, c-format
msgid "protocol '%s' is not supported"
msgstr "'%s' protokolü desteklenmiyor"
-#: connect.c:595
+#: connect.c:717
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "soket üzerinde SO_KEEPALIVE ayarlanamıyor"
-#: connect.c:635 connect.c:698
+#: connect.c:757 connect.c:820
#, c-format
msgid "Looking up %s ... "
-msgstr "%s aranıyor..."
+msgstr "%s adresi aranıyor..."
-#: connect.c:639
+#: connect.c:761
#, c-format
msgid "unable to look up %s (port %s) (%s)"
msgstr "%s aranamıyor (kapı %s) (%s)"
#. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:643 connect.c:714
+#: connect.c:765 connect.c:836
#, c-format
msgid ""
"done.\n"
"Connecting to %s (port %s) ... "
msgstr ""
"bitti.\n"
-"Şuraya bağlanıyor: %s (kapı %s)..."
+"%s adresine bağlanılıyor (kapı %s)..."
-#: connect.c:665 connect.c:742
+#: connect.c:787 connect.c:864
#, c-format
msgid ""
"unable to connect to %s:\n"
"%s"
msgstr ""
-"şuraya bağlanamıyor: %s:\n"
+"%s adresine bağlanılıyor:\n"
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:671 connect.c:748
+#: connect.c:793 connect.c:870
msgid "done."
msgstr "bitti."
-#: connect.c:702
+#: connect.c:824
#, c-format
msgid "unable to look up %s (%s)"
msgstr "%s aranamıyor (%s)"
-#: connect.c:708
+#: connect.c:830
#, c-format
msgid "unknown port %s"
msgstr "bilinmeyen kapı %s"
-#: connect.c:845 connect.c:1175
+#: connect.c:967 connect.c:1299
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "garip makine adı '%s' engellendi"
-#: connect.c:847
+#: connect.c:969
#, c-format
msgid "strange port '%s' blocked"
msgstr "garip kapı '%s' engellendi"
-#: connect.c:857
+#: connect.c:979
#, c-format
msgid "cannot start proxy %s"
msgstr "vekil %s başlatılamıyor"
-#: connect.c:928
+#: connect.c:1050
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr "yol belirtilmedi; geçerli url sözdizimi için 'git help pull' yazın"
-#: connect.c:1123
+#: connect.c:1190
+msgid "newline is forbidden in git:// hosts and repo paths"
+msgstr "git:// makinelerinde ve depo yollarında yenisatır karakteri yasak"
+
+#: connect.c:1247
msgid "ssh variant 'simple' does not support -4"
msgstr "ssh değişik biçimi 'simple' -4 desteklemiyor"
-#: connect.c:1135
+#: connect.c:1259
msgid "ssh variant 'simple' does not support -6"
msgstr "ssh değişik biçimi 'simple' -6 desteklemiyor"
-#: connect.c:1152
+#: connect.c:1276
msgid "ssh variant 'simple' does not support setting port"
msgstr "ssh değişik biçimi 'simple' kapı ayarlamayı desteklemiyor"
-#: connect.c:1264
+#: connect.c:1388
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "garip yol adı '%s' engellendi"
-#: connect.c:1311
+#: connect.c:1436
msgid "unable to fork"
msgstr "çatallanamıyor"
-#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43
+#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45
msgid "Checking connectivity"
msgstr "Bağlantı denetleniyor"
-#: connected.c:110
+#: connected.c:120
msgid "Could not run 'git rev-list'"
msgstr "'git rev-list' çalıştırılamadı"
-#: connected.c:130
+#: connected.c:144
msgid "failed write to rev-list"
msgstr "rev-list yazılamadı"
-#: connected.c:137
+#: connected.c:149
msgid "failed to close rev-list's stdin"
msgstr "rev-list'in stdin'i kapatılamadı"
@@ -2980,60 +3127,88 @@
msgstr ""
"'%s' kodlamasını %s -> %s biçiminde yapıp tersine döndürmek aynı şey değil"
-#: convert.c:668
+#: 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:688
+#: convert.c:685
#, c-format
msgid "cannot feed the input to external filter '%s'"
msgstr "girdi '%s' dış süzgecine beslenemiyor"
-#: convert.c:695
+#: 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:730 convert.c:733
+#: 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:736 convert.c:791
+#: 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:839
+#: convert.c:837
msgid "unexpected filter type"
msgstr "beklenmedik süzgeç türü"
-#: convert.c:850
+#: convert.c:848
msgid "path name too long for external filter"
msgstr "dış süzgeç için yol adı pek uzun"
-#: convert.c:924
+#: 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"
+"'%s' dış süzgeci artık kullanılamıyor; ancak tüm yolların süzümü bitmedi"
-#: convert.c:1223
+#: 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:1411 convert.c:1445
+#: 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:1489
+#: convert.c:1508
#, c-format
msgid "%s: smudge filter %s failed"
-msgstr "%s: kir süzgeci %s başarısız oldu"
+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"
@@ -3129,14 +3304,30 @@
msgid "Marked %d islands, done.\n"
msgstr "%d delta adası imlendi, bitti.\n"
-#: diffcore-order.c:24
+#: diff-merges.c:70
#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "orderfile '%s' okunamadı"
+msgid "unknown value for --diff-merges: %s"
+msgstr "--diff-merges için bilinmeyen değer: %s"
-#: diffcore-rename.c:543
-msgid "Performing inexact rename detection"
-msgstr "Kesin olmayan yeniden adlandırma algılaması gerçekleştiriliyor"
+#: diff-lib.c:534
+msgid "--merge-base does not work with ranges"
+msgstr "--merge-base erimlerle çalışmaz"
+
+#: diff-lib.c:536
+msgid "--merge-base only works with commits"
+msgstr "--merge-base yalnızca işlemelerle çalışır"
+
+#: diff-lib.c:553
+msgid "unable to get HEAD"
+msgstr "HEAD alınamıyor"
+
+#: diff-lib.c:560
+msgid "no merge base found"
+msgstr "bir birleştirme temeli bulunamadı"
+
+#: diff-lib.c:562
+msgid "multiple merge bases found"
+msgstr "birden çok birleştirme temeli bulundu"
#: diff-no-index.c:238
msgid "git diff --no-index [<options>] <path> <path>"
@@ -3150,17 +3341,17 @@
"Bir git deposu değil. Bir çalışma ağacının dışındaki iki yolu karşılaştırmak "
"için --no-index kullanın."
-#: diff.c:155
+#: 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:160
+#: diff.c:161
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Bilinmeyen dirstat parametresi '%s'\n"
-#: diff.c:296
+#: diff.c:297
msgid ""
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
"'dimmed-zebra', 'plain'"
@@ -3168,7 +3359,7 @@
"\"color-moved\" ayarı 'no', 'default', 'blocks', 'zebra', 'dimmed-zebra', "
"'plain' seçeneklerinden biri olmalıdır"
-#: diff.c:324
+#: diff.c:325
#, c-format
msgid ""
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -3177,7 +3368,7 @@
"bilinmeyen color-moved-ws kipi '%s', olabilecek değerler: 'ignore-space-"
"change', 'ignore-space-at-eol', 'ignore-all-space' 'allow-indentation-change'"
-#: diff.c:332
+#: diff.c:333
msgid ""
"color-moved-ws: allow-indentation-change cannot be combined with other "
"whitespace modes"
@@ -3185,12 +3376,12 @@
"color-moved-ws: allow-indentation-change diğer boşluk kipleri ile birlikte "
"kullanılamaz"
-#: diff.c:405
+#: 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:465
+#: diff.c:470
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -3199,35 +3390,35 @@
"'diff.dirstat' yapılandırma değişkeninde hatalar bulundu:\n"
"%s"
-#: diff.c:4202
+#: diff.c:4276
#, c-format
msgid "external diff died, stopping at %s"
msgstr "dış diff sonlandı, %s konumunda durdu"
-#: diff.c:4547
+#: diff.c:4628
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check ve -s birlikte kullanılmaz"
-#: diff.c:4550
+#: diff.c:4631
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G, -S ve --find-object birlikte kullanılmaz"
-#: diff.c:4628
+#: diff.c:4710
msgid "--follow requires exactly one pathspec"
msgstr "--follow tam olarak yalnızca bir yol belirteci gerektiriyor"
-#: diff.c:4676
+#: diff.c:4758
#, c-format
msgid "invalid --stat value: %s"
msgstr "geçersiz --stat değeri: %s"
-#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
-#: parse-options.c:197 parse-options.c:201
+#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306
+#: 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:4713
+#: diff.c:4795
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3236,42 +3427,42 @@
"--dirstat/-X seçenek parametresi ayrıştırılamadı:\n"
"%s"
-#: diff.c:4798
+#: diff.c:4880
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "şurada bilinmeyen değişiklik sınıfı '%c': -diff-filter=%s"
-#: diff.c:4822
+#: diff.c:4904
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "şundan sonra bilinmeyen değer: ws-error-highlight=%.*s"
-#: diff.c:4836
+#: diff.c:4918
#, c-format
msgid "unable to resolve '%s'"
msgstr "'%s' çözülemiyor"
-#: diff.c:4886 diff.c:4892
+#: diff.c:4968 diff.c:4974
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s <n>/<m> biçimi bekliyor"
-#: diff.c:4904
+#: diff.c:4986
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s bir karakter bekliyor, '%s' aldı"
-#: diff.c:4925
+#: diff.c:5007
#, c-format
msgid "bad --color-moved argument: %s"
-msgstr "hatalı --color-moved değişkeni: %s"
+msgstr "hatalı --color-moved argümanı: %s"
-#: diff.c:4944
+#: diff.c:5026
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "--color-moved-ws içinde geçersiz kip '%s'"
-#: diff.c:4984
+#: diff.c:5066
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
@@ -3279,157 +3470,162 @@
"diff-algorithm seçeneği şunları kabul eder: \"myers\", \"minimal\", "
"\"patience\" ve \"histogram\""
-#: diff.c:5020 diff.c:5040
+#: diff.c:5102 diff.c:5122
#, c-format
msgid "invalid argument to %s"
-msgstr "%s için geçersiz değişken"
+msgstr "%s için geçersiz argüman"
-#: diff.c:5178
+#: diff.c:5226
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr "-I'ya geçersiz düzenli ifade verildi: '%s'"
+
+#: diff.c:5275
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "--submodule seçenek parametresi ayrıştırılamadı: '%s'"
-#: diff.c:5234
+#: diff.c:5331
#, c-format
msgid "bad --word-diff argument: %s"
-msgstr "hatalı --word-diff değişkeni: %s"
+msgstr "hatalı --word-diff argümanı: %s"
-#: diff.c:5257
+#: diff.c:5367
msgid "Diff output format options"
msgstr "Diff çıktısı biçimlendirme seçenekleri"
-#: diff.c:5259 diff.c:5265
+#: diff.c:5369 diff.c:5375
msgid "generate patch"
msgstr "yama oluştur"
-#: diff.c:5262 builtin/log.c:173
+#: diff.c:5372 builtin/log.c:179
msgid "suppress diff output"
msgstr "diff çıktısını gizle"
-#: diff.c:5267 diff.c:5381 diff.c:5388
+#: diff.c:5377 diff.c:5491 diff.c:5498
msgid "<n>"
msgstr "<n>"
-#: diff.c:5268 diff.c:5271
+#: diff.c:5378 diff.c:5381
msgid "generate diffs with <n> lines context"
msgstr "diff'leri <n> satır bağlamlı oluştur"
-#: diff.c:5273
+#: diff.c:5383
msgid "generate the diff in raw format"
msgstr "diff'i ham biçimde oluştur"
-#: diff.c:5276
+#: diff.c:5386
msgid "synonym for '-p --raw'"
msgstr "'-p --raw eşanlamlısı"
-#: diff.c:5280
+#: diff.c:5390
msgid "synonym for '-p --stat'"
msgstr "'-p --stat eşanlamlısı"
-#: diff.c:5284
+#: diff.c:5394
msgid "machine friendly --stat"
msgstr "makinede okunabilen --stat"
-#: diff.c:5287
+#: diff.c:5397
msgid "output only the last line of --stat"
msgstr "--stat'ın yalnızca son satırını çıktı ver"
-#: diff.c:5289 diff.c:5297
+#: diff.c:5399 diff.c:5407
msgid "<param1,param2>..."
msgstr "<param1,param2>..."
-#: diff.c:5290
+#: diff.c:5400
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr ""
"her alt dizin için göreceli bir miktar değişikliğin dağıtımını çıktı ver"
-#: diff.c:5294
+#: diff.c:5404
msgid "synonym for --dirstat=cumulative"
msgstr "--dirstat-cumulative eşanlamlısı"
-#: diff.c:5298
+#: diff.c:5408
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "--dirstat=files,param1,param2... eşanlamlısı"
-#: diff.c:5302
+#: diff.c:5412
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
"değişiklikler çakışma imleyicileri veya boşluk hataları doğuruyorsa uyar"
-#: diff.c:5305
+#: diff.c:5415
msgid "condensed summary such as creations, renames and mode changes"
msgstr ""
"sıkışık özet; örn. oluşumlar, yeniden adlandırmalar ve kip değişiklikleri"
-#: diff.c:5308
+#: diff.c:5418
msgid "show only names of changed files"
msgstr "yalnızca değiştirilen dosyaların adlarını göster"
-#: diff.c:5311
+#: diff.c:5421
msgid "show only names and status of changed files"
msgstr "yalnızca değiştirilen dosyaların adlarını ve durumlarını göster"
-#: diff.c:5313
+#: diff.c:5423
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<genişlik>[,<ad-genişlik>[,<sayım>]]"
-#: diff.c:5314
+#: diff.c:5424
msgid "generate diffstat"
msgstr "diffstat oluştur"
-#: diff.c:5316 diff.c:5319 diff.c:5322
+#: diff.c:5426 diff.c:5429 diff.c:5432
msgid "<width>"
msgstr "<genişlik>"
-#: diff.c:5317
+#: diff.c:5427
msgid "generate diffstat with a given width"
msgstr "diffstat'ı verilmiş bir genişlik ile oluştur"
-#: diff.c:5320
+#: diff.c:5430
msgid "generate diffstat with a given name width"
msgstr "diffstat'ı verilmiş bir ad genişliği ile oluştur"
-#: diff.c:5323
+#: diff.c:5433
msgid "generate diffstat with a given graph width"
msgstr "diffstat'ı verilmiş bir grafik genişliği ile oluştur"
-#: diff.c:5325
+#: diff.c:5435
msgid "<count>"
msgstr "<sayım>"
-#: diff.c:5326
+#: diff.c:5436
msgid "generate diffstat with limited lines"
msgstr "diffstat'ı kısıtlı satırlarla oluştur"
-#: diff.c:5329
+#: diff.c:5439
msgid "generate compact summary in diffstat"
msgstr "diffstat içinde ufak özet oluştur"
-#: diff.c:5332
+#: diff.c:5442
msgid "output a binary diff that can be applied"
msgstr "uygulanabilir bir ikili diff çıktısı ver"
-#: diff.c:5335
+#: diff.c:5445
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr "\"index\" satırlarında tam ön ve songörüntü nesne adlarını göster"
-#: diff.c:5337
+#: diff.c:5447
msgid "show colored diff"
msgstr "renkli diff göster"
-#: diff.c:5338
+#: diff.c:5448
msgid "<kind>"
-msgstr "<tür>"
+msgstr "<çeşit>"
-#: diff.c:5339
+#: diff.c:5449
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgstr ""
"diff'teki boşluk hatalarını 'context', 'old' veya 'new' satırlarında vurgula"
-#: diff.c:5342
+#: diff.c:5452
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3437,88 +3633,88 @@
"--raw veya --numstat içinde yol adlarını tahrip etme ve çıktı alanı "
"sonlandırıcıları olarak NUL'ları kullan"
-#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457
+#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570
msgid "<prefix>"
msgstr "<önek>"
-#: diff.c:5346
+#: diff.c:5456
msgid "show the given source prefix instead of \"a/\""
msgstr "\"a/\" yerine verilmiş kaynak önekini göster"
-#: diff.c:5349
+#: diff.c:5459
msgid "show the given destination prefix instead of \"b/\""
msgstr "\"b/\"yerine verilmiş kaynak önekini göster"
-#: diff.c:5352
+#: diff.c:5462
msgid "prepend an additional prefix to every line of output"
msgstr "çıktının her satırının başına ek bir önek ekle"
-#: diff.c:5355
+#: diff.c:5465
msgid "do not show any source or destination prefix"
msgstr "hiçbir kaynak ve hedef önekini gösterme"
-#: diff.c:5358
+#: diff.c:5468
msgid "show context between diff hunks up to the specified number of lines"
msgstr "diff parçaları arasındaki bağlamı belirtilen satır sayısı kadar göster"
-#: diff.c:5362 diff.c:5367 diff.c:5372
+#: diff.c:5472 diff.c:5477 diff.c:5482
msgid "<char>"
msgstr "<karakter>"
-#: diff.c:5363
+#: diff.c:5473
msgid "specify the character to indicate a new line instead of '+'"
msgstr "yeni satırı belirtmek için '+' yerine kullanılacak karakteri belirle"
-#: diff.c:5368
+#: diff.c:5478
msgid "specify the character to indicate an old line instead of '-'"
msgstr "eski satırı belirtmek için '-' yerine kullanılacak karakteri belirle"
-#: diff.c:5373
+#: diff.c:5483
msgid "specify the character to indicate a context instead of ' '"
msgstr "bağlam belirtmek için ' ' yerine kullanılacak karakteri belirle"
-#: diff.c:5376
+#: diff.c:5486
msgid "Diff rename options"
msgstr "Diff yeniden adlandırma seçenekleri"
-#: diff.c:5377
+#: diff.c:5487
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5378
+#: diff.c:5488
msgid "break complete rewrite changes into pairs of delete and create"
msgstr "tam yeniden yazım değişikliklerini silme ve oluşturma olarak ayır"
-#: diff.c:5382
+#: diff.c:5492
msgid "detect renames"
msgstr "yeniden adlandırmaları algıla"
-#: diff.c:5386
+#: diff.c:5496
msgid "omit the preimage for deletes"
msgstr "silmeler için öngörüntüyü atla"
-#: diff.c:5389
+#: diff.c:5499
msgid "detect copies"
msgstr "kopyaları algıla"
-#: diff.c:5393
+#: diff.c:5503
msgid "use unmodified files as source to find copies"
msgstr "değiştirilmemiş dosyaları kopyaları bulmak için kaynak olarak kullan"
-#: diff.c:5395
+#: diff.c:5505
msgid "disable rename detection"
msgstr "yeniden adlandırma algılamasını devre dışı bırak"
-#: diff.c:5398
+#: diff.c:5508
msgid "use empty blobs as rename source"
msgstr "boş ikili nesneleri yeniden adlandırma kaynağı olarak kullan"
-#: diff.c:5400
+#: diff.c:5510
msgid "continue listing the history of a file beyond renames"
msgstr ""
"bir dosyanın geçmişini listelemeyi yeniden adlandırmaların ötesinde sürdür"
-#: diff.c:5403
+#: diff.c:5513
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
@@ -3526,218 +3722,234 @@
"eğer yeniden adlandırma/kopyalama hedeflerinin sayısı verilen sınırı aşarsa "
"yeniden adlandırma/kopyalama algılamasını önle"
-#: diff.c:5405
+#: diff.c:5515
msgid "Diff algorithm options"
msgstr "Diff algoritma seçenekleri"
-#: diff.c:5407
+#: diff.c:5517
msgid "produce the smallest possible diff"
msgstr "olabilecek en küçük diff'i üret"
-#: diff.c:5410
+#: diff.c:5520
msgid "ignore whitespace when comparing lines"
msgstr "satırları karşılaştırırken boşlukları yok say"
-#: diff.c:5413
+#: diff.c:5523
msgid "ignore changes in amount of whitespace"
msgstr "boşluk sayısındaki değişiklikleri yok say"
-#: diff.c:5416
+#: diff.c:5526
msgid "ignore changes in whitespace at EOL"
msgstr "satır sonundaki boşluk değişikliklerini yok say"
-#: diff.c:5419
+#: diff.c:5529
msgid "ignore carrier-return at the end of line"
msgstr "satır sonundaki satırbaşı karakterini yok say"
-#: diff.c:5422
+#: diff.c:5532
msgid "ignore changes whose lines are all blank"
msgstr "satırlarının tümü boş olan değişiklikleri yok say"
-#: diff.c:5425
+#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604
+msgid "<regex>"
+msgstr "<ifade>"
+
+#: diff.c:5535
+msgid "ignore changes whose all lines match <regex>"
+msgstr "satırlarının tümü <ifade> ile eşleşen değişiklikleri yok say"
+
+#: diff.c:5538
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr "diff parça sınırlarını kolay okuma için bulgusal olarak kaydır"
-#: diff.c:5428
+#: diff.c:5541
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "diff'i \"patience diff\" algoritmasını kullanarak oluştur"
-#: diff.c:5432
+#: diff.c:5545
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "diff'i \"histogram diff\" algoritmasını kullanarak oluştur"
-#: diff.c:5434
+#: diff.c:5547
msgid "<algorithm>"
msgstr "<algoritma>"
-#: diff.c:5435
+#: diff.c:5548
msgid "choose a diff algorithm"
msgstr "bir diff algoritması seç"
-#: diff.c:5437
+#: diff.c:5550
msgid "<text>"
msgstr "<metin>"
-#: diff.c:5438
+#: diff.c:5551
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "diff'i \"anchored diff\" algoritmasını kullanarak oluştur"
-#: diff.c:5440 diff.c:5449 diff.c:5452
+#: diff.c:5553 diff.c:5562 diff.c:5565
msgid "<mode>"
msgstr "<kip>"
-#: diff.c:5441
+#: diff.c:5554
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
"sözcük diff'ini değiştirilen sözcükleri sınırlandırmak için <kip> kullanarak "
"göster"
-#: diff.c:5443 diff.c:5446 diff.c:5491
-msgid "<regex>"
-msgstr "<ifade>"
-
-#: diff.c:5444
+#: diff.c:5557
msgid "use <regex> to decide what a word is"
msgstr "bir sözcüğün ne olduğuna karar vermek için <ifade> kullan"
-#: diff.c:5447
+#: diff.c:5560
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "şuna eşdeğer: --word-diff=color --word-diff-regex=<ifade>"
-#: diff.c:5450
+#: diff.c:5563
msgid "moved lines of code are colored differently"
msgstr "taşınan kod satırları farklı renklendirilir"
-#: diff.c:5453
+#: diff.c:5566
msgid "how white spaces are ignored in --color-moved"
msgstr "boşluklar --color-moved içinde nasıl yok sayılır"
-#: diff.c:5456
+#: diff.c:5569
msgid "Other diff options"
msgstr "Diğer diff seçenekleri"
-#: diff.c:5458
+#: diff.c:5571
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
"altdizinden çalıştırıldığında dışarıdaki değişiklikleri hariç tut ve "
"göreceli yolları göster"
-#: diff.c:5462
+#: diff.c:5575
msgid "treat all files as text"
msgstr "tüm dosyaları metin olarak varsay"
-#: diff.c:5464
+#: diff.c:5577
msgid "swap two inputs, reverse the diff"
msgstr "iki girdiyi değiştir, diff'i tersine döndür"
-#: diff.c:5466
+#: diff.c:5579
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "ayrımlar varsa 1 ile, yoksa 0 ile çık"
-#: diff.c:5468
+#: diff.c:5581
msgid "disable all output of the program"
msgstr "tüm program çıktısını devre dışı bırak"
-#: diff.c:5470
+#: diff.c:5583
msgid "allow an external diff helper to be executed"
msgstr "bir dış diff yardımcısının çalıştırılmasına izin ver"
-#: diff.c:5472
+#: diff.c:5585
msgid "run external text conversion filters when comparing binary files"
msgstr ""
"ikili dosyaları karşılaştırırken dış metin dönüştürme süzgeçlerini çalıştır"
-#: diff.c:5474
+#: diff.c:5587
msgid "<when>"
msgstr "<ne-zaman>"
-#: diff.c:5475
+#: diff.c:5588
msgid "ignore changes to submodules in the diff generation"
msgstr "diff oluştururken altmodüllere olan değişiklikleri yok say"
-#: diff.c:5478
+#: diff.c:5591
msgid "<format>"
msgstr "<biçim>"
-#: diff.c:5479
+#: diff.c:5592
msgid "specify how differences in submodules are shown"
msgstr "altmodüllerdeki değişikliklerin nasıl gösterileceğini belirt"
-#: diff.c:5483
+#: diff.c:5596
msgid "hide 'git add -N' entries from the index"
msgstr "indeksten 'git add -N' girdilerini gizle"
-#: diff.c:5486
+#: diff.c:5599
msgid "treat 'git add -N' entries as real in the index"
msgstr "indekste 'git add -N' girdilerine gerçekmiş gibi davran"
-#: diff.c:5488
+#: diff.c:5601
msgid "<string>"
msgstr "<dizi>"
-#: diff.c:5489
+#: diff.c:5602
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr "belirtilen dizinin görülme sayısını değiştiren ayrımlara bak"
-#: diff.c:5492
+#: diff.c:5605
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr "belirtilen düzenli ifadenin görülme sayısını değiştiren ayrımlara bak"
-#: diff.c:5495
+#: diff.c:5608
msgid "show all changes in the changeset with -S or -G"
msgstr "değişiklik setinde -S veya -G içeren tüm değişiklikleri göster"
-#: diff.c:5498
+#: diff.c:5611
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "-S içindeki <dizi>'yi genişletilmiş POSIX düzenli ifadesi olarak işle"
-#: diff.c:5501
+#: diff.c:5614
msgid "control the order in which files appear in the output"
msgstr "dosyaların çıktıda hangi sırayla görüneceğini denetle"
-#: diff.c:5502
+#: diff.c:5615 diff.c:5618
+msgid "<path>"
+msgstr "<yol>"
+
+#: diff.c:5616
+msgid "show the change in the specified path first"
+msgstr "öncelikle belirtilen yoldaki değişikliği göster"
+
+#: diff.c:5619
+msgid "skip the output to the specified path"
+msgstr "belirtilen yola olan çıktıyı atla"
+
+#: diff.c:5621
msgid "<object-id>"
msgstr "<nesne-no>"
-#: diff.c:5503
+#: diff.c:5622
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr "belirtilen nesnenin görülme sayısını değiştiren ayrımlara bak"
-#: diff.c:5505
+#: diff.c:5624
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5506
+#: diff.c:5625
msgid "select files by diff type"
msgstr "dosyaları diff türüne göre seç"
-#: diff.c:5508
+#: diff.c:5627
msgid "<file>"
msgstr "<dosya>"
-#: diff.c:5509
+#: diff.c:5628
msgid "Output to a specific file"
msgstr "belirli bir dosyaya çıktı ver"
-#: diff.c:6164
+#: diff.c:6285
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
"Kesin olmayan yeniden adlandırma algılaması çok fazla dosya olmasından "
"dolayı atlandı."
-#: diff.c:6167
+#: diff.c:6288
msgid "only found copies from modified paths due to too many files."
msgstr ""
"Çok fazla dosya olmasından dolayı yalnızca değiştirilen yollardan kopyalar "
"bulundu."
-#: diff.c:6170
+#: diff.c:6291
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -3745,83 +3957,97 @@
"%s değişkeninizi en azından %d olarak ayarlamak ve komutu yeniden denemek "
"isteyebilirsiniz."
-#: dir.c:555
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "orderfile '%s' okunamadı"
+
+#: diffcore-rename.c:786
+msgid "Performing inexact rename detection"
+msgstr "Kesin olmayan yeniden adlandırma algılaması gerçekleştiriliyor"
+
+#: diffcore-rotate.c:29
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr "diff'te '%s' diye bir yol yok"
+
+#: 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:695 dir.c:724 dir.c:737
+#: dir.c:718 dir.c:747 dir.c:760
#, c-format
msgid "unrecognized pattern: '%s'"
msgstr "tanımlanamayan dizgi: '%s'"
-#: dir.c:754 dir.c:768
+#: dir.c:777 dir.c:791
#, c-format
msgid "unrecognized negative pattern: '%s'"
msgstr "tanımlanamayan negatif dizgi: '%s'"
-#: dir.c:786
+#: 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:796
+#: dir.c:819
msgid "disabling cone pattern matching"
msgstr "koni dizgi eşleşmesi devre dışı bırakılıyor"
-#: dir.c:1173
+#: dir.c:1198
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "%s bir 'exclude' dosyası olarak kullanılamıyor"
-#: dir.c:2144
+#: dir.c:2305
#, c-format
msgid "could not open directory '%s'"
msgstr "'%s' dizini açılamadı"
-#: dir.c:2479
+#: dir.c:2605
msgid "failed to get kernel name and information"
msgstr "çekirdek adı ve bilgisi alınamadı"
-#: dir.c:2603
+#: 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:3407
+#: dir.c:3534
#, c-format
msgid "index file corrupt in repo %s"
msgstr "%s deposundaki indeks dosyası hasarlı"
-#: dir.c:3452 dir.c:3457
+#: dir.c:3579 dir.c:3584
#, c-format
msgid "could not create directories for %s"
msgstr "%s için dizinler oluşturulamadı"
-#: dir.c:3486
+#: dir.c:3613
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "git dizini '%s' konumundan '%s' konumuna göç ettirilemedi"
-#: editor.c:73
+#: 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:178
+#: entry.c:177
msgid "Filtering content"
msgstr "İçerik süzülüyor"
-#: entry.c:476
+#: entry.c:478
#, c-format
msgid "could not stat file '%s'"
msgstr "'%s' dosyasının bilgileri alınamadı"
-#: environment.c:149
+#: environment.c:152
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "hatalı git ad alanı yolu \"%s\""
-#: environment.c:331
+#: environment.c:335
#, c-format
msgid "could not set GIT_DIR to '%s'"
msgstr "GIT_DIR şuna ayarlanamadı: '%s'"
@@ -3829,271 +4055,293 @@
#: 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"
+msgstr "%s çalıştırmak için çok fazla argüman"
-#: fetch-pack.c:150
+#: fetch-pack.c:177
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: sığ bir liste bekleniyordu"
-#: fetch-pack.c:153
+#: fetch-pack.c:180
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr "git fetch-pack: sığ listeden sonra floş paketi bekleniyordu"
-#: fetch-pack.c:164
+#: fetch-pack.c:191
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack: ACK/NAK bekleniyordu, floş paket alındı"
-#: fetch-pack.c:184
+#: fetch-pack.c:211
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: ACK/NAK bekleniyordu, '%s' alındı"
-#: fetch-pack.c:195
+#: fetch-pack.c:222
msgid "unable to write to remote"
msgstr "uzak konuma yazılamıyor"
-#: fetch-pack.c:257
+#: fetch-pack.c:283
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc multi_ack_detailed gerektiriyor"
-#: fetch-pack.c:356 fetch-pack.c:1340
+#: fetch-pack.c:378 fetch-pack.c:1457
#, c-format
msgid "invalid shallow line: %s"
msgstr "geçersiz sığ satır: %s"
-#: fetch-pack.c:362 fetch-pack.c:1346
+#: fetch-pack.c:384 fetch-pack.c:1463
#, c-format
msgid "invalid unshallow line: %s"
msgstr "geçersiz sığ olmayan satır: %s"
-#: fetch-pack.c:364 fetch-pack.c:1348
+#: fetch-pack.c:386 fetch-pack.c:1465
#, c-format
msgid "object not found: %s"
msgstr "nesne bulunamadı: %s"
-#: fetch-pack.c:367 fetch-pack.c:1351
+#: fetch-pack.c:389 fetch-pack.c:1468
#, c-format
msgid "error in object: %s"
msgstr "nesne içinde hata: %s"
-#: fetch-pack.c:369 fetch-pack.c:1353
+#: fetch-pack.c:391 fetch-pack.c:1470
#, c-format
msgid "no shallow found: %s"
msgstr "sığ bulunamadı: %s"
-#: fetch-pack.c:372 fetch-pack.c:1357
+#: fetch-pack.c:394 fetch-pack.c:1474
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "sığ/sığ olmayan bekleniyordu, %s alındı"
-#: fetch-pack.c:414
+#: fetch-pack.c:434
#, c-format
msgid "got %s %d %s"
msgstr "%s %d %s alındı"
-#: fetch-pack.c:431
+#: fetch-pack.c:451
#, c-format
msgid "invalid commit %s"
-msgstr "geçersiz gönderi %s"
+msgstr "geçersiz işleme %s"
-#: fetch-pack.c:462
+#: fetch-pack.c:482
msgid "giving up"
msgstr "vazgeçiliyor"
-#: fetch-pack.c:475 progress.c:323
+#: fetch-pack.c:495 progress.c:339
msgid "done"
msgstr "bitti"
-#: fetch-pack.c:487
+#: fetch-pack.c:507
#, c-format
msgid "got %s (%d) %s"
msgstr "%s (%d) %s alındı"
-#: fetch-pack.c:533
+#: fetch-pack.c:543
#, c-format
msgid "Marking %s as complete"
msgstr "%s tamam olarak imleniyor"
-#: fetch-pack.c:754
+#: fetch-pack.c:758
#, c-format
msgid "already have %s (%s)"
msgstr "%s halihazırda var (%s)"
-#: fetch-pack.c:818
+#: fetch-pack.c:844
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: yanbant çoğullama çözücüsü ayrı çatallanamıyor"
-#: fetch-pack.c:826
+#: fetch-pack.c:852
msgid "protocol error: bad pack header"
msgstr "protokol hatası: hatalı paket üstbilgisi"
-#: fetch-pack.c:900
+#: fetch-pack.c:946
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: %s ayrı çatallanamıyor"
-#: fetch-pack.c:916
+#: fetch-pack.c:952
+msgid "fetch-pack: invalid index-pack output"
+msgstr "fetch-pack: geçersiz index-pack çıktısı"
+
+#: fetch-pack.c:969
#, c-format
msgid "%s failed"
msgstr "%s başarısız oldu"
-#: fetch-pack.c:918
+#: fetch-pack.c:971
msgid "error in sideband demultiplexer"
msgstr "yanbant çoğullama çözücüsünde hata"
-#: fetch-pack.c:965
+#: fetch-pack.c:1031
#, c-format
msgid "Server version is %.*s"
msgstr "Sunucu sürümü %.*s"
-#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985
-#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001
-#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017
-#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039
+#: fetch-pack.c:1039 fetch-pack.c:1045 fetch-pack.c:1048 fetch-pack.c:1054
+#: fetch-pack.c:1058 fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070
+#: fetch-pack.c:1074 fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086
+#: fetch-pack.c:1092 fetch-pack.c:1098 fetch-pack.c:1103 fetch-pack.c:1108
#, c-format
msgid "Server supports %s"
msgstr "Sunucu %s destekliyor"
-#: fetch-pack.c:972
+#: fetch-pack.c:1041
msgid "Server does not support shallow clients"
msgstr "Sunucu sığ istemcileri desteklemiyor"
-#: fetch-pack.c:1032
+#: fetch-pack.c:1101
msgid "Server does not support --shallow-since"
msgstr "Sunucu --shallow-since desteklemiyor"
-#: fetch-pack.c:1037
+#: fetch-pack.c:1106
msgid "Server does not support --shallow-exclude"
msgstr "Sunucu --shallow-exclude desteklemiyor"
-#: fetch-pack.c:1041
+#: fetch-pack.c:1110
msgid "Server does not support --deepen"
msgstr "Sunucu --deepen desteklemiyor"
-#: fetch-pack.c:1058
-msgid "no common commits"
-msgstr "ortak gönderi yok"
+#: fetch-pack.c:1112
+msgid "Server does not support this repository's object format"
+msgstr "Sunucu bu deponun nesne türünü desteklemiyor"
-#: fetch-pack.c:1070 fetch-pack.c:1536
+#: fetch-pack.c:1125
+msgid "no common commits"
+msgstr "ortak işleme yok"
+
+#: fetch-pack.c:1138 fetch-pack.c:1682
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: getirme başarısız"
-#: fetch-pack.c:1209
+#: fetch-pack.c:1265
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "eşleşmeyen algoritmalar: istemci %s; sunucu %s"
+
+#: fetch-pack.c:1269
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "sunucu '%s' algoritmasını desteklemiyor"
+
+#: fetch-pack.c:1289
msgid "Server does not support shallow requests"
msgstr "Sunucu sığ istekleri desteklemiyor"
-#: fetch-pack.c:1216
+#: fetch-pack.c:1296
msgid "Server supports filter"
msgstr "Sunucu süzgeç destekliyor"
-#: fetch-pack.c:1239
+#: fetch-pack.c:1335
msgid "unable to write request to remote"
msgstr "uzak konuma istek yazılamıyor"
-#: fetch-pack.c:1257
+#: fetch-pack.c:1353
#, c-format
msgid "error reading section header '%s'"
msgstr "bölüm üstbilgisi '%s' okunurken hata"
-#: fetch-pack.c:1263
+#: fetch-pack.c:1359
#, c-format
msgid "expected '%s', received '%s'"
msgstr "'%s' bekleniyordu, '%s' alındı"
-#: fetch-pack.c:1303
+#: fetch-pack.c:1420
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "beklenmedik alındı satırı: '%s'"
-#: fetch-pack.c:1308
+#: fetch-pack.c:1425
#, c-format
msgid "error processing acks: %d"
msgstr "alındılar işlenirken hata: %d"
-#: fetch-pack.c:1318
+#: fetch-pack.c:1435
msgid "expected packfile to be sent after 'ready'"
msgstr "paket dosyasının 'ready'den sonra gönderilmesi gerekiyordu"
-#: fetch-pack.c:1320
+#: fetch-pack.c:1437
msgid "expected no other sections to be sent after no 'ready'"
msgstr "'ready' \"yok\" iken başka hiçbir bölümün gönderilmemesi gerekiyordu"
-#: fetch-pack.c:1362
+#: fetch-pack.c:1479
#, c-format
msgid "error processing shallow info: %d"
msgstr "sığ bilgi işlenirken hata: %d"
-#: fetch-pack.c:1409
+#: fetch-pack.c:1526
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "wanted-ref bekleniyordu, '%s' alındı"
-#: fetch-pack.c:1414
+#: fetch-pack.c:1531
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "beklenmedik wanted-ref: '%s'"
-#: fetch-pack.c:1419
+#: fetch-pack.c:1536
#, c-format
msgid "error processing wanted refs: %d"
msgstr "aranan başvurular işlenirken hata: %d"
-#: fetch-pack.c:1762
+#: fetch-pack.c:1566
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack: yanıt sonu paketi bekleniyordu"
+
+#: fetch-pack.c:1960
msgid "no matching remote head"
msgstr "eşleşen uzak dal ucu yok"
-#: fetch-pack.c:1785 builtin/clone.c:689
+#: fetch-pack.c:1983 builtin/clone.c:693
msgid "remote did not send all necessary objects"
msgstr "uzak konum gereken tüm nesneleri göndermedi"
-#: fetch-pack.c:1812
+#: fetch-pack.c:2010
#, c-format
msgid "no such remote ref %s"
msgstr "böyle bir uzak başvuru yok: %s"
-#: fetch-pack.c:1815
+#: fetch-pack.c:2013
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Sunucu %s tanıtılmamış nesnesi için isteğe izin vermiyor"
-#: gpg-interface.c:408
-msgid "gpg failed to sign the data"
-msgstr "gpg veriyi imzalayamadı"
-
-#: gpg-interface.c:434
+#: gpg-interface.c:273
msgid "could not create temporary file"
msgstr "geçici dosya oluşturulamadı"
-#: gpg-interface.c:437
+#: gpg-interface.c:276
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "şuna ayrık imza yazılamadı: '%s'"
+#: gpg-interface.c:470
+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
+#: grep.c:543
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
msgstr ""
-"verilen dizgi NULL baytı içeriyor (-f <dosya> ile). Bu yalnızca PCRE v2 "
-"altında -P ile desteklenir"
+"verilen dizgi NULL baytı içeriyor (-f <dosya> aracılığıyla). Bu yalnızca "
+"PCRE v2 altında -P ile desteklenir"
-#: grep.c:2128
+#: grep.c:1906
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': %s okunamıyor"
-#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82
+#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr "'%s' dosyasının bilgileri alınamadı"
-#: grep.c:2156
+#: grep.c:1934
#, c-format
msgid "'%s': short read"
msgstr "'%s': kısa okuma"
@@ -4108,7 +4356,8 @@
#: help.c:25
msgid "examine the history and state (see also: git help revisions)"
-msgstr "geçmişi ve durumu gözden geçirin (ayrıca bkz: git help revisions)"
+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"
@@ -4150,75 +4399,75 @@
msgid "Low-level Commands / Internal Helpers"
msgstr "Düşük Düzeyli Komutlar / İç Yardımcılar"
-#: help.c:298
+#: help.c:300
#, c-format
msgid "available git commands in '%s'"
msgstr "'%s' içindeki kullanılabilir git komutları"
-#: help.c:305
+#: 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:314
+#: 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:"
+msgstr "En çok kullanılan temel Git komutlarının bir listesi aşağıdadır:"
-#: help.c:363 git.c:98
+#: help.c:365 git.c:100
#, c-format
msgid "unsupported command listing type '%s'"
msgstr "desteklenmeyen komut listeleme türü '%s'"
-#: help.c:403
-msgid "The common Git guides are:"
-msgstr "Yaygın Git kılavuzları:"
+#: help.c:405
+msgid "The Git concept guides are:"
+msgstr "Git konsept kılavuzları şunlardır:"
-#: help.c:512
+#: 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:517
+#: help.c:434
msgid "External commands"
msgstr "Dış komutlar"
-#: help.c:532
+#: help.c:449
msgid "Command aliases"
msgstr "Komut armaları"
-#: help.c:596
+#: help.c:527
#, 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"
+"'%s' bir git komutu gibi görünüyor; ancak biz onu\n"
"çalıştıramadık. git-%s bozuk olabilir mi?"
-#: help.c:655
-msgid "Uh oh. Your system reports no Git commands at all."
-msgstr "Tüh. Sisteminiz hiçbir Git komutunu bildirmiyor."
-
-#: help.c:677
-#, c-format
-msgid "WARNING: You called a Git command named '%s', which does not exist."
-msgstr ""
-"UYARI: '%s' adında bir Git komutunu çağırdınız, ancak böyle bir komut yok."
-
-#: help.c:682
-#, c-format
-msgid "Continuing under the assumption that you meant '%s'."
-msgstr "'%s' demek istediğiniz varsayılarak sürdürülüyor."
-
-#: help.c:687
-#, c-format
-msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
-msgstr "%0.1f saniye içinde sürdürülüyor, '%s' demek istediğiniz varsayılacak."
-
-#: help.c:695
+#: help.c:543 help.c:631
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: '%s' bir git komutu değil. Yardım için: 'git --help'."
-#: help.c:699
+#: help.c:591
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "Tüh. Sisteminiz hiçbir Git komutu bildirmiyor."
+
+#: help.c:613
+#, 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:618
+#, 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:623
+#, 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:635
msgid ""
"\n"
"The most similar command is"
@@ -4232,16 +4481,16 @@
"\n"
"Buna en yakın komutlar:"
-#: help.c:714
+#: help.c:675
msgid "git version [<options>]"
msgstr "git version [<seçenekler>]"
-#: help.c:783
+#: help.c:730
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:787
+#: help.c:734
msgid ""
"\n"
"Did you mean this?"
@@ -4255,7 +4504,15 @@
"\n"
"Şunlardan birini mi demek istediniz?"
-#: ident.c:349
+#: 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"
@@ -4282,55 +4539,68 @@
"değişkenini kullanmayın.\n"
"\n"
-#: ident.c:379
+#: 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:384
+#: 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:401
+#: 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:407
+#: 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:415
+#: 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:421
+#: 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:436 builtin/commit.c:635
+#: ident.c:454 builtin/commit.c:634
#, c-format
msgid "invalid date format: %s"
msgstr "geçersiz tarih biçimi: %s"
-#: list-objects.c:127
-#, c-format
-msgid "entry '%s' in tree %s has tree mode, but is not a tree"
-msgstr "'%s' girdisi (%s ağacında) ağaç kipine iye, ancak bir ağaç değil"
+#: list-objects-filter-options.c:81
+msgid "expected 'tree:<depth>'"
+msgstr "'tree:<derinlik>' bekleniyordu"
-#: 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-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.c:375
+#: list-objects-filter-options.c:109
#, c-format
-msgid "unable to load root tree for commit %s"
-msgstr "%s gönderisi için kök ağacı yüklenemiyor"
+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
@@ -4342,33 +4612,24 @@
msgid "unable to parse sparse filter data in %s"
msgstr "%s içindeki aralıklı süzgeç verisi ayrıştırılamıyor"
-#: list-objects-filter-options.c:58
-msgid "expected 'tree:<depth>'"
-msgstr "'tree:<derinlik>' bekleniyordu"
-
-#: list-objects-filter-options.c:73
-msgid "sparse:path filters support has been dropped"
-msgstr "sparse:path süzgeçleri desteği artık yok"
-
-#: list-objects-filter-options.c:86
+#: list-objects.c:127
#, c-format
-msgid "invalid filter-spec '%s'"
-msgstr "geçersiz filter-spec '%s'"
+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-filter-options.c:102
+#: list-objects.c:140
#, c-format
-msgid "must escape char in sub-filter-spec: '%c'"
-msgstr "sub-filter-spec içinde kaçış karakteri olmalı: '%c'"
+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-filter-options.c:144
-msgid "expected something after combine:"
-msgstr "birlikte kullanımdan sonra bir şeyler bekleniyordu:"
+#: 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"
-#: list-objects-filter-options.c:226
-msgid "multiple filter-specs cannot be combined"
-msgstr "çoklu filter-specs birlikte kullanılamaz"
-
-#: lockfile.c:151
+#: lockfile.c:152
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
@@ -4387,24 +4648,274 @@
"oluyorsa bir git işlemi bu depo içinde daha önceden çakılmış olabilir:\n"
"Sürdürmek için dosyayı el ile kaldırın."
-#: lockfile.c:159
+#: lockfile.c:160
#, c-format
msgid "Unable to create '%s.lock': %s"
msgstr "'%s.lock' oluşturulamıyor: %s"
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "önbellek okunamadı"
+#: ls-refs.c:37
+#, c-format
+msgid "invalid value '%s' for lsrefs.unborn"
+msgstr "lsrefs.unborn için '%s' geçersiz değeri"
-#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913
-#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810
-#: builtin/stash.c:265
-msgid "unable to write new index file"
-msgstr "yeni indeks dosyası yazılamıyor"
+#: ls-refs.c:167
+msgid "expected flush after ls-refs arguments"
+msgstr "ls-refs argümanlarından sonra floş bekleniyordu"
+
+#: merge-ort.c:888 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-ort.c:897 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-ort.c:906 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-ort.c:916 merge-ort.c:923
+#, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr "Not: %s altmodülü %s yönüne ileri sarılıyor"
+
+#: merge-ort.c:944
+#, c-format
+msgid "Failed to merge submodule %s"
+msgstr "'%s' altmodülünü birleştirilemedi"
+
+#: merge-ort.c:951
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but a possible merge resolution exists:\n"
+"%s\n"
+msgstr ""
+"%s altmodülü birleştirilemedi; ancak olası bir birleştirme çözümü mevcut:\n"
+"%s\n"
+
+#: merge-ort.c:955 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-ort.c:968
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but multiple possible merges exist:\n"
+"%s"
+msgstr ""
+"%s altmodülü birleştirilemedi; ancak birden çok olası birleştirmeler "
+"mevcut:\n"
+"%s"
+
+#: merge-ort.c:1127 merge-recursive.c:1341
+msgid "Failed to execute internal merge"
+msgstr "İç birleştirme çalıştırılamadı"
+
+#: merge-ort.c:1132 merge-recursive.c:1346
+#, c-format
+msgid "Unable to add %s to database"
+msgstr "%s veritabanına eklenemedi"
+
+#: merge-ort.c:1139 merge-recursive.c:1378
+#, c-format
+msgid "Auto-merging %s"
+msgstr "%s kendiliğinden birleştiriliyor"
+
+#: merge-ort.c:1278 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-ort.c:1288 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-ort.c:1471
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to rename %s to; it 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 yeniden "
+"adlandırılacağı belirsiz; herhangi bir hedef dosyaların çoğunu almadan "
+"birden çok başka dizine yeniden adlandırılmıştı."
+
+#: merge-ort.c:1637 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-ort.c:1781 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-ort.c:1788 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-ort.c:1801 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-ort.c:1809 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-ort.c:1952
+#, c-format
+msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
+msgstr ""
+"ÇAKIŞMA (y. adlandır/y. adlandır): %s->%s olarak adlandırıldı (%s içinde) ve "
+"ek olarak %s olarak da adlandırıldı (%s içinde)."
+
+#: merge-ort.c:2047
+#, c-format
+msgid ""
+"CONFLICT (rename involved in collision): rename of %s -> %s has content "
+"conflicts AND collides with another path; this may result in nested conflict "
+"markers."
+msgstr ""
+"ÇAKIŞMA (yeniden adlandırma çarpışması): %s -> %s yeniden adlandırmasının "
+"içerik çakışmaları var ve başka bir yolla çarpışıyor; bu iç içe geçmiş "
+"çakışmaimleyicilerine neden olabilir."
+
+#: merge-ort.c:2066 merge-ort.c:2090
+#, c-format
+msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
+msgstr ""
+"ÇAKIŞMA (yeniden adlandır/sil): %s->%s olarak adlandırıldı (%s içinde); "
+"ancak %s içinde silindi."
+
+#: merge-ort.c:2735
+#, c-format
+msgid ""
+"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
+"%s instead."
+msgstr ""
+"ÇAKIŞMA (dosya/dizin): Dizin, şuradan %s yolunda: %s; bunun yerine %s "
+"konumuna taşınıyor."
+
+#: merge-ort.c:2808
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed %s "
+"of them so each can be recorded somewhere."
+msgstr ""
+"ÇAKIŞMA (belirgin türler): %s ögesinin her bir yanında değişik türler vardı; "
+"bunlardan %s tanesi yeniden adlandırıldı; böylelikle başka bir yerde "
+"kayıtları yazılabilir."
+
+#: merge-ort.c:2812
+msgid "both"
+msgstr "her ikisi de"
+
+#: merge-ort.c:2812
+msgid "one"
+msgstr "bir"
+
+#: merge-ort.c:2907 merge-recursive.c:3052
+msgid "content"
+msgstr "içerik"
+
+#: merge-ort.c:2909 merge-recursive.c:3056
+msgid "add/add"
+msgstr "ekle/ekle"
+
+#: merge-ort.c:2911 merge-recursive.c:3101
+msgid "submodule"
+msgstr "altmodül"
+
+#: merge-ort.c:2913 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-ort.c:2938
+#, c-format
+msgid ""
+"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
+"of %s left in tree."
+msgstr ""
+"ÇAKIŞMA (değiştir/sil): %s silindi (%s içinde) ve %s içinde değiştirildi. %s "
+"sürümü (şunun: %s) ağaçta bırakıldı."
+
+#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
+#. base, and 2-3) the trees for the two trees we're merging.
+#.
+#: merge-ort.c:3406
+#, c-format
+msgid "collecting merge info failed for trees %s, %s, %s"
+msgstr "şu ağaçlar için birleştirme bilgisi toplama başarısız: %s, %s, %s"
+
+#: merge-ort-wrappers.c:13 merge-recursive.c:3661
+#, 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-ort-wrappers.c:33 merge-recursive.c:3436
+#, c-format
+msgid "Already up to date!"
+msgstr "Tümü güncel!"
#: merge-recursive.c:356
msgid "(bad commit)\n"
-msgstr "(hatalı gönderi)\n"
+msgstr "(hatalı işleme)\n"
#: merge-recursive.c:379
#, c-format
@@ -4461,25 +4972,10 @@
msgid "do not know what to do with %06o %s '%s'"
msgstr "şununla ne yapılacağı bilinmiyor: %06o %s '%s'"
-#: merge-recursive.c:1191
-#, c-format
-msgid "Failed to merge submodule %s (not checked out)"
-msgstr "%s altmodülü birleştirilemedi (çıkış yapılmadı)"
-
-#: merge-recursive.c:1198
-#, c-format
-msgid "Failed to merge submodule %s (commits not present)"
-msgstr "%s altmodülü birleştirilemedi (gönderiler mevcut değil)"
-
-#: merge-recursive.c:1205
-#, c-format
-msgid "Failed to merge submodule %s (commits don't follow merge-base)"
-msgstr "%s altmodülü birleştirilemedi (gönderiler merge-base'i takip etmiyor)"
-
#: merge-recursive.c:1213 merge-recursive.c:1225
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
-msgstr "%s altmodülü şu gönderiye ileri sarılıyor:"
+msgstr "%s altmodülü şu işlemeye ileri sarılıyor:"
#: merge-recursive.c:1216 merge-recursive.c:1228
#, c-format
@@ -4490,7 +4986,7 @@
#, c-format
msgid "Failed to merge submodule %s (merge following commits not found)"
msgstr ""
-"%s altmodülü birleştirilemedi (gönderileri takip eden birleştirme bulunamadı)"
+"%s altmodülü birleştirilemedi (işlemeleri takip eden birleştirme bulunamadı)"
#: merge-recursive.c:1255
#, c-format
@@ -4501,41 +4997,11 @@
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "Şu altmodül için olası bir birleştirme çözümü bulundu:\n"
-#: merge-recursive.c:1259
-#, c-format
-msgid ""
-"If this is correct simply add it to the index for example\n"
-"by using:\n"
-"\n"
-" git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"which will accept this suggestion.\n"
-msgstr ""
-"Eğer bu doğruysa yalnızca indekse ekleyin, örneğinbu öneriyi kabul edecek:\n"
-"\n"
-"\tgit update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"komutunu kullanmanız yeterlidir.\n"
-
#: merge-recursive.c:1268
#, c-format
msgid "Failed to merge submodule %s (multiple merges found)"
msgstr "%s altmodülü birleştirilemedi (birden çok birleştirme bulundu)"
-#: merge-recursive.c:1341
-msgid "Failed to execute internal merge"
-msgstr "İç birleştirme çalıştırılamadı"
-
-#: merge-recursive.c:1346
-#, c-format
-msgid "Unable to add %s to database"
-msgstr "%s veritabanına eklenemedi"
-
-#: merge-recursive.c:1378
-#, c-format
-msgid "Auto-merging %s"
-msgstr "%s kendiliğinden birleştiriliyor"
-
#: merge-recursive.c:1402
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
@@ -4587,7 +5053,7 @@
msgid "renamed"
msgstr "yeniden adlandırıldı"
-#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117
+#: 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"
@@ -4630,14 +5096,14 @@
msgid " (left unresolved)"
msgstr " (çözülmeden bırakıldı)"
-#: merge-recursive.c:1793
+#: 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:2056
+#: merge-recursive.c:2068
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -4645,30 +5111,10 @@
"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 "
+"yerleştirileceği belirsiz; çünkü %s dizini birden çok başka dizine yeniden "
"adlandırılırken hiçbir hedef dosyaların büyük çoğunluğunu almadı."
-#: merge-recursive.c:2088
-#, c-format
-msgid ""
-"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
-"implicit directory rename(s) putting the following path(s) there: %s."
-msgstr ""
-"ÇAKIŞMA (örtülü dizin yeniden adlandırma): %s konumundaki mevcut dosya/dizin "
-"örtülü yeniden adlandırmanın aşağıdaki yolları oraya koymasına engel oluyor: "
-"%s."
-
-#: merge-recursive.c:2098
-#, c-format
-msgid ""
-"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
-"implicit directory renames tried to put these paths there: %s"
-msgstr ""
-"ÇAKIŞMA (örtülü dizin yeniden adlandırma): %s için birden çok yol "
-"eşlemlenemiyor; örtülü dizin yeniden adlandırmaları aşağıdaki yolları oraya "
-"koymayı denedi: %s."
-
-#: merge-recursive.c:2190
+#: merge-recursive.c:2202
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -4677,334 +5123,267 @@
"ÇAKIŞMA (y. adlandır/y. adlandır): Dizini %s->%s olarak adlandır (%s "
"içinde). Dizini %s->%s olarak adlandır (%s içinde)."
-#: merge-recursive.c:2435
-#, c-format
-msgid ""
-"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
-"renamed."
-msgstr ""
-"UYARI: %s -> %s yeniden adlandırmasını %s ögesine uygulamadan kaçınılıyor, "
-"çünkü %s ögesinin kendisi yeniden adlandırıldı."
-
-#: merge-recursive.c:2961
+#: merge-recursive.c:2973
#, c-format
msgid "cannot read object %s"
msgstr "%s nesnesi okunamıyor"
-#: merge-recursive.c:2964
+#: merge-recursive.c:2976
#, c-format
msgid "object %s is not a blob"
msgstr "%s nesnesi ikili bir nesne değil"
-#: merge-recursive.c:3028
+#: merge-recursive.c:3040
msgid "modify"
msgstr "değiştir"
-#: merge-recursive.c:3028
+#: merge-recursive.c:3040
msgid "modified"
msgstr "değiştirilmiş"
-#: merge-recursive.c:3040
-msgid "content"
-msgstr "içerik"
-
-#: merge-recursive.c:3044
-msgid "add/add"
-msgstr "ekle/ekle"
-
-#: merge-recursive.c:3067
+#: 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:3089 git-submodule.sh:1003
-msgid "submodule"
-msgstr "altmodül"
-
-#: merge-recursive.c:3090
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "ÇAKIŞMA (%s): %s içinde birleştirme çakışması"
-
-#: merge-recursive.c:3120
+#: merge-recursive.c:3132
#, c-format
msgid "Adding as %s instead"
msgstr "Bunun yerine %s olarak ekleniyor"
-#: merge-recursive.c:3203
-#, c-format
-msgid ""
-"Path updated: %s added in %s inside a directory that was renamed in %s; "
-"moving it to %s."
-msgstr ""
-"Yol güncellendi: %s, (%s içinde eklenen) %s içinde yeniden adlandırılan bir "
-"dizinde; onu %s konumuna taşıdı."
-
-#: merge-recursive.c:3206
-#, c-format
-msgid ""
-"CONFLICT (file location): %s added in %s inside a directory that was renamed "
-"in %s, suggesting it should perhaps be moved to %s."
-msgstr ""
-"ÇAKIŞMA (dosya konumu): %s, (%s içinde eklenen) %s içinde yeniden "
-"adlandırılan bir dizinde, belki de %s konumuna taşınmalı."
-
-#: merge-recursive.c:3210
-#, c-format
-msgid ""
-"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
-"%s; moving it to %s."
-msgstr ""
-"Yol güncellendi: %s, %s olarak yeniden adlandırıldı (%s içinde), %s içinde "
-"yeniden adlandırılan bir dizinde; onu %s konumuna taşıdı."
-
-#: merge-recursive.c:3213
-#, c-format
-msgid ""
-"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
-"was renamed in %s, suggesting it should perhaps be moved to %s."
-msgstr ""
-"ÇAKIŞMA (dosya konumu): %s, %s olarak yeniden adlandırıldı (%s içinde), %s "
-"içinde yeniden adlandırılan bir dizinde, belki de %s konumuna taşınmalı."
-
-#: merge-recursive.c:3327
+#: merge-recursive.c:3339
#, c-format
msgid "Removing %s"
msgstr "%s kaldırılıyor"
-#: merge-recursive.c:3350
+#: merge-recursive.c:3362
msgid "file/directory"
msgstr "dosya/dizin"
-#: merge-recursive.c:3355
+#: merge-recursive.c:3367
msgid "directory/file"
msgstr "dizin/dosya"
-#: merge-recursive.c:3362
+#: 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:3371
+#: merge-recursive.c:3383
#, c-format
msgid "Adding %s"
msgstr "%s ekleniyor"
-#: merge-recursive.c:3380
+#: 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:3424
-msgid "Already up to date!"
-msgstr "Her şey güncel!"
-
-#: merge-recursive.c:3433
+#: 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:3537
+#: merge-recursive.c:3539
msgid "Merging:"
msgstr "Birleştiriliyor:"
-#: merge-recursive.c:3550
+#: merge-recursive.c:3552
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "%u ortak ata bulundu:"
msgstr[1] "%u ortak ata bulundu:"
-#: merge-recursive.c:3600
+#: merge-recursive.c:3602
msgid "merge returned no commit"
-msgstr "birleştirme herhangi bir gönderi döndürmedi"
+msgstr "birleştirme herhangi bir işleme döndürmedi"
-#: merge-recursive.c:3659
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-" %s"
-msgstr ""
-"Birleştirme ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine "
-"yazılacak:\n"
-"\t%s"
-
-#: merge-recursive.c:3756
+#: merge-recursive.c:3758
#, c-format
msgid "Could not parse object '%s'"
msgstr "'%s' nesnesi ayrıştırılamadı"
-#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877
+#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896
+#: builtin/stash.c:471
msgid "Unable to write index."
-msgstr "İndeks yazılamadı."
+msgstr "İndeks yazılamıyor."
-#: midx.c:68
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "önbellek okunamadı"
+
+#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917
+#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817
+#: builtin/stash.c:265
+msgid "unable to write new index file"
+msgstr "yeni indeks dosyası yazılamıyor"
+
+#: midx.c:62
+msgid "multi-pack-index OID fanout is of the wrong size"
+msgstr "multi-pack-index OID ikiye bölümünün boyutu hatalı"
+
+#: midx.c:93
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "multi-pack-index dosyası %s pek küçük"
-#: midx.c:84
+#: midx.c:109
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "multi-pack-index imzası 0x%08x, 0x%08x imzası ile eşleşmiyor"
-#: midx.c:89
+#: midx.c:114
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "multi-pack-index sürümü %d tanımlanamıyor"
-#: midx.c:94
+#: midx.c:119
#, c-format
-msgid "hash version %u does not match"
-msgstr "sağlama sürümü %u eşleşmiyor"
+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:108
-msgid "invalid chunk offset (too large)"
-msgstr "geçersiz iri parça ofseti (çok geniş)"
-
-#: midx.c:132
-msgid "terminating multi-pack-index chunk id appears earlier than expected"
-msgstr ""
-"multi-pack-index iri parçası sonlandırılıyor, numarası beklenenden önce "
-"görünüyor"
-
-#: midx.c:145
+#: midx.c:136
msgid "multi-pack-index missing required pack-name chunk"
msgstr "multi-pack-index'ten gerekli pack-name iri parçası eksik"
-#: midx.c:147
+#: midx.c:138
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "multi-pack-index'ten gerekli OID fanout iri parçası eksik"
-#: midx.c:149
+#: midx.c:140
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "multi-pack-index'ten gerekli OID arama iri parçası eksik"
-#: midx.c:151
+#: midx.c:142
msgid "multi-pack-index missing required object offsets chunk"
msgstr "multi-pack-index'ten gerekli nesne ofsetleri iri parçası eksik"
-#: midx.c:165
+#: midx.c:158
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "multi-pack-index paket adlarının sırasız: '%s' şundan önce: '%s'"
-#: midx.c:210
+#: midx.c:202
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "hatalı pack-int-id: %u (%u toplam paket)"
-#: midx.c:260
+#: midx.c:252
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"
+msgstr "multi-pack-index bir 64 bit ofset depoluyor; ancak off_t pek küçük"
-#: midx.c:288
-msgid "error preparing packfile from multi-pack-index"
-msgstr "paket dosyası multi-pack-index'ten hazırlanırken hata"
-
-#: midx.c:472
+#: midx.c:467
#, c-format
msgid "failed to add packfile '%s'"
msgstr "paket dosyası '%s' eklenemedi"
-#: midx.c:478
+#: midx.c:473
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "pack-index '%s' açılamadı"
-#: midx.c:538
+#: midx.c:533
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "%d nesnesi paket dosyasında bulunamadı"
-#: midx.c:842
+#: midx.c:821
msgid "Adding packfiles to multi-pack-index"
msgstr "Paket dosyaları multi-pack-index'e ekleniyor"
-#: midx.c:875
+#: midx.c:855
#, c-format
msgid "did not see pack-file %s to drop"
msgstr "bırakılacak pack-file %s görülmedi"
-#: midx.c:973
-msgid "Writing chunks to multi-pack-index"
-msgstr "İri parçalar multi-pack-index'e yazılıyor"
+#: midx.c:904
+msgid "no pack files to index."
+msgstr "indekslenecek paket dosyası yok."
-#: midx.c:1052
+#: midx.c:965
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "multi-pack-index %s konumunda temizlenemedi"
-#: midx.c:1108
+#: midx.c:1021
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr "multi-pack-index dosyası mevcut, ancak ayrıştırılamadı"
+
+#: midx.c:1029
msgid "Looking for referenced packfiles"
msgstr "Başvurulmuş paket dosyaları aranıyor"
-#: midx.c:1123
+#: midx.c:1044
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr "oid fanout sırasız: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:1128
+#: midx.c:1049
+msgid "the midx contains no oid"
+msgstr "midx bir oid içermiyor"
+
+#: midx.c:1058
msgid "Verifying OID order in multi-pack-index"
msgstr "multi-pack-index içindeki OID sırası doğrulanıyor"
-#: midx.c:1137
+#: midx.c:1067
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "oid araması sırasız: oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1157
+#: midx.c:1087
msgid "Sorting objects by packfile"
msgstr "Nesneler paket dosyasına göre sıralanıyor"
-#: midx.c:1164
+#: midx.c:1094
msgid "Verifying object offsets"
msgstr "Nesne ofsetleri doğrulanıyor"
-#: midx.c:1180
+#: midx.c:1110
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "şunun için paket girdisi yüklenemedi: oid[%d] = %s"
-#: midx.c:1186
+#: midx.c:1116
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "paket dosyası %s için pack-index yüklenemedi"
-#: midx.c:1195
+#: midx.c:1125
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "şunun için yanlış nesne ofseti: oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-#: midx.c:1220
+#: midx.c:1150
msgid "Counting referenced objects"
msgstr "Başvurulmuş nesneler sayılıyor"
-#: midx.c:1230
+#: midx.c:1160
msgid "Finding and deleting unreferenced packfiles"
msgstr "Başvurulmamış paket dosyaları bulunuyor ve siliniyor"
-#: midx.c:1388
+#: midx.c:1351
msgid "could not start pack-objects"
msgstr "pack-objects başlatılamadı"
-#: midx.c:1407
+#: midx.c:1371
msgid "could not finish pack-objects"
msgstr "pack-objects bitirilemedi"
-#: name-hash.c:537
+#: name-hash.c:538
#, c-format
msgid "unable to create lazy_dir thread: %s"
msgstr "lazy_dir iş parçacığı oluşturulamıyor: %s"
-#: name-hash.c:559
+#: name-hash.c:560
#, c-format
msgid "unable to create lazy_name thread: %s"
msgstr "lazy_name oluşturulamıyor: %s"
-#: name-hash.c:565
+#: name-hash.c:566
#, c-format
msgid "unable to join lazy_name thread: %s"
msgstr "lazy_name iş parçacığı ucu birleştirilemiyor: %s"
@@ -5019,7 +5398,7 @@
"Bir önceki not birleştirmenizi sonuçlandırmadınız (%s var).\n"
"Lütfen başka bir not birleştirmesine başlamadan önce 'git notes merge --"
"commit' veya 'git notes merge --abort' kullanarak bir önceki birleştirmeyi "
-"gönderin/durdurun."
+"işleyin/durdurun."
#: notes-merge.c:284
#, c-format
@@ -5028,7 +5407,7 @@
#: notes-utils.c:46
msgid "Cannot commit uninitialized/unreferenced notes tree"
-msgstr "İlklendirilmemiş/Başvurulmamış not ağacı gönderilemiyor"
+msgstr "İlklendirilmemiş/Başvurulmamış not ağacı işlenemiyor"
#: notes-utils.c:105
#, c-format
@@ -5049,6 +5428,359 @@
msgid "Bad %s value: '%s'"
msgstr "Hatalı %s değeri: '%s'"
+#: object-file.c:480
+#, 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"
+
+#: object-file.c:531
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "alternatif nesne yolu olağanlaştırılamıyor: %s"
+
+#: object-file.c:603
+#, 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"
+
+#: object-file.c:610
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "nesne dizini olağanlaştırılamıyor: %s"
+
+#: object-file.c:653
+msgid "unable to fdopen alternates lockfile"
+msgstr "alternatifler kilit dosyası fdopen yapılamıyor"
+
+#: object-file.c:671
+msgid "unable to read alternates file"
+msgstr "alternatifler dosyası okunamıyor"
+
+#: object-file.c:678
+msgid "unable to move new alternates file into place"
+msgstr "yeni alternatifler dosyası yerine taşınamıyor"
+
+#: object-file.c:713
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "'%s' diye bir yol yok"
+
+#: object-file.c:734
+#, 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."
+
+#: object-file.c:740
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "Başvuru deposu '%s' yerel bir depo değil."
+
+#: object-file.c:746
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "başvuru deposu '%s' sığ"
+
+#: object-file.c:754
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "başvuru deposu '%s' aşılı"
+
+#: object-file.c:814
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "alternatif başvurular ayrıştırılırken geçersiz satır: %s"
+
+#: object-file.c:964
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr "%<PRIuMAX>, %<PRIuMAX> sınırı üzerinden mmap yapılmaya çalışılıyor"
+
+#: object-file.c:985
+msgid "mmap failed"
+msgstr "mmap başarısız"
+
+#: object-file.c:1149
+#, c-format
+msgid "object file %s is empty"
+msgstr "nesne dosyası %s boş"
+
+#: object-file.c:1284 object-file.c:2477
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "hasar görmüş gevşek nesne '%s'"
+
+#: object-file.c:1286 object-file.c:2481
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "gevşek nesne '%s' sonunda anlamsız veri"
+
+#: object-file.c:1328
+msgid "invalid object type"
+msgstr "geçersiz nesne türü"
+
+#: object-file.c:1412
+#, c-format
+msgid "unable to unpack %s header with --allow-unknown-type"
+msgstr "%s üstbilgisi --allow-unknown-type ile açılamıyor"
+
+#: object-file.c:1415
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "%s üstbilgisi açılamıyor"
+
+#: object-file.c:1421
+#, 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"
+
+#: object-file.c:1424
+#, c-format
+msgid "unable to parse %s header"
+msgstr "%s üstbilgisi ayrıştırılamıyor"
+
+#: object-file.c:1651
+#, c-format
+msgid "failed to read object %s"
+msgstr "%s nesnesi okunamadı"
+
+#: object-file.c:1655
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "%s yedeği %s için bulunamadı"
+
+#: object-file.c:1659
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "%s gevşek nesnesi (%s içinde depolanıyor) hasar görmüş"
+
+#: object-file.c:1663
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "paketlenmiş nesne %s (%s içinde depolanıyor) hasar görmüş"
+
+#: object-file.c:1768
+#, c-format
+msgid "unable to write file %s"
+msgstr "%s dosyası yazılamıyor"
+
+#: object-file.c:1775
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "'%s' ögesine izin ayarlanamıyor"
+
+#: object-file.c:1782
+msgid "file write error"
+msgstr "dosya yazım hatası"
+
+#: object-file.c:1802
+msgid "error when closing loose object file"
+msgstr "gevşek nesne dosyası kapatılırken hata"
+
+#: object-file.c:1867
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
+msgstr "%s depo veritabanına nesne eklemek için yetersiz izin"
+
+#: object-file.c:1869
+msgid "unable to create temporary file"
+msgstr "geçici dosya oluşturulamıyor"
+
+#: object-file.c:1893
+msgid "unable to write loose object file"
+msgstr "gevşek nesne dosyası yazılamıyor"
+
+#: object-file.c:1899
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "yeni nesne %s söndürülemiyor (%d)"
+
+#: object-file.c:1903
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "%s nesnesi üzerinde deflateEnd başarısız oldu (%d)"
+
+#: object-file.c:1907
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "%s için olan nesne kaynak verisinden dolayı kafa karışıklığı"
+
+#: object-file.c:1917 builtin/pack-objects.c:1097
+#, c-format
+msgid "failed utime() on %s"
+msgstr "%s üzerinde utime() başarısız"
+
+#: object-file.c:1994
+#, c-format
+msgid "cannot read object for %s"
+msgstr "%s için nesne okunamıyor"
+
+#: object-file.c:2045
+msgid "corrupt commit"
+msgstr "hasar görmüş işleme"
+
+#: object-file.c:2053
+msgid "corrupt tag"
+msgstr "hasar görmüş etiket"
+
+#: object-file.c:2153
+#, c-format
+msgid "read error while indexing %s"
+msgstr "%s indekslenirken okuma hatası"
+
+#: object-file.c:2156
+#, c-format
+msgid "short read while indexing %s"
+msgstr "%s indekslenirken kısa read"
+
+#: object-file.c:2229 object-file.c:2239
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr "%s: veritabanına ekleme başarısız"
+
+#: object-file.c:2245
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s: desteklenmeyen dosya türü"
+
+#: object-file.c:2269
+#, c-format
+msgid "%s is not a valid object"
+msgstr "%s geçerli bir nesne değil"
+
+#: object-file.c:2271
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s geçerli bir '%s' nesnesi değil"
+
+#: object-file.c:2298 builtin/index-pack.c:192
+#, c-format
+msgid "unable to open %s"
+msgstr "%s açılamıyor"
+
+#: object-file.c:2488 object-file.c:2541
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "%s için sağlama uyuşmazlığı (%s bekleniyordu)"
+
+#: object-file.c:2512
+#, c-format
+msgid "unable to mmap %s"
+msgstr "%s mmap yapılamadı"
+
+#: object-file.c:2517
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "%s üstbilgisi açılamıyor"
+
+#: object-file.c:2523
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "%s üstbilgisi ayrıştırılamıyor"
+
+#: object-file.c:2534
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "%s içeriği açılamıyor"
+
+#: object-name.c:486
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr "kısa nesne ID'si %s belirsiz"
+
+#: object-name.c:497
+msgid "The candidates are:"
+msgstr "Adaylar:"
+
+#: object-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."
+
+#: object-name.c:916
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "'%.*s' günlüğü yalnızca şuna geri gider: %s"
+
+#: object-name.c:924
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "'%.*s' günlüğünde yalnızca %d girdi var"
+
+#: object-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"
+
+#: object-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'?"
+
+#: object-name.c:1717
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "'%s' yolu '%.*s' içinde mevcut değil"
+
+#: object-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'?"
+
+#: object-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'?"
+
+#: object-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"
+
+#: object-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)"
+
+#: object-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"
+
+#: object-name.c:1922
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "geçersiz nesne adı: '%.*s'"
+
#: object.c:53
#, c-format
msgid "invalid object type \"%s\""
@@ -5074,24 +5806,93 @@
msgid "hash mismatch %s"
msgstr "sağlama uyuşmazlığı %s"
-#: packfile.c:629
+#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226
+#, c-format
+msgid "unable to get size of %s"
+msgstr "%s boyutu alınamıyor"
+
+#: pack-bitmap.c:1489 builtin/rev-list.c:92
+#, c-format
+msgid "unable to get disk usage of %s"
+msgstr "%s ögesinin disk kullanımı alınamıyor"
+
+#: pack-revindex.c:220
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr "reverse-index dosyası %s pek küçük"
+
+#: pack-revindex.c:225
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr "reverse-index dosyası %s hasar görmüş"
+
+#: pack-revindex.c:233
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr "%s reverse-index dosyasının bilinmeyen bir imzası var"
+
+#: pack-revindex.c:237
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr "%s reverse-index dosyasının sürümü %<PRIu32> desteklenmiyor"
+
+#: pack-revindex.c:242
+#, c-format
+msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
+msgstr "%s reverse-index dosyasının sağlama numarası %<PRIu32> desteklenmiyor"
+
+#: pack-write.c:236
+msgid "cannot both write and verify reverse index"
+msgstr "ters indeks dosyası hem yazılıp hem doğrulanamıyor"
+
+#: pack-write.c:257
+#, c-format
+msgid "could not stat: %s"
+msgstr "dosya bilgileri alınamadı: %s"
+
+#: pack-write.c:269
+#, c-format
+msgid "failed to make %s readable"
+msgstr "%s, yazılabilir yapılamadı"
+
+#: pack-write.c:508
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr "vaat dosyası '%s' yazılamadı"
+
+#: packfile.c:625
msgid "offset before end of packfile (broken .idx?)"
msgstr "ofset paket dosyasının sonundan önce (bozuk .idx?)"
-#: packfile.c:1899
+#: packfile.c:1934
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "ofset %s için paket indeksinin başlangıcından önce (hasarlı indeks?)"
-#: packfile.c:1903
+#: packfile.c:1938
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "ofset %s için paket indeksinin sonundan ötede (kırpılmış index?)"
-#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134
+#: parse-options-cb.c:20 parse-options-cb.c:24
#, c-format
-msgid "unable to get size of %s"
-msgstr "%s boyutu alınamıyor"
+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
@@ -5133,26 +5934,31 @@
msgid "did you mean `--%s` (with two dashes)?"
msgstr "şunu mu demek istediniz: '--%s' (iki tire ile)?"
-#: parse-options.c:857
+#: 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:859
+#: parse-options.c:864
#, c-format
msgid "unknown switch `%c'"
msgstr "bilinmeyen anahtar '%c'"
-#: parse-options.c:861
+#: 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:885
+#: parse-options.c:890
msgid "..."
msgstr "..."
-#: parse-options.c:904
+#: parse-options.c:909
#, c-format
msgid "usage: %s"
msgstr "kullanım: %s"
@@ -5160,45 +5966,20 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:910
+#: parse-options.c:915
#, c-format
msgid " or: %s"
msgstr " veya: %s"
-#: parse-options.c:913
+#: parse-options.c:918
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:952
+#: parse-options.c:957
msgid "-NUM"
msgstr "-SAYI"
-#: parse-options.c:966
-#, c-format
-msgid "alias of --%s"
-msgstr "şunun arması: --%s"
-
-#: parse-options-cb.c:20 parse-options-cb.c:24
-#, c-format
-msgid "option `%s' expects a numerical value"
-msgstr "'%s' seçeneği sayısal bir değer bekliyor"
-
-#: parse-options-cb.c:41
-#, c-format
-msgid "malformed expiration date '%s'"
-msgstr "hatalı oluşturulmuş son kullanım tarihi '%s'"
-
-#: parse-options-cb.c:54
-#, c-format
-msgid "option `%s' expects \"always\", \"auto\", or \"never\""
-msgstr "'%s' seçeneği \"always\", \"auto\" veya \"never\" bekliyor"
-
-#: parse-options-cb.c:130 parse-options-cb.c:147
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "hatalı oluşturulmuş nesne adı '%s'"
-
#: path.c:915
#, c-format
msgid "Could not make %s writable by group"
@@ -5257,27 +6038,27 @@
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: 'literal' ve 'glob' birbiriyle uyumsuz"
-#: pathspec.c:442
+#: pathspec.c:445
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr "%s: '%s', '%s' konumunda depo dışında"
-#: pathspec.c:517
+#: pathspec.c:521
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s' (belleten: '%c')"
-#: pathspec.c:527
+#: 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:594
+#: pathspec.c:598
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "yol belirteci '%s' bir sembolik bağın ötesinde"
-#: pathspec.c:639
+#: pathspec.c:643
#, c-format
msgid "line is badly quoted: %s"
msgstr "satırda hatalı tırnaklar: %s"
@@ -5291,292 +6072,320 @@
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:146 pkt-line.c:232
+#: 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:162 pkt-line.c:164
+#: 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:196
+#: 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:203 pkt-line.c:210
+#: pkt-line.c:210 pkt-line.c:217
msgid "packet write failed"
msgstr "paket yazımı başarısız"
-#: pkt-line.c:295
+#: pkt-line.c:302
msgid "read error"
msgstr "okuma hatası"
-#: pkt-line.c:303
+#: pkt-line.c:310
msgid "the remote end hung up unexpectedly"
-msgstr "uzak konum beklenmedik biçimde hattı kapattı"
+msgstr "uzak konum beklenmedik bir biçimde hattı kapattı"
-#: pkt-line.c:331
+#: 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:341 pkt-line.c:346
+#: 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:362
+#: pkt-line.c:373 sideband.c:165
#, c-format
msgid "remote error: %s"
msgstr "uzak konum hatası: %s"
-#: preload-index.c:119
+#: preload-index.c:125
msgid "Refreshing index"
msgstr "İndeks yenileniyor"
-#: preload-index.c:138
+#: preload-index.c:144
#, c-format
msgid "unable to create threaded lstat: %s"
msgstr "iş parçacıklarına ayrılmış 'lstat' oluşturulamıyor: %s"
-#: pretty.c:981
+#: pretty.c:984
msgid "unable to parse --pretty format"
msgstr "--pretty biçimi ayrıştırılamıyor"
-#: promisor-remote.c:23
-msgid "Remote with no URL"
-msgstr "URL'si olmayan uzak konum"
+#: promisor-remote.c:30
+msgid "promisor-remote: unable to fork off fetch subprocess"
+msgstr "promisor-remote: getirme altişlemi çatallanamıyor"
-#: promisor-remote.c:58
+#: 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"
-#: range-diff.c:75
+#: prune-packed.c:35
+msgid "Removing duplicate objects"
+msgstr "Yinelenmiş nesneler kaldırılıyor"
+
+#: range-diff.c:78
msgid "could not start `log`"
msgstr "'log' başlatılamadı"
-#: range-diff.c:77
+#: range-diff.c:80
msgid "could not read `log` output"
msgstr "'log' çıktısı okunamadı"
-#: range-diff.c:96 sequencer.c:5020
+#: range-diff.c:101 sequencer.c:5318
#, c-format
msgid "could not parse commit '%s'"
-msgstr "'%s' gönderisi ayrıştırılamadı"
+msgstr "'%s' işlemesi ayrıştırılamadı"
-#: range-diff.c:122
+#: range-diff.c:115
+#, 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:140
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "git üstbilgisi '%.*s' ayrıştırılamadı"
-#: range-diff.c:285
+#: range-diff.c:306
msgid "failed to generate diff"
msgstr "diff oluşturulamadı"
-#: range-diff.c:518 range-diff.c:520
+#: range-diff.c:558
+msgid "--left-only and --right-only are mutually exclusive"
+msgstr "-p ve --overlay birlikte kullanılmaz"
+
+#: range-diff.c:561 range-diff.c:563
#, c-format
msgid "could not parse log for '%s'"
msgstr "'%s' günlüğü ayrıştırılamadı"
-#: read-cache.c:680
+#: 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:696
+#: 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:718
+#: 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:723
+#: read-cache.c:725
#, c-format
msgid "'%s' does not have a commit checked out"
-msgstr "'%s' çıkışı yapılmış bir gönderiye iye değil"
+msgstr "'%s' çıkışı yapılmış bir işlemeye iye değil"
-#: read-cache.c:775
+#: read-cache.c:777
#, c-format
msgid "unable to index file '%s'"
msgstr "'%s' dosyası indekslenemiyor"
-#: read-cache.c:794
+#: read-cache.c:796
#, c-format
msgid "unable to add '%s' to index"
msgstr "'%s' indekse eklenemiyor"
-#: read-cache.c:805
+#: read-cache.c:807
#, c-format
msgid "unable to stat '%s'"
msgstr "'%s' dosyasının bilgileri alınamıyor"
-#: read-cache.c:1330
+#: 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:1536
+#: read-cache.c:1532
msgid "Refresh index"
-msgstr "İndeksi yenile"
+msgstr "İndeks yenileniyor"
-#: read-cache.c:1651
+#: read-cache.c:1657
#, 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"
+"index.version ayarlanmış; ancak değer geçersiz.\n"
"%i sürümü kullanılıyor"
-#: read-cache.c:1661
+#: read-cache.c:1667
#, 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"
+"GIT_INDEX_VERSION ayarlanmış; ancak değer geçersiz.\n"
"%i sürümü kullanılıyor"
-#: read-cache.c:1717
+#: read-cache.c:1723
#, c-format
msgid "bad signature 0x%08x"
msgstr "hatalı imza 0x%08x"
-#: read-cache.c:1720
+#: read-cache.c:1726
#, c-format
msgid "bad index version %d"
msgstr "hatalı indeks sürümü %d"
-#: read-cache.c:1729
+#: read-cache.c:1735
msgid "bad index file sha1 signature"
msgstr "hatalı indeks dosyası sha1 imzası"
-#: read-cache.c:1759
+#: read-cache.c:1765
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "indeks bizim anlamadığımız %.4s imzası kullanıyor"
-#: read-cache.c:1761
+#: read-cache.c:1767
#, c-format
msgid "ignoring %.4s extension"
msgstr "%.4s uzantısı yok sayılıyor"
-#: read-cache.c:1798
+#: read-cache.c:1804
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "bilinmeyen indeks girdisi biçimi 0x%08x"
-#: read-cache.c:1814
+#: read-cache.c:1820
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "indekste hatalı oluşturulmuş ad alanı, '%s' yolu yakınında"
-#: read-cache.c:1871
+#: read-cache.c:1877
msgid "unordered stage entries in index"
msgstr "indekste sırasız hazırlama alanı girdileri"
-#: read-cache.c:1874
+#: read-cache.c:1880
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "birleştirilmiş dosya '%s' için çoklu hazırlama alanı girdileri"
-#: read-cache.c:1877
+#: read-cache.c:1883
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "'%s' için sırasız hazırlama alanı girdileri"
-#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
-#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
-#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
-#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
-#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
+#: read-cache.c:1989 read-cache.c:2280 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181
+#: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991
+#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505
+#: 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:2124
+#: read-cache.c:2133
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "load_cache_entries iş parçacığı oluşturulamıyor: %s"
-#: read-cache.c:2137
+#: read-cache.c:2146
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "load_cache_entries iş parçacığı ucu birleştirilemiyor: %s"
-#: read-cache.c:2170
+#: read-cache.c:2179
#, c-format
msgid "%s: index file open failed"
msgstr "%s: indeks dosyası açılamadı"
-#: read-cache.c:2174
+#: read-cache.c:2183
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s: açık indeksin bilgileri alınamıyor"
-#: read-cache.c:2178
+#: read-cache.c:2187
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s: indeks dosyası beklenenden daha küçük"
-#: read-cache.c:2182
+#: read-cache.c:2191
#, c-format
msgid "%s: unable to map index file"
msgstr "%s: indeks dosyası eşlemlenemiyor"
-#: read-cache.c:2224
+#: read-cache.c:2233
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "load_index_extensions iş parçacığı oluşturulamıyor: %s"
-#: read-cache.c:2251
+#: read-cache.c:2260
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "load_index_extensions iş parçacığı ucu birleştirilemiyor: %s"
-#: read-cache.c:2283
+#: read-cache.c:2292
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "paylaşılan indeks '%s' tazelenemedi"
-#: read-cache.c:2330
+#: read-cache.c:2339
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "bozuk indeks, %s bekleniyordu (%s içinde), %s alındı"
-#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122
+#: read-cache.c:3035 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141
#, c-format
msgid "could not close '%s'"
msgstr "'%s' kapatılamadı"
-#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959
+#: read-cache.c:3138 sequencer.c:2487 sequencer.c:4239
#, c-format
msgid "could not stat '%s'"
msgstr "'%s' bilgileri alınamadı"
-#: read-cache.c:3142
+#: read-cache.c:3151
#, c-format
msgid "unable to open git dir: %s"
msgstr "git dizini açılamıyor: %s"
-#: read-cache.c:3154
+#: read-cache.c:3163
#, c-format
msgid "unable to unlink: %s"
msgstr "bağlantı kesilemiyor: %s"
-#: read-cache.c:3179
+#: read-cache.c:3188
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "'%s' üzerindeki izin bitleri onarılamıyor"
-#: read-cache.c:3328
+#: read-cache.c:3337
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s: #0 numaralı hazırlama alanına bırakılamıyor"
@@ -5622,22 +6431,21 @@
msgstr ""
"\n"
"Komutlar:\n"
-"p, pick <gönderi> = gönderiyi kullan\n"
-"r, reword <gönderi> = gönderiyi kullan, ancak gönderi iletisini düzenle\n"
-"e, edit <gönderi> = gönderiyi kullan, ancak değiştirmek için dur\n"
-"s, squash <gönderi> = gönderiyi kullan, ancak önceki gönderi içine karıştır\n"
-"f, fixup <gönderi> = \"squash\" gibi, ancak bu gönderinin günlük iletisini "
-"at\n"
+"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 <gönderi> = gönderiyi kaldı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 <gönderi> | -c <gönderi>] <etiket> [# <teksatır>]\n"
-". orijinal birleştirme gönderisi iletisini kullanarak bir\n"
-". birleştirme gönderisi oluştur (veya teksatır, eğer bir orijinal\n"
-". birleştirme gönderisi belirtilmemişse). Gönderi iletisini yeniden\n"
-". yazmak için -c <gönderi> kullanın.\n"
+"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"
@@ -5648,24 +6456,24 @@
msgstr[0] "%s ögesini %s üzerine yeniden temellendir (%d komut)"
msgstr[1] "%s ögesini %s üzerine yeniden temellendir (%d komut)"
-#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228
+#: 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 gönderiyi kaldırmak için 'drop'u açıkça "
+"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: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 ""
"\n"
-"Buradaki bir satırı kaldırırsanız O GÖNDERİ TÜMÜYLE KAYBOLACAK.\n"
+"Buradaki bir satırı kaldırırsanız İŞLEME KAYBOLUR.\n"
-#: rebase-interactive.c:81 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"
@@ -5680,24 +6488,24 @@
"\tgit rebase --continue\n"
"\n"
-#: rebase-interactive.c:86 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 ""
"\n"
-"Eğer ki, her şeyi kaldırırsanız yeniden temellendirme iptal edilecektir.\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:3444
-#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252
+#: rebase-interactive.c:110 rerere.c:469 rerere.c:676 sequencer.c:3615
+#: sequencer.c:3641 sequencer.c:5424 builtin/fsck.c:329 builtin/rebase.c:272
#, c-format
msgid "could not write '%s'"
msgstr "'%s' yazılamadı"
-#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210
-#: builtin/rebase.c:234
+#: rebase-interactive.c:116 builtin/rebase.c:204 builtin/rebase.c:230
+#: builtin/rebase.c:254
#, c-format
msgid "could not write '%s'."
msgstr "'%s' yazılamadı."
@@ -5708,8 +6516,8 @@
"Warning: some commits may have been dropped accidentally.\n"
"Dropped commits (newer to older):\n"
msgstr ""
-"Uyarı: Bazı gönderiler yanlışlıkla bırakılmış olabilir.\n"
-"Bırakılan gönderiler: (yeniden eskiye):\n"
+"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
@@ -5721,140 +6529,21 @@
"The possible behaviours are: ignore, warn, error.\n"
"\n"
msgstr ""
-"Bu iletiden kaçınmak için, bir gönderiyi kaldırırken açıkça \"drop\" "
+"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:2262
-#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221
-#: builtin/rebase.c:246
+#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2402
+#: builtin/rebase.c:190 builtin/rebase.c:215 builtin/rebase.c:241
+#: builtin/rebase.c:266
#, c-format
msgid "could not read '%s'."
msgstr "'%s' okunamadı."
-#: refs.c:262
-#, c-format
-msgid "%s does not point to a valid object!"
-msgstr "%s geçerli bir nesneye işaret etmiyor!"
-
-#: refs.c:667
-#, c-format
-msgid "ignoring dangling symref %s"
-msgstr "sarkan sembolik başvuru %s yok sayılıyor"
-
-#: refs.c:669 ref-filter.c:2098
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr "bozuk başvuru %s yok sayılıyor"
-
-#: refs.c:804
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "'%s' yazma için açılamadı: %s"
-
-#: refs.c:814 refs.c:865
-#, c-format
-msgid "could not read ref '%s'"
-msgstr "'%s' başvurusu okunamadı"
-
-#: refs.c:820
-#, c-format
-msgid "ref '%s' already exists"
-msgstr "'%s' başvurusu halihazırda var"
-
-#: refs.c:825
-#, c-format
-msgid "unexpected object ID when writing '%s'"
-msgstr "'%s' yazılırken beklenmedik nesne numarası"
-
-#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905
-#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157
-#: wrapper.c:620
-#, c-format
-msgid "could not write to '%s'"
-msgstr "şuraya yazılamadı: '%s'"
-
-#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719
-#: builtin/rebase.c:1029
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "'%s' yazma için açılamadı"
-
-#: refs.c:867
-#, c-format
-msgid "unexpected object ID when deleting '%s'"
-msgstr "'%s' silinirken beklenmedik nesne numarası"
-
-#: refs.c:998
-#, c-format
-msgid "log for ref %s has gap after %s"
-msgstr "%s başvurusu için olan günlükte %s sonrasında boşluk var"
-
-#: refs.c:1004
-#, c-format
-msgid "log for ref %s unexpectedly ended on %s"
-msgstr ""
-"%s başvurusu için olan günlük %s konumunda beklenmedik bir biçimde sonlandı"
-
-#: refs.c:1063
-#, c-format
-msgid "log for %s is empty"
-msgstr "%s için olan günlük boş"
-
-#: refs.c:1155
-#, c-format
-msgid "refusing to update ref with bad name '%s'"
-msgstr "hatalı ada iye '%s' başvurusunu güncelleme reddediliyor"
-
-#: refs.c:1231
-#, c-format
-msgid "update_ref failed for ref '%s': %s"
-msgstr "'%s' başvurusu için update_ref başarısız oldu: %s"
-
-#: refs.c:2023
-#, c-format
-msgid "multiple updates for ref '%s' not allowed"
-msgstr "'%s' başvurusu için birden çok güncellemeye izin verilmiyor"
-
-#: refs.c:2055
-msgid "ref updates forbidden inside quarantine environment"
-msgstr "başvuru güncellemeleri karantina ortamı içinde yasak"
-
-#: refs.c:2151 refs.c:2181
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr "'%s' mevcut; '%s' oluşturulamıyor"
-
-#: refs.c:2157 refs.c:2192
-#, c-format
-msgid "cannot process '%s' and '%s' at the same time"
-msgstr "'%s' ve '%s' aynı anda işlenemiyor"
-
-#: refs/files-backend.c:1233
-#, c-format
-msgid "could not remove reference %s"
-msgstr "%s başvurusu kaldırılamadı"
-
-#: refs/files-backend.c:1247 refs/packed-backend.c:1541
-#: refs/packed-backend.c:1551
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "%s başvurusu silinemedi: %s"
-
-#: refs/files-backend.c:1250 refs/packed-backend.c:1554
-#, c-format
-msgid "could not delete references: %s"
-msgstr "başvurular silinemedi: %s"
-
-#: refspec.c:137
-#, c-format
-msgid "invalid refspec '%s'"
-msgstr "geçersiz başvuru belirteci '%s'"
-
-#: ref-filter.c:42 wt-status.c:1938
+#: ref-filter.c:42 wt-status.c:1975
msgid "gone"
msgstr "gitti"
@@ -5873,281 +6562,411 @@
msgid "ahead %d, behind %d"
msgstr "%d önünde, %d arkasında"
-#: ref-filter.c:165
+#: ref-filter.c:175
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "beklenen biçim: %%(color:<renk>)"
-#: ref-filter.c:167
+#: ref-filter.c:177
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "tanımlanamayan renk: %%(color:%s)"
-#: ref-filter.c:189
+#: ref-filter.c:199
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Tamsayı değeri şunu bekliyordu: refname:lstrip=%s"
-#: ref-filter.c:193
+#: ref-filter.c:203
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Tamsayı değeri şunu bekliyordu: refname:rstrip=%s"
-#: ref-filter.c:195
+#: ref-filter.c:205
#, c-format
msgid "unrecognized %%(%s) argument: %s"
-msgstr "tanımlanamayan %%(%s) değişkeni: %s"
+msgstr "tanımlanamayan %%(%s) argümanı: %s"
-#: ref-filter.c:250
+#: ref-filter.c:260
#, c-format
msgid "%%(objecttype) does not take arguments"
-msgstr "%%(objecttype) değişken almıyor"
+msgstr "%%(objecttype) argüman almıyor"
-#: ref-filter.c:272
+#: ref-filter.c:282
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "tanımlanamayan %%(objectsize) değişkeni: %s"
+msgstr "tanımlanamayan %%(objectsize) argümanı: %s"
-#: ref-filter.c:280
+#: ref-filter.c:290
#, c-format
msgid "%%(deltabase) does not take arguments"
-msgstr "%%(deltabase) değişken almıyor"
+msgstr "%%(deltabase) argüman almıyor"
-#: ref-filter.c:292
+#: ref-filter.c:302
#, c-format
msgid "%%(body) does not take arguments"
-msgstr "%%(body) değişken almıyor"
+msgstr "%%(body) argüman almıyor"
-#: ref-filter.c:301
+#: ref-filter.c:315
#, c-format
-msgid "%%(subject) does not take arguments"
-msgstr "%%(subject) değişken almıyor"
+msgid "unrecognized %%(subject) argument: %s"
+msgstr "tanımlanamayan %%(subject) argümanı: %s"
-#: ref-filter.c:323
+#: ref-filter.c:334
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr "%%(trailers:key=<değer>) bekleniyordu"
+
+#: ref-filter.c:336
#, c-format
msgid "unknown %%(trailers) argument: %s"
-msgstr "bilinmeyen %%(trailers) değişkeni: %s"
+msgstr "bilinmeyen %%(trailers) argümanı: %s"
-#: ref-filter.c:352
+#: ref-filter.c:367
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "pozitif değer şunu bekliyordu: contents:lines=%s"
-#: ref-filter.c:354
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "tanımlanamayan %%(contents) değişkeni: %s"
-
#: ref-filter.c:369
#, c-format
-msgid "positive value expected objectname:short=%s"
-msgstr "pozitif değer şunu bekliyordu: objectname:short=%s"
+msgid "unrecognized %%(contents) argument: %s"
+msgstr "tanımlanamayan %%(contents) argümanı: %s"
-#: ref-filter.c:373
+#: ref-filter.c:384
#, c-format
-msgid "unrecognized %%(objectname) argument: %s"
-msgstr "tanımlanamayan %%(objectname) değişkeni: %s"
+msgid "positive value expected '%s' in %%(%s)"
+msgstr "pozitif değer şurada '%s' bekliyordu: %%(%s)"
-#: ref-filter.c:403
+#: ref-filter.c:388
+#, c-format
+msgid "unrecognized argument '%s' in %%(%s)"
+msgstr "şurada tanımlanamayan argüman '%s': %%(%s)"
+
+#: ref-filter.c:402
+#, c-format
+msgid "unrecognized email option: %s"
+msgstr "tanımlanamayan e-posta seçeneği: %s"
+
+#: ref-filter.c:432
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "beklenen biçim: %%(align:<genişlik>,<konum>)"
-#: ref-filter.c:415
+#: ref-filter.c:444
#, c-format
msgid "unrecognized position:%s"
msgstr "tanımlanamayan konum:%s"
-#: ref-filter.c:422
+#: ref-filter.c:451
#, c-format
msgid "unrecognized width:%s"
msgstr "tanımlanamayan genişlik:%s"
-#: ref-filter.c:431
+#: ref-filter.c:460
#, c-format
msgid "unrecognized %%(align) argument: %s"
-msgstr "tanımlanamayan %%(align) değişkeni: %s"
+msgstr "tanımlanamayan %%(align) argümanı: %s"
-#: ref-filter.c:439
+#: ref-filter.c:468
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "pozitif genişlik %%(align) ögeciği ile birlikte bekleniyordu"
-#: ref-filter.c:457
+#: ref-filter.c:486
#, c-format
msgid "unrecognized %%(if) argument: %s"
-msgstr "tanımlanamayan %%(if) değişkeni: %s"
+msgstr "tanımlanamayan %%(if) argümanı: %s"
-#: ref-filter.c:559
+#: ref-filter.c:588
#, c-format
msgid "malformed field name: %.*s"
msgstr "hatalı oluşturulmuş alan adı: %.*s"
-#: ref-filter.c:586
+#: ref-filter.c:615
#, c-format
msgid "unknown field name: %.*s"
msgstr "bilinmeyen alan adı: %.*s"
-#: ref-filter.c:590
+#: ref-filter.c:619
#, 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"
+"bir git deposu değil; ancak '%.*s' alanı nesne verisine erişim gerektiriyor"
-#: ref-filter.c:714
+#: ref-filter.c:743
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "biçim: %%(if) ögeciği bir %%(then) ögeciği olmadan kullanıldı"
-#: ref-filter.c:777
+#: ref-filter.c:806
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "biçim: %%(then) ögeciği bir %%(if) ögeciği olmadan kullanıldı"
-#: ref-filter.c:779
+#: ref-filter.c:808
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "biçim: %%(then) ögeciği birden çok kez kullanıldı"
-#: ref-filter.c:781
+#: ref-filter.c:810
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "biçim: %%(then) ögeciği %%(else) ögeciğinden sonra kullanıldı"
-#: ref-filter.c:809
+#: ref-filter.c:838
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "biçim: %%(else) ögeciği bir %%(if) ögeciği olmadan kullanıldı"
-#: ref-filter.c:811
+#: ref-filter.c:840
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "biçim: %%(else) ögeciği bir %%(then) ögeciği olmadan kullanıldı"
-#: ref-filter.c:813
+#: ref-filter.c:842
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "biçim: %%(else) ögeciği birden çok kez kullanıldı"
-#: ref-filter.c:828
+#: ref-filter.c:857
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "biçim: %%(end) ögeciği eş ögeciği olmadan kullanıldı"
-#: ref-filter.c:885
+#: ref-filter.c:914
#, c-format
msgid "malformed format string %s"
msgstr "hatalı oluşturulmuş biçim dizisi %s"
-#: ref-filter.c:1488
+#: ref-filter.c:1555
#, c-format
-msgid "no branch, rebasing %s"
-msgstr "dal yok, %s yeniden temellendiriliyor"
+msgid "(no branch, rebasing %s)"
+msgstr "(dal yok, %s yeniden temellendiriliyor)"
-#: ref-filter.c:1491
+#: ref-filter.c:1558
#, c-format
-msgid "no branch, rebasing detached HEAD %s"
-msgstr "dal yok, ayrık HEAD %s yeniden temellendiriliyor"
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "(dal yok, ayrık HEAD %s yeniden temellendiriliyor)"
-#: ref-filter.c:1494
+#: ref-filter.c:1561
#, c-format
-msgid "no branch, bisect started on %s"
-msgstr "dal yok, ikili arama %s üzerinde başladı"
+msgid "(no branch, bisect started on %s)"
+msgstr "(dal yok, ikili arama %s üzerinde başladı)"
-#: ref-filter.c:1504
-msgid "no branch"
-msgstr "dal yok"
+#: ref-filter.c:1565
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD, %s konumunda ayrıldı)"
-#: ref-filter.c:1540 ref-filter.c:1749
+#: ref-filter.c:1568
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD, %s ögesinden ayrıldı)"
+
+#: ref-filter.c:1571
+msgid "(no branch)"
+msgstr "(dal yok)"
+
+#: ref-filter.c:1603 ref-filter.c:1812
#, c-format
msgid "missing object %s for %s"
msgstr "eksik nesne %s (%s için)"
-#: ref-filter.c:1550
+#: ref-filter.c:1613
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer %s üzerinde başarısız oldu (%s için)"
-#: ref-filter.c:2004
+#: ref-filter.c:1996
#, c-format
msgid "malformed object at '%s'"
msgstr "'%s' konumunda hatalı oluşturulmuş nesne"
-#: ref-filter.c:2093
+#: ref-filter.c:2085
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "bozuk ada iye %s başvurusu yok sayılıyor"
-#: ref-filter.c:2389
+#: ref-filter.c:2090 refs.c:676
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "bozuk başvuru %s yok sayılıyor"
+
+#: ref-filter.c:2430
#, c-format
msgid "format: %%(end) atom missing"
msgstr "biçim: %%(end) ögeciği eksik"
-#: ref-filter.c:2489
-#, c-format
-msgid "option `%s' is incompatible with --merged"
-msgstr "'%s' seçeneği --merged ile uyumsuz"
-
-#: ref-filter.c:2492
-#, c-format
-msgid "option `%s' is incompatible with --no-merged"
-msgstr "'%s' seçeneği --no-merged ile uyumsuz"
-
-#: ref-filter.c:2502
+#: ref-filter.c:2529
#, c-format
msgid "malformed object name %s"
msgstr "hatalı oluşturulmuş nesne adı %s"
-#: ref-filter.c:2507
+#: ref-filter.c:2534
#, c-format
msgid "option `%s' must point to a commit"
-msgstr "'%s' bir gönderiye işaret etmeli"
+msgstr "'%s' bir işlemeye işaret etmeli"
-#: remote.c:366
+#: 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:566
+#, c-format
+msgid ""
+"Using '%s' as the name for the initial branch. This default branch name\n"
+"is subject to change. To configure the initial branch name to use in all\n"
+"of your new repositories, which will suppress this warning, call:\n"
+"\n"
+"\tgit config --global init.defaultBranch <name>\n"
+"\n"
+"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"'development'. The just-created branch can be renamed via this command:\n"
+"\n"
+"\tgit branch -m <name>\n"
+msgstr ""
+"Başlangıç dal adı olarak %s kullanılıyor. Bu öntanımlı dal adı\n"
+"değiştirilebilir. Bu iletiyi kapatmak ve yeni depolarınızda kullanılacak\n"
+"başlangıç dal adını yapılandırmak için şu komutu kullanın:\n"
+"\n"
+"\tgit config --global init.defaultBranch <ad>\n"
+"\n"
+"'master' yerine kullanılan diğer yaygın dal adları 'main', 'trunk' ve/veya\n"
+"'development'tır. Yeni oluşturulan dal şu komutla yeniden adlandırılabilir:\n"
+"\n"
+"\tgit branch -m <ad>\n"
+
+#: refs.c:588
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "'%s' alınamadı"
+
+#: refs.c:598
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "geçersiz dal adı: %s = %s"
+
+#: refs.c:674
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "sarkan sembolik başvuru %s yok sayılıyor"
+
+#: refs.c:922
+#, 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:929
+#, 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:994
+#, c-format
+msgid "log for %s is empty"
+msgstr "%s için olan günlük boş"
+
+#: refs.c:1086
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "hatalı ada iye '%s' başvurusunu güncelleme reddediliyor"
+
+#: refs.c:1157
+#, 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:2051
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "'%s' başvurusu için birden çok güncellemeye izin verilmiyor"
+
+#: refs.c:2131
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "başvuru güncellemeleri karantina ortamı içinde yasak"
+
+#: refs.c:2142
+msgid "ref updates aborted by hook"
+msgstr "başvuru güncellemeleri kanca tarafından iptal edildi"
+
+#: refs.c:2242 refs.c:2272
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "'%s' mevcut; '%s' oluşturulamıyor"
+
+#: refs.c:2248 refs.c:2283
+#, 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:170
+#, 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:414
+#: remote.c:399
msgid "more than one receivepack given, using the first"
msgstr "birden fazla receivepack verildi, birincisi kullanılıyor"
-#: remote.c:422
+#: remote.c:407
msgid "more than one uploadpack given, using the first"
msgstr "birden fazla uploadpack verildi, birincisi kullanılıyor"
-#: remote.c:612
+#: remote.c:590
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "Hem %s hem %s şuraya getirilemiyor: %s"
-#: remote.c:616
+#: remote.c:594
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s genelde %s ögesini izler, %s değil"
-#: remote.c:620
+#: remote.c:598
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s hem %s hem %s ögelerini izler"
-#: remote.c:688
+#: remote.c:666
#, c-format
msgid "key '%s' of pattern had no '*'"
-msgstr "dizginin '%s' anahtarında'*' yoktu"
+msgstr "dizginin '%s' anahtarında '*' yoktu"
-#: remote.c:698
+#: remote.c:676
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr "dizginin '%s' değerinde '*' yok"
-#: remote.c:1004
+#: remote.c:1083
#, c-format
msgid "src refspec %s does not match any"
msgstr "kaynak başvuru belirteci %s başka hiçbir şeyle eşleşmiyor"
-#: remote.c:1009
+#: remote.c:1088
#, c-format
msgid "src refspec %s matches more than one"
msgstr "kaynak başvuru belirteci %s birden fazlası ile eşleşiyor"
@@ -6156,7 +6975,7 @@
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1024
+#: remote.c:1103
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
@@ -6180,18 +6999,18 @@
"Hiçbiri işe yaramadı, biz de bıraktık. Başvuruyu tam olarak "
"nitelendirmelisiniz."
-#: remote.c:1044
+#: remote.c:1123
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
"Did you mean to create a new branch by pushing to\n"
"'%s:refs/heads/%s'?"
msgstr ""
-"Başvuru belirtecinin <kaynak> kısmı bir gönderi nesnesi.\n"
+"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:1049
+#: remote.c:1128
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
@@ -6202,7 +7021,7 @@
"'%s:refs/tags/%s' konumuna iterek yeni bir etiket mi\n"
"oluşturmak istediniz?"
-#: remote.c:1054
+#: remote.c:1133
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
@@ -6213,7 +7032,7 @@
"'%s:refs/tags/%s' konumuna iterek yeni bir ağaç mı\n"
"etiketlemek istediniz?"
-#: remote.c:1059
+#: remote.c:1138
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
@@ -6224,126 +7043,126 @@
"'%s:refs/tags/%s' konumuna iterek yeni ikili bir nesne mi\n"
"etiketlemek istediniz?"
-#: remote.c:1095
+#: remote.c:1174
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "%s dala çözülemiyor"
-#: remote.c:1106
+#: remote.c:1185
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "'%s' silinemiyor: uzak başvuru yok"
-#: remote.c:1118
+#: remote.c:1197
#, c-format
msgid "dst refspec %s matches more than one"
-msgstr "hedef başvuru belirteci %s birden fazlası ile eşleşiyor"
+msgstr "birden çok hedef başvuru belirteci %s eşleşmesi"
-#: remote.c:1125
+#: remote.c:1204
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr "hedef başvurusu %s birden çok kaynaktan alıyor"
-#: remote.c:1628 remote.c:1729
+#: remote.c:1724 remote.c:1825
msgid "HEAD does not point to a branch"
msgstr "HEAD bir dala işaret etmiyor"
-#: remote.c:1637
+#: remote.c:1733
#, c-format
msgid "no such branch: '%s'"
msgstr "böyle bir dal yok: '%s'"
-#: remote.c:1640
+#: remote.c:1736
#, c-format
msgid "no upstream configured for branch '%s'"
-msgstr "'%s' dalı için üstkaynak yapılandırması yok"
+msgstr "'%s' dalı için üstkaynak yapılandırılmamış"
-#: remote.c:1646
+#: remote.c:1742
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "üstkaynak dalı '%s' bir uzak izleme dalı olarak depolanmıyor"
-#: remote.c:1661
+#: remote.c:1757
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
-msgstr "itme hedefi '%s' ('%s' uzak konumunda) yerel izleme dalına iye değil"
+msgstr "'%s' itme hedefinin ('%s' uzak konumunda) yerel izleme dalı yok"
-#: remote.c:1673
+#: remote.c:1769
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "'%s' dalının itme için uzak konumu yok"
-#: remote.c:1683
+#: remote.c:1779
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "'%s' için olan başvuru belirteçleri '%s' içermiyor"
-#: remote.c:1696
+#: remote.c:1792
msgid "push has no destination (push.default is 'nothing')"
msgstr "itilecek bir hedef yok (push.default: 'nothing')"
-#: remote.c:1718
+#: remote.c:1814
msgid "cannot resolve 'simple' push to a single destination"
msgstr "tek bir konuma 'simple' itme çözülemiyor"
-#: remote.c:1844
+#: remote.c:1943
#, c-format
msgid "couldn't find remote ref %s"
-msgstr "uzak başvuru %s bulunamadı"
+msgstr "%s uzak başvurusu bulunamadı"
-#: remote.c:1857
+#: remote.c:1956
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "* Eğlenceli başvuru '%s' yerel olarak yok sayılıyor"
-#: remote.c:2020
+#: remote.c:2119
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
-msgstr "Dalınız '%s' temelli, ancak üstkaynak gitmiş.\n"
+msgstr "Dalınız '%s' temelli; ancak üstkaynak kaybolmuş.\n"
-#: remote.c:2024
+#: remote.c:2123
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (düzeltmek için \"git branch --unset-upstream\" kullan)\n"
-#: remote.c:2027
+#: remote.c:2126
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "Dalınız '%s' ile güncel.\n"
-#: remote.c:2031
+#: remote.c:2130
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
-msgstr "Sizin dalınız ve '%s' başka gönderilere başvuruyor.\n"
+msgstr "Sizin dalınız ve '%s' başka işlemelere başvuruyor.\n"
-#: remote.c:2034
+#: remote.c:2133
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (ayrıntılar için \"%s\" kullanın)\n"
-#: remote.c:2038
+#: remote.c:2137
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
-msgstr[0] "Dalınız '%s' dalından %d gönderi ileride.\n"
-msgstr[1] "Dalınız '%s' dalından %d gönderi ileride.\n"
+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:2044
+#: remote.c:2143
msgid " (use \"git push\" to publish your local commits)\n"
-msgstr " (yerel gönderilerinizi yayımlamak için \"git push\" kullanın)\n"
+msgstr " (yerel işlemelerinizi yayımlamak için \"git push\" kullanın)\n"
-#: remote.c:2047
+#: remote.c:2146
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
-msgstr[0] "Dalınız '%s' dalından %d gönderi geride ve ileri sarılabilir.\n"
-msgstr[1] "Dalınız '%s' dalından %d gönderi geride ve ileri sarılabilir.\n"
+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:2055
+#: remote.c:2154
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (yerel dalınızı güncellemek için \"git pull\" kullanın)\n"
-#: remote.c:2058
+#: remote.c:2157
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -6353,16 +7172,16 @@
"and have %d and %d different commits each, respectively.\n"
msgstr[0] ""
"Sizin dalınız ve '%s' birbirinden uzaklaşmış ve sırasıyla\n"
-"her birinde %d ve %d gönderi var.\n"
+"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 gönderi var.\n"
+"her birinde %d ve %d işleme var.\n"
-#: remote.c:2068
+#: remote.c:2167
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (uzak dalı kendi dalınıza birleştirmek için \"git pull\" kullanın)\n"
-#: remote.c:2251
+#: remote.c:2359
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "beklenen nesne adı '%s' ayrıştırılamıyor"
@@ -6382,157 +7201,170 @@
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
+#: rerere.c:201 rerere.c:210 rerere.c:213
msgid "corrupt MERGE_RR"
msgstr "hasar görmüş MERGE_RR"
-#: rerere.c:264 rerere.c:269
+#: rerere.c:248 rerere.c:253
msgid "unable to write rerere record"
msgstr "rerere kaydı yazılamıyor"
-#: rerere.c:495
+#: rerere.c:479
#, c-format
msgid "there were errors while writing '%s' (%s)"
msgstr "'%s' yazılırken hatalar vardı (%s)"
-#: rerere.c:498
+#: rerere.c:482
#, c-format
msgid "failed to flush '%s'"
msgstr "'%s' floş yapılamadı"
-#: rerere.c:503 rerere.c:1039
+#: rerere.c:487 rerere.c:1023
#, 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
+#: rerere.c:668
#, c-format
msgid "failed utime() on '%s'"
msgstr "'%s' üzerinde utime() başarısız"
-#: rerere.c:694
+#: rerere.c:678
#, c-format
msgid "writing '%s' failed"
msgstr "'%s' yazılamadı"
-#: rerere.c:714
+#: rerere.c:698
#, 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
+#: rerere.c:737
#, c-format
msgid "Recorded resolution for '%s'."
msgstr "'%s' için çözüm kaydedildi."
-#: rerere.c:788
+#: rerere.c:772
#, c-format
msgid "Resolved '%s' using previous resolution."
msgstr "'%s' bir önceki çözüm kullanılarak çözüldü."
-#: rerere.c:803
+#: rerere.c:787
#, c-format
msgid "cannot unlink stray '%s'"
msgstr "'%s' başıboşunun bağlantısı kesilemiyor"
-#: rerere.c:807
+#: rerere.c:791
#, c-format
msgid "Recorded preimage for '%s'"
msgstr "'%s' için öngörüntü kaydedildi"
-#: rerere.c:881 submodule.c:2078 builtin/log.c:1871
-#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
+#: rerere.c:865 submodule.c:2088 builtin/log.c:1991
+#: 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
+#: rerere.c:1041
#, 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
+#: rerere.c:1052 rerere.c:1059
#, c-format
msgid "no remembered resolution for '%s'"
msgstr "'%s' için hatırlanan çözüm yok"
-#: rerere.c:1077
+#: rerere.c:1061
#, c-format
msgid "cannot unlink '%s'"
msgstr "'%s' bağlantısı kesilemiyor"
-#: rerere.c:1087
+#: rerere.c:1071
#, c-format
msgid "Updated preimage for '%s'"
msgstr "'%s' için öngörüntü güncellendi"
-#: rerere.c:1096
+#: rerere.c:1080
#, c-format
msgid "Forgot resolution for '%s'\n"
msgstr "'%s' için çözüm unutuldu\n"
-#: rerere.c:1199
+#: rerere.c:1191
msgid "unable to open rr-cache directory"
msgstr "rr-cache dizini açılamıyor"
-#: revision.c:2497
+#: reset.c:42
+msgid "could not determine HEAD revision"
+msgstr "HEAD revizyonu saptanamadı"
+
+#: reset.c:70 reset.c:76 sequencer.c:3468
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "%s ögesinin ağacı bulunamadı"
+
+#: revision.c:2338
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "--unpacked=<paketdosyası> artık desteklenmiyor"
+
+#: revision.c:2668
msgid "your current branch appears to be broken"
msgstr "geçerli dalınız bozuk gibi görünüyor"
-#: revision.c:2500
+#: revision.c:2671
#, c-format
msgid "your current branch '%s' does not have any commits yet"
-msgstr "geçerli dalınız '%s' içinde henüz bir gönderi yok"
+msgstr "geçerli dalınız '%s' içinde henüz bir işleme yok"
-#: revision.c:2708
-msgid "--first-parent is incompatible with --bisect"
-msgstr "--first-parent, --bisect ile uyumsuz"
-
-#: revision.c:2712
+#: revision.c:2877
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
+#: run-command.c:767
msgid "open /dev/null failed"
msgstr "/dev/null açılamadı"
-#: run-command.c:1269
+#: run-command.c:1274
#, c-format
msgid "cannot create async thread: %s"
msgstr "async iş parçacığı oluşturulamadı: %s"
-#: run-command.c:1333
+#: run-command.c:1338
#, 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"
+"'%s' kancası yok sayıldı; çünkü bir çalıştırılabilir olarak ayarlanmamış.\n"
"Bu uyarıyı 'git config advice.ignoredHook false' ile kapatabilirsiniz."
-#: send-pack.c:144
+#: send-pack.c:146
msgid "unexpected flush packet while reading remote unpack status"
msgstr "uzak konum açım durumu okunurken beklenmedik floş paketi"
-#: send-pack.c:146
+#: send-pack.c:148
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "uzak konum açım durumu ayrıştırılamadı: %s"
-#: send-pack.c:148
+#: send-pack.c:150
#, c-format
msgid "remote unpack failed: %s"
msgstr "uzak konum açımı başarısız: %s"
-#: send-pack.c:309
+#: send-pack.c:374
msgid "failed to sign the push certificate"
msgstr "itme sertifikası imzalanamadı"
-#: send-pack.c:423
+#: send-pack.c:467
+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:476
msgid "the receiving end does not support --signed push"
msgstr "alıcı uç --signed itmeyi desteklemiyor"
-#: send-pack.c:425
+#: send-pack.c:478
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -6540,47 +7372,47 @@
"alıcı uç --signed itmeyi desteklemediğinden dolayı bir itme sertifikası "
"gönderilmiyor"
-#: send-pack.c:437
+#: send-pack.c:490
msgid "the receiving end does not support --atomic push"
msgstr "alıcı uç --atomic itmeyi desteklemiyor"
-#: send-pack.c:442
+#: send-pack.c:495
msgid "the receiving end does not support push options"
msgstr "alıcı uç itme seçeneklerini desteklemiyor"
-#: sequencer.c:191
+#: sequencer.c:195
#, c-format
msgid "invalid commit message cleanup mode '%s'"
-msgstr "geçersiz gönderi iletisi temizleme kipi '%s'"
+msgstr "geçersiz işleme iletisi temizleme kipi '%s'"
-#: sequencer.c:296
+#: sequencer.c:323
#, c-format
msgid "could not delete '%s'"
msgstr "'%s' silinemedi"
-#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385
+#: sequencer.c:343 builtin/rebase.c:757 builtin/rebase.c:1602 builtin/rm.c:385
#, c-format
msgid "could not remove '%s'"
msgstr "'%s' kaldırılamadı"
-#: sequencer.c:325
+#: sequencer.c:353
msgid "revert"
msgstr "geri al"
-#: sequencer.c:327
+#: sequencer.c:355
msgid "cherry-pick"
msgstr "seç-al"
-#: sequencer.c:329
+#: sequencer.c:357
msgid "rebase"
-msgstr "yeniden temellendir"
+msgstr "yeniden temellendirme"
-#: sequencer.c:331
+#: sequencer.c:359
#, c-format
msgid "unknown action: %d"
msgstr "bilinmeyen eylem: %d"
-#: sequencer.c:389
+#: sequencer.c:418
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -6588,7 +7420,7 @@
"çakışmaları çözdükten sonra doğrusu verilen yolları 'git add <yollar>'\n"
"veya 'git rm <yollar>' ile imleyin"
-#: sequencer.c:392
+#: sequencer.c:421
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -6596,46 +7428,45 @@
msgstr ""
"çakışmaları çözdükten sonra doğrusu verilen yolları 'git add <yollar>'\n"
"veya 'git rm <yollar>' ile imleyin ve çıkan sonucu\n"
-"'git commit' ile gönderin"
+"'git commit' ile işleyin"
-#: sequencer.c:405 sequencer.c:2901
+#: sequencer.c:434 sequencer.c:3070
#, c-format
msgid "could not lock '%s'"
msgstr "'%s' kilitlenemedi"
-#: sequencer.c:412
+#: sequencer.c:436 sequencer.c:2869 sequencer.c:3074 sequencer.c:3088
+#: sequencer.c:3345 sequencer.c:5334 strbuf.c:1168 wrapper.c:631
+#, c-format
+msgid "could not write to '%s'"
+msgstr "şuraya yazılamadı: '%s'"
+
+#: sequencer.c:441
#, c-format
msgid "could not write eol to '%s'"
msgstr "satır sonu şuraya yazılamadı: '%s'"
-#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921
-#: sequencer.c:3185
+#: sequencer.c:446 sequencer.c:2874 sequencer.c:3076 sequencer.c:3090
+#: sequencer.c:3353
#, c-format
msgid "failed to finalize '%s'"
msgstr "'%s' tamamlanamadı"
-#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
-#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
-#: builtin/rebase.c:593
-#, c-format
-msgid "could not read '%s'"
-msgstr "'%s' okunamadı"
-
-#: sequencer.c:466
+#: sequencer.c:485
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "%s ile yerel değişikliklerinizin üzerine yazılacaktır."
-#: sequencer.c:470
+#: sequencer.c:489
msgid "commit your changes or stash them to proceed."
-msgstr "İlerlemek için değişikliklerinizi gönderin veya zulalayın."
+msgstr "İlerlemek için değişikliklerinizi işleyin veya zulalayın."
-#: sequencer.c:502
+#: sequencer.c:521
#, c-format
msgid "%s: fast-forward"
msgstr "%s: ileri sar"
-#: sequencer.c:541 builtin/tag.c:565
+#: sequencer.c:560 builtin/tag.c:598
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Geçersiz temizlik kipi %s"
@@ -6643,65 +7474,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:635
+#: sequencer.c:670
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Yeni indeks dosyası yazılamıyor"
-#: sequencer.c:652
+#: sequencer.c:684
msgid "unable to update cache tree"
msgstr "önbellek ağacı güncellenemiyor"
-#: sequencer.c:666
+#: sequencer.c:698
msgid "could not resolve HEAD commit"
-msgstr "HEAD gönderisi çözülemedi"
+msgstr "HEAD işlemesi çözülemedi"
-#: sequencer.c:746
+#: sequencer.c:778
#, c-format
msgid "no key present in '%.*s'"
msgstr "'%.*s' içinde bir anahtar yok"
-#: sequencer.c:757
+#: sequencer.c:789
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "'%s' ögesinin tırnakları kaldırılamıyor"
-#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710
-#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072
+#: sequencer.c:826 wrapper.c:201 wrapper.c:371 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1136 builtin/rebase.c:910
#, c-format
msgid "could not open '%s' for reading"
msgstr "'%s' okuma için açılamadı"
-#: sequencer.c:804
+#: sequencer.c:836
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "'GIT_AUTHOR_NAME' halihazırda verilmiş"
-#: sequencer.c:809
+#: sequencer.c:841
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "'GIT_AUTHOR_EMAIL' halihazırda verilmiş"
-#: sequencer.c:814
+#: sequencer.c:846
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "'GIT_AUTHOR_DATE' halihazırda verilmiş"
-#: sequencer.c:818
+#: sequencer.c:850
#, c-format
msgid "unknown variable '%s'"
msgstr "bilinmeyen değişken '%s'"
-#: sequencer.c:823
+#: sequencer.c:855
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "'GIT_AUTHOR_NAME' eksik"
-#: sequencer.c:825
+#: sequencer.c:857
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "'GIT_AUTHOR_EMAIL' eksik"
-#: sequencer.c:827
+#: sequencer.c:859
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "'GIT_AUTHOR_DATE' eksik"
-#: sequencer.c:876
+#: sequencer.c:924
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -6718,23 +7549,24 @@
" git rebase --continue\n"
msgstr ""
"Çalışma ağacınızda hazırlanmış değişiklikleriniz var.\n"
-"Bu değişikliklerin bir önceki gönderiyle gitmiş olması gerekiyorsa:\n"
+"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 komutunu çalıştırın.\n"
+"\tgit commit --amend %s\n"
"\n"
-"Bunlar için yeni bir gönderi hazırlamak istiyorsanız:\n"
+"Yeni bir işleme yapmak istiyorsanız şu komutu çalıştırın:\n"
"\n"
-"\tgit commit %s komutunu çalıştırın.\n"
+"\tgit commit %s\n"
"\n"
-"Her iki durumda da işiniz bittikten sonra:\n"
+"Her iki durumda da işiniz bittikten sonra şu komut ile sürdürün:\n"
"\n"
-"\tgit rebase --continue komutu ile sürdürün.\n"
+"\tgit rebase --continue\n"
-#: sequencer.c:1148
+#: sequencer.c:1211
msgid "'prepare-commit-msg' hook failed"
msgstr "'prepare-commit-msg' başarısız oldu"
-#: sequencer.c:1154
+#: sequencer.c:1217
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6756,11 +7588,11 @@
"\n"
"\tgit config --global --edit\n"
"\n"
-"Bundan sonra bu gönderi için kullanılan kimliği düzeltmek isteyebilirsiniz:\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:1167
+#: sequencer.c:1230
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6780,351 +7612,360 @@
"\tgit config --global user.name \"Adınız\"\n"
"\tgit config --global user.email \"siz@e-posta.com\"\n"
"\n"
-"Bundan sonra bu gönderi için kullanılan kimliği düzeltmek isteyebilirsiniz:\n"
+"Bundan sonra bu işleme için kullanılan kimliği düzeltmek isteyebilirsiniz:\n"
"\n"
"\tgit commit --amend --reset-author\n"
-#: sequencer.c:1209
+#: sequencer.c:1272
msgid "couldn't look up newly created commit"
-msgstr "yeni oluşturulan gönderi aranamadı"
+msgstr "yeni yapılan işleme aranamadı"
-#: sequencer.c:1211
+#: sequencer.c:1274
msgid "could not parse newly created commit"
-msgstr "yeni oluşturulan gönderi ayrıştırılamadı"
+msgstr "yeni yapılan işleme ayrıştırılamadı"
-#: sequencer.c:1257
+#: sequencer.c:1320
msgid "unable to resolve HEAD after creating commit"
-msgstr "HEAD, gönderi oluşturduktan sonra çözülemiyor"
+msgstr "HEAD, işleme yapıldıktan sonra çözülemiyor"
-#: sequencer.c:1259
+#: sequencer.c:1322
msgid "detached HEAD"
msgstr "ayrık HEAD"
-#: sequencer.c:1263
+#: sequencer.c:1326
msgid " (root-commit)"
-msgstr " (kök gönderi)"
+msgstr " (kök işleme)"
-#: sequencer.c:1284
+#: sequencer.c:1347
msgid "could not parse HEAD"
msgstr "HEAD ayrıştırılamadı"
-#: sequencer.c:1286
+#: sequencer.c:1349
#, c-format
msgid "HEAD %s is not a commit!"
-msgstr "HEAD %s bir gönderi değil"
+msgstr "HEAD %s bir işleme değil"
-#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574
+#: sequencer.c:1353 sequencer.c:1431 builtin/commit.c:1577
msgid "could not parse HEAD commit"
-msgstr "HEAD gönderisi ayrıştırılamadı"
+msgstr "HEAD işlemesi ayrıştırılamadı"
-#: sequencer.c:1342 sequencer.c:1968
+#: sequencer.c:1409 sequencer.c:2108
msgid "unable to parse commit author"
-msgstr "gönderi yazarı ayrıştırılamıyor"
+msgstr "işleme yazarı ayrıştırılamıyor"
-#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687
+#: sequencer.c:1420 builtin/am.c:1566 builtin/merge.c:702
msgid "git write-tree failed to write a tree"
msgstr "git write-tree bir ağaca yazamadı"
-#: sequencer.c:1386 sequencer.c:1447
+#: sequencer.c:1453 sequencer.c:1573
#, c-format
msgid "unable to read commit message from '%s'"
-msgstr "'%s' konumundan gönderi iletisi okunamıyor"
+msgstr "'%s' konumundan işleme iletisi okunamıyor"
-#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886
-#: builtin/merge.c:911
+#: sequencer.c:1484 sequencer.c:1516
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr "geçersiz yazar kimliği '%s'"
+
+#: sequencer.c:1490
+msgid "corrupt author: missing date information"
+msgstr "hasar görmüş yazar: tarih bilgisi eksik"
+
+#: sequencer.c:1529 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:905
+#: builtin/merge.c:930 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
-msgstr "gönderi nesnesi yazılamadı"
+msgstr "işleme nesnesi yazılamadı"
-#: sequencer.c:1474
+#: sequencer.c:1556 sequencer.c:4291 t/helper/test-fast-rebase.c:198
+#, c-format
+msgid "could not update %s"
+msgstr "%s güncellenemedi"
+
+#: sequencer.c:1605
#, c-format
msgid "could not parse commit %s"
-msgstr "%s gönderisi ayrıştırılamadı"
+msgstr "%s işlemesi ayrıştırılamadı"
-#: sequencer.c:1479
+#: sequencer.c:1610
#, c-format
msgid "could not parse parent commit %s"
-msgstr "üst gönderi %s ayrıştırılamadı"
+msgstr "üst işleme %s ayrıştırılamadı"
-#: sequencer.c:1562 sequencer.c:1673
+#: sequencer.c:1693 sequencer.c:1804
#, c-format
msgid "unknown command: %d"
msgstr "bilinmeyen komut: %d"
-#: sequencer.c:1620 sequencer.c:1645
+#: sequencer.c:1751 sequencer.c:1776
#, c-format
msgid "This is a combination of %d commits."
-msgstr "Bu %d gönderinin bir birleşimi."
+msgstr "Bu %d işlemenin bir birleşimi."
-#: sequencer.c:1630
+#: sequencer.c:1761
msgid "need a HEAD to fixup"
msgstr "düzeltmek için bir HEAD gerekiyor"
-#: sequencer.c:1632 sequencer.c:3212
+#: sequencer.c:1763 sequencer.c:3380
msgid "could not read HEAD"
msgstr "HEAD okunamadı"
-#: sequencer.c:1634
+#: sequencer.c:1765
msgid "could not read HEAD's commit message"
-msgstr "HEAD'in gönderi iletisi okunamadı"
+msgstr "HEAD'in işleme iletisi okunamadı"
-#: sequencer.c:1640
+#: sequencer.c:1771
#, c-format
msgid "cannot write '%s'"
msgstr "'%s' yazılamıyor"
-#: sequencer.c:1647 git-rebase--preserve-merges.sh:496
+#: sequencer.c:1778 git-rebase--preserve-merges.sh:486
msgid "This is the 1st commit message:"
-msgstr "Birinci gönderi iletisi bu:"
+msgstr "Birinci işleme iletisi bu:"
-#: sequencer.c:1655
+#: sequencer.c:1786
#, c-format
msgid "could not read commit message of %s"
-msgstr "%s gönderi iletisi okunamadı"
+msgstr "%s işleme iletisi okunamadı"
-#: sequencer.c:1662
+#: sequencer.c:1793
#, c-format
msgid "This is the commit message #%d:"
-msgstr "Gönderi iletisi #%d bu:"
+msgstr "İşleme iletisi #%d bu:"
-#: sequencer.c:1668
+#: sequencer.c:1799
#, c-format
msgid "The commit message #%d will be skipped:"
-msgstr "Gönderi iletisi #%d atlanacak:"
+msgstr "İşleme iletisi #%d atlanacak:"
-#: sequencer.c:1756
+#: sequencer.c:1887
msgid "your index file is unmerged."
msgstr "indeks dosyanız birleştirilmemiş"
-#: sequencer.c:1763
+#: sequencer.c:1894
msgid "cannot fixup root commit"
-msgstr "kök gönderi düzeltilemiyor"
+msgstr "kök işleme düzeltilemiyor"
-#: sequencer.c:1782
+#: sequencer.c:1913
#, c-format
msgid "commit %s is a merge but no -m option was given."
-msgstr "%s gönderisi bir birleştirme, ancak bir -m seçeneği verilmedi."
+msgstr "%s işlemesi bir birleştirme; ancak bir -m seçeneği verilmedi."
-#: sequencer.c:1790 sequencer.c:1798
+#: sequencer.c:1921 sequencer.c:1929
#, c-format
msgid "commit %s does not have parent %d"
-msgstr "%s gönderisinin %d diye bir üst ögesi yok"
+msgstr "%s işlemesinin %d diye bir üst ögesi yok"
-#: sequencer.c:1804
+#: sequencer.c:1935
#, c-format
msgid "cannot get commit message for %s"
-msgstr "%s gönderi iletisi alınamıyor"
+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:1823
+#: sequencer.c:1954
#, c-format
msgid "%s: cannot parse parent commit %s"
-msgstr "%s: üst gönderi %s ayrıştırılamıyor"
+msgstr "%s: üst işleme %s ayrıştırılamıyor"
-#: sequencer.c:1888
+#: sequencer.c:2019
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "'%s', '%s' olarak yeniden adlandırılamadı"
-#: sequencer.c:1943
+#: sequencer.c:2079
#, c-format
msgid "could not revert %s... %s"
msgstr "%s geri alınamadı... %s"
-#: sequencer.c:1944
+#: sequencer.c:2080
#, c-format
msgid "could not apply %s... %s"
msgstr "%s uygulanamadı... %s"
-#: sequencer.c:1961
+#: sequencer.c:2100
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "%s %s bırakılıyor -- yama içeriği halihazırda üstkaynakta\n"
-#: sequencer.c:2018
+#: sequencer.c:2158
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: indeks okunamadı"
-#: sequencer.c:2025
+#: sequencer.c:2165
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: indeks yenilenemedi"
-#: sequencer.c:2102
+#: sequencer.c:2242
#, c-format
msgid "%s does not accept arguments: '%s'"
-msgstr "%s değişken kabul etmiyor: '%s'"
+msgstr "%s argüman kabul etmiyor: '%s'"
-#: sequencer.c:2111
+#: sequencer.c:2251
#, c-format
msgid "missing arguments for %s"
-msgstr "%s için eksik değişken"
+msgstr "%s için eksik argüman"
-#: sequencer.c:2142
+#: sequencer.c:2282
#, c-format
msgid "could not parse '%s'"
msgstr "'%s' ayrıştırılamadı"
-#: sequencer.c:2203
+#: sequencer.c:2343
#, c-format
msgid "invalid line %d: %.*s"
msgstr "geçersiz satır %d: %.*s"
-#: sequencer.c:2214
+#: sequencer.c:2354
#, c-format
msgid "cannot '%s' without a previous commit"
-msgstr "öncesinde bir gönderi olmadan '%s' yapılamıyor"
+msgstr "öncesinde bir işleme olmadan '%s' yapılamıyor"
-#: sequencer.c:2298
+#: sequencer.c:2440
msgid "cancelling a cherry picking in progress"
msgstr "sürmekte olan bir seç-al iptal ediliyor"
-#: sequencer.c:2305
+#: sequencer.c:2449
msgid "cancelling a revert in progress"
msgstr "sürmekte olan bir geri al iptal ediliyor"
-#: sequencer.c:2349
+#: sequencer.c:2493
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "lütfen bunu 'git rebase --edit-todo' kullanarak onarın."
-#: sequencer.c:2351
+#: sequencer.c:2495
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "kullanılabilir olmayan yönerge tablosu: '%s'"
-#: sequencer.c:2356
+#: sequencer.c:2500
msgid "no commits parsed."
-msgstr "Hiçbir gönderi ayrıştırılmadı."
+msgstr "Hiçbir işleme ayrıştırılmadı."
-#: sequencer.c:2367
+#: sequencer.c:2511
msgid "cannot cherry-pick during a revert."
msgstr "bir geri al sırasında seç-al yapılamıyor"
-#: sequencer.c:2369
+#: sequencer.c:2513
msgid "cannot revert during a cherry-pick."
msgstr "bir seç-al sırasında geri al yapılamıyor"
-#: sequencer.c:2447
+#: sequencer.c:2591
#, c-format
msgid "invalid value for %s: %s"
msgstr "%s için geçersiz değer: %s"
-#: sequencer.c:2540
+#: sequencer.c:2698
msgid "unusable squash-onto"
msgstr "kullanılabilir olmayan squash-onto"
-#: sequencer.c:2556
+#: sequencer.c:2718
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "hatalı oluşturulmuş seçenekler tablosu: '%s'"
-#: sequencer.c:2644 sequencer.c:4361
+#: sequencer.c:2811 sequencer.c:4644
msgid "empty commit set passed"
-msgstr "boş gönderi seti aktarıldı"
+msgstr "boş işleme seti aktarıldı"
-#: sequencer.c:2660
+#: sequencer.c:2828
msgid "revert is already in progress"
msgstr "geri al halihazırda sürüyor"
-#: sequencer.c:2662
+#: sequencer.c:2830
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "\"git revert (--continue | %s--abort | --quit)\" deneyin"
-#: sequencer.c:2665
+#: sequencer.c:2833
msgid "cherry-pick is already in progress"
msgstr "seç-al halihazırda sürüyor"
-#: sequencer.c:2667
+#: sequencer.c:2835
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "\"git cherry-pick (--continue | %s--abort | --quit)\" deneyin"
-#: sequencer.c:2681
+#: sequencer.c:2849
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "ardıştırıcı dizini '%s' oluşturulamadı"
-#: sequencer.c:2696
+#: sequencer.c:2864
msgid "could not lock HEAD"
msgstr "HEAD kilitlenemedi"
-#: sequencer.c:2756 sequencer.c:4099
+#: sequencer.c:2924 sequencer.c:4379
msgid "no cherry-pick or revert in progress"
msgstr "süren bir seç-al veya geri al yok"
-#: sequencer.c:2758 sequencer.c:2769
+#: sequencer.c:2926 sequencer.c:2937
msgid "cannot resolve HEAD"
msgstr "HEAD çözülemiyor"
-#: sequencer.c:2760 sequencer.c:2804
+#: sequencer.c:2928 sequencer.c:2972
msgid "cannot abort from a branch yet to be born"
msgstr "daha doğmamış bir daldan iptal edilemiyor"
-#: sequencer.c:2790 builtin/grep.c:724
+#: sequencer.c:2958 builtin/grep.c:757
#, c-format
msgid "cannot open '%s'"
msgstr "'%s' açılamıyor"
-#: sequencer.c:2792
+#: sequencer.c:2960
#, c-format
msgid "cannot read '%s': %s"
msgstr "'%s' okunamıyor: %s"
-#: sequencer.c:2793
+#: sequencer.c:2961
msgid "unexpected end of file"
msgstr "beklenmedik dosya sonu"
-#: sequencer.c:2799
+#: sequencer.c:2967
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "depolanmış seç-al öncesi HEAD dosyası '%s' hasar görmüş"
-#: sequencer.c:2810
+#: sequencer.c:2978
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "HEAD'i taşımış görünüyorsunuz. Geri sarılmıyor, HEAD'inizi denetleyin!"
-#: sequencer.c:2851
+#: sequencer.c:3019
msgid "no revert in progress"
msgstr "süren bir geri al yok"
-#: sequencer.c:2859
+#: sequencer.c:3028
msgid "no cherry-pick in progress"
msgstr "süren bir seç-al yok"
-#: sequencer.c:2869
+#: sequencer.c:3038
msgid "failed to skip the commit"
-msgstr "gönderi atlanamadı"
+msgstr "işleme atlanamadı"
-#: sequencer.c:2876
+#: sequencer.c:3045
msgid "there is nothing to skip"
msgstr "atlanacak bir şey yok"
-#: sequencer.c:2879
+#: sequencer.c:3048
#, c-format
msgid ""
"have you committed already?\n"
"try \"git %s --continue\""
msgstr ""
-"Gönderiyi yaptınız mı?\n"
+"İşlemeyi yaptınız mı?\n"
"\"git %s --continue\" deneyin.\""
-#: sequencer.c:3003 sequencer.c:4011
-#, c-format
-msgid "could not update %s"
-msgstr "%s güncellenemedi"
-
-#: sequencer.c:3042 sequencer.c:3991
+#: sequencer.c:3210 sequencer.c:4271
msgid "cannot read HEAD"
msgstr "HEAD okunamıyor"
-#: sequencer.c:3059
+#: sequencer.c:3227
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "'%s', '%s' konumuna kopyalanamıyor"
-#: sequencer.c:3067
+#: sequencer.c:3235
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -7135,7 +7976,7 @@
"\n"
" git rebase --continue\n"
msgstr ""
-"Gönderiyi şimdi şu komutla değiştirebilirsiniz:\n"
+"İşlemeyi şimdi şu komutla değiştirebilirsiniz:\n"
"\n"
"\tgit commit --amend %s\n"
"\n"
@@ -7143,22 +7984,27 @@
"\n"
"\tgit rebase --continue\n"
-#: sequencer.c:3077
+#: sequencer.c:3245
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "%s uygulanamıyor... %.*s"
-#: sequencer.c:3084
+#: sequencer.c:3252
#, c-format
msgid "Could not merge %.*s"
msgstr "%.*s birleştirilemedi"
-#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641
+#: sequencer.c:3266 sequencer.c:3270 builtin/difftool.c:640
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "'%s', '%s' konumuna kopyalanamadı"
-#: sequencer.c:3129
+#: sequencer.c:3282
+#, c-format
+msgid "Executing: %s\n"
+msgstr "Çalıştırılıyor: %s\n"
+
+#: sequencer.c:3297
#, c-format
msgid ""
"execution failed: %s\n"
@@ -7173,11 +8019,11 @@
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:3135
+#: sequencer.c:3303
msgid "and made changes to the index and/or the working tree\n"
msgstr "ve indekse ve/veya çalışma ağacına değişiklikler yapıldı\n"
-#: sequencer.c:3141
+#: sequencer.c:3309
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -7189,107 +8035,128 @@
msgstr ""
"Çalıştırma başarılı oldu: %s,\n"
"ancak indeksinize ve/veya çalışma ağacınıza değişiklikler bıraktı\n"
-"Değişikliklerinizi gönderin veya zulalayın, ardından şunu çalıştırın:\n"
+"Değişikliklerinizi işleyin veya zulalayın, ardından şunu çalıştırın:\n"
"\n"
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:3202
+#: sequencer.c:3370
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "izin verilmeyen etiket adı: '%.*s'"
-#: sequencer.c:3256
+#: sequencer.c:3424
msgid "writing fake root commit"
-msgstr "sahte kök gönderi yazılıyor"
+msgstr "sahte kök işlemesi yazılıyor"
-#: sequencer.c:3261
+#: sequencer.c:3429
msgid "writing squash-onto"
msgstr "squash-onto yazılıyor"
-#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886
-#, c-format
-msgid "failed to find tree of %s"
-msgstr "şunun ağacı bulunamadı: %s"
-
-#: sequencer.c:3344
+#: sequencer.c:3513
#, c-format
msgid "could not resolve '%s'"
msgstr "'%s' çözülemedi"
-#: sequencer.c:3375
+#: sequencer.c:3546
msgid "cannot merge without a current revision"
msgstr "güncel bir revizyon olmadan birleştirilemiyor"
-#: sequencer.c:3397
+#: sequencer.c:3568
#, c-format
msgid "unable to parse '%.*s'"
msgstr "'%.*s' ayrıştırılamıyor"
-#: sequencer.c:3406
+#: sequencer.c:3577
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "birleştirilecek bir şey yok: '%.*s'"
-#: sequencer.c:3418
+#: sequencer.c:3589
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "ahtapot birleştirmesi bir [yeni kök]ün üzerinde çalıştırılamaz"
-#: sequencer.c:3434
+#: sequencer.c:3605
#, c-format
msgid "could not get commit message of '%s'"
-msgstr "'%s' gönderisinin gönderi iletisi alınamadı"
+msgstr "'%s' işlemesinin işleme iletisi alınamadı"
-#: sequencer.c:3594
+#: sequencer.c:3788
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "şunu birleştirme girişiminde bulunulamadı bile: '%.*s'"
-#: sequencer.c:3610
+#: sequencer.c:3804
msgid "merge: Unable to write new index file"
msgstr "merge: Yeni indeks dosyası yazılamıyor"
-#: sequencer.c:3679 builtin/rebase.c:737
+#: sequencer.c:3878
+msgid "Cannot autostash"
+msgstr "Kendiliğinden zulalanamıyor"
+
+#: sequencer.c:3881
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "Beklenmedik zula yanıtı: '%s'"
+
+#: sequencer.c:3887
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "'%s' için dizin oluşturulamadı"
+
+#: sequencer.c:3890
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "Zula kendiliğinden oluşturuldu: %s\n"
+
+#: sequencer.c:3894
+msgid "could not reset --hard"
+msgstr "'reset --hard' yapılamadı"
+
+#: sequencer.c:3919
#, c-format
msgid "Applied autostash.\n"
msgstr "Kendiliğinden zulalama uygulandı.\n"
-#: sequencer.c:3691
+#: sequencer.c:3931
#, c-format
msgid "cannot store %s"
msgstr "%s depolanamıyor"
-#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113
+#: sequencer.c:3934
#, 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 ""
-"Kendiliğinden zulalama uygulaması çakışmalara neden oldu.\n"
-"Değişiklikleriniz zula içerisinde güvende.\n"
+"%s\n"
+"Değişiklikleriniz zulada güvende.\n"
"İstediğiniz zaman \"git stash pop\" veya \"git stash drop\" yapabilirsiniz.\n"
-#: sequencer.c:3755
-#, c-format
-msgid "%s: not a valid OID"
-msgstr "%s: geçerli bir OID değil"
+#: sequencer.c:3939
+msgid "Applying autostash resulted in conflicts."
+msgstr "Kendiliğinden zulalama çakışmalara neden oldu."
-#: sequencer.c:3760 git-rebase--preserve-merges.sh:779
+#: sequencer.c:3940
+msgid "Autostash exists; creating a new stash entry."
+msgstr "Kendiliğinden zulalama mevcut; yeni bir zula girdisi oluşturuluyor."
+
+#: sequencer.c:4033 git-rebase--preserve-merges.sh:769
msgid "could not detach HEAD"
msgstr "HEAD ayrılamadı"
-#: sequencer.c:3775
+#: sequencer.c:4048
#, c-format
msgid "Stopped at HEAD\n"
msgstr "HEAD'de duruldu\n"
-#: sequencer.c:3777
+#: sequencer.c:4050
#, c-format
msgid "Stopped at %s\n"
msgstr "%s konumunda duruldu\n"
-#: sequencer.c:3785
+#: sequencer.c:4058
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -7310,110 +8177,120 @@
"\tgit rebase --edit-todo\n"
"\tgit rebase --continue\n"
-#: sequencer.c:3869
+#: sequencer.c:4104
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "Yeniden temellendiriliyor: (%d/%d)%s"
+
+#: sequencer.c:4149
#, c-format
msgid "Stopped at %s... %.*s\n"
-msgstr "%s konumunda duruldu... %.*s\n"
+msgstr "%s konumunda durdu... %.*s\n"
-#: sequencer.c:3940
+#: sequencer.c:4220
#, c-format
msgid "unknown command %d"
msgstr "bilinmeyen komut %d"
-#: sequencer.c:3999
+#: sequencer.c:4279
msgid "could not read orig-head"
msgstr "orig-head okunamadı"
-#: sequencer.c:4004
+#: sequencer.c:4284
msgid "could not read 'onto'"
msgstr "'onto' okunamadı"
-#: sequencer.c:4018
+#: sequencer.c:4298
#, c-format
msgid "could not update HEAD to %s"
-msgstr "HEAD şuraya güncellenemedi: %s"
+msgstr "HEAD şu konuma güncellenemedi: %s"
-#: sequencer.c:4111
+#: sequencer.c:4358
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "%s başarıyla yeniden temellendirildi ve güncellendi.\n"
+
+#: sequencer.c:4391
msgid "cannot rebase: You have unstaged changes."
msgstr "Yeniden temellendirilemiyor: Hazırlanmamış değişiklikleriniz var."
-#: sequencer.c:4120
+#: sequencer.c:4400
msgid "cannot amend non-existing commit"
-msgstr "var olmayan gönderi değiştirilemiyor"
+msgstr "var olmayan işleme değiştirilemiyor"
-#: sequencer.c:4122
+#: sequencer.c:4402
#, c-format
msgid "invalid file: '%s'"
msgstr "geçersiz dosya: '%s'"
-#: sequencer.c:4124
+#: sequencer.c:4404
#, c-format
msgid "invalid contents: '%s'"
msgstr "geçersiz içerik: '%s'"
-#: sequencer.c:4127
+#: sequencer.c:4407
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
"\n"
-"Çalışma ağacınızda gönderilmemiş değişiklikleriniz var. Lütfen önce\n"
-"onları gönderin ve ardından 'git rebase --continue' yapın."
+"Ç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:4163 sequencer.c:4202
+#: sequencer.c:4443 sequencer.c:4482
#, c-format
msgid "could not write file: '%s'"
msgstr "dosya yazılamadı: '%s'"
-#: sequencer.c:4217
+#: sequencer.c:4498
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "CHERRY_PICK_HEAD kaldırılamadı"
-#: sequencer.c:4224
+#: sequencer.c:4505
msgid "could not commit staged changes."
-msgstr "Hazırlanmış değişiklikler gönderilemedi."
+msgstr "Hazırlanmış değişiklikler işlenemedi."
-#: sequencer.c:4338
+#: sequencer.c:4621
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: Bir %s seçip alınamıyor"
-#: sequencer.c:4342
+#: sequencer.c:4625
#, c-format
msgid "%s: bad revision"
msgstr "%s hatalı revizyon"
-#: sequencer.c:4377
+#: sequencer.c:4660
msgid "can't revert as initial commit"
-msgstr "ilk gönderi geri alınamaz"
+msgstr "ilk işleme geri alınamaz"
-#: sequencer.c:4846
+#: sequencer.c:5137
msgid "make_script: unhandled options"
msgstr "make_script: ele alınmayan seçenekler"
-#: sequencer.c:4849
+#: sequencer.c:5140
msgid "make_script: error preparing revisions"
msgstr "make_script: revizyonlar hazırlanırken hata"
-#: sequencer.c:5083 sequencer.c:5100
+#: sequencer.c:5382 sequencer.c:5399
msgid "nothing to do"
msgstr "yapılacak bir şey yok"
-#: sequencer.c:5119
+#: sequencer.c:5418
msgid "could not skip unnecessary pick commands"
msgstr "gerekli olmayan seçim komutları atlanamadı"
-#: sequencer.c:5213
+#: sequencer.c:5512
msgid "the script was already rearranged."
msgstr "betik halihazırda yeniden düzenlenmişti"
-#: setup.c:124
+#: setup.c:133
#, c-format
msgid "'%s' is outside repository at '%s'"
msgstr "'%s', '%s' konumunda depo dışında"
-#: setup.c:175
+#: setup.c:185
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
@@ -7422,120 +8299,124 @@
"%s: Çalışma ağacında böyle bir yol yok.\n"
"Yerelde var olmayan yolları belirtmek için 'git <komut> -- <yol>... kullanın."
-#: setup.c:188
+#: 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 "
+"Belirsiz argüman '%s': Çalışma ağacında olmayan bilinmeyen revizyon veya "
"yol.\n"
"Yolları revizyonlardan ayırmak için '--' kullanın, şöyle:\n"
"'git <komut> [<revizyon>...] -- [<dosya>...]'"
-#: setup.c:254
+#: 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"
+msgstr "'%s' seçeneği seçenek olmayan argümanlardan önce gelmeli"
-#: setup.c:273
+#: 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"
+"Belirsiz argüman '%s': Hem revizyon hem dosya adı.\n"
"Yolları revizyonlardan ayırmak için '--' kullanın, şöyle:\n"
"'git <komut> [<revizyon>...] -- [<dosya>...]'"
-#: setup.c:409
+#: 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:413
+#: 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:559
+#: 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:567
+#: setup.c:669
msgid "unknown repository extensions found:"
msgstr "bilinmeyen depo genişletmeleri bulundu:"
-#: setup.c:586
+#: 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:588
+#: 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:590
+#: setup.c:704
#, c-format
msgid "error reading %s"
msgstr "%s okunurken hata"
-#: setup.c:592
+#: setup.c:706
#, c-format
msgid "invalid gitfile format: %s"
msgstr "geçersiz gitfile biçimi: %s"
-#: setup.c:594
+#: setup.c:708
#, c-format
msgid "no path in gitfile: %s"
msgstr "gitfile içinde yol yok: %s"
-#: setup.c:596
+#: setup.c:710
#, c-format
msgid "not a git repository: %s"
msgstr "bir git deposu değil: %s"
-#: setup.c:695
+#: setup.c:812
#, c-format
msgid "'$%s' too big"
msgstr "'$%s' çok büyük"
-#: setup.c:709
+#: setup.c:826
#, c-format
msgid "not a git repository: '%s'"
msgstr "bir git deposu değil: '%s'"
-#: setup.c:738 setup.c:740 setup.c:771
+#: 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:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856
+#: 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:870
+#: setup.c:987
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "'%*s%s%s' bilgileri alınamadı"
-#: setup.c:1108
+#: setup.c:1225
msgid "Unable to read current working directory"
msgstr "Şu anki çalışma dizini okunamıyor"
-#: setup.c:1117 setup.c:1123
+#: setup.c:1234 setup.c:1240
#, c-format
msgid "cannot change to '%s'"
msgstr "şuraya değiştirilemiyor: '%s'"
-#: setup.c:1128
+#: 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:1134
+#: setup.c:1251
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
@@ -7545,7 +8426,7 @@
"Dosya sistemi sınırında duruluyor (GIT_DISCOVERY_ACROSS_FILESYSTEM "
"ayarlanmamış)."
-#: setup.c:1245
+#: setup.c:1362
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -7554,409 +8435,56 @@
"core.sharedRepository dosya kipi değeri ile sorun (0%.3o).\n"
"Dosyaların sahibinin her zaman okuma ve yazma izni olması gerekir."
-#: setup.c:1289
+#: 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:1304
+#: setup.c:1424
msgid "fork failed"
msgstr "çatallama başarısız"
-#: setup.c:1309
+#: setup.c:1429
msgid "setsid failed"
msgstr "setsid başarısız"
-#: sha1-file.c:452
-#, c-format
-msgid "object directory %s does not exist; check .git/objects/info/alternates"
-msgstr "nesne dizini %s yok; şurayı denetleyin: .git/objects/info/alternates"
-
-#: sha1-file.c:503
-#, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr "alternatif nesne yolu olağanlaştırılamıyor: %s"
-
-#: sha1-file.c:575
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr "%s: alternatif nesne depoları yok sayılıyor, iç içe geçme pek derin"
-
-#: sha1-file.c:582
-#, c-format
-msgid "unable to normalize object directory: %s"
-msgstr "nesne dizini olağanlaştırılamıyor: %s"
-
-#: sha1-file.c:625
-msgid "unable to fdopen alternates lockfile"
-msgstr "alternatifler kilit dosyası fdopen yapılamıyor"
-
-#: sha1-file.c:643
-msgid "unable to read alternates file"
-msgstr "alternatifler dosyası okunamıyor"
-
-#: sha1-file.c:650
-msgid "unable to move new alternates file into place"
-msgstr "yeni alternatifler dosyası yerine taşınamıyor"
-
-#: sha1-file.c:685
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "'%s' diye bir yol yok"
-
-#: sha1-file.c:711
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr ""
-"Bağlantı yapılmış çıkış olarak '%s' başvuru deposu henüz desteklenmiyor."
-
-#: sha1-file.c:717
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "Başvuru deposu '%s' yerel bir depo değil."
-
-#: sha1-file.c:723
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "başvuru deposu '%s' sığ"
-
-#: sha1-file.c:731
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "başvuru deposu '%s' aşılı"
-
-#: sha1-file.c:791
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "alternatif başvurular ayrıştırılırken geçersiz satır: %s"
-
-#: sha1-file.c:943
-#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
-msgstr "%<PRIuMAX>, %<PRIuMAX> sınırı üzerinden mmap yapılmaya çalışılıyor"
-
-#: sha1-file.c:964
-msgid "mmap failed"
-msgstr "mmap başarısız"
-
-#: sha1-file.c:1128
-#, c-format
-msgid "object file %s is empty"
-msgstr "nesne dosyası %s boş"
-
-#: sha1-file.c:1263 sha1-file.c:2443
-#, c-format
-msgid "corrupt loose object '%s'"
-msgstr "hasar görmüş gevşek nesne '%s'"
-
-#: sha1-file.c:1265 sha1-file.c:2447
-#, c-format
-msgid "garbage at end of loose object '%s'"
-msgstr "gevşek nesne '%s' sonunda anlamsız veri"
-
-#: sha1-file.c:1307
-msgid "invalid object type"
-msgstr "geçersiz nesne türü"
-
-#: sha1-file.c:1391
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "%s üstbilgisi --allow-unknown-type ile açılamıyor"
-
-#: sha1-file.c:1394
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "%s üstbilgisi açılamıyor"
-
-#: sha1-file.c:1400
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "%s üstbilgisi paketi --allow-unknown-type ile ayrıştırılamıyor"
-
-#: sha1-file.c:1403
-#, c-format
-msgid "unable to parse %s header"
-msgstr "%s üstbilgisi ayrıştırılamıyor"
-
-#: sha1-file.c:1629
-#, c-format
-msgid "failed to read object %s"
-msgstr "%s nesnesi okunamadı"
-
-#: sha1-file.c:1633
-#, c-format
-msgid "replacement %s not found for %s"
-msgstr "%s yedeği %s için bulunamadı"
-
-#: sha1-file.c:1637
-#, c-format
-msgid "loose object %s (stored in %s) is corrupt"
-msgstr "%s gevşek nesnesi (%s içinde depolanıyor) hasar görmüş"
-
-#: sha1-file.c:1641
-#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "paketlenmiş nesne %s (%s içinde depolanıyor) hasar görmüş"
-
-#: sha1-file.c:1746
-#, c-format
-msgid "unable to write file %s"
-msgstr "%s dosyası yazılamıyor"
-
-#: sha1-file.c:1753
-#, c-format
-msgid "unable to set permission to '%s'"
-msgstr "'%s' ögesine izin ayarlanamıyor"
-
-#: sha1-file.c:1760
-msgid "file write error"
-msgstr "dosya yazım hatası"
-
-#: sha1-file.c:1780
-msgid "error when closing loose object file"
-msgstr "gevşek nesne dosyası kapatılırken hata"
-
-#: sha1-file.c:1845
-#, c-format
-msgid "insufficient permission for adding an object to repository database %s"
-msgstr "%s depo veritabanına nesne eklemek için yetersiz izin"
-
-#: sha1-file.c:1847
-msgid "unable to create temporary file"
-msgstr "geçici dosya oluşturulamıyor"
-
-#: sha1-file.c:1871
-msgid "unable to write loose object file"
-msgstr "gevşek nesne dosyası yazılamıyor"
-
-#: sha1-file.c:1877
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr "yeni nesne %s söndürülemiyor (%d)"
-
-#: sha1-file.c:1881
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr "%s nesnesi üzerinde deflateEnd başarısız oldu (%d)"
-
-#: sha1-file.c:1885
-#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr "%s için olan nesne kaynak verisinden dolayı kafa karışıklığı"
-
-#: sha1-file.c:1895 builtin/pack-objects.c:1054
-#, c-format
-msgid "failed utime() on %s"
-msgstr "%s üzerinde utime() başarısız"
-
-#: sha1-file.c:1972
-#, c-format
-msgid "cannot read object for %s"
-msgstr "%s için nesne okunamıyor"
-
-#: sha1-file.c:2011
-msgid "corrupt commit"
-msgstr "hasar görmüş gönderi"
-
-#: sha1-file.c:2019
-msgid "corrupt tag"
-msgstr "hasar görmüş etiket"
-
-#: sha1-file.c:2119
-#, c-format
-msgid "read error while indexing %s"
-msgstr "%s indekslenirken okuma hatası"
-
-#: sha1-file.c:2122
-#, c-format
-msgid "short read while indexing %s"
-msgstr "%s indekslenirken kısa read"
-
-#: sha1-file.c:2195 sha1-file.c:2205
-#, c-format
-msgid "%s: failed to insert into database"
-msgstr "%s: veritabanına ekleme başarısız"
-
-#: sha1-file.c:2211
-#, c-format
-msgid "%s: unsupported file type"
-msgstr "%s: desteklenmeyen dosya türü"
-
-#: sha1-file.c:2235
-#, c-format
-msgid "%s is not a valid object"
-msgstr "%s geçerli bir nesne değil"
-
-#: sha1-file.c:2237
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s geçerli bir '%s' nesnesi değil"
-
-#: sha1-file.c:2264 builtin/index-pack.c:155
-#, c-format
-msgid "unable to open %s"
-msgstr "%s açılamıyor"
-
-#: sha1-file.c:2454 sha1-file.c:2507
-#, c-format
-msgid "hash mismatch for %s (expected %s)"
-msgstr "%s için sağlama uyuşmazlığı (%s bekleniyordu)"
-
-#: sha1-file.c:2478
-#, c-format
-msgid "unable to mmap %s"
-msgstr "%s mmap yapılamadı"
-
-#: sha1-file.c:2483
-#, c-format
-msgid "unable to unpack header of %s"
-msgstr "%s üstbilgisi açılamıyor"
-
-#: sha1-file.c:2489
-#, c-format
-msgid "unable to parse header of %s"
-msgstr "%s üstbilgisi ayrıştırılamıyor"
-
-#: sha1-file.c:2500
-#, c-format
-msgid "unable to unpack contents of %s"
-msgstr "%s içeriği açılamıyor"
-
-#: sha1-name.c:486
-#, c-format
-msgid "short SHA1 %s is ambiguous"
-msgstr "kısa SHA1 %s belirsiz"
-
-#: sha1-name.c:497
-msgid "The candidates are:"
-msgstr "Adaylar:"
-
-#: sha1-name.c:796
-msgid ""
-"Git normally never creates a ref that ends with 40 hex characters\n"
-"because it will be ignored when you just specify 40-hex. These refs\n"
-"may be created by mistake. For example,\n"
-"\n"
-" git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
-"examine these refs and maybe delete them. Turn this message off by\n"
-"running \"git config advice.objectNameWarning false\""
-msgstr ""
-"Git normalde hiçbir zaman 40 onaltılı karakterlerle biten bir başvuru\n"
-"oluşturmaz, çünkü 40 onaltılı bir başvuru, onu belirlediğiniz zaman yok\n"
-"sayılacaktır. Bu başvurular yanlışlıkla oluşturulmuş olabilir. Örneğin:\n"
-"\n"
-"\tgit switch -c $br $(git rev-parse ...)\n"
-"\n"
-"komutunda \"$br\" bir şekilde boş kalmış ve 40 onaltılı bir başvuru\n"
-"oluşturulmuş. Lütfen bu başvuruları inceleyin ve gerekirse silin. Bu "
-"iletiyi\n"
-"kapatmak için \"git config advice.objectNameWarning\" yapın."
-
-#: sha1-name.c:916
-#, c-format
-msgid "log for '%.*s' only goes back to %s"
-msgstr "'%.*s' günlüğü yalnızca şuna geri gider: %s"
-
-#: sha1-name.c:924
-#, c-format
-msgid "log for '%.*s' only has %d entries"
-msgstr "'%.*s' günlüğünde yalnızca %d girdi var"
-
-#: sha1-name.c:1689
-#, c-format
-msgid "path '%s' exists on disk, but not in '%.*s'"
-msgstr "'%s' yolu disk üzerinde mevcut, ancak '%.*s' içinde değil"
-
-#: sha1-name.c:1695
-#, c-format
-msgid ""
-"path '%s' exists, but not '%s'\n"
-"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
-msgstr ""
-"'%s' yolu mevcut, ancak '%s' değil\n"
-"İpucu: Şunu mu demek istediniz: '%.*s:%s', nam-ı diğer '%.*s:./%s'?"
-
-#: sha1-name.c:1704
-#, c-format
-msgid "path '%s' does not exist in '%.*s'"
-msgstr "'%s' yolu '%.*s' içinde mevcut değil"
-
-#: sha1-name.c:1732
-#, c-format
-msgid ""
-"path '%s' is in the index, but not at stage %d\n"
-"hint: Did you mean ':%d:%s'?"
-msgstr ""
-"'%s' yolu indekste, ancak %d numaralı alanda değil\n"
-"İpucu: Şunu mu demek istediniz: ':%d:%s'?"
-
-#: sha1-name.c:1748
-#, c-format
-msgid ""
-"path '%s' is in the index, but not '%s'\n"
-"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
-msgstr ""
-"'%s' yolu indekste, ancak '%s' değil\n"
-"İpucu: Şunu mu demek istediniz: '%d:%s', nam-ı diğer ':%d:./%s'?"
-
-#: sha1-name.c:1756
-#, c-format
-msgid "path '%s' exists on disk, but not in the index"
-msgstr "'%s' yolu diskte mevcut, ancak indekste değil"
-
-#: sha1-name.c:1758
-#, c-format
-msgid "path '%s' does not exist (neither on disk nor in the index)"
-msgstr "'%s' diye bir yol yok (ne diskte ne de indekste)"
-
-#: sha1-name.c:1771
-msgid "relative path syntax can't be used outside working tree"
-msgstr "göreceli yol sözdizimi çalışma ağacı dışında kullanılamaz"
-
-#: sha1-name.c:1909
-#, c-format
-msgid "invalid object name '%.*s'."
-msgstr "geçersiz nesne adı: '%.*s'"
-
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:837
+#: strbuf.c:848
#, c-format
msgid "%u.%2.2u GiB"
msgstr "%u.%2.2u GiB"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:839
+#: 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:847
+#: strbuf.c:858
#, c-format
msgid "%u.%2.2u MiB"
msgstr "%u.%2.2u MiB"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:849
+#: 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:856
+#: strbuf.c:867
#, c-format
msgid "%u.%2.2u KiB"
msgstr "%u.%2.2u KiB"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:858
+#: 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:864
+#: strbuf.c:875
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
@@ -7964,18 +8492,49 @@
msgstr[1] "%u bayt"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:866
+#: 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:1164
+#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719
+#: builtin/rebase.c:866
+#, 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 ""
@@ -8006,26 +8565,26 @@
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Yol belirteci '%s' '%.*s' altmodülünde"
-#: submodule.c:434
+#: submodule.c:435
#, c-format
msgid "bad --ignore-submodules argument: %s"
-msgstr "hatalı --ignore-submodules değişkeni: %s"
+msgstr "hatalı --ignore-submodules argümanı: %s"
-#: submodule.c:815
+#: submodule.c:817
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
"same. Skipping it."
msgstr ""
-"%s gönderisinde '%s' yolunda bulunan altmodül, aynı adlı bir altmodülle "
+"%s işlemesinde '%s' yolunda bulunan altmodül, aynı adlı bir altmodülle "
"çarpışıyor. Atlanıyor."
-#: submodule.c:910
+#: submodule.c:920
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
-msgstr "altmodül girdisi '%s' (%s) bir %s, gönderi değil"
+msgstr "altmodül girdisi '%s' (%s) bir %s, işleme değil"
-#: submodule.c:995
+#: submodule.c:1005
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
@@ -8034,36 +8593,36 @@
"'%s' altmodülünde 'git rev-list <commits> --not --remotes -n 1' "
"çalıştırılamadı"
-#: submodule.c:1118
+#: submodule.c:1128
#, c-format
msgid "process for submodule '%s' failed"
msgstr "'%s' altmodülü için işlem başarısız oldu"
-#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045
+#: submodule.c:1157 builtin/branch.c:689 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:1158
+#: submodule.c:1168
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr "'%s' altmodülü itiliyor\n"
-#: submodule.c:1161
+#: submodule.c:1171
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "'%s' altmodülü itilemiyor\n"
-#: submodule.c:1453
+#: submodule.c:1463
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr "%s%s altmodülü getiriliyor\n"
-#: submodule.c:1483
+#: submodule.c:1497
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr "'%s' altmodülüne erişilemedi\n"
-#: submodule.c:1637
+#: submodule.c:1652
#, c-format
msgid ""
"Errors during submodule fetch:\n"
@@ -8072,78 +8631,78 @@
"Altmodül getirilirken hata:\n"
"%s"
-#: submodule.c:1662
+#: submodule.c:1677
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "'%s' bir git deposu olarak tanımlanamadı"
-#: submodule.c:1679
+#: submodule.c:1694
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr "'%s' altmodülü içinde 'git status --porcelain=2' çalıştırılamadı"
-#: submodule.c:1720
+#: submodule.c:1735
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr "'%s' altmodülü içinde 'git status --porcelain=2' başarısız oldu"
-#: submodule.c:1800
+#: submodule.c:1810
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "'%s' altmodülü içinde 'git status' başlatılamadı"
-#: submodule.c:1813
+#: submodule.c:1823
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "'%s' altmodülü içinde 'git status' çalıştırılamadı"
-#: submodule.c:1828
+#: submodule.c:1838
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "'%s' altmodülü içinde core.worktree ayarı kapatılamadı"
-#: submodule.c:1855 submodule.c:2165
+#: submodule.c:1865 submodule.c:2175
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "'%s' altmodülüne özyinelenemedi"
-#: submodule.c:1876
+#: submodule.c:1886
msgid "could not reset submodule index"
msgstr "altmodül indeksi sıfırlanamadı"
-#: submodule.c:1918
+#: submodule.c:1928
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "'%s' altmodülü indeksi kirli"
-#: submodule.c:1970
+#: submodule.c:1980
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "'%s' altmodülü güncellenemedi."
-#: submodule.c:2038
+#: submodule.c:2048
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr "altmodül git dizini '%s', '%.*s' git dizini içinde"
-#: submodule.c:2059
+#: submodule.c:2069
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr ""
"relocate_gitdir birden çok çalışma ağaçlı '%s' altmodülü için desteklenmiyor"
-#: submodule.c:2071 submodule.c:2130
+#: submodule.c:2081 submodule.c:2140
#, c-format
msgid "could not lookup name for submodule '%s'"
-msgstr "'%s' altmodülü adı bakılamadı"
+msgstr "'%s' altmodülü adı aranamadı"
-#: submodule.c:2075
+#: submodule.c:2085
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr "'%s' ögesini mevcut bir git dizinine taşıma reddediliyor"
-#: submodule.c:2082
+#: submodule.c:2092
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -8154,94 +8713,259 @@
"şuradan: '%s'\n"
"şuraya: '%s'\n"
-#: submodule.c:2209
+#: submodule.c:2220
msgid "could not start ls-files in .."
msgstr "ls-files şurada başlatılamadı .."
-#: submodule.c:2248
+#: submodule.c:2260
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree beklenmedik bir biçimde %d kodu ile çıktı"
-#: submodule-config.c:236
-#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "kuşku doğuran altmodül yok sayılıyor: %s"
-
-#: submodule-config.c:303
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "submodule.fetchjobs için negatif değerlere izin verilmiyor"
-
-#: submodule-config.c:401
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr ""
-"'%s' bir komut satırı seçeneği olarak yorumlanabileceğinden yok sayılıyor: %s"
-
-#: submodule-config.c:498
-#, c-format
-msgid "invalid value for %s"
-msgstr "%s için geçersiz değer"
-
-#: submodule-config.c:765
-#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr ".gitmodules girdisi %s güncellenemedi"
-
-#: trailer.c:238
+#: 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: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 "bilinmeyen değer '%s' ('%s' anahtarı için)"
-#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323
+#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324
#, c-format
msgid "more than one %s"
msgstr "birden çok %s"
-#: trailer.c:730
+#: trailer.c:728
#, c-format
msgid "empty trailer token in trailer '%.*s'"
-msgstr "'%.*s' artbilgisi içinde boş artbilgi simgesi"
+msgstr "'%.*s' artbilgisi içinde boş artbilgi jetonu"
-#: trailer.c:750
+#: trailer.c:748
#, c-format
msgid "could not read input file '%s'"
msgstr "'%s' girdi dosyası okunamadı"
-#: trailer.c:753
+#: trailer.c:751 builtin/mktag.c:91
msgid "could not read from stdin"
msgstr "stdin'den okunamadı"
-#: trailer.c:1011 wrapper.c:665
+#: trailer.c:1009 wrapper.c:676
#, c-format
msgid "could not stat %s"
msgstr "%s dosya bilgileri alınamadı"
-#: trailer.c:1013
+#: trailer.c:1011
#, c-format
msgid "file %s is not a regular file"
msgstr "%s dosyası sıradan bir dosya değil"
-#: trailer.c:1015
+#: 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:1027
+#: trailer.c:1025
msgid "could not open temporary file"
msgstr "geçici dosya açılamadı"
-#: trailer.c:1067
+#: 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:1237
+#, 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:1447
+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:845
+#, c-format
+msgid "helper reported unexpected status of %s"
+msgstr "yardımcı %s beklenmedik durumu bildirdi"
+
+#: transport-helper.c:928
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr "%s yardımcısı 'dry-run' desteklemiyor"
+
+#: transport-helper.c:931
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr "%s yardımcısı --signed desteklemiyor"
+
+#: transport-helper.c:934
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr "%s yardımcısı --signed=if-asked desteklemiyor"
+
+#: transport-helper.c:939
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr "%s yardımcısı --atomic desteklemiyor"
+
+#: transport-helper.c:943
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr "%s yardımcısı --%s desteklemiyor"
+
+#: transport-helper.c:950
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr "%s yardımcısı 'push-option' desteklemiyor"
+
+#: transport-helper.c:1050
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr "remote-helper itme desteklemiyor; başvuru belirteci gerekli"
+
+#: transport-helper.c:1055
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr "%s yardımcısı 'force' desteklemiyor"
+
+#: transport-helper.c:1102
+msgid "couldn't run fast-export"
+msgstr "fast-export çalıştırılamadı"
+
+#: transport-helper.c:1107
+msgid "error while running fast-export"
+msgstr "fast-export çalıştırılırken hata"
+
+#: transport-helper.c:1132
+#, 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:1214
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr "desteklenmeyen nesne biçimi '%s'"
+
+#: transport-helper.c:1223
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr "başvuru listesinde hatalı oluşturulmuş yanıt: %s"
+
+#: transport-helper.c:1375
+#, c-format
+msgid "read(%s) failed"
+msgstr "read(%s) başarısız oldu"
+
+#: transport-helper.c:1402
+#, c-format
+msgid "write(%s) failed"
+msgstr "write(%s) başarısız oldu"
+
+#: transport-helper.c:1451
+#, c-format
+msgid "%s thread failed"
+msgstr "%s iş parçacığı başarısız oldu"
+
+#: transport-helper.c:1455
+#, c-format
+msgid "%s thread failed to join: %s"
+msgstr "%s iş parçacığı eklenemedi: %s"
+
+#: transport-helper.c:1474 transport-helper.c:1478
+#, 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:1515
+#, c-format
+msgid "%s process failed to wait"
+msgstr "%s işlemi bekleyemedi"
+
+#: transport-helper.c:1519
+#, c-format
+msgid "%s process failed"
+msgstr "%s işlemi başarısız oldu"
+
+#: transport-helper.c:1537 transport-helper.c:1546
+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"
@@ -8252,42 +8976,42 @@
msgid "could not read bundle '%s'"
msgstr "'%s' demeti okunamadı"
-#: transport.c:214
+#: transport.c:220
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "transport: Geçersiz derinlik seçeneği '%s'"
-#: transport.c:266
+#: 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:267
+#: 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:632
+#: transport.c:727
msgid "could not parse transport.color.* config"
msgstr "transport.color.* yapılandırması ayrıştırılamadı"
-#: transport.c:705
+#: transport.c:802
msgid "support for protocol v2 not implemented yet"
msgstr "protokol v2 desteği henüz yerine getirilmedi"
-#: transport.c:831
+#: transport.c:936
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "'%s' yapılandırması için bilinmeyen değer: %s"
-#: transport.c:897
+#: transport.c:1002
#, c-format
msgid "transport '%s' not allowed"
msgstr "'%s' taşıyıcısına izin verilmiyor"
-#: transport.c:949
+#: transport.c:1055
msgid "git-over-rsync is no longer supported"
msgstr "git-over-rsync artık desteklenmiyor"
-#: transport.c:1044
+#: transport.c:1157
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -8296,7 +9020,7 @@
"Aşağıdaki altmodül yolları başka hiçbir uzak konumda bulunamayan\n"
"değişiklikler içeriyor:\n"
-#: transport.c:1048
+#: transport.c:1161
#, c-format
msgid ""
"\n"
@@ -8323,227 +9047,49 @@
"kullanın.\n"
"\n"
-#: transport.c:1056
+#: transport.c:1169
msgid "Aborting."
msgstr "İptal ediliyor"
-#: transport.c:1201
+#: transport.c:1316
msgid "failed to push all needed submodules"
msgstr "gereken tüm altmodüller itilemedi"
-#: transport.c:1345 transport-helper.c:657
-msgid "operation not supported by protocol"
-msgstr "işlem protokol tarafından desteklenmiyor"
-
-#: transport-helper.c:61 transport-helper.c:90
-msgid "full write to remote helper failed"
-msgstr "uzak konum yardımcısına tam yazım başarısız"
-
-#: transport-helper.c:144
-#, c-format
-msgid "unable to find remote helper for '%s'"
-msgstr "'%s' için uzak konum yardımcısı bulunamadı"
-
-#: transport-helper.c:160 transport-helper.c:571
-msgid "can't dup helper output fd"
-msgstr "uzak konum yardımcısı çıktısı için dosya açıklayıcısı çoğaltılamıyor"
-
-#: transport-helper.c:211
-#, c-format
-msgid ""
-"unknown mandatory capability %s; this remote helper probably needs newer "
-"version of Git"
-msgstr ""
-"bilinmeyen zorunlu %s yeteneği; bu uzak konum yardımcısı büyük olasılıkla "
-"Git'in daha yeni bir sürümüne gereksinim duyuyor"
-
-#: transport-helper.c:217
-msgid "this remote helper should implement refspec capability"
-msgstr "bu uzak konum yardımcısı refspec yapabilirliğini yerine getirmeli"
-
-#: transport-helper.c:284 transport-helper.c:425
-#, c-format
-msgid "%s unexpectedly said: '%s'"
-msgstr "%s beklenmedik bir biçimde şunu söyledi: '%s'"
-
-#: transport-helper.c:414
-#, c-format
-msgid "%s also locked %s"
-msgstr "%s ayrıca şunu kilitledi: %s"
-
-#: transport-helper.c:493
-msgid "couldn't run fast-import"
-msgstr "fast-import çalıştırılamadı"
-
-#: transport-helper.c:516
-msgid "error while running fast-import"
-msgstr "fast-import çalıştırılırken hata"
-
-#: transport-helper.c:545 transport-helper.c:1134
-#, c-format
-msgid "could not read ref %s"
-msgstr "%s başvurusu okunamadı"
-
-#: transport-helper.c:590
-#, c-format
-msgid "unknown response to connect: %s"
-msgstr "'connect'e bilinmeyen yanıt: %s"
-
-#: transport-helper.c:612
-msgid "setting remote service path not supported by protocol"
-msgstr "uzak servis yolu ayarlama protokolce desteklenmiyor"
-
-#: transport-helper.c:614
-msgid "invalid remote service path"
-msgstr "geçersiz uzak konum servis yolu"
-
-#: transport-helper.c:660
-#, c-format
-msgid "can't connect to subservice %s"
-msgstr "%s altservisine bağlanamıyor"
-
-#: transport-helper.c:736
-#, c-format
-msgid "expected ok/error, helper said '%s'"
-msgstr "tamam/hata bekleniyordu, yardımcı şunu söyledi: '%s'"
-
-#: transport-helper.c:789
-#, c-format
-msgid "helper reported unexpected status of %s"
-msgstr "yardımcı %s beklenmedik durumu bildirdi"
-
-#: transport-helper.c:850
-#, c-format
-msgid "helper %s does not support dry-run"
-msgstr "%s yardımcısı 'dry-run' desteklemiyor"
-
-#: transport-helper.c:853
-#, c-format
-msgid "helper %s does not support --signed"
-msgstr "%s yardımcısı --signed desteklemiyor"
-
-#: transport-helper.c:856
-#, c-format
-msgid "helper %s does not support --signed=if-asked"
-msgstr "%s yardımcısı --signed=if-asked desteklemiyor"
-
-#: transport-helper.c:861
-#, c-format
-msgid "helper %s does not support --atomic"
-msgstr "%s yardımcısı --atomic desteklemiyor"
-
-#: transport-helper.c:867
-#, c-format
-msgid "helper %s does not support 'push-option'"
-msgstr "%s yardımcısı 'push-option' desteklemiyor"
-
-#: transport-helper.c:965
-msgid "remote-helper doesn't support push; refspec needed"
-msgstr "remote-helper itme desteklemiyor; başvuru belirteci gerekli"
-
-#: transport-helper.c:970
-#, c-format
-msgid "helper %s does not support 'force'"
-msgstr "%s yardımcısı 'force' desteklemiyor"
-
-#: transport-helper.c:1017
-msgid "couldn't run fast-export"
-msgstr "fast-export çalıştırılamadı"
-
-#: transport-helper.c:1022
-msgid "error while running fast-export"
-msgstr "fast-export çalıştırılırken hata"
-
-#: transport-helper.c:1047
-#, c-format
-msgid ""
-"No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch such as 'master'.\n"
-msgstr ""
-"Ortak başvuru yok ve hiç belirtilmemiş; bir şey yapılmayacak.\n"
-"Belki de bir dal belirtmelisiniz, örneğin: 'master'.\n"
-
-#: transport-helper.c:1120
-#, c-format
-msgid "malformed response in ref list: %s"
-msgstr "başvuru listesinde hatalı oluşturulmuş yanıt: %s"
-
-#: transport-helper.c:1272
-#, c-format
-msgid "read(%s) failed"
-msgstr "read(%s) başarısız oldu"
-
-#: transport-helper.c:1299
-#, c-format
-msgid "write(%s) failed"
-msgstr "write(%s) başarısız oldu"
-
-#: transport-helper.c:1348
-#, c-format
-msgid "%s thread failed"
-msgstr "%s iş parçacığı başarısız oldu"
-
-#: transport-helper.c:1352
-#, c-format
-msgid "%s thread failed to join: %s"
-msgstr "%s iş parçacığı eklenemedi: %s"
-
-#: transport-helper.c:1371 transport-helper.c:1375
-#, c-format
-msgid "can't start thread for copying data: %s"
-msgstr "veri kopyalama için iş parçacığı başlatılamıyor: %s"
-
-#: transport-helper.c:1412
-#, c-format
-msgid "%s process failed to wait"
-msgstr "%s işlemi bekleyemedi"
-
-#: transport-helper.c:1416
-#, c-format
-msgid "%s process failed"
-msgstr "%s işlemi başarısız oldu"
-
-#: transport-helper.c:1434 transport-helper.c:1443
-msgid "can't start thread for copying data"
-msgstr "veri kopyalama için iş parçacığı başlatılamıyor"
-
-#: tree-walk.c:32
+#: tree-walk.c:33
msgid "too-short tree object"
msgstr "ağaç nesnesi çok kısa"
-#: tree-walk.c:38
+#: tree-walk.c:39
msgid "malformed mode in tree entry"
msgstr "ağaç girdisinde hatalı oluşturulmuş kip"
-#: tree-walk.c:42
+#: tree-walk.c:43
msgid "empty filename in tree entry"
msgstr "ağaç girdisinde boş dosya adı"
-#: tree-walk.c:117
+#: tree-walk.c:118
msgid "too-short tree file"
msgstr "ağaç dosyası çok kısa"
-#: unpack-trees.c:110
+#: 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ış yapılarak aşağıdaki dosyalardaki yerel değişikliklerin üzerine "
-"yazılacak:\n"
-"%%sLütfen dal değiştirmeden önce değişikliklerinizi gönderin veya zulalayın."
+"Çı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:112
+#: unpack-trees.c:115
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%s"
msgstr ""
-"Çıkış yapılarak aşağıdaki dosyalardaki yerel değişikliklerin üzerine "
-"yazılacak:\n"
+"Çıkış ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine yazılacak:\n"
"%%s"
-#: unpack-trees.c:115
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -8551,9 +9097,9 @@
msgstr ""
"Birleştirme ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine "
"yazılacak:\n"
-"%%sLütfen birleştirmeden önce değişikliklerinizi gönderin veya zulalayın."
+"%%sLütfen birleştirmeden önce değişikliklerinizi işleyin veya zulalayın."
-#: unpack-trees.c:117
+#: unpack-trees.c:120
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -8563,16 +9109,16 @@
"yazılacak:\n"
"%%s"
-#: unpack-trees.c:120
+#: 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 gönderin veya zulalayın."
+"%%sLütfen %s yapmadan önce değişikliklerinizi işleyin veya zulalayın."
-#: unpack-trees.c:122
+#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -8581,44 +9127,43 @@
"%s ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine yazılacak:\n"
"%%s"
-#: unpack-trees.c:127
+#: unpack-trees.c:130
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
"%s"
msgstr ""
-"Aşağıdaki dizinler güncellenerek içlerindeki izlenmeyen dosyalar "
-"kaybedilecek:\n"
+"Aşağıdaki dizinleri güncellemek içlerindeki izlenmeyen dosyaları kaybeder:\n"
"%s"
-#: unpack-trees.c:131
+#: 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ış yapılarak aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
+"Çı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:133
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
-msgstr ""
-"Çıkış yapılarak aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
-"%%s"
-
#: unpack-trees.c:136
#, c-format
msgid ""
+"The following untracked working tree files would be removed by 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:138
+#: unpack-trees.c:141
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -8627,7 +9172,7 @@
"Birleştirme ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
"%%s"
-#: unpack-trees.c:141
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -8636,7 +9181,7 @@
"%s ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
"%%sLütfen %s yapmadan önce onları taşıyın veya kaldırın."
-#: unpack-trees.c:143
+#: unpack-trees.c:146
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -8645,29 +9190,29 @@
"%s ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
"%%s"
-#: unpack-trees.c:149
+#: 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ış yapılarak aşağıdaki izlenmeyen çalışma ağacı dosyalarının üzerine "
+"Çı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:151
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"checkout:\n"
"%%s"
msgstr ""
-"Çıkış yapılarak aşağıdaki izlenmeyen çalışma ağacı dosyalarının üzerine "
+"Çıkış ile aşağıdaki izlenmeyen çalışma ağacı dosyalarının üzerine "
"yazılacak:\n"
"%%s"
-#: unpack-trees.c:154
+#: unpack-trees.c:157
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -8677,7 +9222,7 @@
"yazılacak:\n"
"%%sLütfen birleştirmeden önce onları taşıyın veya kaldırın."
-#: unpack-trees.c:156
+#: unpack-trees.c:159
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -8687,7 +9232,7 @@
"yazılacak:\n"
"%%s"
-#: unpack-trees.c:159
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -8696,7 +9241,7 @@
"%s ile aşağıdaki izlenmeyen çalışma ağacı dosyalarının üzerine yazılacak:\n"
"%%sLütfen %s yapmadan önce onları taşıyın veya kaldırın."
-#: unpack-trees.c:161
+#: unpack-trees.c:164
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -8705,43 +9250,12 @@
"%s ile aşağıdaki izlenmeyen çalışma ağacı dosyalarının üzerine yazılacak:\n"
"%%s"
-#: unpack-trees.c:169
+#: 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:172
-#, c-format
-msgid ""
-"Cannot update sparse checkout: the following entries are not up to date:\n"
-"%s"
-msgstr ""
-"Aralıklı çıkış güncellenemiyor: Aşağıdaki girdiler güncel değil:\n"
-"%s"
-
-#: unpack-trees.c:174
-#, c-format
-msgid ""
-"The following working tree files would be overwritten by sparse checkout "
-"update:\n"
-"%s"
-msgstr ""
-"Aralıklı çıkış güncellemesi ile aşağıdaki çalışma ağacı dosyalarının üzerine "
-"yazılacak:\n"
-"%s"
-
-#: unpack-trees.c:176
-#, c-format
-msgid ""
-"The following working tree files would be removed by sparse checkout "
-"update:\n"
-"%s"
-msgstr ""
-"Aralıklı çıkış güncellemesi ile aşağıdaki çalışma ağacı dosyaları "
-"kaldırılacak:\n"
-"%s"
-
-#: unpack-trees.c:178
+#: unpack-trees.c:175
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -8750,16 +9264,55 @@
"Altmodül güncellenemiyor:\n"
"%s"
-#: unpack-trees.c:255
+#: 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:317
+#: 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:349
+#: 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"
@@ -8769,10 +9322,14 @@
"olmayan dosya sisteminde BÜYÜK/küçük harf duyarlı yollar) ve aynı çarpışan\n"
"gruptan yalnızca bir tanesi çalışma ağacında:\n"
-#: unpack-trees.c:1445
+#: unpack-trees.c:1498
msgid "Updating index flags"
msgstr "İndeks bayrakları güncelleniyor"
+#: upload-pack.c:1543
+msgid "expected flush after fetch arguments"
+msgstr "getir argümanlarından sonra floş bekleniyordu"
+
#: urlmatch.c:163
msgid "invalid URL scheme name or missing '://' suffix"
msgstr "geçersiz URL şeması veya eksik '://' eki"
@@ -8806,27 +9363,27 @@
msgid "Fetching objects"
msgstr "Nesneler getiriliyor"
-#: worktree.c:259 builtin/am.c:2099
+#: worktree.c:238 builtin/am.c:2103
#, c-format
msgid "failed to read '%s'"
msgstr "'%s' okunamadı"
-#: worktree.c:305
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "ana çalışma ağacındaki '%s' depo dizini değil"
-#: worktree.c:316
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr "'%s' dosyası çalışma ağacı konumuna olan tam yolu içermiyor"
-#: worktree.c:328
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' mevcut değil"
-#: worktree.c:334
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "'%s' bir .git dosyası değil, hata kodu %d"
@@ -8836,17 +9393,83 @@
msgid "'%s' does not point back to '%s'"
msgstr "'%s' şuna geri işaret etmiyor: '%s'"
-#: wrapper.c:186 wrapper.c:356
+#: worktree.c:608
+msgid "not a directory"
+msgstr "bir dizin değil"
+
+#: worktree.c:617
+msgid ".git is not a file"
+msgstr ".git bir dosya değil"
+
+#: worktree.c:619
+msgid ".git file broken"
+msgstr ".git dosyası bozuk"
+
+#: worktree.c:621
+msgid ".git file incorrect"
+msgstr ".git dosyası doğru değil"
+
+#: worktree.c:727
+msgid "not a valid path"
+msgstr "geçerli bir yol değil"
+
+#: worktree.c:733
+msgid "unable to locate repository; .git is not a file"
+msgstr "depo konumu bulunamıyor: .git bir dosya değil"
+
+#: worktree.c:737
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr "depo konumu bulunamıyor: .git dosyası bir depoya başvurmuyor"
+
+#: worktree.c:741
+msgid "unable to locate repository; .git file broken"
+msgstr "depo konumu bulunamıyor: .git dosyası bozuk"
+
+#: worktree.c:747
+msgid "gitdir unreadable"
+msgstr "okunamayan gitdir"
+
+#: worktree.c:751
+msgid "gitdir incorrect"
+msgstr "doğru olmayan gitdir"
+
+#: worktree.c:776
+msgid "not a valid directory"
+msgstr "geçerli bir dizin değil"
+
+#: worktree.c:782
+msgid "gitdir file does not exist"
+msgstr "gitdir dosyası mevcut değil"
+
+#: worktree.c:787 worktree.c:796
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "gitdir dosyası (%s) okunamıyor"
+
+#: worktree.c:806
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr "az okundu (%<PRIuMAX> bayt bekleniyordu, %<PRIuMAX> okundu)"
+
+#: worktree.c:814
+msgid "invalid gitdir file"
+msgstr "geçersiz gitdir dosyası"
+
+#: worktree.c:822
+msgid "gitdir file points to non-existent location"
+msgstr "gitdir dosyası var olmayan bir konuma işaret ediyor"
+
+#: 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:387 wrapper.c:588
+#: wrapper.c:398 wrapper.c:599
#, c-format
msgid "unable to access '%s'"
msgstr "'%s' erişilemiyor"
-#: wrapper.c:596
+#: wrapper.c:607
msgid "unable to get current working directory"
msgstr "geçerli çalışma dizini alınamıyor"
@@ -8884,23 +9507,21 @@
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (hazırlığı bitirmek için \"git rm <dosya>...\" kullanın)"
-#: wt-status.c:211 wt-status.c:1074
+#: wt-status.c:211 wt-status.c:1072
msgid "Changes to be committed:"
-msgstr "Gönderilecek değişiklikler:"
+msgstr "İşlenecek değişiklikler:"
-#: wt-status.c:234 wt-status.c:1083
+#: wt-status.c:234 wt-status.c:1081
msgid "Changes not staged for commit:"
-msgstr "Gönderi için hazırlanmamış değişiklikler:"
+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 ""
-" (gönderilecekleri güncellemek için \"git add <dosya>...\" kullanın)"
+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 ""
-" (gönderilecekleri güncellemek için \"git add/rm <dosya>...\" kullanın)"
+msgstr " (işlenecekleri güncellemek için \"git add/rm <dosya>...\" kullanın)"
#: wt-status.c:241
msgid ""
@@ -8916,96 +9537,96 @@
#: wt-status.c:254
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
-msgstr " (gönderilecekler arasına koymak için \"git %s <dosya>...\" kullanın)"
+msgstr " (işlenecekler arasına koymak için \"git %s <dosya>...\" kullanın)"
-#: wt-status.c:268
+#: wt-status.c:266
msgid "both deleted:"
msgstr "ikimiz de sildik:"
-#: wt-status.c:270
+#: wt-status.c:268
msgid "added by us:"
msgstr "biz ekledik:"
-#: wt-status.c:272
+#: wt-status.c:270
msgid "deleted by them:"
msgstr "onlar sildi:"
-#: wt-status.c:274
+#: wt-status.c:272
msgid "added by them:"
msgstr "onlar ekledi:"
-#: wt-status.c:276
+#: wt-status.c:274
msgid "deleted by us:"
msgstr "biz sildik:"
-#: wt-status.c:278
+#: wt-status.c:276
msgid "both added:"
msgstr "ikimiz de ekledik:"
-#: wt-status.c:280
+#: wt-status.c:278
msgid "both modified:"
msgstr "ikimiz de değiştirdik:"
-#: wt-status.c:290
+#: wt-status.c:288
msgid "new file:"
msgstr "yeni dosya:"
-#: wt-status.c:292
+#: wt-status.c:290
msgid "copied:"
msgstr "kopyalandı:"
-#: wt-status.c:294
+#: wt-status.c:292
msgid "deleted:"
msgstr "silindi:"
-#: wt-status.c:296
+#: wt-status.c:294
msgid "modified:"
msgstr "değiştirildi:"
-#: wt-status.c:298
+#: wt-status.c:296
msgid "renamed:"
msgstr "yeniden adlandırıldı:"
-#: wt-status.c:300
+#: wt-status.c:298
msgid "typechange:"
msgstr "türü değiştirildi:"
-#: wt-status.c:302
+#: wt-status.c:300
msgid "unknown:"
msgstr "bilinmiyor"
-#: wt-status.c:304
+#: wt-status.c:302
msgid "unmerged:"
msgstr "birleştirilmedi:"
-#: wt-status.c:384
+#: wt-status.c:382
msgid "new commits, "
-msgstr "yeni gönderiler, "
+msgstr "yeni işlemeler, "
-#: wt-status.c:386
+#: wt-status.c:384
msgid "modified content, "
msgstr "değiştirilen içerik, "
-#: wt-status.c:388
+#: wt-status.c:386
msgid "untracked content, "
msgstr "izlenmeyen içerik, "
-#: wt-status.c:906
+#: wt-status.c:905
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "Zulanızda şu anda %d girdi var"
msgstr[1] "Zulanızda şu anda %d girdi var"
-#: wt-status.c:938
+#: wt-status.c:936
msgid "Submodules changed but not updated:"
-msgstr "Değiştirilen ancak güncellenmeyen altmodüller:"
+msgstr "Değiştirilen; ancak güncellenmeyen altmodüller:"
-#: wt-status.c:940
+#: wt-status.c:938
msgid "Submodule changes to be committed:"
-msgstr "Gönderilecek altmodül değişiklikleri:"
+msgstr "İşlenecek altmodül değişiklikleri:"
-#: wt-status.c:1022
+#: wt-status.c:1020
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
@@ -9013,7 +9634,7 @@
"Yukarıdaki satırı değiştirmeyin veya kaldırmayın.\n"
"Altındaki her şey yok sayılacaktır."
-#: wt-status.c:1114
+#: wt-status.c:1112
#, c-format
msgid ""
"\n"
@@ -9024,359 +9645,370 @@
"Dal önünde/arkasında değerlerini hesaplama %.2f saniye sürdü.\n"
"Bundan kaçınmak için --no-ahead-behind kullanabilirsiniz.\n"
-#: wt-status.c:1144
+#: wt-status.c:1142
msgid "You have unmerged paths."
msgstr "Birleştirilmemiş yollarınız var."
-#: wt-status.c:1147
+#: wt-status.c:1145
msgid " (fix conflicts and run \"git commit\")"
msgstr " (çakışmaları onar ve \"git commit\" çalıştır)"
-#: wt-status.c:1149
+#: wt-status.c:1147
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (birleştirmeyi iptal etmek için \"git merge --abort\" kullanın)"
-#: wt-status.c:1153
+#: wt-status.c:1151
msgid "All conflicts fixed but you are still merging."
-msgstr "Tüm çakışmalar onarıldı ancak siz hâlâ birleştiriyorsunuz."
+msgstr "Tüm çakışmalar onarıldı; ancak siz hâlâ birleştiriyorsunuz."
-#: wt-status.c:1156
+#: wt-status.c:1154
msgid " (use \"git commit\" to conclude merge)"
msgstr " (birleştirmeyi sonuçlandırmak için \"git commit\" kullanın)"
-#: wt-status.c:1165
+#: wt-status.c:1163
msgid "You are in the middle of an am session."
msgstr "Bir 'am' oturumunun tam ortasındasınız."
-#: wt-status.c:1168
+#: wt-status.c:1166
msgid "The current patch is empty."
msgstr "Mevcut yama boş."
-#: wt-status.c:1172
+#: wt-status.c:1170
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (çakışmaları onar ve ardından \"git am --continue\" çalıştır)"
-#: wt-status.c:1174
+#: wt-status.c:1172
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (bu yamayı atlamak için \"git am --skip\" kullanın"
-#: wt-status.c:1176
+#: wt-status.c:1174
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (ilk dalı eski durumuna getirmek için \"git am --abort\" kullanın)"
-#: wt-status.c:1309
+#: wt-status.c:1307
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo eksik"
-#: wt-status.c:1311
+#: wt-status.c:1309
msgid "No commands done."
msgstr "Yerine getirilen bir komut yok."
-#: 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] "Son yerine getirilen komut (toplamda %d komut):"
msgstr[1] "Son yerine getirilen komutlar (toplamda %d komut):"
-#: wt-status.c:1325
+#: wt-status.c:1323
#, c-format
msgid " (see more in file %s)"
msgstr " (ek bilgi için %s dosyasına bakın)"
-#: wt-status.c:1330
+#: wt-status.c:1328
msgid "No commands remaining."
msgstr "Kalan komut yok."
-#: 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] "Sıradaki yerine getirilecek komut (%d kalan komut):"
msgstr[1] "Sıradaki yerine getirilecek komutlar (%d kalan komut):"
-#: wt-status.c:1341
+#: wt-status.c:1339
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (görüntüleme ve düzenleme için \"git rebase --edit-todo\" kullanın)"
-#: wt-status.c:1353
+#: wt-status.c:1351
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Şu anda '%s' dalını '%s' üzerine yeniden temellendiriyorsunuz."
-#: wt-status.c:1358
+#: wt-status.c:1356
msgid "You are currently rebasing."
msgstr "Şu anda yeniden temellendirme yapmaktasınız."
-#: wt-status.c:1371
+#: wt-status.c:1369
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (çakışmaları çözün ve ardından \"git rebase --continue\" çalıştır)"
-#: wt-status.c:1373
+#: wt-status.c:1371
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (bu yamayı atlamak için \"git rebase --skip\" kullanın)"
-#: wt-status.c:1375
+#: wt-status.c:1373
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (ilk dalı çıkış yapmak için \"git rebase --abort\" kullanın)"
-#: wt-status.c:1382
+#: wt-status.c:1380
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (tüm çakışmalar onarıldı: \"git rebase --continue\" çalıştır)"
-#: wt-status.c:1386
+#: wt-status.c:1384
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
-"Şu anda '%s' dalını '%s' üzerine yeniden temellendirirken bir gönderiyi "
+"Şu anda '%s' dalını '%s' üzerine yeniden temellendirirken bir işlemeyi "
"parçalara bölüyorsunuz."
-#: wt-status.c:1391
+#: wt-status.c:1389
msgid "You are currently splitting a commit during a rebase."
msgstr ""
-"Şu anda bir yeniden temellendirme sırasında bir gönderiyi parçalara "
-"bölüyorsunuz."
+"Şu anda yeniden temellendirme sırasında bir işlemeyi parçalara bölüyorsunuz."
-#: wt-status.c:1394
+#: wt-status.c:1392
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (Çalışma dizininiz temizlendiğinde \"git rebase --continue\" çalıştır)"
-#: wt-status.c:1398
+#: wt-status.c:1396
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
-"Şu anda '%s' dalını '%s' üzerine yeniden temellendirirken bir gönderiyi "
+"Şu anda '%s' dalını '%s' üzerine yeniden temellendirirken bir işlemeyi "
"düzenliyorsunuz."
-#: wt-status.c:1403
+#: wt-status.c:1401
msgid "You are currently editing a commit during a rebase."
-msgstr ""
-"Şu anda bir yeniden temellendirme sırasında bir gönderiyi düzenliyorsunuz."
+msgstr "Şu anda yeniden temellendirme sırasında bir işlemeyi düzenliyorsunuz."
+
+#: wt-status.c:1404
+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:1406
-msgid " (use \"git commit --amend\" to amend the current commit)"
-msgstr " (geçerli gönderiyi değiştirmek için \"git commit --amend\" kullanın)"
-
-#: wt-status.c:1408
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (değişikliklerinizden memnunsanız \"git rebase --continue\" kullanın)"
-#: wt-status.c:1419
+#: wt-status.c:1417
msgid "Cherry-pick currently in progress."
msgstr "Seç-al şu anda sürmekte."
-#: wt-status.c:1422
+#: wt-status.c:1420
#, c-format
msgid "You are currently cherry-picking commit %s."
-msgstr "Şu anda %s gönderisini seç-al yapıyorsunuz."
+msgstr "Şu anda %s işlemesini seç-al yapıyorsunuz."
-#: wt-status.c:1429
+#: wt-status.c:1427
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (çakışmaları onar ve \"git cherry-pick --continue\" çalıştır)"
-#: wt-status.c:1432
+#: wt-status.c:1430
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " (sürdürmek için \"git cherry-pick --continue\" çalıştır)"
-#: wt-status.c:1435
+#: wt-status.c:1433
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr " (tüm çakışmalar onarıldı: \"git cherry-pick --continue\" çalıştır)"
-#: wt-status.c:1437
+#: wt-status.c:1435
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
msgstr " (bu yamayı atlamak için \"git cherry-pick --skip\" kullanın)"
-#: wt-status.c:1439
+#: wt-status.c:1437
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " (seç-al işlemini iptal için \"git cherry-pick --abort\" kullanın)"
-#: wt-status.c:1449
+#: wt-status.c:1447
msgid "Revert currently in progress."
msgstr "Geriye al şu anda sürmekte."
-#: wt-status.c:1452
+#: wt-status.c:1450
#, c-format
msgid "You are currently reverting commit %s."
-msgstr "Şu anda %s gönderisini geri alıyorsunuz."
+msgstr "Şu anda %s işlemesini geri alıyorsunuz."
-#: wt-status.c:1458
+#: wt-status.c:1456
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (çakışmaları onar ve \"git revert --continue\" çalıştır)"
-#: wt-status.c:1461
+#: wt-status.c:1459
msgid " (run \"git revert --continue\" to continue)"
msgstr " (sürdürmek için \"git revert --continue\" çalıştır)"
-#: wt-status.c:1464
+#: wt-status.c:1462
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (tüm çakışmalar onarıldı: \"git revert --continue\" çalıştır)"
-#: wt-status.c:1466
+#: wt-status.c:1464
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr " (bu yamayı atlamak için \"git revert --skip\" kullanın)"
-#: wt-status.c:1468
+#: wt-status.c:1466
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (geri al işlemini iptal için \"git revert --abort\" kullanın)"
-#: wt-status.c:1478
+#: wt-status.c:1476
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Şu anda ikili arama yapıyorsunuz, '%s' dalından başlandı."
-#: wt-status.c:1482
+#: wt-status.c:1480
msgid "You are currently bisecting."
msgstr "Şu anda ikili arama yapıyorsunuz"
-#: wt-status.c:1485
+#: wt-status.c:1483
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (ilk dala dönmek için \"git bisect reset\" kullanın)"
-#: wt-status.c:1694
-msgid "On branch "
-msgstr "Şu dalda: "
+#: wt-status.c:1494
+#, 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:1701
+#: wt-status.c:1733
+msgid "On branch "
+msgstr "Üzerinde bulunulan dal: "
+
+#: wt-status.c:1740
msgid "interactive rebase in progress; onto "
msgstr "şunun üzerine etkileşimli yeniden temellendirme sürmekte: "
-#: wt-status.c:1703
+#: wt-status.c:1742
msgid "rebase in progress; onto "
msgstr "şunun üzerine yeniden temellendirme sürmekte: "
-#: wt-status.c:1713
+#: wt-status.c:1747
+msgid "HEAD detached at "
+msgstr "HEAD şurada ayrıldı: "
+
+#: wt-status.c:1749
+msgid "HEAD detached from "
+msgstr "HEAD şundan ayrıldı: "
+
+#: wt-status.c:1752
msgid "Not currently on any branch."
msgstr "Şu anda bir dal üzerinde değil."
-#: wt-status.c:1730
+#: wt-status.c:1769
msgid "Initial commit"
-msgstr "İlk gönderi"
+msgstr "İlk işleme"
-#: wt-status.c:1731
+#: wt-status.c:1770
msgid "No commits yet"
-msgstr "Henüz bir gönderi yok"
+msgstr "Henüz bir işleme yok"
-#: wt-status.c:1745
+#: wt-status.c:1784
msgid "Untracked files"
msgstr "İzlenmeyen dosyalar"
-#: wt-status.c:1747
+#: wt-status.c:1786
msgid "Ignored files"
msgstr "Yok sayılan dosyalar"
-#: wt-status.c:1751
+#: wt-status.c:1790
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
"may speed it up, but you have to be careful not to forget to add\n"
"new files yourself (see 'git help status')."
msgstr ""
-"İzlenmeyen dosyaların sayıp dökülmesi %.2f saniye sürdü. 'status -uno' bunu\n"
-"hızlandırabilir, ancak yeni dosyaları kendinizin eklemeyi unutmaması\n"
+"İ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:1757
+#: wt-status.c:1796
#, c-format
msgid "Untracked files not listed%s"
msgstr "İzlenmeyen dosyalar listelenmiyor%s"
-#: wt-status.c:1759
+#: wt-status.c:1798
msgid " (use -u option to show untracked files)"
msgstr " (izlenmeyen dosyaları göstermek için -u seçeneğini kullanın)"
-#: wt-status.c:1765
+#: wt-status.c:1804
msgid "No changes"
msgstr "Değişiklik yok"
-#: wt-status.c:1770
+#: wt-status.c:1809
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-"Gönderiye eklenen değişiklik yok (\"git add\" ve/veya \"git commit -a\" "
+"İşlemeye eklenen değişiklik yok (\"git add\" ve/veya \"git commit -a\" "
"kullanın)\n"
-#: wt-status.c:1773
+#: wt-status.c:1813
#, c-format
msgid "no changes added to commit\n"
-msgstr "Gönderiye eklenen değişiklik yok\n"
+msgstr "İşlemeye eklenen değişiklik yok\n"
-#: wt-status.c:1776
+#: wt-status.c:1817
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr ""
-"gönderiye bir şey eklenmedi ancak izlenmeyen dosyalar var (izlemek için\n"
+"işlemeye bir şey eklenmedi; ancak izlenmeyen dosyalar var (izlemek için\n"
"\"git add\" kullanın)\n"
-#: wt-status.c:1779
+#: wt-status.c:1821
#, c-format
msgid "nothing added to commit but untracked files present\n"
-msgstr "gönderiye bir şey eklenmedi ancak izlenmeyen dosyalar var\n"
+msgstr "işlemeye bir şey eklenmedi; ancak izlenmeyen dosyalar var\n"
-#: wt-status.c:1782
+#: wt-status.c:1825
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-"Gönderilecek bir şey yok (dosyalar oluşturun/kopyalayın ve izlemek için "
-"\"git add\" kullanın)\n"
+"İşlenecek bir şey yok (dosyalar oluşturun/kopyalayın ve izlemek için \"git "
+"add\" kullanın)\n"
-#: wt-status.c:1785 wt-status.c:1790
+#: wt-status.c:1829 wt-status.c:1835
#, c-format
msgid "nothing to commit\n"
-msgstr "Gönderilecek bir şey yok\n"
+msgstr "İşlenecek bir şey yok\n"
-#: wt-status.c:1788
+#: wt-status.c:1832
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-"Gönderilecek bir şey yok (izlenmeyen dosyaları göstermek için -u kullanın)\n"
+"İşlenecek bir şey yok (izlenmeyen dosyaları göstermek için -u kullanın)\n"
-#: wt-status.c:1792
+#: wt-status.c:1837
#, c-format
msgid "nothing to commit, working tree clean\n"
-msgstr "Gönderilecek bir şey yok, çalışma ağacı temiz\n"
+msgstr "İşlenecek bir şey yok, çalışma ağacı temiz\n"
-#: wt-status.c:1905
+#: wt-status.c:1942
msgid "No commits yet on "
-msgstr "Şurada henüz bir gönderi yok: "
+msgstr "Şurada henüz bir işleme yok: "
-#: wt-status.c:1909
+#: wt-status.c:1946
msgid "HEAD (no branch)"
msgstr "HEAD (dal yok)"
-#: wt-status.c:1940
+#: wt-status.c:1977
msgid "different"
msgstr "değişik"
-#: wt-status.c:1942 wt-status.c:1950
+#: wt-status.c:1979 wt-status.c:1987
msgid "behind "
msgstr "şunun arkasında: "
-#: wt-status.c:1945 wt-status.c:1948
+#: wt-status.c:1982 wt-status.c:1985
msgid "ahead "
msgstr "şunun önünde: "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2470
+#: wt-status.c:2507
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "%s yapılamıyor: Hazırlanmamış değişiklikleriniz var."
-#: wt-status.c:2476
+#: wt-status.c:2513
msgid "additionally, your index contains uncommitted changes."
-msgstr "Ek olarak, indeksiniz gönderilmemiş değişiklikler içeriyor."
+msgstr "Ek olarak, indeksiniz işlenmemiş değişiklikler içeriyor."
-#: wt-status.c:2478
+#: wt-status.c:2515
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
-msgstr "%s yapılamıyor: İndeksiniz gönderilmemiş değişiklikler içeriyor."
+msgstr "%s yapılamıyor: İndeksiniz işlenmemiş değişiklikler içeriyor."
-#: compat/precompose_utf8.c:58 builtin/clone.c:455
+#: compat/precompose_utf8.c:58 builtin/clone.c:457
#, c-format
msgid "failed to unlink '%s'"
msgstr "'%s' bağlantısı kesilemedi"
@@ -9385,130 +10017,135 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<seçenekler>] [--] <yol-blrtç>..."
-#: builtin/add.c:88
+#: builtin/add.c:58
+#, c-format
+msgid "cannot chmod %cx '%s'"
+msgstr "%cx '%s' chmod yapılamıyor"
+
+#: builtin/add.c:96
#, c-format
msgid "unexpected diff status %c"
msgstr "beklenmedik diff durumu %c"
-#: builtin/add.c:93 builtin/commit.c:288
+#: builtin/add.c:101 builtin/commit.c:285
msgid "updating files failed"
msgstr "dosyaları güncelleme başarısız"
-#: builtin/add.c:103
+#: builtin/add.c:111
#, c-format
msgid "remove '%s'\n"
msgstr "kaldır: '%s'\n"
-#: builtin/add.c:178
+#: builtin/add.c:186
msgid "Unstaged changes after refreshing the index:"
msgstr "İndeksi yeniledikten sonra hazırlanmamış değişiklikler:"
-#: builtin/add.c:266 builtin/rev-parse.c:899
+#: builtin/add.c:280 builtin/rev-parse.c:991
msgid "Could not read the index"
msgstr "İndeks okunamadı"
-#: builtin/add.c:277
+#: builtin/add.c:291
#, c-format
msgid "Could not open '%s' for writing."
msgstr "'%s' yazım için açılamadı."
-#: builtin/add.c:281
+#: builtin/add.c:295
msgid "Could not write patch"
msgstr "Yama yazılamadı"
-#: builtin/add.c:284
+#: builtin/add.c:298
msgid "editing patch failed"
msgstr "yamayı düzenleme başarısız"
-#: builtin/add.c:287
+#: builtin/add.c:301
#, c-format
msgid "Could not stat '%s'"
msgstr "'%s' dosya bilgileri alınamadı"
-#: builtin/add.c:289
+#: builtin/add.c:303
msgid "Empty patch. Aborted."
msgstr "Boş yama. İptal edildi."
-#: builtin/add.c:294
+#: builtin/add.c:308
#, c-format
msgid "Could not apply '%s'"
msgstr "'%s' uygulanamadı"
-#: builtin/add.c:302
+#: builtin/add.c:316
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Aşağıdaki yollar sizin .gitignore dosyalarınızın biri tarafından yok "
"sayılıyor:\n"
-#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548
-#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
+#: builtin/add.c:336 builtin/clean.c:904 builtin/fetch.c:169 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559
+#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190
msgid "dry run"
msgstr "sınama turu"
-#: builtin/add.c:325
+#: builtin/add.c:339
msgid "interactive picking"
msgstr "etkileşimli seçim"
-#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307
+#: builtin/add.c:340 builtin/checkout.c:1546 builtin/reset.c:308
msgid "select hunks interactively"
msgstr "parçaları etkileşimli olarak seç"
-#: builtin/add.c:327
+#: builtin/add.c:341
msgid "edit current diff and apply"
msgstr "geçerli diff'i düzenle ve uygula"
-#: builtin/add.c:328
+#: builtin/add.c:342
msgid "allow adding otherwise ignored files"
msgstr "başka türlü yok sayılan dosyaların eklenmesine izin ver"
-#: builtin/add.c:329
+#: builtin/add.c:343
msgid "update tracked files"
msgstr "izlenen dosyaları güncelle"
-#: builtin/add.c:330
+#: builtin/add.c:344
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "izlenen dosyaların satır sonlarını yeniden olağanlaştır (-u ima eder)"
-#: builtin/add.c:331
+#: builtin/add.c:345
msgid "record only the fact that the path will be added later"
msgstr "yalnızca yolun sonra ekleneceği gerçeğinin kaydını yaz"
-#: builtin/add.c:332
+#: builtin/add.c:346
msgid "add changes from all tracked and untracked files"
msgstr "tüm izlenen/izlenmeyen dosyalardan değişiklikleri ekle"
-#: builtin/add.c:335
+#: builtin/add.c:349
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "çalışma ağacında kaldırılan yolları yok say (--no-all ile aynı)"
-#: builtin/add.c:337
+#: builtin/add.c:351
msgid "don't add, only refresh the index"
msgstr "ekleme, yalnızca indeksi yenile"
-#: builtin/add.c:338
+#: builtin/add.c:352
msgid "just skip files which cannot be added because of errors"
msgstr "yalnızca hatalardan dolayı eklenemeyen dosyaları atla"
-#: builtin/add.c:339
+#: builtin/add.c:353
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
"dosyaların -eksik olsalar bile- sınama turunda yok sayılıp sayılmadığını "
"denetle"
-#: builtin/add.c:341 builtin/update-index.c:1004
+#: builtin/add.c:355 builtin/update-index.c:1004
msgid "override the executable bit of the listed files"
msgstr "listelenen dosyaların çalıştırılabilir kısımlarını geçersiz kıl"
-#: builtin/add.c:343
+#: builtin/add.c:357
msgid "warn when adding an embedded repository"
msgstr "gömülü bir depo eklenirken uyar"
-#: builtin/add.c:345
+#: builtin/add.c:359
msgid "backend for `git stash -p`"
msgstr "'git stash -p' için arka uç"
-#: builtin/add.c:363
+#: builtin/add.c:377
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -9539,12 +10176,12 @@
"\n"
"Ek bilgi için: \"git help submodule\"."
-#: builtin/add.c:391
+#: builtin/add.c:405
#, c-format
msgid "adding embedded git repository: %s"
msgstr "gömülü git deposu ekleniyor: %s"
-#: builtin/add.c:410
+#: builtin/add.c:424
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
@@ -9554,49 +10191,49 @@
"Bu iletiyi 'git config advice.addIgnoredFile false'\n"
"kullanarak kapatabilirsiniz."
-#: builtin/add.c:419
+#: builtin/add.c:433
msgid "adding files failed"
msgstr "dosya ekleme başarısız"
-#: builtin/add.c:447 builtin/commit.c:348
+#: builtin/add.c:461 builtin/commit.c:345
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
msgstr "--pathspec-from-file, --interactive/--patch ile uyumsuz"
-#: builtin/add.c:464
+#: builtin/add.c:478
msgid "--pathspec-from-file is incompatible with --edit"
msgstr "--pathspec-from-file, --edit ile uyumsuz"
-#: builtin/add.c:476
+#: builtin/add.c:490
msgid "-A and -u are mutually incompatible"
msgstr "-A ve -u karşılıklı olarak uyumlu"
-#: builtin/add.c:479
+#: builtin/add.c:493
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
"--ignore-missing seçeneği yalnızca --dry-run seçeneği ile birlikte "
"kullanılabilir"
-#: builtin/add.c:483
+#: builtin/add.c:497
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "--chmod param '%s' ya -x ya da +x olmalıdır"
-#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354
-#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509
+#: builtin/add.c:515 builtin/checkout.c:1714 builtin/commit.c:351
+#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1569
msgid "--pathspec-from-file is incompatible with pathspec arguments"
-msgstr "--pathspec-from-file yol belirteci değişkenleri ile uyumsuz"
+msgstr "--pathspec-from-file yol belirteci argümanları ile uyumsuz"
-#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360
-#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515
+#: builtin/add.c:522 builtin/checkout.c:1726 builtin/commit.c:357
+#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1575
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr "--pathspec-file-nul, --pathspec-from-file gerektiriyor"
-#: builtin/add.c:512
+#: builtin/add.c:526
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Hiçbir şey belirtilmedi, hiçbir şey eklenmedi.\n"
-#: builtin/add.c:514
+#: builtin/add.c:528
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
@@ -9654,7 +10291,7 @@
msgid "Patch format detection failed."
msgstr "Yama biçimi algılaması başarısız."
-#: builtin/am.c:953 builtin/clone.c:409
+#: builtin/am.c:953 builtin/clone.c:410
#, c-format
msgid "failed to create directory '%s'"
msgstr "'%s' dizini oluşturulamadı"
@@ -9693,7 +10330,7 @@
#: builtin/am.c:1267
#, c-format
msgid "missing author line in commit %s"
-msgstr "%s gönderisinde yazar satırı eksik"
+msgstr "%s işlemesinde yazar satırı eksik"
#: builtin/am.c:1270
#, c-format
@@ -9730,54 +10367,54 @@
msgid "applying to an empty history"
msgstr "boş bir geçmişe uygulanıyor"
-#: builtin/am.c:1621 builtin/am.c:1625
+#: builtin/am.c:1626 builtin/am.c:1630
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "sürdürülemiyor: %s yok"
-#: builtin/am.c:1643
+#: builtin/am.c:1648
msgid "Commit Body is:"
-msgstr "Gönderi gövdesi:"
+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:1653
+#: builtin/am.c:1658
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
"Uygula? [y]evet/[n]hayır/düz[e]nle/[v]yamayı görüntüle/tümünü k[a]bul et: "
-#: builtin/am.c:1700 builtin/commit.c:398
+#: builtin/am.c:1704 builtin/commit.c:395
msgid "unable to write index file"
msgstr "indeks dosyası yazılamıyor"
-#: builtin/am.c:1704
+#: builtin/am.c:1708
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Kirli indeks: Yamalar uygulanamıyor (kirli: %s)"
-#: builtin/am.c:1744 builtin/am.c:1812
+#: builtin/am.c:1748 builtin/am.c:1816
#, c-format
msgid "Applying: %.*s"
msgstr "Uygulanıyor: %.*s"
-#: builtin/am.c:1761
+#: builtin/am.c:1765
msgid "No changes -- Patch already applied."
msgstr "Değişiklik yok -- Yama halihazırda uygulandı."
-#: builtin/am.c:1767
+#: builtin/am.c:1771
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Yama şurada başarısız oldu: %s %.*s"
-#: builtin/am.c:1771
+#: builtin/am.c:1775
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr ""
"Başarısız olan yamayı görmek için 'git am --show-current-patch=diff' kullanın"
-#: builtin/am.c:1815
+#: builtin/am.c:1819
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -9787,7 +10424,7 @@
"Hazırlanacak başka bir şey kalmadıysa büyük olasılıkla başka bir şey\n"
"aynı değişiklikleri uygulamış olabilir; bu yamayı atlamak isteyebilirsiniz."
-#: builtin/am.c:1822
+#: builtin/am.c:1826
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -9800,17 +10437,17 @@
"Bir dosyanın \"onlar sildi\" olduğunu kabul etmek için dosya ile 'git rm' "
"yapabilirsiniz."
-#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346
-#: builtin/reset.c:354
+#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 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:1981
+#: builtin/am.c:1985
msgid "failed to clean index"
msgstr "indeks temizlenemedi"
-#: builtin/am.c:2025
+#: builtin/am.c:2029
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -9818,154 +10455,156 @@
"Son 'am' başarısızlığından bu yana HEAD'i hareket ettirmiş görünüyorsunuz.\n"
"ORIG_HEAD'e geri sarılmıyor."
-#: builtin/am.c:2132
+#: builtin/am.c:2136
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Geçersiz --patch-format değeri: %s"
-#: builtin/am.c:2172
+#: builtin/am.c:2178
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr "--show-current-patch için geçersiz değer: %s"
-#: builtin/am.c:2176
+#: builtin/am.c:2182
#, c-format
msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
msgstr "--show-current-patch=%s, --show-current-patch=%s ile uyumsuz"
-#: builtin/am.c:2207
+#: builtin/am.c:2213
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<seçenekler>] [(<mbox> | <posta-dizin>)...]"
-#: builtin/am.c:2208
+#: builtin/am.c:2214
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<seçenekler>] (--continue | --skip | --abort)"
-#: builtin/am.c:2214
+#: builtin/am.c:2220
msgid "run interactively"
msgstr "etkileşimli olarak çalıştır"
-#: builtin/am.c:2216
+#: builtin/am.c:2222
msgid "historical option -- no-op"
msgstr "tarihi seçenek -- no-op"
-#: builtin/am.c:2218
+#: builtin/am.c:2224
msgid "allow fall back on 3way merging if needed"
msgstr "gerekirse 3 yönlü birleştirmeye geri çekilmeye izin ver"
-#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:304 builtin/stash.c:812
+#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16
+#: builtin/repack.c:334 builtin/stash.c:882
msgid "be quiet"
msgstr "sessiz ol"
-#: builtin/am.c:2221
-msgid "add a Signed-off-by line to the commit message"
-msgstr "gönderi iletisine bir Signed-off-by satırı ekle"
+#: builtin/am.c:2227
+msgid "add a Signed-off-by trailer to the commit message"
+msgstr "işleme iletisine bir Signed-off-by satırı ekle"
-#: builtin/am.c:2224
+#: builtin/am.c:2230
msgid "recode into utf8 (default)"
msgstr "utf8 olarak yeniden kodla (öntanımlı)"
-#: builtin/am.c:2226
+#: builtin/am.c:2232
msgid "pass -k flag to git-mailinfo"
msgstr "'git-mailinfo'ya -k bayrağını geçir"
-#: builtin/am.c:2228
+#: builtin/am.c:2234
msgid "pass -b flag to git-mailinfo"
msgstr "'git-mailinfo'ya -b bayrağını geçir"
-#: builtin/am.c:2230
+#: builtin/am.c:2236
msgid "pass -m flag to git-mailinfo"
msgstr "'git-mailinfo'ya -m bayrağını geçir"
-#: builtin/am.c:2232
+#: builtin/am.c:2238
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "'git-mailsplit'e mbox biçimi için --keep-cr bayrağını geçir"
-#: builtin/am.c:2235
+#: builtin/am.c:2241
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"'git-mailsplit'e 'am.keepcr'dan bağımsız olarak --keep-cr bayrağını geçirme"
-#: builtin/am.c:2238
+#: builtin/am.c:2244
msgid "strip everything before a scissors line"
msgstr "bir kesim çizgisinden önceki her şeyi çıkar"
-#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249
-#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261
-#: builtin/am.c:2267
+#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
+#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
+#: builtin/am.c:2273
msgid "pass it through git-apply"
msgstr "git-apply aracılığıyla geçir"
-#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670
-#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250
-#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505
-#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321
-#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:154 parse-options.h:175 parse-options.h:316
+#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:904 builtin/merge.c:261
+#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
+#: builtin/rebase.c:1347 builtin/repack.c:345 builtin/repack.c:349
+#: builtin/repack.c:351 builtin/show-branch.c:650 builtin/show-ref.c:172
+#: builtin/tag.c:436 parse-options.h:154 parse-options.h:175
+#: parse-options.h:316
msgid "n"
msgstr "n"
-#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38
+#: builtin/am.c:2269 builtin/branch.c:670 builtin/bugreport.c:136
+#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:470
+#: builtin/verify-tag.c:38
msgid "format"
msgstr "biçim"
-#: builtin/am.c:2264
+#: builtin/am.c:2270
msgid "format the patch(es) are in"
msgstr "yama biçimi"
-#: builtin/am.c:2270
+#: builtin/am.c:2276
msgid "override error message when patch failure occurs"
msgstr "yama başarısız olduğunda hata iletisini geçersiz kıl"
-#: builtin/am.c:2272
+#: builtin/am.c:2278
msgid "continue applying patches after resolving a conflict"
msgstr "bir çakışmayı çözdükten sonra yamaları uygulamayı sürdür"
-#: builtin/am.c:2275
+#: builtin/am.c:2281
msgid "synonyms for --continue"
msgstr "--continue eşanlamlıları"
-#: builtin/am.c:2278
+#: builtin/am.c:2284
msgid "skip the current patch"
msgstr "geçerli yamayı atla"
-#: builtin/am.c:2281
-msgid "restore the original branch and abort the patching operation."
-msgstr "ilk dalı eski durumuna getir ve yamalama işlemini iptal et"
+#: builtin/am.c:2287
+msgid "restore the original branch and abort the patching operation"
+msgstr "orijinal dalı eski durumuna getir ve yamalama işlemini iptal et"
-#: builtin/am.c:2284
-msgid "abort the patching operation but keep HEAD where it is."
-msgstr "yamalama işlemini iptal et ancak HEAD'i olduğu yerde bırak"
+#: builtin/am.c:2290
+msgid "abort the patching operation but keep HEAD where it is"
+msgstr "yamalama işlemini iptal et; ancak HEAD'i olduğu yerde bırak"
-#: builtin/am.c:2288
+#: builtin/am.c:2294
msgid "show the patch being applied"
msgstr "uygulanmakta olan yamayı göster"
-#: builtin/am.c:2293
+#: builtin/am.c:2299
msgid "lie about committer date"
-msgstr "gönderici tarihi hakkında yalan söyle"
+msgstr "işleyici tarihi hakkında yalan söyle"
-#: builtin/am.c:2295
+#: builtin/am.c:2301
msgid "use current timestamp for author date"
msgstr "yazar tarihi için geçerli zaman damgasını kullan"
-#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512
-#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517
-#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418
+#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515
+#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:538
+#: builtin/rebase.c:1400 builtin/revert.c:117 builtin/tag.c:451
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
+#: builtin/am.c:2304 builtin/rebase.c:539 builtin/rebase.c:1401
msgid "GPG-sign commits"
-msgstr "GPG imzalı gönderiler"
+msgstr "GPG imzalı işlemeler"
-#: builtin/am.c:2301
+#: builtin/am.c:2307
msgid "(internal use for git-rebase)"
msgstr "(git-rebase için iç kullanım)"
-#: builtin/am.c:2319
+#: builtin/am.c:2325
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."
@@ -9973,17 +10612,17 @@
"-b/--binary seçeneği uzunca bir süredir düzgün çalışmıyordu ve\n"
"yakında kaldırılacak. Lütfen artık kullanmayın."
-#: builtin/am.c:2326
+#: builtin/am.c:2332
msgid "failed to read the index"
msgstr "indeks okunamadı"
-#: builtin/am.c:2341
+#: builtin/am.c:2347
#, 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."
+"Bir önceki yeniden temellendirme dizini %s hâlâ mevcut; ancak mbox verildi."
-#: builtin/am.c:2365
+#: builtin/am.c:2371
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -9992,17 +10631,17 @@
"Başıboş %s dizini bulundu.\n"
"Kaldırmak için \"git am --abort\" kullanın."
-#: builtin/am.c:2371
+#: builtin/am.c:2377
msgid "Resolve operation not in progress, we are not resuming."
-msgstr "Yapılmakta olan bir çözüm işlemi yok, sürdürmüyoruz."
+msgstr "İlerlemekte olan bir çözüm işlemi yok, sürdürme yapmıyoruz."
-#: builtin/am.c:2381
+#: builtin/am.c:2387
msgid "interactive mode requires patches on the command line"
msgstr "etkileşimli kip yamanın komut satırında olmasını gerektirir"
#: builtin/apply.c:8
msgid "git apply [<options>] [<patch>...]"
-msgstr "git apply [<seçenekler>] [<patch>...]"
+msgstr "git apply [<seçenekler>] [<yama>...]"
#: builtin/archive.c:17
#, c-format
@@ -10032,46 +10671,18 @@
#: builtin/archive.c:69
msgid "git archive: expected a flush"
-msgstr "git archive: floş bekleniyordu"
-
-#: builtin/bisect--helper.c:22
-msgid "git bisect--helper --next-all [--no-checkout]"
-msgstr "git bisect--helper --next-all [--no-checkout]"
+msgstr "git archive: Floş bekleniyordu"
#: builtin/bisect--helper.c:23
-msgid "git bisect--helper --write-terms <bad_term> <good_term>"
-msgstr "git bisect--helper --write-terms <kötü_terim> <iyi_terim>"
+msgid "git bisect--helper --bisect-reset [<commit>]"
+msgstr "git bisect--helper --bisect-reset [<işleme>]"
#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-clean-state"
-msgstr "git bisect--helper --bisect-clean-state"
-
-#: builtin/bisect--helper.c:25
-msgid "git bisect--helper --bisect-reset [<commit>]"
-msgstr "git bisect--helper --bisect-reset [<gönderi>]"
-
-#: builtin/bisect--helper.c:26
-msgid ""
-"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
-"<bad_term>"
-msgstr ""
-"git bisect--helper --bisect-write [--no-log] <durum> <revizyon> <iyi_terim> "
-"<kötü_terim>"
-
-#: builtin/bisect--helper.c:27
-msgid ""
-"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
-"<bad_term>"
-msgstr ""
-"git bisect--helper --bisect-check-and-set-terms <komut> <iyi_terim> "
-"<kötü_terim>"
-
-#: builtin/bisect--helper.c:28
msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
msgstr ""
"git bisect--helper --bisect-next-check <iyi_terim> <kötü_terim> [<terim>]"
-#: builtin/bisect--helper.c:29
+#: builtin/bisect--helper.c:25
msgid ""
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
"term-new]"
@@ -10079,75 +10690,103 @@
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
"term-new]"
+#: builtin/bisect--helper.c:26
+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:28
+msgid "git bisect--helper --bisect-next"
+msgstr "git bisect--helper --bisect-next"
+
+#: builtin/bisect--helper.c:29
+msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
+msgstr "git bisect--helper --bisect-state (bad|new) [<rev>]"
+
#: builtin/bisect--helper.c:30
-msgid ""
-"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
-"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
-msgstr ""
-"git bisect--helper --bisect-start [--term-{old,good}=<terim> --term-{new,bad}"
-"=<terim>][--no-checkout] [<kötü> [<iyi>...]] [--] [<yollar>...]"
+msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
+msgstr "git bisect--helper --bisect-state (good|old) [<rev>...]"
-#: builtin/bisect--helper.c:86
+#: builtin/bisect--helper.c:31
+msgid "git bisect--helper --bisect-replay <filename>"
+msgstr "git bisect--helper --bisect-replay <dosyaadı>"
+
+#: builtin/bisect--helper.c:32
+msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
+msgstr "git bisect--helper --bisect-skip [(<rev>|<erim>)...]"
+
+#: builtin/bisect--helper.c:107
+#, c-format
+msgid "cannot open file '%s' in mode '%s'"
+msgstr "'%s' dosyası '%s' kipinde açılamıyor"
+
+#: builtin/bisect--helper.c:114
+#, c-format
+msgid "could not write to file '%s'"
+msgstr "'%s' dosyasına yazılamadı"
+
+#: builtin/bisect--helper.c:153
#, c-format
msgid "'%s' is not a valid term"
msgstr "'%s' geçerli bir terim değil"
-#: builtin/bisect--helper.c:90
+#: builtin/bisect--helper.c:157
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "'%s yerleşik komutu bir terim olarak kullanılamıyor"
-#: builtin/bisect--helper.c:100
+#: builtin/bisect--helper.c:167
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "'%s' teriminin anlamı değiştirilemiyor"
-#: builtin/bisect--helper.c:111
+#: builtin/bisect--helper.c:177
msgid "please use two different terms"
msgstr "lütfen iki değişik terim kullanın"
-#: builtin/bisect--helper.c:118
-msgid "could not open the file BISECT_TERMS"
-msgstr "BISECT_TERMS dosyası açılamadı"
-
-#: builtin/bisect--helper.c:155
+#: builtin/bisect--helper.c:193
#, c-format
msgid "We are not bisecting.\n"
-msgstr "İkili arama yapmıyoruz.\n"
+msgstr "İkili arama yapılmıyor.\n"
-#: builtin/bisect--helper.c:163
+#: builtin/bisect--helper.c:201
#, c-format
msgid "'%s' is not a valid commit"
-msgstr "'%s' geçerli bir gönderi değil"
+msgstr "'%s' geçerli bir işleme değil"
-#: builtin/bisect--helper.c:172
+#: builtin/bisect--helper.c:210
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
msgstr ""
-"Orijinal HEAD '%s' çıkışı yapılamadı. 'git bisect reset <gönderi>' deneyin."
+"Orijinal HEAD '%s' çıkışı yapılamadı. 'git bisect reset <işleme>' deneyin."
-#: builtin/bisect--helper.c:216
+#: builtin/bisect--helper.c:254
#, c-format
msgid "Bad bisect_write argument: %s"
-msgstr "Hatalı bisect_write değişkeni: %s"
+msgstr "Hatalı bisect_write argümanı: %s"
-#: builtin/bisect--helper.c:221
+#: builtin/bisect--helper.c:259
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "'%s' revizyonunun oid'si alınamadı"
-#: builtin/bisect--helper.c:233
+#: builtin/bisect--helper.c:271
#, c-format
msgid "couldn't open the file '%s'"
msgstr "'%s' dosyası açılamadı"
-#: builtin/bisect--helper.c:259
+#: builtin/bisect--helper.c:297
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr "Geçersiz komut: Şu anda bir %s/%s ikili aramasındasınız"
-#: builtin/bisect--helper.c:286
+#: builtin/bisect--helper.c:324
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
@@ -10156,7 +10795,7 @@
"Bana en azından bir %s ve %s revizyonu vermeniz gerekiyor.\n"
"Bunun için \"git bisect %s\" ve \"git bisect %s\" kullanabilirsiniz."
-#: builtin/bisect--helper.c:290
+#: builtin/bisect--helper.c:328
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -10167,24 +10806,24 @@
"Bundan sonra bana en azından bir %s ve %s revizyonu vermeniz gerekiyor.\n"
"Bunun için \"git bisect %s\" ve \"git bisect %s\" kullanabilirsiniz."
-#: builtin/bisect--helper.c:310
+#: builtin/bisect--helper.c:348
#, c-format
msgid "bisecting only with a %s commit"
-msgstr "yalnızca bir %s gönderisi ile ikili arama yapılıyor"
+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:318
+#: builtin/bisect--helper.c:356
msgid "Are you sure [Y/n]? "
msgstr "Emin misiniz [Y/n]? "
-#: builtin/bisect--helper.c:379
+#: builtin/bisect--helper.c:417
msgid "no terms defined"
msgstr "hiçbir terim tanımlanmadı"
-#: builtin/bisect--helper.c:382
+#: builtin/bisect--helper.c:420
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
@@ -10193,271 +10832,316 @@
"Mevcut terimleriniz eski durum için %s ve\n"
"yeni durum için %s.\n"
-#: builtin/bisect--helper.c:392
+#: builtin/bisect--helper.c:430
#, 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"
+"'git bisect terms' için geçersiz argüman %s.\n"
"Desteklenen seçenekler: --term-good|--term-old ve --term-bad|--term-new."
-#: builtin/bisect--helper.c:478
+#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1014
+msgid "revision walk setup failed\n"
+msgstr "revizyonda gezinme ayarlaması başarısız oldu\n"
+
+#: builtin/bisect--helper.c:519
+#, c-format
+msgid "could not open '%s' for appending"
+msgstr "'%s' iliştirme için açılamadı"
+
+#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651
+msgid "'' is not a valid term"
+msgstr "'' geçerli bir terim değil"
+
+#: builtin/bisect--helper.c:661
#, c-format
msgid "unrecognized option: '%s'"
msgstr "tanımlanamayan seçenek: '%s'"
-#: builtin/bisect--helper.c:482
+#: builtin/bisect--helper.c:665
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "'%s' geçerli bir revizyon değil gibi görünüyor"
-#: builtin/bisect--helper.c:514
+#: builtin/bisect--helper.c:696
msgid "bad HEAD - I need a HEAD"
msgstr "hatalı HEAD - Bana bir HEAD gerek"
-#: builtin/bisect--helper.c:529
+#: builtin/bisect--helper.c:711
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr "'%s' çıkış yapımı başarısız. 'git bisect start <geçerli-dal>' deneyin."
-#: builtin/bisect--helper.c:550
+#: builtin/bisect--helper.c:732
msgid "won't bisect on cg-seek'ed tree"
msgstr "cg-seek yapılmış bir ağaçta ikili arama yapılmayacak"
-#: builtin/bisect--helper.c:553
+#: builtin/bisect--helper.c:735
msgid "bad HEAD - strange symbolic ref"
msgstr "hatalı HEAD - tuhaf sembolik başvuru"
-#: builtin/bisect--helper.c:577
+#: builtin/bisect--helper.c:755
#, c-format
msgid "invalid ref: '%s'"
msgstr "geçersiz başvuru: '%s'"
-#: builtin/bisect--helper.c:633
-msgid "perform 'git bisect next'"
-msgstr "'git bisect next' gerçekleştir"
+#: builtin/bisect--helper.c:813
+msgid "You need to start by \"git bisect start\"\n"
+msgstr "\"git bisect start\" ile başlamalısınız\n"
-#: builtin/bisect--helper.c:635
-msgid "write the terms to .git/BISECT_TERMS"
-msgstr "terimleri .git/BISECT_TERMS konumuna yaz"
+#. 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:824
+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:637
-msgid "cleanup the bisection state"
-msgstr "ikili arama durumunu temizle"
+#: builtin/bisect--helper.c:842
+msgid "Please call `--bisect-state` with at least one argument"
+msgstr "Lütfen '--bisec-state'i en az bir argümanla çalıştırın"
-#: builtin/bisect--helper.c:639
-msgid "check for expected revs"
-msgstr "beklenen başvurular için denetle"
+#: builtin/bisect--helper.c:855
+#, c-format
+msgid "'git bisect %s' can take only one argument."
+msgstr "'git bisect %s' yalnızca bir argüman alabilir."
-#: builtin/bisect--helper.c:641
+#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:878
+#, c-format
+msgid "Bad rev input: %s"
+msgstr "Hatalı revizyon girdisi: %s"
+
+#: builtin/bisect--helper.c:912
+msgid "We are not bisecting."
+msgstr "İkili arama yapmıyoruz."
+
+#: builtin/bisect--helper.c:962
+#, c-format
+msgid "'%s'?? what are you talking about?"
+msgstr "'%s'?? ney ney?"
+
+#: builtin/bisect--helper.c:974
+#, c-format
+msgid "cannot read file '%s' for replaying"
+msgstr "'%s' dosyası yeniden oynatım için okunamıyor"
+
+#: builtin/bisect--helper.c:1047
msgid "reset the bisection state"
msgstr "ikili arama durumunu sıfırla"
-#: builtin/bisect--helper.c:643
-msgid "write out the bisection state in BISECT_LOG"
-msgstr "ikili arama durumunu BISECT_LOG içine yaz"
-
-#: builtin/bisect--helper.c:645
-msgid "check and set terms in a bisection state"
-msgstr "bir ikili arama durumundaki terimleri denetle ve ayarla"
-
-#: builtin/bisect--helper.c:647
+#: builtin/bisect--helper.c:1049
msgid "check whether bad or good terms exist"
msgstr "iyi veya kötü terimlerin olup olmadığını denetle"
-#: builtin/bisect--helper.c:649
+#: builtin/bisect--helper.c:1051
msgid "print out the bisect terms"
msgstr "ikili arama terimlerini yazdır"
-#: builtin/bisect--helper.c:651
+#: builtin/bisect--helper.c:1053
msgid "start the bisect session"
msgstr "ikili arama oturumunu başlat"
-#: builtin/bisect--helper.c:653
-msgid "update BISECT_HEAD instead of checking out the current commit"
-msgstr "geçerli gönderiyi çıkış yapmak yerine BISECT_HEAD güncelle"
+#: builtin/bisect--helper.c:1055
+msgid "find the next bisection commit"
+msgstr "bir sonraki ikili arama işlemesini bul"
-#: builtin/bisect--helper.c:655
+#: builtin/bisect--helper.c:1057
+msgid "mark the state of ref (or refs)"
+msgstr "başvurunun (veya başvuruların) durumunu imle"
+
+#: builtin/bisect--helper.c:1059
+msgid "list the bisection steps so far"
+msgstr "şu ana kadarki ikili arama durumunu listele"
+
+#: builtin/bisect--helper.c:1061
+msgid "replay the bisection process from the given file"
+msgstr "verilen dosyadan ikili arama işlemini yeniden oynat"
+
+#: builtin/bisect--helper.c:1063
+msgid "skip some commits for checkout"
+msgstr "çıkış için birkaç işlemeyi atla"
+
+#: builtin/bisect--helper.c:1065
msgid "no log for BISECT_WRITE"
msgstr "BISECT_WRITE için günlük yok"
-#: builtin/bisect--helper.c:673
-msgid "--write-terms requires two arguments"
-msgstr "--write-terms iki değişken gerektiriyor"
-
-#: builtin/bisect--helper.c:677
-msgid "--bisect-clean-state requires no arguments"
-msgstr "--bisect-clean-state bir değişken gerektirmiyor"
-
-#: builtin/bisect--helper.c:684
+#: builtin/bisect--helper.c:1080
msgid "--bisect-reset requires either no argument or a commit"
-msgstr "--bisect-reset bir değişken veya gönderi gerektirmiyor"
+msgstr "--bisect-reset bir argüman veya işleme gerektirmiyor"
-#: builtin/bisect--helper.c:688
-msgid "--bisect-write requires either 4 or 5 arguments"
-msgstr "--bisect-write 4 veya 5 değişken gerektiriyor"
-
-#: builtin/bisect--helper.c:694
-msgid "--check-and-set-terms requires 3 arguments"
-msgstr "--check-and-set-terms 3 değişken gerektiriyor"
-
-#: builtin/bisect--helper.c:700
+#: builtin/bisect--helper.c:1085
msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "--bisect-next-check 2 veya 3 değişken gerektiriyor"
+msgstr "--bisect-next-check 2 veya 3 argüman gerektiriyor"
-#: builtin/bisect--helper.c:706
+#: builtin/bisect--helper.c:1091
msgid "--bisect-terms requires 0 or 1 argument"
-msgstr "--bisect-terms 0 veya 1 değişken gerektiriyor"
+msgstr "--bisect-terms 0 veya 1 argüman gerektiriyor"
-#: builtin/blame.c:31
+#: builtin/bisect--helper.c:1100
+msgid "--bisect-next requires 0 arguments"
+msgstr "--bisect-next 0 argüman gerektiriyor"
+
+#: builtin/bisect--helper.c:1111
+msgid "--bisect-log requires 0 arguments"
+msgstr "--bisect-log 0 argüman gerektiriyor"
+
+#: builtin/bisect--helper.c:1116
+msgid "no logfile given"
+msgstr "hiçbir günlük dosyası verilmedi"
+
+#: 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:36
+#: 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:409
+#: builtin/blame.c:410
#, c-format
msgid "expecting a color: %s"
msgstr "bir renk bekleniyor: %s"
-#: builtin/blame.c:416
+#: builtin/blame.c:417
msgid "must end with a color"
msgstr "bir renk ile bitmeli"
-#: builtin/blame.c:729
+#: builtin/blame.c:728
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "color.blame.repeatedLines içinde geçersiz renk '%s'"
-#: builtin/blame.c:747
+#: builtin/blame.c:746
msgid "invalid value for blame.coloring"
msgstr "blame.coloring için geçersiz değer"
-#: builtin/blame.c:822
+#: 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:844
-msgid "Show blame entries as we find them, incrementally"
-msgstr "genel bakış girdilerini buldukça artan biçimde göster"
+#: builtin/blame.c:867
+msgid "show blame entries as we find them, incrementally"
+msgstr "genel bakış girdilerini biz buldukça artan biçimde göster"
-#: builtin/blame.c:845
-msgid "Show blank SHA-1 for boundary commits (Default: off)"
-msgstr "sınır gönderileri için boş SHA-1 göster (Öntanımlı: Kapalı)"
+#: builtin/blame.c: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:846
-msgid "Do not treat root commits as boundaries (Default: off)"
-msgstr "kök gönderilerini sınır olarak varsayma (Öntanımlı: Kapalı)"
+#: builtin/blame.c:869
+msgid "do not treat root commits as boundaries (Default: off)"
+msgstr "kök işlemelerini sınır olarak değerlendirme (Öntanımlı: Kapalı)"
-#: builtin/blame.c:847
-msgid "Show work cost statistics"
+#: builtin/blame.c:870
+msgid "show work cost statistics"
msgstr "iş maliyet istatistiklerini göster"
-#: builtin/blame.c:848
-msgid "Force progress reporting"
-msgstr "durum bildirmeyi zorla"
+#: builtin/blame.c:871 builtin/checkout.c:1503 builtin/clone.c:92
+#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:175
+#: builtin/merge.c:297 builtin/multi-pack-index.c:27 builtin/pull.c:119
+#: builtin/push.c:575 builtin/send-pack.c:198
+msgid "force progress reporting"
+msgstr "durum belirtmeyi zorla"
-#: builtin/blame.c:849
-msgid "Show output score for blame entries"
+#: builtin/blame.c:872
+msgid "show output score for blame entries"
msgstr "genel bakış girdileri için çıktı skorunu göster"
-#: builtin/blame.c:850
-msgid "Show original filename (Default: auto)"
+#: builtin/blame.c:873
+msgid "show original filename (Default: auto)"
msgstr "orijinal dosya adını göster (Öntanımlı: Otomatik)"
-#: builtin/blame.c:851
-msgid "Show original linenumber (Default: off)"
+#: builtin/blame.c:874
+msgid "show original linenumber (Default: off)"
msgstr "orijinal satır numarasını göster (Öntanımlı: Kapalı)"
-#: builtin/blame.c:852
-msgid "Show in a format designed for machine consumption"
+#: 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:853
-msgid "Show porcelain format with per-line commit information"
-msgstr "okunabilir biçimde her satır için gönderi bilgisi ile göster"
+#: builtin/blame.c: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:854
-msgid "Use the same output mode as git-annotate (Default: off)"
+#: 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:855
-msgid "Show raw timestamp (Default: off)"
+#: builtin/blame.c:878
+msgid "show raw timestamp (Default: off)"
msgstr "ham zaman damgasını göster (Öntanımlı: Kapalı)"
-#: builtin/blame.c:856
-msgid "Show long commit SHA1 (Default: off)"
-msgstr "uzun gönderi SHA1'ini göster (Öntanımlı: Kapalı)"
+#: builtin/blame.c:879
+msgid "show long commit SHA1 (Default: off)"
+msgstr "uzun işleme SHA1'ini göster (Öntanımlı: Kapalı)"
-#: builtin/blame.c:857
-msgid "Suppress author name and timestamp (Default: off)"
+#: 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:858
-msgid "Show author email instead of name (Default: off)"
+#: 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:859
-msgid "Ignore whitespace differences"
+#: builtin/blame.c:882
+msgid "ignore whitespace differences"
msgstr "boşluk ayrımlarını yok say"
-#: builtin/blame.c:860 builtin/log.c:1702
+#: builtin/blame.c:883 builtin/log.c:1812
msgid "rev"
msgstr "revizyon"
-#: builtin/blame.c:860
-msgid "Ignore <rev> when blaming"
+#: builtin/blame.c:883
+msgid "ignore <rev> when blaming"
msgstr "suçlarken <revizyon>'u yok say"
-#: builtin/blame.c:861
-msgid "Ignore revisions from <file>"
+#: builtin/blame.c:884
+msgid "ignore revisions from <file>"
msgstr "<dosya>'dan olan revizyonları yok say"
-#: builtin/blame.c:862
+#: 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:863
+#: builtin/blame.c:886
msgid "color lines by age"
msgstr "satırları yaşına göre renklendir"
-#: builtin/blame.c:864
-msgid "Spend extra cycles to find better match"
+#: 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:865
-msgid "Use revisions from <file> instead of calling git-rev-list"
+#: 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:866
-msgid "Use <file>'s contents as the final image"
+#: 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:867 builtin/blame.c:868
+#: builtin/blame.c:890 builtin/blame.c:891
msgid "score"
msgstr "skor"
-#: builtin/blame.c:867
-msgid "Find line copies within and across files"
-msgstr "satır kopyalarını dosyalar içinde ve arasında ara"
+#: builtin/blame.c:890
+msgid "find line copies within and across files"
+msgstr "satır kopyalarını dosyaların içinde ve aralarında ara"
-#: builtin/blame.c:868
-msgid "Find line movements within and across files"
-msgstr "satır hareketlerini dosyalar içinde ve arasında ara"
+#: builtin/blame.c:891
+msgid "find line movements within and across files"
+msgstr "satır hareketlerini dosyaların içinde ve aralarında ara"
-#: builtin/blame.c:869
-msgid "n,m"
-msgstr "n,m"
+#: builtin/blame.c:892
+msgid "range"
+msgstr "erim"
-#: builtin/blame.c:869
-msgid "Process only line range n,m, counting from 1"
-msgstr "1'den saymaya başlayarak yalnızca n,m satır aralığını işle"
+#: builtin/blame.c:893
+msgid "process only line range <start>,<end> or function :<funcname>"
+msgstr ""
+"Yalnızca <başlangıç>,<bitiş> satır erimini veya :<işlevadı> işlevini işle"
-#: builtin/blame.c:921
+#: builtin/blame.c:945
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr "--progress, --incremental veya okunabilir biçimlerle kullanılamaz"
@@ -10469,24 +11153,24 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:972
+#: builtin/blame.c:996
msgid "4 years, 11 months ago"
msgstr "4 yıl 11 ay önce"
-#: builtin/blame.c:1079
+#: builtin/blame.c:1112
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "%s dosyasında yalnızca %lu satır var"
msgstr[1] "%s dosyasında yalnızca %lu satır var"
-#: builtin/blame.c:1125
+#: builtin/blame.c:1157
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]"
+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>]"
@@ -10519,7 +11203,7 @@
" '%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ş"
+" dalına birleştirilmiş; ancak HEAD'e henüz birleştirilmemiş"
#: builtin/branch.c:158
#, c-format
@@ -10533,7 +11217,7 @@
#: builtin/branch.c:172
#, c-format
msgid "Couldn't look up commit object for '%s'"
-msgstr "'%s' için gönderi nesnesi aranamadı"
+msgstr "'%s' için işleme nesnesi aranamadı"
#: builtin/branch.c:176
#, c-format
@@ -10548,117 +11232,107 @@
msgid "Update of config-file failed"
msgstr "config-file güncellemesi başarısız"
-#: builtin/branch.c:220
+#: builtin/branch.c:223
msgid "cannot use -a with -d"
msgstr "-a, -d ile kullanılamıyor"
-#: builtin/branch.c:226
+#: builtin/branch.c:230
msgid "Couldn't look up commit object for HEAD"
-msgstr "HEAD için gönderi nesnesi aranamadı"
+msgstr "HEAD için işleme nesnesi aranamadı"
-#: builtin/branch.c:240
+#: builtin/branch.c:244
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
-msgstr "Şurada çıkış yapılmış '%s' dalı silinemiyor: '%s'"
+msgstr "'%s' dalı silinemiyor, şurada çıkış yapılmış: '%s'"
-#: builtin/branch.c:255
+#: builtin/branch.c:259
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "uzak izleme dalı '%s' bulunamadı"
-#: builtin/branch.c:256
+#: builtin/branch.c:260
#, 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
+#: builtin/branch.c:291
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Uzak izleme dalı %s silindi (%s idi).\n"
-#: builtin/branch.c:280
+#: builtin/branch.c:292
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "%s dalı silindi (%s idi).\n"
-#: builtin/branch.c:429 builtin/tag.c:61
+#: builtin/branch.c:438 builtin/tag.c:61
msgid "unable to parse format string"
msgstr "biçim dizisi ayrıştırılamıyor"
-#: builtin/branch.c:460
+#: builtin/branch.c:469
msgid "could not resolve HEAD"
msgstr "HEAD çözülemedi"
-#: builtin/branch.c:466
+#: builtin/branch.c:475
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s), refs/heads/ dışına işaret ediyor"
-#: builtin/branch.c:481
+#: builtin/branch.c:490
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "%s dalı %s konumunda yeniden temellendiriliyor"
-#: builtin/branch.c:485
+#: builtin/branch.c:494
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "%s dalı %s konumunda ikili aranıyor"
-#: builtin/branch.c:502
+#: builtin/branch.c:511
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
+#: builtin/branch.c:513
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
+#: builtin/branch.c:524
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Geçersiz dal adı: '%s'"
-#: builtin/branch.c:542
+#: builtin/branch.c:553
msgid "Branch rename failed"
msgstr "Dal yeniden adlandırması başarısız"
-#: builtin/branch.c:544
+#: builtin/branch.c:555
msgid "Branch copy failed"
msgstr "Dal kopyalaması başarısız"
-#: builtin/branch.c:548
+#: builtin/branch.c:559
#, 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
+#: builtin/branch.c:562
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Yanlış adlandırılan '%s' dalı yeniden adlandırıldı"
-#: builtin/branch.c:557
+#: builtin/branch.c:568
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
-msgstr "Dal %s olarak yeniden adlandırıldı, ancak HEAD güncellenmedi!"
+msgstr "Dal %s olarak yeniden adlandırıldı; ancak HEAD güncellenmedi!"
-#: builtin/branch.c:566
+#: builtin/branch.c:577
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"
+msgstr "Dal yeniden adlandırıldı; ancak config-file güncellemesi başarısız"
-#: builtin/branch.c:568
+#: builtin/branch.c:579
msgid "Branch is copied, but update of config-file failed"
-msgstr "Dal kopyalandı, ancak config-file güncellemesi başarısız"
+msgstr "Dal kopyalandı; ancak config-file güncellemesi başarısız"
-#: builtin/branch.c:584
+#: builtin/branch.c:595
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -10669,212 +11343,212 @@
"\t%s\n"
"'%c' ile başlayan satırlar çıkarılacaktır.\n"
-#: builtin/branch.c:618
+#: builtin/branch.c:629
msgid "Generic options"
msgstr "Genel seçenekler"
-#: builtin/branch.c:620
+#: builtin/branch.c:631
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
+#: builtin/branch.c:632
msgid "suppress informational messages"
msgstr "bilgi iletilerini gizle"
-#: builtin/branch.c:622
+#: builtin/branch.c:633
msgid "set up tracking mode (see git-pull(1))"
msgstr "izleme kipini ayarla (bilgi için: git-pull(1))"
-#: builtin/branch.c:624
+#: builtin/branch.c:635
msgid "do not use"
msgstr "kullanma"
-#: builtin/branch.c:626 builtin/rebase.c:513
+#: builtin/branch.c:637 builtin/rebase.c:534
msgid "upstream"
msgstr "üstkaynak"
-#: builtin/branch.c:626
+#: builtin/branch.c:637
msgid "change the upstream info"
msgstr "üstkaynak bilgisini değiştir"
-#: builtin/branch.c:627
+#: builtin/branch.c:638
msgid "unset the upstream info"
msgstr "üstkaynak bilgisini kaldır"
-#: builtin/branch.c:628
+#: builtin/branch.c:639
msgid "use colored output"
msgstr "renklendirilmiş çıktı kullan"
-#: builtin/branch.c:629
+#: builtin/branch.c:640
msgid "act on remote-tracking branches"
-msgstr "uzak izleyen dallarda iş yap"
+msgstr "uzak izleme dallarında iş yap"
-#: builtin/branch.c:631 builtin/branch.c:633
+#: builtin/branch.c:642 builtin/branch.c:644
msgid "print only branches that contain the commit"
-msgstr "yalnızca gönderiyi içeren dalları yazdır"
+msgstr "yalnızca işlemeyi içeren dalları yazdır"
-#: builtin/branch.c:632 builtin/branch.c:634
+#: builtin/branch.c:643 builtin/branch.c:645
msgid "print only branches that don't contain the commit"
-msgstr "yalnızca gönderiyi içermeyen dalları yazdır"
+msgstr "yalnızca işlemeyi içermeyen dalları yazdır"
-#: builtin/branch.c:637
+#: builtin/branch.c:648
msgid "Specific git-branch actions:"
msgstr "Özel git-branch eylemleri:"
-#: builtin/branch.c:638
+#: builtin/branch.c:649
msgid "list both remote-tracking and local branches"
-msgstr "hem uzak izleyen hem de yerel dalları listele"
+msgstr "hem uzak izleme hem de yerel dalları listele"
-#: builtin/branch.c:640
+#: builtin/branch.c:651
msgid "delete fully merged branch"
msgstr "tümüyle birleştirilen dalı sil"
-#: builtin/branch.c:641
+#: builtin/branch.c:652
msgid "delete branch (even if not merged)"
msgstr "dalı sil (birleştirilmemiş olsa bile)"
-#: builtin/branch.c:642
+#: builtin/branch.c:653
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
+#: builtin/branch.c:654
msgid "move/rename a branch, even if target exists"
msgstr "bir dalı taşı/yeniden adlandır, hedef var olsa bile"
-#: builtin/branch.c:644
+#: builtin/branch.c:655
msgid "copy a branch and its reflog"
msgstr "bir dalı ve onun başvuru günlüğünü kopyala"
-#: builtin/branch.c:645
+#: builtin/branch.c:656
msgid "copy a branch, even if target exists"
msgstr "bir dalı kopyala, hedef var olsa bile"
-#: builtin/branch.c:646
+#: builtin/branch.c:657
msgid "list branch names"
msgstr "dal adlarını listele"
-#: builtin/branch.c:647
+#: builtin/branch.c:658
msgid "show current branch name"
msgstr "geçerli dal adını göster"
-#: builtin/branch.c:648
+#: builtin/branch.c:659
msgid "create the branch's reflog"
msgstr "dalın başvuru günlüğünü oluştur"
-#: builtin/branch.c:650
+#: builtin/branch.c:661
msgid "edit the description for the branch"
msgstr "dalın açıklamasını düzenle"
-#: builtin/branch.c:651
+#: builtin/branch.c:662
msgid "force creation, move/rename, deletion"
msgstr "zorla oluştur, taşı/yeniden adlandır, sil"
-#: builtin/branch.c:652
+#: builtin/branch.c:663
msgid "print only branches that are merged"
msgstr "yalnızca birleştirilen dalları yazdır"
-#: builtin/branch.c:653
+#: builtin/branch.c:664
msgid "print only branches that are not merged"
msgstr "yalnızca birleştirilmeyen dalları yazdır"
-#: builtin/branch.c:654
+#: builtin/branch.c:665
msgid "list branches in columns"
msgstr "dalları sütunlarla listele"
-#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415
+#: builtin/branch.c:667 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:466
msgid "object"
msgstr "nesne"
-#: builtin/branch.c:658
+#: builtin/branch.c:668
msgid "print only branches of the object"
msgstr "yalnızca nesnenin dallarını yazdır"
-#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
+#: builtin/branch.c:669 builtin/for-each-ref.c:48 builtin/tag.c:473
msgid "sorting and filtering are case insensitive"
msgstr "sıralama ve süzme BÜYÜK/küçük harf duyarlı değildir"
-#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
+#: builtin/branch.c:670 builtin/for-each-ref.c:38 builtin/tag.c:471
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "çıktı için kullanılacak biçim"
-#: builtin/branch.c:684 builtin/clone.c:785
+#: builtin/branch.c:693 builtin/clone.c:790
msgid "HEAD not found below refs/heads!"
msgstr "HEAD, refs/heads altında bulunamadı!"
-#: builtin/branch.c:708
+#: builtin/branch.c:717
msgid "--column and --verbose are incompatible"
msgstr "--column ve --verbose birbiriyle uyumsuz"
-#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
+#: builtin/branch.c:732 builtin/branch.c:788 builtin/branch.c:797
msgid "branch name required"
msgstr "dal adı gerekli"
-#: builtin/branch.c:753
+#: builtin/branch.c:764
msgid "Cannot give description to detached HEAD"
msgstr "Ayrılmış HEAD'e açıklama verilemiyor"
-#: builtin/branch.c:758
+#: builtin/branch.c:769
msgid "cannot edit description of more than one branch"
msgstr "birden çok dalın açıklaması düzenlenemiyor"
-#: builtin/branch.c:765
+#: builtin/branch.c:776
#, c-format
msgid "No commit on branch '%s' yet."
-msgstr "'%s' dalında henüz bir gönderi yok."
+msgstr "'%s' dalında henüz bir işleme yok."
-#: builtin/branch.c:768
+#: builtin/branch.c:779
#, c-format
msgid "No branch named '%s'."
msgstr "'%s' adında bir dal yok."
-#: builtin/branch.c:783
+#: builtin/branch.c:794
msgid "too many branches for a copy operation"
msgstr "bir kopyalama işlemi için çok fazla dal"
-#: builtin/branch.c:792
+#: builtin/branch.c:803
msgid "too many arguments for a rename operation"
-msgstr "bir yeniden adlandırma işlemi için çok fazla değişken"
+msgstr "bir yeniden adlandırma işlemi için çok fazla argüman"
-#: builtin/branch.c:797
+#: builtin/branch.c:808
msgid "too many arguments to set new upstream"
-msgstr "yeni üstkaynak ayarlamak için çok fazla değişken"
+msgstr "yeni üstkaynak ayarlamak için çok fazla argüman"
-#: builtin/branch.c:801
+#: builtin/branch.c:812
#, 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 "
+"HEAD'in üst kaynağı %s olarak ayarlanamadı; çünkü herhangi bir dala işaret "
"etmiyor."
-#: builtin/branch.c:804 builtin/branch.c:827
+#: builtin/branch.c:815 builtin/branch.c:838
#, c-format
msgid "no such branch '%s'"
msgstr "'%s' diye bir dal yok"
-#: builtin/branch.c:808
+#: builtin/branch.c:819
#, c-format
msgid "branch '%s' does not exist"
msgstr "'%s' diye bir dal mevcut değil"
-#: builtin/branch.c:821
+#: builtin/branch.c:832
msgid "too many arguments to unset upstream"
-msgstr "üst kaynağı kaldırmak için çok fazla değişken"
+msgstr "üst kaynağı kaldırmak için çok fazla argüman"
-#: builtin/branch.c:825
+#: builtin/branch.c:836
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."
+"HEAD'in üst kaynağı kaldırılamadı; çünkü herhangi bir dala işaret etmiyor."
-#: builtin/branch.c:831
+#: builtin/branch.c:842
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "'%s' dalının üstkaynak bilgisi yok"
-#: builtin/branch.c:841
+#: builtin/branch.c:852
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>?"
@@ -10882,7 +11556,7 @@
"'git branch'in -a ve -r seçenekleri bir dal adı almaz.\n"
"Şunu mu demek istediniz: -a|-r --list <dizgi>?"
-#: builtin/branch.c:845
+#: builtin/branch.c:856
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -10890,9 +11564,105 @@
"--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:135
+msgid "specify a destination for the bugreport file"
+msgstr "hata raporu dosyası için bir konum belirtin"
+
+#: builtin/bugreport.c:137
+msgid "specify a strftime format suffix for the filename"
+msgstr "dosya adı için bir strftime biçimli ek belirtin"
+
+#: builtin/bugreport.c:159
+#, c-format
+msgid "could not create leading directories for '%s'"
+msgstr "'%s' için öncü dizinler oluşturulamadı"
+
+#: builtin/bugreport.c:166
+msgid "System Info"
+msgstr "Sistem Bilgisi"
+
+#: builtin/bugreport.c:169
+msgid "Enabled Hooks"
+msgstr "Etkin Kancalar"
+
+#: builtin/bugreport.c:176
+#, c-format
+msgid "couldn't create a new file at '%s'"
+msgstr "'%s' hata raporu dosyası oluşturulamadı"
+
+#: builtin/bugreport.c:179
+#, c-format
+msgid "unable to write to %s"
+msgstr "%s dosyasına yazılamıyor"
+
+#: builtin/bugreport.c:189
+#, 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>"
+msgstr "git bundle create [<seçenekler>] <dosya> <git-rev-liste argümanlar>"
#: builtin/bundle.c:16 builtin/bundle.c:28
msgid "git bundle verify [<options>] <file>"
@@ -10906,49 +11676,53 @@
msgid "git bundle unbundle <file> [<refname>...]"
msgstr "git bundle unbundle <dosya> [<başvuru-adı>...]"
-#: builtin/bundle.c:66 builtin/pack-objects.c:3375
+#: builtin/bundle.c:67 builtin/pack-objects.c:3495
msgid "do not show progress meter"
msgstr "ilerleme çubuğunu gösterme"
-#: builtin/bundle.c:68 builtin/pack-objects.c:3377
+#: builtin/bundle.c:69 builtin/pack-objects.c:3497
msgid "show progress meter"
msgstr "ilerleme çubuğunu göster"
-#: builtin/bundle.c:70 builtin/pack-objects.c:3379
+#: builtin/bundle.c:71 builtin/pack-objects.c:3499
msgid "show progress meter during object writing phase"
msgstr "ilerleme çubuğunu nesne yazımı aşaması sırasında göster"
-#: builtin/bundle.c:73 builtin/pack-objects.c:3382
+#: builtin/bundle.c:74 builtin/pack-objects.c:3502
msgid "similar to --all-progress when progress meter is shown"
msgstr "ilerleme çubuğu gösterildiğinde --all-progress'e benzer"
-#: builtin/bundle.c:93
+#: 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:104
+#: builtin/bundle.c:107
msgid "do not show bundle details"
msgstr "demet ayrıntılarını gösterme"
-#: builtin/bundle.c:119
+#: builtin/bundle.c:122
#, c-format
msgid "%s is okay\n"
msgstr "%s tamam\n"
-#: builtin/bundle.c:160
+#: builtin/bundle.c:163
msgid "Need a repository to unbundle."
msgstr "Demeti çözmek için bir depo gerekli"
-#: builtin/bundle.c:168 builtin/remote.c:1686
+#: builtin/bundle.c:171 builtin/remote.c:1700
msgid "be verbose; must be placed before a subcommand"
msgstr "ayrıntılı anlat; bir altkomuttan önce yerleştirilmelidir"
-#: builtin/bundle.c:190 builtin/remote.c:1717
+#: builtin/bundle.c:193 builtin/remote.c:1731
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Bilinmeyen altkomut: %s"
-#: builtin/cat-file.c:595
+#: 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>"
@@ -10956,80 +11730,80 @@
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <tür> | --textconv | --filters) [--path=<yol>] <nesne>"
-#: builtin/cat-file.c:596
+#: 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[=<biçim>] | --batch-check[=<biçim>]) [--follow-"
+"symlinks] [--textconv | --filters]"
-#: builtin/cat-file.c:617
+#: 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:635
+#: 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:636
+#: builtin/cat-file.c:639
msgid "show object type"
msgstr "nesne türünü göster"
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:640
msgid "show object size"
msgstr "nesne boyutunu göster"
-#: builtin/cat-file.c:639
+#: 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:640
+#: builtin/cat-file.c:643
msgid "pretty-print object's content"
-msgstr "nesne içeriğini hoş biçimde göster"
+msgstr "nesne içeriğini okunabilir biçimde göster"
-#: builtin/cat-file.c:642
+#: 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:644
+#: 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:645 git-submodule.sh:1002
+#: builtin/cat-file.c:648
msgid "blob"
msgstr "ikili nesne"
-#: builtin/cat-file.c:646
+#: 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:648
+#: 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:649
+#: builtin/cat-file.c:652
msgid "buffer --batch output"
msgstr "--batch çıktısını arabelleğe al"
-#: builtin/cat-file.c:651
+#: 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:655
+#: 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:659
+#: 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:661
+#: 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:663
+#: builtin/cat-file.c:666
msgid "do not order --batch-all-objects output"
msgstr "--batch-all-objects çıktısını sıralama"
@@ -11057,8 +11831,8 @@
msgid "terminate input and output records by a NUL character"
msgstr "girdi ve çıktı kayıtlarını bir NUL karakteri ile sonlandır"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537
-#: builtin/worktree.c:499
+#: builtin/check-ignore.c:21 builtin/checkout.c:1499 builtin/gc.c:549
+#: builtin/worktree.c:489
msgid "suppress progress reporting"
msgstr "ilerleme bildirimini gizle"
@@ -11096,7 +11870,7 @@
#: builtin/check-mailmap.c:9
msgid "git check-mailmap [<options>] <contact>..."
-msgstr "git check-mailmap [<seçenekler>] <contact>..."
+msgstr "git check-mailmap [<seçenekler>] <kişi>..."
#: builtin/check-mailmap.c:14
msgid "also read contacts from stdin"
@@ -11111,54 +11885,54 @@
msgid "no contacts specified"
msgstr "kişi belirtilmedi"
-#: builtin/checkout-index.c:131
+#: builtin/checkout-index.c:152
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<seçenekler>] [--] [<dosya>...]"
-#: builtin/checkout-index.c:148
+#: builtin/checkout-index.c:169
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
+#: builtin/checkout-index.c:186
msgid "check out all files in the index"
msgstr "indeksteki tüm dosyaları çıkış yap"
-#: builtin/checkout-index.c:165
+#: builtin/checkout-index.c:187
msgid "force overwrite of existing files"
msgstr "mevcut dosyaların üzerine yazılmasını zorla"
-#: builtin/checkout-index.c:167
+#: builtin/checkout-index.c:189
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
+#: builtin/checkout-index.c:191
msgid "don't checkout new files"
msgstr "yeni dosyaları çıkış yapma"
-#: builtin/checkout-index.c:171
+#: builtin/checkout-index.c:193
msgid "update stat information in the index file"
msgstr "indeks dosyasındaki dosya bilgilerini güncelle"
-#: builtin/checkout-index.c:175
+#: builtin/checkout-index.c:197
msgid "read list of paths from the standard input"
msgstr "yolların listesini standart girdi'den oku"
-#: builtin/checkout-index.c:177
+#: builtin/checkout-index.c:199
msgid "write the content to temporary files"
msgstr "içeriği geçici dosyalara yaz"
-#: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403
-#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909
-#: builtin/worktree.c:672
+#: builtin/checkout-index.c:200 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:717
msgid "string"
msgstr "dizi"
-#: builtin/checkout-index.c:179
+#: builtin/checkout-index.c:201
msgid "when creating files, prepend <string>"
msgstr "dosyalar oluştururken başına <dizi> ekle"
-#: builtin/checkout-index.c:181
+#: builtin/checkout-index.c:203
msgid "copy out the files from named stage"
msgstr "dosyaları adı verilen alandan kopyala"
@@ -11178,150 +11952,150 @@
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git restore [<seçenekler>] [--source=<dal>] <dosya>..."
-#: builtin/checkout.c:175 builtin/checkout.c:214
+#: 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:177 builtin/checkout.c:216
+#: 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:193
+#: 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:243
+#: 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:261
+#: builtin/checkout.c:275
#, c-format
msgid "path '%s': cannot merge"
msgstr "'%s' yolu: Birleştirilemiyor"
-#: builtin/checkout.c:277
+#: 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:377
+#: 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:382
+#: 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:389
+#: 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:412 builtin/checkout.c:415 builtin/checkout.c:418
-#: builtin/checkout.c:422
+#: 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:425 builtin/checkout.c:428
+#: 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:432
+#: 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:436
+#: builtin/checkout.c:455
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "ne '%s' ne de '%s' belirtilmiş"
-#: builtin/checkout.c:440
+#: 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:445 builtin/checkout.c:450
+#: 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:509 builtin/checkout.c:516
+#: builtin/checkout.c:543 builtin/checkout.c:550
#, c-format
msgid "path '%s' is unmerged"
msgstr "'%s' yolu birleştirilmemiş"
-#: builtin/checkout.c:684 builtin/sparse-checkout.c:106
+#: builtin/checkout.c:718
msgid "you need to resolve your current index first"
msgstr "önce geçerli indeksinizi çözmelisiniz"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:772
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
"%s"
msgstr ""
-"aşağıdaki hazırlanmış değişiklikler içeren dosyalarla sürdürülemiyor:\n"
+"aşağıdaki dosyalardaki hazırlanan değişikliklerle sürdürülemiyor:\n"
"%s"
-#: builtin/checkout.c:837
+#: builtin/checkout.c:865
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "'%s' için başvuru günlüğü yapılamıyor: %s\n"
-#: builtin/checkout.c:879
+#: builtin/checkout.c:907
msgid "HEAD is now at"
-msgstr "HEAD şimdi şurada:"
+msgstr "HEAD konumu:"
-#: builtin/checkout.c:883 builtin/clone.c:717
+#: builtin/checkout.c:911 builtin/clone.c:721 t/helper/test-fast-rebase.c:202
msgid "unable to update HEAD"
msgstr "HEAD güncellenemiyor"
-#: builtin/checkout.c:887
+#: builtin/checkout.c:915
#, c-format
msgid "Reset branch '%s'\n"
msgstr "'%s' dalı sıfırlandı.\n"
-#: builtin/checkout.c:890
+#: builtin/checkout.c:918
#, c-format
msgid "Already on '%s'\n"
msgstr "Halihazırda '%s' üzerinde\n"
-#: builtin/checkout.c:894
+#: builtin/checkout.c:922
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "'%s' dalına geçildi ve sıfırlandı.\n"
-#: builtin/checkout.c:896 builtin/checkout.c:1320
+#: builtin/checkout.c:924 builtin/checkout.c:1355
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Yeni '%s' dalına geçildi.\n"
-#: builtin/checkout.c:898
+#: builtin/checkout.c:926
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "'%s' dalına geçildi.\n"
-#: builtin/checkout.c:949
+#: builtin/checkout.c:977
#, c-format
msgid " ... and %d more.\n"
msgstr "... ve %d daha.\n"
-#: builtin/checkout.c:955
+#: builtin/checkout.c:983
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -11334,17 +12108,17 @@
"\n"
"%s\n"
msgstr[0] ""
-"Uyarı: Arkanızda dallarınızdan hiçbirine bağlı olmayın %d gönderi\n"
+"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 gönderi\n"
+"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:974
+#: builtin/checkout.c:1002
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -11371,19 +12145,19 @@
"\tgit branch <yeni-dal-adı> %s\n"
"\n"
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1037
msgid "internal error in revision walk"
msgstr "revizyonlarda gezinirken iç hata"
-#: builtin/checkout.c:1013
+#: builtin/checkout.c:1041
msgid "Previous HEAD position was"
msgstr "Önceki HEAD konumu şuydu:"
-#: builtin/checkout.c:1053 builtin/checkout.c:1315
+#: builtin/checkout.c:1081 builtin/checkout.c:1350
msgid "You are on a branch yet to be born"
msgstr "Henüz doğmamış bir dal üzerindesiniz"
-#: builtin/checkout.c:1128
+#: builtin/checkout.c:1163
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -11392,7 +12166,7 @@
"'%s' hem bir yerel dosya hem de bir izleme dalı olabilir.\n"
"Lütfen -- (ve isteğe bağlı olarak --no-guess) kullanıp belirsizliği giderin."
-#: builtin/checkout.c:1135
+#: builtin/checkout.c:1170
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"
@@ -11412,51 +12186,51 @@
"isterseniz, örn. 'origin', yapılandırmanızda checkout.defaultsRemote=origin\n"
"ayarını yapmayı düşünün."
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1180
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "'%s' birden çok (%d) uzak izleme dalıyla eşleşti"
-#: builtin/checkout.c:1211
+#: builtin/checkout.c:1246
msgid "only one reference expected"
msgstr "yalnızca bir başvuru bekleniyordu"
-#: builtin/checkout.c:1228
+#: builtin/checkout.c:1263
#, c-format
msgid "only one reference expected, %d given."
msgstr "yalnızca bir başvuru bekleniyordu, %d verildi"
-#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448
+#: builtin/checkout.c:1309 builtin/worktree.c:270 builtin/worktree.c:438
#, c-format
msgid "invalid reference: %s"
msgstr "geçersiz başvuru: %s"
-#: builtin/checkout.c:1287 builtin/checkout.c:1649
+#: builtin/checkout.c:1322 builtin/checkout.c:1688
#, c-format
msgid "reference is not a tree: %s"
msgstr "başvuru bir ağaca değil: %s"
-#: builtin/checkout.c:1334
+#: builtin/checkout.c:1369
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "bir dal bekleniyordu, '%s' etiketi alındı"
-#: builtin/checkout.c:1336
+#: builtin/checkout.c:1371
#, c-format
msgid "a branch is expected, got remote branch '%s'"
-msgstr "bir dal bekleniyordu, '%s' uzak dal alındı"
+msgstr "bir dal bekleniyordu, '%s' uzak dalı alındı"
-#: builtin/checkout.c:1337 builtin/checkout.c:1345
+#: builtin/checkout.c:1372 builtin/checkout.c:1380
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "bir dal bekleniyordu, '%s' alındı"
-#: builtin/checkout.c:1340
+#: builtin/checkout.c:1375
#, c-format
msgid "a branch is expected, got commit '%s'"
-msgstr "bir dal bekleniyordu, '%s' gönderisi alındı"
+msgstr "bir dal bekleniyordu, '%s' işlemesi alındı"
-#: builtin/checkout.c:1356
+#: builtin/checkout.c:1391
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -11464,7 +12238,7 @@
"Birleştirme yaparken dal değiştirilemiyor.\n"
"\"git merge --quit\" veya \"git worktree add\" yapmayı düşünün."
-#: builtin/checkout.c:1360
+#: builtin/checkout.c:1395
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -11472,7 +12246,7 @@
"Bir \"am\" oturumunun ortasında dal değiştirilemiyor.\n"
"\"git am --quit\" veya \"git worktree add\" yapmayı düşünün."
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1399
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -11480,7 +12254,7 @@
"Yeniden temellendirme yaparken dal değiştirilemiyor.\n"
"\"git rebase --quit\" veya \"git worktree add\" yapmayı düşünün."
-#: builtin/checkout.c:1368
+#: builtin/checkout.c:1403
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -11488,151 +12262,146 @@
"Seç-al yaparken dal değiştirilemiyor.\n"
"\"git cherry-pick --quit\" veya \"git worktree add\" yapmayı düşünün."
-#: builtin/checkout.c:1372
+#: builtin/checkout.c:1407
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
msgstr ""
-"Geri al yaparken dal değiştirilemiyor.\n"
+"Geriye al yaparken dal değiştirilemiyor.\n"
"\"git revert --quit\" veya \"git worktree add\" yapmayı düşünün."
-#: builtin/checkout.c:1376
+#: builtin/checkout.c:1411
msgid "you are switching branch while bisecting"
msgstr "ikili arama yaparken dal değiştiriyorsunuz"
-#: builtin/checkout.c:1383
+#: builtin/checkout.c:1418
msgid "paths cannot be used with switching branches"
msgstr "dal değiştirilirken yollar kullanılamaz"
-#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394
+#: builtin/checkout.c:1421 builtin/checkout.c:1425 builtin/checkout.c:1429
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "dal değiştirilirken '%s' kullanılamaz"
-#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404
-#: builtin/checkout.c:1409 builtin/checkout.c:1414
+#: builtin/checkout.c:1433 builtin/checkout.c:1436 builtin/checkout.c:1439
+#: builtin/checkout.c:1444 builtin/checkout.c:1449
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s', '%s' ile birlikte kullanılamaz"
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1446
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s', <başlama-noktası> alamaz"
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1454
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
-msgstr "Dal gönderi olmayan '%s' ögesine değiştirilemez"
+msgstr "Dal, işleme olmayan '%s' ögesine değiştirilemez"
-#: builtin/checkout.c:1426
+#: builtin/checkout.c:1461
msgid "missing branch or commit argument"
-msgstr "dal veya gönderi değişkeni eksik"
+msgstr "dal veya işleme argümanı eksik"
-#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72
-#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286
-#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563
-#: builtin/send-pack.c:174
-msgid "force progress reporting"
-msgstr "durum belirtmeyi zorla"
-
-#: builtin/checkout.c:1469
+#: builtin/checkout.c:1504
msgid "perform a 3-way merge with the new branch"
msgstr "yeni dal ile bir 3 yönlü birleştirme gerçekleştir"
-#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322
+#: builtin/checkout.c:1505 builtin/log.c:1799 parse-options.h:322
msgid "style"
msgstr "stil"
-#: builtin/checkout.c:1471
+#: builtin/checkout.c:1506
msgid "conflict style (merge or diff3)"
msgstr "çakışma stili (birleştirme veya diff3)"
-#: builtin/checkout.c:1483 builtin/worktree.c:496
+#: builtin/checkout.c:1518 builtin/worktree.c:486
msgid "detach HEAD at named commit"
-msgstr "adı verilen gönderide HEAD'i ayır"
+msgstr "adı verilen işlemede HEAD'i ayır"
-#: builtin/checkout.c:1484
+#: builtin/checkout.c:1519
msgid "set upstream info for new branch"
msgstr "yeni dal için üstkaynak bilgisi ayarla"
-#: builtin/checkout.c:1486
+#: builtin/checkout.c:1521
msgid "force checkout (throw away local modifications)"
msgstr "zorla çıkış yap (yerel değişiklikleri çöpe at)"
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1523
msgid "new-branch"
msgstr "yeni dal"
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1523
msgid "new unparented branch"
msgstr "yeni üst ögesi olmayan dal"
-#: builtin/checkout.c:1490 builtin/merge.c:289
+#: builtin/checkout.c:1525 builtin/merge.c:301
msgid "update ignored files (default)"
msgstr "yok sayılan dosyaları güncelle (öntanımlı)"
-#: builtin/checkout.c:1493
+#: builtin/checkout.c:1528
msgid "do not check if another worktree is holding the given ref"
msgstr ""
"verilen başvuruyu başka bir çalışma ağacının tutup tutmadığını denetleme"
-#: builtin/checkout.c:1506
+#: builtin/checkout.c:1541
msgid "checkout our version for unmerged files"
-msgstr "birleştirilmeyen dosyalar için bizim sürümü çıkış yap"
+msgstr "birleştirilmeyen dosyalar için bizdeki sürümü çıkış yap"
-#: builtin/checkout.c:1509
+#: builtin/checkout.c:1544
msgid "checkout their version for unmerged files"
-msgstr "birleştirilmeyen dosyalar için onların sürümünü çıkış yap"
+msgstr "birleştirilmeyen dosyalar için onlardaki sürümünü çıkış yap"
-#: builtin/checkout.c:1513
+#: builtin/checkout.c:1548
msgid "do not limit pathspecs to sparse entries only"
msgstr "yol belirteçlerini yalnızca aralıklı girdilere kısıtlama"
-#: builtin/checkout.c:1565
-msgid "-b, -B and --orphan are mutually exclusive"
-msgstr "-b, -B ve --orphan birlikte kullanılmaz"
+#: builtin/checkout.c:1603
+#, c-format
+msgid "-%c, -%c and --orphan are mutually exclusive"
+msgstr "-%c, -%c ve --orphan birlikte kullanılmaz"
-#: builtin/checkout.c:1568
+#: builtin/checkout.c:1607
msgid "-p and --overlay are mutually exclusive"
msgstr "-p ve --overlay birlikte kullanılmaz"
-#: builtin/checkout.c:1605
+#: builtin/checkout.c:1644
msgid "--track needs a branch name"
msgstr "--track için bir dal adı gerekli"
-#: builtin/checkout.c:1610
-msgid "missing branch name; try -b"
-msgstr "eksik dal adı; -b deneyin"
+#: builtin/checkout.c:1649
+#, c-format
+msgid "missing branch name; try -%c"
+msgstr "eksik dal adı; -%c deneyin"
-#: builtin/checkout.c:1642
+#: builtin/checkout.c:1681
#, c-format
msgid "could not resolve %s"
msgstr "%s çözülemedi"
-#: builtin/checkout.c:1658
+#: builtin/checkout.c:1697
msgid "invalid path specification"
msgstr "geçersiz yol belirtimi"
-#: builtin/checkout.c:1665
+#: builtin/checkout.c:1704
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
-msgstr "'%s' bir gönderi değil ve ondan bir '%s' dalı oluşturulamaz"
+msgstr "'%s' bir işleme değil ve ondan bir '%s' dalı oluşturulamaz"
-#: builtin/checkout.c:1669
+#: builtin/checkout.c:1708
#, 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"
+msgstr "git checkout: --detach bir '%s' yol argümanı almıyor"
-#: builtin/checkout.c:1678
+#: builtin/checkout.c:1717
msgid "--pathspec-from-file is incompatible with --detach"
msgstr "--pathspec-from-file, --detach ile uyumsuz"
-#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506
+#: builtin/checkout.c:1720 builtin/reset.c:325 builtin/stash.c:1566
msgid "--pathspec-from-file is incompatible with --patch"
msgstr "--pathspec-from-file, --patch ile uyumsuz"
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1733
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -11640,109 +12409,110 @@
"git checkout: --ours/--theirs, --force ve --merge indeks çıkışı yapılırken\n"
"birlikte kullanılamaz"
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1738
msgid "you must specify path(s) to restore"
msgstr "eski durumuna getirilecek yolları belirtmelisiniz"
-#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774
-#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494
+#: builtin/checkout.c:1764 builtin/checkout.c:1766 builtin/checkout.c:1815
+#: builtin/checkout.c:1817 builtin/clone.c:122 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:482
+#: builtin/worktree.c:484
msgid "branch"
msgstr "dal"
-#: builtin/checkout.c:1724
+#: builtin/checkout.c:1765
msgid "create and checkout a new branch"
msgstr "yeni bir dal oluştur ve çıkış yap"
-#: builtin/checkout.c:1726
+#: builtin/checkout.c:1767
msgid "create/reset and checkout a branch"
msgstr "bir dal oluştur/sıfırla ve çıkış yap"
-#: builtin/checkout.c:1727
+#: builtin/checkout.c:1768
msgid "create reflog for new branch"
msgstr "yeni dal için başvuru günlüğü oluştur"
-#: builtin/checkout.c:1729
+#: builtin/checkout.c:1770
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "'git checkout <böyle-bir-dal-yok>'a temkinli yaklaş (öntanımlı)"
-#: builtin/checkout.c:1730
+#: builtin/checkout.c:1771
msgid "use overlay mode (default)"
msgstr "yerpaylaşım kipini kullan (öntanımlı)"
-#: builtin/checkout.c:1775
+#: builtin/checkout.c:1816
msgid "create and switch to a new branch"
msgstr "yeni bir dal oluştur ve ona geç"
-#: builtin/checkout.c:1777
+#: builtin/checkout.c:1818
msgid "create/reset and switch to a branch"
msgstr "bir dal oluştur/sıfırla ve ona geç"
-#: builtin/checkout.c:1779
+#: builtin/checkout.c:1820
msgid "second guess 'git switch <no-such-branch>'"
msgstr "'git switch <böyle-bir-dal-yok>'a temkinli yaklaş"
-#: builtin/checkout.c:1781
+#: builtin/checkout.c:1822
msgid "throw away local modifications"
msgstr "yerel değişiklikleri çöpe at"
-#: builtin/checkout.c:1813
+#: builtin/checkout.c:1856
msgid "which tree-ish to checkout from"
msgstr "çıkış yapılacak ağacımsı"
-#: builtin/checkout.c:1815
+#: builtin/checkout.c:1858
msgid "restore the index"
msgstr "indeksi eski durumuna getir"
-#: builtin/checkout.c:1817
+#: builtin/checkout.c:1860
msgid "restore the working tree (default)"
msgstr "çalışma ağacını eski durumuna getir"
-#: builtin/checkout.c:1819
+#: builtin/checkout.c:1862
msgid "ignore unmerged entries"
msgstr "birleştirilmemiş girdileri yok say"
-#: builtin/checkout.c:1820
+#: builtin/checkout.c:1863
msgid "use overlay mode"
msgstr "yerpaylaşım kipini kullan"
-#: 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 <dizgi>] [-x | -X] [--] <yollar>..."
-#: builtin/clean.c:32
+#: builtin/clean.c:33
#, c-format
msgid "Removing %s\n"
msgstr "%s kaldırılıyor\n"
-#: builtin/clean.c:33
+#: builtin/clean.c:34
#, c-format
msgid "Would remove %s\n"
msgstr "%s kaldırılacak\n"
-#: builtin/clean.c:34
+#: builtin/clean.c:35
#, c-format
msgid "Skipping repository %s\n"
msgstr "%s dizini atlanıyor\n"
-#: builtin/clean.c:35
+#: builtin/clean.c:36
#, c-format
msgid "Would skip repository %s\n"
msgstr "%s dizini atlanacak\n"
-#: builtin/clean.c:36
+#: builtin/clean.c:37
#, c-format
msgid "failed to remove %s"
msgstr "%s kaldırılamadı"
-#: builtin/clean.c:37
+#: builtin/clean.c:38
#, c-format
msgid "could not lstat %s\n"
msgstr "%s 'lstat' yapılamadı\n"
-#: builtin/clean.c:301 git-add--interactive.perl:595
+#: builtin/clean.c:302 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -11755,7 +12525,7 @@
"foo - benzersiz öneke dayanarak bir öge seç\n"
" - (boş) hiçbir şey seçme\n"
-#: builtin/clean.c:305 git-add--interactive.perl:604
+#: builtin/clean.c:306 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -11775,33 +12545,33 @@
"* - tüm ögeleri seç\n"
" - (boş) seçimi bitir\n"
-#: builtin/clean.c:521 git-add--interactive.perl:570
-#: git-add--interactive.perl:575
+#: builtin/clean.c:521 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Pardon (%s)?\n"
-#: builtin/clean.c:663
+#: builtin/clean.c:661
#, c-format
msgid "Input ignore patterns>> "
-msgstr "Girdi yok sayma dizgileri>> "
+msgstr "Girdi için yok sayma dizgileri>> "
-#: builtin/clean.c:700
+#: 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:721
+#: 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:762
+#: builtin/clean.c:758
#, c-format
msgid "Remove %s [y/N]? "
msgstr "%s kaldırılsın mı [y/N]? "
-#: builtin/clean.c:795
+#: builtin/clean.c:789
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -11819,96 +12589,96 @@
"help - bu ekranı görüntüle\n"
"? - istem seçimi için yardım"
-#: builtin/clean.c:831
+#: 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:847
+#: builtin/clean.c:841
msgid "No more files to clean, exiting."
msgstr "Temizlenecek başka dosya yok, çıkılıyor."
-#: builtin/clean.c:909
+#: 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:911
+#: builtin/clean.c:905
msgid "force"
msgstr "zorla"
-#: builtin/clean.c:912
+#: builtin/clean.c:906
msgid "interactive cleaning"
msgstr "etkileşimli temizlik"
-#: builtin/clean.c:914
+#: builtin/clean.c:908
msgid "remove whole directories"
msgstr "dizinleri tümüyle kaldır"
-#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564
-#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179
-#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/grep.c:922 builtin/log.c:184 builtin/log.c:186
+#: builtin/ls-files.c:573 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "dizgi"
-#: builtin/clean.c:916
+#: builtin/clean.c:910
msgid "add <pattern> to ignore rules"
msgstr "yok sayma kurallarına <dizgi> ekle"
-#: builtin/clean.c:917
+#: builtin/clean.c:911
msgid "remove ignored files, too"
msgstr "yok sayılan dosyalar da kaldırıldı"
-#: builtin/clean.c:919
+#: builtin/clean.c:913
msgid "remove only ignored files"
msgstr "yalnızca yok sayılan dosyaları kaldır"
-#: builtin/clean.c:937
-msgid "-x and -X cannot be used together"
-msgstr "-x ve -X birlikte kullanılamaz"
-
-#: builtin/clean.c:941
+#: 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 "
+"clean.requireForce 'true' olarak ayarlanmış ve ne -i ne -n ne de -f "
"verilmiş; temizleme reddediliyor"
-#: builtin/clean.c:944
+#: 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"
+"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
+#: builtin/clone.c:94
msgid "don't create a checkout"
msgstr "çıkış yapma!"
-#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
+#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:555
msgid "create a bare repository"
msgstr "çıplak bir depo oluştur"
-#: builtin/clone.c:98
+#: builtin/clone.c:99
msgid "create a mirror repository (implies bare)"
msgstr "bir yansı depo oluştur (çıplak ima eder)"
-#: builtin/clone.c:100
+#: builtin/clone.c:101
msgid "to clone from a local repository"
msgstr "bir yerel depodan klonla"
-#: builtin/clone.c:102
+#: builtin/clone.c:103
msgid "don't use local hardlinks, always copy"
msgstr "yerel sabit bağları kullanma, her zaman kopyala"
-#: builtin/clone.c:104
+#: builtin/clone.c:105
msgid "setup as shared repository"
msgstr "paylaşılan depo ayarla"
@@ -11920,131 +12690,132 @@
msgid "initialize submodules in the clone"
msgstr "klon içerisindeki altmodülleri ilklendir"
-#: builtin/clone.c:110
+#: builtin/clone.c:111
msgid "number of submodules cloned in parallel"
msgstr "paralelde klonlanan altmodüllerin sayısı"
-#: builtin/clone.c:111 builtin/init-db.c:486
+#: builtin/clone.c:112 builtin/init-db.c:552
msgid "template-directory"
msgstr "şablon dizini"
-#: builtin/clone.c:112 builtin/init-db.c:487
+#: builtin/clone.c:113 builtin/init-db.c:553
msgid "directory from which templates will be used"
msgstr "şablonların kullanılacağı dizin"
-#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407
-#: builtin/submodule--helper.c:1912
+#: builtin/clone.c:115 builtin/clone.c:117 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:1409
-#: builtin/submodule--helper.c:1914
+#: builtin/clone.c:119 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/merge-file.c:46
-#: builtin/pack-objects.c:3441 builtin/repack.c:327
+#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3561 builtin/repack.c:357
msgid "name"
msgstr "ad"
-#: builtin/clone.c:120
+#: builtin/clone.c:121
msgid "use <name> instead of 'origin' to track upstream"
msgstr "üstkaynağı izlemek için 'origin' yerine <ad> kullan"
-#: builtin/clone.c:122
+#: builtin/clone.c:123
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "uzak konumun HEAD'i yerine <dal>'ı çıkış yap"
-#: builtin/clone.c:124
+#: builtin/clone.c:125
msgid "path to git-upload-pack on the remote"
msgstr "uzak konumdaki git-upload-pack'e olan yol"
-#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828
-#: builtin/pull.c:207
+#: builtin/clone.c:126 builtin/fetch.c:176 builtin/grep.c:861
+#: builtin/pull.c:208
msgid "depth"
msgstr "derinlik"
-#: builtin/clone.c:126
+#: builtin/clone.c:127
msgid "create a shallow clone of that depth"
msgstr "verilen derinlikte sığ bir depo oluştur"
-#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430
+#: builtin/clone.c:128 builtin/fetch.c:178 builtin/pack-objects.c:3550
+#: builtin/pull.c:211
msgid "time"
msgstr "zaman"
-#: builtin/clone.c:128
+#: builtin/clone.c:129
msgid "create a shallow clone since a specific time"
msgstr "verilen zamandan sonrasını içeren bir sığ depo oluştur"
-#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195
-#: builtin/rebase.c:1480
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/fetch.c:203
+#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1323
msgid "revision"
msgstr "revizyon"
-#: builtin/clone.c:130 builtin/fetch.c:173
+#: builtin/clone.c:131 builtin/fetch.c:181 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:1419
-#: builtin/submodule--helper.c:1928
+#: builtin/clone.c:133 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
+#: builtin/clone.c:135
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
+#: builtin/clone.c:137
msgid "any cloned submodules will be shallow"
msgstr "klonlanan altmodüller sığ olacak"
-#: builtin/clone.c:137 builtin/init-db.c:495
+#: builtin/clone.c:138 builtin/init-db.c:561
msgid "gitdir"
msgstr "git dizini"
-#: builtin/clone.c:138 builtin/init-db.c:496
+#: builtin/clone.c:139 builtin/init-db.c:562
msgid "separate git dir from working tree"
msgstr "git dizinini çalışma ağacından ayır"
-#: builtin/clone.c:139
+#: builtin/clone.c:140
msgid "key=value"
msgstr "anahtar=değer"
-#: builtin/clone.c:140
+#: builtin/clone.c:141
msgid "set config inside the new repository"
msgstr "yapılandırmayı yeni deponun içinde ayarla"
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
-#: builtin/push.c:573 builtin/send-pack.c:172
+#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77
+#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
msgid "server-specific"
msgstr "sunucuya özel"
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
-#: builtin/push.c:573 builtin/send-pack.c:173
+#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77
+#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
msgid "option to transmit"
msgstr "iletme seçeneği"
-#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220
-#: builtin/push.c:574
+#: builtin/clone.c:144 builtin/fetch.c:199 builtin/pull.c:234
+#: builtin/push.c:585
msgid "use IPv4 addresses only"
msgstr "yalnızca IPv4 adresleri kullan"
-#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223
-#: builtin/push.c:576
+#: builtin/clone.c:146 builtin/fetch.c:201 builtin/pull.c:237
+#: builtin/push.c:587
msgid "use IPv6 addresses only"
msgstr "yalnızca IPv6 adresleri kullan"
-#: builtin/clone.c:149
+#: builtin/clone.c:150
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
+#: builtin/clone.c:152
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
+#: builtin/clone.c:288
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -12052,182 +12823,192 @@
"Bir dizin adı tahmin edilemedi.\n"
"Lütfen komut satırında bir dizin belirtin."
-#: builtin/clone.c:340
+#: builtin/clone.c:341
#, 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
+#: builtin/clone.c:414
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s var ve bir dizin değil"
-#: builtin/clone.c:430
+#: builtin/clone.c:432
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "yineleyici '%s' üzerinden çalıştırılamadı"
-#: builtin/clone.c:460
+#: builtin/clone.c:463
#, c-format
msgid "failed to create link '%s'"
msgstr "'%s' bağı oluşturulamadı"
-#: builtin/clone.c:464
+#: builtin/clone.c:467
#, c-format
msgid "failed to copy file to '%s'"
msgstr "dosya şuraya kopyalanamadı: '%s'"
-#: builtin/clone.c:469
+#: builtin/clone.c:472
#, c-format
msgid "failed to iterate over '%s'"
msgstr "'%s' üzerinde yinelenemedi"
-#: builtin/clone.c:494
+#: builtin/clone.c:499
#, c-format
msgid "done.\n"
msgstr "bitti.\n"
-#: builtin/clone.c:508
+#: builtin/clone.c:513
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"
+"Klonlama başarılı oldu; ancak çıkış yapılamadı.\n"
"Neyin çıkış yapılıp yapılmadığını 'git status' ile inceleyebilir\n"
"ve 'git restore --source=HEAD' ile yeniden deneyebilirsiniz.\n"
-#: builtin/clone.c:585
+#: builtin/clone.c:590
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Klonlanacak %s uzak dal bulunamadı."
-#: builtin/clone.c:705
+#: builtin/clone.c:709
#, c-format
msgid "unable to update %s"
msgstr "%s güncellenemiyor"
-#: builtin/clone.c:753
+#: builtin/clone.c:757
msgid "failed to initialize sparse-checkout"
msgstr "sparse-checkout ilklendirilemedi"
-#: builtin/clone.c:776
+#: builtin/clone.c:780
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"uzak konum HEAD'i var olmayan başvuruya bağlanıyor, çıkış yapılamıyor.\n"
-#: builtin/clone.c:807
+#: builtin/clone.c:812
msgid "unable to checkout working tree"
msgstr "çalışma ağacı çıkış yapılamıyor"
-#: builtin/clone.c:862
+#: builtin/clone.c:887
msgid "unable to write parameters to config file"
msgstr "parametreler yapılandırma dosyasına yazılamıyor"
-#: builtin/clone.c:925
+#: builtin/clone.c:950
msgid "cannot repack to clean up"
msgstr "temizlik için yeniden paketlenemiyor"
-#: builtin/clone.c:927
+#: builtin/clone.c:952
msgid "cannot unlink temporary alternates file"
msgstr "geçici alternatifler dosyasının bağlantısı kesilemiyor"
-#: builtin/clone.c:965 builtin/receive-pack.c:1950
+#: builtin/clone.c:993 builtin/receive-pack.c:2493
msgid "Too many arguments."
-msgstr "Çok fazla değişken."
+msgstr "Çok fazla argüman."
-#: builtin/clone.c:969
+#: builtin/clone.c:997
msgid "You must specify a repository to clone."
msgstr "Klonlamak için bir depo belirtmelisiniz."
-#: builtin/clone.c:982
+#: builtin/clone.c:1010
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare ve --origin %s seçenekleri birbiriyle uyumsuz."
-#: builtin/clone.c:985
+#: builtin/clone.c:1013
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare ve --separate-git-dir birbiriyle uyumsuz."
-#: builtin/clone.c:998
+#: builtin/clone.c:1026
#, c-format
msgid "repository '%s' does not exist"
msgstr "'%s' deposu mevcut değil"
-#: builtin/clone.c:1004 builtin/fetch.c:1796
+#: builtin/clone.c:1030 builtin/fetch.c:1951
#, c-format
msgid "depth %s is not a positive number"
msgstr "%s derinliği pozitif bir sayı değil"
-#: builtin/clone.c:1014
+#: builtin/clone.c:1040
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "Hedef yolu '%s' halihazırda mevcut ve boş bir dizin değil."
-#: builtin/clone.c:1024
+#: builtin/clone.c:1046
+#, 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:1060
#, c-format
msgid "working tree '%s' already exists."
msgstr "Çalışma ağacı '%s' halihazırda mevcut."
-#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271
-#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327
+#: builtin/clone.c:1075 builtin/clone.c:1096 builtin/difftool.c:271
+#: builtin/log.c:1986 builtin/worktree.c:282 builtin/worktree.c:314
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "şunun öncü dizinleri oluşturulamadı: '%s'"
-#: builtin/clone.c:1044
+#: builtin/clone.c:1080
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "'%s' çalışma ağacı dizini oluşturulamadı"
-#: builtin/clone.c:1064
+#: builtin/clone.c:1100
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "'%s' çıplak deposuna klonlanıyor...\n"
-#: builtin/clone.c:1066
+#: builtin/clone.c:1102
#, c-format
msgid "Cloning into '%s'...\n"
-msgstr "Şuraya klonlanıyor: '%s'...\n"
+msgstr "Klonlama konumu: '%s'...\n"
-#: builtin/clone.c:1090
+#: builtin/clone.c:1126
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr ""
"clone --recursive hem --reference hem --reference-if-able ile uyumlu değil"
-#: builtin/clone.c:1154
+#: builtin/clone.c:1170 builtin/remote.c:200 builtin/remote.c:705
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr "'%s' geçerli bir uzak konum adı değil"
+
+#: builtin/clone.c:1211
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth yerel klonlarda yok sayılır; yerine file:// kullanın."
-#: builtin/clone.c:1156
+#: builtin/clone.c:1213
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "--shallow-since yerel klonlarda yok sayılır; yerine file:// kullanın."
-#: builtin/clone.c:1158
+#: builtin/clone.c:1215
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-exclude yerel klonlarda yok sayılır; yerine file:// kullanın."
-#: builtin/clone.c:1160
+#: builtin/clone.c:1217
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter yerel klonlarda yok sayılır; yerine file:// kullanın."
-#: builtin/clone.c:1163
+#: builtin/clone.c:1220
msgid "source repository is shallow, ignoring --local"
msgstr "kaynak depo sığ, --local yok sayılıyor"
-#: builtin/clone.c:1168
+#: builtin/clone.c:1225
msgid "--local is ignored"
msgstr "--local yok sayıldı"
-#: builtin/clone.c:1243 builtin/clone.c:1251
+#: builtin/clone.c:1315 builtin/clone.c:1323
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "%s uzak dalı %s üstkaynağında bulunamadı"
-#: builtin/clone.c:1254
+#: builtin/clone.c:1326
msgid "You appear to have cloned an empty repository."
msgstr "Boş bir depoyu klonlamış görünüyorsunuz."
@@ -12261,22 +13042,129 @@
#: builtin/column.c:51
msgid "--command must be the first argument"
-msgstr "--command ilk değişken olmalı"
+msgstr "--command ilk argüman 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:187 builtin/log.c:1768
+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 argümanı, %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[<anahtor-no>]] [(-m <ileti>)...] [(-"
-"F <dosya>)...] <ağaç>"
+"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:526
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:557
#, c-format
msgid "not a valid object name %s"
msgstr "%s geçerli bir nesne adı değil"
@@ -12302,26 +13190,26 @@
#: builtin/commit-tree.c:112
msgid "id of a parent commit object"
-msgstr "bir üst gönderi ögesinin no'su"
+msgstr "bir üst işleme ögesinin no'su"
-#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477
-#: builtin/tag.c:412
+#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:282
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1537
+#: builtin/tag.c:445
msgid "message"
msgstr "ileti"
-#: builtin/commit-tree.c:115 builtin/commit.c:1501
+#: builtin/commit-tree.c:115 builtin/commit.c:1504
msgid "commit message"
-msgstr "gönderi iletisi"
+msgstr "işleme iletisi"
#: builtin/commit-tree.c:118
msgid "read commit log message from file"
-msgstr "gönderi günlük iletisini dosyadan oku"
+msgstr "işleme günlük iletisini dosyadan oku"
-#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288
-#: builtin/pull.c:175 builtin/revert.c:118
+#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:299
+#: builtin/pull.c:176 builtin/revert.c:118
msgid "GPG sign commit"
-msgstr "gönderiyi GPG ile imzala"
+msgstr "işlemeyi GPG ile imzala"
#: builtin/commit-tree.c:133
msgid "must give exactly one tree"
@@ -12345,9 +13233,9 @@
"it empty. You can repeat your command with --allow-empty, or you can\n"
"remove the commit entirely with \"git reset HEAD^\".\n"
msgstr ""
-"En son yapılan gönderiyi değiştirmek istediniz, ancak bu onu\n"
-"boşaltacaktır. Komutunuzu --allow-empty ile yineleyebilir veya\n"
-"gönderiyi \"git reset HEAD^\" ile tümüyle kaldırabilirsiniz.\n"
+"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 ""
@@ -12364,10 +13252,14 @@
"\n"
#: builtin/commit.c:63
-msgid "Otherwise, please use 'git cherry-pick --skip'\n"
-msgstr "Aksi durumda lütfen 'git cherry-pick --skip' kullanın.\n"
+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"
@@ -12379,183 +13271,185 @@
" git cherry-pick --skip\n"
"\n"
msgstr ""
-"ve sonra geri kalan gönderileri seç-al yapmayı sürdürmek için:\n"
+"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 gönderiyi atlamak isterseniz şunu kullanın:\n"
+"Bu işlemeyi atlamak isterseniz şunu kullanın:\n"
"\n"
"\tgit cherry-pick --continue\n"
"\n"
-#: builtin/commit.c:315
+#: builtin/commit.c:312
msgid "failed to unpack HEAD tree object"
msgstr "HEAD ağaç nesnesi açılamadı"
-#: builtin/commit.c:351
+#: 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:364
+#: 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:376
+#: builtin/commit.c:373
msgid "unable to create temporary index"
msgstr "geçici indeks oluşturulamıyor"
-#: builtin/commit.c:385
+#: builtin/commit.c:382
msgid "interactive add failed"
msgstr "etkileşimli ekleme başarısız"
-#: builtin/commit.c:400
+#: builtin/commit.c:397
msgid "unable to update temporary index"
msgstr "geçici indeks güncellenemiyor"
-#: builtin/commit.c:402
+#: builtin/commit.c:399
msgid "Failed to update main cache tree"
msgstr "Ana önbellek ağacı güncellenemedi"
-#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496
+#: 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:479
+#: builtin/commit.c:476
msgid "cannot do a partial commit during a merge."
-msgstr "Bir birleştirme sırasında kısmi gönderi yapılamaz."
+msgstr "Bir birleştirme sırasında kısmi işleme yapılamaz."
-#: builtin/commit.c:481
+#: builtin/commit.c:478
msgid "cannot do a partial commit during a cherry-pick."
-msgstr "Bir seç-al sırasında kısmi gönderi yapılamaz."
+msgstr "Bir seç-al sırasında kısmi işleme yapılamaz."
-#: builtin/commit.c:489
+#: 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:508
+#: builtin/commit.c:507
msgid "unable to write temporary index file"
msgstr "geçici indeks dosyası yazılamıyor"
-#: builtin/commit.c:606
+#: builtin/commit.c:605
#, c-format
msgid "commit '%s' lacks author header"
-msgstr "'%s' gönderisinde yazar üstbilgisi yok"
+msgstr "'%s' işlemesinde yazar üstbilgisi yok"
-#: builtin/commit.c:608
+#: builtin/commit.c:607
#, c-format
msgid "commit '%s' has malformed author line"
-msgstr "'%s' gönderisindeki yazar satırı hatalı oluşturulmuş"
+msgstr "'%s' işlemesindeki yazar satırı hatalı oluşturulmuş"
-#: builtin/commit.c:627
+#: builtin/commit.c:626
msgid "malformed --author parameter"
msgstr "hatalı oluşturulmuş --author parametresi"
-#: builtin/commit.c:680
+#: builtin/commit.c:679
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr ""
-"mevcut gönderi iletisinde kullanılmayan bir yorum\n"
+"mevcut işleme iletisinde kullanılmayan bir yorum\n"
"karakteri seçilemiyor"
-#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097
+#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097
#, c-format
msgid "could not lookup commit %s"
-msgstr "%s gönderisi aranamadı"
+msgstr "%s işlemesi aranamadı"
-#: builtin/commit.c:730 builtin/shortlog.c:319
+#: builtin/commit.c:729 builtin/shortlog.c:413
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(günlük iletisi standart girdi'den okunuyor)\n"
-#: builtin/commit.c:732
+#: builtin/commit.c:731
msgid "could not read log from standard input"
msgstr "günlük standart girdi'den okunamadı"
-#: builtin/commit.c:736
+#: builtin/commit.c:735
#, c-format
msgid "could not read log file '%s'"
msgstr "günlük dosyası '%s' okunamadı"
-#: builtin/commit.c:767 builtin/commit.c:783
+#: builtin/commit.c:766 builtin/commit.c:782
msgid "could not read SQUASH_MSG"
msgstr "SQUASH_MSG okunamadı"
-#: builtin/commit.c:774
+#: builtin/commit.c:773
msgid "could not read MERGE_MSG"
msgstr "MERGE_MSG okunamadı"
-#: builtin/commit.c:834
+#: builtin/commit.c:833
msgid "could not write commit template"
-msgstr "gönderi şablonu yazılamadı"
+msgstr "işleme şablonu yazılamadı"
#: builtin/commit.c:853
-#, c-format
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
+"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ştirme gönderiyorsunuz.\n"
-"Eğer bu doğru değilse lütfen şu dosyayı kaldırın:\n"
-"\t%s\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
-#, c-format
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
+"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 gönderiyorsunuz.\n"
-"Eğer bu doğru değilse lütfen şu dosyayı kaldırın:\n"
-"\t%s\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:871
+#: 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 gönderi iletisi girin. '%c' ile başlayan\n"
-"satırlar yok sayılacaktır. Boş bir ileti gönderiyi iptal eder.\n"
+"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:879
+#: 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 gönderi iletisi girin. '%c' ile başlayan\n"
+"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 gönderiyi iptal eder.\n"
+"Boş bir ileti işlemeyi iptal eder.\n"
-#: builtin/commit.c:896
+#: builtin/commit.c:893
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sYazar: %.*s <%.*s>"
-#: builtin/commit.c:904
+#: builtin/commit.c:901
#, c-format
msgid "%sDate: %s"
msgstr "%sTarih: %s"
-#: builtin/commit.c:911
+#: builtin/commit.c:908
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
-msgstr "%sGönderen: %.*s <%.*s>"
+msgstr "%sİşleyici: %.*s <%.*s>"
-#: builtin/commit.c:929
+#: builtin/commit.c:926
msgid "Cannot read index"
msgstr "İndeks okunamıyor"
@@ -12563,7 +13457,7 @@
msgid "Error building trees"
msgstr "Ağaçlar yapılırken hata"
-#: builtin/commit.c:1011 builtin/tag.c:275
+#: builtin/commit.c:1011 builtin/tag.c:308
#, 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"
@@ -12580,7 +13474,7 @@
msgid "Invalid ignored mode '%s'"
msgstr "Geçersiz yok sayılanları göster kipi '%s'"
-#: builtin/commit.c:1087 builtin/commit.c:1327
+#: 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'"
@@ -12605,80 +13499,85 @@
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Bir seç-al'ın tam ortasındasınız -- değiştirme yapılamıyor."
-#: builtin/commit.c:1188
+#: 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:1198
+#: 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:1200
+#: 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:1208
+#: 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:1225
+#: 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:1231
+#: 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:1362 builtin/commit.c:1524
+#: builtin/commit.c:1366 builtin/commit.c:1527
msgid "show status concisely"
msgstr "durumu kısaca göster"
-#: builtin/commit.c:1364 builtin/commit.c:1526
+#: builtin/commit.c:1368 builtin/commit.c:1529
msgid "show branch information"
msgstr "dal bilgisini göster"
-#: builtin/commit.c:1366
+#: builtin/commit.c:1370
msgid "show stash information"
msgstr "zula bilgisini göster"
-#: builtin/commit.c:1368 builtin/commit.c:1528
+#: 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:1370
+#: builtin/commit.c:1374
msgid "version"
msgstr "sürüm"
-#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549
-#: builtin/worktree.c:643
+#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560
+#: builtin/worktree.c:679
msgid "machine-readable output"
msgstr "makine tarafından okunabilir çıktı"
-#: builtin/commit.c:1373 builtin/commit.c:1532
+#: 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:1376 builtin/commit.c:1535
+#: builtin/commit.c:1380 builtin/commit.c:1538
msgid "terminate entries with NUL"
msgstr "girdileri NUL ile sonlandır"
-#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538
-#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
-#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336
+#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541
+#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
+#: builtin/fast-export.c:1204 builtin/rebase.c:1412 parse-options.h:336
msgid "mode"
msgstr "kip"
-#: builtin/commit.c:1379 builtin/commit.c:1538
+#: 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:1383
+#: builtin/commit.c:1387
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -12686,11 +13585,11 @@
"yok sayılan dosyaları göster, isteğe bağlı kipler: traditional (geleneksel) "
"matching (eşleşen), no (hayır) (Öntanımlı: traditional)."
-#: builtin/commit.c:1385 parse-options.h:192
+#: builtin/commit.c:1389 parse-options.h:192
msgid "when"
msgstr "ne zaman"
-#: builtin/commit.c:1386
+#: builtin/commit.c:1390
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -12698,471 +13597,404 @@
"altmodüllere olan değişiklikleri yok say, isteğe bağlı ne zaman: all "
"(hepsi), dirty (kirli), untracked (izlenmeyen) (Öntanımlı: all)."
-#: builtin/commit.c:1388
+#: builtin/commit.c:1392
msgid "list untracked files in columns"
msgstr "izlenmeyen dosyaları sütunlarla göster"
-#: builtin/commit.c:1389
+#: builtin/commit.c:1393
msgid "do not detect renames"
msgstr "yeniden adlandırmaları algılama"
-#: builtin/commit.c:1391
+#: 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:1411
+#: 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 "
+"Yok sayılan ve izlenmeyen dosyalar argümanlarının desteklenmeyen birlikte "
"kullanımı"
-#: builtin/commit.c:1494
-msgid "suppress summary after successful commit"
-msgstr "başarılı gönderinin ardından özeti gizle"
-
-#: builtin/commit.c:1495
-msgid "show diff in commit message template"
-msgstr "diff'i gönderi iletisi şablonunda göster"
-
#: builtin/commit.c:1497
-msgid "Commit message options"
-msgstr "Gönderi iletisi seçenekleri"
+msgid "suppress summary after successful commit"
+msgstr "başarılı işlemenin ardından özeti gizle"
-#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414
+#: 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:286 builtin/tag.c:447
msgid "read message from file"
msgstr "iletiyi dosyadan oku"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1502
msgid "author"
msgstr "yazar"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1502
msgid "override author for commit"
-msgstr "gönderi yazarını geçersiz kıl"
+msgstr "işleme yazarını geçersiz kıl"
-#: builtin/commit.c:1500 builtin/gc.c:538
+#: builtin/commit.c:1503 builtin/gc.c:550
msgid "date"
msgstr "tarih"
-#: builtin/commit.c:1500
-msgid "override date for commit"
-msgstr "gönderi tarihini geçersiz kıl"
-
-#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504
-#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92
-msgid "commit"
-msgstr "gönderi"
-
-#: builtin/commit.c:1502
-msgid "reuse and edit message from specified commit"
-msgstr "belirtilen gönderinin iletisini düzenle ve yeniden kullan"
-
#: builtin/commit.c:1503
-msgid "reuse message from specified commit"
-msgstr "belirtilen gönderinin iletisini yeniden kullan"
+msgid "override date for commit"
+msgstr "işleme tarihini geçersiz kıl"
-#: builtin/commit.c:1504
-msgid "use autosquash formatted message to fixup specified commit"
-msgstr ""
-"belirtilen gönderiyi düzeltmek için kendiliğinden tıkıştırma tarafından "
-"biçimlendirilen iletiyi kullan"
+#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507
+#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:90
+msgid "commit"
+msgstr "işleme"
#: builtin/commit.c:1505
-msgid "use autosquash formatted message to squash specified commit"
-msgstr ""
-"belirtilen gönderiyi tıkıştırmak için kendiliğinden tıkıştırma tarafından "
-"biçimlendirilen iletiyi kullan"
+msgid "reuse and edit message from specified commit"
+msgstr "belirtilen işlemenin iletisini düzenle ve yeniden kullan"
#: builtin/commit.c:1506
-msgid "the commit is authored by me now (used with -C/-c/--amend)"
-msgstr ""
-"gönderinin yazarı şu andan itibaren benim (-C/-c/--amend ile kullanıldı)"
+msgid "reuse message from specified commit"
+msgstr "belirtilen işlemenin iletisini yeniden kullan"
-#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290
-#: builtin/pull.c:144 builtin/revert.c:110
-msgid "add Signed-off-by:"
-msgstr "Signed-off-by: ekle"
+#: builtin/commit.c: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:1743 builtin/merge.c:302
+#: builtin/pull.c:145 builtin/revert.c:110
+msgid "add a Signed-off-by trailer"
+msgstr "bir Signed-off-by artbilgisi ekle"
+
+#: builtin/commit.c:1511
msgid "use specified template file"
msgstr "belirtilen şablon dosyasını kullan"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1512
msgid "force edit of commit"
-msgstr "gönderiyi zorla düzenle"
+msgstr "işlemeyi zorla düzenle"
-#: builtin/commit.c:1511
+#: builtin/commit.c:1514
msgid "include status in commit message template"
-msgstr "gönderi iletisi şablonunda durumu içer"
+msgstr "işleme iletisi şablonunda durumu içer"
-#: builtin/commit.c:1516
+#: builtin/commit.c:1519
msgid "Commit contents options"
-msgstr "Gönderi içeriği seçenekleri"
+msgstr "İşleme içeriği seçenekleri"
-#: builtin/commit.c:1517
+#: builtin/commit.c:1520
msgid "commit all changed files"
msgstr "değiştirilen tüm dosyaları gönder"
-#: builtin/commit.c:1518
+#: builtin/commit.c:1521
msgid "add specified files to index for commit"
-msgstr "belirtilen dosyaları gönderi için indekse ekle"
+msgstr "belirtilen dosyaları işleme için indekse ekle"
-#: builtin/commit.c:1519
+#: builtin/commit.c:1522
msgid "interactively add files"
msgstr "dosyaları etkileşimli olarak ekle"
-#: builtin/commit.c:1520
+#: builtin/commit.c:1523
msgid "interactively add changes"
msgstr "değişiklikleri etkileşimli olarak ekle"
-#: builtin/commit.c:1521
+#: builtin/commit.c:1524
msgid "commit only specified files"
msgstr "yalnızca belirtilen dosyaları gönder"
-#: builtin/commit.c:1522
+#: builtin/commit.c:1525
msgid "bypass pre-commit and commit-msg hooks"
msgstr "pre-commit ve commit-msg kancalarını atla"
-#: builtin/commit.c:1523
+#: builtin/commit.c:1526
msgid "show what would be committed"
-msgstr "neyin gönderileceğini göster"
+msgstr "neyin işleneceğini göster"
-#: builtin/commit.c:1536
+#: builtin/commit.c:1539
msgid "amend previous commit"
-msgstr "önceki gönderiyi değiştir"
+msgstr "önceki işlemeyi değiştir"
-#: builtin/commit.c:1537
+#: builtin/commit.c:1540
msgid "bypass post-rewrite hook"
msgstr "post-rewrite kancasını atla"
-#: builtin/commit.c:1544
+#: builtin/commit.c:1547
msgid "ok to record an empty change"
msgstr "boş bir değişikliğin kaydı yazılabilir"
-#: builtin/commit.c:1546
+#: 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:1619
+#: builtin/commit.c:1622
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Hasar görmüş MERGE_HEAD dosyası (%s)"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1629
msgid "could not read MERGE_MODE"
msgstr "MERGE_MODE okunamadı"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1650
#, c-format
msgid "could not read commit message: %s"
-msgstr "gönderi iletisi okunamadı: %s"
-
-#: builtin/commit.c:1652
-#, c-format
-msgid "Aborting commit due to empty commit message.\n"
-msgstr "Gönderi iletisinin boş olması nedeniyle gönderi iptal ediliyor.\n"
+msgstr "işleme iletisi okunamadı: %s"
#: builtin/commit.c:1657
#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
-msgstr "Gönderi iptal ediliyor; iletiyi düzenlemediniz.\n"
+msgid "Aborting commit due to empty commit message.\n"
+msgstr "İşleme iletisinin boş olmasından dolayı iptal ediliyor.\n"
-#: builtin/commit.c:1691
+#: 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"
+"Depo güncellendi; ancak new_index dosyası yazılamıyor.\n"
"Diskin dolu olup olmadığını ve kotanızı aşıp aşmadığınızı denetleyin,\n"
"sonra kurtarmak için \"git restore --staged :/\" kullanın."
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:17
-msgid ""
-"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
-msgstr ""
-"git commit-graph verify [--object-dir <nsndzn>] [--shallow] [--[no-]progress]"
-
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:22
-msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
-msgstr ""
-"git commit-graph write [--object-dir <nsndzn>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <bölüm-sçnklr>"
-
-#: builtin/commit-graph.c:52
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "'%s' ile eşleşen nesne dizini bulunamadı"
-
-#: builtin/commit-graph.c:68 builtin/commit-graph.c:125
-#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657
-msgid "dir"
-msgstr "dizin"
-
-#: builtin/commit-graph.c:69 builtin/commit-graph.c:126
-#: builtin/commit-graph.c:211
-msgid "The object directory to store the graph"
-msgstr "Grafiğin depolanacağı nesne dizini"
-
-#: builtin/commit-graph.c:71
-msgid "if the commit-graph is split, only verify the tip file"
-msgstr "commit-graph parçalara bölünmüşse yalnızca uç dosyayı doğrula"
-
-#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23
-#, c-format
-msgid "Could not open commit-graph '%s'"
-msgstr "commit-graph '%s' açılamadı"
-
-#: builtin/commit-graph.c:128
-msgid "start walk at all refs"
-msgstr "tüm başvurularda gezinmeyi başlat"
-
-#: builtin/commit-graph.c:130
-msgid "scan pack-indexes listed by stdin for commits"
-msgstr "stdin tarafından listelenen paket indekslerini tara"
-
-#: builtin/commit-graph.c:132
-msgid "start walk at commits listed by stdin"
-msgstr "stdin tarafından listelenen tüm gönderilerde gezinmeyi başlat"
-
-#: builtin/commit-graph.c:134
-msgid "include all commits already in the commit-graph file"
-msgstr "halihazırda commit-graph dosyasında bulunan tüm gönderileri içer"
-
-#: builtin/commit-graph.c:137
-msgid "allow writing an incremental commit-graph file"
-msgstr "artan bir commit-graph dosyasının yazımına izin ver"
-
-#: builtin/commit-graph.c:139 builtin/commit-graph.c:143
-msgid "maximum number of commits in a non-base split commit-graph"
-msgstr ""
-"bir temel olmayan parçalara bölünmüş commit-graph içinde en çok olabilecek "
-"gönderi sayısı"
-
-#: builtin/commit-graph.c:141
-msgid "maximum ratio between two levels of a split commit-graph"
-msgstr ""
-"bölünmüş bir commit-graph'ın iki düzeyi arasında olabilecek en büyük oran"
-
-#: builtin/commit-graph.c:159
-msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
-msgstr ""
-"--reachable, --stdin-commits veya --stdin-packs'ten en çok birini kullan"
-
#: builtin/config.c:11
msgid "git config [<options>]"
msgstr "git config [<seçenekler>]"
-#: builtin/config.c:104 builtin/env--helper.c:23
+#: builtin/config.c:109 builtin/env--helper.c:27
#, c-format
msgid "unrecognized --type argument, %s"
-msgstr "tanımlanamayan --type değişkeni, %s"
+msgstr "tanımlanamayan --type argümanı, %s"
-#: builtin/config.c:116
+#: builtin/config.c:121
msgid "only one type at a time"
msgstr "bir kerede yalnızca bir tür"
-#: builtin/config.c:125
+#: builtin/config.c:130
msgid "Config file location"
msgstr "Yapılandırma dosyası konumu"
-#: builtin/config.c:126
+#: builtin/config.c:131
msgid "use global config file"
msgstr "global yapılandırma dosyası kullan"
-#: builtin/config.c:127
+#: builtin/config.c:132
msgid "use system config file"
msgstr "sistem yapılandırma dosyası kullan"
-#: builtin/config.c:128
+#: builtin/config.c:133
msgid "use repository config file"
msgstr "depo yapılandırma dosyası kullan"
-#: builtin/config.c:129
+#: builtin/config.c:134
msgid "use per-worktree config file"
msgstr "her çalışma ağacına özel bir yapılandırma dosyası kullan"
-#: builtin/config.c:130
+#: builtin/config.c:135
msgid "use given config file"
msgstr "verilen yapılandırma dosyasını kullan"
-#: builtin/config.c:131
+#: builtin/config.c:136
msgid "blob-id"
msgstr "ikili nesne numarası"
-#: builtin/config.c:131
+#: builtin/config.c:136
msgid "read config from given blob object"
msgstr "verilen ikili nesneden yapılandırmayı oku"
-#: builtin/config.c:132
+#: builtin/config.c:137
msgid "Action"
msgstr "Eylem"
-#: builtin/config.c:133
-msgid "get value: name [value-regex]"
-msgstr "değer al: ad [düzenli ifade değeri]"
+#: builtin/config.c:138
+msgid "get value: name [value-pattern]"
+msgstr "değer al: ad [değer-dizgisi]"
-#: builtin/config.c:134
-msgid "get all values: key [value-regex]"
-msgstr "tüm değerleri al: anahtar [düzenli ifade değeri]"
+#: builtin/config.c:139
+msgid "get all values: key [value-pattern]"
+msgstr "tüm değerleri al: anahtar [değer-dizgisi]"
-#: builtin/config.c:135
-msgid "get values for regexp: name-regex [value-regex]"
-msgstr ""
-"düzenli ifade için değerleri al: düzenli ifade adı [düzenli ifade değeri]"
+#: builtin/config.c:140
+msgid "get values for regexp: name-regex [value-pattern]"
+msgstr "düzenli ifade için değerleri al: düzenli ifade adı [değer-dizgisi]"
-#: builtin/config.c:136
+#: builtin/config.c:141
msgid "get value specific for the URL: section[.var] URL"
msgstr "URL için özel olan değeri al: bölüm[.var] URL"
-#: builtin/config.c:137
-msgid "replace all matching variables: name value [value_regex]"
-msgstr "tüm eşleşen değişkenleri değiştir: ad değer [düzenli ifade değeri]"
+#: builtin/config.c:142
+msgid "replace all matching variables: name value [value-pattern]"
+msgstr "tüm eşleşen değişkenleri değiştir: ad değer [değer-dizgisi]"
-#: builtin/config.c:138
+#: builtin/config.c:143
msgid "add a new variable: name value"
msgstr "yeni bir değişken ekle: ad değer"
-#: builtin/config.c:139
-msgid "remove a variable: name [value-regex]"
-msgstr "bir değişken kaldır: ad [düzenli ifade değeri]"
+#: builtin/config.c:144
+msgid "remove a variable: name [value-pattern]"
+msgstr "bir değişken kaldır: ad [değer-dizgisi]"
-#: builtin/config.c:140
-msgid "remove all matches: name [value-regex]"
-msgstr "tüm eşleşmeleri kaldır: ad [düzenli ifade değeri]"
+#: builtin/config.c:145
+msgid "remove all matches: name [value-pattern]"
+msgstr "tüm eşleşmeleri kaldır: ad [değer-dizgisi]"
-#: builtin/config.c:141
+#: builtin/config.c:146
msgid "rename section: old-name new-name"
msgstr "bölümü yeniden adlandır: eski_ad yeni_ad"
-#: builtin/config.c:142
+#: builtin/config.c:147
msgid "remove a section: name"
msgstr "bir bölümü kaldır: ad"
-#: builtin/config.c:143
+#: builtin/config.c:148
msgid "list all"
msgstr "tümünü listele"
-#: builtin/config.c:144
+#: builtin/config.c:149
+msgid "use string equality when comparing values to 'value-pattern'"
+msgstr "değerleri 'değer-dizgisi' ile karşılaştırırken dizi eşitliği kullan"
+
+#: builtin/config.c:150
msgid "open an editor"
msgstr "bir düzenleyici aç"
-#: builtin/config.c:145
+#: builtin/config.c:151
msgid "find the color configured: slot [default]"
msgstr "yapılandırılan rengi bul: yuva [öntanımlı]"
-#: builtin/config.c:146
+#: builtin/config.c:152
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "renk ayarını bul: yuva [stdout tty]"
-#: builtin/config.c:147
+#: builtin/config.c:153
msgid "Type"
msgstr "Tür"
-#: builtin/config.c:148 builtin/env--helper.c:38
+#: builtin/config.c:154 builtin/env--helper.c:43
msgid "value is given this type"
msgstr "değer bu türde verildi"
-#: builtin/config.c:149
+#: builtin/config.c:155
msgid "value is \"true\" or \"false\""
msgstr "değer \"true\" (doğru) veya \"false\" (yanlış)"
-#: builtin/config.c:150
+#: builtin/config.c:156
msgid "value is decimal number"
msgstr "değer ondalık sayı"
-#: builtin/config.c:151
+#: builtin/config.c:157
msgid "value is --bool or --int"
msgstr "değer --bool veya --int"
-#: builtin/config.c:152
+#: builtin/config.c:158
+msgid "value is --bool or string"
+msgstr "değer --bool veya dizi"
+
+#: builtin/config.c:159
msgid "value is a path (file or directory name)"
msgstr "değer bir yol (dosya veya dizin adı)"
-#: builtin/config.c:153
+#: builtin/config.c:160
msgid "value is an expiry date"
msgstr "değer bir son kullanım tarihi"
-#: builtin/config.c:154
+#: builtin/config.c:161
msgid "Other"
msgstr "Diğer"
-#: builtin/config.c:155
+#: builtin/config.c:162
msgid "terminate values with NUL byte"
msgstr "değerleri NUL baytı ile sonlandır"
-#: builtin/config.c:156
+#: builtin/config.c:163
msgid "show variable names only"
msgstr "yalnızca değişken adlarını göster"
-#: builtin/config.c:157
+#: builtin/config.c:164
msgid "respect include directives on lookup"
msgstr "arama sırasında içerme yönergelerine uy"
-#: builtin/config.c:158
+#: builtin/config.c:165
msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
"yapılandırmanın kökenini göster (dosya, stdin, ikili nesne, komut satırı)"
-#: builtin/config.c:159
+#: builtin/config.c:166
msgid "show scope of config (worktree, local, global, system, command)"
msgstr ""
"yapılandırmanın kapsamını göster (çalışma ağacı, yerel, global, sistem, "
"komut)"
-#: builtin/config.c:160 builtin/env--helper.c:40
+#: builtin/config.c:167 builtin/env--helper.c:45
msgid "value"
msgstr "değer"
-#: builtin/config.c:160
+#: builtin/config.c:167
msgid "with --get, use default value when missing entry"
msgstr "--get ile girdi verilmemişse öntanımlı değeri kullan"
-#: builtin/config.c:174
+#: builtin/config.c:181
#, c-format
msgid "wrong number of arguments, should be %d"
-msgstr "yanlış değişken sayısı, %d olmalı"
+msgstr "yanlış argüman sayısı, %d olmalı"
-#: builtin/config.c:176
+#: builtin/config.c:183
#, 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ı"
+msgstr "yanlış argüman sayısı, %d ile %d arasında olmalı"
-#: builtin/config.c:324
+#: builtin/config.c:339
#, c-format
msgid "invalid key pattern: %s"
msgstr "geçersiz anahtar dizgisi: %s"
-#: builtin/config.c:360
+#: builtin/config.c:377
#, c-format
msgid "failed to format default config value: %s"
msgstr "öntanımlı yapılandırma değeri biçimlendirilemedi: %s"
-#: builtin/config.c:417
+#: builtin/config.c:441
#, c-format
msgid "cannot parse color '%s'"
msgstr "renk ayrıştırılamıyor: '%s'"
-#: builtin/config.c:459
+#: builtin/config.c:483
msgid "unable to parse default color value"
msgstr "öntanımlı renk değeri ayrıştırılamıyor"
-#: builtin/config.c:512 builtin/config.c:768
+#: builtin/config.c:536 builtin/config.c:833
msgid "not in a git directory"
msgstr "bir git dizininde değil"
-#: builtin/config.c:515
+#: builtin/config.c:539
msgid "writing to stdin is not supported"
msgstr "stdin'e yazma desteklenmiyor"
-#: builtin/config.c:518
+#: builtin/config.c:542
msgid "writing config blobs is not supported"
msgstr "yapılandırma ikili nesneleri yazımı desteklenmiyor"
-#: builtin/config.c:603
+#: builtin/config.c:627
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -13177,23 +14009,27 @@
"#\tad = %s\n"
"#\te-posta = %s\n"
-#: builtin/config.c:627
+#: builtin/config.c:652
msgid "only one config file at a time"
msgstr "bir kerede yalnızca bir yapılandırma dosyası"
-#: builtin/config.c:632
+#: builtin/config.c:658
msgid "--local can only be used inside a git repository"
msgstr "--local yalnızca bir git deposu içinde kullanılabilir"
-#: builtin/config.c:635
+#: builtin/config.c:660
msgid "--blob can only be used inside a git repository"
msgstr "--blob yalnızca bir git deposu içinde kullanılabilir"
-#: builtin/config.c:655
+#: builtin/config.c:662
+msgid "--worktree can only be used inside a git repository"
+msgstr "--worktree yalnızca bir git deposu içinde kullanılabilir"
+
+#: builtin/config.c:684
msgid "$HOME not set"
msgstr "$HOME ayarlanmamış"
-#: builtin/config.c:679
+#: builtin/config.c:708
msgid ""
"--worktree cannot be used with multiple working trees unless the config\n"
"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -13203,19 +14039,19 @@
"sürece birden çok çalışma ağacı ile birlikte kullanılamaz. Ayrıntılar için\n"
"lütfen \"git help worktree\" içindeki \"CONFIGURATION FILE\" bölümünü okuyun."
-#: builtin/config.c:714
+#: builtin/config.c:743
msgid "--get-color and variable type are incoherent"
msgstr "--get-color ve değişken türü tutarsız"
-#: builtin/config.c:719
+#: builtin/config.c:748
msgid "only one action at a time"
msgstr "bir kerede yalnızca bir eylem"
-#: builtin/config.c:732
+#: builtin/config.c:761
msgid "--name-only is only applicable to --list or --get-regexp"
msgstr "--name-only yalnızca şunlara uygulanabilir: --list, --get-regexp"
-#: builtin/config.c:738
+#: builtin/config.c:767
msgid ""
"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
"list"
@@ -13223,33 +14059,37 @@
"--show-origin yalnızca şunlara uygulanabilir: --get, --get-all, --get-regexp "
"ve --list"
-#: builtin/config.c:744
+#: builtin/config.c:773
msgid "--default is only applicable to --get"
msgstr "--default yalnızca şuna uygulanabilir: --get"
-#: builtin/config.c:757
+#: builtin/config.c:806
+msgid "--fixed-value only applies with 'value-pattern'"
+msgstr "--fixed-value yalnızca 'değer-dizgisi' ile uygulanır"
+
+#: builtin/config.c:822
#, c-format
msgid "unable to read config file '%s'"
msgstr "'%s' yapılandırma dosyası okunamıyor"
-#: builtin/config.c:760
+#: builtin/config.c:825
msgid "error processing config file(s)"
msgstr "yapılandırma dosyaları işlenirken hata"
-#: builtin/config.c:770
+#: builtin/config.c:835
msgid "editing stdin is not supported"
msgstr "stdin'i düzenleme desteklenmiyor"
-#: builtin/config.c:772
+#: builtin/config.c:837
msgid "editing blobs is not supported"
msgstr "ikili nesneleri düzenleme desteklenmiyor"
-#: builtin/config.c:786
+#: builtin/config.c:851
#, c-format
msgid "cannot create configuration file %s"
msgstr "%s yapılandırma dosyası oluşturulamıyor"
-#: builtin/config.c:799
+#: builtin/config.c:864
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -13259,7 +14099,7 @@
" %s değerini değiştirmek için bir düzenli ifade, --add veya --replace-"
"all kullanın."
-#: builtin/config.c:873 builtin/config.c:884
+#: builtin/config.c:943 builtin/config.c:954
#, c-format
msgid "no such section: %s"
msgstr "böyle bir bölüm yok: %s"
@@ -13272,58 +14112,83 @@
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/credential-store.c:66
+#, c-format
+msgid "unable to get credential storage lock in %d ms"
+msgstr "kimlik depo kilidi %d ms içinde alınamadı"
+
#: builtin/describe.c:26
msgid "git describe [<options>] [<commit-ish>...]"
-msgstr "git describe [<seçenekler>] [<gönderimsi>...]"
+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:62
+#: builtin/describe.c:63
msgid "head"
msgstr "dal ucu"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "lightweight"
msgstr "hafif"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "annotated"
msgstr "ek açıklamalı"
-#: builtin/describe.c:275
+#: builtin/describe.c:277
#, c-format
msgid "annotated tag %s not available"
msgstr "%s ek açıklamalı etiketi mevcut değil"
-#: builtin/describe.c:279
-#, c-format
-msgid "annotated tag %s has no embedded name"
-msgstr "%s ek açıklamalı etiketinde gömülü ad yok"
-
#: builtin/describe.c:281
#, c-format
-msgid "tag '%s' is really '%s' here"
-msgstr "'%s' etiketi gerçekte burada '%s'"
+msgid "tag '%s' is externally known as '%s'"
+msgstr "'%s' etiketi dışarıda '%s' olarak biliniyor"
-#: builtin/describe.c:325
+#: 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:327
+#: 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:394
+#: builtin/describe.c:397
#, c-format
msgid "finished search at %s\n"
msgstr "arama şurada bitirildi: %s\n"
-#: builtin/describe.c:421
+#: builtin/describe.c:424
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -13332,7 +14197,7 @@
"Hiçbir ek açıklamalı etiket şunu betimleyemiyor: '%s'.\n"
"Bunun yanında ek açıklaması olmayan etiketler vardı, --tags deneyin."
-#: builtin/describe.c:425
+#: builtin/describe.c:428
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -13341,12 +14206,12 @@
"Şunu hiçbir etiket betimleyemez: '%s'.\n"
"--always deneyin veya birkaç etiket oluşturun."
-#: builtin/describe.c:455
+#: builtin/describe.c:458
#, c-format
msgid "traversed %lu commits\n"
-msgstr "%lu gönderi katedildi\n"
+msgstr "%lu işleme katedildi\n"
-#: builtin/describe.c:458
+#: builtin/describe.c:461
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -13355,125 +14220,143 @@
"%i etiketten fazla etiket bulundu; en son %i listelendi\n"
"şu konumda arama bırakıldı: %s\n"
-#: builtin/describe.c:526
+#: builtin/describe.c:529
#, c-format
msgid "describe %s\n"
msgstr "şunu tanımla: %s\n"
-#: builtin/describe.c:529
+#: 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:537
+#: builtin/describe.c:540
#, c-format
msgid "%s is neither a commit nor blob"
-msgstr "%s ne bir gönderi ne de ikili nesne"
+msgstr "%s ne bir işleme ne de ikili nesne"
-#: builtin/describe.c:551
+#: builtin/describe.c:554
msgid "find the tag that comes after the commit"
-msgstr "gönderinin ardından gelen etiketi bul"
+msgstr "işlemenin ardından gelen etiketi bul"
-#: builtin/describe.c:552
+#: builtin/describe.c:555
msgid "debug search strategy on stderr"
msgstr "stderr'deki arama stratejisini ayıkla"
-#: builtin/describe.c:553
+#: builtin/describe.c:556
msgid "use any ref"
msgstr "herhangi bir başvuruyu kullan"
-#: builtin/describe.c:554
+#: builtin/describe.c:557
msgid "use any tag, even unannotated"
msgstr "herhangi bir etiketi kullan, ek açıklaması olmasa bile"
-#: builtin/describe.c:555
+#: builtin/describe.c:558
msgid "always use long format"
msgstr "her zaman uzun biçimi kullan"
-#: builtin/describe.c:556
+#: builtin/describe.c:559
msgid "only follow first parent"
msgstr "yalnızca ilk üst ögeyi izle"
-#: builtin/describe.c:559
+#: builtin/describe.c:562
msgid "only output exact matches"
msgstr "yalnızca kesin eşleşmeleri çıktı ver"
-#: builtin/describe.c:561
+#: 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:563
+#: builtin/describe.c:566
msgid "only consider tags matching <pattern>"
msgstr "yalnızca <dizgi> ile eşleşen etiketleri dikkate al"
-#: builtin/describe.c:565
+#: builtin/describe.c:568
msgid "do not consider tags matching <pattern>"
msgstr "<dizgi> ile eşleşen etiketleri dikkate alma"
-#: builtin/describe.c:567 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:535
msgid "show abbreviated commit object as fallback"
-msgstr "kısaltılmış gönderi nesnesini geri çekilinecek nesne olarak göster"
+msgstr "kısaltılmış işleme nesnesini geri çekilinecek nesne olarak göster"
-#: builtin/describe.c:568 builtin/describe.c:571
+#: builtin/describe.c:571 builtin/describe.c:574
msgid "mark"
msgstr "im"
-#: builtin/describe.c:569
+#: 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:572
+#: 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:590
+#: builtin/describe.c:593
msgid "--long is incompatible with --abbrev=0"
msgstr "--long, --abbrev=0 ile uyumsuz"
-#: builtin/describe.c:619
+#: builtin/describe.c:622
msgid "No names found, cannot describe anything."
msgstr "Hiçbir ad bulunamadı, hiçbir şey betimlenemiyor."
-#: builtin/describe.c:670
+#: builtin/describe.c:673
msgid "--dirty is incompatible with commit-ishes"
-msgstr "--dirty, gönderimsilerle uyumsuz"
+msgstr "--dirty, işlememsilerle uyumsuz"
-#: builtin/describe.c:672
+#: builtin/describe.c:675
msgid "--broken is incompatible with commit-ishes"
-msgstr "--broken, gönderimsilerle uyumsuz"
+msgstr "--broken, işlememsilerle uyumsuz"
-#: builtin/diff.c:84
+#: builtin/diff-tree.c:155
+msgid "--stdin and --merge-base are mutually exclusive"
+msgstr "--stdin ve --merge-base birlikte kullanılamaz"
+
+#: builtin/diff-tree.c:157
+msgid "--merge-base only works with two commits"
+msgstr "--merge-base yalnızca iki işleme ile kullanılabilir"
+
+#: builtin/diff.c:92
#, c-format
msgid "'%s': not a regular file or symlink"
msgstr "'%s': Sıradan bir dosya veya sembolik bağ değil"
-#: builtin/diff.c:235
+#: builtin/diff.c:259
#, c-format
msgid "invalid option: %s"
msgstr "geçersiz seçenek: %s"
-#: builtin/diff.c:350
+#: builtin/diff.c:376
+#, c-format
+msgid "%s...%s: no merge base"
+msgstr "%s...%s: birleştirme temeli yok"
+
+#: builtin/diff.c:486
msgid "Not a git repository"
msgstr "Bir git deposu değil"
-#: builtin/diff.c:394
+#: builtin/diff.c:532 builtin/grep.c:682
#, c-format
msgid "invalid object '%s' given."
msgstr "geçersiz nesne '%s' verildi"
-#: builtin/diff.c:403
+#: builtin/diff.c:543
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "ikiden çok ikili nesne verildi: '%s'"
-#: builtin/diff.c:408
+#: builtin/diff.c:548
#, c-format
msgid "unhandled object '%s' given."
msgstr "ele alınmayan nesne '%s' verildi"
+#: builtin/diff.c:582
+#, 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>] [<gönderi> [<gönderi>]] [--] [<yol>...]"
+msgstr "git difftool [<seçenekler>] [<işleme> [<işleme>]] [--] [<yol>...]"
#: builtin/difftool.c:260
#, c-format
@@ -13495,7 +14378,7 @@
msgid "could not read object %s for symlink %s"
msgstr "%s nesnesi %s sembolik bağı için okunamadı"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:412
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
@@ -13503,53 +14386,53 @@
"Birleştirilmiş diff biçimleri (-c ve --cc) dizin diff kipinde\n"
"(-d ve --dir-diff) desteklenmiyor."
-#: builtin/difftool.c:634
+#: builtin/difftool.c:633
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "Her iki dosya da değiştirildi: '%s' ve '%s'."
-#: builtin/difftool.c:636
+#: builtin/difftool.c:635
msgid "working tree file has been left."
msgstr "Çalışma ağacı dosyası bırakıldı."
-#: builtin/difftool.c:647
+#: builtin/difftool.c:646
#, c-format
msgid "temporary files exist in '%s'."
msgstr "'%s' konumunda geçici dosyalar var."
-#: builtin/difftool.c:648
+#: builtin/difftool.c:647
msgid "you may want to cleanup or recover these."
msgstr "Bunları temizlemek veya kurtarmak isteyebilirsiniz."
-#: builtin/difftool.c:697
+#: builtin/difftool.c:696
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "'diff.tool' yerine 'diff.guitool' kullan"
-#: builtin/difftool.c:699
+#: builtin/difftool.c:698
msgid "perform a full-directory diff"
msgstr "bir tam dizin diff'i gerçekleştir"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:700
msgid "do not prompt before launching a diff tool"
msgstr "bir diff aracı çalıştırmadan önce sorma"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:705
msgid "use symlinks in dir-diff mode"
msgstr "dir-diff kipinde sembolik bağlar kullan"
-#: builtin/difftool.c:707
+#: builtin/difftool.c:706
msgid "tool"
msgstr "araç"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:707
msgid "use the specified diff tool"
msgstr "belirtilen diff aracını kullan"
-#: builtin/difftool.c:710
+#: builtin/difftool.c:709
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
+#: builtin/difftool.c:712
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
@@ -13557,31 +14440,31 @@
"ç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
+#: builtin/difftool.c:715
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
+#: builtin/difftool.c:716
msgid "passed to `diff`"
msgstr "'diff'e aktarıldı"
-#: builtin/difftool.c:732
+#: builtin/difftool.c:731
msgid "difftool requires worktree or --no-index"
msgstr "difftool, çalışma ağacı veya --no-index gerektiriyor"
-#: builtin/difftool.c:739
+#: builtin/difftool.c:738
msgid "--dir-diff is incompatible with --no-index"
msgstr "-dir-diff, --no-index ile uyumsuz"
-#: builtin/difftool.c:742
+#: builtin/difftool.c:741
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr "--gui, --tool ve --extcmd birlikte kullanılamaz"
-#: builtin/difftool.c:750
+#: builtin/difftool.c:749
msgid "no <tool> given for --tool=<tool>"
msgstr "--tool=<araç> için bir <araç> verilmedi"
-#: builtin/difftool.c:757
+#: builtin/difftool.c:756
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "--extcmd=<komut> için bir <komut> verilmedi"
@@ -13589,26 +14472,26 @@
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
msgstr "git env--helper --type=[bool|ulong] <seçenekler> <ortam-dğşkn>"
-#: builtin/env--helper.c:37 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:98
msgid "type"
msgstr "tür"
-#: builtin/env--helper.c:41
+#: 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:43
+#: 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:62
+#: 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:77
+#: builtin/env--helper.c:82
#, c-format
msgid ""
"option `--default' expects an unsigned long value with `--type=ulong`, not `"
@@ -13621,183 +14504,243 @@
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-opts]"
-#: builtin/fast-export.c:853
+#: 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:1152
+#: builtin/fast-export.c:1177
+msgid "--anonymize-map token cannot be empty"
+msgstr "--anonymize-map jetonu boş olamaz"
+
+#: builtin/fast-export.c:1197
msgid "show progress after <n> objects"
msgstr "<n> nesneden sonra ilerlemeyi göster"
-#: builtin/fast-export.c:1154
+#: builtin/fast-export.c:1199
msgid "select handling of signed tags"
-msgstr "imzalanan etiketlerin nasıl işleneceğini seçin"
+msgstr "imzalanan etiketlerin nasıl ele alınacağını seçin"
-#: builtin/fast-export.c:1157
+#: builtin/fast-export.c:1202
msgid "select handling of tags that tag filtered objects"
-msgstr "nesnelerce süzülen etiketlerin nasıl işleneceğini seçin"
+msgstr "nesnelerce süzülen etiketlerin nasıl ele alınacağını seçin"
-#: builtin/fast-export.c:1160
+#: builtin/fast-export.c:1205
msgid "select handling of commit messages in an alternate encoding"
-msgstr "başka bir kodlamaya iye gönderi iletilerinin nasıl işleneceğini seçin"
+msgstr ""
+"başka bir kodlamaya iye işleme iletilerinin nasıl ele alınacağını seçin"
-#: builtin/fast-export.c:1163
-msgid "Dump marks to this file"
+#: builtin/fast-export.c:1208
+msgid "dump marks to this file"
msgstr "imleri bu dosyaya boşalt"
-#: builtin/fast-export.c:1165
-msgid "Import marks from this file"
+#: builtin/fast-export.c:1210
+msgid "import marks from this file"
msgstr "imleri bu dosyadan içe aktar"
-#: builtin/fast-export.c:1169
-msgid "Import marks from this file if it exists"
+#: builtin/fast-export.c:1214
+msgid "import marks from this file if it exists"
msgstr "eğer varsa bu dosyadan imleri içe aktar"
-#: builtin/fast-export.c:1171
-msgid "Fake a tagger when tags lack one"
+#: builtin/fast-export.c:1216
+msgid "fake a tagger when tags lack one"
msgstr "etiketlerin bir etiketleyicisi yoksa varmış gibi davran"
-#: builtin/fast-export.c:1173
-msgid "Output full tree for each commit"
-msgstr "her gönderi için tüm ağacın çıktısını ver"
+#: builtin/fast-export.c:1218
+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:1175
-msgid "Use the done feature to terminate the stream"
+#: builtin/fast-export.c:1220
+msgid "use the done feature to terminate the stream"
msgstr "akışı sonlandırmak için 'done' özelliğini kullan"
-#: builtin/fast-export.c:1176
-msgid "Skip output of blob data"
+#: builtin/fast-export.c:1221
+msgid "skip output of blob data"
msgstr "ikili nesne verisi çıktısını atla"
-#: builtin/fast-export.c:1177 builtin/log.c:1705
+#: builtin/fast-export.c:1222 builtin/log.c:1815
msgid "refspec"
msgstr "başvuru belirteci"
-#: builtin/fast-export.c:1178
-msgid "Apply refspec to exported refs"
-msgstr "başvuru belirtecini dışa aktarılan başvurulara aktar"
+#: builtin/fast-export.c:1223
+msgid "apply refspec to exported refs"
+msgstr "başvuru belirtecini dışa aktarılan başvurulara uygula"
-#: builtin/fast-export.c:1179
+#: builtin/fast-export.c:1224
msgid "anonymize output"
msgstr "çıktı kimliğini gizle"
-#: builtin/fast-export.c:1181
-msgid "Reference parents which are not in fast-export stream by object id"
+#: builtin/fast-export.c:1225
+msgid "from:to"
+msgstr "kimden:kime"
+
+#: builtin/fast-export.c:1226
+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:1229
+msgid "reference parents which are not in fast-export stream by object id"
msgstr "'fast-export' akışında olmayan üst ögelere nesne numarası ile başvur"
-#: builtin/fast-export.c:1183
-msgid "Show original object ids of blobs/commits"
-msgstr "ikili nesnelerin/gönderilerin orijinal nesne numaralarını göster"
+#: builtin/fast-export.c:1231
+msgid "show original object ids of blobs/commits"
+msgstr "ikili nesnelerin/işlemelerin orijinal nesne numaralarını göster"
-#: builtin/fast-export.c:1185
-msgid "Label tags with mark ids"
+#: builtin/fast-export.c:1233
+msgid "label tags with mark ids"
msgstr "etiketleri im numaralarıyla adlandır"
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1256
+msgid "--anonymize-map without --anonymize does not make sense"
+msgstr "--anonymize-map, --anonymize olmadan bir anlam ifade etmiyor"
+
+#: builtin/fast-export.c:1271
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
msgstr "Hem --import-marks ve hem --import-marks-if-exists aktarılamadı"
-#: builtin/fetch.c:34
+#: builtin/fast-import.c:3088
+#, c-format
+msgid "Missing from marks for submodule '%s'"
+msgstr "'%s' altmodülü için '(on)-dan' imleri eksik"
+
+#: builtin/fast-import.c:3090
+#, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr "'%s' altmodülü için '(o)-na' imleri eksik"
+
+#: builtin/fast-import.c:3225
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr "'mark' komutu bekleniyordu, %s alındı"
+
+#: builtin/fast-import.c:3230
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr "'to' komutu bekleniyordu, %s alındı"
+
+#: builtin/fast-import.c:3322
+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:3377
+#, 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:242
+#, 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:35
+#: builtin/fetch.c:36
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<seçenekler>] <grup>"
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<seçenekler>] [(<depo> | <grup>)...]"
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<seçenekler>]"
-#: builtin/fetch.c:116
+#: builtin/fetch.c:120
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel negatif olamaz"
-#: builtin/fetch.c:139 builtin/pull.c:184
+#: builtin/fetch.c:143 builtin/pull.c:185
msgid "fetch from all remotes"
msgstr "tüm uzak konumlardan getir"
-#: builtin/fetch.c:141 builtin/pull.c:228
+#: builtin/fetch.c:145 builtin/pull.c:245
msgid "set upstream for git pull/fetch"
msgstr "git pull/fetch için üstkaynak ayarla"
-#: builtin/fetch.c:143 builtin/pull.c:187
+#: builtin/fetch.c:147 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:145 builtin/pull.c:190
+#: builtin/fetch.c:149
+msgid "use atomic transaction to update references"
+msgstr "başvuruları güncellemek için atomsal işlem kullan"
+
+#: builtin/fetch.c:151 builtin/pull.c:191
msgid "path to upload pack on remote end"
msgstr "uzak uçtaki yükleme paketine olan yol"
-#: builtin/fetch.c:146
+#: builtin/fetch.c:152
msgid "force overwrite of local reference"
msgstr "yerel başvurunun üzerine zorla yaz"
-#: builtin/fetch.c:148
+#: builtin/fetch.c:154
msgid "fetch from multiple remotes"
msgstr "birden çok uzak konumdan getir"
-#: builtin/fetch.c:150 builtin/pull.c:194
+#: builtin/fetch.c:156 builtin/pull.c:195
msgid "fetch all tags and associated objects"
msgstr "tüm etiketleri ve ilişkilendirilen nesneleri getir"
-#: builtin/fetch.c:152
+#: builtin/fetch.c:158
msgid "do not fetch all tags (--no-tags)"
msgstr "tüm etiketleri getirme (--no-tags)"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:160
msgid "number of submodules fetched in parallel"
msgstr "paralelde getirilen altmodüllerin sayısı"
-#: builtin/fetch.c:156 builtin/pull.c:197
+#: builtin/fetch.c:162 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:158
+#: builtin/fetch.c:164
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr ""
"artık uzak konumda olmayan yerel etiketleri buda ve değiştirilen etiketleri "
"güncelle"
-#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121
+#: builtin/fetch.c:165 builtin/fetch.c:190 builtin/pull.c:122
msgid "on-demand"
msgstr "istek üzerine"
-#: builtin/fetch.c:160
+#: builtin/fetch.c:166
msgid "control recursive fetching of submodules"
msgstr "altmodüllerin özyineli getirilmesini denetle"
-#: builtin/fetch.c:164 builtin/pull.c:205
+#: builtin/fetch.c:171
+msgid "write fetched references to the FETCH_HEAD file"
+msgstr "getirilen başvuruları FETCH_HEAD dosyasına yaz"
+
+#: builtin/fetch.c:172 builtin/pull.c:206
msgid "keep downloaded pack"
msgstr "indirilen paketi tut"
-#: builtin/fetch.c:166
+#: builtin/fetch.c:174
msgid "allow updating of HEAD ref"
msgstr "HEAD başvurusunun güncellenmesine izin ver"
-#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208
+#: builtin/fetch.c:177 builtin/fetch.c:183 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:171
+#: builtin/fetch.c:179 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:177 builtin/pull.c:211
+#: builtin/fetch.c:185 builtin/pull.c:221
msgid "convert to a complete repository"
msgstr "tam bir depoya dönüştür"
-#: builtin/fetch.c:180
+#: builtin/fetch.c:188
msgid "prepend this to submodule path output"
msgstr "bunu altmodül yol çıktısının başına ekle"
-#: builtin/fetch.c:183
+#: builtin/fetch.c:191
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
@@ -13805,94 +14748,98 @@
"altmodüllerin özyineli getirilmesi için öntanımlı (yapılandırma "
"dosyalarından daha az önceliğe iye)"
-#: builtin/fetch.c:187 builtin/pull.c:214
+#: builtin/fetch.c:195 builtin/pull.c:224
msgid "accept refs that update .git/shallow"
msgstr ".git/shallow'u güncelleyen başvuruları kabul et"
-#: builtin/fetch.c:188 builtin/pull.c:216
+#: builtin/fetch.c:196 builtin/pull.c:226
msgid "refmap"
msgstr "ilgili başvuru"
-#: builtin/fetch.c:189 builtin/pull.c:217
+#: builtin/fetch.c:197 builtin/pull.c:227
msgid "specify fetch refmap"
msgstr "getirme ile ilgili başvuruları belirt"
-#: builtin/fetch.c:196
+#: builtin/fetch.c:204 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:199
-msgid "run 'gc --auto' after fetching"
-msgstr "getirme sonrasında 'gc --auto' çalıştır"
+#: builtin/fetch.c:207 builtin/fetch.c:209
+msgid "run 'maintenance --auto' after fetching"
+msgstr "getirme sonrasında 'maintenance --auto' çalıştır"
-#: builtin/fetch.c:201 builtin/pull.c:226
+#: builtin/fetch.c:211 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:203
+#: builtin/fetch.c:213
msgid "write the commit-graph after fetching"
-msgstr "getirdikten sonra gönderi grafiğini yaz"
+msgstr "getirdikten sonra işleme grafiğini yaz"
-#: builtin/fetch.c:513
+#: builtin/fetch.c:215
+msgid "accept refspecs from stdin"
+msgstr "başvuru belirteçlerini stdin'den oku"
+
+#: builtin/fetch.c:526
msgid "Couldn't find remote ref HEAD"
msgstr "Uzak HEAD başvurusu bulunamadı"
-#: builtin/fetch.c:653
+#: builtin/fetch.c:697
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "fetch.output yapılandırması geçersiz değer içeriyor: %s"
-#: builtin/fetch.c:751
+#: builtin/fetch.c:796
#, c-format
msgid "object %s not found"
msgstr "%s nesnesi bulunamadı"
-#: builtin/fetch.c:755
+#: builtin/fetch.c:800
msgid "[up to date]"
msgstr "[güncel]"
-#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
+#: builtin/fetch.c:813 builtin/fetch.c:829 builtin/fetch.c:901
msgid "[rejected]"
msgstr "[reddedildi]"
-#: builtin/fetch.c:769
+#: builtin/fetch.c:814
msgid "can't fetch in current branch"
msgstr "geçerli dalda getirme yapılamıyor"
-#: builtin/fetch.c:779
+#: builtin/fetch.c:824
msgid "[tag update]"
msgstr "[etiket güncellemesi]"
-#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839
-#: builtin/fetch.c:851
+#: builtin/fetch.c:825 builtin/fetch.c:862 builtin/fetch.c:884
+#: builtin/fetch.c:896
msgid "unable to update local ref"
msgstr "yerel başvuru güncellenemiyor"
-#: builtin/fetch.c:784
+#: builtin/fetch.c:829
msgid "would clobber existing tag"
msgstr "var olan etiketi değiştirecektir"
-#: builtin/fetch.c:806
+#: builtin/fetch.c:851
msgid "[new tag]"
msgstr "[yeni etiket]"
-#: builtin/fetch.c:809
+#: builtin/fetch.c:854
msgid "[new branch]"
msgstr "[yeni dal]"
-#: builtin/fetch.c:812
+#: builtin/fetch.c:857
msgid "[new ref]"
msgstr "[yeni başvuru]"
-#: builtin/fetch.c:851
+#: builtin/fetch.c:896
msgid "forced update"
msgstr "zorlanmış güncelleme"
-#: builtin/fetch.c:856
+#: builtin/fetch.c:901
msgid "non-fast-forward"
msgstr "ileri sarım değil"
-#: builtin/fetch.c:877
+#: builtin/fetch.c:1005
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"
@@ -13902,7 +14849,7 @@
"ancak bu denetleme kapatılmış. Yeniden açmak için --show-forced-updates\n"
"bayrağını kullanın veya 'git config fetch.showForcedUpdates true' çalıştırın."
-#: builtin/fetch.c:881
+#: builtin/fetch.c:1009
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
@@ -13914,22 +14861,22 @@
"kullanarak veya 'git config fetch.showForcedUpdates false' çalıştırarak\n"
"bu denetlemeden kaçınabilirsiniz.\n"
-#: builtin/fetch.c:920
+#: builtin/fetch.c:1041
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s tüm gerekli nesneleri göndermedi\n"
-#: builtin/fetch.c:941
+#: builtin/fetch.c:1069
#, 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"
+msgstr "%s reddedilmeli; çünkü sığ köklerin güncellenmesine izin verilmiyor"
-#: builtin/fetch.c:1026 builtin/fetch.c:1164
+#: builtin/fetch.c:1146 builtin/fetch.c:1297
#, c-format
msgid "From %.*s\n"
-msgstr "Şuradan: %.*s\n"
+msgstr "Şu konumdan: %.*s\n"
-#: builtin/fetch.c:1037
+#: builtin/fetch.c:1168
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -13938,56 +14885,56 @@
"bazı yerel başvurular güncellenemedi; 'git remote prune %s'\n"
"kullanarak eski ve çakışan dalları kaldırmayı deneyin"
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1267
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s sarkacak)"
-#: builtin/fetch.c:1135
+#: builtin/fetch.c:1268
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s sarkmaya başladı)"
-#: builtin/fetch.c:1167
+#: builtin/fetch.c:1300
msgid "[deleted]"
msgstr "[silindi]"
-#: builtin/fetch.c:1168 builtin/remote.c:1112
+#: builtin/fetch.c:1301 builtin/remote.c:1118
msgid "(none)"
-msgstr "(yok)"
+msgstr "(hiçbiri)"
-#: builtin/fetch.c:1191
+#: builtin/fetch.c:1324
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Çıplak olmayan deponun geçerli %s dalına getirme reddediliyor"
-#: builtin/fetch.c:1210
+#: builtin/fetch.c:1343
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "\"%s\" seçeneği \"%s\" değeri %s için geçerli değil"
-#: builtin/fetch.c:1213
+#: builtin/fetch.c:1346
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "\"%s\" seçeneği %s için yok sayılıyor\n"
-#: builtin/fetch.c:1421
+#: builtin/fetch.c:1558
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "birden çok dal algılandı, --set-upstream ile uyumsuz"
-#: builtin/fetch.c:1436
+#: builtin/fetch.c:1573
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "bir uzak konum uzak izleme dalı için üstkaynak ayarlanmıyor"
-#: builtin/fetch.c:1438
+#: builtin/fetch.c:1575
msgid "not setting upstream for a remote tag"
msgstr "bir uzak konum etiketi için üstkaynak ayarlanmıyor"
-#: builtin/fetch.c:1440
+#: builtin/fetch.c:1577
msgid "unknown branch type"
msgstr "bilinmeyen dal türü"
-#: builtin/fetch.c:1442
+#: builtin/fetch.c:1579
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
@@ -13995,22 +14942,22 @@
"Kaynak dal bulunamadı.\n"
"--set-upstream-option ile tam olarak bir dal belirtmeniz gerekiyor."
-#: builtin/fetch.c:1568 builtin/fetch.c:1631
+#: builtin/fetch.c:1708 builtin/fetch.c:1771
#, c-format
msgid "Fetching %s\n"
msgstr "%s getiriliyor\n"
-#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101
+#: builtin/fetch.c:1718 builtin/fetch.c:1773 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr "%s getirilemedi"
-#: builtin/fetch.c:1590
+#: builtin/fetch.c:1730
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "'%s' getirilemedi (çıkış kodu: %d)\n"
-#: builtin/fetch.c:1693
+#: builtin/fetch.c:1834
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -14018,45 +14965,45 @@
"Bir uzak dal belirtilmedi. Lütfen yeni revizyonların\n"
"alınacağı bir URL veya uzak konum adı belirtin."
-#: builtin/fetch.c:1730
+#: builtin/fetch.c:1870
msgid "You need to specify a tag name."
msgstr "Bir etiket adı belirtmeniz gerekiyor."
-#: builtin/fetch.c:1780
+#: builtin/fetch.c:1935
msgid "Negative depth in --deepen is not supported"
msgstr "--deepen için negatif derinlik desteklenmiyor"
-#: builtin/fetch.c:1782
+#: builtin/fetch.c:1937
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen ve --depth birlikte kullanılamaz"
-#: builtin/fetch.c:1787
+#: builtin/fetch.c:1942
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth ve --unshallow birlikte kullanılamaz"
-#: builtin/fetch.c:1789
+#: builtin/fetch.c:1944
msgid "--unshallow on a complete repository does not make sense"
msgstr "tam bir depo üzerinde --unshallow bir anlam ifade etmiyor"
-#: builtin/fetch.c:1805
+#: builtin/fetch.c:1961
msgid "fetch --all does not take a repository argument"
-msgstr "fetch --all bir depo değişkeni almıyor"
+msgstr "fetch --all bir depo argümanı almıyor"
-#: builtin/fetch.c:1807
+#: builtin/fetch.c:1963
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all başvuru belirteçleri ile birlikte bir anlam ifade etmiyor"
-#: builtin/fetch.c:1816
+#: builtin/fetch.c:1972
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Böyle bir uzak konum veya uzak konum grubu yok: %s"
-#: builtin/fetch.c:1823
+#: builtin/fetch.c:1979
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
"Bir grubu getirme ve başvuru belirteçleri tanımlama bir anlam ifade etmiyor"
-#: builtin/fetch.c:1841
+#: builtin/fetch.c:1997
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
@@ -14064,29 +15011,38 @@
"--filter yalnızca extensions.partialclone içinde yapılandırılmış uzak konum "
"ile kullanılabilir."
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fetch.c:2001
+msgid "--atomic can only be used when fetching from one remote"
+msgstr "--atomic yalnızca bir uzak konumdan getirirken kullanılabilir"
+
+#: builtin/fetch.c:2005
+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:671
+#: 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:674
+#: builtin/fmt-merge-msg.c:21
msgid "alias for --log (deprecated)"
-msgstr "--log için arma (kullanım dışı)"
+msgstr "--log için arma (kullanılmamalı)"
-#: builtin/fmt-merge-msg.c:677
+#: builtin/fmt-merge-msg.c:24
msgid "text"
msgstr "metin"
-#: builtin/fmt-merge-msg.c:678
+#: 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:679
+#: builtin/fmt-merge-msg.c:26
msgid "file to read from"
msgstr "okunacak dosya"
@@ -14099,12 +15055,12 @@
msgstr "git for-each-ref [--points-at <nesne>]"
#: builtin/for-each-ref.c:12
-msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
-msgstr "git for-each-ref [(--merged | --no-merged) [<gönderi>]]"
+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 [<gönderi>]] [--no-contains [<gönderi>]]"
+msgstr "git for-each-ref [--contains [<işleme>]] [--no-contains [<işleme>]]"
#: builtin/for-each-ref.c:28
msgid "quote placeholders suitably for shells"
@@ -14126,7 +15082,7 @@
msgid "show only <n> matched refs"
msgstr "yalnızca <n> eşleşen başvuruyu göster"
-#: builtin/for-each-ref.c:39 builtin/tag.c:439
+#: builtin/for-each-ref.c:39 builtin/tag.c:472
msgid "respect format colors"
msgstr "biçim renklerine uy"
@@ -14144,38 +15100,54 @@
#: builtin/for-each-ref.c:46
msgid "print only refs which contain the commit"
-msgstr "yalnızca gönderiyi içeren başvuruları yazdır"
+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 gönderiyi içermeyen başvuruları yazdır"
+msgstr "yalnızca işlemeyi içermeyen başvuruları yazdır"
-#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148
+#: builtin/for-each-repo.c:9
+msgid "git for-each-repo --config=<config> <command-args>"
+msgstr "git for-each-repo --config=<yapılandırma> <komut-argümanları>"
+
+#: builtin/for-each-repo.c:37
+msgid "config"
+msgstr "yapılandırma"
+
+#: builtin/for-each-repo.c:38
+msgid "config key storing a list of repository paths"
+msgstr "bir depo yolları listesi tutan yapılandırma anahtarı"
+
+#: builtin/for-each-repo.c:46
+msgid "missing --config=<config>"
+msgstr "--config=<yapılandırma> eksik"
+
+#: builtin/fsck.c:69 builtin/fsck.c:130 builtin/fsck.c:131
msgid "unknown"
msgstr "bilinmeyen"
#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:100 builtin/fsck.c:120
+#: builtin/fsck.c:83 builtin/fsck.c:103
#, c-format
msgid "error in %s %s: %s"
msgstr "%s %s içinde hata: %s"
#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:114
+#: builtin/fsck.c:97
#, c-format
msgid "warning in %s %s: %s"
msgstr "%s %s içinde uyarı: %s"
-#: builtin/fsck.c:143 builtin/fsck.c:146
+#: builtin/fsck.c:126 builtin/fsck.c:129
#, c-format
msgid "broken link from %7s %s"
msgstr "şuradan kırık bağ: %7s %s"
-#: builtin/fsck.c:155
+#: builtin/fsck.c:138
msgid "wrong object type in link"
msgstr "bağda yanlış nesne türü"
-#: builtin/fsck.c:171
+#: builtin/fsck.c:154
#, c-format
msgid ""
"broken link from %7s %s\n"
@@ -14184,240 +15156,240 @@
"şuradan kırık bağ: %7s %s\n"
" şuraya: %7s %s"
-#: builtin/fsck.c:282
+#: builtin/fsck.c:265
#, c-format
msgid "missing %s %s"
msgstr "eksik %s %s"
-#: builtin/fsck.c:309
+#: builtin/fsck.c:292
#, c-format
msgid "unreachable %s %s"
msgstr "ulaşılamayan %s %s"
-#: builtin/fsck.c:329
+#: builtin/fsck.c:312
#, c-format
msgid "dangling %s %s"
msgstr "sarkan %s %s"
-#: builtin/fsck.c:339
+#: builtin/fsck.c:322
msgid "could not create lost-found"
msgstr "lost-found oluşturulamadı"
-#: builtin/fsck.c:350
+#: builtin/fsck.c:333
#, c-format
msgid "could not finish '%s'"
msgstr "'%s' bitirilemedi"
-#: builtin/fsck.c:367
+#: builtin/fsck.c:350
#, c-format
msgid "Checking %s"
msgstr "%s denetleniyor"
-#: builtin/fsck.c:405
+#: builtin/fsck.c:388
#, c-format
msgid "Checking connectivity (%d objects)"
msgstr "Bağlanabilirlik denetleniyor (%d nesne)"
-#: builtin/fsck.c:424
+#: builtin/fsck.c:407
#, c-format
msgid "Checking %s %s"
msgstr "%s %s denetleniyor"
-#: builtin/fsck.c:429
+#: builtin/fsck.c:412
msgid "broken links"
msgstr "kırık bağlar"
-#: builtin/fsck.c:438
+#: builtin/fsck.c:421
#, c-format
msgid "root %s"
msgstr "kök %s"
-#: builtin/fsck.c:446
+#: builtin/fsck.c:429
#, c-format
msgid "tagged %s %s (%s) in %s"
msgstr "%s %s (%s) şurada etiketlendi: %s"
-#: builtin/fsck.c:475
+#: builtin/fsck.c:458
#, c-format
msgid "%s: object corrupt or missing"
msgstr "%s: nesne hasar görmüş veya kayıp"
-#: builtin/fsck.c:500
+#: builtin/fsck.c:483
#, c-format
msgid "%s: invalid reflog entry %s"
msgstr "%s: geçersiz başvuru günlüğü girdisi %s"
-#: builtin/fsck.c:514
+#: builtin/fsck.c:497
#, c-format
msgid "Checking reflog %s->%s"
msgstr "Başvuru günlüğü denetleniyor: %s->%s"
-#: builtin/fsck.c:548
+#: builtin/fsck.c:531
#, c-format
msgid "%s: invalid sha1 pointer %s"
msgstr "%s: geçersiz sha1 işaretçisi %s"
-#: builtin/fsck.c:555
+#: builtin/fsck.c:538
#, c-format
msgid "%s: not a commit"
-msgstr "%s: bir gönderi değil"
+msgstr "%s: bir işleme değil"
-#: builtin/fsck.c:609
+#: builtin/fsck.c:592
msgid "notice: No default references"
msgstr "Uyarı: Öntanımlı başvurular yok"
-#: builtin/fsck.c:624
+#: builtin/fsck.c:607
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s: nesne hasar görmüş veya kayıp: %s"
-#: builtin/fsck.c:637
+#: builtin/fsck.c:620
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s: nesne ayrıştırılamadı: %s"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:640
#, c-format
msgid "bad sha1 file: %s"
msgstr "hatalı sha1 dosyası: %s"
-#: builtin/fsck.c:672
+#: builtin/fsck.c:655
msgid "Checking object directory"
msgstr "Nesne dizini denetleniyor"
-#: builtin/fsck.c:675
+#: builtin/fsck.c:658
msgid "Checking object directories"
msgstr "Nesne dizinleri denetleniyor"
-#: builtin/fsck.c:690
+#: builtin/fsck.c:673
#, c-format
msgid "Checking %s link"
msgstr "%s bağ denetleniyor"
-#: builtin/fsck.c:695 builtin/index-pack.c:843
+#: builtin/fsck.c:678 builtin/index-pack.c:865
#, c-format
msgid "invalid %s"
msgstr "geçersiz %s"
-#: builtin/fsck.c:702
+#: builtin/fsck.c:685
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s garip bir şeye işaret ediyor (%s)"
-#: builtin/fsck.c:708
+#: builtin/fsck.c:691
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s: ayrık HEAD bir şeye işaret etmiyor"
-#: builtin/fsck.c:712
+#: builtin/fsck.c:695
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "Uyarı: %s henüz doğmamış bir dala işaret ediyor (%s)"
-#: builtin/fsck.c:724
+#: builtin/fsck.c:707
msgid "Checking cache tree"
msgstr "Önbellek ağacı denetleniyor"
-#: builtin/fsck.c:729
+#: builtin/fsck.c:712
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "%s: cache-tree içinde geçersiz sha1 işaretçisi"
-#: builtin/fsck.c:738
+#: builtin/fsck.c:721
msgid "non-tree in cache-tree"
msgstr "cache-tree içinde ağaç olmayan öge"
-#: builtin/fsck.c:769
+#: builtin/fsck.c:752
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<seçenekler>] [<nesne>...]"
-#: builtin/fsck.c:775
+#: builtin/fsck.c:758
msgid "show unreachable objects"
msgstr "ulaşılamayan nesneleri göster"
-#: builtin/fsck.c:776
+#: builtin/fsck.c:759
msgid "show dangling objects"
msgstr "sarkan nesneleri göster"
-#: builtin/fsck.c:777
+#: builtin/fsck.c:760
msgid "report tags"
msgstr "etiketleri bildir"
-#: builtin/fsck.c:778
+#: builtin/fsck.c:761
msgid "report root nodes"
msgstr "kök düğümleri bildir"
-#: builtin/fsck.c:779
+#: builtin/fsck.c:762
msgid "make index objects head nodes"
msgstr "indeks nesnelerini dal ucu düğümü yap"
-#: builtin/fsck.c:780
+#: builtin/fsck.c:763
msgid "make reflogs head nodes (default)"
msgstr "başvuru günlüklerini dal ucu düğümü yap (öntanımlı)"
-#: builtin/fsck.c:781
+#: builtin/fsck.c:764
msgid "also consider packs and alternate objects"
msgstr "ek olarak paketleri ve alternatif nesneleri de dikkate al"
-#: builtin/fsck.c:782
+#: builtin/fsck.c:765
msgid "check only connectivity"
msgstr "yalnızca bağlanabilirliği denetle"
-#: builtin/fsck.c:783
+#: builtin/fsck.c:766 builtin/mktag.c:78
msgid "enable more strict checking"
msgstr "daha kesin denetlemeyi etkinleştir"
-#: builtin/fsck.c:785
+#: builtin/fsck.c:768
msgid "write dangling objects in .git/lost-found"
msgstr "sarkan nesneleri .git/lost-found'a yaz"
-#: builtin/fsck.c:786 builtin/prune.c:132
+#: builtin/fsck.c:769 builtin/prune.c:134
msgid "show progress"
msgstr "ilerlemeyi göster"
-#: builtin/fsck.c:787
+#: builtin/fsck.c:770
msgid "show verbose names for reachable objects"
msgstr "ulaşılabilir nesneler için ayrıntılı adları göster"
-#: builtin/fsck.c:846 builtin/index-pack.c:225
+#: builtin/fsck.c:829 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "Nesneler denetleniyor"
-#: builtin/fsck.c:874
+#: builtin/fsck.c:857
#, c-format
msgid "%s: object missing"
msgstr "%s: nesne kayıp"
-#: builtin/fsck.c:885
+#: builtin/fsck.c:868
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "geçersiz parametre: sha1 bekleniyordu, '%s' alındı"
-#: builtin/gc.c:35
+#: builtin/gc.c:39
msgid "git gc [<options>]"
msgstr "git gc [<seçenekler>]"
-#: builtin/gc.c:90
+#: builtin/gc.c:93
#, c-format
msgid "Failed to fstat %s: %s"
msgstr "%s fstat yapılamadı: %s"
-#: builtin/gc.c:126
+#: builtin/gc.c:129
#, c-format
msgid "failed to parse '%s' value '%s'"
msgstr "'%s' değeri '%s' ayrıştırılamadı"
-#: builtin/gc.c:475 builtin/init-db.c:55
+#: builtin/gc.c:487 builtin/init-db.c:58
#, c-format
msgid "cannot stat '%s'"
msgstr "'%s' bilgileri alınamıyor"
-#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
+#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:562
#, c-format
msgid "cannot read '%s'"
msgstr "'%s' okunamıyor"
-#: builtin/gc.c:491
+#: builtin/gc.c:503
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -14432,52 +15404,52 @@
"\n"
"%s"
-#: builtin/gc.c:539
+#: builtin/gc.c:551
msgid "prune unreferenced objects"
msgstr "başvurulmayan nesneleri buda"
-#: builtin/gc.c:541
+#: builtin/gc.c:553
msgid "be more thorough (increased runtime)"
msgstr "biraz daha titiz ol (artırılmış işleyiş süresi)"
-#: builtin/gc.c:542
+#: builtin/gc.c:554
msgid "enable auto-gc mode"
msgstr "auto-gc kipini etkinleştir"
-#: builtin/gc.c:545
+#: builtin/gc.c:557
msgid "force running gc even if there may be another gc running"
msgstr "başka bir gc çalışıyor olsa bile zorla gc çalıştır"
-#: builtin/gc.c:548
+#: builtin/gc.c:560
msgid "repack all other packs except the largest pack"
msgstr "en büyük paket dışındaki diğer tüm paketleri yeniden paketle"
-#: builtin/gc.c:565
+#: builtin/gc.c:576
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "gc.logexpiry değeri %s ayrıştırılamadı"
-#: builtin/gc.c:576
+#: builtin/gc.c:587
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr "'prune expiry' değeri %s ayrıştırılamadı"
-#: builtin/gc.c:596
+#: builtin/gc.c:607
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "En iyi başarım için depo arka planda kendiliğinden paketleniyor.\n"
-#: builtin/gc.c:598
+#: builtin/gc.c:609
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "En iyi başarım için depo kendiliğinden paketleniyor.\n"
-#: builtin/gc.c:599
+#: builtin/gc.c:610
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "El ile ortalık temizliği için \"git help gc\"ye bakın.\n"
-#: builtin/gc.c:639
+#: builtin/gc.c:650
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -14485,22 +15457,183 @@
"gc %s makinesinde halihazırda çalışıyor (pid %<PRIuMAX> - çalışmıyorsa --"
"force kullanın)"
-#: builtin/gc.c:694
+#: builtin/gc.c:705
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:715
+msgid ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
+msgstr ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<görev>] [--schedule]"
+
+#: builtin/gc.c:745
+msgid "--no-schedule is not allowed"
+msgstr "--no-schedule kullanımına izin yok"
+
+#: builtin/gc.c:750
+#, c-format
+msgid "unrecognized --schedule argument '%s'"
+msgstr "tanımlanamayan --schedule argümanı, %s"
+
+#: builtin/gc.c:869
+msgid "failed to write commit-graph"
+msgstr "commit-graph yazılamadı"
+
+#: builtin/gc.c:914
+msgid "failed to fill remotes"
+msgstr "uzak konumlar doldurulamadı"
+
+#: builtin/gc.c:1037
+msgid "failed to start 'git pack-objects' process"
+msgstr "'git-pack-objects' işlemi başlatılamadı"
+
+#: builtin/gc.c:1054
+msgid "failed to finish 'git pack-objects' process"
+msgstr "'git-pack-objects' işlemi bitirilemedi"
+
+#: builtin/gc.c:1106
+msgid "failed to write multi-pack-index"
+msgstr "multi-pack-index yazılamadı"
+
+#: builtin/gc.c:1124
+msgid "'git multi-pack-index expire' failed"
+msgstr "'git multi-pack-index expire' başarısız oldu"
+
+#: builtin/gc.c:1185
+msgid "'git multi-pack-index repack' failed"
+msgstr "'git multi-pack-index repack' başarısız oldu"
+
+#: builtin/gc.c:1194
+msgid ""
+"skipping incremental-repack task because core.multiPackIndex is disabled"
+msgstr ""
+"incremental-repack görevi atlanıyor; çünkü core.multiPackIndex devre dışı"
+
+#: builtin/gc.c:1298
+#, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr "kilit dosyası '%s' mevcut, bakım atlanıyor"
+
+#: builtin/gc.c:1328
+#, c-format
+msgid "task '%s' failed"
+msgstr "'%s' görevi başarısız oldu"
+
+#: builtin/gc.c:1410
+#, c-format
+msgid "'%s' is not a valid task"
+msgstr "'%s' geçerli bir görev değil"
+
+#: builtin/gc.c:1415
+#, c-format
+msgid "task '%s' cannot be selected multiple times"
+msgstr "'%s' görevi birden çok kez seçilemez"
+
+#: builtin/gc.c:1430
+msgid "run tasks based on the state of the repository"
+msgstr "görevleri deponun durumuna göre çalıştır"
+
+#: builtin/gc.c:1431
+msgid "frequency"
+msgstr "sıklık"
+
+#: builtin/gc.c:1432
+msgid "run tasks based on frequency"
+msgstr "görevleri sıklığa göre çalıştır"
+
+#: builtin/gc.c:1435
+msgid "do not report progress or other information over stderr"
+msgstr "stderr üzerinden ilerlemeyi veya başka bir bilgiyi raporlama"
+
+#: builtin/gc.c:1436
+msgid "task"
+msgstr "görev"
+
+#: builtin/gc.c:1437
+msgid "run a specific task"
+msgstr "belirli bir görevi çalıştır"
+
+#: builtin/gc.c:1454
+msgid "use at most one of --auto and --schedule=<frequency>"
+msgstr "tek kezde --auto ve --schedule=<sıklık>'tan birini kullan"
+
+#: builtin/gc.c:1497
+msgid "failed to run 'git config'"
+msgstr "'git config' çalıştırılamadı"
+
+#: builtin/gc.c:1562
+#, c-format
+msgid "failed to expand path '%s'"
+msgstr "'%s' yolu oluşturulamadı"
+
+#: builtin/gc.c:1591
+msgid "failed to start launchctl"
+msgstr "launchctl başlatılamadı"
+
+#: builtin/gc.c:1628
+#, c-format
+msgid "failed to create directories for '%s'"
+msgstr "'%s' için dizinler oluşturulamadı"
+
+#: builtin/gc.c:1689
+#, c-format
+msgid "failed to bootstrap service %s"
+msgstr "%s servisi özyüklenemedi"
+
+#: builtin/gc.c:1760
+msgid "failed to create temp xml file"
+msgstr "geçici xml dosyası oluşturulamadı"
+
+#: builtin/gc.c:1850
+msgid "failed to start schtasks"
+msgstr "schtasks başlatılamadı"
+
+#: builtin/gc.c:1894
+msgid "failed to run 'crontab -l'; your system might not support 'cron'"
+msgstr "'crontab -l' çalıştırılamadı; sisteminiz 'cron' desteklemiyor olabilir"
+
+#: builtin/gc.c:1911
+msgid "failed to run 'crontab'; your system might not support 'cron'"
+msgstr "'crontab' çalıştırılamadı; sisteminiz 'cron' desteklemiyor olabilir"
+
+#: builtin/gc.c:1915
+msgid "failed to open stdin of 'crontab'"
+msgstr "'crontab' stdin'i açılamadı"
+
+#: builtin/gc.c:1956
+msgid "'crontab' died"
+msgstr "'crontab' beklenmedik bir biçimde sonlandı"
+
+#: builtin/gc.c:1990
+msgid "another process is scheduling background maintenance"
+msgstr "başka bir işlem arka plan bakımı zamanının ayarlıyor"
+
+#: builtin/gc.c:2009
+msgid "failed to add repo to global config"
+msgstr "depo, global yapılandırmaya eklenemedi"
+
+#: builtin/gc.c:2019
+msgid "git maintenance <subcommand> [<options>]"
+msgstr "git maintenance <altkomut> [<seçenekler>]"
+
+#: builtin/gc.c:2038
+#, 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
+#: builtin/grep.c:223
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: iş parçacığı oluşturulamadı: %s"
-#: builtin/grep.c:279
+#: builtin/grep.c:277
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "geçersiz belirtilen iş parçacığı sayısı (%d), %s için"
@@ -14509,259 +15642,259 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731
-#: builtin/pack-objects.c:2854
+#: builtin/grep.c:285 builtin/index-pack.c:1589 builtin/index-pack.c:1808
+#: builtin/pack-objects.c:2944
#, c-format
msgid "no threads support, ignoring %s"
msgstr "iş parçacığı desteği yok, %s yok sayılıyor"
-#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618
+#: builtin/grep.c:473 builtin/grep.c:601 builtin/grep.c:641
#, c-format
msgid "unable to read tree (%s)"
msgstr "ağaç okunamıyor (%s)"
-#: builtin/grep.c:633
+#: builtin/grep.c:656
#, c-format
msgid "unable to grep from object of type %s"
msgstr "%s türündeki bir nesneden grep yapılamıyor"
-#: builtin/grep.c:704
+#: builtin/grep.c:737
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "'%c' anahtarı sayısal bir değer bekliyor"
-#: builtin/grep.c:803
+#: builtin/grep.c:836
msgid "search in index instead of in the work tree"
msgstr "çalışma ağacı yerine indekste ara"
-#: builtin/grep.c:805
+#: builtin/grep.c:838
msgid "find in contents not managed by git"
msgstr "git tarafından yönetilmeyen içerikte bul"
-#: builtin/grep.c:807
+#: builtin/grep.c:840
msgid "search in both tracked and untracked files"
msgstr "hem izlenen hem izlenmeyen dosyalar içinde ara"
-#: builtin/grep.c:809
+#: builtin/grep.c:842
msgid "ignore files specified via '.gitignore'"
msgstr "'.gitignore'da belirtilen dosyaları yok say"
-#: builtin/grep.c:811
+#: builtin/grep.c:844
msgid "recursively search in each submodule"
msgstr "her altmodülde özyineli olarak ara"
-#: builtin/grep.c:814
+#: builtin/grep.c:847
msgid "show non-matching lines"
msgstr "eşleşmeyen satırları göster"
-#: builtin/grep.c:816
+#: builtin/grep.c:849
msgid "case insensitive matching"
msgstr "BÜYÜK/küçük harf duyarsız eşleşme"
-#: builtin/grep.c:818
+#: builtin/grep.c:851
msgid "match patterns only at word boundaries"
msgstr "yalnızca sözcük sınırlarındaki dizgileri eşleştir"
-#: builtin/grep.c:820
+#: builtin/grep.c:853
msgid "process binary files as text"
msgstr "ikili dosyaları metin olarak işle"
-#: builtin/grep.c:822
+#: builtin/grep.c:855
msgid "don't match patterns in binary files"
msgstr "ikili dosyalardaki dizgileri eşleştirme"
-#: builtin/grep.c:825
+#: builtin/grep.c:858
msgid "process binary files with textconv filters"
msgstr "ikili dosyaları textconv süzgeçleri ile işle"
-#: builtin/grep.c:827
+#: builtin/grep.c:860
msgid "search in subdirectories (default)"
msgstr "altdizinlerde ara (öntanımlı)"
-#: builtin/grep.c:829
+#: builtin/grep.c:862
msgid "descend at most <depth> levels"
-msgstr "en çok <derinlik> düzeyine in"
+msgstr "en çok <derinlik> düzey in"
-#: builtin/grep.c:833
+#: builtin/grep.c:866
msgid "use extended POSIX regular expressions"
msgstr "genişletilmiş POSIX düzenli ifadelerini kullan"
-#: builtin/grep.c:836
+#: builtin/grep.c:869
msgid "use basic POSIX regular expressions (default)"
msgstr "temel POSIX düzenli ifadelerini kullan (öntanımlı)"
-#: builtin/grep.c:839
+#: builtin/grep.c:872
msgid "interpret patterns as fixed strings"
msgstr "dizgileri sabit diziler olarak yorumla"
-#: builtin/grep.c:842
+#: builtin/grep.c:875
msgid "use Perl-compatible regular expressions"
msgstr "Perl uyumlu düzenli ifadeler kullan"
-#: builtin/grep.c:845
+#: builtin/grep.c:878
msgid "show line numbers"
msgstr "satır numaralarını göster"
-#: builtin/grep.c:846
+#: builtin/grep.c:879
msgid "show column number of first match"
msgstr "ilk eşleşmenin sütun numarasını göster"
-#: builtin/grep.c:847
+#: builtin/grep.c:880
msgid "don't show filenames"
msgstr "dosya adlarını gösterme"
-#: builtin/grep.c:848
+#: builtin/grep.c:881
msgid "show filenames"
msgstr "dosya adlarını göster"
-#: builtin/grep.c:850
+#: builtin/grep.c:883
msgid "show filenames relative to top directory"
msgstr "dosya adlarını en üst dizine göreceli olarak göster"
-#: builtin/grep.c:852
+#: builtin/grep.c:885
msgid "show only filenames instead of matching lines"
msgstr "eşleşen satırlar yerine yalnızca dosya adlarını göster"
-#: builtin/grep.c:854
+#: builtin/grep.c:887
msgid "synonym for --files-with-matches"
msgstr "--files-with-matches eşanlamlısı"
-#: builtin/grep.c:857
+#: builtin/grep.c:890
msgid "show only the names of files without match"
msgstr "eşleşme olmadan yalnızca dosya adlarını göster"
-#: builtin/grep.c:859
+#: builtin/grep.c:892
msgid "print NUL after filenames"
msgstr "dosya adlarından sonra NUL yazdır"
-#: builtin/grep.c:862
+#: builtin/grep.c:895
msgid "show only matching parts of a line"
msgstr "yalnızca bir satırın eşleşen kısımlarını göster"
-#: builtin/grep.c:864
+#: builtin/grep.c:897
msgid "show the number of matches instead of matching lines"
msgstr "eşleşen satırlar yerine eşleşme sayısını göster"
-#: builtin/grep.c:865
+#: builtin/grep.c:898
msgid "highlight matches"
msgstr "eşleşmeleri vurgula"
-#: builtin/grep.c:867
+#: builtin/grep.c:900
msgid "print empty line between matches from different files"
msgstr "başka dosyalardan olan eşleşmelerin arasına boş satır yazdır"
-#: builtin/grep.c:869
+#: builtin/grep.c:902
msgid "show filename only once above matches from same file"
msgstr ""
"aynı dosyadan olan eşleşmelerin üzerinde dosya adını yalnızca bir kez göster"
-#: builtin/grep.c:872
+#: builtin/grep.c:905
msgid "show <n> context lines before and after matches"
msgstr "eşleşmelerden önce ve sonra <n> satır bağlam göster"
-#: builtin/grep.c:875
+#: builtin/grep.c:908
msgid "show <n> context lines before matches"
msgstr "eşleşmelerden önce <n> satır bağlam göster"
-#: builtin/grep.c:877
+#: builtin/grep.c:910
msgid "show <n> context lines after matches"
msgstr "eşleşmelerden sonra <n> satır bağlam göster"
-#: builtin/grep.c:879
+#: builtin/grep.c:912
msgid "use <n> worker threads"
msgstr "<n> iş parçacığı kullan"
-#: builtin/grep.c:880
+#: builtin/grep.c:913
msgid "shortcut for -C NUM"
msgstr "-C NUM için kısayol"
-#: builtin/grep.c:883
+#: builtin/grep.c:916
msgid "show a line with the function name before matches"
msgstr "eşleşmelerden önce işlev adının olduğu bir satır göster"
-#: builtin/grep.c:885
+#: builtin/grep.c:918
msgid "show the surrounding function"
msgstr "çevresindeki işlevi göster"
-#: builtin/grep.c:888
+#: builtin/grep.c:921
msgid "read patterns from file"
msgstr "dizgileri dosyadan oku"
-#: builtin/grep.c:890
+#: builtin/grep.c:923
msgid "match <pattern>"
msgstr "<dizgi> ile eşleş"
-#: builtin/grep.c:892
+#: builtin/grep.c:925
msgid "combine patterns specified with -e"
msgstr "-e ile belirtilen dizgileri birleştir"
-#: builtin/grep.c:904
+#: builtin/grep.c:937
msgid "indicate hit with exit status without output"
msgstr "çıkış durumu ile olan eşleşmelerde çıktı verme"
-#: builtin/grep.c:906
+#: builtin/grep.c:939
msgid "show only matches from files that match all patterns"
msgstr "yalnızca tüm dizgilerle eşleşen dosyalardan eşleşmeleri göster"
-#: builtin/grep.c:908
-msgid "show parse tree for grep expression"
-msgstr "grep ifadesi için ayrıştırma ağacını göster"
-
-#: builtin/grep.c:912
+#: builtin/grep.c:942
msgid "pager"
msgstr "sayfalayıcı"
-#: builtin/grep.c:912
+#: builtin/grep.c:942
msgid "show matching files in the pager"
msgstr "sayfalayıcıda eşleşen dosyaları göster"
-#: builtin/grep.c:916
+#: builtin/grep.c:946
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "grep(1)'in çağrılmasına izin ver (bu yapım tarafından yok sayıldı)"
-#: builtin/grep.c:983
+#: builtin/grep.c:1012
msgid "no pattern given"
msgstr "bir dizgi verilmedi"
-#: builtin/grep.c:1019
+#: builtin/grep.c:1048
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index veya --untracked revizyonlarla birlikte kullanılamaz"
-#: builtin/grep.c:1027
+#: builtin/grep.c:1056
#, c-format
msgid "unable to resolve revision: %s"
msgstr "revizyon çözülemiyor: %s"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1086
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked, --recurse-submodules ile desteklenmiyor"
-#: builtin/grep.c:1061
+#: builtin/grep.c:1090
msgid "invalid option combination, ignoring --threads"
msgstr "geçersiz seçenek birleştirmesi, --threads yok sayılıyor"
-#: builtin/grep.c:1064 builtin/pack-objects.c:3547
+#: builtin/grep.c:1093 builtin/pack-objects.c:3672
msgid "no threads support, ignoring --threads"
msgstr "iş parçacığı desteği yok, --threads yok sayılıyor"
-#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851
+#: builtin/grep.c:1096 builtin/index-pack.c:1586 builtin/pack-objects.c:2941
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "geçersiz belirtilen iş parçacığı sayısı (%d)"
-#: builtin/grep.c:1101
+#: builtin/grep.c:1130
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager yalnızca çalışma ağacında çalışır"
-#: builtin/grep.c:1127
+#: builtin/grep.c:1156
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached veya --untracked, --no-index ile birlikte kullanılamıyor"
-#: builtin/grep.c:1133
+#: builtin/grep.c:1159
+msgid "--untracked cannot be used with --cached"
+msgstr "--untracked, --cached ile birlikte kullanılamıyor"
+
+#: builtin/grep.c:1165
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "--[no-]exclude-standard, izlenen içerik için kullanılamıyor"
-#: builtin/grep.c:1141
+#: builtin/grep.c:1173
msgid "both --cached and trees are given"
msgstr "hem --cached hem ağaçlar verilmiş"
@@ -14804,66 +15937,66 @@
msgid "process file as it were from this path"
msgstr "dosyayı sanki bu yoldanmış gibi işle"
-#: builtin/help.c:46
-msgid "print all available commands"
-msgstr "tüm kullanılabilir komutlar yazdır"
-
#: builtin/help.c:47
+msgid "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:48
+#: builtin/help.c:49
msgid "print list of useful guides"
msgstr "kullanışlı kılavuzların listesini çıkar"
-#: builtin/help.c:49
+#: 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:51
+#: builtin/help.c:52
msgid "show man page"
msgstr "man sayfasını göster"
-#: builtin/help.c:52
+#: builtin/help.c:53
msgid "show manual in web browser"
msgstr "kılavuzu web tarayıcısında göster"
-#: builtin/help.c:54
+#: builtin/help.c:55
msgid "show info page"
msgstr "bilgi sayfasını göster"
-#: builtin/help.c:56
+#: builtin/help.c:57
msgid "print command description"
msgstr "komut açıklamasını yazdır"
-#: 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] [<komut>]"
-#: builtin/help.c:77
+#: builtin/help.c:163
#, c-format
msgid "unrecognized help format '%s'"
msgstr "tanımlanamayan yardım biçimi '%s'"
-#: builtin/help.c:104
+#: builtin/help.c:190
msgid "Failed to start emacsclient."
msgstr "emacsclient başlatılamadı."
-#: builtin/help.c:117
+#: builtin/help.c:203
msgid "Failed to parse emacsclient version."
msgstr "emacsclient sürümü ayrıştırılamadı."
-#: builtin/help.c:125
+#: 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: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' çalıştırılamadı"
-#: builtin/help.c:221
+#: builtin/help.c:307
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -14872,7 +16005,7 @@
"'%s': desteklenmeyen man görüntüleyicisi yolu.\n"
"Bunun yerine 'man.<araç>.cmd' kullanmayı düşünün."
-#: builtin/help.c:233
+#: builtin/help.c:319
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -14881,396 +16014,428 @@
"'%s': desteklenmeyen man görüntüleyicisi komutu.\n"
"Bunun yerine 'man.<araç>.path' kullanmayı düşünün."
-#: builtin/help.c:350
+#: builtin/help.c:436
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s': Bilinmeyen man görüntüleyicisi."
-#: builtin/help.c:367
+#: 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:375
+#: 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:434 builtin/help.c:445 git.c:336
+#: builtin/help.c:520 builtin/help.c:531 git.c:340
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "'%s', '%s' olarak armalanmış"
-#: builtin/help.c:448 git.c:365
+#: builtin/help.c:534 git.c:372
#, c-format
msgid "bad alias.%s string: %s"
msgstr "hatalı alias.%s dizisi: %s"
-#: builtin/help.c:477 builtin/help.c:507
+#: builtin/help.c:563 builtin/help.c:593
#, c-format
msgid "usage: %s%s"
msgstr "kullanım: %s%s"
-#: builtin/help.c:491
+#: builtin/help.c:577
msgid "'git help config' for more information"
msgstr "ek bilgi için: 'git help config'"
-#: builtin/index-pack.c:185
+#: 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:205
+#: builtin/index-pack.c:241
#, c-format
msgid "did not receive expected object %s"
msgstr "beklenen nesne %s alınmadı"
-#: builtin/index-pack.c:208
+#: 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:258
+#: 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:268
+#: builtin/index-pack.c:304
msgid "early EOF"
msgstr "erken dosya sonu"
-#: builtin/index-pack.c:269
+#: builtin/index-pack.c:305
msgid "read error on input"
msgstr "girdide okuma hatası"
-#: builtin/index-pack.c:281
+#: 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:288 builtin/pack-objects.c:606
+#: builtin/index-pack.c:324 builtin/pack-objects.c:624
msgid "pack too large for current definition of off_t"
msgstr "paket off_t'nin geçerli tanımı için çok büyük"
-#: builtin/index-pack.c:291 builtin/unpack-objects.c:95
+#: 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:312
+#: builtin/index-pack.c:342
+#, 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:326
+#: builtin/index-pack.c:362
msgid "pack signature mismatch"
msgstr "paket imzası uyuşmazlığı"
-#: builtin/index-pack.c:328
+#: builtin/index-pack.c:364
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "paket sürümü %<PRIu32> desteklenmiyor"
-#: builtin/index-pack.c:346
+#: 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:466
+#: builtin/index-pack.c:488
#, c-format
msgid "inflate returned %d"
msgstr "şişirme programı %d döndürdü"
-#: builtin/index-pack.c:515
+#: 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:523
+#: 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:531
+#: builtin/index-pack.c:553
#, c-format
msgid "unknown object type %d"
msgstr "bilinmeyen nesne türü %d"
-#: builtin/index-pack.c:562
+#: builtin/index-pack.c:584
msgid "cannot pread pack file"
msgstr "paket dosyası 'pread' yapılamıyor"
-#: 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] "zamansız paket dosyası sonu, %<PRIuMAX> bayt eksik"
msgstr[1] "zamansız paket dosyası sonu, %<PRIuMAX> bayt eksik"
-#: builtin/index-pack.c:590
+#: builtin/index-pack.c:612
msgid "serious inflate inconsistency"
msgstr "ciddi şişirme programı tutarsızlığı"
-#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765
-#: builtin/index-pack.c:804 builtin/index-pack.c:813
+#: 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:738 builtin/pack-objects.c:158
-#: builtin/pack-objects.c:218 builtin/pack-objects.c:313
+#: 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:802
+#: 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:810
+#: builtin/index-pack.c:832
#, c-format
msgid "cannot read existing object %s"
msgstr "mevcut %s nesnesi okunamıyor"
-#: builtin/index-pack.c:824
+#: builtin/index-pack.c:846
#, c-format
msgid "invalid blob object %s"
msgstr "geçersiz %s ikili nesnesi"
-#: builtin/index-pack.c:827 builtin/index-pack.c:846
+#: 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:848
+#: 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:920 builtin/index-pack.c:951
+#: builtin/index-pack.c:931 builtin/index-pack.c:978
msgid "failed to apply delta"
msgstr "delta uygulanamadı"
-#: builtin/index-pack.c:1121
+#: builtin/index-pack.c:1161
msgid "Receiving objects"
msgstr "Nesneler alınıyor"
-#: builtin/index-pack.c:1121
+#: builtin/index-pack.c:1161
msgid "Indexing objects"
msgstr "Nesneler indeksleniyor"
-#: builtin/index-pack.c:1155
+#: builtin/index-pack.c:1195
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "paket hasar görmüş (SHA1 uyumsuzluğu)"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1200
msgid "cannot fstat packfile"
msgstr "paket dosyası fstat yapılamıyor"
-#: builtin/index-pack.c:1163
+#: builtin/index-pack.c:1203
msgid "pack has junk at the end"
msgstr "paket sonunda döküntüler var"
-#: builtin/index-pack.c:1175
+#: 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:1198
+#: builtin/index-pack.c:1238
msgid "Resolving deltas"
msgstr "Deltalar çözülüyor"
-#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615
+#: builtin/index-pack.c:1249 builtin/pack-objects.c:2707
#, c-format
msgid "unable to create thread: %s"
msgstr "iş parçacığı oluşturulamadı: %s"
-#: builtin/index-pack.c:1249
+#: builtin/index-pack.c:1282
msgid "confusion beyond insanity"
msgstr "karmaşa akıl almaz düzeyde"
-#: builtin/index-pack.c:1255
+#: 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:1267
+#: 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:1271
+#: 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:1295
+#: 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:1392
+#: builtin/index-pack.c:1424
#, c-format
msgid "local object %s is corrupt"
msgstr "yerel nesne %s hasarlı"
-#: builtin/index-pack.c:1406
+#: builtin/index-pack.c:1445
#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "paket dosyası adı '%s', '.pack' ile bitmiyor"
+msgid "packfile name '%s' does not end with '.%s'"
+msgstr "paket dosyası adı '%s', '.%s' ile bitmiyor"
-#: builtin/index-pack.c:1431
+#: builtin/index-pack.c:1469
#, c-format
msgid "cannot write %s file '%s'"
msgstr "%s dosyası '%s' yazılamıyor"
-#: builtin/index-pack.c:1439
+#: 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:1463
+#: builtin/index-pack.c:1503
msgid "error while closing pack file"
msgstr "paket dosyası kapatılırken hata"
-#: builtin/index-pack.c:1477
+#: builtin/index-pack.c:1517
msgid "cannot store pack file"
msgstr "paket dosyası depolanamıyor"
-#: builtin/index-pack.c:1485
+#: builtin/index-pack.c:1525
msgid "cannot store index file"
msgstr "indeks dosyası depolanamıyor"
-#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862
+#: builtin/index-pack.c:1534
+msgid "cannot store reverse index file"
+msgstr "ters indeks dosyası depolanamıyor"
+
+#: builtin/index-pack.c:1580 builtin/pack-objects.c:2952
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "hatalı pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1597
+#: builtin/index-pack.c:1650
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Mevcut paket dosyası '%s' açılamıyor"
-#: builtin/index-pack.c:1599
+#: builtin/index-pack.c:1652
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "'%s' için mevcut paket idx dosyası açılamıyor"
-#: builtin/index-pack.c:1647
+#: builtin/index-pack.c:1700
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "delta değil: %d nesne"
msgstr[1] "delta değil: %d nesne"
-#: builtin/index-pack.c:1654
+#: builtin/index-pack.c:1707
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "zincir uzunluğu = %d: %lu nesne"
msgstr[1] "zincir uzunluğu = %d: %lu nesne"
-#: builtin/index-pack.c:1693
+#: builtin/index-pack.c:1765
msgid "Cannot come back to cwd"
msgstr "Şu anki çalışma dizinine geri gelinemiyor"
-#: builtin/index-pack.c:1742 builtin/index-pack.c:1745
-#: builtin/index-pack.c:1761 builtin/index-pack.c:1765
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1822
+#: builtin/index-pack.c:1838 builtin/index-pack.c:1842
#, c-format
msgid "bad %s"
msgstr "hatalı %s"
-#: builtin/index-pack.c:1781
+#: builtin/index-pack.c:1848 builtin/init-db.c:392 builtin/init-db.c:625
+#, c-format
+msgid "unknown hash algorithm '%s'"
+msgstr "bilinmeyen sağlama algoritması '%s'"
+
+#: builtin/index-pack.c:1867
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin, --stdin olmadan kullanılamaz"
-#: builtin/index-pack.c:1783
+#: builtin/index-pack.c:1869
msgid "--stdin requires a git repository"
msgstr "--stdin bir git dizini gerektirir"
-#: builtin/index-pack.c:1789
+#: builtin/index-pack.c:1871
+msgid "--object-format cannot be used with --stdin"
+msgstr "--object-format, --stdin olmadan kullanılamaz"
+
+#: builtin/index-pack.c:1886
msgid "--verify with no packfile name given"
msgstr "--verify ile bir paket dosyası adı verilmedi"
-#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582
+#: builtin/index-pack.c:1956 builtin/unpack-objects.c:582
msgid "fsck error in pack objects"
msgstr "paket nesnelerinde fsck hatası"
-#: builtin/init-db.c:61
+#: builtin/init-db.c:64
#, c-format
msgid "cannot stat template '%s'"
msgstr "'%s' şablonunun bilgileri alınamıyor"
-#: builtin/init-db.c:66
+#: builtin/init-db.c:69
#, c-format
msgid "cannot opendir '%s'"
msgstr "'%s' opendir yapılamıyor"
-#: builtin/init-db.c:78
+#: builtin/init-db.c:81
#, c-format
msgid "cannot readlink '%s'"
msgstr "'%s' readlink yapılamıyor"
-#: builtin/init-db.c:80
+#: 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:86
+#: builtin/init-db.c:89
#, c-format
msgid "cannot copy '%s' to '%s'"
msgstr "'%s' şuraya kopyalanamıyor: '%s'"
-#: builtin/init-db.c:90
+#: builtin/init-db.c:93
#, c-format
msgid "ignoring template %s"
msgstr "%s şablonu yok sayılıyor"
-#: builtin/init-db.c:121
+#: builtin/init-db.c:124
#, c-format
msgid "templates not found in %s"
msgstr "şablonlar %s içinde bulunamadı"
-#: builtin/init-db.c:136
+#: 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:334
+#: builtin/init-db.c:275
+#, c-format
+msgid "invalid initial branch name: '%s'"
+msgstr "geçersiz başlangıç dalı adı: '%s'"
+
+#: builtin/init-db.c:367
#, c-format
msgid "unable to handle file type %d"
-msgstr "%d dosya türü işlenemiyor"
+msgstr "%d dosya türü ele alınamıyor"
-#: builtin/init-db.c:337
+#: builtin/init-db.c:370
#, c-format
msgid "unable to move %s to %s"
msgstr "%s şuraya taşınamıyor: %s"
-#: builtin/init-db.c:354 builtin/init-db.c:357
+#: builtin/init-db.c:386
+msgid "attempt to reinitialize repository with different hash"
+msgstr "depoyu başka bir sağlama ile yeniden ilklendirme deneniyor"
+
+#: builtin/init-db.c:410 builtin/init-db.c:413
#, c-format
msgid "%s already exists"
msgstr "%s halihazırda var"
-#: builtin/init-db.c:413
+#: builtin/init-db.c:445
+#, c-format
+msgid "re-init: ignored --initial-branch=%s"
+msgstr "re-init: --initial-branch=%s yok sayıldı"
+
+#: builtin/init-db.c:476
#, c-format
msgid "Reinitialized existing shared Git repository in %s%s\n"
msgstr "%s%s içindeki mevcut paylaşılan Git deposu yeniden ilklendirildi\n"
-#: builtin/init-db.c:414
+#: builtin/init-db.c:477
#, c-format
msgid "Reinitialized existing Git repository in %s%s\n"
msgstr "%s%s içindeki mevcut Git deposu yeniden ilklendirildi\n"
-#: builtin/init-db.c:418
+#: builtin/init-db.c:481
#, c-format
msgid "Initialized empty shared Git repository in %s%s\n"
msgstr "%s%s içinde paylaşılan boş Git deposu ilklendirildi\n"
-#: builtin/init-db.c:419
+#: builtin/init-db.c:482
#, c-format
msgid "Initialized empty Git repository in %s%s\n"
msgstr "%s%s içinde boş Git deposu ilklendirildi\n"
-#: builtin/init-db.c:468
+#: builtin/init-db.c:531
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -15278,25 +16443,41 @@
"git init [-q | --quiet] [--bare] [--template=<şablon-dizini>] [--"
"shared[=<izinler>]] [<dizin>]"
-#: builtin/init-db.c:491
+#: builtin/init-db.c:557
msgid "permissions"
msgstr "izinler"
-#: builtin/init-db.c:492
+#: builtin/init-db.c:558
msgid "specify that the git repository is to be shared amongst several users"
msgstr "git deposunun kullanıcılar arasında paylaşıp paylaşılmayacağını belirt"
-#: builtin/init-db.c:529 builtin/init-db.c:534
+#: builtin/init-db.c:564
+msgid "override the name of the initial branch"
+msgstr "başlangıç dalının adını geçersiz kıl"
+
+#: builtin/init-db.c:565 builtin/verify-pack.c:74
+msgid "hash"
+msgstr "sağlama"
+
+#: builtin/init-db.c:566 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:573
+msgid "--separate-git-dir and --bare are mutually exclusive"
+msgstr "--separate-git-dir ve --bare birlikte kullanılamaz"
+
+#: builtin/init-db.c:602 builtin/init-db.c:607
#, c-format
msgid "cannot mkdir %s"
msgstr "%s mkdir yapılamıyor"
-#: builtin/init-db.c:538
+#: builtin/init-db.c:611 builtin/init-db.c:666
#, c-format
msgid "cannot chdir to %s"
msgstr "%s ögesine chdir yapılamıyor"
-#: builtin/init-db.c:559
+#: builtin/init-db.c:638
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -15305,10 +16486,14 @@
"%s (veya --work-tree=<dizin>), %s (veya --git-dir=<dizin>) belirlenmeden "
"izin verilmiyor"
-#: builtin/init-db.c:587
+#: builtin/init-db.c:690
#, c-format
msgid "Cannot access work tree '%s'"
-msgstr "'%s' çalışma ağacına erişilemiyor"
+msgstr "'%s' çalışma ağacı erişilemiyor"
+
+#: builtin/init-db.c:695
+msgid "--separate-git-dir incompatible with bare repository"
+msgstr "--separate-git-dir, çıplak depo ile uyumsuz"
#: builtin/interpret-trailers.c:16
msgid ""
@@ -15316,7 +16501,7 @@
"<token>[(=|:)<value>])...] [<file>...]"
msgstr ""
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
-"<token>[(=|:)<değer>])...] [<dosya>...]"
+"<jeton>[(=|:)<değer>])...] [<dosya>...]"
#: builtin/interpret-trailers.c:95
msgid "edit files in place"
@@ -15356,7 +16541,7 @@
#: builtin/interpret-trailers.c:110
msgid "do not treat --- specially"
-msgstr "şuna özel davranma: ---"
+msgstr "ayırma çizgilerine (---) özel davranma"
#: builtin/interpret-trailers.c:111
msgid "trailer"
@@ -15374,520 +16559,533 @@
msgid "no input file given for in-place editing"
msgstr "yerinde düzenleme için girdi dosyası verilmedi"
-#: builtin/log.c:56
+#: builtin/log.c:59
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<seçenekler>] [<revizyon-erimi>] [[--] <yol>...]"
-#: builtin/log.c:57
+#: builtin/log.c:60
msgid "git show [<options>] <object>..."
msgstr "git show [<seçenekler>] <nesne>..."
-#: builtin/log.c:110
+#: builtin/log.c:113
#, c-format
msgid "invalid --decorate option: %s"
msgstr "geçersiz --decorate seçeneği: %s"
-#: builtin/log.c:174
+#: builtin/log.c:180
msgid "show source"
msgstr "kaynağı göster"
-#: builtin/log.c:175
-msgid "Use mail map file"
+#: builtin/log.c:181
+msgid "use mail map file"
msgstr "posta eşlem dosyasını kullan"
-#: builtin/log.c:177
+#: builtin/log.c:184
msgid "only decorate refs that match <pattern>"
msgstr "yalnızca <dizgi> ile eşleşen başvuruları süsle"
-#: builtin/log.c:179
+#: builtin/log.c:186
msgid "do not decorate refs that match <pattern>"
msgstr "<dizgi> ile eşleşen başvuruları süsleme"
-#: builtin/log.c:180
+#: builtin/log.c:187
msgid "decorate options"
msgstr "süsleme seçenekleri"
-#: builtin/log.c:183
-msgid "Process line range n,m in file, counting from 1"
-msgstr "dosya içindeki n,m satır aralığını 1'den sayarak işle"
+#: builtin/log.c:190
+msgid ""
+"trace the evolution of line range <start>,<end> or function :<funcname> in "
+"<file>"
+msgstr ""
+"<dosya> içindeki <başlangıç>,<bitiş> satır eriminin veya :<işlevadı> "
+"işlevinin evrimini izle"
-#: builtin/log.c:281
+#: builtin/log.c:213
+msgid "-L<range>:<file> cannot be used with pathspec"
+msgstr "-L<erim>:<dosya>, yol belirteci ile kullanılamıyor"
+
+#: builtin/log.c:303
#, c-format
msgid "Final output: %d %s\n"
msgstr "Son çıktı: %d %s\n"
-#: builtin/log.c:535
+#: builtin/log.c:566
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: hatalı dosya"
-#: builtin/log.c:550 builtin/log.c:645
+#: builtin/log.c:581 builtin/log.c:671
#, c-format
msgid "could not read object %s"
msgstr "%s nesnesi okunamadı"
-#: builtin/log.c:670
+#: builtin/log.c:696
#, c-format
msgid "unknown type: %d"
msgstr "bilinmeyen tür: %d"
-#: builtin/log.c:814
+#: builtin/log.c:841
#, c-format
msgid "%s: invalid cover from description mode"
msgstr "%s: açıklama kipinden geçersiz kapak sayfası"
-#: builtin/log.c:821
+#: builtin/log.c:848
msgid "format.headers without value"
msgstr "format.headers değere iye değil"
-#: builtin/log.c:936
-msgid "name of output directory is too long"
-msgstr "çıktı dizininin adı pek uzun"
-
-#: builtin/log.c:952
+#: builtin/log.c:977
#, c-format
msgid "cannot open patch file %s"
msgstr "%s yama dosyası okunamıyor"
-#: builtin/log.c:969
+#: builtin/log.c:994
msgid "need exactly one range"
msgstr "bir tam erim gerekiyor"
-#: builtin/log.c:979
+#: builtin/log.c:1004
msgid "not a range"
msgstr "bir erim değil"
-#: builtin/log.c:1143
+#: builtin/log.c:1168
msgid "cover letter needs email format"
-msgstr "niyet mektubu için e-posta biçimi gerekli"
+msgstr "ön yazı için e-posta biçimi gerekli"
-#: builtin/log.c:1149
+#: builtin/log.c:1174
msgid "failed to create cover-letter file"
msgstr "cover-letter dosyası oluşturulamadı"
-#: builtin/log.c:1228
+#: builtin/log.c:1261
#, c-format
msgid "insane in-reply-to: %s"
msgstr "akıl almaz in-reply-to: %s"
-#: builtin/log.c:1255
+#: builtin/log.c:1288
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<seçenekler>] [<-beri> | <revizyon-erimi>]"
-#: builtin/log.c:1313
+#: builtin/log.c:1346
msgid "two output directories?"
msgstr "iki çıktı dizini?"
-#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211
+#: builtin/log.c:1497 builtin/log.c:2317 builtin/log.c:2319 builtin/log.c:2331
#, c-format
msgid "unknown commit %s"
-msgstr "bilinmeyen gönderi %s"
+msgstr "bilinmeyen işleme %s"
-#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1508 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "'%s' geçerli bir başvuru olarak çözülemedi"
-#: builtin/log.c:1439
+#: builtin/log.c:1517
msgid "could not find exact merge base"
msgstr "kesin birleştirme temeli bulunamadı"
-#: builtin/log.c:1443
+#: builtin/log.c:1527
msgid ""
"failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
"Or you could specify base commit by --base=<base-commit-id> manually"
msgstr ""
-"Üstkaynak alınamadı; taban gönderisinin kaydını kendiliğinden yazmak\n"
+"Ü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 gönderisini kendiniz --base=<taban-gönderisi-"
-"no>\n"
+"izleyin. Bunun dışında taban işlemesini kendiniz --base=<taban-işlemesi-no>\n"
"kullanarak el ile belirtebilirsiniz."
-#: builtin/log.c:1463
+#: builtin/log.c:1550
msgid "failed to find exact merge base"
msgstr "kesin birleştirme temeli bulunamadı"
-#: builtin/log.c:1474
+#: builtin/log.c:1567
msgid "base commit should be the ancestor of revision list"
-msgstr "taban gönderisi revizyon listesinin atası olmalı"
+msgstr "taban işlemesi revizyon listesinin atası olmalı"
-#: builtin/log.c:1478
+#: builtin/log.c:1577
msgid "base commit shouldn't be in revision list"
-msgstr "taban gönderisi revizyon listesinde olmamalı"
+msgstr "taban işlemesi revizyon listesinde olmamalı"
-#: builtin/log.c:1531
+#: builtin/log.c:1635
msgid "cannot get patch id"
msgstr "yama numarası alınamıyor"
-#: builtin/log.c:1583
-msgid "failed to infer range-diff ranges"
-msgstr "range-diff erimlerinden bir anlam çıkarılamadı"
+#: builtin/log.c:1692
+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:1629
+#: builtin/log.c:1694
+#, 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:1738
msgid "use [PATCH n/m] even with a single patch"
msgstr "bir yamayla bile olsa [PATCH n/m] kullan"
-#: builtin/log.c:1632
+#: builtin/log.c:1741
msgid "use [PATCH] even with multiple patches"
msgstr "birden çok yama bile olsa [PATCH] kullan"
-#: builtin/log.c:1636
+#: builtin/log.c:1745
msgid "print patches to standard out"
msgstr "yamaları standart çıktıya yazdır"
-#: builtin/log.c:1638
+#: builtin/log.c:1747
msgid "generate a cover letter"
-msgstr "bir niyet mektubu oluştur"
+msgstr "bir ön yazı oluştur"
-#: builtin/log.c:1640
+#: builtin/log.c:1749
msgid "use simple number sequence for output file names"
msgstr "çıktı dosya adları için yalın sayı dizisi oluştur"
-#: builtin/log.c:1641
+#: builtin/log.c:1750
msgid "sfx"
msgstr "sonek"
-#: builtin/log.c:1642
+#: builtin/log.c:1751
msgid "use <sfx> instead of '.patch'"
msgstr "'.patch' yerine <sonek> kullan"
-#: builtin/log.c:1644
+#: builtin/log.c:1753
msgid "start numbering patches at <n> instead of 1"
msgstr "yamaları 1 yerine <n>'de numaralandırmaya başla"
-#: builtin/log.c:1646
+#: builtin/log.c:1755
msgid "mark the series as Nth re-roll"
msgstr "diziyi n. deneme olarak imle"
-#: builtin/log.c:1648
-msgid "Use [RFC PATCH] instead of [PATCH]"
+#: builtin/log.c:1757
+msgid "max length of output filename"
+msgstr "çıktı dosya adının olabilecek en çok uzunluğu"
+
+#: builtin/log.c:1759
+msgid "use [RFC PATCH] instead of [PATCH]"
msgstr "[PATCH] yerine [RFC PATCH] kullan"
-#: builtin/log.c:1651
+#: builtin/log.c:1762
msgid "cover-from-description-mode"
msgstr "açıklama kipinden kapak sayfası kipi"
-#: builtin/log.c:1652
+#: builtin/log.c:1763
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"
+msgstr "ön yazının bazı kısımlarını dalın açıklamasından oluştur"
-#: builtin/log.c:1654
-msgid "Use [<prefix>] instead of [PATCH]"
+#: builtin/log.c:1765
+msgid "use [<prefix>] instead of [PATCH]"
msgstr "[PATCH] yerine [<önek>] kullan"
-#: builtin/log.c:1657
+#: builtin/log.c:1768
msgid "store resulting files in <dir>"
msgstr "ortaya çıkan dosyaları <dizin>'de depola"
-#: builtin/log.c:1660
+#: builtin/log.c:1771
msgid "don't strip/add [PATCH]"
msgstr "[PATCH]'i soyma/ekleme"
-#: builtin/log.c:1663
+#: builtin/log.c:1774
msgid "don't output binary diffs"
msgstr "ikili diff'leri çıktı verme"
-#: builtin/log.c:1665
+#: builtin/log.c:1776
msgid "output all-zero hash in From header"
msgstr "From başlığında tümü sıfırdan oluşan sağlama çıktısı ver"
-#: builtin/log.c:1667
+#: builtin/log.c:1778
msgid "don't include a patch matching a commit upstream"
-msgstr "üstkaynaktaki bir gönderi ile eşleşen bir yamayı içerme"
+msgstr "üstkaynaktaki bir işleme ile eşleşen bir yamayı içerme"
-#: builtin/log.c:1669
+#: builtin/log.c:1780
msgid "show patch format instead of default (patch + stat)"
msgstr "öntanımlı yerine yama biçimini göster (patch + stat)"
-#: builtin/log.c:1671
+#: builtin/log.c:1782
msgid "Messaging"
msgstr "İletileşme"
-#: builtin/log.c:1672
+#: builtin/log.c:1783
msgid "header"
-msgstr "başlık"
+msgstr "üstbilgi"
-#: builtin/log.c:1673
+#: builtin/log.c:1784
msgid "add email header"
-msgstr "e-posta başlığı ekle"
+msgstr "e-posta üstbilgisi ekle"
-#: builtin/log.c:1674 builtin/log.c:1676
+#: builtin/log.c:1785 builtin/log.c:1786
msgid "email"
msgstr "e-posta"
-#: builtin/log.c:1674
+#: builtin/log.c:1785
msgid "add To: header"
-msgstr "To: başlığı ekle"
+msgstr "To: üstbilgisi ekle"
-#: builtin/log.c:1676
+#: builtin/log.c:1786
msgid "add Cc: header"
-msgstr "Cc: başlığı ekle"
+msgstr "Cc: üstbilgisi ekle"
-#: builtin/log.c:1678
+#: builtin/log.c:1787
msgid "ident"
msgstr "tanımlayıcı"
-#: builtin/log.c:1679
+#: builtin/log.c:1788
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
-"From adresini <tanımlayıcı> olarak ayarla (veya yoksa gönderici "
-"tanımlayıcısı)"
+"From adresini <tanımlayıcı> olarak ayarla (veya yoksa işleyici tanımlayıcısı)"
-#: builtin/log.c:1681
+#: builtin/log.c:1790
msgid "message-id"
msgstr "ileti no"
-#: builtin/log.c:1682
+#: builtin/log.c:1791
msgid "make first mail a reply to <message-id>"
msgstr "ilk postayı <ileti no>'ya bir yanıt yap"
-#: builtin/log.c:1683 builtin/log.c:1686
+#: builtin/log.c:1792 builtin/log.c:1795
msgid "boundary"
msgstr "sınır"
-#: builtin/log.c:1684
+#: builtin/log.c:1793
msgid "attach the patch"
msgstr "yamayı ekle"
-#: builtin/log.c:1687
+#: builtin/log.c:1796
msgid "inline the patch"
msgstr "yamayı iletiye koy"
-#: builtin/log.c:1691
+#: builtin/log.c:1800
msgid "enable message threading, styles: shallow, deep"
msgstr "iletileri kataloglamayı etkinleştir, stiller: shallow, deep"
-#: builtin/log.c:1693
+#: builtin/log.c:1802
msgid "signature"
msgstr "imza"
-#: builtin/log.c:1694
+#: builtin/log.c:1803
msgid "add a signature"
msgstr "imza ekle"
-#: builtin/log.c:1695
+#: builtin/log.c:1804
msgid "base-commit"
-msgstr "taban gönderi"
+msgstr "taban işleme"
-#: builtin/log.c:1696
+#: builtin/log.c:1805
msgid "add prerequisite tree info to the patch series"
-msgstr "yama dizisine önkoşulan ağaç bilgisini ekle"
+msgstr "yama dizisine önkoşul ağaç bilgisini ekle"
-#: builtin/log.c:1698
+#: builtin/log.c:1808
msgid "add a signature from a file"
msgstr "dosyadan bir imza ekle"
-#: builtin/log.c:1699
+#: builtin/log.c:1809
msgid "don't print the patch filenames"
msgstr "yama dosya adlarını yazdırma"
-#: builtin/log.c:1701
+#: builtin/log.c:1811
msgid "show progress while generating patches"
msgstr "yamalar oluşturulurken ilerlemeyi göster"
-#: builtin/log.c:1703
+#: builtin/log.c:1813
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"
+msgstr "<rev> karşısındaki değişiklikleri ön yazıda veya tek bir yamada göster"
-#: builtin/log.c:1706
+#: builtin/log.c:1816
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"
+"<bşvr-blrtç> karşısındaki değişiklikleri ön yazıda veya tek bir yamada göster"
-#: builtin/log.c:1708
+#: builtin/log.c:1818
msgid "percentage by which creation is weighted"
msgstr "oluşumun tartıldığı yüzde"
-#: builtin/log.c:1792
+#: builtin/log.c:1904
#, c-format
msgid "invalid ident line: %s"
msgstr "geçersiz tanımlayıcı satırı: %s"
-#: builtin/log.c:1807
+#: builtin/log.c:1919
msgid "-n and -k are mutually exclusive"
msgstr "-n ve -k birlikte kullanılamaz"
-#: builtin/log.c:1809
+#: builtin/log.c:1921
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "--subject-prefix/--rfc ve -k birlikte kullanılamaz"
-#: builtin/log.c:1817
+#: builtin/log.c:1929
msgid "--name-only does not make sense"
msgstr "--name-only bir anlam ifade etmiyor"
-#: builtin/log.c:1819
+#: builtin/log.c:1931
msgid "--name-status does not make sense"
msgstr "--name-status bir anlam ifade etmiyor"
-#: builtin/log.c:1821
+#: builtin/log.c:1933
msgid "--check does not make sense"
msgstr "--check bir anlam ifade etmiyor"
-#: builtin/log.c:1854
-msgid "standard output, or directory, which one?"
-msgstr "standart çıktı veya dizin, hangisi?"
+#: builtin/log.c:1955
+msgid "--stdout, --output, and --output-directory are mutually exclusive"
+msgstr "--stdout, --output ve --output-directory birlikte kullanılamaz"
-#: builtin/log.c:1958
+#: builtin/log.c:2078
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff, --cover-letter veya tek yama gerektiriyor"
-#: builtin/log.c:1962
+#: builtin/log.c:2082
msgid "Interdiff:"
msgstr "Interdiff:"
-#: builtin/log.c:1963
+#: builtin/log.c:2083
#, c-format
msgid "Interdiff against v%d:"
msgstr "Interdiff v%d karşısında:"
-#: builtin/log.c:1969
+#: builtin/log.c:2089
msgid "--creation-factor requires --range-diff"
msgstr "--creation-factor, --range-diff gerektiriyor"
-#: builtin/log.c:1973
+#: builtin/log.c:2093
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff, --cover-letter veya tek yama gerektiriyor"
-#: builtin/log.c:1981
+#: builtin/log.c:2101
msgid "Range-diff:"
msgstr "Range-diff:"
-#: builtin/log.c:1982
+#: builtin/log.c:2102
#, c-format
msgid "Range-diff against v%d:"
msgstr "Range-diff v%d karşısında:"
-#: builtin/log.c:1993
+#: builtin/log.c:2113
#, c-format
msgid "unable to read signature file '%s'"
msgstr "'%s' imza dosyası okunamıyor"
-#: builtin/log.c:2029
+#: builtin/log.c:2149
msgid "Generating patches"
msgstr "Yamalar oluşturuluyor"
-#: builtin/log.c:2073
+#: builtin/log.c:2193
msgid "failed to create output files"
msgstr "çıktı dosyaları oluşturulamadı"
-#: builtin/log.c:2132
+#: builtin/log.c:2252
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<üstkaynak> [<dal-ucu> [<sınır>]]]"
-#: builtin/log.c:2186
+#: builtin/log.c:2306
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "İzlenen bir uzak dal bulunamadı, lütfen el ile <üstkaynak> belirtin.\n"
-#: builtin/ls-files.c:470
+#: builtin/ls-files.c:486
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<seçenekler>] [<dosya>...]"
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:542
msgid "identify the file status with tags"
msgstr "dosya durumunu etiketlerle tanımla"
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:544
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "'değiştirilmediği düşünülen' dosyaları küçük harflerle göster"
-#: builtin/ls-files.c:530
+#: builtin/ls-files.c:546
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "'fsmonitor clean' dosyalarını küçük harflerle göster"
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:548
msgid "show cached files in the output (default)"
msgstr "önbelleğe alınan dosyaları çıktıda göster (öntanımlı)"
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:550
msgid "show deleted files in the output"
msgstr "silinen dosyaları çıktıda göster"
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:552
msgid "show modified files in the output"
msgstr "değiştirilen dosyaları çıktıda göster"
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:554
msgid "show other files in the output"
msgstr "diğer dosyaları çıktıda göster"
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:556
msgid "show ignored files in the output"
msgstr "yok sayılan dosyaları çıktıda göster"
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:559
msgid "show staged contents' object name in the output"
msgstr "hazırlanan içeriğin nesne adını çıktıda göster"
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:561
msgid "show files on the filesystem that need to be removed"
msgstr "dosya sistemindeki kaldırılması gereken dosyaları göster"
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:563
msgid "show 'other' directories' names only"
msgstr "'diğer' dizinlerin yalnızca adını göster"
-#: builtin/ls-files.c:549
+#: builtin/ls-files.c:565
msgid "show line endings of files"
msgstr "dosyaların satır sonlarını göster"
-#: builtin/ls-files.c:551
+#: builtin/ls-files.c:567
msgid "don't show empty directories"
msgstr "boş dizinleri gösterme"
-#: builtin/ls-files.c:554
+#: builtin/ls-files.c:570
msgid "show unmerged files in the output"
msgstr "birleştirilmemiş dosyaları çıktıda göster"
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:572
msgid "show resolve-undo information"
msgstr "'resolve-undo' bilgisini göster"
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:574
msgid "skip files matching pattern"
msgstr "dizgi ile eşleşen dosyaları atla"
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:577
msgid "exclude patterns are read from <file>"
msgstr "hariç tutma dizgileri <dosya>'dan okunuyor"
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:580
msgid "read additional per-directory exclude patterns in <file>"
msgstr "ek dizin başı hariç tutma dizgilerini <dosya>'dan oku"
-#: builtin/ls-files.c:566
+#: builtin/ls-files.c:582
msgid "add the standard git exclusions"
msgstr "standart git hariç tutmalarını ekle"
-#: builtin/ls-files.c:570
+#: builtin/ls-files.c:586
msgid "make the output relative to the project top directory"
msgstr "çıktıyı en üst proje dizinine göreceli olarak yap"
-#: builtin/ls-files.c:573
+#: builtin/ls-files.c:589
msgid "recurse through submodules"
msgstr "altmodüller içinden özyinele"
-#: builtin/ls-files.c:575
+#: builtin/ls-files.c:591
msgid "if any <file> is not in the index, treat this as an error"
msgstr "eğer bir <dosya> indekste değilse bunu bir hata olarak gör"
-#: builtin/ls-files.c:576
+#: builtin/ls-files.c:592
msgid "tree-ish"
msgstr "ağacımsı"
-#: builtin/ls-files.c:577
+#: builtin/ls-files.c:593
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "<ağacımsı>'dan bu yana kaldırılan yolların hâlâ var olduğunu varsay"
-#: builtin/ls-files.c:579
+#: builtin/ls-files.c:595
msgid "show debugging data"
msgstr "hata ayıklama verisini göster"
+#: builtin/ls-files.c:597
+msgid "suppress duplicate entries"
+msgstr "yinelenen girdileri sustur"
+
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
@@ -15898,39 +17096,39 @@
" [-q | --quiet] [--exit-code] [--get-url]\n"
" [--symref] [<depo> [<başvurular>...]]"
-#: builtin/ls-remote.c:59
+#: builtin/ls-remote.c:60
msgid "do not print remote URL"
msgstr "uzak konum URL'sini yazdırma"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1404
msgid "exec"
msgstr "çalıştır"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
+#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
msgid "path of git-upload-pack on the remote host"
msgstr "uzak konum makinesindeki git-upload-pack yolu"
-#: builtin/ls-remote.c:65
+#: builtin/ls-remote.c:66
msgid "limit to tags"
msgstr "etiketlere kısıtla"
-#: builtin/ls-remote.c:66
-msgid "limit to heads"
-msgstr "uç gönderilere kısıtla"
-
#: builtin/ls-remote.c:67
+msgid "limit to heads"
+msgstr "uç işlemelere kısıtla"
+
+#: builtin/ls-remote.c:68
msgid "do not show peeled tags"
msgstr "soyulmuş etiketleri gösterme"
-#: builtin/ls-remote.c:69
+#: builtin/ls-remote.c:70
msgid "take url.<base>.insteadOf into account"
msgstr "url.<temel>.insteadOf'u dikkate al"
-#: builtin/ls-remote.c:72
+#: builtin/ls-remote.c:73
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
+#: builtin/ls-remote.c:76
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"
@@ -15975,430 +17173,45 @@
msgid "empty mbox: '%s'"
msgstr "boş mbox: '%s'"
-#: builtin/merge.c:55
-msgid "git merge [<options>] [<commit>...]"
-msgstr "git merge [<seçenekler>] [<gönderi>...]"
-
-#: builtin/merge.c:56
-msgid "git merge --abort"
-msgstr "git merge --abort"
-
-#: builtin/merge.c:57
-msgid "git merge --continue"
-msgstr "git merge --continue"
-
-#: builtin/merge.c:119
-msgid "switch `m' requires a value"
-msgstr "'m' anahtarı bir değer gerektiriyor"
-
-#: builtin/merge.c:142
-#, c-format
-msgid "option `%s' requires a value"
-msgstr "'%s' seçeneği bir değer gerektiriyor"
-
-#: builtin/merge.c:188
-#, c-format
-msgid "Could not find merge strategy '%s'.\n"
-msgstr "Birleştirme stratejisi '%s' bulunamadı.\n"
-
-#: builtin/merge.c:189
-#, c-format
-msgid "Available strategies are:"
-msgstr "Kullanılabilir stratejiler:"
-
-#: builtin/merge.c:194
-#, c-format
-msgid "Available custom strategies are:"
-msgstr "Kullanılabilir özel stratejiler:"
-
-#: builtin/merge.c:245 builtin/pull.c:132
-msgid "do not show a diffstat at the end of the merge"
-msgstr "birleştirmenin sonunda bir diffstat gösterme"
-
-#: builtin/merge.c:248 builtin/pull.c:135
-msgid "show a diffstat at the end of the merge"
-msgstr "birleştirmenin sonunda bir diffstat göster"
-
-#: builtin/merge.c:249 builtin/pull.c:138
-msgid "(synonym to --stat)"
-msgstr "(--stat eşanlamlısı)"
-
-#: builtin/merge.c:251 builtin/pull.c:141
-msgid "add (at most <n>) entries from shortlog to merge commit message"
-msgstr ""
-"kısa günlükten birleştirme gönderisi iletisine girdiler (en çok <n>) ekle"
-
-#: builtin/merge.c:254 builtin/pull.c:147
-msgid "create a single commit instead of doing a merge"
-msgstr "bir birleştirme yerine tek bir gönderi oluştur"
-
-#: builtin/merge.c:256 builtin/pull.c:150
-msgid "perform a commit if the merge succeeds (default)"
-msgstr "birleştirme başarılı olursa bir gönderi gerçekleştir (öntanımlı)"
-
-#: builtin/merge.c:258 builtin/pull.c:153
-msgid "edit message before committing"
-msgstr "göndermeden önce iletiyi düzenle"
-
-#: builtin/merge.c:260
-msgid "allow fast-forward (default)"
-msgstr "ileri sarıma izin ver (öntanımlı)"
-
-#: builtin/merge.c:262 builtin/pull.c:160
-msgid "abort if fast-forward is not possible"
-msgstr "ileri sarım olanaklı değilse iptal et"
-
-#: builtin/merge.c:266 builtin/pull.c:163
-msgid "verify that the named commit has a valid GPG signature"
-msgstr "adı verilen gönderinin geçerli bir GPG imzası olduğunu doğrula"
-
-#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167
-#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114
-msgid "strategy"
-msgstr "strateji"
-
-#: builtin/merge.c:268 builtin/pull.c:168
-msgid "merge strategy to use"
-msgstr "kullanılacak birleştirme stratejisi"
-
-#: builtin/merge.c:269 builtin/pull.c:171
-msgid "option=value"
-msgstr "seçenek=değer"
-
-#: builtin/merge.c:270 builtin/pull.c:172
-msgid "option for selected merge strategy"
-msgstr "seçili birleştirme stratejisi için seçenekler"
-
-#: builtin/merge.c:272
-msgid "merge commit message (for a non-fast-forward merge)"
-msgstr ""
-"birleştirme gönderisi iletisi (ileri sarım olmayan bir birleştirme için)"
-
-#: builtin/merge.c:279
-msgid "abort the current in-progress merge"
-msgstr "ilerlemekte olan geçerli birleştirmeyi iptal et"
-
-#: builtin/merge.c:281
-msgid "--abort but leave index and working tree alone"
-msgstr "--abort, ancak indeksi ve çalışma ağacını değiştirmeden bırakın"
-
-#: builtin/merge.c:283
-msgid "continue the current in-progress merge"
-msgstr "ilerlemekte olan geçerli birleştirmeyi sürdürün"
-
-#: builtin/merge.c:285 builtin/pull.c:179
-msgid "allow merging unrelated histories"
-msgstr "birbiriyle ilişkisi olmayan geçmişlerin birleştirilmesine izin ver"
-
-#: builtin/merge.c:291
-msgid "bypass pre-merge-commit and commit-msg hooks"
-msgstr "pre-merge-commit ve commit-msg kancalarını atla"
-
-#: builtin/merge.c:308
-msgid "could not run stash."
-msgstr "zula alınamadı"
-
-#: builtin/merge.c:313
-msgid "stash failed"
-msgstr "zula başarısız oldu"
-
-#: builtin/merge.c:318
-#, c-format
-msgid "not a valid object: %s"
-msgstr "geçerli bir nesne değil: %s"
-
-#: builtin/merge.c:340 builtin/merge.c:357
-msgid "read-tree failed"
-msgstr "read-tree başarısız oldu"
-
-#: builtin/merge.c:387
-msgid " (nothing to squash)"
-msgstr " (tıkıştırılacak bir şey yok)"
-
-#: builtin/merge.c:398
-#, c-format
-msgid "Squash commit -- not updating HEAD\n"
-msgstr "Tıkıştırma gönderisi -- HEAD güncellenmiyor\n"
-
-#: builtin/merge.c:448
-#, c-format
-msgid "No merge message -- not updating HEAD\n"
-msgstr "Birleştirme iletisi yok -- HEAD güncellenmiyor\n"
-
-#: builtin/merge.c:499
-#, c-format
-msgid "'%s' does not point to a commit"
-msgstr "'%s' bir gönderiye işaret etmiyor"
-
-#: builtin/merge.c:586
-#, c-format
-msgid "Bad branch.%s.mergeoptions string: %s"
-msgstr "Hatalı branch.%s.mergeoptions dizisi: %s"
-
-#: builtin/merge.c:708
-msgid "Not handling anything other than two heads merge."
-msgstr "İki uç gönderi birleştirmesi dışında bir şey yapılmıyor."
-
-#: builtin/merge.c:722
-#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "merge-recursive için geçersiz seçenek: -X%s"
-
-#: builtin/merge.c:737
-#, c-format
-msgid "unable to write %s"
-msgstr "%s yazılamıyor"
-
-#: builtin/merge.c:789
-#, c-format
-msgid "Could not read from '%s'"
-msgstr "Şuradan okunamadı: '%s'"
-
-#: builtin/merge.c:798
-#, c-format
-msgid "Not committing merge; use 'git commit' to complete the merge.\n"
-msgstr "Birleştirme gönderilmiyor, tamamlamak için 'git commit' kullanın.\n"
-
-#: builtin/merge.c:804
-msgid ""
-"Please enter a commit message to explain why this merge is necessary,\n"
-"especially if it merges an updated upstream into a topic branch.\n"
-"\n"
-msgstr ""
-"Bu birleştirmenin neden gerekli olduğunu açıklamak için bir gönderi iletisi\n"
-"girin, özellikle güncellenmiş bir üstkaynağı kişisel dala birleştiriyorsa.\n"
-"\n"
-
-#: builtin/merge.c:809
-msgid "An empty message aborts the commit.\n"
-msgstr "Boş bir ileti gönderiyi iptal eder.\n"
-
-#: builtin/merge.c:812
-#, c-format
-msgid ""
-"Lines starting with '%c' will be ignored, and an empty message aborts\n"
-"the commit.\n"
-msgstr ""
-"'%c' ile başlayan satırlar yok sayılacaktır. Boş bir ileti gönderiyi\n"
-"iptal eder.\n"
-
-#: builtin/merge.c:865
-msgid "Empty commit message."
-msgstr "Boş gönderi iletisi."
-
-#: builtin/merge.c:880
-#, c-format
-msgid "Wonderful.\n"
-msgstr "Harika.\n"
-
-#: builtin/merge.c:941
-#, c-format
-msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
-msgstr ""
-"Otomatik birleştirme başarısız; çakışmaları çözün ve sonucu gönderin.\n"
-
-#: builtin/merge.c:980
-msgid "No current branch."
-msgstr "Geçerli dal yok."
-
-#: builtin/merge.c:982
-msgid "No remote for the current branch."
-msgstr "Geçerli dal için uzak konum yok."
-
-#: builtin/merge.c:984
-msgid "No default upstream defined for the current branch."
-msgstr "Geçerli dal için öntanımlı üstkaynak tanımlanmamış."
-
-#: builtin/merge.c:989
-#, c-format
-msgid "No remote-tracking branch for %s from %s"
-msgstr "%s için %s konumundan uzak izleyen dal yok"
-
-#: builtin/merge.c:1046
-#, c-format
-msgid "Bad value '%s' in environment '%s'"
-msgstr "Hatalı değer '%s', '%s' ortamında"
-
-#: builtin/merge.c:1149
-#, c-format
-msgid "not something we can merge in %s: %s"
-msgstr "%s içinde birleştirebileceğimiz bir şey değil: %s"
-
-#: builtin/merge.c:1183
-msgid "not something we can merge"
-msgstr "birleştirebileceğimiz bir şey değil"
-
-#: builtin/merge.c:1286
-msgid "--abort expects no arguments"
-msgstr "--abort bir değişken beklemez"
-
-#: builtin/merge.c:1290
-msgid "There is no merge to abort (MERGE_HEAD missing)."
-msgstr "İptal edilecek bir birleştirme yok (MERGE_HEAD eksik)."
-
-#: builtin/merge.c:1299
-msgid "--quit expects no arguments"
-msgstr "--quit bir değişken beklemez"
-
-#: builtin/merge.c:1312
-msgid "--continue expects no arguments"
-msgstr "--continue bir değişken beklemez"
-
-#: builtin/merge.c:1316
-msgid "There is no merge in progress (MERGE_HEAD missing)."
-msgstr "İlerlemekte olan bir birleştirme yok (MERGE_HEAD eksik)."
-
-#: builtin/merge.c:1332
-msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you merge."
-msgstr ""
-"Birleştirmenizi sonuçlandırmadınız (MERGE_HEAD mevcut).\n"
-"Lütfen birleştirmeden önce değişikliklerinizi gönderin."
-
-#: builtin/merge.c:1339
-msgid ""
-"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
-"Please, commit your changes before you merge."
-msgstr ""
-"Seç-al'ınızı sonuçlandırmadınız (CHERRY_PICK_HEAD mevcut).\n"
-"Lütfen birleştirmeden önce değişikliklerinizi gönderin."
-
-#: builtin/merge.c:1342
-msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
-msgstr "Seç-al'ınızı sonuçlandırmadınız (CHERRY_PICK_HEAD mevcut)."
-
-#: builtin/merge.c:1356
-msgid "You cannot combine --squash with --no-ff."
-msgstr "--squash ile --no-ff birlikte kullanılamaz."
-
-#: builtin/merge.c:1358
-msgid "You cannot combine --squash with --commit."
-msgstr "--squash ile --commit birlikte kullanılamaz."
-
-#: builtin/merge.c:1374
-msgid "No commit specified and merge.defaultToUpstream not set."
-msgstr "Belirtilen bir gönderi yok ve merge.defaultToUpstream ayarlanmamış."
-
-#: builtin/merge.c:1391
-msgid "Squash commit into empty head not supported yet"
-msgstr "Gönderiyi boş dal ucuna tıkıştırma henüz desteklenmiyor"
-
-#: builtin/merge.c:1393
-msgid "Non-fast-forward commit does not make sense into an empty head"
-msgstr ""
-"İleri sarım olmayan gönderiyi boş dal ucuna yapmak bir anlam ifade etmiyor"
-
-#: builtin/merge.c:1398
-#, c-format
-msgid "%s - not something we can merge"
-msgstr "%s - birleştirebileceğimiz bir şey değil"
-
-#: builtin/merge.c:1400
-msgid "Can merge only exactly one commit into empty head"
-msgstr "Boş dal ucuna tam olarak yalnızca bir gönderi birleştirilebilir"
-
-#: builtin/merge.c:1481
-msgid "refusing to merge unrelated histories"
-msgstr "birbiriyle ilişkisi olmayan geçmişleri birleştirme reddediliyor"
-
-#: builtin/merge.c:1490
-msgid "Already up to date."
-msgstr "Her şey güncel."
-
-#: builtin/merge.c:1500
-#, c-format
-msgid "Updating %s..%s\n"
-msgstr "Güncelleniyor: %s..%s\n"
-
-#: builtin/merge.c:1542
-#, c-format
-msgid "Trying really trivial in-index merge...\n"
-msgstr "Gerçekten önemsiz indeks içi birleştirme deneniyor...\n"
-
-#: builtin/merge.c:1549
-#, c-format
-msgid "Nope.\n"
-msgstr "Yok.\n"
-
-#: builtin/merge.c:1574
-msgid "Already up to date. Yeeah!"
-msgstr "Her şey güncel. İşte bu!"
-
-#: builtin/merge.c:1580
-msgid "Not possible to fast-forward, aborting."
-msgstr "İleri sarma olanaklı değil, iptal ediliyor."
-
-#: builtin/merge.c:1603 builtin/merge.c:1668
-#, c-format
-msgid "Rewinding the tree to pristine...\n"
-msgstr "Ağaç bozulmamış durumuna geri sarılıyor...\n"
-
-#: builtin/merge.c:1607
-#, c-format
-msgid "Trying merge strategy %s...\n"
-msgstr "%s birleştirme stratejisi deneniyor...\n"
-
-#: builtin/merge.c:1659
-#, c-format
-msgid "No merge strategy handled the merge.\n"
-msgstr "Birleştirmeyi hiçbir birleştirme stratejisi işlemedi\n"
-
-#: builtin/merge.c:1661
-#, c-format
-msgid "Merge with strategy %s failed.\n"
-msgstr "%s stratejisi ile birleştirme başarısız oldu.\n"
-
-#: builtin/merge.c:1670
-#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
-msgstr "El ile çözümü hazırlamak için %s kullanılıyor.\n"
-
-#: builtin/merge.c:1682
-#, c-format
-msgid "Automatic merge went well; stopped before committing as requested\n"
-msgstr ""
-"Otomatik birleştirme iyi geçti; istendiği üzere gönderme öncesinde durdu.\n"
-
#: builtin/merge-base.c:32
msgid "git merge-base [-a | --all] <commit> <commit>..."
-msgstr "git merge-base [-a | --all] <gönderi> <gönderi>..."
+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 <gönderi>..."
+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 <gönderi>..."
+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 <gönderi> <gönderi>"
+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> [<gönderi>]"
+msgstr "git merge-base --fork-point <başvuru> [<işleme>]"
-#: builtin/merge-base.c:153
+#: builtin/merge-base.c:143
msgid "output all common ancestors"
msgstr "tüm ortak ataları çıktı ver"
-#: builtin/merge-base.c:155
+#: 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:157
+#: 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:159
+#: builtin/merge-base.c:149
msgid "is the first one ancestor of the other?"
msgstr "ilki diğerlerinin atası mı?"
-#: builtin/merge-base.c:161
+#: builtin/merge-base.c:151
msgid "find where <commit> forked from reflog of <ref>"
-msgstr "<gönderi>'nin nerede <başvuru>'nun günlüğünden çatallandığını bul"
+msgstr "<işleme>'nin nerede <başvuru>'nun günlüğünden çatallandığını bul"
#: builtin/merge-file.c:9
msgid ""
@@ -16454,8 +17267,8 @@
#, c-format
msgid "cannot handle more than %d base. Ignoring %s."
msgid_plural "cannot handle more than %d bases. Ignoring %s."
-msgstr[0] "%d tabandan fazlası işlenemiyor. %s yok sayılıyor."
-msgstr[1] "%d tabandan fazlası işlenemiyor. %s yok sayılıyor."
+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."
@@ -16471,6 +17284,431 @@
msgid "Merging %s with %s\n"
msgstr "%s, %s ile birleştiriliyor\n"
+#: builtin/merge.c:58
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<seçenekler>] [<işleme>...]"
+
+#: builtin/merge.c:59
+msgid "git merge --abort"
+msgstr "git merge --abort"
+
+#: builtin/merge.c:60
+msgid "git merge --continue"
+msgstr "git merge --continue"
+
+#: builtin/merge.c:123
+msgid "switch `m' requires a value"
+msgstr "'m' anahtarı bir değer gerektiriyor"
+
+#: builtin/merge.c:146
+#, c-format
+msgid "option `%s' requires a value"
+msgstr "'%s' seçeneği bir değer gerektiriyor"
+
+#: builtin/merge.c:199
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr "Birleştirme stratejisi '%s' bulunamadı.\n"
+
+#: builtin/merge.c:200
+#, c-format
+msgid "Available strategies are:"
+msgstr "Kullanılabilir stratejiler:"
+
+#: builtin/merge.c:205
+#, c-format
+msgid "Available custom strategies are:"
+msgstr "Kullanılabilir özel stratejiler:"
+
+#: builtin/merge.c:256 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:259 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:260 builtin/pull.c:139
+msgid "(synonym to --stat)"
+msgstr "(--stat eşanlamlısı)"
+
+#: builtin/merge.c:262 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:265 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:267 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:269 builtin/pull.c:154
+msgid "edit message before committing"
+msgstr "göndermeden önce iletiyi düzenle"
+
+#: builtin/merge.c:271
+msgid "allow fast-forward (default)"
+msgstr "ileri sarıma izin ver (öntanımlı)"
+
+#: builtin/merge.c:273 builtin/pull.c:161
+msgid "abort if fast-forward is not possible"
+msgstr "ileri sarım olanaklı değilse iptal et"
+
+#: builtin/merge.c:277 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:278 builtin/notes.c:787 builtin/pull.c:168
+#: builtin/rebase.c:541 builtin/rebase.c:1418 builtin/revert.c:114
+msgid "strategy"
+msgstr "strateji"
+
+#: builtin/merge.c:279 builtin/pull.c:169
+msgid "merge strategy to use"
+msgstr "kullanılacak birleştirme stratejisi"
+
+#: builtin/merge.c:280 builtin/pull.c:172
+msgid "option=value"
+msgstr "seçenek=değer"
+
+#: builtin/merge.c:281 builtin/pull.c:173
+msgid "option for selected merge strategy"
+msgstr "seçili birleştirme stratejisi için seçenekler"
+
+#: builtin/merge.c:283
+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:290
+msgid "abort the current in-progress merge"
+msgstr "ilerlemekte olan geçerli birleştirmeyi iptal et"
+
+#: builtin/merge.c:292
+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:294
+msgid "continue the current in-progress merge"
+msgstr "ilerlemekte olan geçerli birleştirmeyi sürdürün"
+
+#: builtin/merge.c:296 builtin/pull.c:180
+msgid "allow merging unrelated histories"
+msgstr "birbiriyle ilişkisi olmayan geçmişlerin birleştirilmesine izin ver"
+
+#: builtin/merge.c:303
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr "pre-merge-commit ve commit-msg kancalarını atla"
+
+#: builtin/merge.c:320
+msgid "could not run stash."
+msgstr "zula yapılamadı"
+
+#: builtin/merge.c:325
+msgid "stash failed"
+msgstr "zulalama başarısız oldu"
+
+#: builtin/merge.c:330
+#, c-format
+msgid "not a valid object: %s"
+msgstr "geçerli bir nesne değil: %s"
+
+#: builtin/merge.c:352 builtin/merge.c:369
+msgid "read-tree failed"
+msgstr "read-tree başarısız oldu"
+
+#: builtin/merge.c:399
+msgid " (nothing to squash)"
+msgstr " (tıkıştırılacak bir şey yok)"
+
+#: builtin/merge.c:410
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr "Tıkıştırma işlemesi -- HEAD güncellenmiyor\n"
+
+#: builtin/merge.c:460
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr "Birleştirme iletisi yok -- HEAD güncellenmiyor\n"
+
+#: builtin/merge.c:511
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr "'%s' bir işlemeye işaret etmiyor"
+
+#: builtin/merge.c:598
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr "Hatalı branch.%s.mergeoptions dizisi: %s"
+
+#: builtin/merge.c:724
+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:737
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr "merge-recursive için geçersiz seçenek: -X%s"
+
+#: builtin/merge.c:756 t/helper/test-fast-rebase.c:209
+#, c-format
+msgid "unable to write %s"
+msgstr "%s yazılamıyor"
+
+#: builtin/merge.c:808
+#, c-format
+msgid "Could not read from '%s'"
+msgstr "Şu konumdan okunamadı: '%s'"
+
+#: builtin/merge.c:817
+#, 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:823
+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:828
+msgid "An empty message aborts the commit.\n"
+msgstr "Boş bir ileti işlemeyi iptal eder.\n"
+
+#: builtin/merge.c:831
+#, 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:884
+msgid "Empty commit message."
+msgstr "Boş işleme iletisi."
+
+#: builtin/merge.c:899
+#, c-format
+msgid "Wonderful.\n"
+msgstr "Harika.\n"
+
+#: builtin/merge.c:960
+#, 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:999
+msgid "No current branch."
+msgstr "Geçerli dal yok."
+
+#: builtin/merge.c:1001
+msgid "No remote for the current branch."
+msgstr "Geçerli dal için uzak konum yok."
+
+#: builtin/merge.c:1003
+msgid "No default upstream defined for the current branch."
+msgstr "Geçerli dal için öntanımlı üstkaynak tanımlanmamış."
+
+#: builtin/merge.c:1008
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
+msgstr "%s için %s konumundan uzak izleme dalı yok"
+
+#: builtin/merge.c:1065
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "Hatalı değer '%s', '%s' ortamında"
+
+#: builtin/merge.c:1168
+#, 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:1202
+msgid "not something we can merge"
+msgstr "birleştirebileceğimiz bir şey değil"
+
+#: builtin/merge.c:1312
+msgid "--abort expects no arguments"
+msgstr "--abort bir argüman beklemez"
+
+#: builtin/merge.c:1316
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr "İptal edilecek bir birleştirme yok (MERGE_HEAD eksik)."
+
+#: builtin/merge.c:1334
+msgid "--quit expects no arguments"
+msgstr "--quit bir argüman beklemez"
+
+#: builtin/merge.c:1347
+msgid "--continue expects no arguments"
+msgstr "--continue bir argüman beklemez"
+
+#: builtin/merge.c:1351
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr "İlerlemekte olan bir birleştirme yok (MERGE_HEAD eksik)."
+
+#: builtin/merge.c:1367
+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:1374
+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:1377
+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:1391
+msgid "You cannot combine --squash with --no-ff."
+msgstr "--squash ile --no-ff birlikte kullanılamaz."
+
+#: builtin/merge.c:1393
+msgid "You cannot combine --squash with --commit."
+msgstr "--squash ile --commit birlikte kullanılamaz."
+
+#: builtin/merge.c:1409
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr "Belirtilen bir işleme yok ve merge.defaultToUpstream ayarlanmamış."
+
+#: builtin/merge.c:1426
+msgid "Squash commit into empty head not supported yet"
+msgstr "İşlemeyi boş dal ucuna tıkıştırma henüz desteklenmiyor"
+
+#: builtin/merge.c:1428
+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:1433
+#, c-format
+msgid "%s - not something we can merge"
+msgstr "%s - birleştirebileceğimiz bir şey değil"
+
+#: builtin/merge.c:1435
+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:1516
+msgid "refusing to merge unrelated histories"
+msgstr "birbiriyle ilişkisi olmayan geçmişleri birleştirme reddediliyor"
+
+#: builtin/merge.c:1525
+msgid "Already up to date."
+msgstr "Tümü güncel."
+
+#: builtin/merge.c:1535
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr "Güncelleniyor: %s..%s\n"
+
+#: builtin/merge.c:1581
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr "Gerçekten önemsiz indeks içi birleştirme deneniyor...\n"
+
+#: builtin/merge.c:1588
+#, c-format
+msgid "Nope.\n"
+msgstr "Yok.\n"
+
+#: builtin/merge.c:1613
+msgid "Already up to date. Yeeah!"
+msgstr "Tümü güncel. İşte bu!"
+
+#: builtin/merge.c:1619
+msgid "Not possible to fast-forward, aborting."
+msgstr "İleri sarma olanaklı değil, iptal ediliyor."
+
+#: builtin/merge.c:1647 builtin/merge.c:1712
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr "Ağaç bozulmamış durumuna geri sarılıyor...\n"
+
+#: builtin/merge.c:1651
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr "%s birleştirme stratejisi deneniyor...\n"
+
+#: builtin/merge.c:1703
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr "Birleştirmeyi hiçbir birleştirme stratejisi işlemedi\n"
+
+#: builtin/merge.c:1705
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr "%s stratejisi ile birleştirme başarısız oldu.\n"
+
+#: builtin/merge.c:1714
+#, 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:1728
+#, 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/mktag.c:10
+msgid "git mktag"
+msgstr "git mktag"
+
+#: builtin/mktag.c:30
+#, c-format
+msgid "warning: tag input does not pass fsck: %s"
+msgstr "uyarı: etiket girdisi fsck'den geçemiyor: %s"
+
+#: builtin/mktag.c:41
+#, c-format
+msgid "error: tag input does not pass fsck: %s"
+msgstr "hata: etiket girdisi fsck'den geçemiyor: %s"
+
+#: builtin/mktag.c:44
+#, c-format
+msgid "%d (FSCK_IGNORE?) should never trigger this callback"
+msgstr "%d (FSCK_IGNORE?) hiçbir zaman bu geri çağırmayı tetiklememeli"
+
+#: builtin/mktag.c:59
+#, c-format
+msgid "could not read tagged object '%s'"
+msgstr "etiketlenmiş nesne '%s' okunamadı"
+
+#: builtin/mktag.c:62
+#, c-format
+msgid "object '%s' tagged as '%s', but is a '%s' type"
+msgstr "'%s' nesnesi '%s' olarak etiketlenmiş; ancak bir '%s' türü"
+
+#: builtin/mktag.c:99
+msgid "tag on stdin did not pass our strict fsck check"
+msgstr "stdin üzerindeki etiket bizim sıkı fsck denetimimizi geçemedi"
+
+#: builtin/mktag.c:102
+msgid "tag on stdin did not refer to a valid object"
+msgstr "stdin üzerindeki etiket geçerli bir nesneye başvurmuyor"
+
+#: builtin/mktag.c:105 builtin/tag.c:232
+msgid "unable to write tag file"
+msgstr "etiket dosyası yazılamıyor"
+
#: builtin/mktree.c:66
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
@@ -16507,9 +17745,12 @@
"yeniden paketleme sırasında daha küçük boyutlu paket dosyalarını bu boyuttan "
"daha büyük bir toplu iş olarak toplayın"
-#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67
+#: builtin/multi-pack-index.c:50 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 builtin/prune-packed.c:25 builtin/tag.c:575
msgid "too many arguments"
-msgstr "çok fazla değişken"
+msgstr "çok fazla argüman"
#: builtin/multi-pack-index.c:60
msgid "--batch-size option is only for 'repack' subcommand"
@@ -16548,75 +17789,79 @@
msgid "skip move/rename errors"
msgstr "taşı/yeniden adlandır hatalarını atla"
-#: builtin/mv.c:169
+#: builtin/mv.c:170
#, c-format
msgid "destination '%s' is not a directory"
msgstr "'%s' hedefi bir dizin değil"
-#: builtin/mv.c:180
+#: 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:184
+#: builtin/mv.c:185
msgid "bad source"
msgstr "hatalı kaynak"
-#: builtin/mv.c:187
+#: builtin/mv.c:188
msgid "can not move directory into itself"
msgstr "dizin kendi içine taşınamıyor"
-#: builtin/mv.c:190
+#: builtin/mv.c:191
msgid "cannot move directory over file"
msgstr "dizin dosya üzerinden taşınamıyor"
-#: builtin/mv.c:199
+#: builtin/mv.c:200
msgid "source directory is empty"
msgstr "kaynak dizin boş"
-#: builtin/mv.c:224
+#: 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:235
+#: builtin/mv.c:238
#, c-format
msgid "overwriting '%s'"
msgstr "üzerine yazılıyor: '%s'"
-#: builtin/mv.c:238
+#: builtin/mv.c:241
msgid "Cannot overwrite"
msgstr "Üzerine yazılamıyor"
-#: builtin/mv.c:241
+#: builtin/mv.c:244
msgid "multiple sources for the same target"
msgstr "aynı hedef için birden çok kaynak"
-#: builtin/mv.c:243
+#: builtin/mv.c:246
msgid "destination directory does not exist"
msgstr "hedef dizin mevcut değil"
-#: builtin/mv.c:250
+#: builtin/mv.c:253
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, kaynak=%s, hedef:%s"
-#: builtin/mv.c:271
+#: 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:277 builtin/remote.c:781 builtin/repack.c:518
+#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:483
#, c-format
msgid "renaming '%s' failed"
msgstr "'%s' yeniden adlandırılamadı"
#: builtin/name-rev.c:465
msgid "git name-rev [<options>] <commit>..."
-msgstr "git name-rev [<seçenekler>] <gönderi>..."
+msgstr "git name-rev [<seçenekler>] <işleme>..."
#: builtin/name-rev.c:466
msgid "git name-rev [<options>] --all"
@@ -16627,12 +17872,12 @@
msgstr "git name-rev [<seçenekler>] --stdin"
#: builtin/name-rev.c:524
-msgid "print only names (no SHA-1)"
-msgstr "yalnızca adları yazdır (SHA-1 yok)"
+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 "gönderileri adlandırmak için yalnızca etiketleri kullan"
+msgstr "işlemeleri adlandırmak için yalnızca etiketleri kullan"
#: builtin/name-rev.c:527
msgid "only use refs matching <pattern>"
@@ -16644,7 +17889,7 @@
#: builtin/name-rev.c:531
msgid "list all commits reachable from all refs"
-msgstr "tüm başvurulardan ulaşılabilir olan tüm gönderileri listele"
+msgstr "tüm başvurulardan ulaşılabilir olan tüm işlemeleri listele"
#: builtin/name-rev.c:532
msgid "read from stdin"
@@ -16799,7 +18044,7 @@
msgid "the note contents have been left in %s"
msgstr "not içeriği %s içinde bırakıldı"
-#: builtin/notes.c:242 builtin/tag.c:532
+#: builtin/notes.c:242 builtin/tag.c:565
#, c-format
msgid "could not open or read '%s'"
msgstr "'%s' açılamadı veya okunamadı"
@@ -16839,12 +18084,6 @@
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."
@@ -16902,8 +18141,8 @@
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"
+msgid "too few arguments"
+msgstr "pek az argüman"
#: builtin/notes.c:538
#, c-format
@@ -16925,7 +18164,7 @@
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
msgstr ""
-"-m/-F/-c/-C seçenekleri 'edit' komutu için kullanım dışı bırakıldı.\n"
+"'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
@@ -16946,11 +18185,11 @@
#: builtin/notes.c:724
msgid "could not find commit from NOTES_MERGE_PARTIAL."
-msgstr "NOTES_MERGE_PARTIAL ögesinden gönderi bulunamadı."
+msgstr "işleme, NOTES_MERGE_PARTIAL ögesinden bulunamadı."
#: builtin/notes.c:726
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
-msgstr "NOTES_MERGE_PARTIAL ögesinden gönderi ayrıştırılamadı"
+msgstr "işleme, NOTES_MERGE_PARTIAL ögesinden ayrıştırılamadı"
#: builtin/notes.c:739
msgid "failed to resolve NOTES_MERGE_REF"
@@ -16983,11 +18222,11 @@
#: builtin/notes.c:790
msgid "Committing unmerged notes"
-msgstr "Birleştirilmemiş notlar gönderiliyor"
+msgstr "Birleştirilmemiş notlar işleniyor"
#: builtin/notes.c:792
msgid "finalize notes merge by committing unmerged notes"
-msgstr "birleştirilmemiş notları göndererek not birleştirmesini tamamla"
+msgstr "birleştirilmemiş notları işleyerek not birleştirmesini tamamla"
#: builtin/notes.c:794
msgid "Aborting notes merge resolution"
@@ -17028,10 +18267,10 @@
"abort'.\n"
msgstr ""
"Kendiliğinden not birleştirmesi başarısız oldu. %s içindeki çakışmaları "
-"çözün ve sonucu 'git notes merge --commit' ile gönderin. Birleştirmeyi iptal "
+"çö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:545
+#: builtin/notes.c:897 builtin/tag.c:578
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "'%s' geçerli bir başvuru olarak çözülemiyor"
@@ -17049,7 +18288,7 @@
msgid "read object names from the standard input"
msgstr "nesne adlarını standart girdi'den oku"
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148
msgid "do not remove, show only"
msgstr "kaldırma, yalnızca göster"
@@ -17065,121 +18304,152 @@
msgid "use notes from <notes-ref>"
msgstr "notları <not-bşvr>'ndan kullan"
-#: builtin/notes.c:1034 builtin/stash.c:1643
+#: builtin/notes.c:1034 builtin/stash.c:1671
#, c-format
msgid "unknown subcommand: %s"
msgstr "bilinmeyen altkomut: %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 [<seçenekler>...] [< <bşvr-liste> | < <nesne-"
"liste>]"
-#: 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 [<sçnklr>...] <base-name> [< <bşvr-liste> | < <nesne-liste>]"
-#: builtin/pack-objects.c:430
+#: builtin/pack-objects.c:440
+#, c-format
+msgid ""
+"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
+"pack %s"
+msgstr ""
+"write_reuse_object: %s bulunamıyor, %<PRIuMAX> ofsetinde bekleniyordu (%s "
+"paketinde)"
+
+#: builtin/pack-objects.c:448
#, c-format
msgid "bad packed object CRC for %s"
msgstr "%s için hatalı paketlenmiş nesne CRC'si"
-#: builtin/pack-objects.c:441
+#: builtin/pack-objects.c:459
#, c-format
msgid "corrupt packed object for %s"
msgstr "%s için hasar görmüş paketlenmiş nesne"
-#: builtin/pack-objects.c:572
+#: builtin/pack-objects.c:590
#, c-format
msgid "recursive delta detected for object %s"
msgstr "%s nesnesi için özyineli delta algılandı"
-#: builtin/pack-objects.c:783
+#: builtin/pack-objects.c:801
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "%u nesne sipariş verildi, %<PRIu32> bekleniyordu"
-#: builtin/pack-objects.c:972
+#: builtin/pack-objects.c:896
+#, c-format
+msgid "expected object at offset %<PRIuMAX> in pack %s"
+msgstr "şu paketin %<PRIuMAX> ofsetinde nesne bekleniyordu: %s"
+
+#: builtin/pack-objects.c:1015
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"biteşlem yazımı kapatılıyor, paketler pack.packSizeLimit dolayısıyla "
"parçalara ayrılmış"
-#: builtin/pack-objects.c:985
+#: builtin/pack-objects.c:1028
msgid "Writing objects"
msgstr "Nesneler yazılıyor"
-#: builtin/pack-objects.c:1046 builtin/update-index.c:90
+#: builtin/pack-objects.c:1089 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "%s bilgileri alınamıyor"
-#: builtin/pack-objects.c:1099
+#: builtin/pack-objects.c:1141
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "%<PRIu32> nesne yazıldı (%<PRIu32> bekleniyordu)"
-#: builtin/pack-objects.c:1297
+#: builtin/pack-objects.c:1358
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "bazı nesneler paketlenmediğinden dolayı biteşlem yazımı kapatılıyor"
-#: builtin/pack-objects.c:1724
+#: builtin/pack-objects.c:1806
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "%s için paket içinde delta taban ofset taşımı"
-#: builtin/pack-objects.c:1733
+#: builtin/pack-objects.c:1815
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "%s için delta taban ofseti sınırların dışında"
-#: builtin/pack-objects.c:2004
+#: builtin/pack-objects.c:2096
msgid "Counting objects"
msgstr "Nesneler sayılıyor"
-#: builtin/pack-objects.c:2149
+#: builtin/pack-objects.c:2241
#, c-format
msgid "unable to parse object header of %s"
msgstr "%s nesne üstbilgisi ayrıştırılamıyor"
-#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235
-#: builtin/pack-objects.c:2245
+#: builtin/pack-objects.c:2311 builtin/pack-objects.c:2327
+#: builtin/pack-objects.c:2337
#, c-format
msgid "object %s cannot be read"
msgstr "%s nesnesi okunamıyor"
-#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249
+#: builtin/pack-objects.c:2314 builtin/pack-objects.c:2341
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr "%s nesnesi için tutarsız nesne uzunluğu (%<PRIuMAX> / %<PRIuMAX>)"
-#: builtin/pack-objects.c:2259
+#: builtin/pack-objects.c:2351
msgid "suboptimal pack - out of memory"
msgstr "standart altı paket - bellek yetersiz"
-#: builtin/pack-objects.c:2574
+#: builtin/pack-objects.c:2666
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Delta sıkıştırması %d iş parçacığı kullanıyor"
-#: builtin/pack-objects.c:2713
+#: builtin/pack-objects.c:2805
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "%s etiketinden ulaşılabilir nesneler paketlenemiyor"
-#: builtin/pack-objects.c:2801
+#: builtin/pack-objects.c:2891
msgid "Compressing objects"
msgstr "Nesneler sıkıştırılıyor"
-#: builtin/pack-objects.c:2807
+#: builtin/pack-objects.c:2897
msgid "inconsistency with delta count"
msgstr "delta sayımında tutarsızlık"
-#: builtin/pack-objects.c:2888
+#: builtin/pack-objects.c:2976
+#, 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:2979
+#, 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:3008
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -17188,7 +18458,7 @@
"sınır nesnesi numarası bekleniyordu, anlamsız veri alındı:\n"
" %s"
-#: builtin/pack-objects.c:2894
+#: builtin/pack-objects.c:3014
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -17197,227 +18467,237 @@
"nesne numarası bekleniyordu, anlamsız veri alındı:\n"
"%s"
-#: builtin/pack-objects.c:2992
+#: builtin/pack-objects.c:3112
msgid "invalid value for --missing"
msgstr "--missing için geçersiz değer"
-#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159
+#: builtin/pack-objects.c:3171 builtin/pack-objects.c:3279
msgid "cannot open pack index"
msgstr "paket indeksi açılamıyor"
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3202
#, c-format
msgid "loose object at %s could not be examined"
msgstr "%s konumundaki gevşek nesne incelenemedi"
-#: builtin/pack-objects.c:3167
+#: builtin/pack-objects.c:3287
msgid "unable to force loose object"
msgstr "gevşek nesne zorlanamıyor"
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3380
#, c-format
msgid "not a rev '%s'"
msgstr "bir revizyon değil: '%s'"
-#: builtin/pack-objects.c:3263
+#: builtin/pack-objects.c:3383
#, c-format
msgid "bad revision '%s'"
msgstr "hatalı revizyon: '%s'"
-#: builtin/pack-objects.c:3288
+#: builtin/pack-objects.c:3408
msgid "unable to add recent objects"
msgstr "en son nesneler eklenemiyor"
-#: builtin/pack-objects.c:3341
+#: builtin/pack-objects.c:3461
#, c-format
msgid "unsupported index version %s"
msgstr "desteklenmeyen indeks sürümü %s"
-#: builtin/pack-objects.c:3345
+#: builtin/pack-objects.c:3465
#, c-format
msgid "bad index version '%s'"
msgstr "hatalı indeks sürümü '%s'"
-#: builtin/pack-objects.c:3383
+#: builtin/pack-objects.c:3503
msgid "<version>[,<offset>]"
msgstr "<sürüm>[,<ofset>]"
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3504
msgid "write the pack index file in the specified idx format version"
msgstr "paket indeks dosyasını belirtilen idx biçiminde yaz"
-#: builtin/pack-objects.c:3387
+#: builtin/pack-objects.c:3507
msgid "maximum size of each output pack file"
msgstr "her çıktı paketi dosyasının olabilecek en büyük boyutu"
-#: builtin/pack-objects.c:3389
+#: builtin/pack-objects.c:3509
msgid "ignore borrowed objects from alternate object store"
msgstr "alternatif nesne mağazasından ödünç alınan nesneleri yok say"
-#: builtin/pack-objects.c:3391
+#: builtin/pack-objects.c:3511
msgid "ignore packed objects"
msgstr "paketlenmiş nesneleri yok say"
-#: builtin/pack-objects.c:3393
+#: builtin/pack-objects.c:3513
msgid "limit pack window by objects"
msgstr "paket penceresini nesnelerle sınırla"
-#: builtin/pack-objects.c:3395
+#: builtin/pack-objects.c:3515
msgid "limit pack window by memory in addition to object limit"
msgstr "paket penceresini nesne limitine ek olarak bellek ile kısıtla"
-#: builtin/pack-objects.c:3397
+#: builtin/pack-objects.c:3517
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "ortaya çıkan pakette olabilecek en büyük delta zincirinin uzunluğu"
-#: builtin/pack-objects.c:3399
+#: builtin/pack-objects.c:3519
msgid "reuse existing deltas"
msgstr "var olan deltaları yeniden kullan"
-#: builtin/pack-objects.c:3401
+#: builtin/pack-objects.c:3521
msgid "reuse existing objects"
msgstr "var olan nesneleri yeniden kullan"
-#: builtin/pack-objects.c:3403
+#: builtin/pack-objects.c:3523
msgid "use OFS_DELTA objects"
msgstr "OFS_DELTA nesneleri kullan"
-#: builtin/pack-objects.c:3405
+#: builtin/pack-objects.c:3525
msgid "use threads when searching for best delta matches"
msgstr "en iyi delta eşleşmelerini ararken iş parçacıklarını kullan"
-#: builtin/pack-objects.c:3407
+#: builtin/pack-objects.c:3527
msgid "do not create an empty pack output"
msgstr "boş bir paket çıktısı oluşturma"
-#: builtin/pack-objects.c:3409
+#: builtin/pack-objects.c:3529
msgid "read revision arguments from standard input"
-msgstr "revizyon değişkenlerini standart girdi'den oku"
+msgstr "revizyon argümanlarını standart girdi'den oku"
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:3531
msgid "limit the objects to those that are not yet packed"
msgstr "nesneleri henüz paketlenmeyenlere kısıtla"
-#: builtin/pack-objects.c:3414
+#: builtin/pack-objects.c:3534
msgid "include objects reachable from any reference"
msgstr "herhangi bir başvurudan ulaşılabilir olan nesneleri içer"
-#: builtin/pack-objects.c:3417
+#: builtin/pack-objects.c:3537
msgid "include objects referred by reflog entries"
msgstr "başvuru günlüğü tarafından başvurulan nesneleri içer"
-#: builtin/pack-objects.c:3420
+#: builtin/pack-objects.c:3540
msgid "include objects referred to by the index"
msgstr "indeks tarafından başvurulan nesneleri içer"
-#: builtin/pack-objects.c:3423
+#: builtin/pack-objects.c:3543
msgid "output pack to stdout"
msgstr "paketi stdout'a çıktı ver"
-#: builtin/pack-objects.c:3425
+#: builtin/pack-objects.c:3545
msgid "include tag objects that refer to objects to be packed"
msgstr "paketlenecek nesnelere başvuran etiket nesnelerini içer"
-#: builtin/pack-objects.c:3427
+#: builtin/pack-objects.c:3547
msgid "keep unreachable objects"
msgstr "ulaşılamayan nesneleri tut"
-#: builtin/pack-objects.c:3429
+#: builtin/pack-objects.c:3549
msgid "pack loose unreachable objects"
msgstr "ulaşılamayan gevşek nesneleri paketle"
-#: builtin/pack-objects.c:3431
+#: builtin/pack-objects.c:3551
msgid "unpack unreachable objects newer than <time>"
msgstr "<zaman>'dan daha yeni ulaşılamayan nesneleri aç"
-#: builtin/pack-objects.c:3434
+#: builtin/pack-objects.c:3554
msgid "use the sparse reachability algorithm"
msgstr "aralıklı ulaşılabilirlik algoritmasını kullan"
-#: builtin/pack-objects.c:3436
+#: builtin/pack-objects.c:3556
msgid "create thin packs"
msgstr "ince paketler oluştur"
-#: builtin/pack-objects.c:3438
+#: builtin/pack-objects.c:3558
msgid "create packs suitable for shallow fetches"
msgstr "sığ getirmelere uygun paketler oluştur"
-#: builtin/pack-objects.c:3440
+#: builtin/pack-objects.c:3560
msgid "ignore packs that have companion .keep file"
msgstr "eşlik eden .keep dosyasına iye paketleri yok say"
-#: builtin/pack-objects.c:3442
+#: builtin/pack-objects.c:3562
msgid "ignore this pack"
msgstr "bu paketi yok say"
-#: builtin/pack-objects.c:3444
+#: builtin/pack-objects.c:3564
msgid "pack compression level"
msgstr "paket sıkıştırma düzeyi"
-#: builtin/pack-objects.c:3446
+#: builtin/pack-objects.c:3566
msgid "do not hide commits by grafts"
-msgstr "aşılarla gelen gönderileri gizleme"
+msgstr "aşılarla gelen işlemeleri gizleme"
-#: builtin/pack-objects.c:3448
+#: builtin/pack-objects.c:3568
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"nesnelerin sayımını hızlandırmak için eğer varsa bir biteşlem indeksi kullan"
-#: builtin/pack-objects.c:3450
+#: builtin/pack-objects.c:3570
msgid "write a bitmap index together with the pack index"
msgstr "paket indeksiyle birlikte bir biteşlem indeksi de yaz"
-#: builtin/pack-objects.c:3454
+#: builtin/pack-objects.c:3574
msgid "write a bitmap index if possible"
msgstr "eğer olanaklıysa bir biteşlem indeksi yaz"
-#: builtin/pack-objects.c:3458
+#: builtin/pack-objects.c:3578
msgid "handling for missing objects"
msgstr "eksik nesneler için işlem"
-#: builtin/pack-objects.c:3461
+#: builtin/pack-objects.c:3581
msgid "do not pack objects in promisor packfiles"
msgstr "nesneleri vaatçi paket dosyalarıyla paketleme"
-#: builtin/pack-objects.c:3463
+#: builtin/pack-objects.c:3583
msgid "respect islands during delta compression"
msgstr "delta sıkıştırması sırasında adalara uy"
-#: builtin/pack-objects.c:3492
+#: builtin/pack-objects.c:3585
+msgid "protocol"
+msgstr "protokol"
+
+#: builtin/pack-objects.c:3586
+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:3617
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "delta zincir derinliği %d çok derin, %d zorlanıyor"
-#: builtin/pack-objects.c:3497
+#: builtin/pack-objects.c:3622
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "pack.deltaCacheLimit çok yüksek, %d zorlanıyor"
-#: builtin/pack-objects.c:3551
+#: builtin/pack-objects.c:3676
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr "--max-pack-size, aktarım için bir paket yapımında kullanılamaz"
-#: builtin/pack-objects.c:3553
+#: builtin/pack-objects.c:3678
msgid "minimum pack size limit is 1 MiB"
msgstr "olabilecek en küçük paket boyutu limiti 1 MiB'dır"
-#: builtin/pack-objects.c:3558
+#: builtin/pack-objects.c:3683
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin bir indekslenebilir paket yapımında kullanılamaz"
-#: builtin/pack-objects.c:3561
+#: builtin/pack-objects.c:3686
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable ve --unpack-unreachable birbiriyle uyumsuz"
-#: builtin/pack-objects.c:3567
+#: builtin/pack-objects.c:3692
msgid "cannot use --filter without --stdout"
msgstr "--filter, --stdout olmadan kullanılamaz"
-#: builtin/pack-objects.c:3627
+#: builtin/pack-objects.c:3752
msgid "Enumerating objects"
-msgstr "Nesneler sayıp dökülüyor"
+msgstr "Nesneler ortaya dökülüyor"
-#: builtin/pack-objects.c:3657
+#: builtin/pack-objects.c:3783
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -17426,6 +18706,21 @@
"Toplam %<PRIu32> (delta %<PRIu32>), yeniden kullanılan %<PRIu32> (delta "
"%<PRIu32>), yeniden kullanılan paket %<PRIu32>"
+#: builtin/pack-redundant.c:601
+msgid ""
+"'git pack-redundant' is nominated for removal.\n"
+"If you still use this command, please add an extra\n"
+"option, '--i-still-use-this', on the command line\n"
+"and let us know you still use it by sending an e-mail\n"
+"to <git@vger.kernel.org>. Thanks.\n"
+msgstr ""
+"'git pack-redundant' komutu kaldırma için aday\n"
+"gösterildi. Bu komutu hâlâ kullanıyorsanız lütfen\n"
+"komut satırında '--i-still-use-this' ek seçeneğini\n"
+"kullanın ve bunu hâlâ kullandığınızı\n"
+"<git@vger.kernel.org> adresine bir e-posta atarak\n"
+"bize haber verin. Sağ olun.\n"
+
#: builtin/pack-refs.c:8
msgid "git pack-refs [<options>]"
msgstr "git pack-refs [<seçenekler>]"
@@ -17438,32 +18733,28 @@
msgid "prune loose refs (default)"
msgstr "gevşek başvuruları buda (öntanımlı)"
-#: 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 "Yinelenmiş nesneler kaldırılıyor"
-
-#: builtin/prune.c:12
+#: 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:131
+#: builtin/prune.c:133
msgid "report pruned objects"
msgstr "budanmış nesneleri bildir"
-#: builtin/prune.c:134
+#: builtin/prune.c:136
msgid "expire objects older than <time>"
msgstr "<zaman>'dan daha eski nesnelerin hükmünü kaldır"
-#: builtin/prune.c:136
+#: 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:150
+#: builtin/prune.c:152
msgid "cannot prune in a precious-objects repo"
msgstr "bir precious-objects deposu içinde budama yapılamıyor"
@@ -17476,58 +18767,56 @@
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<seçenekler>] [<depo> [<bşvr-blrtç>...]]"
-#: builtin/pull.c:122
+#: builtin/pull.c:123
msgid "control for recursive fetching of submodules"
msgstr "altmodüllerin özyineli getirilmesi için denetleme"
-#: builtin/pull.c:126
+#: builtin/pull.c:127
msgid "Options related to merging"
msgstr "Birleştirme ile ilgili seçenekler"
-#: builtin/pull.c:129
+#: 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:157 builtin/rebase.c:471 builtin/revert.c:126
+#: builtin/pull.c:158 builtin/rebase.c:492 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "ileri sarıma izin ver"
-#: builtin/pull.c:166
-msgid "automatically stash/stash pop before and after rebase"
-msgstr ""
-"yeniden temellendirme öncesi ve sonrasında kendiliğinden zulala/zulayı patlat"
+#: builtin/pull.c: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:182
+#: builtin/pull.c:183
msgid "Options related to fetching"
msgstr "Getirme ile ilgili seçenekler"
-#: builtin/pull.c:192
+#: builtin/pull.c:193
msgid "force overwrite of local branch"
msgstr "zorla yerel dalın üzerine yaz"
-#: builtin/pull.c:200
+#: builtin/pull.c:201
msgid "number of submodules pulled in parallel"
msgstr "paralelde çekilen altmodüllerin sayısı"
-#: builtin/pull.c:300
+#: 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:426
+#: builtin/pull.c:445
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr ""
-"Az önce getirdiğiniz referanslar arasında yeniden temellendirme için aday "
-"yok."
+"Az önce getirdiğiniz başvurular arasında yeniden temellendirme için aday yok."
-#: builtin/pull.c:428
+#: builtin/pull.c:447
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr "Az önce getirdiğiniz başvurular arasında birleştirme için aday yok."
-#: builtin/pull.c:429
+#: builtin/pull.c:448
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -17535,89 +18824,112 @@
"Genellikle bu, uzak uçta eşleşmesi olmayan bir joker başvuru belirteci\n"
"sağladığınız anlamına gelir."
-#: builtin/pull.c:432
+#: builtin/pull.c:451
#, 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"
+"'%s' uzak konumundan çekme yapmak istediniz; ancak bir dal belirtmediniz.\n"
"Bu, geçerli dalınız için öntanımlı yapılandırılmış uzak konum olmadığından,\n"
"komut satırında bir dal belirtmeniz gerekir."
-#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73
+#: builtin/pull.c:456 builtin/rebase.c:1253
msgid "You are not currently on a branch."
msgstr "Şu anda bir dal üzerinde değilsiniz."
-#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79
+#: builtin/pull.c:458 builtin/pull.c:473
msgid "Please specify which branch you want to rebase against."
msgstr ""
"Lütfen hangi dala karşı yeniden temellendirme yapmak istediğinizi belirtin."
-#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82
+#: builtin/pull.c:460 builtin/pull.c:475
msgid "Please specify which branch you want to merge with."
msgstr "Lütfen hangi dal ile birleştirmek istediğinizi belirtin."
-#: builtin/pull.c:442 builtin/pull.c:457
+#: builtin/pull.c:461 builtin/pull.c:476
msgid "See git-pull(1) for details."
msgstr "Ayrıntılar için: git-pull(1)"
-#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459
-#: builtin/rebase.c:1415 git-parse-remote.sh:64
+#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
+#: builtin/rebase.c:1259
msgid "<remote>"
msgstr "<uzak-konum>"
-#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464
-#: git-parse-remote.sh:65
+#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
msgid "<branch>"
msgstr "<dal>"
-#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75
+#: builtin/pull.c:471 builtin/rebase.c:1251
msgid "There is no tracking information for the current branch."
msgstr "Geçerli dal için izleme bilgisi yok."
-#: builtin/pull.c:461 git-parse-remote.sh:95
+#: builtin/pull.c:480
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Eğer bu dal için izleme bilgisi ayarlamak isterseniz şununla yapabilirsiniz:"
-#: builtin/pull.c:466
+#: builtin/pull.c:485
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"from the remote, but no such ref was fetched."
msgstr ""
-"Yapılandırmanız uzak konumdan '%s' başvurusu ile birleştirmeyi söylüyor,\n"
+"Yapılandırmanız uzak konumdan '%s' başvurusu ile birleştirmeyi belirtiyor,\n"
"ancak böyle bir başvuru getirilmedi."
-#: builtin/pull.c:576
+#: builtin/pull.c:596
#, c-format
msgid "unable to access commit %s"
-msgstr "%s gönderisine erişilemedi"
+msgstr "%s işlemesine erişilemedi"
-#: builtin/pull.c:857
+#: builtin/pull.c:902
msgid "ignoring --verify-signatures for rebase"
msgstr "yeniden temellendirme için --verify-signature yok sayılıyor"
-#: builtin/pull.c:912
-msgid "--[no-]autostash option is only valid with --rebase."
-msgstr "--[no-]autostash seçeneği yalnızca --rebase ile geçerli."
+#: builtin/pull.c:930
+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:920
+#: builtin/pull.c:991
msgid "Updating an unborn branch with changes added to the index."
msgstr "İndekse eklenen değişikliklerle henüz doğmamış bir dal güncelleniyor."
-#: builtin/pull.c:924
+#: builtin/pull.c:995
msgid "pull with rebase"
-msgstr "yeniden temellendirme ile çek"
+msgstr "yeniden temellendirme ile çekim"
-#: builtin/pull.c:925
+#: builtin/pull.c:996
msgid "please commit or stash them."
-msgstr "Lütfen onları gönderin veya zulalayın."
+msgstr "Lütfen onları işleyin veya zulalayın."
-#: builtin/pull.c:950
+#: builtin/pull.c:1021
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -17625,10 +18937,10 @@
"commit %s."
msgstr ""
"Getirme geçerli dal ucunu güncelledi.\n"
-"Çalışma ağacınız %s gönderisinden\n"
+"Çalışma ağacınız %s işlemesinden\n"
"ileri sarılıyor."
-#: builtin/pull.c:956
+#: builtin/pull.c:1027
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -17645,15 +18957,15 @@
"$ git reset --hard\n"
"komutunu çalıştırın."
-#: builtin/pull.c:971
+#: builtin/pull.c:1042
msgid "Cannot merge multiple branches into empty head."
msgstr "Boş dal ucuna birden çok dal birleştirilemez."
-#: builtin/pull.c:975
+#: builtin/pull.c:1046
msgid "Cannot rebase onto multiple branches."
msgstr "Birden çok dala yeniden temellendirme yapılamaz."
-#: builtin/pull.c:982
+#: builtin/pull.c:1067
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"yerelde kaydı yazılmış altmodül değişiklikleriyle yeniden temellendirme "
@@ -17663,15 +18975,15 @@
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<seçenekler>] [<depo> [<bşvr-blrtç>...]]"
-#: builtin/push.c:112
+#: builtin/push.c:111
msgid "tag shorthand without <tag>"
msgstr "stenografiyi <etiket> olmadan etiketle"
-#: builtin/push.c:122
+#: 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:168
+#: builtin/push.c:164
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -17680,7 +18992,7 @@
"Bu seçeneklerden birini kalıcı olarak seçmek için 'git help config' içinde "
"push.default girdisine bakın."
-#: builtin/push.c:171
+#: builtin/push.c:167
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -17704,7 +19016,7 @@
"\tgit push %s HEAD\n"
"%s"
-#: builtin/push.c:186
+#: builtin/push.c:182
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -17719,7 +19031,7 @@
"\n"
"\tgit push %s HEAD:<uzak-konum-dalının-adı>\n"
-#: builtin/push.c:200
+#: builtin/push.c:194
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -17733,12 +19045,12 @@
"\n"
"\tgit push --set-upstream %s %s\n"
-#: builtin/push.c:208
+#: 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:211
+#: builtin/push.c:205
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -17746,40 +19058,40 @@
"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"
+"itileceğini belirtmeden itiyorsunuz; ancak o geçerli '%s'\n"
"dalınızın üstkaynağı değil."
-#: builtin/push.c:270
+#: 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:277
+#: 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"
+"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"
+"değişiklikleri entegre edin (örn. 'git pull ...').\n"
"Ayrıntılar için 'git push --help' içinde 'Notes about fast-forwards'a bakın."
-#: builtin/push.c:283
+#: 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"
+"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"
+"yapın ve uzak konumdaki değişiklikleri entegre edin (örn. 'git pull ...').\n"
"Ayrıntılar için 'git push --help' içinde 'Notes about fast-forwards'a bakın."
-#: builtin/push.c:289
+#: 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"
@@ -17787,119 +19099,134 @@
"(e.g., 'git pull ...') before pushing again.\n"
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-"Güncellemeler reddedildi çünkü uzak konumda henüz yerelde iyesi olmadığınız\n"
+"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"
+"etmek isteyebilirsiniz (örn. 'git pull ...').\n"
"Ayrıntılar için 'git push --help' içinde 'Notes about fast-forwards'a bakın."
-#: builtin/push.c:296
+#: 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."
+msgstr "Güncellemeler reddedildi; çünkü etiket uzak konumda halihazırda var."
-#: builtin/push.c:299
+#: 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 ""
-"Gönderi olmayan bir nesneye işaret eden uzak başvuruyu güncelleyemez\n"
-"veya --force seçeneğini kullanmadan bir uzak başvuruyu gönderi\n"
+"İş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:360
+#: builtin/push.c:294
+msgid ""
+"Updates were rejected because the tip of the remote-tracking\n"
+"branch has been updated since the last checkout. You may want\n"
+"to integrate those changes locally (e.g., 'git pull ...')\n"
+"before forcing an update.\n"
+msgstr ""
+"Güncellemeler reddedildi; çünkü uzak izleme dalının ucu son çıkıştan bu\n"
+"yana güncellenmiş. Bir güncellemeyi zorlamadan önce bu değişiklikleri yerel\n"
+"olarak entegre etmek isteyebilirsiniz (örn. 'git pull ...'\n"
+
+#: builtin/push.c:364
#, c-format
msgid "Pushing to %s\n"
-msgstr "Şuraya itiliyor: %s\n"
+msgstr "İtme konumu: %s\n"
-#: builtin/push.c:367
+#: builtin/push.c:371
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "bazı başvurular '%s' konumuna itilemedi"
-#: builtin/push.c:542
+#: builtin/push.c:553
msgid "repository"
msgstr "depo"
-#: builtin/push.c:543 builtin/send-pack.c:164
+#: builtin/push.c:554 builtin/send-pack.c:189
msgid "push all refs"
msgstr "tüm başvuruları it"
-#: builtin/push.c:544 builtin/send-pack.c:166
+#: builtin/push.c:555 builtin/send-pack.c:191
msgid "mirror all refs"
msgstr "tüm başvuruları yansıla"
-#: builtin/push.c:546
+#: builtin/push.c:557
msgid "delete refs"
msgstr "başvuruları sil"
-#: builtin/push.c:547
+#: builtin/push.c:558
msgid "push tags (can't be used with --all or --mirror)"
msgstr "etiketleri it (--all veya --mirror ile kullanılamaz)"
-#: builtin/push.c:550 builtin/send-pack.c:167
+#: builtin/push.c:561 builtin/send-pack.c:192
msgid "force updates"
msgstr "zorla güncelle"
-#: builtin/push.c:552 builtin/send-pack.c:181
+#: builtin/push.c:562 builtin/send-pack.c:204
msgid "<refname>:<expect>"
msgstr "<başvuruadı>:<bekle>"
-#: builtin/push.c:553 builtin/send-pack.c:182
+#: builtin/push.c:563 builtin/send-pack.c:205
msgid "require old value of ref to be at this value"
msgstr "başvurunun eski değerinin bu değerde olmasını gerektir"
-#: builtin/push.c:556
+#: builtin/push.c:566 builtin/send-pack.c:208
+msgid "require remote updates to be integrated locally"
+msgstr "uzak güncellemelerin yerele entegre edilmesini gerektir"
+
+#: builtin/push.c:569
msgid "control recursive pushing of submodules"
msgstr "altmodüllerin özyineli itilmesini denetle"
-#: builtin/push.c:558 builtin/send-pack.c:175
+#: builtin/push.c:570 builtin/send-pack.c:199
msgid "use thin pack"
msgstr "ince paket kullan"
-#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161
-#: builtin/send-pack.c:162
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
+#: builtin/send-pack.c:187
msgid "receive pack program"
msgstr "paket programını al"
-#: builtin/push.c:561
+#: builtin/push.c:573
msgid "set upstream for git pull/status"
msgstr "git pull/status için üstkaynak ayarla"
-#: builtin/push.c:564
+#: builtin/push.c:576
msgid "prune locally removed refs"
msgstr "yerelde kaldırılan başvuruları buda"
-#: builtin/push.c:566
+#: builtin/push.c:578
msgid "bypass pre-push hook"
msgstr "pre-push kancasını atla"
-#: builtin/push.c:567
+#: builtin/push.c:579
msgid "push missing but relevant tags"
-msgstr "eksik ancak ilgili etiketleri it"
+msgstr "eksik; ancak ilgili etiketleri it"
-#: builtin/push.c:570 builtin/send-pack.c:169
+#: builtin/push.c:581 builtin/send-pack.c:193
msgid "GPG sign the push"
msgstr "itmeyi GPG ile imzala"
-#: builtin/push.c:572 builtin/send-pack.c:176
+#: builtin/push.c:583 builtin/send-pack.c:200
msgid "request atomic transaction on remote side"
msgstr "uzak tarafta atomsal işlem iste"
-#: builtin/push.c:590
+#: builtin/push.c:601
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete; --all, --mirror ve --tags ile uyumsuz"
-#: builtin/push.c:592
+#: builtin/push.c:603
msgid "--delete doesn't make sense without any refs"
msgstr "--delete bir başvuru olmadan anlam ifade etmiyor"
-#: builtin/push.c:612
+#: builtin/push.c:623
#, c-format
msgid "bad repository '%s'"
msgstr "hatalı depo '%s'"
-#: builtin/push.c:613
+#: builtin/push.c:624
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -17921,71 +19248,79 @@
"\n"
"\tgit push <ad>\n"
-#: builtin/push.c:628
+#: builtin/push.c:639
msgid "--all and --tags are incompatible"
msgstr "--all ve --tags birbiriyle uyumsuz"
-#: builtin/push.c:630
+#: builtin/push.c:641
msgid "--all can't be combined with refspecs"
msgstr "--all başvuru belirteçleriyle birleştirilemez"
-#: builtin/push.c:634
+#: builtin/push.c:645
msgid "--mirror and --tags are incompatible"
msgstr "--mirror ve --tags birbiriyle uyumsuz"
-#: builtin/push.c:636
+#: builtin/push.c:647
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror başvuru belirteçleriyle birleştirilemez"
-#: builtin/push.c:639
+#: builtin/push.c:650
msgid "--all and --mirror are incompatible"
msgstr "--all ve --mirror birbiriyle uyumsuz"
-#: builtin/push.c:643
+#: builtin/push.c:657
msgid "push options must not have new line characters"
msgstr "itme seçeneklerinde yeni satır karakterleri olmamalı"
-#: builtin/range-diff.c:8
+#: builtin/range-diff.c:9
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
+#: builtin/range-diff.c:10
msgid "git range-diff [<options>] <old-tip>...<new-tip>"
msgstr "git range-diff [<seçenekler>] <old-tip>...<new-tip>"
-#: builtin/range-diff.c:10
+#: builtin/range-diff.c:11
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
+#: builtin/range-diff.c:28
msgid "Percentage by which creation is weighted"
msgstr "oluşumun tartıldığı yüzde"
-#: builtin/range-diff.c:24
+#: builtin/range-diff.c:30
msgid "use simple diff colors"
msgstr "yalın diff renklerini kullan"
-#: builtin/range-diff.c:26
+#: builtin/range-diff.c:32
msgid "notes"
msgstr "notlar"
-#: builtin/range-diff.c:26
+#: builtin/range-diff.c:32
msgid "passed to 'git log'"
msgstr "'git log'a aktarıldı"
-#: builtin/range-diff.c:50 builtin/range-diff.c:54
+#: builtin/range-diff.c:35
+msgid "only emit output related to the first range"
+msgstr "yalnızca ilk erimle ilişkili çıktıyı yay"
+
+#: builtin/range-diff.c:37
+msgid "only emit output related to the second range"
+msgstr "yalnızca ikinci erimle ilişkili çıktıyı yay"
+
+#: builtin/range-diff.c:60 builtin/range-diff.c:64
#, c-format
-msgid "no .. in range: '%s'"
-msgstr "erimde .. yok: '%s'"
+msgid "not a commit range: '%s'"
+msgstr "bir işleme erimi değil: '%s'"
-#: builtin/range-diff.c:64
+#: builtin/range-diff.c:74
msgid "single arg format must be symmetric range"
-msgstr "tekli değişken biçimi simetrik erim olmalı"
+msgstr "tekli argüman biçimi simetrik erim olmalı"
-#: builtin/range-diff.c:79
+#: builtin/range-diff.c:89
msgid "need two commit ranges"
-msgstr "iki gönderi erimi gerekli"
+msgstr "iki işleme erimi gerekli"
#: builtin/read-tree.c:41
msgid ""
@@ -18023,7 +19358,7 @@
#: builtin/read-tree.c:137
msgid "same as -m, but discard unmerged entries"
-msgstr "-m ile aynı, ancak birleştirilmeyen girdileri atar"
+msgstr "-m ile aynı; ancak birleştirilmeyen girdileri atar"
#: builtin/read-tree.c:138
msgid "<subdirectory>/"
@@ -18069,7 +19404,7 @@
msgid "You need to resolve your current index first"
msgstr "Öncelikle geçerli indeksinizi çözmelisiniz"
-#: builtin/rebase.c:32
+#: builtin/rebase.c:35
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
"[<upstream> [<branch>]]"
@@ -18077,219 +19412,205 @@
"git rebase [-i] [options] [--exec <komut>] [--onto <yeni-temel> | --keep-"
"base] [<üstkaynak> [<dal>]]"
-#: 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 <komut>] [--onto <yeni-temel>] --root "
"[<dal>]"
-#: 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:175 builtin/rebase.c:199 builtin/rebase.c:226
+#: builtin/rebase.c:195 builtin/rebase.c:219 builtin/rebase.c:246
#, c-format
msgid "unusable todo list: '%s'"
msgstr "kullanılamaz yapılacaklar listesi: '%s'"
-#: builtin/rebase.c:292
+#: builtin/rebase.c:312
#, c-format
msgid "could not create temporary %s"
msgstr "geçici %s oluşturulamadı"
-#: builtin/rebase.c:298
+#: builtin/rebase.c:318
msgid "could not mark as interactive"
msgstr "etkileşimli olarak imlenemedi"
-#: builtin/rebase.c:352
+#: builtin/rebase.c:371
msgid "could not generate todo list"
msgstr "yapılacaklar listesi oluşturulamadı"
-#: builtin/rebase.c:391
+#: builtin/rebase.c:413
msgid "a base commit must be provided with --upstream or --onto"
-msgstr "bir taban gönderisi --upstream veya --onto ile sağlanmalıdır"
+msgstr "bir taban işlemesi --upstream veya --onto ile sağlanmalıdır"
-#: builtin/rebase.c:461
+#: builtin/rebase.c:482
msgid "git rebase--interactive [<options>]"
msgstr "git rebase--interactive [<seçenekler>]"
-#: builtin/rebase.c:474 builtin/rebase.c:1550
-msgid "(DEPRECATED) keep empty commits"
-msgstr "(KULLANIM DIŞI) boş gönderileri tut"
+#: builtin/rebase.c:495 builtin/rebase.c:1394
+msgid "keep commits which start empty"
+msgstr "boş başlayan işlemeleri tut"
-#: builtin/rebase.c:478 builtin/revert.c:128
+#: builtin/rebase.c:499 builtin/revert.c:128
msgid "allow commits with empty messages"
-msgstr "boş iletili gönderilere izin ver"
+msgstr "boş iletili işlemelere izin ver"
-#: builtin/rebase.c:480
+#: builtin/rebase.c:501
msgid "rebase merge commits"
-msgstr "birleştirme gönderilerini yeniden temellendir"
+msgstr "birleştirme işlemelerini yeniden temellendir"
-#: builtin/rebase.c:482
+#: builtin/rebase.c:503
msgid "keep original branch points of cousins"
msgstr "kuzenlerin orijinal dal noktalarını tut"
-#: builtin/rebase.c:484
+#: builtin/rebase.c:505
msgid "move commits that begin with squash!/fixup!"
-msgstr "squash!/fixup! ile başlayan gönderileri taşı"
+msgstr "squash!/fixup! ile başlayan işlemeleri taşı"
-#: builtin/rebase.c:485
+#: builtin/rebase.c:506
msgid "sign commits"
-msgstr "gönderileri imzala"
+msgstr "işlemeleri imzala"
-#: builtin/rebase.c:487 builtin/rebase.c:1490
+#: builtin/rebase.c:508 builtin/rebase.c:1333
msgid "display a diffstat of what changed upstream"
msgstr "üstkaynakta nelerin değiştiğini gösteren bir diffstat görüntüle"
-#: builtin/rebase.c:489
+#: builtin/rebase.c:510
msgid "continue rebase"
msgstr "yeniden temellendirmeyi sürdür"
-#: builtin/rebase.c:491
+#: builtin/rebase.c:512
msgid "skip commit"
-msgstr "gönderiyi atla"
+msgstr "işlemeyi atla"
-#: builtin/rebase.c:492
+#: builtin/rebase.c:513
msgid "edit the todo list"
msgstr "yapılacaklar listesini düzenle"
-#: builtin/rebase.c:494
+#: builtin/rebase.c:515
msgid "show the current patch"
msgstr "geçerli yamayı göster"
-#: builtin/rebase.c:497
+#: builtin/rebase.c:518
msgid "shorten commit ids in the todo list"
-msgstr "yapılacaklar listesindeki gönderi numaralarını kısalt"
+msgstr "yapılacaklar listesindeki işleme numaralarını kısalt"
-#: builtin/rebase.c:499
+#: builtin/rebase.c:520
msgid "expand commit ids in the todo list"
-msgstr "yapılacaklar listesindeki gönderi numaralarını genişlet"
+msgstr "yapılacaklar listesindeki işleme numaralarını genişlet"
-#: builtin/rebase.c:501
+#: builtin/rebase.c:522
msgid "check the todo list"
msgstr "yapılacaklar listesini denetle"
-#: builtin/rebase.c:503
+#: builtin/rebase.c:524
msgid "rearrange fixup/squash lines"
msgstr "fixup/squash satırlarını yeniden düzenle"
-#: builtin/rebase.c:505
+#: builtin/rebase.c:526
msgid "insert exec commands in todo list"
msgstr "yapılacaklar listesine 'exec' komutları ekle"
-#: builtin/rebase.c:506
+#: builtin/rebase.c:527
msgid "onto"
msgstr "üzerine"
-#: builtin/rebase.c:509
+#: builtin/rebase.c:530
msgid "restrict-revision"
msgstr "restrict-revision"
-#: builtin/rebase.c:509
+#: builtin/rebase.c:530
msgid "restrict revision"
msgstr "revizyonu sınırla"
-#: builtin/rebase.c:511
+#: builtin/rebase.c:532
msgid "squash-onto"
msgstr "squash-onto"
-#: builtin/rebase.c:512
+#: builtin/rebase.c:533
msgid "squash onto"
msgstr "tıkıştır"
-#: builtin/rebase.c:514
+#: builtin/rebase.c:535
msgid "the upstream commit"
-msgstr "üstkaynak gönderisi"
+msgstr "üstkaynak işlemesi"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:537
msgid "head-name"
msgstr "head-name"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:537
msgid "head name"
msgstr "dal ucu adı"
-#: builtin/rebase.c:521
+#: builtin/rebase.c:542
msgid "rebase strategy"
msgstr "yeniden temellendirme stratejisi"
-#: builtin/rebase.c:522
+#: builtin/rebase.c:543
msgid "strategy-opts"
msgstr "strategy-opts"
-#: builtin/rebase.c:523
+#: builtin/rebase.c:544
msgid "strategy options"
msgstr "strateji seçenekleri"
-#: builtin/rebase.c:524
+#: builtin/rebase.c:545
msgid "switch-to"
msgstr "switch-to"
-#: builtin/rebase.c:525
+#: builtin/rebase.c:546
msgid "the branch or commit to checkout"
-msgstr "çıkış yapılacak dal veya gönderi"
+msgstr "çıkış yapılacak dal veya işleme"
-#: builtin/rebase.c:526
+#: builtin/rebase.c:547
msgid "onto-name"
msgstr "onto-name"
-#: builtin/rebase.c:526
+#: builtin/rebase.c:547
msgid "onto name"
msgstr "'onto' adı:"
-#: builtin/rebase.c:527
+#: builtin/rebase.c:548
msgid "cmd"
msgstr "komut"
-#: builtin/rebase.c:527
+#: builtin/rebase.c:548
msgid "the command to run"
msgstr "çalıştırılacak komut"
-#: builtin/rebase.c:530 builtin/rebase.c:1584
+#: builtin/rebase.c:551 builtin/rebase.c:1427
msgid "automatically re-schedule any `exec` that fails"
msgstr "başarısız olan her 'exec'i kendiliğinden yeniden zamanla"
-#: builtin/rebase.c:546
+#: builtin/rebase.c:567
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr ""
"--[no-]rebase-cousins seçeneğinin --rebase-merges olmadan hiçbir etkisi yok"
-#: builtin/rebase.c:562
+#: builtin/rebase.c:583
#, c-format
-msgid "%s requires an interactive rebase"
-msgstr "%s bir etkileşimli yeniden temellendirme gerektiriyor"
+msgid "%s requires the merge backend"
+msgstr "%s birleştirme arka ucunu gerektiriyor"
-#: builtin/rebase.c:612
+#: builtin/rebase.c:626
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "'onto' alınamadı: '%s'"
-#: builtin/rebase.c:627
+#: builtin/rebase.c:643
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "geçersiz orig-head: '%s'"
-#: builtin/rebase.c:652
+#: builtin/rebase.c:668
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "geçersiz allow_rerere_autoupdate yok sayılıyor: '%s'"
-#: builtin/rebase.c:728
-#, c-format
-msgid "Could not read '%s'"
-msgstr "'%s' okunamadı"
-
-#: builtin/rebase.c:746
-#, c-format
-msgid "Cannot store %s"
-msgstr "%s depolanamıyor"
-
-#: builtin/rebase.c:853
-msgid "could not determine HEAD revision"
-msgstr "HEAD revizyonu saptanamadı"
-
-#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:813 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"
@@ -18299,11 +19620,11 @@
msgstr ""
"Tüm çakışmaları el ile çözün, onları \"git add/rm <çakışan-dosyalar>\"\n"
"ile tamam olarak imleyin, ardından \"git rebase --continue\" çalıştırın.\n"
-"Bunun yerine bu gönderiyi atlayabilirsiniz: \"git rebase --skip\" yapın.\n"
+"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:1058
+#: builtin/rebase.c:896
#, c-format
msgid ""
"\n"
@@ -18322,7 +19643,7 @@
"\n"
"Bunun sonucu olarak git onları yeniden temellendiremiyor."
-#: builtin/rebase.c:1383
+#: builtin/rebase.c:1227
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
@@ -18330,7 +19651,7 @@
msgstr ""
"tanımlanamayan boş tür '%s'; geçerli türler: \"drop\", \"keep\" ve \"ask\""
-#: builtin/rebase.c:1401
+#: builtin/rebase.c:1245
#, c-format
msgid ""
"%s\n"
@@ -18347,7 +19668,7 @@
"\tgit rebase '<dal>'\n"
"\n"
-#: builtin/rebase.c:1417
+#: builtin/rebase.c:1261
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -18360,141 +19681,153 @@
"\tgit branch --set-upstream-to=%s/<dal> %s\n"
"\n"
-#: builtin/rebase.c:1447
+#: builtin/rebase.c:1291
msgid "exec commands cannot contain newlines"
msgstr "'exec' komutları yenisatırlar içeremez"
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1295
msgid "empty exec command"
msgstr "boş 'exec' komutu"
-#: builtin/rebase.c:1481
+#: builtin/rebase.c:1324
msgid "rebase onto given branch instead of upstream"
msgstr "üstkaynak yerine verilen dalın üzerine yeniden temellendir"
-#: builtin/rebase.c:1483
+#: builtin/rebase.c:1326
msgid "use the merge-base of upstream and branch as the current base"
msgstr "üstkaynağın birleştirme temelini ve dalını geçerli temel olarak kullan"
-#: builtin/rebase.c:1485
+#: builtin/rebase.c:1328
msgid "allow pre-rebase hook to run"
msgstr "pre-rebase kancasının çalışmasına izin ver"
-#: builtin/rebase.c:1487
+#: builtin/rebase.c:1330
msgid "be quiet. implies --no-stat"
msgstr "sessiz ol (--no-stat ima eder)"
-#: builtin/rebase.c:1493
+#: builtin/rebase.c:1336
msgid "do not show diffstat of what changed upstream"
msgstr "üstkaynakta nelerin değiştiğini gösteren diffstat gösterme"
-#: builtin/rebase.c:1496
-msgid "add a Signed-off-by: line to each commit"
-msgstr "her gönderiye bir Signed-off-by satırı ekle"
+#: builtin/rebase.c:1339
+msgid "add a Signed-off-by trailer to each commit"
+msgstr "her işlemeye bir Signed-off-by artbilgisi ekle"
-#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504
-msgid "passed to 'git am'"
-msgstr "'git am'a aktarıldı"
+#: builtin/rebase.c:1342
+msgid "make committer date match author date"
+msgstr "işleyici tarihi ile yazar tarihini aynı yap"
-#: builtin/rebase.c:1506 builtin/rebase.c:1508
+#: builtin/rebase.c:1344
+msgid "ignore author date and use current date"
+msgstr "yazar tarihini yok say ve geçerli tarihi kullan"
+
+#: builtin/rebase.c:1346
+msgid "synonym of --reset-author-date"
+msgstr "--reset-author-date eşanlamlısı"
+
+#: builtin/rebase.c:1348 builtin/rebase.c:1352
msgid "passed to 'git apply'"
msgstr "'git apply'a aktarıldı"
-#: builtin/rebase.c:1510 builtin/rebase.c:1513
-msgid "cherry-pick all commits, even if unchanged"
-msgstr "değiştirilmemiş olsa bile tüm gönderileri seç-al yap"
+#: builtin/rebase.c:1350
+msgid "ignore changes in whitespace"
+msgstr "boşluk değişikliklerini yok say"
-#: builtin/rebase.c:1515
+#: builtin/rebase.c:1354 builtin/rebase.c:1357
+msgid "cherry-pick all commits, even if unchanged"
+msgstr "değiştirilmemiş olsa bile tüm işlemeleri seç-al yap"
+
+#: builtin/rebase.c:1359
msgid "continue"
msgstr "sürdür"
-#: builtin/rebase.c:1518
+#: builtin/rebase.c:1362
msgid "skip current patch and continue"
msgstr "geçerli yamayı atla ve sürdür"
-#: builtin/rebase.c:1520
+#: builtin/rebase.c:1364
msgid "abort and check out the original branch"
msgstr "iptal et ve orijinal dalı çıkış yap"
-#: builtin/rebase.c:1523
+#: builtin/rebase.c:1367
msgid "abort but keep HEAD where it is"
-msgstr "iptal et, ancak HEAD'i olduğu yerde bırak"
+msgstr "iptal et; ancak HEAD'i olduğu yerde bırak"
-#: builtin/rebase.c:1524
+#: builtin/rebase.c:1368
msgid "edit the todo list during an interactive rebase"
msgstr ""
"bir etkileşimli yeniden temellendirme sırasında yapılacaklar listesini "
"düzenle"
-#: builtin/rebase.c:1527
+#: builtin/rebase.c:1371
msgid "show the patch file being applied or merged"
msgstr "yama dosyası uygulanırken veya birleştirilirken göster"
-#: builtin/rebase.c:1530
+#: builtin/rebase.c:1374
msgid "use apply strategies to rebase"
msgstr "yeniden temellendirmek için \"apply\" stratejilerini kullan"
-#: builtin/rebase.c:1534
+#: builtin/rebase.c:1378
msgid "use merging strategies to rebase"
msgstr "yeniden temellendirmek için birleştirme stratejilerini kullan"
-#: builtin/rebase.c:1538
+#: builtin/rebase.c:1382
msgid "let the user edit the list of commits to rebase"
msgstr ""
-"yeniden temellendirilecek gönderilerin listesini kullanıcının düzenlemesine "
+"yeniden temellendirilecek işlemelerin listesini kullanıcının düzenlemesine "
"izin ver"
-#: builtin/rebase.c:1542
+#: builtin/rebase.c:1386
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr ""
-"(KULLANIM DIŞI) birleştirmeleri yok saymak yerine onları yeniden oluşturmaya "
-"çalış"
+"(KULLANILMAMALI) birleştirmeleri yok saymak yerine onları yeniden "
+"oluşturmaya çalış"
-#: builtin/rebase.c:1547
+#: builtin/rebase.c:1391
msgid "how to handle commits that become empty"
-msgstr "boşalan gönderiler nasıl işlensin"
+msgstr "boşalan işlemelerin nasıl ele alınacağı"
-#: builtin/rebase.c:1554
+#: builtin/rebase.c:1398
msgid "move commits that begin with squash!/fixup! under -i"
-msgstr "-i altındaki squash!/fixup! ile başlayan gönderileri taşı"
+msgstr "-i altındaki squash!/fixup! ile başlayan işlemeleri taşı"
-#: builtin/rebase.c:1560
-msgid "automatically stash/stash pop before and after"
-msgstr "öncesinde ve sonrasında kendiliğinden zulala/zulaları patlat"
-
-#: builtin/rebase.c:1562
+#: builtin/rebase.c:1405
msgid "add exec lines after each commit of the editable list"
-msgstr "düzenlenebilir listenin her gönderisinden sonra exec satırları ekle"
+msgstr "düzenlenebilir listenin her işlemesinden sonra exec satırları ekle"
-#: builtin/rebase.c:1566
+#: builtin/rebase.c:1409
msgid "allow rebasing commits with empty messages"
-msgstr "boş iletili gönderilerin yeniden temellendirilmesine izin ver"
+msgstr "boş iletili işlemelerin yeniden temellendirilmesine izin ver"
-#: builtin/rebase.c:1570
+#: builtin/rebase.c:1413
msgid "try to rebase merges instead of skipping them"
msgstr "birleştirmeleri atlamak yerine onları yeniden temellendirmeyi dene"
-#: builtin/rebase.c:1573
+#: builtin/rebase.c:1416
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "üstkaynağı arılaştırmak için 'merge-base --fork-point' kullan"
-#: builtin/rebase.c:1575
+#: builtin/rebase.c:1418
msgid "use the given merge strategy"
msgstr "verilen birleştirme stratejisini kullan"
-#: builtin/rebase.c:1577 builtin/revert.c:115
+#: builtin/rebase.c:1420 builtin/revert.c:115
msgid "option"
msgstr "seçenek"
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1421
msgid "pass the argument through to the merge strategy"
-msgstr "değişkeni birleştirme stratejisine aktar"
+msgstr "argümanı birleştirme stratejisine aktar"
-#: builtin/rebase.c:1581
+#: builtin/rebase.c:1424
msgid "rebase all reachable commits up to the root(s)"
-msgstr "ulaşılabilir tüm gönderileri kök(ler)e kadar yeniden temellendir"
+msgstr "ulaşılabilir tüm işlemeleri kök(ler)e kadar yeniden temellendir"
-#: builtin/rebase.c:1598
+#: builtin/rebase.c:1429
+msgid "apply all changes, even those already present upstream"
+msgstr "tüm değişiklikleri uygula, halihazırda üstkaynakta olanları bile"
+
+#: builtin/rebase.c:1446
msgid ""
"the rebase.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
@@ -18502,40 +19835,43 @@
"'rebase.useBuiltin' desteği kaldırıldı!\n"
"Ayrıntılar için 'git help config' içindeki girdisine bakın."
-#: builtin/rebase.c:1604
+#: builtin/rebase.c:1452
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "Görünüşe göre 'git am' sürmekte. Yeniden temellendirilemiyor."
-#: builtin/rebase.c:1645
+#: builtin/rebase.c:1493
msgid ""
"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr ""
-"'git rebase --preserve-merges' kullanım dışı. Yerine --rebase-merges "
-"kullanın."
+"'git rebase --preserve-merges' artık eski. Yerine --rebase-merges kullanın."
-#: builtin/rebase.c:1650
+#: builtin/rebase.c:1498
msgid "cannot combine '--keep-base' with '--onto'"
msgstr "--keep-base ile --onto birlikte kullanılamaz"
-#: builtin/rebase.c:1652
+#: builtin/rebase.c:1500
msgid "cannot combine '--keep-base' with '--root'"
msgstr "--keep-base ile --root birlikte kullanılamaz"
-#: builtin/rebase.c:1656
-msgid "No rebase in progress?"
-msgstr "Süren bir yeniden temellendirme yok?"
+#: builtin/rebase.c:1504
+msgid "cannot combine '--root' with '--fork-point'"
+msgstr "--root ile --fork-point birlikte kullanılamaz"
-#: builtin/rebase.c:1660
+#: builtin/rebase.c:1507
+msgid "No rebase in progress?"
+msgstr "Sürmekte olan bir yeniden temellendirme yok"
+
+#: builtin/rebase.c:1511
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"--edit-todo seçeneği yalnızca etkileşimli yeniden temellendirme sırasında "
"kullanılabilir."
-#: builtin/rebase.c:1683
+#: builtin/rebase.c:1534 t/helper/test-fast-rebase.c:123
msgid "Cannot read HEAD"
msgstr "HEAD okunamıyor"
-#: builtin/rebase.c:1695
+#: builtin/rebase.c:1546
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -18543,16 +19879,16 @@
"Önce tüm birleştirme çakışmalarını düzenlemeli ve onları\n"
"git add kullanarak tamamlandı olarak imlemelisiniz."
-#: builtin/rebase.c:1714
+#: builtin/rebase.c:1565
msgid "could not discard worktree changes"
msgstr "çalışma ağacı değişiklikleri atılamadı"
-#: builtin/rebase.c:1733
+#: builtin/rebase.c:1584
#, c-format
msgid "could not move back to %s"
msgstr "%s konumuna geri taşınamadı"
-#: builtin/rebase.c:1778
+#: builtin/rebase.c:1630
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -18573,166 +19909,143 @@
"yapın ve beni yeniden çalıştırın. Ben sizi belki orada hâlâ değerli bir\n"
"şeyler olabilir diye durdurdum.\n"
-#: builtin/rebase.c:1806
+#: builtin/rebase.c:1658
msgid "switch `C' expects a numerical value"
msgstr "'C' anahtarı sayısal bir değer bekliyor"
-#: builtin/rebase.c:1847
+#: builtin/rebase.c:1700
#, c-format
msgid "Unknown mode: %s"
msgstr "Bilinmeyen kip: %s"
-#: builtin/rebase.c:1869
+#: builtin/rebase.c:1739
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy, --merge veya --interactive gerektiriyor"
-#: builtin/rebase.c:1899
+#: builtin/rebase.c:1769
msgid "cannot combine apply options with merge options"
msgstr "\"apply\" seçenekleri \"merge\" seçenekleriyle birlikte kullanılamıyor"
-#: builtin/rebase.c:1912
+#: builtin/rebase.c:1782
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "Bilinmeyen yeniden temellendirme arka ucu: %s"
-#: builtin/rebase.c:1937
+#: builtin/rebase.c:1812
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec, --exec veya --interactive gerektiriyor"
-#: builtin/rebase.c:1957
+#: builtin/rebase.c:1832
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr "--preserve-merges ile --rebase-merges birlikte kullanılamıyor"
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1836
msgid ""
"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
"hata: --preserve-merges ile --reschedule-failed-exec birlikte kullanılamıyor"
-#: builtin/rebase.c:1985
+#: builtin/rebase.c:1860
#, c-format
msgid "invalid upstream '%s'"
msgstr "geçersiz üstkaynak '%s'"
-#: builtin/rebase.c:1991
+#: builtin/rebase.c:1866
msgid "Could not create new root commit"
-msgstr "Yeni kök gönderi oluşturulamadı"
+msgstr "Yeni kök işleme oluşturulamadı"
-#: builtin/rebase.c:2017
+#: builtin/rebase.c:1892
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "'%s': tam olarak dallı bir birleştirme temeli gerekli"
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1895
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s': tam olarak bir birleştirme temeli gerekiyor"
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1903
#, c-format
msgid "Does not point to a valid commit '%s'"
-msgstr "'%s' geçerli bir gönderiye işaret etmiyor"
+msgstr "'%s' geçerli bir işlemeye işaret etmiyor"
-#: builtin/rebase.c:2054
+#: builtin/rebase.c:1931
#, c-format
msgid "fatal: no such branch/commit '%s'"
-msgstr "onulmaz: böyle bir dal/gönderi yok: '%s'"
+msgstr "onulmaz: böyle bir dal/işleme yok: '%s'"
-#: builtin/rebase.c:2062 builtin/submodule--helper.c:40
-#: builtin/submodule--helper.c:1990
+#: builtin/rebase.c:1939 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:2073
+#: builtin/rebase.c:1950
msgid "Could not resolve HEAD to a revision"
msgstr "HEAD bir revizyona çözülemedi"
-#: builtin/rebase.c:2111
-msgid "Cannot autostash"
-msgstr "Kendiliğinden zulalanamıyor"
-
-#: builtin/rebase.c:2114
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr "Beklenmedik zula yanıtı: '%s'"
-
-#: builtin/rebase.c:2120
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr "'%s' için dizin oluşturulamadı"
-
-#: builtin/rebase.c:2123
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr "Zula kendiliğinden oluşturuldu: %s\n"
-
-#: builtin/rebase.c:2126
-msgid "could not reset --hard"
-msgstr "'reset --hard' yapılamadı"
-
-#: builtin/rebase.c:2135
+#: builtin/rebase.c:1971
msgid "Please commit or stash them."
-msgstr "Lütfen onları gönderin veya zulalayın."
+msgstr "Lütfen onları işleyin veya zulalayın."
-#: builtin/rebase.c:2169
+#: builtin/rebase.c:2007
#, c-format
msgid "could not switch to %s"
msgstr "şuraya geçilemedi: %s"
-#: builtin/rebase.c:2180
+#: builtin/rebase.c:2018
msgid "HEAD is up to date."
msgstr "HEAD güncel."
-#: builtin/rebase.c:2182
+#: builtin/rebase.c:2020
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "Geçerli dal %s güncel.\n"
-#: builtin/rebase.c:2190
+#: builtin/rebase.c:2028
msgid "HEAD is up to date, rebase forced."
-msgstr "HEAD güncel, yeniden temellendirme zorlandı."
+msgstr "HEAD güncel, yeniden temellendirme zorla yapıldı."
-#: builtin/rebase.c:2192
+#: builtin/rebase.c:2030
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
-msgstr "Geçerli dal %s güncel, yeniden temellendirme zorlandı.\n"
+msgstr "Geçerli dal %s güncel, yeniden temellendirme zorla yapıldı.\n"
-#: builtin/rebase.c:2200
+#: builtin/rebase.c:2038
msgid "The pre-rebase hook refused to rebase."
msgstr "'pre-rebase' kancası yeniden temellendirmeyi reddetti."
-#: builtin/rebase.c:2207
+#: builtin/rebase.c:2045
#, c-format
msgid "Changes to %s:\n"
msgstr "%s için olan değişiklikler:\n"
-#: builtin/rebase.c:2210
+#: builtin/rebase.c:2048
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "%s -> %s değişiklikleri:\n"
-#: builtin/rebase.c:2235
+#: builtin/rebase.c:2073
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"Öncelikle dal ucu üzerindeki çalışmanızı yeniden oynatmak için geri "
"sarılıyor...\n"
-#: builtin/rebase.c:2244
+#: builtin/rebase.c:2082
msgid "Could not detach HEAD"
msgstr "HEAD ayrılamadı"
-#: builtin/rebase.c:2253
+#: builtin/rebase.c:2091
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "%s, %s konumuna ileri sarıldı.\n"
-#: builtin/receive-pack.c:33
+#: builtin/receive-pack.c:34
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-dizini>"
-#: builtin/receive-pack.c:821
+#: builtin/receive-pack.c:1276
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"
@@ -18749,7 +20062,7 @@
"'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"
+"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."
@@ -18761,7 +20074,7 @@
"denyCurrentBranch'\n"
"yapılandırma değişkenini 'refuse' olarak ayarlayın."
-#: builtin/receive-pack.c:841
+#: builtin/receive-pack.c:1296
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"
@@ -18772,7 +20085,7 @@
"\n"
"To squelch this message, you can set it to 'refuse'."
msgstr ""
-"Öntanımlı olarak, geçerli dalı silme reddedilir, çünkü bir sonraki 'git "
+"Ö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"
@@ -18781,11 +20094,11 @@
"değişkenini 'warn' veya 'ignore' olarak ayarlayabilirsiniz.\n"
"Bu iletiyi susturmak için onu 'refuse' olarak ayarlayın."
-#: builtin/receive-pack.c:1938
+#: builtin/receive-pack.c:2481
msgid "quiet"
msgstr "sessiz"
-#: builtin/receive-pack.c:1952
+#: builtin/receive-pack.c:2495
msgid "You must specify a directory."
msgstr "Bir dizin belirtmelisiniz."
@@ -18816,36 +20129,36 @@
msgid "'%s' is not a valid timestamp"
msgstr "'%s' geçerli bir zaman damgası değil"
-#: builtin/reflog.c:606
+#: builtin/reflog.c:609
#, c-format
msgid "Marking reachable objects..."
msgstr "Ulaşılabilir nesneler imleniyor..."
-#: builtin/reflog.c:644
+#: builtin/reflog.c:647
#, c-format
msgid "%s points nowhere!"
msgstr "%s hiçbir yere işaret etmiyor!"
-#: builtin/reflog.c:696
+#: builtin/reflog.c:699
msgid "no reflog specified to delete"
msgstr "silmek için bir başvuru günlüğü belirtilmedi"
-#: builtin/reflog.c:705
+#: builtin/reflog.c:708
#, c-format
msgid "not a reflog: %s"
msgstr "bir başvuru günlüğü değil: %s"
-#: builtin/reflog.c:710
+#: builtin/reflog.c:713
#, c-format
msgid "no reflog for '%s'"
msgstr "'%s' için başvuru günlüğü yok"
-#: builtin/reflog.c:756
+#: builtin/reflog.c:759
#, c-format
msgid "invalid ref format: %s"
msgstr "geçersiz başvuru biçimi: %s"
-#: builtin/reflog.c:765
+#: builtin/reflog.c:768
msgid "git reflog [ show | expire | delete | exists ]"
msgstr "git reflog [ show | expire | delete | exists ]"
@@ -18941,13 +20254,13 @@
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
msgstr ""
-"--mirror tehlikeli ve artık kullanım dışı; lütfen\n"
+"--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"
+msgstr "bilinmeyen yansı argümanı: %s"
#: builtin/remote.c:164
msgid "fetch the remote branches"
@@ -18984,40 +20297,35 @@
msgstr ""
"izlemek için dallar belirtmek yalnızca getirme yansılarıyla anlamifade ediyor"
-#: builtin/remote.c:195 builtin/remote.c:696
+#: builtin/remote.c:195 builtin/remote.c:700
#, c-format
msgid "remote %s already exists."
msgstr "%s uzak konumu halihazırda var."
-#: builtin/remote.c:199 builtin/remote.c:700
-#, c-format
-msgid "'%s' is not a valid remote name"
-msgstr "'%s' geçerli bir uzak konum adı değil"
-
-#: builtin/remote.c:239
+#: builtin/remote.c:240
#, c-format
msgid "Could not setup master '%s'"
msgstr "'%s' ana dalı ayarlanamadı"
-#: builtin/remote.c:354
+#: builtin/remote.c:355
#, 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
+#: builtin/remote.c:454 builtin/remote.c:462
msgid "(matching)"
msgstr "(eşleşiyor)"
-#: builtin/remote.c:465
+#: builtin/remote.c:466
msgid "(delete)"
msgstr "(sil)"
-#: builtin/remote.c:653
+#: builtin/remote.c:655
#, c-format
msgid "could not set '%s'"
msgstr "'%s' ayarlanamadı"
-#: builtin/remote.c:658
+#: builtin/remote.c:660
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
@@ -19028,17 +20336,17 @@
"\t%s:%d\n"
"artık var olmayan '%s' uzak konumunu adlandırıyor."
-#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940
+#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946
#, c-format
msgid "No such remote: '%s'"
msgstr "Böyle bir uzak konum yok: '%s'"
-#: builtin/remote.c:706
+#: builtin/remote.c:710
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "'%s' yapılandırma bölümü '%s' olarak yeniden adlandırılamadı"
-#: builtin/remote.c:726
+#: builtin/remote.c:730
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -19049,17 +20357,17 @@
"\t%s\n"
"\tLütfen gerekirse yapılandırmayı el ile güncelleyin."
-#: builtin/remote.c:766
+#: builtin/remote.c:770
#, c-format
msgid "deleting '%s' failed"
msgstr "'%s' silinmesi başarısız"
-#: builtin/remote.c:800
+#: builtin/remote.c:804
#, c-format
msgid "creating '%s' failed"
msgstr "'%s' oluşturulması başarısız"
-#: builtin/remote.c:876
+#: builtin/remote.c:882
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -19073,120 +20381,120 @@
"Not: refs/remotes hiyerarşisi dışındaki bazı dallar kaldırılmadı;\n"
"onları silmek için şunu kullanın:"
-#: builtin/remote.c:890
+#: builtin/remote.c:896
#, c-format
msgid "Could not remove config section '%s'"
msgstr "'%s' yapılandırsa bölümü kaldırılamadı"
-#: builtin/remote.c:993
+#: builtin/remote.c:999
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " yeni (bir sonraki getirme uzak konumlarda depolayacak/%s"
-#: builtin/remote.c:996
+#: builtin/remote.c:1002
msgid " tracked"
msgstr " izlendi"
-#: builtin/remote.c:998
+#: builtin/remote.c:1004
msgid " stale (use 'git remote prune' to remove)"
msgstr " eskimiş (kaldırmak için 'git remote prune' kullanın)"
-#: builtin/remote.c:1000
+#: builtin/remote.c:1006
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:1041
+#: builtin/remote.c:1047
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "geçersiz branch.%s.merge; birden çok dala yeniden temellendirilemiyor"
-#: builtin/remote.c:1050
+#: builtin/remote.c:1056
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "%s uzak konumuna etkileşimli olarak yeniden temellendirir"
-#: builtin/remote.c:1052
+#: builtin/remote.c:1058
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr ""
"%s uzak konumuna etkileşimli olarak (birleştirmelerle birlikte) yeniden "
"temellendirir"
-#: builtin/remote.c:1055
+#: builtin/remote.c:1061
#, c-format
msgid "rebases onto remote %s"
msgstr "%s uzak konumuna yeniden temellendirir"
-#: builtin/remote.c:1059
+#: builtin/remote.c:1065
#, c-format
msgid " merges with remote %s"
msgstr " %s uzak konumu ile birleştirir"
-#: builtin/remote.c:1062
+#: builtin/remote.c:1068
#, c-format
msgid "merges with remote %s"
msgstr "%s uzak konumu ile birleştirir"
-#: builtin/remote.c:1065
+#: builtin/remote.c:1071
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s ve %s uzak konumu ile birlikte\n"
-#: builtin/remote.c:1108
+#: builtin/remote.c:1114
msgid "create"
msgstr "oluştur"
-#: builtin/remote.c:1111
+#: builtin/remote.c:1117
msgid "delete"
msgstr "sil"
-#: builtin/remote.c:1115
+#: builtin/remote.c:1121
msgid "up to date"
msgstr "güncel"
-#: builtin/remote.c:1118
+#: builtin/remote.c:1124
msgid "fast-forwardable"
msgstr "ileri sarılabilir"
-#: builtin/remote.c:1121
+#: builtin/remote.c:1127
msgid "local out of date"
msgstr "yerelin tarihi geçmiş"
-#: builtin/remote.c:1128
+#: builtin/remote.c:1134
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s şuna zorluyor: %-*s (%s)"
-#: builtin/remote.c:1131
+#: builtin/remote.c:1137
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s şuna itiyor: %-*s (%s)"
-#: builtin/remote.c:1135
+#: builtin/remote.c:1141
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s şuna zorluyor: %s"
-#: builtin/remote.c:1138
+#: builtin/remote.c:1144
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s şuna itiyor: %s"
-#: builtin/remote.c:1206
+#: builtin/remote.c:1212
msgid "do not query remotes"
msgstr "uzak konumları sorgulama"
-#: builtin/remote.c:1233
+#: builtin/remote.c:1239
#, c-format
msgid "* remote %s"
msgstr "* uzak konum %s"
-#: builtin/remote.c:1234
+#: builtin/remote.c:1240
#, c-format
msgid " Fetch URL: %s"
msgstr " URL'yi getir: %s"
-#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390
+#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
msgid "(no URL)"
msgstr "(URL yok)"
@@ -19194,185 +20502,185 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1249 builtin/remote.c:1251
+#: builtin/remote.c:1255 builtin/remote.c:1257
#, c-format
msgid " Push URL: %s"
msgstr " URL'yi it: %s"
-#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD dalı: %s"
-#: builtin/remote.c:1253
+#: builtin/remote.c:1259
msgid "(not queried)"
msgstr "(sorgulanmadı"
-#: builtin/remote.c:1255
+#: builtin/remote.c:1261
msgid "(unknown)"
msgstr "(bilinmiyor)"
-#: builtin/remote.c:1259
+#: builtin/remote.c:1265
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
" HEAD dalı (uzak konum HEAD'i belirsiz, aşağıdakilerden biri olabilir):\n"
-#: builtin/remote.c:1271
+#: builtin/remote.c:1277
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Uzak dal:%s"
msgstr[1] " Uzak dallar:%s"
-#: builtin/remote.c:1274 builtin/remote.c:1300
+#: builtin/remote.c:1280 builtin/remote.c:1306
msgid " (status not queried)"
msgstr " (durum sorgulanmadı)"
-#: builtin/remote.c:1283
+#: builtin/remote.c:1289
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " 'git pull' için yapılandırılan yerel dal:"
msgstr[1] " 'git pull' için yapılandırılan yerel dallar:"
-#: builtin/remote.c:1291
+#: builtin/remote.c:1297
msgid " Local refs will be mirrored by 'git push'"
msgstr " Yerel başvurular 'git pull' tarafından yansılanacak"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1303
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " 'git push'%s için yapılandırılan yerel başvuru:"
msgstr[1] " 'git push'%s için yapılandırılan yerel başvurular:"
-#: builtin/remote.c:1318
+#: builtin/remote.c:1324
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "refs/remotes/<ad>/HEAD'i uzak konuma göre ayarla"
-#: builtin/remote.c:1320
+#: builtin/remote.c:1326
msgid "delete refs/remotes/<name>/HEAD"
msgstr "refs/remotes/<ad>/HEAD'i sil"
-#: builtin/remote.c:1335
+#: builtin/remote.c:1341
msgid "Cannot determine remote HEAD"
msgstr "Uzak konum HEAD'i belirlenemiyor"
-#: builtin/remote.c:1337
+#: builtin/remote.c:1343
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "Birden çok uzak konum HEAD dalı. Lütfen birini açıkça seçin:"
-#: builtin/remote.c:1347
+#: builtin/remote.c:1353
#, c-format
msgid "Could not delete %s"
msgstr "%s silinemedi"
-#: builtin/remote.c:1355
+#: builtin/remote.c:1361
#, c-format
msgid "Not a valid ref: %s"
msgstr "Geçerli bir başvuru değil: %s"
-#: builtin/remote.c:1357
+#: builtin/remote.c:1363
#, c-format
msgid "Could not setup %s"
msgstr "%s ayarlanamadı"
-#: builtin/remote.c:1375
+#: builtin/remote.c:1381
#, c-format
msgid " %s will become dangling!"
msgstr " %s sarkacak!"
-#: builtin/remote.c:1376
+#: builtin/remote.c:1382
#, c-format
msgid " %s has become dangling!"
msgstr " %s sarkmaya başladı!"
-#: builtin/remote.c:1386
+#: builtin/remote.c:1392
#, c-format
msgid "Pruning %s"
msgstr "%s budanıyor"
-#: builtin/remote.c:1387
+#: builtin/remote.c:1393
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1403
+#: builtin/remote.c:1409
#, c-format
msgid " * [would prune] %s"
msgstr " * %s [budanacak]"
-#: builtin/remote.c:1406
+#: builtin/remote.c:1412
#, c-format
msgid " * [pruned] %s"
msgstr " * %s [budandı]"
-#: builtin/remote.c:1451
+#: builtin/remote.c:1457
msgid "prune remotes after fetching"
msgstr "getirme sonrasında uzak konumları buda"
-#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636
+#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
#, c-format
msgid "No such remote '%s'"
msgstr "Böyle bir uzak konum yok '%s'"
-#: builtin/remote.c:1530
+#: builtin/remote.c:1539
msgid "add branch"
msgstr "dal ekle"
-#: builtin/remote.c:1537
+#: builtin/remote.c:1546
msgid "no remote specified"
msgstr "uzak konum belirtilmedi"
-#: builtin/remote.c:1554
+#: builtin/remote.c:1563
msgid "query push URLs rather than fetch URLs"
msgstr "itme URL'lerinden çok getirme URL'lerini sorgula"
-#: builtin/remote.c:1556
+#: builtin/remote.c:1565
msgid "return all URLs"
msgstr "tüm URL'leri döndür"
-#: builtin/remote.c:1584
+#: builtin/remote.c:1595
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "'%s' uzak konumu için URL yapılandırılmamış"
-#: builtin/remote.c:1610
+#: builtin/remote.c:1621
msgid "manipulate push URLs"
msgstr "itme URL'lerini değiştir"
-#: builtin/remote.c:1612
+#: builtin/remote.c:1623
msgid "add URL"
msgstr "URL ekle"
-#: builtin/remote.c:1614
+#: builtin/remote.c:1625
msgid "delete URLs"
msgstr "URL'leri sil"
-#: builtin/remote.c:1621
+#: builtin/remote.c:1632
msgid "--add --delete doesn't make sense"
msgstr "--add --delete bir anlam ifade etmiyor"
-#: builtin/remote.c:1660
+#: builtin/remote.c:1673
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Geçersiz eski URL dizgisi: %s"
-#: builtin/remote.c:1668
+#: builtin/remote.c:1681
#, c-format
msgid "No such URL found: %s"
msgstr "Böyle bir URL bulunamadı: %s"
-#: builtin/remote.c:1670
+#: builtin/remote.c:1683
msgid "Will not delete all non-push URLs"
msgstr "Tüm itme olmayan URL'ler silinmeyecek"
-#: builtin/repack.c:23
+#: builtin/repack.c:26
msgid "git repack [<options>]"
msgstr "git repack [<seçenekler>]"
-#: builtin/repack.c:28
+#: builtin/repack.c:31
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -19381,134 +20689,120 @@
"--no-write-bitmap-index kullanın veya pack.writebitmaps yapılandırmasını\n"
"devre dışı bırakın."
-#: builtin/repack.c:191
+#: builtin/repack.c:198
msgid "could not start pack-objects to repack promisor objects"
msgstr "vaatçi nesneleri yeniden paketleme için pack-objects başlatılamadı"
-#: builtin/repack.c:230 builtin/repack.c:416
+#: builtin/repack.c:270 builtin/repack.c:446
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
"repack: Onaltılı tam nesne no satırları yalnızca pack-objects'ten bekleniyor."
-#: builtin/repack.c:254
+#: builtin/repack.c:294
msgid "could not finish pack-objects to repack promisor objects"
msgstr "vaatçi nesneleri yeniden paketleme için pack-objects bitirilemedi"
-#: builtin/repack.c:292
+#: builtin/repack.c:322
msgid "pack everything in a single pack"
msgstr "her şeyi tek bir pakete sığdır"
-#: builtin/repack.c:294
+#: builtin/repack.c:324
msgid "same as -a, and turn unreachable objects loose"
msgstr "-a ile aynı ve ulaşılamayan nesneleri serbest bırakır"
-#: builtin/repack.c:297
+#: builtin/repack.c:327
msgid "remove redundant packs, and run git-prune-packed"
msgstr "gereksiz paketleri kaldır ve 'git prune-packed' çalıştır"
-#: builtin/repack.c:299
+#: builtin/repack.c:329
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "'git-pack-objects'e --no-reuse-delta geçir"
-#: builtin/repack.c:301
+#: builtin/repack.c:331
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "'git-pack-objects'e --no-reuse-object geçir"
-#: builtin/repack.c:303
+#: builtin/repack.c:333
msgid "do not run git-update-server-info"
msgstr "'git-update-server-info' çalıştırma"
-#: builtin/repack.c:306
+#: builtin/repack.c:336
msgid "pass --local to git-pack-objects"
msgstr "--local'ı 'git-pack-objects'e geçir"
-#: builtin/repack.c:308
+#: builtin/repack.c:338
msgid "write bitmap index"
msgstr "biteşlem indeksi yaz"
-#: builtin/repack.c:310
+#: builtin/repack.c:340
msgid "pass --delta-islands to git-pack-objects"
msgstr "--delta-islands'ı 'git-pack-objects'e geçir"
-#: builtin/repack.c:311
+#: builtin/repack.c:341
msgid "approxidate"
msgstr "yaklaşık tarih"
-#: builtin/repack.c:312
+#: builtin/repack.c:342
msgid "with -A, do not loosen objects older than this"
msgstr "-A ile, bundan daha eski nesneleri bırakma"
-#: builtin/repack.c:314
+#: builtin/repack.c:344
msgid "with -a, repack unreachable objects"
msgstr "-a ile, ulaşılamayan nesneleri yeniden paketle"
-#: builtin/repack.c:316
+#: builtin/repack.c:346
msgid "size of the window used for delta compression"
msgstr "delta sıkıştırması için kullanılan pencerenin boyutu"
-#: builtin/repack.c:317 builtin/repack.c:323
+#: builtin/repack.c:347 builtin/repack.c:353
msgid "bytes"
msgstr "baytlar"
-#: builtin/repack.c:318
+#: builtin/repack.c:348
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"
+msgstr "yukarıdakiyle aynı; ancak girdi sayısı yerine bellek boyutunu kısıtla"
-#: builtin/repack.c:320
+#: builtin/repack.c:350
msgid "limits the maximum delta depth"
msgstr "olabilecek en büyük delta derinliğini kısıtlar"
-#: builtin/repack.c:322
+#: builtin/repack.c:352
msgid "limits the maximum number of threads"
msgstr "iş parçacıklarının olabilecek en büyük sayısını kısıtlar"
-#: builtin/repack.c:324
+#: builtin/repack.c:354
msgid "maximum size of each packfile"
msgstr "her paket dosyasının olabilecek en büyük boyutu"
-#: builtin/repack.c:326
+#: builtin/repack.c:356
msgid "repack objects in packs marked with .keep"
msgstr "nesneleri .keep ile imlenmiş paketlerde yeniden paketle"
-#: builtin/repack.c:328
+#: builtin/repack.c:358
msgid "do not repack this pack"
msgstr "bu paketi yeniden paketleme"
-#: builtin/repack.c:338
+#: builtin/repack.c:368
msgid "cannot delete packs in a precious-objects repo"
msgstr "bir precious-objects deposundaki paketler silinemiyor"
-#: builtin/repack.c:342
+#: builtin/repack.c:372
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable ve -A birbiriyle uyumsuz"
-#: builtin/repack.c:425
+#: builtin/repack.c:455
msgid "Nothing new to pack."
msgstr "Paketlenecek yeni bir şey yok."
-#: builtin/repack.c:486
+#: builtin/repack.c:485
#, 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"
+msgid "missing required file: %s"
+msgstr "gereken dosya eksik: %s"
-#: builtin/repack.c:534
+#: builtin/repack.c:487
#, c-format
-msgid "failed to remove '%s'"
-msgstr "'%s' kaldırılamadı"
+msgid "could not unlink: %s"
+msgstr "bağlantı kaldırılamadı: %s"
#: builtin/replace.c:22
msgid "git replace [-f] <object> <replacement>"
@@ -19520,7 +20814,7 @@
#: builtin/replace.c:24
msgid "git replace [-f] --graft <commit> [<parent>...]"
-msgstr "git replace [-f] --graft <gönderi> [<üst-öge>...]"
+msgstr "git replace [-f] --graft <işleme> [<üst-öge>...]"
#: builtin/replace.c:25
msgid "git replace [-f] --convert-graft-file"
@@ -19636,17 +20930,17 @@
#: builtin/replace.c:384
#, c-format
msgid "could not parse %s as a commit"
-msgstr "%s, bir gönderi olarak ayrıştırılamadı"
+msgstr "%s, bir işleme olarak ayrıştırılamadı"
#: builtin/replace.c:416
#, c-format
msgid "bad mergetag in commit '%s'"
-msgstr "'%s' gönderisinde hatalı birleştirme etiketi"
+msgstr "'%s' işlemesinde hatalı birleştirme etiketi"
#: builtin/replace.c:418
#, c-format
msgid "malformed mergetag in commit '%s'"
-msgstr "'%s' gönderisinde hatalı oluşturulmuş birleştirme etiketi"
+msgstr "'%s' işlemesinde hatalı oluşturulmuş birleştirme etiketi"
#: builtin/replace.c:430
#, c-format
@@ -19654,22 +20948,22 @@
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
"instead of --graft"
msgstr ""
-"'%s' orijinal gönderisi atılmış olan '%s' birleştirme etiketini içeriyor; --"
+"'%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 gönderisinin bir gpg imzası var"
+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 gönderide kaldırılacak"
+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 gönderi yazılamadı: '%s'"
+msgstr "şunun yerine geçecek işleme yazılamadı: '%s'"
#: builtin/replace.c:488
#, c-format
@@ -19679,7 +20973,7 @@
#: builtin/replace.c:492
#, c-format
msgid "new commit is the same as the old one: '%s'"
-msgstr "yeni gönderi eskisiyle aynı: '%s'"
+msgstr "yeni işleme eskisiyle aynı: '%s'"
#: builtin/replace.c:527
#, c-format
@@ -19704,7 +20998,7 @@
#: builtin/replace.c:551
msgid "change a commit's parents"
-msgstr "bir gönderinin üst ögelerini değiştir"
+msgstr "bir işlemenin üst ögelerini değiştir"
#: builtin/replace.c:552
msgid "convert existing graft file"
@@ -19736,23 +21030,23 @@
#: builtin/replace.c:587
msgid "-d needs at least one argument"
-msgstr "-d için en azından bir değişken gerekli"
+msgstr "-d için en azından bir argüman gerekli"
#: builtin/replace.c:593
msgid "bad number of arguments"
-msgstr "hatalı değişken sayısı"
+msgstr "hatalı argüman sayısı"
#: builtin/replace.c:599
msgid "-e needs exactly one argument"
-msgstr "-e için tam olarak bir değişken gerekli"
+msgstr "-e için tam olarak bir argüman gerekli"
#: builtin/replace.c:605
msgid "-g needs at least one argument"
-msgstr "-g için en azından bir değişken gerekli"
+msgstr "-g için en azından bir argüman gerekli"
#: builtin/replace.c:611
msgid "--convert-graft-file takes no argument"
-msgstr "--convert-graft-file değişken almaz"
+msgstr "--convert-graft-file argüman almaz"
#: builtin/replace.c:617
msgid "only one pattern can be given with -l"
@@ -19779,7 +21073,7 @@
msgid ""
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
msgstr ""
-"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<gönderi>]"
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<işleme>]"
#: builtin/reset.c:33
msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
@@ -19815,94 +21109,94 @@
msgid "keep"
msgstr "tut"
-#: builtin/reset.c:82
+#: builtin/reset.c:83
msgid "You do not have a valid HEAD."
msgstr "Geçerli bir HEAD'iniz yok."
-#: builtin/reset.c:84
+#: builtin/reset.c:85
msgid "Failed to find tree of HEAD."
msgstr "HEAD ağacı bulunamadı."
-#: builtin/reset.c:90
+#: builtin/reset.c:91
#, c-format
msgid "Failed to find tree of %s."
msgstr "%s ağacı bulunamadı."
-#: builtin/reset.c:115
+#: builtin/reset.c:116
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD şimdi şurada: %s"
-#: builtin/reset.c:194
+#: 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:294 builtin/stash.c:520 builtin/stash.c:595
-#: builtin/stash.c:619
+#: builtin/reset.c:295 builtin/stash.c:587 builtin/stash.c:661
+#: builtin/stash.c:685
msgid "be quiet, only report errors"
msgstr "sessiz ol, yalnızca hataları bildir"
-#: builtin/reset.c:296
+#: builtin/reset.c:297
msgid "reset HEAD and index"
msgstr "HEAD'i ve indeksi sıfırla"
-#: builtin/reset.c:297
+#: builtin/reset.c:298
msgid "reset only HEAD"
msgstr "yalnızca HEAD'i sıfırla"
-#: builtin/reset.c:299 builtin/reset.c:301
+#: 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:303
+#: builtin/reset.c:304
msgid "reset HEAD but keep local changes"
-msgstr "HEAD'i sıfırla, ancak yerel değişiklikleri tut"
+msgstr "HEAD'i sıfırla; ancak yerel değişiklikleri tut"
-#: builtin/reset.c:309
+#: 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:343
+#: 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:351
+#: 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:360
+#: builtin/reset.c:361
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch, --{hard,mixed,soft} ile uyumsuz"
-#: builtin/reset.c:370
+#: builtin/reset.c:371
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
-"belirtilmiş yol ile --mixed kullanım dışı; yerine 'git reset -- <yollar>' "
+"belirtilmiş yol ile --mixed artık eski; yerine 'git reset -- <yollar>' "
"kullanın."
-#: builtin/reset.c:372
+#: 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:387
+#: 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:391
+#: builtin/reset.c:392
msgid "-N can only be used with --mixed"
msgstr "-N yalnızca --mixed ile birlikte kullanılabilir"
-#: builtin/reset.c:412
+#: builtin/reset.c:413
msgid "Unstaged changes after reset:"
msgstr "Sıfırlama sonrasında hazırlanmamış değişiklikler:"
-#: builtin/reset.c:415
+#: builtin/reset.c:416
#, c-format
msgid ""
"\n"
@@ -19911,52 +21205,52 @@
"to make this the default.\n"
msgstr ""
"\n"
-"Sıfırlama sonrasında hazırlanmamış değişiklikleri sayıp dökme %.2f saniye\n"
+"Sı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:425
+#: 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:429
+#: builtin/reset.c:439
msgid "Could not write new index file."
msgstr "Yeni indeks dosyası yazılamadı."
-#: builtin/rev-list.c:499
+#: builtin/rev-list.c:534
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr "--exclude-promisor-objects ve --missing birlikte kullanılamıyor"
-#: builtin/rev-list.c:560
+#: builtin/rev-list.c:595
msgid "object filtering requires --objects"
msgstr "nesne süzme --objects gerektiriyor"
-#: builtin/rev-list.c:610
+#: builtin/rev-list.c:651
msgid "rev-list does not support display of notes"
msgstr "rev-list not görüntülemesini desteklemiyor"
-#: builtin/rev-list.c:615
+#: builtin/rev-list.c:656
msgid "marked counting is incompatible with --objects"
msgstr "imlenmiş sayım, --objects ile uyumsuz"
-#: builtin/rev-parse.c:408
+#: builtin/rev-parse.c:409
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
-msgstr "git rev-parse --parseopt [<seçenekler>] -- [<değişkenler>...]"
+msgstr "git rev-parse --parseopt [<seçenekler>] -- [<argümanlar>...]"
-#: builtin/rev-parse.c:413
+#: builtin/rev-parse.c:414
msgid "keep the `--` passed as an arg"
-msgstr "'--'i geçirilen bir değişken olarak tut"
+msgstr "'--'i geçirilen bir argüman olarak tut"
-#: builtin/rev-parse.c:415
+#: 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"
+msgstr "seçenek olmayan ilk argümandan sonra ayrıştırmayı durdur"
-#: builtin/rev-parse.c:418
+#: builtin/rev-parse.c:419
msgid "output in stuck long form"
msgstr "uzun biçimde çıktı ver"
-#: 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"
@@ -19964,15 +21258,15 @@
"\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"
+"git rev-parse --parseopt [<seçenekler>] -- [<argümanlar>...]\n"
+"\tor: git rev-parse --sq-quote [<argümanlar>...]\n"
+"\tor: git rev-parse [<seçenekler>] [<argümanlar>...]\n"
"\n"
"İlki hakkında ek bilgi için \"git rev-parse --parseopt -h\" çalıştırın."
#: builtin/revert.c:24
msgid "git revert [<options>] <commit-ish>..."
-msgstr "git revert [<seçenekler>] <gönderimsi>..."
+msgstr "git revert [<seçenekler>] <işlememsi>..."
#: builtin/revert.c:25
msgid "git revert <subcommand>"
@@ -19980,7 +21274,7 @@
#: builtin/revert.c:30
msgid "git cherry-pick [<options>] <commit-ish>..."
-msgstr "git cherry-pick [<seçenekler>] <gönderimsi>..."
+msgstr "git cherry-pick [<seçenekler>] <işlememsi>..."
#: builtin/revert.c:31
msgid "git cherry-pick <subcommand>"
@@ -20010,7 +21304,7 @@
#: builtin/revert.c:105
msgid "skip current commit and continue"
-msgstr "geçerli gönderiyi atla ve sürdür"
+msgstr "geçerli işlemeyi atla ve sürdür"
#: builtin/revert.c:107
msgid "don't automatically commit"
@@ -20018,7 +21312,7 @@
#: builtin/revert.c:108
msgid "edit the commit message"
-msgstr "gönderi iletisini düzenle"
+msgstr "işleme iletisini düzenle"
#: builtin/revert.c:111
msgid "parent-number"
@@ -20038,21 +21332,21 @@
#: builtin/revert.c:125
msgid "append commit name"
-msgstr "gönderi adını iliştir"
+msgstr "işleme adını iliştir"
#: builtin/revert.c:127
msgid "preserve initially empty commits"
-msgstr "başlangıçta boş olan gönderileri koru"
+msgstr "başlangıçta boş olan işlemeleri koru"
#: builtin/revert.c:129
msgid "keep redundant, empty commits"
-msgstr "gereksiz, boş gönderileri tut"
+msgstr "gereksiz, boş işlemeleri tut"
-#: builtin/revert.c:232
+#: builtin/revert.c:239
msgid "revert failed"
msgstr "geri al başarısız"
-#: builtin/revert.c:245
+#: builtin/revert.c:252
msgid "cherry-pick failed"
msgstr "seç-al başarısız"
@@ -20154,57 +21448,78 @@
"[<başvuru>...]\n"
" --all ve açık <başvuru> tanımlaması birlikte kullanılamaz."
-#: builtin/send-pack.c:163
+#: builtin/send-pack.c:188
msgid "remote name"
msgstr "uzak konum adı"
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:201
msgid "use stateless RPC protocol"
msgstr "durumsuz RPC protokolünü kullan"
-#: builtin/send-pack.c:178
+#: builtin/send-pack.c:202
msgid "read refs from stdin"
msgstr "başvuruları stdin'den oku"
-#: builtin/send-pack.c:179
+#: builtin/send-pack.c:203
msgid "print status from remote helper"
msgstr "uzak konum yardımcısından durum yazdır"
-#: builtin/shortlog.c:14
+#: builtin/shortlog.c:16
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git shortlog [<seçenekler>] [<revizyon-erimi>] [[--] <yol>...]"
-#: builtin/shortlog.c:15
+#: builtin/shortlog.c:17
msgid "git log --pretty=short | git shortlog [<options>]"
msgstr "git log --pretty=short | git shortlog [<seçenekler>]"
-#: builtin/shortlog.c:264
-msgid "Group by committer rather than author"
-msgstr "Yazar yerine gönderici ile grupla"
+#: builtin/shortlog.c:123
+msgid "using multiple --group options with stdin is not supported"
+msgstr "stdin ile çoklu --group seçenekleri kullanımı desteklenmiyor"
-#: builtin/shortlog.c:266
+#: builtin/shortlog.c:133
+msgid "using --group=trailer with stdin is not supported"
+msgstr "stdin ile --group=trailer kullanımı desteklenmiyor"
+
+#: builtin/shortlog.c:323
+#, c-format
+msgid "unknown group type: %s"
+msgstr "bilinmeyen grup türü: %s"
+
+#: builtin/shortlog.c:351
+msgid "group by committer rather than author"
+msgstr "yazar yerine işleyici ile grupla"
+
+#: builtin/shortlog.c:354
msgid "sort output according to the number of commits per author"
-msgstr "çıktıyı yazar başına olan gönderi sayısına göre sırala"
+msgstr "çıktıyı yazar başına olan işleme sayısına göre sırala"
-#: builtin/shortlog.c:268
-msgid "Suppress commit descriptions, only provides commit count"
-msgstr "Gönderi açıklamalarını gizle, yalnızca gönderi sayısını ver"
+#: builtin/shortlog.c:356
+msgid "suppress commit descriptions, only provides commit count"
+msgstr "işleme açıklamalarını gizle, yalnızca işleme sayısını ver"
-#: builtin/shortlog.c:270
-msgid "Show the email address of each author"
-msgstr "Her yazarın e-posta adresini göster"
+#: builtin/shortlog.c:358
+msgid "show the email address of each author"
+msgstr "her yazarın e-posta adresini göster"
-#: builtin/shortlog.c:271
+#: builtin/shortlog.c:359
msgid "<w>[,<i1>[,<i2>]]"
msgstr "<w>[,<i1>[,<i2>]]"
-#: builtin/shortlog.c:272
-msgid "Linewrap output"
-msgstr "Çıktı satırlarını kaydır"
+#: builtin/shortlog.c:360
+msgid "linewrap output"
+msgstr "çıktıyı kaydır"
-#: builtin/shortlog.c:301
+#: builtin/shortlog.c:362
+msgid "field"
+msgstr "alan"
+
+#: builtin/shortlog.c:363
+msgid "group by field"
+msgstr "alan ile grupla"
+
+#: builtin/shortlog.c:391
msgid "too many arguments given outside repository"
-msgstr "depo dışında çok fazla değişken verildi"
+msgstr "depo dışında çok fazla argüman verildi"
#: builtin/show-branch.c:13
msgid ""
@@ -20226,8 +21541,8 @@
#, c-format
msgid "ignoring %s; cannot handle more than %d ref"
msgid_plural "ignoring %s; cannot handle more than %d refs"
-msgstr[0] "%s yok sayılıyor; %d başvurudan fazlası işlenemiyor"
-msgstr[1] "%s yok sayılıyor; %d başvurudan fazlası işlenemiyor"
+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
@@ -20248,7 +21563,7 @@
#: builtin/show-branch.c:651
msgid "show <n> more commits after the common ancestor"
-msgstr "ortak atadan sonra <n> gönderi daha göster"
+msgstr "ortak atadan sonra <n> işleme daha göster"
#: builtin/show-branch.c:653
msgid "synonym to more=-1"
@@ -20264,7 +21579,7 @@
#: builtin/show-branch.c:658
msgid "name commits with their object names"
-msgstr "gönderileri kendi nesne adlarıyla adlandır"
+msgstr "işlemeleri kendi nesne adlarıyla adlandır"
#: builtin/show-branch.c:660
msgid "show possible merge bases"
@@ -20276,11 +21591,11 @@
#: builtin/show-branch.c:664
msgid "show commits in topological order"
-msgstr "gönderileri ilingesel sırada göster"
+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 gönderileri göster"
+msgstr "yalnızca birinci dalda olmayan işlemeleri göster"
#: builtin/show-branch.c:669
msgid "show merges reachable from only one tip"
@@ -20328,8 +21643,8 @@
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
-msgstr[0] "%d revizyondan başkası işlenemiyor."
-msgstr[1] "%d revizyondan başkası işlenemiyor."
+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
@@ -20339,7 +21654,15 @@
#: builtin/show-branch.c:838
#, c-format
msgid "cannot find commit %s (%s)"
-msgstr "%s gönderisi bulunamıyor (%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 ""
@@ -20386,18 +21709,26 @@
msgstr "stdin'den yerel bir depoda olmayan başvuruları göster"
#: builtin/sparse-checkout.c:21
-msgid "git sparse-checkout (init|list|set|add|disable) <options>"
-msgstr "git sparse-checkout (init|list|set|add|disable) <seçenekler>"
+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:64
+#: builtin/sparse-checkout.c:45
+msgid "git sparse-checkout list"
+msgstr "git sparse-checkout list"
+
+#: builtin/sparse-checkout.c:71
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr ""
"bu çalışma ağacı aralıklı değil (sparse-checkout dosyası var olmayabilir)"
-#: builtin/sparse-checkout.c:225
+#: builtin/sparse-checkout.c:223
msgid "failed to create directory for sparse-checkout file"
msgstr "aralıklı çıkış dosyası için dizin oluşturulamadı"
+#: builtin/sparse-checkout.c:264
+msgid "unable to upgrade repository format to enable worktreeConfig"
+msgstr "depo biçimi worktreeConfig etkinleştirmesi için yükseltilemiyor"
+
#: builtin/sparse-checkout.c:266
msgid "failed to set extensions.worktreeConfig setting"
msgstr "extensions.worktreeConfig yapılandırması ayarlanamadı"
@@ -20410,46 +21741,42 @@
msgid "initialize the sparse-checkout in cone mode"
msgstr "aralıklı çıkışı koni kipinde ilklendir"
-#: builtin/sparse-checkout.c:308
-msgid "initialize sparse-checkout"
-msgstr "aralıklı çıkış ilklendir"
-
-#: builtin/sparse-checkout.c:341
+#: builtin/sparse-checkout.c:339
#, c-format
msgid "failed to open '%s'"
msgstr "'%s' açılamadı"
-#: builtin/sparse-checkout.c:398
+#: builtin/sparse-checkout.c:396
#, c-format
msgid "could not normalize path %s"
msgstr "'%s' yolu olağanlaştırılamadı"
-#: builtin/sparse-checkout.c:410
+#: builtin/sparse-checkout.c:408
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
msgstr "git sparse-checkout (set|add) (--stdin | <dizgiler>)"
-#: builtin/sparse-checkout.c:435
+#: builtin/sparse-checkout.c:433
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "C biçemli '%s' dizisinin tırnakları kaldırılamıyor"
-#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513
+#: builtin/sparse-checkout.c:487 builtin/sparse-checkout.c:511
msgid "unable to load existing sparse-checkout patterns"
msgstr "mevcut aralıklı çıkış dizgileri yüklenemiyor"
-#: builtin/sparse-checkout.c:558
+#: builtin/sparse-checkout.c:556
msgid "read patterns from standard in"
msgstr "dizgileri stdin'den oku"
-#: builtin/sparse-checkout.c:564
-msgid "set sparse-checkout patterns"
-msgstr "aralıklı çıkış dizgileri ayarla"
+#: builtin/sparse-checkout.c:571
+msgid "git sparse-checkout reapply"
+msgstr "git sparse-checkout reapply"
-#: builtin/sparse-checkout.c:581
-msgid "disable sparse-checkout"
-msgstr "aralıklı çıkışı devre dışı bırak"
+#: builtin/sparse-checkout.c:590
+msgid "git sparse-checkout disable"
+msgstr "git sparse-checkout disable"
-#: builtin/sparse-checkout.c:593
+#: builtin/sparse-checkout.c:618
msgid "error while refreshing working directory"
msgstr "çalışma dizini yenilenirken hata"
@@ -20507,7 +21834,7 @@
#: builtin/stash.c:73
msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
-msgstr "git stash store [-m|--message <ileti>] [-q|--quiet] <gönderi>"
+msgstr "git stash store [-m|--message <ileti>] [-q|--quiet] <işleme>"
#: builtin/stash.c:78
msgid ""
@@ -20522,14 +21849,14 @@
#: builtin/stash.c:128
#, c-format
msgid "'%s' is not a stash-like commit"
-msgstr "'%s' zulaya benzer bir gönderi değil"
+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 git-legacy-stash.sh:549
+#: builtin/stash.c:162
msgid "No stash entries found."
msgstr "Zula girdisi bulunamadı."
@@ -20538,158 +21865,172 @@
msgid "%s is not a valid reference"
msgstr "%s geçerli bir başvuru değil"
-#: builtin/stash.c:225 git-legacy-stash.sh:75
-msgid "git stash clear with parameters is unimplemented"
+#: builtin/stash.c:225
+msgid "git stash clear with arguments is unimplemented"
msgstr "parametreli git stash clear henüz kullanılabilir değil"
-#: builtin/stash.c:404
+#: builtin/stash.c:429
+#, c-format
+msgid ""
+"WARNING: Untracked file in way of tracked file! Renaming\n"
+" %s -> %s\n"
+" to make room.\n"
+msgstr ""
+"UYARI: İzlenmeyen dosya, izlenen dosyanın önüne çıktı!\n"
+"Yer açmak için\n"
+" %s -> %s\n"
+" yeniden adlandırılıyor.\n"
+
+#: builtin/stash.c:490
msgid "cannot apply a stash in the middle of a merge"
msgstr "bir birleştirmenin ortasında zula uygulanamıyor"
-#: builtin/stash.c:415
+#: builtin/stash.c:501
#, c-format
msgid "could not generate diff %s^!."
msgstr "diff oluşturulamadı: %s^!."
-#: builtin/stash.c:422
-msgid "conflicts in index.Try without --index."
+#: builtin/stash.c:508
+msgid "conflicts in index. Try without --index."
msgstr "İndekste çakışmalar var. --index olmadan deneyin."
-#: builtin/stash.c:428
+#: builtin/stash.c:514
msgid "could not save index tree"
msgstr "indeks ağacı kaydedilemedi"
-#: builtin/stash.c:437
+#: builtin/stash.c:523
msgid "could not restore untracked files from stash"
msgstr "izlenmeyen dosyalar zuladan geri getirilemedi"
-#: builtin/stash.c:451
+#: builtin/stash.c:537
#, c-format
msgid "Merging %s with %s"
msgstr "%s, %s ile birleştiriliyor"
-#: builtin/stash.c:461 git-legacy-stash.sh:681
+#: builtin/stash.c:547
msgid "Index was not unstashed."
msgstr "İndeks zuladan çıkartılmamıştı."
-#: builtin/stash.c:522 builtin/stash.c:621
+#: builtin/stash.c:589 builtin/stash.c:687
msgid "attempt to recreate the index"
msgstr "indeks yeniden oluşturulmaya çalışılıyor"
-#: builtin/stash.c:555
+#: builtin/stash.c:633
#, c-format
msgid "Dropped %s (%s)"
msgstr "%s bırakıldı (%s)"
-#: builtin/stash.c:558
+#: builtin/stash.c:636
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s: Zula girdisi bırakılamadı"
-#: builtin/stash.c:583
+#: builtin/stash.c:649
#, c-format
msgid "'%s' is not a stash reference"
msgstr "'%s' bir zula başvurusu değil"
-#: builtin/stash.c:633 git-legacy-stash.sh:695
+#: builtin/stash.c:699
msgid "The stash entry is kept in case you need it again."
msgstr "Zula girdisi yeniden gereksiniminiz olursa diye saklanıyor."
-#: builtin/stash.c:656 git-legacy-stash.sh:713
+#: builtin/stash.c:722
msgid "No branch name specified"
msgstr "Dal adı belirtilmedi"
-#: builtin/stash.c:796 builtin/stash.c:833
+#: builtin/stash.c:866 builtin/stash.c:903
#, c-format
msgid "Cannot update %s with %s"
msgstr "%s, %s ile güncellenemiyor"
-#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
+#: builtin/stash.c:884 builtin/stash.c:1538 builtin/stash.c:1603
msgid "stash message"
msgstr "zula iletisi"
-#: builtin/stash.c:824
+#: builtin/stash.c:894
msgid "\"git stash store\" requires one <commit> argument"
-msgstr "\"git stash store\" bir <gönderi> değişkeni gerektirir"
+msgstr "\"git stash store\" bir <işleme> argümanı gerektirir"
-#: builtin/stash.c:1049 git-legacy-stash.sh:218
+#: builtin/stash.c:1109
msgid "No changes selected"
msgstr "Değişiklik seçilmedi"
-#: builtin/stash.c:1149 git-legacy-stash.sh:150
+#: builtin/stash.c:1209
msgid "You do not have the initial commit yet"
-msgstr "Henüz ilk gönderiniz yok"
+msgstr "Henüz ilk işleme yapılmamış"
-#: builtin/stash.c:1176 git-legacy-stash.sh:165
+#: builtin/stash.c:1236
msgid "Cannot save the current index state"
msgstr "Geçerli indeks durumu kaydedilemiyor"
-#: builtin/stash.c:1185 git-legacy-stash.sh:180
+#: builtin/stash.c:1245
msgid "Cannot save the untracked files"
msgstr "İzlenmeyen dosyalar kaydedilemiyor"
-#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201
-#: git-legacy-stash.sh:214
+#: builtin/stash.c:1256 builtin/stash.c:1265
msgid "Cannot save the current worktree state"
msgstr "Geçerli çalışma ağacı durumu kaydedilemiyor"
-#: builtin/stash.c:1233 git-legacy-stash.sh:234
+#: builtin/stash.c:1293
msgid "Cannot record working tree state"
msgstr "Çalışma ağacı durumu kaydı yazılamıyor"
-#: builtin/stash.c:1282 git-legacy-stash.sh:338
+#: builtin/stash.c:1342
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "--patch, --include-untracked veya --all hepsi bir anda kullanılamıyor"
-#: builtin/stash.c:1298
+#: builtin/stash.c:1358
msgid "Did you forget to 'git add'?"
msgstr "'git add' yapmayı mı unuttunuz?"
-#: builtin/stash.c:1313 git-legacy-stash.sh:346
+#: builtin/stash.c:1373
msgid "No local changes to save"
msgstr "Kaydedilecek yerel değişiklik yok"
-#: builtin/stash.c:1320 git-legacy-stash.sh:351
+#: builtin/stash.c:1380
msgid "Cannot initialize stash"
msgstr "Zula ilklendirilemiyor"
-#: builtin/stash.c:1335 git-legacy-stash.sh:355
+#: builtin/stash.c:1395
msgid "Cannot save the current status"
msgstr "Geçerli durum kaydedilemiyor"
-#: builtin/stash.c:1340
+#: builtin/stash.c:1400
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Çalışma dizini ve indeks durumu %s kaydedildi"
-#: builtin/stash.c:1430 git-legacy-stash.sh:385
+#: builtin/stash.c:1490
msgid "Cannot remove worktree changes"
msgstr "Çalışma ağacı değişiklikleri kaldırılamıyor"
-#: builtin/stash.c:1469 builtin/stash.c:1534
+#: builtin/stash.c:1529 builtin/stash.c:1594
msgid "keep index"
msgstr "indeksi tut"
-#: builtin/stash.c:1471 builtin/stash.c:1536
+#: builtin/stash.c:1531 builtin/stash.c:1596
msgid "stash in patch mode"
msgstr "yama kipinde zula"
-#: builtin/stash.c:1472 builtin/stash.c:1537
+#: builtin/stash.c:1532 builtin/stash.c:1597
msgid "quiet mode"
msgstr "sessiz kip"
-#: builtin/stash.c:1474 builtin/stash.c:1539
+#: builtin/stash.c:1534 builtin/stash.c:1599
msgid "include untracked files in stash"
msgstr "zulada izlenmeyen dosyaları içer"
-#: builtin/stash.c:1476 builtin/stash.c:1541
+#: builtin/stash.c:1536 builtin/stash.c:1601
msgid "include ignore files"
msgstr "yok sayma dosyalarını içer"
-#: builtin/stash.c:1600
-#, c-format
-msgid "could not exec %s"
-msgstr "%s 'exec' yapılamadı"
+#: builtin/stash.c:1636
+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]"
@@ -20707,21 +22048,21 @@
msgid "prepend comment character and space to each line"
msgstr "her satırın başına yorum karakteri ve boşluk koy"
-#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999
+#: 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"
+msgstr "submodule--helper print-default-remote argümanı almaz"
#: builtin/submodule--helper.c:102
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "'%s' url'sinden bir bileşen çıkarılamıyor"
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819
msgid "alternative anchor for relative paths"
msgstr "göreceli yollar için alternatif tutturucu"
@@ -20729,8 +22070,8 @@
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<yol>] [<yol>...]"
-#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630
-#: builtin/submodule--helper.c:653
+#: 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ı"
@@ -20760,12 +22101,13 @@
"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"
+msgid "suppress output of entering each submodule command"
+msgstr "her bir altmodül komutu girişinin çıktısını gizle"
-#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063
-msgid "Recurse into nested submodules"
-msgstr "İç içe geçmiş altmodüller içine özyinele"
+#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888
+#: builtin/submodule--helper.c:1487
+msgid "recurse into nested submodules"
+msgstr "iç içe geçmiş altmodüle özyinele"
#: builtin/submodule--helper.c:572
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
@@ -20780,102 +22122,151 @@
"'%s' yapılandırması aranamadı. Bu deponun kendi yetkili üstkaynağı olduğu "
"varsayılıyor."
-#: builtin/submodule--helper.c:667
+#: 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:671
+#: 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:681
+#: 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:688
+#: 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:710
-msgid "Suppress output for initializing a submodule"
-msgstr "Bir altmodül ilklendirmesi çıktısını gizle"
+#: 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:715
+#: builtin/submodule--helper.c:714
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<seçenekler>] [<yol>]"
-#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
+#: 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:837
+#: 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:864 builtin/submodule--helper.c:1033
+#: 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:888 builtin/submodule--helper.c:1199
-msgid "Suppress submodule status output"
-msgstr "Altmodül durum çıktısını gizle"
+#: 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:889
+#: builtin/submodule--helper.c:887
msgid ""
-"Use commit stored in the index instead of the one stored in the submodule "
+"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr ""
-"Altmodül HEAD'i içinde depolanan gönderi yerine indekste depolanan gönderiyi "
+"altmodül HEAD'i içinde depolanan işleme yerine indekste depolanan işlemeyi "
"kullan"
-#: builtin/submodule--helper.c:890
-msgid "recurse into nested submodules"
-msgstr "iç içe geçmiş altmodüle özyinele"
-
-#: builtin/submodule--helper.c:895
+#: 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:919
+#: builtin/submodule--helper.c:917
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <yol>"
-#: builtin/submodule--helper.c:983
+#: 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:989
+#: 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:1003
+#: 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:1014
+#: 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:1061
-msgid "Suppress output of synchronizing submodule url"
-msgstr "Altmodül url'si eşitleme çıktısını gizle"
+#: 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:1068
+#: 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:1122
+#: builtin/submodule--helper.c:1546
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -20884,7 +22275,7 @@
"Altmodül çalışma ağacı '%s' bir .git dizini içeriyor (tüm geçmişi dahil "
"olacak biçimde kaldırmak istiyorsanız 'rm -rf' kullanın)"
-#: builtin/submodule--helper.c:1134
+#: builtin/submodule--helper.c:1558
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -20893,47 +22284,47 @@
"Altmodül çalışma ağacı '%s' yerel değişiklikler içeriyor; onları atmak için "
"'-f' kullanın"
-#: builtin/submodule--helper.c:1142
+#: builtin/submodule--helper.c:1566
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "'%s' dizini temizlendi\n"
-#: builtin/submodule--helper.c:1144
+#: 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:1155
+#: 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:1171
+#: 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:1200
-msgid "Remove submodule working trees even if they contain local changes"
-msgstr "Altmodül çalışma ağaçlarını yerel değişiklikler içerseler bile kaldır"
+#: builtin/submodule--helper.c: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:1201
-msgid "Unregister all submodules"
-msgstr "Tüm altmodüllerin kaydını kaldır"
+#: builtin/submodule--helper.c:1625
+msgid "unregister all submodules"
+msgstr "tüm altmodüllerin kaydını kaldır"
-#: builtin/submodule--helper.c:1206
+#: 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:1220
+#: 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:1289
+#: 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"
@@ -20945,46 +22336,46 @@
"submodule.alternateErrorStrategy ayarını 'info'ya ayarlayın veya\n"
"--reference yerine --reference-if-able kullanarak klonlayın."
-#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331
+#: 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:1367
+#: 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:1374
+#: 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:1398
+#: 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:1401
+#: builtin/submodule--helper.c:1825
msgid "name of the new submodule"
msgstr "yeni altmodülün adı"
-#: builtin/submodule--helper.c:1404
+#: builtin/submodule--helper.c:1828
msgid "url where to clone the submodule from"
msgstr "altmodülün klonlanacağı url konumu"
-#: builtin/submodule--helper.c:1412
+#: builtin/submodule--helper.c:1836
msgid "depth for shallow clones"
msgstr "sığ klonların derinliği"
-#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924
+#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348
msgid "force cloning progress"
msgstr "zorla klonla"
-#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926
+#: 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:1424
+#: builtin/submodule--helper.c:1848
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -20993,155 +22384,189 @@
"git submodule--helper clone [--prefix=<yol>] [--quiet] [--reference <depo>] "
"[--name <ad>] [--depth <derinlik>] [--single-branch] --url <url> --path <yol>"
-#: builtin/submodule--helper.c:1449
+#: 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:1460
+#: 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:1464
+#: builtin/submodule--helper.c:1888
#, c-format
msgid "directory not empty: '%s'"
msgstr "dizin boş değil: '%s'"
-#: builtin/submodule--helper.c:1476
+#: 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:1512
+#: 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:1516
+#: 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:1617
+#: builtin/submodule--helper.c:2041
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Altmodül yolu '%s' ilklendirilmedi"
-#: builtin/submodule--helper.c:1621
+#: builtin/submodule--helper.c:2045
msgid "Maybe you want to use 'update --init'?"
msgstr "'update --init' mi kullanmak istersiniz?"
-#: builtin/submodule--helper.c:1651
+#: builtin/submodule--helper.c:2075
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Birleştirilmemiş altmodül %s atlanıyor"
-#: builtin/submodule--helper.c:1680
+#: builtin/submodule--helper.c:2104
#, c-format
msgid "Skipping submodule '%s'"
msgstr "'%s' altmodülü atlanıyor"
-#: builtin/submodule--helper.c:1830
+#: builtin/submodule--helper.c:2254
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "'%s' klonlanamadı. Yeniden deneme zamanlandı."
-#: builtin/submodule--helper.c:1841
+#: 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:1903 builtin/submodule--helper.c:2149
+#: 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:1906
+#: 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:1910
+#: builtin/submodule--helper.c:2334
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout veya none"
-#: builtin/submodule--helper.c:1916
-msgid "Create a shallow clone truncated to the specified number of revisions"
-msgstr "Belirli bir revizyon sayısına kısaltılmış sığ klon oluştur"
+#: builtin/submodule--helper.c: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:1919
+#: builtin/submodule--helper.c:2343
msgid "parallel jobs"
msgstr "paralel işler"
-#: builtin/submodule--helper.c:1921
+#: 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:1922
+#: builtin/submodule--helper.c:2346
msgid "don't print cloning progress"
msgstr "klonlama işlemini yazdırma"
-#: builtin/submodule--helper.c:1933
+#: 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:1946
+#: builtin/submodule--helper.c:2370
msgid "bad value for update parameter"
msgstr "güncelleme parametresi için hatalı değer"
-#: builtin/submodule--helper.c:1994
+#: 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 "
+"Altmodül (%s) dalı süperproje dalından devralmak üzere yapılandırıldı; ancak "
"süperproje herhangi bir dalda değil"
-#: builtin/submodule--helper.c:2117
+#: 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:2150
+#: builtin/submodule--helper.c:2574
msgid "recurse into submodules"
msgstr "altmodüllere özyinele"
-#: builtin/submodule--helper.c:2156
+#: 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:2212
+#: 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:2215
+#: 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:2220
+#: builtin/submodule--helper.c:2644
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config <ad> [<değer>]"
-#: builtin/submodule--helper.c:2221
+#: builtin/submodule--helper.c:2645
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <ad>"
-#: builtin/submodule--helper.c:2222
+#: builtin/submodule--helper.c:2646
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2241 git-submodule.sh:174
+#: builtin/submodule--helper.c:2665 git-submodule.sh:150
#, sh-format
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr ".gitmodules dosyasının çalışma ağacında olduğundan lütfen emin ol"
-#: builtin/submodule--helper.c:2291 git.c:433 git.c:684
+#: 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:441 git.c:714
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s, --super-prefix desteklemiyor"
-#: builtin/submodule--helper.c:2297
+#: 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"
@@ -21166,11 +22591,11 @@
msgid "shorten ref output"
msgstr "başvuru çıktısını kısalt"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
msgid "reason"
msgstr "neden"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
msgid "reason of the update"
msgstr "güncelleme nedeni"
@@ -21190,11 +22615,13 @@
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[<sayı>]] [--contains <gönderi>] [--no-contains <gönderi>] [--"
+"git tag -l [-n[<sayı>]] [--contains <işleme>] [--no-contains <işleme>] [--"
"points-at <nesne>]\n"
-"\t\t[--format=<biçim>] [--[no-]merged [<gönderi>]] [<dizgi>...]"
+"\t\t[--format=<biçim>] [--merged <işleme>] [--no-merged <işleme>] "
+"[<dizgi>...]"
#: builtin/tag.c:30
msgid "git tag -v [--format=<format>] <tagname>..."
@@ -21205,12 +22632,12 @@
msgid "tag '%s' not found."
msgstr "'%s' etiketi bulunamadı."
-#: builtin/tag.c:105
+#: builtin/tag.c:124
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "'%s' etiketi silindi (%s idi)\n"
-#: builtin/tag.c:135
+#: builtin/tag.c:159
#, c-format
msgid ""
"\n"
@@ -21223,7 +22650,7 @@
" %s\n"
"'%c' ile başlayan satırlar yok sayılacaktır.\n"
-#: builtin/tag.c:139
+#: builtin/tag.c:163
#, c-format
msgid ""
"\n"
@@ -21238,15 +22665,11 @@
"'%c' ile başlayan satırlar tutulacaktır; isterseniz onları "
"kaldırabilirsiniz.\n"
-#: builtin/tag.c:198
+#: builtin/tag.c:230
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
+#: builtin/tag.c:248
#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
@@ -21259,139 +22682,135 @@
"\n"
"\tgit tag -f %s %s^{}"
-#: builtin/tag.c:232
+#: builtin/tag.c:264
msgid "bad object type."
msgstr "hatalı nesne türü"
-#: builtin/tag.c:284
+#: builtin/tag.c:317
msgid "no tag message?"
msgstr "etiket iletisi yok mu?"
-#: builtin/tag.c:291
+#: builtin/tag.c:324
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Etiket iletisi %s içinde bırakıldı\n"
-#: builtin/tag.c:402
+#: builtin/tag.c:435
msgid "list tag names"
msgstr "etiket adlarını listele"
-#: builtin/tag.c:404
+#: builtin/tag.c:437
msgid "print <n> lines of each tag message"
msgstr "her etiket iletisinin <n> satırını listele"
-#: builtin/tag.c:406
+#: builtin/tag.c:439
msgid "delete tags"
msgstr "etiketleri sil"
-#: builtin/tag.c:407
+#: builtin/tag.c:440
msgid "verify tags"
msgstr "etiketleri doğrula"
-#: builtin/tag.c:409
+#: builtin/tag.c:442
msgid "Tag creation options"
msgstr "Etiket oluşturma seçenekleri"
-#: builtin/tag.c:411
+#: builtin/tag.c:444
msgid "annotated tag, needs a message"
msgstr "açıklama eklenmiş etiket için bir ileti gerek"
-#: builtin/tag.c:413
+#: builtin/tag.c:446
msgid "tag message"
msgstr "etiket iletisi"
-#: builtin/tag.c:415
+#: builtin/tag.c:448
msgid "force edit of tag message"
msgstr "etiket iletisini zorla düzenle"
-#: builtin/tag.c:416
+#: builtin/tag.c:449
msgid "annotated and GPG-signed tag"
msgstr "açıklama eklenmiş ve GPG imzalı etiket"
-#: builtin/tag.c:419
+#: builtin/tag.c:452
msgid "use another key to sign the tag"
msgstr "etiketi imzalamak için başka bir anahtar kullanın"
-#: builtin/tag.c:420
+#: builtin/tag.c:453
msgid "replace the tag if exists"
msgstr "eğer varsa etiketi başkasıyla değiştir"
-#: builtin/tag.c:421 builtin/update-ref.c:369
+#: builtin/tag.c:454 builtin/update-ref.c:505
msgid "create a reflog"
msgstr "bir başvuru günlüğü oluştur"
-#: builtin/tag.c:423
+#: builtin/tag.c:456
msgid "Tag listing options"
msgstr "Etiket listeleme seçenekleri"
-#: builtin/tag.c:424
+#: builtin/tag.c:457
msgid "show tag list in columns"
msgstr "etiket listesini sütunlarla göster"
-#: builtin/tag.c:425 builtin/tag.c:427
+#: builtin/tag.c:458 builtin/tag.c:460
msgid "print only tags that contain the commit"
-msgstr "yalnızca gönderiyi içeren etiketleri yazdır"
+msgstr "yalnızca işlemeyi içeren etiketleri yazdır"
-#: builtin/tag.c:426 builtin/tag.c:428
+#: builtin/tag.c:459 builtin/tag.c:461
msgid "print only tags that don't contain the commit"
-msgstr "yalnızca gönderi içermeyen etiketleri yazdır"
+msgstr "yalnızca işleme içermeyen etiketleri yazdır"
-#: builtin/tag.c:429
+#: builtin/tag.c:462
msgid "print only tags that are merged"
msgstr "yalnızca birleştirilen etiketleri yazdır"
-#: builtin/tag.c:430
+#: builtin/tag.c:463
msgid "print only tags that are not merged"
msgstr "yalnızca birleştirilmeyen etiketleri yazdır"
-#: builtin/tag.c:434
+#: builtin/tag.c:467
msgid "print only tags of the object"
msgstr "yalnızca nesnenin etiketlerini yazdır"
-#: builtin/tag.c:482
+#: builtin/tag.c:515
msgid "--column and -n are incompatible"
msgstr "--column ve -n birbiriyle uyumsuz"
-#: builtin/tag.c:504
+#: builtin/tag.c:537
msgid "-n option is only allowed in list mode"
msgstr "-n seçeneğine yalnızca liste kipinde izin verilir"
-#: builtin/tag.c:506
+#: builtin/tag.c:539
msgid "--contains option is only allowed in list mode"
msgstr "--contains seçeneğine yalnızca liste kipinde izin verilir"
-#: builtin/tag.c:508
+#: builtin/tag.c:541
msgid "--no-contains option is only allowed in list mode"
msgstr "--no-contains seçeneğine yalnızca liste kipinde izin verilir"
-#: builtin/tag.c:510
+#: builtin/tag.c:543
msgid "--points-at option is only allowed in list mode"
msgstr "--points-at seçeneğine yalnızca liste kipinde izin verilir"
-#: builtin/tag.c:512
+#: builtin/tag.c:545
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr ""
"--merged ve --no-merged seçeneklerine yalnızca liste kipinde izin verilir"
-#: builtin/tag.c:523
+#: builtin/tag.c:556
msgid "only one -F or -m option is allowed."
msgstr "yalnızca bir -F veya -m seçeneğine izin verilir"
-#: builtin/tag.c:542
-msgid "too many params"
-msgstr "çok fazla parametre"
-
-#: builtin/tag.c:548
+#: builtin/tag.c:581
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' geçerli bir etiket adı değil."
-#: builtin/tag.c:553
+#: builtin/tag.c:586
#, c-format
msgid "tag '%s' already exists"
msgstr "'%s' etiketi halihazırda var"
-#: builtin/tag.c:584
+#: builtin/tag.c:617
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "'%s' etiketi güncellendi (%s idi)\n"
@@ -21487,7 +22906,7 @@
#: builtin/update-index.c:993
msgid "like --refresh, but ignore assume-unchanged setting"
-msgstr "--refresh gibi, ancak assume-unchanged ayarını yok sayar"
+msgstr "--refresh gibi; ancak assume-unchanged ayarını yok sayar"
#: builtin/update-index.c:997
msgid "<mode>,<object>,<path>"
@@ -21668,19 +23087,19 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<seçenekler>] --stdin [-z]"
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:500
msgid "delete the reference"
msgstr "başvuruyu sil"
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:502
msgid "update <refname> not the one it points to"
msgstr "<başvuru-adı>'nı güncelleyin, işaret ettiğini değil"
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:503
msgid "stdin has NUL-terminated arguments"
-msgstr "stdin'de NUL ile sonlandırılan değişkenler var"
+msgstr "stdin'de NUL ile sonlandırılan argümanlar var"
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:504
msgid "read updates from stdin"
msgstr "güncellemeleri stdin'den oku"
@@ -21714,25 +23133,25 @@
#: builtin/verify-commit.c:19
msgid "git verify-commit [-v | --verbose] <commit>..."
-msgstr "git verify-commit [-v | --verbose] <gönderi>..."
+msgstr "git verify-commit [-v | --verbose] <işleme>..."
#: builtin/verify-commit.c:68
msgid "print commit contents"
-msgstr "gönderi içeriğini yazdır"
+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: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 "ayrıntılı anlatım"
-#: builtin/verify-pack.c:67
+#: builtin/verify-pack.c:72
msgid "show statistics only"
msgstr "yalnızca istatistikleri göster"
@@ -21744,226 +23163,202 @@
msgid "print tag contents"
msgstr "etiket içeriğini yazdır"
-#: builtin/worktree.c:17
-msgid "git worktree add [<options>] <path> [<commit-ish>]"
-msgstr "git worktree add [<seçenekler>] <yol> [<gönderimsi>]"
-
#: builtin/worktree.c:18
+msgid "git worktree add [<options>] <path> [<commit-ish>]"
+msgstr "git worktree add [<seçenekler>] <yol> [<işlememsi>]"
+
+#: builtin/worktree.c:19
msgid "git worktree list [<options>]"
msgstr "git worktree list [<seçenekler>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<seçenekler>] <yol>"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <ç-ağacı> <yeni-yol>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<seçenekler>]"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<seçenekler>] <ç-ağacı>"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <yol>"
-#: builtin/worktree.c:60 builtin/worktree.c:891
+#: builtin/worktree.c:61 builtin/worktree.c:933
#, c-format
msgid "failed to delete '%s'"
msgstr "'%s' silinemedi"
-#: builtin/worktree.c:79
+#: builtin/worktree.c:74
#, c-format
-msgid "Removing worktrees/%s: not a valid directory"
-msgstr "çalışma-ağacı/%s kaldırılıyor: geçerli bir dizin değil"
+msgid "Removing %s/%s: %s"
+msgstr "%s/%s kaldırılıyor: %s"
-#: builtin/worktree.c:85
-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
-msgstr "çalışma-ağacı/%s kaldırılıyor: gitdir dosyası yok"
-
-#: builtin/worktree.c:90 builtin/worktree.c:99
-#, c-format
-msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
-msgstr "çalışma-ağacı/%s kaldırılıyor: gitdir dosyası okunamıyor (%s)"
-
-#: builtin/worktree.c:109
-#, c-format
-msgid ""
-"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
-"%<PRIuMAX>)"
-msgstr ""
-"çalışma-ağacı/%s kaldırılıyor: yetersiz veri (%<PRIuMAX> bayt bekleniyordu, "
-"%<PRIuMAX> okundu"
-
-#: builtin/worktree.c:117
-#, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
-msgstr "çalışma-ağacı/%s kaldırılıyor: geçersiz gitdir dosyası"
-
-#: builtin/worktree.c:126
-#, c-format
-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
-msgstr ""
-"çalışma-ağacı/%s kaldırılıyor: gitdir dosyası olmayan bir konuma işaret "
-"ediyor"
-
-#: builtin/worktree.c:165
+#: builtin/worktree.c:149
msgid "report pruned working trees"
msgstr "budanan çalışma ağaçlarını bildir"
-#: builtin/worktree.c:167
+#: builtin/worktree.c:151
msgid "expire working trees older than <time>"
msgstr "<zaman>'dan eski çalışma ağaçlarının hükmünü kaldır"
-#: builtin/worktree.c:234
+#: builtin/worktree.c:221
#, c-format
msgid "'%s' already exists"
msgstr "'%s' halihazırda var"
-#: builtin/worktree.c:244
+#: builtin/worktree.c:230
#, c-format
-msgid "unable to re-add worktree '%s'"
-msgstr "'%s' çalışma ağacı yeniden eklenemiyor"
+msgid "unusable worktree destination '%s'"
+msgstr "kullanılamayan çalışma ağacı konumu '%s'"
-#: builtin/worktree.c:249
+#: builtin/worktree.c:235
#, 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' eksik ancak kilitli bir çalışma ağacı;\n"
-"geçersiz kılmak için 'add -f -f', temizlemek için 'unlock', 'prune' veya "
+"'%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:251
+#: builtin/worktree.c:237
#, 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' eksik ancak halihazırda kaydı yapılmış bir çalışma ağacı;\n"
-"geçersiz kılmak için 'add -f', temizlemek için 'prune' veya 'remove' kullanın"
+"'%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:301
+#: builtin/worktree.c:288
#, c-format
msgid "could not create directory of '%s'"
msgstr "'%s' dizini oluşturulamadı"
-#: builtin/worktree.c:432 builtin/worktree.c:438
+#: builtin/worktree.c:422 builtin/worktree.c:428
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Çalışma ağacı hazırlanıyor (yeni dal '%s')"
-#: builtin/worktree.c:434
+#: builtin/worktree.c:424
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "Çalışma ağacı hazırlanıyor ('%s' dalı sıfırlanıyor; %s konumundaydı)"
-#: builtin/worktree.c:443
+#: builtin/worktree.c:433
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Çalışma ağacı hazırlanıyor ('%s' çıkış yapılıyor)"
-#: builtin/worktree.c:449
+#: builtin/worktree.c:439
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Çalışma ağacı hazırlanıyor (ayrık HEAD %s)"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:480
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "diğer çalışma ağacında çıkış yapılmış olsa bile <dal> çıkışını yap"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:483
msgid "create a new branch"
msgstr "yeni bir dal oluştur"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:485
msgid "create or reset a branch"
msgstr "yeni bir dal oluştur veya sıfırla"
-#: builtin/worktree.c:497
+#: builtin/worktree.c:487
msgid "populate the new working tree"
msgstr "yeni çalışma ağacını doldur"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:488
msgid "keep the new working tree locked"
msgstr "yeni çalışma ağacını kilitli tut"
-#: builtin/worktree.c:501
+#: builtin/worktree.c:491
msgid "set up tracking mode (see git-branch(1))"
msgstr "izleme kipini ayarla (bkz: git-branch(1))"
-#: builtin/worktree.c:504
+#: builtin/worktree.c:494
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "yeni dalın adını bir uzak izleme dalıyla eşleştirmeyi dene"
-#: builtin/worktree.c:512
+#: builtin/worktree.c:502
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B ve --detach birlikte kullanılamaz"
-#: builtin/worktree.c:573
+#: builtin/worktree.c:563
msgid "--[no-]track can only be used if a new branch is created"
msgstr "--[no-]track yalnızca yeni bir dal oluşturulmuşsa kullanılabilir"
-#: builtin/worktree.c:673
+#: builtin/worktree.c:680
+msgid "show extended annotations and reasons, if available"
+msgstr "varsa genişletilmiş açıklamaları ve nedenleri göster"
+
+#: builtin/worktree.c:682
+msgid "add 'prunable' annotation to worktrees older than <time>"
+msgstr "<zaman>'dan eski çalışma ağaçlarına 'budanabilir' açıklama ekle"
+
+#: builtin/worktree.c:691
+msgid "--verbose and --porcelain are mutually exclusive"
+msgstr "--verbose ve --porcelain birlikte kullanılamaz"
+
+#: builtin/worktree.c:718
msgid "reason for locking"
msgstr "kilitleme nedeni"
-#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
-#: builtin/worktree.c:919
+#: builtin/worktree.c:730 builtin/worktree.c:763 builtin/worktree.c:837
+#: builtin/worktree.c:961
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' bir çalışma ağacı değil"
-#: builtin/worktree.c:687 builtin/worktree.c:720
+#: builtin/worktree.c:732 builtin/worktree.c:765
msgid "The main working tree cannot be locked or unlocked"
msgstr "Ana çalışma ağacı kilitlenemez veya kilidi açılamaz"
-#: builtin/worktree.c:692
+#: builtin/worktree.c:737
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' halihazırda kilitli, nedeni: %s"
-#: builtin/worktree.c:694
+#: builtin/worktree.c:739
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' halihazırda kilitli"
-#: builtin/worktree.c:722
+#: builtin/worktree.c:767
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' kilitli değil"
-#: builtin/worktree.c:763
+#: builtin/worktree.c:808
msgid "working trees containing submodules cannot be moved or removed"
msgstr "altmodül içeren çalışma ağaçları taşınamaz veya kaldırılamaz"
-#: builtin/worktree.c:771
+#: builtin/worktree.c:816
msgid "force move even if worktree is dirty or locked"
msgstr "çalışma ağacı kirli veya kilitli olsa bile zorla taşı"
-#: builtin/worktree.c:794 builtin/worktree.c:921
+#: builtin/worktree.c:839 builtin/worktree.c:963
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' bir ana çalışma ağacı"
-#: builtin/worktree.c:799
+#: builtin/worktree.c:844
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "hedef adı şuradan anlaşılamadı: '%s'"
-#: builtin/worktree.c:805
-#, c-format
-msgid "target '%s' already exists"
-msgstr "'%s' hedefi halihazırda var"
-
-#: builtin/worktree.c:813
+#: builtin/worktree.c:857
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -21972,7 +23367,7 @@
"kilitli bir çalışma ağacı taşınamıyor, kilit nedeni: %s\n"
"geçersiz kılmak için 'move -f -f' kullanın veya önce kilidini açın"
-#: builtin/worktree.c:815
+#: builtin/worktree.c:859
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -21980,38 +23375,38 @@
"kilitli bir çalışma ağacı taşınamıyor;\n"
"geçersiz kılmak için 'move -f -f' kullanın veya önce kilidini açın"
-#: builtin/worktree.c:818
+#: builtin/worktree.c:862
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "doğrulama başarısız, çalışma ağacı taşınamıyor: %s"
-#: builtin/worktree.c:823
+#: builtin/worktree.c:867
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "'%s' -> '%s' taşıması başarısız"
-#: builtin/worktree.c:871
+#: builtin/worktree.c:913
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "'%s' üzerinde 'git status' çalıştırılamadı"
-#: builtin/worktree.c:875
+#: builtin/worktree.c:917
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
"'%s' değiştirilmiş veya izlenmeyen dosyalar içeriyor, silmek için --force "
"kullanın"
-#: builtin/worktree.c:880
+#: builtin/worktree.c:922
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "'%s' üzerinde 'git status' çalıştırılamadı, kod %d"
-#: builtin/worktree.c:903
+#: builtin/worktree.c:945
msgid "force removal even if worktree is dirty or locked"
msgstr "çalışma ağacı kirli veya kilitli olsa bile zorla kaldır"
-#: builtin/worktree.c:926
+#: builtin/worktree.c:968
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -22020,7 +23415,7 @@
"kilitli bir çalışma ağacı kaldırılamıyor, kilit nedeni: %s\n"
"geçersiz kılmak için 'remove -f -f' kullanın veya önce kilidini açın"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:970
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -22028,11 +23423,21 @@
"kilitli bir çalışma ağacı kaldırılamıyor;\n"
"geçersiz kılmak için 'remove -f -f' kullanın veya önce kilidini açın"
-#: builtin/worktree.c:931
+#: builtin/worktree.c:973
#, 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:997
+#, c-format
+msgid "repair: %s: %s"
+msgstr "şunu onar %s: %s"
+
+#: builtin/worktree.c:1000
+#, 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>/]"
@@ -22049,46 +23454,39 @@
msgid "only useful for debugging"
msgstr "yalnızca hata ayıklama için yararlı"
-#: fast-import.c:3125
+#: http-fetch.c:118
#, c-format
-msgid "Expected 'mark' command, got %s"
-msgstr "'mark' komutu bekleniyordu, %s alındı"
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr "--packfile için argüman geçerli bir sağlama olmalıdır ('%s' alındı)"
-#: fast-import.c:3130
-#, c-format
-msgid "Expected 'to' command, got %s"
-msgstr "'to' komutu bekleniyordu, %s alındı"
+#: http-fetch.c:128
+msgid "not a git repository"
+msgstr "bir git deposu değil"
-#: fast-import.c:3254
-#, c-format
-msgid "feature '%s' forbidden in input without --allow-unsafe-features"
-msgstr "'%s' özelliği --allow-unsafe-features olmadan girdide yasaklı"
+#: http-fetch.c:134
+msgid "--packfile requires --index-pack-args"
+msgstr "--packfile, --index-pack-args gerektiriyor"
-#: credential-cache--daemon.c:223
-#, c-format
-msgid ""
-"The permissions on your socket directory are too loose; other\n"
-"users may be able to read your cached credentials. Consider running:\n"
-"\n"
-"\tchmod 0700 %s"
-msgstr ""
-"Soket dizininizdeki izinler çok gevşek; diğer kullanıcılar sizin\n"
-"önbelleğe alınmış yetkilerinizi okuyabilirler. Şunu çalıştırmayı düşünün:\n"
-"\n"
-"\tchmod 0700 %s"
+#: http-fetch.c:143
+msgid "--index-pack-args can only be used with --packfile"
+msgstr "--index-pack-args yalnızca --packfile ile kullanılabilir"
-#: credential-cache--daemon.c:272
-msgid "print debugging messages to stderr"
-msgstr "hata ayıklama iletilerini stderr'e yazdır"
+#: t/helper/test-fast-rebase.c:141
+msgid "unhandled options"
+msgstr "beklenmeyen seçenekler"
-#: t/helper/test-reach.c:152
+#: t/helper/test-fast-rebase.c:146
+msgid "error preparing revisions"
+msgstr "revizyonlar hazırlanırken hata"
+
+#: t/helper/test-reach.c:154
#, c-format
msgid "commit %s is not marked reachable"
-msgstr "%s gönderisi ulaşılabilir olarak imlenmedi"
+msgstr "%s işlemesi ulaşılabilir olarak imlenmedi"
-#: t/helper/test-reach.c:162
+#: t/helper/test-reach.c:164
msgid "too many commits marked reachable"
-msgstr "çok fazla gönderi ulaşılabilir olarak imlenmiş"
+msgstr "çok fazla işleme ulaşılabilir olarak imlenmiş"
#: t/helper/test-serve-v2.c:7
msgid "test-tool serve-v2 [<options>]"
@@ -22098,13 +23496,14 @@
msgid "exit immediately after advertising capabilities"
msgstr "becerileri gösterdikten hemen sonra çık"
-#: 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"
" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
"bare]\n"
" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
" <command> [<args>]"
msgstr ""
"git [--version] [--help] [-C <yol>] [-c <ad>=<değer>]\n"
@@ -22112,9 +23511,10 @@
" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
"bare]\n"
" [--git-dir=<yol>] [--work-tree=<yol>] [--namespace=<ad>]\n"
-" <komut> [<değişkenler>]"
+" [--super-prefix=<yol>] [--config-env=<ad>=<ortamdeğişkeni>]\n"
+" <komut> [<argümanlar>]"
-#: git.c:34
+#: git.c:36
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"
@@ -22126,47 +23526,47 @@
"için 'git help <komut>' veya 'git help <konsept>' yazın. Genel bir görünüm\n"
"için 'git help git' kullanabilirsiniz."
-#: git.c:186
+#: git.c:188
#, c-format
msgid "no directory given for --git-dir\n"
msgstr "--git-dir için dizin verilmedi\n"
-#: git.c:200
+#: git.c:202
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "--namespace için ad alanı verilmedi\n"
-#: git.c:214
+#: git.c:216
#, c-format
msgid "no directory given for --work-tree\n"
msgstr "--work-tree için dizin verilmedi\n"
-#: git.c:228
+#: git.c:230
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr "--super-prefix için önek verilmedi\n"
-#: git.c:250
+#: git.c:252
#, c-format
msgid "-c expects a configuration string\n"
msgstr "-c bir yapılandırma dizisi bekliyor\n"
-#: git.c:288
+#: git.c:292
#, c-format
msgid "no directory given for -C\n"
msgstr "-C için dizin verilmedi\n"
-#: git.c:314
+#: git.c:318
#, c-format
msgid "unknown option: %s\n"
msgstr "bilinmeyen seçenek: %s\n"
-#: git.c:360
+#: git.c:367
#, c-format
msgid "while expanding alias '%s': '%s'"
msgstr "'%s' arması genişletirilirken: '%s'"
-#: git.c:369
+#: git.c:376
#, c-format
msgid ""
"alias '%s' changes environment variables.\n"
@@ -22175,39 +23575,39 @@
"'%s' arması ortam değişkenlerini değiştirir.\n"
"Bunu yapmak için armada '!git' kullanabilirsiniz."
-#: git.c:376
+#: git.c:383
#, c-format
msgid "empty alias for %s"
msgstr "%s için boş arma"
-#: git.c:379
+#: git.c:386
#, c-format
msgid "recursive alias: %s"
msgstr "özyineli arma: %s"
-#: git.c:459
+#: git.c:468
msgid "write failure on standard output"
msgstr "standart çıktı'da yazma hatası"
-#: git.c:461
+#: git.c:470
msgid "unknown write failure on standard output"
msgstr "standart çıktı'da bilinmeyen yazma hatası"
-#: git.c:463
+#: git.c:472
msgid "close failed on standard output"
msgstr "standart çıktı'da kapatma başarısız"
-#: git.c:793
+#: git.c:823
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "arma döngüsü algılandı: '%s' genişletilmesi sonlanmıyor:%s"
-#: git.c:843
+#: git.c:873
#, c-format
msgid "cannot handle %s as a builtin"
-msgstr "%s bir yerleşik olarak işlenemiyor"
+msgstr "%s bir yerleşik olarak ele alınamıyor"
-#: git.c:856
+#: git.c:886
#, c-format
msgid ""
"usage: %s\n"
@@ -22216,55 +23616,55 @@
"kullanım: %s\n"
"\n"
-#: git.c:876
+#: git.c:906
#, c-format
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
msgstr ""
"'%s' armasının genişletilmesi başarısız oldu; '%s' bir git komutu değil\n"
-#: git.c:888
+#: git.c:918
#, c-format
msgid "failed to run command '%s': %s\n"
msgstr "'%s' komutu çalıştırılamadı: %s\n"
-#: http.c:378
+#: 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:399
+#: 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:408
+#: 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:876
+#: 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:949
+#: 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:1086
+#: 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:1093
+#: 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:1097
+#: 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:1966
+#: http.c:2025
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -22275,121 +23675,152 @@
" şu istendi: %s\n"
" yönlenen: %s"
-#: remote-curl.c:166
+#: remote-curl.c:183
#, c-format
msgid "invalid quoting in push-option value: '%s'"
msgstr "push-option değerinde geçersiz tırnak içine alım: '%s'"
-#: remote-curl.c:263
+#: remote-curl.c:307
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "%sinfo/refs geçerli değil: bu bir git deposu mu?"
-#: remote-curl.c:364
+#: remote-curl.c:408
msgid "invalid server response; expected service, got flush packet"
msgstr "geçersiz sunucu yanıtı; servis bekleniyordu, floş paketi alındı"
-#: remote-curl.c:395
+#: remote-curl.c:439
#, c-format
msgid "invalid server response; got '%s'"
msgstr "geçersiz sunucu yanıtı; '%s' alındı"
-#: remote-curl.c:455
+#: remote-curl.c:499
#, c-format
msgid "repository '%s' not found"
msgstr "'%s' deposu bulunamadı"
-#: remote-curl.c:459
+#: remote-curl.c:503
#, c-format
msgid "Authentication failed for '%s'"
msgstr "'%s' için kimlik doğrulaması başarısız"
-#: remote-curl.c:463
+#: remote-curl.c:507
#, c-format
msgid "unable to access '%s': %s"
msgstr "'%s' erişilemiyor: %s"
-#: remote-curl.c:469
+#: remote-curl.c:513
#, c-format
msgid "redirecting to %s"
msgstr "şuraya yeniden yönlendiriliyor: %s"
-#: remote-curl.c:593
+#: remote-curl.c:642
msgid "shouldn't have EOF when not gentle on EOF"
msgstr "dosya sonuna dikkat edilmiyorsa dosya sonu olmamalıdır"
-#: remote-curl.c:673
+#: remote-curl.c:654
+msgid "remote server sent stateless separator"
+msgstr "uzak sunucu durumsuz ayırıcı gönderdi"
+
+#: remote-curl.c:724
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr ""
"rpc sonrası verisi geri sarılamıyor - https.postBuffer'ı artırmayı deneyin"
-#: remote-curl.c:733
+#: remote-curl.c:754
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr "remote-curl: hatalı satır uzunluğu karakteri: %.4s"
+
+#: remote-curl.c:756
+msgid "remote-curl: unexpected response end packet"
+msgstr "remote-curl: beklenmedik yanıt sonu paketi"
+
+#: remote-curl.c:832
#, c-format
msgid "RPC failed; %s"
msgstr "RPC başarısız oldu; %s"
-#: remote-curl.c:773
+#: remote-curl.c:872
msgid "cannot handle pushes this big"
-msgstr "bu kadar büyük itmeler işlenemiyor"
+msgstr "bu kadar büyük itmeler ele alınamıyor"
-#: remote-curl.c:888
+#: remote-curl.c:987
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr "istek söndürülemiyor; 'zlib deflate' hatası %d"
-#: remote-curl.c:892
+#: remote-curl.c:991
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr "istek söndürülemiyor; 'zlib end' hatası %d"
-#: remote-curl.c:1023
+#: remote-curl.c:1041
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr "üstbilginin %d baytı alındı"
+
+#: remote-curl.c:1043
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr "gövdenin %d baytı hâlâ bekleniyor"
+
+#: remote-curl.c:1132
msgid "dumb http transport does not support shallow capabilities"
msgstr "programlanamayan http taşıyıcısı sığ işlevleri desteklemiyor"
-#: remote-curl.c:1038
+#: remote-curl.c:1147
msgid "fetch failed."
msgstr "getirme başarısız."
-#: remote-curl.c:1086
+#: remote-curl.c:1193
msgid "cannot fetch by sha1 over smart http"
msgstr "akıllı http üzerinden sha1 ile getirme yapılamıyor"
-#: remote-curl.c:1130 remote-curl.c:1136
+#: remote-curl.c:1237 remote-curl.c:1243
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "protokol hatası: sha/ref bekleniyordu, '%s' alındı"
-#: remote-curl.c:1148 remote-curl.c:1263
+#: remote-curl.c:1255 remote-curl.c:1373
#, c-format
msgid "http transport does not support %s"
msgstr "http taşıyıcısı %s desteklemiyor"
-#: remote-curl.c:1184
+#: remote-curl.c:1291
msgid "git-http-push failed"
msgstr "git-http-push başarısız"
-#: remote-curl.c:1369
+#: remote-curl.c:1479
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl: kullanım: git remote-curl <uzak-konum> [<url>]"
-#: remote-curl.c:1401
+#: remote-curl.c:1511
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl: git'ten komut akışı okunurken hata"
-#: remote-curl.c:1408
+#: remote-curl.c:1518
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl: yerel bir depo olmadan getirme yapılmaya çalışıldı"
-#: remote-curl.c:1448
+#: remote-curl.c:1559
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl: git'ten bilinmeyen komut '%s'"
-#: list-objects-filter-options.h:85
-msgid "args"
-msgstr "değişkenler"
+#: compat/compiler.h:26
+msgid "no compiler information available\n"
+msgstr "derleyici bilgisi mevcut değil\n"
-#: list-objects-filter-options.h:86
+#: 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 "argümanlar"
+
+#: list-objects-filter-options.h:92
msgid "object filtering"
msgstr "nesne süzümü"
@@ -22410,8 +23841,8 @@
msgstr "daha sessiz ol"
#: parse-options.h:317
-msgid "use <n> digits to display SHA-1s"
-msgstr "SHA-1'leri görüntülemek için <n> rakam kullan"
+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"
@@ -22427,11 +23858,11 @@
msgstr ""
"--pathspec-from-file ile, yol belirteci ögeleri NUL karakteri ile ayrılır"
-#: ref-filter.h:101
+#: ref-filter.h:99
msgid "key"
msgstr "anahtar"
-#: ref-filter.h:101
+#: ref-filter.h:99
msgid "field name to sort on"
msgstr "üzerine sıralanacak alan adı"
@@ -22440,14 +23871,6 @@
msgstr ""
"eğer olanaklıysa indeksi yeniden kullanılmış çakışma çözümü ile güncelle"
-#: wt-status.h:67
-msgid "HEAD detached at "
-msgstr "HEAD şurada ayrıldı: "
-
-#: wt-status.h:68
-msgid "HEAD detached from "
-msgstr "HEAD şundan ayrıldı: "
-
#: command-list.h:50
msgid "Add file contents to the index"
msgstr "Dosya içeriğini indekse ekle"
@@ -22458,7 +23881,7 @@
#: command-list.h:52
msgid "Annotate file lines with commit information"
-msgstr "Gönderi bilgisini dosya içi açıklama olarak ekle"
+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"
@@ -22474,7 +23897,7 @@
#: command-list.h:56
msgid "Use binary search to find the commit that introduced a bug"
-msgstr "Hatalara neden olan gönderiyi bulmada ikili arama kullan"
+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"
@@ -22482,680 +23905,660 @@
#: command-list.h:58
msgid "List, create, or delete branches"
-msgstr "Dallar oluştur, sil veya listele"
+msgstr "Dal 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:60
+#: 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:61
+#: command-list.h:62
msgid "Display gitattributes information"
msgstr "gitattributes bilgisini görüntüle"
-#: command-list.h:62
+#: command-list.h:63
msgid "Debug gitignore / exclude files"
msgstr "gitignore / exclude dosyalarında hata ayıkla"
-#: command-list.h:63
+#: 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:64
+#: 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:65
+#: 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:66
+#: 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:67
-msgid "Find commits yet to be applied to upstream"
-msgstr "Henüz üstkaynağa uygulanmayan gönderileri bul"
-
#: command-list.h:68
-msgid "Apply the changes introduced by some existing commits"
-msgstr "Mevcut bazı gönderilerin getirdiği değişiklikleri uygula"
+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:70
+#: 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:71
+#: command-list.h:72
msgid "Clone a repository into a new directory"
msgstr "Bir depoyu yeni bir dizine klonla"
-#: command-list.h:72
+#: command-list.h:73
msgid "Display data in columns"
msgstr "Verileri sütunlarla göster"
-#: command-list.h:73
+#: command-list.h:74
msgid "Record changes to the repository"
msgstr "Değişikliklerin kaydını depoya yaz"
-#: command-list.h:74
+#: 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:75
-msgid "Create a new commit object"
-msgstr "Yeni bir gönderi nesnesi oluştur"
-
#: 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:77
+#: 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:78
+#: command-list.h:79
msgid "Retrieve and store user credentials"
msgstr "Kullanıcı yetkilerini al ve depola"
-#: command-list.h:79
+#: 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:80
+#: command-list.h:81
msgid "Helper to store credentials on disk"
msgstr "Yetkileri diskte saklamak için yardımcı"
-#: command-list.h:81
-msgid "Export a single commit to a CVS checkout"
-msgstr "Bir CVS çıkışına tek bir gönderiyi dışa aktar"
-
#: command-list.h:82
-msgid "Salvage your data out of another SCM people love to hate"
-msgstr "Tiskindiğiniz başka bir KDY'den verileri kurtar"
+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:84
+#: 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:85
+#: 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:86
-msgid "Show changes between commits, commit and working tree, etc"
-msgstr "Gönderiler, gönderi ve ağaçlar vb. arası değişiklikler"
-
#: command-list.h:87
+msgid "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:88
+#: 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:89
+#: command-list.h:90
msgid "Compares the content and mode of blobs found via two tree objects"
msgstr ""
-"İki ağaç nesnesi ile bulunan ikililerin içerik ve kiplerini karşılaştır"
+"İki ağaç nesnesi aracılığıyla bulunan ikililerin içerik ve kipini karşılaştır"
-#: command-list.h:90
+#: 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:91
+#: command-list.h:92
msgid "Git data exporter"
msgstr "Git veri dışa aktarıcısı"
-#: command-list.h:92
+#: 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:93
+#: 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:94
+#: command-list.h:95
msgid "Receive missing objects from another repository"
msgstr "Başka bir depodan eksik nesneleri al"
-#: command-list.h:95
+#: command-list.h:96
msgid "Rewrite branches"
msgstr "Dalları yeniden yaz"
-#: command-list.h:96
-msgid "Produce a merge commit message"
-msgstr "Bir birleştirme gönderisi iletisi oluştur"
-
#: command-list.h:97
+msgid "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:98
+#: command-list.h:99
+msgid "Run a Git command on a list of repositories"
+msgstr "Listedeki depolar üzerinde bir Git komutu çalıştır"
+
+#: command-list.h:100
msgid "Prepare patches for e-mail submission"
msgstr "E-posta teslimi için yamaları hazırla"
-#: command-list.h:99
+#: command-list.h:101
msgid "Verifies the connectivity and validity of the objects in the database"
msgstr "Veritab. nesnelerin bağlanırlığını ve geçerliliğini sına"
-#: command-list.h:100
+#: command-list.h:102
msgid "Cleanup unnecessary files and optimize the local repository"
msgstr "Gereksiz dosyaları temizle ve yerel depoyu eniyile"
-#: command-list.h:101
+#: command-list.h:103
msgid "Extract commit ID from an archive created using git-archive"
-msgstr "Gönderi iletisini bir git-archive arşivinden çıkartıp al"
+msgstr "İşleme iletisini bir git-archive arşivinden çıkartıp al"
-#: command-list.h:102
+#: command-list.h:104
msgid "Print lines matching a pattern"
msgstr "Bir dizgi ile eşleşen satırları yazdır"
-#: command-list.h:103
+#: command-list.h:105
msgid "A portable graphical interface to Git"
msgstr "Git için taşınabilir bir grafik arabirim"
-#: command-list.h:104
+#: command-list.h:106
msgid "Compute object ID and optionally creates a blob from a file"
msgstr "Sağlamayı hesapla ve isteğe göre dosyadan ikili oluştur"
-#: command-list.h:105
+#: command-list.h:107
msgid "Display help information about Git"
msgstr "Git yardım bilgisini görüntüle"
-#: command-list.h:106
+#: command-list.h:108
msgid "Server side implementation of Git over HTTP"
msgstr "Git'in HTTP üzerinden sunucu tarafı uygulaması"
-#: command-list.h:107
+#: command-list.h:109
msgid "Download from a remote Git repository via HTTP"
msgstr "HTTP üzerinden uzak bir Git deposundan indir"
-#: command-list.h:108
+#: command-list.h:110
msgid "Push objects over HTTP/DAV to another repository"
msgstr "Nesneleri HTTP/DAV üzerinden başka bir depoya it"
-#: command-list.h:109
+#: command-list.h:111
msgid "Send a collection of patches from stdin to an IMAP folder"
msgstr "stdin'den bir IMAP klasörüne bir yama derlemesi gönder"
-#: command-list.h:110
+#: command-list.h:112
msgid "Build pack index file for an existing packed archive"
msgstr "Mevcut paketli bir arşiv için paket indeks dosyası yap"
-#: command-list.h:111
+#: command-list.h:113
msgid "Create an empty Git repository or reinitialize an existing one"
-msgstr "Boş bir Git deposu oluştur veya var olanı yeniden başlat"
+msgstr "Boş bir Git deposu oluştur veya olanı yeniden ilklendir"
-#: command-list.h:112
+#: command-list.h:114
msgid "Instantly browse your working repository in gitweb"
msgstr "gitweb'deki çalışma deposuna anında göz at"
-#: command-list.h:113
+#: command-list.h:115
msgid "Add or parse structured information in commit messages"
-msgstr "Gönderi iletilerine düzenli bilgi ekle veya ayrıştır"
+msgstr "İşleme iletilerine düzenli bilgi ekle veya ayrıştır"
-#: command-list.h:114
+#: command-list.h:116
msgid "The Git repository browser"
msgstr "Git depo tarayıcısı"
-#: command-list.h:115
+#: command-list.h:117
msgid "Show commit logs"
-msgstr "Gönderi günlüklerini göster"
+msgstr "İşleme günlüklerini göster"
-#: command-list.h:116
+#: command-list.h:118
msgid "Show information about files in the index and the working tree"
msgstr "İndeks ve çalışma ağacındaki dosya bilgilerini göster"
-#: command-list.h:117
+#: command-list.h:119
msgid "List references in a remote repository"
msgstr "Uzak bir depodaki başvuruları listele"
-#: command-list.h:118
+#: command-list.h:120
msgid "List the contents of a tree object"
msgstr "Bir ağaç nesnesinin içeriğini listele"
-#: command-list.h:119
+#: command-list.h:121
msgid "Extracts patch and authorship from a single e-mail message"
msgstr "E-posta iletisinden yama ve yazar bilgisini çıkart"
-#: command-list.h:120
+#: command-list.h:122
msgid "Simple UNIX mbox splitter program"
msgstr "Yalın UNIX mbox bölücü yazılımı"
-#: command-list.h:121
+#: command-list.h:123
+msgid "Run tasks to optimize Git repository data"
+msgstr "Git depo verisini eniyilemek için görevler çalıştır"
+
+#: command-list.h:124
msgid "Join two or more development histories together"
msgstr "İki veya daha fazla geliştirme geçmişini birleştir"
-#: command-list.h:122
+#: command-list.h:125
msgid "Find as good common ancestors as possible for a merge"
msgstr "Birleştirme için olabildiğince en iyi ortak ataları bul"
-#: command-list.h:123
+#: command-list.h:126
msgid "Run a three-way file merge"
msgstr "Bir üç yönlü dosya birleştirmesi çalıştır"
-#: command-list.h:124
+#: command-list.h:127
msgid "Run a merge for files needing merging"
msgstr "Birleştirilmesi gereken dosyaları birleştir"
-#: command-list.h:125
+#: command-list.h:128
msgid "The standard helper program to use with git-merge-index"
msgstr "Bu yardımcı program git-merge-index kullanımı içindir"
-#: command-list.h:126
+#: command-list.h:129
msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr "Çakışmaları çözmek için çözüm araçlarını çalıştır"
-#: command-list.h:127
+#: command-list.h:130
msgid "Show three-way merge without touching index"
msgstr "İndekse dokunmadan üçlü birleştirmeyi göster"
-#: command-list.h:128
+#: command-list.h:131
msgid "Write and verify multi-pack-indexes"
msgstr "multi-pack-index doğrula ve yaz"
-#: command-list.h:129
-msgid "Creates a tag object"
-msgstr "Bir etiket nesnesi oluştur"
+#: command-list.h:132
+msgid "Creates a tag object with extra validation"
+msgstr "Ek doğrulamalı bir etiket nesnesi oluştur"
-#: command-list.h:130
+#: command-list.h:133
msgid "Build a tree-object from ls-tree formatted text"
msgstr "ls-tree biçimli metinden bir ağaç nesnesi yap"
-#: command-list.h:131
+#: command-list.h:134
msgid "Move or rename a file, a directory, or a symlink"
msgstr "Dosya, dizin veya sembolik bağları taşı/yeniden adlandır"
-#: command-list.h:132
+#: command-list.h:135
msgid "Find symbolic names for given revs"
msgstr "Verilen revizyonlar için sembolik adları bul"
-#: command-list.h:133
+#: command-list.h:136
msgid "Add or inspect object notes"
msgstr "Nesne notları ekle veya incele"
-#: command-list.h:134
+#: command-list.h:137
msgid "Import from and submit to Perforce repositories"
msgstr "Perforce depolarından içe aktar ve onlara gönder"
-#: command-list.h:135
+#: command-list.h:138
msgid "Create a packed archive of objects"
msgstr "Paketlenmiş bir nesne arşivi oluştur"
-#: command-list.h:136
+#: command-list.h:139
msgid "Find redundant pack files"
msgstr "Gereksiz paket dosyalarını bul"
-#: command-list.h:137
+#: command-list.h:140
msgid "Pack heads and tags for efficient repository access"
msgstr "Etkili depo erişimi için dal uçları ve etiketler paketle"
-#: command-list.h:138
-msgid "Routines to help parsing remote repository access parameters"
-msgstr "Uzak depo erişim parametrelerini ayrıştırmaya yardımcı rutinler"
-
-#: command-list.h:139
+#: command-list.h:141
msgid "Compute unique ID for a patch"
msgstr "Bir yama için eşi olmayan numara hesapla"
-#: command-list.h:140
+#: 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:141
+#: 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:142
+#: 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:143
+#: 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:144
+#: 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:145
+#: command-list.h:147
msgid "Compare two commit ranges (e.g. two versions of a branch)"
-msgstr "İki gönderi erimini karşılaştır (bir dalın iki sürümü)"
+msgstr "İki işleme erimini karşılaştır (bir dalın iki sürümü)"
-#: command-list.h:146
+#: command-list.h:148
msgid "Reads tree information into the index"
msgstr "Ağaç bilgisini indekse okur"
-#: command-list.h:147
+#: command-list.h:149
msgid "Reapply commits on top of another base tip"
-msgstr "Gönderileri başka bir temel ucu üzerine uygula"
+msgstr "İşlemeleri başka bir temel ucu üzerine uygula"
-#: command-list.h:148
+#: command-list.h:150
msgid "Receive what is pushed into the repository"
msgstr "Depoya ne itildiyse al"
-#: command-list.h:149
+#: command-list.h:151
msgid "Manage reflog information"
msgstr "Başvuru günlüğü bilgisini yönet"
-#: command-list.h:150
+#: command-list.h:152
msgid "Manage set of tracked repositories"
msgstr "İzlenen depolar setini yönet"
-#: command-list.h:151
+#: command-list.h:153
msgid "Pack unpacked objects in a repository"
msgstr "Bir depodaki paketlenmemiş nesneleri paketle"
-#: command-list.h:152
+#: 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:153
+#: command-list.h:155
msgid "Generates a summary of pending changes"
msgstr "Bekleyen değişikliklerin bir özetini çıkart"
-#: command-list.h:154
+#: 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:155
+#: 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:156
+#: command-list.h:158
msgid "Restore working tree files"
msgstr "Çalışma ağacı dosyalarını eski durumuna getir"
-#: command-list.h:157
-msgid "Revert some existing commits"
-msgstr "Bazı var olan gönderileri geri al"
-
-#: command-list.h:158
-msgid "Lists commit objects in reverse chronological order"
-msgstr "Gönderi nesnelerini ters kronolojik sırada listele"
-
#: command-list.h:159
+msgid "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:160
+#: 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:161
+#: command-list.h:163
msgid "Send a collection of patches as emails"
msgstr "Bir yama derlemesini e-posta olarak gönder"
-#: command-list.h:162
+#: 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:163
+#: 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:164
+#: command-list.h:166
msgid "Summarize 'git log' output"
msgstr "'git log' çıktısını özetle"
-#: command-list.h:165
-msgid "Show various types of objects"
-msgstr "Çeşitli türde nesneleri göster"
-
-#: command-list.h:166
-msgid "Show branches and their commits"
-msgstr "Dalları ve onların gönderilerini göster"
-
#: command-list.h:167
+msgid "Show various types of objects"
+msgstr "Çeşitli türlerden 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:168
+#: command-list.h:170
msgid "List references in a local repository"
msgstr "Yerel bir depodaki başvuruları listele"
-#: command-list.h:169
+#: 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:170
+#: command-list.h:172
msgid "Common Git shell script setup code"
msgstr "Ortak Git kabuk betiği kurulum kodu"
-#: command-list.h:171
+#: command-list.h:173
msgid "Initialize and modify the sparse-checkout"
msgstr "Aralıklı çıkışı ilklendir ve güncelle"
-#: command-list.h:172
+#: 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:173
+#: 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:174
+#: command-list.h:176
msgid "Show the working tree status"
msgstr "Çalışma ağacı durumunu göster"
-#: command-list.h:175
+#: command-list.h:177
msgid "Remove unnecessary whitespace"
msgstr "Gereksiz boşlukları kaldır"
-#: command-list.h:176
+#: command-list.h:178
msgid "Initialize, update or inspect submodules"
msgstr "Altmodülleri ilklendir, güncelle veya incele"
-#: command-list.h:177
+#: 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:178
+#: command-list.h:180
msgid "Switch branches"
msgstr "Dal değiştir"
-#: command-list.h:179
+#: command-list.h:181
msgid "Read, modify and delete symbolic refs"
msgstr "Sembolik başvuruları oku, düzenle ve sil"
-#: command-list.h:180
+#: 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:181
+#: 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:182
+#: command-list.h:184
msgid "Unpack objects from a packed archive"
msgstr "Paketlenmiş bir arşivden nesneleri çıkar"
-#: command-list.h:183
+#: 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:184
+#: 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:185
+#: 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:186
+#: command-list.h:188
msgid "Send archive back to git-archive"
msgstr "Arşivi git-archive'e geri gönder"
-#: command-list.h:187
+#: 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:188
+#: command-list.h:190
msgid "Show a Git logical variable"
msgstr "Bir mantıksal Git değişkeni göster"
-#: command-list.h:189
+#: command-list.h:191
msgid "Check the GPG signature of commits"
-msgstr "Gönderilerin GPG imzasını denetle"
+msgstr "İşlemelerin GPG imzasını denetle"
-#: command-list.h:190
+#: command-list.h:192
msgid "Validate packed Git archive files"
msgstr "Paketlenmiş Git arşiv dosyalarını doğrula"
-#: command-list.h:191
+#: command-list.h:193
msgid "Check the GPG signature of tags"
msgstr "Etiketlerin GPG imzasını doğrula"
-#: command-list.h:192
+#: 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:193
+#: command-list.h:195
msgid "Show logs with difference each commit introduces"
-msgstr "Günlükleri her gönderinin sunduğu değişikliklerle göster"
+msgstr "Günlükleri her işlemenin sunduğu değişikliklerle göster"
-#: command-list.h:194
+#: command-list.h:196
msgid "Manage multiple working trees"
msgstr "Birden çok çalışma ağacını yönet"
-#: command-list.h:195
+#: 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:196
+#: command-list.h:198
msgid "Defining attributes per path"
msgstr "Öznitelikleri yola göre tanımla"
-#: command-list.h:197
+#: command-list.h:199
msgid "Git command-line interface and conventions"
msgstr "Git komut satırı arabirimi ve kuralları"
-#: command-list.h:198
+#: command-list.h:200
msgid "A Git core tutorial for developers"
msgstr "Geliştiriciler için Git çekirdeği eğitmeni"
-#: command-list.h:199
+#: 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:200
+#: command-list.h:203
msgid "Tweaking diff output"
msgstr "diff çıktısı için ince ayarlar"
-#: command-list.h:201
+#: 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:202
+#: 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:203
+#: command-list.h:207
msgid "Hooks used by Git"
msgstr "Git tarafından kullanılan kancalar"
-#: command-list.h:204
+#: command-list.h:208
msgid "Specifies intentionally untracked files to ignore"
msgstr "Özellikle yok sayılması istenen dosyaları belirt"
-#: command-list.h:205
+#: command-list.h:209
+msgid "Map author/committer names and/or E-Mail addresses"
+msgstr "Yazar/İşleyici adlarını ve/veya e-posta adreslerini eşlemle"
+
+#: command-list.h:210
msgid "Defining submodule properties"
msgstr "Altmodül özelliklerini tanımlama"
-#: command-list.h:206
+#: command-list.h:211
msgid "Git namespaces"
msgstr "Git ad alanları"
-#: command-list.h:207
+#: command-list.h:212
+msgid "Helper programs to interact with remote repositories"
+msgstr "Uzak depolar ile etkileşim için yardımcı programlar"
+
+#: command-list.h:213
msgid "Git Repository Layout"
msgstr "Git Depo Yerleşimi"
-#: command-list.h:208
+#: command-list.h:214
msgid "Specifying revisions and ranges for Git"
msgstr "Git için revizyonları ve erimleri belirtme"
-#: command-list.h:209
+#: command-list.h:215
msgid "Mounting one repository inside another"
msgstr "Bir depoyu bir başkasının içine bağlama"
-#: command-list.h:210
+#: command-list.h:216
msgid "A tutorial introduction to Git: part two"
msgstr "Git'e Giriş: Bölüm 2"
-#: command-list.h:211
+#: command-list.h:217
msgid "A tutorial introduction to Git"
msgstr "Git'e Giriş"
-#: command-list.h:212
+#: command-list.h:218
msgid "An overview of recommended workflows with Git"
msgstr "Önerilen Git çalışma akışlarına genel bakış"
-#: git-bisect.sh:54
-msgid "You need to start by \"git bisect start\""
-msgstr "\"git bisect start\" ile başlamalısınız"
-
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:60
-msgid "Do you want me to do it for you [Y/n]? "
-msgstr "Bunu sizin yerinize benim yapmamı ister misiniz [Y/n]? "
-
-#: git-bisect.sh:101
-#, sh-format
-msgid "Bad rev input: $arg"
-msgstr "Hatalı revizyon girdisi: $arg"
-
-#: git-bisect.sh:121
-#, sh-format
-msgid "Bad rev input: $bisected_head"
-msgstr "Hatalı revizyon girdisi: $bisected_head"
-
-#: git-bisect.sh:130
-#, sh-format
-msgid "Bad rev input: $rev"
-msgstr "Hatalı revizyon girdisi: $rev"
-
-#: git-bisect.sh:139
-#, sh-format
-msgid "'git bisect $TERM_BAD' can take only one argument."
-msgstr "'git bisect $TERM_BAD' yalnızca bir değişken alabilir."
-
-#: git-bisect.sh:209
-msgid "No logfile given"
-msgstr "Günlük dosyası verilmedi"
-
-#: git-bisect.sh:210
-#, sh-format
-msgid "cannot read $file for replaying"
-msgstr "$file yeniden oynatım için okunamıyor"
-
-#: git-bisect.sh:232
-msgid "?? what are you talking about?"
-msgstr "?? neden söz ediyorsun?"
-
-#: git-bisect.sh:241
+#: git-bisect.sh:68
msgid "bisect run failed: no command provided."
msgstr "ikili arama başarısız: Komut verilmedi."
-#: git-bisect.sh:246
+#: git-bisect.sh:73
#, sh-format
msgid "running $command"
msgstr "$command çalıştırılıyor"
-#: git-bisect.sh:253
+#: git-bisect.sh:80
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -23164,27 +24567,23 @@
"bisect çalıştırılamadı:\n"
"çıkış kodu $res, '$command' konumundan, < 0 veya >= 128"
-#: git-bisect.sh:279
+#: git-bisect.sh:105
msgid "bisect run cannot continue any more"
msgstr "bisect daha fazla çalıştırılamıyor"
-#: git-bisect.sh:285
+#: git-bisect.sh:111
#, sh-format
msgid ""
"bisect run failed:\n"
-"'bisect_state $state' exited with error code $res"
+"'bisect-state $state' exited with error code $res"
msgstr ""
-"ikili arama çalıştırılamadı:\n"
-"'bisect_state $state' $res hata koduyla çıktı"
+"ikili arama başarısız oldu:\n"
+"'bisect-state $state' $res hata koduyla çıktı"
-#: git-bisect.sh:292
+#: git-bisect.sh:118
msgid "bisect run success"
msgstr "ikili arama başarılı"
-#: git-bisect.sh:300
-msgid "We are not bisecting."
-msgstr "İkili arama yapmıyoruz."
-
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
@@ -23204,7 +24603,7 @@
#: git-merge-octopus.sh:73
#, sh-format
msgid "Unable to find common commit with $pretty_name"
-msgstr "$pretty_name ile olan ortak gönderi bulunamıyor"
+msgstr "$pretty_name ile olan ortak işleme bulunamıyor"
#: git-merge-octopus.sh:77
#, sh-format
@@ -23214,7 +24613,7 @@
#: git-merge-octopus.sh:89
#, sh-format
msgid "Fast-forwarding to: $pretty_name"
-msgstr "Şuraya ileri sarılıyor: $pretty_name"
+msgstr "İleri sarma konumu: $pretty_name"
#: git-merge-octopus.sh:97
#, sh-format
@@ -23225,129 +24624,47 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "Yalın birleştirme işe yaramadı, otomatik birleştirme deneniyor"
-#: git-legacy-stash.sh:221
-msgid "Cannot remove temporary index (can't happen)"
-msgstr "Geçici indeks kaldırılamıyor (olanaklı değil)"
-
-#: git-legacy-stash.sh:272
-#, sh-format
-msgid "Cannot update $ref_stash with $w_commit"
-msgstr "$ref_stash, $w_commit ile güncellenemiyor"
-
-#: git-legacy-stash.sh:324
-#, sh-format
-msgid "error: unknown option for 'stash push': $option"
-msgstr "hata: 'stash push' için bilinmeyen seçenek: $option"
-
-#: git-legacy-stash.sh:356
-#, sh-format
-msgid "Saved working directory and index state $stash_msg"
-msgstr "$stash_msg indeks durumu ve çalışma dizini kaydedildi"
-
-#: git-legacy-stash.sh:536
-#, sh-format
-msgid "unknown option: $opt"
-msgstr "bilinmeyen seçenek: $opt"
-
-#: git-legacy-stash.sh:556
-#, sh-format
-msgid "Too many revisions specified: $REV"
-msgstr "Çok fazla revizyon belirtildi: $REV"
-
-#: git-legacy-stash.sh:571
-#, sh-format
-msgid "$reference is not a valid reference"
-msgstr "$reference geçerli bir başvuru değil"
-
-#: git-legacy-stash.sh:599
-#, sh-format
-msgid "'$args' is not a stash-like commit"
-msgstr "'$args' zula benzeri bir gönderi değil"
-
-#: git-legacy-stash.sh:610
-#, sh-format
-msgid "'$args' is not a stash reference"
-msgstr "'$args' bir zula başvurusu değil"
-
-#: git-legacy-stash.sh:618
-msgid "unable to refresh index"
-msgstr "indeks yenilenemiyor"
-
-#: git-legacy-stash.sh:622
-msgid "Cannot apply a stash in the middle of a merge"
-msgstr "Bir birleştirmenin ortasında zula uygulanamıyor"
-
-#: git-legacy-stash.sh:630
-msgid "Conflicts in index. Try without --index."
-msgstr "İndekste çakışmalar var. --index olmadan deneyin."
-
-#: git-legacy-stash.sh:632
-msgid "Could not save index tree"
-msgstr "İndeks ağacı kaydedilemedi"
-
-#: git-legacy-stash.sh:641
-msgid "Could not restore untracked files from stash entry"
-msgstr "İzlenmeyen dosyalar zuladan eski durumlarına getirilemedi"
-
-#: git-legacy-stash.sh:666
-msgid "Cannot unstage modified files"
-msgstr "Değiştirilen dosyalar hazırlıktan çıkarılamaz"
-
-#: git-legacy-stash.sh:704
-#, sh-format
-msgid "Dropped ${REV} ($s)"
-msgstr "${REV} bırakıldı ($s)"
-
-#: git-legacy-stash.sh:705
-#, sh-format
-msgid "${REV}: Could not drop stash entry"
-msgstr "${REV}: Zula girdisi bırakılamadı"
-
-#: git-legacy-stash.sh:792
-msgid "(To restore them type \"git stash apply\")"
-msgstr "(Onları eski durumuna getirmek için \"git stash apply\" yazın)"
-
-#: git-submodule.sh:203
+#: git-submodule.sh:179
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"Göreceli yol yalnızca çalışma ağacının en üst düzeyinden kullanılabilir"
-#: git-submodule.sh:213
+#: git-submodule.sh:189
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "depo URL'si: '$repo' kesin olmalı veya ./|../ ile başlamalıdır"
-#: git-submodule.sh:232
+#: git-submodule.sh:208
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' indekste halihazırda var"
-#: git-submodule.sh:235
+#: git-submodule.sh:211
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr "'$sm_path' indekste halihazırda var ve bir altmodül değil"
-#: git-submodule.sh:242
+#: git-submodule.sh:218
#, sh-format
msgid "'$sm_path' does not have a commit checked out"
-msgstr "'$sm_path' çıkış yapılan bir gönderiye iye değil"
+msgstr "'$sm_path' çıkış yapılan bir işlemeye iye değil"
-#: git-submodule.sh:273
+#: git-submodule.sh:249
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "'$sm_path' konumundaki mevcut depo indekse ekleniyor"
-#: git-submodule.sh:275
+#: git-submodule.sh:251
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' halihazırda mevcut ve geçerli bir git deposu değil"
-#: git-submodule.sh:283
+#: git-submodule.sh:259
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr "'$sm_name' için bir git deposu yerelde şu uzak konumlarla bulundu:"
-#: git-submodule.sh:285
+#: git-submodule.sh:261
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -23364,37 +24681,37 @@
"bunun ne anlama geldiğinden emin değilseniz --name seçeneği ile başka bir\n"
"ad seçin."
-#: git-submodule.sh:291
+#: git-submodule.sh:267
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "'$sm_name' altmodülü için yerel git dizini yeniden etkinleştiriliyor."
-#: git-submodule.sh:303
+#: git-submodule.sh:279
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "'$sm_path' altmodülü çıkış yapılamıyor"
-#: git-submodule.sh:308
+#: git-submodule.sh:284
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "'$sm_path' altmodülü eklenemedi"
-#: git-submodule.sh:317
+#: git-submodule.sh:293
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "'$sm_path' altmodülü kaydı yapılamadı"
-#: git-submodule.sh:590
+#: git-submodule.sh:568
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "'$displaypath' altmodül yolunda geçerli revizyon bulunamadı"
-#: git-submodule.sh:600
+#: git-submodule.sh:578
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "'$sm_path' altmodül yolunda getirme yapılamadı"
-#: git-submodule.sh:605
+#: git-submodule.sh:583
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -23403,7 +24720,7 @@
"'$sm_path' altmodül yolunda geçerli ${remote_name}/${branch} revizyonu "
"bulunamadı"
-#: git-submodule.sh:623
+#: git-submodule.sh:601
#, sh-format
msgid ""
"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
@@ -23412,89 +24729,60 @@
"'$displaypath' altmodül yolunda getirme yapılamadı; $sha1 doğrudan "
"getirilmeye çalışılıyor"
-#: git-submodule.sh:629
+#: git-submodule.sh:607
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
"Direct fetching of that commit failed."
msgstr ""
-"'$displaypath' altmodül yolunda getirme tamamlandı, ancak $sha1 içermiyor. "
-"Bu gönderinin doğrudan getirilmesi başarısız oldu."
+"'$displaypath' altmodül yolunda getirme tamamlandı; ancak $sha1 içermiyor. "
+"Bu işlemenin doğrudan getirilmesi başarısız oldu."
-#: git-submodule.sh:636
+#: git-submodule.sh:614
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "'$displaypath' altmodül yolunda '$sha1' çıkışı yapılamadı"
-#: git-submodule.sh:637
+#: git-submodule.sh:615
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Altmodül yolu '$displaypath': '$sha1' çıkışı yaptı"
-#: git-submodule.sh:641
+#: git-submodule.sh:619
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "'$sha1', '$displaypath' altmodül yolunda yeniden temellendirilemedi"
-#: git-submodule.sh:642
+#: git-submodule.sh:620
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Altmodül yolu '$displaypath': '$sha1' içine yeniden temellendirildi"
-#: git-submodule.sh:647
+#: git-submodule.sh:625
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "'$sha1', '$displaypath' altmodül yolunda birleştirilemedi"
-#: git-submodule.sh:648
+#: git-submodule.sh:626
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Altmodül yolu '$displaypath': '$sha1' içinde birleştirildi"
-#: git-submodule.sh:653
+#: git-submodule.sh:631
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr "'$displaypath' altmodül yolunda '$command $sha1' çalıştırılamadı"
-#: git-submodule.sh:654
+#: git-submodule.sh:632
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Altmodül yolu '$displaypath': '$command $sha1'"
-#: git-submodule.sh:685
+#: git-submodule.sh:663
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "'$displaypath' altmodül yoluna özyinelenemedi"
-#: git-submodule.sh:896
-msgid "The --cached option cannot be used with the --files option"
-msgstr "--cached seçeneği --files seçeneği ile birlikte kullanılamaz"
-
-#: git-submodule.sh:948
-#, sh-format
-msgid "unexpected mode $mod_dst"
-msgstr "beklenmedik kip $mod_dst"
-
-#: git-submodule.sh:968
-#, sh-format
-msgid " Warn: $display_name doesn't contain commit $sha1_src"
-msgstr " Uyarı: $display_name, $sha1_src gönderisini içermiyor"
-
-#: git-submodule.sh:971
-#, sh-format
-msgid " Warn: $display_name doesn't contain commit $sha1_dst"
-msgstr " Uyarı: $display_name, $sha1_dst gönderisini içermiyor"
-
-#: git-submodule.sh:974
-#, sh-format
-msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
-msgstr " Uyarı: $display_name, $sha1_src ve $sha1_dst gönderilerini içermiyor"
-
-#: git-parse-remote.sh:89
-#, sh-format
-msgid "See git-${cmd}(1) for details."
-msgstr "Ayrıntılar için: git-${cmd}(1)"
-
#: git-rebase--preserve-merges.sh:109
msgid "Applied autostash."
msgstr "Kendiliğinden zulalama uygulandı."
@@ -23504,12 +24792,22 @@
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:207
+#: git-rebase--preserve-merges.sh:197
msgid ""
"\n"
"Commands:\n"
@@ -23531,25 +24829,24 @@
msgstr ""
"\n"
"Komutlar:\n"
-"p, pick <gönderi> = gönderiyi kullan\n"
-"r, reword <gönderi> = gönderiyi kullan, ancak gönderi iletisini düzenle\n"
-"e, edit <gönderi> = gönderiyi kullan, ancak değiştirme için dur\n"
-"s, squash <gönderi> = gönderiyi kullan, ancak önceki gönderi içine karıştır\n"
-"f, fixup <gönderi> = \"squash\" gibi, ancak bu gönderinin günlük iletisini "
-"at\n"
-"x, exec <gönderi> = komutu (satırın geri kalanı) kabuk kullanarak çalıştır\n"
-"d, drop <gönderi> = gönderiyi kaldır\n"
+"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 <gönderi> | -c <gönderi>] <etiket> [# <tek-satır>]\n"
-". orijinal birleştirme gönderisi iletisini kullanarak bir\n"
-". birleştirme gönderisi oluştur (veya teksatır, eğer bir orijinal\n"
-". birleştirme gönderisi belirtilmemişse). Gönderi iletisini yeniden\n"
-". yazmak için -c <gönderi> kullanın.\n"
+"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:270
+#: git-rebase--preserve-merges.sh:260
#, sh-format
msgid ""
"You can amend the commit now, with\n"
@@ -23560,7 +24857,7 @@
"\n"
"\tgit rebase --continue"
msgstr ""
-"Gönderiyi şimdi şu komutla değiştirebilirsiniz:\n"
+"İşlemeyi şimdi şu komutla değiştirebilirsiniz:\n"
"\n"
"\tgit commit --amend $gpg_sign_opt_quoted\n"
"\n"
@@ -23568,83 +24865,83 @@
"\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: seçilebilecek bir gönderi değil"
+msgstr "$sha1: seçilebilecek bir işleme değil"
-#: git-rebase--preserve-merges.sh:334
+#: git-rebase--preserve-merges.sh:324
#, sh-format
msgid "Invalid commit name: $sha1"
-msgstr "Geçersiz gönderi adı: $sha1"
+msgstr "Geçersiz işleme adı: $sha1"
-#: git-rebase--preserve-merges.sh:364
+#: git-rebase--preserve-merges.sh:354
msgid "Cannot write current commit's replacement sha1"
-msgstr "Geçerli gönderinin yerine geçecek sha1 yazılamıyor"
+msgstr "Geçerli işlemenin yerine geçecek sha1 yazılamıyor"
-#: git-rebase--preserve-merges.sh:415
+#: git-rebase--preserve-merges.sh:405
#, sh-format
msgid "Fast-forward to $sha1"
msgstr "Şuraya ileri sar: $sha1"
-#: git-rebase--preserve-merges.sh:417
+#: 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:426
+#: 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:431
+#: 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:449
+#: 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:458
+#: git-rebase--preserve-merges.sh:448
#, sh-format
msgid "Could not pick $sha1"
msgstr "$sha1 seçilemedi"
-#: git-rebase--preserve-merges.sh:467
+#: git-rebase--preserve-merges.sh:457
#, sh-format
msgid "This is the commit message #${n}:"
-msgstr "Gönderi iletisi #${n}:"
+msgstr "İşleme iletisi #${n}:"
-#: git-rebase--preserve-merges.sh:472
+#: git-rebase--preserve-merges.sh:462
#, sh-format
msgid "The commit message #${n} will be skipped:"
-msgstr "Gönderi iletisi #${n} atlanacak:"
+msgstr "İşleme iletisi #${n} atlanacak:"
-#: 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] "Bu $count gönderinin bir birleşimidir."
-msgstr[1] "Bu $count gönderinin bir birleşimidir."
+msgstr[0] "Bu $count işlemenin bir birleşimidir."
+msgstr[1] "Bu $count işlemenin bir birleşimidir."
-#: git-rebase--preserve-merges.sh:492
+#: git-rebase--preserve-merges.sh:482
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "$fixup_msg yazılamıyor"
-#: git-rebase--preserve-merges.sh:495
+#: git-rebase--preserve-merges.sh:485
msgid "This is a combination of 2 commits."
-msgstr "Bu 2 gönderinin bir birleşimidir."
+msgstr "Bu 2 işlemenin bir birleşimidir."
-#: 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 uygulanamadı"
-#: 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"
@@ -23653,36 +24950,36 @@
"before\n"
"you are able to reword the commit."
msgstr ""
-"$sha1... $rest başarıyla seçildikten sonra gönderi değiştirilemedi.\n"
-"Bu büyük olasılıkla boş bir gönderi iletisinden veya pre-commit kancasının\n"
+"$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"
-"gönderiyi düzenleyebilmeye başlamanız için bu sorunu çözmeniz gerekebilir."
+"işlemeyi düzenleyebilmeye başlamanız için bu sorunu çözmeniz gerekebilir."
-#: git-rebase--preserve-merges.sh:626
+#: 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:641
+#: git-rebase--preserve-merges.sh:631
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
-msgstr "Öncesinde bir gönderi olmadan '$squash_style' yapılamıyor"
+msgstr "Öncesinde bir işleme olmadan '$squash_style' yapılamıyor"
-#: git-rebase--preserve-merges.sh:683
+#: git-rebase--preserve-merges.sh:673
#, sh-format
msgid "Executing: $rest"
msgstr "Çalıştırılıyor: $rest"
-#: git-rebase--preserve-merges.sh:691
+#: 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:693
+#: 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:695
+#: git-rebase--preserve-merges.sh:685
msgid ""
"You can fix the problem, and then run\n"
"\n"
@@ -23693,7 +24990,7 @@
"\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"
@@ -23704,29 +25001,29 @@
msgstr ""
"Çalıştırma başarılı: $rest\n"
"ancak indekse ve/veya çalışma ağacına değişiklikler bıraktı.\n"
-"Değişikliklerinizi gönderin veya zulalayın, ardından şunu çalıştırın:\n"
+"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:719
+#: 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:720
+#: 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:755
+#: 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:812
+#: 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:817
+#: git-rebase--preserve-merges.sh:807
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
@@ -23744,12 +25041,12 @@
" git rebase --continue\n"
msgstr ""
"Çalışma ağacınızda hazırlanmış değişiklikleriniz var.\n"
-"Eğer bu değişiklikleri bir önceki gönderiye tıkıştırmak\n"
-"istediyseniz şu komutu çalıştırın:\n"
+"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 gönderi içinse şunu çalıştırı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"
@@ -23757,45 +25054,45 @@
"\n"
"\tgit 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 "Gönderiyi değiştirmek için yazar kimliğini bulmaya çalışırken hata"
+msgstr "İşlemeyi değiştirmek için yazar kimliğini bulmaya çalışırken hata"
-#: 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 ""
-"Çalışma ağacınızda gönderilmemiş değişiklikleriniz var. Lütfen önce onları\n"
-"gönderin ve ardından yeniden 'git rebase --continue' çalıştırın."
+"Ç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: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 "Hazırlanan değişiklikler gönderilemedi."
+msgstr "Hazırlanan değişiklikler işlenemedi."
-#: 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 "Düzenleyici çalıştırılamadı"
-#: git-rebase--preserve-merges.sh:900
+#: 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:907
+#: git-rebase--preserve-merges.sh:897
msgid "No HEAD?"
msgstr "HEAD yok mu?"
-#: git-rebase--preserve-merges.sh:908
+#: 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:911
+#: git-rebase--preserve-merges.sh:901
msgid "Could not mark as interactive"
msgstr "Etkileşimli olarak imlenemedi"
-#: 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)"
@@ -23804,13 +25101,13 @@
msgstr[1] ""
"$shortrevisions ögesini $shortonto üzerine yeniden temelle ($todocount komut)"
-#: git-rebase--preserve-merges.sh:955
+#: git-rebase--preserve-merges.sh:945
msgid "Note that empty commits are commented out"
-msgstr "Boş gönderilerin yorum olarak varsayıldığını kenara yazın."
+msgstr "Boş işlemelerin yorum olarak varsayıldığını kenara yazın."
-#: 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 "Yeniden yazılan gönderiler başlatılamıyor"
+msgstr "Yeniden yazılan işlemeler ilklendirilemedi"
#: git-sh-setup.sh:89 git-sh-setup.sh:94
#, sh-format
@@ -23848,23 +25145,23 @@
#: git-sh-setup.sh:243
msgid "Cannot rebase: Your index contains uncommitted changes."
msgstr ""
-"Yeniden temellendirme yapılamıyor: İndeksinizde gönderilmemiş "
-"değişiklikleriniz var."
+"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 gönderilmemiş "
+"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 gönderilmemiş değişiklikleriniz var."
+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 gönderilmemiş değişiklikleriniz var."
+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."
@@ -23880,14 +25177,14 @@
msgid "%12s %12s %s"
msgstr "%12s %12s %s"
-#: git-add--interactive.perl:634
+#: git-add--interactive.perl:632
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] "%d yola dokunuldu\n"
msgstr[1] "%d yola dokunuldu\n"
-#: git-add--interactive.perl:1053
+#: git-add--interactive.perl:1056
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
@@ -23895,7 +25192,7 @@
"Eğer yama sorunsuzca uygulanırsa düzenlenen parça derhal hazırlama\n"
"için imlenecektir."
-#: git-add--interactive.perl:1056
+#: git-add--interactive.perl:1059
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
@@ -23903,7 +25200,7 @@
"Eğer yama sorunsuzca uygulanırsa düzenlenen parça derhal zulalama\n"
"için imlenecektir."
-#: git-add--interactive.perl:1059
+#: git-add--interactive.perl:1062
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
@@ -23911,8 +25208,8 @@
"Eğer yama sorunsuzca uygulanırsa, düzenlenen parça derhal hazırlıktan\n"
"çıkarılma için imlenecektir."
-#: git-add--interactive.perl:1062 git-add--interactive.perl:1071
-#: git-add--interactive.perl:1077
+#: git-add--interactive.perl:1065 git-add--interactive.perl:1074
+#: git-add--interactive.perl:1080
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
@@ -23920,8 +25217,8 @@
"Eğer yama sorunsuzca uygulanırsa düzenlenen parça derhal uygulama\n"
"için imlenecektir."
-#: git-add--interactive.perl:1065 git-add--interactive.perl:1068
-#: git-add--interactive.perl:1074
+#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
+#: git-add--interactive.perl:1077
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
@@ -23929,12 +25226,12 @@
"Eğer yama sorunsuzca uygulanırsa düzenlenen parça derhal ıskartaya\n"
"çıkarım için imlenecektir."
-#: git-add--interactive.perl:1111
+#: git-add--interactive.perl:1114
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr "parça düzenleme dosyası yazım için açılamadı: %s"
-#: git-add--interactive.perl:1118
+#: git-add--interactive.perl:1121
#, perl-format
msgid ""
"---\n"
@@ -23947,12 +25244,12 @@
"'%s' satır kaldırmak için onları silin.\n"
"%s ile başlayan satırlar kaldırılacaktır.\n"
-#: git-add--interactive.perl:1140
+#: git-add--interactive.perl:1143
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr "parça düzenleme dosyası okuma için açılamadı: %s"
-#: git-add--interactive.perl:1248
+#: git-add--interactive.perl:1251
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -23966,7 +25263,7 @@
"a - bu parçayı ve sonraki tüm parçaları hazırla\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini hazırlama"
-#: git-add--interactive.perl:1254
+#: git-add--interactive.perl:1257
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -23980,7 +25277,7 @@
"a - bu parçayı ve sonraki tüm parçaları zulala\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini zulalama"
-#: git-add--interactive.perl:1260
+#: git-add--interactive.perl:1263
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -23994,7 +25291,7 @@
"a - bu parçayı ve sonraki tüm parçaları hazırlıktan çıkar\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini hazırlıktan çıkarma"
-#: git-add--interactive.perl:1266
+#: git-add--interactive.perl:1269
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -24008,7 +25305,7 @@
"a - bu parçayı ve sonraki tüm parçaları uygula\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini uygulama"
-#: git-add--interactive.perl:1272 git-add--interactive.perl:1290
+#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -24022,7 +25319,7 @@
"a - bu parçayı ve sonraki tüm parçaları at\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini atma"
-#: git-add--interactive.perl:1278
+#: git-add--interactive.perl:1281
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -24036,7 +25333,7 @@
"a - bu parçayı ve sonraki tüm parçaları at\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini atma"
-#: git-add--interactive.perl:1284
+#: git-add--interactive.perl:1287
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -24050,7 +25347,7 @@
"a - bu parçayı ve sonraki tüm parçaları uygula\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini uygulama"
-#: git-add--interactive.perl:1296
+#: git-add--interactive.perl:1299
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -24064,7 +25361,7 @@
"a - bu parçayı ve sonraki tüm parçaları uygula\n"
"d - bu parçayı veya sonraki parçalardan herhangi birini uygulama"
-#: git-add--interactive.perl:1311
+#: git-add--interactive.perl:1314
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -24086,85 +25383,90 @@
"e - geçerli parçayı el ile düzenle\n"
"? - yardımı yazdır\n"
-#: git-add--interactive.perl:1342
+#: git-add--interactive.perl:1345
msgid "The selected hunks do not apply to the index!\n"
msgstr "Seçili parçalar indekse uygulanamıyor!\n"
-#: git-add--interactive.perl:1357
+#: git-add--interactive.perl:1360
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "birleştirilmeyenler yok sayılıyor: %s\n"
-#: git-add--interactive.perl:1468
+#: git-add--interactive.perl:1479
#, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr "Kip değişimi çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1469
+#: git-add--interactive.perl:1480
#, perl-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
msgstr "Silme çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1470
+#: git-add--interactive.perl:1481
+#, 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:1482
#, perl-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr "Bu parça çalışma ağacına uygulansın mı [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1570
+#: git-add--interactive.perl:1599
msgid "No other hunks to goto\n"
msgstr "Gidilecek başka parça yok\n"
-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1617
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Geçersiz sayı: '%s'\n"
-#: git-add--interactive.perl:1593
+#: git-add--interactive.perl:1622
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "Üzgünüm, yalnızca %d parça kullanılabilir.\n"
msgstr[1] "Üzgünüm, yalnızca %d parça kullanılabilir.\n"
-#: git-add--interactive.perl:1619
+#: git-add--interactive.perl:1657
msgid "No other hunks to search\n"
msgstr "Aranacak başka parça yok\n"
-#: git-add--interactive.perl:1636
+#: git-add--interactive.perl:1674
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Hatalı oluşturulmuş arama düzenli ifadesi %s: %s\n"
-#: git-add--interactive.perl:1646
+#: git-add--interactive.perl:1684
msgid "No hunk matches the given pattern\n"
msgstr "Verilen dizgi ile hiçbir parça eşleşmiyor\n"
-#: git-add--interactive.perl:1658 git-add--interactive.perl:1680
+#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
msgid "No previous hunk\n"
msgstr "Öncesinde parça yok\n"
-#: git-add--interactive.perl:1667 git-add--interactive.perl:1686
+#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
msgid "No next hunk\n"
msgstr "Sonrasında parça yok\n"
-#: git-add--interactive.perl:1692
+#: git-add--interactive.perl:1730
msgid "Sorry, cannot split this hunk\n"
msgstr "Üzgünüm, bu parça bölünemiyor\n"
-#: git-add--interactive.perl:1698
+#: git-add--interactive.perl:1736
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "%d parçaya bölündü.\n"
msgstr[1] "%d parçaya bölündü.\n"
-#: git-add--interactive.perl:1708
+#: git-add--interactive.perl:1746
msgid "Sorry, cannot edit this hunk\n"
msgstr "Üzgünüm, bu parça düzenlenemiyor\n"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1773
+#: git-add--interactive.perl:1811
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
@@ -24182,22 +25484,22 @@
"add untracked - izlenmeyen dosyaların içeriğini hazırlanan değişiklik setine "
"ekle\n"
-#: git-add--interactive.perl:1790 git-add--interactive.perl:1795
-#: git-add--interactive.perl:1798 git-add--interactive.perl:1805
-#: git-add--interactive.perl:1808 git-add--interactive.perl:1815
-#: git-add--interactive.perl:1819 git-add--interactive.perl:1825
+#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
+#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
+#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
+#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
msgid "missing --"
msgstr "-- eksik"
-#: git-add--interactive.perl:1821
+#: git-add--interactive.perl:1866
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "bilinmeyen --patch kipi: %s"
-#: git-add--interactive.perl:1827 git-add--interactive.perl:1833
+#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
#, perl-format
msgid "invalid argument %s, expecting --"
-msgstr "geçersiz değişken %s, -- bekleniyor"
+msgstr "geçersiz argüman %s, -- bekleniyor"
#: git-send-email.perl:138
msgid "local zone differs from GMT by a non-minute interval\n"
@@ -24211,26 +25513,37 @@
msgid "the editor exited uncleanly, aborting everything"
msgstr "düzenleyici düzgünce çıkmadı, her şey iptal ediliyor"
-#: 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' yazmakta olduğunuz e-postanın orta düzey bir sürümünü içeriyor.\n"
-#: git-send-email.perl:315
+#: 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:408
+#: 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: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 ""
+"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:484
+#: git-send-email.perl:492
msgid ""
"`batch-size` and `relogin` must be specified together (via command-line or "
"configuration option)\n"
@@ -24238,37 +25551,37 @@
"'batch-size' ve 'relogin' birlikte belirtilmeli (komut satırı veya "
"yapılandırma seçeneklerinden)\n"
-#: git-send-email.perl:497
+#: 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:528
+#: git-send-email.perl:536
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Bilinmeyen --confirm ayarı: '%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 "uyarı: tırnak içine alınmış sendmail arması desteklenmiyor: %s\n"
-#: git-send-email.perl:558
+#: git-send-email.perl:566
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "uyarı: ':include:' desteklenmiyor: %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 "uyarı: '/file' veya '|pipe' yeniden yönlendirmesi desteklenmiyor: %s\n"
-#: git-send-email.perl:565
+#: 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:649
+#: git-send-email.perl:657
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -24277,18 +25590,18 @@
" * Saying \"./%s\" if you mean a file; or\n"
" * Giving --format-patch option if you mean a range.\n"
msgstr ""
-"'%s' dosyası mevcut, ancak aynı zamanda yama üretilecek gönderilerin\n"
+"'%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:670
+#: git-send-email.perl:678
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "%s opendir yapılamadı: %s"
-#: git-send-email.perl:694
+#: git-send-email.perl:702
#, perl-format
msgid ""
"fatal: %s: %s\n"
@@ -24297,7 +25610,7 @@
"onulmaz: %s: %s\n"
"uyarı: hiçbir yama gönderilmedi\n"
-#: git-send-email.perl:705
+#: git-send-email.perl:713
msgid ""
"\n"
"No patch files specified!\n"
@@ -24307,17 +25620,17 @@
"Hiçbir yama dosyası belirtilmedi!\n"
"\n"
-#: git-send-email.perl:718
+#: 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:728
+#: 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: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"
@@ -24331,38 +25644,38 @@
"\n"
"Bir özet göndermek istemiyorsanız gövde kısmını temizleyin.\n"
-#: git-send-email.perl:763
+#: git-send-email.perl:771
#, perl-format
msgid "Failed to open %s: %s"
msgstr "%s açılamadı: %s"
-#: git-send-email.perl:780
+#: git-send-email.perl:788
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "%s.final açılamadı: %s"
-#: git-send-email.perl:823
+#: 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:858
+#: 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:913
+#: 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"
+"Aşağıdaki dosyalar 8 bit; ancak Content-Transfer-Encoding desteklemiyorlar.\n"
-#: git-send-email.perl:918
+#: 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:926
+#: git-send-email.perl:934
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -24370,27 +25683,27 @@
"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
"want to send.\n"
msgstr ""
-"Gönderme reddediliyor, çünkü\n"
+"Gönderme reddediliyor; çünkü\n"
"\t%s\n"
"içinde '*** SUBJECT HERE ***' konu şablonu var. Yine de göndermek "
"istiyorsanız --force kullanın.\n"
-#: git-send-email.perl:945
+#: 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:963
+#: 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:975
+#: 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: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 "hata: şuradan geçerli bir adres çıkartılamadı: %s\n"
@@ -24398,16 +25711,16 @@
#. 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 "Bu adresle ne yapılsın? ([q] çık|[d] bırak|düz[e]nle): "
-#: git-send-email.perl:1362
+#: 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: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"
@@ -24420,144 +25733,144 @@
" run 'git config --global sendemail.confirm auto'.\n"
"\n"
msgstr ""
-" Yukarıdaki Cc listesi yama gönderi iletisinde bulunan adresler\n"
+" 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"
+" Geçerli davranışı korumak; ancak bu iletiyi susturmak için\n"
" 'git config --global sendemail.confirm auto' çalıştırın.\n"
"\n"
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1460
+#: 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:1463
+#: 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:1491
+#: 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:1538
+#: git-send-email.perl:1546
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Sunucu STARTTLS desteklemiyor! %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 başarısız oldu! %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 düzgünce başlatılamıyor. Yapılandırmayı denetleyin ve --smtp-debug "
"yapın."
-#: git-send-email.perl:1574
+#: git-send-email.perl:1582
#, perl-format
msgid "Failed to send %s\n"
msgstr "%s gönderilemedi\n"
-#: git-send-email.perl:1577
+#: git-send-email.perl:1585
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "%s gönderilir gibi yapıldı\n"
-#: git-send-email.perl:1577
+#: git-send-email.perl:1585
#, perl-format
msgid "Sent %s\n"
msgstr "%s gönderildi\n"
-#: git-send-email.perl:1579
+#: 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:1579
+#: git-send-email.perl:1587
msgid "OK. Log says:\n"
msgstr "Tamam. Günlük çıktısı:\n"
-#: git-send-email.perl:1591
+#: git-send-email.perl:1599
msgid "Result: "
msgstr "Sonuç: "
-#: git-send-email.perl:1594
+#: git-send-email.perl:1602
msgid "Result: OK\n"
msgstr "Sonuç: Tamam\n"
-#: git-send-email.perl:1612
+#: git-send-email.perl:1620
#, perl-format
msgid "can't open file %s"
msgstr "%s dosyası açılamıyor"
-#: 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' satırından ekleniyor\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' satırından ekleniyor\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' satırından ekleniyor\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' satırından ekleniyor\n"
-#: git-send-email.perl:1864
+#: git-send-email.perl:1876
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) '%s' çalıştırılamadı"
-#: 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' konumundan ekleniyor\n"
-#: git-send-email.perl:1875
+#: 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:1905
+#: git-send-email.perl:1917
msgid "cannot send message as 7bit"
msgstr "ileti 7 bit olarak gönderilemiyor"
-#: git-send-email.perl:1913
+#: git-send-email.perl:1925
msgid "invalid transfer encoding"
msgstr "geçersiz aktarım kodlaması"
-#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
+#: 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:1957
+#: 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:1974
+#: 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:1978
+#: 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/po/vi.po b/po/vi.po
index 5459484..f0ee9a8 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -2,15 +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, 2020.
+# Trần Ngọc Quân <vnwildman@gmail.com>, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021.
# Đoàn Trần Công Danh <congdanhqx@gmail.com>, 2020.
#
msgid ""
msgstr ""
-"Project-Id-Version: git v2.26.0\n"
+"Project-Id-Version: git v2.31.0-rc1 rd2\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2020-03-11 15:26+0800\n"
-"PO-Revision-Date: 2020-03-16 08:52+0700\n"
+"POT-Creation-Date: 2021-03-04 22:41+0800\n"
+"PO-Revision-Date: 2021-03-08 08:58+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"
@@ -21,237 +21,242 @@
"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.2\n"
-#: add-interactive.c:368
+#: add-interactive.c:376
#, c-format
msgid "Huh (%s)?"
msgstr "Hả (%s)?"
-#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124
-#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687
-#: builtin/rebase.c:2086 builtin/rebase.c:2130
+#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292
+#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538
+#: builtin/rebase.c:1963
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
+#: add-interactive.c:584 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
+#: add-interactive.c:642 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
+#: add-interactive.c:643 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
+#: add-interactive.c:680 git-add--interactive.perl:641
msgid "Update"
msgstr "Cập nhật"
-#: add-interactive.c:689 add-interactive.c:877
+#: add-interactive.c:697 add-interactive.c:885
#, c-format
msgid "could not stage '%s'"
msgstr "không thể đưa “%s” lên bệ phóng"
-#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317
-#: builtin/rebase.c:899
+#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486
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
+#: add-interactive.c:706 git-add--interactive.perl:626
#, 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
+#: add-interactive.c:724 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "chú ý: %s giờ đã bỏ theo dõi.\n"
-#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281
-#: builtin/reset.c:144
+#: add-interactive.c:729 apply.c:4125 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
+#: add-interactive.c:759 git-add--interactive.perl:653
msgid "Revert"
msgstr "Hoàn nguyên"
-#: add-interactive.c:767
+#: add-interactive.c:775
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
+#: add-interactive.c:813 git-add--interactive.perl:629
#, 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
+#: add-interactive.c:864 git-add--interactive.perl:693
#, 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
+#: add-interactive.c:868 git-add--interactive.perl:687
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
+#: add-interactive.c:895 git-add--interactive.perl:623
#, 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
+#: add-interactive.c:925
#, c-format
msgid "ignoring unmerged: %s"
msgstr "bỏ qua những thứ chưa hòa trộn: %s"
-#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366
+#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369
#, c-format
msgid "Only binary files changed.\n"
msgstr "Chỉ có các tập tin nhị phân là thay đổi.\n"
-#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368
+#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371
#, c-format
msgid "No changes.\n"
msgstr "Không có thay đổi nào.\n"
-#: add-interactive.c:935 git-add--interactive.perl:1376
+#: add-interactive.c:943 git-add--interactive.perl:1379
msgid "Patch update"
msgstr "Cập nhật miếng vá"
-#: add-interactive.c:974 git-add--interactive.perl:1754
+#: add-interactive.c:982 git-add--interactive.perl:1792
msgid "Review diff"
msgstr "Xem xét lại diff"
-#: add-interactive.c:1002
+#: add-interactive.c:1010
msgid "show paths with changes"
msgstr "hiển thị đường dẫn với các thay đổi"
-#: add-interactive.c:1004
+#: add-interactive.c:1012
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
+#: add-interactive.c:1014
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
+#: add-interactive.c:1016
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
+#: add-interactive.c:1018
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
+#: add-interactive.c:1020
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
+#: add-interactive.c:1028 add-interactive.c:1077
msgid "Prompt help:"
msgstr "Trợ giúp về nhắc:"
-#: add-interactive.c:1022
+#: add-interactive.c:1030
msgid "select a single item"
msgstr "chọn một mục đơn"
-#: add-interactive.c:1024
+#: add-interactive.c:1032
msgid "select a range of items"
msgstr "chọn một vùng các mục"
-#: add-interactive.c:1026
+#: add-interactive.c:1034
msgid "select multiple ranges"
msgstr "chọn nhiều vùng"
-#: add-interactive.c:1028 add-interactive.c:1073
+#: add-interactive.c:1036 add-interactive.c:1081
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
+#: add-interactive.c:1038
msgid "unselect specified items"
msgstr "bỏ chọn các mục đã cho"
-#: add-interactive.c:1032
+#: add-interactive.c:1040
msgid "choose all items"
msgstr "chọn tất cả các mục"
-#: add-interactive.c:1034
+#: add-interactive.c:1042
msgid "(empty) finish selecting"
msgstr "(để trống) hoàn tất chọn lựa"
-#: add-interactive.c:1071
+#: add-interactive.c:1079
msgid "select a numbered item"
msgstr "tùy chọn mục bằng số"
-#: add-interactive.c:1075
+#: add-interactive.c:1083
msgid "(empty) select nothing"
msgstr "(để trống) không chọn gì"
-#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851
+#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
msgid "*** Commands ***"
msgstr "*** Lệnh ***"
-#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848
+#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
msgid "What now"
msgstr "Giờ thì sao"
-#: add-interactive.c:1136 git-add--interactive.perl:213
+#: add-interactive.c:1144 git-add--interactive.perl:213
msgid "staged"
msgstr "đã đưa lên bệ phóng"
-#: add-interactive.c:1136 git-add--interactive.perl:213
+#: add-interactive.c:1144 git-add--interactive.perl:213
msgid "unstaged"
msgstr "chưa đưa lên bệ phóng"
-#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251
-#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144
-#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409
-#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
-#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
-#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
+#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257
+#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124
+#: builtin/fetch.c:150 builtin/merge.c:285 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
+#: add-interactive.c:1151
msgid "could not refresh index"
msgstr "không thể đọc lại bảng mục lục"
-#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765
+#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803
#, c-format
msgid "Bye.\n"
msgstr "Tạm biệt.\n"
-#: add-patch.c:33 git-add--interactive.perl:1428
+#: add-patch.c:34 git-add--interactive.perl:1431
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "Thay đổi chế độ bệ phóng [y,n,q,a,d%s,?]? "
-#: add-patch.c:34 git-add--interactive.perl:1429
+#: add-patch.c:35 git-add--interactive.perl:1432
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "Xóa khỏi bệ phóng [y,n,q,a,d%s,?]? "
-#: add-patch.c:35 git-add--interactive.perl:1430
+#: add-patch.c:36 git-add--interactive.perl:1433
+#, 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:1434
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "Đưa lên bệ phóng khúc này [y,n,q,a,d%s,?]? "
-#: add-patch.c:37
+#: add-patch.c:39
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"staging."
@@ -259,7 +264,7 @@
"Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức được đánh dấu "
"để chuyển lên bệ phóng."
-#: add-patch.c:40
+#: add-patch.c:42
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -274,22 +279,27 @@
"d - đừng đưa lên bệ phóng khúc này cũng như bất kỳ cái nào còn lại trong tập "
"tin\n"
-#: add-patch.c:54 git-add--interactive.perl:1433
+#: add-patch.c:56 git-add--interactive.perl:1437
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "Thay đổi chế độ tạm cất đi [y,n,q,a,d%s,?]? "
-#: add-patch.c:55 git-add--interactive.perl:1434
+#: add-patch.c:57 git-add--interactive.perl:1438
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "Xóa tạm cất [y,n,q,a,d%s,?]? "
-#: add-patch.c:56 git-add--interactive.perl:1435
+#: add-patch.c:58 git-add--interactive.perl:1439
+#, 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:1440
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "Tạm cất khúc này [y,n,q,a,d%s,?]? "
-#: add-patch.c:58
+#: add-patch.c:61
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"stashing."
@@ -297,7 +307,7 @@
"Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức được đánh dấu "
"để tạm cất."
-#: add-patch.c:61
+#: add-patch.c:64
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -311,22 +321,27 @@
"a - tạm cất khúc này và tất cả các khúc sau này trong tập tin\n"
"d - đừng tạm cất khúc này cũng như bất kỳ cái nào còn lại trong tập tin\n"
-#: add-patch.c:77 git-add--interactive.perl:1438
+#: add-patch.c:80 git-add--interactive.perl:1443
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "Thay đổi chế độ bỏ ra khỏi bệ phóng [y,n,q,a,d%s,?]? "
-#: add-patch.c:78 git-add--interactive.perl:1439
+#: add-patch.c:81 git-add--interactive.perl:1444
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "Xóa bỏ việc bỏ ra khỏi bệ phóng [y,n,q,a,d%s,?]? "
-#: add-patch.c:79 git-add--interactive.perl:1440
+#: add-patch.c:82 git-add--interactive.perl:1445
+#, 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:1446
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "Bỏ ra khỏi bệ phóng khúc này [y,n,q,a,d%s,?]? "
-#: add-patch.c:81
+#: add-patch.c:85
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"unstaging."
@@ -334,7 +349,7 @@
"Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức được đánh dấu "
"để bỏ ra khỏi bệ phóng."
-#: add-patch.c:84
+#: add-patch.c:88
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -350,22 +365,27 @@
"d - đừng đưa ra khỏi bệ phóng khúc này cũng như bất kỳ cái nào còn lại trong "
"tập tin\n"
-#: add-patch.c:99 git-add--interactive.perl:1443
+#: add-patch.c:103 git-add--interactive.perl:1449
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "Áp dụng thay đổi chế độ cho mục lục [y,n,q,a,d%s,?]? "
-#: add-patch.c:100 git-add--interactive.perl:1444
+#: add-patch.c:104 git-add--interactive.perl:1450
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "Áp dụng việc xóa vào mục lục [y,n,q,a,d%s,?]? "
-#: add-patch.c:101 git-add--interactive.perl:1445
+#: add-patch.c:105 git-add--interactive.perl:1451
+#, 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:1452
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "Áo dụng khúc này vào mục lục [y,n,q,a,d%s,?]? "
-#: add-patch.c:103 add-patch.c:168 add-patch.c:211
+#: 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."
@@ -373,7 +393,7 @@
"Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức được đánh dấu "
"để áp dụng."
-#: add-patch.c:106
+#: add-patch.c:111
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -387,25 +407,31 @@
"a - áp dụng khúc này và tất cả các khúc sau này trong tập tin\n"
"d - đừng áp dụng khúc này cũng như bất kỳ cái nào sau này trong tập tin\n"
-#: add-patch.c:121 git-add--interactive.perl:1448
-#: git-add--interactive.perl:1463
+#: add-patch.c:126 git-add--interactive.perl:1455
+#: git-add--interactive.perl:1473
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "Loại bỏ các thay đổi chế độ từ cây làm việc [y,n,q,a,d%s,?]? "
-#: add-patch.c:122 git-add--interactive.perl:1449
-#: git-add--interactive.perl:1464
+#: add-patch.c:127 git-add--interactive.perl:1456
+#: git-add--interactive.perl:1474
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "Loại bỏ việc xóa khỏi cây làm việc [y,n,q,a,d%s,?]? "
-#: add-patch.c:123 git-add--interactive.perl:1450
-#: git-add--interactive.perl:1465
+#: add-patch.c:128 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
+#, 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:1458
+#: git-add--interactive.perl:1476
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "Loại bỏ khúc này khỏi cây làm việc [y,n,q,a,d%s,?]? "
-#: add-patch.c:125 add-patch.c:147 add-patch.c:190
+#: 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."
@@ -413,7 +439,7 @@
"Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức được đánh dấu "
"để loại bỏ."
-#: add-patch.c:128 add-patch.c:193
+#: 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"
@@ -427,22 +453,27 @@
"a - loại bỏ khúc này và tất cả các khúc sau này trong tập tin\n"
"d - đừng loại bỏ khúc này cũng như bất kỳ cái nào sau này trong tập tin\n"
-#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Loại bỏ thay đổi chế độ từ mục lục và cây làm việc [y,n,q,a,d%s,?]? "
-#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Loại bỏ việc xóa khỏi mục lục và cây làm việc [y,n,q,a,d%s,?]? "
-#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#, 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:1464
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr "Loại bỏ khúc này khỏi mục lục và cây làm việc [y,n,q,a,d%s,?]? "
-#: add-patch.c:150
+#: 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"
@@ -456,22 +487,27 @@
"a - loại bỏ khúc này và tất cả các khúc sau này trong tập tin\n"
"d - đừng loại bỏ khúc này cũng như bất kỳ cái nào sau này trong tập tin\n"
-#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Áp dụng thay đổi chế độ cho mục lục và cây làm việc [y,n,q,a,d%s,?]? "
-#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Áp dụng việc xóa vào mục lục và cây làm việc [y,n,q,a,d%s,?]? "
-#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#, 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:1470
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr "Áp dụng khúc này vào mục lục và cây làm việc [y,n,q,a,d%s,?]? "
-#: add-patch.c:171
+#: 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"
@@ -485,7 +521,7 @@
"a - áp dụng khúc này và tất cả các khúc sau này trong tập tin\n"
"d - đừng áp dụng khúc này cũng như bất kỳ cái nào sau này trong tập tin\n"
-#: add-patch.c:214
+#: add-patch.c:224
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -499,34 +535,34 @@
"a - áp dụng khúc này và tất cả các khúc sau này trong tập tin\n"
"d - đừng áp dụng khúc này cũng như bất kỳ cái nào sau này trong tập tin\n"
-#: add-patch.c:318
+#: 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:337 add-patch.c:341
+#: 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:395
+#: 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:414
+#: 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:428
+#: add-patch.c:452
#, c-format
msgid "failed to run '%s'"
msgstr "gặp lỗi khi chạy “%s”"
-#: add-patch.c:587
+#: add-patch.c:611
msgid "mismatched output from interactive.diffFilter"
msgstr "đầu ra không khớp từ interactive.diffFilter"
-#: add-patch.c:588
+#: add-patch.c:612
msgid ""
"Your filter must maintain a one-to-one correspondence\n"
"between its input and output lines."
@@ -534,7 +570,7 @@
"Bộ lọc của bạn phải duy trì một quan hệ một-đến-một\n"
"giữa các dòng đầu vào và đầu ra của nó."
-#: add-patch.c:761
+#: add-patch.c:790
#, c-format
msgid ""
"expected context line #%d in\n"
@@ -543,7 +579,7 @@
"cần dòng ngữ cảnh #%d trong\n"
"%.*s"
-#: add-patch.c:776
+#: add-patch.c:805
#, c-format
msgid ""
"hunks do not overlap:\n"
@@ -556,11 +592,11 @@
"\tkhông được kết thúc bằng:\n"
"%.*s"
-#: add-patch.c:1052 git-add--interactive.perl:1112
+#: add-patch.c:1081 git-add--interactive.perl:1115
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "Chế độ sửa khúc bằng tay -- xem ở đáy để có hướng dẫn sử dụng nhanh.\n"
-#: add-patch.c:1056
+#: add-patch.c:1085
#, c-format
msgid ""
"---\n"
@@ -574,7 +610,7 @@
"Những dòng bắt đầu bằng %c sẽ bị loại bỏ.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1070 git-add--interactive.perl:1126
+#: add-patch.c:1099 git-add--interactive.perl:1129
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"
@@ -584,13 +620,13 @@
"để sửa lần nữa. Nếu mọi dòng của khúc bị xóa bỏ, thế thì những\n"
"sửa dổi sẽ bị loại bỏ, và khúc vẫn giữ nguyên.\n"
-#: add-patch.c:1103
+#: add-patch.c:1132
msgid "could not parse hunk header"
msgstr "không thể phân tích cú pháp phần đầu khúc"
-#: add-patch.c:1148
+#: add-patch.c:1177
msgid "'git apply --cached' failed"
-msgstr "'git apply --cached' gặp lỗi"
+msgstr "“git apply --cached” gặp lỗi"
#. TRANSLATORS: do not translate [y/n]
#. The program will only accept that input at this point.
@@ -604,26 +640,26 @@
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1218 git-add--interactive.perl:1239
+#: add-patch.c:1246 git-add--interactive.perl:1242
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
"Hunk đã sửa của bạn không được áp dụng. Sửa lại lần nữa (nói \"n\" để loại "
"bỏ!) [y/n]? "
-#: add-patch.c:1261
+#: add-patch.c:1289
msgid "The selected hunks do not apply to the index!"
msgstr "Các khúc đã chọn không được áp dụng vào bảng mục lục!"
-#: add-patch.c:1262 git-add--interactive.perl:1343
+#: add-patch.c:1290 git-add--interactive.perl:1346
msgid "Apply them to the worktree anyway? "
msgstr "Vẫn áp dụng chúng cho cây làm việc? "
-#: add-patch.c:1269 git-add--interactive.perl:1346
+#: add-patch.c:1297 git-add--interactive.perl:1349
msgid "Nothing was applied.\n"
msgstr "Đã không áp dụng gì cả.\n"
-#: add-patch.c:1326
+#: add-patch.c:1354
msgid ""
"j - leave this hunk undecided, see next undecided hunk\n"
"J - leave this hunk undecided, see next hunk\n"
@@ -645,110 +681,119 @@
"e - sửa bằng tay khúc hiện hành\n"
"? - hiển thị trợ giúp\n"
-#: add-patch.c:1447 add-patch.c:1457
+#: add-patch.c:1516 add-patch.c:1526
msgid "No previous hunk"
msgstr "Không có khúc kế trước"
-#: add-patch.c:1452 add-patch.c:1462
+#: add-patch.c:1521 add-patch.c:1531
msgid "No next hunk"
msgstr "Không có khúc kế tiếp"
-#: add-patch.c:1468
+#: add-patch.c:1537
msgid "No other hunks to goto"
msgstr "Không còn khúc nào để mà nhảy đến"
-#: add-patch.c:1479 git-add--interactive.perl:1577
+#: add-patch.c:1548 git-add--interactive.perl:1606
msgid "go to which hunk (<ret> to see more)? "
msgstr "nhảy đến khúc nào (<ret> để xem thêm)? "
-#: add-patch.c:1480 git-add--interactive.perl:1579
+#: add-patch.c:1549 git-add--interactive.perl:1608
msgid "go to which hunk? "
msgstr "nhảy đến khúc nào? "
-#: add-patch.c:1491
+#: add-patch.c:1560
#, c-format
msgid "Invalid number: '%s'"
msgstr "Số không hợp lệ: “%s”"
-#: add-patch.c:1496
+#: add-patch.c:1565
#, c-format
msgid "Sorry, only %d hunk available."
msgid_plural "Sorry, only %d hunks available."
msgstr[0] "Rất tiếc, chỉ có sẵn %d khúc."
-#: add-patch.c:1505
+#: add-patch.c:1574
msgid "No other hunks to search"
msgstr "Không còn khúc nào để mà tìm kiếm"
-#: add-patch.c:1511 git-add--interactive.perl:1623
+#: add-patch.c:1580 git-add--interactive.perl:1661
msgid "search for regex? "
msgstr "tìm kiếm cho biểu thức chính quy? "
-#: add-patch.c:1526
+#: add-patch.c:1595
#, c-format
msgid "Malformed search regexp %s: %s"
msgstr "Định dạng tìm kiếm của biểu thức chính quy không đúng %s: %s"
-#: add-patch.c:1543
+#: add-patch.c:1612
msgid "No hunk matches the given pattern"
msgstr "Không thấy khúc nào khớp mẫu đã cho"
-#: add-patch.c:1550
+#: add-patch.c:1619
msgid "Sorry, cannot split this hunk"
msgstr "Rất tiếc, không thể chia nhỏ khúc này"
-#: add-patch.c:1554
+#: add-patch.c:1623
#, c-format
msgid "Split into %d hunks."
msgstr "Chi nhỏ thành %d khúc."
-#: add-patch.c:1558
+#: add-patch.c:1627
msgid "Sorry, cannot edit this hunk"
msgstr "Rất tiếc, không thể sửa khúc này"
-#: add-patch.c:1609
+#: add-patch.c:1679
msgid "'git apply' failed"
-msgstr "'git apply' gặp lỗi"
+msgstr "“git apply” gặp lỗi"
-#: advice.c:115
+#: advice.c:143
+#, 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:159
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%sgợi ý: %.*s%s\n"
-#: advice.c:168
+#: advice.c:250
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
"Cherry-picking là không thể thực hiện bởi vì bạn có những tập tin chưa được "
"hòa trộn."
-#: advice.c:170
+#: advice.c:252
msgid "Committing is not possible because you have unmerged files."
msgstr ""
"Commit là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn."
-#: advice.c:172
+#: advice.c:254
msgid "Merging is not possible because you have unmerged files."
msgstr ""
"Merge là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn."
-#: advice.c:174
+#: advice.c:256
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
"Pull là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn."
-#: advice.c:176
+#: advice.c:258
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
"Revert là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn."
-#: advice.c:178
+#: advice.c:260
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr ""
"Việc này không thể thực hiện với %s bởi vì bạn có những tập tin chưa được "
"hòa trộn."
-#: advice.c:186
+#: advice.c:268
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
@@ -756,23 +801,23 @@
"Sửa chúng trong cây làm việc, và sau đó dùng lệnh “git add/rm <tập-tin>”\n"
"dành riêng cho việc đánh dấu cần giải quyết và tạo lần chuyển giao."
-#: advice.c:194
+#: advice.c:276
msgid "Exiting because of an unresolved conflict."
msgstr "Thoát ra bởi vì xung đột không thể giải quyết."
-#: advice.c:199 builtin/merge.c:1335
+#: advice.c:281 builtin/merge.c:1370
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Bạn chưa kết thúc việc hòa trộn (MERGE_HEAD vẫn tồn tại)."
-#: advice.c:201
+#: advice.c:283
msgid "Please, commit your changes before merging."
msgstr "Vui lòng chuyển giao các thay đổi trước khi hòa trộn."
-#: advice.c:202
+#: advice.c:284
msgid "Exiting because of unfinished merge."
msgstr "Thoát ra bởi vì việc hòa trộn không hoàn tất."
-#: advice.c:208
+#: advice.c:290
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -803,9 +848,9 @@
"\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"
@@ -1063,7 +1108,8 @@
msgid "cannot checkout %s"
msgstr "không thể lấy ra %s"
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:86 pack-revindex.c:213
+#: setup.c:308
#, c-format
msgid "failed to read %s"
msgstr "gặp lỗi khi đọc %s"
@@ -1083,7 +1129,7 @@
msgid "%s: does not exist in index"
msgstr "%s: không tồn tại trong bảng mục lục"
-#: apply.c:3537 apply.c:3708
+#: apply.c:3537 apply.c:3708 apply.c:3952
#, c-format
msgid "%s: does not match index"
msgstr "%s: không khớp trong mục lục"
@@ -1131,316 +1177,360 @@
msgid "%s has type %o, expected %o"
msgstr "%s có kiểu %o, cần %o"
-#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856
-#: read-cache.c:1325
+#: apply.c: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:3936
+#: 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:3939
+#: apply.c:3954
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: đã sẵn có trong thư mục đang làm việc"
-#: apply.c:3959
+#: apply.c:3974
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o)"
-#: apply.c:3964
+#: apply.c:3979
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "chế độ mới (%o) của %s không khớp với chế độ cũ (%o) của %s"
-#: apply.c:3984
+#: apply.c:3999
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "tập tin chịu tác động “%s” vượt ra ngoài liên kết mềm"
-#: apply.c:3988
+#: apply.c:4003
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: miếng vá không được áp dụng"
-#: apply.c:4003
+#: apply.c:4018
#, c-format
msgid "Checking patch %s..."
msgstr "Đang kiểm tra miếng vá %s…"
-#: apply.c:4095
+#: apply.c:4110
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "thông tin sha1 thiếu hoặc không dùng được cho mô-đun %s"
-#: apply.c:4102
+#: apply.c:4117
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "thay đổi chế độ cho %s, cái mà không phải là HEAD hiện tại"
-#: apply.c:4105
+#: apply.c:4120
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "thông tin sha1 còn thiếu hay không dùng được(%s)."
-#: apply.c:4114
+#: apply.c:4129
#, c-format
msgid "could not add %s to temporary index"
msgstr "không thể thêm %s vào chỉ mục tạm thời"
-#: apply.c:4124
+#: apply.c:4139
#, c-format
msgid "could not write temporary index to %s"
msgstr "không thể ghi mục lục tạm vào %s"
-#: apply.c:4262
+#: apply.c:4277
#, c-format
msgid "unable to remove %s from index"
msgstr "không thể gỡ bỏ %s từ mục lục"
-#: apply.c:4296
+#: apply.c:4311
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "miếng vá sai hỏng cho mô-đun-con %s"
-#: apply.c:4302
+#: apply.c:4317
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "không thể lấy thống kê về tập tin %s mới hơn đã được tạo"
-#: apply.c:4310
+#: apply.c:4325
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "không thể tạo “kho lưu đằng sau” cho tập tin được tạo mới hơn %s"
-#: apply.c:4316 apply.c:4461
+#: apply.c:4331 apply.c:4476
#, c-format
msgid "unable to add cache entry for %s"
msgstr "không thể thêm mục nhớ đệm cho %s"
-#: apply.c:4359
+#: apply.c:4374 builtin/bisect--helper.c:523
#, c-format
msgid "failed to write to '%s'"
msgstr "gặp lỗi khi ghi vào “%s”"
-#: apply.c:4363
+#: apply.c:4378
#, c-format
msgid "closing file '%s'"
msgstr "đang đóng tập tin “%s”"
-#: apply.c:4433
+#: apply.c:4448
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "không thể ghi vào tập tin “%s” chế độ %o"
-#: apply.c:4531
+#: apply.c:4546
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Đã áp dụng miếng vá %s một cách sạch sẽ."
-#: apply.c:4539
+#: apply.c:4554
msgid "internal error"
msgstr "lỗi nội bộ"
-#: apply.c:4542
+#: apply.c:4557
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Đang áp dụng miếng vá %%s với %d lần từ chối…"
-#: apply.c:4553
+#: apply.c:4568
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "đang cắt ngắn tên tập tin .rej thành %.*s.rej"
-#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201
+#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334
#, c-format
msgid "cannot open %s"
msgstr "không mở được “%s”"
-#: apply.c:4575
+#: apply.c:4590
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Khối nhớ #%d được áp dụng gọn gàng."
-#: apply.c:4579
+#: apply.c:4594
#, c-format
msgid "Rejected hunk #%d."
msgstr "Đoạn dữ liệu #%d bị từ chối."
-#: apply.c:4698
+#: apply.c:4718
#, c-format
msgid "Skipped patch '%s'."
msgstr "Bỏ qua đường dẫn “%s”."
-#: apply.c:4706
+#: apply.c:4726
msgid "unrecognized input"
msgstr "không thừa nhận đầu vào"
-#: apply.c:4726
+#: apply.c:4746
msgid "unable to read index file"
msgstr "không thể đọc tập tin lưu bảng mục lục"
-#: apply.c:4883
+#: apply.c:4903
#, c-format
msgid "can't open patch '%s': %s"
msgstr "không thể mở miếng vá “%s”: %s"
-#: apply.c:4910
+#: apply.c:4930
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "đã chấm dứt %d lỗi khoảng trắng"
-#: apply.c:4916 apply.c:4931
+#: apply.c:4936 apply.c:4951
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d dòng thêm khoảng trắng lỗi."
-#: apply.c:4924
+#: apply.c:4944
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "%d dòng được áp dụng sau khi sửa các lỗi khoảng trắng."
-#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406
+#: apply.c:4960 builtin/add.c:626 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:4968
+#: apply.c:4988
msgid "don't apply changes matching the given path"
msgstr "không áp dụng các thay đổi khớp với đường dẫn đã cho"
-#: apply.c:4971
+#: apply.c:4991
msgid "apply changes matching the given path"
msgstr "áp dụng các thay đổi khớp với đường dẫn đã cho"
-#: apply.c:4973 builtin/am.c:2260
+#: apply.c:4993 builtin/am.c:2266
msgid "num"
msgstr "số"
-#: apply.c:4974
+#: apply.c:4994
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "gỡ bỏ <số> dấu gạch chéo dẫn đầu từ đường dẫn diff cổ điển"
-#: apply.c:4977
+#: apply.c:4997
msgid "ignore additions made by the patch"
msgstr "lờ đi phần bổ xung được tạo ra bởi miếng vá"
-#: apply.c:4979
+#: apply.c:4999
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
"thay vì áp dụng một miếng vá, kết xuất kết quả từ lệnh diffstat cho đầu ra"
-#: apply.c:4983
+#: apply.c:5003
msgid "show number of added and deleted lines in decimal notation"
msgstr ""
"hiển thị số lượng các dòng được thêm vào và xóa đi theo ký hiệu thập phân"
-#: apply.c:4985
+#: apply.c:5005
msgid "instead of applying the patch, output a summary for the input"
msgstr "thay vì áp dụng một miếng vá, kết xuất kết quả cho đầu vào"
-#: apply.c:4987
+#: apply.c:5007
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "thay vì áp dụng miếng vá, hãy xem xem miếng vá có thích hợp không"
-#: apply.c:4989
+#: apply.c:5009
msgid "make sure the patch is applicable to the current index"
msgstr "hãy chắc chắn là miếng vá thích hợp với bảng mục lục hiện hành"
-#: apply.c:4991
+#: apply.c:5011
msgid "mark new files with `git add --intent-to-add`"
msgstr "đánh dấu các tập tin mới với “git add --intent-to-add”"
-#: apply.c:4993
+#: apply.c:5013
msgid "apply a patch without touching the working tree"
msgstr "áp dụng một miếng vá mà không động chạm đến cây làm việc"
-#: apply.c:4995
+#: apply.c:5015
msgid "accept a patch that touches outside the working area"
msgstr "chấp nhận một miếng vá mà không động chạm đến cây làm việc"
-#: apply.c:4998
+#: apply.c:5018
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr ""
"đồng thời áp dụng miếng vá (dùng với tùy chọn --stat/--summary/--check)"
-#: apply.c:5000
+#: apply.c:5020
msgid "attempt three-way merge if a patch does not apply"
msgstr "thử hòa trộn kiểu three-way nếu việc vá không thể thực hiện được"
-#: apply.c:5002
+#: apply.c:5022
msgid "build a temporary index based on embedded index information"
msgstr ""
"xây dựng bảng mục lục tạm thời trên cơ sở thông tin bảng mục lục được nhúng"
-#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540
msgid "paths are separated with NUL character"
msgstr "các đường dẫn bị ngăn cách bởi ký tự NULL"
-#: apply.c:5007
+#: apply.c:5027
msgid "ensure at least <n> lines of context match"
msgstr "đảm bảo rằng có ít nhất <n> dòng ngữ cảnh khớp"
-#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98
+#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98
#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3457 builtin/rebase.c:1508
+#: builtin/pack-objects.c:3577 builtin/rebase.c:1352
msgid "action"
msgstr "hành động"
-#: apply.c:5009
+#: apply.c:5029
msgid "detect new or modified lines that have whitespace errors"
msgstr "tìm thấy một dòng mới hoặc bị sửa đổi mà nó có lỗi do khoảng trắng"
-#: apply.c:5012 apply.c:5015
+#: apply.c:5032 apply.c:5035
msgid "ignore changes in whitespace when finding context"
msgstr "lờ đi sự thay đổi do khoảng trắng gây ra khi tìm ngữ cảnh"
-#: apply.c:5018
+#: apply.c:5038
msgid "apply the patch in reverse"
msgstr "áp dụng miếng vá theo chiều ngược"
-#: apply.c:5020
+#: apply.c:5040
msgid "don't expect at least one line of context"
msgstr "đừng hy vọng có ít nhất một dòng ngữ cảnh"
-#: apply.c:5022
+#: apply.c:5042
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "để lại khối dữ liệu bị từ chối trong các tập tin *.rej tương ứng"
-#: apply.c:5024
+#: apply.c:5044
msgid "allow overlapping hunks"
msgstr "cho phép chồng khối nhớ"
-#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22
-#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774
-#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22
+#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757
+#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "chi tiết"
-#: apply.c:5027
+#: apply.c:5047
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr ""
"đã dò tìm thấy dung sai không chính xác thiếu dòng mới tại cuối tập tin"
-#: apply.c:5030
+#: apply.c:5050
msgid "do not trust the line counts in the hunk headers"
msgstr "không tin số lượng dòng trong phần đầu khối dữ liệu"
-#: apply.c:5032 builtin/am.c:2248
+#: apply.c:5052 builtin/am.c:2254
msgid "root"
msgstr "gốc"
-#: apply.c:5033
+#: apply.c:5053
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:450
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr "không thể bắt đầu bộ lọc “%s”"
+
+#: archive-tar.c:453
+msgid "unable to redirect descriptor"
+msgstr "không thể chuyển hướng mô tả"
+
+#: archive-tar.c:460
+#, 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>…]"
@@ -1460,183 +1550,156 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <kho> [--exec <lệnh>] --list"
-#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
-#, 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
-#, c-format
-msgid "no such ref: %.*s"
-msgstr "không có tham chiếu nào như thế: %.*s"
-
-#: archive.c:401
-#, 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
-#, c-format
-msgid "not a tree object: %s"
-msgstr "không phải là đối tượng cây: “%s”"
-
-#: archive.c:426
-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
-msgid "fmt"
-msgstr "định_dạng"
-
-#: archive.c:457
-msgid "archive format"
-msgstr "định dạng lưu trữ"
-
-#: archive.c:458 builtin/log.c:1653
-msgid "prefix"
-msgstr "tiền_tố"
-
-#: archive.c:459
-msgid "prepend prefix to each pathname in the archive"
-msgstr "nối thêm tiền tố vào từng đường dẫn tập tin trong kho lưu"
-
-#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
-#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
-#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887
-#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
-#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
-#: parse-options.h:190
-msgid "file"
-msgstr "tập_tin"
-
-#: archive.c:461 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
-msgid "read .gitattributes in working directory"
-msgstr "đọc .gitattributes trong thư mục làm việc"
-
-#: archive.c:464
-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
-msgid "store only"
-msgstr "chỉ lưu (không nén)"
-
-#: archive.c:466
-msgid "compress faster"
-msgstr "nén nhanh hơn"
-
-#: archive.c:474
-msgid "compress better"
-msgstr "nén nhỏ hơn"
-
-#: archive.c:477
-msgid "list supported archive formats"
-msgstr "liệt kê các kiểu nén được hỗ trợ"
-
-#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
-#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
-msgid "repo"
-msgstr "kho"
-
-#: archive.c:480 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:715
-#: builtin/notes.c:498
-msgid "command"
-msgstr "lệnh"
-
-#: archive.c:482 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
-msgid "Unexpected option --remote"
-msgstr "Gặp tùy chọn không cần --remote"
-
-#: archive.c:491
-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
-msgid "Unexpected option --output"
-msgstr "Gặp tùy chọn không cần --output"
-
-#: archive.c:515
-#, c-format
-msgid "Unknown archive format '%s'"
-msgstr "Không hiểu định dạng “%s”"
-
-#: archive.c:522
-#, 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:351
-#, c-format
-msgid "cannot stream blob %s"
-msgstr "không thể stream blob “%s”"
-
-#: archive-tar.c:266 archive-zip.c:369
-#, c-format
-msgid "unsupported file mode: 0%o (SHA1: %s)"
-msgstr "chế độ tập tin lục không được hỗ trợ: 0%o (SHA1: %s)"
-
-#: archive-tar.c:293 archive-zip.c:359
+#: archive.c:192
#, c-format
msgid "cannot read %s"
msgstr "không thể đọc %s"
-#: archive-tar.c:465
+#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894
+#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786
+#: builtin/merge.c:1139
#, c-format
-msgid "unable to start '%s' filter"
-msgstr "không thể bắt đầu bộ lọc “%s”"
+msgid "could not read '%s'"
+msgstr "không thể đọc “%s”"
-#: archive-tar.c:468
-msgid "unable to redirect descriptor"
-msgstr "không thể chuyển hướng mô tả"
-
-#: archive-tar.c:475
+#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315
#, c-format
-msgid "'%s' filter reported error"
-msgstr "bộ lọc “%s” đã báo cáo lỗi"
+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-zip.c:319
+#: archive.c:454
#, c-format
-msgid "path is not valid UTF-8: %s"
-msgstr "đường dẫn không hợp lệ UTF-8: %s"
+msgid "no such ref: %.*s"
+msgstr "không có tham chiếu nào như thế: %.*s"
-#: archive-zip.c:323
+#: archive.c:460
#, c-format
-msgid "path too long (%d chars, SHA1: %s): %s"
-msgstr "đường dẫn quá dài (%d ký tự, SHA1: %s): %s"
+msgid "not a valid object name: %s"
+msgstr "không phải là tên đối tượng hợp lệ: “%s”"
-#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
+#: archive.c:473
#, c-format
-msgid "deflate error (%d)"
-msgstr "lỗi giải nén (%d)"
+msgid "not a tree object: %s"
+msgstr "không phải là đối tượng cây: “%s”"
-#: archive-zip.c:615
+#: 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:526
#, 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>"
+msgid "File not found: %s"
+msgstr "Không tìm thấy tập tin: %s"
-#: attr.c:212
+#: 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:555
+msgid "fmt"
+msgstr "định_dạng"
+
+#: archive.c:555
+msgid "archive format"
+msgstr "định dạng lưu trữ"
+
+#: archive.c:556 builtin/log.c:1764
+msgid "prefix"
+msgstr "tiền_tố"
+
+#: archive.c:557
+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:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888
+#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
+#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
+#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105
+#: builtin/ls-files.c:576 builtin/ls-files.c:579 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:559
+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:562 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:564
+msgid "read .gitattributes in working directory"
+msgstr "đọc .gitattributes trong thư mục làm việc"
+
+#: archive.c:565
+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:567
+msgid "set compression level"
+msgstr "đặt mức nén"
+
+#: archive.c:570
+msgid "list supported archive formats"
+msgstr "liệt kê các kiểu nén được hỗ trợ"
+
+#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117
+#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
+msgid "repo"
+msgstr "kho"
+
+#: archive.c:573 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:574 builtin/archive.c:93 builtin/difftool.c:714
+#: builtin/notes.c:498
+msgid "command"
+msgstr "lệnh"
+
+#: archive.c:575 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:582
+msgid "Unexpected option --remote"
+msgstr "Gặp tùy chọn không cần --remote"
+
+#: archive.c:584
+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:586
+msgid "Unexpected option --output"
+msgstr "Gặp tùy chọn không cần --output"
+
+#: archive.c:588
+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:610
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "Không hiểu định dạng “%s”"
+
+#: archive.c:619
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "Tham số không được hỗ trợ cho định dạng “%s”: -%d"
+
+#: attr.c:202
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s không phải tên thuộc tính hợp lệ"
-#: attr.c:369
+#: attr.c:359
#, c-format
msgid "%s not allowed: %s:%d"
msgstr "%s không được phép: %s:%d"
-#: attr.c:409
+#: attr.c:399
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -1644,22 +1707,22 @@
"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:489
#, 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:699
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Chúng tôi không bisect thêm nữa!\n"
-#: bisect.c:745
+#: bisect.c:766
#, c-format
msgid "Not a valid commit name %s"
msgstr "Không phải tên đối tượng commit %s hợp lệ"
-#: bisect.c:770
+#: bisect.c:791
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1668,7 +1731,7 @@
"Hòa trộn trên %s là sai.\n"
"Điều đó có nghĩa là lỗi đã được sửa chữa giữa %s và [%s].\n"
-#: bisect.c:775
+#: bisect.c:796
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1677,7 +1740,7 @@
"Hòa trộn trên %s là mới.\n"
"Gần như chắc chắn là có thay đổi giữa %s và [%s].\n"
-#: bisect.c:780
+#: bisect.c:801
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1686,7 +1749,7 @@
"Hòa trộn trên %s là %s.\n"
"Điều đó có nghĩa là lần chuyển giao “%s” đầu tiên là giữa %s và [%s].\n"
-#: bisect.c:788
+#: bisect.c:809
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1697,7 +1760,7 @@
"git bisect không thể làm việc đúng đắn trong trường hợp này.\n"
"Liệu có phải bạn nhầm lẫn các điểm %s và %s không?\n"
-#: bisect.c:801
+#: bisect.c:822
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1709,45 +1772,45 @@
"%s.\n"
"Chúng tôi vẫn cứ tiếp tục."
-#: bisect.c:840
+#: bisect.c:861
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Bisecting: nền hòa trộn cần phải được kiểm tra\n"
-#: bisect.c:890
+#: bisect.c:911
#, c-format
msgid "a %s revision is needed"
msgstr "cần một điểm xét duyệt %s"
-#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287
#, c-format
msgid "could not create file '%s'"
msgstr "không thể tạo tập tin “%s”"
-#: bisect.c:966 builtin/merge.c:149
+#: bisect.c:987 builtin/merge.c:153
#, c-format
msgid "could not read file '%s'"
msgstr "không thể đọc tập tin “%s”"
-#: bisect.c:997
+#: bisect.c:1027
msgid "reading bisect refs failed"
msgstr "việc đọc tham chiếu bisect gặp lỗi"
-#: bisect.c:1019
+#: bisect.c:1057
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s là cả %s và %s\n"
-#: bisect.c:1028
+#: bisect.c:1066
#, c-format
msgid ""
"No testable commit found.\n"
-"Maybe you started with bad path parameters?\n"
+"Maybe you started with bad path arguments?\n"
msgstr ""
"Không tìm thấy lần chuyển giao kiểm tra được nào.\n"
"Có lẽ bạn bắt đầu với các tham số đường dẫn sai?\n"
-#: bisect.c:1057
+#: bisect.c:1095
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1756,46 +1819,46 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1063
+#: bisect.c:1101
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[0] "Bisecting: còn %d điểm xét duyệt để kiểm sau %s này\n"
-#: blame.c:2700
+#: blame.c:2777
msgid "--contents and --reverse do not blend well."
msgstr "tùy chọn--contents và --reverse không được trộn vào nhau."
-#: blame.c:2714
+#: blame.c:2791
msgid "cannot use --contents with final commit object name"
msgstr "không thể dùng --contents với tên đối tượng chuyển giao cuối cùng"
-#: blame.c:2735
+#: blame.c:2812
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
"cùng sử dụng --reverse và --first-parent cần chỉ định lần chuyển giao cuối"
-#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006
-#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388
-#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215
-#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290
-#: builtin/shortlog.c:192
+#: blame.c:2821 bundle.c:213 ref-filter.c:2206 remote.c:2041 sequencer.c:2146
+#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411
+#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335
+#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410
+#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr "cài đặt việc di chuyển qua các điểm xét duyệt gặp lỗi"
-#: blame.c:2762
+#: blame.c:2839
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr ""
"cùng sử dụng --reverse --first-parent yêu cầu vùng cùng với chuỗi cha-mẹ-đầu-"
"tiên"
-#: blame.c:2773
+#: blame.c:2850
#, c-format
msgid "no such path %s in %s"
msgstr "không có đường dẫn %s trong “%s”"
-#: blame.c:2784
+#: blame.c:2861
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "không thể đọc blob %s cho đường dẫn “%s”"
@@ -1931,112 +1994,419 @@
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 "'%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 "unrecognized bundle hash algorithm: %s"
+msgstr "không hiểu thuật toán băm dữ liệu bundle: %s"
-#: bundle.c:64
+#: bundle.c:45
+#, c-format
+msgid "unknown capability '%s'"
+msgstr "không hiểu dung lượng “%s”"
+
+#: 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:2258 sequencer.c:3016
-#: builtin/commit.c:815
+#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184
+#: 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:273
+#: bundle.c:319
msgid "unable to dup bundle descriptor"
msgstr "không thể nhân đôi bộ mô tả bundle"
-#: bundle.c:280
+#: bundle.c:326
msgid "Could not spawn pack-objects"
msgstr "Không thể sản sinh đối tượng gói"
-#: bundle.c:291
+#: bundle.c:337
msgid "pack-objects died"
msgstr "đối tượng gói đã chết"
-#: bundle.c:333
-msgid "rev-list died"
-msgstr "rev-list đã chết"
-
-#: bundle.c:382
+#: bundle.c:386
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "th.chiếu “%s” bị loại trừ bởi các tùy chọn rev-list"
-#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306
+#: bundle.c:490
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr "phiên bản bundle %d không được hỗ trợ"
+
+#: bundle.c:492
+#, 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:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396
#, c-format
msgid "unrecognized argument: %s"
msgstr "đối số không được thừa nhận: %s"
-#: bundle.c:469
+#: bundle.c:539
msgid "Refusing to create empty bundle."
msgstr "Từ chối tạo một bó dữ liệu trống rỗng."
-#: bundle.c:479
+#: bundle.c:549
#, c-format
msgid "cannot create '%s'"
msgstr "không thể tạo “%s”"
-#: bundle.c:504
+#: bundle.c:574
msgid "index-pack died"
msgstr "mục lục gói đã chết"
+#: chunk-format.c:113
+msgid "terminating chunk id appears earlier than expected"
+msgstr "mã mảnh kết thúc sớm hơn bình thường"
+
+#: chunk-format.c:122
+#, c-format
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr "bù mảnh không đúng cách %<PRIx64> và %<PRIx64>"
+
+#: chunk-format.c:129
+#, c-format
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr "tìm thấy ID của mảnh bị trùng lặp %<PRIx32>"
+
+#: chunk-format.c:143
+#, c-format
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr "mảnh cuối cùng có id không bằng không %<PRIx32>"
+
#: color.c:329
#, c-format
msgid "invalid color value: %.*s"
msgstr "giá trị màu không hợp lệ: %.*s"
-#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403
-#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457
+#: commit-graph.c:197 midx.c:46
+msgid "invalid hash version"
+msgstr "phiên bản băm không hợp lệ"
+
+#: commit-graph.c:255
+msgid "commit-graph file is too small"
+msgstr "tập tin đồ-thị-các-lần-chuyển-giao quá nhỏ"
+
+#: commit-graph.c:348
+#, 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:355
+#, 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:362
+#, 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:379
+#, 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:472
+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:482
+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:530
+#, 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:554
+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:735 commit-graph.c:772
+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:756
+#, 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:789
+msgid "commit-graph requires overflow generation data but has none"
+msgstr "commit-graph yêu cầu dữ liệu tạo tràn nhưng không có"
+
+#: commit-graph.c:1065 builtin/am.c:1292
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "không thể phân tích lần chuyển giao “%s”"
+
+#: commit-graph.c:1327 builtin/pack-objects.c:2872
+#, 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:1358
+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:1375
+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:1395
+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:1414
+msgid "Computing commit graph topological levels"
+msgstr "Đang tính mức hình học tô-pô tạo đồ thị các lần chuyển giao"
+
+#: commit-graph.c:1467
+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:1548
+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:1625
+msgid "Collecting referenced commits"
+msgstr "Đang sưu tập các lần chuyển giao được tham chiếu"
+
+#: commit-graph.c:1650
+#, 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:1663
+#, c-format
+msgid "error adding pack %s"
+msgstr "gặp lỗi thêm gói %s"
+
+#: commit-graph.c:1667
+#, c-format
+msgid "error opening index for %s"
+msgstr "gặp lỗi khi mở mục lục cho “%s”"
+
+#: commit-graph.c:1704
+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:1722
+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:1771
+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:1802 midx.c:794
+#, 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:1815
+msgid "unable to create temporary graph layer"
+msgstr "không thể tạo lớp sơ đồ tạm thời"
+
+#: commit-graph.c:1820
+#, c-format
+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:1879
+#, 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:1915
+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:1931
+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:1951
+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:2084
+msgid "Scanning merged commits"
+msgstr "Đang quét các lần chuyển giao đã hòa trộn"
+
+#: commit-graph.c:2128
+msgid "Merging commit-graph"
+msgstr "Đang hòa trộn đồ-thị-các-lần-chuyển-giao"
+
+#: commit-graph.c:2235
+msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
+msgstr ""
+"cố gắng để ghi một đồ thị các lần chuyển giao, nhưng “core.commitGraph” bị "
+"vô hiệu hóa"
+
+#: commit-graph.c:2342
+msgid "too many commits to write graph"
+msgstr "có quá nhiều lần chuyển giao để ghi đồ thị"
+
+#: commit-graph.c:2440
+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:2450
+#, 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:2460 commit-graph.c:2475
+#, 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:2467
+#, 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:2485
+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:2500
+#, 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:2507
+#, 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:2517
+#, 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:2526
+#, 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:2540
+#, 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:2545
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+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:2549
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+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:2566
+#, c-format
+msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
+msgstr ""
+"tạo đồ-thị-các-lần-chuyển-giao cho lần chuyển giao %s là %<PRIuMAX> < "
+"%<PRIuMAX>"
+
+#: commit-graph.c:2572
+#, 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:2887 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2018 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:53
+#: 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:193
+#: commit.c:194
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -2056,28 +2426,28 @@
"Tắt lời nhắn này bằng cách chạy\n"
"\"git config advice.graftFileDeprecated false\""
-#: commit.c:1153
+#: commit.c:1223
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"Lần chuyển giao %s có một chữ ký GPG không đáng tin, được cho là bởi %s."
-#: commit.c:1157
+#: commit.c:1227
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "Lần chuyển giao %s có một chữ ký GPG sai, được cho là bởi %s."
-#: commit.c:1160
+#: commit.c:1230
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Lần chuyển giao %s không có chữ ký GPG."
-#: commit.c:1163
+#: commit.c:1233
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Lần chuyển giao %s có một chữ ký GPG tốt bởi %s\n"
-#: commit.c:1417
+#: commit.c:1487
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
@@ -2087,288 +2457,11 @@
"Bạn có lẽ muốn tu bổ nó sau khi sửa lời chú thích, hoặc là đặt biến\n"
"cấu hình i18n.commitencoding thành bảng mã mà dự án của bạn muốn dùng.\n"
-#: commit-graph.c:122
-msgid "commit-graph file is too small"
-msgstr "tập tin đồ-thị-các-lần-chuyển-giao quá nhỏ"
-
-#: commit-graph.c:189
-#, c-format
-msgid "commit-graph signature %X does not match signature %X"
-msgstr "chữ ký đồ-thị-các-lần-chuyển-giao %X không khớp chữ ký %X"
-
-#: commit-graph.c:196
-#, c-format
-msgid "commit-graph version %X does not match version %X"
-msgstr "phiên bản đồ-thị-các-lần-chuyển-giao %X không khớp phiên bản %X"
-
-#: commit-graph.c:203
-#, c-format
-msgid "commit-graph hash version %X does not match version %X"
-msgstr "phiên bản đồ-thị-các-lần-chuyển-giao %X không khớp phiên bản %X"
-
-#: commit-graph.c:226
-msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
-msgstr ""
-"bảng tìm kiếm mảnh đồ-thị-các-lần-chuyển-giao còn thiếu; tập tin có thể sẽ "
-"không hoàn thiện"
-
-#: commit-graph.c:237
-#, c-format
-msgid "commit-graph improper chunk offset %08x%08x"
-msgstr "bù mảnh đồ-thị-các-lần-chuyển-giao không đúng chỗ %08x%08x"
-
-#: commit-graph.c:280
-#, c-format
-msgid "commit-graph chunk id %08x appears multiple times"
-msgstr "mã mảnh đồ-thị-các-lần-chuyển-giao %08x xuất hiện nhiều lần"
-
-#: commit-graph.c:343
-msgid "commit-graph has no base graphs chunk"
-msgstr "đồ-thị-các-lần-chuyển-giao có không có mảnh các đồ họa cơ sở"
-
-#: commit-graph.c:353
-msgid "commit-graph chain does not match"
-msgstr "móc xích đồ-thị-các-lần-chuyển-giao không khớp"
-
-#: commit-graph.c:401
-#, c-format
-msgid "invalid commit-graph chain: line '%s' not a hash"
-msgstr ""
-"móc xích đồ-thị-các-lần-chuyển-giao không hợp lệ: dòng '%s' không phải là "
-"một mã băm"
-
-#: commit-graph.c:425
-msgid "unable to find all commit-graph files"
-msgstr "không thể tìm thấy tất cả các tập tin đồ-thị-các-lần-chuyển-giao"
-
-#: commit-graph.c:558 commit-graph.c:618
-msgid "invalid commit position. commit-graph is likely corrupt"
-msgstr ""
-"vị trí lần chuyển giao không hợp lệ. đồ-thị-các-lần-chuyển-giao có vẻ như đã "
-"bị hỏng"
-
-#: commit-graph.c:579
-#, c-format
-msgid "could not find commit %s"
-msgstr "không thể tìm thấy lần chuyển giao %s"
-
-#: commit-graph.c:852 builtin/am.c:1292
-#, c-format
-msgid "unable to parse commit %s"
-msgstr "không thể phân tích lần chuyển giao “%s”"
-
-#: commit-graph.c:1011 builtin/pack-objects.c:2782
-#, c-format
-msgid "unable to get type of object %s"
-msgstr "không thể lấy kiểu của đối tượng “%s”"
-
-#: commit-graph.c:1043
-msgid "Loading known commits in commit graph"
-msgstr "Đang tải các lần chuyển giao chưa biết trong đồ thị lần chuyển giao"
-
-#: commit-graph.c:1060
-msgid "Expanding reachable commits in commit graph"
-msgstr ""
-"Mở rộng các lần chuyển giao có thể tiếp cận được trong trong đồ thị lần "
-"chuyển giao"
-
-#: commit-graph.c:1079
-msgid "Clearing commit marks in commit graph"
-msgstr "Đang dọn dẹp các đánh dấu lần chuyển giao trong đồ thị lần chuyển giao"
-
-#: commit-graph.c:1098
-msgid "Computing commit graph generation numbers"
-msgstr "Đang tính toán số tạo đồ thị các lần chuyển giao"
-
-#: commit-graph.c:1173
-#, c-format
-msgid "Finding commits for commit graph in %d pack"
-msgid_plural "Finding commits for commit graph in %d packs"
-msgstr[0] ""
-"Đang tìm các lần chuyển giao cho đồ thị lần chuyển giao trong %d gói"
-
-#: commit-graph.c:1186
-#, c-format
-msgid "error adding pack %s"
-msgstr "gặp lỗi thêm gói %s"
-
-#: commit-graph.c:1190
-#, c-format
-msgid "error opening index for %s"
-msgstr "gặp lỗi khi mở mục lục cho “%s”"
-
-#: commit-graph.c:1214
-#, c-format
-msgid "Finding commits for commit graph from %d ref"
-msgid_plural "Finding commits for commit graph from %d refs"
-msgstr[0] ""
-"Đang tìm các lần chuyển giao cho đồ thị lần chuyển giao từ %d tham chiếu"
-
-#: commit-graph.c:1234
-#, c-format
-msgid "invalid commit object id: %s"
-msgstr "mã số đối tượng lần chuyển giao không hợp lệ: %s"
-
-#: commit-graph.c:1249
-msgid "Finding commits for commit graph among packed objects"
-msgstr ""
-"Đang tìm các lần chuyển giao cho đồ thị lần chuyển giao trong số các đối "
-"tượng đã đóng gói"
-
-#: commit-graph.c:1264
-msgid "Counting distinct commits in commit graph"
-msgstr "Đang đếm các lần chuyển giao khác nhau trong đồ thị lần chuyển giao"
-
-#: commit-graph.c:1294
-msgid "Finding extra edges in commit graph"
-msgstr "Đang tìm các cạnh mở tộng trong đồ thị lần chuyển giao"
-
-#: commit-graph.c:1340
-msgid "failed to write correct number of base graph ids"
-msgstr "gặp lỗi khi ghi số đúng của mã đồ họa cơ sở"
-
-#: commit-graph.c:1373 midx.c:814
-#, c-format
-msgid "unable to create leading directories of %s"
-msgstr "không thể tạo các thư mục dẫn đầu của “%s”"
-
-#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248
-#, c-format
-msgid "unable to create '%s'"
-msgstr "không thể tạo “%s”"
-
-#: commit-graph.c:1445
-#, c-format
-msgid "Writing out commit graph in %d pass"
-msgid_plural "Writing out commit graph in %d passes"
-msgstr[0] "Đang ghi ra đồ thị các lần chuyển giao trong lần %d"
-
-#: commit-graph.c:1486
-msgid "unable to open commit-graph chain file"
-msgstr "không thể mở tập tin mắt xích đồ thị chuyển giao"
-
-#: commit-graph.c:1498
-msgid "failed to rename base commit-graph file"
-msgstr "gặp lỗi khi đổi tên tập tin đồ-thị-các-lần-chuyển-giao"
-
-#: commit-graph.c:1518
-msgid "failed to rename temporary commit-graph file"
-msgstr "gặp lỗi khi đổi tên tập tin đồ-thị-các-lần-chuyển-giao tạm thời"
-
-#: commit-graph.c:1631
-msgid "Scanning merged commits"
-msgstr "Đang quét các lần chuyển giao đã hòa trộn"
-
-#: commit-graph.c:1642
-#, c-format
-msgid "unexpected duplicate commit id %s"
-msgstr "gặp mã số tích lần chuyển giao bị trùng lặp “%s”"
-
-#: commit-graph.c:1665
-msgid "Merging commit-graph"
-msgstr "Đang hòa trộn đồ-thị-các-lần-chuyển-giao"
-
-#: commit-graph.c:1844
-#, 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
-msgid "too many commits to write graph"
-msgstr "có quá nhiều lần chuyển giao để ghi đồ thị"
-
-#: commit-graph.c:1944
-msgid "the commit-graph file has incorrect checksum and is likely corrupt"
-msgstr ""
-"tập tin đồ-thị-các-lần-chuyển-giao có tổng kiểm không đúng và có vẻ như là "
-"đã hỏng"
-
-#: commit-graph.c:1954
-#, c-format
-msgid "commit-graph has incorrect OID order: %s then %s"
-msgstr "đồ-thị-các-lần-chuyển-giao có thứ tự OID không đúng: %s sau %s"
-
-#: commit-graph.c:1964 commit-graph.c:1979
-#, c-format
-msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
-msgstr ""
-"đồ-thị-các-lần-chuyển-giao có giá trị fanout không đúng: fanout[%d] = %u != "
-"%u"
-
-#: commit-graph.c:1971
-#, 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
-msgid "Verifying commits in commit graph"
-msgstr "Đang thẩm tra các lần chuyển giao trong đồ thị lần chuyển giao"
-
-#: commit-graph.c:2003
-#, c-format
-msgid "failed to parse commit %s from object database for commit-graph"
-msgstr ""
-"gặp lỗi khi phân tích lần chuyển giao %s từ cơ sở dữ liệu đối tượng cho đồ "
-"thị lần chuyển giao"
-
-#: commit-graph.c:2010
-#, c-format
-msgid "root tree OID for commit %s in commit-graph is %s != %s"
-msgstr ""
-"OID cây gốc cho lần chuyển giao %s trong đồ-thị-các-lần-chuyển-giao là %s != "
-"%s"
-
-#: commit-graph.c:2020
-#, c-format
-msgid "commit-graph parent list for commit %s is too long"
-msgstr ""
-"danh sách cha mẹ đồ-thị-các-lần-chuyển-giao cho lần chuyển giao %s là quá dài"
-
-#: commit-graph.c:2029
-#, c-format
-msgid "commit-graph parent for %s is %s != %s"
-msgstr "cha mẹ đồ-thị-các-lần-chuyển-giao cho %s là %s != %s"
-
-#: commit-graph.c:2042
-#, c-format
-msgid "commit-graph parent list for commit %s terminates early"
-msgstr ""
-"danh sách cha mẹ đồ-thị-các-lần-chuyển-giao cho lần chuyển giao %s bị chấm "
-"dứt quá sớm"
-
-#: commit-graph.c:2047
-#, c-format
-msgid ""
-"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
-msgstr ""
-"đồ-thị-các-lần-chuyển-giao có con số không lần tạo cho lần chuyển giao %s, "
-"nhưng không phải số không ở chỗ khác"
-
-#: commit-graph.c:2051
-#, c-format
-msgid ""
-"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
-msgstr ""
-"đồ-thị-các-lần-chuyển-giao có con số không phải không lần tạo cho lần chuyển "
-"giao %s, nhưng số không ở chỗ khác"
-
-#: commit-graph.c:2066
-#, c-format
-msgid "commit-graph generation for commit %s is %u != %u"
-msgstr "tạo đồ-thị-các-lần-chuyển-giao cho lần chuyển giao %s là %u != %u"
-
-#: commit-graph.c:2072
-#, 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>"
-
#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "hết bộ nhớ"
-#: config.c:124
+#: config.c:126
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2383,291 +2476,335 @@
"\t%s\n"
"Nguyên nhân có thể là gồm quẩn vòng."
-#: config.c:140
+#: config.c:142
#, 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:153
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:199
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:396
+#, c-format
+msgid "invalid config format: %s"
+msgstr "định dạng cấu hình không hợp lệ: %s"
+
+#: config.c:400
+#, c-format
+msgid "missing environment variable name for configuration '%.*s'"
+msgstr "thiếu tên biến môi trường cho cấu hình '%.*s'"
+
+#: config.c:405
+#, c-format
+msgid "missing environment variable '%s' for configuration '%.*s'"
+msgstr "thiếu biến môi trường '%s' cho cấu hình '%.*s'"
+
+#: config.c:442
#, 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:448
#, 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:2444
+#: config.c:472 sequencer.c:2588
#, c-format
msgid "invalid key: %s"
msgstr "khóa không đúng: %s"
-#: config.c:412
+#: config.c:478
#, 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:511
+msgid "empty config key"
+msgstr "khóa cấu hình trống rỗng"
+
+#: config.c:529 config.c:541
#, 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:555 config.c:572 config.c:579 config.c:588
#, c-format
msgid "bogus format in %s"
msgstr "định dạng không có thực trong %s"
-#: config.c:821
+#: config.c:622
+#, c-format
+msgid "bogus count in %s"
+msgstr "số lượng không có thực trong %s"
+
+#: config.c:626
+#, c-format
+msgid "too many entries in %s"
+msgstr "quá nhiều mục tin trong %s"
+
+#: config.c:636
+#, c-format
+msgid "missing config key %s"
+msgstr "thiếu khóa cấu hình “%s”"
+
+#: config.c:644
+#, c-format
+msgid "missing config value %s"
+msgstr "thiếu giá trị cấu hình “%s”"
+
+#: config.c:995
#, 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:999
#, 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:1003
#, 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:1007
#, 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:1011
#, 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:1015
#, 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:1152
msgid "out of range"
msgstr "nằm ngoài phạm vi"
-#: config.c:978
+#: config.c:1152
msgid "invalid unit"
msgstr "đơn vị không hợp lệ"
-#: config.c:979
+#: config.c:1153
#, 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:1163
#, 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:1166
#, 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:1169
#, 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:1172
#, 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:1175
#, 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:1178
#, 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:1194
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr "sai giá trị kiểu lô-gíc của cấu hình “%s” cho “%s”"
+
+#: config.c:1289
#, 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:1298
#, 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:1391
#, 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:1405 config.c:1416
#, c-format
msgid "bad zlib compression level %d"
msgstr "mức nén zlib %d là sai"
-#: config.c:1325
+#: config.c:1508
msgid "core.commentChar should only be one character"
msgstr "core.commentChar chỉ được có một ký tự"
-#: config.c:1358
+#: config.c:1541
#, 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:1613
#, c-format
msgid "malformed value for %s"
msgstr "giá trị cho %s sai dạng"
-#: config.c:1456
+#: config.c:1639
#, c-format
msgid "malformed value for %s: %s"
msgstr "giá trị cho %s sai dạng: %s"
-#: config.c:1457
+#: config.c:1640
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "phải là một trong số nothing, matching, simple, upstream hay current"
-#: config.c:1518 builtin/pack-objects.c:3541
+#: config.c:1701 builtin/pack-objects.c:3666
#, 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:1823
#, 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:1826
#, 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:1843
#, 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:1873
#, c-format
msgid "failed to parse %s"
msgstr "gặp lỗi khi phân tích cú pháp %s"
-#: config.c:1743
+#: config.c:1927
msgid "unable to parse command-line config"
msgstr "không thể phân tích cấu hình dòng lệnh"
-#: config.c:2097
+#: config.c:2290
msgid "unknown error occurred while reading the configuration files"
msgstr "đã có lỗi chưa biết xảy ra trong khi đọc các tập tin cấu hình"
-#: config.c:2267
+#: config.c:2464
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s không hợp lệ: “%s”"
-#: config.c:2312
+#: config.c:2509
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "giá trị splitIndex.maxPercentChange “%d” phải nằm giữa 0 và 100"
-#: config.c:2358
+#: config.c:2555
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "không thể phân tích “%s” từ cấu hình dòng lệnh"
-#: config.c:2360
+#: config.c:2557
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "sai biến cấu hình “%s” trong tập tin “%s” tại dòng %d"
-#: config.c:2441
+#: config.c:2641
#, c-format
msgid "invalid section name '%s'"
msgstr "tên của phần không hợp lệ “%s”"
-#: config.c:2473
+#: config.c:2673
#, c-format
msgid "%s has multiple values"
msgstr "%s có đa giá trị"
-#: config.c:2502
+#: config.c:2702
#, c-format
msgid "failed to write new configuration file %s"
msgstr "gặp lỗi khi ghi tập tin cấu hình “%s”"
-#: config.c:2754 config.c:3078
+#: config.c:2954 config.c:3280
#, c-format
msgid "could not lock config file %s"
msgstr "không thể khóa tập tin cấu hình %s"
-#: config.c:2765
+#: config.c:2965
#, c-format
msgid "opening %s"
msgstr "đang mở “%s”"
-#: config.c:2800 builtin/config.c:344
+#: config.c:3002 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "mẫu không hợp lệ: %s"
-#: config.c:2825
+#: config.c:3027
#, c-format
msgid "invalid config file %s"
msgstr "tập tin cấu hình “%s” không hợp lệ"
-#: config.c:2838 config.c:3091
+#: config.c:3040 config.c:3293
#, c-format
msgid "fstat on %s failed"
msgstr "fstat trên %s gặp lỗi"
-#: config.c:2849
+#: config.c:3051
#, c-format
msgid "unable to mmap '%s'"
msgstr "không thể mmap “%s”"
-#: config.c:2858 config.c:3096
+#: config.c:3060 config.c:3298
#, c-format
msgid "chmod on %s failed"
msgstr "chmod trên %s gặp lỗi"
-#: config.c:2943 config.c:3193
+#: config.c:3145 config.c:3395
#, c-format
msgid "could not write config file %s"
msgstr "không thể ghi tập tin cấu hình “%s”"
-#: config.c:2977
+#: config.c:3179
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "không thể đặt “%s” thành “%s”"
-#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
+#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
#, c-format
msgid "could not unset '%s'"
msgstr "không thể thôi đặt “%s”"
-#: config.c:3069
+#: config.c:3271
#, c-format
msgid "invalid section name: %s"
msgstr "tên của phần không hợp lệ: %s"
-#: config.c:3236
+#: config.c:3438
#, c-format
msgid "missing value for '%s'"
msgstr "thiếu giá trị cho cho “%s”"
@@ -2693,72 +2830,81 @@
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:497
+#, 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:526
#, 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:530
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:533
+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:666
#, c-format
msgid "protocol '%s' is not supported"
msgstr "giao thức “%s” chưa được hỗ trợ"
-#: connect.c:595
+#: connect.c:717
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:757 connect.c:820
#, c-format
msgid "Looking up %s ... "
msgstr "Đang tìm kiếm %s … "
-#: connect.c:639
+#: connect.c:761
#, 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:765 connect.c:836
#, c-format
msgid ""
"done.\n"
@@ -2767,7 +2913,7 @@
"xong.\n"
"Đang kết nối đến %s (cổng %s) … "
-#: connect.c:665 connect.c:742
+#: connect.c:787 connect.c:864
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -2777,73 +2923,77 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:671 connect.c:748
+#: connect.c:793 connect.c:870
msgid "done."
msgstr "hoàn tất."
-#: connect.c:702
+#: connect.c:824
#, c-format
msgid "unable to look up %s (%s)"
msgstr "không thể tìm thấy %s (%s)"
-#: connect.c:708
+#: connect.c:830
#, c-format
msgid "unknown port %s"
msgstr "không hiểu cổng %s"
-#: connect.c:845 connect.c:1175
+#: connect.c:967 connect.c:1299
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "đã khóa tên máy lạ “%s”"
-#: connect.c:847
+#: connect.c:969
#, c-format
msgid "strange port '%s' blocked"
msgstr "đã khóa cổng lạ “%s”"
-#: connect.c:857
+#: connect.c:979
#, c-format
msgid "cannot start proxy %s"
msgstr "không thể khởi chạy ủy nhiệm “%s”"
-#: connect.c:928
+#: connect.c:1050
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr "chưa chỉ định đường dẫn; xem'git help pull” để biết cú pháp url hợp lệ"
-#: connect.c:1123
+#: connect.c:1190
+msgid "newline is forbidden in git:// hosts and repo paths"
+msgstr "newline bị cấm trong các git:// máy chủ và đường dẫn repo"
+
+#: connect.c:1247
msgid "ssh variant 'simple' does not support -4"
msgstr "ssh biến thể “simple” không hỗ trợ -4"
-#: connect.c:1135
+#: connect.c:1259
msgid "ssh variant 'simple' does not support -6"
msgstr "ssh biến thể “simple” không hỗ trợ -6"
-#: connect.c:1152
+#: connect.c:1276
msgid "ssh variant 'simple' does not support setting port"
msgstr "ssh biến thể “simple” không hỗ trợ đặt cổng"
-#: connect.c:1264
+#: connect.c:1388
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "đã khóa tên đường dẫn lạ “%s”"
-#: connect.c:1311
+#: connect.c:1436
msgid "unable to fork"
msgstr "không thể rẽ nhánh tiến trình con"
-#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43
+#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45
msgid "Checking connectivity"
msgstr "Đang kiểm tra kết nối"
-#: connected.c:110
+#: connected.c:120
msgid "Could not run 'git rev-list'"
msgstr "Không thể chạy “git rev-list”"
-#: connected.c:130
+#: connected.c:144
msgid "failed write to rev-list"
msgstr "gặp lỗi khi ghi vào rev-list"
-#: connected.c:137
+#: 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"
@@ -2918,40 +3068,40 @@
msgid "encoding '%s' from %s to %s and back is not the same"
msgstr "mã hóa “%s” từ %s thành %s và ngược trở lại không phải là cùng"
-#: convert.c:668
+#: convert.c: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:688
+#: 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:695
+#: 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:730 convert.c:733
+#: 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:736 convert.c:791
+#: 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:839
+#: convert.c:837
msgid "unexpected filter type"
msgstr "gặp kiểu bộ lọc thừa"
-#: convert.c:850
+#: 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:924
+#: convert.c:940
#, c-format
msgid ""
"external filter '%s' is not available anymore although not all paths have "
@@ -2960,20 +3110,48 @@
"bộ lọc bên ngoài “%s” không sẵn sàng nữa mặc dù không phải tất cả các đường "
"dẫn đã được lọc"
-#: convert.c:1223
+#: convert.c: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:1411 convert.c:1445
+#: 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:1489
+#: convert.c:1508
#, c-format
msgid "%s: smudge filter %s failed"
msgstr "%s: smudge bộ lọc %s gặp lỗi"
+#: 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"
@@ -3058,14 +3236,30 @@
msgid "Marked %d islands, done.\n"
msgstr "Đã đánh dấu %d island, xong.\n"
-#: diffcore-order.c:24
+#: diff-merges.c:70
#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "gặp lỗi khi đọc tập-tin-thứ-tự “%s”"
+msgid "unknown value for --diff-merges: %s"
+msgstr "không hiểu giá trị cho --diff-merges: %s"
-#: diffcore-rename.c:543
-msgid "Performing inexact rename detection"
-msgstr "Đang thực hiện dò tìm đổi tên không chính xác"
+#: diff-lib.c:534
+msgid "--merge-base does not work with ranges"
+msgstr "--merge-base không hoạt động với phạm vi"
+
+#: diff-lib.c:536
+msgid "--merge-base only works with commits"
+msgstr "--merge-base chỉ hoạt động với các lần chuyển giao"
+
+#: diff-lib.c:553
+msgid "unable to get HEAD"
+msgstr "không thể lấy HEAD"
+
+#: diff-lib.c:560
+msgid "no merge base found"
+msgstr "không tìm thấy cơ sở để hòa trộn"
+
+#: diff-lib.c:562
+msgid "multiple merge bases found"
+msgstr "có nhiều cơ sở để hòa trộn"
#: diff-no-index.c:238
msgid "git diff --no-index [<options>] <path> <path>"
@@ -3079,17 +3273,17 @@
"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'"
@@ -3097,7 +3291,7 @@
"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', "
@@ -3107,7 +3301,7 @@
"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"
@@ -3115,12 +3309,12 @@
"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"
@@ -3129,35 +3323,35 @@
"Tìm thấy các lỗi trong biến cấu hình “diff.dirstat”:\n"
"%s"
-#: diff.c:4202
+#: diff.c:4276
#, c-format
msgid "external diff died, stopping at %s"
msgstr "phần mềm diff ở bên ngoài đã chết, dừng tại %s"
-#: diff.c:4547
+#: diff.c:4628
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check và -s loại từ lẫn nhau"
-#: diff.c:4550
+#: diff.c:4631
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "Các tùy chọn -G, -S, và --find-object loại từ lẫn nhau"
-#: diff.c:4628
+#: diff.c:4710
msgid "--follow requires exactly one pathspec"
msgstr "--follow cần chính xác một đặc tả đường dẫn"
-#: diff.c:4676
+#: diff.c:4758
#, c-format
msgid "invalid --stat value: %s"
msgstr "giá trị --stat không hợp lệ: “%s”"
-#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
-#: parse-options.c:197 parse-options.c:201
+#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306
+#: 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:4713
+#: diff.c:4795
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3166,42 +3360,42 @@
"Gặp lỗi khi phân tích đối số tùy chọn --dirstat/-X:\n"
"%s"
-#: diff.c:4798
+#: diff.c:4880
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "không hiểu lớp thay đổi “%c” trong --diff-filter=%s"
-#: diff.c:4822
+#: diff.c:4904
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "không hiểu giá trị sau ws-error-highlight=%.*s"
-#: diff.c:4836
+#: diff.c:4918
#, c-format
msgid "unable to resolve '%s'"
msgstr "không thể phân giải “%s”"
-#: diff.c:4886 diff.c:4892
+#: diff.c:4968 diff.c:4974
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s cần dạng <n>/<m>"
-#: diff.c:4904
+#: diff.c:4986
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s cần một ký tự, nhưng lại nhận được “%s”"
-#: diff.c:4925
+#: diff.c:5007
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "đối số --color-moved sai: %s"
-#: diff.c:4944
+#: diff.c:5026
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "chế độ “%s” không hợp lệ trong --color-moved-ws"
-#: diff.c:4984
+#: diff.c:5066
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
@@ -3209,150 +3403,155 @@
"tùy chọn diff-algorithm chấp nhận \"myers\", \"minimal\", \"patience\" và "
"\"histogram\""
-#: diff.c:5020 diff.c:5040
+#: diff.c:5102 diff.c:5122
#, c-format
msgid "invalid argument to %s"
msgstr "tham số cho %s không hợp lệ"
-#: diff.c:5178
+#: diff.c:5226
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr "đưa cho -I biểu thức chính quy không hợp lệ: “%s”"
+
+#: diff.c:5275
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "gặp lỗi khi phân tích đối số tùy chọn --submodule: “%s”"
-#: diff.c:5234
+#: diff.c:5331
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "đối số --word-diff sai: %s"
-#: diff.c:5257
+#: diff.c:5367
msgid "Diff output format options"
msgstr "Các tùy chọn định dạng khi xuất các khác biệt"
-#: diff.c:5259 diff.c:5265
+#: diff.c:5369 diff.c:5375
msgid "generate patch"
msgstr "tạo miếng vá"
-#: diff.c:5262 builtin/log.c:173
+#: diff.c:5372 builtin/log.c:179
msgid "suppress diff output"
msgstr "chặn mọi kết xuất từ diff"
-#: diff.c:5267 diff.c:5381 diff.c:5388
+#: diff.c:5377 diff.c:5491 diff.c:5498
msgid "<n>"
msgstr "<n>"
-#: diff.c:5268 diff.c:5271
+#: diff.c:5378 diff.c:5381
msgid "generate diffs with <n> lines context"
msgstr "tạo khác biệt với <n> dòng ngữ cảnh"
-#: diff.c:5273
+#: diff.c:5383
msgid "generate the diff in raw format"
msgstr "tạo khác biệt ở định dạng thô"
-#: diff.c:5276
+#: diff.c:5386
msgid "synonym for '-p --raw'"
msgstr "đồng nghĩa với “-p --raw”"
-#: diff.c:5280
+#: diff.c:5390
msgid "synonym for '-p --stat'"
msgstr "đồng nghĩa với “-p --stat”"
-#: diff.c:5284
+#: diff.c:5394
msgid "machine friendly --stat"
msgstr "--stat thuận tiện cho máy đọc"
-#: diff.c:5287
+#: diff.c:5397
msgid "output only the last line of --stat"
msgstr "chỉ xuất những dòng cuối của --stat"
-#: diff.c:5289 diff.c:5297
+#: diff.c:5399 diff.c:5407
msgid "<param1,param2>..."
msgstr "<tham_số_1,tham_số_2>…"
-#: diff.c:5290
+#: diff.c:5400
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr "đầu ra phân phối của số lượng thay đổi tương đối cho mỗi thư mục con"
-#: diff.c:5294
+#: diff.c:5404
msgid "synonym for --dirstat=cumulative"
msgstr "đồng nghĩa với --dirstat=cumulative"
-#: diff.c:5298
+#: diff.c:5408
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "đồng nghĩa với --dirstat=files,param1,param2…"
-#: diff.c:5302
+#: diff.c:5412
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr ""
"cảnh báo nếu các thay đổi đưa ra các bộ tạo xung đột hay lỗi khoảng trắng"
-#: diff.c:5305
+#: diff.c:5415
msgid "condensed summary such as creations, renames and mode changes"
msgstr "tổng hợp dạng xúc tích như là tạo, đổi tên và các thay đổi chế độ"
-#: diff.c:5308
+#: diff.c:5418
msgid "show only names of changed files"
msgstr "chỉ hiển thị tên của các tập tin đổi"
-#: diff.c:5311
+#: diff.c:5421
msgid "show only names and status of changed files"
msgstr "chỉ hiển thị tên tập tin và tình trạng của các tập tin bị thay đổi"
-#: diff.c:5313
+#: diff.c:5423
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<rộng>[,<name-width>[,<số-lượng>]]"
-#: diff.c:5314
+#: diff.c:5424
msgid "generate diffstat"
msgstr "tạo diffstat"
-#: diff.c:5316 diff.c:5319 diff.c:5322
+#: diff.c:5426 diff.c:5429 diff.c:5432
msgid "<width>"
msgstr "<rộng>"
-#: diff.c:5317
+#: diff.c:5427
msgid "generate diffstat with a given width"
msgstr "tạo diffstat với độ rộng đã cho"
-#: diff.c:5320
+#: diff.c:5430
msgid "generate diffstat with a given name width"
msgstr "tạo diffstat với tên độ rộng đã cho"
-#: diff.c:5323
+#: diff.c:5433
msgid "generate diffstat with a given graph width"
msgstr "tạo diffstat với độ rộng đồ thị đã cho"
-#: diff.c:5325
+#: diff.c:5435
msgid "<count>"
msgstr "<số_lượng>"
-#: diff.c:5326
+#: diff.c:5436
msgid "generate diffstat with limited lines"
msgstr "tạo diffstat với các dòng bị giới hạn"
-#: diff.c:5329
+#: diff.c:5439
msgid "generate compact summary in diffstat"
msgstr "tạo tổng hợp xúc tích trong diffstat"
-#: diff.c:5332
+#: diff.c:5442
msgid "output a binary diff that can be applied"
msgstr "xuất ra một khác biệt dạng nhị phân cái mà có thể được áp dụng"
-#: diff.c:5335
+#: diff.c:5445
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr ""
"hiển thị đầy đủ các tên đối tượng pre- và post-image trên các dòng \"mục lục"
"\""
-#: diff.c:5337
+#: diff.c:5447
msgid "show colored diff"
msgstr "hiển thị thay đổi được tô màu"
-#: diff.c:5338
+#: diff.c:5448
msgid "<kind>"
msgstr "<kiểu>"
-#: diff.c:5339
+#: diff.c:5449
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
@@ -3360,7 +3559,7 @@
"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:5342
+#: diff.c:5452
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3368,89 +3567,89 @@
"không munge tên đường dẫn và sử dụng NUL làm bộ phân tách trường đầu ra "
"trong --raw hay --numstat"
-#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457
+#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570
msgid "<prefix>"
msgstr "<tiền_tố>"
-#: diff.c:5346
+#: diff.c:5456
msgid "show the given source prefix instead of \"a/\""
msgstr "hiển thị tiền tố nguồn đã cho thay cho \"a/\""
-#: diff.c:5349
+#: diff.c:5459
msgid "show the given destination prefix instead of \"b/\""
msgstr "hiển thị tiền tố đích đã cho thay cho \"b/\""
-#: diff.c:5352
+#: diff.c:5462
msgid "prepend an additional prefix to every line of output"
msgstr "treo vào trước một tiền tố bổ sung cho mỗi dòng kết xuất"
-#: diff.c:5355
+#: diff.c:5465
msgid "do not show any source or destination prefix"
msgstr "đừng hiển thị bất kỳ tiền tố nguồn hay đích"
-#: diff.c:5358
+#: diff.c:5468
msgid "show context between diff hunks up to the specified number of lines"
msgstr ""
"hiển thị ngữ cảnh giữa các khúc khác biệt khi đạt đến số lượng dòng đã chỉ "
"định"
-#: diff.c:5362 diff.c:5367 diff.c:5372
+#: diff.c:5472 diff.c:5477 diff.c:5482
msgid "<char>"
msgstr "<ký_tự>"
-#: diff.c:5363
+#: diff.c:5473
msgid "specify the character to indicate a new line instead of '+'"
msgstr "chỉ định một ký tự để biểu thị một dòng được thêm mới thay cho “+”"
-#: diff.c:5368
+#: diff.c:5478
msgid "specify the character to indicate an old line instead of '-'"
msgstr "chỉ định một ký tự để biểu thị một dòng đã cũ thay cho “-”"
-#: diff.c:5373
+#: diff.c:5483
msgid "specify the character to indicate a context instead of ' '"
msgstr "chỉ định một ký tự để biểu thị một ngữ cảnh thay cho “”"
-#: diff.c:5376
+#: diff.c:5486
msgid "Diff rename options"
msgstr "Tùy chọn khác biệt đổi tên"
-#: diff.c:5377
+#: diff.c:5487
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5378
+#: diff.c:5488
msgid "break complete rewrite changes into pairs of delete and create"
msgstr "ngắt các thay đổi ghi lại hoàn thiện thành cặp của xóa và tạo"
-#: diff.c:5382
+#: diff.c:5492
msgid "detect renames"
msgstr "dò tìm các tên thay đổi"
-#: diff.c:5386
+#: diff.c:5496
msgid "omit the preimage for deletes"
msgstr "bỏ qua preimage (tiền ảnh??) cho các việc xóa"
-#: diff.c:5389
+#: diff.c:5499
msgid "detect copies"
msgstr "dò bản sao"
-#: diff.c:5393
+#: diff.c:5503
msgid "use unmodified files as source to find copies"
msgstr "dùng các tập tin không bị chỉnh sửa như là nguồn để tìm các bản sao"
-#: diff.c:5395
+#: diff.c:5505
msgid "disable rename detection"
msgstr "tắt dò tìm đổi tên"
-#: diff.c:5398
+#: diff.c:5508
msgid "use empty blobs as rename source"
msgstr "dùng các blob trống rống như là nguồn đổi tên"
-#: diff.c:5400
+#: diff.c:5510
msgid "continue listing the history of a file beyond renames"
msgstr "tiếp tục liệt kê lịch sử của một tập tin ngoài đổi tên"
-#: diff.c:5403
+#: diff.c:5513
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
@@ -3458,156 +3657,160 @@
"ngăn cản dò tìm đổi tên/bản sao nếu số lượng của đích đổi tên/bản sao vượt "
"quá giới hạn đưa ra"
-#: diff.c:5405
+#: diff.c:5515
msgid "Diff algorithm options"
msgstr "Tùy chọn thuật toán khác biệt"
-#: diff.c:5407
+#: diff.c:5517
msgid "produce the smallest possible diff"
msgstr "sản sinh khác biệt ít nhất có thể"
-#: diff.c:5410
+#: diff.c:5520
msgid "ignore whitespace when comparing lines"
msgstr "lờ đi sự thay đổi do khoảng trắng gây ra khi so sánh các dòng"
-#: diff.c:5413
+#: diff.c:5523
msgid "ignore changes in amount of whitespace"
msgstr "lờ đi sự thay đổi do số lượng khoảng trắng gây ra"
-#: diff.c:5416
+#: diff.c:5526
msgid "ignore changes in whitespace at EOL"
msgstr "lờ đi sự thay đổi do khoảng trắng gây ra khi ở cuối dòng EOL"
-#: diff.c:5419
+#: diff.c:5529
msgid "ignore carrier-return at the end of line"
msgstr "bỏ qua ký tự về đầu dòng tại cuối dòng"
-#: diff.c:5422
+#: diff.c:5532
msgid "ignore changes whose lines are all blank"
msgstr "bỏ qua các thay đổi cho toàn bộ các dòng là trống"
-#: diff.c:5425
+#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604
+msgid "<regex>"
+msgstr "<regex>"
+
+#: diff.c:5535
+msgid "ignore changes whose all lines match <regex>"
+msgstr "bỏ qua các thay đổi có tất cả các dòng khớp <regex>"
+
+#: diff.c:5538
msgid "heuristic to shift diff hunk boundaries for easy reading"
msgstr "heuristic để dịch hạn biên của khối khác biệt cho dễ đọc"
-#: diff.c:5428
+#: diff.c:5541
msgid "generate diff using the \"patience diff\" algorithm"
msgstr "tạo khác biệt sử dung thuật toán \"patience diff\""
-#: diff.c:5432
+#: diff.c:5545
msgid "generate diff using the \"histogram diff\" algorithm"
msgstr "tạo khác biệt sử dung thuật toán \"histogram diff\""
-#: diff.c:5434
+#: diff.c:5547
msgid "<algorithm>"
msgstr "<thuật toán>"
-#: diff.c:5435
+#: diff.c:5548
msgid "choose a diff algorithm"
msgstr "chọn một thuật toán khác biệt"
-#: diff.c:5437
+#: diff.c:5550
msgid "<text>"
msgstr "<văn bản>"
-#: diff.c:5438
+#: diff.c:5551
msgid "generate diff using the \"anchored diff\" algorithm"
msgstr "tạo khác biệt sử dung thuật toán \"anchored diff\""
-#: diff.c:5440 diff.c:5449 diff.c:5452
+#: diff.c:5553 diff.c:5562 diff.c:5565
msgid "<mode>"
msgstr "<chế độ>"
-#: diff.c:5441
+#: diff.c:5554
msgid "show word diff, using <mode> to delimit changed words"
msgstr ""
"hiển thị khác biệt từ, sử dụng <chế độ> để bỏ giới hạn các từ bị thay đổi"
-#: diff.c:5443 diff.c:5446 diff.c:5491
-msgid "<regex>"
-msgstr "<regex>"
-
-#: diff.c:5444
+#: diff.c:5557
msgid "use <regex> to decide what a word is"
msgstr "dùng <regex> để quyết định từ là cái gì"
-#: diff.c:5447
+#: diff.c:5560
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "tương đương với --word-diff=color --word-diff-regex=<regex>"
-#: diff.c:5450
+#: diff.c:5563
msgid "moved lines of code are colored differently"
msgstr "các dòng di chuyển của mã mà được tô màu khác nhau"
-#: diff.c:5453
+#: diff.c:5566
msgid "how white spaces are ignored in --color-moved"
msgstr "cách bỏ qua khoảng trắng trong --color-moved"
-#: diff.c:5456
+#: diff.c:5569
msgid "Other diff options"
msgstr "Các tùy chọn khác biệt khác"
-#: diff.c:5458
+#: diff.c:5571
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr ""
"khi chạy từ thư mục con, thực thi các thay đổi bên ngoài và hiển thị các "
"đường dẫn liên quan"
-#: diff.c:5462
+#: diff.c:5575
msgid "treat all files as text"
msgstr "coi mọi tập tin là dạng văn bản thường"
-#: diff.c:5464
+#: diff.c:5577
msgid "swap two inputs, reverse the diff"
msgstr "tráo đổi hai đầu vào, đảo ngược khác biệt"
-#: diff.c:5466
+#: diff.c:5579
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "thoát với mã 1 nếu không có khác biệt gì, 0 nếu ngược lại"
-#: diff.c:5468
+#: diff.c:5581
msgid "disable all output of the program"
msgstr "tắt mọi kết xuất của chương trình"
-#: diff.c:5470
+#: diff.c:5583
msgid "allow an external diff helper to be executed"
msgstr "cho phép mộ bộ hỗ trợ xuất khác biệt ở bên ngoài được phép thực thi"
-#: diff.c:5472
+#: diff.c:5585
msgid "run external text conversion filters when comparing binary files"
msgstr ""
"chạy các bộ lọc văn bản thông thường bên ngoài khi so sánh các tập tin nhị "
"phân"
-#: diff.c:5474
+#: diff.c:5587
msgid "<when>"
msgstr "<khi>"
-#: diff.c:5475
+#: diff.c:5588
msgid "ignore changes to submodules in the diff generation"
msgstr "bỏ qua các thay đổi trong mô-đun-con trong khi tạo khác biệt"
-#: diff.c:5478
+#: diff.c:5591
msgid "<format>"
msgstr "<định dạng>"
-#: diff.c:5479
+#: diff.c:5592
msgid "specify how differences in submodules are shown"
msgstr "chi định khác biệt bao nhiêu trong các mô đun con được hiển thị"
-#: diff.c:5483
+#: diff.c:5596
msgid "hide 'git add -N' entries from the index"
msgstr "ẩn các mục “git add -N” từ bảng mục lục"
-#: diff.c:5486
+#: diff.c:5599
msgid "treat 'git add -N' entries as real in the index"
msgstr "coi các mục “git add -N” như là có thật trong bảng mục lục"
-#: diff.c:5488
+#: diff.c:5601
msgid "<string>"
msgstr "<chuỗi>"
-#: diff.c:5489
+#: diff.c:5602
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
@@ -3615,7 +3818,7 @@
"tìm các khác biệt cái mà thay đổi số lượng xảy ra của các phát sinh của "
"chuỗi được chỉ ra"
-#: diff.c:5492
+#: diff.c:5605
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
@@ -3623,23 +3826,35 @@
"tìm các khác biệt cái mà thay đổi số lượng xảy ra của các phát sinh của biểu "
"thức chính quy được chỉ ra"
-#: diff.c:5495
+#: diff.c:5608
msgid "show all changes in the changeset with -S or -G"
msgstr "hiển thị tất cả các thay đổi trong một bộ các thay đổi với -S hay -G"
-#: diff.c:5498
+#: diff.c:5611
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "coi <chuỗi> trong -S như là biểu thức chính qui POSIX có mở rộng"
-#: diff.c:5501
+#: diff.c:5614
msgid "control the order in which files appear in the output"
msgstr "điều khiển thứ tự xuát hiện các tập tin trong kết xuất"
-#: diff.c:5502
+#: diff.c:5615 diff.c:5618
+msgid "<path>"
+msgstr "<đường-dẫn>"
+
+#: diff.c:5616
+msgid "show the change in the specified path first"
+msgstr "hiển thị các thay đổi trong đường dẫn đã cho đầu tiên"
+
+#: diff.c:5619
+msgid "skip the output to the specified path"
+msgstr "bỏ qua đầu ra đến đường dẫn đã cho"
+
+#: diff.c:5621
msgid "<object-id>"
msgstr "<mã-số-đối-tượng>"
-#: diff.c:5503
+#: diff.c:5622
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
@@ -3647,33 +3862,33 @@
"tìm các khác biệt cái mà thay đổi số lượng xảy ra của các phát sinh của đối "
"tượng được chỉ ra"
-#: diff.c:5505
+#: diff.c:5624
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)…[*]]"
-#: diff.c:5506
+#: diff.c:5625
msgid "select files by diff type"
msgstr "chọn các tập tin theo kiểu khác biệt"
-#: diff.c:5508
+#: diff.c:5627
msgid "<file>"
msgstr "<tập_tin>"
-#: diff.c:5509
+#: diff.c:5628
msgid "Output to a specific file"
msgstr "Xuất ra một tập tin cụ thể"
-#: diff.c:6164
+#: diff.c:6285
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
"nhận thấy đổi tên không chính xác đã bị bỏ qua bởi có quá nhiều tập tin."
-#: diff.c:6167
+#: diff.c:6288
msgid "only found copies from modified paths due to too many files."
msgstr ""
"chỉ tìm thấy các bản sao từ đường dẫn đã sửa đổi bởi vì có quá nhiều tập tin."
-#: diff.c:6170
+#: diff.c:6291
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -3681,83 +3896,97 @@
"bạn có lẽ muốn đặt biến %s của bạn thành ít nhất là %d và thử lại lệnh lần "
"nữa."
-#: dir.c:555
+#: 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:786
+msgid "Performing inexact rename detection"
+msgstr "Đang thực hiện dò tìm đổi tên không chính xác"
+
+#: diffcore-rotate.c:29
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr "Không có đường dẫn %s trong diff"
+
+#: 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:695 dir.c:724 dir.c:737
+#: 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:754 dir.c:768
+#: 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:786
+#: 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"
+msgstr "tập tin sparse-checkout của bạn có lẽ gặp lỗi: mẫu “%s” đã bị lặp lại"
-#: dir.c:796
+#: dir.c:819
msgid "disabling cone pattern matching"
msgstr "vô hiệu khớp mẫu nón"
-#: dir.c:1173
+#: 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:2144
+#: dir.c:2305
#, c-format
msgid "could not open directory '%s'"
msgstr "không thể mở thư mục “%s”"
-#: dir.c:2479
+#: 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:2603
+#: 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:3407
+#: dir.c:3534
#, c-format
msgid "index file corrupt in repo %s"
msgstr "tập tin ghi bảng mục lục bị hỏng trong kho %s"
-#: dir.c:3452 dir.c:3457
+#: dir.c:3579 dir.c:3584
#, c-format
msgid "could not create directories for %s"
msgstr "không thể tạo thư mục cho %s"
-#: dir.c:3486
+#: dir.c:3613
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "không thể di dời thư mục git từ “%s” sang “%s”"
-#: 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”"
-#: environment.c:149
+#: environment.c:152
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "đường dẫn không gian tên git \"%s\" sai"
-#: environment.c:331
+#: environment.c:335
#, c-format
msgid "could not set GIT_DIR to '%s'"
msgstr "không thể đặt GIT_DIR thành “%s”"
@@ -3767,251 +3996,273 @@
msgid "too many args to run %s"
msgstr "quá nhiều tham số để chạy %s"
-#: fetch-pack.c:150
+#: fetch-pack.c:177
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: cần danh sách shallow"
-#: fetch-pack.c:153
+#: fetch-pack.c:180
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr "git fetch-pack: cần một gói đẩy sau danh sách shallow"
-#: fetch-pack.c:164
+#: fetch-pack.c:191
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack: cần ACK/NAK, nhưng lại nhận được một gói flush"
-#: fetch-pack.c:184
+#: fetch-pack.c:211
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: cần ACK/NAK, nhưng lại nhận được “%s”"
-#: fetch-pack.c:195
+#: fetch-pack.c:222
msgid "unable to write to remote"
msgstr "không thể ghi lên máy phục vụ"
-#: fetch-pack.c:257
+#: fetch-pack.c:283
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc cần multi_ack_detailed"
-#: fetch-pack.c:356 fetch-pack.c:1340
+#: fetch-pack.c:378 fetch-pack.c:1457
#, c-format
msgid "invalid shallow line: %s"
msgstr "dòng shallow không hợp lệ: %s"
-#: fetch-pack.c:362 fetch-pack.c:1346
+#: fetch-pack.c:384 fetch-pack.c:1463
#, c-format
msgid "invalid unshallow line: %s"
msgstr "dòng unshallow không hợp lệ: %s"
-#: fetch-pack.c:364 fetch-pack.c:1348
+#: fetch-pack.c:386 fetch-pack.c:1465
#, c-format
msgid "object not found: %s"
msgstr "không tìm thấy đối tượng: %s"
-#: fetch-pack.c:367 fetch-pack.c:1351
+#: fetch-pack.c:389 fetch-pack.c:1468
#, c-format
msgid "error in object: %s"
msgstr "lỗi trong đối tượng: %s"
-#: fetch-pack.c:369 fetch-pack.c:1353
+#: fetch-pack.c:391 fetch-pack.c:1470
#, c-format
msgid "no shallow found: %s"
msgstr "không tìm shallow nào: %s"
-#: fetch-pack.c:372 fetch-pack.c:1357
+#: fetch-pack.c:394 fetch-pack.c:1474
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "cần shallow/unshallow, nhưng lại nhận được %s"
-#: fetch-pack.c:414
+#: fetch-pack.c:434
#, c-format
msgid "got %s %d %s"
msgstr "nhận %s %d - %s"
-#: fetch-pack.c:431
+#: fetch-pack.c:451
#, c-format
msgid "invalid commit %s"
msgstr "lần chuyển giao %s không hợp lệ"
-#: fetch-pack.c:462
+#: fetch-pack.c:482
msgid "giving up"
msgstr "chịu thua"
-#: fetch-pack.c:475 progress.c:323
+#: fetch-pack.c:495 progress.c:339
msgid "done"
msgstr "xong"
-#: fetch-pack.c:487
+#: fetch-pack.c:507
#, c-format
msgid "got %s (%d) %s"
msgstr "nhận %s (%d) %s"
-#: fetch-pack.c:533
+#: fetch-pack.c:543
#, c-format
msgid "Marking %s as complete"
msgstr "Đánh dấu %s là đã hoàn thành"
-#: fetch-pack.c:754
+#: fetch-pack.c:758
#, c-format
msgid "already have %s (%s)"
msgstr "đã sẵn có %s (%s)"
-#: fetch-pack.c:818
+#: fetch-pack.c:844
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: không thể rẽ nhánh sideband demultiplexer"
-#: fetch-pack.c:826
+#: fetch-pack.c:852
msgid "protocol error: bad pack header"
msgstr "lỗi giao thức: phần đầu gói bị sai"
-#: fetch-pack.c:900
+#: fetch-pack.c:946
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: không thể rẽ nhánh %s"
-#: fetch-pack.c:916
+#: fetch-pack.c:952
+msgid "fetch-pack: invalid index-pack output"
+msgstr "fetch-pack: kết xuất index-pack không hợp lệ"
+
+#: fetch-pack.c:969
#, c-format
msgid "%s failed"
msgstr "%s gặp lỗi"
-#: fetch-pack.c:918
+#: fetch-pack.c:971
msgid "error in sideband demultiplexer"
msgstr "có lỗi trong sideband demultiplexer"
-#: fetch-pack.c:965
+#: fetch-pack.c:1031
#, c-format
msgid "Server version is %.*s"
msgstr "Phiên bản máy chủ là %.*s"
-#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985
-#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001
-#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017
-#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039
+#: fetch-pack.c:1039 fetch-pack.c:1045 fetch-pack.c:1048 fetch-pack.c:1054
+#: fetch-pack.c:1058 fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070
+#: fetch-pack.c:1074 fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086
+#: fetch-pack.c:1092 fetch-pack.c:1098 fetch-pack.c:1103 fetch-pack.c:1108
#, c-format
msgid "Server supports %s"
msgstr "Máy chủ hỗ trợ %s"
-#: fetch-pack.c:972
+#: fetch-pack.c:1041
msgid "Server does not support shallow clients"
msgstr "Máy chủ không hỗ trợ máy khách shallow"
-#: fetch-pack.c:1032
+#: fetch-pack.c:1101
msgid "Server does not support --shallow-since"
msgstr "Máy chủ không hỗ trợ --shallow-since"
-#: fetch-pack.c:1037
+#: fetch-pack.c:1106
msgid "Server does not support --shallow-exclude"
msgstr "Máy chủ không hỗ trợ --shallow-exclude"
-#: fetch-pack.c:1041
+#: fetch-pack.c:1110
msgid "Server does not support --deepen"
msgstr "Máy chủ không hỗ trợ --deepen"
-#: fetch-pack.c:1058
+#: fetch-pack.c:1112
+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:1125
msgid "no common commits"
msgstr "không có lần chuyển giao chung nào"
-#: fetch-pack.c:1070 fetch-pack.c:1536
+#: fetch-pack.c:1138 fetch-pack.c:1682
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: fetch gặp lỗi."
-#: fetch-pack.c:1209
+#: fetch-pack.c:1265
+#, 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:1269
+#, 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:1289
msgid "Server does not support shallow requests"
msgstr "Máy chủ không hỗ trợ yêu cầu shallow"
-#: fetch-pack.c:1216
+#: fetch-pack.c:1296
msgid "Server supports filter"
msgstr "Máy chủ hỗ trợ bộ lọc"
-#: fetch-pack.c:1239
+#: fetch-pack.c:1335
msgid "unable to write request to remote"
msgstr "không thể ghi các yêu cầu lên máy phục vụ"
-#: fetch-pack.c:1257
+#: fetch-pack.c:1353
#, c-format
msgid "error reading section header '%s'"
msgstr "gặp lỗi khi đọc phần đầu của đoạn %s"
-#: fetch-pack.c:1263
+#: fetch-pack.c:1359
#, c-format
msgid "expected '%s', received '%s'"
msgstr "cần “%s”, nhưng lại nhận “%s”"
-#: fetch-pack.c:1303
+#: fetch-pack.c:1420
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "gặp dòng không được thừa nhận: “%s”"
-#: fetch-pack.c:1308
+#: fetch-pack.c:1425
#, c-format
msgid "error processing acks: %d"
msgstr "gặp lỗi khi xử lý tín hiệu trả lời: %d"
-#: fetch-pack.c:1318
+#: fetch-pack.c:1435
msgid "expected packfile to be sent after 'ready'"
msgstr "cần tập tin gói để gửi sau “ready”"
-#: fetch-pack.c:1320
+#: fetch-pack.c:1437
msgid "expected no other sections to be sent after no 'ready'"
msgstr "không cần thêm phần nào để gửi sau “ready”"
-#: fetch-pack.c:1362
+#: fetch-pack.c:1479
#, c-format
msgid "error processing shallow info: %d"
msgstr "lỗi xử lý thông tin shallow: %d"
-#: fetch-pack.c:1409
+#: fetch-pack.c:1526
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "cần wanted-ref, nhưng lại nhận được “%s”"
-#: fetch-pack.c:1414
+#: fetch-pack.c:1531
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "wanted-ref không được mong đợi: “%s”"
-#: fetch-pack.c:1419
+#: fetch-pack.c:1536
#, c-format
msgid "error processing wanted refs: %d"
msgstr "lỗi khi xử lý wanted refs: %d"
-#: fetch-pack.c:1762
+#: fetch-pack.c:1566
+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:1960
msgid "no matching remote head"
msgstr "không khớp phần đầu máy chủ"
-#: fetch-pack.c:1785 builtin/clone.c:689
+#: fetch-pack.c:1983 builtin/clone.c:693
msgid "remote did not send all necessary objects"
msgstr "máy chủ đã không gửi tất cả các đối tượng cần thiết"
-#: fetch-pack.c:1812
+#: fetch-pack.c:2010
#, c-format
msgid "no such remote ref %s"
msgstr "không có máy chủ tham chiếu nào như %s"
-#: fetch-pack.c:1815
+#: fetch-pack.c:2013
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr ""
"Máy phục vụ không cho phép yêu cầu cho đối tượng không được báo trước %s"
-#: gpg-interface.c:408
-msgid "gpg failed to sign the data"
-msgstr "gpg gặp lỗi khi ký dữ liệu"
-
-#: gpg-interface.c:434
+#: gpg-interface.c:273
msgid "could not create temporary file"
msgstr "không thể tạo tập tin tạm thời"
-#: gpg-interface.c:437
+#: gpg-interface.c:276
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "gặp lỗi khi ghi chữ ký đính kèm vào “%s”"
+#: gpg-interface.c:470
+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:668
+#: grep.c:543
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
@@ -4019,18 +4270,18 @@
"mẫu đã cho có chứa NULL byte (qua -f <file>). Điều này chỉ được hỗ trợ với -"
"P dưới PCRE v2"
-#: grep.c:2128
+#: grep.c:1906
#, c-format
msgid "'%s': unable to read %s"
msgstr "“%s”: không thể đọc %s"
-#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82
+#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr "gặp lỗi khi lấy thống kê về “%s”"
-#: grep.c:2156
+#: grep.c:1934
#, c-format
msgid "'%s': short read"
msgstr "“%s”: đọc ngắn"
@@ -4087,41 +4338,41 @@
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:100
#, 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:527
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4130,31 +4381,31 @@
"“%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
-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
-#, 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
-#, 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
-#, 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:543 help.c:631
#, 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:591
+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:613
+#, 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:618
+#, 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:623
+#, 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:635
msgid ""
"\n"
"The most similar command is"
@@ -4165,16 +4416,16 @@
"\n"
"Những lệnh giống nhất là"
-#: help.c:714
+#: help.c:675
msgid "git version [<options>]"
msgstr "git version [<các tùy chọn>]"
-#: help.c:783
+#: help.c:730
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:787
+#: help.c:734
msgid ""
"\n"
"Did you mean this?"
@@ -4185,7 +4436,15 @@
"\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"
@@ -4211,39 +4470,79 @@
"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:635
+#: 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-filter-options.c:81
+msgid "expected 'tree:<depth>'"
+msgstr "cần “tree:<depth>”"
+
+#: 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 "invalid filter-spec '%s'"
+msgstr "đặc tả bộ lọc không hợp lệ “%s”"
+
+#: list-objects-filter-options.c:125
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr "phải thoát char trong sub-filter-spec: “%c”"
+
+#: list-objects-filter-options.c: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: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: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.c:492
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "không thể truy cập các blob rải rác trong “%s”"
+
+#: list-objects-filter.c:495
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "không thể phân tích dữ liệu bộ lọc rải rác trong %s"
+
#: list-objects.c:127
#, c-format
msgid "entry '%s' in tree %s has tree mode, but is not a tree"
@@ -4259,43 +4558,7 @@
msgid "unable to load root tree for commit %s"
msgstr "không thể tải cây gốc cho lần chuyển giao “%s”"
-#: list-objects-filter.c:492
-#, c-format
-msgid "unable to access sparse blob in '%s'"
-msgstr "không thể truy cập các blob rải rác trong '%s'"
-
-#: list-objects-filter.c:495
-#, c-format
-msgid "unable to parse sparse filter data in %s"
-msgstr "không thể phân tích dữ liệu bộ lọc rải rác trong %s"
-
-#: list-objects-filter-options.c:58
-msgid "expected 'tree:<depth>'"
-msgstr "cần “tree:<depth>”"
-
-#: list-objects-filter-options.c:73
-msgid "sparse:path filters support has been dropped"
-msgstr "việc hỗ trợ bộ lọc sparse:đường/dẫn đã bị bỏ"
-
-#: list-objects-filter-options.c:86
-#, c-format
-msgid "invalid filter-spec '%s'"
-msgstr "đặc tả bộ lọc không hợp lệ “%s”"
-
-#: list-objects-filter-options.c:102
-#, c-format
-msgid "must escape char in sub-filter-spec: '%c'"
-msgstr "phải thoát char trong sub-filter-spec: '%c'"
-
-#: list-objects-filter-options.c:144
-msgid "expected something after combine:"
-msgstr "mong đợi một cái gì đó sau khi kết hợp:"
-
-#: list-objects-filter-options.c:226
-msgid "multiple filter-specs cannot be combined"
-msgstr "không thể tổ hợp nhiều đặc tả kiểu lọc"
-
-#: lockfile.c:151
+#: lockfile.c:152
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
@@ -4314,20 +4577,267 @@
"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:37
+#, c-format
+msgid "invalid value '%s' for lsrefs.unborn"
+msgstr "giá trị '%s' không hợp lệ cho lsrefs.unborn"
-#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913
-#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810
-#: builtin/stash.c:265
-msgid "unable to write new index file"
-msgstr "không thể ghi tập tin lưu bảng mục lục mới"
+#: ls-refs.c:167
+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-ort.c:888 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-ort.c:897 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-ort.c:906 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-ort.c:916 merge-ort.c:923
+#, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr "Chú ý: Chuyển-tiếp-nhanh mô-đun-con “%s” sang “%s”"
+
+#: merge-ort.c:944
+#, c-format
+msgid "Failed to merge submodule %s"
+msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s”"
+
+#: merge-ort.c:951
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but a possible merge resolution exists:\n"
+"%s\n"
+msgstr ""
+"Gặp lỗi khi hòa trộn mô-đun-con “%s”, nhưng có cách giải quyết:\n"
+"%s\n"
+
+#: merge-ort.c:955 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ếu đây là đúng đơn giản thêm nó vào mục lục ví dụ\n"
+"bằng cách dùng:\n"
+"\n"
+" git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"cái mà sẽ chấp nhận gợi ý này.\n"
+
+#: merge-ort.c:968
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but multiple possible merges exist:\n"
+"%s"
+msgstr ""
+"Gặp lỗi khi hòa trộn mô-đun-con “%s”, nhưng có nhiều cách giải quyết:\n"
+"%s"
+
+#: merge-ort.c:1127 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-ort.c:1132 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-ort.c:1139 merge-recursive.c:1378
+#, c-format
+msgid "Auto-merging %s"
+msgstr "Tự-động-hòa-trộn %s"
+
+#: merge-ort.c:1278 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 ""
+"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-ort.c:1288 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 ""
+"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-ort.c:1471
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
+"renamed to multiple other directories, with no destination getting a "
+"majority of the files."
+msgstr ""
+"XUNG ĐỘT: (thư mục đổi tên chia tách): Không rõ ràng nơi để đổi tên %s "
+"thành; nó đã 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-ort.c:1637 merge-recursive.c:2447
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+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-ort.c:1781 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 ""
+"Đườ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-ort.c:1788 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 ""
+"Đườ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-ort.c:1801 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 ""
+"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-ort.c:1809 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 ""
+"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-ort.c:1952
+#, c-format
+msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
+msgstr ""
+"XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên %s->%s trong %s và thành %s trong %s."
+
+#: merge-ort.c:2047
+#, c-format
+msgid ""
+"CONFLICT (rename involved in collision): rename of %s -> %s has content "
+"conflicts AND collides with another path; this may result in nested conflict "
+"markers."
+msgstr ""
+"XUNG ĐỘT (đổi tên liên quan đến va chạm): đổi tên %s -> %s xung đột nội dung "
+"VÀ va chạm với một đường dẫn khác; điều này có thể dẫn đến tạo ra các xung "
+"đột lồng nhau."
+
+#: merge-ort.c:2066 merge-ort.c:2090
+#, c-format
+msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
+msgstr ""
+"XUNG ĐỘT (đổi-tên/xóa): Đổi tên %s->%s trong %s, nhưng lại bị xóa trong %s."
+
+#: merge-ort.c:2735
+#, c-format
+msgid ""
+"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
+"%s instead."
+msgstr ""
+"XUNG ĐỘT (tập tin/thư mục): thư mục theo cách của %s từ %s; thay vào đó, di "
+"chuyển nó đến %s."
+
+#: merge-ort.c:2808
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed %s "
+"of them so each can be recorded somewhere."
+msgstr ""
+"CONFLICT (các loại riêng biệt): %s có các loại khác nhau ở mỗi bên; được đổi "
+"tên %s trong số chúng để mỗi cái có thể được ghi lại ở đâu đó."
+
+#: merge-ort.c:2812
+msgid "both"
+msgstr "cả hai"
+
+#: merge-ort.c:2812
+msgid "one"
+msgstr "một"
+
+#: merge-ort.c:2907 merge-recursive.c:3052
+msgid "content"
+msgstr "nội dung"
+
+#: merge-ort.c:2909 merge-recursive.c:3056
+msgid "add/add"
+msgstr "thêm/thêm"
+
+#: merge-ort.c:2911 merge-recursive.c:3101
+msgid "submodule"
+msgstr "mô-đun-con"
+
+#: merge-ort.c:2913 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-ort.c:2938
+#, c-format
+msgid ""
+"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
+"of %s left in tree."
+msgstr ""
+"XUNG ĐỘT (sửa/xóa): %s bị xóa trong %s và sửa trong %s. Phiên bản %s của %s "
+"còn lại trong cây (tree)."
+
+#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
+#. base, and 2-3) the trees for the two trees we're merging.
+#.
+#: merge-ort.c:3406
+#, c-format
+msgid "collecting merge info failed for trees %s, %s, %s"
+msgstr "thu thập thông tin hòa trộn gặp lỗi cho cây %s, %s, %s"
+
+#: merge-ort-wrappers.c:13 merge-recursive.c:3661
+#, 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-ort-wrappers.c:33 merge-recursive.c:3436
+#, c-format
+msgid "Already up to date!"
+msgstr "Đã cập nhật rồi!"
#: merge-recursive.c:356
msgid "(bad commit)\n"
@@ -4389,23 +4899,6 @@
msgid "do not know what to do with %06o %s '%s'"
msgstr "không hiểu phải làm gì với %06o %s “%s”"
-#: merge-recursive.c:1191
-#, c-format
-msgid "Failed to merge submodule %s (not checked out)"
-msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s” (không lấy ra được)"
-
-#: merge-recursive.c:1198
-#, c-format
-msgid "Failed to merge submodule %s (commits not present)"
-msgstr "Gặp lỗi khi hòa trộn mô-đun-con “%s” (lần chuyển giao không hiện diện)"
-
-#: merge-recursive.c:1205
-#, c-format
-msgid "Failed to merge submodule %s (commits don't follow merge-base)"
-msgstr ""
-"Gặp lỗi khi hòa trộn mô-đun-con “%s” (lần chuyển giao không theo sau nền-hòa-"
-"trộn)"
-
#: merge-recursive.c:1213 merge-recursive.c:1225
#, c-format
msgid "Fast-forwarding submodule %s to the following commit:"
@@ -4432,42 +4925,11 @@
msgid "Found a possible merge resolution for the submodule:\n"
msgstr "Tìm thấy một giải pháp hòa trộn có thể cho mô-đun-con:\n"
-#: merge-recursive.c:1259
-#, 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ếu đây là đúng đơn giản thêm nó vào mục lục ví dụ\n"
-"bằng cách dùng:\n"
-"\n"
-" git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"cái mà sẽ chấp nhận gợi ý này.\n"
-
#: 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: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: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:1378
-#, c-format
-msgid "Auto-merging %s"
-msgstr "Tự-động-hòa-trộn %s"
-
#: merge-recursive.c:1402
#, c-format
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
@@ -4519,7 +4981,7 @@
msgid "renamed"
msgstr "đã đổi tên"
-#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117
+#: 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”"
@@ -4562,13 +5024,13 @@
msgid " (left unresolved)"
msgstr " (cần giải quyết)"
-#: merge-recursive.c:1793
+#: 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:2056
+#: merge-recursive.c:2068
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -4579,25 +5041,7 @@
"vì thư mục %s đã bị đổi tên thành nhiều thư mục khác, với không đích đến "
"nhận một phần nhiều của các tập tin."
-#: merge-recursive.c:2088
-#, 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 ""
-"XUNG ĐỘT: (ngầm đổi tên thư mục): Tập tin/thư mục đã sẵn có tại %s theo cách "
-"của các đổi tên thư mục ngầm đặt (các) đường dẫn sau ở đây: %s."
-
-#: merge-recursive.c:2098
-#, 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 ""
-"XUNG ĐỘT: (ngầm đổi tên thư mục): Không thể ánh xạ một đường dẫn thành %s; "
-"các đổi tên thư mục ngầm cố đặt các đường dẫn ở đây: %s"
-
-#: merge-recursive.c:2190
+#: merge-recursive.c:2202
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -4606,333 +5050,268 @@
"XUNG ĐỘT (đổi-tên/đổi-tên): Đổi tên thư mục %s->%s trong %s. Đổi tên thư mục "
"%s->%s trong %s"
-#: merge-recursive.c:2435
-#, c-format
-msgid ""
-"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
-"renamed."
-msgstr ""
-"CẢNH BÁO: tránh áp dụng %s -> %s đổi thên thành %s, bởi vì bản thân %s cũng "
-"bị đổi tên."
-
-#: merge-recursive.c:2961
+#: merge-recursive.c:2973
#, c-format
msgid "cannot read object %s"
msgstr "không thể đọc đối tượng %s"
-#: merge-recursive.c:2964
+#: 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:3028
+#: merge-recursive.c:3040
msgid "modify"
msgstr "sửa đổi"
-#: merge-recursive.c:3028
+#: merge-recursive.c:3040
msgid "modified"
msgstr "đã sửa"
-#: merge-recursive.c:3040
-msgid "content"
-msgstr "nội dung"
-
-#: merge-recursive.c:3044
-msgid "add/add"
-msgstr "thêm/thêm"
-
-#: merge-recursive.c:3067
+#: 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:3089 git-submodule.sh:1003
-msgid "submodule"
-msgstr "mô-đun-con"
-
-#: merge-recursive.c:3090
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "XUNG ĐỘT (%s): Xung đột hòa trộn trong %s"
-
-#: merge-recursive.c:3120
+#: merge-recursive.c:3132
#, c-format
msgid "Adding as %s instead"
msgstr "Thay vào đó thêm vào %s"
-#: merge-recursive.c:3203
-#, c-format
-msgid ""
-"Path updated: %s added in %s inside a directory that was renamed in %s; "
-"moving it to %s."
-msgstr ""
-"Đường dẫn đã được cập nhật: %s được thêm vào trong %s bên trong một thư mục "
-"đã được đổi tên trong %s; di chuyển nó đến %s."
-
-#: merge-recursive.c:3206
-#, 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 ""
-"XUNG ĐỘT (vị trí tệp): %s được thêm vào trong %s trong một thư mục đã được "
-"đổi tên thành %s, đoán là nó nên được di chuyển đến %s."
-
-#: merge-recursive.c:3210
-#, c-format
-msgid ""
-"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
-"%s; moving it to %s."
-msgstr ""
-"Đường dẫn đã được cập nhật: %s được đổi tên thành %s trong %s, bên trong một "
-"thư mục đã được đổi tên trong %s; di chuyển nó đến %s."
-
-#: merge-recursive.c:3213
-#, 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 ""
-"XUNG ĐỘT (vị trí tệp): %s được đổi tên thành %s trong %s, bên trong một thư "
-"mục đã được đổi tên thành %s, đoán là nó nên được di chuyển đến %s."
-
-#: merge-recursive.c:3327
+#: merge-recursive.c:3339
#, c-format
msgid "Removing %s"
msgstr "Đang xóa %s"
-#: merge-recursive.c:3350
+#: merge-recursive.c:3362
msgid "file/directory"
msgstr "tập-tin/thư-mục"
-#: merge-recursive.c:3355
+#: merge-recursive.c:3367
msgid "directory/file"
msgstr "thư-mục/tập-tin"
-#: merge-recursive.c:3362
+#: 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:3371
+#: merge-recursive.c:3383
#, c-format
msgid "Adding %s"
msgstr "Thêm \"%s\""
-#: merge-recursive.c:3380
+#: 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:3424
-msgid "Already up to date!"
-msgstr "Đã cập nhật rồi!"
-
-#: merge-recursive.c:3433
+#: 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:3537
+#: merge-recursive.c:3539
msgid "Merging:"
msgstr "Đang trộn:"
-#: merge-recursive.c:3550
+#: merge-recursive.c:3552
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "tìm thấy %u tổ tiên chung:"
-#: merge-recursive.c:3600
+#: merge-recursive.c:3602
msgid "merge returned no commit"
msgstr "hòa trộn không trả về lần chuyển giao nào"
-#: merge-recursive.c:3659
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-" %s"
-msgstr ""
-"Các thay đổi nội bộ của bạn với các tập tin sau đây sẽ bị ghi đè bởi lệnh "
-"hòa trộn:\n"
-" %s"
-
-#: merge-recursive.c:3756
+#: merge-recursive.c:3758
#, c-format
msgid "Could not parse object '%s'"
msgstr "Không thể phân tích đối tượng “%s”"
-#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877
+#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896
+#: builtin/stash.c:471
msgid "Unable to write index."
msgstr "Không thể ghi bảng mục lục."
-#: midx.c:68
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "gặp lỗi khi đọc bộ nhớ đệm"
+
+#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917
+#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817
+#: 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:62
+msgid "multi-pack-index OID fanout is of the wrong size"
+msgstr "fanout OID nhiều gói chỉ mục có kích thước sai"
+
+#: midx.c:93
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "tập tin đồ thị multi-pack-index %s quá nhỏ"
-#: midx.c:84
+#: midx.c:109
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "chữ ký multi-pack-index 0x%08x không khớp chữ ký 0x%08x"
-#: midx.c:89
+#: midx.c:114
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "không nhận ra phiên bản %d của multi-pack-index"
-#: midx.c:94
+#: midx.c:119
#, 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:108
-msgid "invalid chunk offset (too large)"
-msgstr "khoảng bù đoạn không hợp lệ (quá lớn)"
-
-#: midx.c:132
-msgid "terminating multi-pack-index chunk id appears earlier than expected"
-msgstr "mã mảnh kết thúc multi-pack-index xuất hiện sớm hơn bình thường"
-
-#: midx.c:145
+#: midx.c:136
msgid "multi-pack-index missing required pack-name chunk"
msgstr "multi-pack-index thiếu mảnh pack-name cần thiết"
-#: midx.c:147
+#: midx.c:138
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "multi-pack-index thiếu mảnh OID fanout cần thiết"
-#: midx.c:149
+#: midx.c:140
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "multi-pack-index thiếu mảnh OID lookup cần thiết"
-#: midx.c:151
+#: midx.c:142
msgid "multi-pack-index missing required object offsets chunk"
msgstr "multi-pack-index thiếu mảnh các khoảng bù đối tượng cần thiết"
-#: midx.c:165
+#: midx.c:158
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "các tên gói multi-pack-index không đúng thứ tự: “%s” trước “%s”"
-#: midx.c:210
+#: midx.c:202
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "pack-int-id sai: %u (%u các gói tổng)"
-#: midx.c:260
+#: midx.c:252
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr "multi-pack-index lưu trữ một khoảng bù 64-bít, nhưng off_t là quá nhỏ"
-#: midx.c:288
-msgid "error preparing packfile from multi-pack-index"
-msgstr "lỗi chuẩn bị tập tin gói từ multi-pack-index"
-
-#: midx.c:472
+#: midx.c:467
#, c-format
msgid "failed to add packfile '%s'"
msgstr "gặp lỗi khi thêm tập tin gói “%s”"
-#: midx.c:478
+#: midx.c:473
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "gặp lỗi khi mở pack-index “%s”"
-#: midx.c:538
+#: midx.c:533
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "gặp lỗi khi phân bổ đối tượng “%d” trong tập tin gói"
-#: midx.c:842
+#: midx.c:821
msgid "Adding packfiles to multi-pack-index"
msgstr "Đang thêm tập tin gói từ multi-pack-index"
-#: midx.c:875
+#: midx.c:855
#, c-format
msgid "did not see pack-file %s to drop"
msgstr "đã không thấy tập tin gói %s để mà xóa"
-#: midx.c:973
-msgid "Writing chunks to multi-pack-index"
-msgstr "Đang ghi các khúc vào multi-pack-index"
+#: midx.c:904
+msgid "no pack files to index."
+msgstr "không có tập tin gói để đánh mục lục."
-#: midx.c:1052
+#: midx.c:965
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "gặp lỗi khi xóa multi-pack-index tại %s"
-#: midx.c:1108
+#: midx.c:1021
+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:1029
msgid "Looking for referenced packfiles"
msgstr "Đang khóa cho các gói bị tham chiếu"
-#: midx.c:1123
+#: midx.c:1044
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr "fanout cũ sai thứ tự: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:1128
+#: midx.c:1049
+msgid "the midx contains no oid"
+msgstr "midx chẳng chứa oid nào"
+
+#: midx.c:1058
msgid "Verifying OID order in multi-pack-index"
msgstr "Thẩm tra thứ tự OID trong multi-pack-index"
-#: midx.c:1137
+#: midx.c:1067
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "lookup cũ sai thứ tự: oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1157
+#: midx.c:1087
msgid "Sorting objects by packfile"
msgstr "Đang sắp xếp các đối tượng theo tập tin gói"
-#: midx.c:1164
+#: midx.c:1094
msgid "Verifying object offsets"
msgstr "Đang thẩm tra các khoảng bù đối tượng"
-#: midx.c:1180
+#: midx.c:1110
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "gặp lỗi khi tải mục gói cho oid[%d] = %s"
-#: midx.c:1186
+#: midx.c:1116
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "gặp lỗi khi tải pack-index cho tập tin gói %s"
-#: midx.c:1195
+#: midx.c:1125
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr ""
"khoảng bù đối tượng không đúng cho oid[%d] = %s: %<PRIx64> != %<PRIx64>"
-#: midx.c:1220
+#: midx.c:1150
msgid "Counting referenced objects"
msgstr "Đang đếm các đối tượng được tham chiếu"
-#: midx.c:1230
+#: midx.c:1160
msgid "Finding and deleting unreferenced packfiles"
msgstr "Đang tìm và xóa các gói không được tham chiếu"
-#: midx.c:1388
+#: midx.c:1351
msgid "could not start pack-objects"
msgstr "không thể lấy thông tin thống kê về các đối tượng gói"
-#: midx.c:1407
+#: midx.c:1371
msgid "could not finish pack-objects"
msgstr "không thể hoàn thiện các đối tượng gói"
-#: name-hash.c:537
+#: name-hash.c:538
#, c-format
msgid "unable to create lazy_dir thread: %s"
msgstr "không thể tạo tuyến lazy_dir: %s"
-#: name-hash.c:559
+#: name-hash.c:560
#, c-format
msgid "unable to create lazy_name thread: %s"
msgstr "không thể tạo tuyến lazy_name: %s"
-#: name-hash.c:565
+#: name-hash.c:566
#, c-format
msgid "unable to join lazy_name thread: %s"
msgstr "không thể gia nhập tuyến lazy_name: %s"
@@ -4979,6 +5358,361 @@
msgid "Bad %s value: '%s'"
msgstr "Giá trị %s sai: “%s”"
+#: object-file.c:480
+#, 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"
+
+#: object-file.c:531
+#, 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”"
+
+#: object-file.c:603
+#, 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"
+
+#: object-file.c:610
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "không thể chuẩn hóa thư mục đối tượng: “%s”"
+
+#: object-file.c:653
+msgid "unable to fdopen alternates lockfile"
+msgstr "không thể fdopen tập tin khóa thay thế"
+
+#: object-file.c:671
+msgid "unable to read alternates file"
+msgstr "không thể đọc tập tin thay thế"
+
+#: object-file.c:678
+msgid "unable to move new alternates file into place"
+msgstr "không thể di chuyển tập tin thay thế vào chỗ"
+
+#: object-file.c:713
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "đường dẫn “%s” không tồn tại"
+
+#: object-file.c:734
+#, 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ợ."
+
+#: object-file.c:740
+#, 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ộ."
+
+#: object-file.c:746
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "kho tham chiếu “%s” là nông"
+
+#: object-file.c:754
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "kho tham chiếu “%s” bị cấy ghép"
+
+#: object-file.c:814
+#, 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"
+
+#: object-file.c:964
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr "đang cố để mmap %<PRIuMAX> vượt quá giới hạn %<PRIuMAX>"
+
+#: object-file.c:985
+msgid "mmap failed"
+msgstr "mmap gặp lỗi"
+
+#: object-file.c:1149
+#, c-format
+msgid "object file %s is empty"
+msgstr "tập tin đối tượng %s trống rỗng"
+
+#: object-file.c:1284 object-file.c:2477
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "đối tượng mất hỏng “%s”"
+
+#: object-file.c:1286 object-file.c:2481
+#, 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”"
+
+#: object-file.c:1328
+msgid "invalid object type"
+msgstr "kiểu đối tượng không hợp lệ"
+
+#: object-file.c:1412
+#, 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"
+
+#: object-file.c:1415
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "không thể giải gói phần đầu %s"
+
+#: object-file.c:1421
+#, 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"
+
+#: object-file.c:1424
+#, c-format
+msgid "unable to parse %s header"
+msgstr "không thể phân tích phần đầu của “%s”"
+
+#: object-file.c:1651
+#, c-format
+msgid "failed to read object %s"
+msgstr "gặp lỗi khi đọc đối tượng “%s”"
+
+#: object-file.c:1655
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "c%s thay thế không được tìm thấy cho %s"
+
+#: object-file.c:1659
+#, 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"
+
+#: object-file.c:1663
+#, 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"
+
+#: object-file.c:1768
+#, c-format
+msgid "unable to write file %s"
+msgstr "không thể ghi tập tin %s"
+
+#: object-file.c:1775
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "không thể đặt quyền thành “%s”"
+
+#: object-file.c:1782
+msgid "file write error"
+msgstr "lỗi ghi tập tin"
+
+#: object-file.c:1802
+msgid "error when closing loose object file"
+msgstr "gặp lỗi trong khi đóng tập tin đối tượng"
+
+#: object-file.c:1867
+#, 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"
+
+#: object-file.c:1869
+msgid "unable to create temporary file"
+msgstr "không thể tạo tập tin tạm thời"
+
+#: object-file.c:1893
+msgid "unable to write loose object file"
+msgstr "không thể ghi tập tin đối tượng đã mất"
+
+#: object-file.c:1899
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "không thể xả nén đối tượng mới %s (%d)"
+
+#: object-file.c:1903
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "deflateEnd trên đối tượng %s gặp lỗi (%d)"
+
+#: object-file.c:1907
+#, 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"
+
+#: object-file.c:1917 builtin/pack-objects.c:1097
+#, c-format
+msgid "failed utime() on %s"
+msgstr "gặp lỗi utime() trên “%s”"
+
+#: object-file.c:1994
+#, c-format
+msgid "cannot read object for %s"
+msgstr "không thể đọc đối tượng cho %s"
+
+#: object-file.c:2045
+msgid "corrupt commit"
+msgstr "lần chuyển giao sai hỏng"
+
+#: object-file.c:2053
+msgid "corrupt tag"
+msgstr "thẻ sai hỏng"
+
+#: object-file.c:2153
+#, c-format
+msgid "read error while indexing %s"
+msgstr "gặp lỗi đọc khi đánh mục lục %s"
+
+#: object-file.c:2156
+#, c-format
+msgid "short read while indexing %s"
+msgstr "không đọc ngắn khi đánh mục lục %s"
+
+#: object-file.c:2229 object-file.c:2239
+#, 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"
+
+#: object-file.c:2245
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s: kiểu tập tin không được hỗ trợ"
+
+#: object-file.c:2269
+#, c-format
+msgid "%s is not a valid object"
+msgstr "%s không phải là một đối tượng hợp lệ"
+
+#: object-file.c:2271
+#, 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ệ"
+
+#: object-file.c:2298 builtin/index-pack.c:192
+#, c-format
+msgid "unable to open %s"
+msgstr "không thể mở %s"
+
+#: object-file.c:2488 object-file.c:2541
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "mã băm không khớp cho %s (cần %s)"
+
+#: object-file.c:2512
+#, c-format
+msgid "unable to mmap %s"
+msgstr "không thể mmap %s"
+
+#: object-file.c:2517
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "không thể giải gói phần đầu của “%s”"
+
+#: object-file.c:2523
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "không thể phân tích phần đầu của “%s”"
+
+#: object-file.c:2534
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "không thể giải gói nội dung của “%s”"
+
+#: object-name.c:486
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr "mã đối tượng dạng rút gọn %s chưa rõ ràng"
+
+#: object-name.c:497
+msgid "The candidates are:"
+msgstr "Các ứng cử là:"
+
+#: object-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 thường không bao giờ tạo tham chiếu mà nó kết thúc với 40 ký tự hex\n"
+"bởi vì nó sẽ bị bỏ qua khi bạn chỉ định 40-hex. Những tham chiếu này\n"
+"có lẽ được tạo ra bởi một sai sót nào đó. Ví dụ,\n"
+"\n"
+" git switch -c $br $(git rev-parse …)\n"
+"\n"
+"với \"$br\" không hiểu lý do vì sao trống rỗng và một tham chiếu 40-hex được "
+"tạo ra.\n"
+"Xin hãy kiểm tra những tham chiếu này và có thể xóa chúng đi. Tắt lời nhắn "
+"này\n"
+"bằng cách chạy lệnh \"git config advice.objectNameWarning false\""
+
+#: object-name.c:916
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "nhật ký cho “%.*s” chỉ trở lại đến %s"
+
+#: object-name.c:924
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "nhật ký cho “%.*s” chỉ có %d mục"
+
+#: object-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”"
+
+#: object-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”?"
+
+#: object-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”"
+
+#: object-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”?"
+
+#: object-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”?"
+
+#: object-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"
+
+#: object-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)"
+
+#: object-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"
+
+#: object-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ệ."
+
#: object.c:53
#, c-format
msgid "invalid object type \"%s\""
@@ -5004,25 +5738,94 @@
msgid "hash mismatch %s"
msgstr "mã băm không khớp %s"
-#: packfile.c:629
+#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226
+#, c-format
+msgid "unable to get size of %s"
+msgstr "không thể lấy kích cỡ của %s"
+
+#: pack-bitmap.c:1489 builtin/rev-list.c:92
+#, c-format
+msgid "unable to get disk usage of %s"
+msgstr "không thể dung lượng đĩa đã dùng của %s"
+
+#: pack-revindex.c:220
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr "tập tin reverse-index %s quá nhỏ"
+
+#: pack-revindex.c:225
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr "tập tin reverse-index %s bị hỏng"
+
+#: pack-revindex.c:233
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr "tập tin reverse-index %s có chữ ký chưa biết"
+
+#: pack-revindex.c:237
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr "tệp chỉ mục ngược %s có phiên bản không được hỗ trợ %<PRIu32>"
+
+#: pack-revindex.c:242
+#, c-format
+msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
+msgstr "tệp chỉ mục ngược %s có id mã băm không được hỗ trợ %<PRIu32>"
+
+#: pack-write.c:236
+msgid "cannot both write and verify reverse index"
+msgstr "không thể cùng lúc đọc và xác minh được bảng mục lục đảo ngược"
+
+#: pack-write.c:257
+#, c-format
+msgid "could not stat: %s"
+msgstr "không thể lấy thông tin thống kê: %s"
+
+#: pack-write.c:269
+#, c-format
+msgid "failed to make %s readable"
+msgstr "gặp lỗi làm cho %s đọc được"
+
+#: pack-write.c:508
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr "không thể ghi tập tin promisor “%s”"
+
+#: packfile.c:625
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:1934
#, 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:1938
#, 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 à?)"
-#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134
+#: parse-options-cb.c:20 parse-options-cb.c:24
#, c-format
-msgid "unable to get size of %s"
-msgstr "không thể lấy kích cỡ của %s"
+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
@@ -5064,26 +5867,31 @@
msgid "did you mean `--%s` (with two dashes)?"
msgstr "có phải ý bạn là “--%s“ (với hai dấu gạch ngang)?"
-#: parse-options.c:857
+#: parse-options.c: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:859
+#: parse-options.c:864
#, c-format
msgid "unknown switch `%c'"
msgstr "không hiểu tùy chọn “%c”"
-#: parse-options.c:861
+#: 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:885
+#: parse-options.c:890
msgid "..."
msgstr "…"
-#: parse-options.c:904
+#: parse-options.c:909
#, c-format
msgid "usage: %s"
msgstr "cách dùng: %s"
@@ -5091,45 +5899,20 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:910
+#: parse-options.c:915
#, c-format
msgid " or: %s"
msgstr " hoặc: %s"
-#: parse-options.c:913
+#: parse-options.c:918
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:952
+#: parse-options.c:957
msgid "-NUM"
msgstr "-SỐ"
-#: parse-options.c:966
-#, 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:915
#, c-format
msgid "Could not make %s writable by group"
@@ -5190,27 +5973,27 @@
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s: “literal” và “glob” xung khắc nhau"
-#: pathspec.c:442
+#: pathspec.c:445
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
-msgstr "%s: “%s” ngoài một kho chứa tại '%s'"
+msgstr "%s: “%s” ngoài một kho chứa tại “%s”"
-#: pathspec.c:517
+#: pathspec.c:521
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "“%s” (mnemonic: “%c”)"
-#: pathspec.c:527
+#: 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:594
+#: 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:639
+#: pathspec.c:643
#, c-format
msgid "line is badly quoted: %s"
msgstr "dòng được trích dẫn sai: %s"
@@ -5224,143 +6007,173 @@
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:165
#, c-format
msgid "remote error: %s"
msgstr "lỗi máy chủ: %s"
-#: preload-index.c:119
+#: preload-index.c:125
msgid "Refreshing index"
msgstr "Làm mới bảng mục lục"
-#: preload-index.c:138
+#: preload-index.c:144
#, c-format
msgid "unable to create threaded lstat: %s"
msgstr "không thể tạo tuyến trình lstat: %s"
-#: pretty.c:981
+#: pretty.c:984
msgid "unable to parse --pretty format"
msgstr "không thể phân tích định dạng --pretty"
-#: promisor-remote.c:23
-msgid "Remote with no URL"
-msgstr "Máy chủ không có địa chỉ URL"
+#: promisor-remote.c: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:58
+#: 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"
+msgstr "tên máy chủ hứa hẹn không thể bắt đầu bằng “/”: %s"
-#: range-diff.c:75
+#: prune-packed.c:35
+msgid "Removing duplicate objects"
+msgstr "Đang gỡ các đối tượng trùng lặp"
+
+#: range-diff.c:78
msgid "could not start `log`"
msgstr "không thể lấy thông tin thống kê về “log“"
-#: range-diff.c:77
+#: range-diff.c:80
msgid "could not read `log` output"
msgstr "không thể đọc kết xuất “log”"
-#: range-diff.c:96 sequencer.c:5020
+#: range-diff.c:101 sequencer.c:5318
#, c-format
msgid "could not parse commit '%s'"
msgstr "không thể phân tích lần chuyển giao “%s”"
-#: range-diff.c:122
+#: range-diff.c:115
+#, 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:140
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "không thể phân tích cú pháp phần đầu git “%.*s”"
-#: range-diff.c:285
+#: range-diff.c:306
msgid "failed to generate diff"
msgstr "gặp lỗi khi tạo khác biệt"
-#: range-diff.c:518 range-diff.c:520
+#: range-diff.c:558
+msgid "--left-only and --right-only are mutually exclusive"
+msgstr "--left-only và --right-only loại từ lẫn nhau"
+
+#: range-diff.c:561 range-diff.c:563
#, 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:1330
+#: 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:1536
+#: read-cache.c:1532
msgid "Refresh index"
msgstr "Làm tươi mới bảng mục lục"
-#: read-cache.c:1651
+#: read-cache.c:1657
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -5369,7 +6182,7 @@
"index.version được đặt, nhưng giá trị của nó lại không hợp lệ.\n"
"Dùng phiên bản %i"
-#: read-cache.c:1661
+#: read-cache.c:1667
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -5378,139 +6191,139 @@
"GIT_INDEX_VERSION được đặt, nhưng giá trị của nó lại không hợp lệ.\n"
"Dùng phiên bản %i"
-#: read-cache.c:1717
+#: read-cache.c:1723
#, c-format
msgid "bad signature 0x%08x"
msgstr "chữ ký sai 0x%08x"
-#: read-cache.c:1720
+#: read-cache.c:1726
#, c-format
msgid "bad index version %d"
msgstr "phiên bản mục lục sai %d"
-#: read-cache.c:1729
+#: read-cache.c:1735
msgid "bad index file sha1 signature"
msgstr "chữ ký dạng sha1 cho tập tin mục lục không đúng"
-#: read-cache.c:1759
+#: read-cache.c:1765
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "mục lục dùng phần mở rộng %.4s, cái mà chúng tôi không hiểu được"
-#: read-cache.c:1761
+#: read-cache.c:1767
#, c-format
msgid "ignoring %.4s extension"
msgstr "đang lờ đi phần mở rộng %.4s"
-#: read-cache.c:1798
+#: read-cache.c:1804
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "không hiểu định dạng mục lục 0x%08x"
-#: read-cache.c:1814
+#: read-cache.c:1820
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "trường tên sai sạng trong mục lục, gần đường dẫn “%s”"
-#: read-cache.c:1871
+#: read-cache.c:1877
msgid "unordered stage entries in index"
msgstr "các mục tin stage không đúng thứ tự trong mục lục"
-#: read-cache.c:1874
+#: read-cache.c:1880
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "nhiều mục stage cho tập tin hòa trộn “%s”"
-#: read-cache.c:1877
+#: read-cache.c:1883
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "các mục tin stage không đúng thứ tự cho “%s”"
-#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
-#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
-#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
-#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
-#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
+#: read-cache.c:1989 read-cache.c:2280 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181
+#: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991
+#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505
+#: 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:2124
+#: read-cache.c:2133
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "không thể tạo tuyến load_cache_entries: %s"
-#: read-cache.c:2137
+#: read-cache.c:2146
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "không thể gia nhập tuyến load_cache_entries: %s"
-#: read-cache.c:2170
+#: read-cache.c:2179
#, c-format
msgid "%s: index file open failed"
msgstr "%s: mở tập tin mục lục gặp lỗi"
-#: read-cache.c:2174
+#: read-cache.c:2183
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s: không thể lấy thống kê bảng mục lục đã mở"
-#: read-cache.c:2178
+#: read-cache.c:2187
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s: tập tin mục lục nhỏ hơn mong đợi"
-#: read-cache.c:2182
+#: read-cache.c:2191
#, c-format
msgid "%s: unable to map index file"
msgstr "%s: không thể ánh xạ tập tin mục lục"
-#: read-cache.c:2224
+#: read-cache.c:2233
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "không thể tạo tuyến load_index_extensions: %s"
-#: read-cache.c:2251
+#: read-cache.c:2260
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "không thể gia nhập tuyến load_index_extensions: %s"
-#: read-cache.c:2283
+#: read-cache.c:2292
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "không thể làm tươi mới mục lục đã chia sẻ “%s”"
-#: read-cache.c:2330
+#: read-cache.c:2339
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "mục lục bị hỏng, cần %s trong %s, nhưng lại nhận được %s"
-#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122
+#: read-cache.c:3035 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141
#, c-format
msgid "could not close '%s'"
msgstr "không thể đóng “%s”"
-#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959
+#: read-cache.c:3138 sequencer.c:2487 sequencer.c:4239
#, c-format
msgid "could not stat '%s'"
msgstr "không thể lấy thông tin thống kê về “%s”"
-#: read-cache.c:3142
+#: read-cache.c:3151
#, c-format
msgid "unable to open git dir: %s"
msgstr "không thể mở thư mục git: %s"
-#: read-cache.c:3154
+#: read-cache.c:3163
#, c-format
msgid "unable to unlink: %s"
msgstr "không thể bỏ liên kết (unlink): “%s”"
-#: read-cache.c:3179
+#: read-cache.c:3188
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "không thể sửa các bít phân quyền trên “%s”"
-#: read-cache.c:3328
+#: read-cache.c:3337
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s: không thể xóa bỏ stage #0"
@@ -5584,7 +6397,7 @@
msgid_plural "Rebase %s onto %s (%d commands)"
msgstr[0] "Cải tổ %s vào %s (%d lệnh )"
-#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228
+#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218
msgid ""
"\n"
"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -5593,7 +6406,7 @@
"Đừng xóa bất kỳ dòng nào. Dùng “drop” một cách rõ ràng để xóa bỏ một lần "
"chuyển giao.\n"
-#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232
+#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222
msgid ""
"\n"
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -5601,7 +6414,7 @@
"\n"
"Nếu bạn xóa bỏ một dòng ở đây thì LẦN CHUYỂN GIAO ĐÓ SẼ MẤT.\n"
-#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871
+#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -5615,7 +6428,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:86 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"
@@ -5625,14 +6438,14 @@
"Tuy nhiên, nếu bạn xóa bỏ mọi thứ, việc cải tổ sẽ bị bãi bỏ.\n"
"\n"
-#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444
-#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252
+#: rebase-interactive.c:110 rerere.c:469 rerere.c:676 sequencer.c:3615
+#: sequencer.c:3641 sequencer.c:5424 builtin/fsck.c:329 builtin/rebase.c:272
#, c-format
msgid "could not write '%s'"
msgstr "không thể ghi “%s”"
-#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210
-#: builtin/rebase.c:234
+#: rebase-interactive.c:116 builtin/rebase.c:204 builtin/rebase.c:230
+#: builtin/rebase.c:254
#, c-format
msgid "could not write '%s'."
msgstr "không thể ghi “%s”."
@@ -5664,132 +6477,14 @@
"Cánh ứng xử có thể là: ignore, warn, error.\n"
"\n"
-#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262
-#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221
-#: builtin/rebase.c:246
+#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2402
+#: builtin/rebase.c:190 builtin/rebase.c:215 builtin/rebase.c:241
+#: builtin/rebase.c:266
#, c-format
msgid "could not read '%s'."
msgstr "không thể đọc “%s”."
-#: refs.c:262
-#, c-format
-msgid "%s does not point to a valid object!"
-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:2098
-#, 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:407 sequencer.c:2701 sequencer.c:2905
-#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157
-#: wrapper.c:620
-#, c-format
-msgid "could not write to '%s'"
-msgstr "không thể ghi vào “%s”"
-
-#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719
-#: builtin/rebase.c:1029
-#, 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
-#, 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:2023
-#, c-format
-msgid "multiple updates for ref '%s' not allowed"
-msgstr "không cho phép đa cập nhật cho tham chiếu “%s”"
-
-#: refs.c:2055
-msgid "ref updates forbidden inside quarantine environment"
-msgstr "cập nhật tham chiếu bị cấm trong môi trường kiểm tra"
-
-#: refs.c:2151 refs.c:2181
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr "“%s” sẵn có; không thể tạo “%s”"
-
-#: refs.c:2157 refs.c:2192
-#, c-format
-msgid "cannot process '%s' and '%s' at the same time"
-msgstr "không thể xử lý “%s” và “%s” cùng một lúc"
-
-#: refs/files-backend.c:1233
-#, c-format
-msgid "could not remove reference %s"
-msgstr "không thể gỡ bỏ tham chiếu: %s"
-
-#: refs/files-backend.c:1247 refs/packed-backend.c:1541
-#: refs/packed-backend.c:1551
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "không thể xóa bỏ tham chiếu %s: %s"
-
-#: refs/files-backend.c:1250 refs/packed-backend.c:1554
-#, 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”"
-
-#: ref-filter.c:42 wt-status.c:1938
+#: ref-filter.c:42 wt-status.c:1975
msgid "gone"
msgstr "đã ra đi"
@@ -5808,122 +6503,132 @@
msgid "ahead %d, behind %d"
msgstr "trước %d, sau %d"
-#: ref-filter.c:165
+#: ref-filter.c:175
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "cần định dạng: %%(color:<color>)"
-#: ref-filter.c:167
+#: ref-filter.c:177
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "không nhận ra màu: %%(màu:%s)"
-#: ref-filter.c:189
+#: ref-filter.c:199
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Giá trị nguyên cần tên tham chiếu:lstrip=%s"
-#: ref-filter.c:193
+#: ref-filter.c:203
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Giá trị nguyên cần tên tham chiếu:rstrip=%s"
-#: ref-filter.c:195
+#: ref-filter.c:205
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "đối số không được thừa nhận %%(%s): %s"
-#: ref-filter.c:250
+#: ref-filter.c:260
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) không nhận các đối số"
-#: ref-filter.c:272
+#: ref-filter.c:282
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr "tham số không được thừa nhận %%(objectname): %s"
-#: ref-filter.c:280
+#: ref-filter.c:290
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) không nhận các đối số"
-#: ref-filter.c:292
+#: ref-filter.c:302
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) không nhận các đối số"
-#: ref-filter.c:301
+#: ref-filter.c:315
#, 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:323
+#: ref-filter.c:334
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr "cần %%(trailers:key=<giá trị>)"
+
+#: ref-filter.c:336
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "không hiểu tham số %%(trailers): %s"
-#: ref-filter.c:352
+#: ref-filter.c:367
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "cần nội dung mang giá trị dương:lines=%s"
-#: ref-filter.c:354
+#: ref-filter.c:369
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "đối số không được thừa nhận %%(contents): %s"
-#: ref-filter.c:369
+#: ref-filter.c:384
#, 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:373
+#: ref-filter.c:388
#, 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:403
+#: ref-filter.c:402
+#, 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:432
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "cần định dạng: %%(align:<width>,<position>)"
-#: ref-filter.c:415
+#: ref-filter.c:444
#, c-format
msgid "unrecognized position:%s"
msgstr "vị trí không được thừa nhận:%s"
-#: ref-filter.c:422
+#: ref-filter.c:451
#, c-format
msgid "unrecognized width:%s"
msgstr "chiều rộng không được thừa nhận:%s"
-#: ref-filter.c:431
+#: ref-filter.c:460
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "đối số không được thừa nhận %%(align): %s"
-#: ref-filter.c:439
+#: ref-filter.c:468
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "cần giá trị độ rộng dương với nguyên tử %%(align)"
-#: ref-filter.c:457
+#: ref-filter.c:486
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "đối số không được thừa nhận %%(if): %s"
-#: ref-filter.c:559
+#: ref-filter.c:588
#, c-format
msgid "malformed field name: %.*s"
msgstr "tên trường dị hình: %.*s"
-#: ref-filter.c:586
+#: ref-filter.c:615
#, c-format
msgid "unknown field name: %.*s"
msgstr "không hiểu tên trường: %.*s"
-#: ref-filter.c:590
+#: ref-filter.c:619
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
@@ -5931,159 +6636,278 @@
"không phải là một kho git, nhưng trường “%.*s” yêu cầu truy cập vào dữ liệu "
"đối tượng"
-#: ref-filter.c:714
+#: ref-filter.c:743
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "định dạng: nguyên tử %%(if) được dùng mà không có nguyên tử %%(then)"
-#: ref-filter.c:777
+#: ref-filter.c:806
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "định dạng: nguyên tử %%(then) được dùng mà không có nguyên tử %%(if)"
-#: ref-filter.c:779
+#: ref-filter.c:808
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "định dạng: nguyên tử %%(then) được dùng nhiều hơn một lần"
-#: ref-filter.c:781
+#: ref-filter.c:810
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "định dạng: nguyên tử %%(then) được dùng sau %%(else)"
-#: ref-filter.c:809
+#: ref-filter.c:838
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "định dạng: nguyên tử %%(else) được dùng mà không có nguyên tử %%(if)"
-#: ref-filter.c:811
+#: ref-filter.c:840
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "định dạng: nguyên tử %%(else) được dùng mà không có nguyên tử %%(then)"
-#: ref-filter.c:813
+#: ref-filter.c:842
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "định dạng: nguyên tử %%(else) được dùng nhiều hơn một lần"
-#: ref-filter.c:828
+#: ref-filter.c:857
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "định dạng: nguyên tử %%(end) được dùng mà không có nguyên tử tương ứng"
-#: ref-filter.c:885
+#: ref-filter.c:914
#, c-format
msgid "malformed format string %s"
msgstr "chuỗi định dạng dị hình %s"
-#: ref-filter.c:1488
+#: ref-filter.c:1555
#, c-format
-msgid "no branch, rebasing %s"
-msgstr "không nhánh, đang cải tổ %s"
+msgid "(no branch, rebasing %s)"
+msgstr "(không nhánh, đang cải tổ %s)"
-#: ref-filter.c:1491
+#: ref-filter.c:1558
#, c-format
-msgid "no branch, rebasing detached HEAD %s"
-msgstr "không nhánh, đang cải tổ HEAD %s đã tách rời"
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "(không nhánh, đang cải tổ HEAD %s đã tách rời)"
-#: ref-filter.c:1494
+#: ref-filter.c:1561
#, 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"
+msgid "(no branch, bisect started on %s)"
+msgstr "(không nhánh, di chuyển nửa bước được bắt đầu tại %s)"
-#: ref-filter.c:1504
-msgid "no branch"
-msgstr "không nhánh"
+#: ref-filter.c:1565
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD được tách rời tại %s)"
-#: ref-filter.c:1540 ref-filter.c:1749
+#: ref-filter.c:1568
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD được tách rời từ %s)"
+
+#: ref-filter.c:1571
+msgid "(no branch)"
+msgstr "(không nhánh)"
+
+#: ref-filter.c:1603 ref-filter.c:1812
#, c-format
msgid "missing object %s for %s"
msgstr "thiếu đối tượng %s cho %s"
-#: ref-filter.c:1550
+#: ref-filter.c:1613
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer gặp lỗi trên %s cho %s"
-#: ref-filter.c:2004
+#: ref-filter.c:1996
#, c-format
msgid "malformed object at '%s'"
msgstr "đối tượng dị hình tại “%s”"
-#: ref-filter.c:2093
+#: ref-filter.c:2085
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "đang lờ đi tham chiếu với tên hỏng %s"
-#: ref-filter.c:2389
+#: ref-filter.c:2090 refs.c:676
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "đang lờ đi tham chiếu hỏng %s"
+
+#: ref-filter.c:2430
#, c-format
msgid "format: %%(end) atom missing"
msgstr "định dạng: thiếu nguyên tử %%(end)"
-#: ref-filter.c:2489
-#, c-format
-msgid "option `%s' is incompatible with --merged"
-msgstr "tùy chọn “%s” là xung khắc với tùy chọn --merged"
-
-#: ref-filter.c:2492
-#, c-format
-msgid "option `%s' is incompatible with --no-merged"
-msgstr "tùy chọn “%s” là xung khắc với tùy chọn --no-merged"
-
-#: ref-filter.c:2502
+#: ref-filter.c:2529
#, c-format
msgid "malformed object name %s"
msgstr "tên đối tượng dị hình %s"
-#: ref-filter.c:2507
+#: ref-filter.c:2534
#, c-format
msgid "option `%s' must point to a commit"
msgstr "tùy chọn “%s” phải chỉ đến một lần chuyển giao"
-#: remote.c:366
+#: 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:566
+#, c-format
+msgid ""
+"Using '%s' as the name for the initial branch. This default branch name\n"
+"is subject to change. To configure the initial branch name to use in all\n"
+"of your new repositories, which will suppress this warning, call:\n"
+"\n"
+"\tgit config --global init.defaultBranch <name>\n"
+"\n"
+"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"'development'. The just-created branch can be renamed via this command:\n"
+"\n"
+"\tgit branch -m <name>\n"
+msgstr ""
+"Sử dụng '%s' làm tên cho nhánh ban đầu. Tên nhánh mặc định này\n"
+"có thể thay đổi. Để cấu hình tên nhánh khởi đầu sử dụng trong tất cả\n"
+"kho lưu trữ mới của bạn, cái mà sẽ ngăn chặn cảnh báo này, gọi lệnh:\n"
+"\n"
+"\tgit config --global init.defaultBranch <tên>\n"
+"\n"
+"Tên thường được chọn thay cho 'master' là 'main', 'trunk' và\n"
+"'development'. Nhánh vừa tạo có thể được đổi tên thông qua lệnh:\n"
+"\n"
+"\tgit branch -m <tên>\n"
+
+#: refs.c:588
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "không thể lấy về “%s”"
+
+#: refs.c:598
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "tên nhánh không hợp lệ: %s = %s"
+
+#: refs.c:674
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "đang lờ đi tham chiếu mềm thừa %s"
+
+#: refs.c:922
+#, 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:929
+#, 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:994
+#, c-format
+msgid "log for %s is empty"
+msgstr "nhật ký cho %s trống rỗng"
+
+#: refs.c:1086
+#, 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:1157
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "update_ref bị lỗi cho ref “%s”: %s"
+
+#: refs.c:2051
+#, 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:2131
+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:2142
+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:2242 refs.c:2272
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "“%s” sẵn có; không thể tạo “%s”"
+
+#: refs.c:2248 refs.c:2283
+#, 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:170
+#, 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:414
+#: 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:422
+#: 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:612
+#: 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:616
+#: 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:620
+#: remote.c:598
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s theo dõi cả %s và %s"
-#: remote.c:688
+#: remote.c:666
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr "khóa “%s” của mẫu k có “*”"
-#: remote.c:698
+#: remote.c:676
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr "giá trị “%s” của mẫu k có “*”"
-#: remote.c:1004
+#: remote.c:1083
#, c-format
msgid "src refspec %s does not match any"
msgstr "refspec %s nguồn không khớp bất kỳ cái gì"
-#: remote.c:1009
+#: remote.c:1088
#, c-format
msgid "src refspec %s matches more than one"
msgstr "refspec %s nguồn khớp nhiều hơn một"
@@ -6092,7 +6916,7 @@
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1024
+#: remote.c:1103
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
@@ -6117,7 +6941,7 @@
"Nếu cả hai là không thể, thì chúng tôi cũng chịu thua. Bạn phải dùng tham "
"chiếu dạng đầy đủ."
-#: remote.c:1044
+#: remote.c:1123
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
@@ -6128,7 +6952,7 @@
"Có phải ý bạn là một tạo một nhánh mới bằng cách đẩy lên\n"
"“%s:refs/heads/%s”?"
-#: remote.c:1049
+#: remote.c:1128
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
@@ -6139,7 +6963,7 @@
"Có phải ý bạn là một tạo một thẻ mới bằng cách đẩy lên\n"
"“%s:refs/tags/%s”?"
-#: remote.c:1054
+#: remote.c:1133
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
@@ -6150,7 +6974,7 @@
"Có phải ý bạn là một tạo một cây mới bằng cách đẩy lên\n"
"“%s:refs/tags/%s”?"
-#: remote.c:1059
+#: remote.c:1138
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
@@ -6161,115 +6985,115 @@
"Có phải ý bạn là một tạo một blob mới bằng cách đẩy lên\n"
"“%s:refs/tags/%s”?"
-#: remote.c:1095
+#: remote.c:1174
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "“%s” không thể được phân giải thành nhánh"
-#: remote.c:1106
+#: remote.c:1185
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "không thể xóa “%s”: tham chiếu trên máy chủ không tồn tại"
-#: remote.c:1118
+#: remote.c:1197
#, c-format
msgid "dst refspec %s matches more than one"
msgstr "dst refspec %s khớp nhiều hơn một"
-#: remote.c:1125
+#: remote.c:1204
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr "dst ref %s nhận từ hơn một nguồn"
-#: remote.c:1628 remote.c:1729
+#: remote.c:1724 remote.c:1825
msgid "HEAD does not point to a branch"
msgstr "HEAD không chỉ đến một nhánh nào cả"
-#: remote.c:1637
+#: remote.c:1733
#, c-format
msgid "no such branch: '%s'"
msgstr "không có nhánh nào như thế: “%s”"
-#: remote.c:1640
+#: remote.c:1736
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "không có thượng nguồn được cấu hình cho nhánh “%s”"
-#: remote.c:1646
+#: remote.c:1742
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
"nhánh thượng nguồn “%s” không được lưu lại như là một nhánh theo dõi máy chủ"
-#: remote.c:1661
+#: remote.c:1757
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "đẩy lên đích “%s” trên máy chủ “%s” không có nhánh theo dõi nội bộ"
-#: remote.c:1673
+#: remote.c:1769
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "nhánh “%s” không có máy chủ để đẩy lên"
-#: remote.c:1683
+#: remote.c:1779
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "đẩy refspecs cho “%s” không bao gồm “%s”"
-#: remote.c:1696
+#: remote.c:1792
msgid "push has no destination (push.default is 'nothing')"
msgstr "đẩy lên mà không có đích (push.default là “nothing”)"
-#: remote.c:1718
+#: remote.c:1814
msgid "cannot resolve 'simple' push to a single destination"
msgstr "không thể phân giải đẩy “đơn giản” đến một đích đơn"
-#: remote.c:1844
+#: remote.c:1943
#, c-format
msgid "couldn't find remote ref %s"
msgstr "không thể tìm thấy tham chiếu máy chủ %s"
-#: remote.c:1857
+#: remote.c:1956
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "* Đang bỏ qua tham chiếu thú vị nội bộ “%s”"
-#: remote.c:2020
+#: remote.c:2119
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
"Nhánh của bạn dựa trên cơ sở là “%s”, nhưng trên thượng nguồn không còn.\n"
-#: remote.c:2024
+#: remote.c:2123
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (dùng \" git branch --unset-upstream\" để sửa)\n"
-#: remote.c:2027
+#: remote.c:2126
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "Nhánh của bạn đã cập nhật với “%s”.\n"
-#: remote.c:2031
+#: remote.c:2130
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "Nhánh của bạn và “%s” tham chiếu đến các lần chuyển giao khác nhau.\n"
-#: remote.c:2034
+#: remote.c:2133
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " (dùng \"%s\" để biết thêm chi tiết)\n"
-#: remote.c:2038
+#: remote.c:2137
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "Nhánh của bạn đứng trước “%s” %d lần chuyển giao.\n"
-#: remote.c:2044
+#: remote.c:2143
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (dùng \"git push\" để xuất bản các lần chuyển giao nội bộ của bạn)\n"
-#: remote.c:2047
+#: remote.c:2146
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -6278,11 +7102,11 @@
"Nhánh của bạn đứng đằng sau “%s” %d lần chuyển giao, và có thể được chuyển-"
"tiếp-nhanh.\n"
-#: remote.c:2055
+#: remote.c:2154
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (dùng \"git pull\" để cập nhật nhánh nội bộ của bạn)\n"
-#: remote.c:2058
+#: remote.c:2157
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -6295,13 +7119,13 @@
"và có %d và %d lần chuyển giao khác nhau cho từng cái,\n"
"tương ứng với mỗi lần.\n"
-#: remote.c:2068
+#: remote.c:2167
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
" (dùng \"git pull\" để hòa trộn nhánh trên máy chủ vào trong nhánh của "
"bạn)\n"
-#: remote.c:2251
+#: remote.c:2359
#, 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”"
@@ -6321,126 +7145,135 @@
msgid "replace depth too high for object %s"
msgstr "độ sâu thay thế quá cao cho đối tượng %s"
-#: rerere.c:217 rerere.c:226 rerere.c:229
+#: rerere.c:201 rerere.c:210 rerere.c:213
msgid "corrupt MERGE_RR"
msgstr "MERGE_RR sai hỏng"
-#: rerere.c:264 rerere.c:269
+#: rerere.c:248 rerere.c:253
msgid "unable to write rerere record"
msgstr "không thể ghi bản ghi rerere"
-#: rerere.c:495
+#: rerere.c:479
#, c-format
msgid "there were errors while writing '%s' (%s)"
msgstr "gặp lỗi đọc khi đang ghi “%s” (%s)"
-#: rerere.c:498
+#: rerere.c:482
#, c-format
msgid "failed to flush '%s'"
msgstr "gặp lỗi khi đẩy dữ liệu “%s” lên đĩa"
-#: rerere.c:503 rerere.c:1039
+#: rerere.c:487 rerere.c:1023
#, c-format
msgid "could not parse conflict hunks in '%s'"
msgstr "không thể phân tích các mảnh xung đột trong “%s”"
-#: rerere.c:684
+#: rerere.c:668
#, c-format
msgid "failed utime() on '%s'"
msgstr "gặp lỗi utime() trên “%s”"
-#: rerere.c:694
+#: rerere.c:678
#, c-format
msgid "writing '%s' failed"
msgstr "gặp lỗi khi đang ghi “%s”"
-#: rerere.c:714
+#: rerere.c:698
#, c-format
msgid "Staged '%s' using previous resolution."
msgstr "Đã tạm cất “%s” sử dụng cách phân giải kế trước."
-#: rerere.c:753
+#: rerere.c:737
#, c-format
msgid "Recorded resolution for '%s'."
msgstr "Cách giải quyết đã ghi lại cho “%s”."
-#: rerere.c:788
+#: rerere.c:772
#, c-format
msgid "Resolved '%s' using previous resolution."
msgstr "Đã phân giải giải “%s” sử dụng cách giải quyết kế trước."
-#: rerere.c:803
+#: rerere.c:787
#, c-format
msgid "cannot unlink stray '%s'"
msgstr "không thể unlink stray “%s”"
-#: rerere.c:807
+#: rerere.c:791
#, c-format
msgid "Recorded preimage for '%s'"
msgstr "Preimage đã được ghi lại cho “%s”"
-#: rerere.c:881 submodule.c:2078 builtin/log.c:1871
-#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
+#: rerere.c:865 submodule.c:2088 builtin/log.c:1991
+#: 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”"
-#: rerere.c:1057
+#: rerere.c:1041
#, c-format
msgid "failed to update conflicted state in '%s'"
msgstr "gặp lỗi khi chạy cập nhật trạng thái bị xung đột trong “%s”"
-#: rerere.c:1068 rerere.c:1075
+#: rerere.c:1052 rerere.c:1059
#, c-format
msgid "no remembered resolution for '%s'"
msgstr "đừng nhó các giải quyết cho “%s”"
-#: rerere.c:1077
+#: rerere.c:1061
#, c-format
msgid "cannot unlink '%s'"
msgstr "không thể unlink “%s”"
-#: rerere.c:1087
+#: rerere.c:1071
#, c-format
msgid "Updated preimage for '%s'"
msgstr "Đã cập nhật preimage cho “%s”"
-#: rerere.c:1096
+#: rerere.c:1080
#, c-format
msgid "Forgot resolution for '%s'\n"
msgstr "Quên phân giải cho “%s”\n"
-#: rerere.c:1199
+#: rerere.c:1191
msgid "unable to open rr-cache directory"
msgstr "không thể mở thư mục rr-cache"
-#: revision.c:2497
+#: 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:3468
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "gặp lỗi khi tìm cây của %s"
+
+#: revision.c:2338
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "--unpacked=<packfile> không còn được hỗ trợ nữa"
+
+#: revision.c:2668
msgid "your current branch appears to be broken"
msgstr "nhánh hiện tại của bạn có vẻ như bị hỏng"
-#: revision.c:2500
+#: revision.c:2671
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "nhánh hiện tại của bạn “%s” không có một lần chuyển giao nào cả"
-#: revision.c:2708
-msgid "--first-parent is incompatible with --bisect"
-msgstr "--first-parent xung khắc với --bisect"
-
-#: revision.c:2712
+#: revision.c:2877
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"
-#: run-command.c:763
+#: run-command.c:767
msgid "open /dev/null failed"
msgstr "gặp lỗi khi mở “/dev/null”"
-#: run-command.c:1269
+#: run-command.c:1274
#, 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:1338
#, c-format
msgid ""
"The '%s' hook was ignored because it's not set as executable.\n"
@@ -6449,30 +7282,34 @@
"Móc “%s” bị bỏ qua bởi vì nó không thể đặt là thực thi được.\n"
"Bạn có thể tắt cảnh báo này bằng “git config advice.ignoredHook false“."
-#: send-pack.c:144
+#: send-pack.c:146
msgid "unexpected flush packet while reading remote unpack status"
msgstr ""
"gặp gói flush không cần trong khi đọc tình trạng giải nén gói trên máy chủ"
-#: send-pack.c:146
+#: send-pack.c:148
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "không thể phân tích tình trạng unpack máy chủ: %s"
-#: send-pack.c:148
+#: send-pack.c:150
#, c-format
msgid "remote unpack failed: %s"
msgstr "máy chủ gặp lỗi unpack: %s"
-#: send-pack.c:309
+#: send-pack.c:374
msgid "failed to sign the push certificate"
msgstr "gặp lỗi khi ký chứng thực đẩy"
-#: send-pack.c:423
+#: send-pack.c:467
+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:476
msgid "the receiving end does not support --signed push"
msgstr "kết thúc nhận không hỗ trợ đẩy --signed"
-#: send-pack.c:425
+#: send-pack.c:478
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -6480,47 +7317,47 @@
"đừng gửi giấy chứng nhận đẩy trước khi kết thúc nhận không hỗ trợ đẩy --"
"signed"
-#: send-pack.c:437
+#: send-pack.c:490
msgid "the receiving end does not support --atomic push"
msgstr "kết thúc nhận không hỗ trợ đẩy --atomic"
-#: send-pack.c:442
+#: send-pack.c:495
msgid "the receiving end does not support push options"
msgstr "kết thúc nhận không hỗ trợ các tùy chọn của lệnh push"
-#: sequencer.c:191
+#: sequencer.c:195
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "chế độ dọn dẹp ghi chú các lần chuyển giao không hợp lệ “%s”"
-#: sequencer.c:296
+#: sequencer.c:323
#, c-format
msgid "could not delete '%s'"
msgstr "không thể xóa bỏ “%s”"
-#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385
+#: sequencer.c:343 builtin/rebase.c:757 builtin/rebase.c:1602 builtin/rm.c:385
#, c-format
msgid "could not remove '%s'"
msgstr "không thể gỡ bỏ “%s”"
-#: sequencer.c:325
+#: sequencer.c:353
msgid "revert"
msgstr "hoàn nguyên"
-#: sequencer.c:327
+#: sequencer.c:355
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:329
+#: sequencer.c:357
msgid "rebase"
msgstr "rebase"
-#: sequencer.c:331
+#: sequencer.c:359
#, c-format
msgid "unknown action: %d"
msgstr "không nhận ra thao tác: %d"
-#: sequencer.c:389
+#: sequencer.c:418
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -6528,7 +7365,7 @@
"sau khi giải quyết các xung đột, đánh dấu đường dẫn đã sửa\n"
"với lệnh “git add </các/đường/dẫn>” hoặc “git rm </các/đường/dẫn>”"
-#: sequencer.c:392
+#: sequencer.c:421
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -6538,44 +7375,43 @@
"với lệnh “git add </các/đường/dẫn>” hoặc “git rm </các/đường/dẫn>”\n"
"và chuyển giao kết quả bằng lệnh “git commit”"
-#: sequencer.c:405 sequencer.c:2901
+#: sequencer.c:434 sequencer.c:3070
#, c-format
msgid "could not lock '%s'"
msgstr "không thể khóa “%s”"
-#: sequencer.c:412
+#: sequencer.c:436 sequencer.c:2869 sequencer.c:3074 sequencer.c:3088
+#: sequencer.c:3345 sequencer.c:5334 strbuf.c:1168 wrapper.c:631
+#, c-format
+msgid "could not write to '%s'"
+msgstr "không thể ghi vào “%s”"
+
+#: sequencer.c:441
#, c-format
msgid "could not write eol to '%s'"
msgstr "không thể ghi eol vào “%s”"
-#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921
-#: sequencer.c:3185
+#: sequencer.c:446 sequencer.c:2874 sequencer.c:3076 sequencer.c:3090
+#: sequencer.c:3353
#, c-format
msgid "failed to finalize '%s'"
msgstr "gặp lỗi khi hoàn thành “%s”"
-#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
-#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
-#: builtin/rebase.c:593
-#, c-format
-msgid "could not read '%s'"
-msgstr "không thể đọc “%s”"
-
-#: sequencer.c:466
+#: sequencer.c:485
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "các thay đổi nội bộ của bạn có thể bị ghi đè bởi lệnh %s."
-#: sequencer.c:470
+#: sequencer.c:489
msgid "commit your changes or stash them to proceed."
msgstr "chuyển giao các thay đổi của bạn hay tạm cất (stash) chúng để xử lý."
-#: sequencer.c:502
+#: sequencer.c:521
#, c-format
msgid "%s: fast-forward"
msgstr "%s: chuyển-tiếp-nhanh"
-#: sequencer.c:541 builtin/tag.c:565
+#: sequencer.c:560 builtin/tag.c:598
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Chế độ dọn dẹp không hợp lệ %s"
@@ -6583,65 +7419,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:635
+#: sequencer.c:670
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Không thể ghi tập tin lưu bảng mục lục mới"
-#: sequencer.c:652
+#: sequencer.c:684
msgid "unable to update cache tree"
msgstr "không thể cập nhật cây bộ nhớ đệm"
-#: sequencer.c:666
+#: sequencer.c:698
msgid "could not resolve HEAD commit"
msgstr "không thể phân giải lần chuyển giao HEAD"
-#: sequencer.c:746
+#: sequencer.c:778
#, c-format
msgid "no key present in '%.*s'"
msgstr "không có khóa hiện diện trong “%.*s”"
-#: sequencer.c:757
+#: sequencer.c:789
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "không thể giải trích dẫn giá trị của “%s”"
-#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710
-#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072
+#: sequencer.c:826 wrapper.c:201 wrapper.c:371 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1136 builtin/rebase.c:910
#, c-format
msgid "could not open '%s' for reading"
msgstr "không thể mở “%s” để đọc"
-#: sequencer.c:804
+#: sequencer.c:836
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "“GIT_AUTHOR_NAME” đã sẵn đưa ra rồi"
-#: sequencer.c:809
+#: sequencer.c:841
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "“GIT_AUTHOR_EMAIL” đã sẵn đưa ra rồi"
-#: sequencer.c:814
+#: sequencer.c:846
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "“GIT_AUTHOR_DATE” đã sẵn đưa ra rồi"
-#: sequencer.c:818
+#: sequencer.c:850
#, c-format
msgid "unknown variable '%s'"
msgstr "không hiểu biến “%s”"
-#: sequencer.c:823
+#: sequencer.c:855
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "thiếu “GIT_AUTHOR_NAME”"
-#: sequencer.c:825
+#: sequencer.c:857
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "thiếu “GIT_AUTHOR_EMAIL”"
-#: sequencer.c:827
+#: sequencer.c:859
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "thiếu “GIT_AUTHOR_DATE”"
-#: sequencer.c:876
+#: sequencer.c:924
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -6670,11 +7506,11 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:1148
+#: sequencer.c:1211
msgid "'prepare-commit-msg' hook failed"
msgstr "móc “prepare-commit-msg” bị lỗi"
-#: sequencer.c:1154
+#: sequencer.c:1217
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6705,7 +7541,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1167
+#: sequencer.c:1230
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6733,327 +7569,341 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1209
+#: sequencer.c:1272
msgid "couldn't look up newly created commit"
msgstr "không thể tìm thấy lần chuyển giao mới hơn đã được tạo"
-#: sequencer.c:1211
+#: sequencer.c:1274
msgid "could not parse newly created commit"
msgstr ""
"không thể phân tích cú pháp của đối tượng chuyển giao mới hơn đã được tạo"
-#: sequencer.c:1257
+#: sequencer.c:1320
msgid "unable to resolve HEAD after creating commit"
msgstr "không thể phân giải HEAD sau khi tạo lần chuyển giao"
-#: sequencer.c:1259
+#: sequencer.c:1322
msgid "detached HEAD"
msgstr "đã rời khỏi HEAD"
-#: sequencer.c:1263
+#: sequencer.c:1326
msgid " (root-commit)"
msgstr " (root-commit)"
-#: sequencer.c:1284
+#: sequencer.c:1347
msgid "could not parse HEAD"
msgstr "không thể phân tích HEAD"
-#: sequencer.c:1286
+#: sequencer.c:1349
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s không phải là một lần chuyển giao!"
-#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574
+#: sequencer.c:1353 sequencer.c:1431 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:1342 sequencer.c:1968
+#: sequencer.c:1409 sequencer.c:2108
msgid "unable to parse commit author"
msgstr "không thể phân tích tác giả của lần chuyển giao"
-#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687
+#: sequencer.c:1420 builtin/am.c:1566 builtin/merge.c:702
msgid "git write-tree failed to write a tree"
msgstr "lệnh git write-tree gặp lỗi khi ghi một cây"
-#: sequencer.c:1386 sequencer.c:1447
+#: sequencer.c:1453 sequencer.c:1573
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "không thể đọc phần chú thích (message) từ “%s”"
-#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886
-#: builtin/merge.c:911
+#: sequencer.c:1484 sequencer.c:1516
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr "định danh tác giả không hợp lệ “%s”"
+
+#: sequencer.c:1490
+msgid "corrupt author: missing date information"
+msgstr "tác giả sai hỏng: thiếu thông tin này tháng"
+
+#: sequencer.c:1529 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:905
+#: builtin/merge.c:930 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "gặp lỗi khi ghi đối tượng chuyển giao"
-#: sequencer.c:1474
+#: sequencer.c:1556 sequencer.c:4291 t/helper/test-fast-rebase.c:198
+#, c-format
+msgid "could not update %s"
+msgstr "không thể cập nhật %s"
+
+#: sequencer.c:1605
#, c-format
msgid "could not parse commit %s"
msgstr "không thể phân tích lần chuyển giao %s"
-#: sequencer.c:1479
+#: sequencer.c:1610
#, c-format
msgid "could not parse parent commit %s"
msgstr "không thể phân tích lần chuyển giao cha mẹ “%s”"
-#: sequencer.c:1562 sequencer.c:1673
+#: sequencer.c:1693 sequencer.c:1804
#, c-format
msgid "unknown command: %d"
msgstr "không hiểu câu lệnh %d"
-#: sequencer.c:1620 sequencer.c:1645
+#: sequencer.c:1751 sequencer.c:1776
#, c-format
msgid "This is a combination of %d commits."
msgstr "Đây là tổ hợp của %d lần chuyển giao."
-#: sequencer.c:1630
+#: sequencer.c:1761
msgid "need a HEAD to fixup"
msgstr "cần một HEAD để sửa"
-#: sequencer.c:1632 sequencer.c:3212
+#: sequencer.c:1763 sequencer.c:3380
msgid "could not read HEAD"
msgstr "không thể đọc HEAD"
-#: sequencer.c:1634
+#: sequencer.c:1765
msgid "could not read HEAD's commit message"
msgstr "không thể đọc phần chú thích (message) của HEAD"
-#: sequencer.c:1640
+#: sequencer.c:1771
#, c-format
msgid "cannot write '%s'"
msgstr "không thể ghi “%s”"
-#: sequencer.c:1647 git-rebase--preserve-merges.sh:496
+#: sequencer.c:1778 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:1655
+#: sequencer.c:1786
#, c-format
msgid "could not read commit message of %s"
msgstr "không thể đọc phần chú thích (message) của %s"
-#: sequencer.c:1662
+#: sequencer.c:1793
#, c-format
msgid "This is the commit message #%d:"
msgstr "Đây là chú thích cho lần chuyển giao thứ #%d:"
-#: sequencer.c:1668
+#: sequencer.c:1799
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Chú thích cho lần chuyển giao thứ #%d sẽ bị bỏ qua:"
-#: sequencer.c:1756
+#: sequencer.c:1887
msgid "your index file is unmerged."
msgstr "tập tin lưu mục lục của bạn không được hòa trộn."
-#: sequencer.c:1763
+#: sequencer.c:1894
msgid "cannot fixup root commit"
msgstr "không thể sửa chữa lần chuyển giao gốc"
-#: sequencer.c:1782
+#: sequencer.c:1913
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "lần chuyển giao %s là một lần hòa trộn nhưng không đưa ra tùy chọn -m."
-#: sequencer.c:1790 sequencer.c:1798
+#: sequencer.c:1921 sequencer.c:1929
#, c-format
msgid "commit %s does not have parent %d"
msgstr "lần chuyển giao %s không có cha mẹ %d"
-#: sequencer.c:1804
+#: sequencer.c:1935
#, c-format
msgid "cannot get commit message for %s"
msgstr "không thể lấy ghi chú lần chuyển giao cho %s"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1823
+#: sequencer.c:1954
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: không thể phân tích lần chuyển giao mẹ của %s"
-#: sequencer.c:1888
+#: sequencer.c:2019
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "không thể đổi tên “%s” thành “%s”"
-#: sequencer.c:1943
+#: sequencer.c:2079
#, c-format
msgid "could not revert %s... %s"
msgstr "không thể hoàn nguyên %s… %s"
-#: sequencer.c:1944
+#: sequencer.c:2080
#, c-format
msgid "could not apply %s... %s"
msgstr "không thể áp dụng miếng vá %s… %s"
-#: sequencer.c:1961
+#: sequencer.c:2100
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "xóa %s %s -- vá nội dung thượng nguồn đã có\n"
-#: sequencer.c:2018
+#: sequencer.c:2158
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: gặp lỗi đọc bảng mục lục"
-#: sequencer.c:2025
+#: sequencer.c:2165
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: gặp lỗi khi làm tươi mới bảng mục lục"
-#: sequencer.c:2102
+#: sequencer.c:2242
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s không nhận các đối số: “%s”"
-#: sequencer.c:2111
+#: sequencer.c:2251
#, c-format
msgid "missing arguments for %s"
msgstr "thiếu đối số cho %s"
-#: sequencer.c:2142
+#: sequencer.c:2282
#, c-format
msgid "could not parse '%s'"
msgstr "không thể phân tích cú pháp “%s”"
-#: sequencer.c:2203
+#: sequencer.c:2343
#, c-format
msgid "invalid line %d: %.*s"
msgstr "dòng không hợp lệ %d: %.*s"
-#: sequencer.c:2214
+#: sequencer.c:2354
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "không thể “%s” thể mà không có lần chuyển giao kế trước"
-#: sequencer.c:2298
+#: sequencer.c:2440
msgid "cancelling a cherry picking in progress"
msgstr "đang hủy bỏ thao tác cherry pick đang thực hiện"
-#: sequencer.c:2305
+#: sequencer.c:2449
msgid "cancelling a revert in progress"
msgstr "đang hủy bỏ các thao tác hoàn nguyên đang thực hiện"
-#: sequencer.c:2349
+#: sequencer.c:2493
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "vui lòng sửa lỗi này bằng cách dùng “git rebase --edit-todo”."
-#: sequencer.c:2351
+#: sequencer.c:2495
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "bảng chỉ thị không thể dùng được: %s"
-#: sequencer.c:2356
+#: sequencer.c:2500
msgid "no commits parsed."
msgstr "không có lần chuyển giao nào được phân tích."
-#: sequencer.c:2367
+#: sequencer.c:2511
msgid "cannot cherry-pick during a revert."
msgstr "không thể cherry-pick trong khi hoàn nguyên."
-#: sequencer.c:2369
+#: sequencer.c:2513
msgid "cannot revert during a cherry-pick."
msgstr "không thể thực hiện việc hoàn nguyên trong khi đang cherry-pick."
-#: sequencer.c:2447
+#: sequencer.c:2591
#, c-format
msgid "invalid value for %s: %s"
msgstr "giá trị cho %s không hợp lệ: %s"
-#: sequencer.c:2540
+#: sequencer.c:2698
msgid "unusable squash-onto"
msgstr "squash-onto không dùng được"
-#: sequencer.c:2556
+#: sequencer.c:2718
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "bảng tùy chọn dị hình: “%s”"
-#: sequencer.c:2644 sequencer.c:4361
+#: sequencer.c:2811 sequencer.c:4644
msgid "empty commit set passed"
msgstr "lần chuyển giao trống rỗng đặt là hợp quy cách"
-#: sequencer.c:2660
+#: sequencer.c:2828
msgid "revert is already in progress"
msgstr "có thao tác hoàn nguyên đang được thực hiện"
-#: sequencer.c:2662
+#: sequencer.c:2830
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "hãy thử \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:2665
+#: sequencer.c:2833
msgid "cherry-pick is already in progress"
msgstr "có thao tác “cherry-pick” đang được thực hiện"
-#: sequencer.c:2667
+#: sequencer.c:2835
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "hãy thử \"git cherry-pick (--continue | %s--abort | --quit)\""
-#: sequencer.c:2681
+#: sequencer.c:2849
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "không thể tạo thư mục xếp dãy “%s”"
-#: sequencer.c:2696
+#: sequencer.c:2864
msgid "could not lock HEAD"
msgstr "không thể khóa HEAD"
-#: sequencer.c:2756 sequencer.c:4099
+#: sequencer.c:2924 sequencer.c:4379
msgid "no cherry-pick or revert in progress"
msgstr "không cherry-pick hay hoàn nguyên trong tiến trình"
-#: sequencer.c:2758 sequencer.c:2769
+#: sequencer.c:2926 sequencer.c:2937
msgid "cannot resolve HEAD"
msgstr "không thể phân giải HEAD"
-#: sequencer.c:2760 sequencer.c:2804
+#: sequencer.c:2928 sequencer.c:2972
msgid "cannot abort from a branch yet to be born"
msgstr "không thể hủy bỏ từ một nhánh mà nó còn chưa được tạo ra"
-#: sequencer.c:2790 builtin/grep.c:724
+#: sequencer.c:2958 builtin/grep.c:757
#, c-format
msgid "cannot open '%s'"
msgstr "không mở được “%s”"
-#: sequencer.c:2792
+#: sequencer.c:2960
#, c-format
msgid "cannot read '%s': %s"
msgstr "không thể đọc “%s”: %s"
-#: sequencer.c:2793
+#: sequencer.c:2961
msgid "unexpected end of file"
msgstr "gặp kết thúc tập tin đột xuất"
-#: sequencer.c:2799
+#: sequencer.c:2967
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "tập tin HEAD “pre-cherry-pick” đã lưu “%s” bị hỏng"
-#: sequencer.c:2810
+#: sequencer.c:2978
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Bạn có lẽ đã có HEAD đã bị di chuyển đi, Không thể tua, kiểm tra HEAD của "
"bạn!"
-#: sequencer.c:2851
+#: sequencer.c:3019
msgid "no revert in progress"
msgstr "không có tiến trình hoàn nguyên nào"
-#: sequencer.c:2859
+#: sequencer.c:3028
msgid "no cherry-pick in progress"
msgstr "không có cherry-pick đang được thực hiện"
-#: sequencer.c:2869
+#: sequencer.c:3038
msgid "failed to skip the commit"
msgstr "gặp lỗi khi bỏ qua đối tượng chuyển giao"
-#: sequencer.c:2876
+#: sequencer.c:3045
msgid "there is nothing to skip"
msgstr "ở đây không có gì để mà bỏ qua cả"
-#: sequencer.c:2879
+#: sequencer.c:3048
#, c-format
msgid ""
"have you committed already?\n"
@@ -7062,21 +7912,16 @@
"bạn đã sẵn sàng chuyển giao chưa?\n"
"thử \"git %s --continue\""
-#: sequencer.c:3003 sequencer.c:4011
-#, c-format
-msgid "could not update %s"
-msgstr "không thể cập nhật %s"
-
-#: sequencer.c:3042 sequencer.c:3991
+#: sequencer.c:3210 sequencer.c:4271
msgid "cannot read HEAD"
msgstr "không thể đọc HEAD"
-#: sequencer.c:3059
+#: sequencer.c:3227
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "không thể chép “%s” sang “%s”"
-#: sequencer.c:3067
+#: sequencer.c:3235
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -7095,22 +7940,27 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:3077
+#: sequencer.c:3245
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "Không thể áp dụng %s… %.*s"
-#: sequencer.c:3084
+#: sequencer.c:3252
#, c-format
msgid "Could not merge %.*s"
msgstr "Không hòa trộn %.*s"
-#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641
+#: sequencer.c:3266 sequencer.c:3270 builtin/difftool.c:640
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "không thể chép “%s” sang “%s”"
-#: sequencer.c:3129
+#: sequencer.c:3282
+#, c-format
+msgid "Executing: %s\n"
+msgstr "Đang thực thi: %s\n"
+
+#: sequencer.c:3297
#, c-format
msgid ""
"execution failed: %s\n"
@@ -7125,11 +7975,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3135
+#: sequencer.c:3303
msgid "and made changes to the index and/or the working tree\n"
msgstr "và tạo các thay đổi bảng mục lục và/hay cây làm việc\n"
-#: sequencer.c:3141
+#: sequencer.c:3309
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -7146,103 +7996,124 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3202
+#: sequencer.c:3370
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "tên nhãn dị hình: “%.*s”"
-#: sequencer.c:3256
+#: sequencer.c:3424
msgid "writing fake root commit"
msgstr "ghi lần chuyển giao gốc giả"
-#: sequencer.c:3261
+#: sequencer.c:3429
msgid "writing squash-onto"
msgstr "đang ghi squash-onto"
-#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886
-#, c-format
-msgid "failed to find tree of %s"
-msgstr "gặp lỗi khi tìm cây của %s"
-
-#: sequencer.c:3344
+#: sequencer.c:3513
#, c-format
msgid "could not resolve '%s'"
msgstr "không thể phân giải “%s”"
-#: sequencer.c:3375
+#: sequencer.c:3546
msgid "cannot merge without a current revision"
msgstr "không thể hòa trộn mà không có một điểm xét duyệt hiện tại"
-#: sequencer.c:3397
+#: sequencer.c:3568
#, c-format
msgid "unable to parse '%.*s'"
msgstr "không thể phân tích “%.*s”"
-#: sequencer.c:3406
+#: sequencer.c:3577
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "chẳng có gì để hòa trộn: “%.*s”"
-#: sequencer.c:3418
+#: sequencer.c:3589
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "hòa trộn octopus không thể được thực thi trên đỉnh của một [new root]"
-#: sequencer.c:3434
+#: sequencer.c:3605
#, c-format
msgid "could not get commit message of '%s'"
msgstr "không thể lấy chú thích của lần chuyển giao của “%s”"
-#: sequencer.c:3594
+#: sequencer.c:3788
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "không thể ngay cả khi thử hòa trộn “%.*s”"
-#: sequencer.c:3610
+#: sequencer.c:3804
msgid "merge: Unable to write new index file"
msgstr "merge: Không thể ghi tập tin lưu bảng mục lục mới"
-#: sequencer.c:3679 builtin/rebase.c:737
+#: sequencer.c:3878
+msgid "Cannot autostash"
+msgstr "Không thể autostash"
+
+#: sequencer.c:3881
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "Gặp đáp ứng stash không cần: “%s”"
+
+#: sequencer.c:3887
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "Không thể tạo thư mục cho “%s”"
+
+#: sequencer.c:3890
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "Đã tạo autostash: %s\n"
+
+#: sequencer.c:3894
+msgid "could not reset --hard"
+msgstr "không thể reset --hard"
+
+#: sequencer.c:3919
#, c-format
msgid "Applied autostash.\n"
msgstr "Đã áp dụng autostash.\n"
-#: sequencer.c:3691
+#: sequencer.c:3931
#, c-format
msgid "cannot store %s"
msgstr "không thử lưu “%s”"
-#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113
+#: sequencer.c:3934
#, 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:3755
-#, c-format
-msgid "%s: not a valid OID"
-msgstr "%s không phải là một OID hợp lệ"
+#: sequencer.c:3939
+msgid "Applying autostash resulted in conflicts."
+msgstr "Áp dụng autostash có hiệu quả trong các xung đột."
-#: sequencer.c:3760 git-rebase--preserve-merges.sh:779
+#: sequencer.c:3940
+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:4033 git-rebase--preserve-merges.sh:769
msgid "could not detach HEAD"
msgstr "không thể tách rời HEAD"
-#: sequencer.c:3775
+#: sequencer.c:4048
#, c-format
msgid "Stopped at HEAD\n"
msgstr "Dừng lại ở HEAD\n"
-#: sequencer.c:3777
+#: sequencer.c:4050
#, c-format
msgid "Stopped at %s\n"
msgstr "Dừng lại ở %s\n"
-#: sequencer.c:3785
+#: sequencer.c:4058
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -7263,48 +8134,58 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:3869
+#: sequencer.c:4104
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "Đang cải tổ (%d/%d)%s"
+
+#: sequencer.c:4149
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Dừng lại ở %s… %.*s\n"
-#: sequencer.c:3940
+#: sequencer.c:4220
#, c-format
msgid "unknown command %d"
msgstr "không hiểu câu lệnh %d"
-#: sequencer.c:3999
+#: sequencer.c:4279
msgid "could not read orig-head"
msgstr "không thể đọc orig-head"
-#: sequencer.c:4004
+#: sequencer.c:4284
msgid "could not read 'onto'"
msgstr "không thể đọc “onto”."
-#: sequencer.c:4018
+#: sequencer.c:4298
#, c-format
msgid "could not update HEAD to %s"
msgstr "không thể cập nhật HEAD thành %s"
-#: sequencer.c:4111
+#: sequencer.c:4358
+#, 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:4391
msgid "cannot rebase: You have unstaged changes."
msgstr "không thể cải tổ: Bạn có các thay đổi chưa được đưa lên bệ phóng."
-#: sequencer.c:4120
+#: sequencer.c:4400
msgid "cannot amend non-existing commit"
msgstr "không thể tu bỏ một lần chuyển giao không tồn tại"
-#: sequencer.c:4122
+#: sequencer.c:4402
#, c-format
msgid "invalid file: '%s'"
msgstr "tập tin không hợp lệ: “%s”"
-#: sequencer.c:4124
+#: sequencer.c:4404
#, c-format
msgid "invalid contents: '%s'"
msgstr "nội dung không hợp lệ: “%s”"
-#: sequencer.c:4127
+#: sequencer.c:4407
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -7314,59 +8195,59 @@
"Bạn có các thay đổi chưa chuyển giao trong thư mục làm việc. Vui lòng\n"
"chuyển giao chúng trước và sau đó chạy lệnh “git rebase --continue” lần nữa."
-#: sequencer.c:4163 sequencer.c:4202
+#: sequencer.c:4443 sequencer.c:4482
#, c-format
msgid "could not write file: '%s'"
msgstr "không thể ghi tập tin: “%s”"
-#: sequencer.c:4217
+#: sequencer.c:4498
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "không thể xóa bỏ CHERRY_PICK_HEAD"
-#: sequencer.c:4224
+#: sequencer.c:4505
msgid "could not commit staged changes."
msgstr "không thể chuyển giao các thay đổi đã đưa lên bệ phóng."
-#: sequencer.c:4338
+#: sequencer.c:4621
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: không thể cherry-pick một %s"
-#: sequencer.c:4342
+#: sequencer.c:4625
#, c-format
msgid "%s: bad revision"
msgstr "%s: điểm xét duyệt sai"
-#: sequencer.c:4377
+#: sequencer.c:4660
msgid "can't revert as initial commit"
msgstr "không thể hoàn nguyên một lần chuyển giao khởi tạo"
-#: sequencer.c:4846
+#: sequencer.c:5137
msgid "make_script: unhandled options"
msgstr "make_script: các tùy chọn được không xử lý"
-#: sequencer.c:4849
+#: sequencer.c:5140
msgid "make_script: error preparing revisions"
msgstr "make_script: lỗi chuẩn bị điểm hiệu chỉnh"
-#: sequencer.c:5083 sequencer.c:5100
+#: sequencer.c:5382 sequencer.c:5399
msgid "nothing to do"
msgstr "không có gì để làm"
-#: sequencer.c:5119
+#: sequencer.c:5418
msgid "could not skip unnecessary pick commands"
msgstr "không thể bỏ qua các lệnh cậy (pick) không cần thiết"
-#: sequencer.c:5213
+#: sequencer.c:5512
msgid "the script was already rearranged."
msgstr "văn lệnh đã sẵn được sắp đặt rồi."
-#: setup.c:124
+#: setup.c:133
#, c-format
msgid "'%s' is outside repository at '%s'"
-msgstr "“%s” ngoài một kho chứa tại '%s'"
+msgstr "“%s” ngoài một kho chứa tại “%s”"
-#: setup.c:175
+#: setup.c:185
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
@@ -7376,7 +8257,7 @@
"Dùng “git <lệnh> -- <đường/dẫn>…” để chỉ định đường dẫn mà nó không tồn tại "
"một cách nội bộ."
-#: setup.c:188
+#: setup.c:198
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -7388,12 +8269,12 @@
"Dùng “--” để ngăn cách các đường dẫn khỏi điểm xem xét, như thế này:\n"
"“git <lệnh> [<điểm xem xét>…] -- [<tập tin>…]”"
-#: setup.c:254
+#: setup.c: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:273
+#: setup.c:283
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -7404,92 +8285,96 @@
"Dùng “--” để ngăn cách các đường dẫn khỏi điểm xem xét, như thế này:\n"
"“git <lệnh> [<điểm xem xét>…] -- [<tập tin>…]”"
-#: setup.c:409
+#: setup.c: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:413
+#: 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:559
+#: 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:567
+#: 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:586
+#: 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:588
+#: 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:590
+#: setup.c:704
#, c-format
msgid "error reading %s"
msgstr "gặp lỗi khi đọc %s"
-#: setup.c:592
+#: 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:594
+#: 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:596
+#: setup.c:710
#, c-format
msgid "not a git repository: %s"
msgstr "không phải là kho git: %s"
-#: setup.c:695
+#: setup.c:812
#, c-format
msgid "'$%s' too big"
msgstr "“$%s” quá lớn"
-#: setup.c:709
+#: setup.c:826
#, c-format
msgid "not a git repository: '%s'"
msgstr "không phải là kho git: “%s”"
-#: setup.c:738 setup.c:740 setup.c:771
+#: setup.c: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:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856
+#: 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:870
+#: 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:1108
+#: 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:1117 setup.c:1123
+#: setup.c:1234 setup.c:1240
#, c-format
msgid "cannot change to '%s'"
msgstr "không thể chuyển sang “%s”"
-#: setup.c:1128
+#: 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:1134
+#: setup.c:1251
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
@@ -7499,7 +8384,7 @@
"Dừng tại biên của hệ thống tập tin (GIT_DISCOVERY_ACROSS_FILESYSTEM chưa "
"đặt)."
-#: setup.c:1245
+#: setup.c:1362
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -7508,428 +8393,105 @@
"gặp vấn đề với giá trị chế độ tập tin core.sharedRepository (0%.3o).\n"
"người sở hữu tập tin phải luôn có quyền đọc và ghi."
-#: setup.c:1289
+#: setup.c:1409
msgid "open /dev/null or dup failed"
msgstr "gặp lỗi khi mở “/dev/null” hay dup"
-#: setup.c:1304
+#: setup.c:1424
msgid "fork failed"
msgstr "gặp lỗi khi rẽ nhánh tiến trình"
-#: setup.c:1309
+#: setup.c:1429
msgid "setsid failed"
msgstr "setsid gặp lỗi"
-#: sha1-file.c:452
-#, c-format
-msgid "object directory %s does not exist; check .git/objects/info/alternates"
-msgstr ""
-"thư mục đối tượng %s không tồn tại; kiểm tra .git/objects/info/alternates"
-
-#: sha1-file.c:503
-#, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr "không thể thường hóa đường dẫn đối tượng thay thế: “%s”"
-
-#: sha1-file.c:575
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr "%s: đang bỏ qua kho đối tượng thay thế, lồng nhau quá sâu"
-
-#: sha1-file.c:582
-#, c-format
-msgid "unable to normalize object directory: %s"
-msgstr "không thể chuẩn hóa thư mục đối tượng: “%s”"
-
-#: sha1-file.c:625
-msgid "unable to fdopen alternates lockfile"
-msgstr "không thể fdopen tập tin khóa thay thế"
-
-#: sha1-file.c:643
-msgid "unable to read alternates file"
-msgstr "không thể đọc tập tin thay thế"
-
-#: sha1-file.c:650
-msgid "unable to move new alternates file into place"
-msgstr "không thể di chuyển tập tin thay thế vào chỗ"
-
-#: sha1-file.c:685
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "đường dẫn “%s” không tồn tại"
-
-#: sha1-file.c:711
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr "kho tham chiếu “%s” như là lấy ra liên kết vẫn chưa được hỗ trợ."
-
-#: sha1-file.c:717
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "kho tham chiếu “%s” không phải là một kho nội bộ."
-
-#: sha1-file.c:723
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "kho tham chiếu “%s” là nông"
-
-#: sha1-file.c:731
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "kho tham chiếu “%s” bị cấy ghép"
-
-#: sha1-file.c:791
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "dòng không hợp lệ trong khi phân tích các tham chiếu thay thế: %s"
-
-#: sha1-file.c:943
-#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
-msgstr "đang cố để mmap %<PRIuMAX> vượt quá giới hạn %<PRIuMAX>"
-
-#: sha1-file.c:964
-msgid "mmap failed"
-msgstr "mmap gặp lỗi"
-
-#: sha1-file.c:1128
-#, c-format
-msgid "object file %s is empty"
-msgstr "tập tin đối tượng %s trống rỗng"
-
-#: sha1-file.c:1263 sha1-file.c:2443
-#, c-format
-msgid "corrupt loose object '%s'"
-msgstr "đối tượng mất hỏng “%s”"
-
-#: sha1-file.c:1265 sha1-file.c:2447
-#, c-format
-msgid "garbage at end of loose object '%s'"
-msgstr "gặp rác tại cuối của đối tượng bị mất “%s”"
-
-#: sha1-file.c:1307
-msgid "invalid object type"
-msgstr "kiểu đối tượng không hợp lệ"
-
-#: sha1-file.c:1391
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "không thể giải nén phần đầu gói %s với --allow-unknown-type"
-
-#: sha1-file.c:1394
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "không thể giải gói phần đầu %s"
-
-#: sha1-file.c:1400
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "không thể phân tích phần đầu gói %s với --allow-unknown-type"
-
-#: sha1-file.c:1403
-#, c-format
-msgid "unable to parse %s header"
-msgstr "không thể phân tích phần đầu của “%s”"
-
-#: sha1-file.c:1629
-#, c-format
-msgid "failed to read object %s"
-msgstr "gặp lỗi khi đọc đối tượng “%s”"
-
-#: sha1-file.c:1633
-#, c-format
-msgid "replacement %s not found for %s"
-msgstr "c%s thay thế không được tìm thấy cho %s"
-
-#: sha1-file.c:1637
-#, c-format
-msgid "loose object %s (stored in %s) is corrupt"
-msgstr "đối tượng mất %s (được lưu trong %s) bị hỏng"
-
-#: sha1-file.c:1641
-#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "đối tượng đã đóng gói %s (được lưu trong %s) bị hỏng"
-
-#: sha1-file.c:1746
-#, c-format
-msgid "unable to write file %s"
-msgstr "không thể ghi tập tin %s"
-
-#: sha1-file.c:1753
-#, c-format
-msgid "unable to set permission to '%s'"
-msgstr "không thể đặt quyền thành “%s”"
-
-#: sha1-file.c:1760
-msgid "file write error"
-msgstr "lỗi ghi tập tin"
-
-#: sha1-file.c:1780
-msgid "error when closing loose object file"
-msgstr "gặp lỗi trong khi đóng tập tin đối tượng"
-
-#: sha1-file.c:1845
-#, c-format
-msgid "insufficient permission for adding an object to repository database %s"
-msgstr ""
-"không đủ thẩm quyền để thêm một đối tượng vào cơ sở dữ liệu kho chứa %s"
-
-#: sha1-file.c:1847
-msgid "unable to create temporary file"
-msgstr "không thể tạo tập tin tạm thời"
-
-#: sha1-file.c:1871
-msgid "unable to write loose object file"
-msgstr "không thể ghi tập tin đối tượng đã mất"
-
-#: sha1-file.c:1877
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr "không thể xả nén đối tượng mới %s (%d)"
-
-#: sha1-file.c:1881
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr "deflateEnd trên đối tượng %s gặp lỗi (%d)"
-
-#: sha1-file.c:1885
-#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr "chưa rõ ràng baowir dữ liệu nguồn đối tượng không ổn định cho %s"
-
-#: sha1-file.c:1895 builtin/pack-objects.c:1054
-#, c-format
-msgid "failed utime() on %s"
-msgstr "gặp lỗi utime() trên “%s”"
-
-#: sha1-file.c:1972
-#, c-format
-msgid "cannot read object for %s"
-msgstr "không thể đọc đối tượng cho %s"
-
-#: sha1-file.c:2011
-msgid "corrupt commit"
-msgstr "lần chuyển giao sai hỏng"
-
-#: sha1-file.c:2019
-msgid "corrupt tag"
-msgstr "thẻ sai hỏng"
-
-#: sha1-file.c:2119
-#, c-format
-msgid "read error while indexing %s"
-msgstr "gặp lỗi đọc khi đánh mục lục %s"
-
-#: sha1-file.c:2122
-#, c-format
-msgid "short read while indexing %s"
-msgstr "không đọc ngắn khi đánh mục lục %s"
-
-#: sha1-file.c:2195 sha1-file.c:2205
-#, c-format
-msgid "%s: failed to insert into database"
-msgstr "%s: gặp lỗi khi thêm vào cơ sở dữ liệu"
-
-#: sha1-file.c:2211
-#, c-format
-msgid "%s: unsupported file type"
-msgstr "%s: kiểu tập tin không được hỗ trợ"
-
-#: sha1-file.c:2235
-#, c-format
-msgid "%s is not a valid object"
-msgstr "%s không phải là một đối tượng hợp lệ"
-
-#: sha1-file.c:2237
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s không phải là một đối tượng “%s” hợp lệ"
-
-#: sha1-file.c:2264 builtin/index-pack.c:155
-#, c-format
-msgid "unable to open %s"
-msgstr "không thể mở %s"
-
-#: sha1-file.c:2454 sha1-file.c:2507
-#, c-format
-msgid "hash mismatch for %s (expected %s)"
-msgstr "mã băm không khớp cho %s (cần %s)"
-
-#: sha1-file.c:2478
-#, c-format
-msgid "unable to mmap %s"
-msgstr "không thể mmap %s"
-
-#: sha1-file.c:2483
-#, c-format
-msgid "unable to unpack header of %s"
-msgstr "không thể giải gói phần đầu của “%s”"
-
-#: sha1-file.c:2489
-#, c-format
-msgid "unable to parse header of %s"
-msgstr "không thể phân tích phần đầu của “%s”"
-
-#: sha1-file.c:2500
-#, c-format
-msgid "unable to unpack contents of %s"
-msgstr "không thể giải gói nội dung của “%s”"
-
-#: sha1-name.c:486
-#, c-format
-msgid "short SHA1 %s is ambiguous"
-msgstr "tóm lược SHA1 %s chưa rõ ràng"
-
-#: sha1-name.c:497
-msgid "The candidates are:"
-msgstr "Các ứng cử là:"
-
-#: 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 thường không bao giờ tạo tham chiếu mà nó kết thúc với 40 ký tự hex\n"
-"bởi vì nó sẽ bị bỏ qua khi bạn chỉ định 40-hex. Những tham chiếu này\n"
-"có lẽ được tạo ra bởi một sai sót nào đó. Ví dụ,\n"
-"\n"
-" git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"với \"$br\" không hiểu lý do vì sao trống rỗng và một tham chiếu 40-hex được "
-"tạo ra.\n"
-"Xin hãy kiểm tra những tham chiếu này và có thể xóa chúng đi. Tắt lời nhắn "
-"này\n"
-"bằng cách chạy lệnh \"git config advice.objectNameWarning false\""
-
-#: sha1-name.c:916
-#, c-format
-msgid "log for '%.*s' only goes back to %s"
-msgstr "nhật ký cho '%.*s' chỉ đi lại cho %s"
-
-#: sha1-name.c:924
-#, c-format
-msgid "log for '%.*s' only has %d entries"
-msgstr "nhật ký cho '%.*s' chỉ có %d mục"
-
-#: sha1-name.c:1689
-#, c-format
-msgid "path '%s' exists on disk, but not in '%.*s'"
-msgstr "đường dẫn “%s” có ở trên đĩa, nhưng không trong “%.*s”"
-
-#: sha1-name.c:1695
-#, c-format
-msgid ""
-"path '%s' exists, but not '%s'\n"
-"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
-msgstr ""
-"đường dẫn '%s' tồn tại, nhưng không phải '%s'\n"
-"gợi ý: Có phải ý bạn là '%.*s:%s' aka '%.*s:./%s'?"
-
-#: sha1-name.c:1704
-#, c-format
-msgid "path '%s' does not exist in '%.*s'"
-msgstr "đường dẫn “%s” không tồn tại trong '%.*s'"
-
-#: sha1-name.c:1732
-#, c-format
-msgid ""
-"path '%s' is in the index, but not at stage %d\n"
-"hint: Did you mean ':%d:%s'?"
-msgstr ""
-"đường dẫn '%s' nằm trong chỉ mục, nhưng không phải ở giai đoạn %d\n"
-"gợi ý: Có phải ý bạn là ':%d:%s'?"
-
-#: sha1-name.c:1748
-#, c-format
-msgid ""
-"path '%s' is in the index, but not '%s'\n"
-"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
-msgstr ""
-"đường dẫn '%s' nằm trong chỉ mục, nhưng không phải '%s'\n"
-"gợi ý: Có phải ý bạn là ':% d:%s ' aka ':%d:./%s'?"
-
-#: sha1-name.c:1756
-#, c-format
-msgid "path '%s' exists on disk, but not in the index"
-msgstr "đường dẫn '%s' tồn tại trên đĩa, nhưng không có trong chỉ mục"
-
-#: sha1-name.c:1758
-#, c-format
-msgid "path '%s' does not exist (neither on disk nor in the index)"
-msgstr "đường dẫn “%s” không tồn tại (không trên đĩa cũng không trong mục lục)"
-
-#: sha1-name.c:1771
-msgid "relative path syntax can't be used outside working tree"
-msgstr "cú pháp đường dẫn tương đối không thể thể dùng ngoài cây làm việc"
-
-#: sha1-name.c:1909
-#, c-format
-msgid "invalid object name '%.*s'."
-msgstr "'%.*s' không phải là tên đối tượng hợp lệ"
-
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:837
+#: strbuf.c:848
#, c-format
msgid "%u.%2.2u GiB"
msgstr "%u.%2.2u GiB"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:839
+#: 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:847
+#: strbuf.c:858
#, c-format
msgid "%u.%2.2u MiB"
msgstr "%u.%2.2u MiB"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:849
+#: 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:856
+#: strbuf.c:867
#, c-format
msgid "%u.%2.2u KiB"
msgstr "%u.%2.2u KiB"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:858
+#: 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:864
+#: 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:866
+#: strbuf.c:877
#, c-format
msgid "%u byte/s"
msgid_plural "%u bytes/s"
msgstr[0] "%u byte/giây"
-#: strbuf.c:1164
+#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719
+#: builtin/rebase.c:866
+#, 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 ""
@@ -7960,27 +8522,27 @@
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Đặc tả đường dẫn “%s” thì ở trong mô-đun-con “%.*s”"
-#: submodule.c:434
+#: submodule.c:435
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr "đối số --ignore-submodules sai: %s"
-#: submodule.c:815
+#: submodule.c:817
#, 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-"
+"Mô-đun-con trong lần chuyển giao %s tại đường dẫn: “%s” va chạm với mô-đun-"
"con cùng tên. Nên bỏ qua nó."
-#: submodule.c:910
+#: submodule.c:920
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr ""
"mục tin mô-đun-con “%s” (%s) là một %s, không phải là một lần chuyển giao"
-#: submodule.c:995
+#: submodule.c:1005
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
@@ -7989,36 +8551,36 @@
"Không thể chạy lệnh “git rev-list <các lần chuyển giao> --not --remotes -n "
"1” trong mô-đun-con “%s”"
-#: submodule.c:1118
+#: submodule.c:1128
#, c-format
msgid "process for submodule '%s' failed"
msgstr "xử lý cho mô-đun-con “%s” gặp lỗi"
-#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045
+#: submodule.c:1157 builtin/branch.c:689 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:1158
+#: submodule.c:1168
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr "Đẩy lên mô-đun-con “%s”\n"
-#: submodule.c:1161
+#: submodule.c:1171
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "Không thể đẩy lên mô-đun-con “%s”\n"
-#: submodule.c:1453
+#: submodule.c:1463
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr "Đang lấy về mô-đun-con %s%s\n"
-#: submodule.c:1483
+#: submodule.c:1497
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr "Không thể truy cập mô-đun-con “%s”\n"
-#: submodule.c:1637
+#: submodule.c:1652
#, c-format
msgid ""
"Errors during submodule fetch:\n"
@@ -8027,61 +8589,61 @@
"Có lỗi khi lấy về mô-đun-con:\n"
" “%s”"
-#: submodule.c:1662
+#: submodule.c:1677
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "không nhận ra “%s” là một kho git"
-#: submodule.c:1679
+#: submodule.c:1694
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr "Không thể chạy “git status --porcelain=2” trong mô-đun-con “%s”"
-#: submodule.c:1720
+#: submodule.c:1735
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr "“git status --porcelain=2” gặp lỗi trong mô-đun-con “%s”"
-#: submodule.c:1800
+#: submodule.c:1810
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "không thể lấy thống kê “git status” trong mô-đun-con “%s”"
-#: submodule.c:1813
+#: submodule.c:1823
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "không thể chạy “git status” trong mô-đun-con “%s”"
-#: submodule.c:1828
+#: submodule.c:1838
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "Không thể đặt core.worktree trong mô-đun-con “%s”"
-#: submodule.c:1855 submodule.c:2165
+#: submodule.c:1865 submodule.c:2175
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "không thể đệ quy vào trong mô-đun-con “%s”"
-#: submodule.c:1876
+#: submodule.c:1886
msgid "could not reset submodule index"
msgstr "không thể đặt lại mục lục của mô-đun-con"
-#: submodule.c:1918
+#: submodule.c:1928
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "mô-đun-con “%s” có mục lục còn bẩn"
-#: submodule.c:1970
+#: submodule.c:1980
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "Mô-đun-con “%s” không thể được cập nhật."
-#: submodule.c:2038
+#: submodule.c:2048
#, 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'"
+msgstr "thư mục git mô đun con “%s” là bên trong git DIR “%.*s”"
-#: submodule.c:2059
+#: submodule.c:2069
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -8089,17 +8651,17 @@
"relocate_gitdir cho mô-đun-con “%s” với nhiều hơn một cây làm việc là chưa "
"được hỗ trợ"
-#: submodule.c:2071 submodule.c:2130
+#: submodule.c:2081 submodule.c:2140
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "không thể tìm kiếm tên cho mô-đun-con “%s”"
-#: submodule.c:2075
+#: submodule.c:2085
#, 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ó"
+msgstr "từ chối di chuyển “%s” vào trong một thư mục git sẵn có"
-#: submodule.c:2082
+#: submodule.c:2092
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -8110,95 +8672,260 @@
"“%s” sang\n"
"“%s”\n"
-#: submodule.c:2209
+#: submodule.c:2220
msgid "could not start ls-files in .."
msgstr "không thể lấy thông tin thống kê về ls-files trong .."
-#: submodule.c:2248
+#: submodule.c:2260
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree trả về mã không như mong đợi %d"
-#: submodule-config.c:236
-#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "đang lờ đi tên mô-đun-con mập mờ: %s"
-
-#: submodule-config.c:303
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "không cho phép giá trị âm ở submodule.fetchJobs"
-
-#: submodule-config.c:401
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr ""
-"đang bỏ qua “%s” cái mà có thể được phiên dịch như là một tùy chọn dòng "
-"lệnh: %s"
-
-#: submodule-config.c:498
-#, c-format
-msgid "invalid value for %s"
-msgstr "giá trị cho %s không hợp lệ"
-
-#: submodule-config.c:765
-#, 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:298 builtin/remote.c:323
+#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324
#, 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 builtin/mktag.c:91
msgid "could not read from stdin"
msgstr "không thể đọc từ đầu vào tiêu chuẩn"
-#: trailer.c:1011 wrapper.c:665
+#: trailer.c: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-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: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: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:214
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
+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: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:287 transport-helper.c:429
+#, c-format
+msgid "%s unexpectedly said: '%s'"
+msgstr "%s said bất ngờ: “%s”"
+
+#: transport-helper.c:417
+#, c-format
+msgid "%s also locked %s"
+msgstr "%s cũng khóa %s"
+
+#: transport-helper.c:497
+msgid "couldn't run fast-import"
+msgstr "không thể chạy fast-import"
+
+#: transport-helper.c:520
+msgid "error while running fast-import"
+msgstr "gặp lỗi trong khi chạy fast-import"
+
+#: transport-helper.c:549 transport-helper.c:1237
+#, c-format
+msgid "could not read ref %s"
+msgstr "không thể đọc tham chiếu %s"
+
+#: 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: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:618
+msgid "invalid remote service path"
+msgstr "đường dẫn dịch vụ máy chủ không hợp lệ"
+
+#: transport-helper.c:661 transport.c:1447
+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: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:845
+#, 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:928
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr "helper %s không hỗ trợ dry-run"
+
+#: transport-helper.c:931
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr "helper %s không hỗ trợ --signed"
+
+#: transport-helper.c:934
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr "helper %s không hỗ trợ --signed=if-asked"
+
+#: transport-helper.c:939
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr "helper %s không hỗ trợ --atomic"
+
+#: transport-helper.c:943
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr "helper %s không hỗ trợ --%s"
+
+#: transport-helper.c:950
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr "helper %s không hỗ trợ “push-option”"
+
+#: transport-helper.c:1050
+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:1055
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr "helper %s không hỗ trợ “force”"
+
+#: transport-helper.c:1102
+msgid "couldn't run fast-export"
+msgstr "không thể chạy fast-export"
+
+#: transport-helper.c:1107
+msgid "error while running fast-export"
+msgstr "gặp lỗi trong khi chạy fast-export"
+
+#: transport-helper.c:1132
+#, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\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.\n"
+
+#: transport-helper.c:1214
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr "không hỗ trợ định dạng đối tượng “%s”"
+
+#: transport-helper.c:1223
+#, 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:1375
+#, c-format
+msgid "read(%s) failed"
+msgstr "read(%s) gặp lỗi"
+
+#: transport-helper.c:1402
+#, c-format
+msgid "write(%s) failed"
+msgstr "write(%s) gặp lỗi"
+
+#: transport-helper.c:1451
+#, c-format
+msgid "%s thread failed"
+msgstr "tuyến trình %s gặp lỗi"
+
+#: transport-helper.c:1455
+#, 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:1474 transport-helper.c:1478
+#, 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:1515
+#, c-format
+msgid "%s process failed to wait"
+msgstr "xử lý %s gặp lỗi khi đợi"
+
+#: transport-helper.c:1519
+#, c-format
+msgid "%s process failed"
+msgstr "xử lý %s gặp lỗi"
+
+#: transport-helper.c:1537 transport-helper.c:1546
+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"
+
#: transport.c:116
#, c-format
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
@@ -8209,42 +8936,42 @@
msgid "could not read bundle '%s'"
msgstr "không thể đọc bó “%s”"
-#: transport.c:214
+#: 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:266
+#: 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:267
+#: 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:632
+#: transport.c:727
msgid "could not parse transport.color.* config"
msgstr "không thể phân tích cú pháp cấu hình transport.color.*"
-#: transport.c:705
+#: transport.c:802
msgid "support for protocol v2 not implemented yet"
msgstr "việc hỗ trợ giao thức v2 chưa được thực hiện"
-#: transport.c:831
+#: transport.c:936
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "không hiểu giá trị cho cho cấu hình “%s”: %s"
-#: transport.c:897
+#: transport.c:1002
#, c-format
msgid "transport '%s' not allowed"
msgstr "không cho phép phương thức vận chuyển “%s”"
-#: transport.c:949
+#: transport.c:1055
msgid "git-over-rsync is no longer supported"
msgstr "git-over-rsync không còn được hỗ trợ nữa"
-#: transport.c:1044
+#: transport.c:1157
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -8253,7 +8980,7 @@
"Các đường dẫn mô-đun-con sau đây có chứa các thay đổi cái mà\n"
"có thể được tìm thấy trên mọi máy phục vụ:\n"
-#: transport.c:1048
+#: transport.c:1161
#, c-format
msgid ""
"\n"
@@ -8280,208 +9007,31 @@
"để đẩy chúng lên máy phục vụ.\n"
"\n"
-#: transport.c:1056
+#: transport.c:1169
msgid "Aborting."
msgstr "Bãi bỏ."
-#: transport.c:1201
+#: transport.c:1316
msgid "failed to push all needed submodules"
msgstr "gặp lỗi khi đẩy dữ liệu của tất cả các mô-đun-con cần thiết"
-#: transport.c:1345 transport-helper.c:657
-msgid "operation not supported by protocol"
-msgstr "thao tác không được gia thức hỗ trợ"
-
-#: transport-helper.c:61 transport-helper.c:90
-msgid "full write to remote helper failed"
-msgstr "ghi đầy đủ lên bộ hỗ trợ máy chủ gặp lỗi"
-
-#: transport-helper.c:144
-#, c-format
-msgid "unable to find remote helper for '%s'"
-msgstr "không thể tìm thấy bộ hỗ trợ máy chủ cho “%s”"
-
-#: transport-helper.c:160 transport-helper.c:571
-msgid "can't dup helper output fd"
-msgstr "không thể nhân đôi fd dầu ra bộ hỗ trợ"
-
-#: transport-helper.c:211
-#, c-format
-msgid ""
-"unknown mandatory capability %s; this remote helper probably needs newer "
-"version of Git"
-msgstr ""
-"không hiểu capability bắt buộc %s; bộ hỗ trợ máy chủ này gần như chắc chắn "
-"là cần phiên bản Git mới hơn"
-
-#: transport-helper.c:217
-msgid "this remote helper should implement refspec capability"
-msgstr "bộ hỗ trợ máy chủ này cần phải thực thi capability đặc tả tham chiếu"
-
-#: transport-helper.c:284 transport-helper.c:425
-#, c-format
-msgid "%s unexpectedly said: '%s'"
-msgstr "%s said bất ngờ: “%s”"
-
-#: transport-helper.c:414
-#, c-format
-msgid "%s also locked %s"
-msgstr "%s cũng khóa %s"
-
-#: transport-helper.c:493
-msgid "couldn't run fast-import"
-msgstr "không thể chạy fast-import"
-
-#: transport-helper.c:516
-msgid "error while running fast-import"
-msgstr "gặp lỗi trong khi chạy fast-import"
-
-#: transport-helper.c:545 transport-helper.c:1134
-#, c-format
-msgid "could not read ref %s"
-msgstr "không thể đọc tham chiếu %s"
-
-#: transport-helper.c:590
-#, c-format
-msgid "unknown response to connect: %s"
-msgstr "không hiểu đáp ứng để kết nối: %s"
-
-#: transport-helper.c:612
-msgid "setting remote service path not supported by protocol"
-msgstr "giao thức này không hỗ trợ cài đặt đường dẫn dịch vụ máy chủ"
-
-#: transport-helper.c:614
-msgid "invalid remote service path"
-msgstr "đường dẫn dịch vụ máy chủ không hợp lệ"
-
-#: transport-helper.c:660
-#, c-format
-msgid "can't connect to subservice %s"
-msgstr "không thể kết nối đến dịch vụ phụ %s"
-
-#: transport-helper.c:736
-#, c-format
-msgid "expected ok/error, helper said '%s'"
-msgstr "cần ok/error, nhưng bộ hỗ trợ lại nói “%s”"
-
-#: transport-helper.c:789
-#, c-format
-msgid "helper reported unexpected status of %s"
-msgstr "bộ hỗ trợ báo cáo rằng không cần tình trạng của %s"
-
-#: transport-helper.c:850
-#, c-format
-msgid "helper %s does not support dry-run"
-msgstr "helper %s không hỗ trợ dry-run"
-
-#: transport-helper.c:853
-#, c-format
-msgid "helper %s does not support --signed"
-msgstr "helper %s không hỗ trợ --signed"
-
-#: transport-helper.c:856
-#, c-format
-msgid "helper %s does not support --signed=if-asked"
-msgstr "helper %s không hỗ trợ --signed=if-asked"
-
-#: transport-helper.c:861
-#, c-format
-msgid "helper %s does not support --atomic"
-msgstr "helper %s không hỗ trợ --atomic"
-
-#: transport-helper.c:867
-#, c-format
-msgid "helper %s does not support 'push-option'"
-msgstr "helper %s không hỗ trợ “push-option”"
-
-#: transport-helper.c:965
-msgid "remote-helper doesn't support push; refspec needed"
-msgstr "remote-helper không hỗ trợ push; cần đặc tả tham chiếu"
-
-#: transport-helper.c:970
-#, c-format
-msgid "helper %s does not support 'force'"
-msgstr "helper %s không hỗ trợ “force”"
-
-#: transport-helper.c:1017
-msgid "couldn't run fast-export"
-msgstr "không thể chạy fast-export"
-
-#: transport-helper.c:1022
-msgid "error while running fast-export"
-msgstr "gặp lỗi trong khi chạy fast-export"
-
-#: transport-helper.c:1047
-#, c-format
-msgid ""
-"No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch such as 'master'.\n"
-msgstr ""
-"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"
-
-#: transport-helper.c:1120
-#, c-format
-msgid "malformed response in ref list: %s"
-msgstr "đáp ứng sai dạng trong danh sách tham chiếu: %s"
-
-#: transport-helper.c:1272
-#, c-format
-msgid "read(%s) failed"
-msgstr "read(%s) gặp lỗi"
-
-#: transport-helper.c:1299
-#, c-format
-msgid "write(%s) failed"
-msgstr "write(%s) gặp lỗi"
-
-#: transport-helper.c:1348
-#, c-format
-msgid "%s thread failed"
-msgstr "tuyến trình %s gặp lỗi"
-
-#: transport-helper.c:1352
-#, c-format
-msgid "%s thread failed to join: %s"
-msgstr "tuyến trình %s gặp lỗi khi gia nhập: %s"
-
-#: transport-helper.c:1371 transport-helper.c:1375
-#, c-format
-msgid "can't start thread for copying data: %s"
-msgstr "không thể khởi chạy tuyến trình để sao chép dữ liệu: %s"
-
-#: transport-helper.c:1412
-#, c-format
-msgid "%s process failed to wait"
-msgstr "xử lý %s gặp lỗi khi đợi"
-
-#: transport-helper.c:1416
-#, c-format
-msgid "%s process failed"
-msgstr "xử lý %s gặp lỗi"
-
-#: transport-helper.c:1434 transport-helper.c:1443
-msgid "can't start thread for copying data"
-msgstr "không thể khởi chạy tuyến trình cho việc chép dữ liệu"
-
-#: tree-walk.c:32
+#: tree-walk.c:33
msgid "too-short tree object"
msgstr "đối tượng cây quá ngắn"
-#: tree-walk.c:38
+#: tree-walk.c:39
msgid "malformed mode in tree entry"
msgstr "chế độ dị hình trong đề mục cây"
-#: tree-walk.c:42
+#: tree-walk.c:43
msgid "empty filename in tree entry"
msgstr "tên tập tin trống rỗng trong mục tin cây"
-#: tree-walk.c:117
+#: tree-walk.c:118
msgid "too-short tree file"
msgstr "tập tin cây quá ngắn"
-#: unpack-trees.c:110
+#: unpack-trees.c:113
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -8492,7 +9042,7 @@
"%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn "
"chuyển nhánh."
-#: unpack-trees.c:112
+#: unpack-trees.c:115
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -8502,7 +9052,7 @@
"checkout:\n"
"%%s"
-#: unpack-trees.c:115
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -8513,7 +9063,7 @@
"%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn hòa "
"trộn."
-#: unpack-trees.c:117
+#: unpack-trees.c:120
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -8523,7 +9073,7 @@
"hòa trộn:\n"
"%%s"
-#: unpack-trees.c:120
+#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -8533,7 +9083,7 @@
"%s:\n"
"%%sVui lòng chuyển giao các thay đổi hay tạm cất chúng đi trước khi bạn %s."
-#: unpack-trees.c:122
+#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -8543,7 +9093,7 @@
"%s:\n"
"%%s"
-#: unpack-trees.c:127
+#: unpack-trees.c:130
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -8553,7 +9103,7 @@
"trong nó:\n"
"%s"
-#: unpack-trees.c:131
+#: unpack-trees.c:134
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -8563,19 +9113,19 @@
"checkout:\n"
"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn chuyển nhánh."
-#: unpack-trees.c:133
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
-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 lệnh "
-"checkout:\n"
-"%%s"
-
#: unpack-trees.c:136
#, c-format
msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+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 lệnh "
+"checkout:\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 ""
@@ -8583,7 +9133,7 @@
"trộn:\n"
"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn hòa trộn."
-#: unpack-trees.c:138
+#: unpack-trees.c:141
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -8593,7 +9143,7 @@
"trộn:\n"
"%%s"
-#: unpack-trees.c:141
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -8602,7 +9152,7 @@
"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ bỏ bởi %s:\n"
"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn %s."
-#: unpack-trees.c:143
+#: unpack-trees.c:146
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -8611,7 +9161,7 @@
"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ bỏ bởi %s:\n"
"%%s"
-#: unpack-trees.c:149
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -8622,7 +9172,7 @@
"checkout:\n"
"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn chuyển nhánh."
-#: unpack-trees.c:151
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -8633,7 +9183,7 @@
"checkout:\n"
"%%s"
-#: unpack-trees.c:154
+#: unpack-trees.c:157
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -8643,7 +9193,7 @@
"hòa trộn:\n"
"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn hòa trộn."
-#: unpack-trees.c:156
+#: unpack-trees.c:159
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -8653,7 +9203,7 @@
"hòa trộn:\n"
"%%s"
-#: unpack-trees.c:159
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -8663,7 +9213,7 @@
"%s:\n"
"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn %s."
-#: unpack-trees.c:161
+#: unpack-trees.c:164
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -8673,43 +9223,12 @@
"%s:\n"
"%%s"
-#: unpack-trees.c:169
+#: 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:172
-#, 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"
-
-#: unpack-trees.c:174
-#, 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"
-
-#: unpack-trees.c:176
-#, 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"
-
-#: unpack-trees.c:178
+#: unpack-trees.c:175
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -8718,16 +9237,57 @@
"Không thể cập nhật mô-đun-con:\n"
"%s"
-#: unpack-trees.c:255
+#: unpack-trees.c:178
+#, c-format
+msgid ""
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+"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:180
+#, c-format
+msgid ""
+"The following paths are unmerged and were left despite sparse patterns:\n"
+"%s"
+msgstr ""
+"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:182
+#, c-format
+msgid ""
+"The following paths were already present and thus not updated despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+"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:262
#, c-format
msgid "Aborting\n"
msgstr "Bãi bỏ\n"
-#: unpack-trees.c:317
+#: 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:349
+#: 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"
@@ -8737,10 +9297,14 @@
"HOA/thường trên một hệ thống tập tin không phân biệt HOA/thường)\n"
"và chỉ một từ cùng một nhóm xung đột là trong cây làm việc hiện tại:\n"
-#: unpack-trees.c:1445
+#: unpack-trees.c:1498
msgid "Updating index flags"
msgstr "Đang cập nhật các cờ mục lục"
+#: upload-pack.c:1543
+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ố “://”"
@@ -8774,28 +9338,28 @@
msgid "Fetching objects"
msgstr "Đang lấy về các đối tượng"
-#: worktree.c:259 builtin/am.c:2099
+#: worktree.c:238 builtin/am.c:2103
#, c-format
msgid "failed to read '%s'"
msgstr "gặp lỗi khi đọc “%s”"
-#: worktree.c:305
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "“%s” tại cây làm việc chình không phải là thư mục kho"
-#: worktree.c:316
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr ""
"tập tin “%s” không chứa đường dẫn tuyệt đối đến vị trí cây làm việc hiện"
-#: worktree.c:328
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "\"%s\" không tồn tại"
-#: worktree.c:334
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "“%s” không phải là tập tin .git, mã lỗi %d"
@@ -8805,17 +9369,83 @@
msgid "'%s' does not point back to '%s'"
msgstr "“%s” không chỉ ngược đến “%s”"
-#: wrapper.c:186 wrapper.c:356
+#: worktree.c:608
+msgid "not a directory"
+msgstr "không phải thư mục"
+
+#: worktree.c:617
+msgid ".git is not a file"
+msgstr ".git không phải là một tập tin"
+
+#: worktree.c:619
+msgid ".git file broken"
+msgstr "tệp .git bị hỏng"
+
+#: worktree.c:621
+msgid ".git file incorrect"
+msgstr "tập tin .git không chính xác"
+
+#: worktree.c:727
+msgid "not a valid path"
+msgstr "không phải là một đường dẫn hợp lệ"
+
+#: worktree.c:733
+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:737
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr "không thể phân bổ kho chứa; tập tin .git tham chiếu đến một kho"
+
+#: worktree.c:741
+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:747
+msgid "gitdir unreadable"
+msgstr "gitdir không thể đọc được"
+
+#: worktree.c:751
+msgid "gitdir incorrect"
+msgstr "gitdir không chính xác"
+
+#: worktree.c:776
+msgid "not a valid directory"
+msgstr "không phải thư mục hợp lệ"
+
+#: worktree.c:782
+msgid "gitdir file does not exist"
+msgstr "tập tin gitdir không tồn tại"
+
+#: worktree.c:787 worktree.c:796
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "không thể đọc tập tin gitdir (%s)"
+
+#: worktree.c:806
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr "đọc ngắn (cần %<PRIuMAX> byte, đọc %<PRIuMAX>)"
+
+#: worktree.c:814
+msgid "invalid gitdir file"
+msgstr "tập tin gitdir (thư mục git) không hợp lệ"
+
+#: worktree.c:822
+msgid "gitdir file points to non-existent location"
+msgstr "tập tin gitdir chỉ đến vị trí không tồn tại"
+
+#: 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:387 wrapper.c:588
+#: wrapper.c:398 wrapper.c:599
#, c-format
msgid "unable to access '%s'"
msgstr "không thể truy cập “%s”"
-#: wrapper.c:596
+#: 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"
@@ -8852,11 +9482,11 @@
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:1072
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:1081
msgid "Changes not staged for commit:"
msgstr "Các thay đổi chưa được đặt lên bệ phóng để chuyển giao:"
@@ -8888,93 +9518,93 @@
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:905
#, 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:936
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:938
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:1020
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
@@ -8982,7 +9612,7 @@
"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:1112
#, c-format
msgid ""
"\n"
@@ -8991,111 +9621,111 @@
msgstr ""
"\n"
"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"
+"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:1142
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:1145
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:1147
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:1151
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:1154
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:1163
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:1166
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:1170
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:1172
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:1174
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:1307
msgid "git-rebase-todo is missing."
msgstr "thiếu git-rebase-todo."
-#: wt-status.c:1311
+#: wt-status.c:1309
msgid "No commands done."
msgstr "Không thực hiện lệnh nào."
-#: 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] "Lệnh thực hiện cuối (%d lệnh được thực thi):"
-#: wt-status.c:1325
+#: wt-status.c:1323
#, c-format
msgid " (see more in file %s)"
msgstr " (xem thêm trong %s)"
-#: wt-status.c:1330
+#: wt-status.c:1328
msgid "No commands remaining."
msgstr "Không có lệnh nào còn lại."
-#: 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] "Lệnh cần làm kế tiếp (%d lệnh còn lại):"
-#: wt-status.c:1341
+#: wt-status.c:1339
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:1351
#, 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:1356
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:1369
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:1371
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:1373
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:1380
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:1384
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -9103,150 +9733,165 @@
"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:1389
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:1392
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:1396
#, 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:1401
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:1404
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:1406
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:1417
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:1420
#, 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:1427
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:1430
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:1433
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:1435
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
msgstr " (dùng \"git cherry-pick --skip\" để bỏ qua miếng vá này)"
-#: wt-status.c:1439
+#: wt-status.c:1437
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " (dùng \"git cherry-pick --abort\" để hủy bỏ thao tác cherry-pick)"
-#: wt-status.c:1449
+#: wt-status.c:1447
msgid "Revert currently in progress."
msgstr "Hoàn nguyên hiện tại đang thực hiện."
-#: wt-status.c:1452
+#: wt-status.c:1450
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Bạn hiện nay đang thực hiện thao tác hoàn nguyên lần chuyển giao “%s”."
-#: wt-status.c:1458
+#: wt-status.c:1456
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (sửa các xung đột và sau đó chạy lệnh \"git revert --continue\")"
-#: wt-status.c:1461
+#: wt-status.c:1459
msgid " (run \"git revert --continue\" to continue)"
msgstr " (chạy lệnh \"git revert --continue\" để tiếp tục)"
-#: wt-status.c:1464
+#: wt-status.c:1462
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
" (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git revert --continue\")"
-#: wt-status.c:1466
+#: wt-status.c:1464
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr " (dùng lệnh \"git revert --skip\" để bỏ qua lần vá này)"
-#: wt-status.c:1468
+#: wt-status.c:1466
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (dùng \"git revert --abort\" để hủy bỏ thao tác hoàn nguyên)"
-#: wt-status.c:1478
+#: wt-status.c:1476
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr ""
"Bạn hiện nay đang thực hiện thao tác di chuyển nửa bước (bisect), bắt đầu từ "
"nhánh “%s”."
-#: wt-status.c:1482
+#: wt-status.c:1480
msgid "You are currently bisecting."
msgstr "Bạn hiện tại đang thực hiện việc bisect (di chuyển nửa bước)."
-#: wt-status.c:1485
+#: wt-status.c:1483
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (dùng \"git bisect reset\" để quay trở lại nhánh nguyên thủy)"
-#: wt-status.c:1694
+#: wt-status.c:1494
+#, 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:1733
msgid "On branch "
msgstr "Trên nhánh "
-#: wt-status.c:1701
+#: wt-status.c:1740
msgid "interactive rebase in progress; onto "
msgstr "rebase ở chế độ tương tác đang được thực hiện; lên trên "
-#: wt-status.c:1703
+#: wt-status.c:1742
msgid "rebase in progress; onto "
msgstr "rebase đang được thực hiện: lên trên "
-#: wt-status.c:1713
+#: wt-status.c:1747
+msgid "HEAD detached at "
+msgstr "HEAD được tách rời tại "
+
+#: wt-status.c:1749
+msgid "HEAD detached from "
+msgstr "HEAD được tách rời từ "
+
+#: wt-status.c:1752
msgid "Not currently on any branch."
msgstr "Hiện tại chẳng ở nhánh nào cả."
-#: wt-status.c:1730
+#: wt-status.c:1769
msgid "Initial commit"
msgstr "Lần chuyển giao khởi tạo"
-#: wt-status.c:1731
+#: wt-status.c:1770
msgid "No commits yet"
msgstr "Vẫn chưa chuyển giao"
-#: wt-status.c:1745
+#: wt-status.c:1784
msgid "Untracked files"
msgstr "Những tập tin chưa được theo dõi"
-#: wt-status.c:1747
+#: wt-status.c:1786
msgid "Ignored files"
msgstr "Những tập tin bị lờ đi"
-#: wt-status.c:1751
+#: wt-status.c:1790
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -9258,32 +9903,32 @@
"có lẽ làm nó nhanh hơn, nhưng bạn phải cẩn thận đừng quên mình phải\n"
"tự thêm các tập tin mới (xem “git help status”.."
-#: wt-status.c:1757
+#: wt-status.c:1796
#, c-format
msgid "Untracked files not listed%s"
msgstr "Những tập tin chưa được theo dõi không được liệt kê ra %s"
-#: wt-status.c:1759
+#: wt-status.c:1798
msgid " (use -u option to show untracked files)"
msgstr " (dùng tùy chọn -u để hiển thị các tập tin chưa được theo dõi)"
-#: wt-status.c:1765
+#: wt-status.c:1804
msgid "No changes"
msgstr "Không có thay đổi nào"
-#: wt-status.c:1770
+#: wt-status.c:1809
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
"không có thay đổi nào được thêm vào để chuyển giao (dùng \"git add\" và/hoặc "
"\"git commit -a\")\n"
-#: wt-status.c:1773
+#: wt-status.c:1813
#, c-format
msgid "no changes added to commit\n"
msgstr "không có thay đổi nào được thêm vào để chuyển giao\n"
-#: wt-status.c:1776
+#: wt-status.c:1817
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -9292,74 +9937,74 @@
"không có gì được thêm vào lần chuyển giao nhưng có những tập tin chưa được "
"theo dõi hiện diện (dùng \"git add\" để đưa vào theo dõi)\n"
-#: wt-status.c:1779
+#: wt-status.c:1821
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
"không có gì được thêm vào lần chuyển giao nhưng có những tập tin chưa được "
"theo dõi hiện diện\n"
-#: wt-status.c:1782
+#: wt-status.c:1825
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"không có gì để chuyển giao (tạo/sao-chép các tập tin và dùng \"git add\" để "
"đưa vào theo dõi)\n"
-#: wt-status.c:1785 wt-status.c:1790
+#: wt-status.c:1829 wt-status.c:1835
#, c-format
msgid "nothing to commit\n"
msgstr "không có gì để chuyển giao\n"
-#: wt-status.c:1788
+#: wt-status.c:1832
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"không có gì để chuyển giao (dùng -u xem các tập tin chưa được theo dõi)\n"
-#: wt-status.c:1792
+#: wt-status.c:1837
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "không có gì để chuyển giao, thư mục làm việc sạch sẽ\n"
-#: wt-status.c:1905
+#: wt-status.c:1942
msgid "No commits yet on "
msgstr "Vẫn không thực hiện lệnh chuyển giao nào "
-#: wt-status.c:1909
+#: wt-status.c:1946
msgid "HEAD (no branch)"
msgstr "HEAD (không nhánh)"
-#: wt-status.c:1940
+#: wt-status.c:1977
msgid "different"
msgstr "khác"
-#: wt-status.c:1942 wt-status.c:1950
+#: wt-status.c:1979 wt-status.c:1987
msgid "behind "
msgstr "đằng sau "
-#: wt-status.c:1945 wt-status.c:1948
+#: wt-status.c:1982 wt-status.c:1985
msgid "ahead "
msgstr "phía trước "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2470
+#: wt-status.c:2507
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "không thể %s: Bạn có các thay đổi chưa được đưa lên bệ phóng."
-#: wt-status.c:2476
+#: wt-status.c:2513
msgid "additionally, your index contains uncommitted changes."
msgstr ""
"thêm vào đó, bảng mục lục của bạn có chứa các thay đổi chưa được chuyển giao."
-#: wt-status.c:2478
+#: wt-status.c:2515
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
"không thể %s: Mục lục của bạn có chứa các thay đổi chưa được chuyển giao."
-#: compat/precompose_utf8.c:58 builtin/clone.c:455
+#: compat/precompose_utf8.c:58 builtin/clone.c:457
#, c-format
msgid "failed to unlink '%s'"
msgstr "gặp lỗi khi bỏ liên kết (unlink) “%s”"
@@ -9368,133 +10013,138 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<các tùy chọn>] [--] <pathspec>…"
-#: builtin/add.c:88
+#: builtin/add.c:58
+#, c-format
+msgid "cannot chmod %cx '%s'"
+msgstr "không thể chmod %cx '%s'"
+
+#: builtin/add.c:96
#, c-format
msgid "unexpected diff status %c"
msgstr "trạng thái lệnh diff không như mong đợi %c"
-#: builtin/add.c:93 builtin/commit.c:288
+#: builtin/add.c:101 builtin/commit.c:285
msgid "updating files failed"
msgstr "cập nhật tập tin gặp lỗi"
-#: builtin/add.c:103
+#: builtin/add.c:111
#, c-format
msgid "remove '%s'\n"
msgstr "gỡ bỏ “%s”\n"
-#: builtin/add.c:178
+#: builtin/add.c:186
msgid "Unstaged changes after refreshing the index:"
msgstr ""
"Đưa ra khỏi bệ phóng các thay đổi sau khi làm tươi mới lại bảng mục lục:"
-#: builtin/add.c:266 builtin/rev-parse.c:899
+#: builtin/add.c:280 builtin/rev-parse.c:991
msgid "Could not read the index"
msgstr "Không thể đọc bảng mục lục"
-#: builtin/add.c:277
+#: builtin/add.c:291
#, c-format
msgid "Could not open '%s' for writing."
msgstr "Không thể mở “%s” để ghi."
-#: builtin/add.c:281
+#: builtin/add.c:295
msgid "Could not write patch"
msgstr "Không thể ghi ra miếng vá"
-#: builtin/add.c:284
+#: builtin/add.c:298
msgid "editing patch failed"
msgstr "gặp lỗi khi sửa miếng vá"
-#: builtin/add.c:287
+#: builtin/add.c:301
#, c-format
msgid "Could not stat '%s'"
msgstr "Không thể lấy thông tin thống kê về “%s”"
-#: builtin/add.c:289
+#: builtin/add.c:303
msgid "Empty patch. Aborted."
msgstr "Miếng vá trống rỗng. Nên bỏ qua."
-#: builtin/add.c:294
+#: builtin/add.c:308
#, c-format
msgid "Could not apply '%s'"
msgstr "Không thể áp dụng miếng vá “%s”"
-#: builtin/add.c:302
+#: builtin/add.c:316
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Các đường dẫn theo sau đây sẽ bị lờ đi bởi một trong các tập tin .gitignore "
"của bạn:\n"
-#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548
-#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
+#: builtin/add.c:336 builtin/clean.c:904 builtin/fetch.c:169 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559
+#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190
msgid "dry run"
msgstr "chạy thử"
-#: builtin/add.c:325
+#: builtin/add.c:339
msgid "interactive picking"
msgstr "sửa bằng cách tương tác"
-#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307
+#: builtin/add.c:340 builtin/checkout.c:1546 builtin/reset.c:308
msgid "select hunks interactively"
msgstr "chọn “hunks” theo kiểu tương tác"
-#: builtin/add.c:327
+#: builtin/add.c:341
msgid "edit current diff and apply"
msgstr "sửa diff hiện nay và áp dụng nó"
-#: builtin/add.c:328
+#: builtin/add.c:342
msgid "allow adding otherwise ignored files"
msgstr "cho phép thêm các tập tin bị bỏ qua khác"
-#: builtin/add.c:329
+#: builtin/add.c:343
msgid "update tracked files"
msgstr "cập nhật các tập tin được theo dõi"
-#: builtin/add.c:330
+#: builtin/add.c:344
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "thường hóa lại EOL của các tập tin được theo dõi (ý là -u)"
-#: builtin/add.c:331
+#: builtin/add.c:345
msgid "record only the fact that the path will be added later"
msgstr "chỉ ghi lại sự việc mà đường dẫn sẽ được thêm vào sau"
-#: builtin/add.c:332
+#: builtin/add.c:346
msgid "add changes from all tracked and untracked files"
msgstr ""
"thêm các thay đổi từ tất cả các tập tin có cũng như không được theo dõi dấu "
"vết"
-#: builtin/add.c:335
+#: builtin/add.c:349
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
"lờ đi các đường dẫn bị gỡ bỏ trong cây thư mục làm việc (giống với --no-all)"
-#: builtin/add.c:337
+#: builtin/add.c:351
msgid "don't add, only refresh the index"
msgstr "không thêm, chỉ làm tươi mới bảng mục lục"
-#: builtin/add.c:338
+#: builtin/add.c:352
msgid "just skip files which cannot be added because of errors"
msgstr "chie bỏ qua những tập tin mà nó không thể được thêm vào bởi vì gặp lỗi"
-#: builtin/add.c:339
+#: builtin/add.c:353
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
"kiểm tra xem - thậm chí thiếu - tập tin bị bỏ qua trong quá trình chạy thử"
-#: builtin/add.c:341 builtin/update-index.c:1004
+#: builtin/add.c:355 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:343
+#: builtin/add.c:357
msgid "warn when adding an embedded repository"
msgstr "cảnh báo khi thêm một kho nhúng"
-#: builtin/add.c:345
+#: builtin/add.c:359
msgid "backend for `git stash -p`"
-msgstr "ứng dụng chạy phía sau cho 'git stash -p'"
+msgstr "ứng dụng chạy phía sau cho “git stash -p”"
-#: builtin/add.c:363
+#: builtin/add.c:377
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -9525,12 +10175,12 @@
"\n"
"Xem \"git help submodule\" để biết thêm chi tiết."
-#: builtin/add.c:391
+#: builtin/add.c:405
#, c-format
msgid "adding embedded git repository: %s"
msgstr "thêm cần một kho git nhúng: %s"
-#: builtin/add.c:410
+#: builtin/add.c:424
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
@@ -9540,53 +10190,53 @@
"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:419
+#: builtin/add.c:433
msgid "adding files failed"
msgstr "thêm tập tin gặp lỗi"
-#: builtin/add.c:447 builtin/commit.c:348
+#: builtin/add.c:461 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:464
+#: builtin/add.c:478
msgid "--pathspec-from-file is incompatible with --edit"
msgstr "--pathspec-from-file xung khắc với --edit"
-#: builtin/add.c:476
+#: builtin/add.c:490
msgid "-A and -u are mutually incompatible"
msgstr "-A và -u xung khắc nhau"
-#: builtin/add.c:479
+#: builtin/add.c:493
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "Tùy chọn --ignore-missing chỉ có thể được dùng cùng với --dry-run"
-#: builtin/add.c:483
+#: builtin/add.c:497
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "--chmod tham số “%s” phải hoặc là -x hay +x"
-#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354
-#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509
+#: builtin/add.c:515 builtin/checkout.c:1714 builtin/commit.c:351
+#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1569
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr "--pathspec-from-file xung khắc với các tham số đặc tả đường dẫn"
-#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360
-#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515
+#: builtin/add.c:522 builtin/checkout.c:1726 builtin/commit.c:357
+#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1575
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr "--pathspec-file-nul cần --pathspec-from-file"
-#: builtin/add.c:512
+#: builtin/add.c:526
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Không có gì được chỉ ra, không có gì được thêm vào.\n"
-#: builtin/add.c:514
+#: builtin/add.c:528
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"
+"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\""
@@ -9638,7 +10288,7 @@
msgid "Patch format detection failed."
msgstr "Dò tìm định dạng miếng vá gặp lỗi."
-#: builtin/am.c:953 builtin/clone.c:409
+#: builtin/am.c:953 builtin/clone.c:410
#, c-format
msgid "failed to create directory '%s'"
msgstr "tạo thư mục \"%s\" gặp lỗi"
@@ -9650,7 +10300,7 @@
#: builtin/am.c:1089
#, 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:1090
#, c-format
@@ -9681,11 +10331,11 @@
#: builtin/am.c:1270
#, 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/am.c:1489
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:1491
msgid "Using index info to reconstruct a base tree..."
@@ -9702,7 +10352,7 @@
#: builtin/am.c:1516
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:1542
msgid "Failed to merge in the changes."
@@ -9712,12 +10362,12 @@
msgid "applying to an empty history"
msgstr "áp dụng vào một lịch sử trống rỗng"
-#: builtin/am.c:1621 builtin/am.c:1625
+#: builtin/am.c:1626 builtin/am.c:1630
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "không thể phục hồi: %s không tồn tại."
-#: builtin/am.c:1643
+#: builtin/am.c:1648
msgid "Commit Body is:"
msgstr "Thân của lần chuyển giao là:"
@@ -9725,41 +10375,41 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1653
+#: builtin/am.c:1658
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
"Áp dụng? đồng ý [y]/khô[n]g/chỉnh sửa [e]/hiển thị miếng [v]á/chấp nhận tất "
"cả [a]: "
-#: builtin/am.c:1700 builtin/commit.c:398
+#: builtin/am.c:1704 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:1704
+#: builtin/am.c:1708
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Bảng mục lục bẩn: không thể áp dụng các miếng vá (bẩn: %s)"
-#: builtin/am.c:1744 builtin/am.c:1812
+#: builtin/am.c:1748 builtin/am.c:1816
#, c-format
msgid "Applying: %.*s"
msgstr "Áp dụng: %.*s"
-#: builtin/am.c:1761
+#: builtin/am.c:1765
msgid "No changes -- Patch already applied."
msgstr "Không thay đổi gì cả -- Miếng vá đã được áp dụng rồi."
-#: builtin/am.c:1767
+#: builtin/am.c:1771
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Gặp lỗi khi vá tại %s %.*s"
-#: builtin/am.c:1771
+#: builtin/am.c:1775
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:1815
+#: builtin/am.c:1819
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -9770,7 +10420,7 @@
"đã sẵn được đưa vào với cùng nội dung thay đổi; bạn có lẽ muốn bỏ qua miếng "
"vá này."
-#: builtin/am.c:1822
+#: builtin/am.c:1826
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -9783,17 +10433,17 @@
"Bạn có lẽ muốn chạy “git rm“ trên một tập tin để chấp nhận \"được xóa bởi họ"
"\" cho nó."
-#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346
-#: builtin/reset.c:354
+#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 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:1981
+#: builtin/am.c:1985
msgid "failed to clean index"
msgstr "gặp lỗi khi dọn bảng mục lục"
-#: builtin/am.c:2025
+#: builtin/am.c:2029
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -9801,154 +10451,156 @@
"Bạn có lẽ đã có HEAD đã bị di chuyển đi kể từ lần “am” thất bại cuối cùng.\n"
"Không thể chuyển tới ORIG_HEAD"
-#: builtin/am.c:2132
+#: builtin/am.c:2136
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Giá trị không hợp lệ cho --patch-format: %s"
-#: builtin/am.c:2172
+#: builtin/am.c:2178
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr "Giá trị không hợp lệ cho --show-current-patch: %s"
-#: builtin/am.c:2176
+#: builtin/am.c:2182
#, c-format
msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
msgstr "--show-current-patch=%s xung khắc với --show-current-patch=%s"
-#: builtin/am.c:2207
+#: builtin/am.c:2213
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<các tùy chọn>] [(<mbox>|<Maildir>)…]"
-#: builtin/am.c:2208
+#: builtin/am.c:2214
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<các tùy chọn>] (--continue | --skip | --abort)"
-#: builtin/am.c:2214
+#: builtin/am.c:2220
msgid "run interactively"
msgstr "chạy kiểu tương tác"
-#: builtin/am.c:2216
+#: builtin/am.c:2222
msgid "historical option -- no-op"
msgstr "tùy chọn lịch sử -- không-toán-tử"
-#: builtin/am.c:2218
+#: builtin/am.c:2224
msgid "allow fall back on 3way merging if needed"
msgstr "cho phép quay trở lại để hòa trộn kiểu “3way” nếu cần"
-#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:304 builtin/stash.c:812
+#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16
+#: builtin/repack.c:334 builtin/stash.c:882
msgid "be quiet"
msgstr "im lặng"
-#: builtin/am.c:2221
-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:2227
+msgid "add a Signed-off-by trailer to the commit message"
+msgstr "thêm dòng Signed-off-by vào cuối ghi chú của lần chuyển giao"
-#: builtin/am.c:2224
+#: builtin/am.c:2230
msgid "recode into utf8 (default)"
msgstr "chuyển mã thành utf8 (mặc định)"
-#: builtin/am.c:2226
+#: builtin/am.c:2232
msgid "pass -k flag to git-mailinfo"
msgstr "chuyển cờ -k cho git-mailinfo"
-#: builtin/am.c:2228
+#: builtin/am.c:2234
msgid "pass -b flag to git-mailinfo"
msgstr "chuyển cờ -b cho git-mailinfo"
-#: builtin/am.c:2230
+#: builtin/am.c:2236
msgid "pass -m flag to git-mailinfo"
msgstr "chuyển cờ -m cho git-mailinfo"
-#: builtin/am.c:2232
+#: builtin/am.c:2238
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "chuyển cờ --keep-cr cho git-mailsplit với định dạng mbox"
-#: builtin/am.c:2235
+#: builtin/am.c:2241
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"đừng chuyển cờ --keep-cr cho git-mailsplit không phụ thuộc vào am.keepcr"
-#: builtin/am.c:2238
+#: builtin/am.c:2244
msgid "strip everything before a scissors line"
msgstr "cắt mọi thứ trước dòng scissors"
-#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249
-#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261
-#: builtin/am.c:2267
+#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
+#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
+#: builtin/am.c:2273
msgid "pass it through git-apply"
msgstr "chuyển nó qua git-apply"
-#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670
-#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250
-#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505
-#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321
-#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:154 parse-options.h:175 parse-options.h:316
+#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:904 builtin/merge.c:261
+#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
+#: builtin/rebase.c:1347 builtin/repack.c:345 builtin/repack.c:349
+#: builtin/repack.c:351 builtin/show-branch.c:650 builtin/show-ref.c:172
+#: builtin/tag.c:436 parse-options.h:154 parse-options.h:175
+#: parse-options.h:316
msgid "n"
msgstr "n"
-#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38
+#: builtin/am.c:2269 builtin/branch.c:670 builtin/bugreport.c:136
+#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:470
+#: builtin/verify-tag.c:38
msgid "format"
msgstr "định dạng"
-#: builtin/am.c:2264
+#: builtin/am.c:2270
msgid "format the patch(es) are in"
msgstr "định dạng (các) miếng vá theo"
-#: builtin/am.c:2270
+#: builtin/am.c:2276
msgid "override error message when patch failure occurs"
msgstr "đè lên các lời nhắn lỗi khi xảy ra lỗi vá nghiêm trọng"
-#: builtin/am.c:2272
+#: builtin/am.c:2278
msgid "continue applying patches after resolving a conflict"
msgstr "tiếp tục áp dụng các miếng vá sau khi giải quyết xung đột"
-#: builtin/am.c:2275
+#: builtin/am.c:2281
msgid "synonyms for --continue"
msgstr "đồng nghĩa với --continue"
-#: builtin/am.c:2278
+#: builtin/am.c:2284
msgid "skip the current patch"
msgstr "bỏ qua miếng vá hiện hành"
-#: builtin/am.c:2281
-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:2287
+msgid "restore the original branch and abort the patching operation"
+msgstr "phục hồi lại nhánh gốc và loại bỏ thao tác vá"
-#: builtin/am.c:2284
-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:2290
+msgid "abort the patching operation but keep HEAD where it is"
+msgstr "bỏ qua thao tác vá nhưng vẫn giữ HEAD nơi nó chỉ đến"
-#: builtin/am.c:2288
+#: builtin/am.c:2294
msgid "show the patch being applied"
msgstr "hiển thị miếng vá đã được áp dụng rồi"
-#: builtin/am.c:2293
+#: builtin/am.c:2299
msgid "lie about committer date"
msgstr "nói dối về ngày chuyển giao"
-#: builtin/am.c:2295
+#: builtin/am.c:2301
msgid "use current timestamp for author date"
msgstr "dùng dấu thời gian hiện tại cho ngày tác giả"
-#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512
-#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517
-#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418
+#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515
+#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:538
+#: builtin/rebase.c:1400 builtin/revert.c:117 builtin/tag.c:451
msgid "key-id"
msgstr "mã-số-khóa"
-#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
+#: builtin/am.c:2304 builtin/rebase.c:539 builtin/rebase.c:1401
msgid "GPG-sign commits"
msgstr "Các lần chuyển giao ký-GPG"
-#: builtin/am.c:2301
+#: builtin/am.c:2307
msgid "(internal use for git-rebase)"
msgstr "(dùng nội bộ cho git-rebase)"
-#: builtin/am.c:2319
+#: builtin/am.c:2325
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
@@ -9956,16 +10608,16 @@
"Tùy chọn -b/--binary đã không dùng từ lâu rồi, và\n"
"nó sẽ được bỏ đi. Xin đừng sử dụng nó thêm nữa."
-#: builtin/am.c:2326
+#: builtin/am.c:2332
msgid "failed to read the index"
msgstr "gặp lỗi đọc bảng mục lục"
-#: builtin/am.c:2341
+#: builtin/am.c:2347
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "thư mục rebase trước %s không sẵn có nhưng mbox lại đưa ra."
-#: builtin/am.c:2365
+#: builtin/am.c:2371
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -9974,13 +10626,13 @@
"Tìm thấy thư mục lạc %s.\n"
"Dùng \"git am --abort\" để loại bỏ nó đi."
-#: builtin/am.c:2371
+#: builtin/am.c:2377
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Thao tác phân giải không được tiến hành, chúng ta không phục hồi lại."
-#: builtin/am.c:2381
+#: builtin/am.c:2387
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>...]"
@@ -10016,43 +10668,15 @@
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 --write-terms <bad_term> <good_term>"
-msgstr "git bisect--helper --write-terms <bad_term> <good_term>"
-
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-clean-state"
-msgstr "git bisect--helper --bisect-clean-state"
-
-#: builtin/bisect--helper.c:25
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --bisect-reset [<lần_chuyển_giao>]"
-#: builtin/bisect--helper.c:26
-msgid ""
-"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
-"<bad_term>"
-msgstr ""
-"git bisect--helper --bisect-write [--no-log] <state> <revision> <lúc_sai> "
-"<lúc_đúng>"
-
-#: builtin/bisect--helper.c:27
-msgid ""
-"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
-"<bad_term>"
-msgstr ""
-"git bisect--helper --bisect-check-and-set-terms <command> <lúc_sai> "
-"<lúc_đúng>"
-
-#: builtin/bisect--helper.c:28
+#: builtin/bisect--helper.c:24
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:25
msgid ""
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
"term-new]"
@@ -10060,48 +10684,76 @@
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
"term-new]"
+#: builtin/bisect--helper.c:26
+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> --term-{old,good}"
+"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>…]] [--] [</các/"
+"đường/dẫn>…]"
+
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next"
+msgstr "git bisect--helper --bisect-next"
+
+#: builtin/bisect--helper.c:29
+msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
+msgstr "git bisect--helper --bisect-state (bad|new) [<lần_chuyển_giao>]"
+
#: builtin/bisect--helper.c:30
-msgid ""
-"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
-"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
-msgstr ""
-"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
-"=<term>][--no-checkout] [<sai> [<đúng>…]] [--] [</các/đường/dẫn>…]"
+msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
+msgstr "git bisect--helper --bisect-reset (good|old) [<lần_chuyển_giao>…]"
-#: builtin/bisect--helper.c:86
+#: builtin/bisect--helper.c:31
+msgid "git bisect--helper --bisect-replay <filename>"
+msgstr "git bisect--helper --bisect-replay <tên_tập_tin>"
+
+#: builtin/bisect--helper.c:32
+msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
+msgstr "git bisect--helper --bisect-skip [(<rev>|<vùng>)...]"
+
+#: builtin/bisect--helper.c:107
+#, 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:114
+#, c-format
+msgid "could not write to file '%s'"
+msgstr "không thể ghi vào tập tin “%s”"
+
+#: builtin/bisect--helper.c:153
#, 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:157
#, 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:167
#, 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:177
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:193
#, 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:201
#, 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:172
+#: builtin/bisect--helper.c:210
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -10109,27 +10761,27 @@
"không thể lấy ra HEAD nguyên thủy của “%s”. Hãy thử “git bisect reset <lần-"
"chuyển-giao>”."
-#: builtin/bisect--helper.c:216
+#: builtin/bisect--helper.c:254
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr "Đối số bisect_write sai: %s"
-#: builtin/bisect--helper.c:221
+#: builtin/bisect--helper.c:259
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "không thể lấy oid của điểm xét duyệt “%s”"
-#: builtin/bisect--helper.c:233
+#: builtin/bisect--helper.c:271
#, c-format
msgid "couldn't open the file '%s'"
msgstr "không thể mở tập tin “%s”"
-#: builtin/bisect--helper.c:259
+#: builtin/bisect--helper.c:297
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr "Lệnh không hợp lệ: bạn hiện đang ở một bisect %s/%s"
-#: builtin/bisect--helper.c:286
+#: builtin/bisect--helper.c:324
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
@@ -10138,7 +10790,7 @@
"Bạn phải chỉ cho tôi ít nhất một điểm %s và một %s.\n"
"Bạn có thể sử dụng \"git bisect %s\" và \"git bisect %s\" cho cái đó."
-#: builtin/bisect--helper.c:290
+#: builtin/bisect--helper.c:328
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -10149,7 +10801,7 @@
"Bạn sau đó cần phải chỉ cho tôi ít nhất một điểm xét duyệt %s và một %s.\n"
"Bạn có thể sử dụng \"git bisect %s\" và \"git bisect %s\" cho chúng."
-#: builtin/bisect--helper.c:310
+#: builtin/bisect--helper.c:348
#, c-format
msgid "bisecting only with a %s commit"
msgstr "chỉ thực hiện việc bisect với một lần chuyển giao %s"
@@ -10158,15 +10810,15 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:318
+#: builtin/bisect--helper.c:356
msgid "Are you sure [Y/n]? "
msgstr "Bạn có chắc chắn chưa [Y/n]? "
-#: builtin/bisect--helper.c:379
+#: builtin/bisect--helper.c:417
msgid "no terms defined"
msgstr "chưa định nghĩa thời kỳ nào"
-#: builtin/bisect--helper.c:382
+#: builtin/bisect--helper.c:420
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
@@ -10175,7 +10827,7 @@
"Bạn hiện tại đang ở thời kỳ %s cho tình trạng cũ\n"
"và %s cho tình trạng mới.\n"
-#: builtin/bisect--helper.c:392
+#: builtin/bisect--helper.c:430
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
@@ -10184,266 +10836,310 @@
"tham số không hợp lệ %s cho “git bisect terms”.\n"
"Các tùy chọn hỗ trợ là: --term-good|--term-old và --term-bad|--term-new."
-#: builtin/bisect--helper.c:478
+#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1014
+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:519
+#, c-format
+msgid "could not open '%s' for appending"
+msgstr "không thể mở “%s” để nối thêm"
+
+#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651
+msgid "'' is not a valid term"
+msgstr "” không phải một thời hạn hợp lệ"
+
+#: builtin/bisect--helper.c:661
#, c-format
msgid "unrecognized option: '%s'"
msgstr "tùy chọn không được thừa nhận: “%s”"
-#: builtin/bisect--helper.c:482
+#: builtin/bisect--helper.c:665
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "“%s” không có vẻ như là một điểm xét duyệt hợp lệ"
-#: builtin/bisect--helper.c:514
+#: builtin/bisect--helper.c:696
msgid "bad HEAD - I need a HEAD"
msgstr "sai HEAD - Tôi cần một HEAD"
-#: builtin/bisect--helper.c:529
+#: builtin/bisect--helper.c:711
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr "lấy ra “%s” ra gặp lỗi. Hãy thử \"git bisect reset <nhánh_hợp_lệ>\"."
-#: builtin/bisect--helper.c:550
+#: builtin/bisect--helper.c:732
msgid "won't bisect on cg-seek'ed tree"
msgstr "sẽ không di chuyển nửa bước trên cây được cg-seek"
-#: builtin/bisect--helper.c:553
+#: builtin/bisect--helper.c:735
msgid "bad HEAD - strange symbolic ref"
msgstr "sai HEAD - tham chiếu mềm kỳ lạ"
-#: builtin/bisect--helper.c:577
+#: builtin/bisect--helper.c:755
#, c-format
msgid "invalid ref: '%s'"
msgstr "refspec không hợp lệ: “%s”"
-#: builtin/bisect--helper.c:633
-msgid "perform 'git bisect next'"
-msgstr "thực hiện “git bisect next”"
+#: builtin/bisect--helper.c:813
+msgid "You need to start by \"git bisect start\"\n"
+msgstr "Bạn cần khởi đầu bằng \"git bisect start\"\n"
-#: builtin/bisect--helper.c:635
-msgid "write the terms to .git/BISECT_TERMS"
-msgstr "ghi thời kỳ vào .git/BISECT_TERMS"
+#. 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:824
+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:637
-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:842
+msgid "Please call `--bisect-state` with at least one argument"
+msgstr "Hãy gọi “--bisect-state” với ít nhất một đối số"
-#: builtin/bisect--helper.c:639
-msgid "check for expected revs"
-msgstr "kiểm tra cho điểm xem xét cần dùng"
+#: builtin/bisect--helper.c:855
+#, c-format
+msgid "'git bisect %s' can take only one argument."
+msgstr "“git bisect %s” có thể lấy chỉ một đối số."
-#: builtin/bisect--helper.c:641
+#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:878
+#, c-format
+msgid "Bad rev input: %s"
+msgstr "Đầu vào rev sai: %s"
+
+#: builtin/bisect--helper.c:912
+msgid "We are not bisecting."
+msgstr "Chúng tôi không bisect."
+
+#: builtin/bisect--helper.c:962
+#, c-format
+msgid "'%s'?? what are you talking about?"
+msgstr "'%s'?? bạn đang nói gì thế?"
+
+#: builtin/bisect--helper.c:974
+#, c-format
+msgid "cannot read file '%s' for replaying"
+msgstr "không thể đọc tập tin '%s' để thao diễn lại"
+
+#: builtin/bisect--helper.c:1047
msgid "reset the bisection state"
msgstr "đặt lại trạng di chuyển nửa bước"
-#: builtin/bisect--helper.c:643
-msgid "write out the bisection state in BISECT_LOG"
-msgstr "ghi ra tình trạng di chuyển nửa bước trong BISECT_LOG"
-
-#: builtin/bisect--helper.c:645
-msgid "check and set terms in a bisection state"
-msgstr "kiểm tra và đặt thời điểm trong di chuyển nửa bước"
-
-#: builtin/bisect--helper.c:647
+#: builtin/bisect--helper.c:1049
msgid "check whether bad or good terms exist"
msgstr "kiểm tra xem các thời điểm xấu/tốt có tồn tại không"
-#: builtin/bisect--helper.c:649
+#: builtin/bisect--helper.c:1051
msgid "print out the bisect terms"
msgstr "in ra các thời điểm di chuyển nửa bước"
-#: builtin/bisect--helper.c:651
+#: builtin/bisect--helper.c:1053
msgid "start the bisect session"
msgstr "bắt đầu phiên di chuyển nửa bước"
-#: builtin/bisect--helper.c:653
-msgid "update BISECT_HEAD instead of checking out the current commit"
-msgstr ""
-"cập nhật BISECT_HEAD thay vì lấy ra (checking out) lần chuyển giao hiện hành"
+#: builtin/bisect--helper.c:1055
+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:655
+#: builtin/bisect--helper.c:1057
+msgid "mark the state of ref (or refs)"
+msgstr "đánh dấu trạng thái ref (hoặc refs)"
+
+#: builtin/bisect--helper.c:1059
+msgid "list the bisection steps so far"
+msgstr "liệt kê các bước bisection đi quá xa"
+
+#: builtin/bisect--helper.c:1061
+msgid "replay the bisection process from the given file"
+msgstr "phát lại quá trình bisection từ tệp đã cho"
+
+#: builtin/bisect--helper.c:1063
+msgid "skip some commits for checkout"
+msgstr "bỏ qua một số lần chuyển giao để lấy ra"
+
+#: builtin/bisect--helper.c:1065
msgid "no log for BISECT_WRITE"
msgstr "không có nhật ký cho BISECT_WRITE"
-#: builtin/bisect--helper.c:673
-msgid "--write-terms requires two arguments"
-msgstr "--write-terms cần hai tham số"
-
-#: builtin/bisect--helper.c:677
-msgid "--bisect-clean-state requires no arguments"
-msgstr "--bisect-clean-state không nhận đối số"
-
-#: builtin/bisect--helper.c:684
+#: builtin/bisect--helper.c:1080
msgid "--bisect-reset requires either no argument or a commit"
msgstr ""
"--bisect-reset requires không nhận đối số cũng không nhận lần chuyển giao"
-#: builtin/bisect--helper.c:688
-msgid "--bisect-write requires either 4 or 5 arguments"
-msgstr "--bisect-write cần 4 hoặc 5 tham số"
-
-#: builtin/bisect--helper.c:694
-msgid "--check-and-set-terms requires 3 arguments"
-msgstr "--check-and-set-terms cần 3 tham số"
-
-#: builtin/bisect--helper.c:700
+#: builtin/bisect--helper.c:1085
msgid "--bisect-next-check requires 2 or 3 arguments"
msgstr "--bisect-next-check cần 2 hoặc 3 tham số"
-#: builtin/bisect--helper.c:706
+#: builtin/bisect--helper.c:1091
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms cần 0 hoặc 1 tham số"
-#: builtin/blame.c:31
+#: builtin/bisect--helper.c:1100
+msgid "--bisect-next requires 0 arguments"
+msgstr "--bisect-next cần 0 tham số"
+
+#: builtin/bisect--helper.c:1111
+msgid "--bisect-log requires 0 arguments"
+msgstr "--bisect-log cần 0 tham số"
+
+#: builtin/bisect--helper.c:1116
+msgid "no logfile given"
+msgstr "chưa chỉ ra tập tin ghi nhật ký"
+
+#: builtin/blame.c:32
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr "git blame [<các tùy chọn>] [<rev-opts>] [<rev>] [--] <tập-tin>"
-#: builtin/blame.c:36
+#: builtin/blame.c:37
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<rev-opts> được mô tả trong tài liệu git-rev-list(1)"
-#: builtin/blame.c:409
+#: builtin/blame.c:410
#, c-format
msgid "expecting a color: %s"
msgstr "cần một màu: %s"
-#: builtin/blame.c:416
+#: builtin/blame.c:417
msgid "must end with a color"
msgstr "phải kết thúc bằng một màu"
-#: builtin/blame.c:729
+#: builtin/blame.c:728
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "màu không hợp lệ “%s” trong color.blame.repeatedLines"
-#: builtin/blame.c:747
+#: builtin/blame.c:746
msgid "invalid value for blame.coloring"
msgstr "màu không hợp lệ cho blame.coloring"
-#: builtin/blame.c:822
+#: 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:844
-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: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:845
-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:846
-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: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:847
-msgid "Show work cost statistics"
-msgstr "Hiển thị thống kê công sức làm việc"
+#: 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:848
-msgid "Force progress reporting"
-msgstr "Ép buộc báo cáo tiến triển công việc"
+#: builtin/blame.c:871 builtin/checkout.c:1503 builtin/clone.c:92
+#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:175
+#: builtin/merge.c:297 builtin/multi-pack-index.c:27 builtin/pull.c:119
+#: builtin/push.c:575 builtin/send-pack.c:198
+msgid "force progress reporting"
+msgstr "ép buộc báo cáo tiến triển công việc"
-#: builtin/blame.c:849
-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:872
+msgid "show output score for blame entries"
+msgstr "hiển thị kết xuất điểm số cho các mục tin “blame”"
-#: builtin/blame.c:850
-msgid "Show original filename (Default: auto)"
-msgstr "Hiển thị tên tập tin gốc (Mặc định: auto)"
+#: 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:851
-msgid "Show original linenumber (Default: off)"
-msgstr "Hiển thị số dòng gốc (Mặc định: off)"
+#: 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:852
-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:875
+msgid "show in a format designed for machine consumption"
+msgstr "hiển thị ở định dạng đã thiết kế cho dùng bằng máy"
-#: builtin/blame.c:853
-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: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:854
-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: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:855
-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: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:856
-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: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:857
-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: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:858
-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:881
+msgid "show author email instead of name (Default: off)"
+msgstr "hiển thị thư điện tử của tác giả thay cho tên (Mặc định: off)"
-#: builtin/blame.c:859
-msgid "Ignore whitespace differences"
-msgstr "Bỏ qua các khác biệt do khoảng trắng gây ra"
+#: 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:860 builtin/log.c:1702
+#: builtin/blame.c:883 builtin/log.c:1812
msgid "rev"
msgstr "rev"
-#: builtin/blame.c:860
-msgid "Ignore <rev> when blaming"
-msgstr "Bỏ qua <rev> khi blame"
+#: builtin/blame.c:883
+msgid "ignore <rev> when blaming"
+msgstr "bỏ qua <rev> khi blame"
-#: builtin/blame.c:861
-msgid "Ignore revisions from <file>"
-msgstr "Bỏ qua các điểm xét duyệt từ <tập tin>"
+#: 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:862
+#: 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:863
+#: builtin/blame.c:886
msgid "color lines by age"
msgstr "các dòng màu theo tuổi"
-#: builtin/blame.c:864
-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: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:865
-msgid "Use revisions from <file> instead of calling git-rev-list"
+#: 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”"
+"sử dụng các điểm xét duyệt (revision) từ <tập tin> thay vì gọi “git-rev-list”"
-#: builtin/blame.c:866
-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: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:867 builtin/blame.c:868
+#: builtin/blame.c:890 builtin/blame.c:891
msgid "score"
msgstr "điểm số"
-#: builtin/blame.c:867
-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: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:868
-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: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:869
-msgid "n,m"
-msgstr "n,m"
+#: builtin/blame.c:892
+msgid "range"
+msgstr "vùng"
-#: builtin/blame.c:869
-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:893
+msgid "process only line range <start>,<end> or function :<funcname>"
+msgstr "xử lý chỉ dòng vùng <đầu>,<cuối> hoặc tính năng :<funcname>"
-#: builtin/blame.c:921
+#: builtin/blame.c:945
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr ""
"--progress không được dùng cùng với --incremental hay các định dạng porcelain"
@@ -10456,23 +11152,23 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:972
+#: builtin/blame.c:996
msgid "4 years, 11 months ago"
msgstr "4 năm, 11 tháng trước"
-#: builtin/blame.c:1079
+#: builtin/blame.c:1112
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "tập tin %s chỉ có %lu dòng"
-#: builtin/blame.c:1125
+#: builtin/blame.c:1157
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>]"
@@ -10534,117 +11230,107 @@
msgid "Update of config-file failed"
msgstr "Cập nhật tập tin cấu hình gặp lỗi"
-#: builtin/branch.c:220
+#: builtin/branch.c:223
msgid "cannot use -a with -d"
msgstr "không thể dùng tùy chọn -a với -d"
-#: builtin/branch.c:226
+#: builtin/branch.c:230
msgid "Couldn't look up commit object for HEAD"
msgstr "Không thể tìm kiếm đối tượng chuyển giao cho HEAD"
-#: builtin/branch.c:240
+#: builtin/branch.c:244
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Không thể xóa nhánh “%s” đã được lấy ra tại “%s”"
-#: builtin/branch.c:255
+#: builtin/branch.c:259
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "không tìm thấy nhánh theo dõi máy chủ “%s”."
-#: builtin/branch.c:256
+#: builtin/branch.c:260
#, c-format
msgid "branch '%s' not found."
msgstr "không tìm thấy nhánh “%s”."
-#: builtin/branch.c:271
-#, c-format
-msgid "Error deleting remote-tracking branch '%s'"
-msgstr "Gặp lỗi khi đang xóa nhánh theo dõi máy chủ “%s”"
-
-#: builtin/branch.c:272
-#, c-format
-msgid "Error deleting branch '%s'"
-msgstr "Gặp lỗi khi xóa bỏ nhánh “%s”"
-
-#: builtin/branch.c:279
+#: builtin/branch.c:291
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Đã xóa nhánh theo dõi máy chủ \"%s\" (từng là %s).\n"
-#: builtin/branch.c:280
+#: builtin/branch.c:292
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Nhánh “%s” đã bị xóa (từng là %s)\n"
-#: builtin/branch.c:429 builtin/tag.c:61
+#: builtin/branch.c:438 builtin/tag.c:61
msgid "unable to parse format string"
msgstr "không thể phân tích chuỗi định dạng"
-#: builtin/branch.c:460
+#: builtin/branch.c:469
msgid "could not resolve HEAD"
msgstr "không thể phân giải HEAD"
-#: builtin/branch.c:466
+#: builtin/branch.c:475
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) chỉ bên ngoài của refs/heads/"
-#: builtin/branch.c:481
+#: builtin/branch.c:490
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Nhánh %s đang được cải tổ lại tại %s"
-#: builtin/branch.c:485
+#: builtin/branch.c:494
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Nhánh %s đang được di chuyển phân đôi (bisect) tại %s"
-#: builtin/branch.c:502
+#: builtin/branch.c:511
msgid "cannot copy the current branch while not on any."
msgstr "không thể sao chép nhánh hiện hành trong khi nó chẳng ở đâu cả."
-#: builtin/branch.c:504
+#: builtin/branch.c:513
msgid "cannot rename the current branch while not on any."
msgstr "không thể đổi tên nhánh hiện hành trong khi nó chẳng ở đâu cả."
-#: builtin/branch.c:515
+#: builtin/branch.c:524
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Tên nhánh không hợp lệ: “%s”"
-#: builtin/branch.c:542
+#: builtin/branch.c:553
msgid "Branch rename failed"
msgstr "Gặp lỗi khi đổi tên nhánh"
-#: builtin/branch.c:544
+#: builtin/branch.c:555
msgid "Branch copy failed"
msgstr "Gặp lỗi khi sao chép nhánh"
-#: builtin/branch.c:548
+#: builtin/branch.c:559
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "Đã tạo một bản sao của nhánh khuyết danh “%s”"
-#: builtin/branch.c:551
+#: builtin/branch.c:562
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Đã đổi tên nhánh khuyết danh “%s” đi"
-#: builtin/branch.c:557
+#: builtin/branch.c:568
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Nhánh bị đổi tên thành %s, nhưng HEAD lại không được cập nhật!"
-#: builtin/branch.c:566
+#: builtin/branch.c:577
msgid "Branch is renamed, but update of config-file failed"
msgstr "Nhánh bị đổi tên, nhưng cập nhật tập tin cấu hình gặp lỗi"
-#: builtin/branch.c:568
+#: builtin/branch.c:579
msgid "Branch is copied, but update of config-file failed"
msgstr "Nhánh đã được sao chép, nhưng cập nhật tập tin cấu hình gặp lỗi"
-#: builtin/branch.c:584
+#: builtin/branch.c:595
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -10655,180 +11341,180 @@
" %s\n"
"Những dòng được bắt đầu bằng “%c” sẽ được cắt bỏ.\n"
-#: builtin/branch.c:618
+#: builtin/branch.c:629
msgid "Generic options"
msgstr "Tùy chọn chung"
-#: builtin/branch.c:620
+#: builtin/branch.c:631
msgid "show hash and subject, give twice for upstream branch"
msgstr "hiển thị mã băm và chủ đề, đưa ra hai lần cho nhánh thượng nguồn"
-#: builtin/branch.c:621
+#: builtin/branch.c:632
msgid "suppress informational messages"
msgstr "không xuất các thông tin"
-#: builtin/branch.c:622
+#: builtin/branch.c:633
msgid "set up tracking mode (see git-pull(1))"
msgstr "cài đặt chế độ theo dõi (xem git-pull(1))"
-#: builtin/branch.c:624
+#: builtin/branch.c:635
msgid "do not use"
msgstr "không dùng"
-#: builtin/branch.c:626 builtin/rebase.c:513
+#: builtin/branch.c:637 builtin/rebase.c:534
msgid "upstream"
msgstr "thượng nguồn"
-#: builtin/branch.c:626
+#: builtin/branch.c:637
msgid "change the upstream info"
msgstr "thay đổi thông tin thượng nguồn"
-#: builtin/branch.c:627
+#: builtin/branch.c:638
msgid "unset the upstream info"
msgstr "bỏ đặt thông tin thượng nguồn"
-#: builtin/branch.c:628
+#: builtin/branch.c:639
msgid "use colored output"
msgstr "tô màu kết xuất"
-#: builtin/branch.c:629
+#: builtin/branch.c:640
msgid "act on remote-tracking branches"
msgstr "thao tác trên nhánh “remote-tracking”"
-#: builtin/branch.c:631 builtin/branch.c:633
+#: builtin/branch.c:642 builtin/branch.c:644
msgid "print only branches that contain the commit"
msgstr "chỉ hiển thị những nhánh mà nó chứa lần chuyển giao"
-#: builtin/branch.c:632 builtin/branch.c:634
+#: builtin/branch.c:643 builtin/branch.c:645
msgid "print only branches that don't contain the commit"
msgstr "chỉ hiển thị những nhánh mà nó không chứa lần chuyển giao"
-#: builtin/branch.c:637
+#: builtin/branch.c:648
msgid "Specific git-branch actions:"
msgstr "Hành động git-branch:"
-#: builtin/branch.c:638
+#: builtin/branch.c:649
msgid "list both remote-tracking and local branches"
msgstr "liệt kê cả nhánh “remote-tracking” và nội bộ"
-#: builtin/branch.c:640
+#: builtin/branch.c:651
msgid "delete fully merged branch"
msgstr "xóa một toàn bộ nhánh đã hòa trộn"
-#: builtin/branch.c:641
+#: builtin/branch.c:652
msgid "delete branch (even if not merged)"
msgstr "xóa nhánh (cho dù là chưa được hòa trộn)"
-#: builtin/branch.c:642
+#: builtin/branch.c:653
msgid "move/rename a branch and its reflog"
msgstr "di chuyển hay đổi tên một nhánh và reflog của nó"
-#: builtin/branch.c:643
+#: builtin/branch.c:654
msgid "move/rename a branch, even if target exists"
msgstr "di chuyển hoặc đổi tên một nhánh ngay cả khi đích đã có sẵn"
-#: builtin/branch.c:644
+#: builtin/branch.c:655
msgid "copy a branch and its reflog"
msgstr "sao chép một nhánh và reflog của nó"
-#: builtin/branch.c:645
+#: builtin/branch.c:656
msgid "copy a branch, even if target exists"
msgstr "sao chép một nhánh ngay cả khi đích đã có sẵn"
-#: builtin/branch.c:646
+#: builtin/branch.c:657
msgid "list branch names"
msgstr "liệt kê các tên nhánh"
-#: builtin/branch.c:647
+#: builtin/branch.c:658
msgid "show current branch name"
msgstr "hiển thị nhánh hiện hành"
-#: builtin/branch.c:648
+#: builtin/branch.c:659
msgid "create the branch's reflog"
msgstr "tạo reflog của nhánh"
-#: builtin/branch.c:650
+#: builtin/branch.c:661
msgid "edit the description for the branch"
msgstr "sửa mô tả cho nhánh"
-#: builtin/branch.c:651
+#: builtin/branch.c:662
msgid "force creation, move/rename, deletion"
msgstr "buộc tạo, di chuyển/đổi tên, xóa"
-#: builtin/branch.c:652
+#: builtin/branch.c:663
msgid "print only branches that are merged"
msgstr "chỉ hiển thị những nhánh mà nó được hòa trộn"
-#: builtin/branch.c:653
+#: builtin/branch.c:664
msgid "print only branches that are not merged"
msgstr "chỉ hiển thị những nhánh mà nó không được hòa trộn"
-#: builtin/branch.c:654
+#: builtin/branch.c:665
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:667 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:466
msgid "object"
msgstr "đối tượng"
-#: builtin/branch.c:658
+#: builtin/branch.c:668
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:669 builtin/for-each-ref.c:48 builtin/tag.c:473
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:670 builtin/for-each-ref.c:38 builtin/tag.c:471
#: 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:785
+#: builtin/branch.c:693 builtin/clone.c:790
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:717
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:732 builtin/branch.c:788 builtin/branch.c:797
msgid "branch name required"
msgstr "cần chỉ ra tên nhánh"
-#: builtin/branch.c:753
+#: builtin/branch.c:764
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:769
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:776
#, 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:779
#, 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:794
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:803
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:808
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:812
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -10836,30 +11522,30 @@
"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:815 builtin/branch.c:838
#, 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:819
#, c-format
msgid "branch '%s' does not exist"
msgstr "chưa có nhánh “%s”"
-#: builtin/branch.c:821
+#: builtin/branch.c:832
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:836
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:842
#, 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:852
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>?"
@@ -10868,7 +11554,7 @@
"nhánh.\n"
"Có phải ý bạn là dùng: -a|-r --list <mẫu>?"
-#: builtin/branch.c:845
+#: builtin/branch.c:856
msgid ""
"the '--set-upstream' option is no longer supported. Please use '--track' or "
"'--set-upstream-to' instead."
@@ -10876,6 +11562,103 @@
"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/bugreport.c:15
+msgid "git version:\n"
+msgstr "phiên bản git:\n"
+
+#: builtin/bugreport.c:21
+#, c-format
+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/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:135
+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:137
+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:159
+#, 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:166
+msgid "System Info"
+msgstr "Thông tin hệ thống"
+
+#: builtin/bugreport.c:169
+msgid "Enabled Hooks"
+msgstr "Các Móc đã được bật"
+
+#: builtin/bugreport.c:176
+#, 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:179
+#, c-format
+msgid "unable to write to %s"
+msgstr "không thể ghi vào %s"
+
+#: builtin/bugreport.c:189
+#, 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>"
@@ -10886,55 +11669,59 @@
#: 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>...]"
+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>...]"
+msgstr "git bundle unbundle <tập tin> [<tên tham chiếu>…]"
-#: builtin/bundle.c:66 builtin/pack-objects.c:3375
+#: builtin/bundle.c:67 builtin/pack-objects.c:3495
msgid "do not show progress meter"
msgstr "không hiển thị bộ đo tiến trình"
-#: builtin/bundle.c:68 builtin/pack-objects.c:3377
+#: builtin/bundle.c:69 builtin/pack-objects.c:3497
msgid "show progress meter"
msgstr "hiển thị bộ đo tiến trình"
-#: builtin/bundle.c:70 builtin/pack-objects.c:3379
+#: builtin/bundle.c:71 builtin/pack-objects.c:3499
msgid "show progress meter during object writing phase"
msgstr "hiển thị bộ đo tiến triển trong suốt pha ghi đối tượng"
-#: builtin/bundle.c:73 builtin/pack-objects.c:3382
+#: builtin/bundle.c:74 builtin/pack-objects.c:3502
msgid "similar to --all-progress when progress meter is shown"
msgstr "tương tự --all-progress khi bộ đo tiến trình được xuất hiện"
-#: builtin/bundle.c:93
+#: 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:104
+#: builtin/bundle.c:107
msgid "do not show bundle details"
msgstr "không hiển thị chi tiết bundle (bó)"
-#: builtin/bundle.c:119
+#: builtin/bundle.c:122
#, c-format
msgid "%s is okay\n"
msgstr "“%s” tốt\n"
-#: builtin/bundle.c:160
+#: 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/bundle.c:168 builtin/remote.c:1686
+#: builtin/bundle.c:171 builtin/remote.c:1700
msgid "be verbose; must be placed before a subcommand"
msgstr "chi tiết; phải được đặt trước một lệnh-con"
-#: builtin/bundle.c:190 builtin/remote.c:1717
+#: builtin/bundle.c:193 builtin/remote.c:1731
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Không hiểu câu lệnh con: %s"
-#: builtin/cat-file.c:595
+#: builtin/cat-file.c:598
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -10942,80 +11729,80 @@
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <kiểu> | --textconv) | --filters) [--path=<đường/dẫn>] <đối_tượng>"
-#: builtin/cat-file.c:596
+#: builtin/cat-file.c: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:617
+#: 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:635
+#: 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:636
+#: builtin/cat-file.c:639
msgid "show object type"
msgstr "hiển thị kiểu đối tượng"
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:640
msgid "show object size"
msgstr "hiển thị kích thước đối tượng"
-#: builtin/cat-file.c:639
+#: 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:640
+#: 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:642
+#: 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:644
+#: 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:645 git-submodule.sh:1002
+#: builtin/cat-file.c:648
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:646
+#: 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:648
+#: 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:649
+#: builtin/cat-file.c:652
msgid "buffer --batch output"
msgstr "đệm kết xuất --batch"
-#: builtin/cat-file.c:651
+#: 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:655
+#: 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:659
+#: 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:661
+#: 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:663
+#: builtin/cat-file.c:666
msgid "do not order --batch-all-objects output"
msgstr "đừng sắp xếp đầu ra --batch-all-objects"
@@ -11043,8 +11830,8 @@
msgid "terminate input and output records by a NUL character"
msgstr "chấm dứt các bản ghi vào và ra bằng ký tự NULL"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537
-#: builtin/worktree.c:499
+#: builtin/check-ignore.c:21 builtin/checkout.c:1499 builtin/gc.c:549
+#: builtin/worktree.c:489
msgid "suppress progress reporting"
msgstr "chặn các báo cáo tiến trình hoạt động"
@@ -11097,55 +11884,55 @@
msgid "no contacts specified"
msgstr "chưa chỉ ra danh bạ"
-#: builtin/checkout-index.c:131
+#: builtin/checkout-index.c:152
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<các tùy chọn>] [--] [<tập-tin>…]"
-#: builtin/checkout-index.c:148
+#: builtin/checkout-index.c:169
msgid "stage should be between 1 and 3 or all"
msgstr "stage nên giữa 1 và 3 hay all"
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:186
msgid "check out all files in the index"
msgstr "lấy ra toàn bộ các tập tin trong bảng mục lục"
-#: builtin/checkout-index.c:165
+#: builtin/checkout-index.c:187
msgid "force overwrite of existing files"
msgstr "ép buộc ghi đè lên tập tin đã sẵn có từ trước"
-#: builtin/checkout-index.c:167
+#: builtin/checkout-index.c:189
msgid "no warning for existing files and files not in index"
msgstr ""
"không cảnh báo cho những tập tin tồn tại và không có trong bảng mục lục"
-#: builtin/checkout-index.c:169
+#: builtin/checkout-index.c:191
msgid "don't checkout new files"
msgstr "không checkout các tập tin mới"
-#: builtin/checkout-index.c:171
+#: builtin/checkout-index.c:193
msgid "update stat information in the index file"
msgstr "cập nhật thông tin thống kê trong tập tin lưu bảng mục lục mới"
-#: builtin/checkout-index.c:175
+#: builtin/checkout-index.c:197
msgid "read list of paths from the standard input"
msgstr "đọc danh sách đường dẫn từ đầu vào tiêu chuẩn"
-#: builtin/checkout-index.c:177
+#: builtin/checkout-index.c:199
msgid "write the content to temporary files"
msgstr "ghi nội dung vào tập tin tạm"
-#: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403
-#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909
-#: builtin/worktree.c:672
+#: builtin/checkout-index.c:200 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:717
msgid "string"
msgstr "chuỗi"
-#: builtin/checkout-index.c:179
+#: builtin/checkout-index.c:201
msgid "when creating files, prepend <string>"
msgstr "khi tạo các tập tin, nối thêm <chuỗi>"
-#: builtin/checkout-index.c:181
+#: builtin/checkout-index.c:203
msgid "copy out the files from named stage"
msgstr "sao chép ra các tập tin từ bệ phóng có tên"
@@ -11163,98 +11950,98 @@
#: builtin/checkout.c:42
msgid "git restore [<options>] [--source=<branch>] <file>..."
-msgstr "git restore [<các tùy chọn>] [--source=<nhánh>] <tập tin>..."
+msgstr "git restore [<các tùy chọn>] [--source=<nhánh>] <tập tin>…"
-#: builtin/checkout.c:175 builtin/checkout.c:214
+#: builtin/checkout.c: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:177 builtin/checkout.c:216
+#: 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:193
+#: 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:243
+#: 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:261
+#: 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:277
+#: 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:377
+#: 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:382
+#: 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:389
+#: 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:412 builtin/checkout.c:415 builtin/checkout.c:418
-#: builtin/checkout.c:422
+#: 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:425 builtin/checkout.c:428
+#: 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:432
+#: 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:436
+#: builtin/checkout.c:455
#, c-format
msgid "neither '%s' or '%s' is specified"
-msgstr "không chỉ định '%s' không '%s'"
+msgstr "không chỉ định “%s” cũng không “%s”"
-#: builtin/checkout.c:440
+#: 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:445 builtin/checkout.c:450
+#: 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"
+msgstr "“%s” hay “%s” không thể được sử dụng với %s"
-#: builtin/checkout.c:509 builtin/checkout.c:516
+#: builtin/checkout.c:543 builtin/checkout.c:550
#, c-format
msgid "path '%s' is unmerged"
msgstr "đường dẫn “%s” không được hòa trộn"
-#: builtin/checkout.c:684 builtin/sparse-checkout.c:106
+#: builtin/checkout.c:718
msgid "you need to resolve your current index first"
msgstr "bạn cần phải giải quyết bảng mục lục hiện tại của bạn trước đã"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:772
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -11264,50 +12051,50 @@
"sau:\n"
"%s"
-#: builtin/checkout.c:837
+#: builtin/checkout.c:865
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Không thể thực hiện reflog cho “%s”: %s\n"
-#: builtin/checkout.c:879
+#: builtin/checkout.c:907
msgid "HEAD is now at"
msgstr "HEAD hiện giờ tại"
-#: builtin/checkout.c:883 builtin/clone.c:717
+#: builtin/checkout.c:911 builtin/clone.c:721 t/helper/test-fast-rebase.c:202
msgid "unable to update HEAD"
msgstr "không thể cập nhật HEAD"
-#: builtin/checkout.c:887
+#: builtin/checkout.c:915
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Đặt lại nhánh “%s”\n"
-#: builtin/checkout.c:890
+#: builtin/checkout.c:918
#, c-format
msgid "Already on '%s'\n"
msgstr "Đã sẵn sàng trên “%s”\n"
-#: builtin/checkout.c:894
+#: builtin/checkout.c:922
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Đã chuyển tới và đặt lại nhánh “%s”\n"
-#: builtin/checkout.c:896 builtin/checkout.c:1320
+#: builtin/checkout.c:924 builtin/checkout.c:1355
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Đã chuyển đến nhánh mới “%s”\n"
-#: builtin/checkout.c:898
+#: builtin/checkout.c:926
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Đã chuyển đến nhánh “%s”\n"
-#: builtin/checkout.c:949
+#: builtin/checkout.c:977
#, c-format
msgid " ... and %d more.\n"
msgstr " … và nhiều hơn %d.\n"
-#: builtin/checkout.c:955
+#: builtin/checkout.c:983
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -11326,7 +12113,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:974
+#: builtin/checkout.c:1002
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -11347,19 +12134,19 @@
" git branch <tên_nhánh_mới> %s\n"
"\n"
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1037
msgid "internal error in revision walk"
msgstr "lỗi nội bộ trong khi di chuyển qua các điểm xét duyệt"
-#: builtin/checkout.c:1013
+#: builtin/checkout.c:1041
msgid "Previous HEAD position was"
msgstr "Vị trí trước kia của HEAD là"
-#: builtin/checkout.c:1053 builtin/checkout.c:1315
+#: builtin/checkout.c:1081 builtin/checkout.c:1350
msgid "You are on a branch yet to be born"
msgstr "Bạn tại nhánh mà nó chưa hề được sinh ra"
-#: builtin/checkout.c:1128
+#: builtin/checkout.c:1163
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -11368,7 +12155,7 @@
"“%s” không thể là cả tập tin nội bộ và một nhánh theo dõi.\n"
"Vui long dùng -- (và tùy chọn thêm --no-guess) để tránh lẫn lộn"
-#: builtin/checkout.c:1135
+#: builtin/checkout.c:1170
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"
@@ -11388,51 +12175,51 @@
"chưa rõ ràng, ví dụ máy chủ “origin”, cân nhắc cài đặt\n"
"checkout.defaultRemote=origin trong cấu hình của bạn."
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1180
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "“%s” khớp với nhiều (%d) nhánh máy chủ được theo dõi"
-#: builtin/checkout.c:1211
+#: builtin/checkout.c:1246
msgid "only one reference expected"
msgstr "chỉ cần một tham chiếu"
-#: builtin/checkout.c:1228
+#: builtin/checkout.c:1263
#, c-format
msgid "only one reference expected, %d given."
msgstr "chỉ cần một tham chiếu, nhưng lại đưa ra %d."
-#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448
+#: builtin/checkout.c:1309 builtin/worktree.c:270 builtin/worktree.c:438
#, c-format
msgid "invalid reference: %s"
msgstr "tham chiếu không hợp lệ: %s"
-#: builtin/checkout.c:1287 builtin/checkout.c:1649
+#: builtin/checkout.c:1322 builtin/checkout.c:1688
#, c-format
msgid "reference is not a tree: %s"
msgstr "tham chiếu không phải là một cây:%s"
-#: builtin/checkout.c:1334
+#: builtin/checkout.c:1369
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "cần một nhánh, nhưng lại nhận được thẻ “%s”"
-#: builtin/checkout.c:1336
+#: builtin/checkout.c:1371
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "cần một nhánh, nhưng lại nhận được nhánh máy phục vụ “%s”"
-#: builtin/checkout.c:1337 builtin/checkout.c:1345
+#: builtin/checkout.c:1372 builtin/checkout.c:1380
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "cần một nhánh, nhưng lại nhận được “%s”"
-#: builtin/checkout.c:1340
+#: builtin/checkout.c:1375
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "cần một nhánh, nhưng lại nhận được “%s”"
-#: builtin/checkout.c:1356
+#: builtin/checkout.c:1391
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -11440,7 +12227,7 @@
"không thể chuyển nhánh trong khi đang hòa trộn\n"
"Cân nhắc dung \"git merge --quit\" hoặc \"git worktree add\"."
-#: builtin/checkout.c:1360
+#: builtin/checkout.c:1395
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -11448,7 +12235,7 @@
"không thể chuyển nhanh ở giữa một phiên am\n"
"Cân nhắc dùng \"git am --quit\" hoặc \"git worktree add\"."
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1399
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -11456,7 +12243,7 @@
"không thể chuyển nhánh trong khi cải tổ\n"
"Cân nhắc dùng \"git rebase --quit\" hay \"git worktree add\"."
-#: builtin/checkout.c:1368
+#: builtin/checkout.c:1403
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -11464,7 +12251,7 @@
"không thể chuyển nhánh trong khi cherry-picking\n"
"Cân nhắc dùng \"git cherry-pick --quit\" hay \"git worktree add\"."
-#: builtin/checkout.c:1372
+#: builtin/checkout.c:1407
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -11472,148 +12259,143 @@
"không thể chuyển nhánh trong khi hoàn nguyên\n"
"Cân nhắc dùng \"git revert --quit\" hoặc \"git worktree add\"."
-#: builtin/checkout.c:1376
+#: builtin/checkout.c:1411
msgid "you are switching branch while bisecting"
msgstr ""
"bạn hiện tại đang thực hiện việc chuyển nhánh trong khi đang di chuyển nửa "
"bước"
-#: builtin/checkout.c:1383
+#: builtin/checkout.c:1418
msgid "paths cannot be used with switching branches"
msgstr "các đường dẫn không thể dùng cùng với các nhánh chuyển"
-#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394
+#: builtin/checkout.c:1421 builtin/checkout.c:1425 builtin/checkout.c:1429
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "“%s” không thể được sử dụng với các nhánh chuyển"
-#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404
-#: builtin/checkout.c:1409 builtin/checkout.c:1414
+#: builtin/checkout.c:1433 builtin/checkout.c:1436 builtin/checkout.c:1439
+#: builtin/checkout.c:1444 builtin/checkout.c:1449
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "“%s” không thể được dùng với “%s”"
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1446
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "“%s” không thể nhận <điểm-đầu>"
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1454
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Không thể chuyển nhánh đến một thứ không phải là lần chuyển giao “%s”"
-#: builtin/checkout.c:1426
+#: builtin/checkout.c:1461
msgid "missing branch or commit argument"
msgstr "thiếu tham số là nhánh hoặc lần chuyển giao"
-#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72
-#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286
-#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563
-#: builtin/send-pack.c:174
-msgid "force progress reporting"
-msgstr "ép buộc báo cáo tiến triển công việc"
-
-#: builtin/checkout.c:1469
+#: builtin/checkout.c:1504
msgid "perform a 3-way merge with the new branch"
msgstr "thực hiện hòa trộn kiểu 3-way với nhánh mới"
-#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322
+#: builtin/checkout.c:1505 builtin/log.c:1799 parse-options.h:322
msgid "style"
msgstr "kiểu"
-#: builtin/checkout.c:1471
+#: builtin/checkout.c:1506
msgid "conflict style (merge or diff3)"
msgstr "xung đột kiểu (hòa trộn hoặc diff3)"
-#: builtin/checkout.c:1483 builtin/worktree.c:496
+#: builtin/checkout.c:1518 builtin/worktree.c:486
msgid "detach HEAD at named commit"
msgstr "rời bỏ HEAD tại lần chuyển giao theo tên"
-#: builtin/checkout.c:1484
+#: builtin/checkout.c:1519
msgid "set upstream info for new branch"
msgstr "đặt thông tin thượng nguồn cho nhánh mới"
-#: builtin/checkout.c:1486
+#: builtin/checkout.c:1521
msgid "force checkout (throw away local modifications)"
msgstr "ép buộc lấy ra (bỏ đi những thay đổi nội bộ)"
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1523
msgid "new-branch"
msgstr "nhánh-mới"
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1523
msgid "new unparented branch"
msgstr "nhánh không cha mới"
-#: builtin/checkout.c:1490 builtin/merge.c:289
+#: builtin/checkout.c:1525 builtin/merge.c:301
msgid "update ignored files (default)"
msgstr "cập nhật các tập tin bị bỏ qua (mặc định)"
-#: builtin/checkout.c:1493
+#: builtin/checkout.c:1528
msgid "do not check if another worktree is holding the given ref"
msgstr "không kiểm tra nếu cây làm việc khác đang giữ tham chiếu đã cho"
-#: builtin/checkout.c:1506
+#: builtin/checkout.c:1541
msgid "checkout our version for unmerged files"
msgstr ""
"lấy ra (checkout) phiên bản của chúng ta cho các tập tin chưa được hòa trộn"
-#: builtin/checkout.c:1509
+#: builtin/checkout.c:1544
msgid "checkout their version for unmerged files"
msgstr ""
"lấy ra (checkout) phiên bản của chúng họ cho các tập tin chưa được hòa trộn"
-#: builtin/checkout.c:1513
+#: builtin/checkout.c:1548
msgid "do not limit pathspecs to sparse entries only"
msgstr "không giới hạn đặc tả đường dẫn thành chỉ các mục rải rác"
-#: builtin/checkout.c:1565
-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:1603
+#, c-format
+msgid "-%c, -%c and --orphan are mutually exclusive"
+msgstr "-%c, -%c và --orphan loại từ lẫn nhau"
-#: builtin/checkout.c:1568
+#: builtin/checkout.c:1607
msgid "-p and --overlay are mutually exclusive"
msgstr "-p và --overlay loại từ lẫn nhau"
-#: builtin/checkout.c:1605
+#: builtin/checkout.c:1644
msgid "--track needs a branch name"
msgstr "--track cần tên một nhánh"
-#: builtin/checkout.c:1610
-msgid "missing branch name; try -b"
-msgstr "thiếu tên nhánh; hãy thử -b"
+#: builtin/checkout.c:1649
+#, c-format
+msgid "missing branch name; try -%c"
+msgstr "thiếu tên nhánh; hãy thử -%c"
-#: builtin/checkout.c:1642
+#: builtin/checkout.c:1681
#, c-format
msgid "could not resolve %s"
msgstr "không thể phân giải “%s”"
-#: builtin/checkout.c:1658
+#: builtin/checkout.c:1697
msgid "invalid path specification"
msgstr "đường dẫn đã cho không hợp lệ"
-#: builtin/checkout.c:1665
+#: builtin/checkout.c:1704
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
"“%s” không phải là một lần chuyển giao và một nhánh'%s” không thể được tạo "
"từ đó"
-#: builtin/checkout.c:1669
+#: builtin/checkout.c:1708
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach không nhận một đối số đường dẫn “%s”"
-#: builtin/checkout.c:1678
+#: builtin/checkout.c:1717
msgid "--pathspec-from-file is incompatible with --detach"
msgstr "--pathspec-from-file xung khắc với --detach"
-#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506
+#: builtin/checkout.c:1720 builtin/reset.c:325 builtin/stash.c:1566
msgid "--pathspec-from-file is incompatible with --patch"
msgstr "--pathspec-from-file xung khắc với --patch"
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1733
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -11621,110 +12403,111 @@
"git checkout: --ours/--theirs, --force và --merge là xung khắc với nhau khi\n"
"checkout bảng mục lục (index)."
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1738
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:1723 builtin/checkout.c:1725 builtin/checkout.c:1774
-#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494
+#: builtin/checkout.c:1764 builtin/checkout.c:1766 builtin/checkout.c:1815
+#: builtin/checkout.c:1817 builtin/clone.c:122 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:482
+#: builtin/worktree.c:484
msgid "branch"
msgstr "nhánh"
-#: builtin/checkout.c:1724
+#: builtin/checkout.c:1765
msgid "create and checkout a new branch"
msgstr "tạo và checkout một nhánh mới"
-#: builtin/checkout.c:1726
+#: builtin/checkout.c:1767
msgid "create/reset and checkout a branch"
msgstr "tạo/đặt_lại và checkout một nhánh"
-#: builtin/checkout.c:1727
+#: builtin/checkout.c:1768
msgid "create reflog for new branch"
msgstr "tạo reflog cho nhánh mới"
-#: builtin/checkout.c:1729
+#: builtin/checkout.c:1770
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)"
+msgstr "đoán thứ hai “git checkout <không-nhánh-nào-như-vậy>” (mặc định)"
-#: builtin/checkout.c:1730
+#: builtin/checkout.c:1771
msgid "use overlay mode (default)"
msgstr "dùng chế độ che phủ (mặc định)"
-#: builtin/checkout.c:1775
+#: builtin/checkout.c:1816
msgid "create and switch to a new branch"
msgstr "tạo và chuyển đến một nhánh mới"
-#: builtin/checkout.c:1777
+#: builtin/checkout.c:1818
msgid "create/reset and switch to a branch"
msgstr "tạo/đặt_lại và chuyển đến một nhánh"
-#: builtin/checkout.c:1779
+#: builtin/checkout.c:1820
msgid "second guess 'git switch <no-such-branch>'"
msgstr "gợi ý thứ hai \"git checkout <không-nhánh-nào-như-vậy>\""
-#: builtin/checkout.c:1781
+#: builtin/checkout.c:1822
msgid "throw away local modifications"
msgstr "vứt bỏ các sửa đổi địa phương"
-#: builtin/checkout.c:1813
+#: builtin/checkout.c:1856
msgid "which tree-ish to checkout from"
msgstr "lấy ra từ tree-ish nào"
-#: builtin/checkout.c:1815
+#: builtin/checkout.c:1858
msgid "restore the index"
msgstr "phục hồi bảng mục lục"
-#: builtin/checkout.c:1817
+#: builtin/checkout.c:1860
msgid "restore the working tree (default)"
msgstr "phục hồi cây làm việc (mặc định)"
-#: builtin/checkout.c:1819
+#: builtin/checkout.c:1862
msgid "ignore unmerged entries"
msgstr "bỏ qua những thứ chưa hòa trộn: %s"
-#: builtin/checkout.c:1820
+#: builtin/checkout.c:1863
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:301 git-add--interactive.perl:595
+#: builtin/clean.c:302 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -11737,7 +12520,7 @@
"foo - chọn mục trên cơ sở tiền tố duy nhất\n"
" - (để trống) không chọn gì cả\n"
-#: builtin/clean.c:305 git-add--interactive.perl:604
+#: builtin/clean.c:306 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -11758,33 +12541,33 @@
"* - chọn tất\n"
" - (để trống) kết thúc việc chọn\n"
-#: builtin/clean.c:521 git-add--interactive.perl:570
-#: git-add--interactive.perl:575
+#: builtin/clean.c:521 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Hả (%s)?\n"
-#: builtin/clean.c:663
+#: builtin/clean.c: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:700
+#: 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:721
+#: 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:762
+#: builtin/clean.c:758
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Xóa bỏ “%s” [y/N]? "
-#: builtin/clean.c:795
+#: builtin/clean.c:789
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -11802,55 +12585,51 @@
"help - hiển thị chính trợ giúp này\n"
"? - trợ giúp dành cho chọn bằng cách nhắc"
-#: builtin/clean.c:831
+#: builtin/clean.c: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:847
+#: 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:909
+#: 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:911
+#: builtin/clean.c:905
msgid "force"
msgstr "ép buộc"
-#: builtin/clean.c:912
+#: builtin/clean.c:906
msgid "interactive cleaning"
msgstr "dọn bằng kiểu tương tác"
-#: builtin/clean.c:914
+#: builtin/clean.c:908
msgid "remove whole directories"
msgstr "gỡ bỏ toàn bộ thư mục"
-#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564
-#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179
-#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/grep.c:922 builtin/log.c:184 builtin/log.c:186
+#: builtin/ls-files.c:573 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "mẫu"
-#: builtin/clean.c:916
+#: 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:917
+#: 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:919
+#: builtin/clean.c:913
msgid "remove only ignored files"
msgstr "chỉ gỡ bỏ những tập tin bị bỏ qua"
-#: builtin/clean.c:937
-msgid "-x and -X cannot be used together"
-msgstr "-x và -X không thể dùng cùng nhau"
-
-#: builtin/clean.c:941
+#: builtin/clean.c:929
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -11858,7 +12637,7 @@
"clean.requireForce được đặt thành true và không đưa ra tùy chọn -i, -n mà "
"cũng không -f; từ chối lệnh dọn dẹp (clean)"
-#: builtin/clean.c:944
+#: builtin/clean.c:932
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -11866,31 +12645,35 @@
"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/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>]"
-#: builtin/clone.c:93
+#: builtin/clone.c:94
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:95 builtin/clone.c:97 builtin/init-db.c:555
msgid "create a bare repository"
msgstr "tạo kho thuần"
-#: builtin/clone.c:98
+#: builtin/clone.c:99
msgid "create a mirror repository (implies bare)"
msgstr "tạo kho bản sao (ý là kho thuần)"
-#: builtin/clone.c:100
+#: builtin/clone.c:101
msgid "to clone from a local repository"
msgstr "để nhân bản từ kho nội bộ"
-#: builtin/clone.c:102
+#: builtin/clone.c:103
msgid "don't use local hardlinks, always copy"
msgstr "không sử dụng liên kết cứng nội bộ, luôn sao chép"
-#: builtin/clone.c:104
+#: builtin/clone.c:105
msgid "setup as shared repository"
msgstr "cài đặt đây là kho chia sẻ"
@@ -11902,131 +12685,132 @@
msgid "initialize submodules in the clone"
msgstr "khởi tạo mô-đun-con trong bản sao"
-#: builtin/clone.c:110
+#: builtin/clone.c:111
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:112 builtin/init-db.c:552
msgid "template-directory"
msgstr "thư-mục-mẫu"
-#: builtin/clone.c:112 builtin/init-db.c:487
+#: builtin/clone.c:113 builtin/init-db.c:553
msgid "directory from which templates will be used"
msgstr "thư mục mà tại đó các mẫu sẽ được dùng"
-#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407
-#: builtin/submodule--helper.c:1912
+#: builtin/clone.c:115 builtin/clone.c:117 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:1409
-#: builtin/submodule--helper.c:1914
+#: builtin/clone.c:119 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:3441 builtin/repack.c:327
+#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3561 builtin/repack.c:357
msgid "name"
msgstr "tên"
-#: builtin/clone.c:120
+#: builtin/clone.c:121
msgid "use <name> instead of 'origin' to track upstream"
msgstr "dùng <tên> thay cho “origin” để theo dõi thượng nguồn"
-#: builtin/clone.c:122
+#: builtin/clone.c:123
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "lấy ra <nhánh> thay cho HEAD của máy chủ"
-#: builtin/clone.c:124
+#: builtin/clone.c:125
msgid "path to git-upload-pack on the remote"
msgstr "đường dẫn đến git-upload-pack trên máy chủ"
-#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828
-#: builtin/pull.c:207
+#: builtin/clone.c:126 builtin/fetch.c:176 builtin/grep.c:861
+#: builtin/pull.c:208
msgid "depth"
msgstr "độ-sâu"
-#: builtin/clone.c:126
+#: builtin/clone.c:127
msgid "create a shallow clone of that depth"
msgstr "tạo bản sao không đầy đủ cho mức sâu đã cho"
-#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430
+#: builtin/clone.c:128 builtin/fetch.c:178 builtin/pack-objects.c:3550
+#: builtin/pull.c:211
msgid "time"
msgstr "thời-gian"
-#: builtin/clone.c:128
+#: builtin/clone.c:129
msgid "create a shallow clone since a specific time"
msgstr "tạo bản sao không đầy đủ từ thời điểm đã cho"
-#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195
-#: builtin/rebase.c:1480
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/fetch.c:203
+#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1323
msgid "revision"
msgstr "điểm xét duyệt"
-#: builtin/clone.c:130 builtin/fetch.c:173
+#: builtin/clone.c:131 builtin/fetch.c:181 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/submodule--helper.c:1419
-#: builtin/submodule--helper.c:1928
+#: builtin/clone.c:133 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"
-#: builtin/clone.c:134
+#: builtin/clone.c:135
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
"đứng có nhân bản bất kỳ nhánh nào, và làm cho những lần lấy về sau không "
"theo chúng nữa"
-#: builtin/clone.c:136
+#: builtin/clone.c:137
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:138 builtin/init-db.c:561
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:138 builtin/init-db.c:496
+#: builtin/clone.c:139 builtin/init-db.c:562
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"
-#: builtin/clone.c:139
+#: builtin/clone.c:140
msgid "key=value"
msgstr "khóa=giá_trị"
-#: builtin/clone.c:140
+#: builtin/clone.c:141
msgid "set config inside the new repository"
msgstr "đặt cấu hình bên trong một kho chứa mới"
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
-#: builtin/push.c:573 builtin/send-pack.c:172
+#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77
+#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
msgid "server-specific"
msgstr "đặc-tả-máy-phục-vụ"
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
-#: builtin/push.c:573 builtin/send-pack.c:173
+#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77
+#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
msgid "option to transmit"
msgstr "tùy chọn để chuyển giao"
-#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220
-#: builtin/push.c:574
+#: builtin/clone.c:144 builtin/fetch.c:199 builtin/pull.c:234
+#: builtin/push.c:585
msgid "use IPv4 addresses only"
msgstr "chỉ dùng địa chỉ IPv4"
-#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223
-#: builtin/push.c:576
+#: builtin/clone.c:146 builtin/fetch.c:201 builtin/pull.c:237
+#: builtin/push.c:587
msgid "use IPv6 addresses only"
msgstr "chỉ dùng địa chỉ IPv6"
-#: builtin/clone.c:149
+#: builtin/clone.c:150
msgid "any cloned submodules will use their remote-tracking branch"
msgstr "mọi mô-đun-con nhân bản sẽ dung nhánh theo dõi máy chủ của chúng"
-#: builtin/clone.c:151
+#: builtin/clone.c:152
msgid "initialize sparse-checkout file to include only files at root"
msgstr "khởi tạo tập tin sparse-checkout để bao gồm chỉ các tập tin ở gốc"
-#: builtin/clone.c:287
+#: builtin/clone.c:288
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -12034,42 +12818,42 @@
"Không đoán được thư mục tên là gì.\n"
"Vui lòng chỉ định tên một thư mục trên dòng lệnh"
-#: builtin/clone.c:340
+#: builtin/clone.c:341
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "thông tin: không thể thêm thay thế cho “%s”: %s\n"
-#: builtin/clone.c:413
+#: builtin/clone.c:414
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s có tồn tại nhưng lại không phải là một thư mục"
-#: builtin/clone.c:430
+#: builtin/clone.c:432
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "gặp lỗi khi bắt đầu lặp qua “%s”"
-#: builtin/clone.c:460
+#: builtin/clone.c:463
#, c-format
msgid "failed to create link '%s'"
msgstr "gặp lỗi khi tạo được liên kết mềm %s"
-#: builtin/clone.c:464
+#: builtin/clone.c:467
#, c-format
msgid "failed to copy file to '%s'"
msgstr "gặp lỗi khi sao chép tập tin và “%s”"
-#: builtin/clone.c:469
+#: builtin/clone.c:472
#, c-format
msgid "failed to iterate over '%s'"
msgstr "gặp lỗi khi lặp qua “%s”"
-#: builtin/clone.c:494
+#: builtin/clone.c:499
#, c-format
msgid "done.\n"
msgstr "hoàn tất.\n"
-#: builtin/clone.c:508
+#: builtin/clone.c:513
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -12077,101 +12861,107 @@
msgstr ""
"Việc nhân bản thành công, nhưng checkout gặp lỗi.\n"
"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"
+"và thử lấy ra với lệnh “git restore --source=HEAD :/”\n"
-#: builtin/clone.c:585
+#: builtin/clone.c:590
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Không tìm thấy nhánh máy chủ %s để nhân bản (clone)."
-#: builtin/clone.c:705
+#: builtin/clone.c:709
#, c-format
msgid "unable to update %s"
msgstr "không thể cập nhật %s"
-#: builtin/clone.c:753
+#: builtin/clone.c:757
msgid "failed to initialize sparse-checkout"
msgstr "gặp lỗi khi khởi tạo sparse-checkout"
-#: builtin/clone.c:776
+#: builtin/clone.c:780
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "refers HEAD máy chủ chỉ đến ref không tồn tại, không thể lấy ra.\n"
-#: builtin/clone.c:807
+#: builtin/clone.c:812
msgid "unable to checkout working tree"
msgstr "không thể lấy ra (checkout) cây làm việc"
-#: builtin/clone.c:862
+#: builtin/clone.c:887
msgid "unable to write parameters to config file"
msgstr "không thể ghi các tham số vào tập tin cấu hình"
-#: builtin/clone.c:925
+#: builtin/clone.c:950
msgid "cannot repack to clean up"
msgstr "không thể đóng gói để dọn dẹp"
-#: builtin/clone.c:927
+#: builtin/clone.c:952
msgid "cannot unlink temporary alternates file"
msgstr "không thể bỏ liên kết tập tin thay thế tạm thời"
-#: builtin/clone.c:965 builtin/receive-pack.c:1950
+#: builtin/clone.c:993 builtin/receive-pack.c:2493
msgid "Too many arguments."
msgstr "Có quá nhiều đối số."
-#: builtin/clone.c:969
+#: builtin/clone.c:997
msgid "You must specify a repository to clone."
msgstr "Bạn phải chỉ định một kho để mà nhân bản (clone)."
-#: builtin/clone.c:982
+#: builtin/clone.c:1010
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "tùy chọn --bare và --origin %s xung khắc nhau."
-#: builtin/clone.c:985
+#: builtin/clone.c:1013
msgid "--bare and --separate-git-dir are incompatible."
msgstr "tùy chọn --bare và --separate-git-dir xung khắc nhau."
-#: builtin/clone.c:998
+#: builtin/clone.c:1026
#, c-format
msgid "repository '%s' does not exist"
msgstr "kho chứa “%s” chưa tồn tại"
-#: builtin/clone.c:1004 builtin/fetch.c:1796
+#: builtin/clone.c:1030 builtin/fetch.c:1951
#, c-format
msgid "depth %s is not a positive number"
msgstr "độ sâu %s không phải là một số nguyên dương"
-#: builtin/clone.c:1014
+#: builtin/clone.c:1040
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "đường dẫn đích “%s” đã có từ trước và không phải là một thư mục rỗng."
-#: builtin/clone.c:1024
+#: builtin/clone.c:1046
+#, 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:1060
#, c-format
msgid "working tree '%s' already exists."
msgstr "cây làm việc “%s” đã sẵn tồn tại rồi."
-#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271
-#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327
+#: builtin/clone.c:1075 builtin/clone.c:1096 builtin/difftool.c:271
+#: builtin/log.c:1986 builtin/worktree.c:282 builtin/worktree.c:314
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "không thể tạo các thư mục dẫn đầu của “%s”"
-#: builtin/clone.c:1044
+#: builtin/clone.c:1080
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "không thể tạo cây thư mục làm việc dir “%s”"
-#: builtin/clone.c:1064
+#: builtin/clone.c:1100
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Đang nhân bản thành kho chứa bare “%s”…\n"
-#: builtin/clone.c:1066
+#: builtin/clone.c:1102
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Đang nhân bản thành “%s”…\n"
-#: builtin/clone.c:1090
+#: builtin/clone.c:1126
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -12179,41 +12969,46 @@
"nhân bản --recursive không tương thích với cả hai --reference và --reference-"
"if-able"
-#: builtin/clone.c:1154
+#: builtin/clone.c:1170 builtin/remote.c:200 builtin/remote.c:705
+#, 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/clone.c:1211
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay thế."
-#: builtin/clone.c:1156
+#: builtin/clone.c:1213
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-since bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay "
"thế."
-#: builtin/clone.c:1158
+#: builtin/clone.c:1215
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-exclude bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay "
"thế."
-#: builtin/clone.c:1160
+#: builtin/clone.c:1217
msgid "--filter is ignored in local clones; use file:// instead."
msgstr ""
"--filter bị lờ đi khi nhân bản nội bộ; hãy sử dụng file:// để thay thế."
-#: builtin/clone.c:1163
+#: builtin/clone.c:1220
msgid "source repository is shallow, ignoring --local"
msgstr "kho nguồn là nông, nên bỏ qua --local"
-#: builtin/clone.c:1168
+#: builtin/clone.c:1225
msgid "--local is ignored"
msgstr "--local bị lờ đi"
-#: builtin/clone.c:1243 builtin/clone.c:1251
+#: builtin/clone.c:1315 builtin/clone.c:1323
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Nhánh máy chủ %s không tìm thấy trong thượng nguồn %s"
-#: builtin/clone.c:1254
+#: builtin/clone.c:1326
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."
@@ -12249,6 +13044,120 @@
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:187 builtin/log.c:1768
+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 "
@@ -12262,7 +13171,7 @@
msgid "duplicate parent %s ignored"
msgstr "cha mẹ bị trùng lặp %s đã bị bỏ qua"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:557
#, c-format
msgid "not a valid object name %s"
msgstr "không phải là tên đối tượng hợp lệ “%s”"
@@ -12290,13 +13199,13 @@
msgid "id of a parent commit object"
msgstr "mã số của đối tượng chuyển giao cha mẹ"
-#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477
-#: builtin/tag.c:412
+#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:282
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1537
+#: builtin/tag.c:445
msgid "message"
msgstr "chú thích"
-#: builtin/commit-tree.c:115 builtin/commit.c:1501
+#: builtin/commit-tree.c:115 builtin/commit.c:1504
msgid "commit message"
msgstr "chú thích của lần chuyển giao"
@@ -12304,8 +13213,8 @@
msgid "read commit log message from file"
msgstr "đọc chú thích nhật ký lần chuyển giao từ tập tin"
-#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288
-#: builtin/pull.c:175 builtin/revert.c:118
+#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:299
+#: builtin/pull.c:176 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "Ký lần chuyển giao dùng GPG"
@@ -12354,10 +13263,14 @@
"\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"
@@ -12379,71 +13292,76 @@
" 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:351
+#: 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:364
+#: 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:376
+#: 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:385
+#: 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:400
+#: 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:402
+#: 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:427 builtin/commit.c:450 builtin/commit.c:496
+#: 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:479
+#: 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:481
+#: 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:489
+#: 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:508
+#: 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:606
+#: 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:608
+#: 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:627
+#: builtin/commit.c:626
msgid "malformed --author parameter"
msgstr "đối số cho --author bị dị hình"
-#: builtin/commit.c:680
+#: builtin/commit.c:679
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -12451,68 +13369,66 @@
"không thể chọn một ký tự ghi chú cái mà không được dùng\n"
"trong phần ghi chú hiện tại"
-#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097
+#: builtin/commit.c: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:730 builtin/shortlog.c:319
+#: builtin/commit.c:729 builtin/shortlog.c:413
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(đang đọc thông điệp nhật ký từ đầu vào tiêu chuẩn)\n"
-#: builtin/commit.c:732
+#: builtin/commit.c: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:736
+#: 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:767 builtin/commit.c:783
+#: builtin/commit.c:766 builtin/commit.c:782
msgid "could not read SQUASH_MSG"
msgstr "không thể đọc SQUASH_MSG"
-#: builtin/commit.c:774
+#: builtin/commit.c:773
msgid "could not read MERGE_MSG"
msgstr "không thể đọc MERGE_MSG"
-#: builtin/commit.c:834
+#: builtin/commit.c:833
msgid "could not write commit template"
msgstr "không thể ghi mẫu chuyển giao"
#: builtin/commit.c:853
-#, c-format
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
+"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:858
-#, c-format
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
+"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:871
+#: builtin/commit.c:868
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -12523,7 +13439,7 @@
"bắt đầu bằng “%c” sẽ được bỏ qua, nếu phần chú thích rỗng sẽ hủy bỏ lần "
"chuyển giao.\n"
-#: builtin/commit.c:879
+#: builtin/commit.c:876
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -12535,22 +13451,22 @@
"bắt đầu bằng “%c” sẽ được bỏ qua; bạn có thể xóa chúng đi nếu muốn thế.\n"
"Phần chú thích này nếu trống rỗng sẽ hủy bỏ lần chuyển giao.\n"
-#: builtin/commit.c:896
+#: builtin/commit.c:893
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sTác giả: %.*s <%.*s>"
-#: builtin/commit.c:904
+#: builtin/commit.c:901
#, c-format
msgid "%sDate: %s"
msgstr "%sNgày tháng: %s"
-#: builtin/commit.c:911
+#: builtin/commit.c:908
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sNgười chuyển giao: %.*s <%.*s>"
-#: builtin/commit.c:929
+#: builtin/commit.c:926
msgid "Cannot read index"
msgstr "Không đọc được bảng mục lục"
@@ -12558,7 +13474,7 @@
msgid "Error building trees"
msgstr "Gặp lỗi khi xây dựng cây"
-#: builtin/commit.c:1011 builtin/tag.c:275
+#: builtin/commit.c:1011 builtin/tag.c:308
#, 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"
@@ -12575,7 +13491,7 @@
msgid "Invalid ignored mode '%s'"
msgstr "Chế độ bỏ qua không hợp lệ “%s”"
-#: builtin/commit.c:1087 builtin/commit.c:1327
+#: builtin/commit.c: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”"
@@ -12603,80 +13519,85 @@
"Bạn đang ở giữa của quá trình cherry-pick -- không thể thực hiện việc “tu "
"bổ”."
-#: builtin/commit.c:1188
+#: builtin/commit.c: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:1198
+#: 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:1200
+#: 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:1208
+#: 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:1225
+#: 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:1231
+#: 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:1362 builtin/commit.c:1524
+#: 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:1364 builtin/commit.c:1526
+#: builtin/commit.c:1368 builtin/commit.c:1529
msgid "show branch information"
msgstr "hiển thị thông tin nhánh"
-#: builtin/commit.c:1366
+#: builtin/commit.c:1370
msgid "show stash information"
msgstr "hiển thị thông tin về tạm cất"
-#: builtin/commit.c:1368 builtin/commit.c:1528
+#: builtin/commit.c:1372 builtin/commit.c:1531
msgid "compute full ahead/behind values"
msgstr "tính đầy đủ giá trị trước/sau"
-#: builtin/commit.c:1370
+#: builtin/commit.c:1374
msgid "version"
msgstr "phiên bản"
-#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549
-#: builtin/worktree.c:643
+#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560
+#: builtin/worktree.c:679
msgid "machine-readable output"
msgstr "kết xuất dạng máy-có-thể-đọc"
-#: builtin/commit.c:1373 builtin/commit.c:1532
+#: builtin/commit.c: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:1376 builtin/commit.c:1535
+#: 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:1378 builtin/commit.c:1382 builtin/commit.c:1538
-#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
-#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336
+#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541
+#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
+#: builtin/fast-export.c:1204 builtin/rebase.c:1412 parse-options.h:336
msgid "mode"
msgstr "chế độ"
-#: builtin/commit.c:1379 builtin/commit.c:1538
+#: 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:1383
+#: builtin/commit.c:1387
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
@@ -12684,11 +13605,11 @@
"hiển thị các tập tin bị bỏ qua, các chế độ tùy chọn: traditional, matching, "
"no. (Mặc định: traditional)"
-#: builtin/commit.c:1385 parse-options.h:192
+#: builtin/commit.c:1389 parse-options.h:192
msgid "when"
msgstr "khi"
-#: builtin/commit.c:1386
+#: builtin/commit.c:1390
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -12696,176 +13617,176 @@
"bỏ qua các thay đổi trong mô-đun-con, tùy chọn khi: all, dirty, untracked. "
"(Mặc định: all)"
-#: builtin/commit.c:1388
+#: builtin/commit.c: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:1389
+#: builtin/commit.c:1393
msgid "do not detect renames"
msgstr "không dò tìm các tên thay đổi"
-#: builtin/commit.c:1391
+#: 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:1411
+#: 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:1494
+#: 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:1495
+#: 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:1497
+#: builtin/commit.c:1500
msgid "Commit message options"
msgstr "Các tùy chọn ghi chú commit"
-#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414
+#: builtin/commit.c:1501 builtin/merge.c:286 builtin/tag.c:447
msgid "read message from file"
msgstr "đọc chú thích từ tập tin"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1502
msgid "author"
msgstr "tác giả"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1502
msgid "override author for commit"
msgstr "ghi đè tác giả cho commit"
-#: builtin/commit.c:1500 builtin/gc.c:538
+#: builtin/commit.c:1503 builtin/gc.c:550
msgid "date"
msgstr "ngày tháng"
-#: builtin/commit.c:1500
+#: builtin/commit.c:1503
msgid "override date for commit"
msgstr "ghi đè ngày tháng cho lần chuyển giao"
-#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504
-#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92
+#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507
+#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:90
msgid "commit"
msgstr "lần_chuyển_giao"
-#: builtin/commit.c:1502
+#: 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:1503
+#: 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:1504
+#: 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:1505
+#: 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:1506
+#: 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:1507 builtin/log.c:1634 builtin/merge.c:290
-#: builtin/pull.c:144 builtin/revert.c:110
-msgid "add Signed-off-by:"
-msgstr "(nên dùng) thêm dòng Signed-off-by:"
+#: builtin/commit.c:1510 builtin/log.c:1743 builtin/merge.c:302
+#: builtin/pull.c:145 builtin/revert.c:110
+msgid "add a Signed-off-by trailer"
+msgstr "thêm dòng Signed-off-by vào cuối"
-#: builtin/commit.c:1508
+#: builtin/commit.c:1511
msgid "use specified template file"
msgstr "sử dụng tập tin mẫu đã cho"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1512
msgid "force edit of commit"
msgstr "ép buộc sửa lần commit"
-#: builtin/commit.c:1511
+#: 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:1516
+#: builtin/commit.c:1519
msgid "Commit contents options"
msgstr "Các tùy nội dung ghi chú commit"
-#: builtin/commit.c:1517
+#: 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:1518
+#: 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:1519
+#: 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:1520
+#: builtin/commit.c:1523
msgid "interactively add changes"
msgstr "thêm các thay đổi bằng tương tác"
-#: builtin/commit.c:1521
+#: builtin/commit.c:1524
msgid "commit only specified files"
msgstr "chỉ chuyển giao các tập tin đã chỉ ra"
-#: builtin/commit.c:1522
+#: 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:1523
+#: 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:1536
+#: builtin/commit.c:1539
msgid "amend previous commit"
msgstr "“tu bổ” (amend) lần commit trước"
-#: builtin/commit.c:1537
+#: builtin/commit.c:1540
msgid "bypass post-rewrite hook"
msgstr "vòng qua móc (hook) post-rewrite"
-#: builtin/commit.c:1544
+#: 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:1546
+#: 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:1619
+#: 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:1626
+#: builtin/commit.c:1629
msgid "could not read MERGE_MODE"
msgstr "không thể đọc MERGE_MODE"
-#: builtin/commit.c:1645
+#: 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:1652
+#: 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:1657
+#: 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:1691
+#: 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"
@@ -12876,298 +13797,225 @@
"có bị đầy quá hay quota (hạn nghạch đĩa cứng) bị vượt quá,\n"
"và sau đó \"git restore --staged :/\" để khắc phục."
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:17
-msgid ""
-"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
-msgstr ""
-"git commit-graph verify [--object-dir </thư/mục/đối/tượng>] [--shallow] [--"
-"[no-]progress]"
-
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:22
-msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
-msgstr ""
-"git commit-graph write [--object-dir </thư/mục/đối/tượng>] [--append|--"
-"split] [--reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <các "
-"tùy chọn chia tách>"
-
-#: builtin/commit-graph.c:52
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "không thể tìm thấy thư mục đối tượng khớp với “%s”"
-
-#: builtin/commit-graph.c:68 builtin/commit-graph.c:125
-#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657
-msgid "dir"
-msgstr "tmục"
-
-#: builtin/commit-graph.c:69 builtin/commit-graph.c:126
-#: builtin/commit-graph.c:211
-msgid "The object directory to store the graph"
-msgstr "Thư mục đối tượng để lưu đồ thị"
-
-#: builtin/commit-graph.c:71
-msgid "if the commit-graph is split, only verify the tip file"
-msgstr ""
-"nếu đồ-thị-các-lần-chuyển-giao bị chia cắt, thì chỉ thẩm tra tập tin đỉnh"
-
-#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23
-#, c-format
-msgid "Could not open commit-graph '%s'"
-msgstr "Không thể mở đồ thị chuyển giao “%s”"
-
-#: builtin/commit-graph.c:128
-msgid "start walk at all refs"
-msgstr "bắt đầu di chuyển tại mọi tham chiếu"
-
-#: builtin/commit-graph.c:130
-msgid "scan pack-indexes listed by stdin for commits"
-msgstr ""
-"quét dó các mục lục gói được liệt kê bởi đầu vào tiêu chuẩn cho các lần "
-"chuyển giao"
-
-#: builtin/commit-graph.c:132
-msgid "start walk at commits listed by stdin"
-msgstr ""
-"bắt đầu di chuyển tại các lần chuyển giao được liệt kê bởi đầu vào tiêu chuẩn"
-
-#: builtin/commit-graph.c:134
-msgid "include all commits already in the commit-graph file"
-msgstr ""
-"bao gồm mọi lần chuyển giao đã sẵn có trongười tập tin đồ-thị-các-lần-chuyển-"
-"giao"
-
-#: builtin/commit-graph.c:137
-msgid "allow writing an incremental commit-graph file"
-msgstr "cho phép ghi một tập tin đồ họa các lần chuyển giao lớn lên"
-
-#: builtin/commit-graph.c:139 builtin/commit-graph.c:143
-msgid "maximum number of commits in a non-base split commit-graph"
-msgstr ""
-"số lượng tối đa của các lần chuyển giao trong một đồ-thị-các-lần-chuyển-giao "
-"chia cắt không-cơ-sở"
-
-#: builtin/commit-graph.c:141
-msgid "maximum ratio between two levels of a split commit-graph"
-msgstr "tỷ lệ tối đa giữa hai mức của một đồ-thị-các-lần-chuyển-giao chia cắt"
-
-#: builtin/commit-graph.c:159
-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:104 builtin/env--helper.c:23
+#: builtin/config.c:109 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:116
+#: builtin/config.c:121
msgid "only one type at a time"
msgstr "chỉ một kiểu một lần"
-#: builtin/config.c:125
+#: builtin/config.c:130
msgid "Config file location"
msgstr "Vị trí tập tin cấu hình"
-#: builtin/config.c:126
+#: builtin/config.c:131
msgid "use global config file"
msgstr "dùng tập tin cấu hình toàn cục"
-#: builtin/config.c:127
+#: builtin/config.c:132
msgid "use system config file"
msgstr "sử dụng tập tin cấu hình hệ thống"
-#: builtin/config.c:128
+#: builtin/config.c:133
msgid "use repository config file"
msgstr "dùng tập tin cấu hình của kho"
-#: builtin/config.c:129
+#: builtin/config.c:134
msgid "use per-worktree config file"
msgstr "dùng tập tin cấu hình per-worktree"
-#: builtin/config.c:130
+#: builtin/config.c:135
msgid "use given config file"
msgstr "sử dụng tập tin cấu hình đã cho"
-#: builtin/config.c:131
+#: builtin/config.c:136
msgid "blob-id"
msgstr "blob-id"
-#: builtin/config.c:131
+#: builtin/config.c:136
msgid "read config from given blob object"
msgstr "đọc cấu hình từ đối tượng blob đã cho"
-#: builtin/config.c:132
+#: builtin/config.c:137
msgid "Action"
msgstr "Hành động"
-#: builtin/config.c:133
-msgid "get value: name [value-regex]"
-msgstr "lấy giá-trị: tên [value-regex]"
+#: builtin/config.c:138
+msgid "get value: name [value-pattern]"
+msgstr "lấy giá trị: tên [value-pattern]"
-#: builtin/config.c:134
-msgid "get all values: key [value-regex]"
-msgstr "lấy tất cả giá-trị: khóa [value-regex]"
+#: builtin/config.c:139
+msgid "get all values: key [value-pattern]"
+msgstr "lấy tất cả giá trị: khóa [value-pattern]"
-#: builtin/config.c:135
-msgid "get values for regexp: name-regex [value-regex]"
-msgstr "lấy giá trị cho regexp: name-regex [value-regex]"
+#: builtin/config.c:140
+msgid "get values for regexp: name-regex [value-pattern]"
+msgstr "lấy giá trị cho regexp: name-regex [value-pattern]"
-#: builtin/config.c:136
+#: builtin/config.c:141
msgid "get value specific for the URL: section[.var] URL"
msgstr "lấy đặc tả giá trị cho URL: phần[.biến] URL"
-#: builtin/config.c:137
-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:142
+msgid "replace all matching variables: name value [value-pattern]"
+msgstr "thay thế tất cả các biến khớp mẫu: tên giá-trị [value-pattern]"
-#: builtin/config.c:138
+#: builtin/config.c:143
msgid "add a new variable: name value"
msgstr "thêm biến mới: tên giá-trị"
-#: builtin/config.c:139
-msgid "remove a variable: name [value-regex]"
-msgstr "gỡ bỏ biến: tên [value-regex]"
+#: builtin/config.c:144
+msgid "remove a variable: name [value-pattern]"
+msgstr "gỡ bỏ biến: tên [value-pattern]"
-#: builtin/config.c:140
-msgid "remove all matches: name [value-regex]"
-msgstr "gỡ bỏ mọi cái khớp: tên [value-regex]"
+#: builtin/config.c:145
+msgid "remove all matches: name [value-pattern]"
+msgstr "gỡ bỏ mọi cái khớp: tên [value-pattern]"
-#: builtin/config.c:141
+#: builtin/config.c:146
msgid "rename section: old-name new-name"
msgstr "đổi tên phần: tên-cũ tên-mới"
-#: builtin/config.c:142
+#: builtin/config.c:147
msgid "remove a section: name"
msgstr "gỡ bỏ phần: tên"
-#: builtin/config.c:143
+#: builtin/config.c:148
msgid "list all"
msgstr "liệt kê tất"
-#: builtin/config.c:144
+#: builtin/config.c:149
+msgid "use string equality when comparing values to 'value-pattern'"
+msgstr "sử dụng so sánh bằng chuỗi khi so sánh các giá trị với “value-pattern”"
+
+#: builtin/config.c:150
msgid "open an editor"
msgstr "mở một trình biên soạn"
-#: builtin/config.c:145
+#: builtin/config.c:151
msgid "find the color configured: slot [default]"
msgstr "tìm cấu hình màu sắc: slot [mặc định]"
-#: builtin/config.c:146
+#: builtin/config.c:152
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "tìm các cài đặt về màu sắc: slot [stdout-là-tty]"
-#: builtin/config.c:147
+#: builtin/config.c:153
msgid "Type"
msgstr "Kiểu"
-#: builtin/config.c:148 builtin/env--helper.c:38
+#: builtin/config.c:154 builtin/env--helper.c:43
msgid "value is given this type"
msgstr "giá trị được đưa kiểu này"
-#: builtin/config.c:149
+#: builtin/config.c:155
msgid "value is \"true\" or \"false\""
msgstr "giá trị là \"true\" hoặc \"false\""
-#: builtin/config.c:150
+#: builtin/config.c:156
msgid "value is decimal number"
msgstr "giá trị ở dạng số thập phân"
-#: builtin/config.c:151
+#: builtin/config.c:157
msgid "value is --bool or --int"
msgstr "giá trị là --bool hoặc --int"
-#: builtin/config.c:152
+#: builtin/config.c:158
+msgid "value is --bool or string"
+msgstr "giá trị là --bool hoặc chuỗi"
+
+#: builtin/config.c:159
msgid "value is a path (file or directory name)"
msgstr "giá trị là đường dẫn (tên tập tin hay thư mục)"
-#: builtin/config.c:153
+#: builtin/config.c:160
msgid "value is an expiry date"
msgstr "giá trị là một ngày hết hạn"
-#: builtin/config.c:154
+#: builtin/config.c:161
msgid "Other"
msgstr "Khác"
-#: builtin/config.c:155
+#: builtin/config.c:162
msgid "terminate values with NUL byte"
msgstr "chấm dứt giá trị với byte NUL"
-#: builtin/config.c:156
+#: builtin/config.c:163
msgid "show variable names only"
msgstr "chỉ hiển thị các tên biến"
-#: builtin/config.c:157
+#: builtin/config.c:164
msgid "respect include directives on lookup"
msgstr "tôn trọng kể cà các hướng trong tìm kiếm"
-#: builtin/config.c:158
+#: builtin/config.c:165
msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
"hiển thị nguyên gốc của cấu hình (tập tin, đầu vào tiêu chuẩn, blob, dòng "
"lệnh)"
-#: builtin/config.c:159
+#: builtin/config.c:166
msgid "show scope of config (worktree, local, global, system, command)"
msgstr ""
"hiển thị phạm vi của cấu hình (cây làm việc, cục bộ, toàn cầu, hệ thống, "
"lệnh)"
-#: builtin/config.c:160 builtin/env--helper.c:40
+#: builtin/config.c:167 builtin/env--helper.c:45
msgid "value"
msgstr "giá trị"
-#: builtin/config.c:160
+#: builtin/config.c:167
msgid "with --get, use default value when missing entry"
msgstr "với --get, dùng giá trị mặc định khi thiếu mục tin"
-#: builtin/config.c:174
+#: builtin/config.c:181
#, c-format
msgid "wrong number of arguments, should be %d"
msgstr "sai số lượng tham số, phải là %d"
-#: builtin/config.c:176
+#: builtin/config.c:183
#, c-format
msgid "wrong number of arguments, should be from %d to %d"
msgstr "sai số lượng tham số, phải từ %d đến %d"
-#: builtin/config.c:324
+#: builtin/config.c:339
#, c-format
msgid "invalid key pattern: %s"
msgstr "mẫu khóa không hợp lệ: %s"
-#: builtin/config.c:360
+#: builtin/config.c:377
#, c-format
msgid "failed to format default config value: %s"
msgstr "gặp lỗi khi định dạng giá trị cấu hình mặc định: %s"
-#: builtin/config.c:417
+#: builtin/config.c:441
#, c-format
msgid "cannot parse color '%s'"
msgstr "không thể phân tích màu “%s”"
-#: builtin/config.c:459
+#: builtin/config.c:483
msgid "unable to parse default color value"
msgstr "không thể phân tích giá trị màu mặc định"
-#: builtin/config.c:512 builtin/config.c:768
+#: builtin/config.c:536 builtin/config.c:833
msgid "not in a git directory"
msgstr "không trong thư mục git"
-#: builtin/config.c:515
+#: builtin/config.c:539
msgid "writing to stdin is not supported"
msgstr "việc ghi ra đầu ra tiêu chuẩn là không được hỗ trợ"
-#: builtin/config.c:518
+#: builtin/config.c:542
msgid "writing config blobs is not supported"
msgstr "không hỗ trợ ghi cấu hình các blob"
-#: builtin/config.c:603
+#: builtin/config.c:627
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -13182,23 +14030,27 @@
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:627
+#: builtin/config.c:652
msgid "only one config file at a time"
msgstr "chỉ một tập tin cấu hình một lần"
-#: builtin/config.c:632
+#: builtin/config.c:658
msgid "--local can only be used inside a git repository"
msgstr "--local chỉ có thể được dùng bên trong một kho git"
-#: builtin/config.c:635
+#: builtin/config.c:660
msgid "--blob can only be used inside a git repository"
msgstr "--blob chỉ có thể được dùng bên trong một kho git"
-#: builtin/config.c:655
+#: builtin/config.c:662
+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:684
msgid "$HOME not set"
msgstr "Chưa đặt biến môi trường HOME"
-#: builtin/config.c:679
+#: builtin/config.c:708
msgid ""
"--worktree cannot be used with multiple working trees unless the config\n"
"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -13208,19 +14060,19 @@
"worktreeConfig được bật. Vui lòng đọc phần \"CONFIGURATION FILE\"\n"
"trong \"git help worktree\" để biết thêm chi tiết"
-#: builtin/config.c:714
+#: builtin/config.c:743
msgid "--get-color and variable type are incoherent"
msgstr "--get-color và kiểu biến là không mạch lạc"
-#: builtin/config.c:719
+#: builtin/config.c:748
msgid "only one action at a time"
msgstr "chỉ một thao tác mỗi lần"
-#: builtin/config.c:732
+#: builtin/config.c:761
msgid "--name-only is only applicable to --list or --get-regexp"
msgstr "--name-only chỉ được áp dụng cho --list hoặc --get-regexp"
-#: builtin/config.c:738
+#: builtin/config.c:767
msgid ""
"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
"list"
@@ -13228,33 +14080,37 @@
"--show-origin chỉ được áp dụng cho --get, --get-all, --get-regexp, hoặc --"
"list"
-#: builtin/config.c:744
+#: builtin/config.c:773
msgid "--default is only applicable to --get"
msgstr "--default chỉ được áp dụng cho --get"
-#: builtin/config.c:757
+#: builtin/config.c:806
+msgid "--fixed-value only applies with 'value-pattern'"
+msgstr "--fixed-value chỉ áp dụng với “value-pattern”"
+
+#: builtin/config.c:822
#, c-format
msgid "unable to read config file '%s'"
msgstr "không thể đọc tập tin cấu hình “%s”"
-#: builtin/config.c:760
+#: builtin/config.c:825
msgid "error processing config file(s)"
msgstr "gặp lỗi khi xử lý các tập tin cấu hình"
-#: builtin/config.c:770
+#: builtin/config.c:835
msgid "editing stdin is not supported"
msgstr "sửa chữa đầu ra tiêu chuẩn là không được hỗ trợ"
-#: builtin/config.c:772
+#: builtin/config.c:837
msgid "editing blobs is not supported"
msgstr "việc sửa chữa các blob là không được hỗ trợ"
-#: builtin/config.c:786
+#: builtin/config.c:851
#, c-format
msgid "cannot create configuration file %s"
msgstr "không thể tạo tập tin cấu hình “%s”"
-#: builtin/config.c:799
+#: builtin/config.c:864
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -13263,7 +14119,7 @@
"không thể ghi đè nhiều giá trị với một giá trị đơn\n"
" Dùng một biểu thức chính quy, --add hay --replace-all để thay đổi %s."
-#: builtin/config.c:873 builtin/config.c:884
+#: builtin/config.c:943 builtin/config.c:954
#, c-format
msgid "no such section: %s"
msgstr "không có đoạn: %s"
@@ -13276,6 +14132,36 @@
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/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/credential-store.c:66
+#, c-format
+msgid "unable to get credential storage lock in %d ms"
+msgstr "không thể lấy khóa lưu trữ ủy nhiệm %d ms"
+
#: builtin/describe.c:26
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<các tùy chọn>] <commit-ish>*"
@@ -13284,49 +14170,44 @@
msgid "git describe [<options>] --dirty"
msgstr "git describe [<các tùy chọn>] --dirty"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "head"
msgstr "phía trước"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "lightweight"
msgstr "hạng nhẹ"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "annotated"
msgstr "có diễn giải"
-#: builtin/describe.c:275
+#: builtin/describe.c:277
#, c-format
msgid "annotated tag %s not available"
msgstr "thẻ đã được ghi chú %s không sẵn để dùng"
-#: builtin/describe.c:279
-#, c-format
-msgid "annotated tag %s has no embedded name"
-msgstr "thẻ được chú giải %s không có tên nhúng"
-
#: builtin/describe.c:281
#, 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:325
+#: 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:327
+#: 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:394
+#: 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:421
+#: builtin/describe.c:424
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -13335,7 +14216,7 @@
"Không có thẻ được chú giải nào được mô tả là “%s”.\n"
"Tuy nhiên, ở đây có những thẻ không được chú giải: hãy thử --tags."
-#: builtin/describe.c:425
+#: builtin/describe.c:428
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -13344,12 +14225,12 @@
"Không có thẻ có thể mô tả “%s”.\n"
"Hãy thử --always, hoặc tạo một số thẻ."
-#: builtin/describe.c:455
+#: builtin/describe.c:458
#, c-format
msgid "traversed %lu commits\n"
msgstr "đã xuyên %lu qua lần chuyển giao\n"
-#: builtin/describe.c:458
+#: builtin/describe.c:461
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -13358,122 +14239,140 @@
"tìm thấy nhiều hơn %i thẻ; đã liệt kê %i cái gần\n"
"đây nhất bỏ đi tìm kiếm tại %s\n"
-#: builtin/describe.c:526
+#: builtin/describe.c:529
#, c-format
msgid "describe %s\n"
msgstr "mô tả %s\n"
-#: builtin/describe.c:529
+#: 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:537
+#: 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:551
+#: 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:552
+#: 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:553
+#: builtin/describe.c:556
msgid "use any ref"
msgstr "dùng ref bất kỳ"
-#: builtin/describe.c:554
+#: builtin/describe.c:557
msgid "use any tag, even unannotated"
msgstr "dùng thẻ bất kỳ, cả khi “unannotated”"
-#: builtin/describe.c:555
+#: builtin/describe.c:558
msgid "always use long format"
msgstr "luôn dùng định dạng dài"
-#: builtin/describe.c:556
+#: builtin/describe.c:559
msgid "only follow first parent"
msgstr "chỉ theo cha mẹ đầu tiên"
-#: builtin/describe.c:559
+#: 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:561
+#: 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:563
+#: 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:565
+#: 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:567 builtin/name-rev.c:535
+#: 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:568 builtin/describe.c:571
+#: builtin/describe.c:571 builtin/describe.c:574
msgid "mark"
msgstr "dấu"
-#: builtin/describe.c:569
+#: 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:572
+#: 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:590
+#: 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:619
+#: 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:670
+#: 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:672
+#: 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-tree.c:155
+msgid "--stdin and --merge-base are mutually exclusive"
+msgstr "--stdin và --merge-base loại từ lẫn nhau"
+
+#: builtin/diff-tree.c:157
+msgid "--merge-base only works with two commits"
+msgstr "--merge-base chỉ hoạt động với hai lần chuyển giao"
+
+#: builtin/diff.c:92
#, 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:259
#, c-format
msgid "invalid option: %s"
msgstr "tùy chọn không hợp lệ: %s"
-#: builtin/diff.c:350
+#: builtin/diff.c:376
+#, c-format
+msgid "%s...%s: no merge base"
+msgstr "%s…%s: không có cơ sở hòa trộn"
+
+#: builtin/diff.c:486
msgid "Not a git repository"
msgstr "Không phải là kho git"
-#: builtin/diff.c:394
+#: builtin/diff.c:532 builtin/grep.c:682
#, 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:543
#, 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:548
#, c-format
msgid "unhandled object '%s' given."
msgstr "đã cho đối tượng không thể nắm giữ “%s”."
+#: builtin/diff.c:582
+#, 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 ""
@@ -13500,7 +14399,7 @@
msgid "could not read object %s for symlink %s"
msgstr "không thể đọc đối tượng %s cho liên kết mềm %s"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:412
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
@@ -13508,53 +14407,53 @@
"các định dạng diff tổ hợp(“-c” và “--cc”) chưa được hỗ trợ trong\n"
"chế độ diff thư mục(“-d” và “--dir-diff”)."
-#: builtin/difftool.c:634
+#: builtin/difftool.c:633
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "cả hai tập tin đã bị sửa: “%s” và “%s”."
-#: builtin/difftool.c:636
+#: builtin/difftool.c:635
msgid "working tree file has been left."
msgstr "cây làm việc ở bên trái."
-#: builtin/difftool.c:647
+#: builtin/difftool.c:646
#, c-format
msgid "temporary files exist in '%s'."
msgstr "các tập tin tạm đã sẵn có trong “%s”."
-#: builtin/difftool.c:648
+#: builtin/difftool.c:647
msgid "you may want to cleanup or recover these."
msgstr "bạn có lẽ muốn dọn dẹp hay phục hồi ở đây."
-#: builtin/difftool.c:697
+#: builtin/difftool.c:696
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "dùng “diff.guitool“ thay vì dùng “diff.tool“"
-#: builtin/difftool.c:699
+#: builtin/difftool.c:698
msgid "perform a full-directory diff"
msgstr "thực hiện một diff toàn thư mục"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:700
msgid "do not prompt before launching a diff tool"
msgstr "đừng nhắc khi khởi chạy công cụ diff"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:705
msgid "use symlinks in dir-diff mode"
msgstr "dùng liên kết mềm trong diff-thư-mục"
-#: builtin/difftool.c:707
+#: builtin/difftool.c:706
msgid "tool"
msgstr "công cụ"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:707
msgid "use the specified diff tool"
msgstr "dùng công cụ diff đã cho"
-#: builtin/difftool.c:710
+#: builtin/difftool.c:709
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "in ra danh sách các công cụ dif cái mà có thẻ dùng với “--tool“"
-#: builtin/difftool.c:713
+#: builtin/difftool.c:712
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
@@ -13562,31 +14461,31 @@
"làm cho “git-difftool” thoát khi gọi công cụ diff trả về mã không phải số "
"không"
-#: builtin/difftool.c:716
+#: builtin/difftool.c:715
msgid "specify a custom command for viewing diffs"
msgstr "chỉ định một lệnh tùy ý để xem diff"
-#: builtin/difftool.c:717
+#: builtin/difftool.c:716
msgid "passed to `diff`"
msgstr "chuyển cho “diff”"
-#: builtin/difftool.c:732
+#: builtin/difftool.c:731
msgid "difftool requires worktree or --no-index"
msgstr "difftool cần cây làm việc hoặc --no-index"
-#: builtin/difftool.c:739
+#: builtin/difftool.c:738
msgid "--dir-diff is incompatible with --no-index"
msgstr "--dir-diff xung khắc với --no-index"
-#: builtin/difftool.c:742
+#: builtin/difftool.c:741
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr "--gui, --tool và --extcmd loại từ lẫn nhau"
-#: builtin/difftool.c:750
+#: builtin/difftool.c:749
msgid "no <tool> given for --tool=<tool>"
msgstr "chưa đưa ra <công_cụ> cho --tool=<công_cụ>"
-#: builtin/difftool.c:757
+#: builtin/difftool.c:756
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "chưa đưa ra <lệnh> cho --extcmd=<lệnh>"
@@ -13594,215 +14493,275 @@
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ề"
+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`"
+"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 `"
"%s`"
msgstr ""
-"tùy chọn `--default' cần một giá trị số nguyên dài không dấu với `--"
-"type=ulong`, không phải `%s`"
+"tùy chọn “--default” cần một giá trị số nguyên dài không dấu với “--"
+"type=ulong“, không phải “%s“"
#: builtin/fast-export.c:29
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-opts]"
-#: builtin/fast-export.c:853
+#: 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:1152
+#: builtin/fast-export.c:1177
+msgid "--anonymize-map token cannot be empty"
+msgstr "--anonymize-map thẻ không thể là rỗng"
+
+#: builtin/fast-export.c:1197
msgid "show progress after <n> objects"
msgstr "hiển thị tiến triển sau <n> đối tượng"
-#: builtin/fast-export.c:1154
+#: builtin/fast-export.c:1199
msgid "select handling of signed tags"
msgstr "chọn điều khiển của thẻ đã ký"
-#: builtin/fast-export.c:1157
+#: builtin/fast-export.c:1202
msgid "select handling of tags that tag filtered objects"
msgstr "chọn sự xử lý của các thẻ, cái mà đánh thẻ các đối tượng được lọc ra"
-#: builtin/fast-export.c:1160
+#: builtin/fast-export.c:1205
msgid "select handling of commit messages in an alternate encoding"
msgstr ""
"chọn bộ xử lý cho các ghi chú của lần chuyển giao theo một bộ mã thay thế"
-#: builtin/fast-export.c:1163
-msgid "Dump marks to this file"
-msgstr "Đổ các đánh dấu này vào tập-tin"
+#: builtin/fast-export.c:1208
+msgid "dump marks to this file"
+msgstr "đổ các đánh dấu này vào tập-tin"
-#: builtin/fast-export.c:1165
-msgid "Import marks from this file"
-msgstr "Nhập vào đánh dấu từ tập tin này"
+#: builtin/fast-export.c:1210
+msgid "import marks from this file"
+msgstr "nhập vào đánh dấu từ tập tin này"
-#: builtin/fast-export.c:1169
-msgid "Import marks from this file if it exists"
-msgstr "Nhập vào đánh dấu từ tập tin sẵn có"
+#: builtin/fast-export.c:1214
+msgid "import marks from this file if it exists"
+msgstr "nhập vào đánh dấu từ tập tin sẵn có"
-#: builtin/fast-export.c:1171
-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:1216
+msgid "fake a tagger when tags lack one"
+msgstr "làm giả một cái thẻ khi thẻ bị thiếu một cái"
-#: builtin/fast-export.c:1173
-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:1218
+msgid "output full tree for each commit"
+msgstr "xuất ra toàn bộ cây cho mỗi lần chuyển giao"
-#: builtin/fast-export.c:1175
-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:1220
+msgid "use the done feature to terminate the stream"
+msgstr "sử dụng tính năng done để chấm dứt luồng dữ liệu"
-#: builtin/fast-export.c:1176
-msgid "Skip output of blob data"
-msgstr "Bỏ qua kết xuất của dữ liệu blob"
+#: builtin/fast-export.c:1221
+msgid "skip output of blob data"
+msgstr "bỏ qua kết xuất của dữ liệu blob"
-#: builtin/fast-export.c:1177 builtin/log.c:1705
+#: builtin/fast-export.c:1222 builtin/log.c:1815
msgid "refspec"
msgstr "refspec"
-#: builtin/fast-export.c:1178
-msgid "Apply refspec to exported refs"
-msgstr "Áp dụng refspec cho refs đã xuất"
+#: builtin/fast-export.c:1223
+msgid "apply refspec to exported refs"
+msgstr "áp dụng refspec cho refs đã xuất"
-#: builtin/fast-export.c:1179
+#: builtin/fast-export.c:1224
msgid "anonymize output"
msgstr "kết xuất anonymize"
-#: builtin/fast-export.c:1181
-msgid "Reference parents which are not in fast-export stream by object id"
+#: builtin/fast-export.c:1225
+msgid "from:to"
+msgstr "từ:đến"
+
+#: builtin/fast-export.c:1226
+msgid "convert <from> to <to> in anonymized output"
+msgstr "chuyển đổi <from> sang <to> đầu ra ẩn danh"
+
+#: builtin/fast-export.c:1229
+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"
+"các cha mẹ tham chiếu cái mà không trong luồng dữ liệu fast-export bởi mã id "
+"đối tượng"
-#: builtin/fast-export.c:1183
-msgid "Show original object ids of blobs/commits"
-msgstr "Hiển thị các mã id nguyên gốc của blobs/commits"
+#: builtin/fast-export.c:1231
+msgid "show original object ids of blobs/commits"
+msgstr "hiển thị các mã id nguyên gốc của blobs/commits"
-#: builtin/fast-export.c:1185
-msgid "Label tags with mark ids"
-msgstr "Gắn nhãn thẻ ID dấu"
+#: builtin/fast-export.c:1233
+msgid "label tags with mark ids"
+msgstr "gắn thẻ với các mã ID đánh dấu"
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1256
+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:1271
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
msgstr "Không thể chuyển qua cả hai --import-marks và --import-marks-if-exists"
-#: builtin/fetch.c:34
+#: builtin/fast-import.c:3088
+#, 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:3090
+#, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr "Thiếu đánh dấu cho mô-đun-con “%s”"
+
+#: builtin/fast-import.c:3225
+#, 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:3230
+#, 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:3322
+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:3377
+#, 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:242
+#, 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:35
+#: builtin/fetch.c:36
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<các tùy chọn>] [<nhóm>"
-#: builtin/fetch.c:36
+#: 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:37
+#: builtin/fetch.c:38
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<các tùy chọn>]"
-#: builtin/fetch.c:116
+#: builtin/fetch.c:120
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel không thể âm"
-#: builtin/fetch.c:139 builtin/pull.c:184
+#: builtin/fetch.c:143 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:141 builtin/pull.c:228
+#: builtin/fetch.c:145 builtin/pull.c:245
msgid "set upstream for git pull/fetch"
msgstr "đặt thượng nguồn cho git pull/fetch"
-#: builtin/fetch.c:143 builtin/pull.c:187
+#: builtin/fetch.c:147 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:145 builtin/pull.c:190
+#: builtin/fetch.c:149
+msgid "use atomic transaction to update references"
+msgstr "sử dụng giao dịch hạt nhân bên phía máy chủ"
+
+#: builtin/fetch.c:151 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:146
+#: builtin/fetch.c:152
msgid "force overwrite of local reference"
msgstr "ép buộc ghi đè lên tham chiếu nội bộ"
-#: builtin/fetch.c:148
+#: builtin/fetch.c:154
msgid "fetch from multiple remotes"
msgstr "lấy từ nhiều máy chủ cùng lúc"
-#: builtin/fetch.c:150 builtin/pull.c:194
+#: builtin/fetch.c:156 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:152
+#: builtin/fetch.c:158
msgid "do not fetch all tags (--no-tags)"
msgstr "không lấy tất cả các thẻ (--no-tags)"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:160
msgid "number of submodules fetched in parallel"
msgstr "số lượng mô-đun-con được lấy đồng thời"
-#: builtin/fetch.c:156 builtin/pull.c:197
+#: builtin/fetch.c:162 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:158
+#: builtin/fetch.c:164
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr "cắt xém các thẻ nội bộ không còn ở máy chủ và xóa các thẻ đã thay đổi"
-#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121
+#: builtin/fetch.c:165 builtin/fetch.c:190 builtin/pull.c:122
msgid "on-demand"
msgstr "khi-cần"
-#: builtin/fetch.c:160
+#: builtin/fetch.c:166
msgid "control recursive fetching of submodules"
msgstr "điều khiển việc lấy về đệ quy trong các mô-đun-con"
-#: builtin/fetch.c:164 builtin/pull.c:205
+#: builtin/fetch.c:171
+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:172 builtin/pull.c:206
msgid "keep downloaded pack"
msgstr "giữ lại gói đã tải về"
-#: builtin/fetch.c:166
+#: builtin/fetch.c:174
msgid "allow updating of HEAD ref"
msgstr "cho phép cập nhật th.chiếu HEAD"
-#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208
+#: builtin/fetch.c:177 builtin/fetch.c:183 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:171
+#: builtin/fetch.c:179 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:177 builtin/pull.c:211
+#: builtin/fetch.c:185 builtin/pull.c:221
msgid "convert to a complete repository"
msgstr "chuyển đổi hoàn toàn sang kho git"
-#: builtin/fetch.c:180
+#: builtin/fetch.c:188
msgid "prepend this to submodule path output"
msgstr "soạn sẵn cái này cho kết xuất đường dẫn mô-đun-con"
-#: builtin/fetch.c:183
+#: builtin/fetch.c:191
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
@@ -13810,95 +14769,99 @@
"mặc định cho việc lấy đệ quy các mô-đun-con (có mức ưu tiên thấp hơn các tập "
"tin cấu hình config)"
-#: builtin/fetch.c:187 builtin/pull.c:214
+#: builtin/fetch.c:195 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:188 builtin/pull.c:216
+#: builtin/fetch.c:196 builtin/pull.c:226
msgid "refmap"
msgstr "refmap"
-#: builtin/fetch.c:189 builtin/pull.c:217
+#: builtin/fetch.c:197 builtin/pull.c:227
msgid "specify fetch refmap"
msgstr "chỉ ra refmap cần lấy về"
-#: builtin/fetch.c:196
+#: builtin/fetch.c:204 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:199
-msgid "run 'gc --auto' after fetching"
-msgstr "chạy 'gc --auto' sau khi lấy về"
+#: builtin/fetch.c:207 builtin/fetch.c:209
+msgid "run 'maintenance --auto' after fetching"
+msgstr "chạy “maintenance --auto” sau khi lấy về"
-#: builtin/fetch.c:201 builtin/pull.c:226
+#: builtin/fetch.c:211 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:203
+#: builtin/fetch.c:213
msgid "write the commit-graph after fetching"
msgstr "ghi ra đồ thị các lần chuyển giao sau khi lấy về"
-#: builtin/fetch.c:513
+#: builtin/fetch.c:215
+msgid "accept refspecs from stdin"
+msgstr "chấp nhận tham chiếu từ đầu vào tiêu chuẩn"
+
+#: builtin/fetch.c:526
msgid "Couldn't find remote ref HEAD"
msgstr "Không thể tìm thấy máy chủ cho tham chiếu HEAD"
-#: builtin/fetch.c:653
+#: builtin/fetch.c:697
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "phần cấu hình fetch.output có chứa giá-trị không hợp lệ %s"
-#: builtin/fetch.c:751
+#: builtin/fetch.c:796
#, c-format
msgid "object %s not found"
msgstr "không tìm thấy đối tượng %s"
-#: builtin/fetch.c:755
+#: builtin/fetch.c:800
msgid "[up to date]"
msgstr "[đã cập nhật]"
-#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
+#: builtin/fetch.c:813 builtin/fetch.c:829 builtin/fetch.c:901
msgid "[rejected]"
msgstr "[Bị từ chối]"
-#: builtin/fetch.c:769
+#: builtin/fetch.c:814
msgid "can't fetch in current branch"
msgstr "không thể fetch (lấy) về nhánh hiện hành"
-#: builtin/fetch.c:779
+#: builtin/fetch.c:824
msgid "[tag update]"
msgstr "[cập nhật thẻ]"
-#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839
-#: builtin/fetch.c:851
+#: builtin/fetch.c:825 builtin/fetch.c:862 builtin/fetch.c:884
+#: builtin/fetch.c:896
msgid "unable to update local ref"
msgstr "không thể cập nhật tham chiếu nội bộ"
-#: builtin/fetch.c:784
+#: builtin/fetch.c:829
msgid "would clobber existing tag"
msgstr "nên xóa chồng các thẻ có sẵn"
-#: builtin/fetch.c:806
+#: builtin/fetch.c:851
msgid "[new tag]"
msgstr "[thẻ mới]"
-#: builtin/fetch.c:809
+#: builtin/fetch.c:854
msgid "[new branch]"
msgstr "[nhánh mới]"
-#: builtin/fetch.c:812
+#: builtin/fetch.c:857
msgid "[new ref]"
msgstr "[ref (tham chiếu) mới]"
-#: builtin/fetch.c:851
+#: builtin/fetch.c:896
msgid "forced update"
msgstr "cưỡng bức cập nhật"
-#: builtin/fetch.c:856
+#: builtin/fetch.c:901
msgid "non-fast-forward"
msgstr "không-phải-chuyển-tiếp-nhanh"
-#: builtin/fetch.c:877
+#: builtin/fetch.c:1005
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"
@@ -13906,9 +14869,9 @@
msgstr ""
"Việc lấy về thường chỉ ra các nhánh buộc phải cập nhật,\n"
"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'."
+"“--show-forced-updates” hoặc chạy “git config fetch.showForcedUpdates true”."
-#: builtin/fetch.c:881
+#: builtin/fetch.c:1009
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
@@ -13917,26 +14880,26 @@
" to avoid this check.\n"
msgstr ""
"Việc này cần %.2f giây để kiểm tra các cập nhật ép buộc. Bạn có thể dùng\n"
-"'--no-show-forced-updates' hoặc chạy 'git config fetch.showForcedUpdates "
-"false'\n"
+"“--no-show-forced-updates” hoặc chạy “git config fetch.showForcedUpdates "
+"false”\n"
"để tránh kiểm tra này.\n"
-#: builtin/fetch.c:920
+#: builtin/fetch.c:1041
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s đã không gửi tất cả các đối tượng cần thiết\n"
-#: builtin/fetch.c:941
+#: builtin/fetch.c:1069
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "từ chối %s bởi vì các gốc nông thì không được phép cập nhật"
-#: builtin/fetch.c:1026 builtin/fetch.c:1164
+#: builtin/fetch.c:1146 builtin/fetch.c:1297
#, c-format
msgid "From %.*s\n"
msgstr "Từ %.*s\n"
-#: builtin/fetch.c:1037
+#: builtin/fetch.c:1168
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -13945,58 +14908,58 @@
"một số tham chiếu nội bộ không thể được cập nhật; hãy thử chạy\n"
" “git remote prune %s” để bỏ đi những nhánh cũ, hay bị xung đột"
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1267
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s sẽ trở thành không đầu (không được quản lý))"
-#: builtin/fetch.c:1135
+#: builtin/fetch.c:1268
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s đã trở thành không đầu (không được quản lý))"
-#: builtin/fetch.c:1167
+#: builtin/fetch.c:1300
msgid "[deleted]"
msgstr "[đã xóa]"
-#: builtin/fetch.c:1168 builtin/remote.c:1112
+#: builtin/fetch.c:1301 builtin/remote.c:1118
msgid "(none)"
msgstr "(không)"
-#: builtin/fetch.c:1191
+#: builtin/fetch.c:1324
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
"Từ chối việc lấy vào trong nhánh hiện tại %s của một kho chứa không phải kho "
"trần (bare)"
-#: builtin/fetch.c:1210
+#: builtin/fetch.c:1343
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Tùy chọn \"%s\" có giá trị \"%s\" là không hợp lệ cho %s"
-#: builtin/fetch.c:1213
+#: builtin/fetch.c:1346
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Tùy chọn \"%s\" bị bỏ qua với %s\n"
-#: builtin/fetch.c:1421
+#: builtin/fetch.c:1558
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "phát hiện nhiều nhánh, không tương thích với --set-upstream"
-#: builtin/fetch.c:1436
+#: builtin/fetch.c:1573
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "không cài đặt thượng nguồn cho một nhánh được theo dõi trên máy chủ"
-#: builtin/fetch.c:1438
+#: builtin/fetch.c:1575
msgid "not setting upstream for a remote tag"
msgstr "không cài đặt thượng nguồn cho một thẻ nhánh trên máy chủ"
-#: builtin/fetch.c:1440
+#: builtin/fetch.c:1577
msgid "unknown branch type"
msgstr "không hiểu kiểu nhánh"
-#: builtin/fetch.c:1442
+#: builtin/fetch.c:1579
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
@@ -14004,22 +14967,22 @@
"không tìm thấy nhánh nguồn.\n"
"bạn cần phải chỉ định chính xác một nhánh với tùy chọn --set-upstream."
-#: builtin/fetch.c:1568 builtin/fetch.c:1631
+#: builtin/fetch.c:1708 builtin/fetch.c:1771
#, c-format
msgid "Fetching %s\n"
msgstr "Đang lấy “%s” về\n"
-#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101
+#: builtin/fetch.c:1718 builtin/fetch.c:1773 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr "Không thể lấy“%s” về"
-#: builtin/fetch.c:1590
+#: builtin/fetch.c:1730
#, 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:1693
+#: builtin/fetch.c:1834
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -14027,44 +14990,44 @@
"Chưa chỉ ra kho chứa máy chủ. Xin hãy chỉ định hoặc là URL hoặc\n"
"tên máy chủ từ cái mà những điểm xét duyệt mới có thể được fetch (lấy về)."
-#: builtin/fetch.c:1730
+#: builtin/fetch.c:1870
msgid "You need to specify a tag name."
msgstr "Bạn phải định rõ tên thẻ."
-#: builtin/fetch.c:1780
+#: builtin/fetch.c:1935
msgid "Negative depth in --deepen is not supported"
msgstr "Mức sâu là số âm trong --deepen là không được hỗ trợ"
-#: builtin/fetch.c:1782
+#: builtin/fetch.c:1937
msgid "--deepen and --depth are mutually exclusive"
msgstr "Các tùy chọn--deepen và --depth loại từ lẫn nhau"
-#: builtin/fetch.c:1787
+#: builtin/fetch.c:1942
msgid "--depth and --unshallow cannot be used together"
msgstr "tùy chọn --depth và --unshallow không thể sử dụng cùng với nhau"
-#: builtin/fetch.c:1789
+#: builtin/fetch.c:1944
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow trên kho hoàn chỉnh là không hợp lý"
-#: builtin/fetch.c:1805
+#: builtin/fetch.c:1961
msgid "fetch --all does not take a repository argument"
msgstr "lệnh lấy về \"fetch --all\" không lấy đối số kho chứa"
-#: builtin/fetch.c:1807
+#: builtin/fetch.c:1963
msgid "fetch --all does not make sense with refspecs"
msgstr "lệnh lấy về \"fetch --all\" không hợp lý với refspecs"
-#: builtin/fetch.c:1816
+#: builtin/fetch.c:1972
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Không có nhóm máy chủ hay máy chủ như thế: %s"
-#: builtin/fetch.c:1823
+#: builtin/fetch.c:1979
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Việc lấy về cả một nhóm và chỉ định refspecs không hợp lý"
-#: builtin/fetch.c:1841
+#: builtin/fetch.c:1997
msgid ""
"--filter can only be used with the remote configured in extensions."
"partialclone"
@@ -14072,30 +15035,38 @@
"--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:2001
+msgid "--atomic can only be used when fetching from one remote"
+msgstr "--atomic chỉ có thể dùng khi lấy về từ một máy chủ"
+
+#: builtin/fetch.c:2005
+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:671
+#: 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:674
+#: 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:677
+#: builtin/fmt-merge-msg.c:24
msgid "text"
msgstr "văn bản"
-#: builtin/fmt-merge-msg.c:678
+#: 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:679
+#: builtin/fmt-merge-msg.c:26
msgid "file to read from"
msgstr "tập tin để đọc dữ liệu từ đó"
@@ -14108,8 +15079,10 @@
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>]]"
@@ -14137,7 +15110,7 @@
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:472
msgid "respect format colors"
msgstr "các màu định dạng lưu tâm"
@@ -14161,32 +15134,48 @@
msgid "print only refs which don't contain the commit"
msgstr "chỉ hiển thị những tham chiếu mà nó không chứa lần chuyển giao"
-#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148
+#: builtin/for-each-repo.c:9
+msgid "git for-each-repo --config=<config> <command-args>"
+msgstr "git for-each-repo --config=<config> <command-args>"
+
+#: builtin/for-each-repo.c:37
+msgid "config"
+msgstr "config"
+
+#: builtin/for-each-repo.c:38
+msgid "config key storing a list of repository paths"
+msgstr "khóa cấu hình lưu trữ danh sách đường dẫn kho lưu trữ"
+
+#: builtin/for-each-repo.c:46
+msgid "missing --config=<config>"
+msgstr "thiếu --config=<config>"
+
+#: builtin/fsck.c:69 builtin/fsck.c:130 builtin/fsck.c:131
msgid "unknown"
msgstr "không hiểu"
#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:100 builtin/fsck.c:120
+#: builtin/fsck.c:83 builtin/fsck.c:103
#, c-format
msgid "error in %s %s: %s"
msgstr "lỗi trong %s %s: %s"
#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:114
+#: builtin/fsck.c:97
#, c-format
msgid "warning in %s %s: %s"
msgstr "có cảnh báo trong %s %s: %s"
-#: builtin/fsck.c:143 builtin/fsck.c:146
+#: builtin/fsck.c:126 builtin/fsck.c:129
#, c-format
msgid "broken link from %7s %s"
msgstr "liên kết gãy từ %7s %s"
-#: builtin/fsck.c:155
+#: builtin/fsck.c:138
msgid "wrong object type in link"
msgstr "kiểu đối tượng sai trong liên kết"
-#: builtin/fsck.c:171
+#: builtin/fsck.c:154
#, c-format
msgid ""
"broken link from %7s %s\n"
@@ -14195,240 +15184,240 @@
"liên kết gãy từ %7s %s \n"
" tới %7s %s"
-#: builtin/fsck.c:282
+#: builtin/fsck.c:265
#, c-format
msgid "missing %s %s"
msgstr "thiếu %s %s"
-#: builtin/fsck.c:309
+#: builtin/fsck.c:292
#, c-format
msgid "unreachable %s %s"
msgstr "không tiếp cận được %s %s"
-#: builtin/fsck.c:329
+#: builtin/fsck.c:312
#, c-format
msgid "dangling %s %s"
msgstr "dangling %s %s"
-#: builtin/fsck.c:339
+#: builtin/fsck.c:322
msgid "could not create lost-found"
msgstr "không thể tạo lost-found"
-#: builtin/fsck.c:350
+#: builtin/fsck.c:333
#, c-format
msgid "could not finish '%s'"
msgstr "không thể hoàn thành “%s”"
-#: builtin/fsck.c:367
+#: builtin/fsck.c:350
#, c-format
msgid "Checking %s"
msgstr "Đang kiểm tra %s"
-#: builtin/fsck.c:405
+#: builtin/fsck.c:388
#, c-format
msgid "Checking connectivity (%d objects)"
msgstr "Đang kiểm tra kết nối (%d đối tượng)"
-#: builtin/fsck.c:424
+#: builtin/fsck.c:407
#, c-format
msgid "Checking %s %s"
msgstr "Đang kiểm tra %s %s"
-#: builtin/fsck.c:429
+#: builtin/fsck.c:412
msgid "broken links"
msgstr "các liên kết bị gẫy"
-#: builtin/fsck.c:438
+#: builtin/fsck.c:421
#, c-format
msgid "root %s"
msgstr "gốc %s"
-#: builtin/fsck.c:446
+#: builtin/fsck.c:429
#, c-format
msgid "tagged %s %s (%s) in %s"
msgstr "đã đánh thẻ %s %s (%s) trong %s"
-#: builtin/fsck.c:475
+#: builtin/fsck.c:458
#, c-format
msgid "%s: object corrupt or missing"
msgstr "%s: đối tượng thiếu hay hỏng"
-#: builtin/fsck.c:500
+#: builtin/fsck.c:483
#, c-format
msgid "%s: invalid reflog entry %s"
msgstr "%s: mục reflog không hợp lệ %s"
-#: builtin/fsck.c:514
+#: builtin/fsck.c:497
#, c-format
msgid "Checking reflog %s->%s"
msgstr "Đang kiểm tra việc đổi tên của “%s” thành “%s”"
-#: builtin/fsck.c:548
+#: builtin/fsck.c:531
#, c-format
msgid "%s: invalid sha1 pointer %s"
msgstr "%s: con trỏ sha1 không hợp lệ %s"
-#: builtin/fsck.c:555
+#: builtin/fsck.c:538
#, c-format
msgid "%s: not a commit"
msgstr "%s: không phải là một lần chuyển giao"
-#: builtin/fsck.c:609
+#: builtin/fsck.c:592
msgid "notice: No default references"
msgstr "cảnh báo: Không có các tham chiếu mặc định"
-#: builtin/fsck.c:624
+#: builtin/fsck.c:607
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s: thiếu đối tượng hoặc hỏng: %s"
-#: builtin/fsck.c:637
+#: builtin/fsck.c:620
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s: không thể phân tích cú đối tượng: %s"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:640
#, c-format
msgid "bad sha1 file: %s"
msgstr "tập tin sha1 sai: %s"
-#: builtin/fsck.c:672
+#: builtin/fsck.c:655
msgid "Checking object directory"
msgstr "Đang kiểm tra thư mục đối tượng"
-#: builtin/fsck.c:675
+#: builtin/fsck.c:658
msgid "Checking object directories"
msgstr "Đang kiểm tra các thư mục đối tượng"
-#: builtin/fsck.c:690
+#: builtin/fsck.c:673
#, c-format
msgid "Checking %s link"
msgstr "Đang lấy liên kết %s"
-#: builtin/fsck.c:695 builtin/index-pack.c:843
+#: builtin/fsck.c:678 builtin/index-pack.c:865
#, c-format
msgid "invalid %s"
msgstr "%s không hợp lệ"
-#: builtin/fsck.c:702
+#: builtin/fsck.c:685
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s chỉ đến thứ gì đó xa lạ (%s)"
-#: builtin/fsck.c:708
+#: builtin/fsck.c:691
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s: HEAD đã tách rời không chỉ vào đâu cả"
-#: builtin/fsck.c:712
+#: builtin/fsck.c:695
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "chú ý: %s chỉ đến một nhánh chưa sinh (%s)"
-#: builtin/fsck.c:724
+#: builtin/fsck.c:707
msgid "Checking cache tree"
msgstr "Đang kiểm tra cây nhớ tạm"
-#: builtin/fsck.c:729
+#: builtin/fsck.c:712
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "%s: con trỏ sha1 không hợp lệ trong cache-tree"
-#: builtin/fsck.c:738
+#: builtin/fsck.c:721
msgid "non-tree in cache-tree"
msgstr "non-tree trong cache-tree"
-#: builtin/fsck.c:769
+#: builtin/fsck.c:752
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<các tùy chọn>] [<đối-tượng>…]"
-#: builtin/fsck.c:775
+#: builtin/fsck.c:758
msgid "show unreachable objects"
msgstr "hiển thị các đối tượng không thể đọc được"
-#: builtin/fsck.c:776
+#: builtin/fsck.c:759
msgid "show dangling objects"
msgstr "hiển thị các đối tượng không được quản lý"
-#: builtin/fsck.c:777
+#: builtin/fsck.c:760
msgid "report tags"
msgstr "báo cáo các thẻ"
-#: builtin/fsck.c:778
+#: builtin/fsck.c:761
msgid "report root nodes"
msgstr "báo cáo node gốc"
-#: builtin/fsck.c:779
+#: builtin/fsck.c:762
msgid "make index objects head nodes"
msgstr "tạo “index objects head nodes”"
-#: builtin/fsck.c:780
+#: builtin/fsck.c:763
msgid "make reflogs head nodes (default)"
msgstr "tạo “reflogs head nodes” (mặc định)"
-#: builtin/fsck.c:781
+#: builtin/fsck.c:764
msgid "also consider packs and alternate objects"
msgstr "cũng cân nhắc đến các đối tượng gói và thay thế"
-#: builtin/fsck.c:782
+#: builtin/fsck.c:765
msgid "check only connectivity"
msgstr "chỉ kiểm tra kết nối"
-#: builtin/fsck.c:783
+#: builtin/fsck.c:766 builtin/mktag.c:78
msgid "enable more strict checking"
msgstr "cho phép kiểm tra hạn chế hơn"
-#: builtin/fsck.c:785
+#: builtin/fsck.c:768
msgid "write dangling objects in .git/lost-found"
msgstr "ghi các đối tượng không được quản lý trong .git/lost-found"
-#: builtin/fsck.c:786 builtin/prune.c:132
+#: builtin/fsck.c:769 builtin/prune.c:134
msgid "show progress"
msgstr "hiển thị quá trình"
-#: builtin/fsck.c:787
+#: builtin/fsck.c:770
msgid "show verbose names for reachable objects"
msgstr "hiển thị tên chi tiết cho các đối tượng đọc được"
-#: builtin/fsck.c:846 builtin/index-pack.c:225
+#: builtin/fsck.c:829 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "Đang kiểm tra các đối tượng"
-#: builtin/fsck.c:874
+#: builtin/fsck.c:857
#, c-format
msgid "%s: object missing"
msgstr "%s: thiếu đối tượng"
-#: builtin/fsck.c:885
+#: builtin/fsck.c:868
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "tham số không hợp lệ: cần sha1, nhưng lại nhận được “%s”"
-#: builtin/gc.c:35
+#: builtin/gc.c:39
msgid "git gc [<options>]"
msgstr "git gc [<các tùy chọn>]"
-#: builtin/gc.c:90
+#: builtin/gc.c:93
#, 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:129
#, 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:475 builtin/init-db.c:55
+#: builtin/gc.c:487 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:484 builtin/notes.c:240 builtin/tag.c:529
+#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:562
#, c-format
msgid "cannot read '%s'"
msgstr "không thể đọc “%s”"
-#: builtin/gc.c:491
+#: builtin/gc.c:503
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -14443,54 +15432,54 @@
"\n"
"%s"
-#: builtin/gc.c:539
+#: builtin/gc.c:551
msgid "prune unreferenced objects"
msgstr "xóa bỏ các đối tượng không được tham chiếu"
-#: builtin/gc.c:541
+#: builtin/gc.c:553
msgid "be more thorough (increased runtime)"
msgstr "cẩn thận hơn nữa (tăng thời gian chạy)"
-#: builtin/gc.c:542
+#: builtin/gc.c:554
msgid "enable auto-gc mode"
msgstr "bật chế độ auto-gc"
-#: builtin/gc.c:545
+#: builtin/gc.c:557
msgid "force running gc even if there may be another gc running"
msgstr "buộc gc chạy ngay cả khi có tiến trình gc khác đang chạy"
-#: builtin/gc.c:548
+#: builtin/gc.c:560
msgid "repack all other packs except the largest pack"
msgstr "đóng gói lại tất cả các gói khác ngoại trừ gói lớn nhất"
-#: builtin/gc.c:565
+#: builtin/gc.c:576
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "gặp lỗi khi phân tích giá trị gc.logexpiry %s"
-#: builtin/gc.c:576
+#: builtin/gc.c:587
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr "gặp lỗi khi phân tích giá trị prune %s"
-#: builtin/gc.c:596
+#: builtin/gc.c:607
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"Tự động đóng gói kho chứa trên nền hệ thống để tối ưu hóa hiệu suất làm "
"việc.\n"
-#: builtin/gc.c:598
+#: builtin/gc.c:609
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Tự động đóng gói kho chứa để tối ưu hóa hiệu suất làm việc.\n"
-#: builtin/gc.c:599
+#: builtin/gc.c:610
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Xem \"git help gc\" để có hướng dẫn cụ thể về cách dọn dẹp kho git.\n"
-#: builtin/gc.c:639
+#: builtin/gc.c:650
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -14498,23 +15487,184 @@
"gc đang được thực hiện trên máy “%s” pid %<PRIuMAX> (dùng --force nếu không "
"phải thế)"
-#: builtin/gc.c:694
+#: builtin/gc.c:705
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
"Có quá nhiều đối tượng tự do không được dùng đến; hãy chạy lệnh “git prune” "
"để xóa bỏ chúng đi."
+#: builtin/gc.c:715
+msgid ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
+msgstr ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<nhiệm vụ>] [--schedule]"
+
+#: builtin/gc.c:745
+msgid "--no-schedule is not allowed"
+msgstr "--no-schedule không được phép"
+
+#: builtin/gc.c:750
+#, c-format
+msgid "unrecognized --schedule argument '%s'"
+msgstr "đối số --schedule không được thừa nhận %s"
+
+#: builtin/gc.c:869
+msgid "failed to write commit-graph"
+msgstr "gặp lỗi khi ghi đồ thị các lần chuyển giao"
+
+#: builtin/gc.c:914
+msgid "failed to fill remotes"
+msgstr "gặp lỗi khi điền đầy các máy chủ"
+
+#: builtin/gc.c:1037
+msgid "failed to start 'git pack-objects' process"
+msgstr "gặp lỗi khi lấy thông tin thống kê về tiến trình “git pack-objects”"
+
+#: builtin/gc.c:1054
+msgid "failed to finish 'git pack-objects' process"
+msgstr "gặp lỗi khi hoàn tất tiến trình “git pack-objects”"
+
+#: builtin/gc.c:1106
+msgid "failed to write multi-pack-index"
+msgstr "gặp lỗi khi ghi multi-pack-index"
+
+#: builtin/gc.c:1124
+msgid "'git multi-pack-index expire' failed"
+msgstr "gặp lỗi khi chạy “git multi-pack-index expire”"
+
+#: builtin/gc.c:1185
+msgid "'git multi-pack-index repack' failed"
+msgstr "gặp lỗi khi chạy “git multi-pack-index repack”"
+
+#: builtin/gc.c:1194
+msgid ""
+"skipping incremental-repack task because core.multiPackIndex is disabled"
+msgstr "bỏ qua tác vụ incremental-repack vì core.multiPackIndex bị vô hiệu hóa"
+
+#: builtin/gc.c:1298
+#, 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:1328
+#, c-format
+msgid "task '%s' failed"
+msgstr "gặp lỗi khi thực hiện nhiệm vụ “%s”"
+
+#: builtin/gc.c:1410
+#, 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:1415
+#, 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:1430
+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:1431
+msgid "frequency"
+msgstr "tần số"
+
+#: builtin/gc.c:1432
+msgid "run tasks based on frequency"
+msgstr "chạy nhiệm vụ dựa trên tần suất"
+
+#: builtin/gc.c:1435
+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:1436
+msgid "task"
+msgstr "tác vụ"
+
+#: builtin/gc.c:1437
+msgid "run a specific task"
+msgstr "chạy một nhiệm vụ cụ thể"
+
+#: builtin/gc.c:1454
+msgid "use at most one of --auto and --schedule=<frequency>"
+msgstr "dùng nhiều nhất là một trong --auto và --schedule=<frequency>"
+
+#: builtin/gc.c:1497
+msgid "failed to run 'git config'"
+msgstr "gặp lỗi khi chạy “git config”"
+
+#: builtin/gc.c:1562
+#, c-format
+msgid "failed to expand path '%s'"
+msgstr "gặp lỗi khi khai triển đường dẫn “%s”"
+
+#: builtin/gc.c:1591
+msgid "failed to start launchctl"
+msgstr "gặp lỗi khi khởi chạy launchctl"
+
+#: builtin/gc.c:1628
+#, c-format
+msgid "failed to create directories for '%s'"
+msgstr "gặp lỗi khi tạo thư mục cho \"%s\""
+
+#: builtin/gc.c:1689
+#, c-format
+msgid "failed to bootstrap service %s"
+msgstr "gặp lỗi khi mồi dịch vụ %s"
+
+#: builtin/gc.c:1760
+msgid "failed to create temp xml file"
+msgstr "gặp lỗi khi tạo tập tin xml tạm thời"
+
+#: builtin/gc.c:1850
+msgid "failed to start schtasks"
+msgstr "gặp lỗi khi lấy thông tin thống kê về schtasks"
+
+#: builtin/gc.c:1894
+msgid "failed to run 'crontab -l'; your system might not support 'cron'"
+msgstr ""
+"gặp lỗi khi chạy “crontab -l”; hệ thống của bạn có thể không hỗ trợ “cron”"
+
+#: builtin/gc.c:1911
+msgid "failed to run 'crontab'; your system might not support 'cron'"
+msgstr "gặp lỗi khi chạy “crontab”; hiển thị của bạn có lẽ không hỗ trợ “cron”"
+
+#: builtin/gc.c:1915
+msgid "failed to open stdin of 'crontab'"
+msgstr "gặp lỗi khi mở đầu vào tiêu chuẩn của “crontab”"
+
+#: builtin/gc.c:1956
+msgid "'crontab' died"
+msgstr "“crontab” đã chết"
+
+#: builtin/gc.c:1990
+msgid "another process is scheduling background maintenance"
+msgstr "một tiến trình khác được lập kế hoạch chạy nền để bảo trì"
+
+#: builtin/gc.c:2009
+msgid "failed to add repo to global config"
+msgstr "gặp lỗi khi thêm cấu hình toàn cục"
+
+#: builtin/gc.c:2019
+msgid "git maintenance <subcommand> [<options>]"
+msgstr "git maintenance run <lệnh_con> [<các tùy chọn>]"
+
+#: builtin/gc.c:2038
+#, 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>…]"
-#: builtin/grep.c:225
+#: builtin/grep.c:223
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: gặp lỗi tạo tuyến (thread): %s"
-#: builtin/grep.c:279
+#: builtin/grep.c:277
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "số tuyến đã cho không hợp lệ (%d) cho %s"
@@ -14523,259 +15673,259 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731
-#: builtin/pack-objects.c:2854
+#: builtin/grep.c:285 builtin/index-pack.c:1589 builtin/index-pack.c:1808
+#: builtin/pack-objects.c:2944
#, c-format
msgid "no threads support, ignoring %s"
msgstr "không hỗ trợ đa tuyến, bỏ qua %s"
-#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618
+#: builtin/grep.c:473 builtin/grep.c:601 builtin/grep.c:641
#, c-format
msgid "unable to read tree (%s)"
msgstr "không thể đọc cây (%s)"
-#: builtin/grep.c:633
+#: builtin/grep.c:656
#, c-format
msgid "unable to grep from object of type %s"
msgstr "không thể thực hiện lệnh grep (lọc tìm) từ đối tượng thuộc kiểu %s"
-#: builtin/grep.c:704
+#: builtin/grep.c:737
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "chuyển đến “%c” cần một giá trị bằng số"
-#: builtin/grep.c:803
+#: builtin/grep.c:836
msgid "search in index instead of in the work tree"
msgstr "tìm trong bảng mục lục thay vì trong cây làm việc"
-#: builtin/grep.c:805
+#: builtin/grep.c:838
msgid "find in contents not managed by git"
msgstr "tìm trong nội dung không được quản lý bởi git"
-#: builtin/grep.c:807
+#: builtin/grep.c:840
msgid "search in both tracked and untracked files"
msgstr "tìm kiếm các tập tin được và chưa được theo dõi dấu vết"
-#: builtin/grep.c:809
+#: builtin/grep.c:842
msgid "ignore files specified via '.gitignore'"
msgstr "các tập tin bị bỏ qua được chỉ định thông qua “.gitignore”"
-#: builtin/grep.c:811
+#: builtin/grep.c:844
msgid "recursively search in each submodule"
msgstr "tìm kiếm đệ quy trong từng mô-đun-con"
-#: builtin/grep.c:814
+#: builtin/grep.c:847
msgid "show non-matching lines"
msgstr "hiển thị những dòng không khớp với mẫu"
-#: builtin/grep.c:816
+#: builtin/grep.c:849
msgid "case insensitive matching"
msgstr "phân biệt HOA/thường"
-#: builtin/grep.c:818
+#: builtin/grep.c:851
msgid "match patterns only at word boundaries"
msgstr "chỉ khớp mẫu tại đường ranh giới từ"
-#: builtin/grep.c:820
+#: builtin/grep.c:853
msgid "process binary files as text"
msgstr "xử lý tập tin nhị phân như là dạng văn bản thường"
-#: builtin/grep.c:822
+#: builtin/grep.c:855
msgid "don't match patterns in binary files"
msgstr "không khớp mẫu trong các tập tin nhị phân"
-#: builtin/grep.c:825
+#: builtin/grep.c:858
msgid "process binary files with textconv filters"
msgstr "xử lý tập tin nhị phân với các bộ lọc “textconv”"
-#: builtin/grep.c:827
+#: builtin/grep.c:860
msgid "search in subdirectories (default)"
msgstr "tìm kiếm trong thư mục con (mặc định)"
-#: builtin/grep.c:829
+#: builtin/grep.c:862
msgid "descend at most <depth> levels"
msgstr "hạ xuống ít nhất là mức <sâu>"
-#: builtin/grep.c:833
+#: builtin/grep.c:866
msgid "use extended POSIX regular expressions"
msgstr "dùng biểu thức chính qui POSIX có mở rộng"
-#: builtin/grep.c:836
+#: builtin/grep.c:869
msgid "use basic POSIX regular expressions (default)"
msgstr "sử dụng biểu thức chính quy kiểu POSIX (mặc định)"
-#: builtin/grep.c:839
+#: builtin/grep.c:872
msgid "interpret patterns as fixed strings"
msgstr "diễn dịch các mẫu như là chuỗi cố định"
-#: builtin/grep.c:842
+#: builtin/grep.c:875
msgid "use Perl-compatible regular expressions"
msgstr "sử dụng biểu thức chính quy tương thích Perl"
-#: builtin/grep.c:845
+#: builtin/grep.c:878
msgid "show line numbers"
msgstr "hiển thị số của dòng"
-#: builtin/grep.c:846
+#: builtin/grep.c:879
msgid "show column number of first match"
msgstr "hiển thị số cột của khớp với mẫu đầu tiên"
-#: builtin/grep.c:847
+#: builtin/grep.c:880
msgid "don't show filenames"
msgstr "không hiển thị tên tập tin"
-#: builtin/grep.c:848
+#: builtin/grep.c:881
msgid "show filenames"
msgstr "hiển thị các tên tập tin"
-#: builtin/grep.c:850
+#: builtin/grep.c:883
msgid "show filenames relative to top directory"
msgstr "hiển thị tên tập tin tương đối với thư mục đỉnh (top)"
-#: builtin/grep.c:852
+#: builtin/grep.c:885
msgid "show only filenames instead of matching lines"
msgstr "chỉ hiển thị tên tập tin thay vì những dòng khớp với mẫu"
-#: builtin/grep.c:854
+#: builtin/grep.c:887
msgid "synonym for --files-with-matches"
msgstr "đồng nghĩa với --files-with-matches"
-#: builtin/grep.c:857
+#: builtin/grep.c:890
msgid "show only the names of files without match"
msgstr "chỉ hiển thị tên cho những tập tin không khớp với mẫu"
-#: builtin/grep.c:859
+#: builtin/grep.c:892
msgid "print NUL after filenames"
msgstr "thêm NUL vào sau tên tập tin"
-#: builtin/grep.c:862
+#: builtin/grep.c:895
msgid "show only matching parts of a line"
msgstr "chỉ hiển thị những phần khớp với mẫu của một dòng"
-#: builtin/grep.c:864
+#: builtin/grep.c:897
msgid "show the number of matches instead of matching lines"
msgstr "hiển thị số lượng khớp thay vì những dòng khớp với mẫu"
-#: builtin/grep.c:865
+#: builtin/grep.c:898
msgid "highlight matches"
msgstr "tô sáng phần khớp mẫu"
-#: builtin/grep.c:867
+#: builtin/grep.c:900
msgid "print empty line between matches from different files"
msgstr "hiển thị dòng trống giữa các lần khớp từ các tập tin khác biệt"
-#: builtin/grep.c:869
+#: builtin/grep.c:902
msgid "show filename only once above matches from same file"
msgstr ""
"hiển thị tên tập tin một lần phía trên các lần khớp từ cùng một tập tin"
-#: builtin/grep.c:872
+#: builtin/grep.c:905
msgid "show <n> context lines before and after matches"
msgstr "hiển thị <n> dòng nội dung phía trước và sau các lần khớp"
-#: builtin/grep.c:875
+#: builtin/grep.c:908
msgid "show <n> context lines before matches"
msgstr "hiển thị <n> dòng nội dung trước khớp"
-#: builtin/grep.c:877
+#: builtin/grep.c:910
msgid "show <n> context lines after matches"
msgstr "hiển thị <n> dòng nội dung sau khớp"
-#: builtin/grep.c:879
+#: builtin/grep.c:912
msgid "use <n> worker threads"
msgstr "dùng <n> tuyến trình làm việc"
-#: builtin/grep.c:880
+#: builtin/grep.c:913
msgid "shortcut for -C NUM"
msgstr "dạng viết tắt của -C SỐ"
-#: builtin/grep.c:883
+#: builtin/grep.c:916
msgid "show a line with the function name before matches"
msgstr "hiển thị dòng vói tên hàm trước các lần khớp"
-#: builtin/grep.c:885
+#: builtin/grep.c:918
msgid "show the surrounding function"
msgstr "hiển thị hàm bao quanh"
-#: builtin/grep.c:888
+#: builtin/grep.c:921
msgid "read patterns from file"
msgstr "đọc mẫu từ tập-tin"
-#: builtin/grep.c:890
+#: builtin/grep.c:923
msgid "match <pattern>"
msgstr "match <mẫu>"
-#: builtin/grep.c:892
+#: builtin/grep.c:925
msgid "combine patterns specified with -e"
msgstr "tổ hợp mẫu được chỉ ra với tùy chọn -e"
-#: builtin/grep.c:904
+#: builtin/grep.c:937
msgid "indicate hit with exit status without output"
msgstr "đưa ra gợi ý với trạng thái thoát mà không có kết xuất"
-#: builtin/grep.c:906
+#: builtin/grep.c:939
msgid "show only matches from files that match all patterns"
msgstr "chỉ hiển thị những cái khớp từ tập tin mà nó khớp toàn bộ các mẫu"
-#: builtin/grep.c:908
-msgid "show parse tree for grep expression"
-msgstr "hiển thị cây phân tích cú pháp cho biểu thức “grep” (tìm kiếm)"
-
-#: builtin/grep.c:912
+#: builtin/grep.c:942
msgid "pager"
msgstr "dàn trang"
-#: builtin/grep.c:912
+#: builtin/grep.c:942
msgid "show matching files in the pager"
msgstr "hiển thị các tập tin khớp trong trang giấy"
-#: builtin/grep.c:916
+#: builtin/grep.c:946
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "cho phép gọi grep(1) (bị bỏ qua bởi lần dịch này)"
-#: builtin/grep.c:983
+#: builtin/grep.c:1012
msgid "no pattern given"
msgstr "chưa chỉ ra mẫu"
-#: builtin/grep.c:1019
+#: builtin/grep.c:1048
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index hay --untracked không được sử dụng cùng với revs"
-#: builtin/grep.c:1027
+#: builtin/grep.c:1056
#, c-format
msgid "unable to resolve revision: %s"
msgstr "không thể phân giải điểm xét duyệt: %s"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1086
msgid "--untracked not supported with --recurse-submodules"
msgstr "tùy chọn --untracked không được hỗ trợ với --recurse-submodules"
-#: builtin/grep.c:1061
+#: builtin/grep.c:1090
msgid "invalid option combination, ignoring --threads"
msgstr "tổ hợp tùy chọn không hợp lệ, bỏ qua --threads"
-#: builtin/grep.c:1064 builtin/pack-objects.c:3547
+#: builtin/grep.c:1093 builtin/pack-objects.c:3672
msgid "no threads support, ignoring --threads"
msgstr "không hỗ trợ đa tuyến, bỏ qua --threads"
-#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851
+#: builtin/grep.c:1096 builtin/index-pack.c:1586 builtin/pack-objects.c:2941
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "số tuyến chỉ ra không hợp lệ (%d)"
-#: builtin/grep.c:1101
+#: builtin/grep.c:1130
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager chỉ làm việc trên cây-làm-việc"
-#: builtin/grep.c:1127
+#: builtin/grep.c:1156
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached hay --untracked không được sử dụng với --no-index"
-#: builtin/grep.c:1133
+#: builtin/grep.c:1159
+msgid "--untracked cannot be used with --cached"
+msgstr "--untracked không thể được sử dụng với tùy chọn --cached"
+
+#: builtin/grep.c:1165
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "--[no-]exclude-standard không thể sử dụng cho nội dung lưu dấu vết"
-#: builtin/grep.c:1141
+#: builtin/grep.c:1173
msgid "both --cached and trees are given"
msgstr "cả hai --cached và các cây phải được chỉ ra"
@@ -14816,66 +15966,66 @@
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"
@@ -14884,7 +16034,7 @@
"“%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"
@@ -14893,390 +16043,422 @@
"“%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:340
#, 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:372
#, 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:606
+#: builtin/index-pack.c:324 builtin/pack-objects.c:624
msgid "pack too large for current definition of off_t"
msgstr "gói quá lớn so với định nghĩa hiện tại của kiểu off_t"
-#: builtin/index-pack.c:291 builtin/unpack-objects.c:95
+#: builtin/index-pack.c: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
+#, 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:765
-#: builtin/index-pack.c:804 builtin/index-pack.c:813
+#: 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:158
-#: builtin/pack-objects.c:218 builtin/pack-objects.c:313
+#: 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:802
+#: 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:810
+#: 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:824
+#: 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:827 builtin/index-pack.c:846
+#: 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:848
+#: 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:920 builtin/index-pack.c:951
+#: 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:1121
+#: builtin/index-pack.c:1161
msgid "Receiving objects"
msgstr "Đang nhận về các đối tượng"
-#: builtin/index-pack.c:1121
+#: builtin/index-pack.c:1161
msgid "Indexing objects"
msgstr "Các đối tượng bảng mục lục"
-#: builtin/index-pack.c:1155
+#: 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:1160
+#: 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:1163
+#: 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:1175
+#: 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:1198
+#: builtin/index-pack.c:1238
msgid "Resolving deltas"
msgstr "Đang phân giải các delta"
-#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615
+#: builtin/index-pack.c:1249 builtin/pack-objects.c:2707
#, c-format
msgid "unable to create thread: %s"
msgstr "không thể tạo tuyến: %s"
-#: builtin/index-pack.c:1249
+#: builtin/index-pack.c:1282
msgid "confusion beyond insanity"
msgstr "lộn xộn hơn cả điên rồ"
-#: builtin/index-pack.c:1255
+#: 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:1267
+#: 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:1271
+#: 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:1295
+#: 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:1392
+#: 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:1406
+#: builtin/index-pack.c:1445
#, 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”"
+msgid "packfile name '%s' does not end with '.%s'"
+msgstr "tên tập tin tập tin gói “%s” không được kết thúc “.%s”"
-#: builtin/index-pack.c:1431
+#: 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:1439
+#: 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:1463
+#: builtin/index-pack.c:1503
msgid "error while closing pack file"
msgstr "gặp lỗi trong khi đóng tập tin gói"
-#: builtin/index-pack.c:1477
+#: builtin/index-pack.c:1517
msgid "cannot store pack file"
msgstr "không thể lưu tập tin gói"
-#: builtin/index-pack.c:1485
+#: builtin/index-pack.c:1525
msgid "cannot store index file"
msgstr "không thể lưu trữ tập tin ghi mục lục"
-#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862
+#: builtin/index-pack.c:1534
+msgid "cannot store reverse index file"
+msgstr "không thể lưu trữ tập tin ghi mục lục đảo ngược"
+
+#: builtin/index-pack.c:1580 builtin/pack-objects.c:2952
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "sai pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1597
+#: builtin/index-pack.c:1650
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Không thể mở tập tin gói đã sẵn có “%s”"
-#: builtin/index-pack.c:1599
+#: builtin/index-pack.c:1652
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Không thể mở tập tin idx của gói cho “%s”"
-#: builtin/index-pack.c:1647
+#: builtin/index-pack.c:1700
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "không delta: %d đối tượng"
-#: builtin/index-pack.c:1654
+#: builtin/index-pack.c:1707
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "chiều dài xích = %d: %lu đối tượng"
-#: builtin/index-pack.c:1693
+#: builtin/index-pack.c:1765
msgid "Cannot come back to cwd"
msgstr "Không thể quay lại cwd"
-#: builtin/index-pack.c:1742 builtin/index-pack.c:1745
-#: builtin/index-pack.c:1761 builtin/index-pack.c:1765
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1822
+#: builtin/index-pack.c:1838 builtin/index-pack.c:1842
#, c-format
msgid "bad %s"
msgstr "%s sai"
-#: builtin/index-pack.c:1781
+#: builtin/index-pack.c:1848 builtin/init-db.c:392 builtin/init-db.c:625
+#, 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:1867
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin không thể được dùng mà không có --stdin"
-#: builtin/index-pack.c:1783
+#: builtin/index-pack.c:1869
msgid "--stdin requires a git repository"
msgstr "--stdin cần một kho git"
-#: builtin/index-pack.c:1789
+#: builtin/index-pack.c:1871
+msgid "--object-format cannot be used with --stdin"
+msgstr "--object-format không thể được dùng với --stdin"
+
+#: builtin/index-pack.c:1886
msgid "--verify with no packfile name given"
msgstr "dùng tùy chọn --verify mà không đưa ra tên packfile"
-#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582
+#: builtin/index-pack.c:1956 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:275
+#, 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:367
#, 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:370
#, 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:386
+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:410 builtin/init-db.c:413
#, c-format
msgid "%s already exists"
msgstr "%s đã có từ trước rồi"
-#: builtin/init-db.c:413
+#: builtin/init-db.c:445
+#, c-format
+msgid "re-init: ignored --initial-branch=%s"
+msgstr "re-init: --initial-branch=%s bị bỏ qua"
+
+#: builtin/init-db.c:476
#, 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:477
#, 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:481
#, 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:482
#, 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:531
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -15284,25 +16466,41 @@
"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:557
msgid "permissions"
msgstr "các quyền"
-#: builtin/init-db.c:492
+#: builtin/init-db.c:558
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:564
+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:565 builtin/verify-pack.c:74
+msgid "hash"
+msgstr "băm"
+
+#: builtin/init-db.c:566 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:573
+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:602 builtin/init-db.c:607
#, 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:611 builtin/init-db.c:666
#, 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:638
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -15311,11 +16509,15 @@
"%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:690
#, 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:695
+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 "
@@ -15380,126 +16582,130 @@
msgid "no input file given for in-place editing"
msgstr "không đưa ra tập tin đầu vào để sửa tại-chỗ"
-#: builtin/log.c:56
+#: builtin/log.c:59
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<các tùy chọn>] [<vùng-xem-xét>] [[--] </đường/dẫn>…]"
-#: builtin/log.c:57
+#: builtin/log.c:60
msgid "git show [<options>] <object>..."
msgstr "git show [<các tùy chọn>] <đối-tượng>…"
-#: builtin/log.c:110
+#: builtin/log.c:113
#, c-format
msgid "invalid --decorate option: %s"
msgstr "tùy chọn--decorate không hợp lệ: %s"
-#: builtin/log.c:174
+#: builtin/log.c:180
msgid "show source"
msgstr "hiển thị mã nguồn"
-#: builtin/log.c:175
-msgid "Use mail map file"
-msgstr "Sử dụng tập tin ánh xạ thư"
+#: builtin/log.c:181
+msgid "use mail map file"
+msgstr "sử dụng tập tin ánh xạ thư"
-#: builtin/log.c:177
+#: builtin/log.c:184
msgid "only decorate refs that match <pattern>"
msgstr "chỉ tô sáng các tham chiếu khớp với <mẫu>"
-#: builtin/log.c:179
+#: builtin/log.c:186
msgid "do not decorate refs that match <pattern>"
msgstr "không tô sáng các tham chiếu khớp với <mẫu>"
-#: builtin/log.c:180
+#: builtin/log.c:187
msgid "decorate options"
msgstr "các tùy chọn trang trí"
-#: builtin/log.c:183
-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:190
+msgid ""
+"trace the evolution of line range <start>,<end> or function :<funcname> in "
+"<file>"
+msgstr ""
+"theo dõi sự tiến hóa của phạm vi <start><end> dòng, hoặc chức năng:"
+"<funcname> trong <file>"
-#: builtin/log.c:281
+#: builtin/log.c:213
+msgid "-L<range>:<file> cannot be used with pathspec"
+msgstr "-L<vùng>:<tập_tin> không thể được sử dụng với đặc tả đường dẫn"
+
+#: builtin/log.c:303
#, c-format
msgid "Final output: %d %s\n"
msgstr "Kết xuất cuối cùng: %d %s\n"
-#: builtin/log.c:535
+#: builtin/log.c:566
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: sai tập tin"
-#: builtin/log.c:550 builtin/log.c:645
+#: builtin/log.c:581 builtin/log.c:671
#, c-format
msgid "could not read object %s"
msgstr "không thể đọc đối tượng %s"
-#: builtin/log.c:670
+#: builtin/log.c:696
#, c-format
msgid "unknown type: %d"
msgstr "không nhận ra kiểu: %d"
-#: builtin/log.c:814
+#: builtin/log.c:841
#, c-format
msgid "%s: invalid cover from description mode"
msgstr "%s: bao bọc không hợp lệ từ chế độ mô tả"
-#: builtin/log.c:821
+#: builtin/log.c:848
msgid "format.headers without value"
msgstr "format.headers không có giá trị cụ thể"
-#: builtin/log.c:936
-msgid "name of output directory is too long"
-msgstr "tên của thư mục kết xuất quá dài"
-
-#: builtin/log.c:952
+#: builtin/log.c:977
#, c-format
msgid "cannot open patch file %s"
msgstr "không thể mở tập tin miếng vá: %s"
-#: builtin/log.c:969
+#: builtin/log.c:994
msgid "need exactly one range"
msgstr "cần chính xác một vùng"
-#: builtin/log.c:979
+#: builtin/log.c:1004
msgid "not a range"
msgstr "không phải là một vùng"
-#: builtin/log.c:1143
+#: builtin/log.c:1168
msgid "cover letter needs email format"
msgstr "“cover letter” cần cho định dạng thư"
-#: builtin/log.c:1149
+#: builtin/log.c:1174
msgid "failed to create cover-letter file"
msgstr "gặp lỗi khi tạo các tập tin cover-letter"
-#: builtin/log.c:1228
+#: builtin/log.c:1261
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to điên rồ: %s"
-#: builtin/log.c:1255
+#: builtin/log.c:1288
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<các tùy chọn>] [<kể-từ> | <vùng-xem-xét>]"
-#: builtin/log.c:1313
+#: builtin/log.c:1346
msgid "two output directories?"
msgstr "hai thư mục kết xuất?"
-#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211
+#: builtin/log.c:1497 builtin/log.c:2317 builtin/log.c:2319 builtin/log.c:2331
#, c-format
msgid "unknown commit %s"
msgstr "không hiểu lần chuyển giao %s"
-#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1508 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "gặp lỗi khi phân giải “%s” như là một tham chiếu hợp lệ"
-#: builtin/log.c:1439
+#: builtin/log.c:1517
msgid "could not find exact merge base"
msgstr "không tìm thấy nền hòa trộn chính xác"
-#: builtin/log.c:1443
+#: builtin/log.c:1527
msgid ""
"failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
@@ -15510,279 +16716,289 @@
"nhánh máy chủ. Hoặc là bạn có thể chỉ định lần chuyển giao nền bằng\n"
"\"--base=<base-commit-id>\" một cách thủ công"
-#: builtin/log.c:1463
+#: builtin/log.c:1550
msgid "failed to find exact merge base"
msgstr "gặp lỗi khi tìm nền hòa trộn chính xác"
-#: builtin/log.c:1474
+#: builtin/log.c:1567
msgid "base commit should be the ancestor of revision list"
msgstr "lần chuyển giao nền không là tổ tiên của danh sách điểm xét duyệt"
-#: builtin/log.c:1478
+#: builtin/log.c:1577
msgid "base commit shouldn't be in revision list"
msgstr "lần chuyển giao nền không được trong danh sách điểm xét duyệt"
-#: builtin/log.c:1531
+#: builtin/log.c:1635
msgid "cannot get patch id"
msgstr "không thể lấy mã miếng vá"
-#: builtin/log.c:1583
-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:1692
+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:1629
+#: builtin/log.c:1694
+#, 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:1738
msgid "use [PATCH n/m] even with a single patch"
msgstr "dùng [PATCH n/m] ngay cả với miếng vá đơn"
-#: builtin/log.c:1632
+#: builtin/log.c:1741
msgid "use [PATCH] even with multiple patches"
msgstr "dùng [VÁ] ngay cả với các miếng vá phức tạp"
-#: builtin/log.c:1636
+#: builtin/log.c:1745
msgid "print patches to standard out"
msgstr "hiển thị miếng vá ra đầu ra chuẩn"
-#: builtin/log.c:1638
+#: builtin/log.c:1747
msgid "generate a cover letter"
msgstr "tạo bì thư"
-#: builtin/log.c:1640
+#: builtin/log.c:1749
msgid "use simple number sequence for output file names"
msgstr "sử dụng chỗi dãy số dạng đơn giản cho tên tập-tin xuất ra"
-#: builtin/log.c:1641
+#: builtin/log.c:1750
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1642
+#: builtin/log.c:1751
msgid "use <sfx> instead of '.patch'"
msgstr "sử dụng <sfx> thay cho “.patch”"
-#: builtin/log.c:1644
+#: builtin/log.c:1753
msgid "start numbering patches at <n> instead of 1"
msgstr "bắt đầu đánh số miếng vá từ <n> thay vì 1"
-#: builtin/log.c:1646
+#: builtin/log.c:1755
msgid "mark the series as Nth re-roll"
msgstr "đánh dấu chuỗi nối tiếp dạng thứ-N re-roll"
-#: builtin/log.c:1648
-msgid "Use [RFC PATCH] instead of [PATCH]"
-msgstr "Dùng [RFC VÁ] thay cho [VÁ]"
+#: builtin/log.c:1757
+msgid "max length of output filename"
+msgstr "chiều dài tên tập tin đầu ra tối đa"
-#: builtin/log.c:1651
+#: builtin/log.c:1759
+msgid "use [RFC PATCH] instead of [PATCH]"
+msgstr "dùng [VÁ RFC] thay cho [VÁ]"
+
+#: builtin/log.c:1762
msgid "cover-from-description-mode"
msgstr "cover-from-description-mode"
-#: builtin/log.c:1652
+#: builtin/log.c:1763
msgid "generate parts of a cover letter based on a branch's description"
msgstr "tạo ra các phần của một lá thư bao gồm dựa trên mô tả của nhánh"
-#: builtin/log.c:1654
-msgid "Use [<prefix>] instead of [PATCH]"
-msgstr "Dùng [<tiền-tố>] thay cho [VÁ]"
+#: builtin/log.c:1765
+msgid "use [<prefix>] instead of [PATCH]"
+msgstr "dùng [<tiền-tố>] thay cho [VÁ]"
-#: builtin/log.c:1657
+#: builtin/log.c:1768
msgid "store resulting files in <dir>"
msgstr "lưu các tập tin kết quả trong <t.mục>"
-#: builtin/log.c:1660
+#: builtin/log.c:1771
msgid "don't strip/add [PATCH]"
msgstr "không strip/add [VÁ]"
-#: builtin/log.c:1663
+#: builtin/log.c:1774
msgid "don't output binary diffs"
msgstr "không kết xuất diff (những khác biệt) nhị phân"
-#: builtin/log.c:1665
+#: builtin/log.c:1776
msgid "output all-zero hash in From header"
msgstr "xuất mọi mã băm all-zero trong phần đầu From"
-#: builtin/log.c:1667
+#: builtin/log.c:1778
msgid "don't include a patch matching a commit upstream"
msgstr "không bao gồm miếng vá khớp với một lần chuyển giao thượng nguồn"
-#: builtin/log.c:1669
+#: builtin/log.c:1780
msgid "show patch format instead of default (patch + stat)"
msgstr "hiển thị định dạng miếng vá thay vì mặc định (miếng vá + thống kê)"
-#: builtin/log.c:1671
+#: builtin/log.c:1782
msgid "Messaging"
msgstr "Lời nhắn"
-#: builtin/log.c:1672
+#: builtin/log.c:1783
msgid "header"
msgstr "đầu đề thư"
-#: builtin/log.c:1673
+#: builtin/log.c:1784
msgid "add email header"
msgstr "thêm đầu đề thư"
-#: builtin/log.c:1674 builtin/log.c:1676
+#: builtin/log.c:1785 builtin/log.c:1786
msgid "email"
msgstr "thư điện tử"
-#: builtin/log.c:1674
+#: builtin/log.c:1785
msgid "add To: header"
msgstr "thêm To: đầu đề thư"
-#: builtin/log.c:1676
+#: builtin/log.c:1786
msgid "add Cc: header"
msgstr "thêm Cc: đầu đề thư"
-#: builtin/log.c:1678
+#: builtin/log.c:1787
msgid "ident"
msgstr "thụt lề"
-#: builtin/log.c:1679
+#: builtin/log.c:1788
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"đặt “Địa chỉ gửi” thành <thụ lề> (hoặc thụt lề người commit nếu bỏ quên)"
-#: builtin/log.c:1681
+#: builtin/log.c:1790
msgid "message-id"
msgstr "message-id"
-#: builtin/log.c:1682
+#: builtin/log.c:1791
msgid "make first mail a reply to <message-id>"
msgstr "dùng thư đầu tiên để trả lời <message-id>"
-#: builtin/log.c:1683 builtin/log.c:1686
+#: builtin/log.c:1792 builtin/log.c:1795
msgid "boundary"
msgstr "ranh giới"
-#: builtin/log.c:1684
+#: builtin/log.c:1793
msgid "attach the patch"
msgstr "đính kèm miếng vá"
-#: builtin/log.c:1687
+#: builtin/log.c:1796
msgid "inline the patch"
msgstr "dùng miếng vá làm nội dung"
-#: builtin/log.c:1691
+#: builtin/log.c:1800
msgid "enable message threading, styles: shallow, deep"
msgstr "cho phép luồng lời nhắn, kiểu: “shallow”, “deep”"
-#: builtin/log.c:1693
+#: builtin/log.c:1802
msgid "signature"
msgstr "chữ ký"
-#: builtin/log.c:1694
+#: builtin/log.c:1803
msgid "add a signature"
msgstr "thêm chữ ký"
-#: builtin/log.c:1695
+#: builtin/log.c:1804
msgid "base-commit"
msgstr "lần_chuyển_giao_nền"
-#: builtin/log.c:1696
+#: builtin/log.c:1805
msgid "add prerequisite tree info to the patch series"
msgstr "add trước hết đòi hỏi thông tin cây tới sê-ri miếng vá"
-#: builtin/log.c:1698
+#: builtin/log.c:1808
msgid "add a signature from a file"
msgstr "thêm chữ ký từ một tập tin"
-#: builtin/log.c:1699
+#: builtin/log.c:1809
msgid "don't print the patch filenames"
msgstr "không hiển thị các tên tập tin của miếng vá"
-#: builtin/log.c:1701
+#: builtin/log.c:1811
msgid "show progress while generating patches"
msgstr "hiển thị bộ đo tiến triển trong khi tạo các miếng vá"
-#: builtin/log.c:1703
+#: builtin/log.c:1813
msgid "show changes against <rev> in cover letter or single patch"
msgstr ""
"hiển thị các thay đổi dựa trên <rev> trong các chữ bao bọc hoặc miếng vá đơn"
-#: builtin/log.c:1706
+#: builtin/log.c:1816
msgid "show changes against <refspec> in cover letter or single patch"
msgstr ""
"hiển thị các thay đổi dựa trên <refspec> trong các chữ bao bọc hoặc miếng vá "
"đơn"
-#: builtin/log.c:1708
+#: builtin/log.c:1818
msgid "percentage by which creation is weighted"
msgstr "tỷ lệ phần trăm theo cái tạo là weighted"
-#: builtin/log.c:1792
+#: builtin/log.c:1904
#, 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:1807
+#: builtin/log.c:1919
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:1809
+#: builtin/log.c:1921
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "--subject-prefix/--rfc và -k xung khắc nhau"
-#: builtin/log.c:1817
+#: builtin/log.c:1929
msgid "--name-only does not make sense"
msgstr "--name-only không hợp lý"
-#: builtin/log.c:1819
+#: builtin/log.c:1931
msgid "--name-status does not make sense"
msgstr "--name-status không hợp lý"
-#: builtin/log.c:1821
+#: builtin/log.c:1933
msgid "--check does not make sense"
msgstr "--check không hợp lý"
-#: builtin/log.c:1854
-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:1955
+msgid "--stdout, --output, and --output-directory are mutually exclusive"
+msgstr "Các tùy chọn--stdout, --output, và --output-directory loại từ lẫn nhau"
-#: builtin/log.c:1958
+#: builtin/log.c:2078
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff cần --cover-letter hoặc vá đơn"
-#: builtin/log.c:1962
+#: builtin/log.c:2082
msgid "Interdiff:"
msgstr "Interdiff:"
-#: builtin/log.c:1963
+#: builtin/log.c:2083
#, c-format
msgid "Interdiff against v%d:"
msgstr "Interdiff dựa trên v%d:"
-#: builtin/log.c:1969
+#: builtin/log.c:2089
msgid "--creation-factor requires --range-diff"
msgstr "--creation-factor yêu cầu --range-diff"
-#: builtin/log.c:1973
+#: builtin/log.c:2093
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff yêu cầu --cover-letter hoặc miếng vá đơn"
-#: builtin/log.c:1981
+#: builtin/log.c:2101
msgid "Range-diff:"
msgstr "Range-diff:"
-#: builtin/log.c:1982
+#: builtin/log.c:2102
#, c-format
msgid "Range-diff against v%d:"
msgstr "Range-diff dựa trên v%d:"
-#: builtin/log.c:1993
+#: builtin/log.c:2113
#, c-format
msgid "unable to read signature file '%s'"
msgstr "không thể đọc tập tin chữ ký “%s”"
-#: builtin/log.c:2029
+#: builtin/log.c:2149
msgid "Generating patches"
msgstr "Đang tạo các miếng vá"
-#: builtin/log.c:2073
+#: builtin/log.c:2193
msgid "failed to create output files"
msgstr "gặp lỗi khi tạo các tập tin kết xuất"
-#: builtin/log.c:2132
+#: builtin/log.c:2252
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<thượng-nguồn> [<đầu> [<giới-hạn>]]]"
-#: builtin/log.c:2186
+#: builtin/log.c:2306
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -15790,113 +17006,117 @@
"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:486
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:542
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:544
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:546
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:548
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:550
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:552
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:554
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:556
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:559
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:561
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:563
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:565
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:567
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:570
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:572
msgid "show resolve-undo information"
msgstr "hiển thị thông tin resolve-undo"
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:574
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:577
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:580
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:582
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:586
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:589
msgid "recurse through submodules"
msgstr "đệ quy xuyên qua mô-đun con"
-#: builtin/ls-files.c:575
+#: builtin/ls-files.c:591
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:592
msgid "tree-ish"
msgstr "tree-ish"
-#: builtin/ls-files.c:577
+#: builtin/ls-files.c:593
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:595
msgid "show debugging data"
msgstr "hiển thị dữ liệu gỡ lỗi"
+#: builtin/ls-files.c:597
+msgid "suppress duplicate entries"
+msgstr "chặn các mục tin trùng lặp"
+
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
@@ -15907,39 +17127,39 @@
" [-q | --quiet] [--exit-code] [--get-url]\n"
" [--symref] [<kho> [<các tham chiếu>…]]"
-#: builtin/ls-remote.c:59
+#: builtin/ls-remote.c:60
msgid "do not print remote URL"
msgstr "không hiển thị URL máy chủ"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1404
msgid "exec"
msgstr "thực thi"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
+#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
msgid "path of git-upload-pack on the remote host"
msgstr "đường dẫn của git-upload-pack trên máy chủ"
-#: builtin/ls-remote.c:65
+#: builtin/ls-remote.c:66
msgid "limit to tags"
msgstr "giới hạn tới các thẻ"
-#: builtin/ls-remote.c:66
+#: builtin/ls-remote.c:67
msgid "limit to heads"
msgstr "giới hạn cho các đầu"
-#: builtin/ls-remote.c:67
+#: builtin/ls-remote.c:68
msgid "do not show peeled tags"
msgstr "không hiển thị thẻ bị peel (gọt bỏ)"
-#: builtin/ls-remote.c:69
+#: builtin/ls-remote.c:70
msgid "take url.<base>.insteadOf into account"
msgstr "lấy url.<base>.insteadOf vào trong tài khoản"
-#: builtin/ls-remote.c:72
+#: builtin/ls-remote.c:73
msgid "exit with exit code 2 if no matching refs are found"
msgstr "thoát với mã là 2 nếu không tìm thấy tham chiếu nào khớp"
-#: builtin/ls-remote.c:75
+#: builtin/ls-remote.c:76
msgid "show underlying ref in addition to the object pointed by it"
msgstr "hiển thị tham chiếu nằm dưới để thêm vào đối tượng được chỉ bởi nó"
@@ -15984,399 +17204,6 @@
msgid "empty mbox: '%s'"
msgstr "mbox trống rỗng: “%s”"
-#: builtin/merge.c:55
-msgid "git merge [<options>] [<commit>...]"
-msgstr "git merge [<các tùy chọn>] [<commit>…]"
-
-#: builtin/merge.c:56
-msgid "git merge --abort"
-msgstr "git merge --abort"
-
-#: builtin/merge.c:57
-msgid "git merge --continue"
-msgstr "git merge --continue"
-
-#: builtin/merge.c:119
-msgid "switch `m' requires a value"
-msgstr "switch “m” yêu cầu một giá trị"
-
-#: builtin/merge.c:142
-#, c-format
-msgid "option `%s' requires a value"
-msgstr "tùy chọn “%s” yêu cầu một giá trị"
-
-#: builtin/merge.c:188
-#, c-format
-msgid "Could not find merge strategy '%s'.\n"
-msgstr "Không tìm thấy chiến lược hòa trộn “%s”.\n"
-
-#: builtin/merge.c:189
-#, c-format
-msgid "Available strategies are:"
-msgstr "Các chiến lược sẵn sàng là:"
-
-#: builtin/merge.c:194
-#, c-format
-msgid "Available custom strategies are:"
-msgstr "Các chiến lược tùy chỉnh sẵn sàng là:"
-
-#: builtin/merge.c:245 builtin/pull.c:132
-msgid "do not show a diffstat at the end of the merge"
-msgstr "không hiển thị thống kê khác biệt tại cuối của lần hòa trộn"
-
-#: builtin/merge.c:248 builtin/pull.c:135
-msgid "show a diffstat at the end of the merge"
-msgstr "hiển thị thống kê khác biệt tại cuối của hòa trộn"
-
-#: builtin/merge.c:249 builtin/pull.c:138
-msgid "(synonym to --stat)"
-msgstr "(đồng nghĩa với --stat)"
-
-#: builtin/merge.c:251 builtin/pull.c:141
-msgid "add (at most <n>) entries from shortlog to merge commit message"
-msgstr "thêm (ít nhất <n>) mục từ shortlog cho ghi chú chuyển giao hòa trộn"
-
-#: builtin/merge.c:254 builtin/pull.c:147
-msgid "create a single commit instead of doing a merge"
-msgstr "tạo một lần chuyển giao đưon thay vì thực hiện việc hòa trộn"
-
-#: builtin/merge.c:256 builtin/pull.c:150
-msgid "perform a commit if the merge succeeds (default)"
-msgstr "thực hiện chuyển giao nếu hòa trộn thành công (mặc định)"
-
-#: builtin/merge.c:258 builtin/pull.c:153
-msgid "edit message before committing"
-msgstr "sửa chú thích trước khi chuyển giao"
-
-#: builtin/merge.c:260
-msgid "allow fast-forward (default)"
-msgstr "cho phép chuyển-tiếp-nhanh (mặc định)"
-
-#: builtin/merge.c:262 builtin/pull.c:160
-msgid "abort if fast-forward is not possible"
-msgstr "bỏ qua nếu chuyển-tiếp-nhanh không thể được"
-
-#: builtin/merge.c:266 builtin/pull.c:163
-msgid "verify that the named commit has a valid GPG signature"
-msgstr "thẩm tra xem lần chuyển giao có tên đó có chữ ký GPG hợp lệ hay không"
-
-#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167
-#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114
-msgid "strategy"
-msgstr "chiến lược"
-
-#: builtin/merge.c:268 builtin/pull.c:168
-msgid "merge strategy to use"
-msgstr "chiến lược hòa trộn sẽ dùng"
-
-#: builtin/merge.c:269 builtin/pull.c:171
-msgid "option=value"
-msgstr "tùy_chọn=giá_trị"
-
-#: builtin/merge.c:270 builtin/pull.c:172
-msgid "option for selected merge strategy"
-msgstr "tùy chọn cho chiến lược hòa trộn đã chọn"
-
-#: builtin/merge.c:272
-msgid "merge commit message (for a non-fast-forward merge)"
-msgstr ""
-"hòa trộn ghi chú của lần chuyển giao (dành cho hòa trộn không-chuyển-tiếp-"
-"nhanh)"
-
-#: builtin/merge.c:279
-msgid "abort the current in-progress merge"
-msgstr "bãi bỏ quá trình hòa trộn hiện tại đang thực hiện"
-
-#: builtin/merge.c:281
-msgid "--abort but leave index and working tree alone"
-msgstr "--abort nhưng để lại bảng mục lục và cây làm việc"
-
-#: builtin/merge.c:283
-msgid "continue the current in-progress merge"
-msgstr "tiếp tục quá trình hòa trộn hiện tại đang thực hiện"
-
-#: builtin/merge.c:285 builtin/pull.c:179
-msgid "allow merging unrelated histories"
-msgstr "cho phép hòa trộn lịch sử không liên quan"
-
-#: builtin/merge.c:291
-msgid "bypass pre-merge-commit and commit-msg hooks"
-msgstr "vòng qua móc (hook) pre-merge-commit và commit-msg"
-
-#: builtin/merge.c:308
-msgid "could not run stash."
-msgstr "không thể chạy stash."
-
-#: builtin/merge.c:313
-msgid "stash failed"
-msgstr "lệnh tạm cất gặp lỗi"
-
-#: builtin/merge.c:318
-#, c-format
-msgid "not a valid object: %s"
-msgstr "không phải là một đối tượng hợp lệ: %s"
-
-#: builtin/merge.c:340 builtin/merge.c:357
-msgid "read-tree failed"
-msgstr "read-tree gặp lỗi"
-
-#: builtin/merge.c:387
-msgid " (nothing to squash)"
-msgstr " (không có gì để squash)"
-
-#: builtin/merge.c:398
-#, c-format
-msgid "Squash commit -- not updating HEAD\n"
-msgstr "Squash commit -- không cập nhật HEAD\n"
-
-#: builtin/merge.c:448
-#, c-format
-msgid "No merge message -- not updating HEAD\n"
-msgstr "Không có lời chú thích hòa trộn -- nên không cập nhật HEAD\n"
-
-#: builtin/merge.c:499
-#, c-format
-msgid "'%s' does not point to a commit"
-msgstr "“%s” không chỉ đến một lần chuyển giao nào cả"
-
-#: builtin/merge.c:586
-#, c-format
-msgid "Bad branch.%s.mergeoptions string: %s"
-msgstr "Chuỗi branch.%s.mergeoptions sai: %s"
-
-#: builtin/merge.c:708
-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
-#, 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
-#, c-format
-msgid "unable to write %s"
-msgstr "không thể ghi %s"
-
-#: builtin/merge.c:789
-#, c-format
-msgid "Could not read from '%s'"
-msgstr "Không thể đọc từ “%s”"
-
-#: builtin/merge.c:798
-#, 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
-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 ""
-"Hãy nhập vào các thông tin để giải thích tại sao sự hòa trộn này là cần "
-"thiết,\n"
-"đặc biệt là khi nó hòa trộn thượng nguồn đã cập nhật vào trong một nhánh "
-"topic.\n"
-"\n"
-
-#: builtin/merge.c:809
-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
-#, c-format
-msgid ""
-"Lines starting with '%c' will be ignored, and an empty message aborts\n"
-"the commit.\n"
-msgstr ""
-"Những dòng được bắt đầu bằng “%c” sẽ được bỏ qua, và nếu phần chú\n"
-"thích rỗng sẽ hủy bỏ lần chuyển giao.\n"
-
-#: builtin/merge.c:865
-msgid "Empty commit message."
-msgstr "Chú thích của lần commit (chuyển giao) bị trống rỗng."
-
-#: builtin/merge.c:880
-#, c-format
-msgid "Wonderful.\n"
-msgstr "Tuyệt vời.\n"
-
-#: builtin/merge.c:941
-#, c-format
-msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
-msgstr ""
-"Việc tự động hòa trộn gặp lỗi; hãy sửa các xung đột sau đó chuyển giao kết "
-"quả.\n"
-
-#: builtin/merge.c:980
-msgid "No current branch."
-msgstr "Không phải nhánh hiện hành."
-
-#: builtin/merge.c:982
-msgid "No remote for the current branch."
-msgstr "Không có máy chủ cho nhánh hiện hành."
-
-#: builtin/merge.c:984
-msgid "No default upstream defined for the current branch."
-msgstr "Không có thượng nguồn mặc định được định nghĩa cho nhánh hiện hành."
-
-#: builtin/merge.c:989
-#, c-format
-msgid "No remote-tracking branch for %s from %s"
-msgstr "Không nhánh mạng theo dõi cho %s từ %s"
-
-#: builtin/merge.c:1046
-#, c-format
-msgid "Bad value '%s' in environment '%s'"
-msgstr "Giá trị sai “%s” trong biến môi trường “%s”"
-
-#: builtin/merge.c:1149
-#, c-format
-msgid "not something we can merge in %s: %s"
-msgstr "không phải là một thứ gì đó mà chúng tôi có thể hòa trộn trong %s: %s"
-
-#: builtin/merge.c:1183
-msgid "not something we can merge"
-msgstr "không phải là thứ gì đó mà chúng tôi có thể hòa trộn"
-
-#: builtin/merge.c:1286
-msgid "--abort expects no arguments"
-msgstr "--abort không nhận các đối số"
-
-#: builtin/merge.c:1290
-msgid "There is no merge to abort (MERGE_HEAD missing)."
-msgstr ""
-"Ở đây không có lần hòa trộn nào được hủy bỏ giữa chừng cả (thiếu MERGE_HEAD)."
-
-#: builtin/merge.c:1299
-msgid "--quit expects no arguments"
-msgstr "--quit không nhận các đối số"
-
-#: builtin/merge.c:1312
-msgid "--continue expects no arguments"
-msgstr "--continue không nhận đối số"
-
-#: builtin/merge.c:1316
-msgid "There is no merge in progress (MERGE_HEAD missing)."
-msgstr "Ở đây không có lần hòa trộn nào đang được xử lý cả (thiếu MERGE_HEAD)."
-
-#: builtin/merge.c:1332
-msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you merge."
-msgstr ""
-"Bạn chưa kết thúc việc hòa trộn (MERGE_HEAD vẫn tồn tại).\n"
-"Hãy chuyển giao các thay đổi trước khi bạn có thể hòa trộn."
-
-#: builtin/merge.c:1339
-msgid ""
-"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
-"Please, commit your changes before you merge."
-msgstr ""
-"Bạn chưa kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại).\n"
-"Hãy chuyển giao các thay đổi trước khi bạn có thể hòa trộn."
-
-#: builtin/merge.c:1342
-msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
-msgstr "Bạn chưa kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại)."
-
-#: builtin/merge.c:1356
-msgid "You cannot combine --squash with --no-ff."
-msgstr "Bạn không thể kết hợp --squash với --no-ff."
-
-#: builtin/merge.c:1358
-msgid "You cannot combine --squash with --commit."
-msgstr "Bạn không thể kết hợp --squash với --commit."
-
-#: builtin/merge.c:1374
-msgid "No commit specified and merge.defaultToUpstream not set."
-msgstr "Không chỉ ra lần chuyển giao và merge.defaultToUpstream chưa được đặt."
-
-#: builtin/merge.c:1391
-msgid "Squash commit into empty head not supported yet"
-msgstr "Squash commit vào một head trống rỗng vẫn chưa được hỗ trợ"
-
-#: builtin/merge.c:1393
-msgid "Non-fast-forward commit does not make sense into an empty head"
-msgstr ""
-"Chuyển giao không-chuyển-tiếp-nhanh không hợp lý ở trong một head trống rỗng"
-
-#: builtin/merge.c:1398
-#, c-format
-msgid "%s - not something we can merge"
-msgstr "%s - không phải là thứ gì đó mà chúng tôi có thể hòa trộn"
-
-#: builtin/merge.c:1400
-msgid "Can merge only exactly one commit into empty head"
-msgstr ""
-"Không thể hòa trộn một cách đúng đắn một lần chuyển giao vào một head rỗng"
-
-#: builtin/merge.c:1481
-msgid "refusing to merge unrelated histories"
-msgstr "từ chối hòa trộn lịch sử không liên quan"
-
-#: builtin/merge.c:1490
-msgid "Already up to date."
-msgstr "Đã cập nhật rồi."
-
-#: builtin/merge.c:1500
-#, c-format
-msgid "Updating %s..%s\n"
-msgstr "Đang cập nhật %s..%s\n"
-
-#: builtin/merge.c:1542
-#, c-format
-msgid "Trying really trivial in-index merge...\n"
-msgstr "Đang thử hòa trộn kiểu “trivial in-index”…\n"
-
-#: builtin/merge.c:1549
-#, c-format
-msgid "Nope.\n"
-msgstr "Không.\n"
-
-#: builtin/merge.c:1574
-msgid "Already up to date. Yeeah!"
-msgstr "Đã cập nhật rồi. Yeeah!"
-
-#: builtin/merge.c:1580
-msgid "Not possible to fast-forward, aborting."
-msgstr "Thực hiện lệnh chuyển-tiếp-nhanh là không thể được, đang bỏ qua."
-
-#: builtin/merge.c:1603 builtin/merge.c:1668
-#, c-format
-msgid "Rewinding the tree to pristine...\n"
-msgstr "Đang tua lại cây thành thời xa xưa…\n"
-
-#: builtin/merge.c:1607
-#, c-format
-msgid "Trying merge strategy %s...\n"
-msgstr "Đang thử chiến lược hòa trộn %s…\n"
-
-#: builtin/merge.c:1659
-#, c-format
-msgid "No merge strategy handled the merge.\n"
-msgstr "Không có chiến lược hòa trộn nào được nắm giữ (handle) sự hòa trộn.\n"
-
-#: builtin/merge.c:1661
-#, c-format
-msgid "Merge with strategy %s failed.\n"
-msgstr "Hòa trộn với chiến lược %s gặp lỗi.\n"
-
-#: builtin/merge.c:1670
-#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
-msgstr "Sử dụng %s để chuẩn bị giải quyết bằng tay.\n"
-
-#: builtin/merge.c:1682
-#, 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>…"
@@ -16397,23 +17224,23 @@
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
+#: 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:155
+#: 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:157
+#: 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:159
+#: 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:161
+#: 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>"
@@ -16487,6 +17314,442 @@
msgid "Merging %s with %s\n"
msgstr "Đang hòa trộn %s với %s\n"
+#: builtin/merge.c:58
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<các tùy chọn>] [<commit>…]"
+
+#: builtin/merge.c:59
+msgid "git merge --abort"
+msgstr "git merge --abort"
+
+#: builtin/merge.c:60
+msgid "git merge --continue"
+msgstr "git merge --continue"
+
+#: builtin/merge.c:123
+msgid "switch `m' requires a value"
+msgstr "switch “m” yêu cầu một giá trị"
+
+#: builtin/merge.c:146
+#, 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:199
+#, 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:200
+#, c-format
+msgid "Available strategies are:"
+msgstr "Các chiến lược sẵn sàng là:"
+
+#: builtin/merge.c:205
+#, 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:256 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:259 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:260 builtin/pull.c:139
+msgid "(synonym to --stat)"
+msgstr "(đồng nghĩa với --stat)"
+
+#: builtin/merge.c:262 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:265 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:267 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:269 builtin/pull.c:154
+msgid "edit message before committing"
+msgstr "sửa chú thích trước khi chuyển giao"
+
+#: builtin/merge.c:271
+msgid "allow fast-forward (default)"
+msgstr "cho phép chuyển-tiếp-nhanh (mặc định)"
+
+#: builtin/merge.c:273 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:277 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:278 builtin/notes.c:787 builtin/pull.c:168
+#: builtin/rebase.c:541 builtin/rebase.c:1418 builtin/revert.c:114
+msgid "strategy"
+msgstr "chiến lược"
+
+#: builtin/merge.c:279 builtin/pull.c:169
+msgid "merge strategy to use"
+msgstr "chiến lược hòa trộn sẽ dùng"
+
+#: builtin/merge.c:280 builtin/pull.c:172
+msgid "option=value"
+msgstr "tùy_chọn=giá_trị"
+
+#: builtin/merge.c:281 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:283
+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:290
+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:292
+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:294
+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:296 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:303
+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:320
+msgid "could not run stash."
+msgstr "không thể chạy stash."
+
+#: builtin/merge.c:325
+msgid "stash failed"
+msgstr "lệnh tạm cất gặp lỗi"
+
+#: builtin/merge.c:330
+#, 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:352 builtin/merge.c:369
+msgid "read-tree failed"
+msgstr "read-tree gặp lỗi"
+
+#: builtin/merge.c:399
+msgid " (nothing to squash)"
+msgstr " (không có gì để squash)"
+
+#: builtin/merge.c:410
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr "Squash commit -- không cập nhật HEAD\n"
+
+#: builtin/merge.c:460
+#, 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:511
+#, 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:598
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr "Chuỗi branch.%s.mergeoptions sai: %s"
+
+#: builtin/merge.c:724
+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:737
+#, 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:756 t/helper/test-fast-rebase.c:209
+#, c-format
+msgid "unable to write %s"
+msgstr "không thể ghi %s"
+
+#: builtin/merge.c:808
+#, c-format
+msgid "Could not read from '%s'"
+msgstr "Không thể đọc từ “%s”"
+
+#: builtin/merge.c:817
+#, 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:823
+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 ""
+"Hãy nhập vào các thông tin để giải thích tại sao sự hòa trộn này là cần "
+"thiết,\n"
+"đặc biệt là khi nó hòa trộn thượng nguồn đã cập nhật vào trong một nhánh "
+"topic.\n"
+"\n"
+
+#: builtin/merge.c:828
+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:831
+#, c-format
+msgid ""
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+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:884
+msgid "Empty commit message."
+msgstr "Chú thích của lần commit (chuyển giao) bị trống rỗng."
+
+#: builtin/merge.c:899
+#, c-format
+msgid "Wonderful.\n"
+msgstr "Tuyệt vời.\n"
+
+#: builtin/merge.c:960
+#, 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:999
+msgid "No current branch."
+msgstr "Không phải nhánh hiện hành."
+
+#: builtin/merge.c:1001
+msgid "No remote for the current branch."
+msgstr "Không có máy chủ cho nhánh hiện hành."
+
+#: builtin/merge.c:1003
+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:1008
+#, 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:1065
+#, 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:1168
+#, 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:1202
+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:1312
+msgid "--abort expects no arguments"
+msgstr "--abort không nhận các đối số"
+
+#: builtin/merge.c:1316
+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:1334
+msgid "--quit expects no arguments"
+msgstr "--quit không nhận các đối số"
+
+#: builtin/merge.c:1347
+msgid "--continue expects no arguments"
+msgstr "--continue không nhận đối số"
+
+#: builtin/merge.c:1351
+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:1367
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
+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:1374
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
+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:1377
+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:1391
+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:1393
+msgid "You cannot combine --squash with --commit."
+msgstr "Bạn không thể kết hợp --squash với --commit."
+
+#: builtin/merge.c:1409
+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:1426
+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:1428
+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:1433
+#, 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:1435
+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:1516
+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:1525
+msgid "Already up to date."
+msgstr "Đã cập nhật rồi."
+
+#: builtin/merge.c:1535
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr "Đang cập nhật %s..%s\n"
+
+#: builtin/merge.c:1581
+#, 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:1588
+#, c-format
+msgid "Nope.\n"
+msgstr "Không.\n"
+
+#: builtin/merge.c:1613
+msgid "Already up to date. Yeeah!"
+msgstr "Đã cập nhật rồi. Yeeah!"
+
+#: builtin/merge.c:1619
+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:1647 builtin/merge.c:1712
+#, 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:1651
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr "Đang thử chiến lược hòa trộn %s…\n"
+
+#: builtin/merge.c:1703
+#, 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:1705
+#, 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:1714
+#, 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:1728
+#, 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/mktag.c:10
+msgid "git mktag"
+msgstr "git mktag"
+
+#: builtin/mktag.c:30
+#, c-format
+msgid "warning: tag input does not pass fsck: %s"
+msgstr "cảnh báo: đầu vào thẻ không qua kiểm tra fsck: %s"
+
+#: builtin/mktag.c:41
+#, c-format
+msgid "error: tag input does not pass fsck: %s"
+msgstr "lỗi: đầu vào thẻ không vượt qua fsck: %s"
+
+#: builtin/mktag.c:44
+#, c-format
+msgid "%d (FSCK_IGNORE?) should never trigger this callback"
+msgstr "%d (FSCK_IGNORE?) không bao giờ nên kích hoạt cuộc gọi ngược này"
+
+#: builtin/mktag.c:59
+#, c-format
+msgid "could not read tagged object '%s'"
+msgstr "không thể đọc đối tượng được đánh thẻ %s"
+
+#: builtin/mktag.c:62
+#, c-format
+msgid "object '%s' tagged as '%s', but is a '%s' type"
+msgstr "đối tượng %s được đánh thẻ là %s, không phải là kiểu %s"
+
+#: builtin/mktag.c:99
+msgid "tag on stdin did not pass our strict fsck check"
+msgstr ""
+"thẻ trên stdin đã không vượt qua kiểm tra fsck nghiêm ngặt của chúng tôi"
+
+#: builtin/mktag.c:102
+msgid "tag on stdin did not refer to a valid object"
+msgstr ""
+"thẻ trên đầu vào tiêu chuẩn không chỉ đến một lần chuyển giao hợp lệ nào cả"
+
+#: builtin/mktag.c:105 builtin/tag.c:232
+msgid "unable to write tag file"
+msgstr "không thể ghi vào tập tin lưu thẻ"
+
#: builtin/mktree.c:66
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
@@ -16523,13 +17786,16 @@
"trong suốt quá trình đóng gói lại, gom các tập tin gói có kích cỡ nhỏ hơn "
"vào một bó cái mà lớn hơn kích thước này"
-#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67
+#: builtin/multi-pack-index.c:50 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 builtin/prune-packed.c:25 builtin/tag.c:575
msgid "too many arguments"
msgstr "có quá nhiều đối số"
#: 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'"
+msgstr "tùy chọn --batch-size chỉ cho lệnh con “repack”"
#: builtin/multi-pack-index.c:69
#, c-format
@@ -16563,68 +17829,72 @@
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:781 builtin/repack.c:518
+#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:483
#, c-format
msgid "renaming '%s' failed"
msgstr "gặp lỗi khi đổi tên “%s”"
@@ -16642,8 +17912,8 @@
msgstr "git name-rev [<các tùy chọn>] --stdin"
#: builtin/name-rev.c:524
-msgid "print only names (no SHA-1)"
-msgstr "chỉ hiển thị tên (không SHA-1)"
+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:525
msgid "only use tags to name the commits"
@@ -16816,7 +18086,7 @@
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:565
#, c-format
msgid "could not open or read '%s'"
msgstr "không thể mở hay đọc “%s”"
@@ -16856,12 +18126,6 @@
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "từ chối %s ghi chú trong %s (nằm ngoài refs/notes/)"
-#: 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 "quá nhiều đối số"
-
#: builtin/notes.c:389 builtin/notes.c:678
#, c-format
msgid "no note found for object %s."
@@ -16919,7 +18183,7 @@
msgstr "tải cấu hình chép lại cho <lệnh> (ngầm định là --stdin)"
#: builtin/notes.c:517
-msgid "too few parameters"
+msgid "too few arguments"
msgstr "quá ít đối số"
#: builtin/notes.c:538
@@ -17050,7 +18314,7 @@
"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:578
#, 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ệ."
@@ -17068,7 +18332,7 @@
msgid "read object names from the standard input"
msgstr "đọc tên đối tượng từ thiết bị nhập chuẩn"
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148
msgid "do not remove, show only"
msgstr "không gỡ bỏ, chỉ hiển thị"
@@ -17084,122 +18348,153 @@
msgid "use notes from <notes-ref>"
msgstr "dùng “notes” từ <notes-ref>"
-#: builtin/notes.c:1034 builtin/stash.c:1643
+#: builtin/notes.c:1034 builtin/stash.c:1671
#, 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:430
+#: builtin/pack-objects.c:440
+#, c-format
+msgid ""
+"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
+"pack %s"
+msgstr ""
+"write_reuse_object: không thể phân bổ %s, cần tại vị trí bù %<PRIuMAX> trong "
+"gói %s"
+
+#: builtin/pack-objects.c:448
#, c-format
msgid "bad packed object CRC for %s"
msgstr "CRC của đối tượng gói sai với %s"
-#: builtin/pack-objects.c:441
+#: builtin/pack-objects.c:459
#, c-format
msgid "corrupt packed object for %s"
msgstr "đối tượng đã đóng gói sai hỏng cho %s"
-#: builtin/pack-objects.c:572
+#: builtin/pack-objects.c:590
#, c-format
msgid "recursive delta detected for object %s"
msgstr "dò thấy delta đệ quy cho đối tượng %s"
-#: builtin/pack-objects.c:783
+#: builtin/pack-objects.c:801
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "đã sắp xếp %u đối tượng, cần %<PRIu32>"
-#: builtin/pack-objects.c:972
+#: builtin/pack-objects.c:896
+#, c-format
+msgid "expected object at offset %<PRIuMAX> in pack %s"
+msgstr "cần đối tượng tại khoảng bù %<PRIuMAX> trong gói: %s"
+
+#: builtin/pack-objects.c:1015
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr "tắt ghi bitmap, các gói bị chia nhỏ bởi vì pack.packSizeLimit"
-#: builtin/pack-objects.c:985
+#: builtin/pack-objects.c:1028
msgid "Writing objects"
msgstr "Đang ghi lại các đối tượng"
-#: builtin/pack-objects.c:1046 builtin/update-index.c:90
+#: builtin/pack-objects.c:1089 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:1099
+#: builtin/pack-objects.c:1141
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "đã ghi %<PRIu32> đối tượng trong khi cần %<PRIu32>"
-#: builtin/pack-objects.c:1297
+#: builtin/pack-objects.c:1358
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "tắt ghi bitmap, như vậy một số đối tượng sẽ không được đóng gói"
-#: builtin/pack-objects.c:1724
+#: builtin/pack-objects.c:1806
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "khoảng bù cơ sở cho delta bị tràn trong gói cho %s"
-#: builtin/pack-objects.c:1733
+#: builtin/pack-objects.c:1815
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "khoảng bù cơ sở cho delta nằm ngoài phạm cho %s"
-#: builtin/pack-objects.c:2004
+#: builtin/pack-objects.c:2096
msgid "Counting objects"
msgstr "Đang đếm các đối tượng"
-#: builtin/pack-objects.c:2149
+#: builtin/pack-objects.c:2241
#, c-format
msgid "unable to parse object header of %s"
msgstr "không thể phân tích phần đầu đối tượng của “%s”"
-#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235
-#: builtin/pack-objects.c:2245
+#: builtin/pack-objects.c:2311 builtin/pack-objects.c:2327
+#: builtin/pack-objects.c:2337
#, c-format
msgid "object %s cannot be read"
msgstr "không thể đọc đối tượng %s"
-#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249
+#: builtin/pack-objects.c:2314 builtin/pack-objects.c:2341
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr ""
"đối tượng %s không nhất quán về chiều dài đối tượng (%<PRIuMAX> so với "
"%<PRIuMAX>)"
-#: builtin/pack-objects.c:2259
+#: builtin/pack-objects.c:2351
msgid "suboptimal pack - out of memory"
msgstr "suboptimal pack - hết bộ nhớ"
-#: builtin/pack-objects.c:2574
+#: builtin/pack-objects.c:2666
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "Nén delta dùng tới %d tuyến trình"
-#: builtin/pack-objects.c:2713
+#: builtin/pack-objects.c:2805
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "không thể đóng gói các đối tượng tiếp cận được từ thẻ “%s”"
-#: builtin/pack-objects.c:2801
+#: builtin/pack-objects.c:2891
msgid "Compressing objects"
msgstr "Đang nén các đối tượng"
-#: builtin/pack-objects.c:2807
+#: builtin/pack-objects.c:2897
msgid "inconsistency with delta count"
msgstr "mâu thuẫn với số lượng delta"
-#: builtin/pack-objects.c:2888
+#: builtin/pack-objects.c:2976
+#, 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:2979
+#, 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:3008
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -17208,7 +18503,7 @@
"cần ID đối tượng cạnh, nhận được rác:\n"
" %s"
-#: builtin/pack-objects.c:2894
+#: builtin/pack-objects.c:3014
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -17217,228 +18512,236 @@
"cần ID đối tượng, nhận được rác:\n"
" %s"
-#: builtin/pack-objects.c:2992
+#: builtin/pack-objects.c:3112
msgid "invalid value for --missing"
msgstr "giá trị cho --missing không hợp lệ"
-#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159
+#: builtin/pack-objects.c:3171 builtin/pack-objects.c:3279
msgid "cannot open pack index"
msgstr "không thể mở mục lục của gói"
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3202
#, c-format
msgid "loose object at %s could not be examined"
msgstr "đối tượng mất tại %s không thể đã kiểm tra"
-#: builtin/pack-objects.c:3167
+#: builtin/pack-objects.c:3287
msgid "unable to force loose object"
msgstr "không thể buộc mất đối tượng"
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3380
#, c-format
msgid "not a rev '%s'"
msgstr "không phải một rev “%s”"
-#: builtin/pack-objects.c:3263
+#: builtin/pack-objects.c:3383
#, c-format
msgid "bad revision '%s'"
msgstr "điểm xem xét sai “%s”"
-#: builtin/pack-objects.c:3288
+#: builtin/pack-objects.c:3408
msgid "unable to add recent objects"
msgstr "không thể thêm các đối tượng mới dùng"
-#: builtin/pack-objects.c:3341
+#: builtin/pack-objects.c:3461
#, c-format
msgid "unsupported index version %s"
msgstr "phiên bản mục lục không được hỗ trợ %s"
-#: builtin/pack-objects.c:3345
+#: builtin/pack-objects.c:3465
#, c-format
msgid "bad index version '%s'"
msgstr "phiên bản mục lục sai “%s”"
-#: builtin/pack-objects.c:3383
+#: builtin/pack-objects.c:3503
msgid "<version>[,<offset>]"
msgstr "<phiên bản>[,offset]"
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3504
msgid "write the pack index file in the specified idx format version"
msgstr "ghi tập tin bảng mục lục gói (pack) ở phiên bản định dạng idx đã cho"
-#: builtin/pack-objects.c:3387
+#: builtin/pack-objects.c:3507
msgid "maximum size of each output pack file"
msgstr "kcíh thước tối đa cho tập tin gói được tạo"
-#: builtin/pack-objects.c:3389
+#: builtin/pack-objects.c:3509
msgid "ignore borrowed objects from alternate object store"
msgstr "bỏ qua các đối tượng vay mượn từ kho đối tượng thay thế"
-#: builtin/pack-objects.c:3391
+#: builtin/pack-objects.c:3511
msgid "ignore packed objects"
msgstr "bỏ qua các đối tượng đóng gói"
-#: builtin/pack-objects.c:3393
+#: builtin/pack-objects.c:3513
msgid "limit pack window by objects"
msgstr "giới hạn cửa sổ đóng gói theo đối tượng"
-#: builtin/pack-objects.c:3395
+#: builtin/pack-objects.c:3515
msgid "limit pack window by memory in addition to object limit"
msgstr "giới hạn cửa sổ đóng gói theo bộ nhớ cộng thêm với giới hạn đối tượng"
-#: builtin/pack-objects.c:3397
+#: builtin/pack-objects.c:3517
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "độ dài tối đa của chuỗi móc xích “delta” được phép trong gói kết quả"
-#: builtin/pack-objects.c:3399
+#: builtin/pack-objects.c:3519
msgid "reuse existing deltas"
msgstr "dùng lại các delta sẵn có"
-#: builtin/pack-objects.c:3401
+#: builtin/pack-objects.c:3521
msgid "reuse existing objects"
msgstr "dùng lại các đối tượng sẵn có"
-#: builtin/pack-objects.c:3403
+#: builtin/pack-objects.c:3523
msgid "use OFS_DELTA objects"
msgstr "dùng các đối tượng OFS_DELTA"
-#: builtin/pack-objects.c:3405
+#: builtin/pack-objects.c:3525
msgid "use threads when searching for best delta matches"
msgstr "sử dụng các tuyến trình khi tìm kiếm cho các mẫu khớp delta tốt nhất"
-#: builtin/pack-objects.c:3407
+#: builtin/pack-objects.c:3527
msgid "do not create an empty pack output"
msgstr "không thể tạo kết xuất gói trống rỗng"
-#: builtin/pack-objects.c:3409
+#: builtin/pack-objects.c:3529
msgid "read revision arguments from standard input"
msgstr "đọc tham số “revision” từ thiết bị nhập chuẩn"
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:3531
msgid "limit the objects to those that are not yet packed"
msgstr "giới hạn các đối tượng thành những cái mà chúng vẫn chưa được đóng gói"
-#: builtin/pack-objects.c:3414
+#: builtin/pack-objects.c:3534
msgid "include objects reachable from any reference"
msgstr "bao gồm các đối tượng có thể đọc được từ bất kỳ tham chiếu nào"
-#: builtin/pack-objects.c:3417
+#: builtin/pack-objects.c:3537
msgid "include objects referred by reflog entries"
msgstr "bao gồm các đối tượng được tham chiếu bởi các mục reflog"
-#: builtin/pack-objects.c:3420
+#: builtin/pack-objects.c:3540
msgid "include objects referred to by the index"
msgstr "bao gồm các đối tượng được tham chiếu bởi mục lục"
-#: builtin/pack-objects.c:3423
+#: builtin/pack-objects.c:3543
msgid "output pack to stdout"
msgstr "xuất gói ra đầu ra tiêu chuẩn"
-#: builtin/pack-objects.c:3425
+#: builtin/pack-objects.c:3545
msgid "include tag objects that refer to objects to be packed"
msgstr "bao gồm các đối tượng tham chiếu đến các đối tượng được đóng gói"
-#: builtin/pack-objects.c:3427
+#: builtin/pack-objects.c:3547
msgid "keep unreachable objects"
msgstr "giữ lại các đối tượng không thể đọc được"
-#: builtin/pack-objects.c:3429
+#: builtin/pack-objects.c:3549
msgid "pack loose unreachable objects"
msgstr "pack mất các đối tượng không thể đọc được"
-#: builtin/pack-objects.c:3431
+#: builtin/pack-objects.c:3551
msgid "unpack unreachable objects newer than <time>"
msgstr ""
"xả nén (gỡ khỏi gói) các đối tượng không thể đọc được mới hơn <thời-gian>"
-#: builtin/pack-objects.c:3434
+#: builtin/pack-objects.c:3554
msgid "use the sparse reachability algorithm"
msgstr "sử dụng thuật toán “sparse reachability”"
-#: builtin/pack-objects.c:3436
+#: builtin/pack-objects.c:3556
msgid "create thin packs"
msgstr "tạo gói nhẹ"
-#: builtin/pack-objects.c:3438
+#: builtin/pack-objects.c:3558
msgid "create packs suitable for shallow fetches"
msgstr "tạo gói để phù hợp cho lấy về nông (shallow)"
-#: builtin/pack-objects.c:3440
+#: builtin/pack-objects.c:3560
msgid "ignore packs that have companion .keep file"
msgstr "bỏ qua các gói mà nó có tập tin .keep đi kèm"
-#: builtin/pack-objects.c:3442
+#: builtin/pack-objects.c:3562
msgid "ignore this pack"
msgstr "bỏ qua gói này"
-#: builtin/pack-objects.c:3444
+#: builtin/pack-objects.c:3564
msgid "pack compression level"
msgstr "mức nén gói"
-#: builtin/pack-objects.c:3446
+#: builtin/pack-objects.c:3566
msgid "do not hide commits by grafts"
msgstr "không ẩn các lần chuyển giao bởi “grafts”"
-#: builtin/pack-objects.c:3448
+#: builtin/pack-objects.c:3568
msgid "use a bitmap index if available to speed up counting objects"
msgstr "dùng mục lục ánh xạ nếu có thể được để nâng cao tốc độ đếm đối tượng"
-#: builtin/pack-objects.c:3450
+#: builtin/pack-objects.c:3570
msgid "write a bitmap index together with the pack index"
msgstr "ghi một mục lục ánh xạ cùng với mục lục gói"
-#: builtin/pack-objects.c:3454
+#: builtin/pack-objects.c:3574
msgid "write a bitmap index if possible"
msgstr "ghi mục lục ánh xạ nếu được"
-#: builtin/pack-objects.c:3458
+#: builtin/pack-objects.c:3578
msgid "handling for missing objects"
msgstr "xử lý cho thiếu đối tượng"
-#: builtin/pack-objects.c:3461
+#: builtin/pack-objects.c:3581
msgid "do not pack objects in promisor packfiles"
msgstr "không thể đóng gói các đối tượng trong các tập tin gói hứa hẹn"
-#: builtin/pack-objects.c:3463
+#: builtin/pack-objects.c:3583
msgid "respect islands during delta compression"
msgstr "tôn trọng island trong suốt quá trình nén “delta”"
-#: builtin/pack-objects.c:3492
+#: builtin/pack-objects.c:3585
+msgid "protocol"
+msgstr "giao thức"
+
+#: builtin/pack-objects.c:3586
+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:3617
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "mức sau xích delta %d là quá sâu, buộc dùng %d"
-#: builtin/pack-objects.c:3497
+#: builtin/pack-objects.c:3622
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "pack.deltaCacheLimit là quá cao, ép dùng %d"
-#: builtin/pack-objects.c:3551
+#: builtin/pack-objects.c:3676
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr ""
"--max-pack-size không thể được sử dụng để xây dựng một gói để vận chuyển"
-#: builtin/pack-objects.c:3553
+#: builtin/pack-objects.c:3678
msgid "minimum pack size limit is 1 MiB"
msgstr "giới hạn kích thước tối thiểu của gói là 1 MiB"
-#: builtin/pack-objects.c:3558
+#: builtin/pack-objects.c:3683
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin không thể được dùng để xây dựng gói đánh mục lục được"
-#: builtin/pack-objects.c:3561
+#: builtin/pack-objects.c:3686
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable và --unpack-unreachable xung khắc nhau"
-#: builtin/pack-objects.c:3567
+#: builtin/pack-objects.c:3692
msgid "cannot use --filter without --stdout"
msgstr "không thể dùng tùy chọn --filter mà không có --stdout"
-#: builtin/pack-objects.c:3627
+#: builtin/pack-objects.c:3752
msgid "Enumerating objects"
msgstr "Đánh số các đối tượng"
-#: builtin/pack-objects.c:3657
+#: builtin/pack-objects.c:3783
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -17447,6 +18750,20 @@
"Tổng %<PRIu32> (delta %<PRIu32>), dùng lại %<PRIu32> (delta %<PRIu32>), pack-"
"reused %<PRIu32>"
+#: builtin/pack-redundant.c:601
+msgid ""
+"'git pack-redundant' is nominated for removal.\n"
+"If you still use this command, please add an extra\n"
+"option, '--i-still-use-this', on the command line\n"
+"and let us know you still use it by sending an e-mail\n"
+"to <git@vger.kernel.org>. Thanks.\n"
+msgstr ""
+"'git pack-redundant' được đề cử để loại bỏ.\n"
+"Nếu bạn vẫn sử dụng lệnh này, vui lòng bổ sung\n"
+"thêm một tùy chọn, '--i-still-use-this', trên dòng lệnh\n"
+"và cho chúng tôi biết bạn vẫn sử dụng nó bằng cách gửi e-mail\n"
+"đến <git@vger.kernel.org>. Cảm ơn.\n"
+
#: builtin/pack-refs.c:8
msgid "git pack-refs [<options>]"
msgstr "git pack-refs [<các tùy chọn>]"
@@ -17459,31 +18776,27 @@
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"
@@ -17496,44 +18809,44 @@
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<các tùy chọn>] [<kho-chứa> [<refspec>…]]"
-#: builtin/pull.c:122
+#: builtin/pull.c: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:126
+#: 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:129
+#: 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:157 builtin/rebase.c:471 builtin/revert.c:126
+#: builtin/pull.c:158 builtin/rebase.c:492 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "cho phép chuyển-tiếp-nhanh"
-#: builtin/pull.c:166
-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:182
+#: 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:192
+#: 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:200
+#: 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:300
+#: 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:426
+#: builtin/pull.c:445
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -17541,14 +18854,14 @@
"Ở đây không có ứng cử nào để cải tổ lại trong số các tham chiếu mà bạn vừa "
"lấy về."
-#: builtin/pull.c:428
+#: builtin/pull.c:447
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"Ở đây không có ứng cử nào để hòa trộn trong số các tham chiếu mà bạn vừa lấy "
"về."
-#: builtin/pull.c:429
+#: builtin/pull.c:448
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -17557,7 +18870,7 @@
"tự\n"
"đại diện mà nó lại không khớp trên điểm cuối máy phục vụ."
-#: builtin/pull.c:432
+#: builtin/pull.c:451
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -17569,43 +18882,42 @@
"theo mặc định cho nhánh hiện tại của bạn, bạn phải chỉ định\n"
"một nhánh trên dòng lệnh."
-#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73
+#: builtin/pull.c:456 builtin/rebase.c:1253
msgid "You are not currently on a branch."
msgstr "Hiện tại bạn chẳng ở nhánh nào cả."
-#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79
+#: builtin/pull.c:458 builtin/pull.c:473
msgid "Please specify which branch you want to rebase against."
msgstr "Vui lòng chỉ định nhánh nào bạn muốn cải tổ lại."
-#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82
+#: builtin/pull.c:460 builtin/pull.c:475
msgid "Please specify which branch you want to merge with."
msgstr "Vui lòng chỉ định nhánh nào bạn muốn hòa trộn vào."
-#: builtin/pull.c:442 builtin/pull.c:457
+#: builtin/pull.c:461 builtin/pull.c:476
msgid "See git-pull(1) for details."
msgstr "Xem git-pull(1) để biết thêm chi tiết."
-#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459
-#: builtin/rebase.c:1415 git-parse-remote.sh:64
+#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
+#: builtin/rebase.c:1259
msgid "<remote>"
msgstr "<máy chủ>"
-#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464
-#: git-parse-remote.sh:65
+#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
msgid "<branch>"
msgstr "<nhánh>"
-#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75
+#: builtin/pull.c:471 builtin/rebase.c:1251
msgid "There is no tracking information for the current branch."
msgstr "Ở đây không có thông tin theo dõi cho nhánh hiện hành."
-#: builtin/pull.c:461 git-parse-remote.sh:95
+#: builtin/pull.c:480
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Nếu bạn muốn theo dõi thông tin cho nhánh này bạn có thể thực hiện bằng lệnh:"
-#: builtin/pull.c:466
+#: builtin/pull.c:485
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -17614,34 +18926,63 @@
"Các đặc tả cấu hình của bạn để hòa trộn với tham chiếu “%s”\n"
"từ máy dịch vụ, nhưng không có nhánh nào như thế được lấy về."
-#: builtin/pull.c:576
+#: builtin/pull.c:596
#, c-format
msgid "unable to access commit %s"
msgstr "không thể truy cập lần chuyển giao “%s”"
-#: builtin/pull.c:857
+#: builtin/pull.c:902
msgid "ignoring --verify-signatures for rebase"
msgstr "bỏ qua --verify-signatures khi rebase"
-#: builtin/pull.c:912
-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:930
+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:920
+#: builtin/pull.c:991
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
"Đang cập nhật một nhánh chưa được sinh ra với các thay đổi được thêm vào "
"bảng mục lục."
-#: builtin/pull.c:924
+#: builtin/pull.c:995
msgid "pull with rebase"
msgstr "pull với rebase"
-#: builtin/pull.c:925
+#: builtin/pull.c:996
msgid "please commit or stash them."
msgstr "xin hãy chuyển giao hoặc tạm cất (stash) chúng."
-#: builtin/pull.c:950
+#: builtin/pull.c:1021
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -17652,7 +18993,7 @@
"đang chuyển-tiếp-nhanh cây làm việc của bạn từ\n"
"lần chuyển giaot %s."
-#: builtin/pull.c:956
+#: builtin/pull.c:1027
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -17670,15 +19011,15 @@
"$ git reset --hard\n"
"để khôi phục lại."
-#: builtin/pull.c:971
+#: builtin/pull.c:1042
msgid "Cannot merge multiple branches into empty head."
msgstr "Không thể hòa trộn nhiều nhánh vào trong một head trống rỗng."
-#: builtin/pull.c:975
+#: builtin/pull.c:1046
msgid "Cannot rebase onto multiple branches."
msgstr "Không thể thực hiện lệnh rebase (cải tổ) trên nhiều nhánh."
-#: builtin/pull.c:982
+#: builtin/pull.c:1067
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"không thể cải tổ với các thay đổi mô-đun-con được ghi lại một cách cục bộ"
@@ -17687,15 +19028,15 @@
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<các tùy chọn>] [<kho-chứa> [<refspec>…]]"
-#: builtin/push.c:112
+#: builtin/push.c:111
msgid "tag shorthand without <tag>"
msgstr "dùng tốc ký thẻ không có <thẻ>"
-#: builtin/push.c:122
+#: builtin/push.c: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:168
+#: builtin/push.c:164
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -17704,7 +19045,7 @@
"Để chọn mỗi tùy chọn một cách cố định, xem push.default trong “git help "
"config”."
-#: builtin/push.c:171
+#: builtin/push.c:167
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -17729,7 +19070,7 @@
" git push %s HEAD\n"
"%s"
-#: builtin/push.c:186
+#: builtin/push.c:182
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -17744,7 +19085,7 @@
"\n"
" git push %s HEAD:<tên-của-nhánh-máy-chủ>\n"
-#: builtin/push.c:200
+#: builtin/push.c:194
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -17758,12 +19099,12 @@
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:208
+#: 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:211
+#: builtin/push.c:205
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -17775,14 +19116,14 @@
"nhánh hiện tại “%s” của bạn, mà không báo cho tôi biết là cái gì được push\n"
"để cập nhật nhánh máy chủ nào."
-#: builtin/push.c:270
+#: builtin/push.c: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:277
+#: 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"
@@ -17795,7 +19136,7 @@
"Xem “Note about fast-forwards” trong “git push --help” để có thông tin chi "
"tiết."
-#: builtin/push.c:283
+#: 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"
@@ -17809,7 +19150,7 @@
"Xem “Note about fast-forwards” trong “git push --help” để có thông tin chi "
"tiết."
-#: builtin/push.c:289
+#: 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"
@@ -17824,11 +19165,11 @@
"Xem “Note about fast-forwards” trong “git push --help” để có thông tin chi "
"tiết."
-#: builtin/push.c:296
+#: 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:299
+#: 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"
@@ -17840,99 +19181,115 @@
"đối tượng\n"
"không phải chuyển giao, mà không sử dụng tùy chọn “--force”.\n"
-#: builtin/push.c:360
+#: builtin/push.c:294
+msgid ""
+"Updates were rejected because the tip of the remote-tracking\n"
+"branch has been updated since the last checkout. You may want\n"
+"to integrate those changes locally (e.g., 'git pull ...')\n"
+"before forcing an update.\n"
+msgstr ""
+"Việc cập nhật bị từ chối bởi vì đầu mút của nhánh theo dõi máy chủ\n"
+"đã được cập nhật kể từ sau lần lấy ra cuối cùng. Bạn có lẽ muốn\n"
+"tích hợp các thay đổi này một cách cục bộ (v.d. \"git pull …\")\n"
+"trước khi ép buộc một cập nhật.\n"
+
+#: builtin/push.c:364
#, c-format
msgid "Pushing to %s\n"
msgstr "Đang đẩy lên %s\n"
-#: builtin/push.c:367
+#: builtin/push.c:371
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "gặp lỗi khi đẩy tới một số tham chiếu đến “%s”"
-#: builtin/push.c:542
+#: builtin/push.c:553
msgid "repository"
msgstr "kho"
-#: builtin/push.c:543 builtin/send-pack.c:164
+#: builtin/push.c:554 builtin/send-pack.c:189
msgid "push all refs"
msgstr "đẩy tất cả các tham chiếu"
-#: builtin/push.c:544 builtin/send-pack.c:166
+#: builtin/push.c:555 builtin/send-pack.c:191
msgid "mirror all refs"
msgstr "mirror tất cả các tham chiếu"
-#: builtin/push.c:546
+#: builtin/push.c:557
msgid "delete refs"
msgstr "xóa các tham chiếu"
-#: builtin/push.c:547
+#: builtin/push.c:558
msgid "push tags (can't be used with --all or --mirror)"
msgstr "đẩy các thẻ (không dùng cùng với --all hay --mirror)"
-#: builtin/push.c:550 builtin/send-pack.c:167
+#: builtin/push.c:561 builtin/send-pack.c:192
msgid "force updates"
msgstr "ép buộc cập nhật"
-#: builtin/push.c:552 builtin/send-pack.c:181
+#: builtin/push.c:562 builtin/send-pack.c:204
msgid "<refname>:<expect>"
msgstr "<tên-tham-chiếu>:<cần>"
-#: builtin/push.c:553 builtin/send-pack.c:182
+#: builtin/push.c:563 builtin/send-pack.c:205
msgid "require old value of ref to be at this value"
msgstr "yêu cầu giá-trị cũ của tham chiếu thì là giá-trị này"
-#: builtin/push.c:556
+#: builtin/push.c:566 builtin/send-pack.c:208
+msgid "require remote updates to be integrated locally"
+msgstr "yêu cầu máy chủ cập nhật để thích hợp với máy cục bộ"
+
+#: builtin/push.c:569
msgid "control recursive pushing of submodules"
msgstr "điều khiển việc đẩy lên (push) đệ qui của mô-đun-con"
-#: builtin/push.c:558 builtin/send-pack.c:175
+#: builtin/push.c:570 builtin/send-pack.c:199
msgid "use thin pack"
msgstr "tạo gói nhẹ"
-#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161
-#: builtin/send-pack.c:162
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
+#: builtin/send-pack.c:187
msgid "receive pack program"
msgstr "chương trình nhận gói"
-#: builtin/push.c:561
+#: builtin/push.c:573
msgid "set upstream for git pull/status"
msgstr "đặt thượng nguồn cho git pull/status"
-#: builtin/push.c:564
+#: builtin/push.c:576
msgid "prune locally removed refs"
msgstr "xén tỉa những tham chiếu bị gỡ bỏ"
-#: builtin/push.c:566
+#: builtin/push.c:578
msgid "bypass pre-push hook"
msgstr "vòng qua móc tiền-đẩy (pre-push)"
-#: builtin/push.c:567
+#: builtin/push.c:579
msgid "push missing but relevant tags"
msgstr "push phần bị thiếu nhưng các thẻ lại thích hợp"
-#: builtin/push.c:570 builtin/send-pack.c:169
+#: builtin/push.c:581 builtin/send-pack.c:193
msgid "GPG sign the push"
msgstr "ký lần đẩy dùng GPG"
-#: builtin/push.c:572 builtin/send-pack.c:176
+#: builtin/push.c:583 builtin/send-pack.c:200
msgid "request atomic transaction on remote side"
msgstr "yêu cầu giao dịch hạt nhân bên phía máy chủ"
-#: builtin/push.c:590
+#: builtin/push.c:601
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete là xung khắc với các tùy chọn --all, --mirror và --tags"
-#: builtin/push.c:592
+#: builtin/push.c:603
msgid "--delete doesn't make sense without any refs"
msgstr "--delete không hợp lý nếu không có bất kỳ tham chiếu nào"
-#: builtin/push.c:612
+#: builtin/push.c:623
#, c-format
msgid "bad repository '%s'"
msgstr "repository (kho) sai “%s”"
-#: builtin/push.c:613
+#: builtin/push.c:624
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -17953,69 +19310,77 @@
"\n"
" git push <tên>\n"
-#: builtin/push.c:628
+#: builtin/push.c:639
msgid "--all and --tags are incompatible"
msgstr "--all và --tags xung khắc nhau"
-#: builtin/push.c:630
+#: builtin/push.c:641
msgid "--all can't be combined with refspecs"
msgstr "--all không thể được tổ hợp cùng với đặc tả đường dẫn"
-#: builtin/push.c:634
+#: builtin/push.c:645
msgid "--mirror and --tags are incompatible"
msgstr "--mirror và --tags xung khắc nhau"
-#: builtin/push.c:636
+#: builtin/push.c:647
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror không thể được tổ hợp cùng với đặc tả đường dẫn"
-#: builtin/push.c:639
+#: builtin/push.c:650
msgid "--all and --mirror are incompatible"
msgstr "--all và --mirror xung khắc nhau"
-#: builtin/push.c:643
+#: builtin/push.c:657
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"
-#: builtin/range-diff.c:8
+#: builtin/range-diff.c:9
msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
msgstr ""
"git range-diff [<các tùy chọn>] <old-base>..<old-tip> <new-base>..<new-tip>"
-#: builtin/range-diff.c:9
+#: builtin/range-diff.c:10
msgid "git range-diff [<options>] <old-tip>...<new-tip>"
msgstr "git range-diff [<các tùy chọn>] <old-tip>…<new-tip>"
-#: builtin/range-diff.c:10
+#: builtin/range-diff.c:11
msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
msgstr "git range-diff [<các tùy chọn>] <base> <old-tip> <new-tip>"
-#: builtin/range-diff.c:22
+#: builtin/range-diff.c:28
msgid "Percentage by which creation is weighted"
msgstr "Tỷ lệ phần trăm cái tạo là weighted"
-#: builtin/range-diff.c:24
+#: builtin/range-diff.c:30
msgid "use simple diff colors"
msgstr "dùng màu diff đơn giản"
-#: builtin/range-diff.c:26
+#: builtin/range-diff.c:32
msgid "notes"
msgstr "ghi chú"
-#: builtin/range-diff.c:26
+#: builtin/range-diff.c:32
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:35
+msgid "only emit output related to the first range"
+msgstr "chỉ phát ra kết xuất liên quan đến vùng đầu tiên"
-#: builtin/range-diff.c:64
+#: builtin/range-diff.c:37
+msgid "only emit output related to the second range"
+msgstr "chỉ phát ra kết xuất liên quan đến vùng thứ hai"
+
+#: builtin/range-diff.c:60 builtin/range-diff.c:64
+#, c-format
+msgid "not a commit range: '%s'"
+msgstr "không phải là vùng chuyển giao: “%s”"
+
+#: builtin/range-diff.c:74
msgid "single arg format must be symmetric range"
msgstr "định dạng đối số đơn phải là một vùng đối xứng"
-#: builtin/range-diff.c:79
+#: builtin/range-diff.c:89
msgid "need two commit ranges"
msgstr "cần hai vùng lần chuyển giao"
@@ -18103,7 +19468,7 @@
msgid "You need to resolve your current index first"
msgstr "Bạn cần phải giải quyết bảng mục lục hiện tại của bạn trước đã"
-#: builtin/rebase.c:32
+#: builtin/rebase.c:35
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
"[<upstream> [<branch>]]"
@@ -18111,218 +19476,204 @@
"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:175 builtin/rebase.c:199 builtin/rebase.c:226
+#: builtin/rebase.c:195 builtin/rebase.c:219 builtin/rebase.c:246
#, c-format
msgid "unusable todo list: '%s'"
msgstr "danh sách cần làm không dùng được: “%s”"
-#: builtin/rebase.c:292
+#: builtin/rebase.c:312
#, c-format
msgid "could not create temporary %s"
msgstr "không thể tạo %s tạm thời"
-#: builtin/rebase.c:298
+#: builtin/rebase.c:318
msgid "could not mark as interactive"
msgstr "không thể đánh dấu là tương tác"
-#: builtin/rebase.c:352
+#: builtin/rebase.c:371
msgid "could not generate todo list"
msgstr "không thể tạo danh sách cần làm"
-#: builtin/rebase.c:391
+#: builtin/rebase.c:413
msgid "a base commit must be provided with --upstream or --onto"
msgstr "lần chuyển giao cơ sỏ phải được chỉ định với --upstream hoặc --onto"
-#: builtin/rebase.c:461
+#: builtin/rebase.c:482
msgid "git rebase--interactive [<options>]"
msgstr "git rebase--interactive [<các tùy chọn>]"
-#: builtin/rebase.c:474 builtin/rebase.c:1550
-msgid "(DEPRECATED) keep empty commits"
-msgstr "(CŨ) giữ lại các lần chuyển giao rỗng"
+#: builtin/rebase.c:495 builtin/rebase.c:1394
+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:478 builtin/revert.c:128
+#: builtin/rebase.c:499 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr "chấp nhận chuyển giao mà không ghi chú gì"
-#: builtin/rebase.c:480
+#: builtin/rebase.c:501
msgid "rebase merge commits"
msgstr "cải tổ các lần chuyển giao hòa trộn"
-#: builtin/rebase.c:482
+#: builtin/rebase.c:503
msgid "keep original branch points of cousins"
msgstr "giữ các điểm nhánh nguyên bản của các anh em họ"
-#: builtin/rebase.c:484
+#: builtin/rebase.c:505
msgid "move commits that begin with squash!/fixup!"
msgstr "di chuyển các lần chuyển giao bắt đầu bằng squash!/fixup!"
-#: builtin/rebase.c:485
+#: builtin/rebase.c:506
msgid "sign commits"
msgstr "ký các lần chuyển giao"
-#: builtin/rebase.c:487 builtin/rebase.c:1490
+#: builtin/rebase.c:508 builtin/rebase.c:1333
msgid "display a diffstat of what changed upstream"
msgstr "hiển thị một diffstat của những thay đổi thượng nguồn"
-#: builtin/rebase.c:489
+#: builtin/rebase.c:510
msgid "continue rebase"
msgstr "tiếp tục cải tổ"
-#: builtin/rebase.c:491
+#: builtin/rebase.c:512
msgid "skip commit"
msgstr "bỏ qua lần chuyển giao"
-#: builtin/rebase.c:492
+#: builtin/rebase.c:513
msgid "edit the todo list"
msgstr "sửa danh sách cần làm"
-#: builtin/rebase.c:494
+#: builtin/rebase.c:515
msgid "show the current patch"
msgstr "hiển thị miếng vá hiện hành"
-#: builtin/rebase.c:497
+#: builtin/rebase.c:518
msgid "shorten commit ids in the todo list"
msgstr "rút ngắn mã chuyển giao trong danh sách cần làm"
-#: builtin/rebase.c:499
+#: builtin/rebase.c:520
msgid "expand commit ids in the todo list"
msgstr "khai triển mã chuyển giao trong danh sách cần làm"
-#: builtin/rebase.c:501
+#: builtin/rebase.c:522
msgid "check the todo list"
msgstr "kiểm tra danh sách cần làm"
-#: builtin/rebase.c:503
+#: builtin/rebase.c:524
msgid "rearrange fixup/squash lines"
msgstr "sắp xếp lại các dòng fixup/squash"
-#: builtin/rebase.c:505
+#: builtin/rebase.c:526
msgid "insert exec commands in todo list"
msgstr "chèn các lệnh thực thi trong danh sách cần làm"
-#: builtin/rebase.c:506
+#: builtin/rebase.c:527
msgid "onto"
msgstr "lên trên"
-#: builtin/rebase.c:509
+#: builtin/rebase.c:530
msgid "restrict-revision"
msgstr "điểm-xét-duyệt-hạn-chế"
-#: builtin/rebase.c:509
+#: builtin/rebase.c:530
msgid "restrict revision"
msgstr "điểm xét duyệt hạn chế"
-#: builtin/rebase.c:511
+#: builtin/rebase.c:532
msgid "squash-onto"
msgstr "squash-lên-trên"
-#: builtin/rebase.c:512
+#: builtin/rebase.c:533
msgid "squash onto"
msgstr "squash lên trên"
-#: builtin/rebase.c:514
+#: builtin/rebase.c:535
msgid "the upstream commit"
msgstr "lần chuyển giao thượng nguồn"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:537
msgid "head-name"
msgstr "tên-đầu"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:537
msgid "head name"
msgstr "tên đầu"
-#: builtin/rebase.c:521
+#: builtin/rebase.c:542
msgid "rebase strategy"
msgstr "chiến lược cải tổ"
-#: builtin/rebase.c:522
+#: builtin/rebase.c:543
msgid "strategy-opts"
msgstr "tùy-chọn-chiến-lược"
-#: builtin/rebase.c:523
+#: builtin/rebase.c:544
msgid "strategy options"
msgstr "các tùy chọn chiến lược"
-#: builtin/rebase.c:524
+#: builtin/rebase.c:545
msgid "switch-to"
msgstr "chuyển-đến"
-#: builtin/rebase.c:525
+#: builtin/rebase.c:546
msgid "the branch or commit to checkout"
msgstr "nhánh hay lần chuyển giao lần lấy ra"
-#: builtin/rebase.c:526
+#: builtin/rebase.c:547
msgid "onto-name"
msgstr "onto-name"
-#: builtin/rebase.c:526
+#: builtin/rebase.c:547
msgid "onto name"
msgstr "tên lên trên"
-#: builtin/rebase.c:527
+#: builtin/rebase.c:548
msgid "cmd"
msgstr "lệnh"
-#: builtin/rebase.c:527
+#: builtin/rebase.c:548
msgid "the command to run"
msgstr "lệnh muốn chạy"
-#: builtin/rebase.c:530 builtin/rebase.c:1584
+#: builtin/rebase.c:551 builtin/rebase.c:1427
msgid "automatically re-schedule any `exec` that fails"
msgstr "lập lịch lại một cách tự động bất kỳ “exec“ bị lỗi"
-#: builtin/rebase.c:546
+#: builtin/rebase.c:567
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr "--[no-]rebase-cousins không có tác dụng khi không có --rebase-merges"
-#: builtin/rebase.c:562
+#: builtin/rebase.c:583
#, 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:612
+#: builtin/rebase.c:626
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "không thể đặt lấy “onto”: “%s”"
-#: builtin/rebase.c:627
+#: builtin/rebase.c:643
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "orig-head không hợp lệ: “%s”"
-#: builtin/rebase.c:652
+#: builtin/rebase.c:668
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "đang bỏ qua allow_rerere_autoupdate không hợp lệ: “%s”"
-#: builtin/rebase.c:728
-#, c-format
-msgid "Could not read '%s'"
-msgstr "Không thể đọc “%s”"
-
-#: builtin/rebase.c:746
-#, c-format
-msgid "Cannot store %s"
-msgstr "Không thể lưu “%s”"
-
-#: builtin/rebase.c:853
-msgid "could not determine HEAD revision"
-msgstr "không thể dò tìm điểm xét duyệt HEAD"
-
-#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -18337,7 +19688,7 @@
"Để bãi bỏ và quay trở lại trạng thái trước \"git rebase\", chạy \"git rebase "
"--abort\"."
-#: builtin/rebase.c:1058
+#: builtin/rebase.c:896
#, c-format
msgid ""
"\n"
@@ -18356,16 +19707,16 @@
"\n"
"Kết quả là git không thể cải tổ lại chúng."
-#: builtin/rebase.c:1383
+#: builtin/rebase.c:1227
#, 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\", "
+"kiểu rỗng không được nhận dạng “%s”; giá trị hợp lệ là \"drop\", \"keep\", "
"và \"ask\"."
-#: builtin/rebase.c:1401
+#: builtin/rebase.c:1245
#, c-format
msgid ""
"%s\n"
@@ -18382,7 +19733,7 @@
" git rebase “<nhánh>”\n"
"\n"
-#: builtin/rebase.c:1417
+#: builtin/rebase.c:1261
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -18396,137 +19747,150 @@
" git branch --set-upstream-to=%s/<nhánh> %s\n"
"\n"
-#: builtin/rebase.c:1447
+#: builtin/rebase.c:1291
msgid "exec commands cannot contain newlines"
msgstr "các lệnh thực thi không thể chứa các ký tự dòng mới"
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1295
msgid "empty exec command"
msgstr "lệnh thực thi trống rỗng"
-#: builtin/rebase.c:1481
+#: builtin/rebase.c:1324
msgid "rebase onto given branch instead of upstream"
msgstr "cải tổ vào nhánh đã cho thay cho thượng nguồn"
-#: builtin/rebase.c:1483
+#: builtin/rebase.c:1326
msgid "use the merge-base of upstream and branch as the current base"
msgstr ""
"sử dụng các cơ sở hòa trộn của thượng nguồn và nhánh như là cơ sở hiện tại"
-#: builtin/rebase.c:1485
+#: builtin/rebase.c:1328
msgid "allow pre-rebase hook to run"
msgstr "cho phép móc (hook) pre-rebase được chạy"
-#: builtin/rebase.c:1487
+#: builtin/rebase.c:1330
msgid "be quiet. implies --no-stat"
msgstr "hãy im lặng. ý là --no-stat"
-#: builtin/rebase.c:1493
+#: builtin/rebase.c:1336
msgid "do not show diffstat of what changed upstream"
msgstr "đừng hiển thị diffstat của những thay đổi thượng nguồn"
-#: builtin/rebase.c:1496
-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:1339
+msgid "add a Signed-off-by trailer to each commit"
+msgstr "thêm dòng Signed-off-by vào cuối cho từng lần chuyển giao"
-#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504
-msgid "passed to 'git am'"
-msgstr "chuyển cho “git am”"
+#: builtin/rebase.c:1342
+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:1506 builtin/rebase.c:1508
+#: builtin/rebase.c:1344
+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:1346
+msgid "synonym of --reset-author-date"
+msgstr "đồng nghĩa với --reset-author-date"
+
+#: builtin/rebase.c:1348 builtin/rebase.c:1352
msgid "passed to 'git apply'"
msgstr "chuyển cho “git apply”"
-#: builtin/rebase.c:1510 builtin/rebase.c:1513
+#: builtin/rebase.c:1350
+msgid "ignore changes in whitespace"
+msgstr "lờ đi sự thay đổi do khoảng trắng gây ra"
+
+#: builtin/rebase.c:1354 builtin/rebase.c:1357
msgid "cherry-pick all commits, even if unchanged"
msgstr ""
"cherry-pick tất cả các lần chuyển giao, ngay cả khi không có thay đổi gì"
-#: builtin/rebase.c:1515
+#: builtin/rebase.c:1359
msgid "continue"
msgstr "tiếp tục"
-#: builtin/rebase.c:1518
+#: builtin/rebase.c:1362
msgid "skip current patch and continue"
msgstr "bỏ qua miếng vá hiện hành và tiếp tục"
-#: builtin/rebase.c:1520
+#: builtin/rebase.c:1364
msgid "abort and check out the original branch"
msgstr "bãi bỏ và lấy ra nhánh nguyên thủy"
-#: builtin/rebase.c:1523
+#: builtin/rebase.c:1367
msgid "abort but keep HEAD where it is"
msgstr "bãi bỏ nhưng vẫn vẫn giữ HEAD chỉ đến nó"
-#: builtin/rebase.c:1524
+#: builtin/rebase.c:1368
msgid "edit the todo list during an interactive rebase"
msgstr "sửa danh sách cần làm trong quá trình “rebase” (cải tổ) tương tác"
-#: builtin/rebase.c:1527
+#: builtin/rebase.c:1371
msgid "show the patch file being applied or merged"
msgstr "hiển thị miếng vá đã được áp dụng hay hòa trộn"
-#: builtin/rebase.c:1530
+#: builtin/rebase.c:1374
msgid "use apply strategies to rebase"
msgstr "dùng chiến lược áp dụng để cải tổ"
-#: builtin/rebase.c:1534
+#: builtin/rebase.c:1378
msgid "use merging strategies to rebase"
msgstr "dùng chiến lược hòa trộn để cải tổ"
-#: builtin/rebase.c:1538
+#: builtin/rebase.c:1382
msgid "let the user edit the list of commits to rebase"
msgstr "để người dùng sửa danh sách các lần chuyển giao muốn cải tổ"
-#: builtin/rebase.c:1542
+#: builtin/rebase.c:1386
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "(ĐÃ LẠC HẬU) hay thử tạo lại các hòa trộn thay vì bỏ qua chúng"
-#: builtin/rebase.c:1547
+#: builtin/rebase.c:1391
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:1554
+#: builtin/rebase.c:1398
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "di chuyển các lần chuyển giao mà bắt đầu bằng squash!/fixup! dưới -i"
-#: builtin/rebase.c:1560
-msgid "automatically stash/stash pop before and after"
-msgstr "tự động stash/stash pop trước và sau"
-
-#: builtin/rebase.c:1562
+#: builtin/rebase.c:1405
msgid "add exec lines after each commit of the editable list"
msgstr "thêm các dòng thực thi sau từng lần chuyển giao của danh sách sửa được"
-#: builtin/rebase.c:1566
+#: builtin/rebase.c:1409
msgid "allow rebasing commits with empty messages"
msgstr "chấp nhận cải tổ các chuyển giao mà không ghi chú gì"
-#: builtin/rebase.c:1570
+#: builtin/rebase.c:1413
msgid "try to rebase merges instead of skipping them"
msgstr "cố thử cải tổ các hòa trộn thay vì bỏ qua chúng"
-#: builtin/rebase.c:1573
+#: builtin/rebase.c:1416
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "dùng “merge-base --fork-point” để định nghĩa lại thượng nguồn"
-#: builtin/rebase.c:1575
+#: builtin/rebase.c:1418
msgid "use the given merge strategy"
msgstr "dùng chiến lược hòa trộn đã cho"
-#: builtin/rebase.c:1577 builtin/revert.c:115
+#: builtin/rebase.c:1420 builtin/revert.c:115
msgid "option"
msgstr "tùy chọn"
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1421
msgid "pass the argument through to the merge strategy"
msgstr "chuyển thao số đến chiến lược hòa trộn"
-#: builtin/rebase.c:1581
+#: builtin/rebase.c:1424
msgid "rebase all reachable commits up to the root(s)"
msgstr "cải tổ tất các các lần chuyển giao cho đến root"
-#: builtin/rebase.c:1598
+#: builtin/rebase.c:1429
+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:1446
msgid ""
"the rebase.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
@@ -18534,41 +19898,45 @@
"việc hỗ trợ rebase.useBuiltin đã bị xóa!\n"
"Xem mục tin của nó trong “ git help config” để biết chi tiết."
-#: builtin/rebase.c:1604
+#: builtin/rebase.c:1452
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr ""
"Hình như đang trong quá trình thực hiện lệnh “git-am”. Không thể rebase."
-#: builtin/rebase.c:1645
+#: builtin/rebase.c:1493
msgid ""
"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr ""
"git rebase --preserve-merges đã lạc hậu. Hãy dùng --rebase-merges để thay "
"thế."
-#: builtin/rebase.c:1650
+#: builtin/rebase.c:1498
msgid "cannot combine '--keep-base' with '--onto'"
msgstr "không thể kết hợp “--keep-base” với “--onto”"
-#: builtin/rebase.c:1652
+#: builtin/rebase.c:1500
msgid "cannot combine '--keep-base' with '--root'"
msgstr "không thể kết hợp “--keep-base” với “--root”"
-#: builtin/rebase.c:1656
+#: builtin/rebase.c:1504
+msgid "cannot combine '--root' with '--fork-point'"
+msgstr "không thể kết hợp “--root” với “--fork-point”"
+
+#: builtin/rebase.c:1507
msgid "No rebase in progress?"
msgstr "Không có tiến trình rebase nào phải không?"
-#: builtin/rebase.c:1660
+#: builtin/rebase.c:1511
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"Hành động “--edit-todo” chỉ có thể dùng trong quá trình “rebase” (sửa lịch "
"sử) tương tác."
-#: builtin/rebase.c:1683
+#: builtin/rebase.c:1534 t/helper/test-fast-rebase.c:123
msgid "Cannot read HEAD"
msgstr "Không thể đọc HEAD"
-#: builtin/rebase.c:1695
+#: builtin/rebase.c:1546
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -18576,16 +19944,16 @@
"Bạn phải sửa tất cả các lần hòa trộn xung đột và sau\n"
"đó đánh dấu chúng là cần xử lý sử dụng lệnh git add"
-#: builtin/rebase.c:1714
+#: builtin/rebase.c:1565
msgid "could not discard worktree changes"
msgstr "không thể loại bỏ các thay đổi cây-làm-việc"
-#: builtin/rebase.c:1733
+#: builtin/rebase.c:1584
#, c-format
msgid "could not move back to %s"
msgstr "không thể quay trở lại %s"
-#: builtin/rebase.c:1778
+#: builtin/rebase.c:1630
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -18606,164 +19974,141 @@
"và chạy TÔI lần nữa. TÔI dừng lại trong trường hợp bạn vẫn\n"
"có một số thứ quý giá ở đây.\n"
-#: builtin/rebase.c:1806
+#: builtin/rebase.c:1658
msgid "switch `C' expects a numerical value"
msgstr "tùy chọn “%c” cần một giá trị bằng số"
-#: builtin/rebase.c:1847
+#: builtin/rebase.c:1700
#, c-format
msgid "Unknown mode: %s"
msgstr "Không hiểu chế độ: %s"
-#: builtin/rebase.c:1869
+#: builtin/rebase.c:1739
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy cần --merge hay --interactive"
-#: builtin/rebase.c:1899
+#: builtin/rebase.c:1769
msgid "cannot combine apply options with merge options"
msgstr "không thể tổ hợp các tùy chọn áp dụng với các tùy chọn hòa trộn"
-#: builtin/rebase.c:1912
+#: builtin/rebase.c:1782
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "Không hiểu ứng dụng chạy phía sau lệnh cải tổ: %s"
-#: builtin/rebase.c:1937
+#: builtin/rebase.c:1812
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec cần --exec hay --interactive"
-#: builtin/rebase.c:1957
+#: builtin/rebase.c:1832
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr "không thể kết hợp “--preserve-merges” với “--rebase-merges”"
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1836
msgid ""
"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr "không thể kết hợp “--preserve-merges” với “--reschedule-failed-exec”"
-#: builtin/rebase.c:1985
+#: builtin/rebase.c:1860
#, c-format
msgid "invalid upstream '%s'"
msgstr "thượng nguồn không hợp lệ “%s”"
-#: builtin/rebase.c:1991
+#: builtin/rebase.c:1866
msgid "Could not create new root commit"
msgstr "Không thể tạo lần chuyển giao gốc mới"
-#: builtin/rebase.c:2017
+#: builtin/rebase.c:1892
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "“%s”: cần chính xác một cơ sở hòa trộn với nhánh"
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1895
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "“%s”: cần chính xác một cơ sở hòa trộn"
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1903
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "Không chỉ đến một lần chuyển giao không hợp lệ “%s”"
-#: builtin/rebase.c:2054
+#: builtin/rebase.c:1931
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "nghiêm trọng: không có nhánh/lần chuyển giao “%s” như thế"
-#: builtin/rebase.c:2062 builtin/submodule--helper.c:40
-#: builtin/submodule--helper.c:1990
+#: builtin/rebase.c:1939 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:2073
+#: builtin/rebase.c:1950
msgid "Could not resolve HEAD to a revision"
msgstr "Không thể phân giải lần chuyển giao HEAD đến một điểm xét duyệt"
-#: builtin/rebase.c:2111
-msgid "Cannot autostash"
-msgstr "Không thể autostash"
-
-#: builtin/rebase.c:2114
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr "Gặp đáp ứng stash không cần: “%s”"
-
-#: builtin/rebase.c:2120
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr "Không thể tạo thư mục cho “%s”"
-
-#: builtin/rebase.c:2123
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr "Đã tạo autostash: %s\n"
-
-#: builtin/rebase.c:2126
-msgid "could not reset --hard"
-msgstr "không thể reset --hard"
-
-#: builtin/rebase.c:2135
+#: builtin/rebase.c:1971
msgid "Please commit or stash them."
msgstr "Xin hãy chuyển giao hoặc tạm cất (stash) chúng."
-#: builtin/rebase.c:2169
+#: builtin/rebase.c:2007
#, c-format
msgid "could not switch to %s"
msgstr "không thể chuyển đến %s"
-#: builtin/rebase.c:2180
+#: builtin/rebase.c:2018
msgid "HEAD is up to date."
msgstr "HEAD đã cập nhật."
-#: builtin/rebase.c:2182
+#: builtin/rebase.c:2020
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "Nhánh hiện tại %s đã được cập nhật rồi.\n"
-#: builtin/rebase.c:2190
+#: builtin/rebase.c:2028
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD hiện đã được cập nhật rồi, bị ép buộc rebase."
-#: builtin/rebase.c:2192
+#: builtin/rebase.c:2030
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "Nhánh hiện tại %s đã được cập nhật rồi, lệnh rebase ép buộc.\n"
-#: builtin/rebase.c:2200
+#: builtin/rebase.c:2038
msgid "The pre-rebase hook refused to rebase."
msgstr "Móc (hook) pre-rebase từ chối rebase."
-#: builtin/rebase.c:2207
+#: builtin/rebase.c:2045
#, c-format
msgid "Changes to %s:\n"
msgstr "Thay đổi thành %s:\n"
-#: builtin/rebase.c:2210
+#: builtin/rebase.c:2048
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "Thay đổi từ %s thành %s:\n"
-#: builtin/rebase.c:2235
+#: builtin/rebase.c:2073
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr ""
"Trước tiên, di chuyển head để xem lại các công việc trên đỉnh của nó…\n"
-#: builtin/rebase.c:2244
+#: builtin/rebase.c:2082
msgid "Could not detach HEAD"
msgstr "Không thể tách rời HEAD"
-#: builtin/rebase.c:2253
+#: builtin/rebase.c:2091
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "Chuyển-tiếp-nhanh %s đến %s.\n"
-#: builtin/receive-pack.c:33
+#: builtin/receive-pack.c:34
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <thư-mục-git>"
-#: builtin/receive-pack.c:821
+#: builtin/receive-pack.c:1276
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
@@ -18793,7 +20138,7 @@
"Để chấm dứt lời nhắn này và vẫn giữ cách ứng xử mặc định, hãy đặt\n"
"biến cấu hình “receive.denyCurrentBranch” thành “refuse”."
-#: builtin/receive-pack.c:841
+#: builtin/receive-pack.c:1296
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"
@@ -18814,11 +20159,11 @@
"\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:2481
msgid "quiet"
msgstr "im lặng"
-#: builtin/receive-pack.c:1952
+#: builtin/receive-pack.c:2495
msgid "You must specify a directory."
msgstr "Bạn phải chỉ định thư mục."
@@ -18849,36 +20194,36 @@
msgid "'%s' is not a valid timestamp"
msgstr "“%s” không phải là dấu thời gian hợp lệ"
-#: builtin/reflog.c:606
+#: builtin/reflog.c:609
#, c-format
msgid "Marking reachable objects..."
msgstr "Đánh dấu các đối tượng tiếp cận được…"
-#: builtin/reflog.c:644
+#: builtin/reflog.c:647
#, c-format
msgid "%s points nowhere!"
msgstr "%s chẳng chỉ đến đâu cả!"
-#: builtin/reflog.c:696
+#: builtin/reflog.c:699
msgid "no reflog specified to delete"
msgstr "chưa chỉ ra reflog để xóa"
-#: builtin/reflog.c:705
+#: builtin/reflog.c:708
#, c-format
msgid "not a reflog: %s"
msgstr "không phải một reflog: %s"
-#: builtin/reflog.c:710
+#: builtin/reflog.c:713
#, c-format
msgid "no reflog for '%s'"
msgstr "không reflog cho “%s”"
-#: builtin/reflog.c:756
+#: builtin/reflog.c:759
#, c-format
msgid "invalid ref format: %s"
msgstr "định dạng tham chiếu không hợp lệ: %s"
-#: builtin/reflog.c:765
+#: builtin/reflog.c:768
msgid "git reflog [ show | expire | delete | exists ]"
msgstr "git reflog [ show | expire | delete | exists ]"
@@ -19014,40 +20359,35 @@
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "chỉ định những nhánh để theo dõi chỉ hợp lý với các “fetch mirror”"
-#: builtin/remote.c:195 builtin/remote.c:696
+#: builtin/remote.c:195 builtin/remote.c:700
#, c-format
msgid "remote %s already exists."
msgstr "máy chủ %s đã tồn tại rồi."
-#: builtin/remote.c:199 builtin/remote.c:700
-#, c-format
-msgid "'%s' is not a valid remote name"
-msgstr "“%s” không phải tên máy chủ hợp lệ"
-
-#: builtin/remote.c:239
+#: builtin/remote.c:240
#, c-format
msgid "Could not setup master '%s'"
msgstr "Không thể cài đặt nhánh master “%s”"
-#: builtin/remote.c:354
+#: builtin/remote.c:355
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "Không thể lấy ánh xạ (map) fetch cho đặc tả tham chiếu %s"
-#: builtin/remote.c:453 builtin/remote.c:461
+#: builtin/remote.c:454 builtin/remote.c:462
msgid "(matching)"
msgstr "(khớp)"
-#: builtin/remote.c:465
+#: builtin/remote.c:466
msgid "(delete)"
msgstr "(xóa)"
-#: builtin/remote.c:653
+#: builtin/remote.c:655
#, c-format
msgid "could not set '%s'"
msgstr "không thể đặt “%s”"
-#: builtin/remote.c:658
+#: builtin/remote.c:660
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
@@ -19056,19 +20396,19 @@
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'"
+"bây giờ tên trên máy chủ không tồn tại “%s”"
-#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940
+#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946
#, c-format
msgid "No such remote: '%s'"
msgstr "Không có máy chủ nào như vậy: “%s”"
-#: builtin/remote.c:706
+#: builtin/remote.c:710
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Không thể đổi tên phần của cấu hình từ “%s” thành “%s”"
-#: builtin/remote.c:726
+#: builtin/remote.c:730
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -19079,17 +20419,17 @@
"\t%s\n"
"\tXin hãy cập nhật phần cấu hình một cách thủ công nếu thấy cần thiết."
-#: builtin/remote.c:766
+#: builtin/remote.c:770
#, c-format
msgid "deleting '%s' failed"
msgstr "gặp lỗi khi xóa “%s”"
-#: builtin/remote.c:800
+#: builtin/remote.c:804
#, c-format
msgid "creating '%s' failed"
msgstr "gặp lỗi khi tạo “%s”"
-#: builtin/remote.c:876
+#: builtin/remote.c:882
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -19101,119 +20441,119 @@
"đi;\n"
"để xóa đi, sử dụng:"
-#: builtin/remote.c:890
+#: builtin/remote.c:896
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Không thể gỡ bỏ phần cấu hình “%s”"
-#: builtin/remote.c:993
+#: builtin/remote.c:999
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " mới (lần lấy về tiếp theo sẽ lưu trong remotes/%s)"
-#: builtin/remote.c:996
+#: builtin/remote.c:1002
msgid " tracked"
msgstr " được theo dõi"
-#: builtin/remote.c:998
+#: builtin/remote.c:1004
msgid " stale (use 'git remote prune' to remove)"
msgstr " cũ rích (dùng “git remote prune” để gỡ bỏ)"
-#: builtin/remote.c:1000
+#: builtin/remote.c:1006
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:1041
+#: builtin/remote.c:1047
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "branch.%s.merge không hợp lệ; không thể cải tổ về phía > 1 nhánh"
-#: builtin/remote.c:1050
+#: builtin/remote.c:1056
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "thực hiện rebase một cách tương tác trên máy chủ %s"
-#: builtin/remote.c:1052
+#: builtin/remote.c:1058
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr ""
"thực hiện cải tổ (với các hòa trộn) một cách tương tác lên trên máy chủ %s"
-#: builtin/remote.c:1055
+#: builtin/remote.c:1061
#, c-format
msgid "rebases onto remote %s"
msgstr "thực hiện rebase trên máy chủ %s"
-#: builtin/remote.c:1059
+#: builtin/remote.c:1065
#, c-format
msgid " merges with remote %s"
msgstr " hòa trộn với máy chủ %s"
-#: builtin/remote.c:1062
+#: builtin/remote.c:1068
#, c-format
msgid "merges with remote %s"
msgstr "hòa trộn với máy chủ %s"
-#: builtin/remote.c:1065
+#: builtin/remote.c:1071
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s và với máy chủ %s\n"
-#: builtin/remote.c:1108
+#: builtin/remote.c:1114
msgid "create"
msgstr "tạo"
-#: builtin/remote.c:1111
+#: builtin/remote.c:1117
msgid "delete"
msgstr "xóa"
-#: builtin/remote.c:1115
+#: builtin/remote.c:1121
msgid "up to date"
msgstr "đã cập nhật"
-#: builtin/remote.c:1118
+#: builtin/remote.c:1124
msgid "fast-forwardable"
msgstr "có-thể-chuyển-tiếp-nhanh"
-#: builtin/remote.c:1121
+#: builtin/remote.c:1127
msgid "local out of date"
msgstr "dữ liệu nội bộ đã cũ"
-#: builtin/remote.c:1128
+#: builtin/remote.c:1134
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s ép buộc thành %-*s (%s)"
-#: builtin/remote.c:1131
+#: builtin/remote.c:1137
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s đẩy lên thành %-*s (%s)"
-#: builtin/remote.c:1135
+#: builtin/remote.c:1141
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s ép buộc thành %s"
-#: builtin/remote.c:1138
+#: builtin/remote.c:1144
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s đẩy lên thành %s"
-#: builtin/remote.c:1206
+#: builtin/remote.c:1212
msgid "do not query remotes"
msgstr "không truy vấn các máy chủ"
-#: builtin/remote.c:1233
+#: builtin/remote.c:1239
#, c-format
msgid "* remote %s"
msgstr "* máy chủ %s"
-#: builtin/remote.c:1234
+#: builtin/remote.c:1240
#, c-format
msgid " Fetch URL: %s"
msgstr " URL để lấy về: %s"
-#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390
+#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
msgid "(no URL)"
msgstr "(không có URL)"
@@ -19221,181 +20561,181 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1249 builtin/remote.c:1251
+#: builtin/remote.c:1255 builtin/remote.c:1257
#, c-format
msgid " Push URL: %s"
msgstr " URL để đẩy lên: %s"
-#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
#, c-format
msgid " HEAD branch: %s"
msgstr " Nhánh HEAD: %s"
-#: builtin/remote.c:1253
+#: builtin/remote.c:1259
msgid "(not queried)"
msgstr "(không yêu cầu)"
-#: builtin/remote.c:1255
+#: builtin/remote.c:1261
msgid "(unknown)"
msgstr "(không hiểu)"
-#: builtin/remote.c:1259
+#: builtin/remote.c:1265
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " nhánh HEAD (HEAD máy chủ chưa rõ ràng, có lẽ là một trong số sau):\n"
-#: builtin/remote.c:1271
+#: builtin/remote.c:1277
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Những nhánh trên máy chủ:%s"
-#: builtin/remote.c:1274 builtin/remote.c:1300
+#: builtin/remote.c:1280 builtin/remote.c:1306
msgid " (status not queried)"
msgstr " (trạng thái không được yêu cầu)"
-#: builtin/remote.c:1283
+#: builtin/remote.c:1289
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Những nhánh nội bộ đã được cấu hình cho lệnh “git pull”:"
-#: builtin/remote.c:1291
+#: builtin/remote.c:1297
msgid " Local refs will be mirrored by 'git push'"
msgstr " refs nội bộ sẽ được phản chiếu bởi lệnh “git push”"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1303
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " Những tham chiếu nội bộ được cấu hình cho lệnh “git push”%s:"
-#: builtin/remote.c:1318
+#: builtin/remote.c:1324
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "đặt refs/remotes/<tên>/HEAD cho phù hợp với máy chủ"
-#: builtin/remote.c:1320
+#: builtin/remote.c:1326
msgid "delete refs/remotes/<name>/HEAD"
msgstr "xóa refs/remotes/<tên>/HEAD"
-#: builtin/remote.c:1335
+#: builtin/remote.c:1341
msgid "Cannot determine remote HEAD"
msgstr "Không thể xác định được HEAD máy chủ"
-#: builtin/remote.c:1337
+#: builtin/remote.c:1343
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "Nhiều nhánh HEAD máy chủ. Hãy chọn rõ ràng một:"
-#: builtin/remote.c:1347
+#: builtin/remote.c:1353
#, c-format
msgid "Could not delete %s"
msgstr "Không thể xóa bỏ %s"
-#: builtin/remote.c:1355
+#: builtin/remote.c:1361
#, c-format
msgid "Not a valid ref: %s"
msgstr "Không phải là tham chiếu hợp lệ: %s"
-#: builtin/remote.c:1357
+#: builtin/remote.c:1363
#, c-format
msgid "Could not setup %s"
msgstr "Không thể cài đặt %s"
-#: builtin/remote.c:1375
+#: builtin/remote.c:1381
#, c-format
msgid " %s will become dangling!"
msgstr " %s sẽ trở thành không đầu (không được quản lý)!"
-#: builtin/remote.c:1376
+#: builtin/remote.c:1382
#, c-format
msgid " %s has become dangling!"
msgstr " %s đã trở thành không đầu (không được quản lý)!"
-#: builtin/remote.c:1386
+#: builtin/remote.c:1392
#, c-format
msgid "Pruning %s"
msgstr "Đang xén bớt %s"
-#: builtin/remote.c:1387
+#: builtin/remote.c:1393
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1403
+#: builtin/remote.c:1409
#, c-format
msgid " * [would prune] %s"
msgstr " * [nên xén bớt] %s"
-#: builtin/remote.c:1406
+#: builtin/remote.c:1412
#, c-format
msgid " * [pruned] %s"
msgstr " * [đã bị xén] %s"
-#: builtin/remote.c:1451
+#: builtin/remote.c:1457
msgid "prune remotes after fetching"
msgstr "cắt máy chủ sau khi lấy về"
-#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636
+#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
#, c-format
msgid "No such remote '%s'"
msgstr "Không có máy chủ nào có tên “%s”"
-#: builtin/remote.c:1530
+#: builtin/remote.c:1539
msgid "add branch"
msgstr "thêm nhánh"
-#: builtin/remote.c:1537
+#: builtin/remote.c:1546
msgid "no remote specified"
msgstr "chưa chỉ ra máy chủ nào"
-#: builtin/remote.c:1554
+#: builtin/remote.c:1563
msgid "query push URLs rather than fetch URLs"
msgstr "truy vấn đẩy URL thay vì lấy"
-#: builtin/remote.c:1556
+#: builtin/remote.c:1565
msgid "return all URLs"
msgstr "trả về mọi URL"
-#: builtin/remote.c:1584
+#: builtin/remote.c:1595
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "không có URL nào được cấu hình cho nhánh “%s”"
-#: builtin/remote.c:1610
+#: builtin/remote.c:1621
msgid "manipulate push URLs"
msgstr "đẩy các “URL” bằng tay"
-#: builtin/remote.c:1612
+#: builtin/remote.c:1623
msgid "add URL"
msgstr "thêm URL"
-#: builtin/remote.c:1614
+#: builtin/remote.c:1625
msgid "delete URLs"
msgstr "xóa URLs"
-#: builtin/remote.c:1621
+#: builtin/remote.c:1632
msgid "--add --delete doesn't make sense"
msgstr "--add --delete không hợp lý"
-#: builtin/remote.c:1660
+#: builtin/remote.c:1673
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Kiểu mẫu URL cũ không hợp lệ: %s"
-#: builtin/remote.c:1668
+#: builtin/remote.c:1681
#, c-format
msgid "No such URL found: %s"
msgstr "Không tìm thấy URL như vậy: %s"
-#: builtin/remote.c:1670
+#: builtin/remote.c:1683
msgid "Will not delete all non-push URLs"
msgstr "Sẽ không xóa những địa chỉ URL không-push"
-#: builtin/repack.c:23
+#: builtin/repack.c:26
msgid "git repack [<options>]"
msgstr "git repack [<các tùy chọn>]"
-#: builtin/repack.c:28
+#: builtin/repack.c:31
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -19403,137 +20743,123 @@
"Gia tăng repack là không tương thích với chỉ mục bitmap. Dùng\n"
"--no-write-bitmap-index hay tắt cấu hình pack.writebitmaps."
-#: builtin/repack.c:191
+#: builtin/repack.c:198
msgid "could not start pack-objects to repack promisor objects"
msgstr ""
"không thể lấy thông tin thống kê pack-objects để mà đóng gói lại các đối "
"tượng hứa hẹn"
-#: builtin/repack.c:230 builtin/repack.c:416
+#: builtin/repack.c:270 builtin/repack.c:446
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr ""
"repack: Đang chỉ cần các dòng ID đối tượng dạng thập lục phân đầy dủ từ pack-"
"objects."
-#: builtin/repack.c:254
+#: builtin/repack.c:294
msgid "could not finish pack-objects to repack promisor objects"
msgstr "không thể hoàn tất pack-objects để đóng gói các đối tượng hứa hẹn"
-#: builtin/repack.c:292
+#: builtin/repack.c:322
msgid "pack everything in a single pack"
msgstr "đóng gói mọi thứ trong một gói đơn"
-#: builtin/repack.c:294
+#: builtin/repack.c:324
msgid "same as -a, and turn unreachable objects loose"
msgstr "giống với -a, và chỉnh sửa các đối tượng không đọc được thiếu sót"
-#: builtin/repack.c:297
+#: builtin/repack.c:327
msgid "remove redundant packs, and run git-prune-packed"
msgstr "xóa bỏ các gói dư thừa, và chạy git-prune-packed"
-#: builtin/repack.c:299
+#: builtin/repack.c:329
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "chuyển --no-reuse-delta cho git-pack-objects"
-#: builtin/repack.c:301
+#: builtin/repack.c:331
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "chuyển --no-reuse-object cho git-pack-objects"
-#: builtin/repack.c:303
+#: builtin/repack.c:333
msgid "do not run git-update-server-info"
msgstr "không chạy git-update-server-info"
-#: builtin/repack.c:306
+#: builtin/repack.c:336
msgid "pass --local to git-pack-objects"
msgstr "chuyển --local cho git-pack-objects"
-#: builtin/repack.c:308
+#: builtin/repack.c:338
msgid "write bitmap index"
msgstr "ghi mục lục ánh xạ"
-#: builtin/repack.c:310
+#: builtin/repack.c:340
msgid "pass --delta-islands to git-pack-objects"
msgstr "chuyển --delta-islands cho git-pack-objects"
-#: builtin/repack.c:311
+#: builtin/repack.c:341
msgid "approxidate"
msgstr "ngày ước tính"
-#: builtin/repack.c:312
+#: builtin/repack.c:342
msgid "with -A, do not loosen objects older than this"
msgstr "với -A, các đối tượng cũ hơn khoảng thời gian này thì không bị mất"
-#: builtin/repack.c:314
+#: builtin/repack.c:344
msgid "with -a, repack unreachable objects"
msgstr "với -a, đóng gói lại các đối tượng không thể đọc được"
-#: builtin/repack.c:316
+#: builtin/repack.c:346
msgid "size of the window used for delta compression"
msgstr "kích thước cửa sổ được dùng cho nén “delta”"
-#: builtin/repack.c:317 builtin/repack.c:323
+#: builtin/repack.c:347 builtin/repack.c:353
msgid "bytes"
msgstr "byte"
-#: builtin/repack.c:318
+#: builtin/repack.c:348
msgid "same as the above, but limit memory size instead of entries count"
msgstr "giống như trên, nhưng giới hạn kích thước bộ nhớ hay vì số lượng"
-#: builtin/repack.c:320
+#: builtin/repack.c:350
msgid "limits the maximum delta depth"
msgstr "giới hạn độ sâu tối đa của “delta”"
-#: builtin/repack.c:322
+#: builtin/repack.c:352
msgid "limits the maximum number of threads"
msgstr "giới hạn số lượng tối đa tuyến trình"
-#: builtin/repack.c:324
+#: builtin/repack.c:354
msgid "maximum size of each packfile"
msgstr "kích thước tối đa cho từng tập tin gói"
-#: builtin/repack.c:326
+#: builtin/repack.c:356
msgid "repack objects in packs marked with .keep"
msgstr "đóng gói lại các đối tượng trong các gói đã đánh dấu bằng .keep"
-#: builtin/repack.c:328
+#: builtin/repack.c:358
msgid "do not repack this pack"
msgstr "đừng đóng gói lại gói này"
-#: builtin/repack.c:338
+#: builtin/repack.c:368
msgid "cannot delete packs in a precious-objects repo"
msgstr "không thể xóa các gói trong một kho đối_tượng_vĩ_đại"
-#: builtin/repack.c:342
+#: builtin/repack.c:372
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable và -A xung khắc nhau"
-#: builtin/repack.c:425
+#: builtin/repack.c:455
msgid "Nothing new to pack."
msgstr "Không có gì mới để mà đóng gói."
-#: builtin/repack.c:486
+#: builtin/repack.c:485
#, 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 ""
-"CẢNH BÁO: Một số gói đang dùng vừa được đổi tên bằng cách\n"
-"CẢNH BÁO: đánh tiền tố old- vào tên của chúng, mục đích là\n"
-"CẢNH BÁO: thay chúng bằng phiên bản mới của tập\n"
-"CẢNH BÁO: tin. Nhưng thao tác lại gặp lỗi, và nỗ\n"
-"CẢNH BÁO: lực để đổi ngược lại tên chúng cho đúng với tên\n"
-"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"
+msgid "missing required file: %s"
+msgstr "thiếu tập tin cần thiết: %s"
-#: builtin/repack.c:534
+#: builtin/repack.c:487
#, c-format
-msgid "failed to remove '%s'"
-msgstr "gặp lỗi khi gỡ bỏ “%s”"
+msgid "could not unlink: %s"
+msgstr "không thể bỏ liên kết: %s"
#: builtin/replace.c:22
msgid "git replace [-f] <object> <replacement>"
@@ -19765,7 +21091,7 @@
#: 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:599
msgid "-e needs exactly one argument"
@@ -19809,7 +21135,7 @@
#: builtin/reset.c:33
msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
-msgstr "git reset [-q] [<tree-ish>] [--] <đặc/tả/đường/dẫn>..."
+msgstr "git reset [-q] [<tree-ish>] [--] <đặc/tả/đường/dẫn>…"
#: builtin/reset.c:34
msgid ""
@@ -19819,7 +21145,7 @@
#: builtin/reset.c:35
msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
-msgstr "git reset --patch [<tree-ish>] [--] [<đặc/tả/đường/dẫn>...]"
+msgstr "git reset --patch [<tree-ish>] [--] [<đặc/tả/đường/dẫn>…]"
#: builtin/reset.c:41
msgid "mixed"
@@ -19841,93 +21167,93 @@
msgid "keep"
msgstr "giữ lại"
-#: builtin/reset.c:82
+#: 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:84
+#: 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:90
+#: 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:115
+#: builtin/reset.c:116
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD hiện giờ tại %s"
-#: builtin/reset.c:194
+#: 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:294 builtin/stash.c:520 builtin/stash.c:595
-#: builtin/stash.c:619
+#: builtin/reset.c:295 builtin/stash.c:587 builtin/stash.c:661
+#: builtin/stash.c:685
msgid "be quiet, only report errors"
msgstr "làm việc ở chế độ im lặng, chỉ hiển thị khi có lỗi"
-#: builtin/reset.c:296
+#: builtin/reset.c:297
msgid "reset HEAD and index"
msgstr "đặt lại (reset) HEAD và bảng mục lục"
-#: builtin/reset.c:297
+#: builtin/reset.c:298
msgid "reset only HEAD"
msgstr "chỉ đặt lại (reset) HEAD"
-#: builtin/reset.c:299 builtin/reset.c:301
+#: 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:303
+#: 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:309
+#: 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:343
+#: 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:351
+#: 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:360
+#: 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:370
+#: 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:372
+#: 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:387
+#: 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:391
+#: builtin/reset.c:392
msgid "-N can only be used with --mixed"
msgstr "-N chỉ được dùng khi có --mixed"
-#: builtin/reset.c:412
+#: 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:415
+#: builtin/reset.c:416
#, c-format
msgid ""
"\n"
@@ -19941,48 +21267,48 @@
"Bạn có thể sử dụng để tránh việc này. Đặt reset.quiet thành true trong\n"
"cài đặt config nếu bạn muốn thực hiện nó như là mặc định.\n"
-#: builtin/reset.c:425
+#: builtin/reset.c: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:429
+#: 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:499
+#: builtin/rev-list.c:534
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr "không thể tổ hợp --exclude-promisor-objects và --missing"
-#: builtin/rev-list.c:560
+#: builtin/rev-list.c:595
msgid "object filtering requires --objects"
msgstr "lọc đối tượng yêu cầu --objects"
-#: builtin/rev-list.c:610
+#: builtin/rev-list.c:651
msgid "rev-list does not support display of notes"
msgstr "rev-list không hỗ trợ hiển thị các ghi chú"
-#: builtin/rev-list.c:615
+#: builtin/rev-list.c:656
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"
@@ -20074,11 +21400,11 @@
msgid "keep redundant, empty commits"
msgstr "giữ lại các lần chuyển giao dư thừa, rỗng"
-#: builtin/revert.c:232
+#: builtin/revert.c:239
msgid "revert failed"
msgstr "hoàn nguyên gặp lỗi"
-#: builtin/revert.c:245
+#: builtin/revert.c:252
msgid "cherry-pick failed"
msgstr "cherry-pick gặp lỗi"
@@ -20174,55 +21500,77 @@
"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:188
msgid "remote name"
msgstr "tên máy dịch vụ"
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:201
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:202
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:203
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:16
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:17
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
-msgid "Group by committer rather than author"
-msgstr "Nhóm theo người chuyển giao thay vì tác giả"
+#: builtin/shortlog.c:123
+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:266
+#: builtin/shortlog.c:133
+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:323
+#, c-format
+msgid "unknown group type: %s"
+msgstr "không nhận ra kiểu nhóm: %s"
+
+#: builtin/shortlog.c:351
+msgid "group by committer rather than author"
+msgstr "nhóm theo người chuyển giao thay vì tác giả"
+
+#: builtin/shortlog.c:354
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
-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:356
+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
-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:358
+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:359
msgid "<w>[,<i1>[,<i2>]]"
msgstr "<w>[,<i1>[,<i2>]]"
-#: builtin/shortlog.c:272
-msgid "Linewrap output"
-msgstr "Ngắt dòng khi quá dài"
+#: builtin/shortlog.c:360
+msgid "linewrap output"
+msgstr "ngắt dòng khi quá dài"
-#: builtin/shortlog.c:301
+#: builtin/shortlog.c:362
+msgid "field"
+msgstr "trường"
+
+#: builtin/shortlog.c:363
+msgid "group by field"
+msgstr "nhóm theo trường"
+
+#: builtin/shortlog.c:391
msgid "too many arguments given outside repository"
msgstr "quá nhiều tham số đưa ra ngoài kho chứa"
@@ -20359,6 +21707,14 @@
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 | --"
@@ -20408,19 +21764,27 @@
"bộ"
#: builtin/sparse-checkout.c:21
-msgid "git sparse-checkout (init|list|set|add|disable) <options>"
-msgstr "git sparse-checkout (init|list|set|add|disable) <các-tùy-chọn>"
+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:64
+#: builtin/sparse-checkout.c:45
+msgid "git sparse-checkout list"
+msgstr "git sparse-checkout list"
+
+#: builtin/sparse-checkout.c:71
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr ""
"không thể phân tích cú pháp cây làm việc này (tập tin sparse-checkout có lẽ "
"không tồn tại)"
-#: builtin/sparse-checkout.c:225
+#: builtin/sparse-checkout.c:223
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:264
+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:266
msgid "failed to set extensions.worktreeConfig setting"
msgstr "gặp lỗi khi đặt cài đặt extensions.worktreeConfig"
@@ -20433,46 +21797,42 @@
msgid "initialize the sparse-checkout in cone mode"
msgstr "khởi tạo sparse-checkout trong chế độ nón"
-#: builtin/sparse-checkout.c:308
-msgid "initialize sparse-checkout"
-msgstr "khởi tạo sparse-checkout"
-
-#: builtin/sparse-checkout.c:341
+#: builtin/sparse-checkout.c:339
#, c-format
msgid "failed to open '%s'"
msgstr "gặp lỗi khi mở “%s”"
-#: builtin/sparse-checkout.c:398
+#: builtin/sparse-checkout.c:396
#, c-format
msgid "could not normalize path %s"
msgstr "không thể thường hóa đường dẫn “%s”"
-#: builtin/sparse-checkout.c:410
+#: builtin/sparse-checkout.c:408
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
msgstr "git sparse-checkout (set|add) (--stdin | <các mẫu>)"
-#: builtin/sparse-checkout.c:435
+#: builtin/sparse-checkout.c:433
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "không thể bỏ trích dẫn chuỗi kiểu C “%s”"
-#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513
+#: builtin/sparse-checkout.c:487 builtin/sparse-checkout.c:511
msgid "unable to load existing sparse-checkout patterns"
msgstr "không thể tải các mẫu sparse-checkout"
-#: builtin/sparse-checkout.c:558
+#: builtin/sparse-checkout.c:556
msgid "read patterns from standard in"
msgstr "đọc các mẫu từ đầu vào tiêu chuẩn"
-#: builtin/sparse-checkout.c:564
-msgid "set sparse-checkout patterns"
-msgstr "đặt các mẫu sparse-checkout"
+#: builtin/sparse-checkout.c:571
+msgid "git sparse-checkout reapply"
+msgstr "git sparse-checkout reapply"
-#: builtin/sparse-checkout.c:581
-msgid "disable sparse-checkout"
-msgstr "tắt sparse-checkout"
+#: builtin/sparse-checkout.c:590
+msgid "git sparse-checkout disable"
+msgstr "git sparse-checkout disable"
-#: builtin/sparse-checkout.c:593
+#: builtin/sparse-checkout.c:618
msgid "error while refreshing working directory"
msgstr "gặp lỗi khi đọc lại thư mục làm việc"
@@ -20552,7 +21912,7 @@
msgid "Too many revisions specified:%s"
msgstr "Chỉ ra quá nhiều điểm xét duyệt: %s"
-#: builtin/stash.c:162 git-legacy-stash.sh:549
+#: builtin/stash.c:162
msgid "No stash entries found."
msgstr "Không tìm thấy các mục tạm cất (stash) nào."
@@ -20561,159 +21921,171 @@
msgid "%s is not a valid reference"
msgstr "“%s” không phải một tham chiếu hợp lệ"
-#: builtin/stash.c:225 git-legacy-stash.sh:75
-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:225
+msgid "git stash clear with arguments is unimplemented"
+msgstr "git stash clear với các tham số là chưa được thực hiện"
-#: builtin/stash.c:404
+#: builtin/stash.c:429
+#, c-format
+msgid ""
+"WARNING: Untracked file in way of tracked file! Renaming\n"
+" %s -> %s\n"
+" to make room.\n"
+msgstr ""
+"CẢNH BÁO: Tệp chưa được theo dõi theo cách của tệp được theo dõi! Đổi tên\n"
+" %s -> %s\n"
+" để nhường chỗ.\n"
+
+#: builtin/stash.c:490
msgid "cannot apply a stash in the middle of a merge"
msgstr "không thể áp dụng một stash ở giữa của quá trình hòa trộn"
-#: builtin/stash.c:415
+#: builtin/stash.c:501
#, c-format
msgid "could not generate diff %s^!."
msgstr "không thể tạo diff %s^!."
-#: builtin/stash.c:422
-msgid "conflicts in index.Try without --index."
+#: builtin/stash.c:508
+msgid "conflicts in index. Try without --index."
msgstr "xung đột trong bảng mục lục. Hãy thử mà không dùng tùy chọn --index."
-#: builtin/stash.c:428
+#: builtin/stash.c:514
msgid "could not save index tree"
msgstr "không thể ghi lại cây chỉ mục"
-#: builtin/stash.c:437
+#: builtin/stash.c:523
msgid "could not restore untracked files from stash"
msgstr "không thể phục hồi các tập tin chưa theo dõi từ mục cất đi (stash)"
-#: builtin/stash.c:451
+#: builtin/stash.c:537
#, c-format
msgid "Merging %s with %s"
msgstr "Đang hòa trộn %s với %s"
-#: builtin/stash.c:461 git-legacy-stash.sh:681
+#: builtin/stash.c:547
msgid "Index was not unstashed."
msgstr "Bảng mục lục đã không được bỏ stash."
-#: builtin/stash.c:522 builtin/stash.c:621
+#: builtin/stash.c:589 builtin/stash.c:687
msgid "attempt to recreate the index"
msgstr "gặp lỗi đọc bảng mục lục"
-#: builtin/stash.c:555
+#: builtin/stash.c:633
#, c-format
msgid "Dropped %s (%s)"
msgstr "Đã xóa %s (%s)"
-#: builtin/stash.c:558
+#: builtin/stash.c:636
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s: Không thể xóa bỏ mục stash"
-#: builtin/stash.c:583
+#: builtin/stash.c:649
#, c-format
msgid "'%s' is not a stash reference"
msgstr "”%s” không phải tham chiếu đến stash"
-#: builtin/stash.c:633 git-legacy-stash.sh:695
+#: builtin/stash.c:699
msgid "The stash entry is kept in case you need it again."
msgstr "Các mục tạm cất (stash) được giữ trong trường hợp bạn lại cần nó."
-#: builtin/stash.c:656 git-legacy-stash.sh:713
+#: builtin/stash.c:722
msgid "No branch name specified"
msgstr "Chưa chỉ ra tên của nhánh"
-#: builtin/stash.c:796 builtin/stash.c:833
+#: builtin/stash.c:866 builtin/stash.c:903
#, c-format
msgid "Cannot update %s with %s"
msgstr "Không thể cập nhật %s với %s"
-#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
+#: builtin/stash.c:884 builtin/stash.c:1538 builtin/stash.c:1603
msgid "stash message"
msgstr "phần chú thích cho stash"
-#: builtin/stash.c:824
+#: builtin/stash.c:894
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" cần một đối số <lần chuyển giao>"
-#: builtin/stash.c:1049 git-legacy-stash.sh:218
+#: builtin/stash.c:1109
msgid "No changes selected"
msgstr "Chưa có thay đổi nào được chọn"
-#: builtin/stash.c:1149 git-legacy-stash.sh:150
+#: builtin/stash.c:1209
msgid "You do not have the initial commit yet"
msgstr "Bạn chưa còn có lần chuyển giao khởi tạo"
-#: builtin/stash.c:1176 git-legacy-stash.sh:165
+#: builtin/stash.c:1236
msgid "Cannot save the current index state"
msgstr "Không thể ghi lại trạng thái bảng mục lục hiện hành"
-#: builtin/stash.c:1185 git-legacy-stash.sh:180
+#: builtin/stash.c:1245
msgid "Cannot save the untracked files"
msgstr "Không thể ghi lại các tập tin chưa theo dõi"
-#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201
-#: git-legacy-stash.sh:214
+#: builtin/stash.c:1256 builtin/stash.c:1265
msgid "Cannot save the current worktree state"
msgstr "Không thể ghi lại trạng thái cây-làm-việc hiện hành"
-#: builtin/stash.c:1233 git-legacy-stash.sh:234
+#: builtin/stash.c:1293
msgid "Cannot record working tree state"
msgstr "Không thể ghi lại trạng thái cây làm việc hiện hành"
-#: builtin/stash.c:1282 git-legacy-stash.sh:338
+#: builtin/stash.c:1342
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "Không thể dùng --patch và --include-untracked hay --all cùng một lúc"
-#: builtin/stash.c:1298
+#: builtin/stash.c:1358
msgid "Did you forget to 'git add'?"
msgstr "Có lẽ bạn đã quên “git add ” phải không?"
-#: builtin/stash.c:1313 git-legacy-stash.sh:346
+#: builtin/stash.c:1373
msgid "No local changes to save"
msgstr "Không có thay đổi nội bộ nào được ghi lại"
-#: builtin/stash.c:1320 git-legacy-stash.sh:351
+#: builtin/stash.c:1380
msgid "Cannot initialize stash"
msgstr "Không thể khởi tạo stash"
-#: builtin/stash.c:1335 git-legacy-stash.sh:355
+#: builtin/stash.c:1395
msgid "Cannot save the current status"
msgstr "Không thể ghi lại trạng thái hiện hành"
-#: builtin/stash.c:1340
+#: builtin/stash.c:1400
#, c-format
msgid "Saved working directory and index state %s"
msgstr "Đã ghi lại thư mục làm việc và trạng thái mục lục %s"
-#: builtin/stash.c:1430 git-legacy-stash.sh:385
+#: builtin/stash.c:1490
msgid "Cannot remove worktree changes"
msgstr "Không thể gỡ bỏ các thay đổi cây-làm-việc"
-#: builtin/stash.c:1469 builtin/stash.c:1534
+#: builtin/stash.c:1529 builtin/stash.c:1594
msgid "keep index"
msgstr "giữ nguyên bảng mục lục"
-#: builtin/stash.c:1471 builtin/stash.c:1536
+#: builtin/stash.c:1531 builtin/stash.c:1596
msgid "stash in patch mode"
msgstr "cất đi ở chế độ miếng vá"
-#: builtin/stash.c:1472 builtin/stash.c:1537
+#: builtin/stash.c:1532 builtin/stash.c:1597
msgid "quiet mode"
msgstr "chế độ im lặng"
-#: builtin/stash.c:1474 builtin/stash.c:1539
+#: builtin/stash.c:1534 builtin/stash.c:1599
msgid "include untracked files in stash"
msgstr "bao gồm các tập tin không được theo dõi trong stash"
-#: builtin/stash.c:1476 builtin/stash.c:1541
+#: builtin/stash.c:1536 builtin/stash.c:1601
msgid "include ignore files"
msgstr "bao gồm các tập tin bị bỏ qua"
-#: builtin/stash.c:1600
-#, c-format
-msgid "could not exec %s"
-msgstr "không thể thực thi %s"
+#: builtin/stash.c:1636
+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]"
@@ -20731,7 +22103,7 @@
msgid "prepend comment character and space to each line"
msgstr "treo trước ký tự ghi chú và ký tự khoảng trắng cho từng dòng"
-#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999
+#: builtin/submodule--helper.c: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"
@@ -20745,7 +22117,7 @@
msgid "cannot strip one component off url '%s'"
msgstr "không thể cắt bỏ một thành phần ra khỏi “%s” url"
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395
+#: builtin/submodule--helper.c: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"
@@ -20753,8 +22125,8 @@
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=</đường/dẫn>] [</đường/dẫn>…]"
-#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c: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"
@@ -20785,12 +22157,13 @@
"."
#: 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"
+msgid "suppress output of entering each submodule command"
+msgstr "chặn kết xuất của từng lệnh mô-đun-con"
-#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063
-msgid "Recurse into nested submodules"
-msgstr "Đệ quy vào trong các mô-đun-con lồng nhau"
+#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888
+#: builtin/submodule--helper.c:1487
+msgid "recurse into nested submodules"
+msgstr "đệ quy vào trong mô-đun-con lồng nhau"
#: builtin/submodule--helper.c:572
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
@@ -20805,105 +22178,160 @@
"không thể tìm thấy cấu hình “%s”. Coi rằng đây là kho thượng nguồn có quyền "
"sở hữu chính nó."
-#: builtin/submodule--helper.c:667
+#: builtin/submodule--helper.c: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:671
+#: 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:681
+#: 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:688
+#: 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:710
-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:709
+msgid "suppress output for initializing a submodule"
+msgstr "chặn kết xuất của khởi tạo một mô-đun-con"
-#: builtin/submodule--helper.c:715
+#: 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:789 builtin/submodule--helper.c:924
+#: 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:837
+#: 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:864 builtin/submodule--helper.c:1033
+#: 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:888 builtin/submodule--helper.c:1199
-msgid "Suppress submodule status output"
-msgstr "Chặn két xuất tình trạng mô-đun-con"
+#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623
+msgid "suppress submodule status output"
+msgstr "chặn kết xuất về tình trạng mô-đun-con"
-#: builtin/submodule--helper.c:889
+#: builtin/submodule--helper.c:887
msgid ""
-"Use commit stored in the index instead of the one stored in the submodule "
+"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
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ô-"
+"dùng lần chuyển giao lưu trong mục lục thay cho cái được lưu trong HEAD mô-"
"đun-con"
-#: builtin/submodule--helper.c:890
-msgid "recurse into nested submodules"
-msgstr "đệ quy vào trong mô-đun-con lồng nhau"
-
-#: builtin/submodule--helper.c:895
+#: builtin/submodule--helper.c:893
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr ""
"git submodule status [--quiet] [--cached] [--recursive] [</đường/dẫn>…]"
-#: builtin/submodule--helper.c:919
+#: builtin/submodule--helper.c:917
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name </đường/dẫn>"
-#: builtin/submodule--helper.c:983
+#: 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:989
+#: 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:1003
+#: 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:1014
+#: 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:1061
-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:1485
+msgid "suppress output of synchronizing submodule url"
+msgstr "chặn kết xuất của url mô-đun-con đồng bộ"
-#: builtin/submodule--helper.c:1068
+#: 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:1122
+#: builtin/submodule--helper.c:1546
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -20912,7 +22340,7 @@
"Cây làm việc mô-đun-con “%s” có chứa thư mục .git (dùng “rm -rf” nếu bạn "
"thực sự muốn gỡ bỏ nó cùng với toàn bộ lịch sử của chúng)"
-#: builtin/submodule--helper.c:1134
+#: builtin/submodule--helper.c:1558
#, c-format
msgid ""
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -20921,45 +22349,45 @@
"Cây làm việc mô-đun-con “%s” chứa các thay đổi nội bộ; hãy dùng “-f” để loại "
"bỏ chúng đi"
-#: builtin/submodule--helper.c:1142
+#: builtin/submodule--helper.c:1566
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "Đã xóa thư mục “%s”\n"
-#: builtin/submodule--helper.c:1144
+#: 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:1155
+#: 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:1171
+#: 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:1200
-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: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:1201
-msgid "Unregister all submodules"
-msgstr "Bỏ đăng ký tất cả các trong mô-đun-con"
+#: 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:1206
+#: 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:1220
+#: 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:1289
+#: 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"
@@ -20970,50 +22398,50 @@
"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 "
+"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'."
+"“--reference-if-able” thay vì dùng “--reference”."
-#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331
+#: 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:1367
+#: 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:1374
+#: 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:1398
+#: 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:1401
+#: 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:1404
+#: 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:1412
+#: 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:1415 builtin/submodule--helper.c:1924
+#: 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:1417 builtin/submodule--helper.c:1926
+#: 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:1424
+#: builtin/submodule--helper.c:1848
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -21023,105 +22451,105 @@
"<kho>] [--name <tên>] [--depth <sâu>] [--single-branch] [--url <url>] --path "
"</đường/dẫn>"
-#: builtin/submodule--helper.c:1449
+#: 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"
+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:1460
+#: 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:1464
+#: builtin/submodule--helper.c:1888
#, c-format
msgid "directory not empty: '%s'"
-msgstr "thư mục không trống: '%s'"
+msgstr "thư mục không trống: “%s”"
-#: builtin/submodule--helper.c:1476
+#: 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:1512
+#: 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:1516
+#: 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:1617
+#: 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:1621
+#: 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:1651
+#: 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:1680
+#: builtin/submodule--helper.c:2104
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Bỏ qua mô-đun-con “%s”"
-#: builtin/submodule--helper.c:1830
+#: 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:1841
+#: 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:1903 builtin/submodule--helper.c:2149
+#: 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:1906
+#: 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:1910
+#: 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:1916
-msgid "Create a shallow clone truncated to the specified number of revisions"
+#: 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"
+"tạo một bản sao nông được cắt ngắn thành số lượng điểm xét duyệt đã cho"
-#: builtin/submodule--helper.c:1919
+#: builtin/submodule--helper.c:2343
msgid "parallel jobs"
msgstr "công việc đồng thời"
-#: builtin/submodule--helper.c:1921
+#: 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:1922
+#: 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:1933
+#: 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>…]"
-#: builtin/submodule--helper.c:1946
+#: 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:1994
+#: builtin/submodule--helper.c:2418
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -21130,50 +22558,86 @@
"Nhánh mô-đun-con (%s) được cấu hình kế thừa nhánh từ siêu dự án, nhưng siêu "
"dự án lại không trên bất kỳ nhánh nào"
-#: builtin/submodule--helper.c:2117
+#: builtin/submodule--helper.c: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:2150
+#: builtin/submodule--helper.c:2574
msgid "recurse into submodules"
msgstr "đệ quy vào trong mô-đun-con"
-#: builtin/submodule--helper.c:2156
+#: 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:2212
+#: 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:2215
+#: 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:2220
+#: 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:2221
+#: builtin/submodule--helper.c:2645
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <tên>"
-#: builtin/submodule--helper.c:2222
+#: builtin/submodule--helper.c:2646
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2241 git-submodule.sh:174
+#: builtin/submodule--helper.c:2665 git-submodule.sh:150
#, sh-format
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "hãy đảm bảo rằng tập tin .gitmodules có trong cây làm việc"
-#: builtin/submodule--helper.c:2291 git.c:433 git.c:684
+#: builtin/submodule--helper.c: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:441 git.c:714
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s không hỗ trợ --super-prefix"
-#: builtin/submodule--helper.c:2297
+#: builtin/submodule--helper.c: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ệ"
@@ -21198,11 +22662,11 @@
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:499
msgid "reason"
msgstr "lý do"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
msgid "reason of the update"
msgstr "lý do cập nhật"
@@ -21222,11 +22686,13 @@
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>..."
@@ -21237,12 +22703,12 @@
msgid "tag '%s' not found."
msgstr "không tìm thấy tìm thấy thẻ “%s”."
-#: builtin/tag.c:105
+#: builtin/tag.c:124
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Thẻ đã bị xóa “%s” (từng là %s)\n"
-#: builtin/tag.c:135
+#: builtin/tag.c:159
#, c-format
msgid ""
"\n"
@@ -21255,7 +22721,7 @@
" %s\n"
"Những dòng được bắt đầu bằng “%c” sẽ được bỏ qua.\n"
-#: builtin/tag.c:139
+#: builtin/tag.c:163
#, c-format
msgid ""
"\n"
@@ -21270,15 +22736,11 @@
"Những dòng được bắt đầu bằng “%c” sẽ được giữ lại; bạn có thể xóa chúng đi "
"nếu muốn.\n"
-#: builtin/tag.c:198
+#: builtin/tag.c:230
msgid "unable to sign the tag"
msgstr "không thể ký thẻ"
-#: builtin/tag.c:200
-msgid "unable to write tag file"
-msgstr "không thể ghi vào tập tin lưu thẻ"
-
-#: builtin/tag.c:216
+#: builtin/tag.c:248
#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
@@ -21291,139 +22753,135 @@
"\n"
"\tgit tag -f %s %s^{}"
-#: builtin/tag.c:232
+#: builtin/tag.c:264
msgid "bad object type."
msgstr "kiểu đối tượng sai."
-#: builtin/tag.c:284
+#: builtin/tag.c:317
msgid "no tag message?"
msgstr "không có chú thích gì cho cho thẻ à?"
-#: builtin/tag.c:291
+#: builtin/tag.c:324
#, 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:435
msgid "list tag names"
msgstr "chỉ liệt kê tên các thẻ"
-#: builtin/tag.c:404
+#: builtin/tag.c:437
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:439
msgid "delete tags"
msgstr "xóa thẻ"
-#: builtin/tag.c:407
+#: builtin/tag.c:440
msgid "verify tags"
msgstr "thẩm tra thẻ"
-#: builtin/tag.c:409
+#: builtin/tag.c:442
msgid "Tag creation options"
msgstr "Tùy chọn tạo thẻ"
-#: builtin/tag.c:411
+#: builtin/tag.c:444
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:446
msgid "tag message"
msgstr "phần chú thích cho thẻ"
-#: builtin/tag.c:415
+#: builtin/tag.c:448
msgid "force edit of tag message"
msgstr "ép buộc sửa thẻ lần commit"
-#: builtin/tag.c:416
+#: builtin/tag.c:449
msgid "annotated and GPG-signed tag"
msgstr "thẻ chú giải và ký kiểu GPG"
-#: builtin/tag.c:419
+#: builtin/tag.c:452
msgid "use another key to sign the tag"
msgstr "dùng kháo khác để ký thẻ"
-#: builtin/tag.c:420
+#: builtin/tag.c:453
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:454 builtin/update-ref.c:505
msgid "create a reflog"
msgstr "tạo một reflog"
-#: builtin/tag.c:423
+#: builtin/tag.c:456
msgid "Tag listing options"
msgstr "Các tùy chọn liệt kê thẻ"
-#: builtin/tag.c:424
+#: builtin/tag.c:457
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:458 builtin/tag.c:460
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:459 builtin/tag.c:461
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:462
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:463
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:467
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:515
msgid "--column and -n are incompatible"
msgstr "--column và -n xung khắc nhau"
-#: builtin/tag.c:504
+#: builtin/tag.c:537
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:539
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:541
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:543
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:545
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:556
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
-msgid "too many params"
-msgstr "quá nhiều đối số"
-
-#: builtin/tag.c:548
+#: builtin/tag.c:581
#, 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:586
#, c-format
msgid "tag '%s' already exists"
msgstr "thẻ “%s” đã tồn tại rồi"
-#: builtin/tag.c:584
+#: builtin/tag.c:617
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Đã cập nhật thẻ “%s” (trước là %s)\n"
@@ -21705,19 +23163,19 @@
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:500
msgid "delete the reference"
msgstr "xóa tham chiếu"
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:502
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:503
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:504
msgid "read updates from stdin"
msgstr "đọc cập nhật từ đầu vào tiêu chuẩn"
@@ -21761,15 +23219,15 @@
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ê"
@@ -21781,221 +23239,203 @@
msgid "print tag contents"
msgstr "hiển thị nội dung của thẻ"
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<các tùy chọn>] </đường/dẫn> [<commit-ish>]"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree list [<options>]"
msgstr "git worktree list [<các tùy chọn>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<các tùy chọn>] </đường/dẫn>"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <worktree> </đường/dẫn/mới>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<các tùy chọn>]"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<các tùy chọn>] <worktree>"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree unlock <path>"
msgstr "git worktree unlock </đường/dẫn>"
-#: builtin/worktree.c:60 builtin/worktree.c:891
+#: builtin/worktree.c:61 builtin/worktree.c:933
#, c-format
msgid "failed to delete '%s'"
msgstr "gặp lỗi khi xóa “%s”"
-#: builtin/worktree.c:79
+#: builtin/worktree.c:74
#, 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ệ"
+msgid "Removing %s/%s: %s"
+msgstr "Đang xóa %s/%s: %s"
-#: builtin/worktree.c:85
-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
-msgstr "Gỡ bỏ cây làm việc/%s: không có tập tin gitdir"
-
-#: builtin/worktree.c:90 builtin/worktree.c:99
-#, c-format
-msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
-msgstr "Gỡ bỏ cây làm việc/%s: không thể đọc tập tin gitdir (%s)"
-
-#: builtin/worktree.c:109
-#, c-format
-msgid ""
-"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
-"%<PRIuMAX>)"
-msgstr "Gỡ bỏ cây làm việc/%s: đọc ngắn (cần %<PRIuMAX> byte, đọc %<PRIuMAX>)"
-
-#: builtin/worktree.c:117
-#, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
-msgstr "Gỡ bỏ cây làm việc/%s: tập tin gitdir không hợp lệ"
-
-#: builtin/worktree.c:126
-#, c-format
-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
-msgstr "Gỡ bỏ cây làm việc/%s: tập tin gitdir chỉ đến vị trí không tồn tại"
-
-#: builtin/worktree.c:165
+#: builtin/worktree.c:149
msgid "report pruned working trees"
msgstr "báo cáo các cây làm việc đã prune"
-#: builtin/worktree.c:167
+#: builtin/worktree.c:151
msgid "expire working trees older than <time>"
msgstr "các cây làm việc hết hạn cũ hơn khoảng <thời gian>"
-#: builtin/worktree.c:234
+#: builtin/worktree.c:221
#, c-format
msgid "'%s' already exists"
msgstr "“%s” đã có từ trước rồi"
-#: builtin/worktree.c:244
+#: builtin/worktree.c:230
#, 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:249
+#: builtin/worktree.c:235
#, 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:251
+#: builtin/worktree.c:237
#, 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:301
+#: builtin/worktree.c:288
#, c-format
msgid "could not create directory of '%s'"
msgstr "không thể tạo thư mục của “%s”"
-#: builtin/worktree.c:432 builtin/worktree.c:438
+#: builtin/worktree.c:422 builtin/worktree.c:428
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "Đang chuẩn bị cây làm việc (nhánh mới “%s”)"
-#: builtin/worktree.c:434
+#: builtin/worktree.c:424
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "Đang chuẩn bị cây làm việc (đang cài đặt nhánh “%s”, trước đây tại %s)"
-#: builtin/worktree.c:443
+#: builtin/worktree.c:433
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "Đang chuẩn bị cây làm việc (đang lấy ra “%s”)"
-#: builtin/worktree.c:449
+#: builtin/worktree.c:439
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "Đang chuẩn bị cây làm việc (HEAD đã tách rời “%s”)"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:480
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "lấy ra <nhánh> ngay cả khi nó đã được lấy ra ở cây làm việc khác"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:483
msgid "create a new branch"
msgstr "tạo nhánh mới"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:485
msgid "create or reset a branch"
msgstr "tạo hay đặt lại một nhánh"
-#: builtin/worktree.c:497
+#: builtin/worktree.c:487
msgid "populate the new working tree"
msgstr "di chuyển cây làm việc mới"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:488
msgid "keep the new working tree locked"
msgstr "giữ cây làm việc mới bị khóa"
-#: builtin/worktree.c:501
+#: builtin/worktree.c:491
msgid "set up tracking mode (see git-branch(1))"
msgstr "cài đặt chế độ theo dõi (xem git-branch(1))"
-#: builtin/worktree.c:504
+#: builtin/worktree.c:494
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "có khớp tên tên nhánh mới với một nhánh theo dõi máy chủ"
-#: builtin/worktree.c:512
+#: builtin/worktree.c:502
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "Các tùy chọn -b, -B, và --detach loại từ lẫn nhau"
-#: builtin/worktree.c:573
+#: builtin/worktree.c:563
msgid "--[no-]track can only be used if a new branch is created"
msgstr "--[no-]track chỉ có thể được dùng nếu một nhánh mới được tạo"
-#: builtin/worktree.c:673
+#: builtin/worktree.c:680
+msgid "show extended annotations and reasons, if available"
+msgstr "hiển thị chú thích và lý do mở rộng, nếu có"
+
+#: builtin/worktree.c:682
+msgid "add 'prunable' annotation to worktrees older than <time>"
+msgstr ""
+"thêm chú thích kiểu 'prunable' cho các cây làm việc hết hạn cũ hơn khoảng "
+"<thời gian>"
+
+#: builtin/worktree.c:691
+msgid "--verbose and --porcelain are mutually exclusive"
+msgstr "--verbose và --porcelain loại từ lẫn nhau"
+
+#: builtin/worktree.c:718
msgid "reason for locking"
msgstr "lý do khóa"
-#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
-#: builtin/worktree.c:919
+#: builtin/worktree.c:730 builtin/worktree.c:763 builtin/worktree.c:837
+#: builtin/worktree.c:961
#, c-format
msgid "'%s' is not a working tree"
msgstr "%s không phải là cây làm việc"
-#: builtin/worktree.c:687 builtin/worktree.c:720
+#: builtin/worktree.c:732 builtin/worktree.c:765
msgid "The main working tree cannot be locked or unlocked"
msgstr "Cây thư mục làm việc chính không thể khóa hay bỏ khóa được"
-#: builtin/worktree.c:692
+#: builtin/worktree.c:737
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "“%s” đã được khóa rồi, lý do: %s"
-#: builtin/worktree.c:694
+#: builtin/worktree.c:739
#, c-format
msgid "'%s' is already locked"
msgstr "“%s” đã được khóa rồi"
-#: builtin/worktree.c:722
+#: builtin/worktree.c:767
#, c-format
msgid "'%s' is not locked"
msgstr "“%s” chưa bị khóa"
-#: builtin/worktree.c:763
+#: builtin/worktree.c:808
msgid "working trees containing submodules cannot be moved or removed"
msgstr "cây làm việc có chứa mô-đun-con không thể di chuyển hay xóa bỏ"
-#: builtin/worktree.c:771
+#: builtin/worktree.c:816
msgid "force move even if worktree is dirty or locked"
msgstr "ép buộc ngay cả khi cây làm việc đang bẩn hay bị khóa"
-#: builtin/worktree.c:794 builtin/worktree.c:921
+#: builtin/worktree.c:839 builtin/worktree.c:963
#, c-format
msgid "'%s' is a main working tree"
msgstr "“%s” là cây làm việc chính"
-#: builtin/worktree.c:799
+#: builtin/worktree.c:844
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "không thể phác họa ra tên đích đến “%s”"
-#: builtin/worktree.c:805
-#, c-format
-msgid "target '%s' already exists"
-msgstr "đích “%s” đã tồn tại rồi"
-
-#: builtin/worktree.c:813
+#: builtin/worktree.c:857
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -22004,7 +23444,7 @@
"không thể di chuyển một cây-làm-việc bị khóa, khóa vì: %s\n"
"dùng “move -f -f” để ghi đè hoặc mở khóa trước đã"
-#: builtin/worktree.c:815
+#: builtin/worktree.c:859
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -22012,38 +23452,38 @@
"không thể di chuyển một cây-làm-việc bị khóa;\n"
"dùng “move -f -f” để ghi đè hoặc mở khóa trước đã"
-#: builtin/worktree.c:818
+#: builtin/worktree.c:862
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "thẩm tra gặp lỗi, không thể di chuyển một cây-làm-việc: %s"
-#: builtin/worktree.c:823
+#: builtin/worktree.c:867
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "gặp lỗi khi chuyển “%s” sang “%s”"
-#: builtin/worktree.c:871
+#: builtin/worktree.c:913
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "gặp lỗi khi chạy “git status” vào “%s”"
-#: builtin/worktree.c:875
+#: builtin/worktree.c:917
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr ""
"“%s” có chứa các tập tin đã bị sửa chữa hoặc chưa được theo dõi, hãy dùng --"
"force để xóa nó"
-#: builtin/worktree.c:880
+#: builtin/worktree.c:922
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "gặp lỗi khi chạy “git status” trong “%s”, mã %d"
-#: builtin/worktree.c:903
+#: builtin/worktree.c:945
msgid "force removal even if worktree is dirty or locked"
msgstr "ép buộc di chuyển thậm chí cả khi cây làm việc đang bẩn hay bị khóa"
-#: builtin/worktree.c:926
+#: builtin/worktree.c:968
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -22052,7 +23492,7 @@
"không thể xóa bỏ một cây-làm-việc bị khóa, khóa vì: %s\n"
"dùng “remove -f -f” để ghi đè hoặc mở khóa trước đã"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:970
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -22060,11 +23500,21 @@
"không thể xóa bỏ một cây-làm-việc bị khóa;\n"
"dùng “remove -f -f” để ghi đè hoặc mở khóa trước đã"
-#: builtin/worktree.c:931
+#: builtin/worktree.c:973
#, 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:997
+#, c-format
+msgid "repair: %s: %s"
+msgstr "sửa chữa: %s: %s"
+
+#: builtin/worktree.c:1000
+#, 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ố>/]"
@@ -22081,45 +23531,38 @@
msgid "only useful for debugging"
msgstr "chỉ hữu ích khi cần gỡ lỗi"
-#: fast-import.c:3125
+#: http-fetch.c:118
#, c-format
-msgid "Expected 'mark' command, got %s"
-msgstr "Cần lệnh 'mark', nhưng lại nhận được %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”)"
-#: fast-import.c:3130
-#, c-format
-msgid "Expected 'to' command, got %s"
-msgstr "Cần lệnh 'to', nhưng lại nhận được %s"
+#: http-fetch.c:128
+msgid "not a git repository"
+msgstr "không phải là kho git"
-#: fast-import.c:3254
-#, c-format
-msgid "feature '%s' forbidden in input without --allow-unsafe-features"
-msgstr ""
-"tính năng ' %s ' bị cấm chỉ trong đầu vào mà không có --allow-unsafe-features"
+#: http-fetch.c:134
+#| msgid "--pathspec-file-nul requires --pathspec-from-file"
+msgid "--packfile requires --index-pack-args"
+msgstr "--packfile cần --index-pack-args"
-#: credential-cache--daemon.c:223
-#, c-format
-msgid ""
-"The permissions on your socket directory are too loose; other\n"
-"users may be able to read your cached credentials. Consider running:\n"
-"\n"
-"\tchmod 0700 %s"
-msgstr ""
-"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"
+#: http-fetch.c:143
+msgid "--index-pack-args can only be used with --packfile"
+msgstr "--index-pack-args chỉ được dùng khi có --packfile"
-#: 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"
+#: t/helper/test-fast-rebase.c:141
+msgid "unhandled options"
+msgstr "các tùy chọn được không xử lý"
-#: t/helper/test-reach.c:152
+#: t/helper/test-fast-rebase.c:146
+msgid "error preparing revisions"
+msgstr "gặp lỗi khi chuẩn bị các điểm xét duyệt"
+
+#: 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"
@@ -22131,13 +23574,14 @@
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"
" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
"bare]\n"
" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
" <command> [<args>]"
msgstr ""
"git [--version] [--help] [-C </đường/dẫn/>] [-c <tên>=<giá trị>]\n"
@@ -22147,9 +23591,10 @@
"bare]\n"
" [--git-dir=</đường/dẫn/>] [--work-tree=</đường/dẫn/>] [--"
"namespace=<tên>]\n"
+" [--super-prefix=</đường/dẫn/>] [--config-env=<tên>=<envvar>]\n"
" <lệnh> [<các tham số>]"
-#: git.c:34
+#: git.c:36
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"
@@ -22159,49 +23604,49 @@
"“git help -a” và “git help -g” liệt kê các câu lệnh con sẵn có và một số\n"
"hướng dẫn về khái niệm. Xem “git help <lệnh>” hay “git help <khái-niệm>”\n"
"để 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."
+"Xem “git help git” để biết tổng quan của hệ thống."
-#: git.c:186
+#: git.c:188
#, 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:202
#, 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:216
#, 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:230
#, 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:252
#, 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:292
#, 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:318
#, c-format
msgid "unknown option: %s\n"
msgstr "không hiểu tùy chọn: %s\n"
-#: git.c:360
+#: git.c:367
#, c-format
msgid "while expanding alias '%s': '%s'"
msgstr "trong khi triển khai bí danh “%s”: “%s”"
-#: git.c:369
+#: git.c:376
#, c-format
msgid ""
"alias '%s' changes environment variables.\n"
@@ -22210,40 +23655,40 @@
"bí danh “%s” thay đổi biến môi trường.\n"
"Bạn có thể sử dụng “!git” trong đặt bí danh để làm việc này"
-#: git.c:376
+#: git.c:383
#, c-format
msgid "empty alias for %s"
msgstr "làm trống bí danh cho %s"
-#: git.c:379
+#: git.c:386
#, c-format
msgid "recursive alias: %s"
msgstr "đệ quy các bí danh: %s"
-#: git.c:459
+#: git.c:468
msgid "write failure on standard output"
msgstr "lỗi ghi nghiêm trong trên đầu ra tiêu chuẩn"
-#: git.c:461
+#: git.c:470
msgid "unknown write failure on standard output"
msgstr "lỗi nghiêm trọng chưa biết khi ghi ra đầu ra tiêu chuẩn"
-#: git.c:463
+#: git.c:472
msgid "close failed on standard output"
msgstr "gặp lỗi khi đóng đầu ra tiêu chuẩn"
-#: git.c:793
+#: git.c:823
#, 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:873
#, 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:886
#, c-format
msgid ""
"usage: %s\n"
@@ -22252,57 +23697,57 @@
"cách dùng: %s\n"
"\n"
-#: git.c:876
+#: git.c:906
#, 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:918
#, 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:1086
+#: 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:1093
+#: 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:1097
+#: 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:1966
+#: http.c:2025
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -22313,122 +23758,153 @@
" hỏi cho: %s\n"
" chuyển hướng: %s"
-#: remote-curl.c:166
+#: remote-curl.c:183
#, c-format
msgid "invalid quoting in push-option value: '%s'"
msgstr "sai trích dẫn trong giá trị push-option :“%s”"
-#: remote-curl.c:263
+#: remote-curl.c:307
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "%sinfo/refs không hợp lệ: đây có phải là một kho git?"
-#: remote-curl.c:364
+#: remote-curl.c:408
msgid "invalid server response; expected service, got flush packet"
msgstr ""
"đáp ứng từ máy phục vụ không hợp lệ; cần dịch vụ, nhưng lại nhận được gói "
"flush"
-#: remote-curl.c:395
+#: remote-curl.c:439
#, c-format
msgid "invalid server response; got '%s'"
msgstr "trả về của máy phục vụ không hợp lệ; nhận được %s"
-#: remote-curl.c:455
+#: remote-curl.c:499
#, c-format
msgid "repository '%s' not found"
msgstr "không tìm thấy kho “%s”"
-#: remote-curl.c:459
+#: remote-curl.c:503
#, c-format
msgid "Authentication failed for '%s'"
msgstr "Xác thực gặp lỗi cho “%s”"
-#: remote-curl.c:463
+#: remote-curl.c:507
#, c-format
msgid "unable to access '%s': %s"
msgstr "không thể truy cập “%s”: %s"
-#: remote-curl.c:469
+#: remote-curl.c:513
#, c-format
msgid "redirecting to %s"
msgstr "chuyển hướng đến %s"
-#: remote-curl.c:593
+#: remote-curl.c:642
msgid "shouldn't have EOF when not gentle on EOF"
msgstr "không nên có EOF khi không gentle trên EOF"
-#: remote-curl.c:673
+#: remote-curl.c:654
+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:724
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr "không thể tua lại dữ liệu post rpc - thử tăng http.postBuffer"
-#: remote-curl.c:733
+#: remote-curl.c:754
+#, 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:756
+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:832
#, c-format
msgid "RPC failed; %s"
msgstr "RPC gặp lỗi; %s"
-#: remote-curl.c:773
+#: remote-curl.c:872
msgid "cannot handle pushes this big"
msgstr "không thể xử lý đẩy cái lớn này"
-#: remote-curl.c:888
+#: remote-curl.c:987
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr "không thể giải nén yêu cầu; có lỗi khi giải nén của zlib %d"
-#: remote-curl.c:892
+#: remote-curl.c:991
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr "không thể giải nén yêu cầu; có lỗi ở cuối %d"
-#: remote-curl.c:1023
+#: remote-curl.c:1041
+#, 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:1043
+#, 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:1132
msgid "dumb http transport does not support shallow capabilities"
msgstr "đổ vận chuyển http không hỗ trợ khả năng nông"
-#: remote-curl.c:1038
+#: remote-curl.c:1147
msgid "fetch failed."
msgstr "lấy về gặp lỗi."
-#: remote-curl.c:1086
+#: remote-curl.c:1193
msgid "cannot fetch by sha1 over smart http"
msgstr "không thể lấy về bằng sha1 thông qua smart http"
-#: remote-curl.c:1130 remote-curl.c:1136
+#: remote-curl.c:1237 remote-curl.c:1243
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "lỗi giao thức: cần sha/ref, nhưng lại nhận được “%s”"
-#: remote-curl.c:1148 remote-curl.c:1263
+#: remote-curl.c:1255 remote-curl.c:1373
#, c-format
msgid "http transport does not support %s"
msgstr "vận chuyển http không hỗ trợ %s"
-#: remote-curl.c:1184
+#: remote-curl.c:1291
msgid "git-http-push failed"
msgstr "git-http-push gặp lỗi"
-#: remote-curl.c:1369
+#: remote-curl.c:1479
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl: usage: git remote-curl <máy chủ> [<url>]"
-#: remote-curl.c:1401
+#: remote-curl.c:1511
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl: gặp lỗi khi đọc luồng dữ liệu lệnh từ git"
-#: remote-curl.c:1408
+#: remote-curl.c:1518
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl: đã cố gắng fetch mà không có kho nội bộ"
-#: remote-curl.c:1448
+#: remote-curl.c:1559
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl: không hiểu lệnh “%s” từ git"
-#: list-objects-filter-options.h:85
+#: 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:86
+#: list-objects-filter-options.h:92
msgid "object filtering"
msgstr "lọc đối tượng"
@@ -22449,8 +23925,8 @@
msgstr "im lặng hơn nữa"
#: parse-options.h:317
-msgid "use <n> digits to display SHA-1s"
-msgstr "sử dụng <n> chữ số để hiển thị SHA-1s"
+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:336
msgid "how to strip spaces and #comments from message"
@@ -22467,11 +23943,11 @@
"với --pathspec-from-file, các phần tử đặc tả đường dẫn bị ngăn cách bởi ký "
"tự NULL"
-#: ref-filter.h:101
+#: ref-filter.h:99
msgid "key"
msgstr "khóa"
-#: ref-filter.h:101
+#: ref-filter.h:99
msgid "field name to sort on"
msgstr "tên trường cần sắp xếp"
@@ -22479,14 +23955,6 @@
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
-msgid "HEAD detached at "
-msgstr "HEAD được tách rời tại "
-
-#: wt-status.h:68
-msgid "HEAD detached from "
-msgstr "HEAD được tách rời từ "
-
#: command-list.h:50
msgid "Add file contents to the index"
msgstr "Thêm nội dung tập tin vào bảng mục lục"
@@ -22527,688 +23995,668 @@
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 "Run a Git command on a list of repositories"
+msgstr "Chạy lệnh Git trên danh sách các kho chứa"
+
+#: command-list.h:100
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:101
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:102
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:103
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:104
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:105
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:106
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:107
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:108
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:109
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:110
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:111
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:112
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:113
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:114
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:115
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:116
msgid "The Git repository browser"
msgstr "Bộ duyện kho Git"
-#: command-list.h:115
+#: command-list.h:117
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:118
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:119
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:120
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:121
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:122
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:123
+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:124
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:125
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:126
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:127
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:128
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:129
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:130
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:131
msgid "Write and verify multi-pack-indexes"
msgstr "Ghi và thẩm tra các multi-pack-indexes"
-#: command-list.h:129
-msgid "Creates a tag object"
-msgstr "Tạo một đối tượng thẻ"
+#: command-list.h:132
+msgid "Creates a tag object with extra validation"
+msgstr "Tạo một đối tượng thẻ với kiểm tra mở rộng"
-#: command-list.h:130
+#: command-list.h:133
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:134
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:135
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:136
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:137
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:138
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:139
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:140
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
-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:172
+#: 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:173
+#: 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:174
+#: 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:175
+#: 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:176
+#: 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:177
+#: 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:178
+#: command-list.h:180
msgid "Switch branches"
msgstr "Các nhánh chuyển"
-#: command-list.h:179
+#: 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:180
+#: 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:181
+#: 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:182
+#: 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:183
+#: 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:184
+#: 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:185
+#: 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:186
-msgid "Send archive back to git-archive"
-msgstr "Gửi trở lại kho lưu đến git-archive"
-
-#: command-list.h:187
-msgid "Send objects packed back to git-fetch-pack"
-msgstr "Gửi trở lại các đối tượng đã đóng gói cho git-fetch-pack"
-
#: command-list.h:188
+msgid "Send archive back to git-archive"
+msgstr "Gửi kho lưu trở lại cho git-archive"
+
+#: command-list.h:189
+msgid "Send objects packed back to git-fetch-pack"
+msgstr "Gửi các đối tượng đã đóng gói trở lại cho git-fetch-pack"
+
+#: 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:189
+#: 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:190
+#: 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:191
+#: 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:192
+#: 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:193
+#: 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:194
+#: command-list.h:196
msgid "Manage multiple working trees"
msgstr "Quản lý nhiều cây làm việc"
-#: command-list.h:195
+#: 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:196
+#: 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:197
+#: 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:198
+#: 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:199
+#: 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:200
+#: command-list.h:203
msgid "Tweaking diff output"
msgstr "Chỉnh kết xuất diff"
-#: command-list.h:201
+#: 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:202
+#: 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:203
+#: command-list.h:207
msgid "Hooks used by Git"
msgstr "Các móc được sử dụng bởi Git"
-#: command-list.h:204
+#: 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:205
+#: command-list.h:209
+msgid "Map author/committer names and/or E-Mail addresses"
+msgstr "Ánh xạ tên tác giả/người chuyển giao và/hoặc địa chỉ E-Mail"
+
+#: command-list.h:210
msgid "Defining submodule properties"
msgstr "Định nghĩa thuộc tính mô-đun-con"
-#: command-list.h:206
+#: command-list.h:211
msgid "Git namespaces"
msgstr "Không gian tên Git"
-#: command-list.h:207
+#: command-list.h:212
+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:213
msgid "Git Repository Layout"
msgstr "Bố cục kho Git"
-#: command-list.h:208
+#: command-list.h:214
msgid "Specifying revisions and ranges for Git"
msgstr "Chỉ định điểm xét duyệt và vùng cho Git"
-#: command-list.h:209
+#: command-list.h:215
msgid "Mounting one repository inside another"
msgstr "Gắn một kho chứa vào trong một cái khác"
-#: command-list.h:210
+#: command-list.h:216
msgid "A tutorial introduction to Git: part two"
msgstr "Hướng dẫn cách dùng Git: phần hai"
-#: command-list.h:211
+#: command-list.h:217
msgid "A tutorial introduction to Git"
msgstr "Hướng dẫn cách dùng Git"
-#: command-list.h:212
+#: command-list.h:218
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
-#, sh-format
-msgid "Bad rev input: $arg"
-msgstr "Đầu vào rev sai: $arg"
-
-#: git-bisect.sh:121
-#, sh-format
-msgid "Bad rev input: $bisected_head"
-msgstr "Đầu vào rev sai: $bisected_head"
-
-#: git-bisect.sh:130
-#, sh-format
-msgid "Bad rev input: $rev"
-msgstr "Đầu vào rev sai: $rev"
-
-#: git-bisect.sh:139
-#, 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
-msgid "No logfile given"
-msgstr "Chưa chỉ ra tập tin ghi nhật ký"
-
-#: git-bisect.sh:210
-#, sh-format
-msgid "cannot read $file for replaying"
-msgstr "không thể đọc $file để thao diễn lại"
-
-#: git-bisect.sh:232
-msgid "?? what are you talking about?"
-msgstr "?? bạn đang nói gì thế?"
-
-#: git-bisect.sh:241
+#: git-bisect.sh:68
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:73
#, sh-format
msgid "running $command"
msgstr "đang chạy lệnh $command"
-#: git-bisect.sh:253
+#: git-bisect.sh:80
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -23217,27 +24665,23 @@
"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:105
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:111
#, sh-format
msgid ""
"bisect run failed:\n"
-"'bisect_state $state' exited with error code $res"
+"'bisect-state $state' exited with error code $res"
msgstr ""
"chạy bisect gặp lỗi:\n"
-"”bisect_state $state” đã thoát ra với mã lỗi $res"
+"”bisect-state $state” đã thoát ra với mã lỗi $res"
-#: git-bisect.sh:292
+#: git-bisect.sh:118
msgid "bisect run success"
msgstr "bisect chạy thành công"
-#: git-bisect.sh:300
-msgid "We are not bisecting."
-msgstr "Chúng tôi không bisect."
-
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
@@ -23278,134 +24722,52 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "Hòa trộn đơn giản không làm việc, thử hòa trộn tự động."
-#: git-legacy-stash.sh:221
-msgid "Cannot remove temporary index (can't happen)"
-msgstr "Không thể gỡ bỏ bảng mục lục tạm thời (không thể xảy ra)"
-
-#: git-legacy-stash.sh:272
-#, sh-format
-msgid "Cannot update $ref_stash with $w_commit"
-msgstr "Không thể cập nhật $ref_stash với $w_commit"
-
-#: git-legacy-stash.sh:324
-#, sh-format
-msgid "error: unknown option for 'stash push': $option"
-msgstr "lỗi: không hiểu tùy chọn cho “stash push”: $option"
-
-#: git-legacy-stash.sh:356
-#, sh-format
-msgid "Saved working directory and index state $stash_msg"
-msgstr "Đã ghi lại thư mục làm việc và trạng thái mục lục $stash_msg"
-
-#: git-legacy-stash.sh:536
-#, sh-format
-msgid "unknown option: $opt"
-msgstr "không hiểu tùy chọn: $opt"
-
-#: git-legacy-stash.sh:556
-#, sh-format
-msgid "Too many revisions specified: $REV"
-msgstr "Chỉ ra quá nhiều điểm xét duyệt: $REV"
-
-#: git-legacy-stash.sh:571
-#, sh-format
-msgid "$reference is not a valid reference"
-msgstr "$reference không phải là tham chiếu hợp lệ"
-
-#: git-legacy-stash.sh:599
-#, sh-format
-msgid "'$args' is not a stash-like commit"
-msgstr "“$args” không phải là lần chuyển giao kiểu-stash (cất đi)"
-
-#: git-legacy-stash.sh:610
-#, sh-format
-msgid "'$args' is not a stash reference"
-msgstr "”$args” không phải tham chiếu đến stash"
-
-#: git-legacy-stash.sh:618
-msgid "unable to refresh index"
-msgstr "không thể làm tươi mới bảng mục lục"
-
-#: git-legacy-stash.sh:622
-msgid "Cannot apply a stash in the middle of a merge"
-msgstr "Không thể áp dụng một stash ở giữa của quá trình hòa trộn"
-
-#: git-legacy-stash.sh:630
-msgid "Conflicts in index. Try without --index."
-msgstr "Xung đột trong bảng mục lục. Hãy thử mà không dùng tùy chọn --index."
-
-#: git-legacy-stash.sh:632
-msgid "Could not save index tree"
-msgstr "Không thể ghi lại cây chỉ mục"
-
-#: git-legacy-stash.sh:641
-msgid "Could not restore untracked files from stash entry"
-msgstr "Không thể phục hồi các tập tin chưa theo dõi từ mục cất đi (stash)"
-
-#: git-legacy-stash.sh:666
-msgid "Cannot unstage modified files"
-msgstr "Không thể bỏ ra khỏi bệ phóng các tập tin đã được sửa chữa"
-
-#: git-legacy-stash.sh:704
-#, sh-format
-msgid "Dropped ${REV} ($s)"
-msgstr "Đã xóa ${REV} ($s)"
-
-#: git-legacy-stash.sh:705
-#, sh-format
-msgid "${REV}: Could not drop stash entry"
-msgstr "${REV}: Không thể xóa bỏ mục stash"
-
-#: git-legacy-stash.sh:792
-msgid "(To restore them type \"git stash apply\")"
-msgstr "(Để phục hồi lại chúng hãy gõ \"git stash apply\")"
-
-#: git-submodule.sh:203
+#: git-submodule.sh:179
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr ""
"Đường dẫn tương đối chỉ có thể dùng từ thư mục ở mức cao nhất của cây làm "
"việc"
-#: git-submodule.sh:213
+#: git-submodule.sh:189
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
"repo URL: “$repo” phải là đường dẫn tuyệt đối hoặc là bắt đầu bằng ./|../"
-#: git-submodule.sh:232
+#: git-submodule.sh:208
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "”$sm_path” thực sự đã tồn tại ở bảng mục lục rồi"
-#: git-submodule.sh:235
+#: git-submodule.sh:211
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr ""
"”$sm_path” thực sự đã tồn tại ở bảng mục lục rồi và không phải là một mô-đun-"
"con"
-#: git-submodule.sh:242
+#: git-submodule.sh:218
#, sh-format
msgid "'$sm_path' does not have a commit checked out"
msgstr "“$sm_path” không có lần chuyển giao nào được lấy ra"
-#: git-submodule.sh:273
+#: git-submodule.sh:249
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Đang thêm repo có sẵn tại “$sm_path” vào bảng mục lục"
-#: git-submodule.sh:275
+#: git-submodule.sh:251
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "”$sm_path” đã tồn tại từ trước và không phải là một kho git hợp lệ"
-#: git-submodule.sh:283
+#: git-submodule.sh:259
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr ""
"Thư mục git cho “$sm_name” được tìm thấy một cách cục bộ với các máy chủ:"
-#: git-submodule.sh:285
+#: git-submodule.sh:261
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -23421,40 +24783,40 @@
"hoặc là bạn không chắc chắn điều đó nghĩa là gì thì chọn tên khác với tùy "
"chọn “--name”."
-#: git-submodule.sh:291
+#: git-submodule.sh:267
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr ""
"Phục hồi sự hoạt động của thư mục git nội bộ cho mô-đun-con “$sm_name”."
-#: git-submodule.sh:303
+#: git-submodule.sh:279
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Không thể lấy ra mô-đun-con “$sm_path”"
-#: git-submodule.sh:308
+#: git-submodule.sh:284
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Gặp lỗi khi thêm mô-đun-con “$sm_path”"
-#: git-submodule.sh:317
+#: git-submodule.sh:293
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Gặp lỗi khi đăng ký với hệ thống mô-đun-con “$sm_path”"
-#: git-submodule.sh:590
+#: git-submodule.sh:568
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
"Không tìm thấy điểm xét duyệt hiện hành trong đường dẫn mô-đun-con "
"“$displaypath”"
-#: git-submodule.sh:600
+#: git-submodule.sh:578
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Không thể lấy về trong đường dẫn mô-đun-con “$sm_path”"
-#: git-submodule.sh:605
+#: git-submodule.sh:583
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -23463,7 +24825,7 @@
"Không thể tìm thấy điểm xét duyệt hiện hành ${remote_name}/${branch} trong "
"đường dẫn mô-đun-con “$sm_path”"
-#: git-submodule.sh:623
+#: git-submodule.sh:601
#, sh-format
msgid ""
"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
@@ -23472,7 +24834,7 @@
"Không thể lấy về trong đường dẫn mô-đun-con “$displaypath”; thử lấy về trực "
"tiếp $sha1:"
-#: git-submodule.sh:629
+#: git-submodule.sh:607
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -23481,85 +24843,54 @@
"Đã lấy về từ đường dẫn mô-đun con “$displaypath”, nhưng nó không chứa $sha1. "
"Lấy về theo định hướng của lần chuyển giao đó gặp lỗi."
-#: git-submodule.sh:636
+#: git-submodule.sh:614
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "Không thể lấy ra “$sha1” trong đường dẫn mô-đun-con “$displaypath”"
-#: git-submodule.sh:637
+#: git-submodule.sh:615
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Đường dẫn mô-đun-con “$displaypath”: đã checkout “$sha1”"
-#: git-submodule.sh:641
+#: git-submodule.sh:619
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "Không thể cải tổ “$sha1” trong đường dẫn mô-đun-con “$displaypath”"
-#: git-submodule.sh:642
+#: git-submodule.sh:620
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Đường dẫn mô-đun-con “$displaypath”: được rebase vào trong “$sha1”"
-#: git-submodule.sh:647
+#: git-submodule.sh:625
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
"Không thể hòa trộn (merge) “$sha1” trong đường dẫn mô-đun-con “$displaypath”"
-#: git-submodule.sh:648
+#: git-submodule.sh:626
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Đường dẫn mô-đun-con “$displaypath”: được hòa trộn vào “$sha1”"
-#: git-submodule.sh:653
+#: git-submodule.sh:631
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"Thực hiện không thành công lệnh “$command $sha1” trong đường dẫn mô-đun-con "
"“$displaypath”"
-#: git-submodule.sh:654
+#: git-submodule.sh:632
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Đường dẫn mô-đun-con “$displaypath”: “$command $sha1”"
-#: git-submodule.sh:685
+#: git-submodule.sh:663
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Gặp lỗi khi đệ quy vào trong đường dẫn mô-đun-con “$displaypath”"
-#: git-submodule.sh:896
-msgid "The --cached option cannot be used with the --files option"
-msgstr "Tùy chọn --cached không thể dùng cùng với tùy chọn --files"
-
-#: git-submodule.sh:948
-#, sh-format
-msgid "unexpected mode $mod_dst"
-msgstr "chế độ không như mong chờ $mod_dst"
-
-#: git-submodule.sh:968
-#, sh-format
-msgid " Warn: $display_name doesn't contain commit $sha1_src"
-msgstr " Cảnh báo: $display_name không chứa lần chuyển giao $sha1_src"
-
-#: git-submodule.sh:971
-#, sh-format
-msgid " Warn: $display_name doesn't contain commit $sha1_dst"
-msgstr " Cảnh báo: $display_name không chứa lần chuyển giao $sha1_dst"
-
-#: git-submodule.sh:974
-#, 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."
-msgstr "Xem git-${cmd}(1) để biết thêm chi tiết."
-
#: git-rebase--preserve-merges.sh:109
msgid "Applied autostash."
msgstr "Đã áp dụng autostash."
@@ -23569,12 +24900,23 @@
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"
@@ -23617,7 +24959,7 @@
"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"
@@ -23636,82 +24978,82 @@
"\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"
@@ -23727,31 +25069,31 @@
"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"
@@ -23762,7 +25104,7 @@
"\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"
@@ -23777,25 +25119,25 @@
"\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"
@@ -23826,11 +25168,11 @@
"\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."
@@ -23839,43 +25181,43 @@
"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:955
+#: 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: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 "Không thể khởi tạo các lần chuyển giao ghi lại"
@@ -23951,13 +25293,13 @@
msgid "%12s %12s %s"
msgstr "%12s %12s %s"
-#: git-add--interactive.perl:634
+#: git-add--interactive.perl:632
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] "%d đường dẫn đã touch (chạm)\n"
-#: git-add--interactive.perl:1053
+#: git-add--interactive.perl:1056
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
@@ -23965,7 +25307,7 @@
"Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức\n"
"được đánh dấu để chuyển lên bệ phóng."
-#: git-add--interactive.perl:1056
+#: git-add--interactive.perl:1059
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
@@ -23973,7 +25315,7 @@
"Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức\n"
"được đánh dấu để tạm cất."
-#: git-add--interactive.perl:1059
+#: git-add--interactive.perl:1062
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
@@ -23981,8 +25323,8 @@
"Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức\n"
"được đánh dấu để bỏ chuyển lên bệ phóng."
-#: git-add--interactive.perl:1062 git-add--interactive.perl:1071
-#: git-add--interactive.perl:1077
+#: git-add--interactive.perl:1065 git-add--interactive.perl:1074
+#: git-add--interactive.perl:1080
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
@@ -23990,8 +25332,8 @@
"Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức\n"
"được đánh dấu để áp dụng."
-#: git-add--interactive.perl:1065 git-add--interactive.perl:1068
-#: git-add--interactive.perl:1074
+#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
+#: git-add--interactive.perl:1077
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
@@ -23999,12 +25341,12 @@
"Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức\n"
"được đánh dấu để loại bỏ."
-#: git-add--interactive.perl:1111
+#: git-add--interactive.perl:1114
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr "gặp lỗi khi tập tin sửa khúc để ghi: %s"
-#: git-add--interactive.perl:1118
+#: git-add--interactive.perl:1121
#, perl-format
msgid ""
"---\n"
@@ -24017,12 +25359,12 @@
"Để xóa bỏ dòng “%s”, xóa chúng đi.\n"
"Những dòng bắt đầu bằng %s sẽ bị loại bỏ.\n"
-#: git-add--interactive.perl:1140
+#: git-add--interactive.perl:1143
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr "gặp lỗi khi mở tập tin khúc để đọc: %s"
-#: git-add--interactive.perl:1248
+#: git-add--interactive.perl:1251
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -24037,7 +25379,7 @@
"d - đừng đưa lên bệ phóng khúc này cũng như bất kỳ cái nào còn lại trong tập "
"tin"
-#: git-add--interactive.perl:1254
+#: git-add--interactive.perl:1257
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -24051,7 +25393,7 @@
"a - tạm cất khúc này và tất cả các khúc sau này trong tập tin\n"
"d - đừng tạm cất khúc này cũng như bất kỳ cái nào còn lại trong tập tin"
-#: git-add--interactive.perl:1260
+#: git-add--interactive.perl:1263
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -24067,7 +25409,7 @@
"d - đừng đưa ra khỏi bệ phóng khúc này cũng như bất kỳ cái nào còn lại trong "
"tập tin"
-#: git-add--interactive.perl:1266
+#: git-add--interactive.perl:1269
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -24081,7 +25423,7 @@
"a - áp dụng khúc này và tất cả các khúc sau này trong tập tin\n"
"d - đừng áp dụng khúc này cũng như bất kỳ cái nào sau này trong tập tin"
-#: git-add--interactive.perl:1272 git-add--interactive.perl:1290
+#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -24095,7 +25437,7 @@
"a - loại bỏ khúc này và tất cả các khúc sau này trong tập tin\n"
"d - đừng loại bỏ khúc này cũng như bất kỳ cái nào sau này trong tập tin"
-#: git-add--interactive.perl:1278
+#: git-add--interactive.perl:1281
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -24109,7 +25451,7 @@
"a - loại bỏ khúc này và tất cả các khúc sau này trong tập tin\n"
"d - đừng loại bỏ khúc này cũng như bất kỳ cái nào sau này trong tập tin"
-#: git-add--interactive.perl:1284
+#: git-add--interactive.perl:1287
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -24123,7 +25465,7 @@
"a - áp dụng khúc này và tất cả các khúc sau này trong tập tin\n"
"d - đừng áp dụng khúc này cũng như bất kỳ cái nào sau này trong tập tin"
-#: git-add--interactive.perl:1296
+#: git-add--interactive.perl:1299
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -24137,7 +25479,7 @@
"a - áp dụng khúc này và tất cả các khúc sau này trong tập tin\n"
"d - đừng áp dụng khúc này cũng như bất kỳ cái nào sau này trong tập tin"
-#: git-add--interactive.perl:1311
+#: git-add--interactive.perl:1314
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -24159,83 +25501,88 @@
"e - sửa bằng tay khúc hiện hành\n"
"? - in trợ giúp\n"
-#: git-add--interactive.perl:1342
+#: git-add--interactive.perl:1345
msgid "The selected hunks do not apply to the index!\n"
msgstr "Các khúc đã chọn không được áp dụng vào bảng mục lục!\n"
-#: git-add--interactive.perl:1357
+#: git-add--interactive.perl:1360
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "bỏ qua những thứ chưa hòa trộn: %s\n"
-#: git-add--interactive.perl:1468
+#: git-add--interactive.perl:1479
#, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr "Áp dụng thay đổi chế độ cho cây làm việc [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1469
+#: git-add--interactive.perl:1480
#, perl-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
msgstr "Áp dụng việc xóa cho cây làm việc [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1470
+#: git-add--interactive.perl:1481
+#, 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:1482
#, perl-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr "Áp dụng khúc này vào cây làm việc [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1570
+#: git-add--interactive.perl:1599
msgid "No other hunks to goto\n"
msgstr "Không còn khúc nào để mà nhảy đến\n"
-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1617
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "Số không hợp lệ: “%s”\n"
-#: git-add--interactive.perl:1593
+#: git-add--interactive.perl:1622
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "Rất tiếc, chỉ có sẵn %d khúc.\n"
-#: git-add--interactive.perl:1619
+#: git-add--interactive.perl:1657
msgid "No other hunks to search\n"
msgstr "Không còn khúc nào để mà tìm kiếm\n"
-#: git-add--interactive.perl:1636
+#: git-add--interactive.perl:1674
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "Định dạng tìm kiếm của biểu thức chính quy không đúng %s: %s\n"
-#: git-add--interactive.perl:1646
+#: git-add--interactive.perl:1684
msgid "No hunk matches the given pattern\n"
msgstr "Không thấy khúc nào khớp mẫu đã cho\n"
-#: git-add--interactive.perl:1658 git-add--interactive.perl:1680
+#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
msgid "No previous hunk\n"
msgstr "Không có khúc kế trước\n"
-#: git-add--interactive.perl:1667 git-add--interactive.perl:1686
+#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
msgid "No next hunk\n"
msgstr "Không có khúc kế tiếp\n"
-#: git-add--interactive.perl:1692
+#: git-add--interactive.perl:1730
msgid "Sorry, cannot split this hunk\n"
msgstr "Rất tiếc, không thể chia nhỏ khúc này\n"
-#: git-add--interactive.perl:1698
+#: git-add--interactive.perl:1736
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "Chi nhỏ thành %d khúc.\n"
-#: git-add--interactive.perl:1708
+#: git-add--interactive.perl:1746
msgid "Sorry, cannot edit this hunk\n"
msgstr "Rất tiếc, không thể sửa khúc này\n"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1773
+#: git-add--interactive.perl:1811
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
@@ -24255,19 +25602,19 @@
"add untracked - thêm nội dung các các tập tin chưa theo dõi và tập hợp các "
"thay đổi đã đặt lên bệ phóng\n"
-#: git-add--interactive.perl:1790 git-add--interactive.perl:1795
-#: git-add--interactive.perl:1798 git-add--interactive.perl:1805
-#: git-add--interactive.perl:1808 git-add--interactive.perl:1815
-#: git-add--interactive.perl:1819 git-add--interactive.perl:1825
+#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
+#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
+#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
+#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
msgid "missing --"
msgstr "thiếu --"
-#: git-add--interactive.perl:1821
+#: git-add--interactive.perl:1866
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "không hiểu chế độ --patch: %s"
-#: git-add--interactive.perl:1827 git-add--interactive.perl:1833
+#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "đối số không hợp lệ %s, cần --"
@@ -24284,26 +25631,36 @@
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"
@@ -24311,37 +25668,37 @@
"“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"
@@ -24356,12 +25713,12 @@
" * 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"
@@ -24370,7 +25727,7 @@
"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"
@@ -24380,17 +25737,17 @@
"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"
@@ -24404,27 +25761,27 @@
"\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"
@@ -24432,11 +25789,11 @@
"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"
@@ -24449,20 +25806,20 @@
"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"
@@ -24470,16 +25827,16 @@
#. 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"
@@ -24506,143 +25863,559 @@
#. 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 "repository contains replace objects; skipping commit-graph"
+#~ msgstr ""
+#~ "kho lưu trữ chứa các đối tượng thay thế; bỏ qua sơ đồ lần chuyển giao"
+
+#~ msgid "repository contains (deprecated) grafts; skipping commit-graph"
+#~ msgstr ""
+#~ "kho lưu trữ chứa các mối ghép (đã lạc hậu); bỏ qua sơ đồ các lần chuyển "
+#~ "giao"
+
+#~ msgid "repository is shallow; skipping commit-graph"
+#~ msgstr "kho nguồn là nông, nên bỏ qua commit-graph"
+
#, 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"
+
+#, 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"
+
+#~ msgid "invalid chunk offset (too large)"
+#~ msgstr "khoảng bù đoạn không hợp lệ (quá lớn)"
+
+#~ msgid "Writing chunks to multi-pack-index"
+#~ msgstr "Đang ghi các khúc vào multi-pack-index"
+
+#~ msgid "rev-list died"
+#~ msgstr "rev-list đã chết"
+
+#~ msgid ""
+#~ "git bisect--helper --bisect-write [--no-log] <state> <revision> "
+#~ "<good_term> <bad_term>"
+#~ msgstr ""
+#~ "git bisect--helper --bisect-write [--no-log] <state> <revision> <lúc_sai> "
+#~ "<lúc_đúng>"
+
+#~ msgid ""
+#~ "git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
+#~ "<bad_term>"
+#~ msgstr ""
+#~ "git bisect--helper --bisect-check-and-set-terms <command> <lúc_sai> "
+#~ "<lúc_đúng>"
+
+#~ msgid "git bisect--helper --bisect-auto-next"
+#~ msgstr "git bisect--helper --bisect-auto-next"
+
+#~ 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"
+
+#~ 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"
+
+#~ msgid ""
+#~ "verify the next bisection state then checkout the next bisection commit"
+#~ msgstr ""
+#~ "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ế"
+
+#~ msgid "--bisect-write requires either 4 or 5 arguments"
+#~ msgstr "--bisect-write cần 4 hoặc 5 tham số"
+
+#~ msgid "--check-and-set-terms requires 3 arguments"
+#~ msgstr "--check-and-set-terms cần 3 tham số"
+
+#~ msgid "--bisect-auto-next requires 0 arguments"
+#~ msgstr "--bisect-auto-next cần 0 tham số"
+
+#~ msgid "Force progress reporting"
+#~ msgstr "Ép buộc báo cáo diễn biến công việc"
+
+#, c-format
+#~ msgid "Error deleting remote-tracking branch '%s'"
+#~ msgstr "Gặp lỗi khi đang xóa nhánh theo dõi máy chủ “%s”"
+
+#, c-format
+#~ msgid "Error deleting branch '%s'"
+#~ msgstr "Gặp lỗi khi xóa bỏ nhánh “%s”"
+
+#~ 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)"
+
+#~ msgid "too many parameters"
+#~ msgstr "quá nhiều đối số"
+
+#~ msgid "too few parameters"
+#~ msgstr "quá ít đối số"
+
+#~ msgid "Recurse into nested submodules"
+#~ msgstr "Đệ quy vào trong các mô-đun-con lồng nhau"
+
+#~ msgid "too many params"
+#~ msgstr "quá nhiều đối số"
+
+#, sh-format
+#~ msgid "Bad rev input: $arg"
+#~ msgstr "Đầu vào rev sai: $arg"
+
+#~ 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"
+
+#, 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"
+
+#~ msgid "store only"
+#~ msgstr "chỉ lưu (không nén)"
+
+#~ msgid "compress faster"
+#~ msgstr "nén nhanh hơn"
+
+#~ msgid "compress better"
+#~ msgstr "nén nhỏ hơn"
+
+#~ msgid "unexpected duplicate commit id %s"
+#~ msgstr "gặp mã số tích lần chuyển giao bị trùng lặp “%s”"
+
+#~ msgid "error preparing packfile from multi-pack-index"
+#~ msgstr "lỗi chuẩn bị tập tin gói từ multi-pack-index"
+
+#~ msgid "%s: not a valid OID"
+#~ msgstr "%s không phải là một OID hợp lệ"
+
+#~ msgid "invalid committer '%s'"
+#~ msgstr "chuyển giao không hợp lệ “%s”"
+
+#~ msgid "invalid committer: %s"
+#~ msgstr "chuyển giao không hợp lệ: %s"
+
+#~ msgid "git bisect--helper --next-all"
+#~ msgstr "git bisect--helper --next-all"
+
+#~ msgid "git bisect--helper --write-terms <bad_term> <good_term>"
+#~ msgstr "git bisect--helper --write-terms <bad_term> <good_term>"
+
+#~ msgid "git bisect--helper --bisect-autostart"
+#~ msgstr "git bisect--helper --bisect-autostart"
+
+#~ msgid "perform 'git bisect next'"
+#~ msgstr "thực hiện “git bisect next”"
+
+#~ msgid "write the terms to .git/BISECT_TERMS"
+#~ msgstr "ghi thời kỳ vào .git/BISECT_TERMS"
+
+#~ msgid "cleanup the bisection state"
+#~ msgstr "dọn dẹp tình trạng di chuyển nửa bước"
+
+#~ msgid "check for expected revs"
+#~ msgstr "kiểm tra cho điểm xem xét cần dùng"
+
+#~ 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"
+
+#~ msgid "--write-terms requires two arguments"
+#~ msgstr "--write-terms cần hai tham số"
+
+#~ msgid "--bisect-clean-state requires no arguments"
+#~ msgstr "--bisect-clean-state không nhận đối số"
+
+#~ msgid "--bisect-autostart does not accept arguments"
+#~ msgstr "--bisect-autostart không nhận đối số"
+
+#~ msgid "n,m"
+#~ msgstr "n,m"
+
+#~ 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"
+
+#~ msgid "name of output directory is too long"
+#~ msgstr "tên của thư mục kết xuất quá dài"
+
+#~ msgid "standard output, or directory, which one?"
+#~ msgstr "đầu ra chuẩn, hay thư mục, chọn cái nào?"
+
+#~ 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 ""
+#~ "CẢNH BÁO: Một số gói đang dùng vừa được đổi tên bằng cách\n"
+#~ "CẢNH BÁO: đánh tiền tố old- vào tên của chúng, mục đích là\n"
+#~ "CẢNH BÁO: thay chúng bằng phiên bản mới của tập\n"
+#~ "CẢNH BÁO: tin. Nhưng thao tác lại gặp lỗi, và nỗ\n"
+#~ "CẢNH BÁO: lực để đổi ngược lại tên chúng cho đúng với tên\n"
+#~ "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"
+
+#~ msgid "failed to remove '%s'"
+#~ msgstr "gặp lỗi khi gỡ bỏ “%s”"
+
+#~ 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"
+
+#~ msgid "Bad rev input: $bisected_head"
+#~ msgstr "Đầu vào rev sai: $bisected_head"
+
+#~ msgid "Bad rev input: $rev"
+#~ msgstr "Đầu vào rev sai: $rev"
+
+#~ msgid "See git-${cmd}(1) for details."
+#~ msgstr "Xem git-${cmd}(1) để biết thêm chi tiết."
+
+#~ 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"
+
+#~ 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"
+
+#~ msgid "%%(subject) does not take arguments"
+#~ msgstr "%%(subject) không nhận các đối số"
+
+#~ msgid "positive value expected objectname:short=%s"
+#~ msgstr "cần nội dung mang giá trị dương:shot=%s"
+
+#~ msgid "unrecognized %%(objectname) argument: %s"
+#~ msgstr "đối số không được thừa nhận %%(objectname): %s"
+
+#~ 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 "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 "could not open '%s' for writing: %s"
+#~ msgstr "không thể mở “%s” để ghi: %s"
+
+#~ msgid "could not read ref '%s'"
+#~ msgstr "không thể đọc tham chiếu “%s”"
+
+#~ msgid "ref '%s' already exists"
+#~ msgstr "tham chiếu “%s” đã có từ trước rồi"
+
+#~ msgid "unexpected object ID when writing '%s'"
+#~ msgstr "không cần ID đối tượng khi ghi “%s”"
+
+#~ msgid "unexpected object ID when deleting '%s'"
+#~ msgstr "gặp ID đối tượng không cần khi xóa “%s”"
+
+#~ 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"
+
+#~ 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"
+
+#~ 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"
+
+#~ 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"
+
+#~ 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"
+
+#~ msgid "invalid commit object id: %s"
+#~ msgstr "mã số đối tượng lần chuyển giao không hợp lệ: %s"
+
+#~ 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ệ"
+
+#~ 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 "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ệ"
+
+#~ msgid "unable to re-add worktree '%s'"
+#~ msgstr "không thể thêm-lại cây “%s”"
+
+#~ msgid "target '%s' already exists"
+#~ msgstr "đích “%s” đã tồn tại rồi"
+
+#~ 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"
+
+#~ 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"
+
+#~ 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"
+
+#~ 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"
+
+#~ msgid "Could not read '%s'"
+#~ msgstr "Không thể đọc “%s”"
+
+#~ 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"
+
+#~ 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)"
+
+#~ msgid "Cannot update $ref_stash with $w_commit"
+#~ msgstr "Không thể cập nhật $ref_stash với $w_commit"
+
+#~ msgid "error: unknown option for 'stash push': $option"
+#~ msgstr "lỗi: không hiểu tùy chọn cho “stash push”: $option"
+
+#~ 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"
+
+#~ msgid "unknown option: $opt"
+#~ msgstr "không hiểu tùy chọn: $opt"
+
+#~ msgid "Too many revisions specified: $REV"
+#~ msgstr "Chỉ ra quá nhiều điểm xét duyệt: $REV"
+
+#~ msgid "$reference is not a valid reference"
+#~ msgstr "$reference không phải là tham chiếu hợp lệ"
+
+#~ 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)"
+
+#~ 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"
+
+#~ msgid "Dropped ${REV} ($s)"
+#~ msgstr "Đã xóa ${REV} ($s)"
+
+#~ 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\")"
+
#~ 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,?]? "
@@ -24667,41 +26440,30 @@
#~ "a - đưa lên bệ phóng khúc này và tất cả các khúc còn lại sau này\n"
#~ "d - đừng đưa lên bệ phóng khúc này cũng như bất kỳ cái nào còn lại\n"
-#, c-format
#~ msgid "could not copy '%s' to '%s'."
#~ msgstr "không thể chép “%s” sang “%s”."
#~ msgid "malformed ident line"
-#~ msgstr "thụt đầu dòng dị hình"
+#~ msgstr "dòng định danh không hợp lệ"
-#~ msgid "corrupted author without date information"
-#~ msgstr "tác giả sai hỏng không có thông tin này tháng"
-
-#, c-format
#~ msgid "could not parse '%.*s'"
#~ msgstr "không thể phân tích cú pháp “%.*s”"
-#, c-format
#~ msgid "could not checkout %s"
#~ msgstr "không thể lấy ra %s"
-#, c-format
#~ msgid "filename in tree entry contains backslash: '%s'"
-#~ msgstr "tên tập tin trong mục tin cây có chứa ký tự gạch ngược: '%s'"
+#~ 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"
@@ -24714,25 +26476,12 @@
#~ msgid "no HEAD?"
#~ msgstr "không HEAD?"
-#~ msgid "make committer date match author date"
-#~ msgstr "làm ngày tháng chuyển giao khớp với ngày của tác giả"
-
-#~ msgid "ignore author date and use current date"
-#~ msgstr "bỏ qua ngày tác giả và sử dụng ngày tháng hiện tại"
-
-#~ msgid "synonym of --reset-author-date"
-#~ msgstr "đồng nghĩa với --reset-author-date"
-
-#~ msgid "ignore changes in whitespace"
-#~ msgstr "lờ đi sự thay đổi do khoảng trắng gây ra"
-
#~ msgid "preserve empty commits during rebase"
#~ msgstr "ngăn cấm các lần chuyển giao trống rỗng trong suốt quá trình cải tổ"
#~ msgid "cannot combine --use-bitmap-index with object filtering"
#~ msgstr "không thể tổ hợp --use-bitmap-index với lọc đối tượng"
-#, sh-format
#~ msgid ""
#~ "The following path is ignored by one of your .gitignore files:\n"
#~ "$sm_path\n"
@@ -24743,10 +26492,6 @@
#~ "$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"
@@ -24756,7 +26501,6 @@
#~ 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”"
@@ -24767,14 +26511,12 @@
#~ 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: "
@@ -24793,7 +26535,6 @@
#~ 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”"
@@ -24807,7 +26548,7 @@
#~ msgid ""
#~ "or run 'git config fetch.showForcedUpdates false' to avoid this check.\n"
#~ msgstr ""
-#~ "hoặc chạy 'git config fetch.showForcedUpdates false' để tránh kiểm tra "
+#~ "hoặc chạy “git config fetch.showForcedUpdates false” để tránh kiểm tra "
#~ "này.\n"
#~ msgid ""
@@ -24828,7 +26569,7 @@
#~ "Để làm chấm dứt thông báo này và áp cách hành xử mới, hãy đặt\n"
#~ "giá trị cấu hình log.mailmap true.\n"
#~ "\n"
-#~ "Xem 'git help config ' và tìm kiếm ' log.mailmap ' để biết thêm thông tin."
+#~ "Xem “git help config “ và tìm kiếm “ log.mailmap “ để biết thêm thông tin."
#~ msgid "Server supports multi_ack_detailed"
#~ msgstr "Máy chủ hỗ trợ multi_ack_detailed"
@@ -24854,12 +26595,6 @@
#~ msgid "Server supports ofs-delta"
#~ msgstr "Máy chủ hỗ trợ ofs-delta"
-#~ msgid "(HEAD detached at %s)"
-#~ msgstr "(HEAD được tách rời tại %s)"
-
-#~ msgid "(HEAD detached from %s)"
-#~ msgstr "(HEAD được tách rời từ %s)"
-
#~ msgid "Checking out files"
#~ msgstr "Đang lấy ra các tập tin"
@@ -24888,9 +26623,6 @@
#~ 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ị"
@@ -25057,9 +26789,6 @@
#~ 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"
@@ -25242,10 +26971,6 @@
#~ 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, %"
@@ -25399,9 +27124,6 @@
#~ 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 đã"
@@ -25591,9 +27313,6 @@
#~ msgid "removing '%s' failed"
#~ msgstr "gặp lỗi khi xóa bỏ “%s”"
-#~ msgid "Please call 'bisect_state' with at least one argument."
-#~ msgstr "Hãy gọi lệnhl “bisect_state” với ít nhất một đối số."
-
#~ msgid ""
#~ "If you want to reuse this local git directory instead of cloning again "
#~ "from"
@@ -25736,9 +27455,6 @@
#~ 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”"
@@ -26085,15 +27801,9 @@
#~ msgid "--detach cannot be used with -b/-B/--orphan"
#~ msgstr "--detach không thể được sử dụng với tùy chọn -b/-B/--orphan"
-#~ msgid "--detach cannot be used with -t"
-#~ msgstr "--detach không thể được sử dụng với tùy chọn -t"
-
#~ msgid "--orphan and -b|-B are mutually exclusive"
#~ msgstr "Tùy chọn --orphan và -b|-B loại từ lẫn nhau"
-#~ msgid "--orphan cannot be used with -t"
-#~ msgstr "--orphan không thể được sử dụng với tùy chọn -t"
-
#~ msgid "git checkout: -f and -m are incompatible"
#~ msgstr "git checkout: hai tùy chọn -f và -m xung khắc nhau"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5be5258..fdaaea8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -28,8 +28,9 @@
# bare repository | 纯仓库
# bisect | 二分查找
# blob object | 数据对象
+# bloom filter | 布隆过滤器
# branch | 分支
-# bundle | 包
+# bundle | 归档包
# bypass | 绕过
# cache | 索引（的别称）
# chain | （提交）链
@@ -91,6 +92,7 @@
# plumbing | 管件（Git 底层核心命令的别称）
# porcelain | 瓷件（Git 上层封装命令的别称）
# precious-objects repo | 珍品仓库
+# promisor | 承诺者
# prune | 清除
# pull | 拉，拉取
# push | 推，推送
@@ -123,7 +125,7 @@
# tagger | 打标签者
# topic branch | 主题分支
# track | 跟踪
-# trailer | 尾部署名
+# trailer | 尾注
# tree | 树（工作区或树对象）
# tree object | 树对象
# tree-ish (also treeish) | 树对象（或可以解析为一树对象）
@@ -139,8 +141,8 @@
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2020-03-11 15:26+0800\n"
-"PO-Revision-Date: 2020-03-11 15:38+0800\n"
+"POT-Creation-Date: 2021-03-04 22:41+0800\n"
+"PO-Revision-Date: 2021-03-14 23:21+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,238 +151,243 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: add-interactive.c:368
+#: add-interactive.c:376
#, c-format
msgid "Huh (%s)?"
msgstr "嗯（%s）？"
-#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124
-#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687
-#: builtin/rebase.c:2086 builtin/rebase.c:2130
+#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292
+#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538
+#: builtin/rebase.c:1963
msgid "could not read index"
msgstr "不能读取索引"
-#: add-interactive.c:576 git-add--interactive.perl:269
+#: add-interactive.c:584 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "二进制"
-#: add-interactive.c:634 git-add--interactive.perl:278
+#: add-interactive.c:642 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "无"
-#: add-interactive.c:635 git-add--interactive.perl:314
+#: add-interactive.c:643 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
msgstr "没有修改"
-#: add-interactive.c:672 git-add--interactive.perl:643
+#: add-interactive.c:680 git-add--interactive.perl:641
msgid "Update"
msgstr "更新"
-#: add-interactive.c:689 add-interactive.c:877
+#: add-interactive.c:697 add-interactive.c:885
#, c-format
msgid "could not stage '%s'"
msgstr "不能暂存 '%s'"
-#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317
-#: builtin/rebase.c:899
+#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486
msgid "could not write index"
msgstr "不能写入索引"
-#: add-interactive.c:698 git-add--interactive.perl:628
+#: add-interactive.c:706 git-add--interactive.perl:626
#, 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
+#: add-interactive.c:724 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
msgstr "说明：%s 现已成为未跟踪的。\n"
-#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281
-#: builtin/reset.c:144
+#: add-interactive.c:729 apply.c:4125 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
+#: add-interactive.c:759 git-add--interactive.perl:653
msgid "Revert"
msgstr "还原"
-#: add-interactive.c:767
+#: add-interactive.c:775
msgid "Could not parse HEAD^{tree}"
msgstr "不能解析 HEAD^{tree}"
-#: add-interactive.c:805 git-add--interactive.perl:631
+#: add-interactive.c:813 git-add--interactive.perl:629
#, 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
+#: add-interactive.c:864 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr "没有未跟踪的文件。\n"
-#: add-interactive.c:860 git-add--interactive.perl:689
+#: add-interactive.c:868 git-add--interactive.perl:687
msgid "Add untracked"
msgstr "添加未跟踪的"
-#: add-interactive.c:887 git-add--interactive.perl:625
+#: add-interactive.c:895 git-add--interactive.perl:623
#, 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
+#: add-interactive.c:925
#, c-format
msgid "ignoring unmerged: %s"
msgstr "忽略未合入的：%s"
-#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366
+#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369
#, c-format
msgid "Only binary files changed.\n"
msgstr "只有二进制文件被修改。\n"
-#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368
+#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371
#, c-format
msgid "No changes.\n"
msgstr "没有修改。\n"
-#: add-interactive.c:935 git-add--interactive.perl:1376
+#: add-interactive.c:943 git-add--interactive.perl:1379
msgid "Patch update"
msgstr "补丁更新"
-#: add-interactive.c:974 git-add--interactive.perl:1754
+#: add-interactive.c:982 git-add--interactive.perl:1792
msgid "Review diff"
msgstr "检视 diff"
-#: add-interactive.c:1002
+#: add-interactive.c:1010
msgid "show paths with changes"
msgstr "显示含变更的路径"
-#: add-interactive.c:1004
+#: add-interactive.c:1012
msgid "add working tree state to the staged set of changes"
msgstr "将工作区状态添加到暂存区修改集中"
-#: add-interactive.c:1006
+#: add-interactive.c:1014
msgid "revert staged set of changes back to the HEAD version"
msgstr "将暂存的修改集恢复为 HEAD 版本"
-#: add-interactive.c:1008
+#: add-interactive.c:1016
msgid "pick hunks and update selectively"
msgstr "挑选数据块并有选择地更新"
-#: add-interactive.c:1010
+#: add-interactive.c:1018
msgid "view diff between HEAD and index"
msgstr "显示 HEAD 和索引的差异"
-#: add-interactive.c:1012
+#: add-interactive.c:1020
msgid "add contents of untracked files to the staged set of changes"
msgstr "将未跟踪文件的内容添加到暂存区修改集中"
-#: add-interactive.c:1020 add-interactive.c:1069
+#: add-interactive.c:1028 add-interactive.c:1077
msgid "Prompt help:"
msgstr "帮助："
-#: add-interactive.c:1022
+#: add-interactive.c:1030
msgid "select a single item"
msgstr "选择一个条目"
-#: add-interactive.c:1024
+#: add-interactive.c:1032
msgid "select a range of items"
msgstr "选择一系列条目"
-#: add-interactive.c:1026
+#: add-interactive.c:1034
msgid "select multiple ranges"
msgstr "选择多个范围"
-#: add-interactive.c:1028 add-interactive.c:1073
+#: add-interactive.c:1036 add-interactive.c:1081
msgid "select item based on unique prefix"
msgstr "基于唯一前缀选择条目"
-#: add-interactive.c:1030
+#: add-interactive.c:1038
msgid "unselect specified items"
msgstr "反选指定的条目"
-#: add-interactive.c:1032
+#: add-interactive.c:1040
msgid "choose all items"
msgstr "选择所有条目"
-#: add-interactive.c:1034
+#: add-interactive.c:1042
msgid "(empty) finish selecting"
msgstr "（空）结束选择"
-#: add-interactive.c:1071
+#: add-interactive.c:1079
msgid "select a numbered item"
msgstr "选择一个编号条目"
-#: add-interactive.c:1075
+#: add-interactive.c:1083
msgid "(empty) select nothing"
msgstr "（空）不选择任何内容"
-#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851
+#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
msgid "*** Commands ***"
msgstr "*** 命令 ***"
-#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848
+#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
msgid "What now"
msgstr "请选择"
-#: add-interactive.c:1136 git-add--interactive.perl:213
+#: add-interactive.c:1144 git-add--interactive.perl:213
msgid "staged"
msgstr "缓存"
-#: add-interactive.c:1136 git-add--interactive.perl:213
+#: add-interactive.c:1144 git-add--interactive.perl:213
msgid "unstaged"
msgstr "未缓存"
-#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251
-#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144
-#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409
-#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
-#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
-#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
+#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257
+#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124
+#: builtin/fetch.c:150 builtin/merge.c:285 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
+#: add-interactive.c:1151
msgid "could not refresh index"
msgstr "不能刷新索引"
-#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765
+#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803
#, c-format
msgid "Bye.\n"
msgstr "再见。\n"
-#: add-patch.c:33 git-add--interactive.perl:1428
+#: add-patch.c:34 git-add--interactive.perl:1431
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "暂存模式变更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:34 git-add--interactive.perl:1429
+#: add-patch.c:35 git-add--interactive.perl:1432
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
msgstr "暂存删除动作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:35 git-add--interactive.perl:1430
+#: add-patch.c:36 git-add--interactive.perl:1433
+#, 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:1434
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "暂存该块 [y,n,q,a,d%s,?]? "
-#: add-patch.c:37
+#: add-patch.c:39
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"staging."
msgstr "如果补丁能正确地应用，编辑块将立即标记为暂存。"
-#: add-patch.c:40
+#: add-patch.c:42
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -394,28 +401,33 @@
"a - 暂存该块和本文件中后面的全部块\n"
"d - 不暂存该块和本文件中后面的全部块\n"
-#: add-patch.c:54 git-add--interactive.perl:1433
+#: add-patch.c:56 git-add--interactive.perl:1437
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:55 git-add--interactive.perl:1434
+#: add-patch.c:57 git-add--interactive.perl:1438
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:56 git-add--interactive.perl:1435
+#: add-patch.c:58 git-add--interactive.perl:1439
+#, 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:1440
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "贮藏该块 [y,n,q,a,d%s,?]? "
-#: add-patch.c:58
+#: add-patch.c:61
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"stashing."
msgstr "如果补丁能正确地应用，编辑块将立即标记为贮藏。"
-#: add-patch.c:61
+#: add-patch.c:64
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -429,28 +441,33 @@
"a - 贮藏该块和本文件中后面的全部块\n"
"d - 不贮藏该块和本文件中后面的全部块\n"
-#: add-patch.c:77 git-add--interactive.perl:1438
+#: add-patch.c:80 git-add--interactive.perl:1443
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:78 git-add--interactive.perl:1439
+#: add-patch.c:81 git-add--interactive.perl:1444
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:79 git-add--interactive.perl:1440
+#: add-patch.c:82 git-add--interactive.perl:1445
+#, 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:1446
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "取消暂存该块 [y,n,q,a,d%s,?]? "
-#: add-patch.c:81
+#: add-patch.c:85
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"unstaging."
msgstr "如果补丁能正确地应用，编辑块将立即标记为未暂存。"
-#: add-patch.c:84
+#: add-patch.c:88
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -464,28 +481,33 @@
"a - 取消暂存该块和本文件中后面的全部块\n"
"d - 不要取消暂存该块和本文件中后面的全部块\n"
-#: add-patch.c:99 git-add--interactive.perl:1443
+#: add-patch.c:103 git-add--interactive.perl:1449
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? "
-#: add-patch.c:100 git-add--interactive.perl:1444
+#: add-patch.c:104 git-add--interactive.perl:1450
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? "
-#: add-patch.c:101 git-add--interactive.perl:1445
+#: add-patch.c:105 git-add--interactive.perl:1451
+#, 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:1452
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? "
-#: add-patch.c:103 add-patch.c:168 add-patch.c:211
+#: 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:106
+#: add-patch.c:111
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -499,31 +521,37 @@
"a - 应用该块和本文件中后面的全部块\n"
"d - 不要应用该块和本文件中后面的全部块\n"
-#: add-patch.c:121 git-add--interactive.perl:1448
-#: git-add--interactive.perl:1463
+#: add-patch.c:126 git-add--interactive.perl:1455
+#: git-add--interactive.perl:1473
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:122 git-add--interactive.perl:1449
-#: git-add--interactive.perl:1464
+#: add-patch.c:127 git-add--interactive.perl:1456
+#: git-add--interactive.perl:1474
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:123 git-add--interactive.perl:1450
-#: git-add--interactive.perl:1465
+#: add-patch.c:128 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
+#, 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:1458
+#: git-add--interactive.perl:1476
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? "
-#: add-patch.c:125 add-patch.c:147 add-patch.c:190
+#: 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:128 add-patch.c:193
+#: 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"
@@ -537,22 +565,27 @@
"a - 丢弃该块和本文件中后面的全部块\n"
"d - 不要丢弃该块和本文件中后面的全部块\n"
-#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "从索引和工作区中丢弃删除 [y,n,q,a,d%s,?]? "
+msgstr "从索引和工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
-#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#, 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:1464
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? "
-#: add-patch.c:150
+#: 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"
@@ -566,22 +599,27 @@
"a - 丢弃该块和本文件中后面的全部块\n"
"d - 不要丢弃该块和本文件中后面的全部块\n"
-#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? "
-#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
-#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#, 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:1470
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? "
-#: add-patch.c:171
+#: 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"
@@ -595,7 +633,7 @@
"a - 应用该块和本文件中后面的全部块\n"
"d - 不要应用该块和本文件中后面的全部块\n"
-#: add-patch.c:214
+#: add-patch.c:224
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -609,40 +647,40 @@
"a - 应用该块和本文件中后面的全部块\n"
"d - 不要应用该块和本文件中后面的全部块\n"
-#: add-patch.c:318
+#: add-patch.c:342
#, c-format
msgid "could not parse hunk header '%.*s'"
msgstr "无法解析数据块头信息 '%.*s'"
-#: add-patch.c:337 add-patch.c:341
+#: add-patch.c:361 add-patch.c:365
#, c-format
msgid "could not parse colored hunk header '%.*s'"
msgstr "无法解析彩色数据块头信息 '%.*s'"
-#: add-patch.c:395
+#: add-patch.c:419
msgid "could not parse diff"
msgstr "不能解析差异信息"
-#: add-patch.c:414
+#: add-patch.c:438
msgid "could not parse colored diff"
msgstr "不能解析彩色差异信息"
-#: add-patch.c:428
+#: add-patch.c:452
#, c-format
msgid "failed to run '%s'"
msgstr "运行 '%s' 失败"
-#: add-patch.c:587
+#: add-patch.c:611
msgid "mismatched output from interactive.diffFilter"
msgstr "interactive.diffFilter 的输出不匹配"
-#: add-patch.c:588
+#: 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:761
+#: add-patch.c:790
#, c-format
msgid ""
"expected context line #%d in\n"
@@ -651,7 +689,7 @@
"预期上下文行 #%d 于\n"
"%.*s"
-#: add-patch.c:776
+#: add-patch.c:805
#, c-format
msgid ""
"hunks do not overlap:\n"
@@ -664,11 +702,11 @@
"\t不是结尾于：\n"
"%.*s"
-#: add-patch.c:1052 git-add--interactive.perl:1112
+#: add-patch.c:1081 git-add--interactive.perl:1115
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
-#: add-patch.c:1056
+#: add-patch.c:1085
#, c-format
msgid ""
"---\n"
@@ -682,7 +720,7 @@
"以 %c 开始的行将被删除。\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1070 git-add--interactive.perl:1126
+#: add-patch.c:1099 git-add--interactive.perl:1129
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"
@@ -691,11 +729,11 @@
"如果不能干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n"
"此次编辑被终止，该块不会被修改。\n"
-#: add-patch.c:1103
+#: add-patch.c:1132
msgid "could not parse hunk header"
msgstr "无法解析数据块头信息"
-#: add-patch.c:1148
+#: add-patch.c:1177
msgid "'git apply --cached' failed"
msgstr "'git apply --cached' 失败"
@@ -711,24 +749,24 @@
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1218 git-add--interactive.perl:1239
+#: add-patch.c:1246 git-add--interactive.perl:1242
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? "
-#: add-patch.c:1261
+#: add-patch.c:1289
msgid "The selected hunks do not apply to the index!"
msgstr "选中的块不能应用到索引！"
-#: add-patch.c:1262 git-add--interactive.perl:1343
+#: add-patch.c:1290 git-add--interactive.perl:1346
msgid "Apply them to the worktree anyway? "
msgstr "无论如何都要应用到工作区么？"
-#: add-patch.c:1269 git-add--interactive.perl:1346
+#: add-patch.c:1297 git-add--interactive.perl:1349
msgid "Nothing was applied.\n"
msgstr "未应用。\n"
-#: add-patch.c:1326
+#: add-patch.c:1354
msgid ""
"j - leave this hunk undecided, see next undecided hunk\n"
"J - leave this hunk undecided, see next hunk\n"
@@ -750,103 +788,112 @@
"e - 手动编辑当前块\n"
"? - 显示帮助\n"
-#: add-patch.c:1447 add-patch.c:1457
+#: add-patch.c:1516 add-patch.c:1526
msgid "No previous hunk"
msgstr "没有前一个块"
-#: add-patch.c:1452 add-patch.c:1462
+#: add-patch.c:1521 add-patch.c:1531
msgid "No next hunk"
msgstr "没有下一个块"
-#: add-patch.c:1468
+#: add-patch.c:1537
msgid "No other hunks to goto"
msgstr "没有其它可供跳转的块"
-#: add-patch.c:1479 git-add--interactive.perl:1577
+#: add-patch.c:1548 git-add--interactive.perl:1606
msgid "go to which hunk (<ret> to see more)? "
msgstr "跳转到哪个块（<回车> 查看更多）？ "
-#: add-patch.c:1480 git-add--interactive.perl:1579
+#: add-patch.c:1549 git-add--interactive.perl:1608
msgid "go to which hunk? "
msgstr "跳转到哪个块？"
-#: add-patch.c:1491
+#: add-patch.c:1560
#, c-format
msgid "Invalid number: '%s'"
msgstr "无效数字：'%s'"
-#: add-patch.c:1496
+#: add-patch.c:1565
#, c-format
msgid "Sorry, only %d hunk available."
msgid_plural "Sorry, only %d hunks available."
msgstr[0] "对不起，只有 %d 个可用块。"
msgstr[1] "对不起，只有 %d 个可用块。"
-#: add-patch.c:1505
+#: add-patch.c:1574
msgid "No other hunks to search"
msgstr "没有其它可供查找的块"
-#: add-patch.c:1511 git-add--interactive.perl:1623
+#: add-patch.c:1580 git-add--interactive.perl:1661
msgid "search for regex? "
msgstr "使用正则表达式搜索？"
-#: add-patch.c:1526
+#: add-patch.c:1595
#, c-format
msgid "Malformed search regexp %s: %s"
msgstr "错误的正则表达式 %s：%s"
-#: add-patch.c:1543
+#: add-patch.c:1612
msgid "No hunk matches the given pattern"
msgstr "没有和给定模式相匹配的块"
-#: add-patch.c:1550
+#: add-patch.c:1619
msgid "Sorry, cannot split this hunk"
msgstr "对不起，不能拆分这个块"
-#: add-patch.c:1554
+#: add-patch.c:1623
#, c-format
msgid "Split into %d hunks."
msgstr "拆分为 %d 块。"
-#: add-patch.c:1558
+#: add-patch.c:1627
msgid "Sorry, cannot edit this hunk"
msgstr "对不起，不能编辑这个块"
-#: add-patch.c:1609
+#: add-patch.c:1679
msgid "'git apply' failed"
msgstr "'git apply' 失败"
-#: advice.c:115
+#: advice.c:143
+#, c-format
+msgid ""
+"\n"
+"Disable this message with \"git config advice.%s false\""
+msgstr ""
+"\n"
+"使用 \"git config advice.%s false\" 来关闭此消息"
+
+#: advice.c:159
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%s提示：%.*s%s\n"
-#: advice.c:168
+#: advice.c:250
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "无法拣选，因为您有未合并的文件。"
-#: advice.c:170
+#: advice.c:252
msgid "Committing is not possible because you have unmerged files."
msgstr "无法提交，因为您有未合并的文件。"
-#: advice.c:172
+#: advice.c:254
msgid "Merging is not possible because you have unmerged files."
msgstr "无法合并，因为您有未合并的文件。"
-#: advice.c:174
+#: advice.c:256
msgid "Pulling is not possible because you have unmerged files."
msgstr "无法拉取，因为您有未合并的文件。"
-#: advice.c:176
+#: advice.c:258
msgid "Reverting is not possible because you have unmerged files."
msgstr "无法回退，因为您有未合并的文件。"
-#: advice.c:178
+#: advice.c:260
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "无法 %s，因为您有未合并的文件。"
-#: advice.c:186
+#: advice.c:268
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
@@ -854,23 +901,23 @@
"请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n"
"解决方案并提交。"
-#: advice.c:194
+#: advice.c:276
msgid "Exiting because of an unresolved conflict."
msgstr "因为存在未解决的冲突而退出。"
-#: advice.c:199 builtin/merge.c:1335
+#: advice.c:281 builtin/merge.c:1370
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"
-#: advice.c:201
+#: advice.c:283
msgid "Please, commit your changes before merging."
msgstr "请在合并前先提交您的修改。"
-#: advice.c:202
+#: advice.c:284
msgid "Exiting because of unfinished merge."
msgstr "因为存在未完成的合并而退出。"
-#: advice.c:208
+#: advice.c:290
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -1148,7 +1195,8 @@
msgid "cannot checkout %s"
msgstr "不能检出 %s"
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:86 pack-revindex.c:213
+#: setup.c:308
#, c-format
msgid "failed to read %s"
msgstr "无法读取 %s"
@@ -1168,7 +1216,7 @@
msgid "%s: does not exist in index"
msgstr "%s：不存在于索引中"
-#: apply.c:3537 apply.c:3708
+#: apply.c:3537 apply.c:3708 apply.c:3952
#, c-format
msgid "%s: does not match index"
msgstr "%s：和索引不匹配"
@@ -1216,315 +1264,359 @@
msgid "%s has type %o, expected %o"
msgstr "%s 的类型是 %o，应为 %o"
-#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856
-#: read-cache.c:1325
+#: apply.c: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:3936
+#: apply.c:3950
#, c-format
msgid "%s: already exists in index"
msgstr "%s：已经存在于索引中"
-#: apply.c:3939
+#: apply.c:3954
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s：已经存在于工作区中"
-#: apply.c:3959
+#: apply.c:3974
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"
-#: apply.c:3964
+#: apply.c:3979
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配"
-#: apply.c:3984
+#: apply.c:3999
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "受影响的文件 '%s' 位于符号链接中"
-#: apply.c:3988
+#: apply.c:4003
#, c-format
msgid "%s: patch does not apply"
msgstr "%s：补丁未应用"
-#: apply.c:4003
+#: apply.c:4018
#, c-format
msgid "Checking patch %s..."
msgstr "正在检查补丁 %s..."
-#: apply.c:4095
+#: apply.c:4110
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "子模组 %s 的 sha1 信息缺失或无效"
-#: apply.c:4102
+#: apply.c:4117
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "%s 的模式变更，但它不在当前 HEAD 中"
-#: apply.c:4105
+#: apply.c:4120
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1 信息缺失或无效（%s）。"
-#: apply.c:4114
+#: apply.c:4129
#, c-format
msgid "could not add %s to temporary index"
msgstr "不能在临时索引中添加 %s"
-#: apply.c:4124
+#: apply.c:4139
#, c-format
msgid "could not write temporary index to %s"
msgstr "不能把临时索引写入到 %s"
-#: apply.c:4262
+#: apply.c:4277
#, c-format
msgid "unable to remove %s from index"
msgstr "不能从索引中移除 %s"
-#: apply.c:4296
+#: apply.c:4311
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "子模组 %s 损坏的补丁"
-#: apply.c:4302
+#: apply.c:4317
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "不能对新建文件 '%s' 调用 stat"
-#: apply.c:4310
+#: apply.c:4325
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "不能为新建文件 %s 创建后端存储"
-#: apply.c:4316 apply.c:4461
+#: apply.c:4331 apply.c:4476
#, c-format
msgid "unable to add cache entry for %s"
msgstr "无法为 %s 添加缓存条目"
-#: apply.c:4359
+#: apply.c:4374 builtin/bisect--helper.c:523
#, c-format
msgid "failed to write to '%s'"
msgstr "写入 '%s' 失败"
-#: apply.c:4363
+#: apply.c:4378
#, c-format
msgid "closing file '%s'"
msgstr "关闭文件 '%s'"
-#: apply.c:4433
+#: apply.c:4448
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "不能写文件 '%s' 权限 %o"
-#: apply.c:4531
+#: apply.c:4546
#, c-format
msgid "Applied patch %s cleanly."
msgstr "成功应用补丁 %s。"
-#: apply.c:4539
+#: apply.c:4554
msgid "internal error"
msgstr "内部错误"
-#: apply.c:4542
+#: apply.c:4557
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..."
msgstr[1] "应用 %%s 个补丁，其中 %d 个被拒绝..."
-#: apply.c:4553
+#: apply.c:4568
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "截短 .rej 文件名为 %.*s.rej"
-#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201
+#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334
#, c-format
msgid "cannot open %s"
msgstr "不能打开 %s"
-#: apply.c:4575
+#: apply.c:4590
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "第 #%d 个片段成功应用。"
-#: apply.c:4579
+#: apply.c:4594
#, c-format
msgid "Rejected hunk #%d."
msgstr "拒绝第 #%d 个片段。"
-#: apply.c:4698
+#: apply.c:4718
#, c-format
msgid "Skipped patch '%s'."
msgstr "略过补丁 '%s'。"
-#: apply.c:4706
+#: apply.c:4726
msgid "unrecognized input"
msgstr "未能识别的输入"
-#: apply.c:4726
+#: apply.c:4746
msgid "unable to read index file"
msgstr "无法读取索引文件"
-#: apply.c:4883
+#: apply.c:4903
#, c-format
msgid "can't open patch '%s': %s"
msgstr "不能打开补丁 '%s'：%s"
-#: apply.c:4910
+#: apply.c:4930
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "抑制下仍有 %d 个空白字符误用"
msgstr[1] "抑制下仍有 %d 个空白字符误用"
-#: apply.c:4916 apply.c:4931
+#: apply.c:4936 apply.c:4951
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d 行新增了空白字符误用。"
msgstr[1] "%d 行新增了空白字符误用。"
-#: apply.c:4924
+#: apply.c:4944
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "修复空白错误后，应用了 %d 行。"
msgstr[1] "修复空白错误后，应用了 %d 行。"
-#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406
+#: apply.c:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406
msgid "Unable to write new index file"
msgstr "无法写入新索引文件"
-#: apply.c:4968
+#: apply.c:4988
msgid "don't apply changes matching the given path"
msgstr "不要应用与给出路径向匹配的变更"
-#: apply.c:4971
+#: apply.c:4991
msgid "apply changes matching the given path"
msgstr "应用与给出路径向匹配的变更"
-#: apply.c:4973 builtin/am.c:2260
+#: apply.c:4993 builtin/am.c:2266
msgid "num"
msgstr "数字"
-#: apply.c:4974
+#: apply.c:4994
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
-#: apply.c:4977
+#: apply.c:4997
msgid "ignore additions made by the patch"
msgstr "忽略补丁中的添加的文件"
-#: apply.c:4979
+#: apply.c:4999
msgid "instead of applying the patch, output diffstat for the input"
msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"
-#: apply.c:4983
+#: apply.c:5003
msgid "show number of added and deleted lines in decimal notation"
msgstr "以十进制数显示添加和删除的行数"
-#: apply.c:4985
+#: apply.c:5005
msgid "instead of applying the patch, output a summary for the input"
msgstr "不应用补丁，而是显示输入的概要"
-#: apply.c:4987
+#: apply.c:5007
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "不应用补丁，而是查看补丁是否可应用"
-#: apply.c:4989
+#: apply.c:5009
msgid "make sure the patch is applicable to the current index"
msgstr "确认补丁可以应用到当前索引"
-#: apply.c:4991
+#: apply.c:5011
msgid "mark new files with `git add --intent-to-add`"
msgstr "使用命令 `git add --intent-to-add` 标记新增文件"
-#: apply.c:4993
+#: apply.c:5013
msgid "apply a patch without touching the working tree"
msgstr "应用补丁而不修改工作区"
-#: apply.c:4995
+#: apply.c:5015
msgid "accept a patch that touches outside the working area"
msgstr "接受修改工作区之外文件的补丁"
-#: apply.c:4998
+#: apply.c:5018
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"
-#: apply.c:5000
+#: apply.c:5020
msgid "attempt three-way merge if a patch does not apply"
msgstr "如果一个补丁不能应用则尝试三方合并"
-#: apply.c:5002
+#: apply.c:5022
msgid "build a temporary index based on embedded index information"
msgstr "创建一个临时索引基于嵌入的索引信息"
-#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540
msgid "paths are separated with NUL character"
msgstr "路径以 NUL 字符分隔"
-#: apply.c:5007
+#: apply.c:5027
msgid "ensure at least <n> lines of context match"
msgstr "确保至少匹配 <n> 行上下文"
-#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98
+#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98
#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3457 builtin/rebase.c:1508
+#: builtin/pack-objects.c:3577 builtin/rebase.c:1352
msgid "action"
msgstr "动作"
-#: apply.c:5009
+#: apply.c:5029
msgid "detect new or modified lines that have whitespace errors"
msgstr "检查新增和修改的行中间的空白字符滥用"
-#: apply.c:5012 apply.c:5015
+#: apply.c:5032 apply.c:5035
msgid "ignore changes in whitespace when finding context"
msgstr "查找上下文时忽略空白字符的变更"
-#: apply.c:5018
+#: apply.c:5038
msgid "apply the patch in reverse"
msgstr "反向应用补丁"
-#: apply.c:5020
+#: apply.c:5040
msgid "don't expect at least one line of context"
msgstr "无需至少一行上下文"
-#: apply.c:5022
+#: apply.c:5042
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
-#: apply.c:5024
+#: apply.c:5044
msgid "allow overlapping hunks"
msgstr "允许重叠的补丁片段"
-#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22
-#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774
-#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22
+#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757
+#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "冗长输出"
-#: apply.c:5027
+#: apply.c:5047
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "允许不正确的文件末尾换行符"
-#: apply.c:5030
+#: apply.c:5050
msgid "do not trust the line counts in the hunk headers"
msgstr "不信任补丁片段的头信息中的行号"
-#: apply.c:5032 builtin/am.c:2248
+#: apply.c:5052 builtin/am.c:2254
msgid "root"
msgstr "根目录"
-#: apply.c:5033
+#: apply.c:5053
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:450
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr "无法启动 '%s' 过滤器"
+
+#: archive-tar.c:453
+msgid "unable to redirect descriptor"
+msgstr "无法重定向描述符"
+
+#: archive-tar.c:460
+#, 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 [<选项>] <树对象> [<路径>...]"
@@ -1543,183 +1635,156 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <仓库> [--exec <命令>] --list"
-#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
-#, c-format
-msgid "pathspec '%s' did not match any files"
-msgstr "路径规格 '%s' 未匹配任何文件"
-
-#: archive.c:396
-#, c-format
-msgid "no such ref: %.*s"
-msgstr "无此引用：%.*s"
-
-#: archive.c:401
-#, c-format
-msgid "not a valid object name: %s"
-msgstr "不是一个有效的对象名：%s"
-
-#: archive.c:414
-#, c-format
-msgid "not a tree object: %s"
-msgstr "不是一个树对象：%s"
-
-#: archive.c:426
-msgid "current working directory is untracked"
-msgstr "当前工作目录未被跟踪"
-
-#: archive.c:457
-msgid "fmt"
-msgstr "格式"
-
-#: archive.c:457
-msgid "archive format"
-msgstr "归档格式"
-
-#: archive.c:458 builtin/log.c:1653
-msgid "prefix"
-msgstr "前缀"
-
-#: archive.c:459
-msgid "prepend prefix to each pathname in the archive"
-msgstr "为归档中每个路径名加上前缀"
-
-#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
-#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
-#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887
-#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
-#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
-#: parse-options.h:190
-msgid "file"
-msgstr "文件"
-
-#: archive.c:461 builtin/archive.c:90
-msgid "write the archive to this file"
-msgstr "归档写入此文件"
-
-#: archive.c:463
-msgid "read .gitattributes in working directory"
-msgstr "读取工作区中的 .gitattributes"
-
-#: archive.c:464
-msgid "report archived files on stderr"
-msgstr "在标准错误上报告归档文件"
-
-#: archive.c:465
-msgid "store only"
-msgstr "只存储"
-
-#: archive.c:466
-msgid "compress faster"
-msgstr "压缩速度更快"
-
-#: archive.c:474
-msgid "compress better"
-msgstr "压缩效果更好"
-
-#: archive.c:477
-msgid "list supported archive formats"
-msgstr "列出支持的归档格式"
-
-#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
-#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
-msgid "repo"
-msgstr "仓库"
-
-#: archive.c:480 builtin/archive.c:92
-msgid "retrieve the archive from remote repository <repo>"
-msgstr "从远程仓库（<仓库>）提取归档文件"
-
-#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
-#: builtin/notes.c:498
-msgid "command"
-msgstr "命令"
-
-#: archive.c:482 builtin/archive.c:94
-msgid "path to the remote git-upload-archive command"
-msgstr "远程 git-upload-archive 命令的路径"
-
-#: archive.c:489
-msgid "Unexpected option --remote"
-msgstr "未知参数 --remote"
-
-#: archive.c:491
-msgid "Option --exec can only be used together with --remote"
-msgstr "选项 --exec 只能和 --remote 同时使用"
-
-#: archive.c:493
-msgid "Unexpected option --output"
-msgstr "未知参数 --output"
-
-#: archive.c:515
-#, c-format
-msgid "Unknown archive format '%s'"
-msgstr "未知归档格式 '%s'"
-
-#: archive.c:522
-#, c-format
-msgid "Argument not supported for format '%s': -%d"
-msgstr "参数不支持此格式 '%s'：-%d"
-
-#: archive-tar.c:125 archive-zip.c:351
-#, c-format
-msgid "cannot stream blob %s"
-msgstr "不能打开数据对象 %s"
-
-#: archive-tar.c:266 archive-zip.c:369
-#, c-format
-msgid "unsupported file mode: 0%o (SHA1: %s)"
-msgstr "不支持的文件模式：0%o (SHA1: %s)"
-
-#: archive-tar.c:293 archive-zip.c:359
+#: archive.c:192
#, c-format
msgid "cannot read %s"
msgstr "不能读取 %s"
-#: archive-tar.c:465
+#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894
+#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786
+#: builtin/merge.c:1139
#, c-format
-msgid "unable to start '%s' filter"
-msgstr "无法启动 '%s' 过滤器"
+msgid "could not read '%s'"
+msgstr "不能读取 '%s'"
-#: archive-tar.c:468
-msgid "unable to redirect descriptor"
-msgstr "无法重定向描述符"
-
-#: archive-tar.c:475
+#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315
#, c-format
-msgid "'%s' filter reported error"
-msgstr "'%s' 过滤器报告了错误"
+msgid "pathspec '%s' did not match any files"
+msgstr "路径规格 '%s' 未匹配任何文件"
-#: archive-zip.c:319
+#: archive.c:454
#, c-format
-msgid "path is not valid UTF-8: %s"
-msgstr "路径不是有效的 UTF-8：%s"
+msgid "no such ref: %.*s"
+msgstr "无此引用：%.*s"
-#: archive-zip.c:323
+#: archive.c:460
#, c-format
-msgid "path too long (%d chars, SHA1: %s): %s"
-msgstr "路径太长（%d 字符，SHA1：%s）：%s"
+msgid "not a valid object name: %s"
+msgstr "不是一个有效的对象名：%s"
-#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
+#: archive.c:473
#, c-format
-msgid "deflate error (%d)"
-msgstr "压缩错误 (%d)"
+msgid "not a tree object: %s"
+msgstr "不是一个树对象：%s"
-#: archive-zip.c:615
+#: archive.c:485
+msgid "current working directory is untracked"
+msgstr "当前工作目录未被跟踪"
+
+#: archive.c:526
#, c-format
-msgid "timestamp too large for this system: %<PRIuMAX>"
-msgstr "对于本系统时间戳太大：%<PRIuMAX>"
+msgid "File not found: %s"
+msgstr "文件未找到：%s"
-#: attr.c:212
+#: archive.c:528
+#, c-format
+msgid "Not a regular file: %s"
+msgstr "不是一个常规文件：%s"
+
+#: archive.c:555
+msgid "fmt"
+msgstr "格式"
+
+#: archive.c:555
+msgid "archive format"
+msgstr "归档格式"
+
+#: archive.c:556 builtin/log.c:1764
+msgid "prefix"
+msgstr "前缀"
+
+#: archive.c:557
+msgid "prepend prefix to each pathname in the archive"
+msgstr "为归档中每个路径名加上前缀"
+
+#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888
+#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
+#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
+#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105
+#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412
+#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190
+msgid "file"
+msgstr "文件"
+
+#: archive.c:559
+msgid "add untracked file to archive"
+msgstr "将未跟踪文件添加到归档"
+
+#: archive.c:562 builtin/archive.c:90
+msgid "write the archive to this file"
+msgstr "归档写入此文件"
+
+#: archive.c:564
+msgid "read .gitattributes in working directory"
+msgstr "读取工作区中的 .gitattributes"
+
+#: archive.c:565
+msgid "report archived files on stderr"
+msgstr "在标准错误上报告归档文件"
+
+#: archive.c:567
+msgid "set compression level"
+msgstr "设置压缩级别"
+
+#: archive.c:570
+msgid "list supported archive formats"
+msgstr "列出支持的归档格式"
+
+#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117
+#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
+msgid "repo"
+msgstr "仓库"
+
+#: archive.c:573 builtin/archive.c:92
+msgid "retrieve the archive from remote repository <repo>"
+msgstr "从远程仓库（<仓库>）提取归档文件"
+
+#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714
+#: builtin/notes.c:498
+msgid "command"
+msgstr "命令"
+
+#: archive.c:575 builtin/archive.c:94
+msgid "path to the remote git-upload-archive command"
+msgstr "远程 git-upload-archive 命令的路径"
+
+#: archive.c:582
+msgid "Unexpected option --remote"
+msgstr "未知参数 --remote"
+
+#: archive.c:584
+msgid "Option --exec can only be used together with --remote"
+msgstr "选项 --exec 只能和 --remote 同时使用"
+
+#: archive.c:586
+msgid "Unexpected option --output"
+msgstr "未知参数 --output"
+
+#: archive.c:588
+msgid "Options --add-file and --remote cannot be used together"
+msgstr "选项 --add-file 和 --remote 不能同时使用"
+
+#: archive.c:610
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "未知归档格式 '%s'"
+
+#: archive.c:619
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "参数不支持此格式 '%s'：-%d"
+
+#: attr.c:202
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s 不是一个有效的属性名"
-#: attr.c:369
+#: attr.c:359
#, c-format
msgid "%s not allowed: %s:%d"
msgstr "不允许 %s：%s:%d"
-#: attr.c:409
+#: attr.c:399
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -1727,22 +1792,22 @@
"负值模版在 git attributes 中被忽略\n"
"当字符串确实要以感叹号开始时，使用 '\\!'。"
-#: bisect.c:468
+#: bisect.c:489
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "文件 '%s' 包含错误的引用格式：%s"
-#: bisect.c:678
+#: bisect.c:699
#, c-format
msgid "We cannot bisect more!\n"
msgstr "我们无法进行更多的二分查找！\n"
-#: bisect.c:745
+#: bisect.c:766
#, c-format
msgid "Not a valid commit name %s"
msgstr "不是一个有效的提交名 %s"
-#: bisect.c:770
+#: bisect.c:791
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1751,7 +1816,7 @@
"合并基线 %s 是坏的。\n"
"这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
-#: bisect.c:775
+#: bisect.c:796
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1760,7 +1825,7 @@
"合并基线 %s 是新的。\n"
"介于 %s 和 [%s] 之间的属性已经被修改。\n"
-#: bisect.c:780
+#: bisect.c:801
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1769,7 +1834,7 @@
"合并基线 %s 是 %s。\n"
"这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
-#: bisect.c:788
+#: bisect.c:809
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1780,7 +1845,7 @@
"这种情况下 git 二分查找无法正常工作。\n"
"您可能弄错了 %s 和 %s 版本？\n"
-#: bisect.c:801
+#: bisect.c:822
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1791,45 +1856,45 @@
"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
"我们仍旧继续。"
-#: bisect.c:840
+#: bisect.c:861
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "二分查找中：合并基线必须是经过测试的\n"
-#: bisect.c:890
+#: bisect.c:911
#, c-format
msgid "a %s revision is needed"
msgstr "需要一个 %s 版本"
-#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287
#, c-format
msgid "could not create file '%s'"
msgstr "不能创建文件 '%s'"
-#: bisect.c:966 builtin/merge.c:149
+#: bisect.c:987 builtin/merge.c:153
#, c-format
msgid "could not read file '%s'"
msgstr "不能读取文件 '%s'"
-#: bisect.c:997
+#: bisect.c:1027
msgid "reading bisect refs failed"
msgstr "读取二分查找引用失败"
-#: bisect.c:1019
+#: bisect.c:1057
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s 同时为 %s 和 %s\n"
-#: bisect.c:1028
+#: bisect.c:1066
#, c-format
msgid ""
"No testable commit found.\n"
-"Maybe you started with bad path parameters?\n"
+"Maybe you started with bad path arguments?\n"
msgstr ""
"没有发现可测试的提交。\n"
"可能您在运行时使用了错误的路径参数？\n"
-#: bisect.c:1057
+#: bisect.c:1095
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1839,44 +1904,44 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1063
+#: bisect.c:1101
#, c-format
msgid "Bisecting: %d revision left to test after this %s\n"
msgid_plural "Bisecting: %d revisions left to test after this %s\n"
msgstr[0] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"
msgstr[1] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"
-#: blame.c:2700
+#: blame.c:2777
msgid "--contents and --reverse do not blend well."
msgstr "--contents 和 --reverse 不能混用。"
-#: blame.c:2714
+#: blame.c:2791
msgid "cannot use --contents with final commit object name"
msgstr "不能将 --contents 和最终的提交对象名共用"
-#: blame.c:2735
+#: blame.c:2812
msgid "--reverse and --first-parent together require specified latest commit"
msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
-#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006
-#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388
-#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215
-#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290
-#: builtin/shortlog.c:192
+#: blame.c:2821 bundle.c:213 ref-filter.c:2206 remote.c:2041 sequencer.c:2146
+#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411
+#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335
+#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410
+#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr "版本遍历设置失败"
-#: blame.c:2762
+#: blame.c:2839
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围"
-#: blame.c:2773
+#: blame.c:2850
#, c-format
msgid "no such path %s in %s"
msgstr "在 %2$s 中无此路径 %1$s"
-#: blame.c:2784
+#: blame.c:2861
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "不能为路径 %2$s 读取数据对象 %1$s"
@@ -2004,114 +2069,393 @@
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 "'%s' does not look like a v2 bundle file"
-msgstr "'%s' 不像是一个 v2 版本的包文件"
+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' 不像是一个 v2 或 v3 版本的归档包文件"
+
+#: 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:2258 sequencer.c:3016
-#: builtin/commit.c:815
+#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184
+#: 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:273
+#: bundle.c:319
msgid "unable to dup bundle descriptor"
-msgstr "无法复制 bundle 描述符"
+msgstr "无法复制归档包描述符"
-#: bundle.c:280
+#: bundle.c:326
msgid "Could not spawn pack-objects"
msgstr "不能生成 pack-objects 进程"
-#: bundle.c:291
+#: bundle.c:337
msgid "pack-objects died"
msgstr "pack-objects 终止"
-#: bundle.c:333
-msgid "rev-list died"
-msgstr "rev-list 终止"
-
-#: bundle.c:382
+#: bundle.c:386
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "引用 '%s' 被 rev-list 选项排除"
-#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306
+#: bundle.c:490
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr "不支持的归档包版本 %d"
+
+#: bundle.c:492
+#, c-format
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr "不能写入，归档包版本 %d 不支持算法 %s"
+
+#: bundle.c:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396
#, c-format
msgid "unrecognized argument: %s"
msgstr "未能识别的参数：%s"
-#: bundle.c:469
+#: bundle.c:539
msgid "Refusing to create empty bundle."
-msgstr "不能创建空包。"
+msgstr "不能创建空的归档包。"
-#: bundle.c:479
+#: bundle.c:549
#, c-format
msgid "cannot create '%s'"
msgstr "不能创建 '%s'"
-#: bundle.c:504
+#: bundle.c:574
msgid "index-pack died"
msgstr "index-pack 终止"
+#: chunk-format.c:113
+msgid "terminating chunk id appears earlier than expected"
+msgstr "终止块 ID 比预期更早出现"
+
+#: chunk-format.c:122
+#, c-format
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr "不正确的块偏移 %<PRIx64> 和 %<PRIx64>"
+
+#: chunk-format.c:129
+#, c-format
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr "发现重复的块ID %<PRIx32>"
+
+#: chunk-format.c:143
+#, c-format
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr "最终块有非零 ID %<PRIx32>"
+
#: color.c:329
#, c-format
msgid "invalid color value: %.*s"
msgstr "无效的颜色值：%.*s"
-#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403
-#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457
+#: commit-graph.c:197 midx.c:46
+msgid "invalid hash version"
+msgstr "无效的哈希版本"
+
+#: commit-graph.c:255
+msgid "commit-graph file is too small"
+msgstr "提交图形文件太小"
+
+#: commit-graph.c:348
+#, c-format
+msgid "commit-graph signature %X does not match signature %X"
+msgstr "提交图形签名 %X 和签名 %X 不匹配"
+
+#: commit-graph.c:355
+#, c-format
+msgid "commit-graph version %X does not match version %X"
+msgstr "提交图形版本 %X 和版本 %X 不匹配"
+
+#: commit-graph.c:362
+#, c-format
+msgid "commit-graph hash version %X does not match version %X"
+msgstr "提交图形哈希版本 %X 和版本 %X 不匹配"
+
+#: commit-graph.c:379
+#, c-format
+msgid "commit-graph file is too small to hold %u chunks"
+msgstr "提交图形文件太小，容不下 %u 个块"
+
+#: commit-graph.c:472
+msgid "commit-graph has no base graphs chunk"
+msgstr "提交图形没有基础图形块"
+
+#: commit-graph.c:482
+msgid "commit-graph chain does not match"
+msgstr "提交图形链不匹配"
+
+#: commit-graph.c:530
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr "无效的提交图形链：行 '%s' 不是一个哈希值"
+
+#: commit-graph.c:554
+msgid "unable to find all commit-graph files"
+msgstr "无法找到所有提交图形文件"
+
+#: commit-graph.c:735 commit-graph.c:772
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr "无效的提交位置。提交图形可能已损坏"
+
+#: commit-graph.c:756
+#, c-format
+msgid "could not find commit %s"
+msgstr "无法找到提交 %s"
+
+#: commit-graph.c:789
+msgid "commit-graph requires overflow generation data but has none"
+msgstr "提交图需要溢出世代数据，但是没有"
+
+#: commit-graph.c:1065 builtin/am.c:1292
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "不能解析提交 %s"
+
+#: commit-graph.c:1327 builtin/pack-objects.c:2872
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "无法获得对象 %s 类型"
+
+#: commit-graph.c:1358
+msgid "Loading known commits in commit graph"
+msgstr "正在加载提交图中的已知提交"
+
+#: commit-graph.c:1375
+msgid "Expanding reachable commits in commit graph"
+msgstr "正在扩展提交图中的可达提交"
+
+#: commit-graph.c:1395
+msgid "Clearing commit marks in commit graph"
+msgstr "正在清除提交图中的提交标记"
+
+#: commit-graph.c:1414
+msgid "Computing commit graph topological levels"
+msgstr "正在计算提交图拓扑级别"
+
+#: commit-graph.c:1467
+msgid "Computing commit graph generation numbers"
+msgstr "正在计算提交图世代数字"
+
+#: commit-graph.c:1548
+msgid "Computing commit changed paths Bloom filters"
+msgstr "计算提交变更路径的布隆过滤器"
+
+#: commit-graph.c:1625
+msgid "Collecting referenced commits"
+msgstr "正在收集引用的提交"
+
+#: commit-graph.c:1650
+#, 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:1663
+#, c-format
+msgid "error adding pack %s"
+msgstr "添加包 %s 出错"
+
+#: commit-graph.c:1667
+#, c-format
+msgid "error opening index for %s"
+msgstr "为 %s 打开索引出错"
+
+#: commit-graph.c:1704
+msgid "Finding commits for commit graph among packed objects"
+msgstr "正在打包对象中查找提交图的提交"
+
+#: commit-graph.c:1722
+msgid "Finding extra edges in commit graph"
+msgstr "正在查找提交图中额外的边"
+
+#: commit-graph.c:1771
+msgid "failed to write correct number of base graph ids"
+msgstr "无法写入正确数量的基础图形 ID"
+
+#: commit-graph.c:1802 midx.c:794
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr "不能为 %s 创建先导目录"
+
+#: commit-graph.c:1815
+msgid "unable to create temporary graph layer"
+msgstr "无法创建临时图层"
+
+#: commit-graph.c:1820
+#, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "无法为 '%s' 调整共享权限"
+
+#: commit-graph.c:1879
+#, 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:1915
+msgid "unable to open commit-graph chain file"
+msgstr "无法打开提交图形链文件"
+
+#: commit-graph.c:1931
+msgid "failed to rename base commit-graph file"
+msgstr "无法重命名基础提交图形文件"
+
+#: commit-graph.c:1951
+msgid "failed to rename temporary commit-graph file"
+msgstr "无法重命名临时提交图形文件"
+
+#: commit-graph.c:2084
+msgid "Scanning merged commits"
+msgstr "正在扫描合并提交"
+
+#: commit-graph.c:2128
+msgid "Merging commit-graph"
+msgstr "正在合并提交图形"
+
+#: commit-graph.c:2235
+msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
+msgstr "正尝试写提交图，但是 'core.commitGraph' 被禁用"
+
+#: commit-graph.c:2342
+msgid "too many commits to write graph"
+msgstr "提交太多不能画图"
+
+#: commit-graph.c:2440
+msgid "the commit-graph file has incorrect checksum and is likely corrupt"
+msgstr "提交图文件的校验码错误，可能已经损坏"
+
+#: commit-graph.c:2450
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s"
+
+#: commit-graph.c:2460 commit-graph.c:2475
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u"
+
+#: commit-graph.c:2467
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "无法从提交图形中解析提交 %s"
+
+#: commit-graph.c:2485
+msgid "Verifying commits in commit graph"
+msgstr "正在校验提交图中的提交"
+
+#: commit-graph.c:2500
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr "无法从提交图形的对象库中解析提交 %s"
+
+#: commit-graph.c:2507
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s"
+
+#: commit-graph.c:2517
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr "提交 %s 的提交图形父提交列表太长了"
+
+#: commit-graph.c:2526
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr "%s 的提交图形父提交是 %s != %s"
+
+#: commit-graph.c:2540
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr "提交 %s 的提交图形父提交列表过早终止"
+
+#: commit-graph.c:2545
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零"
+
+#: commit-graph.c:2549
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr "提交图形中提交 %s 的世代号非零，但其它地方是零"
+
+#: commit-graph.c:2566
+#, c-format
+msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
+msgstr "提交图形中的提交 %s 的世代号是 %<PRIuMAX> < %<PRIuMAX>"
+
+#: commit-graph.c:2572
+#, c-format
+msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
+msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
+
+#: commit.c:52 sequencer.c:2887 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr "不能解析 %s"
-#: commit.c:53
+#: commit.c:54
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s 不是一个提交！"
-#: commit.c:193
+#: commit.c:194
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -2122,7 +2466,7 @@
"Turn this message off by running\n"
"\"git config advice.graftFileDeprecated false\""
msgstr ""
-"对 <GIT_DIR>/info/grafts 的支持已被弃用，并将在\n"
+"对 <GIT_DIR>/info/grafts 的支持已过时，并将在\n"
"未来的Git版本中被移除。\n"
"\n"
"请使用 \"git replace --convert-graft-file\" 将\n"
@@ -2131,27 +2475,27 @@
"设置 \"git config advice.graftFileDeprecated false\"\n"
"可关闭本消息"
-#: commit.c:1153
+#: commit.c:1223
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
-#: commit.c:1157
+#: commit.c:1227
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
-#: commit.c:1160
+#: commit.c:1230
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "提交 %s 没有 GPG 签名。"
-#: commit.c:1163
+#: commit.c:1233
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
-#: commit.c:1417
+#: commit.c:1487
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
@@ -2161,262 +2505,11 @@
"您可以通过修补提交来改正提交说明，或者将配置变量 i18n.commitencoding\n"
"设置为您项目所用的字符编码。\n"
-#: commit-graph.c:122
-msgid "commit-graph file is too small"
-msgstr "提交图形文件太小"
-
-#: commit-graph.c:189
-#, c-format
-msgid "commit-graph signature %X does not match signature %X"
-msgstr "提交图形签名 %X 和签名 %X 不匹配"
-
-#: commit-graph.c:196
-#, c-format
-msgid "commit-graph version %X does not match version %X"
-msgstr "提交图形版本 %X 和版本 %X 不匹配"
-
-#: commit-graph.c:203
-#, c-format
-msgid "commit-graph hash version %X does not match version %X"
-msgstr "提交图形哈希版本 %X 和版本 %X 不匹配"
-
-#: commit-graph.c:226
-msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
-msgstr "提交图形块查找表条目丢失，文件可能不完整"
-
-#: commit-graph.c:237
-#, c-format
-msgid "commit-graph improper chunk offset %08x%08x"
-msgstr "提交图形不正确的块偏移 %08x%08x"
-
-#: commit-graph.c:280
-#, c-format
-msgid "commit-graph chunk id %08x appears multiple times"
-msgstr "提交图形块 id %08x 出现了多次"
-
-#: commit-graph.c:343
-msgid "commit-graph has no base graphs chunk"
-msgstr "提交图形没有基础图形块"
-
-#: commit-graph.c:353
-msgid "commit-graph chain does not match"
-msgstr "提交图形链不匹配"
-
-#: commit-graph.c:401
-#, c-format
-msgid "invalid commit-graph chain: line '%s' not a hash"
-msgstr "无效的提交图形链：行 '%s' 不是一个哈希值"
-
-#: commit-graph.c:425
-msgid "unable to find all commit-graph files"
-msgstr "无法找到所有提交图形文件"
-
-#: commit-graph.c:558 commit-graph.c:618
-msgid "invalid commit position. commit-graph is likely corrupt"
-msgstr "无效的提交位置。提交图形可能已损坏"
-
-#: commit-graph.c:579
-#, c-format
-msgid "could not find commit %s"
-msgstr "无法找到提交 %s"
-
-#: commit-graph.c:852 builtin/am.c:1292
-#, c-format
-msgid "unable to parse commit %s"
-msgstr "不能解析提交 %s"
-
-#: commit-graph.c:1011 builtin/pack-objects.c:2782
-#, c-format
-msgid "unable to get type of object %s"
-msgstr "无法获得对象 %s 类型"
-
-#: commit-graph.c:1043
-msgid "Loading known commits in commit graph"
-msgstr "正在加载提交图中的已知提交"
-
-#: commit-graph.c:1060
-msgid "Expanding reachable commits in commit graph"
-msgstr "正在扩展提交图中的可达提交"
-
-#: commit-graph.c:1079
-msgid "Clearing commit marks in commit graph"
-msgstr "正在清除提交图中的提交标记"
-
-#: commit-graph.c:1098
-msgid "Computing commit graph generation numbers"
-msgstr "正在计算提交图世代数字"
-
-#: commit-graph.c:1173
-#, c-format
-msgid "Finding commits for commit graph in %d pack"
-msgid_plural "Finding commits for commit graph in %d packs"
-msgstr[0] "正在 %d 个包中查找提交图的提交"
-msgstr[1] "正在 %d 个包中查找提交图的提交"
-
-#: commit-graph.c:1186
-#, c-format
-msgid "error adding pack %s"
-msgstr "添加包 %s 出错"
-
-#: commit-graph.c:1190
-#, c-format
-msgid "error opening index for %s"
-msgstr "为 %s 打开索引出错"
-
-#: commit-graph.c:1214
-#, c-format
-msgid "Finding commits for commit graph from %d ref"
-msgid_plural "Finding commits for commit graph from %d refs"
-msgstr[0] "正在从 %d 个引用中查找提交图的提交"
-msgstr[1] "正在从 %d 个引用中查找提交图的提交"
-
-#: commit-graph.c:1234
-#, c-format
-msgid "invalid commit object id: %s"
-msgstr "无效的提交对象 ID：%s"
-
-#: commit-graph.c:1249
-msgid "Finding commits for commit graph among packed objects"
-msgstr "正在打包对象中查找提交图的提交"
-
-#: commit-graph.c:1264
-msgid "Counting distinct commits in commit graph"
-msgstr "正在计算提交图中不同的提交"
-
-#: commit-graph.c:1294
-msgid "Finding extra edges in commit graph"
-msgstr "正在查找提交图中额外的边"
-
-#: commit-graph.c:1340
-msgid "failed to write correct number of base graph ids"
-msgstr "无法写入正确数量的基础图形 ID"
-
-#: commit-graph.c:1373 midx.c:814
-#, c-format
-msgid "unable to create leading directories of %s"
-msgstr "不能为 %s 创建先导目录"
-
-#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248
-#, c-format
-msgid "unable to create '%s'"
-msgstr "不能创建 '%s'"
-
-#: commit-graph.c:1445
-#, c-format
-msgid "Writing out commit graph in %d pass"
-msgid_plural "Writing out commit graph in %d passes"
-msgstr[0] "正在用 %d 步写出提交图"
-msgstr[1] "正在用 %d 步写出提交图"
-
-#: commit-graph.c:1486
-msgid "unable to open commit-graph chain file"
-msgstr "无法打开提交图形链文件"
-
-#: commit-graph.c:1498
-msgid "failed to rename base commit-graph file"
-msgstr "无法重命名基础提交图形文件"
-
-#: commit-graph.c:1518
-msgid "failed to rename temporary commit-graph file"
-msgstr "无法重命名临时提交图形文件"
-
-#: commit-graph.c:1631
-msgid "Scanning merged commits"
-msgstr "正在扫描合并提交"
-
-#: commit-graph.c:1642
-#, c-format
-msgid "unexpected duplicate commit id %s"
-msgstr "意外的重复提交 ID %s"
-
-#: commit-graph.c:1665
-msgid "Merging commit-graph"
-msgstr "正在合并提交图形"
-
-#: commit-graph.c:1844
-#, c-format
-msgid "the commit graph format cannot write %d commits"
-msgstr "提交图格式不能写入 %d 个提交"
-
-#: commit-graph.c:1855
-msgid "too many commits to write graph"
-msgstr "提交太多不能画图"
-
-#: commit-graph.c:1944
-msgid "the commit-graph file has incorrect checksum and is likely corrupt"
-msgstr "提交图文件的校验码错误，可能已经损坏"
-
-#: commit-graph.c:1954
-#, c-format
-msgid "commit-graph has incorrect OID order: %s then %s"
-msgstr "提交图形的对象 ID 顺序不正确：%s 然后 %s"
-
-#: commit-graph.c:1964 commit-graph.c:1979
-#, c-format
-msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
-msgstr "提交图形有不正确的扇出值：fanout[%d] = %u != %u"
-
-#: commit-graph.c:1971
-#, c-format
-msgid "failed to parse commit %s from commit-graph"
-msgstr "无法从提交图形中解析提交 %s"
-
-#: commit-graph.c:1989
-msgid "Verifying commits in commit graph"
-msgstr "正在校验提交图中的提交"
-
-#: commit-graph.c:2003
-#, c-format
-msgid "failed to parse commit %s from object database for commit-graph"
-msgstr "无法从提交图形的对象库中解析提交 %s"
-
-#: commit-graph.c:2010
-#, c-format
-msgid "root tree OID for commit %s in commit-graph is %s != %s"
-msgstr "提交图形中的提交 %s 的根树对象 ID 是 %s != %s"
-
-#: commit-graph.c:2020
-#, c-format
-msgid "commit-graph parent list for commit %s is too long"
-msgstr "提交 %s 的提交图形父提交列表太长了"
-
-#: commit-graph.c:2029
-#, c-format
-msgid "commit-graph parent for %s is %s != %s"
-msgstr "%s 的提交图形父提交是 %s != %s"
-
-#: commit-graph.c:2042
-#, c-format
-msgid "commit-graph parent list for commit %s terminates early"
-msgstr "提交 %s 的提交图形父提交列表过早终止"
-
-#: commit-graph.c:2047
-#, c-format
-msgid ""
-"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
-msgstr "提交图形中提交 %s 的世代号是零，但其它地方非零"
-
-#: commit-graph.c:2051
-#, c-format
-msgid ""
-"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
-msgstr "提交图形中提交 %s 的世代号非零，但其它地方是零"
-
-#: commit-graph.c:2066
-#, c-format
-msgid "commit-graph generation for commit %s is %u != %u"
-msgstr "提交图形中的提交 %s 的世代号是 %u != %u"
-
-#: commit-graph.c:2072
-#, c-format
-msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
-msgstr "提交图形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
-
#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "内存耗尽"
-#: config.c:124
+#: config.c:126
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2431,289 +2524,333 @@
"\t%2$s\n"
"这可能是因为循环包含。"
-#: config.c:140
+#: config.c:142
#, c-format
msgid "could not expand include path '%s'"
msgstr "无法扩展包含路径 '%s'"
-#: config.c:151
+#: config.c:153
msgid "relative config includes must come from files"
msgstr "相对路径的配置文件引用必须来自于文件"
-#: config.c:197
+#: config.c:199
msgid "relative config include conditionals must come from files"
msgstr "相对路径的配置文件条件引用必须来自于文件"
-#: config.c:376
+#: config.c:396
+#, c-format
+msgid "invalid config format: %s"
+msgstr "无效的配置格式：%s"
+
+#: config.c:400
+#, c-format
+msgid "missing environment variable name for configuration '%.*s'"
+msgstr "配置 '%.*s' 缺少环境变量名称"
+
+#: config.c:405
+#, c-format
+msgid "missing environment variable '%s' for configuration '%.*s'"
+msgstr "缺少环境变量 '%s' 于配置 '%.*s' "
+
+#: config.c:442
#, c-format
msgid "key does not contain a section: %s"
msgstr "键名没有包含一个小节名称：%s"
-#: config.c:382
+#: config.c:448
#, c-format
msgid "key does not contain variable name: %s"
msgstr "键名没有包含变量名：%s"
-#: config.c:406 sequencer.c:2444
+#: config.c:472 sequencer.c:2588
#, c-format
msgid "invalid key: %s"
msgstr "无效键名：%s"
-#: config.c:412
+#: config.c:478
#, c-format
msgid "invalid key (newline): %s"
msgstr "无效键名（有换行符）：%s"
-#: config.c:448 config.c:460
+#: config.c:511
+msgid "empty config key"
+msgstr "空的配置键名"
+
+#: config.c:529 config.c:541
#, c-format
msgid "bogus config parameter: %s"
msgstr "伪配置参数：%s"
-#: config.c:495
+#: config.c:555 config.c:572 config.c:579 config.c:588
#, c-format
msgid "bogus format in %s"
msgstr "%s 中格式错误"
-#: config.c:821
+#: config.c:622
+#, c-format
+msgid "bogus count in %s"
+msgstr "%s 中错误计数"
+
+#: config.c:626
+#, c-format
+msgid "too many entries in %s"
+msgstr "%s 中太多的条目"
+
+#: config.c:636
+#, c-format
+msgid "missing config key %s"
+msgstr "缺失配置键名 %s"
+
+#: config.c:644
+#, c-format
+msgid "missing config value %s"
+msgstr "缺失配置取值 %s"
+
+#: config.c:995
#, c-format
msgid "bad config line %d in blob %s"
msgstr "数据对象 %2$s 中错误的配置行 %1$d"
-#: config.c:825
+#: config.c:999
#, c-format
msgid "bad config line %d in file %s"
msgstr "文件 %2$s 中错误的配置行 %1$d"
-#: config.c:829
+#: config.c:1003
#, c-format
msgid "bad config line %d in standard input"
msgstr "标准输入中错误的配置行 %d"
-#: config.c:833
+#: config.c:1007
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
-#: config.c:837
+#: config.c:1011
#, c-format
msgid "bad config line %d in command line %s"
msgstr "命令行 %2$s 中错误的配置行 %1$d"
-#: config.c:841
+#: config.c:1015
#, c-format
msgid "bad config line %d in %s"
msgstr "在 %2$s 中错误的配置行 %1$d"
-#: config.c:978
+#: config.c:1152
msgid "out of range"
msgstr "超出范围"
-#: config.c:978
+#: config.c:1152
msgid "invalid unit"
msgstr "无效的单位"
-#: config.c:979
+#: config.c:1153
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s"
-#: config.c:998
+#: config.c:1163
#, 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:1166
#, 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:1169
#, 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:1172
#, 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:1175
#, 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:1178
#, 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:1194
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr "'%2$s' 的错误的布尔取值 '%1$s'"
+
+#: config.c:1289
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "无法扩展用户目录：'%s'"
-#: config.c:1117
+#: config.c:1298
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
-#: config.c:1208
+#: config.c:1391
#, c-format
msgid "abbrev length out of range: %d"
msgstr "缩写长度超出范围：%d"
-#: config.c:1222 config.c:1233
+#: config.c:1405 config.c:1416
#, c-format
msgid "bad zlib compression level %d"
msgstr "错误的 zlib 压缩级别 %d"
-#: config.c:1325
+#: config.c:1508
msgid "core.commentChar should only be one character"
msgstr "core.commentChar 应该是一个字符"
-#: config.c:1358
+#: config.c:1541
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "无效的对象创建模式：%s"
-#: config.c:1430
+#: config.c:1613
#, c-format
msgid "malformed value for %s"
msgstr "%s 的取值格式错误"
-#: config.c:1456
+#: config.c:1639
#, c-format
msgid "malformed value for %s: %s"
msgstr "%s 的取值格式错误：%s"
-#: config.c:1457
+#: config.c:1640
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "必须是其中之一：nothing、matching、simple、upstream 或 current"
-#: config.c:1518 builtin/pack-objects.c:3541
+#: config.c:1701 builtin/pack-objects.c:3666
#, c-format
msgid "bad pack compression level %d"
msgstr "错误的打包压缩级别 %d"
-#: config.c:1639
+#: config.c:1823
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "无法从数据对象 '%s' 加载配置"
-#: config.c:1642
+#: config.c:1826
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "引用 '%s' 没有指向一个数据对象"
-#: config.c:1659
+#: config.c:1843
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "不能解析配置对象 '%s'"
-#: config.c:1689
+#: config.c:1873
#, c-format
msgid "failed to parse %s"
msgstr "解析 %s 失败"
-#: config.c:1743
+#: config.c:1927
msgid "unable to parse command-line config"
msgstr "无法解析命令行中的配置"
-#: config.c:2097
+#: config.c:2290
msgid "unknown error occurred while reading the configuration files"
msgstr "在读取配置文件时遇到未知错误"
-#: config.c:2267
+#: config.c:2464
#, c-format
msgid "Invalid %s: '%s'"
msgstr "无效 %s：'%s'"
-#: config.c:2312
+#: config.c:2509
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
-#: config.c:2358
+#: config.c:2555
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "无法解析命令行配置中的 '%s'"
-#: config.c:2360
+#: config.c:2557
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
-#: config.c:2441
+#: config.c:2641
#, c-format
msgid "invalid section name '%s'"
msgstr "无效的小节名称 '%s'"
-#: config.c:2473
+#: config.c:2673
#, c-format
msgid "%s has multiple values"
msgstr "%s 有多个取值"
-#: config.c:2502
+#: config.c:2702
#, c-format
msgid "failed to write new configuration file %s"
msgstr "写入新的配置文件 %s 失败"
-#: config.c:2754 config.c:3078
+#: config.c:2954 config.c:3280
#, c-format
msgid "could not lock config file %s"
msgstr "不能锁定配置文件 %s"
-#: config.c:2765
+#: config.c:2965
#, c-format
msgid "opening %s"
msgstr "打开 %s"
-#: config.c:2800 builtin/config.c:344
+#: config.c:3002 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "无效模式：%s"
-#: config.c:2825
+#: config.c:3027
#, c-format
msgid "invalid config file %s"
msgstr "无效的配置文件 %s"
-#: config.c:2838 config.c:3091
+#: config.c:3040 config.c:3293
#, c-format
msgid "fstat on %s failed"
msgstr "对 %s 调用 fstat 失败"
-#: config.c:2849
+#: config.c:3051
#, c-format
msgid "unable to mmap '%s'"
msgstr "不能 mmap '%s'"
-#: config.c:2858 config.c:3096
+#: config.c:3060 config.c:3298
#, c-format
msgid "chmod on %s failed"
msgstr "对 %s 调用 chmod 失败"
-#: config.c:2943 config.c:3193
+#: config.c:3145 config.c:3395
#, c-format
msgid "could not write config file %s"
msgstr "不能写入配置文件 %s"
-#: config.c:2977
+#: config.c:3179
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "不能设置 '%s' 为 '%s'"
-#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
+#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
#, c-format
msgid "could not unset '%s'"
msgstr "不能取消设置 '%s'"
-#: config.c:3069
+#: config.c:3271
#, c-format
msgid "invalid section name: %s"
msgstr "无效的小节名称：%s"
-#: config.c:3236
+#: config.c:3438
#, c-format
msgid "missing value for '%s'"
msgstr "%s 的取值缺失"
@@ -2738,72 +2875,81 @@
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:497
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr "服务器给出未知的对象格式 '%s'"
+
+#: connect.c:526
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "无效的 ls-refs 响应：%s"
-#: connect.c:445
+#: connect.c:530
msgid "expected flush after ref listing"
msgstr "在引用列表之后应该有一个 flush 包"
-#: connect.c:544
+#: connect.c:533
+msgid "expected response end packet after ref listing"
+msgstr "在引用列表之后应该有响应结束包"
+
+#: connect.c:666
#, c-format
msgid "protocol '%s' is not supported"
msgstr "不支持 '%s' 协议"
-#: connect.c:595
+#: connect.c:717
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "无法为 socket 设置 SO_KEEPALIVE"
-#: connect.c:635 connect.c:698
+#: connect.c:757 connect.c:820
#, c-format
msgid "Looking up %s ... "
msgstr "查找 %s ..."
-#: connect.c:639
+#: connect.c:761
#, 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:765 connect.c:836
#, c-format
msgid ""
"done.\n"
@@ -2812,7 +2958,7 @@
"完成。\n"
"连接到 %s（端口 %s）... "
-#: connect.c:665 connect.c:742
+#: connect.c:787 connect.c:864
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -2822,73 +2968,77 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:671 connect.c:748
+#: connect.c:793 connect.c:870
msgid "done."
msgstr "完成。"
-#: connect.c:702
+#: connect.c:824
#, c-format
msgid "unable to look up %s (%s)"
msgstr "无法查找 %s（%s）"
-#: connect.c:708
+#: connect.c:830
#, c-format
msgid "unknown port %s"
msgstr "未知端口 %s"
-#: connect.c:845 connect.c:1175
+#: connect.c:967 connect.c:1299
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "已阻止奇怪的主机名 '%s'"
-#: connect.c:847
+#: connect.c:969
#, c-format
msgid "strange port '%s' blocked"
msgstr "已阻止奇怪的端口号 '%s'"
-#: connect.c:857
+#: connect.c:979
#, c-format
msgid "cannot start proxy %s"
msgstr "不能启动代理 %s"
-#: connect.c:928
+#: connect.c:1050
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr "未指定路径，执行 'git help pull' 查看有效的 url 语法"
-#: connect.c:1123
+#: connect.c:1190
+msgid "newline is forbidden in git:// hosts and repo paths"
+msgstr "在 git:// 主机和仓库路径中禁止使用换行符"
+
+#: connect.c:1247
msgid "ssh variant 'simple' does not support -4"
msgstr "ssh 变体 'simple' 不支持 -4"
-#: connect.c:1135
+#: connect.c:1259
msgid "ssh variant 'simple' does not support -6"
msgstr "ssh 变体 'simple' 不支持 -6"
-#: connect.c:1152
+#: connect.c:1276
msgid "ssh variant 'simple' does not support setting port"
msgstr "ssh 变体 'simple' 不支持设置端口"
-#: connect.c:1264
+#: connect.c:1388
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "已阻止奇怪的路径名 '%s'"
-#: connect.c:1311
+#: connect.c:1436
msgid "unable to fork"
msgstr "无法 fork"
-#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43
+#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45
msgid "Checking connectivity"
msgstr "正在检查连通性"
-#: connected.c:110
+#: connected.c:120
msgid "Could not run 'git rev-list'"
msgstr "不能执行 'git rev-list'"
-#: connected.c:130
+#: connected.c:144
msgid "failed write to rev-list"
msgstr "写入 rev-list 失败"
-#: connected.c:137
+#: connected.c:149
msgid "failed to close rev-list's stdin"
msgstr "关闭 rev-list 的标准输入失败"
@@ -2962,60 +3112,88 @@
msgid "encoding '%s' from %s to %s and back is not the same"
msgstr "将'%s' 的编码从 %s 到 %s 来回转换不一致"
-#: convert.c:668
+#: convert.c:665
#, c-format
msgid "cannot fork to run external filter '%s'"
msgstr "不能 fork 以执行外部过滤器 '%s'"
-#: convert.c:688
+#: convert.c:685
#, c-format
msgid "cannot feed the input to external filter '%s'"
msgstr "不能将输入传递给外部过滤器 '%s'"
-#: convert.c:695
+#: convert.c:692
#, c-format
msgid "external filter '%s' failed %d"
msgstr "外部过滤器 '%s' 失败码 %d"
-#: convert.c:730 convert.c:733
+#: convert.c:727 convert.c:730
#, c-format
msgid "read from external filter '%s' failed"
msgstr "从外部过滤器 '%s' 读取失败"
-#: convert.c:736 convert.c:791
+#: convert.c:733 convert.c:788
#, c-format
msgid "external filter '%s' failed"
msgstr "外部过滤器 '%s' 失败"
-#: convert.c:839
+#: convert.c:837
msgid "unexpected filter type"
msgstr "意外的过滤类型"
-#: convert.c:850
+#: convert.c:848
msgid "path name too long for external filter"
msgstr "外部过滤器的路径名太长"
-#: convert.c:924
+#: convert.c:940
#, c-format
msgid ""
"external filter '%s' is not available anymore although not all paths have "
"been filtered"
msgstr "外部过滤器 '%s' 不再可用，但并非所有路径都已过滤"
-#: convert.c:1223
+#: convert.c:1240
msgid "true/false are no valid working-tree-encodings"
msgstr "true/false 不是有效的工作区编码"
-#: convert.c:1411 convert.c:1445
+#: convert.c:1428 convert.c:1462
#, c-format
msgid "%s: clean filter '%s' failed"
msgstr "%s：clean 过滤器 '%s' 失败"
-#: convert.c:1489
+#: 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 "在将来"
@@ -3108,14 +3286,30 @@
msgid "Marked %d islands, done.\n"
msgstr "已标记 %d 个数据岛，结束。\n"
-#: diffcore-order.c:24
+#: diff-merges.c:70
#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "读取排序文件 '%s' 失败"
+msgid "unknown value for --diff-merges: %s"
+msgstr "未知的 --diff-merges 取值：%s"
-#: diffcore-rename.c:543
-msgid "Performing inexact rename detection"
-msgstr "正在进行非精确的重命名探测"
+#: diff-lib.c:534
+msgid "--merge-base does not work with ranges"
+msgstr "--merge-base 不适用于范围"
+
+#: diff-lib.c:536
+msgid "--merge-base only works with commits"
+msgstr "--merge-base 仅适用于提交"
+
+#: diff-lib.c:553
+msgid "unable to get HEAD"
+msgstr "不能解析 HEAD"
+
+#: diff-lib.c:560
+msgid "no merge base found"
+msgstr "未找到合并基线"
+
+#: diff-lib.c:562
+msgid "multiple merge bases found"
+msgstr "找到了多条合并基线"
#: diff-no-index.c:238
msgid "git diff --no-index [<options>] <path> <path>"
@@ -3125,21 +3319,21 @@
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'"
@@ -3147,7 +3341,7 @@
"移动的颜色设置必须是 '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', "
@@ -3156,18 +3350,18 @@
"未知的 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"
@@ -3176,35 +3370,35 @@
"发现配置变量 'diff.dirstat' 中的错误：\n"
"%s"
-#: diff.c:4202
+#: diff.c:4276
#, c-format
msgid "external diff died, stopping at %s"
msgstr "外部 diff 退出，停止在 %s"
-#: diff.c:4547
+#: diff.c:4628
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
-#: diff.c:4550
+#: diff.c:4631
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G、-S 和 --find-object 是互斥的"
-#: diff.c:4628
+#: diff.c:4710
msgid "--follow requires exactly one pathspec"
msgstr "--follow 明确要求只跟一个路径规格"
-#: diff.c:4676
+#: diff.c:4758
#, c-format
msgid "invalid --stat value: %s"
msgstr "无效的 --stat 值：%s"
-#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
-#: parse-options.c:197 parse-options.c:201
+#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306
+#: 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:4713
+#: diff.c:4795
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3213,195 +3407,200 @@
"无法解析 --dirstat/-X 选项的参数：\n"
"%s"
-#: diff.c:4798
+#: diff.c:4880
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "--diff-filter=%2$s 中未知的变更类 '%1$c'"
-#: diff.c:4822
+#: diff.c:4904
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "ws-error-highlight=%.*s 之后未知的值"
-#: diff.c:4836
+#: diff.c:4918
#, c-format
msgid "unable to resolve '%s'"
msgstr "不能解析 '%s'"
-#: diff.c:4886 diff.c:4892
+#: diff.c:4968 diff.c:4974
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s 期望 <n>/<m> 格式"
-#: diff.c:4904
+#: diff.c:4986
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s 期望一个字符，得到 '%s'"
-#: diff.c:4925
+#: diff.c:5007
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "坏的 --color-moved 参数：%s"
-#: diff.c:4944
+#: diff.c:5026
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
msgstr "--color-moved-ws 中的无效模式 '%s' "
-#: diff.c:4984
+#: diff.c:5066
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
msgstr ""
"diff-algorithm 选项有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
-#: diff.c:5020 diff.c:5040
+#: diff.c:5102 diff.c:5122
#, c-format
msgid "invalid argument to %s"
msgstr "%s 的参数无效"
-#: diff.c:5178
+#: diff.c:5226
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr "选项 -I 的正则表达式无效：'%s'"
+
+#: diff.c:5275
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "无法解析 --submodule 选项的参数：'%s'"
-#: diff.c:5234
+#: diff.c:5331
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "坏的 --word-diff 参数：%s"
-#: diff.c:5257
+#: diff.c:5367
msgid "Diff output format options"
msgstr "差异输出格式化选项"
-#: diff.c:5259 diff.c:5265
+#: diff.c:5369 diff.c:5375
msgid "generate patch"
msgstr "生成补丁"
-#: diff.c:5262 builtin/log.c:173
+#: diff.c:5372 builtin/log.c:179
msgid "suppress diff output"
msgstr "不显示差异输出"
-#: diff.c:5267 diff.c:5381 diff.c:5388
+#: diff.c:5377 diff.c:5491 diff.c:5498
msgid "<n>"
msgstr "<n>"
-#: diff.c:5268 diff.c:5271
+#: diff.c:5378 diff.c:5381
msgid "generate diffs with <n> lines context"
msgstr "生成含 <n> 行上下文的差异"
-#: diff.c:5273
+#: diff.c:5383
msgid "generate the diff in raw format"
msgstr "生成原始格式的差异"
-#: diff.c:5276
+#: diff.c:5386
msgid "synonym for '-p --raw'"
msgstr "和 '-p --raw' 同义"
-#: diff.c:5280
+#: diff.c:5390
msgid "synonym for '-p --stat'"
msgstr "和 '-p --stat' 同义"
-#: diff.c:5284
+#: diff.c:5394
msgid "machine friendly --stat"
msgstr "机器友好的 --stat"
-#: diff.c:5287
+#: diff.c:5397
msgid "output only the last line of --stat"
msgstr "只输出 --stat 的最后一行"
-#: diff.c:5289 diff.c:5297
+#: diff.c:5399 diff.c:5407
msgid "<param1,param2>..."
msgstr "<参数1,参数2>..."
-#: diff.c:5290
+#: diff.c:5400
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr "输出每个子目录相对变更的分布"
-#: diff.c:5294
+#: diff.c:5404
msgid "synonym for --dirstat=cumulative"
msgstr "和 --dirstat=cumulative 同义"
-#: diff.c:5298
+#: diff.c:5408
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "是 --dirstat=files,param1,param2... 的同义词"
-#: diff.c:5302
+#: diff.c:5412
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr "如果变更中引入冲突定界符或空白错误，给出警告"
-#: diff.c:5305
+#: diff.c:5415
msgid "condensed summary such as creations, renames and mode changes"
msgstr "精简摘要，例如创建、重命名和模式变更"
-#: diff.c:5308
+#: diff.c:5418
msgid "show only names of changed files"
msgstr "只显示变更文件的文件名"
-#: diff.c:5311
+#: diff.c:5421
msgid "show only names and status of changed files"
msgstr "只显示变更文件的文件名和状态"
-#: diff.c:5313
+#: diff.c:5423
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<宽度>[,<文件名宽度>[,<次数>]]"
-#: diff.c:5314
+#: diff.c:5424
msgid "generate diffstat"
msgstr "生成差异统计（diffstat）"
-#: diff.c:5316 diff.c:5319 diff.c:5322
+#: diff.c:5426 diff.c:5429 diff.c:5432
msgid "<width>"
msgstr "<宽度>"
-#: diff.c:5317
+#: diff.c:5427
msgid "generate diffstat with a given width"
msgstr "使用给定的长度生成差异统计"
-#: diff.c:5320
+#: diff.c:5430
msgid "generate diffstat with a given name width"
msgstr "使用给定的文件名长度生成差异统计"
-#: diff.c:5323
+#: diff.c:5433
msgid "generate diffstat with a given graph width"
msgstr "使用给定的图形长度生成差异统计"
-#: diff.c:5325
+#: diff.c:5435
msgid "<count>"
msgstr "<次数>"
-#: diff.c:5326
+#: diff.c:5436
msgid "generate diffstat with limited lines"
msgstr "生成有限行数的差异统计"
-#: diff.c:5329
+#: diff.c:5439
msgid "generate compact summary in diffstat"
msgstr "生成差异统计的简洁摘要"
-#: diff.c:5332
+#: diff.c:5442
msgid "output a binary diff that can be applied"
msgstr "输出一个可以应用的二进制差异"
-#: diff.c:5335
+#: diff.c:5445
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr "在 \"index\" 行显示完整的前后对象名称"
-#: diff.c:5337
+#: diff.c:5447
msgid "show colored diff"
msgstr "显示带颜色的差异"
-#: diff.c:5338
+#: diff.c:5448
msgid "<kind>"
msgstr "<类型>"
-#: diff.c:5339
+#: diff.c:5449
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgstr "对于差异中的上下文、旧的和新的行，加亮显示错误的空白字符"
-#: diff.c:5342
+#: diff.c:5452
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3409,377 +3608,407 @@
"在 --raw 或者 --numstat 中，不对路径字符转码并使用 NUL 字符做为输出字段的分隔"
"符"
-#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457
+#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570
msgid "<prefix>"
msgstr "<前缀>"
-#: diff.c:5346
+#: diff.c:5456
msgid "show the given source prefix instead of \"a/\""
msgstr "显示给定的源前缀取代 \"a/\""
-#: diff.c:5349
+#: diff.c:5459
msgid "show the given destination prefix instead of \"b/\""
msgstr "显示给定的目标前缀取代 \"b/\""
-#: diff.c:5352
+#: diff.c:5462
msgid "prepend an additional prefix to every line of output"
msgstr "输出的每一行附加前缀"
-#: diff.c:5355
+#: diff.c:5465
msgid "do not show any source or destination prefix"
msgstr "不显示任何源和目标前缀"
-#: diff.c:5358
+#: diff.c:5468
msgid "show context between diff hunks up to the specified number of lines"
msgstr "显示指定行数的差异块间的上下文"
-#: diff.c:5362 diff.c:5367 diff.c:5372
+#: diff.c:5472 diff.c:5477 diff.c:5482
msgid "<char>"
msgstr "<字符>"
-#: diff.c:5363
+#: diff.c:5473
msgid "specify the character to indicate a new line instead of '+'"
msgstr "指定一个字符取代 '+' 来表示新的一行"
-#: diff.c:5368
+#: diff.c:5478
msgid "specify the character to indicate an old line instead of '-'"
msgstr "指定一个字符取代 '-' 来表示旧的一行"
-#: diff.c:5373
+#: diff.c:5483
msgid "specify the character to indicate a context instead of ' '"
msgstr "指定一个字符取代 ' ' 来表示一行上下文"
-#: diff.c:5376
+#: diff.c:5486
msgid "Diff rename options"
msgstr "差异重命名选项"
-#: diff.c:5377
+#: diff.c:5487
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5378
+#: diff.c:5488
msgid "break complete rewrite changes into pairs of delete and create"
msgstr "将完全重写的变更打破为成对的删除和创建"
-#: diff.c:5382
+#: diff.c:5492
msgid "detect renames"
msgstr "检测重命名"
-#: diff.c:5386
+#: diff.c:5496
msgid "omit the preimage for deletes"
msgstr "省略删除操作的差异输出"
-#: diff.c:5389
+#: diff.c:5499
msgid "detect copies"
msgstr "检测拷贝"
-#: diff.c:5393
+#: diff.c:5503
msgid "use unmodified files as source to find copies"
msgstr "使用未修改的文件做为发现拷贝的源"
-#: diff.c:5395
+#: diff.c:5505
msgid "disable rename detection"
msgstr "禁用重命名探测"
-#: diff.c:5398
+#: diff.c:5508
msgid "use empty blobs as rename source"
msgstr "使用空的数据对象做为重命名的源"
-#: diff.c:5400
+#: diff.c:5510
msgid "continue listing the history of a file beyond renames"
msgstr "继续列出文件重命名以外的历史记录"
-#: diff.c:5403
+#: diff.c:5513
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr "如果重命名/拷贝目标超过给定的限制，禁止重命名/拷贝检测"
-#: diff.c:5405
+#: diff.c:5515
msgid "Diff algorithm options"
msgstr "差异算法选项"
-#: diff.c:5407
+#: diff.c:5517
msgid "produce the smallest possible diff"
msgstr "生成尽可能小的差异"
-#: diff.c:5410
+#: diff.c:5520
msgid "ignore whitespace when comparing lines"
msgstr "行比较时忽略空白字符"
-#: diff.c:5413
+#: diff.c:5523
msgid "ignore changes in amount of whitespace"
msgstr "忽略空白字符的变更"
-#: diff.c:5416
+#: diff.c:5526
msgid "ignore changes in whitespace at EOL"
msgstr "忽略行尾的空白字符变更"
-#: diff.c:5419
+#: diff.c:5529
msgid "ignore carrier-return at the end of line"
msgstr "忽略行尾的回车符（CR）"
-#: diff.c:5422
+#: diff.c:5532
msgid "ignore changes whose lines are all blank"
msgstr "忽略整行都是空白的变更"
-#: diff.c:5425
-msgid "heuristic to shift diff hunk boundaries for easy reading"
-msgstr "启发式转换差异边界以便阅读"
-
-#: diff.c:5428
-msgid "generate diff using the \"patience diff\" algorithm"
-msgstr "使用 \"patience diff\" 算法生成差异"
-
-#: diff.c:5432
-msgid "generate diff using the \"histogram diff\" algorithm"
-msgstr "使用 \"histogram diff\" 算法生成差异"
-
-#: diff.c:5434
-msgid "<algorithm>"
-msgstr "<算法>"
-
-#: diff.c:5435
-msgid "choose a diff algorithm"
-msgstr "选择一个差异算法"
-
-#: diff.c:5437
-msgid "<text>"
-msgstr "<文本>"
-
-#: diff.c:5438
-msgid "generate diff using the \"anchored diff\" algorithm"
-msgstr "使用 \"anchored diff\" 算法生成差异"
-
-#: diff.c:5440 diff.c:5449 diff.c:5452
-msgid "<mode>"
-msgstr "<模式>"
-
-#: diff.c:5441
-msgid "show word diff, using <mode> to delimit changed words"
-msgstr "显示单词差异，使用 <模式> 分隔变更的单词"
-
-#: diff.c:5443 diff.c:5446 diff.c:5491
+#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604
msgid "<regex>"
msgstr "<正则>"
-#: diff.c:5444
+#: diff.c:5535
+msgid "ignore changes whose all lines match <regex>"
+msgstr "忽略所有行都和正则表达式匹配的变更"
+
+#: diff.c:5538
+msgid "heuristic to shift diff hunk boundaries for easy reading"
+msgstr "启发式转换差异边界以便阅读"
+
+#: diff.c:5541
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr "使用 \"patience diff\" 算法生成差异"
+
+#: diff.c:5545
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr "使用 \"histogram diff\" 算法生成差异"
+
+#: diff.c:5547
+msgid "<algorithm>"
+msgstr "<算法>"
+
+#: diff.c:5548
+msgid "choose a diff algorithm"
+msgstr "选择一个差异算法"
+
+#: diff.c:5550
+msgid "<text>"
+msgstr "<文本>"
+
+#: diff.c:5551
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr "使用 \"anchored diff\" 算法生成差异"
+
+#: diff.c:5553 diff.c:5562 diff.c:5565
+msgid "<mode>"
+msgstr "<模式>"
+
+#: diff.c:5554
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr "显示单词差异，使用 <模式> 分隔变更的单词"
+
+#: diff.c:5557
msgid "use <regex> to decide what a word is"
msgstr "使用 <正则表达式> 确定何为一个词"
-#: diff.c:5447
+#: diff.c:5560
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"
-#: diff.c:5450
+#: diff.c:5563
msgid "moved lines of code are colored differently"
msgstr "移动的代码行用不同方式着色"
-#: diff.c:5453
+#: diff.c:5566
msgid "how white spaces are ignored in --color-moved"
msgstr "在 --color-moved 下如何忽略空白字符"
-#: diff.c:5456
+#: diff.c:5569
msgid "Other diff options"
msgstr "其它差异选项"
-#: diff.c:5458
+#: diff.c:5571
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr "当从子目录运行，排除目录之外的变更并显示相对路径"
-#: diff.c:5462
+#: diff.c:5575
msgid "treat all files as text"
msgstr "把所有文件当做文本处理"
-#: diff.c:5464
+#: diff.c:5577
msgid "swap two inputs, reverse the diff"
msgstr "交换两个输入，反转差异"
-#: diff.c:5466
+#: diff.c:5579
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "有差异时退出码为 1，否则为 0"
-#: diff.c:5468
+#: diff.c:5581
msgid "disable all output of the program"
msgstr "禁用本程序的所有输出"
-#: diff.c:5470
+#: diff.c:5583
msgid "allow an external diff helper to be executed"
msgstr "允许执行一个外置的差异助手"
-#: diff.c:5472
+#: diff.c:5585
msgid "run external text conversion filters when comparing binary files"
msgstr "当比较二进制文件时，运行外部的文本转换过滤器"
-#: diff.c:5474
+#: diff.c:5587
msgid "<when>"
msgstr "<何时>"
-#: diff.c:5475
+#: diff.c:5588
msgid "ignore changes to submodules in the diff generation"
msgstr "在生成差异时，忽略子模组的更改"
-#: diff.c:5478
+#: diff.c:5591
msgid "<format>"
msgstr "<格式>"
-#: diff.c:5479
+#: diff.c:5592
msgid "specify how differences in submodules are shown"
msgstr "指定子模组的差异如何显示"
-#: diff.c:5483
+#: diff.c:5596
msgid "hide 'git add -N' entries from the index"
msgstr "隐藏索引中 'git add -N' 条目"
-#: diff.c:5486
+#: diff.c:5599
msgid "treat 'git add -N' entries as real in the index"
msgstr "将索引中 'git add -N' 条目当做真实的"
-#: diff.c:5488
+#: diff.c:5601
msgid "<string>"
msgstr "<字符串>"
-#: diff.c:5489
+#: diff.c:5602
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr "查找改变了指定字符串出现次数的差异"
-#: diff.c:5492
+#: diff.c:5605
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr "查找改变指定正则匹配出现次数的差异"
-#: diff.c:5495
+#: diff.c:5608
msgid "show all changes in the changeset with -S or -G"
msgstr "显示使用 -S 或 -G 的变更集的所有变更"
-#: diff.c:5498
+#: diff.c:5611
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "将 -S 的 <string> 当做扩展的 POSIX 正则表达式"
-#: diff.c:5501
+#: diff.c:5614
msgid "control the order in which files appear in the output"
msgstr "控制输出中的文件显示顺序"
-#: diff.c:5502
+#: diff.c:5615 diff.c:5618
+msgid "<path>"
+msgstr "<路径>"
+
+#: diff.c:5616
+msgid "show the change in the specified path first"
+msgstr "先显示指定路径的变更"
+
+#: diff.c:5619
+msgid "skip the output to the specified path"
+msgstr "跳过指定路径的输出"
+
+#: diff.c:5621
msgid "<object-id>"
msgstr "<对象 ID>"
-#: diff.c:5503
+#: diff.c:5622
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr "查找改变指定对象出现次数的差异"
-#: diff.c:5505
+#: diff.c:5624
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5506
+#: diff.c:5625
msgid "select files by diff type"
msgstr "通过差异类型选择文件"
-#: diff.c:5508
+#: diff.c:5627
msgid "<file>"
msgstr "<文件>"
-#: diff.c:5509
+#: diff.c:5628
msgid "Output to a specific file"
msgstr "输出到一个指定的文件"
-#: diff.c:6164
+#: diff.c:6285
msgid "inexact rename detection was skipped due to too many files."
msgstr "因为文件太多，略过不严格的重命名检查。"
-#: diff.c:6167
+#: diff.c:6288
msgid "only found copies from modified paths due to too many files."
msgstr "因为文件太多，只在修改的路径中查找拷贝。"
-#: diff.c:6170
+#: diff.c:6291
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
-#: dir.c:555
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "读取排序文件 '%s' 失败"
+
+#: diffcore-rename.c:786
+msgid "Performing inexact rename detection"
+msgstr "正在进行非精确的重命名探测"
+
+#: diffcore-rotate.c:29
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr "在差异中无此路径 '%s'"
+
+#: dir.c:578
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
msgstr "路径规格 '%s' 未匹配任何 git 已知文件"
-#: dir.c:695 dir.c:724 dir.c:737
+#: dir.c:718 dir.c:747 dir.c:760
#, c-format
msgid "unrecognized pattern: '%s'"
msgstr "未识别的模式：'%s'"
-#: dir.c:754 dir.c:768
+#: dir.c:777 dir.c:791
#, c-format
msgid "unrecognized negative pattern: '%s'"
msgstr "未识别的反向模式：'%s'"
-#: dir.c:786
+#: dir.c:809
#, c-format
msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
msgstr "您的 sparse-checkout 文件可能有问题：重复的模式 '%s'"
-#: dir.c:796
+#: dir.c:819
msgid "disabling cone pattern matching"
msgstr "禁止 cone 模式匹配"
-#: dir.c:1173
+#: dir.c:1198
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "不能将 %s 用作排除文件"
-#: dir.c:2144
+#: dir.c:2305
#, c-format
msgid "could not open directory '%s'"
msgstr "不能打开目录 '%s'"
-#: dir.c:2479
+#: dir.c:2605
msgid "failed to get kernel name and information"
msgstr "无法获得内核名称和信息"
-#: dir.c:2603
+#: dir.c:2729
msgid "untracked cache is disabled on this system or location"
msgstr "缓存未跟踪文件在本系统或位置中被禁用"
-#: dir.c:3407
+#: dir.c:3534
#, c-format
msgid "index file corrupt in repo %s"
msgstr "仓库 %s 中的索引文件损坏"
-#: dir.c:3452 dir.c:3457
+#: dir.c:3579 dir.c:3584
#, c-format
msgid "could not create directories for %s"
msgstr "不能为 %s 创建目录"
-#: dir.c:3486
+#: dir.c:3613
#, 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"
-#: environment.c:149
+#: environment.c:152
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "错误的 git 名字空间路径 \"%s\""
-#: environment.c:331
+#: environment.c:335
#, c-format
msgid "could not set GIT_DIR to '%s'"
msgstr "不能设置 GIT_DIR 为 '%s'"
@@ -3789,250 +4018,272 @@
msgid "too many args to run %s"
msgstr "执行 %s 的参数太多"
-#: fetch-pack.c:150
+#: fetch-pack.c:177
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack：应为 shallow 列表"
-#: fetch-pack.c:153
+#: fetch-pack.c:180
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr "git fetch-pack：在浅克隆列表之后期望一个 flush 包"
-#: fetch-pack.c:164
+#: fetch-pack.c:191
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack：期望 ACK/NAK，却得到 flush 包"
-#: fetch-pack.c:184
+#: fetch-pack.c:211
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"
-#: fetch-pack.c:195
+#: fetch-pack.c:222
msgid "unable to write to remote"
msgstr "无法写到远程"
-#: fetch-pack.c:257
+#: fetch-pack.c:283
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc 需要 multi_ack_detailed"
-#: fetch-pack.c:356 fetch-pack.c:1340
+#: fetch-pack.c:378 fetch-pack.c:1457
#, c-format
msgid "invalid shallow line: %s"
msgstr "无效的 shallow 信息：%s"
-#: fetch-pack.c:362 fetch-pack.c:1346
+#: fetch-pack.c:384 fetch-pack.c:1463
#, c-format
msgid "invalid unshallow line: %s"
msgstr "无效的 unshallow 信息：%s"
-#: fetch-pack.c:364 fetch-pack.c:1348
+#: fetch-pack.c:386 fetch-pack.c:1465
#, c-format
msgid "object not found: %s"
msgstr "对象未找到：%s"
-#: fetch-pack.c:367 fetch-pack.c:1351
+#: fetch-pack.c:389 fetch-pack.c:1468
#, c-format
msgid "error in object: %s"
msgstr "对象中出错：%s"
-#: fetch-pack.c:369 fetch-pack.c:1353
+#: fetch-pack.c:391 fetch-pack.c:1470
#, c-format
msgid "no shallow found: %s"
msgstr "未发现 shallow：%s"
-#: fetch-pack.c:372 fetch-pack.c:1357
+#: fetch-pack.c:394 fetch-pack.c:1474
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "应为 shallow/unshallow，却得到 %s"
-#: fetch-pack.c:414
+#: fetch-pack.c:434
#, c-format
msgid "got %s %d %s"
msgstr "得到 %s %d %s"
-#: fetch-pack.c:431
+#: fetch-pack.c:451
#, c-format
msgid "invalid commit %s"
msgstr "无效提交 %s"
-#: fetch-pack.c:462
+#: fetch-pack.c:482
msgid "giving up"
msgstr "放弃"
-#: fetch-pack.c:475 progress.c:323
+#: fetch-pack.c:495 progress.c:339
msgid "done"
msgstr "完成"
-#: fetch-pack.c:487
+#: fetch-pack.c:507
#, c-format
msgid "got %s (%d) %s"
msgstr "得到 %s (%d) %s"
-#: fetch-pack.c:533
+#: fetch-pack.c:543
#, c-format
msgid "Marking %s as complete"
msgstr "标记 %s 为完成"
-#: fetch-pack.c:754
+#: fetch-pack.c:758
#, c-format
msgid "already have %s (%s)"
msgstr "已经有 %s（%s）"
-#: fetch-pack.c:818
+#: fetch-pack.c:844
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack：无法派生 sideband 多路输出"
-#: fetch-pack.c:826
+#: fetch-pack.c:852
msgid "protocol error: bad pack header"
msgstr "协议错误：坏的包头"
-#: fetch-pack.c:900
+#: fetch-pack.c:946
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack：无法派生进程 %s"
-#: fetch-pack.c:916
+#: fetch-pack.c:952
+msgid "fetch-pack: invalid index-pack output"
+msgstr "fetch-pack：无效的 index-pack 输出"
+
+#: fetch-pack.c:969
#, c-format
msgid "%s failed"
msgstr "%s 失败"
-#: fetch-pack.c:918
+#: fetch-pack.c:971
msgid "error in sideband demultiplexer"
msgstr "sideband 多路输出出错"
-#: fetch-pack.c:965
+#: fetch-pack.c:1031
#, c-format
msgid "Server version is %.*s"
msgstr "服务器版本 %.*s"
-#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985
-#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001
-#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017
-#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039
+#: fetch-pack.c:1039 fetch-pack.c:1045 fetch-pack.c:1048 fetch-pack.c:1054
+#: fetch-pack.c:1058 fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070
+#: fetch-pack.c:1074 fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086
+#: fetch-pack.c:1092 fetch-pack.c:1098 fetch-pack.c:1103 fetch-pack.c:1108
#, c-format
msgid "Server supports %s"
msgstr "服务器支持 %s"
-#: fetch-pack.c:972
+#: fetch-pack.c:1041
msgid "Server does not support shallow clients"
msgstr "服务器不支持 shalllow 客户端"
-#: fetch-pack.c:1032
+#: fetch-pack.c:1101
msgid "Server does not support --shallow-since"
msgstr "服务器不支持 --shallow-since"
-#: fetch-pack.c:1037
+#: fetch-pack.c:1106
msgid "Server does not support --shallow-exclude"
msgstr "服务器不支持 --shallow-exclude"
-#: fetch-pack.c:1041
+#: fetch-pack.c:1110
msgid "Server does not support --deepen"
msgstr "服务器不支持 --deepen"
-#: fetch-pack.c:1058
+#: fetch-pack.c:1112
+msgid "Server does not support this repository's object format"
+msgstr "服务器不支持这个仓库的对象格式"
+
+#: fetch-pack.c:1125
msgid "no common commits"
msgstr "没有共同的提交"
-#: fetch-pack.c:1070 fetch-pack.c:1536
+#: fetch-pack.c:1138 fetch-pack.c:1682
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack：获取失败。"
-#: fetch-pack.c:1209
+#: fetch-pack.c:1265
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "不匹配的算法：客户端 %s，服务端 %s"
+
+#: fetch-pack.c:1269
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "服务器不支持算法 '%s'"
+
+#: fetch-pack.c:1289
msgid "Server does not support shallow requests"
msgstr "服务器不支持 shalllow 请求"
-#: fetch-pack.c:1216
+#: fetch-pack.c:1296
msgid "Server supports filter"
msgstr "服务器支持 filter"
-#: fetch-pack.c:1239
+#: fetch-pack.c:1335
msgid "unable to write request to remote"
msgstr "无法将请求写到远程"
-#: fetch-pack.c:1257
+#: fetch-pack.c:1353
#, c-format
msgid "error reading section header '%s'"
msgstr "读取节标题 '%s' 出错"
-#: fetch-pack.c:1263
+#: fetch-pack.c:1359
#, c-format
msgid "expected '%s', received '%s'"
msgstr "预期 '%s'，得到 '%s'"
-#: fetch-pack.c:1303
+#: fetch-pack.c:1420
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "意外的确认行：'%s'"
-#: fetch-pack.c:1308
+#: fetch-pack.c:1425
#, c-format
msgid "error processing acks: %d"
msgstr "处理 ack 出错：%d"
-#: fetch-pack.c:1318
+#: fetch-pack.c:1435
msgid "expected packfile to be sent after 'ready'"
msgstr "预期在 'ready' 之后发送 packfile"
-#: fetch-pack.c:1320
+#: fetch-pack.c:1437
msgid "expected no other sections to be sent after no 'ready'"
msgstr "在没有 'ready' 不应该发送其它小节"
-#: fetch-pack.c:1362
+#: fetch-pack.c:1479
#, c-format
msgid "error processing shallow info: %d"
msgstr "处理浅克隆信息出错：%d"
-#: fetch-pack.c:1409
+#: fetch-pack.c:1526
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "预期 wanted-ref，得到 '%s'"
-#: fetch-pack.c:1414
+#: fetch-pack.c:1531
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "意外的 wanted-ref：'%s'"
-#: fetch-pack.c:1419
+#: fetch-pack.c:1536
#, c-format
msgid "error processing wanted refs: %d"
msgstr "处理要获取的引用出错：%d"
-#: fetch-pack.c:1762
+#: fetch-pack.c:1566
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack：预期响应结束包"
+
+#: fetch-pack.c:1960
msgid "no matching remote head"
msgstr "没有匹配的远程分支"
-#: fetch-pack.c:1785 builtin/clone.c:689
+#: fetch-pack.c:1983 builtin/clone.c:693
msgid "remote did not send all necessary objects"
msgstr "远程没有发送所有必需的对象"
-#: fetch-pack.c:1812
+#: fetch-pack.c:2010
#, c-format
msgid "no such remote ref %s"
msgstr "没有这样的远程引用 %s"
-#: fetch-pack.c:1815
+#: fetch-pack.c:2013
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "服务器不允许请求未公开的对象 %s"
-#: gpg-interface.c:408
-msgid "gpg failed to sign the data"
-msgstr "gpg 数据签名失败"
-
-#: gpg-interface.c:434
+#: gpg-interface.c:273
msgid "could not create temporary file"
msgstr "不能创建临时文件"
-#: gpg-interface.c:437
+#: gpg-interface.c:276
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "无法将分离式签名写入 '%s'"
+#: gpg-interface.c:470
+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
+#: grep.c:543
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
@@ -4040,18 +4291,18 @@
"给定的模式包含 NULL 字符（通过 -f <文件> 参数）。只有 PCRE v2 下的 -P 支持此"
"功能"
-#: grep.c:2128
+#: grep.c:1906
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s'：无法读取 %s"
-#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82
+#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr "对 '%s' 调用 stat 失败"
-#: grep.c:2156
+#: grep.c:1934
#, c-format
msgid "'%s': short read"
msgstr "'%s'：读取不完整"
@@ -4108,41 +4359,41 @@
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:100
#, 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:527
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4151,31 +4402,31 @@
"'%s' 像是一个 git 命令，但却无法运行。\n"
"可能是 git-%s 受损？"
-#: help.c:655
-msgid "Uh oh. Your system reports no Git commands at all."
-msgstr "唉呀，您的系统中未发现 Git 命令。"
-
-#: help.c:677
-#, c-format
-msgid "WARNING: You called a Git command named '%s', which does not exist."
-msgstr "警告：您运行了一个并不存在的 Git 命令 '%s'。"
-
-#: help.c:682
-#, c-format
-msgid "Continuing under the assumption that you meant '%s'."
-msgstr "假定你想要的是 '%s' 并继续。"
-
-#: help.c:687
-#, c-format
-msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
-msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒钟后继续。"
-
-#: help.c:695
+#: help.c:543 help.c:631
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"
-#: help.c:699
+#: help.c:591
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "唉呀，您的系统中未发现 Git 命令。"
+
+#: help.c:613
+#, c-format
+msgid "WARNING: You called a Git command named '%s', which does not exist."
+msgstr "警告：您运行了一个并不存在的 Git 命令 '%s'。"
+
+#: help.c:618
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr "假定你想要的是 '%s' 并继续。"
+
+#: help.c:623
+#, c-format
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒钟后继续。"
+
+#: help.c:635
msgid ""
"\n"
"The most similar command is"
@@ -4189,16 +4440,16 @@
"\n"
"最相似的命令是"
-#: help.c:714
+#: help.c:675
msgid "git version [<options>]"
msgstr "git version [<选项>]"
-#: help.c:783
+#: help.c:730
#, c-format
msgid "%s: %s - %s"
msgstr "%s：%s - %s"
-#: help.c:787
+#: help.c:734
msgid ""
"\n"
"Did you mean this?"
@@ -4212,7 +4463,15 @@
"\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"
@@ -4237,53 +4496,68 @@
"来设置您账号的缺省身份标识。\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:635
+#: ident.c:454 builtin/commit.c:634
#, c-format
msgid "invalid date format: %s"
msgstr "无效的日期格式：%s"
-#: list-objects.c:127
-#, c-format
-msgid "entry '%s' in tree %s has tree mode, but is not a tree"
-msgstr "树 %2$s 中的条目 '%1$s' 具有树的属性，但不是一个树对象"
+#: list-objects-filter-options.c:81
+msgid "expected 'tree:<depth>'"
+msgstr "期望 'tree:<深度>'"
-#: 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-filter-options.c:96
+msgid "sparse:path filters support has been dropped"
+msgstr "sparse:path 过滤器支持已被删除"
-#: list-objects.c:375
+#: list-objects-filter-options.c:109
#, c-format
-msgid "unable to load root tree for commit %s"
-msgstr "无法为提交 %s 加载根树"
+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
@@ -4295,33 +4569,22 @@
msgid "unable to parse sparse filter data in %s"
msgstr "无法解析 %s 中的稀疏过滤器数据"
-#: list-objects-filter-options.c:58
-msgid "expected 'tree:<depth>'"
-msgstr "期望 'tree:<深度>'"
-
-#: list-objects-filter-options.c:73
-msgid "sparse:path filters support has been dropped"
-msgstr "sparse:path 过滤器支持已被删除"
-
-#: list-objects-filter-options.c:86
+#: list-objects.c:127
#, c-format
-msgid "invalid filter-spec '%s'"
-msgstr "无效的过滤器表达式 '%s'"
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr "树 %2$s 中的条目 '%1$s' 具有树的模式，但不是一个树对象"
-#: list-objects-filter-options.c:102
+#: list-objects.c:140
#, c-format
-msgid "must escape char in sub-filter-spec: '%c'"
-msgstr "必须对 sub-filter-spec 中的字符进行转义：'%c'"
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr "树 %2$s 中的条目 '%1$s' 具有数据对象的模式，但不是一个数据对象"
-#: list-objects-filter-options.c:144
-msgid "expected something after combine:"
-msgstr "期望在组合后有一些东西："
+#: list-objects.c:375
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "无法为提交 %s 加载根树"
-#: list-objects-filter-options.c:226
-msgid "multiple filter-specs cannot be combined"
-msgstr "不能混用多种过滤规格"
-
-#: lockfile.c:151
+#: lockfile.c:152
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
@@ -4339,20 +4602,246 @@
"可能之前有一个 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 "读取缓存失败"
+#: ls-refs.c:37
+#, c-format
+msgid "invalid value '%s' for lsrefs.unborn"
+msgstr "lsrefs.unborn 的取值 '%s' 无效"
-#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913
-#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810
-#: builtin/stash.c:265
-msgid "unable to write new index file"
-msgstr "无法写新的索引文件"
+#: ls-refs.c:167
+msgid "expected flush after ls-refs arguments"
+msgstr "在 ls-refs 参数后应该有一个 flush 包"
+
+#: merge-ort.c:888 merge-recursive.c:1191
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr "无法合并子模组 %s （没有检出）"
+
+#: merge-ort.c:897 merge-recursive.c:1198
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr "无法合并子模组 %s（提交不存在）"
+
+#: merge-ort.c:906 merge-recursive.c:1205
+#, c-format
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
+msgstr "无法合并子模组 %s （提交未跟随合并基线）"
+
+#: merge-ort.c:916 merge-ort.c:923
+#, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr "注意：快进子模组 %s 到 %s"
+
+#: merge-ort.c:944
+#, c-format
+msgid "Failed to merge submodule %s"
+msgstr "无法合并子模组 %s"
+
+#: merge-ort.c:951
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but a possible merge resolution exists:\n"
+"%s\n"
+msgstr ""
+"无法合并子模组 %s，但是存在一个可能的合并方案：\n"
+"%s\n"
+
+#: merge-ort.c:955 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-ort.c:968
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but multiple possible merges exist:\n"
+"%s"
+msgstr ""
+"无法合并子模组 %s，但是存在多个可能的合并：\n"
+"%s"
+
+#: merge-ort.c:1127 merge-recursive.c:1341
+msgid "Failed to execute internal merge"
+msgstr "无法执行内部合并"
+
+#: merge-ort.c:1132 merge-recursive.c:1346
+#, c-format
+msgid "Unable to add %s to database"
+msgstr "不能添加 %s 至对象库"
+
+#: merge-ort.c:1139 merge-recursive.c:1378
+#, c-format
+msgid "Auto-merging %s"
+msgstr "自动合并 %s"
+
+#: merge-ort.c:1278 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-ort.c:1288 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-ort.c:1471
+#, c-format
+msgid ""
+"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
+"renamed to multiple other directories, with no destination getting a "
+"majority of the files."
+msgstr "冲突（分割的目录重命名）：不清楚重命名 %s 到哪里，因为它被重命名到多个其他目录中，没有一个目标目录中包含多数文件。"
+
+#: merge-ort.c:1637 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-ort.c:1781 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-ort.c:1788 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-ort.c:1801 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-ort.c:1809 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-ort.c:1952
+#, c-format
+msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
+msgstr "冲突（重命名/重命名）：%1$s 重命名为 %3$s 中的 %2$s，以及在 %5$s 中的 %4$s。"
+
+#: merge-ort.c:2047
+#, c-format
+msgid ""
+"CONFLICT (rename involved in collision): rename of %s -> %s has content "
+"conflicts AND collides with another path; this may result in nested conflict "
+"markers."
+msgstr "冲突（重命名卷入冲突）：重命名 %s -> %s 有内容冲突并且和另外一个路径碰撞，这可能导致嵌套的冲突标签。"
+
+#: merge-ort.c:2066 merge-ort.c:2090
+#, c-format
+msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
+msgstr "冲突（重命名/删除）：%1$s 在 %3$s 中重命名为 %2$s，但在 %4$s 中删除。"
+
+#: merge-ort.c:2735
+#, c-format
+msgid ""
+"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
+"%s instead."
+msgstr "冲突（文件/目录）：目录已存在于 %2$s 中的 %1$s，将其移动到 %3$s。"
+
+#: merge-ort.c:2808
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed %s "
+"of them so each can be recorded somewhere."
+msgstr "冲突（不同类型）：%s 在每一侧有不同的类型，重命名它们中的%s以便每个被记录在不同位置。"
+
+#: merge-ort.c:2812
+msgid "both"
+msgstr "双方"
+
+#: merge-ort.c:2812
+msgid "one"
+msgstr "一个"
+
+#: merge-ort.c:2907 merge-recursive.c:3052
+msgid "content"
+msgstr "内容"
+
+#: merge-ort.c:2909 merge-recursive.c:3056
+msgid "add/add"
+msgstr "添加/添加"
+
+#: merge-ort.c:2911 merge-recursive.c:3101
+msgid "submodule"
+msgstr "子模组"
+
+#: merge-ort.c:2913 merge-recursive.c:3102
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "冲突（%s）：合并冲突于 %s"
+
+#: merge-ort.c:2938
+#, c-format
+msgid ""
+"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
+"of %s left in tree."
+msgstr "冲突（修改/删除）：%1$s 在 %2$s 中被删除，在 %3$s 中被修改。%5$s 的 %4$s 版本在树中被保留。"
+
+#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
+#. base, and 2-3) the trees for the two trees we're merging.
+#.
+#: merge-ort.c:3406
+#, c-format
+msgid "collecting merge info failed for trees %s, %s, %s"
+msgstr "无法收集树 %s、%s、%s 的合并信息"
+
+#: merge-ort-wrappers.c:13 merge-recursive.c:3661
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+" %s"
+msgstr ""
+"您对下列文件的本地修改将被合并操作覆盖：\n"
+" %s"
+
+#: merge-ort-wrappers.c:33 merge-recursive.c:3436
+#, c-format
+msgid "Already up to date!"
+msgstr "已经是最新的！"
#: merge-recursive.c:356
msgid "(bad commit)\n"
@@ -4412,21 +4901,6 @@
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:"
@@ -4451,41 +4925,11 @@
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."
@@ -4535,7 +4979,7 @@
msgid "renamed"
msgstr "重命名"
-#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117
+#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "拒绝丢失脏文件 '%s'"
@@ -4573,14 +5017,14 @@
msgid " (left unresolved)"
msgstr "（留下未解决）"
-#: merge-recursive.c:1793
+#: 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:2056
+#: merge-recursive.c:2068
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -4590,25 +5034,7 @@
"冲突（分割的目录重命名）：不清楚 %s 应该放在哪里，因为目录 %s 被重命名到多个"
"其它目录，没有目录包含大部分文件。"
-#: merge-recursive.c:2088
-#, c-format
-msgid ""
-"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
-"implicit directory rename(s) putting the following path(s) there: %s."
-msgstr ""
-"冲突（隐式目录重命名）：处于隐式目录重命名的现存文件/目录 %s，将以下路径放"
-"在：%s。"
-
-#: merge-recursive.c:2098
-#, c-format
-msgid ""
-"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
-"implicit directory renames tried to put these paths there: %s"
-msgstr ""
-"冲突（隐式目录重命名）：无法映射一个以上路径到 %s，隐式目录重命名尝试将这些路"
-"径放置于此：%s"
-
-#: merge-recursive.c:2190
+#: merge-recursive.c:2202
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -4617,327 +5043,266 @@
"冲突（重命名/重命名）：在 %3$s 中重命名目录 %1$s->%2$s，在 %6$s 中重命名目录 "
"%4$s->%5$s"
-#: merge-recursive.c:2435
-#, c-format
-msgid ""
-"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
-"renamed."
-msgstr "警告：避免应用 %s -> %s 的重命名到 %s，因为 %s 本身已被重命名。"
-
-#: merge-recursive.c:2961
+#: merge-recursive.c:2973
#, c-format
msgid "cannot read object %s"
msgstr "不能读取对象 %s"
-#: merge-recursive.c:2964
+#: merge-recursive.c:2976
#, c-format
msgid "object %s is not a blob"
msgstr "对象 %s 不是一个数据对象"
-#: merge-recursive.c:3028
+#: merge-recursive.c:3040
msgid "modify"
msgstr "修改"
-#: merge-recursive.c:3028
+#: merge-recursive.c:3040
msgid "modified"
msgstr "修改"
-#: merge-recursive.c:3040
-msgid "content"
-msgstr "内容"
-
-#: merge-recursive.c:3044
-msgid "add/add"
-msgstr "添加/添加"
-
-#: merge-recursive.c:3067
+#: merge-recursive.c:3079
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "略过 %s（已经做过相同合并）"
-#: merge-recursive.c:3089 git-submodule.sh:1003
-msgid "submodule"
-msgstr "子模组"
-
-#: merge-recursive.c:3090
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "冲突（%s）：合并冲突于 %s"
-
-#: merge-recursive.c:3120
+#: merge-recursive.c:3132
#, c-format
msgid "Adding as %s instead"
msgstr "而是以 %s 为名添加"
-#: merge-recursive.c:3203
-#, c-format
-msgid ""
-"Path updated: %s added in %s inside a directory that was renamed in %s; "
-"moving it to %s."
-msgstr ""
-"路径已更新：%s 添加到 %s，位于一个被重命名到 %s 的目录中，将其移动到 %s。"
-
-#: merge-recursive.c:3206
-#, c-format
-msgid ""
-"CONFLICT (file location): %s added in %s inside a directory that was renamed "
-"in %s, suggesting it should perhaps be moved to %s."
-msgstr ""
-"冲突（文件位置）：%s 添加到 %s，位于一个被重命名为 %s 的目录中，建议将其移动"
-"到 %s。"
-
-#: merge-recursive.c:3210
-#, c-format
-msgid ""
-"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
-"%s; moving it to %s."
-msgstr ""
-"路径已更新：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，将其移"
-"动到 %5$s。"
-
-#: merge-recursive.c:3213
-#, c-format
-msgid ""
-"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
-"was renamed in %s, suggesting it should perhaps be moved to %s."
-msgstr ""
-"冲突（文件位置）：%1$s 重命名为 %3$s 中的 %2$s，而该目录被重命名到 %4$s 中，"
-"建议将其移动到 %5$s。"
-
-#: merge-recursive.c:3327
+#: merge-recursive.c:3339
#, c-format
msgid "Removing %s"
msgstr "删除 %s"
-#: merge-recursive.c:3350
+#: merge-recursive.c:3362
msgid "file/directory"
msgstr "文件/目录"
-#: merge-recursive.c:3355
+#: merge-recursive.c:3367
msgid "directory/file"
msgstr "目录/文件"
-#: merge-recursive.c:3362
+#: 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:3371
+#: merge-recursive.c:3383
#, c-format
msgid "Adding %s"
msgstr "添加 %s"
-#: merge-recursive.c:3380
+#: merge-recursive.c:3392
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "冲突（add/add）：合并冲突于 %s"
-#: merge-recursive.c:3424
-msgid "Already up to date!"
-msgstr "已经是最新的！"
-
-#: merge-recursive.c:3433
+#: merge-recursive.c:3445
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "无法合并树 %s 和 %s"
-#: merge-recursive.c:3537
+#: merge-recursive.c:3539
msgid "Merging:"
msgstr "合并："
-#: merge-recursive.c:3550
+#: merge-recursive.c:3552
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "发现 %u 个共同祖先："
msgstr[1] "发现 %u 个共同祖先："
-#: merge-recursive.c:3600
+#: merge-recursive.c:3602
msgid "merge returned no commit"
msgstr "合并未返回提交"
-#: merge-recursive.c:3659
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-" %s"
-msgstr ""
-"您对下列文件的本地修改将被合并操作覆盖：\n"
-" %s"
-
-#: merge-recursive.c:3756
+#: merge-recursive.c:3758
#, c-format
msgid "Could not parse object '%s'"
msgstr "不能解析对象 '%s'"
-#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877
+#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896
+#: builtin/stash.c:471
msgid "Unable to write index."
msgstr "不能写入索引。"
-#: midx.c:68
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "读取缓存失败"
+
+#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917
+#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817
+#: builtin/stash.c:265
+msgid "unable to write new index file"
+msgstr "无法写新的索引文件"
+
+#: midx.c:62
+msgid "multi-pack-index OID fanout is of the wrong size"
+msgstr "多包索引的对象ID扇出表大小错误"
+
+#: midx.c:93
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "多包索引文件 %s 太小"
-#: midx.c:84
+#: midx.c:109
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "多包索引签名 0x%08x 和签名 0x%08x 不匹配"
-#: midx.c:89
+#: midx.c:114
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "multi-pack-index 版本 %d 不能被识别"
-#: midx.c:94
+#: midx.c:119
#, 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:108
-msgid "invalid chunk offset (too large)"
-msgstr "无效的块偏移（太大）"
-
-#: midx.c:132
-msgid "terminating multi-pack-index chunk id appears earlier than expected"
-msgstr "终止多包索引块 id 出现时间早于预期"
-
-#: midx.c:145
+#: midx.c:136
msgid "multi-pack-index missing required pack-name chunk"
msgstr "多包索引缺少必需的包名块"
-#: midx.c:147
+#: midx.c:138
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "多包索引缺少必需的对象 ID 扇出块"
-#: midx.c:149
+#: midx.c:140
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "多包索引缺少必需的对象 ID 查询块"
-#: midx.c:151
+#: midx.c:142
msgid "multi-pack-index missing required object offsets chunk"
msgstr "多包索引缺少必需的对象偏移块"
-#: midx.c:165
+#: midx.c:158
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "多包索引包名无序：'%s' 在 '%s' 之前"
-#: midx.c:210
+#: midx.c:202
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "错的 pack-int-id：%u（共有 %u 个包）"
-#: midx.c:260
+#: midx.c:252
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr "多包索引存储一个64位偏移，但是 off_t 太小"
-#: midx.c:288
-msgid "error preparing packfile from multi-pack-index"
-msgstr "从多包索引准备 packfile 出错"
-
-#: midx.c:472
+#: midx.c:467
#, c-format
msgid "failed to add packfile '%s'"
msgstr "添加包文件 '%s' 失败"
-#: midx.c:478
+#: midx.c:473
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "打开包索引 '%s' 失败"
-#: midx.c:538
+#: midx.c:533
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "在包文件中定位对象 %d 失败"
-#: midx.c:842
+#: midx.c:821
msgid "Adding packfiles to multi-pack-index"
msgstr "添加包文件到多包索引"
-#: midx.c:875
+#: midx.c:855
#, c-format
msgid "did not see pack-file %s to drop"
msgstr "没有看到要丢弃的包文件 %s"
-#: midx.c:973
-msgid "Writing chunks to multi-pack-index"
-msgstr "写入块到多包索引"
+#: midx.c:904
+msgid "no pack files to index."
+msgstr "没有要索引的包文件。"
-#: midx.c:1052
+#: midx.c:965
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "清理位于 %s 的多包索引失败"
-#: midx.c:1108
+#: midx.c:1021
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr "多包索引文件存在，但无法解析"
+
+#: midx.c:1029
msgid "Looking for referenced packfiles"
msgstr "正在查找引用的包文件"
-#: midx.c:1123
+#: midx.c:1044
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr "对象 ID 扇出无序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:1128
+#: midx.c:1049
+msgid "the midx contains no oid"
+msgstr "midx 不包含 oid"
+
+#: midx.c:1058
msgid "Verifying OID order in multi-pack-index"
msgstr "校验多包索引中的 OID 顺序"
-#: midx.c:1137
+#: midx.c:1067
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "对象 ID 查询无序：oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1157
+#: midx.c:1087
msgid "Sorting objects by packfile"
msgstr "通过包文件为对象排序"
-#: midx.c:1164
+#: midx.c:1094
msgid "Verifying object offsets"
msgstr "校验对象偏移"
-#: midx.c:1180
+#: midx.c:1110
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "为 oid[%d] = %s 加载包条目失败"
-#: midx.c:1186
+#: midx.c:1116
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "为包文件 %s 加载包索引失败"
-#: midx.c:1195
+#: midx.c:1125
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "oid[%d] = %s 错误的对象偏移：%<PRIx64> != %<PRIx64>"
-#: midx.c:1220
+#: midx.c:1150
msgid "Counting referenced objects"
msgstr "正在对引用对象计数"
-#: midx.c:1230
+#: midx.c:1160
msgid "Finding and deleting unreferenced packfiles"
msgstr "正在查找和删除未引用的包文件"
-#: midx.c:1388
+#: midx.c:1351
msgid "could not start pack-objects"
msgstr "不能开始 pack-objects"
-#: midx.c:1407
+#: midx.c:1371
msgid "could not finish pack-objects"
msgstr "不能结束 pack-objects"
-#: name-hash.c:537
+#: name-hash.c:538
#, c-format
msgid "unable to create lazy_dir thread: %s"
msgstr "不能创建 lazy_dir 线程：%s"
-#: name-hash.c:559
+#: name-hash.c:560
#, c-format
msgid "unable to create lazy_name thread: %s"
msgstr "不能创建 lazy_name 线程：%s"
-#: name-hash.c:565
+#: name-hash.c:566
#, c-format
msgid "unable to join lazy_name thread: %s"
msgstr "不能加入 lasy_name 线程：%s"
@@ -4981,6 +5346,356 @@
msgid "Bad %s value: '%s'"
msgstr "坏的 %s 值：'%s'"
+#: object-file.c:480
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr "对象目录 %s 不存在，检查 .git/objects/info/alternates"
+
+#: object-file.c:531
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "无法规范化备用对象路径：%s"
+
+#: object-file.c:603
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr "%s：忽略备用对象库，嵌套太深"
+
+#: object-file.c:610
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "无法规范化对象目录: %s"
+
+#: object-file.c:653
+msgid "unable to fdopen alternates lockfile"
+msgstr "无法 fdopen 替换锁文件"
+
+#: object-file.c:671
+msgid "unable to read alternates file"
+msgstr "无法读取替代文件"
+
+#: object-file.c:678
+msgid "unable to move new alternates file into place"
+msgstr "无法将新的替代文件移动到位"
+
+#: object-file.c:713
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "路径 '%s' 不存在"
+
+#: object-file.c:734
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
+
+#: object-file.c:740
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "参考仓库 '%s' 不是一个本地仓库。"
+
+#: object-file.c:746
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "参考仓库 '%s' 是一个浅克隆"
+
+#: object-file.c:754
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "参考仓库 '%s' 已被移植"
+
+#: object-file.c:814
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "解析备用引用时无效的行：%s"
+
+#: object-file.c:964
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr "尝试 mmap %<PRIuMAX>，超过了最大值 %<PRIuMAX>"
+
+#: object-file.c:985
+msgid "mmap failed"
+msgstr "mmap 失败"
+
+#: object-file.c:1149
+#, c-format
+msgid "object file %s is empty"
+msgstr "对象文件 %s 为空"
+
+#: object-file.c:1284 object-file.c:2477
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "损坏的松散对象 '%s'"
+
+#: object-file.c:1286 object-file.c:2481
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "松散对象 '%s' 后面有垃圾数据"
+
+#: object-file.c:1328
+msgid "invalid object type"
+msgstr "无效的对象类型"
+
+#: object-file.c:1412
+#, c-format
+msgid "unable to unpack %s header with --allow-unknown-type"
+msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息"
+
+#: object-file.c:1415
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "无法解开 %s 头部"
+
+#: object-file.c:1421
+#, c-format
+msgid "unable to parse %s header with --allow-unknown-type"
+msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息"
+
+#: object-file.c:1424
+#, c-format
+msgid "unable to parse %s header"
+msgstr "无法解析 %s 头部"
+
+#: object-file.c:1651
+#, c-format
+msgid "failed to read object %s"
+msgstr "读取对象 %s 失败"
+
+#: object-file.c:1655
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "找不到 %2$s 的替代 %1$s"
+
+#: object-file.c:1659
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "松散对象 %s（保存在 %s）已损坏"
+
+#: object-file.c:1663
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "打包对象 %s（保存在 %s）已损坏"
+
+#: object-file.c:1768
+#, c-format
+msgid "unable to write file %s"
+msgstr "无法写文件 %s"
+
+#: object-file.c:1775
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "无法为 '%s' 设置权限"
+
+#: object-file.c:1782
+msgid "file write error"
+msgstr "文件写错误"
+
+#: object-file.c:1802
+msgid "error when closing loose object file"
+msgstr "关闭松散对象文件时出错"
+
+#: object-file.c:1867
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
+msgstr "权限不足，无法在仓库对象库 %s 中添加对象"
+
+#: object-file.c:1869
+msgid "unable to create temporary file"
+msgstr "无法创建临时文件"
+
+#: object-file.c:1893
+msgid "unable to write loose object file"
+msgstr "不能写松散对象文件"
+
+#: object-file.c:1899
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "不能压缩新对象 %s（%d）"
+
+#: object-file.c:1903
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "在对象 %s 上调用 deflateEnd 失败（%d）"
+
+#: object-file.c:1907
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "被 %s 的不稳定对象源数据搞糊涂了"
+
+#: object-file.c:1917 builtin/pack-objects.c:1097
+#, c-format
+msgid "failed utime() on %s"
+msgstr "在 %s 上调用 utime() 失败"
+
+#: object-file.c:1994
+#, c-format
+msgid "cannot read object for %s"
+msgstr "不能读取对象 %s"
+
+#: object-file.c:2045
+msgid "corrupt commit"
+msgstr "损坏的提交"
+
+#: object-file.c:2053
+msgid "corrupt tag"
+msgstr "损坏的标签"
+
+#: object-file.c:2153
+#, c-format
+msgid "read error while indexing %s"
+msgstr "索引 %s 时读取错误"
+
+#: object-file.c:2156
+#, c-format
+msgid "short read while indexing %s"
+msgstr "索引 %s 时读入不完整"
+
+#: object-file.c:2229 object-file.c:2239
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr "%s：插入数据库失败"
+
+#: object-file.c:2245
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s：不支持的文件类型"
+
+#: object-file.c:2269
+#, c-format
+msgid "%s is not a valid object"
+msgstr "%s 不是一个有效的对象"
+
+#: object-file.c:2271
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s 不是一个有效的 '%s' 对象"
+
+#: object-file.c:2298 builtin/index-pack.c:192
+#, c-format
+msgid "unable to open %s"
+msgstr "不能打开 %s"
+
+#: object-file.c:2488 object-file.c:2541
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "%s 的哈希值不匹配（预期 %s）"
+
+#: object-file.c:2512
+#, c-format
+msgid "unable to mmap %s"
+msgstr "不能 mmap %s"
+
+#: object-file.c:2517
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "无法解压缩 %s 的头部"
+
+#: object-file.c:2523
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "无法解析 %s 的头部"
+
+#: object-file.c:2534
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "无法解压缩 %s 的内容"
+
+#: object-name.c:486
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr "短对象ID %s 存在歧义"
+
+#: object-name.c:497
+msgid "The candidates are:"
+msgstr "候选者有："
+
+#: object-name.c:796
+msgid ""
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"may be created by mistake. For example,\n"
+"\n"
+" git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
+msgstr ""
+"Git 通常不会创建一个以40个十六进制字符结尾的引用，因为当您只提供40\n"
+"个十六进制字符时将被忽略。这些引用可能被错误地创建。例如：\n"
+"\n"
+" git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"当 \"$br\" 某种原因空白时，一个40位十六进制的引用将被创建。请检查这些\n"
+"引用，可能需要删除它们。运行 \"git config advice.objectNameWarning\n"
+"false\" 命令关闭本消息通知。"
+
+#: object-name.c:916
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "'%.*s' 的日志仅能回到 %s"
+
+#: object-name.c:924
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "'%.*s' 的日志仅有 %d 个条目"
+
+#: object-name.c:1702
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr "路径 '%s' 在磁盘上，但是不在 '%.*s' 中"
+
+#: object-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'？"
+
+#: object-name.c:1717
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "路径 '%s' 不在 '%.*s' 中"
+
+#: object-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'？"
+
+#: object-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'？"
+
+#: object-name.c:1769
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr "路径 '%s' 在磁盘上，但不在索引里"
+
+#: object-name.c:1771
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr "路径 '%s' 不存在（既不在磁盘上，也不在索引中）"
+
+#: object-name.c:1784
+msgid "relative path syntax can't be used outside working tree"
+msgstr "不能在工作区之外使用相对路径语法"
+
+#: object-name.c:1922
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "无效的对象名 '%.*s'。"
+
#: object.c:53
#, c-format
msgid "invalid object type \"%s\""
@@ -5006,24 +5721,93 @@
msgid "hash mismatch %s"
msgstr "哈希值与 %s 不匹配"
-#: packfile.c:629
+#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226
+#, c-format
+msgid "unable to get size of %s"
+msgstr "无法得到 %s 的大小"
+
+#: pack-bitmap.c:1489 builtin/rev-list.c:92
+#, c-format
+msgid "unable to get disk usage of %s"
+msgstr "无法得到 %s 的磁盘使用量"
+
+#: pack-revindex.c:220
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr "反向索引文件 %s 太小"
+
+#: pack-revindex.c:225
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr "反向索引文件 %s 损坏"
+
+#: pack-revindex.c:233
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr "反向索引文件 %s 有错误的签名"
+
+#: pack-revindex.c:237
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr "反向索引文件 %s 不支持的版本 %<PRIu32>"
+
+#: pack-revindex.c:242
+#, c-format
+msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
+msgstr "反向索引文件 %s 有不支持的哈希 ID %<PRIu32>"
+
+#: pack-write.c:236
+msgid "cannot both write and verify reverse index"
+msgstr "无法同时写入和校验反向索引"
+
+#: pack-write.c:257
+#, c-format
+msgid "could not stat: %s"
+msgstr "不能调用 stat：%s"
+
+#: pack-write.c:269
+#, c-format
+msgid "failed to make %s readable"
+msgstr "无法设置 %s 为可读"
+
+#: pack-write.c:508
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr "无法写入 '%s' 承诺者文件"
+
+#: packfile.c:625
msgid "offset before end of packfile (broken .idx?)"
msgstr "偏移量在包文件结束之前（损坏的 .idx？）"
-#: packfile.c:1899
+#: packfile.c:1934
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"
-#: packfile.c:1903
+#: packfile.c:1938
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"
-#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134
+#: parse-options-cb.c:20 parse-options-cb.c:24
#, c-format
-msgid "unable to get size of %s"
-msgstr "无法得到 %s 的大小"
+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
@@ -5065,26 +5849,31 @@
msgid "did you mean `--%s` (with two dashes)?"
msgstr "你的意思是 `--%s`（有两个短线）？"
-#: parse-options.c:857
+#: 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:859
+#: parse-options.c:864
#, c-format
msgid "unknown switch `%c'"
msgstr "未知开关 `%c'"
-#: parse-options.c:861
+#: parse-options.c:866
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "字符串中未知的非 ascii 字符选项：`%s'"
-#: parse-options.c:885
+#: parse-options.c:890
msgid "..."
msgstr "..."
-#: parse-options.c:904
+#: parse-options.c:909
#, c-format
msgid "usage: %s"
msgstr "用法：%s"
@@ -5092,46 +5881,21 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:910
+#: parse-options.c:915
#, c-format
msgid " or: %s"
msgstr " 或：%s"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: parse-options.c:913
+#: parse-options.c:918
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:952
+#: parse-options.c:957
msgid "-NUM"
msgstr "-数字"
-#: parse-options.c:966
-#, c-format
-msgid "alias of --%s"
-msgstr "--%s 的别名"
-
-#: parse-options-cb.c:20 parse-options-cb.c:24
-#, c-format
-msgid "option `%s' expects a numerical value"
-msgstr "选项 `%s' 期望一个数字值"
-
-#: parse-options-cb.c:41
-#, c-format
-msgid "malformed expiration date '%s'"
-msgstr "格式错误的到期时间：'%s'"
-
-#: parse-options-cb.c:54
-#, c-format
-msgid "option `%s' expects \"always\", \"auto\", or \"never\""
-msgstr "选项 `%s' 期望 \"always\"、\"auto\" 或 \"never\""
-
-#: parse-options-cb.c:130 parse-options-cb.c:147
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "格式错误的对象名 '%s'"
-
#: path.c:915
#, c-format
msgid "Could not make %s writable by group"
@@ -5188,27 +5952,27 @@
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s：'literal' 和 'glob' 不兼容"
-#: pathspec.c:442
+#: pathspec.c:445
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr "%s：'%s' 在位于 '%s' 的仓库之外"
-#: pathspec.c:517
+#: pathspec.c:521
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s'（助记符：'%c'）"
-#: pathspec.c:527
+#: pathspec.c:531
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s：路径规格神奇前缀不被此命令支持：%s"
-#: pathspec.c:594
+#: pathspec.c:598
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "路径规格 '%s' 位于符号链接中"
-#: pathspec.c:639
+#: pathspec.c:643
#, c-format
msgid "line is badly quoted: %s"
msgstr "行被错误地引用：%s"
@@ -5222,141 +5986,168 @@
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:165
#, c-format
msgid "remote error: %s"
msgstr "远程错误：%s"
-#: preload-index.c:119
+#: preload-index.c:125
msgid "Refreshing index"
msgstr "正在刷新索引"
-#: preload-index.c:138
+#: preload-index.c:144
#, c-format
msgid "unable to create threaded lstat: %s"
msgstr "无法创建线程 lstat：%s"
-#: pretty.c:981
+#: pretty.c:984
msgid "unable to parse --pretty format"
msgstr "不能解析 --pretty 格式"
-#: promisor-remote.c:23
-msgid "Remote with no URL"
-msgstr "远程未设置 URL"
+#: promisor-remote.c:30
+msgid "promisor-remote: unable to fork off fetch subprocess"
+msgstr "promisor-remote：无法派生 fetch 子进程"
-#: promisor-remote.c:58
+#: 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"
-#: range-diff.c:75
+#: prune-packed.c:35
+msgid "Removing duplicate objects"
+msgstr "正在删除重复对象"
+
+#: range-diff.c:78
msgid "could not start `log`"
msgstr "不能启动 `log`"
-#: range-diff.c:77
+#: range-diff.c:80
msgid "could not read `log` output"
msgstr "不能读取 `log` 的输出"
-#: range-diff.c:96 sequencer.c:5020
+#: range-diff.c:101 sequencer.c:5318
#, c-format
msgid "could not parse commit '%s'"
msgstr "不能解析提交 '%s'"
-#: range-diff.c:122
+#: range-diff.c:115
+#, c-format
+msgid ""
+"could not parse first line of `log` output: did not start with 'commit ': "
+"'%s'"
+msgstr "无法解析 `log` 输出的首行：不是以 'commit ' 开头：'%s'"
+
+#: range-diff.c:140
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "无法解析 git 头 '%.*s'"
-#: range-diff.c:285
+#: range-diff.c:306
msgid "failed to generate diff"
msgstr "生成 diff 失败"
-#: range-diff.c:518 range-diff.c:520
+#: range-diff.c:558
+msgid "--left-only and --right-only are mutually exclusive"
+msgstr "--left-only 和 --right-only 互斥"
+
+#: range-diff.c:561 range-diff.c:563
#, 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:1330
+#: read-cache.c:1318
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "'%s' 看起来既是文件又是目录"
-#: read-cache.c:1536
+#: read-cache.c:1532
msgid "Refresh index"
msgstr "刷新索引"
-#: read-cache.c:1651
+#: read-cache.c:1657
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -5365,7 +6156,7 @@
"设置了 index.version，但是取值无效。\n"
"使用版本 %i"
-#: read-cache.c:1661
+#: read-cache.c:1667
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -5374,140 +6165,140 @@
"设置了 GIT_INDEX_VERSION，但是取值无效。\n"
"使用版本 %i"
-#: read-cache.c:1717
+#: read-cache.c:1723
#, c-format
msgid "bad signature 0x%08x"
msgstr "坏的签名 0x%08x"
-#: read-cache.c:1720
+#: read-cache.c:1726
#, c-format
msgid "bad index version %d"
msgstr "坏的索引版本 %d"
-#: read-cache.c:1729
+#: read-cache.c:1735
msgid "bad index file sha1 signature"
msgstr "坏的索引文件 sha1 签名"
-#: read-cache.c:1759
+#: read-cache.c:1765
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "索引使用不被支持的 %.4s 扩展"
#
-#: read-cache.c:1761
+#: read-cache.c:1767
#, c-format
msgid "ignoring %.4s extension"
msgstr "忽略 %.4s 扩展"
-#: read-cache.c:1798
+#: read-cache.c:1804
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "未知的索引条目格式 0x%08x"
-#: read-cache.c:1814
+#: read-cache.c:1820
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "索引中靠近路径 '%s' 有错误的名称字段"
-#: read-cache.c:1871
+#: read-cache.c:1877
msgid "unordered stage entries in index"
msgstr "索引中有未排序的暂存条目"
-#: read-cache.c:1874
+#: read-cache.c:1880
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "合并文件 '%s' 有多个暂存条目"
-#: read-cache.c:1877
+#: read-cache.c:1883
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "'%s' 的未排序暂存条目"
-#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
-#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
-#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
-#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
-#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
+#: read-cache.c:1989 read-cache.c:2280 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181
+#: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991
+#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505
+#: 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:2124
+#: read-cache.c:2133
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "无法创建 load_cache_entries 线程：%s"
-#: read-cache.c:2137
+#: read-cache.c:2146
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "无法加入 load_cache_entries 线程：%s"
-#: read-cache.c:2170
+#: read-cache.c:2179
#, c-format
msgid "%s: index file open failed"
msgstr "%s：打开索引文件失败"
-#: read-cache.c:2174
+#: read-cache.c:2183
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s：不能对打开的索引执行 stat 操作"
-#: read-cache.c:2178
+#: read-cache.c:2187
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s：索引文件比预期的小"
-#: read-cache.c:2182
+#: read-cache.c:2191
#, c-format
msgid "%s: unable to map index file"
msgstr "%s：无法对索引文件执行 map 操作"
-#: read-cache.c:2224
+#: read-cache.c:2233
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "无法创建 load_index_extensions 线程：%s"
-#: read-cache.c:2251
+#: read-cache.c:2260
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "无法加入 load_index_extensions 线程：%s"
-#: read-cache.c:2283
+#: read-cache.c:2292
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "无法刷新共享索引 '%s'"
-#: read-cache.c:2330
+#: read-cache.c:2339
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "损坏的索引，期望在 %2$s 中的 %1$s，得到 %3$s"
-#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122
+#: read-cache.c:3035 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141
#, c-format
msgid "could not close '%s'"
msgstr "不能关闭 '%s'"
-#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959
+#: read-cache.c:3138 sequencer.c:2487 sequencer.c:4239
#, c-format
msgid "could not stat '%s'"
msgstr "不能对 '%s' 调用 stat"
-#: read-cache.c:3142
+#: read-cache.c:3151
#, c-format
msgid "unable to open git dir: %s"
msgstr "不能打开 git 目录：%s"
-#: read-cache.c:3154
+#: read-cache.c:3163
#, c-format
msgid "unable to unlink: %s"
msgstr "无法删除：%s"
-#: read-cache.c:3179
+#: read-cache.c:3188
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "不能修复 '%s' 的权限位"
-#: read-cache.c:3328
+#: read-cache.c:3337
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s：不能落到暂存区 #0"
@@ -5574,7 +6365,7 @@
msgstr[0] "变基 %s 到 %s（%d 个提交）"
msgstr[1] "变基 %s 到 %s（%d 个提交）"
-#: rebase-interactive.c:72 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"
@@ -5582,7 +6373,7 @@
"\n"
"不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
-#: rebase-interactive.c:75 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"
@@ -5590,7 +6381,7 @@
"\n"
"如果您在这里删除一行，对应的提交将会丢失。\n"
-#: rebase-interactive.c:81 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"
@@ -5604,7 +6395,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:86 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"
@@ -5614,14 +6405,14 @@
"然而，如果您删除全部内容，变基操作将会终止。\n"
"\n"
-#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444
-#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252
+#: rebase-interactive.c:110 rerere.c:469 rerere.c:676 sequencer.c:3615
+#: sequencer.c:3641 sequencer.c:5424 builtin/fsck.c:329 builtin/rebase.c:272
#, c-format
msgid "could not write '%s'"
msgstr "不能写入 '%s'"
-#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210
-#: builtin/rebase.c:234
+#: rebase-interactive.c:116 builtin/rebase.c:204 builtin/rebase.c:230
+#: builtin/rebase.c:254
#, c-format
msgid "could not write '%s'."
msgstr "不能写入 '%s'。"
@@ -5651,132 +6442,14 @@
"可选值有：ignore、warn、error。\n"
"\n"
-#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262
-#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221
-#: builtin/rebase.c:246
+#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2402
+#: builtin/rebase.c:190 builtin/rebase.c:215 builtin/rebase.c:241
+#: builtin/rebase.c:266
#, c-format
msgid "could not read '%s'."
msgstr "不能读取 '%s'。"
-#: refs.c:262
-#, c-format
-msgid "%s does not point to a valid object!"
-msgstr "%s 没有指向一个有效的对象！"
-
-#: refs.c:667
-#, c-format
-msgid "ignoring dangling symref %s"
-msgstr "忽略悬空符号引用 %s"
-
-#: refs.c:669 ref-filter.c:2098
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr "忽略损坏的引用 %s"
-
-#: refs.c:804
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "无法为写入打开 '%s'：%s"
-
-#: refs.c:814 refs.c:865
-#, c-format
-msgid "could not read ref '%s'"
-msgstr "无法读取引用 '%s'"
-
-#: refs.c:820
-#, c-format
-msgid "ref '%s' already exists"
-msgstr "引用 '%s' 已经存在"
-
-#: refs.c:825
-#, c-format
-msgid "unexpected object ID when writing '%s'"
-msgstr "写入 '%s' 时意外的对象 ID"
-
-#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905
-#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157
-#: wrapper.c:620
-#, c-format
-msgid "could not write to '%s'"
-msgstr "不能写入 '%s'"
-
-#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719
-#: builtin/rebase.c:1029
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "无法打开 '%s' 进行写入"
-
-#: refs.c:867
-#, c-format
-msgid "unexpected object ID when deleting '%s'"
-msgstr "删除 '%s' 时意外的对象 ID"
-
-#: refs.c:998
-#, c-format
-msgid "log for ref %s has gap after %s"
-msgstr "引用 %s 的日志在 %s 之后有缺口"
-
-#: refs.c:1004
-#, c-format
-msgid "log for ref %s unexpectedly ended on %s"
-msgstr "引用 %s 的日志意外终止于 %s "
-
-#: refs.c:1063
-#, c-format
-msgid "log for %s is empty"
-msgstr "%s 的日志为空"
-
-#: refs.c:1155
-#, c-format
-msgid "refusing to update ref with bad name '%s'"
-msgstr "拒绝更新有错误名称 '%s' 的引用"
-
-#: refs.c:1231
-#, c-format
-msgid "update_ref failed for ref '%s': %s"
-msgstr "对引用 '%s' 执行 update_ref 失败：%s"
-
-#: refs.c:2023
-#, c-format
-msgid "multiple updates for ref '%s' not allowed"
-msgstr "不允许对引用 '%s' 多次更新"
-
-#: refs.c:2055
-msgid "ref updates forbidden inside quarantine environment"
-msgstr "在隔离环境中禁止更新引用"
-
-#: refs.c:2151 refs.c:2181
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr "'%s' 已存在，无法创建 '%s'"
-
-#: refs.c:2157 refs.c:2192
-#, c-format
-msgid "cannot process '%s' and '%s' at the same time"
-msgstr "无法同时处理 '%s' 和 '%s'"
-
-#: refs/files-backend.c:1233
-#, c-format
-msgid "could not remove reference %s"
-msgstr "无法删除引用 %s"
-
-#: refs/files-backend.c:1247 refs/packed-backend.c:1541
-#: refs/packed-backend.c:1551
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "无法删除引用 %s：%s"
-
-#: refs/files-backend.c:1250 refs/packed-backend.c:1554
-#, c-format
-msgid "could not delete references: %s"
-msgstr "无法删除引用：%s"
-
-#: refspec.c:137
-#, c-format
-msgid "invalid refspec '%s'"
-msgstr "无效的引用表达式：'%s'"
-
-#: ref-filter.c:42 wt-status.c:1938
+#: ref-filter.c:42 wt-status.c:1975
msgid "gone"
msgstr "丢失"
@@ -5795,280 +6468,408 @@
msgid "ahead %d, behind %d"
msgstr "领先 %d，落后 %d"
-#: ref-filter.c:165
+#: ref-filter.c:175
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "期望的格式：%%(color:<颜色>)"
-#: ref-filter.c:167
+#: ref-filter.c:177
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "未能识别的颜色：%%(color:%s)"
-#: ref-filter.c:189
+#: ref-filter.c:199
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "期望整数值 refname:lstrip=%s"
-#: ref-filter.c:193
+#: ref-filter.c:203
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "期望整数值 refname:rstrip=%s"
-#: ref-filter.c:195
+#: ref-filter.c:205
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "未能识别的 %%(%s) 参数：%s"
-#: ref-filter.c:250
+#: ref-filter.c:260
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) 不带参数"
-#: ref-filter.c:272
+#: ref-filter.c:282
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
msgstr "未能识别的 %%(objectsize) 参数：%s"
-#: ref-filter.c:280
+#: ref-filter.c:290
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) 不带参数"
-#: ref-filter.c:292
+#: ref-filter.c:302
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) 不带参数"
-#: ref-filter.c:301
+#: ref-filter.c:315
#, c-format
-msgid "%%(subject) does not take arguments"
-msgstr "%%(subject) 不带参数"
+msgid "unrecognized %%(subject) argument: %s"
+msgstr "未能识别的 %%(subject) 参数：%s"
-#: ref-filter.c:323
+#: ref-filter.c:334
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr "预期 %%(trailers:key=<值>)"
+
+#: ref-filter.c:336
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "未知的 %%(trailers) 参数：%s"
-#: ref-filter.c:352
+#: ref-filter.c:367
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "期望一个正数 contents:lines=%s"
-#: ref-filter.c:354
+#: ref-filter.c:369
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "未能识别的 %%(contents) 参数：%s"
-#: ref-filter.c:369
+#: ref-filter.c:384
#, 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:373
+#: ref-filter.c:388
#, c-format
-msgid "unrecognized %%(objectname) argument: %s"
-msgstr "未能识别的 %%(objectname) 参数：%s"
+msgid "unrecognized argument '%s' in %%(%s)"
+msgstr "未能识别 %%(%2$s) 中的参数 '%1$s'"
-#: ref-filter.c:403
+#: ref-filter.c:402
+#, c-format
+msgid "unrecognized email option: %s"
+msgstr "未识别的邮件选项：%s"
+
+#: ref-filter.c:432
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "期望的格式：%%(align:<宽度>,<位置>)"
-#: ref-filter.c:415
+#: ref-filter.c:444
#, c-format
msgid "unrecognized position:%s"
msgstr "未能识别的位置：%s"
-#: ref-filter.c:422
+#: ref-filter.c:451
#, c-format
msgid "unrecognized width:%s"
msgstr "未能识别的宽度：%s"
-#: ref-filter.c:431
+#: ref-filter.c:460
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "未能识别的 %%(align) 参数：%s"
-#: ref-filter.c:439
+#: ref-filter.c:468
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "元素 %%(align) 需要一个正数的宽度"
-#: ref-filter.c:457
+#: ref-filter.c:486
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "未能识别的 %%(if) 参数：%s"
-#: ref-filter.c:559
+#: ref-filter.c:588
#, c-format
msgid "malformed field name: %.*s"
msgstr "格式错误的字段名：%.*s"
-#: ref-filter.c:586
+#: ref-filter.c:615
#, c-format
msgid "unknown field name: %.*s"
msgstr "未知的字段名：%.*s"
-#: ref-filter.c:590
+#: ref-filter.c:619
#, 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:714
+#: ref-filter.c:743
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "格式：使用了 %%(if) 元素而没有 %%(then) 元素"
-#: ref-filter.c:777
+#: ref-filter.c:806
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "格式：使用了 %%(then) 元素而没有 %%(if) 元素"
-#: ref-filter.c:779
+#: ref-filter.c:808
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "格式：%%(then) 元素用了多次"
-#: ref-filter.c:781
+#: ref-filter.c:810
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "格式：%%(then) 元素用在了 %%(else) 之后"
-#: ref-filter.c:809
+#: ref-filter.c:838
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "格式：使用了 %%(else) 元素而没有 %%(if) 元素"
-#: ref-filter.c:811
+#: ref-filter.c:840
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "格式：使用了 %%(else) 元素而没有 %%(then) 元素"
-#: ref-filter.c:813
+#: ref-filter.c:842
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "格式：%%(else) 元素用了多次"
-#: ref-filter.c:828
+#: ref-filter.c:857
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "格式：使用了 %%(end) 元素却没有它的对应元素"
-#: ref-filter.c:885
+#: ref-filter.c:914
#, c-format
msgid "malformed format string %s"
msgstr "错误的格式化字符串 %s"
-#: ref-filter.c:1488
+#: ref-filter.c:1555
#, c-format
-msgid "no branch, rebasing %s"
-msgstr "非分支，正变基 %s"
+msgid "(no branch, rebasing %s)"
+msgstr "（非分支，正变基 %s）"
-#: ref-filter.c:1491
+#: ref-filter.c:1558
#, c-format
-msgid "no branch, rebasing detached HEAD %s"
-msgstr "非分支，正变基分离头指针 %s"
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "（非分支，正变基分离头指针 %s）"
-#: ref-filter.c:1494
+#: ref-filter.c:1561
#, c-format
-msgid "no branch, bisect started on %s"
-msgstr "非分支，二分查找开始于 %s"
+msgid "(no branch, bisect started on %s)"
+msgstr "（非分支，二分查找开始于 %s）"
-#: ref-filter.c:1504
-msgid "no branch"
-msgstr "非分支"
+#: ref-filter.c:1565
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "（头指针在 %s 分离）"
-#: ref-filter.c:1540 ref-filter.c:1749
+#: ref-filter.c:1568
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "（头指针自 %s 分离）"
+
+#: ref-filter.c:1571
+msgid "(no branch)"
+msgstr "（非分支）"
+
+#: ref-filter.c:1603 ref-filter.c:1812
#, c-format
msgid "missing object %s for %s"
msgstr "缺失 %2$s 的对象 %1$s"
-#: ref-filter.c:1550
+#: ref-filter.c:1613
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
-#: ref-filter.c:2004
+#: ref-filter.c:1996
#, c-format
msgid "malformed object at '%s'"
msgstr "格式错误的对象 '%s'"
-#: ref-filter.c:2093
+#: ref-filter.c:2085
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "忽略带有错误名称 %s 的引用"
-#: ref-filter.c:2389
+#: ref-filter.c:2090 refs.c:676
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "忽略损坏的引用 %s"
+
+#: ref-filter.c:2430
#, c-format
msgid "format: %%(end) atom missing"
msgstr "格式：缺少 %%(end) 元素"
-#: ref-filter.c:2489
-#, c-format
-msgid "option `%s' is incompatible with --merged"
-msgstr "选项 `%s' 和 --merged 不兼容"
-
-#: ref-filter.c:2492
-#, c-format
-msgid "option `%s' is incompatible with --no-merged"
-msgstr "选项 `%s' 和 --no-merged 不兼容"
-
-#: ref-filter.c:2502
+#: ref-filter.c:2529
#, c-format
msgid "malformed object name %s"
msgstr "格式错误的对象名 %s"
-#: ref-filter.c:2507
+#: ref-filter.c:2534
#, c-format
msgid "option `%s' must point to a commit"
msgstr "选项 `%s' 必须指向一个提交"
-#: remote.c:366
+#: refs.c:264
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr "%s 没有指向一个有效的对象！"
+
+#: refs.c:566
+#, c-format
+msgid ""
+"Using '%s' as the name for the initial branch. This default branch name\n"
+"is subject to change. To configure the initial branch name to use in all\n"
+"of your new repositories, which will suppress this warning, call:\n"
+"\n"
+"\tgit config --global init.defaultBranch <name>\n"
+"\n"
+"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"'development'. The just-created branch can be renamed via this command:\n"
+"\n"
+"\tgit branch -m <name>\n"
+msgstr ""
+"使用 '%s' 作为初始分支的名称。这个默认分支名称可能会更改。要在新仓库中\n"
+"配置使用初始分支名，并消除这条警告，请执行：\n"
+"\n"
+"\tgit config --global init.defaultBranch <名称>\n"
+"\n"
+"除了 'master' 之外，通常选定的名字有 'main'、'trunk' 和 'development'。\n"
+"可以通过以下命令重命名刚创建的分支：\n"
+"\n"
+"\tgit branch -m <name>\n"
+
+#: refs.c:588
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "无法获取 `%s`"
+
+#: refs.c:598
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "无效的分支名：%s = %s"
+
+#: refs.c:674
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "忽略悬空符号引用 %s"
+
+#: refs.c:922
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr "引用 %s 的日志在 %s 之后有缺口"
+
+#: refs.c:929
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr "引用 %s 的日志意外终止于 %s "
+
+#: refs.c:994
+#, c-format
+msgid "log for %s is empty"
+msgstr "%s 的日志为空"
+
+#: refs.c:1086
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "拒绝更新有错误名称 '%s' 的引用"
+
+#: refs.c:1157
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "对引用 '%s' 执行 update_ref 失败：%s"
+
+#: refs.c:2051
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "不允许对引用 '%s' 多次更新"
+
+#: refs.c:2131
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "在隔离环境中禁止更新引用"
+
+#: refs.c:2142
+msgid "ref updates aborted by hook"
+msgstr "引用更新被钩子中止"
+
+#: refs.c:2242 refs.c:2272
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "'%s' 已存在，无法创建 '%s'"
+
+#: refs.c:2248 refs.c:2283
+#, 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:170
+#, 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:414
+#: remote.c:399
msgid "more than one receivepack given, using the first"
msgstr "提供了一个以上的 receivepack，使用第一个"
-#: remote.c:422
+#: remote.c:407
msgid "more than one uploadpack given, using the first"
msgstr "提供了一个以上的 uploadpack，使用第一个"
-#: remote.c:612
+#: remote.c:590
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "不能同时获取 %s 和 %s 至 %s"
-#: remote.c:616
+#: remote.c:594
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s 通常跟踪 %s，而非 %s"
-#: remote.c:620
+#: remote.c:598
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s 同时跟踪 %s 和 %s"
-#: remote.c:688
+#: remote.c:666
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr "模式的键 '%s' 没有 '*'"
-#: remote.c:698
+#: remote.c:676
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr "模式的值 '%s' 没有 '*'"
-#: remote.c:1004
+#: remote.c:1083
#, c-format
msgid "src refspec %s does not match any"
msgstr "源引用表达式 %s 没有匹配"
-#: remote.c:1009
+#: remote.c:1088
#, c-format
msgid "src refspec %s matches more than one"
msgstr "源引用表达式 %s 匹配超过一个"
@@ -6077,7 +6878,7 @@
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1024
+#: remote.c:1103
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
@@ -6099,7 +6900,7 @@
"\n"
"都不行，所以我们已放弃。您必须给出完整的引用。"
-#: remote.c:1044
+#: remote.c:1123
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
@@ -6109,7 +6910,7 @@
"引用表达式的 <src> 是一个提交对象。您是想创建一个新的分支而向\n"
"'%s:refs/heads/%s' 推送么？"
-#: remote.c:1049
+#: remote.c:1128
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
@@ -6119,7 +6920,7 @@
"引用表达式的 <src> 是一个标签对象。您是想创建一个新的标签而向\n"
"'%s:refs/tags/%s' 推送么？"
-#: remote.c:1054
+#: remote.c:1133
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
@@ -6129,7 +6930,7 @@
"引用表达式的 <src> 是一个树对象。您是想为这个树对象创建标签而向\n"
"'%s:refs/tags/%s' 推送么？"
-#: remote.c:1059
+#: remote.c:1138
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
@@ -6139,114 +6940,114 @@
"引用表达式的 <src> 是一个数据对象。您是想为这个数据对象创建标签而向\n"
"'%s:refs/tags/%s' 推送么？"
-#: remote.c:1095
+#: remote.c:1174
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "%s 无法被解析为分支"
-#: remote.c:1106
+#: remote.c:1185
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "无法删除 '%s'：远程引用不存在"
-#: remote.c:1118
+#: remote.c:1197
#, c-format
msgid "dst refspec %s matches more than one"
msgstr "目标引用表达式 %s 匹配超过一个"
-#: remote.c:1125
+#: remote.c:1204
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr "目标引用 %s 接收超过一个源"
-#: remote.c:1628 remote.c:1729
+#: remote.c:1724 remote.c:1825
msgid "HEAD does not point to a branch"
msgstr "HEAD 没有指向一个分支"
-#: remote.c:1637
+#: remote.c:1733
#, c-format
msgid "no such branch: '%s'"
msgstr "没有此分支：'%s'"
-#: remote.c:1640
+#: remote.c:1736
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "尚未给分支 '%s' 设置上游"
-#: remote.c:1646
+#: remote.c:1742
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
-#: remote.c:1661
+#: remote.c:1757
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
-#: remote.c:1673
+#: remote.c:1769
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "分支 '%s' 没有设置要推送的远程服务器"
-#: remote.c:1683
+#: remote.c:1779
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "向 '%s' 推送引用规格未包含 '%s'"
-#: remote.c:1696
+#: remote.c:1792
msgid "push has no destination (push.default is 'nothing')"
msgstr "推送无目标（push.default 是 'nothing'）"
-#: remote.c:1718
+#: remote.c:1814
msgid "cannot resolve 'simple' push to a single destination"
msgstr "无法解析 'simple' 推送至一个单独的目标"
-#: remote.c:1844
+#: remote.c:1943
#, c-format
msgid "couldn't find remote ref %s"
msgstr "无法找到远程引用 %s"
-#: remote.c:1857
+#: remote.c:1956
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "* 在本地忽略可笑的引用 '%s'"
-#: remote.c:2020
+#: remote.c:2119
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"
-#: remote.c:2024
+#: remote.c:2123
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n"
-#: remote.c:2027
+#: remote.c:2126
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "您的分支与上游分支 '%s' 一致。\n"
-#: remote.c:2031
+#: remote.c:2130
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "您的分支和 '%s' 指向不同的提交。\n"
-#: remote.c:2034
+#: remote.c:2133
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " （使用 \"%s\" 查看详情）\n"
-#: remote.c:2038
+#: remote.c:2137
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
msgstr[1] "您的分支领先 '%s' 共 %d 个提交。\n"
-#: remote.c:2044
+#: remote.c:2143
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " （使用 \"git push\" 来发布您的本地提交）\n"
-#: remote.c:2047
+#: remote.c:2146
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -6255,11 +7056,11 @@
msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
# 译者：注意保持前导空格
-#: remote.c:2055
+#: remote.c:2154
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " （使用 \"git pull\" 来更新您的本地分支）\n"
-#: remote.c:2058
+#: remote.c:2157
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -6275,11 +7076,11 @@
"并且分别有 %d 和 %d 处不同的提交。\n"
# 译者：注意保持前导空格
-#: remote.c:2068
+#: remote.c:2167
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " （使用 \"git pull\" 来合并远程分支）\n"
-#: remote.c:2251
+#: remote.c:2359
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "无法解析期望的对象名 '%s'"
@@ -6299,126 +7100,135 @@
msgid "replace depth too high for object %s"
msgstr "对象 %s 的替换层级太深"
-#: rerere.c:217 rerere.c:226 rerere.c:229
+#: rerere.c:201 rerere.c:210 rerere.c:213
msgid "corrupt MERGE_RR"
msgstr "损坏的 MERGE_RR"
-#: rerere.c:264 rerere.c:269
+#: rerere.c:248 rerere.c:253
msgid "unable to write rerere record"
msgstr "无法写入 rerere 记录"
-#: rerere.c:495
+#: rerere.c:479
#, c-format
msgid "there were errors while writing '%s' (%s)"
msgstr "写入 '%s' (%s) 时出错"
-#: rerere.c:498
+#: rerere.c:482
#, c-format
msgid "failed to flush '%s'"
msgstr "刷新 '%s' 失败"
-#: rerere.c:503 rerere.c:1039
+#: rerere.c:487 rerere.c:1023
#, c-format
msgid "could not parse conflict hunks in '%s'"
msgstr "不能解析 '%s' 中的冲突块"
-#: rerere.c:684
+#: rerere.c:668
#, c-format
msgid "failed utime() on '%s'"
msgstr "在 '%s' 上调用 utime() 失败"
-#: rerere.c:694
+#: rerere.c:678
#, c-format
msgid "writing '%s' failed"
msgstr "写入 '%s' 失败"
-#: rerere.c:714
+#: rerere.c:698
#, c-format
msgid "Staged '%s' using previous resolution."
msgstr "使用之前的解决方案暂存 '%s'。"
-#: rerere.c:753
+#: rerere.c:737
#, c-format
msgid "Recorded resolution for '%s'."
msgstr "已记录 '%s' 的解决方案。"
-#: rerere.c:788
+#: rerere.c:772
#, c-format
msgid "Resolved '%s' using previous resolution."
msgstr "使用之前的解决方案解决 '%s'。"
-#: rerere.c:803
+#: rerere.c:787
#, c-format
msgid "cannot unlink stray '%s'"
msgstr "不能删除 stray '%s'"
-#: rerere.c:807
+#: rerere.c:791
#, c-format
msgid "Recorded preimage for '%s'"
msgstr "为 '%s' 记录 preimage"
-#: rerere.c:881 submodule.c:2078 builtin/log.c:1871
-#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
+#: rerere.c:865 submodule.c:2088 builtin/log.c:1991
+#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890
#, c-format
msgid "could not create directory '%s'"
msgstr "不能创建目录 '%s'"
-#: rerere.c:1057
+#: rerere.c:1041
#, c-format
msgid "failed to update conflicted state in '%s'"
msgstr "更新 '%s' 中的冲突状态失败"
-#: rerere.c:1068 rerere.c:1075
+#: rerere.c:1052 rerere.c:1059
#, c-format
msgid "no remembered resolution for '%s'"
msgstr "没有为 '%s' 记忆的解决方案"
-#: rerere.c:1077
+#: rerere.c:1061
#, c-format
msgid "cannot unlink '%s'"
msgstr "不能删除 '%s'"
-#: rerere.c:1087
+#: rerere.c:1071
#, c-format
msgid "Updated preimage for '%s'"
msgstr "已为 '%s' 更新 preimage"
-#: rerere.c:1096
+#: rerere.c:1080
#, c-format
msgid "Forgot resolution for '%s'\n"
msgstr "忘记 '%s' 的解决方案\n"
-#: rerere.c:1199
+#: rerere.c:1191
msgid "unable to open rr-cache directory"
msgstr "不能打开 rr-cache 目录"
-#: revision.c:2497
+#: reset.c:42
+msgid "could not determine HEAD revision"
+msgstr "不能确定 HEAD 版本"
+
+#: reset.c:70 reset.c:76 sequencer.c:3468
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "无法找到 %s 指向的树。"
+
+#: revision.c:2338
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "不再支持 --unpacked=<packfile>"
+
+#: revision.c:2668
msgid "your current branch appears to be broken"
msgstr "您的当前分支好像被损坏"
-#: revision.c:2500
+#: revision.c:2671
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "您的当前分支 '%s' 尚无任何提交"
-#: revision.c:2708
-msgid "--first-parent is incompatible with --bisect"
-msgstr "--first-parent 与 --bisect 不兼容"
-
-#: revision.c:2712
+#: revision.c:2877
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L 尚不支持 -p 和 -s 之外的差异格式"
-#: run-command.c:763
+#: run-command.c:767
msgid "open /dev/null failed"
msgstr "不能打开 /dev/null"
-#: run-command.c:1269
+#: run-command.c:1274
#, c-format
msgid "cannot create async thread: %s"
msgstr "不能创建 async 线程：%s"
-#: run-command.c:1333
+#: run-command.c:1338
#, c-format
msgid ""
"The '%s' hook was ignored because it's not set as executable.\n"
@@ -6427,75 +7237,79 @@
"因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n"
"配置 `git config advice.ignoredHook false` 来关闭这条警告。"
-#: send-pack.c:144
+#: send-pack.c:146
msgid "unexpected flush packet while reading remote unpack status"
msgstr "读取远程解包状态时收到意外的 flush 包"
-#: send-pack.c:146
+#: send-pack.c:148
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "不能解析远程解包状态：%s"
-#: send-pack.c:148
+#: send-pack.c:150
#, c-format
msgid "remote unpack failed: %s"
msgstr "远程解包失败：%s"
-#: send-pack.c:309
+#: send-pack.c:374
msgid "failed to sign the push certificate"
msgstr "为推送证书签名失败"
-#: send-pack.c:423
+#: send-pack.c:467
+msgid "the receiving end does not support this repository's hash algorithm"
+msgstr "接收端不支持这个仓库的哈希算法"
+
+#: send-pack.c:476
msgid "the receiving end does not support --signed push"
msgstr "接收端不支持签名推送"
-#: send-pack.c:425
+#: send-pack.c:478
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr "未发送推送证书，因为接收端不支持签名推送"
-#: send-pack.c:437
+#: send-pack.c:490
msgid "the receiving end does not support --atomic push"
msgstr "接收端不支持原子推送"
-#: send-pack.c:442
+#: send-pack.c:495
msgid "the receiving end does not support push options"
msgstr "接收端不支持推送选项"
-#: sequencer.c:191
+#: sequencer.c:195
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "无效的提交信息清理模式 '%s'"
-#: sequencer.c:296
+#: sequencer.c:323
#, c-format
msgid "could not delete '%s'"
msgstr "无法删除 '%s'"
-#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385
+#: sequencer.c:343 builtin/rebase.c:757 builtin/rebase.c:1602 builtin/rm.c:385
#, c-format
msgid "could not remove '%s'"
msgstr "无法删除 '%s'"
-#: sequencer.c:325
+#: sequencer.c:353
msgid "revert"
msgstr "还原"
-#: sequencer.c:327
+#: sequencer.c:355
msgid "cherry-pick"
msgstr "拣选"
-#: sequencer.c:329
+#: sequencer.c:357
msgid "rebase"
msgstr "变基"
-#: sequencer.c:331
+#: sequencer.c:359
#, c-format
msgid "unknown action: %d"
msgstr "未知动作：%d"
-#: sequencer.c:389
+#: sequencer.c:418
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -6503,7 +7317,7 @@
"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
"命令标记修正后的文件"
-#: sequencer.c:392
+#: sequencer.c:421
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -6512,44 +7326,43 @@
"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
"对修正后的文件做标记，然后用 'git commit' 提交"
-#: sequencer.c:405 sequencer.c:2901
+#: sequencer.c:434 sequencer.c:3070
#, c-format
msgid "could not lock '%s'"
msgstr "不能锁定 '%s'"
-#: sequencer.c:412
+#: sequencer.c:436 sequencer.c:2869 sequencer.c:3074 sequencer.c:3088
+#: sequencer.c:3345 sequencer.c:5334 strbuf.c:1168 wrapper.c:631
+#, c-format
+msgid "could not write to '%s'"
+msgstr "不能写入 '%s'"
+
+#: sequencer.c:441
#, c-format
msgid "could not write eol to '%s'"
msgstr "不能将换行符写入 '%s'"
-#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921
-#: sequencer.c:3185
+#: sequencer.c:446 sequencer.c:2874 sequencer.c:3076 sequencer.c:3090
+#: sequencer.c:3353
#, c-format
msgid "failed to finalize '%s'"
msgstr "无法完成 '%s'"
-#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
-#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
-#: builtin/rebase.c:593
-#, c-format
-msgid "could not read '%s'"
-msgstr "不能读取 '%s'"
-
-#: sequencer.c:466
+#: sequencer.c:485
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "您的本地修改将被%s覆盖。"
-#: sequencer.c:470
+#: sequencer.c:489
msgid "commit your changes or stash them to proceed."
msgstr "提交您的修改或贮藏后再继续。"
-#: sequencer.c:502
+#: sequencer.c:521
#, c-format
msgid "%s: fast-forward"
msgstr "%s：快进"
-#: sequencer.c:541 builtin/tag.c:565
+#: sequencer.c:560 builtin/tag.c:598
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "无效的清理模式 %s"
@@ -6557,65 +7370,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:635
+#: sequencer.c:670
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s：无法写入新索引文件"
-#: sequencer.c:652
+#: sequencer.c:684
msgid "unable to update cache tree"
msgstr "不能更新缓存树"
-#: sequencer.c:666
+#: sequencer.c:698
msgid "could not resolve HEAD commit"
msgstr "不能解析 HEAD 提交"
-#: sequencer.c:746
+#: sequencer.c:778
#, c-format
msgid "no key present in '%.*s'"
msgstr "在 '%.*s' 中没有 key"
-#: sequencer.c:757
+#: sequencer.c:789
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "无法为 '%s' 的值去引号"
-#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710
-#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072
+#: sequencer.c:826 wrapper.c:201 wrapper.c:371 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1136 builtin/rebase.c:910
#, c-format
msgid "could not open '%s' for reading"
msgstr "无法打开 '%s' 进行读取"
-#: sequencer.c:804
+#: sequencer.c:836
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "已经给出 'GIT_AUTHOR_NAME'"
-#: sequencer.c:809
+#: sequencer.c:841
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "已经给出 'GIT_AUTHOR_EMAIL'"
-#: sequencer.c:814
+#: sequencer.c:846
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "已经给出 'GIT_AUTHOR_DATE'"
-#: sequencer.c:818
+#: sequencer.c:850
#, c-format
msgid "unknown variable '%s'"
msgstr "未知变量 '%s'"
-#: sequencer.c:823
+#: sequencer.c:855
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "缺少 'GIT_AUTHOR_NAME'"
-#: sequencer.c:825
+#: sequencer.c:857
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "缺少 'GIT_AUTHOR_EMAIL'"
-#: sequencer.c:827
+#: sequencer.c:859
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "缺少 'GIT_AUTHOR_DATE'"
-#: sequencer.c:876
+#: sequencer.c:924
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -6644,11 +7457,11 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:1148
+#: sequencer.c:1211
msgid "'prepare-commit-msg' hook failed"
msgstr "'prepare-commit-msg' 钩子失败"
-#: sequencer.c:1154
+#: sequencer.c:1217
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6672,7 +7485,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1167
+#: sequencer.c:1230
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6695,325 +7508,339 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1209
+#: sequencer.c:1272
msgid "couldn't look up newly created commit"
msgstr "无法找到新创建的提交"
-#: sequencer.c:1211
+#: sequencer.c:1274
msgid "could not parse newly created commit"
msgstr "不能解析新创建的提交"
-#: sequencer.c:1257
+#: sequencer.c:1320
msgid "unable to resolve HEAD after creating commit"
msgstr "创建提交后，不能解析 HEAD"
-#: sequencer.c:1259
+#: sequencer.c:1322
msgid "detached HEAD"
msgstr "分离头指针"
# 译者：中文字符串拼接，可删除前导空格
-#: sequencer.c:1263
+#: sequencer.c:1326
msgid " (root-commit)"
msgstr "（根提交）"
-#: sequencer.c:1284
+#: sequencer.c:1347
msgid "could not parse HEAD"
msgstr "不能解析 HEAD"
-#: sequencer.c:1286
+#: sequencer.c:1349
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s 不是一个提交！"
-#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574
+#: sequencer.c:1353 sequencer.c:1431 builtin/commit.c:1577
msgid "could not parse HEAD commit"
msgstr "不能解析 HEAD 提交"
-#: sequencer.c:1342 sequencer.c:1968
+#: sequencer.c:1409 sequencer.c:2108
msgid "unable to parse commit author"
msgstr "不能解析提交作者"
-#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687
+#: sequencer.c:1420 builtin/am.c:1566 builtin/merge.c:702
msgid "git write-tree failed to write a tree"
msgstr "git write-tree 无法写入树对象"
-#: sequencer.c:1386 sequencer.c:1447
+#: sequencer.c:1453 sequencer.c:1573
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "不能从 '%s' 读取提交说明"
-#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886
-#: builtin/merge.c:911
+#: sequencer.c:1484 sequencer.c:1516
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr "无效的作者身份 '%s'"
+
+#: sequencer.c:1490
+msgid "corrupt author: missing date information"
+msgstr "损坏的作者：缺失日期信息"
+
+#: sequencer.c:1529 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:905
+#: builtin/merge.c:930 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "写提交对象失败"
-#: sequencer.c:1474
+#: sequencer.c:1556 sequencer.c:4291 t/helper/test-fast-rebase.c:198
+#, c-format
+msgid "could not update %s"
+msgstr "不能更新 %s"
+
+#: sequencer.c:1605
#, c-format
msgid "could not parse commit %s"
msgstr "不能解析提交 %s"
-#: sequencer.c:1479
+#: sequencer.c:1610
#, c-format
msgid "could not parse parent commit %s"
msgstr "不能解析父提交 %s"
-#: sequencer.c:1562 sequencer.c:1673
+#: sequencer.c:1693 sequencer.c:1804
#, c-format
msgid "unknown command: %d"
msgstr "未知命令：%d"
-#: sequencer.c:1620 sequencer.c:1645
+#: sequencer.c:1751 sequencer.c:1776
#, c-format
msgid "This is a combination of %d commits."
msgstr "这是一个 %d 个提交的组合。"
-#: sequencer.c:1630
+#: sequencer.c:1761
msgid "need a HEAD to fixup"
msgstr "需要一个 HEAD 来修复"
-#: sequencer.c:1632 sequencer.c:3212
+#: sequencer.c:1763 sequencer.c:3380
msgid "could not read HEAD"
msgstr "不能读取 HEAD"
-#: sequencer.c:1634
+#: sequencer.c:1765
msgid "could not read HEAD's commit message"
msgstr "不能读取 HEAD 的提交说明"
-#: sequencer.c:1640
+#: sequencer.c:1771
#, c-format
msgid "cannot write '%s'"
msgstr "不能写 '%s'"
-#: sequencer.c:1647 git-rebase--preserve-merges.sh:496
+#: sequencer.c:1778 git-rebase--preserve-merges.sh:486
msgid "This is the 1st commit message:"
msgstr "这是第一个提交说明："
-#: sequencer.c:1655
+#: sequencer.c:1786
#, c-format
msgid "could not read commit message of %s"
msgstr "不能读取 %s 的提交说明"
-#: sequencer.c:1662
+#: sequencer.c:1793
#, c-format
msgid "This is the commit message #%d:"
msgstr "这是提交说明 #%d："
-#: sequencer.c:1668
+#: sequencer.c:1799
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "提交说明 #%d 将被跳过："
-#: sequencer.c:1756
+#: sequencer.c:1887
msgid "your index file is unmerged."
msgstr "您的索引文件未完成合并。"
-#: sequencer.c:1763
+#: sequencer.c:1894
msgid "cannot fixup root commit"
msgstr "不能修复根提交"
-#: sequencer.c:1782
+#: sequencer.c:1913
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
-#: sequencer.c:1790 sequencer.c:1798
+#: sequencer.c:1921 sequencer.c:1929
#, c-format
msgid "commit %s does not have parent %d"
msgstr "提交 %s 没有第 %d 个父提交"
-#: sequencer.c:1804
+#: sequencer.c:1935
#, c-format
msgid "cannot get commit message for %s"
msgstr "不能得到 %s 的提交说明"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1823
+#: sequencer.c:1954
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s：不能解析父提交 %s"
-#: sequencer.c:1888
+#: sequencer.c:2019
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "不能将 '%s' 重命名为 '%s'"
-#: sequencer.c:1943
+#: sequencer.c:2079
#, c-format
msgid "could not revert %s... %s"
msgstr "不能还原 %s... %s"
-#: sequencer.c:1944
+#: sequencer.c:2080
#, c-format
msgid "could not apply %s... %s"
msgstr "不能应用 %s... %s"
-#: sequencer.c:1961
+#: sequencer.c:2100
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "丢弃 %s %s -- 补丁内容已在上游\n"
-#: sequencer.c:2018
+#: sequencer.c:2158
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s：无法读取索引"
-#: sequencer.c:2025
+#: sequencer.c:2165
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s：无法刷新索引"
-#: sequencer.c:2102
+#: sequencer.c:2242
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s 不接受参数：'%s'"
-#: sequencer.c:2111
+#: sequencer.c:2251
#, c-format
msgid "missing arguments for %s"
msgstr "缺少 %s 的参数"
-#: sequencer.c:2142
+#: sequencer.c:2282
#, c-format
msgid "could not parse '%s'"
msgstr "无法解析 '%s'"
-#: sequencer.c:2203
+#: sequencer.c:2343
#, c-format
msgid "invalid line %d: %.*s"
msgstr "无效行 %d：%.*s"
-#: sequencer.c:2214
+#: sequencer.c:2354
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "没有父提交的情况下不能 '%s'"
-#: sequencer.c:2298
+#: sequencer.c:2440
msgid "cancelling a cherry picking in progress"
msgstr "正在取消一个进行中的拣选"
-#: sequencer.c:2305
+#: sequencer.c:2449
msgid "cancelling a revert in progress"
msgstr "正在取消一个进行中的还原"
-#: sequencer.c:2349
+#: sequencer.c:2493
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "请用 'git rebase --edit-todo' 来修改。"
-#: sequencer.c:2351
+#: sequencer.c:2495
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "不可用的指令清单：'%s'"
-#: sequencer.c:2356
+#: sequencer.c:2500
msgid "no commits parsed."
msgstr "没有解析提交。"
-#: sequencer.c:2367
+#: sequencer.c:2511
msgid "cannot cherry-pick during a revert."
msgstr "不能在回退中执行拣选。"
-#: sequencer.c:2369
+#: sequencer.c:2513
msgid "cannot revert during a cherry-pick."
msgstr "不能在拣选中执行回退。"
-#: sequencer.c:2447
+#: sequencer.c:2591
#, c-format
msgid "invalid value for %s: %s"
msgstr "%s 的值无效：%s"
-#: sequencer.c:2540
+#: sequencer.c:2698
msgid "unusable squash-onto"
msgstr "不可用的 squash-onto"
-#: sequencer.c:2556
+#: sequencer.c:2718
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "格式错误的选项清单：'%s'"
-#: sequencer.c:2644 sequencer.c:4361
+#: sequencer.c:2811 sequencer.c:4644
msgid "empty commit set passed"
msgstr "提供了空的提交集"
-#: sequencer.c:2660
+#: sequencer.c:2828
msgid "revert is already in progress"
msgstr "一个还原操作已在进行"
-#: sequencer.c:2662
+#: sequencer.c:2830
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "尝试 \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:2665
+#: sequencer.c:2833
msgid "cherry-pick is already in progress"
msgstr "拣选操作已在进行"
-#: sequencer.c:2667
+#: sequencer.c:2835
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "尝试 \"git cherry-pick (--continue | %s--abort | --quit)\""
-#: sequencer.c:2681
+#: sequencer.c:2849
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "不能创建序列目录 '%s'"
-#: sequencer.c:2696
+#: sequencer.c:2864
msgid "could not lock HEAD"
msgstr "不能锁定 HEAD"
-#: sequencer.c:2756 sequencer.c:4099
+#: sequencer.c:2924 sequencer.c:4379
msgid "no cherry-pick or revert in progress"
msgstr "拣选或还原操作并未进行"
-#: sequencer.c:2758 sequencer.c:2769
+#: sequencer.c:2926 sequencer.c:2937
msgid "cannot resolve HEAD"
msgstr "不能解析 HEAD"
-#: sequencer.c:2760 sequencer.c:2804
+#: sequencer.c:2928 sequencer.c:2972
msgid "cannot abort from a branch yet to be born"
msgstr "不能从尚未建立的分支终止"
-#: sequencer.c:2790 builtin/grep.c:724
+#: sequencer.c:2958 builtin/grep.c:757
#, c-format
msgid "cannot open '%s'"
msgstr "不能打开 '%s'"
-#: sequencer.c:2792
+#: sequencer.c:2960
#, c-format
msgid "cannot read '%s': %s"
msgstr "不能读取 '%s'：%s"
-#: sequencer.c:2793
+#: sequencer.c:2961
msgid "unexpected end of file"
msgstr "意外的文件结束"
-#: sequencer.c:2799
+#: sequencer.c:2967
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
-#: sequencer.c:2810
+#: sequencer.c:2978
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！"
-#: sequencer.c:2851
+#: sequencer.c:3019
msgid "no revert in progress"
msgstr "没有正在进行的还原"
-#: sequencer.c:2859
+#: sequencer.c:3028
msgid "no cherry-pick in progress"
msgstr "没有正在进行的拣选"
-#: sequencer.c:2869
+#: sequencer.c:3038
msgid "failed to skip the commit"
msgstr "无法跳过这个提交"
-#: sequencer.c:2876
+#: sequencer.c:3045
msgid "there is nothing to skip"
msgstr "没有要跳过的"
-#: sequencer.c:2879
+#: sequencer.c:3048
#, c-format
msgid ""
"have you committed already?\n"
@@ -7022,21 +7849,16 @@
"您已经提交了么？\n"
"试试 \"git %s --continue\""
-#: sequencer.c:3003 sequencer.c:4011
-#, c-format
-msgid "could not update %s"
-msgstr "不能更新 %s"
-
-#: sequencer.c:3042 sequencer.c:3991
+#: sequencer.c:3210 sequencer.c:4271
msgid "cannot read HEAD"
msgstr "不能读取 HEAD"
-#: sequencer.c:3059
+#: sequencer.c:3227
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "无法拷贝 '%s' 至 '%s'"
-#: sequencer.c:3067
+#: sequencer.c:3235
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -7055,23 +7877,28 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:3077
+#: sequencer.c:3245
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "不能应用 %s... %.*s"
-#: sequencer.c:3084
+#: sequencer.c:3252
#, c-format
msgid "Could not merge %.*s"
msgstr "不能合并 %.*s"
-#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641
+#: sequencer.c:3266 sequencer.c:3270 builtin/difftool.c:640
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "不能拷贝 '%s' 至 '%s'"
+#: sequencer.c:3282
+#, c-format
+msgid "Executing: %s\n"
+msgstr "正在执行：%s\n"
+
# 译者：注意保持前导空格
-#: sequencer.c:3129
+#: sequencer.c:3297
#, c-format
msgid ""
"execution failed: %s\n"
@@ -7086,11 +7913,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3135
+#: sequencer.c:3303
msgid "and made changes to the index and/or the working tree\n"
msgstr "并且修改索引和/或工作区\n"
-#: sequencer.c:3141
+#: sequencer.c:3309
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -7107,102 +7934,123 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3202
+#: sequencer.c:3370
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "非法的标签名称：'%.*s'"
-#: sequencer.c:3256
+#: sequencer.c:3424
msgid "writing fake root commit"
msgstr "写伪根提交"
-#: sequencer.c:3261
+#: sequencer.c:3429
msgid "writing squash-onto"
msgstr "写入 squash-onto"
-#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886
-#, c-format
-msgid "failed to find tree of %s"
-msgstr "无法找到 %s 指向的树。"
-
-#: sequencer.c:3344
+#: sequencer.c:3513
#, c-format
msgid "could not resolve '%s'"
msgstr "无法解析 '%s'"
-#: sequencer.c:3375
+#: sequencer.c:3546
msgid "cannot merge without a current revision"
msgstr "没有当前版本不能合并"
-#: sequencer.c:3397
+#: sequencer.c:3568
#, c-format
msgid "unable to parse '%.*s'"
msgstr "无法解析 '%.*s'"
-#: sequencer.c:3406
+#: sequencer.c:3577
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "无可用合并：'%.*s'"
-#: sequencer.c:3418
+#: sequencer.c:3589
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "章鱼合并不能在一个新的根提交上执行"
-#: sequencer.c:3434
+#: sequencer.c:3605
#, c-format
msgid "could not get commit message of '%s'"
msgstr "不能获取 '%s' 的提交说明"
-#: sequencer.c:3594
+#: sequencer.c:3788
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "甚至不能尝试合并 '%.*s'"
-#: sequencer.c:3610
+#: sequencer.c:3804
msgid "merge: Unable to write new index file"
msgstr "合并：无法写入新索引文件"
-#: sequencer.c:3679 builtin/rebase.c:737
+#: sequencer.c:3878
+msgid "Cannot autostash"
+msgstr "无法 autostash"
+
+#: sequencer.c:3881
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "意外的 stash 响应：'%s'"
+
+#: sequencer.c:3887
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "不能为 '%s' 创建目录"
+
+#: sequencer.c:3890
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "创建了 autostash：%s\n"
+
+#: sequencer.c:3894
+msgid "could not reset --hard"
+msgstr "无法 reset --hard"
+
+#: sequencer.c:3919
#, c-format
msgid "Applied autostash.\n"
msgstr "已应用 autostash。\n"
-#: sequencer.c:3691
+#: sequencer.c:3931
#, c-format
msgid "cannot store %s"
msgstr "不能存储 %s"
-#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113
+#: sequencer.c:3934
#, 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:3755
-#, c-format
-msgid "%s: not a valid OID"
-msgstr "%s：不是一个有效的对象 ID"
+#: sequencer.c:3939
+msgid "Applying autostash resulted in conflicts."
+msgstr "应用自动贮藏导致冲突。"
-#: sequencer.c:3760 git-rebase--preserve-merges.sh:779
+#: sequencer.c:3940
+msgid "Autostash exists; creating a new stash entry."
+msgstr "自动贮藏已经存在；正在创建一个新的贮藏条目。"
+
+#: sequencer.c:4033 git-rebase--preserve-merges.sh:769
msgid "could not detach HEAD"
msgstr "不能分离头指针"
-#: sequencer.c:3775
+#: sequencer.c:4048
#, c-format
msgid "Stopped at HEAD\n"
msgstr "停止在 HEAD\n"
-#: sequencer.c:3777
+#: sequencer.c:4050
#, c-format
msgid "Stopped at %s\n"
msgstr "停止在 %s\n"
-#: sequencer.c:3785
+#: sequencer.c:4058
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -7222,48 +8070,58 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:3869
+#: sequencer.c:4104
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "正在变基（%d/%d）%s"
+
+#: sequencer.c:4149
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "停止在 %s... %.*s\n"
-#: sequencer.c:3940
+#: sequencer.c:4220
#, c-format
msgid "unknown command %d"
msgstr "未知命令 %d"
-#: sequencer.c:3999
+#: sequencer.c:4279
msgid "could not read orig-head"
msgstr "不能读取 orig-head"
-#: sequencer.c:4004
+#: sequencer.c:4284
msgid "could not read 'onto'"
msgstr "不能读取 'onto'"
-#: sequencer.c:4018
+#: sequencer.c:4298
#, c-format
msgid "could not update HEAD to %s"
msgstr "不能更新 HEAD 为 %s"
-#: sequencer.c:4111
+#: sequencer.c:4358
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "成功变基并更新 %s。\n"
+
+#: sequencer.c:4391
msgid "cannot rebase: You have unstaged changes."
msgstr "不能变基：您有未暂存的变更。"
-#: sequencer.c:4120
+#: sequencer.c:4400
msgid "cannot amend non-existing commit"
msgstr "不能修补不存在的提交"
-#: sequencer.c:4122
+#: sequencer.c:4402
#, c-format
msgid "invalid file: '%s'"
msgstr "无效文件：'%s'"
-#: sequencer.c:4124
+#: sequencer.c:4404
#, c-format
msgid "invalid contents: '%s'"
msgstr "无效内容：'%s'"
-#: sequencer.c:4127
+#: sequencer.c:4407
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -7272,59 +8130,59 @@
"\n"
"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
-#: sequencer.c:4163 sequencer.c:4202
+#: sequencer.c:4443 sequencer.c:4482
#, c-format
msgid "could not write file: '%s'"
msgstr "不能写入文件：'%s'"
-#: sequencer.c:4217
+#: sequencer.c:4498
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "不能删除 CHERRY_PICK_HEAD"
-#: sequencer.c:4224
+#: sequencer.c:4505
msgid "could not commit staged changes."
msgstr "不能提交暂存的修改。"
-#: sequencer.c:4338
+#: sequencer.c:4621
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s：不能拣选一个%s"
-#: sequencer.c:4342
+#: sequencer.c:4625
#, c-format
msgid "%s: bad revision"
msgstr "%s：错误的版本"
-#: sequencer.c:4377
+#: sequencer.c:4660
msgid "can't revert as initial commit"
msgstr "不能作为初始提交回退"
-#: sequencer.c:4846
+#: sequencer.c:5137
msgid "make_script: unhandled options"
msgstr "make_script：有未能处理的选项"
-#: sequencer.c:4849
+#: sequencer.c:5140
msgid "make_script: error preparing revisions"
msgstr "make_script：准备版本时错误"
-#: sequencer.c:5083 sequencer.c:5100
+#: sequencer.c:5382 sequencer.c:5399
msgid "nothing to do"
msgstr "无事可做"
-#: sequencer.c:5119
+#: sequencer.c:5418
msgid "could not skip unnecessary pick commands"
msgstr "无法跳过不必要的拣选"
-#: sequencer.c:5213
+#: sequencer.c:5512
msgid "the script was already rearranged."
msgstr "脚本已经重新编排。"
-#: setup.c:124
+#: setup.c:133
#, c-format
msgid "'%s' is outside repository at '%s'"
msgstr "'%s' 在位于 '%s' 的仓库之外"
-#: setup.c:175
+#: setup.c:185
#, c-format
msgid ""
"%s: no such path in the working tree.\n"
@@ -7333,7 +8191,7 @@
"%s：工作区中无此路径。\n"
"使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。"
-#: setup.c:188
+#: setup.c:198
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -7344,12 +8202,12 @@
"使用 '--' 来分隔版本和路径，例如：\n"
"'git <命令> [<版本>...] -- [<文件>...]'"
-#: setup.c:254
+#: setup.c:264
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr "选项 '%s' 必须在其他非选项参数之前"
-#: setup.c:273
+#: setup.c:283
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -7360,101 +8218,105 @@
"使用 '--' 来分隔版本和路径，例如：\n"
"'git <命令> [<版本>...] -- [<文件>...]'"
-#: setup.c:409
+#: setup.c:419
msgid "unable to set up work tree using invalid config"
msgstr "无法使用无效配置来创建工作区"
-#: setup.c:413
+#: setup.c:423
msgid "this operation must be run in a work tree"
msgstr "该操作必须在一个工作区中运行"
-#: setup.c:559
+#: setup.c:661
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "期望 git 仓库版本 <= %d，却得到 %d"
-#: setup.c:567
+#: setup.c:669
msgid "unknown repository extensions found:"
msgstr "发现未知的仓库扩展："
-#: setup.c:586
+#: 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:588
+#: setup.c:702
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "文件太大，无法作为 .git 文件：'%s'"
-#: setup.c:590
+#: setup.c:704
#, c-format
msgid "error reading %s"
msgstr "读取 %s 出错"
-#: setup.c:592
+#: setup.c:706
#, c-format
msgid "invalid gitfile format: %s"
msgstr "无效的 gitfile 格式：%s"
-#: setup.c:594
+#: setup.c:708
#, c-format
msgid "no path in gitfile: %s"
msgstr "在 gitfile 中没有路径：%s"
-#: setup.c:596
+#: setup.c:710
#, c-format
msgid "not a git repository: %s"
-msgstr "不是一个 git 仓库：%s"
+msgstr "不是 git 仓库：%s"
-#: setup.c:695
+#: setup.c:812
#, c-format
msgid "'$%s' too big"
msgstr "'$%s' 太大"
-#: setup.c:709
+#: setup.c:826
#, c-format
msgid "not a git repository: '%s'"
-msgstr "不是一个 git 仓库：'%s'"
+msgstr "不是 git 仓库：'%s'"
-#: setup.c:738 setup.c:740 setup.c:771
+#: setup.c:855 setup.c:857 setup.c:888
#, c-format
msgid "cannot chdir to '%s'"
msgstr "不能切换目录到 '%s'"
-#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856
+#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973
msgid "cannot come back to cwd"
msgstr "无法返回当前工作目录"
-#: setup.c:870
+#: setup.c:987
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "获取 '%*s%s%s' 状态（stat）失败"
-#: setup.c:1108
+#: setup.c:1225
msgid "Unable to read current working directory"
msgstr "不能读取当前工作目录"
-#: setup.c:1117 setup.c:1123
+#: setup.c:1234 setup.c:1240
#, c-format
msgid "cannot change to '%s'"
msgstr "不能切换到 '%s'"
-#: setup.c:1128
+#: 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:1134
+#: 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:1245
+#: setup.c:1362
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -7463,406 +8325,56 @@
"参数 core.sharedRepository 的文件属性值有问题（0%.3o）。\n"
"文件属主必须始终拥有读写权限。"
-#: setup.c:1289
+#: setup.c:1409
msgid "open /dev/null or dup failed"
msgstr "不能打开或者复制 /dev/null"
-#: setup.c:1304
+#: setup.c:1424
msgid "fork failed"
msgstr "fork 失败"
-#: setup.c:1309
+#: setup.c:1429
msgid "setsid failed"
msgstr "setsid 失败"
-#: sha1-file.c:452
-#, c-format
-msgid "object directory %s does not exist; check .git/objects/info/alternates"
-msgstr "对象目录 %s 不存在，检查 .git/objects/info/alternates"
-
-#: sha1-file.c:503
-#, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr "无法规范化备用对象路径：%s"
-
-#: sha1-file.c:575
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr "%s：忽略备用对象库，嵌套太深"
-
-#: sha1-file.c:582
-#, c-format
-msgid "unable to normalize object directory: %s"
-msgstr "无法规范化对象目录: %s"
-
-#: sha1-file.c:625
-msgid "unable to fdopen alternates lockfile"
-msgstr "无法 fdopen 替换锁文件"
-
-#: sha1-file.c:643
-msgid "unable to read alternates file"
-msgstr "无法读取替代文件"
-
-#: sha1-file.c:650
-msgid "unable to move new alternates file into place"
-msgstr "无法将新的替代文件移动到位"
-
-#: sha1-file.c:685
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "路径 '%s' 不存在"
-
-#: sha1-file.c:711
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
-
-#: sha1-file.c:717
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "参考仓库 '%s' 不是一个本地仓库。"
-
-#: sha1-file.c:723
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "参考仓库 '%s' 是一个浅克隆"
-
-#: sha1-file.c:731
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "参考仓库 '%s' 已被移植"
-
-#: sha1-file.c:791
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "解析备用引用时无效的行：%s"
-
-#: sha1-file.c:943
-#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
-msgstr "尝试 mmap %<PRIuMAX>，超过了最大值 %<PRIuMAX>"
-
-#: sha1-file.c:964
-msgid "mmap failed"
-msgstr "mmap 失败"
-
-#: sha1-file.c:1128
-#, c-format
-msgid "object file %s is empty"
-msgstr "对象文件 %s 为空"
-
-#: sha1-file.c:1263 sha1-file.c:2443
-#, c-format
-msgid "corrupt loose object '%s'"
-msgstr "损坏的松散对象 '%s'"
-
-#: sha1-file.c:1265 sha1-file.c:2447
-#, c-format
-msgid "garbage at end of loose object '%s'"
-msgstr "松散对象 '%s' 后面有垃圾数据"
-
-#: sha1-file.c:1307
-msgid "invalid object type"
-msgstr "无效的对象类型"
-
-#: sha1-file.c:1391
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "无法用 --allow-unknown-type 参数解开 %s 头信息"
-
-#: sha1-file.c:1394
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "无法解开 %s 头部"
-
-#: sha1-file.c:1400
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "无法用 --allow-unknown-type 参数解析 %s 头信息"
-
-#: sha1-file.c:1403
-#, c-format
-msgid "unable to parse %s header"
-msgstr "无法解析 %s 头部"
-
-#: sha1-file.c:1629
-#, c-format
-msgid "failed to read object %s"
-msgstr "读取对象 %s 失败"
-
-#: sha1-file.c:1633
-#, c-format
-msgid "replacement %s not found for %s"
-msgstr "找不到 %2$s 的替代 %1$s"
-
-#: sha1-file.c:1637
-#, c-format
-msgid "loose object %s (stored in %s) is corrupt"
-msgstr "松散对象 %s（保存在 %s）已损坏"
-
-#: sha1-file.c:1641
-#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "打包对象 %s（保存在 %s）已损坏"
-
-#: sha1-file.c:1746
-#, c-format
-msgid "unable to write file %s"
-msgstr "无法写文件 %s"
-
-#: sha1-file.c:1753
-#, c-format
-msgid "unable to set permission to '%s'"
-msgstr "无法为 '%s' 设置权限"
-
-#: sha1-file.c:1760
-msgid "file write error"
-msgstr "文件写错误"
-
-#: sha1-file.c:1780
-msgid "error when closing loose object file"
-msgstr "关闭松散对象文件时出错"
-
-#: sha1-file.c:1845
-#, c-format
-msgid "insufficient permission for adding an object to repository database %s"
-msgstr "权限不足，无法在仓库对象库 %s 中添加对象"
-
-#: sha1-file.c:1847
-msgid "unable to create temporary file"
-msgstr "无法创建临时文件"
-
-#: sha1-file.c:1871
-msgid "unable to write loose object file"
-msgstr "不能写松散对象文件"
-
-#: sha1-file.c:1877
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr "不能压缩新对象 %s（%d）"
-
-#: sha1-file.c:1881
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr "在对象 %s 上调用 deflateEnd 失败（%d）"
-
-#: sha1-file.c:1885
-#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr "被 %s 的不稳定对象源数据搞糊涂了"
-
-#: sha1-file.c:1895 builtin/pack-objects.c:1054
-#, c-format
-msgid "failed utime() on %s"
-msgstr "在 %s 上调用 utime() 失败"
-
-#: sha1-file.c:1972
-#, c-format
-msgid "cannot read object for %s"
-msgstr "不能读取对象 %s"
-
-#: sha1-file.c:2011
-msgid "corrupt commit"
-msgstr "损坏的提交"
-
-#: sha1-file.c:2019
-msgid "corrupt tag"
-msgstr "损坏的标签"
-
-#: sha1-file.c:2119
-#, c-format
-msgid "read error while indexing %s"
-msgstr "索引 %s 时读取错误"
-
-#: sha1-file.c:2122
-#, c-format
-msgid "short read while indexing %s"
-msgstr "索引 %s 时读入不完整"
-
-#: sha1-file.c:2195 sha1-file.c:2205
-#, c-format
-msgid "%s: failed to insert into database"
-msgstr "%s：插入数据库失败"
-
-#: sha1-file.c:2211
-#, c-format
-msgid "%s: unsupported file type"
-msgstr "%s：不支持的文件类型"
-
-#: sha1-file.c:2235
-#, c-format
-msgid "%s is not a valid object"
-msgstr "%s 不是一个有效的对象"
-
-#: sha1-file.c:2237
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s 不是一个有效的 '%s' 对象"
-
-#: sha1-file.c:2264 builtin/index-pack.c:155
-#, c-format
-msgid "unable to open %s"
-msgstr "不能打开 %s"
-
-#: sha1-file.c:2454 sha1-file.c:2507
-#, c-format
-msgid "hash mismatch for %s (expected %s)"
-msgstr "%s 的哈希值不匹配（预期 %s）"
-
-#: sha1-file.c:2478
-#, c-format
-msgid "unable to mmap %s"
-msgstr "不能 mmap %s"
-
-#: sha1-file.c:2483
-#, c-format
-msgid "unable to unpack header of %s"
-msgstr "无法解压缩 %s 的头部"
-
-#: sha1-file.c:2489
-#, c-format
-msgid "unable to parse header of %s"
-msgstr "无法解析 %s 的头部"
-
-#: sha1-file.c:2500
-#, c-format
-msgid "unable to unpack contents of %s"
-msgstr "无法解压缩 %s 的内容"
-
-#: sha1-name.c:486
-#, c-format
-msgid "short SHA1 %s is ambiguous"
-msgstr "短 SHA1 %s 存在歧义"
-
-#: sha1-name.c:497
-msgid "The candidates are:"
-msgstr "候选者有："
-
-#: sha1-name.c:796
-msgid ""
-"Git normally never creates a ref that ends with 40 hex characters\n"
-"because it will be ignored when you just specify 40-hex. These refs\n"
-"may be created by mistake. For example,\n"
-"\n"
-" git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
-"examine these refs and maybe delete them. Turn this message off by\n"
-"running \"git config advice.objectNameWarning false\""
-msgstr ""
-"Git 通常不会创建一个以40个十六进制字符结尾的引用，因为当您只提供40\n"
-"个十六进制字符时将被忽略。这些引用可能被错误地创建。例如：\n"
-"\n"
-" git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"当 \"$br\" 某种原因空白时，一个40位十六进制的引用将被创建。请检查这些\n"
-"引用，可能需要删除它们。运行 \"git config advice.objectNameWarning\n"
-"false\" 命令关闭本消息通知。"
-
-#: sha1-name.c:916
-#, c-format
-msgid "log for '%.*s' only goes back to %s"
-msgstr "'%.*s' 的日志仅能回到 %s"
-
-#: sha1-name.c:924
-#, c-format
-msgid "log for '%.*s' only has %d entries"
-msgstr "'%.*s' 的日志仅有 %d 个条目"
-
-#: sha1-name.c:1689
-#, c-format
-msgid "path '%s' exists on disk, but not in '%.*s'"
-msgstr "路径 '%s' 在磁盘上，但是不在 '%.*s' 中"
-
-#: sha1-name.c:1695
-#, c-format
-msgid ""
-"path '%s' exists, but not '%s'\n"
-"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
-msgstr ""
-"路径 '%s' 存在，而 '%s' 不存在\n"
-"提示：您的意思是 '%.*s:%s' 亦即 '%.*s:./%s'？"
-
-#: sha1-name.c:1704
-#, c-format
-msgid "path '%s' does not exist in '%.*s'"
-msgstr "路径 '%s' 不在 '%.*s' 中"
-
-#: sha1-name.c:1732
-#, c-format
-msgid ""
-"path '%s' is in the index, but not at stage %d\n"
-"hint: Did you mean ':%d:%s'?"
-msgstr ""
-"路径 '%s' 在索引中，但不在暂存区 %d 中\n"
-"提示：您的意思是 ':%d:%s'？"
-
-#: sha1-name.c:1748
-#, c-format
-msgid ""
-"path '%s' is in the index, but not '%s'\n"
-"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
-msgstr ""
-"路径 '%s' 在索引中，但 '%s' 不在\n"
-"提示：您的意思是 ':%d:%s' 亦即 ':%d:./%s'？"
-
-#: sha1-name.c:1756
-#, c-format
-msgid "path '%s' exists on disk, but not in the index"
-msgstr "路径 '%s' 在磁盘上，但不在索引里"
-
-#: sha1-name.c:1758
-#, c-format
-msgid "path '%s' does not exist (neither on disk nor in the index)"
-msgstr "路径 '%s' 不存在（既不在磁盘上，也不在索引中）"
-
-#: sha1-name.c:1771
-msgid "relative path syntax can't be used outside working tree"
-msgstr "不能在工作区之外使用相对路径语法"
-
-#: sha1-name.c:1909
-#, c-format
-msgid "invalid object name '%.*s'."
-msgstr "无效的对象名 '%.*s'。"
-
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:837
+#: strbuf.c:848
#, c-format
msgid "%u.%2.2u GiB"
msgstr "%u.%2.2u GiB"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:839
+#: 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:847
+#: strbuf.c:858
#, c-format
msgid "%u.%2.2u MiB"
msgstr "%u.%2.2u MiB"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:849
+#: 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:856
+#: strbuf.c:867
#, c-format
msgid "%u.%2.2u KiB"
msgstr "%u.%2.2u KiB"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:858
+#: 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:864
+#: strbuf.c:875
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
@@ -7870,18 +8382,48 @@
msgstr[1] "%u 字节"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:866
+#: strbuf.c:877
#, c-format
msgid "%u byte/s"
msgid_plural "%u bytes/s"
msgstr[0] "%u 字节/秒"
msgstr[1] "%u 字节/秒"
-#: strbuf.c:1164
+#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719
+#: builtin/rebase.c:866
+#, 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，先解决合并冲突"
@@ -7910,60 +8452,60 @@
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
-#: submodule.c:434
+#: submodule.c:435
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr "坏的 --ignore-submodules 参数：%s"
-#: submodule.c:815
+#: submodule.c:817
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
"same. Skipping it."
msgstr "提交 %s 中位于路径 '%s' 的子模组和同名的子模组冲突。 跳过它。"
-#: submodule.c:910
+#: submodule.c:920
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "子模组条目 '%s'（%s）是一个 %s，不是一个提交"
-#: submodule.c:995
+#: submodule.c:1005
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
"submodule %s"
msgstr "无法在子模组 %s 中执行 'git rev-list <提交> --not --remotes -n 1'"
-#: submodule.c:1118
+#: submodule.c:1128
#, c-format
msgid "process for submodule '%s' failed"
msgstr "处理子模组 '%s' 失败"
-#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045
+#: submodule.c:1157 builtin/branch.c:689 builtin/submodule--helper.c:2469
msgid "Failed to resolve HEAD as a valid ref."
msgstr "无法将 HEAD 解析为有效引用。"
-#: submodule.c:1158
+#: submodule.c:1168
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr "正在推送子模组 '%s'\n"
-#: submodule.c:1161
+#: submodule.c:1171
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "无法推送子模组 '%s'\n"
-#: submodule.c:1453
+#: submodule.c:1463
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr "正在获取子模组 %s%s\n"
-#: submodule.c:1483
+#: submodule.c:1497
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr "无法访问子模组 '%s'\n"
-#: submodule.c:1637
+#: submodule.c:1652
#, c-format
msgid ""
"Errors during submodule fetch:\n"
@@ -7972,77 +8514,77 @@
"获取子模组时的错误：\n"
"%s"
-#: submodule.c:1662
+#: submodule.c:1677
#, c-format
msgid "'%s' not recognized as a git repository"
-msgstr "无法将 '%s' 识别为一个 git 仓库"
+msgstr "无法将 '%s' 识别为 git 仓库"
-#: submodule.c:1679
+#: submodule.c:1694
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr "无法在子模组 %s 中执行 'git status --porcelain=2'"
-#: submodule.c:1720
+#: submodule.c:1735
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr "在子模组 %s 中执行 'git status --porcelain=2' 失败"
-#: submodule.c:1800
+#: submodule.c:1810
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "无法在子模组 '%s' 中启动 'git status'"
-#: submodule.c:1813
+#: submodule.c:1823
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "无法在子模组 '%s' 中执行 'git status'"
-#: submodule.c:1828
+#: submodule.c:1838
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "无法在子模组 '%s' 中取消 core.worktree 的设置"
-#: submodule.c:1855 submodule.c:2165
+#: submodule.c:1865 submodule.c:2175
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "无法递归进子模组路径 '%s'"
-#: submodule.c:1876
+#: submodule.c:1886
msgid "could not reset submodule index"
msgstr "无法重置子模组索引"
-#: submodule.c:1918
+#: submodule.c:1928
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "子模组 '%s' 中有脏索引"
-#: submodule.c:1970
+#: submodule.c:1980
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "子模组 '%s' 无法被更新。"
-#: submodule.c:2038
+#: submodule.c:2048
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr "子模组 git 目录 '%s' 位于 git 目录 '%.*s' 中"
-#: submodule.c:2059
+#: submodule.c:2069
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
-#: submodule.c:2071 submodule.c:2130
+#: submodule.c:2081 submodule.c:2140
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "不能查询子模组 '%s' 的名称"
-#: submodule.c:2075
+#: submodule.c:2085
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr "禁止移动 '%s' 到现存 git 目录中"
-#: submodule.c:2082
+#: submodule.c:2092
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -8053,93 +8595,257 @@
"'%s' 迁移至\n"
"'%s'\n"
-#: submodule.c:2209
+#: submodule.c:2220
msgid "could not start ls-files in .."
msgstr "无法在 .. 中启动 ls-files"
-#: submodule.c:2248
+#: submodule.c:2260
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree 返回未知返回值 %d"
-#: submodule-config.c:236
-#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "忽略可疑的子模组名称：%s"
-
-#: submodule-config.c:303
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "submodule.fetchjobs 不允许为负值"
-
-#: submodule-config.c:401
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr "忽略可能被解析为命令行选项的 '%s'：%s"
-
-#: submodule-config.c:498
-#, c-format
-msgid "invalid value for %s"
-msgstr "%s 的值无效"
-
-#: submodule-config.c:765
-#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr "不能更新 .gitmodules 条目 %s"
-
-#: trailer.c:238
+#: 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:298 builtin/remote.c:323
+#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324
#, 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' 的键为空"
+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 builtin/mktag.c:91
msgid "could not read from stdin"
msgstr "不能自标准输入读取"
-#: trailer.c:1011 wrapper.c:665
+#: 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-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:1237
+#, 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:1447
+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:845
+#, c-format
+msgid "helper reported unexpected status of %s"
+msgstr "助手报告 %s 的意外状态"
+
+#: transport-helper.c:928
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr "助手 %s 不支持 dry-run"
+
+#: transport-helper.c:931
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr "助手 %s 不支持 --signed"
+
+#: transport-helper.c:934
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr "助手 %s 不支持 --signed=if-asked"
+
+#: transport-helper.c:939
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr "助手 %s 不支持 --atomic"
+
+#: transport-helper.c:943
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr "助手 %s 不支持 --%s"
+
+#: transport-helper.c:950
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr "助手 %s 不支持 'push-option'"
+
+#: transport-helper.c:1050
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr "remote-heper 不支持 push，需要引用表达式"
+
+#: transport-helper.c:1055
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr "助手 %s 不支持 'force'"
+
+#: transport-helper.c:1102
+msgid "couldn't run fast-export"
+msgstr "无法执行 fast-export"
+
+#: transport-helper.c:1107
+msgid "error while running fast-export"
+msgstr "执行 fast-export 时出错"
+
+#: transport-helper.c:1132
+#, 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:1214
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr "不支持的对象格式 '%s'"
+
+#: transport-helper.c:1223
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr "引用列表中格式错误的响应：%s"
+
+#: transport-helper.c:1375
+#, c-format
+msgid "read(%s) failed"
+msgstr "读取（%s）失败"
+
+#: transport-helper.c:1402
+#, c-format
+msgid "write(%s) failed"
+msgstr "写（%s）失败"
+
+#: transport-helper.c:1451
+#, c-format
+msgid "%s thread failed"
+msgstr "%s 线程失败"
+
+#: transport-helper.c:1455
+#, c-format
+msgid "%s thread failed to join: %s"
+msgstr "%s 线程等待失败：%s"
+
+#: transport-helper.c:1474 transport-helper.c:1478
+#, c-format
+msgid "can't start thread for copying data: %s"
+msgstr "不能启动线程来拷贝数据：%s"
+
+#: transport-helper.c:1515
+#, c-format
+msgid "%s process failed to wait"
+msgstr "%s 进程等待失败"
+
+#: transport-helper.c:1519
+#, c-format
+msgid "%s process failed"
+msgstr "%s 进程失败"
+
+#: transport-helper.c:1537 transport-helper.c:1546
+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"
@@ -8148,51 +8854,51 @@
#: transport.c:145
#, c-format
msgid "could not read bundle '%s'"
-msgstr "无法读取 bundle '%s'"
+msgstr "无法读取归档包 '%s'"
-#: transport.c:214
+#: transport.c:220
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "传输：无效的深度选项 '%s'"
-#: transport.c:266
+#: transport.c:269
msgid "see protocol.version in 'git help config' for more details"
msgstr "查看 'git help config' 中的 protocol.version 获取更多信息"
-#: transport.c:267
+#: transport.c:270
msgid "server options require protocol version 2 or later"
msgstr "服务端选项需要版本 2 协议或更高"
-#: transport.c:632
+#: transport.c:727
msgid "could not parse transport.color.* config"
msgstr "不能解析 transport.color.* 配置"
-#: transport.c:705
+#: transport.c:802
msgid "support for protocol v2 not implemented yet"
msgstr "协议 v2 的支持尚未实现"
-#: transport.c:831
+#: transport.c:936
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "配置 '%s' 的取值未知：%s"
-#: transport.c:897
+#: transport.c:1002
#, c-format
msgid "transport '%s' not allowed"
msgstr "传输 '%s' 不允许"
-#: transport.c:949
+#: transport.c:1055
msgid "git-over-rsync is no longer supported"
msgstr "不再支持 git-over-rsync"
-#: transport.c:1044
+#: transport.c:1157
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n"
-#: transport.c:1048
+#: transport.c:1161
#, c-format
msgid ""
"\n"
@@ -8219,205 +8925,31 @@
"以推送至远程。\n"
"\n"
-#: transport.c:1056
+#: transport.c:1169
msgid "Aborting."
msgstr "正在终止。"
-#: transport.c:1201
+#: transport.c:1316
msgid "failed to push all needed submodules"
msgstr "不能推送全部需要的子模组"
-#: transport.c:1345 transport-helper.c:657
-msgid "operation not supported by protocol"
-msgstr "协议不支持该操作"
-
-#: transport-helper.c:61 transport-helper.c:90
-msgid "full write to remote helper failed"
-msgstr "完整写入远程助手失败"
-
-#: transport-helper.c:144
-#, c-format
-msgid "unable to find remote helper for '%s'"
-msgstr "无法为 '%s' 找到远程助手"
-
-#: transport-helper.c:160 transport-helper.c:571
-msgid "can't dup helper output fd"
-msgstr "无法复制助手输出文件句柄"
-
-#: transport-helper.c:211
-#, c-format
-msgid ""
-"unknown mandatory capability %s; this remote helper probably needs newer "
-"version of Git"
-msgstr "未知的强制能力 %s，该远程助手可能需要新版本的Git"
-
-#: transport-helper.c:217
-msgid "this remote helper should implement refspec capability"
-msgstr "远程助手需要实现 refspec 能力"
-
-#: transport-helper.c:284 transport-helper.c:425
-#, c-format
-msgid "%s unexpectedly said: '%s'"
-msgstr "%s 意外地说：'%s'"
-
-#: transport-helper.c:414
-#, c-format
-msgid "%s also locked %s"
-msgstr "%s 也锁定了 %s"
-
-#: transport-helper.c:493
-msgid "couldn't run fast-import"
-msgstr "不能执行 fast-import"
-
-#: transport-helper.c:516
-msgid "error while running fast-import"
-msgstr "执行 fast-import 出错"
-
-#: transport-helper.c:545 transport-helper.c:1134
-#, c-format
-msgid "could not read ref %s"
-msgstr "无法读取引用 %s"
-
-#: transport-helper.c:590
-#, c-format
-msgid "unknown response to connect: %s"
-msgstr "连接时未知的响应：%s"
-
-#: transport-helper.c:612
-msgid "setting remote service path not supported by protocol"
-msgstr "协议不支持设置远程服务路径"
-
-#: transport-helper.c:614
-msgid "invalid remote service path"
-msgstr "无效的远程服务路径"
-
-#: transport-helper.c:660
-#, c-format
-msgid "can't connect to subservice %s"
-msgstr "不能连接到子服务 %s"
-
-#: transport-helper.c:736
-#, c-format
-msgid "expected ok/error, helper said '%s'"
-msgstr "预期 ok/error，助手说 '%s'"
-
-#: transport-helper.c:789
-#, c-format
-msgid "helper reported unexpected status of %s"
-msgstr "助手报告 %s 的意外状态"
-
-#: transport-helper.c:850
-#, c-format
-msgid "helper %s does not support dry-run"
-msgstr "助手 %s 不支持 dry-run"
-
-#: transport-helper.c:853
-#, c-format
-msgid "helper %s does not support --signed"
-msgstr "助手 %s 不支持 --signed"
-
-#: transport-helper.c:856
-#, c-format
-msgid "helper %s does not support --signed=if-asked"
-msgstr "助手 %s 不支持 --signed=if-asked"
-
-#: transport-helper.c:861
-#, c-format
-msgid "helper %s does not support --atomic"
-msgstr "助手 %s 不支持 --atomic"
-
-#: transport-helper.c:867
-#, c-format
-msgid "helper %s does not support 'push-option'"
-msgstr "助手 %s 不支持 'push-option'"
-
-#: transport-helper.c:965
-msgid "remote-helper doesn't support push; refspec needed"
-msgstr "remote-heper 不支持 push，需要引用表达式"
-
-#: transport-helper.c:970
-#, c-format
-msgid "helper %s does not support 'force'"
-msgstr "助手 %s 不支持 'force'"
-
-#: transport-helper.c:1017
-msgid "couldn't run fast-export"
-msgstr "无法执行 fast-export"
-
-#: transport-helper.c:1022
-msgid "error while running fast-export"
-msgstr "执行 fast-export 时出错"
-
-#: transport-helper.c:1047
-#, c-format
-msgid ""
-"No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch such as 'master'.\n"
-msgstr ""
-"没有共同的引用并且也没有指定，什么也不会做。\n"
-"可能您应该指定一个分支如 'master'。\n"
-
-#: transport-helper.c:1120
-#, c-format
-msgid "malformed response in ref list: %s"
-msgstr "引用列表中格式错误的响应：%s"
-
-#: transport-helper.c:1272
-#, c-format
-msgid "read(%s) failed"
-msgstr "读取（%s）失败"
-
-#: transport-helper.c:1299
-#, c-format
-msgid "write(%s) failed"
-msgstr "写（%s）失败"
-
-#: transport-helper.c:1348
-#, c-format
-msgid "%s thread failed"
-msgstr "%s 线程失败"
-
-#: transport-helper.c:1352
-#, c-format
-msgid "%s thread failed to join: %s"
-msgstr "%s 线程等待失败：%s"
-
-#: transport-helper.c:1371 transport-helper.c:1375
-#, c-format
-msgid "can't start thread for copying data: %s"
-msgstr "不能启动线程来拷贝数据：%s"
-
-#: transport-helper.c:1412
-#, c-format
-msgid "%s process failed to wait"
-msgstr "%s 进程等待失败"
-
-#: transport-helper.c:1416
-#, c-format
-msgid "%s process failed"
-msgstr "%s 进程失败"
-
-#: transport-helper.c:1434 transport-helper.c:1443
-msgid "can't start thread for copying data"
-msgstr "不能启动线程来拷贝数据"
-
-#: tree-walk.c:32
+#: tree-walk.c:33
msgid "too-short tree object"
msgstr "太短的树对象"
-#: tree-walk.c:38
+#: tree-walk.c:39
msgid "malformed mode in tree entry"
msgstr "树对象中的条目模式错误"
-#: tree-walk.c:42
+#: tree-walk.c:43
msgid "empty filename in tree entry"
msgstr "树对象条目中空的文件名"
-#: tree-walk.c:117
+#: tree-walk.c:118
msgid "too-short tree file"
msgstr "太短的树文件"
-#: unpack-trees.c:110
+#: unpack-trees.c:113
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -8426,7 +8958,7 @@
"您对下列文件的本地修改将被检出操作覆盖：\n"
"%%s请在切换分支前提交或贮藏您的修改。"
-#: unpack-trees.c:112
+#: unpack-trees.c:115
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -8435,7 +8967,7 @@
"您对下列文件的本地修改将被检出操作覆盖：\n"
"%%s"
-#: unpack-trees.c:115
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -8444,7 +8976,7 @@
"您对下列文件的本地修改将被合并操作覆盖：\n"
"%%s请在合并前提交或贮藏您的修改。"
-#: unpack-trees.c:117
+#: unpack-trees.c:120
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -8453,7 +8985,7 @@
"您对下列文件的本地修改将被合并操作覆盖：\n"
"%%s"
-#: unpack-trees.c:120
+#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -8462,7 +8994,7 @@
"您对下列文件的本地修改将被 %s 覆盖：\n"
"%%s请在 %s 之前提交或贮藏您的修改。"
-#: unpack-trees.c:122
+#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -8471,7 +9003,7 @@
"您对下列文件的本地修改将被 %s 覆盖：\n"
"%%s"
-#: unpack-trees.c:127
+#: unpack-trees.c:130
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -8480,7 +9012,7 @@
"更新如下目录将会丢失其中未跟踪的文件：\n"
"%s"
-#: unpack-trees.c:131
+#: unpack-trees.c:134
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -8489,7 +9021,7 @@
"工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"
"%%s请在切换分支之前移动或删除。"
-#: unpack-trees.c:133
+#: unpack-trees.c:136
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -8498,7 +9030,7 @@
"工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"
"%%s"
-#: unpack-trees.c:136
+#: unpack-trees.c:139
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -8507,7 +9039,7 @@
"工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"
"%%s请在合并前移动或删除。"
-#: unpack-trees.c:138
+#: unpack-trees.c:141
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -8516,7 +9048,7 @@
"工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"
"%%s"
-#: unpack-trees.c:141
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -8525,7 +9057,7 @@
"工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"
"%%s请在 %s 前移动或删除。"
-#: unpack-trees.c:143
+#: unpack-trees.c:146
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -8534,7 +9066,7 @@
"工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"
"%%s"
-#: unpack-trees.c:149
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -8544,7 +9076,7 @@
"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"
"%%s请在切换分支前移动或删除。"
-#: unpack-trees.c:151
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -8554,7 +9086,7 @@
"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"
"%%s"
-#: unpack-trees.c:154
+#: unpack-trees.c:157
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -8563,7 +9095,7 @@
"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"
"%%s请在合并前移动或删除。"
-#: unpack-trees.c:156
+#: unpack-trees.c:159
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -8572,7 +9104,7 @@
"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"
"%%s"
-#: unpack-trees.c:159
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -8581,7 +9113,7 @@
"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"
"%%s请在 %s 前移动或删除。"
-#: unpack-trees.c:161
+#: unpack-trees.c:164
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -8590,41 +9122,12 @@
"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"
"%%s"
-#: unpack-trees.c:169
+#: unpack-trees.c:172
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
-#: unpack-trees.c:172
-#, c-format
-msgid ""
-"Cannot update sparse checkout: the following entries are not up to date:\n"
-"%s"
-msgstr ""
-"无法更新稀疏检出：如下条目不是最新：\n"
-"%s"
-
-#: unpack-trees.c:174
-#, c-format
-msgid ""
-"The following working tree files would be overwritten by sparse checkout "
-"update:\n"
-"%s"
-msgstr ""
-"工作区中下列文件将被稀疏检出更新所覆盖：\n"
-"%s"
-
-#: unpack-trees.c:176
-#, c-format
-msgid ""
-"The following working tree files would be removed by sparse checkout "
-"update:\n"
-"%s"
-msgstr ""
-"工作区中下列文件将被稀疏检出更新所删除：\n"
-"%s"
-
-#: unpack-trees.c:178
+#: unpack-trees.c:175
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -8633,16 +9136,52 @@
"无法更新子模组：\n"
"%s"
-#: unpack-trees.c:255
+#: 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:317
+#: 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:349
+#: 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"
@@ -8651,10 +9190,14 @@
"以下路径发生碰撞（如：在不区分大小写的文件系统上的区分大小写的路径），\n"
"并且碰撞组中只有一个文件存在工作区中：\n"
-#: unpack-trees.c:1445
+#: unpack-trees.c:1498
msgid "Updating index flags"
msgstr "正在更新索引标志"
+#: upload-pack.c:1543
+msgid "expected flush after fetch arguments"
+msgstr "在 fetch 参数之后应该有一个 flush 包"
+
#: urlmatch.c:163
msgid "invalid URL scheme name or missing '://' suffix"
msgstr "无效的 URL 方案名称或丢失 '://' 后缀"
@@ -8688,27 +9231,27 @@
msgid "Fetching objects"
msgstr "正在获取对象"
-#: worktree.c:259 builtin/am.c:2099
+#: worktree.c:238 builtin/am.c:2103
#, c-format
msgid "failed to read '%s'"
msgstr "读取 '%s' 失败"
-#: worktree.c:305
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "在主工作区的 '%s' 不是仓库目录"
-#: worktree.c:316
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr "文件 '%s' 不包含工作区的绝对路径"
-#: worktree.c:328
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' 不存在"
-#: worktree.c:334
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "'%s' 不是一个 .git 文件，错误码 %d"
@@ -8718,17 +9261,83 @@
msgid "'%s' does not point back to '%s'"
msgstr "'%s' 没有指回到 '%s'"
-#: wrapper.c:186 wrapper.c:356
+#: worktree.c:608
+msgid "not a directory"
+msgstr "不是一个目录"
+
+#: worktree.c:617
+msgid ".git is not a file"
+msgstr ".git 不是一个文件"
+
+#: worktree.c:619
+msgid ".git file broken"
+msgstr ".git 文件损坏"
+
+#: worktree.c:621
+msgid ".git file incorrect"
+msgstr ".git 文件不正确"
+
+#: worktree.c:727
+msgid "not a valid path"
+msgstr "不是一个有效的路径"
+
+#: worktree.c:733
+msgid "unable to locate repository; .git is not a file"
+msgstr "无法定位仓库，.git 不是一个文件"
+
+#: worktree.c:737
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr "无法定位仓库，.git 文件没有指向一个仓库"
+
+#: worktree.c:741
+msgid "unable to locate repository; .git file broken"
+msgstr "无法定位仓库，.git 文件损坏"
+
+#: worktree.c:747
+msgid "gitdir unreadable"
+msgstr "gitdir 不可读"
+
+#: worktree.c:751
+msgid "gitdir incorrect"
+msgstr "gitdir 不正确"
+
+#: worktree.c:776
+msgid "not a valid directory"
+msgstr "不是一个有效的目录"
+
+#: worktree.c:782
+msgid "gitdir file does not exist"
+msgstr "gitdir 文件不存在"
+
+#: worktree.c:787 worktree.c:796
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "无法读取 gitdir 文件（%s）"
+
+#: worktree.c:806
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr "读取过短（期望 %<PRIuMAX> 字节，读取 %<PRIuMAX>）"
+
+#: worktree.c:814
+msgid "invalid gitdir file"
+msgstr "无效的 gitdir 文件"
+
+#: worktree.c:822
+msgid "gitdir file points to non-existent location"
+msgstr "gitdir 文件指向一个不存在的位置"
+
+#: wrapper.c:197 wrapper.c:367
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "无法打开 '%s' 进行读写"
-#: wrapper.c:387 wrapper.c:588
+#: wrapper.c:398 wrapper.c:599
#, c-format
msgid "unable to access '%s'"
msgstr "不能访问 '%s'"
-#: wrapper.c:596
+#: wrapper.c:607
msgid "unable to get current working directory"
msgstr "不能获取当前工作目录"
@@ -8767,11 +9376,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:1072
msgid "Changes to be committed:"
msgstr "要提交的变更："
-#: wt-status.c:234 wt-status.c:1083
+#: wt-status.c:234 wt-status.c:1081
msgid "Changes not staged for commit:"
msgstr "尚未暂存以备提交的变更："
@@ -8802,97 +9411,97 @@
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:905
#, 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:936
msgid "Submodules changed but not updated:"
msgstr "子模组已修改但尚未更新："
-#: wt-status.c:940
+#: wt-status.c:938
msgid "Submodule changes to be committed:"
msgstr "要提交的子模组变更："
-#: wt-status.c:1022
+#: wt-status.c:1020
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
@@ -8900,7 +9509,7 @@
"不要改动或删除上面的一行。\n"
"其下所有内容都将被忽略。"
-#: wt-status.c:1114
+#: wt-status.c:1112
#, c-format
msgid ""
"\n"
@@ -8911,77 +9520,77 @@
"花了 %.2f 秒才计算出分支的领先/落后范围。\n"
"为避免，您可以使用 '--no-ahead-behind'。\n"
-#: wt-status.c:1144
+#: wt-status.c:1142
msgid "You have unmerged paths."
msgstr "您有尚未合并的路径。"
# 译者：注意保持前导空格
-#: wt-status.c:1147
+#: wt-status.c:1145
msgid " (fix conflicts and run \"git commit\")"
msgstr " （解决冲突并运行 \"git commit\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1149
+#: wt-status.c:1147
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " （使用 \"git merge --abort\" 终止合并）"
-#: wt-status.c:1153
+#: wt-status.c:1151
msgid "All conflicts fixed but you are still merging."
msgstr "所有冲突已解决但您仍处于合并中。"
# 译者：注意保持前导空格
-#: wt-status.c:1156
+#: wt-status.c:1154
msgid " (use \"git commit\" to conclude merge)"
msgstr " （使用 \"git commit\" 结束合并）"
-#: wt-status.c:1165
+#: wt-status.c:1163
msgid "You are in the middle of an am session."
msgstr "您正处于 am 操作过程中。"
-#: wt-status.c:1168
+#: wt-status.c:1166
msgid "The current patch is empty."
msgstr "当前的补丁为空。"
# 译者：注意保持前导空格
-#: wt-status.c:1172
+#: wt-status.c:1170
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " （解决冲突，然后运行 \"git am --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1174
+#: wt-status.c:1172
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " （使用 \"git am --skip\" 跳过此补丁）"
# 译者：注意保持前导空格
-#: wt-status.c:1176
+#: wt-status.c:1174
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " （使用 \"git am --abort\" 恢复原有分支）"
-#: wt-status.c:1309
+#: wt-status.c:1307
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo 丢失。"
-#: wt-status.c:1311
+#: wt-status.c:1309
msgid "No commands done."
msgstr "没有命令被执行。"
-#: 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] "最后一条命令已完成（%d 条命令被执行）："
msgstr[1] "最后的命令已完成（%d 条命令被执行）："
-#: wt-status.c:1325
+#: wt-status.c:1323
#, c-format
msgid " (see more in file %s)"
msgstr " （更多参见文件 %s）"
-#: wt-status.c:1330
+#: wt-status.c:1328
msgid "No commands remaining."
msgstr "未剩下任何命令。"
-#: 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):"
@@ -8989,189 +9598,202 @@
msgstr[1] "接下来要执行的命令（剩余 %d 条命令）："
# 译者：注意保持前导空格
-#: wt-status.c:1341
+#: wt-status.c:1339
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " （使用 \"git rebase --edit-todo\" 来查看和编辑）"
-#: wt-status.c:1353
+#: wt-status.c:1351
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
-#: wt-status.c:1358
+#: wt-status.c:1356
msgid "You are currently rebasing."
msgstr "您在执行变基操作。"
# 译者：注意保持前导空格
-#: wt-status.c:1371
+#: wt-status.c:1369
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " （解决冲突，然后运行 \"git rebase --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1373
+#: wt-status.c:1371
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " （使用 \"git rebase --skip\" 跳过此补丁）"
# 译者：注意保持前导空格
-#: wt-status.c:1375
+#: wt-status.c:1373
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " （使用 \"git rebase --abort\" 以检出原有分支）"
# 译者：注意保持前导空格
-#: wt-status.c:1382
+#: wt-status.c:1380
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " （所有冲突已解决：运行 \"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'."
msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
-#: wt-status.c:1391
+#: wt-status.c:1389
msgid "You are currently splitting a commit during a rebase."
msgstr "您在执行变基操作时拆分提交。"
# 译者：注意保持前导空格
-#: wt-status.c:1394
+#: wt-status.c:1392
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr " （一旦您工作目录提交干净后，运行 \"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 "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
-#: wt-status.c:1403
+#: wt-status.c:1401
msgid "You are currently editing a commit during a rebase."
msgstr "您在执行变基操作时编辑提交。"
# 译者：注意保持前导空格
-#: wt-status.c:1406
+#: wt-status.c:1404
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " （使用 \"git commit --amend\" 修补当前提交）"
# 译者：注意保持前导空格
-#: wt-status.c:1408
+#: wt-status.c:1406
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）"
-#: wt-status.c:1419
+#: wt-status.c:1417
msgid "Cherry-pick currently in progress."
msgstr "拣选操作正在进行中。"
-#: wt-status.c:1422
+#: wt-status.c:1420
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "您在执行拣选提交 %s 的操作。"
# 译者：注意保持前导空格
-#: wt-status.c:1429
+#: wt-status.c:1427
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1432
+#: wt-status.c:1430
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " （执行 \"git cherry-pick --continue\" 以继续）"
# 译者：注意保持前导空格
-#: wt-status.c:1435
+#: wt-status.c:1433
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1437
+#: wt-status.c:1435
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
msgstr " （使用 \"git cherry-pick --skip\" 跳过此补丁）"
# 译者：注意保持前导空格
-#: wt-status.c:1439
+#: wt-status.c:1437
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）"
-#: wt-status.c:1449
+#: wt-status.c:1447
msgid "Revert currently in progress."
msgstr "还原操作正在行中。"
-#: wt-status.c:1452
+#: wt-status.c:1450
#, c-format
msgid "You are currently reverting commit %s."
msgstr "您在执行反转提交 %s 的操作。"
# 译者：注意保持前导空格
-#: wt-status.c:1458
+#: wt-status.c:1456
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " （解决冲突并执行 \"git revert --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1461
+#: wt-status.c:1459
msgid " (run \"git revert --continue\" to continue)"
msgstr " （执行 \"git revert --continue\" 以继续）"
# 译者：注意保持前导空格
-#: wt-status.c:1464
+#: wt-status.c:1462
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " （所有冲突已解决：执行 \"git revert --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1466
+#: wt-status.c:1464
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr " （使用 \"git revert --skip\" 跳过此补丁）"
# 译者：注意保持前导空格
-#: wt-status.c:1468
+#: wt-status.c:1466
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）"
-#: wt-status.c:1478
+#: wt-status.c:1476
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
-#: wt-status.c:1482
+#: wt-status.c:1480
msgid "You are currently bisecting."
msgstr "您在执行二分查找操作。"
# 译者：注意保持前导空格
-#: wt-status.c:1485
+#: wt-status.c:1483
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " （使用 \"git bisect reset\" 以回到原有分支）"
-#: wt-status.c:1694
+#: wt-status.c:1494
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr "您处于稀疏签出状态，包含 %d%% 的跟踪文件"
+
+#: wt-status.c:1733
msgid "On branch "
msgstr "位于分支 "
-#: wt-status.c:1701
+#: wt-status.c:1740
msgid "interactive rebase in progress; onto "
msgstr "交互式变基操作正在进行中；至 "
-#: wt-status.c:1703
+#: wt-status.c:1742
msgid "rebase in progress; onto "
msgstr "变基操作正在进行中；至 "
-#: wt-status.c:1713
+#: wt-status.c:1747
+msgid "HEAD detached at "
+msgstr "头指针分离于 "
+
+#: wt-status.c:1749
+msgid "HEAD detached from "
+msgstr "头指针分离自 "
+
+#: wt-status.c:1752
msgid "Not currently on any branch."
msgstr "当前不在任何分支上。"
-#: wt-status.c:1730
+#: wt-status.c:1769
msgid "Initial commit"
msgstr "初始提交"
-#: wt-status.c:1731
+#: wt-status.c:1770
msgid "No commits yet"
msgstr "尚无提交"
-#: wt-status.c:1745
+#: wt-status.c:1784
msgid "Untracked files"
msgstr "未跟踪的文件"
-#: wt-status.c:1747
+#: wt-status.c:1786
msgid "Ignored files"
msgstr "忽略的文件"
-#: wt-status.c:1751
+#: wt-status.c:1790
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -9181,102 +9803,102 @@
"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n"
"但您需要小心不要忘了添加新文件（参见 'git help status'）。"
-#: wt-status.c:1757
+#: wt-status.c:1796
#, c-format
msgid "Untracked files not listed%s"
msgstr "未跟踪的文件没有列出%s"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1759
+#: wt-status.c:1798
msgid " (use -u option to show untracked files)"
msgstr "（使用 -u 参数显示未跟踪的文件）"
-#: wt-status.c:1765
+#: wt-status.c:1804
msgid "No changes"
msgstr "没有修改"
-#: wt-status.c:1770
+#: wt-status.c:1809
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n"
-#: wt-status.c:1773
+#: wt-status.c:1813
#, c-format
msgid "no changes added to commit\n"
msgstr "修改尚未加入提交\n"
-#: wt-status.c:1776
+#: wt-status.c:1817
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"
-#: wt-status.c:1779
+#: wt-status.c:1821
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "提交为空，但是存在尚未跟踪的文件\n"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1782
+#: wt-status.c:1825
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n"
-#: wt-status.c:1785 wt-status.c:1790
+#: wt-status.c:1829 wt-status.c:1835
#, c-format
msgid "nothing to commit\n"
msgstr "无文件要提交\n"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1788
+#: wt-status.c:1832
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1792
+#: wt-status.c:1837
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "无文件要提交，干净的工作区\n"
-#: wt-status.c:1905
+#: wt-status.c:1942
msgid "No commits yet on "
msgstr "尚无提交在 "
-#: wt-status.c:1909
+#: wt-status.c:1946
msgid "HEAD (no branch)"
msgstr "HEAD（非分支）"
-#: wt-status.c:1940
+#: wt-status.c:1977
msgid "different"
msgstr "不同"
# 译者：注意保持句尾空格
-#: wt-status.c:1942 wt-status.c:1950
+#: wt-status.c:1979 wt-status.c:1987
msgid "behind "
msgstr "落后 "
-#: wt-status.c:1945 wt-status.c:1948
+#: wt-status.c:1982 wt-status.c:1985
msgid "ahead "
msgstr "领先 "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2470
+#: wt-status.c:2507
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "不能%s：您有未暂存的变更。"
-#: wt-status.c:2476
+#: wt-status.c:2513
msgid "additionally, your index contains uncommitted changes."
msgstr "另外，您的索引中包含未提交的变更。"
-#: wt-status.c:2478
+#: wt-status.c:2515
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "不能%s：您的索引中包含未提交的变更。"
-#: compat/precompose_utf8.c:58 builtin/clone.c:455
+#: compat/precompose_utf8.c:58 builtin/clone.c:457
#, c-format
msgid "failed to unlink '%s'"
msgstr "删除 '%s' 失败"
@@ -9285,126 +9907,131 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<选项>] [--] <路径规格>..."
-#: builtin/add.c:88
+#: builtin/add.c:58
+#, c-format
+msgid "cannot chmod %cx '%s'"
+msgstr "不能 chmod %cx '%s'"
+
+#: builtin/add.c:96
#, c-format
msgid "unexpected diff status %c"
msgstr "意外的差异状态 %c"
-#: builtin/add.c:93 builtin/commit.c:288
+#: builtin/add.c:101 builtin/commit.c:285
msgid "updating files failed"
msgstr "更新文件失败"
-#: builtin/add.c:103
+#: builtin/add.c:111
#, c-format
msgid "remove '%s'\n"
msgstr "删除 '%s'\n"
-#: builtin/add.c:178
+#: builtin/add.c:186
msgid "Unstaged changes after refreshing the index:"
msgstr "刷新索引之后尚未被暂存的变更："
-#: builtin/add.c:266 builtin/rev-parse.c:899
+#: builtin/add.c:280 builtin/rev-parse.c:991
msgid "Could not read the index"
msgstr "不能读取索引"
-#: builtin/add.c:277
+#: builtin/add.c:291
#, c-format
msgid "Could not open '%s' for writing."
msgstr "无法为写入打开 '%s'。"
-#: builtin/add.c:281
+#: builtin/add.c:295
msgid "Could not write patch"
msgstr "不能生成补丁"
-#: builtin/add.c:284
+#: builtin/add.c:298
msgid "editing patch failed"
msgstr "编辑补丁失败"
-#: builtin/add.c:287
+#: builtin/add.c:301
#, c-format
msgid "Could not stat '%s'"
msgstr "不能对 '%s' 调用 stat"
-#: builtin/add.c:289
+#: builtin/add.c:303
msgid "Empty patch. Aborted."
msgstr "空补丁。异常终止。"
-#: builtin/add.c:294
+#: builtin/add.c:308
#, c-format
msgid "Could not apply '%s'"
msgstr "不能应用 '%s'"
-#: builtin/add.c:302
+#: builtin/add.c:316
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
-#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548
-#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
+#: builtin/add.c:336 builtin/clean.c:904 builtin/fetch.c:169 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559
+#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190
msgid "dry run"
msgstr "演习"
-#: builtin/add.c:325
+#: builtin/add.c:339
msgid "interactive picking"
msgstr "交互式拣选"
-#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307
+#: builtin/add.c:340 builtin/checkout.c:1546 builtin/reset.c:308
msgid "select hunks interactively"
msgstr "交互式挑选数据块"
-#: builtin/add.c:327
+#: builtin/add.c:341
msgid "edit current diff and apply"
msgstr "编辑当前差异并应用"
-#: builtin/add.c:328
+#: builtin/add.c:342
msgid "allow adding otherwise ignored files"
msgstr "允许添加忽略的文件"
-#: builtin/add.c:329
+#: builtin/add.c:343
msgid "update tracked files"
msgstr "更新已跟踪的文件"
-#: builtin/add.c:330
+#: builtin/add.c:344
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "对已跟踪文件（暗含 -u）重新归一换行符"
-#: builtin/add.c:331
+#: builtin/add.c:345
msgid "record only the fact that the path will be added later"
msgstr "只记录，该路径稍后再添加"
-#: builtin/add.c:332
+#: builtin/add.c:346
msgid "add changes from all tracked and untracked files"
msgstr "添加所有改变的已跟踪文件和未跟踪文件"
-#: builtin/add.c:335
+#: builtin/add.c:349
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "忽略工作区中移除的路径（和 --no-all 相同）"
-#: builtin/add.c:337
+#: builtin/add.c:351
msgid "don't add, only refresh the index"
msgstr "不添加，只刷新索引"
-#: builtin/add.c:338
+#: builtin/add.c:352
msgid "just skip files which cannot be added because of errors"
msgstr "跳过因出错不能添加的文件"
-#: builtin/add.c:339
+#: builtin/add.c:353
msgid "check if - even missing - files are ignored in dry run"
msgstr "检查在演习模式下文件（即使不存在）是否被忽略"
-#: builtin/add.c:341 builtin/update-index.c:1004
+#: builtin/add.c:355 builtin/update-index.c:1004
msgid "override the executable bit of the listed files"
msgstr "覆盖列表里文件的可执行位"
-#: builtin/add.c:343
+#: builtin/add.c:357
msgid "warn when adding an embedded repository"
msgstr "创建一个嵌入式仓库时给予警告"
-#: builtin/add.c:345
+#: builtin/add.c:359
msgid "backend for `git stash -p`"
msgstr "`git stash -p` 的后端"
-#: builtin/add.c:363
+#: builtin/add.c:377
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -9432,12 +10059,12 @@
"\n"
"参见 \"git help submodule\" 获取更多信息。"
-#: builtin/add.c:391
+#: builtin/add.c:405
#, c-format
msgid "adding embedded git repository: %s"
msgstr "正在添加嵌入式 git 仓库：%s"
-#: builtin/add.c:410
+#: builtin/add.c:424
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
@@ -9447,47 +10074,47 @@
"运行下面的命令来关闭本消息\n"
"\"git config advice.addIgnoredFile false\""
-#: builtin/add.c:419
+#: builtin/add.c:433
msgid "adding files failed"
msgstr "添加文件失败"
-#: builtin/add.c:447 builtin/commit.c:348
+#: builtin/add.c:461 builtin/commit.c:345
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
msgstr "--pathspec-from-file 与 --interactive/--patch 不兼容"
-#: builtin/add.c:464
+#: builtin/add.c:478
msgid "--pathspec-from-file is incompatible with --edit"
msgstr "--pathspec-from-file 与 --edit 不兼容"
-#: builtin/add.c:476
+#: builtin/add.c:490
msgid "-A and -u are mutually incompatible"
msgstr "-A 和 -u 选项互斥"
-#: builtin/add.c:479
+#: builtin/add.c:493
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
-#: builtin/add.c:483
+#: builtin/add.c:497
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
-#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354
-#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509
+#: builtin/add.c:515 builtin/checkout.c:1714 builtin/commit.c:351
+#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1569
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr "--pathspec-from-file 与路径表达式参数不兼容"
-#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360
-#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515
+#: builtin/add.c:522 builtin/checkout.c:1726 builtin/commit.c:357
+#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1575
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr "--pathspec-file-nul 需要 --pathspec-from-file"
-#: builtin/add.c:512
+#: builtin/add.c:526
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "没有指定文件，也没有文件被添加。\n"
-#: builtin/add.c:514
+#: builtin/add.c:528
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
@@ -9545,7 +10172,7 @@
msgid "Patch format detection failed."
msgstr "补丁格式探测失败。"
-#: builtin/am.c:953 builtin/clone.c:409
+#: builtin/am.c:953 builtin/clone.c:410
#, c-format
msgid "failed to create directory '%s'"
msgstr "创建目录 '%s' 失败"
@@ -9615,12 +10242,12 @@
msgid "applying to an empty history"
msgstr "正应用到一个空历史上"
-#: builtin/am.c:1621 builtin/am.c:1625
+#: builtin/am.c:1626 builtin/am.c:1630
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "无法继续：%s 不存在。"
-#: builtin/am.c:1643
+#: builtin/am.c:1648
msgid "Commit Body is:"
msgstr "提交内容为："
@@ -9629,39 +10256,39 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1653
+#: builtin/am.c:1658
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]："
-#: builtin/am.c:1700 builtin/commit.c:398
+#: builtin/am.c:1704 builtin/commit.c:395
msgid "unable to write index file"
msgstr "无法写入索引文件"
-#: builtin/am.c:1704
+#: builtin/am.c:1708
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "脏索引：不能应用补丁（脏文件：%s）"
-#: builtin/am.c:1744 builtin/am.c:1812
+#: builtin/am.c:1748 builtin/am.c:1816
#, c-format
msgid "Applying: %.*s"
msgstr "应用：%.*s"
-#: builtin/am.c:1761
+#: builtin/am.c:1765
msgid "No changes -- Patch already applied."
msgstr "没有变更 —— 补丁已经应用过。"
-#: builtin/am.c:1767
+#: builtin/am.c:1771
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "打补丁失败于 %s %.*s"
-#: builtin/am.c:1771
+#: builtin/am.c:1775
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr "用 'git am --show-current-patch=diff' 命令查看失败的补丁"
-#: builtin/am.c:1815
+#: builtin/am.c:1819
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -9671,7 +10298,7 @@
"如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"
"您也许想要跳过这个补丁。"
-#: builtin/am.c:1822
+#: builtin/am.c:1826
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -9682,169 +10309,171 @@
"您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"
"你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
-#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346
-#: builtin/reset.c:354
+#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 builtin/reset.c:347
+#: builtin/reset.c:355
#, c-format
msgid "Could not parse object '%s'."
msgstr "不能解析对象 '%s'。"
-#: builtin/am.c:1981
+#: builtin/am.c:1985
msgid "failed to clean index"
msgstr "清空索引失败"
-#: builtin/am.c:2025
+#: builtin/am.c:2029
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
-#: builtin/am.c:2132
+#: builtin/am.c:2136
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "无效的 --patch-format 值：%s"
-#: builtin/am.c:2172
+#: builtin/am.c:2178
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr "无效的 --show-current-patch 值：%s"
-#: builtin/am.c:2176
+#: builtin/am.c:2182
#, c-format
msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
msgstr "--show-current-patch=%s 和 --show-current-patch=%s 不兼容"
-#: builtin/am.c:2207
+#: builtin/am.c:2213
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2208
+#: builtin/am.c:2214
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<选项>] (--continue | --skip | --abort)"
-#: builtin/am.c:2214
+#: builtin/am.c:2220
msgid "run interactively"
msgstr "以交互式方式运行"
-#: builtin/am.c:2216
+#: builtin/am.c:2222
msgid "historical option -- no-op"
msgstr "老的参数 —— 无作用"
-#: builtin/am.c:2218
+#: builtin/am.c:2224
msgid "allow fall back on 3way merging if needed"
msgstr "如果必要，允许使用三方合并。"
-#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:304 builtin/stash.c:812
+#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16
+#: builtin/repack.c:334 builtin/stash.c:882
msgid "be quiet"
msgstr "静默模式"
-#: builtin/am.c:2221
-msgid "add a Signed-off-by line to the commit message"
-msgstr "在提交说明中添加一个 Signed-off-by 签名"
+#: builtin/am.c:2227
+msgid "add a Signed-off-by trailer to the commit message"
+msgstr "在提交说明中添加 Signed-off-by 尾注"
-#: builtin/am.c:2224
+#: builtin/am.c:2230
msgid "recode into utf8 (default)"
msgstr "使用 utf8 字符集（默认）"
-#: builtin/am.c:2226
+#: builtin/am.c:2232
msgid "pass -k flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -k 参数"
-#: builtin/am.c:2228
+#: builtin/am.c:2234
msgid "pass -b flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -b 参数"
-#: builtin/am.c:2230
+#: builtin/am.c:2236
msgid "pass -m flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -m 参数"
-#: builtin/am.c:2232
+#: builtin/am.c:2238
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数"
-#: builtin/am.c:2235
+#: builtin/am.c:2241
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置"
-#: builtin/am.c:2238
+#: builtin/am.c:2244
msgid "strip everything before a scissors line"
msgstr "丢弃裁切线前的所有内容"
-#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249
-#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261
-#: builtin/am.c:2267
+#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
+#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
+#: builtin/am.c:2273
msgid "pass it through git-apply"
msgstr "传递给 git-apply"
-#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670
-#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250
-#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505
-#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321
-#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:154 parse-options.h:175 parse-options.h:316
+#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:904 builtin/merge.c:261
+#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
+#: builtin/rebase.c:1347 builtin/repack.c:345 builtin/repack.c:349
+#: builtin/repack.c:351 builtin/show-branch.c:650 builtin/show-ref.c:172
+#: builtin/tag.c:436 parse-options.h:154 parse-options.h:175
+#: parse-options.h:316
msgid "n"
msgstr "n"
-#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38
+#: builtin/am.c:2269 builtin/branch.c:670 builtin/bugreport.c:136
+#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:470
+#: builtin/verify-tag.c:38
msgid "format"
msgstr "格式"
-#: builtin/am.c:2264
+#: builtin/am.c:2270
msgid "format the patch(es) are in"
msgstr "补丁的格式"
-#: builtin/am.c:2270
+#: builtin/am.c:2276
msgid "override error message when patch failure occurs"
msgstr "打补丁失败时显示的错误信息"
-#: builtin/am.c:2272
+#: builtin/am.c:2278
msgid "continue applying patches after resolving a conflict"
msgstr "冲突解决后继续应用补丁"
-#: builtin/am.c:2275
+#: builtin/am.c:2281
msgid "synonyms for --continue"
msgstr "和 --continue 同义"
-#: builtin/am.c:2278
+#: builtin/am.c:2284
msgid "skip the current patch"
msgstr "跳过当前补丁"
-#: builtin/am.c:2281
-msgid "restore the original branch and abort the patching operation."
-msgstr "恢复原始分支并终止打补丁操作。"
+#: builtin/am.c:2287
+msgid "restore the original branch and abort the patching operation"
+msgstr "恢复原始分支并终止打补丁操作"
-#: builtin/am.c:2284
-msgid "abort the patching operation but keep HEAD where it is."
-msgstr "终止补丁操作但保持 HEAD 不变。"
+#: builtin/am.c:2290
+msgid "abort the patching operation but keep HEAD where it is"
+msgstr "终止补丁操作但保持 HEAD 不变"
-#: builtin/am.c:2288
+#: builtin/am.c:2294
msgid "show the patch being applied"
msgstr "显示正在应用的补丁"
-#: builtin/am.c:2293
+#: builtin/am.c:2299
msgid "lie about committer date"
msgstr "将作者日期作为提交日期"
-#: builtin/am.c:2295
+#: builtin/am.c:2301
msgid "use current timestamp for author date"
msgstr "用当前时间作为作者日期"
-#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512
-#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517
-#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418
+#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515
+#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:538
+#: builtin/rebase.c:1400 builtin/revert.c:117 builtin/tag.c:451
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
+#: builtin/am.c:2304 builtin/rebase.c:539 builtin/rebase.c:1401
msgid "GPG-sign commits"
msgstr "使用 GPG 签名提交"
-#: builtin/am.c:2301
+#: builtin/am.c:2307
msgid "(internal use for git-rebase)"
msgstr "（内部使用，用于 git-rebase）"
-#: builtin/am.c:2319
+#: builtin/am.c:2325
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
@@ -9852,16 +10481,16 @@
"参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n"
"请不要再使用它了。"
-#: builtin/am.c:2326
+#: builtin/am.c:2332
msgid "failed to read the index"
msgstr "读取索引失败"
-#: builtin/am.c:2341
+#: builtin/am.c:2347
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。"
-#: builtin/am.c:2365
+#: builtin/am.c:2371
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -9870,11 +10499,11 @@
"发现了错误的 %s 目录。\n"
"使用 \"git am --abort\" 删除它。"
-#: builtin/am.c:2371
+#: builtin/am.c:2377
msgid "Resolve operation not in progress, we are not resuming."
msgstr "解决操作未进行，我们不会继续。"
-#: builtin/am.c:2381
+#: builtin/am.c:2387
msgid "interactive mode requires patches on the command line"
msgstr "交互式模式需要命令行上提供补丁"
@@ -9912,42 +10541,15 @@
msgid "git archive: expected a flush"
msgstr "git archive：应有一个 flush 包"
-#: builtin/bisect--helper.c:22
-msgid "git bisect--helper --next-all [--no-checkout]"
-msgstr "git bisect--helper --next-all [--no-checkout]"
-
#: builtin/bisect--helper.c:23
-msgid "git bisect--helper --write-terms <bad_term> <good_term>"
-msgstr "git bisect--helper --write-terms <坏-术语> <好-术语>"
-
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-clean-state"
-msgstr "git bisect--helper --bisect-clean-state"
-
-#: builtin/bisect--helper.c:25
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --bisect-reset [<提交>]"
-#: builtin/bisect--helper.c:26
-msgid ""
-"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
-"<bad_term>"
-msgstr ""
-"git bisect--helper --bisect-write [--no-log] <状态> <版本> <好-术语> <坏-术语"
-">"
-
-#: builtin/bisect--helper.c:27
-msgid ""
-"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
-"<bad_term>"
-msgstr ""
-"git bisect--helper --bisect-check-and-set-terms <命令> <好-术语> <坏-术语>"
-
-#: builtin/bisect--helper.c:28
+#: builtin/bisect--helper.c:24
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:25
msgid ""
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
"term-new]"
@@ -9955,74 +10557,101 @@
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
"term-new]"
+#: builtin/bisect--helper.c:26
+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:28
+msgid "git bisect--helper --bisect-next"
+msgstr "git bisect--helper --bisect-next"
+
+#: builtin/bisect--helper.c:29
+msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
+msgstr "git bisect--helper --bisect-state (bad|new) [<版本>]"
+
#: builtin/bisect--helper.c:30
-msgid ""
-"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
-"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
-msgstr ""
-"git bisect--helper --bisect-start [--term-{old,good}=<术语> --term-{new,bad}"
-"=<术语>][--no-checkout] [<坏> [<好>...]] [--] [<路径>...]"
+msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
+msgstr "git bisect--helper --bisect-state (good|old) [<版本>...]"
-#: builtin/bisect--helper.c:86
+#: builtin/bisect--helper.c:31
+msgid "git bisect--helper --bisect-replay <filename>"
+msgstr "git bisect--helper --bisect-replay <文件>"
+
+#: builtin/bisect--helper.c:32
+msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
+msgstr "git bisect--helper --bisect-skip [(<版本>|<范围>)...]"
+
+#: builtin/bisect--helper.c:107
+#, c-format
+msgid "cannot open file '%s' in mode '%s'"
+msgstr "不能以 '%2$s' 模式打开文件 '%1$s'"
+
+#: builtin/bisect--helper.c:114
+#, c-format
+msgid "could not write to file '%s'"
+msgstr "不能写入文件 '%s'"
+
+#: builtin/bisect--helper.c:153
#, c-format
msgid "'%s' is not a valid term"
msgstr "'%s' 不是一个有效的术语"
-#: builtin/bisect--helper.c:90
+#: builtin/bisect--helper.c:157
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "不能使用内置命令 '%s' 作为术语"
-#: builtin/bisect--helper.c:100
+#: builtin/bisect--helper.c:167
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "不能修改术语 '%s' 的含义"
-#: builtin/bisect--helper.c:111
+#: builtin/bisect--helper.c:177
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:193
#, c-format
msgid "We are not bisecting.\n"
msgstr "我们没有在二分查找。\n"
-#: builtin/bisect--helper.c:163
+#: builtin/bisect--helper.c:201
#, c-format
msgid "'%s' is not a valid commit"
msgstr "'%s' 不是一个有效的提交"
-#: builtin/bisect--helper.c:172
+#: builtin/bisect--helper.c:210
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
msgstr "不能检出原始 HEAD '%s'。尝试 'git bisect reset <提交>'。"
-#: builtin/bisect--helper.c:216
+#: builtin/bisect--helper.c:254
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr "坏的 bisect_write 参数：%s"
-#: builtin/bisect--helper.c:221
+#: builtin/bisect--helper.c:259
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "无法获取版本 '%s' 的对象 ID"
-#: builtin/bisect--helper.c:233
+#: builtin/bisect--helper.c:271
#, c-format
msgid "couldn't open the file '%s'"
msgstr "无法打开文件 '%s'"
-#: builtin/bisect--helper.c:259
+#: builtin/bisect--helper.c:297
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
msgstr "无效的命令：您当前正处于一个 %s/%s 二分查找中"
-#: builtin/bisect--helper.c:286
+#: builtin/bisect--helper.c:324
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
@@ -10031,7 +10660,7 @@
"您需要给我至少一个 %s 和一个 %s 版本。\n"
"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。"
-#: builtin/bisect--helper.c:290
+#: builtin/bisect--helper.c:328
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -10042,7 +10671,7 @@
"然后需要提供我至少一个 %s 和一个 %s 版本。\n"
"为此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。"
-#: builtin/bisect--helper.c:310
+#: builtin/bisect--helper.c:348
#, c-format
msgid "bisecting only with a %s commit"
msgstr "在只有一个 %s 提交的情况下二分查找"
@@ -10052,22 +10681,22 @@
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:318
+#: builtin/bisect--helper.c:356
msgid "Are you sure [Y/n]? "
msgstr "您确认么[Y/n]？ "
-#: builtin/bisect--helper.c:379
+#: builtin/bisect--helper.c:417
msgid "no terms defined"
msgstr "未定义术语"
-#: builtin/bisect--helper.c:382
+#: builtin/bisect--helper.c:420
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
"and %s for the new state.\n"
msgstr "您当前针对旧状态的术语是 %s，对新状态的术语是 %s。\n"
-#: builtin/bisect--helper.c:392
+#: builtin/bisect--helper.c:430
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
@@ -10076,262 +10705,307 @@
"命令 'git bisect terms' 的参数 %s 无效。\n"
"支持的选项有：--term-good|--term-old 和 --term-bad|--term-new。"
-#: builtin/bisect--helper.c:478
+#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1014
+msgid "revision walk setup failed\n"
+msgstr "版本遍历设置失败\n"
+
+#: builtin/bisect--helper.c:519
+#, c-format
+msgid "could not open '%s' for appending"
+msgstr "无法打开 '%s' 进行追加"
+
+#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651
+msgid "'' is not a valid term"
+msgstr "'' 不是一个有效的术语"
+
+#: builtin/bisect--helper.c:661
#, c-format
msgid "unrecognized option: '%s'"
msgstr "未识别的选项：'%s'"
-#: builtin/bisect--helper.c:482
+#: builtin/bisect--helper.c:665
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "'%s' 看起来不是一个有效的版本"
-#: builtin/bisect--helper.c:514
+#: builtin/bisect--helper.c:696
msgid "bad HEAD - I need a HEAD"
msgstr "坏的 HEAD - 我需要一个 HEAD"
-#: builtin/bisect--helper.c:529
+#: builtin/bisect--helper.c:711
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
msgstr "检出 '%s' 失败。尝试 'git bisect start <有效分支>'。"
-#: builtin/bisect--helper.c:550
+#: builtin/bisect--helper.c:732
msgid "won't bisect on cg-seek'ed tree"
msgstr "不会在做了 cg-seek 的树上做二分查找"
-#: builtin/bisect--helper.c:553
+#: builtin/bisect--helper.c:735
msgid "bad HEAD - strange symbolic ref"
msgstr "坏的 HEAD - 奇怪的符号引用"
-#: builtin/bisect--helper.c:577
+#: builtin/bisect--helper.c:755
#, c-format
msgid "invalid ref: '%s'"
msgstr "无效的引用：'%s'"
-#: builtin/bisect--helper.c:633
-msgid "perform 'git bisect next'"
-msgstr "执行 'git bisect next'"
+#: builtin/bisect--helper.c:813
+msgid "You need to start by \"git bisect start\"\n"
+msgstr "您需要执行 \"git bisect start\" 来开始\n"
-#: builtin/bisect--helper.c:635
-msgid "write the terms to .git/BISECT_TERMS"
-msgstr "将术语写入 .git/BISECT_TERMS"
+# 译者：注意保持句尾空格
+#. 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:824
+msgid "Do you want me to do it for you [Y/n]? "
+msgstr "您想让我为您这样做么[Y/n]？ "
-#: builtin/bisect--helper.c:637
-msgid "cleanup the bisection state"
-msgstr "清除二分查找状态"
+#: builtin/bisect--helper.c:842
+msgid "Please call `--bisect-state` with at least one argument"
+msgstr "请使用至少一个参数调用 `--bisect-state`"
-#: builtin/bisect--helper.c:639
-msgid "check for expected revs"
-msgstr "检查预期的版本"
+#: builtin/bisect--helper.c:855
+#, c-format
+msgid "'git bisect %s' can take only one argument."
+msgstr "'git bisect %s' 只能带一个参数。"
-#: builtin/bisect--helper.c:641
+#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:878
+#, c-format
+msgid "Bad rev input: %s"
+msgstr "坏的版本输入：%s"
+
+#: builtin/bisect--helper.c:912
+msgid "We are not bisecting."
+msgstr "我们没有在二分查找。"
+
+#: builtin/bisect--helper.c:962
+#, c-format
+msgid "'%s'?? what are you talking about?"
+msgstr "'%s'?? 您在说什么?"
+
+#: builtin/bisect--helper.c:974
+#, c-format
+msgid "cannot read file '%s' for replaying"
+msgstr "不能读取文件 '%s' 来重放"
+
+#: builtin/bisect--helper.c:1047
msgid "reset the bisection state"
msgstr "清除二分查找状态"
-#: builtin/bisect--helper.c:643
-msgid "write out the bisection state in BISECT_LOG"
-msgstr "将二分查找的状态写入 BISECT_LOG"
-
-#: builtin/bisect--helper.c:645
-msgid "check and set terms in a bisection state"
-msgstr "在一个二分查找状态中检查和设置术语"
-
-#: builtin/bisect--helper.c:647
+#: builtin/bisect--helper.c:1049
msgid "check whether bad or good terms exist"
msgstr "检查坏的或好的术语是否存在"
-#: builtin/bisect--helper.c:649
+#: builtin/bisect--helper.c:1051
msgid "print out the bisect terms"
msgstr "打印二分查找术语"
-#: builtin/bisect--helper.c:651
+#: builtin/bisect--helper.c:1053
msgid "start the bisect session"
msgstr "启动二分查找过程"
-#: builtin/bisect--helper.c:653
-msgid "update BISECT_HEAD instead of checking out the current commit"
-msgstr "更新 BISECT_HEAD 而非检出当前提交"
+#: builtin/bisect--helper.c:1055
+msgid "find the next bisection commit"
+msgstr "查询下一个二分查找提交"
-#: builtin/bisect--helper.c:655
+#: builtin/bisect--helper.c:1057
+msgid "mark the state of ref (or refs)"
+msgstr "标记引用的状态"
+
+#: builtin/bisect--helper.c:1059
+msgid "list the bisection steps so far"
+msgstr "列出到目前为止的二分查找步骤"
+
+#: builtin/bisect--helper.c:1061
+msgid "replay the bisection process from the given file"
+msgstr "从给定文件重放二分查找进程"
+
+#: builtin/bisect--helper.c:1063
+msgid "skip some commits for checkout"
+msgstr "跳过要检出的一些提交"
+
+#: builtin/bisect--helper.c:1065
msgid "no log for BISECT_WRITE"
msgstr "BISECT_WRITE 无日志"
-#: builtin/bisect--helper.c:673
-msgid "--write-terms requires two arguments"
-msgstr "--write-terms 需要两个参数"
-
-#: builtin/bisect--helper.c:677
-msgid "--bisect-clean-state requires no arguments"
-msgstr "--bisect-clean-state 不带参数"
-
-#: builtin/bisect--helper.c:684
+#: builtin/bisect--helper.c:1080
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-reset 无需参数或者需要一个提交"
-#: builtin/bisect--helper.c:688
-msgid "--bisect-write requires either 4 or 5 arguments"
-msgstr "--bisect-write 需要 4 或 5 个参数"
-
-#: builtin/bisect--helper.c:694
-msgid "--check-and-set-terms requires 3 arguments"
-msgstr "--check-and-set-terms 需要 3 个参数"
-
-#: builtin/bisect--helper.c:700
+#: builtin/bisect--helper.c:1085
msgid "--bisect-next-check requires 2 or 3 arguments"
msgstr "--bisect-next-check 需要 2 或 3 个参数"
-#: builtin/bisect--helper.c:706
+#: builtin/bisect--helper.c:1091
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms 需要 0 或 1 个参数"
-#: builtin/blame.c:31
+#: builtin/bisect--helper.c:1100
+msgid "--bisect-next requires 0 arguments"
+msgstr "--bisect-next 需要 0 个参数"
+
+#: builtin/bisect--helper.c:1111
+msgid "--bisect-log requires 0 arguments"
+msgstr "--bisect-log 需要 0 个参数"
+
+#: builtin/bisect--helper.c:1116
+msgid "no logfile given"
+msgstr "未提供日志文件"
+
+#: builtin/blame.c:32
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
-#: builtin/blame.c:36
+#: builtin/blame.c:37
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
-#: builtin/blame.c:409
+#: builtin/blame.c:410
#, c-format
msgid "expecting a color: %s"
msgstr "期望一个颜色：%s"
-#: builtin/blame.c:416
+#: builtin/blame.c:417
msgid "must end with a color"
msgstr "必须以一个颜色结尾"
-#: builtin/blame.c:729
+#: builtin/blame.c:728
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "设置 color.blame.repeatedLines 中的无效颜色 '%s'"
-#: builtin/blame.c:747
+#: builtin/blame.c:746
msgid "invalid value for blame.coloring"
msgstr "设置 blame.coloring 中的无效取值"
-#: builtin/blame.c:822
+#: builtin/blame.c:845
#, c-format
msgid "cannot find revision %s to ignore"
msgstr "不能找到要忽略的版本 %s"
-#: builtin/blame.c:844
-msgid "Show blame entries as we find them, incrementally"
+#: builtin/blame.c:867
+msgid "show blame entries as we find them, incrementally"
msgstr "增量式地显示发现的 blame 条目"
-#: builtin/blame.c:845
-msgid "Show blank SHA-1 for boundary commits (Default: off)"
-msgstr "边界提交显示空的 SHA-1（默认：关闭）"
+#: builtin/blame.c:868
+msgid "do not show object names of boundary commits (Default: off)"
+msgstr "不显示边界提交的对象名（默认：关闭）"
-#: builtin/blame.c:846
-msgid "Do not treat root commits as boundaries (Default: off)"
+#: builtin/blame.c:869
+msgid "do not treat root commits as boundaries (Default: off)"
msgstr "不把根提交作为边界（默认：关闭）"
-#: builtin/blame.c:847
-msgid "Show work cost statistics"
-msgstr "显示命令消耗统计"
+#: builtin/blame.c:870
+msgid "show work cost statistics"
+msgstr "显示工作消耗统计"
-#: builtin/blame.c:848
-msgid "Force progress reporting"
-msgstr "强制进度显示"
+#: builtin/blame.c:871 builtin/checkout.c:1503 builtin/clone.c:92
+#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:175
+#: builtin/merge.c:297 builtin/multi-pack-index.c:27 builtin/pull.c:119
+#: builtin/push.c:575 builtin/send-pack.c:198
+msgid "force progress reporting"
+msgstr "强制显示进度报告"
-#: builtin/blame.c:849
-msgid "Show output score for blame entries"
-msgstr "显示判断 blame 条目位移的得分诊断信息"
+#: builtin/blame.c:872
+msgid "show output score for blame entries"
+msgstr "显示 blame 条目的输出得分"
-#: builtin/blame.c:850
-msgid "Show original filename (Default: auto)"
+#: builtin/blame.c:873
+msgid "show original filename (Default: auto)"
msgstr "显示原始文件名（默认：自动）"
-#: builtin/blame.c:851
-msgid "Show original linenumber (Default: off)"
+#: builtin/blame.c:874
+msgid "show original linenumber (Default: off)"
msgstr "显示原始的行号（默认：关闭）"
-#: builtin/blame.c:852
-msgid "Show in a format designed for machine consumption"
+#: builtin/blame.c:875
+msgid "show in a format designed for machine consumption"
msgstr "显示为一个适合机器读取的格式"
-#: builtin/blame.c:853
-msgid "Show porcelain format with per-line commit information"
+#: builtin/blame.c:876
+msgid "show porcelain format with per-line commit information"
msgstr "为每一行显示机器适用的提交信息"
-#: builtin/blame.c:854
-msgid "Use the same output mode as git-annotate (Default: off)"
+#: builtin/blame.c:877
+msgid "use the same output mode as git-annotate (Default: off)"
msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）"
-#: builtin/blame.c:855
-msgid "Show raw timestamp (Default: off)"
+#: builtin/blame.c:878
+msgid "show raw timestamp (Default: off)"
msgstr "显示原始时间戳（默认：关闭）"
-#: builtin/blame.c:856
-msgid "Show long commit SHA1 (Default: off)"
+#: builtin/blame.c:879
+msgid "show long commit SHA1 (Default: off)"
msgstr "显示长的 SHA1 提交号（默认：关闭）"
-#: builtin/blame.c:857
-msgid "Suppress author name and timestamp (Default: off)"
+#: builtin/blame.c:880
+msgid "suppress author name and timestamp (Default: off)"
msgstr "隐藏作者名字和时间戳（默认：关闭）"
-#: builtin/blame.c:858
-msgid "Show author email instead of name (Default: off)"
+#: builtin/blame.c:881
+msgid "show author email instead of name (Default: off)"
msgstr "显示作者的邮箱而不是名字（默认：关闭）"
-#: builtin/blame.c:859
-msgid "Ignore whitespace differences"
+#: builtin/blame.c:882
+msgid "ignore whitespace differences"
msgstr "忽略空白差异"
-#: builtin/blame.c:860 builtin/log.c:1702
+#: builtin/blame.c:883 builtin/log.c:1812
msgid "rev"
msgstr "版本"
-#: builtin/blame.c:860
-msgid "Ignore <rev> when blaming"
+#: builtin/blame.c:883
+msgid "ignore <rev> when blaming"
msgstr "在执行 blame 操作时忽略 <版本>"
-#: builtin/blame.c:861
-msgid "Ignore revisions from <file>"
+#: builtin/blame.c:884
+msgid "ignore revisions from <file>"
msgstr "忽略来自 <文件> 中的版本"
-#: builtin/blame.c:862
+#: builtin/blame.c:885
msgid "color redundant metadata from previous line differently"
msgstr "使用颜色间隔输出与前一行不同的重复元信息"
-#: builtin/blame.c:863
+#: builtin/blame.c:886
msgid "color lines by age"
msgstr "依据时间着色"
-#: builtin/blame.c:864
-msgid "Spend extra cycles to find better match"
+#: builtin/blame.c:887
+msgid "spend extra cycles to find better match"
msgstr "花费额外的循环来找到更好的匹配"
-#: builtin/blame.c:865
-msgid "Use revisions from <file> instead of calling git-rev-list"
+#: builtin/blame.c:888
+msgid "use revisions from <file> instead of calling git-rev-list"
msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
-#: builtin/blame.c:866
-msgid "Use <file>'s contents as the final image"
-msgstr "使用 <文件> 的内容作为最终的图片"
+#: builtin/blame.c:889
+msgid "use <file>'s contents as the final image"
+msgstr "使用 <文件> 的内容作为最终的镜像"
-#: builtin/blame.c:867 builtin/blame.c:868
+#: builtin/blame.c:890 builtin/blame.c:891
msgid "score"
msgstr "得分"
-#: builtin/blame.c:867
-msgid "Find line copies within and across files"
+#: builtin/blame.c:890
+msgid "find line copies within and across files"
msgstr "找到文件内及跨文件的行拷贝"
-#: builtin/blame.c:868
-msgid "Find line movements within and across files"
+#: builtin/blame.c:891
+msgid "find line movements within and across files"
msgstr "找到文件内及跨文件的行移动"
-#: builtin/blame.c:869
-msgid "n,m"
-msgstr "n,m"
+#: builtin/blame.c:892
+msgid "range"
+msgstr "范围"
-#: builtin/blame.c:869
-msgid "Process only line range n,m, counting from 1"
-msgstr "只处理行范围在 n 和 m 之间的，从 1 开始"
+#: builtin/blame.c:893
+msgid "process only line range <start>,<end> or function :<funcname>"
+msgstr "只处理在 <开始>,<结束> 范围内的行，或者函数：<函数名>"
-#: builtin/blame.c:921
+#: builtin/blame.c:945
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"
@@ -10343,24 +11017,24 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:972
+#: builtin/blame.c:996
msgid "4 years, 11 months ago"
msgstr "4 年 11 个月前"
-#: builtin/blame.c:1079
+#: builtin/blame.c:1112
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "文件 %s 只有 %lu 行"
msgstr[1] "文件 %s 只有 %lu 行"
-#: builtin/blame.c:1125
+#: builtin/blame.c:1157
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>]"
@@ -10424,117 +11098,107 @@
msgid "Update of config-file failed"
msgstr "更新配置文件失败"
-#: builtin/branch.c:220
+#: builtin/branch.c:223
msgid "cannot use -a with -d"
msgstr "不能将 -a 和 -d 同时使用"
-#: builtin/branch.c:226
+#: builtin/branch.c:230
msgid "Couldn't look up commit object for HEAD"
msgstr "无法查询 HEAD 指向的提交对象"
-#: builtin/branch.c:240
+#: builtin/branch.c:244
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
-#: builtin/branch.c:255
+#: builtin/branch.c:259
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "未能找到远程跟踪分支 '%s'。"
-#: builtin/branch.c:256
+#: builtin/branch.c:260
#, 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
+#: builtin/branch.c:291
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "已删除远程跟踪分支 %s（曾为 %s）。\n"
-#: builtin/branch.c:280
+#: builtin/branch.c:292
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "已删除分支 %s（曾为 %s）。\n"
-#: builtin/branch.c:429 builtin/tag.c:61
+#: builtin/branch.c:438 builtin/tag.c:61
msgid "unable to parse format string"
msgstr "不能解析格式化字符串"
-#: builtin/branch.c:460
+#: builtin/branch.c:469
msgid "could not resolve HEAD"
msgstr "不能解析 HEAD 提交"
-#: builtin/branch.c:466
+#: builtin/branch.c:475
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) 指向 refs/heads/ 之外"
-#: builtin/branch.c:481
+#: builtin/branch.c:490
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "分支 %s 正被变基到 %s"
-#: builtin/branch.c:485
+#: builtin/branch.c:494
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "分支 %s 正被二分查找于 %s"
-#: builtin/branch.c:502
+#: builtin/branch.c:511
msgid "cannot copy the current branch while not on any."
msgstr "无法拷贝当前分支因为不处于任何分支上。"
-#: builtin/branch.c:504
+#: builtin/branch.c:513
msgid "cannot rename the current branch while not on any."
msgstr "无法重命名当前分支因为不处于任何分支上。"
-#: builtin/branch.c:515
+#: builtin/branch.c:524
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "无效的分支名：'%s'"
-#: builtin/branch.c:542
+#: builtin/branch.c:553
msgid "Branch rename failed"
msgstr "分支重命名失败"
-#: builtin/branch.c:544
+#: builtin/branch.c:555
msgid "Branch copy failed"
msgstr "分支拷贝失败"
-#: builtin/branch.c:548
+#: builtin/branch.c:559
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "已为错误命名的分支 '%s' 创建了一个副本"
-#: builtin/branch.c:551
+#: builtin/branch.c:562
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "已将错误命名的分支 '%s' 重命名"
-#: builtin/branch.c:557
+#: builtin/branch.c:568
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "分支重命名为 %s，但 HEAD 没有更新！"
-#: builtin/branch.c:566
+#: builtin/branch.c:577
msgid "Branch is renamed, but update of config-file failed"
msgstr "分支被重命名，但更新配置文件失败"
-#: builtin/branch.c:568
+#: builtin/branch.c:579
msgid "Branch is copied, but update of config-file failed"
msgstr "分支已拷贝，但更新配置文件失败"
-#: builtin/branch.c:584
+#: builtin/branch.c:595
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -10545,209 +11209,209 @@
" %s\n"
"以 '%c' 开头的行将被过滤。\n"
-#: builtin/branch.c:618
+#: builtin/branch.c:629
msgid "Generic options"
msgstr "通用选项"
-#: builtin/branch.c:620
+#: builtin/branch.c:631
msgid "show hash and subject, give twice for upstream branch"
msgstr "显示哈希值和主题，若参数出现两次则显示上游分支"
-#: builtin/branch.c:621
+#: builtin/branch.c:632
msgid "suppress informational messages"
msgstr "不显示信息"
-#: builtin/branch.c:622
+#: builtin/branch.c:633
msgid "set up tracking mode (see git-pull(1))"
msgstr "设置跟踪模式（参见 git-pull(1)）"
-#: builtin/branch.c:624
+#: builtin/branch.c:635
msgid "do not use"
msgstr "不要使用"
-#: builtin/branch.c:626 builtin/rebase.c:513
+#: builtin/branch.c:637 builtin/rebase.c:534
msgid "upstream"
msgstr "上游"
-#: builtin/branch.c:626
+#: builtin/branch.c:637
msgid "change the upstream info"
msgstr "改变上游信息"
-#: builtin/branch.c:627
+#: builtin/branch.c:638
msgid "unset the upstream info"
msgstr "取消上游信息的设置"
-#: builtin/branch.c:628
+#: builtin/branch.c:639
msgid "use colored output"
msgstr "使用彩色输出"
-#: builtin/branch.c:629
+#: builtin/branch.c:640
msgid "act on remote-tracking branches"
msgstr "作用于远程跟踪分支"
-#: builtin/branch.c:631 builtin/branch.c:633
+#: builtin/branch.c:642 builtin/branch.c:644
msgid "print only branches that contain the commit"
msgstr "只打印包含该提交的分支"
-#: builtin/branch.c:632 builtin/branch.c:634
+#: builtin/branch.c:643 builtin/branch.c:645
msgid "print only branches that don't contain the commit"
msgstr "只打印不包含该提交的分支"
-#: builtin/branch.c:637
+#: builtin/branch.c:648
msgid "Specific git-branch actions:"
msgstr "具体的 git-branch 动作："
-#: builtin/branch.c:638
+#: builtin/branch.c:649
msgid "list both remote-tracking and local branches"
msgstr "列出远程跟踪及本地分支"
-#: builtin/branch.c:640
+#: builtin/branch.c:651
msgid "delete fully merged branch"
msgstr "删除完全合并的分支"
-#: builtin/branch.c:641
+#: builtin/branch.c:652
msgid "delete branch (even if not merged)"
msgstr "删除分支（即使没有合并）"
-#: builtin/branch.c:642
+#: builtin/branch.c:653
msgid "move/rename a branch and its reflog"
msgstr "移动/重命名一个分支，以及它的引用日志"
-#: builtin/branch.c:643
+#: builtin/branch.c:654
msgid "move/rename a branch, even if target exists"
msgstr "移动/重命名一个分支，即使目标已存在"
-#: builtin/branch.c:644
+#: builtin/branch.c:655
msgid "copy a branch and its reflog"
msgstr "拷贝一个分支和它的引用日志"
-#: builtin/branch.c:645
+#: builtin/branch.c:656
msgid "copy a branch, even if target exists"
msgstr "拷贝一个分支，即使目标已存在"
-#: builtin/branch.c:646
+#: builtin/branch.c:657
msgid "list branch names"
msgstr "列出分支名"
-#: builtin/branch.c:647
+#: builtin/branch.c:658
msgid "show current branch name"
msgstr "显示当前分支名"
-#: builtin/branch.c:648
+#: builtin/branch.c:659
msgid "create the branch's reflog"
msgstr "创建分支的引用日志"
-#: builtin/branch.c:650
+#: builtin/branch.c:661
msgid "edit the description for the branch"
msgstr "标记分支的描述"
-#: builtin/branch.c:651
+#: builtin/branch.c:662
msgid "force creation, move/rename, deletion"
msgstr "强制创建、移动/重命名、删除"
-#: builtin/branch.c:652
+#: builtin/branch.c:663
msgid "print only branches that are merged"
msgstr "只打印已经合并的分支"
-#: builtin/branch.c:653
+#: builtin/branch.c:664
msgid "print only branches that are not merged"
msgstr "只打印尚未合并的分支"
-#: builtin/branch.c:654
+#: builtin/branch.c:665
msgid "list branches in columns"
msgstr "以列的方式显示分支"
-#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415
+#: builtin/branch.c:667 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:466
msgid "object"
msgstr "对象"
-#: builtin/branch.c:658
+#: builtin/branch.c:668
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:669 builtin/for-each-ref.c:48 builtin/tag.c:473
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:670 builtin/for-each-ref.c:38 builtin/tag.c:471
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "输出格式"
-#: builtin/branch.c:684 builtin/clone.c:785
+#: builtin/branch.c:693 builtin/clone.c:790
msgid "HEAD not found below refs/heads!"
msgstr "HEAD 没有位于 /refs/heads 之下！"
-#: builtin/branch.c:708
+#: builtin/branch.c:717
msgid "--column and --verbose are incompatible"
msgstr "--column 和 --verbose 不兼容"
-#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
+#: builtin/branch.c:732 builtin/branch.c:788 builtin/branch.c:797
msgid "branch name required"
msgstr "必须提供分支名"
-#: builtin/branch.c:753
+#: builtin/branch.c:764
msgid "Cannot give description to detached HEAD"
msgstr "不能向分离头指针提供描述"
-#: builtin/branch.c:758
+#: builtin/branch.c:769
msgid "cannot edit description of more than one branch"
msgstr "不能为一个以上的分支编辑描述"
-#: builtin/branch.c:765
+#: builtin/branch.c:776
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "分支 '%s' 尚无提交。"
-#: builtin/branch.c:768
+#: builtin/branch.c:779
#, c-format
msgid "No branch named '%s'."
msgstr "没有分支 '%s'。"
-#: builtin/branch.c:783
+#: builtin/branch.c:794
msgid "too many branches for a copy operation"
msgstr "为拷贝操作提供了太多的分支名"
-#: builtin/branch.c:792
+#: builtin/branch.c:803
msgid "too many arguments for a rename operation"
msgstr "为重命名操作提供了太多的参数"
-#: builtin/branch.c:797
+#: builtin/branch.c:808
msgid "too many arguments to set new upstream"
msgstr "为设置新上游提供了太多的参数"
-#: builtin/branch.c:801
+#: builtin/branch.c:812
#, 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:815 builtin/branch.c:838
#, c-format
msgid "no such branch '%s'"
msgstr "没有此分支 '%s'"
-#: builtin/branch.c:808
+#: builtin/branch.c:819
#, c-format
msgid "branch '%s' does not exist"
msgstr "分支 '%s' 不存在"
-#: builtin/branch.c:821
+#: builtin/branch.c:832
msgid "too many arguments to unset upstream"
msgstr "为取消上游设置操作提供了太多的参数"
-#: builtin/branch.c:825
+#: builtin/branch.c:836
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
-#: builtin/branch.c:831
+#: builtin/branch.c:842
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "分支 '%s' 没有上游信息"
-#: builtin/branch.c:841
+#: builtin/branch.c:852
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>?"
@@ -10755,13 +11419,108 @@
"'git branch' 的 -a 和 -r 选项不带一个分支名。\n"
"您是否想要使用：-a|-r --list <模式>？"
-#: builtin/branch.c:845
+#: builtin/branch.c:856
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:135
+msgid "specify a destination for the bugreport file"
+msgstr "指定错误报告文件的目标位置"
+
+#: builtin/bugreport.c:137
+msgid "specify a strftime format suffix for the filename"
+msgstr "指定文件的 strftime 格式后缀"
+
+#: builtin/bugreport.c:159
+#, c-format
+msgid "could not create leading directories for '%s'"
+msgstr "不能为 '%s' 创建先导目录"
+
+#: builtin/bugreport.c:166
+msgid "System Info"
+msgstr "系统信息"
+
+#: builtin/bugreport.c:169
+msgid "Enabled Hooks"
+msgstr "启用的钩子"
+
+#: builtin/bugreport.c:176
+#, c-format
+msgid "couldn't create a new file at '%s'"
+msgstr "不能在 '%s' 创建新文件"
+
+#: builtin/bugreport.c:179
+#, c-format
+msgid "unable to write to %s"
+msgstr "无法写入 %s"
+
+#: builtin/bugreport.c:189
+#, 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 参数>"
@@ -10778,49 +11537,53 @@
msgid "git bundle unbundle <file> [<refname>...]"
msgstr "git bundle unbundle <文件> [<引用名>...]"
-#: builtin/bundle.c:66 builtin/pack-objects.c:3375
+#: builtin/bundle.c:67 builtin/pack-objects.c:3495
msgid "do not show progress meter"
msgstr "不显示进度表"
-#: builtin/bundle.c:68 builtin/pack-objects.c:3377
+#: builtin/bundle.c:69 builtin/pack-objects.c:3497
msgid "show progress meter"
msgstr "显示进度表"
-#: builtin/bundle.c:70 builtin/pack-objects.c:3379
+#: builtin/bundle.c:71 builtin/pack-objects.c:3499
msgid "show progress meter during object writing phase"
msgstr "在对象写入阶段显示进度表"
-#: builtin/bundle.c:73 builtin/pack-objects.c:3382
+#: builtin/bundle.c:74 builtin/pack-objects.c:3502
msgid "similar to --all-progress when progress meter is shown"
msgstr "当进度表显示时类似于 --all-progress"
-#: builtin/bundle.c:93
+#: 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:104
+#: builtin/bundle.c:107
msgid "do not show bundle details"
-msgstr "不显示 bundle 细节"
+msgstr "不显示归档包的细节"
-#: builtin/bundle.c:119
+#: builtin/bundle.c:122
#, c-format
msgid "%s is okay\n"
msgstr "%s 可以\n"
-#: builtin/bundle.c:160
+#: builtin/bundle.c:163
msgid "Need a repository to unbundle."
-msgstr "需要一个仓库来解包。"
+msgstr "需要一个仓库来解开归档包。"
-#: builtin/bundle.c:168 builtin/remote.c:1686
+#: builtin/bundle.c:171 builtin/remote.c:1700
msgid "be verbose; must be placed before a subcommand"
msgstr "冗长输出；必须置于子命令之前"
-#: builtin/bundle.c:190 builtin/remote.c:1717
+#: builtin/bundle.c:193 builtin/remote.c:1731
#, c-format
msgid "Unknown subcommand: %s"
msgstr "未知子命令：%s"
-#: builtin/cat-file.c:595
+#: 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>"
@@ -10828,79 +11591,79 @@
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
-#: builtin/cat-file.c:596
+#: builtin/cat-file.c: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:617
+#: builtin/cat-file.c:620
msgid "only one batch option may be specified"
msgstr "只能指定一个批处理选项"
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:638
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<类型> 可以是其中之一：blob、tree、commit、tag"
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:639
msgid "show object type"
msgstr "显示对象类型"
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:640
msgid "show object size"
msgstr "显示对象大小"
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:642
msgid "exit with zero when there's no error"
msgstr "当没有错误时退出并返回零"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:643
msgid "pretty-print object's content"
msgstr "美观地打印对象的内容"
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:645
msgid "for blob objects, run textconv on object's content"
msgstr "对于数据对象，对其内容做文本转换"
-#: builtin/cat-file.c:644
+#: builtin/cat-file.c:647
msgid "for blob objects, run filters on object's content"
msgstr "对于数据对象，对其内容做过滤"
-#: builtin/cat-file.c:645 git-submodule.sh:1002
+#: builtin/cat-file.c:648
msgid "blob"
msgstr "数据对象"
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:649
msgid "use a specific path for --textconv/--filters"
msgstr "对于 --textconv/--filters 使用一个特定的路径"
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:651
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "允许 -s 和 -t 对损坏的对象生效"
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:652
msgid "buffer --batch output"
msgstr "缓冲 --batch 的输出"
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:654
msgid "show info and content of objects fed from the standard input"
msgstr "显示从标准输入提供的对象的信息和内容"
-#: builtin/cat-file.c:655
+#: builtin/cat-file.c:658
msgid "show info about objects fed from the standard input"
msgstr "显示从标准输入提供的对象的信息"
-#: builtin/cat-file.c:659
+#: builtin/cat-file.c:662
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr "跟随树内符号链接（和 --batch 或 --batch-check 共用）"
-#: builtin/cat-file.c:661
+#: builtin/cat-file.c:664
msgid "show all objects with --batch or --batch-check"
msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
-#: builtin/cat-file.c:663
+#: builtin/cat-file.c:666
msgid "do not order --batch-all-objects output"
msgstr "不要对 --batch-all-objects 的输出排序"
@@ -10928,8 +11691,8 @@
msgid "terminate input and output records by a NUL character"
msgstr "输入和输出的记录使用 NUL 字符终结"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537
-#: builtin/worktree.c:499
+#: builtin/check-ignore.c:21 builtin/checkout.c:1499 builtin/gc.c:549
+#: builtin/worktree.c:489
msgid "suppress progress reporting"
msgstr "不显示进度报告"
@@ -10982,54 +11745,54 @@
msgid "no contacts specified"
msgstr "未指定联系地址"
-#: builtin/checkout-index.c:131
+#: builtin/checkout-index.c:152
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<选项>] [--] [<文件>...]"
-#: builtin/checkout-index.c:148
+#: builtin/checkout-index.c:169
msgid "stage should be between 1 and 3 or all"
msgstr "索引值应该取值 1 到 3 或者 all"
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:186
msgid "check out all files in the index"
msgstr "检出索引区的所有文件"
-#: builtin/checkout-index.c:165
+#: builtin/checkout-index.c:187
msgid "force overwrite of existing files"
msgstr "强制覆盖现有的文件"
-#: builtin/checkout-index.c:167
+#: builtin/checkout-index.c:189
msgid "no warning for existing files and files not in index"
msgstr "存在或不在索引中的文件都没有警告"
-#: builtin/checkout-index.c:169
+#: builtin/checkout-index.c:191
msgid "don't checkout new files"
msgstr "不检出新文件"
-#: builtin/checkout-index.c:171
+#: builtin/checkout-index.c:193
msgid "update stat information in the index file"
msgstr "更新索引中文件的状态信息"
-#: builtin/checkout-index.c:175
+#: builtin/checkout-index.c:197
msgid "read list of paths from the standard input"
msgstr "从标准输入读取路径列表"
-#: builtin/checkout-index.c:177
+#: builtin/checkout-index.c:199
msgid "write the content to temporary files"
msgstr "将内容写入临时文件"
-#: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403
-#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909
-#: builtin/worktree.c:672
+#: builtin/checkout-index.c:200 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:717
msgid "string"
msgstr "字符串"
-#: builtin/checkout-index.c:179
+#: builtin/checkout-index.c:201
msgid "when creating files, prepend <string>"
msgstr "在创建文件时，在前面加上 <字符串>"
-#: builtin/checkout-index.c:181
+#: builtin/checkout-index.c:203
msgid "copy out the files from named stage"
msgstr "从指定暂存区中拷出文件"
@@ -11049,98 +11812,98 @@
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git restore [<选项>] [--source=<分支>] <文件>..."
-#: builtin/checkout.c:175 builtin/checkout.c:214
+#: builtin/checkout.c:188 builtin/checkout.c:227
#, c-format
msgid "path '%s' does not have our version"
msgstr "路径 '%s' 没有我们的版本"
-#: builtin/checkout.c:177 builtin/checkout.c:216
+#: builtin/checkout.c:190 builtin/checkout.c:229
#, c-format
msgid "path '%s' does not have their version"
msgstr "路径 '%s' 没有他们的版本"
-#: builtin/checkout.c:193
+#: builtin/checkout.c:206
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "路径 '%s' 没有全部必需的版本"
-#: builtin/checkout.c:243
+#: builtin/checkout.c:258
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "路径 '%s' 没有必需的版本"
-#: builtin/checkout.c:261
+#: builtin/checkout.c:275
#, c-format
msgid "path '%s': cannot merge"
msgstr "path '%s'：无法合并"
-#: builtin/checkout.c:277
+#: builtin/checkout.c:291
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "无法为 '%s' 添加合并结果"
-#: builtin/checkout.c:377
+#: 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:382
+#: 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:389
+#: 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:412 builtin/checkout.c:415 builtin/checkout.c:418
-#: builtin/checkout.c:422
+#: 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:425 builtin/checkout.c:428
+#: builtin/checkout.c:444 builtin/checkout.c:447
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' 不能和 %s 同时使用"
-#: builtin/checkout.c:432
+#: builtin/checkout.c:451
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "不能同时更新路径并切换到分支'%s'。"
-#: builtin/checkout.c:436
+#: builtin/checkout.c:455
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "'%s' 或 '%s' 都没有指定"
-#: builtin/checkout.c:440
+#: builtin/checkout.c:459
#, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr "未指定 '%2$s' 时，必须使用 '%1$s'"
-#: builtin/checkout.c:445 builtin/checkout.c:450
+#: builtin/checkout.c:464 builtin/checkout.c:469
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr "'%s' 或 '%s' 不能和 %s 一起使用"
-#: builtin/checkout.c:509 builtin/checkout.c:516
+#: builtin/checkout.c:543 builtin/checkout.c:550
#, c-format
msgid "path '%s' is unmerged"
msgstr "路径 '%s' 未合并"
-#: builtin/checkout.c:684 builtin/sparse-checkout.c:106
+#: builtin/checkout.c:718
msgid "you need to resolve your current index first"
msgstr "您需要先解决当前索引的冲突"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:772
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -11149,51 +11912,51 @@
"不能继续，下列文件有暂存的修改：\n"
"%s"
-#: builtin/checkout.c:837
+#: builtin/checkout.c:865
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "不能对 '%s' 执行 reflog 操作：%s\n"
-#: builtin/checkout.c:879
+#: builtin/checkout.c:907
msgid "HEAD is now at"
msgstr "HEAD 目前位于"
-#: builtin/checkout.c:883 builtin/clone.c:717
+#: builtin/checkout.c:911 builtin/clone.c:721 t/helper/test-fast-rebase.c:202
msgid "unable to update HEAD"
msgstr "不能更新 HEAD"
-#: builtin/checkout.c:887
+#: builtin/checkout.c:915
#, c-format
msgid "Reset branch '%s'\n"
msgstr "重置分支 '%s'\n"
-#: builtin/checkout.c:890
+#: builtin/checkout.c:918
#, c-format
msgid "Already on '%s'\n"
msgstr "已经位于 '%s'\n"
-#: builtin/checkout.c:894
+#: builtin/checkout.c:922
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "切换并重置分支 '%s'\n"
-#: builtin/checkout.c:896 builtin/checkout.c:1320
+#: builtin/checkout.c:924 builtin/checkout.c:1355
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "切换到一个新分支 '%s'\n"
-#: builtin/checkout.c:898
+#: builtin/checkout.c:926
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "切换到分支 '%s'\n"
# 译者：注意保持前导空格
-#: builtin/checkout.c:949
+#: builtin/checkout.c:977
#, c-format
msgid " ... and %d more.\n"
msgstr " ... 及其它 %d 个。\n"
-#: builtin/checkout.c:955
+#: builtin/checkout.c:983
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -11214,7 +11977,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:974
+#: builtin/checkout.c:1002
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -11241,19 +12004,19 @@
" git branch <新分支名> %s\n"
"\n"
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1037
msgid "internal error in revision walk"
msgstr "在版本遍历时遇到内部错误"
-#: builtin/checkout.c:1013
+#: builtin/checkout.c:1041
msgid "Previous HEAD position was"
msgstr "之前的 HEAD 位置是"
-#: builtin/checkout.c:1053 builtin/checkout.c:1315
+#: builtin/checkout.c:1081 builtin/checkout.c:1350
msgid "You are on a branch yet to be born"
msgstr "您位于一个尚未初始化的分支"
-#: builtin/checkout.c:1128
+#: builtin/checkout.c:1163
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -11262,7 +12025,7 @@
"'%s' 既可以是一个本地文件，也可以是一个跟踪分支。\n"
"请使用 --（和可选的 --no-guess）来消除歧义"
-#: builtin/checkout.c:1135
+#: builtin/checkout.c:1170
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"
@@ -11281,51 +12044,51 @@
"如果您总是喜欢使用模糊的简短分支名 <名称>，而不喜欢如 'origin' 的远程\n"
"名称，可以在配置中设置 checkout.defaultRemote=origin。"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1180
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "'%s' 匹配多个（%d 个）远程跟踪分支"
-#: builtin/checkout.c:1211
+#: builtin/checkout.c:1246
msgid "only one reference expected"
msgstr "只期望一个引用"
-#: builtin/checkout.c:1228
+#: builtin/checkout.c:1263
#, c-format
msgid "only one reference expected, %d given."
msgstr "应只有一个引用，却给出了 %d 个"
-#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448
+#: builtin/checkout.c:1309 builtin/worktree.c:270 builtin/worktree.c:438
#, c-format
msgid "invalid reference: %s"
msgstr "无效引用：%s"
-#: builtin/checkout.c:1287 builtin/checkout.c:1649
+#: builtin/checkout.c:1322 builtin/checkout.c:1688
#, c-format
msgid "reference is not a tree: %s"
msgstr "引用不是一个树：%s"
-#: builtin/checkout.c:1334
+#: builtin/checkout.c:1369
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "期望一个分支，得到标签 '%s'"
-#: builtin/checkout.c:1336
+#: builtin/checkout.c:1371
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "期望一个分支，得到远程分支 '%s'"
-#: builtin/checkout.c:1337 builtin/checkout.c:1345
+#: builtin/checkout.c:1372 builtin/checkout.c:1380
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "期望一个分支，得到 '%s'"
-#: builtin/checkout.c:1340
+#: builtin/checkout.c:1375
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "期望一个分支，得到提交 '%s'"
-#: builtin/checkout.c:1356
+#: builtin/checkout.c:1391
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -11333,7 +12096,7 @@
"不能在合并时切换分支\n"
"考虑使用 \"git merge --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1360
+#: builtin/checkout.c:1395
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -11341,7 +12104,7 @@
"不能在一个 am 会话期间切换分支\n"
"考虑使用 \"git am --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1399
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -11349,7 +12112,7 @@
"不能在变基时切换分支\n"
"考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1368
+#: builtin/checkout.c:1403
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -11357,7 +12120,7 @@
"不能在拣选时切换分支\n"
"考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1372
+#: builtin/checkout.c:1407
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -11365,251 +12128,247 @@
"不能在还原时切换分支\n"
"考虑使用 \"git revert --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1376
+#: builtin/checkout.c:1411
msgid "you are switching branch while bisecting"
msgstr "您在执行二分查找时切换分支"
-#: builtin/checkout.c:1383
+#: builtin/checkout.c:1418
msgid "paths cannot be used with switching branches"
msgstr "路径不能和切换分支同时使用"
-#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394
+#: builtin/checkout.c:1421 builtin/checkout.c:1425 builtin/checkout.c:1429
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' 不能和切换分支同时使用"
-#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404
-#: builtin/checkout.c:1409 builtin/checkout.c:1414
+#: builtin/checkout.c:1433 builtin/checkout.c:1436 builtin/checkout.c:1439
+#: builtin/checkout.c:1444 builtin/checkout.c:1449
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' 不能和 '%s' 同时使用"
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1446
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s' 不带 <起始点>"
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1454
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "不能切换分支到一个非提交 '%s'"
-#: builtin/checkout.c:1426
+#: builtin/checkout.c:1461
msgid "missing branch or commit argument"
msgstr "缺少分支或提交参数"
-#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72
-#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286
-#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563
-#: builtin/send-pack.c:174
-msgid "force progress reporting"
-msgstr "强制显示进度报告"
-
-#: builtin/checkout.c:1469
+#: builtin/checkout.c:1504
msgid "perform a 3-way merge with the new branch"
msgstr "和新的分支执行三方合并"
-#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322
+#: builtin/checkout.c:1505 builtin/log.c:1799 parse-options.h:322
msgid "style"
msgstr "风格"
-#: builtin/checkout.c:1471
+#: builtin/checkout.c:1506
msgid "conflict style (merge or diff3)"
msgstr "冲突输出风格（merge 或 diff3）"
-#: builtin/checkout.c:1483 builtin/worktree.c:496
+#: builtin/checkout.c:1518 builtin/worktree.c:486
msgid "detach HEAD at named commit"
msgstr "HEAD 从指定的提交分离"
-#: builtin/checkout.c:1484
+#: builtin/checkout.c:1519
msgid "set upstream info for new branch"
msgstr "为新的分支设置上游信息"
-#: builtin/checkout.c:1486
+#: builtin/checkout.c:1521
msgid "force checkout (throw away local modifications)"
msgstr "强制检出（丢弃本地修改）"
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1523
msgid "new-branch"
msgstr "新分支"
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1523
msgid "new unparented branch"
msgstr "新的没有父提交的分支"
-#: builtin/checkout.c:1490 builtin/merge.c:289
+#: builtin/checkout.c:1525 builtin/merge.c:301
msgid "update ignored files (default)"
msgstr "更新忽略的文件（默认）"
-#: builtin/checkout.c:1493
+#: builtin/checkout.c:1528
msgid "do not check if another worktree is holding the given ref"
msgstr "不检查指定的引用是否被其他工作区所占用"
-#: builtin/checkout.c:1506
+#: builtin/checkout.c:1541
msgid "checkout our version for unmerged files"
msgstr "对尚未合并的文件检出我们的版本"
-#: builtin/checkout.c:1509
+#: builtin/checkout.c:1544
msgid "checkout their version for unmerged files"
msgstr "对尚未合并的文件检出他们的版本"
-#: builtin/checkout.c:1513
+#: builtin/checkout.c:1548
msgid "do not limit pathspecs to sparse entries only"
msgstr "对路径不做稀疏检出的限制"
-#: builtin/checkout.c:1565
-msgid "-b, -B and --orphan are mutually exclusive"
-msgstr "-b、-B 和 --orphan 是互斥的"
+#: builtin/checkout.c:1603
+#, c-format
+msgid "-%c, -%c and --orphan are mutually exclusive"
+msgstr "-%c、-%c 和 --orphan 是互斥的"
-#: builtin/checkout.c:1568
+#: builtin/checkout.c:1607
msgid "-p and --overlay are mutually exclusive"
msgstr "-p 和 --overlay 互斥"
-#: builtin/checkout.c:1605
+#: builtin/checkout.c:1644
msgid "--track needs a branch name"
msgstr "--track 需要一个分支名"
-#: builtin/checkout.c:1610
-msgid "missing branch name; try -b"
-msgstr "缺少分支名，尝试 -b"
+#: builtin/checkout.c:1649
+#, c-format
+msgid "missing branch name; try -%c"
+msgstr "缺少分支名，尝试 -%c"
-#: builtin/checkout.c:1642
+#: builtin/checkout.c:1681
#, c-format
msgid "could not resolve %s"
msgstr "无法解析 %s"
-#: builtin/checkout.c:1658
+#: builtin/checkout.c:1697
msgid "invalid path specification"
msgstr "无效的路径规格"
-#: builtin/checkout.c:1665
+#: builtin/checkout.c:1704
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "'%s' 不是一个提交，不能基于它创建分支 '%s'"
-#: builtin/checkout.c:1669
+#: builtin/checkout.c:1708
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout：--detach 不能接收路径参数 '%s'"
-#: builtin/checkout.c:1678
+#: builtin/checkout.c:1717
msgid "--pathspec-from-file is incompatible with --detach"
msgstr "--pathspec-from-file 与 --detach 不兼容"
-#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506
+#: builtin/checkout.c:1720 builtin/reset.c:325 builtin/stash.c:1566
msgid "--pathspec-from-file is incompatible with --patch"
msgstr "--pathspec-from-file 与 --patch 不兼容"
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1733
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
"git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。"
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1738
msgid "you must specify path(s) to restore"
msgstr "您必须指定一个要恢复的路径"
-#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774
-#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494
+#: builtin/checkout.c:1764 builtin/checkout.c:1766 builtin/checkout.c:1815
+#: builtin/checkout.c:1817 builtin/clone.c:122 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:482
+#: builtin/worktree.c:484
msgid "branch"
msgstr "分支"
-#: builtin/checkout.c:1724
+#: builtin/checkout.c:1765
msgid "create and checkout a new branch"
msgstr "创建并检出一个新的分支"
-#: builtin/checkout.c:1726
+#: builtin/checkout.c:1767
msgid "create/reset and checkout a branch"
msgstr "创建/重置并检出一个分支"
-#: builtin/checkout.c:1727
+#: builtin/checkout.c:1768
msgid "create reflog for new branch"
msgstr "为新的分支创建引用日志"
-#: builtin/checkout.c:1729
+#: builtin/checkout.c:1770
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "二次猜测 'git checkout <无此分支>'（默认）"
-#: builtin/checkout.c:1730
+#: builtin/checkout.c:1771
msgid "use overlay mode (default)"
msgstr "使用叠加模式（默认）"
-#: builtin/checkout.c:1775
+#: builtin/checkout.c:1816
msgid "create and switch to a new branch"
msgstr "创建并切换一个新分支"
-#: builtin/checkout.c:1777
+#: builtin/checkout.c:1818
msgid "create/reset and switch to a branch"
msgstr "创建/重置并切换一个分支"
-#: builtin/checkout.c:1779
+#: builtin/checkout.c:1820
msgid "second guess 'git switch <no-such-branch>'"
msgstr "二次猜测 'git switch <无此分支>'"
-#: builtin/checkout.c:1781
+#: builtin/checkout.c:1822
msgid "throw away local modifications"
msgstr "丢弃本地修改"
-#: builtin/checkout.c:1813
+#: builtin/checkout.c:1856
msgid "which tree-ish to checkout from"
msgstr "要检出哪一个树"
-#: builtin/checkout.c:1815
+#: builtin/checkout.c:1858
msgid "restore the index"
msgstr "恢复索引"
-#: builtin/checkout.c:1817
+#: builtin/checkout.c:1860
msgid "restore the working tree (default)"
msgstr "恢复工作区（默认）"
-#: builtin/checkout.c:1819
+#: builtin/checkout.c:1862
msgid "ignore unmerged entries"
msgstr "忽略未合并条目"
-#: builtin/checkout.c:1820
+#: builtin/checkout.c:1863
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:301 git-add--interactive.perl:595
+#: builtin/clean.c:302 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -11622,7 +12381,7 @@
"foo - 通过唯一前缀选择一个选项\n"
" - （空）什么也不选择\n"
-#: builtin/clean.c:305 git-add--interactive.perl:604
+#: builtin/clean.c:306 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -11643,33 +12402,33 @@
"* - 选择所有选项\n"
" - （空）结束选择\n"
-#: builtin/clean.c:521 git-add--interactive.perl:570
-#: git-add--interactive.perl:575
+#: builtin/clean.c:521 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "嗯（%s）？\n"
-#: builtin/clean.c:663
+#: builtin/clean.c:661
#, c-format
msgid "Input ignore patterns>> "
msgstr "输入模版以排除条目>> "
-#: builtin/clean.c:700
+#: builtin/clean.c:696
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "警告：无法找到和 %s 匹配的条目"
-#: builtin/clean.c:721
+#: builtin/clean.c:717
msgid "Select items to delete"
msgstr "选择要删除的条目"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:762
+#: builtin/clean.c:758
#, c-format
msgid "Remove %s [y/N]? "
msgstr "删除 %s [y/N]？"
-#: builtin/clean.c:795
+#: builtin/clean.c:789
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -11687,94 +12446,94 @@
"help - 显示本帮助\n"
"? - 显示如何在提示符下选择的帮助"
-#: builtin/clean.c:831
+#: builtin/clean.c:825
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "将删除如下条目："
msgstr[1] "将删除如下条目："
-#: builtin/clean.c:847
+#: builtin/clean.c:841
msgid "No more files to clean, exiting."
msgstr "没有要清理的文件，退出。"
-#: builtin/clean.c:909
+#: builtin/clean.c:903
msgid "do not print names of files removed"
msgstr "不打印删除文件的名称"
-#: builtin/clean.c:911
+#: builtin/clean.c:905
msgid "force"
msgstr "强制"
-#: builtin/clean.c:912
+#: builtin/clean.c:906
msgid "interactive cleaning"
msgstr "交互式清除"
-#: builtin/clean.c:914
+#: builtin/clean.c:908
msgid "remove whole directories"
msgstr "删除整个目录"
-#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564
-#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179
-#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/grep.c:922 builtin/log.c:184 builtin/log.c:186
+#: builtin/ls-files.c:573 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "模式"
-#: builtin/clean.c:916
+#: builtin/clean.c:910
msgid "add <pattern> to ignore rules"
msgstr "添加 <模式> 到忽略规则"
-#: builtin/clean.c:917
+#: builtin/clean.c:911
msgid "remove ignored files, too"
msgstr "也删除忽略的文件"
-#: builtin/clean.c:919
+#: builtin/clean.c:913
msgid "remove only ignored files"
msgstr "只删除忽略的文件"
-#: builtin/clean.c:937
-msgid "-x and -X cannot be used together"
-msgstr "-x 和 -X 不能同时使用"
-
-#: builtin/clean.c:941
+#: 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:944
+#: 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
+#: builtin/clone.c:94
msgid "don't create a checkout"
msgstr "不创建一个检出"
-#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
+#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:555
msgid "create a bare repository"
msgstr "创建一个纯仓库"
-#: builtin/clone.c:98
+#: builtin/clone.c:99
msgid "create a mirror repository (implies bare)"
msgstr "创建一个镜像仓库（也是纯仓库）"
-#: builtin/clone.c:100
+#: builtin/clone.c:101
msgid "to clone from a local repository"
msgstr "从本地仓库克隆"
-#: builtin/clone.c:102
+#: builtin/clone.c:103
msgid "don't use local hardlinks, always copy"
msgstr "不使用本地硬链接，始终复制"
-#: builtin/clone.c:104
+#: builtin/clone.c:105
msgid "setup as shared repository"
msgstr "设置为共享仓库"
@@ -11786,129 +12545,130 @@
msgid "initialize submodules in the clone"
msgstr "在克隆时初始化子模组"
-#: builtin/clone.c:110
+#: builtin/clone.c:111
msgid "number of submodules cloned in parallel"
msgstr "并发克隆的子模组的数量"
-#: builtin/clone.c:111 builtin/init-db.c:486
+#: builtin/clone.c:112 builtin/init-db.c:552
msgid "template-directory"
msgstr "模板目录"
-#: builtin/clone.c:112 builtin/init-db.c:487
+#: builtin/clone.c:113 builtin/init-db.c:553
msgid "directory from which templates will be used"
msgstr "模板目录将被使用"
-#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407
-#: builtin/submodule--helper.c:1912
+#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831
+#: builtin/submodule--helper.c:2336
msgid "reference repository"
msgstr "参考仓库"
-#: builtin/clone.c:118 builtin/submodule--helper.c:1409
-#: builtin/submodule--helper.c:1914
+#: builtin/clone.c:119 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:3441 builtin/repack.c:327
+#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3561 builtin/repack.c:357
msgid "name"
msgstr "名称"
-#: builtin/clone.c:120
+#: builtin/clone.c:121
msgid "use <name> instead of 'origin' to track upstream"
msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
-#: builtin/clone.c:122
+#: builtin/clone.c:123
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "检出 <分支> 而不是远程 HEAD"
-#: builtin/clone.c:124
+#: builtin/clone.c:125
msgid "path to git-upload-pack on the remote"
msgstr "远程 git-upload-pack 路径"
-#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828
-#: builtin/pull.c:207
+#: builtin/clone.c:126 builtin/fetch.c:176 builtin/grep.c:861
+#: builtin/pull.c:208
msgid "depth"
msgstr "深度"
-#: builtin/clone.c:126
+#: builtin/clone.c:127
msgid "create a shallow clone of that depth"
msgstr "创建一个指定深度的浅克隆"
-#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430
+#: builtin/clone.c:128 builtin/fetch.c:178 builtin/pack-objects.c:3550
+#: builtin/pull.c:211
msgid "time"
msgstr "时间"
-#: builtin/clone.c:128
+#: builtin/clone.c:129
msgid "create a shallow clone since a specific time"
msgstr "从一个特定时间创建一个浅克隆"
-#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195
-#: builtin/rebase.c:1480
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/fetch.c:203
+#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1323
msgid "revision"
msgstr "版本"
-#: builtin/clone.c:130 builtin/fetch.c:173
+#: builtin/clone.c:131 builtin/fetch.c:181 builtin/pull.c:215
msgid "deepen history of shallow clone, excluding rev"
msgstr "深化浅克隆的历史，除了特定版本"
-#: builtin/clone.c:132 builtin/submodule--helper.c:1419
-#: builtin/submodule--helper.c:1928
+#: builtin/clone.c:133 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
+#: builtin/clone.c:135
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr "不要克隆任何标签，并且后续获取操作也不下载它们"
-#: builtin/clone.c:136
+#: builtin/clone.c:137
msgid "any cloned submodules will be shallow"
msgstr "子模组将以浅下载模式克隆"
-#: builtin/clone.c:137 builtin/init-db.c:495
+#: builtin/clone.c:138 builtin/init-db.c:561
msgid "gitdir"
msgstr "git目录"
-#: builtin/clone.c:138 builtin/init-db.c:496
+#: builtin/clone.c:139 builtin/init-db.c:562
msgid "separate git dir from working tree"
msgstr "git目录和工作区分离"
-#: builtin/clone.c:139
+#: builtin/clone.c:140
msgid "key=value"
msgstr "key=value"
-#: builtin/clone.c:140
+#: builtin/clone.c:141
msgid "set config inside the new repository"
msgstr "在新仓库中设置配置信息"
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
-#: builtin/push.c:573 builtin/send-pack.c:172
+#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77
+#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
msgid "server-specific"
msgstr "server-specific"
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
-#: builtin/push.c:573 builtin/send-pack.c:173
+#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77
+#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
msgid "option to transmit"
msgstr "传输选项"
-#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220
-#: builtin/push.c:574
+#: builtin/clone.c:144 builtin/fetch.c:199 builtin/pull.c:234
+#: builtin/push.c:585
msgid "use IPv4 addresses only"
msgstr "只使用 IPv4 地址"
-#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223
-#: builtin/push.c:576
+#: builtin/clone.c:146 builtin/fetch.c:201 builtin/pull.c:237
+#: builtin/push.c:587
msgid "use IPv6 addresses only"
msgstr "只使用 IPv6 地址"
-#: builtin/clone.c:149
+#: builtin/clone.c:150
msgid "any cloned submodules will use their remote-tracking branch"
msgstr "任何克隆的子模组将使用它们的远程跟踪分支"
-#: builtin/clone.c:151
+#: builtin/clone.c:152
msgid "initialize sparse-checkout file to include only files at root"
msgstr "初始化稀疏检出文件，只包含根目录文件"
-#: builtin/clone.c:287
+#: builtin/clone.c:288
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -11916,42 +12676,42 @@
"无法猜到目录名。\n"
"请在命令行指定一个目录"
-#: builtin/clone.c:340
+#: builtin/clone.c:341
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: 不能为 '%s' 添加一个备用：%s\n"
-#: builtin/clone.c:413
+#: builtin/clone.c:414
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s 存在且不是一个目录"
-#: builtin/clone.c:430
+#: builtin/clone.c:432
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "无法在 '%s' 上启动迭代器"
-#: builtin/clone.c:460
+#: builtin/clone.c:463
#, c-format
msgid "failed to create link '%s'"
msgstr "创建链接 '%s' 失败"
-#: builtin/clone.c:464
+#: builtin/clone.c:467
#, c-format
msgid "failed to copy file to '%s'"
msgstr "拷贝文件至 '%s' 失败"
-#: builtin/clone.c:469
+#: builtin/clone.c:472
#, c-format
msgid "failed to iterate over '%s'"
msgstr "无法在 '%s' 上迭代"
-#: builtin/clone.c:494
+#: builtin/clone.c:499
#, c-format
msgid "done.\n"
msgstr "完成。\n"
-#: builtin/clone.c:508
+#: builtin/clone.c:513
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -11961,134 +12721,144 @@
"您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"
"'git restore --source=HEAD :/' 重试\n"
-#: builtin/clone.c:585
+#: builtin/clone.c:590
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "不能发现要克隆的远程分支 %s。"
-#: builtin/clone.c:705
+#: builtin/clone.c:709
#, c-format
msgid "unable to update %s"
msgstr "不能更新 %s"
-#: builtin/clone.c:753
+#: builtin/clone.c:757
msgid "failed to initialize sparse-checkout"
msgstr "无法初始化稀疏检出"
-#: builtin/clone.c:776
+#: builtin/clone.c:780
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"
-#: builtin/clone.c:807
+#: builtin/clone.c:812
msgid "unable to checkout working tree"
msgstr "不能检出工作区"
-#: builtin/clone.c:862
+#: builtin/clone.c:887
msgid "unable to write parameters to config file"
msgstr "无法将参数写入配置文件"
-#: builtin/clone.c:925
+#: builtin/clone.c:950
msgid "cannot repack to clean up"
msgstr "无法执行 repack 来清理"
-#: builtin/clone.c:927
+#: builtin/clone.c:952
msgid "cannot unlink temporary alternates file"
msgstr "无法删除临时的 alternates 文件"
-#: builtin/clone.c:965 builtin/receive-pack.c:1950
+#: builtin/clone.c:993 builtin/receive-pack.c:2493
msgid "Too many arguments."
msgstr "太多参数。"
-#: builtin/clone.c:969
+#: builtin/clone.c:997
msgid "You must specify a repository to clone."
msgstr "您必须指定一个仓库来克隆。"
-#: builtin/clone.c:982
+#: builtin/clone.c:1010
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare 和 --origin %s 选项不兼容。"
-#: builtin/clone.c:985
+#: builtin/clone.c:1013
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare 和 --separate-git-dir 选项不兼容。"
-#: builtin/clone.c:998
+#: builtin/clone.c:1026
#, c-format
msgid "repository '%s' does not exist"
msgstr "仓库 '%s' 不存在"
-#: builtin/clone.c:1004 builtin/fetch.c:1796
+#: builtin/clone.c:1030 builtin/fetch.c:1951
#, c-format
msgid "depth %s is not a positive number"
msgstr "深度 %s 不是一个正数"
-#: builtin/clone.c:1014
+#: builtin/clone.c:1040
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"
-#: builtin/clone.c:1024
+#: builtin/clone.c:1046
+#, c-format
+msgid "repository path '%s' already exists and is not an empty directory."
+msgstr "仓库路径 '%s' 已经存在，并且不是一个空目录。"
+
+#: builtin/clone.c:1060
#, c-format
msgid "working tree '%s' already exists."
msgstr "工作区 '%s' 已经存在。"
-#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271
-#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327
+#: builtin/clone.c:1075 builtin/clone.c:1096 builtin/difftool.c:271
+#: builtin/log.c:1986 builtin/worktree.c:282 builtin/worktree.c:314
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "不能为 '%s' 创建先导目录"
-#: builtin/clone.c:1044
+#: builtin/clone.c:1080
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "不能创建工作区目录 '%s'"
-#: builtin/clone.c:1064
+#: builtin/clone.c:1100
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "克隆到纯仓库 '%s'...\n"
-#: builtin/clone.c:1066
+#: builtin/clone.c:1102
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "正克隆到 '%s'...\n"
-#: builtin/clone.c:1090
+#: builtin/clone.c:1126
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
-#: builtin/clone.c:1154
+#: builtin/clone.c:1170 builtin/remote.c:200 builtin/remote.c:705
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr "'%s' 不是一个有效的远程名称"
+
+#: builtin/clone.c:1211
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1156
+#: builtin/clone.c:1213
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "--shallow-since 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1158
+#: builtin/clone.c:1215
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr "--shallow-exclude 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1160
+#: builtin/clone.c:1217
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1163
+#: builtin/clone.c:1220
msgid "source repository is shallow, ignoring --local"
msgstr "源仓库是浅克隆，忽略 --local"
-#: builtin/clone.c:1168
+#: builtin/clone.c:1225
msgid "--local is ignored"
msgstr "--local 被忽略"
-#: builtin/clone.c:1243 builtin/clone.c:1251
+#: builtin/clone.c:1315 builtin/clone.c:1323
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "远程分支 %s 在上游 %s 未发现"
-#: builtin/clone.c:1254
+#: builtin/clone.c:1326
msgid "You appear to have cloned an empty repository."
msgstr "您似乎克隆了一个空仓库。"
@@ -12124,6 +12894,110 @@
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:187 builtin/log.c:1768
+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 "
@@ -12137,7 +13011,7 @@
msgid "duplicate parent %s ignored"
msgstr "忽略重复的父提交 %s"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:557
#, c-format
msgid "not a valid object name %s"
msgstr "不是一个有效的对象名 %s"
@@ -12165,13 +13039,13 @@
msgid "id of a parent commit object"
msgstr "父提交对象 ID"
-#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477
-#: builtin/tag.c:412
+#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:282
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1537
+#: builtin/tag.c:445
msgid "message"
msgstr "说明"
-#: builtin/commit-tree.c:115 builtin/commit.c:1501
+#: builtin/commit-tree.c:115 builtin/commit.c:1504
msgid "commit message"
msgstr "提交说明"
@@ -12179,8 +13053,8 @@
msgid "read commit log message from file"
msgstr "从文件中读取提交说明"
-#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288
-#: builtin/pull.c:175 builtin/revert.c:118
+#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:299
+#: builtin/pull.c:176 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "GPG 提交签名"
@@ -12224,10 +13098,14 @@
"\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"
@@ -12248,134 +13126,136 @@
" 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:351
+#: builtin/commit.c:348
msgid "--pathspec-from-file with -a does not make sense"
msgstr "--pathspec-from-file 和 -a 在一起没有意义"
-#: builtin/commit.c:364
+#: builtin/commit.c:361
msgid "No paths with --include/--only does not make sense."
msgstr "参数 --include/--only 不跟路径没有意义。"
-#: builtin/commit.c:376
+#: builtin/commit.c:373
msgid "unable to create temporary index"
msgstr "不能创建临时索引"
-#: builtin/commit.c:385
+#: builtin/commit.c:382
msgid "interactive add failed"
msgstr "交互式添加失败"
-#: builtin/commit.c:400
+#: builtin/commit.c:397
msgid "unable to update temporary index"
msgstr "无法更新临时索引"
-#: builtin/commit.c:402
+#: builtin/commit.c:399
msgid "Failed to update main cache tree"
msgstr "不能更新树的主缓存"
-#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496
+#: 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:479
+#: builtin/commit.c:476
msgid "cannot do a partial commit during a merge."
msgstr "在合并过程中不能做部分提交。"
-#: builtin/commit.c:481
+#: builtin/commit.c:478
msgid "cannot do a partial commit during a cherry-pick."
msgstr "在拣选过程中不能做部分提交。"
-#: builtin/commit.c:489
+#: 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:508
+#: builtin/commit.c:507
msgid "unable to write temporary index file"
msgstr "无法写临时索引文件"
-#: builtin/commit.c:606
+#: builtin/commit.c:605
#, c-format
msgid "commit '%s' lacks author header"
msgstr "提交 '%s' 缺少作者信息"
-#: builtin/commit.c:608
+#: builtin/commit.c:607
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "提交 '%s' 有格式错误的作者信息"
-#: builtin/commit.c:627
+#: builtin/commit.c:626
msgid "malformed --author parameter"
msgstr "格式错误的 --author 参数"
-#: builtin/commit.c:680
+#: 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:718 builtin/commit.c:751 builtin/commit.c:1097
+#: 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:730 builtin/shortlog.c:319
+#: builtin/commit.c:729 builtin/shortlog.c:413
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "（正从标准输入中读取日志信息）\n"
-#: builtin/commit.c:732
+#: builtin/commit.c:731
msgid "could not read log from standard input"
msgstr "不能从标准输入中读取日志信息"
-#: builtin/commit.c:736
+#: builtin/commit.c:735
#, c-format
msgid "could not read log file '%s'"
msgstr "不能读取日志文件 '%s'"
-#: builtin/commit.c:767 builtin/commit.c:783
+#: builtin/commit.c:766 builtin/commit.c:782
msgid "could not read SQUASH_MSG"
msgstr "不能读取 SQUASH_MSG"
-#: builtin/commit.c:774
+#: builtin/commit.c:773
msgid "could not read MERGE_MSG"
msgstr "不能读取 MERGE_MSG"
-#: builtin/commit.c:834
+#: builtin/commit.c:833
msgid "could not write commit template"
msgstr "不能写提交模版"
#: builtin/commit.c:853
-#, c-format
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
+"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:858
-#, c-format
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
+"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:871
+#: builtin/commit.c:868
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -12384,7 +13264,7 @@
"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n"
"说明将会终止提交。\n"
-#: builtin/commit.c:879
+#: builtin/commit.c:876
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -12395,24 +13275,24 @@
"也可以删除它们。一个空的提交说明将会终止提交。\n"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:896
+#: builtin/commit.c:893
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%s作者： %.*s <%.*s>"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:904
+#: builtin/commit.c:901
#, c-format
msgid "%sDate: %s"
msgstr "%s日期： %s"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:911
+#: builtin/commit.c:908
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%s提交者：%.*s <%.*s>"
-#: builtin/commit.c:929
+#: builtin/commit.c:926
msgid "Cannot read index"
msgstr "无法读取索引"
@@ -12420,7 +13300,7 @@
msgid "Error building trees"
msgstr "无法创建树对象"
-#: builtin/commit.c:1011 builtin/tag.c:275
+#: builtin/commit.c:1011 builtin/tag.c:308
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
@@ -12435,7 +13315,7 @@
msgid "Invalid ignored mode '%s'"
msgstr "无效的忽略模式 '%s'"
-#: builtin/commit.c:1087 builtin/commit.c:1327
+#: builtin/commit.c:1087 builtin/commit.c:1331
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "无效的未追踪文件参数 '%s'"
@@ -12460,255 +13340,259 @@
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
-#: builtin/commit.c:1188
+#: 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:1198
+#: builtin/commit.c:1200
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
-#: builtin/commit.c:1200
+#: builtin/commit.c:1202
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "选项 -m 不能和 -c/-C/-F 同时使用。"
-#: builtin/commit.c:1208
+#: 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:1225
+#: 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:1231
+#: builtin/commit.c:1235
#, c-format
msgid "paths '%s ...' with -a does not make sense"
msgstr "路径 '%s ...' 和 -a 选项同时使用没有意义"
-#: builtin/commit.c:1362 builtin/commit.c:1524
+#: builtin/commit.c:1366 builtin/commit.c:1527
msgid "show status concisely"
msgstr "以简洁的格式显示状态"
-#: builtin/commit.c:1364 builtin/commit.c:1526
+#: builtin/commit.c:1368 builtin/commit.c:1529
msgid "show branch information"
msgstr "显示分支信息"
-#: builtin/commit.c:1366
+#: builtin/commit.c:1370
msgid "show stash information"
msgstr "显示贮藏区信息"
-#: builtin/commit.c:1368 builtin/commit.c:1528
+#: builtin/commit.c:1372 builtin/commit.c:1531
msgid "compute full ahead/behind values"
msgstr "计算完整的领先/落后值"
-#: builtin/commit.c:1370
+#: builtin/commit.c:1374
msgid "version"
msgstr "版本"
-#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549
-#: builtin/worktree.c:643
+#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560
+#: builtin/worktree.c:679
msgid "machine-readable output"
msgstr "机器可读的输出"
-#: builtin/commit.c:1373 builtin/commit.c:1532
+#: builtin/commit.c:1377 builtin/commit.c:1535
msgid "show status in long format (default)"
msgstr "以长格式显示状态（默认）"
-#: builtin/commit.c:1376 builtin/commit.c:1535
+#: builtin/commit.c:1380 builtin/commit.c:1538
msgid "terminate entries with NUL"
msgstr "条目以 NUL 字符结尾"
-#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538
-#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
-#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336
+#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541
+#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
+#: builtin/fast-export.c:1204 builtin/rebase.c:1412 parse-options.h:336
msgid "mode"
msgstr "模式"
-#: builtin/commit.c:1379 builtin/commit.c:1538
+#: 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:1383
+#: builtin/commit.c:1387
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
msgstr ""
"显示已忽略的文件，可选模式：traditional、matching、no。（默认：traditional）"
-#: builtin/commit.c:1385 parse-options.h:192
+#: builtin/commit.c:1389 parse-options.h:192
msgid "when"
msgstr "何时"
-#: builtin/commit.c:1386
+#: builtin/commit.c:1390
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
"忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"
-#: builtin/commit.c:1388
+#: builtin/commit.c:1392
msgid "list untracked files in columns"
msgstr "以列的方式显示未跟踪的文件"
-#: builtin/commit.c:1389
+#: builtin/commit.c:1393
msgid "do not detect renames"
msgstr "不检测重命名"
-#: builtin/commit.c:1391
+#: builtin/commit.c:1395
msgid "detect renames, optionally set similarity index"
msgstr "检测重命名，可以设置索引相似度"
-#: builtin/commit.c:1411
+#: builtin/commit.c:1415
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr "不支持已忽略和未跟踪文件参数的组合"
-#: builtin/commit.c:1494
+#: builtin/commit.c:1497
msgid "suppress summary after successful commit"
msgstr "提交成功后不显示概述信息"
-#: builtin/commit.c:1495
+#: builtin/commit.c:1498
msgid "show diff in commit message template"
msgstr "在提交说明模板里显示差异"
-#: builtin/commit.c:1497
+#: builtin/commit.c:1500
msgid "Commit message options"
msgstr "提交说明选项"
-#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414
+#: builtin/commit.c:1501 builtin/merge.c:286 builtin/tag.c:447
msgid "read message from file"
msgstr "从文件中读取提交说明"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1502
msgid "author"
msgstr "作者"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1502
msgid "override author for commit"
msgstr "提交时覆盖作者"
-#: builtin/commit.c:1500 builtin/gc.c:538
+#: builtin/commit.c:1503 builtin/gc.c:550
msgid "date"
msgstr "日期"
-#: builtin/commit.c:1500
+#: builtin/commit.c:1503
msgid "override date for commit"
msgstr "提交时覆盖日期"
-#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504
-#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92
+#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507
+#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:90
msgid "commit"
msgstr "提交"
-#: builtin/commit.c:1502
+#: builtin/commit.c:1505
msgid "reuse and edit message from specified commit"
msgstr "重用并编辑指定提交的提交说明"
-#: builtin/commit.c:1503
+#: builtin/commit.c:1506
msgid "reuse message from specified commit"
msgstr "重用指定提交的提交说明"
-#: builtin/commit.c:1504
+#: builtin/commit.c:1507
msgid "use autosquash formatted message to fixup specified commit"
msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
-#: builtin/commit.c:1505
+#: builtin/commit.c:1508
msgid "use autosquash formatted message to squash specified commit"
msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
-#: builtin/commit.c:1506
+#: builtin/commit.c:1509
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"
-#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290
-#: builtin/pull.c:144 builtin/revert.c:110
-msgid "add Signed-off-by:"
-msgstr "添加 Signed-off-by: 签名"
+#: builtin/commit.c:1510 builtin/log.c:1743 builtin/merge.c:302
+#: builtin/pull.c:145 builtin/revert.c:110
+msgid "add a Signed-off-by trailer"
+msgstr "添加 Signed-off-by 尾注"
-#: builtin/commit.c:1508
+#: builtin/commit.c:1511
msgid "use specified template file"
msgstr "使用指定的模板文件"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1512
msgid "force edit of commit"
msgstr "强制编辑提交"
-#: builtin/commit.c:1511
+#: builtin/commit.c:1514
msgid "include status in commit message template"
msgstr "在提交说明模板里包含状态信息"
-#: builtin/commit.c:1516
+#: builtin/commit.c:1519
msgid "Commit contents options"
msgstr "提交内容选项"
-#: builtin/commit.c:1517
+#: builtin/commit.c:1520
msgid "commit all changed files"
msgstr "提交所有改动的文件"
-#: builtin/commit.c:1518
+#: builtin/commit.c:1521
msgid "add specified files to index for commit"
msgstr "添加指定的文件到索引区等待提交"
-#: builtin/commit.c:1519
+#: builtin/commit.c:1522
msgid "interactively add files"
msgstr "交互式添加文件"
-#: builtin/commit.c:1520
+#: builtin/commit.c:1523
msgid "interactively add changes"
msgstr "交互式添加变更"
-#: builtin/commit.c:1521
+#: builtin/commit.c:1524
msgid "commit only specified files"
msgstr "只提交指定的文件"
-#: builtin/commit.c:1522
+#: builtin/commit.c:1525
msgid "bypass pre-commit and commit-msg hooks"
msgstr "绕过 pre-commit 和 commit-msg 钩子"
-#: builtin/commit.c:1523
+#: builtin/commit.c:1526
msgid "show what would be committed"
msgstr "显示将要提交的内容"
-#: builtin/commit.c:1536
+#: builtin/commit.c:1539
msgid "amend previous commit"
msgstr "修改先前的提交"
-#: builtin/commit.c:1537
+#: builtin/commit.c:1540
msgid "bypass post-rewrite hook"
msgstr "绕过 post-rewrite 钩子"
-#: builtin/commit.c:1544
+#: builtin/commit.c:1547
msgid "ok to record an empty change"
msgstr "允许一个空提交"
-#: builtin/commit.c:1546
+#: builtin/commit.c:1549
msgid "ok to record a change with an empty message"
msgstr "允许空的提交说明"
-#: builtin/commit.c:1619
+#: builtin/commit.c:1622
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "损坏的 MERGE_HEAD 文件（%s）"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1629
msgid "could not read MERGE_MODE"
msgstr "不能读取 MERGE_MODE"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1650
#, c-format
msgid "could not read commit message: %s"
msgstr "不能读取提交说明：%s"
-#: builtin/commit.c:1652
+#: builtin/commit.c:1657
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "终止提交因为提交说明为空。\n"
-#: builtin/commit.c:1657
+#: builtin/commit.c:1662
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "终止提交；您未更改来自模版的提交说明。\n"
-#: builtin/commit.c:1691
+#: 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"
@@ -12717,284 +13601,221 @@
"仓库已更新，但无法写 new_index 文件。检查是否磁盘已满或\n"
"磁盘配额已耗尽，然后执行 \"git restore --staged :/\" 恢复。"
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:17
-msgid ""
-"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
-msgstr ""
-"git commit-graph verify [--object-dir <对象目录>] [--shallow] [--"
-"[no-]progress]"
-
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:22
-msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
-msgstr ""
-"git commit-graph write [--object-dir <对象目录>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
-
-#: builtin/commit-graph.c:52
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "无法找到和 %s 匹配的对象目录"
-
-#: builtin/commit-graph.c:68 builtin/commit-graph.c:125
-#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657
-msgid "dir"
-msgstr "目录"
-
-#: builtin/commit-graph.c:69 builtin/commit-graph.c:126
-#: builtin/commit-graph.c:211
-msgid "The object directory to store the graph"
-msgstr "保存图形的对象目录"
-
-#: builtin/commit-graph.c:71
-msgid "if the commit-graph is split, only verify the tip file"
-msgstr "如果提交图形被拆分，只验证头一个文件"
-
-#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23
-#, c-format
-msgid "Could not open commit-graph '%s'"
-msgstr "无法打开提交图形 '%s'"
-
-#: builtin/commit-graph.c:128
-msgid "start walk at all refs"
-msgstr "开始遍历所有引用"
-
-#: builtin/commit-graph.c:130
-msgid "scan pack-indexes listed by stdin for commits"
-msgstr "从标准输入中的包索引文件列表中扫描提交"
-
-#: builtin/commit-graph.c:132
-msgid "start walk at commits listed by stdin"
-msgstr "从标准输入中的提交开始扫描"
-
-#: builtin/commit-graph.c:134
-msgid "include all commits already in the commit-graph file"
-msgstr "包含 commit-graph 文件中已有所有提交"
-
-#: builtin/commit-graph.c:137
-msgid "allow writing an incremental commit-graph file"
-msgstr "允许写一个增量提交图形文件"
-
-#: builtin/commit-graph.c:139 builtin/commit-graph.c:143
-msgid "maximum number of commits in a non-base split commit-graph"
-msgstr "在非基本拆分提交图形中的最大提交数"
-
-#: builtin/commit-graph.c:141
-msgid "maximum ratio between two levels of a split commit-graph"
-msgstr "一个拆分提交图形的两个级别之间的最大比率"
-
-#: builtin/commit-graph.c:159
-msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
-msgstr "不能同时使用 --reachable、--stdin-commits 或 --stdin-packs"
-
#: builtin/config.c:11
msgid "git config [<options>]"
msgstr "git config [<选项>]"
-#: builtin/config.c:104 builtin/env--helper.c:23
+#: builtin/config.c:109 builtin/env--helper.c:27
#, c-format
msgid "unrecognized --type argument, %s"
msgstr "未能识别的 --type 参数，%s"
-#: builtin/config.c:116
+#: builtin/config.c:121
msgid "only one type at a time"
msgstr "一次只能一个类型"
-#: builtin/config.c:125
+#: builtin/config.c:130
msgid "Config file location"
msgstr "配置文件位置"
-#: builtin/config.c:126
+#: builtin/config.c:131
msgid "use global config file"
msgstr "使用全局配置文件"
-#: builtin/config.c:127
+#: builtin/config.c:132
msgid "use system config file"
msgstr "使用系统级配置文件"
-#: builtin/config.c:128
+#: builtin/config.c:133
msgid "use repository config file"
msgstr "使用仓库级配置文件"
-#: builtin/config.c:129
+#: builtin/config.c:134
msgid "use per-worktree config file"
msgstr "使用工作区级别的配置文件"
-#: builtin/config.c:130
+#: builtin/config.c:135
msgid "use given config file"
msgstr "使用指定的配置文件"
-#: builtin/config.c:131
+#: builtin/config.c:136
msgid "blob-id"
msgstr "数据对象 ID"
-#: builtin/config.c:131
+#: builtin/config.c:136
msgid "read config from given blob object"
msgstr "从给定的数据对象读取配置"
-#: builtin/config.c:132
+#: builtin/config.c:137
msgid "Action"
msgstr "操作"
-#: builtin/config.c:133
-msgid "get value: name [value-regex]"
-msgstr "获取值：name [value-regex]"
+#: builtin/config.c:138
+msgid "get value: name [value-pattern]"
+msgstr "获取值：名称 [值模式]"
-#: builtin/config.c:134
-msgid "get all values: key [value-regex]"
-msgstr "获得所有的值：key [value-regex]"
+#: builtin/config.c:139
+msgid "get all values: key [value-pattern]"
+msgstr "获得所有的值：键 [值模式]"
-#: builtin/config.c:135
-msgid "get values for regexp: name-regex [value-regex]"
-msgstr "根据正则表达式获得值：name-regex [value-regex]"
+#: builtin/config.c:140
+msgid "get values for regexp: name-regex [value-pattern]"
+msgstr "根据正则表达式获得值：名称正则 [值模式]"
-#: builtin/config.c:136
+#: builtin/config.c:141
msgid "get value specific for the URL: section[.var] URL"
msgstr "获得 URL 取值：section[.var] URL"
-#: builtin/config.c:137
-msgid "replace all matching variables: name value [value_regex]"
-msgstr "替换所有匹配的变量：name value [value_regex]"
+#: builtin/config.c:142
+msgid "replace all matching variables: name value [value-pattern]"
+msgstr "替换所有匹配的变量：名称 值 [值模式]"
-#: builtin/config.c:138
+#: builtin/config.c:143
msgid "add a new variable: name value"
-msgstr "添加一个新的变量：name value"
+msgstr "添加一个新的变量：名称 值"
-#: builtin/config.c:139
-msgid "remove a variable: name [value-regex]"
-msgstr "删除一个变量：name [value-regex]"
+#: builtin/config.c:144
+msgid "remove a variable: name [value-pattern]"
+msgstr "删除一个变量：名称 [值模式]"
-#: builtin/config.c:140
-msgid "remove all matches: name [value-regex]"
-msgstr "删除所有匹配项：name [value-regex]"
+#: builtin/config.c:145
+msgid "remove all matches: name [value-pattern]"
+msgstr "删除所有匹配项：名称 [值模式]"
-#: builtin/config.c:141
+#: builtin/config.c:146
msgid "rename section: old-name new-name"
msgstr "重命名小节：old-name new-name"
-#: builtin/config.c:142
+#: builtin/config.c:147
msgid "remove a section: name"
msgstr "删除一个小节：name"
-#: builtin/config.c:143
+#: builtin/config.c:148
msgid "list all"
msgstr "列出所有"
-#: builtin/config.c:144
+#: builtin/config.c:149
+msgid "use string equality when comparing values to 'value-pattern'"
+msgstr "在比较值与 '值模式' 时，使用字符串字面比较"
+
+#: builtin/config.c:150
msgid "open an editor"
msgstr "打开一个编辑器"
-#: builtin/config.c:145
+#: builtin/config.c:151
msgid "find the color configured: slot [default]"
msgstr "获得配置的颜色：配置 [默认]"
-#: builtin/config.c:146
+#: builtin/config.c:152
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "获得颜色设置：配置 [stdout-is-tty]"
-#: builtin/config.c:147
+#: builtin/config.c:153
msgid "Type"
msgstr "类型"
-#: builtin/config.c:148 builtin/env--helper.c:38
+#: builtin/config.c:154 builtin/env--helper.c:43
msgid "value is given this type"
msgstr "取值为该类型"
-#: builtin/config.c:149
+#: builtin/config.c:155
msgid "value is \"true\" or \"false\""
msgstr "值是 \"true\" 或 \"false\""
-#: builtin/config.c:150
+#: builtin/config.c:156
msgid "value is decimal number"
msgstr "值是十进制数"
-#: builtin/config.c:151
+#: builtin/config.c:157
msgid "value is --bool or --int"
-msgstr "值是 --bool or --int"
+msgstr "值是 --bool 或 --int"
-#: builtin/config.c:152
+#: builtin/config.c:158
+msgid "value is --bool or string"
+msgstr "值是 --bool 或字符串"
+
+#: builtin/config.c:159
msgid "value is a path (file or directory name)"
msgstr "值是一个路径（文件或目录名）"
-#: builtin/config.c:153
+#: builtin/config.c:160
msgid "value is an expiry date"
msgstr "值是一个到期日期"
-#: builtin/config.c:154
+#: builtin/config.c:161
msgid "Other"
msgstr "其它"
-#: builtin/config.c:155
+#: builtin/config.c:162
msgid "terminate values with NUL byte"
msgstr "终止值是 NUL 字节"
-#: builtin/config.c:156
+#: builtin/config.c:163
msgid "show variable names only"
msgstr "只显示变量名"
-#: builtin/config.c:157
+#: builtin/config.c:164
msgid "respect include directives on lookup"
msgstr "查询时参照 include 指令递归查找"
-#: builtin/config.c:158
+#: builtin/config.c:165
msgid "show origin of config (file, standard input, blob, command line)"
msgstr "显示配置的来源（文件、标准输入、数据对象，或命令行）"
-#: builtin/config.c:159
+#: builtin/config.c:166
msgid "show scope of config (worktree, local, global, system, command)"
msgstr "显示配置的作用域（工作区、本地、全局、系统、命令）"
-#: builtin/config.c:160 builtin/env--helper.c:40
+#: builtin/config.c:167 builtin/env--helper.c:45
msgid "value"
msgstr "取值"
-#: builtin/config.c:160
+#: builtin/config.c:167
msgid "with --get, use default value when missing entry"
msgstr "使用 --get 参数，当缺少设置时使用默认值"
-#: builtin/config.c:174
+#: builtin/config.c:181
#, c-format
msgid "wrong number of arguments, should be %d"
msgstr "错误的参数个数，应该为 %d 个"
-#: builtin/config.c:176
+#: builtin/config.c:183
#, c-format
msgid "wrong number of arguments, should be from %d to %d"
msgstr "错误的参数个数，应该为从 %d 个到 %d 个"
-#: builtin/config.c:324
+#: builtin/config.c:339
#, c-format
msgid "invalid key pattern: %s"
msgstr "无效键名模式：%s"
-#: builtin/config.c:360
+#: builtin/config.c:377
#, c-format
msgid "failed to format default config value: %s"
msgstr "格式化默认配置值失败：%s"
-#: builtin/config.c:417
+#: builtin/config.c:441
#, c-format
msgid "cannot parse color '%s'"
msgstr "无法解析颜色 '%s'"
-#: builtin/config.c:459
+#: builtin/config.c:483
msgid "unable to parse default color value"
msgstr "无法解析默认颜色值"
-#: builtin/config.c:512 builtin/config.c:768
+#: builtin/config.c:536 builtin/config.c:833
msgid "not in a git directory"
msgstr "不在 git 仓库中"
-#: builtin/config.c:515
+#: builtin/config.c:539
msgid "writing to stdin is not supported"
msgstr "不支持写到标准输入"
-#: builtin/config.c:518
+#: builtin/config.c:542
msgid "writing config blobs is not supported"
msgstr "不支持写到配置数据对象"
-#: builtin/config.c:603
+#: builtin/config.c:627
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -13009,23 +13830,27 @@
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:627
+#: builtin/config.c:652
msgid "only one config file at a time"
msgstr "一次只能有一个配置文件"
-#: builtin/config.c:632
+#: builtin/config.c:658
msgid "--local can only be used inside a git repository"
-msgstr "--local 只能在一个仓库内使用"
+msgstr "--local 只能在 git 仓库内使用"
-#: builtin/config.c:635
+#: builtin/config.c:660
msgid "--blob can only be used inside a git repository"
-msgstr "--blob 只能在一个仓库内使用"
+msgstr "--blob 只能在 git 仓库内使用"
-#: builtin/config.c:655
+#: builtin/config.c:662
+msgid "--worktree can only be used inside a git repository"
+msgstr "--worktree 只能在 git 仓库内使用"
+
+#: builtin/config.c:684
msgid "$HOME not set"
msgstr "$HOME 未设置"
-#: builtin/config.c:679
+#: builtin/config.c:708
msgid ""
"--worktree cannot be used with multiple working trees unless the config\n"
"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -13034,51 +13859,55 @@
"不能和多个工作区一起使用 --worktree，除非启用 worktreeConfig 配置扩展。\n"
"详情请阅读“git help worktree”的“CONFIGURATION FILE”小节"
-#: builtin/config.c:714
+#: builtin/config.c:743
msgid "--get-color and variable type are incoherent"
msgstr "--get-color 和变量类型不兼容"
-#: builtin/config.c:719
+#: builtin/config.c:748
msgid "only one action at a time"
msgstr "一次只能有一个动作"
-#: builtin/config.c:732
+#: builtin/config.c:761
msgid "--name-only is only applicable to --list or --get-regexp"
msgstr "--name-only 仅适用于 --list 或 --get-regexp"
-#: builtin/config.c:738
+#: builtin/config.c:767
msgid ""
"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
"list"
msgstr "--show-origin 仅适用于 --get、--get-all、--get-regexp 和 --list"
-#: builtin/config.c:744
+#: builtin/config.c:773
msgid "--default is only applicable to --get"
msgstr "--default 仅适用于 --get"
-#: builtin/config.c:757
+#: builtin/config.c:806
+msgid "--fixed-value only applies with 'value-pattern'"
+msgstr "--fixed-value 仅适用于有 '值模式'"
+
+#: builtin/config.c:822
#, c-format
msgid "unable to read config file '%s'"
msgstr "无法读取配置文件 '%s'"
-#: builtin/config.c:760
+#: builtin/config.c:825
msgid "error processing config file(s)"
msgstr "处理配置文件出错"
-#: builtin/config.c:770
+#: builtin/config.c:835
msgid "editing stdin is not supported"
msgstr "不支持编辑标准输入"
-#: builtin/config.c:772
+#: builtin/config.c:837
msgid "editing blobs is not supported"
msgstr "不支持编辑数据对象"
-#: builtin/config.c:786
+#: builtin/config.c:851
#, c-format
msgid "cannot create configuration file %s"
msgstr "不能创建配置文件 %s"
-#: builtin/config.c:799
+#: builtin/config.c:864
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -13087,7 +13916,7 @@
"无法用一个值覆盖多个值\n"
" 使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
-#: builtin/config.c:873 builtin/config.c:884
+#: builtin/config.c:943 builtin/config.c:954
#, c-format
msgid "no such section: %s"
msgstr "无此小节：%s"
@@ -13100,6 +13929,36 @@
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 套接字"
+
+#: builtin/credential-cache.c:154
+msgid "credential-cache unavailable; no unix socket support"
+msgstr "credential-cache 不可用，不支持 unix 套接字"
+
+#: builtin/credential-store.c:66
+#, c-format
+msgid "unable to get credential storage lock in %d ms"
+msgstr "无法在 %d ms 获得凭证存储锁"
+
#: builtin/describe.c:26
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<选项>] [<提交号>...]"
@@ -13108,49 +13967,44 @@
msgid "git describe [<options>] --dirty"
msgstr "git describe [<选项>] --dirty"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "head"
msgstr "头"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "lightweight"
msgstr "轻量级的"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "annotated"
msgstr "附注的"
-#: builtin/describe.c:275
+#: builtin/describe.c:277
#, c-format
msgid "annotated tag %s not available"
msgstr "附注标签 %s 无效"
-#: builtin/describe.c:279
-#, c-format
-msgid "annotated tag %s has no embedded name"
-msgstr "附注标签 %s 没有嵌入名称"
-
#: builtin/describe.c:281
#, c-format
-msgid "tag '%s' is really '%s' here"
-msgstr "标签 '%s' 的确是在 '%s'"
+msgid "tag '%s' is externally known as '%s'"
+msgstr "标签 '%s' 在外部被认为是 '%s'"
-#: builtin/describe.c:325
+#: builtin/describe.c:328
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "没有标签准确匹配 '%s'"
-#: builtin/describe.c:327
+#: builtin/describe.c:330
#, c-format
msgid "No exact match on refs or tags, searching to describe\n"
msgstr "没有精确匹配到引用或标签，继续搜索进行描述\n"
-#: builtin/describe.c:394
+#: builtin/describe.c:397
#, c-format
msgid "finished search at %s\n"
msgstr "完成搜索 %s\n"
-#: builtin/describe.c:421
+#: builtin/describe.c:424
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -13159,7 +14013,7 @@
"没有附注标签能描述 '%s'。\n"
"然而，存在未附注标签：尝试 --tags。"
-#: builtin/describe.c:425
+#: builtin/describe.c:428
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -13168,12 +14022,12 @@
"没有标签能描述 '%s'。\n"
"尝试 --always，或者创建一些标签。"
-#: builtin/describe.c:455
+#: builtin/describe.c:458
#, c-format
msgid "traversed %lu commits\n"
msgstr "已遍历 %lu 个提交\n"
-#: builtin/describe.c:458
+#: builtin/describe.c:461
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -13182,122 +14036,140 @@
"发现多于 %i 个标签，列出最近的 %i 个\n"
"在 %s 放弃搜索\n"
-#: builtin/describe.c:526
+#: builtin/describe.c:529
#, c-format
msgid "describe %s\n"
msgstr "描述 %s\n"
-#: builtin/describe.c:529
+#: builtin/describe.c:532
#, c-format
msgid "Not a valid object name %s"
msgstr "不是一个有效的对象名 %s"
-#: builtin/describe.c:537
+#: builtin/describe.c:540
#, c-format
msgid "%s is neither a commit nor blob"
msgstr "%s 既不是提交也不是数据对象"
-#: builtin/describe.c:551
+#: builtin/describe.c:554
msgid "find the tag that comes after the commit"
msgstr "寻找该提交之后的标签"
-#: builtin/describe.c:552
+#: builtin/describe.c:555
msgid "debug search strategy on stderr"
msgstr "在标准错误上调试搜索策略"
-#: builtin/describe.c:553
+#: builtin/describe.c:556
msgid "use any ref"
msgstr "使用任意引用"
-#: builtin/describe.c:554
+#: builtin/describe.c:557
msgid "use any tag, even unannotated"
msgstr "使用任意标签，即使未附带注释"
-#: builtin/describe.c:555
+#: builtin/describe.c:558
msgid "always use long format"
msgstr "始终使用长提交号格式"
-#: builtin/describe.c:556
+#: builtin/describe.c:559
msgid "only follow first parent"
msgstr "只跟随第一个父提交"
-#: builtin/describe.c:559
+#: builtin/describe.c:562
msgid "only output exact matches"
msgstr "只输出精确匹配"
-#: builtin/describe.c:561
+#: builtin/describe.c:564
msgid "consider <n> most recent tags (default: 10)"
msgstr "考虑最近 <n> 个标签（默认：10）"
-#: builtin/describe.c:563
+#: builtin/describe.c:566
msgid "only consider tags matching <pattern>"
msgstr "只考虑匹配 <模式> 的标签"
-#: builtin/describe.c:565
+#: builtin/describe.c:568
msgid "do not consider tags matching <pattern>"
msgstr "不考虑匹配 <模式> 的标签"
-#: builtin/describe.c:567 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:535
msgid "show abbreviated commit object as fallback"
msgstr "显示简写的提交号作为后备"
-#: builtin/describe.c:568 builtin/describe.c:571
+#: builtin/describe.c:571 builtin/describe.c:574
msgid "mark"
msgstr "标记"
-#: builtin/describe.c:569
+#: builtin/describe.c:572
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "对于脏工作区，追加 <标记>（默认：\"-dirty\"）"
-#: builtin/describe.c:572
+#: builtin/describe.c:575
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr "对于损坏的工作区，追加 <标记>（默认：\"-broken\"）"
-#: builtin/describe.c:590
+#: builtin/describe.c:593
msgid "--long is incompatible with --abbrev=0"
msgstr "--long 与 --abbrev=0 不兼容"
-#: builtin/describe.c:619
+#: builtin/describe.c:622
msgid "No names found, cannot describe anything."
msgstr "没有发现名称，无法描述任何东西。"
-#: builtin/describe.c:670
+#: builtin/describe.c:673
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty 与提交号不兼容"
-#: builtin/describe.c:672
+#: builtin/describe.c:675
msgid "--broken is incompatible with commit-ishes"
msgstr "--broken 与提交号不兼容"
-#: builtin/diff.c:84
+#: builtin/diff-tree.c:155
+msgid "--stdin and --merge-base are mutually exclusive"
+msgstr "--stdin 和 --merge-base 是互斥的"
+
+#: builtin/diff-tree.c:157
+msgid "--merge-base only works with two commits"
+msgstr "--merge-base 仅适用于两个提交"
+
+#: builtin/diff.c:92
#, c-format
msgid "'%s': not a regular file or symlink"
msgstr "'%s'：不是一个正规文件或符号链接"
-#: builtin/diff.c:235
+#: builtin/diff.c:259
#, c-format
msgid "invalid option: %s"
msgstr "无效选项：%s"
-#: builtin/diff.c:350
-msgid "Not a git repository"
-msgstr "不是一个 git 仓库"
+#: builtin/diff.c:376
+#, c-format
+msgid "%s...%s: no merge base"
+msgstr "%s...%s：无合并基线"
-#: builtin/diff.c:394
+#: builtin/diff.c:486
+msgid "Not a git repository"
+msgstr "不是 git 仓库"
+
+#: builtin/diff.c:532 builtin/grep.c:682
#, c-format
msgid "invalid object '%s' given."
msgstr "提供了无效对象 '%s'。"
-#: builtin/diff.c:403
+#: builtin/diff.c:543
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "提供了超过两个数据对象：'%s'"
-#: builtin/diff.c:408
+#: builtin/diff.c:548
#, c-format
msgid "unhandled object '%s' given."
msgstr "无法处理的对象 '%s'。"
+#: builtin/diff.c:582
+#, 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 [<选项>] [<提交> [<提交>]] [--] [<路径>...]"
@@ -13322,7 +14194,7 @@
msgid "could not read object %s for symlink %s"
msgstr "无法读取符号链接 %2$s 指向的对象 %1$s"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:412
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
@@ -13330,83 +14202,83 @@
"不支持在目录比较模式（'-d' 和 '--dir-diff'）中采用组合差异格式（'-c' 和 '--"
"cc'）。"
-#: builtin/difftool.c:634
+#: builtin/difftool.c:633
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "两个文件都被修改：'%s' 和 '%s'。"
-#: builtin/difftool.c:636
+#: builtin/difftool.c:635
msgid "working tree file has been left."
msgstr "工作区文件被留了下来。"
-#: builtin/difftool.c:647
+#: builtin/difftool.c:646
#, c-format
msgid "temporary files exist in '%s'."
msgstr "临时文件存在于 '%s'。"
-#: builtin/difftool.c:648
+#: builtin/difftool.c:647
msgid "you may want to cleanup or recover these."
msgstr "您可能想要清理或者恢复它们。"
-#: builtin/difftool.c:697
+#: builtin/difftool.c:696
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "使用 `diff.guitool` 代替 `diff.tool`"
-#: builtin/difftool.c:699
+#: builtin/difftool.c:698
msgid "perform a full-directory diff"
msgstr "执行一个全目录差异比较"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:700
msgid "do not prompt before launching a diff tool"
msgstr "启动差异比较工具之前不提示"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:705
msgid "use symlinks in dir-diff mode"
msgstr "在 dir-diff 模式中使用符号链接"
-#: builtin/difftool.c:707
+#: builtin/difftool.c:706
msgid "tool"
msgstr "工具"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:707
msgid "use the specified diff tool"
msgstr "使用指定的差异比较工具"
-#: builtin/difftool.c:710
+#: builtin/difftool.c:709
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "显示可以用在 `--tool` 参数后的差异工具列表"
-#: builtin/difftool.c:713
+#: builtin/difftool.c:712
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
msgstr "当执行 diff 工具返回非零退出码时，使 'git-difftool' 退出"
-#: builtin/difftool.c:716
+#: builtin/difftool.c:715
msgid "specify a custom command for viewing diffs"
msgstr "指定一个用于查看差异的自定义命令"
-#: builtin/difftool.c:717
+#: builtin/difftool.c:716
msgid "passed to `diff`"
msgstr "传递给 `diff`"
-#: builtin/difftool.c:732
+#: builtin/difftool.c:731
msgid "difftool requires worktree or --no-index"
msgstr "difftool 要求工作区或者 --no-index"
-#: builtin/difftool.c:739
+#: builtin/difftool.c:738
msgid "--dir-diff is incompatible with --no-index"
msgstr "--dir-diff 和 --no-index 不兼容"
-#: builtin/difftool.c:742
+#: builtin/difftool.c:741
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr "--gui、--tool 和 --extcmd 互斥"
-#: builtin/difftool.c:750
+#: builtin/difftool.c:749
msgid "no <tool> given for --tool=<tool>"
msgstr "没有为 --tool=<工具> 参数提供 <工具>"
-#: builtin/difftool.c:757
+#: builtin/difftool.c:756
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
@@ -13414,24 +14286,24 @@
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 `"
@@ -13442,273 +14314,336 @@
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-opts]"
-#: builtin/fast-export.c:853
+#: builtin/fast-export.c:868
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr "错误：除非指定 --mark-tags，否则无法导出嵌套标签。"
-#: builtin/fast-export.c:1152
+#: builtin/fast-export.c:1177
+msgid "--anonymize-map token cannot be empty"
+msgstr "--anonymize-map 取值不能为空"
+
+#: builtin/fast-export.c:1197
msgid "show progress after <n> objects"
msgstr "在 <n> 个对象之后显示进度"
-#: builtin/fast-export.c:1154
+#: builtin/fast-export.c:1199
msgid "select handling of signed tags"
msgstr "选择如何处理签名标签"
-#: builtin/fast-export.c:1157
+#: builtin/fast-export.c:1202
msgid "select handling of tags that tag filtered objects"
msgstr "选择当标签指向被过滤对象时该标签的处理方式"
-#: builtin/fast-export.c:1160
+#: builtin/fast-export.c:1205
msgid "select handling of commit messages in an alternate encoding"
msgstr "选择使用备用编码处理提交说明"
-#: builtin/fast-export.c:1163
-msgid "Dump marks to this file"
+#: builtin/fast-export.c:1208
+msgid "dump marks to this file"
msgstr "把标记存储到这个文件"
-#: builtin/fast-export.c:1165
-msgid "Import marks from this file"
+#: builtin/fast-export.c:1210
+msgid "import marks from this file"
msgstr "从这个文件导入标记"
-#: builtin/fast-export.c:1169
-msgid "Import marks from this file if it exists"
-msgstr "从该文件导入标记（如果存在的话）"
+#: builtin/fast-export.c:1214
+msgid "import marks from this file if it exists"
+msgstr "如果文件存在，从该文件导入标记"
-#: builtin/fast-export.c:1171
-msgid "Fake a tagger when tags lack one"
-msgstr "当标签缺少标记者字段时，假装提供一个"
+#: builtin/fast-export.c:1216
+msgid "fake a tagger when tags lack one"
+msgstr "当标签缺少标记人字段时，假装提供一个"
-#: builtin/fast-export.c:1173
-msgid "Output full tree for each commit"
+#: builtin/fast-export.c:1218
+msgid "output full tree for each commit"
msgstr "每次提交都输出整个树"
-#: builtin/fast-export.c:1175
-msgid "Use the done feature to terminate the stream"
+#: builtin/fast-export.c:1220
+msgid "use the done feature to terminate the stream"
msgstr "使用 done 功能来终止流"
-#: builtin/fast-export.c:1176
-msgid "Skip output of blob data"
+#: builtin/fast-export.c:1221
+msgid "skip output of blob data"
msgstr "跳过数据对象的输出"
-#: builtin/fast-export.c:1177 builtin/log.c:1705
+#: builtin/fast-export.c:1222 builtin/log.c:1815
msgid "refspec"
msgstr "引用规格"
-#: builtin/fast-export.c:1178
-msgid "Apply refspec to exported refs"
+#: builtin/fast-export.c:1223
+msgid "apply refspec to exported refs"
msgstr "对导出的引用应用引用规格"
-#: builtin/fast-export.c:1179
+#: builtin/fast-export.c:1224
msgid "anonymize output"
msgstr "匿名输出"
-#: builtin/fast-export.c:1181
-msgid "Reference parents which are not in fast-export stream by object id"
+#: builtin/fast-export.c:1225
+msgid "from:to"
+msgstr "from:to"
+
+#: builtin/fast-export.c:1226
+msgid "convert <from> to <to> in anonymized output"
+msgstr "在匿名输出中将 <from> 转换为 <to>"
+
+#: builtin/fast-export.c:1229
+msgid "reference parents which are not in fast-export stream by object id"
msgstr "引用父对象 ID 不在 fast-export 流中"
-#: builtin/fast-export.c:1183
-msgid "Show original object ids of blobs/commits"
+#: builtin/fast-export.c:1231
+msgid "show original object ids of blobs/commits"
msgstr "显示数据对象/提交的原始对象 ID"
-#: builtin/fast-export.c:1185
-msgid "Label tags with mark ids"
+#: builtin/fast-export.c:1233
+msgid "label tags with mark ids"
msgstr "对带有标记 ID 的标签做标记"
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1256
+msgid "--anonymize-map without --anonymize does not make sense"
+msgstr "--anonymize-map 而没有 --anonymize 没有意义"
+
+#: builtin/fast-export.c:1271
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
msgstr "不能同时传递参数 --import-marks 和 --import-marks-if-exists"
-#: builtin/fetch.c:34
+#: builtin/fast-import.c:3088
+#, c-format
+msgid "Missing from marks for submodule '%s'"
+msgstr "子模组 '%s' 缺少 from 标记"
+
+#: builtin/fast-import.c:3090
+#, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr "子模组 '%s' 缺少 to 标记"
+
+#: builtin/fast-import.c:3225
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr "预期 'mark' 命令，得到 %s"
+
+#: builtin/fast-import.c:3230
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr "预期 'to' 命令，得到 %s"
+
+#: builtin/fast-import.c:3322
+msgid "Expected format name:filename for submodule rewrite option"
+msgstr "子模组重写选项的预期格式为 name:filename"
+
+#: builtin/fast-import.c:3377
+#, c-format
+msgid "feature '%s' forbidden in input without --allow-unsafe-features"
+msgstr "不带 --allow-unsafe-features 的输入中禁止使用功能 '%s'"
+
+#: builtin/fetch-pack.c:242
+#, 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:35
+#: builtin/fetch.c:36
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<选项>] <组>"
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<选项>]"
-#: builtin/fetch.c:116
+#: builtin/fetch.c:120
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel 不能为负数"
-#: builtin/fetch.c:139 builtin/pull.c:184
+#: builtin/fetch.c:143 builtin/pull.c:185
msgid "fetch from all remotes"
msgstr "从所有的远程抓取"
-#: builtin/fetch.c:141 builtin/pull.c:228
+#: builtin/fetch.c:145 builtin/pull.c:245
msgid "set upstream for git pull/fetch"
msgstr "为 git pull/fetch 设置上游"
-#: builtin/fetch.c:143 builtin/pull.c:187
+#: builtin/fetch.c:147 builtin/pull.c:188
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
-#: builtin/fetch.c:145 builtin/pull.c:190
+#: builtin/fetch.c:149
+msgid "use atomic transaction to update references"
+msgstr "使用原子事务更新引用"
+
+#: builtin/fetch.c:151 builtin/pull.c:191
msgid "path to upload pack on remote end"
msgstr "上传包到远程的路径"
-#: builtin/fetch.c:146
+#: builtin/fetch.c:152
msgid "force overwrite of local reference"
msgstr "强制覆盖本地引用"
-#: builtin/fetch.c:148
+#: builtin/fetch.c:154
msgid "fetch from multiple remotes"
msgstr "从多个远程抓取"
-#: builtin/fetch.c:150 builtin/pull.c:194
+#: builtin/fetch.c:156 builtin/pull.c:195
msgid "fetch all tags and associated objects"
msgstr "抓取所有的标签和关联对象"
-#: builtin/fetch.c:152
+#: builtin/fetch.c:158
msgid "do not fetch all tags (--no-tags)"
msgstr "不抓取任何标签(--no-tags)"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:160
msgid "number of submodules fetched in parallel"
msgstr "子模组获取的并发数"
-#: builtin/fetch.c:156 builtin/pull.c:197
+#: builtin/fetch.c:162 builtin/pull.c:198
msgid "prune remote-tracking branches no longer on remote"
msgstr "清除远程已经不存在的分支的跟踪分支"
-#: builtin/fetch.c:158
+#: builtin/fetch.c:164
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr "清除远程不存在的本地标签，并且替换变更标签"
# 译者：可选值，不能翻译
-#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121
+#: builtin/fetch.c:165 builtin/fetch.c:190 builtin/pull.c:122
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:160
+#: builtin/fetch.c:166
msgid "control recursive fetching of submodules"
msgstr "控制子模组的递归抓取"
-#: builtin/fetch.c:164 builtin/pull.c:205
+#: builtin/fetch.c:171
+msgid "write fetched references to the FETCH_HEAD file"
+msgstr "将获取到的引用写入 FETCH_HEAD 文件"
+
+#: builtin/fetch.c:172 builtin/pull.c:206
msgid "keep downloaded pack"
msgstr "保持下载包"
-#: builtin/fetch.c:166
+#: builtin/fetch.c:174
msgid "allow updating of HEAD ref"
msgstr "允许更新 HEAD 引用"
-#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208
+#: builtin/fetch.c:177 builtin/fetch.c:183 builtin/pull.c:209
+#: builtin/pull.c:218
msgid "deepen history of shallow clone"
msgstr "深化浅克隆的历史"
-#: builtin/fetch.c:171
+#: builtin/fetch.c:179 builtin/pull.c:212
msgid "deepen history of shallow repository based on time"
msgstr "基于时间来深化浅克隆的历史"
-#: builtin/fetch.c:177 builtin/pull.c:211
+#: builtin/fetch.c:185 builtin/pull.c:221
msgid "convert to a complete repository"
msgstr "转换为一个完整的仓库"
-#: builtin/fetch.c:180
+#: builtin/fetch.c:188
msgid "prepend this to submodule path output"
msgstr "在子模组路径输出的前面加上此目录"
-#: builtin/fetch.c:183
+#: builtin/fetch.c:191
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr "递归获取子模组的缺省值（比配置文件优先级低）"
-#: builtin/fetch.c:187 builtin/pull.c:214
+#: builtin/fetch.c:195 builtin/pull.c:224
msgid "accept refs that update .git/shallow"
msgstr "接受更新 .git/shallow 的引用"
-#: builtin/fetch.c:188 builtin/pull.c:216
+#: builtin/fetch.c:196 builtin/pull.c:226
msgid "refmap"
msgstr "引用映射"
-#: builtin/fetch.c:189 builtin/pull.c:217
+#: builtin/fetch.c:197 builtin/pull.c:227
msgid "specify fetch refmap"
msgstr "指定获取操作的引用映射"
-#: builtin/fetch.c:196
+#: builtin/fetch.c:204 builtin/pull.c:240
msgid "report that we have only objects reachable from this object"
msgstr "报告我们只拥有从该对象开始可达的对象"
-#: builtin/fetch.c:199
-msgid "run 'gc --auto' after fetching"
-msgstr "获取后执行 'gc --auto'"
+#: builtin/fetch.c:207 builtin/fetch.c:209
+msgid "run 'maintenance --auto' after fetching"
+msgstr "获取后执行 'maintenance --auto'"
-#: builtin/fetch.c:201 builtin/pull.c:226
+#: builtin/fetch.c:211 builtin/pull.c:243
msgid "check for forced-updates on all updated branches"
msgstr "在所有更新分支上检查强制更新"
-#: builtin/fetch.c:203
+#: builtin/fetch.c:213
msgid "write the commit-graph after fetching"
msgstr "抓取后写提交图"
-#: builtin/fetch.c:513
+#: builtin/fetch.c:215
+msgid "accept refspecs from stdin"
+msgstr "从标准输入获取引用表达式"
+
+#: builtin/fetch.c:526
msgid "Couldn't find remote ref HEAD"
msgstr "无法发现远程 HEAD 引用"
-#: builtin/fetch.c:653
+#: builtin/fetch.c:697
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "配置变量 fetch.output 包含无效值 %s"
-#: builtin/fetch.c:751
+#: builtin/fetch.c:796
#, c-format
msgid "object %s not found"
msgstr "对象 %s 未发现"
-#: builtin/fetch.c:755
+#: builtin/fetch.c:800
msgid "[up to date]"
msgstr "[最新]"
-#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
+#: builtin/fetch.c:813 builtin/fetch.c:829 builtin/fetch.c:901
msgid "[rejected]"
msgstr "[已拒绝]"
-#: builtin/fetch.c:769
+#: builtin/fetch.c:814
msgid "can't fetch in current branch"
msgstr "当前分支下不能执行获取操作"
-#: builtin/fetch.c:779
+#: builtin/fetch.c:824
msgid "[tag update]"
msgstr "[标签更新]"
-#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839
-#: builtin/fetch.c:851
+#: builtin/fetch.c:825 builtin/fetch.c:862 builtin/fetch.c:884
+#: builtin/fetch.c:896
msgid "unable to update local ref"
msgstr "不能更新本地引用"
-#: builtin/fetch.c:784
+#: builtin/fetch.c:829
msgid "would clobber existing tag"
msgstr "会破坏现有的标签"
-#: builtin/fetch.c:806
+#: builtin/fetch.c:851
msgid "[new tag]"
msgstr "[新标签]"
-#: builtin/fetch.c:809
+#: builtin/fetch.c:854
msgid "[new branch]"
msgstr "[新分支]"
-#: builtin/fetch.c:812
+#: builtin/fetch.c:857
msgid "[new ref]"
msgstr "[新引用]"
-#: builtin/fetch.c:851
+#: builtin/fetch.c:896
msgid "forced update"
msgstr "强制更新"
-#: builtin/fetch.c:856
+#: builtin/fetch.c:901
msgid "non-fast-forward"
msgstr "非快进"
-#: builtin/fetch.c:877
+#: builtin/fetch.c:1005
msgid ""
"Fetch normally indicates which branches had a forced update,\n"
"but that check has been disabled. To re-enable, use '--show-forced-updates'\n"
@@ -13718,7 +14653,7 @@
"要重新启用，请使用 '--show-forced-updates' 选项或运行\n"
"'git config fetch.showForcedUpdates true'。"
-#: builtin/fetch.c:881
+#: builtin/fetch.c:1009
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
@@ -13729,22 +14664,22 @@
"花了 %.2f 秒来检查强制更新。您可以使用 '--no-show-forced-updates'\n"
"或运行 'git config fetch.showForcedUpdates false' 以避免此项检查。\n"
-#: builtin/fetch.c:920
+#: builtin/fetch.c:1041
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s 未发送所有必需的对象\n"
-#: builtin/fetch.c:941
+#: builtin/fetch.c:1069
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "拒绝 %s 因为浅克隆不允许被更新"
-#: builtin/fetch.c:1026 builtin/fetch.c:1164
+#: builtin/fetch.c:1146 builtin/fetch.c:1297
#, c-format
msgid "From %.*s\n"
msgstr "来自 %.*s\n"
-#: builtin/fetch.c:1037
+#: builtin/fetch.c:1168
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -13754,57 +14689,57 @@
" 'git remote prune %s' 来删除旧的、有冲突的分支"
# 译者：注意保持前导空格
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1267
#, c-format
msgid " (%s will become dangling)"
msgstr " （%s 将成为悬空状态）"
# 译者：注意保持前导空格
-#: builtin/fetch.c:1135
+#: builtin/fetch.c:1268
#, c-format
msgid " (%s has become dangling)"
msgstr " （%s 已成为悬空状态）"
-#: builtin/fetch.c:1167
+#: builtin/fetch.c:1300
msgid "[deleted]"
msgstr "[已删除]"
-#: builtin/fetch.c:1168 builtin/remote.c:1112
+#: builtin/fetch.c:1301 builtin/remote.c:1118
msgid "(none)"
msgstr "（无）"
-#: builtin/fetch.c:1191
+#: builtin/fetch.c:1324
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "拒绝获取到非纯仓库的当前分支 %s"
-#: builtin/fetch.c:1210
+#: builtin/fetch.c:1343
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
-#: builtin/fetch.c:1213
+#: builtin/fetch.c:1346
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "选项 \"%s\" 为 %s 所忽略\n"
-#: builtin/fetch.c:1421
+#: builtin/fetch.c:1558
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "检测到多分支，和 --set-upstream 不兼容"
-#: builtin/fetch.c:1436
+#: builtin/fetch.c:1573
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "没有为一个远程跟踪分支设置上游"
-#: builtin/fetch.c:1438
+#: builtin/fetch.c:1575
msgid "not setting upstream for a remote tag"
msgstr "没有为一个远程标签设置上游"
-#: builtin/fetch.c:1440
+#: builtin/fetch.c:1577
msgid "unknown branch type"
msgstr "未知的分支类型"
-#: builtin/fetch.c:1442
+#: builtin/fetch.c:1579
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
@@ -13812,92 +14747,100 @@
"未发现源分支。\n"
"您需要使用 --set-upstream 选项指定一个分支。"
-#: builtin/fetch.c:1568 builtin/fetch.c:1631
+#: builtin/fetch.c:1708 builtin/fetch.c:1771
#, c-format
msgid "Fetching %s\n"
msgstr "正在获取 %s\n"
-#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101
+#: builtin/fetch.c:1718 builtin/fetch.c:1773 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr "不能获取 %s"
-#: builtin/fetch.c:1590
+#: builtin/fetch.c:1730
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "无法获取 '%s'（退出码：%d）\n"
-#: builtin/fetch.c:1693
+#: builtin/fetch.c:1834
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定，用以获取新提交。"
-#: builtin/fetch.c:1730
+#: builtin/fetch.c:1870
msgid "You need to specify a tag name."
msgstr "您需要指定一个标签名称。"
-#: builtin/fetch.c:1780
+#: builtin/fetch.c:1935
msgid "Negative depth in --deepen is not supported"
msgstr "--deepen 不支持负数深度"
-#: builtin/fetch.c:1782
+#: builtin/fetch.c:1937
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen 和 --depth 是互斥的"
-#: builtin/fetch.c:1787
+#: builtin/fetch.c:1942
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth 和 --unshallow 不能同时使用"
-#: builtin/fetch.c:1789
+#: builtin/fetch.c:1944
msgid "--unshallow on a complete repository does not make sense"
msgstr "对于一个完整的仓库，参数 --unshallow 没有意义"
-#: builtin/fetch.c:1805
+#: builtin/fetch.c:1961
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all 不能带一个仓库参数"
-#: builtin/fetch.c:1807
+#: builtin/fetch.c:1963
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all 带引用规格没有任何意义"
-#: builtin/fetch.c:1816
+#: builtin/fetch.c:1972
#, c-format
msgid "No such remote or remote group: %s"
msgstr "没有这样的远程或远程组：%s"
-#: builtin/fetch.c:1823
+#: builtin/fetch.c:1979
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "获取组并指定引用规格没有意义"
-#: builtin/fetch.c:1841
+#: builtin/fetch.c:1997
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:2001
+msgid "--atomic can only be used when fetching from one remote"
+msgstr "--atomic 仅在从一个远程仓库获取的时候可用"
+
+#: builtin/fetch.c:2005
+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:671
+#: builtin/fmt-merge-msg.c:18
msgid "populate log with at most <n> entries from shortlog"
msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明"
-#: builtin/fmt-merge-msg.c:674
+#: builtin/fmt-merge-msg.c:21
msgid "alias for --log (deprecated)"
msgstr "参数 --log 的别名（已弃用）"
-#: builtin/fmt-merge-msg.c:677
+#: builtin/fmt-merge-msg.c:24
msgid "text"
msgstr "文本"
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:25
msgid "use <text> as start of message"
msgstr "使用 <文本> 作为提交说明的开始"
-#: builtin/fmt-merge-msg.c:679
+#: builtin/fmt-merge-msg.c:26
msgid "file to read from"
msgstr "从文件中读取"
@@ -13910,8 +14853,8 @@
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>]]"
@@ -13937,7 +14880,7 @@
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:472
msgid "respect format colors"
msgstr "遵照格式中的颜色输出"
@@ -13961,32 +14904,48 @@
msgid "print only refs which don't contain the commit"
msgstr "只打印不包含该提交的引用"
-#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148
+#: builtin/for-each-repo.c:9
+msgid "git for-each-repo --config=<config> <command-args>"
+msgstr "git for-each-repo --config=<配置> <命令参数>"
+
+#: builtin/for-each-repo.c:37
+msgid "config"
+msgstr "配置"
+
+#: builtin/for-each-repo.c:38
+msgid "config key storing a list of repository paths"
+msgstr "存储着仓库路径列表的配置项键名"
+
+#: builtin/for-each-repo.c:46
+msgid "missing --config=<config>"
+msgstr "缺少 --config=<配置>"
+
+#: builtin/fsck.c:69 builtin/fsck.c:130 builtin/fsck.c:131
msgid "unknown"
msgstr "未知"
#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:100 builtin/fsck.c:120
+#: builtin/fsck.c:83 builtin/fsck.c:103
#, c-format
msgid "error in %s %s: %s"
msgstr "%s %s 错误：%s"
#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:114
+#: builtin/fsck.c:97
#, c-format
msgid "warning in %s %s: %s"
msgstr "%s %s 警告：%s"
-#: builtin/fsck.c:143 builtin/fsck.c:146
+#: builtin/fsck.c:126 builtin/fsck.c:129
#, c-format
msgid "broken link from %7s %s"
msgstr "来自 %7s %s 的损坏的链接"
-#: builtin/fsck.c:155
+#: builtin/fsck.c:138
msgid "wrong object type in link"
msgstr "链接中错误的对象类型"
-#: builtin/fsck.c:171
+#: builtin/fsck.c:154
#, c-format
msgid ""
"broken link from %7s %s\n"
@@ -13995,240 +14954,240 @@
"损坏的链接来自于 %7s %s\n"
" 到 %7s %s"
-#: builtin/fsck.c:282
+#: builtin/fsck.c:265
#, c-format
msgid "missing %s %s"
msgstr "缺失 %s %s"
-#: builtin/fsck.c:309
+#: builtin/fsck.c:292
#, c-format
msgid "unreachable %s %s"
msgstr "不可达 %s %s"
-#: builtin/fsck.c:329
+#: builtin/fsck.c:312
#, c-format
msgid "dangling %s %s"
msgstr "悬空 %s %s"
-#: builtin/fsck.c:339
+#: builtin/fsck.c:322
msgid "could not create lost-found"
msgstr "不能创建 lost-found"
-#: builtin/fsck.c:350
+#: builtin/fsck.c:333
#, c-format
msgid "could not finish '%s'"
msgstr "不能完成 '%s'"
-#: builtin/fsck.c:367
+#: builtin/fsck.c:350
#, c-format
msgid "Checking %s"
msgstr "正在检查 %s"
-#: builtin/fsck.c:405
+#: builtin/fsck.c:388
#, c-format
msgid "Checking connectivity (%d objects)"
msgstr "正在检查连通性（%d 个对象）"
-#: builtin/fsck.c:424
+#: builtin/fsck.c:407
#, c-format
msgid "Checking %s %s"
msgstr "正在检查 %s %s"
-#: builtin/fsck.c:429
+#: builtin/fsck.c:412
msgid "broken links"
msgstr "损坏的链接"
-#: builtin/fsck.c:438
+#: builtin/fsck.c:421
#, c-format
msgid "root %s"
msgstr "根 %s"
-#: builtin/fsck.c:446
+#: builtin/fsck.c:429
#, c-format
msgid "tagged %s %s (%s) in %s"
msgstr "标记 %s %s (%s) 于 %s"
-#: builtin/fsck.c:475
+#: builtin/fsck.c:458
#, c-format
msgid "%s: object corrupt or missing"
msgstr "%s：对象损坏或丢失"
-#: builtin/fsck.c:500
+#: builtin/fsck.c:483
#, c-format
msgid "%s: invalid reflog entry %s"
msgstr "%s：无效的引用日志条目 %s"
-#: builtin/fsck.c:514
+#: builtin/fsck.c:497
#, c-format
msgid "Checking reflog %s->%s"
msgstr "正在检查引用日志 %s->%s"
-#: builtin/fsck.c:548
+#: builtin/fsck.c:531
#, c-format
msgid "%s: invalid sha1 pointer %s"
msgstr "%s：无效的 sha1 指针 %s"
-#: builtin/fsck.c:555
+#: builtin/fsck.c:538
#, c-format
msgid "%s: not a commit"
msgstr "%s：不是一个提交"
-#: builtin/fsck.c:609
+#: builtin/fsck.c:592
msgid "notice: No default references"
msgstr "注意：无默认引用"
-#: builtin/fsck.c:624
+#: builtin/fsck.c:607
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s：对象损坏或丢失：%s"
-#: builtin/fsck.c:637
+#: builtin/fsck.c:620
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s：不能解析对象：%s"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:640
#, c-format
msgid "bad sha1 file: %s"
msgstr "坏的 sha1 文件：%s"
-#: builtin/fsck.c:672
+#: builtin/fsck.c:655
msgid "Checking object directory"
msgstr "正在检查对象目录"
-#: builtin/fsck.c:675
+#: builtin/fsck.c:658
msgid "Checking object directories"
msgstr "正在检查对象目录"
-#: builtin/fsck.c:690
+#: builtin/fsck.c:673
#, c-format
msgid "Checking %s link"
msgstr "正在检查 %s 链接"
-#: builtin/fsck.c:695 builtin/index-pack.c:843
+#: builtin/fsck.c:678 builtin/index-pack.c:865
#, c-format
msgid "invalid %s"
msgstr "无效的 %s"
-#: builtin/fsck.c:702
+#: builtin/fsck.c:685
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s 指向奇怪的东西（%s）"
-#: builtin/fsck.c:708
+#: builtin/fsck.c:691
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s：分离头指针的指向不存在"
-#: builtin/fsck.c:712
+#: builtin/fsck.c:695
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "注意：%s 指向一个尚未诞生的分支（%s）"
-#: builtin/fsck.c:724
+#: builtin/fsck.c:707
msgid "Checking cache tree"
msgstr "正在检查缓存树"
-#: builtin/fsck.c:729
+#: builtin/fsck.c:712
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "%s：cache-tree 中无效的 sha1 指针"
-#: builtin/fsck.c:738
+#: builtin/fsck.c:721
msgid "non-tree in cache-tree"
msgstr "cache-tree 中非树对象"
-#: builtin/fsck.c:769
+#: builtin/fsck.c:752
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<选项>] [<对象>...]"
-#: builtin/fsck.c:775
+#: builtin/fsck.c:758
msgid "show unreachable objects"
msgstr "显示不可达的对象"
-#: builtin/fsck.c:776
+#: builtin/fsck.c:759
msgid "show dangling objects"
msgstr "显示悬空的对象"
-#: builtin/fsck.c:777
+#: builtin/fsck.c:760
msgid "report tags"
msgstr "报告标签"
-#: builtin/fsck.c:778
+#: builtin/fsck.c:761
msgid "report root nodes"
msgstr "报告根节点"
-#: builtin/fsck.c:779
+#: builtin/fsck.c:762
msgid "make index objects head nodes"
msgstr "将索引亦作为检查的头节点"
-#: builtin/fsck.c:780
+#: builtin/fsck.c:763
msgid "make reflogs head nodes (default)"
msgstr "将引用日志作为检查的头节点（默认）"
-#: builtin/fsck.c:781
+#: builtin/fsck.c:764
msgid "also consider packs and alternate objects"
msgstr "也考虑包和备用对象"
-#: builtin/fsck.c:782
+#: builtin/fsck.c:765
msgid "check only connectivity"
msgstr "仅检查连通性"
-#: builtin/fsck.c:783
+#: builtin/fsck.c:766 builtin/mktag.c:78
msgid "enable more strict checking"
msgstr "启用更严格的检查"
-#: builtin/fsck.c:785
+#: builtin/fsck.c:768
msgid "write dangling objects in .git/lost-found"
msgstr "将悬空对象写入 .git/lost-found 中"
-#: builtin/fsck.c:786 builtin/prune.c:132
+#: builtin/fsck.c:769 builtin/prune.c:134
msgid "show progress"
msgstr "显示进度"
-#: builtin/fsck.c:787
+#: builtin/fsck.c:770
msgid "show verbose names for reachable objects"
msgstr "显示可达对象的详细名称"
-#: builtin/fsck.c:846 builtin/index-pack.c:225
+#: builtin/fsck.c:829 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "正在检查对象"
-#: builtin/fsck.c:874
+#: builtin/fsck.c:857
#, c-format
msgid "%s: object missing"
msgstr "%s：对象缺失"
-#: builtin/fsck.c:885
+#: builtin/fsck.c:868
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "无效的参数：期望 sha1，得到 '%s'"
-#: builtin/gc.c:35
+#: builtin/gc.c:39
msgid "git gc [<options>]"
msgstr "git gc [<选项>]"
-#: builtin/gc.c:90
+#: builtin/gc.c:93
#, c-format
msgid "Failed to fstat %s: %s"
msgstr "对 %s 调用 fstat 失败：%s"
-#: builtin/gc.c:126
+#: builtin/gc.c:129
#, c-format
msgid "failed to parse '%s' value '%s'"
msgstr "无法解析 '%s' 值 '%s'"
-#: builtin/gc.c:475 builtin/init-db.c:55
+#: builtin/gc.c:487 builtin/init-db.c:58
#, c-format
msgid "cannot stat '%s'"
msgstr "不能对 '%s' 调用 stat"
-#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
+#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:562
#, c-format
msgid "cannot read '%s'"
msgstr "不能读取 '%s'"
-#: builtin/gc.c:491
+#: builtin/gc.c:503
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -14242,73 +15201,233 @@
"\n"
"%s"
-#: builtin/gc.c:539
+#: builtin/gc.c:551
msgid "prune unreferenced objects"
msgstr "清除未引用的对象"
-#: builtin/gc.c:541
+#: builtin/gc.c:553
msgid "be more thorough (increased runtime)"
msgstr "更彻底（增加运行时间）"
-#: builtin/gc.c:542
+#: builtin/gc.c:554
msgid "enable auto-gc mode"
msgstr "启用自动垃圾回收模式"
-#: builtin/gc.c:545
+#: builtin/gc.c:557
msgid "force running gc even if there may be another gc running"
msgstr "强制执行 gc 即使另外一个 gc 正在执行"
-#: builtin/gc.c:548
+#: builtin/gc.c:560
msgid "repack all other packs except the largest pack"
msgstr "除了最大的包之外，对所有其它包文件重新打包"
-#: builtin/gc.c:565
+#: builtin/gc.c:576
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "解析 gc.logexpiry 的值 %s 失败"
-#: builtin/gc.c:576
+#: builtin/gc.c:587
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr "解析清除期限值 %s 失败"
-#: builtin/gc.c:596
+#: builtin/gc.c:607
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "自动在后台执行仓库打包以求最佳性能。\n"
-#: builtin/gc.c:598
+#: builtin/gc.c:609
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "自动打包仓库以求最佳性能。\n"
-#: builtin/gc.c:599
+#: builtin/gc.c:610
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "手工维护参见 \"git help gc\"。\n"
-#: builtin/gc.c:639
+#: builtin/gc.c:650
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
"已经有一个 gc 正运行在机器 '%s' pid %<PRIuMAX>（如果不是，使用 --force）"
-#: builtin/gc.c:694
+#: builtin/gc.c:705
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"
+#: builtin/gc.c:715
+msgid ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
+msgstr ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<任务>] [--schedule]"
+
+#: builtin/gc.c:745
+msgid "--no-schedule is not allowed"
+msgstr "--no-schedule 不被允许"
+
+#: builtin/gc.c:750
+#, c-format
+msgid "unrecognized --schedule argument '%s'"
+msgstr "无法识别的 --schedule 参数 '%s'"
+
+#: builtin/gc.c:869
+msgid "failed to write commit-graph"
+msgstr "无法写入提交图"
+
+#: builtin/gc.c:914
+msgid "failed to fill remotes"
+msgstr "无法填充远程仓库"
+
+#: builtin/gc.c:1037
+msgid "failed to start 'git pack-objects' process"
+msgstr "无法启动 'git pack-objects' 进程"
+
+#: builtin/gc.c:1054
+msgid "failed to finish 'git pack-objects' process"
+msgstr "无法完成 'git pack-objects' 进程"
+
+#: builtin/gc.c:1106
+msgid "failed to write multi-pack-index"
+msgstr "无法写入多包索引"
+
+#: builtin/gc.c:1124
+msgid "'git multi-pack-index expire' failed"
+msgstr "'git multi-pack-index expire' 失败"
+
+#: builtin/gc.c:1185
+msgid "'git multi-pack-index repack' failed"
+msgstr "'git multi-pack-index repack' 失败"
+
+#: builtin/gc.c:1194
+msgid ""
+"skipping incremental-repack task because core.multiPackIndex is disabled"
+msgstr "跳过增量重新打包任务，因为 core.multiPackIndex 被禁用"
+
+#: builtin/gc.c:1298
+#, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr "锁文件 '%s' 已存在，跳过维护"
+
+#: builtin/gc.c:1328
+#, c-format
+msgid "task '%s' failed"
+msgstr "任务 '%s' 失败"
+
+#: builtin/gc.c:1410
+#, c-format
+msgid "'%s' is not a valid task"
+msgstr "'%s' 不是一个有效的任务"
+
+#: builtin/gc.c:1415
+#, c-format
+msgid "task '%s' cannot be selected multiple times"
+msgstr "任务 '%s' 不能被多次选择"
+
+#: builtin/gc.c:1430
+msgid "run tasks based on the state of the repository"
+msgstr "基于仓库状态来运行任务"
+
+#: builtin/gc.c:1431
+msgid "frequency"
+msgstr "频率"
+
+#: builtin/gc.c:1432
+msgid "run tasks based on frequency"
+msgstr "基于频率运行任务"
+
+#: builtin/gc.c:1435
+msgid "do not report progress or other information over stderr"
+msgstr "不通过标准错误报告进度或其它信息"
+
+#: builtin/gc.c:1436
+msgid "task"
+msgstr "任务"
+
+#: builtin/gc.c:1437
+msgid "run a specific task"
+msgstr "运行一个特定的任务"
+
+#: builtin/gc.c:1454
+msgid "use at most one of --auto and --schedule=<frequency>"
+msgstr "最多使用 --auto 和 --schedule=<频率> 其中之一"
+
+#: builtin/gc.c:1497
+msgid "failed to run 'git config'"
+msgstr "无法运行 'git config'"
+
+#: builtin/gc.c:1562
+#, c-format
+msgid "failed to expand path '%s'"
+msgstr "无法扩展路径 '%s'"
+
+#: builtin/gc.c:1591
+msgid "failed to start launchctl"
+msgstr "无法启动 launchctl"
+
+#: builtin/gc.c:1628
+#, c-format
+msgid "failed to create directories for '%s'"
+msgstr "无法为 '%s' 创建目录"
+
+#: builtin/gc.c:1689
+#, c-format
+msgid "failed to bootstrap service %s"
+msgstr "无法引导服务 %s"
+
+#: builtin/gc.c:1760
+msgid "failed to create temp xml file"
+msgstr "无法创建临时 XML 文件"
+
+#: builtin/gc.c:1850
+msgid "failed to start schtasks"
+msgstr "无法启动计划任务"
+
+#: builtin/gc.c:1894
+msgid "failed to run 'crontab -l'; your system might not support 'cron'"
+msgstr "无法执行 'crontab -l'，您的系统可能不支持 'cron'"
+
+#: builtin/gc.c:1911
+msgid "failed to run 'crontab'; your system might not support 'cron'"
+msgstr "无法运行 'crontab'，您的系统可能不支持 'cron'"
+
+#: builtin/gc.c:1915
+msgid "failed to open stdin of 'crontab'"
+msgstr "无法打开 'crontab' 的标准输入"
+
+#: builtin/gc.c:1956
+msgid "'crontab' died"
+msgstr "'crontab' 终止"
+
+#: builtin/gc.c:1990
+msgid "another process is scheduling background maintenance"
+msgstr "另外一个进程正运行于后台维护"
+
+#: builtin/gc.c:2009
+msgid "failed to add repo to global config"
+msgstr "无法将仓库添加到全局配置"
+
+#: builtin/gc.c:2019
+msgid "git maintenance <subcommand> [<options>]"
+msgstr "git maintenance <子命令> [<选项>]"
+
+#: builtin/gc.c:2038
+#, 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
+#: builtin/grep.c:223
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep：无法创建线程：%s"
-#: builtin/grep.c:279
+#: builtin/grep.c:277
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
@@ -14317,259 +15436,259 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731
-#: builtin/pack-objects.c:2854
+#: builtin/grep.c:285 builtin/index-pack.c:1589 builtin/index-pack.c:1808
+#: builtin/pack-objects.c:2944
#, c-format
msgid "no threads support, ignoring %s"
msgstr "没有线程支持，忽略 %s"
-#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618
+#: builtin/grep.c:473 builtin/grep.c:601 builtin/grep.c:641
#, c-format
msgid "unable to read tree (%s)"
msgstr "无法读取树（%s）"
-#: builtin/grep.c:633
+#: builtin/grep.c:656
#, c-format
msgid "unable to grep from object of type %s"
msgstr "无法抓取来自于 %s 类型的对象"
-#: builtin/grep.c:704
+#: builtin/grep.c:737
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "开关 `%c' 期望一个数字值"
-#: builtin/grep.c:803
+#: builtin/grep.c:836
msgid "search in index instead of in the work tree"
msgstr "在索引区搜索而不是在工作区"
-#: builtin/grep.c:805
+#: builtin/grep.c:838
msgid "find in contents not managed by git"
msgstr "在未被 git 管理的内容中查找"
# 译者：中文字符串拼接，可删除前导空格
-#: builtin/grep.c:807
+#: builtin/grep.c:840
msgid "search in both tracked and untracked files"
msgstr "在跟踪和未跟踪的文件中搜索"
-#: builtin/grep.c:809
+#: builtin/grep.c:842
msgid "ignore files specified via '.gitignore'"
msgstr "忽略 '.gitignore' 包含的文件"
-#: builtin/grep.c:811
+#: builtin/grep.c:844
msgid "recursively search in each submodule"
msgstr "在每一个子模组中递归搜索"
-#: builtin/grep.c:814
+#: builtin/grep.c:847
msgid "show non-matching lines"
msgstr "显示未匹配的行"
-#: builtin/grep.c:816
+#: builtin/grep.c:849
msgid "case insensitive matching"
msgstr "不区分大小写匹配"
-#: builtin/grep.c:818
+#: builtin/grep.c:851
msgid "match patterns only at word boundaries"
msgstr "只在单词边界匹配模式"
-#: builtin/grep.c:820
+#: builtin/grep.c:853
msgid "process binary files as text"
msgstr "把二进制文件当做文本处理"
-#: builtin/grep.c:822
+#: builtin/grep.c:855
msgid "don't match patterns in binary files"
msgstr "不在二进制文件中匹配模式"
-#: builtin/grep.c:825
+#: builtin/grep.c:858
msgid "process binary files with textconv filters"
msgstr "用 textconv 过滤器处理二进制文件"
-#: builtin/grep.c:827
+#: builtin/grep.c:860
msgid "search in subdirectories (default)"
msgstr "在子目录中寻找（默认）"
-#: builtin/grep.c:829
+#: builtin/grep.c:862
msgid "descend at most <depth> levels"
msgstr "最多以指定的深度向下寻找"
-#: builtin/grep.c:833
+#: builtin/grep.c:866
msgid "use extended POSIX regular expressions"
msgstr "使用扩展的 POSIX 正则表达式"
-#: builtin/grep.c:836
+#: builtin/grep.c:869
msgid "use basic POSIX regular expressions (default)"
msgstr "使用基本的 POSIX 正则表达式（默认）"
-#: builtin/grep.c:839
+#: builtin/grep.c:872
msgid "interpret patterns as fixed strings"
msgstr "把模式解析为固定的字符串"
-#: builtin/grep.c:842
+#: builtin/grep.c:875
msgid "use Perl-compatible regular expressions"
msgstr "使用 Perl 兼容的正则表达式"
-#: builtin/grep.c:845
+#: builtin/grep.c:878
msgid "show line numbers"
msgstr "显示行号"
-#: builtin/grep.c:846
+#: builtin/grep.c:879
msgid "show column number of first match"
msgstr "显示第一个匹配的列号"
-#: builtin/grep.c:847
+#: builtin/grep.c:880
msgid "don't show filenames"
msgstr "不显示文件名"
-#: builtin/grep.c:848
+#: builtin/grep.c:881
msgid "show filenames"
msgstr "显示文件名"
-#: builtin/grep.c:850
+#: builtin/grep.c:883
msgid "show filenames relative to top directory"
msgstr "显示相对于顶级目录的文件名"
-#: builtin/grep.c:852
+#: builtin/grep.c:885
msgid "show only filenames instead of matching lines"
msgstr "只显示文件名而不显示匹配的行"
-#: builtin/grep.c:854
+#: builtin/grep.c:887
msgid "synonym for --files-with-matches"
msgstr "和 --files-with-matches 同义"
-#: builtin/grep.c:857
+#: builtin/grep.c:890
msgid "show only the names of files without match"
msgstr "只显示未匹配的文件名"
-#: builtin/grep.c:859
+#: builtin/grep.c:892
msgid "print NUL after filenames"
msgstr "在文件名后输出 NUL 字符"
-#: builtin/grep.c:862
+#: builtin/grep.c:895
msgid "show only matching parts of a line"
msgstr "只显示行中的匹配的部分"
-#: builtin/grep.c:864
+#: builtin/grep.c:897
msgid "show the number of matches instead of matching lines"
msgstr "显示总匹配行数，而不显示匹配的行"
-#: builtin/grep.c:865
+#: builtin/grep.c:898
msgid "highlight matches"
msgstr "高亮显示匹配项"
-#: builtin/grep.c:867
+#: builtin/grep.c:900
msgid "print empty line between matches from different files"
msgstr "在不同文件的匹配项之间打印空行"
-#: builtin/grep.c:869
+#: builtin/grep.c:902
msgid "show filename only once above matches from same file"
msgstr "只在同一文件的匹配项的上面显示一次文件名"
-#: builtin/grep.c:872
+#: builtin/grep.c:905
msgid "show <n> context lines before and after matches"
msgstr "显示匹配项前后的 <n> 行上下文"
-#: builtin/grep.c:875
+#: builtin/grep.c:908
msgid "show <n> context lines before matches"
msgstr "显示匹配项前 <n> 行上下文"
-#: builtin/grep.c:877
+#: builtin/grep.c:910
msgid "show <n> context lines after matches"
msgstr "显示匹配项后 <n> 行上下文"
-#: builtin/grep.c:879
+#: builtin/grep.c:912
msgid "use <n> worker threads"
msgstr "使用 <n> 个工作线程"
-#: builtin/grep.c:880
+#: builtin/grep.c:913
msgid "shortcut for -C NUM"
msgstr "快捷键 -C 数字"
-#: builtin/grep.c:883
+#: builtin/grep.c:916
msgid "show a line with the function name before matches"
msgstr "在匹配的前面显示一行函数名"
-#: builtin/grep.c:885
+#: builtin/grep.c:918
msgid "show the surrounding function"
msgstr "显示所在函数的前后内容"
-#: builtin/grep.c:888
+#: builtin/grep.c:921
msgid "read patterns from file"
msgstr "从文件读取模式"
-#: builtin/grep.c:890
+#: builtin/grep.c:923
msgid "match <pattern>"
msgstr "匹配 <模式>"
-#: builtin/grep.c:892
+#: builtin/grep.c:925
msgid "combine patterns specified with -e"
msgstr "组合用 -e 参数设定的模式"
-#: builtin/grep.c:904
+#: builtin/grep.c:937
msgid "indicate hit with exit status without output"
msgstr "不输出，而用退出码标识命中状态"
-#: builtin/grep.c:906
+#: builtin/grep.c:939
msgid "show only matches from files that match all patterns"
msgstr "只显示匹配所有模式的文件中的匹配"
-#: builtin/grep.c:908
-msgid "show parse tree for grep expression"
-msgstr "显示 grep 表达式的解析树"
-
-#: builtin/grep.c:912
+#: builtin/grep.c:942
msgid "pager"
msgstr "分页"
-#: builtin/grep.c:912
+#: builtin/grep.c:942
msgid "show matching files in the pager"
msgstr "分页显示匹配的文件"
-#: builtin/grep.c:916
+#: builtin/grep.c:946
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "允许调用 grep(1)（本次构建忽略）"
-#: builtin/grep.c:983
+#: builtin/grep.c:1012
msgid "no pattern given"
msgstr "未提供匹配模式"
-#: builtin/grep.c:1019
+#: builtin/grep.c:1048
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index 或 --untracked 不能和版本同时使用"
-#: builtin/grep.c:1027
+#: builtin/grep.c:1056
#, c-format
msgid "unable to resolve revision: %s"
msgstr "不能解析版本：%s"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1086
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked 不支持和 --recurse-submodules 共用"
-#: builtin/grep.c:1061
+#: builtin/grep.c:1090
msgid "invalid option combination, ignoring --threads"
msgstr "无效的选项组合，忽略 --threads"
-#: builtin/grep.c:1064 builtin/pack-objects.c:3547
+#: builtin/grep.c:1093 builtin/pack-objects.c:3672
msgid "no threads support, ignoring --threads"
msgstr "没有线程支持，忽略 --threads"
-#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851
+#: builtin/grep.c:1096 builtin/index-pack.c:1586 builtin/pack-objects.c:2941
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "指定的线程数无效（%d）"
-#: builtin/grep.c:1101
+#: builtin/grep.c:1130
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager 仅用于工作区"
-#: builtin/grep.c:1127
+#: builtin/grep.c:1156
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached 或 --untracked 不能与 --no-index 同时使用"
-#: builtin/grep.c:1133
+#: builtin/grep.c:1159
+msgid "--untracked cannot be used with --cached"
+msgstr "--untracked 不能与 --cached 同时使用"
+
+#: builtin/grep.c:1165
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "--[no-]exclude-standard 不能用于已跟踪内容"
-#: builtin/grep.c:1141
+#: builtin/grep.c:1173
msgid "both --cached and trees are given"
msgstr "同时给出了 --cached 和树对象"
@@ -14610,66 +15729,66 @@
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"
@@ -14678,7 +15797,7 @@
"'%s'：不支持的 man 手册查看器的路径。\n"
"请使用 'man.<工具>.cmd'。"
-#: builtin/help.c:233
+#: builtin/help.c:319
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -14687,396 +15806,428 @@
"'%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:340
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "'%s' 是 '%s' 的别名"
-#: builtin/help.c:448 git.c:365
+#: builtin/help.c:534 git.c:372
#, 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:606
+#: builtin/index-pack.c:324 builtin/pack-objects.c:624
msgid "pack too large for current definition of off_t"
msgstr "包太大超过了当前 off_t 的定义"
-#: builtin/index-pack.c:291 builtin/unpack-objects.c:95
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
msgid "pack exceeds maximum allowed size"
msgstr "包超过了最大允许值"
-#: builtin/index-pack.c:312
+#: builtin/index-pack.c:342
+#, 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:765
-#: builtin/index-pack.c:804 builtin/index-pack.c:813
+#: 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:158
-#: builtin/pack-objects.c:218 builtin/pack-objects.c:313
+#: 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:802
+#: builtin/index-pack.c:824
#, c-format
msgid "cannot read existing object info %s"
msgstr "不能读取现存对象信息 %s"
-#: builtin/index-pack.c:810
+#: builtin/index-pack.c:832
#, c-format
msgid "cannot read existing object %s"
msgstr "不能读取现存对象 %s"
-#: builtin/index-pack.c:824
+#: builtin/index-pack.c:846
#, c-format
msgid "invalid blob object %s"
msgstr "无效的数据对象 %s"
-#: builtin/index-pack.c:827 builtin/index-pack.c:846
+#: builtin/index-pack.c:849 builtin/index-pack.c:868
msgid "fsck error in packed object"
msgstr "对打包对象 fsck 检查出错"
-#: builtin/index-pack.c:848
+#: builtin/index-pack.c:870
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "%s 的所有子对象并非都可达"
-#: builtin/index-pack.c:920 builtin/index-pack.c:951
+#: builtin/index-pack.c:931 builtin/index-pack.c:978
msgid "failed to apply delta"
msgstr "应用 delta 失败"
-#: builtin/index-pack.c:1121
+#: builtin/index-pack.c:1161
msgid "Receiving objects"
msgstr "接收对象中"
-#: builtin/index-pack.c:1121
+#: builtin/index-pack.c:1161
msgid "Indexing objects"
msgstr "索引对象中"
-#: builtin/index-pack.c:1155
+#: builtin/index-pack.c:1195
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "包冲突（SHA1 不匹配）"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1200
msgid "cannot fstat packfile"
msgstr "不能对包文件调用 fstat"
-#: builtin/index-pack.c:1163
+#: builtin/index-pack.c:1203
msgid "pack has junk at the end"
msgstr "包的结尾有垃圾数据"
-#: builtin/index-pack.c:1175
+#: builtin/index-pack.c:1215
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "parse_pack_objects() 中遇到不可理喻的问题"
-#: builtin/index-pack.c:1198
+#: builtin/index-pack.c:1238
msgid "Resolving deltas"
msgstr "处理 delta 中"
-#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615
+#: builtin/index-pack.c:1249 builtin/pack-objects.c:2707
#, c-format
msgid "unable to create thread: %s"
msgstr "不能创建线程：%s"
-#: builtin/index-pack.c:1249
+#: builtin/index-pack.c:1282
msgid "confusion beyond insanity"
msgstr "不可理喻"
-#: builtin/index-pack.c:1255
+#: 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:1267
+#: builtin/index-pack.c:1300
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）"
-#: builtin/index-pack.c:1271
+#: 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:1295
+#: builtin/index-pack.c:1328
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "不能压缩附加对象（%d）"
-#: builtin/index-pack.c:1392
+#: builtin/index-pack.c:1424
#, c-format
msgid "local object %s is corrupt"
msgstr "本地对象 %s 已损坏"
-#: builtin/index-pack.c:1406
+#: builtin/index-pack.c:1445
#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
+msgid "packfile name '%s' does not end with '.%s'"
+msgstr "包文件名 '%s' 没有以 '.%s' 结尾"
-#: builtin/index-pack.c:1431
+#: builtin/index-pack.c:1469
#, c-format
msgid "cannot write %s file '%s'"
msgstr "无法写入 %s 文件 '%s'"
-#: builtin/index-pack.c:1439
+#: builtin/index-pack.c:1477
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "无法关闭已写入的 %s 文件 '%s'"
-#: builtin/index-pack.c:1463
+#: builtin/index-pack.c:1503
msgid "error while closing pack file"
msgstr "关闭包文件时出错"
-#: builtin/index-pack.c:1477
+#: builtin/index-pack.c:1517
msgid "cannot store pack file"
msgstr "无法存储包文件"
-#: builtin/index-pack.c:1485
+#: builtin/index-pack.c:1525
msgid "cannot store index file"
msgstr "无法存储索引文件"
-#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862
+#: builtin/index-pack.c:1534
+msgid "cannot store reverse index file"
+msgstr "无法存储反向索引文件"
+
+#: builtin/index-pack.c:1580 builtin/pack-objects.c:2952
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "坏的 pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1597
+#: builtin/index-pack.c:1650
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "无法打开现存包文件 '%s'"
-#: builtin/index-pack.c:1599
+#: builtin/index-pack.c:1652
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "无法为 %s 打开包索引文件"
-#: builtin/index-pack.c:1647
+#: builtin/index-pack.c:1700
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "非 delta：%d 个对象"
msgstr[1] "非 delta：%d 个对象"
-#: builtin/index-pack.c:1654
+#: builtin/index-pack.c:1707
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "链长 = %d: %lu 对象"
msgstr[1] "链长 = %d: %lu 对象"
-#: builtin/index-pack.c:1693
+#: builtin/index-pack.c:1765
msgid "Cannot come back to cwd"
msgstr "无法返回当前工作目录"
-#: builtin/index-pack.c:1742 builtin/index-pack.c:1745
-#: builtin/index-pack.c:1761 builtin/index-pack.c:1765
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1822
+#: builtin/index-pack.c:1838 builtin/index-pack.c:1842
#, c-format
msgid "bad %s"
msgstr "错误选项 %s"
-#: builtin/index-pack.c:1781
+#: builtin/index-pack.c:1848 builtin/init-db.c:392 builtin/init-db.c:625
+#, c-format
+msgid "unknown hash algorithm '%s'"
+msgstr "未知的哈希算法 '%s'"
+
+#: builtin/index-pack.c:1867
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin 不能和 --stdin 同时使用"
-#: builtin/index-pack.c:1783
+#: builtin/index-pack.c:1869
msgid "--stdin requires a git repository"
-msgstr "--stdin 需要一个 git 仓库"
+msgstr "--stdin 需要 git 仓库"
-#: builtin/index-pack.c:1789
+#: builtin/index-pack.c:1871
+msgid "--object-format cannot be used with --stdin"
+msgstr "--object-format 不能和 --stdin 同时使用"
+
+#: builtin/index-pack.c:1886
msgid "--verify with no packfile name given"
msgstr "--verify 没有提供包文件名参数"
-#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582
+#: builtin/index-pack.c:1956 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:275
+#, c-format
+msgid "invalid initial branch name: '%s'"
+msgstr "无效的初始分支名：'%s'"
+
+#: builtin/init-db.c:367
#, c-format
msgid "unable to handle file type %d"
msgstr "不能处理 %d 类型的文件"
-#: builtin/init-db.c:337
+#: builtin/init-db.c:370
#, 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:386
+msgid "attempt to reinitialize repository with different hash"
+msgstr "尝试用不同的哈希算法重新初始化仓库"
+
+#: builtin/init-db.c:410 builtin/init-db.c:413
#, c-format
msgid "%s already exists"
msgstr "%s 已经存在"
-#: builtin/init-db.c:413
+#: builtin/init-db.c:445
+#, c-format
+msgid "re-init: ignored --initial-branch=%s"
+msgstr "re-init：已忽略 --initial-branch=%s"
+
+#: builtin/init-db.c:476
#, 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:477
#, 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:481
#, 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:482
#, 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:531
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -15084,36 +16235,56 @@
"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] "
"[<目录>]"
-#: builtin/init-db.c:491
+#: builtin/init-db.c:557
msgid "permissions"
msgstr "权限"
-#: builtin/init-db.c:492
+#: builtin/init-db.c:558
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:564
+msgid "override the name of the initial branch"
+msgstr "覆盖初始分支名称"
+
+#: builtin/init-db.c:565 builtin/verify-pack.c:74
+msgid "hash"
+msgstr "hash"
+
+#: builtin/init-db.c:566 builtin/show-index.c:22 builtin/verify-pack.c:75
+msgid "specify the hash algorithm to use"
+msgstr "指定要使用的哈希算法"
+
+#: builtin/init-db.c:573
+msgid "--separate-git-dir and --bare are mutually exclusive"
+msgstr "--separate-git-dir 和 --bare 是互斥的"
+
+#: builtin/init-db.c:602 builtin/init-db.c:607
#, c-format
msgid "cannot mkdir %s"
msgstr "不能创建目录 %s"
-#: builtin/init-db.c:538
+#: builtin/init-db.c:611 builtin/init-db.c:666
#, c-format
msgid "cannot chdir to %s"
msgstr "不能切换目录到 %s"
-#: builtin/init-db.c:559
+#: builtin/init-db.c:638
#, 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:690
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "不能访问工作区 '%s'"
+#: builtin/init-db.c:695
+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 "
@@ -15128,23 +16299,23 @@
#: builtin/interpret-trailers.c:96
msgid "trim empty trailers"
-msgstr "删除空的尾部署名"
+msgstr "删除空的尾注"
#: builtin/interpret-trailers.c:99
msgid "where to place the new trailer"
-msgstr "在哪里放置新的尾部署名"
+msgstr "在哪里放置新的尾注"
#: builtin/interpret-trailers.c:101
msgid "action if trailer already exists"
-msgstr "当尾部署名已经存在时所采取的动作"
+msgstr "当尾注已经存在时所采取的动作"
#: builtin/interpret-trailers.c:103
msgid "action if trailer is missing"
-msgstr "当尾部署名缺失时所采取的动作"
+msgstr "当尾注缺失时所采取的动作"
#: builtin/interpret-trailers.c:105
msgid "output only the trailers"
-msgstr "只输出尾部署名"
+msgstr "只输出尾注"
#: builtin/interpret-trailers.c:106
msgid "do not apply config rules"
@@ -15164,11 +16335,11 @@
#: builtin/interpret-trailers.c:111
msgid "trailer"
-msgstr "尾部署名"
+msgstr "尾注"
#: builtin/interpret-trailers.c:112
msgid "trailer(s) to add"
-msgstr "要添加的尾部署名"
+msgstr "要添加的尾注"
#: builtin/interpret-trailers.c:123
msgid "--trailer with --only-input does not make sense"
@@ -15178,126 +16349,128 @@
msgid "no input file given for in-place editing"
msgstr "没有给出要原位编辑的文件"
-#: builtin/log.c:56
+#: builtin/log.c:59
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
-#: builtin/log.c:57
+#: builtin/log.c:60
msgid "git show [<options>] <object>..."
msgstr "git show [<选项>] <对象>..."
-#: builtin/log.c:110
+#: builtin/log.c:113
#, c-format
msgid "invalid --decorate option: %s"
msgstr "无效的 --decorate 选项：%s"
-#: builtin/log.c:174
+#: builtin/log.c:180
msgid "show source"
msgstr "显示源"
-#: builtin/log.c:175
-msgid "Use mail map file"
+#: builtin/log.c:181
+msgid "use mail map file"
msgstr "使用邮件映射文件"
-#: builtin/log.c:177
+#: builtin/log.c:184
msgid "only decorate refs that match <pattern>"
msgstr "只修饰与 <模式> 匹配的引用"
-#: builtin/log.c:179
+#: builtin/log.c:186
msgid "do not decorate refs that match <pattern>"
msgstr "不修饰和 <模式> 匹配的引用"
-#: builtin/log.c:180
+#: builtin/log.c:187
msgid "decorate options"
msgstr "修饰选项"
-#: builtin/log.c:183
-msgid "Process line range n,m in file, counting from 1"
-msgstr "处理文件中第 n 到 m 之间的行，从 1 开始"
+#: builtin/log.c:190
+msgid ""
+"trace the evolution of line range <start>,<end> or function :<funcname> in "
+"<file>"
+msgstr "跟踪 <文件> 中 <开始>,<结束> 范围内的行或函数 :<函数名> 的演变"
-#: builtin/log.c:281
+#: builtin/log.c:213
+msgid "-L<range>:<file> cannot be used with pathspec"
+msgstr "-L<范围>:<文件> 不能和路径表达式共用"
+
+#: builtin/log.c:303
#, c-format
msgid "Final output: %d %s\n"
msgstr "最终输出：%d %s\n"
-#: builtin/log.c:535
+#: builtin/log.c:566
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: 损坏的文件"
-#: builtin/log.c:550 builtin/log.c:645
+#: builtin/log.c:581 builtin/log.c:671
#, c-format
msgid "could not read object %s"
msgstr "不能读取对象 %s"
-#: builtin/log.c:670
+#: builtin/log.c:696
#, c-format
msgid "unknown type: %d"
msgstr "未知类型：%d"
-#: builtin/log.c:814
+#: builtin/log.c:841
#, c-format
msgid "%s: invalid cover from description mode"
msgstr "%s：从描述生成附函的模式无效"
-#: builtin/log.c:821
+#: builtin/log.c:848
msgid "format.headers without value"
msgstr "format.headers 没有值"
-#: builtin/log.c:936
-msgid "name of output directory is too long"
-msgstr "输出目录名太长"
-
-#: builtin/log.c:952
+#: builtin/log.c:977
#, c-format
msgid "cannot open patch file %s"
msgstr "无法打开补丁文件 %s"
-#: builtin/log.c:969
+#: builtin/log.c:994
msgid "need exactly one range"
msgstr "只需要一个范围"
-#: builtin/log.c:979
+#: builtin/log.c:1004
msgid "not a range"
msgstr "不是一个范围"
-#: builtin/log.c:1143
+#: builtin/log.c:1168
msgid "cover letter needs email format"
msgstr "附函需要邮件地址格式"
-#: builtin/log.c:1149
+#: builtin/log.c:1174
msgid "failed to create cover-letter file"
msgstr "无法创建附函文件"
-#: builtin/log.c:1228
+#: builtin/log.c:1261
#, c-format
msgid "insane in-reply-to: %s"
msgstr "不正常的 in-reply-to：%s"
-#: builtin/log.c:1255
+#: builtin/log.c:1288
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
-#: builtin/log.c:1313
+#: builtin/log.c:1346
msgid "two output directories?"
msgstr "两个输出目录？"
-#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211
+#: builtin/log.c:1497 builtin/log.c:2317 builtin/log.c:2319 builtin/log.c:2331
#, c-format
msgid "unknown commit %s"
msgstr "未知提交 %s"
-#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1508 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "无法将 '%s' 解析为一个有效引用"
-#: builtin/log.c:1439
+#: builtin/log.c:1517
msgid "could not find exact merge base"
msgstr "不能找到准确的合并基线"
-#: builtin/log.c:1443
+#: builtin/log.c:1527
msgid ""
"failed to get upstream, if you want to record base commit automatically,\n"
"please use git branch --set-upstream-to to track a remote branch.\n"
@@ -15307,384 +16480,397 @@
"git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
"参数 --base=<基线提交> 手动指定一个基线提交"
-#: builtin/log.c:1463
+#: builtin/log.c:1550
msgid "failed to find exact merge base"
msgstr "无法找到准确的合并基线"
-#: builtin/log.c:1474
+#: builtin/log.c:1567
msgid "base commit should be the ancestor of revision list"
msgstr "基线提交应该是版本列表的祖先"
-#: builtin/log.c:1478
+#: builtin/log.c:1577
msgid "base commit shouldn't be in revision list"
msgstr "基线提交不应该出现在版本列表中"
-#: builtin/log.c:1531
+#: builtin/log.c:1635
msgid "cannot get patch id"
msgstr "无法得到补丁 id"
-#: builtin/log.c:1583
-msgid "failed to infer range-diff ranges"
-msgstr "无法推断 range-diff 范围"
+#: builtin/log.c:1692
+msgid "failed to infer range-diff origin of current series"
+msgstr "无法推断当前系列的 range-diff 起始"
-#: builtin/log.c:1629
+#: builtin/log.c:1694
+#, c-format
+msgid "using '%s' as range-diff origin of current series"
+msgstr "使用 '%s' 作为当前系列的 range-diff 源"
+
+#: builtin/log.c:1738
msgid "use [PATCH n/m] even with a single patch"
msgstr "使用 [PATCH n/m]，即使只有一个补丁"
-#: builtin/log.c:1632
+#: builtin/log.c:1741
msgid "use [PATCH] even with multiple patches"
msgstr "使用 [PATCH]，即使有多个补丁"
-#: builtin/log.c:1636
+#: builtin/log.c:1745
msgid "print patches to standard out"
msgstr "打印补丁到标准输出"
-#: builtin/log.c:1638
+#: builtin/log.c:1747
msgid "generate a cover letter"
msgstr "生成一封附函"
-#: builtin/log.c:1640
+#: builtin/log.c:1749
msgid "use simple number sequence for output file names"
msgstr "使用简单的数字序列作为输出文件名"
-#: builtin/log.c:1641
+#: builtin/log.c:1750
msgid "sfx"
msgstr "后缀"
-#: builtin/log.c:1642
+#: builtin/log.c:1751
msgid "use <sfx> instead of '.patch'"
msgstr "使用 <后缀> 代替 '.patch'"
-#: builtin/log.c:1644
+#: builtin/log.c:1753
msgid "start numbering patches at <n> instead of 1"
msgstr "补丁以 <n> 开始编号，而不是1"
-#: builtin/log.c:1646
+#: builtin/log.c:1755
msgid "mark the series as Nth re-roll"
msgstr "标记补丁系列是第几次重制"
-#: builtin/log.c:1648
-msgid "Use [RFC PATCH] instead of [PATCH]"
+#: builtin/log.c:1757
+msgid "max length of output filename"
+msgstr "输出文件名的最大长度"
+
+#: builtin/log.c:1759
+msgid "use [RFC PATCH] instead of [PATCH]"
msgstr "使用 [RFC PATCH] 代替 [PATCH]"
-#: builtin/log.c:1651
+#: builtin/log.c:1762
msgid "cover-from-description-mode"
msgstr "从分支描述获取附函的模式"
-#: builtin/log.c:1652
+#: builtin/log.c:1763
msgid "generate parts of a cover letter based on a branch's description"
msgstr "基于一个分支描述生成部分附函"
-#: builtin/log.c:1654
-msgid "Use [<prefix>] instead of [PATCH]"
+#: builtin/log.c:1765
+msgid "use [<prefix>] instead of [PATCH]"
msgstr "使用 [<前缀>] 代替 [PATCH]"
-#: builtin/log.c:1657
+#: builtin/log.c:1768
msgid "store resulting files in <dir>"
msgstr "把结果文件存储在 <目录>"
-#: builtin/log.c:1660
+#: builtin/log.c:1771
msgid "don't strip/add [PATCH]"
msgstr "不删除/添加 [PATCH]"
-#: builtin/log.c:1663
+#: builtin/log.c:1774
msgid "don't output binary diffs"
msgstr "不输出二进制差异"
-#: builtin/log.c:1665
+#: builtin/log.c:1776
msgid "output all-zero hash in From header"
msgstr "在 From 头信息中输出全为零的哈希值"
-#: builtin/log.c:1667
+#: builtin/log.c:1778
msgid "don't include a patch matching a commit upstream"
msgstr "不包含已在上游提交中的补丁"
-#: builtin/log.c:1669
+#: builtin/log.c:1780
msgid "show patch format instead of default (patch + stat)"
msgstr "显示纯补丁格式而非默认的（补丁+状态）"
-#: builtin/log.c:1671
+#: builtin/log.c:1782
msgid "Messaging"
msgstr "邮件发送"
-#: builtin/log.c:1672
+#: builtin/log.c:1783
msgid "header"
msgstr "header"
-#: builtin/log.c:1673
+#: builtin/log.c:1784
msgid "add email header"
msgstr "添加邮件头"
-#: builtin/log.c:1674 builtin/log.c:1676
+#: builtin/log.c:1785 builtin/log.c:1786
msgid "email"
msgstr "邮件地址"
-#: builtin/log.c:1674
+#: builtin/log.c:1785
msgid "add To: header"
msgstr "添加收件人"
-#: builtin/log.c:1676
+#: builtin/log.c:1786
msgid "add Cc: header"
msgstr "添加抄送"
-#: builtin/log.c:1678
+#: builtin/log.c:1787
msgid "ident"
msgstr "标识"
-#: builtin/log.c:1679
+#: builtin/log.c:1788
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）"
-#: builtin/log.c:1681
+#: builtin/log.c:1790
msgid "message-id"
msgstr "邮件标识"
-#: builtin/log.c:1682
+#: builtin/log.c:1791
msgid "make first mail a reply to <message-id>"
msgstr "使第一封邮件作为对 <邮件标识> 的回复"
-#: builtin/log.c:1683 builtin/log.c:1686
+#: builtin/log.c:1792 builtin/log.c:1795
msgid "boundary"
msgstr "边界"
-#: builtin/log.c:1684
+#: builtin/log.c:1793
msgid "attach the patch"
msgstr "附件方式添加补丁"
-#: builtin/log.c:1687
+#: builtin/log.c:1796
msgid "inline the patch"
msgstr "内联显示补丁"
-#: builtin/log.c:1691
+#: builtin/log.c:1800
msgid "enable message threading, styles: shallow, deep"
msgstr "启用邮件线索，风格：浅，深"
-#: builtin/log.c:1693
+#: builtin/log.c:1802
msgid "signature"
msgstr "签名"
-#: builtin/log.c:1694
+#: builtin/log.c:1803
msgid "add a signature"
msgstr "添加一个签名"
-#: builtin/log.c:1695
+#: builtin/log.c:1804
msgid "base-commit"
msgstr "基线提交"
-#: builtin/log.c:1696
+#: builtin/log.c:1805
msgid "add prerequisite tree info to the patch series"
msgstr "为补丁列表添加前置树信息"
-#: builtin/log.c:1698
+#: builtin/log.c:1808
msgid "add a signature from a file"
msgstr "从文件添加一个签名"
-#: builtin/log.c:1699
+#: builtin/log.c:1809
msgid "don't print the patch filenames"
msgstr "不要打印补丁文件名"
-#: builtin/log.c:1701
+#: builtin/log.c:1811
msgid "show progress while generating patches"
msgstr "在生成补丁时显示进度"
-#: builtin/log.c:1703
+#: builtin/log.c:1813
msgid "show changes against <rev> in cover letter or single patch"
msgstr "在附函或单个补丁中显示和 <rev> 的差异"
-#: builtin/log.c:1706
+#: builtin/log.c:1816
msgid "show changes against <refspec> in cover letter or single patch"
msgstr "在附函或单个补丁中显示和 <refspec> 的差异"
-#: builtin/log.c:1708
+#: builtin/log.c:1818
msgid "percentage by which creation is weighted"
msgstr "创建权重的百分比"
-#: builtin/log.c:1792
+#: builtin/log.c:1904
#, c-format
msgid "invalid ident line: %s"
msgstr "包含无效的身份标识：%s"
-#: builtin/log.c:1807
+#: builtin/log.c:1919
msgid "-n and -k are mutually exclusive"
msgstr "-n 和 -k 互斥"
-#: builtin/log.c:1809
+#: builtin/log.c:1921
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "--subject-prefix/--rfc 和 -k 互斥"
-#: builtin/log.c:1817
+#: builtin/log.c:1929
msgid "--name-only does not make sense"
msgstr "--name-only 无意义"
-#: builtin/log.c:1819
+#: builtin/log.c:1931
msgid "--name-status does not make sense"
msgstr "--name-status 无意义"
-#: builtin/log.c:1821
+#: builtin/log.c:1933
msgid "--check does not make sense"
msgstr "--check 无意义"
-#: builtin/log.c:1854
-msgid "standard output, or directory, which one?"
-msgstr "标准输出或目录，哪一个？"
+#: builtin/log.c:1955
+msgid "--stdout, --output, and --output-directory are mutually exclusive"
+msgstr "--stdout、--output 和 --output-directory 是互斥的"
-#: builtin/log.c:1958
+#: builtin/log.c:2078
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff 需要 --cover-letter 或单一补丁"
-#: builtin/log.c:1962
+#: builtin/log.c:2082
msgid "Interdiff:"
msgstr "版本间差异："
-#: builtin/log.c:1963
+#: builtin/log.c:2083
#, c-format
msgid "Interdiff against v%d:"
msgstr "对 v%d 的版本差异："
-#: builtin/log.c:1969
+#: builtin/log.c:2089
msgid "--creation-factor requires --range-diff"
msgstr "--creation-factor 需要 --range-diff"
-#: builtin/log.c:1973
+#: builtin/log.c:2093
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff 需要 --cover-letter 或单一补丁"
-#: builtin/log.c:1981
+#: builtin/log.c:2101
msgid "Range-diff:"
msgstr "范围差异："
-#: builtin/log.c:1982
+#: builtin/log.c:2102
#, c-format
msgid "Range-diff against v%d:"
msgstr "对 v%d 的范围差异："
-#: builtin/log.c:1993
+#: builtin/log.c:2113
#, c-format
msgid "unable to read signature file '%s'"
msgstr "无法读取签名文件 '%s'"
-#: builtin/log.c:2029
+#: builtin/log.c:2149
msgid "Generating patches"
msgstr "生成补丁"
-#: builtin/log.c:2073
+#: builtin/log.c:2193
msgid "failed to create output files"
msgstr "无法创建输出文件"
-#: builtin/log.c:2132
+#: builtin/log.c:2252
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
-#: builtin/log.c:2186
+#: builtin/log.c:2306
#, 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:486
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<选项>] [<文件>...]"
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:542
msgid "identify the file status with tags"
msgstr "用标签标识文件的状态"
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:544
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "使用小写字母表示 '假设未改变的' 文件"
-#: builtin/ls-files.c:530
+#: builtin/ls-files.c:546
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "使用小写字母表示 'fsmonitor clean' 文件"
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:548
msgid "show cached files in the output (default)"
msgstr "显示缓存的文件（默认）"
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:550
msgid "show deleted files in the output"
msgstr "显示已删除的文件"
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:552
msgid "show modified files in the output"
msgstr "显示已修改的文件"
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:554
msgid "show other files in the output"
msgstr "显示其它文件"
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:556
msgid "show ignored files in the output"
msgstr "显示忽略的文件"
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:559
msgid "show staged contents' object name in the output"
msgstr "显示暂存区内容的对象名称"
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:561
msgid "show files on the filesystem that need to be removed"
msgstr "显示文件系统需要删除的文件"
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:563
msgid "show 'other' directories' names only"
msgstr "只显示“其他”目录的名称"
-#: builtin/ls-files.c:549
+#: builtin/ls-files.c:565
msgid "show line endings of files"
msgstr "显示文件换行符格式"
-#: builtin/ls-files.c:551
+#: builtin/ls-files.c:567
msgid "don't show empty directories"
msgstr "不显示空目录"
-#: builtin/ls-files.c:554
+#: builtin/ls-files.c:570
msgid "show unmerged files in the output"
msgstr "显示未合并的文件"
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:572
msgid "show resolve-undo information"
msgstr "显示 resolve-undo 信息"
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:574
msgid "skip files matching pattern"
-msgstr "匹配排除文件的模式"
+msgstr "跳过和模式匹配的文件"
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:577
msgid "exclude patterns are read from <file>"
msgstr "从 <文件> 中读取排除模式"
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:580
msgid "read additional per-directory exclude patterns in <file>"
msgstr "从 <文件> 读取额外的每个目录的排除模式"
-#: builtin/ls-files.c:566
+#: builtin/ls-files.c:582
msgid "add the standard git exclusions"
msgstr "添加标准的 git 排除"
-#: builtin/ls-files.c:570
+#: builtin/ls-files.c:586
msgid "make the output relative to the project top directory"
msgstr "显示相对于顶级目录的文件名"
-#: builtin/ls-files.c:573
+#: builtin/ls-files.c:589
msgid "recurse through submodules"
msgstr "在子模组中递归"
-#: builtin/ls-files.c:575
+#: builtin/ls-files.c:591
msgid "if any <file> is not in the index, treat this as an error"
msgstr "如果任何 <文件> 都不在索引区，视为错误"
-#: builtin/ls-files.c:576
+#: builtin/ls-files.c:592
msgid "tree-ish"
msgstr "树对象"
-#: builtin/ls-files.c:577
+#: builtin/ls-files.c:593
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "假装自从 <树对象> 之后删除的路径仍然存在"
-#: builtin/ls-files.c:579
+#: builtin/ls-files.c:595
msgid "show debugging data"
msgstr "显示调试数据"
+#: builtin/ls-files.c:597
+msgid "suppress duplicate entries"
+msgstr "抑制重复条目"
+
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
@@ -15695,39 +16881,39 @@
" [-q | --quiet] [--exit-code] [--get-url]\n"
" [--symref] [<仓库> [<引用>...]]"
-#: builtin/ls-remote.c:59
+#: builtin/ls-remote.c:60
msgid "do not print remote URL"
msgstr "不打印远程 URL"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1404
msgid "exec"
msgstr "exec"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
+#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
msgid "path of git-upload-pack on the remote host"
msgstr "远程主机上的 git-upload-pack 路径"
-#: builtin/ls-remote.c:65
+#: builtin/ls-remote.c:66
msgid "limit to tags"
msgstr "仅限于标签"
-#: builtin/ls-remote.c:66
+#: builtin/ls-remote.c:67
msgid "limit to heads"
msgstr "仅限于分支"
-#: builtin/ls-remote.c:67
+#: builtin/ls-remote.c:68
msgid "do not show peeled tags"
msgstr "不显示已解析的标签"
-#: builtin/ls-remote.c:69
+#: builtin/ls-remote.c:70
msgid "take url.<base>.insteadOf into account"
msgstr "参考 url.<base>.insteadOf 设置"
-#: builtin/ls-remote.c:72
+#: builtin/ls-remote.c:73
msgid "exit with exit code 2 if no matching refs are found"
msgstr "若未找到匹配的引用则以退出码2退出"
-#: builtin/ls-remote.c:75
+#: builtin/ls-remote.c:76
msgid "show underlying ref in addition to the object pointed by it"
msgstr "除了显示指向的对象外，显示指向的引用名"
@@ -15772,386 +16958,6 @@
msgid "empty mbox: '%s'"
msgstr "空的 mbox：'%s'"
-#: builtin/merge.c:55
-msgid "git merge [<options>] [<commit>...]"
-msgstr "git merge [<选项>] [<提交>...]"
-
-#: builtin/merge.c:56
-msgid "git merge --abort"
-msgstr "git merge --abort"
-
-#: builtin/merge.c:57
-msgid "git merge --continue"
-msgstr "git merge --continue"
-
-#: builtin/merge.c:119
-msgid "switch `m' requires a value"
-msgstr "开关 `m' 需要一个值"
-
-#: builtin/merge.c:142
-#, c-format
-msgid "option `%s' requires a value"
-msgstr "选项 `%s' 需要一个值"
-
-#: builtin/merge.c:188
-#, c-format
-msgid "Could not find merge strategy '%s'.\n"
-msgstr "不能找到合并策略 '%s'。\n"
-
-#: builtin/merge.c:189
-#, c-format
-msgid "Available strategies are:"
-msgstr "可用的策略有："
-
-#: builtin/merge.c:194
-#, c-format
-msgid "Available custom strategies are:"
-msgstr "可用的自定义策略有："
-
-#: builtin/merge.c:245 builtin/pull.c:132
-msgid "do not show a diffstat at the end of the merge"
-msgstr "在合并的最后不显示差异统计"
-
-#: builtin/merge.c:248 builtin/pull.c:135
-msgid "show a diffstat at the end of the merge"
-msgstr "在合并的最后显示差异统计"
-
-#: builtin/merge.c:249 builtin/pull.c:138
-msgid "(synonym to --stat)"
-msgstr "（和 --stat 同义）"
-
-#: builtin/merge.c:251 builtin/pull.c:141
-msgid "add (at most <n>) entries from shortlog to merge commit message"
-msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录"
-
-#: builtin/merge.c:254 builtin/pull.c:147
-msgid "create a single commit instead of doing a merge"
-msgstr "创建一个单独的提交而不是做一次合并"
-
-#: builtin/merge.c:256 builtin/pull.c:150
-msgid "perform a commit if the merge succeeds (default)"
-msgstr "如果合并成功，执行一次提交（默认）"
-
-#: builtin/merge.c:258 builtin/pull.c:153
-msgid "edit message before committing"
-msgstr "在提交前编辑提交说明"
-
-#: builtin/merge.c:260
-msgid "allow fast-forward (default)"
-msgstr "允许快进（默认）"
-
-#: builtin/merge.c:262 builtin/pull.c:160
-msgid "abort if fast-forward is not possible"
-msgstr "如果不能快进就放弃合并"
-
-#: builtin/merge.c:266 builtin/pull.c:163
-msgid "verify that the named commit has a valid GPG signature"
-msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
-
-#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167
-#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114
-msgid "strategy"
-msgstr "策略"
-
-#: builtin/merge.c:268 builtin/pull.c:168
-msgid "merge strategy to use"
-msgstr "要使用的合并策略"
-
-#: builtin/merge.c:269 builtin/pull.c:171
-msgid "option=value"
-msgstr "option=value"
-
-#: builtin/merge.c:270 builtin/pull.c:172
-msgid "option for selected merge strategy"
-msgstr "所选的合并策略的选项"
-
-#: builtin/merge.c:272
-msgid "merge commit message (for a non-fast-forward merge)"
-msgstr "合并的提交说明（针对非快进式合并）"
-
-#: builtin/merge.c:279
-msgid "abort the current in-progress merge"
-msgstr "放弃当前正在进行的合并"
-
-#
-#: builtin/merge.c:281
-msgid "--abort but leave index and working tree alone"
-msgstr "--abort，但是保留索引和工作区"
-
-#: builtin/merge.c:283
-msgid "continue the current in-progress merge"
-msgstr "继续当前正在进行的合并"
-
-#: builtin/merge.c:285 builtin/pull.c:179
-msgid "allow merging unrelated histories"
-msgstr "允许合并不相关的历史"
-
-#: builtin/merge.c:291
-msgid "bypass pre-merge-commit and commit-msg hooks"
-msgstr "绕过 pre-merge-commit 和 commit-msg 钩子"
-
-#: builtin/merge.c:308
-msgid "could not run stash."
-msgstr "不能运行贮藏。"
-
-#: builtin/merge.c:313
-msgid "stash failed"
-msgstr "贮藏失败"
-
-#: builtin/merge.c:318
-#, c-format
-msgid "not a valid object: %s"
-msgstr "不是一个有效对象：%s"
-
-#: builtin/merge.c:340 builtin/merge.c:357
-msgid "read-tree failed"
-msgstr "读取树失败"
-
-# 译者：注意保持前导空格
-#: builtin/merge.c:387
-msgid " (nothing to squash)"
-msgstr " （无可压缩）"
-
-#: builtin/merge.c:398
-#, c-format
-msgid "Squash commit -- not updating HEAD\n"
-msgstr "压缩提交 -- 未更新 HEAD\n"
-
-#: builtin/merge.c:448
-#, c-format
-msgid "No merge message -- not updating HEAD\n"
-msgstr "无合并信息 -- 未更新 HEAD\n"
-
-#: builtin/merge.c:499
-#, c-format
-msgid "'%s' does not point to a commit"
-msgstr "'%s' 没有指向一个提交"
-
-#: builtin/merge.c:586
-#, c-format
-msgid "Bad branch.%s.mergeoptions string: %s"
-msgstr "坏的 branch.%s.mergeoptions 字符串：%s"
-
-#: builtin/merge.c:708
-msgid "Not handling anything other than two heads merge."
-msgstr "未处理两个头合并之外的任何操作。"
-
-#: builtin/merge.c:722
-#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "merge-recursive 的未知选项：-X%s"
-
-#: builtin/merge.c:737
-#, c-format
-msgid "unable to write %s"
-msgstr "不能写 %s"
-
-#: builtin/merge.c:789
-#, c-format
-msgid "Could not read from '%s'"
-msgstr "不能从 '%s' 读取"
-
-#: builtin/merge.c:798
-#, c-format
-msgid "Not committing merge; use 'git commit' to complete the merge.\n"
-msgstr "未提交合并，使用 'git commit' 完成此次合并。\n"
-
-#: builtin/merge.c:804
-msgid ""
-"Please enter a commit message to explain why this merge is necessary,\n"
-"especially if it merges an updated upstream into a topic branch.\n"
-"\n"
-msgstr ""
-"请输入一个提交信息以解释此合并的必要性，尤其是将一个更新后的上游分支\n"
-"合并到主题分支。\n"
-"\n"
-
-#: builtin/merge.c:809
-msgid "An empty message aborts the commit.\n"
-msgstr "空的提交说明会终止提交。\n"
-
-#: builtin/merge.c:812
-#, c-format
-msgid ""
-"Lines starting with '%c' will be ignored, and an empty message aborts\n"
-"the commit.\n"
-msgstr "以 '%c' 开始的行将被忽略，而空的提交说明将终止提交。\n"
-
-#: builtin/merge.c:865
-msgid "Empty commit message."
-msgstr "空提交信息。"
-
-#: builtin/merge.c:880
-#, c-format
-msgid "Wonderful.\n"
-msgstr "太棒了。\n"
-
-#: builtin/merge.c:941
-#, c-format
-msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
-msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"
-
-#: builtin/merge.c:980
-msgid "No current branch."
-msgstr "没有当前分支。"
-
-#: builtin/merge.c:982
-msgid "No remote for the current branch."
-msgstr "当前分支没有对应的远程仓库。"
-
-#: builtin/merge.c:984
-msgid "No default upstream defined for the current branch."
-msgstr "当前分支没有定义默认的上游分支。"
-
-#: builtin/merge.c:989
-#, c-format
-msgid "No remote-tracking branch for %s from %s"
-msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
-
-#: builtin/merge.c:1046
-#, c-format
-msgid "Bad value '%s' in environment '%s'"
-msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
-
-#: builtin/merge.c:1149
-#, c-format
-msgid "not something we can merge in %s: %s"
-msgstr "不能在 %s 中合并：%s"
-
-#: builtin/merge.c:1183
-msgid "not something we can merge"
-msgstr "不能合并"
-
-#: builtin/merge.c:1286
-msgid "--abort expects no arguments"
-msgstr "--abort 不带参数"
-
-#: builtin/merge.c:1290
-msgid "There is no merge to abort (MERGE_HEAD missing)."
-msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"
-
-#: builtin/merge.c:1299
-msgid "--quit expects no arguments"
-msgstr "--quit 不带参数"
-
-#: builtin/merge.c:1312
-msgid "--continue expects no arguments"
-msgstr "--continue 不带参数"
-
-#: builtin/merge.c:1316
-msgid "There is no merge in progress (MERGE_HEAD missing)."
-msgstr "没有进行中的合并（MERGE_HEAD 丢失）。"
-
-#: builtin/merge.c:1332
-msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you merge."
-msgstr ""
-"您尚未结束您的合并（存在 MERGE_HEAD）。\n"
-"请在合并前先提交您的修改。"
-
-#: builtin/merge.c:1339
-msgid ""
-"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
-"Please, commit your changes before you merge."
-msgstr ""
-"您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"
-"请在合并前先提交您的修改。"
-
-#: builtin/merge.c:1342
-msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
-msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"
-
-#: builtin/merge.c:1356
-msgid "You cannot combine --squash with --no-ff."
-msgstr "您不能将 --squash 和 --no-ff 组合使用。"
-
-#: builtin/merge.c:1358
-msgid "You cannot combine --squash with --commit."
-msgstr "您不能将 --squash 和 --commit 组合使用。"
-
-#: builtin/merge.c:1374
-msgid "No commit specified and merge.defaultToUpstream not set."
-msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
-
-#: builtin/merge.c:1391
-msgid "Squash commit into empty head not supported yet"
-msgstr "尚不支持到空分支的压缩提交"
-
-#: builtin/merge.c:1393
-msgid "Non-fast-forward commit does not make sense into an empty head"
-msgstr "到空分支的非快进式提交没有意义"
-
-#: builtin/merge.c:1398
-#, c-format
-msgid "%s - not something we can merge"
-msgstr "%s - 不能被合并"
-
-#: builtin/merge.c:1400
-msgid "Can merge only exactly one commit into empty head"
-msgstr "只能将一个提交合并到空分支上"
-
-#: builtin/merge.c:1481
-msgid "refusing to merge unrelated histories"
-msgstr "拒绝合并无关的历史"
-
-#: builtin/merge.c:1490
-msgid "Already up to date."
-msgstr "已经是最新的。"
-
-#: builtin/merge.c:1500
-#, c-format
-msgid "Updating %s..%s\n"
-msgstr "更新 %s..%s\n"
-
-#: builtin/merge.c:1542
-#, c-format
-msgid "Trying really trivial in-index merge...\n"
-msgstr "尝试非常小的索引内合并...\n"
-
-#: builtin/merge.c:1549
-#, c-format
-msgid "Nope.\n"
-msgstr "无。\n"
-
-#: builtin/merge.c:1574
-msgid "Already up to date. Yeeah!"
-msgstr "已经是最新的。耶！"
-
-#: builtin/merge.c:1580
-msgid "Not possible to fast-forward, aborting."
-msgstr "无法快进，终止。"
-
-#: builtin/merge.c:1603 builtin/merge.c:1668
-#, c-format
-msgid "Rewinding the tree to pristine...\n"
-msgstr "将树回滚至原始状态...\n"
-
-#: builtin/merge.c:1607
-#, c-format
-msgid "Trying merge strategy %s...\n"
-msgstr "尝试合并策略 %s...\n"
-
-#: builtin/merge.c:1659
-#, c-format
-msgid "No merge strategy handled the merge.\n"
-msgstr "没有合并策略处理此合并。\n"
-
-#: builtin/merge.c:1661
-#, c-format
-msgid "Merge with strategy %s failed.\n"
-msgstr "使用策略 %s 合并失败。\n"
-
-#: builtin/merge.c:1670
-#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
-msgstr "使用 %s 以准备手工解决。\n"
-
-#: builtin/merge.c:1682
-#, c-format
-msgid "Automatic merge went well; stopped before committing as requested\n"
-msgstr "自动合并进展顺利，按要求在提交前停止\n"
-
#: builtin/merge-base.c:32
msgid "git merge-base [-a | --all] <commit> <commit>..."
msgstr "git merge-base [-a | --all] <提交> <提交>..."
@@ -16172,33 +16978,33 @@
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <引用> [<提交>]"
-#: builtin/merge-base.c:153
+#: builtin/merge-base.c:143
msgid "output all common ancestors"
msgstr "输出所有共同的祖先"
-#: builtin/merge-base.c:155
+#: builtin/merge-base.c:145
msgid "find ancestors for a single n-way merge"
msgstr "查找一个多路合并的祖先提交"
-#: builtin/merge-base.c:157
+#: builtin/merge-base.c:147
msgid "list revs not reachable from others"
msgstr "显示不能被其他访问到的版本"
-#: builtin/merge-base.c:159
+#: builtin/merge-base.c:149
msgid "is the first one ancestor of the other?"
msgstr "第一个是其他的祖先提交么？"
-#: builtin/merge-base.c:161
+#: builtin/merge-base.c:151
msgid "find where <commit> forked from reflog of <ref>"
-msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
+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>"
+"git merge-file [<选项>] [-L <名字1> [-L <初始名字> [-L <名字2>]]] <文件1> <初"
+"始文件> <文件2>"
#: builtin/merge-file.c:35
msgid "send results to standard output"
@@ -16263,6 +17069,427 @@
msgid "Merging %s with %s\n"
msgstr "合并 %s 和 %s\n"
+#: builtin/merge.c:58
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<选项>] [<提交>...]"
+
+#: builtin/merge.c:59
+msgid "git merge --abort"
+msgstr "git merge --abort"
+
+#: builtin/merge.c:60
+msgid "git merge --continue"
+msgstr "git merge --continue"
+
+#: builtin/merge.c:123
+msgid "switch `m' requires a value"
+msgstr "开关 `m' 需要一个值"
+
+#: builtin/merge.c:146
+#, c-format
+msgid "option `%s' requires a value"
+msgstr "选项 `%s' 需要一个值"
+
+#: builtin/merge.c:199
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr "不能找到合并策略 '%s'。\n"
+
+#: builtin/merge.c:200
+#, c-format
+msgid "Available strategies are:"
+msgstr "可用的策略有："
+
+#: builtin/merge.c:205
+#, c-format
+msgid "Available custom strategies are:"
+msgstr "可用的自定义策略有："
+
+#: builtin/merge.c:256 builtin/pull.c:133
+msgid "do not show a diffstat at the end of the merge"
+msgstr "在合并的最后不显示差异统计"
+
+#: builtin/merge.c:259 builtin/pull.c:136
+msgid "show a diffstat at the end of the merge"
+msgstr "在合并的最后显示差异统计"
+
+#: builtin/merge.c:260 builtin/pull.c:139
+msgid "(synonym to --stat)"
+msgstr "（和 --stat 同义）"
+
+#: builtin/merge.c:262 builtin/pull.c:142
+msgid "add (at most <n>) entries from shortlog to merge commit message"
+msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录"
+
+#: builtin/merge.c:265 builtin/pull.c:148
+msgid "create a single commit instead of doing a merge"
+msgstr "创建一个单独的提交而不是做一次合并"
+
+#: builtin/merge.c:267 builtin/pull.c:151
+msgid "perform a commit if the merge succeeds (default)"
+msgstr "如果合并成功，执行一次提交（默认）"
+
+#: builtin/merge.c:269 builtin/pull.c:154
+msgid "edit message before committing"
+msgstr "在提交前编辑提交说明"
+
+#: builtin/merge.c:271
+msgid "allow fast-forward (default)"
+msgstr "允许快进（默认）"
+
+#: builtin/merge.c:273 builtin/pull.c:161
+msgid "abort if fast-forward is not possible"
+msgstr "如果不能快进就放弃合并"
+
+#: builtin/merge.c:277 builtin/pull.c:164
+msgid "verify that the named commit has a valid GPG signature"
+msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
+
+#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
+#: builtin/rebase.c:541 builtin/rebase.c:1418 builtin/revert.c:114
+msgid "strategy"
+msgstr "策略"
+
+#: builtin/merge.c:279 builtin/pull.c:169
+msgid "merge strategy to use"
+msgstr "要使用的合并策略"
+
+#: builtin/merge.c:280 builtin/pull.c:172
+msgid "option=value"
+msgstr "option=value"
+
+#: builtin/merge.c:281 builtin/pull.c:173
+msgid "option for selected merge strategy"
+msgstr "所选的合并策略的选项"
+
+#: builtin/merge.c:283
+msgid "merge commit message (for a non-fast-forward merge)"
+msgstr "合并的提交说明（针对非快进式合并）"
+
+#: builtin/merge.c:290
+msgid "abort the current in-progress merge"
+msgstr "放弃当前正在进行的合并"
+
+#
+#: builtin/merge.c:292
+msgid "--abort but leave index and working tree alone"
+msgstr "--abort，但是保留索引和工作区"
+
+#: builtin/merge.c:294
+msgid "continue the current in-progress merge"
+msgstr "继续当前正在进行的合并"
+
+#: builtin/merge.c:296 builtin/pull.c:180
+msgid "allow merging unrelated histories"
+msgstr "允许合并不相关的历史"
+
+#: builtin/merge.c:303
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr "绕过 pre-merge-commit 和 commit-msg 钩子"
+
+#: builtin/merge.c:320
+msgid "could not run stash."
+msgstr "不能运行贮藏。"
+
+#: builtin/merge.c:325
+msgid "stash failed"
+msgstr "贮藏失败"
+
+#: builtin/merge.c:330
+#, c-format
+msgid "not a valid object: %s"
+msgstr "不是一个有效对象：%s"
+
+#: builtin/merge.c:352 builtin/merge.c:369
+msgid "read-tree failed"
+msgstr "读取树失败"
+
+# 译者：注意保持前导空格
+#: builtin/merge.c:399
+msgid " (nothing to squash)"
+msgstr " （无可压缩）"
+
+#: builtin/merge.c:410
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr "压缩提交 -- 未更新 HEAD\n"
+
+#: builtin/merge.c:460
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr "无合并信息 -- 未更新 HEAD\n"
+
+#: builtin/merge.c:511
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr "'%s' 没有指向一个提交"
+
+#: builtin/merge.c:598
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr "坏的 branch.%s.mergeoptions 字符串：%s"
+
+#: builtin/merge.c:724
+msgid "Not handling anything other than two heads merge."
+msgstr "未处理两个头合并之外的任何操作。"
+
+#: builtin/merge.c:737
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr "merge-recursive 的未知选项：-X%s"
+
+#: builtin/merge.c:756 t/helper/test-fast-rebase.c:209
+#, c-format
+msgid "unable to write %s"
+msgstr "不能写 %s"
+
+#: builtin/merge.c:808
+#, c-format
+msgid "Could not read from '%s'"
+msgstr "不能从 '%s' 读取"
+
+#: builtin/merge.c:817
+#, c-format
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+msgstr "未提交合并，使用 'git commit' 完成此次合并。\n"
+
+#: builtin/merge.c:823
+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:828
+msgid "An empty message aborts the commit.\n"
+msgstr "空的提交说明会终止提交。\n"
+
+#: builtin/merge.c:831
+#, 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:884
+msgid "Empty commit message."
+msgstr "空提交信息。"
+
+#: builtin/merge.c:899
+#, c-format
+msgid "Wonderful.\n"
+msgstr "太棒了。\n"
+
+#: builtin/merge.c:960
+#, c-format
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"
+
+#: builtin/merge.c:999
+msgid "No current branch."
+msgstr "没有当前分支。"
+
+#: builtin/merge.c:1001
+msgid "No remote for the current branch."
+msgstr "当前分支没有对应的远程仓库。"
+
+#: builtin/merge.c:1003
+msgid "No default upstream defined for the current branch."
+msgstr "当前分支没有定义默认的上游分支。"
+
+#: builtin/merge.c:1008
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
+msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
+
+#: builtin/merge.c:1065
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
+
+#: builtin/merge.c:1168
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr "不能在 %s 中合并：%s"
+
+#: builtin/merge.c:1202
+msgid "not something we can merge"
+msgstr "不能合并"
+
+#: builtin/merge.c:1312
+msgid "--abort expects no arguments"
+msgstr "--abort 不带参数"
+
+#: builtin/merge.c:1316
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"
+
+#: builtin/merge.c:1334
+msgid "--quit expects no arguments"
+msgstr "--quit 不带参数"
+
+#: builtin/merge.c:1347
+msgid "--continue expects no arguments"
+msgstr "--continue 不带参数"
+
+#: builtin/merge.c:1351
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr "没有进行中的合并（MERGE_HEAD 丢失）。"
+
+#: builtin/merge.c:1367
+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:1374
+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:1377
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"
+
+#: builtin/merge.c:1391
+msgid "You cannot combine --squash with --no-ff."
+msgstr "您不能将 --squash 和 --no-ff 组合使用。"
+
+#: builtin/merge.c:1393
+msgid "You cannot combine --squash with --commit."
+msgstr "您不能将 --squash 和 --commit 组合使用。"
+
+#: builtin/merge.c:1409
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
+
+#: builtin/merge.c:1426
+msgid "Squash commit into empty head not supported yet"
+msgstr "尚不支持到空分支的压缩提交"
+
+#: builtin/merge.c:1428
+msgid "Non-fast-forward commit does not make sense into an empty head"
+msgstr "到空分支的非快进式提交没有意义"
+
+#: builtin/merge.c:1433
+#, c-format
+msgid "%s - not something we can merge"
+msgstr "%s - 不能被合并"
+
+#: builtin/merge.c:1435
+msgid "Can merge only exactly one commit into empty head"
+msgstr "只能将一个提交合并到空分支上"
+
+#: builtin/merge.c:1516
+msgid "refusing to merge unrelated histories"
+msgstr "拒绝合并无关的历史"
+
+#: builtin/merge.c:1525
+msgid "Already up to date."
+msgstr "已经是最新的。"
+
+#: builtin/merge.c:1535
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr "更新 %s..%s\n"
+
+#: builtin/merge.c:1581
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr "尝试非常小的索引内合并...\n"
+
+#: builtin/merge.c:1588
+#, c-format
+msgid "Nope.\n"
+msgstr "无。\n"
+
+#: builtin/merge.c:1613
+msgid "Already up to date. Yeeah!"
+msgstr "已经是最新的。耶！"
+
+#: builtin/merge.c:1619
+msgid "Not possible to fast-forward, aborting."
+msgstr "无法快进，终止。"
+
+#: builtin/merge.c:1647 builtin/merge.c:1712
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr "将树回滚至原始状态...\n"
+
+#: builtin/merge.c:1651
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr "尝试合并策略 %s...\n"
+
+#: builtin/merge.c:1703
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr "没有合并策略处理此合并。\n"
+
+#: builtin/merge.c:1705
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr "使用策略 %s 合并失败。\n"
+
+#: builtin/merge.c:1714
+#, c-format
+msgid "Using the %s to prepare resolving by hand.\n"
+msgstr "使用 %s 以准备手工解决。\n"
+
+#: builtin/merge.c:1728
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
+msgstr "自动合并进展顺利，按要求在提交前停止\n"
+
+#: builtin/mktag.c:10
+msgid "git mktag"
+msgstr "git mktag"
+
+#: builtin/mktag.c:30
+#, c-format
+msgid "warning: tag input does not pass fsck: %s"
+msgstr "警告：标签输入未通过 fsck：%s"
+
+#: builtin/mktag.c:41
+#, c-format
+msgid "error: tag input does not pass fsck: %s"
+msgstr "错误：标签输入未通过 fsck：%s"
+
+#: builtin/mktag.c:44
+#, c-format
+msgid "%d (FSCK_IGNORE?) should never trigger this callback"
+msgstr "%d（忽略 FSCK?）不应该触发这个调用"
+
+#: builtin/mktag.c:59
+#, c-format
+msgid "could not read tagged object '%s'"
+msgstr "不能读取被标记的对象 '%s'"
+
+#: builtin/mktag.c:62
+#, c-format
+msgid "object '%s' tagged as '%s', but is a '%s' type"
+msgstr "对象 '%s' 被标记为 '%s'，然而是一个 '%s' 类型"
+
+#: builtin/mktag.c:99
+msgid "tag on stdin did not pass our strict fsck check"
+msgstr "标准输入上的标签未通过我们严格的 fsck 检查"
+
+#: builtin/mktag.c:102
+msgid "tag on stdin did not refer to a valid object"
+msgstr "标准输入上的标签未指向一个有效的对象"
+
+#: builtin/mktag.c:105 builtin/tag.c:232
+msgid "unable to write tag file"
+msgstr "无法写标签文件"
+
#: builtin/mktree.c:66
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
@@ -16297,7 +17524,10 @@
"larger than this size"
msgstr "在 repack 期间，将较小尺寸的包文件收集到大于此大小的批次中"
-#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67
+#: builtin/multi-pack-index.c:50 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 builtin/prune-packed.c:25 builtin/tag.c:575
msgid "too many arguments"
msgstr "太多参数"
@@ -16336,68 +17566,72 @@
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:781 builtin/repack.c:518
+#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:483
#, c-format
msgid "renaming '%s' failed"
msgstr "重命名 '%s' 失败"
@@ -16415,8 +17649,8 @@
msgstr "git name-rev [<选项>] --stdin"
#: builtin/name-rev.c:524
-msgid "print only names (no SHA-1)"
-msgstr "只打印名称（无 SHA-1）"
+msgid "print only ref-based names (no object names)"
+msgstr "只打印基于引用的名称（非对象名）"
#: builtin/name-rev.c:525
msgid "only use tags to name the commits"
@@ -16586,7 +17820,7 @@
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:565
#, c-format
msgid "could not open or read '%s'"
msgstr "不能打开或读取 '%s'"
@@ -16626,12 +17860,6 @@
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."
@@ -16687,7 +17915,7 @@
msgstr "重新加载 <命令> 的配置（隐含 --stdin）"
#: builtin/notes.c:517
-msgid "too few parameters"
+msgid "too few arguments"
msgstr "参数太少"
#: builtin/notes.c:538
@@ -16811,7 +18039,7 @@
"自动合并说明失败。修改 %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:578
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "无法解析 '%s' 为一个有效引用。"
@@ -16829,7 +18057,7 @@
msgid "read object names from the standard input"
msgstr "从标准输入读取对象名称"
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148
msgid "do not remove, show only"
msgstr "不删除，只显示"
@@ -16845,116 +18073,143 @@
msgid "use notes from <notes-ref>"
msgstr "从 <注解引用> 使用注解"
-#: builtin/notes.c:1034 builtin/stash.c:1643
+#: builtin/notes.c:1034 builtin/stash.c:1671
#, 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:430
+#: builtin/pack-objects.c:440
+#, c-format
+msgid ""
+"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
+"pack %s"
+msgstr "write_reuse_object：无法定位 %1$s，预期在包 %3$s 中的偏移量 %2$<PRIuMAX> 上"
+
+#: builtin/pack-objects.c:448
#, c-format
msgid "bad packed object CRC for %s"
msgstr "%s 错的包对象 CRC"
-#: builtin/pack-objects.c:441
+#: builtin/pack-objects.c:459
#, c-format
msgid "corrupt packed object for %s"
msgstr "%s 损坏的包对象"
-#: builtin/pack-objects.c:572
+#: builtin/pack-objects.c:590
#, c-format
msgid "recursive delta detected for object %s"
msgstr "发现对象 %s 递归 delta"
-#: builtin/pack-objects.c:783
+#: builtin/pack-objects.c:801
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "排序了 %u 个对象，预期 %<PRIu32> 个"
-#: builtin/pack-objects.c:972
+#: builtin/pack-objects.c:896
+#, c-format
+msgid "expected object at offset %<PRIuMAX> in pack %s"
+msgstr "预期对象在包文件 %2$s 的偏移量 %1$<PRIuMAX> 上"
+
+#: builtin/pack-objects.c:1015
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr "禁用 bitmap 写入，因为 pack.packSizeLimit 设置使得包被切分为多个"
-#: builtin/pack-objects.c:985
+#: builtin/pack-objects.c:1028
msgid "Writing objects"
msgstr "写入对象中"
-#: builtin/pack-objects.c:1046 builtin/update-index.c:90
+#: builtin/pack-objects.c:1089 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "对 %s 调用 stat 失败"
-#: builtin/pack-objects.c:1099
+#: builtin/pack-objects.c:1141
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个"
-#: builtin/pack-objects.c:1297
+#: builtin/pack-objects.c:1358
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "禁用 bitmap 写入，因为一些对象将不会被打包"
-#: builtin/pack-objects.c:1724
+#: builtin/pack-objects.c:1806
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "%s 压缩中 delta 基准偏移越界"
-#: builtin/pack-objects.c:1733
+#: builtin/pack-objects.c:1815
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "%s 的 delta 基准偏移越界"
-#: builtin/pack-objects.c:2004
+#: builtin/pack-objects.c:2096
msgid "Counting objects"
msgstr "对象计数中"
-#: builtin/pack-objects.c:2149
+#: builtin/pack-objects.c:2241
#, c-format
msgid "unable to parse object header of %s"
msgstr "无法解析对象 %s 头信息"
-#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235
-#: builtin/pack-objects.c:2245
+#: builtin/pack-objects.c:2311 builtin/pack-objects.c:2327
+#: builtin/pack-objects.c:2337
#, c-format
msgid "object %s cannot be read"
msgstr "对象 %s 无法读取"
-#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249
+#: builtin/pack-objects.c:2314 builtin/pack-objects.c:2341
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr "对象 %s 不一致的对象长度（%<PRIuMAX> vs %<PRIuMAX>）"
-#: builtin/pack-objects.c:2259
+#: builtin/pack-objects.c:2351
msgid "suboptimal pack - out of memory"
msgstr "次优（suboptimal）打包 - 内存不足"
-#: builtin/pack-objects.c:2574
+#: builtin/pack-objects.c:2666
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "使用 %d 个线程进行压缩"
-#: builtin/pack-objects.c:2713
+#: builtin/pack-objects.c:2805
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "无法为标签 %s 压缩对象"
-#: builtin/pack-objects.c:2801
+#: builtin/pack-objects.c:2891
msgid "Compressing objects"
msgstr "压缩对象中"
-#: builtin/pack-objects.c:2807
+#: builtin/pack-objects.c:2897
msgid "inconsistency with delta count"
msgstr "不一致的差异计数"
-#: builtin/pack-objects.c:2888
+#: builtin/pack-objects.c:2976
+#, 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:2979
+#, c-format
+msgid ""
+"object already configured in another uploadpack.blobpackfileuri (got '%s')"
+msgstr "对象已经在另外的 uploadpack.blobpackfileuri 中配置（得到 '%s'）"
+
+#: builtin/pack-objects.c:3008
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -16963,7 +18218,7 @@
"预期边界对象（edge object）ID，却得到垃圾数据：\n"
" %s"
-#: builtin/pack-objects.c:2894
+#: builtin/pack-objects.c:3014
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -16972,226 +18227,234 @@
"预期对象 ID，却得到垃圾数据：\n"
" %s"
-#: builtin/pack-objects.c:2992
+#: builtin/pack-objects.c:3112
msgid "invalid value for --missing"
msgstr "选项 --missing 的值无效"
-#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159
+#: builtin/pack-objects.c:3171 builtin/pack-objects.c:3279
msgid "cannot open pack index"
msgstr "无法打开包文件索引"
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3202
#, c-format
msgid "loose object at %s could not be examined"
msgstr "无法检查 %s 处的松散对象"
-#: builtin/pack-objects.c:3167
+#: builtin/pack-objects.c:3287
msgid "unable to force loose object"
msgstr "无法强制松散对象"
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3380
#, c-format
msgid "not a rev '%s'"
msgstr "不是一个版本 '%s'"
-#: builtin/pack-objects.c:3263
+#: builtin/pack-objects.c:3383
#, c-format
msgid "bad revision '%s'"
msgstr "坏的版本 '%s'"
-#: builtin/pack-objects.c:3288
+#: builtin/pack-objects.c:3408
msgid "unable to add recent objects"
msgstr "无法添加最近的对象"
-#: builtin/pack-objects.c:3341
+#: builtin/pack-objects.c:3461
#, c-format
msgid "unsupported index version %s"
msgstr "不支持的索引版本 %s"
-#: builtin/pack-objects.c:3345
+#: builtin/pack-objects.c:3465
#, c-format
msgid "bad index version '%s'"
msgstr "坏的索引版本 '%s'"
-#: builtin/pack-objects.c:3383
+#: builtin/pack-objects.c:3503
msgid "<version>[,<offset>]"
msgstr "<版本>[,<偏移>]"
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3504
msgid "write the pack index file in the specified idx format version"
msgstr "用指定的 idx 格式版本来写包索引文件"
-#: builtin/pack-objects.c:3387
+#: builtin/pack-objects.c:3507
msgid "maximum size of each output pack file"
msgstr "每个输出包的最大尺寸"
-#: builtin/pack-objects.c:3389
+#: builtin/pack-objects.c:3509
msgid "ignore borrowed objects from alternate object store"
msgstr "忽略从备用对象存储里借用对象"
-#: builtin/pack-objects.c:3391
+#: builtin/pack-objects.c:3511
msgid "ignore packed objects"
msgstr "忽略包对象"
-#: builtin/pack-objects.c:3393
+#: builtin/pack-objects.c:3513
msgid "limit pack window by objects"
msgstr "限制打包窗口的对象数"
-#: builtin/pack-objects.c:3395
+#: builtin/pack-objects.c:3515
msgid "limit pack window by memory in addition to object limit"
msgstr "除对象数量限制外设置打包窗口的内存限制"
-#: builtin/pack-objects.c:3397
+#: builtin/pack-objects.c:3517
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "打包允许的 delta 链的最大长度"
-#: builtin/pack-objects.c:3399
+#: builtin/pack-objects.c:3519
msgid "reuse existing deltas"
msgstr "重用已存在的 deltas"
-#: builtin/pack-objects.c:3401
+#: builtin/pack-objects.c:3521
msgid "reuse existing objects"
msgstr "重用已存在的对象"
-#: builtin/pack-objects.c:3403
+#: builtin/pack-objects.c:3523
msgid "use OFS_DELTA objects"
msgstr "使用 OFS_DELTA 对象"
-#: builtin/pack-objects.c:3405
+#: builtin/pack-objects.c:3525
msgid "use threads when searching for best delta matches"
msgstr "使用线程查询最佳 delta 匹配"
-#: builtin/pack-objects.c:3407
+#: builtin/pack-objects.c:3527
msgid "do not create an empty pack output"
msgstr "不创建空的包输出"
-#: builtin/pack-objects.c:3409
+#: builtin/pack-objects.c:3529
msgid "read revision arguments from standard input"
msgstr "从标准输入读取版本号参数"
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:3531
msgid "limit the objects to those that are not yet packed"
msgstr "限制那些尚未打包的对象"
-#: builtin/pack-objects.c:3414
+#: builtin/pack-objects.c:3534
msgid "include objects reachable from any reference"
msgstr "包括可以从任何引用访问到的对象"
-#: builtin/pack-objects.c:3417
+#: builtin/pack-objects.c:3537
msgid "include objects referred by reflog entries"
msgstr "包括被引用日志引用到的对象"
-#: builtin/pack-objects.c:3420
+#: builtin/pack-objects.c:3540
msgid "include objects referred to by the index"
msgstr "包括被索引引用到的对象"
-#: builtin/pack-objects.c:3423
+#: builtin/pack-objects.c:3543
msgid "output pack to stdout"
msgstr "输出包到标准输出"
-#: builtin/pack-objects.c:3425
+#: builtin/pack-objects.c:3545
msgid "include tag objects that refer to objects to be packed"
msgstr "包括那些引用了待打包对象的标签对象"
-#: builtin/pack-objects.c:3427
+#: builtin/pack-objects.c:3547
msgid "keep unreachable objects"
msgstr "维持不可达的对象"
-#: builtin/pack-objects.c:3429
+#: builtin/pack-objects.c:3549
msgid "pack loose unreachable objects"
msgstr "打包松散的不可达对象"
-#: builtin/pack-objects.c:3431
+#: builtin/pack-objects.c:3551
msgid "unpack unreachable objects newer than <time>"
msgstr "将比给定 <时间> 新的无法访问的对象解包"
-#: builtin/pack-objects.c:3434
+#: builtin/pack-objects.c:3554
msgid "use the sparse reachability algorithm"
msgstr "使用稀疏可达性算法"
-#: builtin/pack-objects.c:3436
+#: builtin/pack-objects.c:3556
msgid "create thin packs"
msgstr "创建精简包"
-#: builtin/pack-objects.c:3438
+#: builtin/pack-objects.c:3558
msgid "create packs suitable for shallow fetches"
msgstr "创建适合浅克隆仓库获取的包"
-#: builtin/pack-objects.c:3440
+#: builtin/pack-objects.c:3560
msgid "ignore packs that have companion .keep file"
msgstr "忽略配有 .keep 文件的包"
-#: builtin/pack-objects.c:3442
+#: builtin/pack-objects.c:3562
msgid "ignore this pack"
msgstr "忽略该 pack"
-#: builtin/pack-objects.c:3444
+#: builtin/pack-objects.c:3564
msgid "pack compression level"
msgstr "打包压缩级别"
-#: builtin/pack-objects.c:3446
+#: builtin/pack-objects.c:3566
msgid "do not hide commits by grafts"
msgstr "显示被移植隐藏的提交"
-#: builtin/pack-objects.c:3448
+#: builtin/pack-objects.c:3568
msgid "use a bitmap index if available to speed up counting objects"
msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度"
-#: builtin/pack-objects.c:3450
+#: builtin/pack-objects.c:3570
msgid "write a bitmap index together with the pack index"
msgstr "在建立包索引的同时创建 bitmap 索引"
-#: builtin/pack-objects.c:3454
+#: builtin/pack-objects.c:3574
msgid "write a bitmap index if possible"
msgstr "如果可能，写 bitmap 索引"
-#: builtin/pack-objects.c:3458
+#: builtin/pack-objects.c:3578
msgid "handling for missing objects"
msgstr "处理丢失的对象"
-#: builtin/pack-objects.c:3461
+#: builtin/pack-objects.c:3581
msgid "do not pack objects in promisor packfiles"
msgstr "不要打包 promisor 包文件中的对象"
-#: builtin/pack-objects.c:3463
+#: builtin/pack-objects.c:3583
msgid "respect islands during delta compression"
msgstr "在增量压缩时参考数据岛"
-#: builtin/pack-objects.c:3492
+#: builtin/pack-objects.c:3585
+msgid "protocol"
+msgstr "协议"
+
+#: builtin/pack-objects.c:3586
+msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
+msgstr "使用此协议排除任何已配置的 uploadpack.blobpackfileuri"
+
+#: builtin/pack-objects.c:3617
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "增量链深度 %d 太深了，强制为 %d"
-#: builtin/pack-objects.c:3497
+#: builtin/pack-objects.c:3622
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "配置 pack.deltaCacheLimit 太高了，强制为 %d"
-#: builtin/pack-objects.c:3551
+#: builtin/pack-objects.c:3676
msgid "--max-pack-size cannot be used to build a pack for transfer"
msgstr "不能使用 --max-pack-size 来构建传输用的包文件"
-#: builtin/pack-objects.c:3553
+#: builtin/pack-objects.c:3678
msgid "minimum pack size limit is 1 MiB"
msgstr "最小的包文件大小是 1 MiB"
-#: builtin/pack-objects.c:3558
+#: builtin/pack-objects.c:3683
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin 不能用于创建一个可索引包"
-#: builtin/pack-objects.c:3561
+#: builtin/pack-objects.c:3686
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable 和 --unpack-unreachable 不兼容"
-#: builtin/pack-objects.c:3567
+#: builtin/pack-objects.c:3692
msgid "cannot use --filter without --stdout"
msgstr "不能在没有 --stdout 的情况下使用 --filter"
-#: builtin/pack-objects.c:3627
+#: builtin/pack-objects.c:3752
msgid "Enumerating objects"
-msgstr "枚举对象"
+msgstr "枚举对象中"
-#: builtin/pack-objects.c:3657
+#: builtin/pack-objects.c:3783
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -17200,6 +18463,19 @@
"总共 %<PRIu32>（差异 %<PRIu32>），复用 %<PRIu32>（差异 %<PRIu32>），包复用 "
"%<PRIu32>"
+#: builtin/pack-redundant.c:601
+msgid ""
+"'git pack-redundant' is nominated for removal.\n"
+"If you still use this command, please add an extra\n"
+"option, '--i-still-use-this', on the command line\n"
+"and let us know you still use it by sending an e-mail\n"
+"to <git@vger.kernel.org>. Thanks.\n"
+msgstr ""
+"准备移除 'git pack-redundant' 命令。如果您仍旧使用这个\n"
+"命令，请在命令行中添加额外参数：'--i-still-use-this'，\n"
+"并通过发送邮件到 <git@vger.kernel.org> 让我们知道您仍旧\n"
+"使用它。 谢谢。\n"
+
#: builtin/pack-refs.c:8
msgid "git pack-refs [<options>]"
msgstr "git pack-refs [<选项>]"
@@ -17212,31 +18488,27 @@
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 "不能在珍品仓库中执行清理操作"
@@ -17249,61 +18521,61 @@
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
-#: builtin/pull.c:122
+#: builtin/pull.c:123
msgid "control for recursive fetching of submodules"
msgstr "控制子模组的递归获取"
-#: builtin/pull.c:126
+#: builtin/pull.c:127
msgid "Options related to merging"
msgstr "和合并相关的选项"
-#: builtin/pull.c:129
+#: builtin/pull.c:130
msgid "incorporate changes by rebasing rather than merging"
msgstr "使用变基操作取代合并操作以合入修改"
-#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126
+#: builtin/pull.c:158 builtin/rebase.c:492 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "允许快进式"
-#: builtin/pull.c:166
-msgid "automatically stash/stash pop before and after rebase"
-msgstr "变基操作前后执行自动贮藏和弹出贮藏"
+#: builtin/pull.c:167 parse-options.h:339
+msgid "automatically stash/stash pop before and after"
+msgstr "在操作前后执行自动贮藏和弹出贮藏"
-#: builtin/pull.c:182
+#: builtin/pull.c:183
msgid "Options related to fetching"
msgstr "和获取相关的参数"
-#: builtin/pull.c:192
+#: builtin/pull.c:193
msgid "force overwrite of local branch"
msgstr "强制覆盖本地分支"
-#: builtin/pull.c:200
+#: builtin/pull.c:201
msgid "number of submodules pulled in parallel"
msgstr "并发拉取的子模组的数量"
-#: builtin/pull.c:300
+#: builtin/pull.c:317
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "pull.ff 的取值无效：%s"
-#: builtin/pull.c:426
+#: builtin/pull.c:445
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
-#: builtin/pull.c:428
+#: builtin/pull.c:447
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
-#: builtin/pull.c:429
+#: builtin/pull.c:448
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
-#: builtin/pull.c:432
+#: builtin/pull.c:451
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -17313,42 +18585,41 @@
"您要求从远程 '%s' 拉取，但是未指定一个分支。因为这不是当前\n"
"分支默认的远程仓库，您必须在命令行中指定一个分支名。"
-#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73
+#: builtin/pull.c:456 builtin/rebase.c:1253
msgid "You are not currently on a branch."
msgstr "您当前不在一个分支上。"
-#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79
+#: builtin/pull.c:458 builtin/pull.c:473
msgid "Please specify which branch you want to rebase against."
msgstr "请指定您要变基到哪一个分支。"
-#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82
+#: builtin/pull.c:460 builtin/pull.c:475
msgid "Please specify which branch you want to merge with."
msgstr "请指定您要合并哪一个分支。"
-#: builtin/pull.c:442 builtin/pull.c:457
+#: builtin/pull.c:461 builtin/pull.c:476
msgid "See git-pull(1) for details."
msgstr "详见 git-pull(1)。"
-#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459
-#: builtin/rebase.c:1415 git-parse-remote.sh:64
+#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
+#: builtin/rebase.c:1259
msgid "<remote>"
msgstr "<远程>"
-#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464
-#: git-parse-remote.sh:65
+#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
msgid "<branch>"
msgstr "<分支>"
-#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75
+#: builtin/pull.c:471 builtin/rebase.c:1251
msgid "There is no tracking information for the current branch."
msgstr "当前分支没有跟踪信息。"
-#: builtin/pull.c:461 git-parse-remote.sh:95
+#: builtin/pull.c:480
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr "如果您想要为此分支创建跟踪信息，您可以执行："
-#: builtin/pull.c:466
+#: builtin/pull.c:485
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -17357,32 +18628,55 @@
"您的配置中指定要合并远程的引用 '%s'，\n"
"但是没有获取到这个引用。"
-#: builtin/pull.c:576
+#: builtin/pull.c:596
#, c-format
msgid "unable to access commit %s"
msgstr "无法访问提交 %s"
-#: builtin/pull.c:857
+#: builtin/pull.c:902
msgid "ignoring --verify-signatures for rebase"
msgstr "为变基操作忽略 --verify-signatures"
-#: builtin/pull.c:912
-msgid "--[no-]autostash option is only valid with --rebase."
-msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。"
+#: builtin/pull.c:930
+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:920
+#: builtin/pull.c:991
msgid "Updating an unborn branch with changes added to the index."
msgstr "更新尚未诞生的分支，变更添加至索引。"
-#: builtin/pull.c:924
+#: builtin/pull.c:995
msgid "pull with rebase"
msgstr "变基式拉取"
-#: builtin/pull.c:925
+#: builtin/pull.c:996
msgid "please commit or stash them."
msgstr "请提交或贮藏它们。"
-#: builtin/pull.c:950
+#: builtin/pull.c:1021
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -17392,7 +18686,7 @@
"fetch 更新了当前的分支。快进您的工作区\n"
"至提交 %s。"
-#: builtin/pull.c:956
+#: builtin/pull.c:1027
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -17409,15 +18703,15 @@
"$ git reset --hard\n"
"恢复之前的状态。"
-#: builtin/pull.c:971
+#: builtin/pull.c:1042
msgid "Cannot merge multiple branches into empty head."
msgstr "无法将多个分支合并到空分支。"
-#: builtin/pull.c:975
+#: builtin/pull.c:1046
msgid "Cannot rebase onto multiple branches."
msgstr "无法变基到多个分支。"
-#: builtin/pull.c:982
+#: builtin/pull.c:1067
msgid "cannot rebase with locally recorded submodule modifications"
msgstr "本地子模组中有修改，无法变基"
@@ -17425,15 +18719,15 @@
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
-#: builtin/push.c:112
+#: builtin/push.c:111
msgid "tag shorthand without <tag>"
msgstr "标签后面未提供 <标签> 参数"
-#: builtin/push.c:122
+#: builtin/push.c:119
msgid "--delete only accepts plain target ref names"
msgstr "--delete 只接受简单的目标引用名"
-#: builtin/push.c:168
+#: builtin/push.c:164
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -17441,7 +18735,7 @@
"\n"
"为了永久地选择任一选项，参见 'git help config' 中的 push.default。"
-#: builtin/push.c:171
+#: builtin/push.c:167
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -17465,7 +18759,7 @@
" git push %s HEAD\n"
"%s"
-#: builtin/push.c:186
+#: builtin/push.c:182
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -17479,7 +18773,7 @@
"\n"
" git push %s HEAD:<远程分支名字>\n"
-#: builtin/push.c:200
+#: builtin/push.c:194
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -17492,12 +18786,12 @@
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:208
+#: builtin/push.c:202
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr "当前分支 %s 有多个上游分支，拒绝推送。"
-#: builtin/push.c:211
+#: builtin/push.c:205
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -17507,12 +18801,12 @@
"您正推送至远程 '%s'（其并非当前分支 '%s' 的上游），\n"
"而没有告诉我要推送什么、更新哪个远程分支。"
-#: builtin/push.c:270
+#: 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:277
+#: 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"
@@ -17523,7 +18817,7 @@
"再次推送前，先与远程变更合并（如 'git pull ...'）。详见\n"
"'git push --help' 中的 'Note about fast-forwards' 小节。"
-#: builtin/push.c:283
+#: 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"
@@ -17534,7 +18828,7 @@
"检出该分支并整合远程变更（如 'git pull ...'），然后再推送。详见\n"
"'git push --help' 中的 'Note about fast-forwards' 小节。"
-#: builtin/push.c:289
+#: 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"
@@ -17547,11 +18841,11 @@
"（如 'git pull ...'）。\n"
"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
-#: builtin/push.c:296
+#: builtin/push.c:286
msgid "Updates were rejected because the tag already exists in the remote."
msgstr "更新被拒绝，因为该标签在远程已经存在。"
-#: builtin/push.c:299
+#: 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"
@@ -17560,99 +18854,113 @@
"如果不使用 '--force' 参数，您不能更新一个指向非提交对象的远程引用，\n"
"也不能更新远程引用让其指向一个非提交对象。\n"
-#: builtin/push.c:360
+#: builtin/push.c:294
+msgid ""
+"Updates were rejected because the tip of the remote-tracking\n"
+"branch has been updated since the last checkout. You may want\n"
+"to integrate those changes locally (e.g., 'git pull ...')\n"
+"before forcing an update.\n"
+msgstr ""
+"更新被拒绝，因为远程跟踪分支的最新提交自从上次检出之后已被更新。\n"
+"在强制更新前，您可能想将这些变更整合到本地（如 'git pull ...'）。\n"
+
+#: builtin/push.c:364
#, c-format
msgid "Pushing to %s\n"
msgstr "推送到 %s\n"
-#: builtin/push.c:367
+#: builtin/push.c:371
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "推送一些引用到 '%s' 失败"
-#: builtin/push.c:542
+#: builtin/push.c:553
msgid "repository"
msgstr "仓库"
-#: builtin/push.c:543 builtin/send-pack.c:164
+#: builtin/push.c:554 builtin/send-pack.c:189
msgid "push all refs"
msgstr "推送所有引用"
-#: builtin/push.c:544 builtin/send-pack.c:166
+#: builtin/push.c:555 builtin/send-pack.c:191
msgid "mirror all refs"
msgstr "镜像所有引用"
-#: builtin/push.c:546
+#: builtin/push.c:557
msgid "delete refs"
msgstr "删除引用"
-#: builtin/push.c:547
+#: builtin/push.c:558
msgid "push tags (can't be used with --all or --mirror)"
msgstr "推送标签（不能使用 --all or --mirror）"
-#: builtin/push.c:550 builtin/send-pack.c:167
+#: builtin/push.c:561 builtin/send-pack.c:192
msgid "force updates"
msgstr "强制更新"
-#: builtin/push.c:552 builtin/send-pack.c:181
+#: builtin/push.c:562 builtin/send-pack.c:204
msgid "<refname>:<expect>"
msgstr "<引用名>:<期望值>"
-#: builtin/push.c:553 builtin/send-pack.c:182
+#: builtin/push.c:563 builtin/send-pack.c:205
msgid "require old value of ref to be at this value"
msgstr "要求引用旧的取值为设定值"
-#: builtin/push.c:556
+#: builtin/push.c:566 builtin/send-pack.c:208
+msgid "require remote updates to be integrated locally"
+msgstr "要求远程更新在本地被整合"
+
+#: builtin/push.c:569
msgid "control recursive pushing of submodules"
msgstr "控制子模组的递归推送"
-#: builtin/push.c:558 builtin/send-pack.c:175
+#: builtin/push.c:570 builtin/send-pack.c:199
msgid "use thin pack"
msgstr "使用精简打包"
-#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161
-#: builtin/send-pack.c:162
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
+#: builtin/send-pack.c:187
msgid "receive pack program"
msgstr "接收包程序"
-#: builtin/push.c:561
+#: builtin/push.c:573
msgid "set upstream for git pull/status"
msgstr "设置 git pull/status 的上游"
-#: builtin/push.c:564
+#: builtin/push.c:576
msgid "prune locally removed refs"
msgstr "清除本地删除的引用"
-#: builtin/push.c:566
+#: builtin/push.c:578
msgid "bypass pre-push hook"
msgstr "绕过 pre-push 钩子"
-#: builtin/push.c:567
+#: builtin/push.c:579
msgid "push missing but relevant tags"
msgstr "推送缺失但有关的标签"
-#: builtin/push.c:570 builtin/send-pack.c:169
+#: builtin/push.c:581 builtin/send-pack.c:193
msgid "GPG sign the push"
msgstr "用 GPG 为推送签名"
-#: builtin/push.c:572 builtin/send-pack.c:176
+#: builtin/push.c:583 builtin/send-pack.c:200
msgid "request atomic transaction on remote side"
msgstr "需要远端支持原子事务"
-#: builtin/push.c:590
+#: builtin/push.c:601
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
-#: builtin/push.c:592
+#: builtin/push.c:603
msgid "--delete doesn't make sense without any refs"
msgstr "--delete 未接任何引用没有意义"
-#: builtin/push.c:612
+#: builtin/push.c:623
#, c-format
msgid "bad repository '%s'"
msgstr "坏的仓库 '%s'"
-#: builtin/push.c:613
+#: builtin/push.c:624
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -17673,68 +18981,76 @@
"\n"
" git push <名称>\n"
-#: builtin/push.c:628
+#: builtin/push.c:639
msgid "--all and --tags are incompatible"
msgstr "--all 和 --tags 不兼容"
-#: builtin/push.c:630
+#: builtin/push.c:641
msgid "--all can't be combined with refspecs"
msgstr "--all 不能和引用规格同时使用"
-#: builtin/push.c:634
+#: builtin/push.c:645
msgid "--mirror and --tags are incompatible"
msgstr "--mirror 和 --tags 不兼容"
-#: builtin/push.c:636
+#: builtin/push.c:647
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror 不能和引用规格同时使用"
-#: builtin/push.c:639
+#: builtin/push.c:650
msgid "--all and --mirror are incompatible"
msgstr "--all 和 --mirror 不兼容"
-#: builtin/push.c:643
+#: builtin/push.c:657
msgid "push options must not have new line characters"
msgstr "推送选项不能有换行符"
-#: builtin/range-diff.c:8
+#: builtin/range-diff.c:9
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
+#: builtin/range-diff.c:10
msgid "git range-diff [<options>] <old-tip>...<new-tip>"
msgstr "git range-diff [<选项>] <old-tip>...<new-tip>"
-#: builtin/range-diff.c:10
+#: builtin/range-diff.c:11
msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
msgstr "git range-diff [<选项>] <base> <old-tip> <new-tip>"
-#: builtin/range-diff.c:22
+#: builtin/range-diff.c:28
msgid "Percentage by which creation is weighted"
msgstr "创建权重的百分比"
-#: builtin/range-diff.c:24
+#: builtin/range-diff.c:30
msgid "use simple diff colors"
msgstr "使用简单差异颜色"
-#: builtin/range-diff.c:26
+#: builtin/range-diff.c:32
msgid "notes"
msgstr "注解"
-#: builtin/range-diff.c:26
+#: builtin/range-diff.c:32
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:35
+msgid "only emit output related to the first range"
+msgstr "仅显示与第一个范围有关的输出"
-#: builtin/range-diff.c:64
+#: builtin/range-diff.c:37
+msgid "only emit output related to the second range"
+msgstr "仅显示与第二个范围有关的输出"
+
+#: builtin/range-diff.c:60 builtin/range-diff.c:64
+#, c-format
+msgid "not a commit range: '%s'"
+msgstr "不是一个提交范围：'%s'"
+
+#: builtin/range-diff.c:74
msgid "single arg format must be symmetric range"
msgstr "单个参数格式必须是对称范围（即包含...）"
-#: builtin/range-diff.c:79
+#: builtin/range-diff.c:89
msgid "need two commit ranges"
msgstr "需要两个提交范围"
@@ -17820,7 +19136,7 @@
msgid "You need to resolve your current index first"
msgstr "您需要先解决当前索引的冲突"
-#: builtin/rebase.c:32
+#: builtin/rebase.c:35
msgid ""
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
"[<upstream> [<branch>]]"
@@ -17828,217 +19144,203 @@
"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:175 builtin/rebase.c:199 builtin/rebase.c:226
+#: builtin/rebase.c:195 builtin/rebase.c:219 builtin/rebase.c:246
#, c-format
msgid "unusable todo list: '%s'"
msgstr "不可用的待办列表：'%s'"
-#: builtin/rebase.c:292
+#: builtin/rebase.c:312
#, c-format
msgid "could not create temporary %s"
msgstr "无法创建临时的 %s"
-#: builtin/rebase.c:298
+#: builtin/rebase.c:318
msgid "could not mark as interactive"
msgstr "无法标记为交互式"
-#: builtin/rebase.c:352
+#: builtin/rebase.c:371
msgid "could not generate todo list"
msgstr "无法生成待办列表"
-#: builtin/rebase.c:391
+#: builtin/rebase.c:413
msgid "a base commit must be provided with --upstream or --onto"
msgstr "使用 --upstream 或 --onto 必须提供一个基线提交"
-#: builtin/rebase.c:461
+#: builtin/rebase.c:482
msgid "git rebase--interactive [<options>]"
msgstr "git rebase--interactive [<选项>]"
-#: builtin/rebase.c:474 builtin/rebase.c:1550
-msgid "(DEPRECATED) keep empty commits"
-msgstr "（已弃用）保留空提交"
+#: builtin/rebase.c:495 builtin/rebase.c:1394
+msgid "keep commits which start empty"
+msgstr "保留初始为空的提交"
-#: builtin/rebase.c:478 builtin/revert.c:128
+#: builtin/rebase.c:499 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr "允许提交说明为空"
-#: builtin/rebase.c:480
+#: builtin/rebase.c:501
msgid "rebase merge commits"
msgstr "对合并提交变基"
-#: builtin/rebase.c:482
+#: builtin/rebase.c:503
msgid "keep original branch points of cousins"
msgstr "保持兄弟提交的原始分支点"
-#: builtin/rebase.c:484
+#: builtin/rebase.c:505
msgid "move commits that begin with squash!/fixup!"
msgstr "移动以 squash!/fixup! 开头的提交"
-#: builtin/rebase.c:485
+#: builtin/rebase.c:506
msgid "sign commits"
msgstr "签名提交"
-#: builtin/rebase.c:487 builtin/rebase.c:1490
+#: builtin/rebase.c:508 builtin/rebase.c:1333
msgid "display a diffstat of what changed upstream"
msgstr "显示上游变化的差异统计"
-#: builtin/rebase.c:489
+#: builtin/rebase.c:510
msgid "continue rebase"
msgstr "继续变基"
-#: builtin/rebase.c:491
+#: builtin/rebase.c:512
msgid "skip commit"
msgstr "跳过提交"
-#: builtin/rebase.c:492
+#: builtin/rebase.c:513
msgid "edit the todo list"
msgstr "变基待办列表"
-#: builtin/rebase.c:494
+#: builtin/rebase.c:515
msgid "show the current patch"
msgstr "显示当前补丁"
-#: builtin/rebase.c:497
+#: builtin/rebase.c:518
msgid "shorten commit ids in the todo list"
msgstr "缩短待办列表中的提交号"
-#: builtin/rebase.c:499
+#: builtin/rebase.c:520
msgid "expand commit ids in the todo list"
msgstr "扩展待办列表中的提交号"
-#: builtin/rebase.c:501
+#: builtin/rebase.c:522
msgid "check the todo list"
msgstr "检查待办列表"
-#: builtin/rebase.c:503
+#: builtin/rebase.c:524
msgid "rearrange fixup/squash lines"
msgstr "重新排列 fixup/squash 行"
-#: builtin/rebase.c:505
+#: builtin/rebase.c:526
msgid "insert exec commands in todo list"
msgstr "在待办列表中插入 exec 执行命令"
-#: builtin/rebase.c:506
+#: builtin/rebase.c:527
msgid "onto"
msgstr "onto"
-#: builtin/rebase.c:509
+#: builtin/rebase.c:530
msgid "restrict-revision"
msgstr "restrict-revision"
-#: builtin/rebase.c:509
+#: builtin/rebase.c:530
msgid "restrict revision"
msgstr "限制版本"
-#: builtin/rebase.c:511
+#: builtin/rebase.c:532
msgid "squash-onto"
msgstr "squash-onto"
-#: builtin/rebase.c:512
+#: builtin/rebase.c:533
msgid "squash onto"
msgstr "squash onto"
-#: builtin/rebase.c:514
+#: builtin/rebase.c:535
msgid "the upstream commit"
msgstr "上游提交"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:537
msgid "head-name"
msgstr "head-name"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:537
msgid "head name"
msgstr "head 名称"
-#: builtin/rebase.c:521
+#: builtin/rebase.c:542
msgid "rebase strategy"
msgstr "变基策略"
-#: builtin/rebase.c:522
+#: builtin/rebase.c:543
msgid "strategy-opts"
msgstr "strategy-opts"
-#: builtin/rebase.c:523
+#: builtin/rebase.c:544
msgid "strategy options"
msgstr "策略选项"
-#: builtin/rebase.c:524
+#: builtin/rebase.c:545
msgid "switch-to"
msgstr "切换到"
-#: builtin/rebase.c:525
+#: builtin/rebase.c:546
msgid "the branch or commit to checkout"
msgstr "要检出的分支或提交"
-#: builtin/rebase.c:526
+#: builtin/rebase.c:547
msgid "onto-name"
msgstr "onto-name"
-#: builtin/rebase.c:526
+#: builtin/rebase.c:547
msgid "onto name"
msgstr "onto name"
-#: builtin/rebase.c:527
+#: builtin/rebase.c:548
msgid "cmd"
msgstr "cmd"
-#: builtin/rebase.c:527
+#: builtin/rebase.c:548
msgid "the command to run"
msgstr "要执行的命令"
-#: builtin/rebase.c:530 builtin/rebase.c:1584
+#: builtin/rebase.c:551 builtin/rebase.c:1427
msgid "automatically re-schedule any `exec` that fails"
msgstr "自动重新安排任何失败的 `exec`"
-#: builtin/rebase.c:546
+#: builtin/rebase.c:567
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr "不使用 --rebase-merges，则 --[no-]rebase-cousins 没有效果"
-#: builtin/rebase.c:562
+#: builtin/rebase.c:583
#, c-format
-msgid "%s requires an interactive rebase"
-msgstr "%s 需要交互式变基"
+msgid "%s requires the merge backend"
+msgstr "%s 需要合并后端"
-#: builtin/rebase.c:612
+#: builtin/rebase.c:626
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "无法获取 'onto'：'%s'"
-#: builtin/rebase.c:627
+#: builtin/rebase.c:643
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "无效的原始 head：'%s'"
-#: builtin/rebase.c:652
+#: builtin/rebase.c:668
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "忽略无效的 allow_rerere_autoupdate：'%s'"
-#: builtin/rebase.c:728
-#, c-format
-msgid "Could not read '%s'"
-msgstr "不能读取 '%s'"
-
-#: builtin/rebase.c:746
-#, c-format
-msgid "Cannot store %s"
-msgstr "不能存储 %s"
-
-#: builtin/rebase.c:853
-msgid "could not determine HEAD revision"
-msgstr "不能确定 HEAD 版本"
-
-#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
msgid ""
"Resolve all conflicts manually, mark them as resolved with\n"
"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -18051,7 +19353,7 @@
"\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
"\"git rebase\" 执行之前的状态，执行 \"git rebase --abort\"。"
-#: builtin/rebase.c:1058
+#: builtin/rebase.c:896
#, c-format
msgid ""
"\n"
@@ -18069,14 +19371,14 @@
"\n"
"因此 git 无法对其变基。"
-#: builtin/rebase.c:1383
+#: builtin/rebase.c:1227
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
"\"."
msgstr "无法识别的空类型 '%s'；有效值有 \"drop\"、\"keep\" 和 \"ask\"。"
-#: builtin/rebase.c:1401
+#: builtin/rebase.c:1245
#, c-format
msgid ""
"%s\n"
@@ -18093,7 +19395,7 @@
" git rebase '<branch>'\n"
"\n"
-#: builtin/rebase.c:1417
+#: builtin/rebase.c:1261
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -18106,136 +19408,148 @@
" git branch --set-upstream-to=%s/<branch> %s\n"
"\n"
-#: builtin/rebase.c:1447
+#: builtin/rebase.c:1291
msgid "exec commands cannot contain newlines"
msgstr "exec 命令不能包含换行符"
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1295
msgid "empty exec command"
msgstr "空的 exec 命令"
-#: builtin/rebase.c:1481
+#: builtin/rebase.c:1324
msgid "rebase onto given branch instead of upstream"
msgstr "变基到给定的分支而非上游"
-#: builtin/rebase.c:1483
+#: builtin/rebase.c:1326
msgid "use the merge-base of upstream and branch as the current base"
msgstr "使用上游和分支的合并基线做为当前基线"
-#: builtin/rebase.c:1485
+#: builtin/rebase.c:1328
msgid "allow pre-rebase hook to run"
msgstr "允许执行 pre-rebase 钩子"
-#: builtin/rebase.c:1487
+#: builtin/rebase.c:1330
msgid "be quiet. implies --no-stat"
msgstr "安静。暗示 --no-stat"
-#: builtin/rebase.c:1493
+#: builtin/rebase.c:1336
msgid "do not show diffstat of what changed upstream"
msgstr "不显示上游变化的差异统计"
-#: builtin/rebase.c:1496
-msgid "add a Signed-off-by: line to each commit"
-msgstr "为每一个提交添加一个 Signed-off-by: 签名"
+#: builtin/rebase.c:1339
+msgid "add a Signed-off-by trailer to each commit"
+msgstr "为每一个提交添加 Signed-off-by 尾注"
-#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504
-msgid "passed to 'git am'"
-msgstr "传递给 'git am"
+#: builtin/rebase.c:1342
+msgid "make committer date match author date"
+msgstr "使提交者日期和作者日期一致"
-#: builtin/rebase.c:1506 builtin/rebase.c:1508
+#: builtin/rebase.c:1344
+msgid "ignore author date and use current date"
+msgstr "忽略作者日期，使用当前日期"
+
+#: builtin/rebase.c:1346
+msgid "synonym of --reset-author-date"
+msgstr "--reset-author-date 的同义词"
+
+#: builtin/rebase.c:1348 builtin/rebase.c:1352
msgid "passed to 'git apply'"
msgstr "传递给 'git apply'"
-#: builtin/rebase.c:1510 builtin/rebase.c:1513
+#: builtin/rebase.c:1350
+msgid "ignore changes in whitespace"
+msgstr "忽略空白字符的变更"
+
+#: builtin/rebase.c:1354 builtin/rebase.c:1357
msgid "cherry-pick all commits, even if unchanged"
msgstr "拣选所有提交，即使未修改"
-#: builtin/rebase.c:1515
+#: builtin/rebase.c:1359
msgid "continue"
msgstr "继续"
-#: builtin/rebase.c:1518
+#: builtin/rebase.c:1362
msgid "skip current patch and continue"
msgstr "跳过当前补丁并继续"
# 译者：注意保持前导空格
-#: builtin/rebase.c:1520
+#: builtin/rebase.c:1364
msgid "abort and check out the original branch"
msgstr "终止并检出原有分支"
-#: builtin/rebase.c:1523
+#: builtin/rebase.c:1367
msgid "abort but keep HEAD where it is"
msgstr "终止但保持 HEAD 不变"
-#: builtin/rebase.c:1524
+#: builtin/rebase.c:1368
msgid "edit the todo list during an interactive rebase"
msgstr "在交互式变基中编辑待办列表"
-#: builtin/rebase.c:1527
+#: builtin/rebase.c:1371
msgid "show the patch file being applied or merged"
msgstr "显示正在应用或合并的补丁文件"
-#: builtin/rebase.c:1530
+#: builtin/rebase.c:1374
msgid "use apply strategies to rebase"
msgstr "使用应用策略进行变基"
-#: builtin/rebase.c:1534
+#: builtin/rebase.c:1378
msgid "use merging strategies to rebase"
msgstr "使用合并策略进行变基"
-#: builtin/rebase.c:1538
+#: builtin/rebase.c:1382
msgid "let the user edit the list of commits to rebase"
msgstr "让用户编辑要变基的提交列表"
-#: builtin/rebase.c:1542
+#: builtin/rebase.c:1386
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "（已弃用）尝试重建合并提交而非忽略它们"
-#: builtin/rebase.c:1547
+#: builtin/rebase.c:1391
msgid "how to handle commits that become empty"
msgstr "如何处理成为空提交的提交"
-#: builtin/rebase.c:1554
+#: builtin/rebase.c:1398
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "在 -i 交互模式下，移动以 squash!/fixup! 开头的提交"
-#: builtin/rebase.c:1560
-msgid "automatically stash/stash pop before and after"
-msgstr "在操作前后执行自动贮藏和弹出贮藏"
-
-#: builtin/rebase.c:1562
+#: builtin/rebase.c:1405
msgid "add exec lines after each commit of the editable list"
msgstr "可编辑列表的每一个提交下面增加一行 exec"
-#: builtin/rebase.c:1566
+#: builtin/rebase.c:1409
msgid "allow rebasing commits with empty messages"
msgstr "允许针对空提交说明的提交变基"
-#: builtin/rebase.c:1570
+#: builtin/rebase.c:1413
msgid "try to rebase merges instead of skipping them"
msgstr "尝试对合并提交变基而不是忽略它们"
-#: builtin/rebase.c:1573
+#: builtin/rebase.c:1416
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "使用 'merge-base --fork-point' 来优化上游"
-#: builtin/rebase.c:1575
+#: builtin/rebase.c:1418
msgid "use the given merge strategy"
msgstr "使用给定的合并策略"
-#: builtin/rebase.c:1577 builtin/revert.c:115
+#: builtin/rebase.c:1420 builtin/revert.c:115
msgid "option"
msgstr "选项"
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1421
msgid "pass the argument through to the merge strategy"
msgstr "将参数传递给合并策略"
-#: builtin/rebase.c:1581
+#: builtin/rebase.c:1424
msgid "rebase all reachable commits up to the root(s)"
msgstr "将所有可达的提交变基到根提交"
-#: builtin/rebase.c:1598
+#: builtin/rebase.c:1429
+msgid "apply all changes, even those already present upstream"
+msgstr "应用所有更改，甚至那些已在上游存在的"
+
+#: builtin/rebase.c:1446
msgid ""
"the rebase.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
@@ -18243,36 +19557,40 @@
"对 rebase.useBuiltin 的支持已被删除！\n"
"详见 'git help config' 中的条目。"
-#: builtin/rebase.c:1604
+#: builtin/rebase.c:1452
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "看起来 'git-am' 正在执行中。无法变基。"
-#: builtin/rebase.c:1645
+#: builtin/rebase.c:1493
msgid ""
"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr "git rebase --preserve-merges 被弃用。用 --rebase-merges 代替。"
-#: builtin/rebase.c:1650
+#: builtin/rebase.c:1498
msgid "cannot combine '--keep-base' with '--onto'"
msgstr "不能将 '--keep-base' 和 '--onto' 组合使用"
-#: builtin/rebase.c:1652
+#: builtin/rebase.c:1500
msgid "cannot combine '--keep-base' with '--root'"
msgstr "不能将 '--keep-base' 和 '--root' 组合使用"
-#: builtin/rebase.c:1656
+#: builtin/rebase.c:1504
+msgid "cannot combine '--root' with '--fork-point'"
+msgstr "不能将 '--root' 和 '--fork-point' 组合使用"
+
+#: builtin/rebase.c:1507
msgid "No rebase in progress?"
msgstr "没有正在进行的变基？"
-#: builtin/rebase.c:1660
+#: builtin/rebase.c:1511
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
-#: builtin/rebase.c:1683
+#: builtin/rebase.c:1534 t/helper/test-fast-rebase.c:123
msgid "Cannot read HEAD"
msgstr "不能读取 HEAD"
-#: builtin/rebase.c:1695
+#: builtin/rebase.c:1546
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -18280,16 +19598,16 @@
"您必须编辑所有的合并冲突，然后通过 git add\n"
"命令将它们标记为已解决"
-#: builtin/rebase.c:1714
+#: builtin/rebase.c:1565
msgid "could not discard worktree changes"
msgstr "无法丢弃工作区变更"
-#: builtin/rebase.c:1733
+#: builtin/rebase.c:1584
#, c-format
msgid "could not move back to %s"
msgstr "无法移回 %s"
-#: builtin/rebase.c:1778
+#: builtin/rebase.c:1630
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -18308,164 +19626,141 @@
"\t%s\n"
"然后再重新执行。 为避免丢失重要数据，我已经停止当前操作。\n"
-#: builtin/rebase.c:1806
+#: builtin/rebase.c:1658
msgid "switch `C' expects a numerical value"
msgstr "开关 `C' 期望一个数字值"
-#: builtin/rebase.c:1847
+#: builtin/rebase.c:1700
#, c-format
msgid "Unknown mode: %s"
msgstr "未知模式：%s"
-#: builtin/rebase.c:1869
+#: builtin/rebase.c:1739
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy 需要 --merge 或 --interactive"
-#: builtin/rebase.c:1899
+#: builtin/rebase.c:1769
msgid "cannot combine apply options with merge options"
msgstr "不能组合使用应用选项和合并选项"
-#: builtin/rebase.c:1912
+#: builtin/rebase.c:1782
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "未知的变基后端：%s"
-#: builtin/rebase.c:1937
+#: builtin/rebase.c:1812
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive"
-#: builtin/rebase.c:1957
+#: builtin/rebase.c:1832
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr "不能将 '--preserve-merges' 和 '--rebase-merges' 同时使用"
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1836
msgid ""
"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
"错误：不能将 '--preserve-merges' 和 '--reschedule-failed-exec' 同时使用"
-#: builtin/rebase.c:1985
+#: builtin/rebase.c:1860
#, c-format
msgid "invalid upstream '%s'"
msgstr "无效的上游 '%s'"
-#: builtin/rebase.c:1991
+#: builtin/rebase.c:1866
msgid "Could not create new root commit"
msgstr "不能创建新的根提交"
-#: builtin/rebase.c:2017
+#: builtin/rebase.c:1892
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "'%s'：只需要与分支的一个合并基线"
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1895
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s'：只需要一个合并基线"
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1903
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "没有指向一个有效的提交 '%s'"
-#: builtin/rebase.c:2054
+#: builtin/rebase.c:1931
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "致命错误：无此分支/提交 '%s'"
-#: builtin/rebase.c:2062 builtin/submodule--helper.c:40
-#: builtin/submodule--helper.c:1990
+#: builtin/rebase.c:1939 builtin/submodule--helper.c:40
+#: builtin/submodule--helper.c:2414
#, c-format
msgid "No such ref: %s"
msgstr "没有这样的引用：%s"
-#: builtin/rebase.c:2073
+#: builtin/rebase.c:1950
msgid "Could not resolve HEAD to a revision"
msgstr "无法将 HEAD 解析为一个版本"
-#: builtin/rebase.c:2111
-msgid "Cannot autostash"
-msgstr "无法 autostash"
-
-#: builtin/rebase.c:2114
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr "意外的 stash 响应：'%s'"
-
-#: builtin/rebase.c:2120
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr "不能为 '%s' 创建目录"
-
-#: builtin/rebase.c:2123
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr "创建了 autostash：%s\n"
-
-#: builtin/rebase.c:2126
-msgid "could not reset --hard"
-msgstr "无法 reset --hard"
-
-#: builtin/rebase.c:2135
+#: builtin/rebase.c:1971
msgid "Please commit or stash them."
msgstr "请提交或贮藏修改。"
-#: builtin/rebase.c:2169
+#: builtin/rebase.c:2007
#, c-format
msgid "could not switch to %s"
msgstr "无法切换到 %s"
-#: builtin/rebase.c:2180
+#: builtin/rebase.c:2018
msgid "HEAD is up to date."
msgstr "HEAD 是最新的。"
-#: builtin/rebase.c:2182
+#: builtin/rebase.c:2020
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "当前分支 %s 是最新的。\n"
-#: builtin/rebase.c:2190
+#: builtin/rebase.c:2028
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD 是最新的，强制变基。"
-#: builtin/rebase.c:2192
+#: builtin/rebase.c:2030
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "当前分支 %s 是最新的，强制变基。\n"
-#: builtin/rebase.c:2200
+#: builtin/rebase.c:2038
msgid "The pre-rebase hook refused to rebase."
msgstr "pre-rebase 钩子拒绝了变基操作。"
-#: builtin/rebase.c:2207
+#: builtin/rebase.c:2045
#, c-format
msgid "Changes to %s:\n"
msgstr "到 %s 的变更：\n"
-#: builtin/rebase.c:2210
+#: builtin/rebase.c:2048
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "从 %s 到 %s 的变更：\n"
-#: builtin/rebase.c:2235
+#: builtin/rebase.c:2073
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr "首先，回退头指针以便在其上重放您的工作...\n"
-#: builtin/rebase.c:2244
+#: builtin/rebase.c:2082
msgid "Could not detach HEAD"
msgstr "无法分离头指针"
-#: builtin/rebase.c:2253
+#: builtin/rebase.c:2091
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "快进 %s 到 %s。\n"
-#: builtin/receive-pack.c:33
+#: builtin/receive-pack.c:34
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <仓库目录>"
-#: builtin/receive-pack.c:821
+#: builtin/receive-pack.c:1276
msgid ""
"By default, updating the current branch in a non-bare repository\n"
"is denied, because it will make the index and work tree inconsistent\n"
@@ -18491,7 +19786,7 @@
"若要屏蔽此信息且保持默认行为，设置 'receive.denyCurrentBranch'\n"
"配置变量为 'refuse'。"
-#: builtin/receive-pack.c:841
+#: builtin/receive-pack.c:1296
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"
@@ -18510,11 +19805,11 @@
"\n"
"若要屏蔽此信息，您可以设置它为 'refuse'。"
-#: builtin/receive-pack.c:1938
+#: builtin/receive-pack.c:2481
msgid "quiet"
msgstr "静默模式"
-#: builtin/receive-pack.c:1952
+#: builtin/receive-pack.c:2495
msgid "You must specify a directory."
msgstr "您必须指定一个目录。"
@@ -18545,36 +19840,36 @@
msgid "'%s' is not a valid timestamp"
msgstr "'%s' 不是一个有效的时间戳"
-#: builtin/reflog.c:606
+#: builtin/reflog.c:609
#, c-format
msgid "Marking reachable objects..."
msgstr "正在标记可达对象..."
-#: builtin/reflog.c:644
+#: builtin/reflog.c:647
#, c-format
msgid "%s points nowhere!"
msgstr "%s 指向不存在！"
-#: builtin/reflog.c:696
+#: builtin/reflog.c:699
msgid "no reflog specified to delete"
msgstr "未指定要删除的引用日志"
-#: builtin/reflog.c:705
+#: builtin/reflog.c:708
#, c-format
msgid "not a reflog: %s"
msgstr "不是一个引用日志：%s"
-#: builtin/reflog.c:710
+#: builtin/reflog.c:713
#, c-format
msgid "no reflog for '%s'"
msgstr "没有 '%s' 的引用日志"
-#: builtin/reflog.c:756
+#: builtin/reflog.c:759
#, c-format
msgid "invalid ref format: %s"
msgstr "无效的引用格式：%s"
-#: builtin/reflog.c:765
+#: builtin/reflog.c:768
msgid "git reflog [ show | expire | delete | exists ]"
msgstr "git reflog [ show | expire | delete | exists ]"
@@ -18709,40 +20004,35 @@
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
-#: builtin/remote.c:195 builtin/remote.c:696
+#: builtin/remote.c:195 builtin/remote.c:700
#, c-format
msgid "remote %s already exists."
msgstr "远程 %s 已经存在。"
-#: builtin/remote.c:199 builtin/remote.c:700
-#, c-format
-msgid "'%s' is not a valid remote name"
-msgstr "'%s' 不是一个有效的远程名称"
-
-#: builtin/remote.c:239
+#: builtin/remote.c:240
#, c-format
msgid "Could not setup master '%s'"
msgstr "无法设置 master '%s'"
-#: builtin/remote.c:354
+#: builtin/remote.c:355
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "无法得到引用规格 %s 的获取列表"
-#: builtin/remote.c:453 builtin/remote.c:461
+#: builtin/remote.c:454 builtin/remote.c:462
msgid "(matching)"
msgstr "（匹配）"
-#: builtin/remote.c:465
+#: builtin/remote.c:466
msgid "(delete)"
msgstr "（删除）"
-#: builtin/remote.c:653
+#: builtin/remote.c:655
#, c-format
msgid "could not set '%s'"
msgstr "不能设置 '%s'"
-#: builtin/remote.c:658
+#: builtin/remote.c:660
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
@@ -18753,17 +20043,17 @@
"\t%s:%d\n"
"现在在为不存在的远程名 '%s' 命名"
-#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940
+#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946
#, c-format
msgid "No such remote: '%s'"
msgstr "没有此远程仓库：'%s'"
-#: builtin/remote.c:706
+#: builtin/remote.c:710
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "不能重命名配置小节 '%s' 到 '%s'"
-#: builtin/remote.c:726
+#: builtin/remote.c:730
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -18774,17 +20064,17 @@
"\t%s\n"
"\t如果必要请手动更新配置。"
-#: builtin/remote.c:766
+#: builtin/remote.c:770
#, c-format
msgid "deleting '%s' failed"
msgstr "删除 '%s' 失败"
-#: builtin/remote.c:800
+#: builtin/remote.c:804
#, c-format
msgid "creating '%s' failed"
msgstr "创建 '%s' 失败"
-#: builtin/remote.c:876
+#: builtin/remote.c:882
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -18794,118 +20084,118 @@
msgstr[0] "注意：ref/remotes 层级之外的一个分支未被移除。要删除它，使用："
msgstr[1] "注意：ref/remotes 层级之外的一些分支未被移除。要删除它们，使用："
-#: builtin/remote.c:890
+#: builtin/remote.c:896
#, c-format
msgid "Could not remove config section '%s'"
msgstr "不能移除配置小节 '%s'"
-#: builtin/remote.c:993
+#: builtin/remote.c:999
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " 新的（下一次获取将存储于 remotes/%s）"
-#: builtin/remote.c:996
+#: builtin/remote.c:1002
msgid " tracked"
msgstr " 已跟踪"
-#: builtin/remote.c:998
+#: builtin/remote.c:1004
msgid " stale (use 'git remote prune' to remove)"
msgstr " 过时（使用 'git remote prune' 来移除）"
-#: builtin/remote.c:1000
+#: builtin/remote.c:1006
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:1041
+#: builtin/remote.c:1047
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "无效的 branch.%s.merge，不能变基到一个以上的分支"
-#: builtin/remote.c:1050
+#: builtin/remote.c:1056
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "交互式变基到远程 %s"
-#: builtin/remote.c:1052
+#: builtin/remote.c:1058
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr "交互式变基（含合并提交）到远程 %s"
-#: builtin/remote.c:1055
+#: builtin/remote.c:1061
#, c-format
msgid "rebases onto remote %s"
msgstr "变基到远程 %s"
-#: builtin/remote.c:1059
+#: builtin/remote.c:1065
#, c-format
msgid " merges with remote %s"
msgstr " 与远程 %s 合并"
-#: builtin/remote.c:1062
+#: builtin/remote.c:1068
#, c-format
msgid "merges with remote %s"
msgstr "与远程 %s 合并"
-#: builtin/remote.c:1065
+#: builtin/remote.c:1071
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s 以及和远程 %s\n"
-#: builtin/remote.c:1108
+#: builtin/remote.c:1114
msgid "create"
msgstr "创建"
-#: builtin/remote.c:1111
+#: builtin/remote.c:1117
msgid "delete"
msgstr "删除"
-#: builtin/remote.c:1115
+#: builtin/remote.c:1121
msgid "up to date"
msgstr "最新"
-#: builtin/remote.c:1118
+#: builtin/remote.c:1124
msgid "fast-forwardable"
msgstr "可快进"
-#: builtin/remote.c:1121
+#: builtin/remote.c:1127
msgid "local out of date"
msgstr "本地已过时"
-#: builtin/remote.c:1128
+#: builtin/remote.c:1134
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s 强制推送至 %-*s (%s)"
-#: builtin/remote.c:1131
+#: builtin/remote.c:1137
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s 推送至 %-*s (%s)"
-#: builtin/remote.c:1135
+#: builtin/remote.c:1141
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s 强制推送至 %s"
-#: builtin/remote.c:1138
+#: builtin/remote.c:1144
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s 推送至 %s"
-#: builtin/remote.c:1206
+#: builtin/remote.c:1212
msgid "do not query remotes"
msgstr "不查询远程"
-#: builtin/remote.c:1233
+#: builtin/remote.c:1239
#, c-format
msgid "* remote %s"
msgstr "* 远程 %s"
-#: builtin/remote.c:1234
+#: builtin/remote.c:1240
#, c-format
msgid " Fetch URL: %s"
msgstr " 获取地址：%s"
-#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390
+#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
msgid "(no URL)"
msgstr "(无 URL)"
@@ -18913,32 +20203,32 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1249 builtin/remote.c:1251
+#: builtin/remote.c:1255 builtin/remote.c:1257
#, c-format
msgid " Push URL: %s"
msgstr " 推送地址：%s"
-#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD 分支：%s"
# 译者：中文字符串拼接，可删除前导空格
-#: builtin/remote.c:1253
+#: builtin/remote.c:1259
msgid "(not queried)"
msgstr "（未查询）"
-#: builtin/remote.c:1255
+#: builtin/remote.c:1261
msgid "(unknown)"
msgstr "（未知）"
-#: builtin/remote.c:1259
+#: builtin/remote.c:1265
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " HEAD 分支（远程 HEAD 模糊，可能是下列中的一个）：\n"
-#: builtin/remote.c:1271
+#: builtin/remote.c:1277
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
@@ -18946,155 +20236,155 @@
msgstr[1] " 远程分支：%s"
# 译者：中文字符串拼接，可删除前导空格
-#: builtin/remote.c:1274 builtin/remote.c:1300
+#: builtin/remote.c:1280 builtin/remote.c:1306
msgid " (status not queried)"
msgstr "（状态未查询）"
-#: builtin/remote.c:1283
+#: builtin/remote.c:1289
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " 为 'git pull' 配置的本地分支："
msgstr[1] " 为 'git pull' 配置的本地分支："
-#: builtin/remote.c:1291
+#: builtin/remote.c:1297
msgid " Local refs will be mirrored by 'git push'"
msgstr " 本地引用将在 'git push' 时被镜像"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1303
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " 为 'git push' 配置的本地引用%s："
msgstr[1] " 为 'git push' 配置的本地引用%s："
-#: builtin/remote.c:1318
+#: builtin/remote.c:1324
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
-#: builtin/remote.c:1320
+#: builtin/remote.c:1326
msgid "delete refs/remotes/<name>/HEAD"
msgstr "删除 refs/remotes/<名称>/HEAD"
-#: builtin/remote.c:1335
+#: builtin/remote.c:1341
msgid "Cannot determine remote HEAD"
msgstr "无法确定远程 HEAD"
-#: builtin/remote.c:1337
+#: builtin/remote.c:1343
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "多个远程 HEAD 分支。请明确地选择一个用命令："
-#: builtin/remote.c:1347
+#: builtin/remote.c:1353
#, c-format
msgid "Could not delete %s"
msgstr "无法删除 %s"
-#: builtin/remote.c:1355
+#: builtin/remote.c:1361
#, c-format
msgid "Not a valid ref: %s"
msgstr "不是一个有效引用：%s"
-#: builtin/remote.c:1357
+#: builtin/remote.c:1363
#, c-format
msgid "Could not setup %s"
msgstr "不能设置 %s"
# 译者：注意保持前导空格
-#: builtin/remote.c:1375
+#: builtin/remote.c:1381
#, c-format
msgid " %s will become dangling!"
msgstr " %s 将成为悬空状态！"
# 译者：注意保持前导空格
-#: builtin/remote.c:1376
+#: builtin/remote.c:1382
#, c-format
msgid " %s has become dangling!"
msgstr " %s 已成为悬空状态！"
-#: builtin/remote.c:1386
+#: builtin/remote.c:1392
#, c-format
msgid "Pruning %s"
msgstr "修剪 %s"
-#: builtin/remote.c:1387
+#: builtin/remote.c:1393
#, c-format
msgid "URL: %s"
msgstr "URL：%s"
-#: builtin/remote.c:1403
+#: builtin/remote.c:1409
#, c-format
msgid " * [would prune] %s"
msgstr " * [将删除] %s"
-#: builtin/remote.c:1406
+#: builtin/remote.c:1412
#, c-format
msgid " * [pruned] %s"
msgstr " * [已删除] %s"
-#: builtin/remote.c:1451
+#: builtin/remote.c:1457
msgid "prune remotes after fetching"
msgstr "抓取后清除远程"
-#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636
+#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
#, c-format
msgid "No such remote '%s'"
msgstr "没有此远程 '%s'"
-#: builtin/remote.c:1530
+#: builtin/remote.c:1539
msgid "add branch"
msgstr "添加分支"
-#: builtin/remote.c:1537
+#: builtin/remote.c:1546
msgid "no remote specified"
msgstr "未指定远程"
-#: builtin/remote.c:1554
+#: builtin/remote.c:1563
msgid "query push URLs rather than fetch URLs"
msgstr "查询推送 URL 地址，而非获取 URL 地址"
-#: builtin/remote.c:1556
+#: builtin/remote.c:1565
msgid "return all URLs"
msgstr "返回所有 URL 地址"
-#: builtin/remote.c:1584
+#: builtin/remote.c:1595
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "没有给远程仓库 '%s' 设定 URL"
-#: builtin/remote.c:1610
+#: builtin/remote.c:1621
msgid "manipulate push URLs"
msgstr "操作推送 URLS"
-#: builtin/remote.c:1612
+#: builtin/remote.c:1623
msgid "add URL"
msgstr "添加 URL"
-#: builtin/remote.c:1614
+#: builtin/remote.c:1625
msgid "delete URLs"
msgstr "删除 URLS"
-#: builtin/remote.c:1621
+#: builtin/remote.c:1632
msgid "--add --delete doesn't make sense"
msgstr "--add --delete 无意义"
-#: builtin/remote.c:1660
+#: builtin/remote.c:1673
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "无效的旧 URL 匹配模版：%s"
-#: builtin/remote.c:1668
+#: builtin/remote.c:1681
#, c-format
msgid "No such URL found: %s"
msgstr "未找到此 URL：%s"
-#: builtin/remote.c:1670
+#: builtin/remote.c:1683
msgid "Will not delete all non-push URLs"
msgstr "将不会删除所有非推送 URL 地址"
-#: builtin/repack.c:23
+#: builtin/repack.c:26
msgid "git repack [<options>]"
msgstr "git repack [<选项>]"
-#: builtin/repack.c:28
+#: builtin/repack.c:31
msgid ""
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -19102,130 +20392,119 @@
"增量 repack 和 bitmap 索引不兼容。 使用 --no-write-bitmap-index\n"
"或禁用 pack.writebitmaps 配置。"
-#: builtin/repack.c:191
+#: builtin/repack.c:198
msgid "could not start pack-objects to repack promisor objects"
msgstr "无法开始 pack-objects 来重新打包 promisor 对象"
-#: builtin/repack.c:230 builtin/repack.c:416
+#: builtin/repack.c:270 builtin/repack.c:446
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr "repack：期望来自 pack-objects 的完整十六进制对象 ID。"
-#: builtin/repack.c:254
+#: builtin/repack.c:294
msgid "could not finish pack-objects to repack promisor objects"
msgstr "无法完成 pack-objects 来重新打包 promisor 对象"
-#: builtin/repack.c:292
+#: builtin/repack.c:322
msgid "pack everything in a single pack"
msgstr "所有内容打包到一个包文件中"
-#: builtin/repack.c:294
+#: builtin/repack.c:324
msgid "same as -a, and turn unreachable objects loose"
msgstr "和 -a 相同，并将不可达的对象设为松散对象"
-#: builtin/repack.c:297
+#: builtin/repack.c:327
msgid "remove redundant packs, and run git-prune-packed"
msgstr "删除多余的包，运行 git-prune-packed"
-#: builtin/repack.c:299
+#: builtin/repack.c:329
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
-#: builtin/repack.c:301
+#: builtin/repack.c:331
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
-#: builtin/repack.c:303
+#: builtin/repack.c:333
msgid "do not run git-update-server-info"
msgstr "不运行 git-update-server-info"
-#: builtin/repack.c:306
+#: builtin/repack.c:336
msgid "pass --local to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --local"
-#: builtin/repack.c:308
+#: builtin/repack.c:338
msgid "write bitmap index"
msgstr "写 bitmap 索引"
-#: builtin/repack.c:310
+#: builtin/repack.c:340
msgid "pass --delta-islands to git-pack-objects"
msgstr "向 git-pack-objects 传递参数 --delta-islands"
-#: builtin/repack.c:311
+#: builtin/repack.c:341
msgid "approxidate"
msgstr "近似日期"
-#: builtin/repack.c:312
+#: builtin/repack.c:342
msgid "with -A, do not loosen objects older than this"
msgstr "使用 -A，不要将早于给定时间的对象过期"
-#: builtin/repack.c:314
+#: builtin/repack.c:344
msgid "with -a, repack unreachable objects"
msgstr "使用 -a ，重新对不可达对象打包"
-#: builtin/repack.c:316
+#: builtin/repack.c:346
msgid "size of the window used for delta compression"
msgstr "用于增量压缩的窗口值"
-#: builtin/repack.c:317 builtin/repack.c:323
+#: builtin/repack.c:347 builtin/repack.c:353
msgid "bytes"
msgstr "字节"
-#: builtin/repack.c:318
+#: builtin/repack.c:348
msgid "same as the above, but limit memory size instead of entries count"
msgstr "和上面的相似，但限制内存大小而非条目数"
-#: builtin/repack.c:320
+#: builtin/repack.c:350
msgid "limits the maximum delta depth"
msgstr "限制最大增量深度"
-#: builtin/repack.c:322
+#: builtin/repack.c:352
msgid "limits the maximum number of threads"
msgstr "限制最大线程数"
-#: builtin/repack.c:324
+#: builtin/repack.c:354
msgid "maximum size of each packfile"
msgstr "每个包文件的最大尺寸"
-#: builtin/repack.c:326
+#: builtin/repack.c:356
msgid "repack objects in packs marked with .keep"
msgstr "对标记为 .keep 的包中的对象重新打包"
-#: builtin/repack.c:328
+#: builtin/repack.c:358
msgid "do not repack this pack"
msgstr "不要对该包文件重新打包"
-#: builtin/repack.c:338
+#: builtin/repack.c:368
msgid "cannot delete packs in a precious-objects repo"
msgstr "不能删除珍品仓库中的打包文件"
-#: builtin/repack.c:342
+#: builtin/repack.c:372
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable 和 -A 不兼容"
-#: builtin/repack.c:425
+#: builtin/repack.c:455
msgid "Nothing new to pack."
msgstr "没有新的要打包。"
-#: builtin/repack.c:486
+#: builtin/repack.c:485
#, 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"
+msgid "missing required file: %s"
+msgstr "缺少需要的文件：%s"
-#: builtin/repack.c:534
+#: builtin/repack.c:487
#, c-format
-msgid "failed to remove '%s'"
-msgstr "删除 '%s' 失败"
+msgid "could not unlink: %s"
+msgstr "不能删除：%s"
#: builtin/replace.c:22
msgid "git replace [-f] <object> <replacement>"
@@ -19528,94 +20807,94 @@
msgid "keep"
msgstr "保持"
-#: builtin/reset.c:82
+#: builtin/reset.c:83
msgid "You do not have a valid HEAD."
msgstr "您没有一个有效的 HEAD。"
-#: builtin/reset.c:84
+#: builtin/reset.c:85
msgid "Failed to find tree of HEAD."
msgstr "无法找到 HEAD 指向的树。"
-#: builtin/reset.c:90
+#: builtin/reset.c:91
#, c-format
msgid "Failed to find tree of %s."
msgstr "无法找到 %s 指向的树。"
-#: builtin/reset.c:115
+#: builtin/reset.c:116
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD 现在位于 %s"
# 译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:194
+#: builtin/reset.c:195
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "在合并过程中不能做%s重置操作。"
-#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595
-#: builtin/stash.c:619
+#: builtin/reset.c:295 builtin/stash.c:587 builtin/stash.c:661
+#: builtin/stash.c:685
msgid "be quiet, only report errors"
msgstr "安静模式，只报告错误"
-#: builtin/reset.c:296
+#: builtin/reset.c:297
msgid "reset HEAD and index"
msgstr "重置 HEAD 和索引"
-#: builtin/reset.c:297
+#: builtin/reset.c:298
msgid "reset only HEAD"
msgstr "只重置 HEAD"
-#: builtin/reset.c:299 builtin/reset.c:301
+#: builtin/reset.c:300 builtin/reset.c:302
msgid "reset HEAD, index and working tree"
msgstr "重置 HEAD、索引和工作区"
-#: builtin/reset.c:303
+#: builtin/reset.c:304
msgid "reset HEAD but keep local changes"
msgstr "重置 HEAD 但保存本地变更"
-#: builtin/reset.c:309
+#: builtin/reset.c:310
msgid "record only the fact that removed paths will be added later"
msgstr "将删除的路径标记为稍后添加"
-#: builtin/reset.c:343
+#: builtin/reset.c:344
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "无法将 '%s' 解析为一个有效的版本。"
-#: builtin/reset.c:351
+#: builtin/reset.c:352
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "无法将 '%s' 解析为一个有效的树对象。"
-#: builtin/reset.c:360
+#: builtin/reset.c:361
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
-#: builtin/reset.c:370
+#: builtin/reset.c:371
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr "--mixed 带路径已弃用，而是用 'git reset -- <路径>'。"
# 译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:372
+#: builtin/reset.c:373
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "不能带路径进行%s重置。"
# 译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:387
+#: builtin/reset.c:388
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "不能对纯仓库进行%s重置"
-#: builtin/reset.c:391
+#: builtin/reset.c:392
msgid "-N can only be used with --mixed"
msgstr "-N 只能和 --mixed 同时使用"
-#: builtin/reset.c:412
+#: builtin/reset.c:413
msgid "Unstaged changes after reset:"
msgstr "重置后取消暂存的变更："
-#: builtin/reset.c:415
+#: builtin/reset.c:416
#, c-format
msgid ""
"\n"
@@ -19627,48 +20906,48 @@
"重置后，枚举未暂存变更花费了 %.2f 秒。 您可以使用 '--quiet' 避免此情况。\n"
"将配置变量 reset.quiet 设置为 true 可使其成为默认值。\n"
-#: builtin/reset.c:425
+#: builtin/reset.c:434
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "不能重置索引文件至版本 '%s'。"
-#: builtin/reset.c:429
+#: builtin/reset.c:439
msgid "Could not write new index file."
msgstr "不能写入新的索引文件。"
-#: builtin/rev-list.c:499
+#: builtin/rev-list.c:534
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr "不能同时使用 --exclude-promisor-objects 和 --missing 选项"
-#: builtin/rev-list.c:560
+#: builtin/rev-list.c:595
msgid "object filtering requires --objects"
msgstr "对象过滤需要 --objects"
-#: builtin/rev-list.c:610
+#: builtin/rev-list.c:651
msgid "rev-list does not support display of notes"
msgstr "rev-list 不支持显示注解"
-#: builtin/rev-list.c:615
+#: builtin/rev-list.c:656
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"
@@ -19760,11 +21039,11 @@
msgid "keep redundant, empty commits"
msgstr "保持多余的、空的提交"
-#: builtin/revert.c:232
+#: builtin/revert.c:239
msgid "revert failed"
msgstr "还原失败"
-#: builtin/revert.c:245
+#: builtin/revert.c:252
msgid "cherry-pick failed"
msgstr "拣选失败"
@@ -19859,55 +21138,76 @@
"receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
" --all 和明确的 <引用> 互斥。"
-#: builtin/send-pack.c:163
+#: builtin/send-pack.c:188
msgid "remote name"
msgstr "远程名称"
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:201
msgid "use stateless RPC protocol"
msgstr "使用无状态的 RPC 协议"
-#: builtin/send-pack.c:178
+#: builtin/send-pack.c:202
msgid "read refs from stdin"
msgstr "从标准输入读取引用"
-#: builtin/send-pack.c:179
+#: builtin/send-pack.c:203
msgid "print status from remote helper"
msgstr "打印来自远程 helper 的状态"
-#: builtin/shortlog.c:14
+#: builtin/shortlog.c:16
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git shortlog [<选项>] [<版本范围>] [[--] <路径>...]"
-#: builtin/shortlog.c:15
+#: builtin/shortlog.c:17
msgid "git log --pretty=short | git shortlog [<options>]"
msgstr "git log --pretty=short | git shortlog [<选项>]"
-#: builtin/shortlog.c:264
-msgid "Group by committer rather than author"
-msgstr "按照提交者分组而不是作者"
+#: builtin/shortlog.c:123
+msgid "using multiple --group options with stdin is not supported"
+msgstr "不支持和标准输入一起使用多个 --group 选项"
-#: builtin/shortlog.c:266
+#: builtin/shortlog.c:133
+msgid "using --group=trailer with stdin is not supported"
+msgstr "不支持和标准输入一起使用 --group=trailer"
+
+#: builtin/shortlog.c:323
+#, c-format
+msgid "unknown group type: %s"
+msgstr "未知分组类型：%s"
+
+#: builtin/shortlog.c:351
+msgid "group by committer rather than author"
+msgstr "按照提交者而不是作者分组"
+
+#: builtin/shortlog.c:354
msgid "sort output according to the number of commits per author"
msgstr "根据每个作者的提交数量排序"
-#: builtin/shortlog.c:268
-msgid "Suppress commit descriptions, only provides commit count"
-msgstr "隐藏提交说明，只提供提交数量"
+#: builtin/shortlog.c:356
+msgid "suppress commit descriptions, only provides commit count"
+msgstr "抑制提交描述，只提供提交数量"
-#: builtin/shortlog.c:270
-msgid "Show the email address of each author"
+#: builtin/shortlog.c:358
+msgid "show the email address of each author"
msgstr "显示每个作者的电子邮件地址"
-#: builtin/shortlog.c:271
+#: builtin/shortlog.c:359
msgid "<w>[,<i1>[,<i2>]]"
msgstr "<w>[,<i1>[,<i2>]]"
-#: builtin/shortlog.c:272
-msgid "Linewrap output"
+#: builtin/shortlog.c:360
+msgid "linewrap output"
msgstr "折行输出"
-#: builtin/shortlog.c:301
+#: builtin/shortlog.c:362
+msgid "field"
+msgstr "字段"
+
+#: builtin/shortlog.c:363
+msgid "group by field"
+msgstr "按字段分组"
+
+#: builtin/shortlog.c:391
msgid "too many arguments given outside repository"
msgstr "仓库外执行提供了太多的参数"
@@ -20045,6 +21345,14 @@
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 | --"
@@ -20090,17 +21398,25 @@
msgstr "显示从标准输入中读入的不在本地仓库中的引用"
#: builtin/sparse-checkout.c:21
-msgid "git sparse-checkout (init|list|set|add|disable) <options>"
-msgstr "git sparse-checkout (init|list|set|add|disable) <选项>"
+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:64
+#: builtin/sparse-checkout.c:45
+msgid "git sparse-checkout list"
+msgstr "git sparse-checkout list"
+
+#: builtin/sparse-checkout.c:71
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr "本工作区不是稀疏模式（稀疏检出文件可能不存在）"
-#: builtin/sparse-checkout.c:225
+#: builtin/sparse-checkout.c:223
msgid "failed to create directory for sparse-checkout file"
msgstr "无法为稀疏检出文件创建目录"
+#: builtin/sparse-checkout.c:264
+msgid "unable to upgrade repository format to enable worktreeConfig"
+msgstr "无法升级仓库格式以启用 worktreeConfig"
+
#: builtin/sparse-checkout.c:266
msgid "failed to set extensions.worktreeConfig setting"
msgstr "无法设置 extensions.worktreeConfig"
@@ -20113,46 +21429,42 @@
msgid "initialize the sparse-checkout in cone mode"
msgstr "初始化稀疏检出为 cone 模式"
-#: builtin/sparse-checkout.c:308
-msgid "initialize sparse-checkout"
-msgstr "初始化稀疏检出"
-
-#: builtin/sparse-checkout.c:341
+#: builtin/sparse-checkout.c:339
#, c-format
msgid "failed to open '%s'"
msgstr "无法打开 '%s'"
-#: builtin/sparse-checkout.c:398
+#: builtin/sparse-checkout.c:396
#, c-format
msgid "could not normalize path %s"
msgstr "无法规范化路径 %s"
-#: builtin/sparse-checkout.c:410
+#: builtin/sparse-checkout.c:408
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
msgstr "git sparse-checkout (set|add) (--stdin | <模式>)"
-#: builtin/sparse-checkout.c:435
+#: builtin/sparse-checkout.c:433
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "无法为 C 语言风格的字符串 '%s' 去引号"
-#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513
+#: builtin/sparse-checkout.c:487 builtin/sparse-checkout.c:511
msgid "unable to load existing sparse-checkout patterns"
msgstr "无法加载现存的稀疏检出模式"
-#: builtin/sparse-checkout.c:558
+#: builtin/sparse-checkout.c:556
msgid "read patterns from standard in"
msgstr "从标准输入读取模式"
-#: builtin/sparse-checkout.c:564
-msgid "set sparse-checkout patterns"
-msgstr "设置稀疏检出模式"
+#: builtin/sparse-checkout.c:571
+msgid "git sparse-checkout reapply"
+msgstr "git sparse-checkout reapply"
-#: builtin/sparse-checkout.c:581
-msgid "disable sparse-checkout"
-msgstr "禁用稀疏检出"
+#: builtin/sparse-checkout.c:590
+msgid "git sparse-checkout disable"
+msgstr "git sparse-checkout disable"
-#: builtin/sparse-checkout.c:593
+#: builtin/sparse-checkout.c:618
msgid "error while refreshing working directory"
msgstr "刷新工作目录时出错"
@@ -20232,7 +21544,7 @@
msgid "Too many revisions specified:%s"
msgstr "指定了太多的版本：%s"
-#: builtin/stash.c:162 git-legacy-stash.sh:549
+#: builtin/stash.c:162
msgid "No stash entries found."
msgstr "未发现贮藏条目。"
@@ -20241,158 +21553,171 @@
msgid "%s is not a valid reference"
msgstr "%s 不是一个有效的引用名"
-#: builtin/stash.c:225 git-legacy-stash.sh:75
-msgid "git stash clear with parameters is unimplemented"
+#: builtin/stash.c:225
+msgid "git stash clear with arguments 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:429
+#, c-format
+msgid ""
+"WARNING: Untracked file in way of tracked file! Renaming\n"
+" %s -> %s\n"
+" to make room.\n"
+msgstr ""
+"警告：未跟踪文件出现在跟踪文件的路径上！重命名\n"
+" %s -> %s\n"
+" 以腾出空间。\n"
-#: builtin/stash.c:415
+#: builtin/stash.c:490
+msgid "cannot apply a stash in the middle of a merge"
+msgstr "无法在合并过程中应用贮藏"
+
+#: builtin/stash.c:501
#, c-format
msgid "could not generate diff %s^!."
msgstr "无法生成差异 %s^!."
-#: builtin/stash.c:422
-msgid "conflicts in index.Try without --index."
+#: builtin/stash.c:508
+msgid "conflicts in index. Try without --index."
msgstr "索引中有冲突。尝试不用 --index。"
-#: builtin/stash.c:428
+#: builtin/stash.c:514
msgid "could not save index tree"
msgstr "不能保存索引树"
-#: builtin/stash.c:437
+#: builtin/stash.c:523
msgid "could not restore untracked files from stash"
msgstr "无法从贮藏条目中恢复未跟踪文件"
-#: builtin/stash.c:451
+#: builtin/stash.c:537
#, c-format
msgid "Merging %s with %s"
msgstr "正在合并 %s 和 %s"
-#: builtin/stash.c:461 git-legacy-stash.sh:681
+#: builtin/stash.c:547
msgid "Index was not unstashed."
msgstr "索引未从贮藏中恢复。"
-#: builtin/stash.c:522 builtin/stash.c:621
+#: builtin/stash.c:589 builtin/stash.c:687
msgid "attempt to recreate the index"
msgstr "尝试重建索引"
-#: builtin/stash.c:555
+#: builtin/stash.c:633
#, c-format
msgid "Dropped %s (%s)"
msgstr "丢弃了 %s（%s）"
-#: builtin/stash.c:558
+#: builtin/stash.c:636
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s：无法丢弃贮藏条目"
-#: builtin/stash.c:583
+#: builtin/stash.c:649
#, c-format
msgid "'%s' is not a stash reference"
msgstr "'%s' 不是一个贮藏引用"
-#: builtin/stash.c:633 git-legacy-stash.sh:695
+#: builtin/stash.c:699
msgid "The stash entry is kept in case you need it again."
msgstr "贮藏条目被保留以备您再次需要。"
-#: builtin/stash.c:656 git-legacy-stash.sh:713
+#: builtin/stash.c:722
msgid "No branch name specified"
msgstr "未指定分支名"
-#: builtin/stash.c:796 builtin/stash.c:833
+#: builtin/stash.c:866 builtin/stash.c:903
#, c-format
msgid "Cannot update %s with %s"
msgstr "无法用 %2$s 更新 %1$s"
-#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
+#: builtin/stash.c:884 builtin/stash.c:1538 builtin/stash.c:1603
msgid "stash message"
msgstr "贮藏说明"
-#: builtin/stash.c:824
+#: builtin/stash.c:894
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" 需要一个 <提交> 参数"
-#: builtin/stash.c:1049 git-legacy-stash.sh:218
+#: builtin/stash.c:1109
msgid "No changes selected"
msgstr "没有选择变更"
-#: builtin/stash.c:1149 git-legacy-stash.sh:150
+#: builtin/stash.c:1209
msgid "You do not have the initial commit yet"
msgstr "您尚未建立初始提交"
-#: builtin/stash.c:1176 git-legacy-stash.sh:165
+#: builtin/stash.c:1236
msgid "Cannot save the current index state"
msgstr "无法保存当前索引状态"
-#: builtin/stash.c:1185 git-legacy-stash.sh:180
+#: builtin/stash.c:1245
msgid "Cannot save the untracked files"
msgstr "无法保存未跟踪文件"
-#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201
-#: git-legacy-stash.sh:214
+#: builtin/stash.c:1256 builtin/stash.c:1265
msgid "Cannot save the current worktree state"
msgstr "无法保存当前工作区状态"
-#: builtin/stash.c:1233 git-legacy-stash.sh:234
+#: builtin/stash.c:1293
msgid "Cannot record working tree state"
msgstr "不能记录工作区状态"
-#: builtin/stash.c:1282 git-legacy-stash.sh:338
+#: builtin/stash.c:1342
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
-#: builtin/stash.c:1298
+#: builtin/stash.c:1358
msgid "Did you forget to 'git add'?"
msgstr "您是否忘了执行 'git add'？"
-#: builtin/stash.c:1313 git-legacy-stash.sh:346
+#: builtin/stash.c:1373
msgid "No local changes to save"
msgstr "没有要保存的本地修改"
-#: builtin/stash.c:1320 git-legacy-stash.sh:351
+#: builtin/stash.c:1380
msgid "Cannot initialize stash"
msgstr "无法初始化贮藏"
-#: builtin/stash.c:1335 git-legacy-stash.sh:355
+#: builtin/stash.c:1395
msgid "Cannot save the current status"
msgstr "无法保存当前状态"
-#: builtin/stash.c:1340
+#: builtin/stash.c:1400
#, c-format
msgid "Saved working directory and index state %s"
msgstr "保存工作目录和索引状态 %s"
-#: builtin/stash.c:1430 git-legacy-stash.sh:385
+#: builtin/stash.c:1490
msgid "Cannot remove worktree changes"
msgstr "无法删除工作区变更"
-#: builtin/stash.c:1469 builtin/stash.c:1534
+#: builtin/stash.c:1529 builtin/stash.c:1594
msgid "keep index"
msgstr "保持索引"
-#: builtin/stash.c:1471 builtin/stash.c:1536
+#: builtin/stash.c:1531 builtin/stash.c:1596
msgid "stash in patch mode"
msgstr "以补丁模式贮藏"
-#: builtin/stash.c:1472 builtin/stash.c:1537
+#: builtin/stash.c:1532 builtin/stash.c:1597
msgid "quiet mode"
msgstr "静默模式"
-#: builtin/stash.c:1474 builtin/stash.c:1539
+#: builtin/stash.c:1534 builtin/stash.c:1599
msgid "include untracked files in stash"
msgstr "贮藏中包含未跟踪文件"
-#: builtin/stash.c:1476 builtin/stash.c:1541
+#: builtin/stash.c:1536 builtin/stash.c:1601
msgid "include ignore files"
msgstr "包含忽略的文件"
-#: builtin/stash.c:1600
-#, c-format
-msgid "could not exec %s"
-msgstr "不能执行 %s"
+#: builtin/stash.c:1636
+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]"
@@ -20410,7 +21735,7 @@
msgid "prepend comment character and space to each line"
msgstr "为每一行的行首添加注释符和空格"
-#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999
+#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "期望一个完整的引用名称，却得到 %s"
@@ -20424,7 +21749,7 @@
msgid "cannot strip one component off url '%s'"
msgstr "无法从 url '%s' 剥离一个组件"
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819
msgid "alternative anchor for relative paths"
msgstr "相对路径的替代锚记（anchor）"
@@ -20432,8 +21757,8 @@
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
-#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c: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"
@@ -20463,11 +21788,12 @@
"."
#: builtin/submodule--helper.c:565
-msgid "Suppress output of entering each submodule command"
-msgstr "阻止进入每一个子模组命令的输出"
+msgid "suppress output of entering each submodule command"
+msgstr "抑制进入每一个子模组命令的输出"
-#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063
-msgid "Recurse into nested submodules"
+#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888
+#: builtin/submodule--helper.c:1487
+msgid "recurse into nested submodules"
msgstr "递归进入嵌套子模组中"
#: builtin/submodule--helper.c:572
@@ -20481,100 +21807,149 @@
"authoritative upstream."
msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
-#: builtin/submodule--helper.c:667
+#: builtin/submodule--helper.c:666
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "无法为子模组 '%s' 注册 url"
-#: builtin/submodule--helper.c:671
+#: 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:681
+#: builtin/submodule--helper.c:680
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "警告：建议子模组 '%s' 使用命令更新模式\n"
-#: builtin/submodule--helper.c:688
+#: builtin/submodule--helper.c:687
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "无法为子模组 '%s' 注册更新模式"
-#: builtin/submodule--helper.c:710
-msgid "Suppress output for initializing a submodule"
-msgstr "阻止子模组初始化的输出"
+#: builtin/submodule--helper.c:709
+msgid "suppress output for initializing a submodule"
+msgstr "抑制子模组初始化的输出"
-#: builtin/submodule--helper.c:715
+#: builtin/submodule--helper.c:714
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<选项>] [<路径>]"
-#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
+#: builtin/submodule--helper.c: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:837
+#: builtin/submodule--helper.c:835
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "无法解析子模组 '%s' 的 HEAD 引用"
-#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "递归子模组 '%s' 失败"
-#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199
-msgid "Suppress submodule status output"
-msgstr "阻止子模组状态输出"
+#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623
+msgid "suppress submodule status output"
+msgstr "抑制子模组状态输出"
-#: builtin/submodule--helper.c:889
+#: builtin/submodule--helper.c:887
msgid ""
-"Use commit stored in the index instead of the one stored in the submodule "
+"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr "使用存储在索引中的提交，而非存储在子模组 HEAD 中的提交"
-#: builtin/submodule--helper.c:890
-msgid "recurse into nested submodules"
-msgstr "递归进入嵌套子模组中"
-
-#: builtin/submodule--helper.c:895
+#: builtin/submodule--helper.c:893
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]"
-#: builtin/submodule--helper.c:919
+#: builtin/submodule--helper.c:917
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <路径>"
-#: builtin/submodule--helper.c:983
+#: 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:989
+#: builtin/submodule--helper.c:1413
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "无法为子模组路径 '%s' 注册 url"
-#: builtin/submodule--helper.c:1003
+#: builtin/submodule--helper.c:1427
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "无法得到子模组 '%s' 的默认远程关联"
-#: builtin/submodule--helper.c:1014
+#: builtin/submodule--helper.c:1438
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "无法为子模组 '%s' 更新远程关联"
-#: builtin/submodule--helper.c:1061
-msgid "Suppress output of synchronizing submodule url"
-msgstr "阻止子模组 url 同步的输出"
+#: builtin/submodule--helper.c:1485
+msgid "suppress output of synchronizing submodule url"
+msgstr "抑制子模组 URL 同步的输出"
-#: builtin/submodule--helper.c:1068
+#: builtin/submodule--helper.c:1492
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]"
-#: builtin/submodule--helper.c:1122
+#: builtin/submodule--helper.c:1546
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -20583,52 +21958,52 @@
"子模组工作区 '%s' 包含一个 .git 目录（如果您确需删除它及其全部历史，使用 'rm "
"-rf' 命令）"
-#: builtin/submodule--helper.c:1134
+#: 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:1142
+#: builtin/submodule--helper.c:1566
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "已清除目录 '%s'\n"
-#: builtin/submodule--helper.c:1144
+#: builtin/submodule--helper.c:1568
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "无法移除子模组工作区 '%s'\n"
-#: builtin/submodule--helper.c:1155
+#: builtin/submodule--helper.c:1579
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "不能创建空的子模组目录 %s"
-#: builtin/submodule--helper.c:1171
+#: 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:1200
-msgid "Remove submodule working trees even if they contain local changes"
+#: builtin/submodule--helper.c:1624
+msgid "remove submodule working trees even if they contain local changes"
msgstr "删除子模组工作区，即使包含本地修改"
-#: builtin/submodule--helper.c:1201
-msgid "Unregister all submodules"
+#: builtin/submodule--helper.c:1625
+msgid "unregister all submodules"
msgstr "将所有子模组取消注册"
-#: builtin/submodule--helper.c:1206
+#: 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:1220
+#: builtin/submodule--helper.c:1644
msgid "Use '--all' if you really want to deinitialize all submodules"
msgstr "如果您确实想要对所有子模组执行取消初始化，请使用 '--all'"
-#: builtin/submodule--helper.c:1289
+#: 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"
@@ -20640,46 +22015,46 @@
"Git 不使用备用仓库克隆，或者等效地使用 '--reference-if-able' 而非\n"
"'--reference' 来克隆。"
-#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331
+#: 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:1367
+#: builtin/submodule--helper.c:1791
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
-#: builtin/submodule--helper.c:1374
+#: builtin/submodule--helper.c:1798
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'"
-#: builtin/submodule--helper.c:1398
+#: builtin/submodule--helper.c:1822
msgid "where the new submodule will be cloned to"
msgstr "新的子模组将要克隆的路径"
-#: builtin/submodule--helper.c:1401
+#: builtin/submodule--helper.c:1825
msgid "name of the new submodule"
msgstr "新子模组的名称"
-#: builtin/submodule--helper.c:1404
+#: builtin/submodule--helper.c:1828
msgid "url where to clone the submodule from"
msgstr "克隆子模组的 url 地址"
-#: builtin/submodule--helper.c:1412
+#: builtin/submodule--helper.c:1836
msgid "depth for shallow clones"
msgstr "浅克隆的深度"
-#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924
+#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348
msgid "force cloning progress"
msgstr "强制显示克隆进度"
-#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926
+#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350
msgid "disallow cloning into non-empty directory"
msgstr "不允许克隆到一个非空目录"
-#: builtin/submodule--helper.c:1424
+#: builtin/submodule--helper.c:1848
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -20688,152 +22063,186 @@
"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
"[--name <名字>] [--depth <深度>] [--single-branch] --url <url> --path <路径>"
-#: builtin/submodule--helper.c:1449
+#: 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:1460
+#: builtin/submodule--helper.c:1884
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "无法克隆 '%s' 到子模组路径 '%s'"
-#: builtin/submodule--helper.c:1464
+#: builtin/submodule--helper.c:1888
#, c-format
msgid "directory not empty: '%s'"
msgstr "目录非空：'%s'"
-#: builtin/submodule--helper.c:1476
+#: builtin/submodule--helper.c:1900
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "无法得到 '%s' 的子模组目录"
-#: builtin/submodule--helper.c:1512
+#: 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:1516
+#: 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:1617
+#: builtin/submodule--helper.c:2041
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "子模组 '%s' 尚未初始化"
-#: builtin/submodule--helper.c:1621
+#: builtin/submodule--helper.c:2045
msgid "Maybe you want to use 'update --init'?"
msgstr "也许您想要执行 'update --init'？"
-#: builtin/submodule--helper.c:1651
+#: builtin/submodule--helper.c:2075
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "略过未合并的子模组 %s"
-#: builtin/submodule--helper.c:1680
+#: builtin/submodule--helper.c:2104
#, c-format
msgid "Skipping submodule '%s'"
msgstr "略过子模组 '%s'"
-#: builtin/submodule--helper.c:1830
+#: builtin/submodule--helper.c:2254
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "克隆 '%s' 失败。按计划重试"
-#: builtin/submodule--helper.c:1841
+#: builtin/submodule--helper.c:2265
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "第二次尝试克隆 '%s' 失败，退出"
-#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149
+#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573
msgid "path into the working tree"
msgstr "到工作区的路径"
-#: builtin/submodule--helper.c:1906
+#: builtin/submodule--helper.c:2330
msgid "path into the working tree, across nested submodule boundaries"
msgstr "工作区中的路径，递归嵌套子模组"
-#: builtin/submodule--helper.c:1910
+#: builtin/submodule--helper.c:2334
msgid "rebase, merge, checkout or none"
msgstr "rebase、merge、checkout 或 none"
-#: builtin/submodule--helper.c:1916
-msgid "Create a shallow clone truncated to the specified number of revisions"
+#: builtin/submodule--helper.c:2340
+msgid "create a shallow clone truncated to the specified number of revisions"
msgstr "创建一个指定深度的浅克隆"
-#: builtin/submodule--helper.c:1919
+#: builtin/submodule--helper.c:2343
msgid "parallel jobs"
msgstr "并发任务"
-#: builtin/submodule--helper.c:1921
+#: builtin/submodule--helper.c:2345
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
-#: builtin/submodule--helper.c:1922
+#: builtin/submodule--helper.c:2346
msgid "don't print cloning progress"
msgstr "不要输出克隆进度"
-#: builtin/submodule--helper.c:1933
+#: 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:1946
+#: builtin/submodule--helper.c:2370
msgid "bad value for update parameter"
msgstr "update 参数取值错误"
-#: builtin/submodule--helper.c:1994
+#: 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:2117
+#: builtin/submodule--helper.c:2541
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "无法获得子模组 '%s' 的仓库句柄"
-#: builtin/submodule--helper.c:2150
+#: builtin/submodule--helper.c:2574
msgid "recurse into submodules"
msgstr "在子模组中递归"
-#: builtin/submodule--helper.c:2156
+#: 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:2212
+#: builtin/submodule--helper.c:2636
msgid "check if it is safe to write to the .gitmodules file"
msgstr "检查写入 .gitmodules 文件是否安全"
-#: builtin/submodule--helper.c:2215
+#: builtin/submodule--helper.c:2639
msgid "unset the config in the .gitmodules file"
msgstr "取消 .gitmodules 文件中的设置"
-#: builtin/submodule--helper.c:2220
+#: builtin/submodule--helper.c:2644
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config <名称> [<值>]"
-#: builtin/submodule--helper.c:2221
+#: builtin/submodule--helper.c:2645
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <名称>"
-#: builtin/submodule--helper.c:2222
+#: builtin/submodule--helper.c:2646
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2241 git-submodule.sh:174
+#: builtin/submodule--helper.c:2665 git-submodule.sh:150
#, sh-format
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "请确认 .gitmodules 文件在工作区里"
-#: builtin/submodule--helper.c:2291 git.c:433 git.c:684
+#: builtin/submodule--helper.c: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:441 git.c:714
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s 不支持 --super-prefix"
-#: builtin/submodule--helper.c:2297
+#: builtin/submodule--helper.c:2798
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
@@ -20858,11 +22267,11 @@
msgid "shorten ref output"
msgstr "缩短引用输出"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
msgid "reason"
msgstr "原因"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
msgid "reason of the update"
msgstr "更新的原因"
@@ -20882,11 +22291,12 @@
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>..."
@@ -20897,12 +22307,12 @@
msgid "tag '%s' not found."
msgstr "未发现标签 '%s'。"
-#: builtin/tag.c:105
+#: builtin/tag.c:124
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "已删除标签 '%s'（曾为 %s）\n"
-#: builtin/tag.c:135
+#: builtin/tag.c:159
#, c-format
msgid ""
"\n"
@@ -20915,7 +22325,7 @@
" %s\n"
"以 '%c' 开头的行将被忽略。\n"
-#: builtin/tag.c:139
+#: builtin/tag.c:163
#, c-format
msgid ""
"\n"
@@ -20929,15 +22339,11 @@
" %s\n"
"以 '%c' 开头的行将被保留，如果您愿意也可以删除它们。\n"
-#: builtin/tag.c:198
+#: builtin/tag.c:230
msgid "unable to sign the tag"
msgstr "无法签署标签"
-#: builtin/tag.c:200
-msgid "unable to write tag file"
-msgstr "无法写标签文件"
-
-#: builtin/tag.c:216
+#: builtin/tag.c:248
#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
@@ -20950,138 +22356,134 @@
"\n"
"\tgit tag -f %s %s^{}"
-#: builtin/tag.c:232
+#: builtin/tag.c:264
msgid "bad object type."
msgstr "坏的对象类型。"
-#: builtin/tag.c:284
+#: builtin/tag.c:317
msgid "no tag message?"
msgstr "无标签说明？"
-#: builtin/tag.c:291
+#: builtin/tag.c:324
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "标签说明被保留在 %s\n"
-#: builtin/tag.c:402
+#: builtin/tag.c:435
msgid "list tag names"
msgstr "列出标签名称"
-#: builtin/tag.c:404
+#: builtin/tag.c:437
msgid "print <n> lines of each tag message"
msgstr "每个标签信息打印 <n> 行"
-#: builtin/tag.c:406
+#: builtin/tag.c:439
msgid "delete tags"
msgstr "删除标签"
-#: builtin/tag.c:407
+#: builtin/tag.c:440
msgid "verify tags"
msgstr "验证标签"
-#: builtin/tag.c:409
+#: builtin/tag.c:442
msgid "Tag creation options"
msgstr "标签创建选项"
-#: builtin/tag.c:411
+#: builtin/tag.c:444
msgid "annotated tag, needs a message"
msgstr "附注标签，需要一个说明"
-#: builtin/tag.c:413
+#: builtin/tag.c:446
msgid "tag message"
msgstr "标签说明"
-#: builtin/tag.c:415
+#: builtin/tag.c:448
msgid "force edit of tag message"
msgstr "强制编辑标签说明"
-#: builtin/tag.c:416
+#: builtin/tag.c:449
msgid "annotated and GPG-signed tag"
msgstr "附注并附加 GPG 签名的标签"
-#: builtin/tag.c:419
+#: builtin/tag.c:452
msgid "use another key to sign the tag"
msgstr "使用另外的私钥签名该标签"
-#: builtin/tag.c:420
+#: builtin/tag.c:453
msgid "replace the tag if exists"
msgstr "如果存在，替换现有的标签"
-#: builtin/tag.c:421 builtin/update-ref.c:369
+#: builtin/tag.c:454 builtin/update-ref.c:505
msgid "create a reflog"
msgstr "创建引用日志"
-#: builtin/tag.c:423
+#: builtin/tag.c:456
msgid "Tag listing options"
msgstr "标签列表选项"
-#: builtin/tag.c:424
+#: builtin/tag.c:457
msgid "show tag list in columns"
msgstr "以列的方式显示标签列表"
-#: builtin/tag.c:425 builtin/tag.c:427
+#: builtin/tag.c:458 builtin/tag.c:460
msgid "print only tags that contain the commit"
msgstr "只打印包含该提交的标签"
-#: builtin/tag.c:426 builtin/tag.c:428
+#: builtin/tag.c:459 builtin/tag.c:461
msgid "print only tags that don't contain the commit"
msgstr "只打印不包含该提交的标签"
-#: builtin/tag.c:429
+#: builtin/tag.c:462
msgid "print only tags that are merged"
msgstr "只打印已经合并的标签"
-#: builtin/tag.c:430
+#: builtin/tag.c:463
msgid "print only tags that are not merged"
msgstr "只打印尚未合并的标签"
-#: builtin/tag.c:434
+#: builtin/tag.c:467
msgid "print only tags of the object"
msgstr "只打印指向该对象的标签"
-#: builtin/tag.c:482
+#: builtin/tag.c:515
msgid "--column and -n are incompatible"
msgstr "--column 和 -n 不兼容"
-#: builtin/tag.c:504
+#: builtin/tag.c:537
msgid "-n option is only allowed in list mode"
msgstr "-n 选项只允许用在列表显示模式"
-#: builtin/tag.c:506
+#: builtin/tag.c:539
msgid "--contains option is only allowed in list mode"
msgstr "--contains 选项只允许用在列表显示模式"
-#: builtin/tag.c:508
+#: builtin/tag.c:541
msgid "--no-contains option is only allowed in list mode"
msgstr "--no-contains 选项只允许用在列表显示模式"
-#: builtin/tag.c:510
+#: builtin/tag.c:543
msgid "--points-at option is only allowed in list mode"
msgstr "--points-at 选项只允许用在列表显示模式"
-#: builtin/tag.c:512
+#: builtin/tag.c:545
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式"
-#: builtin/tag.c:523
+#: builtin/tag.c:556
msgid "only one -F or -m option is allowed."
msgstr "只允许一个 -F 或 -m 选项。"
-#: builtin/tag.c:542
-msgid "too many params"
-msgstr "太多参数"
-
-#: builtin/tag.c:548
+#: builtin/tag.c:581
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' 不是一个有效的标签名称。"
-#: builtin/tag.c:553
+#: builtin/tag.c:586
#, c-format
msgid "tag '%s' already exists"
msgstr "标签 '%s' 已存在"
-#: builtin/tag.c:584
+#: builtin/tag.c:617
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "已更新标签 '%s'（曾为 %s）\n"
@@ -21351,19 +22753,19 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<选项>] --stdin [-z]"
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:500
msgid "delete the reference"
msgstr "删除引用"
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:502
msgid "update <refname> not the one it points to"
msgstr "更新 <引用名> 本身而不是它指向的引用"
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:503
msgid "stdin has NUL-terminated arguments"
msgstr "标准输入有以 NUL 字符终止的参数"
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:504
msgid "read updates from stdin"
msgstr "从标准输入读取更新"
@@ -21407,15 +22809,15 @@
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 "只显示统计"
@@ -21427,221 +22829,201 @@
msgid "print tag contents"
msgstr "打印标签内容"
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<选项>] <路径> [<提交>]"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree list [<options>]"
msgstr "git worktree list [<选项>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<选项>] <路径>"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <工作区> <新路径>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<选项>]"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<选项>] <工作区>"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <路径>"
-#: builtin/worktree.c:60 builtin/worktree.c:891
+#: builtin/worktree.c:61 builtin/worktree.c:933
#, c-format
msgid "failed to delete '%s'"
msgstr "删除 '%s' 失败"
-#: builtin/worktree.c:79
+#: builtin/worktree.c:74
#, c-format
-msgid "Removing worktrees/%s: not a valid directory"
-msgstr "删除工作区/%s：不是一个有效的目录"
+msgid "Removing %s/%s: %s"
+msgstr "删除 %s/%s: %s"
-#: builtin/worktree.c:85
-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
-msgstr "删除 worktrees/%s：gitdir 文件不存在"
-
-#: builtin/worktree.c:90 builtin/worktree.c:99
-#, c-format
-msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
-msgstr "删除 worktrees/%s：无法读取 gitdir 文件 (%s)"
-
-#: builtin/worktree.c:109
-#, c-format
-msgid ""
-"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
-"%<PRIuMAX>)"
-msgstr "删除工作树/%s：读取过短（期望 %<PRIuMAX> 字节，读取 %<PRIuMAX>）"
-
-#: builtin/worktree.c:117
-#, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
-msgstr "删除 worktrees/%s：无效的 gitdir 文件"
-
-#: builtin/worktree.c:126
-#, c-format
-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
-msgstr "删除 worktrees/%s：gitdir 文件的指向不存在"
-
-#: builtin/worktree.c:165
+#: builtin/worktree.c:149
msgid "report pruned working trees"
msgstr "报告清除的工作区"
-#: builtin/worktree.c:167
+#: builtin/worktree.c:151
msgid "expire working trees older than <time>"
msgstr "将早于 <时间> 的工作区过期"
-#: builtin/worktree.c:234
+#: builtin/worktree.c:221
#, c-format
msgid "'%s' already exists"
msgstr "'%s' 已经存在"
-#: builtin/worktree.c:244
+#: builtin/worktree.c:230
#, c-format
-msgid "unable to re-add worktree '%s'"
-msgstr "无法再次添加工作区 '%s'"
+msgid "unusable worktree destination '%s'"
+msgstr "无法使用的工作区目标 '%s'"
-#: builtin/worktree.c:249
+#: builtin/worktree.c:235
#, 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:251
+#: builtin/worktree.c:237
#, 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:301
+#: builtin/worktree.c:288
#, c-format
msgid "could not create directory of '%s'"
msgstr "不能创建目录 '%s'"
-#: builtin/worktree.c:432 builtin/worktree.c:438
+#: builtin/worktree.c:422 builtin/worktree.c:428
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "准备工作区（新分支 '%s'）"
-#: builtin/worktree.c:434
+#: builtin/worktree.c:424
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "准备工作区（重置分支 '%s'，之前为 %s）"
-#: builtin/worktree.c:443
+#: builtin/worktree.c:433
#, c-format
msgid "Preparing worktree (checking out '%s')"
msgstr "准备工作区（检出 '%s'）"
-#: builtin/worktree.c:449
+#: builtin/worktree.c:439
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "准备工作区（分离头指针 %s）"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:480
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "检出 <分支>，即使已经被检出到其它工作区"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:483
msgid "create a new branch"
msgstr "创建一个新分支"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:485
msgid "create or reset a branch"
msgstr "创建或重置一个分支"
-#: builtin/worktree.c:497
+#: builtin/worktree.c:487
msgid "populate the new working tree"
msgstr "生成新的工作区"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:488
msgid "keep the new working tree locked"
msgstr "锁定新工作区"
-#: builtin/worktree.c:501
+#: builtin/worktree.c:491
msgid "set up tracking mode (see git-branch(1))"
msgstr "设置跟踪模式（参见 git-branch(1)）"
-#: builtin/worktree.c:504
+#: builtin/worktree.c:494
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "尝试为新分支名匹配一个远程跟踪分支"
-#: builtin/worktree.c:512
+#: builtin/worktree.c:502
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b、-B 和 --detach 是互斥的"
-#: builtin/worktree.c:573
+#: builtin/worktree.c:563
msgid "--[no-]track can only be used if a new branch is created"
msgstr "只能在创建新分支时使用选项 --[no-]track "
-#: builtin/worktree.c:673
+#: builtin/worktree.c:680
+msgid "show extended annotations and reasons, if available"
+msgstr "显示扩展的注释和原因（如果有）"
+
+#: builtin/worktree.c:682
+msgid "add 'prunable' annotation to worktrees older than <time>"
+msgstr "向早于 <时间> 的工作区添添加“可修剪”注释"
+
+#: builtin/worktree.c:691
+msgid "--verbose and --porcelain are mutually exclusive"
+msgstr "--verbose 和 --porcelain 互斥"
+
+#: builtin/worktree.c:718
msgid "reason for locking"
msgstr "锁定原因"
-#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
-#: builtin/worktree.c:919
+#: builtin/worktree.c:730 builtin/worktree.c:763 builtin/worktree.c:837
+#: builtin/worktree.c:961
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' 不是一个工作区"
-#: builtin/worktree.c:687 builtin/worktree.c:720
+#: builtin/worktree.c:732 builtin/worktree.c:765
msgid "The main working tree cannot be locked or unlocked"
msgstr "主工作区无法被加锁或解锁"
-#: builtin/worktree.c:692
+#: builtin/worktree.c:737
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' 已被锁定，原因：%s"
-#: builtin/worktree.c:694
+#: builtin/worktree.c:739
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' 已被锁定"
-#: builtin/worktree.c:722
+#: builtin/worktree.c:767
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' 未被锁定"
-#: builtin/worktree.c:763
+#: builtin/worktree.c:808
msgid "working trees containing submodules cannot be moved or removed"
msgstr "不能移动或删除包含子模组的工作区"
-#: builtin/worktree.c:771
+#: builtin/worktree.c:816
msgid "force move even if worktree is dirty or locked"
msgstr "强制移动，即使工作区是脏的或已锁定"
-#: builtin/worktree.c:794 builtin/worktree.c:921
+#: builtin/worktree.c:839 builtin/worktree.c:963
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' 是一个主工作区"
-#: builtin/worktree.c:799
+#: builtin/worktree.c:844
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "无法从 '%s' 算出目标名称"
-#: builtin/worktree.c:805
-#, c-format
-msgid "target '%s' already exists"
-msgstr "目标 '%s' 已存在"
-
-#: builtin/worktree.c:813
+#: builtin/worktree.c:857
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -21650,7 +23032,7 @@
"无法移动一个锁定的工作区，锁定原因：%s\n"
"使用 'move -f -f' 覆盖或先解锁"
-#: builtin/worktree.c:815
+#: builtin/worktree.c:859
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -21658,36 +23040,36 @@
"无法移动一个锁定的工作区，\n"
"使用 'move -f -f' 覆盖或先解锁"
-#: builtin/worktree.c:818
+#: builtin/worktree.c:862
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "验证失败，无法移动工作区：%s"
-#: builtin/worktree.c:823
+#: builtin/worktree.c:867
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "移动 '%s' 到 '%s' 失败"
-#: builtin/worktree.c:871
+#: builtin/worktree.c:913
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "在 '%s' 中执行 'git status' 失败"
-#: builtin/worktree.c:875
+#: builtin/worktree.c:917
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr "'%s' 包含修改或未跟踪的文件，使用 --force 删除"
-#: builtin/worktree.c:880
+#: builtin/worktree.c:922
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "在 '%s' 中执行 'git status' 失败，退出码 %d"
-#: builtin/worktree.c:903
+#: builtin/worktree.c:945
msgid "force removal even if worktree is dirty or locked"
msgstr "强制删除，即使工作区是脏的或已锁定"
-#: builtin/worktree.c:926
+#: builtin/worktree.c:968
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -21696,7 +23078,7 @@
"无法删除一个锁定的工作区，锁定原因：%s\n"
"使用 'remove -f -f' 覆盖或先解锁"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:970
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -21704,11 +23086,21 @@
"无法删除一个锁定的工作区，\n"
"使用 'remove -f -f' 覆盖或先解锁"
-#: builtin/worktree.c:931
+#: builtin/worktree.c:973
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "验证失败，无法删除工作区：%s"
+#: builtin/worktree.c:997
+#, c-format
+msgid "repair: %s: %s"
+msgstr "修理：%s：%s"
+
+#: builtin/worktree.c:1000
+#, 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=<前缀>/]"
@@ -21725,44 +23117,37 @@
msgid "only useful for debugging"
msgstr "只对调试有用"
-#: fast-import.c:3125
+#: http-fetch.c:118
#, c-format
-msgid "Expected 'mark' command, got %s"
-msgstr "预期 'mark' 命令，得到 %s"
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr "--packfile 的参数必须是有效的哈希值（得到 '%s'）"
-#: fast-import.c:3130
-#, c-format
-msgid "Expected 'to' command, got %s"
-msgstr "预期 'to' 命令，得到 %s"
+#: http-fetch.c:128
+msgid "not a git repository"
+msgstr "不是 git 仓库"
-#: fast-import.c:3254
-#, c-format
-msgid "feature '%s' forbidden in input without --allow-unsafe-features"
-msgstr "不带 --allow-unsafe-features 的输入中禁止使用功能 '%s'"
+#: http-fetch.c:134
+msgid "--packfile requires --index-pack-args"
+msgstr "--packfile 需要 --index-pack-args"
-#: credential-cache--daemon.c:223
-#, c-format
-msgid ""
-"The permissions on your socket directory are too loose; other\n"
-"users may be able to read your cached credentials. Consider running:\n"
-"\n"
-"\tchmod 0700 %s"
-msgstr ""
-"您的 socket 目录权限过于宽松，其他用户可能会读取您缓存的认证信息。考虑执"
-"行：\n"
-"\n"
-"\tchmod 0700 %s"
+#: http-fetch.c:143
+msgid "--index-pack-args can only be used with --packfile"
+msgstr "--index-pack-args 只能和 --packfile 一起使用"
-#: credential-cache--daemon.c:272
-msgid "print debugging messages to stderr"
-msgstr "调试信息输出到标准错误"
+#: t/helper/test-fast-rebase.c:141
+msgid "unhandled options"
+msgstr "未处理的选项"
-#: t/helper/test-reach.c:152
+#: t/helper/test-fast-rebase.c:146
+msgid "error preparing revisions"
+msgstr "准备版本时错误"
+
+#: 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 "太多提交标记为可达"
@@ -21774,23 +23159,24 @@
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"
" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
"bare]\n"
" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\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"
+" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]\n"
" [--git-dir=<路径>] [--work-tree=<路径>] [--namespace=<名称>]\n"
+" [--super-prefix=<路径>] [--config-env=<名称>=<环境变量>]\n"
" <命令> [<参数>]"
-#: git.c:34
+#: git.c:36
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"
@@ -21802,47 +23188,47 @@
"帮助。\n"
"有关系统的概述，查看 'git help git'。"
-#: git.c:186
+#: git.c:188
#, c-format
msgid "no directory given for --git-dir\n"
msgstr "没有为 --git-dir 提供目录\n"
-#: git.c:200
+#: git.c:202
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "没有为 --namespace 提供命名空间\n"
-#: git.c:214
+#: git.c:216
#, c-format
msgid "no directory given for --work-tree\n"
msgstr "没有为 --work-tree 提供目录\n"
-#: git.c:228
+#: git.c:230
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr "没有为 --super-prefix 提供前缀\n"
-#: git.c:250
+#: git.c:252
#, c-format
msgid "-c expects a configuration string\n"
msgstr "应为 -c 提供一个配置字符串\n"
-#: git.c:288
+#: git.c:292
#, c-format
msgid "no directory given for -C\n"
msgstr "没有为 -C 提供目录\n"
-#: git.c:314
+#: git.c:318
#, c-format
msgid "unknown option: %s\n"
msgstr "未知选项：%s\n"
-#: git.c:360
+#: git.c:367
#, c-format
msgid "while expanding alias '%s': '%s'"
msgstr "在扩展别名 '%s' 时：'%s'"
-#: git.c:369
+#: git.c:376
#, c-format
msgid ""
"alias '%s' changes environment variables.\n"
@@ -21851,39 +23237,39 @@
"别名 '%s' 修改环境变量。您可以使用在别名中\n"
"使用 '!git'"
-#: git.c:376
+#: git.c:383
#, c-format
msgid "empty alias for %s"
msgstr "%s 的空别名"
-#: git.c:379
+#: git.c:386
#, c-format
msgid "recursive alias: %s"
msgstr "递归的别名：%s"
-#: git.c:459
+#: git.c:468
msgid "write failure on standard output"
msgstr "在标准输出写入失败"
-#: git.c:461
+#: git.c:470
msgid "unknown write failure on standard output"
msgstr "到标准输出的未知写入错误"
-#: git.c:463
+#: git.c:472
msgid "close failed on standard output"
msgstr "标准输出关闭失败"
-#: git.c:793
+#: git.c:823
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "检测到别名循环：'%s'的扩展未终止：%s"
-#: git.c:843
+#: git.c:873
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "不能作为内置命令处理 %s"
-#: git.c:856
+#: git.c:886
#, c-format
msgid ""
"usage: %s\n"
@@ -21892,53 +23278,53 @@
"用法：%s\n"
"\n"
-#: git.c:876
+#: git.c:906
#, 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:918
#, 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:1086
+#: http.c:1132
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "不支持的 SSL 后端 '%s'。支持的 SSL 后端："
-#: http.c:1093
+#: 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:1097
+#: http.c:1143
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr "无法将 SSL 后端设置为 '%s'：已经设置"
-#: http.c:1966
+#: http.c:2025
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -21949,120 +23335,151 @@
" 请求：%s\n"
" 重定向：%s"
-#: remote-curl.c:166
+#: remote-curl.c:183
#, c-format
msgid "invalid quoting in push-option value: '%s'"
msgstr "在 push-option 取值中无效的引号：'%s'"
-#: remote-curl.c:263
+#: remote-curl.c:307
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
-msgstr "%sinfo/refs 无效：这是一个 git 仓库么？"
+msgstr "%sinfo/refs 无效：这是 git 仓库么？"
-#: remote-curl.c:364
+#: remote-curl.c:408
msgid "invalid server response; expected service, got flush packet"
msgstr "无效的服务端响应。预期服务，得到 flush 包"
-#: remote-curl.c:395
+#: remote-curl.c:439
#, c-format
msgid "invalid server response; got '%s'"
msgstr "无效的服务端响应，得到 '%s'"
-#: remote-curl.c:455
+#: remote-curl.c:499
#, c-format
msgid "repository '%s' not found"
msgstr "仓库 '%s' 未找到"
-#: remote-curl.c:459
+#: remote-curl.c:503
#, c-format
msgid "Authentication failed for '%s'"
msgstr "'%s' 鉴权失败"
-#: remote-curl.c:463
+#: remote-curl.c:507
#, c-format
msgid "unable to access '%s': %s"
msgstr "无法访问 '%s'：%s"
-#: remote-curl.c:469
+#: remote-curl.c:513
#, c-format
msgid "redirecting to %s"
msgstr "重定向到 %s"
-#: remote-curl.c:593
+#: remote-curl.c:642
msgid "shouldn't have EOF when not gentle on EOF"
msgstr "当没有设置温和处理文件结束符（EOF）时，不应该有文件结束符"
-#: remote-curl.c:673
+#: remote-curl.c:654
+msgid "remote server sent stateless separator"
+msgstr "远程服务器发送了无状态分隔符"
+
+#: remote-curl.c:724
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr "无法倒回 rpc post 数据 - 尝试增加 http.postBuffer"
-#: remote-curl.c:733
+#: remote-curl.c:754
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr "remote-curl：错误的行宽字符：%.4s"
+
+#: remote-curl.c:756
+msgid "remote-curl: unexpected response end packet"
+msgstr "remote-curl：意外响应结束包"
+
+#: remote-curl.c:832
#, c-format
msgid "RPC failed; %s"
msgstr "RPC 失败。%s"
-#: remote-curl.c:773
+#: remote-curl.c:872
msgid "cannot handle pushes this big"
msgstr "不能处理这么大的推送"
-#: remote-curl.c:888
+#: remote-curl.c:987
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr "不能压缩请求，zlib 压缩错误 %d"
-#: remote-curl.c:892
+#: remote-curl.c:991
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr "不能压缩请求，zlib 结束错误 %d"
-#: remote-curl.c:1023
+#: remote-curl.c:1041
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr "收到了 %d 字节长度的头信息"
+
+#: remote-curl.c:1043
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr "预期仍然需要 %d 个字节的正文"
+
+#: remote-curl.c:1132
msgid "dumb http transport does not support shallow capabilities"
msgstr "哑 http 传输不支持 shalllow 能力"
-#: remote-curl.c:1038
+#: remote-curl.c:1147
msgid "fetch failed."
msgstr "获取失败。"
-#: remote-curl.c:1086
+#: remote-curl.c:1193
msgid "cannot fetch by sha1 over smart http"
msgstr "无法通过智能 HTTP 获取 sha1"
-#: remote-curl.c:1130 remote-curl.c:1136
+#: remote-curl.c:1237 remote-curl.c:1243
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "协议错误：期望 sha/ref，却得到 '%s'"
-#: remote-curl.c:1148 remote-curl.c:1263
+#: remote-curl.c:1255 remote-curl.c:1373
#, c-format
msgid "http transport does not support %s"
msgstr "http 传输协议不支持 %s"
-#: remote-curl.c:1184
+#: remote-curl.c:1291
msgid "git-http-push failed"
msgstr "git-http-push 失败"
-#: remote-curl.c:1369
+#: remote-curl.c:1479
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl：用法：git remote-curl <远程> [<url>]"
-#: remote-curl.c:1401
+#: remote-curl.c:1511
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl：错误读取来自 git 的命令流"
-#: remote-curl.c:1408
+#: remote-curl.c:1518
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl：尝试没有本地仓库下获取"
-#: remote-curl.c:1448
+#: remote-curl.c:1559
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl：未知的来自 git 的命令 '%s'"
-#: list-objects-filter-options.h:85
+#: 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:86
+#: list-objects-filter-options.h:92
msgid "object filtering"
msgstr "对象过滤"
@@ -22083,8 +23500,8 @@
msgstr "更加安静"
#: parse-options.h:317
-msgid "use <n> digits to display SHA-1s"
-msgstr "用 <n> 位数字显示 SHA-1 哈希值"
+msgid "use <n> digits to display object names"
+msgstr "用 <n> 位数字显示对象名"
#: parse-options.h:336
msgid "how to strip spaces and #comments from message"
@@ -22099,11 +23516,11 @@
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr "使用 --pathspec-from-file，路径表达式用空字符分隔"
-#: ref-filter.h:101
+#: ref-filter.h:99
msgid "key"
msgstr "key"
-#: ref-filter.h:101
+#: ref-filter.h:99
msgid "field name to sort on"
msgstr "排序的字段名"
@@ -22111,14 +23528,6 @@
msgid "update the index with reused conflict resolution if possible"
msgstr "如果可能，重用冲突解决更新索引"
-#: wt-status.h:67
-msgid "HEAD detached at "
-msgstr "头指针分离于 "
-
-#: wt-status.h:68
-msgid "HEAD detached from "
-msgstr "头指针分离自 "
-
#: command-list.h:50
msgid "Add file contents to the index"
msgstr "添加文件内容至索引"
@@ -22156,677 +23565,656 @@
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 "Run a Git command on a list of repositories"
+msgstr "在一个仓库列表上运行 Git 命令"
+
+#: command-list.h:100
msgid "Prepare patches for e-mail submission"
msgstr "准备电子邮件提交的补丁"
-#: command-list.h:99
+#: command-list.h:101
msgid "Verifies the connectivity and validity of the objects in the database"
msgstr "验证仓库中对象的连通性和有效性"
-#: command-list.h:100
+#: command-list.h:102
msgid "Cleanup unnecessary files and optimize the local repository"
msgstr "清除不必要的文件和优化本地仓库"
-#: command-list.h:101
+#: command-list.h:103
msgid "Extract commit ID from an archive created using git-archive"
msgstr "从 git-archive 创建的归档文件中提取提交 ID"
-#: command-list.h:102
+#: command-list.h:104
msgid "Print lines matching a pattern"
msgstr "输出和模式匹配的行"
-#: command-list.h:103
+#: command-list.h:105
msgid "A portable graphical interface to Git"
msgstr "一个便携的 Git 图形客户端"
-#: command-list.h:104
+#: command-list.h:106
msgid "Compute object ID and optionally creates a blob from a file"
msgstr "从一个文件计算对象 ID，并可以创建 blob 数据对象"
-#: command-list.h:105
+#: command-list.h:107
msgid "Display help information about Git"
msgstr "显示 Git 的帮助信息"
-#: command-list.h:106
+#: command-list.h:108
msgid "Server side implementation of Git over HTTP"
msgstr "Git HTTP 协议的服务端实现"
-#: command-list.h:107
+#: command-list.h:109
msgid "Download from a remote Git repository via HTTP"
msgstr "通过 HTTP 从远程 Git 仓库下载"
-#: command-list.h:108
+#: command-list.h:110
msgid "Push objects over HTTP/DAV to another repository"
msgstr "通过 HTTP/DAV 推送对象另一个仓库"
-#: command-list.h:109
+#: command-list.h:111
msgid "Send a collection of patches from stdin to an IMAP folder"
msgstr "从标准输入将一组补丁发送到IMAP文件夹"
-#: command-list.h:110
+#: command-list.h:112
msgid "Build pack index file for an existing packed archive"
msgstr "从一个现存的包存档文件创建包索引"
-#: command-list.h:111
+#: command-list.h:113
msgid "Create an empty Git repository or reinitialize an existing one"
msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
-#: command-list.h:112
+#: command-list.h:114
msgid "Instantly browse your working repository in gitweb"
msgstr "在 gitweb 中即时浏览您的工作仓库"
-#: command-list.h:113
+#: command-list.h:115
msgid "Add or parse structured information in commit messages"
msgstr "添加或解析提交说明中的结构化信息"
-#: command-list.h:114
+#: command-list.h:116
msgid "The Git repository browser"
msgstr "Git 仓库浏览器"
-#: command-list.h:115
+#: command-list.h:117
msgid "Show commit logs"
msgstr "显示提交日志"
-#: command-list.h:116
+#: command-list.h:118
msgid "Show information about files in the index and the working tree"
msgstr "显示索引和工作区中文件的信息"
-#: command-list.h:117
+#: command-list.h:119
msgid "List references in a remote repository"
msgstr "显示一个远程仓库的引用"
-#: command-list.h:118
+#: command-list.h:120
msgid "List the contents of a tree object"
msgstr "显示一个树对象的内容"
-#: command-list.h:119
+#: command-list.h:121
msgid "Extracts patch and authorship from a single e-mail message"
msgstr "从单个电子邮件中提取补丁和作者身份"
-#: command-list.h:120
+#: command-list.h:122
msgid "Simple UNIX mbox splitter program"
msgstr "简单的 UNIX mbox 邮箱切分程序"
-#: command-list.h:121
+#: command-list.h:123
+msgid "Run tasks to optimize Git repository data"
+msgstr "运行任务以优化仓库数据"
+
+#: command-list.h:124
msgid "Join two or more development histories together"
msgstr "合并两个或更多开发历史"
-#: command-list.h:122
+#: command-list.h:125
msgid "Find as good common ancestors as possible for a merge"
msgstr "为了合并查找尽可能好的公共祖先提交"
-#: command-list.h:123
+#: command-list.h:126
msgid "Run a three-way file merge"
msgstr "运行一个三路文件合并"
-#: command-list.h:124
+#: command-list.h:127
msgid "Run a merge for files needing merging"
msgstr "对于需要合并的文件执行合并"
-#: command-list.h:125
+#: command-list.h:128
msgid "The standard helper program to use with git-merge-index"
msgstr "与 git-merge-index 一起使用的标准向导程序"
-#: command-list.h:126
+#: command-list.h:129
msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr "运行合并冲突解决工具以解决合并冲突"
-#: command-list.h:127
+#: command-list.h:130
msgid "Show three-way merge without touching index"
msgstr "显示三路合并而不动索引"
-#: command-list.h:128
+#: command-list.h:131
msgid "Write and verify multi-pack-indexes"
msgstr "写入和校验多包索引"
-#: command-list.h:129
-msgid "Creates a tag object"
-msgstr "创建一个标签对象"
+#: command-list.h:132
+msgid "Creates a tag object with extra validation"
+msgstr "创建一个有额外验证的标签对象"
-#: command-list.h:130
+#: command-list.h:133
msgid "Build a tree-object from ls-tree formatted text"
msgstr "基于 ls-tree 的格式化文本创建一个树对象"
-#: command-list.h:131
+#: command-list.h:134
msgid "Move or rename a file, a directory, or a symlink"
msgstr "移动或重命名一个文件、目录或符号链接"
# 查找给定版本的符号名称
-#: command-list.h:132
+#: command-list.h:135
msgid "Find symbolic names for given revs"
msgstr "查找给定版本的符号名称"
-#: command-list.h:133
+#: command-list.h:136
msgid "Add or inspect object notes"
msgstr "添加或检查对象注释"
-#: command-list.h:134
+#: command-list.h:137
msgid "Import from and submit to Perforce repositories"
msgstr "导入和提交到 Perforce 仓库中"
-#: command-list.h:135
+#: command-list.h:138
msgid "Create a packed archive of objects"
msgstr "创建对象的存档包"
-#: command-list.h:136
+#: command-list.h:139
msgid "Find redundant pack files"
msgstr "查找冗余的包文件"
-#: command-list.h:137
+#: command-list.h:140
msgid "Pack heads and tags for efficient repository access"
msgstr "打包头和标签以实现高效的仓库访问"
-#: command-list.h:138
-msgid "Routines to help parsing remote repository access parameters"
-msgstr "帮助解析远程仓库访问参数的例程"
-
-#: command-list.h:139
+#: 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:172
+#: command-list.h:174
msgid "Stash the changes in a dirty working directory away"
msgstr "贮藏脏工作区中的修改"
-#: command-list.h:173
+#: command-list.h:175
msgid "Add file contents to the staging area"
msgstr "将文件内容添加到索引"
-#: command-list.h:174
+#: command-list.h:176
msgid "Show the working tree status"
msgstr "显示工作区状态"
-#: command-list.h:175
+#: command-list.h:177
msgid "Remove unnecessary whitespace"
msgstr "删除不必要的空白字符"
-#: command-list.h:176
+#: command-list.h:178
msgid "Initialize, update or inspect submodules"
msgstr "初始化、更新或检查子模组"
-#: command-list.h:177
+#: command-list.h:179
msgid "Bidirectional operation between a Subversion repository and Git"
msgstr "Subersion 仓库和 Git 之间的双向操作"
-#: command-list.h:178
+#: command-list.h:180
msgid "Switch branches"
msgstr "切换分支"
-#: command-list.h:179
+#: command-list.h:181
msgid "Read, modify and delete symbolic refs"
msgstr "读取、修改和删除符号引用"
-#: command-list.h:180
+#: command-list.h:182
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
-#: command-list.h:181
+#: command-list.h:183
msgid "Creates a temporary file with a blob's contents"
msgstr "用 blob 数据对象的内容创建一个临时文件"
-#: command-list.h:182
+#: command-list.h:184
msgid "Unpack objects from a packed archive"
msgstr "从打包文件中解压缩对象"
-#: command-list.h:183
+#: command-list.h:185
msgid "Register file contents in the working tree to the index"
msgstr "将工作区的文件内容注册到索引"
-#: command-list.h:184
+#: command-list.h:186
msgid "Update the object name stored in a ref safely"
msgstr "安全地更新存储于引用中的对象名称"
-#: command-list.h:185
+#: command-list.h:187
msgid "Update auxiliary info file to help dumb servers"
msgstr "更新辅助信息文件以帮助哑协议服务"
-#: command-list.h:186
+#: command-list.h:188
msgid "Send archive back to git-archive"
msgstr "将存档发送回 git-archive"
-#: command-list.h:187
+#: command-list.h:189
msgid "Send objects packed back to git-fetch-pack"
msgstr "将对象压缩包发送回 git-fetch-pack"
-#: command-list.h:188
+#: command-list.h:190
msgid "Show a Git logical variable"
msgstr "显示一个Git逻辑变量"
-#: command-list.h:189
+#: command-list.h:191
msgid "Check the GPG signature of commits"
msgstr "检查 GPG 提交签名"
-#: command-list.h:190
+#: command-list.h:192
msgid "Validate packed Git archive files"
msgstr "校验打包的Git存仓文件"
-#: command-list.h:191
+#: command-list.h:193
msgid "Check the GPG signature of tags"
msgstr "检查标签的 GPG 签名"
-#: command-list.h:192
+#: command-list.h:194
msgid "Git web interface (web frontend to Git repositories)"
msgstr "Git web 界面（Git 仓库的 web 前端）"
-#: command-list.h:193
+#: command-list.h:195
msgid "Show logs with difference each commit introduces"
msgstr "显示每一个提交引入的差异日志"
-#: command-list.h:194
+#: command-list.h:196
msgid "Manage multiple working trees"
msgstr "管理多个工作区"
-#: command-list.h:195
+#: command-list.h:197
msgid "Create a tree object from the current index"
msgstr "从当前索引创建一个树对象"
-#: command-list.h:196
+#: command-list.h:198
msgid "Defining attributes per path"
msgstr "定义路径的属性"
-#: command-list.h:197
+#: command-list.h:199
msgid "Git command-line interface and conventions"
msgstr "Git 命令行界面和约定"
-#: command-list.h:198
+#: command-list.h:200
msgid "A Git core tutorial for developers"
msgstr "面向开发人员的 Git 核心教程"
-#: command-list.h:199
+#: 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:200
+#: command-list.h:203
msgid "Tweaking diff output"
msgstr "调整差异输出"
-#: command-list.h:201
+#: command-list.h:204
msgid "A useful minimum set of commands for Everyday Git"
msgstr "每一天 Git 的一组有用的最小命令集合"
-#: command-list.h:202
+#: 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:203
+#: command-list.h:207
msgid "Hooks used by Git"
msgstr "Git 使用的钩子"
-#: command-list.h:204
+#: command-list.h:208
msgid "Specifies intentionally untracked files to ignore"
msgstr "忽略指定的未跟踪文件"
-#: command-list.h:205
+#: command-list.h:209
+msgid "Map author/committer names and/or E-Mail addresses"
+msgstr "映射作者/提交者的名称和/或邮件地址"
+
+#: command-list.h:210
msgid "Defining submodule properties"
msgstr "定义子模组属性"
-#: command-list.h:206
+#: command-list.h:211
msgid "Git namespaces"
msgstr "Git 名字空间"
-#: command-list.h:207
+#: command-list.h:212
+msgid "Helper programs to interact with remote repositories"
+msgstr "与远程仓库交互的助手程序"
+
+#: command-list.h:213
msgid "Git Repository Layout"
msgstr "Git 仓库布局"
-#: command-list.h:208
+#: command-list.h:214
msgid "Specifying revisions and ranges for Git"
msgstr "指定 Git 的版本和版本范围"
-#: command-list.h:209
+#: command-list.h:215
msgid "Mounting one repository inside another"
msgstr "将一个仓库安装到另外一个仓库中"
-#: command-list.h:210
+#: command-list.h:216
msgid "A tutorial introduction to Git: part two"
msgstr "一个 Git 教程：第二部分"
-#: command-list.h:211
+#: command-list.h:217
msgid "A tutorial introduction to Git"
msgstr "一个 Git 教程"
-#: command-list.h:212
+#: command-list.h:218
msgid "An overview of recommended workflows with Git"
msgstr "Git 推荐的工作流概览"
-#: git-bisect.sh:54
-msgid "You need to start by \"git bisect start\""
-msgstr "您需要执行 \"git bisect start\" 来开始"
-
-# 译者：注意保持句尾空格
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:60
-msgid "Do you want me to do it for you [Y/n]? "
-msgstr "您想让我为您这样做么[Y/n]？ "
-
-#: git-bisect.sh:101
-#, sh-format
-msgid "Bad rev input: $arg"
-msgstr "坏的输入版本：$arg"
-
-#: git-bisect.sh:121
-#, sh-format
-msgid "Bad rev input: $bisected_head"
-msgstr "坏的输入版本：$bisected_head"
-
-#: git-bisect.sh:130
-#, sh-format
-msgid "Bad rev input: $rev"
-msgstr "坏的输入版本：$rev"
-
-#: git-bisect.sh:139
-#, sh-format
-msgid "'git bisect $TERM_BAD' can take only one argument."
-msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
-
-#: git-bisect.sh:209
-msgid "No logfile given"
-msgstr "未提供日志文件"
-
-#: git-bisect.sh:210
-#, sh-format
-msgid "cannot read $file for replaying"
-msgstr "不能读取 $file 来重放"
-
-#: git-bisect.sh:232
-msgid "?? what are you talking about?"
-msgstr "?? 您在说什么?"
-
-#: git-bisect.sh:241
+#: git-bisect.sh:68
msgid "bisect run failed: no command provided."
msgstr "二分查找运行失败：没有提供命令。"
-#: git-bisect.sh:246
+#: git-bisect.sh:73
#, sh-format
msgid "running $command"
msgstr "运行 $command"
-#: git-bisect.sh:253
+#: git-bisect.sh:80
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -22835,27 +24223,23 @@
"二分查找运行失败：\n"
"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
-#: git-bisect.sh:279
+#: git-bisect.sh:105
msgid "bisect run cannot continue any more"
msgstr "二分查找不能继续运行"
-#: git-bisect.sh:285
+#: git-bisect.sh:111
#, sh-format
msgid ""
"bisect run failed:\n"
-"'bisect_state $state' exited with error code $res"
+"'bisect-state $state' exited with error code $res"
msgstr ""
"二分查找运行失败：\n"
-"'bisect_state $state' 退出码为 $res"
+"'bisect-state $state' 退出码为 $res"
-#: git-bisect.sh:292
+#: git-bisect.sh:118
msgid "bisect run success"
msgstr "二分查找运行成功"
-#: git-bisect.sh:300
-msgid "We are not bisecting."
-msgstr "我们没有在二分查找。"
-
#: git-merge-octopus.sh:46
msgid ""
"Error: Your local changes to the following files would be overwritten by "
@@ -22894,128 +24278,46 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "简单合并未生效，尝试自动合并。"
-#: git-legacy-stash.sh:221
-msgid "Cannot remove temporary index (can't happen)"
-msgstr "无法删除临时索引（不应发生）"
-
-#: git-legacy-stash.sh:272
-#, sh-format
-msgid "Cannot update $ref_stash with $w_commit"
-msgstr "无法用 $w_commit 更新 $ref_stash"
-
-#: git-legacy-stash.sh:324
-#, sh-format
-msgid "error: unknown option for 'stash push': $option"
-msgstr "错误：'stash push' 的未知选项：$option"
-
-#: git-legacy-stash.sh:356
-#, sh-format
-msgid "Saved working directory and index state $stash_msg"
-msgstr "保存工作目录和索引状态 $stash_msg"
-
-#: git-legacy-stash.sh:536
-#, sh-format
-msgid "unknown option: $opt"
-msgstr "未知选项: $opt"
-
-#: git-legacy-stash.sh:556
-#, sh-format
-msgid "Too many revisions specified: $REV"
-msgstr "指定了太多的版本：$REV"
-
-#: git-legacy-stash.sh:571
-#, sh-format
-msgid "$reference is not a valid reference"
-msgstr "$reference 不是一个有效的引用"
-
-#: git-legacy-stash.sh:599
-#, sh-format
-msgid "'$args' is not a stash-like commit"
-msgstr "'$args' 不是贮藏式提交"
-
-#: git-legacy-stash.sh:610
-#, sh-format
-msgid "'$args' is not a stash reference"
-msgstr "'$args' 不是一个贮藏引用"
-
-#: git-legacy-stash.sh:618
-msgid "unable to refresh index"
-msgstr "无法刷新索引"
-
-#: git-legacy-stash.sh:622
-msgid "Cannot apply a stash in the middle of a merge"
-msgstr "无法在合并过程应用贮藏"
-
-#: git-legacy-stash.sh:630
-msgid "Conflicts in index. Try without --index."
-msgstr "索引中有冲突。尝试不使用 --index。"
-
-#: git-legacy-stash.sh:632
-msgid "Could not save index tree"
-msgstr "不能保存索引树"
-
-#: git-legacy-stash.sh:641
-msgid "Could not restore untracked files from stash entry"
-msgstr "无法从贮藏条目中恢复未跟踪文件"
-
-#: git-legacy-stash.sh:666
-msgid "Cannot unstage modified files"
-msgstr "无法将修改的文件取消暂存"
-
-#: git-legacy-stash.sh:704
-#, sh-format
-msgid "Dropped ${REV} ($s)"
-msgstr "丢弃了 ${REV} ($s)"
-
-#: git-legacy-stash.sh:705
-#, sh-format
-msgid "${REV}: Could not drop stash entry"
-msgstr "${REV}：无法丢弃贮藏条目"
-
-#: git-legacy-stash.sh:792
-msgid "(To restore them type \"git stash apply\")"
-msgstr "（为恢复数据输入 \"git stash apply\"）"
-
-#: git-submodule.sh:203
+#: git-submodule.sh:179
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr "只能在工作区的顶级目录中使用相对路径"
-#: git-submodule.sh:213
+#: git-submodule.sh:189
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "仓库 URL：'$repo' 必须是绝对路径或以 ./|../ 起始"
-#: git-submodule.sh:232
+#: git-submodule.sh:208
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' 已经存在于索引中"
-#: git-submodule.sh:235
+#: git-submodule.sh:211
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr "'$sm_path' 已经存在于索引中且不是一个子模组"
-#: git-submodule.sh:242
+#: git-submodule.sh:218
#, sh-format
msgid "'$sm_path' does not have a commit checked out"
msgstr "'$sm_path' 没有检出的提交"
-#: git-submodule.sh:273
+#: git-submodule.sh:249
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "添加位于 '$sm_path' 的现存仓库到索引"
-#: git-submodule.sh:275
+#: git-submodule.sh:251
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
-#: git-submodule.sh:283
+#: git-submodule.sh:259
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr "本地发现 '$sm_name' 的一个 git 目录，与其对应的远程仓库："
-#: git-submodule.sh:285
+#: git-submodule.sh:261
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -23030,51 +24332,51 @@
"使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n"
"或者您不确定这里的含义，使用 '--name' 选项选择另外的名称。"
-#: git-submodule.sh:291
+#: git-submodule.sh:267
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "激活本地 git 目录到子模组 '$sm_name'。"
-#: git-submodule.sh:303
+#: git-submodule.sh:279
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "不能检出子模组 '$sm_path'"
-#: git-submodule.sh:308
+#: git-submodule.sh:284
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "无法添加子模组 '$sm_path'"
-#: git-submodule.sh:317
+#: git-submodule.sh:293
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "无法注册子模组 '$sm_path'"
-#: git-submodule.sh:590
+#: git-submodule.sh:568
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
-#: git-submodule.sh:600
+#: git-submodule.sh:578
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中获取"
-#: git-submodule.sh:605
+#: git-submodule.sh:583
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
-#: git-submodule.sh:623
+#: git-submodule.sh:601
#, sh-format
msgid ""
"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
"$sha1:"
msgstr "无法在子模组路径 '$displaypath' 中获取，尝试直接获取 $sha1："
-#: git-submodule.sh:629
+#: git-submodule.sh:607
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -23082,83 +24384,51 @@
msgstr ""
"获取了子模组路径 '$displaypath'，但是它没有包含 $sha1。直接获取该提交失败。"
-#: git-submodule.sh:636
+#: git-submodule.sh:614
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
-#: git-submodule.sh:637
+#: git-submodule.sh:615
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "子模组路径 '$displaypath'：检出 '$sha1'"
-#: git-submodule.sh:641
+#: git-submodule.sh:619
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
-#: git-submodule.sh:642
+#: git-submodule.sh:620
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "子模组路径 '$displaypath'：变基至 '$sha1'"
-#: git-submodule.sh:647
+#: git-submodule.sh:625
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
-#: git-submodule.sh:648
+#: git-submodule.sh:626
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "子模组路径 '$displaypath'：已合并入 '$sha1'"
-#: git-submodule.sh:653
+#: git-submodule.sh:631
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
-#: git-submodule.sh:654
+#: git-submodule.sh:632
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "子模组 '$displaypath'：'$command $sha1'"
-#: git-submodule.sh:685
+#: git-submodule.sh:663
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "无法递归进子模组路径 '$displaypath'"
-#: git-submodule.sh:896
-msgid "The --cached option cannot be used with the --files option"
-msgstr "选项 --cached 不能和选项 --files 同时使用"
-
-#: git-submodule.sh:948
-#, sh-format
-msgid "unexpected mode $mod_dst"
-msgstr "意外的模式 $mod_dst"
-
-# 译者：注意保持前导空格
-#: git-submodule.sh:968
-#, sh-format
-msgid " Warn: $display_name doesn't contain commit $sha1_src"
-msgstr " 警告：$display_name 未包含提交 $sha1_src"
-
-# 译者：注意保持前导空格
-#: git-submodule.sh:971
-#, sh-format
-msgid " Warn: $display_name doesn't contain commit $sha1_dst"
-msgstr " 警告：$display_name 未包含提交 $sha1_dst"
-
-# 译者：注意保持前导空格
-#: git-submodule.sh:974
-#, sh-format
-msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
-msgstr " 警告：$display_name 未包含提交 $sha1_src 和 $sha1_dst"
-
-#: git-parse-remote.sh:89
-#, sh-format
-msgid "See git-${cmd}(1) for details."
-msgstr "详见 git-${cmd}(1)。"
-
#: git-rebase--preserve-merges.sh:109
msgid "Applied autostash."
msgstr "已应用 autostash。"
@@ -23168,12 +24438,22 @@
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"
@@ -23211,7 +24491,7 @@
"\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"
@@ -23230,83 +24510,83 @@
"\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"
@@ -23319,32 +24599,32 @@
"这通常是因为空的提交说明，或者 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"
@@ -23355,7 +24635,7 @@
"\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"
@@ -23369,25 +24649,25 @@
"\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"
@@ -23416,55 +24696,55 @@
"\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:955
+#: git-rebase--preserve-merges.sh:945
msgid "Note that empty commits are commented out"
msgstr "注意空提交已被注释掉"
-#: 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 "不能对重写提交进行初始化"
@@ -23531,51 +24811,51 @@
msgid "%12s %12s %s"
msgstr "%12s %12s %s"
-#: git-add--interactive.perl:634
+#: git-add--interactive.perl:632
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] "触碰了 %d 个路径\n"
msgstr[1] "触碰了 %d 个路径\n"
-#: git-add--interactive.perl:1053
+#: git-add--interactive.perl:1056
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
msgstr "如果补丁能干净地应用，编辑块将立即标记为暂存。"
-#: git-add--interactive.perl:1056
+#: git-add--interactive.perl:1059
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
msgstr "如果补丁能干净地应用，编辑块将立即标记为贮藏。"
-#: git-add--interactive.perl:1059
+#: git-add--interactive.perl:1062
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
msgstr "如果补丁能干净地应用，编辑块将立即标记为未暂存。"
-#: git-add--interactive.perl:1062 git-add--interactive.perl:1071
-#: git-add--interactive.perl:1077
+#: git-add--interactive.perl:1065 git-add--interactive.perl:1074
+#: git-add--interactive.perl:1080
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
msgstr "如果补丁能干净地应用，编辑块将立即标记为应用。"
-#: git-add--interactive.perl:1065 git-add--interactive.perl:1068
-#: git-add--interactive.perl:1074
+#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
+#: git-add--interactive.perl:1077
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
msgstr "如果补丁能干净地应用，编辑块将立即标记为丢弃。"
-#: git-add--interactive.perl:1111
+#: git-add--interactive.perl:1114
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr "为写入打开块编辑文件失败：%s"
-#: git-add--interactive.perl:1118
+#: git-add--interactive.perl:1121
#, perl-format
msgid ""
"---\n"
@@ -23588,12 +24868,12 @@
"要删除 '%s' 开始的行，删除它们。\n"
"以 %s 开始的行将被删除。\n"
-#: git-add--interactive.perl:1140
+#: git-add--interactive.perl:1143
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr "无法读取块编辑文件：%s"
-#: git-add--interactive.perl:1248
+#: git-add--interactive.perl:1251
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -23607,7 +24887,7 @@
"a - 暂存该块和本文件中后面的全部块\n"
"d - 不暂存该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1254
+#: git-add--interactive.perl:1257
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -23621,7 +24901,7 @@
"a - 贮藏该块和本文件中后面的全部块\n"
"d - 不贮藏该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1260
+#: git-add--interactive.perl:1263
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -23635,7 +24915,7 @@
"a - 不暂存该块和本文件中后面的全部块\n"
"d - 不要不暂存该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1266
+#: git-add--interactive.perl:1269
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -23649,7 +24929,7 @@
"a - 应用该块和本文件中后面的全部块\n"
"d - 不要应用该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1272 git-add--interactive.perl:1290
+#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -23663,7 +24943,7 @@
"a - 丢弃该块和本文件中后面的全部块\n"
"d - 不要丢弃该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1278
+#: git-add--interactive.perl:1281
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -23677,7 +24957,7 @@
"a - 丢弃该块和本文件中后面的全部块\n"
"d - 不要丢弃该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1284
+#: git-add--interactive.perl:1287
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -23691,7 +24971,7 @@
"a - 应用该块和本文件中后面的全部块\n"
"d - 不要应用该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1296
+#: git-add--interactive.perl:1299
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -23705,7 +24985,7 @@
"a - 应用该块和本文件中后面的全部块\n"
"d - 不要应用该块和本文件中后面的全部块"
-#: git-add--interactive.perl:1311
+#: git-add--interactive.perl:1314
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -23727,85 +25007,90 @@
"e - 手动编辑当前块\n"
"? - 显示帮助\n"
-#: git-add--interactive.perl:1342
+#: git-add--interactive.perl:1345
msgid "The selected hunks do not apply to the index!\n"
msgstr "选中的块不能应用到索引！\n"
-#: git-add--interactive.perl:1357
+#: git-add--interactive.perl:1360
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "忽略未合入的：%s\n"
-#: git-add--interactive.perl:1468
+#: git-add--interactive.perl:1479
#, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr "将模式变更应用到工作区 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1469
+#: git-add--interactive.perl:1480
#, perl-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
msgstr "将删除操作应用到工作区 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1470
+#: git-add--interactive.perl:1481
+#, perl-format
+msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
+msgstr "将添加操作应用到工作区 [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1482
#, perl-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr "将该块应用到工作区 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1570
+#: git-add--interactive.perl:1599
msgid "No other hunks to goto\n"
msgstr "没有其它可供跳转的块\n"
-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1617
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "无效数字：'%s'\n"
-#: git-add--interactive.perl:1593
+#: git-add--interactive.perl:1622
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "对不起，只有 %d 个可用块。\n"
msgstr[1] "对不起，只有 %d 个可用块。\n"
-#: git-add--interactive.perl:1619
+#: git-add--interactive.perl:1657
msgid "No other hunks to search\n"
msgstr "没有其它可供查找的块\n"
-#: git-add--interactive.perl:1636
+#: git-add--interactive.perl:1674
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "错误的正则表达式 %s：%s\n"
-#: git-add--interactive.perl:1646
+#: git-add--interactive.perl:1684
msgid "No hunk matches the given pattern\n"
msgstr "没有和给定模式相匹配的块\n"
-#: git-add--interactive.perl:1658 git-add--interactive.perl:1680
+#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
msgid "No previous hunk\n"
msgstr "没有前一个块\n"
-#: git-add--interactive.perl:1667 git-add--interactive.perl:1686
+#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
msgid "No next hunk\n"
msgstr "没有下一个块\n"
-#: git-add--interactive.perl:1692
+#: git-add--interactive.perl:1730
msgid "Sorry, cannot split this hunk\n"
msgstr "对不起，不能拆分这个块\n"
-#: git-add--interactive.perl:1698
+#: git-add--interactive.perl:1736
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "拆分为 %d 块。\n"
msgstr[1] "拆分为 %d 块。\n"
-#: git-add--interactive.perl:1708
+#: git-add--interactive.perl:1746
msgid "Sorry, cannot edit this hunk\n"
msgstr "对不起，不能编辑这个块\n"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1773
+#: git-add--interactive.perl:1811
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
@@ -23822,19 +25107,19 @@
"diff - 显示 HEAD 和索引间差异\n"
"add untracked - 添加未跟踪文件的内容至暂存列表\n"
-#: git-add--interactive.perl:1790 git-add--interactive.perl:1795
-#: git-add--interactive.perl:1798 git-add--interactive.perl:1805
-#: git-add--interactive.perl:1808 git-add--interactive.perl:1815
-#: git-add--interactive.perl:1819 git-add--interactive.perl:1825
+#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
+#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
+#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
+#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
msgid "missing --"
msgstr "缺失 --"
-#: git-add--interactive.perl:1821
+#: git-add--interactive.perl:1866
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "未知的 --patch 模式：%s"
-#: git-add--interactive.perl:1827 git-add--interactive.perl:1833
+#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "无效的参数 %s，期望是 --"
@@ -23851,62 +25136,72 @@
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"
@@ -23921,12 +25216,12 @@
" * 如果含义为一个文件，使用 \"./%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"
@@ -23935,7 +25230,7 @@
"致命错误：%s：%s\n"
"警告：补丁未能发送\n"
-#: git-send-email.perl:705
+#: git-send-email.perl:713
msgid ""
"\n"
"No patch files specified!\n"
@@ -23945,17 +25240,17 @@
"未指定补丁文件！\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"
@@ -23968,37 +25263,37 @@
"\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"
@@ -24010,20 +25305,20 @@
"\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"
@@ -24031,16 +25326,16 @@
#. 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"
@@ -24065,128 +25360,128 @@
#. 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/po/zh_TW.po b/po/zh_TW.po
index 5efe496..a0a23a9 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -17,371 +17,528 @@
# - Zhuang Ya <zhuangya AT me.com>
#
# Git glossary for Chinese translators
+# updated on 5/23/2020
#
-# English | Chinese
-# ---------------------------------+--------------------------------------
-# 3-way merge | 三方合併
-# abbreviate | 簡寫（的 SHA-1 值）
-# alternate object database | 備用物件庫
-# amend | 修補
-# ancestor | 祖先，祖先提交
-# annotated tag | 附註標籤
-# bare repository | 純版本庫
-# bisect | 二分尋找
-# blob object | 資料物件
-# branch | 分支
-# bundle | 包
-# bypass | 繞過
-# cache | 索引（的別稱）
-# chain | （提交）鏈
-# changeset | 變更集
-# checkout | 簽出
-# checksum | 校驗，校驗和
-# cherry-picking | 揀選
-# clean | 乾淨（的工作區）
-# clone | 複製
-# commit | 提交
-# commit message | 提交說明
-# commit object | 提交物件
-# commit-ish (also committish) | 提交號
-# conflict | 衝突
-# core Git | 核心 Git 工具
-# cover letter | 附函
-# DAG | 有向無環圖
-# dangling object | 懸空物件
-# detached HEAD | 分離開頭指標
-# directory | 目錄
-# dirty | 髒（的工作區）
-# dumb HTTP protocol | 啞 HTTP 協定
-# evil merge | 壞合併（合併引入了父提交沒有的修改）
-# fast-forward | 快轉
-# fetch | 取得
-# file system | 檔案系統
-# fork | 衍生
-# Git archive | 版本庫（對於 arch 使用者）
-# gitfile | gitfile（版本庫連結檔案）
-# grafts | （提交）移植
-# hash | 雜湊值
-# HEAD | HEAD（開頭指標，亦即目前分支）
-# head | 頭、分支
-# head ref | 分支
-# header | 標頭訊息
-# hook | 掛鉤
-# hunk | 修補檔片段
-# index | 索引
-# index entry | 索引條目
-# loose object | 鬆散物件
-# loose refs | 鬆散引用
-# master | master（預設分支名）
-# merge | 合併
-# object | 物件
-# object database | 物件庫
-# object identifier | 物件識別元
-# object name | 物件名稱
-# object type | 物件類型
-# octopus | 章魚式合併（兩分支以上的合併）
-# origin | origin（預設的遠端名稱）
-# pack | 包
-# pack index | 包索引
-# packfile | 包檔案
-# parent | 父提交
-# patch | 修補檔
-# pathspec | 路徑規格
-# pattern | 模式
-# pickaxe | 挖掘
-# plumbing | 管件（Git 底層核心指令的別稱）
-# porcelain | 瓷件（Git 上層封裝指令的別稱）
-# precious-objects repo | 珍品版本庫
-# prune | 清除
-# pull | 拉，拉取
-# push | 推，推送
-# reachable | 可以取得
-# rebase | 重定基底
-# ref | 引用
-# reflog | 引用日誌
-# refspec | 引用規格
-# remote | 遠端，遠端版本庫
-# remote-tracking branch | 遠端追蹤分支
-# replay | 重放
-# repo | 版本庫
-# repository | 版本庫
-# resolve | （衝突）解決
-# revert | 還原提交
-# revision | 版本
-# rewind | 還原 (Fuzzy)
-# SCM | 原始碼管理（工具）
-# SHA-1 | SHA-1（安全雜湊演算法1）
-# shallow repository | 淺（複製）版本庫
-# signed tag | 簽名標籤
-# smart HTTP protocol | 智慧 HTTP 協定
-# squash | 壓縮
-# stage | n. 暫存區（即索引）; v. 暫存
-# stash | n. 儲藏區; v. 儲藏
-# submodule | 子模組
-# symref | 符號引用
-# tag | n. 標籤; v. 打標籤
-# tag object | 標籤物件
-# tagger | 打標籤者
-# topic branch | 主題分支
-# track | 追蹤
-# trailer | 尾部署名
-# tree | 樹（工作區或樹狀物件）
-# tree object | 樹狀物件
-# tree-ish (also treeish) | 樹狀物件（或可以解析為一樹狀物件）
-# unmerged index | 未合併索引
-# unpack | 解包
-# unreachable object | 無法取得物件
-# unstage | 取消暫存
-# upstream | 上游
-# upstream branch | 上游分支
-# working tree | 工作區
+# 原文 翻譯
+# 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-03-11 15:26+0800\n"
-"PO-Revision-Date: 2020-03-15 01:48+0800\n"
+"POT-Creation-Date: 2021-03-04 22:41+0800\n"
+"PO-Revision-Date: 2021-03-06 02:21+0800\n"
"Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"
-"Language-Team: Chinese (traditional) <zh-l10n@lists.linux.org.tw>\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.2\n"
"X-ZhConverter: 繁化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://"
"zhconvert.org\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 2.3\n"
-#: add-interactive.c:368
+#: add-interactive.c:376
#, c-format
msgid "Huh (%s)?"
msgstr "嗯（%s）？"
-#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124
-#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687
-#: builtin/rebase.c:2086 builtin/rebase.c:2130
+#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3292
+#: sequencer.c:3743 sequencer.c:3898 builtin/rebase.c:1538
+#: builtin/rebase.c:1963
msgid "could not read index"
-msgstr "不能讀取索引"
+msgstr "無法讀取索引"
-#: add-interactive.c:576 git-add--interactive.perl:269
+#: add-interactive.c:584 git-add--interactive.perl:269
#: git-add--interactive.perl:294
msgid "binary"
msgstr "二進位"
-#: add-interactive.c:634 git-add--interactive.perl:278
+#: add-interactive.c:642 git-add--interactive.perl:278
#: git-add--interactive.perl:332
msgid "nothing"
msgstr "無"
-#: add-interactive.c:635 git-add--interactive.perl:314
+#: add-interactive.c:643 git-add--interactive.perl:314
#: git-add--interactive.perl:329
msgid "unchanged"
-msgstr "沒有修改"
+msgstr "未變更"
-#: add-interactive.c:672 git-add--interactive.perl:643
+#: add-interactive.c:680 git-add--interactive.perl:641
msgid "Update"
msgstr "更新"
-#: add-interactive.c:689 add-interactive.c:877
+#: add-interactive.c:697 add-interactive.c:885
#, c-format
msgid "could not stage '%s'"
-msgstr "不能暫存 '%s'"
+msgstr "無法暫存「%s」"
-#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317
-#: builtin/rebase.c:899
+#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3486
msgid "could not write index"
-msgstr "不能寫入索引"
+msgstr "無法寫入索引"
-#: add-interactive.c:698 git-add--interactive.perl:628
+#: add-interactive.c:706 git-add--interactive.perl:626
#, c-format, perl-format
msgid "updated %d path\n"
msgid_plural "updated %d paths\n"
-msgstr[0] "更新了 %d 個路徑\n"
+msgstr[0] "已更新 %d 個路徑\n"
-#: add-interactive.c:716 git-add--interactive.perl:678
+#: add-interactive.c:724 git-add--interactive.perl:676
#, c-format, perl-format
msgid "note: %s is untracked now.\n"
-msgstr "說明：%s 現已成為未追蹤的。\n"
+msgstr "注意：%s 現已不再追蹤。\n"
-#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281
-#: builtin/reset.c:144
+#: add-interactive.c:729 apply.c:4125 builtin/checkout.c:295
+#: builtin/reset.c:145
#, c-format
msgid "make_cache_entry failed for path '%s'"
-msgstr "對路徑 '%s' 的 make_cache_entry 動作失敗"
+msgstr "「%s」路徑執行 make_cache_entry 失敗"
-#: add-interactive.c:751 git-add--interactive.perl:655
+#: add-interactive.c:759 git-add--interactive.perl:653
msgid "Revert"
msgstr "還原"
-#: add-interactive.c:767
+#: add-interactive.c:775
msgid "Could not parse HEAD^{tree}"
msgstr "不能解析 HEAD^{樹}"
-#: add-interactive.c:805 git-add--interactive.perl:631
+#: add-interactive.c:813 git-add--interactive.perl:629
#, 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
+#: add-interactive.c:864 git-add--interactive.perl:693
#, c-format
msgid "No untracked files.\n"
msgstr "沒有未追蹤的檔案。\n"
-#: add-interactive.c:860 git-add--interactive.perl:689
+#: add-interactive.c:868 git-add--interactive.perl:687
msgid "Add untracked"
msgstr "新增未追蹤的"
-#: add-interactive.c:887 git-add--interactive.perl:625
+#: add-interactive.c:895 git-add--interactive.perl:623
#, c-format, perl-format
msgid "added %d path\n"
msgid_plural "added %d paths\n"
msgstr[0] "增加了 %d 個路徑\n"
-#: add-interactive.c:917
+#: add-interactive.c:925
#, c-format
msgid "ignoring unmerged: %s"
msgstr "忽略未合併：%s"
-#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366
+#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369
#, c-format
msgid "Only binary files changed.\n"
msgstr "只有二進位檔案被修改。\n"
-#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368
+#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371
#, c-format
msgid "No changes.\n"
msgstr "沒有修改。\n"
-#: add-interactive.c:935 git-add--interactive.perl:1376
+#: add-interactive.c:943 git-add--interactive.perl:1379
msgid "Patch update"
msgstr "修補檔更新"
-#: add-interactive.c:974 git-add--interactive.perl:1754
+#: add-interactive.c:982 git-add--interactive.perl:1792
msgid "Review diff"
msgstr "檢視 diff"
-#: add-interactive.c:1002
+#: add-interactive.c:1010
msgid "show paths with changes"
msgstr "顯示有變更的路徑"
-#: add-interactive.c:1004
+#: add-interactive.c:1012
msgid "add working tree state to the staged set of changes"
msgstr "加入工作區狀態至暫存列表"
-#: add-interactive.c:1006
+#: add-interactive.c:1014
msgid "revert staged set of changes back to the HEAD version"
msgstr "還原修改的暫存集至 HEAD 版本"
-#: add-interactive.c:1008
+#: add-interactive.c:1016
msgid "pick hunks and update selectively"
msgstr "挑選區塊並選擇性更新"
-#: add-interactive.c:1010
+#: add-interactive.c:1018
msgid "view diff between HEAD and index"
msgstr "檢視 HEAD 及索引之間的差異"
-#: add-interactive.c:1012
+#: add-interactive.c:1020
msgid "add contents of untracked files to the staged set of changes"
msgstr "加入未追蹤檔案的內容至暫存列表"
-#: add-interactive.c:1020 add-interactive.c:1069
+#: add-interactive.c:1028 add-interactive.c:1077
msgid "Prompt help:"
msgstr "提示說明："
-#: add-interactive.c:1022
+#: add-interactive.c:1030
msgid "select a single item"
msgstr "選擇單一項目"
-#: add-interactive.c:1024
+#: add-interactive.c:1032
msgid "select a range of items"
msgstr "選擇項目範圍"
-#: add-interactive.c:1026
+#: add-interactive.c:1034
msgid "select multiple ranges"
msgstr "選擇多個範圍"
-#: add-interactive.c:1028 add-interactive.c:1073
+#: add-interactive.c:1036 add-interactive.c:1081
msgid "select item based on unique prefix"
msgstr "基於唯一前綴選擇項目"
-#: add-interactive.c:1030
+#: add-interactive.c:1038
msgid "unselect specified items"
msgstr "取消選擇指定項目"
-#: add-interactive.c:1032
+#: add-interactive.c:1040
msgid "choose all items"
msgstr "選擇所有項目"
-#: add-interactive.c:1034
+#: add-interactive.c:1042
msgid "(empty) finish selecting"
msgstr "（空）完成選取"
-#: add-interactive.c:1071
+#: add-interactive.c:1079
msgid "select a numbered item"
msgstr "選擇編號過的項目"
-#: add-interactive.c:1075
+#: add-interactive.c:1083
msgid "(empty) select nothing"
msgstr "（空）全不選取"
-#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851
+#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
msgid "*** Commands ***"
msgstr "*** 指令 ***"
-#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848
+#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
msgid "What now"
msgstr "請選擇"
-#: add-interactive.c:1136 git-add--interactive.perl:213
+#: add-interactive.c:1144 git-add--interactive.perl:213
msgid "staged"
msgstr "快取"
-#: add-interactive.c:1136 git-add--interactive.perl:213
+#: add-interactive.c:1144 git-add--interactive.perl:213
msgid "unstaged"
msgstr "未快取"
-#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251
-#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144
-#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409
-#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
-#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
-#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213
+#: add-interactive.c:1144 apply.c:4987 apply.c:4990 builtin/am.c:2257
+#: builtin/am.c:2260 builtin/bugreport.c:134 builtin/clone.c:124
+#: builtin/fetch.c:150 builtin/merge.c:285 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
+#: add-interactive.c:1151
msgid "could not refresh index"
msgstr "無法重新整理索引"
-#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765
+#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803
#, c-format
msgid "Bye.\n"
msgstr "再見。\n"
-#: add-patch.c:33 git-add--interactive.perl:1428
+#: add-patch.c:34 git-add--interactive.perl:1431
#, c-format, perl-format
msgid "Stage mode change [y,n,q,a,d%s,?]? "
msgstr "暫存模式變更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:34 git-add--interactive.perl:1429
+#: add-patch.c:35 git-add--interactive.perl:1432
#, c-format, perl-format
msgid "Stage deletion [y,n,q,a,d%s,?]? "
-msgstr "暫存刪除動作 [y,n,q,a,d%s,?]? "
+msgstr "暫存刪除變更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:35 git-add--interactive.perl:1430
+#: add-patch.c:36 git-add--interactive.perl:1433
+#, 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:1434
#, c-format, perl-format
msgid "Stage this hunk [y,n,q,a,d%s,?]? "
msgstr "暫存此區塊 [y,n,q,a,d%s,?]? "
-#: add-patch.c:37
+#: add-patch.c:39
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"staging."
msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為暫存。"
-#: add-patch.c:40
+#: add-patch.c:42
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -395,28 +552,33 @@
"a - 暫存此區塊和本檔案中後面的全部區塊\n"
"d - 不暫存此區塊和本檔案中後面的全部區塊\n"
-#: add-patch.c:54 git-add--interactive.perl:1433
+#: add-patch.c:56 git-add--interactive.perl:1437
#, c-format, perl-format
msgid "Stash mode change [y,n,q,a,d%s,?]? "
msgstr "儲藏模式變更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:55 git-add--interactive.perl:1434
+#: add-patch.c:57 git-add--interactive.perl:1438
#, c-format, perl-format
msgid "Stash deletion [y,n,q,a,d%s,?]? "
-msgstr "儲藏刪除動作 [y,n,q,a,d%s,?]? "
+msgstr "儲藏刪除變更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:56 git-add--interactive.perl:1435
+#: add-patch.c:58 git-add--interactive.perl:1439
+#, 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:1440
#, c-format, perl-format
msgid "Stash this hunk [y,n,q,a,d%s,?]? "
msgstr "儲藏此區塊 [y,n,q,a,d%s,?]? "
-#: add-patch.c:58
+#: add-patch.c:61
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"stashing."
msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為儲藏。"
-#: add-patch.c:61
+#: add-patch.c:64
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -430,28 +592,33 @@
"a - 儲藏此區塊和本檔案中後面的全部區塊\n"
"d - 不儲藏此區塊和本檔案中後面的全部區塊\n"
-#: add-patch.c:77 git-add--interactive.perl:1438
+#: add-patch.c:80 git-add--interactive.perl:1443
#, c-format, perl-format
msgid "Unstage mode change [y,n,q,a,d%s,?]? "
msgstr "取消暫存模式變更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:78 git-add--interactive.perl:1439
+#: add-patch.c:81 git-add--interactive.perl:1444
#, c-format, perl-format
msgid "Unstage deletion [y,n,q,a,d%s,?]? "
-msgstr "取消暫存刪除動作 [y,n,q,a,d%s,?]? "
+msgstr "取消暫存刪除變更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:79 git-add--interactive.perl:1440
+#: add-patch.c:82 git-add--interactive.perl:1445
+#, 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:1446
#, c-format, perl-format
msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
msgstr "取消暫存此區塊 [y,n,q,a,d%s,?]? "
-#: add-patch.c:81
+#: add-patch.c:85
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be marked for "
"unstaging."
msgstr "如果修補檔能乾淨地套用，編輯區塊將立即標記為未暫存。"
-#: add-patch.c:84
+#: add-patch.c:88
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -465,28 +632,33 @@
"a - 不暫存此區塊和本檔案中後面的全部區塊\n"
"d - 不要不暫存此區塊和本檔案中後面的全部區塊\n"
-#: add-patch.c:99 git-add--interactive.perl:1443
+#: add-patch.c:103 git-add--interactive.perl:1449
#, c-format, perl-format
msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
msgstr "將模式變更套用到索引 [y,n,q,a,d%s,?]? "
-#: add-patch.c:100 git-add--interactive.perl:1444
+#: add-patch.c:104 git-add--interactive.perl:1450
#, c-format, perl-format
msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
-msgstr "將刪除動作套用到索引 [y,n,q,a,d%s,?]? "
+msgstr "將刪除變更套用到索引 [y,n,q,a,d%s,?]? "
-#: add-patch.c:101 git-add--interactive.perl:1445
+#: add-patch.c:105 git-add--interactive.perl:1451
+#, 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:1452
#, c-format, perl-format
msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
msgstr "將此區塊套用到索引 [y,n,q,a,d%s,?]? "
-#: add-patch.c:103 add-patch.c:168 add-patch.c:211
+#: 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:106
+#: add-patch.c:111
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -500,31 +672,37 @@
"a - 套用此區塊和本檔案中後面的全部區塊\n"
"d - 不要套用此區塊和本檔案中後面的全部區塊\n"
-#: add-patch.c:121 git-add--interactive.perl:1448
-#: git-add--interactive.perl:1463
+#: add-patch.c:126 git-add--interactive.perl:1455
+#: git-add--interactive.perl:1473
#, c-format, perl-format
msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
msgstr "從工作區中捨棄模式變更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:122 git-add--interactive.perl:1449
-#: git-add--interactive.perl:1464
+#: add-patch.c:127 git-add--interactive.perl:1456
+#: git-add--interactive.perl:1474
#, c-format, perl-format
msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
-msgstr "從工作區中捨棄刪除動作 [y,n,q,a,d%s,?]? "
+msgstr "從工作區中捨棄刪除變更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:123 git-add--interactive.perl:1450
-#: git-add--interactive.perl:1465
+#: add-patch.c:128 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
+#, 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:1458
+#: git-add--interactive.perl:1476
#, c-format, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
msgstr "從工作區中捨棄此區塊 [y,n,q,a,d%s,?]? "
-#: add-patch.c:125 add-patch.c:147 add-patch.c:190
+#: 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:128 add-patch.c:193
+#: 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"
@@ -538,22 +716,27 @@
"a - 捨棄此區塊和本檔案中後面的全部區塊\n"
"d - 不要捨棄此區塊和本檔案中後面的全部區塊\n"
-#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
#, c-format, perl-format
msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
msgstr "從索引和工作區中捨棄模式變更 [y,n,q,a,d%s,?]? "
-#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
#, c-format, perl-format
msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
msgstr "從索引和工作區中捨棄刪除 [y,n,q,a,d%s,?]? "
-#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#, 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:1464
#, c-format, perl-format
msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
msgstr "從索引和工作區中捨棄此區塊 [y,n,q,a,d%s,?]? "
-#: add-patch.c:150
+#: 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"
@@ -567,22 +750,27 @@
"a - 捨棄此區塊和本檔案中後面的全部區塊\n"
"d - 不要捨棄此區塊和本檔案中後面的全部區塊\n"
-#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
#, c-format, perl-format
msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
msgstr "將模式變更套用到索引和工作區 [y,n,q,a,d%s,?]? "
-#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
#, c-format, perl-format
msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "將刪除動作套用到索引和工作區 [y,n,q,a,d%s,?]? "
+msgstr "將刪除變更套用到索引和工作區 [y,n,q,a,d%s,?]? "
-#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#, 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:1470
#, c-format, perl-format
msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
msgstr "將此區塊套用到索引和工作區 [y,n,q,a,d%s,?]? "
-#: add-patch.c:171
+#: 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"
@@ -596,7 +784,7 @@
"a - 套用此區塊和本檔案中後面的全部區塊\n"
"d - 不要套用此區塊和本檔案中後面的全部區塊\n"
-#: add-patch.c:214
+#: add-patch.c:224
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -610,40 +798,40 @@
"a - 套用此區塊和本檔案中後面的全部區塊\n"
"d - 不要套用此區塊和本檔案中後面的全部區塊\n"
-#: add-patch.c:318
+#: add-patch.c:342
#, c-format
msgid "could not parse hunk header '%.*s'"
msgstr "無法解析區塊標頭 '%.*s'"
-#: add-patch.c:337 add-patch.c:341
+#: add-patch.c:361 add-patch.c:365
#, c-format
msgid "could not parse colored hunk header '%.*s'"
msgstr "無法解析上色過的區塊標頭 '%.*s'"
-#: add-patch.c:395
+#: add-patch.c:419
msgid "could not parse diff"
msgstr "無法解析差異 (diff)"
-#: add-patch.c:414
+#: add-patch.c:438
msgid "could not parse colored diff"
msgstr "無法解析上色過的差異 (diff)"
-#: add-patch.c:428
+#: add-patch.c:452
#, c-format
msgid "failed to run '%s'"
msgstr "無法執行 '%s'"
-#: add-patch.c:587
+#: add-patch.c:611
msgid "mismatched output from interactive.diffFilter"
msgstr "interactive.diffFilter 的輸出不符"
-#: add-patch.c:588
+#: 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:761
+#: add-patch.c:790
#, c-format
msgid ""
"expected context line #%d in\n"
@@ -652,7 +840,7 @@
"應有上下文行 #%d 於\n"
"%.*s"
-#: add-patch.c:776
+#: add-patch.c:805
#, c-format
msgid ""
"hunks do not overlap:\n"
@@ -665,11 +853,11 @@
"\t不以下述結尾：\n"
"%.*s"
-#: add-patch.c:1052 git-add--interactive.perl:1112
+#: add-patch.c:1081 git-add--interactive.perl:1115
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
msgstr "手動區塊編輯模式 -- 檢視底部的快速指南。\n"
-#: add-patch.c:1056
+#: add-patch.c:1085
#, c-format
msgid ""
"---\n"
@@ -683,7 +871,7 @@
"以 %c 開始的行將被刪除。\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: add-patch.c:1070 git-add--interactive.perl:1126
+#: add-patch.c:1099 git-add--interactive.perl:1129
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"
@@ -692,11 +880,11 @@
"如果不能乾淨地套用，您將有機會重新編輯。如果此區塊的全部內容刪除，則\n"
"此次編輯被終止，此區塊不會被修改。\n"
-#: add-patch.c:1103
+#: add-patch.c:1132
msgid "could not parse hunk header"
msgstr "無法解析區塊標頭"
-#: add-patch.c:1148
+#: add-patch.c:1177
msgid "'git apply --cached' failed"
msgstr "「git apply --cached」失敗"
@@ -712,24 +900,24 @@
#. Consider translating (saying "no" discards!) as
#. (saying "n" for "no" discards!) if the translation
#. of the word "no" does not start with n.
-#: add-patch.c:1218 git-add--interactive.perl:1239
+#: add-patch.c:1246 git-add--interactive.perl:1242
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr "您的編輯塊不能被應用。重新編輯（選擇 \"no\" 捨棄！） [y/n]? "
-#: add-patch.c:1261
+#: add-patch.c:1289
msgid "The selected hunks do not apply to the index!"
msgstr "選取的區塊不會套用進索引！"
-#: add-patch.c:1262 git-add--interactive.perl:1343
+#: add-patch.c:1290 git-add--interactive.perl:1346
msgid "Apply them to the worktree anyway? "
msgstr "無論如何都要套用到工作區嗎？"
-#: add-patch.c:1269 git-add--interactive.perl:1346
+#: add-patch.c:1297 git-add--interactive.perl:1349
msgid "Nothing was applied.\n"
msgstr "未套用。\n"
-#: add-patch.c:1326
+#: add-patch.c:1354
msgid ""
"j - leave this hunk undecided, see next undecided hunk\n"
"J - leave this hunk undecided, see next hunk\n"
@@ -751,102 +939,111 @@
"e - 手動編輯目前區塊\n"
"? - 顯示說明\n"
-#: add-patch.c:1447 add-patch.c:1457
+#: add-patch.c:1516 add-patch.c:1526
msgid "No previous hunk"
msgstr "沒有上一個區塊"
-#: add-patch.c:1452 add-patch.c:1462
+#: add-patch.c:1521 add-patch.c:1531
msgid "No next hunk"
msgstr "沒有下一個區塊"
-#: add-patch.c:1468
+#: add-patch.c:1537
msgid "No other hunks to goto"
msgstr "沒有其它可供跳轉的區塊"
-#: add-patch.c:1479 git-add--interactive.perl:1577
+#: add-patch.c:1548 git-add--interactive.perl:1606
msgid "go to which hunk (<ret> to see more)? "
msgstr "跳轉到哪個區塊（<Enter> 檢視更多）？ "
-#: add-patch.c:1480 git-add--interactive.perl:1579
+#: add-patch.c:1549 git-add--interactive.perl:1608
msgid "go to which hunk? "
msgstr "跳轉到哪個區塊？"
-#: add-patch.c:1491
+#: add-patch.c:1560
#, c-format
msgid "Invalid number: '%s'"
msgstr "無效數字：'%s'"
-#: add-patch.c:1496
+#: add-patch.c:1565
#, c-format
msgid "Sorry, only %d hunk available."
msgid_plural "Sorry, only %d hunks available."
msgstr[0] "對不起，只有 %d 個可用區塊。"
-#: add-patch.c:1505
+#: add-patch.c:1574
msgid "No other hunks to search"
msgstr "沒有其它可供尋找的區塊"
-#: add-patch.c:1511 git-add--interactive.perl:1623
+#: add-patch.c:1580 git-add--interactive.perl:1661
msgid "search for regex? "
msgstr "使用正規表示式搜尋？"
-#: add-patch.c:1526
+#: add-patch.c:1595
#, c-format
msgid "Malformed search regexp %s: %s"
msgstr "錯誤的正規表示式 %s：%s"
-#: add-patch.c:1543
+#: add-patch.c:1612
msgid "No hunk matches the given pattern"
msgstr "沒有和提供模式相符合的區塊"
-#: add-patch.c:1550
+#: add-patch.c:1619
msgid "Sorry, cannot split this hunk"
msgstr "對不起，不能分割這個區塊"
-#: add-patch.c:1554
+#: add-patch.c:1623
#, c-format
msgid "Split into %d hunks."
msgstr "分割為 %d 塊。"
-#: add-patch.c:1558
+#: add-patch.c:1627
msgid "Sorry, cannot edit this hunk"
msgstr "對不起，不能編輯這個區塊"
-#: add-patch.c:1609
+#: add-patch.c:1679
msgid "'git apply' failed"
msgstr "'git apply' 失敗"
-#: advice.c:115
+#: advice.c:143
+#, c-format
+msgid ""
+"\n"
+"Disable this message with \"git config advice.%s false\""
+msgstr ""
+"\n"
+"請使用「git config advice.%s false」來停用此訊息"
+
+#: advice.c:159
#, c-format
msgid "%shint: %.*s%s\n"
msgstr "%s提示：%.*s%s\n"
-#: advice.c:168
+#: advice.c:250
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "無法揀選，因為您有未合併的檔案。"
-#: advice.c:170
+#: advice.c:252
msgid "Committing is not possible because you have unmerged files."
msgstr "無法提交，因為您有未合併的檔案。"
-#: advice.c:172
+#: advice.c:254
msgid "Merging is not possible because you have unmerged files."
msgstr "無法合併，因為您有未合併的檔案。"
-#: advice.c:174
+#: advice.c:256
msgid "Pulling is not possible because you have unmerged files."
msgstr "無法拉取，因為您有未合併的檔案。"
-#: advice.c:176
+#: advice.c:258
msgid "Reverting is not possible because you have unmerged files."
msgstr "無法還原提交，因為您有未合併的檔案。"
-#: advice.c:178
+#: advice.c:260
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "無法 %s，因為您有未合併的檔案。"
-#: advice.c:186
+#: advice.c:268
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
@@ -854,23 +1051,23 @@
"請在工作區改正檔案，然後酌情使用 'git add/rm <檔案>' 指令標記\n"
"解決方案並提交。"
-#: advice.c:194
+#: advice.c:276
msgid "Exiting because of an unresolved conflict."
msgstr "因為存在未解決的衝突而離開。"
-#: advice.c:199 builtin/merge.c:1335
+#: advice.c:281 builtin/merge.c:1370
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "您尚未結束您的合併（存在 MERGE_HEAD）。"
-#: advice.c:201
+#: advice.c:283
msgid "Please, commit your changes before merging."
msgstr "請在合併前先提交您的修改。"
-#: advice.c:202
+#: advice.c:284
msgid "Exiting because of unfinished merge."
msgstr "因為存在未完成的合併而離開。"
-#: advice.c:208
+#: advice.c:290
#, c-format
msgid ""
"Note: switching to '%s'.\n"
@@ -921,12 +1118,12 @@
#: apply.c:69
#, c-format
msgid "unrecognized whitespace option '%s'"
-msgstr "未能識別的空白字元選項 '%s'"
+msgstr "無法識別的空白字元選項 '%s'"
#: apply.c:85
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
-msgstr "未能識別的空白字元忽略選項 '%s'"
+msgstr "無法識別的空白字元忽略選項 '%s'"
#: apply.c:135
msgid "--reject and --3way cannot be used together."
@@ -1054,7 +1251,7 @@
#: apply.c:2015
#, c-format
msgid "unrecognized binary patch at line %d"
-msgstr "未能識別的二進位修補檔位於第 %d 行"
+msgstr "無法識別的二進位修補檔位於第 %d 行"
#: apply.c:2177
#, c-format
@@ -1080,7 +1277,7 @@
#, 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[0] "區塊 #%d 成功套用於 %d（位移 %d 行）。"
#: apply.c:3069
#, c-format
@@ -1145,9 +1342,10 @@
#: apply.c:3353
#, c-format
msgid "cannot checkout %s"
-msgstr "不能簽出 %s"
+msgstr "不能檢出 %s"
-#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:86 pack-revindex.c:213
+#: setup.c:308
#, c-format
msgid "failed to read %s"
msgstr "無法讀取 %s"
@@ -1167,7 +1365,7 @@
msgid "%s: does not exist in index"
msgstr "%s：不存在於索引中"
-#: apply.c:3537 apply.c:3708
+#: apply.c:3537 apply.c:3708 apply.c:3952
#, c-format
msgid "%s: does not match index"
msgstr "%s：和索引不符合"
@@ -1215,311 +1413,355 @@
msgid "%s has type %o, expected %o"
msgstr "%s 的類型是 %o，應為 %o"
-#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856
-#: read-cache.c:1325
+#: apply.c: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:3936
+#: apply.c:3950
#, c-format
msgid "%s: already exists in index"
msgstr "%s：已經存在於索引中"
-#: apply.c:3939
+#: apply.c:3954
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s：已經存在於工作區中"
-#: apply.c:3959
+#: apply.c:3974
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "%2$s 的新模式（%1$o）和舊模式（%3$o）不符合"
-#: apply.c:3964
+#: apply.c:3979
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "%2$s 的新模式（%1$o）和 %4$s 的舊模式（%3$o）不符合"
-#: apply.c:3984
+#: apply.c:3999
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "受影響的檔案 '%s' 位於符號連結中"
-#: apply.c:3988
+#: apply.c:4003
#, c-format
msgid "%s: patch does not apply"
msgstr "%s：修補檔未套用"
-#: apply.c:4003
+#: apply.c:4018
#, c-format
msgid "Checking patch %s..."
msgstr "正在檢查修補檔 %s..."
-#: apply.c:4095
+#: apply.c:4110
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "子模組 %s 的 sha1 訊息缺少或無效"
-#: apply.c:4102
+#: apply.c:4117
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "%s 的模式變更，但它不在目前 HEAD 中"
-#: apply.c:4105
+#: apply.c:4120
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1 訊息缺少或無效（%s）。"
-#: apply.c:4114
+#: apply.c:4129
#, c-format
msgid "could not add %s to temporary index"
msgstr "不能在暫時索引中新增 %s"
-#: apply.c:4124
+#: apply.c:4139
#, c-format
msgid "could not write temporary index to %s"
msgstr "不能把暫時索引寫入到 %s"
-#: apply.c:4262
+#: apply.c:4277
#, c-format
msgid "unable to remove %s from index"
msgstr "不能從索引中移除 %s"
-#: apply.c:4296
+#: apply.c:4311
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "子模組 %s 損壞的修補檔"
-#: apply.c:4302
+#: apply.c:4317
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "不能對建立檔案 '%s' 呼叫 stat"
-#: apply.c:4310
+#: apply.c:4325
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "不能為建立檔案 %s 建立後端儲存"
-#: apply.c:4316 apply.c:4461
+#: apply.c:4331 apply.c:4476
#, c-format
msgid "unable to add cache entry for %s"
msgstr "無法為 %s 新增快取條目"
-#: apply.c:4359
+#: apply.c:4374 builtin/bisect--helper.c:523
#, c-format
msgid "failed to write to '%s'"
msgstr "寫入 '%s' 失敗"
-#: apply.c:4363
+#: apply.c:4378
#, c-format
msgid "closing file '%s'"
msgstr "關閉檔案 '%s'"
-#: apply.c:4433
+#: apply.c:4448
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "不能寫入檔案 '%s' 權限 %o"
-#: apply.c:4531
+#: apply.c:4546
#, c-format
msgid "Applied patch %s cleanly."
msgstr "成功套用修補檔 %s。"
-#: apply.c:4539
+#: apply.c:4554
msgid "internal error"
msgstr "內部錯誤"
-#: apply.c:4542
+#: apply.c:4557
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "套用 %%s 個修補檔，其中 %d 個被拒絕..."
-#: apply.c:4553
+#: apply.c:4568
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "截短 .rej 檔案名為 %.*s.rej"
-#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201
+#: apply.c:4576 builtin/fetch.c:933 builtin/fetch.c:1334
#, c-format
msgid "cannot open %s"
msgstr "不能開啟 %s"
-#: apply.c:4575
+#: apply.c:4590
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "第 #%d 個片段成功應用。"
-#: apply.c:4579
+#: apply.c:4594
#, c-format
msgid "Rejected hunk #%d."
msgstr "拒絕第 #%d 個片段。"
-#: apply.c:4698
+#: apply.c:4718
#, c-format
msgid "Skipped patch '%s'."
msgstr "略過修補檔 '%s'。"
-#: apply.c:4706
-msgid "unrecognized input"
-msgstr "未能識別的輸入"
-
#: apply.c:4726
+msgid "unrecognized input"
+msgstr "無法識別的輸入"
+
+#: apply.c:4746
msgid "unable to read index file"
msgstr "無法讀取索引檔案"
-#: apply.c:4883
+#: apply.c:4903
#, c-format
msgid "can't open patch '%s': %s"
msgstr "不能開啟修補檔 '%s'：%s"
-#: apply.c:4910
+#: apply.c:4930
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "抑制下仍有 %d 個空白字元誤用"
-#: apply.c:4916 apply.c:4931
+#: apply.c:4936 apply.c:4951
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d 行新增了空白字元誤用。"
-#: apply.c:4924
+#: apply.c:4944
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "修復空白錯誤後，應用了 %d 行。"
-#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406
+#: apply.c:4960 builtin/add.c:626 builtin/mv.c:304 builtin/rm.c:406
msgid "Unable to write new index file"
msgstr "無法寫入新索引檔案"
-#: apply.c:4968
+#: apply.c:4988
msgid "don't apply changes matching the given path"
msgstr "不要應用與給出路徑向符合的變更"
-#: apply.c:4971
+#: apply.c:4991
msgid "apply changes matching the given path"
msgstr "應用與給出路徑向符合的變更"
-#: apply.c:4973 builtin/am.c:2260
+#: apply.c:4993 builtin/am.c:2266
msgid "num"
msgstr "數字"
-#: apply.c:4974
+#: apply.c:4994
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "從傳統的 diff 路徑中移除指定數量的前導斜線"
-#: apply.c:4977
+#: apply.c:4997
msgid "ignore additions made by the patch"
msgstr "忽略修補檔中的新增的檔案"
-#: apply.c:4979
+#: apply.c:4999
msgid "instead of applying the patch, output diffstat for the input"
msgstr "不套用修補檔，而是顯示輸入的差異統計（diffstat）"
-#: apply.c:4983
+#: apply.c:5003
msgid "show number of added and deleted lines in decimal notation"
msgstr "以十進位數顯示新增和刪除的行數"
-#: apply.c:4985
+#: apply.c:5005
msgid "instead of applying the patch, output a summary for the input"
msgstr "不套用修補檔，而是顯示輸入的概要"
-#: apply.c:4987
+#: apply.c:5007
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "不套用修補檔，而是檢視修補檔是否可應用"
-#: apply.c:4989
+#: apply.c:5009
msgid "make sure the patch is applicable to the current index"
msgstr "確認修補檔可以套用到目前索引"
-#: apply.c:4991
+#: apply.c:5011
msgid "mark new files with `git add --intent-to-add`"
msgstr "使用指令 `git add --intent-to-add` 標記新增檔案"
-#: apply.c:4993
+#: apply.c:5013
msgid "apply a patch without touching the working tree"
msgstr "套用修補檔而不修改工作區"
-#: apply.c:4995
+#: apply.c:5015
msgid "accept a patch that touches outside the working area"
msgstr "接受修改工作區之外檔案的修補檔"
-#: apply.c:4998
+#: apply.c:5018
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "還套用此修補檔（與 --stat/--summary/--check 選項同時使用）"
-#: apply.c:5000
+#: apply.c:5020
msgid "attempt three-way merge if a patch does not apply"
msgstr "如果一個修補檔不能應用則嘗試三方合併"
-#: apply.c:5002
+#: apply.c:5022
msgid "build a temporary index based on embedded index information"
msgstr "建立一個暫時索引基於嵌入的索引訊息"
-#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5025 builtin/checkout-index.c:195 builtin/ls-files.c:540
msgid "paths are separated with NUL character"
msgstr "路徑以 NUL 字元分隔"
-#: apply.c:5007
+#: apply.c:5027
msgid "ensure at least <n> lines of context match"
msgstr "確保至少符合 <n> 行上下文"
-#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98
+#: apply.c:5028 builtin/am.c:2245 builtin/interpret-trailers.c:98
#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3457 builtin/rebase.c:1508
+#: builtin/pack-objects.c:3577 builtin/rebase.c:1352
msgid "action"
msgstr "動作"
-#: apply.c:5009
+#: apply.c:5029
msgid "detect new or modified lines that have whitespace errors"
msgstr "檢查新增和修改的行中間的空白字元濫用"
-#: apply.c:5012 apply.c:5015
+#: apply.c:5032 apply.c:5035
msgid "ignore changes in whitespace when finding context"
msgstr "尋找上下文時忽略空白字元的變更"
-#: apply.c:5018
+#: apply.c:5038
msgid "apply the patch in reverse"
msgstr "反向套用修補檔"
-#: apply.c:5020
+#: apply.c:5040
msgid "don't expect at least one line of context"
msgstr "無需至少一行上下文"
-#: apply.c:5022
+#: apply.c:5042
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "將拒絕的修補檔片段儲存在對應的 *.rej 檔案中"
-#: apply.c:5024
+#: apply.c:5044
msgid "allow overlapping hunks"
msgstr "允許重疊的修補檔片段"
-#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22
-#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774
-#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5045 builtin/add.c:337 builtin/check-ignore.c:22
+#: builtin/commit.c:1364 builtin/count-objects.c:98 builtin/fsck.c:757
+#: builtin/log.c:2286 builtin/mv.c:123 builtin/read-tree.c:128
msgid "be verbose"
msgstr "詳細輸出"
-#: apply.c:5027
+#: apply.c:5047
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "允許不正確的檔案末尾換行符號"
-#: apply.c:5030
+#: apply.c:5050
msgid "do not trust the line counts in the hunk headers"
msgstr "不信任修補檔片段的標頭訊息中的行號"
-#: apply.c:5032 builtin/am.c:2248
+#: apply.c:5052 builtin/am.c:2254
msgid "root"
msgstr "根目錄"
-#: apply.c:5033
+#: apply.c:5053
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:450
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr "無法啟動 '%s' 過濾器"
+
+#: archive-tar.c:453
+msgid "unable to redirect descriptor"
+msgstr "無法重定向描述符"
+
+#: archive-tar.c:460
+#, 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 [<選項>] <樹或提交> [<路徑>...]"
@@ -1532,212 +1774,185 @@
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"
+msgstr "git archive --remote <版本庫> [--exec <命令>] --list"
-#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
-#, c-format
-msgid "pathspec '%s' did not match any files"
-msgstr "路徑規格 '%s' 未符合任何檔案"
-
-#: archive.c:396
-#, c-format
-msgid "no such ref: %.*s"
-msgstr "無此引用：%.*s"
-
-#: archive.c:401
-#, c-format
-msgid "not a valid object name: %s"
-msgstr "不是一個有效的物件名：%s"
-
-#: archive.c:414
-#, c-format
-msgid "not a tree object: %s"
-msgstr "不是一個樹狀物件：%s"
-
-#: archive.c:426
-msgid "current working directory is untracked"
-msgstr "目前工作目錄未被追蹤"
-
-#: archive.c:457
-msgid "fmt"
-msgstr "格式"
-
-#: archive.c:457
-msgid "archive format"
-msgstr "歸檔格式"
-
-#: archive.c:458 builtin/log.c:1653
-msgid "prefix"
-msgstr "前綴"
-
-#: archive.c:459
-msgid "prepend prefix to each pathname in the archive"
-msgstr "為歸檔中每個路徑名加上前綴"
-
-#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
-#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
-#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887
-#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
-#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
-#: parse-options.h:190
-msgid "file"
-msgstr "檔案"
-
-#: archive.c:461 builtin/archive.c:90
-msgid "write the archive to this file"
-msgstr "歸檔寫入此檔案"
-
-#: archive.c:463
-msgid "read .gitattributes in working directory"
-msgstr "讀取工作區中的 .gitattributes"
-
-#: archive.c:464
-msgid "report archived files on stderr"
-msgstr "在標準錯誤上報告歸檔檔案"
-
-#: archive.c:465
-msgid "store only"
-msgstr "只儲存"
-
-#: archive.c:466
-msgid "compress faster"
-msgstr "壓縮速度更快"
-
-#: archive.c:474
-msgid "compress better"
-msgstr "壓縮效果更好"
-
-#: archive.c:477
-msgid "list supported archive formats"
-msgstr "列出支援的歸檔格式"
-
-#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
-#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
-msgid "repo"
-msgstr "版本庫"
-
-#: archive.c:480 builtin/archive.c:92
-msgid "retrieve the archive from remote repository <repo>"
-msgstr "從遠端版本庫（<版本庫>）擷取歸檔檔案"
-
-#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
-#: builtin/notes.c:498
-msgid "command"
-msgstr "指令"
-
-#: archive.c:482 builtin/archive.c:94
-msgid "path to the remote git-upload-archive command"
-msgstr "遠端 git-upload-archive 指令的路徑"
-
-#: archive.c:489
-msgid "Unexpected option --remote"
-msgstr "未知參數 --remote"
-
-#: archive.c:491
-msgid "Option --exec can only be used together with --remote"
-msgstr "選項 --exec 只能和 --remote 同時使用"
-
-#: archive.c:493
-msgid "Unexpected option --output"
-msgstr "未知參數 --output"
-
-#: archive.c:515
-#, c-format
-msgid "Unknown archive format '%s'"
-msgstr "未知歸檔格式 '%s'"
-
-#: archive.c:522
-#, c-format
-msgid "Argument not supported for format '%s': -%d"
-msgstr "參數不支援此格式 '%s'：-%d"
-
-#: archive-tar.c:125 archive-zip.c:351
-#, c-format
-msgid "cannot stream blob %s"
-msgstr "不能開啟資料物件 %s"
-
-#: archive-tar.c:266 archive-zip.c:369
-#, c-format
-msgid "unsupported file mode: 0%o (SHA1: %s)"
-msgstr "不支援的檔案模式：0%o (SHA1: %s)"
-
-#: archive-tar.c:293 archive-zip.c:359
+#: archive.c:192
#, c-format
msgid "cannot read %s"
msgstr "不能讀取 %s"
-#: archive-tar.c:465
+#: archive.c:345 sequencer.c:459 sequencer.c:1744 sequencer.c:2894
+#: sequencer.c:3335 sequencer.c:3444 builtin/am.c:249 builtin/commit.c:786
+#: builtin/merge.c:1139
#, c-format
-msgid "unable to start '%s' filter"
-msgstr "無法啟動 '%s' 過濾器"
+msgid "could not read '%s'"
+msgstr "不能讀取 '%s'"
-#: archive-tar.c:468
-msgid "unable to redirect descriptor"
-msgstr "無法重定向描述符"
-
-#: archive-tar.c:475
+#: archive.c:430 builtin/add.c:189 builtin/add.c:602 builtin/rm.c:315
#, c-format
-msgid "'%s' filter reported error"
-msgstr "'%s' 過濾器報告了錯誤"
+msgid "pathspec '%s' did not match any files"
+msgstr "路徑規格 '%s' 未符合任何檔案"
-#: archive-zip.c:319
+#: archive.c:454
#, c-format
-msgid "path is not valid UTF-8: %s"
-msgstr "路徑不是有效的 UTF-8：%s"
+msgid "no such ref: %.*s"
+msgstr "無此引用：%.*s"
-#: archive-zip.c:323
+#: archive.c:460
#, c-format
-msgid "path too long (%d chars, SHA1: %s): %s"
-msgstr "路徑太長（%d 字元，SHA1：%s）：%s"
+msgid "not a valid object name: %s"
+msgstr "不是一個有效的物件名：%s"
-#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
+#: archive.c:473
#, c-format
-msgid "deflate error (%d)"
-msgstr "壓縮錯誤 (%d)"
+msgid "not a tree object: %s"
+msgstr "不是一個樹狀物件：%s"
-#: archive-zip.c:615
+#: archive.c:485
+msgid "current working directory is untracked"
+msgstr "目前工作目錄未被追蹤"
+
+#: archive.c:526
#, c-format
-msgid "timestamp too large for this system: %<PRIuMAX>"
-msgstr "對於本系統時間戳太大：%<PRIuMAX>"
+msgid "File not found: %s"
+msgstr "找不到檔案：%s"
-#: attr.c:212
+#: archive.c:528
+#, c-format
+msgid "Not a regular file: %s"
+msgstr "不是一般檔案：%s"
+
+#: archive.c:555
+msgid "fmt"
+msgstr "格式"
+
+#: archive.c:555
+msgid "archive format"
+msgstr "歸檔格式"
+
+#: archive.c:556 builtin/log.c:1764
+msgid "prefix"
+msgstr "前綴"
+
+#: archive.c:557
+msgid "prepend prefix to each pathname in the archive"
+msgstr "為歸檔中每個路徑名加上前綴"
+
+#: archive.c:558 archive.c:561 builtin/blame.c:884 builtin/blame.c:888
+#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:135
+#: builtin/fast-export.c:1207 builtin/fast-export.c:1209
+#: builtin/fast-export.c:1213 builtin/grep.c:920 builtin/hash-object.c:105
+#: builtin/ls-files.c:576 builtin/ls-files.c:579 builtin/notes.c:412
+#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:190
+msgid "file"
+msgstr "檔案"
+
+#: archive.c:559
+msgid "add untracked file to archive"
+msgstr "將未追蹤檔案加入歸檔"
+
+#: archive.c:562 builtin/archive.c:90
+msgid "write the archive to this file"
+msgstr "歸檔寫入此檔案"
+
+#: archive.c:564
+msgid "read .gitattributes in working directory"
+msgstr "讀取工作區中的 .gitattributes"
+
+#: archive.c:565
+msgid "report archived files on stderr"
+msgstr "在標準錯誤上報告歸檔檔案"
+
+#: archive.c:567
+msgid "set compression level"
+msgstr "設定壓縮級別"
+
+#: archive.c:570
+msgid "list supported archive formats"
+msgstr "列出支援的歸檔格式"
+
+#: archive.c:572 builtin/archive.c:91 builtin/clone.c:114 builtin/clone.c:117
+#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
+msgid "repo"
+msgstr "版本庫"
+
+#: archive.c:573 builtin/archive.c:92
+msgid "retrieve the archive from remote repository <repo>"
+msgstr "從遠端版本庫（<版本庫>）擷取歸檔檔案"
+
+#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714
+#: builtin/notes.c:498
+msgid "command"
+msgstr "指令"
+
+#: archive.c:575 builtin/archive.c:94
+msgid "path to the remote git-upload-archive command"
+msgstr "遠端 git-upload-archive 指令的路徑"
+
+#: archive.c:582
+msgid "Unexpected option --remote"
+msgstr "未知參數 --remote"
+
+#: archive.c:584
+msgid "Option --exec can only be used together with --remote"
+msgstr "選項 --exec 只能和 --remote 同時使用"
+
+#: archive.c:586
+msgid "Unexpected option --output"
+msgstr "未知參數 --output"
+
+#: archive.c:588
+msgid "Options --add-file and --remote cannot be used together"
+msgstr "--add-file 和 --remote 選項不能同時使用"
+
+#: archive.c:610
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "未知歸檔格式 '%s'"
+
+#: archive.c:619
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "參數不支援此格式 '%s'：-%d"
+
+#: attr.c:202
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s 不是一個有效的屬性名"
-#: attr.c:369
+#: attr.c:359
#, c-format
msgid "%s not allowed: %s:%d"
msgstr "不允許 %s：%s:%d"
-#: attr.c:409
+#: attr.c:399
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgstr ""
"反向模式在 git attributes 中被忽略\n"
-"當字串確實要以驚嘆號開始時，使用 '\\!'。"
+"當字串確定要以驚嘆號開始時，使用 '\\!'。"
-#: bisect.c:468
+#: bisect.c:489
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "檔案 '%s' 包含錯誤的引用格式：%s"
-#: bisect.c:678
+#: bisect.c:699
#, c-format
msgid "We cannot bisect more!\n"
-msgstr "我們無法進行更多的二分尋找！\n"
+msgstr "我們無法進行更多的二分搜尋！\n"
-#: bisect.c:745
+#: bisect.c:766
#, c-format
msgid "Not a valid commit name %s"
msgstr "不是一個有效的提交名 %s"
-#: bisect.c:770
+#: bisect.c:791
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -1746,7 +1961,7 @@
"合併基礎 %s 是壞的。\n"
"這意味著介於 %s 和 [%s] 之間的 bug 已經被修復。\n"
-#: bisect.c:775
+#: bisect.c:796
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1755,7 +1970,7 @@
"合併基礎 %s 是新的。\n"
"介於 %s 和 [%s] 之間的屬性已經被修改。\n"
-#: bisect.c:780
+#: bisect.c:801
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1764,7 +1979,7 @@
"合併基礎 %s 是 %s。\n"
"這意味著第一個 '%s' 提交位於 %s 和 [%s] 之間。\n"
-#: bisect.c:788
+#: bisect.c:809
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1772,10 +1987,10 @@
"Maybe you mistook %s and %s revs?\n"
msgstr ""
"一些 %s 版本不是 %s 版本的祖先。\n"
-"這種情況下 git 二分尋找無法正常工作。\n"
+"這種情況下 git 二分搜尋無法正常工作。\n"
"您可能弄錯了 %s 和 %s 版本？\n"
-#: bisect.c:801
+#: bisect.c:822
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1786,45 +2001,45 @@
"所以我們無法確認第一個 %s 提交是否介於 %s 和 %s 之間。\n"
"我們仍舊繼續。"
-#: bisect.c:840
+#: bisect.c:861
#, c-format
msgid "Bisecting: a merge base must be tested\n"
-msgstr "二分尋找中：合併基礎必須是經過測試的\n"
+msgstr "二分搜尋中：合併基礎必須是經過測試的\n"
-#: bisect.c:890
+#: bisect.c:911
#, c-format
msgid "a %s revision is needed"
msgstr "需要一個 %s 版本"
-#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287
#, c-format
msgid "could not create file '%s'"
msgstr "不能建立檔案 '%s'"
-#: bisect.c:966 builtin/merge.c:149
+#: bisect.c:987 builtin/merge.c:153
#, c-format
msgid "could not read file '%s'"
msgstr "不能讀取檔案 '%s'"
-#: bisect.c:997
+#: bisect.c:1027
msgid "reading bisect refs failed"
-msgstr "讀取二分尋找引用失敗"
+msgstr "讀取二分搜尋引用失敗"
-#: bisect.c:1019
+#: bisect.c:1057
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s 同時為 %s 和 %s\n"
-#: bisect.c:1028
+#: bisect.c:1066
#, c-format
msgid ""
"No testable commit found.\n"
-"Maybe you started with bad path parameters?\n"
+"Maybe you started with bad path arguments?\n"
msgstr ""
-"沒有發現可測試的提交。\n"
-"可能您在執行時使用了錯誤的路徑參數？\n"
+"沒找到能夠測試的提交。\n"
+"可能是執行傳入的路徑引數是錯誤的？\n"
-#: bisect.c:1057
+#: bisect.c:1095
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1833,43 +2048,43 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1063
+#: bisect.c:1101
#, 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[0] "二分搜尋中：在此之後，還剩 %d 個版本待測試 %s\n"
-#: blame.c:2700
+#: blame.c:2777
msgid "--contents and --reverse do not blend well."
msgstr "--contents 和 --reverse 不能混用。"
-#: blame.c:2714
+#: blame.c:2791
msgid "cannot use --contents with final commit object name"
msgstr "不能將 --contents 和最終的提交物件名共用"
-#: blame.c:2735
+#: blame.c:2812
msgid "--reverse and --first-parent together require specified latest commit"
msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
-#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006
-#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388
-#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215
-#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290
-#: builtin/shortlog.c:192
+#: blame.c:2821 bundle.c:213 ref-filter.c:2206 remote.c:2041 sequencer.c:2146
+#: sequencer.c:4641 submodule.c:856 builtin/commit.c:1045 builtin/log.c:411
+#: builtin/log.c:1016 builtin/log.c:1624 builtin/log.c:2045 builtin/log.c:2335
+#: builtin/merge.c:424 builtin/pack-objects.c:3395 builtin/pack-objects.c:3410
+#: builtin/shortlog.c:255
msgid "revision walk setup failed"
msgstr "版本遍歷設定失敗"
-#: blame.c:2762
+#: blame.c:2839
msgid ""
"--reverse --first-parent together require range along first-parent chain"
msgstr "--reverse 和 --first-parent 共用，需要第一祖先鏈上的提交範圍"
-#: blame.c:2773
+#: blame.c:2850
#, c-format
msgid "no such path %s in %s"
msgstr "在 %2$s 中無此路徑 %1$s"
-#: blame.c:2784
+#: blame.c:2861
#, c-format
msgid "cannot read blob %s for path %s"
msgstr "不能為路徑 %2$s 讀取資料物件 %1$s"
@@ -1997,112 +2212,391 @@
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'"
+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 "'%s' does not look like a v2 bundle file"
-msgstr "'%s' 不像是一個 v2 版本的包檔案"
+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' 不像是一個 v2 或 v3 版本的包檔案"
+
+#: bundle.c:110
#, c-format
msgid "unrecognized header: %s%s (%d)"
-msgstr "未能識別的包頭：%s%s (%d)"
+msgstr "無法識別的包頭：%s%s (%d)"
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016
-#: builtin/commit.c:815
+#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2398 sequencer.c:3184
+#: 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] "這個包中含有這 %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] "這個包需要這 %d 個引用："
-#: bundle.c:273
+#: bundle.c:319
msgid "unable to dup bundle descriptor"
msgstr "無法複製 bundle 描述符"
-#: bundle.c:280
+#: bundle.c:326
msgid "Could not spawn pack-objects"
msgstr "不能生成 pack-objects 進程"
-#: bundle.c:291
+#: bundle.c:337
msgid "pack-objects died"
msgstr "pack-objects 終止"
-#: bundle.c:333
-msgid "rev-list died"
-msgstr "rev-list 終止"
-
-#: bundle.c:382
+#: bundle.c:386
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "引用 '%s' 被 rev-list 選項排除"
-#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306
+#: bundle.c:490
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr "不支援的包版本 %d"
+
+#: bundle.c:492
+#, c-format
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr "無法寫入 %2$s 演算法的包版本 %1$d"
+
+#: bundle.c:510 builtin/log.c:210 builtin/log.c:1926 builtin/shortlog.c:396
#, c-format
msgid "unrecognized argument: %s"
-msgstr "未能識別的參數：%s"
+msgstr "無法識別的參數：%s"
-#: bundle.c:469
+#: bundle.c:539
msgid "Refusing to create empty bundle."
msgstr "不能建立空包。"
-#: bundle.c:479
+#: bundle.c:549
#, c-format
msgid "cannot create '%s'"
msgstr "不能建立 '%s'"
-#: bundle.c:504
+#: bundle.c:574
msgid "index-pack died"
msgstr "index-pack 終止"
+#: chunk-format.c:113
+msgid "terminating chunk id appears earlier than expected"
+msgstr "終止區塊 id 出現的時間早於預期"
+
+#: chunk-format.c:122
+#, c-format
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr "不正確的區塊偏移 %<PRIx64> 及 %<PRIx64>"
+
+#: chunk-format.c:129
+#, c-format
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr "找到重複的區塊 ID %<PRIx32>"
+
+#: chunk-format.c:143
+#, c-format
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr "最終區塊有非零 ID %<PRIx32>"
+
#: color.c:329
#, c-format
msgid "invalid color value: %.*s"
msgstr "無效的顏色值：%.*s"
-#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403
-#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457
+#: commit-graph.c:197 midx.c:46
+msgid "invalid hash version"
+msgstr "無效的雜湊版本"
+
+#: commit-graph.c:255
+msgid "commit-graph file is too small"
+msgstr "提交圖形檔案太小"
+
+#: commit-graph.c:348
+#, c-format
+msgid "commit-graph signature %X does not match signature %X"
+msgstr "提交圖形簽名 %X 和簽名 %X 不符合"
+
+#: commit-graph.c:355
+#, c-format
+msgid "commit-graph version %X does not match version %X"
+msgstr "提交圖形版本 %X 和版本 %X 不符合"
+
+#: commit-graph.c:362
+#, c-format
+msgid "commit-graph hash version %X does not match version %X"
+msgstr "提交圖形雜湊版本 %X 和版本 %X 不符合"
+
+#: commit-graph.c:379
+#, c-format
+msgid "commit-graph file is too small to hold %u chunks"
+msgstr "commit-graph 檔案不夠放置 %u 個區塊"
+
+#: commit-graph.c:472
+msgid "commit-graph has no base graphs chunk"
+msgstr "提交圖形沒有基礎圖形區塊"
+
+#: commit-graph.c:482
+msgid "commit-graph chain does not match"
+msgstr "提交圖形鏈不符合"
+
+#: commit-graph.c:530
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr "無效的提交圖形鏈：行 '%s' 不是一個雜湊值"
+
+#: commit-graph.c:554
+msgid "unable to find all commit-graph files"
+msgstr "無法找到所有提交圖形檔案"
+
+#: commit-graph.c:735 commit-graph.c:772
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr "無效的提交位置。提交圖形可能已損壞"
+
+#: commit-graph.c:756
+#, c-format
+msgid "could not find commit %s"
+msgstr "無法找到提交 %s"
+
+#: commit-graph.c:789
+msgid "commit-graph requires overflow generation data but has none"
+msgstr ""
+
+#: commit-graph.c:1065 builtin/am.c:1292
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "不能解析提交 %s"
+
+#: commit-graph.c:1327 builtin/pack-objects.c:2872
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "無法獲得物件 %s 類型"
+
+#: commit-graph.c:1358
+msgid "Loading known commits in commit graph"
+msgstr "正在載入提交圖中的已知提交"
+
+#: commit-graph.c:1375
+msgid "Expanding reachable commits in commit graph"
+msgstr "正在擴展提交圖中的可以取得提交"
+
+#: commit-graph.c:1395
+msgid "Clearing commit marks in commit graph"
+msgstr "正在清除提交圖中的提交標記"
+
+#: commit-graph.c:1414
+#, fuzzy
+#| msgid "Computing commit graph generation numbers"
+msgid "Computing commit graph topological levels"
+msgstr "正在計算提交圖世代數字"
+
+#: commit-graph.c:1467
+msgid "Computing commit graph generation numbers"
+msgstr "正在計算提交圖世代數字"
+
+#: commit-graph.c:1548
+msgid "Computing commit changed paths Bloom filters"
+msgstr "正在計算提交變更路徑的布隆過濾器"
+
+#: commit-graph.c:1625
+msgid "Collecting referenced commits"
+msgstr "正在收集引用提交"
+
+#: commit-graph.c:1650
+#, 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:1663
+#, c-format
+msgid "error adding pack %s"
+msgstr "新增包 %s 發生錯誤"
+
+#: commit-graph.c:1667
+#, c-format
+msgid "error opening index for %s"
+msgstr "為 %s 開啟索引發生錯誤"
+
+#: commit-graph.c:1704
+msgid "Finding commits for commit graph among packed objects"
+msgstr "正在打包物件中尋找提交圖的提交"
+
+#: commit-graph.c:1722
+msgid "Finding extra edges in commit graph"
+msgstr "正在尋找提交圖中額外的邊"
+
+#: commit-graph.c:1771
+msgid "failed to write correct number of base graph ids"
+msgstr "無法寫入正確數量的基礎圖形 ID"
+
+#: commit-graph.c:1802 midx.c:794
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr "不能為 %s 建立先導目錄"
+
+#: commit-graph.c:1815
+msgid "unable to create temporary graph layer"
+msgstr "無法建立暫時的圖形層"
+
+#: commit-graph.c:1820
+#, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "無法調整「%s」的共用權限"
+
+#: commit-graph.c:1879
+#, 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:1915
+msgid "unable to open commit-graph chain file"
+msgstr "無法開啟提交圖形鏈檔案"
+
+#: commit-graph.c:1931
+msgid "failed to rename base commit-graph file"
+msgstr "無法重新命名基礎提交圖形檔案"
+
+#: commit-graph.c:1951
+msgid "failed to rename temporary commit-graph file"
+msgstr "無法重新命名暫時提交圖形檔案"
+
+#: commit-graph.c:2084
+msgid "Scanning merged commits"
+msgstr "正在掃描合併提交"
+
+#: commit-graph.c:2128
+msgid "Merging commit-graph"
+msgstr "正在合併提交圖形"
+
+#: commit-graph.c:2235
+msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
+msgstr "嘗試寫入提交圖形，但 “core.commitGraph” 已被停用。"
+
+#: commit-graph.c:2342
+msgid "too many commits to write graph"
+msgstr "提交太多不能畫圖"
+
+#: commit-graph.c:2440
+msgid "the commit-graph file has incorrect checksum and is likely corrupt"
+msgstr "提交圖檔案的總和檢查碼錯誤，可能已經損壞"
+
+#: commit-graph.c:2450
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr "提交圖形的物件 ID 順序不正確：%s 然後 %s"
+
+#: commit-graph.c:2460 commit-graph.c:2475
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr "提交圖形有不正確的扇出值：fanout[%d] = %u != %u"
+
+#: commit-graph.c:2467
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "無法從提交圖形中解析提交 %s"
+
+#: commit-graph.c:2485
+msgid "Verifying commits in commit graph"
+msgstr "正在驗證提交圖中的提交"
+
+#: commit-graph.c:2500
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr "無法從提交圖形的物件庫中解析提交 %s"
+
+#: commit-graph.c:2507
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr "提交圖形中的提交 %s 的根樹狀物件 ID 是 %s != %s"
+
+#: commit-graph.c:2517
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr "提交 %s 的提交圖形父提交列表太長了"
+
+#: commit-graph.c:2526
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr "%s 的提交圖形父提交是 %s != %s"
+
+#: commit-graph.c:2540
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr "提交 %s 的提交圖形父提交列表過早終止"
+
+#: commit-graph.c:2545
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr "提交圖形中提交 %s 的世代號是零，但其它地方非零"
+
+#: commit-graph.c:2549
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr "提交圖形中提交 %s 的世代號非零，但其它地方是零"
+
+#: commit-graph.c:2566
+#, c-format
+msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
+msgstr "提交 %s 的提交圖形處於 %<PRIuMAX> < %<PRIuMAX> 世代"
+
+#: commit-graph.c:2572
+#, c-format
+msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
+msgstr "提交圖形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
+
+#: commit.c:52 sequencer.c:2887 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2018 builtin/replace.c:457
#, c-format
msgid "could not parse %s"
msgstr "不能解析 %s"
-#: commit.c:53
+#: commit.c:54
#, c-format
msgid "%s %s is not a commit!"
msgstr "%s %s 不是一個提交！"
-#: commit.c:193
+#: commit.c:194
msgid ""
"Support for <GIT_DIR>/info/grafts is deprecated\n"
"and will be removed in a future Git version.\n"
@@ -2122,27 +2616,27 @@
"設定 \"git config advice.graftFileDeprecated false\"\n"
"可關閉本消息"
-#: commit.c:1153
+#: commit.c:1223
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "提交 %s 有一個非可信的聲稱來自 %s 的 GPG 簽名。"
-#: commit.c:1157
+#: commit.c:1227
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "提交 %s 有一個錯誤的聲稱來自 %s 的 GPG 簽名。"
-#: commit.c:1160
+#: commit.c:1230
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "提交 %s 沒有 GPG 簽名。"
-#: commit.c:1163
+#: commit.c:1233
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "提交 %s 有一個來自 %s 的好的 GPG 簽名。\n"
-#: commit.c:1417
+#: commit.c:1487
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"
@@ -2152,259 +2646,11 @@
"您可以透過修補提交來改正提交說明，或者將設定變數 i18n.commitencoding\n"
"設定為您項目所用的字元編碼。\n"
-#: commit-graph.c:122
-msgid "commit-graph file is too small"
-msgstr "提交圖形檔案太小"
-
-#: commit-graph.c:189
-#, c-format
-msgid "commit-graph signature %X does not match signature %X"
-msgstr "提交圖形簽名 %X 和簽名 %X 不符合"
-
-#: commit-graph.c:196
-#, c-format
-msgid "commit-graph version %X does not match version %X"
-msgstr "提交圖形版本 %X 和版本 %X 不符合"
-
-#: commit-graph.c:203
-#, c-format
-msgid "commit-graph hash version %X does not match version %X"
-msgstr "提交圖形雜湊版本 %X 和版本 %X 不符合"
-
-#: commit-graph.c:226
-msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
-msgstr "提交圖形區塊尋找表條目遺失，檔案可能不完整"
-
-#: commit-graph.c:237
-#, c-format
-msgid "commit-graph improper chunk offset %08x%08x"
-msgstr "提交圖形不正確的區塊位移 %08x%08x"
-
-#: commit-graph.c:280
-#, c-format
-msgid "commit-graph chunk id %08x appears multiple times"
-msgstr "提交圖形區塊 id %08x 出現了多次"
-
-#: commit-graph.c:343
-msgid "commit-graph has no base graphs chunk"
-msgstr "提交圖形沒有基礎圖形區塊"
-
-#: commit-graph.c:353
-msgid "commit-graph chain does not match"
-msgstr "提交圖形鏈不符合"
-
-#: commit-graph.c:401
-#, c-format
-msgid "invalid commit-graph chain: line '%s' not a hash"
-msgstr "無效的提交圖形鏈：行 '%s' 不是一個雜湊值"
-
-#: commit-graph.c:425
-msgid "unable to find all commit-graph files"
-msgstr "無法找到所有提交圖形檔案"
-
-#: commit-graph.c:558 commit-graph.c:618
-msgid "invalid commit position. commit-graph is likely corrupt"
-msgstr "無效的提交位置。提交圖形可能已損壞"
-
-#: commit-graph.c:579
-#, c-format
-msgid "could not find commit %s"
-msgstr "無法找到提交 %s"
-
-#: commit-graph.c:852 builtin/am.c:1292
-#, c-format
-msgid "unable to parse commit %s"
-msgstr "不能解析提交 %s"
-
-#: commit-graph.c:1011 builtin/pack-objects.c:2782
-#, c-format
-msgid "unable to get type of object %s"
-msgstr "無法獲得物件 %s 類型"
-
-#: commit-graph.c:1043
-msgid "Loading known commits in commit graph"
-msgstr "正在載入提交圖中的已知提交"
-
-#: commit-graph.c:1060
-msgid "Expanding reachable commits in commit graph"
-msgstr "正在擴展提交圖中的可以取得提交"
-
-#: commit-graph.c:1079
-msgid "Clearing commit marks in commit graph"
-msgstr "正在清除提交圖中的提交標記"
-
-#: commit-graph.c:1098
-msgid "Computing commit graph generation numbers"
-msgstr "正在計算提交圖世代數字"
-
-#: commit-graph.c:1173
-#, c-format
-msgid "Finding commits for commit graph in %d pack"
-msgid_plural "Finding commits for commit graph in %d packs"
-msgstr[0] "正在 %d 個包中尋找提交圖的提交"
-
-#: commit-graph.c:1186
-#, c-format
-msgid "error adding pack %s"
-msgstr "新增包 %s 發生錯誤"
-
-#: commit-graph.c:1190
-#, c-format
-msgid "error opening index for %s"
-msgstr "為 %s 開啟索引發生錯誤"
-
-#: commit-graph.c:1214
-#, c-format
-msgid "Finding commits for commit graph from %d ref"
-msgid_plural "Finding commits for commit graph from %d refs"
-msgstr[0] "正在從 %d 個引用中尋找提交圖的提交"
-
-#: commit-graph.c:1234
-#, c-format
-msgid "invalid commit object id: %s"
-msgstr "無效的提交物件 ID：%s"
-
-#: commit-graph.c:1249
-msgid "Finding commits for commit graph among packed objects"
-msgstr "正在打包物件中尋找提交圖的提交"
-
-#: commit-graph.c:1264
-msgid "Counting distinct commits in commit graph"
-msgstr "正在計算提交圖中不同的提交"
-
-#: commit-graph.c:1294
-msgid "Finding extra edges in commit graph"
-msgstr "正在尋找提交圖中額外的邊"
-
-#: commit-graph.c:1340
-msgid "failed to write correct number of base graph ids"
-msgstr "無法寫入正確數量的基礎圖形 ID"
-
-#: commit-graph.c:1373 midx.c:814
-#, c-format
-msgid "unable to create leading directories of %s"
-msgstr "不能為 %s 建立先導目錄"
-
-#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248
-#, c-format
-msgid "unable to create '%s'"
-msgstr "不能建立 '%s'"
-
-#: commit-graph.c:1445
-#, c-format
-msgid "Writing out commit graph in %d pass"
-msgid_plural "Writing out commit graph in %d passes"
-msgstr[0] "正在用 %d 步寫出提交圖"
-
-#: commit-graph.c:1486
-msgid "unable to open commit-graph chain file"
-msgstr "無法開啟提交圖形鏈檔案"
-
-#: commit-graph.c:1498
-msgid "failed to rename base commit-graph file"
-msgstr "無法重新命名基礎提交圖形檔案"
-
-#: commit-graph.c:1518
-msgid "failed to rename temporary commit-graph file"
-msgstr "無法重新命名暫時提交圖形檔案"
-
-#: commit-graph.c:1631
-msgid "Scanning merged commits"
-msgstr "正在掃描合併提交"
-
-#: commit-graph.c:1642
-#, c-format
-msgid "unexpected duplicate commit id %s"
-msgstr "意外的重複提交 ID %s"
-
-#: commit-graph.c:1665
-msgid "Merging commit-graph"
-msgstr "正在合併提交圖形"
-
-#: commit-graph.c:1844
-#, c-format
-msgid "the commit graph format cannot write %d commits"
-msgstr "提交圖格式不能寫入 %d 個提交"
-
-#: commit-graph.c:1855
-msgid "too many commits to write graph"
-msgstr "提交太多不能畫圖"
-
-#: commit-graph.c:1944
-msgid "the commit-graph file has incorrect checksum and is likely corrupt"
-msgstr "提交圖檔案的總和檢查碼錯誤，可能已經損壞"
-
-#: commit-graph.c:1954
-#, c-format
-msgid "commit-graph has incorrect OID order: %s then %s"
-msgstr "提交圖形的物件 ID 順序不正確：%s 然後 %s"
-
-#: commit-graph.c:1964 commit-graph.c:1979
-#, c-format
-msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
-msgstr "提交圖形有不正確的扇出值：fanout[%d] = %u != %u"
-
-#: commit-graph.c:1971
-#, c-format
-msgid "failed to parse commit %s from commit-graph"
-msgstr "無法從提交圖形中解析提交 %s"
-
-#: commit-graph.c:1989
-msgid "Verifying commits in commit graph"
-msgstr "正在驗證提交圖中的提交"
-
-#: commit-graph.c:2003
-#, c-format
-msgid "failed to parse commit %s from object database for commit-graph"
-msgstr "無法從提交圖形的物件庫中解析提交 %s"
-
-#: commit-graph.c:2010
-#, c-format
-msgid "root tree OID for commit %s in commit-graph is %s != %s"
-msgstr "提交圖形中的提交 %s 的根樹狀物件 ID 是 %s != %s"
-
-#: commit-graph.c:2020
-#, c-format
-msgid "commit-graph parent list for commit %s is too long"
-msgstr "提交 %s 的提交圖形父提交列表太長了"
-
-#: commit-graph.c:2029
-#, c-format
-msgid "commit-graph parent for %s is %s != %s"
-msgstr "%s 的提交圖形父提交是 %s != %s"
-
-#: commit-graph.c:2042
-#, c-format
-msgid "commit-graph parent list for commit %s terminates early"
-msgstr "提交 %s 的提交圖形父提交列表過早終止"
-
-#: commit-graph.c:2047
-#, c-format
-msgid ""
-"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
-msgstr "提交圖形中提交 %s 的世代號是零，但其它地方非零"
-
-#: commit-graph.c:2051
-#, c-format
-msgid ""
-"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
-msgstr "提交圖形中提交 %s 的世代號非零，但其它地方是零"
-
-#: commit-graph.c:2066
-#, c-format
-msgid "commit-graph generation for commit %s is %u != %u"
-msgstr "提交圖形中的提交 %s 的世代號是 %u != %u"
-
-#: commit-graph.c:2072
-#, c-format
-msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
-msgstr "提交圖形中提交 %s 的提交日期是 %<PRIuMAX> != %<PRIuMAX>"
-
#: compat/obstack.c:406 compat/obstack.c:408
msgid "memory exhausted"
msgstr "記憶體耗盡"
-#: config.c:124
+#: config.c:126
#, c-format
msgid ""
"exceeded maximum include depth (%d) while including\n"
@@ -2419,289 +2665,333 @@
"\t%2$s\n"
"這可能是因為循環包含。"
-#: config.c:140
+#: config.c:142
#, c-format
msgid "could not expand include path '%s'"
msgstr "無法擴展包含路徑 '%s'"
-#: config.c:151
+#: config.c:153
msgid "relative config includes must come from files"
msgstr "相對路徑的設定檔案引用必須來自於檔案"
-#: config.c:197
+#: config.c:199
msgid "relative config include conditionals must come from files"
msgstr "相對路徑的設定檔案條件引用必須來自於檔案"
-#: config.c:376
+#: config.c:396
+#, c-format
+msgid "invalid config format: %s"
+msgstr "無效的設定檔格式：%s"
+
+#: config.c:400
+#, c-format
+msgid "missing environment variable name for configuration '%.*s'"
+msgstr "缺少「%.*s」組態設定的環境變數名稱"
+
+#: config.c:405
+#, c-format
+msgid "missing environment variable '%s' for configuration '%.*s'"
+msgstr "缺少環境變數「%s」（於「%.*s」組態設定）"
+
+#: config.c:442
#, c-format
msgid "key does not contain a section: %s"
msgstr "鍵名沒有包含一個小節名稱：%s"
-#: config.c:382
+#: config.c:448
#, c-format
msgid "key does not contain variable name: %s"
msgstr "鍵名沒有包含變數名：%s"
-#: config.c:406 sequencer.c:2444
+#: config.c:472 sequencer.c:2588
#, c-format
msgid "invalid key: %s"
msgstr "無效鍵名：%s"
-#: config.c:412
+#: config.c:478
#, c-format
msgid "invalid key (newline): %s"
msgstr "無效鍵名（有換行符號）：%s"
-#: config.c:448 config.c:460
+#: config.c:511
+msgid "empty config key"
+msgstr "空白設定鍵"
+
+#: config.c:529 config.c:541
#, c-format
msgid "bogus config parameter: %s"
msgstr "偽設定參數：%s"
-#: config.c:495
+#: config.c:555 config.c:572 config.c:579 config.c:588
#, c-format
msgid "bogus format in %s"
msgstr "%s 中格式錯誤"
-#: config.c:821
+#: config.c:622
+#, c-format
+msgid "bogus count in %s"
+msgstr "%s 中有偽計數"
+
+#: config.c:626
+#, c-format
+msgid "too many entries in %s"
+msgstr "%s 中的項目過多"
+
+#: config.c:636
+#, c-format
+msgid "missing config key %s"
+msgstr "缺少 %s 設定鍵"
+
+#: config.c:644
+#, c-format
+msgid "missing config value %s"
+msgstr "缺少 %s 設定值"
+
+#: config.c:995
#, c-format
msgid "bad config line %d in blob %s"
msgstr "資料物件 %2$s 中錯誤的設定行 %1$d"
-#: config.c:825
+#: config.c:999
#, c-format
msgid "bad config line %d in file %s"
msgstr "檔案 %2$s 中錯誤的設定行 %1$d"
-#: config.c:829
+#: config.c:1003
#, c-format
msgid "bad config line %d in standard input"
msgstr "標準輸入中錯誤的設定行 %d"
-#: config.c:833
+#: config.c:1007
#, c-format
msgid "bad config line %d in submodule-blob %s"
msgstr "子模組資料物件 %2$s 中錯誤的設定行 %1$d"
-#: config.c:837
+#: config.c:1011
#, c-format
msgid "bad config line %d in command line %s"
msgstr "指令列 %2$s 中錯誤的設定行 %1$d"
-#: config.c:841
+#: config.c:1015
#, c-format
msgid "bad config line %d in %s"
msgstr "在 %2$s 中錯誤的設定行 %1$d"
-#: config.c:978
+#: config.c:1152
msgid "out of range"
msgstr "超出範圍"
-#: config.c:978
+#: config.c:1152
msgid "invalid unit"
msgstr "無效的單位"
-#: config.c:979
+#: config.c:1153
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
msgstr "設定變數 '%2$s' 的數字取值 '%1$s' 設定錯誤：%3$s"
-#: config.c:998
+#: config.c:1163
#, 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:1166
#, 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:1169
#, 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:1172
#, 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:1175
#, 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:1178
#, 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:1194
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr "「%2$s」的「%1$s」布林設定值無效"
+
+#: config.c:1289
#, c-format
msgid "failed to expand user dir in: '%s'"
msgstr "無法擴展使用者目錄：'%s'"
-#: config.c:1117
+#: config.c:1298
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
msgstr "'%2$s' 的值 '%1$s' 不是一個有效的時間戳"
-#: config.c:1208
+#: config.c:1391
#, c-format
msgid "abbrev length out of range: %d"
msgstr "縮寫長度超出範圍：%d"
-#: config.c:1222 config.c:1233
+#: config.c:1405 config.c:1416
#, c-format
msgid "bad zlib compression level %d"
msgstr "錯誤的 zlib 壓縮級別 %d"
-#: config.c:1325
+#: config.c:1508
msgid "core.commentChar should only be one character"
msgstr "core.commentChar 應該是一個字元"
-#: config.c:1358
+#: config.c:1541
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "無效的物件建立模式：%s"
-#: config.c:1430
+#: config.c:1613
#, c-format
msgid "malformed value for %s"
msgstr "%s 的取值格式錯誤"
-#: config.c:1456
+#: config.c:1639
#, c-format
msgid "malformed value for %s: %s"
msgstr "%s 的取值格式錯誤：%s"
-#: config.c:1457
+#: config.c:1640
msgid "must be one of nothing, matching, simple, upstream or current"
msgstr "必須是其中之一：nothing、matching、simple、upstream 或 current"
-#: config.c:1518 builtin/pack-objects.c:3541
+#: config.c:1701 builtin/pack-objects.c:3666
#, c-format
msgid "bad pack compression level %d"
msgstr "錯誤的打包壓縮級別 %d"
-#: config.c:1639
+#: config.c:1823
#, c-format
msgid "unable to load config blob object '%s'"
msgstr "無法從資料物件 '%s' 載入設定"
-#: config.c:1642
+#: config.c:1826
#, c-format
msgid "reference '%s' does not point to a blob"
msgstr "引用 '%s' 沒有指向一個資料物件"
-#: config.c:1659
+#: config.c:1843
#, c-format
msgid "unable to resolve config blob '%s'"
msgstr "不能解析設定物件 '%s'"
-#: config.c:1689
+#: config.c:1873
#, c-format
msgid "failed to parse %s"
msgstr "解析 %s 失敗"
-#: config.c:1743
+#: config.c:1927
msgid "unable to parse command-line config"
msgstr "無法解析指令列中的設定"
-#: config.c:2097
+#: config.c:2290
msgid "unknown error occurred while reading the configuration files"
msgstr "在讀取設定檔案時遇到未知錯誤"
-#: config.c:2267
+#: config.c:2464
#, c-format
msgid "Invalid %s: '%s'"
msgstr "無效 %s：'%s'"
-#: config.c:2312
+#: config.c:2509
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "splitIndex.maxPercentChange 的取值 '%d' 應該介於 0 和 100 之間"
-#: config.c:2358
+#: config.c:2555
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "無法解析指令列設定中的 '%s'"
-#: config.c:2360
+#: config.c:2557
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "在檔案 '%2$s' 的第 %3$d 行發現錯誤的設定變數 '%1$s'"
-#: config.c:2441
+#: config.c:2641
#, c-format
msgid "invalid section name '%s'"
msgstr "無效的小節名稱 '%s'"
-#: config.c:2473
+#: config.c:2673
#, c-format
msgid "%s has multiple values"
msgstr "%s 有多個取值"
-#: config.c:2502
+#: config.c:2702
#, c-format
msgid "failed to write new configuration file %s"
msgstr "寫入新的設定檔案 %s 失敗"
-#: config.c:2754 config.c:3078
+#: config.c:2954 config.c:3280
#, c-format
msgid "could not lock config file %s"
msgstr "不能鎖定設定檔案 %s"
-#: config.c:2765
+#: config.c:2965
#, c-format
msgid "opening %s"
msgstr "開啟 %s"
-#: config.c:2800 builtin/config.c:344
+#: config.c:3002 builtin/config.c:361
#, c-format
msgid "invalid pattern: %s"
msgstr "無效模式：%s"
-#: config.c:2825
+#: config.c:3027
#, c-format
msgid "invalid config file %s"
msgstr "無效的設定檔案 %s"
-#: config.c:2838 config.c:3091
+#: config.c:3040 config.c:3293
#, c-format
msgid "fstat on %s failed"
msgstr "對 %s 呼叫 fstat 失敗"
-#: config.c:2849
+#: config.c:3051
#, c-format
msgid "unable to mmap '%s'"
msgstr "不能 mmap '%s'"
-#: config.c:2858 config.c:3096
+#: config.c:3060 config.c:3298
#, c-format
msgid "chmod on %s failed"
msgstr "對 %s 呼叫 chmod 失敗"
-#: config.c:2943 config.c:3193
+#: config.c:3145 config.c:3395
#, c-format
msgid "could not write config file %s"
msgstr "不能寫入設定檔案 %s"
-#: config.c:2977
+#: config.c:3179
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "不能設定 '%s' 為 '%s'"
-#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
+#: config.c:3181 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
#, c-format
msgid "could not unset '%s'"
msgstr "不能取消設定 '%s'"
-#: config.c:3069
+#: config.c:3271
#, c-format
msgid "invalid section name: %s"
msgstr "無效的小節名稱：%s"
-#: config.c:3236
+#: config.c:3438
#, c-format
msgid "missing value for '%s'"
msgstr "%s 的取值缺少"
@@ -2726,72 +3016,81 @@
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:497
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr "伺服器指定的「%s」物件格式無效"
+
+#: connect.c:526
#, c-format
msgid "invalid ls-refs response: %s"
msgstr "無效的 ls-refs 回應：%s"
-#: connect.c:445
+#: connect.c:530
msgid "expected flush after ref listing"
msgstr "在引用列表之後應該有一個 flush 包"
-#: connect.c:544
+#: connect.c:533
+msgid "expected response end packet after ref listing"
+msgstr "在引用列表後預期要有回應結束封包"
+
+#: connect.c:666
#, c-format
msgid "protocol '%s' is not supported"
msgstr "不支援 '%s' 協定"
-#: connect.c:595
+#: connect.c:717
msgid "unable to set SO_KEEPALIVE on socket"
msgstr "無法為 socket 設定 SO_KEEPALIVE"
-#: connect.c:635 connect.c:698
+#: connect.c:757 connect.c:820
#, c-format
msgid "Looking up %s ... "
-msgstr "尋找 %s ..."
+msgstr "尋找 %s ... "
-#: connect.c:639
+#: connect.c:761
#, 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:765 connect.c:836
#, c-format
msgid ""
"done.\n"
@@ -2800,7 +3099,7 @@
"完成。\n"
"連線到 %s（埠 %s）... "
-#: connect.c:665 connect.c:742
+#: connect.c:787 connect.c:864
#, c-format
msgid ""
"unable to connect to %s:\n"
@@ -2810,73 +3109,77 @@
"%s"
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:671 connect.c:748
+#: connect.c:793 connect.c:870
msgid "done."
msgstr "完成。"
-#: connect.c:702
+#: connect.c:824
#, c-format
msgid "unable to look up %s (%s)"
msgstr "無法尋找 %s（%s）"
-#: connect.c:708
+#: connect.c:830
#, c-format
msgid "unknown port %s"
msgstr "未知埠 %s"
-#: connect.c:845 connect.c:1175
+#: connect.c:967 connect.c:1299
#, c-format
msgid "strange hostname '%s' blocked"
msgstr "已阻止奇怪的主機名稱 '%s'"
-#: connect.c:847
+#: connect.c:969
#, c-format
msgid "strange port '%s' blocked"
msgstr "已阻止奇怪的埠號 '%s'"
-#: connect.c:857
+#: connect.c:979
#, c-format
msgid "cannot start proxy %s"
msgstr "不能啟動代理 %s"
-#: connect.c:928
+#: connect.c:1050
msgid "no path specified; see 'git help pull' for valid url syntax"
msgstr "未指定路徑，執行 'git help pull' 檢視有效的 url 語法"
-#: connect.c:1123
+#: connect.c:1190
+msgid "newline is forbidden in git:// hosts and repo paths"
+msgstr "git:// 主機名稱和版本庫路徑中不能有換行"
+
+#: connect.c:1247
msgid "ssh variant 'simple' does not support -4"
msgstr "ssh 變體 'simple' 不支援 -4"
-#: connect.c:1135
+#: connect.c:1259
msgid "ssh variant 'simple' does not support -6"
msgstr "ssh 變體 'simple' 不支援 -6"
-#: connect.c:1152
+#: connect.c:1276
msgid "ssh variant 'simple' does not support setting port"
msgstr "ssh 變體 'simple' 不支援設定埠"
-#: connect.c:1264
+#: connect.c:1388
#, c-format
msgid "strange pathname '%s' blocked"
msgstr "已阻止奇怪的路徑名 '%s'"
-#: connect.c:1311
+#: connect.c:1436
msgid "unable to fork"
msgstr "無法 fork"
-#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43
+#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45
msgid "Checking connectivity"
msgstr "正在檢查連通性"
-#: connected.c:110
+#: connected.c:120
msgid "Could not run 'git rev-list'"
msgstr "不能執行 'git rev-list'"
-#: connected.c:130
+#: connected.c:144
msgid "failed write to rev-list"
msgstr "寫入 rev-list 失敗"
-#: connected.c:137
+#: connected.c:149
msgid "failed to close rev-list's stdin"
msgstr "關閉 rev-list 的標準輸入失敗"
@@ -2896,8 +3199,8 @@
"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"
-"在工作區中該檔案仍保持原有的換行符號。"
+"%s 中的 CRLF 將被 LF 取代。\n"
+"在工作區中該檔案仍保持原有的換行符號"
#: convert.c:217
#, c-format
@@ -2949,60 +3252,88 @@
msgid "encoding '%s' from %s to %s and back is not the same"
msgstr "將'%s' 的編碼從 %s 到 %s 來迴轉換不一致"
-#: convert.c:668
+#: convert.c:665
#, c-format
msgid "cannot fork to run external filter '%s'"
msgstr "不能 fork 以執行外部過濾器 '%s'"
-#: convert.c:688
+#: convert.c:685
#, c-format
msgid "cannot feed the input to external filter '%s'"
msgstr "不能將輸入傳遞給外部過濾器 '%s'"
-#: convert.c:695
+#: convert.c:692
#, c-format
msgid "external filter '%s' failed %d"
msgstr "外部過濾器 '%s' 失敗碼 %d"
-#: convert.c:730 convert.c:733
+#: convert.c:727 convert.c:730
#, c-format
msgid "read from external filter '%s' failed"
msgstr "從外部過濾器 '%s' 讀取失敗"
-#: convert.c:736 convert.c:791
+#: convert.c:733 convert.c:788
#, c-format
msgid "external filter '%s' failed"
msgstr "外部過濾器 '%s' 失敗"
-#: convert.c:839
+#: convert.c:837
msgid "unexpected filter type"
msgstr "意外的過濾類型"
-#: convert.c:850
+#: convert.c:848
msgid "path name too long for external filter"
msgstr "外部過濾器的路徑名太長"
-#: convert.c:924
+#: convert.c:940
#, c-format
msgid ""
"external filter '%s' is not available anymore although not all paths have "
"been filtered"
msgstr "外部過濾器 '%s' 不再可用，但並非所有路徑都已過濾"
-#: convert.c:1223
+#: convert.c:1240
msgid "true/false are no valid working-tree-encodings"
msgstr "true/false 不是有效的工作區編碼"
-#: convert.c:1411 convert.c:1445
+#: convert.c:1428 convert.c:1462
#, c-format
msgid "%s: clean filter '%s' failed"
msgstr "%s：clean 過濾器 '%s' 失敗"
-#: convert.c:1489
+#: 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 "在將來"
@@ -3086,14 +3417,30 @@
msgid "Marked %d islands, done.\n"
msgstr "已標記 %d 個資料島，結束。\n"
-#: diffcore-order.c:24
+#: diff-merges.c:70
#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "讀取排序檔案 '%s' 失敗"
+msgid "unknown value for --diff-merges: %s"
+msgstr "--diff-merges 的值無效：%s"
-#: diffcore-rename.c:543
-msgid "Performing inexact rename detection"
-msgstr "正在進行非精確的重新命名偵測"
+#: diff-lib.c:534
+msgid "--merge-base does not work with ranges"
+msgstr "—merge-base 跟範圍無法搭配運作"
+
+#: diff-lib.c:536
+msgid "--merge-base only works with commits"
+msgstr "--merge-base 只能跟提交搭配才能運作"
+
+#: diff-lib.c:553
+msgid "unable to get HEAD"
+msgstr "不能取得 HEAD"
+
+#: diff-lib.c:560
+msgid "no merge base found"
+msgstr "找不到合併基底"
+
+#: diff-lib.c:562
+msgid "multiple merge bases found"
+msgstr "找到多個合併基底"
#: diff-no-index.c:238
msgid "git diff --no-index [<options>] <path> <path>"
@@ -3106,18 +3453,18 @@
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'"
@@ -3125,7 +3472,7 @@
"移動的顏色設定必須是 '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', "
@@ -3134,18 +3481,18 @@
"未知的 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"
@@ -3154,35 +3501,35 @@
"發現設定變數 'diff.dirstat' 中的錯誤：\n"
"%s"
-#: diff.c:4202
+#: diff.c:4276
#, c-format
msgid "external diff died, stopping at %s"
msgstr "外部 diff 離開，停止在 %s"
-#: diff.c:4547
+#: diff.c:4628
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
-#: diff.c:4550
+#: diff.c:4631
msgid "-G, -S and --find-object are mutually exclusive"
msgstr "-G、-S 和 --find-object 是互斥的"
-#: diff.c:4628
+#: diff.c:4710
msgid "--follow requires exactly one pathspec"
msgstr "--follow 明確要求只跟一個路徑規格"
-#: diff.c:4676
+#: diff.c:4758
#, c-format
msgid "invalid --stat value: %s"
msgstr "無效的 --stat 值：%s"
-#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209
-#: parse-options.c:197 parse-options.c:201
+#: diff.c:4763 diff.c:4768 diff.c:4773 diff.c:4778 diff.c:5306
+#: 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:4713
+#: diff.c:4795
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -3191,195 +3538,200 @@
"無法解析 --dirstat/-X 選項的參數：\n"
"%s"
-#: diff.c:4798
+#: diff.c:4880
#, c-format
msgid "unknown change class '%c' in --diff-filter=%s"
msgstr "--diff-filter=%2$s 中未知的變更類 '%1$c'"
-#: diff.c:4822
+#: diff.c:4904
#, c-format
msgid "unknown value after ws-error-highlight=%.*s"
msgstr "ws-error-highlight=%.*s 之後未知的值"
-#: diff.c:4836
+#: diff.c:4918
#, c-format
msgid "unable to resolve '%s'"
msgstr "不能解析 '%s'"
-#: diff.c:4886 diff.c:4892
+#: diff.c:4968 diff.c:4974
#, c-format
msgid "%s expects <n>/<m> form"
msgstr "%s 期望 <n>/<m> 格式"
-#: diff.c:4904
+#: diff.c:4986
#, c-format
msgid "%s expects a character, got '%s'"
msgstr "%s 期望一個字元，得到 '%s'"
-#: diff.c:4925
+#: diff.c:5007
#, c-format
msgid "bad --color-moved argument: %s"
msgstr "壞的 --color-moved 參數：%s"
-#: diff.c:4944
+#: diff.c:5026
#, c-format
msgid "invalid mode '%s' in --color-moved-ws"
-msgstr "--color-moved-ws 中的無效模式 '%s' "
+msgstr "--color-moved-ws 中的無效模式 '%s'"
-#: diff.c:4984
+#: diff.c:5066
msgid ""
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
"\"histogram\""
msgstr ""
"diff-algorithm 選項有 \"myers\"、\"minimal\"、\"patience\" 和 \"histogram\""
-#: diff.c:5020 diff.c:5040
+#: diff.c:5102 diff.c:5122
#, c-format
msgid "invalid argument to %s"
msgstr "%s 的參數無效"
-#: diff.c:5178
+#: diff.c:5226
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr "傳入 -I 的正規表示式無效：「%s」"
+
+#: diff.c:5275
#, c-format
msgid "failed to parse --submodule option parameter: '%s'"
msgstr "無法解析 --submodule 選項的參數：'%s'"
-#: diff.c:5234
+#: diff.c:5331
#, c-format
msgid "bad --word-diff argument: %s"
msgstr "壞的 --word-diff 參數：%s"
-#: diff.c:5257
+#: diff.c:5367
msgid "Diff output format options"
msgstr "差異輸出格式化選項"
-#: diff.c:5259 diff.c:5265
+#: diff.c:5369 diff.c:5375
msgid "generate patch"
msgstr "生成修補檔"
-#: diff.c:5262 builtin/log.c:173
+#: diff.c:5372 builtin/log.c:179
msgid "suppress diff output"
msgstr "不顯示差異輸出"
-#: diff.c:5267 diff.c:5381 diff.c:5388
+#: diff.c:5377 diff.c:5491 diff.c:5498
msgid "<n>"
msgstr "<n>"
-#: diff.c:5268 diff.c:5271
+#: diff.c:5378 diff.c:5381
msgid "generate diffs with <n> lines context"
msgstr "生成含 <n> 行上下文的差異"
-#: diff.c:5273
+#: diff.c:5383
msgid "generate the diff in raw format"
msgstr "生成原始格式的差異"
-#: diff.c:5276
+#: diff.c:5386
msgid "synonym for '-p --raw'"
msgstr "和 '-p --raw' 同義"
-#: diff.c:5280
+#: diff.c:5390
msgid "synonym for '-p --stat'"
msgstr "和 '-p --stat' 同義"
-#: diff.c:5284
+#: diff.c:5394
msgid "machine friendly --stat"
msgstr "機器友好的 --stat"
-#: diff.c:5287
+#: diff.c:5397
msgid "output only the last line of --stat"
msgstr "只輸出 --stat 的最後一行"
-#: diff.c:5289 diff.c:5297
+#: diff.c:5399 diff.c:5407
msgid "<param1,param2>..."
msgstr "<參數1,參數2>..."
-#: diff.c:5290
+#: diff.c:5400
msgid ""
"output the distribution of relative amount of changes for each sub-directory"
msgstr "輸出每個子目錄相對變更的分布"
-#: diff.c:5294
+#: diff.c:5404
msgid "synonym for --dirstat=cumulative"
msgstr "和 --dirstat=cumulative 同義"
-#: diff.c:5298
+#: diff.c:5408
msgid "synonym for --dirstat=files,param1,param2..."
msgstr "是 --dirstat=files,param1,param2... 的同義詞"
-#: diff.c:5302
+#: diff.c:5412
msgid "warn if changes introduce conflict markers or whitespace errors"
msgstr "如果變更中引入衝突定界符或空白錯誤，給出警告"
-#: diff.c:5305
+#: diff.c:5415
msgid "condensed summary such as creations, renames and mode changes"
msgstr "精簡摘要，例如建立、重新命名和模式變更"
-#: diff.c:5308
+#: diff.c:5418
msgid "show only names of changed files"
msgstr "只顯示變更檔案的檔案名"
-#: diff.c:5311
+#: diff.c:5421
msgid "show only names and status of changed files"
msgstr "只顯示變更檔案的檔案名和狀態"
-#: diff.c:5313
+#: diff.c:5423
msgid "<width>[,<name-width>[,<count>]]"
msgstr "<寬度>[,<檔案名寬度>[,<次數>]]"
-#: diff.c:5314
+#: diff.c:5424
msgid "generate diffstat"
msgstr "生成差異統計（diffstat）"
-#: diff.c:5316 diff.c:5319 diff.c:5322
+#: diff.c:5426 diff.c:5429 diff.c:5432
msgid "<width>"
msgstr "<寬度>"
-#: diff.c:5317
+#: diff.c:5427
msgid "generate diffstat with a given width"
msgstr "使用提供的長度生成差異統計"
-#: diff.c:5320
+#: diff.c:5430
msgid "generate diffstat with a given name width"
msgstr "使用提供的檔案名長度生成差異統計"
-#: diff.c:5323
+#: diff.c:5433
msgid "generate diffstat with a given graph width"
msgstr "使用提供的圖形長度生成差異統計"
-#: diff.c:5325
+#: diff.c:5435
msgid "<count>"
msgstr "<次數>"
-#: diff.c:5326
+#: diff.c:5436
msgid "generate diffstat with limited lines"
msgstr "生成有限行數的差異統計"
-#: diff.c:5329
+#: diff.c:5439
msgid "generate compact summary in diffstat"
msgstr "生成差異統計的簡潔摘要"
-#: diff.c:5332
+#: diff.c:5442
msgid "output a binary diff that can be applied"
msgstr "輸出一個可以應用的二進位差異"
-#: diff.c:5335
+#: diff.c:5445
msgid "show full pre- and post-image object names on the \"index\" lines"
msgstr "在 \"index\" 行顯示完整的前後物件名稱"
-#: diff.c:5337
+#: diff.c:5447
msgid "show colored diff"
msgstr "顯示帶顏色的差異"
-#: diff.c:5338
+#: diff.c:5448
msgid "<kind>"
msgstr "<類型>"
-#: diff.c:5339
+#: diff.c:5449
msgid ""
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
"diff"
msgstr "對於差異中的上下文、舊的和新的行，加亮顯示錯誤的空白字元"
-#: diff.c:5342
+#: diff.c:5452
msgid ""
"do not munge pathnames and use NULs as output field terminators in --raw or "
"--numstat"
@@ -3387,377 +3739,407 @@
"在 --raw 或者 --numstat 中，不對路徑字元轉檔並使用 NUL 字元做為輸出欄位的分隔"
"符"
-#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457
+#: diff.c:5455 diff.c:5458 diff.c:5461 diff.c:5570
msgid "<prefix>"
msgstr "<前綴>"
-#: diff.c:5346
+#: diff.c:5456
msgid "show the given source prefix instead of \"a/\""
msgstr "顯示提供的源前綴取代 \"a/\""
-#: diff.c:5349
+#: diff.c:5459
msgid "show the given destination prefix instead of \"b/\""
msgstr "顯示提供的目標前綴取代 \"b/\""
-#: diff.c:5352
+#: diff.c:5462
msgid "prepend an additional prefix to every line of output"
msgstr "輸出的每一行附加前綴"
-#: diff.c:5355
+#: diff.c:5465
msgid "do not show any source or destination prefix"
msgstr "不顯示任何源和目標前綴"
-#: diff.c:5358
+#: diff.c:5468
msgid "show context between diff hunks up to the specified number of lines"
msgstr "顯示指定行數的差異區塊間的上下文"
-#: diff.c:5362 diff.c:5367 diff.c:5372
+#: diff.c:5472 diff.c:5477 diff.c:5482
msgid "<char>"
msgstr "<字元>"
-#: diff.c:5363
+#: diff.c:5473
msgid "specify the character to indicate a new line instead of '+'"
msgstr "指定一個字元取代 '+' 來表示新的一行"
-#: diff.c:5368
+#: diff.c:5478
msgid "specify the character to indicate an old line instead of '-'"
msgstr "指定一個字元取代 '-' 來表示舊的一行"
-#: diff.c:5373
+#: diff.c:5483
msgid "specify the character to indicate a context instead of ' '"
msgstr "指定一個字元取代 ' ' 來表示一行上下文"
-#: diff.c:5376
+#: diff.c:5486
msgid "Diff rename options"
msgstr "差異重新命名選項"
-#: diff.c:5377
+#: diff.c:5487
msgid "<n>[/<m>]"
msgstr "<n>[/<m>]"
-#: diff.c:5378
+#: diff.c:5488
msgid "break complete rewrite changes into pairs of delete and create"
msgstr "將完全重寫的變更打破為成對的刪除和建立"
-#: diff.c:5382
+#: diff.c:5492
msgid "detect renames"
msgstr "檢測重新命名"
-#: diff.c:5386
+#: diff.c:5496
msgid "omit the preimage for deletes"
-msgstr "省略刪除動作的差異輸出"
+msgstr "省略刪除變更的差異輸出"
-#: diff.c:5389
+#: diff.c:5499
msgid "detect copies"
msgstr "檢測複製"
-#: diff.c:5393
+#: diff.c:5503
msgid "use unmodified files as source to find copies"
msgstr "使用未修改的檔案做為發現複製的源"
-#: diff.c:5395
+#: diff.c:5505
msgid "disable rename detection"
-msgstr "禁用重新命名偵測"
+msgstr "停用重新命名偵測"
-#: diff.c:5398
+#: diff.c:5508
msgid "use empty blobs as rename source"
msgstr "使用空的資料物件做為重新命名的源"
-#: diff.c:5400
+#: diff.c:5510
msgid "continue listing the history of a file beyond renames"
msgstr "繼續列出檔案重新命名以外的歷史記錄"
-#: diff.c:5403
+#: diff.c:5513
msgid ""
"prevent rename/copy detection if the number of rename/copy targets exceeds "
"given limit"
msgstr "如果重新命名/複製目標超過提供的限制，禁止重新命名/複製檢測"
-#: diff.c:5405
+#: diff.c:5515
msgid "Diff algorithm options"
msgstr "差異演算法選項"
-#: diff.c:5407
+#: diff.c:5517
msgid "produce the smallest possible diff"
msgstr "生成儘可能小的差異"
-#: diff.c:5410
+#: diff.c:5520
msgid "ignore whitespace when comparing lines"
msgstr "行比較時忽略空白字元"
-#: diff.c:5413
+#: diff.c:5523
msgid "ignore changes in amount of whitespace"
msgstr "忽略空白字元的變更"
-#: diff.c:5416
+#: diff.c:5526
msgid "ignore changes in whitespace at EOL"
msgstr "忽略行尾的空白字元變更"
-#: diff.c:5419
+#: diff.c:5529
msgid "ignore carrier-return at the end of line"
msgstr "忽略行尾的Enter符（CR）"
-#: diff.c:5422
+#: diff.c:5532
msgid "ignore changes whose lines are all blank"
msgstr "忽略整行都是空白的變更"
-#: diff.c:5425
-msgid "heuristic to shift diff hunk boundaries for easy reading"
-msgstr "啟發式轉換差異邊界以便閱讀"
-
-#: diff.c:5428
-msgid "generate diff using the \"patience diff\" algorithm"
-msgstr "使用 \"patience diff\" 演算法生成差異"
-
-#: diff.c:5432
-msgid "generate diff using the \"histogram diff\" algorithm"
-msgstr "使用 \"histogram diff\" 演算法生成差異"
-
-#: diff.c:5434
-msgid "<algorithm>"
-msgstr "<演算法>"
-
-#: diff.c:5435
-msgid "choose a diff algorithm"
-msgstr "選擇一個差異演算法"
-
-#: diff.c:5437
-msgid "<text>"
-msgstr "<文字>"
-
-#: diff.c:5438
-msgid "generate diff using the \"anchored diff\" algorithm"
-msgstr "使用 \"anchored diff\" 演算法生成差異"
-
-#: diff.c:5440 diff.c:5449 diff.c:5452
-msgid "<mode>"
-msgstr "<模式>"
-
-#: diff.c:5441
-msgid "show word diff, using <mode> to delimit changed words"
-msgstr "顯示單詞差異，使用 <模式> 分隔變更的單詞"
-
-#: diff.c:5443 diff.c:5446 diff.c:5491
+#: diff.c:5534 diff.c:5556 diff.c:5559 diff.c:5604
msgid "<regex>"
msgstr "<正則>"
-#: diff.c:5444
+#: diff.c:5535
+msgid "ignore changes whose all lines match <regex>"
+msgstr "忽略整行符合 <regex> 的變更"
+
+#: diff.c:5538
+msgid "heuristic to shift diff hunk boundaries for easy reading"
+msgstr "啟發式轉換差異邊界以便閱讀"
+
+#: diff.c:5541
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr "使用 \"patience diff\" 演算法生成差異"
+
+#: diff.c:5545
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr "使用 \"histogram diff\" 演算法生成差異"
+
+#: diff.c:5547
+msgid "<algorithm>"
+msgstr "<演算法>"
+
+#: diff.c:5548
+msgid "choose a diff algorithm"
+msgstr "選擇一個差異演算法"
+
+#: diff.c:5550
+msgid "<text>"
+msgstr "<文字>"
+
+#: diff.c:5551
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr "使用 \"anchored diff\" 演算法生成差異"
+
+#: diff.c:5553 diff.c:5562 diff.c:5565
+msgid "<mode>"
+msgstr "<模式>"
+
+#: diff.c:5554
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr "顯示單詞差異，使用 <模式> 分隔變更的單詞"
+
+#: diff.c:5557
msgid "use <regex> to decide what a word is"
msgstr "使用 <正規表示式> 確定何為一個詞"
-#: diff.c:5447
+#: diff.c:5560
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
msgstr "相當於 --word-diff=color --word-diff-regex=<正則>"
-#: diff.c:5450
+#: diff.c:5563
msgid "moved lines of code are colored differently"
msgstr "移動的程式碼行用不同方式著色"
-#: diff.c:5453
+#: diff.c:5566
msgid "how white spaces are ignored in --color-moved"
msgstr "在 --color-moved 下如何忽略空白字元"
-#: diff.c:5456
+#: diff.c:5569
msgid "Other diff options"
msgstr "其它差異選項"
-#: diff.c:5458
+#: diff.c:5571
msgid "when run from subdir, exclude changes outside and show relative paths"
msgstr "當從子目錄執行，排除目錄之外的變更並顯示相對路徑"
-#: diff.c:5462
+#: diff.c:5575
msgid "treat all files as text"
msgstr "把所有檔案當做文字處理"
-#: diff.c:5464
+#: diff.c:5577
msgid "swap two inputs, reverse the diff"
msgstr "交換兩個輸入，反轉差異"
-#: diff.c:5466
+#: diff.c:5579
msgid "exit with 1 if there were differences, 0 otherwise"
msgstr "有差異時離開碼為 1，否則為 0"
-#: diff.c:5468
+#: diff.c:5581
msgid "disable all output of the program"
-msgstr "禁用本程式的所有輸出"
+msgstr "停用本程式的所有輸出"
-#: diff.c:5470
+#: diff.c:5583
msgid "allow an external diff helper to be executed"
-msgstr "允許執行一個外部的差異助手"
+msgstr "允許執行一個外部的差異協助工具"
-#: diff.c:5472
+#: diff.c:5585
msgid "run external text conversion filters when comparing binary files"
msgstr "當比較二進位檔案時，執行外部的文字轉換過濾器"
-#: diff.c:5474
+#: diff.c:5587
msgid "<when>"
msgstr "<何時>"
-#: diff.c:5475
+#: diff.c:5588
msgid "ignore changes to submodules in the diff generation"
msgstr "在生成差異時，忽略子模組的更改"
-#: diff.c:5478
+#: diff.c:5591
msgid "<format>"
msgstr "<格式>"
-#: diff.c:5479
+#: diff.c:5592
msgid "specify how differences in submodules are shown"
msgstr "指定子模組的差異如何顯示"
-#: diff.c:5483
+#: diff.c:5596
msgid "hide 'git add -N' entries from the index"
msgstr "隱藏索引中 'git add -N' 條目"
-#: diff.c:5486
+#: diff.c:5599
msgid "treat 'git add -N' entries as real in the index"
msgstr "將索引中 'git add -N' 條目當做真實的"
-#: diff.c:5488
+#: diff.c:5601
msgid "<string>"
msgstr "<字串>"
-#: diff.c:5489
+#: diff.c:5602
msgid ""
"look for differences that change the number of occurrences of the specified "
"string"
msgstr "尋找改變了指定字串出現次數的差異"
-#: diff.c:5492
+#: diff.c:5605
msgid ""
"look for differences that change the number of occurrences of the specified "
"regex"
msgstr "尋找改變指定正則符合出現次數的差異"
-#: diff.c:5495
+#: diff.c:5608
msgid "show all changes in the changeset with -S or -G"
msgstr "顯示使用 -S 或 -G 的變更集的所有變更"
-#: diff.c:5498
+#: diff.c:5611
msgid "treat <string> in -S as extended POSIX regular expression"
msgstr "將 -S 的 <string> 當做擴展的 POSIX 正規表示式"
-#: diff.c:5501
+#: diff.c:5614
msgid "control the order in which files appear in the output"
msgstr "控制輸出中的檔案顯示順序"
-#: diff.c:5502
+#: diff.c:5615 diff.c:5618
+msgid "<path>"
+msgstr "<路徑>"
+
+#: diff.c:5616
+msgid "show the change in the specified path first"
+msgstr "先顯示指定路徑的變更"
+
+#: diff.c:5619
+msgid "skip the output to the specified path"
+msgstr ""
+
+#: diff.c:5621
msgid "<object-id>"
msgstr "<物件 ID>"
-#: diff.c:5503
+#: diff.c:5622
msgid ""
"look for differences that change the number of occurrences of the specified "
"object"
msgstr "尋找改變指定物件出現次數的差異"
-#: diff.c:5505
+#: diff.c:5624
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
-#: diff.c:5506
+#: diff.c:5625
msgid "select files by diff type"
msgstr "透過差異類型選擇檔案"
-#: diff.c:5508
+#: diff.c:5627
msgid "<file>"
msgstr "<檔案>"
-#: diff.c:5509
+#: diff.c:5628
msgid "Output to a specific file"
msgstr "輸出到一個指定的檔案"
-#: diff.c:6164
+#: diff.c:6285
msgid "inexact rename detection was skipped due to too many files."
msgstr "因為檔案太多，略過不嚴格的重新命名檢查。"
-#: diff.c:6167
+#: diff.c:6288
msgid "only found copies from modified paths due to too many files."
msgstr "因為檔案太多，只在修改的路徑中尋找複製。"
-#: diff.c:6170
+#: diff.c:6291
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr "您可能想要將變數 %s 設定為至少 %d 並再次執行此指令。"
-#: dir.c:555
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "讀取排序檔案 '%s' 失敗"
+
+#: diffcore-rename.c:786
+msgid "Performing inexact rename detection"
+msgstr "正在進行非精確的重新命名偵測"
+
+#: diffcore-rotate.c:29
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr "diff 中沒有「%s」路徑"
+
+#: dir.c:578
#, c-format
msgid "pathspec '%s' did not match any file(s) known to git"
msgstr "路徑規格 '%s' 未符合任何 git 已知檔案"
-#: dir.c:695 dir.c:724 dir.c:737
+#: dir.c:718 dir.c:747 dir.c:760
#, c-format
msgid "unrecognized pattern: '%s'"
msgstr "無法識別樣式：「%s」"
-#: dir.c:754 dir.c:768
+#: dir.c:777 dir.c:791
#, c-format
msgid "unrecognized negative pattern: '%s'"
msgstr "無法識別反向模式：「%s」"
-#: dir.c:786
+#: dir.c:809
#, c-format
msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
-msgstr "您的稀疏簽出檔案可能有問題：「%s」樣式重複"
+msgstr "您的稀疏檢出檔案可能有問題：「%s」樣式重複"
-#: dir.c:796
+#: dir.c:819
msgid "disabling cone pattern matching"
msgstr "停用 cone 樣式符合模式"
-#: dir.c:1173
+#: dir.c:1198
#, c-format
msgid "cannot use %s as an exclude file"
msgstr "不能將 %s 用作排除檔案"
-#: dir.c:2144
+#: dir.c:2305
#, c-format
msgid "could not open directory '%s'"
msgstr "不能開啟目錄 '%s'"
-#: dir.c:2479
+#: dir.c:2605
msgid "failed to get kernel name and information"
msgstr "無法獲得核心名稱和訊息"
-#: dir.c:2603
+#: dir.c:2729
msgid "untracked cache is disabled on this system or location"
-msgstr "快取未追蹤檔案在本系統或位置中被禁用"
+msgstr "快取未追蹤檔案在本系統或位置中被停用"
-#: dir.c:3407
+#: dir.c:3534
#, c-format
msgid "index file corrupt in repo %s"
msgstr "版本庫 %s 中的索引檔案損壞"
-#: dir.c:3452 dir.c:3457
+#: dir.c:3579 dir.c:3584
#, c-format
msgid "could not create directories for %s"
msgstr "不能為 %s 建立目錄"
-#: dir.c:3486
+#: dir.c:3613
#, 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"
-#: environment.c:149
+#: environment.c:152
#, c-format
msgid "bad git namespace path \"%s\""
msgstr "錯誤的 git 名字空間路徑 \"%s\""
-#: environment.c:331
+#: environment.c:335
#, c-format
msgid "could not set GIT_DIR to '%s'"
msgstr "不能設定 GIT_DIR 為 '%s'"
@@ -3767,250 +4149,272 @@
msgid "too many args to run %s"
msgstr "執行 %s 的參數太多"
-#: fetch-pack.c:150
+#: fetch-pack.c:177
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack：應為 shallow 列表"
-#: fetch-pack.c:153
+#: fetch-pack.c:180
msgid "git fetch-pack: expected a flush packet after shallow list"
msgstr "git fetch-pack：在淺複製列表之後期望一個 flush 包"
-#: fetch-pack.c:164
+#: fetch-pack.c:191
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
msgstr "git fetch-pack：期望 ACK/NAK，卻得到 flush 包"
-#: fetch-pack.c:184
+#: fetch-pack.c:211
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack：應為 ACK/NAK，卻得到 '%s'"
-#: fetch-pack.c:195
+#: fetch-pack.c:222
msgid "unable to write to remote"
msgstr "無法寫到遠端"
-#: fetch-pack.c:257
+#: fetch-pack.c:283
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc 需要 multi_ack_detailed"
-#: fetch-pack.c:356 fetch-pack.c:1340
+#: fetch-pack.c:378 fetch-pack.c:1457
#, c-format
msgid "invalid shallow line: %s"
msgstr "無效的 shallow 訊息：%s"
-#: fetch-pack.c:362 fetch-pack.c:1346
+#: fetch-pack.c:384 fetch-pack.c:1463
#, c-format
msgid "invalid unshallow line: %s"
msgstr "無效的 unshallow 訊息：%s"
-#: fetch-pack.c:364 fetch-pack.c:1348
+#: fetch-pack.c:386 fetch-pack.c:1465
#, c-format
msgid "object not found: %s"
msgstr "物件未找到：%s"
-#: fetch-pack.c:367 fetch-pack.c:1351
+#: fetch-pack.c:389 fetch-pack.c:1468
#, c-format
msgid "error in object: %s"
msgstr "物件中發生錯誤：%s"
-#: fetch-pack.c:369 fetch-pack.c:1353
+#: fetch-pack.c:391 fetch-pack.c:1470
#, c-format
msgid "no shallow found: %s"
msgstr "未發現 shallow：%s"
-#: fetch-pack.c:372 fetch-pack.c:1357
+#: fetch-pack.c:394 fetch-pack.c:1474
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "應為 shallow/unshallow，卻得到 %s"
-#: fetch-pack.c:414
+#: fetch-pack.c:434
#, c-format
msgid "got %s %d %s"
msgstr "得到 %s %d %s"
-#: fetch-pack.c:431
+#: fetch-pack.c:451
#, c-format
msgid "invalid commit %s"
msgstr "無效提交 %s"
-#: fetch-pack.c:462
+#: fetch-pack.c:482
msgid "giving up"
msgstr "放棄"
-#: fetch-pack.c:475 progress.c:323
+#: fetch-pack.c:495 progress.c:339
msgid "done"
msgstr "完成"
-#: fetch-pack.c:487
+#: fetch-pack.c:507
#, c-format
msgid "got %s (%d) %s"
msgstr "得到 %s (%d) %s"
-#: fetch-pack.c:533
+#: fetch-pack.c:543
#, c-format
msgid "Marking %s as complete"
msgstr "標記 %s 為完成"
-#: fetch-pack.c:754
+#: fetch-pack.c:758
#, c-format
msgid "already have %s (%s)"
msgstr "已經有 %s（%s）"
-#: fetch-pack.c:818
+#: fetch-pack.c:844
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack：無法衍生 sideband 多路輸出"
-#: fetch-pack.c:826
+#: fetch-pack.c:852
msgid "protocol error: bad pack header"
msgstr "協定錯誤：壞的包頭"
-#: fetch-pack.c:900
+#: fetch-pack.c:946
#, c-format
msgid "fetch-pack: unable to fork off %s"
-msgstr "fetch-pack：無法衍生進程 %s"
+msgstr "fetch-pack：無法 fork %s 處理程序"
-#: fetch-pack.c:916
+#: fetch-pack.c:952
+msgid "fetch-pack: invalid index-pack output"
+msgstr "fetch-pack：無效的 index-pack 輸出"
+
+#: fetch-pack.c:969
#, c-format
msgid "%s failed"
msgstr "%s 失敗"
-#: fetch-pack.c:918
+#: fetch-pack.c:971
msgid "error in sideband demultiplexer"
msgstr "sideband 多路輸出發生錯誤"
-#: fetch-pack.c:965
+#: fetch-pack.c:1031
#, c-format
msgid "Server version is %.*s"
msgstr "伺服器版本 %.*s"
-#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985
-#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001
-#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017
-#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039
+#: fetch-pack.c:1039 fetch-pack.c:1045 fetch-pack.c:1048 fetch-pack.c:1054
+#: fetch-pack.c:1058 fetch-pack.c:1062 fetch-pack.c:1066 fetch-pack.c:1070
+#: fetch-pack.c:1074 fetch-pack.c:1078 fetch-pack.c:1082 fetch-pack.c:1086
+#: fetch-pack.c:1092 fetch-pack.c:1098 fetch-pack.c:1103 fetch-pack.c:1108
#, c-format
msgid "Server supports %s"
msgstr "伺服器支援 %s"
-#: fetch-pack.c:972
+#: fetch-pack.c:1041
msgid "Server does not support shallow clients"
msgstr "伺服器不支援 shalllow 用戶端"
-#: fetch-pack.c:1032
+#: fetch-pack.c:1101
msgid "Server does not support --shallow-since"
msgstr "伺服器不支援 --shallow-since"
-#: fetch-pack.c:1037
+#: fetch-pack.c:1106
msgid "Server does not support --shallow-exclude"
msgstr "伺服器不支援 --shallow-exclude"
-#: fetch-pack.c:1041
+#: fetch-pack.c:1110
msgid "Server does not support --deepen"
msgstr "伺服器不支援 --deepen"
-#: fetch-pack.c:1058
+#: fetch-pack.c:1112
+msgid "Server does not support this repository's object format"
+msgstr "伺服器不支援此版本庫的物件格式"
+
+#: fetch-pack.c:1125
msgid "no common commits"
msgstr "沒有共同的提交"
-#: fetch-pack.c:1070 fetch-pack.c:1536
+#: fetch-pack.c:1138 fetch-pack.c:1682
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack：取得失敗。"
-#: fetch-pack.c:1209
+#: fetch-pack.c:1265
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "算法不一致：用戶端 %s；伺服器 %s"
+
+#: fetch-pack.c:1269
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "伺服器不支援「%s」算法"
+
+#: fetch-pack.c:1289
msgid "Server does not support shallow requests"
msgstr "伺服器不支援 shalllow 請求"
-#: fetch-pack.c:1216
+#: fetch-pack.c:1296
msgid "Server supports filter"
msgstr "伺服器支援 filter"
-#: fetch-pack.c:1239
+#: fetch-pack.c:1335
msgid "unable to write request to remote"
msgstr "無法將請求寫到遠端"
-#: fetch-pack.c:1257
+#: fetch-pack.c:1353
#, c-format
msgid "error reading section header '%s'"
msgstr "讀取節標題 '%s' 發生錯誤"
-#: fetch-pack.c:1263
+#: fetch-pack.c:1359
#, c-format
msgid "expected '%s', received '%s'"
msgstr "預期 '%s'，得到 '%s'"
-#: fetch-pack.c:1303
+#: fetch-pack.c:1420
#, c-format
msgid "unexpected acknowledgment line: '%s'"
msgstr "意外的確認行：'%s'"
-#: fetch-pack.c:1308
+#: fetch-pack.c:1425
#, c-format
msgid "error processing acks: %d"
msgstr "處理 ack 發生錯誤：%d"
-#: fetch-pack.c:1318
+#: fetch-pack.c:1435
msgid "expected packfile to be sent after 'ready'"
msgstr "預期在 'ready' 之後傳送 packfile"
-#: fetch-pack.c:1320
+#: fetch-pack.c:1437
msgid "expected no other sections to be sent after no 'ready'"
msgstr "在沒有 'ready' 不應該傳送其它小節"
-#: fetch-pack.c:1362
+#: fetch-pack.c:1479
#, c-format
msgid "error processing shallow info: %d"
msgstr "處理淺複製訊息發生錯誤：%d"
-#: fetch-pack.c:1409
+#: fetch-pack.c:1526
#, c-format
msgid "expected wanted-ref, got '%s'"
msgstr "預期 wanted-ref，得到 '%s'"
-#: fetch-pack.c:1414
+#: fetch-pack.c:1531
#, c-format
msgid "unexpected wanted-ref: '%s'"
msgstr "意外的 wanted-ref：'%s'"
-#: fetch-pack.c:1419
+#: fetch-pack.c:1536
#, c-format
msgid "error processing wanted refs: %d"
msgstr "處理要取得的引用發生錯誤：%d"
-#: fetch-pack.c:1762
+#: fetch-pack.c:1566
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack: 預期要有回應結束封包"
+
+#: fetch-pack.c:1960
msgid "no matching remote head"
msgstr "沒有符合的遠端分支"
-#: fetch-pack.c:1785 builtin/clone.c:689
+#: fetch-pack.c:1983 builtin/clone.c:693
msgid "remote did not send all necessary objects"
msgstr "遠端沒有傳送所有必需的物件"
-#: fetch-pack.c:1812
+#: fetch-pack.c:2010
#, c-format
msgid "no such remote ref %s"
msgstr "沒有這樣的遠端引用 %s"
-#: fetch-pack.c:1815
+#: fetch-pack.c:2013
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "伺服器不允許請求未公開的物件 %s"
-#: gpg-interface.c:408
-msgid "gpg failed to sign the data"
-msgstr "gpg 無法為資料簽名"
-
-#: gpg-interface.c:434
+#: gpg-interface.c:273
msgid "could not create temporary file"
msgstr "不能建立暫存檔"
-#: gpg-interface.c:437
+#: gpg-interface.c:276
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "無法將分離式簽名寫入 '%s'"
+#: gpg-interface.c:470
+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
+#: grep.c:543
msgid ""
"given pattern contains NULL byte (via -f <file>). This is only supported "
"with -P under PCRE v2"
@@ -4018,18 +4422,18 @@
"提供的模式包含 NULL 字元（通過 -f <檔案> 參數）。只有 PCRE v2 下的 -P 支援此"
"功能"
-#: grep.c:2128
+#: grep.c:1906
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s'：無法讀取 %s"
-#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82
+#: grep.c:1923 setup.c:176 builtin/clone.c:412 builtin/diff.c:90
#: builtin/rm.c:135
#, c-format
msgid "failed to stat '%s'"
msgstr "對 '%s' 呼叫 stat 失敗"
-#: grep.c:2156
+#: grep.c:1934
#, c-format
msgid "'%s': short read"
msgstr "'%s'：讀取不完整"
@@ -4084,43 +4488,43 @@
#: 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 "在 '%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:100
#, 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:527
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
@@ -4129,31 +4533,31 @@
"'%s' 像是一個 git 指令，但卻無法執行。\n"
"可能是 git-%s 受損？"
-#: help.c:655
-msgid "Uh oh. Your system reports no Git commands at all."
-msgstr "唉呀，您的系統中未發現 Git 指令。"
-
-#: help.c:677
-#, c-format
-msgid "WARNING: You called a Git command named '%s', which does not exist."
-msgstr "警告：您執行了一個並不存在的 Git 指令 '%s'。"
-
-#: help.c:682
-#, c-format
-msgid "Continuing under the assumption that you meant '%s'."
-msgstr "假定你想要的是 '%s' 並繼續。"
-
-#: help.c:687
-#, c-format
-msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
-msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒鐘後繼續。"
-
-#: help.c:695
+#: help.c:543 help.c:631
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git：'%s' 不是一個 git 指令。參見 'git --help'。"
-#: help.c:699
+#: help.c:591
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "唉呀，您的系統中未發現 Git 指令。"
+
+#: help.c:613
+#, c-format
+msgid "WARNING: You called a Git command named '%s', which does not exist."
+msgstr "警告：您執行了一個並不存在的 Git 指令 '%s'。"
+
+#: help.c:618
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr "假定你想要的是 '%s' 並繼續。"
+
+#: help.c:623
+#, c-format
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒鐘後繼續。"
+
+#: help.c:635
msgid ""
"\n"
"The most similar command is"
@@ -4164,16 +4568,16 @@
"\n"
"最類似的指令有"
-#: help.c:714
+#: help.c:675
msgid "git version [<options>]"
msgstr "git version [<選項>]"
-#: help.c:783
+#: help.c:730
#, c-format
msgid "%s: %s - %s"
msgstr "%s：%s - %s"
-#: help.c:787
+#: help.c:734
msgid ""
"\n"
"Did you mean this?"
@@ -4184,7 +4588,15 @@
"\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"
@@ -4209,39 +4621,79 @@
"來設定您帳號的預設身份標記。\n"
"如果僅在本版本庫設定身份標記，則省略 --global 參數。\n"
-#: ident.c:379
+#: ident.c:397
msgid "no email was given and auto-detection is disabled"
-msgstr "未提供信件位址且自動偵測被禁用"
+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 "未提供姓名且自動偵測被禁用"
+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"
+msgstr "姓名中僅包含停用字元：%s"
-#: ident.c:436 builtin/commit.c:635
+#: 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"
@@ -4257,43 +4709,7 @@
msgid "unable to load root tree for commit %s"
msgstr "無法為提交 %s 載入根樹"
-#: list-objects-filter.c:492
-#, c-format
-msgid "unable to access sparse blob in '%s'"
-msgstr "不能存取 '%s' 中的稀疏資料物件"
-
-#: list-objects-filter.c:495
-#, c-format
-msgid "unable to parse sparse filter data in %s"
-msgstr "無法解析 %s 中的稀疏過濾器資料"
-
-#: list-objects-filter-options.c:58
-msgid "expected 'tree:<depth>'"
-msgstr "期望 'tree:<深度>'"
-
-#: list-objects-filter-options.c:73
-msgid "sparse:path filters support has been dropped"
-msgstr "sparse:path 過濾器支援已被刪除"
-
-#: list-objects-filter-options.c:86
-#, c-format
-msgid "invalid filter-spec '%s'"
-msgstr "無效的過濾器表達式 '%s'"
-
-#: list-objects-filter-options.c:102
-#, c-format
-msgid "must escape char in sub-filter-spec: '%c'"
-msgstr "必須對 sub-filter-spec 中的字元進行轉義：'%c'"
-
-#: list-objects-filter-options.c:144
-msgid "expected something after combine:"
-msgstr "期望在組合後有一些東西："
-
-#: list-objects-filter-options.c:226
-msgid "multiple filter-specs cannot be combined"
-msgstr "不能混用多種過濾規格"
-
-#: lockfile.c:151
+#: lockfile.c:152
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
@@ -4311,20 +4727,262 @@
"可能之前有一個 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 "讀取快取失敗"
+#: ls-refs.c:37
+#, c-format
+msgid "invalid value '%s' for lsrefs.unborn"
+msgstr "lsrefs.unborn 的值「%s」無效"
-#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913
-#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810
-#: builtin/stash.c:265
-msgid "unable to write new index file"
-msgstr "無法寫新的索引檔案"
+#: ls-refs.c:167
+msgid "expected flush after ls-refs arguments"
+msgstr "在 ls-refs 引數之後應該有一個 flush 包"
+
+#: merge-ort.c:888 merge-recursive.c:1191
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr "無法合併子模組 %s （沒有檢出）"
+
+#: merge-ort.c:897 merge-recursive.c:1198
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr "無法合併子模組 %s（提交不存在）"
+
+#: merge-ort.c:906 merge-recursive.c:1205
+#, c-format
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
+msgstr "無法合併子模組 %s （提交未跟隨合併基礎）"
+
+#: merge-ort.c:916 merge-ort.c:923
+#, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr "注意：正在將 %s 子模組快轉到 %s"
+
+#: merge-ort.c:944
+#, c-format
+msgid "Failed to merge submodule %s"
+msgstr "無法合併 %s 子模組"
+
+#: merge-ort.c:951
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but a possible merge resolution exists:\n"
+"%s\n"
+msgstr ""
+"無法合併 %s 子模組，但有找到一個可行的合併方案：\n"
+"%s\n"
+
+#: merge-ort.c:955 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-ort.c:968
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but multiple possible merges exist:\n"
+"%s"
+msgstr ""
+"無法合併 %s 子模組，但有找到幾個可行的合併方案：\n"
+"%s"
+
+#: merge-ort.c:1127 merge-recursive.c:1341
+msgid "Failed to execute internal merge"
+msgstr "無法執行內部合併"
+
+#: merge-ort.c:1132 merge-recursive.c:1346
+#, c-format
+msgid "Unable to add %s to database"
+msgstr "不能新增 %s 至物件庫"
+
+#: merge-ort.c:1139 merge-recursive.c:1378
+#, c-format
+msgid "Auto-merging %s"
+msgstr "自動合併 %s"
+
+#: merge-ort.c:1278 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-ort.c:1288 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-ort.c:1471
+#, 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."
+msgid ""
+"CONFLICT (directory rename split): Unclear where to rename %s to; it was "
+"renamed to multiple other directories, with no destination getting a "
+"majority of the files."
+msgstr ""
+"衝突（分割的目錄重新命名）：不清楚 %s 應該放在哪裡，因為目錄 %s 被重新命名到"
+"多個其它目錄，沒有目錄包含大部分檔案。"
+
+#: merge-ort.c:1637 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-ort.c:1781 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-ort.c:1788 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-ort.c:1801 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-ort.c:1809 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-ort.c:1952
+#, fuzzy, c-format
+#| msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
+msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
+msgstr ""
+"衝突（重新命名/重新命名）：在 %3$s 中重新命名 %1$s->%2$s，在 %6$s 中重新命名 "
+"%4$s->%5$s"
+
+#: merge-ort.c:2047
+#, c-format
+msgid ""
+"CONFLICT (rename involved in collision): rename of %s -> %s has content "
+"conflicts AND collides with another path; this may result in nested conflict "
+"markers."
+msgstr ""
+
+#: merge-ort.c:2066 merge-ort.c:2090
+#, fuzzy, c-format
+#| msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
+msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
+msgstr ""
+"衝突（重新命名/新增）：在 %3$s 中重新命名 %1$s->%2$s。在 %5$s 中新增 %4$s"
+
+#: merge-ort.c:2735
+#, c-format
+msgid ""
+"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
+"%s instead."
+msgstr ""
+
+#: merge-ort.c:2808
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed %s "
+"of them so each can be recorded somewhere."
+msgstr ""
+
+#: merge-ort.c:2812
+msgid "both"
+msgstr "雙方"
+
+#: merge-ort.c:2812
+msgid "one"
+msgstr "一方"
+
+#: merge-ort.c:2907 merge-recursive.c:3052
+msgid "content"
+msgstr "內容"
+
+#: merge-ort.c:2909 merge-recursive.c:3056
+msgid "add/add"
+msgstr "新增/新增"
+
+#: merge-ort.c:2911 merge-recursive.c:3101
+msgid "submodule"
+msgstr "子模組"
+
+#: merge-ort.c:2913 merge-recursive.c:3102
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "衝突（%s）：合併衝突於 %s"
+
+#: merge-ort.c:2938
+#, fuzzy, c-format
+#| msgid ""
+#| "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s "
+#| "left in tree."
+msgid ""
+"CONFLICT (modify/delete): %s deleted in %s and modified in %s. Version %s "
+"of %s left in tree."
+msgstr ""
+"衝突（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
+"本被保留。"
+
+#. TRANSLATORS: The %s arguments are: 1) tree hash of a merge
+#. base, and 2-3) the trees for the two trees we're merging.
+#.
+#: merge-ort.c:3406
+#, c-format
+msgid "collecting merge info failed for trees %s, %s, %s"
+msgstr "%s, %s, %s 樹的合併資訊收集失敗"
+
+#: merge-ort-wrappers.c:13 merge-recursive.c:3661
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+" %s"
+msgstr ""
+"您對下列檔案的本機修改將被合併動作覆蓋：\n"
+" %s"
+
+#: merge-ort-wrappers.c:33 merge-recursive.c:3436
+#, c-format
+msgid "Already up to date!"
+msgstr "已經是最新的！"
#: merge-recursive.c:356
msgid "(bad commit)\n"
@@ -4384,21 +5042,6 @@
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:"
@@ -4423,41 +5066,11 @@
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."
@@ -4507,7 +5120,7 @@
msgid "renamed"
msgstr "重新命名"
-#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117
+#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129
#, c-format
msgid "Refusing to lose dirty file at %s"
msgstr "拒絕遺失髒檔案 '%s'"
@@ -4544,16 +5157,16 @@
#: merge-recursive.c:1713
msgid " (left unresolved)"
-msgstr "（留下未解決）"
+msgstr " （留下未解決）"
-#: merge-recursive.c:1793
+#: 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:2056
+#: merge-recursive.c:2068
#, c-format
msgid ""
"CONFLICT (directory rename split): Unclear where to place %s because "
@@ -4563,25 +5176,7 @@
"衝突（分割的目錄重新命名）：不清楚 %s 應該放在哪裡，因為目錄 %s 被重新命名到"
"多個其它目錄，沒有目錄包含大部分檔案。"
-#: merge-recursive.c:2088
-#, c-format
-msgid ""
-"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
-"implicit directory rename(s) putting the following path(s) there: %s."
-msgstr ""
-"衝突（隱式目錄重新命名）：處於隱式目錄重新命名的現存檔案/目錄 %s，將以下路徑"
-"放在：%s。"
-
-#: merge-recursive.c:2098
-#, c-format
-msgid ""
-"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
-"implicit directory renames tried to put these paths there: %s"
-msgstr ""
-"衝突（隱式目錄重新命名）：無法映射一個以上路徑到 %s，隱式目錄重新命名嘗試將這"
-"些路徑放置於此：%s"
-
-#: merge-recursive.c:2190
+#: merge-recursive.c:2202
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -4590,326 +5185,267 @@
"衝突（重新命名/重新命名）：在 %3$s 中重新命名目錄 %1$s->%2$s，在 %6$s 中重新"
"命名目錄 %4$s->%5$s"
-#: merge-recursive.c:2435
-#, c-format
-msgid ""
-"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
-"renamed."
-msgstr "警告：避免應用 %s -> %s 的重新命名到 %s，因為 %s 本身已被重新命名。"
-
-#: merge-recursive.c:2961
+#: merge-recursive.c:2973
#, c-format
msgid "cannot read object %s"
msgstr "不能讀取物件 %s"
-#: merge-recursive.c:2964
+#: merge-recursive.c:2976
#, c-format
msgid "object %s is not a blob"
msgstr "物件 %s 不是一個資料物件"
-#: merge-recursive.c:3028
+#: merge-recursive.c:3040
msgid "modify"
msgstr "修改"
-#: merge-recursive.c:3028
+#: merge-recursive.c:3040
msgid "modified"
msgstr "修改"
-#: merge-recursive.c:3040
-msgid "content"
-msgstr "內容"
-
-#: merge-recursive.c:3044
-msgid "add/add"
-msgstr "新增/新增"
-
-#: merge-recursive.c:3067
+#: merge-recursive.c:3079
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "略過 %s（已經做過相同合併）"
-#: merge-recursive.c:3089 git-submodule.sh:1003
-msgid "submodule"
-msgstr "子模組"
-
-#: merge-recursive.c:3090
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "衝突（%s）：合併衝突於 %s"
-
-#: merge-recursive.c:3120
+#: merge-recursive.c:3132
#, c-format
msgid "Adding as %s instead"
msgstr "而是以 %s 為名新增"
-#: merge-recursive.c:3203
-#, c-format
-msgid ""
-"Path updated: %s added in %s inside a directory that was renamed in %s; "
-"moving it to %s."
-msgstr ""
-"路徑已更新：%s 新增到 %s，位於一個被重新命名到 %s 的目錄中，將其移動到 %s。"
-
-#: merge-recursive.c:3206
-#, c-format
-msgid ""
-"CONFLICT (file location): %s added in %s inside a directory that was renamed "
-"in %s, suggesting it should perhaps be moved to %s."
-msgstr ""
-"衝突（檔案位置）：%s 新增到 %s，位於一個被重新命名為 %s 的目錄中，建議將其移"
-"動到 %s。"
-
-#: merge-recursive.c:3210
-#, c-format
-msgid ""
-"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
-"%s; moving it to %s."
-msgstr ""
-"路徑已更新：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s 中，將"
-"其移動到 %5$s。"
-
-#: merge-recursive.c:3213
-#, c-format
-msgid ""
-"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
-"was renamed in %s, suggesting it should perhaps be moved to %s."
-msgstr ""
-"衝突（檔案位置）：%1$s 重新命名為 %3$s 中的 %2$s，而該目錄被重新命名到 %4$s "
-"中，建議將其移動到 %5$s。"
-
-#: merge-recursive.c:3327
+#: merge-recursive.c:3339
#, c-format
msgid "Removing %s"
msgstr "刪除 %s"
-#: merge-recursive.c:3350
+#: merge-recursive.c:3362
msgid "file/directory"
msgstr "檔案/目錄"
-#: merge-recursive.c:3355
+#: merge-recursive.c:3367
msgid "directory/file"
msgstr "目錄/檔案"
-#: merge-recursive.c:3362
+#: 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:3371
+#: merge-recursive.c:3383
#, c-format
msgid "Adding %s"
msgstr "新增 %s"
-#: merge-recursive.c:3380
+#: merge-recursive.c:3392
#, c-format
msgid "CONFLICT (add/add): Merge conflict in %s"
msgstr "衝突（add/add）：合併衝突於 %s"
-#: merge-recursive.c:3424
-msgid "Already up to date!"
-msgstr "已經是最新的！"
-
-#: merge-recursive.c:3433
+#: merge-recursive.c:3445
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "無法合併樹 %s 和 %s"
-#: merge-recursive.c:3537
+#: merge-recursive.c:3539
msgid "Merging:"
msgstr "合併："
-#: merge-recursive.c:3550
+#: merge-recursive.c:3552
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "發現 %u 個共同祖先："
-#: merge-recursive.c:3600
+#: merge-recursive.c:3602
msgid "merge returned no commit"
msgstr "合併未返回提交"
-#: merge-recursive.c:3659
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-" %s"
-msgstr ""
-"您對下列檔案的本機修改將被合併動作覆蓋：\n"
-" %s"
-
-#: merge-recursive.c:3756
+#: merge-recursive.c:3758
#, c-format
msgid "Could not parse object '%s'"
msgstr "不能解析物件 '%s'"
-#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877
+#: merge-recursive.c:3776 builtin/merge.c:712 builtin/merge.c:896
+#: builtin/stash.c:471
msgid "Unable to write index."
msgstr "不能寫入索引。"
-#: midx.c:68
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "讀取快取失敗"
+
+#: merge.c:109 rerere.c:704 builtin/am.c:1883 builtin/am.c:1917
+#: builtin/checkout.c:575 builtin/checkout.c:828 builtin/clone.c:817
+#: builtin/stash.c:265
+msgid "unable to write new index file"
+msgstr "無法寫新的索引檔案"
+
+#: midx.c:62
+#, fuzzy
+#| msgid "multi-pack-index version %d not recognized"
+msgid "multi-pack-index OID fanout is of the wrong size"
+msgstr "multi-pack-index 版本 %d 不能被識別"
+
+#: midx.c:93
#, c-format
msgid "multi-pack-index file %s is too small"
msgstr "多包索引檔案 %s 太小"
-#: midx.c:84
+#: midx.c:109
#, c-format
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
msgstr "多包索引簽名 0x%08x 和簽名 0x%08x 不符合"
-#: midx.c:89
+#: midx.c:114
#, c-format
msgid "multi-pack-index version %d not recognized"
msgstr "multi-pack-index 版本 %d 不能被識別"
-#: midx.c:94
+#: midx.c:119
#, c-format
-msgid "hash version %u does not match"
-msgstr "散列版本 %u 不符合"
+msgid "multi-pack-index hash version %u does not match version %u"
+msgstr "multi-pack-index 雜湊版本 %u 與版本 %u 不符合"
-#: midx.c:108
-msgid "invalid chunk offset (too large)"
-msgstr "無效的區塊位移（太大）"
-
-#: midx.c:132
-msgid "terminating multi-pack-index chunk id appears earlier than expected"
-msgstr "終止多包索引區塊 id 出現時間早於預期"
-
-#: midx.c:145
+#: midx.c:136
msgid "multi-pack-index missing required pack-name chunk"
msgstr "多包索引缺少必需的包名塊"
-#: midx.c:147
+#: midx.c:138
msgid "multi-pack-index missing required OID fanout chunk"
msgstr "多包索引缺少必需的物件 ID 扇出塊"
-#: midx.c:149
+#: midx.c:140
msgid "multi-pack-index missing required OID lookup chunk"
msgstr "多包索引缺少必需的物件 ID 查詢塊"
-#: midx.c:151
+#: midx.c:142
msgid "multi-pack-index missing required object offsets chunk"
msgstr "多包索引缺少必需的物件位移塊"
-#: midx.c:165
+#: midx.c:158
#, c-format
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
msgstr "多包索引包名無序：'%s' 在 '%s' 之前"
-#: midx.c:210
+#: midx.c:202
#, c-format
msgid "bad pack-int-id: %u (%u total packs)"
msgstr "錯的 pack-int-id：%u（共有 %u 個包）"
-#: midx.c:260
+#: midx.c:252
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
msgstr "多包索引儲存一個64位位移，但是 off_t 太小"
-#: midx.c:288
-msgid "error preparing packfile from multi-pack-index"
-msgstr "從多包索引準備 packfile 時發生錯誤"
-
-#: midx.c:472
+#: midx.c:467
#, c-format
msgid "failed to add packfile '%s'"
msgstr "新增 packfile '%s' 失敗"
-#: midx.c:478
+#: midx.c:473
#, c-format
msgid "failed to open pack-index '%s'"
msgstr "開啟包索引 '%s' 失敗"
-#: midx.c:538
+#: midx.c:533
#, c-format
msgid "failed to locate object %d in packfile"
msgstr "在 packfile 中定位物件 %d 失敗"
-#: midx.c:842
+#: midx.c:821
msgid "Adding packfiles to multi-pack-index"
msgstr "正在新增 packfile 至多包索引"
-#: midx.c:875
+#: midx.c:855
#, c-format
msgid "did not see pack-file %s to drop"
msgstr "沒有看到要捨棄的包檔案 %s"
-#: midx.c:973
-msgid "Writing chunks to multi-pack-index"
-msgstr "寫入區塊至多包索引"
+#: midx.c:904
+msgid "no pack files to index."
+msgstr "沒有要索引的 pack 檔案。"
-#: midx.c:1052
+#: midx.c:965
#, c-format
msgid "failed to clear multi-pack-index at %s"
msgstr "清理位於 %s 的多包索引失敗"
-#: midx.c:1108
+#: midx.c:1021
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr "有 multi-pack-index 檔案，但無法解析"
+
+#: midx.c:1029
msgid "Looking for referenced packfiles"
msgstr "正在尋找引用的 packfile"
-#: midx.c:1123
+#: midx.c:1044
#, c-format
msgid ""
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
msgstr "物件 ID 扇出無序：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
-#: midx.c:1128
+#: midx.c:1049
+msgid "the midx contains no oid"
+msgstr "midx 沒有 oid"
+
+#: midx.c:1058
msgid "Verifying OID order in multi-pack-index"
msgstr "正在驗證多包索引中的物件 ID 順序"
-#: midx.c:1137
+#: midx.c:1067
#, c-format
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
msgstr "物件 ID 查詢無序：oid[%d] = %s >= %s = oid[%d]"
-#: midx.c:1157
+#: midx.c:1087
msgid "Sorting objects by packfile"
msgstr "透過 packfile 為物件排序"
-#: midx.c:1164
+#: midx.c:1094
msgid "Verifying object offsets"
msgstr "正在驗證物件位移"
-#: midx.c:1180
+#: midx.c:1110
#, c-format
msgid "failed to load pack entry for oid[%d] = %s"
msgstr "為 oid[%d] = %s 載入包條目失敗"
-#: midx.c:1186
+#: midx.c:1116
#, c-format
msgid "failed to load pack-index for packfile %s"
msgstr "為 packfile %s 載入包索引失敗"
-#: midx.c:1195
+#: midx.c:1125
#, c-format
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
msgstr "oid[%d] = %s 錯誤的物件位移：%<PRIx64> != %<PRIx64>"
-#: midx.c:1220
+#: midx.c:1150
msgid "Counting referenced objects"
msgstr "正在計算引用物件"
-#: midx.c:1230
+#: midx.c:1160
msgid "Finding and deleting unreferenced packfiles"
msgstr "正在尋找並刪除沒有參考的 packfile"
-#: midx.c:1388
+#: midx.c:1351
msgid "could not start pack-objects"
msgstr "不能開始 pack-objects"
-#: midx.c:1407
+#: midx.c:1371
msgid "could not finish pack-objects"
msgstr "不能結束 pack-objects"
-#: name-hash.c:537
+#: name-hash.c:538
#, c-format
msgid "unable to create lazy_dir thread: %s"
msgstr "不能建立 lazy_dir 執行緒：%s"
-#: name-hash.c:559
+#: name-hash.c:560
#, c-format
msgid "unable to create lazy_name thread: %s"
msgstr "不能建立 lazy_name 執行緒：%s"
-#: name-hash.c:565
+#: name-hash.c:566
#, c-format
msgid "unable to join lazy_name thread: %s"
msgstr "不能加入 lasy_name 執行緒：%s"
@@ -4953,6 +5489,357 @@
msgid "Bad %s value: '%s'"
msgstr "壞的 %s 值：'%s'"
+#: object-file.c:480
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr "物件目錄 %s 不存在，檢查 .git/objects/info/alternates"
+
+#: object-file.c:531
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "無法規範化備用物件路徑：%s"
+
+#: object-file.c:603
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr "%s：忽略備用物件庫，嵌套太深"
+
+#: object-file.c:610
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "無法規範化物件目錄: %s"
+
+#: object-file.c:653
+msgid "unable to fdopen alternates lockfile"
+msgstr "無法 fdopen 取代鎖檔案"
+
+#: object-file.c:671
+msgid "unable to read alternates file"
+msgstr "無法讀取替代檔案"
+
+#: object-file.c:678
+msgid "unable to move new alternates file into place"
+msgstr "無法將新的替代檔案移動到位"
+
+#: object-file.c:713
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "路徑 '%s' 不存在"
+
+#: object-file.c:734
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr "尚不支援將參考版本庫 '%s' 作為一個連結檢出。"
+
+#: object-file.c:740
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "參考版本庫 '%s' 不是一個本機版本庫。"
+
+#: object-file.c:746
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "參考版本庫 '%s' 是一個淺複製"
+
+#: object-file.c:754
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "參考版本庫 '%s' 已被移植"
+
+#: object-file.c:814
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "解析備用引用時無效的行：%s"
+
+#: object-file.c:964
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr "嘗試 mmap %<PRIuMAX>，超過了最大值 %<PRIuMAX>"
+
+#: object-file.c:985
+msgid "mmap failed"
+msgstr "mmap 失敗"
+
+#: object-file.c:1149
+#, c-format
+msgid "object file %s is empty"
+msgstr "物件檔案 %s 為空"
+
+#: object-file.c:1284 object-file.c:2477
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "損壞的鬆散物件 '%s'"
+
+#: object-file.c:1286 object-file.c:2481
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "鬆散物件 '%s' 後面有垃圾資料"
+
+#: object-file.c:1328
+msgid "invalid object type"
+msgstr "無效的物件類型"
+
+#: object-file.c:1412
+#, c-format
+msgid "unable to unpack %s header with --allow-unknown-type"
+msgstr "無法用 --allow-unknown-type 參數解開 %s 標頭訊息"
+
+#: object-file.c:1415
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "無法解開 %s 頭部"
+
+#: object-file.c:1421
+#, c-format
+msgid "unable to parse %s header with --allow-unknown-type"
+msgstr "無法用 --allow-unknown-type 參數解析 %s 標頭訊息"
+
+#: object-file.c:1424
+#, c-format
+msgid "unable to parse %s header"
+msgstr "無法解析 %s 頭部"
+
+#: object-file.c:1651
+#, c-format
+msgid "failed to read object %s"
+msgstr "讀取物件 %s 失敗"
+
+#: object-file.c:1655
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "找不到 %2$s 的替代 %1$s"
+
+#: object-file.c:1659
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "鬆散物件 %s（儲存在 %s）已損壞"
+
+#: object-file.c:1663
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "打包物件 %s（儲存在 %s）已損壞"
+
+#: object-file.c:1768
+#, c-format
+msgid "unable to write file %s"
+msgstr "無法寫檔案 %s"
+
+#: object-file.c:1775
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "無法為 '%s' 設定權限"
+
+#: object-file.c:1782
+msgid "file write error"
+msgstr "檔案寫錯誤"
+
+#: object-file.c:1802
+msgid "error when closing loose object file"
+msgstr "關閉鬆散物件檔案時發生錯誤"
+
+#: object-file.c:1867
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
+msgstr "權限不足，無法在版本庫物件庫 %s 中新增物件"
+
+#: object-file.c:1869
+msgid "unable to create temporary file"
+msgstr "無法建立暫存檔"
+
+#: object-file.c:1893
+msgid "unable to write loose object file"
+msgstr "不能寫鬆散物件檔案"
+
+#: object-file.c:1899
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "不能壓縮新物件 %s（%d）"
+
+#: object-file.c:1903
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "在物件 %s 上呼叫 deflateEnd 失敗（%d）"
+
+#: object-file.c:1907
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "被 %s 的不穩定物件源資料搞糊塗了"
+
+#: object-file.c:1917 builtin/pack-objects.c:1097
+#, c-format
+msgid "failed utime() on %s"
+msgstr "在 %s 上呼叫 utime() 失敗"
+
+#: object-file.c:1994
+#, c-format
+msgid "cannot read object for %s"
+msgstr "不能讀取物件 %s"
+
+#: object-file.c:2045
+msgid "corrupt commit"
+msgstr "損壞的提交"
+
+#: object-file.c:2053
+msgid "corrupt tag"
+msgstr "損壞的標籤"
+
+#: object-file.c:2153
+#, c-format
+msgid "read error while indexing %s"
+msgstr "索引 %s 時讀取錯誤"
+
+#: object-file.c:2156
+#, c-format
+msgid "short read while indexing %s"
+msgstr "索引 %s 時讀入不完整"
+
+#: object-file.c:2229 object-file.c:2239
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr "%s：插入資料庫失敗"
+
+#: object-file.c:2245
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s：不支援的檔案類型"
+
+#: object-file.c:2269
+#, c-format
+msgid "%s is not a valid object"
+msgstr "%s 不是一個有效的物件"
+
+#: object-file.c:2271
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s 不是一個有效的 '%s' 物件"
+
+#: object-file.c:2298 builtin/index-pack.c:192
+#, c-format
+msgid "unable to open %s"
+msgstr "不能開啟 %s"
+
+#: object-file.c:2488 object-file.c:2541
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "%s 的雜湊值不符合（預期 %s）"
+
+#: object-file.c:2512
+#, c-format
+msgid "unable to mmap %s"
+msgstr "不能 mmap %s"
+
+#: object-file.c:2517
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "無法解壓縮 %s 的頭部"
+
+#: object-file.c:2523
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "無法解析 %s 的頭部"
+
+#: object-file.c:2534
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "無法解壓縮 %s 的內容"
+
+#: object-name.c:486
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr "短物件 ID %s 存在歧義"
+
+#: object-name.c:497
+msgid "The candidates are:"
+msgstr "候選者有："
+
+#: object-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」命令以關閉本訊息通知"
+
+#: object-name.c:916
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "'%.*s' 的日誌只能回到 %s"
+
+#: object-name.c:924
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "'%.*s' 的日誌只有 %d 個項目"
+
+#: object-name.c:1702
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr "磁碟上存在 '%s' 路徑，但不存在於 '%.*s'"
+
+#: object-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' 嗎？"
+
+#: object-name.c:1717
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "'%s' 路徑不存在於 '%.*s'"
+
+#: object-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' 嗎？"
+
+#: object-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' 嗎？"
+
+#: object-name.c:1769
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr "磁碟上存在 '%s' 路徑，但不在索引中"
+
+#: object-name.c:1771
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr "'%s' 路徑不存在 (既不存在磁碟，也不存在索引)"
+
+#: object-name.c:1784
+msgid "relative path syntax can't be used outside working tree"
+msgstr "相對路徑與法不能用在工作區外"
+
+#: object-name.c:1922
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "'%.*s' 物件名稱無效。"
+
#: object.c:53
#, c-format
msgid "invalid object type \"%s\""
@@ -4978,24 +5865,93 @@
msgid "hash mismatch %s"
msgstr "雜湊值與 %s 不符合"
-#: packfile.c:629
+#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226
+#, c-format
+msgid "unable to get size of %s"
+msgstr "不能得到 %s 的大小"
+
+#: pack-bitmap.c:1489 builtin/rev-list.c:92
+#, c-format
+msgid "unable to get disk usage of %s"
+msgstr "無法取得 %s 的磁碟用量"
+
+#: pack-revindex.c:220
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr "%s 倒排索引檔案過小"
+
+#: pack-revindex.c:225
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr "%s 倒排索引檔案損壞"
+
+#: pack-revindex.c:233
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr "%s 倒排索引檔案有未知簽章"
+
+#: pack-revindex.c:237
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr "倒排索引檔案 %s 有不支援的版本 %<PRIu32>"
+
+#: pack-revindex.c:242
+#, c-format
+msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
+msgstr "倒排索引檔案 %s 有不支援的雜湊 ID %<PRIu32>"
+
+#: pack-write.c:236
+msgid "cannot both write and verify reverse index"
+msgstr "無法同時寫入和驗證倒排索引"
+
+#: pack-write.c:257
+#, c-format
+msgid "could not stat: %s"
+msgstr "無法 stat：%s"
+
+#: pack-write.c:269
+#, c-format
+msgid "failed to make %s readable"
+msgstr "無法讓 %s 能夠寫入"
+
+#: pack-write.c:508
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr "無法寫入「%s」promisor 檔案"
+
+#: packfile.c:625
msgid "offset before end of packfile (broken .idx?)"
msgstr "位移量在 packfile 結束之前（損壞的 .idx？）"
-#: packfile.c:1899
+#: packfile.c:1934
#, c-format
msgid "offset before start of pack index for %s (corrupt index?)"
msgstr "位移量在 %s 的包索引開始之前（損壞的索引？）"
-#: packfile.c:1903
+#: packfile.c:1938
#, c-format
msgid "offset beyond end of pack index for %s (truncated index?)"
msgstr "位移量越過了 %s 的包索引的結尾（被截斷的索引？）"
-#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134
+#: parse-options-cb.c:20 parse-options-cb.c:24
#, c-format
-msgid "unable to get size of %s"
-msgstr "不能得到 %s 的大小"
+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
@@ -5037,26 +5993,31 @@
msgid "did you mean `--%s` (with two dashes)?"
msgstr "你的意思是 `--%s`（有兩個短線）嗎？"
-#: parse-options.c:857
+#: 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:859
+#: parse-options.c:864
#, c-format
msgid "unknown switch `%c'"
msgstr "未知開關 `%c'"
-#: parse-options.c:861
+#: parse-options.c:866
#, c-format
msgid "unknown non-ascii option in string: `%s'"
msgstr "字串中未知的非 ascii 字元選項：`%s'"
-#: parse-options.c:885
+#: parse-options.c:890
msgid "..."
msgstr "..."
-#: parse-options.c:904
+#: parse-options.c:909
#, c-format
msgid "usage: %s"
msgstr "用法：%s"
@@ -5064,46 +6025,21 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:910
+#: parse-options.c:915
#, c-format
msgid " or: %s"
-msgstr " 或：%s"
+msgstr " 或：%s"
# 譯者：為保證在輸出中對齊，注意調整句中空格！
-#: parse-options.c:913
+#: parse-options.c:918
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:952
+#: parse-options.c:957
msgid "-NUM"
msgstr "-數字"
-#: parse-options.c:966
-#, c-format
-msgid "alias of --%s"
-msgstr "--%s 的別名"
-
-#: parse-options-cb.c:20 parse-options-cb.c:24
-#, c-format
-msgid "option `%s' expects a numerical value"
-msgstr "選項 `%s' 期望一個數字值"
-
-#: parse-options-cb.c:41
-#, c-format
-msgid "malformed expiration date '%s'"
-msgstr "格式錯誤的到期時間：'%s'"
-
-#: parse-options-cb.c:54
-#, c-format
-msgid "option `%s' expects \"always\", \"auto\", or \"never\""
-msgstr "選項 `%s' 期望 \"always\"、\"auto\" 或 \"never\""
-
-#: parse-options-cb.c:130 parse-options-cb.c:147
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "格式錯誤的物件名 '%s'"
-
#: path.c:915
#, c-format
msgid "Could not make %s writable by group"
@@ -5160,27 +6096,27 @@
msgid "%s: 'literal' and 'glob' are incompatible"
msgstr "%s：'literal' 和 'glob' 不相容"
-#: pathspec.c:442
+#: pathspec.c:445
#, c-format
msgid "%s: '%s' is outside repository at '%s'"
msgstr "%s：'%s' 在位於 '%s' 的版本庫之外"
-#: pathspec.c:517
+#: pathspec.c:521
#, c-format
msgid "'%s' (mnemonic: '%c')"
msgstr "'%s'（助記符：'%c'）"
-#: pathspec.c:527
+#: pathspec.c:531
#, c-format
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s：路徑規格神奇前綴不被此指令支援：%s"
-#: pathspec.c:594
+#: pathspec.c:598
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "路徑規格 '%s' 位於符號連結中"
-#: pathspec.c:639
+#: pathspec.c:643
#, c-format
msgid "line is badly quoted: %s"
msgstr "某行不應該被括號括住：%s"
@@ -5194,141 +6130,168 @@
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:165
#, c-format
msgid "remote error: %s"
msgstr "遠端錯誤：%s"
-#: preload-index.c:119
+#: preload-index.c:125
msgid "Refreshing index"
msgstr "正在重新整理索引"
-#: preload-index.c:138
+#: preload-index.c:144
#, c-format
msgid "unable to create threaded lstat: %s"
msgstr "無法建立執行緒 lstat：%s"
-#: pretty.c:981
+#: pretty.c:984
msgid "unable to parse --pretty format"
msgstr "不能解析 --pretty 格式"
-#: promisor-remote.c:23
-msgid "Remote with no URL"
-msgstr "遠端未設定 URL"
+#: promisor-remote.c:30
+msgid "promisor-remote: unable to fork off fetch subprocess"
+msgstr "promisor-remote: 無法 fork fetch 子處理程序"
-#: promisor-remote.c:58
+#: 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"
-#: range-diff.c:75
+#: prune-packed.c:35
+msgid "Removing duplicate objects"
+msgstr "正在刪除重複物件"
+
+#: range-diff.c:78
msgid "could not start `log`"
msgstr "不能啟動 `log`"
-#: range-diff.c:77
+#: range-diff.c:80
msgid "could not read `log` output"
msgstr "不能讀取 `log` 的輸出"
-#: range-diff.c:96 sequencer.c:5020
+#: range-diff.c:101 sequencer.c:5318
#, c-format
msgid "could not parse commit '%s'"
msgstr "不能解析提交 '%s'"
-#: range-diff.c:122
+#: range-diff.c:115
+#, c-format
+msgid ""
+"could not parse first line of `log` output: did not start with 'commit ': "
+"'%s'"
+msgstr "無法解析第一行「log」輸出：開頭不是「commit」：「%s」"
+
+#: range-diff.c:140
#, c-format
msgid "could not parse git header '%.*s'"
msgstr "無法解析 git 頭 '%.*s'"
-#: range-diff.c:285
+#: range-diff.c:306
msgid "failed to generate diff"
msgstr "生成 diff 失敗"
-#: range-diff.c:518 range-diff.c:520
+#: range-diff.c:558
+msgid "--left-only and --right-only are mutually exclusive"
+msgstr "--left-only 和 --right-only 互斥"
+
+#: range-diff.c:561 range-diff.c:563
#, 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' 沒有簽出一個提交"
+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:1330
+#: read-cache.c:1318
#, c-format
msgid "'%s' appears as both a file and as a directory"
msgstr "'%s' 看起來既是檔案又是目錄"
-#: read-cache.c:1536
+#: read-cache.c:1532
msgid "Refresh index"
msgstr "重新整理索引"
-#: read-cache.c:1651
+#: read-cache.c:1657
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -5337,7 +6300,7 @@
"設定了 index.version，但是取值無效。\n"
"使用版本 %i"
-#: read-cache.c:1661
+#: read-cache.c:1667
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -5346,140 +6309,140 @@
"設定了 GIT_INDEX_VERSION，但是取值無效。\n"
"使用版本 %i"
-#: read-cache.c:1717
+#: read-cache.c:1723
#, c-format
msgid "bad signature 0x%08x"
msgstr "壞的簽名 0x%08x"
-#: read-cache.c:1720
+#: read-cache.c:1726
#, c-format
msgid "bad index version %d"
msgstr "壞的索引版本 %d"
-#: read-cache.c:1729
+#: read-cache.c:1735
msgid "bad index file sha1 signature"
msgstr "壞的索引檔案 sha1 簽名"
-#: read-cache.c:1759
+#: read-cache.c:1765
#, c-format
msgid "index uses %.4s extension, which we do not understand"
msgstr "索引使用不被支援的 %.4s 擴展"
#
-#: read-cache.c:1761
+#: read-cache.c:1767
#, c-format
msgid "ignoring %.4s extension"
msgstr "忽略 %.4s 擴展"
-#: read-cache.c:1798
+#: read-cache.c:1804
#, c-format
msgid "unknown index entry format 0x%08x"
msgstr "未知的索引條目格式 0x%08x"
-#: read-cache.c:1814
+#: read-cache.c:1820
#, c-format
msgid "malformed name field in the index, near path '%s'"
msgstr "索引中靠近路徑 '%s' 有錯誤的名稱欄位"
-#: read-cache.c:1871
+#: read-cache.c:1877
msgid "unordered stage entries in index"
msgstr "索引中有未排序的暫存條目"
-#: read-cache.c:1874
+#: read-cache.c:1880
#, c-format
msgid "multiple stage entries for merged file '%s'"
msgstr "合併檔案 '%s' 有多個暫存條目"
-#: read-cache.c:1877
+#: read-cache.c:1883
#, c-format
msgid "unordered stage entries for '%s'"
msgstr "'%s' 的未排序暫存條目"
-#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
-#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
-#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967
-#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485
-#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290
+#: read-cache.c:1989 read-cache.c:2280 rerere.c:549 rerere.c:583 rerere.c:1095
+#: submodule.c:1634 builtin/add.c:546 builtin/check-ignore.c:181
+#: builtin/checkout.c:504 builtin/checkout.c:690 builtin/clean.c:991
+#: builtin/commit.c:364 builtin/diff-tree.c:122 builtin/grep.c:505
+#: 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:2124
+#: read-cache.c:2133
#, c-format
msgid "unable to create load_cache_entries thread: %s"
msgstr "無法建立 load_cache_entries 執行緒：%s"
-#: read-cache.c:2137
+#: read-cache.c:2146
#, c-format
msgid "unable to join load_cache_entries thread: %s"
msgstr "無法加入 load_cache_entries 執行緒：%s"
-#: read-cache.c:2170
+#: read-cache.c:2179
#, c-format
msgid "%s: index file open failed"
msgstr "%s：開啟索引檔案失敗"
-#: read-cache.c:2174
+#: read-cache.c:2183
#, c-format
msgid "%s: cannot stat the open index"
msgstr "%s：不能對開啟的索引執行 stat 動作"
-#: read-cache.c:2178
+#: read-cache.c:2187
#, c-format
msgid "%s: index file smaller than expected"
msgstr "%s：索引檔案比預期的小"
-#: read-cache.c:2182
+#: read-cache.c:2191
#, c-format
msgid "%s: unable to map index file"
msgstr "%s：無法對索引檔案執行 map 動作"
-#: read-cache.c:2224
+#: read-cache.c:2233
#, c-format
msgid "unable to create load_index_extensions thread: %s"
msgstr "無法建立 load_index_extensions 執行緒：%s"
-#: read-cache.c:2251
+#: read-cache.c:2260
#, c-format
msgid "unable to join load_index_extensions thread: %s"
msgstr "無法加入 load_index_extensions 執行緒：%s"
-#: read-cache.c:2283
+#: read-cache.c:2292
#, c-format
msgid "could not freshen shared index '%s'"
msgstr "無法重新整理共享索引 '%s'"
-#: read-cache.c:2330
+#: read-cache.c:2339
#, c-format
msgid "broken index, expect %s in %s, got %s"
msgstr "損壞的索引，期望在 %2$s 中的 %1$s，得到 %3$s"
-#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122
+#: read-cache.c:3035 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1141
#, c-format
msgid "could not close '%s'"
msgstr "不能關閉 '%s'"
-#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959
+#: read-cache.c:3138 sequencer.c:2487 sequencer.c:4239
#, c-format
msgid "could not stat '%s'"
msgstr "不能對 '%s' 呼叫 stat"
-#: read-cache.c:3142
+#: read-cache.c:3151
#, c-format
msgid "unable to open git dir: %s"
msgstr "不能開啟 git 目錄：%s"
-#: read-cache.c:3154
+#: read-cache.c:3163
#, c-format
msgid "unable to unlink: %s"
msgstr "無法刪除：%s"
-#: read-cache.c:3179
+#: read-cache.c:3188
#, c-format
msgid "cannot fix permission bits on '%s'"
msgstr "不能修復 '%s' 的權限位"
-#: read-cache.c:3328
+#: read-cache.c:3337
#, c-format
msgid "%s: cannot drop to stage #0"
msgstr "%s：不能落到暫存區 #0"
@@ -5527,7 +6490,7 @@
"e, edit <提交> = 使用提交，進入 shell 以便進行提交修補\n"
"s, squash <提交> = 使用提交，但融合到前一個提交\n"
"f, fixup <提交> = 類似於 \"squash\"，但捨棄提交說明日誌\n"
-"x, exec <指令> = 使用 shell 執行指令（此行剩餘部分）\n"
+"x, exec <命令> = 使用 shell 執行指令（此行剩餘部分）\n"
"b, break = 在此處停止（使用 'git rebase --continue' 繼續重定基底）\n"
"d, drop <提交> = 刪除提交\n"
"l, label <label> = 為目前 HEAD 打上標記\n"
@@ -5545,7 +6508,7 @@
msgid_plural "Rebase %s onto %s (%d commands)"
msgstr[0] "重定基底 %s 到 %s（%d 個提交）"
-#: rebase-interactive.c:72 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"
@@ -5553,7 +6516,7 @@
"\n"
"不要刪除任意一行。使用 'drop' 顯式地刪除一個提交。\n"
-#: rebase-interactive.c:75 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"
@@ -5561,7 +6524,7 @@
"\n"
"如果您在這裡刪除一行，對應的提交將會遺失。\n"
-#: rebase-interactive.c:81 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"
@@ -5575,7 +6538,7 @@
" git rebase --continue\n"
"\n"
-#: rebase-interactive.c:86 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"
@@ -5585,14 +6548,14 @@
"然而，如果您刪除全部內容，重定基底動作將會終止。\n"
"\n"
-#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444
-#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252
+#: rebase-interactive.c:110 rerere.c:469 rerere.c:676 sequencer.c:3615
+#: sequencer.c:3641 sequencer.c:5424 builtin/fsck.c:329 builtin/rebase.c:272
#, c-format
msgid "could not write '%s'"
msgstr "不能寫入 '%s'"
-#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210
-#: builtin/rebase.c:234
+#: rebase-interactive.c:116 builtin/rebase.c:204 builtin/rebase.c:230
+#: builtin/rebase.c:254
#, c-format
msgid "could not write '%s'."
msgstr "不能寫入 '%s'。"
@@ -5622,132 +6585,14 @@
"可選值有：ignore、warn、error。\n"
"\n"
-#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262
-#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221
-#: builtin/rebase.c:246
+#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2402
+#: builtin/rebase.c:190 builtin/rebase.c:215 builtin/rebase.c:241
+#: builtin/rebase.c:266
#, c-format
msgid "could not read '%s'."
msgstr "不能讀取 '%s'。"
-#: refs.c:262
-#, c-format
-msgid "%s does not point to a valid object!"
-msgstr "%s 沒有指向一個有效的物件！"
-
-#: refs.c:667
-#, c-format
-msgid "ignoring dangling symref %s"
-msgstr "忽略懸空符號引用 %s"
-
-#: refs.c:669 ref-filter.c:2098
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr "忽略損壞的引用 %s"
-
-#: refs.c:804
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "無法為寫入開啟 '%s'：%s"
-
-#: refs.c:814 refs.c:865
-#, c-format
-msgid "could not read ref '%s'"
-msgstr "無法讀取引用 '%s'"
-
-#: refs.c:820
-#, c-format
-msgid "ref '%s' already exists"
-msgstr "引用 '%s' 已經存在"
-
-#: refs.c:825
-#, c-format
-msgid "unexpected object ID when writing '%s'"
-msgstr "寫入 '%s' 時意外的物件 ID"
-
-#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905
-#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157
-#: wrapper.c:620
-#, c-format
-msgid "could not write to '%s'"
-msgstr "不能寫入 '%s'"
-
-#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719
-#: builtin/rebase.c:1029
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "無法開啟 '%s' 進行寫入"
-
-#: refs.c:867
-#, c-format
-msgid "unexpected object ID when deleting '%s'"
-msgstr "刪除 '%s' 時意外的物件 ID"
-
-#: refs.c:998
-#, c-format
-msgid "log for ref %s has gap after %s"
-msgstr "引用 %s 的日誌在 %s 之後有缺口"
-
-#: refs.c:1004
-#, c-format
-msgid "log for ref %s unexpectedly ended on %s"
-msgstr "引用 %s 的日誌意外終止於 %s "
-
-#: refs.c:1063
-#, c-format
-msgid "log for %s is empty"
-msgstr "%s 的日誌為空"
-
-#: refs.c:1155
-#, c-format
-msgid "refusing to update ref with bad name '%s'"
-msgstr "拒絕更新有錯誤名稱 '%s' 的引用"
-
-#: refs.c:1231
-#, c-format
-msgid "update_ref failed for ref '%s': %s"
-msgstr "對引用 '%s' 執行 update_ref 失敗：%s"
-
-#: refs.c:2023
-#, c-format
-msgid "multiple updates for ref '%s' not allowed"
-msgstr "不允許對引用 '%s' 多次更新"
-
-#: refs.c:2055
-msgid "ref updates forbidden inside quarantine environment"
-msgstr "在隔離環境中禁止更新引用"
-
-#: refs.c:2151 refs.c:2181
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr "'%s' 已存在，無法建立 '%s'"
-
-#: refs.c:2157 refs.c:2192
-#, c-format
-msgid "cannot process '%s' and '%s' at the same time"
-msgstr "無法同時處理 '%s' 和 '%s'"
-
-#: refs/files-backend.c:1233
-#, c-format
-msgid "could not remove reference %s"
-msgstr "無法刪除引用 %s"
-
-#: refs/files-backend.c:1247 refs/packed-backend.c:1541
-#: refs/packed-backend.c:1551
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "無法刪除引用 %s：%s"
-
-#: refs/files-backend.c:1250 refs/packed-backend.c:1554
-#, c-format
-msgid "could not delete references: %s"
-msgstr "無法刪除引用：%s"
-
-#: refspec.c:137
-#, c-format
-msgid "invalid refspec '%s'"
-msgstr "無效的引用表達式：'%s'"
-
-#: ref-filter.c:42 wt-status.c:1938
+#: ref-filter.c:42 wt-status.c:1975
msgid "gone"
msgstr "遺失"
@@ -5766,280 +6611,409 @@
msgid "ahead %d, behind %d"
msgstr "領先 %d，落後 %d"
-#: ref-filter.c:165
+#: ref-filter.c:175
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "期望的格式：%%(color:<顏色>)"
-#: ref-filter.c:167
+#: ref-filter.c:177
#, c-format
msgid "unrecognized color: %%(color:%s)"
-msgstr "未能識別的顏色：%%(color:%s)"
+msgstr "無法識別的顏色：%%(color:%s)"
-#: ref-filter.c:189
+#: ref-filter.c:199
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "期望整數值 refname:lstrip=%s"
-#: ref-filter.c:193
+#: ref-filter.c:203
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "期望整數值 refname:rstrip=%s"
-#: ref-filter.c:195
+#: ref-filter.c:205
#, c-format
msgid "unrecognized %%(%s) argument: %s"
-msgstr "未能識別的 %%(%s) 參數：%s"
+msgstr "無法識別的 %%(%s) 參數：%s"
-#: ref-filter.c:250
+#: ref-filter.c:260
#, c-format
msgid "%%(objecttype) does not take arguments"
msgstr "%%(objecttype) 不帶參數"
-#: ref-filter.c:272
+#: ref-filter.c:282
#, c-format
msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "未能識別的 %%(objectsize) 參數：%s"
+msgstr "無法識別的 %%(objectsize) 參數：%s"
-#: ref-filter.c:280
+#: ref-filter.c:290
#, c-format
msgid "%%(deltabase) does not take arguments"
msgstr "%%(deltabase) 不帶參數"
-#: ref-filter.c:292
+#: ref-filter.c:302
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) 不帶參數"
-#: ref-filter.c:301
+#: ref-filter.c:315
#, c-format
-msgid "%%(subject) does not take arguments"
-msgstr "%%(subject) 不帶參數"
+msgid "unrecognized %%(subject) argument: %s"
+msgstr "無法識別的 %%(subject) 引數：%s"
-#: ref-filter.c:323
+#: ref-filter.c:334
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr "預期是 %%(trailers:key=<value>)"
+
+#: ref-filter.c:336
#, c-format
msgid "unknown %%(trailers) argument: %s"
msgstr "未知的 %%(trailers) 參數：%s"
-#: ref-filter.c:352
+#: ref-filter.c:367
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "期望一個正數 contents:lines=%s"
-#: ref-filter.c:354
-#, c-format
-msgid "unrecognized %%(contents) argument: %s"
-msgstr "未能識別的 %%(contents) 參數：%s"
-
#: ref-filter.c:369
#, c-format
-msgid "positive value expected objectname:short=%s"
-msgstr "期望一個正數 objectname:short=%s"
+msgid "unrecognized %%(contents) argument: %s"
+msgstr "無法識別的 %%(contents) 參數：%s"
-#: ref-filter.c:373
+#: ref-filter.c:384
#, c-format
-msgid "unrecognized %%(objectname) argument: %s"
-msgstr "未能識別的 %%(objectname) 參數：%s"
+msgid "positive value expected '%s' in %%(%s)"
+msgstr "%%(%2$s) 中的 '%1$s' 預期是正數值"
-#: ref-filter.c:403
+#: ref-filter.c:388
+#, c-format
+msgid "unrecognized argument '%s' in %%(%s)"
+msgstr "無法識別 %%(%2$s) 中的 '%1$s' 參數"
+
+#: ref-filter.c:402
+#, c-format
+msgid "unrecognized email option: %s"
+msgstr "無法識別的 email 選項：%s"
+
+#: ref-filter.c:432
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "期望的格式：%%(align:<寬度>,<位置>)"
-#: ref-filter.c:415
+#: ref-filter.c:444
#, c-format
msgid "unrecognized position:%s"
-msgstr "未能識別的位置：%s"
+msgstr "無法識別的位置：%s"
-#: ref-filter.c:422
+#: ref-filter.c:451
#, c-format
msgid "unrecognized width:%s"
-msgstr "未能識別的寬度：%s"
+msgstr "無法識別的寬度：%s"
-#: ref-filter.c:431
+#: ref-filter.c:460
#, c-format
msgid "unrecognized %%(align) argument: %s"
-msgstr "未能識別的 %%(align) 參數：%s"
+msgstr "無法識別的 %%(align) 參數：%s"
-#: ref-filter.c:439
+#: ref-filter.c:468
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "元素 %%(align) 需要一個正數的寬度"
-#: ref-filter.c:457
+#: ref-filter.c:486
#, c-format
msgid "unrecognized %%(if) argument: %s"
-msgstr "未能識別的 %%(if) 參數：%s"
+msgstr "無法識別的 %%(if) 參數：%s"
-#: ref-filter.c:559
+#: ref-filter.c:588
#, c-format
msgid "malformed field name: %.*s"
msgstr "格式錯誤的欄位名：%.*s"
-#: ref-filter.c:586
+#: ref-filter.c:615
#, c-format
msgid "unknown field name: %.*s"
msgstr "未知的欄位名：%.*s"
-#: ref-filter.c:590
+#: ref-filter.c:619
#, c-format
msgid ""
"not a git repository, but the field '%.*s' requires access to object data"
msgstr "不是一個 git 版本庫，但是欄位 '%.*s' 需要存取物件資料"
-#: ref-filter.c:714
+#: ref-filter.c:743
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "格式：使用了 %%(if) 元素而沒有 %%(then) 元素"
-#: ref-filter.c:777
+#: ref-filter.c:806
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "格式：使用了 %%(then) 元素而沒有 %%(if) 元素"
-#: ref-filter.c:779
+#: ref-filter.c:808
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "格式：%%(then) 元素用了多次"
-#: ref-filter.c:781
+#: ref-filter.c:810
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "格式：%%(then) 元素用在了 %%(else) 之後"
-#: ref-filter.c:809
+#: ref-filter.c:838
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "格式：使用了 %%(else) 元素而沒有 %%(if) 元素"
-#: ref-filter.c:811
+#: ref-filter.c:840
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "格式：使用了 %%(else) 元素而沒有 %%(then) 元素"
-#: ref-filter.c:813
+#: ref-filter.c:842
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "格式：%%(else) 元素用了多次"
-#: ref-filter.c:828
+#: ref-filter.c:857
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "格式：使用了 %%(end) 元素卻沒有它的對應元素"
-#: ref-filter.c:885
+#: ref-filter.c:914
#, c-format
msgid "malformed format string %s"
msgstr "錯誤的格式化字串 %s"
-#: ref-filter.c:1488
+#: ref-filter.c:1555
#, c-format
-msgid "no branch, rebasing %s"
-msgstr "非分支，正重定基底 %s"
+msgid "(no branch, rebasing %s)"
+msgstr "（無分支，重定 %s 的基底）"
-#: ref-filter.c:1491
+#: ref-filter.c:1558
#, c-format
-msgid "no branch, rebasing detached HEAD %s"
-msgstr "非分支，正重定基底分離開頭指標 %s"
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "（無分支，重定 %s 分離開頭指標的基底）"
-#: ref-filter.c:1494
+#: ref-filter.c:1561
#, c-format
-msgid "no branch, bisect started on %s"
-msgstr "非分支，二分尋找開始於 %s"
+msgid "(no branch, bisect started on %s)"
+msgstr "（無分支，二分搜尋從 %s 開始）"
-#: ref-filter.c:1504
-msgid "no branch"
-msgstr "非分支"
+#: ref-filter.c:1565
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "（開頭指標分離於 %s）"
-#: ref-filter.c:1540 ref-filter.c:1749
+#: ref-filter.c:1568
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "（開頭指標分離自 %s）"
+
+#: ref-filter.c:1571
+msgid "(no branch)"
+msgstr "（無分支）"
+
+#: ref-filter.c:1603 ref-filter.c:1812
#, c-format
msgid "missing object %s for %s"
msgstr "缺少 %2$s 的物件 %1$s"
-#: ref-filter.c:1550
+#: ref-filter.c:1613
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer 失敗於 %2$s 的 %1$s"
-#: ref-filter.c:2004
+#: ref-filter.c:1996
#, c-format
msgid "malformed object at '%s'"
msgstr "格式錯誤的物件 '%s'"
-#: ref-filter.c:2093
+#: ref-filter.c:2085
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "忽略帶有錯誤名稱 %s 的引用"
-#: ref-filter.c:2389
+#: ref-filter.c:2090 refs.c:676
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "忽略損壞的引用 %s"
+
+#: ref-filter.c:2430
#, c-format
msgid "format: %%(end) atom missing"
msgstr "格式：缺少 %%(end) 元素"
-#: ref-filter.c:2489
-#, c-format
-msgid "option `%s' is incompatible with --merged"
-msgstr "選項 `%s' 和 --merged 不相容"
-
-#: ref-filter.c:2492
-#, c-format
-msgid "option `%s' is incompatible with --no-merged"
-msgstr "選項 `%s' 和 --no-merged 不相容"
-
-#: ref-filter.c:2502
+#: ref-filter.c:2529
#, c-format
msgid "malformed object name %s"
msgstr "格式錯誤的物件名 %s"
-#: ref-filter.c:2507
+#: ref-filter.c:2534
#, c-format
msgid "option `%s' must point to a commit"
msgstr "選項 `%s' 必須指向一個提交"
-#: remote.c:366
+#: refs.c:264
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr "%s 沒有指向一個有效的物件！"
+
+#: refs.c:566
+#, c-format
+msgid ""
+"Using '%s' as the name for the initial branch. This default branch name\n"
+"is subject to change. To configure the initial branch name to use in all\n"
+"of your new repositories, which will suppress this warning, call:\n"
+"\n"
+"\tgit config --global init.defaultBranch <name>\n"
+"\n"
+"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"'development'. The just-created branch can be renamed via this command:\n"
+"\n"
+"\tgit branch -m <name>\n"
+msgstr ""
+"將「%s」設定為初始分支的名稱。這個預設分支名稱可以變更。\n"
+"如果要設定所有新版本庫要使用的初始分支名稱，\n"
+"請呼叫（會隱藏這個警告）：\n"
+"\n"
+"\tgit config —global init.defaultBranch <name>\n"
+"\n"
+"除了 ‘master’ 外，常用的分支名稱有 ‘main’, ‘trunk’ 以及\n"
+"‘development’。剛建立的分支可以用這個命令重新命名：\n"
+"\n"
+"\tgit branch -m <name>\n"
+
+#: refs.c:588
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "無法擷取「%s」"
+
+#: refs.c:598
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "分支名稱無效：%s = %s"
+
+#: refs.c:674
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "忽略懸空符號引用 %s"
+
+#: refs.c:922
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr "引用 %s 的日誌在 %s 之後有缺口"
+
+#: refs.c:929
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr "引用 %s 的日誌意外終止於 %s"
+
+#: refs.c:994
+#, c-format
+msgid "log for %s is empty"
+msgstr "%s 的日誌為空"
+
+#: refs.c:1086
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "拒絕更新有錯誤名稱 '%s' 的引用"
+
+#: refs.c:1157
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "對引用 '%s' 執行 update_ref 失敗：%s"
+
+#: refs.c:2051
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "不允許對引用 '%s' 多次更新"
+
+#: refs.c:2131
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "在隔離環境中禁止更新引用"
+
+#: refs.c:2142
+msgid "ref updates aborted by hook"
+msgstr "引用更新被掛鉤拒絕"
+
+#: refs.c:2242 refs.c:2272
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "'%s' 已存在，無法建立 '%s'"
+
+#: refs.c:2248 refs.c:2283
+#, 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:170
+#, 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:414
+#: remote.c:399
msgid "more than one receivepack given, using the first"
msgstr "提供了一個以上的 receivepack，使用第一個"
-#: remote.c:422
+#: remote.c:407
msgid "more than one uploadpack given, using the first"
msgstr "提供了一個以上的 uploadpack，使用第一個"
-#: remote.c:612
+#: remote.c:590
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "不能同時取得 %s 和 %s 至 %s"
-#: remote.c:616
+#: remote.c:594
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s 通常追蹤 %s，而非 %s"
-#: remote.c:620
+#: remote.c:598
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s 同時追蹤 %s 和 %s"
-#: remote.c:688
+#: remote.c:666
#, c-format
msgid "key '%s' of pattern had no '*'"
msgstr "模式的鍵 '%s' 沒有 '*'"
-#: remote.c:698
+#: remote.c:676
#, c-format
msgid "value '%s' of pattern has no '*'"
msgstr "模式的值 '%s' 沒有 '*'"
-#: remote.c:1004
+#: remote.c:1083
#, c-format
msgid "src refspec %s does not match any"
msgstr "源引用表達式 %s 沒有符合"
-#: remote.c:1009
+#: remote.c:1088
#, c-format
msgid "src refspec %s matches more than one"
msgstr "源引用表達式 %s 符合超過一個"
@@ -6048,7 +7022,7 @@
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
#. the <src>.
#.
-#: remote.c:1024
+#: remote.c:1103
#, c-format
msgid ""
"The destination you provided is not a full refname (i.e.,\n"
@@ -6070,7 +7044,7 @@
"\n"
"都不行，所以我們已放棄。您必須給出完整的引用。"
-#: remote.c:1044
+#: remote.c:1123
#, c-format
msgid ""
"The <src> part of the refspec is a commit object.\n"
@@ -6080,7 +7054,7 @@
"引用表達式的 <src> 是一個提交物件。您是想建立一個新的分支而向\n"
"'%s:refs/heads/%s' 推送嗎？"
-#: remote.c:1049
+#: remote.c:1128
#, c-format
msgid ""
"The <src> part of the refspec is a tag object.\n"
@@ -6090,7 +7064,7 @@
"引用表達式的 <src> 是一個標籤物件。您是想建立一個新的標籤而向\n"
"'%s:refs/tags/%s' 推送嗎？"
-#: remote.c:1054
+#: remote.c:1133
#, c-format
msgid ""
"The <src> part of the refspec is a tree object.\n"
@@ -6100,7 +7074,7 @@
"引用表達式的 <src> 是一個樹狀物件。您是想為這個樹狀物件建立標籤而向\n"
"'%s:refs/tags/%s' 推送嗎？"
-#: remote.c:1059
+#: remote.c:1138
#, c-format
msgid ""
"The <src> part of the refspec is a blob object.\n"
@@ -6110,113 +7084,113 @@
"引用表達式的 <src> 是一個資料物件。您是想為這個資料物件建立標籤而向\n"
"'%s:refs/tags/%s' 推送嗎？"
-#: remote.c:1095
+#: remote.c:1174
#, c-format
msgid "%s cannot be resolved to branch"
msgstr "%s 無法被解析為分支"
-#: remote.c:1106
+#: remote.c:1185
#, c-format
msgid "unable to delete '%s': remote ref does not exist"
msgstr "無法刪除 '%s'：遠端引用不存在"
-#: remote.c:1118
+#: remote.c:1197
#, c-format
msgid "dst refspec %s matches more than one"
msgstr "目標引用表達式 %s 符合超過一個"
-#: remote.c:1125
+#: remote.c:1204
#, c-format
msgid "dst ref %s receives from more than one src"
msgstr "目標引用 %s 接收超過一個源"
-#: remote.c:1628 remote.c:1729
+#: remote.c:1724 remote.c:1825
msgid "HEAD does not point to a branch"
msgstr "HEAD 沒有指向一個分支"
-#: remote.c:1637
+#: remote.c:1733
#, c-format
msgid "no such branch: '%s'"
msgstr "沒有此分支：'%s'"
-#: remote.c:1640
+#: remote.c:1736
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "尚未給分支 '%s' 設定上游"
-#: remote.c:1646
+#: remote.c:1742
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "上游分支 '%s' 沒有儲存為一個遠端追蹤分支"
-#: remote.c:1661
+#: remote.c:1757
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "推送目標 '%s' 至遠端 '%s' 沒有本機追蹤分支"
-#: remote.c:1673
+#: remote.c:1769
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "分支 '%s' 沒有設定要推送的遠端伺服器"
-#: remote.c:1683
+#: remote.c:1779
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "向 '%s' 推送引用規格未包含 '%s'"
-#: remote.c:1696
+#: remote.c:1792
msgid "push has no destination (push.default is 'nothing')"
msgstr "推送無目標（push.default 是 'nothing'）"
-#: remote.c:1718
+#: remote.c:1814
msgid "cannot resolve 'simple' push to a single destination"
msgstr "無法解析 'simple' 推送至一個單獨的目標"
-#: remote.c:1844
+#: remote.c:1943
#, c-format
msgid "couldn't find remote ref %s"
msgstr "無法找到遠端引用 %s"
-#: remote.c:1857
+#: remote.c:1956
#, c-format
msgid "* Ignoring funny ref '%s' locally"
msgstr "* 在本機忽略可笑的引用 '%s'"
-#: remote.c:2020
+#: remote.c:2119
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "您的分支基於 '%s'，但此上游分支已經不存在。\n"
-#: remote.c:2024
+#: remote.c:2123
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " （使用 \"git branch --unset-upstream\" 來修復）\n"
-#: remote.c:2027
+#: remote.c:2126
#, c-format
msgid "Your branch is up to date with '%s'.\n"
msgstr "您的分支與上游分支 '%s' 一致。\n"
-#: remote.c:2031
+#: remote.c:2130
#, c-format
msgid "Your branch and '%s' refer to different commits.\n"
msgstr "您的分支和 '%s' 指向不同的提交。\n"
-#: remote.c:2034
+#: remote.c:2133
#, c-format
msgid " (use \"%s\" for details)\n"
msgstr " （使用 \"%s\" 檢視詳情）\n"
-#: remote.c:2038
+#: remote.c:2137
#, c-format
msgid "Your branch is ahead of '%s' by %d commit.\n"
msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
msgstr[0] "您的分支領先 '%s' 共 %d 個提交。\n"
-#: remote.c:2044
+#: remote.c:2143
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " （使用 \"git push\" 來發布您的本機提交）\n"
-#: remote.c:2047
+#: remote.c:2146
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -6224,11 +7198,11 @@
msgstr[0] "您的分支落後 '%s' 共 %d 個提交，並且可以快轉。\n"
# 譯者：請維持前導空格
-#: remote.c:2055
+#: remote.c:2154
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " （使用 \"git pull\" 來更新您的本機分支）\n"
-#: remote.c:2058
+#: remote.c:2157
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -6241,11 +7215,11 @@
"並且分別有 %d 和 %d 處不同的提交。\n"
# 譯者：請維持前導空格
-#: remote.c:2068
+#: remote.c:2167
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " （使用 \"git pull\" 來合併遠端分支）\n"
-#: remote.c:2251
+#: remote.c:2359
#, c-format
msgid "cannot parse expected object name '%s'"
msgstr "無法解析期望的物件名 '%s'"
@@ -6265,126 +7239,135 @@
msgid "replace depth too high for object %s"
msgstr "物件 %s 的取代層級太深"
-#: rerere.c:217 rerere.c:226 rerere.c:229
+#: rerere.c:201 rerere.c:210 rerere.c:213
msgid "corrupt MERGE_RR"
msgstr "損壞的 MERGE_RR"
-#: rerere.c:264 rerere.c:269
+#: rerere.c:248 rerere.c:253
msgid "unable to write rerere record"
msgstr "無法寫入 rerere 記錄"
-#: rerere.c:495
+#: rerere.c:479
#, c-format
msgid "there were errors while writing '%s' (%s)"
msgstr "寫入 '%s' (%s) 時發生錯誤"
-#: rerere.c:498
+#: rerere.c:482
#, c-format
msgid "failed to flush '%s'"
msgstr "重新整理 '%s' 失敗"
-#: rerere.c:503 rerere.c:1039
+#: rerere.c:487 rerere.c:1023
#, c-format
msgid "could not parse conflict hunks in '%s'"
msgstr "不能解析 '%s' 中的衝突塊"
-#: rerere.c:684
+#: rerere.c:668
#, c-format
msgid "failed utime() on '%s'"
msgstr "在 '%s' 上呼叫 utime() 失敗"
-#: rerere.c:694
+#: rerere.c:678
#, c-format
msgid "writing '%s' failed"
msgstr "寫入 '%s' 失敗"
-#: rerere.c:714
+#: rerere.c:698
#, c-format
msgid "Staged '%s' using previous resolution."
msgstr "使用之前的解決方案暫存 '%s'。"
-#: rerere.c:753
+#: rerere.c:737
#, c-format
msgid "Recorded resolution for '%s'."
msgstr "已記錄 '%s' 的解決方案。"
-#: rerere.c:788
+#: rerere.c:772
#, c-format
msgid "Resolved '%s' using previous resolution."
msgstr "使用之前的解決方案解決 '%s'。"
-#: rerere.c:803
+#: rerere.c:787
#, c-format
msgid "cannot unlink stray '%s'"
msgstr "不能刪除 stray '%s'"
-#: rerere.c:807
+#: rerere.c:791
#, c-format
msgid "Recorded preimage for '%s'"
msgstr "為 '%s' 記錄 preimage"
-#: rerere.c:881 submodule.c:2078 builtin/log.c:1871
-#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
+#: rerere.c:865 submodule.c:2088 builtin/log.c:1991
+#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890
#, c-format
msgid "could not create directory '%s'"
msgstr "不能建立目錄 '%s'"
-#: rerere.c:1057
+#: rerere.c:1041
#, c-format
msgid "failed to update conflicted state in '%s'"
msgstr "更新 '%s' 中的衝突狀態失敗"
-#: rerere.c:1068 rerere.c:1075
+#: rerere.c:1052 rerere.c:1059
#, c-format
msgid "no remembered resolution for '%s'"
msgstr "沒有為 '%s' 記憶的解決方案"
-#: rerere.c:1077
+#: rerere.c:1061
#, c-format
msgid "cannot unlink '%s'"
msgstr "不能刪除 '%s'"
-#: rerere.c:1087
+#: rerere.c:1071
#, c-format
msgid "Updated preimage for '%s'"
msgstr "已為 '%s' 更新 preimage"
-#: rerere.c:1096
+#: rerere.c:1080
#, c-format
msgid "Forgot resolution for '%s'\n"
msgstr "忘記 '%s' 的解決方案\n"
-#: rerere.c:1199
+#: rerere.c:1191
msgid "unable to open rr-cache directory"
msgstr "不能開啟 rr-cache 目錄"
-#: revision.c:2497
+#: reset.c:42
+msgid "could not determine HEAD revision"
+msgstr "不能確定 HEAD 版本"
+
+#: reset.c:70 reset.c:76 sequencer.c:3468
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "無法找到 %s 指向的樹"
+
+#: revision.c:2338
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "--unpacked=<packfile> 已不受支援"
+
+#: revision.c:2668
msgid "your current branch appears to be broken"
msgstr "您的目前分支好像被損壞"
-#: revision.c:2500
+#: revision.c:2671
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "您的目前分支 '%s' 尚無任何提交"
-#: revision.c:2708
-msgid "--first-parent is incompatible with --bisect"
-msgstr "--first-parent 與 --bisect 不相容"
-
-#: revision.c:2712
+#: revision.c:2877
msgid "-L does not yet support diff formats besides -p and -s"
msgstr "-L 尚不支援 -p 和 -s 之外的差異格式"
-#: run-command.c:763
+#: run-command.c:767
msgid "open /dev/null failed"
msgstr "不能開啟 /dev/null"
-#: run-command.c:1269
+#: run-command.c:1274
#, c-format
msgid "cannot create async thread: %s"
msgstr "不能建立 async 執行緒：%s"
-#: run-command.c:1333
+#: run-command.c:1338
#, c-format
msgid ""
"The '%s' hook was ignored because it's not set as executable.\n"
@@ -6393,75 +7376,79 @@
"因為沒有將掛鉤 '%s' 設定為可執行，掛鉤被忽略。您可以透過\n"
"設定 `git config advice.ignoredHook false` 來關閉這條警告。"
-#: send-pack.c:144
+#: send-pack.c:146
msgid "unexpected flush packet while reading remote unpack status"
msgstr "讀取遠端解包狀態時收到意外的 flush 包"
-#: send-pack.c:146
+#: send-pack.c:148
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "不能解析遠端解包狀態：%s"
-#: send-pack.c:148
+#: send-pack.c:150
#, c-format
msgid "remote unpack failed: %s"
msgstr "遠端解包失敗：%s"
-#: send-pack.c:309
+#: send-pack.c:374
msgid "failed to sign the push certificate"
msgstr "為推送證書籤名失敗"
-#: send-pack.c:423
+#: send-pack.c:467
+msgid "the receiving end does not support this repository's hash algorithm"
+msgstr "接收端不支援此版本庫的雜湊算法"
+
+#: send-pack.c:476
msgid "the receiving end does not support --signed push"
msgstr "接收端不支援簽名推送"
-#: send-pack.c:425
+#: send-pack.c:478
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr "未傳送推送證書，因為接收端不支援簽名推送"
-#: send-pack.c:437
+#: send-pack.c:490
msgid "the receiving end does not support --atomic push"
msgstr "接收端不支援原子推送"
-#: send-pack.c:442
+#: send-pack.c:495
msgid "the receiving end does not support push options"
msgstr "接收端不支援推送選項"
-#: sequencer.c:191
+#: sequencer.c:195
#, c-format
msgid "invalid commit message cleanup mode '%s'"
msgstr "無效的提交訊息清理模式 '%s'"
-#: sequencer.c:296
+#: sequencer.c:323
#, c-format
msgid "could not delete '%s'"
msgstr "無法刪除 '%s'"
-#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385
+#: sequencer.c:343 builtin/rebase.c:757 builtin/rebase.c:1602 builtin/rm.c:385
#, c-format
msgid "could not remove '%s'"
msgstr "無法刪除 '%s'"
-#: sequencer.c:325
+#: sequencer.c:353
msgid "revert"
-msgstr "還原"
+msgstr "復原"
-#: sequencer.c:327
+#: sequencer.c:355
msgid "cherry-pick"
-msgstr "揀選"
+msgstr "摘取"
-#: sequencer.c:329
+#: sequencer.c:357
msgid "rebase"
msgstr "rebase"
-#: sequencer.c:331
+#: sequencer.c:359
#, c-format
msgid "unknown action: %d"
msgstr "未知動作：%d"
-#: sequencer.c:389
+#: sequencer.c:418
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -6469,7 +7456,7 @@
"衝突解決完畢後，用 'git add <路徑>' 或 'git rm <路徑>'\n"
"指令標記修正後的檔案"
-#: sequencer.c:392
+#: sequencer.c:421
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -6478,44 +7465,43 @@
"衝突解決完畢後，用 'git add <路徑>' 或 'git rm <路徑>'\n"
"對修正後的檔案做標記，然後用 'git commit' 提交"
-#: sequencer.c:405 sequencer.c:2901
+#: sequencer.c:434 sequencer.c:3070
#, c-format
msgid "could not lock '%s'"
msgstr "不能鎖定 '%s'"
-#: sequencer.c:412
+#: sequencer.c:436 sequencer.c:2869 sequencer.c:3074 sequencer.c:3088
+#: sequencer.c:3345 sequencer.c:5334 strbuf.c:1168 wrapper.c:631
+#, c-format
+msgid "could not write to '%s'"
+msgstr "不能寫入 '%s'"
+
+#: sequencer.c:441
#, c-format
msgid "could not write eol to '%s'"
msgstr "不能將換行符號寫入 '%s'"
-#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921
-#: sequencer.c:3185
+#: sequencer.c:446 sequencer.c:2874 sequencer.c:3076 sequencer.c:3090
+#: sequencer.c:3353
#, c-format
msgid "failed to finalize '%s'"
msgstr "無法完成 '%s'"
-#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167
-#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120
-#: builtin/rebase.c:593
-#, c-format
-msgid "could not read '%s'"
-msgstr "不能讀取 '%s'"
-
-#: sequencer.c:466
+#: sequencer.c:485
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "您的本機修改將被%s覆蓋。"
-#: sequencer.c:470
+#: sequencer.c:489
msgid "commit your changes or stash them to proceed."
msgstr "提交您的修改或儲藏後再繼續。"
-#: sequencer.c:502
+#: sequencer.c:521
#, c-format
msgid "%s: fast-forward"
msgstr "%s：快轉"
-#: sequencer.c:541 builtin/tag.c:565
+#: sequencer.c:560 builtin/tag.c:598
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "無效的清理模式 %s"
@@ -6523,65 +7509,65 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase".
#.
-#: sequencer.c:635
+#: sequencer.c:670
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s：無法寫入新索引檔案"
-#: sequencer.c:652
+#: sequencer.c:684
msgid "unable to update cache tree"
msgstr "不能更新快取樹"
-#: sequencer.c:666
+#: sequencer.c:698
msgid "could not resolve HEAD commit"
msgstr "不能解析 HEAD 提交"
-#: sequencer.c:746
+#: sequencer.c:778
#, c-format
msgid "no key present in '%.*s'"
msgstr "在 '%.*s' 中沒有 key"
-#: sequencer.c:757
+#: sequencer.c:789
#, c-format
msgid "unable to dequote value of '%s'"
msgstr "無法為 '%s' 的值去引號"
-#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710
-#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072
+#: sequencer.c:826 wrapper.c:201 wrapper.c:371 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1136 builtin/rebase.c:910
#, c-format
msgid "could not open '%s' for reading"
msgstr "無法開啟 '%s' 進行讀取"
-#: sequencer.c:804
+#: sequencer.c:836
msgid "'GIT_AUTHOR_NAME' already given"
msgstr "已經給出 'GIT_AUTHOR_NAME'"
-#: sequencer.c:809
+#: sequencer.c:841
msgid "'GIT_AUTHOR_EMAIL' already given"
msgstr "已經給出 'GIT_AUTHOR_EMAIL'"
-#: sequencer.c:814
+#: sequencer.c:846
msgid "'GIT_AUTHOR_DATE' already given"
msgstr "已經給出 'GIT_AUTHOR_DATE'"
-#: sequencer.c:818
+#: sequencer.c:850
#, c-format
msgid "unknown variable '%s'"
msgstr "未知變數 '%s'"
-#: sequencer.c:823
+#: sequencer.c:855
msgid "missing 'GIT_AUTHOR_NAME'"
msgstr "缺少 'GIT_AUTHOR_NAME'"
-#: sequencer.c:825
+#: sequencer.c:857
msgid "missing 'GIT_AUTHOR_EMAIL'"
msgstr "缺少 'GIT_AUTHOR_EMAIL'"
-#: sequencer.c:827
+#: sequencer.c:859
msgid "missing 'GIT_AUTHOR_DATE'"
msgstr "缺少 'GIT_AUTHOR_DATE'"
-#: sequencer.c:876
+#: sequencer.c:924
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -6610,11 +7596,11 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:1148
+#: sequencer.c:1211
msgid "'prepare-commit-msg' hook failed"
msgstr "'prepare-commit-msg' 掛鉤失敗"
-#: sequencer.c:1154
+#: sequencer.c:1217
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6638,7 +7624,7 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1167
+#: sequencer.c:1230
msgid ""
"Your name and email address were configured automatically based\n"
"on your username and hostname. Please check that they are accurate.\n"
@@ -6661,325 +7647,339 @@
"\n"
" git commit --amend --reset-author\n"
-#: sequencer.c:1209
+#: sequencer.c:1272
msgid "couldn't look up newly created commit"
msgstr "無法找到新建立的提交"
-#: sequencer.c:1211
+#: sequencer.c:1274
msgid "could not parse newly created commit"
msgstr "不能解析新建立的提交"
-#: sequencer.c:1257
+#: sequencer.c:1320
msgid "unable to resolve HEAD after creating commit"
msgstr "建立提交後，不能解析 HEAD"
-#: sequencer.c:1259
+#: sequencer.c:1322
msgid "detached HEAD"
-msgstr "分離開頭指標"
+msgstr "分離 HEAD"
# 譯者：中文字串拼接，可刪除前導空格
-#: sequencer.c:1263
+#: sequencer.c:1326
msgid " (root-commit)"
msgstr " (根提交)"
-#: sequencer.c:1284
+#: sequencer.c:1347
msgid "could not parse HEAD"
msgstr "不能解析 HEAD"
-#: sequencer.c:1286
+#: sequencer.c:1349
#, c-format
msgid "HEAD %s is not a commit!"
msgstr "HEAD %s 不是一個提交！"
-#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574
+#: sequencer.c:1353 sequencer.c:1431 builtin/commit.c:1577
msgid "could not parse HEAD commit"
msgstr "不能解析 HEAD 提交"
-#: sequencer.c:1342 sequencer.c:1968
+#: sequencer.c:1409 sequencer.c:2108
msgid "unable to parse commit author"
msgstr "不能解析提交作者"
-#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687
+#: sequencer.c:1420 builtin/am.c:1566 builtin/merge.c:702
msgid "git write-tree failed to write a tree"
msgstr "git write-tree 無法寫入樹狀物件"
-#: sequencer.c:1386 sequencer.c:1447
+#: sequencer.c:1453 sequencer.c:1573
#, c-format
msgid "unable to read commit message from '%s'"
msgstr "不能從 '%s' 讀取提交說明"
-#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886
-#: builtin/merge.c:911
+#: sequencer.c:1484 sequencer.c:1516
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr "無效的作者身分 '%s'"
+
+#: sequencer.c:1490
+msgid "corrupt author: missing date information"
+msgstr "作者資訊損壞：缺少日期資訊"
+
+#: sequencer.c:1529 builtin/am.c:1593 builtin/commit.c:1678 builtin/merge.c:905
+#: builtin/merge.c:930 t/helper/test-fast-rebase.c:78
msgid "failed to write commit object"
msgstr "寫提交物件失敗"
-#: sequencer.c:1474
+#: sequencer.c:1556 sequencer.c:4291 t/helper/test-fast-rebase.c:198
+#, c-format
+msgid "could not update %s"
+msgstr "不能更新 %s"
+
+#: sequencer.c:1605
#, c-format
msgid "could not parse commit %s"
msgstr "不能解析提交 %s"
-#: sequencer.c:1479
+#: sequencer.c:1610
#, c-format
msgid "could not parse parent commit %s"
msgstr "不能解析父提交 %s"
-#: sequencer.c:1562 sequencer.c:1673
+#: sequencer.c:1693 sequencer.c:1804
#, c-format
msgid "unknown command: %d"
msgstr "未知指令：%d"
-#: sequencer.c:1620 sequencer.c:1645
+#: sequencer.c:1751 sequencer.c:1776
#, c-format
msgid "This is a combination of %d commits."
msgstr "這是一個 %d 個提交的組合。"
-#: sequencer.c:1630
+#: sequencer.c:1761
msgid "need a HEAD to fixup"
msgstr "需要一個 HEAD 來修復"
-#: sequencer.c:1632 sequencer.c:3212
+#: sequencer.c:1763 sequencer.c:3380
msgid "could not read HEAD"
msgstr "不能讀取 HEAD"
-#: sequencer.c:1634
+#: sequencer.c:1765
msgid "could not read HEAD's commit message"
msgstr "不能讀取 HEAD 的提交說明"
-#: sequencer.c:1640
+#: sequencer.c:1771
#, c-format
msgid "cannot write '%s'"
msgstr "不能寫 '%s'"
-#: sequencer.c:1647 git-rebase--preserve-merges.sh:496
+#: sequencer.c:1778 git-rebase--preserve-merges.sh:486
msgid "This is the 1st commit message:"
msgstr "這是第一個提交說明："
-#: sequencer.c:1655
+#: sequencer.c:1786
#, c-format
msgid "could not read commit message of %s"
msgstr "不能讀取 %s 的提交說明"
-#: sequencer.c:1662
+#: sequencer.c:1793
#, c-format
msgid "This is the commit message #%d:"
msgstr "這是提交說明 #%d："
-#: sequencer.c:1668
+#: sequencer.c:1799
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "提交說明 #%d 將被跳過："
-#: sequencer.c:1756
+#: sequencer.c:1887
msgid "your index file is unmerged."
msgstr "您的索引檔案未完成合併。"
-#: sequencer.c:1763
+#: sequencer.c:1894
msgid "cannot fixup root commit"
msgstr "不能修復根提交"
-#: sequencer.c:1782
+#: sequencer.c:1913
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "提交 %s 是一個合併提交但未提供 -m 選項。"
-#: sequencer.c:1790 sequencer.c:1798
+#: sequencer.c:1921 sequencer.c:1929
#, c-format
msgid "commit %s does not have parent %d"
msgstr "提交 %s 沒有第 %d 個父提交"
-#: sequencer.c:1804
+#: sequencer.c:1935
#, c-format
msgid "cannot get commit message for %s"
msgstr "不能得到 %s 的提交說明"
#. TRANSLATORS: The first %s will be a "todo" command like
#. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1823
+#: sequencer.c:1954
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s：不能解析父提交 %s"
-#: sequencer.c:1888
+#: sequencer.c:2019
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "不能將 '%s' 重新命名為 '%s'"
-#: sequencer.c:1943
+#: sequencer.c:2079
#, c-format
msgid "could not revert %s... %s"
msgstr "不能還原 %s... %s"
-#: sequencer.c:1944
+#: sequencer.c:2080
#, c-format
msgid "could not apply %s... %s"
msgstr "不能應用 %s... %s"
-#: sequencer.c:1961
+#: sequencer.c:2100
#, c-format
msgid "dropping %s %s -- patch contents already upstream\n"
msgstr "拋棄 %s %s -- 修補檔的內容已在上游\n"
-#: sequencer.c:2018
+#: sequencer.c:2158
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s：無法讀取索引"
-#: sequencer.c:2025
+#: sequencer.c:2165
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s：無法重新整理索引"
-#: sequencer.c:2102
+#: sequencer.c:2242
#, c-format
msgid "%s does not accept arguments: '%s'"
msgstr "%s 不接受參數：'%s'"
-#: sequencer.c:2111
+#: sequencer.c:2251
#, c-format
msgid "missing arguments for %s"
msgstr "缺少 %s 的參數"
-#: sequencer.c:2142
+#: sequencer.c:2282
#, c-format
msgid "could not parse '%s'"
msgstr "無法解析 '%s'"
-#: sequencer.c:2203
+#: sequencer.c:2343
#, c-format
msgid "invalid line %d: %.*s"
msgstr "無效行 %d：%.*s"
-#: sequencer.c:2214
+#: sequencer.c:2354
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "沒有父提交的情況下不能 '%s'"
-#: sequencer.c:2298
+#: sequencer.c:2440
msgid "cancelling a cherry picking in progress"
msgstr "正在取消一個進行中的揀選"
-#: sequencer.c:2305
+#: sequencer.c:2449
msgid "cancelling a revert in progress"
msgstr "正在取消一個進行中的還原"
-#: sequencer.c:2349
+#: sequencer.c:2493
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "請用 'git rebase --edit-todo' 來修改。"
-#: sequencer.c:2351
+#: sequencer.c:2495
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "不可用的指令清單：'%s'"
-#: sequencer.c:2356
+#: sequencer.c:2500
msgid "no commits parsed."
msgstr "沒有解析提交。"
-#: sequencer.c:2367
+#: sequencer.c:2511
msgid "cannot cherry-pick during a revert."
msgstr "不能在還原提交中執行揀選。"
-#: sequencer.c:2369
+#: sequencer.c:2513
msgid "cannot revert during a cherry-pick."
msgstr "不能在揀選中執行還原提交。"
-#: sequencer.c:2447
+#: sequencer.c:2591
#, c-format
msgid "invalid value for %s: %s"
msgstr "%s 的值無效：%s"
-#: sequencer.c:2540
+#: sequencer.c:2698
msgid "unusable squash-onto"
msgstr "不可用的 squash-onto"
-#: sequencer.c:2556
+#: sequencer.c:2718
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "格式錯誤的選項清單：'%s'"
-#: sequencer.c:2644 sequencer.c:4361
+#: sequencer.c:2811 sequencer.c:4644
msgid "empty commit set passed"
msgstr "提供了空的提交集"
-#: sequencer.c:2660
+#: sequencer.c:2828
msgid "revert is already in progress"
msgstr "一個還原動作已在進行"
-#: sequencer.c:2662
+#: sequencer.c:2830
#, c-format
msgid "try \"git revert (--continue | %s--abort | --quit)\""
msgstr "嘗試 \"git revert (--continue | %s--abort | --quit)\""
-#: sequencer.c:2665
+#: sequencer.c:2833
msgid "cherry-pick is already in progress"
msgstr "揀選動作已在進行"
-#: sequencer.c:2667
+#: sequencer.c:2835
#, c-format
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
msgstr "嘗試 \"git cherry-pick (--continue | %s--abort | --quit)\""
-#: sequencer.c:2681
+#: sequencer.c:2849
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "不能建立序列目錄 '%s'"
-#: sequencer.c:2696
+#: sequencer.c:2864
msgid "could not lock HEAD"
msgstr "不能鎖定 HEAD"
-#: sequencer.c:2756 sequencer.c:4099
+#: sequencer.c:2924 sequencer.c:4379
msgid "no cherry-pick or revert in progress"
msgstr "揀選或還原動作並未進行"
-#: sequencer.c:2758 sequencer.c:2769
+#: sequencer.c:2926 sequencer.c:2937
msgid "cannot resolve HEAD"
msgstr "不能解析 HEAD"
-#: sequencer.c:2760 sequencer.c:2804
+#: sequencer.c:2928 sequencer.c:2972
msgid "cannot abort from a branch yet to be born"
msgstr "不能從尚未建立的分支終止"
-#: sequencer.c:2790 builtin/grep.c:724
+#: sequencer.c:2958 builtin/grep.c:757
#, c-format
msgid "cannot open '%s'"
msgstr "不能開啟 '%s'"
-#: sequencer.c:2792
+#: sequencer.c:2960
#, c-format
msgid "cannot read '%s': %s"
msgstr "不能讀取 '%s'：%s"
-#: sequencer.c:2793
+#: sequencer.c:2961
msgid "unexpected end of file"
msgstr "意外的檔案結束"
-#: sequencer.c:2799
+#: sequencer.c:2967
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "儲存揀選提交前的 HEAD 檔案 '%s' 損壞"
-#: sequencer.c:2810
+#: sequencer.c:2978
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "您好像移動了 HEAD。未能還原，檢查您的 HEAD！"
-#: sequencer.c:2851
+#: sequencer.c:3019
msgid "no revert in progress"
msgstr "沒有正在進行的還原"
-#: sequencer.c:2859
+#: sequencer.c:3028
msgid "no cherry-pick in progress"
msgstr "沒有正在進行的揀選"
-#: sequencer.c:2869
+#: sequencer.c:3038
msgid "failed to skip the commit"
msgstr "無法跳過這個提交"
-#: sequencer.c:2876
+#: sequencer.c:3045
msgid "there is nothing to skip"
msgstr "沒有要跳過的"
-#: sequencer.c:2879
+#: sequencer.c:3048
#, c-format
msgid ""
"have you committed already?\n"
@@ -6988,21 +7988,16 @@
"您已經提交了嗎？\n"
"試試 \"git %s --continue\""
-#: sequencer.c:3003 sequencer.c:4011
-#, c-format
-msgid "could not update %s"
-msgstr "不能更新 %s"
-
-#: sequencer.c:3042 sequencer.c:3991
+#: sequencer.c:3210 sequencer.c:4271
msgid "cannot read HEAD"
msgstr "不能讀取 HEAD"
-#: sequencer.c:3059
+#: sequencer.c:3227
#, c-format
msgid "unable to copy '%s' to '%s'"
msgstr "無法複製 '%s' 至 '%s'"
-#: sequencer.c:3067
+#: sequencer.c:3235
#, c-format
msgid ""
"You can amend the commit now, with\n"
@@ -7021,23 +8016,28 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:3077
+#: sequencer.c:3245
#, c-format
msgid "Could not apply %s... %.*s"
msgstr "不能應用 %s... %.*s"
-#: sequencer.c:3084
+#: sequencer.c:3252
#, c-format
msgid "Could not merge %.*s"
msgstr "不能合併 %.*s"
-#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641
+#: sequencer.c:3266 sequencer.c:3270 builtin/difftool.c:640
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "不能複製 '%s' 至 '%s'"
+#: sequencer.c:3282
+#, c-format
+msgid "Executing: %s\n"
+msgstr "執行：%s\n"
+
# 譯者：請維持前導空格
-#: sequencer.c:3129
+#: sequencer.c:3297
#, c-format
msgid ""
"execution failed: %s\n"
@@ -7052,11 +8052,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3135
+#: sequencer.c:3303
msgid "and made changes to the index and/or the working tree\n"
msgstr "並且修改索引和/或工作區\n"
-#: sequencer.c:3141
+#: sequencer.c:3309
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -7073,102 +8073,123 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:3202
+#: sequencer.c:3370
#, c-format
msgid "illegal label name: '%.*s'"
msgstr "非法的標籤名稱：'%.*s'"
-#: sequencer.c:3256
+#: sequencer.c:3424
msgid "writing fake root commit"
msgstr "寫偽根提交"
-#: sequencer.c:3261
+#: sequencer.c:3429
msgid "writing squash-onto"
msgstr "寫入 squash-onto"
-#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886
-#, c-format
-msgid "failed to find tree of %s"
-msgstr "無法找到 %s 指向的樹。"
-
-#: sequencer.c:3344
+#: sequencer.c:3513
#, c-format
msgid "could not resolve '%s'"
msgstr "無法解析 '%s'"
-#: sequencer.c:3375
+#: sequencer.c:3546
msgid "cannot merge without a current revision"
msgstr "沒有目前版本不能合併"
-#: sequencer.c:3397
+#: sequencer.c:3568
#, c-format
msgid "unable to parse '%.*s'"
msgstr "無法解析 '%.*s'"
-#: sequencer.c:3406
+#: sequencer.c:3577
#, c-format
msgid "nothing to merge: '%.*s'"
msgstr "無可用合併：'%.*s'"
-#: sequencer.c:3418
+#: sequencer.c:3589
msgid "octopus merge cannot be executed on top of a [new root]"
msgstr "章魚合並不能在一個新的根提交上執行"
-#: sequencer.c:3434
+#: sequencer.c:3605
#, c-format
msgid "could not get commit message of '%s'"
msgstr "不能取得 '%s' 的提交說明"
-#: sequencer.c:3594
+#: sequencer.c:3788
#, c-format
msgid "could not even attempt to merge '%.*s'"
msgstr "甚至不能嘗試合併 '%.*s'"
-#: sequencer.c:3610
+#: sequencer.c:3804
msgid "merge: Unable to write new index file"
msgstr "合併：無法寫入新索引檔案"
-#: sequencer.c:3679 builtin/rebase.c:737
+#: sequencer.c:3878
+msgid "Cannot autostash"
+msgstr "無法 autostash"
+
+#: sequencer.c:3881
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "意外的 stash 回應：'%s'"
+
+#: sequencer.c:3887
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "不能為 '%s' 建立目錄"
+
+#: sequencer.c:3890
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "建立了 autostash：%s\n"
+
+#: sequencer.c:3894
+msgid "could not reset --hard"
+msgstr "無法 reset --hard"
+
+#: sequencer.c:3919
#, c-format
msgid "Applied autostash.\n"
msgstr "已應用 autostash。\n"
-#: sequencer.c:3691
+#: sequencer.c:3931
#, c-format
msgid "cannot store %s"
msgstr "不能儲存 %s"
-#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113
+#: sequencer.c:3934
#, 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"
+"%s\n"
"您的修改安全地儲存在儲藏區中。\n"
"您可以在任何時候執行 \"git stash pop\" 或 \"git stash drop\"。\n"
-#: sequencer.c:3755
-#, c-format
-msgid "%s: not a valid OID"
-msgstr "%s：不是一個有效的物件 ID"
+#: sequencer.c:3939
+msgid "Applying autostash resulted in conflicts."
+msgstr "因套用自動儲藏而導致衝突。"
-#: sequencer.c:3760 git-rebase--preserve-merges.sh:779
+#: sequencer.c:3940
+msgid "Autostash exists; creating a new stash entry."
+msgstr "已有自動儲藏；建立新儲藏項目。"
+
+#: sequencer.c:4033 git-rebase--preserve-merges.sh:769
msgid "could not detach HEAD"
msgstr "不能分離開頭指標"
-#: sequencer.c:3775
+#: sequencer.c:4048
#, c-format
msgid "Stopped at HEAD\n"
msgstr "停止在 HEAD\n"
-#: sequencer.c:3777
+#: sequencer.c:4050
#, c-format
msgid "Stopped at %s\n"
msgstr "停止在 %s\n"
-#: sequencer.c:3785
+#: sequencer.c:4058
#, c-format
msgid ""
"Could not execute the todo command\n"
@@ -7188,48 +8209,58 @@
" git rebase --edit-todo\n"
" git rebase --continue\n"
-#: sequencer.c:3869
+#: sequencer.c:4104
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "正在重定基底 (%d/%d)%s"
+
+#: sequencer.c:4149
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "停止在 %s... %.*s\n"
-#: sequencer.c:3940
+#: sequencer.c:4220
#, c-format
msgid "unknown command %d"
msgstr "未知指令 %d"
-#: sequencer.c:3999
+#: sequencer.c:4279
msgid "could not read orig-head"
msgstr "不能讀取 orig-head"
-#: sequencer.c:4004
+#: sequencer.c:4284
msgid "could not read 'onto'"
msgstr "不能讀取 'onto'"
-#: sequencer.c:4018
+#: sequencer.c:4298
#, c-format
msgid "could not update HEAD to %s"
msgstr "不能更新 HEAD 為 %s"
-#: sequencer.c:4111
+#: sequencer.c:4358
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "成功重定基底並更新 %s。\n"
+
+#: sequencer.c:4391
msgid "cannot rebase: You have unstaged changes."
msgstr "不能重定基底：您有未暫存的變更。"
-#: sequencer.c:4120
+#: sequencer.c:4400
msgid "cannot amend non-existing commit"
msgstr "不能修補不存在的提交"
-#: sequencer.c:4122
+#: sequencer.c:4402
#, c-format
msgid "invalid file: '%s'"
msgstr "無效檔案：'%s'"
-#: sequencer.c:4124
+#: sequencer.c:4404
#, c-format
msgid "invalid contents: '%s'"
msgstr "無效內容：'%s'"
-#: sequencer.c:4127
+#: sequencer.c:4407
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -7238,68 +8269,68 @@
"\n"
"您的工作區中有未提交的變更。請先提交然後再次執行 'git rebase --continue'。"
-#: sequencer.c:4163 sequencer.c:4202
+#: sequencer.c:4443 sequencer.c:4482
#, c-format
msgid "could not write file: '%s'"
msgstr "不能寫入檔案：'%s'"
-#: sequencer.c:4217
+#: sequencer.c:4498
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "不能刪除 CHERRY_PICK_HEAD"
-#: sequencer.c:4224
+#: sequencer.c:4505
msgid "could not commit staged changes."
msgstr "不能提交暫存的修改。"
-#: sequencer.c:4338
+#: sequencer.c:4621
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s：不能揀選一個%s"
-#: sequencer.c:4342
+#: sequencer.c:4625
#, c-format
msgid "%s: bad revision"
msgstr "%s：錯誤的版本"
-#: sequencer.c:4377
+#: sequencer.c:4660
msgid "can't revert as initial commit"
msgstr "不能作為初始提交還原提交"
-#: sequencer.c:4846
+#: sequencer.c:5137
msgid "make_script: unhandled options"
msgstr "make_script：有未能處理的選項"
-#: sequencer.c:4849
+#: sequencer.c:5140
msgid "make_script: error preparing revisions"
msgstr "make_script：準備版本時錯誤"
-#: sequencer.c:5083 sequencer.c:5100
+#: sequencer.c:5382 sequencer.c:5399
msgid "nothing to do"
msgstr "無事可做"
-#: sequencer.c:5119
+#: sequencer.c:5418
msgid "could not skip unnecessary pick commands"
msgstr "無法跳過不必要的揀選"
-#: sequencer.c:5213
+#: sequencer.c:5512
msgid "the script was already rearranged."
msgstr "腳本已經重新編排。"
-#: setup.c:124
+#: setup.c:133
#, c-format
msgid "'%s' is outside repository at '%s'"
msgstr "'%s' 在位於 '%s' 的版本庫之外"
-#: setup.c:175
+#: 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 <指令> -- <路徑>...' 來指定本機不存在的路徑。"
+"使用指令 'git <命令> -- <路徑>...' 來指定本機不存在的路徑。"
-#: setup.c:188
+#: setup.c:198
#, c-format
msgid ""
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -7308,14 +8339,14 @@
msgstr ""
"有歧義的參數 '%s'：未知的版本或路徑不存在於工作區中。\n"
"使用 '--' 來分隔版本和路徑，例如：\n"
-"'git <指令> [<版本>...] -- [<檔案>...]'"
+"'git <命令> [<版本>...] -- [<檔案>...]'"
-#: setup.c:254
+#: setup.c:264
#, c-format
msgid "option '%s' must come before non-option arguments"
msgstr "選項 '%s' 必須在其他非選項參數之前"
-#: setup.c:273
+#: setup.c:283
#, c-format
msgid ""
"ambiguous argument '%s': both revision and filename\n"
@@ -7324,94 +8355,98 @@
msgstr ""
"有歧義的參數 '%s'：可同時是版本和檔案\n"
"使用 '--' 來分隔版本和路徑，例如：\n"
-"'git <指令> [<版本>...] -- [<檔案>...]'"
+"'git <命令> [<版本>...] -- [<檔案>...]'"
-#: setup.c:409
+#: setup.c:419
msgid "unable to set up work tree using invalid config"
msgstr "無法使用無效設定來建立工作區"
-#: setup.c:413
+#: setup.c:423
msgid "this operation must be run in a work tree"
msgstr "該動作必須在一個工作區中執行"
-#: setup.c:559
+#: setup.c:661
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "期望 git 版本庫版本 <= %d，卻得到 %d"
-#: setup.c:567
+#: setup.c:669
msgid "unknown repository extensions found:"
msgstr "發現未知的版本庫擴展："
-#: setup.c:586
+#: 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:588
+#: setup.c:702
#, c-format
msgid "too large to be a .git file: '%s'"
msgstr "檔案太大，無法作為 .git 檔案：'%s'"
-#: setup.c:590
+#: setup.c:704
#, c-format
msgid "error reading %s"
msgstr "讀取 %s 發生錯誤"
-#: setup.c:592
+#: setup.c:706
#, c-format
msgid "invalid gitfile format: %s"
msgstr "無效的 gitfile 格式：%s"
-#: setup.c:594
+#: setup.c:708
#, c-format
msgid "no path in gitfile: %s"
msgstr "在 gitfile 中沒有路徑：%s"
-#: setup.c:596
+#: setup.c:710
#, c-format
msgid "not a git repository: %s"
msgstr "不是一個 git 版本庫：%s"
-#: setup.c:695
+#: setup.c:812
#, c-format
msgid "'$%s' too big"
msgstr "'$%s' 太大"
-#: setup.c:709
+#: setup.c:826
#, c-format
msgid "not a git repository: '%s'"
msgstr "不是一個 git 版本庫：'%s'"
-#: setup.c:738 setup.c:740 setup.c:771
+#: setup.c:855 setup.c:857 setup.c:888
#, c-format
msgid "cannot chdir to '%s'"
msgstr "不能切換目錄到 '%s'"
-#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856
+#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973
msgid "cannot come back to cwd"
msgstr "無法返回目前工作目錄"
-#: setup.c:870
+#: setup.c:987
#, c-format
msgid "failed to stat '%*s%s%s'"
msgstr "取得 '%*s%s%s' 狀態（stat）失敗"
-#: setup.c:1108
+#: setup.c:1225
msgid "Unable to read current working directory"
msgstr "不能讀取目前工作目錄"
-#: setup.c:1117 setup.c:1123
+#: setup.c:1234 setup.c:1240
#, c-format
msgid "cannot change to '%s'"
msgstr "不能切換到 '%s'"
-#: setup.c:1128
+#: setup.c:1245
#, c-format
msgid "not a git repository (or any of the parent directories): %s"
msgstr "不是一個 git 版本庫（或者任何父目錄）：%s"
-#: setup.c:1134
+#: setup.c:1251
#, c-format
msgid ""
"not a git repository (or any parent up to mount point %s)\n"
@@ -7420,7 +8455,7 @@
"不是一個 git 版本庫（或者直至掛載點 %s 的任何父目錄）\n"
"停止在檔案系統邊界（未設定 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"
-#: setup.c:1245
+#: setup.c:1362
#, c-format
msgid ""
"problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -7429,423 +8464,103 @@
"參數 core.sharedRepository 的檔案屬性值有問題（0%.3o）。\n"
"檔案所有者必須始終擁有讀寫權限。"
-#: setup.c:1289
+#: setup.c:1409
msgid "open /dev/null or dup failed"
msgstr "不能開啟或者複製 /dev/null"
-#: setup.c:1304
+#: setup.c:1424
msgid "fork failed"
msgstr "fork 失敗"
-#: setup.c:1309
+#: setup.c:1429
msgid "setsid failed"
msgstr "setsid 失敗"
-#: sha1-file.c:452
-#, c-format
-msgid "object directory %s does not exist; check .git/objects/info/alternates"
-msgstr "物件目錄 %s 不存在，檢查 .git/objects/info/alternates"
-
-#: sha1-file.c:503
-#, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr "無法規範化備用物件路徑：%s"
-
-#: sha1-file.c:575
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr "%s：忽略備用物件庫，嵌套太深"
-
-#: sha1-file.c:582
-#, c-format
-msgid "unable to normalize object directory: %s"
-msgstr "無法規範化物件目錄: %s"
-
-#: sha1-file.c:625
-msgid "unable to fdopen alternates lockfile"
-msgstr "無法 fdopen 取代鎖檔案"
-
-#: sha1-file.c:643
-msgid "unable to read alternates file"
-msgstr "無法讀取替代檔案"
-
-#: sha1-file.c:650
-msgid "unable to move new alternates file into place"
-msgstr "無法將新的替代檔案移動到位"
-
-#: sha1-file.c:685
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "路徑 '%s' 不存在"
-
-#: sha1-file.c:711
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr "尚不支援將參考版本庫 '%s' 作為一個連結簽出。"
-
-#: sha1-file.c:717
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "參考版本庫 '%s' 不是一個本機版本庫。"
-
-#: sha1-file.c:723
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "參考版本庫 '%s' 是一個淺複製"
-
-#: sha1-file.c:731
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "參考版本庫 '%s' 已被移植"
-
-#: sha1-file.c:791
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "解析備用引用時無效的行：%s"
-
-#: sha1-file.c:943
-#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
-msgstr "嘗試 mmap %<PRIuMAX>，超過了最大值 %<PRIuMAX>"
-
-#: sha1-file.c:964
-msgid "mmap failed"
-msgstr "mmap 失敗"
-
-#: sha1-file.c:1128
-#, c-format
-msgid "object file %s is empty"
-msgstr "物件檔案 %s 為空"
-
-#: sha1-file.c:1263 sha1-file.c:2443
-#, c-format
-msgid "corrupt loose object '%s'"
-msgstr "損壞的鬆散物件 '%s'"
-
-#: sha1-file.c:1265 sha1-file.c:2447
-#, c-format
-msgid "garbage at end of loose object '%s'"
-msgstr "鬆散物件 '%s' 後面有垃圾資料"
-
-#: sha1-file.c:1307
-msgid "invalid object type"
-msgstr "無效的物件類型"
-
-#: sha1-file.c:1391
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "無法用 --allow-unknown-type 參數解開 %s 標頭訊息"
-
-#: sha1-file.c:1394
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "無法解開 %s 頭部"
-
-#: sha1-file.c:1400
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "無法用 --allow-unknown-type 參數解析 %s 標頭訊息"
-
-#: sha1-file.c:1403
-#, c-format
-msgid "unable to parse %s header"
-msgstr "無法解析 %s 頭部"
-
-#: sha1-file.c:1629
-#, c-format
-msgid "failed to read object %s"
-msgstr "讀取物件 %s 失敗"
-
-#: sha1-file.c:1633
-#, c-format
-msgid "replacement %s not found for %s"
-msgstr "找不到 %2$s 的替代 %1$s"
-
-#: sha1-file.c:1637
-#, c-format
-msgid "loose object %s (stored in %s) is corrupt"
-msgstr "鬆散物件 %s（儲存在 %s）已損壞"
-
-#: sha1-file.c:1641
-#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "打包物件 %s（儲存在 %s）已損壞"
-
-#: sha1-file.c:1746
-#, c-format
-msgid "unable to write file %s"
-msgstr "無法寫檔案 %s"
-
-#: sha1-file.c:1753
-#, c-format
-msgid "unable to set permission to '%s'"
-msgstr "無法為 '%s' 設定權限"
-
-#: sha1-file.c:1760
-msgid "file write error"
-msgstr "檔案寫錯誤"
-
-#: sha1-file.c:1780
-msgid "error when closing loose object file"
-msgstr "關閉鬆散物件檔案時發生錯誤"
-
-#: sha1-file.c:1845
-#, c-format
-msgid "insufficient permission for adding an object to repository database %s"
-msgstr "權限不足，無法在版本庫物件庫 %s 中新增物件"
-
-#: sha1-file.c:1847
-msgid "unable to create temporary file"
-msgstr "無法建立暫存檔"
-
-#: sha1-file.c:1871
-msgid "unable to write loose object file"
-msgstr "不能寫鬆散物件檔案"
-
-#: sha1-file.c:1877
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr "不能壓縮新物件 %s（%d）"
-
-#: sha1-file.c:1881
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr "在物件 %s 上呼叫 deflateEnd 失敗（%d）"
-
-#: sha1-file.c:1885
-#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr "被 %s 的不穩定物件源資料搞糊塗了"
-
-#: sha1-file.c:1895 builtin/pack-objects.c:1054
-#, c-format
-msgid "failed utime() on %s"
-msgstr "在 %s 上呼叫 utime() 失敗"
-
-#: sha1-file.c:1972
-#, c-format
-msgid "cannot read object for %s"
-msgstr "不能讀取物件 %s"
-
-#: sha1-file.c:2011
-msgid "corrupt commit"
-msgstr "損壞的提交"
-
-#: sha1-file.c:2019
-msgid "corrupt tag"
-msgstr "損壞的標籤"
-
-#: sha1-file.c:2119
-#, c-format
-msgid "read error while indexing %s"
-msgstr "索引 %s 時讀取錯誤"
-
-#: sha1-file.c:2122
-#, c-format
-msgid "short read while indexing %s"
-msgstr "索引 %s 時讀入不完整"
-
-#: sha1-file.c:2195 sha1-file.c:2205
-#, c-format
-msgid "%s: failed to insert into database"
-msgstr "%s：插入資料庫失敗"
-
-#: sha1-file.c:2211
-#, c-format
-msgid "%s: unsupported file type"
-msgstr "%s：不支援的檔案類型"
-
-#: sha1-file.c:2235
-#, c-format
-msgid "%s is not a valid object"
-msgstr "%s 不是一個有效的物件"
-
-#: sha1-file.c:2237
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s 不是一個有效的 '%s' 物件"
-
-#: sha1-file.c:2264 builtin/index-pack.c:155
-#, c-format
-msgid "unable to open %s"
-msgstr "不能開啟 %s"
-
-#: sha1-file.c:2454 sha1-file.c:2507
-#, c-format
-msgid "hash mismatch for %s (expected %s)"
-msgstr "%s 的雜湊值不符合（預期 %s）"
-
-#: sha1-file.c:2478
-#, c-format
-msgid "unable to mmap %s"
-msgstr "不能 mmap %s"
-
-#: sha1-file.c:2483
-#, c-format
-msgid "unable to unpack header of %s"
-msgstr "無法解壓縮 %s 的頭部"
-
-#: sha1-file.c:2489
-#, c-format
-msgid "unable to parse header of %s"
-msgstr "無法解析 %s 的頭部"
-
-#: sha1-file.c:2500
-#, c-format
-msgid "unable to unpack contents of %s"
-msgstr "無法解壓縮 %s 的內容"
-
-#: sha1-name.c:486
-#, c-format
-msgid "short SHA1 %s is ambiguous"
-msgstr "短 SHA1 %s 存在歧義"
-
-#: sha1-name.c:497
-msgid "The candidates are:"
-msgstr "候選者有："
-
-#: sha1-name.c:796
-msgid ""
-"Git normally never creates a ref that ends with 40 hex characters\n"
-"because it will be ignored when you just specify 40-hex. These refs\n"
-"may be created by mistake. For example,\n"
-"\n"
-" git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
-"examine these refs and maybe delete them. Turn this message off by\n"
-"running \"git config advice.objectNameWarning false\""
-msgstr ""
-"Git 通常不會建立一個以40個十六進位字元結尾的引用，因為當您只提供40\n"
-"個十六進位字元時將被忽略。這些引用可能被錯誤地建立。例如：\n"
-"\n"
-" git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"當 \"$br\" 某種原因空白時，一個40位十六進位的引用將被建立。請檢查這些\n"
-"引用，可能需要刪除它們。執行 \"git config advice.objectNameWarning\n"
-"false\" 指令關閉本消息通知。"
-
-#: sha1-name.c:916
-#, c-format
-msgid "log for '%.*s' only goes back to %s"
-msgstr "'%.*s' 的日誌只能回到 %s"
-
-#: sha1-name.c:924
-#, c-format
-msgid "log for '%.*s' only has %d entries"
-msgstr "'%.*s' 的日誌只有 %d 個項目"
-
-#: sha1-name.c:1689
-#, c-format
-msgid "path '%s' exists on disk, but not in '%.*s'"
-msgstr "磁碟上存在 '%s' 路徑，但不存在於 '%.*s'"
-
-#: sha1-name.c:1695
-#, c-format
-msgid ""
-"path '%s' exists, but not '%s'\n"
-"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
-msgstr ""
-"'%s' 路徑存在，但不是 '%s'\n"
-"提示：你在說 '%.*s:%s'，即 '%.*s:./%s' 嗎？"
-
-#: sha1-name.c:1704
-#, c-format
-msgid "path '%s' does not exist in '%.*s'"
-msgstr "'%s' 路徑不存在於 '%.*s'"
-
-#: sha1-name.c:1732
-#, c-format
-msgid ""
-"path '%s' is in the index, but not at stage %d\n"
-"hint: Did you mean ':%d:%s'?"
-msgstr ""
-"'%s' 路徑在索引，但不在 %d 暫存區\n"
-"提示：你在說 ':%d:%s' 嗎？"
-
-#: sha1-name.c:1748
-#, c-format
-msgid ""
-"path '%s' is in the index, but not '%s'\n"
-"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
-msgstr ""
-"'%s' 路徑在索引，但不是 '%s'\n"
-"提示：你在說 ':%d:%s'，即 ':%d:%s' 嗎？"
-
-#: sha1-name.c:1756
-#, c-format
-msgid "path '%s' exists on disk, but not in the index"
-msgstr "磁碟上存在 '%s' 路徑，但不在索引中"
-
-#: sha1-name.c:1758
-#, c-format
-msgid "path '%s' does not exist (neither on disk nor in the index)"
-msgstr "'%s' 路徑不存在 (既不存在磁碟，也不存在索引)"
-
-#: sha1-name.c:1771
-msgid "relative path syntax can't be used outside working tree"
-msgstr "相對路徑與法不能用在工作區外"
-
-#: sha1-name.c:1909
-#, c-format
-msgid "invalid object name '%.*s'."
-msgstr "'%.*s' 物件名稱無效。"
-
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:837
+#: strbuf.c:848
#, c-format
msgid "%u.%2.2u GiB"
msgstr "%u.%2.2u GiB"
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:839
+#: 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:847
+#: strbuf.c:858
#, c-format
msgid "%u.%2.2u MiB"
msgstr "%u.%2.2u MiB"
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:849
+#: 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:856
+#: strbuf.c:867
#, c-format
msgid "%u.%2.2u KiB"
msgstr "%u.%2.2u KiB"
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:858
+#: 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:864
+#: strbuf.c:875
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
msgstr[0] "%u 位元組"
#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:866
+#: strbuf.c:877
#, c-format
msgid "%u byte/s"
msgid_plural "%u bytes/s"
msgstr[0] "%u 位元組/秒"
-#: strbuf.c:1164
+#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719
+#: builtin/rebase.c:866
+#, 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，先解決合併衝突"
@@ -7867,67 +8582,67 @@
#: submodule.c:327
#, c-format
msgid "in unpopulated submodule '%s'"
-msgstr "位於未簽出的子模組 '%s'"
+msgstr "位於未檢出的子模組 '%s'"
#: submodule.c:358
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "路徑規格 '%s' 在子模組 '%.*s' 中"
-#: submodule.c:434
+#: submodule.c:435
#, c-format
msgid "bad --ignore-submodules argument: %s"
msgstr "無效 --ignore-submodules 參數：%s"
-#: submodule.c:815
+#: submodule.c:817
#, c-format
msgid ""
"Submodule in commit %s at path: '%s' collides with a submodule named the "
"same. Skipping it."
msgstr "%s 提交位於路徑：'%s' 的子模組與同名的子模組衝突。跳過。"
-#: submodule.c:910
+#: submodule.c:920
#, c-format
msgid "submodule entry '%s' (%s) is a %s, not a commit"
msgstr "子模組條目 '%s'（%s）是一個 %s，不是一個提交"
-#: submodule.c:995
+#: submodule.c:1005
#, c-format
msgid ""
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
"submodule %s"
msgstr "無法在 %s 子模組執行 'git rev-list <提交> --not --remotes -n 1' 命令"
-#: submodule.c:1118
+#: submodule.c:1128
#, c-format
msgid "process for submodule '%s' failed"
msgstr "處理 '%s' 子模組失敗"
-#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045
+#: submodule.c:1157 builtin/branch.c:689 builtin/submodule--helper.c:2469
msgid "Failed to resolve HEAD as a valid ref."
msgstr "無法將 HEAD 解析為有效引用。"
-#: submodule.c:1158
+#: submodule.c:1168
#, c-format
msgid "Pushing submodule '%s'\n"
msgstr "正在推送 '%s' 子模組\n"
-#: submodule.c:1161
+#: submodule.c:1171
#, c-format
msgid "Unable to push submodule '%s'\n"
msgstr "無法推送 '%s' 子模組\n"
-#: submodule.c:1453
+#: submodule.c:1463
#, c-format
msgid "Fetching submodule %s%s\n"
msgstr "正在抓取 %s%s 子模組\n"
-#: submodule.c:1483
+#: submodule.c:1497
#, c-format
msgid "Could not access submodule '%s'\n"
msgstr "無法存取子模組 '%s'\n"
-#: submodule.c:1637
+#: submodule.c:1652
#, c-format
msgid ""
"Errors during submodule fetch:\n"
@@ -7936,77 +8651,77 @@
"抓取子模組時發生錯誤：\n"
"%s"
-#: submodule.c:1662
+#: submodule.c:1677
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "無法將 '%s' 識別為一個 git 版本庫"
-#: submodule.c:1679
+#: submodule.c:1694
#, c-format
msgid "Could not run 'git status --porcelain=2' in submodule %s"
msgstr "無法在 %s 子模組執行 'git status --porcelain=2'"
-#: submodule.c:1720
+#: submodule.c:1735
#, c-format
msgid "'git status --porcelain=2' failed in submodule %s"
msgstr "%s 子模組執行 'git status --porcelain=2' 失敗"
-#: submodule.c:1800
+#: submodule.c:1810
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "無法在子模組 '%s' 中啟動 'git status'"
-#: submodule.c:1813
+#: submodule.c:1823
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "無法在子模組 '%s' 中執行 'git status'"
-#: submodule.c:1828
+#: submodule.c:1838
#, c-format
msgid "Could not unset core.worktree setting in submodule '%s'"
msgstr "無法在子模組 '%s' 中取消 core.worktree 的設定"
-#: submodule.c:1855 submodule.c:2165
+#: submodule.c:1865 submodule.c:2175
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "無法遞迴子模組路徑 '%s'"
-#: submodule.c:1876
+#: submodule.c:1886
msgid "could not reset submodule index"
msgstr "無法重設子模組的索引"
-#: submodule.c:1918
+#: submodule.c:1928
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "子模組 '%s' 中有髒索引"
-#: submodule.c:1970
+#: submodule.c:1980
#, c-format
msgid "Submodule '%s' could not be updated."
msgstr "子模組 '%s' 無法被更新。"
-#: submodule.c:2038
+#: submodule.c:2048
#, c-format
msgid "submodule git dir '%s' is inside git dir '%.*s'"
msgstr "「%s」子模組 git 目錄在「%.*s」git 路徑中"
-#: submodule.c:2059
+#: submodule.c:2069
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr "不支援對有多個工作區的子模組 '%s' 執行 relocate_gitdir"
-#: submodule.c:2071 submodule.c:2130
+#: submodule.c:2081 submodule.c:2140
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "不能查詢子模組 '%s' 的名稱"
-#: submodule.c:2075
+#: submodule.c:2085
#, c-format
msgid "refusing to move '%s' into an existing git dir"
msgstr "拒絕移動「%s」至現存 git 目錄"
-#: submodule.c:2082
+#: submodule.c:2092
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -8017,93 +8732,257 @@
"'%s' 遷移至\n"
"'%s'\n"
-#: submodule.c:2209
+#: submodule.c:2220
msgid "could not start ls-files in .."
msgstr "無法在 .. 中啟動 ls-files"
-#: submodule.c:2248
+#: submodule.c:2260
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree 返回未知返回值 %d"
-#: submodule-config.c:236
-#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "忽略可疑的子模組名稱：%s"
-
-#: submodule-config.c:303
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "submodule.fetchjobs 不允許為負值"
-
-#: submodule-config.c:401
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr "忽略可能被解析為指令列選項的 '%s'：%s"
-
-#: submodule-config.c:498
-#, c-format
-msgid "invalid value for %s"
-msgstr "%s 的值無效"
-
-#: submodule-config.c:765
-#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr "不能更新 .gitmodules 條目 %s"
-
-#: trailer.c:238
+#: 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:298 builtin/remote.c:323
+#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324
#, 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 builtin/mktag.c:91
msgid "could not read from stdin"
msgstr "不能自標準輸入讀取"
-#: trailer.c:1011 wrapper.c:665
+#: 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-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:1237
+#, 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:1447
+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:845
+#, c-format
+msgid "helper reported unexpected status of %s"
+msgstr "協助工具報告 %s 的意外狀態"
+
+#: transport-helper.c:928
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr "協助工具 %s 不支援 dry-run"
+
+#: transport-helper.c:931
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr "協助工具 %s 不支援 --signed"
+
+#: transport-helper.c:934
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr "協助工具 %s 不支援 --signed=if-asked"
+
+#: transport-helper.c:939
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr "協助工具 %s 不支援 --atomic"
+
+#: transport-helper.c:943
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr "協助工具 %s 不支援 --%s"
+
+#: transport-helper.c:950
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr "協助工具 %s 不支援 'push-option'"
+
+#: transport-helper.c:1050
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr "remote-heper 不支援 push，需要引用表達式"
+
+#: transport-helper.c:1055
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr "協助工具 %s 不支援 'force'"
+
+#: transport-helper.c:1102
+msgid "couldn't run fast-export"
+msgstr "無法執行 fast-export"
+
+#: transport-helper.c:1107
+msgid "error while running fast-export"
+msgstr "執行 fast-export 時發生錯誤"
+
+#: transport-helper.c:1132
+#, 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:1214
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr "不支援的物件格式「%s」"
+
+#: transport-helper.c:1223
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr "引用列表中格式錯誤的回應：%s"
+
+#: transport-helper.c:1375
+#, c-format
+msgid "read(%s) failed"
+msgstr "讀取（%s）失敗"
+
+#: transport-helper.c:1402
+#, c-format
+msgid "write(%s) failed"
+msgstr "寫（%s）失敗"
+
+#: transport-helper.c:1451
+#, c-format
+msgid "%s thread failed"
+msgstr "%s 執行緒失敗"
+
+#: transport-helper.c:1455
+#, c-format
+msgid "%s thread failed to join: %s"
+msgstr "%s 執行緒等待失敗：%s"
+
+#: transport-helper.c:1474 transport-helper.c:1478
+#, c-format
+msgid "can't start thread for copying data: %s"
+msgstr "不能啟動執行緒來複製資料：%s"
+
+#: transport-helper.c:1515
+#, c-format
+msgid "%s process failed to wait"
+msgstr "%s 進程等待失敗"
+
+#: transport-helper.c:1519
+#, c-format
+msgid "%s process failed"
+msgstr "%s 進程失敗"
+
+#: transport-helper.c:1537 transport-helper.c:1546
+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"
@@ -8114,49 +8993,49 @@
msgid "could not read bundle '%s'"
msgstr "無法讀取 bundle '%s'"
-#: transport.c:214
+#: transport.c:220
#, c-format
msgid "transport: invalid depth option '%s'"
msgstr "傳輸：無效的深度選項 '%s'"
-#: transport.c:266
+#: transport.c:269
msgid "see protocol.version in 'git help config' for more details"
msgstr "檢視 'git help config' 中的 protocol.version 取得更多訊息"
-#: transport.c:267
+#: transport.c:270
msgid "server options require protocol version 2 or later"
msgstr "服務端選項需要版本 2 協定或更高"
-#: transport.c:632
+#: transport.c:727
msgid "could not parse transport.color.* config"
msgstr "不能解析 transport.color.* 設定"
-#: transport.c:705
+#: transport.c:802
msgid "support for protocol v2 not implemented yet"
msgstr "協定 v2 的支援尚未實現"
-#: transport.c:831
+#: transport.c:936
#, c-format
msgid "unknown value for config '%s': %s"
msgstr "設定 '%s' 的取值未知：%s"
-#: transport.c:897
+#: transport.c:1002
#, c-format
msgid "transport '%s' not allowed"
msgstr "傳輸 '%s' 不允許"
-#: transport.c:949
+#: transport.c:1055
msgid "git-over-rsync is no longer supported"
msgstr "不再支援 git-over-rsync"
-#: transport.c:1044
+#: transport.c:1157
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr "下列子模組路徑所包含的修改在任何遠端源中都找不到：\n"
-#: transport.c:1048
+#: transport.c:1161
#, c-format
msgid ""
"\n"
@@ -8183,223 +9062,49 @@
"以推送至遠端。\n"
"\n"
-#: transport.c:1056
+#: transport.c:1169
msgid "Aborting."
msgstr "正在終止。"
-#: transport.c:1201
+#: transport.c:1316
msgid "failed to push all needed submodules"
msgstr "不能推送全部需要的子模組"
-#: transport.c:1345 transport-helper.c:657
-msgid "operation not supported by protocol"
-msgstr "協定不支援該動作"
-
-#: transport-helper.c:61 transport-helper.c:90
-msgid "full write to remote helper failed"
-msgstr "完整寫入遠端助手失敗"
-
-#: transport-helper.c:144
-#, c-format
-msgid "unable to find remote helper for '%s'"
-msgstr "無法為 '%s' 找到遠端助手"
-
-#: transport-helper.c:160 transport-helper.c:571
-msgid "can't dup helper output fd"
-msgstr "無法複製助手輸出檔案句柄"
-
-#: transport-helper.c:211
-#, c-format
-msgid ""
-"unknown mandatory capability %s; this remote helper probably needs newer "
-"version of Git"
-msgstr "未知的強制能力 %s，該遠端助手可能需要新版本的Git"
-
-#: transport-helper.c:217
-msgid "this remote helper should implement refspec capability"
-msgstr "遠端助手需要實現 refspec 能力"
-
-#: transport-helper.c:284 transport-helper.c:425
-#, c-format
-msgid "%s unexpectedly said: '%s'"
-msgstr "%s 意外地說：'%s'"
-
-#: transport-helper.c:414
-#, c-format
-msgid "%s also locked %s"
-msgstr "%s 也鎖定了 %s"
-
-#: transport-helper.c:493
-msgid "couldn't run fast-import"
-msgstr "不能執行 fast-import"
-
-#: transport-helper.c:516
-msgid "error while running fast-import"
-msgstr "執行 fast-import 發生錯誤"
-
-#: transport-helper.c:545 transport-helper.c:1134
-#, c-format
-msgid "could not read ref %s"
-msgstr "無法讀取引用 %s"
-
-#: transport-helper.c:590
-#, c-format
-msgid "unknown response to connect: %s"
-msgstr "連線時未知的回應：%s"
-
-#: transport-helper.c:612
-msgid "setting remote service path not supported by protocol"
-msgstr "協定不支援設定遠端服務路徑"
-
-#: transport-helper.c:614
-msgid "invalid remote service path"
-msgstr "無效的遠端服務路徑"
-
-#: transport-helper.c:660
-#, c-format
-msgid "can't connect to subservice %s"
-msgstr "不能連線到子服務 %s"
-
-#: transport-helper.c:736
-#, c-format
-msgid "expected ok/error, helper said '%s'"
-msgstr "預期 ok/error，助手說 '%s'"
-
-#: transport-helper.c:789
-#, c-format
-msgid "helper reported unexpected status of %s"
-msgstr "助手報告 %s 的意外狀態"
-
-#: transport-helper.c:850
-#, c-format
-msgid "helper %s does not support dry-run"
-msgstr "助手 %s 不支援 dry-run"
-
-#: transport-helper.c:853
-#, c-format
-msgid "helper %s does not support --signed"
-msgstr "助手 %s 不支援 --signed"
-
-#: transport-helper.c:856
-#, c-format
-msgid "helper %s does not support --signed=if-asked"
-msgstr "助手 %s 不支援 --signed=if-asked"
-
-#: transport-helper.c:861
-#, c-format
-msgid "helper %s does not support --atomic"
-msgstr "助手 %s 不支援 --atomic"
-
-#: transport-helper.c:867
-#, c-format
-msgid "helper %s does not support 'push-option'"
-msgstr "助手 %s 不支援 'push-option'"
-
-#: transport-helper.c:965
-msgid "remote-helper doesn't support push; refspec needed"
-msgstr "remote-heper 不支援 push，需要引用表達式"
-
-#: transport-helper.c:970
-#, c-format
-msgid "helper %s does not support 'force'"
-msgstr "助手 %s 不支援 'force'"
-
-#: transport-helper.c:1017
-msgid "couldn't run fast-export"
-msgstr "無法執行 fast-export"
-
-#: transport-helper.c:1022
-msgid "error while running fast-export"
-msgstr "執行 fast-export 時發生錯誤"
-
-#: transport-helper.c:1047
-#, c-format
-msgid ""
-"No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch such as 'master'.\n"
-msgstr ""
-"沒有共同的引用並且也沒有指定，什麼也不會做。\n"
-"可能您應該指定一個分支如 'master'。\n"
-
-#: transport-helper.c:1120
-#, c-format
-msgid "malformed response in ref list: %s"
-msgstr "引用列表中格式錯誤的回應：%s"
-
-#: transport-helper.c:1272
-#, c-format
-msgid "read(%s) failed"
-msgstr "讀取（%s）失敗"
-
-#: transport-helper.c:1299
-#, c-format
-msgid "write(%s) failed"
-msgstr "寫（%s）失敗"
-
-#: transport-helper.c:1348
-#, c-format
-msgid "%s thread failed"
-msgstr "%s 執行緒失敗"
-
-#: transport-helper.c:1352
-#, c-format
-msgid "%s thread failed to join: %s"
-msgstr "%s 執行緒等待失敗：%s"
-
-#: transport-helper.c:1371 transport-helper.c:1375
-#, c-format
-msgid "can't start thread for copying data: %s"
-msgstr "不能啟動執行緒來複製資料：%s"
-
-#: transport-helper.c:1412
-#, c-format
-msgid "%s process failed to wait"
-msgstr "%s 進程等待失敗"
-
-#: transport-helper.c:1416
-#, c-format
-msgid "%s process failed"
-msgstr "%s 進程失敗"
-
-#: transport-helper.c:1434 transport-helper.c:1443
-msgid "can't start thread for copying data"
-msgstr "不能啟動執行緒來複製資料"
-
-#: tree-walk.c:32
+#: tree-walk.c:33
msgid "too-short tree object"
msgstr "太短的樹狀物件"
-#: tree-walk.c:38
+#: tree-walk.c:39
msgid "malformed mode in tree entry"
msgstr "樹狀物件中的條目模式錯誤"
-#: tree-walk.c:42
+#: tree-walk.c:43
msgid "empty filename in tree entry"
msgstr "樹狀物件條目中空的檔案名"
-#: tree-walk.c:117
+#: tree-walk.c:118
msgid "too-short tree file"
msgstr "太短的樹檔案"
-#: unpack-trees.c:110
+#: unpack-trees.c: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"
+"您對下列檔案的本機修改將被檢出動作覆蓋：\n"
"%%s請在切換分支前提交或儲藏您的修改。"
-#: unpack-trees.c:112
+#: unpack-trees.c:115
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%s"
msgstr ""
-"您對下列檔案的本機修改將被簽出動作覆蓋：\n"
+"您對下列檔案的本機修改將被檢出動作覆蓋：\n"
"%%s"
-#: unpack-trees.c:115
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -8408,7 +9113,7 @@
"您對下列檔案的本機修改將被合併動作覆蓋：\n"
"%%s請在合併前提交或儲藏您的修改。"
-#: unpack-trees.c:117
+#: unpack-trees.c:120
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -8417,7 +9122,7 @@
"您對下列檔案的本機修改將被合併動作覆蓋：\n"
"%%s"
-#: unpack-trees.c:120
+#: unpack-trees.c:123
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -8426,7 +9131,7 @@
"您對下列檔案的本機修改將被 %s 覆蓋：\n"
"%%s請在 %s 之前提交或儲藏您的修改。"
-#: unpack-trees.c:122
+#: unpack-trees.c:125
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -8435,7 +9140,7 @@
"您對下列檔案的本機修改將被 %s 覆蓋：\n"
"%%s"
-#: unpack-trees.c:127
+#: unpack-trees.c:130
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -8444,34 +9149,34 @@
"更新如下目錄將會遺失其中未追蹤的檔案：\n"
"%s"
-#: unpack-trees.c:131
+#: 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"
+"工作區中下列未追蹤的檔案將會因為檢出動作而被刪除：\n"
"%%s請在切換分支之前移動或刪除。"
-#: unpack-trees.c:133
-#, c-format
-msgid ""
-"The following untracked working tree files would be removed by checkout:\n"
-"%%s"
-msgstr ""
-"工作區中下列未追蹤的檔案將會因為簽出動作而被刪除：\n"
-"%%s"
-
#: unpack-trees.c:136
#, c-format
msgid ""
+"The following untracked working tree files would be removed by 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:138
+#: unpack-trees.c:141
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -8480,7 +9185,7 @@
"工作區中下列未追蹤的檔案將會因為合併動作而被刪除：\n"
"%%s"
-#: unpack-trees.c:141
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -8489,7 +9194,7 @@
"工作區中下列未追蹤的檔案將會因為 %s 動作而被刪除：\n"
"%%s請在 %s 前移動或刪除。"
-#: unpack-trees.c:143
+#: unpack-trees.c:146
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -8498,27 +9203,27 @@
"工作區中下列未追蹤的檔案將會因為 %s 動作而被刪除：\n"
"%%s"
-#: unpack-trees.c:149
+#: 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"
+"工作區中下列未追蹤的檔案將會因為檢出動作而被覆蓋：\n"
"%%s請在切換分支前移動或刪除。"
-#: unpack-trees.c:151
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
"checkout:\n"
"%%s"
msgstr ""
-"工作區中下列未追蹤的檔案將會因為簽出動作而被覆蓋：\n"
+"工作區中下列未追蹤的檔案將會因為檢出動作而被覆蓋：\n"
"%%s"
-#: unpack-trees.c:154
+#: unpack-trees.c:157
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -8527,7 +9232,7 @@
"工作區中下列未追蹤的檔案將會因為合併動作而被覆蓋：\n"
"%%s請在合併前移動或刪除。"
-#: unpack-trees.c:156
+#: unpack-trees.c:159
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -8536,7 +9241,7 @@
"工作區中下列未追蹤的檔案將會因為合併動作而被覆蓋：\n"
"%%s"
-#: unpack-trees.c:159
+#: unpack-trees.c:162
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -8545,7 +9250,7 @@
"工作區中下列未追蹤的檔案將會因為 %s 動作而被覆蓋：\n"
"%%s請在 %s 前移動或刪除。"
-#: unpack-trees.c:161
+#: unpack-trees.c:164
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -8554,41 +9259,12 @@
"工作區中下列未追蹤的檔案將會因為 %s 動作而被覆蓋：\n"
"%%s"
-#: unpack-trees.c:169
+#: unpack-trees.c:172
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "條目 '%s' 和 '%s' 重疊。無法合併。"
-#: unpack-trees.c:172
-#, c-format
-msgid ""
-"Cannot update sparse checkout: the following entries are not up to date:\n"
-"%s"
-msgstr ""
-"無法更新稀疏簽出：如下條目不是最新：\n"
-"%s"
-
-#: unpack-trees.c:174
-#, c-format
-msgid ""
-"The following working tree files would be overwritten by sparse checkout "
-"update:\n"
-"%s"
-msgstr ""
-"工作區中下列檔案將被稀疏簽出更新所覆蓋：\n"
-"%s"
-
-#: unpack-trees.c:176
-#, c-format
-msgid ""
-"The following working tree files would be removed by sparse checkout "
-"update:\n"
-"%s"
-msgstr ""
-"工作區中下列檔案將被稀疏簽出更新所刪除：\n"
-"%s"
-
-#: unpack-trees.c:178
+#: unpack-trees.c:175
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -8597,16 +9273,52 @@
"無法更新子模組：\n"
"%s"
-#: unpack-trees.c:255
+#: 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:317
+#: 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:349
+#: 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"
@@ -8615,10 +9327,14 @@
"以下路徑發生碰撞（如：在不區分大小寫的檔案系統上的區分大小寫的路徑），\n"
"並且碰撞組中只有一個檔案存在工作區中：\n"
-#: unpack-trees.c:1445
+#: unpack-trees.c:1498
msgid "Updating index flags"
msgstr "正在更新索引旗標"
+#: upload-pack.c:1543
+msgid "expected flush after fetch arguments"
+msgstr "在 fetch 引數應為一個 flush 包"
+
#: urlmatch.c:163
msgid "invalid URL scheme name or missing '://' suffix"
msgstr "無效的 URL 方案名稱或遺失 '://' 後綴"
@@ -8652,27 +9368,27 @@
msgid "Fetching objects"
msgstr "正在抓取物件"
-#: worktree.c:259 builtin/am.c:2099
+#: worktree.c:238 builtin/am.c:2103
#, c-format
msgid "failed to read '%s'"
msgstr "讀取 '%s' 失敗"
-#: worktree.c:305
+#: worktree.c:304
#, c-format
msgid "'%s' at main working tree is not the repository directory"
msgstr "在主工作區的 '%s' 不是版本庫目錄"
-#: worktree.c:316
+#: worktree.c:315
#, c-format
msgid "'%s' file does not contain absolute path to the working tree location"
msgstr "檔案 '%s' 不包含工作區的絕對路徑"
-#: worktree.c:328
+#: worktree.c:327
#, c-format
msgid "'%s' does not exist"
msgstr "'%s' 不存在"
-#: worktree.c:334
+#: worktree.c:333
#, c-format
msgid "'%s' is not a .git file, error code %d"
msgstr "'%s' 不是一個 .git 檔案，錯誤碼 %d"
@@ -8682,17 +9398,83 @@
msgid "'%s' does not point back to '%s'"
msgstr "'%s' 沒有指回到 '%s'"
-#: wrapper.c:186 wrapper.c:356
+#: worktree.c:608
+msgid "not a directory"
+msgstr "不是目錄"
+
+#: worktree.c:617
+msgid ".git is not a file"
+msgstr ".git 不是檔案"
+
+#: worktree.c:619
+msgid ".git file broken"
+msgstr ".git 檔案損毀"
+
+#: worktree.c:621
+msgid ".git file incorrect"
+msgstr ".git 檔案不正確"
+
+#: worktree.c:727
+msgid "not a valid path"
+msgstr "非有效路徑"
+
+#: worktree.c:733
+msgid "unable to locate repository; .git is not a file"
+msgstr "無法定位版本庫；.git 不是檔案"
+
+#: worktree.c:737
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr "無法定位版本庫；.git 檔案未參考版本庫"
+
+#: worktree.c:741
+msgid "unable to locate repository; .git file broken"
+msgstr "無法定位版本庫；.git 檔案損壞"
+
+#: worktree.c:747
+msgid "gitdir unreadable"
+msgstr "無法讀取 gitdir"
+
+#: worktree.c:751
+msgid "gitdir incorrect"
+msgstr "不正確的 gitdir"
+
+#: worktree.c:776
+msgid "not a valid directory"
+msgstr "非有效目錄"
+
+#: worktree.c:782
+msgid "gitdir file does not exist"
+msgstr "找不到 gitdir 檔案"
+
+#: worktree.c:787 worktree.c:796
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "無法讀取 gitdir 檔案 (%s)"
+
+#: worktree.c:806
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr "讀取過短（預期有 %<PRIuMAX> 位元組，只讀到 %<PRIuMAX>）"
+
+#: worktree.c:814
+msgid "invalid gitdir file"
+msgstr "gitdir 檔案無效"
+
+#: worktree.c:822
+msgid "gitdir file points to non-existent location"
+msgstr "gitdir 檔案指向的位置不存在"
+
+#: wrapper.c:197 wrapper.c:367
#, c-format
msgid "could not open '%s' for reading and writing"
msgstr "無法開啟 '%s' 進行讀寫"
-#: wrapper.c:387 wrapper.c:588
+#: wrapper.c:398 wrapper.c:599
#, c-format
msgid "unable to access '%s'"
msgstr "不能存取 '%s'"
-#: wrapper.c:596
+#: wrapper.c:607
msgid "unable to get current working directory"
msgstr "不能取得目前工作目錄"
@@ -8731,11 +9513,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:1072
msgid "Changes to be committed:"
msgstr "要提交的變更："
-#: wt-status.c:234 wt-status.c:1083
+#: wt-status.c:234 wt-status.c:1081
msgid "Changes not staged for commit:"
msgstr "尚未暫存以備提交的變更："
@@ -8766,96 +9548,96 @@
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:905
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "您的儲藏區目前有 %d 條紀錄"
-#: wt-status.c:938
+#: wt-status.c:936
msgid "Submodules changed but not updated:"
msgstr "子模組已修改但尚未更新："
-#: wt-status.c:940
+#: wt-status.c:938
msgid "Submodule changes to be committed:"
msgstr "要提交的子模組變更："
-#: wt-status.c:1022
+#: wt-status.c:1020
msgid ""
"Do not modify or remove the line above.\n"
"Everything below it will be ignored."
@@ -8863,7 +9645,7 @@
"不要改動或刪除上面的一行。\n"
"其下所有內容都將被忽略。"
-#: wt-status.c:1114
+#: wt-status.c:1112
#, c-format
msgid ""
"\n"
@@ -8874,265 +9656,278 @@
"花了 %.2f 秒才計算出分支的領先/落後範圍。\n"
"為避免，您可以使用 '--no-ahead-behind'。\n"
-#: wt-status.c:1144
+#: wt-status.c:1142
msgid "You have unmerged paths."
msgstr "您有尚未合併的路徑。"
# 譯者：請維持前導空格
-#: wt-status.c:1147
+#: wt-status.c:1145
msgid " (fix conflicts and run \"git commit\")"
msgstr " （解決衝突並執行 \"git commit\"）"
# 譯者：請維持前導空格
-#: wt-status.c:1149
+#: wt-status.c:1147
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " （使用 \"git merge --abort\" 終止合併）"
-#: wt-status.c:1153
+#: wt-status.c:1151
msgid "All conflicts fixed but you are still merging."
msgstr "所有衝突已解決但您仍處於合併中。"
# 譯者：請維持前導空格
-#: wt-status.c:1156
+#: wt-status.c:1154
msgid " (use \"git commit\" to conclude merge)"
msgstr " （使用 \"git commit\" 結束合併）"
-#: wt-status.c:1165
+#: wt-status.c:1163
msgid "You are in the middle of an am session."
msgstr "您正處於 am 動作過程中。"
-#: wt-status.c:1168
+#: wt-status.c:1166
msgid "The current patch is empty."
msgstr "目前的修補檔為空。"
# 譯者：請維持前導空格
-#: wt-status.c:1172
+#: wt-status.c:1170
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " （解決衝突，然後執行 \"git am --continue\"）"
# 譯者：請維持前導空格
-#: wt-status.c:1174
+#: wt-status.c:1172
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " （使用 \"git am --skip\" 跳過此修補檔）"
# 譯者：請維持前導空格
-#: wt-status.c:1176
+#: wt-status.c:1174
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " （使用 \"git am --abort\" 復原原有分支）"
-#: wt-status.c:1309
+#: wt-status.c:1307
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo 遺失。"
-#: wt-status.c:1311
+#: wt-status.c:1309
msgid "No commands done."
msgstr "沒有指令被執行。"
-#: 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] "最後一條指令已完成（%d 條指令被執行）："
-#: wt-status.c:1325
+#: wt-status.c:1323
#, c-format
msgid " (see more in file %s)"
msgstr " （更多參見檔案 %s）"
-#: wt-status.c:1330
+#: wt-status.c:1328
msgid "No commands remaining."
msgstr "未剩下任何指令。"
-#: 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] "接下來要執行的指令（剩餘 %d 條指令）："
# 譯者：請維持前導空格
-#: wt-status.c:1341
+#: wt-status.c:1339
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " （使用 \"git rebase --edit-todo\" 來檢視和編輯）"
-#: wt-status.c:1353
+#: wt-status.c:1351
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作。"
-#: wt-status.c:1358
+#: wt-status.c:1356
msgid "You are currently rebasing."
msgstr "您在執行重定基底動作。"
# 譯者：請維持前導空格
-#: wt-status.c:1371
+#: wt-status.c:1369
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " （解決衝突，然後執行 \"git rebase --continue\"）"
# 譯者：請維持前導空格
-#: wt-status.c:1373
+#: wt-status.c:1371
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " （使用 \"git rebase --skip\" 跳過此修補檔）"
# 譯者：請維持前導空格
-#: wt-status.c:1375
+#: wt-status.c:1373
msgid " (use \"git rebase --abort\" to check out the original branch)"
-msgstr " （使用 \"git rebase --abort\" 以簽出原有分支）"
+msgstr " （使用 \"git rebase --abort\" 以檢出原有分支）"
# 譯者：請維持前導空格
-#: wt-status.c:1382
+#: wt-status.c:1380
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " （所有衝突已解決：執行 \"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'."
msgstr "您在執行將分支 '%s' 重定基底到 '%s' 的動作時分割提交。"
-#: wt-status.c:1391
+#: wt-status.c:1389
msgid "You are currently splitting a commit during a rebase."
msgstr "您在執行重定基底動作時分割提交。"
# 譯者：請維持前導空格
-#: wt-status.c:1394
+#: wt-status.c:1392
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr " （一旦您工作目錄提交乾淨後，執行 \"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 "您在執行將分支 '%s' 重定基底到 '%s' 的動作時編輯提交。"
-#: wt-status.c:1403
+#: wt-status.c:1401
msgid "You are currently editing a commit during a rebase."
msgstr "您在執行重定基底動作時編輯提交。"
# 譯者：請維持前導空格
-#: wt-status.c:1406
+#: wt-status.c:1404
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " （使用 \"git commit --amend\" 修補目前提交）"
# 譯者：請維持前導空格
-#: wt-status.c:1408
+#: wt-status.c:1406
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " （當您對您的修改滿意後執行 \"git rebase --continue\"）"
-#: wt-status.c:1419
+#: wt-status.c:1417
msgid "Cherry-pick currently in progress."
msgstr "揀選動作正在進行中。"
-#: wt-status.c:1422
+#: wt-status.c:1420
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "您在執行揀選提交 %s 的動作。"
# 譯者：請維持前導空格
-#: wt-status.c:1429
+#: wt-status.c:1427
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " （解決衝突並執行 \"git cherry-pick --continue\"）"
# 譯者：請維持前導空格
-#: wt-status.c:1432
+#: wt-status.c:1430
msgid " (run \"git cherry-pick --continue\" to continue)"
msgstr " （執行 \"git cherry-pick --continue\" 以繼續）"
# 譯者：請維持前導空格
-#: wt-status.c:1435
+#: wt-status.c:1433
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr " （所有衝突已解決：執行 \"git cherry-pick --continue\"）"
# 譯者：請維持前導空格
-#: wt-status.c:1437
+#: wt-status.c:1435
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
msgstr " （使用 \"git cherry-pick --skip\" 跳過此修補檔）"
# 譯者：請維持前導空格
-#: wt-status.c:1439
+#: wt-status.c:1437
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " （使用 \"git cherry-pick --abort\" 以取消揀選動作）"
-#: wt-status.c:1449
+#: wt-status.c:1447
msgid "Revert currently in progress."
msgstr "還原動作正在行中。"
-#: wt-status.c:1452
+#: wt-status.c:1450
#, c-format
msgid "You are currently reverting commit %s."
msgstr "您在執行反轉提交 %s 的動作。"
# 譯者：請維持前導空格
-#: wt-status.c:1458
+#: wt-status.c:1456
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " （解決衝突並執行 \"git revert --continue\"）"
# 譯者：請維持前導空格
-#: wt-status.c:1461
+#: wt-status.c:1459
msgid " (run \"git revert --continue\" to continue)"
msgstr " （執行 \"git revert --continue\" 以繼續）"
# 譯者：請維持前導空格
-#: wt-status.c:1464
+#: wt-status.c:1462
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " （所有衝突已解決：執行 \"git revert --continue\"）"
# 譯者：請維持前導空格
-#: wt-status.c:1466
+#: wt-status.c:1464
msgid " (use \"git revert --skip\" to skip this patch)"
msgstr " （使用 \"git revert --skip\" 跳過此修補檔）"
# 譯者：請維持前導空格
-#: wt-status.c:1468
+#: wt-status.c:1466
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " （使用 \"git revert --abort\" 以取消反轉提交動作）"
-#: wt-status.c:1478
+#: wt-status.c:1476
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
-msgstr "您在執行從分支 '%s' 開始的二分尋找動作。"
+msgstr "您在執行從分支 '%s' 開始的二分搜尋動作。"
-#: wt-status.c:1482
+#: wt-status.c:1480
msgid "You are currently bisecting."
-msgstr "您在執行二分尋找動作。"
+msgstr "您在執行二分搜尋動作。"
# 譯者：請維持前導空格
-#: wt-status.c:1485
+#: wt-status.c:1483
msgid " (use \"git bisect reset\" to get back to the original branch)"
-msgstr " （使用 \"git bisect reset\" 簽出原有分支）"
+msgstr " （使用 \"git bisect reset\" 檢出原有分支）"
-#: wt-status.c:1694
+#: wt-status.c:1494
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr "您處於稀疏簽出狀態，包含 %d%% 的追蹤檔案。"
+
+#: wt-status.c:1733
msgid "On branch "
msgstr "位於分支 "
-#: wt-status.c:1701
+#: wt-status.c:1740
msgid "interactive rebase in progress; onto "
msgstr "互動式重定基底動作正在進行中；至 "
-#: wt-status.c:1703
+#: wt-status.c:1742
msgid "rebase in progress; onto "
msgstr "重定基底動作正在進行中；至 "
-#: wt-status.c:1713
+#: wt-status.c:1747
+msgid "HEAD detached at "
+msgstr "開頭指標分離於 "
+
+#: wt-status.c:1749
+msgid "HEAD detached from "
+msgstr "開頭指標分離自 "
+
+#: wt-status.c:1752
msgid "Not currently on any branch."
msgstr "目前不在任何分支上。"
-#: wt-status.c:1730
+#: wt-status.c:1769
msgid "Initial commit"
msgstr "初始提交"
-#: wt-status.c:1731
+#: wt-status.c:1770
msgid "No commits yet"
msgstr "尚無提交"
-#: wt-status.c:1745
+#: wt-status.c:1784
msgid "Untracked files"
msgstr "未追蹤的檔案"
-#: wt-status.c:1747
+#: wt-status.c:1786
msgid "Ignored files"
msgstr "忽略的檔案"
-#: wt-status.c:1751
+#: wt-status.c:1790
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -9142,102 +9937,102 @@
"耗費了 %.2f 秒以枚舉未追蹤的檔案。'status -uno' 也許能提高速度，\n"
"但您需要小心不要忘了新增新檔案（參見 'git help status'）。"
-#: wt-status.c:1757
+#: wt-status.c:1796
#, c-format
msgid "Untracked files not listed%s"
msgstr "未追蹤的檔案沒有列出%s"
# 譯者：中文字串拼接，可刪除前導空格
-#: wt-status.c:1759
+#: wt-status.c:1798
msgid " (use -u option to show untracked files)"
-msgstr "（使用 -u 參數顯示未追蹤的檔案）"
+msgstr " （使用 -u 參數顯示未追蹤的檔案）"
-#: wt-status.c:1765
+#: wt-status.c:1804
msgid "No changes"
msgstr "沒有修改"
-#: wt-status.c:1770
+#: wt-status.c:1809
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n"
-#: wt-status.c:1773
+#: wt-status.c:1813
#, c-format
msgid "no changes added to commit\n"
msgstr "修改尚未加入提交\n"
-#: wt-status.c:1776
+#: wt-status.c:1817
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr "提交為空，但是存在尚未追蹤的檔案（使用 \"git add\" 建立追蹤）\n"
-#: wt-status.c:1779
+#: wt-status.c:1821
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "提交為空，但是存在尚未追蹤的檔案\n"
# 譯者：中文字串拼接，可刪除前導空格
-#: wt-status.c:1782
+#: wt-status.c:1825
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "無檔案要提交（建立/複製檔案並使用 \"git add\" 建立追蹤）\n"
-#: wt-status.c:1785 wt-status.c:1790
+#: wt-status.c:1829 wt-status.c:1835
#, c-format
msgid "nothing to commit\n"
msgstr "無檔案要提交\n"
# 譯者：中文字串拼接，可刪除前導空格
-#: wt-status.c:1788
+#: wt-status.c:1832
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "無檔案要提交（使用 -u 顯示未追蹤的檔案）\n"
# 譯者：中文字串拼接，可刪除前導空格
-#: wt-status.c:1792
+#: wt-status.c:1837
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "沒有要提交的檔案，工作區為乾淨狀態\n"
-#: wt-status.c:1905
+#: wt-status.c:1942
msgid "No commits yet on "
msgstr "尚無提交在 "
-#: wt-status.c:1909
+#: wt-status.c:1946
msgid "HEAD (no branch)"
msgstr "HEAD（非分支）"
-#: wt-status.c:1940
+#: wt-status.c:1977
msgid "different"
msgstr "不同"
# 譯者：請維持句尾空格
-#: wt-status.c:1942 wt-status.c:1950
+#: wt-status.c:1979 wt-status.c:1987
msgid "behind "
msgstr "落後 "
-#: wt-status.c:1945 wt-status.c:1948
+#: wt-status.c:1982 wt-status.c:1985
msgid "ahead "
msgstr "領先 "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2470
+#: wt-status.c:2507
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "不能%s：您有未暫存的變更。"
-#: wt-status.c:2476
+#: wt-status.c:2513
msgid "additionally, your index contains uncommitted changes."
msgstr "另外，您的索引中包含未提交的變更。"
-#: wt-status.c:2478
+#: wt-status.c:2515
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "不能%s：您的索引中包含未提交的變更。"
-#: compat/precompose_utf8.c:58 builtin/clone.c:455
+#: compat/precompose_utf8.c:58 builtin/clone.c:457
#, c-format
msgid "failed to unlink '%s'"
msgstr "刪除 '%s' 失敗"
@@ -9246,126 +10041,131 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<選項>] [--] <路徑規格>..."
-#: builtin/add.c:88
+#: builtin/add.c:58
+#, c-format
+msgid "cannot chmod %cx '%s'"
+msgstr "無法 chmod %cx ‘%s’"
+
+#: builtin/add.c:96
#, c-format
msgid "unexpected diff status %c"
msgstr "意外的差異狀態 %c"
-#: builtin/add.c:93 builtin/commit.c:288
+#: builtin/add.c:101 builtin/commit.c:285
msgid "updating files failed"
msgstr "更新檔案失敗"
-#: builtin/add.c:103
+#: builtin/add.c:111
#, c-format
msgid "remove '%s'\n"
msgstr "刪除 '%s'\n"
-#: builtin/add.c:178
+#: builtin/add.c:186
msgid "Unstaged changes after refreshing the index:"
msgstr "重新整理索引之後尚未被暫存的變更："
-#: builtin/add.c:266 builtin/rev-parse.c:899
+#: builtin/add.c:280 builtin/rev-parse.c:991
msgid "Could not read the index"
msgstr "不能讀取索引"
-#: builtin/add.c:277
+#: builtin/add.c:291
#, c-format
msgid "Could not open '%s' for writing."
msgstr "無法為寫入開啟 '%s'。"
-#: builtin/add.c:281
+#: builtin/add.c:295
msgid "Could not write patch"
msgstr "不能生成修補檔"
-#: builtin/add.c:284
+#: builtin/add.c:298
msgid "editing patch failed"
msgstr "編輯修補檔失敗"
-#: builtin/add.c:287
+#: builtin/add.c:301
#, c-format
msgid "Could not stat '%s'"
msgstr "不能對 '%s' 呼叫 stat"
-#: builtin/add.c:289
+#: builtin/add.c:303
msgid "Empty patch. Aborted."
msgstr "空修補檔。異常終止。"
-#: builtin/add.c:294
+#: builtin/add.c:308
#, c-format
msgid "Could not apply '%s'"
msgstr "不能應用 '%s'"
-#: builtin/add.c:302
+#: builtin/add.c:316
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "下列路徑根據您的一個 .gitignore 檔案而被忽略：\n"
-#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548
-#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
+#: builtin/add.c:336 builtin/clean.c:904 builtin/fetch.c:169 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:559
+#: builtin/remote.c:1427 builtin/rm.c:242 builtin/send-pack.c:190
msgid "dry run"
msgstr "測試執行"
-#: builtin/add.c:325
+#: builtin/add.c:339
msgid "interactive picking"
msgstr "互動式揀選"
-#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307
+#: builtin/add.c:340 builtin/checkout.c:1546 builtin/reset.c:308
msgid "select hunks interactively"
msgstr "互動式挑選資料區塊"
-#: builtin/add.c:327
+#: builtin/add.c:341
msgid "edit current diff and apply"
msgstr "編輯目前差異並應用"
-#: builtin/add.c:328
+#: builtin/add.c:342
msgid "allow adding otherwise ignored files"
msgstr "允許新增忽略的檔案"
-#: builtin/add.c:329
+#: builtin/add.c:343
msgid "update tracked files"
msgstr "更新已追蹤的檔案"
-#: builtin/add.c:330
+#: builtin/add.c:344
msgid "renormalize EOL of tracked files (implies -u)"
msgstr "對已追蹤檔案（隱含 -u）重新歸一換行符號"
-#: builtin/add.c:331
+#: builtin/add.c:345
msgid "record only the fact that the path will be added later"
msgstr "只記錄，該路徑稍後再新增"
-#: builtin/add.c:332
+#: builtin/add.c:346
msgid "add changes from all tracked and untracked files"
msgstr "新增所有改變的已追蹤檔案和未追蹤檔案"
-#: builtin/add.c:335
+#: builtin/add.c:349
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "忽略工作區中移除的路徑（和 --no-all 相同）"
-#: builtin/add.c:337
+#: builtin/add.c:351
msgid "don't add, only refresh the index"
msgstr "不新增，只重新整理索引"
-#: builtin/add.c:338
+#: builtin/add.c:352
msgid "just skip files which cannot be added because of errors"
msgstr "跳過因發生錯誤不能新增的檔案"
-#: builtin/add.c:339
+#: builtin/add.c:353
msgid "check if - even missing - files are ignored in dry run"
msgstr "檢查在測試執行模式下檔案（即使不存在）是否被忽略"
-#: builtin/add.c:341 builtin/update-index.c:1004
+#: builtin/add.c:355 builtin/update-index.c:1004
msgid "override the executable bit of the listed files"
msgstr "覆蓋列表裡檔案的可執行位"
-#: builtin/add.c:343
+#: builtin/add.c:357
msgid "warn when adding an embedded repository"
msgstr "建立一個嵌入式版本庫時給予警告"
-#: builtin/add.c:345
+#: builtin/add.c:359
msgid "backend for `git stash -p`"
msgstr "`git stash -p` 的後端"
-#: builtin/add.c:363
+#: builtin/add.c:377
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -9394,12 +10194,12 @@
"\n"
"參見 \"git help submodule\" 取得更多訊息。"
-#: builtin/add.c:391
+#: builtin/add.c:405
#, c-format
msgid "adding embedded git repository: %s"
msgstr "正在新增嵌入式 git 版本庫：%s"
-#: builtin/add.c:410
+#: builtin/add.c:424
msgid ""
"Use -f if you really want to add them.\n"
"Turn this message off by running\n"
@@ -9409,47 +10209,47 @@
"如要關閉此訊息，請執行\n"
"\"git config advice.addIgnoredFile false\""
-#: builtin/add.c:419
+#: builtin/add.c:433
msgid "adding files failed"
msgstr "新增檔案失敗"
-#: builtin/add.c:447 builtin/commit.c:348
+#: builtin/add.c:461 builtin/commit.c:345
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
msgstr "--pathspec-from-file 與 --interactive/--patch 不相容"
-#: builtin/add.c:464
+#: builtin/add.c:478
msgid "--pathspec-from-file is incompatible with --edit"
msgstr "--pathspec-from-file 與 --edit 不相容"
-#: builtin/add.c:476
+#: builtin/add.c:490
msgid "-A and -u are mutually incompatible"
msgstr "-A 和 -u 選項互斥"
-#: builtin/add.c:479
+#: builtin/add.c:493
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "選項 --ignore-missing 只能和 --dry-run 同時使用"
-#: builtin/add.c:483
+#: builtin/add.c:497
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "參數 --chmod 取值 '%s' 必須是 -x 或 +x"
-#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354
-#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509
+#: builtin/add.c:515 builtin/checkout.c:1714 builtin/commit.c:351
+#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1569
msgid "--pathspec-from-file is incompatible with pathspec arguments"
msgstr "--pathspec-from-file 與 <路徑規格> 參數不相容"
-#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360
-#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515
+#: builtin/add.c:522 builtin/checkout.c:1726 builtin/commit.c:357
+#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1575
msgid "--pathspec-file-nul requires --pathspec-from-file"
msgstr "--pathspec-file-nul 需要 --pathspec-from-file"
-#: builtin/add.c:512
+#: builtin/add.c:526
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "沒有指定檔案，也沒有檔案被新增。\n"
-#: builtin/add.c:514
+#: builtin/add.c:528
msgid ""
"Maybe you wanted to say 'git add .'?\n"
"Turn this message off by running\n"
@@ -9507,7 +10307,7 @@
msgid "Patch format detection failed."
msgstr "修補檔格式偵測失敗。"
-#: builtin/am.c:953 builtin/clone.c:409
+#: builtin/am.c:953 builtin/clone.c:410
#, c-format
msgid "failed to create directory '%s'"
msgstr "建立目錄 '%s' 失敗"
@@ -9529,7 +10329,7 @@
#: builtin/am.c:1091
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
-msgstr "若要復原至原始分支並停止修補檔動作，執行 \"%s --abort\"。"
+msgstr "若要復原至原始分支並停止修補動作，執行 \"%s --abort\"。"
#: builtin/am.c:1174
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
@@ -9567,7 +10367,7 @@
#: builtin/am.c:1516
msgid "Falling back to patching base and 3-way merge..."
-msgstr "回落到基礎版本上打修補檔及進行三方合併..."
+msgstr "回落到基礎版本上修補及進行三方合併..."
#: builtin/am.c:1542
msgid "Failed to merge in the changes."
@@ -9577,12 +10377,12 @@
msgid "applying to an empty history"
msgstr "正套用到一個空歷史上"
-#: builtin/am.c:1621 builtin/am.c:1625
+#: builtin/am.c:1626 builtin/am.c:1630
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "無法繼續：%s 不存在。"
-#: builtin/am.c:1643
+#: builtin/am.c:1648
msgid "Commit Body is:"
msgstr "提交內容為："
@@ -9591,39 +10391,39 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1653
+#: builtin/am.c:1658
#, c-format
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
-msgstr "套用？是[y]/否[n]/編輯[e]/檢視修補檔[v]/應用所有[a]："
+msgstr "套用？是[y]/否[n]/編輯[e]/檢視修補檔[v]/全部接受[a]： "
-#: builtin/am.c:1700 builtin/commit.c:398
+#: builtin/am.c:1704 builtin/commit.c:395
msgid "unable to write index file"
msgstr "無法寫入索引檔案"
-#: builtin/am.c:1704
+#: builtin/am.c:1708
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "髒索引：不能套用修補檔（髒檔案：%s）"
-#: builtin/am.c:1744 builtin/am.c:1812
+#: builtin/am.c:1748 builtin/am.c:1816
#, c-format
msgid "Applying: %.*s"
msgstr "應用：%.*s"
-#: builtin/am.c:1761
+#: builtin/am.c:1765
msgid "No changes -- Patch already applied."
msgstr "沒有變更 —— 修補檔已經應用過。"
-#: builtin/am.c:1767
+#: builtin/am.c:1771
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "打修補檔失敗於 %s %.*s"
-#: builtin/am.c:1771
+#: builtin/am.c:1775
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
msgstr "用 'git am --show-current-patch=diff' 命令檢視失敗的修補檔"
-#: builtin/am.c:1815
+#: builtin/am.c:1819
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -9633,7 +10433,7 @@
"如果沒有什麼要新增到暫存區的，則很可能是其它提交已經引入了相同的變更。\n"
"您也許想要跳過這個修補檔。"
-#: builtin/am.c:1822
+#: builtin/am.c:1826
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -9644,169 +10444,171 @@
"您應該對已經衝突解決的每一個檔案執行 'git add' 來標記已經完成。 \n"
"你可以對 \"由他們刪除\" 的檔案執行 `git rm` 指令。"
-#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346
-#: builtin/reset.c:354
+#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 builtin/reset.c:347
+#: builtin/reset.c:355
#, c-format
msgid "Could not parse object '%s'."
msgstr "不能解析物件 '%s'。"
-#: builtin/am.c:1981
+#: builtin/am.c:1985
msgid "failed to clean index"
msgstr "清空索引失敗"
-#: builtin/am.c:2025
+#: builtin/am.c:2029
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr "您好像在上一次 'am' 失敗後移動了 HEAD。未還原至 ORIG_HEAD"
-#: builtin/am.c:2132
+#: builtin/am.c:2136
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "無效的 --patch-format 值：%s"
-#: builtin/am.c:2172
+#: builtin/am.c:2178
#, c-format
msgid "Invalid value for --show-current-patch: %s"
msgstr "無效的 --show-current-patch 值：%s"
-#: builtin/am.c:2176
+#: builtin/am.c:2182
#, c-format
msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
msgstr "--show-current-patch=%s 與 --show-current-patch=%s 不相容"
-#: builtin/am.c:2207
+#: builtin/am.c:2213
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<選項>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2208
+#: builtin/am.c:2214
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<選項>] (--continue | --skip | --abort)"
-#: builtin/am.c:2214
+#: builtin/am.c:2220
msgid "run interactively"
msgstr "以互動式方式執行"
-#: builtin/am.c:2216
+#: builtin/am.c:2222
msgid "historical option -- no-op"
msgstr "老的參數 —— 無作用"
-#: builtin/am.c:2218
+#: builtin/am.c:2224
msgid "allow fall back on 3way merging if needed"
-msgstr "如果必要，允許使用三方合併。"
+msgstr "如果必要，允許使用三方合併"
-#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:304 builtin/stash.c:812
+#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16
+#: builtin/repack.c:334 builtin/stash.c:882
msgid "be quiet"
msgstr "靜默模式"
-#: builtin/am.c:2221
-msgid "add a Signed-off-by line to the commit message"
-msgstr "在提交說明中新增一個 Signed-off-by 簽名"
+#: builtin/am.c:2227
+msgid "add a Signed-off-by trailer to the commit message"
+msgstr "在提交訊息結尾加入 Signed-off-by"
-#: builtin/am.c:2224
+#: builtin/am.c:2230
msgid "recode into utf8 (default)"
msgstr "使用 utf8 字元集（預設）"
-#: builtin/am.c:2226
+#: builtin/am.c:2232
msgid "pass -k flag to git-mailinfo"
msgstr "向 git-mailinfo 傳遞 -k 參數"
-#: builtin/am.c:2228
+#: builtin/am.c:2234
msgid "pass -b flag to git-mailinfo"
msgstr "向 git-mailinfo 傳遞 -b 參數"
-#: builtin/am.c:2230
+#: builtin/am.c:2236
msgid "pass -m flag to git-mailinfo"
msgstr "向 git-mailinfo 傳遞 -m 參數"
-#: builtin/am.c:2232
+#: builtin/am.c:2238
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "針對 mbox 格式，向 git-mailsplit 傳遞 --keep-cr 參數"
-#: builtin/am.c:2235
+#: builtin/am.c:2241
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "不向 git-mailsplit 傳遞 --keep-cr 參數，覆蓋 am.keepcr 的設定"
-#: builtin/am.c:2238
+#: builtin/am.c:2244
msgid "strip everything before a scissors line"
msgstr "捨棄裁切線前的所有內容"
-#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249
-#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261
-#: builtin/am.c:2267
+#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
+#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
+#: builtin/am.c:2273
msgid "pass it through git-apply"
msgstr "傳遞給 git-apply"
-#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670
-#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250
-#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505
-#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321
-#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:154 parse-options.h:175 parse-options.h:316
+#: builtin/am.c:2263 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:904 builtin/merge.c:261
+#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
+#: builtin/rebase.c:1347 builtin/repack.c:345 builtin/repack.c:349
+#: builtin/repack.c:351 builtin/show-branch.c:650 builtin/show-ref.c:172
+#: builtin/tag.c:436 parse-options.h:154 parse-options.h:175
+#: parse-options.h:316
msgid "n"
msgstr "n"
-#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38
+#: builtin/am.c:2269 builtin/branch.c:670 builtin/bugreport.c:136
+#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:470
+#: builtin/verify-tag.c:38
msgid "format"
msgstr "格式"
-#: builtin/am.c:2264
+#: builtin/am.c:2270
msgid "format the patch(es) are in"
msgstr "修補檔的格式"
-#: builtin/am.c:2270
+#: builtin/am.c:2276
msgid "override error message when patch failure occurs"
msgstr "打修補檔失敗時顯示的錯誤訊息"
-#: builtin/am.c:2272
+#: builtin/am.c:2278
msgid "continue applying patches after resolving a conflict"
msgstr "衝突解決後繼續套用修補檔"
-#: builtin/am.c:2275
+#: builtin/am.c:2281
msgid "synonyms for --continue"
msgstr "和 --continue 同義"
-#: builtin/am.c:2278
+#: builtin/am.c:2284
msgid "skip the current patch"
msgstr "跳過目前修補檔"
-#: builtin/am.c:2281
-msgid "restore the original branch and abort the patching operation."
-msgstr "復原原始分支並終止打修補檔動作。"
+#: builtin/am.c:2287
+msgid "restore the original branch and abort the patching operation"
+msgstr "還原原始分支並中止修補動作"
-#: builtin/am.c:2284
-msgid "abort the patching operation but keep HEAD where it is."
-msgstr "終止修補檔動作但保持 HEAD 不變。"
+#: builtin/am.c:2290
+msgid "abort the patching operation but keep HEAD where it is"
+msgstr "終止修補動作但保持 HEAD 不變。"
-#: builtin/am.c:2288
+#: builtin/am.c:2294
msgid "show the patch being applied"
msgstr "顯示正在套用的修補檔"
-#: builtin/am.c:2293
+#: builtin/am.c:2299
msgid "lie about committer date"
msgstr "將作者日期作為提交日期"
-#: builtin/am.c:2295
+#: builtin/am.c:2301
msgid "use current timestamp for author date"
msgstr "用目前時間作為作者日期"
-#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512
-#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517
-#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418
+#: builtin/am.c:2303 builtin/commit-tree.c:120 builtin/commit.c:1515
+#: builtin/merge.c:298 builtin/pull.c:175 builtin/rebase.c:538
+#: builtin/rebase.c:1400 builtin/revert.c:117 builtin/tag.c:451
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
+#: builtin/am.c:2304 builtin/rebase.c:539 builtin/rebase.c:1401
msgid "GPG-sign commits"
msgstr "使用 GPG 簽名提交"
-#: builtin/am.c:2301
+#: builtin/am.c:2307
msgid "(internal use for git-rebase)"
msgstr "（內部使用，用於 git-rebase）"
-#: builtin/am.c:2319
+#: builtin/am.c:2325
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."
@@ -9814,16 +10616,16 @@
"參數 -b/--binary 已經很長時間不做任何實質動作了，並且將被移除。\n"
"請不要再使用它了。"
-#: builtin/am.c:2326
+#: builtin/am.c:2332
msgid "failed to read the index"
msgstr "讀取索引失敗"
-#: builtin/am.c:2341
+#: builtin/am.c:2347
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "之前的重定基底目錄 %s 仍然存在，但卻提供了 mbox。"
-#: builtin/am.c:2365
+#: builtin/am.c:2371
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -9832,11 +10634,11 @@
"發現了錯誤的 %s 目錄。\n"
"使用 \"git am --abort\" 刪除它。"
-#: builtin/am.c:2371
+#: builtin/am.c:2377
msgid "Resolve operation not in progress, we are not resuming."
msgstr "解決動作未進行，我們不會繼續。"
-#: builtin/am.c:2381
+#: builtin/am.c:2387
msgid "interactive mode requires patches on the command line"
msgstr "互動式模式需要指令列上提供修補檔"
@@ -9874,42 +10676,15 @@
msgid "git archive: expected a flush"
msgstr "git archive：應有一個 flush 包"
-#: builtin/bisect--helper.c:22
-msgid "git bisect--helper --next-all [--no-checkout]"
-msgstr "git bisect--helper --next-all [--no-checkout]"
-
#: builtin/bisect--helper.c:23
-msgid "git bisect--helper --write-terms <bad_term> <good_term>"
-msgstr "git bisect--helper --write-terms <壞-術語> <好-術語>"
-
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-clean-state"
-msgstr "git bisect--helper --bisect-clean-state"
-
-#: builtin/bisect--helper.c:25
msgid "git bisect--helper --bisect-reset [<commit>]"
msgstr "git bisect--helper --bisect-reset [<提交>]"
-#: builtin/bisect--helper.c:26
-msgid ""
-"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
-"<bad_term>"
-msgstr ""
-"git bisect--helper --bisect-write [--no-log] <狀態> <版本> <好-術語> <壞-術語"
-">"
-
-#: builtin/bisect--helper.c:27
-msgid ""
-"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
-"<bad_term>"
-msgstr ""
-"git bisect--helper --bisect-check-and-set-terms <指令> <好-術語> <壞-術語>"
-
-#: builtin/bisect--helper.c:28
+#: builtin/bisect--helper.c:24
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:25
msgid ""
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
"term-new]"
@@ -9917,74 +10692,101 @@
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
"term-new]"
+#: builtin/bisect--helper.c:26
+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:28
+msgid "git bisect--helper --bisect-next"
+msgstr "git bisect--helper --bisect-next"
+
+#: builtin/bisect--helper.c:29
+msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
+msgstr "git bisect--helper --bisect-state (bad|new) [<修訂版>]"
+
#: builtin/bisect--helper.c:30
-msgid ""
-"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
-"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
-msgstr ""
-"git bisect--helper --bisect-start [--term-{old,good}=<術語> --term-{new,bad}"
-"=<術語>][--no-checkout] [<壞> [<好>...]] [--] [<路徑>...]"
+msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
+msgstr "git bisect--helper --bisect-state (good|old) [<修訂版>...]"
-#: builtin/bisect--helper.c:86
+#: builtin/bisect--helper.c:31
+msgid "git bisect--helper --bisect-replay <filename>"
+msgstr "git bisect--helper --bisect-replay <檔名>"
+
+#: builtin/bisect--helper.c:32
+msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
+msgstr "git bisect--helper --bisect-skip [(<修訂版>|<範圍>)...]"
+
+#: builtin/bisect--helper.c:107
+#, c-format
+msgid "cannot open file '%s' in mode '%s'"
+msgstr "無法以 '%2$s' 模式開啟 '%1$s' 檔案"
+
+#: builtin/bisect--helper.c:114
+#, c-format
+msgid "could not write to file '%s'"
+msgstr "無法寫入 '%s' 檔案"
+
+#: builtin/bisect--helper.c:153
#, c-format
msgid "'%s' is not a valid term"
msgstr "'%s' 不是一個有效的術語"
-#: builtin/bisect--helper.c:90
+#: builtin/bisect--helper.c:157
#, c-format
msgid "can't use the builtin command '%s' as a term"
msgstr "不能使用內建指令 '%s' 作為術語"
-#: builtin/bisect--helper.c:100
+#: builtin/bisect--helper.c:167
#, c-format
msgid "can't change the meaning of the term '%s'"
msgstr "不能修改術語 '%s' 的含義"
-#: builtin/bisect--helper.c:111
+#: builtin/bisect--helper.c:177
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:193
#, c-format
msgid "We are not bisecting.\n"
-msgstr "我們沒有在二分尋找。\n"
+msgstr "我們沒有在二分搜尋。\n"
-#: builtin/bisect--helper.c:163
+#: builtin/bisect--helper.c:201
#, c-format
msgid "'%s' is not a valid commit"
msgstr "'%s' 不是一個有效的提交"
-#: builtin/bisect--helper.c:172
+#: builtin/bisect--helper.c:210
#, c-format
msgid ""
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
-msgstr "不能簽出原始 HEAD '%s'。嘗試 'git bisect reset <提交>'。"
+msgstr "不能檢出原始 HEAD '%s'。嘗試 'git bisect reset <提交>'。"
-#: builtin/bisect--helper.c:216
+#: builtin/bisect--helper.c:254
#, c-format
msgid "Bad bisect_write argument: %s"
msgstr "壞的 bisect_write 參數：%s"
-#: builtin/bisect--helper.c:221
+#: builtin/bisect--helper.c:259
#, c-format
msgid "couldn't get the oid of the rev '%s'"
msgstr "無法取得版本 '%s' 的物件 ID"
-#: builtin/bisect--helper.c:233
+#: builtin/bisect--helper.c:271
#, c-format
msgid "couldn't open the file '%s'"
msgstr "無法開啟檔案 '%s'"
-#: builtin/bisect--helper.c:259
+#: builtin/bisect--helper.c:297
#, c-format
msgid "Invalid command: you're currently in a %s/%s bisect"
-msgstr "無效的指令：您目前正處於一個 %s/%s 二分尋找中"
+msgstr "無效的指令：您目前正處於一個 %s/%s 二分搜尋中"
-#: builtin/bisect--helper.c:286
+#: builtin/bisect--helper.c:324
#, c-format
msgid ""
"You need to give me at least one %s and %s revision.\n"
@@ -9993,7 +10795,7 @@
"您需要給我至少一個 %s 和一個 %s 版本。\n"
"為此您可以用 \"git bisect %s\" 和 \"git bisect %s\"。"
-#: builtin/bisect--helper.c:290
+#: builtin/bisect--helper.c:328
#, c-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -10004,32 +10806,32 @@
"然後需要提供我至少一個 %s 和一個 %s 版本。\n"
"為此您可以用 \"git bisect %s\" 和 \"git bisect %s\" 指令。"
-#: builtin/bisect--helper.c:310
+#: builtin/bisect--helper.c:348
#, c-format
msgid "bisecting only with a %s commit"
-msgstr "在只有一個 %s 提交的情況下二分尋找"
+msgstr "在只有一個 %s 提交的情況下二分搜尋"
# 譯者：請維持句尾空格
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
#.
-#: builtin/bisect--helper.c:318
+#: builtin/bisect--helper.c:356
msgid "Are you sure [Y/n]? "
msgstr "您確認嗎[Y/n]？ "
-#: builtin/bisect--helper.c:379
+#: builtin/bisect--helper.c:417
msgid "no terms defined"
msgstr "未定義術語"
-#: builtin/bisect--helper.c:382
+#: builtin/bisect--helper.c:420
#, c-format
msgid ""
"Your current terms are %s for the old state\n"
"and %s for the new state.\n"
msgstr "您目前針對舊狀態的術語是 %s，對新狀態的術語是 %s。\n"
-#: builtin/bisect--helper.c:392
+#: builtin/bisect--helper.c:430
#, c-format
msgid ""
"invalid argument %s for 'git bisect terms'.\n"
@@ -10038,262 +10840,307 @@
"指令 'git bisect terms' 的參數 %s 無效。\n"
"支援的選項有：--term-good|--term-old 和 --term-bad|--term-new。"
-#: builtin/bisect--helper.c:478
+#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1014
+msgid "revision walk setup failed\n"
+msgstr "版本遍歷設定失敗\n"
+
+#: builtin/bisect--helper.c:519
+#, c-format
+msgid "could not open '%s' for appending"
+msgstr "無法開啟 '%s' 進行附加"
+
+#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651
+msgid "'' is not a valid term"
+msgstr "'' 不是一個有效的術語"
+
+#: builtin/bisect--helper.c:661
#, c-format
msgid "unrecognized option: '%s'"
msgstr "未識別的選項：'%s'"
-#: builtin/bisect--helper.c:482
+#: builtin/bisect--helper.c:665
#, c-format
msgid "'%s' does not appear to be a valid revision"
msgstr "'%s' 看起來不是一個有效的版本"
-#: builtin/bisect--helper.c:514
+#: builtin/bisect--helper.c:696
msgid "bad HEAD - I need a HEAD"
msgstr "壞的 HEAD - 我需要一個 HEAD"
-#: builtin/bisect--helper.c:529
+#: builtin/bisect--helper.c:711
#, c-format
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
-msgstr "簽出 '%s' 失敗。嘗試 'git bisect start <有效分支>'。"
+msgstr "檢出 '%s' 失敗。嘗試 'git bisect start <有效分支>'。"
-#: builtin/bisect--helper.c:550
+#: builtin/bisect--helper.c:732
msgid "won't bisect on cg-seek'ed tree"
-msgstr "不會在做了 cg-seek 的樹上做二分尋找"
+msgstr "不會在做了 cg-seek 的樹上做二分搜尋"
-#: builtin/bisect--helper.c:553
+#: builtin/bisect--helper.c:735
msgid "bad HEAD - strange symbolic ref"
msgstr "壞的 HEAD - 奇怪的符號引用"
-#: builtin/bisect--helper.c:577
+#: builtin/bisect--helper.c:755
#, c-format
msgid "invalid ref: '%s'"
msgstr "無效的引用：'%s'"
-#: builtin/bisect--helper.c:633
-msgid "perform 'git bisect next'"
-msgstr "執行 'git bisect next'"
+#: builtin/bisect--helper.c:813
+msgid "You need to start by \"git bisect start\"\n"
+msgstr "您需要執行 \"git bisect start\" 來開始\n"
-#: builtin/bisect--helper.c:635
-msgid "write the terms to .git/BISECT_TERMS"
-msgstr "將術語寫入 .git/BISECT_TERMS"
+# 譯者：請維持句尾空格
+#. 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:824
+msgid "Do you want me to do it for you [Y/n]? "
+msgstr "您想讓我為您這樣做嗎[Y/n]？ "
-#: builtin/bisect--helper.c:637
-msgid "cleanup the bisection state"
-msgstr "清除二分尋找狀態"
+#: builtin/bisect--helper.c:842
+msgid "Please call `--bisect-state` with at least one argument"
+msgstr "要呼叫 `—bisect-state`，請傳入一個以上的引數"
-#: builtin/bisect--helper.c:639
-msgid "check for expected revs"
-msgstr "檢查預期的版本"
+#: builtin/bisect--helper.c:855
+#, c-format
+msgid "'git bisect %s' can take only one argument."
+msgstr "'git bisect %s' 只能有一個參數。"
-#: builtin/bisect--helper.c:641
+#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:878
+#, c-format
+msgid "Bad rev input: %s"
+msgstr "<修訂版> 輸入格式錯誤：%s"
+
+#: builtin/bisect--helper.c:912
+msgid "We are not bisecting."
+msgstr "我們沒有在二分搜尋。"
+
+#: builtin/bisect--helper.c:962
+#, c-format
+msgid "'%s'?? what are you talking about?"
+msgstr "「%s」？？您在說什麼？"
+
+#: builtin/bisect--helper.c:974
+#, c-format
+msgid "cannot read file '%s' for replaying"
+msgstr "無法讀取「%s」檔案來重放"
+
+#: builtin/bisect--helper.c:1047
msgid "reset the bisection state"
-msgstr "清除二分尋找狀態"
+msgstr "清除二分搜尋狀態"
-#: builtin/bisect--helper.c:643
-msgid "write out the bisection state in BISECT_LOG"
-msgstr "將二分尋找的狀態寫入 BISECT_LOG"
-
-#: builtin/bisect--helper.c:645
-msgid "check and set terms in a bisection state"
-msgstr "在一個二分尋找狀態中檢查和設定術語"
-
-#: builtin/bisect--helper.c:647
+#: builtin/bisect--helper.c:1049
msgid "check whether bad or good terms exist"
msgstr "檢查壞的或好的術語是否存在"
-#: builtin/bisect--helper.c:649
+#: builtin/bisect--helper.c:1051
msgid "print out the bisect terms"
-msgstr "列印二分尋找術語"
+msgstr "列印二分搜尋術語"
-#: builtin/bisect--helper.c:651
+#: builtin/bisect--helper.c:1053
msgid "start the bisect session"
-msgstr "啟動二分尋找過程"
+msgstr "啟動二分搜尋過程"
-#: builtin/bisect--helper.c:653
-msgid "update BISECT_HEAD instead of checking out the current commit"
-msgstr "更新 BISECT_HEAD 而非簽出目前提交"
+#: builtin/bisect--helper.c:1055
+msgid "find the next bisection commit"
+msgstr "尋找下一個二分搜尋提交"
-#: builtin/bisect--helper.c:655
+#: builtin/bisect--helper.c:1057
+msgid "mark the state of ref (or refs)"
+msgstr "標記 ref (或 refs) 的狀態"
+
+#: builtin/bisect--helper.c:1059
+msgid "list the bisection steps so far"
+msgstr "列出迄今的二分搜尋步驟"
+
+#: builtin/bisect--helper.c:1061
+msgid "replay the bisection process from the given file"
+msgstr "從指定檔案重放二分搜尋過程"
+
+#: builtin/bisect--helper.c:1063
+msgid "skip some commits for checkout"
+msgstr "跳過要檢出的部分提交"
+
+#: builtin/bisect--helper.c:1065
msgid "no log for BISECT_WRITE"
msgstr "BISECT_WRITE 無日誌"
-#: builtin/bisect--helper.c:673
-msgid "--write-terms requires two arguments"
-msgstr "--write-terms 需要兩個參數"
-
-#: builtin/bisect--helper.c:677
-msgid "--bisect-clean-state requires no arguments"
-msgstr "--bisect-clean-state 不帶參數"
-
-#: builtin/bisect--helper.c:684
+#: builtin/bisect--helper.c:1080
msgid "--bisect-reset requires either no argument or a commit"
msgstr "--bisect-reset 無需參數或者需要一個提交"
-#: builtin/bisect--helper.c:688
-msgid "--bisect-write requires either 4 or 5 arguments"
-msgstr "--bisect-write 需要 4 或 5 個參數"
-
-#: builtin/bisect--helper.c:694
-msgid "--check-and-set-terms requires 3 arguments"
-msgstr "--check-and-set-terms 需要 3 個參數"
-
-#: builtin/bisect--helper.c:700
+#: builtin/bisect--helper.c:1085
msgid "--bisect-next-check requires 2 or 3 arguments"
msgstr "--bisect-next-check 需要 2 或 3 個參數"
-#: builtin/bisect--helper.c:706
+#: builtin/bisect--helper.c:1091
msgid "--bisect-terms requires 0 or 1 argument"
msgstr "--bisect-terms 需要 0 或 1 個參數"
-#: builtin/blame.c:31
+#: builtin/bisect--helper.c:1100
+msgid "--bisect-next requires 0 arguments"
+msgstr "--bisect-next 需要 0 個引數"
+
+#: builtin/bisect--helper.c:1111
+msgid "--bisect-log requires 0 arguments"
+msgstr "--bisect-log 需要 0 個引數"
+
+#: builtin/bisect--helper.c:1116
+msgid "no logfile given"
+msgstr "未提供日誌檔案"
+
+#: builtin/blame.c:32
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr "git blame [<選項>] [<版本選項>] [<版本>] [--] <檔案>"
-#: builtin/blame.c:36
+#: builtin/blame.c:37
msgid "<rev-opts> are documented in git-rev-list(1)"
msgstr "<版本選項> 的檔案記錄在 git-rev-list(1) 中"
-#: builtin/blame.c:409
+#: builtin/blame.c:410
#, c-format
msgid "expecting a color: %s"
msgstr "期望一個顏色：%s"
-#: builtin/blame.c:416
+#: builtin/blame.c:417
msgid "must end with a color"
msgstr "必須以一個顏色結尾"
-#: builtin/blame.c:729
+#: builtin/blame.c:728
#, c-format
msgid "invalid color '%s' in color.blame.repeatedLines"
msgstr "設定 color.blame.repeatedLines 中的無效顏色 '%s'"
-#: builtin/blame.c:747
+#: builtin/blame.c:746
msgid "invalid value for blame.coloring"
msgstr "設定 blame.coloring 中的無效取值"
-#: builtin/blame.c:822
+#: builtin/blame.c:845
#, c-format
msgid "cannot find revision %s to ignore"
msgstr "不能找到要忽略的版本 %s"
-#: builtin/blame.c:844
-msgid "Show blame entries as we find them, incrementally"
-msgstr "增量式地顯示發現的 blame 條目"
+#: builtin/blame.c:867
+msgid "show blame entries as we find them, incrementally"
+msgstr "增量式顯示發現的 blame 條目"
-#: builtin/blame.c:845
-msgid "Show blank SHA-1 for boundary commits (Default: off)"
-msgstr "邊界提交顯示空的 SHA-1（預設：關閉）"
+#: builtin/blame.c:868
+msgid "do not show object names of boundary commits (Default: off)"
+msgstr "不要顯示邊界提交的物件名稱（預設值: off）"
-#: builtin/blame.c:846
-msgid "Do not treat root commits as boundaries (Default: off)"
-msgstr "不把根提交作為邊界（預設：關閉）"
+#: builtin/blame.c:869
+msgid "do not treat root commits as boundaries (Default: off)"
+msgstr "不將根提交看作邊界（預設值：off）"
-#: builtin/blame.c:847
-msgid "Show work cost statistics"
-msgstr "顯示指令消耗統計"
+#: builtin/blame.c:870
+msgid "show work cost statistics"
+msgstr "顯示工作量統計"
-#: builtin/blame.c:848
-msgid "Force progress reporting"
-msgstr "強制進度顯示"
+#: builtin/blame.c:871 builtin/checkout.c:1503 builtin/clone.c:92
+#: builtin/commit-graph.c:84 builtin/commit-graph.c:222 builtin/fetch.c:175
+#: builtin/merge.c:297 builtin/multi-pack-index.c:27 builtin/pull.c:119
+#: builtin/push.c:575 builtin/send-pack.c:198
+msgid "force progress reporting"
+msgstr "強制顯示進度報告"
-#: builtin/blame.c:849
-msgid "Show output score for blame entries"
+#: builtin/blame.c:872
+msgid "show output score for blame entries"
msgstr "顯示判斷 blame 條目位移的得分診斷訊息"
-#: builtin/blame.c:850
-msgid "Show original filename (Default: auto)"
-msgstr "顯示原始檔案名（預設：自動）"
+#: builtin/blame.c:873
+msgid "show original filename (Default: auto)"
+msgstr "顯示原始檔案名稱（預設值：auto）"
-#: builtin/blame.c:851
-msgid "Show original linenumber (Default: off)"
-msgstr "顯示原始的行號（預設：關閉）"
+#: builtin/blame.c:874
+msgid "show original linenumber (Default: off)"
+msgstr "顯示原始檔案名稱（預設值：off）"
-#: builtin/blame.c:852
-msgid "Show in a format designed for machine consumption"
-msgstr "顯示為一個適合機器讀取的格式"
+#: builtin/blame.c:875
+msgid "show in a format designed for machine consumption"
+msgstr "顯示成適合機器讀取的格式"
-#: builtin/blame.c:853
-msgid "Show porcelain format with per-line commit information"
-msgstr "為每一行顯示機器適用的提交訊息"
+#: builtin/blame.c:876
+msgid "show porcelain format with per-line commit information"
+msgstr "顯示每一列適合機器的提交訊息"
-#: builtin/blame.c:854
-msgid "Use the same output mode as git-annotate (Default: off)"
-msgstr "使用和 git-annotate 相同的輸出模式（預設：關閉）"
+#: builtin/blame.c:877
+msgid "use the same output mode as git-annotate (Default: off)"
+msgstr "使用和 git-annotate 相同的輸出模式（預設值：off）"
-#: builtin/blame.c:855
-msgid "Show raw timestamp (Default: off)"
-msgstr "顯示原始時間戳（預設：關閉）"
+#: builtin/blame.c:878
+msgid "show raw timestamp (Default: off)"
+msgstr "顯示原始時間戳（預設值：off）"
-#: builtin/blame.c:856
-msgid "Show long commit SHA1 (Default: off)"
-msgstr "顯示長的 SHA1 提交號（預設：關閉）"
+#: builtin/blame.c:879
+msgid "show long commit SHA1 (Default: off)"
+msgstr "顯示較長的 SHA1 提交編號（預設值：off）"
-#: builtin/blame.c:857
-msgid "Suppress author name and timestamp (Default: off)"
-msgstr "隱藏作者名字和時間戳（預設：關閉）"
+#: builtin/blame.c:880
+msgid "suppress author name and timestamp (Default: off)"
+msgstr "隱藏作者名字及時間戳（預設值：off）"
-#: builtin/blame.c:858
-msgid "Show author email instead of name (Default: off)"
-msgstr "顯示作者的信箱而不是名字（預設：關閉）"
+#: builtin/blame.c:881
+msgid "show author email instead of name (Default: off)"
+msgstr "顯示作者信箱而非名稱（預設值：off）"
-#: builtin/blame.c:859
-msgid "Ignore whitespace differences"
+#: builtin/blame.c:882
+msgid "ignore whitespace differences"
msgstr "忽略空白差異"
-#: builtin/blame.c:860 builtin/log.c:1702
+#: builtin/blame.c:883 builtin/log.c:1812
msgid "rev"
msgstr "版本"
-#: builtin/blame.c:860
-msgid "Ignore <rev> when blaming"
-msgstr "在執行 blame 動作時忽略 <版本>"
+#: builtin/blame.c:883
+msgid "ignore <rev> when blaming"
+msgstr "在執行 blame 動作時忽略 <修訂版>"
-#: builtin/blame.c:861
-msgid "Ignore revisions from <file>"
-msgstr "忽略來自 <檔案> 中的版本"
+#: builtin/blame.c:884
+msgid "ignore revisions from <file>"
+msgstr "忽略 <檔案> 中的修訂版"
-#: builtin/blame.c:862
+#: builtin/blame.c:885
msgid "color redundant metadata from previous line differently"
msgstr "使用顏色間隔輸出與前一行不同的重複元訊息"
-#: builtin/blame.c:863
+#: builtin/blame.c:886
msgid "color lines by age"
msgstr "依據時間著色"
-#: builtin/blame.c:864
-msgid "Spend extra cycles to find better match"
-msgstr "花費額外的循環來找到更好的符合"
+#: builtin/blame.c:887
+msgid "spend extra cycles to find better match"
+msgstr "循環更多次以找到更佳符合"
-#: builtin/blame.c:865
-msgid "Use revisions from <file> instead of calling git-rev-list"
+#: builtin/blame.c:888
+msgid "use revisions from <file> instead of calling git-rev-list"
msgstr "使用來自 <檔案> 的修訂集而不是呼叫 git-rev-list"
-#: builtin/blame.c:866
-msgid "Use <file>'s contents as the final image"
-msgstr "使用 <檔案> 的內容作為最終的圖片"
+#: builtin/blame.c:889
+msgid "use <file>'s contents as the final image"
+msgstr "將 <檔案> 的內容當成是最終 image"
-#: builtin/blame.c:867 builtin/blame.c:868
+#: builtin/blame.c:890 builtin/blame.c:891
msgid "score"
msgstr "得分"
-#: builtin/blame.c:867
-msgid "Find line copies within and across files"
-msgstr "找到檔案內及跨檔案的行複製"
+#: builtin/blame.c:890
+msgid "find line copies within and across files"
+msgstr "找到檔案內及跨檔案的複製列"
-#: builtin/blame.c:868
-msgid "Find line movements within and across files"
-msgstr "找到檔案內及跨檔案的行移動"
+#: builtin/blame.c:891
+msgid "find line movements within and across files"
+msgstr "找到檔案內及跨檔案的移動列"
-#: builtin/blame.c:869
-msgid "n,m"
-msgstr "n,m"
+#: builtin/blame.c:892
+msgid "range"
+msgstr "range"
-#: builtin/blame.c:869
-msgid "Process only line range n,m, counting from 1"
-msgstr "只處理行範圍在 n 和 m 之間的，從 1 開始"
+#: builtin/blame.c:893
+msgid "process only line range <start>,<end> or function :<funcname>"
+msgstr "只處理範圍在 <開始>,<結尾> 的列，或是 :<函數名稱> 函數"
-#: builtin/blame.c:921
+#: builtin/blame.c:945
msgid "--progress can't be used with --incremental or porcelain formats"
msgstr "--progress 不能和 --incremental 或 --porcelain 同時使用"
@@ -10305,23 +11152,23 @@
#. your language may need more or fewer display
#. columns.
#.
-#: builtin/blame.c:972
+#: builtin/blame.c:996
msgid "4 years, 11 months ago"
msgstr "4 年 11 個月前"
-#: builtin/blame.c:1079
+#: builtin/blame.c:1112
#, c-format
msgid "file %s has only %lu line"
msgid_plural "file %s has only %lu lines"
msgstr[0] "檔案 %s 只有 %lu 行"
-#: builtin/blame.c:1125
+#: builtin/blame.c:1157
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>]"
@@ -10385,117 +11232,107 @@
msgid "Update of config-file failed"
msgstr "更新設定檔案失敗"
-#: builtin/branch.c:220
+#: builtin/branch.c:223
msgid "cannot use -a with -d"
msgstr "不能將 -a 和 -d 同時使用"
-#: builtin/branch.c:226
+#: builtin/branch.c:230
msgid "Couldn't look up commit object for HEAD"
msgstr "無法查詢 HEAD 指向的提交物件"
-#: builtin/branch.c:240
+#: builtin/branch.c:244
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
-msgstr "無法刪除簽出於 '%2$s' 的分支 '%1$s'。"
+msgstr "無法刪除在「%2$s」檢出的「%1$s」分支"
-#: builtin/branch.c:255
+#: builtin/branch.c:259
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "未能找到遠端追蹤分支 '%s'。"
-#: builtin/branch.c:256
+#: builtin/branch.c:260
#, 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
+#: builtin/branch.c:291
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "已刪除遠端追蹤分支 %s（曾為 %s）。\n"
-#: builtin/branch.c:280
+#: builtin/branch.c:292
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "已刪除分支 %s（曾為 %s）。\n"
-#: builtin/branch.c:429 builtin/tag.c:61
+#: builtin/branch.c:438 builtin/tag.c:61
msgid "unable to parse format string"
msgstr "不能解析格式化字串"
-#: builtin/branch.c:460
+#: builtin/branch.c:469
msgid "could not resolve HEAD"
msgstr "不能解析 HEAD 提交"
-#: builtin/branch.c:466
+#: builtin/branch.c:475
#, c-format
msgid "HEAD (%s) points outside of refs/heads/"
msgstr "HEAD (%s) 指向 refs/heads/ 之外"
-#: builtin/branch.c:481
+#: builtin/branch.c:490
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "分支 %s 正被重定基底到 %s"
-#: builtin/branch.c:485
+#: builtin/branch.c:494
#, c-format
msgid "Branch %s is being bisected at %s"
-msgstr "分支 %s 正被二分尋找於 %s"
+msgstr "分支 %s 正被二分搜尋於 %s"
-#: builtin/branch.c:502
+#: builtin/branch.c:511
msgid "cannot copy the current branch while not on any."
msgstr "無法複製目前分支因為不處於任何分支上。"
-#: builtin/branch.c:504
+#: builtin/branch.c:513
msgid "cannot rename the current branch while not on any."
msgstr "無法重新命名目前分支因為不處於任何分支上。"
-#: builtin/branch.c:515
+#: builtin/branch.c:524
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "無效的分支名：'%s'"
-#: builtin/branch.c:542
+#: builtin/branch.c:553
msgid "Branch rename failed"
msgstr "分支重新命名失敗"
-#: builtin/branch.c:544
+#: builtin/branch.c:555
msgid "Branch copy failed"
msgstr "分支複製失敗"
-#: builtin/branch.c:548
+#: builtin/branch.c:559
#, c-format
msgid "Created a copy of a misnamed branch '%s'"
msgstr "已為錯誤命名的分支 '%s' 建立了一個副本"
-#: builtin/branch.c:551
+#: builtin/branch.c:562
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "已將錯誤命名的分支 '%s' 重新命名"
-#: builtin/branch.c:557
+#: builtin/branch.c:568
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "分支重新命名為 %s，但 HEAD 沒有更新！"
-#: builtin/branch.c:566
+#: builtin/branch.c:577
msgid "Branch is renamed, but update of config-file failed"
msgstr "分支被重新命名，但更新設定檔案失敗"
-#: builtin/branch.c:568
+#: builtin/branch.c:579
msgid "Branch is copied, but update of config-file failed"
msgstr "分支已複製，但更新設定檔案失敗"
-#: builtin/branch.c:584
+#: builtin/branch.c:595
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -10506,209 +11343,209 @@
" %s\n"
"以 '%c' 開頭的行將被過濾。\n"
-#: builtin/branch.c:618
+#: builtin/branch.c:629
msgid "Generic options"
msgstr "通用選項"
-#: builtin/branch.c:620
+#: builtin/branch.c:631
msgid "show hash and subject, give twice for upstream branch"
msgstr "顯示雜湊值和主題，若參數出現兩次則顯示上游分支"
-#: builtin/branch.c:621
+#: builtin/branch.c:632
msgid "suppress informational messages"
msgstr "不顯示訊息"
-#: builtin/branch.c:622
+#: builtin/branch.c:633
msgid "set up tracking mode (see git-pull(1))"
msgstr "設定追蹤模式（參見 git-pull(1)）"
-#: builtin/branch.c:624
+#: builtin/branch.c:635
msgid "do not use"
msgstr "不要使用"
-#: builtin/branch.c:626 builtin/rebase.c:513
+#: builtin/branch.c:637 builtin/rebase.c:534
msgid "upstream"
msgstr "上游"
-#: builtin/branch.c:626
+#: builtin/branch.c:637
msgid "change the upstream info"
msgstr "改變上游訊息"
-#: builtin/branch.c:627
+#: builtin/branch.c:638
msgid "unset the upstream info"
msgstr "取消上游資訊設定"
-#: builtin/branch.c:628
+#: builtin/branch.c:639
msgid "use colored output"
msgstr "使用彩色輸出"
-#: builtin/branch.c:629
+#: builtin/branch.c:640
msgid "act on remote-tracking branches"
msgstr "作用於遠端追蹤分支"
-#: builtin/branch.c:631 builtin/branch.c:633
+#: builtin/branch.c:642 builtin/branch.c:644
msgid "print only branches that contain the commit"
msgstr "只列印包含該提交的分支"
-#: builtin/branch.c:632 builtin/branch.c:634
+#: builtin/branch.c:643 builtin/branch.c:645
msgid "print only branches that don't contain the commit"
msgstr "只列印不包含該提交的分支"
-#: builtin/branch.c:637
+#: builtin/branch.c:648
msgid "Specific git-branch actions:"
msgstr "具體的 git-branch 動作："
-#: builtin/branch.c:638
+#: builtin/branch.c:649
msgid "list both remote-tracking and local branches"
msgstr "列出遠端追蹤及本機分支"
-#: builtin/branch.c:640
+#: builtin/branch.c:651
msgid "delete fully merged branch"
msgstr "刪除完全合併的分支"
-#: builtin/branch.c:641
+#: builtin/branch.c:652
msgid "delete branch (even if not merged)"
msgstr "刪除分支（即使沒有合併）"
-#: builtin/branch.c:642
+#: builtin/branch.c:653
msgid "move/rename a branch and its reflog"
msgstr "移動/重新命名一個分支，以及它的引用日誌"
-#: builtin/branch.c:643
+#: builtin/branch.c:654
msgid "move/rename a branch, even if target exists"
msgstr "移動/重新命名一個分支，即使目標已存在"
-#: builtin/branch.c:644
+#: builtin/branch.c:655
msgid "copy a branch and its reflog"
msgstr "複製一個分支和它的引用日誌"
-#: builtin/branch.c:645
+#: builtin/branch.c:656
msgid "copy a branch, even if target exists"
msgstr "複製一個分支，即使目標已存在"
-#: builtin/branch.c:646
+#: builtin/branch.c:657
msgid "list branch names"
msgstr "列出分支名"
-#: builtin/branch.c:647
+#: builtin/branch.c:658
msgid "show current branch name"
msgstr "顯示目前分支名"
-#: builtin/branch.c:648
+#: builtin/branch.c:659
msgid "create the branch's reflog"
msgstr "建立分支的引用日誌"
-#: builtin/branch.c:650
+#: builtin/branch.c:661
msgid "edit the description for the branch"
msgstr "標記分支的描述"
-#: builtin/branch.c:651
+#: builtin/branch.c:662
msgid "force creation, move/rename, deletion"
msgstr "強制建立、移動/重新命名、刪除"
-#: builtin/branch.c:652
+#: builtin/branch.c:663
msgid "print only branches that are merged"
msgstr "只列印已經合併的分支"
-#: builtin/branch.c:653
+#: builtin/branch.c:664
msgid "print only branches that are not merged"
msgstr "只列印尚未合併的分支"
-#: builtin/branch.c:654
+#: builtin/branch.c:665
msgid "list branches in columns"
msgstr "以列的方式顯示分支"
-#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415
+#: builtin/branch.c:667 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:466
msgid "object"
msgstr "物件"
-#: builtin/branch.c:658
+#: builtin/branch.c:668
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:669 builtin/for-each-ref.c:48 builtin/tag.c:473
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:670 builtin/for-each-ref.c:38 builtin/tag.c:471
#: builtin/verify-tag.c:38
msgid "format to use for the output"
msgstr "輸出格式"
-#: builtin/branch.c:684 builtin/clone.c:785
+#: builtin/branch.c:693 builtin/clone.c:790
msgid "HEAD not found below refs/heads!"
msgstr "HEAD 沒有位於 /refs/heads 之下！"
-#: builtin/branch.c:708
+#: builtin/branch.c:717
msgid "--column and --verbose are incompatible"
msgstr "--column 和 --verbose 不相容"
-#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
+#: builtin/branch.c:732 builtin/branch.c:788 builtin/branch.c:797
msgid "branch name required"
msgstr "必須提供分支名"
-#: builtin/branch.c:753
+#: builtin/branch.c:764
msgid "Cannot give description to detached HEAD"
msgstr "不能向分離開頭指標提供描述"
-#: builtin/branch.c:758
+#: builtin/branch.c:769
msgid "cannot edit description of more than one branch"
msgstr "不能為一個以上的分支編輯描述"
-#: builtin/branch.c:765
+#: builtin/branch.c:776
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "分支 '%s' 尚無提交。"
-#: builtin/branch.c:768
+#: builtin/branch.c:779
#, c-format
msgid "No branch named '%s'."
msgstr "沒有分支 '%s'。"
-#: builtin/branch.c:783
+#: builtin/branch.c:794
msgid "too many branches for a copy operation"
msgstr "為複製動作提供了太多的分支名"
-#: builtin/branch.c:792
+#: builtin/branch.c:803
msgid "too many arguments for a rename operation"
msgstr "為重新命名動作提供了太多的參數"
-#: builtin/branch.c:797
+#: builtin/branch.c:808
msgid "too many arguments to set new upstream"
msgstr "為設定新上游提供了太多的參數"
-#: builtin/branch.c:801
+#: builtin/branch.c:812
#, 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:815 builtin/branch.c:838
#, c-format
msgid "no such branch '%s'"
msgstr "沒有此分支 '%s'"
-#: builtin/branch.c:808
+#: builtin/branch.c:819
#, c-format
msgid "branch '%s' does not exist"
msgstr "分支 '%s' 不存在"
-#: builtin/branch.c:821
+#: builtin/branch.c:832
msgid "too many arguments to unset upstream"
msgstr "為取消上游設定動作提供了太多的參數"
-#: builtin/branch.c:825
+#: builtin/branch.c:836
msgid "could not unset upstream of HEAD when it does not point to any branch."
-msgstr "無法取消 HEAD 的上游設定因為它沒有指向一個分支"
+msgstr "在 HEAD 的上游未指向任何分支時無法取消設定。"
-#: builtin/branch.c:831
+#: builtin/branch.c:842
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "分支 '%s' 沒有上游訊息"
-#: builtin/branch.c:841
+#: builtin/branch.c:852
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>?"
@@ -10716,13 +11553,108 @@
"'git branch' 的 -a 和 -r 選項不帶一個分支名。\n"
"您是否想要使用：-a|-r --list <模式>？"
-#: builtin/branch.c:845
+#: builtin/branch.c:856
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:135
+msgid "specify a destination for the bugreport file"
+msgstr "請指定 bugreport 檔案的目的地"
+
+#: builtin/bugreport.c:137
+msgid "specify a strftime format suffix for the filename"
+msgstr "請指定檔案名稱的 strftime 格式後綴"
+
+#: builtin/bugreport.c:159
+#, c-format
+msgid "could not create leading directories for '%s'"
+msgstr "無法建立 '%s' 的前置目錄"
+
+#: builtin/bugreport.c:166
+msgid "System Info"
+msgstr "系統資訊"
+
+#: builtin/bugreport.c:169
+msgid "Enabled Hooks"
+msgstr "啟用的掛鉤"
+
+#: builtin/bugreport.c:176
+#, c-format
+msgid "couldn't create a new file at '%s'"
+msgstr "不要在「%s」建立新檔案"
+
+#: builtin/bugreport.c:179
+#, c-format
+msgid "unable to write to %s"
+msgstr "無法寫入 %s"
+
+#: builtin/bugreport.c:189
+#, 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 參數>"
@@ -10739,49 +11671,53 @@
msgid "git bundle unbundle <file> [<refname>...]"
msgstr "git bundle unbundle <檔案> [<參考名稱>...]"
-#: builtin/bundle.c:66 builtin/pack-objects.c:3375
+#: builtin/bundle.c:67 builtin/pack-objects.c:3495
msgid "do not show progress meter"
msgstr "不顯示進度表"
-#: builtin/bundle.c:68 builtin/pack-objects.c:3377
+#: builtin/bundle.c:69 builtin/pack-objects.c:3497
msgid "show progress meter"
msgstr "顯示進度表"
-#: builtin/bundle.c:70 builtin/pack-objects.c:3379
+#: builtin/bundle.c:71 builtin/pack-objects.c:3499
msgid "show progress meter during object writing phase"
msgstr "在物件寫入階段顯示進度表"
-#: builtin/bundle.c:73 builtin/pack-objects.c:3382
+#: builtin/bundle.c:74 builtin/pack-objects.c:3502
msgid "similar to --all-progress when progress meter is shown"
msgstr "當進度表顯示時類似於 --all-progress"
-#: builtin/bundle.c:93
+#: 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:104
+#: builtin/bundle.c:107
msgid "do not show bundle details"
msgstr "不顯示包 (bundle) 詳細資訊"
-#: builtin/bundle.c:119
+#: builtin/bundle.c:122
#, c-format
msgid "%s is okay\n"
msgstr "%s 可以\n"
-#: builtin/bundle.c:160
+#: builtin/bundle.c:163
msgid "Need a repository to unbundle."
msgstr "需要一個版本庫來解包。"
-#: builtin/bundle.c:168 builtin/remote.c:1686
+#: builtin/bundle.c:171 builtin/remote.c:1700
msgid "be verbose; must be placed before a subcommand"
msgstr "詳細輸出；必須置於子指令之前"
-#: builtin/bundle.c:190 builtin/remote.c:1717
+#: builtin/bundle.c:193 builtin/remote.c:1731
#, c-format
msgid "Unknown subcommand: %s"
msgstr "未知子指令：%s"
-#: builtin/cat-file.c:595
+#: 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>"
@@ -10789,79 +11725,79 @@
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <類型> | --textconv | --filters) [--path=<路徑>] <物件>"
-#: builtin/cat-file.c:596
+#: builtin/cat-file.c: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:617
+#: builtin/cat-file.c:620
msgid "only one batch option may be specified"
msgstr "只能指定一個批次處理選項"
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:638
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<類型> 可以是其中之一：blob、tree、commit、tag"
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:639
msgid "show object type"
msgstr "顯示物件類型"
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:640
msgid "show object size"
msgstr "顯示物件大小"
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:642
msgid "exit with zero when there's no error"
msgstr "當沒有錯誤時離開並返回零"
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:643
msgid "pretty-print object's content"
msgstr "美觀地列印物件的內容"
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:645
msgid "for blob objects, run textconv on object's content"
msgstr "對於資料物件，對其內容做文字轉換"
-#: builtin/cat-file.c:644
+#: builtin/cat-file.c:647
msgid "for blob objects, run filters on object's content"
msgstr "對於資料物件，對其內容做過濾"
-#: builtin/cat-file.c:645 git-submodule.sh:1002
+#: builtin/cat-file.c:648
msgid "blob"
-msgstr "資料物件"
+msgstr "blob"
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:649
msgid "use a specific path for --textconv/--filters"
msgstr "對於 --textconv/--filters 使用一個特定的路徑"
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:651
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "允許 -s 和 -t 對損壞的物件生效"
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:652
msgid "buffer --batch output"
msgstr "緩衝 --batch 的輸出"
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:654
msgid "show info and content of objects fed from the standard input"
msgstr "顯示從標準輸入提供的物件的訊息和內容"
-#: builtin/cat-file.c:655
+#: builtin/cat-file.c:658
msgid "show info about objects fed from the standard input"
msgstr "顯示從標準輸入提供的物件的訊息"
-#: builtin/cat-file.c:659
+#: builtin/cat-file.c:662
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr "跟隨樹內符號連結（和 --batch 或 --batch-check 共用）"
-#: builtin/cat-file.c:661
+#: builtin/cat-file.c:664
msgid "show all objects with --batch or --batch-check"
msgstr "使用 --batch 或 --batch-check 參數顯示所有物件"
-#: builtin/cat-file.c:663
+#: builtin/cat-file.c:666
msgid "do not order --batch-all-objects output"
msgstr "不要對 --batch-all-objects 的輸出排序"
@@ -10889,8 +11825,8 @@
msgid "terminate input and output records by a NUL character"
msgstr "輸入和輸出的紀錄使用 NUL 字元終結"
-#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537
-#: builtin/worktree.c:499
+#: builtin/check-ignore.c:21 builtin/checkout.c:1499 builtin/gc.c:549
+#: builtin/worktree.c:489
msgid "suppress progress reporting"
msgstr "不顯示進度報告"
@@ -10943,54 +11879,54 @@
msgid "no contacts specified"
msgstr "未指定聯繫位址"
-#: builtin/checkout-index.c:131
+#: builtin/checkout-index.c:152
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<選項>] [--] [<檔案>...]"
-#: builtin/checkout-index.c:148
+#: builtin/checkout-index.c:169
msgid "stage should be between 1 and 3 or all"
msgstr "索引值應該取值 1 到 3 或者 all"
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:186
msgid "check out all files in the index"
-msgstr "簽出索引區的所有檔案"
+msgstr "檢出索引區的所有檔案"
-#: builtin/checkout-index.c:165
+#: builtin/checkout-index.c:187
msgid "force overwrite of existing files"
msgstr "強制覆蓋現有的檔案"
-#: builtin/checkout-index.c:167
+#: builtin/checkout-index.c:189
msgid "no warning for existing files and files not in index"
msgstr "存在或不在索引中的檔案都沒有警告"
-#: builtin/checkout-index.c:169
+#: builtin/checkout-index.c:191
msgid "don't checkout new files"
-msgstr "不簽出新檔案"
+msgstr "不檢出新檔案"
-#: builtin/checkout-index.c:171
+#: builtin/checkout-index.c:193
msgid "update stat information in the index file"
msgstr "更新索引中檔案的狀態訊息"
-#: builtin/checkout-index.c:175
+#: builtin/checkout-index.c:197
msgid "read list of paths from the standard input"
msgstr "從標準輸入讀取路徑列表"
-#: builtin/checkout-index.c:177
+#: builtin/checkout-index.c:199
msgid "write the content to temporary files"
msgstr "將內容寫入暫存檔"
-#: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403
-#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909
-#: builtin/worktree.c:672
+#: builtin/checkout-index.c:200 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:717
msgid "string"
msgstr "字串"
-#: builtin/checkout-index.c:179
+#: builtin/checkout-index.c:201
msgid "when creating files, prepend <string>"
msgstr "在建立檔案時，在前面加上 <字串>"
-#: builtin/checkout-index.c:181
+#: builtin/checkout-index.c:203
msgid "copy out the files from named stage"
msgstr "從指定暫存區中拷出檔案"
@@ -11010,95 +11946,95 @@
msgid "git restore [<options>] [--source=<branch>] <file>..."
msgstr "git restore [<選項>] [--source=<分支>] <檔案>..."
-#: builtin/checkout.c:175 builtin/checkout.c:214
+#: builtin/checkout.c:188 builtin/checkout.c:227
#, c-format
msgid "path '%s' does not have our version"
msgstr "路徑 '%s' 沒有我們的版本"
-#: builtin/checkout.c:177 builtin/checkout.c:216
+#: builtin/checkout.c:190 builtin/checkout.c:229
#, c-format
msgid "path '%s' does not have their version"
msgstr "路徑 '%s' 沒有他們的版本"
-#: builtin/checkout.c:193
+#: builtin/checkout.c:206
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "路徑 '%s' 沒有全部必需的版本"
-#: builtin/checkout.c:243
+#: builtin/checkout.c:258
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "路徑 '%s' 沒有必需的版本"
-#: builtin/checkout.c:261
+#: builtin/checkout.c:275
#, c-format
msgid "path '%s': cannot merge"
msgstr "path '%s'：無法合併"
-#: builtin/checkout.c:277
+#: builtin/checkout.c:291
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "無法為 '%s' 新增合併結果"
-#: builtin/checkout.c:377
+#: builtin/checkout.c:396
#, c-format
msgid "Recreated %d merge conflict"
msgid_plural "Recreated %d merge conflicts"
msgstr[0] "重新建立了 %d 個合併衝突"
-#: builtin/checkout.c:382
+#: 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:389
+#: 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:412 builtin/checkout.c:415 builtin/checkout.c:418
-#: builtin/checkout.c:422
+#: 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:425 builtin/checkout.c:428
+#: builtin/checkout.c:444 builtin/checkout.c:447
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' 不能和 %s 同時使用"
-#: builtin/checkout.c:432
+#: builtin/checkout.c:451
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "不能同時更新路徑並切換到分支'%s'。"
-#: builtin/checkout.c:436
+#: builtin/checkout.c:455
#, c-format
msgid "neither '%s' or '%s' is specified"
msgstr "'%s' 或 '%s' 都沒有指定"
-#: builtin/checkout.c:440
+#: builtin/checkout.c:459
#, c-format
msgid "'%s' must be used when '%s' is not specified"
msgstr "未指定 '%2$s' 時，必須使用 '%1$s'"
-#: builtin/checkout.c:445 builtin/checkout.c:450
+#: builtin/checkout.c:464 builtin/checkout.c:469
#, c-format
msgid "'%s' or '%s' cannot be used with %s"
msgstr "'%s' 或 '%s' 不能和 %s 一起使用"
-#: builtin/checkout.c:509 builtin/checkout.c:516
+#: builtin/checkout.c:543 builtin/checkout.c:550
#, c-format
msgid "path '%s' is unmerged"
msgstr "路徑 '%s' 未合併"
-#: builtin/checkout.c:684 builtin/sparse-checkout.c:106
+#: builtin/checkout.c:718
msgid "you need to resolve your current index first"
msgstr "您需要先解決目前索引的衝突"
-#: builtin/checkout.c:734
+#: builtin/checkout.c:772
#, c-format
msgid ""
"cannot continue with staged changes in the following files:\n"
@@ -11107,51 +12043,51 @@
"不能繼續，下列檔案有暫存的修改：\n"
"%s"
-#: builtin/checkout.c:837
+#: builtin/checkout.c:865
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "不能對 '%s' 執行 reflog 動作：%s\n"
-#: builtin/checkout.c:879
+#: builtin/checkout.c:907
msgid "HEAD is now at"
msgstr "HEAD 目前位於"
-#: builtin/checkout.c:883 builtin/clone.c:717
+#: builtin/checkout.c:911 builtin/clone.c:721 t/helper/test-fast-rebase.c:202
msgid "unable to update HEAD"
msgstr "不能更新 HEAD"
-#: builtin/checkout.c:887
+#: builtin/checkout.c:915
#, c-format
msgid "Reset branch '%s'\n"
msgstr "重設分支 '%s'\n"
-#: builtin/checkout.c:890
+#: builtin/checkout.c:918
#, c-format
msgid "Already on '%s'\n"
msgstr "已經位於 '%s'\n"
-#: builtin/checkout.c:894
+#: builtin/checkout.c:922
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "切換並重設分支 '%s'\n"
-#: builtin/checkout.c:896 builtin/checkout.c:1320
+#: builtin/checkout.c:924 builtin/checkout.c:1355
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "切換到一個新分支 '%s'\n"
-#: builtin/checkout.c:898
+#: builtin/checkout.c:926
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "切換到分支 '%s'\n"
# 譯者：請維持前導空格
-#: builtin/checkout.c:949
+#: builtin/checkout.c:977
#, c-format
msgid " ... and %d more.\n"
msgstr " ... 及其它 %d 個。\n"
-#: builtin/checkout.c:955
+#: builtin/checkout.c:983
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -11168,7 +12104,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:974
+#: builtin/checkout.c:1002
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -11189,19 +12125,19 @@
" git branch <新分支名> %s\n"
"\n"
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1037
msgid "internal error in revision walk"
msgstr "在版本遍歷時遇到內部錯誤"
-#: builtin/checkout.c:1013
+#: builtin/checkout.c:1041
msgid "Previous HEAD position was"
msgstr "之前的 HEAD 位置是"
-#: builtin/checkout.c:1053 builtin/checkout.c:1315
+#: builtin/checkout.c:1081 builtin/checkout.c:1350
msgid "You are on a branch yet to be born"
msgstr "您位於一個尚未初始化的分支"
-#: builtin/checkout.c:1128
+#: builtin/checkout.c:1163
#, c-format
msgid ""
"'%s' could be both a local file and a tracking branch.\n"
@@ -11210,7 +12146,7 @@
"'%s' 既可以是一個本機檔案，也可以是一個追蹤分支。\n"
"請使用 --（和可選的 --no-guess）來消除歧義"
-#: builtin/checkout.c:1135
+#: builtin/checkout.c:1170
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"
@@ -11221,7 +12157,7 @@
"one remote, e.g. the 'origin' remote, consider setting\n"
"checkout.defaultRemote=origin in your config."
msgstr ""
-"如果您想要簽出一個遠端追蹤分支，例如 'origin'，您可以\n"
+"如果您想要檢出一個遠端追蹤分支，例如 'origin'，您可以\n"
"使用 --track 選項寫出全名：\n"
"\n"
" git checkout --track origin/<name>\n"
@@ -11229,51 +12165,51 @@
"如果您總是喜歡使用模糊的簡短分支名 <name>，而不喜歡如 'origin' 的遠端\n"
"版本庫名，可以在設定中設定 checkout.defaultRemote=origin。"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1180
#, c-format
msgid "'%s' matched multiple (%d) remote tracking branches"
msgstr "'%s' 符合多個 (%d) 遠端追蹤分支"
-#: builtin/checkout.c:1211
+#: builtin/checkout.c:1246
msgid "only one reference expected"
msgstr "預期只有一個引用"
-#: builtin/checkout.c:1228
+#: builtin/checkout.c:1263
#, c-format
msgid "only one reference expected, %d given."
-msgstr "應只有一個引用，卻給出了 %d 個"
+msgstr "應只有一個引用，卻提供了 %d 個。"
-#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448
+#: builtin/checkout.c:1309 builtin/worktree.c:270 builtin/worktree.c:438
#, c-format
msgid "invalid reference: %s"
msgstr "無效引用：%s"
-#: builtin/checkout.c:1287 builtin/checkout.c:1649
+#: builtin/checkout.c:1322 builtin/checkout.c:1688
#, c-format
msgid "reference is not a tree: %s"
msgstr "引用不是一個樹：%s"
-#: builtin/checkout.c:1334
+#: builtin/checkout.c:1369
#, c-format
msgid "a branch is expected, got tag '%s'"
msgstr "期望一個分支，得到標籤 '%s'"
-#: builtin/checkout.c:1336
+#: builtin/checkout.c:1371
#, c-format
msgid "a branch is expected, got remote branch '%s'"
msgstr "期望一個分支，得到遠端分支 '%s'"
-#: builtin/checkout.c:1337 builtin/checkout.c:1345
+#: builtin/checkout.c:1372 builtin/checkout.c:1380
#, c-format
msgid "a branch is expected, got '%s'"
msgstr "期望一個分支，得到 '%s'"
-#: builtin/checkout.c:1340
+#: builtin/checkout.c:1375
#, c-format
msgid "a branch is expected, got commit '%s'"
msgstr "期望一個分支，得到提交 '%s'"
-#: builtin/checkout.c:1356
+#: builtin/checkout.c:1391
msgid ""
"cannot switch branch while merging\n"
"Consider \"git merge --quit\" or \"git worktree add\"."
@@ -11281,7 +12217,7 @@
"不能在合併時切換分支\n"
"考慮使用 \"git merge --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1360
+#: builtin/checkout.c:1395
msgid ""
"cannot switch branch in the middle of an am session\n"
"Consider \"git am --quit\" or \"git worktree add\"."
@@ -11289,7 +12225,7 @@
"不能在 am 工作階段期間切換分支\n"
"考慮使用 \"git am --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1399
msgid ""
"cannot switch branch while rebasing\n"
"Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -11297,7 +12233,7 @@
"不能在重定基底時切換分支\n"
"考慮使用 \"git rebase --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1368
+#: builtin/checkout.c:1403
msgid ""
"cannot switch branch while cherry-picking\n"
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -11305,7 +12241,7 @@
"不能在揀選時切換分支\n"
"考慮使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1372
+#: builtin/checkout.c:1407
msgid ""
"cannot switch branch while reverting\n"
"Consider \"git revert --quit\" or \"git worktree add\"."
@@ -11313,251 +12249,247 @@
"不能在還原時切換分支\n"
"考慮使用 \"git revert --quit\" 或 \"git worktree add\"。"
-#: builtin/checkout.c:1376
+#: builtin/checkout.c:1411
msgid "you are switching branch while bisecting"
-msgstr "您在執行二分尋找時切換分支"
+msgstr "您在執行二分搜尋時切換分支"
-#: builtin/checkout.c:1383
+#: builtin/checkout.c:1418
msgid "paths cannot be used with switching branches"
msgstr "路徑不能和切換分支同時使用"
-#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394
+#: builtin/checkout.c:1421 builtin/checkout.c:1425 builtin/checkout.c:1429
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' 不能和切換分支同時使用"
-#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404
-#: builtin/checkout.c:1409 builtin/checkout.c:1414
+#: builtin/checkout.c:1433 builtin/checkout.c:1436 builtin/checkout.c:1439
+#: builtin/checkout.c:1444 builtin/checkout.c:1449
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' 不能和 '%s' 同時使用"
-#: builtin/checkout.c:1411
+#: builtin/checkout.c:1446
#, c-format
msgid "'%s' cannot take <start-point>"
msgstr "'%s' 不帶 <起始點>"
-#: builtin/checkout.c:1419
+#: builtin/checkout.c:1454
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "不能切換分支到一個非提交 '%s'"
-#: builtin/checkout.c:1426
+#: builtin/checkout.c:1461
msgid "missing branch or commit argument"
msgstr "缺少分支或提交參數"
-#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72
-#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286
-#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563
-#: builtin/send-pack.c:174
-msgid "force progress reporting"
-msgstr "強制顯示進度報告"
-
-#: builtin/checkout.c:1469
+#: builtin/checkout.c:1504
msgid "perform a 3-way merge with the new branch"
msgstr "和新的分支執行三方合併"
-#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322
+#: builtin/checkout.c:1505 builtin/log.c:1799 parse-options.h:322
msgid "style"
msgstr "風格"
-#: builtin/checkout.c:1471
+#: builtin/checkout.c:1506
msgid "conflict style (merge or diff3)"
msgstr "衝突輸出風格（merge 或 diff3）"
-#: builtin/checkout.c:1483 builtin/worktree.c:496
+#: builtin/checkout.c:1518 builtin/worktree.c:486
msgid "detach HEAD at named commit"
msgstr "HEAD 從指定的提交分離"
-#: builtin/checkout.c:1484
+#: builtin/checkout.c:1519
msgid "set upstream info for new branch"
msgstr "為新的分支設定上游訊息"
-#: builtin/checkout.c:1486
+#: builtin/checkout.c:1521
msgid "force checkout (throw away local modifications)"
-msgstr "強制簽出（捨棄本機修改）"
+msgstr "強制檢出（捨棄本機修改）"
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1523
msgid "new-branch"
msgstr "新分支"
-#: builtin/checkout.c:1488
+#: builtin/checkout.c:1523
msgid "new unparented branch"
msgstr "新的沒有父提交的分支"
-#: builtin/checkout.c:1490 builtin/merge.c:289
+#: builtin/checkout.c:1525 builtin/merge.c:301
msgid "update ignored files (default)"
msgstr "更新忽略的檔案（預設）"
-#: builtin/checkout.c:1493
+#: builtin/checkout.c:1528
msgid "do not check if another worktree is holding the given ref"
msgstr "不檢查指定的引用是否被其他工作區所占用"
-#: builtin/checkout.c:1506
+#: builtin/checkout.c:1541
msgid "checkout our version for unmerged files"
-msgstr "對尚未合併的檔案簽出我們的版本"
+msgstr "對尚未合併的檔案檢出我們的版本"
-#: builtin/checkout.c:1509
+#: builtin/checkout.c:1544
msgid "checkout their version for unmerged files"
-msgstr "對尚未合併的檔案簽出他們的版本"
+msgstr "對尚未合併的檔案檢出他們的版本"
-#: builtin/checkout.c:1513
+#: builtin/checkout.c:1548
msgid "do not limit pathspecs to sparse entries only"
-msgstr "對路徑不做稀疏簽出的限制"
+msgstr "對路徑不做稀疏檢出的限制"
-#: builtin/checkout.c:1565
-msgid "-b, -B and --orphan are mutually exclusive"
-msgstr "-b、-B 和 --orphan 是互斥的"
+#: builtin/checkout.c:1603
+#, c-format
+msgid "-%c, -%c and --orphan are mutually exclusive"
+msgstr "-%c、-%c 和 --orphan 是互斥的"
-#: builtin/checkout.c:1568
+#: builtin/checkout.c:1607
msgid "-p and --overlay are mutually exclusive"
msgstr "-p 和 --overlay 互斥"
-#: builtin/checkout.c:1605
+#: builtin/checkout.c:1644
msgid "--track needs a branch name"
msgstr "--track 需要一個分支名"
-#: builtin/checkout.c:1610
-msgid "missing branch name; try -b"
-msgstr "缺少分支名，嘗試 -b"
+#: builtin/checkout.c:1649
+#, c-format
+msgid "missing branch name; try -%c"
+msgstr "缺少分支名稱，請嘗試 -%c"
-#: builtin/checkout.c:1642
+#: builtin/checkout.c:1681
#, c-format
msgid "could not resolve %s"
msgstr "無法解析 %s"
-#: builtin/checkout.c:1658
+#: builtin/checkout.c:1697
msgid "invalid path specification"
msgstr "無效的路徑規格"
-#: builtin/checkout.c:1665
+#: builtin/checkout.c:1704
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "'%s' 不是一個提交，不能基於它建立分支 '%s'"
-#: builtin/checkout.c:1669
+#: builtin/checkout.c:1708
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout：--detach 不能接收路徑參數 '%s'"
-#: builtin/checkout.c:1678
+#: builtin/checkout.c:1717
msgid "--pathspec-from-file is incompatible with --detach"
msgstr "--pathspec-from-file 與 --detach 不相容"
-#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506
+#: builtin/checkout.c:1720 builtin/reset.c:325 builtin/stash.c:1566
msgid "--pathspec-from-file is incompatible with --patch"
msgstr "--pathspec-from-file 與 --patch 不相容"
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1733
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
-"git checkout：在從索引簽出時，--ours/--theirs、--force 和 --merge 不相容。"
+"git checkout：在從索引檢出時，--ours/--theirs、--force 和 --merge 不相容。"
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1738
msgid "you must specify path(s) to restore"
msgstr "您必須指定一個要復原的路徑"
-#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774
-#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170
-#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494
+#: builtin/checkout.c:1764 builtin/checkout.c:1766 builtin/checkout.c:1815
+#: builtin/checkout.c:1817 builtin/clone.c:122 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:482
+#: builtin/worktree.c:484
msgid "branch"
msgstr "分支"
-#: builtin/checkout.c:1724
+#: builtin/checkout.c:1765
msgid "create and checkout a new branch"
-msgstr "建立並簽出一個新的分支"
+msgstr "建立並檢出一個新的分支"
-#: builtin/checkout.c:1726
+#: builtin/checkout.c:1767
msgid "create/reset and checkout a branch"
-msgstr "建立/重設並簽出一個分支"
+msgstr "建立/重設並檢出一個分支"
-#: builtin/checkout.c:1727
+#: builtin/checkout.c:1768
msgid "create reflog for new branch"
msgstr "為新的分支建立引用日誌"
-#: builtin/checkout.c:1729
+#: builtin/checkout.c:1770
msgid "second guess 'git checkout <no-such-branch>' (default)"
msgstr "二次猜測 'git checkout <無此分支>'（預設）"
-#: builtin/checkout.c:1730
+#: builtin/checkout.c:1771
msgid "use overlay mode (default)"
msgstr "使用疊加模式（預設）"
-#: builtin/checkout.c:1775
+#: builtin/checkout.c:1816
msgid "create and switch to a new branch"
msgstr "建立並切換一個新分支"
-#: builtin/checkout.c:1777
+#: builtin/checkout.c:1818
msgid "create/reset and switch to a branch"
msgstr "建立/重設並切換一個分支"
-#: builtin/checkout.c:1779
+#: builtin/checkout.c:1820
msgid "second guess 'git switch <no-such-branch>'"
msgstr "二次猜測 'git switch <無此分支>'"
-#: builtin/checkout.c:1781
+#: builtin/checkout.c:1822
msgid "throw away local modifications"
msgstr "捨棄本機修改"
-#: builtin/checkout.c:1813
+#: builtin/checkout.c:1856
msgid "which tree-ish to checkout from"
-msgstr "要簽出哪一個樹"
+msgstr "要檢出哪一個樹"
-#: builtin/checkout.c:1815
+#: builtin/checkout.c:1858
msgid "restore the index"
msgstr "復原索引"
-#: builtin/checkout.c:1817
+#: builtin/checkout.c:1860
msgid "restore the working tree (default)"
msgstr "復原工作區（預設）"
-#: builtin/checkout.c:1819
+#: builtin/checkout.c:1862
msgid "ignore unmerged entries"
msgstr "忽略未合併條目"
-#: builtin/checkout.c:1820
+#: builtin/checkout.c:1863
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:301 git-add--interactive.perl:595
+#: builtin/clean.c:302 git-add--interactive.perl:593
#, c-format
msgid ""
"Prompt help:\n"
@@ -11570,7 +12502,7 @@
"foo - 透過唯一前綴選擇一個選項\n"
" - （空）什麼也不選擇\n"
-#: builtin/clean.c:305 git-add--interactive.perl:604
+#: builtin/clean.c:306 git-add--interactive.perl:602
#, c-format
msgid ""
"Prompt help:\n"
@@ -11591,33 +12523,33 @@
"* - 選擇所有選項\n"
" - （空）結束選擇\n"
-#: builtin/clean.c:521 git-add--interactive.perl:570
-#: git-add--interactive.perl:575
+#: builtin/clean.c:521 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "嗯（%s）？\n"
-#: builtin/clean.c:663
+#: builtin/clean.c:661
#, c-format
msgid "Input ignore patterns>> "
msgstr "輸入範本以排除條目>> "
-#: builtin/clean.c:700
+#: builtin/clean.c:696
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "警告：無法找到和 %s 符合的條目"
-#: builtin/clean.c:721
+#: builtin/clean.c:717
msgid "Select items to delete"
msgstr "選擇要刪除的條目"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:762
+#: builtin/clean.c:758
#, c-format
msgid "Remove %s [y/N]? "
-msgstr "刪除 %s [y/N]？"
+msgstr "移除 %s [y/N]？ "
-#: builtin/clean.c:795
+#: builtin/clean.c:789
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -11635,93 +12567,93 @@
"help - 顯示本協助\n"
"? - 顯示如何在提示符下選擇的協助"
-#: builtin/clean.c:831
+#: builtin/clean.c:825
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "將刪除如下條目："
-#: builtin/clean.c:847
+#: builtin/clean.c:841
msgid "No more files to clean, exiting."
msgstr "沒有要清理的檔案，離開。"
-#: builtin/clean.c:909
+#: builtin/clean.c:903
msgid "do not print names of files removed"
msgstr "不列印刪除檔案的名稱"
-#: builtin/clean.c:911
+#: builtin/clean.c:905
msgid "force"
msgstr "強制"
-#: builtin/clean.c:912
+#: builtin/clean.c:906
msgid "interactive cleaning"
msgstr "互動式清除"
-#: builtin/clean.c:914
+#: builtin/clean.c:908
msgid "remove whole directories"
msgstr "刪除整個目錄"
-#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564
-#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179
-#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528
+#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/grep.c:922 builtin/log.c:184 builtin/log.c:186
+#: builtin/ls-files.c:573 builtin/name-rev.c:526 builtin/name-rev.c:528
#: builtin/show-ref.c:179
msgid "pattern"
msgstr "模式"
-#: builtin/clean.c:916
+#: builtin/clean.c:910
msgid "add <pattern> to ignore rules"
msgstr "新增 <模式> 到忽略規則"
-#: builtin/clean.c:917
+#: builtin/clean.c:911
msgid "remove ignored files, too"
msgstr "也刪除忽略的檔案"
-#: builtin/clean.c:919
+#: builtin/clean.c:913
msgid "remove only ignored files"
msgstr "只刪除忽略的檔案"
-#: builtin/clean.c:937
-msgid "-x and -X cannot be used together"
-msgstr "-x 和 -X 不能同時使用"
-
-#: builtin/clean.c:941
+#: 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:944
+#: 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
+#: builtin/clone.c:94
msgid "don't create a checkout"
-msgstr "不建立一個簽出"
+msgstr "不建立一個檢出"
-#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
+#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:555
msgid "create a bare repository"
msgstr "建立一個純版本庫"
-#: builtin/clone.c:98
+#: builtin/clone.c:99
msgid "create a mirror repository (implies bare)"
msgstr "建立一個鏡像版本庫（也是純版本庫）"
-#: builtin/clone.c:100
+#: builtin/clone.c:101
msgid "to clone from a local repository"
msgstr "從本機版本庫複製"
-#: builtin/clone.c:102
+#: builtin/clone.c:103
msgid "don't use local hardlinks, always copy"
msgstr "不使用本機硬連結，始終複製"
-#: builtin/clone.c:104
+#: builtin/clone.c:105
msgid "setup as shared repository"
msgstr "設定為共享版本庫"
@@ -11733,129 +12665,130 @@
msgid "initialize submodules in the clone"
msgstr "在複製時初始化子模組"
-#: builtin/clone.c:110
+#: builtin/clone.c:111
msgid "number of submodules cloned in parallel"
msgstr "並發複製的子模組的數量"
-#: builtin/clone.c:111 builtin/init-db.c:486
+#: builtin/clone.c:112 builtin/init-db.c:552
msgid "template-directory"
msgstr "範本目錄"
-#: builtin/clone.c:112 builtin/init-db.c:487
+#: builtin/clone.c:113 builtin/init-db.c:553
msgid "directory from which templates will be used"
msgstr "範本目錄將被使用"
-#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407
-#: builtin/submodule--helper.c:1912
+#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831
+#: builtin/submodule--helper.c:2336
msgid "reference repository"
msgstr "參考版本庫"
-#: builtin/clone.c:118 builtin/submodule--helper.c:1409
-#: builtin/submodule--helper.c:1914
+#: builtin/clone.c:119 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:3441 builtin/repack.c:327
+#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3561 builtin/repack.c:357
msgid "name"
msgstr "名稱"
-#: builtin/clone.c:120
+#: builtin/clone.c:121
msgid "use <name> instead of 'origin' to track upstream"
msgstr "使用 <名稱> 而不是 'origin' 去追蹤上游"
-#: builtin/clone.c:122
+#: builtin/clone.c:123
msgid "checkout <branch> instead of the remote's HEAD"
-msgstr "簽出 <分支> 而不是遠端 HEAD"
+msgstr "檢出 <分支> 而不是遠端 HEAD"
-#: builtin/clone.c:124
+#: builtin/clone.c:125
msgid "path to git-upload-pack on the remote"
msgstr "遠端 git-upload-pack 路徑"
-#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828
-#: builtin/pull.c:207
+#: builtin/clone.c:126 builtin/fetch.c:176 builtin/grep.c:861
+#: builtin/pull.c:208
msgid "depth"
msgstr "深度"
-#: builtin/clone.c:126
+#: builtin/clone.c:127
msgid "create a shallow clone of that depth"
msgstr "建立一個指定深度的淺複製"
-#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430
+#: builtin/clone.c:128 builtin/fetch.c:178 builtin/pack-objects.c:3550
+#: builtin/pull.c:211
msgid "time"
msgstr "時間"
-#: builtin/clone.c:128
+#: builtin/clone.c:129
msgid "create a shallow clone since a specific time"
msgstr "從一個特定時間建立一個淺複製"
-#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195
-#: builtin/rebase.c:1480
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/fetch.c:203
+#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1323
msgid "revision"
-msgstr "版本"
+msgstr "修訂版"
-#: builtin/clone.c:130 builtin/fetch.c:173
+#: builtin/clone.c:131 builtin/fetch.c:181 builtin/pull.c:215
msgid "deepen history of shallow clone, excluding rev"
msgstr "深化淺複製的歷史，除了特定版本"
-#: builtin/clone.c:132 builtin/submodule--helper.c:1419
-#: builtin/submodule--helper.c:1928
+#: builtin/clone.c:133 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
+#: builtin/clone.c:135
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr "不要複製任何標籤，並且後續取得動作也不下載它們"
-#: builtin/clone.c:136
+#: builtin/clone.c:137
msgid "any cloned submodules will be shallow"
msgstr "子模組將以淺下載模式複製"
-#: builtin/clone.c:137 builtin/init-db.c:495
+#: builtin/clone.c:138 builtin/init-db.c:561
msgid "gitdir"
msgstr "git目錄"
-#: builtin/clone.c:138 builtin/init-db.c:496
+#: builtin/clone.c:139 builtin/init-db.c:562
msgid "separate git dir from working tree"
msgstr "git目錄和工作區分離"
-#: builtin/clone.c:139
+#: builtin/clone.c:140
msgid "key=value"
msgstr "key=value"
-#: builtin/clone.c:140
+#: builtin/clone.c:141
msgid "set config inside the new repository"
msgstr "在新版本庫中設定設定訊息"
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
-#: builtin/push.c:573 builtin/send-pack.c:172
+#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77
+#: builtin/pull.c:230 builtin/push.c:584 builtin/send-pack.c:196
msgid "server-specific"
msgstr "server-specific"
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76
-#: builtin/push.c:573 builtin/send-pack.c:173
+#: builtin/clone.c:143 builtin/fetch.c:198 builtin/ls-remote.c:77
+#: builtin/pull.c:231 builtin/push.c:584 builtin/send-pack.c:197
msgid "option to transmit"
msgstr "傳輸選項"
-#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220
-#: builtin/push.c:574
+#: builtin/clone.c:144 builtin/fetch.c:199 builtin/pull.c:234
+#: builtin/push.c:585
msgid "use IPv4 addresses only"
msgstr "只使用 IPv4 位址"
-#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223
-#: builtin/push.c:576
+#: builtin/clone.c:146 builtin/fetch.c:201 builtin/pull.c:237
+#: builtin/push.c:587
msgid "use IPv6 addresses only"
msgstr "只使用 IPv6 位址"
-#: builtin/clone.c:149
+#: builtin/clone.c:150
msgid "any cloned submodules will use their remote-tracking branch"
msgstr "任何複製的子模組將使用它們的遠端追蹤分支"
-#: builtin/clone.c:151
+#: builtin/clone.c:152
msgid "initialize sparse-checkout file to include only files at root"
-msgstr "初始化稀疏簽出檔案，只包含根目錄中的檔案"
+msgstr "初始化稀疏檢出檔案，只包含根目錄中的檔案"
-#: builtin/clone.c:287
+#: builtin/clone.c:288
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -11863,179 +12796,189 @@
"無法猜到目錄名。\n"
"請在指令列指定一個目錄"
-#: builtin/clone.c:340
+#: builtin/clone.c:341
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: 不能為 '%s' 新增一個備用：%s\n"
-#: builtin/clone.c:413
+#: builtin/clone.c:414
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s 存在且不是一個目錄"
-#: builtin/clone.c:430
+#: builtin/clone.c:432
#, c-format
msgid "failed to start iterator over '%s'"
msgstr "無法在 '%s' 上啟動疊代器"
-#: builtin/clone.c:460
+#: builtin/clone.c:463
#, c-format
msgid "failed to create link '%s'"
msgstr "建立連結 '%s' 失敗"
-#: builtin/clone.c:464
+#: builtin/clone.c:467
#, c-format
msgid "failed to copy file to '%s'"
msgstr "複製檔案至 '%s' 失敗"
-#: builtin/clone.c:469
+#: builtin/clone.c:472
#, c-format
msgid "failed to iterate over '%s'"
msgstr "無法在 '%s' 上疊代"
-#: builtin/clone.c:494
+#: builtin/clone.c:499
#, c-format
msgid "done.\n"
msgstr "完成。\n"
-#: builtin/clone.c:508
+#: builtin/clone.c:513
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"
+"複製成功，但是檢出失敗。\n"
+"您可以透過 'git status' 檢查哪些已被檢出，然後使用指令\n"
"'git restore --source=HEAD :/' 重試\n"
-#: builtin/clone.c:585
+#: builtin/clone.c:590
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "不能發現要複製的遠端分支 %s。"
-#: builtin/clone.c:705
+#: builtin/clone.c:709
#, c-format
msgid "unable to update %s"
msgstr "不能更新 %s"
-#: builtin/clone.c:753
+#: builtin/clone.c:757
msgid "failed to initialize sparse-checkout"
-msgstr "無法初始化稀疏簽出"
+msgstr "無法初始化稀疏檢出"
-#: builtin/clone.c:776
+#: builtin/clone.c:780
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
-msgstr "遠端 HEAD 指向一個不存在的引用，無法簽出。\n"
+msgstr "遠端 HEAD 指向一個不存在的引用，無法檢出。\n"
-#: builtin/clone.c:807
+#: builtin/clone.c:812
msgid "unable to checkout working tree"
-msgstr "不能簽出工作區"
+msgstr "不能檢出工作區"
-#: builtin/clone.c:862
+#: builtin/clone.c:887
msgid "unable to write parameters to config file"
msgstr "無法將參數寫入設定檔案"
-#: builtin/clone.c:925
+#: builtin/clone.c:950
msgid "cannot repack to clean up"
msgstr "無法執行 repack 來清理"
-#: builtin/clone.c:927
+#: builtin/clone.c:952
msgid "cannot unlink temporary alternates file"
msgstr "無法刪除暫時的 alternates 檔案"
-#: builtin/clone.c:965 builtin/receive-pack.c:1950
+#: builtin/clone.c:993 builtin/receive-pack.c:2493
msgid "Too many arguments."
msgstr "太多參數。"
-#: builtin/clone.c:969
+#: builtin/clone.c:997
msgid "You must specify a repository to clone."
msgstr "您必須指定一個版本庫來複製。"
-#: builtin/clone.c:982
+#: builtin/clone.c:1010
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare 和 --origin %s 選項不相容。"
-#: builtin/clone.c:985
+#: builtin/clone.c:1013
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare 和 --separate-git-dir 選項不相容。"
-#: builtin/clone.c:998
+#: builtin/clone.c:1026
#, c-format
msgid "repository '%s' does not exist"
msgstr "版本庫 '%s' 不存在"
-#: builtin/clone.c:1004 builtin/fetch.c:1796
+#: builtin/clone.c:1030 builtin/fetch.c:1951
#, c-format
msgid "depth %s is not a positive number"
msgstr "深度 %s 不是一個正數"
-#: builtin/clone.c:1014
+#: builtin/clone.c:1040
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "目標路徑 '%s' 已經存在，並且不是一個空目錄。"
-#: builtin/clone.c:1024
+#: builtin/clone.c:1046
+#, c-format
+msgid "repository path '%s' already exists and is not an empty directory."
+msgstr "版本庫路徑 '%s' 已經存在，並且不是一個空目錄。"
+
+#: builtin/clone.c:1060
#, c-format
msgid "working tree '%s' already exists."
msgstr "工作區 '%s' 已經存在。"
-#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271
-#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327
+#: builtin/clone.c:1075 builtin/clone.c:1096 builtin/difftool.c:271
+#: builtin/log.c:1986 builtin/worktree.c:282 builtin/worktree.c:314
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "不能為 '%s' 建立先導目錄"
-#: builtin/clone.c:1044
+#: builtin/clone.c:1080
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "不能建立工作區目錄 '%s'"
-#: builtin/clone.c:1064
+#: builtin/clone.c:1100
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "複製到純版本庫 '%s'...\n"
-#: builtin/clone.c:1066
+#: builtin/clone.c:1102
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "正複製到 '%s'...\n"
-#: builtin/clone.c:1090
+#: builtin/clone.c:1126
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不相容"
-#: builtin/clone.c:1154
+#: builtin/clone.c:1170 builtin/remote.c:200 builtin/remote.c:705
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr "'%s' 不是一個有效的遠端名稱"
+
+#: builtin/clone.c:1211
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth 在本機複製時被忽略，請改用 file:// 協定。"
-#: builtin/clone.c:1156
+#: builtin/clone.c:1213
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "--shallow-since 在本機複製時被忽略，請改用 file:// 協定。"
-#: builtin/clone.c:1158
+#: builtin/clone.c:1215
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr "--shallow-exclude 在本機複製時被忽略，請改用 file:// 協定。"
-#: builtin/clone.c:1160
+#: builtin/clone.c:1217
msgid "--filter is ignored in local clones; use file:// instead."
msgstr "--filter 在本機複製時被忽略，請改用 file:// 協定。"
-#: builtin/clone.c:1163
+#: builtin/clone.c:1220
msgid "source repository is shallow, ignoring --local"
msgstr "源版本庫是淺複製，忽略 --local"
-#: builtin/clone.c:1168
+#: builtin/clone.c:1225
msgid "--local is ignored"
msgstr "--local 被忽略"
-#: builtin/clone.c:1243 builtin/clone.c:1251
+#: builtin/clone.c:1315 builtin/clone.c:1323
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "遠端分支 %s 在上游 %s 未發現"
-#: builtin/clone.c:1254
+#: builtin/clone.c:1326
msgid "You appear to have cloned an empty repository."
msgstr "您似乎複製了一個空版本庫。"
@@ -12071,6 +13014,110 @@
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 <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:187 builtin/log.c:1768
+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 "
@@ -12084,7 +13131,7 @@
msgid "duplicate parent %s ignored"
msgstr "忽略重複的父提交 %s"
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:557
#, c-format
msgid "not a valid object name %s"
msgstr "不是一個有效的物件名 %s"
@@ -12112,22 +13159,22 @@
msgid "id of a parent commit object"
msgstr "父提交物件 ID"
-#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477
-#: builtin/tag.c:412
+#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:282
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1537
+#: builtin/tag.c:445
msgid "message"
-msgstr "說明"
+msgstr "訊息"
-#: builtin/commit-tree.c:115 builtin/commit.c:1501
+#: builtin/commit-tree.c:115 builtin/commit.c:1504
msgid "commit message"
-msgstr "提交說明"
+msgstr "提交訊息"
#: builtin/commit-tree.c:118
msgid "read commit log message from file"
msgstr "從檔案中讀取提交說明"
-#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288
-#: builtin/pull.c:175 builtin/revert.c:118
+#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:299
+#: builtin/pull.c:176 builtin/revert.c:118
msgid "GPG sign commit"
msgstr "GPG 提交簽名"
@@ -12171,10 +13218,14 @@
"\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"
@@ -12195,134 +13246,138 @@
" 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:351
+#: builtin/commit.c:348
msgid "--pathspec-from-file with -a does not make sense"
msgstr "--pathspec-from-file 和 -a 同時使用沒有意義"
-#: builtin/commit.c:364
+#: builtin/commit.c:361
msgid "No paths with --include/--only does not make sense."
msgstr "參數 --include/--only 不跟路徑沒有意義。"
-#: builtin/commit.c:376
+#: builtin/commit.c:373
msgid "unable to create temporary index"
msgstr "不能建立暫時索引"
-#: builtin/commit.c:385
+#: builtin/commit.c:382
msgid "interactive add failed"
msgstr "互動式新增失敗"
-#: builtin/commit.c:400
+#: builtin/commit.c:397
msgid "unable to update temporary index"
msgstr "無法更新暫時索引"
-#: builtin/commit.c:402
+#: builtin/commit.c:399
msgid "Failed to update main cache tree"
msgstr "不能更新樹的主快取"
-#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496
+#: 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:479
+#: builtin/commit.c:476
msgid "cannot do a partial commit during a merge."
msgstr "在合併過程中不能做部分提交。"
-#: builtin/commit.c:481
+#: builtin/commit.c:478
msgid "cannot do a partial commit during a cherry-pick."
msgstr "在揀選過程中不能做部分提交。"
-#: builtin/commit.c:489
+#: 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:508
+#: builtin/commit.c:507
msgid "unable to write temporary index file"
msgstr "無法寫暫時索引檔案"
-#: builtin/commit.c:606
+#: builtin/commit.c:605
#, c-format
msgid "commit '%s' lacks author header"
msgstr "提交 '%s' 缺少作者訊息"
-#: builtin/commit.c:608
+#: builtin/commit.c:607
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "提交 '%s' 有格式錯誤的作者訊息"
-#: builtin/commit.c:627
+#: builtin/commit.c:626
msgid "malformed --author parameter"
msgstr "格式錯誤的 --author 參數"
-#: builtin/commit.c:680
+#: 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:718 builtin/commit.c:751 builtin/commit.c:1097
+#: 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:730 builtin/shortlog.c:319
+#: builtin/commit.c:729 builtin/shortlog.c:413
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "（正從標準輸入中讀取日誌訊息）\n"
-#: builtin/commit.c:732
+#: builtin/commit.c:731
msgid "could not read log from standard input"
msgstr "不能從標準輸入中讀取日誌訊息"
-#: builtin/commit.c:736
+#: builtin/commit.c:735
#, c-format
msgid "could not read log file '%s'"
msgstr "不能讀取日誌檔案 '%s'"
-#: builtin/commit.c:767 builtin/commit.c:783
+#: builtin/commit.c:766 builtin/commit.c:782
msgid "could not read SQUASH_MSG"
msgstr "不能讀取 SQUASH_MSG"
-#: builtin/commit.c:774
+#: builtin/commit.c:773
msgid "could not read MERGE_MSG"
msgstr "不能讀取 MERGE_MSG"
-#: builtin/commit.c:834
+#: builtin/commit.c:833
msgid "could not write commit template"
msgstr "不能寫提交範本"
#: builtin/commit.c:853
-#, c-format
msgid ""
"\n"
"It looks like you may be committing a merge.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
+"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"
+"您似乎正在提交一個合併提交。\n"
+"如果錯誤，請執行\n"
+"\tgit update-ref -d MERGE_HEAD\n"
+"後重試。\n"
#: builtin/commit.c:858
-#, c-format
msgid ""
"\n"
"It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
+"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"
+"您似乎正在提交一個揀選提交。\n"
+"如果錯誤，請執行\n"
+"\tgit update-ref -d CHERRY_PICK_HEAD\n"
+"後重試。\n"
-#: builtin/commit.c:871
+#: builtin/commit.c:868
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -12331,7 +13386,7 @@
"請為您的變更輸入提交說明。以 '%c' 開始的行將被忽略，而一個空的提交\n"
"說明將會終止提交。\n"
-#: builtin/commit.c:879
+#: builtin/commit.c:876
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -12342,24 +13397,24 @@
"也可以刪除它們。一個空的提交說明將會終止提交。\n"
# 譯者：為保證在輸出中對齊，注意調整句中空格！
-#: builtin/commit.c:896
+#: builtin/commit.c:893
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%s作者： %.*s <%.*s>"
# 譯者：為保證在輸出中對齊，注意調整句中空格！
-#: builtin/commit.c:904
+#: builtin/commit.c:901
#, c-format
msgid "%sDate: %s"
msgstr "%s日期： %s"
# 譯者：為保證在輸出中對齊，注意調整句中空格！
-#: builtin/commit.c:911
+#: builtin/commit.c:908
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%s提交者：%.*s <%.*s>"
-#: builtin/commit.c:929
+#: builtin/commit.c:926
msgid "Cannot read index"
msgstr "無法讀取索引"
@@ -12367,7 +13422,7 @@
msgid "Error building trees"
msgstr "無法建立樹狀物件"
-#: builtin/commit.c:1011 builtin/tag.c:275
+#: builtin/commit.c:1011 builtin/tag.c:308
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "請使用 -m 或 -F 選項提供提交說明。\n"
@@ -12382,7 +13437,7 @@
msgid "Invalid ignored mode '%s'"
msgstr "無效的忽略模式 '%s'"
-#: builtin/commit.c:1087 builtin/commit.c:1327
+#: builtin/commit.c:1087 builtin/commit.c:1331
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "無效的未追蹤檔案參數 '%s'"
@@ -12407,255 +13462,260 @@
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "您正處於一個揀選過程中 -- 無法修補提交。"
-#: builtin/commit.c:1188
+#: 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:1198
+#: builtin/commit.c:1200
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "只能用一個 -c/-C/-F/--fixup 選項。"
-#: builtin/commit.c:1200
+#: builtin/commit.c:1202
msgid "Option -m cannot be combined with -c/-C/-F."
msgstr "選項 -m 不能和 -c/-C/-F 同時使用。"
-#: builtin/commit.c:1208
+#: 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:1225
+#: 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:1231
+#: builtin/commit.c:1235
#, c-format
msgid "paths '%s ...' with -a does not make sense"
-msgstr "路徑 '%s ...' 和 -a 選項同時使用沒有意義"
+msgstr "路徑 '%s ...' 和 -a 選項同時使用沒有意義"
-#: builtin/commit.c:1362 builtin/commit.c:1524
+#: builtin/commit.c:1366 builtin/commit.c:1527
msgid "show status concisely"
msgstr "以簡潔的格式顯示狀態"
-#: builtin/commit.c:1364 builtin/commit.c:1526
+#: builtin/commit.c:1368 builtin/commit.c:1529
msgid "show branch information"
msgstr "顯示分支訊息"
-#: builtin/commit.c:1366
+#: builtin/commit.c:1370
msgid "show stash information"
msgstr "顯示儲藏區訊息"
-#: builtin/commit.c:1368 builtin/commit.c:1528
+#: builtin/commit.c:1372 builtin/commit.c:1531
msgid "compute full ahead/behind values"
msgstr "計算完整的領先/落後值"
-#: builtin/commit.c:1370
+#: builtin/commit.c:1374
msgid "version"
msgstr "版本"
-#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549
-#: builtin/worktree.c:643
+#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560
+#: builtin/worktree.c:679
msgid "machine-readable output"
msgstr "機器可讀的輸出"
-#: builtin/commit.c:1373 builtin/commit.c:1532
+#: builtin/commit.c:1377 builtin/commit.c:1535
msgid "show status in long format (default)"
msgstr "以長格式顯示狀態（預設）"
-#: builtin/commit.c:1376 builtin/commit.c:1535
+#: builtin/commit.c:1380 builtin/commit.c:1538
msgid "terminate entries with NUL"
msgstr "條目以 NUL 字元結尾"
-#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538
-#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
-#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336
+#: builtin/commit.c:1382 builtin/commit.c:1386 builtin/commit.c:1541
+#: builtin/fast-export.c:1198 builtin/fast-export.c:1201
+#: builtin/fast-export.c:1204 builtin/rebase.c:1412 parse-options.h:336
msgid "mode"
msgstr "模式"
-#: builtin/commit.c:1379 builtin/commit.c:1538
+#: builtin/commit.c:1383 builtin/commit.c:1541
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
-msgstr "顯示未追蹤的檔案，「模式」的可選參數：all、normal、no。（預設：all）"
+msgstr "顯示未追蹤的檔案，「模式」的可選參數：all、normal、no。（預設值：all）"
-#: builtin/commit.c:1383
+#: builtin/commit.c:1387
msgid ""
"show ignored files, optional modes: traditional, matching, no. (Default: "
"traditional)"
msgstr ""
-"顯示已忽略的檔案，可選模式：traditional、matching、no。（預設：traditional）"
+"顯示已忽略的檔案，可選模式：traditional、matching、no。（預設值："
+"traditional）"
-#: builtin/commit.c:1385 parse-options.h:192
+#: builtin/commit.c:1389 parse-options.h:192
msgid "when"
msgstr "何時"
-#: builtin/commit.c:1386
+#: builtin/commit.c:1390
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
-"忽略子模組的更改，「何時」的可選參數：all、dirty、untracked。（預設：all）"
+"忽略子模組的更改，「何時」的可選參數：all、dirty、untracked。（預設值：all）"
-#: builtin/commit.c:1388
+#: builtin/commit.c:1392
msgid "list untracked files in columns"
msgstr "以列的方式顯示未追蹤的檔案"
-#: builtin/commit.c:1389
+#: builtin/commit.c:1393
msgid "do not detect renames"
msgstr "不檢測重新命名"
-#: builtin/commit.c:1391
+#: builtin/commit.c:1395
msgid "detect renames, optionally set similarity index"
msgstr "檢測重新命名，可以設定索引相似度"
-#: builtin/commit.c:1411
+#: builtin/commit.c:1415
msgid "Unsupported combination of ignored and untracked-files arguments"
msgstr "不支援已忽略和未追蹤檔案參數的組合"
-#: builtin/commit.c:1494
+#: builtin/commit.c:1497
msgid "suppress summary after successful commit"
msgstr "提交成功後不顯示概述訊息"
-#: builtin/commit.c:1495
+#: builtin/commit.c:1498
msgid "show diff in commit message template"
msgstr "在提交說明範本裡顯示差異"
-#: builtin/commit.c:1497
+#: builtin/commit.c:1500
msgid "Commit message options"
msgstr "提交說明選項"
-#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414
+#: builtin/commit.c:1501 builtin/merge.c:286 builtin/tag.c:447
msgid "read message from file"
msgstr "從檔案中讀取提交說明"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1502
msgid "author"
msgstr "作者"
-#: builtin/commit.c:1499
+#: builtin/commit.c:1502
msgid "override author for commit"
msgstr "提交時覆蓋作者"
-#: builtin/commit.c:1500 builtin/gc.c:538
+#: builtin/commit.c:1503 builtin/gc.c:550
msgid "date"
msgstr "日期"
-#: builtin/commit.c:1500
+#: builtin/commit.c:1503
msgid "override date for commit"
msgstr "提交時覆蓋日期"
-#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504
-#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92
+#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507
+#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:90
msgid "commit"
msgstr "提交"
-#: builtin/commit.c:1502
+#: builtin/commit.c:1505
msgid "reuse and edit message from specified commit"
msgstr "重用並編輯指定提交的提交說明"
-#: builtin/commit.c:1503
+#: builtin/commit.c:1506
msgid "reuse message from specified commit"
msgstr "重用指定提交的提交說明"
-#: builtin/commit.c:1504
+#: builtin/commit.c:1507
msgid "use autosquash formatted message to fixup specified commit"
msgstr "使用 autosquash 格式的提交說明用以修正指定的提交"
-#: builtin/commit.c:1505
+#: builtin/commit.c:1508
msgid "use autosquash formatted message to squash specified commit"
msgstr "使用 autosquash 格式的提交說明用以壓縮至指定的提交"
-#: builtin/commit.c:1506
+#: builtin/commit.c:1509
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "現在將該提交的作者改為我（和 -C/-c/--amend 參數共用）"
-#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290
-#: builtin/pull.c:144 builtin/revert.c:110
-msgid "add Signed-off-by:"
-msgstr "新增 Signed-off-by: 簽名"
+#: builtin/commit.c:1510 builtin/log.c:1743 builtin/merge.c:302
+#: builtin/pull.c:145 builtin/revert.c:110
+msgid "add a Signed-off-by trailer"
+msgstr "在結尾加入 Signed-off-by"
-#: builtin/commit.c:1508
+#: builtin/commit.c:1511
msgid "use specified template file"
msgstr "使用指定的範本檔案"
-#: builtin/commit.c:1509
+#: builtin/commit.c:1512
msgid "force edit of commit"
msgstr "強制編輯提交"
-#: builtin/commit.c:1511
+#: builtin/commit.c:1514
msgid "include status in commit message template"
msgstr "在提交說明範本裡包含狀態訊息"
-#: builtin/commit.c:1516
+#: builtin/commit.c:1519
msgid "Commit contents options"
msgstr "提交內容選項"
-#: builtin/commit.c:1517
+#: builtin/commit.c:1520
msgid "commit all changed files"
msgstr "提交所有改動的檔案"
-#: builtin/commit.c:1518
+#: builtin/commit.c:1521
msgid "add specified files to index for commit"
msgstr "新增指定的檔案到索引區等待提交"
-#: builtin/commit.c:1519
+#: builtin/commit.c:1522
msgid "interactively add files"
msgstr "互動式新增檔案"
-#: builtin/commit.c:1520
+#: builtin/commit.c:1523
msgid "interactively add changes"
msgstr "互動式新增變更"
-#: builtin/commit.c:1521
+#: builtin/commit.c:1524
msgid "commit only specified files"
msgstr "只提交指定的檔案"
-#: builtin/commit.c:1522
+#: builtin/commit.c:1525
msgid "bypass pre-commit and commit-msg hooks"
msgstr "繞過 pre-commit 和 commit-msg 掛鉤"
-#: builtin/commit.c:1523
+#: builtin/commit.c:1526
msgid "show what would be committed"
msgstr "顯示將要提交的內容"
-#: builtin/commit.c:1536
+#: builtin/commit.c:1539
msgid "amend previous commit"
msgstr "修改先前的提交"
-#: builtin/commit.c:1537
+#: builtin/commit.c:1540
msgid "bypass post-rewrite hook"
msgstr "繞過 post-rewrite 掛鉤"
-#: builtin/commit.c:1544
+#: builtin/commit.c:1547
msgid "ok to record an empty change"
msgstr "允許一個空提交"
-#: builtin/commit.c:1546
+#: builtin/commit.c:1549
msgid "ok to record a change with an empty message"
msgstr "允許空的提交說明"
-#: builtin/commit.c:1619
+#: builtin/commit.c:1622
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "損壞的 MERGE_HEAD 檔案（%s）"
-#: builtin/commit.c:1626
+#: builtin/commit.c:1629
msgid "could not read MERGE_MODE"
msgstr "不能讀取 MERGE_MODE"
-#: builtin/commit.c:1645
+#: builtin/commit.c:1650
#, c-format
msgid "could not read commit message: %s"
msgstr "不能讀取提交說明：%s"
-#: builtin/commit.c:1652
+#: builtin/commit.c:1657
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "終止提交因為提交說明為空。\n"
-#: builtin/commit.c:1657
+#: builtin/commit.c:1662
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "終止提交；您未更改來自範本的提交說明。\n"
-#: builtin/commit.c:1691
+#: 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"
@@ -12664,286 +13724,223 @@
"版本庫已更新，但無法寫 new_index 檔案。檢查是否磁碟已滿或\n"
"磁碟配額已耗盡，然後執行 \"git restore --staged :/\" 復原。"
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:17
-msgid ""
-"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
-msgstr ""
-"git commit-graph verify [--object-dir <物件目錄>] [--shallow] [--"
-"[no-]progress]"
-
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:22
-msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
-msgstr ""
-"git commit-graph write [--object-dir <物件目錄>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
-
-#: builtin/commit-graph.c:52
-#, c-format
-msgid "could not find object directory matching %s"
-msgstr "找不到符合 %s 的物件目錄"
-
-#: builtin/commit-graph.c:68 builtin/commit-graph.c:125
-#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657
-msgid "dir"
-msgstr "目錄"
-
-#: builtin/commit-graph.c:69 builtin/commit-graph.c:126
-#: builtin/commit-graph.c:211
-msgid "The object directory to store the graph"
-msgstr "儲存圖形的物件目錄"
-
-#: builtin/commit-graph.c:71
-msgid "if the commit-graph is split, only verify the tip file"
-msgstr "如果提交圖形被分割，只驗證頭一個檔案"
-
-#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23
-#, c-format
-msgid "Could not open commit-graph '%s'"
-msgstr "無法開啟提交圖形 '%s'"
-
-#: builtin/commit-graph.c:128
-msgid "start walk at all refs"
-msgstr "開始遍歷所有引用"
-
-#: builtin/commit-graph.c:130
-msgid "scan pack-indexes listed by stdin for commits"
-msgstr "從標準輸入中的包索引檔案列表中掃描提交"
-
-#: builtin/commit-graph.c:132
-msgid "start walk at commits listed by stdin"
-msgstr "從標準輸入中的提交開始掃描"
-
-#: builtin/commit-graph.c:134
-msgid "include all commits already in the commit-graph file"
-msgstr "包含 commit-graph 檔案中已有所有提交"
-
-#: builtin/commit-graph.c:137
-msgid "allow writing an incremental commit-graph file"
-msgstr "允許寫一個增量提交圖形檔案"
-
-#: builtin/commit-graph.c:139 builtin/commit-graph.c:143
-msgid "maximum number of commits in a non-base split commit-graph"
-msgstr "在非基本分割提交圖形中的最大提交數"
-
-#: builtin/commit-graph.c:141
-msgid "maximum ratio between two levels of a split commit-graph"
-msgstr "一個分割提交圖形的兩個級別之間的最大比率"
-
-#: builtin/commit-graph.c:159
-msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
-msgstr "不能同時使用 --reachable、--stdin-commits 或 --stdin-packs"
-
#: builtin/config.c:11
msgid "git config [<options>]"
msgstr "git config [<選項>]"
-#: builtin/config.c:104 builtin/env--helper.c:23
+#: builtin/config.c:109 builtin/env--helper.c:27
#, c-format
msgid "unrecognized --type argument, %s"
-msgstr "未能識別的 --type 參數，%s"
+msgstr "無法識別的 --type 參數，%s"
-#: builtin/config.c:116
+#: builtin/config.c:121
msgid "only one type at a time"
msgstr "一次只能一個類型"
-#: builtin/config.c:125
+#: builtin/config.c:130
msgid "Config file location"
msgstr "設定檔案位置"
-#: builtin/config.c:126
+#: builtin/config.c:131
msgid "use global config file"
msgstr "使用全域設定檔案"
-#: builtin/config.c:127
+#: builtin/config.c:132
msgid "use system config file"
msgstr "使用系統級設定檔案"
-#: builtin/config.c:128
+#: builtin/config.c:133
msgid "use repository config file"
msgstr "使用版本庫級設定檔案"
-#: builtin/config.c:129
+#: builtin/config.c:134
msgid "use per-worktree config file"
msgstr "使用工作區級別的設定檔案"
-#: builtin/config.c:130
+#: builtin/config.c:135
msgid "use given config file"
msgstr "使用指定的設定檔案"
-#: builtin/config.c:131
+#: builtin/config.c:136
msgid "blob-id"
msgstr "資料物件 ID"
-#: builtin/config.c:131
+#: builtin/config.c:136
msgid "read config from given blob object"
msgstr "從提供的資料物件讀取設定"
-#: builtin/config.c:132
+#: builtin/config.c:137
msgid "Action"
msgstr "動作"
-#: builtin/config.c:133
-msgid "get value: name [value-regex]"
-msgstr "取得值：name [value-regex]"
+#: builtin/config.c:138
+msgid "get value: name [value-pattern]"
+msgstr "取得值：name [value-pattern]"
-#: builtin/config.c:134
-msgid "get all values: key [value-regex]"
-msgstr "獲得所有的值：key [value-regex]"
+#: builtin/config.c:139
+msgid "get all values: key [value-pattern]"
+msgstr "取得所有值：key [value-pattern]"
-#: builtin/config.c:135
-msgid "get values for regexp: name-regex [value-regex]"
-msgstr "根據正規表示式獲得值：name-regex [value-regex]"
+#: builtin/config.c:140
+msgid "get values for regexp: name-regex [value-pattern]"
+msgstr "根據正規表示式取得值：name-regex [value-pattern]"
-#: builtin/config.c:136
+#: builtin/config.c:141
msgid "get value specific for the URL: section[.var] URL"
msgstr "獲得 URL 取值：section[.var] URL"
-#: builtin/config.c:137
-msgid "replace all matching variables: name value [value_regex]"
-msgstr "取代所有符合的變數：name value [value_regex]"
+#: builtin/config.c:142
+msgid "replace all matching variables: name value [value-pattern]"
+msgstr "取代所有符合的變數：name value [value-pattern]"
-#: builtin/config.c:138
+#: builtin/config.c:143
msgid "add a new variable: name value"
msgstr "新增一個新的變數：name value"
-#: builtin/config.c:139
-msgid "remove a variable: name [value-regex]"
-msgstr "刪除一個變數：name [value-regex]"
+#: builtin/config.c:144
+msgid "remove a variable: name [value-pattern]"
+msgstr "移除一個變數：name [value-pattern]"
-#: builtin/config.c:140
-msgid "remove all matches: name [value-regex]"
-msgstr "刪除所有符合項：name [value-regex]"
+#: builtin/config.c:145
+msgid "remove all matches: name [value-pattern]"
+msgstr "移除所有符合項目：name [value-pattern]"
-#: builtin/config.c:141
+#: builtin/config.c:146
msgid "rename section: old-name new-name"
msgstr "重新命名小節：old-name new-name"
-#: builtin/config.c:142
+#: builtin/config.c:147
msgid "remove a section: name"
msgstr "刪除一個小節：name"
-#: builtin/config.c:143
+#: builtin/config.c:148
msgid "list all"
msgstr "全部列出"
-#: builtin/config.c:144
+#: builtin/config.c:149
+msgid "use string equality when comparing values to 'value-pattern'"
+msgstr "比較「value-pattern」的值時，使用字串相等比較"
+
+#: builtin/config.c:150
msgid "open an editor"
msgstr "開啟一個編輯器"
-#: builtin/config.c:145
+#: builtin/config.c:151
msgid "find the color configured: slot [default]"
msgstr "獲得設定的顏色：設定 [預設]"
-#: builtin/config.c:146
+#: builtin/config.c:152
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "獲得顏色設定：設定 [stdout-is-tty]"
-#: builtin/config.c:147
+#: builtin/config.c:153
msgid "Type"
msgstr "類型"
-#: builtin/config.c:148 builtin/env--helper.c:38
+#: builtin/config.c:154 builtin/env--helper.c:43
msgid "value is given this type"
msgstr "取值為該類型"
-#: builtin/config.c:149
+#: builtin/config.c:155
msgid "value is \"true\" or \"false\""
msgstr "值是 \"true\" 或 \"false\""
-#: builtin/config.c:150
+#: builtin/config.c:156
msgid "value is decimal number"
msgstr "值是十進位數"
-#: builtin/config.c:151
+#: builtin/config.c:157
msgid "value is --bool or --int"
msgstr "值是 --bool or --int"
-#: builtin/config.c:152
+#: builtin/config.c:158
+msgid "value is --bool or string"
+msgstr "值是 --bool 或 string"
+
+#: builtin/config.c:159
msgid "value is a path (file or directory name)"
msgstr "值是一個路徑（檔案或目錄名）"
-#: builtin/config.c:153
+#: builtin/config.c:160
msgid "value is an expiry date"
msgstr "值是一個到期日期"
-#: builtin/config.c:154
+#: builtin/config.c:161
msgid "Other"
msgstr "其它"
-#: builtin/config.c:155
+#: builtin/config.c:162
msgid "terminate values with NUL byte"
msgstr "終止值是 NUL 位元組"
-#: builtin/config.c:156
+#: builtin/config.c:163
msgid "show variable names only"
msgstr "只顯示變數名"
-#: builtin/config.c:157
+#: builtin/config.c:164
msgid "respect include directives on lookup"
msgstr "查詢時參照 include 指令遞迴尋找"
-#: builtin/config.c:158
+#: builtin/config.c:165
msgid "show origin of config (file, standard input, blob, command line)"
msgstr "顯示設定的來源（檔案、標準輸入、資料物件，或指令列）"
-#: builtin/config.c:159
+#: builtin/config.c:166
msgid "show scope of config (worktree, local, global, system, command)"
msgstr ""
"顯示設定檔的作用域 (工作區 worktree、本機 local、全域 global、系統 system、指"
"令 command)"
-#: builtin/config.c:160 builtin/env--helper.c:40
+#: builtin/config.c:167 builtin/env--helper.c:45
msgid "value"
msgstr "取值"
-#: builtin/config.c:160
+#: builtin/config.c:167
msgid "with --get, use default value when missing entry"
msgstr "使用 --get 但未指定參數時所使用的預設值"
-#: builtin/config.c:174
+#: builtin/config.c:181
#, c-format
msgid "wrong number of arguments, should be %d"
msgstr "錯誤的參數個數，應該為 %d 個"
-#: builtin/config.c:176
+#: builtin/config.c:183
#, c-format
msgid "wrong number of arguments, should be from %d to %d"
msgstr "錯誤的參數個數，應該為從 %d 個到 %d 個"
-#: builtin/config.c:324
+#: builtin/config.c:339
#, c-format
msgid "invalid key pattern: %s"
msgstr "無效鍵名模式：%s"
-#: builtin/config.c:360
+#: builtin/config.c:377
#, c-format
msgid "failed to format default config value: %s"
msgstr "格式化預設設定值失敗：%s"
-#: builtin/config.c:417
+#: builtin/config.c:441
#, c-format
msgid "cannot parse color '%s'"
msgstr "無法解析顏色 '%s'"
-#: builtin/config.c:459
+#: builtin/config.c:483
msgid "unable to parse default color value"
msgstr "無法解析預設顏色值"
-#: builtin/config.c:512 builtin/config.c:768
+#: builtin/config.c:536 builtin/config.c:833
msgid "not in a git directory"
msgstr "不在 git 版本庫中"
-#: builtin/config.c:515
+#: builtin/config.c:539
msgid "writing to stdin is not supported"
msgstr "不支援寫到標準輸入"
-#: builtin/config.c:518
+#: builtin/config.c:542
msgid "writing config blobs is not supported"
msgstr "不支援寫到設定資料物件"
-#: builtin/config.c:603
+#: builtin/config.c:627
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -12958,23 +13955,27 @@
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:627
+#: builtin/config.c:652
msgid "only one config file at a time"
msgstr "一次只能有一個設定檔案"
-#: builtin/config.c:632
+#: builtin/config.c:658
msgid "--local can only be used inside a git repository"
msgstr "--local 只能在一個版本庫內使用"
-#: builtin/config.c:635
+#: builtin/config.c:660
msgid "--blob can only be used inside a git repository"
msgstr "--blob 只能在一個版本庫內使用"
-#: builtin/config.c:655
+#: builtin/config.c:662
+msgid "--worktree can only be used inside a git repository"
+msgstr "--worktree 只能在 git 版本庫中使用"
+
+#: builtin/config.c:684
msgid "$HOME not set"
msgstr "$HOME 未設定"
-#: builtin/config.c:679
+#: builtin/config.c:708
msgid ""
"--worktree cannot be used with multiple working trees unless the config\n"
"extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -12983,51 +13984,55 @@
"不能和多個工作區一起使用 --worktree，除非啟用 worktreeConfig 設定擴展。\n"
"詳情請閱讀「git help worktree」的「CONFIGURATION FILE」小節"
-#: builtin/config.c:714
+#: builtin/config.c:743
msgid "--get-color and variable type are incoherent"
msgstr "--get-color 和變數類型不相容"
-#: builtin/config.c:719
+#: builtin/config.c:748
msgid "only one action at a time"
msgstr "一次只能有一個動作"
-#: builtin/config.c:732
+#: builtin/config.c:761
msgid "--name-only is only applicable to --list or --get-regexp"
msgstr "--name-only 僅適用於 --list 或 --get-regexp"
-#: builtin/config.c:738
+#: builtin/config.c:767
msgid ""
"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
"list"
msgstr "--show-origin 僅適用於 --get、--get-all、--get-regexp 和 --list"
-#: builtin/config.c:744
+#: builtin/config.c:773
msgid "--default is only applicable to --get"
msgstr "--default 僅適用於 --get"
-#: builtin/config.c:757
+#: builtin/config.c:806
+msgid "--fixed-value only applies with 'value-pattern'"
+msgstr "--fixed-value 僅套用至 'value-pattern'"
+
+#: builtin/config.c:822
#, c-format
msgid "unable to read config file '%s'"
msgstr "無法讀取設定檔案 '%s'"
-#: builtin/config.c:760
+#: builtin/config.c:825
msgid "error processing config file(s)"
msgstr "處理設定檔案發生錯誤"
-#: builtin/config.c:770
+#: builtin/config.c:835
msgid "editing stdin is not supported"
msgstr "不支援編輯標準輸入"
-#: builtin/config.c:772
+#: builtin/config.c:837
msgid "editing blobs is not supported"
msgstr "不支援編輯資料物件"
-#: builtin/config.c:786
+#: builtin/config.c:851
#, c-format
msgid "cannot create configuration file %s"
msgstr "不能建立設定檔案 %s"
-#: builtin/config.c:799
+#: builtin/config.c:864
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -13036,7 +14041,7 @@
"無法用一個值覆蓋多個值\n"
" 使用一個正規表示式、--add 或 --replace-all 來修改 %s。"
-#: builtin/config.c:873 builtin/config.c:884
+#: builtin/config.c:943 builtin/config.c:954
#, c-format
msgid "no such section: %s"
msgstr "無此小節：%s"
@@ -13049,6 +14054,36 @@
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/credential-store.c:66
+#, c-format
+msgid "unable to get credential storage lock in %d ms"
+msgstr "無法在 %d 毫秒內取得憑證儲存空間的鎖"
+
#: builtin/describe.c:26
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<選項>] [<提交號>...]"
@@ -13057,49 +14092,44 @@
msgid "git describe [<options>] --dirty"
msgstr "git describe [<選項>] --dirty"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "head"
-msgstr "頭"
+msgstr "HEAD"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "lightweight"
msgstr "輕量級的"
-#: builtin/describe.c:62
+#: builtin/describe.c:63
msgid "annotated"
msgstr "附註的"
-#: builtin/describe.c:275
+#: builtin/describe.c:277
#, c-format
msgid "annotated tag %s not available"
msgstr "附註標籤 %s 無效"
-#: builtin/describe.c:279
-#, c-format
-msgid "annotated tag %s has no embedded name"
-msgstr "附註標籤 %s 沒有嵌入名稱"
-
#: builtin/describe.c:281
#, c-format
-msgid "tag '%s' is really '%s' here"
-msgstr "標籤 '%s' 的確是在 '%s'"
+msgid "tag '%s' is externally known as '%s'"
+msgstr "「%s」標籤在外部被認為是「%s」"
-#: builtin/describe.c:325
+#: builtin/describe.c:328
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "沒有標籤準確符合 '%s'"
-#: builtin/describe.c:327
+#: builtin/describe.c:330
#, c-format
msgid "No exact match on refs or tags, searching to describe\n"
msgstr "沒有精確符合到引用或標籤，繼續搜尋進行描述\n"
-#: builtin/describe.c:394
+#: builtin/describe.c:397
#, c-format
msgid "finished search at %s\n"
msgstr "完成搜尋 %s\n"
-#: builtin/describe.c:421
+#: builtin/describe.c:424
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -13108,7 +14138,7 @@
"沒有附註標籤能描述 '%s'。\n"
"然而，存在未附註標籤：嘗試 --tags。"
-#: builtin/describe.c:425
+#: builtin/describe.c:428
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -13117,12 +14147,12 @@
"沒有標籤能描述 '%s'。\n"
"嘗試 --always，或者建立一些標籤。"
-#: builtin/describe.c:455
+#: builtin/describe.c:458
#, c-format
msgid "traversed %lu commits\n"
msgstr "已遍歷 %lu 個提交\n"
-#: builtin/describe.c:458
+#: builtin/describe.c:461
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -13131,122 +14161,140 @@
"發現多於 %i 個標籤，列出最近的 %i 個\n"
"在 %s 放棄搜尋\n"
-#: builtin/describe.c:526
+#: builtin/describe.c:529
#, c-format
msgid "describe %s\n"
msgstr "描述 %s\n"
-#: builtin/describe.c:529
+#: builtin/describe.c:532
#, c-format
msgid "Not a valid object name %s"
msgstr "不是一個有效的物件名 %s"
-#: builtin/describe.c:537
+#: builtin/describe.c:540
#, c-format
msgid "%s is neither a commit nor blob"
msgstr "%s 既不是提交也不是資料物件"
-#: builtin/describe.c:551
+#: builtin/describe.c:554
msgid "find the tag that comes after the commit"
msgstr "尋找該提交之後的標籤"
-#: builtin/describe.c:552
+#: builtin/describe.c:555
msgid "debug search strategy on stderr"
msgstr "在標準錯誤上除錯搜尋策略"
-#: builtin/describe.c:553
+#: builtin/describe.c:556
msgid "use any ref"
msgstr "使用任意引用"
-#: builtin/describe.c:554
+#: builtin/describe.c:557
msgid "use any tag, even unannotated"
msgstr "使用任意標籤，即使未附帶備註"
-#: builtin/describe.c:555
+#: builtin/describe.c:558
msgid "always use long format"
msgstr "始終使用長提交號格式"
-#: builtin/describe.c:556
+#: builtin/describe.c:559
msgid "only follow first parent"
msgstr "只跟隨第一個父提交"
-#: builtin/describe.c:559
+#: builtin/describe.c:562
msgid "only output exact matches"
msgstr "只輸出精確符合"
-#: builtin/describe.c:561
+#: builtin/describe.c:564
msgid "consider <n> most recent tags (default: 10)"
-msgstr "考慮最近 <n> 個標籤（預設：10）"
+msgstr "考慮最近 <n> 個標籤（預設值：10）"
-#: builtin/describe.c:563
+#: builtin/describe.c:566
msgid "only consider tags matching <pattern>"
msgstr "只考慮符合 <模式> 的標籤"
-#: builtin/describe.c:565
+#: builtin/describe.c:568
msgid "do not consider tags matching <pattern>"
msgstr "不考慮符合 <模式> 的標籤"
-#: builtin/describe.c:567 builtin/name-rev.c:535
+#: builtin/describe.c:570 builtin/name-rev.c:535
msgid "show abbreviated commit object as fallback"
msgstr "顯示簡寫的提交號作為後備"
-#: builtin/describe.c:568 builtin/describe.c:571
+#: builtin/describe.c:571 builtin/describe.c:574
msgid "mark"
msgstr "標記"
-#: builtin/describe.c:569
-msgid "append <mark> on dirty working tree (default: \"-dirty\")"
-msgstr "對於髒工作區，追加 <標記>（預設：\"-dirty\"）"
-
#: builtin/describe.c:572
-msgid "append <mark> on broken working tree (default: \"-broken\")"
-msgstr "對於損壞的工作區，追加 <標記>（預設：\"-broken\"）"
+msgid "append <mark> on dirty working tree (default: \"-dirty\")"
+msgstr "對於髒工作區，追加 <標記>（預設值：”-dirty\"）"
-#: builtin/describe.c:590
+#: 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:619
+#: builtin/describe.c:622
msgid "No names found, cannot describe anything."
msgstr "沒有發現名稱，無法描述任何東西。"
-#: builtin/describe.c:670
+#: builtin/describe.c:673
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty 與提交號不相容"
-#: builtin/describe.c:672
+#: builtin/describe.c:675
msgid "--broken is incompatible with commit-ishes"
msgstr "--broken 與提交號不相容"
-#: builtin/diff.c:84
+#: builtin/diff-tree.c:155
+msgid "--stdin and --merge-base are mutually exclusive"
+msgstr "--stdin 和 --merge-base 互斥"
+
+#: builtin/diff-tree.c:157
+msgid "--merge-base only works with two commits"
+msgstr "--merge-base 只對 2 個以上的提交有用"
+
+#: builtin/diff.c:92
#, c-format
msgid "'%s': not a regular file or symlink"
msgstr "'%s'：不是一個正規檔案或符號連結"
-#: builtin/diff.c:235
+#: builtin/diff.c:259
#, c-format
msgid "invalid option: %s"
msgstr "無效選項：%s"
-#: builtin/diff.c:350
+#: builtin/diff.c:376
+#, c-format
+msgid "%s...%s: no merge base"
+msgstr "%s...%s: 無合併基底"
+
+#: builtin/diff.c:486
msgid "Not a git repository"
msgstr "不是一個 git 版本庫"
-#: builtin/diff.c:394
+#: builtin/diff.c:532 builtin/grep.c:682
#, c-format
msgid "invalid object '%s' given."
msgstr "提供了無效物件 '%s'。"
-#: builtin/diff.c:403
+#: builtin/diff.c:543
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "提供了超過兩個資料物件：'%s'"
-#: builtin/diff.c:408
+#: builtin/diff.c:548
#, c-format
msgid "unhandled object '%s' given."
msgstr "無法處理的物件 '%s'。"
+#: builtin/diff.c:582
+#, 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 [<選項>] [<提交> [<提交>]] [--] [<路徑>...]"
@@ -13271,7 +14319,7 @@
msgid "could not read object %s for symlink %s"
msgstr "無法讀取符號連結 %2$s 指向的物件 %1$s"
-#: builtin/difftool.c:413
+#: builtin/difftool.c:412
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
@@ -13279,108 +14327,108 @@
"不支援在目錄比較模式（'-d' 和 '--dir-diff'）中採用組合差異格式（'-c' 和 '--"
"cc'）。"
-#: builtin/difftool.c:634
+#: builtin/difftool.c:633
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "兩個檔案都被修改：'%s' 和 '%s'。"
-#: builtin/difftool.c:636
+#: builtin/difftool.c:635
msgid "working tree file has been left."
msgstr "工作區檔案被留了下來。"
-#: builtin/difftool.c:647
+#: builtin/difftool.c:646
#, c-format
msgid "temporary files exist in '%s'."
msgstr "暫存檔存在於 '%s'。"
-#: builtin/difftool.c:648
+#: builtin/difftool.c:647
msgid "you may want to cleanup or recover these."
msgstr "您可能想要清理或者復原它們。"
-#: builtin/difftool.c:697
+#: builtin/difftool.c:696
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "使用 `diff.guitool` 代替 `diff.tool`"
-#: builtin/difftool.c:699
+#: builtin/difftool.c:698
msgid "perform a full-directory diff"
msgstr "執行一個全目錄差異比較"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:700
msgid "do not prompt before launching a diff tool"
msgstr "啟動差異比較工具之前不提示"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:705
msgid "use symlinks in dir-diff mode"
msgstr "在 dir-diff 模式中使用符號連結"
-#: builtin/difftool.c:707
+#: builtin/difftool.c:706
msgid "tool"
msgstr "工具"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:707
msgid "use the specified diff tool"
msgstr "使用指定的差異比較工具"
-#: builtin/difftool.c:710
+#: builtin/difftool.c:709
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "顯示可以用在 `--tool` 參數後的差異工具列表"
-#: builtin/difftool.c:713
+#: builtin/difftool.c:712
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
msgstr "當執行 diff 工具返回非零離開碼時，使 'git-difftool' 離開"
-#: builtin/difftool.c:716
+#: builtin/difftool.c:715
msgid "specify a custom command for viewing diffs"
msgstr "指定一個用於檢視差異的自訂指令"
-#: builtin/difftool.c:717
+#: builtin/difftool.c:716
msgid "passed to `diff`"
msgstr "傳遞給 `diff`"
-#: builtin/difftool.c:732
+#: builtin/difftool.c:731
msgid "difftool requires worktree or --no-index"
msgstr "difftool 要求工作區或者 --no-index"
-#: builtin/difftool.c:739
+#: builtin/difftool.c:738
msgid "--dir-diff is incompatible with --no-index"
msgstr "--dir-diff 和 --no-index 不相容"
-#: builtin/difftool.c:742
+#: builtin/difftool.c:741
msgid "--gui, --tool and --extcmd are mutually exclusive"
msgstr "--gui、--tool 和 --extcmd 互斥"
-#: builtin/difftool.c:750
+#: builtin/difftool.c:749
msgid "no <tool> given for --tool=<tool>"
msgstr "沒有為 --tool=<工具> 參數提供 <工具>"
-#: builtin/difftool.c:757
+#: builtin/difftool.c:756
msgid "no <cmd> given for --extcmd=<cmd>"
-msgstr "沒有為 --extcmd=<指令> 參數提供 <指令>"
+msgstr "沒有為 --extcmd=<命令> 參數提供 <命令>"
#: builtin/env--helper.c:6
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
msgstr "git env--helper --type=[bool|ulong] <選項> <環境變數>"
-#: builtin/env--helper.c:37 builtin/hash-object.c:98
+#: 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 `"
@@ -13391,283 +14439,346 @@
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-opts]"
-#: builtin/fast-export.c:853
+#: builtin/fast-export.c:868
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
msgstr "錯誤：除非指定 --mark-tags，否則無法匯出嵌套標籤。"
-#: builtin/fast-export.c:1152
+#: builtin/fast-export.c:1177
+msgid "--anonymize-map token cannot be empty"
+msgstr "--anonymize-map 的鍵不能空白"
+
+#: builtin/fast-export.c:1197
msgid "show progress after <n> objects"
msgstr "在 <n> 個物件之後顯示進度"
-#: builtin/fast-export.c:1154
+#: builtin/fast-export.c:1199
msgid "select handling of signed tags"
msgstr "選擇如何處理簽名標籤"
-#: builtin/fast-export.c:1157
+#: builtin/fast-export.c:1202
msgid "select handling of tags that tag filtered objects"
msgstr "選擇當標籤指向被過濾物件時該標籤的處理方式"
-#: builtin/fast-export.c:1160
+#: builtin/fast-export.c:1205
msgid "select handling of commit messages in an alternate encoding"
msgstr "選擇使用備用編碼處理提交說明"
-#: builtin/fast-export.c:1163
-msgid "Dump marks to this file"
-msgstr "把標記儲存到這個檔案"
+#: builtin/fast-export.c:1208
+msgid "dump marks to this file"
+msgstr "把標記傾印到這個檔案"
-#: builtin/fast-export.c:1165
-msgid "Import marks from this file"
+#: builtin/fast-export.c:1210
+msgid "import marks from this file"
msgstr "從這個檔案匯入標記"
-#: builtin/fast-export.c:1169
-msgid "Import marks from this file if it exists"
-msgstr "從該檔案匯入標記（如果存在的話）"
+#: builtin/fast-export.c:1214
+msgid "import marks from this file if it exists"
+msgstr "如果這個檔案存在，則從檔案匯入標記"
-#: builtin/fast-export.c:1171
-msgid "Fake a tagger when tags lack one"
-msgstr "當標籤缺少標記者欄位時，假裝提供一個"
+#: builtin/fast-export.c:1216
+msgid "fake a tagger when tags lack one"
+msgstr "當標籤缺少標記者欄位時假裝有一個"
-#: builtin/fast-export.c:1173
-msgid "Output full tree for each commit"
-msgstr "每次提交都輸出整個樹"
+#: builtin/fast-export.c:1218
+msgid "output full tree for each commit"
+msgstr "每次提交都輸出整棵樹"
-#: builtin/fast-export.c:1175
-msgid "Use the done feature to terminate the stream"
-msgstr "使用 done 功能來終止流"
+#: builtin/fast-export.c:1220
+msgid "use the done feature to terminate the stream"
+msgstr "使用 done 功能終止串流"
-#: builtin/fast-export.c:1176
-msgid "Skip output of blob data"
-msgstr "跳過資料物件的輸出"
+#: builtin/fast-export.c:1221
+msgid "skip output of blob data"
+msgstr "跳過資料物件資料的輸出"
-#: builtin/fast-export.c:1177 builtin/log.c:1705
+#: builtin/fast-export.c:1222 builtin/log.c:1815
msgid "refspec"
-msgstr "引用規格"
+msgstr "參照規格"
-#: builtin/fast-export.c:1178
-msgid "Apply refspec to exported refs"
-msgstr "對匯出的引用應用引用規格"
+#: builtin/fast-export.c:1223
+msgid "apply refspec to exported refs"
+msgstr "對匯出的引用套用引用規格"
-#: builtin/fast-export.c:1179
+#: builtin/fast-export.c:1224
msgid "anonymize output"
msgstr "匿名輸出"
-#: builtin/fast-export.c:1181
-msgid "Reference parents which are not in fast-export stream by object id"
-msgstr "引用父物件 ID 不在 fast-export 流中"
+#: builtin/fast-export.c:1225
+msgid "from:to"
+msgstr "from:to"
-#: builtin/fast-export.c:1183
-msgid "Show original object ids of blobs/commits"
-msgstr "顯示資料物件/提交的原始物件 ID"
+#: builtin/fast-export.c:1226
+msgid "convert <from> to <to> in anonymized output"
+msgstr "在匿名輸出中將 <from> 轉換為 <to>"
-#: builtin/fast-export.c:1185
-msgid "Label tags with mark ids"
-msgstr "對帶有標記 ID 的標籤做標記"
+#: builtin/fast-export.c:1229
+msgid "reference parents which are not in fast-export stream by object id"
+msgstr "依物件 ID 參考不在 fast-export 串流中的引用父物件"
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1231
+msgid "show original object ids of blobs/commits"
+msgstr "顯示資料物件及提交的原始物件 ID"
+
+#: builtin/fast-export.c:1233
+msgid "label tags with mark ids"
+msgstr "為包含標記 ID 的標籤打上標記"
+
+#: builtin/fast-export.c:1256
+msgid "--anonymize-map without --anonymize does not make sense"
+msgstr "缺少 --anonymize 的 --anonymize-map 沒有意義"
+
+#: builtin/fast-export.c:1271
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
msgstr "不能同時傳遞參數 --import-marks 和 --import-marks-if-exists"
-#: builtin/fetch.c:34
+#: builtin/fast-import.c:3088
+#, c-format
+msgid "Missing from marks for submodule '%s'"
+msgstr "「%s」子模組缺少 from 標記"
+
+#: builtin/fast-import.c:3090
+#, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr "「%s」子模組缺少 to 標記"
+
+#: builtin/fast-import.c:3225
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr "預期 'mark' 指令，得到 %s"
+
+#: builtin/fast-import.c:3230
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr "預期 'to' 指令，得到 %s"
+
+#: builtin/fast-import.c:3322
+msgid "Expected format name:filename for submodule rewrite option"
+msgstr "期望子模組 rewrite 選項的格式是 name:filename"
+
+#: builtin/fast-import.c:3377
+#, c-format
+msgid "feature '%s' forbidden in input without --allow-unsafe-features"
+msgstr "沒有 --allow-unsafe-features 時，禁止在輸入中使用 '%s' 功能"
+
+#: builtin/fetch-pack.c:242
+#, 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:35
+#: builtin/fetch.c:36
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<選項>] <組>"
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<選項>] [(<版本庫> | <組>)...]"
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<選項>]"
-#: builtin/fetch.c:116
+#: builtin/fetch.c:120
msgid "fetch.parallel cannot be negative"
msgstr "fetch.parallel 不能為負數"
-#: builtin/fetch.c:139 builtin/pull.c:184
+#: builtin/fetch.c:143 builtin/pull.c:185
msgid "fetch from all remotes"
msgstr "從所有的遠端抓取"
-#: builtin/fetch.c:141 builtin/pull.c:228
+#: builtin/fetch.c:145 builtin/pull.c:245
msgid "set upstream for git pull/fetch"
msgstr "為 git pull/fetch 設定上游"
-#: builtin/fetch.c:143 builtin/pull.c:187
+#: builtin/fetch.c:147 builtin/pull.c:188
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "追加到 .git/FETCH_HEAD 而不是覆蓋它"
-#: builtin/fetch.c:145 builtin/pull.c:190
+#: builtin/fetch.c:149
+msgid "use atomic transaction to update references"
+msgstr "使用原子事務更新參考"
+
+#: builtin/fetch.c:151 builtin/pull.c:191
msgid "path to upload pack on remote end"
msgstr "上傳包到遠端的路徑"
-#: builtin/fetch.c:146
+#: builtin/fetch.c:152
msgid "force overwrite of local reference"
msgstr "強制覆蓋本機引用"
-#: builtin/fetch.c:148
+#: builtin/fetch.c:154
msgid "fetch from multiple remotes"
msgstr "從多個遠端抓取"
-#: builtin/fetch.c:150 builtin/pull.c:194
+#: builtin/fetch.c:156 builtin/pull.c:195
msgid "fetch all tags and associated objects"
msgstr "抓取所有的標籤和關聯物件"
-#: builtin/fetch.c:152
+#: builtin/fetch.c:158
msgid "do not fetch all tags (--no-tags)"
msgstr "不抓取任何標籤(--no-tags)"
-#: builtin/fetch.c:154
+#: builtin/fetch.c:160
msgid "number of submodules fetched in parallel"
msgstr "子模組取得的並發數"
-#: builtin/fetch.c:156 builtin/pull.c:197
+#: builtin/fetch.c:162 builtin/pull.c:198
msgid "prune remote-tracking branches no longer on remote"
msgstr "清除遠端已經不存在的分支的追蹤分支"
-#: builtin/fetch.c:158
+#: builtin/fetch.c:164
msgid "prune local tags no longer on remote and clobber changed tags"
msgstr "清除遠端不存在的本機標籤，並且取代變更標籤"
# 譯者：可選值，不能翻譯
-#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121
+#: builtin/fetch.c:165 builtin/fetch.c:190 builtin/pull.c:122
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:160
+#: builtin/fetch.c:166
msgid "control recursive fetching of submodules"
msgstr "控制子模組的遞迴抓取"
-#: builtin/fetch.c:164 builtin/pull.c:205
+#: builtin/fetch.c:171
+msgid "write fetched references to the FETCH_HEAD file"
+msgstr "將取得的參考寫入 FETCH_HEAD 檔案"
+
+#: builtin/fetch.c:172 builtin/pull.c:206
msgid "keep downloaded pack"
msgstr "保持下載包"
-#: builtin/fetch.c:166
+#: builtin/fetch.c:174
msgid "allow updating of HEAD ref"
msgstr "允許更新 HEAD 引用"
-#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208
+#: builtin/fetch.c:177 builtin/fetch.c:183 builtin/pull.c:209
+#: builtin/pull.c:218
msgid "deepen history of shallow clone"
msgstr "深化淺複製的歷史"
-#: builtin/fetch.c:171
+#: builtin/fetch.c:179 builtin/pull.c:212
msgid "deepen history of shallow repository based on time"
msgstr "基於時間來深化淺複製的歷史"
-#: builtin/fetch.c:177 builtin/pull.c:211
+#: builtin/fetch.c:185 builtin/pull.c:221
msgid "convert to a complete repository"
msgstr "轉換為一個完整的版本庫"
-#: builtin/fetch.c:180
+#: builtin/fetch.c:188
msgid "prepend this to submodule path output"
msgstr "在子模組路徑輸出的前面加上此目錄"
-#: builtin/fetch.c:183
+#: builtin/fetch.c:191
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr "遞迴取得子模組的預設值（比設定檔案優先度低）"
-#: builtin/fetch.c:187 builtin/pull.c:214
+#: builtin/fetch.c:195 builtin/pull.c:224
msgid "accept refs that update .git/shallow"
msgstr "接受更新 .git/shallow 的引用"
-#: builtin/fetch.c:188 builtin/pull.c:216
+#: builtin/fetch.c:196 builtin/pull.c:226
msgid "refmap"
msgstr "引用映射"
-#: builtin/fetch.c:189 builtin/pull.c:217
+#: builtin/fetch.c:197 builtin/pull.c:227
msgid "specify fetch refmap"
msgstr "指定取得動作的引用映射"
-#: builtin/fetch.c:196
+#: builtin/fetch.c:204 builtin/pull.c:240
msgid "report that we have only objects reachable from this object"
msgstr "報告我們只擁有從該物件開始可以取得的物件"
-#: builtin/fetch.c:199
-msgid "run 'gc --auto' after fetching"
-msgstr "取得後執行 'gc --auto'"
+#: builtin/fetch.c:207 builtin/fetch.c:209
+msgid "run 'maintenance --auto' after fetching"
+msgstr "取得 (fetch) 後執行 'maintenance --auto'"
-#: builtin/fetch.c:201 builtin/pull.c:226
+#: builtin/fetch.c:211 builtin/pull.c:243
msgid "check for forced-updates on all updated branches"
msgstr "在所有更新分支上檢查強制更新"
-#: builtin/fetch.c:203
+#: builtin/fetch.c:213
msgid "write the commit-graph after fetching"
msgstr "抓取後寫入分支圖"
-#: builtin/fetch.c:513
+#: builtin/fetch.c:215
+msgid "accept refspecs from stdin"
+msgstr "從標準輸入中接受引用表達式"
+
+#: builtin/fetch.c:526
msgid "Couldn't find remote ref HEAD"
msgstr "無法發現遠端 HEAD 引用"
-#: builtin/fetch.c:653
+#: builtin/fetch.c:697
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "設定變數 fetch.output 包含無效值 %s"
-#: builtin/fetch.c:751
+#: builtin/fetch.c:796
#, c-format
msgid "object %s not found"
msgstr "物件 %s 未發現"
-#: builtin/fetch.c:755
+#: builtin/fetch.c:800
msgid "[up to date]"
msgstr "[最新]"
-#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
+#: builtin/fetch.c:813 builtin/fetch.c:829 builtin/fetch.c:901
msgid "[rejected]"
msgstr "[已拒絕]"
-#: builtin/fetch.c:769
+#: builtin/fetch.c:814
msgid "can't fetch in current branch"
msgstr "目前分支下不能執行取得動作"
-#: builtin/fetch.c:779
+#: builtin/fetch.c:824
msgid "[tag update]"
msgstr "[標籤更新]"
-#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839
-#: builtin/fetch.c:851
+#: builtin/fetch.c:825 builtin/fetch.c:862 builtin/fetch.c:884
+#: builtin/fetch.c:896
msgid "unable to update local ref"
msgstr "不能更新本機引用"
-#: builtin/fetch.c:784
+#: builtin/fetch.c:829
msgid "would clobber existing tag"
msgstr "會破壞現有的標籤"
-#: builtin/fetch.c:806
+#: builtin/fetch.c:851
msgid "[new tag]"
msgstr "[新標籤]"
-#: builtin/fetch.c:809
+#: builtin/fetch.c:854
msgid "[new branch]"
msgstr "[新分支]"
-#: builtin/fetch.c:812
+#: builtin/fetch.c:857
msgid "[new ref]"
msgstr "[新引用]"
-#: builtin/fetch.c:851
+#: builtin/fetch.c:896
msgid "forced update"
msgstr "強制更新"
-#: builtin/fetch.c:856
+#: builtin/fetch.c:901
msgid "non-fast-forward"
msgstr "非快轉"
-#: builtin/fetch.c:877
+#: builtin/fetch.c:1005
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"
+"取得動作通常顯示哪些分支發生了強制更新，但該檢查已被停用。\n"
"要重新啟用，請使用 '--show-forced-updates' 選項或執行\n"
"'git config fetch.showForcedUpdates true'。"
-#: builtin/fetch.c:881
+#: builtin/fetch.c:1009
#, c-format
msgid ""
"It took %.2f seconds to check forced updates. You can use\n"
@@ -13678,22 +14789,22 @@
"花了 %.2f 秒來檢查強制更新。您可以使用 '--no-show-forced-updates'\n"
"或執行 'git config fetch.showForcedUpdates false' 以避免此項檢查。\n"
-#: builtin/fetch.c:920
+#: builtin/fetch.c:1041
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s 未傳送所有必需的物件\n"
-#: builtin/fetch.c:941
+#: builtin/fetch.c:1069
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "拒絕 %s 因為淺複製不允許被更新"
-#: builtin/fetch.c:1026 builtin/fetch.c:1164
+#: builtin/fetch.c:1146 builtin/fetch.c:1297
#, c-format
msgid "From %.*s\n"
msgstr "來自 %.*s\n"
-#: builtin/fetch.c:1037
+#: builtin/fetch.c:1168
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -13703,57 +14814,57 @@
" 'git remote prune %s' 來刪除舊的、有衝突的分支"
# 譯者：請維持前導空格
-#: builtin/fetch.c:1134
+#: builtin/fetch.c:1267
#, c-format
msgid " (%s will become dangling)"
msgstr " （%s 將成為懸空狀態）"
# 譯者：請維持前導空格
-#: builtin/fetch.c:1135
+#: builtin/fetch.c:1268
#, c-format
msgid " (%s has become dangling)"
msgstr " （%s 已成為懸空狀態）"
-#: builtin/fetch.c:1167
+#: builtin/fetch.c:1300
msgid "[deleted]"
msgstr "[已刪除]"
-#: builtin/fetch.c:1168 builtin/remote.c:1112
+#: builtin/fetch.c:1301 builtin/remote.c:1118
msgid "(none)"
msgstr "（無）"
-#: builtin/fetch.c:1191
+#: builtin/fetch.c:1324
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "拒絕取得到非純版本庫的目前分支 %s"
-#: builtin/fetch.c:1210
+#: builtin/fetch.c:1343
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "選項 \"%s\" 的值 \"%s\" 對於 %s 是無效的"
-#: builtin/fetch.c:1213
+#: builtin/fetch.c:1346
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "選項 \"%s\" 為 %s 所忽略\n"
-#: builtin/fetch.c:1421
+#: builtin/fetch.c:1558
msgid "multiple branches detected, incompatible with --set-upstream"
msgstr "檢測到多分支，和 --set-upstream 不相容"
-#: builtin/fetch.c:1436
+#: builtin/fetch.c:1573
msgid "not setting upstream for a remote remote-tracking branch"
msgstr "沒有為一個遠端追蹤分支設定上游"
-#: builtin/fetch.c:1438
+#: builtin/fetch.c:1575
msgid "not setting upstream for a remote tag"
msgstr "沒有為一個遠端標籤設定上游"
-#: builtin/fetch.c:1440
+#: builtin/fetch.c:1577
msgid "unknown branch type"
msgstr "未知的分支類型"
-#: builtin/fetch.c:1442
+#: builtin/fetch.c:1579
msgid ""
"no source branch found.\n"
"you need to specify exactly one branch with the --set-upstream option."
@@ -13761,92 +14872,100 @@
"未發現源分支。\n"
"您需要使用 --set-upstream 選項指定一個分支。"
-#: builtin/fetch.c:1568 builtin/fetch.c:1631
+#: builtin/fetch.c:1708 builtin/fetch.c:1771
#, c-format
msgid "Fetching %s\n"
msgstr "正在取得 %s\n"
-#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101
+#: builtin/fetch.c:1718 builtin/fetch.c:1773 builtin/remote.c:101
#, c-format
msgid "Could not fetch %s"
msgstr "不能取得 %s"
-#: builtin/fetch.c:1590
+#: builtin/fetch.c:1730
#, c-format
msgid "could not fetch '%s' (exit code: %d)\n"
msgstr "無法取得 '%s'（離開碼：%d）\n"
-#: builtin/fetch.c:1693
+#: builtin/fetch.c:1834
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr "未指定遠端版本庫。請透過一個 URL 或遠端版本庫名指定，用以取得新提交。"
-#: builtin/fetch.c:1730
+#: builtin/fetch.c:1870
msgid "You need to specify a tag name."
msgstr "您需要指定一個標籤名稱。"
-#: builtin/fetch.c:1780
+#: builtin/fetch.c:1935
msgid "Negative depth in --deepen is not supported"
msgstr "--deepen 不支援負數深度"
-#: builtin/fetch.c:1782
+#: builtin/fetch.c:1937
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen 和 --depth 是互斥的"
-#: builtin/fetch.c:1787
+#: builtin/fetch.c:1942
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth 和 --unshallow 不能同時使用"
-#: builtin/fetch.c:1789
+#: builtin/fetch.c:1944
msgid "--unshallow on a complete repository does not make sense"
msgstr "對於一個完整的版本庫，參數 --unshallow 沒有意義"
-#: builtin/fetch.c:1805
+#: builtin/fetch.c:1961
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all 不能帶一個版本庫參數"
-#: builtin/fetch.c:1807
+#: builtin/fetch.c:1963
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all 帶引用規格沒有任何意義"
-#: builtin/fetch.c:1816
+#: builtin/fetch.c:1972
#, c-format
msgid "No such remote or remote group: %s"
msgstr "沒有這樣的遠端或遠端組：%s"
-#: builtin/fetch.c:1823
+#: builtin/fetch.c:1979
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "取得組並指定引用規格沒有意義"
-#: builtin/fetch.c:1841
+#: builtin/fetch.c:1997
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:2001
+msgid "--atomic can only be used when fetching from one remote"
+msgstr "--stdin 只能在擷取 (fetch) 一個遠端時使用"
+
+#: builtin/fetch.c:2005
+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:671
+#: builtin/fmt-merge-msg.c:18
msgid "populate log with at most <n> entries from shortlog"
msgstr "向提交說明中最多複製指定條目（合併而來的提交）的簡短說明"
-#: builtin/fmt-merge-msg.c:674
+#: builtin/fmt-merge-msg.c:21
msgid "alias for --log (deprecated)"
msgstr "參數 --log 的別名（已棄用）"
-#: builtin/fmt-merge-msg.c:677
+#: builtin/fmt-merge-msg.c:24
msgid "text"
msgstr "文字"
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:25
msgid "use <text> as start of message"
msgstr "使用 <文字> 作為提交說明的開始"
-#: builtin/fmt-merge-msg.c:679
+#: builtin/fmt-merge-msg.c:26
msgid "file to read from"
msgstr "從檔案中讀取"
@@ -13859,8 +14978,8 @@
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>]]"
@@ -13886,7 +15005,7 @@
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:472
msgid "respect format colors"
msgstr "遵照格式中的顏色輸出"
@@ -13910,32 +15029,48 @@
msgid "print only refs which don't contain the commit"
msgstr "只列印不包含該提交的引用"
-#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148
+#: builtin/for-each-repo.c:9
+msgid "git for-each-repo --config=<config> <command-args>"
+msgstr "git for-each-repo --config=<設定> <命令引數>"
+
+#: builtin/for-each-repo.c:37
+msgid "config"
+msgstr "config"
+
+#: builtin/for-each-repo.c:38
+msgid "config key storing a list of repository paths"
+msgstr "儲存版本庫路徑清單的設定鍵"
+
+#: builtin/for-each-repo.c:46
+msgid "missing --config=<config>"
+msgstr "缺少 --config=<設定>"
+
+#: builtin/fsck.c:69 builtin/fsck.c:130 builtin/fsck.c:131
msgid "unknown"
msgstr "未知"
#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:100 builtin/fsck.c:120
+#: builtin/fsck.c:83 builtin/fsck.c:103
#, c-format
msgid "error in %s %s: %s"
msgstr "%s %s 錯誤：%s"
#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:114
+#: builtin/fsck.c:97
#, c-format
msgid "warning in %s %s: %s"
msgstr "%s %s 警告：%s"
-#: builtin/fsck.c:143 builtin/fsck.c:146
+#: builtin/fsck.c:126 builtin/fsck.c:129
#, c-format
msgid "broken link from %7s %s"
msgstr "來自 %7s %s 的損壞的連結"
-#: builtin/fsck.c:155
+#: builtin/fsck.c:138
msgid "wrong object type in link"
msgstr "連結中錯誤的物件類型"
-#: builtin/fsck.c:171
+#: builtin/fsck.c:154
#, c-format
msgid ""
"broken link from %7s %s\n"
@@ -13944,240 +15079,240 @@
"損壞的連結來自於 %7s %s\n"
" 到 %7s %s"
-#: builtin/fsck.c:282
+#: builtin/fsck.c:265
#, c-format
msgid "missing %s %s"
msgstr "缺少 %s %s"
-#: builtin/fsck.c:309
+#: builtin/fsck.c:292
#, c-format
msgid "unreachable %s %s"
msgstr "無法取得 %s %s"
-#: builtin/fsck.c:329
+#: builtin/fsck.c:312
#, c-format
msgid "dangling %s %s"
msgstr "懸空 %s %s"
-#: builtin/fsck.c:339
+#: builtin/fsck.c:322
msgid "could not create lost-found"
msgstr "不能建立 lost-found"
-#: builtin/fsck.c:350
+#: builtin/fsck.c:333
#, c-format
msgid "could not finish '%s'"
msgstr "不能完成 '%s'"
-#: builtin/fsck.c:367
+#: builtin/fsck.c:350
#, c-format
msgid "Checking %s"
msgstr "正在檢查 %s"
-#: builtin/fsck.c:405
+#: builtin/fsck.c:388
#, c-format
msgid "Checking connectivity (%d objects)"
msgstr "正在檢查連通性（%d 個物件）"
-#: builtin/fsck.c:424
+#: builtin/fsck.c:407
#, c-format
msgid "Checking %s %s"
msgstr "正在檢查 %s %s"
-#: builtin/fsck.c:429
+#: builtin/fsck.c:412
msgid "broken links"
msgstr "損壞的連結"
-#: builtin/fsck.c:438
+#: builtin/fsck.c:421
#, c-format
msgid "root %s"
msgstr "根 %s"
-#: builtin/fsck.c:446
+#: builtin/fsck.c:429
#, c-format
msgid "tagged %s %s (%s) in %s"
-msgstr "標記 %s %s (%s) 於 %s"
+msgstr "已標記 %s %s (%s) 於 %s"
-#: builtin/fsck.c:475
+#: builtin/fsck.c:458
#, c-format
msgid "%s: object corrupt or missing"
msgstr "%s：物件損壞或遺失"
-#: builtin/fsck.c:500
+#: builtin/fsck.c:483
#, c-format
msgid "%s: invalid reflog entry %s"
msgstr "%s：無效的引用日誌條目 %s"
-#: builtin/fsck.c:514
+#: builtin/fsck.c:497
#, c-format
msgid "Checking reflog %s->%s"
msgstr "正在檢查引用日誌 %s->%s"
-#: builtin/fsck.c:548
+#: builtin/fsck.c:531
#, c-format
msgid "%s: invalid sha1 pointer %s"
msgstr "%s：無效的 sha1 指標 %s"
-#: builtin/fsck.c:555
+#: builtin/fsck.c:538
#, c-format
msgid "%s: not a commit"
msgstr "%s：不是一個提交"
-#: builtin/fsck.c:609
+#: builtin/fsck.c:592
msgid "notice: No default references"
msgstr "注意：無預設引用"
-#: builtin/fsck.c:624
+#: builtin/fsck.c:607
#, c-format
msgid "%s: object corrupt or missing: %s"
msgstr "%s：物件損壞或遺失：%s"
-#: builtin/fsck.c:637
+#: builtin/fsck.c:620
#, c-format
msgid "%s: object could not be parsed: %s"
msgstr "%s：不能解析物件：%s"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:640
#, c-format
msgid "bad sha1 file: %s"
msgstr "壞的 sha1 檔案：%s"
-#: builtin/fsck.c:672
+#: builtin/fsck.c:655
msgid "Checking object directory"
msgstr "正在檢查物件目錄"
-#: builtin/fsck.c:675
+#: builtin/fsck.c:658
msgid "Checking object directories"
msgstr "正在檢查物件目錄"
-#: builtin/fsck.c:690
+#: builtin/fsck.c:673
#, c-format
msgid "Checking %s link"
msgstr "正在檢查 %s 連結"
-#: builtin/fsck.c:695 builtin/index-pack.c:843
+#: builtin/fsck.c:678 builtin/index-pack.c:865
#, c-format
msgid "invalid %s"
msgstr "無效的 %s"
-#: builtin/fsck.c:702
+#: builtin/fsck.c:685
#, c-format
msgid "%s points to something strange (%s)"
msgstr "%s 指向奇怪的東西（%s）"
-#: builtin/fsck.c:708
+#: builtin/fsck.c:691
#, c-format
msgid "%s: detached HEAD points at nothing"
msgstr "%s：分離開頭指標的指向不存在"
-#: builtin/fsck.c:712
+#: builtin/fsck.c:695
#, c-format
msgid "notice: %s points to an unborn branch (%s)"
msgstr "注意：%s 指向一個尚未誕生的分支（%s）"
-#: builtin/fsck.c:724
+#: builtin/fsck.c:707
msgid "Checking cache tree"
msgstr "正在檢查快取樹"
-#: builtin/fsck.c:729
+#: builtin/fsck.c:712
#, c-format
msgid "%s: invalid sha1 pointer in cache-tree"
msgstr "%s：cache-tree 中無效的 sha1 指標"
-#: builtin/fsck.c:738
+#: builtin/fsck.c:721
msgid "non-tree in cache-tree"
msgstr "cache-tree 中非樹狀物件"
-#: builtin/fsck.c:769
+#: builtin/fsck.c:752
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<選項>] [<物件>...]"
-#: builtin/fsck.c:775
+#: builtin/fsck.c:758
msgid "show unreachable objects"
msgstr "顯示無法取得的物件"
-#: builtin/fsck.c:776
+#: builtin/fsck.c:759
msgid "show dangling objects"
msgstr "顯示懸空的物件"
-#: builtin/fsck.c:777
+#: builtin/fsck.c:760
msgid "report tags"
msgstr "報告標籤"
-#: builtin/fsck.c:778
+#: builtin/fsck.c:761
msgid "report root nodes"
msgstr "報告根節點"
-#: builtin/fsck.c:779
+#: builtin/fsck.c:762
msgid "make index objects head nodes"
msgstr "將索引亦作為檢查的頭節點"
-#: builtin/fsck.c:780
+#: builtin/fsck.c:763
msgid "make reflogs head nodes (default)"
msgstr "將引用日誌作為檢查的頭節點（預設）"
-#: builtin/fsck.c:781
+#: builtin/fsck.c:764
msgid "also consider packs and alternate objects"
msgstr "也考慮包和備用物件"
-#: builtin/fsck.c:782
+#: builtin/fsck.c:765
msgid "check only connectivity"
msgstr "僅檢查連通性"
-#: builtin/fsck.c:783
+#: builtin/fsck.c:766 builtin/mktag.c:78
msgid "enable more strict checking"
msgstr "啟用更嚴格的檢查"
-#: builtin/fsck.c:785
+#: builtin/fsck.c:768
msgid "write dangling objects in .git/lost-found"
msgstr "將懸空物件寫入 .git/lost-found 中"
-#: builtin/fsck.c:786 builtin/prune.c:132
+#: builtin/fsck.c:769 builtin/prune.c:134
msgid "show progress"
msgstr "顯示進度"
-#: builtin/fsck.c:787
+#: builtin/fsck.c:770
msgid "show verbose names for reachable objects"
msgstr "顯示可以取得物件的詳細名稱"
-#: builtin/fsck.c:846 builtin/index-pack.c:225
+#: builtin/fsck.c:829 builtin/index-pack.c:261
msgid "Checking objects"
msgstr "正在檢查物件"
-#: builtin/fsck.c:874
+#: builtin/fsck.c:857
#, c-format
msgid "%s: object missing"
msgstr "%s：物件缺少"
-#: builtin/fsck.c:885
+#: builtin/fsck.c:868
#, c-format
msgid "invalid parameter: expected sha1, got '%s'"
msgstr "無效的參數：期望 sha1，得到 '%s'"
-#: builtin/gc.c:35
+#: builtin/gc.c:39
msgid "git gc [<options>]"
msgstr "git gc [<選項>]"
-#: builtin/gc.c:90
+#: builtin/gc.c:93
#, c-format
msgid "Failed to fstat %s: %s"
msgstr "對 %s 呼叫 fstat 失敗：%s"
-#: builtin/gc.c:126
+#: builtin/gc.c:129
#, c-format
msgid "failed to parse '%s' value '%s'"
msgstr "無法解析 '%s' 值 '%s'"
-#: builtin/gc.c:475 builtin/init-db.c:55
+#: builtin/gc.c:487 builtin/init-db.c:58
#, c-format
msgid "cannot stat '%s'"
msgstr "不能對 '%s' 呼叫 stat"
-#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
+#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:562
#, c-format
msgid "cannot read '%s'"
msgstr "不能讀取 '%s'"
-#: builtin/gc.c:491
+#: builtin/gc.c:503
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -14191,72 +15326,232 @@
"\n"
"%s"
-#: builtin/gc.c:539
+#: builtin/gc.c:551
msgid "prune unreferenced objects"
msgstr "清除未引用的物件"
-#: builtin/gc.c:541
+#: builtin/gc.c:553
msgid "be more thorough (increased runtime)"
msgstr "更徹底（增加執行時間）"
-#: builtin/gc.c:542
+#: builtin/gc.c:554
msgid "enable auto-gc mode"
msgstr "啟用自動垃圾回收模式"
-#: builtin/gc.c:545
+#: builtin/gc.c:557
msgid "force running gc even if there may be another gc running"
msgstr "強制執行 gc 即使另外一個 gc 正在執行"
-#: builtin/gc.c:548
+#: builtin/gc.c:560
msgid "repack all other packs except the largest pack"
msgstr "除了最大的包之外，對所有其它包檔案重新打包"
-#: builtin/gc.c:565
+#: builtin/gc.c:576
#, c-format
msgid "failed to parse gc.logexpiry value %s"
msgstr "解析 gc.logexpiry 的值 %s 失敗"
-#: builtin/gc.c:576
+#: builtin/gc.c:587
#, c-format
msgid "failed to parse prune expiry value %s"
msgstr "解析清除期限值 %s 失敗"
-#: builtin/gc.c:596
+#: builtin/gc.c:607
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "自動在後台執行版本庫打包以求最佳性能。\n"
-#: builtin/gc.c:598
+#: builtin/gc.c:609
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "自動打包版本庫以求最佳性能。\n"
-#: builtin/gc.c:599
+#: builtin/gc.c:610
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "手動維護參見 \"git help gc\"。\n"
-#: builtin/gc.c:639
+#: builtin/gc.c:650
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr "gc 已在「%s」機器 pid %<PRIuMAX> 執行（如果不是，使用 --force）"
-#: builtin/gc.c:694
+#: builtin/gc.c:705
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr "有太多無法取得的鬆散物件，執行 'git prune' 刪除它們。"
+#: builtin/gc.c:715
+msgid ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
+msgstr ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<作業>] [--schedule]"
+
+#: builtin/gc.c:745
+msgid "--no-schedule is not allowed"
+msgstr "不允許 --no-schedule"
+
+#: builtin/gc.c:750
+#, c-format
+msgid "unrecognized --schedule argument '%s'"
+msgstr "無法識別的 --schedule 引數 '%s'"
+
+#: builtin/gc.c:869
+msgid "failed to write commit-graph"
+msgstr "無法寫入提交圖形"
+
+#: builtin/gc.c:914
+msgid "failed to fill remotes"
+msgstr "無法填充遠端位置"
+
+#: builtin/gc.c:1037
+msgid "failed to start 'git pack-objects' process"
+msgstr "無法啟動 ‘git pack-objects’ 處理程序"
+
+#: builtin/gc.c:1054
+msgid "failed to finish 'git pack-objects' process"
+msgstr "無法完成 ‘git pack-objects’ 處理程序"
+
+#: builtin/gc.c:1106
+msgid "failed to write multi-pack-index"
+msgstr "無法寫入多包索引"
+
+#: builtin/gc.c:1124
+msgid "'git multi-pack-index expire' failed"
+msgstr "'git multi-pack-index expire' 失敗"
+
+#: builtin/gc.c:1185
+msgid "'git multi-pack-index repack' failed"
+msgstr "'git multi-pack-index repack' 失敗"
+
+#: builtin/gc.c:1194
+msgid ""
+"skipping incremental-repack task because core.multiPackIndex is disabled"
+msgstr "略過增量重新打包工作，因為 core.multiPackIndex 已被停用"
+
+#: builtin/gc.c:1298
+#, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr "已存在 '%s' 鎖定檔案，略過維護"
+
+#: builtin/gc.c:1328
+#, c-format
+msgid "task '%s' failed"
+msgstr "作業 '%s' 失敗"
+
+#: builtin/gc.c:1410
+#, c-format
+msgid "'%s' is not a valid task"
+msgstr "'%s' 非有效作業"
+
+#: builtin/gc.c:1415
+#, c-format
+msgid "task '%s' cannot be selected multiple times"
+msgstr "不能多次選取 '%s' 作業"
+
+#: builtin/gc.c:1430
+msgid "run tasks based on the state of the repository"
+msgstr "基於版本庫狀態執行作業"
+
+#: builtin/gc.c:1431
+msgid "frequency"
+msgstr "frequency"
+
+#: builtin/gc.c:1432
+msgid "run tasks based on frequency"
+msgstr "依據頻率執行工作"
+
+#: builtin/gc.c:1435
+msgid "do not report progress or other information over stderr"
+msgstr "不要在 stderr 輸出進度或其他資訊"
+
+#: builtin/gc.c:1436
+msgid "task"
+msgstr "作業"
+
+#: builtin/gc.c:1437
+msgid "run a specific task"
+msgstr "執行指定作業"
+
+#: builtin/gc.c:1454
+msgid "use at most one of --auto and --schedule=<frequency>"
+msgstr "--auto 和 --schedule=<頻率> 請任選一"
+
+#: builtin/gc.c:1497
+msgid "failed to run 'git config'"
+msgstr "無法執行 ‘git config’"
+
+#: builtin/gc.c:1562
+#, c-format
+msgid "failed to expand path '%s'"
+msgstr "無法展開「%s」路徑"
+
+#: builtin/gc.c:1591
+msgid "failed to start launchctl"
+msgstr "無法啟動 launchctl"
+
+#: builtin/gc.c:1628
+#, c-format
+msgid "failed to create directories for '%s'"
+msgstr "無法建立「%s」的目錄"
+
+#: builtin/gc.c:1689
+#, c-format
+msgid "failed to bootstrap service %s"
+msgstr "無法啟動載入 %s 服務"
+
+#: builtin/gc.c:1760
+msgid "failed to create temp xml file"
+msgstr "無法建立暫存 XML 檔案"
+
+#: builtin/gc.c:1850
+msgid "failed to start schtasks"
+msgstr "無法啟動 schtasks"
+
+#: builtin/gc.c:1894
+msgid "failed to run 'crontab -l'; your system might not support 'cron'"
+msgstr "無法執行 “crontab -l”；您的系統可能不支援 “cron”"
+
+#: builtin/gc.c:1911
+msgid "failed to run 'crontab'; your system might not support 'cron'"
+msgstr "無法執行 “crontab”；您的系統可能不支援 “cron”"
+
+#: builtin/gc.c:1915
+msgid "failed to open stdin of 'crontab'"
+msgstr "無法開啟 ‘crontab’ 的標準輸入"
+
+#: builtin/gc.c:1956
+msgid "'crontab' died"
+msgstr "“crontab” 結束運作"
+
+#: builtin/gc.c:1990
+msgid "another process is scheduling background maintenance"
+msgstr "其他處理程序正在排定背景維護工作"
+
+#: builtin/gc.c:2009
+msgid "failed to add repo to global config"
+msgstr "無法將版本庫加至全域設定"
+
+#: builtin/gc.c:2019
+msgid "git maintenance <subcommand> [<options>]"
+msgstr "git maintenance <子命令> [<選項>]"
+
+#: builtin/gc.c:2038
+#, 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
+#: builtin/grep.c:223
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep：無法建立執行緒：%s"
-#: builtin/grep.c:279
+#: builtin/grep.c:277
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "為 %2$s 設定的執行緒數 (%1$d) 無效"
@@ -14265,259 +15560,259 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731
-#: builtin/pack-objects.c:2854
+#: builtin/grep.c:285 builtin/index-pack.c:1589 builtin/index-pack.c:1808
+#: builtin/pack-objects.c:2944
#, c-format
msgid "no threads support, ignoring %s"
msgstr "沒有執行緒支援，忽略 %s"
-#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618
+#: builtin/grep.c:473 builtin/grep.c:601 builtin/grep.c:641
#, c-format
msgid "unable to read tree (%s)"
msgstr "無法讀取樹（%s）"
-#: builtin/grep.c:633
+#: builtin/grep.c:656
#, c-format
msgid "unable to grep from object of type %s"
msgstr "無法抓取來自於 %s 類型的物件"
-#: builtin/grep.c:704
+#: builtin/grep.c:737
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "開關 `%c' 期望一個數字值"
-#: builtin/grep.c:803
+#: builtin/grep.c:836
msgid "search in index instead of in the work tree"
msgstr "在索引區搜尋而不是在工作區"
-#: builtin/grep.c:805
+#: builtin/grep.c:838
msgid "find in contents not managed by git"
msgstr "在未被 git 管理的內容中尋找"
# 譯者：中文字串拼接，可刪除前導空格
-#: builtin/grep.c:807
+#: builtin/grep.c:840
msgid "search in both tracked and untracked files"
msgstr "在追蹤和未追蹤的檔案中搜尋"
-#: builtin/grep.c:809
+#: builtin/grep.c:842
msgid "ignore files specified via '.gitignore'"
msgstr "忽略 '.gitignore' 包含的檔案"
-#: builtin/grep.c:811
+#: builtin/grep.c:844
msgid "recursively search in each submodule"
msgstr "在每一個子模組中遞迴搜尋"
-#: builtin/grep.c:814
+#: builtin/grep.c:847
msgid "show non-matching lines"
msgstr "顯示未符合的行"
-#: builtin/grep.c:816
+#: builtin/grep.c:849
msgid "case insensitive matching"
msgstr "不區分大小寫符合"
-#: builtin/grep.c:818
+#: builtin/grep.c:851
msgid "match patterns only at word boundaries"
msgstr "只在單詞邊界符合模式"
-#: builtin/grep.c:820
+#: builtin/grep.c:853
msgid "process binary files as text"
msgstr "把二進位檔案當做文字處理"
-#: builtin/grep.c:822
+#: builtin/grep.c:855
msgid "don't match patterns in binary files"
msgstr "不在二進位檔案中符合模式"
-#: builtin/grep.c:825
+#: builtin/grep.c:858
msgid "process binary files with textconv filters"
msgstr "用 textconv 過濾器處理二進位檔案"
-#: builtin/grep.c:827
+#: builtin/grep.c:860
msgid "search in subdirectories (default)"
msgstr "在子目錄中尋找（預設）"
-#: builtin/grep.c:829
+#: builtin/grep.c:862
msgid "descend at most <depth> levels"
msgstr "最多以指定的深度向下尋找"
-#: builtin/grep.c:833
+#: builtin/grep.c:866
msgid "use extended POSIX regular expressions"
msgstr "使用擴展的 POSIX 正規表示式"
-#: builtin/grep.c:836
+#: builtin/grep.c:869
msgid "use basic POSIX regular expressions (default)"
msgstr "使用基本的 POSIX 正規表示式（預設）"
-#: builtin/grep.c:839
+#: builtin/grep.c:872
msgid "interpret patterns as fixed strings"
msgstr "把模式解析為固定的字串"
-#: builtin/grep.c:842
+#: builtin/grep.c:875
msgid "use Perl-compatible regular expressions"
msgstr "使用 Perl 相容的正規表示式"
-#: builtin/grep.c:845
+#: builtin/grep.c:878
msgid "show line numbers"
msgstr "顯示行號"
-#: builtin/grep.c:846
+#: builtin/grep.c:879
msgid "show column number of first match"
msgstr "顯示第一個符合的列號"
-#: builtin/grep.c:847
+#: builtin/grep.c:880
msgid "don't show filenames"
msgstr "不顯示檔案名"
-#: builtin/grep.c:848
+#: builtin/grep.c:881
msgid "show filenames"
msgstr "顯示檔案名"
-#: builtin/grep.c:850
+#: builtin/grep.c:883
msgid "show filenames relative to top directory"
msgstr "顯示相對於頂級目錄的檔案名"
-#: builtin/grep.c:852
+#: builtin/grep.c:885
msgid "show only filenames instead of matching lines"
msgstr "只顯示檔案名而不顯示符合的行"
-#: builtin/grep.c:854
+#: builtin/grep.c:887
msgid "synonym for --files-with-matches"
msgstr "和 --files-with-matches 同義"
-#: builtin/grep.c:857
+#: builtin/grep.c:890
msgid "show only the names of files without match"
msgstr "只顯示未符合的檔案名"
-#: builtin/grep.c:859
+#: builtin/grep.c:892
msgid "print NUL after filenames"
msgstr "在檔案名後輸出 NUL 字元"
-#: builtin/grep.c:862
+#: builtin/grep.c:895
msgid "show only matching parts of a line"
msgstr "只顯示行中的符合的部分"
-#: builtin/grep.c:864
+#: builtin/grep.c:897
msgid "show the number of matches instead of matching lines"
msgstr "顯示總符合行數，而不顯示符合的行"
-#: builtin/grep.c:865
+#: builtin/grep.c:898
msgid "highlight matches"
msgstr "高亮顯示符合項"
-#: builtin/grep.c:867
+#: builtin/grep.c:900
msgid "print empty line between matches from different files"
msgstr "在不同檔案的符合項之間列印空行"
-#: builtin/grep.c:869
+#: builtin/grep.c:902
msgid "show filename only once above matches from same file"
msgstr "只在同一檔案的符合項的上面顯示一次檔案名"
-#: builtin/grep.c:872
+#: builtin/grep.c:905
msgid "show <n> context lines before and after matches"
msgstr "顯示符合項前後的 <n> 行上下文"
-#: builtin/grep.c:875
+#: builtin/grep.c:908
msgid "show <n> context lines before matches"
msgstr "顯示符合項前 <n> 行上下文"
-#: builtin/grep.c:877
+#: builtin/grep.c:910
msgid "show <n> context lines after matches"
msgstr "顯示符合項後 <n> 行上下文"
-#: builtin/grep.c:879
+#: builtin/grep.c:912
msgid "use <n> worker threads"
msgstr "使用 <n> 個工作執行緒"
-#: builtin/grep.c:880
+#: builtin/grep.c:913
msgid "shortcut for -C NUM"
msgstr "快捷鍵 -C 數字"
-#: builtin/grep.c:883
+#: builtin/grep.c:916
msgid "show a line with the function name before matches"
msgstr "在符合的前面顯示一行函數名"
-#: builtin/grep.c:885
+#: builtin/grep.c:918
msgid "show the surrounding function"
msgstr "顯示所在函數的前後內容"
-#: builtin/grep.c:888
+#: builtin/grep.c:921
msgid "read patterns from file"
msgstr "從檔案讀取模式"
-#: builtin/grep.c:890
+#: builtin/grep.c:923
msgid "match <pattern>"
msgstr "符合 <模式>"
-#: builtin/grep.c:892
+#: builtin/grep.c:925
msgid "combine patterns specified with -e"
msgstr "組合用 -e 參數設定的模式"
-#: builtin/grep.c:904
+#: builtin/grep.c:937
msgid "indicate hit with exit status without output"
msgstr "不輸出，而用離開碼標記命中狀態"
-#: builtin/grep.c:906
+#: builtin/grep.c:939
msgid "show only matches from files that match all patterns"
msgstr "只顯示符合所有模式的檔案中的符合"
-#: builtin/grep.c:908
-msgid "show parse tree for grep expression"
-msgstr "顯示 grep 表達式的解析樹"
-
-#: builtin/grep.c:912
+#: builtin/grep.c:942
msgid "pager"
msgstr "分頁"
-#: builtin/grep.c:912
+#: builtin/grep.c:942
msgid "show matching files in the pager"
msgstr "分頁顯示符合的檔案"
-#: builtin/grep.c:916
+#: builtin/grep.c:946
msgid "allow calling of grep(1) (ignored by this build)"
-msgstr "允許呼叫 grep(1)（本次構建忽略）"
+msgstr "允許呼叫 grep(1)（本次組建忽略）"
-#: builtin/grep.c:983
+#: builtin/grep.c:1012
msgid "no pattern given"
msgstr "未提供符合模式"
-#: builtin/grep.c:1019
+#: builtin/grep.c:1048
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index 或 --untracked 不能和版本同時使用"
-#: builtin/grep.c:1027
+#: builtin/grep.c:1056
#, c-format
msgid "unable to resolve revision: %s"
msgstr "不能解析版本：%s"
-#: builtin/grep.c:1057
+#: builtin/grep.c:1086
msgid "--untracked not supported with --recurse-submodules"
msgstr "--untracked 不支援與 --recurse-submodules 一起使用"
-#: builtin/grep.c:1061
+#: builtin/grep.c:1090
msgid "invalid option combination, ignoring --threads"
msgstr "無效的選項組合，忽略 --threads"
-#: builtin/grep.c:1064 builtin/pack-objects.c:3547
+#: builtin/grep.c:1093 builtin/pack-objects.c:3672
msgid "no threads support, ignoring --threads"
msgstr "沒有執行緒支援，忽略 --threads"
-#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851
+#: builtin/grep.c:1096 builtin/index-pack.c:1586 builtin/pack-objects.c:2941
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "指定的執行緒數無效（%d）"
-#: builtin/grep.c:1101
+#: builtin/grep.c:1130
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager 僅用於工作區"
-#: builtin/grep.c:1127
+#: builtin/grep.c:1156
msgid "--cached or --untracked cannot be used with --no-index"
msgstr "--cached 或 --untracked 不能與 --no-index 同時使用"
-#: builtin/grep.c:1133
+#: builtin/grep.c:1159
+msgid "--untracked cannot be used with --cached"
+msgstr "--untracked 不能與 --cached 一起使用"
+
+#: builtin/grep.c:1165
msgid "--[no-]exclude-standard cannot be used for tracked contents"
msgstr "--[no-]exclude-standard 不能用於已追蹤內容"
-#: builtin/grep.c:1141
+#: builtin/grep.c:1173
msgid "both --cached and trees are given"
msgstr "同時給出了 --cached 和樹狀物件"
@@ -14558,66 +15853,66 @@
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] [<指令>]"
+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'"
+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"
@@ -14626,7 +15921,7 @@
"'%s'：不支援的 man 手冊檢視器的路徑。\n"
"請使用 'man.<工具>.cmd'。"
-#: builtin/help.c:233
+#: builtin/help.c:319
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -14635,390 +15930,422 @@
"'%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:340
#, c-format
msgid "'%s' is aliased to '%s'"
msgstr "'%s' 是 '%s' 的別名"
-#: builtin/help.c:448 git.c:365
+#: builtin/help.c:534 git.c:372
#, 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 位元組"
-#: 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:606
+#: builtin/index-pack.c:324 builtin/pack-objects.c:624
msgid "pack too large for current definition of off_t"
msgstr "包太大超過了目前 off_t 的定義"
-#: builtin/index-pack.c:291 builtin/unpack-objects.c:95
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
msgid "pack exceeds maximum allowed size"
msgstr "包超過了最大允許值"
-#: builtin/index-pack.c:312
+#: builtin/index-pack.c:342
+#, 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: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> 位元組"
-#: 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:765
-#: builtin/index-pack.c:804 builtin/index-pack.c:813
+#: 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:158
-#: builtin/pack-objects.c:218 builtin/pack-objects.c:313
+#: 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:802
+#: builtin/index-pack.c:824
#, c-format
msgid "cannot read existing object info %s"
msgstr "不能讀取現存物件訊息 %s"
-#: builtin/index-pack.c:810
+#: builtin/index-pack.c:832
#, c-format
msgid "cannot read existing object %s"
msgstr "不能讀取現存物件 %s"
-#: builtin/index-pack.c:824
+#: builtin/index-pack.c:846
#, c-format
msgid "invalid blob object %s"
msgstr "無效的資料物件 %s"
-#: builtin/index-pack.c:827 builtin/index-pack.c:846
+#: builtin/index-pack.c:849 builtin/index-pack.c:868
msgid "fsck error in packed object"
msgstr "對打包物件 fsck 檢查發生錯誤"
-#: builtin/index-pack.c:848
+#: builtin/index-pack.c:870
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "%s 的所有子物件並非都可以取得"
-#: builtin/index-pack.c:920 builtin/index-pack.c:951
+#: builtin/index-pack.c:931 builtin/index-pack.c:978
msgid "failed to apply delta"
msgstr "應用 delta 失敗"
-#: builtin/index-pack.c:1121
+#: builtin/index-pack.c:1161
msgid "Receiving objects"
msgstr "接收物件中"
-#: builtin/index-pack.c:1121
+#: builtin/index-pack.c:1161
msgid "Indexing objects"
msgstr "索引物件中"
-#: builtin/index-pack.c:1155
+#: builtin/index-pack.c:1195
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "包衝突（SHA1 不符合）"
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1200
msgid "cannot fstat packfile"
msgstr "不能對 packfile 呼叫 fstat"
-#: builtin/index-pack.c:1163
+#: builtin/index-pack.c:1203
msgid "pack has junk at the end"
msgstr "包的結尾有垃圾資料"
-#: builtin/index-pack.c:1175
+#: builtin/index-pack.c:1215
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "parse_pack_objects() 中遇到不可理喻的問題"
-#: builtin/index-pack.c:1198
+#: builtin/index-pack.c:1238
msgid "Resolving deltas"
msgstr "處理 delta 中"
-#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615
+#: builtin/index-pack.c:1249 builtin/pack-objects.c:2707
#, c-format
msgid "unable to create thread: %s"
msgstr "不能建立執行緒：%s"
-#: builtin/index-pack.c:1249
+#: builtin/index-pack.c:1282
msgid "confusion beyond insanity"
msgstr "不可理喻"
-#: builtin/index-pack.c:1255
+#: 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:1267
+#: builtin/index-pack.c:1300
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "對 %s 的尾部總和檢查出現意外（磁碟損壞？）"
-#: builtin/index-pack.c:1271
+#: 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:1295
+#: builtin/index-pack.c:1328
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "不能壓縮附加物件（%d）"
-#: builtin/index-pack.c:1392
+#: builtin/index-pack.c:1424
#, c-format
msgid "local object %s is corrupt"
msgstr "本機物件 %s 已損壞"
-#: builtin/index-pack.c:1406
+#: builtin/index-pack.c:1445
#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "packfile 名稱 '%s' 沒有以 '.pack' 結尾"
+msgid "packfile name '%s' does not end with '.%s'"
+msgstr "packfile 名稱「%s」的結尾不是「.%s」"
-#: builtin/index-pack.c:1431
+#: builtin/index-pack.c:1469
#, c-format
msgid "cannot write %s file '%s'"
msgstr "無法寫入 %s 檔案 '%s'"
-#: builtin/index-pack.c:1439
+#: builtin/index-pack.c:1477
#, c-format
msgid "cannot close written %s file '%s'"
msgstr "無法關閉已寫入的 %s 檔案 '%s'"
-#: builtin/index-pack.c:1463
+#: builtin/index-pack.c:1503
msgid "error while closing pack file"
msgstr "關閉包檔案時發生錯誤"
-#: builtin/index-pack.c:1477
+#: builtin/index-pack.c:1517
msgid "cannot store pack file"
msgstr "無法儲存包檔案"
-#: builtin/index-pack.c:1485
+#: builtin/index-pack.c:1525
msgid "cannot store index file"
msgstr "無法儲存索引檔案"
-#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862
+#: builtin/index-pack.c:1534
+msgid "cannot store reverse index file"
+msgstr "無法儲存倒排索引檔案"
+
+#: builtin/index-pack.c:1580 builtin/pack-objects.c:2952
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "壞的 pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1597
+#: builtin/index-pack.c:1650
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "無法開啟現存包檔案 '%s'"
-#: builtin/index-pack.c:1599
+#: builtin/index-pack.c:1652
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "無法為 %s 開啟包索引檔案"
-#: builtin/index-pack.c:1647
+#: builtin/index-pack.c:1700
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "非 delta：%d 個物件"
-#: builtin/index-pack.c:1654
+#: builtin/index-pack.c:1707
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "鏈長 = %d: %lu 物件"
-#: builtin/index-pack.c:1693
+#: builtin/index-pack.c:1765
msgid "Cannot come back to cwd"
msgstr "無法返回目前工作目錄"
-#: builtin/index-pack.c:1742 builtin/index-pack.c:1745
-#: builtin/index-pack.c:1761 builtin/index-pack.c:1765
+#: builtin/index-pack.c:1819 builtin/index-pack.c:1822
+#: builtin/index-pack.c:1838 builtin/index-pack.c:1842
#, c-format
msgid "bad %s"
msgstr "錯誤選項 %s"
-#: builtin/index-pack.c:1781
+#: builtin/index-pack.c:1848 builtin/init-db.c:392 builtin/init-db.c:625
+#, c-format
+msgid "unknown hash algorithm '%s'"
+msgstr "未知的「%s」雜湊算法"
+
+#: builtin/index-pack.c:1867
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin 不能和 --stdin 同時使用"
-#: builtin/index-pack.c:1783
+#: builtin/index-pack.c:1869
msgid "--stdin requires a git repository"
msgstr "--stdin 需要一個 git 版本庫"
-#: builtin/index-pack.c:1789
+#: builtin/index-pack.c:1871
+msgid "--object-format cannot be used with --stdin"
+msgstr "--object-format 不能和 --stdin 同時使用"
+
+#: builtin/index-pack.c:1886
msgid "--verify with no packfile name given"
msgstr "--verify 沒有提供 packfile 名稱參數"
-#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582
+#: builtin/index-pack.c:1956 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:275
+#, c-format
+msgid "invalid initial branch name: '%s'"
+msgstr "無效的初始分支名稱：'%s'"
+
+#: builtin/init-db.c:367
#, c-format
msgid "unable to handle file type %d"
msgstr "不能處理 %d 類型的檔案"
-#: builtin/init-db.c:337
+#: builtin/init-db.c:370
#, 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:386
+msgid "attempt to reinitialize repository with different hash"
+msgstr "嘗試以不同的雜湊值重新初始化版本庫"
+
+#: builtin/init-db.c:410 builtin/init-db.c:413
#, c-format
msgid "%s already exists"
msgstr "%s 已經存在"
-#: builtin/init-db.c:413
+#: builtin/init-db.c:445
+#, c-format
+msgid "re-init: ignored --initial-branch=%s"
+msgstr "re-init: 忽略 --initial-branch=%s"
+
+#: builtin/init-db.c:476
#, 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:477
#, 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:481
#, 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:482
#, 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:531
msgid ""
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
"shared[=<permissions>]] [<directory>]"
@@ -15026,36 +16353,56 @@
"git init [-q | --quiet] [--bare] [--template=<範本目錄>] [--shared[=<權限>]] "
"[<目錄>]"
-#: builtin/init-db.c:491
+#: builtin/init-db.c:557
msgid "permissions"
msgstr "權限"
-#: builtin/init-db.c:492
+#: builtin/init-db.c:558
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:564
+msgid "override the name of the initial branch"
+msgstr "覆蓋初始分支的名稱"
+
+#: builtin/init-db.c:565 builtin/verify-pack.c:74
+msgid "hash"
+msgstr "雜湊"
+
+#: builtin/init-db.c:566 builtin/show-index.c:22 builtin/verify-pack.c:75
+msgid "specify the hash algorithm to use"
+msgstr "指定要使用的雜湊算法"
+
+#: builtin/init-db.c:573
+msgid "--separate-git-dir and --bare are mutually exclusive"
+msgstr "--separate-git-dir 和 --bare 互斥"
+
+#: builtin/init-db.c:602 builtin/init-db.c:607
#, c-format
msgid "cannot mkdir %s"
msgstr "不能建立目錄 %s"
-#: builtin/init-db.c:538
+#: builtin/init-db.c:611 builtin/init-db.c:666
#, c-format
msgid "cannot chdir to %s"
msgstr "不能切換目錄到 %s"
-#: builtin/init-db.c:559
+#: builtin/init-db.c:638
#, 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:690
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "不能存取工作區 '%s'"
+#: builtin/init-db.c:695
+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 "
@@ -15120,126 +16467,130 @@
msgid "no input file given for in-place editing"
msgstr "沒有給出要原位編輯的檔案"
-#: builtin/log.c:56
+#: builtin/log.c:59
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<選項>] [<版本範圍>] [[--] <路徑>...]"
-#: builtin/log.c:57
+#: builtin/log.c:60
msgid "git show [<options>] <object>..."
msgstr "git show [<選項>] <物件>..."
-#: builtin/log.c:110
+#: builtin/log.c:113
#, c-format
msgid "invalid --decorate option: %s"
msgstr "無效的 --decorate 選項：%s"
-#: builtin/log.c:174
+#: builtin/log.c:180
msgid "show source"
msgstr "顯示源"
-#: builtin/log.c:175
-msgid "Use mail map file"
+#: builtin/log.c:181
+msgid "use mail map file"
msgstr "使用信件映射檔案"
-#: builtin/log.c:177
+#: builtin/log.c:184
msgid "only decorate refs that match <pattern>"
msgstr "只修飾與 <模式> 符合的引用"
-#: builtin/log.c:179
+#: builtin/log.c:186
msgid "do not decorate refs that match <pattern>"
msgstr "不修飾和 <模式> 符合的引用"
-#: builtin/log.c:180
+#: builtin/log.c:187
msgid "decorate options"
msgstr "修飾選項"
-#: builtin/log.c:183
-msgid "Process line range n,m in file, counting from 1"
-msgstr "處理檔案中第 n 到 m 之間的行，從 1 開始"
+#: builtin/log.c:190
+#, fuzzy
+#| msgid "Process only line range <start>,<end> or function :<funcname>"
+msgid ""
+"trace the evolution of line range <start>,<end> or function :<funcname> in "
+"<file>"
+msgstr "只處理範圍在 <開始>,<結尾> 的列，或是 :<函數名稱> 函數"
-#: builtin/log.c:281
+#: builtin/log.c:213
+msgid "-L<range>:<file> cannot be used with pathspec"
+msgstr "-L<範圍>:<檔案> 和 pathspec 不能同時使用"
+
+#: builtin/log.c:303
#, c-format
msgid "Final output: %d %s\n"
msgstr "最終輸出：%d %s\n"
-#: builtin/log.c:535
+#: builtin/log.c:566
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: 損壞的檔案"
-#: builtin/log.c:550 builtin/log.c:645
+#: builtin/log.c:581 builtin/log.c:671
#, c-format
msgid "could not read object %s"
msgstr "不能讀取物件 %s"
-#: builtin/log.c:670
+#: builtin/log.c:696
#, c-format
msgid "unknown type: %d"
msgstr "未知類型：%d"
-#: builtin/log.c:814
+#: builtin/log.c:841
#, c-format
msgid "%s: invalid cover from description mode"
msgstr "%s：從描述產生附函的模式無效"
-#: builtin/log.c:821
+#: builtin/log.c:848
msgid "format.headers without value"
msgstr "format.headers 沒有值"
-#: builtin/log.c:936
-msgid "name of output directory is too long"
-msgstr "輸出目錄名太長"
-
-#: builtin/log.c:952
+#: builtin/log.c:977
#, c-format
msgid "cannot open patch file %s"
msgstr "無法開啟修補檔案 %s"
-#: builtin/log.c:969
+#: builtin/log.c:994
msgid "need exactly one range"
msgstr "只需要一個範圍"
-#: builtin/log.c:979
+#: builtin/log.c:1004
msgid "not a range"
msgstr "不是一個範圍"
-#: builtin/log.c:1143
+#: builtin/log.c:1168
msgid "cover letter needs email format"
msgstr "附函需要信件位址格式"
-#: builtin/log.c:1149
+#: builtin/log.c:1174
msgid "failed to create cover-letter file"
msgstr "無法建立附函檔案"
-#: builtin/log.c:1228
+#: builtin/log.c:1261
#, c-format
msgid "insane in-reply-to: %s"
msgstr "不正常的 in-reply-to：%s"
-#: builtin/log.c:1255
+#: builtin/log.c:1288
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<選項>] [<從> | <版本範圍>]"
-#: builtin/log.c:1313
+#: builtin/log.c:1346
msgid "two output directories?"
msgstr "兩個輸出目錄？"
-#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211
+#: builtin/log.c:1497 builtin/log.c:2317 builtin/log.c:2319 builtin/log.c:2331
#, c-format
msgid "unknown commit %s"
msgstr "未知提交 %s"
-#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1508 builtin/replace.c:58 builtin/replace.c:207
#: builtin/replace.c:210
#, c-format
msgid "failed to resolve '%s' as a valid ref"
msgstr "無法將 '%s' 解析為一個有效引用"
-#: builtin/log.c:1439
+#: builtin/log.c:1517
msgid "could not find exact merge base"
msgstr "不能找到準確的合併基礎"
-#: builtin/log.c:1443
+#: builtin/log.c:1527
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"
@@ -15249,384 +16600,397 @@
"git branch --set-upstream-to 來追蹤一個遠端分支。或者你可以透過\n"
"參數 --base=<基礎提交> 手動指定一個基礎提交"
-#: builtin/log.c:1463
+#: builtin/log.c:1550
msgid "failed to find exact merge base"
msgstr "無法找到準確的合併基礎"
-#: builtin/log.c:1474
+#: builtin/log.c:1567
msgid "base commit should be the ancestor of revision list"
msgstr "基礎提交應該是版本列表的祖先"
-#: builtin/log.c:1478
+#: builtin/log.c:1577
msgid "base commit shouldn't be in revision list"
msgstr "基礎提交不應該出現在版本列表中"
-#: builtin/log.c:1531
+#: builtin/log.c:1635
msgid "cannot get patch id"
msgstr "無法得到修補檔 id"
-#: builtin/log.c:1583
-msgid "failed to infer range-diff ranges"
-msgstr "無法推斷 range-diff 範圍"
+#: builtin/log.c:1692
+msgid "failed to infer range-diff origin of current series"
+msgstr "無法推斷目前系列的 range-diff 起點"
-#: builtin/log.c:1629
+#: builtin/log.c:1694
+#, c-format
+msgid "using '%s' as range-diff origin of current series"
+msgstr "將 '%s' 當作目前系列的 range-diff 起點"
+
+#: builtin/log.c:1738
msgid "use [PATCH n/m] even with a single patch"
msgstr "使用 [PATCH n/m]，即使只有一個修補檔"
-#: builtin/log.c:1632
+#: builtin/log.c:1741
msgid "use [PATCH] even with multiple patches"
msgstr "使用 [PATCH]，即使有多個修補檔"
-#: builtin/log.c:1636
+#: builtin/log.c:1745
msgid "print patches to standard out"
msgstr "列印修補檔到標準輸出"
-#: builtin/log.c:1638
+#: builtin/log.c:1747
msgid "generate a cover letter"
msgstr "生成一封附函"
-#: builtin/log.c:1640
+#: builtin/log.c:1749
msgid "use simple number sequence for output file names"
msgstr "使用簡單的數字序列作為輸出檔案名"
-#: builtin/log.c:1641
+#: builtin/log.c:1750
msgid "sfx"
msgstr "後綴"
-#: builtin/log.c:1642
+#: builtin/log.c:1751
msgid "use <sfx> instead of '.patch'"
msgstr "使用 <後綴> 代替 '.patch'"
-#: builtin/log.c:1644
+#: builtin/log.c:1753
msgid "start numbering patches at <n> instead of 1"
msgstr "修補檔以 <n> 開始編號，而不是1"
-#: builtin/log.c:1646
+#: builtin/log.c:1755
msgid "mark the series as Nth re-roll"
msgstr "標記修補檔系列是第幾次重製"
-#: builtin/log.c:1648
-msgid "Use [RFC PATCH] instead of [PATCH]"
+#: builtin/log.c:1757
+msgid "max length of output filename"
+msgstr "輸出檔名的最大長度"
+
+#: builtin/log.c:1759
+msgid "use [RFC PATCH] instead of [PATCH]"
msgstr "使用 [RFC PATCH] 代替 [PATCH]"
-#: builtin/log.c:1651
+#: builtin/log.c:1762
msgid "cover-from-description-mode"
msgstr "從描述產生附函的模式"
-#: builtin/log.c:1652
+#: builtin/log.c:1763
msgid "generate parts of a cover letter based on a branch's description"
msgstr "基於分支描述產生部分附函"
-#: builtin/log.c:1654
-msgid "Use [<prefix>] instead of [PATCH]"
+#: builtin/log.c:1765
+msgid "use [<prefix>] instead of [PATCH]"
msgstr "使用 [<前綴>] 代替 [PATCH]"
-#: builtin/log.c:1657
+#: builtin/log.c:1768
msgid "store resulting files in <dir>"
msgstr "把結果檔案儲存在 <目錄>"
-#: builtin/log.c:1660
+#: builtin/log.c:1771
msgid "don't strip/add [PATCH]"
msgstr "不刪除/新增 [PATCH]"
-#: builtin/log.c:1663
+#: builtin/log.c:1774
msgid "don't output binary diffs"
msgstr "不輸出二進位差異"
-#: builtin/log.c:1665
+#: builtin/log.c:1776
msgid "output all-zero hash in From header"
msgstr "在 From 標頭訊息中輸出全為零的雜湊值"
-#: builtin/log.c:1667
+#: builtin/log.c:1778
msgid "don't include a patch matching a commit upstream"
msgstr "不包含已在上游提交中的修補檔"
-#: builtin/log.c:1669
+#: builtin/log.c:1780
msgid "show patch format instead of default (patch + stat)"
msgstr "顯示純修補檔格式而非預設的（修補檔+狀態）"
-#: builtin/log.c:1671
+#: builtin/log.c:1782
msgid "Messaging"
msgstr "信件傳送"
-#: builtin/log.c:1672
+#: builtin/log.c:1783
msgid "header"
msgstr "header"
-#: builtin/log.c:1673
+#: builtin/log.c:1784
msgid "add email header"
msgstr "新增信件頭"
-#: builtin/log.c:1674 builtin/log.c:1676
+#: builtin/log.c:1785 builtin/log.c:1786
msgid "email"
msgstr "信件位址"
-#: builtin/log.c:1674
+#: builtin/log.c:1785
msgid "add To: header"
msgstr "新增收件人"
-#: builtin/log.c:1676
+#: builtin/log.c:1786
msgid "add Cc: header"
msgstr "新增抄送"
-#: builtin/log.c:1678
+#: builtin/log.c:1787
msgid "ident"
msgstr "標記"
-#: builtin/log.c:1679
+#: builtin/log.c:1788
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "將 From 位址設定為 <標記>（如若不提供，則用提交者 ID 做為位址）"
-#: builtin/log.c:1681
+#: builtin/log.c:1790
msgid "message-id"
msgstr "信件標記"
-#: builtin/log.c:1682
+#: builtin/log.c:1791
msgid "make first mail a reply to <message-id>"
msgstr "使第一封信件作為對 <信件標記> 的回覆"
-#: builtin/log.c:1683 builtin/log.c:1686
+#: builtin/log.c:1792 builtin/log.c:1795
msgid "boundary"
msgstr "邊界"
-#: builtin/log.c:1684
+#: builtin/log.c:1793
msgid "attach the patch"
msgstr "附件方式新增修補檔"
-#: builtin/log.c:1687
+#: builtin/log.c:1796
msgid "inline the patch"
msgstr "內聯顯示修補檔"
-#: builtin/log.c:1691
+#: builtin/log.c:1800
msgid "enable message threading, styles: shallow, deep"
msgstr "啟用信件線索，風格：淺，深"
-#: builtin/log.c:1693
+#: builtin/log.c:1802
msgid "signature"
msgstr "簽名"
-#: builtin/log.c:1694
+#: builtin/log.c:1803
msgid "add a signature"
msgstr "新增一個簽名"
-#: builtin/log.c:1695
+#: builtin/log.c:1804
msgid "base-commit"
msgstr "基礎提交"
-#: builtin/log.c:1696
+#: builtin/log.c:1805
msgid "add prerequisite tree info to the patch series"
msgstr "為修補檔列表新增前置樹訊息"
-#: builtin/log.c:1698
+#: builtin/log.c:1808
msgid "add a signature from a file"
msgstr "從檔案新增一個簽名"
-#: builtin/log.c:1699
+#: builtin/log.c:1809
msgid "don't print the patch filenames"
msgstr "不要列印修補檔檔案名"
-#: builtin/log.c:1701
+#: builtin/log.c:1811
msgid "show progress while generating patches"
msgstr "在生成修補檔時顯示進度"
-#: builtin/log.c:1703
+#: builtin/log.c:1813
msgid "show changes against <rev> in cover letter or single patch"
msgstr "在附函或單個修補檔中顯示和 <rev> 的差異"
-#: builtin/log.c:1706
+#: builtin/log.c:1816
msgid "show changes against <refspec> in cover letter or single patch"
msgstr "在附函或單個修補檔中顯示和 <refspec> 的差異"
-#: builtin/log.c:1708
+#: builtin/log.c:1818
msgid "percentage by which creation is weighted"
msgstr "建立權重的百分比"
-#: builtin/log.c:1792
+#: builtin/log.c:1904
#, c-format
msgid "invalid ident line: %s"
msgstr "包含無效的身份標記：%s"
-#: builtin/log.c:1807
+#: builtin/log.c:1919
msgid "-n and -k are mutually exclusive"
msgstr "-n 和 -k 互斥"
-#: builtin/log.c:1809
+#: builtin/log.c:1921
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
msgstr "--subject-prefix/--rfc 和 -k 互斥"
-#: builtin/log.c:1817
+#: builtin/log.c:1929
msgid "--name-only does not make sense"
msgstr "--name-only 無意義"
-#: builtin/log.c:1819
+#: builtin/log.c:1931
msgid "--name-status does not make sense"
msgstr "--name-status 無意義"
-#: builtin/log.c:1821
+#: builtin/log.c:1933
msgid "--check does not make sense"
msgstr "--check 無意義"
-#: builtin/log.c:1854
-msgid "standard output, or directory, which one?"
-msgstr "標準輸出或目錄，哪一個？"
+#: builtin/log.c:1955
+msgid "--stdout, --output, and --output-directory are mutually exclusive"
+msgstr "--stdout、--output 和 --output-directory 互斥"
-#: builtin/log.c:1958
+#: builtin/log.c:2078
msgid "--interdiff requires --cover-letter or single patch"
msgstr "--interdiff 需要 --cover-letter 或單一修補檔"
-#: builtin/log.c:1962
+#: builtin/log.c:2082
msgid "Interdiff:"
msgstr "版本間差異："
-#: builtin/log.c:1963
+#: builtin/log.c:2083
#, c-format
msgid "Interdiff against v%d:"
msgstr "對 v%d 的版本差異："
-#: builtin/log.c:1969
+#: builtin/log.c:2089
msgid "--creation-factor requires --range-diff"
msgstr "--creation-factor 需要 --range-diff"
-#: builtin/log.c:1973
+#: builtin/log.c:2093
msgid "--range-diff requires --cover-letter or single patch"
msgstr "--range-diff 需要 --cover-letter 或單一修補檔"
-#: builtin/log.c:1981
+#: builtin/log.c:2101
msgid "Range-diff:"
msgstr "範圍差異："
-#: builtin/log.c:1982
+#: builtin/log.c:2102
#, c-format
msgid "Range-diff against v%d:"
msgstr "對 v%d 的範圍差異："
-#: builtin/log.c:1993
+#: builtin/log.c:2113
#, c-format
msgid "unable to read signature file '%s'"
msgstr "無法讀取簽名檔案 '%s'"
-#: builtin/log.c:2029
+#: builtin/log.c:2149
msgid "Generating patches"
msgstr "生成修補檔"
-#: builtin/log.c:2073
+#: builtin/log.c:2193
msgid "failed to create output files"
msgstr "無法建立輸出檔案"
-#: builtin/log.c:2132
+#: builtin/log.c:2252
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<上游> [<頭> [<限制>]]]"
-#: builtin/log.c:2186
+#: builtin/log.c:2306
#, 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:486
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<選項>] [<檔案>...]"
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:542
msgid "identify the file status with tags"
msgstr "用標籤標記檔案的狀態"
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:544
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "使用小寫字母表示 '假設未改變的' 檔案"
-#: builtin/ls-files.c:530
+#: builtin/ls-files.c:546
msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr "使用小寫字母表示 'fsmonitor clean' 檔案"
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:548
msgid "show cached files in the output (default)"
msgstr "顯示快取的檔案（預設）"
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:550
msgid "show deleted files in the output"
msgstr "顯示已刪除的檔案"
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:552
msgid "show modified files in the output"
msgstr "顯示已修改的檔案"
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:554
msgid "show other files in the output"
msgstr "顯示其它檔案"
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:556
msgid "show ignored files in the output"
msgstr "顯示忽略的檔案"
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:559
msgid "show staged contents' object name in the output"
msgstr "顯示暫存區內容的物件名稱"
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:561
msgid "show files on the filesystem that need to be removed"
msgstr "顯示檔案系統需要刪除的檔案"
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:563
msgid "show 'other' directories' names only"
msgstr "只顯示「其他」目錄的名稱"
-#: builtin/ls-files.c:549
+#: builtin/ls-files.c:565
msgid "show line endings of files"
msgstr "顯示檔案換行符號格式"
-#: builtin/ls-files.c:551
+#: builtin/ls-files.c:567
msgid "don't show empty directories"
msgstr "不顯示空目錄"
-#: builtin/ls-files.c:554
+#: builtin/ls-files.c:570
msgid "show unmerged files in the output"
msgstr "顯示未合併的檔案"
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:572
msgid "show resolve-undo information"
msgstr "顯示 resolve-undo 訊息"
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:574
msgid "skip files matching pattern"
msgstr "符合排除檔案的模式"
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:577
msgid "exclude patterns are read from <file>"
msgstr "從 <檔案> 中讀取排除模式"
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:580
msgid "read additional per-directory exclude patterns in <file>"
msgstr "從 <檔案> 讀取額外的每個目錄的排除模式"
-#: builtin/ls-files.c:566
+#: builtin/ls-files.c:582
msgid "add the standard git exclusions"
msgstr "新增標準的 git 排除"
-#: builtin/ls-files.c:570
+#: builtin/ls-files.c:586
msgid "make the output relative to the project top directory"
msgstr "顯示相對於頂級目錄的檔案名"
-#: builtin/ls-files.c:573
+#: builtin/ls-files.c:589
msgid "recurse through submodules"
msgstr "在子模組中遞迴"
-#: builtin/ls-files.c:575
+#: builtin/ls-files.c:591
msgid "if any <file> is not in the index, treat this as an error"
msgstr "如果任何 <檔案> 都不在索引區，視為錯誤"
-#: builtin/ls-files.c:576
+#: builtin/ls-files.c:592
msgid "tree-ish"
msgstr "樹或提交"
-#: builtin/ls-files.c:577
+#: builtin/ls-files.c:593
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "假裝自從 <樹或提交> 之後刪除的路徑仍然存在"
-#: builtin/ls-files.c:579
+#: builtin/ls-files.c:595
msgid "show debugging data"
msgstr "顯示除錯資料"
+#: builtin/ls-files.c:597
+msgid "suppress duplicate entries"
+msgstr "不顯示重複項目"
+
#: builtin/ls-remote.c:9
msgid ""
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
@@ -15637,39 +17001,39 @@
" [-q | --quiet] [--exit-code] [--get-url]\n"
" [--symref] [<版本庫> [<引用>...]]"
-#: builtin/ls-remote.c:59
+#: builtin/ls-remote.c:60
msgid "do not print remote URL"
msgstr "不列印遠端 URL"
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1404
msgid "exec"
msgstr "exec"
-#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
+#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
msgid "path of git-upload-pack on the remote host"
msgstr "遠端主機上的 git-upload-pack 路徑"
-#: builtin/ls-remote.c:65
+#: builtin/ls-remote.c:66
msgid "limit to tags"
msgstr "僅限於標籤"
-#: builtin/ls-remote.c:66
+#: builtin/ls-remote.c:67
msgid "limit to heads"
msgstr "僅限於分支"
-#: builtin/ls-remote.c:67
+#: builtin/ls-remote.c:68
msgid "do not show peeled tags"
msgstr "不顯示已解析的標籤"
-#: builtin/ls-remote.c:69
+#: builtin/ls-remote.c:70
msgid "take url.<base>.insteadOf into account"
msgstr "參考 url.<base>.insteadOf 設定"
-#: builtin/ls-remote.c:72
+#: builtin/ls-remote.c:73
msgid "exit with exit code 2 if no matching refs are found"
msgstr "若未找到符合的引用則以離開碼2離開"
-#: builtin/ls-remote.c:75
+#: builtin/ls-remote.c:76
msgid "show underlying ref in addition to the object pointed by it"
msgstr "除了顯示指向的物件外，顯示指向的引用名"
@@ -15714,386 +17078,6 @@
msgid "empty mbox: '%s'"
msgstr "空的 mbox：'%s'"
-#: builtin/merge.c:55
-msgid "git merge [<options>] [<commit>...]"
-msgstr "git merge [<選項>] [<提交>...]"
-
-#: builtin/merge.c:56
-msgid "git merge --abort"
-msgstr "git merge --abort"
-
-#: builtin/merge.c:57
-msgid "git merge --continue"
-msgstr "git merge --continue"
-
-#: builtin/merge.c:119
-msgid "switch `m' requires a value"
-msgstr "開關 `m' 需要一個值"
-
-#: builtin/merge.c:142
-#, c-format
-msgid "option `%s' requires a value"
-msgstr "選項 `%s' 需要一個值"
-
-#: builtin/merge.c:188
-#, c-format
-msgid "Could not find merge strategy '%s'.\n"
-msgstr "不能找到合併策略 '%s'。\n"
-
-#: builtin/merge.c:189
-#, c-format
-msgid "Available strategies are:"
-msgstr "可用的策略有："
-
-#: builtin/merge.c:194
-#, c-format
-msgid "Available custom strategies are:"
-msgstr "可用的自訂策略有："
-
-#: builtin/merge.c:245 builtin/pull.c:132
-msgid "do not show a diffstat at the end of the merge"
-msgstr "在合併的最後不顯示差異統計"
-
-#: builtin/merge.c:248 builtin/pull.c:135
-msgid "show a diffstat at the end of the merge"
-msgstr "在合併的最後顯示差異統計"
-
-#: builtin/merge.c:249 builtin/pull.c:138
-msgid "(synonym to --stat)"
-msgstr "（和 --stat 同義）"
-
-#: builtin/merge.c:251 builtin/pull.c:141
-msgid "add (at most <n>) entries from shortlog to merge commit message"
-msgstr "在合併提交訊息中新增（最多 <n> 條）精簡提交記錄"
-
-#: builtin/merge.c:254 builtin/pull.c:147
-msgid "create a single commit instead of doing a merge"
-msgstr "建立一個單獨的提交而不是做一次合併"
-
-#: builtin/merge.c:256 builtin/pull.c:150
-msgid "perform a commit if the merge succeeds (default)"
-msgstr "如果合併成功，執行一次提交（預設）"
-
-#: builtin/merge.c:258 builtin/pull.c:153
-msgid "edit message before committing"
-msgstr "在提交前編輯提交說明"
-
-#: builtin/merge.c:260
-msgid "allow fast-forward (default)"
-msgstr "允許快轉（預設）"
-
-#: builtin/merge.c:262 builtin/pull.c:160
-msgid "abort if fast-forward is not possible"
-msgstr "如果不能快轉就放棄合併"
-
-#: builtin/merge.c:266 builtin/pull.c:163
-msgid "verify that the named commit has a valid GPG signature"
-msgstr "驗證指定的提交是否包含一個有效的 GPG 簽名"
-
-#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167
-#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114
-msgid "strategy"
-msgstr "策略"
-
-#: builtin/merge.c:268 builtin/pull.c:168
-msgid "merge strategy to use"
-msgstr "要使用的合併策略"
-
-#: builtin/merge.c:269 builtin/pull.c:171
-msgid "option=value"
-msgstr "option=value"
-
-#: builtin/merge.c:270 builtin/pull.c:172
-msgid "option for selected merge strategy"
-msgstr "所選的合併策略的選項"
-
-#: builtin/merge.c:272
-msgid "merge commit message (for a non-fast-forward merge)"
-msgstr "合併的提交說明（針對非快轉式合併）"
-
-#: builtin/merge.c:279
-msgid "abort the current in-progress merge"
-msgstr "放棄目前正在進行的合併"
-
-#
-#: builtin/merge.c:281
-msgid "--abort but leave index and working tree alone"
-msgstr "--abort，但是保留索引和工作區"
-
-#: builtin/merge.c:283
-msgid "continue the current in-progress merge"
-msgstr "繼續目前正在進行的合併"
-
-#: builtin/merge.c:285 builtin/pull.c:179
-msgid "allow merging unrelated histories"
-msgstr "允許合並不相關的歷史"
-
-#: builtin/merge.c:291
-msgid "bypass pre-merge-commit and commit-msg hooks"
-msgstr "繞過 pre-merge-commit 和 commit-msg 掛鉤"
-
-#: builtin/merge.c:308
-msgid "could not run stash."
-msgstr "不能執行儲藏。"
-
-#: builtin/merge.c:313
-msgid "stash failed"
-msgstr "儲藏失敗"
-
-#: builtin/merge.c:318
-#, c-format
-msgid "not a valid object: %s"
-msgstr "不是一個有效物件：%s"
-
-#: builtin/merge.c:340 builtin/merge.c:357
-msgid "read-tree failed"
-msgstr "讀取樹失敗"
-
-# 譯者：請維持前導空格
-#: builtin/merge.c:387
-msgid " (nothing to squash)"
-msgstr " （無可壓縮）"
-
-#: builtin/merge.c:398
-#, c-format
-msgid "Squash commit -- not updating HEAD\n"
-msgstr "壓縮提交 -- 未更新 HEAD\n"
-
-#: builtin/merge.c:448
-#, c-format
-msgid "No merge message -- not updating HEAD\n"
-msgstr "無合併訊息 -- 未更新 HEAD\n"
-
-#: builtin/merge.c:499
-#, c-format
-msgid "'%s' does not point to a commit"
-msgstr "'%s' 沒有指向一個提交"
-
-#: builtin/merge.c:586
-#, c-format
-msgid "Bad branch.%s.mergeoptions string: %s"
-msgstr "壞的 branch.%s.mergeoptions 字串：%s"
-
-#: builtin/merge.c:708
-msgid "Not handling anything other than two heads merge."
-msgstr "未處理兩個頭合併之外的任何動作。"
-
-#: builtin/merge.c:722
-#, c-format
-msgid "Unknown option for merge-recursive: -X%s"
-msgstr "merge-recursive 的未知選項：-X%s"
-
-#: builtin/merge.c:737
-#, c-format
-msgid "unable to write %s"
-msgstr "不能寫 %s"
-
-#: builtin/merge.c:789
-#, c-format
-msgid "Could not read from '%s'"
-msgstr "不能從 '%s' 讀取"
-
-#: builtin/merge.c:798
-#, c-format
-msgid "Not committing merge; use 'git commit' to complete the merge.\n"
-msgstr "未提交合並，使用 'git commit' 完成此次合併。\n"
-
-#: builtin/merge.c:804
-msgid ""
-"Please enter a commit message to explain why this merge is necessary,\n"
-"especially if it merges an updated upstream into a topic branch.\n"
-"\n"
-msgstr ""
-"請輸入一個提交訊息以解釋此合併的必要性，尤其是將一個更新後的上游分支\n"
-"合併到主題分支。\n"
-"\n"
-
-#: builtin/merge.c:809
-msgid "An empty message aborts the commit.\n"
-msgstr "空的提交說明會終止提交。\n"
-
-#: builtin/merge.c:812
-#, c-format
-msgid ""
-"Lines starting with '%c' will be ignored, and an empty message aborts\n"
-"the commit.\n"
-msgstr "以 '%c' 開始的行將被忽略，而空的提交說明將終止提交。\n"
-
-#: builtin/merge.c:865
-msgid "Empty commit message."
-msgstr "空提交訊息。"
-
-#: builtin/merge.c:880
-#, c-format
-msgid "Wonderful.\n"
-msgstr "太棒了。\n"
-
-#: builtin/merge.c:941
-#, c-format
-msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
-msgstr "自動合併失敗，修正衝突然後提交修正的結果。\n"
-
-#: builtin/merge.c:980
-msgid "No current branch."
-msgstr "沒有目前分支。"
-
-#: builtin/merge.c:982
-msgid "No remote for the current branch."
-msgstr "目前分支沒有對應的遠端版本庫。"
-
-#: builtin/merge.c:984
-msgid "No default upstream defined for the current branch."
-msgstr "目前分支沒有定義預設的上游分支。"
-
-#: builtin/merge.c:989
-#, c-format
-msgid "No remote-tracking branch for %s from %s"
-msgstr "對於 %s 沒有來自 %s 的遠端追蹤分支"
-
-#: builtin/merge.c:1046
-#, c-format
-msgid "Bad value '%s' in environment '%s'"
-msgstr "環境 '%2$s' 中存在壞的取值 '%1$s'"
-
-#: builtin/merge.c:1149
-#, c-format
-msgid "not something we can merge in %s: %s"
-msgstr "不能在 %s 中合併：%s"
-
-#: builtin/merge.c:1183
-msgid "not something we can merge"
-msgstr "不能合併"
-
-#: builtin/merge.c:1286
-msgid "--abort expects no arguments"
-msgstr "--abort 不帶參數"
-
-#: builtin/merge.c:1290
-msgid "There is no merge to abort (MERGE_HEAD missing)."
-msgstr "沒有要終止的合併（MERGE_HEAD 遺失）。"
-
-#: builtin/merge.c:1299
-msgid "--quit expects no arguments"
-msgstr "--quit 不帶參數"
-
-#: builtin/merge.c:1312
-msgid "--continue expects no arguments"
-msgstr "--continue 不帶參數"
-
-#: builtin/merge.c:1316
-msgid "There is no merge in progress (MERGE_HEAD missing)."
-msgstr "沒有進行中的合併（MERGE_HEAD 遺失）。"
-
-#: builtin/merge.c:1332
-msgid ""
-"You have not concluded your merge (MERGE_HEAD exists).\n"
-"Please, commit your changes before you merge."
-msgstr ""
-"您尚未結束您的合併（存在 MERGE_HEAD）。\n"
-"請在合併前先提交您的修改。"
-
-#: builtin/merge.c:1339
-msgid ""
-"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
-"Please, commit your changes before you merge."
-msgstr ""
-"您尚未結束您的揀選（存在 CHERRY_PICK_HEAD）。\n"
-"請在合併前先提交您的修改。"
-
-#: builtin/merge.c:1342
-msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
-msgstr "您尚未結束您的揀選（存在 CHERRY_PICK_HEAD）。"
-
-#: builtin/merge.c:1356
-msgid "You cannot combine --squash with --no-ff."
-msgstr "您不能將 --squash 和 --no-ff 組合使用。"
-
-#: builtin/merge.c:1358
-msgid "You cannot combine --squash with --commit."
-msgstr "您不能將 --squash 和 --commit 組合使用。"
-
-#: builtin/merge.c:1374
-msgid "No commit specified and merge.defaultToUpstream not set."
-msgstr "未指定提交並且 merge.defaultToUpstream 未設定。"
-
-#: builtin/merge.c:1391
-msgid "Squash commit into empty head not supported yet"
-msgstr "尚不支援到空分支的壓縮提交"
-
-#: builtin/merge.c:1393
-msgid "Non-fast-forward commit does not make sense into an empty head"
-msgstr "到空分支的非快轉式提交沒有意義"
-
-#: builtin/merge.c:1398
-#, c-format
-msgid "%s - not something we can merge"
-msgstr "%s - 不能被合併"
-
-#: builtin/merge.c:1400
-msgid "Can merge only exactly one commit into empty head"
-msgstr "只能將一個提交合並到空分支上"
-
-#: builtin/merge.c:1481
-msgid "refusing to merge unrelated histories"
-msgstr "拒絕合併無關的歷史"
-
-#: builtin/merge.c:1490
-msgid "Already up to date."
-msgstr "已經是最新的。"
-
-#: builtin/merge.c:1500
-#, c-format
-msgid "Updating %s..%s\n"
-msgstr "更新 %s..%s\n"
-
-#: builtin/merge.c:1542
-#, c-format
-msgid "Trying really trivial in-index merge...\n"
-msgstr "嘗試非常小的索引內合併...\n"
-
-#: builtin/merge.c:1549
-#, c-format
-msgid "Nope.\n"
-msgstr "無。\n"
-
-#: builtin/merge.c:1574
-msgid "Already up to date. Yeeah!"
-msgstr "已經是最新的。耶！"
-
-#: builtin/merge.c:1580
-msgid "Not possible to fast-forward, aborting."
-msgstr "無法快轉，終止。"
-
-#: builtin/merge.c:1603 builtin/merge.c:1668
-#, c-format
-msgid "Rewinding the tree to pristine...\n"
-msgstr "將樹回滾至原始狀態...\n"
-
-#: builtin/merge.c:1607
-#, c-format
-msgid "Trying merge strategy %s...\n"
-msgstr "嘗試合併策略 %s...\n"
-
-#: builtin/merge.c:1659
-#, c-format
-msgid "No merge strategy handled the merge.\n"
-msgstr "沒有合併策略處理此合併。\n"
-
-#: builtin/merge.c:1661
-#, c-format
-msgid "Merge with strategy %s failed.\n"
-msgstr "使用策略 %s 合併失敗。\n"
-
-#: builtin/merge.c:1670
-#, c-format
-msgid "Using the %s to prepare resolving by hand.\n"
-msgstr "使用 %s 以準備手動解決。\n"
-
-#: builtin/merge.c:1682
-#, c-format
-msgid "Automatic merge went well; stopped before committing as requested\n"
-msgstr "自動合併進展順利，按要求在提交前停止\n"
-
#: builtin/merge-base.c:32
msgid "git merge-base [-a | --all] <commit> <commit>..."
msgstr "git merge-base [-a | --all] <提交> <提交>..."
@@ -16114,23 +17098,23 @@
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <引用> [<提交>]"
-#: builtin/merge-base.c:153
+#: builtin/merge-base.c:143
msgid "output all common ancestors"
msgstr "輸出所有共同的祖先"
-#: builtin/merge-base.c:155
+#: builtin/merge-base.c:145
msgid "find ancestors for a single n-way merge"
msgstr "尋找一個多路合併的祖先提交"
-#: builtin/merge-base.c:157
+#: builtin/merge-base.c:147
msgid "list revs not reachable from others"
msgstr "顯示不能被其他存取到的版本"
-#: builtin/merge-base.c:159
+#: builtin/merge-base.c:149
msgid "is the first one ancestor of the other?"
msgstr "第一個是其他的祖先提交嗎？"
-#: builtin/merge-base.c:161
+#: builtin/merge-base.c:151
msgid "find where <commit> forked from reflog of <ref>"
msgstr "根據 <引用> 的引用日誌尋找 <提交> 的衍生處"
@@ -16204,6 +17188,427 @@
msgid "Merging %s with %s\n"
msgstr "合併 %s 和 %s\n"
+#: builtin/merge.c:58
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<選項>] [<提交>...]"
+
+#: builtin/merge.c:59
+msgid "git merge --abort"
+msgstr "git merge --abort"
+
+#: builtin/merge.c:60
+msgid "git merge --continue"
+msgstr "git merge --continue"
+
+#: builtin/merge.c:123
+msgid "switch `m' requires a value"
+msgstr "開關 `m' 需要一個值"
+
+#: builtin/merge.c:146
+#, c-format
+msgid "option `%s' requires a value"
+msgstr "選項 `%s' 需要一個值"
+
+#: builtin/merge.c:199
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr "不能找到合併策略 '%s'。\n"
+
+#: builtin/merge.c:200
+#, c-format
+msgid "Available strategies are:"
+msgstr "可用的策略有："
+
+#: builtin/merge.c:205
+#, c-format
+msgid "Available custom strategies are:"
+msgstr "可用的自訂策略有："
+
+#: builtin/merge.c:256 builtin/pull.c:133
+msgid "do not show a diffstat at the end of the merge"
+msgstr "在合併的最後不顯示差異統計"
+
+#: builtin/merge.c:259 builtin/pull.c:136
+msgid "show a diffstat at the end of the merge"
+msgstr "在合併的最後顯示差異統計"
+
+#: builtin/merge.c:260 builtin/pull.c:139
+msgid "(synonym to --stat)"
+msgstr "（和 --stat 同義）"
+
+#: builtin/merge.c:262 builtin/pull.c:142
+msgid "add (at most <n>) entries from shortlog to merge commit message"
+msgstr "在合併提交訊息中新增（最多 <n> 條）精簡提交記錄"
+
+#: builtin/merge.c:265 builtin/pull.c:148
+msgid "create a single commit instead of doing a merge"
+msgstr "建立一個單獨的提交而不是做一次合併"
+
+#: builtin/merge.c:267 builtin/pull.c:151
+msgid "perform a commit if the merge succeeds (default)"
+msgstr "如果合併成功，執行一次提交（預設）"
+
+#: builtin/merge.c:269 builtin/pull.c:154
+msgid "edit message before committing"
+msgstr "在提交前編輯提交說明"
+
+#: builtin/merge.c:271
+msgid "allow fast-forward (default)"
+msgstr "允許快轉（預設）"
+
+#: builtin/merge.c:273 builtin/pull.c:161
+msgid "abort if fast-forward is not possible"
+msgstr "如果不能快轉就放棄合併"
+
+#: builtin/merge.c:277 builtin/pull.c:164
+msgid "verify that the named commit has a valid GPG signature"
+msgstr "驗證指定的提交是否包含一個有效的 GPG 簽名"
+
+#: builtin/merge.c:278 builtin/notes.c:787 builtin/pull.c:168
+#: builtin/rebase.c:541 builtin/rebase.c:1418 builtin/revert.c:114
+msgid "strategy"
+msgstr "策略"
+
+#: builtin/merge.c:279 builtin/pull.c:169
+msgid "merge strategy to use"
+msgstr "要使用的合併策略"
+
+#: builtin/merge.c:280 builtin/pull.c:172
+msgid "option=value"
+msgstr "option=value"
+
+#: builtin/merge.c:281 builtin/pull.c:173
+msgid "option for selected merge strategy"
+msgstr "所選的合併策略的選項"
+
+#: builtin/merge.c:283
+msgid "merge commit message (for a non-fast-forward merge)"
+msgstr "合併的提交說明（針對非快轉式合併）"
+
+#: builtin/merge.c:290
+msgid "abort the current in-progress merge"
+msgstr "放棄目前正在進行的合併"
+
+#
+#: builtin/merge.c:292
+msgid "--abort but leave index and working tree alone"
+msgstr "--abort，但是保留索引和工作區"
+
+#: builtin/merge.c:294
+msgid "continue the current in-progress merge"
+msgstr "繼續目前正在進行的合併"
+
+#: builtin/merge.c:296 builtin/pull.c:180
+msgid "allow merging unrelated histories"
+msgstr "允許合並不相關的歷史"
+
+#: builtin/merge.c:303
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr "繞過 pre-merge-commit 和 commit-msg 掛鉤"
+
+#: builtin/merge.c:320
+msgid "could not run stash."
+msgstr "不能執行儲藏。"
+
+#: builtin/merge.c:325
+msgid "stash failed"
+msgstr "儲藏失敗"
+
+#: builtin/merge.c:330
+#, c-format
+msgid "not a valid object: %s"
+msgstr "不是一個有效物件：%s"
+
+#: builtin/merge.c:352 builtin/merge.c:369
+msgid "read-tree failed"
+msgstr "讀取樹失敗"
+
+# 譯者：請維持前導空格
+#: builtin/merge.c:399
+msgid " (nothing to squash)"
+msgstr " （無可壓縮）"
+
+#: builtin/merge.c:410
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr "壓縮提交 -- 未更新 HEAD\n"
+
+#: builtin/merge.c:460
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr "無合併訊息 -- 未更新 HEAD\n"
+
+#: builtin/merge.c:511
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr "'%s' 沒有指向一個提交"
+
+#: builtin/merge.c:598
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr "壞的 branch.%s.mergeoptions 字串：%s"
+
+#: builtin/merge.c:724
+msgid "Not handling anything other than two heads merge."
+msgstr "未處理兩個頭合併之外的任何動作。"
+
+#: builtin/merge.c:737
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr "merge-recursive 的未知選項：-X%s"
+
+#: builtin/merge.c:756 t/helper/test-fast-rebase.c:209
+#, c-format
+msgid "unable to write %s"
+msgstr "不能寫 %s"
+
+#: builtin/merge.c:808
+#, c-format
+msgid "Could not read from '%s'"
+msgstr "不能從 '%s' 讀取"
+
+#: builtin/merge.c:817
+#, c-format
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+msgstr "未提交合並，使用 'git commit' 完成此次合併。\n"
+
+#: builtin/merge.c:823
+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:828
+msgid "An empty message aborts the commit.\n"
+msgstr "空的提交說明會終止提交。\n"
+
+#: builtin/merge.c:831
+#, 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:884
+msgid "Empty commit message."
+msgstr "空提交訊息。"
+
+#: builtin/merge.c:899
+#, c-format
+msgid "Wonderful.\n"
+msgstr "太棒了。\n"
+
+#: builtin/merge.c:960
+#, c-format
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgstr "自動合併失敗，修正衝突然後提交修正的結果。\n"
+
+#: builtin/merge.c:999
+msgid "No current branch."
+msgstr "沒有目前分支。"
+
+#: builtin/merge.c:1001
+msgid "No remote for the current branch."
+msgstr "目前分支沒有對應的遠端版本庫。"
+
+#: builtin/merge.c:1003
+msgid "No default upstream defined for the current branch."
+msgstr "目前分支沒有定義預設的上游分支。"
+
+#: builtin/merge.c:1008
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
+msgstr "對於 %s 沒有來自 %s 的遠端追蹤分支"
+
+#: builtin/merge.c:1065
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "環境 '%2$s' 中存在壞的取值 '%1$s'"
+
+#: builtin/merge.c:1168
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr "不能在 %s 中合併：%s"
+
+#: builtin/merge.c:1202
+msgid "not something we can merge"
+msgstr "不能合併"
+
+#: builtin/merge.c:1312
+msgid "--abort expects no arguments"
+msgstr "--abort 不帶參數"
+
+#: builtin/merge.c:1316
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr "沒有要終止的合併（MERGE_HEAD 遺失）。"
+
+#: builtin/merge.c:1334
+msgid "--quit expects no arguments"
+msgstr "--quit 不帶參數"
+
+#: builtin/merge.c:1347
+msgid "--continue expects no arguments"
+msgstr "--continue 不帶參數"
+
+#: builtin/merge.c:1351
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr "沒有進行中的合併（MERGE_HEAD 遺失）。"
+
+#: builtin/merge.c:1367
+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:1374
+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:1377
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+msgstr "您尚未結束您的揀選（存在 CHERRY_PICK_HEAD）。"
+
+#: builtin/merge.c:1391
+msgid "You cannot combine --squash with --no-ff."
+msgstr "您不能將 --squash 和 --no-ff 組合使用。"
+
+#: builtin/merge.c:1393
+msgid "You cannot combine --squash with --commit."
+msgstr "您不能將 --squash 和 --commit 組合使用。"
+
+#: builtin/merge.c:1409
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr "未指定提交並且 merge.defaultToUpstream 未設定。"
+
+#: builtin/merge.c:1426
+msgid "Squash commit into empty head not supported yet"
+msgstr "尚不支援到空分支的壓縮提交"
+
+#: builtin/merge.c:1428
+msgid "Non-fast-forward commit does not make sense into an empty head"
+msgstr "到空分支的非快轉式提交沒有意義"
+
+#: builtin/merge.c:1433
+#, c-format
+msgid "%s - not something we can merge"
+msgstr "%s - 不能被合併"
+
+#: builtin/merge.c:1435
+msgid "Can merge only exactly one commit into empty head"
+msgstr "只能將一個提交合並到空分支上"
+
+#: builtin/merge.c:1516
+msgid "refusing to merge unrelated histories"
+msgstr "拒絕合併無關的歷史"
+
+#: builtin/merge.c:1525
+msgid "Already up to date."
+msgstr "已經是最新的。"
+
+#: builtin/merge.c:1535
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr "更新 %s..%s\n"
+
+#: builtin/merge.c:1581
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr "嘗試非常小的索引內合併...\n"
+
+#: builtin/merge.c:1588
+#, c-format
+msgid "Nope.\n"
+msgstr "無。\n"
+
+#: builtin/merge.c:1613
+msgid "Already up to date. Yeeah!"
+msgstr "已經是最新的。耶！"
+
+#: builtin/merge.c:1619
+msgid "Not possible to fast-forward, aborting."
+msgstr "無法快轉，終止。"
+
+#: builtin/merge.c:1647 builtin/merge.c:1712
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr "將樹回滾至原始狀態...\n"
+
+#: builtin/merge.c:1651
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr "嘗試合併策略 %s...\n"
+
+#: builtin/merge.c:1703
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr "沒有合併策略處理此合併。\n"
+
+#: builtin/merge.c:1705
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr "使用策略 %s 合併失敗。\n"
+
+#: builtin/merge.c:1714
+#, c-format
+msgid "Using the %s to prepare resolving by hand.\n"
+msgstr "使用 %s 以準備手動解決。\n"
+
+#: builtin/merge.c:1728
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
+msgstr "自動合併進展順利，按要求在提交前停止\n"
+
+#: builtin/mktag.c:10
+msgid "git mktag"
+msgstr "git mktag"
+
+#: builtin/mktag.c:30
+#, c-format
+msgid "warning: tag input does not pass fsck: %s"
+msgstr "警告：標籤輸入未通過 fsck：%s"
+
+#: builtin/mktag.c:41
+#, c-format
+msgid "error: tag input does not pass fsck: %s"
+msgstr "錯誤：標籤輸入未通過 fsck：%s"
+
+#: builtin/mktag.c:44
+#, c-format
+msgid "%d (FSCK_IGNORE?) should never trigger this callback"
+msgstr "%d (FSCK_IGNORE?) 不應觸發這個回呼函式"
+
+#: builtin/mktag.c:59
+#, c-format
+msgid "could not read tagged object '%s'"
+msgstr "無法讀取有標籤的物件「%s」"
+
+#: builtin/mktag.c:62
+#, c-format
+msgid "object '%s' tagged as '%s', but is a '%s' type"
+msgstr "「%s」已標為「%s」，但卻是「%s」類型"
+
+#: builtin/mktag.c:99
+msgid "tag on stdin did not pass our strict fsck check"
+msgstr "stdin 上的標籤未通過我們的嚴格 fsck 檢查"
+
+#: builtin/mktag.c:102
+msgid "tag on stdin did not refer to a valid object"
+msgstr "標準輸入上的標籤參考的不是有效物件"
+
+#: builtin/mktag.c:105 builtin/tag.c:232
+msgid "unable to write tag file"
+msgstr "無法寫標籤檔案"
+
#: builtin/mktree.c:66
msgid "git mktree [-z] [--missing] [--batch]"
msgstr "git mktree [-z] [--missing] [--batch]"
@@ -16238,7 +17643,10 @@
"larger than this size"
msgstr "在 repack 期間，將較小尺寸的包檔案收集到大於此大小的批次中"
-#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67
+#: builtin/multi-pack-index.c:50 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 builtin/prune-packed.c:25 builtin/tag.c:575
msgid "too many arguments"
msgstr "太多參數"
@@ -16277,68 +17685,72 @@
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:781 builtin/repack.c:518
+#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:483
#, c-format
msgid "renaming '%s' failed"
msgstr "重新命名 '%s' 失敗"
@@ -16356,8 +17768,8 @@
msgstr "git name-rev [<選項>] --stdin"
#: builtin/name-rev.c:524
-msgid "print only names (no SHA-1)"
-msgstr "只列印名稱（無 SHA-1）"
+msgid "print only ref-based names (no object names)"
+msgstr "只輸出基於參考的名稱 (沒有物件名稱)"
#: builtin/name-rev.c:525
msgid "only use tags to name the commits"
@@ -16527,7 +17939,7 @@
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:565
#, c-format
msgid "could not open or read '%s'"
msgstr "不能開啟或讀取 '%s'"
@@ -16567,12 +17979,6 @@
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."
@@ -16625,11 +18031,11 @@
#: builtin/notes.c:499
msgid "load rewriting config for <command> (implies --stdin)"
-msgstr "重新載入 <指令> 的設定（隱含 --stdin）"
+msgstr "重新載入 <命令> 的設定（隱含 --stdin）"
#: builtin/notes.c:517
-msgid "too few parameters"
-msgstr "參數太少"
+msgid "too few arguments"
+msgstr "太少參數"
#: builtin/notes.c:538
#, c-format
@@ -16752,7 +18158,7 @@
"自動合併說明失敗。修改 %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:578
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "無法解析 '%s' 為一個有效引用。"
@@ -16770,7 +18176,7 @@
msgid "read object names from the standard input"
msgstr "從標準輸入讀取物件名稱"
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148
msgid "do not remove, show only"
msgstr "不刪除，只顯示"
@@ -16786,116 +18192,144 @@
msgid "use notes from <notes-ref>"
msgstr "從 <註解引用> 使用註解"
-#: builtin/notes.c:1034 builtin/stash.c:1643
+#: builtin/notes.c:1034 builtin/stash.c:1671
#, 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:430
+#: builtin/pack-objects.c:440
+#, c-format
+msgid ""
+"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
+"pack %s"
+msgstr ""
+"write_reuse_object：無法定位 %1$s，預期在 %3$s 包中的 %2$<PRIuMAX> 偏移量"
+
+#: builtin/pack-objects.c:448
#, c-format
msgid "bad packed object CRC for %s"
msgstr "%s 錯的包物件 CRC"
-#: builtin/pack-objects.c:441
+#: builtin/pack-objects.c:459
#, c-format
msgid "corrupt packed object for %s"
msgstr "%s 損壞的包物件"
-#: builtin/pack-objects.c:572
+#: builtin/pack-objects.c:590
#, c-format
msgid "recursive delta detected for object %s"
msgstr "發現物件 %s 遞迴 delta"
-#: builtin/pack-objects.c:783
+#: builtin/pack-objects.c:801
#, c-format
msgid "ordered %u objects, expected %<PRIu32>"
msgstr "排序了 %u 個物件，預期 %<PRIu32> 個"
-#: builtin/pack-objects.c:972
-msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
-msgstr "禁用 bitmap 寫入，因為 pack.packSizeLimit 設定使得包被切分為多個"
+#: builtin/pack-objects.c:896
+#, c-format
+msgid "expected object at offset %<PRIuMAX> in pack %s"
+msgstr "預期 %2$s 包中的偏移 %1$<PRIuMAX> 有物件"
-#: builtin/pack-objects.c:985
+#: builtin/pack-objects.c:1015
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr "停用 bitmap 寫入，因為 pack.packSizeLimit 設定使得包被切分為多個"
+
+#: builtin/pack-objects.c:1028
msgid "Writing objects"
msgstr "寫入物件中"
-#: builtin/pack-objects.c:1046 builtin/update-index.c:90
+#: builtin/pack-objects.c:1089 builtin/update-index.c:90
#, c-format
msgid "failed to stat %s"
msgstr "對 %s 呼叫 stat 失敗"
-#: builtin/pack-objects.c:1099
+#: builtin/pack-objects.c:1141
#, c-format
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
msgstr "寫入 %<PRIu32> 個物件而預期 %<PRIu32> 個"
-#: builtin/pack-objects.c:1297
+#: builtin/pack-objects.c:1358
msgid "disabling bitmap writing, as some objects are not being packed"
-msgstr "禁用 bitmap 寫入，因為一些物件將不會被打包"
+msgstr "停用 bitmap 寫入，因為一些物件將不會被打包"
-#: builtin/pack-objects.c:1724
+#: builtin/pack-objects.c:1806
#, c-format
msgid "delta base offset overflow in pack for %s"
msgstr "%s 壓縮中 delta 基準位移越界"
-#: builtin/pack-objects.c:1733
+#: builtin/pack-objects.c:1815
#, c-format
msgid "delta base offset out of bound for %s"
msgstr "%s 的 delta 基準位移越界"
-#: builtin/pack-objects.c:2004
+#: builtin/pack-objects.c:2096
msgid "Counting objects"
msgstr "物件計數中"
-#: builtin/pack-objects.c:2149
+#: builtin/pack-objects.c:2241
#, c-format
msgid "unable to parse object header of %s"
msgstr "無法解析物件 %s 標頭訊息"
-#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235
-#: builtin/pack-objects.c:2245
+#: builtin/pack-objects.c:2311 builtin/pack-objects.c:2327
+#: builtin/pack-objects.c:2337
#, c-format
msgid "object %s cannot be read"
msgstr "物件 %s 無法讀取"
-#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249
+#: builtin/pack-objects.c:2314 builtin/pack-objects.c:2341
#, c-format
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
msgstr "物件 %s 不一致的物件長度（%<PRIuMAX> vs %<PRIuMAX>）"
-#: builtin/pack-objects.c:2259
+#: builtin/pack-objects.c:2351
msgid "suboptimal pack - out of memory"
msgstr "次優（suboptimal）打包 - 記憶體不足"
-#: builtin/pack-objects.c:2574
+#: builtin/pack-objects.c:2666
#, c-format
msgid "Delta compression using up to %d threads"
msgstr "使用 %d 個執行緒進行壓縮"
-#: builtin/pack-objects.c:2713
+#: builtin/pack-objects.c:2805
#, c-format
msgid "unable to pack objects reachable from tag %s"
msgstr "無法為標籤 %s 壓縮物件"
-#: builtin/pack-objects.c:2801
+#: builtin/pack-objects.c:2891
msgid "Compressing objects"
msgstr "壓縮物件中"
-#: builtin/pack-objects.c:2807
+#: builtin/pack-objects.c:2897
msgid "inconsistency with delta count"
msgstr "不一致的差異計數"
-#: builtin/pack-objects.c:2888
+#: builtin/pack-objects.c:2976
+#, 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:2979
+#, c-format
+msgid ""
+"object already configured in another uploadpack.blobpackfileuri (got '%s')"
+msgstr "物件已經在其他 uploadpack.blobpackfileuri 設定過 (收到 '%s')"
+
+#: builtin/pack-objects.c:3008
#, c-format
msgid ""
"expected edge object ID, got garbage:\n"
@@ -16904,7 +18338,7 @@
"預期邊界物件（edge object）ID，卻得到垃圾資料：\n"
" %s"
-#: builtin/pack-objects.c:2894
+#: builtin/pack-objects.c:3014
#, c-format
msgid ""
"expected object ID, got garbage:\n"
@@ -16913,226 +18347,234 @@
"預期物件 ID，卻得到垃圾資料：\n"
" %s"
-#: builtin/pack-objects.c:2992
+#: builtin/pack-objects.c:3112
msgid "invalid value for --missing"
msgstr "選項 --missing 的值無效"
-#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159
+#: builtin/pack-objects.c:3171 builtin/pack-objects.c:3279
msgid "cannot open pack index"
msgstr "無法開啟包檔案索引"
-#: builtin/pack-objects.c:3082
+#: builtin/pack-objects.c:3202
#, c-format
msgid "loose object at %s could not be examined"
msgstr "無法檢查 %s 處的鬆散物件"
-#: builtin/pack-objects.c:3167
+#: builtin/pack-objects.c:3287
msgid "unable to force loose object"
msgstr "無法強制鬆散物件"
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3380
#, c-format
msgid "not a rev '%s'"
msgstr "不是一個版本 '%s'"
-#: builtin/pack-objects.c:3263
+#: builtin/pack-objects.c:3383
#, c-format
msgid "bad revision '%s'"
msgstr "壞的版本 '%s'"
-#: builtin/pack-objects.c:3288
+#: builtin/pack-objects.c:3408
msgid "unable to add recent objects"
msgstr "無法新增最近的物件"
-#: builtin/pack-objects.c:3341
+#: builtin/pack-objects.c:3461
#, c-format
msgid "unsupported index version %s"
msgstr "不支援的索引版本 %s"
-#: builtin/pack-objects.c:3345
+#: builtin/pack-objects.c:3465
#, c-format
msgid "bad index version '%s'"
msgstr "壞的索引版本 '%s'"
-#: builtin/pack-objects.c:3383
+#: builtin/pack-objects.c:3503
msgid "<version>[,<offset>]"
msgstr "<版本>[,<位移>]"
-#: builtin/pack-objects.c:3384
+#: builtin/pack-objects.c:3504
msgid "write the pack index file in the specified idx format version"
msgstr "用指定的 idx 格式版本來寫包索引檔案"
-#: builtin/pack-objects.c:3387
+#: builtin/pack-objects.c:3507
msgid "maximum size of each output pack file"
msgstr "每個輸出包的最大尺寸"
-#: builtin/pack-objects.c:3389
+#: builtin/pack-objects.c:3509
msgid "ignore borrowed objects from alternate object store"
msgstr "忽略從備用物件儲存裡借用物件"
-#: builtin/pack-objects.c:3391
+#: builtin/pack-objects.c:3511
msgid "ignore packed objects"
msgstr "忽略包物件"
-#: builtin/pack-objects.c:3393
+#: builtin/pack-objects.c:3513
msgid "limit pack window by objects"
msgstr "限制打包視窗的物件數"
-#: builtin/pack-objects.c:3395
+#: builtin/pack-objects.c:3515
msgid "limit pack window by memory in addition to object limit"
msgstr "除物件數量限制外設定打包視窗的記憶體限制"
-#: builtin/pack-objects.c:3397
+#: builtin/pack-objects.c:3517
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "打包允許的 delta 鏈的最大長度"
-#: builtin/pack-objects.c:3399
+#: builtin/pack-objects.c:3519
msgid "reuse existing deltas"
msgstr "重用已存在的 deltas"
-#: builtin/pack-objects.c:3401
+#: builtin/pack-objects.c:3521
msgid "reuse existing objects"
msgstr "重用已存在的物件"
-#: builtin/pack-objects.c:3403
+#: builtin/pack-objects.c:3523
msgid "use OFS_DELTA objects"
msgstr "使用 OFS_DELTA 物件"
-#: builtin/pack-objects.c:3405
+#: builtin/pack-objects.c:3525
msgid "use threads when searching for best delta matches"
msgstr "使用執行緒查詢最佳 delta 符合"
-#: builtin/pack-objects.c:3407
+#: builtin/pack-objects.c:3527
msgid "do not create an empty pack output"
msgstr "不建立空的包輸出"
-#: builtin/pack-objects.c:3409
+#: builtin/pack-objects.c:3529
msgid "read revision arguments from standard input"
msgstr "從標準輸入讀取版本號參數"
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:3531
msgid "limit the objects to those that are not yet packed"
msgstr "限制那些尚未打包的物件"
-#: builtin/pack-objects.c:3414
+#: builtin/pack-objects.c:3534
msgid "include objects reachable from any reference"
msgstr "包括可以從任何引用存取到的物件"
-#: builtin/pack-objects.c:3417
+#: builtin/pack-objects.c:3537
msgid "include objects referred by reflog entries"
msgstr "包括被引用日誌引用到的物件"
-#: builtin/pack-objects.c:3420
+#: builtin/pack-objects.c:3540
msgid "include objects referred to by the index"
msgstr "包括被索引引用到的物件"
-#: builtin/pack-objects.c:3423
+#: builtin/pack-objects.c:3543
msgid "output pack to stdout"
msgstr "輸出包到標準輸出"
-#: builtin/pack-objects.c:3425
+#: builtin/pack-objects.c:3545
msgid "include tag objects that refer to objects to be packed"
msgstr "包括那些引用了待打包物件的標籤物件"
-#: builtin/pack-objects.c:3427
+#: builtin/pack-objects.c:3547
msgid "keep unreachable objects"
msgstr "維持無法取得的物件"
-#: builtin/pack-objects.c:3429
+#: builtin/pack-objects.c:3549
msgid "pack loose unreachable objects"
msgstr "打包鬆散的無法取得物件"
-#: builtin/pack-objects.c:3431
+#: builtin/pack-objects.c:3551
msgid "unpack unreachable objects newer than <time>"
msgstr "將比提供 <時間> 新的無法存取的物件解包"
-#: builtin/pack-objects.c:3434
+#: builtin/pack-objects.c:3554
msgid "use the sparse reachability algorithm"
msgstr "使用稀疏可以取得性演算法"
-#: builtin/pack-objects.c:3436
+#: builtin/pack-objects.c:3556
msgid "create thin packs"
msgstr "建立精簡包"
-#: builtin/pack-objects.c:3438
+#: builtin/pack-objects.c:3558
msgid "create packs suitable for shallow fetches"
msgstr "建立適合淺複製版本庫取得的包"
-#: builtin/pack-objects.c:3440
+#: builtin/pack-objects.c:3560
msgid "ignore packs that have companion .keep file"
msgstr "忽略配有 .keep 檔案的包"
-#: builtin/pack-objects.c:3442
+#: builtin/pack-objects.c:3562
msgid "ignore this pack"
msgstr "忽略該 pack"
-#: builtin/pack-objects.c:3444
+#: builtin/pack-objects.c:3564
msgid "pack compression level"
msgstr "打包壓縮級別"
-#: builtin/pack-objects.c:3446
+#: builtin/pack-objects.c:3566
msgid "do not hide commits by grafts"
msgstr "顯示被移植隱藏的提交"
-#: builtin/pack-objects.c:3448
+#: builtin/pack-objects.c:3568
msgid "use a bitmap index if available to speed up counting objects"
msgstr "使用 bitmap 索引（如果有的話）以提高物件計數時的速度"
-#: builtin/pack-objects.c:3450
+#: builtin/pack-objects.c:3570
msgid "write a bitmap index together with the pack index"
msgstr "在建立包索引的同時建立 bitmap 索引"
-#: builtin/pack-objects.c:3454
+#: builtin/pack-objects.c:3574
msgid "write a bitmap index if possible"
msgstr "如果可能，寫 bitmap 索引"
-#: builtin/pack-objects.c:3458
+#: builtin/pack-objects.c:3578
msgid "handling for missing objects"
msgstr "處理遺失的物件"
-#: builtin/pack-objects.c:3461
+#: builtin/pack-objects.c:3581
msgid "do not pack objects in promisor packfiles"
msgstr "不要打包 promisor packfile 中的物件"
-#: builtin/pack-objects.c:3463
+#: builtin/pack-objects.c:3583
msgid "respect islands during delta compression"
msgstr "在增量壓縮時參考資料島"
-#: builtin/pack-objects.c:3492
+#: builtin/pack-objects.c:3585
+msgid "protocol"
+msgstr "通訊協定"
+
+#: builtin/pack-objects.c:3586
+msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
+msgstr "排除任何設定過，使用此通訊協定的 uploadpack.blobpackfileuri"
+
+#: builtin/pack-objects.c:3617
#, c-format
msgid "delta chain depth %d is too deep, forcing %d"
msgstr "增量鏈深度 %d 太深了，強制為 %d"
-#: builtin/pack-objects.c:3497
+#: builtin/pack-objects.c:3622
#, c-format
msgid "pack.deltaCacheLimit is too high, forcing %d"
msgstr "設定 pack.deltaCacheLimit 太高了，強制為 %d"
-#: builtin/pack-objects.c:3551
+#: builtin/pack-objects.c:3676
msgid "--max-pack-size cannot be used to build a pack for transfer"
-msgstr "不能使用 --max-pack-size 來構建傳輸用的包檔案"
+msgstr "不能使用 --max-pack-size 來組建傳輸用的包檔案"
-#: builtin/pack-objects.c:3553
+#: builtin/pack-objects.c:3678
msgid "minimum pack size limit is 1 MiB"
msgstr "最小的包檔案大小是 1 MiB"
-#: builtin/pack-objects.c:3558
+#: builtin/pack-objects.c:3683
msgid "--thin cannot be used to build an indexable pack"
msgstr "--thin 不能用於建立一個可索引包"
-#: builtin/pack-objects.c:3561
+#: builtin/pack-objects.c:3686
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
msgstr "--keep-unreachable 和 --unpack-unreachable 不相容"
-#: builtin/pack-objects.c:3567
+#: builtin/pack-objects.c:3692
msgid "cannot use --filter without --stdout"
msgstr "不能在沒有 --stdout 的情況下使用 --filter"
-#: builtin/pack-objects.c:3627
+#: builtin/pack-objects.c:3752
msgid "Enumerating objects"
msgstr "枚舉物件"
-#: builtin/pack-objects.c:3657
+#: builtin/pack-objects.c:3783
#, c-format
msgid ""
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
@@ -17141,6 +18583,20 @@
"總共 %<PRIu32> (差異 %<PRIu32>)，復用 %<PRIu32> (差異 %<PRIu32>)，重用包 "
"%<PRIu32>"
+#: builtin/pack-redundant.c:601
+msgid ""
+"'git pack-redundant' is nominated for removal.\n"
+"If you still use this command, please add an extra\n"
+"option, '--i-still-use-this', on the command line\n"
+"and let us know you still use it by sending an e-mail\n"
+"to <git@vger.kernel.org>. Thanks.\n"
+msgstr ""
+"「git pack-redundant」已被提名準備移除。\n"
+"如果您仍在使用這條命令，請在命令列多加一個選項\n"
+"「--i-still-use-this」，然後寄封電子信到\n"
+"<git@vger.kernel.org> 讓我們知道您還在使用。\n"
+"感謝。\n"
+
#: builtin/pack-refs.c:8
msgid "git pack-refs [<options>]"
msgstr "git pack-refs [<選項>]"
@@ -17153,31 +18609,27 @@
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 packfile 以外的物件"
-#: builtin/prune.c:150
+#: builtin/prune.c:152
msgid "cannot prune in a precious-objects repo"
msgstr "不能在珍品版本庫中執行清理動作"
@@ -17190,61 +18642,61 @@
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<選項>] [<版本庫> [<引用規格>...]]"
-#: builtin/pull.c:122
+#: builtin/pull.c:123
msgid "control for recursive fetching of submodules"
msgstr "控制子模組的遞迴取得"
-#: builtin/pull.c:126
+#: builtin/pull.c:127
msgid "Options related to merging"
msgstr "和合併相關的選項"
-#: builtin/pull.c:129
+#: builtin/pull.c:130
msgid "incorporate changes by rebasing rather than merging"
msgstr "使用重定基底動作取代合併動作以套用修改"
-#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126
+#: builtin/pull.c:158 builtin/rebase.c:492 builtin/revert.c:126
msgid "allow fast-forward"
msgstr "允許快轉式"
-#: builtin/pull.c:166
-msgid "automatically stash/stash pop before and after rebase"
-msgstr "重定基底動作前後執行自動儲藏和彈出儲藏"
+#: builtin/pull.c:167 parse-options.h:339
+msgid "automatically stash/stash pop before and after"
+msgstr "在動作前後執行自動儲藏和彈出儲藏"
-#: builtin/pull.c:182
+#: builtin/pull.c:183
msgid "Options related to fetching"
msgstr "和取得相關的參數"
-#: builtin/pull.c:192
+#: builtin/pull.c:193
msgid "force overwrite of local branch"
msgstr "強制覆蓋本機分支"
-#: builtin/pull.c:200
+#: builtin/pull.c:201
msgid "number of submodules pulled in parallel"
msgstr "並發拉取的子模組的數量"
-#: builtin/pull.c:300
+#: builtin/pull.c:317
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "pull.ff 的取值無效：%s"
-#: builtin/pull.c:426
+#: builtin/pull.c:445
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr "在您剛剛取得到的引用中沒有重定基底動作的候選。"
-#: builtin/pull.c:428
+#: builtin/pull.c:447
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr "在您剛剛取得到的引用中沒有合併動作的候選。"
-#: builtin/pull.c:429
+#: builtin/pull.c:448
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
msgstr "通常這意味著您提供了一萬用字元引用規格但未能和遠端符合。"
-#: builtin/pull.c:432
+#: builtin/pull.c:451
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -17254,42 +18706,41 @@
"您要求從遠端 '%s' 拉取，但是未指定一個分支。因為這不是目前\n"
"分支預設的遠端版本庫，您必須在指令列中指定一個分支名。"
-#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73
+#: builtin/pull.c:456 builtin/rebase.c:1253
msgid "You are not currently on a branch."
msgstr "您目前不在一個分支上。"
-#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79
+#: builtin/pull.c:458 builtin/pull.c:473
msgid "Please specify which branch you want to rebase against."
msgstr "請指定您要重定基底到哪一個分支。"
-#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82
+#: builtin/pull.c:460 builtin/pull.c:475
msgid "Please specify which branch you want to merge with."
msgstr "請指定您要合併哪一個分支。"
-#: builtin/pull.c:442 builtin/pull.c:457
+#: builtin/pull.c:461 builtin/pull.c:476
msgid "See git-pull(1) for details."
msgstr "詳見 git-pull(1)。"
-#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459
-#: builtin/rebase.c:1415 git-parse-remote.sh:64
+#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
+#: builtin/rebase.c:1259
msgid "<remote>"
msgstr "<遠端>"
-#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464
-#: git-parse-remote.sh:65
+#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
msgid "<branch>"
msgstr "<分支>"
-#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75
+#: builtin/pull.c:471 builtin/rebase.c:1251
msgid "There is no tracking information for the current branch."
msgstr "目前分支沒有追蹤訊息。"
-#: builtin/pull.c:461 git-parse-remote.sh:95
+#: builtin/pull.c:480
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr "如果您想要為此分支建立追蹤訊息，您可以執行："
-#: builtin/pull.c:466
+#: builtin/pull.c:485
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -17298,32 +18749,57 @@
"您的設定中指定要合併遠端的引用 '%s'，\n"
"但是沒有取得到這個引用。"
-#: builtin/pull.c:576
+#: builtin/pull.c:596
#, c-format
msgid "unable to access commit %s"
msgstr "無法存取提交 %s"
-#: builtin/pull.c:857
+#: builtin/pull.c:902
msgid "ignoring --verify-signatures for rebase"
msgstr "為重定基底動作忽略 --verify-signatures"
-#: builtin/pull.c:912
-msgid "--[no-]autostash option is only valid with --rebase."
-msgstr "--[no-]autostash 選項只在使用 --rebase 時有效。"
+#: builtin/pull.c:930
+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:920
+#: builtin/pull.c:991
msgid "Updating an unborn branch with changes added to the index."
msgstr "更新尚未誕生的分支，變更新增至索引。"
-#: builtin/pull.c:924
+#: builtin/pull.c:995
msgid "pull with rebase"
msgstr "重定基底式拉取"
-#: builtin/pull.c:925
+#: builtin/pull.c:996
msgid "please commit or stash them."
msgstr "請提交或儲藏它們。"
-#: builtin/pull.c:950
+#: builtin/pull.c:1021
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -17333,7 +18809,7 @@
"fetch 更新了目前的分支。快轉您的工作區\n"
"至提交 %s。"
-#: builtin/pull.c:956
+#: builtin/pull.c:1027
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -17350,15 +18826,15 @@
"$ git reset --hard\n"
"復原之前的狀態。"
-#: builtin/pull.c:971
+#: builtin/pull.c:1042
msgid "Cannot merge multiple branches into empty head."
msgstr "無法將多個分支合併到空分支。"
-#: builtin/pull.c:975
+#: builtin/pull.c:1046
msgid "Cannot rebase onto multiple branches."
msgstr "無法重定基底到多個分支。"
-#: builtin/pull.c:982
+#: builtin/pull.c:1067
msgid "cannot rebase with locally recorded submodule modifications"
msgstr "本機子模組中有修改，無法重定基底"
@@ -17366,15 +18842,15 @@
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<選項>] [<版本庫> [<引用規格>...]]"
-#: builtin/push.c:112
+#: builtin/push.c:111
msgid "tag shorthand without <tag>"
msgstr "標籤後面未提供 <標籤> 參數"
-#: builtin/push.c:122
+#: builtin/push.c:119
msgid "--delete only accepts plain target ref names"
msgstr "--delete 只接受簡單的目標引用名"
-#: builtin/push.c:168
+#: builtin/push.c:164
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -17382,7 +18858,7 @@
"\n"
"為了永久地選擇任一選項，參見 'git help config' 中的 push.default。"
-#: builtin/push.c:171
+#: builtin/push.c:167
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -17406,7 +18882,7 @@
" git push %s HEAD\n"
"%s"
-#: builtin/push.c:186
+#: builtin/push.c:182
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -17420,7 +18896,7 @@
"\n"
" git push %s HEAD:<遠端分支名字>\n"
-#: builtin/push.c:200
+#: builtin/push.c:194
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -17433,12 +18909,12 @@
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:208
+#: builtin/push.c:202
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr "目前分支 %s 有多個上游分支，拒絕推送。"
-#: builtin/push.c:211
+#: builtin/push.c:205
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -17448,12 +18924,12 @@
"您正推送至遠端 '%s'（其並非目前分支 '%s' 的上游），\n"
"而沒有告訴我要推送什麼、更新哪個遠端分支。"
-#: builtin/push.c:270
+#: 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:277
+#: 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"
@@ -17464,7 +18940,7 @@
"再次推送前，先與遠端變更合併（如 'git pull ...'）。詳見\n"
"'git push --help' 中的 'Note about fast-forwards' 小節。"
-#: builtin/push.c:283
+#: 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"
@@ -17472,10 +18948,10 @@
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
"更新被拒絕，因為推送的一個分支的最新提交落後於其對應的遠端分支。\n"
-"簽出該分支並整合遠端變更（如 'git pull ...'），然後再推送。詳見\n"
+"檢出該分支並整合遠端變更（如 'git pull ...'），然後再推送。詳見\n"
"'git push --help' 中的 'Note about fast-forwards' 小節。"
-#: builtin/push.c:289
+#: 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"
@@ -17488,11 +18964,11 @@
"（如 'git pull ...'）。\n"
"詳見 'git push --help' 中的 'Note about fast-forwards' 小節。"
-#: builtin/push.c:296
+#: builtin/push.c:286
msgid "Updates were rejected because the tag already exists in the remote."
msgstr "更新被拒絕，因為該標籤在遠端已經存在。"
-#: builtin/push.c:299
+#: 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"
@@ -17501,99 +18977,114 @@
"如果不使用 '--force' 參數，您不能更新一個指向非提交物件的遠端引用，\n"
"也不能更新遠端引用讓其指向一個非提交物件。\n"
-#: builtin/push.c:360
+#: builtin/push.c:294
+msgid ""
+"Updates were rejected because the tip of the remote-tracking\n"
+"branch has been updated since the last checkout. You may want\n"
+"to integrate those changes locally (e.g., 'git pull ...')\n"
+"before forcing an update.\n"
+msgstr ""
+"更新被拒，因為遠端追蹤分支的最新指針繼上次簽出後有更新。\n"
+"您可能會希望先將這些變更整合至本地（例如：‘git pull …’)\n"
+"最後才強制更新。\n"
+
+#: builtin/push.c:364
#, c-format
msgid "Pushing to %s\n"
msgstr "推送到 %s\n"
-#: builtin/push.c:367
+#: builtin/push.c:371
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "推送一些引用到 '%s' 失敗"
-#: builtin/push.c:542
+#: builtin/push.c:553
msgid "repository"
msgstr "版本庫"
-#: builtin/push.c:543 builtin/send-pack.c:164
+#: builtin/push.c:554 builtin/send-pack.c:189
msgid "push all refs"
msgstr "推送所有引用"
-#: builtin/push.c:544 builtin/send-pack.c:166
+#: builtin/push.c:555 builtin/send-pack.c:191
msgid "mirror all refs"
msgstr "鏡像所有引用"
-#: builtin/push.c:546
+#: builtin/push.c:557
msgid "delete refs"
msgstr "刪除引用"
-#: builtin/push.c:547
+#: builtin/push.c:558
msgid "push tags (can't be used with --all or --mirror)"
msgstr "推送標籤（不能使用 --all or --mirror）"
-#: builtin/push.c:550 builtin/send-pack.c:167
+#: builtin/push.c:561 builtin/send-pack.c:192
msgid "force updates"
msgstr "強制更新"
-#: builtin/push.c:552 builtin/send-pack.c:181
+#: builtin/push.c:562 builtin/send-pack.c:204
msgid "<refname>:<expect>"
msgstr "<引用名>:<期望值>"
-#: builtin/push.c:553 builtin/send-pack.c:182
+#: builtin/push.c:563 builtin/send-pack.c:205
msgid "require old value of ref to be at this value"
msgstr "要求引用舊的取值為設定值"
-#: builtin/push.c:556
+#: builtin/push.c:566 builtin/send-pack.c:208
+msgid "require remote updates to be integrated locally"
+msgstr "需要將遠端更新整合進本地"
+
+#: builtin/push.c:569
msgid "control recursive pushing of submodules"
msgstr "控制子模組的遞迴推送"
-#: builtin/push.c:558 builtin/send-pack.c:175
+#: builtin/push.c:570 builtin/send-pack.c:199
msgid "use thin pack"
msgstr "使用精簡打包"
-#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161
-#: builtin/send-pack.c:162
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
+#: builtin/send-pack.c:187
msgid "receive pack program"
msgstr "接收包程式"
-#: builtin/push.c:561
+#: builtin/push.c:573
msgid "set upstream for git pull/status"
msgstr "設定 git pull/status 的上游"
-#: builtin/push.c:564
+#: builtin/push.c:576
msgid "prune locally removed refs"
msgstr "清除本機刪除的引用"
-#: builtin/push.c:566
+#: builtin/push.c:578
msgid "bypass pre-push hook"
msgstr "繞過 pre-push 掛鉤"
-#: builtin/push.c:567
+#: builtin/push.c:579
msgid "push missing but relevant tags"
msgstr "推送缺少但有關的標籤"
-#: builtin/push.c:570 builtin/send-pack.c:169
+#: builtin/push.c:581 builtin/send-pack.c:193
msgid "GPG sign the push"
msgstr "用 GPG 為推送簽名"
-#: builtin/push.c:572 builtin/send-pack.c:176
+#: builtin/push.c:583 builtin/send-pack.c:200
msgid "request atomic transaction on remote side"
msgstr "需要遠端支援原子事務"
-#: builtin/push.c:590
+#: builtin/push.c:601
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete 與 --all、--mirror 及 --tags 不相容"
-#: builtin/push.c:592
+#: builtin/push.c:603
msgid "--delete doesn't make sense without any refs"
msgstr "--delete 未接任何引用沒有意義"
-#: builtin/push.c:612
+#: builtin/push.c:623
#, c-format
msgid "bad repository '%s'"
msgstr "壞的版本庫 '%s'"
-#: builtin/push.c:613
+#: builtin/push.c:624
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -17614,68 +19105,76 @@
"\n"
" git push <名稱>\n"
-#: builtin/push.c:628
+#: builtin/push.c:639
msgid "--all and --tags are incompatible"
msgstr "--all 和 --tags 不相容"
-#: builtin/push.c:630
+#: builtin/push.c:641
msgid "--all can't be combined with refspecs"
msgstr "--all 不能和引用規格同時使用"
-#: builtin/push.c:634
+#: builtin/push.c:645
msgid "--mirror and --tags are incompatible"
msgstr "--mirror 和 --tags 不相容"
-#: builtin/push.c:636
+#: builtin/push.c:647
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror 不能和引用規格同時使用"
-#: builtin/push.c:639
+#: builtin/push.c:650
msgid "--all and --mirror are incompatible"
msgstr "--all 和 --mirror 不相容"
-#: builtin/push.c:643
+#: builtin/push.c:657
msgid "push options must not have new line characters"
msgstr "推送選項不能有換行符號"
-#: builtin/range-diff.c:8
+#: builtin/range-diff.c:9
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
+#: builtin/range-diff.c:10
msgid "git range-diff [<options>] <old-tip>...<new-tip>"
msgstr "git range-diff [<選項>] <old-tip>...<new-tip>"
-#: builtin/range-diff.c:10
+#: builtin/range-diff.c:11
msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
msgstr "git range-diff [<選項>] <base> <old-tip> <new-tip>"
-#: builtin/range-diff.c:22
+#: builtin/range-diff.c:28
msgid "Percentage by which creation is weighted"
msgstr "建立權重的百分比"
-#: builtin/range-diff.c:24
+#: builtin/range-diff.c:30
msgid "use simple diff colors"
msgstr "使用簡單差異顏色"
-#: builtin/range-diff.c:26
+#: builtin/range-diff.c:32
msgid "notes"
msgstr "註解"
-#: builtin/range-diff.c:26
+#: builtin/range-diff.c:32
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:35
+msgid "only emit output related to the first range"
+msgstr "只發出跟第一個範圍相關的輸出"
-#: builtin/range-diff.c:64
+#: builtin/range-diff.c:37
+msgid "only emit output related to the second range"
+msgstr "只發出跟第二個範圍相關的輸出"
+
+#: builtin/range-diff.c:60 builtin/range-diff.c:64
+#, c-format
+msgid "not a commit range: '%s'"
+msgstr "不是提交範圍：「%s」"
+
+#: builtin/range-diff.c:74
msgid "single arg format must be symmetric range"
msgstr "單個參數格式必須是對稱範圍（即包含...）"
-#: builtin/range-diff.c:79
+#: builtin/range-diff.c:89
msgid "need two commit ranges"
msgstr "需要兩個提交範圍"
@@ -17747,7 +19246,7 @@
#: builtin/read-tree.c:151
msgid "skip applying sparse checkout filter"
-msgstr "跳過應用稀疏簽出過濾器"
+msgstr "跳過應用稀疏檢出過濾器"
#: builtin/read-tree.c:153
msgid "debug unpack-trees"
@@ -17761,225 +19260,211 @@
msgid "You need to resolve your current index first"
msgstr "您需要先解決目前索引的衝突"
-#: builtin/rebase.c:32
+#: 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] [<"
+"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 [<分支>]"
+"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:175 builtin/rebase.c:199 builtin/rebase.c:226
+#: builtin/rebase.c:195 builtin/rebase.c:219 builtin/rebase.c:246
#, c-format
msgid "unusable todo list: '%s'"
msgstr "不可用的待辦列表：'%s'"
-#: builtin/rebase.c:292
+#: builtin/rebase.c:312
#, c-format
msgid "could not create temporary %s"
msgstr "無法建立暫時的 %s"
-#: builtin/rebase.c:298
+#: builtin/rebase.c:318
msgid "could not mark as interactive"
msgstr "無法標記為互動式"
-#: builtin/rebase.c:352
+#: builtin/rebase.c:371
msgid "could not generate todo list"
msgstr "無法生成待辦列表"
-#: builtin/rebase.c:391
+#: builtin/rebase.c:413
msgid "a base commit must be provided with --upstream or --onto"
msgstr "使用 --upstream 或 --onto 必須提供一個基礎提交"
-#: builtin/rebase.c:461
+#: builtin/rebase.c:482
msgid "git rebase--interactive [<options>]"
msgstr "git rebase--interactive [<選項>]"
-#: builtin/rebase.c:474 builtin/rebase.c:1550
-msgid "(DEPRECATED) keep empty commits"
-msgstr "(棄用) 保持空提交"
+#: builtin/rebase.c:495 builtin/rebase.c:1394
+msgid "keep commits which start empty"
+msgstr "保留開頭是空白的提交"
-#: builtin/rebase.c:478 builtin/revert.c:128
+#: builtin/rebase.c:499 builtin/revert.c:128
msgid "allow commits with empty messages"
msgstr "允許提交說明為空"
-#: builtin/rebase.c:480
+#: builtin/rebase.c:501
msgid "rebase merge commits"
msgstr "對合併提交重定基底"
-#: builtin/rebase.c:482
+#: builtin/rebase.c:503
msgid "keep original branch points of cousins"
msgstr "保持兄弟提交的原始分支點"
-#: builtin/rebase.c:484
+#: builtin/rebase.c:505
msgid "move commits that begin with squash!/fixup!"
msgstr "移動以 squash!/fixup! 開頭的提交"
-#: builtin/rebase.c:485
+#: builtin/rebase.c:506
msgid "sign commits"
msgstr "簽名提交"
-#: builtin/rebase.c:487 builtin/rebase.c:1490
+#: builtin/rebase.c:508 builtin/rebase.c:1333
msgid "display a diffstat of what changed upstream"
msgstr "顯示上游變化的差異統計"
-#: builtin/rebase.c:489
+#: builtin/rebase.c:510
msgid "continue rebase"
msgstr "繼續重定基底"
-#: builtin/rebase.c:491
+#: builtin/rebase.c:512
msgid "skip commit"
msgstr "跳過提交"
-#: builtin/rebase.c:492
+#: builtin/rebase.c:513
msgid "edit the todo list"
msgstr "重定基底待辦列表"
-#: builtin/rebase.c:494
+#: builtin/rebase.c:515
msgid "show the current patch"
msgstr "顯示目前修補檔"
-#: builtin/rebase.c:497
+#: builtin/rebase.c:518
msgid "shorten commit ids in the todo list"
msgstr "縮短待辦列表中的提交號"
-#: builtin/rebase.c:499
+#: builtin/rebase.c:520
msgid "expand commit ids in the todo list"
msgstr "擴展待辦列表中的提交號"
-#: builtin/rebase.c:501
+#: builtin/rebase.c:522
msgid "check the todo list"
msgstr "檢查待辦列表"
-#: builtin/rebase.c:503
+#: builtin/rebase.c:524
msgid "rearrange fixup/squash lines"
msgstr "重新排列 fixup/squash 行"
-#: builtin/rebase.c:505
+#: builtin/rebase.c:526
msgid "insert exec commands in todo list"
msgstr "在待辦列表中插入 exec 執行指令"
-#: builtin/rebase.c:506
+#: builtin/rebase.c:527
msgid "onto"
msgstr "onto"
-#: builtin/rebase.c:509
+#: builtin/rebase.c:530
msgid "restrict-revision"
msgstr "restrict-revision"
-#: builtin/rebase.c:509
+#: builtin/rebase.c:530
msgid "restrict revision"
msgstr "限制版本"
-#: builtin/rebase.c:511
+#: builtin/rebase.c:532
msgid "squash-onto"
msgstr "squash-onto"
-#: builtin/rebase.c:512
+#: builtin/rebase.c:533
msgid "squash onto"
msgstr "squash onto"
-#: builtin/rebase.c:514
+#: builtin/rebase.c:535
msgid "the upstream commit"
msgstr "上游提交"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:537
msgid "head-name"
msgstr "head-name"
-#: builtin/rebase.c:516
+#: builtin/rebase.c:537
msgid "head name"
msgstr "head 名稱"
-#: builtin/rebase.c:521
+#: builtin/rebase.c:542
msgid "rebase strategy"
msgstr "重定基底策略"
-#: builtin/rebase.c:522
+#: builtin/rebase.c:543
msgid "strategy-opts"
msgstr "strategy-opts"
-#: builtin/rebase.c:523
+#: builtin/rebase.c:544
msgid "strategy options"
msgstr "策略選項"
-#: builtin/rebase.c:524
+#: builtin/rebase.c:545
msgid "switch-to"
msgstr "切換到"
-#: builtin/rebase.c:525
+#: builtin/rebase.c:546
msgid "the branch or commit to checkout"
-msgstr "要簽出的分支或提交"
+msgstr "要檢出的分支或提交"
-#: builtin/rebase.c:526
+#: builtin/rebase.c:547
msgid "onto-name"
msgstr "onto-name"
-#: builtin/rebase.c:526
+#: builtin/rebase.c:547
msgid "onto name"
msgstr "onto name"
-#: builtin/rebase.c:527
+#: builtin/rebase.c:548
msgid "cmd"
msgstr "cmd"
-#: builtin/rebase.c:527
+#: builtin/rebase.c:548
msgid "the command to run"
msgstr "要執行的指令"
-#: builtin/rebase.c:530 builtin/rebase.c:1584
+#: builtin/rebase.c:551 builtin/rebase.c:1427
msgid "automatically re-schedule any `exec` that fails"
msgstr "自動重新安排任何失敗的 `exec`"
-#: builtin/rebase.c:546
+#: builtin/rebase.c:567
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
msgstr "不使用 --rebase-merges，則 --[no-]rebase-cousins 沒有效果"
-#: builtin/rebase.c:562
+#: builtin/rebase.c:583
#, c-format
-msgid "%s requires an interactive rebase"
-msgstr "%s 需要互動式重定基底"
+msgid "%s requires the merge backend"
+msgstr "%s 需要合併後端"
-#: builtin/rebase.c:612
+#: builtin/rebase.c:626
#, c-format
msgid "could not get 'onto': '%s'"
msgstr "無法取得 'onto'：'%s'"
-#: builtin/rebase.c:627
+#: builtin/rebase.c:643
#, c-format
msgid "invalid orig-head: '%s'"
msgstr "無效的原始 head：'%s'"
-#: builtin/rebase.c:652
+#: builtin/rebase.c:668
#, c-format
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
msgstr "忽略無效的 allow_rerere_autoupdate：'%s'"
-#: builtin/rebase.c:728
-#, c-format
-msgid "Could not read '%s'"
-msgstr "不能讀取 '%s'"
-
-#: builtin/rebase.c:746
-#, c-format
-msgid "Cannot store %s"
-msgstr "不能儲存 %s"
-
-#: builtin/rebase.c:853
-msgid "could not determine HEAD revision"
-msgstr "不能確定 HEAD 版本"
-
-#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:813 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"
@@ -17992,7 +19477,7 @@
"\"git rebase --skip\" 指令跳過這個提交。如果想要終止執行並回到\n"
"\"git rebase\" 執行之前的狀態，執行 \"git rebase --abort\"。"
-#: builtin/rebase.c:1058
+#: builtin/rebase.c:896
#, c-format
msgid ""
"\n"
@@ -18010,14 +19495,14 @@
"\n"
"因此 git 無法對其重定基底。"
-#: builtin/rebase.c:1383
+#: builtin/rebase.c:1227
#, c-format
msgid ""
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
"\"."
msgstr "無法識別的 '%s' 空類型；有效的數值有 \"drop\"、\"keep\" 跟 \"ask\"。"
-#: builtin/rebase.c:1401
+#: builtin/rebase.c:1245
#, c-format
msgid ""
"%s\n"
@@ -18034,7 +19519,7 @@
" git rebase '<branch>'\n"
"\n"
-#: builtin/rebase.c:1417
+#: builtin/rebase.c:1261
#, c-format
msgid ""
"If you wish to set tracking information for this branch you can do so with:\n"
@@ -18047,136 +19532,148 @@
" git branch --set-upstream-to=%s/<branch> %s\n"
"\n"
-#: builtin/rebase.c:1447
+#: builtin/rebase.c:1291
msgid "exec commands cannot contain newlines"
msgstr "exec 指令不能包含換行符號"
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1295
msgid "empty exec command"
msgstr "空的 exec 指令"
-#: builtin/rebase.c:1481
+#: builtin/rebase.c:1324
msgid "rebase onto given branch instead of upstream"
msgstr "重定基底到提供的分支而非上游"
-#: builtin/rebase.c:1483
+#: builtin/rebase.c:1326
msgid "use the merge-base of upstream and branch as the current base"
msgstr "使用上游和分支的合併基礎做為目前基礎"
-#: builtin/rebase.c:1485
+#: builtin/rebase.c:1328
msgid "allow pre-rebase hook to run"
msgstr "允許執行 pre-rebase 掛鉤"
-#: builtin/rebase.c:1487
+#: builtin/rebase.c:1330
msgid "be quiet. implies --no-stat"
msgstr "安靜。暗示 --no-stat"
-#: builtin/rebase.c:1493
+#: builtin/rebase.c:1336
msgid "do not show diffstat of what changed upstream"
msgstr "不顯示上游變化的差異統計"
-#: builtin/rebase.c:1496
-msgid "add a Signed-off-by: line to each commit"
-msgstr "為每一個提交新增一個 Signed-off-by: 簽名"
+#: builtin/rebase.c:1339
+msgid "add a Signed-off-by trailer to each commit"
+msgstr "在每個提交結尾加入 Signed-off-by"
-#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504
-msgid "passed to 'git am'"
-msgstr "傳遞給 'git am'"
+#: builtin/rebase.c:1342
+msgid "make committer date match author date"
+msgstr "使提交日期與製作日期相符合"
-#: builtin/rebase.c:1506 builtin/rebase.c:1508
+#: builtin/rebase.c:1344
+msgid "ignore author date and use current date"
+msgstr "忽略製作日期而使用日前日期"
+
+#: builtin/rebase.c:1346
+msgid "synonym of --reset-author-date"
+msgstr "和 --reset-author-date 同義"
+
+#: builtin/rebase.c:1348 builtin/rebase.c:1352
msgid "passed to 'git apply'"
msgstr "傳遞給 'git apply'"
-#: builtin/rebase.c:1510 builtin/rebase.c:1513
+#: builtin/rebase.c:1350
+msgid "ignore changes in whitespace"
+msgstr "忽略空白字元中的變更"
+
+#: builtin/rebase.c:1354 builtin/rebase.c:1357
msgid "cherry-pick all commits, even if unchanged"
msgstr "揀選所有提交，即使未修改"
-#: builtin/rebase.c:1515
+#: builtin/rebase.c:1359
msgid "continue"
msgstr "繼續"
-#: builtin/rebase.c:1518
+#: builtin/rebase.c:1362
msgid "skip current patch and continue"
msgstr "跳過目前修補檔並繼續"
# 譯者：請維持前導空格
-#: builtin/rebase.c:1520
+#: builtin/rebase.c:1364
msgid "abort and check out the original branch"
-msgstr "終止並簽出原有分支"
+msgstr "終止並檢出原有分支"
-#: builtin/rebase.c:1523
+#: builtin/rebase.c:1367
msgid "abort but keep HEAD where it is"
msgstr "終止但保持 HEAD 不變"
-#: builtin/rebase.c:1524
+#: builtin/rebase.c:1368
msgid "edit the todo list during an interactive rebase"
msgstr "在互動式重定基底中編輯待辦列表"
-#: builtin/rebase.c:1527
+#: builtin/rebase.c:1371
msgid "show the patch file being applied or merged"
msgstr "顯示正在套用或合併的修補檔案"
-#: builtin/rebase.c:1530
+#: builtin/rebase.c:1374
msgid "use apply strategies to rebase"
msgstr "使用套用策略進行重定基底"
-#: builtin/rebase.c:1534
+#: builtin/rebase.c:1378
msgid "use merging strategies to rebase"
msgstr "使用合併策略進行重定基底"
-#: builtin/rebase.c:1538
+#: builtin/rebase.c:1382
msgid "let the user edit the list of commits to rebase"
msgstr "讓使用者編輯要重定基底的提交列表"
-#: builtin/rebase.c:1542
+#: builtin/rebase.c:1386
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
msgstr "（已棄用）嘗試重建合併提交而非忽略它們"
-#: builtin/rebase.c:1547
+#: builtin/rebase.c:1391
msgid "how to handle commits that become empty"
msgstr "處理空白提交的方式"
-#: builtin/rebase.c:1554
+#: builtin/rebase.c:1398
msgid "move commits that begin with squash!/fixup! under -i"
msgstr "在 -i 互動模式下，移動以 squash!/fixup! 開頭的提交"
-#: builtin/rebase.c:1560
-msgid "automatically stash/stash pop before and after"
-msgstr "在動作前後執行自動儲藏和彈出儲藏"
-
-#: builtin/rebase.c:1562
+#: builtin/rebase.c:1405
msgid "add exec lines after each commit of the editable list"
msgstr "可編輯列表的每一個提交下面增加一行 exec"
-#: builtin/rebase.c:1566
+#: builtin/rebase.c:1409
msgid "allow rebasing commits with empty messages"
msgstr "允許針對空提交說明的提交重定基底"
-#: builtin/rebase.c:1570
+#: builtin/rebase.c:1413
msgid "try to rebase merges instead of skipping them"
msgstr "嘗試對合併提交重定基底而不是忽略它們"
-#: builtin/rebase.c:1573
+#: builtin/rebase.c:1416
msgid "use 'merge-base --fork-point' to refine upstream"
msgstr "使用 'merge-base --fork-point' 來最佳化上游"
-#: builtin/rebase.c:1575
+#: builtin/rebase.c:1418
msgid "use the given merge strategy"
msgstr "使用提供的合併策略"
-#: builtin/rebase.c:1577 builtin/revert.c:115
+#: builtin/rebase.c:1420 builtin/revert.c:115
msgid "option"
msgstr "選項"
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1421
msgid "pass the argument through to the merge strategy"
msgstr "將參數傳遞給合併策略"
-#: builtin/rebase.c:1581
+#: builtin/rebase.c:1424
msgid "rebase all reachable commits up to the root(s)"
msgstr "將所有可以取得的提交重定基底到根提交"
-#: builtin/rebase.c:1598
+#: builtin/rebase.c:1429
+msgid "apply all changes, even those already present upstream"
+msgstr "即使已提供上游，仍套用所有變更"
+
+#: builtin/rebase.c:1446
msgid ""
"the rebase.useBuiltin support has been removed!\n"
"See its entry in 'git help config' for details."
@@ -18184,36 +19681,40 @@
"對 rebase.useBuiltin 的支援已被刪除！\n"
"詳見 'git help config' 中的條目。"
-#: builtin/rebase.c:1604
+#: builtin/rebase.c:1452
msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr "看起來 'git-am' 正在執行中。無法重定基底。"
-#: builtin/rebase.c:1645
+#: builtin/rebase.c:1493
msgid ""
"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
msgstr "git rebase --preserve-merges 被棄用。用 --rebase-merges 代替。"
-#: builtin/rebase.c:1650
+#: builtin/rebase.c:1498
msgid "cannot combine '--keep-base' with '--onto'"
msgstr "不能將 '--keep-base' 和 '--onto' 組合使用"
-#: builtin/rebase.c:1652
+#: builtin/rebase.c:1500
msgid "cannot combine '--keep-base' with '--root'"
msgstr "不能將 '--keep-base' 和 '--root' 組合使用"
-#: builtin/rebase.c:1656
+#: builtin/rebase.c:1504
+msgid "cannot combine '--root' with '--fork-point'"
+msgstr "不能將 '--root' 和 '--fork-point' 結合使用"
+
+#: builtin/rebase.c:1507
msgid "No rebase in progress?"
msgstr "沒有正在進行的重定基底？"
-#: builtin/rebase.c:1660
+#: builtin/rebase.c:1511
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "動作 --edit-todo 只能用在互動式重定基底過程中。"
-#: builtin/rebase.c:1683
+#: builtin/rebase.c:1534 t/helper/test-fast-rebase.c:123
msgid "Cannot read HEAD"
msgstr "不能讀取 HEAD"
-#: builtin/rebase.c:1695
+#: builtin/rebase.c:1546
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -18221,16 +19722,16 @@
"您必須編輯所有的合併衝突，然後透過 git add\n"
"指令將它們標記為已解決"
-#: builtin/rebase.c:1714
+#: builtin/rebase.c:1565
msgid "could not discard worktree changes"
msgstr "無法捨棄工作區變更"
-#: builtin/rebase.c:1733
+#: builtin/rebase.c:1584
#, c-format
msgid "could not move back to %s"
msgstr "無法移回 %s"
-#: builtin/rebase.c:1778
+#: builtin/rebase.c:1630
#, c-format
msgid ""
"It seems that there is already a %s directory, and\n"
@@ -18249,164 +19750,141 @@
"\t%s\n"
"然後再重新執行。 為避免遺失重要資料，我已經停止目前動作。\n"
-#: builtin/rebase.c:1806
+#: builtin/rebase.c:1658
msgid "switch `C' expects a numerical value"
msgstr "開關 `C' 期望一個數字值"
-#: builtin/rebase.c:1847
+#: builtin/rebase.c:1700
#, c-format
msgid "Unknown mode: %s"
msgstr "未知模式：%s"
-#: builtin/rebase.c:1869
+#: builtin/rebase.c:1739
msgid "--strategy requires --merge or --interactive"
msgstr "--strategy 需要 --merge 或 --interactive"
-#: builtin/rebase.c:1899
+#: builtin/rebase.c:1769
msgid "cannot combine apply options with merge options"
msgstr "不能將 apply 套用選項與 merge 合併選項一起使用"
-#: builtin/rebase.c:1912
+#: builtin/rebase.c:1782
#, c-format
msgid "Unknown rebase backend: %s"
msgstr "未知 rebase 後端：%s"
-#: builtin/rebase.c:1937
+#: builtin/rebase.c:1812
msgid "--reschedule-failed-exec requires --exec or --interactive"
msgstr "--reschedule-failed-exec 需要 --exec 或 --interactive"
-#: builtin/rebase.c:1957
+#: builtin/rebase.c:1832
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
msgstr "不能將 '--preserve-merges' 和 '--rebase-merges' 同時使用"
-#: builtin/rebase.c:1961
+#: builtin/rebase.c:1836
msgid ""
"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
msgstr ""
"錯誤：不能將 '--preserve-merges' 和 '--reschedule-failed-exec' 同時使用"
-#: builtin/rebase.c:1985
+#: builtin/rebase.c:1860
#, c-format
msgid "invalid upstream '%s'"
msgstr "無效的上游 '%s'"
-#: builtin/rebase.c:1991
+#: builtin/rebase.c:1866
msgid "Could not create new root commit"
msgstr "不能建立新的根提交"
-#: builtin/rebase.c:2017
+#: builtin/rebase.c:1892
#, c-format
msgid "'%s': need exactly one merge base with branch"
msgstr "'%s'：只需要與分支的一個合併基礎"
-#: builtin/rebase.c:2020
+#: builtin/rebase.c:1895
#, c-format
msgid "'%s': need exactly one merge base"
msgstr "'%s'：只需要一個合併基礎"
-#: builtin/rebase.c:2028
+#: builtin/rebase.c:1903
#, c-format
msgid "Does not point to a valid commit '%s'"
msgstr "沒有指向一個有效的提交 '%s'"
-#: builtin/rebase.c:2054
+#: builtin/rebase.c:1931
#, c-format
msgid "fatal: no such branch/commit '%s'"
msgstr "致命錯誤：無此分支/提交 '%s'"
-#: builtin/rebase.c:2062 builtin/submodule--helper.c:40
-#: builtin/submodule--helper.c:1990
+#: builtin/rebase.c:1939 builtin/submodule--helper.c:40
+#: builtin/submodule--helper.c:2414
#, c-format
msgid "No such ref: %s"
msgstr "沒有這樣的引用：%s"
-#: builtin/rebase.c:2073
+#: builtin/rebase.c:1950
msgid "Could not resolve HEAD to a revision"
msgstr "無法將 HEAD 解析為一個版本"
-#: builtin/rebase.c:2111
-msgid "Cannot autostash"
-msgstr "無法 autostash"
-
-#: builtin/rebase.c:2114
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr "意外的 stash 回應：'%s'"
-
-#: builtin/rebase.c:2120
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr "不能為 '%s' 建立目錄"
-
-#: builtin/rebase.c:2123
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr "建立了 autostash：%s\n"
-
-#: builtin/rebase.c:2126
-msgid "could not reset --hard"
-msgstr "無法 reset --hard"
-
-#: builtin/rebase.c:2135
+#: builtin/rebase.c:1971
msgid "Please commit or stash them."
msgstr "請提交或儲藏修改。"
-#: builtin/rebase.c:2169
+#: builtin/rebase.c:2007
#, c-format
msgid "could not switch to %s"
msgstr "無法切換到 %s"
-#: builtin/rebase.c:2180
+#: builtin/rebase.c:2018
msgid "HEAD is up to date."
msgstr "HEAD 是最新的。"
-#: builtin/rebase.c:2182
+#: builtin/rebase.c:2020
#, c-format
msgid "Current branch %s is up to date.\n"
msgstr "目前分支 %s 是最新的。\n"
-#: builtin/rebase.c:2190
+#: builtin/rebase.c:2028
msgid "HEAD is up to date, rebase forced."
msgstr "HEAD 是最新的，強制重定基底。"
-#: builtin/rebase.c:2192
+#: builtin/rebase.c:2030
#, c-format
msgid "Current branch %s is up to date, rebase forced.\n"
msgstr "目前分支 %s 是最新的，強制重定基底。\n"
-#: builtin/rebase.c:2200
+#: builtin/rebase.c:2038
msgid "The pre-rebase hook refused to rebase."
msgstr "pre-rebase 掛鉤拒絕了重定基底動作。"
-#: builtin/rebase.c:2207
+#: builtin/rebase.c:2045
#, c-format
msgid "Changes to %s:\n"
msgstr "到 %s 的變更：\n"
-#: builtin/rebase.c:2210
+#: builtin/rebase.c:2048
#, c-format
msgid "Changes from %s to %s:\n"
msgstr "從 %s 到 %s 的變更：\n"
-#: builtin/rebase.c:2235
+#: builtin/rebase.c:2073
#, c-format
msgid "First, rewinding head to replay your work on top of it...\n"
msgstr "首先，還原開頭指標以便在其上重放您的工作...\n"
-#: builtin/rebase.c:2244
+#: builtin/rebase.c:2082
msgid "Could not detach HEAD"
msgstr "無法分離開頭指標"
-#: builtin/rebase.c:2253
+#: builtin/rebase.c:2091
#, c-format
msgid "Fast-forwarded %s to %s.\n"
msgstr "快轉 %s 到 %s。\n"
-#: builtin/receive-pack.c:33
+#: builtin/receive-pack.c:34
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <版本庫目錄>"
-#: builtin/receive-pack.c:821
+#: builtin/receive-pack.c:1276
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"
@@ -18432,7 +19910,7 @@
"若要封鎖此訊息且保持預設行為，設定 'receive.denyCurrentBranch'\n"
"設定變數為 'refuse'。"
-#: builtin/receive-pack.c:841
+#: builtin/receive-pack.c:1296
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"
@@ -18443,7 +19921,7 @@
"\n"
"To squelch this message, you can set it to 'refuse'."
msgstr ""
-"預設禁止刪除目前分支，因為下一次 'git clone' 將不會簽出任何檔案，\n"
+"預設禁止刪除目前分支，因為下一次 'git clone' 將不會檢出任何檔案，\n"
"導致困惑。\n"
"\n"
"您可以在遠端版本庫中設定 'receive.denyDeleteCurrent' 設定變數為\n"
@@ -18451,11 +19929,11 @@
"\n"
"若要封鎖此訊息，您可以設定它為 'refuse'。"
-#: builtin/receive-pack.c:1938
+#: builtin/receive-pack.c:2481
msgid "quiet"
msgstr "靜默模式"
-#: builtin/receive-pack.c:1952
+#: builtin/receive-pack.c:2495
msgid "You must specify a directory."
msgstr "您必須指定一個目錄。"
@@ -18486,36 +19964,36 @@
msgid "'%s' is not a valid timestamp"
msgstr "'%s' 不是一個有效的時間戳"
-#: builtin/reflog.c:606
+#: builtin/reflog.c:609
#, c-format
msgid "Marking reachable objects..."
msgstr "正在標記可以取得物件..."
-#: builtin/reflog.c:644
+#: builtin/reflog.c:647
#, c-format
msgid "%s points nowhere!"
msgstr "%s 指向不存在！"
-#: builtin/reflog.c:696
+#: builtin/reflog.c:699
msgid "no reflog specified to delete"
msgstr "未指定要刪除的引用日誌"
-#: builtin/reflog.c:705
+#: builtin/reflog.c:708
#, c-format
msgid "not a reflog: %s"
msgstr "不是一個引用日誌：%s"
-#: builtin/reflog.c:710
+#: builtin/reflog.c:713
#, c-format
msgid "no reflog for '%s'"
msgstr "沒有 '%s' 的引用日誌"
-#: builtin/reflog.c:756
+#: builtin/reflog.c:759
#, c-format
msgid "invalid ref format: %s"
msgstr "無效的引用格式：%s"
-#: builtin/reflog.c:765
+#: builtin/reflog.c:768
msgid "git reflog [ show | expire | delete | exists ]"
msgstr "git reflog [ show | expire | delete | exists ]"
@@ -18636,7 +20114,7 @@
#: builtin/remote.c:172
msgid "master branch"
-msgstr "主線分支"
+msgstr "master 分支"
#: builtin/remote.c:174
msgid "set up remote as a mirror to push to or fetch from"
@@ -18650,40 +20128,35 @@
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "指定要追蹤的分支只在與取得鏡像同時使用才有意義"
-#: builtin/remote.c:195 builtin/remote.c:696
+#: builtin/remote.c:195 builtin/remote.c:700
#, c-format
msgid "remote %s already exists."
msgstr "遠端 %s 已經存在。"
-#: builtin/remote.c:199 builtin/remote.c:700
-#, c-format
-msgid "'%s' is not a valid remote name"
-msgstr "'%s' 不是一個有效的遠端名稱"
-
-#: builtin/remote.c:239
+#: builtin/remote.c:240
#, c-format
msgid "Could not setup master '%s'"
msgstr "無法設定 master '%s'"
-#: builtin/remote.c:354
+#: builtin/remote.c:355
#, c-format
msgid "Could not get fetch map for refspec %s"
msgstr "無法得到引用規格 %s 的取得列表"
-#: builtin/remote.c:453 builtin/remote.c:461
+#: builtin/remote.c:454 builtin/remote.c:462
msgid "(matching)"
msgstr "（符合）"
-#: builtin/remote.c:465
+#: builtin/remote.c:466
msgid "(delete)"
msgstr "（刪除）"
-#: builtin/remote.c:653
+#: builtin/remote.c:655
#, c-format
msgid "could not set '%s'"
msgstr "無法設定 '%s'"
-#: builtin/remote.c:658
+#: builtin/remote.c:660
#, c-format
msgid ""
"The %s configuration remote.pushDefault in:\n"
@@ -18694,17 +20167,17 @@
"\t%s:%d\n"
"現命名成不存在的遠端分支 '%s'"
-#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940
+#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946
#, c-format
msgid "No such remote: '%s'"
msgstr "沒有此遠端版本庫：'%s'"
-#: builtin/remote.c:706
+#: builtin/remote.c:710
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "不能重新命名設定小節 '%s' 到 '%s'"
-#: builtin/remote.c:726
+#: builtin/remote.c:730
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -18715,17 +20188,17 @@
"\t%s\n"
"\t如果必要請手動更新設定。"
-#: builtin/remote.c:766
+#: builtin/remote.c:770
#, c-format
msgid "deleting '%s' failed"
msgstr "刪除 '%s' 失敗"
-#: builtin/remote.c:800
+#: builtin/remote.c:804
#, c-format
msgid "creating '%s' failed"
msgstr "建立 '%s' 失敗"
-#: builtin/remote.c:876
+#: builtin/remote.c:882
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -18734,118 +20207,118 @@
"to delete them, use:"
msgstr[0] "注意：ref/remotes 層級之外的一個分支未被移除。要刪除它，使用："
-#: builtin/remote.c:890
+#: builtin/remote.c:896
#, c-format
msgid "Could not remove config section '%s'"
msgstr "不能移除設定小節 '%s'"
-#: builtin/remote.c:993
+#: builtin/remote.c:999
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " 新的（下一次取得將儲存於 remotes/%s）"
-#: builtin/remote.c:996
+#: builtin/remote.c:1002
msgid " tracked"
msgstr " 已追蹤"
-#: builtin/remote.c:998
+#: builtin/remote.c:1004
msgid " stale (use 'git remote prune' to remove)"
msgstr " 過時（使用 'git remote prune' 來移除）"
-#: builtin/remote.c:1000
+#: builtin/remote.c:1006
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:1041
+#: builtin/remote.c:1047
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "無效的 branch.%s.merge，不能重定基底到一個以上的分支"
-#: builtin/remote.c:1050
+#: builtin/remote.c:1056
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "互動式重定基底到遠端 %s"
-#: builtin/remote.c:1052
+#: builtin/remote.c:1058
#, c-format
msgid "rebases interactively (with merges) onto remote %s"
msgstr "互動式重定基底（含合併提交）到遠端 %s"
-#: builtin/remote.c:1055
+#: builtin/remote.c:1061
#, c-format
msgid "rebases onto remote %s"
msgstr "重定基底到遠端 %s"
-#: builtin/remote.c:1059
+#: builtin/remote.c:1065
#, c-format
msgid " merges with remote %s"
msgstr " 與遠端 %s 合併"
-#: builtin/remote.c:1062
+#: builtin/remote.c:1068
#, c-format
msgid "merges with remote %s"
msgstr "與遠端 %s 合併"
-#: builtin/remote.c:1065
+#: builtin/remote.c:1071
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s 以及和遠端 %s\n"
-#: builtin/remote.c:1108
+#: builtin/remote.c:1114
msgid "create"
msgstr "建立"
-#: builtin/remote.c:1111
+#: builtin/remote.c:1117
msgid "delete"
msgstr "刪除"
-#: builtin/remote.c:1115
+#: builtin/remote.c:1121
msgid "up to date"
msgstr "最新"
-#: builtin/remote.c:1118
+#: builtin/remote.c:1124
msgid "fast-forwardable"
msgstr "可快轉"
-#: builtin/remote.c:1121
+#: builtin/remote.c:1127
msgid "local out of date"
msgstr "本機已過時"
-#: builtin/remote.c:1128
+#: builtin/remote.c:1134
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s 強制推送至 %-*s (%s)"
-#: builtin/remote.c:1131
+#: builtin/remote.c:1137
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s 推送至 %-*s (%s)"
-#: builtin/remote.c:1135
+#: builtin/remote.c:1141
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s 強制推送至 %s"
-#: builtin/remote.c:1138
+#: builtin/remote.c:1144
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s 推送至 %s"
-#: builtin/remote.c:1206
+#: builtin/remote.c:1212
msgid "do not query remotes"
msgstr "不查詢遠端"
-#: builtin/remote.c:1233
+#: builtin/remote.c:1239
#, c-format
msgid "* remote %s"
msgstr "* 遠端 %s"
-#: builtin/remote.c:1234
+#: builtin/remote.c:1240
#, c-format
msgid " Fetch URL: %s"
msgstr " 取得位址：%s"
-#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390
+#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
msgid "(no URL)"
msgstr "(無 URL)"
@@ -18853,316 +20326,305 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1249 builtin/remote.c:1251
+#: builtin/remote.c:1255 builtin/remote.c:1257
#, c-format
msgid " Push URL: %s"
msgstr " 推送位址：%s"
-#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257
+#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD 分支：%s"
# 譯者：中文字串拼接，可刪除前導空格
-#: builtin/remote.c:1253
+#: builtin/remote.c:1259
msgid "(not queried)"
msgstr "（未查詢）"
-#: builtin/remote.c:1255
+#: builtin/remote.c:1261
msgid "(unknown)"
msgstr "（未知）"
-#: builtin/remote.c:1259
+#: builtin/remote.c:1265
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " HEAD 分支（遠端 HEAD 模糊，可能是下列中的一個）：\n"
-#: builtin/remote.c:1271
+#: builtin/remote.c:1277
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " 遠端分支：%s"
# 譯者：中文字串拼接，可刪除前導空格
-#: builtin/remote.c:1274 builtin/remote.c:1300
+#: builtin/remote.c:1280 builtin/remote.c:1306
msgid " (status not queried)"
msgstr "（狀態未查詢）"
-#: builtin/remote.c:1283
+#: builtin/remote.c:1289
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " 為 'git pull' 設定的本機分支："
-#: builtin/remote.c:1291
+#: builtin/remote.c:1297
msgid " Local refs will be mirrored by 'git push'"
msgstr " 本機引用將在 'git push' 時被鏡像"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1303
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
msgstr[0] " 為 'git push' 設定的本機引用%s："
-#: builtin/remote.c:1318
+#: builtin/remote.c:1324
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "根據遠端設定 refs/remotes/<名稱>/HEAD"
-#: builtin/remote.c:1320
+#: builtin/remote.c:1326
msgid "delete refs/remotes/<name>/HEAD"
msgstr "刪除 refs/remotes/<名稱>/HEAD"
-#: builtin/remote.c:1335
+#: builtin/remote.c:1341
msgid "Cannot determine remote HEAD"
msgstr "無法確定遠端 HEAD"
-#: builtin/remote.c:1337
+#: builtin/remote.c:1343
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "多個遠端 HEAD 分支。請明確地選擇一個用指令："
-#: builtin/remote.c:1347
+#: builtin/remote.c:1353
#, c-format
msgid "Could not delete %s"
msgstr "無法刪除 %s"
-#: builtin/remote.c:1355
+#: builtin/remote.c:1361
#, c-format
msgid "Not a valid ref: %s"
msgstr "不是一個有效引用：%s"
-#: builtin/remote.c:1357
+#: builtin/remote.c:1363
#, c-format
msgid "Could not setup %s"
msgstr "不能設定 %s"
# 譯者：請維持前導空格
-#: builtin/remote.c:1375
+#: builtin/remote.c:1381
#, c-format
msgid " %s will become dangling!"
msgstr " %s 將成為懸空狀態！"
# 譯者：請維持前導空格
-#: builtin/remote.c:1376
+#: builtin/remote.c:1382
#, c-format
msgid " %s has become dangling!"
msgstr " %s 已成為懸空狀態！"
-#: builtin/remote.c:1386
+#: builtin/remote.c:1392
#, c-format
msgid "Pruning %s"
msgstr "修剪 %s"
-#: builtin/remote.c:1387
+#: builtin/remote.c:1393
#, c-format
msgid "URL: %s"
msgstr "URL：%s"
-#: builtin/remote.c:1403
+#: builtin/remote.c:1409
#, c-format
msgid " * [would prune] %s"
msgstr " * [將刪除] %s"
-#: builtin/remote.c:1406
+#: builtin/remote.c:1412
#, c-format
msgid " * [pruned] %s"
msgstr " * [已刪除] %s"
-#: builtin/remote.c:1451
+#: builtin/remote.c:1457
msgid "prune remotes after fetching"
msgstr "抓取後清除遠端"
-#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636
+#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
#, c-format
msgid "No such remote '%s'"
msgstr "沒有此遠端 '%s'"
-#: builtin/remote.c:1530
+#: builtin/remote.c:1539
msgid "add branch"
msgstr "新增分支"
-#: builtin/remote.c:1537
+#: builtin/remote.c:1546
msgid "no remote specified"
msgstr "未指定遠端"
-#: builtin/remote.c:1554
+#: builtin/remote.c:1563
msgid "query push URLs rather than fetch URLs"
msgstr "查詢推送 URL 位址，而非取得 URL 位址"
-#: builtin/remote.c:1556
+#: builtin/remote.c:1565
msgid "return all URLs"
msgstr "返回所有 URL 位址"
-#: builtin/remote.c:1584
+#: builtin/remote.c:1595
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "沒有給遠端版本庫 '%s' 設定 URL"
-#: builtin/remote.c:1610
+#: builtin/remote.c:1621
msgid "manipulate push URLs"
msgstr "動作推送 URLS"
-#: builtin/remote.c:1612
+#: builtin/remote.c:1623
msgid "add URL"
msgstr "新增 URL"
-#: builtin/remote.c:1614
+#: builtin/remote.c:1625
msgid "delete URLs"
msgstr "刪除 URL"
-#: builtin/remote.c:1621
+#: builtin/remote.c:1632
msgid "--add --delete doesn't make sense"
msgstr "--add --delete 無意義"
-#: builtin/remote.c:1660
+#: builtin/remote.c:1673
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "無效的舊 URL 符合範本：%s"
-#: builtin/remote.c:1668
+#: builtin/remote.c:1681
#, c-format
msgid "No such URL found: %s"
msgstr "未找到此 URL：%s"
-#: builtin/remote.c:1670
+#: builtin/remote.c:1683
msgid "Will not delete all non-push URLs"
msgstr "將不會刪除所有非推送 URL 位址"
-#: builtin/repack.c:23
+#: builtin/repack.c:26
msgid "git repack [<options>]"
msgstr "git repack [<選項>]"
-#: builtin/repack.c:28
+#: builtin/repack.c:31
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 設定。"
+"或停用 pack.writebitmaps 設定。"
-#: builtin/repack.c:191
+#: builtin/repack.c:198
msgid "could not start pack-objects to repack promisor objects"
msgstr "無法開始 pack-objects 來重新打包 promisor 物件"
-#: builtin/repack.c:230 builtin/repack.c:416
+#: builtin/repack.c:270 builtin/repack.c:446
msgid "repack: Expecting full hex object ID lines only from pack-objects."
msgstr "repack：期望來自 pack-objects 的完整十六進位物件 ID。"
-#: builtin/repack.c:254
+#: builtin/repack.c:294
msgid "could not finish pack-objects to repack promisor objects"
msgstr "無法完成 pack-objects 來重新打包 promisor 物件"
-#: builtin/repack.c:292
+#: builtin/repack.c:322
msgid "pack everything in a single pack"
msgstr "所有內容打包到一個包檔案中"
-#: builtin/repack.c:294
+#: builtin/repack.c:324
msgid "same as -a, and turn unreachable objects loose"
msgstr "和 -a 相同，並將無法取得的物件設為鬆散物件"
-#: builtin/repack.c:297
+#: builtin/repack.c:327
msgid "remove redundant packs, and run git-prune-packed"
msgstr "刪除多餘的包，執行 git-prune-packed"
-#: builtin/repack.c:299
+#: builtin/repack.c:329
msgid "pass --no-reuse-delta to git-pack-objects"
msgstr "向 git-pack-objects 傳遞參數 --no-reuse-delta"
-#: builtin/repack.c:301
+#: builtin/repack.c:331
msgid "pass --no-reuse-object to git-pack-objects"
msgstr "向 git-pack-objects 傳遞參數 --no-reuse-object"
-#: builtin/repack.c:303
+#: builtin/repack.c:333
msgid "do not run git-update-server-info"
msgstr "不執行 git-update-server-info"
-#: builtin/repack.c:306
+#: builtin/repack.c:336
msgid "pass --local to git-pack-objects"
msgstr "向 git-pack-objects 傳遞參數 --local"
-#: builtin/repack.c:308
+#: builtin/repack.c:338
msgid "write bitmap index"
msgstr "寫 bitmap 索引"
-#: builtin/repack.c:310
+#: builtin/repack.c:340
msgid "pass --delta-islands to git-pack-objects"
msgstr "向 git-pack-objects 傳遞參數 --delta-islands"
-#: builtin/repack.c:311
+#: builtin/repack.c:341
msgid "approxidate"
msgstr "近似日期"
-#: builtin/repack.c:312
+#: builtin/repack.c:342
msgid "with -A, do not loosen objects older than this"
msgstr "使用 -A，不要將早於提供時間的物件過期"
-#: builtin/repack.c:314
+#: builtin/repack.c:344
msgid "with -a, repack unreachable objects"
msgstr "使用 -a ，重新對無法取得物件打包"
-#: builtin/repack.c:316
+#: builtin/repack.c:346
msgid "size of the window used for delta compression"
msgstr "用於增量壓縮的視窗值"
-#: builtin/repack.c:317 builtin/repack.c:323
+#: builtin/repack.c:347 builtin/repack.c:353
msgid "bytes"
msgstr "位元組"
-#: builtin/repack.c:318
+#: builtin/repack.c:348
msgid "same as the above, but limit memory size instead of entries count"
msgstr "和上面的相似，但限制記憶體大小而非條目數"
-#: builtin/repack.c:320
+#: builtin/repack.c:350
msgid "limits the maximum delta depth"
msgstr "限制最大增量深度"
-#: builtin/repack.c:322
+#: builtin/repack.c:352
msgid "limits the maximum number of threads"
msgstr "限制最大執行緒數"
-#: builtin/repack.c:324
+#: builtin/repack.c:354
msgid "maximum size of each packfile"
msgstr "每個 packfile 的最大尺寸"
-#: builtin/repack.c:326
+#: builtin/repack.c:356
msgid "repack objects in packs marked with .keep"
msgstr "對標記為 .keep 的包中的物件重新打包"
-#: builtin/repack.c:328
+#: builtin/repack.c:358
msgid "do not repack this pack"
msgstr "不要對該包檔案重新打包"
-#: builtin/repack.c:338
+#: builtin/repack.c:368
msgid "cannot delete packs in a precious-objects repo"
msgstr "不能刪除珍品版本庫中的打包檔案"
-#: builtin/repack.c:342
+#: builtin/repack.c:372
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable 和 -A 不相容"
-#: builtin/repack.c:425
+#: builtin/repack.c:455
msgid "Nothing new to pack."
msgstr "沒有新的要打包。"
-#: builtin/repack.c:486
+#: builtin/repack.c:485
#, 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"
+msgid "missing required file: %s"
+msgstr "缺少必要檔案：%s"
-#: builtin/repack.c:534
+#: builtin/repack.c:487
#, c-format
-msgid "failed to remove '%s'"
-msgstr "刪除 '%s' 失敗"
+msgid "could not unlink: %s"
+msgstr "無法取消連結：%s"
#: builtin/replace.c:22
msgid "git replace [-f] <object> <replacement>"
@@ -19466,94 +20928,94 @@
msgid "keep"
msgstr "保持"
-#: builtin/reset.c:82
+#: builtin/reset.c:83
msgid "You do not have a valid HEAD."
msgstr "您沒有一個有效的 HEAD。"
-#: builtin/reset.c:84
+#: builtin/reset.c:85
msgid "Failed to find tree of HEAD."
msgstr "無法找到 HEAD 指向的樹。"
-#: builtin/reset.c:90
+#: builtin/reset.c:91
#, c-format
msgid "Failed to find tree of %s."
msgstr "無法找到 %s 指向的樹。"
-#: builtin/reset.c:115
+#: builtin/reset.c:116
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD 現在位於 %s"
# 譯者：漢字之間無空格，故刪除%s前後空格
-#: builtin/reset.c:194
+#: builtin/reset.c:195
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "在合併過程中不能做%s重設動作。"
-#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595
-#: builtin/stash.c:619
+#: builtin/reset.c:295 builtin/stash.c:587 builtin/stash.c:661
+#: builtin/stash.c:685
msgid "be quiet, only report errors"
msgstr "安靜模式，只報告錯誤"
-#: builtin/reset.c:296
+#: builtin/reset.c:297
msgid "reset HEAD and index"
msgstr "重設 HEAD 和索引"
-#: builtin/reset.c:297
+#: builtin/reset.c:298
msgid "reset only HEAD"
msgstr "只重設 HEAD"
-#: builtin/reset.c:299 builtin/reset.c:301
+#: builtin/reset.c:300 builtin/reset.c:302
msgid "reset HEAD, index and working tree"
msgstr "重設 HEAD、索引和工作區"
-#: builtin/reset.c:303
+#: builtin/reset.c:304
msgid "reset HEAD but keep local changes"
msgstr "重設 HEAD 但儲存本機變更"
-#: builtin/reset.c:309
+#: builtin/reset.c:310
msgid "record only the fact that removed paths will be added later"
msgstr "將刪除的路徑標記為稍後新增"
-#: builtin/reset.c:343
+#: builtin/reset.c:344
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "無法將 '%s' 解析為一個有效的版本。"
-#: builtin/reset.c:351
+#: builtin/reset.c:352
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "無法將 '%s' 解析為一個有效的樹狀物件。"
-#: builtin/reset.c:360
+#: builtin/reset.c:361
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch 與 --{hard、mixed、soft} 選項不相容"
-#: builtin/reset.c:370
+#: builtin/reset.c:371
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr "--mixed 帶路徑已棄用，而是用 'git reset -- <路徑>'。"
# 譯者：漢字之間無空格，故刪除%s前後空格
-#: builtin/reset.c:372
+#: builtin/reset.c:373
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "不能帶路徑進行%s重設。"
# 譯者：漢字之間無空格，故刪除%s前後空格
-#: builtin/reset.c:387
+#: builtin/reset.c:388
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "不能對純版本庫進行%s重設"
-#: builtin/reset.c:391
+#: builtin/reset.c:392
msgid "-N can only be used with --mixed"
msgstr "-N 只能和 --mixed 同時使用"
-#: builtin/reset.c:412
+#: builtin/reset.c:413
msgid "Unstaged changes after reset:"
msgstr "重設後取消暫存的變更："
-#: builtin/reset.c:415
+#: builtin/reset.c:416
#, c-format
msgid ""
"\n"
@@ -19565,48 +21027,48 @@
"重設後，枚舉未暫存變更花費了 %.2f 秒。 您可以使用 '--quiet' 避免此情況。\n"
"將設定變數 reset.quiet 設定為 true 可使其成為預設值。\n"
-#: builtin/reset.c:425
+#: builtin/reset.c:434
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "不能重設索引檔案至版本 '%s'。"
-#: builtin/reset.c:429
+#: builtin/reset.c:439
msgid "Could not write new index file."
msgstr "不能寫入新的索引檔案。"
-#: builtin/rev-list.c:499
+#: builtin/rev-list.c:534
msgid "cannot combine --exclude-promisor-objects and --missing"
msgstr "不能同時使用 --exclude-promisor-objects 和 --missing 選項"
-#: builtin/rev-list.c:560
+#: builtin/rev-list.c:595
msgid "object filtering requires --objects"
msgstr "物件過濾需要 --objects"
-#: builtin/rev-list.c:610
+#: builtin/rev-list.c:651
msgid "rev-list does not support display of notes"
msgstr "rev-list 不支援顯示註解"
-#: builtin/rev-list.c:615
+#: builtin/rev-list.c:656
msgid "marked counting is incompatible with --objects"
msgstr "--objects 不相容標記計數 (marked counting)"
-#: 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"
@@ -19698,11 +21160,11 @@
msgid "keep redundant, empty commits"
msgstr "保持多餘的、空的提交"
-#: builtin/revert.c:232
+#: builtin/revert.c:239
msgid "revert failed"
msgstr "還原失敗"
-#: builtin/revert.c:245
+#: builtin/revert.c:252
msgid "cherry-pick failed"
msgstr "揀選失敗"
@@ -19794,55 +21256,76 @@
"receive-pack>] [--verbose] [--thin] [--atomic] [<主機>:]<目錄> [<引用>...]\n"
" --all 和明確的 <引用> 互斥。"
-#: builtin/send-pack.c:163
+#: builtin/send-pack.c:188
msgid "remote name"
msgstr "遠端名稱"
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:201
msgid "use stateless RPC protocol"
msgstr "使用無狀態的 RPC 協定"
-#: builtin/send-pack.c:178
+#: builtin/send-pack.c:202
msgid "read refs from stdin"
msgstr "從標準輸入讀取引用"
-#: builtin/send-pack.c:179
+#: builtin/send-pack.c:203
msgid "print status from remote helper"
msgstr "列印來自遠端 helper 的狀態"
-#: builtin/shortlog.c:14
+#: builtin/shortlog.c:16
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git shortlog [<選項>] [<版本範圍>] [[--] <路徑>...]"
-#: builtin/shortlog.c:15
+#: builtin/shortlog.c:17
msgid "git log --pretty=short | git shortlog [<options>]"
msgstr "git log --pretty=short | git shortlog [<選項>]"
-#: builtin/shortlog.c:264
-msgid "Group by committer rather than author"
-msgstr "按照提交者分組而不是作者"
+#: builtin/shortlog.c:123
+msgid "using multiple --group options with stdin is not supported"
+msgstr "不支援在標準輸入使用多個 --group 選項"
-#: builtin/shortlog.c:266
+#: builtin/shortlog.c:133
+msgid "using --group=trailer with stdin is not supported"
+msgstr "不支援在標準輸入使用 --group=trailer"
+
+#: builtin/shortlog.c:323
+#, c-format
+msgid "unknown group type: %s"
+msgstr "未知群組類型：%s"
+
+#: builtin/shortlog.c:351
+msgid "group by committer rather than author"
+msgstr "依提交者而非作者分組"
+
+#: builtin/shortlog.c:354
msgid "sort output according to the number of commits per author"
msgstr "根據每個作者的提交數量排序"
-#: builtin/shortlog.c:268
-msgid "Suppress commit descriptions, only provides commit count"
+#: builtin/shortlog.c:356
+msgid "suppress commit descriptions, only provides commit count"
msgstr "隱藏提交說明，只提供提交數量"
-#: builtin/shortlog.c:270
-msgid "Show the email address of each author"
+#: builtin/shortlog.c:358
+msgid "show the email address of each author"
msgstr "顯示每個作者的電子信件位址"
-#: builtin/shortlog.c:271
+#: builtin/shortlog.c:359
msgid "<w>[,<i1>[,<i2>]]"
msgstr "<w>[,<i1>[,<i2>]]"
-#: builtin/shortlog.c:272
-msgid "Linewrap output"
+#: builtin/shortlog.c:360
+msgid "linewrap output"
msgstr "折行輸出"
-#: builtin/shortlog.c:301
+#: builtin/shortlog.c:362
+msgid "field"
+msgstr "欄位"
+
+#: builtin/shortlog.c:363
+msgid "group by field"
+msgstr "依欄位分組"
+
+#: builtin/shortlog.c:391
msgid "too many arguments given outside repository"
msgstr "版本庫外執行提供了太多的參數"
@@ -19977,6 +21460,14 @@
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 | --"
@@ -20022,16 +21513,24 @@
msgstr "顯示從標準輸入中讀入的不在本機版本庫中的引用"
#: builtin/sparse-checkout.c:21
-msgid "git sparse-checkout (init|list|set|add|disable) <options>"
-msgstr "git sparse-checkout (init|list|set|add|disable) <選項>"
+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:64
+#: builtin/sparse-checkout.c:45
+msgid "git sparse-checkout list"
+msgstr "git sparse-checkout list"
+
+#: builtin/sparse-checkout.c:71
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
msgstr "這不是稀疏工作區（sparse-checkout 檔案可能不存在）"
-#: builtin/sparse-checkout.c:225
+#: builtin/sparse-checkout.c:223
msgid "failed to create directory for sparse-checkout file"
-msgstr "無法建立稀疏簽出檔案的目錄"
+msgstr "無法建立稀疏檢出檔案的目錄"
+
+#: builtin/sparse-checkout.c:264
+msgid "unable to upgrade repository format to enable worktreeConfig"
+msgstr "無法升級版本庫格式，以致無法啟用 worktreeConfig"
#: builtin/sparse-checkout.c:266
msgid "failed to set extensions.worktreeConfig setting"
@@ -20043,48 +21542,44 @@
#: builtin/sparse-checkout.c:302
msgid "initialize the sparse-checkout in cone mode"
-msgstr "以 cone 模式初始化稀疏簽出"
+msgstr "以 cone 模式初始化稀疏檢出"
-#: builtin/sparse-checkout.c:308
-msgid "initialize sparse-checkout"
-msgstr "初始化稀疏簽出"
-
-#: builtin/sparse-checkout.c:341
+#: builtin/sparse-checkout.c:339
#, c-format
msgid "failed to open '%s'"
msgstr "無法開啟「%s」"
-#: builtin/sparse-checkout.c:398
+#: builtin/sparse-checkout.c:396
#, c-format
msgid "could not normalize path %s"
msgstr "無法標準化路徑 %s"
-#: builtin/sparse-checkout.c:410
+#: builtin/sparse-checkout.c:408
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
msgstr "git sparse-checkout (set|add) (--stdin | <樣式>)"
-#: builtin/sparse-checkout.c:435
+#: builtin/sparse-checkout.c:433
#, c-format
msgid "unable to unquote C-style string '%s'"
msgstr "無法去掉 '%s' C 樣式字串的引號"
-#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513
+#: builtin/sparse-checkout.c:487 builtin/sparse-checkout.c:511
msgid "unable to load existing sparse-checkout patterns"
-msgstr "無法載入現存的稀疏簽出樣式"
+msgstr "無法載入現存的稀疏檢出樣式"
-#: builtin/sparse-checkout.c:558
+#: builtin/sparse-checkout.c:556
msgid "read patterns from standard in"
msgstr "從標準輸入讀取樣式"
-#: builtin/sparse-checkout.c:564
-msgid "set sparse-checkout patterns"
-msgstr "設定稀疏簽出樣式"
+#: builtin/sparse-checkout.c:571
+msgid "git sparse-checkout reapply"
+msgstr "git sparse-checkout reapply"
-#: builtin/sparse-checkout.c:581
-msgid "disable sparse-checkout"
-msgstr "停用稀疏簽出"
+#: builtin/sparse-checkout.c:590
+msgid "git sparse-checkout disable"
+msgstr "git sparse-checkout disable"
-#: builtin/sparse-checkout.c:593
+#: builtin/sparse-checkout.c:618
msgid "error while refreshing working directory"
msgstr "重新整理工作目錄時發生錯誤"
@@ -20164,7 +21659,7 @@
msgid "Too many revisions specified:%s"
msgstr "指定了太多的版本：%s"
-#: builtin/stash.c:162 git-legacy-stash.sh:549
+#: builtin/stash.c:162
msgid "No stash entries found."
msgstr "未發現儲藏條目。"
@@ -20173,158 +21668,168 @@
msgid "%s is not a valid reference"
msgstr "%s 不是一個有效的引用名"
-#: builtin/stash.c:225 git-legacy-stash.sh:75
-msgid "git stash clear with parameters is unimplemented"
-msgstr "git stash clear 不支援參數"
+#: builtin/stash.c:225
+msgid "git stash clear with arguments is unimplemented"
+msgstr "尚未實作傳入參數的 git stash clear"
-#: builtin/stash.c:404
+#: builtin/stash.c:429
+#, c-format
+msgid ""
+"WARNING: Untracked file in way of tracked file! Renaming\n"
+" %s -> %s\n"
+" to make room.\n"
+msgstr ""
+
+#: builtin/stash.c:490
msgid "cannot apply a stash in the middle of a merge"
msgstr "無法在合併過程套用儲藏"
-#: builtin/stash.c:415
+#: builtin/stash.c:501
#, 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:508
+msgid "conflicts in index. Try without --index."
+msgstr "索引中有衝突。請試試看不用 --index。"
-#: builtin/stash.c:428
+#: builtin/stash.c:514
msgid "could not save index tree"
msgstr "不能儲存索引樹"
-#: builtin/stash.c:437
+#: builtin/stash.c:523
msgid "could not restore untracked files from stash"
msgstr "無法從儲藏條目中復原未追蹤檔案"
-#: builtin/stash.c:451
+#: builtin/stash.c:537
#, c-format
msgid "Merging %s with %s"
msgstr "正在合併 %s 和 %s"
-#: builtin/stash.c:461 git-legacy-stash.sh:681
+#: builtin/stash.c:547
msgid "Index was not unstashed."
msgstr "索引未從儲藏中復原。"
-#: builtin/stash.c:522 builtin/stash.c:621
+#: builtin/stash.c:589 builtin/stash.c:687
msgid "attempt to recreate the index"
msgstr "嘗試重建索引"
-#: builtin/stash.c:555
+#: builtin/stash.c:633
#, c-format
msgid "Dropped %s (%s)"
msgstr "捨棄了 %s（%s）"
-#: builtin/stash.c:558
+#: builtin/stash.c:636
#, c-format
msgid "%s: Could not drop stash entry"
msgstr "%s：無法捨棄儲藏條目"
-#: builtin/stash.c:583
+#: builtin/stash.c:649
#, c-format
msgid "'%s' is not a stash reference"
msgstr "'%s' 不是一個儲藏引用"
-#: builtin/stash.c:633 git-legacy-stash.sh:695
+#: builtin/stash.c:699
msgid "The stash entry is kept in case you need it again."
msgstr "儲藏條目被保留以備您再次需要。"
-#: builtin/stash.c:656 git-legacy-stash.sh:713
+#: builtin/stash.c:722
msgid "No branch name specified"
msgstr "未指定分支名"
-#: builtin/stash.c:796 builtin/stash.c:833
+#: builtin/stash.c:866 builtin/stash.c:903
#, c-format
msgid "Cannot update %s with %s"
msgstr "無法用 %2$s 更新 %1$s"
-#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
+#: builtin/stash.c:884 builtin/stash.c:1538 builtin/stash.c:1603
msgid "stash message"
msgstr "儲藏說明"
-#: builtin/stash.c:824
+#: builtin/stash.c:894
msgid "\"git stash store\" requires one <commit> argument"
msgstr "\"git stash store\" 需要一個 <提交> 參數"
-#: builtin/stash.c:1049 git-legacy-stash.sh:218
+#: builtin/stash.c:1109
msgid "No changes selected"
msgstr "沒有選擇變更"
-#: builtin/stash.c:1149 git-legacy-stash.sh:150
+#: builtin/stash.c:1209
msgid "You do not have the initial commit yet"
msgstr "您尚未建立初始提交"
-#: builtin/stash.c:1176 git-legacy-stash.sh:165
+#: builtin/stash.c:1236
msgid "Cannot save the current index state"
msgstr "無法儲存目前索引狀態"
-#: builtin/stash.c:1185 git-legacy-stash.sh:180
+#: builtin/stash.c:1245
msgid "Cannot save the untracked files"
msgstr "無法儲存未追蹤檔案"
-#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201
-#: git-legacy-stash.sh:214
+#: builtin/stash.c:1256 builtin/stash.c:1265
msgid "Cannot save the current worktree state"
msgstr "無法儲存目前工作區狀態"
-#: builtin/stash.c:1233 git-legacy-stash.sh:234
+#: builtin/stash.c:1293
msgid "Cannot record working tree state"
msgstr "不能記錄工作區狀態"
-#: builtin/stash.c:1282 git-legacy-stash.sh:338
+#: builtin/stash.c:1342
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "不能同時使用參數 --patch 和 --include-untracked 或 --all"
-#: builtin/stash.c:1298
+#: builtin/stash.c:1358
msgid "Did you forget to 'git add'?"
msgstr "您是否忘了執行 'git add'？"
-#: builtin/stash.c:1313 git-legacy-stash.sh:346
+#: builtin/stash.c:1373
msgid "No local changes to save"
msgstr "沒有要儲存的本機修改"
-#: builtin/stash.c:1320 git-legacy-stash.sh:351
+#: builtin/stash.c:1380
msgid "Cannot initialize stash"
msgstr "無法初始化儲藏"
-#: builtin/stash.c:1335 git-legacy-stash.sh:355
+#: builtin/stash.c:1395
msgid "Cannot save the current status"
msgstr "無法儲存目前狀態"
-#: builtin/stash.c:1340
+#: builtin/stash.c:1400
#, c-format
msgid "Saved working directory and index state %s"
msgstr "儲存工作目錄和索引狀態 %s"
-#: builtin/stash.c:1430 git-legacy-stash.sh:385
+#: builtin/stash.c:1490
msgid "Cannot remove worktree changes"
msgstr "無法刪除工作區變更"
-#: builtin/stash.c:1469 builtin/stash.c:1534
+#: builtin/stash.c:1529 builtin/stash.c:1594
msgid "keep index"
msgstr "保持索引"
-#: builtin/stash.c:1471 builtin/stash.c:1536
+#: builtin/stash.c:1531 builtin/stash.c:1596
msgid "stash in patch mode"
msgstr "以修補檔模式儲藏"
-#: builtin/stash.c:1472 builtin/stash.c:1537
+#: builtin/stash.c:1532 builtin/stash.c:1597
msgid "quiet mode"
msgstr "靜默模式"
-#: builtin/stash.c:1474 builtin/stash.c:1539
+#: builtin/stash.c:1534 builtin/stash.c:1599
msgid "include untracked files in stash"
msgstr "儲藏中包含未追蹤檔案"
-#: builtin/stash.c:1476 builtin/stash.c:1541
+#: builtin/stash.c:1536 builtin/stash.c:1601
msgid "include ignore files"
msgstr "包含忽略的檔案"
-#: builtin/stash.c:1600
-#, c-format
-msgid "could not exec %s"
-msgstr "不能執行 %s"
+#: builtin/stash.c:1636
+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]"
@@ -20342,7 +21847,7 @@
msgid "prepend comment character and space to each line"
msgstr "為每一行的行首新增備註符和空格"
-#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999
+#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "期望一個完整的引用名稱，卻得到 %s"
@@ -20356,7 +21861,7 @@
msgid "cannot strip one component off url '%s'"
msgstr "無法從 url '%s' 剝離一個元件"
-#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819
msgid "alternative anchor for relative paths"
msgstr "相對路徑的替代錨記（anchor）"
@@ -20364,8 +21869,8 @@
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<路徑>] [<路徑>...]"
-#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c: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"
@@ -20395,16 +21900,17 @@
"."
#: builtin/submodule--helper.c:565
-msgid "Suppress output of entering each submodule command"
-msgstr "阻止進入每一個子模組指令的輸出"
+msgid "suppress output of entering each submodule command"
+msgstr "隱藏每個子模組進入命令的輸出"
-#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063
-msgid "Recurse into nested submodules"
+#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888
+#: 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] [--] <指令>"
+msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>"
#: builtin/submodule--helper.c:599
#, c-format
@@ -20413,100 +21919,149 @@
"authoritative upstream."
msgstr "無法找到設定 '%s'。假定這個版本庫是其自身的官方上游。"
-#: builtin/submodule--helper.c:667
+#: builtin/submodule--helper.c:666
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "無法為子模組 '%s' 註冊 url"
-#: builtin/submodule--helper.c:671
+#: 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:681
+#: builtin/submodule--helper.c:680
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "警告：建議子模組 '%s' 使用指令更新模式\n"
-#: builtin/submodule--helper.c:688
+#: builtin/submodule--helper.c:687
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "無法為子模組 '%s' 註冊更新模式"
-#: builtin/submodule--helper.c:710
-msgid "Suppress output for initializing a submodule"
-msgstr "阻止子模組初始化的輸出"
+#: builtin/submodule--helper.c:709
+msgid "suppress output for initializing a submodule"
+msgstr "隱藏初始化子模組的輸出"
-#: builtin/submodule--helper.c:715
+#: builtin/submodule--helper.c:714
msgid "git submodule--helper init [<options>] [<path>]"
msgstr "git submodule--helper init [<選項>] [<路徑>]"
-#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
+#: builtin/submodule--helper.c: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:837
+#: builtin/submodule--helper.c:835
#, c-format
msgid "could not resolve HEAD ref inside the submodule '%s'"
msgstr "無法解析子模組 '%s' 的 HEAD 引用"
-#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457
#, c-format
msgid "failed to recurse into submodule '%s'"
msgstr "遞迴子模組 '%s' 失敗"
-#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199
-msgid "Suppress submodule status output"
-msgstr "阻止子模組狀態輸出"
+#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623
+msgid "suppress submodule status output"
+msgstr "隱藏子模組的狀態輸出"
-#: builtin/submodule--helper.c:889
+#: builtin/submodule--helper.c:887
msgid ""
-"Use commit stored in the index instead of the one stored in the submodule "
+"use commit stored in the index instead of the one stored in the submodule "
"HEAD"
msgstr "使用儲存在索引中的提交，而非儲存在子模組 HEAD 中的提交"
-#: builtin/submodule--helper.c:890
-msgid "recurse into nested submodules"
-msgstr "遞迴進入嵌套子模組中"
-
-#: builtin/submodule--helper.c:895
+#: builtin/submodule--helper.c:893
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路徑>...]"
-#: builtin/submodule--helper.c:919
+#: builtin/submodule--helper.c:917
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <路徑>"
-#: builtin/submodule--helper.c:983
+#: 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 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:989
+#: builtin/submodule--helper.c:1413
#, c-format
msgid "failed to register url for submodule path '%s'"
msgstr "無法為子模組路徑 '%s' 註冊 url"
-#: builtin/submodule--helper.c:1003
+#: builtin/submodule--helper.c:1427
#, c-format
msgid "failed to get the default remote for submodule '%s'"
msgstr "無法得到子模組 '%s' 的預設遠端關聯"
-#: builtin/submodule--helper.c:1014
+#: builtin/submodule--helper.c:1438
#, c-format
msgid "failed to update remote for submodule '%s'"
msgstr "無法為子模組 '%s' 更新遠端關聯"
-#: builtin/submodule--helper.c:1061
-msgid "Suppress output of synchronizing submodule url"
-msgstr "阻止子模組 url 同步的輸出"
+#: builtin/submodule--helper.c:1485
+msgid "suppress output of synchronizing submodule url"
+msgstr "隱藏子模組 URL 同步的輸出"
-#: builtin/submodule--helper.c:1068
+#: builtin/submodule--helper.c:1492
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
msgstr "git submodule--helper sync [--quiet] [--recursive] [<路徑>]"
-#: builtin/submodule--helper.c:1122
+#: builtin/submodule--helper.c:1546
#, c-format
msgid ""
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -20515,52 +22070,52 @@
"子模組工作區 '%s' 包含一個 .git 目錄（如果您確需刪除它及其全部歷史，使用 'rm "
"-rf' 指令）"
-#: builtin/submodule--helper.c:1134
+#: 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:1142
+#: builtin/submodule--helper.c:1566
#, c-format
msgid "Cleared directory '%s'\n"
msgstr "已清除目錄 '%s'\n"
-#: builtin/submodule--helper.c:1144
+#: builtin/submodule--helper.c:1568
#, c-format
msgid "Could not remove submodule work tree '%s'\n"
msgstr "無法移除子模組工作區 '%s'\n"
-#: builtin/submodule--helper.c:1155
+#: builtin/submodule--helper.c:1579
#, c-format
msgid "could not create empty submodule directory %s"
msgstr "不能建立空的子模組目錄 %s"
-#: builtin/submodule--helper.c:1171
+#: 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:1200
-msgid "Remove submodule working trees even if they contain local changes"
-msgstr "刪除子模組工作區，即使包含本機修改"
+#: builtin/submodule--helper.c:1624
+msgid "remove submodule working trees even if they contain local changes"
+msgstr "即使有本機變更仍移除子模組的工作區"
-#: builtin/submodule--helper.c:1201
-msgid "Unregister all submodules"
-msgstr "將所有子模組取消註冊"
+#: builtin/submodule--helper.c:1625
+msgid "unregister all submodules"
+msgstr "取消註冊所有子模組"
-#: builtin/submodule--helper.c:1206
+#: 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:1220
+#: builtin/submodule--helper.c:1644
msgid "Use '--all' if you really want to deinitialize all submodules"
-msgstr "如果您確實想要對所有子模組執行取消初始化，請使用 '--all'"
+msgstr "如果您確定想要對所有子模組執行取消初始化，請使用 '--all'"
-#: builtin/submodule--helper.c:1289
+#: 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"
@@ -20572,46 +22127,46 @@
"以允許 Git 不用備用版本庫複製，亦可使用等效的 '--reference-if-able'\n"
"而非 '--reference' 複製。"
-#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331
+#: 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:1367
+#: builtin/submodule--helper.c:1791
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "不能識別 submodule.alternateErrorStrategy 的取值 '%s'"
-#: builtin/submodule--helper.c:1374
+#: builtin/submodule--helper.c:1798
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "不能識別 submodule.alternateLocaion 的取值 '%s'"
-#: builtin/submodule--helper.c:1398
+#: builtin/submodule--helper.c:1822
msgid "where the new submodule will be cloned to"
msgstr "新的子模組將要複製的路徑"
-#: builtin/submodule--helper.c:1401
+#: builtin/submodule--helper.c:1825
msgid "name of the new submodule"
msgstr "新子模組的名稱"
-#: builtin/submodule--helper.c:1404
+#: builtin/submodule--helper.c:1828
msgid "url where to clone the submodule from"
msgstr "複製子模組的 url 位址"
-#: builtin/submodule--helper.c:1412
+#: builtin/submodule--helper.c:1836
msgid "depth for shallow clones"
msgstr "淺複製的深度"
-#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924
+#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348
msgid "force cloning progress"
msgstr "強制顯示複製進度"
-#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926
+#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350
msgid "disallow cloning into non-empty directory"
msgstr "不允許複製至非空白目錄"
-#: builtin/submodule--helper.c:1424
+#: builtin/submodule--helper.c:1848
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
@@ -20621,152 +22176,189 @@
">] [--name <名字>] [--depth <深度>] [--single-branch] --url <url> --path <路"
"徑>"
-#: builtin/submodule--helper.c:1449
+#: 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:1460
+#: builtin/submodule--helper.c:1884
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "無法複製 '%s' 到子模組路徑 '%s'"
-#: builtin/submodule--helper.c:1464
+#: builtin/submodule--helper.c:1888
#, c-format
msgid "directory not empty: '%s'"
msgstr "目錄不是空的：「%s」"
-#: builtin/submodule--helper.c:1476
+#: builtin/submodule--helper.c:1900
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "無法得到 '%s' 的子模組目錄"
-#: builtin/submodule--helper.c:1512
+#: 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:1516
+#: 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:1617
+#: builtin/submodule--helper.c:2041
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "子模組 '%s' 尚未初始化"
-#: builtin/submodule--helper.c:1621
+#: builtin/submodule--helper.c:2045
msgid "Maybe you want to use 'update --init'?"
msgstr "也許您想要執行 'update --init'？"
-#: builtin/submodule--helper.c:1651
+#: builtin/submodule--helper.c:2075
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "略過未合併的子模組 %s"
-#: builtin/submodule--helper.c:1680
+#: builtin/submodule--helper.c:2104
#, c-format
msgid "Skipping submodule '%s'"
msgstr "略過子模組 '%s'"
-#: builtin/submodule--helper.c:1830
+#: builtin/submodule--helper.c:2254
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "複製 '%s' 失敗。按計劃重試"
-#: builtin/submodule--helper.c:1841
+#: builtin/submodule--helper.c:2265
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "第二次嘗試複製 '%s' 失敗，離開"
-#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149
+#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573
msgid "path into the working tree"
msgstr "到工作區的路徑"
-#: builtin/submodule--helper.c:1906
+#: builtin/submodule--helper.c:2330
msgid "path into the working tree, across nested submodule boundaries"
msgstr "工作區中的路徑，遞迴嵌套子模組"
-#: builtin/submodule--helper.c:1910
+#: builtin/submodule--helper.c:2334
msgid "rebase, merge, checkout or none"
msgstr "rebase、merge、checkout 或 none"
-#: builtin/submodule--helper.c:1916
-msgid "Create a shallow clone truncated to the specified number of revisions"
+#: builtin/submodule--helper.c:2340
+#, fuzzy
+#| msgid ""
+#| "Create a shallow clone truncated to the specified number of revisions"
+msgid "create a shallow clone truncated to the specified number of revisions"
msgstr "建立一個指定深度的淺複製"
-#: builtin/submodule--helper.c:1919
+#: builtin/submodule--helper.c:2343
msgid "parallel jobs"
msgstr "並發任務"
-#: builtin/submodule--helper.c:1921
+#: builtin/submodule--helper.c:2345
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "初始複製是否應該遵守推薦的淺複製選項"
-#: builtin/submodule--helper.c:1922
+#: builtin/submodule--helper.c:2346
msgid "don't print cloning progress"
msgstr "不要輸出複製進度"
-#: builtin/submodule--helper.c:1933
+#: 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:1946
+#: builtin/submodule--helper.c:2370
msgid "bad value for update parameter"
msgstr "update 參數取值錯誤"
-#: builtin/submodule--helper.c:1994
+#: 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:2117
+#: builtin/submodule--helper.c:2541
#, c-format
msgid "could not get a repository handle for submodule '%s'"
msgstr "無法獲得子模組 '%s' 的版本庫句柄"
-#: builtin/submodule--helper.c:2150
+#: builtin/submodule--helper.c:2574
msgid "recurse into submodules"
msgstr "在子模組中遞迴"
-#: builtin/submodule--helper.c:2156
+#: 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:2212
+#: builtin/submodule--helper.c:2636
msgid "check if it is safe to write to the .gitmodules file"
msgstr "檢查寫入 .gitmodules 檔案是否安全"
-#: builtin/submodule--helper.c:2215
+#: builtin/submodule--helper.c:2639
msgid "unset the config in the .gitmodules file"
msgstr "取消 .gitmodules 檔案中的設定"
-#: builtin/submodule--helper.c:2220
+#: builtin/submodule--helper.c:2644
msgid "git submodule--helper config <name> [<value>]"
msgstr "git submodule--helper config <名稱> [<值>]"
-#: builtin/submodule--helper.c:2221
+#: builtin/submodule--helper.c:2645
msgid "git submodule--helper config --unset <name>"
msgstr "git submodule--helper config --unset <名稱>"
-#: builtin/submodule--helper.c:2222
+#: builtin/submodule--helper.c:2646
msgid "git submodule--helper config --check-writeable"
msgstr "git submodule--helper config --check-writeable"
-#: builtin/submodule--helper.c:2241 git-submodule.sh:174
+#: builtin/submodule--helper.c:2665 git-submodule.sh:150
#, sh-format
msgid "please make sure that the .gitmodules file is in the working tree"
msgstr "請確認 .gitmodules 檔案在工作區裡"
-#: builtin/submodule--helper.c:2291 git.c:433 git.c:684
+#: builtin/submodule--helper.c: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:441 git.c:714
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s 不支援 --super-prefix"
-#: builtin/submodule--helper.c:2297
+#: builtin/submodule--helper.c:2798
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' 不是一個有效的 submodule--helper 子指令"
@@ -20791,11 +22383,11 @@
msgid "shorten ref output"
msgstr "縮短引用輸出"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
msgid "reason"
msgstr "原因"
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
msgid "reason of the update"
msgstr "更新的原因"
@@ -20815,11 +22407,12 @@
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>..."
@@ -20830,12 +22423,12 @@
msgid "tag '%s' not found."
msgstr "未發現標籤 '%s'。"
-#: builtin/tag.c:105
+#: builtin/tag.c:124
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "已刪除標籤 '%s'（曾為 %s）\n"
-#: builtin/tag.c:135
+#: builtin/tag.c:159
#, c-format
msgid ""
"\n"
@@ -20848,7 +22441,7 @@
" %s\n"
"以 '%c' 開頭的行將被忽略。\n"
-#: builtin/tag.c:139
+#: builtin/tag.c:163
#, c-format
msgid ""
"\n"
@@ -20862,15 +22455,11 @@
" %s\n"
"以 '%c' 開頭的行將被保留，如果您願意也可以刪除它們。\n"
-#: builtin/tag.c:198
+#: builtin/tag.c:230
msgid "unable to sign the tag"
msgstr "無法簽署標籤"
-#: builtin/tag.c:200
-msgid "unable to write tag file"
-msgstr "無法寫標籤檔案"
-
-#: builtin/tag.c:216
+#: builtin/tag.c:248
#, c-format
msgid ""
"You have created a nested tag. The object referred to by your new tag is\n"
@@ -20883,138 +22472,134 @@
"\n"
"\tgit tag -f %s %s^{}"
-#: builtin/tag.c:232
+#: builtin/tag.c:264
msgid "bad object type."
msgstr "壞的物件類型。"
-#: builtin/tag.c:284
+#: builtin/tag.c:317
msgid "no tag message?"
msgstr "無標籤說明？"
-#: builtin/tag.c:291
+#: builtin/tag.c:324
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "標籤說明被保留在 %s\n"
-#: builtin/tag.c:402
+#: builtin/tag.c:435
msgid "list tag names"
msgstr "列出標籤名稱"
-#: builtin/tag.c:404
+#: builtin/tag.c:437
msgid "print <n> lines of each tag message"
msgstr "每個標籤訊息列印 <n> 行"
-#: builtin/tag.c:406
+#: builtin/tag.c:439
msgid "delete tags"
msgstr "刪除標籤"
-#: builtin/tag.c:407
+#: builtin/tag.c:440
msgid "verify tags"
msgstr "驗證標籤"
-#: builtin/tag.c:409
+#: builtin/tag.c:442
msgid "Tag creation options"
msgstr "標籤建立選項"
-#: builtin/tag.c:411
+#: builtin/tag.c:444
msgid "annotated tag, needs a message"
msgstr "附註標籤，需要一個說明"
-#: builtin/tag.c:413
+#: builtin/tag.c:446
msgid "tag message"
msgstr "標籤說明"
-#: builtin/tag.c:415
+#: builtin/tag.c:448
msgid "force edit of tag message"
msgstr "強制編輯標籤說明"
-#: builtin/tag.c:416
+#: builtin/tag.c:449
msgid "annotated and GPG-signed tag"
msgstr "附註並附加 GPG 簽名的標籤"
-#: builtin/tag.c:419
+#: builtin/tag.c:452
msgid "use another key to sign the tag"
msgstr "使用另外的私鑰簽名該標籤"
-#: builtin/tag.c:420
+#: builtin/tag.c:453
msgid "replace the tag if exists"
msgstr "如果存在，取代現有的標籤"
-#: builtin/tag.c:421 builtin/update-ref.c:369
+#: builtin/tag.c:454 builtin/update-ref.c:505
msgid "create a reflog"
msgstr "建立引用日誌"
-#: builtin/tag.c:423
+#: builtin/tag.c:456
msgid "Tag listing options"
msgstr "標籤列表選項"
-#: builtin/tag.c:424
+#: builtin/tag.c:457
msgid "show tag list in columns"
msgstr "以列的方式顯示標籤列表"
-#: builtin/tag.c:425 builtin/tag.c:427
+#: builtin/tag.c:458 builtin/tag.c:460
msgid "print only tags that contain the commit"
msgstr "只列印包含該提交的標籤"
-#: builtin/tag.c:426 builtin/tag.c:428
+#: builtin/tag.c:459 builtin/tag.c:461
msgid "print only tags that don't contain the commit"
msgstr "只列印不包含該提交的標籤"
-#: builtin/tag.c:429
+#: builtin/tag.c:462
msgid "print only tags that are merged"
msgstr "只列印已經合併的標籤"
-#: builtin/tag.c:430
+#: builtin/tag.c:463
msgid "print only tags that are not merged"
msgstr "只列印尚未合併的標籤"
-#: builtin/tag.c:434
+#: builtin/tag.c:467
msgid "print only tags of the object"
msgstr "只列印指向該物件的標籤"
-#: builtin/tag.c:482
+#: builtin/tag.c:515
msgid "--column and -n are incompatible"
msgstr "--column 和 -n 不相容"
-#: builtin/tag.c:504
+#: builtin/tag.c:537
msgid "-n option is only allowed in list mode"
msgstr "-n 選項只允許用在列表顯示模式"
-#: builtin/tag.c:506
+#: builtin/tag.c:539
msgid "--contains option is only allowed in list mode"
msgstr "--contains 選項只允許用在列表顯示模式"
-#: builtin/tag.c:508
+#: builtin/tag.c:541
msgid "--no-contains option is only allowed in list mode"
msgstr "--no-contains 選項只允許用在列表顯示模式"
-#: builtin/tag.c:510
+#: builtin/tag.c:543
msgid "--points-at option is only allowed in list mode"
msgstr "--points-at 選項只允許用在列表顯示模式"
-#: builtin/tag.c:512
+#: builtin/tag.c:545
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "--merged 和 --no-merged 選項只允許用在列表顯示模式"
-#: builtin/tag.c:523
+#: builtin/tag.c:556
msgid "only one -F or -m option is allowed."
msgstr "只允許一個 -F 或 -m 選項。"
-#: builtin/tag.c:542
-msgid "too many params"
-msgstr "太多參數"
-
-#: builtin/tag.c:548
+#: builtin/tag.c:581
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' 不是一個有效的標籤名稱。"
-#: builtin/tag.c:553
+#: builtin/tag.c:586
#, c-format
msgid "tag '%s' already exists"
msgstr "標籤 '%s' 已存在"
-#: builtin/tag.c:584
+#: builtin/tag.c:617
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "已更新標籤 '%s'（曾為 %s）\n"
@@ -21186,11 +22771,11 @@
#: builtin/update-index.c:1055
msgid "enable or disable split index"
-msgstr "啟用或禁用索引分割"
+msgstr "啟用或停用索引分割"
#: builtin/update-index.c:1057
msgid "enable/disable untracked cache"
-msgstr "啟用/禁用對未追蹤檔案的快取"
+msgstr "啟用/停用對未追蹤檔案的快取"
#: builtin/update-index.c:1059
msgid "test if the filesystem supports untracked cache"
@@ -21206,7 +22791,7 @@
#: builtin/update-index.c:1065
msgid "enable or disable file system monitor"
-msgstr "啟用或禁用檔案系統監控"
+msgstr "啟用或停用檔案系統監控"
#: builtin/update-index.c:1067
msgid "mark files as fsmonitor valid"
@@ -21220,35 +22805,33 @@
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
-msgstr ""
-"core.splitIndex 被設定為 false。如果您確實要啟用索引分割，請刪除或修改它。"
+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。如果您確實要禁用索引分割，請刪除或修改它。"
+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。如果您確實要禁用未追蹤檔案快取，請刪除或修"
-"改它。"
+"core.untrackedCache 被設定為 true。如果您確定要停用未追蹤檔案的快取，請移除或"
+"修改"
#: builtin/update-index.c:1198
msgid "Untracked cache disabled"
-msgstr "快取未追蹤檔案被禁用"
+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。如果您確實要啟用未追蹤檔案快取，請刪除或"
-"修改它。"
+"core.untrackedCache 被設定為 false。如果您確定要啟用未追蹤檔案快取，請移除或"
+"修改"
#: builtin/update-index.c:1210
#, c-format
@@ -21266,11 +22849,11 @@
#: builtin/update-index.c:1225
msgid ""
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
-msgstr "core.fsmonitor 已設定；如果想要禁用 fsmonitor 請移除該選項"
+msgstr "core.fsmonitor 已設定；如果想要停用 fsmonitor 請移除該選項"
#: builtin/update-index.c:1229
msgid "fsmonitor disabled"
-msgstr "fsmonitor 被禁用"
+msgstr "fsmonitor 被停用"
#: builtin/update-ref.c:10
msgid "git update-ref [<options>] -d <refname> [<old-val>]"
@@ -21284,19 +22867,19 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<選項>] --stdin [-z]"
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:500
msgid "delete the reference"
msgstr "刪除引用"
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:502
msgid "update <refname> not the one it points to"
msgstr "更新 <引用名> 本身而不是它指向的引用"
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:503
msgid "stdin has NUL-terminated arguments"
msgstr "標準輸入有以 NUL 字元終止的參數"
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:504
msgid "read updates from stdin"
msgstr "從標準輸入讀取更新"
@@ -21340,15 +22923,15 @@
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 "只顯示統計"
@@ -21360,221 +22943,203 @@
msgid "print tag contents"
msgstr "列印標籤內容"
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
msgid "git worktree add [<options>] <path> [<commit-ish>]"
msgstr "git worktree add [<選項>] <路徑> [<提交>]"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree list [<options>]"
msgstr "git worktree list [<選項>]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<選項>] <路徑>"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree move <worktree> <new-path>"
msgstr "git worktree move <工作區> <新路徑>"
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<選項>]"
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
msgid "git worktree remove [<options>] <worktree>"
msgstr "git worktree remove [<選項>] <工作區>"
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <路徑>"
-#: builtin/worktree.c:60 builtin/worktree.c:891
+#: builtin/worktree.c:61 builtin/worktree.c:933
#, c-format
msgid "failed to delete '%s'"
msgstr "刪除 '%s' 失敗"
-#: builtin/worktree.c:79
+#: builtin/worktree.c:74
#, c-format
-msgid "Removing worktrees/%s: not a valid directory"
-msgstr "刪除工作區/%s：不是一個有效的目錄"
+msgid "Removing %s/%s: %s"
+msgstr "移除 %s/%s: %s"
-#: builtin/worktree.c:85
-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
-msgstr "刪除 worktrees/%s：gitdir 檔案不存在"
-
-#: builtin/worktree.c:90 builtin/worktree.c:99
-#, c-format
-msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
-msgstr "刪除 worktrees/%s：無法讀取 gitdir 檔案 (%s)"
-
-#: builtin/worktree.c:109
-#, c-format
-msgid ""
-"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
-"%<PRIuMAX>)"
-msgstr "刪除工作樹/%s：讀取過短（期望 %<PRIuMAX> 位元組，讀取 %<PRIuMAX>）"
-
-#: builtin/worktree.c:117
-#, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
-msgstr "刪除 worktrees/%s：無效的 gitdir 檔案"
-
-#: builtin/worktree.c:126
-#, c-format
-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
-msgstr "刪除 worktrees/%s：gitdir 檔案的指向不存在"
-
-#: builtin/worktree.c:165
+#: builtin/worktree.c:149
msgid "report pruned working trees"
msgstr "報告清除的工作區"
-#: builtin/worktree.c:167
+#: builtin/worktree.c:151
msgid "expire working trees older than <time>"
msgstr "將早於 <時間> 的工作區過期"
-#: builtin/worktree.c:234
+#: builtin/worktree.c:221
#, c-format
msgid "'%s' already exists"
msgstr "'%s' 已經存在"
-#: builtin/worktree.c:244
+#: builtin/worktree.c:230
#, c-format
-msgid "unable to re-add worktree '%s'"
-msgstr "無法再次新增工作區 '%s'"
+msgid "unusable worktree destination '%s'"
+msgstr "無法使用的工作目錄目的地「%s」"
-#: builtin/worktree.c:249
+#: builtin/worktree.c:235
#, 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:251
+#: builtin/worktree.c:237
#, 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:301
+#: builtin/worktree.c:288
#, c-format
msgid "could not create directory of '%s'"
msgstr "不能建立目錄 '%s'"
-#: builtin/worktree.c:432 builtin/worktree.c:438
+#: builtin/worktree.c:422 builtin/worktree.c:428
#, c-format
msgid "Preparing worktree (new branch '%s')"
msgstr "準備工作區（新分支 '%s'）"
-#: builtin/worktree.c:434
+#: builtin/worktree.c:424
#, c-format
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
msgstr "準備工作區（重設分支 '%s'，之前為 %s）"
-#: builtin/worktree.c:443
+#: builtin/worktree.c:433
#, c-format
msgid "Preparing worktree (checking out '%s')"
-msgstr "準備工作區（簽出 '%s'）"
+msgstr "準備工作區（檢出 '%s'）"
-#: builtin/worktree.c:449
+#: builtin/worktree.c:439
#, c-format
msgid "Preparing worktree (detached HEAD %s)"
msgstr "準備工作區（分離開頭指標 %s）"
-#: builtin/worktree.c:490
+#: builtin/worktree.c:480
msgid "checkout <branch> even if already checked out in other worktree"
-msgstr "簽出 <分支>，即使已經被簽出到其它工作區"
+msgstr "檢出 <分支>，即使已經被檢出到其它工作區"
-#: builtin/worktree.c:493
+#: builtin/worktree.c:483
msgid "create a new branch"
msgstr "建立一個新分支"
-#: builtin/worktree.c:495
+#: builtin/worktree.c:485
msgid "create or reset a branch"
msgstr "建立或重設一個分支"
-#: builtin/worktree.c:497
+#: builtin/worktree.c:487
msgid "populate the new working tree"
msgstr "生成新的工作區"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:488
msgid "keep the new working tree locked"
msgstr "鎖定新工作區"
-#: builtin/worktree.c:501
+#: builtin/worktree.c:491
msgid "set up tracking mode (see git-branch(1))"
msgstr "設定追蹤模式（參見 git-branch(1)）"
-#: builtin/worktree.c:504
+#: builtin/worktree.c:494
msgid "try to match the new branch name with a remote-tracking branch"
msgstr "嘗試為新分支名符合一個遠端追蹤分支"
-#: builtin/worktree.c:512
+#: builtin/worktree.c:502
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b、-B 和 --detach 是互斥的"
-#: builtin/worktree.c:573
+#: builtin/worktree.c:563
msgid "--[no-]track can only be used if a new branch is created"
-msgstr "只能在建立新分支時使用選項 --[no-]track "
+msgstr "只能在建立新分支時使用 --[no-]track 選項"
-#: builtin/worktree.c:673
+#: builtin/worktree.c:680
+msgid "show extended annotations and reasons, if available"
+msgstr "如果有則顯示延伸的註釋和原因"
+
+#: builtin/worktree.c:682
+#, fuzzy
+#| msgid "expire working trees older than <time>"
+msgid "add 'prunable' annotation to worktrees older than <time>"
+msgstr "將早於 <時間> 的工作區過期"
+
+#: builtin/worktree.c:691
+msgid "--verbose and --porcelain are mutually exclusive"
+msgstr "--verbose 和 --porcelain 互斥"
+
+#: builtin/worktree.c:718
msgid "reason for locking"
msgstr "鎖定原因"
-#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
-#: builtin/worktree.c:919
+#: builtin/worktree.c:730 builtin/worktree.c:763 builtin/worktree.c:837
+#: builtin/worktree.c:961
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' 不是一個工作區"
-#: builtin/worktree.c:687 builtin/worktree.c:720
+#: builtin/worktree.c:732 builtin/worktree.c:765
msgid "The main working tree cannot be locked or unlocked"
msgstr "主工作區無法被加鎖或解鎖"
-#: builtin/worktree.c:692
+#: builtin/worktree.c:737
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' 已被鎖定，原因：%s"
-#: builtin/worktree.c:694
+#: builtin/worktree.c:739
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' 已被鎖定"
-#: builtin/worktree.c:722
+#: builtin/worktree.c:767
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' 未被鎖定"
-#: builtin/worktree.c:763
+#: builtin/worktree.c:808
msgid "working trees containing submodules cannot be moved or removed"
msgstr "不能移動或刪除包含子模組的工作區"
-#: builtin/worktree.c:771
+#: builtin/worktree.c:816
msgid "force move even if worktree is dirty or locked"
msgstr "強制移動，即使工作區是髒的或已鎖定"
-#: builtin/worktree.c:794 builtin/worktree.c:921
+#: builtin/worktree.c:839 builtin/worktree.c:963
#, c-format
msgid "'%s' is a main working tree"
msgstr "'%s' 是一個主工作區"
-#: builtin/worktree.c:799
+#: builtin/worktree.c:844
#, c-format
msgid "could not figure out destination name from '%s'"
msgstr "無法從 '%s' 算出目標名稱"
-#: builtin/worktree.c:805
-#, c-format
-msgid "target '%s' already exists"
-msgstr "目標 '%s' 已存在"
-
-#: builtin/worktree.c:813
+#: builtin/worktree.c:857
#, c-format
msgid ""
"cannot move a locked working tree, lock reason: %s\n"
@@ -21583,7 +23148,7 @@
"無法移動一個鎖定的工作區，鎖定原因：%s\n"
"使用 'move -f -f' 覆蓋或先解鎖"
-#: builtin/worktree.c:815
+#: builtin/worktree.c:859
msgid ""
"cannot move a locked working tree;\n"
"use 'move -f -f' to override or unlock first"
@@ -21591,36 +23156,36 @@
"無法移動一個鎖定的工作區，\n"
"使用 'move -f -f' 覆蓋或先解鎖"
-#: builtin/worktree.c:818
+#: builtin/worktree.c:862
#, c-format
msgid "validation failed, cannot move working tree: %s"
msgstr "驗證失敗，無法移動工作區：%s"
-#: builtin/worktree.c:823
+#: builtin/worktree.c:867
#, c-format
msgid "failed to move '%s' to '%s'"
msgstr "移動 '%s' 到 '%s' 失敗"
-#: builtin/worktree.c:871
+#: builtin/worktree.c:913
#, c-format
msgid "failed to run 'git status' on '%s'"
msgstr "在 '%s' 中執行 'git status' 失敗"
-#: builtin/worktree.c:875
+#: builtin/worktree.c:917
#, c-format
msgid "'%s' contains modified or untracked files, use --force to delete it"
msgstr "'%s' 包含修改或未追蹤的檔案，使用 --force 刪除"
-#: builtin/worktree.c:880
+#: builtin/worktree.c:922
#, c-format
msgid "failed to run 'git status' on '%s', code %d"
msgstr "在 '%s' 中執行 'git status' 失敗，離開碼 %d"
-#: builtin/worktree.c:903
+#: builtin/worktree.c:945
msgid "force removal even if worktree is dirty or locked"
msgstr "強制刪除，即使工作區是髒的或已鎖定"
-#: builtin/worktree.c:926
+#: builtin/worktree.c:968
#, c-format
msgid ""
"cannot remove a locked working tree, lock reason: %s\n"
@@ -21629,7 +23194,7 @@
"無法刪除一個鎖定的工作區，鎖定原因：%s\n"
"使用 'remove -f -f' 覆蓋或先解鎖"
-#: builtin/worktree.c:928
+#: builtin/worktree.c:970
msgid ""
"cannot remove a locked working tree;\n"
"use 'remove -f -f' to override or unlock first"
@@ -21637,11 +23202,21 @@
"無法刪除一個鎖定的工作區，\n"
"使用 'remove -f -f' 覆蓋或先解鎖"
-#: builtin/worktree.c:931
+#: builtin/worktree.c:973
#, c-format
msgid "validation failed, cannot remove working tree: %s"
msgstr "驗證失敗，無法刪除工作區：%s"
+#: builtin/worktree.c:997
+#, c-format
+msgid "repair: %s: %s"
+msgstr "修復：%s：%s"
+
+#: builtin/worktree.c:1000
+#, 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=<前綴>/]"
@@ -21658,44 +23233,38 @@
msgid "only useful for debugging"
msgstr "只對除錯有用"
-#: fast-import.c:3125
+#: http-fetch.c:118
#, c-format
-msgid "Expected 'mark' command, got %s"
-msgstr "預期 'mark' 指令，得到 %s"
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr "傳入 --packfile 的參數必須是有效的雜湊 (收到 '%s')"
-#: fast-import.c:3130
-#, c-format
-msgid "Expected 'to' command, got %s"
-msgstr "預期 'to' 指令，得到 %s"
+#: http-fetch.c:128
+msgid "not a git repository"
+msgstr "不是一個 git 版本庫"
-#: fast-import.c:3254
-#, c-format
-msgid "feature '%s' forbidden in input without --allow-unsafe-features"
-msgstr "沒有 --allow-unsafe-features 時，禁止在輸入中使用 '%s' 功能"
+#: http-fetch.c:134
+msgid "--packfile requires --index-pack-args"
+msgstr "--packfile 需要 --index-pack-args"
-#: credential-cache--daemon.c:223
-#, c-format
-msgid ""
-"The permissions on your socket directory are too loose; other\n"
-"users may be able to read your cached credentials. Consider running:\n"
-"\n"
-"\tchmod 0700 %s"
-msgstr ""
-"您的 socket 目錄權限過於寬鬆，其他使用者可能會讀取您快取的認證訊息。考慮執"
-"行：\n"
-"\n"
-"\tchmod 0700 %s"
+#: http-fetch.c:143
+#| msgid "-N can only be used with --mixed"
+msgid "--index-pack-args can only be used with --packfile"
+msgstr "--index-pack-args 只能與 --packfile 一起使用"
-#: credential-cache--daemon.c:272
-msgid "print debugging messages to stderr"
-msgstr "除錯訊息輸出到標準錯誤"
+#: t/helper/test-fast-rebase.c:141
+msgid "unhandled options"
+msgstr "未處理選項"
-#: t/helper/test-reach.c:152
+#: t/helper/test-fast-rebase.c:146
+msgid "error preparing revisions"
+msgstr "準備修訂版本時發生錯誤"
+
+#: 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 "太多提交標記為可以取得"
@@ -21707,23 +23276,33 @@
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"
+#| " [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+#| "bare]\n"
+#| " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+#| " <command> [<args>]"
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"
+" [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
" <command> [<args>]"
msgstr ""
-"git [--version] [--help] [-C <路徑>] [-c <名稱>=<取值>]\n"
+"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"
-" <指令> [<參數>]"
+" [--super-prefix=<路徑>] [--config-env=<名稱>=<環境變數>]\n"
+" <命令> [<引數>]"
-#: git.c:34
+#: git.c:36
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"
@@ -21731,51 +23310,51 @@
"See 'git help git' for an overview of the system."
msgstr ""
"指令 'git help -a' 和 'git help -g' 顯示可用的子指令和一些概念說明。\n"
-"檢視 'git help <指令>' 或 'git help <概念>' 以取得提供子指令或概念\n"
+"檢視 'git help <命令>' 或 'git help <概念>' 以取得提供子指令或概念\n"
"說明。\n"
"有關系統概述，檢視 'git help git'。"
-#: git.c:186
+#: git.c:188
#, c-format
msgid "no directory given for --git-dir\n"
msgstr "沒有為 --git-dir 提供目錄\n"
-#: git.c:200
+#: git.c:202
#, c-format
msgid "no namespace given for --namespace\n"
msgstr "沒有為 --namespace 提供命名空間\n"
-#: git.c:214
+#: git.c:216
#, c-format
msgid "no directory given for --work-tree\n"
msgstr "沒有為 --work-tree 提供目錄\n"
-#: git.c:228
+#: git.c:230
#, c-format
msgid "no prefix given for --super-prefix\n"
msgstr "沒有為 --super-prefix 提供前綴\n"
-#: git.c:250
+#: git.c:252
#, c-format
msgid "-c expects a configuration string\n"
msgstr "應為 -c 提供一個設定字串\n"
-#: git.c:288
+#: git.c:292
#, c-format
msgid "no directory given for -C\n"
msgstr "沒有為 -C 提供目錄\n"
-#: git.c:314
+#: git.c:318
#, c-format
msgid "unknown option: %s\n"
msgstr "未知選項：%s\n"
-#: git.c:360
+#: git.c:367
#, c-format
msgid "while expanding alias '%s': '%s'"
msgstr "在擴展別名 '%s' 時：'%s'"
-#: git.c:369
+#: git.c:376
#, c-format
msgid ""
"alias '%s' changes environment variables.\n"
@@ -21784,39 +23363,39 @@
"別名 '%s' 修改環境變數。您可以使用在別名中\n"
"使用 '!git'"
-#: git.c:376
+#: git.c:383
#, c-format
msgid "empty alias for %s"
msgstr "%s 的空別名"
-#: git.c:379
+#: git.c:386
#, c-format
msgid "recursive alias: %s"
msgstr "遞迴的別名：%s"
-#: git.c:459
+#: git.c:468
msgid "write failure on standard output"
msgstr "在標準輸出寫入失敗"
-#: git.c:461
+#: git.c:470
msgid "unknown write failure on standard output"
msgstr "到標準輸出的未知寫入錯誤"
-#: git.c:463
+#: git.c:472
msgid "close failed on standard output"
msgstr "標準輸出關閉失敗"
-#: git.c:793
+#: git.c:823
#, c-format
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
msgstr "檢測到別名循環：'%s'的擴展未終止：%s"
-#: git.c:843
+#: git.c:873
#, c-format
msgid "cannot handle %s as a builtin"
msgstr "不能作為內建指令處理 %s"
-#: git.c:856
+#: git.c:886
#, c-format
msgid ""
"usage: %s\n"
@@ -21825,53 +23404,53 @@
"用法：%s\n"
"\n"
-#: git.c:876
+#: git.c:906
#, 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:918
#, 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:1086
+#: http.c:1132
#, c-format
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
msgstr "不支援的 SSL 後端 '%s'。支援的 SSL 後端："
-#: http.c:1093
+#: 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 後端構建"
+msgstr "無法設定 SSL 後端為 '%s'：cURL: cURL 沒有使用 SSL 後端組建"
-#: http.c:1097
+#: http.c:1143
#, c-format
msgid "Could not set SSL backend to '%s': already set"
msgstr "無法將 SSL 後端設定為 '%s'：已經設定"
-#: http.c:1966
+#: http.c:2025
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -21882,120 +23461,151 @@
" 請求：%s\n"
" 重定向：%s"
-#: remote-curl.c:166
+#: remote-curl.c:183
#, c-format
msgid "invalid quoting in push-option value: '%s'"
msgstr "在 push-option 取值中無效的引號：'%s'"
-#: remote-curl.c:263
+#: remote-curl.c:307
#, c-format
msgid "%sinfo/refs not valid: is this a git repository?"
msgstr "%sinfo/refs 無效：這是一個 git 版本庫嗎？"
-#: remote-curl.c:364
+#: remote-curl.c:408
msgid "invalid server response; expected service, got flush packet"
msgstr "無效的服務端回應。預期服務，得到 flush 包"
-#: remote-curl.c:395
+#: remote-curl.c:439
#, c-format
msgid "invalid server response; got '%s'"
msgstr "無效的服務端回應，得到 '%s'"
-#: remote-curl.c:455
+#: remote-curl.c:499
#, c-format
msgid "repository '%s' not found"
msgstr "版本庫 '%s' 未找到"
-#: remote-curl.c:459
+#: remote-curl.c:503
#, c-format
msgid "Authentication failed for '%s'"
msgstr "'%s' 身份驗證失敗"
-#: remote-curl.c:463
+#: remote-curl.c:507
#, c-format
msgid "unable to access '%s': %s"
msgstr "無法存取 '%s'：%s"
-#: remote-curl.c:469
+#: remote-curl.c:513
#, c-format
msgid "redirecting to %s"
msgstr "重定向到 %s"
-#: remote-curl.c:593
+#: remote-curl.c:642
msgid "shouldn't have EOF when not gentle on EOF"
msgstr "當沒有設定溫和處理檔案結束符（EOF）時，不應該有檔案結束符"
-#: remote-curl.c:673
+#: remote-curl.c:654
+msgid "remote server sent stateless separator"
+msgstr "遠端伺服器傳送了無狀態的分隔符號"
+
+#: remote-curl.c:724
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
msgstr "無法還原 rpc post 資料 - 嘗試增加 http.postBuffer"
-#: remote-curl.c:733
+#: remote-curl.c:754
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr "remote-curl: 錯誤的行長度字串：%.4s"
+
+#: remote-curl.c:756
+msgid "remote-curl: unexpected response end packet"
+msgstr "remote-curl: 非預期的回應結束封包"
+
+#: remote-curl.c:832
#, c-format
msgid "RPC failed; %s"
msgstr "RPC 失敗。%s"
-#: remote-curl.c:773
+#: remote-curl.c:872
msgid "cannot handle pushes this big"
msgstr "不能處理這麼大的推送"
-#: remote-curl.c:888
+#: remote-curl.c:987
#, c-format
msgid "cannot deflate request; zlib deflate error %d"
msgstr "不能壓縮請求，zlib 壓縮錯誤 %d"
-#: remote-curl.c:892
+#: remote-curl.c:991
#, c-format
msgid "cannot deflate request; zlib end error %d"
msgstr "不能壓縮請求，zlib 結束錯誤 %d"
-#: remote-curl.c:1023
+#: remote-curl.c:1041
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr "收到了 %d 位元組長度的標頭"
+
+#: remote-curl.c:1043
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr "預期仍要有 %d 位元組的本文 (body)"
+
+#: remote-curl.c:1132
msgid "dumb http transport does not support shallow capabilities"
msgstr "啞 http 傳輸不支援 shalllow 能力"
-#: remote-curl.c:1038
+#: remote-curl.c:1147
msgid "fetch failed."
msgstr "取得失敗。"
-#: remote-curl.c:1086
+#: remote-curl.c:1193
msgid "cannot fetch by sha1 over smart http"
msgstr "無法透過智慧 HTTP 取得 sha1"
-#: remote-curl.c:1130 remote-curl.c:1136
+#: remote-curl.c:1237 remote-curl.c:1243
#, c-format
msgid "protocol error: expected sha/ref, got '%s'"
msgstr "協定錯誤：期望 sha/ref，卻得到 '%s'"
-#: remote-curl.c:1148 remote-curl.c:1263
+#: remote-curl.c:1255 remote-curl.c:1373
#, c-format
msgid "http transport does not support %s"
msgstr "http 傳輸協定不支援 %s"
-#: remote-curl.c:1184
+#: remote-curl.c:1291
msgid "git-http-push failed"
msgstr "git-http-push 失敗"
-#: remote-curl.c:1369
+#: remote-curl.c:1479
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
msgstr "remote-curl：用法：git remote-curl <遠端> [<url>]"
-#: remote-curl.c:1401
+#: remote-curl.c:1511
msgid "remote-curl: error reading command stream from git"
msgstr "remote-curl：錯誤讀取來自 git 的指令流"
-#: remote-curl.c:1408
+#: remote-curl.c:1518
msgid "remote-curl: fetch attempted without a local repo"
msgstr "remote-curl：嘗試沒有本機版本庫下取得"
-#: remote-curl.c:1448
+#: remote-curl.c:1559
#, c-format
msgid "remote-curl: unknown command '%s' from git"
msgstr "remote-curl：未知的來自 git 的指令 '%s'"
-#: list-objects-filter-options.h:85
+#: 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:86
+#: list-objects-filter-options.h:92
msgid "object filtering"
msgstr "物件過濾"
@@ -22016,8 +23626,8 @@
msgstr "更加安靜"
#: parse-options.h:317
-msgid "use <n> digits to display SHA-1s"
-msgstr "用 <n> 位數字顯示 SHA-1 雜湊值"
+msgid "use <n> digits to display object names"
+msgstr "用 <n> 位數字顯示物件名稱"
#: parse-options.h:336
msgid "how to strip spaces and #comments from message"
@@ -22032,11 +23642,11 @@
"with --pathspec-from-file, pathspec elements are separated with NUL character"
msgstr "如使用 --pathspec-from-file，則 <路徑規格> 元件會使用 NUL 字元分隔"
-#: ref-filter.h:101
+#: ref-filter.h:99
msgid "key"
msgstr "key"
-#: ref-filter.h:101
+#: ref-filter.h:99
msgid "field name to sort on"
msgstr "排序的欄位名"
@@ -22044,14 +23654,6 @@
msgid "update the index with reused conflict resolution if possible"
msgstr "如果可能，重用衝突解決更新索引"
-#: wt-status.h:67
-msgid "HEAD detached at "
-msgstr "開頭指標分離於 "
-
-#: wt-status.h:68
-msgid "HEAD detached from "
-msgstr "開頭指標分離自 "
-
#: command-list.h:50
msgid "Add file contents to the index"
msgstr "新增檔案內容至索引"
@@ -22078,7 +23680,7 @@
#: command-list.h:56
msgid "Use binary search to find the commit that introduced a bug"
-msgstr "透過二分尋找定位引入 bug 的提交"
+msgstr "透過二分搜尋定位引入 bug 的提交"
#: command-list.h:57
msgid "Show what revision and author last modified each line of a file"
@@ -22089,705 +23691,680 @@
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
-msgid "Helper to temporarily store passwords in memory"
-msgstr "在記憶體中暫時儲存密碼的助手"
-
#: command-list.h:80
-msgid "Helper to store credentials on disk"
-msgstr "在磁碟儲存密碼的助手"
+msgid "Helper to temporarily store passwords in memory"
+msgstr "在記憶體中暫時儲存密碼的協助工具"
#: command-list.h:81
-msgid "Export a single commit to a CVS checkout"
-msgstr "將一個提交匯出到 CVS 簽出中"
+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: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
-msgid "Output information on each ref"
-msgstr "對每一個引用輸出訊息 "
-
#: command-list.h:98
+msgid "Output information on each ref"
+msgstr "對每一個引用輸出訊息"
+
+#: command-list.h:99
+msgid "Run a Git command on a list of repositories"
+msgstr "在列表中的版本庫中執行 Git 命令"
+
+#: command-list.h:100
msgid "Prepare patches for e-mail submission"
msgstr "準備電子信件提交的修補檔"
-#: command-list.h:99
+#: command-list.h:101
msgid "Verifies the connectivity and validity of the objects in the database"
msgstr "驗證版本庫中物件的連通性和有效性"
-#: command-list.h:100
+#: command-list.h:102
msgid "Cleanup unnecessary files and optimize the local repository"
msgstr "清除不必要的檔案和最佳化本機版本庫"
-#: command-list.h:101
+#: command-list.h:103
msgid "Extract commit ID from an archive created using git-archive"
msgstr "從 git-archive 建立的歸檔檔案中擷取提交 ID"
-#: command-list.h:102
+#: command-list.h:104
msgid "Print lines matching a pattern"
msgstr "輸出和模式符合的行"
-#: command-list.h:103
+#: command-list.h:105
msgid "A portable graphical interface to Git"
msgstr "一個便攜的 Git 圖形用戶端"
-#: command-list.h:104
+#: command-list.h:106
msgid "Compute object ID and optionally creates a blob from a file"
msgstr "從一個檔案計算物件 ID，並可以建立 blob 資料物件"
-#: command-list.h:105
+#: command-list.h:107
msgid "Display help information about Git"
msgstr "顯示 Git 的說明訊息"
-#: command-list.h:106
+#: command-list.h:108
msgid "Server side implementation of Git over HTTP"
msgstr "Git HTTP 協定的服務端實現"
-#: command-list.h:107
+#: command-list.h:109
msgid "Download from a remote Git repository via HTTP"
msgstr "通過 HTTP 從遠端 Git 版本庫下載"
-#: command-list.h:108
+#: command-list.h:110
msgid "Push objects over HTTP/DAV to another repository"
msgstr "通過 HTTP/DAV 推送物件另一個版本庫"
-#: command-list.h:109
+#: command-list.h:111
msgid "Send a collection of patches from stdin to an IMAP folder"
msgstr "從標準輸入將一組修補檔傳送到IMAP資料夾"
-#: command-list.h:110
+#: command-list.h:112
msgid "Build pack index file for an existing packed archive"
msgstr "從一個現存的包存檔檔案建立包索引"
-#: command-list.h:111
+#: command-list.h:113
msgid "Create an empty Git repository or reinitialize an existing one"
msgstr "建立一個空的 Git 版本庫或重新初始化一個已存在的版本庫"
-#: command-list.h:112
+#: command-list.h:114
msgid "Instantly browse your working repository in gitweb"
msgstr "在 gitweb 中即時瀏覽您的工作版本庫"
-#: command-list.h:113
+#: command-list.h:115
msgid "Add or parse structured information in commit messages"
msgstr "新增或解析提交說明中的結構化訊息"
-#: command-list.h:114
+#: command-list.h:116
msgid "The Git repository browser"
msgstr "Git 版本庫瀏覽器"
-#: command-list.h:115
+#: command-list.h:117
msgid "Show commit logs"
msgstr "顯示提交日誌"
-#: command-list.h:116
+#: command-list.h:118
msgid "Show information about files in the index and the working tree"
msgstr "顯示索引和工作區中檔案的訊息"
-#: command-list.h:117
+#: command-list.h:119
msgid "List references in a remote repository"
msgstr "顯示一個遠端版本庫的引用"
-#: command-list.h:118
+#: command-list.h:120
msgid "List the contents of a tree object"
msgstr "顯示一個樹狀物件的內容"
-#: command-list.h:119
+#: command-list.h:121
msgid "Extracts patch and authorship from a single e-mail message"
msgstr "從單個電子信件中擷取修補檔和作者身份"
-#: command-list.h:120
+#: command-list.h:122
msgid "Simple UNIX mbox splitter program"
msgstr "簡單的 UNIX mbox 信箱切分程式"
-#: command-list.h:121
+#: command-list.h:123
+msgid "Run tasks to optimize Git repository data"
+msgstr "執行用來最佳化 Git 版本庫資料的作業"
+
+#: command-list.h:124
msgid "Join two or more development histories together"
msgstr "合併兩個或更多開發歷史"
-#: command-list.h:122
+#: command-list.h:125
msgid "Find as good common ancestors as possible for a merge"
msgstr "為了合併尋找儘可能好的公共祖先提交"
-#: command-list.h:123
+#: command-list.h:126
msgid "Run a three-way file merge"
msgstr "執行一個三路檔案合併"
-#: command-list.h:124
+#: command-list.h:127
msgid "Run a merge for files needing merging"
msgstr "對於需要合併的檔案執行合併"
-#: command-list.h:125
+#: command-list.h:128
msgid "The standard helper program to use with git-merge-index"
msgstr "與 git-merge-index 一起使用的標準嚮導程式"
-#: command-list.h:126
+#: command-list.h:129
msgid "Run merge conflict resolution tools to resolve merge conflicts"
msgstr "執行合併衝突解決工具以解決合併衝突"
-#: command-list.h:127
+#: command-list.h:130
msgid "Show three-way merge without touching index"
msgstr "顯示三路合併而不動索引"
-#: command-list.h:128
+#: command-list.h:131
msgid "Write and verify multi-pack-indexes"
msgstr "寫入和驗證多包索引"
-#: command-list.h:129
-msgid "Creates a tag object"
-msgstr "建立一個標籤物件"
+#: command-list.h:132
+msgid "Creates a tag object with extra validation"
+msgstr "建立有額外驗證的標籤物件"
-#: command-list.h:130
+#: command-list.h:133
msgid "Build a tree-object from ls-tree formatted text"
msgstr "基於 ls-tree 的格式化文字建立一個樹狀物件"
-#: command-list.h:131
+#: command-list.h:134
msgid "Move or rename a file, a directory, or a symlink"
msgstr "移動或重新命名一個檔案、目錄或符號連結"
# 尋找提供版本的符號名稱
-#: command-list.h:132
+#: command-list.h:135
msgid "Find symbolic names for given revs"
msgstr "尋找提供版本的符號名稱"
-#: command-list.h:133
+#: command-list.h:136
msgid "Add or inspect object notes"
msgstr "新增或檢查物件備註"
-#: command-list.h:134
+#: command-list.h:137
msgid "Import from and submit to Perforce repositories"
msgstr "匯入和提交到 Perforce 版本庫中"
-#: command-list.h:135
+#: command-list.h:138
msgid "Create a packed archive of objects"
msgstr "建立物件的存檔包"
-#: command-list.h:136
+#: command-list.h:139
msgid "Find redundant pack files"
msgstr "尋找冗餘的包檔案"
-#: command-list.h:137
+#: command-list.h:140
msgid "Pack heads and tags for efficient repository access"
msgstr "打包頭和標籤以實現高效的版本庫存取"
-#: command-list.h:138
-msgid "Routines to help parsing remote repository access parameters"
-msgstr "協助解析遠端版本庫存取參數的例程"
-
-#: command-list.h:139
+#: 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 修補檔集套用到目前分支。"
+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 "初始化並修改稀疏簽出"
+msgstr "初始化並修改稀疏檢出"
-#: command-list.h:172
+#: command-list.h:174
msgid "Stash the changes in a dirty working directory away"
msgstr "儲藏髒工作區中的修改"
-#: command-list.h:173
+#: command-list.h:175
msgid "Add file contents to the staging area"
msgstr "將檔案內容新增到索引"
-#: command-list.h:174
+#: command-list.h:176
msgid "Show the working tree status"
msgstr "顯示工作區狀態"
-#: command-list.h:175
+#: command-list.h:177
msgid "Remove unnecessary whitespace"
msgstr "刪除不必要的空白字元"
-#: command-list.h:176
+#: command-list.h:178
msgid "Initialize, update or inspect submodules"
msgstr "初始化、更新或檢查子模組"
-#: command-list.h:177
+#: command-list.h:179
msgid "Bidirectional operation between a Subversion repository and Git"
msgstr "Subversion 版本庫和 Git 之間的雙向動作"
-#: command-list.h:178
+#: command-list.h:180
msgid "Switch branches"
msgstr "切換分支"
-#: command-list.h:179
+#: command-list.h:181
msgid "Read, modify and delete symbolic refs"
msgstr "讀取、修改和刪除符號引用"
-#: command-list.h:180
+#: command-list.h:182
msgid "Create, list, delete or verify a tag object signed with GPG"
msgstr "建立、列出、刪除或驗證一個 GPG 簽名的標籤物件"
-#: command-list.h:181
+#: command-list.h:183
msgid "Creates a temporary file with a blob's contents"
-msgstr "用 blob 資料物件的內容建立一個暫存檔"
+msgstr "用資料物件的內容建立暫存檔"
-#: command-list.h:182
+#: command-list.h:184
msgid "Unpack objects from a packed archive"
msgstr "從打包檔案中解壓縮物件"
-#: command-list.h:183
+#: command-list.h:185
msgid "Register file contents in the working tree to the index"
msgstr "將工作區的檔案內容註冊到索引"
-#: command-list.h:184
+#: command-list.h:186
msgid "Update the object name stored in a ref safely"
msgstr "安全地更新儲存於引用中的物件名稱"
-#: command-list.h:185
+#: command-list.h:187
msgid "Update auxiliary info file to help dumb servers"
msgstr "更新輔助訊息檔案以協助啞協定服務"
-#: command-list.h:186
+#: command-list.h:188
msgid "Send archive back to git-archive"
msgstr "將存檔傳送回 git-archive"
-#: command-list.h:187
+#: command-list.h:189
msgid "Send objects packed back to git-fetch-pack"
msgstr "將物件壓縮包傳送回 git-fetch-pack"
-#: command-list.h:188
+#: command-list.h:190
msgid "Show a Git logical variable"
msgstr "顯示 Git 邏輯變數"
-#: command-list.h:189
+#: command-list.h:191
msgid "Check the GPG signature of commits"
msgstr "檢查 GPG 提交簽名"
-#: command-list.h:190
+#: command-list.h:192
msgid "Validate packed Git archive files"
msgstr "驗證打包的 Git 封存檔案"
-#: command-list.h:191
+#: command-list.h:193
msgid "Check the GPG signature of tags"
msgstr "檢查標籤的 GPG 簽名"
-#: command-list.h:192
+#: command-list.h:194
msgid "Git web interface (web frontend to Git repositories)"
msgstr "Git web 介面（Git 版本庫的 web 前端）"
-#: command-list.h:193
+#: command-list.h:195
msgid "Show logs with difference each commit introduces"
msgstr "顯示每一個提交引入的差異日誌"
-#: command-list.h:194
+#: command-list.h:196
msgid "Manage multiple working trees"
msgstr "管理多個工作區"
-#: command-list.h:195
+#: command-list.h:197
msgid "Create a tree object from the current index"
msgstr "從目前索引建立一個樹狀物件"
-#: command-list.h:196
+#: command-list.h:198
msgid "Defining attributes per path"
msgstr "定義路徑的屬性"
-#: command-list.h:197
+#: command-list.h:199
msgid "Git command-line interface and conventions"
msgstr "Git 指令列介面和約定"
-#: command-list.h:198
+#: command-list.h:200
msgid "A Git core tutorial for developers"
msgstr "面向開發人員的 Git 核心教學"
-#: command-list.h:199
+#: 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:200
+#: command-list.h:203
msgid "Tweaking diff output"
msgstr "調整差異輸出"
-#: command-list.h:201
+#: command-list.h:204
msgid "A useful minimum set of commands for Everyday Git"
msgstr "每一天 Git 的一組有用的最小指令集合"
-#: command-list.h:202
+#: 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:203
+#: command-list.h:207
msgid "Hooks used by Git"
msgstr "Git 使用的掛鉤"
-#: command-list.h:204
+#: command-list.h:208
msgid "Specifies intentionally untracked files to ignore"
msgstr "忽略指定的未追蹤檔案"
-#: command-list.h:205
+#: command-list.h:209
+msgid "Map author/committer names and/or E-Mail addresses"
+msgstr "映射作者或提交者的名稱和（或）電子信箱地址"
+
+#: command-list.h:210
msgid "Defining submodule properties"
msgstr "定義子模組屬性"
-#: command-list.h:206
+#: command-list.h:211
msgid "Git namespaces"
msgstr "Git 名字空間"
-#: command-list.h:207
+#: command-list.h:212
+msgid "Helper programs to interact with remote repositories"
+msgstr "用來與遠端版本庫互動的協助工具"
+
+#: command-list.h:213
msgid "Git Repository Layout"
msgstr "Git 版本庫配置"
-#: command-list.h:208
+#: command-list.h:214
msgid "Specifying revisions and ranges for Git"
msgstr "指定 Git 的版本和版本範圍"
-#: command-list.h:209
+#: command-list.h:215
msgid "Mounting one repository inside another"
msgstr "在某個版本庫掛載某個版本庫"
-#: command-list.h:210
+#: command-list.h:216
msgid "A tutorial introduction to Git: part two"
msgstr "一個 Git 教學：第二部分"
-#: command-list.h:211
+#: command-list.h:217
msgid "A tutorial introduction to Git"
msgstr "一個 Git 教學"
-#: command-list.h:212
+#: command-list.h:218
msgid "An overview of recommended workflows with Git"
msgstr "Git 推薦的工作流概覽"
-#: git-bisect.sh:54
-msgid "You need to start by \"git bisect start\""
-msgstr "您需要執行 \"git bisect start\" 來開始"
-
-# 譯者：請維持句尾空格
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:60
-msgid "Do you want me to do it for you [Y/n]? "
-msgstr "您想讓我為您這樣做嗎[Y/n]？ "
-
-#: git-bisect.sh:101
-#, sh-format
-msgid "Bad rev input: $arg"
-msgstr "壞的輸入版本：$arg"
-
-#: git-bisect.sh:121
-#, sh-format
-msgid "Bad rev input: $bisected_head"
-msgstr "壞的輸入版本：$bisected_head"
-
-#: git-bisect.sh:130
-#, sh-format
-msgid "Bad rev input: $rev"
-msgstr "壞的輸入版本：$rev"
-
-#: git-bisect.sh:139
-#, sh-format
-msgid "'git bisect $TERM_BAD' can take only one argument."
-msgstr "'git bisect $TERM_BAD' 只能帶一個參數。"
-
-#: git-bisect.sh:209
-msgid "No logfile given"
-msgstr "未提供日誌檔案"
-
-#: git-bisect.sh:210
-#, sh-format
-msgid "cannot read $file for replaying"
-msgstr "不能讀取 $file 來重放"
-
-#: git-bisect.sh:232
-msgid "?? what are you talking about?"
-msgstr "?? 您在說什麼?"
-
-#: git-bisect.sh:241
+#: git-bisect.sh:68
msgid "bisect run failed: no command provided."
-msgstr "二分尋找執行失敗：沒有提供指令。"
+msgstr "二分搜尋執行失敗：沒有提供指令。"
-#: git-bisect.sh:246
+#: git-bisect.sh:73
#, sh-format
msgid "running $command"
msgstr "執行 $command"
-#: git-bisect.sh:253
+#: git-bisect.sh:80
#, sh-format
msgid ""
"bisect run failed:\n"
"exit code $res from '$command' is < 0 or >= 128"
msgstr ""
-"二分尋找執行失敗：\n"
+"二分搜尋執行失敗：\n"
"指令 '$command' 的離開碼 $res 小於 0 或大於等於 128"
-#: git-bisect.sh:279
+#: git-bisect.sh:105
msgid "bisect run cannot continue any more"
-msgstr "二分尋找不能繼續執行"
+msgstr "二分搜尋不能繼續執行"
-#: git-bisect.sh:285
+#: git-bisect.sh:111
#, sh-format
msgid ""
"bisect run failed:\n"
-"'bisect_state $state' exited with error code $res"
+"'bisect-state $state' exited with error code $res"
msgstr ""
-"二分尋找執行失敗：\n"
-"'bisect_state $state' 離開碼為 $res"
+"二分搜尋執行失敗：\n"
+"‘bisect-state $state’ 結束，錯誤碼 $res"
-#: git-bisect.sh:292
+#: git-bisect.sh:118
msgid "bisect run success"
-msgstr "二分尋找執行成功"
-
-#: git-bisect.sh:300
-msgid "We are not bisecting."
-msgstr "我們沒有在二分尋找。"
+msgstr "二分搜尋執行成功"
#: git-merge-octopus.sh:46
msgid ""
@@ -22827,128 +24404,46 @@
msgid "Simple merge did not work, trying automatic merge."
msgstr "簡單合併未生效，嘗試自動合併。"
-#: git-legacy-stash.sh:221
-msgid "Cannot remove temporary index (can't happen)"
-msgstr "無法刪除暫時索引（不應發生）"
-
-#: git-legacy-stash.sh:272
-#, sh-format
-msgid "Cannot update $ref_stash with $w_commit"
-msgstr "無法用 $w_commit 更新 $ref_stash"
-
-#: git-legacy-stash.sh:324
-#, sh-format
-msgid "error: unknown option for 'stash push': $option"
-msgstr "錯誤：'stash push' 的未知選項：$option"
-
-#: git-legacy-stash.sh:356
-#, sh-format
-msgid "Saved working directory and index state $stash_msg"
-msgstr "儲存工作目錄和索引狀態 $stash_msg"
-
-#: git-legacy-stash.sh:536
-#, sh-format
-msgid "unknown option: $opt"
-msgstr "未知選項: $opt"
-
-#: git-legacy-stash.sh:556
-#, sh-format
-msgid "Too many revisions specified: $REV"
-msgstr "指定了太多的版本：$REV"
-
-#: git-legacy-stash.sh:571
-#, sh-format
-msgid "$reference is not a valid reference"
-msgstr "$reference 不是一個有效的引用"
-
-#: git-legacy-stash.sh:599
-#, sh-format
-msgid "'$args' is not a stash-like commit"
-msgstr "'$args' 不是儲藏式提交"
-
-#: git-legacy-stash.sh:610
-#, sh-format
-msgid "'$args' is not a stash reference"
-msgstr "'$args' 不是一個儲藏引用"
-
-#: git-legacy-stash.sh:618
-msgid "unable to refresh index"
-msgstr "無法重新整理索引"
-
-#: git-legacy-stash.sh:622
-msgid "Cannot apply a stash in the middle of a merge"
-msgstr "無法在合併過程套用儲藏"
-
-#: git-legacy-stash.sh:630
-msgid "Conflicts in index. Try without --index."
-msgstr "索引中有衝突。嘗試不使用 --index。"
-
-#: git-legacy-stash.sh:632
-msgid "Could not save index tree"
-msgstr "不能儲存索引樹"
-
-#: git-legacy-stash.sh:641
-msgid "Could not restore untracked files from stash entry"
-msgstr "無法從儲藏條目中復原未追蹤檔案"
-
-#: git-legacy-stash.sh:666
-msgid "Cannot unstage modified files"
-msgstr "無法將修改的檔案取消暫存"
-
-#: git-legacy-stash.sh:704
-#, sh-format
-msgid "Dropped ${REV} ($s)"
-msgstr "捨棄了 ${REV} ($s)"
-
-#: git-legacy-stash.sh:705
-#, sh-format
-msgid "${REV}: Could not drop stash entry"
-msgstr "${REV}：無法捨棄儲藏條目"
-
-#: git-legacy-stash.sh:792
-msgid "(To restore them type \"git stash apply\")"
-msgstr "（為復原資料輸入 \"git stash apply\"）"
-
-#: git-submodule.sh:203
+#: git-submodule.sh:179
msgid "Relative path can only be used from the toplevel of the working tree"
msgstr "只能在工作區的頂級目錄中使用相對路徑"
-#: git-submodule.sh:213
+#: git-submodule.sh:189
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr "版本庫 URL：'$repo' 必須是絕對路徑或以 ./|../ 起始"
-#: git-submodule.sh:232
+#: git-submodule.sh:208
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "'$sm_path' 已經存在於索引中"
-#: git-submodule.sh:235
+#: git-submodule.sh:211
#, sh-format
msgid "'$sm_path' already exists in the index and is not a submodule"
msgstr "'$sm_path' 已經存在於索引中且不是一個子模組"
-#: git-submodule.sh:242
+#: git-submodule.sh:218
#, sh-format
msgid "'$sm_path' does not have a commit checked out"
-msgstr "'$sm_path' 沒有簽出的提交"
+msgstr "'$sm_path' 沒有檢出的提交"
-#: git-submodule.sh:273
+#: git-submodule.sh:249
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "新增位於 '$sm_path' 的現存版本庫到索引"
-#: git-submodule.sh:275
+#: git-submodule.sh:251
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "'$sm_path' 已存在且不是一個有效的 git 版本庫"
-#: git-submodule.sh:283
+#: git-submodule.sh:259
#, sh-format
msgid "A git directory for '$sm_name' is found locally with remote(s):"
msgstr "本機發現 '$sm_name' 的一個 git 目錄，與其對應的遠端版本庫："
-#: git-submodule.sh:285
+#: git-submodule.sh:261
#, sh-format
msgid ""
"If you want to reuse this local git directory instead of cloning again from\n"
@@ -22963,51 +24458,51 @@
"使用 '--force' 選項。如果本機 git 目錄不是正確的版本庫\n"
"或者您不確定這裡的含義，使用 '--name' 選項選擇另外的名稱。"
-#: git-submodule.sh:291
+#: git-submodule.sh:267
#, sh-format
msgid "Reactivating local git directory for submodule '$sm_name'."
msgstr "啟動本機 git 目錄到子模組 '$sm_name'。"
-#: git-submodule.sh:303
+#: git-submodule.sh:279
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
-msgstr "不能簽出子模組 '$sm_path'"
+msgstr "不能檢出子模組 '$sm_path'"
-#: git-submodule.sh:308
+#: git-submodule.sh:284
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "無法新增子模組 '$sm_path'"
-#: git-submodule.sh:317
+#: git-submodule.sh:293
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "無法註冊子模組 '$sm_path'"
-#: git-submodule.sh:590
+#: git-submodule.sh:568
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "無法在子模組路徑 '$displaypath' 中找到目前版本"
-#: git-submodule.sh:600
+#: git-submodule.sh:578
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "無法在子模組路徑 '$sm_path' 中取得"
-#: git-submodule.sh:605
+#: git-submodule.sh:583
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr "無法在子模組路徑 '$sm_path' 中找到目前版本 ${remote_name}/${branch}"
-#: git-submodule.sh:623
+#: git-submodule.sh:601
#, sh-format
msgid ""
"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
"$sha1:"
msgstr "無法在子模組路徑 '$displaypath' 中取得，嘗試直接取得 $sha1："
-#: git-submodule.sh:629
+#: git-submodule.sh:607
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -23015,83 +24510,51 @@
msgstr ""
"取得了子模組路徑 '$displaypath'，但是它沒有包含 $sha1。直接取得該提交失敗。"
-#: git-submodule.sh:636
+#: git-submodule.sh:614
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr "無法在子模組路徑 '$displaypath' 中簽出 '$sha1'"
+msgstr "無法在子模組路徑 '$displaypath' 中檢出 '$sha1'"
-#: git-submodule.sh:637
+#: git-submodule.sh:615
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
-msgstr "子模組路徑 '$displaypath'：簽出 '$sha1'"
+msgstr "子模組路徑 '$displaypath'：檢出 '$sha1'"
-#: git-submodule.sh:641
+#: git-submodule.sh:619
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "無法在子模組路徑 '$displaypath' 中重定基底 '$sha1'"
-#: git-submodule.sh:642
+#: git-submodule.sh:620
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "子模組路徑 '$displaypath'：重定基底至 '$sha1'"
-#: git-submodule.sh:647
+#: git-submodule.sh:625
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "無法合併 '$sha1' 到子模組路徑 '$displaypath' 中"
-#: git-submodule.sh:648
+#: git-submodule.sh:626
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "子模組路徑 '$displaypath'：已合併入 '$sha1'"
-#: git-submodule.sh:653
+#: git-submodule.sh:631
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr "在子模組 '$displaypath' 中執行 '$command $sha1' 失敗"
-#: git-submodule.sh:654
+#: git-submodule.sh:632
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "子模組 '$displaypath'：'$command $sha1'"
-#: git-submodule.sh:685
+#: git-submodule.sh:663
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "無法遞迴進子模組路徑 '$displaypath'"
-#: git-submodule.sh:896
-msgid "The --cached option cannot be used with the --files option"
-msgstr "選項 --cached 不能和選項 --files 同時使用"
-
-#: git-submodule.sh:948
-#, sh-format
-msgid "unexpected mode $mod_dst"
-msgstr "意外的模式 $mod_dst"
-
-# 譯者：請維持前導空格
-#: git-submodule.sh:968
-#, sh-format
-msgid " Warn: $display_name doesn't contain commit $sha1_src"
-msgstr " 警告：$display_name 未包含提交 $sha1_src"
-
-# 譯者：請維持前導空格
-#: git-submodule.sh:971
-#, sh-format
-msgid " Warn: $display_name doesn't contain commit $sha1_dst"
-msgstr " 警告：$display_name 未包含提交 $sha1_dst"
-
-# 譯者：請維持前導空格
-#: git-submodule.sh:974
-#, sh-format
-msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
-msgstr " 警告：$display_name 未包含提交 $sha1_src 和 $sha1_dst"
-
-#: git-parse-remote.sh:89
-#, sh-format
-msgid "See git-${cmd}(1) for details."
-msgstr "詳見 git-${cmd}(1)。"
-
#: git-rebase--preserve-merges.sh:109
msgid "Applied autostash."
msgstr "已應用 autostash。"
@@ -23101,12 +24564,22 @@
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"
@@ -23133,7 +24606,7 @@
"e, edit <提交> = 使用提交，但停下來修補\n"
"s, squash <提交> = 使用提交，但融合到前一個提交\n"
"f, fixup <提交> = 類似於 \"squash\"，但捨棄提交說明日誌\n"
-"x, exec <指令> = 使用 shell 執行指令（此行剩餘部分）\n"
+"x, exec <命令> = 使用 shell 執行指令（此行剩餘部分）\n"
"d, drop <提交> = 刪除提交\n"
"l, label <標籤> = 為目前 HEAD 打上標籤\n"
"t, reset <標籤> = 重設 HEAD 到該標籤\n"
@@ -23144,7 +24617,7 @@
"\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"
@@ -23163,82 +24636,82 @@
"\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 個提交的組合。"
-#: 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"
@@ -23251,32 +24724,32 @@
"這通常是因為空的提交說明，或者 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"
@@ -23287,7 +24760,7 @@
"\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"
@@ -23301,25 +24774,25 @@
"\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"
@@ -23348,54 +24821,54 @@
"\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"
+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 個提交）"
-#: git-rebase--preserve-merges.sh:955
+#: git-rebase--preserve-merges.sh:945
msgid "Note that empty commits are commented out"
msgstr "注意空提交已被備註掉"
-#: 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 "不能對重寫提交進行初始化"
@@ -23412,7 +24885,7 @@
#: 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 不能在沒有工作區的情況下使用"
+msgstr "致命錯誤：$program_name 不能在沒有工作區的情況下使用。"
#: git-sh-setup.sh:221
msgid "Cannot rebase: You have unstaged changes."
@@ -23462,50 +24935,50 @@
msgid "%12s %12s %s"
msgstr "%12s %12s %s"
-#: git-add--interactive.perl:634
+#: git-add--interactive.perl:632
#, perl-format
msgid "touched %d path\n"
msgid_plural "touched %d paths\n"
msgstr[0] "建立了 %d 個路徑\n"
-#: git-add--interactive.perl:1053
+#: git-add--interactive.perl:1056
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for staging."
msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為暫存。"
-#: git-add--interactive.perl:1056
+#: git-add--interactive.perl:1059
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for stashing."
msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為儲藏。"
-#: git-add--interactive.perl:1059
+#: git-add--interactive.perl:1062
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for unstaging."
msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為未暫存。"
-#: git-add--interactive.perl:1062 git-add--interactive.perl:1071
-#: git-add--interactive.perl:1077
+#: git-add--interactive.perl:1065 git-add--interactive.perl:1074
+#: git-add--interactive.perl:1080
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for applying."
msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為應用。"
-#: git-add--interactive.perl:1065 git-add--interactive.perl:1068
-#: git-add--interactive.perl:1074
+#: git-add--interactive.perl:1068 git-add--interactive.perl:1071
+#: git-add--interactive.perl:1077
msgid ""
"If the patch applies cleanly, the edited hunk will immediately be\n"
"marked for discarding."
msgstr "如果修補檔能乾淨地套用，編輯塊將立即標記為捨棄。"
-#: git-add--interactive.perl:1111
+#: git-add--interactive.perl:1114
#, perl-format
msgid "failed to open hunk edit file for writing: %s"
msgstr "為寫入開啟區塊編輯檔案失敗：%s"
-#: git-add--interactive.perl:1118
+#: git-add--interactive.perl:1121
#, perl-format
msgid ""
"---\n"
@@ -23518,12 +24991,12 @@
"要刪除 '%s' 開始的行，刪除它們。\n"
"以 %s 開始的行將被刪除。\n"
-#: git-add--interactive.perl:1140
+#: git-add--interactive.perl:1143
#, perl-format
msgid "failed to open hunk edit file for reading: %s"
msgstr "無法讀取區塊編輯檔案：%s"
-#: git-add--interactive.perl:1248
+#: git-add--interactive.perl:1251
msgid ""
"y - stage this hunk\n"
"n - do not stage this hunk\n"
@@ -23537,7 +25010,7 @@
"a - 暫存此區塊和本檔案中後面的全部區塊\n"
"d - 不暫存此區塊和本檔案中後面的全部區塊"
-#: git-add--interactive.perl:1254
+#: git-add--interactive.perl:1257
msgid ""
"y - stash this hunk\n"
"n - do not stash this hunk\n"
@@ -23551,7 +25024,7 @@
"a - 儲藏此區塊和本檔案中後面的全部區塊\n"
"d - 不儲藏此區塊和本檔案中後面的全部區塊"
-#: git-add--interactive.perl:1260
+#: git-add--interactive.perl:1263
msgid ""
"y - unstage this hunk\n"
"n - do not unstage this hunk\n"
@@ -23565,7 +25038,7 @@
"a - 不暫存此區塊和本檔案中後面的全部區塊\n"
"d - 不要不暫存此區塊和本檔案中後面的全部區塊"
-#: git-add--interactive.perl:1266
+#: git-add--interactive.perl:1269
msgid ""
"y - apply this hunk to index\n"
"n - do not apply this hunk to index\n"
@@ -23579,7 +25052,7 @@
"a - 套用此區塊和本檔案中後面的全部區塊\n"
"d - 不要套用此區塊和本檔案中後面的全部區塊"
-#: git-add--interactive.perl:1272 git-add--interactive.perl:1290
+#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
msgid ""
"y - discard this hunk from worktree\n"
"n - do not discard this hunk from worktree\n"
@@ -23593,7 +25066,7 @@
"a - 捨棄此區塊和本檔案中後面的全部區塊\n"
"d - 不要捨棄此區塊和本檔案中後面的全部區塊"
-#: git-add--interactive.perl:1278
+#: git-add--interactive.perl:1281
msgid ""
"y - discard this hunk from index and worktree\n"
"n - do not discard this hunk from index and worktree\n"
@@ -23607,7 +25080,7 @@
"a - 捨棄此區塊和本檔案中後面的全部區塊\n"
"d - 不要捨棄此區塊和本檔案中後面的全部區塊"
-#: git-add--interactive.perl:1284
+#: git-add--interactive.perl:1287
msgid ""
"y - apply this hunk to index and worktree\n"
"n - do not apply this hunk to index and worktree\n"
@@ -23621,7 +25094,7 @@
"a - 套用此區塊和本檔案中後面的全部區塊\n"
"d - 不要套用此區塊和本檔案中後面的全部區塊"
-#: git-add--interactive.perl:1296
+#: git-add--interactive.perl:1299
msgid ""
"y - apply this hunk to worktree\n"
"n - do not apply this hunk to worktree\n"
@@ -23635,7 +25108,7 @@
"a - 套用此區塊和本檔案中後面的全部區塊\n"
"d - 不要套用此區塊和本檔案中後面的全部區塊"
-#: git-add--interactive.perl:1311
+#: git-add--interactive.perl:1314
msgid ""
"g - select a hunk to go to\n"
"/ - search for a hunk matching the given regex\n"
@@ -23657,83 +25130,88 @@
"e - 手動編輯目前區塊\n"
"? - 顯示說明\n"
-#: git-add--interactive.perl:1342
+#: git-add--interactive.perl:1345
msgid "The selected hunks do not apply to the index!\n"
msgstr "選中的區塊不能套用到索引！\n"
-#: git-add--interactive.perl:1357
+#: git-add--interactive.perl:1360
#, perl-format
msgid "ignoring unmerged: %s\n"
msgstr "忽略未套用的：%s\n"
-#: git-add--interactive.perl:1468
+#: git-add--interactive.perl:1479
#, perl-format
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
msgstr "將模式變更套用到工作區 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1469
+#: git-add--interactive.perl:1480
#, perl-format
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
-msgstr "將刪除動作套用到工作區 [y,n,q,a,d%s,?]? "
+msgstr "將刪除變更套用到工作區 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1470
+#: git-add--interactive.perl:1481
+#, perl-format
+msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
+msgstr "將新增變更套用到工作區 [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1482
#, perl-format
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
msgstr "將此區塊套用到工作區 [y,n,q,a,d%s,?]? "
-#: git-add--interactive.perl:1570
+#: git-add--interactive.perl:1599
msgid "No other hunks to goto\n"
msgstr "沒有其它可供跳轉的區塊\n"
-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1617
#, perl-format
msgid "Invalid number: '%s'\n"
msgstr "無效數字：'%s'\n"
-#: git-add--interactive.perl:1593
+#: git-add--interactive.perl:1622
#, perl-format
msgid "Sorry, only %d hunk available.\n"
msgid_plural "Sorry, only %d hunks available.\n"
msgstr[0] "對不起，只有 %d 個可用區塊。\n"
-#: git-add--interactive.perl:1619
+#: git-add--interactive.perl:1657
msgid "No other hunks to search\n"
msgstr "沒有其它可供尋找的區塊\n"
-#: git-add--interactive.perl:1636
+#: git-add--interactive.perl:1674
#, perl-format
msgid "Malformed search regexp %s: %s\n"
msgstr "錯誤的正規表示式 %s：%s\n"
-#: git-add--interactive.perl:1646
+#: git-add--interactive.perl:1684
msgid "No hunk matches the given pattern\n"
msgstr "沒有和提供模式相符合的區塊\n"
-#: git-add--interactive.perl:1658 git-add--interactive.perl:1680
+#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
msgid "No previous hunk\n"
msgstr "沒有前一個區塊\n"
-#: git-add--interactive.perl:1667 git-add--interactive.perl:1686
+#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
msgid "No next hunk\n"
msgstr "沒有下一個區塊\n"
-#: git-add--interactive.perl:1692
+#: git-add--interactive.perl:1730
msgid "Sorry, cannot split this hunk\n"
msgstr "對不起，不能分割這個區塊\n"
-#: git-add--interactive.perl:1698
+#: git-add--interactive.perl:1736
#, perl-format
msgid "Split into %d hunk.\n"
msgid_plural "Split into %d hunks.\n"
msgstr[0] "分割為 %d 塊。\n"
-#: git-add--interactive.perl:1708
+#: git-add--interactive.perl:1746
msgid "Sorry, cannot edit this hunk\n"
msgstr "對不起，不能編輯這個區塊\n"
#. TRANSLATORS: please do not translate the command names
#. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1773
+#: git-add--interactive.perl:1811
msgid ""
"status - show paths with changes\n"
"update - add working tree state to the staged set of changes\n"
@@ -23750,19 +25228,19 @@
"diff - 顯示 HEAD 和索引間差異\n"
"add untracked - 新增未追蹤檔案的內容至暫存列表\n"
-#: git-add--interactive.perl:1790 git-add--interactive.perl:1795
-#: git-add--interactive.perl:1798 git-add--interactive.perl:1805
-#: git-add--interactive.perl:1808 git-add--interactive.perl:1815
-#: git-add--interactive.perl:1819 git-add--interactive.perl:1825
+#: git-add--interactive.perl:1828 git-add--interactive.perl:1840
+#: git-add--interactive.perl:1843 git-add--interactive.perl:1850
+#: git-add--interactive.perl:1853 git-add--interactive.perl:1860
+#: git-add--interactive.perl:1864 git-add--interactive.perl:1870
msgid "missing --"
msgstr "缺少 --"
-#: git-add--interactive.perl:1821
+#: git-add--interactive.perl:1866
#, perl-format
msgid "unknown --patch mode: %s"
msgstr "未知的 --patch 模式：%s"
-#: git-add--interactive.perl:1827 git-add--interactive.perl:1833
+#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
#, perl-format
msgid "invalid argument %s, expecting --"
msgstr "無效的參數 %s，期望是 --"
@@ -23779,62 +25257,72 @@
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"
@@ -23849,12 +25337,12 @@
" * 如果含義為一個檔案，使用 \"./%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"
@@ -23863,7 +25351,7 @@
"致命錯誤：%s：%s\n"
"警告：修補檔未能傳送\n"
-#: git-send-email.perl:705
+#: git-send-email.perl:713
msgid ""
"\n"
"No patch files specified!\n"
@@ -23873,17 +25361,17 @@
"未指定修補檔案！\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"
@@ -23896,37 +25384,37 @@
"\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]？"
+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
-msgid "Which 8bit encoding should I declare [UTF-8]? "
-msgstr "要聲明 8bit 為什麼樣的編碼格式 [UTF-8]？"
-
#: 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"
@@ -23936,22 +25424,22 @@
msgstr ""
"拒絕傳送，因為修補檔\n"
"\t%s\n"
-"包含範本標題 '*** SUBJECT HERE ***'。如果確實想要傳送，使用參數 --force。\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 ？"
+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"
@@ -23959,16 +25447,16 @@
#. 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"
@@ -23993,128 +25481,219 @@
#. 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]："
+
+#~ msgid "repository contains replace objects; skipping commit-graph"
+#~ msgstr "版本庫有取代物件；跳過提交圖形"
+
+#~ msgid "repository contains (deprecated) grafts; skipping commit-graph"
+#~ msgstr "版本庫有（廢棄的）移植項目；跳過提交圖形"
+
+#~ msgid "repository is shallow; skipping commit-graph"
+#~ msgstr "版本庫是淺複製；忽略提交圖形"
+
+#, c-format
+#~ msgid "commit-graph improper chunk offset %08x%08x"
+#~ msgstr "提交圖形不正確的區塊位移 %08x%08x"
+
+#, c-format
+#~ msgid "commit-graph chunk id %08x appears multiple times"
+#~ msgstr "提交圖形區塊 id %08x 出現了多次"
+
+#~ msgid "invalid chunk offset (too large)"
+#~ msgstr "無效的區塊位移（太大）"
+
+#~ msgid "Writing chunks to multi-pack-index"
+#~ msgstr "寫入區塊至多包索引"
+
+#~ msgid "rev-list died"
+#~ msgstr "rev-list 終止"
+
+#~ msgid ""
+#~ "git bisect--helper --bisect-write [--no-log] <state> <revision> "
+#~ "<good_term> <bad_term>"
+#~ msgstr ""
+#~ "git bisect--helper --bisect-write [--no-log] <狀態> <版本> <好-術語> <壞-"
+#~ "術語>"
+
+#~ msgid ""
+#~ "git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
+#~ "<bad_term>"
+#~ msgstr ""
+#~ "git bisect--helper --bisect-check-and-set-terms <指令> <好-術語> <壞-術語>"
+
+#~ msgid "git bisect--helper --bisect-auto-next"
+#~ msgstr "git bisect--helper --bisect-auto-next"
+
+#~ msgid "write out the bisection state in BISECT_LOG"
+#~ msgstr "將二分尋找的狀態寫入 BISECT_LOG"
+
+#~ msgid "check and set terms in a bisection state"
+#~ msgstr "在一個二分尋找狀態中檢查和設定術語"
+
+#~ msgid ""
+#~ "verify the next bisection state then checkout the next bisection commit"
+#~ msgstr "驗證下一個二分尋找狀態後，檢出下一個二分尋找提交"
+
+#~ msgid "--bisect-write requires either 4 or 5 arguments"
+#~ msgstr "--bisect-write 需要 4 或 5 個參數"
+
+#~ msgid "--check-and-set-terms requires 3 arguments"
+#~ msgstr "--check-and-set-terms 需要 3 個參數"
+
+#~ msgid "--bisect-auto-next requires 0 arguments"
+#~ msgstr "--bisect-auto-next 需要 0 個引數"
+
+#~ msgid "Force progress reporting"
+#~ msgstr "強制進度顯示"
+
+#, c-format
+#~ msgid "Error deleting remote-tracking branch '%s'"
+#~ msgstr "無法刪除遠端追蹤分支 '%s'"
+
+#, c-format
+#~ msgid "Error deleting branch '%s'"
+#~ msgstr "無法刪除分支 '%s'"
+
+#~ msgid "show parse tree for grep expression"
+#~ msgstr "顯示 grep 表達式的解析樹"
+
+#~ msgid "too many parameters"
+#~ msgstr "參數太多"
+
+#~ msgid "too few parameters"
+#~ msgstr "參數太少"
+
+#~ msgid "Recurse into nested submodules"
+#~ msgstr "遞迴進入嵌套子模組中"
+
+#~ msgid "too many params"
+#~ msgstr "太多參數"
+
+#, sh-format
+#~ msgid "Bad rev input: $arg"
+#~ msgstr "壞的輸入版本：$arg"
diff --git a/preload-index.c b/preload-index.c
index ed6eaa4..e5529a5 100644
--- a/preload-index.c
+++ b/preload-index.c
@@ -31,6 +31,7 @@
struct pathspec pathspec;
struct progress_data *progress;
int offset, nr;
+ int t2_nr_lstat;
};
static void *preload_thread(void *_data)
@@ -73,6 +74,7 @@
continue;
if (threaded_has_symlink_leading_path(&cache, ce->name, ce_namelen(ce)))
continue;
+ p->t2_nr_lstat++;
if (lstat(ce->name, &st))
continue;
if (ie_match_stat(index, ce, &st, CE_MATCH_RACY_IS_DIRTY|CE_MATCH_IGNORE_FSMONITOR))
@@ -98,6 +100,7 @@
int threads, i, work, offset;
struct thread_data data[MAX_PARALLEL];
struct progress_data pd;
+ int t2_sum_lstat = 0;
if (!HAVE_THREADS || !core_preload_index)
return;
@@ -107,6 +110,9 @@
threads = 2;
if (threads < 2)
return;
+
+ trace2_region_enter("index", "preload", NULL);
+
trace_performance_enter();
if (threads > MAX_PARALLEL)
threads = MAX_PARALLEL;
@@ -141,10 +147,14 @@
struct thread_data *p = data+i;
if (pthread_join(p->pthread, NULL))
die("unable to join threaded lstat");
+ t2_sum_lstat += p->t2_nr_lstat;
}
stop_progress(&pd.progress);
trace_performance_leave("preload index");
+
+ trace2_data_intmax("index", NULL, "preload/sum_lstat", t2_sum_lstat);
+ trace2_region_leave("index", "preload", NULL);
}
int repo_read_index_preload(struct repository *repo,
diff --git a/pretty.c b/pretty.c
index 28afc70..d5efd00 100644
--- a/pretty.c
+++ b/pretty.c
@@ -474,7 +474,8 @@
}
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 */
@@ -677,8 +678,8 @@
{
static struct string_list *mail_map;
if (!mail_map) {
- mail_map = xcalloc(1, sizeof(*mail_map));
- read_mailmap(mail_map, NULL);
+ CALLOC_ARRAY(mail_map, 1);
+ read_mailmap(mail_map);
}
return mail_map->nr && map_user(mail_map, email, email_len, name, name_len);
}
@@ -782,6 +783,7 @@
};
struct format_commit_context {
+ struct repository *repository;
const struct commit *commit;
const struct pretty_print_context *pretty_ctx;
unsigned commit_header_parsed:1;
@@ -838,21 +840,22 @@
(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;
}
@@ -1146,6 +1149,63 @@
return 0;
}
+int format_set_trailers_options(struct process_trailer_options *opts,
+ struct string_list *filter_list,
+ struct strbuf *sepbuf,
+ struct strbuf *kvsepbuf,
+ const char **arg,
+ char **invalid_arg)
+{
+ for (;;) {
+ const char *argval;
+ size_t arglen;
+
+ if (**arg == ')')
+ break;
+
+ if (match_placeholder_arg_value(*arg, "key", arg, &argval, &arglen)) {
+ uintptr_t len = arglen;
+
+ if (!argval)
+ return -1;
+
+ if (len && argval[len - 1] == ':')
+ len--;
+ string_list_append(filter_list, argval)->util = (char *)len;
+
+ opts->filter = format_trailer_match_cb;
+ opts->filter_data = filter_list;
+ opts->only_trailers = 1;
+ } else if (match_placeholder_arg_value(*arg, "separator", arg, &argval, &arglen)) {
+ char *fmt;
+
+ strbuf_reset(sepbuf);
+ fmt = xstrndup(argval, arglen);
+ strbuf_expand(sepbuf, fmt, strbuf_expand_literal_cb, NULL);
+ free(fmt);
+ opts->separator = sepbuf;
+ } else if (match_placeholder_arg_value(*arg, "key_value_separator", arg, &argval, &arglen)) {
+ char *fmt;
+
+ strbuf_reset(kvsepbuf);
+ fmt = xstrndup(argval, arglen);
+ strbuf_expand(kvsepbuf, fmt, strbuf_expand_literal_cb, NULL);
+ free(fmt);
+ opts->key_value_separator = kvsepbuf;
+ } else if (!match_placeholder_bool_arg(*arg, "only", arg, &opts->only_trailers) &&
+ !match_placeholder_bool_arg(*arg, "unfold", arg, &opts->unfold) &&
+ !match_placeholder_bool_arg(*arg, "keyonly", arg, &opts->key_only) &&
+ !match_placeholder_bool_arg(*arg, "valueonly", arg, &opts->value_only)) {
+ if (invalid_arg) {
+ size_t len = strcspn(*arg, ",)");
+ *invalid_arg = xstrndup(*arg, len);
+ }
+ return -1;
+ }
+ }
+ return 0;
+}
+
static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
const char *placeholder,
void *context)
@@ -1154,7 +1214,7 @@
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;
@@ -1371,10 +1431,13 @@
return 2;
}
-
/* For the rest we have to parse the commit header. */
- if (!c->commit_header_parsed)
+ if (!c->commit_header_parsed) {
+ msg = c->message =
+ repo_logmsg_reencode(c->repository, commit,
+ &c->commit_encoding, "UTF-8");
parse_commit_header(c);
+ }
switch (placeholder[0]) {
case 'a': /* author ... */
@@ -1404,7 +1467,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);
@@ -1415,42 +1479,15 @@
struct process_trailer_options opts = PROCESS_TRAILER_OPTIONS_INIT;
struct string_list filter_list = STRING_LIST_INIT_NODUP;
struct strbuf sepbuf = STRBUF_INIT;
+ struct strbuf kvsepbuf = STRBUF_INIT;
size_t ret = 0;
opts.no_divider = 1;
if (*arg == ':') {
arg++;
- for (;;) {
- const char *argval;
- size_t arglen;
-
- if (match_placeholder_arg_value(arg, "key", &arg, &argval, &arglen)) {
- uintptr_t len = arglen;
-
- if (!argval)
- goto trailer_out;
-
- if (len && argval[len - 1] == ':')
- len--;
- string_list_append(&filter_list, argval)->util = (char *)len;
-
- opts.filter = format_trailer_match_cb;
- opts.filter_data = &filter_list;
- opts.only_trailers = 1;
- } else if (match_placeholder_arg_value(arg, "separator", &arg, &argval, &arglen)) {
- char *fmt;
-
- strbuf_reset(&sepbuf);
- fmt = xstrndup(argval, arglen);
- strbuf_expand(&sepbuf, fmt, strbuf_expand_literal_cb, NULL);
- free(fmt);
- opts.separator = &sepbuf;
- } else if (!match_placeholder_bool_arg(arg, "only", &arg, &opts.only_trailers) &&
- !match_placeholder_bool_arg(arg, "unfold", &arg, &opts.unfold) &&
- !match_placeholder_bool_arg(arg, "valueonly", &arg, &opts.value_only))
- break;
- }
+ if (format_set_trailers_options(&opts, &filter_list, &sepbuf, &kvsepbuf, &arg, NULL))
+ goto trailer_out;
}
if (*arg == ')') {
format_trailers_from_commit(sb, msg + c->subject_off, &opts);
@@ -1654,6 +1691,7 @@
const struct pretty_print_context *pretty_ctx)
{
struct format_commit_context context = {
+ .repository = r,
.commit = commit,
.pretty_ctx = pretty_ctx,
.wrap_start = sb->len
@@ -1661,18 +1699,14 @@
const char *output_enc = pretty_ctx->output_encoding;
const char *utf8 = "UTF-8";
- /*
- * convert a commit message to UTF-8 first
- * as far as 'format_commit_item' assumes it in UTF-8
- */
- context.message = repo_logmsg_reencode(r, commit,
- &context.commit_encoding,
- utf8);
-
strbuf_expand(sb, format, format_commit_item, &context);
rewrap_message_tail(sb, &context, 0, 0, 0);
- /* then convert a commit message to an actual output encoding */
+ /*
+ * Convert output to an actual output encoding; note that
+ * format_commit_item() will always use UTF-8, so we don't
+ * have to bother if that's what the output wants.
+ */
if (output_enc) {
if (same_encoding(utf8, output_enc))
output_enc = NULL;
@@ -1767,7 +1801,8 @@
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/pretty.h b/pretty.h
index 4ad1fc3..d902cdd 100644
--- a/pretty.h
+++ b/pretty.h
@@ -6,6 +6,7 @@
struct commit;
struct strbuf;
+struct process_trailer_options;
/* Commit formats */
enum cmit_fmt {
@@ -43,6 +44,7 @@
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 +140,18 @@
/* 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);
+
+/*
+ * Set values of fields in "struct process_trailer_options"
+ * according to trailers arguments.
+ */
+int format_set_trailers_options(struct process_trailer_options *opts,
+ struct string_list *filter_list,
+ struct strbuf *sepbuf,
+ struct strbuf *kvsepbuf,
+ const char **arg,
+ char **invalid_arg);
+
#endif /* PRETTY_H */
diff --git a/progress.c b/progress.c
index 19805ac..680c6a8 100644
--- a/progress.c
+++ b/progress.c
@@ -8,6 +8,7 @@
* published by the Free Software Foundation.
*/
+#define GIT_TEST_PROGRESS_ONLY
#include "cache.h"
#include "gettext.h"
#include "progress.h"
@@ -52,7 +53,6 @@
*/
int progress_testing;
uint64_t progress_test_ns = 0;
-void progress_test_force_update(void); /* To silence -Wmissing-prototypes */
void progress_test_force_update(void)
{
progress_update = 1;
@@ -196,7 +196,7 @@
now_ns = progress_getnanotime(progress);
if (!tp) {
- progress->throughput = tp = xcalloc(1, sizeof(*tp));
+ progress->throughput = CALLOC_ARRAY(tp, 1);
tp->prev_total = tp->curr_total = total;
tp->prev_ns = now_ns;
strbuf_init(&tp->display, 0);
@@ -265,6 +265,7 @@
progress->title_len = utf8_strwidth(title);
progress->split = 0;
set_progress_signal();
+ trace2_region_enter("progress", title, the_repository);
return progress;
}
@@ -318,14 +319,34 @@
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;
diff --git a/progress.h b/progress.h
index 8473389..f1913ac 100644
--- a/progress.h
+++ b/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/promisor-remote.c b/promisor-remote.c
index 9f338c9..da3f2ca 100644
--- a/promisor-remote.c
+++ b/promisor-remote.c
@@ -3,48 +3,43 @@
#include "promisor-remote.h"
#include "config.h"
#include "transport.h"
+#include "strvec.h"
static char *repository_format_partial_clone;
-static const char *core_partial_clone_filter_default;
void set_repository_format_partial_clone(char *partial_clone)
{
repository_format_partial_clone = xstrdup_or_null(partial_clone);
}
-static int fetch_refs(const char *remote_name, struct ref *ref)
-{
- struct remote *remote;
- struct transport *transport;
- int res;
-
- remote = remote_get(remote_name);
- if (!remote->url[0])
- die(_("Remote with no URL"));
- transport = transport_get(remote, remote->url[0]);
-
- transport_set_option(transport, TRANS_OPT_FROM_PROMISOR, "1");
- transport_set_option(transport, TRANS_OPT_NO_DEPENDENTS, "1");
- res = transport_fetch_refs(transport, ref);
-
- return res;
-}
-
static int fetch_objects(const char *remote_name,
const struct object_id *oids,
int oid_nr)
{
- struct ref *ref = NULL;
+ 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++) {
- 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;
+ 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"));
}
- return fetch_refs(remote_name, ref);
+
+ 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;
@@ -101,13 +96,9 @@
static int promisor_remote_config(const char *var, const char *value, void *data)
{
const char *name;
- int namelen;
+ size_t namelen;
const char *subkey;
- if (!strcmp(var, "core.partialclonefilter"))
- return git_config_string(&core_partial_clone_filter_default,
- var, value);
-
if (parse_config_key(var, "remote", &name, &namelen, &subkey) < 0)
return 0;
@@ -217,7 +208,7 @@
if (remaining_nr) {
int j = 0;
- new_oids = xcalloc(remaining_nr, sizeof(*new_oids));
+ CALLOC_ARRAY(new_oids, remaining_nr);
for (i = 0; i < oid_nr; i++)
if (remaining[i])
oidcpy(&new_oids[j++], &old_oids[i]);
@@ -241,6 +232,9 @@
int to_free = 0;
int res = -1;
+ if (oid_nr == 0)
+ return 0;
+
promisor_remote_init();
for (r = promisors; r; r = r->next) {
diff --git a/promisor-remote.h b/promisor-remote.h
index 737bac3..c7a1406 100644
--- a/promisor-remote.h
+++ b/promisor-remote.h
@@ -9,7 +9,7 @@
* Promisor remote linked list
*
* Information in its fields come from remote.XXX config entries or
- * from extensions.partialclone or core.partialclonefilter.
+ * from extensions.partialclone.
*/
struct promisor_remote {
struct promisor_remote *next;
@@ -20,6 +20,14 @@
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);
diff --git a/prompt.c b/prompt.c
index 6d5885d..5ded21a 100644
--- a/prompt.c
+++ b/prompt.c
@@ -74,3 +74,15 @@
}
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/prompt.h b/prompt.h
index e04cced..e294e93 100644
--- a/prompt.h
+++ b/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/protocol.c b/protocol.c
index 803bef5..052d7ed 100644
--- a/protocol.c
+++ b/protocol.c
@@ -20,7 +20,7 @@
const char *git_test_k = "GIT_TEST_PROTOCOL_VERSION";
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)
diff --git a/prune-packed.c b/prune-packed.c
new file mode 100644
index 0000000..261520b
--- /dev/null
+++ b/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/prune-packed.h b/prune-packed.h
new file mode 100644
index 0000000..936fa9d
--- /dev/null
+++ b/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/quote.c b/quote.c
index bcc0dbc..8a3a5e3 100644
--- a/quote.c
+++ b/quote.c
@@ -1,6 +1,6 @@
#include "cache.h"
#include "quote.h"
-#include "argv-array.h"
+#include "strvec.h"
int quote_path_fully = 1;
@@ -116,7 +116,7 @@
}
}
-static char *sq_dequote_step(char *arg, char **next)
+char *sq_dequote_step(char *arg, char **next)
{
char *dst = arg;
char *src = arg;
@@ -153,11 +153,8 @@
}
/* Fallthrough */
default:
- if (!next || !isspace(*src))
+ if (!next)
return NULL;
- do {
- c = *++src;
- } while (isspace(c));
*dst = 0;
*next = src;
return arg;
@@ -172,7 +169,7 @@
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;
@@ -182,12 +179,20 @@
char *dequoted = sq_dequote_step(next, &next);
if (!dequoted)
return -1;
+ if (next) {
+ char c;
+ if (!isspace(*next))
+ return -1;
+ do {
+ c = *++next;
+ } while (isspace(c));
+ }
if (argv) {
ALLOC_GROW(*argv, *nr + 1, *alloc);
(*argv)[(*nr)++] = dequoted;
}
if (array)
- argv_array_push(array, dequoted);
+ strvec_push(array, dequoted);
} while (next);
return 0;
@@ -198,7 +203,7 @@
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);
}
@@ -210,7 +215,7 @@
*/
#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,
@@ -223,9 +228,9 @@
/* 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.
@@ -235,9 +240,9 @@
{
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;
}
@@ -256,7 +261,7 @@
* 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) \
@@ -272,6 +277,7 @@
count += (l); \
} while (0)
+ int no_dq = !!(flags & CQUOTE_NODQ);
size_t len, count = 0;
const char *p = name;
@@ -291,8 +297,8 @@
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');
@@ -309,19 +315,21 @@
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 {
@@ -352,13 +360,25 @@
}
/* 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/quote.h b/quote.h
index ca8ee31..768cc63 100644
--- a/quote.h
+++ b/quote.h
@@ -42,13 +42,27 @@
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
+/*
+ * This unwraps what sq_quote() produces in place, but returns
* NULL if the input does not look like what sq_quote would have
- * produced.
+ * produced (the full string must be a single quoted item).
*/
char *sq_dequote(char *);
/*
+ * Like sq_dequote(), but dequote a single item, and leave "next" pointing to
+ * the next character. E.g., in the string:
+ *
+ * 'one' 'two' 'three'
+ *
+ * after the first call, the return value would be the unquoted string "one",
+ * with "next" pointing to the space between "one" and "two"). The caller is
+ * responsible for advancing the pointer to the start of the next item before
+ * calling sq_dequote_step() again.
+ */
+char *sq_dequote_step(char *src, char **next);
+
+/*
* Same as the above, but can be used to unwrap many arguments in the
* same string separated by space. Like sq_quote, it works in place,
* modifying arg and appending pointers into it to argv.
@@ -56,24 +70,27 @@
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/range-diff.c b/range-diff.c
index f745567..116fb07 100644
--- a/range-diff.c
+++ b/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"
@@ -11,6 +11,7 @@
#include "pretty.h"
#include "userdiff.h"
#include "apply.h"
+#include "revision.h"
struct patch_util {
/* For the search for an exact match */
@@ -41,7 +42,7 @@
* as struct object_id (will need to be free()d).
*/
static int read_patches(const char *range, struct string_list *list,
- const struct argv_array *other_arg)
+ const struct strvec *other_arg)
{
struct child_process cp = CHILD_PROCESS_INIT;
struct strbuf buf = STRBUF_INIT, contents = STRBUF_INIT;
@@ -51,22 +52,24 @@
int offset, len;
size_t size;
- argv_array_pushl(&cp.args, "log", "--no-color", "-p", "--no-merges",
- "--reverse", "--date-order", "--decorate=no",
- "--no-prefix",
- /*
- * Choose indicators that are not used anywhere
- * else in diffs, but still look reasonable
- * (e.g. will not be confusing when debugging)
- */
- "--output-indicator-new=>",
- "--output-indicator-old=<",
- "--output-indicator-context=#",
- "--no-abbrev-commit",
- 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)
- argv_array_pushv(&cp.args, other_arg->argv);
- argv_array_push(&cp.args, range);
+ strvec_pushv(&cp.args, other_arg->v);
+ strvec_push(&cp.args, range);
cp.out = -1;
cp.no_stdin = 1;
cp.git_cmd = 1;
@@ -78,6 +81,8 @@
finish_command(&cp);
return -1;
}
+ if (finish_command(&cp))
+ return -1;
line = contents.buf;
size = contents.len;
@@ -91,14 +96,14 @@
string_list_append(list, buf.buf)->util = util;
strbuf_reset(&buf);
}
- util = xcalloc(sizeof(*util), 1);
+ CALLOC_ARRAY(util, 1);
if (get_oid(p, &util->oid)) {
error(_("could not parse commit '%s'"), p);
free(util);
+ free(current_filename);
string_list_clear(list, 1);
strbuf_release(&buf);
strbuf_release(&contents);
- finish_command(&cp);
return -1;
}
util->matching = -1;
@@ -106,20 +111,41 @@
continue;
}
+ if (!util) {
+ error(_("could not parse first line of `log` output: "
+ "did not start with 'commit ': '%s'"),
+ line);
+ free(current_filename);
+ string_list_clear(list, 1);
+ strbuf_release(&buf);
+ strbuf_release(&contents);
+ 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';
+ 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);
+ if (len < 0) {
+ error(_("could not parse git header '%.*s'"),
+ orig_len, line);
+ free(util);
+ free(current_filename);
+ string_list_clear(list, 1);
+ strbuf_release(&buf);
+ strbuf_release(&contents);
+ return -1;
+ }
strbuf_addstr(&buf, " ## ");
if (patch.is_new > 0)
strbuf_addf(&buf, "%s (new)", patch.new_name);
@@ -202,9 +228,6 @@
strbuf_release(&buf);
free(current_filename);
- if (finish_command(&cp))
- return -1;
-
return 0;
}
@@ -216,11 +239,9 @@
static void find_exact_matches(struct string_list *a, struct string_list *b)
{
- struct hashmap map;
+ struct hashmap map = HASHMAP_INIT((hashmap_cmp_fn)patch_util_cmp, NULL);
int i;
- hashmap_init(&map, (hashmap_cmp_fn)patch_util_cmp, NULL, 0);
-
/* First, add the patches of a to a hash map */
for (i = 0; i < a->nr; i++) {
struct patch_util *util = a->items[i].util;
@@ -250,7 +271,7 @@
}
}
- hashmap_free(&map);
+ hashmap_clear(&map);
}
static void diffsize_consume(void *data, char *line, unsigned long len)
@@ -444,12 +465,35 @@
diff_flush(diffopt);
}
+static struct strbuf *output_prefix_cb(struct diff_options *opt, void *data)
+{
+ return data;
+}
+
static void output(struct string_list *a, struct string_list *b,
- struct diff_options *diffopt)
+ struct range_diff_options *range_diff_opts)
{
struct strbuf buf = STRBUF_INIT, dashes = STRBUF_INIT;
int patch_no_width = decimal_width(1 + (a->nr > b->nr ? a->nr : b->nr));
int i = 0, j = 0;
+ struct diff_options opts;
+ struct strbuf indent = STRBUF_INIT;
+
+ if (range_diff_opts->diffopt)
+ memcpy(&opts, range_diff_opts->diffopt, sizeof(opts));
+ else
+ diff_setup(&opts);
+
+ if (!opts.output_format)
+ opts.output_format = DIFF_FORMAT_PATCH;
+ opts.flags.suppress_diff_headers = 1;
+ opts.flags.dual_color_diffed_diffs =
+ range_diff_opts->dual_color;
+ opts.flags.suppress_hunk_header_line_count = 1;
+ opts.output_prefix = output_prefix_cb;
+ strbuf_addstr(&indent, " ");
+ opts.output_prefix_data = &indent;
+ diff_setup_done(&opts);
/*
* We assume the user is really more interested in the second argument
@@ -470,7 +514,8 @@
/* Show unmatched LHS commit whose predecessors were shown. */
if (i < a->nr && a_util->matching < 0) {
- output_pair_header(diffopt, patch_no_width,
+ if (!range_diff_opts->right_only)
+ output_pair_header(&opts, patch_no_width,
&buf, &dashes, a_util, NULL);
i++;
continue;
@@ -478,7 +523,8 @@
/* Show unmatched RHS commits. */
while (j < b->nr && b_util->matching < 0) {
- output_pair_header(diffopt, patch_no_width,
+ if (!range_diff_opts->left_only)
+ output_pair_header(&opts, patch_no_width,
&buf, &dashes, NULL, b_util);
b_util = ++j < b->nr ? b->items[j].util : NULL;
}
@@ -486,63 +532,41 @@
/* Show matching LHS/RHS pair. */
if (j < b->nr) {
a_util = a->items[b_util->matching].util;
- output_pair_header(diffopt, patch_no_width,
+ output_pair_header(&opts, patch_no_width,
&buf, &dashes, a_util, b_util);
- if (!(diffopt->output_format & DIFF_FORMAT_NO_OUTPUT))
+ if (!(opts.output_format & DIFF_FORMAT_NO_OUTPUT))
patch_diff(a->items[b_util->matching].string,
- b->items[j].string, diffopt);
+ b->items[j].string, &opts);
a_util->shown = 1;
j++;
}
}
strbuf_release(&buf);
strbuf_release(&dashes);
-}
-
-static struct strbuf *output_prefix_cb(struct diff_options *opt, void *data)
-{
- return data;
+ strbuf_release(&indent);
}
int show_range_diff(const char *range1, const char *range2,
- int creation_factor, int dual_color,
- const struct diff_options *diffopt,
- const struct argv_array *other_arg)
+ struct range_diff_options *range_diff_opts)
{
int res = 0;
struct string_list branch1 = STRING_LIST_INIT_DUP;
struct string_list branch2 = STRING_LIST_INIT_DUP;
- if (read_patches(range1, &branch1, other_arg))
+ if (range_diff_opts->left_only && range_diff_opts->right_only)
+ res = error(_("--left-only and --right-only are mutually exclusive"));
+
+ if (!res && read_patches(range1, &branch1, range_diff_opts->other_arg))
res = error(_("could not parse log for '%s'"), range1);
- if (!res && read_patches(range2, &branch2, other_arg))
+ if (!res && read_patches(range2, &branch2, range_diff_opts->other_arg))
res = error(_("could not parse log for '%s'"), range2);
if (!res) {
- struct diff_options opts;
- struct strbuf indent = STRBUF_INIT;
-
- if (diffopt)
- memcpy(&opts, diffopt, sizeof(opts));
- else
- diff_setup(&opts);
-
- if (!opts.output_format)
- opts.output_format = DIFF_FORMAT_PATCH;
- opts.flags.suppress_diff_headers = 1;
- opts.flags.dual_color_diffed_diffs = dual_color;
- opts.flags.suppress_hunk_header_line_count = 1;
- opts.output_prefix = output_prefix_cb;
- strbuf_addstr(&indent, " ");
- opts.output_prefix_data = &indent;
- diff_setup_done(&opts);
-
find_exact_matches(&branch1, &branch2);
- get_correspondences(&branch1, &branch2, creation_factor);
- output(&branch1, &branch2, &opts);
-
- strbuf_release(&indent);
+ get_correspondences(&branch1, &branch2,
+ range_diff_opts->creation_factor);
+ output(&branch1, &branch2, range_diff_opts);
}
string_list_clear(&branch1, 1);
@@ -550,3 +574,31 @@
return res;
}
+
+int is_range_diff_range(const char *arg)
+{
+ char *copy = xstrdup(arg); /* setup_revisions() modifies it */
+ const char *argv[] = { "", copy, "--", NULL };
+ int i, positive = 0, negative = 0;
+ struct rev_info revs;
+
+ init_revisions(&revs, NULL);
+ if (setup_revisions(3, argv, &revs, NULL) == 1) {
+ for (i = 0; i < revs.pending.nr; i++)
+ if (revs.pending.objects[i].item->flags & UNINTERESTING)
+ negative++;
+ else
+ positive++;
+ for (i = 0; i < revs.pending.nr; i++) {
+ struct object *obj = revs.pending.objects[i].item;
+
+ if (obj->type == OBJ_COMMIT)
+ clear_commit_marks((struct commit *)obj,
+ ALL_REV_FLAGS);
+ }
+ }
+
+ free(copy);
+ object_array_clear(&revs.pending);
+ return negative > 0 && positive > 0;
+}
diff --git a/range-diff.h b/range-diff.h
index e11976d..04ffe21 100644
--- a/range-diff.h
+++ b/range-diff.h
@@ -2,18 +2,29 @@
#define RANGE_DIFF_H
#include "diff.h"
-#include "argv-array.h"
+#include "strvec.h"
#define RANGE_DIFF_CREATION_FACTOR_DEFAULT 60
+struct range_diff_options {
+ int creation_factor;
+ unsigned dual_color:1;
+ unsigned left_only:1, right_only:1;
+ const struct diff_options *diffopt; /* may be NULL */
+ const struct strvec *other_arg; /* may be NULL */
+};
+
/*
- * 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.
+ * Compare series of commits in `range1` and `range2`, and emit to the
+ * standard output.
*/
int show_range_diff(const char *range1, const char *range2,
- int creation_factor, int dual_color,
- const struct diff_options *diffopt,
- const struct argv_array *other_arg);
+ struct range_diff_options *opts);
+
+/*
+ * Determine whether the given argument is usable as a range argument of `git
+ * range-diff`, e.g. A..B.
+ */
+int is_range_diff_range(const char *arg);
#endif
diff --git a/read-cache.c b/read-cache.c
index aa427c5..5a907af 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -89,8 +89,10 @@
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;
}
@@ -1171,20 +1173,6 @@
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.
@@ -1376,7 +1364,9 @@
static struct cache_entry *refresh_cache_ent(struct index_state *istate,
struct cache_entry *ce,
unsigned int options, int *err,
- int *changed_ret)
+ int *changed_ret,
+ int *t2_did_lstat,
+ int *t2_did_scan)
{
struct stat st;
struct cache_entry *updated;
@@ -1418,6 +1408,8 @@
return NULL;
}
+ if (t2_did_lstat)
+ *t2_did_lstat = 1;
if (lstat(ce->name, &st) < 0) {
if (ignore_missing && errno == ENOENT)
return ce;
@@ -1454,6 +1446,8 @@
}
}
+ if (t2_did_scan)
+ *t2_did_scan = 1;
if (ie_modified(istate, ce, &st, options)) {
if (err)
*err = EINVAL;
@@ -1531,6 +1525,8 @@
const char *added_fmt;
const char *unmerged_fmt;
struct progress *progress = NULL;
+ int t2_sum_lstat = 0;
+ int t2_sum_scan = 0;
if (flags & REFRESH_PROGRESS && isatty(2))
progress = start_delayed_progress(_("Refresh index"),
@@ -1548,11 +1544,14 @@
* we only have to do the special cases that are left.
*/
preload_index(istate, pathspec, 0);
+ trace2_region_enter("index", "refresh", NULL);
for (i = 0; i < istate->cache_nr; i++) {
struct cache_entry *ce, *new_entry;
int cache_errno = 0;
int changed = 0;
int filtered = 0;
+ int t2_did_lstat = 0;
+ int t2_did_scan = 0;
ce = istate->cache[i];
if (ignore_submodules && S_ISGITLINK(ce->ce_mode))
@@ -1578,7 +1577,11 @@
if (filtered)
continue;
- new_entry = refresh_cache_ent(istate, ce, options, &cache_errno, &changed);
+ new_entry = refresh_cache_ent(istate, ce, options,
+ &cache_errno, &changed,
+ &t2_did_lstat, &t2_did_scan);
+ t2_sum_lstat += t2_did_lstat;
+ t2_sum_scan += t2_did_scan;
if (new_entry == ce)
continue;
if (progress)
@@ -1614,6 +1617,9 @@
replace_index_entry(istate, i, new_entry);
}
+ trace2_data_intmax("index", NULL, "refresh/sum_lstat", t2_sum_lstat);
+ trace2_data_intmax("index", NULL, "refresh/sum_scan", t2_sum_scan);
+ trace2_region_leave("index", "refresh", NULL);
if (progress) {
display_progress(progress, istate->cache_nr);
stop_progress(&progress);
@@ -1626,7 +1632,7 @@
struct cache_entry *ce,
unsigned int options)
{
- return refresh_cache_ent(istate, ce, options, NULL, NULL);
+ return refresh_cache_ent(istate, ce, options, NULL, NULL, NULL, NULL);
}
@@ -2020,11 +2026,12 @@
{
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));
}
@@ -2084,12 +2091,13 @@
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)
nr_threads = ieot->nr;
- data = xcalloc(nr_threads, sizeof(*data));
+ CALLOC_ARRAY(data, nr_threads);
offset = ieot_start = 0;
ieot_blocks = DIV_ROUND_UP(ieot->nr, nr_threads);
@@ -2111,11 +2119,12 @@
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));
}
@@ -2190,7 +2199,7 @@
istate->version = ntohl(hdr->hdr_version);
istate->cache_nr = ntohl(hdr->hdr_entries);
istate->cache_alloc = alloc_nr(istate->cache_nr);
- istate->cache = xcalloc(istate->cache_alloc, sizeof(*istate->cache));
+ CALLOC_ARRAY(istate->cache, istate->cache_alloc);
istate->initialized = 1;
p.istate = istate;
@@ -2317,7 +2326,7 @@
if (split_index->base)
discard_index(split_index->base);
else
- split_index->base = xcalloc(1, sizeof(*split_index->base));
+ CALLOC_ARRAY(split_index->base, 1);
base_oid_hex = oid_to_hex(&split_index->base_oid);
base_path = xstrfmt("%s/sharedindex.%s", gitdir, base_oid_hex);
@@ -2364,6 +2373,7 @@
cache_tree_free(&(istate->cache_tree));
istate->initialized = 0;
istate->fsmonitor_has_run_once = 0;
+ FREE_AND_NULL(istate->fsmonitor_last_update);
FREE_AND_NULL(istate->cache);
istate->cache_alloc = 0;
discard_split_index(istate);
@@ -2372,7 +2382,7 @@
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;
@@ -2456,7 +2466,7 @@
}
}
-#define WRITE_BUFFER_SIZE 8192
+#define WRITE_BUFFER_SIZE (128 * 1024)
static unsigned char write_buffer[WRITE_BUFFER_SIZE];
static unsigned long write_buffer_len;
@@ -3023,10 +3033,10 @@
if (ce_flush(&c, newfd, istate->oid.hash))
return -1;
if (close_tempfile_gently(tempfile)) {
- error(_("could not close '%s'"), tempfile->filename.buf);
+ error(_("could not close '%s'"), get_tempfile_path(tempfile));
return -1;
}
- if (stat(tempfile->filename.buf, &st))
+ if (stat(get_tempfile_path(tempfile), &st))
return -1;
istate->timestamp.sec = (unsigned int)st.st_mtime;
istate->timestamp.nsec = ST_MTIME_NSEC(st);
@@ -3067,10 +3077,10 @@
* that is associated with the given "istate".
*/
trace2_region_enter_printf("index", "do_write_index", the_repository,
- "%s", lock->tempfile->filename.buf);
+ "%s", get_lock_file_path(lock));
ret = do_write_index(istate, lock->tempfile, 0);
trace2_region_leave_printf("index", "do_write_index", the_repository,
- "%s", lock->tempfile->filename.buf);
+ "%s", get_lock_file_path(lock));
if (ret)
return ret;
@@ -3167,10 +3177,10 @@
move_cache_to_base_index(istate);
trace2_region_enter_printf("index", "shared/do_write_index",
- the_repository, "%s", (*temp)->filename.buf);
+ the_repository, "%s", get_tempfile_path(*temp));
ret = do_write_index(si->base, *temp, 1);
trace2_region_leave_printf("index", "shared/do_write_index",
- the_repository, "%s", (*temp)->filename.buf);
+ the_repository, "%s", get_tempfile_path(*temp));
if (ret)
return ret;
@@ -3418,7 +3428,7 @@
stat_validity_clear(sv);
else {
if (!sv->sd)
- sv->sd = xcalloc(1, sizeof(struct stat_data));
+ CALLOC_ARRAY(sv->sd, 1);
fill_stat_data(sv->sd, &st);
}
}
diff --git a/ref-filter.c b/ref-filter.c
index b1812cb..f0bd32f 100644
--- a/ref-filter.c
+++ b/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;
@@ -67,6 +67,12 @@
int lstrip, rstrip;
};
+static struct ref_trailer_buf {
+ struct string_list filter_list;
+ struct strbuf sepbuf;
+ struct strbuf kvsepbuf;
+} ref_trailer_buf = {STRING_LIST_INIT_NODUP, STRBUF_INIT, STRBUF_INIT};
+
static struct expand_data {
struct object_id oid;
enum object_type type;
@@ -127,7 +133,8 @@
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;
@@ -138,7 +145,10 @@
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;
@@ -297,37 +307,38 @@
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;
}
static int trailers_atom_parser(const struct ref_format *format, struct used_atom *atom,
const char *arg, struct strbuf *err)
{
- struct string_list params = STRING_LIST_INIT_DUP;
- int i;
-
atom->u.contents.trailer_opts.no_divider = 1;
if (arg) {
- string_list_split(¶ms, arg, ',', -1);
- for (i = 0; i < params.nr; i++) {
- const char *s = params.items[i].string;
- if (!strcmp(s, "unfold"))
- atom->u.contents.trailer_opts.unfold = 1;
- else if (!strcmp(s, "only"))
- atom->u.contents.trailer_opts.only_trailers = 1;
- else {
- strbuf_addf(err, _("unknown %%(trailers) argument: %s"), s);
- string_list_clear(¶ms, 0);
- return -1;
- }
+ const char *argbuf = xstrfmt("%s)", arg);
+ char *invalid_arg = NULL;
+
+ if (format_set_trailers_options(&atom->u.contents.trailer_opts,
+ &ref_trailer_buf.filter_list,
+ &ref_trailer_buf.sepbuf,
+ &ref_trailer_buf.kvsepbuf,
+ &argbuf, &invalid_arg)) {
+ if (!invalid_arg)
+ strbuf_addf(err, _("expected %%(trailers:key=<value>)"));
+ else
+ strbuf_addf(err, _("unknown %%(trailers) argument: %s"), invalid_arg);
+ free((char *)invalid_arg);
+ return -1;
}
}
atom->u.contents.option = C_TRAILERS;
- string_list_clear(¶ms, 0);
return 0;
}
@@ -338,13 +349,17 @@
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;
@@ -355,22 +370,36 @@
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;
}
@@ -475,25 +504,25 @@
{ "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 },
@@ -743,7 +772,8 @@
struct strbuf *unused_err)
{
struct ref_formatting_stack *new_stack;
- struct if_then_else *if_then_else = xcalloc(sizeof(struct if_then_else), 1);
+ struct if_then_else *if_then_else = xcalloc(1,
+ sizeof(struct if_then_else));
if_then_else->str = atomv->atom->u.if_then_else.str;
if_then_else->cmp_status = atomv->atom->u.if_then_else.cmp_status;
@@ -898,21 +928,27 @@
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;
}
@@ -940,7 +976,7 @@
} 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]);
}
}
@@ -979,21 +1015,20 @@
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);
}
@@ -1034,28 +1069,52 @@
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 xstrdup("");
- eoemail = strchr(email, '>');
+ 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 xstrdup("");
- return xmemdupz(email, eoemail + 1 - email);
+ return xmemdupz(email, eoemail - email);
}
static char *copy_subject(const char *buf, unsigned long len)
{
- char *r = xmemdupz(buf, len);
+ struct strbuf sb = STRBUF_INIT;
int i;
- for (i = 0; i < len; i++)
- if (r[i] == '\n')
- r[i] = ' ';
+ for (i = 0; i < len; i++) {
+ if (buf[i] == '\r' && i + 1 < len && buf[i + 1] == '\n')
+ continue; /* ignore CR in CRLF */
- return r;
+ if (buf[i] == '\n')
+ strbuf_addch(&sb, ' ');
+ else
+ strbuf_addch(&sb, buf[i]);
+ }
+ return strbuf_detach(&sb, NULL);
}
static void grab_date(const char *buf, struct atom_value *v, const char *atomname)
@@ -1113,7 +1172,7 @@
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)
@@ -1124,8 +1183,8 @@
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);
}
@@ -1156,12 +1215,20 @@
}
static void find_subpos(const char *buf,
- const char **sub, unsigned long *sublen,
- const char **body, unsigned long *bodylen,
- unsigned long *nonsiglen,
- const char **sig, unsigned long *siglen)
+ const char **sub, size_t *sublen,
+ const char **body, size_t *bodylen,
+ size_t *nonsiglen,
+ const char **sig, size_t *siglen)
{
+ struct strbuf payload = STRBUF_INIT;
+ struct strbuf signature = STRBUF_INIT;
const char *eol;
+ const char *end = buf + strlen(buf);
+ const char *sigstart;
+
+ /* parse signature first; we might not even have a subject line */
+ parse_signature(buf, end - buf, &payload, &signature);
+
/* skip past header until we hit empty line */
while (*buf && *buf != '\n') {
eol = strchrnul(buf, '\n');
@@ -1172,31 +1239,32 @@
/* skip any empty lines */
while (*buf == '\n')
buf++;
-
- /* parse signature first; we might not even have a subject line */
- *sig = buf + parse_signature(buf, strlen(buf));
- *siglen = strlen(*sig);
+ *sig = strbuf_detach(&signature, siglen);
+ sigstart = buf + parse_signed_buffer(buf, strlen(buf));
/* subject is first non-empty line */
*sub = buf;
- /* subject goes to first empty line */
- while (buf < *sig && *buf && *buf != '\n') {
- eol = strchrnul(buf, '\n');
- if (*eol)
- eol++;
- buf = eol;
+ /* subject goes to first empty line before signature begins */
+ if ((eol = strstr(*sub, "\n\n"))) {
+ eol = eol < sigstart ? eol : sigstart;
+ /* check if message uses CRLF */
+ } else if (! (eol = strstr(*sub, "\r\n\r\n"))) {
+ /* treat whole message as subject */
+ eol = strrchr(*sub, '\0');
}
+ buf = eol;
*sublen = buf - *sub;
/* drop trailing newline, if present */
- if (*sublen && (*sub)[*sublen - 1] == '\n')
+ while (*sublen && ((*sub)[*sublen - 1] == '\n' ||
+ (*sub)[*sublen - 1] == '\r'))
*sublen -= 1;
/* skip any empty lines */
- while (*buf == '\n')
+ while (*buf == '\n' || *buf == '\r')
buf++;
*body = buf;
*bodylen = strlen(buf);
- *nonsiglen = *sig - buf;
+ *nonsiglen = sigstart - buf;
}
/*
@@ -1228,18 +1296,19 @@
{
int i;
const char *subpos = NULL, *bodypos = NULL, *sigpos = NULL;
- unsigned long sublen = 0, bodylen = 0, nonsiglen = 0, siglen = 0;
+ size_t sublen = 0, bodylen = 0, nonsiglen = 0, siglen = 0;
for (i = 0; i < used_atom_cnt; i++) {
struct used_atom *atom = &used_atom[i];
const char *name = atom->name;
struct atom_value *v = &val[i];
+
if (!!deref != (*name == '*'))
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;
@@ -1251,15 +1320,21 @@
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)
v->s = xmemdupz(sigpos, siglen);
else if (atom->u.contents.option == C_LINES) {
struct strbuf s = STRBUF_INIT;
- const char *contents_end = bodylen + bodypos - siglen;
+ const char *contents_end = bodypos + nonsiglen;
/* Size is the length of the message after removing the signature */
append_lines(&s, subpos, contents_end - subpos, atom->u.contents.nlines);
@@ -1273,7 +1348,9 @@
v->s = strbuf_detach(&s, NULL);
} else if (atom->u.contents.option == C_BARE)
v->s = xstrdup(subpos);
+
}
+ free((void *)sigpos);
}
/*
@@ -1473,38 +1550,27 @@
struct wt_status_state state;
memset(&state, 0, sizeof(state));
wt_status_get_state(the_repository, &state, 1);
-
- /*
- * The ( character must be hard-coded and not part of a localizable
- * string, since the description is used as a sort key and compared
- * with ref names.
- */
- strbuf_addch(&desc, '(');
if (state.rebase_in_progress ||
state.rebase_interactive_in_progress) {
if (state.branch)
- strbuf_addf(&desc, _("no branch, rebasing %s"),
+ strbuf_addf(&desc, _("(no branch, rebasing %s)"),
state.branch);
else
- strbuf_addf(&desc, _("no branch, rebasing detached HEAD %s"),
+ strbuf_addf(&desc, _("(no branch, rebasing detached HEAD %s)"),
state.detached_from);
} else if (state.bisect_in_progress)
- strbuf_addf(&desc, _("no branch, bisect started on %s"),
+ strbuf_addf(&desc, _("(no branch, bisect started on %s)"),
state.branch);
else if (state.detached_from) {
if (state.detached_at)
- strbuf_addstr(&desc, HEAD_DETACHED_AT);
+ strbuf_addf(&desc, _("(HEAD detached at %s)"),
+ state.detached_from);
else
- strbuf_addstr(&desc, HEAD_DETACHED_FROM);
- strbuf_addstr(&desc, state.detached_from);
- }
- else
- strbuf_addstr(&desc, _("no branch"));
- strbuf_addch(&desc, ')');
+ strbuf_addf(&desc, _("(HEAD detached from %s)"),
+ state.detached_from);
+ } else
+ strbuf_addstr(&desc, _("(no branch)"));
- free(state.branch);
- free(state.onto);
- free(state.detached_from);
return strbuf_detach(&desc, NULL);
}
@@ -1579,7 +1645,7 @@
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);
}
@@ -1611,7 +1677,7 @@
int i;
struct object_info empty = OBJECT_INFO_INIT;
- ref->value = xcalloc(used_atom_cnt, sizeof(struct atom_value));
+ CALLOC_ARRAY(ref->value, used_atom_cnt);
if (need_symref && (ref->flag & REF_ISSYMREF) && !ref->symref) {
ref->symref = resolve_refdup(ref->refname, RESOLVE_REF_READING,
@@ -1699,7 +1765,7 @@
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))
@@ -1868,64 +1934,6 @@
return match_pattern(filter, refname);
}
-static int qsort_strcmp(const void *va, const void *vb)
-{
- const char *a = *(const char **)va;
- const char *b = *(const char **)vb;
-
- return strcmp(a, b);
-}
-
-static void find_longest_prefixes_1(struct string_list *out,
- struct strbuf *prefix,
- const char **patterns, size_t nr)
-{
- size_t i;
-
- for (i = 0; i < nr; i++) {
- char c = patterns[i][prefix->len];
- if (!c || is_glob_special(c)) {
- string_list_append(out, prefix->buf);
- return;
- }
- }
-
- i = 0;
- while (i < nr) {
- size_t end;
-
- /*
- * Set "end" to the index of the element _after_ the last one
- * in our group.
- */
- for (end = i + 1; end < nr; end++) {
- if (patterns[i][prefix->len] != patterns[end][prefix->len])
- break;
- }
-
- strbuf_addch(prefix, patterns[i][prefix->len]);
- find_longest_prefixes_1(out, prefix, patterns + i, end - i);
- strbuf_setlen(prefix, prefix->len - 1);
-
- i = end;
- }
-}
-
-static void find_longest_prefixes(struct string_list *out,
- const char **patterns)
-{
- struct argv_array sorted = ARGV_ARRAY_INIT;
- struct strbuf prefix = STRBUF_INIT;
-
- argv_array_pushv(&sorted, patterns);
- QSORT(sorted.argv, sorted.argc, qsort_strcmp);
-
- find_longest_prefixes_1(out, &prefix, sorted.argv, sorted.argc);
-
- argv_array_clear(&sorted);
- strbuf_release(&prefix);
-}
-
/*
* This is the same as for_each_fullref_in(), but it tries to iterate
* only over the patterns we'll care about. Note that it _doesn't_ do a full
@@ -1936,10 +1944,6 @@
void *cb_data,
int broken)
{
- struct string_list prefixes = STRING_LIST_INIT_DUP;
- struct string_list_item *prefix;
- int ret;
-
if (!filter->match_as_path) {
/*
* in this case, the patterns are applied after
@@ -1963,25 +1967,16 @@
return for_each_fullref_in("", cb, cb_data, broken);
}
- find_longest_prefixes(&prefixes, filter->name_patterns);
-
- for_each_string_list_item(prefix, &prefixes) {
- ret = for_each_fullref_in(prefix->string, cb, cb_data, broken);
- if (ret)
- break;
- }
-
- string_list_clear(&prefixes, 0);
- return ret;
+ return for_each_fullref_in_prefixes(NULL, filter->name_patterns,
+ cb, cb_data, broken);
}
/*
- * 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
@@ -2113,9 +2108,9 @@
* 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... */
@@ -2170,20 +2165,28 @@
used_atom_cnt = 0;
if (ref_to_worktree_map.worktrees) {
- hashmap_free_entries(&(ref_to_worktree_map.map),
+ hashmap_clear_and_free(&(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;
+
+ CALLOC_ARRAY(to_clear, array->nr);
repo_init_revisions(the_repository, &revs, NULL);
@@ -2193,8 +2196,11 @@
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))
@@ -2209,14 +2215,19 @@
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);
}
@@ -2268,18 +2279,30 @@
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;
}
+static int compare_detached_head(struct ref_array_item *a, struct ref_array_item *b)
+{
+ if (!(a->kind ^ b->kind))
+ BUG("ref_kind_from_refname() should only mark one ref as HEAD");
+ if (a->kind & FILTER_REFS_DETACHED_HEAD)
+ return -1;
+ else if (b->kind & FILTER_REFS_DETACHED_HEAD)
+ return 1;
+ BUG("should have died in the xor check above");
+ return 0;
+}
+
static int cmp_ref_sorting(struct ref_sorting *s, struct ref_array_item *a, struct ref_array_item *b)
{
struct atom_value *va, *vb;
int cmp;
+ int cmp_detached_head = 0;
cmp_type cmp_type = used_atom[s->atom].type;
- int (*cmp_fn)(const char *, const char *);
struct strbuf err = STRBUF_INIT;
if (get_ref_atom_value(a, s->atom, &va, &err))
@@ -2287,21 +2310,28 @@
if (get_ref_atom_value(b, s->atom, &vb, &err))
die("%s", err.buf);
strbuf_release(&err);
- cmp_fn = s->ignore_case ? strcasecmp : strcmp;
- if (s->version)
+ if (s->sort_flags & REF_SORTING_DETACHED_HEAD_FIRST &&
+ ((a->kind | b->kind) & FILTER_REFS_DETACHED_HEAD)) {
+ cmp = compare_detached_head(a, b);
+ cmp_detached_head = 1;
+ } else if (s->sort_flags & REF_SORTING_VERSION) {
cmp = versioncmp(va->s, vb->s);
- else if (cmp_type == FIELD_STR)
+ } else if (cmp_type == FIELD_STR) {
+ int (*cmp_fn)(const char *, const char *);
+ cmp_fn = s->sort_flags & REF_SORTING_ICASE
+ ? strcasecmp : strcmp;
cmp = cmp_fn(va->s, vb->s);
- else {
+ } else {
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;
}
- return (s->reverse) ? -cmp : cmp;
+ return (s->sort_flags & REF_SORTING_REVERSE && !cmp_detached_head)
+ ? -cmp : cmp;
}
static int compare_refs(const void *a_, const void *b_, void *ref_sorting)
@@ -2315,7 +2345,21 @@
if (cmp)
return cmp;
}
- return 0;
+ s = ref_sorting;
+ return s && s->sort_flags & REF_SORTING_ICASE ?
+ strcasecmp(a->refname, b->refname) :
+ strcmp(a->refname, b->refname);
+}
+
+void ref_sorting_set_sort_flags_all(struct ref_sorting *sorting,
+ unsigned int mask, int on)
+{
+ for (; sorting; sorting = sorting->next) {
+ if (on)
+ sorting->sort_flags |= mask;
+ else
+ sorting->sort_flags &= ~mask;
+ }
}
void ref_array_sort(struct ref_sorting *sorting, struct ref_array *array)
@@ -2447,17 +2491,17 @@
{
struct ref_sorting *s;
- s = xcalloc(1, sizeof(*s));
+ CALLOC_ARRAY(s, 1);
s->next = *sorting_tail;
*sorting_tail = s;
if (*arg == '-') {
- s->reverse = 1;
+ s->sort_flags |= REF_SORTING_REVERSE;
arg++;
}
if (skip_prefix(arg, "version:", &arg) ||
skip_prefix(arg, "v:", &arg))
- s->version = 1;
+ s->sort_flags |= REF_SORTING_VERSION;
s->atom = parse_sorting_atom(arg);
}
@@ -2478,31 +2522,22 @@
{
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/ref-filter.h b/ref-filter.h
index f1dcff4..19ea4c4 100644
--- a/ref-filter.h
+++ b/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"
@@ -28,9 +28,12 @@
struct ref_sorting {
struct ref_sorting *next;
int atom; /* index into used_atom array (internal) */
- unsigned reverse : 1,
- ignore_case : 1,
- version : 1;
+ enum {
+ REF_SORTING_REVERSE = 1<<0,
+ REF_SORTING_ICASE = 1<<1,
+ REF_SORTING_VERSION = 1<<2,
+ REF_SORTING_DETACHED_HEAD_FIRST = 1<<3,
+ } sort_flags;
};
struct ref_array_item {
@@ -54,13 +57,8 @@
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 +112,8 @@
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 REF_SORTING_* sort_flags for all elements of a sorting list */
+void ref_sorting_set_sort_flags_all(struct ref_sorting *sorting, unsigned int mask, int on);
/* 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/reflog-walk.c b/reflog-walk.c
index 3a25b27..e9cd328 100644
--- a/reflog-walk.c
+++ b/reflog-walk.c
@@ -112,7 +112,7 @@
void init_reflog_walk(struct reflog_walk_info **info)
{
- *info = xcalloc(1, sizeof(struct reflog_walk_info));
+ CALLOC_ARRAY(*info, 1);
(*info)->complete_reflogs.strdup_strings = 1;
}
@@ -181,7 +181,7 @@
}
free(branch);
- commit_reflog = xcalloc(1, sizeof(struct commit_reflog));
+ CALLOC_ARRAY(commit_reflog, 1);
if (recno < 0) {
commit_reflog->recno = get_reflog_recno_by_time(reflogs, timestamp);
if (commit_reflog->recno < 0) {
diff --git a/refs.c b/refs.c
index 1ab0bb5..261fd82 100644
--- a/refs.c
+++ b/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 @@
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 @@
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 @@
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,62 @@
* 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);
+}
+
+static const char default_branch_name_advice[] = N_(
+"Using '%s' as the name for the initial branch. This default branch name\n"
+"is subject to change. To configure the initial branch name to use in all\n"
+"of your new repositories, which will suppress this warning, call:\n"
+"\n"
+"\tgit config --global init.defaultBranch <name>\n"
+"\n"
+"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
+"'development'. The just-created branch can be renamed via this command:\n"
+"\n"
+"\tgit branch -m <name>\n"
+);
+
+char *repo_default_branch_name(struct repository *r, int quiet)
+{
+ const char *config_key = "init.defaultbranch";
+ const char *config_display_key = "init.defaultBranch";
+ char *ret = NULL, *full_ref;
+ const char *env = getenv("GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME");
+
+ if (env && *env)
+ ret = xstrdup(env);
+ else if (repo_config_get_string(r, config_key, &ret) < 0)
+ die(_("could not retrieve `%s`"), config_display_key);
+
+ if (!ret) {
+ ret = xstrdup("master");
+ if (!quiet)
+ advise(_(default_branch_name_advice), ret);
+ }
+
+ 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(int quiet)
+{
+ static char *ret;
+
+ if (!ret)
+ ret = repo_default_branch_name(the_repository, quiet);
+
+ return ret;
}
/*
@@ -610,10 +617,14 @@
* 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 +637,15 @@
}
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 +684,7 @@
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 +727,9 @@
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 +789,6 @@
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 +797,6 @@
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 +819,11 @@
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 +835,15 @@
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) {
@@ -969,59 +882,9 @@
int *cutoff_cnt;
};
-static int read_ref_at_ent(struct object_id *ooid, struct object_id *noid,
- const char *email, timestamp_t timestamp, int tz,
- const char *message, void *cb_data)
+static void set_read_ref_cutoffs(struct read_ref_at_cb *cb,
+ timestamp_t timestamp, int tz, const char *message)
{
- struct read_ref_at_cb *cb = cb_data;
-
- cb->reccnt++;
- cb->tz = tz;
- cb->date = timestamp;
-
- if (timestamp <= cb->at_time || cb->cnt == 0) {
- if (cb->msg)
- *cb->msg = xstrdup(message);
- if (cb->cutoff_time)
- *cb->cutoff_time = timestamp;
- if (cb->cutoff_tz)
- *cb->cutoff_tz = tz;
- if (cb->cutoff_cnt)
- *cb->cutoff_cnt = cb->reccnt - 1;
- /*
- * we have not yet updated cb->[n|o]oid so they still
- * hold the values for the previous record.
- */
- if (!is_null_oid(&cb->ooid)) {
- oidcpy(cb->oid, noid);
- if (!oideq(&cb->ooid, noid))
- warning(_("log for ref %s has gap after %s"),
- cb->refname, show_date(cb->date, cb->tz, DATE_MODE(RFC2822)));
- }
- else if (cb->date == cb->at_time)
- oidcpy(cb->oid, noid);
- else if (!oideq(noid, cb->oid))
- warning(_("log for ref %s unexpectedly ended on %s"),
- cb->refname, show_date(cb->date, cb->tz,
- DATE_MODE(RFC2822)));
- oidcpy(&cb->ooid, ooid);
- oidcpy(&cb->noid, noid);
- cb->found_it = 1;
- return 1;
- }
- oidcpy(&cb->ooid, ooid);
- oidcpy(&cb->noid, noid);
- if (cb->cnt > 0)
- cb->cnt--;
- return 0;
-}
-
-static int read_ref_at_ent_oldest(struct object_id *ooid, struct object_id *noid,
- const char *email, timestamp_t timestamp,
- int tz, const char *message, void *cb_data)
-{
- struct read_ref_at_cb *cb = cb_data;
-
if (cb->msg)
*cb->msg = xstrdup(message);
if (cb->cutoff_time)
@@ -1030,6 +893,69 @@
*cb->cutoff_tz = tz;
if (cb->cutoff_cnt)
*cb->cutoff_cnt = cb->reccnt;
+}
+
+static int read_ref_at_ent(struct object_id *ooid, struct object_id *noid,
+ const char *email, timestamp_t timestamp, int tz,
+ const char *message, void *cb_data)
+{
+ struct read_ref_at_cb *cb = cb_data;
+ int reached_count;
+
+ cb->tz = tz;
+ cb->date = timestamp;
+
+ /*
+ * It is not possible for cb->cnt == 0 on the first iteration because
+ * that special case is handled in read_ref_at().
+ */
+ if (cb->cnt > 0)
+ cb->cnt--;
+ reached_count = cb->cnt == 0 && !is_null_oid(ooid);
+ if (timestamp <= cb->at_time || reached_count) {
+ set_read_ref_cutoffs(cb, timestamp, tz, message);
+ /*
+ * we have not yet updated cb->[n|o]oid so they still
+ * hold the values for the previous record.
+ */
+ if (!is_null_oid(&cb->ooid) && !oideq(&cb->ooid, noid))
+ warning(_("log for ref %s has gap after %s"),
+ cb->refname, show_date(cb->date, cb->tz, DATE_MODE(RFC2822)));
+ if (reached_count)
+ oidcpy(cb->oid, ooid);
+ else if (!is_null_oid(&cb->ooid) || cb->date == cb->at_time)
+ oidcpy(cb->oid, noid);
+ else if (!oideq(noid, cb->oid))
+ warning(_("log for ref %s unexpectedly ended on %s"),
+ cb->refname, show_date(cb->date, cb->tz,
+ DATE_MODE(RFC2822)));
+ cb->found_it = 1;
+ }
+ cb->reccnt++;
+ oidcpy(&cb->ooid, ooid);
+ oidcpy(&cb->noid, noid);
+ return cb->found_it;
+}
+
+static int read_ref_at_ent_newest(struct object_id *ooid, struct object_id *noid,
+ const char *email, timestamp_t timestamp,
+ int tz, const char *message, void *cb_data)
+{
+ struct read_ref_at_cb *cb = cb_data;
+
+ set_read_ref_cutoffs(cb, timestamp, tz, message);
+ oidcpy(cb->oid, noid);
+ /* We just want the first entry */
+ return 1;
+}
+
+static int read_ref_at_ent_oldest(struct object_id *ooid, struct object_id *noid,
+ const char *email, timestamp_t timestamp,
+ int tz, const char *message, void *cb_data)
+{
+ struct read_ref_at_cb *cb = cb_data;
+
+ set_read_ref_cutoffs(cb, timestamp, tz, message);
oidcpy(cb->oid, ooid);
if (is_null_oid(cb->oid))
oidcpy(cb->oid, noid);
@@ -1054,6 +980,11 @@
cb.cutoff_cnt = cutoff_cnt;
cb.oid = oid;
+ if (cb.cnt == 0) {
+ refs_for_each_reflog_ent_reverse(refs, refname, read_ref_at_ent_newest, &cb);
+ return 0;
+ }
+
refs_for_each_reflog_ent_reverse(refs, refname, read_ref_at_ent, &cb);
if (!cb.reccnt) {
@@ -1076,7 +1007,7 @@
struct ref_transaction *tr;
assert(err);
- tr = xcalloc(1, sizeof(struct ref_transaction));
+ CALLOC_ARRAY(tr, 1);
tr->ref_store = refs;
return tr;
}
@@ -1136,7 +1067,7 @@
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 +1145,13 @@
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");
@@ -1380,7 +1306,7 @@
while (len && ref[len - 1] == '/')
ref[--len] = '\0';
if (!hide_refs) {
- hide_refs = xcalloc(1, sizeof(*hide_refs));
+ CALLOC_ARRAY(hide_refs, 1);
hide_refs->strdup_strings = 1;
}
string_list_append(hide_refs, ref);
@@ -1638,11 +1564,124 @@
return refs_for_each_rawref(get_main_ref_store(the_repository), fn, cb_data);
}
+static int qsort_strcmp(const void *va, const void *vb)
+{
+ const char *a = *(const char **)va;
+ const char *b = *(const char **)vb;
+
+ return strcmp(a, b);
+}
+
+static void find_longest_prefixes_1(struct string_list *out,
+ struct strbuf *prefix,
+ const char **patterns, size_t nr)
+{
+ size_t i;
+
+ for (i = 0; i < nr; i++) {
+ char c = patterns[i][prefix->len];
+ if (!c || is_glob_special(c)) {
+ string_list_append(out, prefix->buf);
+ return;
+ }
+ }
+
+ i = 0;
+ while (i < nr) {
+ size_t end;
+
+ /*
+ * Set "end" to the index of the element _after_ the last one
+ * in our group.
+ */
+ for (end = i + 1; end < nr; end++) {
+ if (patterns[i][prefix->len] != patterns[end][prefix->len])
+ break;
+ }
+
+ strbuf_addch(prefix, patterns[i][prefix->len]);
+ find_longest_prefixes_1(out, prefix, patterns + i, end - i);
+ strbuf_setlen(prefix, prefix->len - 1);
+
+ i = end;
+ }
+}
+
+static void find_longest_prefixes(struct string_list *out,
+ const char **patterns)
+{
+ struct strvec sorted = STRVEC_INIT;
+ struct strbuf prefix = STRBUF_INIT;
+
+ strvec_pushv(&sorted, patterns);
+ QSORT(sorted.v, sorted.nr, qsort_strcmp);
+
+ find_longest_prefixes_1(out, &prefix, sorted.v, sorted.nr);
+
+ strvec_clear(&sorted);
+ strbuf_release(&prefix);
+}
+
+int for_each_fullref_in_prefixes(const char *namespace,
+ const char **patterns,
+ each_ref_fn fn, void *cb_data,
+ unsigned int broken)
+{
+ struct string_list prefixes = STRING_LIST_INIT_DUP;
+ struct string_list_item *prefix;
+ struct strbuf buf = STRBUF_INIT;
+ int ret = 0, namespace_len;
+
+ find_longest_prefixes(&prefixes, patterns);
+
+ if (namespace)
+ strbuf_addstr(&buf, namespace);
+ namespace_len = buf.len;
+
+ for_each_string_list_item(prefix, &prefixes) {
+ strbuf_addstr(&buf, prefix->string);
+ ret = for_each_fullref_in(buf.buf, fn, cb_data, broken);
+ if (ret)
+ break;
+ strbuf_setlen(&buf, namespace_len);
+ }
+
+ string_list_clear(&prefixes, 0);
+ strbuf_release(&buf);
+ return ret;
+}
+
+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 */
@@ -1852,14 +1891,15 @@
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;
}
/*
@@ -1963,31 +2003,14 @@
return refs->be->pack_refs(refs, flags);
}
-int refs_peel_ref(struct ref_store *refs, const char *refname,
- struct object_id *oid)
+int peel_iterated_oid(const struct object_id *base, struct object_id *peeled)
{
- int flag;
- struct object_id base;
+ if (current_ref_iter &&
+ (current_ref_iter->oid == base ||
+ oideq(current_ref_iter->oid, base)))
+ return ref_iterator_peel(current_ref_iter, peeled);
- if (current_ref_iter && current_ref_iter->refname == refname) {
- struct object_id peeled;
-
- if (ref_iterator_peel(current_ref_iter, &peeled))
- return -1;
- oidcpy(oid, &peeled);
- return 0;
- }
-
- if (refs_read_ref_full(refs, refname,
- RESOLVE_REF_READING, &base, &flag))
- return -1;
-
- return peel_object(&base, oid);
-}
-
-int peel_ref(const char *refname, struct object_id *oid)
-{
- return refs_peel_ref(get_main_ref_store(the_repository), refname, oid);
+ return peel_object(base, peeled);
}
int refs_create_symref(struct ref_store *refs,
@@ -1995,9 +2018,14 @@
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,
@@ -2030,10 +2058,58 @@
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:
@@ -2056,7 +2132,17 @@
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,
@@ -2080,6 +2166,8 @@
break;
}
+ run_transaction_hook(transaction, "aborted");
+
ref_transaction_free(transaction);
return ret;
}
@@ -2108,7 +2196,10 @@
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,
@@ -2312,10 +2403,16 @@
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,
@@ -2327,7 +2424,13 @@
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)
@@ -2338,7 +2441,13 @@
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/refs.h b/refs.h
index 545029c..48970df 100644
--- a/refs.h
+++ b/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 @@
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);
@@ -114,16 +118,16 @@
int refs_init_db(struct strbuf *err);
/*
- * If refname is a non-symbolic reference that refers to a tag object,
- * and the tag can be (recursively) dereferenced to a non-tag object,
- * store the object ID of the referred-to object to oid and return 0.
- * If any of these conditions are not met, return a non-zero value.
- * Symbolic references are considered unpeelable, even if they
- * ultimately resolve to a peelable tag.
+ * Return the peeled value of the oid currently being iterated via
+ * for_each_ref(), etc. This is equivalent to calling:
+ *
+ * peel_object(oid, &peeled);
+ *
+ * with the "oid" value given to the each_ref_fn callback, except
+ * that some ref storage may be able to answer the query without
+ * actually loading the object in memory.
*/
-int refs_peel_ref(struct ref_store *refs, const char *refname,
- struct object_id *oid);
-int peel_ref(const char *refname, struct object_id *oid);
+int peel_iterated_oid(const struct object_id *base, struct object_id *peeled);
/**
* Resolve refname in the nested "gitlink" repository in the specified
@@ -145,16 +149,31 @@
* 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(int quiet);
+char *repo_default_branch_name(struct repository *r, int quiet);
+
+/*
* A ref_transaction represents a collection of reference updates that
* should succeed or fail together.
*
@@ -329,6 +348,15 @@
unsigned int broken);
/**
+ * iterate all refs in "patterns" by partitioning patterns into disjoint sets
+ * and iterating the longest-common prefix of each set.
+ *
+ * callers should be prepared to ignore references that they did not ask for.
+ */
+int for_each_fullref_in_prefixes(const char *namespace, const char **patterns,
+ 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);
@@ -361,18 +389,6 @@
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, "?*[");
@@ -444,19 +460,35 @@
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);
/*
diff --git a/refs/debug.c b/refs/debug.c
new file mode 100644
index 0000000..922e64f
--- /dev/null
+++ b/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/refs/files-backend.c b/refs/files-backend.c
index 561c33a..119972e 100644
--- a/refs/files-backend.c
+++ b/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 ref_store base;
unsigned int store_flags;
- char *gitdir;
char *gitcommondir;
struct ref_cache *loose;
@@ -94,18 +86,17 @@
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 @@
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 @@
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 @@
struct strbuf sb_path = STRBUF_INIT;
const char *path;
const char *buf;
- const char *p;
struct stat st;
int fd;
int ret = -1;
@@ -465,29 +455,8 @@
close(fd);
strbuf_rtrim(&sb_contents);
buf = sb_contents.buf;
- if (skip_prefix(buf, "ref:", &buf)) {
- while (isspace(*buf))
- buf++;
- strbuf_reset(referent);
- strbuf_addstr(referent, buf);
- *type |= REF_ISSYMREF;
- ret = 0;
- goto out;
- }
-
- /*
- * Please note that 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;
- }
-
- ret = 0;
+ ret = parse_loose_ref_contents(buf, oid, referent, type);
out:
save_errno = errno;
@@ -497,6 +466,32 @@
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;
+ return 0;
+ }
+
+ /*
+ * FETCH_HEAD has additional data after the sha.
+ */
+ if (parse_oid_hex(buf, oid, &p) ||
+ (*p != '\0' && !isspace(*p))) {
+ *type |= REF_ISBROKEN;
+ errno = EINVAL;
+ return -1;
+ }
+ return 0;
+}
+
static void unlock_ref(struct ref_lock *lock)
{
rollback_lock_file(&lock->lk);
@@ -554,7 +549,7 @@
/* First lock the file so it can't change out from under us. */
- *lock_p = lock = xcalloc(1, sizeof(*lock));
+ *lock_p = CALLOC_ARRAY(lock, 1);
lock->ref_name = xstrdup(refname);
files_ref_path(refs, &ref_file, refname);
@@ -848,7 +843,7 @@
overlay_iter = overlay_ref_iterator_begin(loose_iter, packed_iter);
- iter = xcalloc(1, sizeof(*iter));
+ CALLOC_ARRAY(iter, 1);
ref_iterator = &iter->base;
base_ref_iterator_init(ref_iterator, &files_ref_iterator_vtable,
overlay_iter->ordered);
@@ -935,7 +930,7 @@
files_assert_main_repository(refs, "lock_ref_oid_basic");
assert(err);
- lock = xcalloc(1, sizeof(struct ref_lock));
+ CALLOC_ARRAY(lock, 1);
if (mustexist)
resolve_flags |= RESOLVE_REF_READING;
@@ -1628,8 +1623,10 @@
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;
@@ -1827,12 +1824,12 @@
if (!fdopen_lock_file(&lock->lk, "w"))
return error("unable to fdopen %s: %s",
- lock->lk.tempfile->filename.buf, strerror(errno));
+ get_lock_file_path(&lock->lk), strerror(errno));
update_symref_reflog(refs, lock, refname, target, logmsg);
/* no error check; commit_ref will check ferror */
- fprintf(lock->lk.tempfile->fp, "ref: %s\n", target);
+ fprintf(get_lock_file_fp(&lock->lk), "ref: %s\n", target);
if (commit_ref(lock) < 0)
return error("unable to write symref for %s: %s", refname,
strerror(errno));
@@ -2155,7 +2152,7 @@
return empty_ref_iterator_begin();
}
- iter = xcalloc(1, sizeof(*iter));
+ CALLOC_ARRAY(iter, 1);
ref_iterator = &iter->base;
base_ref_iterator_init(ref_iterator, &files_reflog_iterator_vtable, 0);
@@ -2197,12 +2194,11 @@
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);
}
@@ -2565,17 +2561,19 @@
}
}
- 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);
+
+ free(backend_data);
}
- if (backend_data->packed_refs_locked)
- packed_refs_unlock(refs->packed_ref_store);
-
- free(backend_data);
-
transaction->state = REF_TRANSACTION_CLOSED;
}
@@ -2599,7 +2597,7 @@
if (!transaction->nr)
goto cleanup;
- backend_data = xcalloc(1, sizeof(*backend_data));
+ CALLOC_ARRAY(backend_data, 1);
transaction->backend_data = backend_data;
/*
diff --git a/refs/iterator.c b/refs/iterator.c
index 629e00a..a89d132 100644
--- a/refs/iterator.c
+++ b/refs/iterator.c
@@ -393,7 +393,7 @@
if (!*prefix && !trim)
return iter0; /* optimization: no need to wrap iterator */
- iter = xcalloc(1, sizeof(*iter));
+ CALLOC_ARRAY(iter, 1);
ref_iterator = &iter->base;
base_ref_iterator_init(ref_iterator, &prefix_ref_iterator_vtable, iter0->ordered);
diff --git a/refs/packed-backend.c b/refs/packed-backend.c
index 4458a0f..dfecdbc 100644
--- a/refs/packed-backend.c
+++ b/refs/packed-backend.c
@@ -200,6 +200,7 @@
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);
@@ -940,7 +941,7 @@
if (start == snapshot->eof)
return empty_ref_iterator_begin();
- iter = xcalloc(1, sizeof(*iter));
+ CALLOC_ARRAY(iter, 1);
ref_iterator = &iter->base;
base_ref_iterator_init(ref_iterator, &packed_ref_iterator_vtable, 1);
@@ -1423,7 +1424,7 @@
* do so itself.
*/
- data = xcalloc(1, sizeof(*data));
+ CALLOC_ARRAY(data, 1);
string_list_init(&data->updates, 0);
transaction->backend_data = data;
diff --git a/refs/ref-cache.c b/refs/ref-cache.c
index b7052f7..46f1e54 100644
--- a/refs/ref-cache.c
+++ b/refs/ref-cache.c
@@ -530,7 +530,7 @@
if (prime_dir)
prime_ref_dir(dir, prefix);
- iter = xcalloc(1, sizeof(*iter));
+ CALLOC_ARRAY(iter, 1);
ref_iterator = &iter->base;
base_ref_iterator_init(ref_iterator, &cache_ref_iterator_vtable, 1);
ALLOC_GROW(iter->levels, 10, iter->levels_alloc);
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index ff2436c..467f4b3 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -32,6 +32,13 @@
#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 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
@@ -347,9 +348,13 @@
/*
* 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 @@
/* 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 @@
/*
* 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/refspec.c b/refspec.c
index 9a9bf21..e3d852c 100644
--- a/refspec.c
+++ b/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 @@
1,
0,
0,
+ 0,
"refs/tags/*",
"refs/tags/*"
};
@@ -32,10 +33,17 @@
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 @@
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) {
@@ -63,9 +71,34 @@
}
item->pattern = is_glob;
- item->src = xstrndup(lhs, llen);
+ if (llen == 1 && *lhs == '@')
+ item->src = xstrdup("HEAD");
+ else
+ 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 +186,7 @@
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 +196,21 @@
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)
@@ -201,15 +248,25 @@
return ret;
}
+int valid_remote_name(const char *name)
+{
+ int result;
+ struct strbuf refspec = STRBUF_INIT;
+ strbuf_addf(&refspec, "refs/heads/test:refs/remotes/%s/test", name);
+ result = valid_fetch_refspec(refspec.buf);
+ strbuf_release(&refspec);
+ return result;
+}
+
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;
@@ -218,15 +275,16 @@
else if (item->src && !item->exact_sha1)
prefix = item->src;
- if (prefix) {
- if (item->pattern) {
- const char *glob = strchr(prefix, '*');
- argv_array_pushf(ref_prefixes, "%.*s",
- (int)(glob - prefix),
- prefix);
- } else {
- expand_ref_prefix(ref_prefixes, prefix);
- }
+ if (!prefix)
+ continue;
+
+ if (item->pattern) {
+ const char *glob = strchr(prefix, '*');
+ strvec_pushf(ref_prefixes, "%.*s",
+ (int)(glob - prefix),
+ prefix);
+ } else {
+ expand_ref_prefix(ref_prefixes, prefix);
}
}
}
diff --git a/refspec.h b/refspec.h
index 3f2bd4a..8b79891 100644
--- a/refspec.h
+++ b/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;
@@ -21,20 +36,8 @@
#define REFSPEC_INIT_PUSH { .fetch = REFSPEC_PUSH }
/**
- * A struct refspec holds the parsed interpretation of a refspec. If it will
- * force updates (starts with a '+'), force is true. If it is a pattern
- * (sides end with '*') pattern is true. src and dest are the two sides
- * (including '*' characters if present); if there is only one side, it is src,
- * and dst is NULL; if sides exist but are empty (i.e., the refspec either
- * starts or ends with ':'), the corresponding side is "".
- *
- * An array of strings can be parsed into an array of struct refspecs using
+ * An array of strings can be parsed into a struct refspec using
* parse_fetch_refspec() or parse_push_refspec().
- *
- * remote_find_tracking(), given a remote and a struct refspec with either src
- * or dst filled out, will fill out the other such that the result is in the
- * "fetch" specification for the remote (note that this evaluates patterns and
- * returns a single result).
*/
struct refspec {
struct refspec_item *items;
@@ -55,17 +58,20 @@
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);
+int valid_remote_name(const char *name);
-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/remote-curl.c b/remote-curl.c
index e4cd321..0290b04 100644
--- a/remote-curl.c
+++ b/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,9 +39,14 @@
/* 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;
+
+ atomic : 1,
+ object_format : 1,
+ force_if_includes : 1;
+ const struct git_hash_algo *hash_algo;
};
static struct options options;
static struct string_list cas_options = STRING_LIST_INIT_DUP;
@@ -119,10 +124,22 @@
}
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;
+ } else if (!strcmp(name, TRANS_OPT_FORCE_IF_INCLUDES)) {
+ if (!strcmp(value, "true"))
+ options.force_if_includes = 1;
+ else if (!strcmp(value, "false"))
+ options.force_if_includes = 0;
+ else
+ return -1;
+ return 0;
} else if (!strcmp(name, "cloning")) {
if (!strcmp(value, "true"))
options.cloning = 1;
@@ -184,12 +201,19 @@
} 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 */;
}
@@ -231,6 +255,7 @@
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");
@@ -239,6 +264,19 @@
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;
@@ -249,6 +287,12 @@
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;
@@ -259,13 +303,13 @@
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)
@@ -509,11 +553,16 @@
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);
@@ -601,6 +650,8 @@
case PACKET_READ_FLUSH:
memcpy(buf - 4, "0000", 4);
break;
+ case PACKET_READ_RESPONSE_END:
+ die(_("remote server sent stateless separator"));
}
}
@@ -643,7 +694,7 @@
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.
*/
@@ -679,9 +730,55 @@
}
#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;
};
/*
@@ -702,6 +799,8 @@
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;
}
@@ -778,7 +877,7 @@
* 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();
@@ -920,6 +1019,8 @@
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);
@@ -936,6 +1037,14 @@
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;
@@ -985,7 +1094,7 @@
break;
rpc->pos = 0;
rpc->len = n;
- err |= post_rpc(rpc, 0);
+ err |= post_rpc(rpc, 0, 0);
}
close(client.in);
@@ -1044,41 +1153,39 @@
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];
@@ -1093,12 +1200,12 @@
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;
}
@@ -1170,15 +1277,15 @@
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"));
@@ -1189,38 +1296,41 @@
{
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)
- argv_array_push(&args, "--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");
+ if (options.force_if_includes)
+ strvec_push(&args, "--force-if-includes");
+
+ strvec_push(&args, "--stdin");
for (i = 0; i < nr_spec; i++)
packet_buf_write(&preamble, "%s\n", specs[i]);
packet_buf_flush(&preamble);
@@ -1228,12 +1338,12 @@
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;
}
@@ -1252,13 +1362,13 @@
static void parse_push(struct strbuf *buf)
{
- struct argv_array specs = ARGV_ARRAY_INIT;
+ struct strvec specs = STRVEC_INIT;
int ret;
do {
const char *arg;
if (skip_prefix(buf->buf, "push ", &arg))
- argv_array_push(&specs, arg);
+ strvec_push(&specs, arg);
else
die(_("http transport does not support %s"), buf->buf);
@@ -1269,15 +1379,15 @@
break;
} while (1);
- ret = push(specs.argc, specs.argv);
+ ret = push(specs.nr, specs.v);
printf("\n");
fflush(stdout);
if (ret)
exit(128); /* error already reported */
- free_specs:
- argv_array_clear(&specs);
+free_specs:
+ strvec_clear(&specs);
}
static int stateless_connect(const char *service_name)
@@ -1342,7 +1452,7 @@
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 */
@@ -1439,6 +1549,7 @@
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/remote-testsvn.c b/remote-testsvn.c
deleted file mode 100644
index 3af708c..0000000
--- a/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/remote.c b/remote.c
index c43196e..6d1e8d0 100644
--- a/remote.c
+++ b/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"
@@ -151,7 +151,7 @@
if (e)
return container_of(e, struct remote, ent);
- ret = xcalloc(1, sizeof(struct remote));
+ CALLOC_ARRAY(ret, 1);
ret->prune = -1; /* unspecified */
ret->prune_tags = -1; /* unspecified */
ret->name = xstrndup(name, len);
@@ -174,54 +174,43 @@
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));
+ CALLOC_ARRAY(ret, 1);
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));
+ CALLOC_ARRAY(ret, 1);
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;
}
@@ -287,7 +276,7 @@
/*
* 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.
*/
@@ -295,28 +284,24 @@
if (frag)
*(frag++) = '\0';
else
- frag = "master";
+ frag = (char *)git_default_branch_name(0);
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;
@@ -370,7 +355,7 @@
remote = make_remote(name, namelen);
remote->origin = REMOTE_CONFIG;
if (current_config_scope() == CONFIG_SCOPE_LOCAL ||
- current_config_scope() == CONFIG_SCOPE_WORKTREE)
+ current_config_scope() == CONFIG_SCOPE_WORKTREE)
remote->configured_in_repo = 1;
if (!strcmp(subkey, "mirror"))
remote->mirror = git_config_bool(key, value);
@@ -470,7 +455,7 @@
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);
@@ -697,6 +682,101 @@
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.
+ *
+ * The first loop finds and expands all positive refspecs
+ * matched by the queried ref.
+ *
+ * The second loop checks if any of the results of the first loop
+ * match any negative refspec.
+ */
+ 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 (refspec->matching) {
+ /* For the special matching refspec, any query should match */
+ string_list_append(&reversed, needle);
+ } else if (!refspec->src) {
+ BUG("refspec->src should not be null here");
+ } 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)
@@ -707,6 +787,9 @@
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;
@@ -714,7 +797,7 @@
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))
@@ -735,12 +818,15 @@
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)) {
@@ -1069,7 +1155,7 @@
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;
@@ -1145,6 +1231,10 @@
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;
@@ -1350,7 +1440,7 @@
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);
@@ -1452,6 +1542,8 @@
string_list_clear(&src_ref_index, 0);
}
+ *dst = apply_negative_refspecs(*dst, rs);
+
if (errs)
return -1;
return 0;
@@ -1486,12 +1578,23 @@
* with the remote-tracking branch to find the value
* to expect, but we did not have such a tracking
* branch.
+ *
+ * If the tip of the remote-tracking ref is unreachable
+ * from any reflog entry of its local ref indicating a
+ * possible update since checkout; reject the push.
*/
if (ref->expect_old_sha1) {
if (!oideq(&ref->old_oid, &ref->old_oid_expect))
reject_reason = REF_STATUS_REJECT_STALE;
+ else if (ref->check_reachable && ref->unreachable)
+ reject_reason =
+ REF_STATUS_REJECT_REMOTE_UPDATED;
else
- /* If the ref isn't stale then force the update. */
+ /*
+ * If the ref isn't stale, and is reachable
+ * from from one of the reflog entries of
+ * the local branch, force the update.
+ */
force_ref_update = 1;
}
@@ -1561,7 +1664,7 @@
remote = remote_get(ret->remote_name);
- ret->merge = xcalloc(ret->merge_nr, sizeof(*ret->merge));
+ CALLOC_ARRAY(ret->merge, ret->merge_nr);
for (i = 0; i < ret->merge_nr; i++) {
ret->merge[i] = xcalloc(1, sizeof(**ret->merge));
ret->merge[i]->src = xstrdup(ret->merge_name[i]);
@@ -1569,7 +1672,7 @@
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]);
@@ -1584,7 +1687,7 @@
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;
}
@@ -1821,6 +1924,9 @@
{
struct ref *ref_map, **rmp;
+ if (refspec->negative)
+ return 0;
+
if (refspec->pattern) {
ref_map = get_expanded_map(remote_refs, refspec);
} else {
@@ -1896,7 +2002,7 @@
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))
@@ -1922,15 +2028,15 @@
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"));
@@ -1949,7 +2055,7 @@
clear_commit_marks(ours, ALL_REV_FLAGS);
clear_commit_marks(theirs, ALL_REV_FLAGS);
- argv_array_clear(&argv);
+ strvec_clear(&argv);
return 1;
}
@@ -2108,8 +2214,17 @@
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(0));
+
+ 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);
@@ -2258,12 +2373,13 @@
/*
* Look at remote.fetch refspec and see if we have a remote
- * tracking branch for the refname there. Fill its current
- * value in sha1[].
+ * tracking branch for the refname there. Fill the name of
+ * the remote-tracking branch in *dst_refname, and the name
+ * of the commit object at its tip in oid[].
* If we cannot do so, return negative to signal an error.
*/
static int remote_tracking(struct remote *remote, const char *refname,
- struct object_id *oid)
+ struct object_id *oid, char **dst_refname)
{
char *dst;
@@ -2272,9 +2388,150 @@
return -1; /* no tracking ref for refname at remote */
if (read_ref(dst, oid))
return -1; /* we know what the tracking ref is but we cannot read it */
+
+ *dst_refname = dst;
return 0;
}
+/*
+ * The struct "reflog_commit_array" and related helper functions
+ * are used for collecting commits into an array during reflog
+ * traversals in "check_and_collect_until()".
+ */
+struct reflog_commit_array {
+ struct commit **item;
+ size_t nr, alloc;
+};
+
+#define REFLOG_COMMIT_ARRAY_INIT { NULL, 0, 0 }
+
+/* Append a commit to the array. */
+static void append_commit(struct reflog_commit_array *arr,
+ struct commit *commit)
+{
+ ALLOC_GROW(arr->item, arr->nr + 1, arr->alloc);
+ arr->item[arr->nr++] = commit;
+}
+
+/* Free and reset the array. */
+static void free_commit_array(struct reflog_commit_array *arr)
+{
+ FREE_AND_NULL(arr->item);
+ arr->nr = arr->alloc = 0;
+}
+
+struct check_and_collect_until_cb_data {
+ struct commit *remote_commit;
+ struct reflog_commit_array *local_commits;
+ timestamp_t remote_reflog_timestamp;
+};
+
+/* Get the timestamp of the latest entry. */
+static int peek_reflog(struct object_id *o_oid, struct object_id *n_oid,
+ const char *ident, timestamp_t timestamp,
+ int tz, const char *message, void *cb_data)
+{
+ timestamp_t *ts = cb_data;
+ *ts = timestamp;
+ return 1;
+}
+
+static int check_and_collect_until(struct object_id *o_oid,
+ struct object_id *n_oid,
+ const char *ident, timestamp_t timestamp,
+ int tz, const char *message, void *cb_data)
+{
+ struct commit *commit;
+ struct check_and_collect_until_cb_data *cb = cb_data;
+
+ /* An entry was found. */
+ if (oideq(n_oid, &cb->remote_commit->object.oid))
+ return 1;
+
+ if ((commit = lookup_commit_reference(the_repository, n_oid)))
+ append_commit(cb->local_commits, commit);
+
+ /*
+ * If the reflog entry timestamp is older than the remote ref's
+ * latest reflog entry, there is no need to check or collect
+ * entries older than this one.
+ */
+ if (timestamp < cb->remote_reflog_timestamp)
+ return -1;
+
+ return 0;
+}
+
+#define MERGE_BASES_BATCH_SIZE 8
+
+/*
+ * Iterate through the reflog of the local ref to check if there is an entry
+ * for the given remote-tracking ref; runs until the timestamp of an entry is
+ * older than latest timestamp of remote-tracking ref's reflog. Any commits
+ * are that seen along the way are collected into an array to check if the
+ * remote-tracking ref is reachable from any of them.
+ */
+static int is_reachable_in_reflog(const char *local, const struct ref *remote)
+{
+ timestamp_t date;
+ struct commit *commit;
+ struct commit **chunk;
+ struct check_and_collect_until_cb_data cb;
+ struct reflog_commit_array arr = REFLOG_COMMIT_ARRAY_INIT;
+ size_t size = 0;
+ int ret = 0;
+
+ commit = lookup_commit_reference(the_repository, &remote->old_oid);
+ if (!commit)
+ goto cleanup_return;
+
+ /*
+ * Get the timestamp from the latest entry
+ * of the remote-tracking ref's reflog.
+ */
+ for_each_reflog_ent_reverse(remote->tracking_ref, peek_reflog, &date);
+
+ cb.remote_commit = commit;
+ cb.local_commits = &arr;
+ cb.remote_reflog_timestamp = date;
+ ret = for_each_reflog_ent_reverse(local, check_and_collect_until, &cb);
+
+ /* We found an entry in the reflog. */
+ if (ret > 0)
+ goto cleanup_return;
+
+ /*
+ * Check if the remote commit is reachable from any
+ * of the commits in the collected array, in batches.
+ */
+ for (chunk = arr.item; chunk < arr.item + arr.nr; chunk += size) {
+ size = arr.item + arr.nr - chunk;
+ if (MERGE_BASES_BATCH_SIZE < size)
+ size = MERGE_BASES_BATCH_SIZE;
+
+ if ((ret = in_merge_bases_many(commit, size, chunk)))
+ break;
+ }
+
+cleanup_return:
+ free_commit_array(&arr);
+ return ret;
+}
+
+/*
+ * Check for reachability of a remote-tracking
+ * ref in the reflog entries of its local ref.
+ */
+static void check_if_includes_upstream(struct ref *remote)
+{
+ struct ref *local = get_local_ref(remote->name);
+ if (!local)
+ return;
+
+ if (is_reachable_in_reflog(local->name, remote) <= 0)
+ remote->unreachable = 1;
+}
+
static void apply_cas(struct push_cas_option *cas,
struct remote *remote,
struct ref *ref)
@@ -2289,8 +2546,12 @@
ref->expect_old_sha1 = 1;
if (!entry->use_tracking)
oidcpy(&ref->old_oid_expect, &entry->expect);
- else if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
+ else if (remote_tracking(remote, ref->name,
+ &ref->old_oid_expect,
+ &ref->tracking_ref))
oidclr(&ref->old_oid_expect);
+ else
+ ref->check_reachable = cas->use_force_if_includes;
return;
}
@@ -2299,8 +2560,12 @@
return;
ref->expect_old_sha1 = 1;
- if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
+ if (remote_tracking(remote, ref->name,
+ &ref->old_oid_expect,
+ &ref->tracking_ref))
oidclr(&ref->old_oid_expect);
+ else
+ ref->check_reachable = cas->use_force_if_includes;
}
void apply_push_cas(struct push_cas_option *cas,
@@ -2308,6 +2573,15 @@
struct ref *remote_refs)
{
struct ref *ref;
- for (ref = remote_refs; ref; ref = ref->next)
+ for (ref = remote_refs; ref; ref = ref->next) {
apply_cas(cas, remote, ref);
+
+ /*
+ * If "compare-and-swap" is in "use_tracking[_for_rest]"
+ * mode, and if "--force-if-includes" was specified, run
+ * the check.
+ */
+ if (ref->check_reachable)
+ check_if_includes_upstream(ref);
+ }
}
diff --git a/remote.h b/remote.h
index 11d8719..5a59198 100644
--- a/remote.h
+++ b/remote.h
@@ -6,6 +6,8 @@
#include "hashmap.h"
#include "refspec.h"
+struct transport_ls_refs_options;
+
/**
* The API gives access to the configuration related to remotes. It handles
* all three configuration mechanisms historically and currently used by Git,
@@ -93,18 +95,34 @@
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;
struct object_id new_oid;
struct object_id old_oid_expect; /* used by expect-old */
char *symref;
+ char *tracking_ref;
unsigned int
force:1,
forced_update:1,
expect_old_sha1:1,
exact_oid:1,
- deletion:1;
+ deletion:1,
+ /* Need to check if local reflog reaches the remote tip. */
+ check_reachable:1,
+ /*
+ * Store the result of the check enabled by "check_reachable";
+ * implies the local reflog does not reach the remote tip.
+ */
+ unreachable:1;
enum {
REF_NOT_MATCHED = 0, /* initial value */
@@ -118,7 +136,7 @@
* should be 0, so that xcalloc'd structures get it
* by default.
*/
- enum {
+ enum fetch_head_status {
FETCH_HEAD_MERGE = -1,
FETCH_HEAD_NOT_FOR_MERGE = 0,
FETCH_HEAD_IGNORE = 1
@@ -134,12 +152,14 @@
REF_STATUS_REJECT_NEEDS_FORCE,
REF_STATUS_REJECT_STALE,
REF_STATUS_REJECT_SHALLOW,
+ REF_STATUS_REJECT_REMOTE_UPDATED,
REF_STATUS_UPTODATE,
REF_STATUS_REMOTE_REJECT,
REF_STATUS_EXPECTING_REPORT,
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 */
};
@@ -168,7 +188,7 @@
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,
@@ -178,8 +198,9 @@
/* 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);
+ struct transport_ls_refs_options *transport_options,
+ const struct string_list *server_options,
+ int stateless_rpc);
int resolve_remote_symref(struct ref *ref, struct ref *list);
@@ -192,6 +213,12 @@
*/
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);
@@ -204,7 +231,8 @@
/*
* 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
@@ -331,6 +359,7 @@
struct push_cas_option {
unsigned use_tracking_for_rest:1;
+ unsigned use_force_if_includes:1;
struct push_cas {
struct object_id expect;
unsigned use_tracking:1;
diff --git a/repo-settings.c b/repo-settings.c
index a703e40..f7fff0f 100644
--- a/repo-settings.c
+++ b/repo-settings.c
@@ -1,6 +1,7 @@
#include "cache.h"
#include "config.h"
#include "repository.h"
+#include "midx.h"
#define UPDATE_DEFAULT_BOOL(s,v) do { if (s == -1) { s = v; } } while(0)
@@ -17,9 +18,12 @@
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))
@@ -39,25 +43,33 @@
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);
+
+ value = git_env_bool(GIT_TEST_MULTI_PACK_INDEX, 0);
+ if (value || !repo_config_get_bool(r, "core.multipackindex", &value))
+ r->settings.core_multi_pack_index = value;
+ UPDATE_DEFAULT_BOOL(r->settings.core_multi_pack_index, 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;
- if (!repo_config_get_bool(r, "feature.experimental", &value) && value) {
- UPDATE_DEFAULT_BOOL(r->settings.pack_use_sparse, 1);
- UPDATE_DEFAULT_BOOL(r->settings.fetch_negotiation_algorithm, FETCH_NEGOTIATION_SKIPPING);
- UPDATE_DEFAULT_BOOL(r->settings.fetch_write_commit_graph, 1);
- }
UPDATE_DEFAULT_BOOL(r->settings.fetch_write_commit_graph, 0);
+ 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;
diff --git a/repository.c b/repository.c
index a4174dd..87b355e 100644
--- a/repository.c
+++ b/repository.c
@@ -72,7 +72,7 @@
repo_set_commondir(repo, o->commondir);
if (!repo->objects->odb) {
- repo->objects->odb = xcalloc(1, sizeof(*repo->objects->odb));
+ CALLOC_ARRAY(repo->objects->odb, 1);
repo->objects->odb_tail = &repo->objects->odb->next;
}
expand_base_dir(&repo->objects->odb->path, o->object_dir,
@@ -262,7 +262,13 @@
int repo_read_index(struct repository *repo)
{
if (!repo->index)
- repo->index = xcalloc(1, sizeof(*repo->index));
+ CALLOC_ARRAY(repo->index, 1);
+
+ /* Complete the double-reference */
+ if (!repo->index->repo)
+ repo->index->repo = repo;
+ else if (repo->index->repo != repo)
+ BUG("repo's index should point back at itself");
return read_index_from(repo->index, repo->index_file, repo->gitdir);
}
diff --git a/repository.h b/repository.h
index 040057d..b385ca3 100644
--- a/repository.h
+++ b/repository.h
@@ -23,12 +23,14 @@
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;
@@ -37,6 +39,8 @@
int pack_use_sparse;
enum fetch_negotiation_setting fetch_negotiation_algorithm;
+
+ int core_multi_pack_index;
};
struct repository {
@@ -67,8 +71,12 @@
*/
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.
@@ -192,4 +200,10 @@
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/rerere.c b/rerere.c
index 9281131..dee60dc 100644
--- a/rerere.c
+++ b/rerere.c
@@ -10,7 +10,8 @@
#include "attr.h"
#include "pathspec.h"
#include "object-store.h"
-#include "sha1-lookup.h"
+#include "hash-lookup.h"
+#include "strmap.h"
#define RESOLVED 0
#define PUNTED 1
@@ -23,26 +24,27 @@
/* automatically update cleanly resolved paths to the index */
static int rerere_autoupdate;
-static int rerere_dir_nr;
-static int rerere_dir_alloc;
-
#define RR_HAS_POSTIMAGE 1
#define RR_HAS_PREIMAGE 2
-static struct rerere_dir {
- unsigned char hash[GIT_MAX_HEXSZ];
+struct rerere_dir {
int status_alloc, status_nr;
unsigned char *status;
-} **rerere_dir;
+ char name[FLEX_ARRAY];
+};
+
+static struct strmap rerere_dirs = STRMAP_INIT;
static void free_rerere_dirs(void)
{
- int i;
- for (i = 0; i < rerere_dir_nr; i++) {
- free(rerere_dir[i]->status);
- free(rerere_dir[i]);
+ struct hashmap_iter iter;
+ struct strmap_entry *ent;
+
+ strmap_for_each_entry(&rerere_dirs, &iter, ent) {
+ struct rerere_dir *rr_dir = ent->value;
+ free(rr_dir->status);
+ free(rr_dir);
}
- FREE_AND_NULL(rerere_dir);
- rerere_dir_nr = rerere_dir_alloc = 0;
+ strmap_clear(&rerere_dirs, 0);
}
static void free_rerere_id(struct string_list_item *item)
@@ -52,7 +54,7 @@
static const char *rerere_id_hex(const struct rerere_id *id)
{
- return hash_to_hex(id->collection->hash);
+ return id->collection->name;
}
static void fit_variant(struct rerere_dir *rr_dir, int variant)
@@ -115,7 +117,7 @@
static void scan_rerere_dir(struct rerere_dir *rr_dir)
{
struct dirent *de;
- DIR *dir = opendir(git_path("rr-cache/%s", hash_to_hex(rr_dir->hash)));
+ DIR *dir = opendir(git_path("rr-cache/%s", rr_dir->name));
if (!dir)
return;
@@ -133,39 +135,21 @@
closedir(dir);
}
-static const unsigned char *rerere_dir_hash(size_t i, void *table)
-{
- struct rerere_dir **rr_dir = table;
- return rr_dir[i]->hash;
-}
-
static struct rerere_dir *find_rerere_dir(const char *hex)
{
- unsigned char hash[GIT_MAX_RAWSZ];
struct rerere_dir *rr_dir;
- int pos;
- if (get_sha1_hex(hex, hash))
- return NULL; /* BUG */
- pos = sha1_pos(hash, rerere_dir, rerere_dir_nr, rerere_dir_hash);
- if (pos < 0) {
- rr_dir = xmalloc(sizeof(*rr_dir));
- hashcpy(rr_dir->hash, hash);
+ rr_dir = strmap_get(&rerere_dirs, hex);
+ if (!rr_dir) {
+ FLEX_ALLOC_STR(rr_dir, name, hex);
rr_dir->status = NULL;
rr_dir->status_nr = 0;
rr_dir->status_alloc = 0;
- pos = -1 - pos;
+ strmap_put(&rerere_dirs, hex, rr_dir);
- /* Make sure the array is big enough ... */
- ALLOC_GROW(rerere_dir, rerere_dir_nr + 1, rerere_dir_alloc);
- /* ... and add it in. */
- rerere_dir_nr++;
- MOVE_ARRAY(rerere_dir + pos + 1, rerere_dir + pos,
- rerere_dir_nr - pos - 1);
- rerere_dir[pos] = rr_dir;
scan_rerere_dir(rr_dir);
}
- return rerere_dir[pos];
+ return rr_dir;
}
static int has_rerere_resolution(const struct rerere_id *id)
@@ -1178,6 +1162,14 @@
unlink_rr_item(id);
}
+/* Does the basename in "path" look plausibly like an rr-cache entry? */
+static int is_rr_cache_dirname(const char *path)
+{
+ struct object_id oid;
+ const char *end;
+ return !parse_oid_hex(path, &oid, &end) && !*end;
+}
+
void rerere_gc(struct repository *r, struct string_list *rr)
{
struct string_list to_remove = STRING_LIST_INIT_DUP;
@@ -1205,10 +1197,11 @@
if (is_dot_or_dotdot(e->d_name))
continue;
- rr_dir = find_rerere_dir(e->d_name);
- if (!rr_dir)
+ if (!is_rr_cache_dirname(e->d_name))
continue; /* or should we remove e->d_name? */
+ rr_dir = find_rerere_dir(e->d_name);
+
now_empty = 1;
for (id.variant = 0, id.collection = rr_dir;
id.variant < id.collection->status_nr;
diff --git a/reset.c b/reset.c
new file mode 100644
index 0000000..2f4fbd0
--- /dev/null
+++ b/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/reset.h b/reset.h
new file mode 100644
index 0000000..12f83c7
--- /dev/null
+++ b/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/resolve-undo.c b/resolve-undo.c
index 236320f..bbd2e57 100644
--- a/resolve-undo.c
+++ b/resolve-undo.c
@@ -15,7 +15,7 @@
return;
if (!istate->resolve_undo) {
- resolve_undo = xcalloc(1, sizeof(*resolve_undo));
+ CALLOC_ARRAY(resolve_undo, 1);
resolve_undo->strdup_strings = 1;
istate->resolve_undo = resolve_undo;
}
@@ -57,7 +57,7 @@
int i;
const unsigned rawsz = the_hash_algo->rawsz;
- resolve_undo = xcalloc(1, sizeof(*resolve_undo));
+ CALLOC_ARRAY(resolve_undo, 1);
resolve_undo->strdup_strings = 1;
while (size) {
diff --git a/revision.c b/revision.c
index 8136929..99c859f 100644
--- a/revision.c
+++ b/revision.c
@@ -5,6 +5,7 @@
#include "tree.h"
#include "commit.h"
#include "diff.h"
+#include "diff-merges.h"
#include "refs.h"
#include "revision.h"
#include "repository.h"
@@ -23,12 +24,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;
@@ -37,6 +40,8 @@
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;
@@ -120,11 +125,6 @@
return strcmp(e1->path, e2->path);
}
-static void paths_and_oids_init(struct hashmap *map)
-{
- hashmap_init(map, path_and_oids_cmp, NULL, 0);
-}
-
static void paths_and_oids_clear(struct hashmap *map)
{
struct hashmap_iter iter;
@@ -135,7 +135,7 @@
free(entry->path);
}
- hashmap_free_entries(map, struct path_and_oids_entry, ent);
+ hashmap_clear_and_free(map, struct path_and_oids_entry, ent);
}
static void paths_and_oids_insert(struct hashmap *map,
@@ -154,7 +154,7 @@
entry = hashmap_get_entry(map, &key, ent, NULL);
if (!entry) {
- entry = xcalloc(1, sizeof(struct path_and_oids_entry));
+ CALLOC_ARRAY(entry, 1);
hashmap_entry_init(&entry->ent, hash);
entry->path = xstrdup(key.path);
oidset_init(&entry->trees, 16);
@@ -209,7 +209,7 @@
struct oidset *trees)
{
unsigned has_interesting = 0, has_uninteresting = 0;
- struct hashmap map;
+ struct hashmap map = HASHMAP_INIT(path_and_oids_cmp, NULL);
struct hashmap_iter map_iter;
struct path_and_oids_entry *entry;
struct object_id *oid;
@@ -233,8 +233,6 @@
if (!has_uninteresting || !has_interesting)
return;
- paths_and_oids_init(&map);
-
oidset_iter_init(trees, &iter);
while ((oid = oidset_iter_next(&iter))) {
struct tree *tree = lookup_tree(r, oid);
@@ -311,13 +309,14 @@
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);
@@ -435,7 +434,7 @@
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);
@@ -624,11 +623,156 @@
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;
@@ -653,17 +797,26 @@
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)
@@ -671,9 +824,9 @@
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 {
@@ -851,11 +1004,11 @@
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
@@ -870,7 +1023,19 @@
}
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:
@@ -884,7 +1049,7 @@
* 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));
@@ -897,6 +1062,10 @@
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));
@@ -948,7 +1117,7 @@
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);
@@ -979,7 +1148,7 @@
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)
@@ -1073,12 +1242,14 @@
/*
* Have we seen the same patch id?
*/
- id = has_commit_patch_id(commit, &ids);
+ id = patch_id_iter_first(commit, &ids);
if (!id)
continue;
commit->object.flags |= cherry_flag;
- id->commit->object.flags |= cherry_flag;
+ do {
+ id->commit->object.flags |= cherry_flag;
+ } while ((id = patch_id_iter_next(id, &ids)));
}
free_patch_ids(&ids);
@@ -1253,7 +1424,8 @@
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;
@@ -1383,7 +1555,7 @@
void add_ref_exclusion(struct string_list **ref_excludes_p, const char *exclude)
{
if (!*ref_excludes_p) {
- *ref_excludes_p = xcalloc(1, sizeof(**ref_excludes_p));
+ CALLOC_ARRAY(*ref_excludes_p, 1);
(*ref_excludes_p)->strdup_strings = 1;
}
string_list_append(*ref_excludes_p, exclude);
@@ -1452,7 +1624,7 @@
{
struct worktree **worktrees, **p;
- worktrees = get_worktrees(0);
+ worktrees = get_worktrees();
for (p = worktrees; *p; p++) {
struct worktree *wt = *p;
@@ -1540,7 +1712,7 @@
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 };
@@ -1637,7 +1809,6 @@
revs->repo = r;
revs->abbrev = DEFAULT_ABBREV;
- revs->ignore_merges = 1;
revs->simplify_history = 1;
revs->pruning.repo = r;
revs->pruning.flags.recursive = 1;
@@ -1658,7 +1829,6 @@
revs->commit_format = CMIT_FMT_DEFAULT;
revs->expand_tabs_in_log_default = 8;
- init_grep_defaults(revs->repo);
grep_init(&revs->grep_filter, revs->repo, prefix);
revs->grep_filter.status_only = 1;
@@ -1839,7 +2009,7 @@
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;
@@ -1914,15 +2084,23 @@
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;
@@ -2157,7 +2335,7 @@
} 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;
@@ -2165,19 +2343,8 @@
revs->diff = 1;
revs->diffopt.flags.recursive = 1;
revs->diffopt.flags.tree_in_recursive = 1;
- } else if (!strcmp(arg, "-m")) {
- revs->ignore_merges = 0;
- } else if (!strcmp(arg, "-c")) {
- revs->diff = 1;
- revs->dense_combined_merges = 0;
- revs->combine_merges = 1;
- } else if (!strcmp(arg, "--combined-all-paths")) {
- revs->diff = 1;
- revs->combined_all_paths = 1;
- } else if (!strcmp(arg, "--cc")) {
- revs->diff = 1;
- revs->dense_combined_merges = 1;
- revs->combine_merges = 1;
+ } else if ((argcount = diff_merges_parse_opts(revs, argv))) {
+ return argcount;
} else if (!strcmp(arg, "-v")) {
revs->verbose_header = 1;
} else if (!strcmp(arg, "--pretty")) {
@@ -2241,6 +2408,10 @@
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")) {
@@ -2265,6 +2436,8 @@
} 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")) {
@@ -2292,8 +2465,6 @@
} else if ((argcount = parse_long_opt("grep", argv, &optarg))) {
add_message_grep(revs, optarg);
return argcount;
- } else if (!strcmp(arg, "--grep-debug")) {
- revs->grep_filter.debug = 1;
} else if (!strcmp(arg, "--basic-regexp")) {
revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_BRE;
} else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) {
@@ -2375,8 +2546,8 @@
}
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;
@@ -2510,8 +2681,8 @@
*/
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;
@@ -2530,7 +2701,7 @@
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;
}
@@ -2547,7 +2718,7 @@
int opts;
opts = handle_revision_pseudo_opt(submodule,
- revs, argc - i, argv + i,
+ revs, argv + i,
&flags);
if (opts > 0) {
i += opts - 1;
@@ -2596,14 +2767,12 @@
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.
@@ -2619,9 +2788,9 @@
* }
*/
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;
@@ -2629,7 +2798,7 @@
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;
@@ -2652,6 +2821,12 @@
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;
@@ -2664,18 +2839,11 @@
copy_pathspec(&revs->diffopt.pathspec,
&revs->prune_data);
}
- if (revs->combine_merges)
- revs->ignore_merges = 0;
- if (revs->combined_all_paths && !revs->combine_merges)
- die("--combined-all-paths makes no sense without -c or --cc");
+
+ diff_merges_setup_revs(revs);
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,
@@ -2704,9 +2872,6 @@
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"));
@@ -2764,7 +2929,7 @@
st = lookup_decoration(&revs->merge_simplification, &commit->object);
if (!st) {
- st = xcalloc(1, sizeof(*st));
+ CALLOC_ARRAY(st, 1);
add_decoration(&revs->merge_simplification, &commit->object, st);
}
return st;
@@ -3019,7 +3184,8 @@
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);
@@ -3104,7 +3270,7 @@
define_commit_slab(author_date_slab, timestamp_t);
struct topo_walk_info {
- uint32_t min_generation;
+ timestamp_t min_generation;
struct prio_queue explore_queue;
struct prio_queue indegree_queue;
struct prio_queue topo_queue;
@@ -3112,6 +3278,26 @@
struct author_date_slab author_date;
};
+static int topo_walk_atexit_registered;
+static unsigned int count_explore_walked;
+static unsigned int count_indegree_walked;
+static unsigned int count_topo_walked;
+
+static void trace2_topo_walk_statistics_atexit(void)
+{
+ struct json_writer jw = JSON_WRITER_INIT;
+
+ jw_object_begin(&jw, 0);
+ jw_object_intmax(&jw, "count_explore_walked", count_explore_walked);
+ jw_object_intmax(&jw, "count_indegree_walked", count_indegree_walked);
+ jw_object_intmax(&jw, "count_topo_walked", count_topo_walked);
+ jw_end(&jw);
+
+ trace2_data_json("topo_walk", the_repository, "statistics", &jw);
+
+ jw_release(&jw);
+}
+
static inline void test_flag_and_insert(struct prio_queue *q, struct commit *c, int flag)
{
if (c->object.flags & flag)
@@ -3130,9 +3316,11 @@
if (!c)
return;
- if (parse_commit_gently(c, 1) < 0)
+ if (repo_parse_commit_gently(revs->repo, c, 1) < 0)
return;
+ count_explore_walked++;
+
if (revs->sort_order == REV_SORT_BY_AUTHOR_DATE)
record_author_date(&info->author_date, c);
@@ -3150,12 +3338,12 @@
}
static void explore_to_depth(struct rev_info *revs,
- uint32_t gen_cutoff)
+ timestamp_t gen_cutoff)
{
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);
}
@@ -3168,15 +3356,20 @@
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);
+ count_indegree_walked++;
+
+ explore_to_depth(revs, commit_graph_generation(c));
for (p = c->parents; p; p = p->next) {
struct commit *parent = p->item;
int *pi = indegree_slab_at(&info->indegree, parent);
+ if (repo_parse_commit_gently(revs->repo, parent, 1) < 0)
+ return;
+
if (*pi)
(*pi)++;
else
@@ -3190,12 +3383,12 @@
}
static void compute_indegrees_to_depth(struct rev_info *revs,
- uint32_t gen_cutoff)
+ timestamp_t gen_cutoff)
{
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);
}
@@ -3248,15 +3441,17 @@
info->min_generation = GENERATION_NUMBER_INFINITY;
for (list = revs->commits; list; list = list->next) {
struct commit *c = list->item;
+ timestamp_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;
@@ -3278,6 +3473,11 @@
*/
if (revs->sort_order == REV_SORT_IN_GRAPH_ORDER)
prio_queue_reverse(&info->topo_queue);
+
+ if (trace2_is_enabled() && !topo_walk_atexit_registered) {
+ atexit(trace2_topo_walk_statistics_atexit);
+ topo_walk_atexit_registered = 1;
+ }
}
static struct commit *next_topo_commit(struct rev_info *revs)
@@ -3304,18 +3504,22 @@
oid_to_hex(&commit->object.oid));
}
+ count_topo_walked++;
+
for (p = commit->parents; p; p = p->next) {
struct commit *parent = p->item;
int *pi;
+ timestamp_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);
}
@@ -3362,6 +3566,8 @@
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)
@@ -3373,12 +3579,20 @@
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;
}
@@ -3583,6 +3797,22 @@
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;
@@ -3602,6 +3832,10 @@
/* 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.
diff --git a/revision.h b/revision.h
index 475f048..e6be3c8 100644
--- a/revision.h
+++ b/revision.h
@@ -34,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.
@@ -43,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
@@ -56,6 +60,8 @@
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 {
@@ -129,6 +135,7 @@
no_walk:2,
remove_empty_trees:1,
simplify_history:1,
+ show_pulls:1,
topo_order:1,
simplify_merges:1,
simplify_by_decoration:1,
@@ -181,13 +188,19 @@
unsigned int diff:1,
full_diff:1,
show_root_diff:1,
+ match_missing:1,
no_commit_id:1,
verbose_header:1,
- ignore_merges:1,
+ always_show_header:1,
+ /* Diff-merge flags */
+ explicit_diff_merges: 1,
+ merges_need_diff: 1,
+ separate_merges: 1,
combine_merges:1,
combined_all_paths:1,
+ combined_imply_patch:1,
dense_combined_merges:1,
- always_show_header:1;
+ first_parent_merges:1;
/* Format info */
int show_notes;
@@ -203,7 +216,8 @@
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,
@@ -229,6 +243,7 @@
const char *extra_headers;
const char *log_reencode;
const char *subject_prefix;
+ int patch_name_max;
int no_inline;
int show_log_size;
struct string_list *mailmap;
@@ -291,6 +306,17 @@
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);
diff --git a/run-command.c b/run-command.c
index f5e1149..be6bc12 100644
--- a/run-command.c
+++ b/run-command.c
@@ -2,23 +2,24 @@
#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"
#include "quote.h"
+#include "config.h"
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 {
@@ -263,31 +264,31 @@
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
@@ -401,7 +402,7 @@
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");
@@ -410,29 +411,29 @@
* 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) {
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;
}
@@ -550,8 +551,11 @@
while ((waiting = waitpid(pid, &status, 0)) < 0 && errno == EINTR)
; /* nothing */
- if (in_signal)
- return 0;
+ if (in_signal) {
+ if (WIFEXITED(status))
+ code = WEXITSTATUS(status);
+ return code;
+ }
if (waiting < 0) {
failed_errno = errno;
@@ -672,9 +676,9 @@
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 +746,7 @@
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 +850,10 @@
* 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 +892,7 @@
if (null_fd >= 0)
close(null_fd);
- argv_array_clear(&argv);
+ strvec_clear(&argv);
free(childenv);
}
end_of_spawn:
@@ -897,7 +901,7 @@
{
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 +939,7 @@
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);
@@ -989,6 +993,7 @@
int ret = wait_or_whine(cmd->pid, cmd->argv[0], 0);
trace2_child_exit(cmd, ret);
child_process_clear(cmd);
+ invalidate_lstat_cache();
return ret;
}
@@ -1039,6 +1044,7 @@
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;
@@ -1289,13 +1295,19 @@
int finish_async(struct async *async)
{
#ifdef NO_PTHREADS
- return wait_or_whine(async->pid, "child process", 0);
+ int ret = wait_or_whine(async->pid, "child process", 0);
+
+ invalidate_lstat_cache();
+
+ return ret;
#else
void *ret = (void *)(intptr_t)(-1);
if (pthread_join(async->tid, &ret))
error("pthread_join failed");
+ invalidate_lstat_cache();
return (int)(intptr_t)ret;
+
#endif
}
@@ -1351,9 +1363,9 @@
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;
@@ -1626,8 +1638,8 @@
pp->nr_processes = 0;
pp->output_owner = 0;
pp->shutdown = 0;
- pp->children = xcalloc(n, sizeof(*pp->children));
- pp->pfd = xcalloc(n, sizeof(*pp->pfd));
+ CALLOC_ARRAY(pp->children, n);
+ CALLOC_ARRAY(pp->pfd, n);
strbuf_init(&pp->buffered_output, 0);
for (i = 0; i < n; i++) {
@@ -1864,3 +1876,19 @@
return result;
}
+
+int run_auto_maintenance(int quiet)
+{
+ int enabled;
+ struct child_process maint = CHILD_PROCESS_INIT;
+
+ if (!git_config_get_bool("maintenance.auto", &enabled) &&
+ !enabled)
+ return 0;
+
+ 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/run-command.h b/run-command.h
index 0f3cc73..d08414a 100644
--- a/run-command.h
+++ b/run-command.h
@@ -3,7 +3,7 @@
#include "thread-utils.h"
-#include "argv-array.h"
+#include "strvec.h"
/**
* The run-command API offers a versatile tool to run sub-processes with
@@ -52,15 +52,15 @@
* 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
+ * `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;
@@ -107,7 +107,7 @@
* 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).
+ * .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).
*/
@@ -126,15 +126,22 @@
*/
unsigned silent_exec_failure:1;
- unsigned stdout_to_stderr:1;
+ /**
+ * Run the command from argv[0] using a shell (but note that we may
+ * still optimize out the shell call if the command contains no
+ * metacharacters). Note that further arguments to the command in
+ * argv[1], etc, do not need to be shell-quoted.
+ */
unsigned use_shell:1;
+
+ unsigned stdout_to_stderr:1;
unsigned clean_on_exit:1;
unsigned wait_after_clean:1;
void (*clean_on_exit_handler)(struct child_process *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,
@@ -218,12 +225,18 @@
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
diff --git a/send-pack.c b/send-pack.c
index 0407841..5f215b1 100644
--- a/send-pack.c
+++ b/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)
@@ -67,23 +68,24 @@
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;
+ po.clean_on_exit = 1;
if (start_command(&po))
die_errno("git pack-objects failed");
@@ -153,25 +155,79 @@
{
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) {
+ CALLOC_ARRAY(hint->report, 1);
+ report = hint->report;
+ } else {
+ report = hint->report;
+ while (report->next)
+ report = report->next;
+ CALLOC_ARRAY(report->next, 1);
+ 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);
@@ -179,24 +235,27 @@
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;
}
@@ -241,11 +300,17 @@
case REF_STATUS_REJECT_FETCH_FIRST:
case REF_STATUS_REJECT_NEEDS_FORCE:
case REF_STATUS_REJECT_STALE:
+ case REF_STATUS_REJECT_REMOTE_UPDATED:
case REF_STATUS_REJECT_NODELETE:
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;
}
}
@@ -322,29 +387,6 @@
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)
@@ -383,18 +425,24 @@
int use_sideband = 0;
int quiet_supported = 0;
int agent_supported = 0;
+ int advertise_sid = 0;
int use_atomic = 0;
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;
const char *push_cert_nonce = NULL;
struct packet_reader reader;
+ git_config_get_bool("transfer.advertisesid", &advertise_sid);
+
/* 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;
@@ -406,6 +454,8 @@
quiet_supported = 1;
if (server_supports("agent"))
agent_supported = 1;
+ if (!server_supports("session-id"))
+ advertise_sid = 0;
if (server_supports("no-thin"))
args->use_thin_pack = 0;
if (server_supports("atomic"))
@@ -413,6 +463,9 @@
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);
@@ -430,7 +483,7 @@
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)
@@ -443,8 +496,10 @@
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))
@@ -453,8 +508,12 @@
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());
+ if (advertise_sid)
+ strbuf_addf(&cap_buf, " session-id=%s", trace2_session_id());
/*
* NEEDSWORK: why does delete-refs have to be so specific to
@@ -465,13 +524,6 @@
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.
@@ -489,7 +541,10 @@
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:
@@ -504,31 +559,35 @@
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)
+ 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 (args->dry_run || push_cert_nonce)
- continue;
+ if (check_to_send_update(ref, args) < 0)
+ 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);
+ 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;
diff --git a/sequencer.c b/sequencer.c
index e528225..848204d 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -14,9 +14,10 @@
#include "diff.h"
#include "revision.h"
#include "rerere.h"
-#include "merge-recursive.h"
+#include "merge-ort.h"
+#include "merge-ort-wrappers.h"
#include "refs.h"
-#include "argv-array.h"
+#include "strvec.h"
#include "quote.h"
#include "trailer.h"
#include "log-tree.h"
@@ -32,6 +33,7 @@
#include "alias.h"
#include "commit-reach.h"
#include "rebase-interactive.h"
+#include "reset.h"
#define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION"
@@ -40,7 +42,7 @@
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")
@@ -119,7 +121,7 @@
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")
/*
@@ -149,6 +151,8 @@
* 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")
@@ -201,6 +205,20 @@
return 0;
}
+ if (!opts->default_strategy && !strcmp(k, "pull.twohead")) {
+ int ret = git_config_string((const char**)&opts->default_strategy, k, v);
+ if (ret == 0) {
+ /*
+ * pull.twohead is allowed to be multi-valued; we only
+ * care about the first value.
+ */
+ char *tmp = strchr(opts->default_strategy, ' ');
+ if (tmp)
+ *tmp = '\0';
+ }
+ return ret;
+ }
+
status = git_gpg_config(k, v, NULL);
if (status)
return status;
@@ -246,11 +264,20 @@
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;
@@ -303,6 +330,7 @@
}
free(opts->gpg_sign);
+ free(opts->default_strategy);
free(opts->strategy);
for (i = 0; i < opts->xopts_nr; i++)
free(opts->xopts[i]);
@@ -354,7 +382,7 @@
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;
@@ -380,7 +408,8 @@
* (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;
}
@@ -419,25 +448,15 @@
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;
}
@@ -447,7 +466,7 @@
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;
@@ -590,8 +609,9 @@
struct replay_opts *opts)
{
struct merge_options o;
+ struct merge_result result;
struct tree *next_tree, *base_tree, *head_tree;
- int clean;
+ int clean, show_output;
int i;
struct lock_file index_lock = LOCK_INIT;
@@ -615,12 +635,27 @@
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);
- if (is_rebase_i(opts) && clean <= 0)
- fputs(o.obuf.buf, stdout);
- strbuf_release(&o.obuf);
+ if (opts->strategy && !strcmp(opts->strategy, "ort")) {
+ memset(&result, 0, sizeof(result));
+ merge_incore_nonrecursive(&o, base_tree, head_tree, next_tree,
+ &result);
+ show_output = !is_rebase_i(opts) || !result.clean;
+ /*
+ * TODO: merge_switch_to_result will update index/working tree;
+ * we only really want to do that if !result.clean || this is
+ * the final patch to be picked. But determining this is the
+ * final patch would take some work, and "head_tree" would need
+ * to be replace with the tree the index matched before we
+ * started doing any picks.
+ */
+ merge_switch_to_result(&o, head_tree, &result, 1, show_output);
+ clean = result.clean;
+ } else {
+ clean = merge_trees(&o, head_tree, next_tree, base_tree);
+ if (is_rebase_i(opts) && clean <= 0)
+ fputs(o.obuf.buf, stdout);
+ strbuf_release(&o.obuf);
+ }
if (clean < 0) {
rollback_lock_file(&index_lock);
return clean;
@@ -644,9 +679,6 @@
static struct object_id *get_cache_tree_oid(struct index_state *istate)
{
- if (!istate->cache_tree)
- istate->cache_tree = cache_tree();
-
if (!cache_tree_fully_valid(istate->cache_tree))
if (cache_tree_update(istate, 0)) {
error(_("unable to update cache tree"));
@@ -839,10 +871,10 @@
/*
* 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;
@@ -850,9 +882,9 @@
&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);
@@ -872,6 +904,22 @@
return NULL;
}
+static const char *author_date_from_env_array(const struct strvec *env)
+{
+ int i;
+ const char *date;
+
+ 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[] =
N_("you have staged changes in your working tree\n"
"If these changes are meant to be squashed into the previous commit, run:\n"
@@ -892,6 +940,7 @@
#define CLEANUP_MSG (1<<3)
#define VERIFY_MSG (1<<4)
#define CREATE_ROOT_COMMIT (1<<5)
+#define VERBATIM_MSG (1<<6)
static int run_command_silent_on_success(struct child_process *cmd)
{
@@ -922,13 +971,15 @@
* 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 & CLEANUP_MSG) && (flags & VERBATIM_MSG))
+ BUG("CLEANUP_MSG and VERBATIM_MSG are mutually exclusive");
+
cmd.git_cmd = 1;
if (is_rebase_i(opts) && read_env_script(&cmd.env_array)) {
@@ -938,32 +989,44 @@
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 & VERBATIM_MSG))
+ strvec_push(&cmd.args, "--cleanup=verbatim");
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);
@@ -1315,15 +1378,19 @@
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;
+ if ((flags & CLEANUP_MSG) && (flags & VERBATIM_MSG))
+ BUG("CLEANUP_MSG and VERBATIM_MSG are mutually exclusive");
+
if (parse_head(r, ¤t_head))
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);
@@ -1393,6 +1460,8 @@
if (flags & CLEANUP_MSG)
cleanup = COMMIT_MSG_CLEANUP_ALL;
+ else if (flags & VERBATIM_MSG)
+ cleanup = COMMIT_MSG_CLEANUP_NONE;
else if ((opts->signoff || opts->record_origin) &&
!opts->explicit_cleanup)
cleanup = COMMIT_MSG_CLEANUP_SPACE;
@@ -1406,10 +1475,57 @@
goto out;
}
- reset_ident_date();
+ if (opts->committer_date_is_author_date) {
+ struct ident_split id;
+ struct strbuf date = STRBUF_INIT;
- if (commit_tree_extended(msg->buf, msg->len, &tree, parents,
- oid, author, opts->gpg_sign, extra)) {
+ 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(getenv("GIT_COMMITTER_NAME"),
+ getenv("GIT_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 (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;
}
@@ -1433,9 +1549,19 @@
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;
@@ -1452,7 +1578,8 @@
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,
@@ -1460,8 +1587,12 @@
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;
}
@@ -1564,7 +1695,7 @@
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;
}
@@ -1879,7 +2010,7 @@
if (!final_fixup)
msg_file = rebase_path_squash_msg();
else if (file_exists(rebase_path_fixup_msg())) {
- flags |= CLEANUP_MSG;
+ flags |= VERBATIM_MSG;
msg_file = rebase_path_fixup_msg();
} else {
const char *dest = git_path_squash_msg(r);
@@ -1898,7 +2029,10 @@
if (is_rebase_i(opts) && write_author_script(msg.message) < 0)
res = -1;
- else if (!opts->strategy || !strcmp(opts->strategy, "recursive") || command == TODO_REVERT) {
+ else if (!opts->strategy ||
+ !strcmp(opts->strategy, "recursive") ||
+ !strcmp(opts->strategy, "ort") ||
+ command == TODO_REVERT) {
res = do_recursive_merge(r, base, next, base_label, next_label,
&head, &msgbuf, opts);
if (res < 0)
@@ -1929,7 +2063,9 @@
* 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;
@@ -1957,7 +2093,8 @@
flags |= ALLOW_EMPTY;
} else if (allow == 2) {
drop_commit = 1;
- 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));
fprintf(stderr,
_("dropping %s %s -- patch contents already upstream\n"),
@@ -1965,13 +2102,14 @@
} /* 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(r, NULL, opts, EDIT_MSG |
+ res = run_git_commit(NULL, opts, EDIT_MSG |
VERIFY_MSG | AMEND_MSG |
(flags & ALLOW_EMPTY));
*check_todo = 1;
@@ -2295,15 +2433,19 @@
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;
@@ -2485,8 +2627,10 @@
{
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 {
@@ -2496,7 +2640,8 @@
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"))
@@ -2515,6 +2660,16 @@
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;
@@ -2525,10 +2680,11 @@
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'))) {
@@ -2538,12 +2694,16 @@
}
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_committish(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()))
@@ -2573,7 +2733,7 @@
}
int write_basic_state(struct replay_opts *opts, const char *head_name,
- struct commit *onto, const char *orig_head)
+ struct commit *onto, const struct object_id *orig_head)
{
if (head_name)
write_file(rebase_path_head_name(), "%s\n", head_name);
@@ -2581,7 +2741,8 @@
write_file(rebase_path_onto(), "%s\n",
oid_to_hex(&onto->object.oid));
if (orig_head)
- write_file(rebase_path_orig_head(), "%s\n", orig_head);
+ write_file(rebase_path_orig_head(), "%s\n",
+ oid_to_hex(orig_head));
if (opts->quiet)
write_file(rebase_path_quiet(), "%s", "");
@@ -2605,6 +2766,10 @@
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", "");
@@ -2653,8 +2818,9 @@
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) {
@@ -2736,15 +2902,15 @@
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;
}
@@ -2753,8 +2919,8 @@
{
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"));
@@ -2848,7 +3014,7 @@
*/
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())
@@ -2856,7 +3022,8 @@
}
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())
@@ -2994,15 +3161,14 @@
{
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));
@@ -3109,17 +3275,17 @@
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)
@@ -3149,7 +3315,7 @@
status = 1;
}
- argv_array_clear(&child_env);
+ strvec_clear(&child_env);
return status;
}
@@ -3290,6 +3456,7 @@
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);
@@ -3360,7 +3527,9 @@
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")) ?
+ (!opts->strategy ||
+ !strcmp(opts->strategy, "recursive") ||
+ !strcmp(opts->strategy, "ort")) ?
NULL : opts->strategy;
struct merge_options o;
int merge_arg_len, oneline_offset, can_fast_forward, ret, k;
@@ -3526,36 +3695,46 @@
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");
+ strvec_push(&cmd.args, "merge");
+ strvec_push(&cmd.args, "-s");
if (!strategy)
- argv_array_push(&cmd.args, "octopus");
+ strvec_push(&cmd.args, "octopus");
else {
- argv_array_push(&cmd.args, strategy);
+ strvec_push(&cmd.args, strategy);
for (k = 0; k < opts->xopts_nr; k++)
- argv_array_pushf(&cmd.args,
- "-X%s", opts->xopts[k]);
+ strvec_pushf(&cmd.args,
+ "-X%s", opts->xopts[k]);
}
- 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, "--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_pushf(&cmd.args, "-S%s", opts->gpg_sign);
+ else
+ strvec_push(&cmd.args, "--no-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);
ret = run_command(&cmd);
/* force re-reading of the cache */
@@ -3588,7 +3767,20 @@
o.branch2 = ref_name.buf;
o.buffer_output = 2;
- ret = merge_recursive(&o, head_commit, merge_commit, reversed, &i);
+ if (opts->strategy && !strcmp(opts->strategy, "ort")) {
+ /*
+ * TODO: Should use merge_incore_recursive() and
+ * merge_switch_to_result(), skipping the call to
+ * merge_switch_to_result() when we don't actually need to
+ * update the index and working copy immediately.
+ */
+ ret = merge_ort_recursive(&o,
+ head_commit, merge_commit, reversed,
+ &i);
+ } else {
+ ret = merge_recursive(&o, head_commit, merge_commit, reversed,
+ &i);
+ }
if (ret <= 0)
fputs(o.obuf.buf, stdout);
strbuf_release(&o.obuf);
@@ -3623,7 +3815,7 @@
* 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:
@@ -3659,59 +3851,142 @@
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 stash_sha1 = STRBUF_INIT;
+ 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 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) {
@@ -3731,9 +4006,9 @@
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);
@@ -3748,21 +4023,17 @@
static int checkout_onto(struct repository *r, struct replay_opts *opts,
const char *onto_name, const struct object_id *onto,
- const char *orig_head)
+ const struct object_id *orig_head)
{
- struct object_id oid;
const char *action = reflog_message(opts, "start", "checkout %s", onto_name);
- if (get_oid(orig_head, &oid))
- 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"));
}
- return update_ref(NULL, "ORIG_HEAD", &oid, NULL, 0, UPDATE_REFS_MSG_ON_ERR);
+ return update_ref(NULL, "ORIG_HEAD", orig_head, NULL, 0, UPDATE_REFS_MSG_ON_ERR);
}
static int stopped_at_head(struct repository *r)
@@ -3799,11 +4070,16 @@
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;
@@ -3825,7 +4101,7 @@
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");
@@ -3845,12 +4121,14 @@
}
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),
&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),
@@ -4052,9 +4330,9 @@
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);
@@ -4065,19 +4343,19 @@
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);
}
@@ -4096,8 +4374,8 @@
{
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);
}
@@ -4213,15 +4491,16 @@
}
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());
@@ -4274,8 +4553,9 @@
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;
@@ -4289,8 +4569,9 @@
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);
}
@@ -4591,6 +4872,7 @@
struct rev_info *revs, struct strbuf *out,
unsigned flags)
{
+ int keep_empty = flags & TODO_LIST_KEEP_EMPTY;
int rebase_cousins = flags & TODO_LIST_REBASE_COUSINS;
int root_with_onto = flags & TODO_LIST_ROOT_WITH_ONTO;
struct strbuf buf = STRBUF_INIT, oneline = STRBUF_INIT;
@@ -4645,6 +4927,8 @@
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);
@@ -4656,6 +4940,9 @@
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);
@@ -4806,7 +5093,7 @@
oidmap_free(&commit2todo, 1);
oidmap_free(&state.commit2label, 1);
- hashmap_free_entries(&state.labels, struct labels_entry, entry);
+ hashmap_clear_and_free(&state.labels, struct labels_entry, entry);
strbuf_release(&state.buf);
return 0;
@@ -4819,14 +5106,16 @@
struct pretty_print_context pp = {0};
struct rev_info revs;
struct commit *commit;
+ int keep_empty = flags & TODO_LIST_KEEP_EMPTY;
const char *insn = flags & TODO_LIST_ABBREVIATE_CMDS ? "p" : "pick";
int rebase_merges = flags & TODO_LIST_REBASE_MERGES;
+ 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;
@@ -4858,9 +5147,13 @@
if (!is_empty && (commit->object.flags & PATCHSAME))
continue;
+ 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;
@@ -4878,7 +5171,7 @@
int i, insert, nr = 0, alloc = 0;
struct todo_item *items = NULL, *base_items = NULL;
- base_items = xcalloc(commands->nr, sizeof(struct todo_item));
+ CALLOC_ARRAY(base_items, commands->nr);
for (i = 0; i < commands->nr; i++) {
size_t command_len = strlen(commands->items[i].string);
@@ -4947,6 +5240,8 @@
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,
@@ -4955,8 +5250,9 @@
}
/* 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));
@@ -5053,17 +5349,18 @@
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 commit *onto, const struct object_id *orig_head,
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, 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);
@@ -5079,7 +5376,7 @@
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"));
@@ -5090,12 +5387,12 @@
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);
@@ -5264,10 +5561,13 @@
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)) {
@@ -5309,9 +5609,30 @@
for (i = 0; i < todo_list->nr; i++)
free(subjects[i]);
free(subjects);
- hashmap_free_entries(&subject2item, struct subject2item_entry, entry);
+ hashmap_clear_and_free(&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/sequencer.h b/sequencer.h
index 718a074..f8b2e4a 100644
--- a/sequencer.h
+++ b/sequencer.h
@@ -3,12 +3,12 @@
#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);
@@ -45,6 +45,8 @@
int verbose;
int quiet;
int reschedule_failed_exec;
+ int committer_date_is_author_date;
+ int ignore_date;
int mainline;
@@ -53,6 +55,7 @@
int explicit_cleanup;
/* Merge strategy */
+ char *default_strategy; /* from config options */
char *strategy;
char **xopts;
size_t xopts_nr, xopts_alloc;
@@ -134,7 +137,7 @@
int sequencer_skip(struct repository *repo, struct replay_opts *opts);
int sequencer_remove_state(struct replay_opts *opts);
-/* #define TODO_LIST_KEEP_EMPTY (1U << 0) */ /* No longer used */
+#define TODO_LIST_KEEP_EMPTY (1U << 0)
#define TODO_LIST_SHORTEN_IDS (1U << 1)
#define TODO_LIST_ABBREVIATE_CMDS (1U << 2)
#define TODO_LIST_REBASE_MERGES (1U << 3)
@@ -150,7 +153,7 @@
* `--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);
@@ -159,8 +162,9 @@
struct string_list *commands);
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,
- unsigned autosquash, struct todo_list *todo_list);
+ struct commit *onto, const struct object_id *orig_head,
+ struct string_list *commands, unsigned autosquash,
+ struct todo_list *todo_list);
int todo_list_rearrange_squash(struct todo_list *todo_list);
/*
@@ -191,6 +195,12 @@
const struct commit *current_head,
const struct object_id *new_head);
+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)
void print_commit_summary(struct repository *repo,
@@ -198,12 +208,27 @@
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);
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);
+ struct commit *onto, const struct object_id *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/serve.c b/serve.c
index 317256c..ac20c72 100644
--- a/serve.c
+++ b/serve.c
@@ -3,11 +3,13 @@
#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"
+static int advertise_sid;
+
static int always_advertise(struct repository *r,
struct strbuf *value)
{
@@ -22,6 +24,23 @@
return 1;
}
+static int object_format_advertise(struct repository *r,
+ struct strbuf *value)
+{
+ if (value)
+ strbuf_addstr(value, r->hash_algo->name);
+ return 1;
+}
+
+static int session_id_advertise(struct repository *r, struct strbuf *value)
+{
+ if (!advertise_sid)
+ return 0;
+ if (value)
+ strbuf_addstr(value, trace2_session_id());
+ return 1;
+}
+
struct protocol_capability {
/*
* The name of the capability. The server uses this name when
@@ -48,15 +67,17 @@
* 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);
};
static struct protocol_capability capabilities[] = {
{ "agent", agent_advertise, NULL },
- { "ls-refs", always_advertise, ls_refs },
+ { "ls-refs", ls_refs_advertise, ls_refs },
{ "fetch", upload_pack_advertise, upload_pack_v2 },
{ "server-option", always_advertise, NULL },
+ { "object-format", object_format_advertise, NULL },
+ { "session-id", session_id_advertise, NULL },
};
static void advertise_capabilities(void)
@@ -133,13 +154,13 @@
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 +174,22 @@
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,8 +199,9 @@
{
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;
+ const char *client_sid;
packet_reader_init(&reader, 0, NULL, 0,
PACKET_READ_CHOMP_NEWLINE |
@@ -186,7 +224,7 @@
/* 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 +236,7 @@
* 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,21 +255,30 @@
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);
+
+ if (has_capability(&keys, "session-id", &client_sid))
+ trace2_data_string("transfer", NULL, "client-sid", client_sid);
+
command->command(the_repository, &keys, &reader);
- argv_array_clear(&keys);
+ strvec_clear(&keys);
return 0;
}
/* Main serve loop for protocol version 2 */
void serve(struct serve_options *options)
{
+ git_config_get_bool("transfer.advertisesid", &advertise_sid);
+
if (options->advertise_capabilities || !options->stateless_rpc) {
/* serve by default supports v2 */
packet_write_fmt(1, "version 2\n");
diff --git a/serve.h b/serve.h
index 42ddca7..fc2683e 100644
--- a/serve.h
+++ b/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/server-info.c b/server-info.c
index bae2cdf..de0aa44 100644
--- a/server-info.c
+++ b/server-info.c
@@ -296,7 +296,7 @@
i = num_pack++;
ALLOC_GROW(info, num_pack, alloc);
- info[i] = xcalloc(1, sizeof(struct pack_info));
+ CALLOC_ARRAY(info[i], 1);
info[i]->p = p;
info[i]->old_num = -1;
}
diff --git a/setup.c b/setup.c
index 5ea9285..c04cd25 100644
--- a/setup.c
+++ b/setup.c
@@ -32,6 +32,7 @@
char *path0;
int off;
const char *work_tree = get_git_work_tree();
+ struct strbuf realpath = STRBUF_INIT;
if (!work_tree)
return -1;
@@ -60,8 +61,10 @@
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 = '/';
@@ -69,11 +72,14 @@
}
/* 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;
}
@@ -441,6 +447,63 @@
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;
@@ -449,23 +512,25 @@
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);
@@ -504,6 +569,7 @@
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) {
/*
@@ -532,6 +598,37 @@
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;
@@ -551,6 +648,7 @@
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);
@@ -576,6 +674,18 @@
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;
}
@@ -623,6 +733,7 @@
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 */
@@ -673,7 +784,9 @@
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)
@@ -729,7 +842,7 @@
}
/* #18, #26 */
- set_git_dir(gitdirenv);
+ set_git_dir(gitdirenv, 0);
free(gitfile);
return NULL;
}
@@ -751,7 +864,7 @@
}
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;
}
@@ -763,14 +876,14 @@
/* 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, '/');
@@ -779,7 +892,7 @@
}
/* cwd outside worktree */
- set_git_dir(gitdirenv);
+ set_git_dir(gitdirenv, 0);
free(gitfile);
return NULL;
}
@@ -808,7 +921,7 @@
/* #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;
@@ -817,7 +930,7 @@
/* #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)
@@ -860,10 +973,10 @@
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;
}
@@ -881,7 +994,7 @@
/*
* 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.
@@ -1257,11 +1370,14 @@
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/sha256/gcrypt.h b/sha256/gcrypt.h
index 09bd8bb..501da5e 100644
--- a/sha256/gcrypt.h
+++ b/sha256/gcrypt.h
@@ -22,8 +22,14 @@
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/shallow.c b/shallow.c
index 7fd04af..9ed18eb 100644
--- a/shallow.c
+++ b/shallow.c
@@ -8,12 +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 "list-objects.h"
#include "commit-reach.h"
+#include "shallow.h"
void set_alternate_shallow_file(struct repository *r, const char *path, int override)
{
@@ -38,15 +39,21 @@
return register_commit_graft(r, graft, 0);
}
+int unregister_shallow(const struct object_id *oid)
+{
+ int pos = commit_graft_pos(the_repository, oid);
+ 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)
{
- /*
- * 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.
- */
-
FILE *fp;
char buf[1024];
const char *path = r->parsed_objects->alternate_shallow_file;
@@ -79,11 +86,34 @@
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)
{
@@ -150,15 +180,7 @@
}
}
}
- for (i = 0; i < depths.slab_count; i++) {
- int j;
-
- if (!depths.slab[i])
- continue;
- for (j = 0; j < depths.slab_size; j++)
- free(depths.slab[i][j]);
- }
- clear_commit_depth(&depths);
+ deep_clear_commit_depth(&depths, free_depth_in_slab);
return result;
}
@@ -340,22 +362,22 @@
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
@@ -388,7 +410,7 @@
*/
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;
@@ -402,18 +424,18 @@
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/shallow.h b/shallow.h
new file mode 100644
index 0000000..5b4a96d
--- /dev/null
+++ b/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/shell.c b/shell.c
index 54cca74..cef7ffd 100644
--- a/shell.c
+++ b/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"
@@ -76,12 +77,11 @@
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/shortlog.h b/shortlog.h
index 2fa61c4..3f7e9aa 100644
--- a/shortlog.h
+++ b/shortlog.h
@@ -15,9 +15,14 @@
int in2;
int user_format;
int abbrev;
- int committer;
- char *common_repo_prefix;
+ enum {
+ SHORTLOG_GROUP_AUTHOR = (1 << 0),
+ SHORTLOG_GROUP_COMMITTER = (1 << 1),
+ SHORTLOG_GROUP_TRAILER = (1 << 2),
+ } groups;
+ struct string_list trailers;
+
int email;
struct string_list mailmap;
FILE *file;
diff --git a/sideband.c b/sideband.c
index ef85111..6f9e026 100644
--- a/sideband.c
+++ b/sideband.c
@@ -3,6 +3,7 @@
#include "config.h"
#include "sideband.h"
#include "help.h"
+#include "pkt-line.h"
struct keyword_entry {
/*
@@ -114,7 +115,8 @@
#define ANSI_SUFFIX "\033[K"
#define DUMB_SUFFIX " "
-int demultiplex_sideband(const char *me, char *buf, int len,
+int demultiplex_sideband(const char *me, int status,
+ char *buf, int len,
int die_on_error,
struct strbuf *scratch,
enum sideband_type *sideband_type)
@@ -130,24 +132,37 @@
suffix = DUMB_SUFFIX;
}
- if (len == 0) {
- *sideband_type = SIDEBAND_FLUSH;
- goto cleanup;
- }
- if (len < 1) {
+ if (status == PACKET_READ_EOF) {
strbuf_addf(scratch,
- "%s%s: protocol error: no band designator",
+ "%s%s: unexpected disconnect while reading sideband packet",
scratch->len ? "\n" : "", me);
*sideband_type = SIDEBAND_PROTOCOL_ERROR;
goto cleanup;
}
+
+ if (len < 0)
+ BUG("negative length on non-eof packet read");
+
+ if (len == 0) {
+ if (status == PACKET_READ_NORMAL) {
+ strbuf_addf(scratch,
+ "%s%s: protocol error: missing sideband designator",
+ scratch->len ? "\n" : "", me);
+ *sideband_type = SIDEBAND_PROTOCOL_ERROR;
+ } else {
+ /* covers flush, delim, etc */
+ *sideband_type = SIDEBAND_FLUSH;
+ }
+ goto cleanup;
+ }
+
band = buf[0] & 0xff;
buf[len] = '\0';
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);
@@ -190,7 +205,7 @@
return 0;
case 1:
*sideband_type = SIDEBAND_PRIMARY;
- break;
+ return 1;
default:
strbuf_addf(scratch, "%s%s: protocol error: bad band #%d",
scratch->len ? "\n" : "", me, band);
diff --git a/sideband.h b/sideband.h
index 227740a..5a25331 100644
--- a/sideband.h
+++ b/sideband.h
@@ -18,8 +18,12 @@
*
* scratch must be a struct strbuf allocated by the caller. It is used to store
* progress messages split across multiple packets.
+ *
+ * The "status" parameter is a pkt-line response as returned by
+ * packet_read_with_status() (e.g., PACKET_READ_NORMAL).
*/
-int demultiplex_sideband(const char *me, char *buf, int len,
+int demultiplex_sideband(const char *me, int status,
+ char *buf, int len,
int die_on_error,
struct strbuf *scratch,
enum sideband_type *sideband_type);
diff --git a/split-index.c b/split-index.c
index e6154e4..94937d2 100644
--- a/split-index.c
+++ b/split-index.c
@@ -5,7 +5,7 @@
struct split_index *init_split_index(struct index_state *istate)
{
if (!istate->split_index) {
- istate->split_index = xcalloc(1, sizeof(*istate->split_index));
+ CALLOC_ARRAY(istate->split_index, 1);
istate->split_index->refcount = 1;
}
return istate->split_index;
@@ -79,13 +79,15 @@
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);
}
- si->base = xcalloc(1, sizeof(*si->base));
+ CALLOC_ARRAY(si->base, 1);
si->base->version = istate->version;
/* zero timestamp disables racy test in ce_write_index() */
si->base->timestamp = istate->timestamp;
diff --git a/strbuf.c b/strbuf.c
index bb0065c..e3397cc 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -479,15 +479,17 @@
}
}
-#define URL_UNSAFE_CHARS " <>\"%{}|\\^`:/?#[]@!$&'()*+,;="
+#define URL_UNSAFE_CHARS " <>\"%{}|\\^`:?#[]@!$&'()*+,;="
-void strbuf_add_percentencode(struct strbuf *dst, const char *src)
+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 || strchr(URL_UNSAFE_CHARS, ch))
+ 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);
@@ -554,7 +556,6 @@
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)
@@ -690,6 +691,16 @@
}
#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))
diff --git a/strbuf.h b/strbuf.h
index ce8e49c..223ee20 100644
--- a/strbuf.h
+++ b/strbuf.h
@@ -378,11 +378,16 @@
*/
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);
+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,
@@ -503,6 +508,12 @@
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
diff --git a/strmap.c b/strmap.c
new file mode 100644
index 0000000..4fb9f61
--- /dev/null
+++ b/strmap.c
@@ -0,0 +1,178 @@
+#include "git-compat-util.h"
+#include "strmap.h"
+#include "mem-pool.h"
+
+int cmp_strmap_entry(const void *hashmap_cmp_fn_data,
+ const struct hashmap_entry *entry1,
+ const struct hashmap_entry *entry2,
+ const void *keydata)
+{
+ const struct strmap_entry *e1, *e2;
+
+ e1 = container_of(entry1, const struct strmap_entry, ent);
+ e2 = container_of(entry2, const struct strmap_entry, ent);
+ return strcmp(e1->key, e2->key);
+}
+
+static struct strmap_entry *find_strmap_entry(struct strmap *map,
+ const char *str)
+{
+ struct strmap_entry entry;
+ hashmap_entry_init(&entry.ent, strhash(str));
+ entry.key = str;
+ return hashmap_get_entry(&map->map, &entry, ent, NULL);
+}
+
+void strmap_init(struct strmap *map)
+{
+ strmap_init_with_options(map, NULL, 1);
+}
+
+void strmap_init_with_options(struct strmap *map,
+ struct mem_pool *pool,
+ int strdup_strings)
+{
+ hashmap_init(&map->map, cmp_strmap_entry, NULL, 0);
+ map->pool = pool;
+ map->strdup_strings = strdup_strings;
+}
+
+static void strmap_free_entries_(struct strmap *map, int free_values)
+{
+ struct hashmap_iter iter;
+ struct strmap_entry *e;
+
+ if (!map)
+ return;
+
+ if (!free_values && map->pool)
+ /* Memory other than util is owned by and freed with the pool */
+ return;
+
+ /*
+ * We need to iterate over the hashmap entries and free
+ * e->key and e->value ourselves; hashmap has no API to
+ * take care of that for us. Since we're already iterating over
+ * the hashmap, though, might as well free e too and avoid the need
+ * to make some call into the hashmap API to do that.
+ */
+ hashmap_for_each_entry(&map->map, &iter, e, ent) {
+ if (free_values)
+ free(e->value);
+ if (!map->pool)
+ free(e);
+ }
+}
+
+void strmap_clear(struct strmap *map, int free_values)
+{
+ strmap_free_entries_(map, free_values);
+ hashmap_clear(&map->map);
+}
+
+void strmap_partial_clear(struct strmap *map, int free_values)
+{
+ strmap_free_entries_(map, free_values);
+ hashmap_partial_clear(&map->map);
+}
+
+static struct strmap_entry *create_entry(struct strmap *map,
+ const char *str,
+ void *data)
+{
+ struct strmap_entry *entry;
+
+ if (map->strdup_strings) {
+ if (!map->pool) {
+ FLEXPTR_ALLOC_STR(entry, key, str);
+ } else {
+ size_t len = st_add(strlen(str), 1); /* include NUL */
+ entry = mem_pool_alloc(map->pool,
+ st_add(sizeof(*entry), len));
+ memcpy(entry + 1, str, len);
+ entry->key = (void *)(entry + 1);
+ }
+ } else if (!map->pool) {
+ entry = xmalloc(sizeof(*entry));
+ } else {
+ entry = mem_pool_alloc(map->pool, sizeof(*entry));
+ }
+ hashmap_entry_init(&entry->ent, strhash(str));
+ if (!map->strdup_strings)
+ entry->key = str;
+ entry->value = data;
+ return entry;
+}
+
+void *strmap_put(struct strmap *map, const char *str, void *data)
+{
+ struct strmap_entry *entry = find_strmap_entry(map, str);
+
+ if (entry) {
+ void *old = entry->value;
+ entry->value = data;
+ return old;
+ }
+
+ entry = create_entry(map, str, data);
+ hashmap_add(&map->map, &entry->ent);
+ return NULL;
+}
+
+struct strmap_entry *strmap_get_entry(struct strmap *map, const char *str)
+{
+ return find_strmap_entry(map, str);
+}
+
+void *strmap_get(struct strmap *map, const char *str)
+{
+ struct strmap_entry *entry = find_strmap_entry(map, str);
+ return entry ? entry->value : NULL;
+}
+
+int strmap_contains(struct strmap *map, const char *str)
+{
+ return find_strmap_entry(map, str) != NULL;
+}
+
+void strmap_remove(struct strmap *map, const char *str, int free_value)
+{
+ struct strmap_entry entry, *ret;
+ hashmap_entry_init(&entry.ent, strhash(str));
+ entry.key = str;
+ ret = hashmap_remove_entry(&map->map, &entry, ent, NULL);
+ if (!ret)
+ return;
+ if (free_value)
+ free(ret->value);
+ if (!map->pool)
+ free(ret);
+}
+
+void strintmap_incr(struct strintmap *map, const char *str, intptr_t amt)
+{
+ struct strmap_entry *entry = find_strmap_entry(&map->map, str);
+ if (entry) {
+ intptr_t *whence = (intptr_t*)&entry->value;
+ *whence += amt;
+ }
+ else
+ strintmap_set(map, str, map->default_value + amt);
+}
+
+int strset_add(struct strset *set, const char *str)
+{
+ /*
+ * Cannot use strmap_put() because it'll return NULL in both cases:
+ * - cannot find str: NULL means "not found"
+ * - does find str: NULL is the value associated with str
+ */
+ struct strmap_entry *entry = find_strmap_entry(&set->map, str);
+
+ if (entry)
+ return 0;
+
+ entry = create_entry(&set->map, str, NULL);
+ hashmap_add(&set->map.map, &entry->ent);
+ return 1;
+}
diff --git a/strmap.h b/strmap.h
new file mode 100644
index 0000000..1e152d8
--- /dev/null
+++ b/strmap.h
@@ -0,0 +1,268 @@
+#ifndef STRMAP_H
+#define STRMAP_H
+
+#include "hashmap.h"
+
+struct mem_pool;
+struct strmap {
+ struct hashmap map;
+ struct mem_pool *pool;
+ unsigned int strdup_strings:1;
+};
+
+struct strmap_entry {
+ struct hashmap_entry ent;
+ const char *key;
+ void *value;
+ /* strmap_entry may be allocated extra space to store the key at end */
+};
+
+int cmp_strmap_entry(const void *hashmap_cmp_fn_data,
+ const struct hashmap_entry *entry1,
+ const struct hashmap_entry *entry2,
+ const void *keydata);
+
+#define STRMAP_INIT { \
+ .map = HASHMAP_INIT(cmp_strmap_entry, NULL), \
+ .strdup_strings = 1, \
+ }
+#define STRINTMAP_INIT { \
+ .map = STRMAP_INIT, \
+ .default_value = 0, \
+ }
+#define STRSET_INIT { .map = STRMAP_INIT }
+
+/*
+ * Initialize the members of the strmap. Any keys added to the strmap will
+ * be strdup'ed with their memory managed by the strmap.
+ */
+void strmap_init(struct strmap *map);
+
+/*
+ * Same as strmap_init, but for those who want to control the memory management
+ * carefully instead of using the default of strdup_strings=1 and pool=NULL.
+ */
+void strmap_init_with_options(struct strmap *map,
+ struct mem_pool *pool,
+ int strdup_strings);
+
+/*
+ * Remove all entries from the map, releasing any allocated resources.
+ */
+void strmap_clear(struct strmap *map, int free_values);
+
+/*
+ * Similar to strmap_clear() but leaves map->map->table allocated and
+ * pre-sized so that subsequent uses won't need as many rehashings.
+ */
+void strmap_partial_clear(struct strmap *map, int free_values);
+
+/*
+ * Insert "str" into the map, pointing to "data".
+ *
+ * If an entry for "str" already exists, its data pointer is overwritten, and
+ * the original data pointer returned. Otherwise, returns NULL.
+ */
+void *strmap_put(struct strmap *map, const char *str, void *data);
+
+/*
+ * Return the strmap_entry mapped by "str", or NULL if there is not such
+ * an item in map.
+ */
+struct strmap_entry *strmap_get_entry(struct strmap *map, const char *str);
+
+/*
+ * Return the data pointer mapped by "str", or NULL if the entry does not
+ * exist.
+ */
+void *strmap_get(struct strmap *map, const char *str);
+
+/*
+ * Return non-zero iff "str" is present in the map. This differs from
+ * strmap_get() in that it can distinguish entries with a NULL data pointer.
+ */
+int strmap_contains(struct strmap *map, const char *str);
+
+/*
+ * Remove the given entry from the strmap. If the string isn't in the
+ * strmap, the map is not altered.
+ */
+void strmap_remove(struct strmap *map, const char *str, int free_value);
+
+/*
+ * Return how many entries the strmap has.
+ */
+static inline unsigned int strmap_get_size(struct strmap *map)
+{
+ return hashmap_get_size(&map->map);
+}
+
+/*
+ * Return whether the strmap is empty.
+ */
+static inline int strmap_empty(struct strmap *map)
+{
+ return strmap_get_size(map) == 0;
+}
+
+/*
+ * iterate through @map using @iter, @var is a pointer to a type strmap_entry
+ */
+#define strmap_for_each_entry(mystrmap, iter, var) \
+ hashmap_for_each_entry(&(mystrmap)->map, iter, var, ent)
+
+
+/*
+ * strintmap:
+ * A map of string -> int, typecasting the void* of strmap to an int.
+ *
+ * Primary differences:
+ * 1) Since the void* value is just an int in disguise, there is no value
+ * to free. (Thus one fewer argument to strintmap_clear)
+ * 2) strintmap_get() returns an int, or returns the default_value if the
+ * key is not found in the strintmap.
+ * 3) No strmap_put() equivalent; strintmap_set() and strintmap_incr()
+ * instead.
+ */
+
+struct strintmap {
+ struct strmap map;
+ int default_value;
+};
+
+#define strintmap_for_each_entry(mystrmap, iter, var) \
+ strmap_for_each_entry(&(mystrmap)->map, iter, var)
+
+static inline void strintmap_init(struct strintmap *map, int default_value)
+{
+ strmap_init(&map->map);
+ map->default_value = default_value;
+}
+
+static inline void strintmap_init_with_options(struct strintmap *map,
+ int default_value,
+ struct mem_pool *pool,
+ int strdup_strings)
+{
+ strmap_init_with_options(&map->map, pool, strdup_strings);
+ map->default_value = default_value;
+}
+
+static inline void strintmap_clear(struct strintmap *map)
+{
+ strmap_clear(&map->map, 0);
+}
+
+static inline void strintmap_partial_clear(struct strintmap *map)
+{
+ strmap_partial_clear(&map->map, 0);
+}
+
+static inline int strintmap_contains(struct strintmap *map, const char *str)
+{
+ return strmap_contains(&map->map, str);
+}
+
+static inline void strintmap_remove(struct strintmap *map, const char *str)
+{
+ strmap_remove(&map->map, str, 0);
+}
+
+static inline int strintmap_empty(struct strintmap *map)
+{
+ return strmap_empty(&map->map);
+}
+
+static inline unsigned int strintmap_get_size(struct strintmap *map)
+{
+ return strmap_get_size(&map->map);
+}
+
+/*
+ * Returns the value for str in the map. If str isn't found in the map,
+ * the map's default_value is returned.
+ */
+static inline int strintmap_get(struct strintmap *map, const char *str)
+{
+ struct strmap_entry *result = strmap_get_entry(&map->map, str);
+ if (!result)
+ return map->default_value;
+ return (intptr_t)result->value;
+}
+
+static inline void strintmap_set(struct strintmap *map, const char *str,
+ intptr_t v)
+{
+ strmap_put(&map->map, str, (void *)v);
+}
+
+/*
+ * Increment the value for str by amt. If str isn't in the map, add it and
+ * set its value to default_value + amt.
+ */
+void strintmap_incr(struct strintmap *map, const char *str, intptr_t amt);
+
+/*
+ * strset:
+ * A set of strings.
+ *
+ * Primary differences with strmap:
+ * 1) The value is always NULL, and ignored. As there is no value to free,
+ * there is one fewer argument to strset_clear
+ * 2) No strset_get() because there is no value.
+ * 3) No strset_put(); use strset_add() instead.
+ */
+
+struct strset {
+ struct strmap map;
+};
+
+#define strset_for_each_entry(mystrset, iter, var) \
+ strmap_for_each_entry(&(mystrset)->map, iter, var)
+
+static inline void strset_init(struct strset *set)
+{
+ strmap_init(&set->map);
+}
+
+static inline void strset_init_with_options(struct strset *set,
+ struct mem_pool *pool,
+ int strdup_strings)
+{
+ strmap_init_with_options(&set->map, pool, strdup_strings);
+}
+
+static inline void strset_clear(struct strset *set)
+{
+ strmap_clear(&set->map, 0);
+}
+
+static inline void strset_partial_clear(struct strset *set)
+{
+ strmap_partial_clear(&set->map, 0);
+}
+
+static inline int strset_contains(struct strset *set, const char *str)
+{
+ return strmap_contains(&set->map, str);
+}
+
+static inline void strset_remove(struct strset *set, const char *str)
+{
+ strmap_remove(&set->map, str, 0);
+}
+
+static inline int strset_empty(struct strset *set)
+{
+ return strmap_empty(&set->map);
+}
+
+static inline unsigned int strset_get_size(struct strset *set)
+{
+ return strmap_get_size(&set->map);
+}
+
+/* Returns 1 if str is added to the set; returns 0 if str was already in set */
+int strset_add(struct strset *set, const char *str);
+
+#endif /* STRMAP_H */
diff --git a/strvec.c b/strvec.c
new file mode 100644
index 0000000..21dce0a
--- /dev/null
+++ b/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/strvec.h b/strvec.h
new file mode 100644
index 0000000..fdcad75
--- /dev/null
+++ b/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/sub-process.c b/sub-process.c
index 1b1af9d..dfa790d 100644
--- a/sub-process.c
+++ b/sub-process.c
@@ -84,7 +84,7 @@
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;
diff --git a/submodule-config.c b/submodule-config.c
index 4d1c92d..f502505 100644
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -103,8 +103,8 @@
ent /* member name */)
free_one_config(entry);
- hashmap_free_entries(&cache->for_path, struct submodule_entry, ent);
- hashmap_free_entries(&cache->for_name, struct submodule_entry, ent);
+ hashmap_clear_and_free(&cache->for_path, struct submodule_entry, ent);
+ hashmap_clear_and_free(&cache->for_name, struct submodule_entry, ent);
cache->initialized = 0;
cache->gitmodules_read = 0;
}
@@ -225,7 +225,8 @@
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)
@@ -776,10 +777,14 @@
{
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/submodule.c b/submodule.c
index 31f391d..9767ba9 100644
--- a/submodule.c
+++ b/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"
@@ -194,7 +194,7 @@
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 @@
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;
}
@@ -420,6 +420,7 @@
void handle_ignore_submodules_arg(struct diff_options *diffopt,
const char *arg)
{
+ diffopt->flags.ignore_submodule_set = 1;
diffopt->flags.ignore_submodules = 0;
diffopt->flags.ignore_untracked_in_submodules = 0;
diffopt->flags.ignore_dirty_submodules = 0;
@@ -438,13 +439,14 @@
*/
}
-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 +461,7 @@
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 +483,27 @@
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 +612,7 @@
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 +634,12 @@
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 +683,22 @@
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 +706,7 @@
* 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))
@@ -836,13 +838,20 @@
*/
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"));
@@ -857,7 +866,8 @@
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 +889,8 @@
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 +951,9 @@
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 +992,9 @@
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;
@@ -1012,13 +1022,13 @@
{
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 +1051,7 @@
}
free_submodules_oids(&submodules);
- argv_array_clear(&argv);
+ strvec_clear(&argv);
return needs_pushing->nr;
}
@@ -1054,22 +1064,22 @@
{
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 +1105,13 @@
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;
@@ -1189,17 +1199,17 @@
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 +1241,7 @@
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 +1252,24 @@
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 +1277,7 @@
struct submodule_parallel_fetch {
int count;
- struct argv_array args;
+ struct strvec args;
struct repository *r;
const char *prefix;
int command_line_option;
@@ -1283,7 +1293,7 @@
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, STRBUF_INIT}
@@ -1299,7 +1309,7 @@
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);
@@ -1452,15 +1462,15 @@
if (!spf->quiet)
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;
@@ -1468,6 +1478,7 @@
strbuf_release(&submodule_prefix);
return 1;
} else {
+ struct strbuf empty_submodule_path = STRBUF_INIT;
fetch_task_release(task);
free(task);
@@ -1476,13 +1487,17 @@
* An empty directory is normal,
* the submodule is not initialized
*/
+ strbuf_addf(&empty_submodule_path, "%s/%s/",
+ spf->r->worktree,
+ ce->name);
if (S_ISGITLINK(ce->ce_mode) &&
- !is_empty_dir(ce->name)) {
+ !is_empty_dir(empty_submodule_path.buf)) {
spf->result = 1;
strbuf_addf(err,
_("Could not access submodule '%s'\n"),
ce->name);
}
+ strbuf_release(&empty_submodule_path);
}
}
@@ -1500,14 +1515,14 @@
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);
@@ -1598,7 +1613,7 @@
}
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)
@@ -1618,10 +1633,10 @@
if (repo_read_index(r) < 0)
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);
@@ -1638,7 +1653,7 @@
spf.submodules_with_errors.buf);
- argv_array_clear(&spf.args);
+ strvec_clear(&spf.args);
out:
free_submodules_oids(&spf.changed_submodule_names);
return spf.result;
@@ -1666,9 +1681,9 @@
}
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;
@@ -1726,14 +1741,6 @@
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;
@@ -1746,7 +1753,10 @@
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;
@@ -1779,16 +1789,16 @@
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;
@@ -1846,8 +1856,8 @@
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;
@@ -1866,11 +1876,11 @@
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"));
@@ -1947,24 +1957,24 @@
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);
@@ -1980,8 +1990,8 @@
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;
@@ -2157,9 +2167,9 @@
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);
@@ -2168,13 +2178,13 @@
}
}
-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;
@@ -2185,19 +2195,20 @@
* 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;
@@ -2231,7 +2242,8 @@
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);
@@ -2240,10 +2252,10 @@
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/submodule.h b/submodule.h
index c81ec1a..4ac6e31 100644
--- a/submodule.h
+++ b/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 @@
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 @@
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,
@@ -143,7 +143,7 @@
* 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,
@@ -152,8 +152,8 @@
/*
* 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/symlinks.c b/symlinks.c
index 69d458a..7dbb6b2 100644
--- a/symlinks.c
+++ b/symlinks.c
@@ -267,6 +267,13 @@
*/
static int threaded_has_dirs_only_path(struct cache_def *cache, const char *name, int len, int prefix_len)
{
+ /*
+ * Note: this function is used by the checkout machinery, which also
+ * takes care to properly reset the cache when it performs an operation
+ * that would leave the cache outdated. If this function starts caching
+ * anything else besides FL_DIR, remember to also invalidate the cache
+ * when creating or deleting paths that might be in the cache.
+ */
return lstat_cache(cache, name, len,
FL_DIR|FL_FULLPATH, prefix_len) &
FL_DIR;
@@ -321,3 +328,20 @@
{
do_remove_scheduled_dirs(0);
}
+
+void invalidate_lstat_cache(void)
+{
+ reset_lstat_cache(&default_cache);
+}
+
+#undef rmdir
+int lstat_cache_aware_rmdir(const char *path)
+{
+ /* Any change in this function must be made also in `mingw_rmdir()` */
+ int ret = rmdir(path);
+
+ if (!ret)
+ invalidate_lstat_cache();
+
+ return ret;
+}
diff --git a/t/.gitattributes b/t/.gitattributes
index df05434..dafa17c 100644
--- a/t/.gitattributes
+++ b/t/.gitattributes
@@ -1,13 +1,13 @@
t[0-9][0-9][0-9][0-9]/* -whitespace
/chainlint/*.expect eol=lf
-/diff-lib/* eol=lf
+/lib-diff/* eol=lf
/t0110/url-* binary
/t3206/* eol=lf
/t3900/*.txt eol=lf
/t3901/*.txt eol=lf
-/t4034/*/* eol=lf
/t4013/* eol=lf
/t4018/* eol=lf
+/t4034/*/* eol=lf
/t4051/* eol=lf
/t4100/* eol=lf
/t4101/* eol=lf
diff --git a/t/Makefile b/t/Makefile
index c83fd18..882d26e 100644
--- a/t/Makefile
+++ b/t/Makefile
@@ -34,6 +34,7 @@
T = $(sort $(wildcard t[0-9][0-9][0-9][0-9]-*.sh))
TGITWEB = $(sort $(wildcard t95[0-9][0-9]-*.sh))
THELPERS = $(sort $(filter-out $(T),$(wildcard *.sh)))
+TPERF = $(sort $(wildcard perf/p[0-9][0-9][0-9][0-9]-*.sh))
CHAINLINTTESTS = $(sort $(patsubst chainlint/%.test,%,$(wildcard chainlint/*.test)))
CHAINLINT = sed -f chainlint.sed
@@ -81,17 +82,17 @@
test-lint-filenames
test-lint-duplicates:
- @dups=`echo $(T) | tr ' ' '\n' | sed 's/-.*//' | sort | uniq -d` && \
+ @dups=`echo $(T) $(TPERF) | tr ' ' '\n' | sed 's/-.*//' | sort | uniq -d` && \
test -z "$$dups" || { \
echo >&2 "duplicate test numbers:" $$dups; exit 1; }
test-lint-executable:
- @bad=`for i in $(T); do test -x "$$i" || echo $$i; done` && \
+ @bad=`for i in $(T) $(TPERF); do test -x "$$i" || echo $$i; done` && \
test -z "$$bad" || { \
echo >&2 "non-executable tests:" $$bad; exit 1; }
test-lint-shell-syntax:
- @'$(PERL_PATH_SQ)' check-non-portable-shell.pl $(T) $(THELPERS)
+ @'$(PERL_PATH_SQ)' check-non-portable-shell.pl $(T) $(THELPERS) $(TPERF)
test-lint-filenames:
@# We do *not* pass a glob to ls-files but use grep instead, to catch
diff --git a/t/README b/t/README
index 9afd61e..593d4a4 100644
--- a/t/README
+++ b/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 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::
@@ -257,16 +258,21 @@
only some tests should be run or that some tests should be
excluded from a run.
-The argument for --run is a list of individual test numbers or
-ranges with an optional negation prefix that define what tests in
-a test suite to include in the run. A range is two numbers
-separated with a dash and matches a range of tests with both ends
-been included. You may omit the first or the second number to
-mean "from the first test" or "up to the very last test"
-respectively.
+The argument for --run, <test-selector>, is a list of description
+substrings or globs or individual test numbers or ranges with an
+optional negation prefix (of '!') that define what tests in a test
+suite to include (or exclude, if negated) in the run. A range is two
+numbers separated with a dash and matches a range of tests with both
+ends been included. You may omit the first or the second number to
+mean "from the first test" or "up to the very last test" respectively.
-Optional prefix of '!' means that the test or a range of tests
-should be excluded from the run.
+The argument to --run is split on commas into separate strings,
+numbers, and ranges, and picks all tests that match any of the
+individual selection criteria. If the substring of the description
+text that you want to match includes a comma, use the glob character
+'?' instead. For example --run='rebase,merge?cherry-pick' would match
+on all tests that match either the glob *rebase* or the glob
+*merge?cherry-pick*.
If --run starts with an unprefixed number or range the initial
set of tests to run is empty. If the first item starts with '!'
@@ -274,9 +280,6 @@
determined every test number or range is added or excluded from
the set one by one, from left to right.
-Individual numbers or ranges could be separated either by a space
-or a comma.
-
For example, to run only tests up to a specific test (21), one
could do this:
@@ -289,7 +292,7 @@
Common case is to run several setup tests (1, 2, 3) and then a
specific test (21) that relies on that setup:
- $ sh ./t9200-git-cvsexport-commit.sh --run='1 2 3 21'
+ $ sh ./t9200-git-cvsexport-commit.sh --run='1,2,3,21'
or:
@@ -297,17 +300,17 @@
or:
- $ sh ./t9200-git-cvsexport-commit.sh --run='-3 21'
+ $ sh ./t9200-git-cvsexport-commit.sh --run='-3,21'
As noted above, the test set is built by going through the items
from left to right, so this:
- $ sh ./t9200-git-cvsexport-commit.sh --run='1-4 !3'
+ $ sh ./t9200-git-cvsexport-commit.sh --run='1-4,!3'
will run tests 1, 2, and 4. Items that come later have higher
precedence. It means that this:
- $ sh ./t9200-git-cvsexport-commit.sh --run='!3 1-4'
+ $ sh ./t9200-git-cvsexport-commit.sh --run='!3,1-4'
would just run tests from 1 to 4, including 3.
@@ -316,6 +319,18 @@
$ sh ./t9200-git-cvsexport-commit.sh --run='!7-11'
+Sometimes there may be multiple tests with e.g. "setup" in their name
+that are needed and rather than figuring out the number for all of them
+we can just use "setup" as a substring/glob to match against the test
+description:
+
+ $ sh ./t0050-filesystem.sh --run=setup,9-11
+
+or one could select both the setup tests and the rename ones (assuming all
+relevant tests had those words in their descriptions):
+
+ $ sh ./t0050-filesystem.sh --run=setup,rename
+
Some tests in a test suite rely on the previous tests performing
certain actions, specifically some tests are designated as
"setup" test, so you cannot _arbitrarily_ disable one test and
@@ -343,12 +358,6 @@
refactor to deal with it. The "SYMLINKS" prerequisite is currently
excluded as so much relies on it, but this might change in the future.
-GIT_TEST_GETTEXT_POISON=<boolean> turns all strings marked for
-translation into gibberish if true. Used for spotting those tests that
-need to be marked with a C_LOCALE_OUTPUT prerequisite when adding more
-strings for translation. See "Testing marked strings" in po/README for
-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.
@@ -378,6 +387,14 @@
be written after every 'git commit' command, and overrides the
'core.commitGraph' setting to true.
+GIT_TEST_COMMIT_GRAPH_NO_GDAT=<boolean>, when true, forces the
+commit-graph to be written without generation data chunk.
+
+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,17 +403,13 @@
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-config(1).
-
GIT_TEST_ADD_I_USE_BUILTIN=<boolean>, when true, enables the
built-in version of git add -i. See 'add.interactive.useBuiltin' in
git-config(1).
@@ -419,6 +432,13 @@
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".
+
+GIT_TEST_WRITE_REV_INDEX=<boolean>, when true enables the
+'pack.writeReverseIndex' setting.
+
Naming Tests
------------
@@ -550,6 +570,41 @@
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.
@@ -862,13 +917,13 @@
Check whether a file has the length it is expected to.
- - test_path_is_file <path> [<diagnosis>]
- test_path_is_dir <path> [<diagnosis>]
- test_path_is_missing <path> [<diagnosis>]
+ - test_path_is_file <path>
+ test_path_is_dir <path>
+ test_path_is_missing <path>
Check if the named path is a file, if the named path is a
directory, or if the named path does not exist, respectively,
- and fail otherwise, showing the <diagnosis> text.
+ and fail otherwise.
- test_when_finished <script>
@@ -1049,18 +1104,6 @@
Git was compiled with support for PCRE. Wrap any tests
that use git-grep --perl-regexp or git-grep -P in these.
- - LIBPCRE1
-
- Git was compiled with PCRE v1 support via
- USE_LIBPCRE1=YesPlease. Wrap any PCRE using tests that for some
- reason need v1 of the PCRE library instead of v2 in these.
-
- - LIBPCRE2
-
- Git was compiled with PCRE v2 support via
- USE_LIBPCRE2=YesPlease. Wrap any PCRE using tests that for some
- reason need v2 of the PCRE library instead of v1 in these.
-
- CASE_INSENSITIVE_FS
Test is run on a case insensitive file system.
@@ -1080,21 +1123,21 @@
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/t/annotate-tests.sh b/t/annotate-tests.sh
index d933af5..29ce890 100644
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -95,7 +95,7 @@
'
test_expect_success 'setup B1 lines (branch1)' '
- git checkout -b branch1 master &&
+ git checkout -b branch1 main &&
echo "3A slow green fox jumps into the" >>file &&
echo "well." >>file &&
GIT_AUTHOR_NAME="B1" GIT_AUTHOR_EMAIL="B1@test.git" \
@@ -107,7 +107,7 @@
'
test_expect_success 'setup B2 lines (branch2)' '
- git checkout -b branch2 master &&
+ git checkout -b branch2 main &&
sed -e "s/2A quick brown/4A quick brown lazy dog/" <file >file.new &&
mv file.new file &&
GIT_AUTHOR_NAME="B2" GIT_AUTHOR_EMAIL="B2@test.git" \
@@ -131,11 +131,11 @@
'
test_expect_success 'blame ancestor' '
- check_count -h master A 2 B 2
+ check_count -h main A 2 B 2
'
test_expect_success 'blame great-ancestor' '
- check_count -h master^ A 2
+ check_count -h main^ A 2
'
test_expect_success 'setup evil merge' '
@@ -479,6 +479,24 @@
check_count -f hello.c -L$n -L^:ma.. F 4 G 1 H 1
'
+test_expect_success 'setup -L :funcname with userdiff driver' '
+ echo "fortran-* diff=fortran" >.gitattributes &&
+ fortran_file=fortran-external-function &&
+ orig_file="$TEST_DIRECTORY/t4018/$fortran_file" &&
+ cp "$orig_file" . &&
+ git add "$fortran_file" &&
+ GIT_AUTHOR_NAME="A" GIT_AUTHOR_EMAIL="A@test.git" \
+ git commit -m "add fortran file" &&
+ sed -e "s/ChangeMe/IWasChanged/" <"$orig_file" >"$fortran_file" &&
+ git add "$fortran_file" &&
+ GIT_AUTHOR_NAME="B" GIT_AUTHOR_EMAIL="B@test.git" \
+ git commit -m "change fortran file"
+'
+
+test_expect_success 'blame -L :funcname with userdiff driver' '
+ check_count -f fortran-external-function -L:RIGHT A 7 B 1
+'
+
test_expect_success 'setup incremental' '
(
GIT_AUTHOR_NAME=I &&
diff --git a/t/chainlint.sed b/t/chainlint.sed
index 70df40e..8a25c5b 100644
--- a/t/chainlint.sed
+++ b/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
-: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 @@
s/(//
bslurp
-:nextline
+:nextln
N
s/.*\n//
@@ -151,10 +151,10 @@
# 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 @@
# 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 @@
# 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 @@
}
}
# 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 @@
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 @@
# 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 @@
# otherwise, slurp next line and try again
N
s/\n//
-bsqstring
+bsqstr
:sqdone
s/@!/'/g
bfolded
@@ -282,11 +282,11 @@
: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 @@
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 @@
# 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 @@
# "$(...)" -- 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/t/helper/.gitignore b/t/helper/.gitignore
index 48c7bb0bb..8c2ddcc 100644
--- a/t/helper/.gitignore
+++ b/t/helper/.gitignore
@@ -1,4 +1,2 @@
/test-tool
/test-fake-ssh
-/test-line-buffer
-/test-svn-fe
diff --git a/t/helper/test-advise.c b/t/helper/test-advise.c
new file mode 100644
index 0000000..a7043df
--- /dev/null
+++ b/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/t/helper/test-bloom.c b/t/helper/test-bloom.c
new file mode 100644
index 0000000..2a1ae3d
--- /dev/null
+++ b/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;
+ CALLOC_ARRAY(filter.data, filter.len);
+
+ 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/t/helper/test-config.c b/t/helper/test-config.c
index 234c722..a6e9367 100644
--- a/t/helper/test-config.c
+++ b/t/helper/test-config.c
@@ -126,7 +126,7 @@
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/t/helper/test-crontab.c b/t/helper/test-crontab.c
new file mode 100644
index 0000000..e7c0137
--- /dev/null
+++ b/t/helper/test-crontab.c
@@ -0,0 +1,35 @@
+#include "test-tool.h"
+#include "cache.h"
+
+/*
+ * Usage: test-tool cron <file> [-l]
+ *
+ * If -l is specified, then write the contents of <file> to stdout.
+ * Otherwise, write from stdin into <file>.
+ */
+int cmd__crontab(int argc, const char **argv)
+{
+ int a;
+ FILE *from, *to;
+
+ if (argc == 3 && !strcmp(argv[2], "-l")) {
+ from = fopen(argv[1], "r");
+ if (!from)
+ return 0;
+ to = stdout;
+ } else if (argc == 2) {
+ from = stdin;
+ to = fopen(argv[1], "w");
+ } else
+ return error("unknown arguments");
+
+ while ((a = fgetc(from)) != EOF)
+ fputc(a, to);
+
+ if (argc == 3)
+ fclose(from);
+ else
+ fclose(to);
+
+ return 0;
+}
diff --git a/t/helper/test-dump-split-index.c b/t/helper/test-dump-split-index.c
index 63c689d..a209880 100644
--- a/t/helper/test-dump-split-index.c
+++ b/t/helper/test-dump-split-index.c
@@ -13,6 +13,8 @@
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/t/helper/test-fast-rebase.c b/t/helper/test-fast-rebase.c
new file mode 100644
index 0000000..3732122
--- /dev/null
+++ b/t/helper/test-fast-rebase.c
@@ -0,0 +1,211 @@
+/*
+ * "git fast-rebase" builtin command
+ *
+ * FAST: Forking Any Subprocesses (is) Taboo
+ *
+ * This is meant SOLELY as a demo of what is possible. sequencer.c and
+ * rebase.c should be refactored to use the ideas here, rather than attempting
+ * to extend this file to replace those (unless Phillip or Dscho say that
+ * refactoring is too hard and we need a clean slate, but I'm guessing that
+ * refactoring is the better route).
+ */
+
+#define USE_THE_INDEX_COMPATIBILITY_MACROS
+#include "test-tool.h"
+
+#include "cache-tree.h"
+#include "commit.h"
+#include "lockfile.h"
+#include "merge-ort.h"
+#include "refs.h"
+#include "revision.h"
+#include "sequencer.h"
+#include "strvec.h"
+#include "tree.h"
+
+static const char *short_commit_name(struct commit *commit)
+{
+ return find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV);
+}
+
+static struct commit *peel_committish(const char *name)
+{
+ struct object *obj;
+ struct object_id oid;
+
+ if (get_oid(name, &oid))
+ return NULL;
+ obj = parse_object(the_repository, &oid);
+ return (struct commit *)peel_to_type(name, 0, obj, OBJ_COMMIT);
+}
+
+static char *get_author(const char *message)
+{
+ size_t len;
+ const char *a;
+
+ a = find_commit_header(message, "author", &len);
+ if (a)
+ return xmemdupz(a, len);
+
+ return NULL;
+}
+
+static struct commit *create_commit(struct tree *tree,
+ struct commit *based_on,
+ struct commit *parent)
+{
+ struct object_id ret;
+ struct object *obj;
+ struct commit_list *parents = NULL;
+ char *author;
+ char *sign_commit = NULL;
+ struct commit_extra_header *extra;
+ struct strbuf msg = STRBUF_INIT;
+ const char *out_enc = get_commit_output_encoding();
+ const char *message = logmsg_reencode(based_on, NULL, out_enc);
+ const char *orig_message = NULL;
+ const char *exclude_gpgsig[] = { "gpgsig", NULL };
+
+ commit_list_insert(parent, &parents);
+ extra = read_commit_extra_headers(based_on, exclude_gpgsig);
+ find_commit_subject(message, &orig_message);
+ strbuf_addstr(&msg, orig_message);
+ author = get_author(message);
+ reset_ident_date();
+ if (commit_tree_extended(msg.buf, msg.len, &tree->object.oid, parents,
+ &ret, author, NULL, sign_commit, extra)) {
+ error(_("failed to write commit object"));
+ return NULL;
+ }
+ free(author);
+ strbuf_release(&msg);
+
+ obj = parse_object(the_repository, &ret);
+ return (struct commit *)obj;
+}
+
+int cmd__fast_rebase(int argc, const char **argv)
+{
+ struct commit *onto;
+ struct commit *last_commit = NULL, *last_picked_commit = NULL;
+ struct object_id head;
+ struct lock_file lock = LOCK_INIT;
+ int clean = 1;
+ struct strvec rev_walk_args = STRVEC_INIT;
+ struct rev_info revs;
+ struct commit *commit;
+ struct merge_options merge_opt;
+ struct tree *next_tree, *base_tree, *head_tree;
+ struct merge_result result;
+ struct strbuf reflog_msg = STRBUF_INIT;
+ struct strbuf branch_name = STRBUF_INIT;
+
+ /*
+ * test-tool stuff doesn't set up the git directory by default; need to
+ * do that manually.
+ */
+ setup_git_directory();
+
+ if (argc == 2 && !strcmp(argv[1], "-h")) {
+ printf("Sorry, I am not a psychiatrist; I can not give you the help you need. Oh, you meant usage...\n");
+ exit(129);
+ }
+
+ if (argc != 5 || strcmp(argv[1], "--onto"))
+ die("usage: read the code, figure out how to use it, then do so");
+
+ onto = peel_committish(argv[2]);
+ strbuf_addf(&branch_name, "refs/heads/%s", argv[4]);
+
+ /* Sanity check */
+ if (get_oid("HEAD", &head))
+ die(_("Cannot read HEAD"));
+ assert(oideq(&onto->object.oid, &head));
+
+ hold_locked_index(&lock, LOCK_DIE_ON_ERROR);
+ assert(repo_read_index(the_repository) >= 0);
+
+ repo_init_revisions(the_repository, &revs, NULL);
+ revs.verbose_header = 1;
+ revs.max_parents = 1;
+ revs.cherry_mark = 1;
+ revs.limited = 1;
+ revs.reverse = 1;
+ revs.right_only = 1;
+ revs.sort_order = REV_SORT_IN_GRAPH_ORDER;
+ revs.topo_order = 1;
+ strvec_pushl(&rev_walk_args, "", argv[4], "--not", argv[3], NULL);
+
+ if (setup_revisions(rev_walk_args.nr, rev_walk_args.v, &revs, NULL) > 1)
+ return error(_("unhandled options"));
+
+ strvec_clear(&rev_walk_args);
+
+ if (prepare_revision_walk(&revs) < 0)
+ return error(_("error preparing revisions"));
+
+ init_merge_options(&merge_opt, the_repository);
+ memset(&result, 0, sizeof(result));
+ merge_opt.show_rename_progress = 1;
+ merge_opt.branch1 = "HEAD";
+ head_tree = get_commit_tree(onto);
+ result.tree = head_tree;
+ last_commit = onto;
+ while ((commit = get_revision(&revs))) {
+ struct commit *base;
+
+ fprintf(stderr, "Rebasing %s...\r",
+ oid_to_hex(&commit->object.oid));
+ assert(commit->parents && !commit->parents->next);
+ base = commit->parents->item;
+
+ next_tree = get_commit_tree(commit);
+ base_tree = get_commit_tree(base);
+
+ merge_opt.branch2 = short_commit_name(commit);
+ merge_opt.ancestor = xstrfmt("parent of %s", merge_opt.branch2);
+
+ merge_incore_nonrecursive(&merge_opt,
+ base_tree,
+ result.tree,
+ next_tree,
+ &result);
+
+ free((char*)merge_opt.ancestor);
+ merge_opt.ancestor = NULL;
+ if (!result.clean)
+ die("Aborting: Hit a conflict and restarting is not implemented.");
+ last_picked_commit = commit;
+ last_commit = create_commit(result.tree, commit, last_commit);
+ }
+ fprintf(stderr, "\nDone.\n");
+ /* TODO: There should be some kind of rev_info_free(&revs) call... */
+ memset(&revs, 0, sizeof(revs));
+
+ merge_switch_to_result(&merge_opt, head_tree, &result, 1, !result.clean);
+
+ if (result.clean < 0)
+ exit(128);
+
+ strbuf_addf(&reflog_msg, "finish rebase %s onto %s",
+ oid_to_hex(&last_picked_commit->object.oid),
+ oid_to_hex(&last_commit->object.oid));
+ if (update_ref(reflog_msg.buf, branch_name.buf,
+ &last_commit->object.oid,
+ &last_picked_commit->object.oid,
+ REF_NO_DEREF, UPDATE_REFS_MSG_ON_ERR)) {
+ error(_("could not update %s"), argv[4]);
+ die("Failed to update %s", argv[4]);
+ }
+ if (create_symref("HEAD", branch_name.buf, reflog_msg.buf) < 0)
+ die(_("unable to update HEAD"));
+ strbuf_release(&reflog_msg);
+ strbuf_release(&branch_name);
+
+ prime_cache_tree(the_repository, the_repository->index, result.tree);
+ if (write_locked_index(&the_index, &lock,
+ COMMIT_LOCK | SKIP_IF_UNCHANGED))
+ die(_("unable to write %s"), get_index_file());
+ return (clean == 0);
+}
diff --git a/t/helper/test-hashmap.c b/t/helper/test-hashmap.c
index f387062..36ff07b 100644
--- a/t/helper/test-hashmap.c
+++ b/t/helper/test-hashmap.c
@@ -110,7 +110,7 @@
hashmap_add(&map, &entries[i]->ent);
}
- hashmap_free(&map);
+ hashmap_clear(&map);
}
} else {
/* test map lookups */
@@ -130,7 +130,7 @@
}
}
- hashmap_free(&map);
+ hashmap_clear(&map);
}
}
@@ -151,12 +151,11 @@
int cmd__hashmap(int argc, const char **argv)
{
struct strbuf line = STRBUF_INIT;
- struct hashmap map;
int icase;
+ struct hashmap map = HASHMAP_INIT(test_entry_cmp, &icase);
/* init hash map */
icase = argc > 1 && !strcmp("ignorecase", argv[1]);
- hashmap_init(&map, test_entry_cmp, &icase, 0);
/* process commands from stdin */
while (strbuf_getline(&line, stdin) != EOF) {
@@ -262,6 +261,6 @@
}
strbuf_release(&line);
- hashmap_free_entries(&map, struct test_entry, ent);
+ hashmap_clear_and_free(&map, struct test_entry, ent);
return 0;
}
diff --git a/t/helper/test-line-buffer.c b/t/helper/test-line-buffer.c
deleted file mode 100644
index 078dd7e..0000000
--- a/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/t/helper/test-sha1-array.c b/t/helper/test-oid-array.c
similarity index 78%
rename from t/helper/test-sha1-array.c
rename to t/helper/test-oid-array.c
index ad5e69f..b16cd0b 100644
--- a/t/helper/test-sha1-array.c
+++ b/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 @@
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 @@
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/t/helper/test-parse-pathspec-file.c b/t/helper/test-parse-pathspec-file.c
index 02f4ccf..b3e08ce 100644
--- a/t/helper/test-parse-pathspec-file.c
+++ b/t/helper/test-parse-pathspec-file.c
@@ -6,7 +6,7 @@
int cmd__parse_pathspec_file(int argc, const char **argv)
{
struct pathspec pathspec;
- const char *pathspec_from_file = 0;
+ const char *pathspec_from_file = NULL;
int pathspec_file_nul = 0, i;
static const char *const usage[] = {
@@ -20,9 +20,9 @@
OPT_END()
};
- parse_options(argc, argv, 0, options, usage, 0);
+ parse_options(argc, argv, NULL, options, usage, 0);
- parse_pathspec_file(&pathspec, 0, 0, 0, pathspec_from_file,
+ parse_pathspec_file(&pathspec, 0, 0, NULL, pathspec_from_file,
pathspec_file_nul);
for (i = 0; i < pathspec.nr; i++)
diff --git a/t/helper/test-path-utils.c b/t/helper/test-path-utils.c
index 409034c..313a153 100644
--- a/t/helper/test-path-utils.c
+++ b/t/helper/test-path-utils.c
@@ -290,11 +290,14 @@
}
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;
}
diff --git a/t/helper/test-pcre2-config.c b/t/helper/test-pcre2-config.c
new file mode 100644
index 0000000..5258fdd
--- /dev/null
+++ b/t/helper/test-pcre2-config.c
@@ -0,0 +1,12 @@
+#include "test-tool.h"
+#include "cache.h"
+#include "grep.h"
+
+int cmd__pcre2_config(int argc, const char **argv)
+{
+ if (argc == 2 && !strcmp(argv[1], "has-PCRE2_MATCH_INVALID_UTF")) {
+ int value = PCRE2_MATCH_INVALID_UTF;
+ return !value;
+ }
+ return 1;
+}
diff --git a/t/helper/test-pkt-line.c b/t/helper/test-pkt-line.c
index 282d536..5e638f0 100644
--- a/t/helper/test-pkt-line.c
+++ b/t/helper/test-pkt-line.c
@@ -46,6 +46,9 @@
case PACKET_READ_DELIM:
printf("0001\n");
break;
+ case PACKET_READ_RESPONSE_END:
+ printf("0002\n");
+ break;
}
}
}
@@ -67,7 +70,7 @@
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,11 +78,31 @@
case PACKET_READ_FLUSH:
return;
case PACKET_READ_DELIM:
+ case PACKET_READ_RESPONSE_END:
break;
}
}
}
+static int send_split_sideband(void)
+{
+ const char *part1 = "Hello,";
+ const char *primary = "\001primary: regular output\n";
+ const char *part2 = " world!\n";
+
+ send_sideband(1, 2, part1, strlen(part1), LARGE_PACKET_MAX);
+ packet_write(1, primary, strlen(primary));
+ send_sideband(1, 2, part2, strlen(part2), LARGE_PACKET_MAX);
+ packet_response_end(1);
+
+ return 0;
+}
+
+static int receive_sideband(void)
+{
+ return recv_sideband("sideband", 0, 1);
+}
+
int cmd__pkt_line(int argc, const char **argv)
{
if (argc < 2)
@@ -91,6 +114,10 @@
unpack();
else if (!strcmp(argv[1], "unpack-sideband"))
unpack_sideband();
+ else if (!strcmp(argv[1], "send-split-sideband"))
+ send_split_sideband();
+ else if (!strcmp(argv[1], "receive-sideband"))
+ receive_sideband();
else
die("invalid argument '%s'", argv[1]);
diff --git a/t/helper/test-proc-receive.c b/t/helper/test-proc-receive.c
new file mode 100644
index 0000000..cc08506
--- /dev/null
+++ b/t/helper/test-proc-receive.c
@@ -0,0 +1,202 @@
+#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_read_version;
+static int die_write_version;
+static int die_read_commands;
+static int die_read_push_options;
+static int die_write_report;
+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;
+
+ if (die_read_version)
+ die("die with the --die-read-version option");
+
+ for (;;) {
+ int linelen;
+
+ if (packet_reader_read(reader) != PACKET_READ_NORMAL)
+ break;
+
+ /* Ignore version negotiation for version 0 */
+ if (version == 0)
+ continue;
+
+ if (reader->pktlen > 8 && starts_with(reader->line, "version=")) {
+ server_version = atoi(reader->line+8);
+ if (server_version != 1)
+ die("bad protocol version: %d", server_version);
+ 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 (die_write_version)
+ die("die with the --die-write-version option");
+
+ if (version != 0)
+ 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 (die_read_commands)
+ die("die with the --die-read-commands option");
+
+ if (parse_oid_hex(reader->line, &old_oid, &p) ||
+ *p++ != ' ' ||
+ parse_oid_hex(p, &new_oid, &p) ||
+ *p++ != ' ')
+ 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;
+
+ if (die_read_push_options)
+ die("die with the --die-read-push-options option");
+
+ 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-read-version", &die_read_version,
+ "die when reading version"),
+ OPT_BOOL(0, "die-write-version", &die_write_version,
+ "die when writing version"),
+ OPT_BOOL(0, "die-read-commands", &die_read_commands,
+ "die when reading commands"),
+ OPT_BOOL(0, "die-read-push-options", &die_read_push_options,
+ "die when reading push-options"),
+ OPT_BOOL(0, "die-write-report", &die_write_report,
+ "die when writing report"),
+ 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_GENTLE_ON_EOF);
+
+ 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 (die_write_report)
+ die("die with the --die-write-report option");
+ 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/t/helper/test-progress.c b/t/helper/test-progress.c
index 42b96cb..5d05cbe 100644
--- a/t/helper/test-progress.c
+++ b/t/helper/test-progress.c
@@ -13,20 +13,13 @@
*
* 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"
-/*
- * These are defined in 'progress.c', but are not exposed in 'progress.h',
- * because they are exclusively for testing.
- */
-extern int progress_testing;
-extern uint64_t progress_test_ns;
-void progress_test_force_update(void);
-
int cmd__progress(int argc, const char **argv)
{
int total = 0;
diff --git a/t/helper/test-reach.c b/t/helper/test-reach.c
index a027217..cda804e 100644
--- a/t/helper/test-reach.c
+++ b/t/helper/test-reach.c
@@ -67,7 +67,7 @@
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 @@
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/t/helper/test-read-graph.c b/t/helper/test-read-graph.c
index f8a4617..75927b2 100644
--- a/t/helper/test-read-graph.c
+++ b/t/helper/test-read-graph.c
@@ -7,27 +7,17 @@
int cmd__read_graph(int argc, const char **argv)
{
struct commit_graph *graph = NULL;
- char *graph_name;
- int open_ok;
- int fd;
- struct stat st;
struct object_directory *odb;
setup_git_directory();
odb = the_repository->objects->odb;
- graph_name = get_commit_graph_filename(odb);
+ prepare_repo_settings(the_repository);
- open_ok = open_commit_graph(graph_name, &fd, &st);
- if (!open_ok)
- die_errno(_("Could not open commit-graph '%s'"), graph_name);
-
- graph = load_commit_graph_one_fd_st(fd, &st, odb);
+ graph = read_commit_graph_one(the_repository, odb);
if (!graph)
return 1;
- FREE_AND_NULL(graph_name);
-
printf("header: %08x %d %d %d %d\n",
ntohl(*(uint32_t*)graph->data),
*(unsigned char*)(graph->data + 4),
@@ -43,8 +33,16 @@
printf(" oid_lookup");
if (graph->chunk_commit_data)
printf(" commit_metadata");
+ if (graph->chunk_generation_data)
+ printf(" generation_data");
+ if (graph->chunk_generation_data_overflow)
+ printf(" generation_data_overflow");
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);
diff --git a/t/helper/test-read-midx.c b/t/helper/test-read-midx.c
index 831b586..2430880 100644
--- a/t/helper/test-read-midx.c
+++ b/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/t/helper/test-ref-store.c b/t/helper/test-ref-store.c
index 799fc00..bba5f84 100644
--- a/t/helper/test-ref-store.c
+++ b/t/helper/test-ref-store.c
@@ -37,7 +37,7 @@
*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;
@@ -72,18 +72,6 @@
return refs_pack_refs(refs, flags);
}
-static int cmd_peel_ref(struct ref_store *refs, const char **argv)
-{
- const char *refname = notnull(*argv++, "refname");
- struct object_id oid;
- int ret;
-
- ret = refs_peel_ref(refs, refname, &oid);
- if (!ret)
- puts(oid_to_hex(&oid));
- return ret;
-}
-
static int cmd_create_symref(struct ref_store *refs, const char **argv)
{
const char *refname = notnull(*argv++, "refname");
@@ -255,7 +243,6 @@
static struct command commands[] = {
{ "pack-refs", cmd_pack_refs },
- { "peel-ref", cmd_peel_ref },
{ "create-symref", cmd_create_symref },
{ "delete-refs", cmd_delete_refs },
{ "rename-ref", cmd_rename_ref },
diff --git a/t/helper/test-regex.c b/t/helper/test-regex.c
index 10284cc..d6f28ca 100644
--- a/t/helper/test-regex.c
+++ b/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 @@
};
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 @@
{
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/t/helper/test-repository.c b/t/helper/test-repository.c
index f7f8618..56f0e3c 100644
--- a/t/helper/test-repository.c
+++ b/t/helper/test-repository.c
@@ -19,12 +19,11 @@
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 @@
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 @@
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/t/helper/test-run-command.c b/t/helper/test-run-command.c
index 1646aa2..7ae03dc 100644
--- a/t/helper/test-run-command.c
+++ b/t/helper/test-run-command.c
@@ -12,7 +12,7 @@
#include "git-compat-util.h"
#include "cache.h"
#include "run-command.h"
-#include "argv-array.h"
+#include "strvec.h"
#include "strbuf.h"
#include "parse-options.h"
#include "string-list.h"
@@ -31,7 +31,7 @@
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;
@@ -72,19 +72,19 @@
return 0;
test = suite->tests.items[suite->next++].string;
- argv_array_pushl(&cp->args, "sh", test, NULL);
+ strvec_pushl(&cp->args, "sh", test, NULL);
if (suite->quiet)
- argv_array_push(&cp->args, "--quiet");
+ strvec_push(&cp->args, "--quiet");
if (suite->immediate)
- argv_array_push(&cp->args, "-i");
+ strvec_push(&cp->args, "-i");
if (suite->verbose)
- argv_array_push(&cp->args, "-v");
+ strvec_push(&cp->args, "-v");
if (suite->verbose_log)
- argv_array_push(&cp->args, "-V");
+ strvec_push(&cp->args, "-V");
if (suite->trace)
- argv_array_push(&cp->args, "-x");
+ strvec_push(&cp->args, "-x");
if (suite->write_junit_xml)
- argv_array_push(&cp->args, "--write-junit-xml");
+ strvec_push(&cp->args, "--write-junit-xml");
strbuf_addf(err, "Output of '%s':\n", test);
*task_cb = (void *)test;
@@ -220,7 +220,7 @@
char special[] = ".?*\\^_\"'`{}()[]<>@~&+:;$%"; // \t\r\n\a";
int i, j, k, trials = 100, skip = 0, msys2 = 0;
struct strbuf out = STRBUF_INIT;
- struct argv_array args = ARGV_ARRAY_INIT;
+ struct strvec args = STRVEC_INIT;
struct option options[] = {
OPT_INTEGER('n', "trials", &trials, "Number of trials"),
OPT_INTEGER('s', "skip", &skip, "Skip <n> trials"),
@@ -241,20 +241,20 @@
size_t arg_count, arg_offset;
int ret = 0;
- argv_array_clear(&args);
+ strvec_clear(&args);
if (msys2)
- argv_array_pushl(&args, "sh", "-c",
- "printf %s\\\\0 \"$@\"", "skip", NULL);
+ strvec_pushl(&args, "sh", "-c",
+ "printf %s\\\\0 \"$@\"", "skip", NULL);
else
- argv_array_pushl(&args, "test-tool", "run-command",
- "quote-echo", NULL);
- arg_offset = args.argc;
+ 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++)
- argv_array_push(&args, argv[j]);
+ strvec_push(&args, argv[j]);
} else {
arg_count = 1 + (my_random() % 5);
for (j = 0; j < arg_count; j++) {
@@ -268,20 +268,20 @@
ARRAY_SIZE(special)];
buf[arg_len] = '\0';
- argv_array_push(&args, buf);
+ strvec_push(&args, buf);
}
}
if (i < skip)
continue;
- cp.argv = args.argv;
+ 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.argv[j + arg_offset];
+ const char *arg = args.v[j + arg_offset];
if (strcmp(arg, out.buf + k))
ret = error("incorrectly quoted arg: '%s', "
@@ -298,10 +298,10 @@
fprintf(stderr, "Trial #%d failed. Arguments:\n", i);
for (j = 0; j < arg_count; j++)
fprintf(stderr, "arg #%d: '%s'\n",
- (int)j, args.argv[j + arg_offset]);
+ (int)j, args.v[j + arg_offset]);
strbuf_release(&out);
- argv_array_clear(&args);
+ strvec_clear(&args);
return ret;
}
@@ -311,7 +311,7 @@
}
strbuf_release(&out);
- argv_array_clear(&args);
+ strvec_clear(&args);
return 0;
}
@@ -338,8 +338,8 @@
xsnprintf(path, sizeof(path), "out-XXXXXX");
tmp = xmkstemp(path);
- argv_array_pushl(&cp.args,
- "test-tool", argv0, "inherited-handle-child", NULL);
+ 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)
@@ -391,7 +391,7 @@
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/t/helper/test-submodule-nested-repo-config.c b/t/helper/test-submodule-nested-repo-config.c
index bc97929..c5fd452 100644
--- a/t/helper/test-submodule-nested-repo-config.c
+++ b/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 @@
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/t/helper/test-svn-fe.c b/t/helper/test-svn-fe.c
deleted file mode 100644
index 7667c08..0000000
--- a/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/t/helper/test-tool.c b/t/helper/test-tool.c
index c9a232d..f97cd9f 100644
--- a/t/helper/test-tool.c
+++ b/t/helper/test-tool.c
@@ -14,8 +14,11 @@
};
static struct test_cmd cmds[] = {
+ { "advise", cmd__advise_if_enabled },
+ { "bloom", cmd__bloom },
{ "chmtime", cmd__chmtime },
{ "config", cmd__config },
+ { "crontab", cmd__crontab },
{ "ctype", cmd__ctype },
{ "date", cmd__date },
{ "delta", cmd__delta },
@@ -26,6 +29,7 @@
{ "dump-split-index", cmd__dump_split_index },
{ "dump-untracked-cache", cmd__dump_untracked_cache },
{ "example-decorate", cmd__example_decorate },
+ { "fast-rebase", cmd__fast_rebase },
{ "genrandom", cmd__genrandom },
{ "genzeros", cmd__genzeros },
{ "hashmap", cmd__hashmap },
@@ -36,13 +40,16 @@
{ "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 },
+ { "pcre2-config", cmd__pcre2_config },
{ "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 },
@@ -56,7 +63,6 @@
{ "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 },
@@ -111,6 +117,7 @@
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/t/helper/test-tool.h b/t/helper/test-tool.h
index c8549fd..28072c0 100644
--- a/t/helper/test-tool.h
+++ b/t/helper/test-tool.h
@@ -4,8 +4,11 @@
#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__crontab(int argc, const char **argv);
int cmd__ctype(int argc, const char **argv);
int cmd__date(int argc, const char **argv);
int cmd__delta(int argc, const char **argv);
@@ -16,6 +19,7 @@
int cmd__dump_split_index(int argc, const char **argv);
int cmd__dump_untracked_cache(int argc, const char **argv);
int cmd__example_decorate(int argc, const char **argv);
+int cmd__fast_rebase(int argc, const char **argv);
int cmd__genrandom(int argc, const char **argv);
int cmd__genzeros(int argc, const char **argv);
int cmd__hashmap(int argc, const char **argv);
@@ -31,8 +35,10 @@
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__pcre2_config(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);
@@ -46,7 +52,7 @@
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/t/helper/test-trace2.c b/t/helper/test-trace2.c
index 197819c..f93633f 100644
--- a/t/helper/test-trace2.c
+++ b/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"
@@ -198,6 +198,14 @@
return 0;
}
+static int ut_007bug(int argc, const char **argv)
+{
+ /*
+ * Exercise BUG() to ensure that the message is printed to trace2.
+ */
+ BUG("the bug message");
+}
+
/*
* Usage:
* test-tool trace2 <ut_name_1> <ut_usage_1>
@@ -214,6 +222,7 @@
{ ut_004child, "004child", "[<child_command_line>]" },
{ ut_005exec, "005exec", "<git_command_args>" },
{ ut_006data, "006data", "[<category> <key> <value>]+" },
+ { ut_007bug, "007bug", "" },
};
/* clang-format on */
diff --git a/t/lib-bitmap.sh b/t/lib-bitmap.sh
new file mode 100644
index 0000000..fe3f98b
--- /dev/null
+++ b/t/lib-bitmap.sh
@@ -0,0 +1,26 @@
+# Compare a file containing rev-list bitmap traversal output to its non-bitmap
+# counterpart. You can't just use test_cmp for this, because the two produce
+# subtly different output:
+#
+# - regular output is in traversal order, whereas bitmap is split by type,
+# with non-packed objects at the end
+#
+# - regular output has a space and the pathname appended to non-commit
+# objects; bitmap output omits this
+#
+# This function normalizes and compares the two. The second file should
+# always be the bitmap output.
+test_bitmap_traversal () {
+ if test "$1" = "--no-confirm-bitmaps"
+ then
+ shift
+ elif cmp "$1" "$2"
+ then
+ echo >&2 "identical raw outputs; are you sure bitmaps were used?"
+ return 1
+ fi &&
+ cut -d' ' -f1 "$1" | sort >"$1.normalized" &&
+ sort "$2" >"$2.normalized" &&
+ test_cmp "$1.normalized" "$2.normalized" &&
+ rm -f "$1.normalized" "$2.normalized"
+}
diff --git a/t/lib-bundle.sh b/t/lib-bundle.sh
new file mode 100644
index 0000000..cf7ed81
--- /dev/null
+++ b/t/lib-bundle.sh
@@ -0,0 +1,42 @@
+# Library of git-bundle related functions.
+
+# Display the pack data contained in the bundle file, bypassing the
+# header that contains the signature, prerequisites and references.
+convert_bundle_to_pack () {
+ while read x && test -n "$x"
+ do
+ :;
+ done
+ cat
+}
+
+# Check count of objects in a bundle file.
+# We can use "--thin" opiton to check thin pack, which must be fixed by
+# command `git-index-pack --fix-thin --stdin`.
+test_bundle_object_count () {
+ thin=
+ if test "$1" = "--thin"
+ then
+ thin=t
+ shift
+ fi
+ if test $# -ne 2
+ then
+ echo >&2 "args should be: <bundle> <count>"
+ return 1
+ fi
+ bundle=$1
+ pack=$bundle.pack
+ convert_bundle_to_pack <"$bundle" >"$pack" &&
+ if test -n "$thin"
+ then
+ mv "$pack" "$bundle.thin.pack" &&
+ git index-pack --stdin --fix-thin "$pack" <"$bundle.thin.pack"
+ else
+ git index-pack "$pack"
+ fi || return 1
+ count=$(git show-index <"${pack%pack}idx" | wc -l) &&
+ test $2 = $count && return 0
+ echo >&2 "error: object count for $bundle is $count, not $2"
+ return 1
+}
diff --git a/t/lib-credential.sh b/t/lib-credential.sh
old mode 100755
new mode 100644
index bb88cc0..5ea8bc9
--- a/t/lib-credential.sh
+++ b/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 @@
false
fi &&
test_cmp expect-stdout stdout &&
- test_i18ncmp expect-stderr stderr
+ test_cmp expect-stderr stderr
}
read_chunk() {
diff --git a/t/lib-cvs.sh b/t/lib-cvs.sh
index 9b2bcfb..32b3473 100644
--- a/t/lib-cvs.sh
+++ b/t/lib-cvs.sh
@@ -36,7 +36,7 @@
test_cvs_co () {
# Usage: test_cvs_co BRANCH_NAME
rm -rf module-cvs-"$1"
- if [ "$1" = "master" ]
+ if [ "$1" = "main" ]
then
$CVS co -P -d module-cvs-"$1" -A module
else
diff --git a/t/diff-lib.sh b/t/lib-diff.sh
similarity index 100%
rename from t/diff-lib.sh
rename to t/lib-diff.sh
diff --git a/t/diff-lib/COPYING b/t/lib-diff/COPYING
similarity index 100%
rename from t/diff-lib/COPYING
rename to t/lib-diff/COPYING
diff --git a/t/diff-lib/README b/t/lib-diff/README
similarity index 100%
rename from t/diff-lib/README
rename to t/lib-diff/README
diff --git a/t/lib-gettext.sh b/t/lib-gettext.sh
index 2139b42..cc6bb2c 100644
--- a/t/lib-gettext.sh
+++ b/t/lib-gettext.sh
@@ -17,7 +17,7 @@
. "$GIT_BUILD_DIR"/git-sh-i18n
fi
-if test_have_prereq GETTEXT && test_have_prereq C_LOCALE_OUTPUT
+if test_have_prereq GETTEXT
then
# is_IS.UTF-8 on Solaris and FreeBSD, is_IS.utf8 on Debian
is_IS_locale=$(locale -a 2>/dev/null |
diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
index 7d248e6..547eb3c 100644
--- a/t/lib-git-svn.sh
+++ b/t/lib-git-svn.sh
@@ -78,21 +78,24 @@
}
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 $!;
diff --git a/t/gitweb-lib.sh b/t/lib-gitweb.sh
similarity index 100%
rename from t/gitweb-lib.sh
rename to t/lib-gitweb.sh
diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
old mode 100755
new mode 100644
index 8d28652..9fc5241
--- a/t/lib-gpg.sh
+++ b/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.
-gpg_version=$(gpg --version 2>&1)
-if test $? != 127
-then
+GNUPGHOME="$PWD/gpghome"
+export GNUPGHOME
+
+test_lazy_prereq GPG '
+ gpg_version=$(gpg --version 2>&1)
+ test $? != 127 || exit 1
+
# 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 @@
# 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
+'
-if test_have_prereq GPG &&
- echo | gpg --homedir "${GNUPGHOME}" -b --rfc1991 >/dev/null 2>&1
-then
- test_set_prereq RFC1991
-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 -
+'
+
+test_lazy_prereq RFC1991 '
+ test_have_prereq GPG &&
+ echo | gpg --homedir "${GNUPGHOME}" -b --rfc1991 >/dev/null
+'
sanitize_pgp() {
perl -ne '
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
index 1449ee9..d2edfa4 100644
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh
@@ -129,6 +129,8 @@
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
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index 994e529..afa91e3 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -117,6 +117,8 @@
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/
@@ -126,6 +128,12 @@
<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>
diff --git a/t/lib-httpd/incomplete-body-upload-pack-v2-http.sh b/t/lib-httpd/incomplete-body-upload-pack-v2-http.sh
new file mode 100644
index 0000000..90e73ef
--- /dev/null
+++ b/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/t/lib-httpd/incomplete-length-upload-pack-v2-http.sh b/t/lib-httpd/incomplete-length-upload-pack-v2-http.sh
new file mode 100644
index 0000000..dce552e
--- /dev/null
+++ b/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/t/lib-log-graph.sh b/t/lib-log-graph.sh
old mode 100755
new mode 100644
index 1184cce..bf952ef
--- a/t/lib-log-graph.sh
+++ b/t/lib-log-graph.sh
@@ -12,13 +12,13 @@
lib_test_cmp_graph () {
git log --graph "$@" >output &&
sed 's/ *$//' >output.sanitized <output &&
- test_i18ncmp expect output.sanitized
+ test_cmp 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
+ test_cmp expect output.sanitized
}
lib_test_cmp_colored_graph () {
diff --git a/t/lib-merge.sh b/t/lib-merge.sh
new file mode 100644
index 0000000..8734ebf
--- /dev/null
+++ b/t/lib-merge.sh
@@ -0,0 +1,13 @@
+# Helper functions used by merge tests.
+
+test_expect_merge_algorithm () {
+ status_for_recursive=$1 status_for_ort=$2
+ shift 2
+
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ test_expect_${status_for_ort} "$@"
+ else
+ test_expect_${status_for_recursive} "$@"
+ fi
+}
diff --git a/t/lib-pack.sh b/t/lib-pack.sh
index f346317..bb8938c 100644
--- a/t/lib-pack.sh
+++ b/t/lib-pack.sh
@@ -35,8 +35,6 @@
# have hardcoded some well-known objects. See the case statements below for the
# complete list.
pack_obj () {
- test_oid_init
-
case "$1" in
# empty blob
$EMPTY_BLOB)
@@ -93,6 +91,14 @@
;;
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
@@ -113,7 +119,6 @@
# Compute and append pack trailer to "$1"
pack_trailer () {
- test_oid_init &&
test-tool $(test_oid algo) -b <"$1" >trailer.tmp &&
cat trailer.tmp >>"$1" &&
rm -f trailer.tmp
diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh
index b72c051..172d745 100644
--- a/t/lib-rebase.sh
+++ b/t/lib-rebase.sh
@@ -29,7 +29,6 @@
*/COMMIT_EDITMSG)
test -z "$EXPECT_HEADER_COUNT" ||
test "$EXPECT_HEADER_COUNT" = "$(sed -n '1s/^# This is a combination of \(.*\) commits\./\1/p' < "$1")" ||
- test "# # GETTEXT POISON #" = "$(sed -n '1p' < "$1")" ||
exit
test -z "$FAKE_COMMIT_MESSAGE" || echo "$FAKE_COMMIT_MESSAGE" > "$1"
test -z "$FAKE_COMMIT_AMEND" || echo "$FAKE_COMMIT_AMEND" >> "$1"
diff --git a/t/lib-submodule-update.sh b/t/lib-submodule-update.sh
old mode 100755
new mode 100644
index 1dd17fc..4b714e9
--- a/t/lib-submodule-update.sh
+++ b/t/lib-submodule-update.sh
@@ -144,7 +144,7 @@
git checkout -b valid_sub1 &&
git revert HEAD &&
- git checkout master
+ git checkout "${GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME-master}"
)
}
@@ -183,7 +183,7 @@
)
}
-test_git_directory_exists() {
+test_git_directory_exists () {
test -e ".git/modules/$1" &&
if test -f sub1/.git
then
@@ -196,7 +196,6 @@
# 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,30 +296,27 @@
# - 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 ...
- if test "$KNOWN_FAILURE_STASH_DOES_IGNORE_SUBMODULE_CHANGES" = 1
- then
- # Restoring stash fails to restore submodule index entry
- RESULT="failure"
- else
- RESULT="success"
- fi
- test_expect_$RESULT "$command: added submodule creates empty directory" '
+ test_expect_success "$command: added submodule creates empty directory" '
prolog &&
reset_work_tree_to no_submodule &&
(
@@ -334,6 +330,13 @@
)
'
# ... and doesn't care if it already exists.
+ if test "$KNOWN_FAILURE_STASH_DOES_IGNORE_SUBMODULE_CHANGES" = 1
+ then
+ # Restoring stash fails to restore submodule index entry
+ RESULT="failure"
+ else
+ RESULT="success"
+ fi
test_expect_$RESULT "$command: added submodule leaves existing empty directory alone" '
prolog &&
reset_work_tree_to no_submodule &&
@@ -443,7 +446,7 @@
(
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 @@
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 @@
(
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 @@
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 @@
# 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 @@
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 @@
# - 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_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_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 @@
)
'
+ # 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_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_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 @@
)
'
- # 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 @@
# 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/t/lib-t6000.sh b/t/lib-t6000.sh
index b0ed476..fba6778 100644
--- a/t/lib-t6000.sh
+++ b/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 @@
_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/t/oid-info/README b/t/oid-info/README
index 27f843f..ca56a74 100644
--- a/t/oid-info/README
+++ b/t/oid-info/README
@@ -5,7 +5,7 @@
(specifically, those whitespace in the default `$IFS`). The key consists only
of shell identifier characters, and the value consists of a hash algorithm,
colon, and value. The hash algorithm also consists only of shell identifier
-characters; it should match the value in sha1-file.c.
+characters; it should match the value in object-file.c.
For example, the following lines map the key "rawsz" to "20" if SHA-1 is in use
and to "32" if SHA-256 is in use:
diff --git a/t/perf/.gitignore b/t/perf/.gitignore
index 982eb8e..72f5d0d 100644
--- a/t/perf/.gitignore
+++ b/t/perf/.gitignore
@@ -1,3 +1,4 @@
/build/
/test-results/
+/test-trace/
/trash directory*/
diff --git a/t/perf/Makefile b/t/perf/Makefile
index 8c47155..2465770 100644
--- a/t/perf/Makefile
+++ b/t/perf/Makefile
@@ -1,15 +1,18 @@
-include ../../config.mak
export GIT_TEST_OPTIONS
-all: perf
+all: test-lint perf
perf: pre-clean
./run
pre-clean:
- rm -rf test-results
+ rm -rf test-results test-trace
clean:
- rm -rf build "trash directory".* test-results
+ rm -rf build "trash directory".* test-results test-trace
+
+test-lint:
+ $(MAKE) -C .. test-lint
.PHONY: all perf pre-clean clean
diff --git a/t/perf/README b/t/perf/README
index c7b70e2..fb9127a 100644
--- a/t/perf/README
+++ b/t/perf/README
@@ -28,6 +28,8 @@
7810.3: grep --cached, cheap regex 3.07(3.02+0.25)
7810.4: grep --cached, expensive regex 9.39(30.57+0.24)
+Output format is in seconds "Elapsed(User + System)"
+
You can compare multiple repositories and even git revisions with the
'run' script:
@@ -84,6 +86,15 @@
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/t/perf/p1400-update-ref.sh b/t/perf/p1400-update-ref.sh
new file mode 100755
index 0000000..dda8a74
--- /dev/null
+++ b/t/perf/p1400-update-ref.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+test_description="Tests performance of update-ref"
+
+. ./perf-lib.sh
+
+test_perf_fresh_repo
+
+test_expect_success "setup" '
+ test_commit PRE &&
+ test_commit POST &&
+ for i in $(test_seq 5000)
+ do
+ printf "start\ncreate refs/heads/%d PRE\ncommit\n" $i &&
+ printf "start\nupdate refs/heads/%d POST PRE\ncommit\n" $i &&
+ printf "start\ndelete refs/heads/%d POST\ncommit\n" $i
+ done >instructions
+'
+
+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 <instructions >/dev/null
+'
+
+test_done
diff --git a/t/perf/p3400-rebase.sh b/t/perf/p3400-rebase.sh
index d202aae..7a0bb29 100755
--- a/t/perf/p3400-rebase.sh
+++ b/t/perf/p3400-rebase.sh
@@ -9,16 +9,16 @@
git checkout -f -B base &&
git checkout -B to-rebase &&
git checkout -B upstream &&
- for i in $(seq 100)
+ for i in $(test_seq 100)
do
# simulate huge diffs
echo change$i >unrelated-file$i &&
- seq 1000 >>unrelated-file$i &&
+ test_seq 1000 >>unrelated-file$i &&
git add unrelated-file$i &&
test_tick &&
git commit -m commit$i unrelated-file$i &&
echo change$i >unrelated-file$i &&
- seq 1000 | tac >>unrelated-file$i &&
+ test_seq 1000 | tac >>unrelated-file$i &&
git add unrelated-file$i &&
test_tick &&
git commit -m commit$i-reverse unrelated-file$i ||
diff --git a/t/perf/p4205-log-pretty-formats.sh b/t/perf/p4205-log-pretty-formats.sh
index 7c26f4f..609fecd 100755
--- a/t/perf/p4205-log-pretty-formats.sh
+++ b/t/perf/p4205-log-pretty-formats.sh
@@ -6,7 +6,7 @@
test_perf_default_repo
-for format in %H %h %T %t %P %p %h-%h-%h
+for format in %H %h %T %t %P %p %h-%h-%h %an-%ae-%s
do
test_perf "log with $format" "
git log --format=\"$format\" >/dev/null
diff --git a/t/perf/p5302-pack-index.sh b/t/perf/p5302-pack-index.sh
index a9b3e11..228593d 100755
--- a/t/perf/p5302-pack-index.sh
+++ b/t/perf/p5302-pack-index.sh
@@ -13,35 +13,36 @@
export PACK
'
-test_perf 'index-pack 0 threads' '
+# 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 PERF_EXTRA '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
-'
-
-test_perf 'index-pack 2 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
-'
-
-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/t/perf/p5303-many-packs.sh b/t/perf/p5303-many-packs.sh
index 7ee7916..ce0c42c 100755
--- a/t/perf/p5303-many-packs.sh
+++ b/t/perf/p5303-many-packs.sh
@@ -21,10 +21,14 @@
mkdir staging &&
git rev-list --first-parent HEAD |
- sed -n '1~5p' |
- head -n "$1" |
- perl -e 'print reverse <>' \
- >pushes
+ perl -e '
+ my $n = shift;
+ while (<>) {
+ last unless @commits < $n;
+ push @commits, $_ if $. % 5 == 1;
+ }
+ print reverse @commits;
+ ' "$1" >pushes
# create base packfile
head -n 1 pushes |
@@ -73,6 +77,10 @@
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.
diff --git a/t/perf/p5310-pack-bitmaps.sh b/t/perf/p5310-pack-bitmaps.sh
index 7743f4f..b3e725f 100755
--- a/t/perf/p5310-pack-bitmaps.sh
+++ b/t/perf/p5310-pack-bitmaps.sh
@@ -31,10 +31,6 @@
} | 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
'
@@ -57,6 +53,11 @@
--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
'
@@ -90,4 +91,9 @@
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/t/perf/p7519-fsmonitor.sh b/t/perf/p7519-fsmonitor.sh
index def7ecd..b657564 100755
--- a/t/perf/p7519-fsmonitor.sh
+++ b/t/perf/p7519-fsmonitor.sh
@@ -22,7 +22,9 @@
#
# GIT_PERF_7519_UNTRACKED_CACHE: used to configure core.untrackedCache
# GIT_PERF_7519_SPLIT_INDEX: used to configure core.splitIndex
-# GIT_PERF_7519_FSMONITOR: used to configure core.fsMonitor
+# GIT_PERF_7519_FSMONITOR: used to configure core.fsMonitor. May be an
+# absolute path to an integration. May be a space delimited list of
+# absolute paths to integrations.
#
# The big win for using fsmonitor is the elimination of the need to scan the
# working directory looking for changed and untracked files. If the file
@@ -30,6 +32,8 @@
#
# GIT_PERF_7519_DROP_CACHE: if set, the OS caches are dropped between tests
#
+# GIT_PERF_7519_TRACE: if set, enable trace logging during the test.
+# Trace logs will be grouped by fsmonitor provider.
test_perf_large_repo
test_checkout_worktree
@@ -68,7 +72,33 @@
fi
fi
-test_expect_success "setup for fsmonitor" '
+trace_start() {
+ if test -n "$GIT_PERF_7519_TRACE"
+ then
+ name="$1"
+ TEST_TRACE_DIR="$TEST_OUTPUT_DIRECTORY/test-trace/p7519/"
+ echo "Writing trace logging to $TEST_TRACE_DIR"
+
+ mkdir -p "$TEST_TRACE_DIR"
+
+ # Start Trace2 logging and any other GIT_TRACE_* logs that you
+ # want for this named test case.
+
+ GIT_TRACE2_PERF="$TEST_TRACE_DIR/$name.trace2perf"
+ export GIT_TRACE2_PERF
+
+ >"$GIT_TRACE2_PERF"
+ fi
+}
+
+trace_stop() {
+ if test -n "$GIT_PERF_7519_TRACE"
+ then
+ unset GIT_TRACE2_PERF
+ fi
+}
+
+test_expect_success "one time repo setup" '
# set untrackedCache depending on the environment
if test -n "$GIT_PERF_7519_UNTRACKED_CACHE"
then
@@ -88,24 +118,36 @@
git config core.splitIndex "$GIT_PERF_7519_SPLIT_INDEX"
fi &&
+ mkdir 1_file 10_files 100_files 1000_files 10000_files &&
+ for i in $(test_seq 1 10); do touch 10_files/$i; done &&
+ for i in $(test_seq 1 100); do touch 100_files/$i; done &&
+ for i in $(test_seq 1 1000); do touch 1000_files/$i; done &&
+ for i in $(test_seq 1 10000); do touch 10000_files/$i; done &&
+ git add 1_file 10_files 100_files 1000_files 10000_files &&
+ git commit -qm "Add files" &&
+
+ # If Watchman exists, watch the work tree and attempt a query.
+ if test_have_prereq WATCHMAN; then
+ watchman watch "$GIT_WORK_TREE" &&
+ watchman watch-list | grep -q -F "p7519-fsmonitor"
+ fi
+'
+
+setup_for_fsmonitor() {
# set INTEGRATION_SCRIPT depending on the environment
- if test -n "$GIT_PERF_7519_FSMONITOR"
+ if test -n "$INTEGRATION_PATH"
then
- INTEGRATION_SCRIPT="$GIT_PERF_7519_FSMONITOR"
+ INTEGRATION_SCRIPT="$INTEGRATION_PATH"
else
#
# Choose integration script based on existence of Watchman.
- # If Watchman exists, watch the work tree and attempt a query.
- # If everything succeeds, use Watchman integration script,
- # else fall back to an empty integration script.
+ # Fall back to an empty integration script.
#
mkdir .git/hooks &&
if test_have_prereq WATCHMAN
then
INTEGRATION_SCRIPT=".git/hooks/fsmonitor-watchman" &&
- cp "$TEST_DIRECTORY/../templates/hooks--fsmonitor-watchman.sample" "$INTEGRATION_SCRIPT" &&
- watchman watch "$GIT_WORK_TREE" &&
- watchman watch-list | grep -q -F "$GIT_WORK_TREE"
+ cp "$TEST_DIRECTORY/../templates/hooks--fsmonitor-watchman.sample" "$INTEGRATION_SCRIPT"
else
INTEGRATION_SCRIPT=".git/hooks/fsmonitor-empty" &&
write_script "$INTEGRATION_SCRIPT"<<-\EOF
@@ -114,63 +156,107 @@
fi &&
git config core.fsmonitor "$INTEGRATION_SCRIPT" &&
- git update-index --fsmonitor
-'
+ git update-index --fsmonitor 2>error &&
+ if test_have_prereq WATCHMAN
+ then
+ test_must_be_empty error # ensure no silent error
+ else
+ grep "Empty last update token" error
+ fi
+}
-if test -n "$GIT_PERF_7519_DROP_CACHE"; then
- test-tool drop-caches
+test_perf_w_drop_caches () {
+ if test -n "$GIT_PERF_7519_DROP_CACHE"; then
+ test-tool drop-caches
+ fi
+
+ test_perf "$@"
+}
+
+test_fsmonitor_suite() {
+ if test -n "$INTEGRATION_SCRIPT"; then
+ DESC="fsmonitor=$(basename $INTEGRATION_SCRIPT)"
+ else
+ DESC="fsmonitor=disabled"
+ fi
+
+ test_expect_success "test_initialization" '
+ git reset --hard &&
+ git status # Warm caches
+ '
+
+ test_perf_w_drop_caches "status ($DESC)" '
+ git status
+ '
+
+ test_perf_w_drop_caches "status -uno ($DESC)" '
+ git status -uno
+ '
+
+ test_perf_w_drop_caches "status -uall ($DESC)" '
+ git status -uall
+ '
+
+ # Update the mtimes on upto 100k files to make status think
+ # that they are dirty. For simplicity, omit any files with
+ # LFs (i.e. anything that ls-files thinks it needs to dquote).
+ # Then fully backslash-quote the paths to capture any
+ # whitespace so that they pass thru xargs properly.
+ #
+ test_perf_w_drop_caches "status (dirty) ($DESC)" '
+ git ls-files | \
+ head -100000 | \
+ grep -v \" | \
+ sed '\''s/\(.\)/\\\1/g'\'' | \
+ xargs test-tool chmtime -300 &&
+ git status
+ '
+
+ test_perf_w_drop_caches "diff ($DESC)" '
+ git diff
+ '
+
+ test_perf_w_drop_caches "diff -- 0_files ($DESC)" '
+ git diff -- 1_file
+ '
+
+ test_perf_w_drop_caches "diff -- 10_files ($DESC)" '
+ git diff -- 10_files
+ '
+
+ test_perf_w_drop_caches "diff -- 100_files ($DESC)" '
+ git diff -- 100_files
+ '
+
+ test_perf_w_drop_caches "diff -- 1000_files ($DESC)" '
+ git diff -- 1000_files
+ '
+
+ test_perf_w_drop_caches "diff -- 10000_files ($DESC)" '
+ git diff -- 10000_files
+ '
+
+ test_perf_w_drop_caches "add ($DESC)" '
+ git add --all
+ '
+}
+
+#
+# Run a full set of perf tests using each Hook-based fsmonitor provider,
+# such as Watchman.
+#
+
+trace_start fsmonitor-watchman
+if test -n "$GIT_PERF_7519_FSMONITOR"; then
+ for INTEGRATION_PATH in $GIT_PERF_7519_FSMONITOR; do
+ test_expect_success "setup for fsmonitor $INTEGRATION_PATH" 'setup_for_fsmonitor'
+ test_fsmonitor_suite
+ done
+else
+ test_expect_success "setup for fsmonitor" 'setup_for_fsmonitor'
+ test_fsmonitor_suite
fi
-test_perf "status (fsmonitor=$INTEGRATION_SCRIPT)" '
- git status
-'
-
-if test -n "$GIT_PERF_7519_DROP_CACHE"; then
- test-tool drop-caches
-fi
-
-test_perf "status -uno (fsmonitor=$INTEGRATION_SCRIPT)" '
- git status -uno
-'
-
-if test -n "$GIT_PERF_7519_DROP_CACHE"; then
- test-tool drop-caches
-fi
-
-test_perf "status -uall (fsmonitor=$INTEGRATION_SCRIPT)" '
- git status -uall
-'
-
-test_expect_success "setup without fsmonitor" '
- unset INTEGRATION_SCRIPT &&
- git config --unset core.fsmonitor &&
- git update-index --no-fsmonitor
-'
-
-if test -n "$GIT_PERF_7519_DROP_CACHE"; then
- test-tool drop-caches
-fi
-
-test_perf "status (fsmonitor=$INTEGRATION_SCRIPT)" '
- git status
-'
-
-if test -n "$GIT_PERF_7519_DROP_CACHE"; then
- test-tool drop-caches
-fi
-
-test_perf "status -uno (fsmonitor=$INTEGRATION_SCRIPT)" '
- git status -uno
-'
-
-if test -n "$GIT_PERF_7519_DROP_CACHE"; then
- test-tool drop-caches
-fi
-
-test_perf "status -uall (fsmonitor=$INTEGRATION_SCRIPT)" '
- git status -uall
-'
-
if test_have_prereq WATCHMAN
then
watchman watch-del "$GIT_WORK_TREE" >/dev/null 2>&1 &&
@@ -179,5 +265,20 @@
# preventing the removal of the trash directory
watchman shutdown-server >/dev/null 2>&1
fi
+trace_stop
+
+#
+# Run a full set of perf tests with the fsmonitor feature disabled.
+#
+
+trace_start fsmonitor-disabled
+test_expect_success "setup without fsmonitor" '
+ unset INTEGRATION_SCRIPT &&
+ git config --unset core.fsmonitor &&
+ git update-index --no-fsmonitor
+'
+
+test_fsmonitor_suite
+trace_stop
test_done
diff --git a/t/perf/p9300-fast-import-export.sh b/t/perf/p9300-fast-import-export.sh
new file mode 100755
index 0000000..586161e
--- /dev/null
+++ b/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/t/perf/perf-lib.sh b/t/perf/perf-lib.sh
index 13e3893..e385c68 100644
--- a/t/perf/perf-lib.sh
+++ b/t/perf/perf-lib.sh
@@ -147,14 +147,16 @@
"$GTIME" -f "%E %U %S" -o test_time.$i "$SHELL" -c '
. '"$TEST_DIRECTORY"/test-lib-functions.sh'
test_export () {
- [ $# != 0 ] || return 0
- test_export_="$test_export_\\|$1"
- shift
- test_export "$@"
+ test_export_="$test_export_ $*"
}
'"$1"'
ret=$?
-set | sed -n "s'"/'/'\\\\''/g"';s/^\\($test_export_\\)/export '"'&'"'/p" >test_vars
+needles=
+for v in $test_export_
+do
+ needles="$needles;s/^$v=/export $v=/p"
+done
+set | sed -n "s'"/'/'\\\\''/g"'$needles" >test_vars
exit $ret' >&3 2>&4
eval_ret=$?
@@ -245,3 +247,5 @@
test_export () {
export "$@"
}
+
+test_lazy_prereq PERF_EXTRA 'test_bool_env GIT_PERF_EXTRA false'
diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index 3e440c0..705d62c 100755
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@ -77,9 +77,7 @@
# 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
@@ -94,15 +92,15 @@
. "\$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
)
}
@@ -137,32 +135,32 @@
)
}
-test_expect_success 'pretend we have a fully passing test suite' "
- run_sub_test_lib_test full-pass '3 passing tests' <<-\\EOF &&
+test_expect_success 'pretend we have a fully passing test suite' '
+ run_sub_test_lib_test full-pass "3 passing tests" <<-\EOF &&
for i in 1 2 3
do
- test_expect_success \"passing test #\$i\" 'true'
+ test_expect_success "passing test #$i" "true"
done
test_done
EOF
- check_sub_test_lib_test full-pass <<-\\EOF
+ check_sub_test_lib_test full-pass <<-\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 'pretend we have a partially passing test suite' "
+test_expect_success 'pretend we have a partially passing test suite' '
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'
- test_expect_success 'passing test #3' 'true'
+ partial-pass "2/3 tests passing" <<-\EOF &&
+ test_expect_success "passing test #1" "true"
+ test_expect_success "failing test #2" "false"
+ test_expect_success "passing test #3" "true"
test_done
EOF
- check_sub_test_lib_test partial-pass <<-\\EOF
+ check_sub_test_lib_test partial-pass <<-\EOF
> ok 1 - passing test #1
> not ok 2 - failing test #2
# false
@@ -170,44 +168,44 @@
> # failed 1 among 3 test(s)
> 1..3
EOF
-"
+'
-test_expect_success 'pretend we have a known breakage' "
- run_sub_test_lib_test failing-todo 'A failing TODO test' <<-\\EOF &&
- test_expect_success 'passing test' 'true'
- test_expect_failure 'pretend we have a known breakage' 'false'
+test_expect_success 'pretend we have a known breakage' '
+ run_sub_test_lib_test failing-todo "A failing TODO test" <<-\EOF &&
+ test_expect_success "passing test" "true"
+ test_expect_failure "pretend we have a known breakage" "false"
test_done
EOF
- check_sub_test_lib_test failing-todo <<-\\EOF
+ check_sub_test_lib_test failing-todo <<-\EOF
> ok 1 - passing test
> not ok 2 - pretend we have a known breakage # TODO known breakage
> # still have 1 known breakage(s)
> # passed all remaining 1 test(s)
> 1..2
EOF
-"
+'
-test_expect_success 'pretend we have fixed a known breakage' "
- run_sub_test_lib_test passing-todo 'A passing TODO test' <<-\\EOF &&
- test_expect_failure 'pretend we have fixed a known breakage' 'true'
+test_expect_success 'pretend we have fixed a known breakage' '
+ run_sub_test_lib_test passing-todo "A passing TODO test" <<-\EOF &&
+ test_expect_failure "pretend we have fixed a known breakage" "true"
test_done
EOF
- check_sub_test_lib_test passing-todo <<-\\EOF
+ check_sub_test_lib_test passing-todo <<-\EOF
> ok 1 - pretend we have fixed a known breakage # TODO known breakage vanished
> # 1 known breakage(s) vanished; please update test(s)
> 1..1
EOF
-"
+'
-test_expect_success 'pretend we have fixed one of two known breakages (run in sub test-lib)' "
+test_expect_success 'pretend we have fixed one of two known breakages (run in sub test-lib)' '
run_sub_test_lib_test partially-passing-todos \
- '2 TODO tests, one passing' <<-\\EOF &&
- test_expect_failure 'pretend we have a known breakage' 'false'
- test_expect_success 'pretend we have a passing test' 'true'
- test_expect_failure 'pretend we have fixed another known breakage' 'true'
+ "2 TODO tests, one passing" <<-\EOF &&
+ test_expect_failure "pretend we have a known breakage" "false"
+ test_expect_success "pretend we have a passing test" "true"
+ test_expect_failure "pretend we have fixed another known breakage" "true"
test_done
EOF
- check_sub_test_lib_test partially-passing-todos <<-\\EOF
+ check_sub_test_lib_test partially-passing-todos <<-\EOF
> not ok 1 - pretend we have a known breakage # TODO known breakage
> ok 2 - pretend we have a passing test
> ok 3 - pretend we have fixed another known breakage # TODO known breakage vanished
@@ -216,17 +214,17 @@
> # passed all remaining 1 test(s)
> 1..3
EOF
-"
+'
-test_expect_success 'pretend we have a pass, fail, and known breakage' "
+test_expect_success 'pretend we have a pass, fail, and known breakage' '
run_sub_test_lib_test_err \
- mixed-results1 'mixed results #1' <<-\\EOF &&
- test_expect_success 'passing test' 'true'
- test_expect_success 'failing test' 'false'
- test_expect_failure 'pretend we have a known breakage' 'false'
+ mixed-results1 "mixed results #1" <<-\EOF &&
+ test_expect_success "passing test" "true"
+ test_expect_success "failing test" "false"
+ test_expect_failure "pretend we have a known breakage" "false"
test_done
EOF
- check_sub_test_lib_test mixed-results1 <<-\\EOF
+ check_sub_test_lib_test mixed-results1 <<-\EOF
> ok 1 - passing test
> not ok 2 - failing test
> # false
@@ -235,24 +233,24 @@
> # failed 1 among remaining 2 test(s)
> 1..3
EOF
-"
+'
-test_expect_success 'pretend we have a mix of all possible results' "
+test_expect_success 'pretend we have a mix of all possible results' '
run_sub_test_lib_test_err \
- mixed-results2 'mixed results #2' <<-\\EOF &&
- test_expect_success 'passing test' 'true'
- test_expect_success 'passing test' 'true'
- test_expect_success 'passing test' 'true'
- test_expect_success 'passing test' 'true'
- test_expect_success 'failing test' 'false'
- test_expect_success 'failing test' 'false'
- test_expect_success 'failing test' 'false'
- test_expect_failure 'pretend we have a known breakage' 'false'
- test_expect_failure 'pretend we have a known breakage' 'false'
- test_expect_failure 'pretend we have fixed a known breakage' 'true'
+ mixed-results2 "mixed results #2" <<-\EOF &&
+ test_expect_success "passing test" "true"
+ test_expect_success "passing test" "true"
+ test_expect_success "passing test" "true"
+ test_expect_success "passing test" "true"
+ test_expect_success "failing test" "false"
+ test_expect_success "failing test" "false"
+ test_expect_success "failing test" "false"
+ test_expect_failure "pretend we have a known breakage" "false"
+ test_expect_failure "pretend we have a known breakage" "false"
+ test_expect_failure "pretend we have fixed a known breakage" "true"
test_done
EOF
- check_sub_test_lib_test mixed-results2 <<-\\EOF
+ check_sub_test_lib_test mixed-results2 <<-\EOF
> ok 1 - passing test
> ok 2 - passing test
> ok 3 - passing test
@@ -271,9 +269,9 @@
> # failed 3 among remaining 7 test(s)
> 1..10
EOF
-"
+'
-test_expect_success C_LOCALE_OUTPUT 'test --verbose' '
+test_expect_success 'test --verbose' '
run_sub_test_lib_test_err \
t1234-verbose "test verbose" --verbose <<-\EOF &&
test_expect_success "passing test" true
@@ -323,18 +321,18 @@
EOF
'
-test_expect_success 'GIT_SKIP_TESTS' "
+test_expect_success 'GIT_SKIP_TESTS' '
(
- GIT_SKIP_TESTS='git.2' && export GIT_SKIP_TESTS &&
+ GIT_SKIP_TESTS="git.2" && export GIT_SKIP_TESTS &&
run_sub_test_lib_test git-skip-tests-basic \
- 'GIT_SKIP_TESTS' <<-\\EOF &&
+ "GIT_SKIP_TESTS" <<-\EOF &&
for i in 1 2 3
do
- test_expect_success \"passing test #\$i\" 'true'
+ test_expect_success "passing test #$i" "true"
done
test_done
EOF
- check_sub_test_lib_test git-skip-tests-basic <<-\\EOF
+ check_sub_test_lib_test git-skip-tests-basic <<-\EOF
> ok 1 - passing test #1
> ok 2 # skip passing test #2 (GIT_SKIP_TESTS)
> ok 3 - passing test #3
@@ -342,20 +340,20 @@
> 1..3
EOF
)
-"
+'
-test_expect_success 'GIT_SKIP_TESTS several tests' "
+test_expect_success 'GIT_SKIP_TESTS several tests' '
(
- GIT_SKIP_TESTS='git.2 git.5' && export GIT_SKIP_TESTS &&
+ GIT_SKIP_TESTS="git.2 git.5" && export GIT_SKIP_TESTS &&
run_sub_test_lib_test git-skip-tests-several \
- 'GIT_SKIP_TESTS several tests' <<-\\EOF &&
+ "GIT_SKIP_TESTS several tests" <<-\EOF &&
for i in 1 2 3 4 5 6
do
- test_expect_success \"passing test #\$i\" 'true'
+ test_expect_success "passing test #$i" "true"
done
test_done
EOF
- check_sub_test_lib_test git-skip-tests-several <<-\\EOF
+ check_sub_test_lib_test git-skip-tests-several <<-\EOF
> ok 1 - passing test #1
> ok 2 # skip passing test #2 (GIT_SKIP_TESTS)
> ok 3 - passing test #3
@@ -366,20 +364,20 @@
> 1..6
EOF
)
-"
+'
-test_expect_success 'GIT_SKIP_TESTS sh pattern' "
+test_expect_success 'GIT_SKIP_TESTS sh pattern' '
(
- GIT_SKIP_TESTS='git.[2-5]' && export GIT_SKIP_TESTS &&
+ GIT_SKIP_TESTS="git.[2-5]" && export GIT_SKIP_TESTS &&
run_sub_test_lib_test git-skip-tests-sh-pattern \
- 'GIT_SKIP_TESTS sh pattern' <<-\\EOF &&
+ "GIT_SKIP_TESTS sh pattern" <<-\EOF &&
for i in 1 2 3 4 5 6
do
- test_expect_success \"passing test #\$i\" 'true'
+ test_expect_success "passing test #$i" "true"
done
test_done
EOF
- check_sub_test_lib_test git-skip-tests-sh-pattern <<-\\EOF
+ check_sub_test_lib_test git-skip-tests-sh-pattern <<-\EOF
> ok 1 - passing test #1
> ok 2 # skip passing test #2 (GIT_SKIP_TESTS)
> ok 3 # skip passing test #3 (GIT_SKIP_TESTS)
@@ -390,37 +388,37 @@
> 1..6
EOF
)
-"
+'
-test_expect_success 'GIT_SKIP_TESTS entire suite' "
+test_expect_success 'GIT_SKIP_TESTS entire suite' '
(
- GIT_SKIP_TESTS='git' && export GIT_SKIP_TESTS &&
+ GIT_SKIP_TESTS="git" && export GIT_SKIP_TESTS &&
run_sub_test_lib_test git-skip-tests-entire-suite \
- 'GIT_SKIP_TESTS entire suite' <<-\\EOF &&
+ "GIT_SKIP_TESTS entire suite" <<-\EOF &&
for i in 1 2 3
do
- test_expect_success \"passing test #\$i\" 'true'
+ test_expect_success "passing test #$i" "true"
done
test_done
EOF
- check_sub_test_lib_test git-skip-tests-entire-suite <<-\\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' "
+test_expect_success 'GIT_SKIP_TESTS does not skip unmatched suite' '
(
- GIT_SKIP_TESTS='notgit' && export GIT_SKIP_TESTS &&
+ 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 &&
+ "GIT_SKIP_TESTS does not skip unmatched suite" <<-\EOF &&
for i in 1 2 3
do
- test_expect_success \"passing test #\$i\" 'true'
+ test_expect_success "passing test #$i" "true"
done
test_done
EOF
- check_sub_test_lib_test git-skip-tests-unmatched-suite <<-\\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
@@ -428,18 +426,18 @@
> 1..3
EOF
)
-"
+'
-test_expect_success '--run basic' "
+test_expect_success '--run basic' '
run_sub_test_lib_test run-basic \
- '--run basic' --run='1 3 5' <<-\\EOF &&
+ "--run basic" --run="1,3,5" <<-\EOF &&
for i in 1 2 3 4 5 6
do
- test_expect_success \"passing test #\$i\" 'true'
+ test_expect_success "passing test #$i" "true"
done
test_done
EOF
- check_sub_test_lib_test run-basic <<-\\EOF
+ check_sub_test_lib_test run-basic <<-\EOF
> ok 1 - passing test #1
> ok 2 # skip passing test #2 (--run)
> ok 3 - passing test #3
@@ -449,18 +447,18 @@
> # passed all 6 test(s)
> 1..6
EOF
-"
+'
-test_expect_success '--run with a range' "
+test_expect_success '--run with a range' '
run_sub_test_lib_test run-range \
- '--run with a range' --run='1-3' <<-\\EOF &&
+ "--run with a range" --run="1-3" <<-\EOF &&
for i in 1 2 3 4 5 6
do
- test_expect_success \"passing test #\$i\" 'true'
+ test_expect_success "passing test #$i" "true"
done
test_done
EOF
- check_sub_test_lib_test run-range <<-\\EOF
+ check_sub_test_lib_test run-range <<-\EOF
> ok 1 - passing test #1
> ok 2 - passing test #2
> ok 3 - passing test #3
@@ -470,18 +468,18 @@
> # passed all 6 test(s)
> 1..6
EOF
-"
+'
-test_expect_success '--run with two ranges' "
+test_expect_success '--run with two ranges' '
run_sub_test_lib_test run-two-ranges \
- '--run with two ranges' --run='1-2 5-6' <<-\\EOF &&
+ "--run with two ranges" --run="1-2,5-6" <<-\EOF &&
for i in 1 2 3 4 5 6
do
- test_expect_success \"passing test #\$i\" 'true'
+ test_expect_success "passing test #$i" "true"
done
test_done
EOF
- check_sub_test_lib_test run-two-ranges <<-\\EOF
+ check_sub_test_lib_test run-two-ranges <<-\EOF
> ok 1 - passing test #1
> ok 2 - passing test #2
> ok 3 # skip passing test #3 (--run)
@@ -491,18 +489,18 @@
> # passed all 6 test(s)
> 1..6
EOF
-"
+'
-test_expect_success '--run with a left open range' "
+test_expect_success '--run with a left open range' '
run_sub_test_lib_test run-left-open-range \
- '--run with a left open range' --run='-3' <<-\\EOF &&
+ "--run with a left open range" --run="-3" <<-\EOF &&
for i in 1 2 3 4 5 6
do
- test_expect_success \"passing test #\$i\" 'true'
+ test_expect_success "passing test #$i" "true"
done
test_done
EOF
- check_sub_test_lib_test run-left-open-range <<-\\EOF
+ check_sub_test_lib_test run-left-open-range <<-\EOF
> ok 1 - passing test #1
> ok 2 - passing test #2
> ok 3 - passing test #3
@@ -512,18 +510,18 @@
> # passed all 6 test(s)
> 1..6
EOF
-"
+'
-test_expect_success '--run with a right open range' "
+test_expect_success '--run with a right open range' '
run_sub_test_lib_test run-right-open-range \
- '--run with a right open range' --run='4-' <<-\\EOF &&
+ "--run with a right open range" --run="4-" <<-\EOF &&
for i in 1 2 3 4 5 6
do
- test_expect_success \"passing test #\$i\" 'true'
+ test_expect_success "passing test #$i" "true"
done
test_done
EOF
- check_sub_test_lib_test run-right-open-range <<-\\EOF
+ check_sub_test_lib_test run-right-open-range <<-\EOF
> ok 1 # skip passing test #1 (--run)
> ok 2 # skip passing test #2 (--run)
> ok 3 # skip passing test #3 (--run)
@@ -533,18 +531,18 @@
> # passed all 6 test(s)
> 1..6
EOF
-"
+'
-test_expect_success '--run with basic negation' "
+test_expect_success '--run with basic negation' '
run_sub_test_lib_test run-basic-neg \
- '--run with basic negation' --run='"'!3'"' <<-\\EOF &&
+ "--run with basic negation" --run="!3" <<-\EOF &&
for i in 1 2 3 4 5 6
do
- test_expect_success \"passing test #\$i\" 'true'
+ test_expect_success "passing test #$i" "true"
done
test_done
EOF
- check_sub_test_lib_test run-basic-neg <<-\\EOF
+ check_sub_test_lib_test run-basic-neg <<-\EOF
> ok 1 - passing test #1
> ok 2 - passing test #2
> ok 3 # skip passing test #3 (--run)
@@ -554,18 +552,18 @@
> # passed all 6 test(s)
> 1..6
EOF
-"
+'
-test_expect_success '--run with two negations' "
+test_expect_success '--run with two negations' '
run_sub_test_lib_test run-two-neg \
- '--run with two negations' --run='"'!3 !6'"' <<-\\EOF &&
+ "--run with two negations" --run="!3,!6" <<-\EOF &&
for i in 1 2 3 4 5 6
do
- test_expect_success \"passing test #\$i\" 'true'
+ test_expect_success "passing test #$i" "true"
done
test_done
EOF
- check_sub_test_lib_test run-two-neg <<-\\EOF
+ check_sub_test_lib_test run-two-neg <<-\EOF
> ok 1 - passing test #1
> ok 2 - passing test #2
> ok 3 # skip passing test #3 (--run)
@@ -575,18 +573,18 @@
> # passed all 6 test(s)
> 1..6
EOF
-"
+'
-test_expect_success '--run a range and negation' "
+test_expect_success '--run a range and negation' '
run_sub_test_lib_test run-range-and-neg \
- '--run a range and negation' --run='"'-4 !2'"' <<-\\EOF &&
+ "--run a range and negation" --run="-4,!2" <<-\EOF &&
for i in 1 2 3 4 5 6
do
- test_expect_success \"passing test #\$i\" 'true'
+ test_expect_success "passing test #$i" "true"
done
test_done
EOF
- check_sub_test_lib_test run-range-and-neg <<-\\EOF
+ check_sub_test_lib_test run-range-and-neg <<-\EOF
> ok 1 - passing test #1
> ok 2 # skip passing test #2 (--run)
> ok 3 - passing test #3
@@ -596,18 +594,18 @@
> # passed all 6 test(s)
> 1..6
EOF
-"
+'
-test_expect_success '--run range negation' "
+test_expect_success '--run range negation' '
run_sub_test_lib_test run-range-neg \
- '--run range negation' --run='"'!1-3'"' <<-\\EOF &&
+ "--run range negation" --run="!1-3" <<-\EOF &&
for i in 1 2 3 4 5 6
do
- test_expect_success \"passing test #\$i\" 'true'
+ test_expect_success "passing test #$i" "true"
done
test_done
EOF
- check_sub_test_lib_test run-range-neg <<-\\EOF
+ check_sub_test_lib_test run-range-neg <<-\EOF
> ok 1 # skip passing test #1 (--run)
> ok 2 # skip passing test #2 (--run)
> ok 3 # skip passing test #3 (--run)
@@ -617,19 +615,19 @@
> # passed all 6 test(s)
> 1..6
EOF
-"
+'
-test_expect_success '--run include, exclude and include' "
+test_expect_success '--run include, exclude and include' '
run_sub_test_lib_test run-inc-neg-inc \
- '--run include, exclude and include' \
- --run='"'1-5 !1-3 2'"' <<-\\EOF &&
+ "--run include, exclude and include" \
+ --run="1-5,!1-3,2" <<-\EOF &&
for i in 1 2 3 4 5 6
do
- test_expect_success \"passing test #\$i\" 'true'
+ test_expect_success "passing test #$i" "true"
done
test_done
EOF
- check_sub_test_lib_test run-inc-neg-inc <<-\\EOF
+ check_sub_test_lib_test run-inc-neg-inc <<-\EOF
> ok 1 # skip passing test #1 (--run)
> ok 2 - passing test #2
> ok 3 # skip passing test #3 (--run)
@@ -639,19 +637,19 @@
> # passed all 6 test(s)
> 1..6
EOF
-"
+'
-test_expect_success '--run include, exclude and include, comma separated' "
+test_expect_success '--run include, exclude and include, comma separated' '
run_sub_test_lib_test run-inc-neg-inc-comma \
- '--run include, exclude and include, comma separated' \
- --run=1-5,\!1-3,2 <<-\\EOF &&
+ "--run include, exclude and include, comma separated" \
+ --run=1-5,!1-3,2 <<-\EOF &&
for i in 1 2 3 4 5 6
do
- test_expect_success \"passing test #\$i\" 'true'
+ test_expect_success "passing test #$i" "true"
done
test_done
EOF
- check_sub_test_lib_test run-inc-neg-inc-comma <<-\\EOF
+ check_sub_test_lib_test run-inc-neg-inc-comma <<-\EOF
> ok 1 # skip passing test #1 (--run)
> ok 2 - passing test #2
> ok 3 # skip passing test #3 (--run)
@@ -661,19 +659,19 @@
> # passed all 6 test(s)
> 1..6
EOF
-"
+'
-test_expect_success '--run exclude and include' "
+test_expect_success '--run exclude and include' '
run_sub_test_lib_test run-neg-inc \
- '--run exclude and include' \
- --run='"'!3- 5'"' <<-\\EOF &&
+ "--run exclude and include" \
+ --run="!3-,5" <<-\EOF &&
for i in 1 2 3 4 5 6
do
- test_expect_success \"passing test #\$i\" 'true'
+ test_expect_success "passing test #$i" "true"
done
test_done
EOF
- check_sub_test_lib_test run-neg-inc <<-\\EOF
+ check_sub_test_lib_test run-neg-inc <<-\EOF
> ok 1 - passing test #1
> ok 2 - passing test #2
> ok 3 # skip passing test #3 (--run)
@@ -683,19 +681,19 @@
> # passed all 6 test(s)
> 1..6
EOF
-"
+'
-test_expect_success '--run empty selectors' "
+test_expect_success '--run empty selectors' '
run_sub_test_lib_test run-empty-sel \
- '--run empty selectors' \
- --run='1,,3,,,5' <<-\\EOF &&
+ "--run empty selectors" \
+ --run="1,,3,,,5" <<-\EOF &&
for i in 1 2 3 4 5 6
do
- test_expect_success \"passing test #\$i\" 'true'
+ test_expect_success "passing test #$i" "true"
done
test_done
EOF
- check_sub_test_lib_test run-empty-sel <<-\\EOF
+ check_sub_test_lib_test run-empty-sel <<-\EOF
> ok 1 - passing test #1
> ok 2 # skip passing test #2 (--run)
> ok 3 - passing test #3
@@ -705,148 +703,189 @@
> # passed all 6 test(s)
> 1..6
EOF
-"
+'
-test_expect_success '--run invalid range start' "
+test_expect_success '--run substring selector' '
+ run_sub_test_lib_test run-substring-selector \
+ "--run empty selectors" \
+ --run="relevant" <<-\EOF &&
+ test_expect_success "relevant test" "true"
+ for i in 1 2 3 4 5 6
+ do
+ test_expect_success "other test #$i" "true"
+ done
+ test_done
+ EOF
+ check_sub_test_lib_test run-substring-selector <<-\EOF
+ > ok 1 - relevant test
+ > ok 2 # skip other test #1 (--run)
+ > ok 3 # skip other test #2 (--run)
+ > ok 4 # skip other test #3 (--run)
+ > ok 5 # skip other test #4 (--run)
+ > ok 6 # skip other test #5 (--run)
+ > ok 7 # skip other test #6 (--run)
+ > # passed all 7 test(s)
+ > 1..7
+ EOF
+'
+
+test_expect_success '--run keyword selection' '
run_sub_test_lib_test_err run-inv-range-start \
- '--run invalid range start' \
- --run='a-5' <<-\\EOF &&
- test_expect_success \"passing test #1\" 'true'
+ "--run invalid range start" \
+ --run="a-5" <<-\EOF &&
+ test_expect_success "passing test #1" "true"
test_done
EOF
check_sub_test_lib_test_err run-inv-range-start \
- <<-\\EOF_OUT 3<<-\\EOF_ERR
+ <<-\EOF_OUT 3<<-EOF_ERR
> FATAL: Unexpected exit with code 1
EOF_OUT
- > error: --run: invalid non-numeric in range start: 'a-5'
+ > error: --run: invalid non-numeric in range start: ${SQ}a-5${SQ}
EOF_ERR
-"
+'
-test_expect_success '--run invalid range end' "
+test_expect_success '--run invalid range end' '
run_sub_test_lib_test_err run-inv-range-end \
- '--run invalid range end' \
- --run='1-z' <<-\\EOF &&
- test_expect_success \"passing test #1\" 'true'
+ "--run invalid range end" \
+ --run="1-z" <<-\EOF &&
+ test_expect_success "passing test #1" "true"
test_done
EOF
check_sub_test_lib_test_err run-inv-range-end \
- <<-\\EOF_OUT 3<<-\\EOF_ERR
+ <<-\EOF_OUT 3<<-EOF_ERR
> FATAL: Unexpected exit with code 1
EOF_OUT
- > error: --run: invalid non-numeric in range end: '1-z'
+ > error: --run: invalid non-numeric in range end: ${SQ}1-z${SQ}
EOF_ERR
-"
+'
-test_expect_success '--run invalid selector' "
- run_sub_test_lib_test_err run-inv-selector \
- '--run invalid selector' \
- --run='1?' <<-\\EOF &&
- test_expect_success \"passing test #1\" 'true'
+test_expect_success 'tests respect prerequisites' '
+ run_sub_test_lib_test prereqs "tests respect prereqs" <<-\EOF &&
+
+ test_set_prereq HAVEIT
+ test_expect_success HAVEIT "prereq is satisfied" "true"
+ test_expect_success "have_prereq works" "
+ test_have_prereq HAVEIT
+ "
+ test_expect_success DONTHAVEIT "prereq not satisfied" "false"
+
+ test_set_prereq HAVETHIS
+ test_expect_success HAVETHIS,HAVEIT "multiple prereqs" "true"
+ test_expect_success HAVEIT,DONTHAVEIT "mixed prereqs (yes,no)" "false"
+ test_expect_success DONTHAVEIT,HAVEIT "mixed prereqs (no,yes)" "false"
+
test_done
EOF
- check_sub_test_lib_test_err run-inv-selector \
- <<-\\EOF_OUT 3<<-\\EOF_ERR
- > FATAL: Unexpected exit with code 1
- EOF_OUT
- > error: --run: invalid non-numeric in test selector: '1?'
- EOF_ERR
-"
-
-test_set_prereq HAVEIT
-haveit=no
-test_expect_success HAVEIT 'test runs if prerequisite is satisfied' '
- test_have_prereq HAVEIT &&
- haveit=yes
-'
-donthaveit=yes
-test_expect_success DONTHAVEIT 'unmet prerequisite causes test to be skipped' '
- donthaveit=no
-'
-if test -z "$GIT_TEST_FAIL_PREREQS_INTERNAL" -a $haveit$donthaveit != yesyes
-then
- say "bug in test framework: prerequisite tags do not work reliably"
- exit 1
-fi
-
-test_set_prereq HAVETHIS
-haveit=no
-test_expect_success HAVETHIS,HAVEIT 'test runs if prerequisites are satisfied' '
- test_have_prereq HAVEIT &&
- test_have_prereq HAVETHIS &&
- haveit=yes
-'
-donthaveit=yes
-test_expect_success HAVEIT,DONTHAVEIT 'unmet prerequisites causes test to be skipped' '
- donthaveit=no
-'
-donthaveiteither=yes
-test_expect_success DONTHAVEIT,HAVEIT 'unmet prerequisites causes test to be skipped' '
- donthaveiteither=no
-'
-if test -z "$GIT_TEST_FAIL_PREREQS_INTERNAL" -a $haveit$donthaveit$donthaveiteither != yesyesyes
-then
- say "bug in test framework: multiple prerequisite tags do not work reliably"
- exit 1
-fi
-
-test_lazy_prereq LAZY_TRUE true
-havetrue=no
-test_expect_success LAZY_TRUE 'test runs if lazy prereq is satisfied' '
- havetrue=yes
-'
-donthavetrue=yes
-test_expect_success !LAZY_TRUE 'missing lazy prereqs skip tests' '
- donthavetrue=no
+ check_sub_test_lib_test prereqs <<-\EOF
+ ok 1 - prereq is satisfied
+ ok 2 - have_prereq works
+ ok 3 # skip prereq not satisfied (missing DONTHAVEIT)
+ ok 4 - multiple prereqs
+ ok 5 # skip mixed prereqs (yes,no) (missing DONTHAVEIT of HAVEIT,DONTHAVEIT)
+ ok 6 # skip mixed prereqs (no,yes) (missing DONTHAVEIT of DONTHAVEIT,HAVEIT)
+ # passed all 6 test(s)
+ 1..6
+ EOF
'
-if test -z "$GIT_TEST_FAIL_PREREQS_INTERNAL" -a "$havetrue$donthavetrue" != yesyes
-then
- say 'bug in test framework: lazy prerequisites do not work'
- exit 1
-fi
+test_expect_success 'tests respect lazy prerequisites' '
+ run_sub_test_lib_test lazy-prereqs "respect lazy prereqs" <<-\EOF &&
-test_lazy_prereq LAZY_FALSE false
-nothavefalse=no
-test_expect_success !LAZY_FALSE 'negative lazy prereqs checked' '
- nothavefalse=yes
-'
-havefalse=yes
-test_expect_success LAZY_FALSE 'missing negative lazy prereqs will skip' '
- havefalse=no
+ test_lazy_prereq LAZY_TRUE true
+ test_expect_success LAZY_TRUE "lazy prereq is satisifed" "true"
+ test_expect_success !LAZY_TRUE "negative lazy prereq" "false"
+
+ test_lazy_prereq LAZY_FALSE false
+ test_expect_success LAZY_FALSE "lazy prereq not satisfied" "false"
+ test_expect_success !LAZY_FALSE "negative false prereq" "true"
+
+ test_done
+ EOF
+
+ check_sub_test_lib_test lazy-prereqs <<-\EOF
+ ok 1 - lazy prereq is satisifed
+ ok 2 # skip negative lazy prereq (missing !LAZY_TRUE)
+ ok 3 # skip lazy prereq not satisfied (missing LAZY_FALSE)
+ ok 4 - negative false prereq
+ # passed all 4 test(s)
+ 1..4
+ EOF
'
-if test -z "$GIT_TEST_FAIL_PREREQS_INTERNAL" -a "$nothavefalse$havefalse" != yesyes
-then
- say 'bug in test framework: negative lazy prerequisites do not work'
- exit 1
-fi
+test_expect_success 'nested lazy prerequisites' '
+ run_sub_test_lib_test nested-lazy "nested lazy prereqs" <<-\EOF &&
-clean=no
+ test_lazy_prereq NESTED_INNER "
+ >inner &&
+ rm -f outer
+ "
+ test_lazy_prereq NESTED_PREREQ "
+ >outer &&
+ test_have_prereq NESTED_INNER &&
+ echo can create new file in cwd >file &&
+ test_path_is_file outer &&
+ test_path_is_missing inner
+ "
+ test_expect_success NESTED_PREREQ "evaluate nested prereq" "true"
+
+ test_done
+ EOF
+
+ check_sub_test_lib_test nested-lazy <<-\EOF
+ ok 1 - evaluate nested prereq
+ # passed all 1 test(s)
+ 1..1
+ EOF
+'
+
+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 after themselves' '
- test_when_finished clean=yes
+ run_sub_test_lib_test cleanup "test with cleanup" <<-\EOF &&
+ clean=no
+ test_expect_success "do cleanup" "
+ test_when_finished clean=yes
+ "
+ test_expect_success "cleanup happened" "
+ test $clean = yes
+ "
+ test_done
+ EOF
+
+ check_sub_test_lib_test cleanup <<-\EOF
+ ok 1 - do cleanup
+ ok 2 - cleanup happened
+ # passed all 2 test(s)
+ 1..2
+ EOF
'
-if test -z "$GIT_TEST_FAIL_PREREQS_INTERNAL" -a $clean != yes
-then
- say "bug in test framework: basic cleanup command does not work reliably"
- exit 1
-fi
-
-test_expect_success 'tests clean up even on failures' "
+test_expect_success 'tests clean up even on failures' '
run_sub_test_lib_test_err \
- failing-cleanup 'Failing tests with cleanup commands' <<-\\EOF &&
- test_expect_success 'tests clean up even after a failure' '
+ failing-cleanup "Failing tests with cleanup commands" <<-\EOF &&
+ test_expect_success "tests clean up even after a failure" "
touch clean-after-failure &&
test_when_finished rm clean-after-failure &&
(exit 1)
- '
- test_expect_success 'failure to clean up causes the test to fail' '
+ "
+ test_expect_success "failure to clean up causes the test to fail" "
test_when_finished \"(exit 2)\"
- '
+ "
test_done
EOF
- check_sub_test_lib_test failing-cleanup <<-\\EOF
+ check_sub_test_lib_test failing-cleanup <<-\EOF
> not ok 1 - tests clean up even after a failure
> # Z
> # touch clean-after-failure &&
@@ -855,33 +894,29 @@
> # Z
> not ok 2 - failure to clean up causes the test to fail
> # Z
- > # test_when_finished \"(exit 2)\"
+ > # test_when_finished "(exit 2)"
> # Z
> # failed 2 among 2 test(s)
> 1..2
EOF
-"
+'
-test_expect_success 'test_atexit is run' "
+test_expect_success 'test_atexit is run' '
run_sub_test_lib_test_err \
- atexit-cleanup 'Run atexit commands' -i <<-\\EOF &&
- test_expect_success 'tests clean up even after a failure' '
+ atexit-cleanup "Run atexit commands" -i <<-\EOF &&
+ test_expect_success "tests clean up even after a failure" "
> ../../clean-atexit &&
test_atexit rm ../../clean-atexit &&
> ../../also-clean-atexit &&
test_atexit rm ../../also-clean-atexit &&
> ../../dont-clean-atexit &&
(exit 1)
- '
+ "
test_done
EOF
test_path_is_file dont-clean-atexit &&
test_path_is_missing clean-atexit &&
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' '
@@ -917,6 +952,17 @@
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 &&
@@ -1173,7 +1219,7 @@
test_expect_success 'git read-tree followed by write-tree should be idempotent' '
rm -f .git/index &&
git read-tree $tree &&
- test -f .git/index &&
+ test_path_is_file .git/index &&
newtree=$(git write-tree) &&
test "$newtree" = "$tree"
'
@@ -1260,4 +1306,22 @@
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/t/t0001-init.sh b/t/t0001-init.sh
index 26f8206..0803994 100755
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh
@@ -163,7 +163,7 @@
(
mkdir again &&
cd again &&
- git init >out1 2>err1 &&
+ git -c init.defaultBranch=initial init >out1 2>err1 &&
git init >out2 2>err2
) &&
test_i18ngrep "Initialized empty" again/out1 &&
@@ -316,6 +316,28 @@
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_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 @@
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 '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,52 @@
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_TEST_DEFAULT_INITIAL_BRANCH_NAME= git init initial-branch-config &&
+ git -C initial-branch-config symbolic-ref HEAD >actual &&
+ grep nmb actual
+'
+
+test_expect_success 'advice on unconfigured init.defaultBranch' '
+ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= git -c color.advice=always \
+ init unconfigured-default-branch-name 2>err &&
+ test_decode_color <err >decoded &&
+ test_i18ngrep "<YELLOW>hint: " decoded
+'
+
+test_expect_success 'overridden default main branch name (env)' '
+ test_config_global init.defaultBranch nmb &&
+ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=env git init main-branch-env &&
+ git -C main-branch-env symbolic-ref HEAD >actual &&
+ grep env actual
+'
+
+test_expect_success 'invalid default branch name' '
+ test_must_fail env GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME="with space" \
+ git init initial-branch-invalid 2>err &&
+ test_i18ngrep "invalid branch name" err
+'
+
+test_expect_success 'branch -m with the initial branch' '
+ git init rename-initial &&
+ git -C rename-initial branch -m renamed &&
+ test renamed = $(git -C rename-initial symbolic-ref --short HEAD) &&
+ git -C rename-initial branch -m renamed again &&
+ test again = $(git -C rename-initial symbolic-ref --short HEAD)
+'
+
test_done
diff --git a/t/t0002-gitfile.sh b/t/t0002-gitfile.sh
index 0aa9908..8440e6a 100755
--- a/t/t0002-gitfile.sh
+++ b/t/t0002-gitfile.sh
@@ -4,6 +4,9 @@
Verify that plumbing commands work when .git is a file
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
objpath() {
@@ -62,7 +65,7 @@
'
test_expect_success 'check rev-list' '
- echo $SHA >"$REAL/HEAD" &&
+ git update-ref "HEAD" "$SHA" &&
test "$SHA" = "$(git rev-list HEAD)"
'
@@ -96,7 +99,7 @@
git ls-remote enter_repo >actual &&
cat >expected <<-EOF &&
$head HEAD
- $head refs/heads/master
+ $head refs/heads/main
$head refs/tags/foo
EOF
test_cmp expected actual
@@ -111,7 +114,7 @@
git ls-remote foo >actual &&
cat >expected <<-EOF &&
$head HEAD
- $head refs/heads/master
+ $head refs/heads/main
$head refs/tags/foo
EOF
test_cmp expected actual
@@ -122,7 +125,7 @@
git ls-remote --upload-pack="git upload-pack --strict" foo/.git >actual &&
cat >expected <<-EOF &&
$head HEAD
- $head refs/heads/master
+ $head refs/heads/main
$head refs/tags/foo
EOF
test_cmp expected actual
diff --git a/t/t0006-date.sh b/t/t0006-date.sh
index d9fcc82..6b757d7 100755
--- a/t/t0006-date.sh
+++ b/t/t0006-date.sh
@@ -11,7 +11,7 @@
echo "$t -> $2" >expect
test_expect_${3:-success} "relative date ($2)" "
test-tool date relative $t >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
"
}
@@ -81,6 +81,11 @@
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'
@@ -103,6 +108,7 @@
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'
@@ -133,7 +139,7 @@
echo "$t -> $2" >expect
test_expect_success "human date $t" '
test-tool date human $t >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
}
diff --git a/t/t0007-git-var.sh b/t/t0007-git-var.sh
index 1f600e2..88b9ae8 100755
--- a/t/t0007-git-var.sh
+++ b/t/t0007-git-var.sh
@@ -17,7 +17,7 @@
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/t/t0008-ignores.sh b/t/t0008-ignores.sh
index 370a389..f7abde6 100755
--- a/t/t0008-ignores.sh
+++ b/t/t0008-ignores.sh
@@ -34,7 +34,7 @@
test_stderr () {
expected="$1"
expect_in stderr "$1" &&
- test_i18ncmp "$HOME/expected-stderr" "$HOME/stderr"
+ test_cmp "$HOME/expected-stderr" "$HOME/stderr"
}
broken_c_unquote () {
diff --git a/t/t0012-help.sh b/t/t0012-help.sh
index e8ef730..5679e29 100755
--- a/t/t0012-help.sh
+++ b/t/t0012-help.sh
@@ -55,7 +55,7 @@
git: 'revisions' is not a git command. See 'git --help'.
EOF
test_must_fail git revisions --help 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
"
test_expect_success 'git help' '
diff --git a/t/t0017-env-helper.sh b/t/t0017-env-helper.sh
index c1ecf6a..4a159f9 100755
--- a/t/t0017-env-helper.sh
+++ b/t/t0017-env-helper.sh
@@ -86,14 +86,14 @@
git config -f home/cycle include.path .gitconfig &&
test_must_fail \
- env HOME="$(pwd)/home" GIT_TEST_GETTEXT_POISON=false \
+ env HOME="$(pwd)/home" \
git config -l 2>err &&
grep "exceeded maximum include depth" err &&
test_must_fail \
- env HOME="$(pwd)/home" GIT_TEST_GETTEXT_POISON=true \
- git -C cycle env--helper --type=bool --default=0 --exit-code GIT_TEST_GETTEXT_POISON 2>err &&
- grep "# GETTEXT POISON #" err
+ env HOME="$(pwd)/home" GIT_TEST_ENV_HELPER=true \
+ git -C cycle env--helper --type=bool --default=0 --exit-code GIT_TEST_ENV_HELPER 2>err &&
+ grep "exceeded maximum include depth" err
'
test_done
diff --git a/t/t0018-advice.sh b/t/t0018-advice.sh
new file mode 100755
index 0000000..39e5e4b
--- /dev/null
+++ b/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_cmp 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_cmp 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/t/t0020-crlf.sh b/t/t0020-crlf.sh
index b63ba62..f25ae8b 100755
--- a/t/t0020-crlf.sh
+++ b/t/t0020-crlf.sh
@@ -2,6 +2,9 @@
test_description='CRLF conversion'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
has_cr() {
@@ -84,10 +87,8 @@
git commit -m "nowarn" &&
for w in Oh here is CRLFQ in text; do echo $w; done | q_to_cr >doublewarn &&
git add doublewarn 2>err &&
- if test_have_prereq C_LOCALE_OUTPUT
- then
- test $(grep "CRLF will be replaced by LF" err | wc -l) = 1
- fi
+ grep "CRLF will be replaced by LF" err >err.warnings &&
+ test_line_count = 1 err.warnings
'
@@ -318,8 +319,8 @@
git add .gitattributes .file &&
git commit -m second &&
- git checkout master~1 &&
- git checkout master &&
+ git checkout main~1 &&
+ git checkout main &&
test "$(git diff-files --raw)" = ""
'
@@ -331,8 +332,8 @@
git add .file2 &&
git commit -m third &&
- git checkout master~1 &&
- git checkout master &&
+ git checkout main~1 &&
+ git checkout main &&
has_cr .file2
'
diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh
index dc664da..a9e10a0 100755
--- a/t/t0021-conversion.sh
+++ b/t/t0021-conversion.sh
@@ -2,6 +2,9 @@
test_description='blob conversion via gitattributes'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
TEST_ROOT="$PWD"
@@ -23,10 +26,6 @@
perl -pe "s/./chr((ord($&) % 26) + ord('a'))/sge" >"$TEST_ROOT/$NAME"
}
-file_size () {
- test-tool path-utils file-size "$1"
-}
-
filter_git () {
rm -f *.log &&
git "$@"
@@ -35,7 +34,7 @@
# Compare two files and ensure that `clean` and `smudge` respectively are
# called at least once if specified in the `expect` file. The actual
# invocation count is not relevant because their number can vary.
-# c.f. http://lore.kernel.org/git/xmqqshv18i8i.fsf@gitster.mtv.corp.google.com/
+# c.f. https://lore.kernel.org/git/xmqqshv18i8i.fsf@gitster.mtv.corp.google.com/
test_cmp_count () {
expect=$1
actual=$2
@@ -50,7 +49,7 @@
# Compare two files but exclude all `clean` invocations because Git can
# call `clean` zero or more times.
-# c.f. http://lore.kernel.org/git/xmqqshv18i8i.fsf@gitster.mtv.corp.google.com/
+# c.f. https://lore.kernel.org/git/xmqqshv18i8i.fsf@gitster.mtv.corp.google.com/
test_cmp_exclude_clean () {
expect=$1
actual=$2
@@ -361,9 +360,13 @@
cp "$TEST_ROOT/test3 '\''sq'\'',\$x=.o" "testsubdir/test3 '\''sq'\'',\$x=.r" &&
>test4-empty.r &&
- S=$(file_size test.r) &&
- S2=$(file_size test2.r) &&
- S3=$(file_size "testsubdir/test3 '\''sq'\'',\$x=.r") &&
+ S=$(test_file_size test.r) &&
+ S2=$(test_file_size test2.r) &&
+ S3=$(test_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,14 +381,16 @@
test_cmp_count expected.log debug.log &&
git commit -m "test commit 2" &&
+ MAIN=$(git rev-parse --verify main) &&
+ META="ref=refs/heads/main treeish=$MAIN" &&
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 &&
@@ -402,14 +407,14 @@
EOF
test_cmp_exclude_clean expected.log debug.log &&
- filter_git checkout --quiet --no-progress master &&
+ filter_git checkout --quiet --no-progress main &&
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 &&
@@ -420,6 +425,117 @@
)
'
+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=$(test_file_size test.r) &&
+ S2=$(test_file_size test2.r) &&
+ S3=$(test_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) &&
+
+ MAIN=$(git rev-parse --verify main) &&
+
+ 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 main^^ main &&
+ MAIN2=$(git rev-parse --verify main) &&
+ META="ref=refs/heads/main treeish=$MAIN2" &&
+ 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 $MAIN &&
+ META="treeish=$MAIN" &&
+ 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-main $MAIN &&
+ git reset --hard empty-branch &&
+ filter_git reset --hard old-main &&
+ META="ref=refs/heads/old-main treeish=$MAIN" &&
+ 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 main $MAIN2 &&
+ filter_git merge main &&
+ META="treeish=$MAIN2" &&
+ 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 main >/dev/null &&
+ META="ref=refs/heads/main treeish=$MAIN2" &&
+ 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 $MAIN2^{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" &&
@@ -432,7 +548,7 @@
echo "*.r filter=protocol" >.gitattributes &&
cp "$TEST_ROOT/test.o" test.r &&
- S=$(file_size test.r) &&
+ S=$(test_file_size test.r) &&
# Check that the process filter is invoked here
filter_git add . &&
@@ -456,7 +572,7 @@
echo "*.r filter=protocol" >.gitattributes &&
cp "$TEST_ROOT/test.o" test.r &&
- S=$(file_size test.r) &&
+ S=$(test_file_size test.r) &&
filter_git add . &&
cat >expected.log <<-EOF &&
@@ -519,17 +635,22 @@
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,9 +696,13 @@
echo "this is going to fail" >smudge-write-fail.o &&
cp smudge-write-fail.o smudge-write-fail.r &&
- S=$(file_size test.r) &&
- S2=$(file_size test2.r) &&
- SF=$(file_size smudge-write-fail.r) &&
+ S=$(test_file_size test.r) &&
+ S2=$(test_file_size test2.r) &&
+ SF=$(test_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 &&
@@ -591,11 +716,11 @@
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,9 +751,13 @@
echo "this will cause an error" >error.o &&
cp error.o error.r &&
- S=$(file_size test.r) &&
- S2=$(file_size test2.r) &&
- SE=$(file_size error.r) &&
+ S=$(test_file_size test.r) &&
+ S2=$(test_file_size test2.r) &&
+ SE=$(test_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 &&
@@ -637,9 +766,9 @@
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 &&
@@ -665,18 +794,21 @@
echo "error this blob and all future blobs" >abort.o &&
cp abort.o abort.r &&
- SA=$(file_size abort.r) &&
+ M="blob=$(git hash-object abort.r)" &&
+ rm -f debug.log &&
+ SA=$(test_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 &&
@@ -726,28 +858,30 @@
git commit -m "test commit"
) &&
- S=$(file_size "$TEST_ROOT/test.o") &&
+ S=$(test_file_size "$TEST_ROOT/test.o") &&
+ PM="ref=refs/heads/main treeish=$(git -C repo rev-parse --verify main) " &&
+ M="${PM}blob=$(git -C repo rev-parse --verify main: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
@@ -767,8 +901,11 @@
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 &&
@@ -819,4 +956,85 @@
grep "error: external filter .* signaled that .unfiltered. is now available although it has not been delayed earlier" git-stderr.log
'
+for mode in 'case' 'utf-8'
+do
+ case "$mode" in
+ case) dir='A' symlink='a' mode_prereq='CASE_INSENSITIVE_FS' ;;
+ utf-8)
+ dir=$(printf "\141\314\210") symlink=$(printf "\303\244")
+ mode_prereq='UTF8_NFD_TO_NFC' ;;
+ esac
+
+ test_expect_success PERL,SYMLINKS,$mode_prereq \
+ "delayed checkout with $mode-collision don't write to the wrong place" '
+ test_config_global filter.delay.process \
+ "\"$TEST_ROOT/rot13-filter.pl\" --always-delay delayed.log clean smudge delay" &&
+ test_config_global filter.delay.required true &&
+
+ git init $mode-collision &&
+ (
+ cd $mode-collision &&
+ mkdir target-dir &&
+
+ empty_oid=$(printf "" | git hash-object -w --stdin) &&
+ symlink_oid=$(printf "%s" "$PWD/target-dir" | git hash-object -w --stdin) &&
+ attr_oid=$(echo "$dir/z filter=delay" | git hash-object -w --stdin) &&
+
+ cat >objs <<-EOF &&
+ 100644 blob $empty_oid $dir/x
+ 100644 blob $empty_oid $dir/y
+ 100644 blob $empty_oid $dir/z
+ 120000 blob $symlink_oid $symlink
+ 100644 blob $attr_oid .gitattributes
+ EOF
+
+ git update-index --index-info <objs &&
+ git commit -m "test commit"
+ ) &&
+
+ git clone $mode-collision $mode-collision-cloned &&
+ # Make sure z was really delayed
+ grep "IN: smudge $dir/z .* \\[DELAYED\\]" $mode-collision-cloned/delayed.log &&
+
+ # Should not create $dir/z at $symlink/z
+ test_path_is_missing $mode-collision/target-dir/z
+ '
+done
+
+test_expect_success PERL,SYMLINKS,CASE_INSENSITIVE_FS \
+"delayed checkout with submodule collision don't write to the wrong place" '
+ git init collision-with-submodule &&
+ (
+ cd collision-with-submodule &&
+ git config filter.delay.process "\"$TEST_ROOT/rot13-filter.pl\" --always-delay delayed.log clean smudge delay" &&
+ git config filter.delay.required true &&
+
+ # We need Git to treat the submodule "a" and the
+ # leading dir "A" as different paths in the index.
+ git config --local core.ignoreCase false &&
+
+ empty_oid=$(printf "" | git hash-object -w --stdin) &&
+ attr_oid=$(echo "A/B/y filter=delay" | git hash-object -w --stdin) &&
+ cat >objs <<-EOF &&
+ 100644 blob $empty_oid A/B/x
+ 100644 blob $empty_oid A/B/y
+ 100644 blob $attr_oid .gitattributes
+ EOF
+ git update-index --index-info <objs &&
+
+ git init a &&
+ mkdir target-dir &&
+ symlink_oid=$(printf "%s" "$PWD/target-dir" | git -C a hash-object -w --stdin) &&
+ echo "120000 blob $symlink_oid b" >objs &&
+ git -C a update-index --index-info <objs &&
+ git -C a commit -m sub &&
+ git submodule add ./a &&
+ git commit -m super &&
+
+ git checkout --recurse-submodules . &&
+ grep "IN: smudge A/B/y .* \\[DELAYED\\]" delayed.log &&
+ test_path_is_missing target-dir/y
+ )
+'
+
test_done
diff --git a/t/t0021/rot13-filter.pl b/t/t0021/rot13-filter.pl
index 4701072..7bb9376 100644
--- a/t/t0021/rot13-filter.pl
+++ b/t/t0021/rot13-filter.pl
@@ -2,9 +2,15 @@
# Example implementation for the Git filter protocol version 2
# See Documentation/gitattributes.txt, section "Filter Protocol"
#
-# The first argument defines a debug log file that the script write to.
-# All remaining arguments define a list of supported protocol
-# capabilities ("clean", "smudge", etc).
+# Usage: rot13-filter.pl [--always-delay] <log path> <capabilities>
+#
+# Log path defines a debug log file that the script writes to. The
+# subsequent arguments define a list of supported protocol capabilities
+# ("clean", "smudge", etc).
+#
+# When --always-delay is given all pathnames with the "can-delay" flag
+# that don't appear on the list bellow are delayed with a count of 1
+# (see more below).
#
# This implementation supports special test cases:
# (1) If data with the pathname "clean-write-fail.r" is processed with
@@ -53,6 +59,13 @@
use Git::Packet;
my $MAX_PACKET_CONTENT_SIZE = 65516;
+
+my $always_delay = 0;
+if ( $ARGV[0] eq '--always-delay' ) {
+ $always_delay = 1;
+ shift @ARGV;
+}
+
my $log_file = shift @ARGV;
my @capabilities = @ARGV;
@@ -134,8 +147,16 @@
if ( $buffer eq "can-delay=1" ) {
if ( exists $DELAY{$pathname} and $DELAY{$pathname}{"requested"} == 0 ) {
$DELAY{$pathname}{"requested"} = 1;
+ } elsif ( !exists $DELAY{$pathname} and $always_delay ) {
+ $DELAY{$pathname} = { "requested" => 1, "count" => 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/t/t0027-auto-crlf.sh b/t/t0027-auto-crlf.sh
index 9fcd56f..d24d5ac 100755
--- a/t/t0027-auto-crlf.sh
+++ b/t/t0027-auto-crlf.sh
@@ -83,7 +83,7 @@
*) echo >&2 "Illegal 1": "$1" ; return false ;;
esac
grep "will be replaced by" "$2" | sed -e "s/\(.*\) in [^ ]*$/\1/" | uniq >"$2".actual
- test_i18ncmp "$2".expect "$2".actual
+ test_cmp "$2".expect "$2".actual
}
commit_check_warn () {
@@ -368,9 +368,9 @@
test_cmp expect actual
'
-test_expect_success 'setup master' '
+test_expect_success 'setup main' '
echo >.gitattributes &&
- git checkout -b master &&
+ git checkout -b main &&
git add .gitattributes &&
git commit -m "add .gitattributes" . &&
printf "\$Id: 0000000000000000000000000000000000000000 \$\nLINEONE\nLINETWO\nLINETHREE" >LF &&
diff --git a/t/t0028-working-tree-encoding.sh b/t/t0028-working-tree-encoding.sh
index bfc4fb9..f970a98 100755
--- a/t/t0028-working-tree-encoding.sh
+++ b/t/t0028-working-tree-encoding.sh
@@ -2,6 +2,9 @@
test_description='working-tree-encoding conversion via gitattributes'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
GIT_TRACE_WORKING_TREE_ENCODING=1 && export GIT_TRACE_WORKING_TREE_ENCODING
@@ -215,7 +218,7 @@
TEST_HASH=$(git hash-object --no-filters -w nonsense.utf16le) &&
git update-index --add --cacheinfo 100644 $TEST_HASH nonsense.utf16le &&
COMMIT=$(git commit-tree -p $(git rev-parse HEAD) -m "plain commit" $(git write-tree)) &&
- git update-ref refs/heads/master $COMMIT &&
+ git update-ref refs/heads/main $COMMIT &&
test_must_fail git checkout HEAD^ 2>err.out &&
test_i18ngrep "error: .* overwritten by checkout:" err.out
@@ -231,7 +234,7 @@
TEST_HASH=$(git hash-object --no-filters -w nonsense.utf16) &&
git update-index --add --cacheinfo 100644 $TEST_HASH nonsense.utf16 &&
COMMIT=$(git commit-tree -p $(git rev-parse HEAD) -m "plain commit" $(git write-tree)) &&
- git update-ref refs/heads/master $COMMIT &&
+ git update-ref refs/heads/main $COMMIT &&
git diff 2>err.out &&
test_i18ngrep "error: BOM is required" err.out
diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh
index 3483b72..ad4746d 100755
--- a/t/t0040-parse-options.sh
+++ b/t/t0040-parse-options.sh
@@ -44,7 +44,7 @@
--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
@@ -54,14 +54,14 @@
-A, --alias-source <string>
get a string
-Z, --alias-target <string>
- get a string
+ alias of --alias-source
EOF
test_expect_success 'test help' '
test_must_fail test-tool parse-options -h >output 2>output.err &&
test_must_be_empty output.err &&
- test_i18ncmp expect output
+ test_cmp expect output
'
mv expect expect.err
@@ -84,7 +84,7 @@
cat expect.err >>expect &&
test_must_fail test-tool parse-options $* >output 2>output.err &&
test_must_be_empty output &&
- test_i18ncmp expect output.err
+ test_cmp expect output.err
}
test_expect_success 'OPT_BOOL() #1' 'check boolean: 1 --yes'
@@ -250,7 +250,7 @@
test_expect_success 'detect possible typos' '
test_must_fail test-tool parse-options -boolean >output 2>output.err &&
test_must_be_empty output &&
- test_i18ncmp typo.err output.err
+ test_cmp typo.err output.err
'
cat >typo.err <<\EOF
@@ -260,7 +260,7 @@
test_expect_success 'detect possible typos' '
test_must_fail test-tool parse-options -ambiguous >output 2>output.err &&
test_must_be_empty output &&
- test_i18ncmp typo.err output.err
+ test_cmp typo.err output.err
'
test_expect_success 'keep some options as arguments' '
diff --git a/t/t0041-usage.sh b/t/t0041-usage.sh
index 5b927b7..c4fc34e 100755
--- a/t/t0041-usage.sh
+++ b/t/t0041-usage.sh
@@ -2,6 +2,9 @@
test_description='Test commands behavior when given invalid argument value'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup ' '
@@ -41,8 +44,8 @@
'
test_expect_success 'branch --contains <existent_commit>' '
- git branch --contains "master" >actual 2>actual.err &&
- test_i18ngrep "master" actual &&
+ git branch --contains "main" >actual 2>actual.err &&
+ test_i18ngrep "main" actual &&
test_line_count = 0 actual.err
'
@@ -54,7 +57,7 @@
'
test_expect_success 'branch --no-contains <existent_commit>' '
- git branch --no-contains "master" >actual 2>actual.err &&
+ git branch --no-contains "main" >actual 2>actual.err &&
test_line_count = 0 actual &&
test_line_count = 0 actual.err
'
@@ -73,7 +76,7 @@
'
test_expect_success 'for-each-ref --contains <existent_object>' '
- git for-each-ref --contains "master" >actual 2>actual.err &&
+ git for-each-ref --contains "main" >actual 2>actual.err &&
test_line_count = 2 actual &&
test_line_count = 0 actual.err
'
@@ -86,7 +89,7 @@
'
test_expect_success 'for-each-ref --no-contains <existent_object>' '
- git for-each-ref --no-contains "master" >actual 2>actual.err &&
+ git for-each-ref --no-contains "main" >actual 2>actual.err &&
test_line_count = 0 actual &&
test_line_count = 0 actual.err
'
diff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh
index 608673f..afc343c 100755
--- a/t/t0050-filesystem.sh
+++ b/t/t0050-filesystem.sh
@@ -2,6 +2,9 @@
test_description='Various filesystem issues'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
auml=$(printf '\303\244')
@@ -65,7 +68,7 @@
git mv camelcase tmp &&
git mv tmp CamelCase &&
git commit -m "rename" &&
- git checkout -f master
+ git checkout -f main
'
test_expect_success 'rename (case change)' '
@@ -118,7 +121,7 @@
git mv $aumlcdiar tmp &&
git mv tmp "$auml" &&
git commit -m rename &&
- git checkout -f master
+ git checkout -f main
'
$test_unicode 'rename (silent unicode normalization)' '
@@ -147,7 +150,7 @@
git add gitweb &&
git commit -m "add gitweb/subdir/file" &&
- git checkout master
+ git checkout main
)
'
diff --git a/t/t0060-path-utils.sh b/t/t0060-path-utils.sh
index 2ea2d00..0ff06b5 100755
--- a/t/t0060-path-utils.sh
+++ b/t/t0060-path-utils.sh
@@ -312,8 +312,8 @@
test_git_path GIT_COMMON_DIR=bar info//sparse-checkout .git/info//sparse-checkout
test_git_path GIT_COMMON_DIR=bar remotes/bar bar/remotes/bar
test_git_path GIT_COMMON_DIR=bar branches/bar bar/branches/bar
-test_git_path GIT_COMMON_DIR=bar logs/refs/heads/master bar/logs/refs/heads/master
-test_git_path GIT_COMMON_DIR=bar refs/heads/master bar/refs/heads/master
+test_git_path GIT_COMMON_DIR=bar logs/refs/heads/main bar/logs/refs/heads/main
+test_git_path GIT_COMMON_DIR=bar refs/heads/main bar/refs/heads/main
test_git_path GIT_COMMON_DIR=bar refs/bisect/foo .git/refs/bisect/foo
test_git_path GIT_COMMON_DIR=bar hooks/me bar/hooks/me
test_git_path GIT_COMMON_DIR=bar config bar/config
@@ -476,6 +476,7 @@
C:\\git \
comm \
conout.c \
+ com0.c \
lptN \
\
--not \
@@ -488,6 +489,7 @@
"AUX.c" \
"abc/conOut\$ .xyz/test" \
lpt8 \
+ com9.c \
"lpt*" \
Nul \
"PRN./abc"
diff --git a/t/t0064-sha1-array.sh b/t/t0064-oid-array.sh
similarity index 76%
rename from t/t0064-sha1-array.sh
rename to t/t0064-oid-array.sh
index 5dda570..2e5438c 100755
--- a/t/t0064-sha1-array.sh
+++ b/t/t0064-oid-array.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-test_description='basic tests for the SHA1 array implementation'
+test_description='basic tests for the oid array implementation'
. ./test-lib.sh
echoid () {
@@ -18,7 +18,7 @@
{
echoid append 88 44 aa 55 &&
echo for_each_unique
- } | test-tool sha1-array >actual &&
+ } | test-tool oid-array >actual &&
test_cmp expect actual
'
@@ -27,8 +27,9 @@
{
echoid append 88 44 aa 55 &&
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 +37,7 @@
{
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 +46,7 @@
{
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
'
@@ -54,19 +55,21 @@
{
echoid append 88 44 aa 55 &&
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
+ test "$n" -ge 3 &&
+ test "$n" -le 5
'
test_expect_success 'lookup non-existing entry with duplicates' '
{
echoid append 88 44 aa 55 &&
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 +84,7 @@
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 +93,7 @@
{
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/t/t0068-for-each-repo.sh b/t/t0068-for-each-repo.sh
new file mode 100755
index 0000000..4675e85
--- /dev/null
+++ b/t/t0068-for-each-repo.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+test_description='git for-each-repo builtin'
+
+. ./test-lib.sh
+
+test_expect_success 'run based on configured value' '
+ git init one &&
+ git init two &&
+ git init three &&
+ git -C two commit --allow-empty -m "DID NOT RUN" &&
+ git config run.key "$TRASH_DIRECTORY/one" &&
+ git config --add run.key "$TRASH_DIRECTORY/three" &&
+ git for-each-repo --config=run.key commit --allow-empty -m "ran" &&
+ git -C one log -1 --pretty=format:%s >message &&
+ grep ran message &&
+ git -C two log -1 --pretty=format:%s >message &&
+ ! grep ran message &&
+ git -C three log -1 --pretty=format:%s >message &&
+ grep ran message &&
+ git for-each-repo --config=run.key -- commit --allow-empty -m "ran again" &&
+ git -C one log -1 --pretty=format:%s >message &&
+ grep again message &&
+ git -C two log -1 --pretty=format:%s >message &&
+ ! grep again message &&
+ git -C three log -1 --pretty=format:%s >message &&
+ grep again message
+'
+
+test_expect_success 'do nothing on empty config' '
+ # the whole thing would fail if for-each-ref iterated even
+ # once, because "git help --no-such-option" would fail
+ git for-each-repo --config=bogus.config -- help --no-such-option
+'
+
+test_done
diff --git a/t/t0070-fundamental.sh b/t/t0070-fundamental.sh
index 7b111a5..8d59905 100755
--- a/t/t0070-fundamental.sh
+++ b/t/t0070-fundamental.sh
@@ -34,4 +34,22 @@
test-tool regex --bug
'
+test_expect_success 'incomplete sideband messages are reassembled' '
+ test-tool pkt-line send-split-sideband >split-sideband &&
+ test-tool pkt-line receive-sideband <split-sideband 2>err &&
+ grep "Hello, world" err
+'
+
+test_expect_success 'eof on sideband message is reported' '
+ printf 1234 >input &&
+ test-tool pkt-line receive-sideband <input 2>err &&
+ test_i18ngrep "unexpected disconnect" err
+'
+
+test_expect_success 'missing sideband designator is reported' '
+ printf 0004 >input &&
+ test-tool pkt-line receive-sideband <input 2>err &&
+ test_i18ngrep "missing sideband" err
+'
+
test_done
diff --git a/t/t0081-line-buffer.sh b/t/t0081-line-buffer.sh
deleted file mode 100755
index ce92e6a..0000000
--- a/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/t/t0090-cache-tree.sh b/t/t0090-cache-tree.sh
index 5a63369..9bf66c9 100755
--- a/t/t0090-cache-tree.sh
+++ b/t/t0090-cache-tree.sh
@@ -10,40 +10,36 @@
cmp_cache_tree () {
test-tool dump-cache-tree | sed -e '/#(ref)/d' >actual &&
sed "s/$OID_REGEX/SHA/" <actual >filtered &&
- test_cmp "$1" filtered
+ test_cmp "$1" filtered &&
+ rm filtered
}
# We don't bother with actually checking the SHA1:
# test-tool dump-cache-tree already verifies that all existing data is
# correct.
-generate_expected_cache_tree_rec () {
- dir="$1${1:+/}" &&
- parent="$2" &&
- # ls-files might have foo/bar, foo/bar/baz, and foo/bar/quux
- # We want to count only foo because it's the only direct child
- git ls-files >files &&
- subtrees=$(grep / files|cut -d / -f 1|uniq) &&
- subtree_count=$(echo "$subtrees"|awk -v c=0 '$1 != "" {++c} END {print c}') &&
- entries=$(wc -l <files) &&
- printf "SHA $dir (%d entries, %d subtrees)\n" "$entries" "$subtree_count" &&
- for subtree in $subtrees
- do
- cd "$subtree"
- generate_expected_cache_tree_rec "$dir$subtree" "$dir" || return 1
- cd ..
- done &&
- dir=$parent
-}
-
generate_expected_cache_tree () {
- (
- generate_expected_cache_tree_rec
- )
+ pathspec="$1" &&
+ dir="$2${2:+/}" &&
+ git ls-tree --name-only HEAD -- "$pathspec" >files &&
+ git ls-tree --name-only -d HEAD -- "$pathspec" >subtrees &&
+ printf "SHA %s (%d entries, %d subtrees)\n" "$dir" $(wc -l <files) $(wc -l <subtrees) &&
+ while read subtree
+ do
+ generate_expected_cache_tree "$pathspec/$subtree/" "$subtree" || return 1
+ done <subtrees
}
test_cache_tree () {
- generate_expected_cache_tree >expect &&
- cmp_cache_tree expect
+ generate_expected_cache_tree "." >expect &&
+ cmp_cache_tree expect &&
+ rm expect actual files subtrees &&
+ git status --porcelain -- ':!status' ':!expected.status' >status &&
+ if test -n "$1"
+ then
+ test_cmp "$1" status
+ else
+ test_must_be_empty status
+ fi
}
test_invalid_cache_tree () {
@@ -54,7 +50,7 @@
}
test_no_cache_tree () {
- : >expect &&
+ >expect &&
cmp_cache_tree expect
}
@@ -83,18 +79,6 @@
test_invalid_cache_tree
'
-cat >before <<\EOF
-SHA (3 entries, 2 subtrees)
-SHA dir1/ (1 entries, 0 subtrees)
-SHA dir2/ (1 entries, 0 subtrees)
-EOF
-
-cat >expect <<\EOF
-invalid (2 subtrees)
-invalid dir1/ (0 subtrees)
-SHA dir2/ (1 entries, 0 subtrees)
-EOF
-
test_expect_success 'git-add in subdir does not invalidate sibling cache-tree' '
git tag no-children &&
test_when_finished "git reset --hard no-children; git read-tree HEAD" &&
@@ -102,9 +86,20 @@
test_commit dir1/a &&
test_commit dir2/b &&
echo "I changed this file" >dir1/a &&
+ test_when_finished "rm before" &&
+ cat >before <<-\EOF &&
+ SHA (3 entries, 2 subtrees)
+ SHA dir1/ (1 entries, 0 subtrees)
+ SHA dir2/ (1 entries, 0 subtrees)
+ EOF
cmp_cache_tree before &&
echo "I changed this file" >dir1/a &&
git add dir1/a &&
+ cat >expect <<-\EOF &&
+ invalid (2 subtrees)
+ invalid dir1/ (0 subtrees)
+ SHA dir2/ (1 entries, 0 subtrees)
+ EOF
cmp_cache_tree expect
'
@@ -133,6 +128,7 @@
'
test_expect_success PERL 'commit --interactive gives cache-tree on partial commit' '
+ test_when_finished "git reset --hard" &&
cat <<-\EOT >foo.c &&
int foo()
{
@@ -159,7 +155,10 @@
EOT
test_write_lines p 1 "" s n y q |
git commit --interactive -m foo &&
- test_cache_tree
+ cat <<-\EOF >expected.status &&
+ M foo.c
+ EOF
+ test_cache_tree expected.status
'
test_expect_success PERL 'commit -p with shrinking cache-tree' '
@@ -250,7 +249,10 @@
git add one.t &&
echo "some other change" >two.t &&
git commit two.t -m partial &&
- test_cache_tree
+ cat <<-\EOF >expected.status &&
+ M one.t
+ EOF
+ test_cache_tree expected.status
'
test_expect_success 'no phantom error when switching trees' '
diff --git a/t/t0091-bugreport.sh b/t/t0091-bugreport.sh
new file mode 100755
index 0000000..526304f
--- /dev/null
+++ b/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/t/t0095-bloom.sh b/t/t0095-bloom.sh
new file mode 100755
index 0000000..7e4ab17
--- /dev/null
+++ b/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/t/t0100-previous.sh b/t/t0100-previous.sh
index 58c0b7e..69beb59 100755
--- a/t/t0100-previous.sh
+++ b/t/t0100-previous.sh
@@ -2,13 +2,16 @@
test_description='previous branch syntax @{-n}'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'branch -d @{-1}' '
test_commit A &&
git checkout -b junk &&
git checkout - &&
- test "$(git symbolic-ref HEAD)" = refs/heads/master &&
+ test "$(git symbolic-ref HEAD)" = refs/heads/main &&
git branch -d @{-1} &&
test_must_fail git rev-parse --verify refs/heads/junk
'
@@ -17,9 +20,9 @@
git reflog expire --expire=now &&
git checkout -b junk2 &&
git checkout - &&
- test "$(git symbolic-ref HEAD)" = refs/heads/master &&
+ test "$(git symbolic-ref HEAD)" = refs/heads/main &&
test_must_fail git branch -d @{-12} &&
- git rev-parse --verify refs/heads/master
+ git rev-parse --verify refs/heads/main
'
test_expect_success 'merge @{-1}' '
@@ -28,19 +31,19 @@
git checkout A &&
test_commit C &&
test_commit D &&
- git branch -f master B &&
+ git branch -f main B &&
git branch -f other &&
git checkout other &&
- git checkout master &&
+ git checkout main &&
git merge @{-1} &&
git cat-file commit HEAD | grep "Merge branch '\''other'\''"
'
test_expect_success 'merge @{-1}~1' '
- git checkout master &&
+ git checkout main &&
git reset --hard B &&
git checkout other &&
- git checkout master &&
+ git checkout main &&
git merge @{-1}~1 &&
git cat-file commit HEAD >actual &&
grep "Merge branch '\''other'\''" actual
@@ -48,11 +51,11 @@
test_expect_success 'merge @{-100} before checking out that many branches yet' '
git reflog expire --expire=now &&
- git checkout -f master &&
+ git checkout -f main &&
git reset --hard B &&
git branch -f other C &&
git checkout other &&
- git checkout master &&
+ git checkout main &&
test_must_fail git merge @{-100}
'
diff --git a/t/t0201-gettext-fallbacks.sh b/t/t0201-gettext-fallbacks.sh
index 90da1c7..6c74df0 100755
--- a/t/t0201-gettext-fallbacks.sh
+++ b/t/t0201-gettext-fallbacks.sh
@@ -18,7 +18,7 @@
test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
'
-test_expect_success C_LOCALE_OUTPUT 'sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is fallthrough' '
+test_expect_success 'sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is fallthrough' '
echo fallthrough >expect &&
echo $GIT_INTERNAL_GETTEXT_SH_SCHEME >actual &&
test_cmp expect actual
@@ -27,25 +27,25 @@
test_expect_success 'gettext: our gettext() fallback has pass-through semantics' '
printf "test" >expect &&
gettext "test" >actual &&
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
printf "test more words" >expect &&
gettext "test more words" >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'eval_gettext: our eval_gettext() fallback has pass-through semantics' '
printf "test" >expect &&
eval_gettext "test" >actual &&
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
printf "test more words" >expect &&
eval_gettext "test more words" >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate variables' '
printf "test YesPlease" >expect &&
GIT_INTERNAL_GETTEXT_TEST_FALLBACKS=YesPlease eval_gettext "test \$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate variables with spaces' '
@@ -53,7 +53,7 @@
export cmdline &&
printf "When you have resolved this problem, run git am --resolved." >expect &&
eval_gettext "When you have resolved this problem, run \$cmdline --resolved." >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate variables with spaces and quotes' '
@@ -61,7 +61,7 @@
export cmdline &&
printf "When you have resolved this problem, run \"git am --resolved\"." >expect &&
eval_gettext "When you have resolved this problem, run \"\$cmdline --resolved\"." >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_done
diff --git a/t/t0205-gettext-poison.sh b/t/t0205-gettext-poison.sh
deleted file mode 100755
index f9fa16a..0000000
--- a/t/t0205-gettext-poison.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2010 Ævar Arnfjörð Bjarmason
-#
-
-test_description='Gettext Shell poison'
-
-GIT_TEST_GETTEXT_POISON=true
-export GIT_TEST_GETTEXT_POISON
-. ./lib-gettext.sh
-
-test_expect_success 'sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is poison' '
- test "$GIT_INTERNAL_GETTEXT_SH_SCHEME" = "poison"
-'
-
-test_expect_success 'gettext: our gettext() fallback has poison semantics' '
- printf "# GETTEXT POISON #" >expect &&
- gettext "test" >actual &&
- test_cmp expect actual &&
- printf "# GETTEXT POISON #" >expect &&
- gettext "test more words" >actual &&
- test_cmp expect actual
-'
-
-test_expect_success 'eval_gettext: our eval_gettext() fallback has poison semantics' '
- printf "# GETTEXT POISON #" >expect &&
- eval_gettext "test" >actual &&
- test_cmp expect actual &&
- printf "# GETTEXT POISON #" >expect &&
- eval_gettext "test more words" >actual &&
- test_cmp expect actual
-'
-
-test_expect_success "gettext: invalid GIT_TEST_GETTEXT_POISON value doesn't infinitely loop" "
- test_must_fail env GIT_TEST_GETTEXT_POISON=xyz git version 2>error &&
- grep \"fatal: bad numeric config value 'xyz' for 'GIT_TEST_GETTEXT_POISON': invalid unit\" error
-"
-
-test_done
diff --git a/t/t0210-trace2-normal.sh b/t/t0210-trace2-normal.sh
index ce7574e..0cf3a63 100755
--- a/t/t0210-trace2-normal.sh
+++ b/t/t0210-trace2-normal.sh
@@ -147,6 +147,25 @@
test_cmp expect actual
'
+# Verb 007bug
+#
+# Check that BUG writes to trace2
+
+test_expect_success 'BUG messages are written to trace2' '
+ test_when_finished "rm trace.normal actual expect" &&
+ test_must_fail env GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 007bug &&
+ perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+ cat >expect <<-EOF &&
+ version $V
+ start _EXE_ trace2 007bug
+ cmd_name trace2 (trace2)
+ error the bug message
+ exit elapsed:_TIME_ code:99
+ atexit elapsed:_TIME_ code:99
+ EOF
+ test_cmp expect actual
+'
+
sane_unset GIT_TRACE2_BRIEF
# Now test without environment variables and get all Trace2 settings
diff --git a/t/t0212-trace2-event.sh b/t/t0212-trace2-event.sh
index 7065a1b..1529155 100755
--- a/t/t0212-trace2-event.sh
+++ b/t/t0212-trace2-event.sh
@@ -199,6 +199,43 @@
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 &&
diff --git a/t/t0300-credentials.sh b/t/t0300-credentials.sh
index 5555a15..3485c05 100755
--- a/t/t0300-credentials.sh
+++ b/t/t0300-credentials.sh
@@ -265,6 +265,32 @@
EOF
'
+test_expect_success 'git-credential respects core.askPass' '
+ write_script alternate-askpass <<-\EOF &&
+ echo >&2 "alternate askpass invoked"
+ echo alternate-value
+ EOF
+ test_config core.askpass "$PWD/alternate-askpass" &&
+ (
+ # unset GIT_ASKPASS set by lib-credential.sh which would
+ # override our config, but do so in a subshell so that we do
+ # not interfere with other tests
+ sane_unset GIT_ASKPASS &&
+ check fill <<-\EOF
+ protocol=http
+ host=example.com
+ --
+ protocol=http
+ host=example.com
+ username=alternate-value
+ password=alternate-value
+ --
+ alternate askpass invoked
+ alternate askpass invoked
+ EOF
+ )
+'
+
HELPER="!f() {
cat >/dev/null
echo username=foo
@@ -366,6 +392,51 @@
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
@@ -507,7 +578,7 @@
quit: host=example.com
fatal: credential helper '\''quit'\'' told us to quit
EOF
- test_i18ncmp expect stderr
+ test_cmp expect stderr
'
test_expect_success 'empty helper spec resets helper list' '
@@ -532,10 +603,10 @@
url=https://one.example.com?%0ahost=two.example.com/
EOF
cat >expect <<-\EOF &&
- warning: url contains a newline in its host component: https://one.example.com?%0ahost=two.example.com/
+ 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_cmp expect stderr
'
test_expect_success 'host-less URLs are parsed as empty host' '
@@ -562,7 +633,7 @@
cat >expect <<-\EOF &&
fatal: refusing to work with credential missing host field
EOF
- test_i18ncmp expect stderr
+ test_cmp expect stderr
'
test_expect_success 'credential system refuses to work with missing protocol' '
@@ -572,7 +643,79 @@
cat >expect <<-\EOF &&
fatal: refusing to work with credential missing protocol field
EOF
- test_i18ncmp expect stderr
+ test_cmp 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/t/t0302-credential-store.sh b/t/t0302-credential-store.sh
index d6b54e8..716bf1a 100755
--- a/t/t0302-credential-store.sh
+++ b/t/t0302-credential-store.sh
@@ -107,7 +107,6 @@
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_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/t/t0410-partial-clone.sh b/t/t0410-partial-clone.sh
index a3988bd..584a039 100755
--- a/t/t0410-partial-clone.sh
+++ b/t/t0410-partial-clone.sh
@@ -30,6 +30,40 @@
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 '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,7 +194,10 @@
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
@@ -180,7 +217,7 @@
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' '
diff --git a/t/t0500-progress-display.sh b/t/t0500-progress-display.sh
index d2d088d..22058b5 100755
--- a/t/t0500-progress-display.sh
+++ b/t/t0500-progress-display.sh
@@ -29,7 +29,7 @@
test-tool progress "Working hard" <in 2>stderr &&
show_cr <stderr >out &&
- test_i18ncmp expect out
+ test_cmp expect out
'
test_expect_success 'progress display with total' '
@@ -48,7 +48,7 @@
test-tool progress --total=3 "Working hard" <in 2>stderr &&
show_cr <stderr >out &&
- test_i18ncmp expect out
+ test_cmp expect out
'
test_expect_success 'progress display breaks long lines #1' '
@@ -72,7 +72,7 @@
<in 2>stderr &&
show_cr <stderr >out &&
- test_i18ncmp expect out
+ test_cmp expect out
'
test_expect_success 'progress display breaks long lines #2' '
@@ -100,7 +100,7 @@
<in 2>stderr &&
show_cr <stderr >out &&
- test_i18ncmp expect out
+ test_cmp expect out
'
test_expect_success 'progress display breaks long lines #3 - even the first is too long' '
@@ -126,7 +126,7 @@
<in 2>stderr &&
show_cr <stderr >out &&
- test_i18ncmp expect out
+ test_cmp expect out
'
test_expect_success 'progress display breaks long lines #4 - title line matches terminal width' '
@@ -150,7 +150,7 @@
<in 2>stderr &&
show_cr <stderr >out &&
- test_i18ncmp expect out
+ test_cmp expect out
'
# Progress counter goes backwards, this should not happen in practice.
@@ -172,7 +172,7 @@
test-tool progress --total=1000 "Working hard" <in 2>stderr &&
show_cr <stderr >out &&
- test_i18ncmp expect out
+ test_cmp expect out
'
test_expect_success 'progress display with throughput' '
@@ -201,7 +201,7 @@
test-tool progress "Working hard" <in 2>stderr &&
show_cr <stderr >out &&
- test_i18ncmp expect out
+ test_cmp expect out
'
test_expect_success 'progress display with throughput and total' '
@@ -226,7 +226,7 @@
test-tool progress --total=40 "Working hard" <in 2>stderr &&
show_cr <stderr >out &&
- test_i18ncmp expect out
+ test_cmp expect out
'
test_expect_success 'cover up after throughput shortens' '
@@ -255,7 +255,7 @@
test-tool progress "Working hard" <in 2>stderr &&
show_cr <stderr >out &&
- test_i18ncmp expect out
+ test_cmp expect out
'
test_expect_success 'cover up after throughput shortens a lot' '
@@ -280,7 +280,32 @@
test-tool progress "Working hard" <in 2>stderr &&
show_cr <stderr >out &&
- test_i18ncmp expect out
+ test_cmp 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.
+ test_region progress "Working hard" trace.event &&
+ grep "\"key\":\"total_objects\",\"value\":\"40\"" trace.event &&
+ grep "\"key\":\"total_bytes\",\"value\":\"409600\"" trace.event
'
test_done
diff --git a/t/t1004-read-tree-m-u-wf.sh b/t/t1004-read-tree-m-u-wf.sh
index c13578a..11bf104 100755
--- a/t/t1004-read-tree-m-u-wf.sh
+++ b/t/t1004-read-tree-m-u-wf.sh
@@ -2,6 +2,9 @@
test_description='read-tree -m -u checks working tree files'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-read-tree.sh
@@ -20,17 +23,17 @@
git branch side &&
git tag -f branch-point &&
- echo file2 is not tracked on the master anymore &&
+ echo file2 is not tracked on the main branch anymore &&
rm -f file2 subdir/file2 &&
git update-index --remove file2 subdir/file2 &&
- git commit -a -m "master removes file2 and subdir/file2"
+ git commit -a -m "main removes file2 and subdir/file2"
'
test_expect_success 'two-way not clobbering' '
- echo >file2 master creates untracked file2 &&
- echo >subdir/file2 master creates untracked subdir/file2 &&
- if err=$(read_tree_u_must_succeed -m -u master side 2>&1)
+ echo >file2 main creates untracked file2 &&
+ echo >subdir/file2 main creates untracked subdir/file2 &&
+ if err=$(read_tree_u_must_succeed -m -u main side 2>&1)
then
echo should have complained
false
@@ -43,7 +46,7 @@
test_expect_success 'two-way with incorrect --exclude-per-directory (1)' '
- if err=$(read_tree_u_must_succeed -m --exclude-per-directory=.gitignore master side 2>&1)
+ if err=$(read_tree_u_must_succeed -m --exclude-per-directory=.gitignore main side 2>&1)
then
echo should have complained
false
@@ -54,7 +57,7 @@
test_expect_success 'two-way with incorrect --exclude-per-directory (2)' '
- if err=$(read_tree_u_must_succeed -m -u --exclude-per-directory=foo --exclude-per-directory=.gitignore master side 2>&1)
+ if err=$(read_tree_u_must_succeed -m -u --exclude-per-directory=foo --exclude-per-directory=.gitignore main side 2>&1)
then
echo should have complained
false
@@ -65,7 +68,7 @@
test_expect_success 'two-way clobbering a ignored file' '
- read_tree_u_must_succeed -m -u --exclude-per-directory=.gitignore master side
+ read_tree_u_must_succeed -m -u --exclude-per-directory=.gitignore main side
'
rm -f .gitignore
@@ -81,21 +84,21 @@
git update-index --add file3 subdir/file3 &&
git commit -a -m "side adds file3 and removes file2" &&
- git checkout master &&
- echo >file2 file two is untracked on the master side &&
- echo >subdir/file2 file two is untracked on the master side &&
+ git checkout main &&
+ echo >file2 file two is untracked on the main side &&
+ echo >subdir/file2 file two is untracked on the main side &&
- read_tree_u_must_succeed -m -u branch-point master side
+ read_tree_u_must_succeed -m -u branch-point main side
'
test_expect_success 'three-way not clobbering a working tree file' '
git reset --hard &&
rm -f file2 subdir/file2 file3 subdir/file3 &&
- git checkout master &&
- echo >file3 file three created in master, untracked &&
- echo >subdir/file3 file three created in master, untracked &&
- if err=$(read_tree_u_must_succeed -m -u branch-point master side 2>&1)
+ git checkout main &&
+ echo >file3 file three created in main, untracked &&
+ echo >subdir/file3 file three created in main, untracked &&
+ if err=$(read_tree_u_must_succeed -m -u branch-point main side 2>&1)
then
echo should have complained
false
@@ -110,11 +113,11 @@
git reset --hard &&
rm -f file2 subdir/file2 file3 subdir/file3 &&
- git checkout master &&
- echo >file3 file three created in master, untracked &&
- echo >subdir/file3 file three created in master, untracked &&
+ git checkout main &&
+ echo >file3 file three created in main, untracked &&
+ echo >subdir/file3 file three created in main, untracked &&
- read_tree_u_must_succeed -m -u --exclude-per-directory=.gitignore branch-point master side
+ read_tree_u_must_succeed -m -u --exclude-per-directory=.gitignore branch-point main side
'
test_expect_success '3-way not overwriting local changes (setup)' '
diff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh
index 43c4be1..5d2dc99 100755
--- a/t/t1006-cat-file.sh
+++ b/t/t1006-cat-file.sh
@@ -140,8 +140,6 @@
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"
@@ -168,7 +166,7 @@
$tag_description"
-tag_sha1=$(echo_without_newline "$tag_content" | git mktag)
+tag_sha1=$(echo_without_newline "$tag_content" | git hash-object -t tag --stdin -w)
tag_size=$(strlen "$tag_content")
run_tests 'tag' $tag_sha1 $tag_size "$tag_content" "$tag_content" 1
diff --git a/t/t1008-read-tree-overlay.sh b/t/t1008-read-tree-overlay.sh
index cf96016..4512fb0b 100755
--- a/t/t1008-read-tree-overlay.sh
+++ b/t/t1008-read-tree-overlay.sh
@@ -2,6 +2,9 @@
test_description='test multi-tree read-tree without merging'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-read-tree.sh
@@ -22,7 +25,7 @@
'
test_expect_success 'multi-read' '
- read_tree_must_succeed initial master side &&
+ read_tree_must_succeed initial main side &&
test_write_lines a b/c >expect &&
git ls-files >actual &&
test_cmp expect actual
diff --git a/t/t1009-read-tree-new-index.sh b/t/t1009-read-tree-new-index.sh
index 59b3aa4..2935f68 100755
--- a/t/t1009-read-tree-new-index.sh
+++ b/t/t1009-read-tree-new-index.sh
@@ -2,6 +2,9 @@
test_description='test read-tree into a fresh index file'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
@@ -12,13 +15,13 @@
test_expect_success 'non-existent index file' '
rm -f new-index &&
- GIT_INDEX_FILE=new-index git read-tree master
+ GIT_INDEX_FILE=new-index git read-tree main
'
test_expect_success 'empty index file' '
rm -f new-index &&
> new-index &&
- GIT_INDEX_FILE=new-index git read-tree master
+ GIT_INDEX_FILE=new-index git read-tree main
'
test_done
diff --git a/t/t1011-read-tree-sparse-checkout.sh b/t/t1011-read-tree-sparse-checkout.sh
index eb44baf..24092c0 100755
--- a/t/t1011-read-tree-sparse-checkout.sh
+++ b/t/t1011-read-tree-sparse-checkout.sh
@@ -2,7 +2,7 @@
test_description='sparse checkout tests
-* (tag: removed, master) removed
+* (tag: removed, main) removed
| D sub/added
* (HEAD, tag: top) modified and added
| M init.t
@@ -74,13 +74,19 @@
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' '
@@ -233,20 +239,21 @@
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
+ test_cmp expected actual
'
test_expect_success 'checkout without --ignore-skip-worktree-bits' '
diff --git a/t/t1013-read-tree-submodule.sh b/t/t1013-read-tree-submodule.sh
index 91a6faf..b6df744 100755
--- a/t/t1013-read-tree-submodule.sh
+++ b/t/t1013-read-tree-submodule.sh
@@ -12,8 +12,8 @@
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/t/t1021-rerere-in-workdir.sh b/t/t1021-rerere-in-workdir.sh
index 301e071..0b89289 100755
--- a/t/t1021-rerere-in-workdir.sh
+++ b/t/t1021-rerere-in-workdir.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='rerere run in a workdir'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success SYMLINKS setup '
@@ -19,7 +22,7 @@
test_tick &&
git commit -a -m goodbye &&
- git checkout master
+ git checkout main
'
test_expect_success SYMLINKS 'rerere in workdir' '
diff --git a/t/t1050-large.sh b/t/t1050-large.sh
index 184b479..4bab6a5 100755
--- a/t/t1050-large.sh
+++ b/t/t1050-large.sh
@@ -5,12 +5,6 @@
. ./test-lib.sh
-# This should be moved to test-lib.sh together with the
-# copy in t0021 after both topics have graduated to 'master'.
-file_size () {
- test-tool path-utils file-size "$1"
-}
-
test_expect_success setup '
# clone does not allow us to pass core.bigfilethreshold to
# new repos, so set core.bigfilethreshold globally
@@ -29,7 +23,7 @@
test_expect_success "add with $config" '
test_when_finished "rm -f .git/objects/pack/pack-*.* .git/index" &&
git $config add large1 &&
- sz=$(file_size .git/objects/pack/pack-*.pack) &&
+ sz=$(test_file_size .git/objects/pack/pack-*.pack) &&
case "$expect" in
small) test "$sz" -le 100000 ;;
large) test "$sz" -ge 100000 ;;
@@ -64,7 +58,7 @@
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_path_is_file "$l" || continue
bad=t
@@ -177,7 +171,8 @@
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' '
diff --git a/t/t1090-sparse-checkout-scope.sh b/t/t1090-sparse-checkout-scope.sh
index 40cc004..3deb490 100755
--- a/t/t1090-sparse-checkout-scope.sh
+++ b/t/t1090-sparse-checkout-scope.sh
@@ -2,6 +2,9 @@
test_description='sparse checkout scope tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup' '
@@ -20,18 +23,18 @@
git commit -m "modification"
'
-test_expect_success 'perform sparse checkout of master' '
+test_expect_success 'perform sparse checkout of main' '
git config --local --bool core.sparsecheckout true &&
echo "!/*" >.git/info/sparse-checkout &&
echo "/a" >>.git/info/sparse-checkout &&
echo "/c" >>.git/info/sparse-checkout &&
- git checkout master &&
+ git checkout main &&
test_path_is_file a &&
test_path_is_missing b &&
test_path_is_file c
'
-test_expect_success 'merge feature branch into sparse checkout of master' '
+test_expect_success 'merge feature branch into sparse checkout of main' '
git merge feature &&
test_path_is_file a &&
test_path_is_missing b &&
@@ -39,10 +42,10 @@
test "$(cat c)" = "modified"
'
-test_expect_success 'return to full checkout of master' '
+test_expect_success 'return to full checkout of main' '
git checkout feature &&
echo "/*" >.git/info/sparse-checkout &&
- git checkout master &&
+ git checkout main &&
test_path_is_file a &&
test_path_is_file b &&
test_path_is_file c &&
@@ -63,7 +66,6 @@
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/t/t1091-sparse-checkout-builtin.sh b/t/t1091-sparse-checkout-builtin.sh
index 44a9120..fc64e9e 100755
--- a/t/t1091-sparse-checkout-builtin.sh
+++ b/t/t1091-sparse-checkout-builtin.sh
@@ -2,6 +2,9 @@
test_description='sparse checkout builtin tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
list_files() {
@@ -100,16 +103,36 @@
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 main &&
+ 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 &&
- test_must_fail git sparse-checkout set nothing &&
+ git sparse-checkout set nothing &&
test_path_is_file .git/config.worktree &&
- test_must_fail git config core.sparseCheckout &&
- git sparse-checkout set "/*" &&
test_cmp_config true core.sparseCheckout
)
'
@@ -277,15 +300,23 @@
check_files repo a deep folder1
'
-test_expect_success 'revert to old sparse-checkout on bad update' '
+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_must_fail git -C repo sparse-checkout set deep/deeper1 2>err &&
- test_i18ngrep "cannot set sparse-checkout patterns" err &&
- test_cmp repo/.git/info/sparse-checkout expect &&
- check_files repo/deep a deeper1 deeper2
+ test_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' '
@@ -294,8 +325,8 @@
echo >file &&
git add file &&
git commit -m "test" &&
- test_must_fail git sparse-checkout set nothing 2>err &&
- test_i18ngrep "Sparse checkout leaves no entry on working directory" err &&
+ 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
)
@@ -315,19 +346,96 @@
test_i18ngrep ! "disabling cone patterns" err
'
-test_expect_success 'sparse-checkout (init|set|disable) fails with dirty status' '
+test_expect_success 'sparse-checkout (init|set|disable) warns with dirty status' '
git clone repo dirty &&
echo dirty >dirty/folder1/a &&
- test_must_fail git -C dirty sparse-checkout init &&
- test_must_fail git -C dirty sparse-checkout set /folder2/* /deep/deeper1/* &&
- test_must_fail git -C dirty sparse-checkout disable &&
+
+ git -C dirty 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/* &&
- git -C dirty sparse-checkout disable
+ 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 &&
diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh
new file mode 100755
index 0000000..8cd3e5a
--- /dev/null
+++ b/t/t1092-sparse-checkout-compatibility.sh
@@ -0,0 +1,301 @@
+#!/bin/sh
+
+test_description='compare full workdir to sparse workdir'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+ git init initial-repo &&
+ (
+ cd initial-repo &&
+ echo a >a &&
+ echo "after deep" >e &&
+ echo "after folder1" >g &&
+ echo "after x" >z &&
+ mkdir folder1 folder2 deep x &&
+ mkdir deep/deeper1 deep/deeper2 &&
+ mkdir deep/deeper1/deepest &&
+ echo "after deeper1" >deep/e &&
+ echo "after deepest" >deep/deeper1/e &&
+ cp a folder1 &&
+ cp a folder2 &&
+ cp a x &&
+ cp a deep &&
+ cp a deep/deeper1 &&
+ cp a deep/deeper2 &&
+ cp a deep/deeper1/deepest &&
+ cp -r deep/deeper1/deepest deep/deeper2 &&
+ git add . &&
+ git commit -m "initial commit" &&
+ git checkout -b base &&
+ for dir in folder1 folder2 deep
+ do
+ git checkout -b update-$dir &&
+ echo "updated $dir" >$dir/a &&
+ git commit -a -m "update $dir" || return 1
+ done &&
+
+ git checkout -b rename-base base &&
+ echo >folder1/larger-content <<-\EOF &&
+ matching
+ lines
+ help
+ inexact
+ renames
+ EOF
+ cp folder1/larger-content folder2/ &&
+ cp folder1/larger-content deep/deeper1/ &&
+ git add . &&
+ git commit -m "add interesting rename content" &&
+
+ git checkout -b rename-out-to-out rename-base &&
+ mv folder1/a folder2/b &&
+ mv folder1/larger-content folder2/edited-content &&
+ echo >>folder2/edited-content &&
+ git add . &&
+ git commit -m "rename folder1/... to folder2/..." &&
+
+ git checkout -b rename-out-to-in rename-base &&
+ mv folder1/a deep/deeper1/b &&
+ mv folder1/larger-content deep/deeper1/edited-content &&
+ echo >>deep/deeper1/edited-content &&
+ git add . &&
+ git commit -m "rename folder1/... to deep/deeper1/..." &&
+
+ git checkout -b rename-in-to-out rename-base &&
+ mv deep/deeper1/a folder1/b &&
+ mv deep/deeper1/larger-content folder1/edited-content &&
+ echo >>folder1/edited-content &&
+ git add . &&
+ git commit -m "rename deep/deeper1/... to folder1/..." &&
+
+ git checkout -b deepest base &&
+ echo "updated deepest" >deep/deeper1/deepest/a &&
+ git commit -a -m "update deepest" &&
+
+ git checkout -f base &&
+ git reset --hard
+ )
+'
+
+init_repos () {
+ rm -rf full-checkout sparse-checkout sparse-index &&
+
+ # create repos in initial state
+ cp -r initial-repo full-checkout &&
+ git -C full-checkout reset --hard &&
+
+ cp -r initial-repo sparse-checkout &&
+ git -C sparse-checkout reset --hard &&
+ git -C sparse-checkout sparse-checkout init --cone &&
+
+ # initialize sparse-checkout definitions
+ git -C sparse-checkout sparse-checkout set deep
+}
+
+run_on_sparse () {
+ (
+ cd sparse-checkout &&
+ $* >../sparse-checkout-out 2>../sparse-checkout-err
+ )
+}
+
+run_on_all () {
+ (
+ cd full-checkout &&
+ $* >../full-checkout-out 2>../full-checkout-err
+ ) &&
+ run_on_sparse $*
+}
+
+test_all_match () {
+ run_on_all $* &&
+ test_cmp full-checkout-out sparse-checkout-out &&
+ test_cmp full-checkout-err sparse-checkout-err
+}
+
+test_expect_success 'status with options' '
+ init_repos &&
+ test_all_match git status --porcelain=v2 &&
+ test_all_match git status --porcelain=v2 -z -u &&
+ test_all_match git status --porcelain=v2 -uno &&
+ run_on_all "touch README.md" &&
+ test_all_match git status --porcelain=v2 &&
+ test_all_match git status --porcelain=v2 -z -u &&
+ test_all_match git status --porcelain=v2 -uno &&
+ test_all_match git add README.md &&
+ test_all_match git status --porcelain=v2 &&
+ test_all_match git status --porcelain=v2 -z -u &&
+ test_all_match git status --porcelain=v2 -uno
+'
+
+test_expect_success 'add, commit, checkout' '
+ init_repos &&
+
+ write_script edit-contents <<-\EOF &&
+ echo text >>$1
+ EOF
+ run_on_all "../edit-contents README.md" &&
+
+ test_all_match git add README.md &&
+ test_all_match git status --porcelain=v2 &&
+ test_all_match git commit -m "Add README.md" &&
+
+ test_all_match git checkout HEAD~1 &&
+ test_all_match git checkout - &&
+
+ run_on_all "../edit-contents README.md" &&
+
+ test_all_match git add -A &&
+ test_all_match git status --porcelain=v2 &&
+ test_all_match git commit -m "Extend README.md" &&
+
+ test_all_match git checkout HEAD~1 &&
+ test_all_match git checkout - &&
+
+ run_on_all "../edit-contents deep/newfile" &&
+
+ test_all_match git status --porcelain=v2 -uno &&
+ test_all_match git status --porcelain=v2 &&
+ test_all_match git add . &&
+ test_all_match git status --porcelain=v2 &&
+ test_all_match git commit -m "add deep/newfile" &&
+
+ test_all_match git checkout HEAD~1 &&
+ test_all_match git checkout -
+'
+
+test_expect_success 'checkout and reset --hard' '
+ init_repos &&
+
+ test_all_match git checkout update-folder1 &&
+ test_all_match git status --porcelain=v2 &&
+
+ test_all_match git checkout update-deep &&
+ test_all_match git status --porcelain=v2 &&
+
+ test_all_match git checkout -b reset-test &&
+ test_all_match git reset --hard deepest &&
+ test_all_match git reset --hard update-folder1 &&
+ test_all_match git reset --hard update-folder2
+'
+
+test_expect_success 'diff --staged' '
+ init_repos &&
+
+ write_script edit-contents <<-\EOF &&
+ echo text >>README.md
+ EOF
+ run_on_all "../edit-contents" &&
+
+ test_all_match git diff &&
+ test_all_match git diff --staged &&
+ test_all_match git add README.md &&
+ test_all_match git diff &&
+ test_all_match git diff --staged
+'
+
+test_expect_success 'diff with renames' '
+ init_repos &&
+
+ for branch in rename-out-to-out rename-out-to-in rename-in-to-out
+ do
+ test_all_match git checkout rename-base &&
+ test_all_match git checkout $branch -- .&&
+ test_all_match git diff --staged --no-renames &&
+ test_all_match git diff --staged --find-renames || return 1
+ done
+'
+
+test_expect_success 'log with pathspec outside sparse definition' '
+ init_repos &&
+
+ test_all_match git log -- a &&
+ test_all_match git log -- folder1/a &&
+ test_all_match git log -- folder2/a &&
+ test_all_match git log -- deep/a &&
+ test_all_match git log -- deep/deeper1/a &&
+ test_all_match git log -- deep/deeper1/deepest/a &&
+
+ test_all_match git checkout update-folder1 &&
+ test_all_match git log -- folder1/a
+'
+
+test_expect_success 'blame with pathspec inside sparse definition' '
+ init_repos &&
+
+ test_all_match git blame a &&
+ test_all_match git blame deep/a &&
+ test_all_match git blame deep/deeper1/a &&
+ test_all_match git blame deep/deeper1/deepest/a
+'
+
+# TODO: blame currently does not support blaming files outside of the
+# sparse definition. It complains that the file doesn't exist locally.
+test_expect_failure 'blame with pathspec outside sparse definition' '
+ init_repos &&
+
+ test_all_match git blame folder1/a &&
+ test_all_match git blame folder2/a &&
+ test_all_match git blame deep/deeper2/a &&
+ test_all_match git blame deep/deeper2/deepest/a
+'
+
+# TODO: reset currently does not behave as expected when in a
+# sparse-checkout.
+test_expect_failure 'checkout and reset (mixed)' '
+ init_repos &&
+
+ test_all_match git checkout -b reset-test update-deep &&
+ test_all_match git reset deepest &&
+ test_all_match git reset update-folder1 &&
+ test_all_match git reset update-folder2
+'
+
+test_expect_success 'merge' '
+ init_repos &&
+
+ test_all_match git checkout -b merge update-deep &&
+ test_all_match git merge -m "folder1" update-folder1 &&
+ test_all_match git rev-parse HEAD^{tree} &&
+ test_all_match git merge -m "folder2" update-folder2 &&
+ test_all_match git rev-parse HEAD^{tree}
+'
+
+test_expect_success 'merge with outside renames' '
+ init_repos &&
+
+ for type in out-to-out out-to-in in-to-out
+ do
+ test_all_match git reset --hard &&
+ test_all_match git checkout -f -b merge-$type update-deep &&
+ test_all_match git merge -m "$type" rename-$type &&
+ test_all_match git rev-parse HEAD^{tree} || return 1
+ done
+'
+
+test_expect_success 'clean' '
+ init_repos &&
+
+ echo bogus >>.gitignore &&
+ run_on_all cp ../.gitignore . &&
+ test_all_match git add .gitignore &&
+ test_all_match git commit -m ignore-bogus-files &&
+
+ run_on_sparse mkdir folder1 &&
+ run_on_all touch folder1/bogus &&
+
+ test_all_match git status --porcelain=v2 &&
+ test_all_match git clean -f &&
+ test_all_match git status --porcelain=v2 &&
+
+ test_all_match git clean -xf &&
+ test_all_match git status --porcelain=v2 &&
+
+ test_all_match git clean -xdf &&
+ test_all_match git status --porcelain=v2 &&
+
+ test_path_is_dir sparse-checkout/folder1
+'
+
+test_done
diff --git a/t/t1300-config.sh b/t/t1300-config.sh
index 97ebfe1..e0dd5d6 100755
--- a/t/t1300-config.sh
+++ b/t/t1300-config.sh
@@ -5,6 +5,9 @@
test_description='Test git config in different settings'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'clear default config' '
@@ -12,75 +15,75 @@
'
cat > expect << EOF
-[core]
+[section]
penguin = little blue
EOF
test_expect_success 'initial' '
- git config core.penguin "little blue" &&
+ git config section.penguin "little blue" &&
test_cmp expect .git/config
'
cat > expect << EOF
-[core]
+[section]
penguin = little blue
Movie = BadPhysics
EOF
test_expect_success 'mixed case' '
- git config Core.Movie BadPhysics &&
+ git config Section.Movie BadPhysics &&
test_cmp expect .git/config
'
cat > expect << EOF
-[core]
+[section]
penguin = little blue
Movie = BadPhysics
-[Cores]
+[Sections]
WhatEver = Second
EOF
test_expect_success 'similar section' '
- git config Cores.WhatEver Second &&
+ git config Sections.WhatEver Second &&
test_cmp expect .git/config
'
cat > expect << EOF
-[core]
+[section]
penguin = little blue
Movie = BadPhysics
UPPERCASE = true
-[Cores]
+[Sections]
WhatEver = Second
EOF
test_expect_success 'uppercase section' '
- git config CORE.UPPERCASE true &&
+ git config SECTION.UPPERCASE true &&
test_cmp expect .git/config
'
test_expect_success 'replace with non-match' '
- git config core.penguin kingpin !blue
+ git config section.penguin kingpin !blue
'
test_expect_success 'replace with non-match (actually matching)' '
- git config core.penguin "very blue" !kingpin
+ git config section.penguin "very blue" !kingpin
'
cat > expect << EOF
-[core]
+[section]
penguin = very blue
Movie = BadPhysics
UPPERCASE = true
penguin = kingpin
-[Cores]
+[Sections]
WhatEver = Second
EOF
test_expect_success 'non-match result' 'test_cmp expect .git/config'
test_expect_success 'find mixed-case key by canonical name' '
- test_cmp_config Second cores.whatever
+ test_cmp_config Second sections.whatever
'
test_expect_success 'find mixed-case key by non-canonical name' '
- test_cmp_config Second CoReS.WhAtEvEr
+ test_cmp_config Second SeCtIoNs.WhAtEvEr
'
test_expect_success 'subsections are not canonicalized by git-config' '
@@ -469,7 +472,8 @@
'
test_expect_success 'alternative --file (non-existing file should fail)' '
- test_must_fail git config --file non-existing-config -l
+ test_must_fail git config --file non-existing-config -l &&
+ test_must_fail git config --file non-existing-config test.xyzzy
'
cat > other-config << EOF
@@ -506,10 +510,6 @@
test_expect_success 'refer config from subdirectory' '
mkdir x &&
- test_cmp_config -C x strasse --get --file ../other-config ein.bahn
-'
-
-test_expect_success 'refer config from subdirectory via --file' '
test_cmp_config -C x strasse --file=../other-config --get ein.bahn
'
@@ -675,6 +675,13 @@
test_i18ngrep "bad numeric config value .1auto. for .aninvalid.unit. in file .git/config: invalid unit" actual
'
+test_expect_success 'invalid unit boolean' '
+ git config commit.gpgsign "1true" &&
+ test_cmp_config 1true commit.gpgsign &&
+ test_must_fail git config --bool --get commit.gpgsign 2>actual &&
+ test_i18ngrep "bad boolean config value .1true. for .commit.gpgsign." actual
+'
+
test_expect_success 'line number is reported correctly' '
printf "[bool]\n\tvar\n" >invalid &&
test_must_fail git config -f invalid --path bool.var 2>actual &&
@@ -1036,11 +1043,6 @@
test_cmp expect actual
'
-test_expect_success 'nonexistent configuration' '
- test_must_fail git config --file=doesnotexist --list &&
- test_must_fail git config --file=doesnotexist test.xyzzy
-'
-
test_expect_success SYMLINKS 'symlink to nonexistent configuration' '
ln -s doesnotexist linktonada &&
ln -s linktonada linktolinktonada &&
@@ -1054,8 +1056,8 @@
echo foo > foo &&
git add foo &&
git commit -m 'initial commit' &&
- git config branch.master.mergeoptions 'echo \"' &&
- test_must_fail git merge master
+ git config branch.main.mergeoptions 'echo \"' &&
+ test_must_fail git merge main
"
test_expect_success 'git -c "key=value" support' '
@@ -1065,12 +1067,12 @@
true
EOF
{
- git -c core.name=value config core.name &&
+ git -c section.name=value config section.name &&
git -c foo.CamelCase=value config foo.camelcase &&
git -c foo.flag config --bool foo.flag
} >actual &&
test_cmp expect actual &&
- test_must_fail git -c name=value config core.name
+ test_must_fail git -c name=value config section.name
'
# We just need a type-specifier here that cares about the
@@ -1115,7 +1117,7 @@
test_expect_success 'git -c does not split values on equals' '
echo "value with = in it" >expect &&
- git -c core.foo="value with = in it" config core.foo >actual &&
+ git -c section.foo="value with = in it" config section.foo >actual &&
test_cmp expect actual
'
@@ -1294,6 +1296,58 @@
GIT_CONFIG_PARAMETERS="" git -c x.one=1 config --list
'
+test_expect_success 'GIT_CONFIG_PARAMETERS handles old-style entries' '
+ v="${SQ}key.one=foo${SQ}" &&
+ v="$v ${SQ}key.two=bar${SQ}" &&
+ v="$v ${SQ}key.ambiguous=section.whatever=value${SQ}" &&
+ GIT_CONFIG_PARAMETERS=$v git config --get-regexp "key.*" >actual &&
+ cat >expect <<-EOF &&
+ key.one foo
+ key.two bar
+ key.ambiguous section.whatever=value
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success 'GIT_CONFIG_PARAMETERS handles new-style entries' '
+ v="${SQ}key.one${SQ}=${SQ}foo${SQ}" &&
+ v="$v ${SQ}key.two${SQ}=${SQ}bar${SQ}" &&
+ v="$v ${SQ}key.ambiguous=section.whatever${SQ}=${SQ}value${SQ}" &&
+ GIT_CONFIG_PARAMETERS=$v git config --get-regexp "key.*" >actual &&
+ cat >expect <<-EOF &&
+ key.one foo
+ key.two bar
+ key.ambiguous=section.whatever value
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success 'old and new-style entries can mix' '
+ v="${SQ}key.oldone=oldfoo${SQ}" &&
+ v="$v ${SQ}key.newone${SQ}=${SQ}newfoo${SQ}" &&
+ v="$v ${SQ}key.oldtwo=oldbar${SQ}" &&
+ v="$v ${SQ}key.newtwo${SQ}=${SQ}newbar${SQ}" &&
+ GIT_CONFIG_PARAMETERS=$v git config --get-regexp "key.*" >actual &&
+ cat >expect <<-EOF &&
+ key.oldone oldfoo
+ key.newone newfoo
+ key.oldtwo oldbar
+ key.newtwo newbar
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success 'old and new bools with ambiguous subsection' '
+ v="${SQ}key.with=equals.oldbool${SQ}" &&
+ v="$v ${SQ}key.with=equals.newbool${SQ}=" &&
+ GIT_CONFIG_PARAMETERS=$v git config --get-regexp "key.*" >actual &&
+ cat >expect <<-EOF &&
+ key.with equals.oldbool
+ key.with=equals.newbool
+ EOF
+ test_cmp expect actual
+'
+
test_expect_success 'detect bogus GIT_CONFIG_PARAMETERS' '
cat >expect <<-\EOF &&
env.one one
@@ -1316,6 +1370,173 @@
git config --get-regexp "env.*"
'
+test_expect_success 'git --config-env=key=envvar support' '
+ cat >expect <<-\EOF &&
+ value
+ value
+ false
+ EOF
+ {
+ ENVVAR=value git --config-env=core.name=ENVVAR config core.name &&
+ ENVVAR=value git --config-env=foo.CamelCase=ENVVAR config foo.camelcase &&
+ ENVVAR= git --config-env=foo.flag=ENVVAR config --bool foo.flag
+ } >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'git --config-env fails with invalid parameters' '
+ test_must_fail git --config-env=foo.flag config --bool foo.flag 2>error &&
+ test_i18ngrep "invalid config format: foo.flag" error &&
+ test_must_fail git --config-env=foo.flag= config --bool foo.flag 2>error &&
+ test_i18ngrep "missing environment variable name for configuration ${SQ}foo.flag${SQ}" error &&
+ sane_unset NONEXISTENT &&
+ test_must_fail git --config-env=foo.flag=NONEXISTENT config --bool foo.flag 2>error &&
+ test_i18ngrep "missing environment variable ${SQ}NONEXISTENT${SQ} for configuration ${SQ}foo.flag${SQ}" error
+'
+
+test_expect_success 'git -c and --config-env work together' '
+ cat >expect <<-\EOF &&
+ bar.cmd cmd-value
+ bar.env env-value
+ EOF
+ ENVVAR=env-value git \
+ -c bar.cmd=cmd-value \
+ --config-env=bar.env=ENVVAR \
+ config --get-regexp "^bar.*" >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'git -c and --config-env override each other' '
+ cat >expect <<-\EOF &&
+ env
+ cmd
+ EOF
+ {
+ ENVVAR=env git -c bar.bar=cmd --config-env=bar.bar=ENVVAR config bar.bar &&
+ ENVVAR=env git --config-env=bar.bar=ENVVAR -c bar.bar=cmd config bar.bar
+ } >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success '--config-env handles keys with equals' '
+ echo value=with=equals >expect &&
+ ENVVAR=value=with=equals git \
+ --config-env=section.subsection=with=equals.key=ENVVAR \
+ config section.subsection=with=equals.key >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'git config handles environment config pairs' '
+ GIT_CONFIG_COUNT=2 \
+ GIT_CONFIG_KEY_0="pair.one" GIT_CONFIG_VALUE_0="foo" \
+ GIT_CONFIG_KEY_1="pair.two" GIT_CONFIG_VALUE_1="bar" \
+ git config --get-regexp "pair.*" >actual &&
+ cat >expect <<-EOF &&
+ pair.one foo
+ pair.two bar
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success 'git config ignores pairs without count' '
+ test_must_fail env GIT_CONFIG_KEY_0="pair.one" GIT_CONFIG_VALUE_0="value" \
+ git config pair.one 2>error &&
+ test_must_be_empty error
+'
+
+test_expect_success 'git config ignores pairs with zero count' '
+ test_must_fail env \
+ GIT_CONFIG_COUNT=0 \
+ GIT_CONFIG_KEY_0="pair.one" GIT_CONFIG_VALUE_0="value" \
+ git config pair.one
+'
+
+test_expect_success 'git config ignores pairs exceeding count' '
+ GIT_CONFIG_COUNT=1 \
+ GIT_CONFIG_KEY_0="pair.one" GIT_CONFIG_VALUE_0="value" \
+ GIT_CONFIG_KEY_1="pair.two" GIT_CONFIG_VALUE_1="value" \
+ git config --get-regexp "pair.*" >actual &&
+ cat >expect <<-EOF &&
+ pair.one value
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success 'git config ignores pairs with zero count' '
+ test_must_fail env \
+ GIT_CONFIG_COUNT=0 GIT_CONFIG_KEY_0="pair.one" GIT_CONFIG_VALUE_0="value" \
+ git config pair.one >error &&
+ test_must_be_empty error
+'
+
+test_expect_success 'git config ignores pairs with empty count' '
+ test_must_fail env \
+ GIT_CONFIG_COUNT= GIT_CONFIG_KEY_0="pair.one" GIT_CONFIG_VALUE_0="value" \
+ git config pair.one >error &&
+ test_must_be_empty error
+'
+
+test_expect_success 'git config fails with invalid count' '
+ test_must_fail env GIT_CONFIG_COUNT=10a git config --list 2>error &&
+ test_i18ngrep "bogus count" error &&
+ test_must_fail env GIT_CONFIG_COUNT=9999999999999999 git config --list 2>error &&
+ test_i18ngrep "too many entries" error
+'
+
+test_expect_success 'git config fails with missing config key' '
+ test_must_fail env GIT_CONFIG_COUNT=1 GIT_CONFIG_VALUE_0="value" \
+ git config --list 2>error &&
+ test_i18ngrep "missing config key" error
+'
+
+test_expect_success 'git config fails with missing config value' '
+ test_must_fail env GIT_CONFIG_COUNT=1 GIT_CONFIG_KEY_0="pair.one" \
+ git config --list 2>error &&
+ test_i18ngrep "missing config value" error
+'
+
+test_expect_success 'git config fails with invalid config pair key' '
+ test_must_fail env GIT_CONFIG_COUNT=1 \
+ GIT_CONFIG_KEY_0= GIT_CONFIG_VALUE_0=value \
+ git config --list &&
+ test_must_fail env GIT_CONFIG_COUNT=1 \
+ GIT_CONFIG_KEY_0=missing-section GIT_CONFIG_VALUE_0=value \
+ git config --list
+'
+
+test_expect_success 'environment overrides config file' '
+ test_when_finished "rm -f .git/config" &&
+ cat >.git/config <<-EOF &&
+ [pair]
+ one = value
+ EOF
+ GIT_CONFIG_COUNT=1 GIT_CONFIG_KEY_0=pair.one GIT_CONFIG_VALUE_0=override \
+ git config pair.one >actual &&
+ cat >expect <<-EOF &&
+ override
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success 'GIT_CONFIG_PARAMETERS overrides environment config' '
+ GIT_CONFIG_COUNT=1 GIT_CONFIG_KEY_0=pair.one GIT_CONFIG_VALUE_0=value \
+ GIT_CONFIG_PARAMETERS="${SQ}pair.one=override${SQ}" \
+ git config pair.one >actual &&
+ cat >expect <<-EOF &&
+ override
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success 'command line overrides environment config' '
+ GIT_CONFIG_COUNT=1 GIT_CONFIG_KEY_0=pair.one GIT_CONFIG_VALUE_0=value \
+ git -c pair.one=override config pair.one >actual &&
+ cat >expect <<-EOF &&
+ override
+ EOF
+ test_cmp expect actual
+'
+
test_expect_success 'git config --edit works' '
git config -f tmp test.value no &&
echo test.value=yes >expect &&
@@ -1661,9 +1882,11 @@
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.environ=true
command line: user.cmdline=true
EOF
- git -c user.cmdline=true config --list --show-origin >output &&
+ GIT_CONFIG_COUNT=1 GIT_CONFIG_KEY_0=user.environ GIT_CONFIG_VALUE_0=true\
+ git -c user.cmdline=true config --list --show-origin >output &&
test_cmp expect output
'
@@ -1769,11 +1992,11 @@
test_expect_success '--show-origin blob ref' '
cat >expect <<-\EOF &&
- blob:master:custom.conf user.custom=true
+ blob:main:custom.conf user.custom=true
EOF
git add "$CUSTOM_CONFIG_FILE" &&
git commit -m "new config file" &&
- git config --blob=master:"$CUSTOM_CONFIG_FILE" --show-origin --list >output &&
+ git config --blob=main:"$CUSTOM_CONFIG_FILE" --show-origin --list >output &&
test_cmp expect output
'
@@ -1836,60 +2059,63 @@
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
-'
+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]
+[section]
foo = true
number = 10
big = 1M
EOF
test_expect_success 'identical modern --type specifiers are allowed' '
- test_cmp_config 1048576 --type=int --type=int core.big
+ test_cmp_config 1048576 --type=int --type=int section.big
'
test_expect_success 'identical legacy --type specifiers are allowed' '
- test_cmp_config 1048576 --int --int core.big
+ test_cmp_config 1048576 --int --int section.big
'
test_expect_success 'identical mixed --type specifiers are allowed' '
- test_cmp_config 1048576 --int --type=int core.big
+ test_cmp_config 1048576 --int --type=int section.big
'
test_expect_success 'non-identical modern --type specifiers are not allowed' '
- test_must_fail git config --type=int --type=bool core.big 2>error &&
+ test_must_fail git config --type=int --type=bool section.big 2>error &&
test_i18ngrep "only one type at a time" error
'
test_expect_success 'non-identical legacy --type specifiers are not allowed' '
- test_must_fail git config --int --bool core.big 2>error &&
+ test_must_fail git config --int --bool section.big 2>error &&
test_i18ngrep "only one type at a time" error
'
test_expect_success 'non-identical mixed --type specifiers are not allowed' '
- test_must_fail git config --type=int --bool core.big 2>error &&
+ test_must_fail git config --type=int --bool section.big 2>error &&
test_i18ngrep "only one type at a time" error
'
test_expect_success '--type allows valid type specifiers' '
- test_cmp_config true --type=bool core.foo
+ test_cmp_config true --type=bool section.foo
'
test_expect_success '--no-type unsets type specifiers' '
- test_cmp_config 10 --type=bool --no-type core.number
+ test_cmp_config 10 --type=bool --no-type section.number
'
test_expect_success 'unset type specifiers may be reset to conflicting ones' '
- test_cmp_config 1048576 --type=bool --no-type --type=int core.big
+ test_cmp_config 1048576 --type=bool --no-type --type=int section.big
'
test_expect_success '--type rejects unknown specifiers' '
- test_must_fail git config --type=nonsense core.foo 2>error &&
+ test_must_fail git config --type=nonsense section.foo 2>error &&
test_i18ngrep "unrecognized --type argument" error
'
@@ -1914,4 +2140,153 @@
test_cmp expect .git/config
'
+test_expect_success 'set all config with value-pattern' '
+ test_when_finished rm -f config initial &&
+ git config --file=initial abc.key one &&
+
+ # no match => add new entry
+ cp initial config &&
+ git config --file=config abc.key two a+ &&
+ git config --file=config --list >actual &&
+ cat >expect <<-\EOF &&
+ abc.key=one
+ abc.key=two
+ EOF
+ test_cmp expect actual &&
+
+ # multiple matches => failure
+ test_must_fail git config --file=config abc.key three o+ 2>err &&
+ test_i18ngrep "has multiple values" err &&
+
+ # multiple values, no match => add
+ git config --file=config abc.key three a+ &&
+ git config --file=config --list >actual &&
+ cat >expect <<-\EOF &&
+ abc.key=one
+ abc.key=two
+ abc.key=three
+ EOF
+ test_cmp expect actual &&
+
+ # single match => replace
+ git config --file=config abc.key four h+ &&
+ git config --file=config --list >actual &&
+ cat >expect <<-\EOF &&
+ abc.key=one
+ abc.key=two
+ abc.key=four
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success '--replace-all and value-pattern' '
+ test_when_finished rm -f config &&
+ git config --file=config --add abc.key one &&
+ git config --file=config --add abc.key two &&
+ git config --file=config --add abc.key three &&
+ git config --file=config --replace-all abc.key four "o+" &&
+ git config --file=config --list >actual &&
+ cat >expect <<-\EOF &&
+ abc.key=four
+ abc.key=three
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success 'refuse --fixed-value for incompatible actions' '
+ test_when_finished rm -f config &&
+ git config --file=config dev.null bogus &&
+
+ # These modes do not allow --fixed-value at all
+ test_must_fail git config --file=config --fixed-value --add dev.null bogus &&
+ test_must_fail git config --file=config --fixed-value --get-urlmatch dev.null bogus &&
+ test_must_fail git config --file=config --fixed-value --get-urlmatch dev.null bogus &&
+ test_must_fail git config --file=config --fixed-value --rename-section dev null &&
+ test_must_fail git config --file=config --fixed-value --remove-section dev &&
+ test_must_fail git config --file=config --fixed-value --list &&
+ test_must_fail git config --file=config --fixed-value --get-color dev.null &&
+ test_must_fail git config --file=config --fixed-value --get-colorbool dev.null &&
+
+ # These modes complain when --fixed-value has no value-pattern
+ test_must_fail git config --file=config --fixed-value dev.null bogus &&
+ test_must_fail git config --file=config --fixed-value --replace-all dev.null bogus &&
+ test_must_fail git config --file=config --fixed-value --get dev.null &&
+ test_must_fail git config --file=config --fixed-value --get-all dev.null &&
+ test_must_fail git config --file=config --fixed-value --get-regexp "dev.*" &&
+ test_must_fail git config --file=config --fixed-value --unset dev.null &&
+ test_must_fail git config --file=config --fixed-value --unset-all dev.null
+'
+
+test_expect_success '--fixed-value uses exact string matching' '
+ test_when_finished rm -f config initial &&
+ META="a+b*c?d[e]f.g" &&
+ git config --file=initial fixed.test "$META" &&
+
+ cp initial config &&
+ git config --file=config fixed.test bogus "$META" &&
+ git config --file=config --list >actual &&
+ cat >expect <<-EOF &&
+ fixed.test=$META
+ fixed.test=bogus
+ EOF
+ test_cmp expect actual &&
+
+ cp initial config &&
+ git config --file=config --fixed-value fixed.test bogus "$META" &&
+ git config --file=config --list >actual &&
+ cat >expect <<-\EOF &&
+ fixed.test=bogus
+ EOF
+ test_cmp expect actual &&
+
+ cp initial config &&
+ test_must_fail git config --file=config --unset fixed.test "$META" &&
+ git config --file=config --fixed-value --unset fixed.test "$META" &&
+ test_must_fail git config --file=config fixed.test &&
+
+ cp initial config &&
+ test_must_fail git config --file=config --unset-all fixed.test "$META" &&
+ git config --file=config --fixed-value --unset-all fixed.test "$META" &&
+ test_must_fail git config --file=config fixed.test &&
+
+ cp initial config &&
+ git config --file=config --replace-all fixed.test bogus "$META" &&
+ git config --file=config --list >actual &&
+ cat >expect <<-EOF &&
+ fixed.test=$META
+ fixed.test=bogus
+ EOF
+ test_cmp expect actual &&
+
+ git config --file=config --fixed-value --replace-all fixed.test bogus "$META" &&
+ git config --file=config --list >actual &&
+ cat >expect <<-EOF &&
+ fixed.test=bogus
+ fixed.test=bogus
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success '--get and --get-all with --fixed-value' '
+ test_when_finished rm -f config &&
+ META="a+b*c?d[e]f.g" &&
+ git config --file=config fixed.test bogus &&
+ git config --file=config --add fixed.test "$META" &&
+
+ git config --file=config --get fixed.test bogus &&
+ test_must_fail git config --file=config --get fixed.test "$META" &&
+ git config --file=config --get --fixed-value fixed.test "$META" &&
+ test_must_fail git config --file=config --get --fixed-value fixed.test non-existent &&
+
+ git config --file=config --get-all fixed.test bogus &&
+ test_must_fail git config --file=config --get-all fixed.test "$META" &&
+ git config --file=config --get-all --fixed-value fixed.test "$META" &&
+ test_must_fail git config --file=config --get-all --fixed-value fixed.test non-existent &&
+
+ git config --file=config --get-regexp fixed+ bogus &&
+ test_must_fail git config --file=config --get-regexp fixed+ "$META" &&
+ git config --file=config --get-regexp --fixed-value fixed+ "$META" &&
+ test_must_fail git config --file=config --get-regexp --fixed-value fixed+ non-existent
+'
+
test_done
diff --git a/t/t1301-shared-repo.sh b/t/t1301-shared-repo.sh
index 2dc853d..ac947bf 100755
--- a/t/t1301-shared-repo.sh
+++ b/t/t1301-shared-repo.sh
@@ -5,6 +5,9 @@
test_description='Test shared repository initialization'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
# Remove a default ACL from the test dir if possible.
@@ -115,13 +118,13 @@
umask 077 &&
git config core.sharedRepository group &&
git reflog expire --all &&
- actual="$(ls -l .git/logs/refs/heads/master)" &&
+ actual="$(ls -l .git/logs/refs/heads/main)" &&
case "$actual" in
-rw-rw-*)
: happy
;;
*)
- echo Ooops, .git/logs/refs/heads/master is not 0662 [$actual]
+ echo Ooops, .git/logs/refs/heads/main is not 0662 [$actual]
false
;;
esac
diff --git a/t/t1302-repo-version.sh b/t/t1302-repo-version.sh
index ce4cff1..0acabb6 100755
--- a/t/t1302-repo-version.sh
+++ b/t/t1302-repo-version.sh
@@ -8,6 +8,10 @@
. ./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 '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 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/t/t1305-config-include.sh b/t/t1305-config-include.sh
index f1e1b28..ccbb116 100755
--- a/t/t1305-config-include.sh
+++ b/t/t1305-config-include.sh
@@ -312,7 +312,7 @@
test_expect_success 'conditional include, onbranch' '
echo "[includeIf \"onbranch:foo-branch\"]path=bar9" >>.git/config &&
echo "[test]nine=9" >.git/bar9 &&
- git checkout -b master &&
+ git checkout -b main &&
test_must_fail git config test.nine &&
git checkout -b foo-branch &&
echo 9 >expect &&
@@ -352,9 +352,7 @@
git init --bare cycle &&
git -C cycle config include.path cycle &&
git config -f cycle/cycle include.path config &&
- test_must_fail \
- env GIT_TEST_GETTEXT_POISON=false \
- git -C cycle config --get-all test.value 2>stderr &&
+ test_must_fail git -C cycle config --get-all test.value 2>stderr &&
grep "exceeded maximum include depth" stderr
'
diff --git a/t/t1308-config-set.sh b/t/t1308-config-set.sh
index 3a527e3..88b119a 100755
--- a/t/t1308-config-set.sh
+++ b/t/t1308-config-set.sh
@@ -208,14 +208,14 @@
echo "[" >>.git/config &&
echo "fatal: bad config line 34 in file .git/config" >expect &&
test_expect_code 128 test-tool config get_value foo.bar 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'proper error on error in custom config files' '
echo "[" >>syntax-error &&
echo "fatal: bad config line 1 in file syntax-error" >expect &&
test_expect_code 128 test-tool config configset_get_value foo.bar syntax-error 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'check line errors for malformed values' '
diff --git a/t/t1309-early-config.sh b/t/t1309-early-config.sh
index ebb8e1a..b4a9158 100755
--- a/t/t1309-early-config.sh
+++ b/t/t1309-early-config.sh
@@ -91,11 +91,11 @@
test_expect_success 'early config and onbranch' '
echo "[broken" >broken &&
- test_with_config "[includeif \"onbranch:master\"]path=../broken"
+ test_with_config "[includeif \"onbranch:topic\"]path=../broken"
'
test_expect_success 'onbranch config outside of git repo' '
- test_config_global includeIf.onbranch:master.path non-existent &&
+ test_config_global includeIf.onbranch:topic.path non-existent &&
nongit git help
'
diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
index a6224ef..e31f65f 100755
--- a/t/t1400-update-ref.sh
+++ b/t/t1400-update-ref.sh
@@ -4,11 +4,14 @@
#
test_description='Test git update-ref and basic ref logging'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
Z=$ZERO_OID
-m=refs/heads/master
+m=refs/heads/main
n_dir=refs/heads/gu
n=$n_dir/fixes
outside=refs/foo
@@ -27,38 +30,39 @@
}
test_expect_success setup '
+ git checkout --orphan main &&
create_test_commits "" &&
mkdir $bare &&
cd $bare &&
- git init --bare &&
+ git init --bare -b main &&
create_test_commits "bare" &&
cd -
'
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" &&
+ test_when_finished "git update-ref -d $m" &&
git update-ref -d $m $B &&
- test_path_is_missing .git/$m
+ test_must_fail git show-ref --verify -q $m
'
test_expect_success "delete $m without oldvalue verification" '
- test_when_finished "rm -f .git/$m" &&
+ test_when_finished "git update-ref -d $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
+ test_must_fail git show-ref --verify -q $m
'
test_expect_success "fail to create $n" '
@@ -69,37 +73,37 @@
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" &&
+ test_when_finished "git update-ref -d $m" &&
git update-ref -d HEAD $B &&
- test_path_is_missing .git/$m
+ test_must_fail git show-ref --verify -q $m
'
test_expect_success "deleting current branch adds message to HEAD's log" '
- test_when_finished "rm -f .git/$m" &&
+ test_when_finished "git update-ref -d $m" &&
git update-ref $m $A &&
git symbolic-ref HEAD $m &&
git update-ref -m delete-$m -d $m &&
- test_path_is_missing .git/$m &&
+ test_must_fail git show-ref --verify -q $m &&
grep "delete-$m$" .git/logs/HEAD
'
test_expect_success "deleting by HEAD adds message to HEAD's log" '
- test_when_finished "rm -f .git/$m" &&
+ test_when_finished "git update-ref -d $m" &&
git update-ref $m $A &&
git symbolic-ref HEAD $m &&
git update-ref -m delete-by-head -d HEAD &&
- test_path_is_missing .git/$m &&
+ test_must_fail git show-ref --verify -q $m &&
grep "delete-by-head$" .git/logs/HEAD
'
@@ -160,10 +164,10 @@
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,40 +182,46 @@
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" &&
+ test_when_finished "git update-ref -d $m" &&
git update-ref -d HEAD $B &&
! grep "$m" .git/packed-refs &&
- test_path_is_missing .git/$m
+ test_must_fail git show-ref --verify -q $m
'
-cp -f .git/HEAD .git/HEAD.orig
test_expect_success 'delete symref without dereference' '
- test_when_finished "cp -f .git/HEAD.orig .git/HEAD" &&
- git update-ref --no-deref -d HEAD &&
- test_path_is_missing .git/HEAD
-'
-
-test_expect_success 'delete symref without dereference when the referred ref is packed' '
- test_when_finished "cp -f .git/HEAD.orig .git/HEAD" &&
+ test_when_finished "git update-ref -d $m" &&
echo foo >foo.c &&
git add foo.c &&
git commit -m foo &&
- git pack-refs --all &&
- git update-ref --no-deref -d HEAD &&
- test_path_is_missing .git/HEAD
+ git symbolic-ref SYMREF $m &&
+ git update-ref --no-deref -d SYMREF &&
+ git show-ref --verify -q $m &&
+ test_must_fail git show-ref --verify -q SYMREF &&
+ test_must_fail git symbolic-ref SYMREF
'
-git update-ref -d $m
+test_expect_success 'delete symref without dereference when the referred ref is packed' '
+ test_when_finished "git update-ref -d $m" &&
+ echo foo >foo.c &&
+ git add foo.c &&
+ git commit -m foo &&
+ git symbolic-ref SYMREF $m &&
+ git pack-refs --all &&
+ git update-ref --no-deref -d SYMREF &&
+ git show-ref --verify -q $m &&
+ test_must_fail git show-ref --verify -q SYMREF &&
+ test_must_fail git symbolic-ref SYMREF
+'
test_expect_success 'update-ref -d is not confused by self-reference' '
git symbolic-ref refs/heads/self refs/heads/self &&
@@ -226,25 +236,25 @@
test_when_finished "rm -f .git/refs/heads/self" &&
test_path_is_file .git/refs/heads/self &&
git update-ref --no-deref -d refs/heads/self &&
- test_path_is_missing .git/refs/heads/self
+ test_must_fail git show-ref --verify -q refs/heads/self
'
test_expect_success 'update-ref --no-deref -d can delete reference to bad ref' '
>.git/refs/heads/bad &&
test_when_finished "rm -f .git/refs/heads/bad" &&
git symbolic-ref refs/heads/ref-to-bad refs/heads/bad &&
- test_when_finished "rm -f .git/refs/heads/ref-to-bad" &&
+ test_when_finished "git update-ref -d refs/heads/ref-to-bad" &&
test_path_is_file .git/refs/heads/ref-to-bad &&
git update-ref --no-deref -d refs/heads/ref-to-bad &&
- test_path_is_missing .git/refs/heads/ref-to-bad
+ test_must_fail git show-ref --verify -q refs/heads/ref-to-bad
'
test_expect_success '(not) create HEAD with old sha1' '
test_must_fail git update-ref HEAD $A $B
'
test_expect_success "(not) prior created .git/$m" '
- test_when_finished "rm -f .git/$m" &&
- test_path_is_missing .git/$m
+ test_when_finished "git update-ref -d $m" &&
+ test_must_fail git show-ref --verify -q $m
'
test_expect_success 'create HEAD' '
@@ -254,28 +264,28 @@
test_must_fail git update-ref HEAD $B $Z
'
test_expect_success "(not) changed .git/$m" '
- test_when_finished "rm -f .git/$m" &&
- ! test $B = $(cat .git/$m)
+ test_when_finished "git update-ref -d $m" &&
+ ! test $B = $(git show-ref -s --verify $m)
'
-rm -f .git/logs/refs/heads/master
+rm -f .git/logs/refs/heads/main
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' '
@@ -284,8 +294,8 @@
test_path_is_file .git/refs/heads/d1/d2/r1 &&
test_path_is_file .git/logs/refs/heads/d1/d2/r1 &&
git branch -d d1/d2/r1 &&
- test_path_is_missing .git/refs/heads/d1/d2 &&
- test_path_is_missing .git/logs/refs/heads/d1/d2 &&
+ test_must_fail git show-ref --verify -q refs/heads/d1/d2 &&
+ test_must_fail git show-ref --verify -q logs/refs/heads/d1/d2 &&
test_path_is_file .git/refs/heads/d1/r2 &&
test_path_is_file .git/logs/refs/heads/d1/r2
'
@@ -294,12 +304,12 @@
git branch e1/e2/r1 HEAD &&
git branch e1/r2 HEAD &&
git checkout e1/e2/r1 &&
- test_when_finished "git checkout master" &&
+ test_when_finished "git checkout main" &&
test_path_is_file .git/refs/heads/e1/e2/r1 &&
test_path_is_file .git/logs/refs/heads/e1/e2/r1 &&
git update-ref -d HEAD &&
- test_path_is_missing .git/refs/heads/e1/e2 &&
- test_path_is_missing .git/logs/refs/heads/e1/e2 &&
+ test_must_fail git show-ref --verify -q refs/heads/e1/e2 &&
+ test_must_fail git show-ref --verify -q logs/refs/heads/e1/e2 &&
test_path_is_file .git/refs/heads/e1/r2 &&
test_path_is_file .git/logs/refs/heads/e1/r2 &&
test_path_is_file .git/logs/HEAD
@@ -319,19 +329,19 @@
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
@@ -358,68 +368,68 @@
ed="Thu, 26 May 2005 18:32:00 -0500"
gd="Thu, 26 May 2005 18:33:00 -0500"
ld="Thu, 26 May 2005 18:43:00 -0500"
-test_expect_success 'Query "master@{May 25 2005}" (before history)' '
+test_expect_success 'Query "main@{May 25 2005}" (before history)' '
test_when_finished "rm -f o e" &&
- git rev-parse --verify "master@{May 25 2005}" >o 2>e &&
+ git rev-parse --verify "main@{May 25 2005}" >o 2>e &&
echo "$C" >expect &&
test_cmp expect o &&
- echo "warning: log for '\''master'\'' only goes back to $ed" >expect &&
- test_i18ncmp expect e
+ echo "warning: log for '\''main'\'' only goes back to $ed" >expect &&
+ test_cmp expect e
'
-test_expect_success 'Query master@{2005-05-25} (before history)' '
+test_expect_success 'Query main@{2005-05-25} (before history)' '
test_when_finished "rm -f o e" &&
- git rev-parse --verify master@{2005-05-25} >o 2>e &&
+ git rev-parse --verify main@{2005-05-25} >o 2>e &&
echo "$C" >expect &&
test_cmp expect o &&
- echo "warning: log for '\''master'\'' only goes back to $ed" >expect &&
- test_i18ncmp expect e
+ echo "warning: log for '\''main'\'' only goes back to $ed" >expect &&
+ test_cmp expect e
'
-test_expect_success 'Query "master@{May 26 2005 23:31:59}" (1 second before history)' '
+test_expect_success 'Query "main@{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 &&
+ git rev-parse --verify "main@{May 26 2005 23:31:59}" >o 2>e &&
echo "$C" >expect &&
test_cmp expect o &&
- echo "warning: log for '\''master'\'' only goes back to $ed" >expect &&
- test_i18ncmp expect e
+ echo "warning: log for '\''main'\'' only goes back to $ed" >expect &&
+ test_cmp expect e
'
-test_expect_success 'Query "master@{May 26 2005 23:32:00}" (exactly history start)' '
+test_expect_success 'Query "main@{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 &&
+ git rev-parse --verify "main@{May 26 2005 23:32:00}" >o 2>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_expect_success 'Query "main@{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 &&
+ git rev-parse --verify "main@{May 26 2005 23:32:30}" >o 2>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_expect_success 'Query "main@{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 &&
+ git rev-parse --verify "main@{2005-05-26 23:33:01}" >o 2>e &&
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_expect_success 'Query "main@{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 &&
+ git rev-parse --verify "main@{2005-05-26 23:38:00}" >o 2>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_expect_success 'Query "main@{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 &&
+ git rev-parse --verify "main@{2005-05-26 23:43:00}" >o 2>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_expect_success 'Query "main@{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 &&
+ git rev-parse --verify "main@{2005-05-28}" >o 2>e &&
echo "$D" >expect &&
test_cmp expect o &&
test_i18ngrep -F "warning: log for ref $m unexpectedly ended on $ld" e
@@ -461,71 +471,71 @@
'
unset h_TEST h_OTHER h_FIXED h_MERGED
-test_expect_success 'git cat-file blob master:F (expect OTHER)' '
- test OTHER = $(git cat-file blob master:F)
+test_expect_success 'git cat-file blob main:F (expect OTHER)' '
+ test OTHER = $(git cat-file blob main:F)
'
-test_expect_success 'git cat-file blob master@{2005-05-26 23:30}:F (expect TEST)' '
- test TEST = $(git cat-file blob "master@{2005-05-26 23:30}:F")
+test_expect_success 'git cat-file blob main@{2005-05-26 23:30}:F (expect TEST)' '
+ test TEST = $(git cat-file blob "main@{2005-05-26 23:30}:F")
'
-test_expect_success 'git cat-file blob master@{2005-05-26 23:42}:F (expect OTHER)' '
- test OTHER = $(git cat-file blob "master@{2005-05-26 23:42}:F")
+test_expect_success 'git cat-file blob main@{2005-05-26 23:42}:F (expect OTHER)' '
+ test OTHER = $(git cat-file blob "main@{2005-05-26 23:42}:F")
'
# Test adding and deleting pseudorefs
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
'
@@ -580,21 +590,21 @@
'
test_expect_success 'stdin fails on unbalanced quotes' '
- echo "create $a \"master" >stdin &&
+ echo "create $a \"main" >stdin &&
test_must_fail git update-ref --stdin <stdin 2>err &&
- grep "fatal: badly quoted argument: \\\"master" err
+ grep "fatal: badly quoted argument: \\\"main" err
'
test_expect_success 'stdin fails on invalid escape' '
- echo "create $a \"ma\zter\"" >stdin &&
+ echo "create $a \"ma\zn\"" >stdin &&
test_must_fail git update-ref --stdin <stdin 2>err &&
- grep "fatal: badly quoted argument: \\\"ma\\\\zter\\\"" err
+ grep "fatal: badly quoted argument: \\\"ma\\\\zn\\\"" err
'
test_expect_success 'stdin fails on junk after quoted argument' '
- echo "create \"$a\"master" >stdin &&
+ echo "create \"$a\"main" >stdin &&
test_must_fail git update-ref --stdin <stdin 2>err &&
- grep "fatal: unexpected character after quoted argument: \\\"$a\\\"master" err
+ grep "fatal: unexpected character after quoted argument: \\\"$a\\\"main" err
'
test_expect_success 'stdin fails create with no ref' '
@@ -706,7 +716,7 @@
test_expect_success 'stdin succeeds with escaped character' '
git update-ref -d $a &&
- echo "create $a \"ma\\163ter\"" >stdin &&
+ echo "create $a \"ma\\151n\"" >stdin &&
git update-ref --stdin <stdin &&
git rev-parse $m >expect &&
git rev-parse $a >actual &&
@@ -1354,15 +1364,6 @@
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)
@@ -1397,11 +1398,204 @@
git rev-parse refs/bisect/something >../worktree-head &&
git for-each-ref | grep refs/bisect/something
) &&
- test_path_is_missing .git/refs/bisect &&
+ git show-ref >actual &&
+ ! grep 'refs/bisect' actual &&
test_must_fail git rev-parse refs/bisect/something &&
git update-ref refs/bisect/something HEAD &&
git rev-parse refs/bisect/something >main-head &&
! 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_must_fail git show-ref --verify -q $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_must_fail git show-ref --verify -q $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_must_fail git show-ref --verify -q $b
+'
+
+test_expect_success 'transaction can commit multiple times' '
+ cat >stdin <<-EOF &&
+ start
+ create refs/heads/branch-1 $A
+ commit
+ start
+ create refs/heads/branch-2 $B
+ commit
+ EOF
+ git update-ref --stdin <stdin >actual &&
+ printf "%s: ok\n" start commit start commit >expect &&
+ test_cmp expect actual &&
+ echo "$A" >expect &&
+ git rev-parse refs/heads/branch-1 >actual &&
+ test_cmp expect actual &&
+ echo "$B" >expect &&
+ git rev-parse refs/heads/branch-2 >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'transaction can create and delete' '
+ cat >stdin <<-EOF &&
+ start
+ create refs/heads/create-and-delete $A
+ commit
+ start
+ delete refs/heads/create-and-delete $A
+ commit
+ EOF
+ git update-ref --stdin <stdin >actual &&
+ printf "%s: ok\n" start commit start commit >expect &&
+ test_must_fail git show-ref --verify refs/heads/create-and-delete
+'
+
+test_expect_success 'transaction can commit after abort' '
+ cat >stdin <<-EOF &&
+ start
+ create refs/heads/abort $A
+ abort
+ start
+ create refs/heads/abort $A
+ commit
+ EOF
+ git update-ref --stdin <stdin >actual &&
+ printf "%s: ok\n" start abort start commit >expect &&
+ echo "$A" >expect &&
+ git rev-parse refs/heads/abort >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'transaction cannot restart ongoing transaction' '
+ cat >stdin <<-EOF &&
+ start
+ create refs/heads/restart $A
+ start
+ commit
+ EOF
+ test_must_fail git update-ref --stdin <stdin >actual &&
+ test_must_fail git show-ref --verify refs/heads/restart
+'
+
test_done
diff --git a/t/t1402-check-ref-format.sh b/t/t1402-check-ref-format.sh
index 98e4a86..cabc516 100755
--- a/t/t1402-check-ref-format.sh
+++ b/t/t1402-check-ref-format.sh
@@ -134,18 +134,18 @@
test_expect_success "check-ref-format --branch @{-1}" '
T=$(git write-tree) &&
sha1=$(echo A | git commit-tree $T) &&
- git update-ref refs/heads/master $sha1 &&
- git update-ref refs/remotes/origin/master $sha1 &&
- git checkout master &&
- git checkout origin/master &&
- git checkout master &&
+ git update-ref refs/heads/main $sha1 &&
+ git update-ref refs/remotes/origin/main $sha1 &&
+ git checkout main &&
+ git checkout origin/main &&
+ git checkout main &&
refname=$(git check-ref-format --branch @{-1}) &&
test "$refname" = "$sha1" &&
refname2=$(git check-ref-format --branch @{-2}) &&
- test "$refname2" = master'
+ test "$refname2" = main'
-test_expect_success 'check-ref-format --branch -naster' '
- test_must_fail git check-ref-format --branch -naster >actual &&
+test_expect_success 'check-ref-format --branch -nain' '
+ test_must_fail git check-ref-format --branch -nain >actual &&
test_must_be_empty actual
'
@@ -154,11 +154,11 @@
T=$(git write-tree) &&
sha1=$(echo A | git commit-tree $T) &&
- git update-ref refs/heads/master $sha1 &&
- git update-ref refs/remotes/origin/master $sha1 &&
- git checkout master &&
- git checkout origin/master &&
- git checkout master &&
+ git update-ref refs/heads/main $sha1 &&
+ git update-ref refs/remotes/origin/main $sha1 &&
+ git checkout main &&
+ git checkout origin/main &&
+ git checkout main &&
refname=$(
cd subdir &&
git check-ref-format --branch @{-1}
@@ -171,9 +171,9 @@
test_must_be_empty actual
'
-test_expect_success 'check-ref-format --branch master from non-repo' '
- echo master >expect &&
- nongit git check-ref-format --branch master >actual &&
+test_expect_success 'check-ref-format --branch main from non-repo' '
+ echo main >expect &&
+ nongit git check-ref-format --branch main >actual &&
test_cmp expect actual
'
diff --git a/t/t1403-show-ref.sh b/t/t1403-show-ref.sh
index 5d955c3..6ce62f8 100755
--- a/t/t1403-show-ref.sh
+++ b/t/t1403-show-ref.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='show-ref'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
@@ -9,7 +12,7 @@
git checkout -b side &&
test_commit B &&
git tag -f -a -m "annotated B" B &&
- git checkout master &&
+ git checkout main &&
test_commit C &&
git branch B A^0
'
@@ -92,23 +95,23 @@
git show-ref --verify -d refs/tags/A refs/tags/C >actual &&
test_cmp expect actual &&
- echo $(git rev-parse refs/heads/master) refs/heads/master >expect &&
- git show-ref -d master >actual &&
+ echo $(git rev-parse refs/heads/main) refs/heads/main >expect &&
+ git show-ref -d main >actual &&
test_cmp expect actual &&
- git show-ref -d heads/master >actual &&
+ git show-ref -d heads/main >actual &&
test_cmp expect actual &&
- git show-ref -d refs/heads/master >actual &&
+ git show-ref -d refs/heads/main >actual &&
test_cmp expect actual &&
- git show-ref -d --verify refs/heads/master >actual &&
+ git show-ref -d --verify refs/heads/main >actual &&
test_cmp expect actual &&
- test_must_fail git show-ref -d --verify master >actual &&
+ test_must_fail git show-ref -d --verify main >actual &&
test_must_be_empty actual &&
- test_must_fail git show-ref -d --verify heads/master >actual &&
+ test_must_fail git show-ref -d --verify heads/main >actual &&
test_must_be_empty actual &&
test_must_fail git show-ref --verify -d A C >actual &&
@@ -120,7 +123,7 @@
'
test_expect_success 'show-ref --heads, --tags, --head, pattern' '
- for branch in B master side
+ for branch in B main side
do
echo $(git rev-parse refs/heads/$branch) refs/heads/$branch
done >expect.heads &&
diff --git a/t/t1404-update-ref-errors.sh b/t/t1404-update-ref-errors.sh
index 2d142e5..8b51c4e 100755
--- a/t/t1404-update-ref-errors.sh
+++ b/t/t1404-update-ref-errors.sh
@@ -101,7 +101,7 @@
printf "%s\n" "delete $delname" "create $addname $D"
fi >commands &&
test_must_fail git update-ref --stdin <commands 2>output.err &&
- test_i18ncmp expected-err output.err &&
+ test_cmp expected-err output.err &&
printf "%s\n" "$C $delref" >expected-refs &&
git for-each-ref --format="%(objectname) %(refname)" $prefix/r >actual-refs &&
test_cmp expected-refs actual-refs
diff --git a/t/t1405-main-ref-store.sh b/t/t1405-main-ref-store.sh
index 331899d..a237d98 100755
--- a/t/t1405-main-ref-store.sh
+++ b/t/t1405-main-ref-store.sh
@@ -2,6 +2,9 @@
test_description='test main ref store api'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
RUN="test-tool ref-store main"
@@ -14,41 +17,38 @@
N=`find .git/refs -type f | wc -l`
'
-test_expect_success 'peel_ref(new-tag)' '
- git rev-parse HEAD >expected &&
- git tag -a -m new-tag new-tag HEAD &&
- $RUN peel-ref refs/tags/new-tag >actual &&
- test_cmp expected actual
-'
-
-test_expect_success 'create_symref(FOO, refs/heads/master)' '
- $RUN create-symref FOO refs/heads/master nothing &&
- echo refs/heads/master >expected &&
+test_expect_success 'create_symref(FOO, refs/heads/main)' '
+ $RUN create-symref FOO refs/heads/main nothing &&
+ echo refs/heads/main >expected &&
git symbolic-ref FOO >actual &&
test_cmp expected actual
'
test_expect_success 'delete_refs(FOO, refs/tags/new-tag)' '
+ git tag -a -m new-tag new-tag HEAD &&
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 main) &&
+ 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 --
'
-test_expect_success 'rename_refs(master, new-master)' '
- git rev-parse master >expected &&
- $RUN rename-ref refs/heads/master refs/heads/new-master &&
- git rev-parse new-master >actual &&
+test_expect_success 'rename_refs(main, new-main)' '
+ git rev-parse main >expected &&
+ $RUN rename-ref refs/heads/main refs/heads/new-main &&
+ git rev-parse new-main >actual &&
test_cmp expected actual &&
- test_commit recreate-master
+ test_commit recreate-main
'
test_expect_success 'for_each_ref(refs/heads/)' '
$RUN for-each-ref refs/heads/ | cut -d" " -f 2- >actual &&
cat >expected <<-\EOF &&
- master 0x0
- new-master 0x0
+ main 0x0
+ new-main 0x0
EOF
test_cmp expected actual
'
@@ -59,23 +59,23 @@
test_cmp expected actual
'
-test_expect_success 'resolve_ref(new-master)' '
- SHA1=`git rev-parse new-master` &&
- echo "$SHA1 refs/heads/new-master 0x0" >expected &&
- $RUN resolve-ref refs/heads/new-master 0 >actual &&
+test_expect_success 'resolve_ref(new-main)' '
+ SHA1=`git rev-parse new-main` &&
+ echo "$SHA1 refs/heads/new-main 0x0" >expected &&
+ $RUN resolve-ref refs/heads/new-main 0 >actual &&
test_cmp expected actual
'
-test_expect_success 'verify_ref(new-master)' '
- $RUN verify-ref refs/heads/new-master
+test_expect_success 'verify_ref(new-main)' '
+ $RUN verify-ref refs/heads/new-main
'
test_expect_success 'for_each_reflog()' '
$RUN for-each-reflog | sort -k2 | cut -d" " -f 2- >actual &&
cat >expected <<-\EOF &&
HEAD 0x1
- refs/heads/master 0x0
- refs/heads/new-master 0x0
+ refs/heads/main 0x0
+ refs/heads/new-main 0x0
EOF
test_cmp expected actual
'
@@ -83,12 +83,12 @@
test_expect_success 'for_each_reflog_ent()' '
$RUN for-each-reflog-ent HEAD >actual &&
head -n1 actual | grep one &&
- tail -n2 actual | head -n1 | grep recreate-master
+ tail -n2 actual | head -n1 | grep recreate-main
'
test_expect_success 'for_each_reflog_ent_reverse()' '
$RUN for-each-reflog-ent-reverse HEAD >actual &&
- head -n1 actual | grep recreate-master &&
+ head -n1 actual | grep recreate-main &&
tail -n2 actual | head -n1 | grep one
'
diff --git a/t/t1406-submodule-ref-store.sh b/t/t1406-submodule-ref-store.sh
index 36b7ef5..0a87058 100755
--- a/t/t1406-submodule-ref-store.sh
+++ b/t/t1406-submodule-ref-store.sh
@@ -2,6 +2,9 @@
test_description='test submodule ref store api'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
RUN="test-tool ref-store submodule:sub"
@@ -11,7 +14,8 @@
(
cd sub &&
test_commit first &&
- git checkout -b new-master
+ git checkout -b new-main &&
+ git tag -a -m new-tag new-tag HEAD
)
'
@@ -19,15 +23,8 @@
test_must_fail $RUN pack-refs 3
'
-test_expect_success 'peel_ref(new-tag)' '
- git -C sub rev-parse HEAD >expected &&
- git -C sub tag -a -m new-tag new-tag HEAD &&
- $RUN peel-ref refs/tags/new-tag >actual &&
- test_cmp expected actual
-'
-
test_expect_success 'create_symref() not allowed' '
- test_must_fail $RUN create-symref FOO refs/heads/master nothing
+ test_must_fail $RUN create-symref FOO refs/heads/main nothing
'
test_expect_success 'delete_refs() not allowed' '
@@ -35,14 +32,14 @@
'
test_expect_success 'rename_refs() not allowed' '
- test_must_fail $RUN rename-ref refs/heads/master refs/heads/new-master
+ test_must_fail $RUN rename-ref refs/heads/main refs/heads/new-main
'
test_expect_success 'for_each_ref(refs/heads/)' '
$RUN for-each-ref refs/heads/ | cut -d" " -f 2- >actual &&
cat >expected <<-\EOF &&
- master 0x0
- new-master 0x0
+ main 0x0
+ new-main 0x0
EOF
test_cmp expected actual
'
@@ -53,23 +50,23 @@
test_cmp expected actual
'
-test_expect_success 'resolve_ref(master)' '
- SHA1=`git -C sub rev-parse master` &&
- echo "$SHA1 refs/heads/master 0x0" >expected &&
- $RUN resolve-ref refs/heads/master 0 >actual &&
+test_expect_success 'resolve_ref(main)' '
+ SHA1=`git -C sub rev-parse main` &&
+ echo "$SHA1 refs/heads/main 0x0" >expected &&
+ $RUN resolve-ref refs/heads/main 0 >actual &&
test_cmp expected actual
'
-test_expect_success 'verify_ref(new-master)' '
- $RUN verify-ref refs/heads/new-master
+test_expect_success 'verify_ref(new-main)' '
+ $RUN verify-ref refs/heads/new-main
'
test_expect_success 'for_each_reflog()' '
$RUN for-each-reflog | sort | cut -d" " -f 2- >actual &&
cat >expected <<-\EOF &&
HEAD 0x1
- refs/heads/master 0x0
- refs/heads/new-master 0x0
+ refs/heads/main 0x0
+ refs/heads/new-main 0x0
EOF
test_cmp expected actual
'
@@ -77,12 +74,12 @@
test_expect_success 'for_each_reflog_ent()' '
$RUN for-each-reflog-ent HEAD >actual &&
head -n1 actual | grep first &&
- tail -n2 actual | head -n1 | grep master.to.new
+ tail -n2 actual | head -n1 | grep main.to.new
'
test_expect_success 'for_each_reflog_ent_reverse()' '
$RUN for-each-reflog-ent-reverse HEAD >actual &&
- head -n1 actual | grep master.to.new &&
+ head -n1 actual | grep main.to.new &&
tail -n2 actual | head -n1 | grep first
'
diff --git a/t/t1407-worktree-ref-store.sh b/t/t1407-worktree-ref-store.sh
index 9a84858..d3fe777 100755
--- a/t/t1407-worktree-ref-store.sh
+++ b/t/t1407-worktree-ref-store.sh
@@ -2,6 +2,9 @@
test_description='test worktree ref store api'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
RWT="test-tool ref-store worktree:wt"
@@ -9,7 +12,7 @@
test_expect_success 'setup' '
test_commit first &&
- git worktree add -b wt-master wt &&
+ git worktree add -b wt-main wt &&
(
cd wt &&
test_commit second
@@ -17,34 +20,34 @@
'
test_expect_success 'resolve_ref(<shared-ref>)' '
- SHA1=`git rev-parse master` &&
- echo "$SHA1 refs/heads/master 0x0" >expected &&
- $RWT resolve-ref refs/heads/master 0 >actual &&
+ SHA1=`git rev-parse main` &&
+ echo "$SHA1 refs/heads/main 0x0" >expected &&
+ $RWT resolve-ref refs/heads/main 0 >actual &&
test_cmp expected actual &&
- $RMAIN resolve-ref refs/heads/master 0 >actual &&
+ $RMAIN resolve-ref refs/heads/main 0 >actual &&
test_cmp expected actual
'
test_expect_success 'resolve_ref(<per-worktree-ref>)' '
SHA1=`git -C wt rev-parse HEAD` &&
- echo "$SHA1 refs/heads/wt-master 0x1" >expected &&
+ echo "$SHA1 refs/heads/wt-main 0x1" >expected &&
$RWT resolve-ref HEAD 0 >actual &&
test_cmp expected actual &&
SHA1=`git rev-parse HEAD` &&
- echo "$SHA1 refs/heads/master 0x1" >expected &&
+ echo "$SHA1 refs/heads/main 0x1" >expected &&
$RMAIN resolve-ref HEAD 0 >actual &&
test_cmp expected actual
'
-test_expect_success 'create_symref(FOO, refs/heads/master)' '
- $RWT create-symref FOO refs/heads/master nothing &&
- echo refs/heads/master >expected &&
+test_expect_success 'create_symref(FOO, refs/heads/main)' '
+ $RWT create-symref FOO refs/heads/main nothing &&
+ echo refs/heads/main >expected &&
git -C wt symbolic-ref FOO >actual &&
test_cmp expected actual &&
- $RMAIN create-symref FOO refs/heads/wt-master nothing &&
- echo refs/heads/wt-master >expected &&
+ $RMAIN create-symref FOO refs/heads/wt-main nothing &&
+ echo refs/heads/wt-main >expected &&
git symbolic-ref FOO >actual &&
test_cmp expected actual
'
@@ -63,8 +66,8 @@
HEAD 0x1
PSEUDO-WT 0x0
refs/bisect/wt-random 0x0
- refs/heads/master 0x0
- refs/heads/wt-master 0x0
+ refs/heads/main 0x0
+ refs/heads/wt-main 0x0
EOF
test_cmp expected actual &&
@@ -73,8 +76,8 @@
HEAD 0x1
PSEUDO-MAIN 0x0
refs/bisect/random 0x0
- refs/heads/master 0x0
- refs/heads/wt-master 0x0
+ refs/heads/main 0x0
+ refs/heads/wt-main 0x0
EOF
test_cmp expected actual
'
diff --git a/t/t1408-packed-refs.sh b/t/t1408-packed-refs.sh
index 1e44a17..41ba1f1 100755
--- a/t/t1408-packed-refs.sh
+++ b/t/t1408-packed-refs.sh
@@ -2,6 +2,9 @@
test_description='packed-refs entries are covered by loose refs'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
@@ -9,32 +12,32 @@
git commit --allow-empty -m one &&
one=$(git rev-parse HEAD) &&
git for-each-ref >actual &&
- echo "$one commit refs/heads/master" >expect &&
+ echo "$one commit refs/heads/main" >expect &&
test_cmp expect actual &&
git pack-refs --all &&
git for-each-ref >actual &&
- echo "$one commit refs/heads/master" >expect &&
+ echo "$one commit refs/heads/main" >expect &&
test_cmp expect actual &&
git checkout --orphan another &&
test_tick &&
git commit --allow-empty -m two &&
two=$(git rev-parse HEAD) &&
- git checkout -B master &&
+ git checkout -B main &&
git branch -D another &&
git for-each-ref >actual &&
- echo "$two commit refs/heads/master" >expect &&
+ echo "$two commit refs/heads/main" >expect &&
test_cmp expect actual &&
git reflog expire --expire=now --all &&
git prune &&
- git tag -m v1.0 v1.0 master
+ git tag -m v1.0 v1.0 main
'
test_expect_success 'no error from stale entry in packed-refs' '
- git describe master >actual 2>&1 &&
+ git describe main >actual 2>&1 &&
echo "v1.0" >expect &&
test_cmp expect actual
'
diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh
index 76d9b74..27b9080 100755
--- a/t/t1410-reflog.sh
+++ b/t/t1410-reflog.sh
@@ -4,6 +4,9 @@
#
test_description='Test prune and reflog expiration'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
check_have () {
@@ -54,7 +57,6 @@
}
test_expect_success setup '
- test_oid_init &&
mkdir -p A/B &&
echo rat >C &&
echo ox >A/D &&
@@ -100,7 +102,7 @@
check_fsck &&
- git reflog refs/heads/master >output &&
+ git reflog refs/heads/main >output &&
test_line_count = 4 output
'
@@ -117,7 +119,7 @@
check_have A B C D E F G H I J K L &&
- git reflog refs/heads/master >output &&
+ git reflog refs/heads/main >output &&
test_line_count = 5 output
'
@@ -136,7 +138,7 @@
--stale-fix \
--all &&
- git reflog refs/heads/master >output &&
+ git reflog refs/heads/main >output &&
test_line_count = 5 output &&
check_fsck "missing blob $F"
@@ -150,12 +152,38 @@
--stale-fix \
--all &&
- git reflog refs/heads/master >output &&
+ git reflog refs/heads/main >output &&
test_line_count = 2 output &&
check_fsck "dangling commit $K"
'
+test_expect_success '--stale-fix handles missing objects generously' '
+ git -c core.logAllRefUpdates=false fast-import --date-format=now <<-EOS &&
+ commit refs/heads/stale-fix
+ mark :1
+ committer Author <a@uth.or> now
+ data <<EOF
+ start stale fix
+ EOF
+ M 100644 inline file
+ data <<EOF
+ contents
+ EOF
+ commit refs/heads/stale-fix
+ committer Author <a@uth.or> now
+ data <<EOF
+ stale fix branch tip
+ EOF
+ from :1
+ EOS
+
+ parent_oid=$(git rev-parse stale-fix^) &&
+ test_when_finished "recover $parent_oid" &&
+ corrupt $parent_oid &&
+ git reflog expire --stale-fix
+'
+
test_expect_success 'prune and fsck' '
git prune &&
@@ -187,29 +215,29 @@
git commit -m tiger C &&
HEAD_entry_count=$(git reflog | wc -l) &&
- master_entry_count=$(git reflog show master | wc -l) &&
+ main_entry_count=$(git reflog show main | wc -l) &&
test $HEAD_entry_count = 5 &&
- test $master_entry_count = 5 &&
+ test $main_entry_count = 5 &&
- git reflog delete master@{1} &&
- git reflog show master > output &&
- test_line_count = $(($master_entry_count - 1)) output &&
+ git reflog delete main@{1} &&
+ git reflog show main > output &&
+ test_line_count = $(($main_entry_count - 1)) output &&
test $HEAD_entry_count = $(git reflog | wc -l) &&
! grep ox < output &&
- master_entry_count=$(wc -l < output) &&
+ main_entry_count=$(wc -l < output) &&
git reflog delete HEAD@{1} &&
test $(($HEAD_entry_count -1)) = $(git reflog | wc -l) &&
- test $master_entry_count = $(git reflog show master | wc -l) &&
+ test $main_entry_count = $(git reflog show main | wc -l) &&
HEAD_entry_count=$(git reflog | wc -l) &&
- git reflog delete master@{07.04.2005.15:15:00.-0700} &&
- git reflog show master > output &&
- test_line_count = $(($master_entry_count - 1)) output &&
+ git reflog delete main@{07.04.2005.15:15:00.-0700} &&
+ git reflog show main > output &&
+ test_line_count = $(($main_entry_count - 1)) output &&
! grep dragon < output
'
@@ -217,7 +245,7 @@
test_expect_success 'rewind2' '
test_tick && git reset --hard HEAD~2 &&
- git reflog refs/heads/master >output &&
+ git reflog refs/heads/main >output &&
test_line_count = 4 output
'
@@ -227,7 +255,7 @@
--expire=never \
--expire-unreachable=never \
--all &&
- git reflog refs/heads/master >output &&
+ git reflog refs/heads/main >output &&
test_line_count = 4 output
'
@@ -238,7 +266,7 @@
git reflog expire --verbose --all >output &&
test_line_count = 9 output &&
- git reflog refs/heads/master >output &&
+ git reflog refs/heads/main >output &&
test_line_count = 4 output
'
@@ -247,7 +275,7 @@
test_config gc.reflogexpireunreachable false &&
git reflog expire --verbose --all &&
- git reflog refs/heads/master >output &&
+ git reflog refs/heads/main >output &&
test_line_count = 4 output
'
@@ -256,33 +284,33 @@
test_config gc.reflogexpire never &&
test_config gc.reflogexpireunreachable never &&
- test_must_fail git reflog expire master@{123} 2>stderr &&
+ test_must_fail git reflog expire main@{123} 2>stderr &&
test_i18ngrep "points nowhere" stderr &&
test_must_fail git reflog expire does-not-exist 2>stderr &&
test_i18ngrep "points nowhere" stderr
'
test_expect_success 'checkout should not delete log for packed ref' '
- test $(git reflog master | wc -l) = 4 &&
+ test $(git reflog main | wc -l) = 4 &&
git branch foo &&
git pack-refs --all &&
git checkout foo &&
- test $(git reflog master | wc -l) = 4
+ test $(git reflog main | wc -l) = 4
'
test_expect_success 'stale dirs do not cause d/f conflicts (reflogs on)' '
test_when_finished "git branch -d one || git branch -d one/two" &&
- git branch one/two master &&
- echo "one/two@{0} branch: Created from master" >expect &&
+ git branch one/two main &&
+ echo "one/two@{0} branch: Created from main" >expect &&
git log -g --format="%gd %gs" one/two >actual &&
test_cmp expect actual &&
git branch -d one/two &&
# now logs/refs/heads/one is a stale directory, but
# we should move it out of the way to create "one" reflog
- git branch one master &&
- echo "one@{0} branch: Created from master" >expect &&
+ git branch one main &&
+ echo "one@{0} branch: Created from main" >expect &&
git log -g --format="%gd %gs" one >actual &&
test_cmp expect actual
'
@@ -290,15 +318,15 @@
test_expect_success 'stale dirs do not cause d/f conflicts (reflogs off)' '
test_when_finished "git branch -d one || git branch -d one/two" &&
- git branch one/two master &&
- echo "one/two@{0} branch: Created from master" >expect &&
+ git branch one/two main &&
+ echo "one/two@{0} branch: Created from main" >expect &&
git log -g --format="%gd %gs" one/two >actual &&
test_cmp expect actual &&
git branch -d one/two &&
# same as before, but we only create a reflog for "one" if
# it already exists, which it does not
- git -c core.logallrefupdates=false branch one master &&
+ git -c core.logallrefupdates=false branch one main &&
git log -g --format="%gd %gs" one >actual &&
test_must_be_empty actual
'
diff --git a/t/t1411-reflog-show.sh b/t/t1411-reflog-show.sh
index 985daf1..0bb319b 100755
--- a/t/t1411-reflog-show.sh
+++ b/t/t1411-reflog-show.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='Test reflog display routines'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup' '
@@ -167,7 +170,7 @@
'
test_expect_success 'reflog exists works' '
- git reflog exists refs/heads/master &&
+ git reflog exists refs/heads/main &&
! git reflog exists refs/heads/nonexistent
'
diff --git a/t/t1412-reflog-loop.sh b/t/t1412-reflog-loop.sh
index 3acd895..977603f 100755
--- a/t/t1412-reflog-loop.sh
+++ b/t/t1412-reflog-loop.sh
@@ -4,11 +4,8 @@
. ./test-lib.sh
test_expect_success 'setup commits' '
- test_tick &&
- echo content >file && git add file && git commit -m one &&
- git tag one &&
- echo content >>file && git add file && git commit -m two &&
- git tag two
+ test_commit one file content &&
+ test_commit --append two file content
'
test_expect_success 'setup reflog with alternating commits' '
diff --git a/t/t1413-reflog-detach.sh b/t/t1413-reflog-detach.sh
index c730600..bde0520 100755
--- a/t/t1413-reflog-detach.sh
+++ b/t/t1413-reflog-detach.sh
@@ -1,10 +1,13 @@
#!/bin/sh
test_description='Test reflog interaction with detached HEAD'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
reset_state () {
- git checkout master &&
+ git checkout main &&
cp saved_reflog .git/logs/HEAD
}
@@ -19,14 +22,14 @@
test_expect_success baseline '
reset_state &&
- git rev-parse master master^ >expect &&
+ git rev-parse main main^ >expect &&
git log -g --format=%H >actual &&
test_cmp expect actual
'
test_expect_success 'switch to branch' '
reset_state &&
- git rev-parse side master master^ >expect &&
+ git rev-parse side main main^ >expect &&
git checkout side &&
git log -g --format=%H >actual &&
test_cmp expect actual
@@ -34,34 +37,34 @@
test_expect_success 'detach to other' '
reset_state &&
- git rev-parse master side master master^ >expect &&
+ git rev-parse main side main main^ >expect &&
git checkout side &&
- git checkout master^0 &&
+ git checkout main^0 &&
git log -g --format=%H >actual &&
test_cmp expect actual
'
test_expect_success 'detach to self' '
reset_state &&
- git rev-parse master master master^ >expect &&
- git checkout master^0 &&
+ git rev-parse main main main^ >expect &&
+ git checkout main^0 &&
git log -g --format=%H >actual &&
test_cmp expect actual
'
test_expect_success 'attach to self' '
reset_state &&
- git rev-parse master master master master^ >expect &&
- git checkout master^0 &&
- git checkout master &&
+ git rev-parse main main main main^ >expect &&
+ git checkout main^0 &&
+ git checkout main &&
git log -g --format=%H >actual &&
test_cmp expect actual
'
test_expect_success 'attach to other' '
reset_state &&
- git rev-parse side master master master^ >expect &&
- git checkout master^0 &&
+ git rev-parse side main main main^ >expect &&
+ git checkout main^0 &&
git checkout side &&
git log -g --format=%H >actual &&
test_cmp expect actual
diff --git a/t/t1414-reflog-walk.sh b/t/t1414-reflog-walk.sh
index 1181a9f..80d9470 100755
--- a/t/t1414-reflog-walk.sh
+++ b/t/t1414-reflog-walk.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='various tests of reflog walk (log -g) behavior'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'set up some reflog entries' '
@@ -8,7 +11,7 @@
test_commit two &&
git checkout -b side HEAD^ &&
test_commit three &&
- git merge --no-commit master &&
+ git merge --no-commit main &&
echo evil-merge-content >>one.t &&
test_tick &&
git commit --no-edit -a
@@ -20,9 +23,9 @@
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}main${SQ} into side
HEAD@{1} commit: three
- HEAD@{2} checkout: moving from master to side
+ HEAD@{2} checkout: moving from main to side
HEAD@{3} commit: two
HEAD@{4} commit (initial): one
EOF
@@ -73,15 +76,15 @@
# sort ignores the bits after the timestamp.
#
# 2. POSIX leaves undefined whether this is a stable sort or not. So
- # we use "-k 1" to ensure that we see HEAD before master before
+ # we use "-k 1" to ensure that we see HEAD before main before
# side when breaking ties.
{
do_walk --date=unix HEAD &&
do_walk --date=unix side &&
- do_walk --date=unix master
+ do_walk --date=unix main
} >expect.raw &&
sort -t "{" -k 2nr -k 1 <expect.raw >expect &&
- do_walk --date=unix HEAD master side >actual &&
+ do_walk --date=unix HEAD main side >actual &&
test_cmp expect actual
'
diff --git a/t/t1415-worktree-refs.sh b/t/t1415-worktree-refs.sh
index bb2c757..7ab9124 100755
--- a/t/t1415-worktree-refs.sh
+++ b/t/t1415-worktree-refs.sh
@@ -76,24 +76,24 @@
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/t/t1416-ref-transaction-hooks.sh b/t/t1416-ref-transaction-hooks.sh
new file mode 100755
index 0000000..6c94102
--- /dev/null
+++ b/t/t1416-ref-transaction-hooks.sh
@@ -0,0 +1,139 @@
+#!/bin/sh
+
+test_description='reference transaction hooks'
+
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./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/main
+ EOF
+ git update-ref HEAD POST <<-EOF &&
+ update HEAD $ZERO_OID $POST_OID
+ update refs/heads/main $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/main
+ 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/main
+ EOF
+ git update-ref --stdin <<-EOF &&
+ start
+ update HEAD POST $ZERO_OID
+ update refs/heads/main 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/t/t1430-bad-ref-name.sh b/t/t1430-bad-ref-name.sh
index c7878a6..b1839e0 100755
--- a/t/t1430-bad-ref-name.sh
+++ b/t/t1430-bad-ref-name.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='Test handling of ref names that check-ref-format rejects'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
@@ -17,7 +20,7 @@
corrupt
COMMIT
- from refs/heads/master
+ from refs/heads/main
INPUT_END
test_must_fail git fast-import <input
@@ -32,14 +35,14 @@
corrupt
COMMIT
- from refs/heads/master
+ from refs/heads/main
INPUT_END
test_must_fail git fast-import <input
'
test_expect_success 'git branch shows badly named ref as warning' '
- cp .git/refs/heads/master .git/refs/heads/broken...ref &&
+ cp .git/refs/heads/main .git/refs/heads/broken...ref &&
test_when_finished "rm -f .git/refs/heads/broken...ref" &&
git branch >output 2>error &&
test_i18ngrep -e "ignoring ref with broken name refs/heads/broken\.\.\.ref" error &&
@@ -47,7 +50,7 @@
'
test_expect_success 'branch -d can delete badly named ref' '
- cp .git/refs/heads/master .git/refs/heads/broken...ref &&
+ cp .git/refs/heads/main .git/refs/heads/broken...ref &&
test_when_finished "rm -f .git/refs/heads/broken...ref" &&
git branch -d broken...ref &&
git branch >output 2>error &&
@@ -56,7 +59,7 @@
'
test_expect_success 'branch -D can delete badly named ref' '
- cp .git/refs/heads/master .git/refs/heads/broken...ref &&
+ cp .git/refs/heads/main .git/refs/heads/broken...ref &&
test_when_finished "rm -f .git/refs/heads/broken...ref" &&
git branch -D broken...ref &&
git branch >output 2>error &&
@@ -98,17 +101,17 @@
test_might_fail git branch -D goodref &&
git branch goodref &&
test_must_fail git branch -m goodref broken...ref &&
- test_cmp_rev master goodref &&
+ test_cmp_rev main goodref &&
git branch >output 2>error &&
! grep -e "broken\.\.\.ref" error &&
! grep -e "broken\.\.\.ref" output
'
test_expect_failure 'branch -m can rename from a bad ref name' '
- cp .git/refs/heads/master .git/refs/heads/broken...ref &&
+ cp .git/refs/heads/main .git/refs/heads/broken...ref &&
test_when_finished "rm -f .git/refs/heads/broken...ref" &&
git branch -m broken...ref renamed &&
- test_cmp_rev master renamed &&
+ test_cmp_rev main renamed &&
git branch >output 2>error &&
! grep -e "broken\.\.\.ref" error &&
! grep -e "broken\.\.\.ref" output
@@ -122,7 +125,7 @@
! grep -e "broken\.\.\.ref" output
'
-test_expect_failure C_LOCALE_OUTPUT 'push --mirror can delete badly named ref' '
+test_expect_failure 'push --mirror can delete badly named ref' '
top=$(pwd) &&
git init src &&
git init dest &&
@@ -135,7 +138,7 @@
cd dest &&
test_commit two &&
git checkout --detach &&
- cp .git/refs/heads/master .git/refs/heads/broken...ref
+ cp .git/refs/heads/main .git/refs/heads/broken...ref
) &&
git -C src push --mirror "file://$top/dest" &&
git -C dest branch >output 2>error &&
@@ -146,7 +149,7 @@
test_expect_success 'rev-parse skips symref pointing to broken name' '
test_when_finished "rm -f .git/refs/heads/broken...ref" &&
git branch shadow one &&
- cp .git/refs/heads/master .git/refs/heads/broken...ref &&
+ cp .git/refs/heads/main .git/refs/heads/broken...ref &&
printf "ref: refs/heads/broken...ref\n" >.git/refs/tags/shadow &&
test_when_finished "rm -f .git/refs/tags/shadow" &&
git rev-parse --verify one >expect &&
@@ -156,11 +159,11 @@
'
test_expect_success 'for-each-ref emits warnings for broken names' '
- cp .git/refs/heads/master .git/refs/heads/broken...ref &&
+ cp .git/refs/heads/main .git/refs/heads/broken...ref &&
test_when_finished "rm -f .git/refs/heads/broken...ref" &&
printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
test_when_finished "rm -f .git/refs/heads/badname" &&
- printf "ref: refs/heads/master\n" >.git/refs/heads/broken...symref &&
+ printf "ref: refs/heads/main\n" >.git/refs/heads/broken...symref &&
test_when_finished "rm -f .git/refs/heads/broken...symref" &&
git for-each-ref >output 2>error &&
! grep -e "broken\.\.\.ref" output &&
@@ -172,7 +175,7 @@
'
test_expect_success 'update-ref -d can delete broken name' '
- cp .git/refs/heads/master .git/refs/heads/broken...ref &&
+ cp .git/refs/heads/main .git/refs/heads/broken...ref &&
test_when_finished "rm -f .git/refs/heads/broken...ref" &&
git update-ref -d refs/heads/broken...ref >output 2>error &&
test_must_be_empty output &&
@@ -183,7 +186,7 @@
'
test_expect_success 'branch -d can delete broken name' '
- cp .git/refs/heads/master .git/refs/heads/broken...ref &&
+ cp .git/refs/heads/main .git/refs/heads/broken...ref &&
test_when_finished "rm -f .git/refs/heads/broken...ref" &&
git branch -d broken...ref >output 2>error &&
test_i18ngrep "Deleted branch broken...ref (was broken)" output &&
@@ -194,7 +197,7 @@
'
test_expect_success 'update-ref --no-deref -d can delete symref to broken name' '
- cp .git/refs/heads/master .git/refs/heads/broken...ref &&
+ cp .git/refs/heads/main .git/refs/heads/broken...ref &&
test_when_finished "rm -f .git/refs/heads/broken...ref" &&
printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
test_when_finished "rm -f .git/refs/heads/badname" &&
@@ -205,7 +208,7 @@
'
test_expect_success 'branch -d can delete symref to broken name' '
- cp .git/refs/heads/master .git/refs/heads/broken...ref &&
+ cp .git/refs/heads/main .git/refs/heads/broken...ref &&
test_when_finished "rm -f .git/refs/heads/broken...ref" &&
printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
test_when_finished "rm -f .git/refs/heads/badname" &&
@@ -234,7 +237,7 @@
'
test_expect_success 'update-ref -d can delete broken name through symref' '
- cp .git/refs/heads/master .git/refs/heads/broken...ref &&
+ cp .git/refs/heads/main .git/refs/heads/broken...ref &&
test_when_finished "rm -f .git/refs/heads/broken...ref" &&
printf "ref: refs/heads/broken...ref\n" >.git/refs/heads/badname &&
test_when_finished "rm -f .git/refs/heads/badname" &&
@@ -245,7 +248,7 @@
'
test_expect_success 'update-ref --no-deref -d can delete symref with broken name' '
- printf "ref: refs/heads/master\n" >.git/refs/heads/broken...symref &&
+ printf "ref: refs/heads/main\n" >.git/refs/heads/broken...symref &&
test_when_finished "rm -f .git/refs/heads/broken...symref" &&
git update-ref --no-deref -d refs/heads/broken...symref >output 2>error &&
test_path_is_missing .git/refs/heads/broken...symref &&
@@ -254,11 +257,11 @@
'
test_expect_success 'branch -d can delete symref with broken name' '
- printf "ref: refs/heads/master\n" >.git/refs/heads/broken...symref &&
+ printf "ref: refs/heads/main\n" >.git/refs/heads/broken...symref &&
test_when_finished "rm -f .git/refs/heads/broken...symref" &&
git branch -d broken...symref >output 2>error &&
test_path_is_missing .git/refs/heads/broken...symref &&
- test_i18ngrep "Deleted branch broken...symref (was refs/heads/master)" output &&
+ test_i18ngrep "Deleted branch broken...symref (was refs/heads/main)" output &&
test_must_be_empty error
'
@@ -296,37 +299,37 @@
'
test_expect_success 'update-ref --stdin fails create with bad ref name' '
- echo "create ~a refs/heads/master" >stdin &&
+ echo "create ~a refs/heads/main" >stdin &&
test_must_fail git update-ref --stdin <stdin 2>err &&
grep "fatal: invalid ref format: ~a" err
'
test_expect_success 'update-ref --stdin fails update with bad ref name' '
- echo "update ~a refs/heads/master" >stdin &&
+ echo "update ~a refs/heads/main" >stdin &&
test_must_fail git update-ref --stdin <stdin 2>err &&
grep "fatal: invalid ref format: ~a" err
'
test_expect_success 'update-ref --stdin fails delete with bad ref name' '
- echo "delete ~a refs/heads/master" >stdin &&
+ echo "delete ~a refs/heads/main" >stdin &&
test_must_fail git update-ref --stdin <stdin 2>err &&
grep "fatal: invalid ref format: ~a" err
'
test_expect_success 'update-ref --stdin -z fails create with bad ref name' '
- printf "%s\0" "create ~a " refs/heads/master >stdin &&
+ printf "%s\0" "create ~a " refs/heads/main >stdin &&
test_must_fail git update-ref -z --stdin <stdin 2>err &&
grep "fatal: invalid ref format: ~a " err
'
test_expect_success 'update-ref --stdin -z fails update with bad ref name' '
- printf "%s\0" "update ~a" refs/heads/master "" >stdin &&
+ printf "%s\0" "update ~a" refs/heads/main "" >stdin &&
test_must_fail git update-ref -z --stdin <stdin 2>err &&
grep "fatal: invalid ref format: ~a" err
'
test_expect_success 'update-ref --stdin -z fails delete with bad ref name' '
- printf "%s\0" "delete ~a" refs/heads/master >stdin &&
+ printf "%s\0" "delete ~a" refs/heads/main >stdin &&
test_must_fail git update-ref -z --stdin <stdin 2>err &&
grep "fatal: invalid ref format: ~a" err
'
diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh
index d09eff5..5071ac6 100755
--- a/t/t1450-fsck.sh
+++ b/t/t1450-fsck.sh
@@ -3,13 +3,12 @@
test_description='git fsck random collection of tests
* (HEAD) B
-* (master) A
+* (main) A
'
. ./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 &&
@@ -41,17 +40,13 @@
# specific corruption you test afterwards, lest a later test trip over
# it.
-test_expect_success 'setup: helpers for corruption tests' '
- sha1_file() {
- remainder=${1#??} &&
- firsttwo=${1%$remainder} &&
- echo ".git/objects/$firsttwo/$remainder"
- } &&
+sha1_file () {
+ git rev-parse --git-path objects/$(test_oid_to_path "$1")
+}
- remove_object() {
- rm "$(sha1_file "$1")"
- }
-'
+remove_object () {
+ rm "$(sha1_file "$1")"
+}
test_expect_success 'object with bad sha1' '
sha=$(echo blob | git hash-object -w --stdin) &&
@@ -133,6 +128,30 @@
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 &&
@@ -233,6 +252,35 @@
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
@@ -328,7 +376,7 @@
warning in tag $tag: badTagName: invalid '\''tag'\'' name: wrong name format
warning in tag $tag: missingTaggerEntry: invalid format - expected '\''tagger'\'' line
EOF
- test_i18ncmp expect out
+ test_cmp expect out
'
test_expect_success 'tag with bad tagger' '
@@ -610,13 +658,15 @@
git init name-objects &&
(
cd name-objects &&
+ git config core.logAllRefUpdates false &&
test_commit julius caesar.t &&
- test_commit augustus &&
- test_commit caesar &&
+ test_commit augustus44 &&
+ test_commit caesar &&
remove_object $(git rev-parse julius:caesar.t) &&
- test_must_fail git fsck --name-objects >out &&
tree=$(git rev-parse --verify julius:) &&
- test_i18ngrep "$tree (refs/tags/julius:" out
+ git tag -d julius &&
+ test_must_fail git fsck --name-objects >out &&
+ test_i18ngrep "$tree (refs/tags/augustus44\\^:" out
)
'
@@ -661,7 +711,7 @@
# 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 &&
@@ -754,7 +804,7 @@
git fsck >actual &&
# the output order is non-deterministic, as it comes from a hash
sort <actual >actual.sorted &&
- test_i18ncmp expect actual.sorted
+ test_cmp expect actual.sorted
)
'
@@ -764,7 +814,7 @@
git fsck --connectivity-only >actual &&
# the output order is non-deterministic, as it comes from a hash
sort <actual >actual.sorted &&
- test_i18ncmp expect actual.sorted
+ test_cmp expect actual.sorted
)
'
diff --git a/t/t1500-rev-parse.sh b/t/t1500-rev-parse.sh
index 603019b..deae916 100755
--- a/t/t1500-rev-parse.sh
+++ b/t/t1500-rev-parse.sh
@@ -1,8 +1,21 @@
#!/bin/sh
test_description='test git rev-parse'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
+test_one () {
+ dir="$1" &&
+ expect="$2" &&
+ shift &&
+ shift &&
+ echo "$expect" >expect &&
+ git -C "$dir" rev-parse "$@" >actual &&
+ test_cmp expect actual
+}
+
# usage: [options] label is-bare is-inside-git is-inside-work prefix git-dir absolute-git-dir
test_rev_parse () {
d=
@@ -59,9 +72,14 @@
ROOT=$(pwd)
test_expect_success 'setup' '
- test_oid_init &&
mkdir -p sub/dir work &&
- cp -R .git repo.git
+ cp -R .git repo.git &&
+ git checkout -B main &&
+ test_commit abc &&
+ git checkout -b side &&
+ test_commit def &&
+ git checkout main &&
+ git worktree add worktree side
'
test_rev_parse toplevel false false true '' .git "$ROOT/.git"
@@ -89,6 +107,45 @@
test_rev_parse -C work -g ../repo.git -b u 'GIT_DIR=../repo.git, core.bare undefined' false false true ''
+test_expect_success 'rev-parse --path-format=absolute' '
+ test_one "." "$ROOT/.git" --path-format=absolute --git-dir &&
+ test_one "." "$ROOT/.git" --path-format=absolute --git-common-dir &&
+ test_one "sub/dir" "$ROOT/.git" --path-format=absolute --git-dir &&
+ test_one "sub/dir" "$ROOT/.git" --path-format=absolute --git-common-dir &&
+ test_one "worktree" "$ROOT/.git/worktrees/worktree" --path-format=absolute --git-dir &&
+ test_one "worktree" "$ROOT/.git" --path-format=absolute --git-common-dir &&
+ test_one "." "$ROOT" --path-format=absolute --show-toplevel &&
+ test_one "." "$ROOT/.git/objects" --path-format=absolute --git-path objects &&
+ test_one "." "$ROOT/.git/objects/foo/bar/baz" --path-format=absolute --git-path objects/foo/bar/baz
+'
+
+test_expect_success 'rev-parse --path-format=relative' '
+ test_one "." ".git" --path-format=relative --git-dir &&
+ test_one "." ".git" --path-format=relative --git-common-dir &&
+ test_one "sub/dir" "../../.git" --path-format=relative --git-dir &&
+ test_one "sub/dir" "../../.git" --path-format=relative --git-common-dir &&
+ test_one "worktree" "../.git/worktrees/worktree" --path-format=relative --git-dir &&
+ test_one "worktree" "../.git" --path-format=relative --git-common-dir &&
+ test_one "." "./" --path-format=relative --show-toplevel &&
+ test_one "." ".git/objects" --path-format=relative --git-path objects &&
+ test_one "." ".git/objects/foo/bar/baz" --path-format=relative --git-path objects/foo/bar/baz
+'
+
+test_expect_success '--path-format=relative does not affect --absolute-git-dir' '
+ git rev-parse --path-format=relative --absolute-git-dir >actual &&
+ echo "$ROOT/.git" >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success '--path-format can change in the middle of the command line' '
+ git rev-parse --path-format=absolute --git-dir --path-format=relative --git-path objects/foo/bar >actual &&
+ cat >expect <<-EOF &&
+ $ROOT/.git
+ .git/objects/foo/bar
+ EOF
+ test_cmp expect actual
+'
+
test_expect_success 'git-common-dir from worktree root' '
echo .git >expect &&
git rev-parse --git-common-dir >actual &&
@@ -175,8 +232,8 @@
test_commit -C super/dir/sub branch1_commit &&
git -C super add dir/sub &&
test_commit -C super branch1_commit &&
- git -C super checkout -b branch2 master &&
- git -C super/dir/sub checkout -b branch2 master &&
+ git -C super checkout -b branch2 main &&
+ git -C super/dir/sub checkout -b branch2 main &&
test_commit -C super/dir/sub branch2_commit &&
git -C super add dir/sub &&
test_commit -C super branch2_commit &&
@@ -186,4 +243,19 @@
test_cmp expect out
'
+# at least one external project depends on this behavior:
+test_expect_success 'rev-parse --since= unsqueezed ordering' '
+ x1=--since=1970-01-01T00:00:01Z &&
+ x2=--since=1970-01-01T00:00:02Z &&
+ x3=--since=1970-01-01T00:00:03Z &&
+ git rev-parse $x1 $x1 $x3 $x2 >actual &&
+ cat >expect <<-EOF &&
+ --max-age=1
+ --max-age=1
+ --max-age=3
+ --max-age=2
+ EOF
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t1502-rev-parse-parseopt.sh b/t/t1502-rev-parse-parseopt.sh
index a859abe..b29563f 100755
--- a/t/t1502-rev-parse-parseopt.sh
+++ b/t/t1502-rev-parse-parseopt.sh
@@ -95,7 +95,7 @@
|EOF
END_EXPECT
test_expect_code 129 git rev-parse --parseopt -- -h > output < optionspec &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'test --parseopt help output no switches' '
@@ -108,7 +108,7 @@
|EOF
END_EXPECT
test_expect_code 129 git rev-parse --parseopt -- -h > output < optionspec_no_switches &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'test --parseopt help output hidden switches' '
@@ -121,7 +121,7 @@
|EOF
END_EXPECT
test_expect_code 129 git rev-parse --parseopt -- -h > output < optionspec_only_hidden_switches &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'test --parseopt help-all output hidden switches' '
@@ -136,7 +136,7 @@
|EOF
END_EXPECT
test_expect_code 129 git rev-parse --parseopt -- --help-all > output < optionspec_only_hidden_switches &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'test --parseopt invalid switch help output' '
@@ -176,7 +176,7 @@
|
END_EXPECT
test_expect_code 129 git rev-parse --parseopt -- --does-not-exist 1>/dev/null 2>output < optionspec &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'setup expect.1' "
diff --git a/t/t1503-rev-parse-verify.sh b/t/t1503-rev-parse-verify.sh
index 492edff..bf08102 100755
--- a/t/t1503-rev-parse-verify.sh
+++ b/t/t1503-rev-parse-verify.sh
@@ -6,6 +6,9 @@
exec </dev/null
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
add_line_into_file()
@@ -51,8 +54,8 @@
test "$rev_hash3" = "$HASH3" &&
rev_hash4=$(git rev-parse --verify $HASH4) &&
test "$rev_hash4" = "$HASH4" &&
- rev_master=$(git rev-parse --verify master) &&
- test "$rev_master" = "$HASH4" &&
+ rev_main=$(git rev-parse --verify main) &&
+ test "$rev_main" = "$HASH4" &&
rev_head=$(git rev-parse --verify HEAD) &&
test "$rev_head" = "$HASH4"
'
@@ -86,8 +89,8 @@
test_expect_success 'fails silently when using -q with deleted reflogs' '
ref=$(git rev-parse HEAD) &&
git update-ref --create-reflog -m "message for refs/test" refs/test "$ref" &&
- git reflog delete --updateref --rewrite refs/test@{0} &&
- test_must_fail git rev-parse -q --verify refs/test@{0} >error 2>&1 &&
+ git reflog delete --updateref --rewrite refs/test@{1} &&
+ test_must_fail git rev-parse -q --verify refs/test@{1} >error 2>&1 &&
test_must_be_empty error
'
@@ -116,27 +119,27 @@
'
test_expect_success 'use --default' '
- git rev-parse --verify --default master &&
- git rev-parse --verify --default master HEAD &&
- git rev-parse --default master --verify &&
- git rev-parse --default master --verify HEAD &&
- git rev-parse --verify HEAD --default master &&
- test_must_fail git rev-parse --verify foo --default master &&
+ git rev-parse --verify --default main &&
+ git rev-parse --verify --default main HEAD &&
+ git rev-parse --default main --verify &&
+ git rev-parse --default main --verify HEAD &&
+ git rev-parse --verify HEAD --default main &&
+ test_must_fail git rev-parse --verify foo --default main &&
test_must_fail git rev-parse --default HEAD --verify bar &&
test_must_fail git rev-parse --verify --default HEAD baz &&
test_must_fail git rev-parse --default foo --verify &&
test_must_fail git rev-parse --verify --default bar
'
-test_expect_success 'master@{n} for various n' '
+test_expect_success 'main@{n} for various n' '
N=$(git reflog | wc -l) &&
Nm1=$(($N-1)) &&
Np1=$(($N+1)) &&
- git rev-parse --verify master@{0} &&
- git rev-parse --verify master@{1} &&
- git rev-parse --verify master@{$Nm1} &&
- test_must_fail git rev-parse --verify master@{$N} &&
- test_must_fail git rev-parse --verify master@{$Np1}
+ git rev-parse --verify main@{0} &&
+ git rev-parse --verify main@{1} &&
+ git rev-parse --verify main@{$Nm1} &&
+ test_must_fail git rev-parse --verify main@{$N} &&
+ test_must_fail git rev-parse --verify main@{$Np1}
'
test_expect_success SYMLINKS 'ref resolution not confused by broken symlinks' '
@@ -144,4 +147,17 @@
test_must_fail git rev-parse --verify broken
'
+test_expect_success 'options can appear after --verify' '
+ git rev-parse --verify HEAD >expect &&
+ git rev-parse --verify -q HEAD >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'verify respects --end-of-options' '
+ git update-ref refs/heads/-tricky HEAD &&
+ git rev-parse --verify HEAD >expect &&
+ git rev-parse --verify --end-of-options -tricky >actual &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t1505-rev-parse-last.sh b/t/t1505-rev-parse-last.sh
index 4969edb..2803ca9 100755
--- a/t/t1505-rev-parse-last.sh
+++ b/t/t1505-rev-parse-last.sh
@@ -2,6 +2,9 @@
test_description='test @{-N} syntax'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
@@ -20,12 +23,12 @@
make_commit 3 &&
git checkout side &&
make_commit 4 &&
- git merge master &&
- git checkout master
+ git merge main &&
+ git checkout main
'
-# 1 -- 2 -- 3 master
+# 1 -- 2 -- 3 main
# \ \
# \ \
# --- 4 --- 5 side
@@ -49,7 +52,7 @@
'
test_expect_success '@{-2} works' '
- test_cmp_rev master @{-2}
+ test_cmp_rev main @{-2}
'
test_expect_success '@{-3} fails' '
diff --git a/t/t1506-rev-parse-diagnosis.sh b/t/t1506-rev-parse-diagnosis.sh
index 52edcbd..65a154a 100755
--- a/t/t1506-rev-parse-diagnosis.sh
+++ b/t/t1506-rev-parse-diagnosis.sh
@@ -4,6 +4,9 @@
exec </dev/null
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_did_you_mean ()
@@ -12,7 +15,7 @@
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_i18ncmp expected error
+ test_cmp expected error
}
HASH_file=
@@ -137,10 +140,10 @@
'
test_expect_success 'invalid @{n} reference' '
- test_must_fail git rev-parse master@{99999} >output 2>error &&
+ test_must_fail git rev-parse main@{99999} >output 2>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_must_fail git rev-parse --verify main@{99999} >output 2>error &&
test_must_be_empty output &&
test_i18ngrep "log for [^ ]* only has [0-9][0-9]* entries" error
'
@@ -190,6 +193,24 @@
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
@@ -207,7 +228,7 @@
{
# 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 &&
@@ -236,4 +257,29 @@
test_must_fail git rev-parse "foo\\*bar"
'
+test_expect_success 'arg after dashdash not interpreted as option' '
+ cat >expect <<-\EOF &&
+ --
+ --local-env-vars
+ EOF
+ git rev-parse -- --local-env-vars >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'arg after end-of-options not interpreted as option' '
+ test_must_fail git rev-parse --end-of-options --not-real -- 2>err &&
+ test_i18ngrep bad.revision.*--not-real err
+'
+
+test_expect_success 'end-of-options still allows --' '
+ cat >expect <<-EOF &&
+ --end-of-options
+ $(git rev-parse --verify HEAD)
+ --
+ path
+ EOF
+ git rev-parse --end-of-options HEAD -- path >actual &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t1507-rev-parse-upstream.sh b/t/t1507-rev-parse-upstream.sh
index dfc0d96..c34714f 100755
--- a/t/t1507-rev-parse-upstream.sh
+++ b/t/t1507-rev-parse-upstream.sh
@@ -2,6 +2,9 @@
test_description='test <branch>@{upstream} syntax'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
@@ -10,20 +13,20 @@
test_commit 1 &&
git checkout -b side &&
test_commit 2 &&
- git checkout master &&
+ git checkout main &&
git clone . clone &&
test_commit 3 &&
(cd clone &&
test_commit 4 &&
git branch --track my-side origin/side &&
- git branch --track local-master master &&
+ git branch --track local-main main &&
git branch --track fun@ny origin/side &&
git branch --track @funny origin/side &&
git branch --track funny@ origin/side &&
- git remote add -t master master-only .. &&
- git fetch master-only &&
+ git remote add -t main main-only .. &&
+ git fetch main-only &&
git branch bad-upstream &&
- git config branch.bad-upstream.remote master-only &&
+ git config branch.bad-upstream.remote main-only &&
git config branch.bad-upstream.merge refs/heads/side
)
'
@@ -39,7 +42,7 @@
}
test_expect_success '@{upstream} resolves to correct full name' '
- echo refs/remotes/origin/master >expect &&
+ echo refs/remotes/origin/main >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 &&
@@ -49,7 +52,7 @@
'
test_expect_success '@{u} resolves to correct full name' '
- echo refs/remotes/origin/master >expect &&
+ echo refs/remotes/origin/main >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 &&
@@ -132,7 +135,7 @@
test_expect_success 'merge my-side@{u} records the correct name' '
(
cd clone &&
- git checkout master &&
+ git checkout main &&
test_might_fail git branch -D new &&
git branch -t new my-side@{u} &&
git merge -s ours new@{u} &&
@@ -143,24 +146,24 @@
'
test_expect_success 'branch -d other@{u}' '
- git checkout -t -b other master &&
+ git checkout -t -b other main &&
git branch -d @{u} &&
- git for-each-ref refs/heads/master >actual &&
+ git for-each-ref refs/heads/main >actual &&
test_must_be_empty actual
'
test_expect_success 'checkout other@{u}' '
- git branch -f master HEAD &&
- git checkout -t -b another master &&
+ git branch -f main HEAD &&
+ git checkout -t -b another main &&
git checkout @{u} &&
git symbolic-ref HEAD >actual &&
- echo refs/heads/master >expect &&
+ echo refs/heads/main >expect &&
test_cmp expect actual
'
test_expect_success 'branch@{u} works when tracking a local branch' '
- echo refs/heads/master >expect &&
- git -C clone rev-parse --symbolic-full-name local-master@{u} >actual &&
+ echo refs/heads/main >expect &&
+ git -C clone rev-parse --symbolic-full-name local-main@{u} >actual &&
test_cmp expect actual
'
@@ -169,15 +172,15 @@
fatal: no upstream configured for branch ${SQ}non-tracking${SQ}
EOF
error_message non-tracking@{u} &&
- test_i18ncmp expect error
+ test_cmp expect error
'
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}main${SQ}
EOF
test_must_fail git rev-parse --verify @{u} 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'branch@{u} error message with misspelt branch' '
@@ -185,7 +188,7 @@
fatal: no such branch: ${SQ}no-such-branch${SQ}
EOF
error_message no-such-branch@{u} &&
- test_i18ncmp expect error
+ test_cmp expect error
'
test_expect_success '@{u} error message when not on a branch' '
@@ -194,7 +197,7 @@
EOF
git checkout HEAD^0 &&
test_must_fail git rev-parse --verify @{u} 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'branch@{u} error message if upstream branch not fetched' '
@@ -202,20 +205,20 @@
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
+ test_cmp expect error
'
test_expect_success 'pull works when tracking a local branch' '
(
cd clone &&
- git checkout local-master &&
+ git checkout local-main &&
git pull
)
'
# makes sense if the previous one succeeded
test_expect_success '@{u} works when tracking a local branch' '
- echo refs/heads/master >expect &&
+ echo refs/heads/main >expect &&
git -C clone rev-parse --symbolic-full-name @{u} >actual &&
test_cmp expect actual
'
@@ -224,7 +227,7 @@
commit=$(git rev-parse HEAD) &&
cat >expect <<-EOF &&
commit $commit
- Reflog: master@{0} (C O Mitter <committer@example.com>)
+ Reflog: main@{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
@@ -239,7 +242,7 @@
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: main@{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
diff --git a/t/t1508-at-combinations.sh b/t/t1508-at-combinations.sh
index 4a9964e..87a4286 100755
--- a/t/t1508-at-combinations.sh
+++ b/t/t1508-at-combinations.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='test various @{X} syntax combinations together'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
check() {
@@ -30,8 +33,8 @@
}
test_expect_success 'setup' '
- test_commit master-one &&
- test_commit master-two &&
+ test_commit main-one &&
+ test_commit main-two &&
git checkout -b upstream-branch &&
test_commit upstream-one &&
test_commit upstream-two &&
@@ -47,7 +50,7 @@
git checkout -b new-branch &&
test_commit new-one &&
test_commit new-two &&
- git branch -u master old-branch &&
+ git branch -u main old-branch &&
git branch -u upstream-branch new-branch
'
@@ -62,8 +65,8 @@
check "@{u}" ref refs/heads/upstream-branch
check "HEAD@{u}" ref refs/heads/upstream-branch
check "@{u}@{1}" commit upstream-one
-check "@{-1}@{u}" ref refs/heads/master
-check "@{-1}@{u}@{1}" commit master-one
+check "@{-1}@{u}" ref refs/heads/main
+check "@{-1}@{u}@{1}" commit main-one
check "@" commit new-two
check "@@{u}" ref refs/heads/upstream-branch
check "@@/at-test" ref refs/heads/@@/at-test
@@ -99,4 +102,17 @@
check "@:normal" blob content
check "@:fun@ny" blob content
+test_expect_success '@{1} works with only one reflog entry' '
+ git checkout -B newbranch main &&
+ git reflog expire --expire=now refs/heads/newbranch &&
+ git commit --allow-empty -m "first after expiration" &&
+ test_cmp_rev newbranch~ newbranch@{1}
+'
+
+test_expect_success '@{0} works with empty reflog' '
+ git checkout -B newbranch main &&
+ git reflog expire --expire=now refs/heads/newbranch &&
+ test_cmp_rev newbranch newbranch@{0}
+'
+
test_done
diff --git a/t/t1510-repo-setup.sh b/t/t1510-repo-setup.sh
index 9974457..bbfe05b 100755
--- a/t/t1510-repo-setup.sh
+++ b/t/t1510-repo-setup.sh
@@ -79,7 +79,7 @@
name=$1 worktreecfg=$2 gitfile=$3 barecfg=$4 &&
sane_unset GIT_DIR GIT_WORK_TREE &&
- git init "$name" &&
+ git -c init.defaultBranch=initial init "$name" &&
maybe_config "$name/.git/config" core.worktree "$worktreecfg" &&
maybe_config "$name/.git/config" core.bare "$barecfg" &&
mkdir -p "$name/sub/sub" &&
diff --git a/t/t1511-rev-parse-caret.sh b/t/t1511-rev-parse-caret.sh
index e0a49a6..6ecfed8 100755
--- a/t/t1511-rev-parse-caret.sh
+++ b/t/t1511-rev-parse-caret.sh
@@ -2,6 +2,9 @@
test_description='tests for ref^{stuff}'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup' '
@@ -15,7 +18,7 @@
git commit -m Initial &&
git tag -a -m commit commit-tag &&
git branch ref &&
- git checkout master &&
+ git checkout main &&
echo modified >>a-blob &&
git add -u &&
git commit -m Modified &&
@@ -73,52 +76,52 @@
'
test_expect_success 'ref^{/.}' '
- git rev-parse master >expected &&
- git rev-parse master^{/.} >actual &&
+ git rev-parse main >expected &&
+ git rev-parse main^{/.} >actual &&
test_cmp expected actual
'
test_expect_success 'ref^{/non-existent}' '
- test_must_fail git rev-parse master^{/non-existent}
+ test_must_fail git rev-parse main^{/non-existent}
'
test_expect_success 'ref^{/Initial}' '
git rev-parse ref >expected &&
- git rev-parse master^{/Initial} >actual &&
+ git rev-parse main^{/Initial} >actual &&
test_cmp expected actual
'
test_expect_success 'ref^{/!Exp}' '
- test_must_fail git rev-parse master^{/!Exp}
+ test_must_fail git rev-parse main^{/!Exp}
'
test_expect_success 'ref^{/!}' '
- test_must_fail git rev-parse master^{/!}
+ test_must_fail git rev-parse main^{/!}
'
test_expect_success 'ref^{/!!Exp}' '
git rev-parse expref >expected &&
- git rev-parse master^{/!!Exp} >actual &&
+ git rev-parse main^{/!!Exp} >actual &&
test_cmp expected actual
'
test_expect_success 'ref^{/!-}' '
- test_must_fail git rev-parse master^{/!-}
+ test_must_fail git rev-parse main^{/!-}
'
test_expect_success 'ref^{/!-.}' '
- test_must_fail git rev-parse master^{/!-.}
+ test_must_fail git rev-parse main^{/!-.}
'
test_expect_success 'ref^{/!-non-existent}' '
- git rev-parse master >expected &&
- git rev-parse master^{/!-non-existent} >actual &&
+ git rev-parse main >expected &&
+ git rev-parse main^{/!-non-existent} >actual &&
test_cmp expected actual
'
test_expect_success 'ref^{/!-Changed}' '
git rev-parse expref >expected &&
- git rev-parse master^{/!-Changed} >actual &&
+ git rev-parse main^{/!-Changed} >actual &&
test_cmp expected actual
'
diff --git a/t/t1512-rev-parse-disambiguation.sh b/t/t1512-rev-parse-disambiguation.sh
index 18fa6cf..7891a6b 100755
--- a/t/t1512-rev-parse-disambiguation.sh
+++ b/t/t1512-rev-parse-disambiguation.sh
@@ -20,6 +20,9 @@
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
if ! test_have_prereq SHA1
@@ -48,7 +51,7 @@
test_expect_success 'warn ambiguity when no candidate matches type hint' '
test_must_fail git rev-parse --verify 000000000^{commit} 2>actual &&
- test_i18ngrep "short SHA1 000000000 is ambiguous" actual
+ test_i18ngrep "short object ID 000000000 is ambiguous" actual
'
test_expect_success 'disambiguate tree-ish' '
@@ -212,7 +215,7 @@
side=$(git rev-parse HEAD) &&
# commit 000000000066
- git checkout master &&
+ git checkout main &&
# If you use recursive, merge will fail and you will need to
# clean up a0blgqsjc as well. If you use resolve, merge will
@@ -311,39 +314,39 @@
grep "refname.*${REF}.*ambiguous" err
'
-test_expect_success C_LOCALE_OUTPUT 'ambiguity errors are not repeated (raw)' '
+test_expect_success 'ambiguity errors are not repeated (raw)' '
test_must_fail git rev-parse 00000 2>stderr &&
grep "is ambiguous" stderr >errors &&
test_line_count = 1 errors
'
-test_expect_success C_LOCALE_OUTPUT 'ambiguity errors are not repeated (treeish)' '
+test_expect_success 'ambiguity errors are not repeated (treeish)' '
test_must_fail git rev-parse 00000:foo 2>stderr &&
grep "is ambiguous" stderr >errors &&
test_line_count = 1 errors
'
-test_expect_success C_LOCALE_OUTPUT 'ambiguity errors are not repeated (peel)' '
+test_expect_success 'ambiguity errors are not repeated (peel)' '
test_must_fail git rev-parse 00000^{commit} 2>stderr &&
grep "is ambiguous" stderr >errors &&
test_line_count = 1 errors
'
-test_expect_success C_LOCALE_OUTPUT 'ambiguity hints' '
+test_expect_success 'ambiguity hints' '
test_must_fail git rev-parse 000000000 2>stderr &&
grep ^hint: stderr >hints &&
# 16 candidates, plus one intro line
test_line_count = 17 hints
'
-test_expect_success C_LOCALE_OUTPUT 'ambiguity hints respect type' '
+test_expect_success 'ambiguity hints respect type' '
test_must_fail git rev-parse 000000000^{commit} 2>stderr &&
grep ^hint: stderr >hints &&
# 5 commits, 1 tag (which is a committish), plus intro line
test_line_count = 7 hints
'
-test_expect_success C_LOCALE_OUTPUT 'failed type-selector still shows hint' '
+test_expect_success 'failed type-selector still shows hint' '
# these two blobs share the same prefix "ee3d", but neither
# will pass for a commit
echo 851 | git hash-object --stdin -w &&
@@ -367,7 +370,7 @@
git -c core.disambiguate=committish rev-parse $sha1^{tree}
'
-test_expect_success C_LOCALE_OUTPUT 'ambiguous commits are printed by type first, then hash order' '
+test_expect_success 'ambiguous commits are printed by type first, then hash order' '
test_must_fail git rev-parse 0000 2>stderr &&
grep ^hint: stderr >hints &&
grep 0000 hints >objects &&
diff --git a/t/t1513-rev-parse-prefix.sh b/t/t1513-rev-parse-prefix.sh
index 87ec3ae..5f437be 100755
--- a/t/t1513-rev-parse-prefix.sh
+++ b/t/t1513-rev-parse-prefix.sh
@@ -2,6 +2,9 @@
test_description='Tests for rev-parse --prefix'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup' '
@@ -76,9 +79,9 @@
'
test_expect_success 'file and refs with prefix' '
- git rev-parse --prefix sub1/ master file1 >actual &&
+ git rev-parse --prefix sub1/ main file1 >actual &&
cat <<-EOF >expected &&
- $(git rev-parse master)
+ $(git rev-parse main)
sub1/file1
EOF
test_cmp expected actual
diff --git a/t/t1514-rev-parse-push.sh b/t/t1514-rev-parse-push.sh
index 788cc91..d868a08 100755
--- a/t/t1514-rev-parse-push.sh
+++ b/t/t1514-rev-parse-push.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='test <branch>@{push} syntax'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
resolve () {
@@ -16,24 +19,24 @@
git remote add other other.git &&
test_commit base &&
git push origin HEAD &&
- git branch --set-upstream-to=origin/master master &&
- git branch --track topic origin/master &&
+ git branch --set-upstream-to=origin/main main &&
+ git branch --track topic origin/main &&
git push origin topic &&
git push other topic
'
test_expect_success '@{push} with default=nothing' '
test_config push.default nothing &&
- test_must_fail git rev-parse master@{push} &&
- test_must_fail git rev-parse master@{PUSH} &&
- test_must_fail git rev-parse master@{PuSH}
+ test_must_fail git rev-parse main@{push} &&
+ test_must_fail git rev-parse main@{PUSH} &&
+ test_must_fail git rev-parse main@{PuSH}
'
test_expect_success '@{push} with default=simple' '
test_config push.default simple &&
- resolve master@{push} refs/remotes/origin/master &&
- resolve master@{PUSH} refs/remotes/origin/master &&
- resolve master@{pUSh} refs/remotes/origin/master
+ resolve main@{push} refs/remotes/origin/main &&
+ resolve main@{PUSH} refs/remotes/origin/main &&
+ resolve main@{pUSh} refs/remotes/origin/main
'
test_expect_success 'triangular @{push} fails with default=simple' '
diff --git a/t/t1600-index.sh b/t/t1600-index.sh
index b7c31aa..c9b9e71 100755
--- a/t/t1600-index.sh
+++ b/t/t1600-index.sh
@@ -18,7 +18,7 @@
warning: GIT_INDEX_VERSION set, but the value is invalid.
Using version Z
EOF
- test_i18ncmp expect.err actual.err
+ test_cmp expect.err actual.err
)
'
@@ -32,7 +32,7 @@
warning: GIT_INDEX_VERSION set, but the value is invalid.
Using version Z
EOF
- test_i18ncmp expect.err actual.err
+ test_cmp expect.err actual.err
)
'
@@ -55,7 +55,7 @@
warning: index.version set, but the value is invalid.
Using version Z
EOF
- test_i18ncmp expect.err actual.err
+ test_cmp expect.err actual.err
)
'
diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh
index 12a5568..986baa6 100755
--- a/t/t1700-split-index.sh
+++ b/t/t1700-split-index.sh
@@ -2,6 +2,9 @@
test_description='split index mode tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
# We need total control of index splitting here
@@ -496,7 +499,7 @@
test_commit initial &&
git checkout -b side-branch &&
test_commit extra &&
- git checkout master &&
+ git checkout main &&
git update-index --split-index &&
test_commit more &&
# must not write a new shareindex, or we wont catch the problem
diff --git a/t/t2004-checkout-cache-temp.sh b/t/t2004-checkout-cache-temp.sh
index a12afe9..a9352b0 100755
--- a/t/t2004-checkout-cache-temp.sh
+++ b/t/t2004-checkout-cache-temp.sh
@@ -88,9 +88,17 @@
done
'
+test_expect_success 'checkout all stages of unknown path' '
+ rm -f path* .merge_* actual &&
+ test_must_fail git checkout-index --stage=all --temp \
+ -- does-not-exist 2>stderr &&
+ test_i18ngrep not.in.the.cache stderr
+'
+
test_expect_success 'checkout all stages/one file to nothing' '
rm -f path* .merge_* actual &&
- git checkout-index --stage=all --temp -- path0 >actual &&
+ git checkout-index --stage=all --temp -- path0 >actual 2>stderr &&
+ test_must_be_empty stderr &&
test_line_count = 0 actual
'
diff --git a/t/t2006-checkout-index-basic.sh b/t/t2006-checkout-index-basic.sh
index 57cbdfe..7705e3a 100755
--- a/t/t2006-checkout-index-basic.sh
+++ b/t/t2006-checkout-index-basic.sh
@@ -21,4 +21,83 @@
test_i18ngrep "[Uu]sage" broken/usage
'
+test_expect_success 'checkout-index reports errors (cmdline)' '
+ test_must_fail git checkout-index -- does-not-exist 2>stderr &&
+ test_i18ngrep not.in.the.cache stderr
+'
+
+test_expect_success 'checkout-index reports errors (stdin)' '
+ echo does-not-exist |
+ test_must_fail git checkout-index --stdin 2>stderr &&
+ test_i18ngrep not.in.the.cache stderr
+'
+for mode in 'case' 'utf-8'
+do
+ case "$mode" in
+ case) dir='A' symlink='a' mode_prereq='CASE_INSENSITIVE_FS' ;;
+ utf-8)
+ dir=$(printf "\141\314\210") symlink=$(printf "\303\244")
+ mode_prereq='UTF8_NFD_TO_NFC' ;;
+ esac
+
+ test_expect_success SYMLINKS,$mode_prereq \
+ "checkout-index with $mode-collision don't write to the wrong place" '
+ git init $mode-collision &&
+ (
+ cd $mode-collision &&
+ mkdir target-dir &&
+
+ empty_obj_hex=$(git hash-object -w --stdin </dev/null) &&
+ symlink_hex=$(printf "%s" "$PWD/target-dir" | git hash-object -w --stdin) &&
+
+ cat >objs <<-EOF &&
+ 100644 blob ${empty_obj_hex} ${dir}/x
+ 100644 blob ${empty_obj_hex} ${dir}/y
+ 100644 blob ${empty_obj_hex} ${dir}/z
+ 120000 blob ${symlink_hex} ${symlink}
+ EOF
+
+ git update-index --index-info <objs &&
+
+ # Note: the order is important here to exercise the
+ # case where the file at ${dir} has its type changed by
+ # the time Git tries to check out ${dir}/z.
+ #
+ # Also, we use core.precomposeUnicode=false because we
+ # want Git to treat the UTF-8 paths transparently on
+ # Mac OS, matching what is in the index.
+ #
+ git -c core.precomposeUnicode=false checkout-index -f \
+ ${dir}/x ${dir}/y ${symlink} ${dir}/z &&
+
+ # Should not create ${dir}/z at ${symlink}/z
+ test_path_is_missing target-dir/z
+
+ )
+ '
+done
+
+test_expect_success 'checkout-index --temp correctly reports error on missing blobs' '
+ test_when_finished git reset --hard &&
+ missing_blob=$(echo "no such blob here" | git hash-object --stdin) &&
+ cat >objs <<-EOF &&
+ 100644 $missing_blob file
+ 120000 $missing_blob symlink
+ EOF
+ git update-index --index-info <objs &&
+
+ test_must_fail git checkout-index --temp symlink file 2>stderr &&
+ test_i18ngrep "unable to read sha1 file of file ($missing_blob)" stderr &&
+ test_i18ngrep "unable to read sha1 file of symlink ($missing_blob)" stderr
+'
+
+test_expect_success 'checkout-index --temp correctly reports error for submodules' '
+ git init sub &&
+ test_commit -C sub file &&
+ git submodule add ./sub &&
+ git commit -m sub &&
+ test_must_fail git checkout-index --temp sub 2>stderr &&
+ test_i18ngrep "cannot create temporary submodule sub" stderr
+'
+
test_done
diff --git a/t/t2007-checkout-symlink.sh b/t/t2007-checkout-symlink.sh
index fc9aad5..6f0b90c 100755
--- a/t/t2007-checkout-symlink.sh
+++ b/t/t2007-checkout-symlink.sh
@@ -4,6 +4,9 @@
test_description='git checkout to switch between branches with symlink<->dir'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
@@ -12,14 +15,14 @@
echo hello >frotz/filfre &&
git add frotz/filfre &&
test_tick &&
- git commit -m "master has file frotz/filfre" &&
+ git commit -m "main has file frotz/filfre" &&
git branch side &&
echo goodbye >nitfol &&
git add nitfol &&
test_tick &&
- git commit -m "master adds file nitfol" &&
+ git commit -m "main adds file nitfol" &&
git checkout side &&
@@ -34,13 +37,13 @@
test_expect_success 'switch from symlink to dir' '
- git checkout master
+ git checkout main
'
-test_expect_success 'Remove temporary directories & switch to master' '
+test_expect_success 'Remove temporary directories & switch to main' '
rm -fr frotz xyzzy nitfol &&
- git checkout -f master
+ git checkout -f main
'
test_expect_success 'switch from dir to symlink' '
diff --git a/t/t2009-checkout-statinfo.sh b/t/t2009-checkout-statinfo.sh
index f3c2152..b054063 100755
--- a/t/t2009-checkout-statinfo.sh
+++ b/t/t2009-checkout-statinfo.sh
@@ -2,6 +2,9 @@
test_description='checkout should leave clean stat info'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup' '
@@ -21,13 +24,13 @@
git reset --hard &&
test "$(git diff-files --raw)" = "" &&
- git checkout master &&
+ git checkout main &&
test "$(git diff-files --raw)" = "" &&
git checkout side &&
test "$(git diff-files --raw)" = "" &&
- git checkout master &&
+ git checkout main &&
test "$(git diff-files --raw)" = ""
'
@@ -37,13 +40,13 @@
git reset --hard &&
test "$(git diff-files --raw)" = "" &&
- git checkout master world &&
+ git checkout main world &&
test "$(git diff-files --raw)" = "" &&
git checkout side world &&
test "$(git diff-files --raw)" = "" &&
- git checkout master world &&
+ git checkout main world &&
test "$(git diff-files --raw)" = ""
'
diff --git a/t/t2010-checkout-ambiguous.sh b/t/t2010-checkout-ambiguous.sh
index 2e47fe0..6e87573 100755
--- a/t/t2010-checkout-ambiguous.sh
+++ b/t/t2010-checkout-ambiguous.sh
@@ -2,6 +2,9 @@
test_description='checkout and pathspecs/refspecs ambiguities'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup' '
@@ -17,7 +20,7 @@
'
test_expect_success 'branch switching' '
- test "refs/heads/master" = "$(git symbolic-ref HEAD)" &&
+ test "refs/heads/main" = "$(git symbolic-ref HEAD)" &&
git checkout world -- &&
test "refs/heads/world" = "$(git symbolic-ref HEAD)"
'
@@ -57,7 +60,7 @@
'
test_expect_success 'accurate error message with more than one ref' '
- test_must_fail git checkout HEAD master -- 2>actual &&
+ test_must_fail git checkout HEAD main -- 2>actual &&
test_i18ngrep 2 actual &&
test_i18ngrep "one reference expected, 2 given" actual
'
diff --git a/t/t2011-checkout-invalid-head.sh b/t/t2011-checkout-invalid-head.sh
index 0e8d56a..e52022e 100755
--- a/t/t2011-checkout-invalid-head.sh
+++ b/t/t2011-checkout-invalid-head.sh
@@ -2,6 +2,9 @@
test_description='checkout switching away from an invalid branch'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup' '
@@ -11,12 +14,12 @@
'
test_expect_success 'checkout should not start branch from a tree' '
- test_must_fail git checkout -b newbranch master^{tree}
+ test_must_fail git checkout -b newbranch main^{tree}
'
-test_expect_success 'checkout master from invalid HEAD' '
+test_expect_success 'checkout main from invalid HEAD' '
echo $ZERO_OID >.git/HEAD &&
- git checkout master --
+ git checkout main --
'
test_expect_success 'checkout notices failure to lock HEAD' '
@@ -26,7 +29,7 @@
'
test_expect_success 'create ref directory/file conflict scenario' '
- git update-ref refs/heads/outer/inner master &&
+ git update-ref refs/heads/outer/inner main &&
# do not rely on symbolic-ref to get a known state,
# as it may use the same code we are testing
@@ -37,12 +40,12 @@
test_expect_success 'checkout away from d/f HEAD (unpacked, to branch)' '
reset_to_df &&
- git checkout master
+ git checkout main
'
test_expect_success 'checkout away from d/f HEAD (unpacked, to detached)' '
reset_to_df &&
- git checkout --detach master
+ git checkout --detach main
'
test_expect_success 'pack refs' '
@@ -51,11 +54,11 @@
test_expect_success 'checkout away from d/f HEAD (packed, to branch)' '
reset_to_df &&
- git checkout master
+ git checkout main
'
test_expect_success 'checkout away from d/f HEAD (packed, to detached)' '
reset_to_df &&
- git checkout --detach master
+ git checkout --detach main
'
test_done
diff --git a/t/t2012-checkout-last.sh b/t/t2012-checkout-last.sh
index e7ba8c5..0e7d47a 100755
--- a/t/t2012-checkout-last.sh
+++ b/t/t2012-checkout-last.sh
@@ -2,16 +2,15 @@
test_description='checkout can switch to last branch and merge base'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup' '
- echo hello >world &&
- git add world &&
- git commit -m initial &&
+ test_commit initial world hello &&
git branch other &&
- echo "hello again" >>world &&
- git add world &&
- git commit -m second
+ test_commit --append second world "hello again"
'
test_expect_success '"checkout -" does not work initially' '
@@ -24,7 +23,7 @@
test_expect_success '"checkout -" switches back' '
git checkout - &&
- test "z$(git symbolic-ref HEAD)" = "zrefs/heads/master"
+ test "z$(git symbolic-ref HEAD)" = "zrefs/heads/main"
'
test_expect_success '"checkout -" switches forth' '
@@ -93,61 +92,59 @@
test_expect_success 'merge base test setup' '
git checkout -b another other &&
- echo "hello again" >>world &&
- git add world &&
- git commit -m third
+ test_commit --append third world "hello again"
'
-test_expect_success 'another...master' '
+test_expect_success 'another...main' '
git checkout another &&
- git checkout another...master &&
- test "z$(git rev-parse --verify HEAD)" = "z$(git rev-parse --verify master^)"
+ git checkout another...main &&
+ test "z$(git rev-parse --verify HEAD)" = "z$(git rev-parse --verify main^)"
'
-test_expect_success '...master' '
+test_expect_success '...main' '
git checkout another &&
- git checkout ...master &&
- test "z$(git rev-parse --verify HEAD)" = "z$(git rev-parse --verify master^)"
+ git checkout ...main &&
+ test "z$(git rev-parse --verify HEAD)" = "z$(git rev-parse --verify main^)"
'
-test_expect_success 'master...' '
+test_expect_success 'main...' '
git checkout another &&
- git checkout master... &&
- test "z$(git rev-parse --verify HEAD)" = "z$(git rev-parse --verify master^)"
+ git checkout main... &&
+ test "z$(git rev-parse --verify HEAD)" = "z$(git rev-parse --verify main^)"
'
test_expect_success '"checkout -" works after a rebase A' '
- git checkout master &&
+ git checkout main &&
git checkout other &&
- git rebase master &&
+ git rebase main &&
git checkout - &&
- test "z$(git symbolic-ref HEAD)" = "zrefs/heads/master"
+ test "z$(git symbolic-ref HEAD)" = "zrefs/heads/main"
'
test_expect_success '"checkout -" works after a rebase A B' '
- git branch moodle master~1 &&
- git checkout master &&
+ git branch moodle main~1 &&
+ git checkout main &&
git checkout other &&
- git rebase master moodle &&
+ git rebase main moodle &&
git checkout - &&
- test "z$(git symbolic-ref HEAD)" = "zrefs/heads/master"
+ test "z$(git symbolic-ref HEAD)" = "zrefs/heads/main"
'
test_expect_success '"checkout -" works after a rebase -i A' '
- git checkout master &&
+ git checkout main &&
git checkout other &&
- git rebase -i master &&
+ git rebase -i main &&
git checkout - &&
- test "z$(git symbolic-ref HEAD)" = "zrefs/heads/master"
+ test "z$(git symbolic-ref HEAD)" = "zrefs/heads/main"
'
test_expect_success '"checkout -" works after a rebase -i A B' '
- git branch foodle master~1 &&
- git checkout master &&
+ git branch foodle main~1 &&
+ git checkout main &&
git checkout other &&
- git rebase master foodle &&
+ git rebase main foodle &&
git checkout - &&
- test "z$(git symbolic-ref HEAD)" = "zrefs/heads/master"
+ test "z$(git symbolic-ref HEAD)" = "zrefs/heads/main"
'
test_done
diff --git a/t/t2013-checkout-submodule.sh b/t/t2013-checkout-submodule.sh
index 8f86b5f..b2bdd1f 100755
--- a/t/t2013-checkout-submodule.sh
+++ b/t/t2013-checkout-submodule.sh
@@ -68,8 +68,8 @@
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/t/t2015-checkout-unborn.sh b/t/t2015-checkout-unborn.sh
index 37bdced..a972121 100755
--- a/t/t2015-checkout-unborn.sh
+++ b/t/t2015-checkout-unborn.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='checkout from unborn branch'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup' '
@@ -11,7 +14,7 @@
git add file &&
git commit -m base
) &&
- git fetch parent master:origin
+ git fetch parent main:origin
'
test_expect_success 'checkout from unborn preserves untracked files' '
diff --git a/t/t2016-checkout-patch.sh b/t/t2016-checkout-patch.sh
index 47aeb0b..abfd586 100755
--- a/t/t2016-checkout-patch.sh
+++ b/t/t2016-checkout-patch.sh
@@ -18,6 +18,10 @@
# note: bar sorts before dir/foo, so the first 'n' is always to skip 'bar'
+# NEEDSWORK: Since the builtin add-p is used when $GIT_TEST_ADD_I_USE_BUILTIN
+# is given, we should replace the PERL prerequisite with an ADD_I prerequisite
+# which first checks if $GIT_TEST_ADD_I_USE_BUILTIN is defined before checking
+# PERL.
test_expect_success PERL 'saying "n" does nothing' '
set_and_save_state dir/foo work head &&
test_write_lines n n | git checkout -p &&
@@ -59,6 +63,13 @@
verify_state dir/foo head head
'
+test_expect_success PERL 'git checkout -p HEAD^...' '
+ # the third n is to get out in case it mistakenly does not apply
+ test_write_lines n y n | git checkout -p HEAD^... &&
+ verify_saved_state bar &&
+ verify_state dir/foo parent parent
+'
+
test_expect_success PERL 'git checkout -p HEAD^' '
# the third n is to get out in case it mistakenly does not apply
test_write_lines n y n | git checkout -p HEAD^ &&
@@ -112,4 +123,9 @@
verify_saved_head
'
+test_expect_success PERL 'empty tree can be handled' '
+ test_when_finished "git reset --hard" &&
+ git checkout -p $(test_oid empty_tree) --
+'
+
test_done
diff --git a/t/t2017-checkout-orphan.sh b/t/t2017-checkout-orphan.sh
index 655f278..c7adbdd 100755
--- a/t/t2017-checkout-orphan.sh
+++ b/t/t2017-checkout-orphan.sh
@@ -7,6 +7,9 @@
Main Tests for --orphan functionality.'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
TEST_FILE=foo
@@ -29,34 +32,34 @@
test_tick &&
git commit -m "Third Commit" &&
test_must_fail git rev-parse --verify HEAD^ &&
- git diff-tree --quiet master alpha
+ git diff-tree --quiet main alpha
'
test_expect_success '--orphan creates a new orphan branch from <start_point>' '
- git checkout master &&
- git checkout --orphan beta master^ &&
+ git checkout main &&
+ git checkout --orphan beta main^ &&
test_must_fail git rev-parse --verify HEAD &&
test "refs/heads/beta" = "$(git symbolic-ref HEAD)" &&
test_tick &&
git commit -m "Fourth Commit" &&
test_must_fail git rev-parse --verify HEAD^ &&
- git diff-tree --quiet master^ beta
+ git diff-tree --quiet main^ beta
'
test_expect_success '--orphan must be rejected with -b' '
- git checkout master &&
+ git checkout main &&
test_must_fail git checkout --orphan new -b newer &&
- test refs/heads/master = "$(git symbolic-ref HEAD)"
+ test refs/heads/main = "$(git symbolic-ref HEAD)"
'
test_expect_success '--orphan must be rejected with -t' '
- git checkout master &&
- test_must_fail git checkout --orphan new -t master &&
- test refs/heads/master = "$(git symbolic-ref HEAD)"
+ git checkout main &&
+ test_must_fail git checkout --orphan new -t main &&
+ test refs/heads/main = "$(git symbolic-ref HEAD)"
'
test_expect_success '--orphan ignores branch.autosetupmerge' '
- git checkout master &&
+ git checkout main &&
git config branch.autosetupmerge always &&
git checkout --orphan gamma &&
test -z "$(git config branch.gamma.merge)" &&
@@ -65,7 +68,7 @@
'
test_expect_success '--orphan makes reflog by default' '
- git checkout master &&
+ git checkout main &&
git config --unset core.logAllRefUpdates &&
git checkout --orphan delta &&
test_must_fail git rev-parse --verify delta@{0} &&
@@ -74,7 +77,7 @@
'
test_expect_success '--orphan does not make reflog when core.logAllRefUpdates = false' '
- git checkout master &&
+ git checkout main &&
git config core.logAllRefUpdates false &&
git checkout --orphan epsilon &&
test_must_fail git rev-parse --verify epsilon@{0} &&
@@ -83,7 +86,7 @@
'
test_expect_success '--orphan with -l makes reflog when core.logAllRefUpdates = false' '
- git checkout master &&
+ git checkout main &&
git checkout -l --orphan zeta &&
test_must_fail git rev-parse --verify zeta@{0} &&
git commit -m Zeta &&
@@ -91,33 +94,33 @@
'
test_expect_success 'giving up --orphan not committed when -l and core.logAllRefUpdates = false deletes reflog' '
- git checkout master &&
+ git checkout main &&
git checkout -l --orphan eta &&
test_must_fail git rev-parse --verify eta@{0} &&
- git checkout master &&
+ git checkout main &&
test_must_fail git rev-parse --verify eta@{0}
'
test_expect_success '--orphan is rejected with an existing name' '
- git checkout master &&
- test_must_fail git checkout --orphan master &&
- test refs/heads/master = "$(git symbolic-ref HEAD)"
+ git checkout main &&
+ test_must_fail git checkout --orphan main &&
+ test refs/heads/main = "$(git symbolic-ref HEAD)"
'
test_expect_success '--orphan refuses to switch if a merge is needed' '
- git checkout master &&
+ git checkout main &&
git reset --hard &&
echo local >>"$TEST_FILE" &&
cat "$TEST_FILE" >"$TEST_FILE.saved" &&
- test_must_fail git checkout --orphan new master^ &&
- test refs/heads/master = "$(git symbolic-ref HEAD)" &&
+ test_must_fail git checkout --orphan new main^ &&
+ test refs/heads/main = "$(git symbolic-ref HEAD)" &&
test_cmp "$TEST_FILE" "$TEST_FILE.saved" &&
git diff-index --quiet --cached HEAD &&
git reset --hard
'
test_expect_success 'cannot --detach on an unborn branch' '
- git checkout master &&
+ git checkout main &&
git checkout --orphan new &&
test_must_fail git checkout --detach
'
diff --git a/t/t2018-checkout-branch.sh b/t/t2018-checkout-branch.sh
index bbca7ef..93be1c0 100755
--- a/t/t2018-checkout-branch.sh
+++ b/t/t2018-checkout-branch.sh
@@ -150,7 +150,7 @@
git checkout branch2 &&
echo >expect "fatal: A branch named '\''branch1'\'' already exists." &&
test_must_fail git checkout -b @{-1} 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'checkout -B to an existing branch resets branch to HEAD' '
@@ -238,4 +238,36 @@
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/t/t2020-checkout-detach.sh b/t/t2020-checkout-detach.sh
index b748db9..bc46713 100755
--- a/t/t2020-checkout-detach.sh
+++ b/t/t2020-checkout-detach.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='checkout into detached HEAD state'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
check_detached () {
@@ -22,7 +25,7 @@
}
reset () {
- git checkout master &&
+ git checkout main &&
check_not_detached
}
@@ -85,7 +88,7 @@
test_expect_success 'checkout --detach errors out for extra argument' '
reset &&
- git checkout master &&
+ git checkout main &&
test_must_fail git checkout --detach tag one.t &&
check_not_detached
'
@@ -113,7 +116,7 @@
echo new content >orphan &&
git commit -a -m orphan2 &&
orphan2=$(git rev-parse HEAD) &&
- git checkout master 2>stderr
+ git checkout main 2>stderr
'
test_expect_success 'checkout warns on orphan commits: output' '
@@ -132,7 +135,7 @@
test_expect_success 'checkout does not warn leaving ref tip' '
reset &&
git checkout --detach two &&
- git checkout master 2>stderr
+ git checkout main 2>stderr
'
test_expect_success 'checkout does not warn leaving ref tip' '
@@ -142,7 +145,7 @@
test_expect_success 'checkout does not warn leaving reachable commit' '
reset &&
git checkout --detach HEAD^ &&
- git checkout master 2>stderr
+ git checkout main 2>stderr
'
test_expect_success 'checkout does not warn leaving reachable commit' '
@@ -150,17 +153,17 @@
'
cat >expect <<'EOF'
-Your branch is behind 'master' by 1 commit, and can be fast-forwarded.
+Your branch is behind 'main' by 1 commit, and can be fast-forwarded.
(use "git pull" to update your local branch)
EOF
test_expect_success 'tracking count is accurate after orphan check' '
reset &&
- git branch child master^ &&
+ git branch child main^ &&
git config branch.child.remote . &&
- git config branch.child.merge refs/heads/master &&
+ git config branch.child.merge refs/heads/main &&
git checkout child^ &&
git checkout child >stdout &&
- test_i18ncmp expect stdout
+ test_cmp expect stdout
'
test_expect_success 'no advice given for explicit detached head state' '
@@ -189,9 +192,9 @@
# Detached HEAD tests for GIT_PRINT_SHA1_ELLIPSIS (new format)
test_expect_success 'describe_detached_head prints no SHA-1 ellipsis when not asked to' "
- commit=$(git rev-parse --short=12 master^) &&
- commit2=$(git rev-parse --short=12 master~2) &&
- commit3=$(git rev-parse --short=12 master~3) &&
+ commit=$(git rev-parse --short=12 main^) &&
+ commit2=$(git rev-parse --short=12 main~2) &&
+ commit3=$(git rev-parse --short=12 main~3) &&
# The first detach operation is more chatty than the following ones.
cat >1st_detach <<-EOF &&
@@ -234,15 +237,15 @@
sane_unset GIT_PRINT_SHA1_ELLIPSIS &&
git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
check_detached &&
- test_i18ncmp 1st_detach actual &&
+ test_cmp 1st_detach actual &&
GIT_PRINT_SHA1_ELLIPSIS="no" git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
check_detached &&
- test_i18ncmp 2nd_detach actual &&
+ test_cmp 2nd_detach actual &&
GIT_PRINT_SHA1_ELLIPSIS= git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
check_detached &&
- test_i18ncmp 3rd_detach actual &&
+ test_cmp 3rd_detach actual &&
sane_unset GIT_PRINT_SHA1_ELLIPSIS &&
@@ -253,17 +256,17 @@
# Make no mention of the env var at all
git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
check_detached &&
- test_i18ncmp 1st_detach actual &&
+ test_cmp 1st_detach actual &&
GIT_PRINT_SHA1_ELLIPSIS='nope' &&
git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
check_detached &&
- test_i18ncmp 2nd_detach actual &&
+ test_cmp 2nd_detach actual &&
GIT_PRINT_SHA1_ELLIPSIS=nein &&
git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
check_detached &&
- test_i18ncmp 3rd_detach actual &&
+ test_cmp 3rd_detach actual &&
true
"
@@ -271,9 +274,9 @@
# Detached HEAD tests for GIT_PRINT_SHA1_ELLIPSIS (old format)
test_expect_success 'describe_detached_head does print SHA-1 ellipsis when asked to' "
- commit=$(git rev-parse --short=12 master^) &&
- commit2=$(git rev-parse --short=12 master~2) &&
- commit3=$(git rev-parse --short=12 master~3) &&
+ commit=$(git rev-parse --short=12 main^) &&
+ commit2=$(git rev-parse --short=12 main~2) &&
+ commit3=$(git rev-parse --short=12 main~3) &&
# The first detach operation is more chatty than the following ones.
cat >1st_detach <<-EOF &&
@@ -316,15 +319,15 @@
GIT_PRINT_SHA1_ELLIPSIS=yes git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
check_detached &&
- test_i18ncmp 1st_detach actual &&
+ test_cmp 1st_detach actual &&
GIT_PRINT_SHA1_ELLIPSIS=Yes git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
check_detached &&
- test_i18ncmp 2nd_detach actual &&
+ test_cmp 2nd_detach actual &&
GIT_PRINT_SHA1_ELLIPSIS=YES git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
check_detached &&
- test_i18ncmp 3rd_detach actual &&
+ test_cmp 3rd_detach actual &&
true
"
diff --git a/t/t2022-checkout-paths.sh b/t/t2022-checkout-paths.sh
index 6844afa..c49ba7f 100755
--- a/t/t2022-checkout-paths.sh
+++ b/t/t2022-checkout-paths.sh
@@ -1,19 +1,22 @@
#!/bin/sh
test_description='checkout $tree -- $paths'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
mkdir dir &&
- >dir/master &&
+ >dir/main &&
echo common >dir/common &&
- git add dir/master dir/common &&
- test_tick && git commit -m "master has dir/master" &&
+ git add dir/main dir/common &&
+ test_tick && git commit -m "main has dir/main" &&
git checkout -b next &&
- git mv dir/master dir/next0 &&
+ git mv dir/main dir/next0 &&
echo next >dir/next1 &&
git add dir &&
- test_tick && git commit -m "next has dir/next but not dir/master"
+ test_tick && git commit -m "next has dir/next but not dir/main"
'
test_expect_success 'checking out paths out of a tree does not clobber unrelated paths' '
@@ -26,11 +29,11 @@
echo untracked >expect.next2 &&
cat expect.next2 >dir/next2 &&
- git checkout master dir &&
+ git checkout main dir &&
test_cmp expect.common dir/common &&
- test_path_is_file dir/master &&
- git diff --exit-code master dir/master &&
+ test_path_is_file dir/main &&
+ git diff --exit-code main dir/main &&
test_path_is_missing dir/next0 &&
test_cmp expect.next1 dir/next1 &&
@@ -52,11 +55,11 @@
EOF
git update-index --index-info <expect.next0 &&
- git checkout master dir &&
+ git checkout main dir &&
test_cmp expect.common dir/common &&
- test_path_is_file dir/master &&
- git diff --exit-code master dir/master &&
+ test_path_is_file dir/main &&
+ git diff --exit-code main dir/main &&
git ls-files -s dir/next0 >actual.next0 &&
test_cmp expect.next0 actual.next0
'
diff --git a/t/t2023-checkout-m.sh b/t/t2023-checkout-m.sh
index fca3f85..7b327b7 100755
--- a/t/t2023-checkout-m.sh
+++ b/t/t2023-checkout-m.sh
@@ -4,21 +4,24 @@
Ensures that checkout -m on a resolved file restores the conflicted file'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
test_tick &&
test_commit both.txt both.txt initial &&
git branch topic &&
- test_commit modified_in_master both.txt in_master &&
- test_commit added_in_master each.txt in_master &&
+ test_commit modified_in_main both.txt in_main &&
+ test_commit added_in_main each.txt in_main &&
git checkout topic &&
test_commit modified_in_topic both.txt in_topic &&
test_commit added_in_topic each.txt in_topic
'
-test_expect_success 'git merge master' '
- test_must_fail git merge master
+test_expect_success 'git merge main' '
+ test_must_fail git merge main
'
clean_branchnames () {
@@ -61,7 +64,7 @@
git checkout topic &&
echo c >a &&
C_OBJ=$(git hash-object a) &&
- git checkout -m master &&
+ git checkout -m main &&
test_cmp_rev :1:a $A_OBJ &&
test_cmp_rev :2:a $B_OBJ &&
test_cmp_rev :3:a $C_OBJ &&
diff --git a/t/t2024-checkout-dwim.sh b/t/t2024-checkout-dwim.sh
index accfa9a..4a1c901 100755
--- a/t/t2024-checkout-dwim.sh
+++ b/t/t2024-checkout-dwim.sh
@@ -29,11 +29,11 @@
}
test_expect_success 'setup' '
- test_commit my_master &&
+ test_commit my_main &&
git init repo_a &&
(
cd repo_a &&
- test_commit a_master &&
+ test_commit a_main &&
git checkout -b foo &&
test_commit a_foo &&
git checkout -b bar &&
@@ -44,7 +44,7 @@
git init repo_b &&
(
cd repo_b &&
- test_commit b_master &&
+ test_commit b_main &&
git checkout -b foo &&
test_commit b_foo &&
git checkout -b baz &&
@@ -60,23 +60,23 @@
'
test_expect_success 'checkout of non-existing branch fails' '
- git checkout -B master &&
+ git checkout -B main &&
test_might_fail git branch -D xyzzy &&
test_must_fail git checkout xyzzy &&
status_uno_is_clean &&
test_must_fail git rev-parse --verify refs/heads/xyzzy &&
- test_branch master
+ test_branch main
'
test_expect_success 'checkout of branch from multiple remotes fails #1' '
- git checkout -B master &&
+ git checkout -B main &&
test_might_fail git branch -D foo &&
test_must_fail git checkout foo &&
status_uno_is_clean &&
test_must_fail git rev-parse --verify refs/heads/foo &&
- test_branch master
+ test_branch main
'
test_expect_success 'when arg matches multiple remotes, do not fallback to interpreting as pathspec' '
@@ -100,21 +100,21 @@
'
test_expect_success 'checkout of branch from multiple remotes fails with advice' '
- git checkout -B master &&
+ git checkout -B main &&
test_might_fail git branch -D foo &&
test_must_fail git checkout foo 2>stderr &&
- test_branch master &&
+ test_branch main &&
status_uno_is_clean &&
test_i18ngrep "^hint: " stderr &&
test_must_fail git -c advice.checkoutAmbiguousRemoteBranchName=false \
checkout foo 2>stderr &&
- test_branch master &&
+ test_branch main &&
status_uno_is_clean &&
test_i18ngrep ! "^hint: " stderr
'
test_expect_success PERL 'checkout -p with multiple remotes does not print advice' '
- git checkout -B master &&
+ git checkout -B main &&
test_might_fail git branch -D foo &&
git checkout -p foo 2>stderr &&
@@ -123,7 +123,7 @@
'
test_expect_success 'checkout of branch from multiple remotes succeeds with checkout.defaultRemote #1' '
- git checkout -B master &&
+ git checkout -B main &&
status_uno_is_clean &&
test_might_fail git branch -D foo &&
@@ -135,7 +135,7 @@
'
test_expect_success 'checkout of branch from a single remote succeeds #1' '
- git checkout -B master &&
+ git checkout -B main &&
test_might_fail git branch -D bar &&
git checkout bar &&
@@ -146,7 +146,7 @@
'
test_expect_success 'checkout of branch from a single remote succeeds #2' '
- git checkout -B master &&
+ git checkout -B main &&
test_might_fail git branch -D baz &&
git checkout baz &&
@@ -157,22 +157,33 @@
'
test_expect_success '--no-guess suppresses branch auto-vivification' '
- git checkout -B master &&
+ git checkout -B main &&
status_uno_is_clean &&
test_might_fail git branch -D bar &&
test_must_fail git checkout --no-guess bar &&
test_must_fail git rev-parse --verify refs/heads/bar &&
- test_branch master
+ test_branch main
+'
+
+test_expect_success 'checkout.guess = false suppresses branch auto-vivification' '
+ git checkout -B main &&
+ status_uno_is_clean &&
+ test_might_fail git branch -D bar &&
+
+ test_config checkout.guess false &&
+ test_must_fail git checkout bar &&
+ test_must_fail git rev-parse --verify refs/heads/bar &&
+ test_branch main
'
test_expect_success 'setup more remotes with unconventional refspecs' '
- git checkout -B master &&
+ git checkout -B main &&
status_uno_is_clean &&
git init repo_c &&
(
cd repo_c &&
- test_commit c_master &&
+ test_commit c_main &&
git checkout -b bar &&
test_commit c_bar &&
git checkout -b spam &&
@@ -181,7 +192,7 @@
git init repo_d &&
(
cd repo_d &&
- test_commit d_master &&
+ test_commit d_main &&
git checkout -b baz &&
test_commit d_baz &&
git checkout -b eggs &&
@@ -197,29 +208,29 @@
'
test_expect_success 'checkout of branch from multiple remotes fails #2' '
- git checkout -B master &&
+ git checkout -B main &&
status_uno_is_clean &&
test_might_fail git branch -D bar &&
test_must_fail git checkout bar &&
status_uno_is_clean &&
test_must_fail git rev-parse --verify refs/heads/bar &&
- test_branch master
+ test_branch main
'
test_expect_success 'checkout of branch from multiple remotes fails #3' '
- git checkout -B master &&
+ git checkout -B main &&
status_uno_is_clean &&
test_might_fail git branch -D baz &&
test_must_fail git checkout baz &&
status_uno_is_clean &&
test_must_fail git rev-parse --verify refs/heads/baz &&
- test_branch master
+ test_branch main
'
test_expect_success 'checkout of branch from a single remote succeeds #3' '
- git checkout -B master &&
+ git checkout -B main &&
status_uno_is_clean &&
test_might_fail git branch -D spam &&
@@ -231,7 +242,7 @@
'
test_expect_success 'checkout of branch from a single remote succeeds #4' '
- git checkout -B master &&
+ git checkout -B main &&
status_uno_is_clean &&
test_might_fail git branch -D eggs &&
@@ -243,7 +254,7 @@
'
test_expect_success 'checkout of branch with a file having the same name fails' '
- git checkout -B master &&
+ git checkout -B main &&
status_uno_is_clean &&
test_might_fail git branch -D spam &&
@@ -251,11 +262,11 @@
test_must_fail git checkout spam &&
status_uno_is_clean &&
test_must_fail git rev-parse --verify refs/heads/spam &&
- test_branch master
+ test_branch main
'
test_expect_success 'checkout of branch with a file in subdir having the same name fails' '
- git checkout -B master &&
+ git checkout -B main &&
status_uno_is_clean &&
test_might_fail git branch -D spam &&
@@ -265,11 +276,11 @@
test_must_fail git -C sub checkout spam &&
status_uno_is_clean &&
test_must_fail git rev-parse --verify refs/heads/spam &&
- test_branch master
+ test_branch main
'
test_expect_success 'checkout <branch> -- succeeds, even if a file with the same name exists' '
- git checkout -B master &&
+ git checkout -B main &&
status_uno_is_clean &&
test_might_fail git branch -D spam &&
@@ -283,7 +294,7 @@
test_expect_success 'loosely defined local base branch is reported correctly' '
- git checkout master &&
+ git checkout main &&
status_uno_is_clean &&
git branch strict &&
git branch loose &&
@@ -291,8 +302,8 @@
test_config branch.strict.remote . &&
test_config branch.loose.remote . &&
- test_config branch.strict.merge refs/heads/master &&
- test_config branch.loose.merge master &&
+ test_config branch.strict.merge refs/heads/main &&
+ test_config branch.loose.merge main &&
git checkout strict | sed -e "s/strict/BRANCHNAME/g" >expect &&
status_uno_is_clean &&
diff --git a/t/t2025-checkout-no-overlay.sh b/t/t2025-checkout-no-overlay.sh
index 76330cb..fa9e098 100755
--- a/t/t2025-checkout-no-overlay.sh
+++ b/t/t2025-checkout-no-overlay.sh
@@ -44,4 +44,16 @@
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/t/t2027-checkout-track.sh b/t/t2027-checkout-track.sh
new file mode 100755
index 0000000..4453741
--- /dev/null
+++ b/t/t2027-checkout-track.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+test_description='tests for git branch --track'
+
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./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 main &&
+ test $(git rev-parse --abbrev-ref HEAD) = branch1 &&
+ test $(git config --get branch.branch1.remote) = . &&
+ test $(git config --get branch.branch1.merge) = refs/heads/main
+'
+
+test_expect_success 'checkout --track -b rejects an extra path argument' '
+ test_must_fail git checkout --track -b branch2 main one.t 2>err &&
+ test_i18ngrep "cannot be used with updating paths" err
+'
+
+test_done
diff --git a/t/t2030-unresolve-info.sh b/t/t2030-unresolve-info.sh
index 309199b..be6c84c 100755
--- a/t/t2030-unresolve-info.sh
+++ b/t/t2030-unresolve-info.sh
@@ -2,6 +2,9 @@
test_description='undoing resolution'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
check_resolve_undo () {
@@ -59,7 +62,7 @@
test_commit fourth fi/le fourth &&
git checkout add-add &&
test_commit fifth add-differently &&
- git checkout master
+ git checkout main
'
test_expect_success 'add records switch clears' '
@@ -183,8 +186,8 @@
'
test_expect_success 'rerere forget (add-add conflict)' '
- git checkout -f master &&
- echo master >add-differently &&
+ git checkout -f main &&
+ echo main >add-differently &&
git add add-differently &&
git commit -m "add differently" &&
test_must_fail git merge fifth &&
diff --git a/t/t2060-switch.sh b/t/t2060-switch.sh
index f9efa29..9bc6a3a 100755
--- a/t/t2060-switch.sh
+++ b/t/t2060-switch.sh
@@ -2,6 +2,9 @@
test_description='switch basic functionality'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup' '
@@ -23,41 +26,41 @@
'
test_expect_success 'switch and detach' '
- test_when_finished git switch master &&
- test_must_fail git switch master^{commit} &&
- git switch --detach master^{commit} &&
+ test_when_finished git switch main &&
+ test_must_fail git switch main^{commit} &&
+ git switch --detach main^{commit} &&
test_must_fail git symbolic-ref HEAD
'
test_expect_success 'switch and detach current branch' '
- test_when_finished git switch master &&
- git switch master &&
+ test_when_finished git switch main &&
+ git switch main &&
git switch --detach &&
test_must_fail git symbolic-ref HEAD
'
test_expect_success 'switch and create branch' '
- test_when_finished git switch master &&
- git switch -c temp master^ &&
- test_cmp_rev master^ refs/heads/temp &&
+ test_when_finished git switch main &&
+ git switch -c temp main^ &&
+ test_cmp_rev main^ refs/heads/temp &&
echo refs/heads/temp >expected-branch &&
git symbolic-ref HEAD >actual-branch &&
test_cmp expected-branch actual-branch
'
test_expect_success 'force create branch from HEAD' '
- test_when_finished git switch master &&
- git switch --detach master &&
+ test_when_finished git switch main &&
+ git switch --detach main &&
test_must_fail git switch -c temp &&
git switch -C temp &&
- test_cmp_rev master refs/heads/temp &&
+ test_cmp_rev main refs/heads/temp &&
echo refs/heads/temp >expected-branch &&
git symbolic-ref HEAD >actual-branch &&
test_cmp expected-branch actual-branch
'
test_expect_success 'new orphan branch from empty' '
- test_when_finished git switch master &&
+ test_when_finished git switch main &&
test_must_fail git switch --orphan new-orphan HEAD &&
git switch --orphan new-orphan &&
test_commit orphan &&
@@ -68,8 +71,16 @@
test_cmp expected tracked-files
'
+test_expect_success 'orphan branch works with --discard-changes' '
+ test_when_finished git switch main &&
+ 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 &&
+ test_when_finished git switch main &&
: >first-branch &&
git switch first-branch &&
echo refs/heads/first-branch >expected &&
@@ -77,9 +88,12 @@
test_cmp expected actual
'
-test_expect_success 'guess and create branch ' '
- test_when_finished git switch master &&
+test_expect_success 'guess and create branch' '
+ test_when_finished git switch main &&
test_must_fail git switch --no-guess foo &&
+ test_config checkout.guess false &&
+ test_must_fail git switch foo &&
+ test_config checkout.guess true &&
git switch foo &&
echo refs/heads/foo >expected &&
git symbolic-ref HEAD >actual &&
diff --git a/t/t2070-restore.sh b/t/t2070-restore.sh
index 076d0df..7c43ddf 100755
--- a/t/t2070-restore.sh
+++ b/t/t2070-restore.sh
@@ -2,6 +2,9 @@
test_description='restore basic functionality'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup' '
@@ -15,7 +18,7 @@
echo ignored >ignored &&
echo /ignored >.gitignore &&
git add one two .gitignore &&
- git update-ref refs/heads/one master
+ git update-ref refs/heads/one main
'
test_expect_success 'restore without pathspec is not ok' '
@@ -69,6 +72,17 @@
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 &&
(
@@ -80,7 +94,7 @@
git switch -c first &&
echo first >unmerged &&
git commit -am first &&
- git switch -c second master &&
+ git switch -c second main &&
echo second >unmerged &&
git commit -am second &&
test_must_fail git merge first &&
diff --git a/t/t2071-restore-patch.sh b/t/t2071-restore-patch.sh
index 98b2476..b5c5c0f 100755
--- a/t/t2071-restore-patch.sh
+++ b/t/t2071-restore-patch.sh
@@ -60,6 +60,14 @@
verify_state dir/foo parent index
'
+test_expect_success PERL 'git restore -p --source=HEAD^...' '
+ set_state dir/foo work index &&
+ # the third n is to get out in case it mistakenly does not apply
+ test_write_lines n y n | git restore -p --source=HEAD^... &&
+ verify_saved_state bar &&
+ verify_state dir/foo parent index
+'
+
test_expect_success PERL 'git restore -p handles deletion' '
set_state dir/foo work index &&
rm dir/foo &&
diff --git a/t/t2072-restore-pathspec-file.sh b/t/t2072-restore-pathspec-file.sh
index 0d47946..b48345b 100755
--- a/t/t2072-restore-pathspec-file.sh
+++ b/t/t2072-restore-pathspec-file.sh
@@ -9,18 +9,21 @@
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 fileA.t fileB.t fileC.t 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 fileA.t fileB.t fileC.t fileD.t &&
+ git add dir1 fileA.t fileB.t fileC.t fileD.t &&
git commit -m "files 2" &&
git tag checkpoint
@@ -31,7 +34,7 @@
}
verify_expect () {
- git status --porcelain --untracked-files=no -- fileA.t fileB.t fileC.t fileD.t >actual &&
+ git status --porcelain --untracked-files=no -- dir1 fileA.t fileB.t fileC.t fileD.t >actual &&
test_cmp expect actual
}
@@ -161,4 +164,14 @@
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/t/t2104-update-index-skip-worktree.sh b/t/t2104-update-index-skip-worktree.sh
index 7e2e7dd..30666fc 100755
--- a/t/t2104-update-index-skip-worktree.sh
+++ b/t/t2104-update-index-skip-worktree.sh
@@ -9,6 +9,11 @@
sane_unset GIT_TEST_SPLIT_INDEX
+test_set_index_version () {
+ GIT_INDEX_VERSION="$1"
+ export GIT_INDEX_VERSION
+}
+
test_set_index_version 3
cat >expect.full <<EOF
diff --git a/t/t2106-update-index-assume-unchanged.sh b/t/t2106-update-index-assume-unchanged.sh
index 99d858c..2d450da 100755
--- a/t/t2106-update-index-assume-unchanged.sh
+++ b/t/t2106-update-index-assume-unchanged.sh
@@ -5,20 +5,23 @@
. ./test-lib.sh
-test_expect_success 'setup' \
- ': >file &&
- git add file &&
- git commit -m initial &&
- git branch other &&
- echo upstream >file &&
- git add file &&
- git commit -m upstream'
+test_expect_success 'setup' '
+ : >file &&
+ git add file &&
+ git commit -m initial &&
+ git branch other &&
+ echo upstream >file &&
+ git add file &&
+ git commit -m upstream
+'
-test_expect_success 'do not switch branches with dirty file' \
- 'git reset --hard &&
- git checkout other &&
- echo dirt >file &&
- git update-index --assume-unchanged file &&
- test_must_fail git checkout master'
+test_expect_success 'do not switch branches with dirty file' '
+ git reset --hard &&
+ git checkout other &&
+ echo dirt >file &&
+ git update-index --assume-unchanged file &&
+ test_must_fail git checkout - 2>err &&
+ test_i18ngrep overwritten err
+'
test_done
diff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh
index f764b7e..45ca35d 100755
--- a/t/t2200-add-update.sh
+++ b/t/t2200-add-update.sh
@@ -135,7 +135,7 @@
after=$(git ls-files -s check top) &&
test "$before" = "$after" &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
@@ -179,7 +179,8 @@
test_expect_success '"add -u non-existent" should fail' '
test_must_fail git add -u non-existent &&
- ! (git ls-files | grep "non-existent")
+ git ls-files >actual &&
+ ! grep "non-existent" actual
'
test_done
diff --git a/t/t2203-add-intent.sh b/t/t2203-add-intent.sh
index 5bbe8dc..cf0175a 100755
--- a/t/t2203-add-intent.sh
+++ b/t/t2203-add-intent.sh
@@ -232,17 +232,53 @@
)
'
-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 &&
- 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
-'
+ : >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 &&
+ 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/t/t2400-worktree-add.sh b/t/t2400-worktree-add.sh
index 5a74954..96dfca1 100755
--- a/t/t2400-worktree-add.sh
+++ b/t/t2400-worktree-add.sh
@@ -2,6 +2,9 @@
test_description='test git worktree add'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-rebase.sh
@@ -12,12 +15,12 @@
test_expect_success '"add" an existing worktree' '
mkdir -p existing/subtree &&
- test_must_fail git worktree add --detach existing master
+ test_must_fail git worktree add --detach existing main
'
test_expect_success '"add" an existing empty worktree' '
mkdir existing_empty &&
- git worktree add --detach existing_empty master
+ git worktree add --detach existing_empty main
'
test_expect_success '"add" using shorthand - fails when no previous branch' '
@@ -29,7 +32,7 @@
echo hello >myworld &&
git add myworld &&
git commit -m myworld &&
- git checkout master &&
+ git checkout main &&
git worktree add short-hand - &&
echo refs/heads/newbranch >expect &&
git -C short-hand rev-parse --symbolic-full-name HEAD >actual &&
@@ -37,7 +40,7 @@
'
test_expect_success '"add" refuses to checkout locked branch' '
- test_must_fail git worktree add zere master &&
+ test_must_fail git worktree add zere main &&
! test -d zere &&
! test -d .git/worktrees/zere
'
@@ -46,13 +49,13 @@
(
cd existing_empty &&
echo dirty >>init.t &&
- git checkout master -- init.t
+ git checkout main -- init.t
)
'
test_expect_success '"add" worktree' '
git rev-parse HEAD >expect &&
- git worktree add --detach here master &&
+ git worktree add --detach here main &&
(
cd here &&
test_cmp ../init.t init.t &&
@@ -65,7 +68,7 @@
test_expect_success '"add" worktree with lock' '
git rev-parse HEAD >expect &&
- git worktree add --detach --lock here-with-lock master &&
+ git worktree add --detach --lock here-with-lock main &&
test -f .git/worktrees/here-with-lock/locked
'
@@ -73,7 +76,7 @@
(
mkdir sub &&
cd sub &&
- git worktree add --detach here master &&
+ git worktree add --detach here main &&
cd here &&
test_cmp ../../init.t init.t
)
@@ -82,19 +85,19 @@
test_expect_success '"add" from a linked checkout' '
(
cd here &&
- git worktree add --detach nested-here master &&
+ git worktree add --detach nested-here main &&
cd nested-here &&
git fsck
)
'
test_expect_success '"add" worktree creating new branch' '
- git worktree add -b newmaster there master &&
+ git worktree add -b newmain there main &&
(
cd there &&
test_cmp ../init.t init.t &&
git symbolic-ref HEAD >actual &&
- echo refs/heads/newmaster >expect &&
+ echo refs/heads/newmain >expect &&
test_cmp expect actual &&
git fsck
)
@@ -103,7 +106,7 @@
test_expect_success 'die the same branch is already checked out' '
(
cd here &&
- test_must_fail git checkout newmaster
+ test_must_fail git checkout newmain
)
'
@@ -112,20 +115,20 @@
ref=$(git -C there symbolic-ref HEAD) &&
rm "$head" &&
ln -s "$ref" "$head" &&
- test_must_fail git -C here checkout newmaster
+ test_must_fail git -C here checkout newmain
'
test_expect_success 'not die the same branch is already checked out' '
(
cd here &&
- git worktree add --force anothernewmaster newmaster
+ git worktree add --force anothernewmain newmain
)
'
test_expect_success 'not die on re-checking out current branch' '
(
cd there &&
- git checkout newmaster
+ git checkout newmain
)
'
@@ -133,14 +136,14 @@
(
git clone --bare . bare &&
cd bare &&
- git worktree add -b bare-master ../there2 master
+ git worktree add -b bare-main ../there2 main
)
'
test_expect_success 'checkout from a bare repo without "add"' '
(
cd bare &&
- test_must_fail git checkout master
+ test_must_fail git checkout main
)
'
@@ -148,7 +151,7 @@
(
git clone --bare . bare2 &&
cd bare2 &&
- git worktree add ../there3 master
+ git worktree add ../there3 main
)
'
@@ -165,7 +168,7 @@
EOF
git log --format=%s -2 >actual &&
test_cmp expected actual &&
- git worktree add --detach grafted master &&
+ git worktree add --detach grafted main &&
git --git-dir=grafted/.git log --format=%s -2 >actual &&
test_cmp expected actual
'
@@ -226,34 +229,34 @@
'
test_expect_success '"add" -b/-B mutually exclusive' '
- test_must_fail git worktree add -b poodle -B poodle bamboo master
+ test_must_fail git worktree add -b poodle -B poodle bamboo main
'
test_expect_success '"add" -b/--detach mutually exclusive' '
- test_must_fail git worktree add -b poodle --detach bamboo master
+ test_must_fail git worktree add -b poodle --detach bamboo main
'
test_expect_success '"add" -B/--detach mutually exclusive' '
- test_must_fail git worktree add -B poodle --detach bamboo master
+ test_must_fail git worktree add -B poodle --detach bamboo main
'
test_expect_success '"add -B" fails if the branch is checked out' '
- git rev-parse newmaster >before &&
- test_must_fail git worktree add -B newmaster bamboo master &&
- git rev-parse newmaster >after &&
+ git rev-parse newmain >before &&
+ test_must_fail git worktree add -B newmain bamboo main &&
+ git rev-parse newmain >after &&
test_cmp before after
'
test_expect_success 'add -B' '
- git worktree add -B poodle bamboo2 master^ &&
+ git worktree add -B poodle bamboo2 main^ &&
git -C bamboo2 symbolic-ref HEAD >actual &&
echo refs/heads/poodle >expected &&
test_cmp expected actual &&
- test_cmp_rev master^ poodle
+ test_cmp_rev main^ poodle
'
test_expect_success 'add --quiet' '
- git worktree add --quiet another-worktree master 2>actual &&
+ git worktree add --quiet another-worktree main 2>actual &&
test_must_be_empty actual
'
@@ -348,24 +351,24 @@
test_expect_success '--track sets up tracking' '
test_when_finished rm -rf track &&
- git worktree add --track -b track track master &&
- test_branch_upstream track . master
+ git worktree add --track -b track track main &&
+ test_branch_upstream track . main
'
# setup remote repository $1 and repository $2 with $1 set up as
-# remote. The remote has two branches, master and foo.
+# remote. The remote has two branches, main and foo.
setup_remote_repo () {
git init $1 &&
(
cd $1 &&
- test_commit $1_master &&
+ test_commit $1_main &&
git checkout -b foo &&
test_commit upstream_foo
) &&
git init $2 &&
(
cd $2 &&
- test_commit $2_master &&
+ test_commit $2_main &&
git remote add $1 ../$1 &&
git config remote.$1.fetch \
"refs/heads/*:refs/remotes/$1/*" &&
diff --git a/t/t2401-worktree-prune.sh b/t/t2401-worktree-prune.sh
index b7d6d5d..a615d3b 100755
--- a/t/t2401-worktree-prune.sh
+++ b/t/t2401-worktree-prune.sh
@@ -2,6 +2,9 @@
test_description='prune $GIT_DIR/worktrees'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success initialize '
@@ -20,7 +23,7 @@
cat >expect <<EOF &&
Removing worktrees/abc: not a valid directory
EOF
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
! test -f .git/worktrees/abc &&
! test -d .git/worktrees
'
@@ -32,7 +35,7 @@
Removing worktrees/def: gitdir file does not exist
EOF
git worktree prune --verbose >actual &&
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
! test -d .git/worktrees/def &&
! test -d .git/worktrees
'
@@ -87,9 +90,33 @@
test_expect_success 'not prune proper checkouts' '
test_when_finished rm -r .git/worktrees &&
- git worktree add --detach "$PWD/nop" master &&
+ git worktree add --detach "$PWD/nop" main &&
git worktree prune &&
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/t/t2402-worktree-list.sh b/t/t2402-worktree-list.sh
index 69ffe86..fedcefe 100755
--- a/t/t2402-worktree-list.sh
+++ b/t/t2402-worktree-list.sh
@@ -2,6 +2,9 @@
test_description='test git worktree list'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup' '
@@ -21,7 +24,7 @@
test_expect_success 'rev-parse --git-path objects linked worktree' '
echo "$(git rev-parse --show-toplevel)/.git/objects" >expect &&
test_when_finished "rm -rf linked-tree actual expect && git worktree prune" &&
- git worktree add --detach linked-tree master &&
+ git worktree add --detach linked-tree main &&
git -C linked-tree rev-parse --git-path objects >actual &&
test_cmp expect actual
'
@@ -29,7 +32,7 @@
test_expect_success '"list" all worktrees from main' '
echo "$(git rev-parse --show-toplevel) $(git rev-parse --short HEAD) [$(git symbolic-ref --short HEAD)]" >expect &&
test_when_finished "rm -rf here out actual expect && git worktree prune" &&
- git worktree add --detach here master &&
+ git worktree add --detach here main &&
echo "$(git -C here rev-parse --show-toplevel) $(git rev-parse --short HEAD) (detached HEAD)" >>expect &&
git worktree list >out &&
sed "s/ */ /g" <out >actual &&
@@ -39,7 +42,7 @@
test_expect_success '"list" all worktrees from linked' '
echo "$(git rev-parse --show-toplevel) $(git rev-parse --short HEAD) [$(git symbolic-ref --short HEAD)]" >expect &&
test_when_finished "rm -rf here out actual expect && git worktree prune" &&
- git worktree add --detach here master &&
+ git worktree add --detach here main &&
echo "$(git -C here rev-parse --show-toplevel) $(git rev-parse --short HEAD) (detached HEAD)" >>expect &&
git -C here worktree list >out &&
sed "s/ */ /g" <out >actual &&
@@ -52,7 +55,7 @@
echo "branch $(git symbolic-ref HEAD)" >>expect &&
echo >>expect &&
test_when_finished "rm -rf here actual expect && git worktree prune" &&
- git worktree add --detach here master &&
+ git worktree add --detach here main &&
echo "worktree $(git -C here rev-parse --show-toplevel)" >>expect &&
echo "HEAD $(git rev-parse HEAD)" >>expect &&
echo "detached" >>expect &&
@@ -61,18 +64,124 @@
test_cmp expect actual
'
+test_expect_success '"list" all worktrees with locked annotation' '
+ test_when_finished "rm -rf locked unlocked out && git worktree prune" &&
+ git worktree add --detach locked main &&
+ git worktree add --detach unlocked main &&
+ git worktree lock locked &&
+ test_when_finished "git worktree unlock locked" &&
+ git worktree list >out &&
+ grep "/locked *[0-9a-f].* locked$" out &&
+ ! grep "/unlocked *[0-9a-f].* locked$" out
+'
+
+test_expect_success '"list" all worktrees --porcelain with locked' '
+ test_when_finished "rm -rf locked1 locked2 unlocked out actual expect && git worktree prune" &&
+ echo "locked" >expect &&
+ echo "locked with reason" >>expect &&
+ git worktree add --detach locked1 &&
+ git worktree add --detach locked2 &&
+ # unlocked worktree should not be annotated with "locked"
+ git worktree add --detach unlocked &&
+ git worktree lock locked1 &&
+ test_when_finished "git worktree unlock locked1" &&
+ git worktree lock locked2 --reason "with reason" &&
+ test_when_finished "git worktree unlock locked2" &&
+ git worktree list --porcelain >out &&
+ grep "^locked" out >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success '"list" all worktrees --porcelain with locked reason newline escaped' '
+ test_when_finished "rm -rf locked_lf locked_crlf out actual expect && git worktree prune" &&
+ printf "locked \"locked\\\\r\\\\nreason\"\n" >expect &&
+ printf "locked \"locked\\\\nreason\"\n" >>expect &&
+ git worktree add --detach locked_lf &&
+ git worktree add --detach locked_crlf &&
+ git worktree lock locked_lf --reason "$(printf "locked\nreason")" &&
+ test_when_finished "git worktree unlock locked_lf" &&
+ git worktree lock locked_crlf --reason "$(printf "locked\r\nreason")" &&
+ test_when_finished "git worktree unlock locked_crlf" &&
+ git worktree list --porcelain >out &&
+ grep "^locked" out >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success '"list" all worktrees with prunable annotation' '
+ test_when_finished "rm -rf prunable unprunable out && git worktree prune" &&
+ git worktree add --detach prunable &&
+ git worktree add --detach unprunable &&
+ rm -rf prunable &&
+ git worktree list >out &&
+ grep "/prunable *[0-9a-f].* prunable$" out &&
+ ! grep "/unprunable *[0-9a-f].* prunable$"
+'
+
+test_expect_success '"list" all worktrees --porcelain with prunable' '
+ test_when_finished "rm -rf prunable out && git worktree prune" &&
+ git worktree add --detach prunable &&
+ rm -rf prunable &&
+ git worktree list --porcelain >out &&
+ sed -n "/^worktree .*\/prunable$/,/^$/p" <out >only_prunable &&
+ test_i18ngrep "^prunable gitdir file points to non-existent location$" only_prunable
+'
+
+test_expect_success '"list" all worktrees with prunable consistent with "prune"' '
+ test_when_finished "rm -rf prunable unprunable out && git worktree prune" &&
+ git worktree add --detach prunable &&
+ git worktree add --detach unprunable &&
+ rm -rf prunable &&
+ git worktree list >out &&
+ grep "/prunable *[0-9a-f].* prunable$" out &&
+ ! grep "/unprunable *[0-9a-f].* unprunable$" out &&
+ git worktree prune --verbose >out &&
+ test_i18ngrep "^Removing worktrees/prunable" out &&
+ test_i18ngrep ! "^Removing worktrees/unprunable" out
+'
+
+test_expect_success '"list" --verbose and --porcelain mutually exclusive' '
+ test_must_fail git worktree list --verbose --porcelain
+'
+
+test_expect_success '"list" all worktrees --verbose with locked' '
+ test_when_finished "rm -rf locked1 locked2 out actual expect && git worktree prune" &&
+ git worktree add locked1 --detach &&
+ git worktree add locked2 --detach &&
+ git worktree lock locked1 &&
+ test_when_finished "git worktree unlock locked1" &&
+ git worktree lock locked2 --reason "with reason" &&
+ test_when_finished "git worktree unlock locked2" &&
+ echo "$(git -C locked2 rev-parse --show-toplevel) $(git rev-parse --short HEAD) (detached HEAD)" >expect &&
+ printf "\tlocked: with reason\n" >>expect &&
+ git worktree list --verbose >out &&
+ grep "/locked1 *[0-9a-f].* locked$" out &&
+ sed -n "s/ */ /g;/\/locked2 *[0-9a-f].*$/,/locked: .*$/p" <out >actual &&
+ test_cmp actual expect
+'
+
+test_expect_success '"list" all worktrees --verbose with prunable' '
+ test_when_finished "rm -rf prunable out actual expect && git worktree prune" &&
+ git worktree add prunable --detach &&
+ echo "$(git -C prunable rev-parse --show-toplevel) $(git rev-parse --short HEAD) (detached HEAD)" >expect &&
+ printf "\tprunable: gitdir file points to non-existent location\n" >>expect &&
+ rm -rf prunable &&
+ git worktree list --verbose >out &&
+ sed -n "s/ */ /g;/\/prunable *[0-9a-f].*$/,/prunable: .*$/p" <out >actual &&
+ test_cmp actual expect
+'
+
test_expect_success 'bare repo setup' '
git init --bare bare1 &&
echo "data" >file1 &&
git add file1 &&
git commit -m"File1: add data" &&
- git push bare1 master &&
+ git push bare1 main &&
git reset --hard HEAD^
'
test_expect_success '"list" all worktrees from bare main' '
test_when_finished "rm -rf there out actual expect && git -C bare1 worktree prune" &&
- git -C bare1 worktree add --detach ../there master &&
+ git -C bare1 worktree add --detach ../there main &&
echo "$(pwd)/bare1 (bare)" >expect &&
echo "$(git -C there rev-parse --show-toplevel) $(git -C there rev-parse --short HEAD) (detached HEAD)" >>expect &&
git -C bare1 worktree list >out &&
@@ -82,7 +191,7 @@
test_expect_success '"list" all worktrees --porcelain from bare main' '
test_when_finished "rm -rf there actual expect && git -C bare1 worktree prune" &&
- git -C bare1 worktree add --detach ../there master &&
+ git -C bare1 worktree add --detach ../there main &&
echo "worktree $(pwd)/bare1" >expect &&
echo "bare" >>expect &&
echo >>expect &&
@@ -96,7 +205,7 @@
test_expect_success '"list" all worktrees from linked with a bare main' '
test_when_finished "rm -rf there out actual expect && git -C bare1 worktree prune" &&
- git -C bare1 worktree add --detach ../there master &&
+ git -C bare1 worktree add --detach ../there main &&
echo "$(pwd)/bare1 (bare)" >expect &&
echo "$(git -C there rev-parse --show-toplevel) $(git -C there rev-parse --short HEAD) (detached HEAD)" >>expect &&
git -C there worktree list >out &&
@@ -152,7 +261,7 @@
'
test_expect_success 'worktree path when called in .git directory' '
- git worktree list >list1&&
+ git worktree list >list1 &&
git -C .git worktree list >list2 &&
test_cmp list1 list2
'
diff --git a/t/t2403-worktree-move.sh b/t/t2403-worktree-move.sh
index 939d18d..a4e1a17 100755
--- a/t/t2403-worktree-move.sh
+++ b/t/t2403-worktree-move.sh
@@ -112,6 +112,27 @@
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/t/t2404-worktree-config.sh b/t/t2404-worktree-config.sh
index 286121d..9536d10 100755
--- a/t/t2404-worktree-config.sh
+++ b/t/t2404-worktree-config.sh
@@ -23,8 +23,10 @@
'
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/t/t2405-worktree-submodule.sh b/t/t2405-worktree-submodule.sh
index e1b2bfd..b172c26 100755
--- a/t/t2405-worktree-submodule.sh
+++ b/t/t2405-worktree-submodule.sh
@@ -2,6 +2,9 @@
test_description='Combination of submodules and multiple worktrees'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
base_path=$(pwd -P)
@@ -31,7 +34,7 @@
'
test_expect_failure 'submodule is checked out just after worktree add' '
- git -C worktree diff --submodule master"^!" >out &&
+ git -C worktree diff --submodule main"^!" >out &&
grep "file1 updated" out
'
@@ -41,7 +44,7 @@
'
test_expect_success 'submodule is checked out just after submodule update in linked worktree' '
- git -C worktree-submodule-update diff --submodule master"^!" >out &&
+ git -C worktree-submodule-update diff --submodule main"^!" >out &&
grep "file1 updated" out
'
@@ -51,7 +54,7 @@
'
test_expect_success 'submodule is checked out after manually adding submodule worktree' '
- git -C linked_submodule diff --submodule master"^!" >out &&
+ git -C linked_submodule diff --submodule main"^!" >out &&
grep "file1 updated" out
'
diff --git a/t/t2406-worktree-repair.sh b/t/t2406-worktree-repair.sh
new file mode 100755
index 0000000..f737418
--- /dev/null
+++ b/t/t2406-worktree-repair.sh
@@ -0,0 +1,205 @@
+#!/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 not referencing repo' '
+ test_when_finished "rm -rf side not-a-repo && git worktree prune" &&
+ git worktree add --detach side &&
+ sed s,\.git/worktrees/side$,not-a-repo, side/.git >side/.newgit &&
+ mv side/.newgit side/.git &&
+ mkdir not-a-repo &&
+ test_must_fail git worktree repair side 2>err &&
+ test_i18ngrep ".git file does not reference a repository" 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_expect_success 'repair moved main and linked worktrees' '
+ test_when_finished "rm -rf main side mainmoved sidemoved" &&
+ test_create_repo main &&
+ test_commit -C main init &&
+ git -C main worktree add --detach ../side &&
+ sed "s,side/\.git$,sidemoved/.git," \
+ main/.git/worktrees/side/gitdir >expect-gitdir &&
+ sed "s,main/.git/worktrees/side$,mainmoved/.git/worktrees/side," \
+ side/.git >expect-gitfile &&
+ mv main mainmoved &&
+ mv side sidemoved &&
+ git -C mainmoved worktree repair ../sidemoved &&
+ test_cmp expect-gitdir mainmoved/.git/worktrees/side/gitdir &&
+ test_cmp expect-gitfile sidemoved/.git
+'
+
+test_done
diff --git a/t/t3000-ls-files-others.sh b/t/t3000-ls-files-others.sh
index 0aefada..740ce56 100755
--- a/t/t3000-ls-files-others.sh
+++ b/t/t3000-ls-files-others.sh
@@ -91,4 +91,141 @@
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/t/t3005-ls-files-relative.sh b/t/t3005-ls-files-relative.sh
index 2ec69a8..727e9ae 100755
--- a/t/t3005-ls-files-relative.sh
+++ b/t/t3005-ls-files-relative.sh
@@ -46,7 +46,7 @@
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 &&
- test_i18ncmp expect.err actual.err
+ test_cmp expect.err actual.err
)
'
@@ -61,7 +61,7 @@
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 &&
- test_i18ncmp expect.err actual.err
+ test_cmp expect.err actual.err
)
'
diff --git a/t/t3012-ls-files-dedup.sh b/t/t3012-ls-files-dedup.sh
new file mode 100755
index 0000000..2682b1f
--- /dev/null
+++ b/t/t3012-ls-files-dedup.sh
@@ -0,0 +1,66 @@
+#!/bin/sh
+
+test_description='git ls-files --deduplicate test'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+ >a.txt &&
+ >b.txt &&
+ >delete.txt &&
+ git add a.txt b.txt delete.txt &&
+ git commit -m base &&
+ echo a >a.txt &&
+ echo b >b.txt &&
+ echo delete >delete.txt &&
+ git add a.txt b.txt delete.txt &&
+ git commit -m tip &&
+ git tag tip &&
+ git reset --hard HEAD^ &&
+ echo change >a.txt &&
+ git commit -a -m side &&
+ git tag side
+'
+
+test_expect_success 'git ls-files --deduplicate to show unique unmerged path' '
+ test_must_fail git merge tip &&
+ git ls-files --deduplicate >actual &&
+ cat >expect <<-\EOF &&
+ a.txt
+ b.txt
+ delete.txt
+ EOF
+ test_cmp expect actual &&
+ git merge --abort
+'
+
+test_expect_success 'git ls-files -d -m --deduplicate with different display options' '
+ git reset --hard side &&
+ test_must_fail git merge tip &&
+ rm delete.txt &&
+ git ls-files -d -m --deduplicate >actual &&
+ cat >expect <<-\EOF &&
+ a.txt
+ delete.txt
+ EOF
+ test_cmp expect actual &&
+ git ls-files -d -m -t --deduplicate >actual &&
+ cat >expect <<-\EOF &&
+ C a.txt
+ C a.txt
+ C a.txt
+ R delete.txt
+ C delete.txt
+ EOF
+ test_cmp expect actual &&
+ git ls-files -d -m -c --deduplicate >actual &&
+ cat >expect <<-\EOF &&
+ a.txt
+ b.txt
+ delete.txt
+ EOF
+ test_cmp expect actual &&
+ git merge --abort
+'
+
+test_done
diff --git a/t/t3040-subprojects-basic.sh b/t/t3040-subprojects-basic.sh
index b81eb5f..6abdcbb 100755
--- a/t/t3040-subprojects-basic.sh
+++ b/t/t3040-subprojects-basic.sh
@@ -79,7 +79,4 @@
git diff-index --exit-code --raw --cached save -- sub1
'
-# just interesting what happened...
-# git diff --name-status -M save master
-
test_done
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 411a70b..cc4b102 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -5,6 +5,9 @@
test_description='git branch assorted tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-rebase.sh
@@ -12,6 +15,7 @@
echo Hello >A &&
git update-index --add A &&
git commit -m "Initial commit." &&
+ git branch -M main &&
echo World >>A &&
git update-index --add A &&
git commit -m "Second commit." &&
@@ -27,8 +31,8 @@
mkdir broken &&
(
cd broken &&
- git init &&
- >.git/refs/heads/master &&
+ git init -b main &&
+ >.git/refs/heads/main &&
test_expect_code 129 git branch -h >usage 2>&1
) &&
test_i18ngrep "[Uu]sage" broken/usage
@@ -42,8 +46,8 @@
git branch a/b/c && test_path_is_file .git/refs/heads/a/b/c
'
-test_expect_success 'git branch mb master... should create a branch' '
- git branch mb master... && test_path_is_file .git/refs/heads/mb
+test_expect_success 'git branch mb main... should create a branch' '
+ git branch mb main... && test_path_is_file .git/refs/heads/mb
'
test_expect_success 'git branch HEAD should fail' '
@@ -51,7 +55,7 @@
'
cat >expect <<EOF
-$ZERO_OID $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from master
+$ZERO_OID $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from main
EOF
test_expect_success 'git branch --create-reflog d/e/f should create a branch and a log' '
GIT_COMMITTER_DATE="2005-05-26 23:30" \
@@ -110,7 +114,7 @@
test_expect_success 'git branch -m bbb should rename checked out branch' '
test_when_finished git branch -D bbb &&
- test_when_finished git checkout master &&
+ test_when_finished git checkout main &&
git checkout -b aaa &&
git commit --allow-empty -m "a new commit" &&
git rev-parse aaa@{0} >expect &&
@@ -124,7 +128,7 @@
test_expect_success 'renaming checked out branch works with d/f conflict' '
test_when_finished "git branch -D foo/bar || git branch -D foo" &&
- test_when_finished git checkout master &&
+ test_when_finished git checkout main &&
git checkout -b foo &&
git branch -m foo/bar &&
git symbolic-ref HEAD >actual &&
@@ -178,14 +182,14 @@
'
test_expect_success 'git branch -M should leave orphaned HEAD alone' '
- git init orphan &&
+ git init -b main orphan &&
(
cd orphan &&
test_commit initial &&
git checkout --orphan lonely &&
grep lonely .git/HEAD &&
test_path_is_missing .git/refs/head/lonely &&
- git branch -M master mistress &&
+ git branch -M main mistress &&
grep lonely .git/HEAD
)
'
@@ -201,7 +205,7 @@
'
test_expect_success 'git branch -M baz bam should succeed when baz is checked out as linked working tree' '
- git checkout master &&
+ git checkout main &&
git worktree add -b baz bazdir &&
git worktree add -f bazdir2 baz &&
git branch -M baz bam &&
@@ -224,20 +228,20 @@
git worktree prune
'
-test_expect_success 'git branch -M master should work when master is checked out' '
- git checkout master &&
- git branch -M master
+test_expect_success 'git branch -M main should work when main is checked out' '
+ git checkout main &&
+ git branch -M main
'
-test_expect_success 'git branch -M master master should work when master is checked out' '
- git checkout master &&
- git branch -M master master
+test_expect_success 'git branch -M main main should work when main is checked out' '
+ git checkout main &&
+ git branch -M main main
'
-test_expect_success 'git branch -M master2 master2 should work when master is checked out' '
- git checkout master &&
- git branch master2 &&
- git branch -M master2 master2
+test_expect_success 'git branch -M topic topic should work when main is checked out' '
+ git checkout main &&
+ git branch topic &&
+ git branch -M topic topic
'
test_expect_success 'git branch -v -d t should work' '
@@ -289,11 +293,11 @@
test_expect_success 'bare main worktree has HEAD at branch deleted by secondary worktree' '
test_when_finished "rm -rf nonbare base secondary" &&
- git init nonbare &&
+ git init -b main nonbare &&
test_commit -C nonbare x &&
git clone --bare nonbare bare &&
- git -C bare worktree add --detach ../secondary master &&
- git -C secondary branch -D master
+ git -C bare worktree add --detach ../secondary main &&
+ git -C secondary branch -D main
'
test_expect_success 'git branch --list -v with --abbrev' '
@@ -305,7 +309,9 @@
git branch -v --list --no-abbrev t >actual.noabbrev &&
git branch -v --list --abbrev=0 t >actual.0abbrev &&
+ git -c core.abbrev=no branch -v --list t >actual.noabbrev-conf &&
test_cmp actual.noabbrev actual.0abbrev &&
+ test_cmp actual.noabbrev actual.noabbrev-conf &&
git branch -v --list --abbrev=36 t >actual.36abbrev &&
# how many hexdigits are used?
@@ -323,11 +329,11 @@
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 * main 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 +342,7 @@
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
@@ -345,17 +351,17 @@
j/k
l
m/m
-* master
- master2
+* main
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 +370,11 @@
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 * main 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 +383,9 @@
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 -8 | sed "s/ *$//" >actual &&
git config --unset column.ui &&
- cat >expected <<\EOF &&
+ cat >expect <<\EOF &&
a/b/c
abc
bam
@@ -388,21 +394,21 @@
j/k
l
m/m
-* master
- master2
+* main
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
'
@@ -427,8 +433,8 @@
'
test_expect_success 'git branch -m correctly renames multiple config sections' '
- test_when_finished "git checkout master" &&
- git checkout -b source master &&
+ test_when_finished "git checkout main" &&
+ git checkout -b source main &&
# Assert that a config file with multiple config sections has
# those sections preserved...
@@ -587,20 +593,20 @@
! grep "$msg$" .git/logs/HEAD
'
-test_expect_success 'git branch -C master should work when master is checked out' '
- git checkout master &&
- git branch -C master
+test_expect_success 'git branch -C main should work when main is checked out' '
+ git checkout main &&
+ git branch -C main
'
-test_expect_success 'git branch -C master master should work when master is checked out' '
- git checkout master &&
- git branch -C master master
+test_expect_success 'git branch -C main main should work when main is checked out' '
+ git checkout main &&
+ git branch -C main main
'
-test_expect_success 'git branch -C master5 master5 should work when master is checked out' '
- git checkout master &&
- git branch master5 &&
- git branch -C master5 master5
+test_expect_success 'git branch -C main5 main5 should work when main is checked out' '
+ git checkout main &&
+ git branch main5 &&
+ git branch -C main5 main5
'
test_expect_success 'git branch -C ab cd should overwrite existing config for cd' '
@@ -620,8 +626,8 @@
test_expect_success 'git branch -c correctly copies multiple config sections' '
FOO=1 &&
export FOO &&
- test_when_finished "git checkout master" &&
- git checkout -b source2 master &&
+ test_when_finished "git checkout main" &&
+ git checkout -b source2 main &&
# Assert that a config file with multiple config sections has
# those sections preserved...
@@ -689,7 +695,7 @@
git branch -d symref >actual &&
test_path_is_file .git/refs/heads/target &&
test_path_is_missing .git/refs/heads/symref &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'deleting a dangling symref' '
@@ -698,7 +704,7 @@
echo "Deleted branch dangling-symref (was nowhere)." >expect &&
git branch -d dangling-symref >actual &&
test_path_is_missing .git/refs/heads/dangling-symref &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'deleting a self-referential symref' '
@@ -707,15 +713,15 @@
echo "Deleted branch self-reference (was refs/heads/self-reference)." >expect &&
git branch -d self-reference >actual &&
test_path_is_missing .git/refs/heads/self-reference &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
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 &&
- test_path_is_file .git/refs/heads/master &&
- test_path_is_missing .git/refs/heads/master3
+ git symbolic-ref refs/heads/topic refs/heads/main &&
+ test_must_fail git branch -m topic new-topic &&
+ git symbolic-ref refs/heads/topic &&
+ test_path_is_file .git/refs/heads/main &&
+ 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' '
@@ -728,27 +734,27 @@
test_expect_success 'test tracking setup via --track' '
git config remote.local.url . &&
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
- (git show-ref -q refs/remotes/local/master || git fetch local) &&
- git branch --track my1 local/master &&
+ (git show-ref -q refs/remotes/local/main || git fetch local) &&
+ git branch --track my1 local/main &&
test $(git config branch.my1.remote) = local &&
- test $(git config branch.my1.merge) = refs/heads/master
+ test $(git config branch.my1.merge) = refs/heads/main
'
test_expect_success 'test tracking setup (non-wildcard, matching)' '
git config remote.local.url . &&
- git config remote.local.fetch refs/heads/master:refs/remotes/local/master &&
- (git show-ref -q refs/remotes/local/master || git fetch local) &&
- git branch --track my4 local/master &&
+ git config remote.local.fetch refs/heads/main:refs/remotes/local/main &&
+ (git show-ref -q refs/remotes/local/main || git fetch local) &&
+ git branch --track my4 local/main &&
test $(git config branch.my4.remote) = local &&
- test $(git config branch.my4.merge) = refs/heads/master
+ test $(git config branch.my4.merge) = refs/heads/main
'
test_expect_success 'tracking setup fails on non-matching refspec' '
git config remote.local.url . &&
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
- (git show-ref -q refs/remotes/local/master || git fetch local) &&
+ (git show-ref -q refs/remotes/local/main || git fetch local) &&
git config remote.local.fetch refs/heads/s:refs/remotes/local/s &&
- test_must_fail git branch --track my5 local/master &&
+ test_must_fail git branch --track my5 local/main &&
test_must_fail git config branch.my5.remote &&
test_must_fail git config branch.my5.merge
'
@@ -757,21 +763,21 @@
git config branch.autosetupmerge true &&
git config remote.local.url . &&
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
- (git show-ref -q refs/remotes/local/master || git fetch local) &&
- git branch my3 local/master &&
+ (git show-ref -q refs/remotes/local/main || git fetch local) &&
+ git branch my3 local/main &&
test $(git config branch.my3.remote) = local &&
- test $(git config branch.my3.merge) = refs/heads/master
+ test $(git config branch.my3.merge) = refs/heads/main
'
test_expect_success 'test overriding tracking setup via --no-track' '
git config branch.autosetupmerge true &&
git config remote.local.url . &&
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
- (git show-ref -q refs/remotes/local/master || git fetch local) &&
- git branch --no-track my2 local/master &&
+ (git show-ref -q refs/remotes/local/main || git fetch local) &&
+ git branch --no-track my2 local/main &&
git config branch.autosetupmerge false &&
! test "$(git config branch.my2.remote)" = local &&
- ! test "$(git config branch.my2.merge)" = refs/heads/master
+ ! test "$(git config branch.my2.merge)" = refs/heads/main
'
test_expect_success 'no tracking without .fetch entries' '
@@ -802,7 +808,7 @@
sha1=$(git rev-parse my7 | cut -c 1-7) &&
echo "Deleted branch my7 (was $sha1)." >expect &&
git branch -d my7 >actual 2>&1 &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'deleting currently checked out branch fails' '
@@ -835,134 +841,153 @@
'
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 main a b c 2>err &&
+ test_cmp 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 main when it does not point to any branch." >expect &&
+ test_must_fail git branch --set-upstream-to main 2>err &&
+ test_cmp 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 main does-not-exist 2>err &&
+ test_cmp 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 main 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_cmp 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' '
- test_config branch.master.remote foo &&
- test_config branch.master.merge foo &&
+ test_config branch.main.remote foo &&
+ test_config branch.main.merge foo &&
git branch my12 &&
git branch --set-upstream-to my12 &&
- test "$(git config branch.master.remote)" = "." &&
- test "$(git config branch.master.merge)" = "refs/heads/my12"
+ test "$(git config branch.main.remote)" = "." &&
+ test "$(git config branch.main.merge)" = "refs/heads/my12"
'
test_expect_success 'use --set-upstream-to modify a particular branch' '
git branch my13 &&
- git branch --set-upstream-to master my13 &&
+ git branch --set-upstream-to main my13 &&
test_when_finished "git branch --unset-upstream my13" &&
test "$(git config branch.my13.remote)" = "." &&
- test "$(git config branch.my13.merge)" = "refs/heads/master"
+ test "$(git config branch.my13.merge)" = "refs/heads/main"
'
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_cmp 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' '
git branch my14 &&
- test_config branch.master.remote foo &&
- test_config branch.master.merge foo &&
+ test_config branch.main.remote foo &&
+ test_config branch.main.merge foo &&
git branch --set-upstream-to my14 &&
git branch --unset-upstream &&
- test_must_fail git config branch.master.remote &&
- test_must_fail git config branch.master.merge &&
+ test_must_fail git config branch.main.remote &&
+ test_must_fail git config branch.main.merge &&
# fail for a branch without upstream set
- test_must_fail git branch --unset-upstream
+ echo "fatal: Branch '"'"'main'"'"' has no upstream information" >expect &&
+ test_must_fail git branch --unset-upstream 2>err &&
+ test_cmp 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_cmp 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_cmp expect err
'
test_expect_success 'test --unset-upstream on a particular branch' '
git branch my15 &&
- git branch --set-upstream-to master my14 &&
+ git branch --set-upstream-to main my14 &&
git branch --unset-upstream my14 &&
test_must_fail git config branch.my14.remote &&
test_must_fail git config branch.my14.merge
'
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/main
'
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_cmp expect actual
'
# Keep this test last, as it changes the current branch
cat >expect <<EOF
-$ZERO_OID $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from master
+$ZERO_OID $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from main
EOF
test_expect_success 'git checkout -b g/h/i -l should create a branch and a log' '
GIT_COMMITTER_DATE="2005-05-26 23:30" \
- git checkout -b g/h/i -l master &&
+ git checkout -b g/h/i -l main &&
test_path_is_file .git/refs/heads/g/h/i &&
test_path_is_file .git/logs/refs/heads/g/h/i &&
test_cmp expect .git/logs/refs/heads/g/h/i
'
test_expect_success 'checkout -b makes reflog by default' '
- git checkout master &&
+ git checkout main &&
git config --unset core.logAllRefUpdates &&
git checkout -b alpha &&
git rev-parse --verify alpha@{0}
'
test_expect_success 'checkout -b does not make reflog when core.logAllRefUpdates = false' '
- git checkout master &&
+ git checkout main &&
git config core.logAllRefUpdates false &&
git checkout -b beta &&
test_must_fail git rev-parse --verify beta@{0}
'
test_expect_success 'checkout -b with -l makes reflog when core.logAllRefUpdates = false' '
- git checkout master &&
+ git checkout main &&
git checkout -lb gamma &&
git config --unset core.logAllRefUpdates &&
git rev-parse --verify gamma@{0}
@@ -971,10 +996,10 @@
test_expect_success 'avoid ambiguous track' '
git config branch.autosetupmerge true &&
git config remote.ambi1.url lalala &&
- git config remote.ambi1.fetch refs/heads/lalala:refs/heads/master &&
+ git config remote.ambi1.fetch refs/heads/lalala:refs/heads/main &&
git config remote.ambi2.url lilili &&
- git config remote.ambi2.fetch refs/heads/lilili:refs/heads/master &&
- test_must_fail git branch all1 master &&
+ git config remote.ambi2.fetch refs/heads/lilili:refs/heads/main &&
+ test_must_fail git branch all1 main &&
test -z "$(git config branch.all1.merge)"
'
@@ -1030,10 +1055,10 @@
git config remote.local.url . &&
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
git config branch.autosetuprebase local &&
- (git show-ref -q refs/remotes/local/master || git fetch local) &&
- git branch --track myr5 local/master &&
+ (git show-ref -q refs/remotes/local/main || git fetch local) &&
+ git branch --track myr5 local/main &&
test "$(git config branch.myr5.remote)" = local &&
- test "$(git config branch.myr5.merge)" = refs/heads/master &&
+ test "$(git config branch.myr5.merge)" = refs/heads/main &&
! test "$(git config branch.myr5.rebase)" = true
'
@@ -1041,10 +1066,10 @@
git config remote.local.url . &&
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
git config branch.autosetuprebase never &&
- (git show-ref -q refs/remotes/local/master || git fetch local) &&
- git branch --track myr6 local/master &&
+ (git show-ref -q refs/remotes/local/main || git fetch local) &&
+ git branch --track myr6 local/main &&
test "$(git config branch.myr6.remote)" = local &&
- test "$(git config branch.myr6.merge)" = refs/heads/master &&
+ test "$(git config branch.myr6.merge)" = refs/heads/main &&
! test "$(git config branch.myr6.rebase)" = true
'
@@ -1052,10 +1077,10 @@
git config remote.local.url . &&
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
git config branch.autosetuprebase remote &&
- (git show-ref -q refs/remotes/local/master || git fetch local) &&
- git branch --track myr7 local/master &&
+ (git show-ref -q refs/remotes/local/main || git fetch local) &&
+ git branch --track myr7 local/main &&
test "$(git config branch.myr7.remote)" = local &&
- test "$(git config branch.myr7.merge)" = refs/heads/master &&
+ test "$(git config branch.myr7.merge)" = refs/heads/main &&
test "$(git config branch.myr7.rebase)" = true
'
@@ -1063,10 +1088,10 @@
git config remote.local.url . &&
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
git config branch.autosetuprebase remote &&
- (git show-ref -q refs/remotes/local/master || git fetch local) &&
- git branch --track myr8 local/master &&
+ (git show-ref -q refs/remotes/local/main || git fetch local) &&
+ git branch --track myr8 local/main &&
test "$(git config branch.myr8.remote)" = local &&
- test "$(git config branch.myr8.merge)" = refs/heads/master &&
+ test "$(git config branch.myr8.merge)" = refs/heads/main &&
test "$(git config branch.myr8.rebase)" = true
'
@@ -1074,10 +1099,10 @@
git config --unset branch.autosetuprebase &&
git config remote.local.url . &&
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
- (git show-ref -q refs/remotes/local/master || git fetch local) &&
- git branch --track myr9 local/master &&
+ (git show-ref -q refs/remotes/local/main || git fetch local) &&
+ git branch --track myr9 local/main &&
test "$(git config branch.myr9.remote)" = local &&
- test "$(git config branch.myr9.merge)" = refs/heads/master &&
+ test "$(git config branch.myr9.merge)" = refs/heads/main &&
test "z$(git config branch.myr9.rebase)" = z
'
@@ -1095,7 +1120,7 @@
test_expect_success 'autosetuprebase unconfigured on untracked local branch' '
git config remote.local.url . &&
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
- (git show-ref -q refs/remotes/local/master || git fetch local) &&
+ (git show-ref -q refs/remotes/local/main || git fetch local) &&
git branch --no-track myr11 mybase2 &&
test "z$(git config branch.myr11.remote)" = z &&
test "z$(git config branch.myr11.merge)" = z &&
@@ -1105,8 +1130,8 @@
test_expect_success 'autosetuprebase unconfigured on untracked remote branch' '
git config remote.local.url . &&
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
- (git show-ref -q refs/remotes/local/master || git fetch local) &&
- git branch --no-track myr12 local/master &&
+ (git show-ref -q refs/remotes/local/main || git fetch local) &&
+ git branch --no-track myr12 local/main &&
test "z$(git config branch.myr12.remote)" = z &&
test "z$(git config branch.myr12.merge)" = z &&
test "z$(git config branch.myr12.rebase)" = z
@@ -1116,7 +1141,7 @@
git config branch.autosetuprebase never &&
git config remote.local.url . &&
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
- (git show-ref -q refs/remotes/local/master || git fetch local) &&
+ (git show-ref -q refs/remotes/local/main || git fetch local) &&
git branch --no-track myr13 mybase2 &&
test "z$(git config branch.myr13.remote)" = z &&
test "z$(git config branch.myr13.merge)" = z &&
@@ -1127,7 +1152,7 @@
git config branch.autosetuprebase local &&
git config remote.local.url . &&
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
- (git show-ref -q refs/remotes/local/master || git fetch local) &&
+ (git show-ref -q refs/remotes/local/main || git fetch local) &&
git branch --no-track myr14 mybase2 &&
test "z$(git config branch.myr14.remote)" = z &&
test "z$(git config branch.myr14.merge)" = z &&
@@ -1138,7 +1163,7 @@
git config branch.autosetuprebase remote &&
git config remote.local.url . &&
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
- (git show-ref -q refs/remotes/local/master || git fetch local) &&
+ (git show-ref -q refs/remotes/local/main || git fetch local) &&
git branch --no-track myr15 mybase2 &&
test "z$(git config branch.myr15.remote)" = z &&
test "z$(git config branch.myr15.merge)" = z &&
@@ -1149,7 +1174,7 @@
git config branch.autosetuprebase always &&
git config remote.local.url . &&
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
- (git show-ref -q refs/remotes/local/master || git fetch local) &&
+ (git show-ref -q refs/remotes/local/main || git fetch local) &&
git branch --no-track myr16 mybase2 &&
test "z$(git config branch.myr16.remote)" = z &&
test "z$(git config branch.myr16.merge)" = z &&
@@ -1160,8 +1185,8 @@
git config branch.autosetuprebase never &&
git config remote.local.url . &&
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
- (git show-ref -q refs/remotes/local/master || git fetch local) &&
- git branch --no-track myr17 local/master &&
+ (git show-ref -q refs/remotes/local/main || git fetch local) &&
+ git branch --no-track myr17 local/main &&
test "z$(git config branch.myr17.remote)" = z &&
test "z$(git config branch.myr17.merge)" = z &&
test "z$(git config branch.myr17.rebase)" = z
@@ -1171,8 +1196,8 @@
git config branch.autosetuprebase local &&
git config remote.local.url . &&
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
- (git show-ref -q refs/remotes/local/master || git fetch local) &&
- git branch --no-track myr18 local/master &&
+ (git show-ref -q refs/remotes/local/main || git fetch local) &&
+ git branch --no-track myr18 local/main &&
test "z$(git config branch.myr18.remote)" = z &&
test "z$(git config branch.myr18.merge)" = z &&
test "z$(git config branch.myr18.rebase)" = z
@@ -1182,8 +1207,8 @@
git config branch.autosetuprebase remote &&
git config remote.local.url . &&
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
- (git show-ref -q refs/remotes/local/master || git fetch local) &&
- git branch --no-track myr19 local/master &&
+ (git show-ref -q refs/remotes/local/main || git fetch local) &&
+ git branch --no-track myr19 local/main &&
test "z$(git config branch.myr19.remote)" = z &&
test "z$(git config branch.myr19.merge)" = z &&
test "z$(git config branch.myr19.rebase)" = z
@@ -1193,8 +1218,8 @@
git config branch.autosetuprebase always &&
git config remote.local.url . &&
git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
- (git show-ref -q refs/remotes/local/master || git fetch local) &&
- git branch --no-track myr20 local/master &&
+ (git show-ref -q refs/remotes/local/main || git fetch local) &&
+ git branch --no-track myr20 local/main &&
test "z$(git config branch.myr20.remote)" = z &&
test "z$(git config branch.myr20.merge)" = z &&
test "z$(git config branch.myr20.rebase)" = z
@@ -1202,7 +1227,7 @@
test_expect_success 'autosetuprebase always on detached HEAD' '
git config branch.autosetupmerge always &&
- test_when_finished git checkout master &&
+ test_when_finished git checkout main &&
git checkout HEAD^0 &&
git branch my11 &&
test -z "$(git config branch.my11.remote)" &&
@@ -1230,18 +1255,18 @@
test_expect_success 'attempt to delete a branch merged to its base' '
# we are on my9 which is the initial commit; traditionally
# we would not have allowed deleting my8 that is not merged
- # to my9, but it is set to track master that already has my8
- git config branch.my8.merge refs/heads/master &&
+ # to my9, but it is set to track main that already has my8
+ git config branch.my8.merge refs/heads/main &&
git branch -d my8
'
test_expect_success 'attempt to delete a branch merged to its base' '
- git checkout master &&
+ git checkout main &&
echo Third >>A &&
git commit -m "Third commit" A &&
git branch -t my10 my9 &&
git branch -f my10 HEAD^ &&
- # we are on master which is at the third commit, and my10
+ # we are on main which is at the third commit, and my10
# is behind us, so traditionally we would have allowed deleting
# it; but my10 is set to track my9 that is further behind.
test_must_fail git branch -d my10
@@ -1268,6 +1293,7 @@
'
test_expect_success 'refuse --edit-description on unborn branch for now' '
+ test_when_finished "git checkout main" &&
write_script editor <<-\EOF &&
echo "New contents" >"$1"
EOF
@@ -1279,24 +1305,20 @@
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 &&
+ git checkout main &&
FAKE_LINES="1 edit 2" &&
export FAKE_LINES &&
set_fake_editor &&
git rebase -i HEAD~2 &&
git branch --list >actual &&
- test_i18ngrep "rebasing master" actual
+ test_i18ngrep "rebasing main" actual
'
test_expect_success '--list during rebase from detached HEAD' '
- test_when_finished "reset_rebase && git checkout master" &&
- git checkout master^0 &&
+ test_when_finished "reset_rebase && git checkout main" &&
+ git checkout main^0 &&
oid=$(git rev-parse --short HEAD) &&
FAKE_LINES="1 edit 2" &&
export FAKE_LINES &&
@@ -1308,17 +1330,17 @@
test_expect_success 'tracking with unexpected .fetch refspec' '
rm -rf a b c d &&
- git init a &&
+ git init -b main a &&
(
cd a &&
test_commit a
) &&
- git init b &&
+ git init -b main b &&
(
cd b &&
test_commit b
) &&
- git init c &&
+ git init -b main c &&
(
cd c &&
test_commit c &&
@@ -1326,23 +1348,23 @@
git remote add b ../b &&
git fetch --all
) &&
- git init d &&
+ git init -b main d &&
(
cd d &&
git remote add c ../c &&
git config remote.c.fetch "+refs/remotes/*:refs/remotes/*" &&
git fetch c &&
- git branch --track local/a/master remotes/a/master &&
- test "$(git config branch.local/a/master.remote)" = "c" &&
- test "$(git config branch.local/a/master.merge)" = "refs/remotes/a/master" &&
+ git branch --track local/a/main remotes/a/main &&
+ test "$(git config branch.local/a/main.remote)" = "c" &&
+ test "$(git config branch.local/a/main.merge)" = "refs/remotes/a/main" &&
git rev-parse --verify a >expect &&
- git rev-parse --verify local/a/master >actual &&
+ git rev-parse --verify local/a/main >actual &&
test_cmp expect actual
)
'
test_expect_success 'configured committerdate sort' '
- git init sort &&
+ git init -b main sort &&
(
cd sort &&
git config branch.sort committerdate &&
@@ -1355,7 +1377,7 @@
test_commit b &&
git branch >actual &&
cat >expect <<-\EOF &&
- master
+ main
a
c
* b
@@ -1373,7 +1395,7 @@
a
* b
c
- master
+ main
EOF
test_cmp expect actual
)
diff --git a/t/t3201-branch-contains.sh b/t/t3201-branch-contains.sh
index 40251c9..349a810 100755
--- a/t/t3201-branch-contains.sh
+++ b/t/t3201-branch-contains.sh
@@ -2,6 +2,9 @@
test_description='branch --contains <commit>, --no-contains <commit> --merged, and --no-merged'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
@@ -10,51 +13,52 @@
git add file &&
test_tick &&
git commit -m initial &&
+ git branch -M main &&
git branch side &&
echo 1 >file &&
test_tick &&
- git commit -a -m "second on master" &&
+ git commit -a -m "second on main" &&
git checkout side &&
echo 1 >file &&
test_tick &&
git commit -a -m "second on side" &&
- git merge master
+ git merge main
'
-test_expect_success 'branch --contains=master' '
+test_expect_success 'branch --contains=main' '
- git branch --contains=master >actual &&
+ git branch --contains=main >actual &&
{
- echo " master" && echo "* side"
+ echo " main" && echo "* side"
} >expect &&
test_cmp expect actual
'
-test_expect_success 'branch --contains master' '
+test_expect_success 'branch --contains main' '
- git branch --contains master >actual &&
+ git branch --contains main >actual &&
{
- echo " master" && echo "* side"
+ echo " main" && echo "* side"
} >expect &&
test_cmp expect actual
'
-test_expect_success 'branch --no-contains=master' '
+test_expect_success 'branch --no-contains=main' '
- git branch --no-contains=master >actual &&
+ git branch --no-contains=main >actual &&
test_must_be_empty actual
'
-test_expect_success 'branch --no-contains master' '
+test_expect_success 'branch --no-contains main' '
- git branch --no-contains master >actual &&
+ git branch --no-contains main >actual &&
test_must_be_empty actual
'
@@ -73,7 +77,7 @@
git branch --no-contains=side >actual &&
{
- echo " master"
+ echo " main"
} >expect &&
test_cmp expect actual
@@ -81,9 +85,9 @@
test_expect_success 'branch --contains with pattern implies --list' '
- git branch --contains=master master >actual &&
+ git branch --contains=main main >actual &&
{
- echo " master"
+ echo " main"
} >expect &&
test_cmp expect actual
@@ -91,7 +95,7 @@
test_expect_success 'branch --no-contains with pattern implies --list' '
- git branch --no-contains=master master >actual &&
+ git branch --no-contains=main main >actual &&
test_must_be_empty actual
'
@@ -100,7 +104,7 @@
git branch --merged >actual &&
{
- echo " master" &&
+ echo " main" &&
echo "* side"
} >expect &&
test_cmp expect actual
@@ -109,9 +113,9 @@
test_expect_success 'branch --merged with pattern implies --list' '
- git branch --merged=side master >actual &&
+ git branch --merged=side main >actual &&
{
- echo " master"
+ echo " main"
} >expect &&
test_cmp expect actual
@@ -124,18 +128,18 @@
'
-test_expect_success 'master: branch --merged' '
+test_expect_success 'main: branch --merged' '
- git checkout master &&
+ git checkout main &&
git branch --merged >actual &&
{
- echo "* master"
+ echo "* main"
} >expect &&
test_cmp expect actual
'
-test_expect_success 'master: branch --no-merged' '
+test_expect_success 'main: branch --no-merged' '
git branch --no-merged >actual &&
{
@@ -147,22 +151,22 @@
test_expect_success 'branch --no-merged with pattern implies --list' '
- git branch --no-merged=master master >actual &&
+ git branch --no-merged=main main >actual &&
test_must_be_empty actual
'
test_expect_success 'implicit --list conflicts with modification options' '
- test_must_fail git branch --contains=master -d &&
- test_must_fail git branch --contains=master -m foo &&
- test_must_fail git branch --no-contains=master -d &&
- test_must_fail git branch --no-contains=master -m foo
+ test_must_fail git branch --contains=main -d &&
+ test_must_fail git branch --contains=main -m foo &&
+ test_must_fail git branch --no-contains=main -d &&
+ test_must_fail git branch --no-contains=main -m foo
'
test_expect_success 'Assert that --contains only works on commits, not trees & blobs' '
- test_must_fail git branch --contains master^{tree} &&
+ test_must_fail git branch --contains main^{tree} &&
blob=$(git hash-object -w --stdin <<-\EOF
Some blob
EOF
@@ -171,44 +175,96 @@
test_must_fail git branch --no-contains $blob
'
+test_expect_success 'multiple branch --contains' '
+ git checkout -b side2 main &&
+ >feature &&
+ git add feature &&
+ git commit -m "add feature" &&
+ git checkout -b next main &&
+ 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 main >actual &&
+ cat >expect <<-\EOF &&
+ main
+ * 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 &&
+ main
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success 'multiple branch --no-merged' '
+ git branch --no-merged next --no-merged main >actual &&
+ cat >expect <<-\EOF &&
+ side2
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success 'branch --contains combined with --no-contains' '
+ git checkout -b seen main &&
+ 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
# merged).
#
-# Here "topic" tracks "master" with one extra commit, and "zzz" points to the
-# same tip as master The name "zzz" must come alphabetically after "topic"
+# Here "topic" tracks "main" with one extra commit, and "zzz" points to the
+# same tip as main The name "zzz" must come alphabetically after "topic"
# as we process them in that order.
test_expect_success 'branch --merged with --verbose' '
- git branch --track topic master &&
+ git branch --track topic main &&
git branch zzz topic &&
git checkout topic &&
test_commit foo &&
git branch --merged topic >actual &&
cat >expect <<-\EOF &&
- master
+ main
* topic
zzz
EOF
test_cmp expect actual &&
git branch --verbose --merged topic >actual &&
cat >expect <<-EOF &&
- master $(git rev-parse --short master) second on master
- * topic $(git rev-parse --short topic ) [ahead 1] foo
- zzz $(git rev-parse --short zzz ) second on master
- 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
+ main $(git rev-parse --short main) second on main
+ * topic $(git rev-parse --short topic ) [ahead 1] foo
+ zzz $(git rev-parse --short zzz ) second on main
EOF
test_cmp expect actual
-
'
test_done
diff --git a/t/t3202-show-branch-octopus.sh b/t/t3202-show-branch-octopus.sh
index 6adf478..5cb0126 100755
--- a/t/t3202-show-branch-octopus.sh
+++ b/t/t3202-show-branch-octopus.sh
@@ -2,6 +2,9 @@
test_description='test show-branch with more than 8 heads'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
numbers="1 2 3 4 5 6 7 8 9 10"
@@ -15,7 +18,7 @@
for i in $numbers
do
- git checkout -b branch$i master &&
+ git checkout -b branch$i main &&
> file$i &&
git add file$i &&
test_tick &&
diff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh
index 71818b9..5325b9f 100755
--- a/t/t3203-branch-output.sh
+++ b/t/t3203-branch-output.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='git branch display tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-terminal.sh
@@ -8,6 +11,7 @@
echo content >file &&
git add file &&
git commit -m one &&
+ git branch -M main &&
echo content >>file &&
git commit -a -m two
'
@@ -26,7 +30,7 @@
cat >expect <<'EOF'
branch-one
branch-two
-* master
+* main
EOF
test_expect_success 'git branch shows local branches' '
git branch >actual &&
@@ -60,7 +64,7 @@
cat >expect <<'EOF'
branch-one
branch-two
-* master
+* main
remotes/origin/HEAD -> origin/branch-one
remotes/origin/branch-one
remotes/origin/branch-two
@@ -152,24 +156,24 @@
* (HEAD detached at $(git rev-parse --short HEAD^0))
branch-one
branch-two
- master
+ main
EOF
git checkout HEAD^0 &&
git branch >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'git branch shows detached HEAD properly after checkout --detach' '
- git checkout master &&
+ git checkout main &&
cat >expect <<EOF &&
* (HEAD detached at $(git rev-parse --short HEAD^0))
branch-one
branch-two
- master
+ main
EOF
git checkout --detach &&
git branch >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'git branch shows detached HEAD properly after moving' '
@@ -177,11 +181,11 @@
* (HEAD detached from $(git rev-parse --short HEAD))
branch-one
branch-two
- master
+ main
EOF
git reset --hard HEAD^1 &&
git branch >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'git branch shows detached HEAD properly from tag' '
@@ -189,12 +193,12 @@
* (HEAD detached at fromtag)
branch-one
branch-two
- master
+ main
EOF
- git tag fromtag master &&
+ git tag fromtag main &&
git checkout fromtag &&
git branch >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'git branch shows detached HEAD properly after moving from tag' '
@@ -202,28 +206,77 @@
* (HEAD detached from fromtag)
branch-one
branch-two
- master
+ main
EOF
git reset --hard HEAD^1 &&
git branch >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
-test_expect_success 'git branch `--sort` option' '
+test_expect_success 'git branch `--sort=[-]objectsize` option' '
cat >expect <<-\EOF &&
* (HEAD detached from fromtag)
branch-two
branch-one
- master
+ main
EOF
git branch --sort=objectsize >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual &&
+
+ cat >expect <<-\EOF &&
+ * (HEAD detached from fromtag)
+ branch-one
+ main
+ branch-two
+ EOF
+ git branch --sort=-objectsize >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'git branch `--sort=[-]type` option' '
+ cat >expect <<-\EOF &&
+ * (HEAD detached from fromtag)
+ branch-one
+ branch-two
+ main
+ EOF
+ git branch --sort=type >actual &&
+ test_cmp expect actual &&
+
+ cat >expect <<-\EOF &&
+ * (HEAD detached from fromtag)
+ branch-one
+ branch-two
+ main
+ EOF
+ git branch --sort=-type >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'git branch `--sort=[-]version:refname` option' '
+ cat >expect <<-\EOF &&
+ * (HEAD detached from fromtag)
+ branch-one
+ branch-two
+ main
+ EOF
+ git branch --sort=version:refname >actual &&
+ test_cmp expect actual &&
+
+ cat >expect <<-\EOF &&
+ * (HEAD detached from fromtag)
+ main
+ branch-two
+ branch-one
+ EOF
+ git branch --sort=-version:refname >actual &&
+ test_cmp expect actual
'
test_expect_success 'git branch --points-at option' '
cat >expect <<-\EOF &&
branch-one
- master
+ main
EOF
git branch --points-at=branch-one >actual &&
test_cmp expect actual
@@ -251,7 +304,7 @@
test_expect_success 'sort branches, ignore case' '
(
- git init sort-icase &&
+ git init -b main sort-icase &&
cd sort-icase &&
test_commit initial &&
git branch branch-one &&
@@ -260,14 +313,14 @@
cat >expected <<-\EOF &&
BRANCH-two
branch-one
- master
+ main
EOF
test_cmp expected actual &&
git branch --list -i | awk "{print \$NF}" >actual &&
cat >expected <<-\EOF &&
branch-one
BRANCH-two
- master
+ main
EOF
test_cmp expected actual
)
@@ -279,12 +332,12 @@
Refname is refs/heads/ambiguous
Refname is refs/heads/branch-one
Refname is refs/heads/branch-two
- Refname is refs/heads/master
+ Refname is refs/heads/main
Refname is refs/heads/ref-to-branch
Refname is refs/heads/ref-to-remote
EOF
git branch --format="Refname is %(refname)" >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'worktree colors correct' '
@@ -293,7 +346,7 @@
ambiguous<RESET>
branch-one<RESET>
+ <CYAN>branch-two<RESET>
- master<RESET>
+ main<RESET>
ref-to-branch<RESET> -> branch-one
ref-to-remote<RESET> -> origin/branch-one
EOF
@@ -302,13 +355,13 @@
rm -r worktree_dir &&
git worktree prune &&
test_decode_color <actual.raw >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success "set up color tests" '
- echo "<RED>master<RESET>" >expect.color &&
- echo "master" >expect.bare &&
- color_args="--format=%(color:red)%(refname:short) --list master"
+ echo "<RED>main<RESET>" >expect.color &&
+ echo "main" >expect.bare &&
+ color_args="--format=%(color:red)%(refname:short) --list main"
'
test_expect_success '%(color) omitted without tty' '
@@ -331,13 +384,13 @@
test_expect_success 'verbose output lists worktree path' '
one=$(git rev-parse --short HEAD) &&
- two=$(git rev-parse --short master) &&
+ two=$(git rev-parse --short main) &&
cat >expect <<-EOF &&
* (HEAD detached from fromtag) $one one
ambiguous $one one
branch-one $two two
+ branch-two $one ($(pwd)/worktree_dir) one
- master $two two
+ main $two two
ref-to-branch $two two
ref-to-remote $two two
EOF
@@ -345,7 +398,7 @@
git branch -vv >actual &&
rm -r worktree_dir &&
git worktree prune &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_done
diff --git a/t/t3204-branch-name-interpretation.sh b/t/t3204-branch-name-interpretation.sh
index 698d9cc..993a6b5 100755
--- a/t/t3204-branch-name-interpretation.sh
+++ b/t/t3204-branch-name-interpretation.sh
@@ -6,6 +6,9 @@
refs/heads/, but we interpret some magic syntax like @{-1}, @{upstream}, etc.
This script aims to check the behavior of those corner cases.
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
expect_branch() {
@@ -28,7 +31,7 @@
git branch previous one &&
git checkout previous &&
- git checkout master &&
+ git checkout main &&
git branch -f @{-1} two &&
expect_branch previous two
@@ -58,7 +61,7 @@
git branch previous-del &&
git checkout previous-del &&
- git checkout master &&
+ git checkout main &&
git branch -D @{-1} &&
expect_deleted previous-del
@@ -98,7 +101,7 @@
git update-ref refs/remotes/origin/previous one &&
git checkout -b origin/previous two &&
- git checkout master &&
+ git checkout main &&
test_must_fail git branch -r -D @{-1} &&
expect_branch refs/remotes/origin/previous one &&
diff --git a/t/t3205-branch-color.sh b/t/t3205-branch-color.sh
index 4f1e16b..08bd906 100755
--- a/t/t3205-branch-color.sh
+++ b/t/t3205-branch-color.sh
@@ -1,11 +1,15 @@
#!/bin/sh
test_description='basic branch output coloring'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'set up some sample branches' '
test_commit foo &&
- git update-ref refs/remotes/origin/master HEAD &&
+ git branch -M main &&
+ git update-ref refs/remotes/origin/main HEAD &&
git update-ref refs/heads/other HEAD
'
@@ -19,9 +23,9 @@
test_expect_success 'regular output shows colors' '
cat >expect <<-\EOF &&
- * <CYAN>master<RESET>
+ * <CYAN>main<RESET>
<BLUE>other<RESET>
- <YELLOW>remotes/origin/master<RESET>
+ <YELLOW>remotes/origin/main<RESET>
EOF
git branch --color -a >actual.raw &&
test_decode_color <actual.raw >actual &&
@@ -31,9 +35,9 @@
test_expect_success 'verbose output shows colors' '
oid=$(git rev-parse --short HEAD) &&
cat >expect <<-EOF &&
- * <CYAN>master <RESET> $oid foo
- <BLUE>other <RESET> $oid foo
- <YELLOW>remotes/origin/master<RESET> $oid foo
+ * <CYAN>main <RESET> $oid foo
+ <BLUE>other <RESET> $oid foo
+ <YELLOW>remotes/origin/main<RESET> $oid foo
EOF
git branch --color -v -a >actual.raw &&
test_decode_color <actual.raw >actual &&
diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh
index bd808f8..1b26c4c 100755
--- a/t/t3206-range-diff.sh
+++ b/t/t3206-range-diff.sh
@@ -2,6 +2,9 @@
test_description='range-diff tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
# Note that because of the range-diff's heuristics, test_commit does more
@@ -127,7 +130,7 @@
'
test_expect_success 'simple A..B A..C (unmodified)' '
- git range-diff --no-color master..topic master..unmodified \
+ git range-diff --no-color main..topic main..unmodified \
>actual &&
cat >expect <<-EOF &&
1: $(test_oid t1) = 1: $(test_oid u1) s/5/A/
@@ -145,13 +148,26 @@
'
test_expect_success 'simple A B C (unmodified)' '
- git range-diff --no-color master topic unmodified >actual &&
+ git range-diff --no-color main topic unmodified >actual &&
# same "expect" as above
test_cmp expect actual
'
+test_expect_success 'A^! and A^-<n> (unmodified)' '
+ git range-diff --no-color topic^! unmodified^-1 >actual &&
+ cat >expect <<-EOF &&
+ 1: $(test_oid t4) = 1: $(test_oid u4) s/12/B/
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success 'A^{/..} is not mistaken for a range' '
+ test_must_fail git range-diff topic^.. topic^{/..} 2>error &&
+ test_i18ngrep "not a commit range" error
+'
+
test_expect_success 'trivial reordering' '
- git range-diff --no-color master topic reordered >actual &&
+ git range-diff --no-color main topic reordered >actual &&
cat >expect <<-EOF &&
1: $(test_oid t1) = 1: $(test_oid r1) s/5/A/
3: $(test_oid t3) = 2: $(test_oid r2) s/11/B/
@@ -162,7 +178,7 @@
'
test_expect_success 'removed a commit' '
- git range-diff --no-color master topic removed >actual &&
+ git range-diff --no-color main topic removed >actual &&
cat >expect <<-EOF &&
1: $(test_oid t1) = 1: $(test_oid d1) s/5/A/
2: $(test_oid t2) < -: $(test_oid __) s/4/A/
@@ -173,7 +189,7 @@
'
test_expect_success 'added a commit' '
- git range-diff --no-color master topic added >actual &&
+ git range-diff --no-color main topic added >actual &&
cat >expect <<-EOF &&
1: $(test_oid t1) = 1: $(test_oid a1) s/5/A/
2: $(test_oid t2) = 2: $(test_oid a2) s/4/A/
@@ -185,7 +201,7 @@
'
test_expect_success 'new base, A B C' '
- git range-diff --no-color master topic rebased >actual &&
+ git range-diff --no-color main topic rebased >actual &&
cat >expect <<-EOF &&
1: $(test_oid t1) = 1: $(test_oid b1) s/5/A/
2: $(test_oid t2) = 2: $(test_oid b2) s/4/A/
@@ -196,7 +212,7 @@
'
test_expect_success 'new base, B...C' '
- # this syntax includes the commits from master!
+ # this syntax includes the commits from main!
git range-diff --no-color topic...rebased >actual &&
cat >expect <<-EOF &&
-: $(test_oid __) > 1: $(test_oid b5) unrelated
@@ -252,17 +268,13 @@
git range-diff --no-color --stat topic...changed >actual &&
cat >expect <<-EOF &&
1: $(test_oid t1) = 1: $(test_oid c1) s/5/A/
- a => b | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
2: $(test_oid t2) = 2: $(test_oid c2) s/4/A/
- a => b | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
3: $(test_oid t3) ! 3: $(test_oid c3) s/11/B/
- a => b | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
+ a => b | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
4: $(test_oid t4) ! 4: $(test_oid c4) s/12/B/
- a => b | 0
- 1 file changed, 0 insertions(+), 0 deletions(-)
+ a => b | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
EOF
test_cmp expect actual
'
@@ -424,7 +436,7 @@
test_expect_success 'no commits on one side' '
git commit --amend -m "new message" &&
- git range-diff master HEAD@{1} HEAD
+ git range-diff main HEAD@{1} HEAD
'
test_expect_success 'changed message' '
@@ -486,11 +498,11 @@
test_cmp expect actual
'
-for prev in topic master..topic
+for prev in topic main..topic
do
test_expect_success "format-patch --range-diff=$prev" '
git format-patch --cover-letter --range-diff=$prev \
- master..unmodified >actual &&
+ main..unmodified >actual &&
test_when_finished "rm 000?-*" &&
test_line_count = 5 actual &&
test_i18ngrep "^Range-diff:$" 0000-* &&
@@ -513,11 +525,21 @@
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 \
+ main..topic main..unmodified
+'
+
+test_expect_success 'basic with modified format.pretty without "commit "' '
+ git -c format.pretty="format:%H%n" range-diff \
+ main..topic main..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 \
+ git range-diff --no-color main..topic main..unmodified \
>actual &&
sed s/Z/\ /g >expect <<-EOF &&
1: $(test_oid t1) = 1: $(test_oid u1) s/5/A/
@@ -541,7 +563,7 @@
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 \
+ git range-diff --no-color --no-notes main..topic main..unmodified \
>actual &&
cat >expect <<-EOF &&
1: $(test_oid t1) = 1: $(test_oid u1) s/5/A/
@@ -559,7 +581,7 @@
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 \
+ git range-diff --no-color --notes=note1 --notes=note2 main..topic main..unmodified \
>actual &&
sed s/Z/\ /g >expect <<-EOF &&
1: $(test_oid t1) = 1: $(test_oid u1) s/5/A/
@@ -589,7 +611,7 @@
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 &&
+ main..unmodified >actual &&
test_when_finished "rm 000?-*" &&
test_line_count = 5 actual &&
test_i18ngrep "^Range-diff:$" 0000-* &&
@@ -606,7 +628,7 @@
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 &&
+ main..unmodified >actual &&
test_when_finished "rm 000?-*" &&
test_line_count = 5 actual &&
test_i18ngrep "^Range-diff:$" 0000-* &&
@@ -623,7 +645,7 @@
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 &&
+ main..unmodified >actual &&
test_when_finished "rm 000?-*" &&
test_line_count = 5 actual &&
test_i18ngrep "^Range-diff:$" 0000-* &&
@@ -652,7 +674,7 @@
test_when_finished git notes remove topic unmodified &&
test_config format.notes true &&
git format-patch --cover-letter --range-diff=$prev \
- master..unmodified >actual &&
+ main..unmodified >actual &&
test_when_finished "rm 000?-*" &&
test_line_count = 5 actual &&
test_i18ngrep "^Range-diff:$" 0000-* &&
@@ -683,7 +705,7 @@
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 &&
+ main..unmodified >actual &&
test_when_finished "rm 000?-*" &&
test_line_count = 5 actual &&
test_i18ngrep "^Range-diff:$" 0000-* &&
@@ -711,4 +733,19 @@
test_cmp expect actual
'
+test_expect_success '--left-only/--right-only' '
+ git switch --orphan left-right &&
+ test_commit first &&
+ test_commit unmatched &&
+ test_commit common &&
+ git switch -C left-right first &&
+ git cherry-pick common &&
+
+ git range-diff -s --left-only ...common >actual &&
+ head_oid=$(git rev-parse --short HEAD) &&
+ common_oid=$(git rev-parse --short common) &&
+ echo "1: $head_oid = 2: $common_oid common" >expect &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t3206/history.export b/t/t3206/history.export
index 4c808e5..4485adc 100644
--- a/t/t3206/history.export
+++ b/t/t3206/history.export
@@ -168,7 +168,7 @@
data 10
unrelated
-commit refs/heads/master
+commit refs/heads/main
mark :12
author Thomas Rast <trast@inf.ethz.ch> 1374485127 +0200
committer Thomas Rast <trast@inf.ethz.ch> 1374485127 +0200
diff --git a/t/t3210-pack-refs.sh b/t/t3210-pack-refs.sh
index f41b2af..3b7cdc5 100755
--- a/t/t3210-pack-refs.sh
+++ b/t/t3210-pack-refs.sh
@@ -9,6 +9,9 @@
This test runs git pack-refs and git show-ref and checks that the branch
semantic is still the same.
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'enable reflogs' '
@@ -135,7 +138,7 @@
git commit --allow-empty -m "future garbage" &&
git pack-refs --all &&
git reset --hard HEAD^ &&
- git checkout master &&
+ git checkout main &&
git reflog expire --expire=all --all &&
git prune --expire=all &&
git branch -d lamb 2>result &&
@@ -240,7 +243,7 @@
test_expect_success SYMLINKS 'pack symlinked packed-refs' '
# First make sure that symlinking works when reading:
- git update-ref refs/heads/lossy refs/heads/master &&
+ git update-ref refs/heads/lossy refs/heads/main &&
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/t/t3211-peel-ref.sh b/t/t3211-peel-ref.sh
index 3b7caca..37b9d26 100755
--- a/t/t3211-peel-ref.sh
+++ b/t/t3211-peel-ref.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='tests for the peel_ref optimization of packed-refs'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'create annotated tag in refs/tags' '
@@ -19,7 +22,7 @@
test_expect_success 'set up expected show-ref output' '
{
- print_ref "refs/heads/master" &&
+ print_ref "refs/heads/main" &&
print_ref "refs/outside/foo" &&
print_ref "refs/outside/foo^{}" &&
print_ref "refs/tags/base" &&
@@ -47,7 +50,7 @@
# know we are emulating exactly what an older git would have written.
{
echo "# pack-refs with: peeled " &&
- print_ref "refs/heads/master" &&
+ print_ref "refs/heads/main" &&
print_ref "refs/outside/foo" &&
print_ref "refs/tags/base" &&
print_ref "refs/tags/foo" &&
diff --git a/t/t3300-funny-names.sh b/t/t3300-funny-names.sh
index 04de03c..f5bf16a 100755
--- a/t/t3300-funny-names.sh
+++ b/t/t3300-funny-names.sh
@@ -181,7 +181,7 @@
git diff-index -M -p $t0 >diff &&
git apply --stat <diff >diffstat &&
sed -e "s/|.*//" -e "s/ *\$//" <diffstat >current &&
- test_i18ncmp expected current
+ test_cmp expected current
'
test_expect_success 'numstat for rename quotes funny filename' '
diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh
index 8f43303..d742be8 100755
--- a/t/t3301-notes.sh
+++ b/t/t3301-notes.sh
@@ -672,6 +672,11 @@
test_cmp expect-both-reversed actual
'
+test_expect_success 'notes.displayRef with no value handled gracefully' '
+ test_must_fail git -c notes.displayRef log -0 --notes &&
+ test_must_fail git -c notes.displayRef diff-tree --notes HEAD
+'
+
test_expect_success 'GIT_NOTES_DISPLAY_REF works' '
GIT_NOTES_DISPLAY_REF=refs/notes/commits:refs/notes/other \
git log -2 >actual &&
@@ -1288,18 +1293,18 @@
grep "replacement note 3" actual
'
-test_expect_success 'git notes copy diagnoses too many or too few parameters' '
+test_expect_success 'git notes copy diagnoses too many or too few arguments' '
test_must_fail git notes copy 2>error &&
- test_i18ngrep "too few parameters" error &&
+ test_i18ngrep "too few arguments" error &&
test_must_fail git notes copy one two three 2>error &&
- test_i18ngrep "too many parameters" error
+ test_i18ngrep "too many arguments" error
'
-test_expect_success 'git notes get-ref expands refs/heads/master to refs/notes/refs/heads/master' '
+test_expect_success 'git notes get-ref expands refs/heads/main to refs/notes/refs/heads/main' '
test_unconfig core.notesRef &&
sane_unset GIT_NOTES_REF &&
- echo refs/notes/refs/heads/master >expect &&
- git notes --ref=refs/heads/master get-ref >actual &&
+ echo refs/notes/refs/heads/main >expect &&
+ git notes --ref=refs/heads/main get-ref >actual &&
test_cmp expect actual
'
diff --git a/t/t3302-notes-index-expensive.sh b/t/t3302-notes-index-expensive.sh
index 7217c5e..ef8b639 100755
--- a/t/t3302-notes-index-expensive.sh
+++ b/t/t3302-notes-index-expensive.sh
@@ -5,6 +5,9 @@
test_description='Test commit notes index (expensive!)'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
create_repo () {
@@ -20,7 +23,7 @@
notemark=$(($mark+1))
test_tick &&
cat <<-INPUT_END &&
- commit refs/heads/master
+ commit refs/heads/main
mark :$mark
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
data <<COMMIT
diff --git a/t/t3303-notes-subtrees.sh b/t/t3303-notes-subtrees.sh
index 704aee8..d47ce00 100755
--- a/t/t3303-notes-subtrees.sh
+++ b/t/t3303-notes-subtrees.sh
@@ -2,6 +2,9 @@
test_description='Test commit notes organized in subtrees'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
number_of_commits=100
@@ -40,7 +43,7 @@
nr=$(($nr+1)) &&
test_tick &&
cat <<INPUT_END
-commit refs/heads/master
+commit refs/heads/main
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
data <<COMMIT
commit #$nr
@@ -75,7 +78,7 @@
(
start_note_commit &&
nr=$number_of_commits &&
- git rev-list refs/heads/master |
+ git rev-list refs/heads/main |
while read sha1; do
note_path=$(echo "$sha1" | sed "$1")
cat <<INPUT_END &&
@@ -105,7 +108,7 @@
(
start_note_commit &&
nr=$number_of_commits &&
- git rev-list refs/heads/master |
+ git rev-list refs/heads/main |
while read sha1; do
first_note_path=$(echo "$sha1" | sed "$1")
second_note_path=$(echo "$sha1" | sed "$2")
@@ -144,7 +147,7 @@
(
start_note_commit &&
nr=$number_of_commits &&
- git rev-list refs/heads/master |
+ git rev-list refs/heads/main |
while read sha1; do
first_note_path=$(echo "$sha1" | sed "$1")
second_note_path=$(echo "$sha1" | sed "$2")
diff --git a/t/t3304-notes-mixed.sh b/t/t3304-notes-mixed.sh
index 1709e8c..03dfcd3 100755
--- a/t/t3304-notes-mixed.sh
+++ b/t/t3304-notes-mixed.sh
@@ -2,6 +2,9 @@
test_description='Test notes trees that also contain non-notes'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
number_of_commits=100
@@ -36,7 +39,7 @@
test_tick &&
cat <<INPUT_END >input &&
-commit refs/heads/master
+commit refs/heads/main
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
data <<COMMIT
commit #1
@@ -51,7 +54,7 @@
test_tick &&
cat <<INPUT_END >>input &&
-commit refs/heads/master
+commit refs/heads/main
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
data <<COMMIT
commit #2
@@ -68,8 +71,8 @@
test_expect_success "create a notes tree with both notes and non-notes" '
- commit1=$(git rev-parse refs/heads/master^) &&
- commit2=$(git rev-parse refs/heads/master) &&
+ commit1=$(git rev-parse refs/heads/main^) &&
+ commit2=$(git rev-parse refs/heads/main) &&
test_tick &&
cat <<INPUT_END >input &&
commit refs/notes/commits
diff --git a/t/t3305-notes-fanout.sh b/t/t3305-notes-fanout.sh
index 3b4753e..94c1b02 100755
--- a/t/t3305-notes-fanout.sh
+++ b/t/t3305-notes-fanout.sh
@@ -7,7 +7,7 @@
path_has_fanout() {
path=$1 &&
fanout=$2 &&
- after_last_slash=$((40 - $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\}$"
}
diff --git a/t/t3308-notes-merge.sh b/t/t3308-notes-merge.sh
index 790e292..202702b 100755
--- a/t/t3308-notes-merge.sh
+++ b/t/t3308-notes-merge.sh
@@ -22,7 +22,6 @@
# Copy notes to remote-notes
git fetch . refs/notes/*:refs/remote-notes/origin/* &&
- test_oid_init &&
test_oid_cache <<-EOF
hash4a sha1:5e93d24084d32e1cb61f7070505b9d2530cca987
hash3a sha1:8366731eeee53787d2bdf8fc1eff7d94757e8da0
@@ -109,7 +108,7 @@
git update-ref refs/notes/dir/foo HEAD &&
test_must_fail git -c "core.notesRef=refs/notes/dir" notes merge x &&
test_must_fail git -c "core.notesRef=refs/notes/dir/" notes merge x &&
- test_must_fail git -c "core.notesRef=refs/heads/master" notes merge x &&
+ test_must_fail git -c "core.notesRef=refs/heads/main" notes merge x &&
test_must_fail git -c "core.notesRef=refs/notes/y:" notes merge x &&
test_must_fail git -c "core.notesRef=refs/notes/y:foo" notes merge x &&
test_must_fail git -c "core.notesRef=refs/notes/foo^{bar" notes merge x
diff --git a/t/t3320-notes-merge-worktrees.sh b/t/t3320-notes-merge-worktrees.sh
index 823fdbd..052516e 100755
--- a/t/t3320-notes-merge-worktrees.sh
+++ b/t/t3320-notes-merge-worktrees.sh
@@ -5,6 +5,9 @@
test_description='Test merging of notes trees in multiple worktrees'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup commit' '
@@ -36,8 +39,8 @@
'
test_expect_success 'create some new worktrees' '
- git worktree add -b newbranch worktree master &&
- git worktree add -b newbranch2 worktree2 master
+ git worktree add -b newbranch worktree main &&
+ git worktree add -b newbranch2 worktree2 main
'
test_expect_success 'merge z into y fails and sets NOTES_MERGE_REF' '
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index 40d2975..587b408 100755
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -8,6 +8,9 @@
This test runs git rebase and checks that the author information is not lost
among other things.
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
GIT_AUTHOR_NAME=author@name
@@ -24,15 +27,15 @@
git update-index --add Y &&
git commit -m "Add Y." &&
git checkout -b filemove &&
- git reset --soft master &&
+ git reset --soft main &&
mkdir D &&
git mv A D/A &&
git commit -m "Move A." &&
- git checkout -b my-topic-branch master &&
+ git checkout -b my-topic-branch main &&
echo Second >B &&
git update-index --add B &&
git commit -m "Add B." &&
- git checkout -f master &&
+ git checkout -f main &&
echo Third >>A &&
git update-index A &&
git commit -m "Modify A." &&
@@ -46,23 +49,23 @@
test_expect_success 'rebase on dirty worktree' '
echo dirty >>A &&
- test_must_fail git rebase master
+ test_must_fail git rebase main
'
test_expect_success 'rebase on dirty cache' '
git add A &&
- test_must_fail git rebase master
+ test_must_fail git rebase main
'
-test_expect_success 'rebase against master' '
+test_expect_success 'rebase against main' '
git reset --hard HEAD &&
- git rebase master
+ git rebase main
'
test_expect_success 'rebase sets ORIG_HEAD to pre-rebase state' '
git checkout -b orig-head topic &&
pre="$(git rev-parse --verify HEAD)" &&
- git rebase master &&
+ git rebase main &&
test_cmp_rev "$pre" ORIG_HEAD &&
test_cmp_rev ! "$pre" HEAD
'
@@ -93,28 +96,28 @@
test_expect_success 'rebase from ambiguous branch name' '
git checkout -b topic side &&
- git rebase master
+ git rebase main
'
test_expect_success 'rebase off of the previous branch using "-"' '
- git checkout master &&
+ git checkout main &&
git checkout HEAD^ &&
git rebase @{-1} >expect.messages &&
- git merge-base master HEAD >expect.forkpoint &&
+ git merge-base main HEAD >expect.forkpoint &&
- git checkout master &&
+ git checkout main &&
git checkout HEAD^ &&
git rebase - >actual.messages &&
- git merge-base master HEAD >actual.forkpoint &&
+ git merge-base main HEAD >actual.forkpoint &&
test_cmp expect.forkpoint actual.forkpoint &&
# the next one is dubious---we may want to say "-",
# instead of @{-1}, in the message
- test_i18ncmp expect.messages actual.messages
+ test_cmp expect.messages actual.messages
'
test_expect_success 'rebase a single mode change' '
- git checkout master &&
+ git checkout main &&
git branch -D topic &&
echo 1 >X &&
git add X &&
@@ -126,7 +129,7 @@
test_chmod +x A &&
test_tick &&
git commit -m modechange &&
- GIT_TRACE=1 git rebase master
+ GIT_TRACE=1 git rebase main
'
test_expect_success 'rebase is not broken by diff.renames' '
@@ -162,11 +165,11 @@
test_expect_success 'rebase works with format.useAutoBase' '
test_config format.useAutoBase true &&
git checkout topic &&
- git rebase master
+ git rebase main
'
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-base main &&
git checkout -b default topic &&
git config branch.default.remote . &&
git config branch.default.merge refs/heads/default-base &&
@@ -184,7 +187,7 @@
'
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-base main &&
git checkout -B default topic &&
git config branch.default.remote . &&
git config branch.default.merge refs/heads/default-base &&
@@ -226,13 +229,13 @@
test_expect_success 'rebase --apply -q is quiet' '
git checkout -b quiet topic &&
- git rebase --apply -q master >output.out 2>&1 &&
+ git rebase --apply -q main >output.out 2>&1 &&
test_must_be_empty output.out
'
test_expect_success 'rebase --merge -q is quiet' '
git checkout -B quiet topic &&
- git rebase --merge -q master >output.out 2>&1 &&
+ git rebase --merge -q main >output.out 2>&1 &&
test_must_be_empty output.out
'
@@ -294,7 +297,7 @@
'
test_expect_success 'rebase with "From " line in commit message' '
- git checkout -b preserve-from master~1 &&
+ git checkout -b preserve-from main~1 &&
cat >From_.msg <<EOF &&
Somebody embedded an mbox in a commit message
@@ -310,7 +313,7 @@
>From_ &&
git add From_ &&
git commit -F From_.msg &&
- git rebase master &&
+ git rebase main &&
git log -1 --pretty=format:%B >out &&
test_cmp From_.msg out
'
@@ -357,12 +360,12 @@
git cherry-pick test &&
git checkout test &&
- git rebase master &&
+ git rebase main &&
grep "smudged" a.txt &&
git checkout removal &&
git reset --hard &&
- git rebase master &&
+ git rebase main &&
grep "clean" a.txt
)
'
@@ -402,20 +405,20 @@
'
test_expect_success 'switch to branch checked out here' '
- git checkout master &&
- git rebase master master
+ git checkout main &&
+ git rebase main main
'
test_expect_success 'switch to branch not checked out' '
- git checkout master &&
+ git checkout main &&
git branch other &&
- git rebase master other
+ git rebase main other
'
test_expect_success 'refuse to switch to branch checked out elsewhere' '
- git checkout master &&
+ git checkout main &&
git worktree add wt &&
- test_must_fail git -C wt rebase master master 2>err &&
+ test_must_fail git -C wt rebase main main 2>err &&
test_i18ngrep "already checked out" err
'
diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh
index a1ec501..cfde68f 100755
--- a/t/t3402-rebase-merge.sh
+++ b/t/t3402-rebase-merge.sh
@@ -5,6 +5,9 @@
test_description='git rebase --merge test'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
T="A quick brown fox
@@ -19,10 +22,10 @@
git commit -m"initial" &&
git branch side &&
echo "11 $T" >>original &&
- git commit -a -m"master updates a bit." &&
+ git commit -a -m"main updates a bit." &&
echo "12 $T" >>original &&
- git commit -a -m"master updates a bit more." &&
+ git commit -a -m"main updates a bit more." &&
git checkout side &&
(echo "0 $T" && cat original) >renamed &&
@@ -47,13 +50,13 @@
'
test_expect_success 'reference merge' '
- git merge -s recursive -m "reference merge" master
+ git merge -s recursive -m "reference merge" main
'
PRE_REBASE=$(git rev-parse test-rebase)
test_expect_success rebase '
git checkout test-rebase &&
- GIT_TRACE=1 git rebase --merge master
+ GIT_TRACE=1 git rebase --merge main
'
test_expect_success 'test-rebase@{1} is pre rebase' '
@@ -72,24 +75,24 @@
'
test_expect_success 'rebase the other way' '
- git reset --hard master &&
+ git reset --hard main &&
git rebase --merge side
'
test_expect_success 'rebase -Xtheirs' '
- git checkout -b conflicting master~2 &&
+ git checkout -b conflicting main~2 &&
echo "AB $T" >> original &&
git commit -mconflicting original &&
- git rebase -Xtheirs master &&
+ git rebase -Xtheirs main &&
grep AB original &&
! grep 11 original
'
test_expect_success 'rebase -Xtheirs from orphan' '
- git checkout --orphan orphan-conflicting master~2 &&
+ git checkout --orphan orphan-conflicting main~2 &&
echo "AB $T" >> original &&
git commit -morphan-conflicting original &&
- git rebase -Xtheirs master &&
+ git rebase -Xtheirs main &&
grep AB original &&
! grep 11 original
'
@@ -107,9 +110,9 @@
test_expect_success 'picking rebase' '
git reset --hard side &&
- git rebase --merge --onto master side^^ &&
- mb=$(git merge-base master HEAD) &&
- if test "$mb" = "$(git rev-parse master)"
+ git rebase --merge --onto main side^^ &&
+ mb=$(git merge-base main HEAD) &&
+ if test "$mb" = "$(git rev-parse main)"
then
echo happy
else
@@ -140,11 +143,11 @@
EOF
chmod +x test-bin/git-merge-funny &&
git reset --hard &&
- git checkout -b test-funny master^ &&
+ git checkout -b test-funny main^ &&
test_commit funny &&
(
PATH=./test-bin:$PATH &&
- git rebase -s funny -Xopt master
+ git rebase -s funny -Xopt main
) &&
test -f funny.was.run
'
@@ -162,4 +165,81 @@
git rebase --skip
'
+test_expect_success '--reapply-cherry-picks' '
+ git init repo &&
+
+ # O(1-10) -- O(1-11) -- O(0-10) main
+ # \
+ # -- 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 main 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 main
+'
+
+test_expect_success '--reapply-cherry-picks refrains from reading unneeded blobs' '
+ git init server &&
+
+ # O(1-10) -- O(1-11) -- O(1-12) main
+ # \
+ # -- 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/main &&
+ 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 main^^:file.txt) &&
+ ADD_11_BLOB=$(git -C server rev-parse main^:file.txt) &&
+ grep "[?]$MERGE_BASE_BLOB" missing_list &&
+ grep "[?]$ADD_11_BLOB" missing_list &&
+
+ git -C client rebase --merge --reapply-cherry-picks origin/main &&
+
+ # 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/t/t3403-rebase-skip.sh b/t/t3403-rebase-skip.sh
index ee8a8db..e26762d 100755
--- a/t/t3403-rebase-skip.sh
+++ b/t/t3403-rebase-skip.sh
@@ -5,6 +5,9 @@
test_description='git rebase --merge --skip tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-rebase.sh
@@ -29,6 +32,13 @@
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 &&
@@ -41,7 +51,7 @@
'
test_expect_success 'rebase with git am -3 (default)' '
- test_must_fail git rebase master
+ test_must_fail git rebase main
'
test_expect_success 'rebase --skip can not be used with other options' '
@@ -57,7 +67,7 @@
test refs/heads/skip-reference = $(git symbolic-ref HEAD) &&
git branch post-rebase &&
git reset --hard pre-rebase &&
- test_must_fail git rebase master &&
+ test_must_fail git rebase main &&
echo "hello" > hello &&
git add hello &&
git rebase --continue &&
@@ -68,7 +78,7 @@
test_expect_success 'checkout skip-merge' 'git checkout -f skip-merge'
test_expect_success 'rebase with --merge' '
- test_must_fail git rebase --merge master
+ test_must_fail git rebase --merge main
'
test_expect_success 'rebase --skip with --merge' '
@@ -85,6 +95,78 @@
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" &&
(
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index c5ce3ab..66bcbbf 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -12,7 +12,7 @@
one - two - three - four (conflict-branch)
/
- A - B - C - D - E (master)
+ A - B - C - D - E (primary)
| \
| F - G - H (branch1)
| \
@@ -25,11 +25,15 @@
where A, B, D and G all touch file1, and one, two, three, four all
touch file "conflict".
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-rebase.sh
test_expect_success 'setup' '
+ git switch -C primary &&
test_commit A file1 &&
test_commit B file1 &&
test_commit C file2 &&
@@ -65,7 +69,7 @@
export SHELL
test_expect_success 'rebase --keep-empty' '
- git checkout -b emptybranch master &&
+ git checkout -b emptybranch primary &&
git commit --allow-empty -m "empty" &&
git rebase --keep-empty -i HEAD~2 &&
git log --oneline >actual &&
@@ -82,11 +86,11 @@
git rebase -i HEAD^ >output 2>&1
) &&
tail -n 1 output >actual && # Ignore output about changing todo list
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'rebase -i with the exec command' '
- git checkout master &&
+ git checkout primary &&
(
set_fake_editor &&
FAKE_LINES="1 exec_>touch-one
@@ -97,18 +101,19 @@
) &&
test_path_is_file touch-one &&
test_path_is_file touch-two &&
- test_path_is_missing touch-three " (should have stopped before)" &&
+ # Missing because we should have stopped by now.
+ test_path_is_missing touch-three &&
test_cmp_rev C HEAD &&
git rebase --continue &&
test_path_is_file touch-three &&
test_path_is_file "touch-file name with spaces" &&
test_path_is_file touch-after-semicolon &&
- test_cmp_rev master HEAD &&
+ test_cmp_rev primary HEAD &&
rm -f touch-*
'
test_expect_success 'rebase -i with the exec command runs from tree root' '
- git checkout master &&
+ git checkout primary &&
mkdir subdir && (cd subdir &&
set_fake_editor &&
FAKE_LINES="1 exec_>touch-subdir" \
@@ -121,7 +126,7 @@
test_expect_success 'rebase -i with exec allows git commands in subdirs' '
test_when_finished "rm -rf subdir" &&
test_when_finished "git rebase --abort ||:" &&
- git checkout master &&
+ git checkout primary &&
mkdir subdir && (cd subdir &&
set_fake_editor &&
FAKE_LINES="1 x_cd_subdir_&&_git_rev-parse_--is-inside-work-tree" \
@@ -139,13 +144,13 @@
'
test_expect_success 'rebase -i with the exec command checks tree cleanness' '
- git checkout master &&
+ git checkout primary &&
(
set_fake_editor &&
test_must_fail env FAKE_LINES="exec_echo_foo_>file1 1" \
git rebase -i HEAD^
) &&
- test_cmp_rev master^ HEAD &&
+ test_cmp_rev primary^ HEAD &&
git reset --hard &&
git rebase --continue
'
@@ -154,9 +159,9 @@
test_when_finished "git rebase --abort ||:" &&
test_must_fail env git rebase -x "" @ 2>actual &&
test_write_lines "error: empty exec command" >expected &&
- test_i18ncmp expected actual &&
+ test_cmp expected actual &&
test_must_fail env git rebase -x " " @ 2>actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'rebase -x with newline in command fails' '
@@ -164,11 +169,11 @@
test_must_fail env git rebase -x "a${LF}b" @ 2>actual &&
test_write_lines "error: exec commands cannot contain newlines" \
>expected &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'rebase -i with exec of inexistent command' '
- git checkout master &&
+ git checkout primary &&
test_when_finished "git rebase --abort" &&
(
set_fake_editor &&
@@ -187,7 +192,7 @@
git checkout branch2 &&
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' '
@@ -196,16 +201,16 @@
git commit -m "stop here" &&
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 &&
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' '
@@ -214,12 +219,12 @@
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' '
@@ -256,11 +261,11 @@
D
=======
G
- >>>>>>> $commit... G
+ >>>>>>> $commit (G)
EOF
git tag new-branch1 &&
- test_must_fail git rebase -i master &&
- test "$(git rev-parse HEAD~3)" = "$(git rev-parse master)" &&
+ test_must_fail git rebase -i primary &&
+ test "$(git rev-parse HEAD~3)" = "$(git rev-parse primary)" &&
test_cmp expect .git/rebase-merge/patch &&
test_cmp expect2 file1 &&
test "$(git diff --name-status |
@@ -279,7 +284,7 @@
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
'
@@ -287,7 +292,7 @@
test_expect_success 'abort with error when new base cannot be checked out' '
git rm --cached file1 &&
git commit -m "remove file in base" &&
- test_must_fail git rebase -i master > output 2>&1 &&
+ test_must_fail git rebase -i primary > output 2>&1 &&
test_i18ngrep "The following untracked working tree files would be overwritten by checkout:" \
output &&
test_i18ngrep "file1" output &&
@@ -301,7 +306,7 @@
test_tick &&
GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" &&
git tag twerp &&
- git rebase -i --onto master HEAD^ &&
+ git rebase -i --onto primary HEAD^ &&
git show HEAD | grep "^Author: Twerp Snog"
'
@@ -322,7 +327,7 @@
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
'
@@ -336,10 +341,10 @@
(
set_fake_editor &&
FAKE_LINES="1 squash 2" EXPECT_HEADER_COUNT=2 \
- git rebase -i --onto master HEAD~2
+ git rebase -i --onto primary HEAD~2
) &&
test B = $(cat file7) &&
- test $(git rev-parse HEAD^) = $(git rev-parse master)
+ test_cmp_rev HEAD^ primary
'
test_expect_success 'retain authorship when squashing' '
@@ -366,12 +371,12 @@
'
test_expect_success REBASE_P 'preserve merges with -p' '
- git checkout -b to-be-preserved master^ &&
+ git checkout -b to-be-preserved primary^ &&
: > unrelated-file &&
git add unrelated-file &&
test_tick &&
git commit -m "unrelated" &&
- git checkout -b another-branch master &&
+ git checkout -b another-branch primary &&
echo B > file1 &&
test_tick &&
git commit -m J file1 &&
@@ -394,13 +399,13 @@
git commit -m M file1 &&
git checkout -b to-be-rebased &&
test_tick &&
- git rebase -i -p --onto branch1 master &&
+ git rebase -i -p --onto branch1 primary &&
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 &&
@@ -432,12 +437,12 @@
git add file1 &&
FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue
) &&
- test $(git rev-parse HEAD^) = $(git rev-parse new-branch1) &&
+ 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} &&
+ git reset --hard primary@{1} &&
test_tick &&
test_must_fail git rebase -v -i --onto new-branch1 HEAD^ &&
echo resolved > file1 &&
@@ -446,7 +451,7 @@
grep "^ file1 | 2 +-$" output
'
-test_expect_success C_LOCALE_OUTPUT 'multi-squash only fires up editor once' '
+test_expect_success 'multi-squash only fires up editor once' '
base=$(git rev-parse HEAD~4) &&
(
set_fake_editor &&
@@ -459,7 +464,7 @@
test 1 = $(git show | grep ONCE | wc -l)
'
-test_expect_success C_LOCALE_OUTPUT 'multi-fixup does not fire up editor' '
+test_expect_success 'multi-fixup does not fire up editor' '
git checkout -b multi-fixup E &&
base=$(git rev-parse HEAD~4) &&
(
@@ -510,7 +515,7 @@
git branch -D conflict-squash
'
-test_expect_success C_LOCALE_OUTPUT 'squash and fixup generate correct log messages' '
+test_expect_success 'squash and fixup generate correct log messages' '
cat >expect-squash-fixup <<-\EOF &&
B
@@ -537,7 +542,7 @@
git branch -D squash-fixup
'
-test_expect_success C_LOCALE_OUTPUT 'squash ignores comments' '
+test_expect_success 'squash ignores comments' '
git checkout -b skip-comments E &&
base=$(git rev-parse HEAD~4) &&
(
@@ -553,7 +558,7 @@
git branch -D skip-comments
'
-test_expect_success C_LOCALE_OUTPUT 'squash ignores blank lines' '
+test_expect_success 'squash ignores blank lines' '
git checkout -b skip-blank-lines E &&
base=$(git rev-parse HEAD~4) &&
(
@@ -739,7 +744,7 @@
--author="Somebody else <somebody@else.com>" &&
test $(git rev-parse branch3) != $(git rev-parse branch4) &&
git rebase -i branch3 &&
- test $(git rev-parse branch3) = $(git rev-parse branch4)
+ test_cmp_rev branch3 branch4
'
@@ -798,11 +803,11 @@
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' '
- git checkout master &&
+ git checkout primary &&
git reset --hard &&
test-tool chmtime =123456789 file3 &&
git update-index --refresh &&
@@ -814,14 +819,14 @@
'
test_expect_success 'reword' '
- git checkout -b reword-branch master &&
+ git checkout -b reword-branch primary &&
(
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^) &&
+ test $(git rev-parse primary) != $(git rev-parse HEAD) &&
+ test_cmp_rev primary^ HEAD^ &&
FAKE_LINES="1 2 reword 3 4" FAKE_COMMIT_MESSAGE="D changed" \
git rebase -i A &&
git show HEAD^ | grep "D changed" &&
@@ -885,7 +890,7 @@
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
'
@@ -918,7 +923,7 @@
'
test_expect_success 'prepare for rebase -i --exec' '
- git checkout master &&
+ git checkout primary &&
git checkout -b execute &&
test_commit one_exec main.txt one_exec &&
test_commit two_exec main.txt two_exec &&
@@ -991,7 +996,7 @@
test_cmp expected actual
'
-test_expect_success C_LOCALE_OUTPUT 'rebase -ix with --autosquash' '
+test_expect_success 'rebase -ix with --autosquash' '
git reset --hard execute &&
git checkout -b autosquash &&
echo second >second.txt &&
@@ -1027,7 +1032,7 @@
git reset --hard execute &&
test_must_fail git rebase -i --exec 2>actual &&
test_i18ngrep "requires a value" actual &&
- git checkout master
+ git checkout primary
'
test_expect_success 'rebase -i --root re-order and drop commits' '
@@ -1079,7 +1084,7 @@
test_expect_success 'rebase -i --root reword original root commit' '
test_when_finished "test_might_fail git rebase --abort" &&
- git checkout -b reword-original-root-branch master &&
+ git checkout -b reword-original-root-branch primary &&
(
set_fake_editor &&
FAKE_LINES="reword 1 2" FAKE_COMMIT_MESSAGE="A changed" \
@@ -1091,7 +1096,7 @@
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 &&
+ git checkout -b reword-now-root-branch primary &&
(
set_fake_editor &&
FAKE_LINES="reword 3 1" FAKE_COMMIT_MESSAGE="C changed" \
@@ -1132,7 +1137,7 @@
test "$(git rev-list --count HEAD)" = 2
'
-test_expect_success C_LOCALE_OUTPUT 'rebase --edit-todo does not work on non-interactive rebase' '
+test_expect_success 'rebase --edit-todo does not work on non-interactive rebase' '
git checkout reword-original-root-branch &&
git reset --hard &&
git checkout conflict-branch &&
@@ -1250,8 +1255,8 @@
test_expect_code 1 grep " emp" error
'
-test_expect_success SHA1 'short SHA-1 setup' '
- test_when_finished "git checkout master" &&
+test_expect_success 'short commit ID setup' '
+ test_when_finished "git checkout primary" &&
git checkout --orphan collide &&
git rm -rf . &&
(
@@ -1262,23 +1267,54 @@
)
'
-test_expect_success SHA1 'short SHA-1 collide' '
- test_when_finished "reset_rebase && git checkout master" &&
+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 primary" &&
git checkout collide &&
- colliding_sha1=6bcda37 &&
- test $colliding_sha1 = "$(git rev-parse HEAD | cut -c 1-7)" &&
+ 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_COMMIT_MESSAGE="collide2 $(test_oid t3404_collider)" \
FAKE_LINES="reword 1 break 2" git rebase -i HEAD~2 &&
- test $colliding_sha1 = "$(git rev-parse HEAD | cut -c 1-7)" &&
- grep "^pick $colliding_sha1 " \
+ 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]\{40\}" \
+ grep "^pick [0-9a-f]\{$hexsz\}" \
.git/rebase-merge/git-rebase-todo &&
- grep "^pick [0-9a-f]\{40\}" \
+ grep "^pick [0-9a-f]\{$hexsz\}" \
.git/rebase-merge/git-rebase-todo.backup &&
git rebase --continue
) &&
@@ -1385,11 +1421,11 @@
rebase_setup_and_clean () {
test_when_finished "
- git checkout master &&
+ git checkout primary &&
test_might_fail git branch -D $1 &&
test_might_fail git rebase --abort
" &&
- git checkout -b $1 ${2:-master}
+ git checkout -b $1 ${2:-primary}
}
test_expect_success 'drop' '
@@ -1420,7 +1456,7 @@
cat >expect <<-EOF &&
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 primary)
To avoid this message, use "drop" to explicitly remove a commit.
EOF
test_config rebase.missingCommitsCheck warn &&
@@ -1430,7 +1466,7 @@
FAKE_LINES="1 2 3 4" git rebase -i --root 2>actual.2
) &&
head -n4 actual.2 >actual &&
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
test D = $(git cat-file commit HEAD | sed -ne \$p)
'
@@ -1438,8 +1474,8 @@
cat >expect <<-EOF &&
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~2)
+ - $(git rev-list --pretty=oneline --abbrev-commit -1 primary)
+ - $(git rev-list --pretty=oneline --abbrev-commit -1 primary~2)
To avoid this message, use "drop" to explicitly remove a commit.
Use '\''git config rebase.missingCommitsCheck'\'' to change the level of warnings.
@@ -1454,7 +1490,7 @@
set_fake_editor &&
test_must_fail env FAKE_LINES="1 2 4" \
git rebase -i --root 2>actual &&
- test_i18ncmp expect actual &&
+ test_cmp 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
@@ -1481,11 +1517,11 @@
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)
+ error: invalid line 1: badcmd $(git rev-list --pretty=oneline --abbrev-commit -1 primary~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)
+ - $(git rev-list --pretty=oneline --abbrev-commit -1 primary)
+ - $(git rev-list --pretty=oneline --abbrev-commit -1 primary~4)
To avoid this message, use "drop" to explicitly remove a commit.
EOF
head -n4 expect >expect.2 &&
@@ -1500,11 +1536,11 @@
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 &&
+ test_cmp 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 &&
+ test_cmp expect.3 actual &&
git rebase --continue 2>actual
) &&
test D = $(git cat-file commit HEAD | sed -ne \$p) &&
@@ -1515,11 +1551,11 @@
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)
+ error: invalid line 1: badcmd $(git rev-list --pretty=oneline --abbrev-commit -1 primary~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)
+ - $(git rev-list --pretty=oneline --abbrev-commit -1 primary)
+ - $(git rev-list --pretty=oneline --abbrev-commit -1 primary~4)
To avoid this message, use "drop" to explicitly remove a commit.
Use '\''git config rebase.missingCommitsCheck'\'' to change the level of warnings.
@@ -1540,16 +1576,16 @@
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_cmp expect actual &&
test_must_fail git rebase --continue 2>actual &&
- test_i18ncmp expect.2 actual &&
+ test_cmp 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_cmp expect.3 actual &&
test_must_fail git rebase --continue 2>actual &&
- test_i18ncmp expect.3 actual &&
+ test_cmp 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
@@ -1604,7 +1640,7 @@
(
set_cat_todo_editor &&
test_must_fail git rebase -i --exec "git show HEAD" \
- --autosquash master >actual
+ --autosquash primary >actual
) &&
test_cmp expected actual
'
@@ -1615,7 +1651,7 @@
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)" \
+ test_i18ngrep "badcmd $(git rev-list --oneline -1 primary~1)" \
actual &&
test_i18ngrep "You can fix this with .git rebase --edit-todo.." \
actual &&
@@ -1734,6 +1770,49 @@
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
+'
+
+test_expect_success 'ORIG_HEAD is updated correctly' '
+ test_when_finished "git checkout primary && git branch -D test-orig-head" &&
+ git checkout -b test-orig-head A &&
+ git commit --allow-empty -m A1 &&
+ git commit --allow-empty -m A2 &&
+ git commit --allow-empty -m A3 &&
+ git commit --allow-empty -m A4 &&
+ git rebase primary &&
+ test_cmp_rev ORIG_HEAD test-orig-head@{1}
+'
+
# This must be the last test in this file
test_expect_success '$EDITOR and friends are unchanged' '
test_editor_unchanged
diff --git a/t/t3405-rebase-malformed.sh b/t/t3405-rebase-malformed.sh
index 860e63e..2524331 100755
--- a/t/t3405-rebase-malformed.sh
+++ b/t/t3405-rebase-malformed.sh
@@ -2,6 +2,9 @@
test_description='rebase should handle arbitrary git message'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-rebase.sh
@@ -52,7 +55,7 @@
git add file3 &&
git commit --allow-empty-message -m "" &&
- git checkout master &&
+ git checkout main &&
echo One >file1 &&
test_tick &&
@@ -62,7 +65,7 @@
test_expect_success 'rebase commit with multi-line subject' '
- git rebase master multi-line-subject &&
+ git rebase main multi-line-subject &&
git cat-file commit HEAD | sed -e "1,/^\$/d" >F1 &&
test_cmp F0 F1 &&
@@ -70,14 +73,14 @@
'
test_expect_success 'rebase commit with diff in message' '
- git rebase master diff-in-message &&
+ git rebase main diff-in-message &&
git cat-file commit HEAD | sed -e "1,/^$/d" >G1 &&
test_cmp G0 G1 &&
test_cmp G G0
'
test_expect_success 'rebase -m commit with empty message' '
- git rebase -m master empty-message-merge
+ git rebase -m main empty-message-merge
'
test_expect_success 'rebase -i commit with empty message' '
diff --git a/t/t3406-rebase-message.sh b/t/t3406-rebase-message.sh
index 61b76f3..77a313f 100755
--- a/t/t3406-rebase-message.sh
+++ b/t/t3406-rebase-message.sh
@@ -2,6 +2,9 @@
test_description='messages from rebase operation'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup' '
@@ -18,27 +21,27 @@
'
test_expect_success 'rebase -m' '
- git rebase -m master >actual &&
+ git rebase -m main >actual &&
test_must_be_empty actual
'
-test_expect_success 'rebase against master twice' '
- git rebase --apply master >out &&
+test_expect_success 'rebase against main twice' '
+ git rebase --apply main >out &&
test_i18ngrep "Current branch topic is up to date" out
'
-test_expect_success 'rebase against master twice with --force' '
- git rebase --force-rebase --apply master >out &&
+test_expect_success 'rebase against main twice with --force' '
+ git rebase --force-rebase --apply main >out &&
test_i18ngrep "Current branch topic is up to date, rebase forced" out
'
-test_expect_success 'rebase against master twice from another branch' '
+test_expect_success 'rebase against main twice from another branch' '
git checkout topic^ &&
- git rebase --apply master topic >out &&
+ git rebase --apply main topic >out &&
test_i18ngrep "Current branch topic is up to date" out
'
-test_expect_success 'rebase fast-forward to master' '
+test_expect_success 'rebase fast-forward to main' '
git checkout topic^ &&
git rebase --apply topic >out &&
test_i18ngrep "Fast-forwarded HEAD to topic" out
@@ -46,31 +49,24 @@
test_expect_success 'rebase --stat' '
git reset --hard start &&
- git rebase --stat master >diffstat.txt &&
- grep "^ fileX | *1 +$" diffstat.txt
+ git rebase --stat main >diffstat.txt &&
+ grep "^ fileX | *1 +$" diffstat.txt
'
test_expect_success 'rebase w/config rebase.stat' '
git reset --hard start &&
- git config rebase.stat true &&
- git rebase master >diffstat.txt &&
- grep "^ fileX | *1 +$" diffstat.txt
+ git config rebase.stat true &&
+ git rebase main >diffstat.txt &&
+ grep "^ fileX | *1 +$" diffstat.txt
'
test_expect_success 'rebase -n overrides config rebase.stat config' '
git reset --hard start &&
- git config rebase.stat true &&
- git rebase -n master >diffstat.txt &&
- ! grep "^ fileX | *1 +$" diffstat.txt
+ git config rebase.stat true &&
+ git rebase -n main >diffstat.txt &&
+ ! grep "^ fileX | *1 +$" diffstat.txt
'
-# Output to stderr:
-#
-# "Does not point to a valid commit: invalid-ref"
-#
-# NEEDSWORK: This "grep" is fine in real non-C locales, but
-# GIT_TEST_GETTEXT_POISON poisons the refname along with the enclosing
-# error message.
test_expect_success 'rebase --onto outputs the invalid ref' '
test_must_fail git rebase --onto invalid-ref HEAD HEAD 2>err &&
test_i18ngrep "invalid-ref" err
@@ -89,22 +85,22 @@
git checkout -b reflog-topic start &&
test_commit reflog-to-rebase &&
- git rebase --apply reflog-onto &&
+ git rebase reflog-onto &&
git log -g --format=%gs -3 >actual &&
cat >expect <<-\EOF &&
- rebase finished: returning to refs/heads/reflog-topic
- 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 &&
git checkout -b reflog-prefix reflog-to-rebase &&
- GIT_REFLOG_ACTION=change-the-reflog git rebase --apply reflog-onto &&
+ GIT_REFLOG_ACTION=change-the-reflog git rebase reflog-onto &&
git log -g --format=%gs -3 >actual &&
cat >expect <<-\EOF &&
- rebase finished: returning to refs/heads/reflog-prefix
- 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
'
@@ -113,7 +109,7 @@
git init unrelated &&
test_commit -C unrelated 1 &&
git -C unrelated remote add -f origin "$PWD" &&
- git -C unrelated branch --set-upstream-to=origin/master &&
+ git -C unrelated branch --set-upstream-to=origin/main &&
git -C unrelated -c core.editor=true rebase -i -v --stat >actual &&
test_i18ngrep "Changes to " actual &&
test_i18ngrep "5 files changed" actual
diff --git a/t/t3407-rebase-abort.sh b/t/t3407-rebase-abort.sh
index 97efea0..7c381fb 100755
--- a/t/t3407-rebase-abort.sh
+++ b/t/t3407-rebase-abort.sh
@@ -2,6 +2,9 @@
test_description='git rebase --abort tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
### Test that we handle space characters properly
@@ -37,7 +40,7 @@
cd "$work_dir" &&
# Clean up the state from the previous one
git reset --hard pre-rebase &&
- test_must_fail git rebase$type master &&
+ test_must_fail git rebase$type main &&
test_path_is_dir "$dotest" &&
git rebase --abort &&
test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
@@ -48,10 +51,10 @@
cd "$work_dir" &&
# Clean up the state from the previous one
git reset --hard pre-rebase &&
- test_must_fail git rebase$type master &&
+ test_must_fail git rebase$type main &&
test_path_is_dir "$dotest" &&
test_must_fail git rebase --skip &&
- test $(git rev-parse HEAD) = $(git rev-parse master) &&
+ test $(git rev-parse HEAD) = $(git rev-parse main) &&
git rebase --abort &&
test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
test ! -d "$dotest"
@@ -61,13 +64,13 @@
cd "$work_dir" &&
# Clean up the state from the previous one
git reset --hard pre-rebase &&
- test_must_fail git rebase$type master &&
+ test_must_fail git rebase$type main &&
test_path_is_dir "$dotest" &&
echo c > a &&
echo d >> a &&
git add a &&
test_must_fail git rebase --continue &&
- test $(git rev-parse HEAD) != $(git rev-parse master) &&
+ test $(git rev-parse HEAD) != $(git rev-parse main) &&
git rebase --abort &&
test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
test ! -d "$dotest"
@@ -78,7 +81,7 @@
# Clean up the state from the previous one
git reset --hard pre-rebase &&
git reflog show to-rebase > reflog_before &&
- test_must_fail git rebase$type master &&
+ test_must_fail git rebase$type main &&
git rebase --abort &&
git reflog show to-rebase > reflog_after &&
test_cmp reflog_before reflog_after &&
@@ -89,7 +92,7 @@
cd "$work_dir" &&
# Clean up the state from the previous one
git reset --hard pre-rebase &&
- test_must_fail git rebase$type master &&
+ test_must_fail git rebase$type main &&
test_must_fail git rebase -v --abort &&
test_must_fail git rebase --abort -v &&
git rebase --abort
@@ -103,7 +106,7 @@
cd "$work_dir" &&
# Clean up the state from the previous one
git reset --hard pre-rebase &&
- test_must_fail git rebase --apply master &&
+ test_must_fail git rebase --apply main &&
test_path_is_dir .git/rebase-apply &&
head_before=$(git rev-parse HEAD) &&
git rebase --quit &&
@@ -115,7 +118,7 @@
cd "$work_dir" &&
# Clean up the state from the previous one
git reset --hard pre-rebase &&
- test_must_fail git rebase --merge master &&
+ test_must_fail git rebase --merge main &&
test_path_is_dir .git/rebase-merge &&
head_before=$(git rev-parse HEAD) &&
git rebase --quit &&
diff --git a/t/t3408-rebase-multi-line.sh b/t/t3408-rebase-multi-line.sh
index d2bd7c1..ab0960e 100755
--- a/t/t3408-rebase-multi-line.sh
+++ b/t/t3408-rebase-multi-line.sh
@@ -2,6 +2,9 @@
test_description='rebasing a commit with multi-line first paragraph.'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
@@ -46,7 +49,7 @@
test_expect_success rebase '
git checkout side &&
- git rebase master &&
+ git rebase main &&
git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
git cat-file commit side@{1} | sed -e "1,/^\$/d" >expect &&
test_cmp expect actual
diff --git a/t/t3409-rebase-preserve-merges.sh b/t/t3409-rebase-preserve-merges.sh
index 3b340f1..ec8062a 100755
--- a/t/t3409-rebase-preserve-merges.sh
+++ b/t/t3409-rebase-preserve-merges.sh
@@ -6,6 +6,9 @@
Run "git rebase -p" and check that merges are properly carried along
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
if ! test_have_prereq REBASE_P; then
@@ -18,7 +21,7 @@
# Clone 2 (conflicting merge):
#
-# A1--A2--B3 <-- origin/master
+# A1--A2--B3 <-- origin/main
# \ \
# B1------M <-- topic
# \
@@ -26,7 +29,7 @@
#
# Clone 3 (no-ff merge):
#
-# A1--A2--B3 <-- origin/master
+# A1--A2--B3 <-- origin/main
# \
# B1------M <-- topic
# \ /
@@ -44,7 +47,7 @@
echo Second > B &&
git add B &&
git commit -m "Add B1" &&
- git checkout -f master &&
+ git checkout -f main &&
echo Third >> A &&
git commit -a -m "Modify A2" &&
echo Fifth > B &&
@@ -55,10 +58,10 @@
(
cd clone2 &&
git checkout -b topic origin/topic &&
- test_must_fail git merge origin/master &&
+ test_must_fail git merge origin/main &&
echo Resolved >B &&
git add B &&
- git commit -m "Merge origin/master into topic"
+ git commit -m "Merge origin/main into topic"
) &&
git clone ./. clone3 &&
diff --git a/t/t3412-rebase-root.sh b/t/t3412-rebase-root.sh
index 21632a9..fda62c6 100755
--- a/t/t3412-rebase-root.sh
+++ b/t/t3412-rebase-root.sh
@@ -4,6 +4,9 @@
Tests if git rebase --root --onto <newparent> can rebase the root commit.
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
log_with_names () {
@@ -24,7 +27,7 @@
test_expect_success 'rebase --root fails with too many args' '
git checkout -B fail other &&
- test_must_fail git rebase --onto master --root fail fail
+ test_must_fail git rebase --onto main --root fail fail
'
test_expect_success 'setup pre-rebase hook' '
@@ -44,7 +47,7 @@
test_expect_success 'rebase --root --onto <newbase>' '
git checkout -b work other &&
- git rebase --root --onto master &&
+ git rebase --root --onto main &&
git log --pretty=tformat:"%s" > rebased &&
test_cmp expect rebased
'
@@ -55,7 +58,7 @@
test_expect_success 'rebase --root --onto <newbase> <branch>' '
git branch work2 other &&
- git rebase --root --onto master work2 &&
+ git rebase --root --onto main work2 &&
git log --pretty=tformat:"%s" > rebased2 &&
test_cmp expect rebased2
'
@@ -66,7 +69,7 @@
test_expect_success 'rebase -i --root --onto <newbase>' '
git checkout -b work3 other &&
- git rebase -i --root --onto master &&
+ git rebase -i --root --onto main &&
git log --pretty=tformat:"%s" > rebased3 &&
test_cmp expect rebased3
'
@@ -77,7 +80,7 @@
test_expect_success 'rebase -i --root --onto <newbase> <branch>' '
git branch work4 other &&
- git rebase -i --root --onto master work4 &&
+ git rebase -i --root --onto main work4 &&
git log --pretty=tformat:"%s" > rebased4 &&
test_cmp expect rebased4
'
@@ -88,7 +91,7 @@
test_expect_success REBASE_P 'rebase -i -p with linear history' '
git checkout -b work5 other &&
- git rebase -i -p --root --onto master &&
+ git rebase -i -p --root --onto main &&
git log --pretty=tformat:"%s" > rebased5 &&
test_cmp expect rebased5
'
@@ -122,7 +125,7 @@
test_expect_success REBASE_P 'rebase -i -p with merge' '
git checkout -b work6 other &&
- git rebase -i -p --root --onto master &&
+ git rebase -i -p --root --onto main &&
log_with_names work6 > rebased6 &&
test_cmp expect-side rebased6
'
@@ -157,7 +160,7 @@
test_expect_success REBASE_P 'rebase -i -p with two roots' '
git checkout -b work7 other &&
- git rebase -i -p --root --onto master &&
+ git rebase -i -p --root --onto main &&
log_with_names work7 > rebased7 &&
test_cmp expect-third rebased7
'
@@ -173,14 +176,14 @@
test_expect_success 'pre-rebase hook stops rebase' '
git checkout -b stops1 other &&
- test_must_fail git rebase --root --onto master &&
+ test_must_fail git rebase --root --onto main &&
test "z$(git symbolic-ref HEAD)" = zrefs/heads/stops1 &&
test 0 = $(git rev-list other...stops1 | wc -l)
'
test_expect_success 'pre-rebase hook stops rebase -i' '
git checkout -b stops2 other &&
- test_must_fail git rebase --root --onto master &&
+ test_must_fail git rebase --root --onto main &&
test "z$(git symbolic-ref HEAD)" = zrefs/heads/stops2 &&
test 0 = $(git rev-list other...stops2 | wc -l)
'
@@ -190,7 +193,7 @@
'
test_expect_success 'set up a conflict' '
- git checkout master &&
+ git checkout main &&
echo conflict > B &&
git add B &&
git commit -m conflict
@@ -198,7 +201,7 @@
test_expect_success 'rebase --root with conflict (first part)' '
git checkout -b conflict1 other &&
- test_must_fail git rebase --root --onto master &&
+ test_must_fail git rebase --root --onto main &&
git ls-files -u | grep "B$"
'
@@ -225,7 +228,7 @@
test_expect_success 'rebase -i --root with conflict (first part)' '
git checkout -b conflict2 other &&
- test_must_fail git rebase -i --root --onto master &&
+ test_must_fail git rebase -i --root --onto main &&
git ls-files -u | grep "B$"
'
@@ -263,7 +266,7 @@
test_expect_success REBASE_P 'rebase -i -p --root with conflict (first part)' '
git checkout -b conflict3 other &&
- test_must_fail git rebase -i -p --root --onto master &&
+ test_must_fail git rebase -i -p --root --onto main &&
git ls-files -u | grep "B$"
'
diff --git a/t/t3413-rebase-hook.sh b/t/t3413-rebase-hook.sh
index b6833e9..b4acb3b 100755
--- a/t/t3413-rebase-hook.sh
+++ b/t/t3413-rebase-hook.sh
@@ -2,6 +2,9 @@
test_description='git rebase with its hook(s)'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
@@ -18,7 +21,7 @@
git add git &&
test_tick &&
git commit -m side &&
- git checkout master &&
+ git checkout main &&
git log --pretty=oneline --abbrev-commit --graph --all &&
git branch test side
'
@@ -26,14 +29,14 @@
test_expect_success 'rebase' '
git checkout test &&
git reset --hard side &&
- git rebase master &&
+ git rebase main &&
test "z$(cat git)" = zworld
'
test_expect_success 'rebase -i' '
git checkout test &&
git reset --hard side &&
- EDITOR=true git rebase -i master &&
+ EDITOR=true git rebase -i main &&
test "z$(cat git)" = zworld
'
@@ -49,53 +52,53 @@
test_expect_success 'pre-rebase hook gets correct input (1)' '
git checkout test &&
git reset --hard side &&
- git rebase master &&
+ git rebase main &&
test "z$(cat git)" = zworld &&
- test "z$(cat .git/PRE-REBASE-INPUT)" = zmaster,
+ test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,
'
test_expect_success 'pre-rebase hook gets correct input (2)' '
git checkout test &&
git reset --hard side &&
- git rebase master test &&
+ git rebase main test &&
test "z$(cat git)" = zworld &&
- test "z$(cat .git/PRE-REBASE-INPUT)" = zmaster,test
+ test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,test
'
test_expect_success 'pre-rebase hook gets correct input (3)' '
git checkout test &&
git reset --hard side &&
- git checkout master &&
- git rebase master test &&
+ git checkout main &&
+ git rebase main test &&
test "z$(cat git)" = zworld &&
- test "z$(cat .git/PRE-REBASE-INPUT)" = zmaster,test
+ test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,test
'
test_expect_success 'pre-rebase hook gets correct input (4)' '
git checkout test &&
git reset --hard side &&
- EDITOR=true git rebase -i master &&
+ EDITOR=true git rebase -i main &&
test "z$(cat git)" = zworld &&
- test "z$(cat .git/PRE-REBASE-INPUT)" = zmaster,
+ test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,
'
test_expect_success 'pre-rebase hook gets correct input (5)' '
git checkout test &&
git reset --hard side &&
- EDITOR=true git rebase -i master test &&
+ EDITOR=true git rebase -i main test &&
test "z$(cat git)" = zworld &&
- test "z$(cat .git/PRE-REBASE-INPUT)" = zmaster,test
+ test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,test
'
test_expect_success 'pre-rebase hook gets correct input (6)' '
git checkout test &&
git reset --hard side &&
- git checkout master &&
- EDITOR=true git rebase -i master test &&
+ git checkout main &&
+ EDITOR=true git rebase -i main test &&
test "z$(cat git)" = zworld &&
- test "z$(cat .git/PRE-REBASE-INPUT)" = zmaster,test
+ test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,test
'
test_expect_success 'setup pre-rebase hook that fails' '
@@ -110,7 +113,7 @@
test_expect_success 'pre-rebase hook stops rebase (1)' '
git checkout test &&
git reset --hard side &&
- test_must_fail git rebase master &&
+ test_must_fail git rebase main &&
test "z$(git symbolic-ref HEAD)" = zrefs/heads/test &&
test 0 = $(git rev-list HEAD...side | wc -l)
'
@@ -118,7 +121,7 @@
test_expect_success 'pre-rebase hook stops rebase (2)' '
git checkout test &&
git reset --hard side &&
- test_must_fail env EDITOR=: git rebase -i master &&
+ test_must_fail env EDITOR=: git rebase -i main &&
test "z$(git symbolic-ref HEAD)" = zrefs/heads/test &&
test 0 = $(git rev-list HEAD...side | wc -l)
'
@@ -126,7 +129,7 @@
test_expect_success 'rebase --no-verify overrides pre-rebase (1)' '
git checkout test &&
git reset --hard side &&
- git rebase --no-verify master &&
+ git rebase --no-verify main &&
test "z$(git symbolic-ref HEAD)" = zrefs/heads/test &&
test "z$(cat git)" = zworld
'
@@ -134,7 +137,7 @@
test_expect_success 'rebase --no-verify overrides pre-rebase (2)' '
git checkout test &&
git reset --hard side &&
- EDITOR=true git rebase --no-verify -i master &&
+ EDITOR=true git rebase --no-verify -i main &&
test "z$(git symbolic-ref HEAD)" = zrefs/heads/test &&
test "z$(cat git)" = zworld
'
diff --git a/t/t3415-rebase-autosquash.sh b/t/t3415-rebase-autosquash.sh
index 093de90..908016c 100755
--- a/t/t3415-rebase-autosquash.sh
+++ b/t/t3415-rebase-autosquash.sh
@@ -2,6 +2,9 @@
test_description='auto squash'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-rebase.sh
@@ -303,23 +306,23 @@
fi
}
-test_expect_success C_LOCALE_OUTPUT 'fixup! fixup!' '
+test_expect_success 'fixup! fixup!' '
test_auto_fixup_fixup fixup fixup
'
-test_expect_success C_LOCALE_OUTPUT 'fixup! squash!' '
+test_expect_success 'fixup! squash!' '
test_auto_fixup_fixup fixup squash
'
-test_expect_success C_LOCALE_OUTPUT 'squash! squash!' '
+test_expect_success 'squash! squash!' '
test_auto_fixup_fixup squash squash
'
-test_expect_success C_LOCALE_OUTPUT 'squash! fixup!' '
+test_expect_success 'squash! fixup!' '
test_auto_fixup_fixup squash fixup
'
-test_expect_success C_LOCALE_OUTPUT 'autosquash with custom inst format' '
+test_expect_success 'autosquash with custom inst format' '
git reset --hard base &&
git config --add rebase.instructionFormat "[%an @ %ar] %s" &&
echo 2 >file1 &&
@@ -407,7 +410,7 @@
test_expect_success 'abort last squash' '
test_when_finished "test_might_fail git rebase --abort" &&
- test_when_finished "git checkout master" &&
+ test_when_finished "git checkout main" &&
git checkout -b some-squashes &&
git commit --allow-empty -m first &&
@@ -424,4 +427,28 @@
! 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_expect_success 'fixup does not clean up commit message' '
+ oneline="#818" &&
+ git commit --allow-empty -m "$oneline" &&
+ git commit --fixup HEAD --allow-empty &&
+ git -c commit.cleanup=strip rebase -ki --autosquash HEAD~2 &&
+ test "$oneline" = "$(git show -s --format=%s)"
+'
+
test_done
diff --git a/t/t3416-rebase-onto-threedots.sh b/t/t3416-rebase-onto-threedots.sh
index 9c25484..3716a42 100755
--- a/t/t3416-rebase-onto-threedots.sh
+++ b/t/t3416-rebase-onto-threedots.sh
@@ -2,17 +2,20 @@
test_description='git rebase --onto A...B'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY/lib-rebase.sh"
-# Rebase only the tip commit of "topic" on merge base between "master"
-# and "topic". Cannot do this for "side" with "master" because there
+# Rebase only the tip commit of "topic" on merge base between "main"
+# and "topic". Cannot do this for "side" with "main" because there
# is no single merge base.
#
#
# F---G topic G'
# / /
-# A---B---C---D---E master --> A---B---C---D---E
+# A---B---C---D---E main --> A---B---C---D---E
# \ \ /
# \ x
# \ / \
@@ -26,7 +29,7 @@
git branch topic &&
git checkout side &&
test_commit H &&
- git checkout master &&
+ git checkout main &&
test_tick &&
git merge H &&
git tag D &&
@@ -42,83 +45,83 @@
test_commit K
'
-test_expect_success 'rebase --onto master...topic' '
+test_expect_success 'rebase --onto main...topic' '
git reset --hard &&
git checkout topic &&
git reset --hard G &&
- git rebase --onto master...topic F &&
+ git rebase --onto main...topic F &&
git rev-parse HEAD^1 >actual &&
git rev-parse C^0 >expect &&
test_cmp expect actual
'
-test_expect_success 'rebase --onto master...' '
+test_expect_success 'rebase --onto main...' '
git reset --hard &&
git checkout topic &&
git reset --hard G &&
- git rebase --onto master... F &&
+ git rebase --onto main... F &&
git rev-parse HEAD^1 >actual &&
git rev-parse C^0 >expect &&
test_cmp expect actual
'
-test_expect_success 'rebase --onto master...side' '
+test_expect_success 'rebase --onto main...side' '
git reset --hard &&
git checkout side &&
git reset --hard K &&
- test_must_fail git rebase --onto master...side J
+ test_must_fail git rebase --onto main...side J
'
-test_expect_success 'rebase -i --onto master...topic' '
+test_expect_success 'rebase -i --onto main...topic' '
git reset --hard &&
git checkout topic &&
git reset --hard G &&
set_fake_editor &&
- EXPECT_COUNT=1 git rebase -i --onto master...topic F &&
+ EXPECT_COUNT=1 git rebase -i --onto main...topic F &&
git rev-parse HEAD^1 >actual &&
git rev-parse C^0 >expect &&
test_cmp expect actual
'
-test_expect_success 'rebase -i --onto master...' '
+test_expect_success 'rebase -i --onto main...' '
git reset --hard &&
git checkout topic &&
git reset --hard G &&
set_fake_editor &&
- EXPECT_COUNT=1 git rebase -i --onto master... F &&
+ EXPECT_COUNT=1 git rebase -i --onto main... F &&
git rev-parse HEAD^1 >actual &&
git rev-parse C^0 >expect &&
test_cmp expect actual
'
-test_expect_success 'rebase -i --onto master...side' '
+test_expect_success 'rebase -i --onto main...side' '
git reset --hard &&
git checkout side &&
git reset --hard K &&
set_fake_editor &&
- test_must_fail git rebase -i --onto master...side J
+ test_must_fail git rebase -i --onto main...side J
'
test_expect_success 'rebase --keep-base --onto incompatible' '
- test_must_fail git rebase --keep-base --onto master...
+ test_must_fail git rebase --keep-base --onto main...
'
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' '
+test_expect_success 'rebase --keep-base main from topic' '
git reset --hard &&
git checkout topic &&
git reset --hard G &&
- git rebase --keep-base master &&
+ git rebase --keep-base main &&
git rev-parse C >base.expect &&
- git merge-base master HEAD >base.actual &&
+ git merge-base main HEAD >base.actual &&
test_cmp base.expect base.actual &&
git rev-parse HEAD~2 >actual &&
@@ -126,23 +129,23 @@
test_cmp expect actual
'
-test_expect_success 'rebase --keep-base master from side' '
+test_expect_success 'rebase --keep-base main from side' '
git reset --hard &&
git checkout side &&
git reset --hard K &&
- test_must_fail git rebase --keep-base master
+ test_must_fail git rebase --keep-base main
'
-test_expect_success 'rebase -i --keep-base master from topic' '
+test_expect_success 'rebase -i --keep-base main from topic' '
git reset --hard &&
git checkout topic &&
git reset --hard G &&
set_fake_editor &&
- EXPECT_COUNT=2 git rebase -i --keep-base master &&
+ EXPECT_COUNT=2 git rebase -i --keep-base main &&
git rev-parse C >base.expect &&
- git merge-base master HEAD >base.actual &&
+ git merge-base main HEAD >base.actual &&
test_cmp base.expect base.actual &&
git rev-parse HEAD~2 >actual &&
@@ -150,13 +153,13 @@
test_cmp expect actual
'
-test_expect_success 'rebase -i --keep-base master from side' '
+test_expect_success 'rebase -i --keep-base main 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_must_fail git rebase -i --keep-base main
'
test_done
diff --git a/t/t3417-rebase-whitespace-fix.sh b/t/t3417-rebase-whitespace-fix.sh
index e85cdc7..946e92f 100755
--- a/t/t3417-rebase-whitespace-fix.sh
+++ b/t/t3417-rebase-whitespace-fix.sh
@@ -52,7 +52,7 @@
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 @@
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/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh
index 7a2da97..0838f4e 100755
--- a/t/t3418-rebase-continue.sh
+++ b/t/t3418-rebase-continue.sh
@@ -2,6 +2,9 @@
test_description='git rebase --continue tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-rebase.sh
@@ -15,13 +18,13 @@
git checkout -b topic HEAD^ &&
test_commit "commit-new-file-F2-on-topic-branch" F2 22 &&
- git checkout master
+ git checkout main
'
test_expect_success 'interactive rebase --continue works with touched file' '
rm -fr .git/rebase-* &&
git reset --hard &&
- git checkout master &&
+ git checkout main &&
FAKE_LINES="edit 1" git rebase -i HEAD^ &&
test-tool chmtime =-60 F1 &&
@@ -31,9 +34,9 @@
test_expect_success 'non-interactive rebase --continue works with touched file' '
rm -fr .git/rebase-* &&
git reset --hard &&
- git checkout master &&
+ git checkout main &&
- test_must_fail git rebase --onto master master topic &&
+ test_must_fail git rebase --onto main main topic &&
echo "Resolved" >F2 &&
git add F2 &&
test-tool chmtime =-60 F1 &&
@@ -61,7 +64,7 @@
chmod +x test-bin/git-merge-funny &&
(
PATH=./test-bin:$PATH &&
- test_must_fail git rebase -s funny -Xopt master topic
+ test_must_fail git rebase -s funny -Xopt main topic
) &&
test -f funny.was.run &&
rm funny.was.run &&
@@ -93,7 +96,7 @@
chmod +x test-bin/git-merge-funny &&
(
PATH=./test-bin:$PATH &&
- test_must_fail git rebase -i -s funny -Xopt -Xfoo master topic
+ test_must_fail git rebase -i -s funny -Xopt -Xfoo main topic
) &&
test -f funny.was.run &&
rm funny.was.run &&
@@ -188,11 +191,11 @@
test_expect_success 'setup rerere database' '
rm -fr .git/rebase-* &&
git reset --hard commit-new-file-F3-on-topic-branch &&
- git checkout master &&
+ git checkout main &&
test_commit "commit-new-file-F3" F3 3 &&
test_config rerere.enabled true &&
git update-ref refs/heads/topic commit-new-file-F3-on-topic-branch &&
- test_must_fail git rebase -m master topic &&
+ test_must_fail git rebase -m main topic &&
echo "Resolved" >F2 &&
cp F2 expected-F2 &&
git add F2 &&
@@ -207,7 +210,7 @@
prepare () {
rm -fr .git/rebase-* &&
git reset --hard commit-new-file-F3-on-topic-branch &&
- git checkout master &&
+ git checkout main &&
test_config rerere.enabled true
}
@@ -215,7 +218,7 @@
action=$1 &&
test_expect_success "rebase $action --continue remembers --rerere-autoupdate" '
prepare &&
- test_must_fail git rebase $action --rerere-autoupdate master topic &&
+ test_must_fail git rebase $action --rerere-autoupdate main topic &&
test_cmp expected-F2 F2 &&
git diff-files --quiet &&
test_must_fail git rebase --continue &&
@@ -227,7 +230,7 @@
test_expect_success "rebase $action --continue honors rerere.autoUpdate" '
prepare &&
test_config rerere.autoupdate true &&
- test_must_fail git rebase $action master topic &&
+ test_must_fail git rebase $action main topic &&
test_cmp expected-F2 F2 &&
git diff-files --quiet &&
test_must_fail git rebase --continue &&
@@ -239,7 +242,7 @@
test_expect_success "rebase $action --continue remembers --no-rerere-autoupdate" '
prepare &&
test_config rerere.autoupdate true &&
- test_must_fail git rebase $action --no-rerere-autoupdate master topic &&
+ test_must_fail git rebase $action --no-rerere-autoupdate main topic &&
test_cmp expected-F2 F2 &&
test_must_fail git diff-files --quiet &&
git add F2 &&
diff --git a/t/t3419-rebase-patch-id.sh b/t/t3419-rebase-patch-id.sh
index d934583..295040f 100755
--- a/t/t3419-rebase-patch-id.sh
+++ b/t/t3419-rebase-patch-id.sh
@@ -2,16 +2,10 @@
test_description='git rebase - test patch id computation'
-. ./test-lib.sh
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
-count () {
- i=0
- while test $i -lt $1
- do
- echo "$i"
- i=$(($i+1))
- done
-}
+. ./test-lib.sh
scramble () {
i=0
@@ -26,76 +20,55 @@
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 'setup: 500 lines' '
+ rm -f .gitattributes &&
+ git checkout -q -f main &&
+ git reset --hard root &&
+ test_seq 500 >file &&
+ git add file &&
+ git commit -q -m initial &&
+ git branch -f other &&
- 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" &&
- 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 checkout -q other &&
- : >newfile &&
- git add newfile &&
- git commit -q -m 'add small file' &&
+ git cherry-pick main >/dev/null 2>&1
+'
- git cherry-pick master >/dev/null 2>&1
- "
+test_expect_success 'setup attributes' '
+ echo "file binary" >.gitattributes
+'
- test_debug "
- run git diff master^\!
- "
+test_expect_success 'detect upstream patch' '
+ git checkout -q main &&
+ scramble file &&
+ git add file &&
+ git commit -q -m "change big file again" &&
+ git checkout -q other^{} &&
+ git rebase main &&
+ git rev-list main...HEAD~ >revs &&
+ test_must_be_empty revs
+'
- 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 $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 &&
- git rev-list master...HEAD~ >revs &&
- test_must_be_empty revs
- '
-
- 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 &&
- git rebase --quit
- '
-}
-
-do_tests 500
-do_tests 50000 EXPENSIVE
+test_expect_success 'do not drop patch' '
+ git branch -f squashed main &&
+ 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/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh
index b97ea62..43fcb68 100755
--- a/t/t3420-rebase-autostash.sh
+++ b/t/t3420-rebase-autostash.sh
@@ -4,6 +4,9 @@
#
test_description='git rebase --autostash tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
@@ -21,12 +24,12 @@
git add . &&
test_tick &&
git commit -m "third commit" &&
- git checkout -b unrelated-onto-branch master &&
+ git checkout -b unrelated-onto-branch main &&
echo unrelated >file4 &&
git add . &&
test_tick &&
git commit -m "unrelated commit" &&
- git checkout -b related-onto-branch master &&
+ git checkout -b related-onto-branch main &&
echo conflicting-change >file2 &&
git add . &&
test_tick &&
@@ -107,7 +110,7 @@
fi &&
create_expected_success_$suffix &&
sed "$remove_progress_re" <actual >actual2 &&
- test_i18ncmp expected actual2
+ test_cmp expected actual2
'
test_expect_success "rebase$type: dirty index, non-conflicting rebase" '
@@ -184,6 +187,26 @@
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 &&
@@ -208,7 +231,7 @@
fi &&
create_expected_failure_$suffix &&
sed "$remove_progress_re" <actual >actual2 &&
- test_i18ncmp expected actual2
+ test_cmp expected actual2
'
}
@@ -285,7 +308,7 @@
'
test_expect_success 'autostash with dirty submodules' '
- test_when_finished "git reset --hard && git checkout master" &&
+ test_when_finished "git reset --hard && git checkout main" &&
git checkout -b with-submodule &&
git submodule add ./ sub &&
test_tick &&
@@ -304,7 +327,7 @@
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" &&
+ test_when_finished "git reset --hard && git checkout main" &&
echo changed >file0 &&
git rebase --autostash not-the-feature-branch feature-branch &&
test_cmp_rev not-the-feature-branch unrelated-onto-branch
diff --git a/t/t3421-rebase-topology-linear.sh b/t/t3421-rebase-topology-linear.sh
index cf8dfd6..4a9204b 100755
--- a/t/t3421-rebase-topology-linear.sh
+++ b/t/t3421-rebase-topology-linear.sh
@@ -220,14 +220,13 @@
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 --apply
test_run_rebase success -m
test_run_rebase success -i
test_have_prereq !REBASE_P || test_run_rebase success -p
@@ -242,7 +241,6 @@
test_linear_range 'd k l' j..
"
}
-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
diff --git a/t/t3422-rebase-incompatible-options.sh b/t/t3422-rebase-incompatible-options.sh
index 50e7960..c823406 100755
--- a/t/t3422-rebase-incompatible-options.sh
+++ b/t/t3422-rebase-incompatible-options.sh
@@ -61,8 +61,6 @@
}
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' '
diff --git a/t/t3423-rebase-reword.sh b/t/t3423-rebase-reword.sh
index 6963750..4859bb8 100755
--- a/t/t3423-rebase-reword.sh
+++ b/t/t3423-rebase-reword.sh
@@ -7,7 +7,7 @@
. "$TEST_DIRECTORY"/lib-rebase.sh
test_expect_success 'setup' '
- test_commit master file-1 test &&
+ test_commit main file-1 test &&
git checkout -b stuff &&
@@ -22,7 +22,7 @@
set_fake_editor &&
FAKE_LINES="pick 1 reword 2" FAKE_COMMIT_MESSAGE="feature_b_reworded" \
- git rebase -i -v master &&
+ git rebase -i -v main &&
test "$(git log -1 --format=%B)" = "feature_b_reworded" &&
test $(git rev-list --count HEAD) = 3
@@ -35,7 +35,7 @@
set_fake_editor &&
test_must_fail env FAKE_LINES="reword 2" \
- git rebase -i -v master &&
+ git rebase -i -v main &&
git checkout --theirs file-2 &&
git add file-2 &&
diff --git a/t/t3424-rebase-empty.sh b/t/t3424-rebase-empty.sh
index e1e3051..5e1045a 100755
--- a/t/t3424-rebase-empty.sh
+++ b/t/t3424-rebase-empty.sh
@@ -123,6 +123,42 @@
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 &&
diff --git a/t/t3426-rebase-submodule.sh b/t/t3426-rebase-submodule.sh
index a2bba04..0ad3a07 100755
--- a/t/t3426-rebase-submodule.sh
+++ b/t/t3426-rebase-submodule.sh
@@ -17,10 +17,11 @@
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 @@
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/t/t3427-rebase-subtree.sh b/t/t3427-rebase-subtree.sh
index 79e43a3..e78c7e3 100755
--- a/t/t3427-rebase-subtree.sh
+++ b/t/t3427-rebase-subtree.sh
@@ -4,6 +4,9 @@
This test runs git rebase and tests the subtree strategy.
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-rebase.sh
@@ -15,12 +18,12 @@
# this test script tries to document them. First, the following commit history
# is generated (the onelines are shown, time flows from left to right):
#
-# master1 - master2 - master3
+# topic_1 - topic_2 - topic_3
# \
-# README ---------------------- Add subproject master - master4 - files_subtree/master5
+# README ---------------------- Add subproject main - topic_4 - files_subtree/topic_5
#
-# Where the merge moves the files master[123].t into the subdirectory
-# files_subtree/ and master4 as well as files_subtree/master5 add files to that
+# Where the merge moves the files topic_[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
@@ -28,11 +31,11 @@
# an empty commit is added on top. The pre-rebase commit history looks like
# this:
#
-# Add subproject master - master4 - files_subtree/master5 - Empty commit
+# Add subproject main - topic_4 - files_subtree/topic_5 - Empty commit
#
-# where the root commit adds three files: master1.t, master2.t and master3.t.
+# where the root commit adds three files: topic_1.t, topic_2.t and topic_3.t.
#
-# This commit history is then rebased onto `master3` with the
+# This commit history is then rebased onto `topic_3` with the
# `-Xsubtree=files_subtree` option in three different ways:
#
# 1. using `--preserve-merges`
@@ -43,20 +46,20 @@
test_commit README &&
git init files &&
- test_commit -C files master1 &&
- test_commit -C files master2 &&
- test_commit -C files master3 &&
+ test_commit -C files topic_1 &&
+ test_commit -C files topic_2 &&
+ test_commit -C files topic_3 &&
: perform subtree merge into files_subtree/ &&
- git fetch files refs/heads/master:refs/heads/files-master &&
+ git fetch files refs/heads/main:refs/heads/files-main &&
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" &&
+ files-main &&
+ git read-tree --prefix=files_subtree -u files-main &&
+ git commit -m "Add subproject main" &&
: add two extra commits to rebase &&
- test_commit -C files_subtree master4 &&
- test_commit files_subtree/master5 &&
+ 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/ |
@@ -66,44 +69,44 @@
git commit -m "Empty commit" --allow-empty
'
-# FAILURE: Does not preserve master4.
+# FAILURE: Does not preserve topic_4.
test_expect_failure REBASE_P 'Rebase -Xsubtree --preserve-merges --onto commit' '
reset_rebase &&
git checkout -b rebase-preserve-merges to-rebase &&
- git rebase -Xsubtree=files_subtree --preserve-merges --onto files-master master &&
- verbose test "$(commit_message HEAD~)" = "master4" &&
- verbose test "$(commit_message HEAD)" = "files_subtree/master5"
+ git rebase -Xsubtree=files_subtree --preserve-merges --onto files-main main &&
+ verbose test "$(commit_message HEAD~)" = "topic_4" &&
+ verbose test "$(commit_message HEAD)" = "files_subtree/topic_5"
'
-# FAILURE: Does not preserve master4.
+# 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 to-rebase &&
- git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-master master &&
- verbose test "$(commit_message HEAD~2)" = "master4" &&
- verbose test "$(commit_message HEAD~)" = "files_subtree/master5" &&
+ git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-main main &&
+ verbose test "$(commit_message HEAD~2)" = "topic_4" &&
+ verbose test "$(commit_message HEAD~)" = "files_subtree/topic_5" &&
verbose test "$(commit_message HEAD)" = "Empty commit"
'
test_expect_success 'Rebase -Xsubtree --empty=ask --onto commit' '
reset_rebase &&
git checkout -b rebase-onto to-rebase &&
- test_must_fail git rebase -Xsubtree=files_subtree --empty=ask --onto files-master master &&
+ test_must_fail git rebase -Xsubtree=files_subtree --empty=ask --onto files-main main &&
: first pick results in no changes &&
git rebase --skip &&
- verbose test "$(commit_message HEAD~2)" = "master4" &&
- verbose test "$(commit_message HEAD~)" = "files_subtree/master5" &&
+ verbose test "$(commit_message HEAD~2)" = "topic_4" &&
+ verbose test "$(commit_message HEAD~)" = "files_subtree/topic_5" &&
verbose test "$(commit_message HEAD)" = "Empty commit"
'
test_expect_success 'Rebase -Xsubtree --empty=ask --rebase-merges --onto commit' '
reset_rebase &&
git checkout -b rebase-merges-onto to-rebase &&
- test_must_fail git rebase -Xsubtree=files_subtree --empty=ask --rebase-merges --onto files-master --root &&
+ test_must_fail git rebase -Xsubtree=files_subtree --empty=ask --rebase-merges --onto files-main --root &&
: first pick results in no changes &&
git rebase --skip &&
- verbose test "$(commit_message HEAD~2)" = "master4" &&
- verbose test "$(commit_message HEAD~)" = "files_subtree/master5" &&
+ 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/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh
index a1bc3e2..6748070 100755
--- a/t/t3430-rebase-merges.sh
+++ b/t/t3430-rebase-merges.sh
@@ -12,12 +12,15 @@
-- B -- (first)
/ \
- A - C - D - E - H (master)
+ A - C - D - E - H (main)
\ \ /
\ F - G (second)
\
Conflicting-G
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-rebase.sh
. "$TEST_DIRECTORY"/lib-log-graph.sh
@@ -37,7 +40,7 @@
git checkout -b first &&
test_commit B &&
b=$(git rev-parse --short HEAD) &&
- git checkout master &&
+ git checkout main &&
test_commit C &&
c=$(git rev-parse --short HEAD) &&
test_commit D &&
@@ -52,7 +55,7 @@
f=$(git rev-parse --short HEAD) &&
test_commit G &&
g=$(git rev-parse --short HEAD) &&
- git checkout master &&
+ git checkout main &&
git merge --no-commit G &&
test_tick &&
git commit -m H &&
@@ -82,7 +85,7 @@
EOF
test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
test_tick &&
- git rebase -i -r A master &&
+ git rebase -i -r A main &&
test_cmp_graph <<-\EOF
* Merge the topic branch '\''onebranch'\''
|\
@@ -183,7 +186,7 @@
'
test_expect_success 'with a branch tip that was cherry-picked already' '
- git checkout -b already-upstream master &&
+ git checkout -b already-upstream main &&
base="$(git rev-parse --verify HEAD)" &&
test_commit A1 &&
@@ -211,7 +214,7 @@
'
test_expect_success 'do not rebase cousins unless asked for' '
- git checkout -b cousins master &&
+ git checkout -b cousins main &&
before="$(git rev-parse --verify HEAD)" &&
test_tick &&
git rebase -r HEAD^ &&
@@ -340,7 +343,7 @@
test_expect_success 'A root commit can be a cousin, treat it that way' '
git checkout --orphan khnum &&
test_commit yama &&
- git checkout -b asherah master &&
+ git checkout -b asherah main &&
test_commit shamkat &&
git merge --allow-unrelated-histories khnum &&
test_tick &&
@@ -367,7 +370,7 @@
git checkout -b third B &&
test_commit I &&
third=$(git rev-parse HEAD) &&
- git checkout -b labels master &&
+ git checkout -b labels main &&
git merge --no-commit third &&
test_tick &&
git commit -m "Merge commit '\''$third'\'' into labels" &&
@@ -420,7 +423,7 @@
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 &&
diff --git a/t/t3431-rebase-fork-point.sh b/t/t3431-rebase-fork-point.sh
index 78851b9..4c98d99 100755
--- a/t/t3431-rebase-fork-point.sh
+++ b/t/t3431-rebase-fork-point.sh
@@ -5,13 +5,16 @@
test_description='git rebase --fork-point test'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
-# A---B---D---E (master)
+# A---B---D---E (main)
# \
# C*---F---G (side)
#
-# C was formerly part of master but master was rewound to remove C
+# C was formerly part of main but main was rewound to remove C
#
test_expect_success setup '
test_commit A &&
@@ -26,19 +29,23 @@
test_commit G
'
+do_test_rebase () {
+ expected="$1" &&
+ shift &&
+ git checkout main &&
+ 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 () {
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_expect_success "git rebase $*" "do_test_rebase '$expected' $*"
}
test_rebase 'G F E D B A'
@@ -47,11 +54,62 @@
test_rebase 'G F C E D B A' --no-fork-point
test_rebase 'G F C D B A' --no-fork-point --onto D
test_rebase 'G F C B A' --no-fork-point --keep-base
-test_rebase 'G F E D B A' --fork-point refs/heads/master
-test_rebase 'G F D B A' --fork-point --onto D refs/heads/master
-test_rebase 'G F B A' --fork-point --keep-base refs/heads/master
-test_rebase 'G F C E D B A' refs/heads/master
-test_rebase 'G F C D B A' --onto D refs/heads/master
-test_rebase 'G F C B A' --keep-base refs/heads/master
+
+test_rebase 'G F E D B A' --fork-point refs/heads/main
+test_rebase 'G F E D B A' --fork-point main
+
+test_rebase 'G F D B A' --fork-point --onto D refs/heads/main
+test_rebase 'G F D B A' --fork-point --onto D main
+
+test_rebase 'G F B A' --fork-point --keep-base refs/heads/main
+test_rebase 'G F B A' --fork-point --keep-base main
+
+test_rebase 'G F C E D B A' refs/heads/main
+test_rebase 'G F C E D B A' main
+
+test_rebase 'G F C D B A' --onto D refs/heads/main
+test_rebase 'G F C D B A' --onto D main
+
+test_rebase 'G F C B A' --keep-base refs/heads/main
+test_rebase 'G F C B A' --keep-base main
+
+test_expect_success 'git rebase --fork-point with ambigous refname' '
+ git checkout main &&
+ git checkout -b one &&
+ git checkout side &&
+ git tag one &&
+ test_must_fail git rebase --fork-point --onto D one
+'
+
+test_expect_success '--fork-point and --root both given' '
+ test_must_fail git rebase --fork-point --root 2>err &&
+ test_i18ngrep "cannot combine" err
+'
+
+test_expect_success 'rebase.forkPoint set to false' '
+ test_config rebase.forkPoint false &&
+ do_test_rebase "G F C E D B A"
+'
+
+test_expect_success 'rebase.forkPoint set to false and then to true' '
+ test_config_global rebase.forkPoint false &&
+ test_config rebase.forkPoint true &&
+ do_test_rebase "G F E D B A"
+'
+
+test_expect_success 'rebase.forkPoint set to false and command line says --fork-point' '
+ test_config rebase.forkPoint false &&
+ do_test_rebase "G F E D B A" --fork-point
+'
+
+test_expect_success 'rebase.forkPoint set to true and command line says --no-fork-point' '
+ test_config rebase.forkPoint true &&
+ do_test_rebase "G F C E D B A" --no-fork-point
+'
+
+test_expect_success 'rebase.forkPoint set to true and --root given' '
+ test_config rebase.forkPoint true &&
+ git rebase --root
+'
test_done
diff --git a/t/t3432-rebase-fast-forward.sh b/t/t3432-rebase-fast-forward.sh
index 6c9d4a1..5086e14 100755
--- a/t/t3432-rebase-fast-forward.sh
+++ b/t/t3432-rebase-fast-forward.sh
@@ -5,6 +5,9 @@
test_description='ensure rebase fast-forwards commits when possible'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
@@ -28,10 +31,12 @@
shift &&
cmp_f="$1" &&
shift &&
- test_rebase_same_head_ $status_n $what_n $cmp_n " --apply" "$*" &&
- test_rebase_same_head_ $status_f $what_f $cmp_f " --apply --no-ff" "$*"
- test_rebase_same_head_ $status_n $what_n $cmp_n " --merge" "$*" &&
- test_rebase_same_head_ $status_f $what_f $cmp_f " --merge --no-ff" "$*"
+ test_rebase_same_head_ $status_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_ () {
@@ -41,20 +46,33 @@
shift &&
cmp="$1" &&
shift &&
+ abbreviate="$1" &&
+ shift &&
flag="$1"
shift &&
- test_expect_$status "git rebase$flag $* with $changes is $what with $cmp HEAD" "
+ 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' &&
- cp .git/logs/HEAD expect &&
+ 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 .git/logs/HEAD
+ test_line_count '-gt' \$old actual
elif test $what = noop
then
- test_cmp expect .git/logs/HEAD
+ test_cmp expect actual
fi &&
newhead=\$(git rev-parse HEAD) &&
if test $cmp = same
@@ -69,19 +87,19 @@
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 same main
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 --onto main... main
+test_rebase_same_head success noop same success work same --keep-base main
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 same --fork-point main
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_rebase_same_head success noop same success work same --fork-point --onto main... main
+test_rebase_same_head success noop same success work same --keep-base --keep-base main
test_expect_success 'add work same to side' '
test_commit E
@@ -89,22 +107,22 @@
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 same main
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 --onto main... main
+test_rebase_same_head success noop same success work same --keep-base main
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 same --fork-point main
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_rebase_same_head success noop same success work same --fork-point --onto main... main
+test_rebase_same_head success noop same success work same --fork-point --keep-base main
test_expect_success 'add work same to upstream' '
- git checkout master &&
+ git checkout main &&
test_commit F &&
git checkout side
'
@@ -112,12 +130,12 @@
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 --onto main... main
+test_rebase_same_head success noop same success work diff --keep-base main
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_rebase_same_head success noop same success work diff --fork-point --onto main... main
+test_rebase_same_head success noop same success work diff --fork-point --keep-base main
test_done
diff --git a/t/t3434-rebase-i18n.sh b/t/t3434-rebase-i18n.sh
index c7c835c..e6fef69 100755
--- a/t/t3434-rebase-i18n.sh
+++ b/t/t3434-rebase-i18n.sh
@@ -7,13 +7,16 @@
Initial setup:
-1 - 2 master
+1 - 2 main
\
3 - 4 first
\
5 - 6 second
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
compare_msg () {
@@ -41,7 +44,7 @@
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 &&
+ git rebase --rebase-merges main &&
compare_msg eucJP.txt eucJP UTF-8
'
@@ -50,7 +53,7 @@
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 &&
+ git rebase --rebase-merges main &&
compare_msg eucJP.txt eucJP ISO-2022-JP
'
@@ -66,7 +69,7 @@
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_must_fail git rebase -m main &&
test -f .git/rebase-merge/message &&
git stripspace <.git/rebase-merge/message >two.t &&
git add two.t &&
diff --git a/t/t3435-rebase-gpg-sign.sh b/t/t3435-rebase-gpg-sign.sh
new file mode 100755
index 0000000..ec10766
--- /dev/null
+++ b/t/t3435-rebase-gpg-sign.sh
@@ -0,0 +1,130 @@
+#!/bin/sh
+#
+# Copyright (c) 2020 Doan Tran Cong Danh
+#
+
+test_description='test rebase --[no-]gpg-sign'
+
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./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 main &&
+ 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 main &&
+ test_must_fail git verify-commit HEAD
+'
+
+test_expect_success 'rebase -r, merge strategy, --gpg-sign will sign commit' '
+ git reset --hard merged &&
+ test_unconfig commit.gpgsign &&
+ git rebase -fr --gpg-sign -s resolve --root &&
+ git verify-commit HEAD
+'
+
+test_expect_success 'rebase -r, merge strategy, commit.gpgsign=true will sign commit' '
+ git reset --hard merged &&
+ git config commit.gpgsign true &&
+ git rebase -fr -s resolve --root &&
+ git verify-commit HEAD
+'
+
+test_expect_success 'rebase -r, merge strategy, commit.gpgsign=false --gpg-sign will sign commit' '
+ git reset --hard merged &&
+ git config commit.gpgsign false &&
+ git rebase -fr --gpg-sign -s resolve --root &&
+ git verify-commit HEAD
+'
+
+test_expect_success "rebase -r, merge strategy, commit.gpgsign=true --no-gpg-sign won't sign commit" '
+ git reset --hard merged &&
+ git config commit.gpgsign true &&
+ git rebase -fr --no-gpg-sign -s resolve --root &&
+ test_must_fail git verify-commit HEAD
+'
+
+test_expect_success 'rebase -r --gpg-sign will sign commit' '
+ git reset --hard merged &&
+ test_unconfig commit.gpgsign &&
+ git rebase -fr --gpg-sign --root &&
+ git verify-commit HEAD
+'
+
+test_expect_success 'rebase -r with commit.gpgsign=true will sign commit' '
+ git reset --hard merged &&
+ git config commit.gpgsign true &&
+ git rebase -fr --root &&
+ git verify-commit HEAD
+'
+
+test_expect_success 'rebase -r --gpg-sign with commit.gpgsign=false will sign commit' '
+ git reset --hard merged &&
+ git config commit.gpgsign false &&
+ git rebase -fr --gpg-sign --root &&
+ git verify-commit HEAD
+'
+
+test_expect_success "rebase -r --no-gpg-sign with commit.gpgsign=true won't sign commit" '
+ git reset --hard merged &&
+ git config commit.gpgsign true &&
+ git rebase -fr --no-gpg-sign --root &&
+ test_must_fail git verify-commit HEAD
+'
+
+test_done
diff --git a/t/t3436-rebase-more-options.sh b/t/t3436-rebase-more-options.sh
new file mode 100755
index 0000000..4d10664
--- /dev/null
+++ b/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 main &&
+ 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/t/t3500-cherry.sh b/t/t3500-cherry.sh
index f038f34..0458a58 100755
--- a/t/t3500-cherry.sh
+++ b/t/t3500-cherry.sh
@@ -5,9 +5,12 @@
test_description='git cherry should detect patches integrated upstream
-This test cherry-picks one local change of two into master branch, and
+This test cherry-picks one local change of two into main branch, and
checks that git cherry only returns the second patch in the local branch
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
GIT_AUTHOR_EMAIL=bogus_email_address
@@ -32,7 +35,7 @@
test_tick &&
git commit -m "Add C." &&
- git checkout -f master &&
+ git checkout -f main &&
rm -f B C &&
echo Third >> A &&
@@ -40,19 +43,42 @@
test_tick &&
git commit -m "Modify A." &&
- expr "$(echo $(git cherry master my-topic-branch) )" : "+ [^ ]* + .*"
+ expr "$(echo $(git cherry main my-topic-branch) )" : "+ [^ ]* + .*"
'
test_expect_success \
'check that cherry with limit returns only the top patch'\
- 'expr "$(echo $(git cherry master my-topic-branch my-topic-branch^1) )" : "+ [^ ]*"
+ 'expr "$(echo $(git cherry main my-topic-branch my-topic-branch^1) )" : "+ [^ ]*"
'
test_expect_success \
'cherry-pick one of the 2 patches, and check cherry recognized one and only one as new' \
'git cherry-pick my-topic-branch^0 &&
- echo $(git cherry master my-topic-branch) &&
- expr "$(echo $(git cherry master my-topic-branch) )" : "+ [^ ]* - .*"
+ echo $(git cherry main my-topic-branch) &&
+ expr "$(echo $(git cherry main 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/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh
index 7c1da21..9d100cd 100755
--- a/t/t3501-revert-cherry-pick.sh
+++ b/t/t3501-revert-cherry-pick.sh
@@ -10,6 +10,9 @@
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
@@ -47,7 +50,7 @@
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 +59,7 @@
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' '
@@ -112,7 +115,7 @@
test_expect_success 'cherry-pick "-" to pick from previous branch' '
git checkout unborn &&
test_commit to-pick actual content &&
- git checkout master &&
+ git checkout main &&
git cherry-pick - &&
echo content >expect &&
test_cmp expect actual
@@ -132,7 +135,7 @@
test_expect_success 'cherry-pick "-" works with arguments' '
git checkout -b side-branch &&
test_commit change actual change &&
- git checkout master &&
+ git checkout main &&
git cherry-pick -s - &&
echo "Signed-off-by: C O Mitter <committer@example.com>" >expect &&
git cat-file commit HEAD | grep ^Signed-off-by: >signoff &&
diff --git a/t/t3502-cherry-pick-merge.sh b/t/t3502-cherry-pick-merge.sh
index 8b635a1..5495eac 100755
--- a/t/t3502-cherry-pick-merge.sh
+++ b/t/t3502-cherry-pick-merge.sh
@@ -8,6 +8,9 @@
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
@@ -25,7 +28,7 @@
echo new line >B &&
git commit -m "add line to B" B &&
git tag b &&
- git checkout master &&
+ git checkout main &&
git merge side &&
git tag c
diff --git a/t/t3503-cherry-pick-root.sh b/t/t3503-cherry-pick-root.sh
index e27f39d..95fe4fe 100755
--- a/t/t3503-cherry-pick-root.sh
+++ b/t/t3503-cherry-pick-root.sh
@@ -2,6 +2,9 @@
test_description='test cherry-picking (and reverting) a root commit'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
@@ -30,7 +33,7 @@
test_expect_success 'cherry-pick a root commit' '
git checkout second^0 &&
- git cherry-pick master &&
+ git cherry-pick main &&
echo first >expect &&
test_cmp expect file1
@@ -38,14 +41,14 @@
test_expect_success 'revert a root commit' '
- git revert master &&
+ git revert main &&
test_path_is_missing file1
'
test_expect_success 'cherry-pick a root commit with an external strategy' '
- git cherry-pick --strategy=resolve master &&
+ git cherry-pick --strategy=resolve main &&
echo first >expect &&
test_cmp expect file1
@@ -53,7 +56,7 @@
test_expect_success 'revert a root commit with an external strategy' '
- git revert --strategy=resolve master &&
+ git revert --strategy=resolve main &&
test_path_is_missing file1
'
@@ -65,7 +68,7 @@
echo third >expect.file3 &&
git checkout second^0 &&
- git cherry-pick master third &&
+ git cherry-pick main third &&
test_cmp expect.file1 file1 &&
test_cmp expect.file2 file2 &&
diff --git a/t/t3504-cherry-pick-rerere.sh b/t/t3504-cherry-pick-rerere.sh
index 80a0d08..4581ae9 100755
--- a/t/t3504-cherry-pick-rerere.sh
+++ b/t/t3504-cherry-pick-rerere.sh
@@ -2,12 +2,15 @@
test_description='cherry-pick should rerere for conflicts'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
test_commit foo &&
- test_commit foo-master foo &&
- test_commit bar-master bar &&
+ test_commit foo-main foo &&
+ test_commit bar-main bar &&
git checkout -b dev foo &&
test_commit foo-dev foo &&
@@ -16,7 +19,7 @@
'
test_expect_success 'conflicting merge' '
- test_must_fail git merge master
+ test_must_fail git merge main
'
test_expect_success 'fixup' '
@@ -29,7 +32,7 @@
'
test_expect_success 'cherry-pick conflict with --rerere-autoupdate' '
- test_must_fail git cherry-pick --rerere-autoupdate foo..bar-master &&
+ test_must_fail git cherry-pick --rerere-autoupdate foo..bar-main &&
test_cmp foo-expect foo &&
git diff-files --quiet &&
test_must_fail git cherry-pick --continue &&
@@ -41,7 +44,7 @@
test_expect_success 'cherry-pick conflict repsects rerere.autoUpdate' '
test_config rerere.autoUpdate true &&
- test_must_fail git cherry-pick foo..bar-master &&
+ test_must_fail git cherry-pick foo..bar-main &&
test_cmp foo-expect foo &&
git diff-files --quiet &&
test_must_fail git cherry-pick --continue &&
@@ -53,7 +56,7 @@
test_expect_success 'cherry-pick conflict with --no-rerere-autoupdate' '
test_config rerere.autoUpdate true &&
- test_must_fail git cherry-pick --no-rerere-autoupdate foo..bar-master &&
+ test_must_fail git cherry-pick --no-rerere-autoupdate foo..bar-main &&
test_cmp foo-expect foo &&
test_must_fail git diff-files --quiet &&
git add foo &&
@@ -66,38 +69,38 @@
'
test_expect_success 'cherry-pick --continue rejects --rerere-autoupdate' '
- test_must_fail git cherry-pick --rerere-autoupdate foo..bar-master &&
+ test_must_fail git cherry-pick --rerere-autoupdate foo..bar-main &&
test_cmp foo-expect foo &&
git diff-files --quiet &&
test_must_fail git cherry-pick --continue --rerere-autoupdate >actual 2>&1 &&
echo "fatal: cherry-pick: --rerere-autoupdate cannot be used with --continue" >expect &&
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
test_must_fail git cherry-pick --continue --no-rerere-autoupdate >actual 2>&1 &&
echo "fatal: cherry-pick: --no-rerere-autoupdate cannot be used with --continue" >expect &&
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
git cherry-pick --abort
'
test_expect_success 'cherry-pick --rerere-autoupdate more than once' '
- test_must_fail git cherry-pick --rerere-autoupdate --rerere-autoupdate foo..bar-master &&
+ test_must_fail git cherry-pick --rerere-autoupdate --rerere-autoupdate foo..bar-main &&
test_cmp foo-expect foo &&
git diff-files --quiet &&
git cherry-pick --abort &&
- test_must_fail git cherry-pick --rerere-autoupdate --no-rerere-autoupdate --rerere-autoupdate foo..bar-master &&
+ test_must_fail git cherry-pick --rerere-autoupdate --no-rerere-autoupdate --rerere-autoupdate foo..bar-main &&
test_cmp foo-expect foo &&
git diff-files --quiet &&
git cherry-pick --abort &&
- test_must_fail git cherry-pick --rerere-autoupdate --no-rerere-autoupdate foo..bar-master &&
+ test_must_fail git cherry-pick --rerere-autoupdate --no-rerere-autoupdate foo..bar-main &&
test_must_fail git diff-files --quiet &&
git cherry-pick --abort
'
test_expect_success 'cherry-pick conflict without rerere' '
test_config rerere.enabled false &&
- test_must_fail git cherry-pick foo-master &&
+ test_must_fail git cherry-pick foo-main &&
grep ===== foo &&
grep foo-dev foo &&
- grep foo-master foo
+ grep foo-main foo
'
test_done
diff --git a/t/t3505-cherry-pick-empty.sh b/t/t3505-cherry-pick-empty.sh
index 5f911bb..eba3c38 100755
--- a/t/t3505-cherry-pick-empty.sh
+++ b/t/t3505-cherry-pick-empty.sh
@@ -2,6 +2,9 @@
test_description='test cherry-picking an empty commit'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
@@ -17,7 +20,7 @@
test_tick &&
git commit --allow-empty-message -m "" &&
- git checkout master &&
+ git checkout main &&
git checkout -b empty-change-branch &&
test_tick &&
git commit --allow-empty -m "empty"
@@ -25,7 +28,7 @@
'
test_expect_success 'cherry-pick an empty commit' '
- git checkout master &&
+ git checkout main &&
test_expect_code 1 git cherry-pick empty-change-branch
'
@@ -35,7 +38,7 @@
test_expect_success 'cherry-pick a commit with an empty message' '
test_when_finished "git reset --hard empty-message-branch~1" &&
- git checkout master &&
+ git checkout main &&
git cherry-pick empty-message-branch
'
@@ -44,12 +47,12 @@
'
test_expect_success 'cherry-pick a commit with an empty message with --allow-empty-message' '
- git checkout -f master &&
+ git checkout -f main &&
git cherry-pick --allow-empty-message empty-message-branch
'
test_expect_success 'cherry pick an empty non-ff commit without --allow-empty' '
- git checkout master &&
+ git checkout main &&
echo fourth >>file2 &&
git add file2 &&
git commit -m "fourth" &&
@@ -57,22 +60,22 @@
'
test_expect_success 'cherry pick an empty non-ff commit with --allow-empty' '
- git checkout master &&
+ git checkout main &&
git cherry-pick --allow-empty empty-change-branch
'
test_expect_success 'cherry pick with --keep-redundant-commits' '
- git checkout master &&
+ git checkout main &&
git cherry-pick --keep-redundant-commits HEAD^
'
test_expect_success 'cherry-pick a commit that becomes no-op (prep)' '
- git checkout master &&
+ git checkout main &&
git branch fork &&
echo foo >file2 &&
git add file2 &&
test_tick &&
- git commit -m "add file2 on master" &&
+ git commit -m "add file2 on main" &&
git checkout fork &&
echo foo >file2 &&
@@ -84,15 +87,15 @@
test_expect_success 'cherry-pick a no-op without --keep-redundant' '
git reset --hard &&
git checkout fork^0 &&
- test_must_fail git cherry-pick master
+ test_must_fail git cherry-pick main
'
test_expect_success 'cherry-pick a no-op with --keep-redundant' '
git reset --hard &&
git checkout fork^0 &&
- git cherry-pick --keep-redundant-commits master &&
+ git cherry-pick --keep-redundant-commits main &&
git show -s --format=%s >actual &&
- echo "add file2 on master" >expect &&
+ echo "add file2 on main" >expect &&
test_cmp expect actual
'
diff --git a/t/t3506-cherry-pick-ff.sh b/t/t3506-cherry-pick-ff.sh
index 9d5adbc..7e11bd4 100755
--- a/t/t3506-cherry-pick-ff.sh
+++ b/t/t3506-cherry-pick-ff.sh
@@ -2,6 +2,9 @@
test_description='test cherry-picking with --ff option'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
@@ -24,7 +27,7 @@
'
test_expect_success 'cherry-pick using --ff fast forwards' '
- git checkout master &&
+ git checkout main &&
git reset --hard first &&
test_tick &&
git cherry-pick --ff second &&
@@ -32,7 +35,7 @@
'
test_expect_success 'cherry-pick not using --ff does not fast forwards' '
- git checkout master &&
+ git checkout main &&
git reset --hard first &&
test_tick &&
git cherry-pick second &&
@@ -49,7 +52,7 @@
# (This has been taken from t3502-cherry-pick-merge.sh)
#
test_expect_success 'merge setup' '
- git checkout master &&
+ git checkout main &&
git reset --hard first &&
echo new line >A &&
git add A &&
@@ -62,7 +65,7 @@
test_tick &&
git commit -m "add line to B" B &&
git tag B &&
- git checkout master &&
+ git checkout main &&
git merge side &&
git tag C &&
git checkout -b new A
diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh
index 9bd482c..014001b 100755
--- a/t/t3507-cherry-pick-conflict.sh
+++ b/t/t3507-cherry-pick-conflict.sh
@@ -9,6 +9,9 @@
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
pristine_detach () {
@@ -29,7 +32,7 @@
test_commit redundant-pick foo c redundant &&
git commit --allow-empty --allow-empty-message &&
git tag empty &&
- git checkout master &&
+ git checkout main &&
git config advice.detachedhead false
'
@@ -56,7 +59,7 @@
EOF
test_must_fail git cherry-pick picked 2>actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
"
test_expect_success 'advice from failed cherry-pick --no-commit' "
@@ -70,7 +73,7 @@
EOF
test_must_fail git cherry-pick --no-commit picked 2>actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
"
test_expect_success 'failed cherry-pick sets CHERRY_PICK_HEAD' '
@@ -161,6 +164,29 @@
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 &&
@@ -230,7 +256,7 @@
test_must_fail git cherry-pick picked &&
- test_i18ncmp expected .git/MERGE_MSG
+ test_cmp expected .git/MERGE_MSG
'
test_expect_success \
@@ -250,7 +276,7 @@
test_must_fail git cherry-pick --cleanup=scissors picked &&
- test_i18ncmp expected .git/MERGE_MSG
+ test_cmp expected .git/MERGE_MSG
'
test_expect_success 'failed cherry-pick describes conflict in work tree' '
@@ -260,12 +286,12 @@
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 +301,16 @@
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 +322,7 @@
a
=======
b
- >>>>>>> parent of objid picked
+ >>>>>>> parent of objid (picked)
EOF
{
git checkout picked -- foo &&
@@ -322,7 +348,7 @@
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
'
@@ -406,16 +432,16 @@
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
'
@@ -439,7 +465,7 @@
test_must_fail git revert picked &&
sed "s/$OID_REGEX/OBJID/" .git/MERGE_MSG >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success \
@@ -462,7 +488,7 @@
test_must_fail git revert --cleanup=scissors picked &&
sed "s/$OID_REGEX/OBJID/" .git/MERGE_MSG >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'failed cherry-pick does not forget -s' '
@@ -489,7 +515,7 @@
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 +544,7 @@
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/t/t3508-cherry-pick-many-commits.sh b/t/t3508-cherry-pick-many-commits.sh
index 23070a7..e8375d1 100755
--- a/t/t3508-cherry-pick-many-commits.sh
+++ b/t/t3508-cherry-pick-many-commits.sh
@@ -2,6 +2,9 @@
test_description='test cherry-picking many commits'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
check_head_differs_from() {
@@ -31,7 +34,7 @@
'
test_expect_success 'cherry-pick first..fourth works' '
- git checkout -f master &&
+ git checkout -f main &&
git reset --hard first &&
test_tick &&
git cherry-pick first..fourth &&
@@ -45,7 +48,7 @@
test_commit one &&
test_commit two &&
test_commit three &&
- git checkout -f master &&
+ git checkout -f main &&
git reset --hard first &&
git cherry-pick three one two &&
git diff --quiet three &&
@@ -56,38 +59,38 @@
'
test_expect_success 'cherry-pick three one two: fails' '
- git checkout -f master &&
+ git checkout -f main &&
git reset --hard first &&
test_must_fail git cherry-pick three one two:
'
test_expect_success 'output to keep user entertained during multi-pick' '
cat <<-\EOF >expected &&
- [master OBJID] second
+ [main OBJID] second
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:14:13 2005 -0700
1 file changed, 1 insertion(+)
- [master OBJID] third
+ [main OBJID] third
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:15:13 2005 -0700
1 file changed, 1 insertion(+)
- [master OBJID] fourth
+ [main OBJID] fourth
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:16:13 2005 -0700
1 file changed, 1 insertion(+)
EOF
- git checkout -f master &&
+ git checkout -f main &&
git reset --hard first &&
test_tick &&
git cherry-pick first..fourth >actual &&
sed -e "s/$_x05[0-9a-f][0-9a-f]/OBJID/" <actual >actual.fuzzy &&
test_line_count -ge 3 actual.fuzzy &&
- test_i18ncmp expected actual.fuzzy
+ test_cmp expected actual.fuzzy
'
test_expect_success 'cherry-pick --strategy resolve first..fourth works' '
- git checkout -f master &&
+ git checkout -f main &&
git reset --hard first &&
test_tick &&
git cherry-pick --strategy resolve first..fourth &&
@@ -99,32 +102,32 @@
test_expect_success 'output during multi-pick indicates merge strategy' '
cat <<-\EOF >expected &&
Trying simple merge.
- [master OBJID] second
+ [main OBJID] second
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:14:13 2005 -0700
1 file changed, 1 insertion(+)
Trying simple merge.
- [master OBJID] third
+ [main OBJID] third
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:15:13 2005 -0700
1 file changed, 1 insertion(+)
Trying simple merge.
- [master OBJID] fourth
+ [main OBJID] fourth
Author: A U Thor <author@example.com>
Date: Thu Apr 7 15:16:13 2005 -0700
1 file changed, 1 insertion(+)
EOF
- git checkout -f master &&
+ git checkout -f main &&
git reset --hard first &&
test_tick &&
git cherry-pick --strategy resolve first..fourth >actual &&
sed -e "s/$_x05[0-9a-f][0-9a-f]/OBJID/" <actual >actual.fuzzy &&
- test_i18ncmp expected actual.fuzzy
+ test_cmp expected actual.fuzzy
'
test_expect_success 'cherry-pick --ff first..fourth works' '
- git checkout -f master &&
+ git checkout -f main &&
git reset --hard first &&
test_tick &&
git cherry-pick --ff first..fourth &&
@@ -134,7 +137,7 @@
'
test_expect_success 'cherry-pick -n first..fourth works' '
- git checkout -f master &&
+ git checkout -f main &&
git reset --hard first &&
test_tick &&
git cherry-pick -n first..fourth &&
@@ -144,7 +147,7 @@
'
test_expect_success 'revert first..fourth works' '
- git checkout -f master &&
+ git checkout -f main &&
git reset --hard fourth &&
test_tick &&
git revert first..fourth &&
@@ -154,7 +157,7 @@
'
test_expect_success 'revert ^first fourth works' '
- git checkout -f master &&
+ git checkout -f main &&
git reset --hard fourth &&
test_tick &&
git revert ^first fourth &&
@@ -164,7 +167,7 @@
'
test_expect_success 'revert fourth fourth~1 fourth~2 works' '
- git checkout -f master &&
+ git checkout -f main &&
git reset --hard fourth &&
test_tick &&
git revert fourth fourth~1 fourth~2 &&
@@ -174,7 +177,7 @@
'
test_expect_success 'cherry-pick -3 fourth works' '
- git checkout -f master &&
+ git checkout -f main &&
git reset --hard first &&
test_tick &&
git cherry-pick -3 fourth &&
@@ -184,7 +187,7 @@
'
test_expect_success 'cherry-pick --stdin works' '
- git checkout -f master &&
+ git checkout -f main &&
git reset --hard first &&
test_tick &&
git rev-list --reverse first..fourth | git cherry-pick --stdin &&
diff --git a/t/t3509-cherry-pick-merge-df.sh b/t/t3509-cherry-pick-merge-df.sh
index 1e5b394..f415924 100755
--- a/t/t3509-cherry-pick-merge-df.sh
+++ b/t/t3509-cherry-pick-merge-df.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='Test cherry-pick with directory/file conflicts'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'Initialize repository' '
@@ -28,7 +31,7 @@
test_expect_success 'Cherry-pick succeeds with rename across D/F conflicts' '
git reset --hard &&
- git checkout master^0 &&
+ git checkout main^0 &&
git cherry-pick branch
'
diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh
index 793bcc7..b76cb6d 100755
--- a/t/t3510-cherry-pick-sequence.sh
+++ b/t/t3510-cherry-pick-sequence.sh
@@ -123,7 +123,8 @@
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
'
@@ -169,7 +170,7 @@
git commit -a &&
test_path_is_missing .git/CHERRY_PICK_HEAD &&
test_must_fail git cherry-pick --skip 2>advice &&
- test_i18ncmp expect advice
+ test_cmp expect advice
'
test_expect_success 'selectively advise --skip while launching another sequence' '
@@ -181,7 +182,7 @@
EOF
test_must_fail git cherry-pick picked..yetanotherpick &&
test_must_fail git cherry-pick picked..yetanotherpick 2>advice &&
- test_i18ncmp expect advice &&
+ test_cmp expect advice &&
cat >expect <<-EOF &&
error: cherry-pick is already in progress
hint: try "git cherry-pick (--continue | --abort | --quit)"
@@ -189,7 +190,7 @@
EOF
git reset --merge &&
test_must_fail git cherry-pick picked..yetanotherpick 2>advice &&
- test_i18ncmp expect advice
+ test_cmp expect advice
'
test_expect_success 'allow skipping commit but not abort for a new history' '
@@ -203,7 +204,7 @@
test_must_fail git cherry-pick anotherpick &&
test_must_fail git cherry-pick --abort 2>advice &&
git cherry-pick --skip &&
- test_i18ncmp expect advice
+ test_cmp expect advice
'
test_expect_success 'allow skipping stopped cherry-pick because of untracked file modifications' '
diff --git a/t/t3512-cherry-pick-submodule.sh b/t/t3512-cherry-pick-submodule.sh
index bd78287..822f2d4 100755
--- a/t/t3512-cherry-pick-submodule.sh
+++ b/t/t3512-cherry-pick-submodule.sh
@@ -2,12 +2,15 @@
test_description='cherry-pick can handle submodules'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-submodule-update.sh
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 &&
@@ -35,7 +38,7 @@
git add a_file &&
git commit -m "modify a file" &&
- git checkout master &&
+ git checkout main &&
git submodule add ../sub sub &&
git submodule update sub &&
diff --git a/t/t3513-revert-submodule.sh b/t/t3513-revert-submodule.sh
index 5e39fcd..a759f12 100755
--- a/t/t3513-revert-submodule.sh
+++ b/t/t3513-revert-submodule.sh
@@ -15,7 +15,12 @@
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 @@
}
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/t/t3514-cherry-pick-revert-gpg.sh b/t/t3514-cherry-pick-revert-gpg.sh
new file mode 100755
index 0000000..5b2e250
--- /dev/null
+++ b/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/t/t3600-rm.sh b/t/t3600-rm.sh
index f2c0168..bb9ef35 100755
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@ -5,6 +5,9 @@
test_description='Test of the various options to git rm.'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
# Setup some files to be removed, some with funny characters
@@ -240,8 +243,7 @@
test_path_is_missing frotz/nitfol
'
-test_expect_success 'choking "git rm" should not let it die with cruft' '
- test_oid_init &&
+choke_git_rm_setup() {
git reset -q --hard &&
test_when_finished "rm -f .git/index.lock && git reset -q --hard" &&
i=0 &&
@@ -250,12 +252,24 @@
do
echo "100644 $hash 0 some-file-$i"
i=$(( $i + 1 ))
- done | git update-index --index-info &&
+ done | git update-index --index-info
+}
+
+test_expect_success 'choking "git rm" should not let it die with cruft (induce SIGPIPE)' '
+ choke_git_rm_setup &&
# git command is intentionally placed upstream of pipe to induce SIGPIPE
git rm -n "some-file-*" | : &&
test_path_is_missing .git/index.lock
'
+
+test_expect_success !MINGW 'choking "git rm" should not let it die with cruft (induce and check SIGPIPE)' '
+ choke_git_rm_setup &&
+ OUT=$( ((trap "" PIPE; git rm -n "some-file-*"; echo $? 1>&3) | :) 3>&1 ) &&
+ test_match_signal 13 "$OUT" &&
+ test_path_is_missing .git/index.lock
+'
+
test_expect_success 'Resolving by removal is not a warning-worthy event' '
git reset -q --hard &&
test_when_finished "rm -f .git/index.lock msg && git reset -q --hard" &&
@@ -440,7 +454,7 @@
git add .gitmodules &&
echo "warning: Could not find section in .gitmodules where path=submod" >expect.err &&
git rm submod >actual 2>actual.err &&
- test_i18ncmp expect.err actual.err &&
+ test_cmp expect.err actual.err &&
test_path_is_missing submod &&
test_path_is_missing submod/.git &&
git status -s -uno >actual &&
@@ -484,16 +498,16 @@
echo 1 >nitfol &&
git add nitfol &&
git commit -m "added nitfol 1" &&
- git checkout -b branch2 master &&
+ git checkout -b branch2 main &&
echo 2 >nitfol &&
git add nitfol &&
git commit -m "added nitfol 2" &&
- git checkout -b conflict1 master &&
+ git checkout -b conflict1 main &&
git -C submod fetch &&
git -C submod checkout branch1 &&
git add submod &&
git commit -m "submod 1" &&
- git checkout -b conflict2 master &&
+ git checkout -b conflict2 main &&
git -C submod checkout branch2 &&
git add submod &&
git commit -m "submod 2"
@@ -605,7 +619,7 @@
'
test_expect_success 'rm of a populated submodule with a .git directory migrates git dir' '
- git checkout -f master &&
+ git checkout -f main &&
git reset --hard &&
git submodule update &&
(
@@ -718,7 +732,7 @@
git checkout HEAD^ &&
git submodule update &&
git checkout -q HEAD^ &&
- git checkout -q master 2>actual &&
+ git checkout -q main 2>actual &&
test_i18ngrep "^warning: unable to rmdir '\''submod'\'':" actual &&
git status -s submod >actual &&
echo "?? submod/" >expected &&
@@ -810,7 +824,7 @@
echo content1 >foo.txt &&
echo content1 >bar.txt &&
test_must_fail git rm foo.txt bar.txt 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'rm files with different staged content without hints' '
@@ -823,7 +837,7 @@
echo content2 >foo.txt &&
echo content2 >bar.txt &&
test_must_fail git -c advice.rmhints=false rm foo.txt bar.txt 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'rm file with local modification' '
@@ -835,7 +849,7 @@
git commit -m "testing rm 3" &&
echo content3 >foo.txt &&
test_must_fail git rm foo.txt 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'rm file with local modification without hints' '
@@ -845,7 +859,7 @@
EOF
echo content4 >bar.txt &&
test_must_fail git -c advice.rmhints=false rm bar.txt 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'rm file with changes in the index' '
@@ -858,7 +872,7 @@
echo content5 >foo.txt &&
git add foo.txt &&
test_must_fail git rm foo.txt 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'rm file with changes in the index without hints' '
@@ -867,7 +881,7 @@
foo.txt
EOF
test_must_fail git -c advice.rmhints=false rm foo.txt 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'rm files with two different errors' '
@@ -886,7 +900,7 @@
echo content6 >bar1.txt &&
git add bar1.txt &&
test_must_fail git rm bar1.txt foo1.txt 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'rm empty string should fail' '
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index 88bc7998..b3b122f 100755
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -192,7 +192,7 @@
test_must_be_empty actual &&
git diff-files --name-only >actual &&
- ! grep bar actual&&
+ ! grep bar actual &&
grep baz actual
'
@@ -304,7 +304,7 @@
error: '"'empty/'"' does not have a commit checked out
fatal: adding files failed
EOF
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'git add --dry-run of existing changed file' "
@@ -320,7 +320,7 @@
test_expect_success 'git add --dry-run of an existing file output' "
echo \"fatal: pathspec 'ignored-file' did not match any files\" >expect &&
- test_i18ncmp expect actual
+ test_cmp expect actual
"
cat >expect.err <<\EOF
@@ -339,8 +339,8 @@
'
test_expect_success 'git add --dry-run --ignore-missing of non-existing file output' '
- test_i18ncmp expect.out actual.out &&
- test_i18ncmp expect.err actual.err
+ test_cmp expect.out actual.out &&
+ test_cmp expect.err actual.err
'
test_expect_success 'git add empty string should fail' '
@@ -386,6 +386,36 @@
! test -x foo4
'
+test_expect_success 'git add --chmod fails with non regular files (but updates the other paths)' '
+ git reset --hard &&
+ test_ln_s_add foo foo3 &&
+ touch foo4 &&
+ test_must_fail git add --chmod=+x foo3 foo4 2>stderr &&
+ test_i18ngrep "cannot chmod +x .foo3." stderr &&
+ test_mode_in_index 120000 foo3 &&
+ test_mode_in_index 100755 foo4
+'
+
+test_expect_success 'git add --chmod honors --dry-run' '
+ git reset --hard &&
+ echo foo >foo4 &&
+ git add foo4 &&
+ git add --chmod=+x --dry-run foo4 &&
+ test_mode_in_index 100644 foo4
+'
+
+test_expect_success 'git add --chmod --dry-run reports error for non regular files' '
+ git reset --hard &&
+ test_ln_s_add foo foo4 &&
+ test_must_fail git add --chmod=+x --dry-run foo4 2>stderr &&
+ test_i18ngrep "cannot chmod +x .foo4." stderr
+'
+
+test_expect_success 'git add --chmod --dry-run reports error for unmatched pathspec' '
+ test_must_fail git add --chmod=+x --dry-run nonexistent 2>stderr &&
+ test_i18ngrep "pathspec .nonexistent. did not match any files" stderr
+'
+
test_expect_success 'no file status change if no pathspec is given' '
>foo5 &&
>foo6 &&
@@ -409,11 +439,17 @@
'
test_expect_success 'all statuses changed in folder if . is given' '
- rm -fr empty &&
- git add --chmod=+x . &&
- test $(git ls-files --stage | grep ^100644 | wc -l) -eq 0 &&
- git add --chmod=-x . &&
- test $(git ls-files --stage | grep ^100755 | wc -l) -eq 0
+ git init repo &&
+ (
+ cd repo &&
+ mkdir -p sub/dir &&
+ touch x y z sub/a sub/dir/b &&
+ git add -A &&
+ git add --chmod=+x . &&
+ test $(git ls-files --stage | grep ^100644 | wc -l) -eq 0 &&
+ git add --chmod=-x . &&
+ test $(git ls-files --stage | grep ^100755 | wc -l) -eq 0
+ )
'
test_expect_success CASE_INSENSITIVE_FS 'path is case-insensitive' '
diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index 5bae6e5..2077146 100755
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='add -i basic tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-terminal.sh
@@ -31,7 +34,16 @@
# indicates a dumb terminal, so we set that variable, too.
force_color () {
- env GIT_PAGER_IN_USE=true TERM=vt100 "$@"
+ # 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)' '
@@ -358,7 +370,7 @@
'
# Test splitting the first patch, then adding both
-test_expect_success C_LOCALE_OUTPUT 'add first line works' '
+test_expect_success '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 |
@@ -412,6 +424,25 @@
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 &&
@@ -521,8 +552,8 @@
test_commit non-conflict &&
git checkout -b side &&
test_commit side conflict.t &&
- git checkout master &&
- test_commit master conflict.t &&
+ git checkout main &&
+ test_commit main conflict.t &&
test_must_fail git merge side &&
echo changed >non-conflict.t &&
echo y | git add -p >output &&
@@ -541,18 +572,110 @@
diff_cmp expected diff
'
+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 >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 'colors can be overridden' '
+ git reset --hard &&
+ test_when_finished "git rm -f color-test" &&
+ test_write_lines context old more-context >color-test &&
+ git add color-test &&
+ test_write_lines context new more-context another-one >color-test &&
+
+ echo trigger an error message >input &&
+ force_color git \
+ -c color.interactive.error=blue \
+ add -i 2>err.raw <input &&
+ test_decode_color <err.raw >err &&
+ grep "<BLUE>Huh (trigger)?<RESET>" err &&
+
+ test_write_lines help quit >input &&
+ force_color git \
+ -c color.interactive.header=red \
+ -c color.interactive.help=green \
+ -c color.interactive.prompt=yellow \
+ add -i >actual.raw <input &&
+ test_decode_color <actual.raw >actual &&
+ cat >expect <<-\EOF &&
+ <RED> staged unstaged path<RESET>
+ 1: +3/-0 +2/-1 color-test
+
+ <RED>*** Commands ***<RESET>
+ 1: <YELLOW>s<RESET>tatus 2: <YELLOW>u<RESET>pdate 3: <YELLOW>r<RESET>evert 4: <YELLOW>a<RESET>dd untracked
+ 5: <YELLOW>p<RESET>atch 6: <YELLOW>d<RESET>iff 7: <YELLOW>q<RESET>uit 8: <YELLOW>h<RESET>elp
+ <YELLOW>What now<RESET>> <GREEN>status - show paths with changes<RESET>
+ <GREEN>update - add working tree state to the staged set of changes<RESET>
+ <GREEN>revert - revert staged set of changes back to the HEAD version<RESET>
+ <GREEN>patch - pick hunks and update selectively<RESET>
+ <GREEN>diff - view diff between HEAD and index<RESET>
+ <GREEN>add untracked - add contents of untracked files to the staged set of changes<RESET>
+ <RED>*** Commands ***<RESET>
+ 1: <YELLOW>s<RESET>tatus 2: <YELLOW>u<RESET>pdate 3: <YELLOW>r<RESET>evert 4: <YELLOW>a<RESET>dd untracked
+ 5: <YELLOW>p<RESET>atch 6: <YELLOW>d<RESET>iff 7: <YELLOW>q<RESET>uit 8: <YELLOW>h<RESET>elp
+ <YELLOW>What now<RESET>> Bye.
+ EOF
+ test_cmp expect actual &&
+
+ : exercise recolor_hunk by editing and then look at the hunk again &&
+ test_write_lines s e K q >input &&
+ force_color git \
+ -c color.interactive.prompt=yellow \
+ -c color.diff.meta=italic \
+ -c color.diff.frag=magenta \
+ -c color.diff.context=cyan \
+ -c color.diff.old=bold \
+ -c color.diff.new=blue \
+ -c core.editor=touch \
+ add -p >actual.raw <input &&
+ test_decode_color <actual.raw >actual.decoded &&
+ sed "s/index [0-9a-f]*\\.\\.[0-9a-f]* 100644/<INDEX-LINE>/" <actual.decoded >actual &&
+ cat >expect <<-\EOF &&
+ <ITALIC>diff --git a/color-test b/color-test<RESET>
+ <ITALIC><INDEX-LINE><RESET>
+ <ITALIC>--- a/color-test<RESET>
+ <ITALIC>+++ b/color-test<RESET>
+ <MAGENTA>@@ -1,3 +1,4 @@<RESET>
+ <CYAN> context<RESET>
+ <BOLD>-old<RESET>
+ <BLUE>+<RESET><BLUE>new<RESET>
+ <CYAN> more-context<RESET>
+ <BLUE>+<RESET><BLUE>another-one<RESET>
+ <YELLOW>(1/1) Stage this hunk [y,n,q,a,d,s,e,?]? <RESET><BOLD>Split into 2 hunks.<RESET>
+ <MAGENTA>@@ -1,3 +1,3 @@<RESET>
+ <CYAN> context<RESET>
+ <BOLD>-old<RESET>
+ <BLUE>+<RESET><BLUE>new<RESET>
+ <CYAN> more-context<RESET>
+ <YELLOW>(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,?]? <RESET><MAGENTA>@@ -3 +3,2 @@<RESET>
+ <CYAN> more-context<RESET>
+ <BLUE>+<RESET><BLUE>another-one<RESET>
+ <YELLOW>(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,?]? <RESET><MAGENTA>@@ -1,3 +1,3 @@<RESET>
+ <CYAN> context<RESET>
+ <BOLD>-old<RESET>
+ <BLUE>+new<RESET>
+ <CYAN> more-context<RESET>
+ <YELLOW>(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,?]? <RESET>
+ EOF
+ test_cmp expect actual
+'
+
test_expect_success 'colorized diffs respect diff.wsErrorHighlight' '
git reset --hard &&
@@ -585,7 +708,7 @@
echo content >test &&
test_config interactive.diffFilter "sed 1d" &&
printf y >y &&
- test_must_fail force_color git add -p <y
+ force_color test_must_fail git add -p <y
'
test_expect_success 'diff.algorithm is passed to `git diff-files`' '
@@ -729,6 +852,12 @@
cat >expected <<-\EOF &&
dirty-both-ways
dirty-head
+ EOF
+ test_cmp expected actual &&
+ git -C for-submodules diff-files --name-only --ignore-submodules=none >actual &&
+ cat >expected <<-\EOF &&
+ dirty-both-ways
+ dirty-head
dirty-otherwise
EOF
test_cmp expected actual &&
@@ -780,12 +909,50 @@
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 &&
@@ -807,7 +974,7 @@
EOF
test_write_lines h | force_color git add -i >actual.colored &&
test_decode_color <actual.colored >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_done
diff --git a/t/t3800-mktag.sh b/t/t3800-mktag.sh
index 64dcc5e..60a666d 100755
--- a/t/t3800-mktag.sh
+++ b/t/t3800-mktag.sh
@@ -12,10 +12,27 @@
# given in the expect.pat file.
check_verify_failure () {
- expect="$2"
+ test_expect_success "$1" "
+ test_must_fail git mktag <tag.sig 2>message &&
+ grep '$2' message &&
+ if test '$3' != '--no-strict'
+ then
+ test_must_fail git mktag --no-strict <tag.sig 2>message.no-strict &&xb
+ grep '$2' message.no-strict
+ fi
+ "
+}
+
+test_expect_mktag_success() {
test_expect_success "$1" '
- ( test_must_fail git mktag <tag.sig 2>message ) &&
- grep "$expect" message
+ git hash-object -t tag -w --stdin <tag.sig >expected &&
+ git fsck --strict &&
+
+ git mktag <tag.sig >hash &&
+ test_cmp expected hash &&
+ test_when_finished "git update-ref -d refs/tags/mytag $(cat hash)" &&
+ git update-ref refs/tags/mytag $(cat hash) $(test_oid zero) &&
+ git fsck --strict
'
}
@@ -23,11 +40,24 @@
# first create a commit, so we have a valid object/type
# for the tag.
test_expect_success 'setup' '
- test_oid_init &&
- echo Hello >A &&
- git update-index --add A &&
- git commit -m "Initial commit" &&
- head=$(git rev-parse --verify HEAD)
+ test_commit A &&
+ test_commit B &&
+ head=$(git rev-parse --verify HEAD) &&
+ head_parent=$(git rev-parse --verify HEAD~) &&
+ tree=$(git rev-parse HEAD^{tree}) &&
+ blob=$(git rev-parse --verify HEAD:B.t)
+'
+
+test_expect_success 'basic usage' '
+ cat >tag.sig <<-EOF &&
+ object $head
+ type commit
+ tag mytag
+ tagger T A Gger <tagger@example.com> 1206478233 -0500
+ EOF
+ git mktag <tag.sig &&
+ git mktag --end-of-options <tag.sig &&
+ test_expect_code 129 git mktag --unknown-option
'
############################################################
@@ -38,33 +68,33 @@
EOF
check_verify_failure 'Tag object length check' \
- '^error: .*size wrong.*$'
+ '^error:.* missingObject:' 'strict'
############################################################
# 2. object line label check
cat >tag.sig <<EOF
-xxxxxx 139e9b33986b1c2670fff52c5067603117b3e895
+xxxxxx $head
type tag
tag mytag
tagger . <> 0 +0000
EOF
-check_verify_failure '"object" line label check' '^error: char0: .*"object "$'
+check_verify_failure '"object" line label check' '^error:.* missingObject:'
############################################################
-# 3. object line SHA1 check
+# 3. object line hash check
cat >tag.sig <<EOF
-object zz9e9b33986b1c2670fff52c5067603117b3e895
+object $(echo $head | tr 0-9a-f z)
type tag
tag mytag
tagger . <> 0 +0000
EOF
-check_verify_failure '"object" line SHA1 check' '^error: char7: .*SHA1 hash$'
+check_verify_failure '"object" line check' '^error:.* badObjectSha1:'
############################################################
# 4. type line label check
@@ -77,7 +107,7 @@
EOF
-check_verify_failure '"type" line label check' '^error: char.*: .*"\\ntype "$'
+check_verify_failure '"type" line label check' '^error:.* missingTypeEntry:'
############################################################
# 5. type line eol check
@@ -85,7 +115,7 @@
echo "object $head" >tag.sig
printf "type tagsssssssssssssssssssssssssssssss" >>tag.sig
-check_verify_failure '"type" line eol check' '^error: char.*: .*"\\n"$'
+check_verify_failure '"type" line eol check' '^error:.* unterminatedHeader:'
############################################################
# 6. tag line label check #1
@@ -99,7 +129,7 @@
EOF
check_verify_failure '"tag" line label check #1' \
- '^error: char.*: no "tag " found$'
+ '^error:.* missingTagEntry:'
############################################################
# 7. tag line label check #2
@@ -111,7 +141,7 @@
EOF
check_verify_failure '"tag" line label check #2' \
- '^error: char.*: no "tag " found$'
+ '^error:.* badType:'
############################################################
# 8. type line type-name length check
@@ -123,10 +153,32 @@
EOF
check_verify_failure '"type" line type-name length check' \
- '^error: char.*: type too long$'
+ '^error:.* badType:'
############################################################
-# 9. verify object (SHA1/type) check
+# 9. verify object (hash/type) check
+
+cat >tag.sig <<EOF
+object $(test_oid deadbeef)
+type tag
+tag mytag
+tagger . <> 0 +0000
+
+EOF
+
+check_verify_failure 'verify object (hash/type) check -- correct type, nonexisting object' \
+ '^fatal: could not read tagged object'
+
+cat >tag.sig <<EOF
+object $head
+type tagggg
+tag mytag
+tagger . <> 0 +0000
+
+EOF
+
+check_verify_failure 'verify object (hash/type) check -- made-up type, valid object' \
+ '^error:.* badType:'
cat >tag.sig <<EOF
object $(test_oid deadbeef)
@@ -136,8 +188,48 @@
EOF
-check_verify_failure 'verify object (SHA1/type) check' \
- '^error: char7: could not verify object.*$'
+check_verify_failure 'verify object (hash/type) check -- made-up type, nonexisting object' \
+ '^error:.* badType:'
+
+cat >tag.sig <<EOF
+object $head
+type tree
+tag mytag
+tagger . <> 0 +0000
+
+EOF
+
+check_verify_failure 'verify object (hash/type) check -- mismatched type, valid object' \
+ '^fatal: object.*tagged as.*tree.*but is.*commit'
+
+############################################################
+# 9.5. verify object (hash/type) check -- replacement
+
+test_expect_success 'setup replacement of commit -> commit and tree -> blob' '
+ git replace $head_parent $head &&
+ git replace -f $tree $blob
+'
+
+cat >tag.sig <<EOF
+object $head_parent
+type commit
+tag mytag
+tagger . <> 0 +0000
+
+EOF
+
+test_expect_mktag_success 'tag to a commit replaced by another commit'
+
+cat >tag.sig <<EOF
+object $tree
+type tree
+tag mytag
+tagger . <> 0 +0000
+
+EOF
+
+check_verify_failure 'verify object (hash/type) check -- mismatched type, valid object' \
+ '^fatal: object.*tagged as.*tree.*but is.*blob'
############################################################
# 10. verify tag-name check
@@ -151,7 +243,7 @@
EOF
check_verify_failure 'verify tag-name check' \
- '^error: char.*: could not verify tag name$'
+ '^error:.* badTagName:' '--no-strict'
############################################################
# 11. tagger line label check #1
@@ -165,7 +257,7 @@
EOF
check_verify_failure '"tagger" line label check #1' \
- '^error: char.*: could not find "tagger "$'
+ '^error:.* missingTaggerEntry:' '--no-strict'
############################################################
# 12. tagger line label check #2
@@ -180,10 +272,10 @@
EOF
check_verify_failure '"tagger" line label check #2' \
- '^error: char.*: could not find "tagger "$'
+ '^error:.* missingTaggerEntry:' '--no-strict'
############################################################
-# 13. disallow missing tag author name
+# 13. allow missing tag author name like fsck
cat >tag.sig <<EOF
object $head
@@ -194,8 +286,7 @@
This is filler
EOF
-check_verify_failure 'disallow missing tag author name' \
- '^error: char.*: missing tagger name$'
+test_expect_mktag_success 'allow missing tag author name'
############################################################
# 14. disallow missing tag author name
@@ -210,7 +301,7 @@
EOF
check_verify_failure 'disallow malformed tagger' \
- '^error: char.*: malformed tagger field$'
+ '^error:.* badEmail:' '--no-strict'
############################################################
# 15. allow empty tag email
@@ -223,12 +314,10 @@
EOF
-test_expect_success \
- 'allow empty tag email' \
- 'git mktag <tag.sig >.git/refs/tags/mytag 2>message'
+test_expect_mktag_success 'allow empty tag email'
############################################################
-# 16. disallow spaces in tag email
+# 16. allow spaces in tag email like fsck
cat >tag.sig <<EOF
object $head
@@ -238,8 +327,7 @@
EOF
-check_verify_failure 'disallow spaces in tag email' \
- '^error: char.*: malformed tagger field$'
+test_expect_mktag_success 'allow spaces in tag email like fsck'
############################################################
# 17. disallow missing tag timestamp
@@ -253,7 +341,7 @@
EOF
check_verify_failure 'disallow missing tag timestamp' \
- '^error: char.*: missing tag timestamp$'
+ '^error:.* badDate:'
############################################################
# 18. detect invalid tag timestamp1
@@ -267,7 +355,7 @@
EOF
check_verify_failure 'detect invalid tag timestamp1' \
- '^error: char.*: missing tag timestamp$'
+ '^error:.* badDate:'
############################################################
# 19. detect invalid tag timestamp2
@@ -281,7 +369,7 @@
EOF
check_verify_failure 'detect invalid tag timestamp2' \
- '^error: char.*: malformed tag timestamp$'
+ '^error:.* badDate:'
############################################################
# 20. detect invalid tag timezone1
@@ -295,7 +383,7 @@
EOF
check_verify_failure 'detect invalid tag timezone1' \
- '^error: char.*: malformed tag timezone$'
+ '^error:.* badTimezone:'
############################################################
# 21. detect invalid tag timezone2
@@ -309,10 +397,10 @@
EOF
check_verify_failure 'detect invalid tag timezone2' \
- '^error: char.*: malformed tag timezone$'
+ '^error:.* badTimezone:'
############################################################
-# 22. detect invalid tag timezone3
+# 22. allow invalid tag timezone3 (the maximum is -1200/+1400)
cat >tag.sig <<EOF
object $head
@@ -322,8 +410,7 @@
EOF
-check_verify_failure 'detect invalid tag timezone3' \
- '^error: char.*: malformed tag timezone$'
+test_expect_mktag_success 'allow invalid tag timezone'
############################################################
# 23. detect invalid header entry
@@ -338,10 +425,39 @@
EOF
check_verify_failure 'detect invalid header entry' \
- '^error: char.*: trailing garbage in tag header$'
+ '^error:.* extraHeaderEntry:' '--no-strict'
-############################################################
-# 24. create valid tag
+test_expect_success 'invalid header entry config & fsck' '
+ test_must_fail git mktag <tag.sig &&
+ git mktag --no-strict <tag.sig &&
+
+ test_must_fail git -c fsck.extraHeaderEntry=error mktag <tag.sig &&
+ test_must_fail git -c fsck.extraHeaderEntry=error mktag --no-strict <tag.sig &&
+
+ test_must_fail git -c fsck.extraHeaderEntry=warn mktag <tag.sig &&
+ git -c fsck.extraHeaderEntry=warn mktag --no-strict <tag.sig &&
+
+ git -c fsck.extraHeaderEntry=ignore mktag <tag.sig &&
+ git -c fsck.extraHeaderEntry=ignore mktag --no-strict <tag.sig &&
+
+ git fsck &&
+ git -c fsck.extraHeaderEntry=warn fsck 2>err &&
+ grep "warning .*extraHeaderEntry:" err &&
+ test_must_fail git -c fsck.extraHeaderEntry=error 2>err fsck &&
+ grep "error .* extraHeaderEntry:" err
+'
+
+cat >tag.sig <<EOF
+object $head
+type commit
+tag mytag
+tagger T A Gger <tagger@example.com> 1206478233 -0500
+
+
+this line comes after an extra newline
+EOF
+
+test_expect_mktag_success 'allow extra newlines at start of body'
cat >tag.sig <<EOF
object $head
@@ -351,16 +467,27 @@
EOF
-test_expect_success \
- 'create valid tag' \
- 'git mktag <tag.sig >.git/refs/tags/mytag 2>message'
+test_expect_mktag_success 'allow a blank line before an empty body (1)'
+
+cat >tag.sig <<EOF
+object $head
+type commit
+tag mytag
+tagger T A Gger <tagger@example.com> 1206478233 -0500
+EOF
+
+test_expect_mktag_success 'allow no blank line before an empty body (2)'
############################################################
-# 25. check mytag
+# 24. create valid tag
-test_expect_success \
- 'check mytag' \
- 'git tag -l | grep mytag'
+cat >tag.sig <<EOF
+object $head
+type commit
+tag mytag
+tagger T A Gger <tagger@example.com> 1206478233 -0500
+EOF
+test_expect_mktag_success 'create valid tag object'
test_done
diff --git a/t/t3901-i18n-patch.sh b/t/t3901-i18n-patch.sh
index 923eb01..4f16a73 100755
--- a/t/t3901-i18n-patch.sh
+++ b/t/t3901-i18n-patch.sh
@@ -5,6 +5,9 @@
test_description='i18n settings and format-patch | am pipe'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
check_encoding () {
@@ -45,7 +48,7 @@
# the first commit on the side branch is UTF-8
test_tick &&
- git checkout -b side master^ &&
+ git checkout -b side main^ &&
echo Another file >yours &&
git add yours &&
git commit -s -m "Second on side" &&
@@ -69,7 +72,7 @@
test_expect_success 'format-patch output (ISO-8859-1)' '
git config i18n.logoutputencoding ISO8859-1 &&
- git format-patch --stdout master..HEAD^ >out-l1 &&
+ git format-patch --stdout main..HEAD^ >out-l1 &&
git format-patch --stdout HEAD^ >out-l2 &&
grep "^Content-Type: text/plain; charset=ISO8859-1" out-l1 &&
grep "^From: =?ISO8859-1?q?=C1=E9=ED=20=F3=FA?=" out-l1 &&
@@ -80,7 +83,7 @@
test_expect_success 'format-patch output (UTF-8)' '
git config i18n.logoutputencoding UTF-8 &&
- git format-patch --stdout master..HEAD^ >out-u1 &&
+ git format-patch --stdout main..HEAD^ >out-u1 &&
git format-patch --stdout HEAD^ >out-u2 &&
grep "^Content-Type: text/plain; charset=UTF-8" out-u1 &&
grep "^From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?=" out-u1 &&
@@ -102,7 +105,7 @@
# we want UTF-8 encoded name.
. "$TEST_DIRECTORY"/t3901/utf8.txt &&
git checkout -b test &&
- git rebase master &&
+ git rebase main &&
check_encoding 2
'
@@ -113,7 +116,7 @@
. "$TEST_DIRECTORY"/t3901/utf8.txt &&
git reset --hard side &&
- git rebase master &&
+ git rebase main &&
check_encoding 2
'
@@ -125,7 +128,7 @@
. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
git reset --hard side &&
- git rebase master &&
+ git rebase main &&
check_encoding 2 8859
'
@@ -138,7 +141,7 @@
. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
git reset --hard side &&
- git rebase master &&
+ git rebase main &&
check_encoding 2 8859
'
@@ -150,7 +153,7 @@
git config i18n.logoutputencoding UTF-8 &&
. "$TEST_DIRECTORY"/t3901/utf8.txt &&
- git reset --hard master &&
+ git reset --hard main &&
git cherry-pick side^ &&
git cherry-pick side &&
git revert HEAD &&
@@ -165,7 +168,7 @@
git config i18n.logoutputencoding ISO8859-1 &&
. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
- git reset --hard master &&
+ git reset --hard main &&
git cherry-pick side^ &&
git cherry-pick side &&
git revert HEAD &&
@@ -180,7 +183,7 @@
git config i18n.logoutputencoding ISO8859-1 &&
. "$TEST_DIRECTORY"/t3901/utf8.txt &&
- git reset --hard master &&
+ git reset --hard main &&
git cherry-pick side^ &&
git cherry-pick side &&
git revert HEAD &&
@@ -196,7 +199,7 @@
git config i18n.logoutputencoding UTF-8 &&
. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
- git reset --hard master &&
+ git reset --hard main &&
git cherry-pick side^ &&
git cherry-pick side &&
git revert HEAD &&
@@ -210,7 +213,7 @@
. "$TEST_DIRECTORY"/t3901/utf8.txt &&
git reset --hard side &&
- git rebase --merge master &&
+ git rebase --merge main &&
check_encoding 2
'
@@ -221,7 +224,7 @@
. "$TEST_DIRECTORY"/t3901/utf8.txt &&
git reset --hard side &&
- git rebase --merge master &&
+ git rebase --merge main &&
check_encoding 2
'
@@ -233,7 +236,7 @@
. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
git reset --hard side &&
- git rebase --merge master &&
+ git rebase --merge main &&
check_encoding 2 8859
'
@@ -246,7 +249,7 @@
. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
git reset --hard side &&
- git rebase --merge master &&
+ git rebase --merge main &&
check_encoding 2 8859
'
@@ -256,7 +259,7 @@
git config i18n.commitencoding UTF-8 &&
. "$TEST_DIRECTORY"/t3901/utf8.txt &&
- git reset --hard master &&
+ git reset --hard main &&
git am out-u1 out-u2 &&
check_encoding 2
@@ -267,7 +270,7 @@
git config i18n.commitencoding ISO8859-1 &&
. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
- git reset --hard master &&
+ git reset --hard main &&
git am out-l1 out-l2 &&
check_encoding 2 8859
@@ -277,7 +280,7 @@
# Apply ISO-8859-1 patches with UTF-8 commitencoding
git config i18n.commitencoding UTF-8 &&
. "$TEST_DIRECTORY"/t3901/utf8.txt &&
- git reset --hard master &&
+ git reset --hard main &&
# am specifies --utf8 by default.
git am out-l1 out-l2 &&
@@ -290,7 +293,7 @@
git config i18n.commitencoding UTF-8 &&
. "$TEST_DIRECTORY"/t3901/utf8.txt &&
- git reset --hard master &&
+ git reset --hard main &&
git am --no-utf8 out-l1 out-l2 2>err &&
# commit-tree will warn that the commit message does not contain valid UTF-8
@@ -305,7 +308,7 @@
git config i18n.commitencoding ISO8859-1 &&
. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
- git reset --hard master &&
+ git reset --hard main &&
# mailinfo will re-code the commit message to the charset specified by
# i18n.commitencoding
git am out-u1 out-u2 &&
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 3ad23e2..5f282ec 100755
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -5,6 +5,9 @@
test_description='Test git stash'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
diff_cmp () {
@@ -220,14 +223,14 @@
git commit file -m second &&
git stash branch stashbranch &&
test refs/heads/stashbranch = $(git symbolic-ref HEAD) &&
- test $(git rev-parse HEAD) = $(git rev-parse master^) &&
+ test $(git rev-parse HEAD) = $(git rev-parse main^) &&
git diff --cached >output &&
diff_cmp expect output &&
git diff >output &&
diff_cmp expect1 output &&
git add file &&
git commit -m alternate\ second &&
- git diff master..stashbranch >output &&
+ git diff main..stashbranch >output &&
diff_cmp output expect2 &&
test 0 = $(git stash list | wc -l)
'
@@ -520,7 +523,7 @@
STASH_ID=$(git stash create) &&
git reset --hard &&
git stash branch stash-branch ${STASH_ID} &&
- test_when_finished "git reset --hard HEAD && git checkout master &&
+ test_when_finished "git reset --hard HEAD && git checkout main &&
git branch -D stash-branch" &&
test $(git ls-files --modified | wc -l) -eq 1
'
@@ -536,7 +539,7 @@
STASH_ID=$(git stash create) &&
git reset --hard &&
git stash branch stash-branch ${STASH_ID} &&
- test_when_finished "git reset --hard HEAD && git checkout master &&
+ test_when_finished "git reset --hard HEAD && git checkout main &&
git branch -D stash-branch" &&
test $(git ls-files --modified | wc -l) -eq 1
'
@@ -561,7 +564,7 @@
1 file changed, 1 insertion(+)
EOF
git stash show ${STASH_ID} >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'stash show - stashes on stack, stash-like argument' '
@@ -738,7 +741,7 @@
git stash &&
git stash show 0 &&
git stash branch tmp 0 &&
- git checkout master &&
+ git checkout main &&
git stash &&
git stash apply 0 &&
git reset --hard &&
@@ -755,7 +758,7 @@
git commit -m initial &&
echo bar >file &&
git stash &&
- test_must_fail git stash branch master stash@{0} &&
+ test_must_fail git stash branch main stash@{0} &&
git rev-parse stash@{0} --
'
@@ -768,7 +771,7 @@
echo bar >file &&
git stash &&
echo baz >file &&
- test_when_finished "git checkout master" &&
+ test_when_finished "git checkout main" &&
test_must_fail git stash branch new_branch stash@{0} &&
git rev-parse stash@{0} --
'
@@ -789,7 +792,7 @@
git stash apply
) |
sed -e 1d >actual && # drop "Saved..."
- test_i18ncmp expect actual
+ test_cmp expect actual
'
cat >expect <<EOF
@@ -902,7 +905,7 @@
>foo &&
git add foo &&
git stash push -m "test message" &&
- echo "stash@{0}: On master: test message" >expect &&
+ echo "stash@{0}: On main: test message" >expect &&
git stash list -1 >actual &&
test_cmp expect actual
'
@@ -911,7 +914,7 @@
>foo &&
git add foo &&
git stash push -m"unspaced test message" &&
- echo "stash@{0}: On master: unspaced test message" >expect &&
+ echo "stash@{0}: On main: unspaced test message" >expect &&
git stash list -1 >actual &&
test_cmp expect actual
'
@@ -968,7 +971,7 @@
>foo &&
git add foo &&
git stash push -m"test mfoo" &&
- echo "stash@{0}: On master: test mfoo" >expect &&
+ echo "stash@{0}: On main: test mfoo" >expect &&
git stash list -1 >actual &&
test_cmp expect actual
'
@@ -977,7 +980,7 @@
>foo &&
git add foo &&
git stash push --message "test message foo" &&
- echo "stash@{0}: On master: test message foo" >expect &&
+ echo "stash@{0}: On main: test message foo" >expect &&
git stash list -1 >actual &&
test_cmp expect actual
'
@@ -986,7 +989,7 @@
>foo &&
git add foo &&
git stash push --message="test message=foo" &&
- echo "stash@{0}: On master: test message=foo" >expect &&
+ echo "stash@{0}: On main: test message=foo" >expect &&
git stash list -1 >actual &&
test_cmp expect actual
'
@@ -995,7 +998,7 @@
>foo &&
git add foo &&
git stash push -m "test m foo" &&
- echo "stash@{0}: On master: test m foo" >expect &&
+ echo "stash@{0}: On main: test m foo" >expect &&
git stash list -1 >actual &&
test_cmp expect actual
'
@@ -1004,7 +1007,7 @@
>foo &&
git add foo &&
STASH_ID=$(git stash create "create test message") &&
- echo "On master: create test message" >expect &&
+ echo "On main: create test message" >expect &&
git show --pretty=%s -s ${STASH_ID} >actual &&
test_cmp expect actual
'
@@ -1013,13 +1016,13 @@
>foo &&
git add foo &&
STASH_ID=$(git stash create test untracked) &&
- echo "On master: test untracked" >expect &&
+ echo "On main: test untracked" >expect &&
git show --pretty=%s -s ${STASH_ID} >actual &&
test_cmp expect actual
'
test_expect_success 'create in a detached state' '
- test_when_finished "git checkout master" &&
+ test_when_finished "git checkout main" &&
git checkout HEAD~1 &&
>foo &&
git add foo &&
@@ -1111,7 +1114,7 @@
git stash push -p foo >actual &&
echo "No local changes to save" >expect &&
git reset --hard HEAD~ &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'push <pathspec>: show no changes when there are none' '
@@ -1121,7 +1124,7 @@
git stash push foo >actual &&
echo "No local changes to save" >expect &&
git reset --hard HEAD~ &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'push: <pathspec> not in the repository errors out' '
@@ -1290,4 +1293,18 @@
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/t/t3904-stash-patch.sh b/t/t3904-stash-patch.sh
index 9546b6f..accfe38 100755
--- a/t/t3904-stash-patch.sh
+++ b/t/t3904-stash-patch.sh
@@ -89,7 +89,7 @@
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 @@
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/t/t3905-stash-include-untracked.sh b/t/t3905-stash-include-untracked.sh
index f075c7f..598b17f 100755
--- a/t/t3905-stash-include-untracked.sh
+++ b/t/t3905-stash-include-untracked.sh
@@ -8,16 +8,16 @@
. ./test-lib.sh
test_expect_success 'stash save --include-untracked some dirty working directory' '
- echo 1 > file &&
+ echo 1 >file &&
git add file &&
test_tick &&
git commit -m initial &&
- echo 2 > file &&
+ echo 2 >file &&
git add file &&
- echo 3 > file &&
+ echo 3 >file &&
test_tick &&
- echo 1 > file2 &&
- echo 1 > HEAD &&
+ echo 1 >file2 &&
+ echo 1 >HEAD &&
mkdir untracked &&
echo untracked >untracked/untracked &&
git stash --include-untracked &&
@@ -25,48 +25,50 @@
git diff-index --cached --quiet HEAD
'
-cat > expect <<EOF
-?? actual
-?? expect
-EOF
-
test_expect_success 'stash save --include-untracked cleaned the untracked files' '
+ cat >expect <<-EOF &&
+ ?? actual
+ ?? expect
+ EOF
+
git status --porcelain >actual &&
test_cmp expect actual
'
-tracked=$(git rev-parse --short $(echo 1 | git hash-object --stdin))
-untracked=$(git rev-parse --short $(echo untracked | git hash-object --stdin))
-cat > expect.diff <<EOF
-diff --git a/HEAD b/HEAD
-new file mode 100644
-index 0000000..$tracked
---- /dev/null
-+++ b/HEAD
-@@ -0,0 +1 @@
-+1
-diff --git a/file2 b/file2
-new file mode 100644
-index 0000000..$tracked
---- /dev/null
-+++ b/file2
-@@ -0,0 +1 @@
-+1
-diff --git a/untracked/untracked b/untracked/untracked
-new file mode 100644
-index 0000000..$untracked
---- /dev/null
-+++ b/untracked/untracked
-@@ -0,0 +1 @@
-+untracked
-EOF
-cat > expect.lstree <<EOF
-HEAD
-file2
-untracked
-EOF
-
test_expect_success 'stash save --include-untracked stashed the untracked files' '
+ one_blob=$(echo 1 | git hash-object --stdin) &&
+ tracked=$(git rev-parse --short "$one_blob") &&
+ untracked_blob=$(echo untracked | git hash-object --stdin) &&
+ untracked=$(git rev-parse --short "$untracked_blob") &&
+ cat >expect.diff <<-EOF &&
+ diff --git a/HEAD b/HEAD
+ new file mode 100644
+ index 0000000..$tracked
+ --- /dev/null
+ +++ b/HEAD
+ @@ -0,0 +1 @@
+ +1
+ diff --git a/file2 b/file2
+ new file mode 100644
+ index 0000000..$tracked
+ --- /dev/null
+ +++ b/file2
+ @@ -0,0 +1 @@
+ +1
+ diff --git a/untracked/untracked b/untracked/untracked
+ new file mode 100644
+ index 0000000..$untracked
+ --- /dev/null
+ +++ b/untracked/untracked
+ @@ -0,0 +1 @@
+ +untracked
+ EOF
+ cat >expect.lstree <<-EOF &&
+ HEAD
+ file2
+ untracked
+ EOF
+
test_path_is_missing file2 &&
test_path_is_missing untracked &&
test_path_is_missing HEAD &&
@@ -83,57 +85,64 @@
test_must_fail git stash --patch --all
'
-git clean --force --quiet
+test_expect_success 'clean up untracked/untracked file to prepare for next tests' '
+ git clean --force --quiet
-cat > expect <<EOF
- M file
-?? HEAD
-?? actual
-?? expect
-?? file2
-?? untracked/
-EOF
+'
test_expect_success 'stash pop after save --include-untracked leaves files untracked again' '
+ cat >expect <<-EOF &&
+ M file
+ ?? HEAD
+ ?? actual
+ ?? expect
+ ?? file2
+ ?? untracked/
+ EOF
+
git stash pop &&
git status --porcelain >actual &&
test_cmp expect actual &&
- test "1" = "$(cat file2)" &&
- test untracked = "$(cat untracked/untracked)"
+ echo 1 >expect_file2 &&
+ test_cmp expect_file2 file2 &&
+ echo untracked >untracked_expect &&
+ test_cmp untracked_expect untracked/untracked
'
-git clean --force --quiet -d
+test_expect_success 'clean up untracked/ directory to prepare for next tests' '
+ git clean --force --quiet -d
+'
test_expect_success 'stash save -u dirty index' '
- echo 4 > file3 &&
+ echo 4 >file3 &&
git add file3 &&
test_tick &&
git stash -u
'
-blob=$(git rev-parse --short $(echo 4 | git hash-object --stdin))
-cat > expect <<EOF
-diff --git a/file3 b/file3
-new file mode 100644
-index 0000000..$blob
---- /dev/null
-+++ b/file3
-@@ -0,0 +1 @@
-+4
-EOF
-
test_expect_success 'stash save --include-untracked dirty index got stashed' '
+ four_blob=$(echo 4 | git hash-object --stdin) &&
+ blob=$(git rev-parse --short "$four_blob") &&
+ cat >expect <<-EOF &&
+ diff --git a/file3 b/file3
+ new file mode 100644
+ index 0000000..$blob
+ --- /dev/null
+ +++ b/file3
+ @@ -0,0 +1 @@
+ +4
+ EOF
+
git stash pop --index &&
+ test_when_finished "git reset" &&
git diff --cached >actual &&
test_cmp expect actual
'
-git reset > /dev/null
-
# Must direct output somewhere where it won't be considered an untracked file
test_expect_success 'stash save --include-untracked -q is quiet' '
- echo 1 > file5 &&
- git stash save --include-untracked --quiet > .git/stash-output.out 2>&1 &&
+ echo 1 >file5 &&
+ git stash save --include-untracked --quiet >.git/stash-output.out 2>&1 &&
test_line_count = 0 .git/stash-output.out &&
rm -f .git/stash-output.out
'
@@ -141,35 +150,34 @@
test_expect_success 'stash save --include-untracked removed files' '
rm -f file &&
git stash save --include-untracked &&
- echo 1 > expect &&
+ echo 1 >expect &&
+ test_when_finished "rm -f expect" &&
test_cmp expect file
'
-rm -f expect
-
test_expect_success 'stash save --include-untracked removed files got stashed' '
git stash pop &&
test_path_is_missing file
'
-cat > .gitignore <<EOF
-.gitignore
-ignored
-ignored.d/
-EOF
-
test_expect_success 'stash save --include-untracked respects .gitignore' '
- echo ignored > ignored &&
+ cat >.gitignore <<-EOF &&
+ .gitignore
+ ignored
+ ignored.d/
+ EOF
+
+ echo ignored >ignored &&
mkdir ignored.d &&
echo ignored >ignored.d/untracked &&
git stash -u &&
- test -s ignored &&
- test -s ignored.d/untracked &&
- test -s .gitignore
+ test_file_not_empty ignored &&
+ test_file_not_empty ignored.d/untracked &&
+ test_file_not_empty .gitignore
'
test_expect_success 'stash save -u can stash with only untracked files different' '
- echo 4 > file4 &&
+ echo 4 >file4 &&
git stash -u &&
test_path_is_missing file4
'
@@ -183,9 +191,9 @@
test_expect_success 'stash save --all is stash poppable' '
git stash pop &&
- test -s ignored &&
- test -s ignored.d/untracked &&
- test -s .gitignore
+ test_file_not_empty ignored &&
+ test_file_not_empty ignored.d/untracked &&
+ test_file_not_empty .gitignore
'
test_expect_success 'stash push --include-untracked with pathspec' '
@@ -214,17 +222,17 @@
test_path_is_file bar
'
-cat > .gitignore <<EOF
-ignored
-ignored.d/*
-EOF
-
test_expect_success 'stash previously ignored file' '
+ cat >.gitignore <<-EOF &&
+ ignored
+ ignored.d/*
+ EOF
+
git reset HEAD &&
git add .gitignore &&
git commit -m "Add .gitignore" &&
>ignored.d/foo &&
- echo "!ignored.d/foo" >> .gitignore &&
+ echo "!ignored.d/foo" >>.gitignore &&
git stash save --include-untracked &&
test_path_is_missing ignored.d/foo &&
git stash pop &&
@@ -280,7 +288,7 @@
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
+ test_cmp expect actual
'
test_expect_success 'stash -u with globs' '
diff --git a/t/t3906-stash-submodule.sh b/t/t3906-stash-submodule.sh
index b93d1d7..a52e53d 100755
--- a/t/t3906-stash-submodule.sh
+++ b/t/t3906-stash-submodule.sh
@@ -8,7 +8,12 @@
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,7 +24,7 @@
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" &&
diff --git a/t/t3910-mac-os-precompose.sh b/t/t3910-mac-os-precompose.sh
index 54ce19e..898267a 100755
--- a/t/t3910-mac-os-precompose.sh
+++ b/t/t3910-mac-os-precompose.sh
@@ -5,6 +5,9 @@
test_description='utf-8 decomposed (nfd) converted to precomposed (nfc)'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
if ! test_have_prereq UTF8_NFD_TO_NFC
@@ -151,7 +154,7 @@
git checkout l.$Odiarnfd
'
test_expect_success "setup case mac2" '
- git checkout master &&
+ git checkout main &&
git reset --hard &&
git checkout -b mac_os_2
'
@@ -163,7 +166,7 @@
git commit -m "add d2.$Adiarnfd/f.$Adiarnfd" -- d2.$Adiarnfd/f.$Adiarnfd
'
test_expect_success "setup for long decomposed filename" '
- git checkout master &&
+ git checkout main &&
git reset --hard &&
git checkout -b mac_os_long_nfd_fn
'
@@ -173,7 +176,7 @@
git commit -m "Long filename"
'
test_expect_success "setup for long precomposed filename" '
- git checkout master &&
+ git checkout main &&
git reset --hard &&
git checkout -b mac_os_long_nfc_fn
'
@@ -191,6 +194,22 @@
test_must_be_empty untracked
'
+test_expect_success "unicode decomposed: git restore -p . " '
+ DIRNAMEPWD=dir.Odiarnfc &&
+ DIRNAMEINREPO=dir.$Adiarnfc &&
+ export DIRNAMEPWD DIRNAMEINREPO &&
+ git init "$DIRNAMEPWD" &&
+ (
+ cd "$DIRNAMEPWD" &&
+ mkdir "$DIRNAMEINREPO" &&
+ cd "$DIRNAMEINREPO" &&
+ echo "Initial" >file &&
+ git add file &&
+ echo "More stuff" >>file &&
+ echo y | git restore -p .
+ )
+'
+
# Test if the global core.precomposeunicode stops autosensing
# Must be the last test case
test_expect_success "respect git config --global core.precomposeunicode" '
diff --git a/t/t3920-crlf-messages.sh b/t/t3920-crlf-messages.sh
new file mode 100755
index 0000000..70ddce3
--- /dev/null
+++ b/t/t3920-crlf-messages.sh
@@ -0,0 +1,126 @@
+#!/bin/sh
+
+test_description='Test ref-filter and pretty APIs for commit and tag messages using CRLF'
+. ./test-lib.sh
+
+LIB_CRLF_BRANCHES=""
+
+create_crlf_ref () {
+ branch="$1" &&
+ cat >.crlf-orig-$branch.txt &&
+ cat .crlf-orig-$branch.txt | append_cr >.crlf-message-$branch.txt &&
+ grep 'Subject' .crlf-orig-$branch.txt | tr '\n' ' ' | sed 's/[ ]*$//' | tr -d '\n' >.crlf-subject-$branch.txt &&
+ grep 'Body' .crlf-message-$branch.txt >.crlf-body-$branch.txt || true &&
+ LIB_CRLF_BRANCHES="${LIB_CRLF_BRANCHES} ${branch}" &&
+ test_tick &&
+ hash=$(git commit-tree HEAD^{tree} -p HEAD -F .crlf-message-${branch}.txt) &&
+ git branch ${branch} ${hash} &&
+ git tag tag-${branch} ${branch} -F .crlf-message-${branch}.txt --cleanup=verbatim
+}
+
+create_crlf_refs () {
+ create_crlf_ref crlf <<-\EOF &&
+ Subject first line
+
+ Body first line
+ Body second line
+ EOF
+ create_crlf_ref crlf-empty-lines-after-subject <<-\EOF &&
+ Subject first line
+
+
+ Body first line
+ Body second line
+ EOF
+ create_crlf_ref crlf-two-line-subject <<-\EOF &&
+ Subject first line
+ Subject second line
+
+ Body first line
+ Body second line
+ EOF
+ create_crlf_ref crlf-two-line-subject-no-body <<-\EOF &&
+ Subject first line
+ Subject second line
+ EOF
+ create_crlf_ref crlf-two-line-subject-no-body-trailing-newline <<-\EOF
+ Subject first line
+ Subject second line
+
+ EOF
+}
+
+test_crlf_subject_body_and_contents() {
+ command_and_args="$@" &&
+ command=$1 &&
+ if test ${command} = "branch" || test ${command} = "for-each-ref" || test ${command} = "tag"
+ then
+ atoms="(contents:subject) (contents:body) (contents)"
+ elif test ${command} = "log" || test ${command} = "show"
+ then
+ atoms="s b B"
+ fi &&
+ files="subject body message" &&
+ while test -n "${atoms}"
+ do
+ set ${atoms} && atom=$1 && shift && atoms="$*" &&
+ set ${files} && file=$1 && shift && files="$*" &&
+ test_expect_success "${command}: --format='%${atom}' works with messages using CRLF" "
+ rm -f expect &&
+ for ref in ${LIB_CRLF_BRANCHES}
+ do
+ cat .crlf-${file}-\"\${ref}\".txt >>expect &&
+ printf \"\n\" >>expect
+ done &&
+ git $command_and_args --format=\"%${atom}\" >actual &&
+ test_cmp expect actual
+ "
+ done
+}
+
+
+test_expect_success 'Setup refs with commit and tag messages using CRLF' '
+ test_commit inital &&
+ create_crlf_refs
+'
+
+test_expect_success 'branch: --verbose works with messages using CRLF' '
+ rm -f expect &&
+ for branch in $LIB_CRLF_BRANCHES
+ do
+ printf " " >>expect &&
+ cat .crlf-subject-${branch}.txt >>expect &&
+ printf "\n" >>expect
+ done &&
+ git branch -v >tmp &&
+ # Remove first two columns, and the line for the currently checked out branch
+ current=$(git branch --show-current) &&
+ grep -v $current <tmp | awk "{\$1=\$2=\"\"}1" >actual &&
+ test_cmp expect actual
+'
+
+test_crlf_subject_body_and_contents branch --list crlf*
+
+test_crlf_subject_body_and_contents tag --list tag-crlf*
+
+test_crlf_subject_body_and_contents for-each-ref refs/heads/crlf*
+
+test_expect_success 'log: --oneline works with messages using CRLF' '
+ for branch in $LIB_CRLF_BRANCHES
+ do
+ cat .crlf-subject-${branch}.txt >expect &&
+ printf "\n" >>expect &&
+ git log --oneline -1 ${branch} >tmp-branch &&
+ git log --oneline -1 tag-${branch} >tmp-tag &&
+ cut -d" " -f2- <tmp-branch >actual-branch &&
+ cut -d" " -f2- <tmp-tag >actual-tag &&
+ test_cmp expect actual-branch &&
+ test_cmp expect actual-tag || return 1
+ done
+'
+
+test_crlf_subject_body_and_contents log --all --reverse --grep Subject
+
+test_crlf_subject_body_and_contents show $LIB_CRLF_BRANCHES
+
+test_done
diff --git a/t/t4000-diff-format.sh b/t/t4000-diff-format.sh
index e5116a7..cce3349 100755
--- a/t/t4000-diff-format.sh
+++ b/t/t4000-diff-format.sh
@@ -7,7 +7,7 @@
'
. ./test-lib.sh
-. "$TEST_DIRECTORY"/diff-lib.sh
+. "$TEST_DIRECTORY"/lib-diff.sh
echo >path0 'Line 1
Line 2
diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh
index c16486a..68f2ebc 100755
--- a/t/t4001-diff-rename.sh
+++ b/t/t4001-diff-rename.sh
@@ -7,7 +7,7 @@
'
. ./test-lib.sh
-. "$TEST_DIRECTORY"/diff-lib.sh
+. "$TEST_DIRECTORY"/lib-diff.sh
test_expect_success 'setup' '
cat >path0 <<-\EOF &&
@@ -262,4 +262,28 @@
grep "myotherfile.*myfile" actual
'
+test_expect_success 'basename similarity vs best similarity' '
+ mkdir subdir &&
+ test_write_lines line1 line2 line3 line4 line5 \
+ line6 line7 line8 line9 line10 >subdir/file.txt &&
+ git add subdir/file.txt &&
+ git commit -m "base txt" &&
+
+ git rm subdir/file.txt &&
+ test_write_lines line1 line2 line3 line4 line5 \
+ line6 line7 line8 >file.txt &&
+ test_write_lines line1 line2 line3 line4 line5 \
+ line6 line7 line8 line9 >file.md &&
+ git add file.txt file.md &&
+ git commit -a -m "rename" &&
+ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+ # subdir/file.txt is 88% similar to file.md, 78% similar to file.txt,
+ # but since same basenames are checked first...
+ cat >expected <<-\EOF &&
+ A file.md
+ R078 subdir/file.txt file.txt
+ EOF
+ test_cmp expected actual
+'
+
test_done
diff --git a/t/t4002-diff-basic.sh b/t/t4002-diff-basic.sh
index cbcdd10..6a9f010 100755
--- a/t/t4002-diff-basic.sh
+++ b/t/t4002-diff-basic.sh
@@ -10,8 +10,6 @@
. "$TEST_DIRECTORY"/lib-read-tree-m-3way.sh
-test_oid_init
-
test_oid_cache <<\EOF
aa_1 sha1:ccba72ad3888a3520b39efcf780b9ee64167535d
aa_1 sha256:9febfbf18197819b2735c45291f138525d2476d59470f98239647544586ba403
diff --git a/t/t4003-diff-rename-1.sh b/t/t4003-diff-rename-1.sh
index df2accb..db07ff3 100755
--- a/t/t4003-diff-rename-1.sh
+++ b/t/t4003-diff-rename-1.sh
@@ -7,11 +7,11 @@
'
. ./test-lib.sh
-. "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash
+. "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash
test_expect_success \
'prepare reference tree' \
- 'cat "$TEST_DIRECTORY"/diff-lib/COPYING >COPYING &&
+ 'cat "$TEST_DIRECTORY"/lib-diff/COPYING >COPYING &&
echo frotz >rezrov &&
git update-index --add COPYING rezrov &&
tree=$(git write-tree) &&
@@ -99,7 +99,7 @@
test_expect_success \
'prepare work tree once again' \
- 'cat "$TEST_DIRECTORY"/diff-lib/COPYING >COPYING &&
+ 'cat "$TEST_DIRECTORY"/lib-diff/COPYING >COPYING &&
git update-index --add --remove COPYING COPYING.1'
# tree has COPYING and rezrov. work tree has COPYING and COPYING.1,
diff --git a/t/t4004-diff-rename-symlink.sh b/t/t4004-diff-rename-symlink.sh
index 6e562c8..3d495e3 100755
--- a/t/t4004-diff-rename-symlink.sh
+++ b/t/t4004-diff-rename-symlink.sh
@@ -10,7 +10,7 @@
by an edit for them.
'
. ./test-lib.sh
-. "$TEST_DIRECTORY"/diff-lib.sh
+. "$TEST_DIRECTORY"/lib-diff.sh
test_expect_success SYMLINKS \
'prepare reference tree' \
diff --git a/t/t4005-diff-rename-2.sh b/t/t4005-diff-rename-2.sh
index f542d29..8647906 100755
--- a/t/t4005-diff-rename-2.sh
+++ b/t/t4005-diff-rename-2.sh
@@ -6,16 +6,16 @@
test_description='Same rename detection as t4003 but testing diff-raw.'
. ./test-lib.sh
-. "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash
+. "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash
test_expect_success 'setup reference tree' '
- cat "$TEST_DIRECTORY"/diff-lib/COPYING >COPYING &&
+ cat "$TEST_DIRECTORY"/lib-diff/COPYING >COPYING &&
echo frotz >rezrov &&
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)
@@ -64,7 +64,7 @@
# nows how to say Copy.
test_expect_success 'validate output from rename/copy detection (#3)' '
- cat "$TEST_DIRECTORY"/diff-lib/COPYING >COPYING &&
+ cat "$TEST_DIRECTORY"/lib-diff/COPYING >COPYING &&
git update-index --add --remove COPYING COPYING.1 &&
cat <<-EOF >expected &&
diff --git a/t/t4006-diff-mode.sh b/t/t4006-diff-mode.sh
index 03489af..275ce5f 100755
--- a/t/t4006-diff-mode.sh
+++ b/t/t4006-diff-mode.sh
@@ -39,13 +39,13 @@
1 file changed, 0 insertions(+), 0 deletions(-)
EOF
git diff HEAD --stat >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success '--shortstat output after text chmod' '
tail -n 1 <expect >expect.short &&
git diff HEAD --shortstat >actual &&
- test_i18ncmp expect.short actual
+ test_cmp expect.short actual
'
test_expect_success '--stat output after binary chmod' '
@@ -56,13 +56,13 @@
2 files changed, 0 insertions(+), 0 deletions(-)
EOF
git diff HEAD --stat >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success '--shortstat output after binary chmod' '
tail -n 1 <expect >expect.short &&
git diff HEAD --shortstat >actual &&
- test_i18ncmp expect.short actual
+ test_cmp expect.short actual
'
test_done
diff --git a/t/t4007-rename-3.sh b/t/t4007-rename-3.sh
index b187b7f..cbb9c62 100755
--- a/t/t4007-rename-3.sh
+++ b/t/t4007-rename-3.sh
@@ -7,17 +7,17 @@
'
. ./test-lib.sh
-. "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash
+. "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash
test_expect_success 'prepare reference tree' '
mkdir path0 path1 &&
- cp "$TEST_DIRECTORY"/diff-lib/COPYING path0/COPYING &&
+ cp "$TEST_DIRECTORY"/lib-diff/COPYING path0/COPYING &&
git update-index --add path0/COPYING &&
tree=$(git write-tree) &&
echo $tree
'
-blob=$(git hash-object "$TEST_DIRECTORY/diff-lib/COPYING")
+blob=$(git hash-object "$TEST_DIRECTORY/lib-diff/COPYING")
test_expect_success 'prepare work tree' '
cp path0/COPYING path1/COPYING &&
git update-index --add --remove path0/COPYING path1/COPYING
diff --git a/t/t4008-diff-break-rewrite.sh b/t/t4008-diff-break-rewrite.sh
index b1ccd41..2299f27 100755
--- a/t/t4008-diff-break-rewrite.sh
+++ b/t/t4008-diff-break-rewrite.sh
@@ -22,11 +22,11 @@
Further, with -B and -M together, these should turn into two renames.
'
. ./test-lib.sh
-. "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash
+. "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash
test_expect_success setup '
- cat "$TEST_DIRECTORY"/diff-lib/README >file0 &&
- cat "$TEST_DIRECTORY"/diff-lib/COPYING >file1 &&
+ cat "$TEST_DIRECTORY"/lib-diff/README >file0 &&
+ cat "$TEST_DIRECTORY"/lib-diff/COPYING >file1 &&
blob0_id=$(git hash-object file0) &&
blob1_id=$(git hash-object file1) &&
git update-index --add file0 file1 &&
diff --git a/t/t4009-diff-rename-4.sh b/t/t4009-diff-rename-4.sh
index b63bdf0..b1da807 100755
--- a/t/t4009-diff-rename-4.sh
+++ b/t/t4009-diff-rename-4.sh
@@ -7,11 +7,11 @@
'
. ./test-lib.sh
-. "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash
+. "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash
test_expect_success \
'prepare reference tree' \
- 'cat "$TEST_DIRECTORY"/diff-lib/COPYING >COPYING &&
+ 'cat "$TEST_DIRECTORY"/lib-diff/COPYING >COPYING &&
echo frotz >rezrov &&
git update-index --add COPYING rezrov &&
orig=$(git hash-object COPYING) &&
@@ -81,7 +81,7 @@
test_expect_success \
'prepare work tree once again' \
- 'cat "$TEST_DIRECTORY"/diff-lib/COPYING >COPYING &&
+ 'cat "$TEST_DIRECTORY"/lib-diff/COPYING >COPYING &&
git update-index --add --remove COPYING COPYING.1'
git diff-index -z -C --find-copies-harder $tree >current
diff --git a/t/t4010-diff-pathspec.sh b/t/t4010-diff-pathspec.sh
index e5ca359..1bbced7 100755
--- a/t/t4010-diff-pathspec.sh
+++ b/t/t4010-diff-pathspec.sh
@@ -10,7 +10,7 @@
path1/file1
'
. ./test-lib.sh
-. "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash
+. "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash
test_expect_success \
setup \
@@ -125,7 +125,9 @@
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/t/t4011-diff-symlink.sh b/t/t4011-diff-symlink.sh
index 717034b..5a25c25 100755
--- a/t/t4011-diff-symlink.sh
+++ b/t/t4011-diff-symlink.sh
@@ -7,7 +7,7 @@
'
. ./test-lib.sh
-. "$TEST_DIRECTORY"/diff-lib.sh
+. "$TEST_DIRECTORY"/lib-diff.sh
# Print the short OID of a symlink with the given name.
symlink_oid () {
diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh
index 6579c81..33ff588 100755
--- a/t/t4012-diff-binary.sh
+++ b/t/t4012-diff-binary.sh
@@ -34,19 +34,19 @@
test_expect_success 'apply --stat output for binary file change' '
git diff >diff &&
git apply --stat --summary <diff >current &&
- test_i18ncmp expected current
+ test_cmp expected current
'
test_expect_success 'diff --shortstat output for binary file change' '
tail -n 1 expected >expect &&
git diff --shortstat >current &&
- test_i18ncmp expect current
+ test_cmp expect current
'
test_expect_success 'diff --shortstat output for binary file change only' '
echo " 1 file changed, 0 insertions(+), 0 deletions(-)" >expected &&
git diff --shortstat -- b >current &&
- test_i18ncmp expected current
+ test_cmp expected current
'
test_expect_success 'apply --numstat notices binary file change' '
@@ -63,7 +63,7 @@
# apply needs to be able to skip the binary material correctly
# in order to report the line number of a corrupt patch.
-test_expect_success C_LOCALE_OUTPUT 'apply detecting corrupt patch correctly' '
+test_expect_success 'apply detecting corrupt patch correctly' '
git diff >output &&
sed -e "s/-CIT/xCIT/" <output >broken &&
test_must_fail git apply --stat --summary broken 2>detected &&
@@ -73,7 +73,7 @@
test "$detected" = xCIT
'
-test_expect_success C_LOCALE_OUTPUT 'apply detecting corrupt patch correctly' '
+test_expect_success 'apply detecting corrupt patch correctly' '
git diff --binary | sed -e "s/-CIT/xCIT/" >broken &&
test_must_fail git apply --stat --summary broken 2>detected &&
detected=$(cat detected) &&
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index dde3f11..6cca8b8 100755
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -5,7 +5,11 @@
test_description='Various diff formatting options'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-diff.sh
test_expect_success setup '
@@ -95,6 +99,15 @@
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 |
@@ -121,32 +134,51 @@
EOF
process_diffs () {
- _x04="[0-9a-f][0-9a-f][0-9a-f][0-9a-f]" &&
- _x07="$_x05[0-9a-f][0-9a-f]" &&
- sed -e "s/$OID_REGEX/$ZERO_OID/g" \
- -e "s/From $_x40 /From $ZERO_OID /" \
- -e "s/from $_x40)/from $ZERO_OID)/" \
- -e "s/commit $_x40\$/commit $ZERO_OID/" \
- -e "s/commit $_x40 (/commit $ZERO_OID (/" \
- -e "s/$_x40 $_x40 $_x40/$ZERO_OID $ZERO_OID $ZERO_OID/" \
- -e "s/$_x40 $_x40 /$ZERO_OID $ZERO_OID /" \
- -e "s/^$_x40 $_x40$/$ZERO_OID $ZERO_OID/" \
- -e "s/^$_x40 /$ZERO_OID /" \
- -e "s/^$_x40$/$ZERO_OID/" \
- -e "s/$_x07\.\.$_x07/fffffff..fffffff/g" \
- -e "s/$_x07,$_x07\.\.$_x07/fffffff,fffffff..fffffff/g" \
- -e "s/$_x07 $_x07 $_x07/fffffff fffffff fffffff/g" \
- -e "s/$_x07 $_x07 /fffffff fffffff /g" \
- -e "s/Merge: $_x07 $_x07/Merge: fffffff fffffff/g" \
- -e "s/$_x07\.\.\./fffffff.../g" \
- -e "s/ $_x04\.\.\./ ffff.../g" \
- -e "s/ $_x04/ ffff/g" \
- "$1"
+ 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
+ status=success
case "$magic" in
'' | '#'*)
continue ;;
@@ -155,6 +187,10 @@
label="$magic-$cmd"
case "$magic" in
noellipses) ;;
+ failure)
+ status=failure
+ magic=
+ label="$cmd" ;;
*)
BUG "unknown magic $magic" ;;
esac ;;
@@ -167,7 +203,7 @@
expect="$TEST_DIRECTORY/t4013/diff.$test"
actual="$pfx-diff.$test"
- test_expect_success "git $cmd # magic is ${magic:-(not used)}" '
+ test_expect_$status "git $cmd # magic is ${magic:-(not used)}" '
{
echo "$ git $cmd"
case "$magic" in
@@ -186,7 +222,7 @@
process_diffs "$expect" >expect &&
case $cmd in
*format-patch* | *-stat*)
- test_i18ncmp expect actual;;
+ test_cmp expect actual;;
*)
test_cmp expect actual;;
esac &&
@@ -212,6 +248,9 @@
: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
@@ -288,9 +327,16 @@
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 -p --diff-merges=first-parent master
+log --diff-merges=first-parent master
log -m -p --first-parent master
log -m -p master
+log --cc -m -p master
+log -c -m -p master
log -SF master
log -S F master
log -SF -p master
@@ -300,6 +346,7 @@
log -GF master
log -GF -p master
log -GF -p --pickaxe-all master
+log -IA -IB -I1 -I2 -p master
log --decorate --all
log --decorate=full --all
@@ -398,6 +445,9 @@
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
@@ -437,4 +487,43 @@
test_cmp expect actual
'
+test_expect_success 'diff -I<regex>: setup' '
+ git checkout master &&
+ test_seq 50 >file0 &&
+ git commit -m "Set up -I<regex> test file" file0 &&
+ test_seq 50 | sed -e "s/13/ten and three/" -e "/7\$/d" >file0 &&
+ echo >>file0
+'
+test_expect_success 'diff -I<regex>' '
+ git diff --ignore-blank-lines -I"ten.*e" -I"^[124-9]" >actual &&
+ cat >expect <<-\EOF &&
+ diff --git a/file0 b/file0
+ --- a/file0
+ +++ b/file0
+ @@ -34,7 +31,6 @@
+ 34
+ 35
+ 36
+ -37
+ 38
+ 39
+ 40
+ EOF
+ compare_diff_patch expect actual
+'
+
+test_expect_success 'diff -I<regex> --stat' '
+ git diff --stat --ignore-blank-lines -I"ten.*e" -I"^[124-9]" >actual &&
+ cat >expect <<-\EOF &&
+ file0 | 1 -
+ 1 file changed, 1 deletion(-)
+ EOF
+ test_cmp expect actual
+'
+
+test_expect_success 'diff -I<regex>: detect malformed regex' '
+ test_expect_code 129 git diff --ignore-matching-lines="^[124-9" 2>error &&
+ test_i18ngrep "invalid regex given to -I: " error
+'
+
test_done
diff --git a/t/t4013/diff.diff-tree_--format=%N_note b/t/t4013/diff.diff-tree_--format=%N_note
new file mode 100644
index 0000000..93042ed
--- /dev/null
+++ b/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/t/t4013/diff.diff-tree_--pretty_--notes_note b/t/t4013/diff.diff-tree_--pretty_--notes_note
new file mode 100644
index 0000000..4d0bde6
--- /dev/null
+++ b/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/t/t4013/diff.diff-tree_--pretty_note b/t/t4013/diff.diff-tree_--pretty_note
new file mode 100644
index 0000000..1fa5967
--- /dev/null
+++ b/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/t/t4013/diff.diff-tree_--root_-p_--abbrev=10_initial b/t/t4013/diff.diff-tree_--root_-p_--abbrev=10_initial
new file mode 100644
index 0000000..7518a90
--- /dev/null
+++ b/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/t/t4013/diff.diff-tree_--root_-p_--full-index_--abbrev=10_initial b/t/t4013/diff.diff-tree_--root_-p_--full-index_--abbrev=10_initial
new file mode 100644
index 0000000..69f913f
--- /dev/null
+++ b/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/t/t4013/diff.diff-tree_--root_-p_--full-index_initial b/t/t4013/diff.diff-tree_--root_-p_--full-index_initial
new file mode 100644
index 0000000..1b0b671
--- /dev/null
+++ b/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/t/t4013/diff.log_--cc_-m_-p_master b/t/t4013/diff.log_--cc_-m_-p_master
new file mode 100644
index 0000000..7c217cf
--- /dev/null
+++ b/t/t4013/diff.log_--cc_-m_-p_master
@@ -0,0 +1,200 @@
+$ git log --cc -m -p master
+commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0)
+Merge: 9a6d494 c7a2ab9
+Author: A U Thor <author@example.com>
+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 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a)
+Merge: 9a6d494 c7a2ab9
+Author: A U Thor <author@example.com>
+Date: Mon Jun 26 00:04:00 2006 +0000
+
+ Merge branch 'side'
+
+diff --git a/dir/sub b/dir/sub
+index 7289e35..992913c 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -1,4 +1,8 @@
+ A
+ B
++C
++D
++E
++F
+ 1
+ 2
+diff --git a/file0 b/file0
+index f4615da..10a8a9f 100644
+--- a/file0
++++ b/file0
+@@ -1,6 +1,9 @@
+ 1
+ 2
+ 3
++4
++5
++6
+ A
+ B
+ C
+diff --git a/file1 b/file1
+new file mode 100644
+index 0000000..b1e6722
+--- /dev/null
++++ b/file1
+@@ -0,0 +1,3 @@
++A
++B
++C
+diff --git a/file2 b/file2
+deleted file mode 100644
+index 01e79c3..0000000
+--- a/file2
++++ /dev/null
+@@ -1,3 +0,0 @@
+-1
+-2
+-3
+diff --git a/file3 b/file3
+deleted file mode 100644
+index 7289e35..0000000
+--- a/file3
++++ /dev/null
+@@ -1,4 +0,0 @@
+-A
+-B
+-1
+-2
+
+commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
+Author: A U Thor <author@example.com>
+Date: Mon Jun 26 00:03:00 2006 +0000
+
+ Side
+
+diff --git a/dir/sub b/dir/sub
+index 35d242b..7289e35 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -1,2 +1,4 @@
+ A
+ B
++1
++2
+diff --git a/file0 b/file0
+index 01e79c3..f4615da 100644
+--- a/file0
++++ b/file0
+@@ -1,3 +1,6 @@
+ 1
+ 2
+ 3
++A
++B
++C
+diff --git a/file3 b/file3
+new file mode 100644
+index 0000000..7289e35
+--- /dev/null
++++ b/file3
+@@ -0,0 +1,4 @@
++A
++B
++1
++2
+
+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/t/t4013/diff.log_--decorate=full_--all b/t/t4013/diff.log_--decorate=full_--all
index 2afe91f..3f9b872 100644
--- a/t/t4013/diff.log_--decorate=full_--all
+++ b/t/t4013/diff.log_--decorate=full_--all
@@ -5,12 +5,27 @@
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/t/t4013/diff.log_--decorate_--all b/t/t4013/diff.log_--decorate_--all
index d0f308a..f5e20e1 100644
--- a/t/t4013/diff.log_--decorate_--all
+++ b/t/t4013/diff.log_--decorate_--all
@@ -5,12 +5,27 @@
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/t/t4013/diff.log_--diff-merges=first-parent_master b/t/t4013/diff.log_--diff-merges=first-parent_master
new file mode 100644
index 0000000..fa63a55
--- /dev/null
+++ b/t/t4013/diff.log_--diff-merges=first-parent_master
@@ -0,0 +1,56 @@
+$ git log --diff-merges=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'
+
+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 c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
+Author: A U Thor <author@example.com>
+Date: Mon Jun 26 00:03:00 2006 +0000
+
+ Side
+
+commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
+Author: A U Thor <author@example.com>
+Date: Mon Jun 26 00:02:00 2006 +0000
+
+ Third
+
+commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
+Author: A U Thor <author@example.com>
+Date: Mon Jun 26 00:01:00 2006 +0000
+
+ Second
+
+ This is the second commit.
+
+commit 444ac553ac7612cc88969031b02b3767fb8a353a
+Author: A U Thor <author@example.com>
+Date: Mon Jun 26 00:00:00 2006 +0000
+
+ Initial
+$
diff --git a/t/t4013/diff.log_--diff-merges=off_-p_--first-parent_master b/t/t4013/diff.log_--diff-merges=off_-p_--first-parent_master
new file mode 100644
index 0000000..194e893
--- /dev/null
+++ b/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/t/t4013/diff.log_--first-parent_--diff-merges=off_-p_master b/t/t4013/diff.log_--first-parent_--diff-merges=off_-p_master
new file mode 100644
index 0000000..5d7461a
--- /dev/null
+++ b/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/t/t4013/diff.log_--no-diff-merges_-p_--first-parent_master b/t/t4013/diff.log_--no-diff-merges_-p_--first-parent_master
new file mode 100644
index 0000000..5970022
--- /dev/null
+++ b/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/t/t4013/diff.log_-IA_-IB_-I1_-I2_-p_master b/t/t4013/diff.log_-IA_-IB_-I1_-I2_-p_master
new file mode 100644
index 0000000..929f35a
--- /dev/null
+++ b/t/t4013/diff.log_-IA_-IB_-I1_-I2_-p_master
@@ -0,0 +1,99 @@
+$ git log -IA -IB -I1 -I2 -p 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 c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
+Author: A U Thor <author@example.com>
+Date: Mon Jun 26 00:03:00 2006 +0000
+
+ Side
+
+diff --git a/file0 b/file0
+index 01e79c3..f4615da 100644
+--- a/file0
++++ b/file0
+@@ -1,3 +1,6 @@
+ 1
+ 2
+ 3
++A
++B
++C
+diff --git a/file3 b/file3
+new file mode 100644
+index 0000000..7289e35
+
+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/t/t4013/diff.log_-c_-m_-p_master b/t/t4013/diff.log_-c_-m_-p_master
new file mode 100644
index 0000000..b660f3d
--- /dev/null
+++ b/t/t4013/diff.log_-c_-m_-p_master
@@ -0,0 +1,200 @@
+$ git log -c -m -p master
+commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0)
+Merge: 9a6d494 c7a2ab9
+Author: A U Thor <author@example.com>
+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 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a)
+Merge: 9a6d494 c7a2ab9
+Author: A U Thor <author@example.com>
+Date: Mon Jun 26 00:04:00 2006 +0000
+
+ Merge branch 'side'
+
+diff --git a/dir/sub b/dir/sub
+index 7289e35..992913c 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -1,4 +1,8 @@
+ A
+ B
++C
++D
++E
++F
+ 1
+ 2
+diff --git a/file0 b/file0
+index f4615da..10a8a9f 100644
+--- a/file0
++++ b/file0
+@@ -1,6 +1,9 @@
+ 1
+ 2
+ 3
++4
++5
++6
+ A
+ B
+ C
+diff --git a/file1 b/file1
+new file mode 100644
+index 0000000..b1e6722
+--- /dev/null
++++ b/file1
+@@ -0,0 +1,3 @@
++A
++B
++C
+diff --git a/file2 b/file2
+deleted file mode 100644
+index 01e79c3..0000000
+--- a/file2
++++ /dev/null
+@@ -1,3 +0,0 @@
+-1
+-2
+-3
+diff --git a/file3 b/file3
+deleted file mode 100644
+index 7289e35..0000000
+--- a/file3
++++ /dev/null
+@@ -1,4 +0,0 @@
+-A
+-B
+-1
+-2
+
+commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
+Author: A U Thor <author@example.com>
+Date: Mon Jun 26 00:03:00 2006 +0000
+
+ Side
+
+diff --git a/dir/sub b/dir/sub
+index 35d242b..7289e35 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -1,2 +1,4 @@
+ A
+ B
++1
++2
+diff --git a/file0 b/file0
+index 01e79c3..f4615da 100644
+--- a/file0
++++ b/file0
+@@ -1,3 +1,6 @@
+ 1
+ 2
+ 3
++A
++B
++C
+diff --git a/file3 b/file3
+new file mode 100644
+index 0000000..7289e35
+--- /dev/null
++++ b/file3
+@@ -0,0 +1,4 @@
++A
++B
++1
++2
+
+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/t/t4013/diff.log_-p_--diff-merges=first-parent_master b/t/t4013/diff.log_-p_--diff-merges=first-parent_master
new file mode 100644
index 0000000..9538a27
--- /dev/null
+++ b/t/t4013/diff.log_-p_--diff-merges=first-parent_master
@@ -0,0 +1,137 @@
+$ git log -p --diff-merges=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'
+
+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 c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
+Author: A U Thor <author@example.com>
+Date: Mon Jun 26 00:03:00 2006 +0000
+
+ Side
+
+diff --git a/dir/sub b/dir/sub
+index 35d242b..7289e35 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -1,2 +1,4 @@
+ A
+ B
++1
++2
+diff --git a/file0 b/file0
+index 01e79c3..f4615da 100644
+--- a/file0
++++ b/file0
+@@ -1,3 +1,6 @@
+ 1
+ 2
+ 3
++A
++B
++C
+diff --git a/file3 b/file3
+new file mode 100644
+index 0000000..7289e35
+--- /dev/null
++++ b/file3
+@@ -0,0 +1,4 @@
++A
++B
++1
++2
+
+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/t/t4013/diff.log_-p_--first-parent_master b/t/t4013/diff.log_-p_--first-parent_master
index 3fc896d..28840eb 100644
--- a/t/t4013/diff.log_-p_--first-parent_master
+++ b/t/t4013/diff.log_-p_--first-parent_master
@@ -6,6 +6,28 @@
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/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index b653dd7..cdd3154 100755
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -5,6 +5,9 @@
test_description='various format-patch tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-terminal.sh
@@ -32,11 +35,11 @@
test_tick &&
git commit -m "Side changes #3 with \\n backslash-n in it." &&
- git checkout master &&
+ git checkout main &&
git diff-tree -p C2 >patch &&
git apply --index <patch &&
test_tick &&
- git commit -m "Master accepts moral equivalent of #2" &&
+ git commit -m "Main accepts moral equivalent of #2" &&
git checkout side &&
git checkout -b patchid &&
@@ -56,57 +59,57 @@
test_tick &&
git commit -m "patchid 3" &&
- git checkout master
+ git checkout main
'
test_expect_success 'format-patch --ignore-if-in-upstream' '
- git format-patch --stdout master..side >patch0 &&
+ git format-patch --stdout main..side >patch0 &&
grep "^From " patch0 >from0 &&
test_line_count = 3 from0
'
test_expect_success 'format-patch --ignore-if-in-upstream' '
git format-patch --stdout \
- --ignore-if-in-upstream master..side >patch1 &&
+ --ignore-if-in-upstream main..side >patch1 &&
grep "^From " patch1 >from1 &&
test_line_count = 2 from1
'
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 tag -a v2 -m tag main &&
git format-patch --stdout --ignore-if-in-upstream v2..v1 >patch1 &&
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 main &&
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 checkout -b merger master &&
+ git commit -am "Feature branch change #2" &&
+ git checkout -b merger main &&
test_tick &&
- git merge --no-ff slave &&
+ 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' '
- git checkout -b rebuild-0 master &&
+ git checkout -b rebuild-0 main &&
git am -3 patch0 &&
- git rev-list master.. >list &&
+ git rev-list main.. >list &&
test_line_count = 2 list
'
test_expect_success 'format-patch --ignore-if-in-upstream result applies' '
- git checkout -b rebuild-1 master &&
+ git checkout -b rebuild-1 main &&
git am -3 patch1 &&
- git rev-list master.. >list &&
+ git rev-list main.. >list &&
test_line_count = 2 list
'
@@ -130,7 +133,7 @@
" &&
git config --add format.headers "Cc: S E Cipient <scipient@example.com>
" &&
- git format-patch --stdout master..side >patch2 &&
+ git format-patch --stdout main..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
@@ -139,7 +142,7 @@
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 &&
+ git format-patch --stdout main..side >patch3 &&
sed -e "/^\$/q" patch3 >hdrs3 &&
grep "^To: R E Cipient <rcipient@example.com>\$" hdrs3 &&
grep "^Cc: S E Cipient <scipient@example.com>\$" hdrs3
@@ -148,7 +151,7 @@
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 &&
+ git format-patch --stdout main..side >patch4 &&
sed -e "/^\$/q" patch4 >hdrs4 &&
grep "^To: R E Cipient <rcipient@example.com>,\$" hdrs4 &&
grep "^ *S E Cipient <scipient@example.com>\$" hdrs4
@@ -156,7 +159,7 @@
test_expect_success 'additional command line cc (ascii)' '
git config --replace-all format.headers "Cc: R E Cipient <rcipient@example.com>" &&
- git format-patch --cc="S E Cipient <scipient@example.com>" --stdout master..side >patch5 &&
+ git format-patch --cc="S E Cipient <scipient@example.com>" --stdout main..side >patch5 &&
sed -e "/^\$/q" patch5 >hdrs5 &&
grep "^Cc: R E Cipient <rcipient@example.com>,\$" hdrs5 &&
grep "^ *S E Cipient <scipient@example.com>\$" hdrs5
@@ -164,7 +167,7 @@
test_expect_failure 'additional command line cc (rfc822)' '
git config --replace-all format.headers "Cc: R E Cipient <rcipient@example.com>" &&
- git format-patch --cc="S. E. Cipient <scipient@example.com>" --stdout master..side >patch5 &&
+ git format-patch --cc="S. E. Cipient <scipient@example.com>" --stdout main..side >patch5 &&
sed -e "/^\$/q" patch5 >hdrs5 &&
grep "^Cc: R E Cipient <rcipient@example.com>,\$" hdrs5 &&
grep "^ *\"S. E. Cipient\" <scipient@example.com>\$" hdrs5
@@ -172,14 +175,14 @@
test_expect_success 'command line headers' '
git config --unset-all format.headers &&
- git format-patch --add-header="Cc: R E Cipient <rcipient@example.com>" --stdout master..side >patch6 &&
+ git format-patch --add-header="Cc: R E Cipient <rcipient@example.com>" --stdout main..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 >patch7 &&
+ git format-patch --add-header="Cc: S E Cipient <scipient@example.com>" --stdout main..side >patch7 &&
sed -e "/^\$/q" patch7 >hdrs7 &&
grep "^Cc: R E Cipient <rcipient@example.com>,\$" hdrs7 &&
grep "^ *S E Cipient <scipient@example.com>\$" hdrs7
@@ -187,40 +190,40 @@
test_expect_success 'command line To: header (ascii)' '
git config --unset-all format.headers &&
- git format-patch --to="R E Cipient <rcipient@example.com>" --stdout master..side >patch8 &&
+ git format-patch --to="R E Cipient <rcipient@example.com>" --stdout main..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 >patch8 &&
+ git format-patch --to="R. E. Cipient <rcipient@example.com>" --stdout main..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 >patch8 &&
+ git format-patch --to="R Ä Cipient <rcipient@example.com>" --stdout main..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 >patch9 &&
+ git format-patch --stdout main..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 >patch9 &&
+ git format-patch --stdout main..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 >patch9 &&
+ git format-patch --stdout main..side >patch9 &&
sed -e "/^\$/q" patch9 >hdrs9 &&
grep "^To: =?UTF-8?q?R=20=C3=84=20Cipient?= <rcipient@example.com>\$" hdrs9
'
@@ -234,35 +237,35 @@
}
test_expect_success 'format.from=false' '
- git -c format.from=false format-patch --stdout master..side >patch &&
+ git -c format.from=false format-patch --stdout main..side >patch &&
sed -e "/^\$/q" patch >hdrs &&
check_patch 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 >patch &&
+ git -c format.from=true format-patch --stdout main..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 >patch &&
+ git -c format.from="F R Om <from@example.com>" format-patch --stdout main..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 >patch &&
+ git -c format.from="F R Om <from@example.com>" format-patch --no-from --stdout main..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 >patch &&
+ git -c format.from="F R Om <from@example.com>" format-patch --from --stdout main..side >patch &&
sed -e "/^\$/q" patch >hdrs &&
check_patch hdrs &&
! grep "^From: F R Om <from@example.com>\$" hdrs
@@ -271,7 +274,7 @@
test_expect_success '--no-to overrides config.to' '
git config --replace-all format.to \
"R E Cipient <rcipient@example.com>" &&
- git format-patch --no-to --stdout master..side >patch10 &&
+ git format-patch --no-to --stdout main..side >patch10 &&
sed -e "/^\$/q" patch10 >hdrs10 &&
check_patch hdrs10 &&
! grep "^To: R E Cipient <rcipient@example.com>\$" hdrs10
@@ -281,7 +284,7 @@
git config --replace-all format.to \
"Someone <someone@out.there>" &&
git format-patch --no-to --to="Someone Else <else@out.there>" \
- --stdout master..side >patch11 &&
+ --stdout main..side >patch11 &&
sed -e "/^\$/q" patch11 >hdrs11 &&
check_patch hdrs11 &&
! grep "^To: Someone <someone@out.there>\$" hdrs11 &&
@@ -291,7 +294,7 @@
test_expect_success '--no-cc overrides config.cc' '
git config --replace-all format.cc \
"C E Cipient <rcipient@example.com>" &&
- git format-patch --no-cc --stdout master..side >patch12 &&
+ git format-patch --no-cc --stdout main..side >patch12 &&
sed -e "/^\$/q" patch12 >hdrs12 &&
check_patch hdrs12 &&
! grep "^Cc: C E Cipient <rcipient@example.com>\$" hdrs12
@@ -300,7 +303,7 @@
test_expect_success '--no-add-header overrides config.headers' '
git config --replace-all format.headers \
"Header1: B E Cipient <rcipient@example.com>" &&
- git format-patch --no-add-header --stdout master..side >patch13 &&
+ git format-patch --no-add-header --stdout main..side >patch13 &&
sed -e "/^\$/q" patch13 >hdrs13 &&
check_patch hdrs13 &&
! grep "^Header1: B E Cipient <rcipient@example.com>\$" hdrs13
@@ -309,13 +312,67 @@
test_expect_success 'multiple files' '
rm -rf patches/ &&
git checkout side &&
- git format-patch -o patches/ master &&
+ git format-patch -o patches/ main &&
ls patches/0001-Side-changes-1.patch patches/0002-Side-changes-2.patch patches/0003-Side-changes-3-with-n-backslash-n-in-it.patch
'
+test_expect_success 'filename length limit' '
+ test_when_finished "rm -f 000*" &&
+ rm -rf 000[1-9]-*.patch &&
+ for len in 15 25 35
+ do
+ git format-patch --filename-max-length=$len -3 side &&
+ max=$(
+ for patch in 000[1-9]-*.patch
+ do
+ echo "$patch" | wc -c
+ done |
+ sort -nr |
+ head -n 1
+ ) &&
+ test $max -le $len || return 1
+ done
+'
+
+test_expect_success 'filename length limit from config' '
+ test_when_finished "rm -f 000*" &&
+ rm -rf 000[1-9]-*.patch &&
+ for len in 15 25 35
+ do
+ git -c format.filenameMaxLength=$len format-patch -3 side &&
+ max=$(
+ for patch in 000[1-9]-*.patch
+ do
+ echo "$patch" | wc -c
+ done |
+ sort -nr |
+ head -n 1
+ ) &&
+ test $max -le $len || return 1
+ done
+'
+
+test_expect_success 'filename limit applies only to basename' '
+ test_when_finished "rm -rf patches/" &&
+ rm -rf patches/ &&
+ for len in 15 25 35
+ do
+ git format-patch -o patches --filename-max-length=$len -3 side &&
+ max=$(
+ for patch in patches/000[1-9]-*.patch
+ do
+ echo "${patch#patches/}" | wc -c
+ done |
+ sort -nr |
+ head -n 1
+ ) &&
+ test $max -le $len || return 1
+ done
+'
+
test_expect_success 'reroll count' '
rm -fr patches &&
- git format-patch -o patches --cover-letter --reroll-count 4 master..side >list &&
+ git format-patch -o patches --cover-letter --reroll-count 4 main..side >list &&
! grep -v "^patches/v4-000[0-3]-" list &&
sed -n -e "/^Subject: /p" $(cat list) >subjects &&
! grep -v "^Subject: \[PATCH v4 [0-3]/3\] " subjects
@@ -323,7 +380,7 @@
test_expect_success 'reroll count (-v)' '
rm -fr patches &&
- git format-patch -o patches --cover-letter -v4 master..side >list &&
+ git format-patch -o patches --cover-letter -v4 main..side >list &&
! grep -v "^patches/v4-000[0-3]-" list &&
sed -n -e "/^Subject: /p" $(cat list) >subjects &&
! grep -v "^Subject: \[PATCH v4 [0-3]/3\] " subjects
@@ -359,7 +416,7 @@
test_expect_success 'no threading' '
git checkout side &&
- check_threading expect.no-threading master
+ check_threading expect.no-threading main
'
cat >expect.thread <<EOF
@@ -376,7 +433,7 @@
EOF
test_expect_success 'thread' '
- check_threading expect.thread --thread master
+ check_threading expect.thread --thread main
'
cat >expect.in-reply-to <<EOF
@@ -396,7 +453,7 @@
test_expect_success 'thread in-reply-to' '
check_threading expect.in-reply-to --in-reply-to="<test.message>" \
- --thread master
+ --thread main
'
cat >expect.cover-letter <<EOF
@@ -417,7 +474,7 @@
EOF
test_expect_success 'thread cover-letter' '
- check_threading expect.cover-letter --cover-letter --thread master
+ check_threading expect.cover-letter --cover-letter --thread main
'
cat >expect.cl-irt <<EOF
@@ -444,12 +501,12 @@
test_expect_success 'thread cover-letter in-reply-to' '
check_threading expect.cl-irt --cover-letter \
- --in-reply-to="<test.message>" --thread master
+ --in-reply-to="<test.message>" --thread main
'
test_expect_success 'thread explicit shallow' '
check_threading expect.cl-irt --cover-letter \
- --in-reply-to="<test.message>" --thread=shallow master
+ --in-reply-to="<test.message>" --thread=shallow main
'
cat >expect.deep <<EOF
@@ -467,7 +524,7 @@
EOF
test_expect_success 'thread deep' '
- check_threading expect.deep --thread=deep master
+ check_threading expect.deep --thread=deep main
'
cat >expect.deep-irt <<EOF
@@ -490,7 +547,7 @@
test_expect_success 'thread deep in-reply-to' '
check_threading expect.deep-irt --thread=deep \
- --in-reply-to="<test.message>" master
+ --in-reply-to="<test.message>" main
'
cat >expect.deep-cl <<EOF
@@ -514,7 +571,7 @@
EOF
test_expect_success 'thread deep cover-letter' '
- check_threading expect.deep-cl --cover-letter --thread=deep master
+ check_threading expect.deep-cl --cover-letter --thread=deep main
'
cat >expect.deep-cl-irt <<EOF
@@ -544,27 +601,27 @@
test_expect_success 'thread deep cover-letter in-reply-to' '
check_threading expect.deep-cl-irt --cover-letter \
- --in-reply-to="<test.message>" --thread=deep master
+ --in-reply-to="<test.message>" --thread=deep main
'
test_expect_success 'thread via config' '
test_config format.thread true &&
- check_threading expect.thread master
+ check_threading expect.thread main
'
test_expect_success 'thread deep via config' '
test_config format.thread deep &&
- check_threading expect.deep master
+ check_threading expect.deep main
'
test_expect_success 'thread config + override' '
test_config format.thread deep &&
- check_threading expect.thread --thread master
+ check_threading expect.thread --thread main
'
test_expect_success 'thread config + --no-thread' '
test_config format.thread deep &&
- check_threading expect.no-threading --no-thread master
+ check_threading expect.no-threading --no-thread main
'
test_expect_success 'excessive subject' '
@@ -577,7 +634,7 @@
after=$(git rev-parse --short $after) &&
git update-index file &&
git commit -m "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 paragraph right at the start as the only thing in the commit message. It had better not become the filename for the patch." &&
- git format-patch -o patches/ master..side &&
+ git format-patch -o patches/ main..side &&
ls patches/0004-This-is-an-excessively-long-subject-line-for-a-messa.patch
'
@@ -831,21 +888,21 @@
test_expect_success 'options no longer allowed for format-patch' '
test_must_fail git format-patch --name-only 2>output &&
- test_i18ncmp expect.name-only output &&
+ test_cmp expect.name-only output &&
test_must_fail git format-patch --name-status 2>output &&
- test_i18ncmp expect.name-status output &&
+ test_cmp expect.name-status output &&
test_must_fail git format-patch --check 2>output &&
- test_i18ncmp expect.check output
+ test_cmp expect.check output
'
test_expect_success 'format-patch --numstat should produce a patch' '
- git format-patch --numstat --stdout master..side >output &&
+ git format-patch --numstat --stdout main..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 &&
+ git format-patch main..side -- file 2>error &&
! grep "Use .--" error
'
@@ -1161,6 +1218,59 @@
'
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' '
@@ -1549,13 +1659,26 @@
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_must_fail git format-patch --cover-letter --cover-from-description garbage main &&
test_config format.coverFromDescription garbage &&
- test_must_fail git format-patch --cover-letter master
+ test_must_fail git format-patch --cover-letter main
'
test_expect_success 'cover letter with format.coverFromDescription = default' '
@@ -1564,7 +1687,7 @@
body" &&
test_config format.coverFromDescription default &&
git checkout rebuild-1 &&
- git format-patch --stdout --cover-letter master >actual &&
+ git format-patch --stdout --cover-letter main >actual &&
grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
grep "^config subject$" actual &&
@@ -1576,7 +1699,7 @@
body" &&
git checkout rebuild-1 &&
- git format-patch --stdout --cover-letter --cover-from-description default master >actual &&
+ git format-patch --stdout --cover-letter --cover-from-description default main >actual &&
grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
grep "^config subject$" actual &&
@@ -1589,7 +1712,7 @@
body" &&
test_config format.coverFromDescription none &&
git checkout rebuild-1 &&
- git format-patch --stdout --cover-letter master >actual &&
+ git format-patch --stdout --cover-letter main >actual &&
grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
! grep "^config subject$" actual &&
@@ -1601,7 +1724,7 @@
body" &&
git checkout rebuild-1 &&
- git format-patch --stdout --cover-letter --cover-from-description none master >actual &&
+ git format-patch --stdout --cover-letter --cover-from-description none main >actual &&
grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
! grep "^config subject$" actual &&
@@ -1614,7 +1737,7 @@
body" &&
test_config format.coverFromDescription message &&
git checkout rebuild-1 &&
- git format-patch --stdout --cover-letter master >actual &&
+ git format-patch --stdout --cover-letter main >actual &&
grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
grep "^config subject$" actual &&
@@ -1626,7 +1749,7 @@
body" &&
git checkout rebuild-1 &&
- git format-patch --stdout --cover-letter --cover-from-description message master >actual &&
+ git format-patch --stdout --cover-letter --cover-from-description message main >actual &&
grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
grep "^config subject$" actual &&
@@ -1639,7 +1762,7 @@
body" &&
test_config format.coverFromDescription subject &&
git checkout rebuild-1 &&
- git format-patch --stdout --cover-letter master >actual &&
+ git format-patch --stdout --cover-letter main >actual &&
grep "^Subject: \[PATCH 0/2\] config subject$" actual &&
! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
! grep "^config subject$" actual &&
@@ -1651,7 +1774,7 @@
body" &&
git checkout rebuild-1 &&
- git format-patch --stdout --cover-letter --cover-from-description subject master >actual &&
+ git format-patch --stdout --cover-letter --cover-from-description subject main >actual &&
grep "^Subject: \[PATCH 0/2\] config subject$" actual &&
! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
! grep "^config subject$" actual &&
@@ -1664,7 +1787,7 @@
body" &&
test_config format.coverFromDescription auto &&
git checkout rebuild-1 &&
- git format-patch --stdout --cover-letter master >actual &&
+ git format-patch --stdout --cover-letter main >actual &&
grep "^Subject: \[PATCH 0/2\] config subject$" actual &&
! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
! grep "^config subject$" actual &&
@@ -1676,7 +1799,7 @@
body" &&
git checkout rebuild-1 &&
- git format-patch --stdout --cover-letter --cover-from-description auto master >actual &&
+ git format-patch --stdout --cover-letter --cover-from-description auto main >actual &&
grep "^Subject: \[PATCH 0/2\] config subject$" actual &&
! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
! grep "^config subject$" actual &&
@@ -1689,7 +1812,7 @@
body" &&
test_config format.coverFromDescription auto &&
git checkout rebuild-1 &&
- git format-patch --stdout --cover-letter master >actual &&
+ git format-patch --stdout --cover-letter main >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 &&
@@ -1701,7 +1824,7 @@
body" &&
git checkout rebuild-1 &&
- git format-patch --stdout --cover-letter --cover-from-description auto master >actual &&
+ git format-patch --stdout --cover-letter --cover-from-description auto main >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 &&
@@ -1714,7 +1837,7 @@
body" &&
test_config format.coverFromDescription none &&
git checkout rebuild-1 &&
- git format-patch --stdout --cover-letter --cover-from-description subject master >actual &&
+ git format-patch --stdout --cover-letter --cover-from-description subject main >actual &&
grep "^Subject: \[PATCH 0/2\] config subject$" actual &&
! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
! grep "^config subject$" actual &&
@@ -1724,7 +1847,7 @@
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 &&
+ git format-patch --stdout --cover-letter main >actual &&
grep hello actual
'
@@ -1738,14 +1861,14 @@
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 &&
+ git format-patch --stdout --cover-letter ^main rebuild-1 >actual &&
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 &&
+ git format-patch --stdout --cover-letter main.. >actual &&
grep hello actual
'
@@ -1812,8 +1935,8 @@
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) &&
+ git format-patch -o patches main..side &&
+ count=$(git rev-list --count main..side) &&
ls patches >list &&
test_line_count = $count list
'
@@ -1821,16 +1944,16 @@
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) &&
+ git format-patch -o existing-dir/patches main..side &&
+ count=$(git rev-list --count main..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) &&
+ git format-patch -o non-existing-dir/patches main..side &&
+ count=$(git rev-list --count main..side) &&
test_path_is_dir non-existing-dir &&
ls non-existing-dir/patches >list &&
test_line_count = $count list
@@ -1839,8 +1962,8 @@
test_expect_success 'format-patch format.outputDirectory option' '
test_config format.outputDirectory patches &&
rm -fr patches &&
- git format-patch master..side &&
- count=$(git rev-list --count master..side) &&
+ git format-patch main..side &&
+ count=$(git rev-list --count main..side) &&
ls patches >list &&
test_line_count = $count list
'
@@ -1848,11 +1971,44 @@
test_expect_success 'format-patch -o overrides format.outputDirectory' '
test_config format.outputDirectory patches &&
rm -fr patches patchset &&
- git format-patch master..side -o patchset &&
+ git format-patch main..side -o patchset &&
test_path_is_missing patches &&
test_path_is_dir patchset
'
+test_expect_success 'format-patch forbids multiple outputs' '
+ rm -fr outfile outdir &&
+ test_must_fail \
+ git format-patch --stdout --output-directory=outdir &&
+ test_must_fail \
+ git format-patch --stdout --output=outfile &&
+ test_must_fail \
+ git format-patch --output=outfile --output-directory=outdir
+'
+
+test_expect_success 'configured outdir does not conflict with output options' '
+ rm -fr outfile outdir &&
+ test_config format.outputDirectory outdir &&
+ git format-patch --stdout &&
+ test_path_is_missing outdir &&
+ git format-patch --output=outfile &&
+ test_path_is_missing outdir
+'
+
+test_expect_success 'format-patch --output' '
+ rm -fr outfile &&
+ git format-patch -3 --stdout HEAD >expect &&
+ git format-patch -3 --output=outfile HEAD &&
+ test_cmp expect outfile
+'
+
+test_expect_success 'format-patch --cover-letter --output' '
+ rm -fr outfile &&
+ git format-patch --cover-letter -3 --stdout HEAD >expect &&
+ git format-patch --cover-letter -3 --output=outfile HEAD &&
+ test_cmp expect outfile
+'
+
test_expect_success 'format-patch --base' '
git checkout patchid &&
@@ -1912,14 +2068,14 @@
# ------------W
#
# If "format-patch Z..X" is given, P and Z can not be specified as the base commit
- git checkout -b topic1 master &&
+ git checkout -b topic1 main &&
git rev-parse HEAD >commit-id-base &&
test_commit P &&
git rev-parse HEAD >commit-id-P &&
test_commit Z &&
git rev-parse HEAD >commit-id-Z &&
test_commit Y &&
- git checkout -b topic2 master &&
+ git checkout -b topic2 main &&
test_commit W &&
git merge topic1 &&
test_commit X &&
@@ -1932,7 +2088,7 @@
'
test_expect_success 'format-patch --base=auto' '
- git checkout -b upstream master &&
+ git checkout -b upstream main &&
git checkout -b local upstream &&
git branch --set-upstream-to=upstream &&
test_commit N1 &&
@@ -1953,11 +2109,11 @@
# \ / \
# C---M2---E
#
- git checkout master &&
+ git checkout main &&
test_commit A &&
- git checkout -b xb master &&
+ git checkout -b xb main &&
test_commit B &&
- git checkout -b xc master &&
+ git checkout -b xc main &&
test_commit C &&
git checkout -b xbc xb -- &&
git merge xc &&
@@ -1971,6 +2127,12 @@
test_must_fail git format-patch --base=auto -1
'
+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 &&
test_config format.useAutoBase true &&
@@ -1981,6 +2143,16 @@
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_config format.useAutoBase true &&
git format-patch --stdout --base=HEAD~1 -1 >patch &&
@@ -1996,6 +2168,12 @@
! 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' '
git format-patch --attach=mimemime --stdout --base=HEAD~ -1 >patch &&
sed -n -e "/^base-commit:/s/.*/1/p" -e "/^---*mimemime--$/s/.*/2/p" \
@@ -2055,7 +2233,7 @@
'
test_expect_success 'interdiff: setup' '
- git checkout -b boop master &&
+ git checkout -b boop main &&
test_commit fnorp blorp &&
test_commit fleep blorp
'
diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh
index 88d3026..2c13b62 100755
--- a/t/t4015-diff-whitespace.sh
+++ b/t/t4015-diff-whitespace.sh
@@ -7,7 +7,7 @@
'
. ./test-lib.sh
-. "$TEST_DIRECTORY"/diff-lib.sh
+. "$TEST_DIRECTORY"/lib-diff.sh
test_expect_success "Ray Lehtiniemi's example" '
cat <<-\EOF >x &&
@@ -567,6 +567,30 @@
git diff --check --quiet
'
+test_expect_success '-w and --exit-code interact sensibly' '
+ test_when_finished "git checkout x" &&
+ {
+ test_seq 15 &&
+ echo " 16"
+ } >x &&
+ test_must_fail git diff --exit-code &&
+ git diff -w >actual &&
+ test_must_be_empty actual &&
+ git diff -w --exit-code
+'
+
+test_expect_success '-I and --exit-code interact sensibly' '
+ test_when_finished "git checkout x" &&
+ {
+ test_seq 15 &&
+ echo " 16"
+ } >x &&
+ test_must_fail git diff --exit-code &&
+ git diff -I. >actual &&
+ test_must_be_empty actual &&
+ git diff -I. --exit-code
+'
+
test_expect_success 'check staged with no whitespace errors' '
echo "foo();" >x &&
git add x &&
@@ -789,7 +813,7 @@
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 &&
@@ -799,8 +823,42 @@
test_must_be_empty actual
'
-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 &&
+ git commit -m "base" &&
+ sed -e "5s/^/ /" x >z &&
+ git rm x &&
+ git add z &&
+ 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) &&
@@ -843,13 +901,13 @@
test_expect_success 'combined diff with autocrlf conversion' '
git reset --hard &&
- echo >x hello &&
- git commit -m "one side" x &&
+ test_commit "one side" x hello one-side &&
git checkout HEAD^ &&
echo >x goodbye &&
git commit -m "the other side" x &&
git config core.autocrlf true &&
- test_must_fail git merge master &&
+ test_must_fail git merge one-side >actual &&
+ test_i18ngrep "Automatic merge failed" actual &&
git diff >actual.raw &&
sed -e "1,/^@@@/d" actual.raw >actual &&
diff --git a/t/t4016-diff-quote.sh b/t/t4016-diff-quote.sh
index 9c48e5c..876271d 100755
--- a/t/t4016-diff-quote.sh
+++ b/t/t4016-diff-quote.sh
@@ -82,7 +82,7 @@
7 files changed, 0 insertions(+), 0 deletions(-)
EOF
git diff --stat -M HEAD >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_done
diff --git a/t/t4017-diff-retval.sh b/t/t4017-diff-retval.sh
index 95a7ca7..ed461f4 100755
--- a/t/t4017-diff-retval.sh
+++ b/t/t4017-diff-retval.sh
@@ -2,6 +2,9 @@
test_description='Return value of diffs'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup' '
@@ -111,7 +114,7 @@
git checkout HEAD^ &&
echo binary >>b &&
git commit -m "side" b &&
- test_must_fail git merge master &&
+ test_must_fail git merge main &&
git add b &&
test_expect_code 2 git --no-pager diff --cached --check >test.out &&
test 3 = $(grep "conflict marker" test.out | wc -l) &&
diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh
index 02255a0..9675bc1 100755
--- a/t/t4018-diff-funcname.sh
+++ b/t/t4018-diff-funcname.sh
@@ -27,6 +27,7 @@
diffpatterns="
ada
+ bash
bibtex
cpp
csharp
@@ -38,6 +39,7 @@
golang
html
java
+ markdown
matlab
objc
pascal
diff --git a/t/t4018/bash-arithmetic-function b/t/t4018/bash-arithmetic-function
new file mode 100644
index 0000000..c0b276c
--- /dev/null
+++ b/t/t4018/bash-arithmetic-function
@@ -0,0 +1,4 @@
+RIGHT() ((
+
+ ChangeMe = "$x" + "$y"
+))
diff --git a/t/t4018/bash-bashism-style-compact b/t/t4018/bash-bashism-style-compact
new file mode 100644
index 0000000..1ca3126
--- /dev/null
+++ b/t/t4018/bash-bashism-style-compact
@@ -0,0 +1,6 @@
+function RIGHT {
+ function InvalidSyntax{
+ :
+ echo 'ChangeMe'
+ }
+}
diff --git a/t/t4018/bash-bashism-style-function b/t/t4018/bash-bashism-style-function
new file mode 100644
index 0000000..f1de4fa
--- /dev/null
+++ b/t/t4018/bash-bashism-style-function
@@ -0,0 +1,4 @@
+function RIGHT {
+ :
+ echo 'ChangeMe'
+}
diff --git a/t/t4018/bash-bashism-style-whitespace b/t/t4018/bash-bashism-style-whitespace
new file mode 100644
index 0000000..ade85dd
--- /dev/null
+++ b/t/t4018/bash-bashism-style-whitespace
@@ -0,0 +1,4 @@
+ function RIGHT ( ) {
+
+ ChangeMe
+ }
diff --git a/t/t4018/bash-conditional-function b/t/t4018/bash-conditional-function
new file mode 100644
index 0000000..c5949e8
--- /dev/null
+++ b/t/t4018/bash-conditional-function
@@ -0,0 +1,4 @@
+RIGHT() [[ \
+
+ "$a" > "$ChangeMe"
+]]
diff --git a/t/t4018/bash-missing-parentheses b/t/t4018/bash-missing-parentheses
new file mode 100644
index 0000000..8c8a05d
--- /dev/null
+++ b/t/t4018/bash-missing-parentheses
@@ -0,0 +1,6 @@
+function RIGHT {
+ functionInvalidSyntax {
+ :
+ echo 'ChangeMe'
+ }
+}
diff --git a/t/t4018/bash-mixed-style-compact b/t/t4018/bash-mixed-style-compact
new file mode 100644
index 0000000..d9364cb
--- /dev/null
+++ b/t/t4018/bash-mixed-style-compact
@@ -0,0 +1,4 @@
+function RIGHT(){
+ :
+ echo 'ChangeMe'
+}
diff --git a/t/t4018/bash-mixed-style-function b/t/t4018/bash-mixed-style-function
new file mode 100644
index 0000000..555f9b2
--- /dev/null
+++ b/t/t4018/bash-mixed-style-function
@@ -0,0 +1,4 @@
+function RIGHT() {
+
+ ChangeMe
+}
diff --git a/t/t4018/bash-nested-functions b/t/t4018/bash-nested-functions
new file mode 100644
index 0000000..2c9237e
--- /dev/null
+++ b/t/t4018/bash-nested-functions
@@ -0,0 +1,6 @@
+outer() {
+ RIGHT() {
+ :
+ echo 'ChangeMe'
+ }
+}
diff --git a/t/t4018/bash-other-characters b/t/t4018/bash-other-characters
new file mode 100644
index 0000000..a3f390d
--- /dev/null
+++ b/t/t4018/bash-other-characters
@@ -0,0 +1,4 @@
+_RIGHT_0n() {
+
+ ChangeMe
+}
diff --git a/t/t4018/bash-posix-style-compact b/t/t4018/bash-posix-style-compact
new file mode 100644
index 0000000..045bd20
--- /dev/null
+++ b/t/t4018/bash-posix-style-compact
@@ -0,0 +1,4 @@
+RIGHT(){
+
+ ChangeMe
+}
diff --git a/t/t4018/bash-posix-style-function b/t/t4018/bash-posix-style-function
new file mode 100644
index 0000000..a4d1448
--- /dev/null
+++ b/t/t4018/bash-posix-style-function
@@ -0,0 +1,4 @@
+RIGHT() {
+
+ ChangeMe
+}
diff --git a/t/t4018/bash-posix-style-whitespace b/t/t4018/bash-posix-style-whitespace
new file mode 100644
index 0000000..4d984f0
--- /dev/null
+++ b/t/t4018/bash-posix-style-whitespace
@@ -0,0 +1,4 @@
+ RIGHT ( ) {
+
+ ChangeMe
+ }
diff --git a/t/t4018/bash-subshell-function b/t/t4018/bash-subshell-function
new file mode 100644
index 0000000..80baa09
--- /dev/null
+++ b/t/t4018/bash-subshell-function
@@ -0,0 +1,4 @@
+RIGHT() (
+
+ ChangeMe=2
+)
diff --git a/t/t4018/bash-trailing-comment b/t/t4018/bash-trailing-comment
new file mode 100644
index 0000000..f1edbed
--- /dev/null
+++ b/t/t4018/bash-trailing-comment
@@ -0,0 +1,4 @@
+RIGHT() { # Comment
+
+ ChangeMe
+}
diff --git a/t/t4018/css-attribute-value-selector b/t/t4018/css-attribute-value-selector
new file mode 100644
index 0000000..918256b
--- /dev/null
+++ b/t/t4018/css-attribute-value-selector
@@ -0,0 +1,4 @@
+[class*="RIGHT"] {
+ background : #000;
+ border : 10px ChangeMe #C6C6C6;
+}
diff --git a/t/t4018/css-block-level-@-statements b/t/t4018/css-block-level-@-statements
new file mode 100644
index 0000000..d6755f2
--- /dev/null
+++ b/t/t4018/css-block-level-@-statements
@@ -0,0 +1,10 @@
+@keyframes RIGHT {
+ from {
+ background : #000;
+ border : 10px ChangeMe #C6C6C6;
+ }
+ to {
+ background : #fff;
+ border : 10px solid #C6C6C6;
+ }
+}
diff --git a/t/t4018/css-class-selector b/t/t4018/css-class-selector
new file mode 100644
index 0000000..f790a00
--- /dev/null
+++ b/t/t4018/css-class-selector
@@ -0,0 +1,4 @@
+.RIGHT {
+ background : #000;
+ border : 10px ChangeMe #C6C6C6;
+}
diff --git a/t/t4018/css-id-selector b/t/t4018/css-id-selector
new file mode 100644
index 0000000..17c5111
--- /dev/null
+++ b/t/t4018/css-id-selector
@@ -0,0 +1,4 @@
+#RIGHT {
+ background : #000;
+ border : 10px ChangeMe #C6C6C6;
+}
diff --git a/t/t4018/css-root-selector b/t/t4018/css-root-selector
new file mode 100644
index 0000000..22b958e
--- /dev/null
+++ b/t/t4018/css-root-selector
@@ -0,0 +1,4 @@
+:RIGHT {
+ background : #000;
+ border : 10px ChangeMe #C6C6C6;
+}
diff --git a/t/t4018/fortran-block-data b/t/t4018/fortran-block-data
new file mode 100644
index 0000000..63d4e21
--- /dev/null
+++ b/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/t/t4018/fortran-comment b/t/t4018/fortran-comment
new file mode 100644
index 0000000..7b10d17
--- /dev/null
+++ b/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/t/t4018/fortran-comment-keyword b/t/t4018/fortran-comment-keyword
new file mode 100644
index 0000000..e9206a5
--- /dev/null
+++ b/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/t/t4018/fortran-comment-legacy b/t/t4018/fortran-comment-legacy
new file mode 100644
index 0000000..53cd062
--- /dev/null
+++ b/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/t/t4018/fortran-comment-legacy-star b/t/t4018/fortran-comment-legacy-star
new file mode 100644
index 0000000..2cbcdc3
--- /dev/null
+++ b/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/t/t4018/fortran-external-function b/t/t4018/fortran-external-function
new file mode 100644
index 0000000..5a2d85d
--- /dev/null
+++ b/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/t/t4018/fortran-external-subroutine b/t/t4018/fortran-external-subroutine
new file mode 100644
index 0000000..4ce85fe
--- /dev/null
+++ b/t/t4018/fortran-external-subroutine
@@ -0,0 +1,5 @@
+subroutine RIGHT
+
+real ChangeMe
+
+end subroutine RIGHT
diff --git a/t/t4018/fortran-module b/t/t4018/fortran-module
new file mode 100644
index 0000000..c4b737d
--- /dev/null
+++ b/t/t4018/fortran-module
@@ -0,0 +1,5 @@
+module RIGHT
+
+use ChangeMe
+
+end module RIGHT
diff --git a/t/t4018/fortran-module-procedure b/t/t4018/fortran-module-procedure
new file mode 100644
index 0000000..1ce6d85
--- /dev/null
+++ b/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/t/t4018/fortran-program b/t/t4018/fortran-program
new file mode 100644
index 0000000..4616895
--- /dev/null
+++ b/t/t4018/fortran-program
@@ -0,0 +1,5 @@
+program RIGHT
+
+call ChangeMe
+
+end program RIGHT
diff --git a/t/t4018/markdown-heading-indented b/t/t4018/markdown-heading-indented
new file mode 100644
index 0000000..1991c2b
--- /dev/null
+++ b/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/t/t4018/markdown-heading-non-headings b/t/t4018/markdown-heading-non-headings
new file mode 100644
index 0000000..c479c1a
--- /dev/null
+++ b/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/t/t4018/php-abstract-method b/t/t4018/php-abstract-method
new file mode 100644
index 0000000..ce215df7
--- /dev/null
+++ b/t/t4018/php-abstract-method
@@ -0,0 +1,7 @@
+abstract class Klass
+{
+ abstract public function RIGHT(): ?string
+ {
+ return 'ChangeMe';
+ }
+}
diff --git a/t/t4018/php-final-method b/t/t4018/php-final-method
new file mode 100644
index 0000000..537fb8a
--- /dev/null
+++ b/t/t4018/php-final-method
@@ -0,0 +1,7 @@
+class Klass
+{
+ final public function RIGHT(): string
+ {
+ return 'ChangeMe';
+ }
+}
diff --git a/t/t4018/rust-macro-rules b/t/t4018/rust-macro-rules
new file mode 100644
index 0000000..ec610c5
--- /dev/null
+++ b/t/t4018/rust-macro-rules
@@ -0,0 +1,6 @@
+macro_rules! RIGHT {
+ () => {
+ // a comment
+ let x = ChangeMe;
+ };
+}
diff --git a/t/t4027-diff-submodule.sh b/t/t4027-diff-submodule.sh
index e29deaf..94ef77e 100755
--- a/t/t4027-diff-submodule.sh
+++ b/t/t4027-diff-submodule.sh
@@ -3,10 +3,9 @@
test_description='difference in submodules'
. ./test-lib.sh
-. "$TEST_DIRECTORY"/diff-lib.sh
+. "$TEST_DIRECTORY"/lib-diff.sh
test_expect_success setup '
- test_oid_init &&
test_tick &&
test_create_repo sub &&
(
@@ -94,6 +93,14 @@
) &&
git diff HEAD >actual &&
sed -e "1,/^@@/d" actual >actual.body &&
+ expect_from_to >expect.body $subtip $subprev &&
+ test_cmp expect.body actual.body
+'
+
+test_expect_success 'git diff HEAD with dirty submodule (untracked) (none ignored)' '
+ test_config diff.ignoreSubmodules none &&
+ git diff HEAD >actual &&
+ sed -e "1,/^@@/d" actual >actual.body &&
expect_from_to >expect.body $subtip $subprev-dirty &&
test_cmp expect.body actual.body
'
@@ -169,13 +176,13 @@
git clean -qfdx &&
>cruft
) &&
- git diff HEAD >actual &&
+ git diff --ignore-submodules=none HEAD >actual &&
sed -e "1,/^@@/d" actual >actual.body &&
expect_from_to >expect.body $subprev $subprev-dirty &&
test_cmp expect.body actual.body &&
git diff --ignore-submodules=all HEAD >actual2 &&
test_must_be_empty actual2 &&
- git diff --ignore-submodules=untracked HEAD >actual3 &&
+ git diff HEAD >actual3 &&
test_must_be_empty actual3 &&
git diff --ignore-submodules=dirty HEAD >actual4 &&
test_must_be_empty actual4
diff --git a/t/t4030-diff-textconv.sh b/t/t4030-diff-textconv.sh
index 4cb9f0e..c906320 100755
--- a/t/t4030-diff-textconv.sh
+++ b/t/t4030-diff-textconv.sh
@@ -139,7 +139,7 @@
test_expect_success 'diffstat does not run textconv' '
echo file diff=fail >.gitattributes &&
git diff --stat HEAD^ HEAD >actual &&
- test_i18ncmp expect.stat actual &&
+ test_cmp expect.stat actual &&
head -n1 <expect.stat >expect.line1 &&
head -n1 <actual >actual.line1 &&
diff --git a/t/t4034-diff-words.sh b/t/t4034-diff-words.sh
index fb145aa..56f1e62 100755
--- a/t/t4034-diff-words.sh
+++ b/t/t4034-diff-words.sh
@@ -3,7 +3,7 @@
test_description='word diff colors'
. ./test-lib.sh
-. "$TEST_DIRECTORY"/diff-lib.sh
+. "$TEST_DIRECTORY"/lib-diff.sh
cat >pre.simple <<-\EOF
h(4)
@@ -102,7 +102,7 @@
'
test_expect_success '--word-diff=porcelain' '
- sed 's/#.*$//' >expect <<-EOF &&
+ sed "s/#.*$//" >expect <<-EOF &&
diff --git a/pre b/post
index $pre..$post 100644
--- a/pre
diff --git a/t/t4038-diff-combined.sh b/t/t4038-diff-combined.sh
index 9468083..aeac203 100755
--- a/t/t4038-diff-combined.sh
+++ b/t/t4038-diff-combined.sh
@@ -2,8 +2,11 @@
test_description='combined diff'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
-. "$TEST_DIRECTORY"/diff-lib.sh
+. "$TEST_DIRECTORY"/lib-diff.sh
setup_helper () {
one=$1 branch=$2 side=$3 &&
@@ -115,7 +118,7 @@
'
test_expect_success 'setup combined ignore spaces' '
- git checkout master &&
+ git checkout main &&
>test &&
git add test &&
git commit -m initial &&
@@ -143,7 +146,7 @@
EOF
git commit -m "test other space changes" -a &&
- test_must_fail git merge master &&
+ test_must_fail git merge main &&
tr -d Q <<-\EOF >test &&
eol spaces Q
space change
@@ -404,7 +407,7 @@
test_expect_success 'combine diff gets tree sorting right' '
# create a directory and a file that sort differently in trees
# versus byte-wise (implied "/" sorts after ".")
- git checkout -f master &&
+ git checkout -f main &&
mkdir foo &&
echo base >foo/one &&
echo base >foo/two &&
@@ -414,9 +417,9 @@
# one side modifies a file in the directory, along with the root
# file...
- echo master >foo/one &&
- echo master >foo.ext &&
- git commit -a -m master &&
+ echo main >foo/one &&
+ echo main >foo.ext &&
+ git commit -a -m main &&
# the other side modifies the other file in the directory
git checkout -b other HEAD^ &&
@@ -426,7 +429,7 @@
# And now we merge. The files in the subdirectory will resolve cleanly,
# meaning that a combined diff will not find them interesting. But it
# will find the tree itself interesting, because it had to be merged.
- git checkout master &&
+ git checkout main &&
git merge other &&
printf "MM\tfoo\n" >expect &&
diff --git a/t/t4041-diff-submodule-option.sh b/t/t4041-diff-submodule-option.sh
index f852136..0c1502d 100755
--- a/t/t4041-diff-submodule-option.sh
+++ b/t/t4041-diff-submodule-option.sh
@@ -9,6 +9,9 @@
This test tries to verify the sanity of the --submodule option of git diff.
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
# Tested non-UTF-8 encoding
@@ -262,7 +265,7 @@
test_expect_success 'submodule contains untracked content' '
echo new > sm1/new-file &&
- git diff-index -p --submodule=log HEAD >actual &&
+ git diff-index -p --ignore-submodules=none --submodule=log HEAD >actual &&
cat >expected <<-EOF &&
Submodule sm1 contains untracked content
EOF
@@ -270,7 +273,7 @@
'
test_expect_success 'submodule contains untracked content (untracked ignored)' '
- git diff-index -p --ignore-submodules=untracked --submodule=log HEAD >actual &&
+ git diff-index -p --submodule=log HEAD >actual &&
test_must_be_empty actual
'
@@ -286,7 +289,7 @@
test_expect_success 'submodule contains untracked and modified content' '
echo new > sm1/foo6 &&
- git diff-index -p --submodule=log HEAD >actual &&
+ git diff-index -p --ignore-submodules=none --submodule=log HEAD >actual &&
cat >expected <<-EOF &&
Submodule sm1 contains untracked content
Submodule sm1 contains modified content
@@ -296,7 +299,7 @@
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 &&
+ git diff-index -p --submodule=log HEAD >actual &&
cat >expected <<-EOF &&
Submodule sm1 contains modified content
EOF
@@ -337,7 +340,7 @@
test_expect_success 'modified submodule contains untracked content' '
echo new > sm1/new-file &&
- git diff-index -p --submodule=log HEAD >actual &&
+ git diff-index -p --ignore-submodules=none --submodule=log HEAD >actual &&
cat >expected <<-EOF &&
Submodule sm1 contains untracked content
Submodule sm1 $head6..$head8:
@@ -347,7 +350,7 @@
'
test_expect_success 'modified submodule contains untracked content (untracked ignored)' '
- git diff-index -p --ignore-submodules=untracked --submodule=log HEAD >actual &&
+ git diff-index -p --submodule=log HEAD >actual &&
cat >expected <<-EOF &&
Submodule sm1 $head6..$head8:
> change
@@ -371,7 +374,7 @@
test_expect_success 'modified submodule contains untracked and modified content' '
echo modification >> sm1/foo6 &&
- git diff-index -p --submodule=log HEAD >actual &&
+ git diff-index -p --ignore-submodules=none --submodule=log HEAD >actual &&
cat >expected <<-EOF &&
Submodule sm1 contains untracked content
Submodule sm1 contains modified content
@@ -383,7 +386,7 @@
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 &&
+ git diff-index -p --submodule=log HEAD >actual &&
cat >expected <<-EOF &&
Submodule sm1 contains modified content
Submodule sm1 $head6..$head8:
@@ -538,7 +541,7 @@
(cd super &&
(cd sub &&
git fetch &&
- git checkout origin/master
+ git checkout origin/main
) &&
git diff --submodule > ../actual
) &&
diff --git a/t/t4045-diff-relative.sh b/t/t4045-diff-relative.sh
index 2588087..61ba5f7 100755
--- a/t/t4045-diff-relative.sh
+++ b/t/t4045-diff-relative.sh
@@ -8,7 +8,8 @@
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 @@
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
@@ -60,7 +61,7 @@
EOF
test_expect_success "--stat $*" "
git -C '$dir' diff --stat $* HEAD^ >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
"
}
@@ -70,7 +71,7 @@
expect=$1
shift
cat >expected <<-EOF
- :000000 100644 $ZERO_OID $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 @@
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/t/t4048-diff-combined-binary.sh b/t/t4048-diff-combined-binary.sh
index 7f9ad9f..0260cf6 100755
--- a/t/t4048-diff-combined-binary.sh
+++ b/t/t4048-diff-combined-binary.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='combined and merge diff handle binary files and textconv'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup binary merge conflict' '
@@ -14,7 +17,7 @@
echo threeQ3 | q_to_nul >binary &&
git commit -a -m three &&
three=$(git rev-parse --short HEAD:binary) &&
- test_must_fail git merge master &&
+ test_must_fail git merge main &&
echo resolvedQhooray | q_to_nul >binary &&
git commit -a -m resolved &&
res=$(git rev-parse --short HEAD:binary)
@@ -62,14 +65,14 @@
'
test_expect_success 'setup non-binary with binary attribute' '
- git checkout master &&
+ git checkout main &&
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_must_fail git merge main &&
test_commit resolved text &&
res=$(git rev-parse --short HEAD:text) &&
echo text -diff >.gitattributes
@@ -206,11 +209,11 @@
+THREE
++=======
+ TWO
-++>>>>>>> MASTER
+++>>>>>>> MAIN
EOF
test_expect_success 'diff --cc respects textconv on worktree file' '
git reset --hard HEAD^ &&
- test_must_fail git merge master &&
+ test_must_fail git merge main &&
git diff >actual &&
test_cmp expect actual
'
diff --git a/t/t4049-diff-stat-count.sh b/t/t4049-diff-stat-count.sh
index a341217..53061b1 100755
--- a/t/t4049-diff-stat-count.sh
+++ b/t/t4049-diff-stat-count.sh
@@ -25,7 +25,7 @@
4 files changed, 2 insertions(+)
EOF
git diff --stat --stat-count=2 HEAD >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'binary changes do not count in lines' '
@@ -40,7 +40,7 @@
3 files changed, 2 insertions(+)
EOF
git diff --stat --stat-count=2 >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'exclude unmerged entries from total file count' '
@@ -62,7 +62,7 @@
3 files changed, 3 insertions(+)
EOF
git diff --stat --stat-count=2 >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_done
diff --git a/t/t4052-stat-output.sh b/t/t4052-stat-output.sh
index 28c0538..9eba436 100755
--- a/t/t4052-stat-output.sh
+++ b/t/t4052-stat-output.sh
@@ -5,6 +5,9 @@
test_description='test --stat output of various commands'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-terminal.sh
@@ -353,7 +356,7 @@
EOF
test_expect_success 'merge --stat respects COLUMNS (big change)' '
git checkout -b branch HEAD^^ &&
- COLUMNS=100 git merge --stat --no-ff master^ >output &&
+ COLUMNS=100 git merge --stat --no-ff main^ >output &&
grep " | " output >actual &&
test_cmp expect actual
'
@@ -362,7 +365,7 @@
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 +++++++++++++++++++++++++++++++++++++++
EOF
test_expect_success 'merge --stat respects COLUMNS (long filename)' '
- COLUMNS=100 git merge --stat --no-ff master >output &&
+ COLUMNS=100 git merge --stat --no-ff main >output &&
grep " | " output >actual &&
test_cmp expect actual
'
diff --git a/t/t4056-diff-order.sh b/t/t4056-diff-order.sh
index 43dd474..aec1d9d 100755
--- a/t/t4056-diff-order.sh
+++ b/t/t4056-diff-order.sh
@@ -1,6 +1,9 @@
#!/bin/sh
-test_description='diff order'
+test_description='diff order & rotate'
+
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
. ./test-lib.sh
@@ -106,7 +109,7 @@
test_expect_success 'setup for testing combine-diff order' '
git checkout -b tmp HEAD~ &&
create_files 3 &&
- git checkout master &&
+ git checkout main &&
git merge --no-commit -s ours tmp &&
create_files 5
'
@@ -124,4 +127,74 @@
'
done
+### rotate and skip
+
+test_expect_success 'rotate and skip setup' '
+ >sample1.t &&
+ >sample2.t &&
+ >sample3.t &&
+ >sample4.t &&
+ git add sample[1234].t &&
+ git commit -m "added" sample[1234].t &&
+ echo modified >>sample1.t &&
+ echo modified >>sample2.t &&
+ echo modified >>sample4.t &&
+ git commit -m "updated" sample[1234].t
+'
+
+test_expect_success 'diff --rotate-to' '
+ git diff --rotate-to=sample2.t --name-only HEAD^ >actual &&
+ test_write_lines sample2.t sample4.t sample1.t >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'diff --skip-to' '
+ git diff --skip-to=sample2.t --name-only HEAD^ >actual &&
+ test_write_lines sample2.t sample4.t >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'diff --rotate/skip-to error condition' '
+ test_must_fail git diff --rotate-to=sample3.t HEAD^ &&
+ test_must_fail git diff --skip-to=sample3.t HEAD^
+'
+
+test_expect_success 'log --rotate-to' '
+ git log --rotate-to=sample3.t --raw HEAD~2.. >raw &&
+ # just distill the commit header and paths
+ sed -n -e "s/^commit.*/commit/p" \
+ -e "/^:/s/^.* //p" raw >actual &&
+
+ cat >expect <<-\EOF &&
+ commit
+ sample4.t
+ sample1.t
+ sample2.t
+ commit
+ sample3.t
+ sample4.t
+ sample1.t
+ sample2.t
+ EOF
+
+ test_cmp expect actual
+'
+
+test_expect_success 'log --skip-to' '
+ git log --skip-to=sample3.t --raw HEAD~2.. >raw &&
+ # just distill the commit header and paths
+ sed -n -e "s/^commit.*/commit/p" \
+ -e "/^:/s/^.* //p" raw >actual &&
+
+ cat >expect <<-\EOF &&
+ commit
+ sample4.t
+ commit
+ sample3.t
+ sample4.t
+ EOF
+
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t4057-diff-combined-paths.sh b/t/t4057-diff-combined-paths.sh
index 4f4b541..7e5b74f 100755
--- a/t/t4057-diff-combined-paths.sh
+++ b/t/t4057-diff-combined-paths.sh
@@ -2,6 +2,9 @@
test_description='combined diff show only paths that are different to all parents'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
# verify that diffc.expect matches output of
@@ -14,7 +17,7 @@
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" &&
@@ -24,9 +27,9 @@
echo $i/2 >>$i.txt
done &&
git commit -a -m "side 2-9" &&
- git checkout master &&
+ git checkout main &&
echo 1/2 >1.txt &&
- git commit -a -m "master 1" &&
+ git commit -a -m "main 1" &&
git merge side &&
>diffc.expect &&
diffc_verify
@@ -41,19 +44,19 @@
done &&
echo "4side" >>4.txt &&
git commit -a -m "side 2-9 +4" &&
- git checkout master &&
+ git checkout main &&
for i in $(test_seq 1 9)
do
echo $i/3 >>$i.txt
done &&
- echo "4master" >>4.txt &&
- git commit -a -m "master 1-9 +4" &&
+ echo "4main" >>4.txt &&
+ git commit -a -m "main 1-9 +4" &&
test_must_fail git merge side &&
cat <<-\EOF >4.txt &&
4
4/2
4/3
- 4master
+ 4main
4side
EOF
git add 4.txt &&
@@ -69,12 +72,12 @@
echo $i/4 >>$i.txt
done &&
git commit -a -m "side 5-9" &&
- git checkout master &&
+ git checkout main &&
for i in $(test_seq 1 3)
do
echo $i/4 >>$i.txt
done &&
- git commit -a -m "master 1-3 +4hello" &&
+ git commit -a -m "main 1-3 +4hello" &&
git merge side &&
echo "Hello World" >4hello.txt &&
git add 4hello.txt &&
@@ -90,12 +93,12 @@
echo $i/5 >>$i.txt
done &&
git commit -a -m "side 5-9" &&
- git checkout master &&
+ git checkout main &&
for i in $(test_seq 1 3)
do
echo $i/4 >>$i.txt
done &&
- git commit -a -m "master 1-3" &&
+ git commit -a -m "main 1-3" &&
git merge side &&
git rm 4.txt &&
git commit --amend &&
diff --git a/t/t4058-diff-duplicates.sh b/t/t4058-diff-duplicates.sh
index c24ee17..54614b8 100755
--- a/t/t4058-diff-duplicates.sh
+++ b/t/t4058-diff-duplicates.sh
@@ -1,5 +1,14 @@
#!/bin/sh
+# NOTICE:
+# This testsuite does a number of diffs and checks that the output match.
+# However, it is a "garbage in, garbage out" situation; the trees have
+# duplicate entries for individual paths, and it results in diffs that do
+# not make much sense. As such, it is not clear that the diffs are
+# "correct". The primary purpose of these tests was to verify that
+# diff-tree does not segfault, but there is perhaps some value in ensuring
+# that the diff output isn't wildly unreasonable.
+
test_description='test tree diff when trees have duplicate entries'
. ./test-lib.sh
@@ -57,7 +66,16 @@
git tag two $outer_two
'
-test_expect_success 'diff-tree between trees' '
+test_expect_success 'create tree without duplicate entries' '
+ blob_one=$(echo one | git hash-object -w --stdin) &&
+ outer_three=$(make_tree \
+ 100644 renamed $blob_one
+ ) &&
+ git tag three $outer_three
+'
+
+test_expect_success 'diff-tree between duplicate trees' '
+ # See NOTICE at top of file
{
printf ":000000 100644 $ZERO_OID $blob_two A\touter/inner\n" &&
printf ":000000 100644 $ZERO_OID $blob_two A\touter/inner\n" &&
@@ -71,9 +89,101 @@
'
test_expect_success 'diff-tree with renames' '
- # same expectation as above, since we disable rename detection
+ # See NOTICE at top of file.
git diff-tree -M -r --no-abbrev one two >actual &&
+ test_must_be_empty actual
+'
+
+test_expect_success 'diff-tree FROM duplicate tree' '
+ # See NOTICE at top of file.
+ {
+ printf ":100644 000000 $blob_one $ZERO_OID D\touter/inner\n" &&
+ printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n" &&
+ printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n" &&
+ printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n" &&
+ printf ":000000 100644 $ZERO_OID $blob_one A\trenamed\n"
+ } >expect &&
+ git diff-tree -r --no-abbrev one three >actual &&
test_cmp expect actual
'
+test_expect_success 'diff-tree FROM duplicate tree, with renames' '
+ # See NOTICE at top of file.
+ {
+ printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n" &&
+ printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n" &&
+ printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n" &&
+ printf ":100644 100644 $blob_one $blob_one R100\touter/inner\trenamed\n"
+ } >expect &&
+ git diff-tree -M -r --no-abbrev one three >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'create a few commits' '
+ git commit-tree -m "Duplicate Entries" two^{tree} >commit_id &&
+ git branch base $(cat commit_id) &&
+
+ git commit-tree -p $(cat commit_id) -m "Just one" three^{tree} >up &&
+ git branch update $(cat up) &&
+
+ git commit-tree -p $(cat up) -m "Back to weird" two^{tree} >final &&
+ git branch final $(cat final) &&
+
+ rm commit_id up final
+'
+
+test_expect_failure 'git read-tree does not segfault' '
+ test_when_finished rm .git/index.lock &&
+ test_might_fail git read-tree --reset base
+'
+
+test_expect_failure 'reset --hard does not segfault' '
+ test_when_finished rm .git/index.lock &&
+ git checkout base &&
+ test_might_fail git reset --hard
+'
+
+test_expect_failure 'git diff HEAD does not segfault' '
+ git checkout base &&
+ GIT_TEST_CHECK_CACHE_TREE=false &&
+ git reset --hard &&
+ test_might_fail git diff HEAD
+'
+
+test_expect_failure 'can switch to another branch when status is empty' '
+ git clean -ffdqx &&
+ git status --porcelain -uno >actual &&
+ test_must_be_empty actual &&
+ git checkout update
+'
+
+test_expect_success 'forcibly switch to another branch, verify status empty' '
+ git checkout -f update &&
+ git status --porcelain -uno >actual &&
+ test_must_be_empty actual
+'
+
+test_expect_success 'fast-forward from non-duplicate entries to duplicate' '
+ git merge final
+'
+
+test_expect_failure 'clean status, switch branches, status still clean' '
+ git status --porcelain -uno >actual &&
+ test_must_be_empty actual &&
+ git checkout base &&
+ git status --porcelain -uno >actual &&
+ test_must_be_empty actual
+'
+
+test_expect_success 'switch to base branch and force status to be clean' '
+ git checkout base &&
+ GIT_TEST_CHECK_CACHE_TREE=false git reset --hard &&
+ git status --porcelain -uno >actual &&
+ test_must_be_empty actual
+'
+
+test_expect_failure 'fast-forward from duplicate entries to non-duplicate' '
+ git merge update
+'
+
test_done
diff --git a/t/t4060-diff-submodule-option-diff-format.sh b/t/t4060-diff-submodule-option-diff-format.sh
index fc8229c..dc7b242 100755
--- a/t/t4060-diff-submodule-option-diff-format.sh
+++ b/t/t4060-diff-submodule-option-diff-format.sh
@@ -409,7 +409,7 @@
test_expect_success 'submodule contains untracked content' '
echo new > sm1/new-file &&
- git diff-index -p --submodule=diff HEAD >actual &&
+ git diff-index -p --ignore-submodules=none --submodule=diff HEAD >actual &&
cat >expected <<-EOF &&
Submodule sm1 contains untracked content
EOF
@@ -417,7 +417,7 @@
'
test_expect_success 'submodule contains untracked content (untracked ignored)' '
- git diff-index -p --ignore-submodules=untracked --submodule=diff HEAD >actual &&
+ git diff-index -p --submodule=diff HEAD >actual &&
test_must_be_empty actual
'
@@ -433,7 +433,7 @@
test_expect_success 'submodule contains untracked and modified content' '
echo new > sm1/foo6 &&
- git diff-index -p --submodule=diff HEAD >actual &&
+ git diff-index -p --ignore-submodules=none --submodule=diff HEAD >actual &&
cat >expected <<-EOF &&
Submodule sm1 contains untracked content
Submodule sm1 contains modified content
@@ -451,7 +451,7 @@
# NOT OK
test_expect_success 'submodule contains untracked and modified content (untracked ignored)' '
echo new > sm1/foo6 &&
- git diff-index -p --ignore-submodules=untracked --submodule=diff HEAD >actual &&
+ git diff-index -p --submodule=diff HEAD >actual &&
cat >expected <<-EOF &&
Submodule sm1 contains modified content
diff --git a/sm1/foo6 b/sm1/foo6
@@ -512,7 +512,7 @@
test_expect_success 'modified submodule contains untracked content' '
echo new > sm1/new-file &&
- git diff-index -p --submodule=diff HEAD >actual &&
+ git diff-index -p --ignore-submodules=none --submodule=diff HEAD >actual &&
cat >expected <<-EOF &&
Submodule sm1 contains untracked content
Submodule sm1 $head7..$head8:
@@ -528,7 +528,7 @@
'
test_expect_success 'modified submodule contains untracked content (untracked ignored)' '
- git diff-index -p --ignore-submodules=untracked --submodule=diff HEAD >actual &&
+ git diff-index -p --submodule=diff HEAD >actual &&
cat >expected <<-EOF &&
Submodule sm1 $head7..$head8:
diff --git a/sm1/foo6 b/sm1/foo6
@@ -564,7 +564,7 @@
test_expect_success 'modified submodule contains untracked and modified content' '
echo modification >> sm1/foo6 &&
- git diff-index -p --submodule=diff HEAD >actual &&
+ git diff-index -p --ignore-submodules=none --submodule=diff HEAD >actual &&
cat >expected <<-EOF &&
Submodule sm1 contains untracked content
Submodule sm1 contains modified content
@@ -583,7 +583,7 @@
test_expect_success 'modified submodule contains untracked and modified content (untracked ignored)' '
echo modification >> sm1/foo6 &&
- git diff-index -p --ignore-submodules=untracked --submodule=diff HEAD >actual &&
+ git diff-index -p --submodule=diff HEAD >actual &&
cat >expected <<-EOF &&
Submodule sm1 contains modified content
Submodule sm1 $head7..$head8:
diff --git a/t/t4061-diff-indent.sh b/t/t4061-diff-indent.sh
index 2affd7a..7750b87 100755
--- a/t/t4061-diff-indent.sh
+++ b/t/t4061-diff-indent.sh
@@ -3,8 +3,11 @@
test_description='Test diff indent heuristic.
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
-. "$TEST_DIRECTORY"/diff-lib.sh
+. "$TEST_DIRECTORY"/lib-diff.sh
# Compare two diff outputs. Ignore "index" lines, because we don't
# care about SHA-1s or file modes.
@@ -17,7 +20,7 @@
# 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
}
@@ -266,7 +269,7 @@
git reset --soft HEAD~ &&
git diff-index --indent-heuristic -p old -- spaces.txt >out-diff-index-compacted &&
compare_diff spaces-compacted-expect out-diff-index-compacted &&
- git checkout -f master
+ git checkout -f main
'
test_expect_success 'diff-index: nice spaces with diff.indentHeuristic=true' '
@@ -274,7 +277,7 @@
git reset --soft HEAD~ &&
git -c diff.indentHeuristic=true diff-index -p old -- spaces.txt >out-diff-index-compacted2 &&
compare_diff spaces-compacted-expect out-diff-index-compacted2 &&
- git checkout -f master
+ git checkout -f main
'
test_expect_success 'diff-index: ugly spaces with --no-indent-heuristic' '
@@ -282,7 +285,7 @@
git reset --soft HEAD~ &&
git diff-index --no-indent-heuristic -p old -- spaces.txt >out-diff-index &&
compare_diff spaces-expect out-diff-index &&
- git checkout -f master
+ git checkout -f main
'
test_expect_success 'diff-index: ugly spaces with diff.indentHeuristic=false' '
@@ -290,7 +293,7 @@
git reset --soft HEAD~ &&
git -c diff.indentHeuristic=false diff-index -p old -- spaces.txt >out-diff-index2 &&
compare_diff spaces-expect out-diff-index2 &&
- git checkout -f master
+ git checkout -f main
'
test_expect_success 'diff-index: --indent-heuristic overrides config' '
@@ -298,7 +301,7 @@
git reset --soft HEAD~ &&
git -c diff.indentHeuristic=false diff-index --indent-heuristic -p old -- spaces.txt >out-diff-index-compacted3 &&
compare_diff spaces-compacted-expect out-diff-index-compacted3 &&
- git checkout -f master
+ git checkout -f main
'
test_expect_success 'diff-index: --no-indent-heuristic overrides config' '
@@ -306,7 +309,7 @@
git reset --soft HEAD~ &&
git -c diff.indentHeuristic=true diff-index --no-indent-heuristic -p old -- spaces.txt >out-diff-index3 &&
compare_diff spaces-expect out-diff-index3 &&
- git checkout -f master
+ git checkout -f main
'
# --- diff-files tests ----------------------------------------------------
@@ -317,7 +320,7 @@
git diff-files --indent-heuristic -p spaces.txt >out-diff-files-raw &&
grep -v index out-diff-files-raw >out-diff-files-compacted &&
compare_diff spaces-compacted-expect out-diff-files-compacted &&
- git checkout -f master
+ git checkout -f main
'
test_expect_success 'diff-files: nice spaces with diff.indentHeuristic=true' '
@@ -326,7 +329,7 @@
git -c diff.indentHeuristic=true diff-files -p spaces.txt >out-diff-files-raw2 &&
grep -v index out-diff-files-raw2 >out-diff-files-compacted2 &&
compare_diff spaces-compacted-expect out-diff-files-compacted2 &&
- git checkout -f master
+ git checkout -f main
'
test_expect_success 'diff-files: ugly spaces with --no-indent-heuristic' '
@@ -335,7 +338,7 @@
git diff-files --no-indent-heuristic -p spaces.txt >out-diff-files-raw &&
grep -v index out-diff-files-raw >out-diff-files &&
compare_diff spaces-expect out-diff-files &&
- git checkout -f master
+ git checkout -f main
'
test_expect_success 'diff-files: ugly spaces with diff.indentHeuristic=false' '
@@ -344,7 +347,7 @@
git -c diff.indentHeuristic=false diff-files -p spaces.txt >out-diff-files-raw2 &&
grep -v index out-diff-files-raw2 >out-diff-files &&
compare_diff spaces-expect out-diff-files &&
- git checkout -f master
+ git checkout -f main
'
test_expect_success 'diff-files: --indent-heuristic overrides config' '
@@ -353,7 +356,7 @@
git -c diff.indentHeuristic=false diff-files --indent-heuristic -p spaces.txt >out-diff-files-raw3 &&
grep -v index out-diff-files-raw3 >out-diff-files-compacted &&
compare_diff spaces-compacted-expect out-diff-files-compacted &&
- git checkout -f master
+ git checkout -f main
'
test_expect_success 'diff-files: --no-indent-heuristic overrides config' '
@@ -362,7 +365,7 @@
git -c diff.indentHeuristic=true diff-files --no-indent-heuristic -p spaces.txt >out-diff-files-raw4 &&
grep -v index out-diff-files-raw4 >out-diff-files &&
compare_diff spaces-expect out-diff-files &&
- git checkout -f master
+ git checkout -f main
'
test_done
diff --git a/t/t4064-diff-oidfind.sh b/t/t4064-diff-oidfind.sh
index 3bdf317..6d8c898 100755
--- a/t/t4064-diff-oidfind.sh
+++ b/t/t4064-diff-oidfind.sh
@@ -65,4 +65,59 @@
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/t/t4066-diff-emit-delay.sh b/t/t4066-diff-emit-delay.sh
index 6331f63..a1de63b 100755
--- a/t/t4066-diff-emit-delay.sh
+++ b/t/t4066-diff-emit-delay.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='test combined/stat/moved interaction'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
# This test covers a weird 3-way interaction between "--cc -p", which will run
@@ -13,7 +16,7 @@
test_commit B &&
git checkout -b side HEAD^ &&
test_commit C &&
- git merge -m M master &&
+ git merge -m M main &&
test_commit D
'
diff --git a/t/t4067-diff-partial-clone.sh b/t/t4067-diff-partial-clone.sh
index 4831ad3..804f2a8 100755
--- a/t/t4067-diff-partial-clone.sh
+++ b/t/t4067-diff-partial-clone.sh
@@ -20,7 +20,7 @@
# 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 @@
# 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
'
@@ -125,9 +125,57 @@
# 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/t/t4068-diff-symmetric-merge-base.sh b/t/t4068-diff-symmetric-merge-base.sh
new file mode 100755
index 0000000..2d650d8
--- /dev/null
+++ b/t/t4068-diff-symmetric-merge-base.sh
@@ -0,0 +1,196 @@
+#!/bin/sh
+
+test_description='behavior of diff with symmetric-diff setups and --merge-base'
+
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./test-lib.sh
+
+# build these situations:
+# - normal merge with one merge base (br1...b2r);
+# - criss-cross merge ie 2 merge bases (br1...main);
+# - disjoint subgraph (orphan branch, br3...main).
+#
+# B---E <-- main
+# / \ /
+# 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 main &&
+ git tag commit-D &&
+ git checkout main &&
+ 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...main >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 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...main br2...br3 2>err &&
+ test_i18ngrep "usage" err
+'
+
+test_expect_success 'diff with symmetric difference and extraneous arg' '
+ test_must_fail git diff main br1...main 2>err &&
+ test_i18ngrep "usage" err
+'
+
+test_expect_success 'diff with two ranges' '
+ test_must_fail git diff main br1..main br2..br3 2>err &&
+ test_i18ngrep "usage" err
+'
+
+test_expect_success 'diff with ranges and extra arg' '
+ test_must_fail git diff main br1..main commit-D 2>err &&
+ test_i18ngrep "usage" err
+'
+
+test_expect_success 'diff --merge-base with no commits' '
+ test_must_fail git diff --merge-base
+'
+
+test_expect_success 'diff --merge-base with three commits' '
+ test_must_fail git diff --merge-base br1 br2 main 2>err &&
+ test_i18ngrep "usage" err
+'
+
+for cmd in diff-index diff
+do
+ test_expect_success "$cmd --merge-base with one commit" '
+ git checkout main &&
+ git $cmd commit-C >expect &&
+ git $cmd --merge-base br2 >actual &&
+ test_cmp expect actual
+ '
+
+ test_expect_success "$cmd --merge-base with one commit and unstaged changes" '
+ git checkout main &&
+ test_when_finished git reset --hard &&
+ echo unstaged >>c &&
+ git $cmd commit-C >expect &&
+ git $cmd --merge-base br2 >actual &&
+ test_cmp expect actual
+ '
+
+ test_expect_success "$cmd --merge-base with one commit and staged and unstaged changes" '
+ git checkout main &&
+ test_when_finished git reset --hard &&
+ echo staged >>c &&
+ git add c &&
+ echo unstaged >>c &&
+ git $cmd commit-C >expect &&
+ git $cmd --merge-base br2 >actual &&
+ test_cmp expect actual
+ '
+
+ test_expect_success "$cmd --merge-base --cached with one commit and staged and unstaged changes" '
+ git checkout main &&
+ test_when_finished git reset --hard &&
+ echo staged >>c &&
+ git add c &&
+ echo unstaged >>c &&
+ git $cmd --cached commit-C >expect &&
+ git $cmd --cached --merge-base br2 >actual &&
+ test_cmp expect actual
+ '
+
+ test_expect_success "$cmd --merge-base with non-commit" '
+ git checkout main &&
+ test_must_fail git $cmd --merge-base main^{tree} 2>err &&
+ test_i18ngrep "fatal: --merge-base only works with commits" err
+ '
+
+ test_expect_success "$cmd --merge-base with no merge bases and one commit" '
+ git checkout main &&
+ test_must_fail git $cmd --merge-base br3 2>err &&
+ test_i18ngrep "fatal: no merge base found" err
+ '
+
+ test_expect_success "$cmd --merge-base with multiple merge bases and one commit" '
+ git checkout main &&
+ test_must_fail git $cmd --merge-base br1 2>err &&
+ test_i18ngrep "fatal: multiple merge bases found" err
+ '
+done
+
+for cmd in diff-tree diff
+do
+ test_expect_success "$cmd --merge-base with two commits" '
+ git $cmd commit-C main >expect &&
+ git $cmd --merge-base br2 main >actual &&
+ test_cmp expect actual
+ '
+
+ test_expect_success "$cmd --merge-base commit and non-commit" '
+ test_must_fail git $cmd --merge-base br2 main^{tree} 2>err &&
+ test_i18ngrep "fatal: --merge-base only works with commits" err
+ '
+
+ test_expect_success "$cmd --merge-base with no merge bases and two commits" '
+ test_must_fail git $cmd --merge-base br2 br3 2>err &&
+ test_i18ngrep "fatal: no merge base found" err
+ '
+
+ test_expect_success "$cmd --merge-base with multiple merge bases and two commits" '
+ test_must_fail git $cmd --merge-base main br1 2>err &&
+ test_i18ngrep "fatal: multiple merge bases found" err
+ '
+done
+
+test_expect_success 'diff-tree --merge-base with one commit' '
+ test_must_fail git diff-tree --merge-base main 2>err &&
+ test_i18ngrep "fatal: --merge-base only works with two commits" err
+'
+
+test_expect_success 'diff --merge-base with range' '
+ test_must_fail git diff --merge-base br2..br3 2>err &&
+ test_i18ngrep "fatal: --merge-base does not work with ranges" err
+'
+
+test_done
diff --git a/t/t4100-apply-stat.sh b/t/t4100-apply-stat.sh
index 744b8e5..9b433de 100755
--- a/t/t4100-apply-stat.sh
+++ b/t/t4100-apply-stat.sh
@@ -17,13 +17,13 @@
test_expect_success "$title" '
git apply --stat --summary \
<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
- test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+ test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
'
test_expect_success "$title with recount" '
sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
git apply --recount --stat --summary >current &&
- test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+ test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
'
done <<\EOF
rename
diff --git a/t/t4103-apply-binary.sh b/t/t4103-apply-binary.sh
index 1b420e3..fad6d3f 100755
--- a/t/t4103-apply-binary.sh
+++ b/t/t4103-apply-binary.sh
@@ -6,6 +6,9 @@
test_description='git apply handling binary patches
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup' '
@@ -31,64 +34,64 @@
git update-index --add --remove file1 file2 file3 file4 &&
git commit -m "Second Version" &&
- git diff-tree -p master binary >B.diff &&
- git diff-tree -p -C master binary >C.diff &&
+ git diff-tree -p main binary >B.diff &&
+ git diff-tree -p -C main binary >C.diff &&
- git diff-tree -p --binary master binary >BF.diff &&
- git diff-tree -p --binary -C master binary >CF.diff &&
+ git diff-tree -p --binary main binary >BF.diff &&
+ git diff-tree -p --binary -C main binary >CF.diff &&
- git diff-tree -p --full-index master binary >B-index.diff &&
- git diff-tree -p -C --full-index master binary >C-index.diff &&
+ git diff-tree -p --full-index main binary >B-index.diff &&
+ git diff-tree -p -C --full-index main binary >C-index.diff &&
- git diff-tree -p --binary --no-prefix master binary -- file3 >B0.diff &&
+ git diff-tree -p --binary --no-prefix main binary -- file3 >B0.diff &&
git init other-repo &&
(
cd other-repo &&
- git fetch .. master &&
+ git fetch .. main &&
git reset --hard FETCH_HEAD
)
'
test_expect_success 'stat binary diff -- should not fail.' \
- 'git checkout master &&
+ 'git checkout main &&
git apply --stat --summary B.diff'
test_expect_success 'stat binary -p0 diff -- should not fail.' '
- git checkout master &&
+ git checkout main &&
git apply --stat -p0 B0.diff
'
test_expect_success 'stat binary diff (copy) -- should not fail.' \
- 'git checkout master &&
+ 'git checkout main &&
git apply --stat --summary C.diff'
test_expect_success 'check binary diff -- should fail.' \
- 'git checkout master &&
+ 'git checkout main &&
test_must_fail git apply --check B.diff'
test_expect_success 'check binary diff (copy) -- should fail.' \
- 'git checkout master &&
+ 'git checkout main &&
test_must_fail git apply --check C.diff'
test_expect_success \
'check incomplete binary diff with replacement -- should fail.' '
- git checkout master &&
+ git checkout main &&
test_must_fail git apply --check --allow-binary-replacement B.diff
'
test_expect_success \
'check incomplete binary diff with replacement (copy) -- should fail.' '
- git checkout master &&
+ git checkout main &&
test_must_fail git apply --check --allow-binary-replacement C.diff
'
test_expect_success 'check binary diff with replacement.' \
- 'git checkout master &&
+ 'git checkout main &&
git apply --check --allow-binary-replacement BF.diff'
test_expect_success 'check binary diff with replacement (copy).' \
- 'git checkout master &&
+ 'git checkout main &&
git apply --check --allow-binary-replacement CF.diff'
# Now we start applying them.
@@ -96,7 +99,7 @@
do_reset () {
rm -f file? &&
git reset --hard &&
- git checkout -f master
+ git checkout -f main
}
test_expect_success 'apply binary diff -- should fail.' \
diff --git a/t/t4104-apply-boundary.sh b/t/t4104-apply-boundary.sh
index 32e3b0e..71ef413 100755
--- a/t/t4104-apply-boundary.sh
+++ b/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 @@
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 @@
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 @@
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/t/t4108-apply-threeway.sh b/t/t4108-apply-threeway.sh
index d7349ce..d62db3f 100755
--- a/t/t4108-apply-threeway.sh
+++ b/t/t4108-apply-threeway.sh
@@ -2,6 +2,9 @@
test_description='git apply --3way'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
print_sanitized_conflicted_diff () {
@@ -24,14 +27,14 @@
test_tick &&
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 commit -a -m main &&
git checkout side &&
test_write_lines 1 2 3 4 five 6 7 >one &&
test_write_lines 1 2 3 4 five 6 7 >two &&
git commit -a -m side &&
- git checkout master
+ git checkout main
'
test_expect_success 'apply without --3way' '
@@ -39,7 +42,7 @@
# should fail to apply
git reset --hard &&
- git checkout master^0 &&
+ git checkout main^0 &&
test_must_fail git apply --index P.diff &&
# should leave things intact
git diff-files --exit-code &&
@@ -52,14 +55,14 @@
# The corresponding conflicted merge
git reset --hard &&
- git checkout master^0 &&
+ git checkout main^0 &&
test_must_fail git merge --no-commit side &&
git ls-files -s >expect.ls &&
print_sanitized_conflicted_diff >expect.diff &&
# should fail to apply
git reset --hard &&
- git checkout master^0 &&
+ git checkout main^0 &&
test_must_fail git apply --index --3way P.diff &&
git ls-files -s >actual.ls &&
print_sanitized_conflicted_diff >actual.diff &&
@@ -86,7 +89,7 @@
# The corresponding conflicted merge
git reset --hard &&
- git checkout master^0 &&
+ git checkout main^0 &&
test_must_fail git merge --no-commit side &&
# Manually resolve and record the resolution
@@ -96,7 +99,7 @@
# should fail to apply
git reset --hard &&
- git checkout master^0 &&
+ git checkout main^0 &&
test_must_fail git apply --index --3way P.diff &&
# but rerere should have replayed the recorded resolution
diff --git a/t/t4114-apply-typechange.sh b/t/t4114-apply-typechange.sh
index ebadbc3..da3e64f 100755
--- a/t/t4114-apply-typechange.sh
+++ b/t/t4114-apply-typechange.sh
@@ -88,6 +88,13 @@
'
test_debug 'cat patch'
+test_expect_success 'symlink becomes file, in reverse' '
+ git checkout -f foo-symlinked-to-bar &&
+ git diff-tree -p HEAD foo-back-to-file > patch &&
+ git checkout foo-back-to-file &&
+ git apply -R --index < patch
+ '
+
test_expect_success 'binary file becomes symlink' '
git checkout -f foo-becomes-binary &&
git diff-tree -p --binary HEAD foo-symlinked-to-bar > patch &&
diff --git a/t/t4121-apply-diffs.sh b/t/t4121-apply-diffs.sh
index 66368ef..b45454a 100755
--- a/t/t4121-apply-diffs.sh
+++ b/t/t4121-apply-diffs.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='git apply for contextually independent diffs'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
echo '1
@@ -23,7 +26,7 @@
git commit -a -q -m 2 &&
echo 9 >>file &&
git commit -a -q -m 3 &&
- git checkout master'
+ git checkout main'
test_expect_success \
'check if contextually independent diffs for the same file apply' \
diff --git a/t/t4122-apply-symlink-inside.sh b/t/t4122-apply-symlink-inside.sh
index 4acb3f3..aa52de4 100755
--- a/t/t4122-apply-symlink-inside.sh
+++ b/t/t4122-apply-symlink-inside.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='apply to deeper directory without getting fooled with symlink'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
@@ -35,11 +38,11 @@
test_expect_success 'check result' '
- git diff --exit-code master &&
- git diff --exit-code --cached master &&
+ git diff --exit-code main &&
+ git diff --exit-code --cached main &&
test_tick &&
git commit -m replay &&
- T1=$(git rev-parse "master^{tree}") &&
+ T1=$(git rev-parse "main^{tree}") &&
T2=$(git rev-parse "HEAD^{tree}") &&
test "z$T1" = "z$T2"
diff --git a/t/t4124-apply-ws-rule.sh b/t/t4124-apply-ws-rule.sh
index 971a5a7..0ca2982 100755
--- a/t/t4124-apply-ws-rule.sh
+++ b/t/t4124-apply-ws-rule.sh
@@ -52,6 +52,13 @@
# 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)
diff --git a/t/t4127-apply-same-fn.sh b/t/t4127-apply-same-fn.sh
index 972946c..305b7e6 100755
--- a/t/t4127-apply-same-fn.sh
+++ b/t/t4127-apply-same-fn.sh
@@ -32,6 +32,10 @@
test_expect_success 'apply same filename with overlapping changes' '
git reset --hard &&
+
+ # Store same_fn so that we can check apply -R in next test
+ cp same_fn same_fn1 &&
+
modify "s/^d/z/" same_fn &&
git diff > patch0 &&
git add same_fn &&
@@ -43,6 +47,11 @@
test_cmp same_fn same_fn2
'
+test_expect_success 'apply same filename with overlapping changes, in reverse' '
+ git apply -R patch0 &&
+ test_cmp same_fn same_fn1
+'
+
test_expect_success 'apply same new filename after rename' '
git reset --hard &&
git mv same_fn new_fn &&
diff --git a/t/t4129-apply-samemode.sh b/t/t4129-apply-samemode.sh
index 5cdd76d..576632f 100755
--- a/t/t4129-apply-samemode.sh
+++ b/t/t4129-apply-samemode.sh
@@ -73,4 +73,30 @@
test_i18ngrep "invalid mode" err
'
+test_expect_success POSIXPERM 'do not use core.sharedRepository for working tree files' '
+ git reset --hard &&
+ test_config core.sharedRepository 0666 &&
+ (
+ # Remove a default ACL if possible.
+ (setfacl -k . 2>/dev/null || true) &&
+ umask 0077 &&
+
+ # Test both files (f1) and leading dirs (d)
+ mkdir d &&
+ touch f1 d/f2 &&
+ git add f1 d/f2 &&
+ git diff --staged >patch-f1-and-f2.txt &&
+
+ rm -rf d f1 &&
+ git apply patch-f1-and-f2.txt &&
+
+ echo "-rw-------" >f1_mode.expected &&
+ echo "drwx------" >d_mode.expected &&
+ test_modebits f1 >f1_mode.actual &&
+ test_modebits d >d_mode.actual &&
+ test_cmp f1_mode.expected f1_mode.actual &&
+ test_cmp d_mode.expected d_mode.actual
+ )
+'
+
test_done
diff --git a/t/t4134-apply-submodule.sh b/t/t4134-apply-submodule.sh
index 99ed4cc..d1c16ba 100755
--- a/t/t4134-apply-submodule.sh
+++ b/t/t4134-apply-submodule.sh
@@ -8,7 +8,6 @@
. ./test-lib.sh
test_expect_success setup '
- test_oid_init &&
cat > create-sm.patch <<EOF &&
diff --git a/dir/sm b/dir/sm
new file mode 160000
diff --git a/t/t4137-apply-submodule.sh b/t/t4137-apply-submodule.sh
index a9bd40a..07d5262 100755
--- a/t/t4137-apply-submodule.sh
+++ b/t/t4137-apply-submodule.sh
@@ -6,15 +6,19 @@
. "$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/t/t4140-apply-ita.sh b/t/t4140-apply-ita.sh
new file mode 100755
index 0000000..c614eaf
--- /dev/null
+++ b/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/t/t4150-am.sh b/t/t4150-am.sh
index cb45271..2aaaa0d 100755
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -2,6 +2,9 @@
test_description='git am running'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup: messages' '
@@ -166,7 +169,7 @@
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 &&
@@ -179,8 +182,8 @@
test_tick &&
git commit -m "added another file" &&
- git format-patch --stdout master >lorem-move.patch &&
- git format-patch --no-prefix --stdout master >lorem-zero.patch &&
+ git format-patch --stdout main >lorem-move.patch &&
+ git format-patch --no-prefix --stdout main >lorem-zero.patch &&
git checkout -b rename &&
git mv file renamed &&
@@ -453,11 +456,11 @@
git checkout first &&
git am patch2 &&
test_path_is_missing .git/rebase-apply &&
- test "$(git rev-parse master^^)" = "$(git rev-parse HEAD^^)" &&
- git diff --exit-code master..HEAD &&
- git diff --exit-code master^..HEAD^ &&
- compare author master HEAD &&
- compare author master^ HEAD^ &&
+ test "$(git rev-parse main^^)" = "$(git rev-parse HEAD^^)" &&
+ git diff --exit-code main..HEAD &&
+ git diff --exit-code main^..HEAD^ &&
+ compare author main HEAD &&
+ compare author main^ HEAD^ &&
test "$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" = \
"$(git log -1 --pretty=format:"%cn <%ce>" HEAD)"
'
@@ -465,7 +468,7 @@
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 +482,7 @@
'
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 +543,7 @@
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 +570,7 @@
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 &&
@@ -759,7 +762,7 @@
git checkout first &&
cat pine patch1 | git am &&
test_path_is_missing .git/rebase-apply &&
- git diff --exit-code master^..HEAD
+ git diff --exit-code main^..HEAD
'
test_expect_success 'am fails on mail without patch' '
@@ -903,7 +906,7 @@
test_tick &&
test_must_fail git am empty-file 2>actual &&
echo Patch format detection failed. >expected &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'am --message-id really adds the message id' '
@@ -989,7 +992,7 @@
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^ &&
@@ -998,7 +1001,7 @@
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 &&
@@ -1009,7 +1012,7 @@
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^ &&
@@ -1020,7 +1023,7 @@
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
'
@@ -1112,25 +1115,41 @@
test_commit sixth &&
git checkout test &&
- git format-patch --stdout master..HEAD >patches &&
- git reset --hard master &&
+ git format-patch --stdout main..HEAD >patches &&
+ git reset --hard main &&
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 format-patch --stdout main..HEAD >patches &&
+ git reset --hard main &&
git am patches &&
grep "clean" a.txt &&
git checkout conflict &&
git reset --hard &&
- git format-patch --stdout master..HEAD >patches &&
+ git format-patch --stdout main..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/t/t4153-am-resume-override-opts.sh b/t/t4153-am-resume-override-opts.sh
index 8ea22d1..b7c3861 100755
--- a/t/t4153-am-resume-override-opts.sh
+++ b/t/t4153-am-resume-override-opts.sh
@@ -61,7 +61,7 @@
# Applying side2 will be quiet.
git am --no-quiet --continue >out &&
echo "Applying: side1" >expected &&
- test_i18ncmp expected out
+ test_cmp expected out
'
test_expect_success '--signoff overrides --no-signoff' '
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index 831d424..9f8c76d 100755
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -8,7 +8,7 @@
! [fifth] version1
! [first] first
! [fourth] version1
- ! [master] initial
+ ! [main] initial
! [second] prefer first over second
! [third] version2
------
@@ -19,13 +19,15 @@
- [second] prefer first over second
+ + [first] first
+ [second^] second
-++++++ [master] initial
+++++++ [main] initial
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup' '
- test_oid_init &&
cat >a1 <<-\EOF &&
Some title
==========
@@ -58,7 +60,7 @@
test_tick &&
git commit -q -a -m first &&
- git checkout -b second master &&
+ git checkout -b second main &&
git show first:a1 |
sed -e "s/To die, t/To die! T/" -e "s/Some title/Some Title/" >a1 &&
echo "* END *" >>a1 &&
@@ -169,7 +171,7 @@
oldmtimepost=$(test-tool chmtime --get -60 $rr/postimage) &&
- git checkout -b third master &&
+ git checkout -b third main &&
git show second^:a1 | sed "s/To die: t/To die! T/" >a1 &&
git commit -q -a -m third &&
@@ -364,7 +366,7 @@
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 &&
@@ -581,13 +583,13 @@
test_expect_success 'rerere with unexpected conflict markers does not crash' '
git reset --hard &&
- git checkout -b branch-1 master &&
+ git checkout -b branch-1 main &&
echo "bar" >test &&
git add test &&
git commit -q -m two &&
git reset --hard &&
- git checkout -b branch-2 master &&
+ git checkout -b branch-2 main &&
echo "foo" >test &&
git add test &&
git commit -q -a -m one &&
@@ -602,7 +604,7 @@
test_expect_success 'rerere with inner conflict markers' '
git reset --hard &&
- git checkout -b A master &&
+ git checkout -b A main &&
echo "bar" >test &&
git add test &&
git commit -q -m two &&
@@ -611,7 +613,7 @@
git commit -q -m three &&
git reset --hard &&
- git checkout -b B master &&
+ git checkout -b B main &&
echo "foo" >test &&
git add test &&
git commit -q -a -m one &&
@@ -652,11 +654,11 @@
git add original &&
git commit -m original &&
- git checkout -b A master &&
+ git checkout -b A main &&
git mv original A &&
git commit -m "rename to A" &&
- git checkout -b B master &&
+ git checkout -b B main &&
git mv original B &&
git commit -m "rename to B"
)
diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh
index d3a7ce6..3095b1b 100755
--- a/t/t4201-shortlog.sh
+++ b/t/t4201-shortlog.sh
@@ -6,6 +6,9 @@
test_description='git shortlog
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup' '
@@ -191,7 +194,7 @@
'
test_expect_success 'shortlog with --output=<file>' '
- git shortlog --output=shortlog -1 master >output &&
+ git shortlog --output=shortlog -1 main >output &&
test_must_be_empty output &&
test_line_count = 3 shortlog
'
@@ -215,4 +218,145 @@
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/t/t4202-log.sh b/t/t4202-log.sh
index 0f766ba..350cfa3 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -2,6 +2,9 @@
test_description='git log'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY/lib-gpg.sh"
. "$TEST_DIRECTORY/lib-terminal.sh"
@@ -478,7 +481,7 @@
git checkout -b side HEAD~4 &&
test_commit side-1 1 1 &&
test_commit side-2 2 2 &&
- git checkout master &&
+ git checkout main &&
git merge side
'
@@ -541,17 +544,17 @@
'
test_expect_success 'log --raw --graph -m with merge' '
- git log --raw --graph --oneline -m master | head -n 500 >actual &&
+ git log --raw --graph --oneline -m main | head -n 500 >actual &&
grep "initial" actual
'
test_expect_success 'diff-tree --graph' '
- git diff-tree --graph master^ | head -n 500 >actual &&
+ git diff-tree --graph main^ | head -n 500 >actual &&
grep "one" actual
'
cat > expect <<\EOF
-* commit master
+* commit main
|\ Merge: A B
| | Author: A U Thor <author@example.com>
| |
@@ -567,22 +570,22 @@
| |
| | side-1
| |
-* | commit master~1
+* | commit main~1
| | Author: A U Thor <author@example.com>
| |
| | Second
| |
-* | commit master~2
+* | commit main~2
| | Author: A U Thor <author@example.com>
| |
| | sixth
| |
-* | commit master~3
+* | commit main~3
| | Author: A U Thor <author@example.com>
| |
| | fifth
| |
-* | commit master~4
+* | commit main~4
|/ Author: A U Thor <author@example.com>
|
| fourth
@@ -613,19 +616,19 @@
test_expect_success 'set up more tangled history' '
git checkout -b tangle HEAD~6 &&
test_commit tangle-a tangle-a a &&
- git merge master~3 &&
+ git merge main~3 &&
git merge side~1 &&
- git checkout master &&
+ git checkout main &&
git merge tangle &&
git checkout -b reach &&
test_commit reach &&
- git checkout master &&
+ git checkout main &&
git checkout -b octopus-a &&
test_commit octopus-a &&
- git checkout master &&
+ git checkout main &&
git checkout -b octopus-b &&
test_commit octopus-b &&
- git checkout master &&
+ git checkout main &&
test_commit seventh &&
git merge octopus-a octopus-b &&
git merge reach
@@ -650,7 +653,7 @@
|\
| * Merge branch 'side' (early part) into tangle
| |\
-| * \ Merge branch 'master' (early part) into tangle
+| * \ Merge branch 'main' (early part) into tangle
| |\ \
| * | | tangle-a
* | | | Merge branch 'side'
@@ -742,8 +745,24 @@
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
'
@@ -778,7 +797,7 @@
test_expect_success 'decorate-refs-exclude with glob' '
cat >expect.decorate <<-\EOF &&
- Merge-tag-reach (HEAD -> master)
+ Merge-tag-reach (HEAD -> main)
Merge-tags-octopus-a-and-octopus-b
seventh (tag: seventh)
octopus-b (tag: octopus-b)
@@ -787,12 +806,15 @@
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
'
test_expect_success 'decorate-refs-exclude without globs' '
cat >expect.decorate <<-\EOF &&
- Merge-tag-reach (HEAD -> master)
+ Merge-tag-reach (HEAD -> main)
Merge-tags-octopus-a-and-octopus-b
seventh (tag: seventh)
octopus-b (tag: octopus-b, octopus-b)
@@ -801,12 +823,15 @@
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
'
test_expect_success 'multiple decorate-refs-exclude' '
cat >expect.decorate <<-\EOF &&
- Merge-tag-reach (HEAD -> master)
+ Merge-tag-reach (HEAD -> main)
Merge-tags-octopus-a-and-octopus-b
seventh (tag: seventh)
octopus-b (tag: octopus-b)
@@ -816,12 +841,20 @@
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 &&
- Merge-tag-reach (master)
+ cat >expect.no-decorate <<-\EOF &&
+ Merge-tag-reach (main)
Merge-tags-octopus-a-and-octopus-b
seventh
octopus-b
@@ -831,12 +864,27 @@
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 (main)
+ 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)
+ Merge-tag-reach (HEAD -> main)
reach (tag: reach, reach)
seventh (tag: seventh)
Merge-branch-tangle
@@ -846,6 +894,10 @@
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
'
@@ -1031,7 +1083,7 @@
| |\ \ Merge: MERGE_PARENTS
| | | | Author: A U Thor <author@example.com>
| | | |
-| | | | Merge branch 'master' (early part) into tangle
+| | | | Merge branch 'main' (early part) into tangle
| | | |
| * | | commit COMMIT_OBJECT_NAME
| | | | Author: A U Thor <author@example.com>
@@ -1306,7 +1358,7 @@
*** | |\ \ Merge: MERGE_PARENTS
*** | | | | Author: A U Thor <author@example.com>
*** | | | |
-*** | | | | Merge branch 'master' (early part) into tangle
+*** | | | | Merge branch 'main' (early part) into tangle
*** | | | |
*** | * | | commit COMMIT_OBJECT_NAME
*** | | | | Author: A U Thor <author@example.com>
@@ -1539,24 +1591,24 @@
'
test_expect_success GPG 'setup signed branch' '
- test_when_finished "git reset --hard && git checkout master" &&
- git checkout -b signed master &&
+ test_when_finished "git reset --hard && git checkout main" &&
+ git checkout -b signed main &&
echo foo >foo &&
git add foo &&
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 &&
+ test_when_finished "git reset --hard && git checkout main" &&
+ git checkout -b signed-subkey main &&
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 &&
+ test_when_finished "git reset --hard && git checkout main" &&
+ git checkout -b signed-x509 main &&
echo foo >foo &&
git add foo &&
test_config gpg.format x509 &&
@@ -1589,12 +1641,12 @@
'
test_expect_success GPG 'log --graph --show-signature for merged tag' '
- test_when_finished "git reset --hard && git checkout master" &&
- git checkout -b plain master &&
+ test_when_finished "git reset --hard && git checkout main" &&
+ git checkout -b plain main &&
echo aaa >bar &&
git add bar &&
git commit -m bar_commit &&
- git checkout -b tagged master &&
+ git checkout -b tagged main &&
echo bbb >baz &&
git add baz &&
git commit -m baz_commit &&
@@ -1608,12 +1660,12 @@
'
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 &&
+ test_when_finished "git reset --hard && git checkout main" &&
+ git checkout -b plain-shallow main &&
echo aaa >bar &&
git add bar &&
git commit -m bar_commit &&
- git checkout --detach master &&
+ git checkout --detach main &&
echo bbb >baz &&
git add baz &&
git commit -m baz_commit &&
@@ -1627,15 +1679,75 @@
grep "tag signed_tag_shallow names a non-parent $hash" actual
'
-test_expect_success GPGSM 'log --graph --show-signature for merged tag x509' '
- test_when_finished "git reset --hard && git checkout master" &&
- test_config gpg.format x509 &&
- test_config user.signingkey $GIT_COMMITTER_EMAIL &&
- git checkout -b plain-x509 master &&
+test_expect_success GPG 'log --graph --show-signature for merged tag with missing key' '
+ test_when_finished "git reset --hard && git checkout main" &&
+ git checkout -b plain-nokey main &&
echo aaa >bar &&
git add bar &&
git commit -m bar_commit &&
- git checkout -b tagged-x509 master &&
+ git checkout -b tagged-nokey main &&
+ 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 main" &&
+ git checkout -b plain-bad main &&
+ echo aaa >bar &&
+ git add bar &&
+ git commit -m bar_commit &&
+ git checkout -b tagged-bad main &&
+ 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 main" &&
+ git checkout -b plain-fail main &&
+ echo aaa >bar &&
+ git add bar &&
+ git commit -m bar_commit &&
+ git checkout -b tagged-fail main &&
+ 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 main" &&
+ test_config gpg.format x509 &&
+ test_config user.signingkey $GIT_COMMITTER_EMAIL &&
+ git checkout -b plain-x509 main &&
+ echo aaa >bar &&
+ git add bar &&
+ git commit -m bar_commit &&
+ git checkout -b tagged-x509 main &&
echo bbb >baz &&
git add baz &&
git commit -m baz_commit &&
@@ -1648,6 +1760,51 @@
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 main" &&
+ test_config gpg.format x509 &&
+ test_config user.signingkey $GIT_COMMITTER_EMAIL &&
+ git checkout -b plain-x509-nokey main &&
+ echo aaa >bar &&
+ git add bar &&
+ git commit -m bar_commit &&
+ git checkout -b tagged-x509-nokey main &&
+ 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 main" &&
+ test_config gpg.format x509 &&
+ test_config user.signingkey $GIT_COMMITTER_EMAIL &&
+ git checkout -b plain-x509-bad main &&
+ echo aaa >bar &&
+ git add bar &&
+ git commit -m bar_commit &&
+ git checkout -b tagged-x509-bad main &&
+ 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
@@ -1681,7 +1838,7 @@
git init empty &&
test_must_fail git -C empty log 2>stderr &&
test_i18ngrep does.not.have.any.commits stderr &&
- echo 1234abcd >empty/.git/refs/heads/master &&
+ echo 1234abcd >empty/.git/refs/heads/main &&
test_must_fail git -C empty log 2>stderr &&
test_i18ngrep broken stderr &&
echo "ref: refs/heads/invalid.lock" >empty/.git/HEAD &&
@@ -1696,6 +1853,16 @@
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 &&
diff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh
index 586c3a8..93caf9a 100755
--- a/t/t4203-mailmap.sh
+++ b/t/t4203-mailmap.sh
@@ -2,30 +2,14 @@
test_description='.mailmap configurations'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
-fuzz_blame () {
- sed "
- s/$_x05[0-9a-f][0-9a-f][0-9a-f]/OBJID/g
- s/$_x05[0-9a-f][0-9a-f]/OBJI/g
- s/[-0-9]\{10\} [:0-9]\{8\} [-+][0-9]\{4\}/DATE/g
- " "$@"
-}
-
-test_expect_success setup '
- cat >contacts <<- EOF &&
- $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
- nick1 <bugs@company.xx>
- EOF
-
- echo one >one &&
- git add one &&
- test_tick &&
- git commit -m initial &&
- echo two >>one &&
- git add one &&
- test_tick &&
- git commit --author "nick1 <bugs@company.xx>" -m second
+test_expect_success 'setup commits and contacts file' '
+ test_commit initial one one &&
+ test_commit --author "nick1 <bugs@company.xx>" --append second one two
'
test_expect_success 'check-mailmap no arguments' '
@@ -33,7 +17,7 @@
'
test_expect_success 'check-mailmap arguments' '
- cat >expect <<- EOF &&
+ cat >expect <<-EOF &&
$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
nick1 <bugs@company.xx>
EOF
@@ -44,172 +28,256 @@
'
test_expect_success 'check-mailmap --stdin' '
- cat >expect <<- EOF &&
+ cat >expect <<-EOF &&
$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
nick1 <bugs@company.xx>
EOF
- git check-mailmap --stdin <contacts >actual &&
+ git check-mailmap --stdin <expect >actual &&
test_cmp expect actual
'
-test_expect_success 'check-mailmap --stdin arguments' '
+test_expect_success 'check-mailmap --stdin arguments: no mapping' '
+ test_when_finished "rm contacts" &&
+ cat >contacts <<-EOF &&
+ $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
+ nick1 <bugs@company.xx>
+ EOF
cat >expect <<-\EOF &&
Internal Guy <bugs@company.xy>
EOF
- cat <contacts >>expect &&
+ cat contacts >>expect &&
+
git check-mailmap --stdin "Internal Guy <bugs@company.xy>" \
<contacts >actual &&
test_cmp expect actual
'
+test_expect_success 'check-mailmap --stdin arguments: mapping' '
+ test_when_finished "rm .mailmap" &&
+ cat >.mailmap <<-EOF &&
+ New Name <$GIT_AUTHOR_EMAIL>
+ EOF
+ cat >stdin <<-EOF &&
+ Old Name <$GIT_AUTHOR_EMAIL>
+ EOF
+
+ cp .mailmap expect &&
+ git check-mailmap --stdin <stdin >actual &&
+ test_cmp expect actual &&
+
+ cat .mailmap >>expect &&
+ git check-mailmap --stdin "Another Old Name <$GIT_AUTHOR_EMAIL>" \
+ <stdin >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'check-mailmap bogus contact' '
test_must_fail git check-mailmap bogus
'
-cat >expect << EOF
-$GIT_AUTHOR_NAME (1):
- initial
-
-nick1 (1):
- second
-
-EOF
+test_expect_success 'check-mailmap bogus contact --stdin' '
+ test_must_fail git check-mailmap --stdin bogus </dev/null
+'
test_expect_success 'No mailmap' '
+ cat >expect <<-EOF &&
+ $GIT_AUTHOR_NAME (1):
+ initial
+
+ nick1 (1):
+ second
+
+ EOF
git shortlog HEAD >actual &&
test_cmp expect actual
'
-cat >expect <<\EOF
-Repo Guy (1):
- initial
+test_expect_success 'setup default .mailmap' '
+ cat >default.map <<-EOF
+ Repo Guy <$GIT_AUTHOR_EMAIL>
+ EOF
+'
-nick1 (1):
- second
+test_expect_success 'test default .mailmap' '
+ test_when_finished "rm .mailmap" &&
+ cp default.map .mailmap &&
-EOF
+ cat >expect <<-\EOF &&
+ Repo Guy (1):
+ initial
-test_expect_success 'default .mailmap' '
- echo "Repo Guy <$GIT_AUTHOR_EMAIL>" > .mailmap &&
+ nick1 (1):
+ second
+
+ EOF
git shortlog HEAD >actual &&
test_cmp expect actual
'
-# Using a mailmap file in a subdirectory of the repo here, but
-# could just as well have been a file outside of the repository
-cat >expect <<\EOF
-Internal Guy (1):
- second
-
-Repo Guy (1):
- initial
-
-EOF
test_expect_success 'mailmap.file set' '
- mkdir -p internal_mailmap &&
- echo "Internal Guy <bugs@company.xx>" > internal_mailmap/.mailmap &&
- git config mailmap.file internal_mailmap/.mailmap &&
+ test_when_finished "rm .mailmap" &&
+ cp default.map .mailmap &&
+
+ test_config mailmap.file internal.map &&
+ cat >internal.map <<-\EOF &&
+ Internal Guy <bugs@company.xx>
+ EOF
+
+ cat >expect <<-\EOF &&
+ Internal Guy (1):
+ second
+
+ Repo Guy (1):
+ initial
+
+ EOF
git shortlog HEAD >actual &&
- test_cmp expect actual
+ test_cmp expect actual &&
+
+ # The internal_mailmap/.mailmap file is an a subdirectory, but
+ # as shown here it can also be outside the repository
+ test_when_finished "rm -rf sub-repo" &&
+ git clone . sub-repo &&
+ (
+ cd sub-repo &&
+ cp ../.mailmap . &&
+ git config mailmap.file ../internal.map &&
+ git shortlog HEAD >actual &&
+ test_cmp ../expect actual
+ )
'
-cat >expect <<\EOF
-External Guy (1):
- initial
-
-Internal Guy (1):
- second
-
-EOF
test_expect_success 'mailmap.file override' '
- echo "External Guy <$GIT_AUTHOR_EMAIL>" >> internal_mailmap/.mailmap &&
- git config mailmap.file internal_mailmap/.mailmap &&
+ test_config mailmap.file internal.map &&
+ cat >internal.map <<-EOF &&
+ Internal Guy <bugs@company.xx>
+ External Guy <$GIT_AUTHOR_EMAIL>
+ EOF
+
+ cat >expect <<-\EOF &&
+ External Guy (1):
+ initial
+
+ Internal Guy (1):
+ second
+
+ EOF
git shortlog HEAD >actual &&
test_cmp expect actual
'
-cat >expect <<\EOF
-Repo Guy (1):
- initial
-
-nick1 (1):
- second
-
-EOF
-
test_expect_success 'mailmap.file non-existent' '
- rm internal_mailmap/.mailmap &&
- rmdir internal_mailmap &&
+ test_when_finished "rm .mailmap" &&
+ cp default.map .mailmap &&
+
+ cat >expect <<-\EOF &&
+ Repo Guy (1):
+ initial
+
+ nick1 (1):
+ second
+
+ EOF
git shortlog HEAD >actual &&
test_cmp expect actual
'
-cat >expect <<\EOF
-Internal Guy (1):
- second
-
-Repo Guy (1):
- initial
-
-EOF
-
test_expect_success 'name entry after email entry' '
- mkdir -p internal_mailmap &&
- echo "<bugs@company.xy> <bugs@company.xx>" >internal_mailmap/.mailmap &&
- echo "Internal Guy <bugs@company.xx>" >>internal_mailmap/.mailmap &&
+ test_when_finished "rm .mailmap" &&
+ cp default.map .mailmap &&
+
+ test_config mailmap.file internal.map &&
+ cat >internal.map <<-\EOF &&
+ <bugs@company.xy> <bugs@company.xx>
+ Internal Guy <bugs@company.xx>
+ EOF
+
+ cat >expect <<-\EOF &&
+ Internal Guy (1):
+ second
+
+ Repo Guy (1):
+ initial
+
+ EOF
+
git shortlog HEAD >actual &&
test_cmp expect actual
'
-cat >expect <<\EOF
-Internal Guy (1):
- second
-
-Repo Guy (1):
- initial
-
-EOF
-
test_expect_success 'name entry after email entry, case-insensitive' '
- mkdir -p internal_mailmap &&
- echo "<bugs@company.xy> <bugs@company.xx>" >internal_mailmap/.mailmap &&
- echo "Internal Guy <BUGS@Company.xx>" >>internal_mailmap/.mailmap &&
+ test_when_finished "rm .mailmap" &&
+ cp default.map .mailmap &&
+
+ test_config mailmap.file internal.map &&
+ cat >internal.map <<-\EOF &&
+ <bugs@company.xy> <bugs@company.xx>
+ Internal Guy <BUGS@Company.xx>
+ EOF
+
+ cat >expect <<-\EOF &&
+ Internal Guy (1):
+ second
+
+ Repo Guy (1):
+ initial
+
+ EOF
+ git shortlog HEAD >actual &&
+ test_cmp expect actual &&
+
+ cat >internal.map <<-\EOF &&
+ NiCk <BuGs@CoMpAnY.Xy> NICK1 <BUGS@COMPANY.XX>
+ EOF
+
+ cat >expect <<-\EOF &&
+ NiCk (1):
+ second
+
+ Repo Guy (1):
+ initial
+
+ EOF
git shortlog HEAD >actual &&
test_cmp expect actual
'
-cat >expect << EOF
-$GIT_AUTHOR_NAME (1):
- initial
-
-nick1 (1):
- second
-
-EOF
test_expect_success 'No mailmap files, but configured' '
- rm -f .mailmap internal_mailmap/.mailmap &&
+ cat >expect <<-EOF &&
+ $GIT_AUTHOR_NAME (1):
+ initial
+
+ nick1 (1):
+ second
+
+ EOF
git shortlog HEAD >actual &&
test_cmp expect actual
'
test_expect_success 'setup mailmap blob tests' '
git checkout -b map &&
- test_when_finished "git checkout master" &&
- cat >just-bugs <<- EOF &&
+ test_when_finished "git checkout main" &&
+ cat >just-bugs <<-\EOF &&
Blob Guy <bugs@company.xx>
EOF
- cat >both <<- EOF &&
+ cat >both <<-EOF &&
Blob Guy <$GIT_AUTHOR_EMAIL>
Blob Guy <bugs@company.xx>
EOF
printf "Tricky Guy <$GIT_AUTHOR_EMAIL>" >no-newline &&
git add just-bugs both no-newline &&
git commit -m "my mailmaps" &&
- echo "Repo Guy <$GIT_AUTHOR_EMAIL>" >.mailmap &&
- echo "Internal Guy <$GIT_AUTHOR_EMAIL>" >internal.map
+
+ cat >internal.map <<-EOF
+ Internal Guy <$GIT_AUTHOR_EMAIL>
+ EOF
'
test_expect_success 'mailmap.blob set' '
+ test_when_finished "rm .mailmap" &&
+ cp default.map .mailmap &&
+
cat >expect <<-\EOF &&
Blob Guy (1):
second
@@ -223,6 +291,9 @@
'
test_expect_success 'mailmap.blob overrides .mailmap' '
+ test_when_finished "rm .mailmap" &&
+ cp default.map .mailmap &&
+
cat >expect <<-\EOF &&
Blob Guy (2):
initial
@@ -249,7 +320,11 @@
test_cmp expect actual
'
-test_expect_success 'mailmap.blob can be missing' '
+test_expect_success 'mailmap.file can be missing' '
+ test_when_finished "rm .mailmap" &&
+ cp default.map .mailmap &&
+
+ test_config mailmap.file nonexistent &&
cat >expect <<-\EOF &&
Repo Guy (1):
initial
@@ -258,7 +333,34 @@
second
EOF
- git -c mailmap.blob=map:nonexistent shortlog HEAD >actual &&
+ git shortlog HEAD >actual 2>err &&
+ test_must_be_empty err &&
+ test_cmp expect actual
+'
+
+test_expect_success 'mailmap.blob can be missing' '
+ test_when_finished "rm .mailmap" &&
+ cp default.map .mailmap &&
+
+ cat >expect <<-\EOF &&
+ Repo Guy (1):
+ initial
+
+ nick1 (1):
+ second
+
+ EOF
+ git -c mailmap.blob=map:nonexistent shortlog HEAD >actual 2>err &&
+ test_must_be_empty err &&
+ test_cmp expect actual
+'
+
+test_expect_success 'mailmap.blob might be the wrong type' '
+ test_when_finished "rm .mailmap" &&
+ cp default.map .mailmap &&
+
+ git -c mailmap.blob=HEAD: shortlog HEAD >actual 2>err &&
+ test_i18ngrep "mailmap is not a blob" err &&
test_cmp expect actual
'
@@ -267,11 +369,15 @@
(
cd non-bare &&
test_commit one .mailmap "Fake Name <$GIT_AUTHOR_EMAIL>" &&
- echo " 1 Fake Name" >expect &&
+ cat >expect <<-\EOF &&
+ 1 Fake Name
+ EOF
git shortlog -ns HEAD >actual &&
test_cmp expect actual &&
rm .mailmap &&
- echo " 1 $GIT_AUTHOR_NAME" >expect &&
+ cat >expect <<-EOF &&
+ 1 $GIT_AUTHOR_NAME
+ EOF
git shortlog -ns HEAD >actual &&
test_cmp expect actual
)
@@ -281,7 +387,9 @@
git clone --bare non-bare bare &&
(
cd bare &&
- echo " 1 Fake Name" >expect &&
+ cat >expect <<-\EOF &&
+ 1 Fake Name
+ EOF
git shortlog -ns HEAD >actual &&
test_cmp expect actual
)
@@ -300,178 +408,260 @@
test_cmp expect actual
'
-test_expect_success 'cleanup after mailmap.blob tests' '
- rm -f .mailmap
-'
-
test_expect_success 'single-character name' '
- echo " 1 A <$GIT_AUTHOR_EMAIL>" >expect &&
- echo " 1 nick1 <bugs@company.xx>" >>expect &&
- echo "A <$GIT_AUTHOR_EMAIL>" >.mailmap &&
test_when_finished "rm .mailmap" &&
+ cat >.mailmap <<-EOF &&
+ A <$GIT_AUTHOR_EMAIL>
+ EOF
+
+ cat >expect <<-EOF &&
+ 1 A <$GIT_AUTHOR_EMAIL>
+ 1 nick1 <bugs@company.xx>
+ EOF
git shortlog -es HEAD >actual &&
test_cmp expect actual
'
test_expect_success 'preserve canonical email case' '
- echo " 1 $GIT_AUTHOR_NAME <AUTHOR@example.com>" >expect &&
- echo " 1 nick1 <bugs@company.xx>" >>expect &&
- echo "<AUTHOR@example.com> <$GIT_AUTHOR_EMAIL>" >.mailmap &&
test_when_finished "rm .mailmap" &&
+ cat >.mailmap <<-EOF &&
+ <AUTHOR@example.com> <$GIT_AUTHOR_EMAIL>
+ EOF
+
+ cat >expect <<-EOF &&
+ 1 $GIT_AUTHOR_NAME <AUTHOR@example.com>
+ 1 nick1 <bugs@company.xx>
+ EOF
git shortlog -es HEAD >actual &&
test_cmp expect actual
'
-# Extended mailmap configurations should give us the following output for shortlog
-cat >expect << EOF
-$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> (1):
- initial
+test_expect_success 'gitmailmap(5) example output: setup' '
+ test_create_repo doc &&
+ test_commit -C doc --author "Joe Developer <joe@example.com>" A &&
+ test_commit -C doc --author "Joe R. Developer <joe@example.com>" B &&
+ test_commit -C doc --author "Jane Doe <jane@example.com>" C &&
+ test_commit -C doc --author "Jane Doe <jane@laptop.(none)>" D &&
+ test_commit -C doc --author "Jane D. <jane@desktop.(none)>" E
+'
-CTO <cto@company.xx> (1):
- seventh
+test_expect_success 'gitmailmap(5) example output: example #1' '
+ test_config -C doc mailmap.file ../doc.map &&
+ cat >doc.map <<-\EOF &&
+ Joe R. Developer <joe@example.com>
+ Jane Doe <jane@example.com>
+ Jane Doe <jane@desktop.(none)>
+ EOF
-Other Author <other@author.xx> (2):
- third
- fourth
+ cat >expect <<-\EOF &&
+ Author Joe Developer <joe@example.com> maps to Joe R. Developer <joe@example.com>
+ Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
-Santa Claus <santa.claus@northpole.xx> (2):
- fifth
- sixth
+ Author Joe R. Developer <joe@example.com> maps to Joe R. Developer <joe@example.com>
+ Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
-Some Dude <some@dude.xx> (1):
- second
+ Author Jane Doe <jane@example.com> maps to Jane Doe <jane@example.com>
+ Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
-EOF
+ Author Jane Doe <jane@laptop.(none)> maps to Jane Doe <jane@laptop.(none)>
+ Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+ Author Jane D <jane@desktop.(none)> maps to Jane Doe <jane@desktop.(none)>
+ Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+ EOF
+ git -C doc log --reverse --pretty=format:"Author %an <%ae> maps to %aN <%aE>%nCommitter %cn <%ce> maps to %cN <%cE>%n" >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'gitmailmap(5) example output: example #2' '
+ test_config -C doc mailmap.file ../doc.map &&
+ cat >doc.map <<-\EOF &&
+ Joe R. Developer <joe@example.com>
+ Jane Doe <jane@example.com> <jane@laptop.(none)>
+ Jane Doe <jane@example.com> <jane@desktop.(none)>
+ EOF
+
+ cat >expect <<-\EOF &&
+ Author Joe Developer <joe@example.com> maps to Joe R. Developer <joe@example.com>
+ Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+ Author Joe R. Developer <joe@example.com> maps to Joe R. Developer <joe@example.com>
+ Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+ Author Jane Doe <jane@example.com> maps to Jane Doe <jane@example.com>
+ Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+ Author Jane Doe <jane@laptop.(none)> maps to Jane Doe <jane@example.com>
+ Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+ Author Jane D <jane@desktop.(none)> maps to Jane Doe <jane@example.com>
+ Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+ EOF
+ git -C doc log --reverse --pretty=format:"Author %an <%ae> maps to %aN <%aE>%nCommitter %cn <%ce> maps to %cN <%cE>%n" >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'gitmailmap(5) example output: example #3' '
+ test_config -C doc mailmap.file ../doc.map &&
+ cat >>doc.map <<-\EOF &&
+ Joe R. Developer <joe@example.com> Joe <bugs@example.com>
+ Jane Doe <jane@example.com> Jane <bugs@example.com>
+ EOF
+
+ test_commit -C doc --author "Joe <bugs@example.com>" F &&
+ test_commit -C doc --author "Jane <bugs@example.com>" G &&
+
+ cat >>expect <<-\EOF &&
+
+ Author Joe <bugs@example.com> maps to Joe R. Developer <joe@example.com>
+ Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+ Author Jane <bugs@example.com> maps to Jane Doe <jane@example.com>
+ Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+ EOF
+ git -C doc log --reverse --pretty=format:"Author %an <%ae> maps to %aN <%aE>%nCommitter %cn <%ce> maps to %cN <%cE>%n" >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'Shortlog output (complex mapping)' '
- echo three >>one &&
- git add one &&
- test_tick &&
- git commit --author "nick2 <bugs@company.xx>" -m third &&
+ test_config mailmap.file complex.map &&
+ cat >complex.map <<-EOF &&
+ Committed <$GIT_COMMITTER_EMAIL>
+ <cto@company.xx> <cto@coompany.xx>
+ Some Dude <some@dude.xx> nick1 <bugs@company.xx>
+ Other Author <other@author.xx> nick2 <bugs@company.xx>
+ Other Author <other@author.xx> <nick2@company.xx>
+ Santa Claus <santa.claus@northpole.xx> <me@company.xx>
+ EOF
- echo four >>one &&
- git add one &&
- test_tick &&
- git commit --author "nick2 <nick2@company.xx>" -m fourth &&
+ test_commit --author "nick2 <bugs@company.xx>" --append third one three &&
+ test_commit --author "nick2 <nick2@company.xx>" --append fourth one four &&
+ test_commit --author "santa <me@company.xx>" --append fifth one five &&
+ test_commit --author "claus <me@company.xx>" --append sixth one six &&
+ test_commit --author "CTO <cto@coompany.xx>" --append seventh one seven &&
- echo five >>one &&
- git add one &&
- test_tick &&
- git commit --author "santa <me@company.xx>" -m fifth &&
+ cat >expect <<-EOF &&
+ $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> (1):
+ initial
- echo six >>one &&
- git add one &&
- test_tick &&
- git commit --author "claus <me@company.xx>" -m sixth &&
+ CTO <cto@company.xx> (1):
+ seventh
- echo seven >>one &&
- git add one &&
- test_tick &&
- git commit --author "CTO <cto@coompany.xx>" -m seventh &&
+ Other Author <other@author.xx> (2):
+ third
+ fourth
- mkdir -p internal_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 &&
- echo "Other Author <other@author.xx> <nick2@company.xx>" >> internal_mailmap/.mailmap &&
- echo "Santa Claus <santa.claus@northpole.xx> <me@company.xx>" >> internal_mailmap/.mailmap &&
- echo "Santa Claus <santa.claus@northpole.xx> <me@company.xx>" >> internal_mailmap/.mailmap &&
+ Santa Claus <santa.claus@northpole.xx> (2):
+ fifth
+ sixth
+
+ Some Dude <some@dude.xx> (1):
+ second
+
+ EOF
git shortlog -e HEAD >actual &&
test_cmp expect actual
'
-# git log with --pretty format which uses the name and email mailmap placemarkers
-cat >expect << EOF
-Author CTO <cto@coompany.xx> maps to CTO <cto@company.xx>
-Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL>
-
-Author claus <me@company.xx> maps to Santa Claus <santa.claus@northpole.xx>
-Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL>
-
-Author santa <me@company.xx> maps to Santa Claus <santa.claus@northpole.xx>
-Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL>
-
-Author nick2 <nick2@company.xx> maps to Other Author <other@author.xx>
-Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL>
-
-Author nick2 <bugs@company.xx> maps to Other Author <other@author.xx>
-Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL>
-
-Author nick1 <bugs@company.xx> maps to Some Dude <some@dude.xx>
-Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL>
-
-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)' '
+ test_config mailmap.file complex.map &&
+
+ cat >expect <<-EOF &&
+ Author CTO <cto@coompany.xx> maps to CTO <cto@company.xx>
+ Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL>
+
+ Author claus <me@company.xx> maps to Santa Claus <santa.claus@northpole.xx>
+ Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL>
+
+ Author santa <me@company.xx> maps to Santa Claus <santa.claus@northpole.xx>
+ Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL>
+
+ Author nick2 <nick2@company.xx> maps to Other Author <other@author.xx>
+ Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL>
+
+ Author nick2 <bugs@company.xx> maps to Other Author <other@author.xx>
+ Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL>
+
+ Author nick1 <bugs@company.xx> maps to Some Dude <some@dude.xx>
+ Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL>
+
+ 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
+
git log --pretty=format:"Author %an <%ae> maps to %aN <%aE>%nCommitter %cn <%ce> maps to %cN <%cE>%n" >actual &&
test_cmp expect actual
'
-cat >expect << EOF
-Author email cto@coompany.xx has local-part cto
-Committer email $GIT_COMMITTER_EMAIL has local-part $TEST_COMMITTER_LOCALNAME
-
-Author email me@company.xx has local-part me
-Committer email $GIT_COMMITTER_EMAIL has local-part $TEST_COMMITTER_LOCALNAME
-
-Author email me@company.xx has local-part me
-Committer email $GIT_COMMITTER_EMAIL has local-part $TEST_COMMITTER_LOCALNAME
-
-Author email nick2@company.xx has local-part nick2
-Committer email $GIT_COMMITTER_EMAIL has local-part $TEST_COMMITTER_LOCALNAME
-
-Author email bugs@company.xx has local-part bugs
-Committer email $GIT_COMMITTER_EMAIL has local-part $TEST_COMMITTER_LOCALNAME
-
-Author email bugs@company.xx has local-part bugs
-Committer email $GIT_COMMITTER_EMAIL has local-part $TEST_COMMITTER_LOCALNAME
-
-Author email author@example.com has local-part author
-Committer email $GIT_COMMITTER_EMAIL has local-part $TEST_COMMITTER_LOCALNAME
-EOF
-
test_expect_success 'Log output (local-part email address)' '
+ 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
+
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: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
-EOF
-
test_expect_success 'Log output with --use-mailmap' '
- git log --use-mailmap | grep Author >actual &&
+ test_config mailmap.file complex.map &&
+
+ cat >expect <<-EOF &&
+ Author: CTO <cto@company.xx>
+ Author: Santa Claus <santa.claus@northpole.xx>
+ Author: Santa Claus <santa.claus@northpole.xx>
+ Author: Other Author <other@author.xx>
+ Author: Other Author <other@author.xx>
+ Author: Some Dude <some@dude.xx>
+ Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
+ EOF
+
+ git log --use-mailmap >log &&
+ grep Author log >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: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
-EOF
-
test_expect_success 'Log output with log.mailmap' '
- git -c log.mailmap=True log | grep Author >actual &&
+ test_config mailmap.file complex.map &&
+
+ cat >expect <<-EOF &&
+ Author: CTO <cto@company.xx>
+ Author: Santa Claus <santa.claus@northpole.xx>
+ Author: Santa Claus <santa.claus@northpole.xx>
+ Author: Other Author <other@author.xx>
+ Author: Other Author <other@author.xx>
+ Author: Some Dude <some@dude.xx>
+ Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
+ EOF
+
+ git -c log.mailmap=True log >log &&
+ grep Author log >actual &&
test_cmp expect actual
'
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>
@@ -480,12 +670,13 @@
Author: nick1 <bugs@company.xx>
Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
EOF
- git -c log.mailmap=False log | grep Author > actual &&
+ git -c log.mailmap=false log >log &&
+ grep Author log >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>
@@ -494,64 +685,251 @@
Author: nick1 <bugs@company.xx>
Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
EOF
- git log --no-use-mailmap | grep Author > actual &&
+ git log --no-use-mailmap >log &&
+ grep Author log >actual &&
test_cmp expect actual
'
-cat >expect <<\EOF
-Author: Santa Claus <santa.claus@northpole.xx>
-Author: Santa Claus <santa.claus@northpole.xx>
-EOF
-
test_expect_success 'Grep author with --use-mailmap' '
- git log --use-mailmap --author Santa | grep Author >actual &&
+ test_config mailmap.file complex.map &&
+
+ cat >expect <<-\EOF &&
+ Author: Santa Claus <santa.claus@northpole.xx>
+ Author: Santa Claus <santa.claus@northpole.xx>
+ EOF
+ git log --use-mailmap --author Santa >log &&
+ grep Author log >actual &&
test_cmp expect actual
'
-cat >expect <<\EOF
-Author: Santa Claus <santa.claus@northpole.xx>
-Author: Santa Claus <santa.claus@northpole.xx>
-EOF
test_expect_success 'Grep author with log.mailmap' '
- git -c log.mailmap=True log --author Santa | grep Author >actual &&
+ test_config mailmap.file complex.map &&
+
+ cat >expect <<-\EOF &&
+ Author: Santa Claus <santa.claus@northpole.xx>
+ Author: Santa Claus <santa.claus@northpole.xx>
+ EOF
+
+ git -c log.mailmap=True log --author Santa >log &&
+ grep Author log >actual &&
test_cmp expect actual
'
test_expect_success 'log.mailmap is true by default these days' '
- git log --author Santa | grep Author >actual &&
+ test_config mailmap.file complex.map &&
+ git log --author Santa >log &&
+ grep Author log >actual &&
test_cmp expect actual
'
test_expect_success 'Only grep replaced author with --use-mailmap' '
+ test_config mailmap.file complex.map &&
git log --use-mailmap --author "<cto@coompany.xx>" >actual &&
test_must_be_empty actual
'
-# git blame
-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
-OBJID (Santa Claus DATE 5) five
-OBJID (Santa Claus DATE 6) six
-OBJID (CTO DATE 7) seven
-EOF
-test_expect_success 'Blame output (complex mapping)' '
- git blame one >actual &&
- fuzz_blame actual >actual.fuzz &&
+test_expect_success 'Blame --porcelain output (complex mapping)' '
+ test_config mailmap.file complex.map &&
+
+ cat >expect <<-EOF &&
+ 1 1 1
+ A U Thor
+ 2 2 1
+ Some Dude
+ 3 3 1
+ Other Author
+ 4 4 1
+ Other Author
+ 5 5 1
+ Santa Claus
+ 6 6 1
+ Santa Claus
+ 7 7 1
+ CTO
+ EOF
+
+ git blame --porcelain one >actual.blame &&
+
+ NUM="[0-9][0-9]*" &&
+ sed -n <actual.blame >actual.fuzz \
+ -e "s/^author //p" \
+ -e "s/^$OID_REGEX \\($NUM $NUM $NUM\\)$/\\1/p" &&
test_cmp expect actual.fuzz
'
-cat >expect <<\EOF
-Some Dude <some@dude.xx>
-EOF
+test_expect_success 'Blame output (complex mapping)' '
+ git -c mailmap.file=complex.map blame one >a &&
+ git blame one >b &&
+ test_file_not_empty a &&
+ ! cmp a b
+'
test_expect_success 'commit --author honors mailmap' '
+ test_config mailmap.file complex.map &&
+
+ cat >expect <<-\EOF &&
+ Some Dude <some@dude.xx>
+ EOF
+
test_must_fail git commit --author "nick" --allow-empty -meight &&
git commit --author "Some Dude" --allow-empty -meight &&
git show --pretty=format:"%an <%ae>%n" >actual &&
test_cmp expect actual
'
+test_expect_success 'comment syntax: setup' '
+ test_create_repo comm &&
+ test_commit -C comm --author "A <a@example.com>" A &&
+ test_commit -C comm --author "B <b@example.com>" B &&
+ test_commit -C comm --author "C <#@example.com>" C &&
+ test_commit -C comm --author "D <d@e#ample.com>" D &&
+
+ test_config -C comm mailmap.file ../doc.map &&
+ cat >>doc.map <<-\EOF &&
+ # Ah <a@example.com>
+
+ ; Bee <b@example.com>
+ Cee <cee@example.com> <#@example.com>
+ Dee <dee@example.com> <d@e#ample.com>
+ EOF
+
+ cat >expect <<-\EOF &&
+ Author A <a@example.com> maps to A <a@example.com>
+ Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+ Author B <b@example.com> maps to ; Bee <b@example.com>
+ Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+ Author C <#@example.com> maps to Cee <cee@example.com>
+ Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+ Author D <d@e#ample.com> maps to Dee <dee@example.com>
+ Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+ EOF
+ git -C comm log --reverse --pretty=format:"Author %an <%ae> maps to %aN <%aE>%nCommitter %cn <%ce> maps to %cN <%cE>%n" >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'whitespace syntax: setup' '
+ test_create_repo space &&
+ test_commit -C space --author "A <a@example.com>" A &&
+ test_commit -C space --author "B <b@example.com>" B &&
+ test_commit -C space --author " C <c@example.com>" C &&
+ test_commit -C space --author " D <d@example.com>" D &&
+ test_commit -C space --author "E E <e@example.com>" E &&
+ test_commit -C space --author "F F <f@example.com>" F &&
+ test_commit -C space --author "G G <g@example.com>" G &&
+ test_commit -C space --author "H H <h@example.com>" H &&
+
+ test_config -C space mailmap.file ../space.map &&
+ cat >>space.map <<-\EOF &&
+ Ah <ah@example.com> < a@example.com >
+ Bee <bee@example.com > < b@example.com >
+ Cee <cee@example.com> C <c@example.com>
+ dee <dee@example.com> D <d@example.com>
+ eee <eee@example.com> E E <e@example.com>
+ eff <eff@example.com> F F <f@example.com>
+ gee <gee@example.com> G G <g@example.com>
+ aitch <aitch@example.com> H H <h@example.com>
+ EOF
+
+ cat >expect <<-\EOF &&
+ Author A <a@example.com> maps to A <a@example.com>
+ Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+ Author B <b@example.com> maps to B <b@example.com>
+ Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+ Author C <c@example.com> maps to Cee <cee@example.com>
+ Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+ Author D <d@example.com> maps to dee <dee@example.com>
+ Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+ Author E E <e@example.com> maps to eee <eee@example.com>
+ Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+ Author F F <f@example.com> maps to eff <eff@example.com>
+ Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+ Author G G <g@example.com> maps to gee <gee@example.com>
+ Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+ Author H H <h@example.com> maps to H H <h@example.com>
+ Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+ EOF
+ git -C space log --reverse --pretty=format:"Author %an <%ae> maps to %aN <%aE>%nCommitter %cn <%ce> maps to %cN <%cE>%n" >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'empty syntax: setup' '
+ test_create_repo empty &&
+ test_commit -C empty --author "A <>" A &&
+ test_commit -C empty --author "B <b@example.com>" B &&
+ test_commit -C empty --author "C <c@example.com>" C &&
+
+ test_config -C empty mailmap.file ../empty.map &&
+ cat >>empty.map <<-\EOF &&
+ Ah <ah@example.com> <>
+ Bee <bee@example.com> <>
+ Cee <> <c@example.com>
+ EOF
+
+ cat >expect <<-\EOF &&
+ Author A <> maps to Bee <bee@example.com>
+ Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+ Author B <b@example.com> maps to B <b@example.com>
+ Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+ Author C <c@example.com> maps to C <c@example.com>
+ Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+ EOF
+ git -C empty log --reverse --pretty=format:"Author %an <%ae> maps to %aN <%aE>%nCommitter %cn <%ce> maps to %cN <%cE>%n" >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'set up mailmap location tests' '
+ git init --bare loc-bare &&
+ git --git-dir=loc-bare --work-tree=. commit \
+ --allow-empty -m foo --author="Orig <orig@example.com>" &&
+ echo "New <new@example.com> <orig@example.com>" >loc-bare/.mailmap
+'
+
+test_expect_success 'bare repo with --work-tree finds mailmap at top-level' '
+ git -C loc-bare --work-tree=. log -1 --format=%aE >actual &&
+ echo new@example.com >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'bare repo does not look in current directory' '
+ git -C loc-bare log -1 --format=%aE >actual &&
+ echo orig@example.com >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'non-git shortlog respects mailmap in current dir' '
+ git --git-dir=loc-bare log -1 >input &&
+ nongit cp "$TRASH_DIRECTORY/loc-bare/.mailmap" . &&
+ nongit git shortlog -s <input >actual &&
+ echo " 1 New" >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'shortlog on stdin respects mailmap from repo' '
+ cp loc-bare/.mailmap . &&
+ git shortlog -s <input >actual &&
+ echo " 1 New" >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'find top-level mailmap from subdir' '
+ git clone loc-bare loc-wt &&
+ cp loc-bare/.mailmap loc-wt &&
+ mkdir loc-wt/subdir &&
+ git -C loc-wt/subdir log -1 --format=%aE >actual &&
+ echo new@example.com >expect &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t4204-patch-id.sh b/t/t4204-patch-id.sh
index 8ff8bd8..f120857 100755
--- a/t/t4204-patch-id.sh
+++ b/t/t4204-patch-id.sh
@@ -2,6 +2,9 @@
test_description='git patch-id'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup' '
@@ -13,9 +16,9 @@
test_write_lines $as b >foo &&
test_write_lines $as b >bar &&
git commit -a -m first &&
- git checkout -b same master &&
+ git checkout -b same main &&
git commit --amend -m same-msg &&
- git checkout -b notsame master &&
+ git checkout -b notsame main &&
echo c >foo &&
echo c >bar &&
git commit --amend -a -m notsame-msg &&
@@ -46,31 +49,31 @@
}
test_expect_success 'patch-id detects equality' '
- get_patch_id master &&
+ get_patch_id main &&
get_patch_id same &&
- test_cmp patch-id_master patch-id_same
+ test_cmp patch-id_main patch-id_same
'
test_expect_success 'patch-id detects inequality' '
- get_patch_id master &&
+ get_patch_id main &&
get_patch_id notsame &&
- ! test_cmp patch-id_master patch-id_notsame
+ ! test_cmp patch-id_main patch-id_notsame
'
test_expect_success 'patch-id supports git-format-patch output' '
- get_patch_id master &&
+ get_patch_id main &&
git checkout same &&
git format-patch -1 --stdout | calc_patch_id same &&
- test_cmp patch-id_master patch-id_same &&
+ test_cmp patch-id_main patch-id_same &&
set $(git format-patch -1 --stdout | git patch-id) &&
test "$2" = $(git rev-parse HEAD)
'
test_expect_success 'whitespace is irrelevant in footer' '
- get_patch_id master &&
+ get_patch_id main &&
git checkout same &&
git format-patch -1 --stdout | sed "s/ \$//" | calc_patch_id same &&
- test_cmp patch-id_master patch-id_same
+ test_cmp patch-id_main patch-id_same
'
cmp_patch_id () {
@@ -88,7 +91,7 @@
shift
name="order-${1}-$relevant"
shift
- get_top_diff "master" | calc_patch_id "$name" "$@" &&
+ get_top_diff "main" | calc_patch_id "$name" "$@" &&
git checkout same &&
git format-patch -1 --stdout -O foo-then-bar |
calc_patch_id "ordered-$name" "$@" &&
@@ -137,10 +140,10 @@
'
test_expect_success 'patch-id supports git-format-patch MIME output' '
- get_patch_id master &&
+ get_patch_id main &&
git checkout same &&
git format-patch -1 --attach --stdout | calc_patch_id same &&
- test_cmp patch-id_master patch-id_same
+ test_cmp patch-id_main patch-id_same
'
test_expect_success 'patch-id respects config from subdir' '
diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
index 204c149..85432b8 100755
--- a/t/t4205-log-pretty-formats.sh
+++ b/t/t4205-log-pretty-formats.sh
@@ -123,10 +123,10 @@
stat1_part=$(git diff-tree --no-commit-id --stat --root HEAD^) &&
printf "add bar\n$stat0_part\n\0$(commit_msg)\n$stat1_part\n" >expected &&
git log -z --stat --pretty="format:%s" >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
-test_expect_failure C_LOCALE_OUTPUT 'NUL termination with --stat' '
+test_expect_failure 'NUL termination with --stat' '
stat0_part=$(git diff --stat HEAD^ HEAD) &&
stat1_part=$(git diff-tree --no-commit-id --stat --root HEAD^) &&
printf "add bar\n$stat0_part\n\0$(commit_msg)\n$stat1_part\n0" >expected &&
@@ -605,6 +605,12 @@
test_cmp expect actual
'
+test_expect_success 'pretty format %(trailers:) enables no options' '
+ git log --no-walk --pretty="%(trailers:)" >actual &&
+ # "expect" the same as the test above
+ test_cmp expect actual
+'
+
test_expect_success '%(trailers:only) shows only "key: value" trailers' '
git log --no-walk --pretty="%(trailers:only)" >actual &&
{
@@ -709,19 +715,101 @@
test_cmp expect actual
'
+test_expect_success '%(trailers:keyonly) shows only keys' '
+ git log --no-walk --pretty="format:%(trailers:keyonly)" >actual &&
+ test_write_lines \
+ "Signed-off-by" \
+ "Acked-by" \
+ "[ v2 updated patch description ]" \
+ "Signed-off-by" >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success '%(trailers:key=foo,keyonly) shows only key' '
+ git log --no-walk --pretty="format:%(trailers:key=Acked-by,keyonly)" >actual &&
+ echo "Acked-by" >expect &&
+ test_cmp expect actual
+'
+
test_expect_success '%(trailers:key=foo,valueonly) shows only value' '
git log --no-walk --pretty="format:%(trailers:key=Acked-by,valueonly)" >actual &&
echo "A U Thor <author@example.com>" >expect &&
test_cmp expect actual
'
-test_expect_success 'pretty format %(trailers:separator) changes separator' '
- git log --no-walk --pretty=format:"X%(trailers:separator=%x00,unfold)X" >actual &&
- printf "XSigned-off-by: A U Thor <author@example.com>\0Acked-by: A U Thor <author@example.com>\0[ v2 updated patch description ]\0Signed-off-by: A U Thor <author@example.com>X" >expect &&
+test_expect_success '%(trailers:valueonly) shows only values' '
+ git log --no-walk --pretty="format:%(trailers:valueonly)" >actual &&
+ test_write_lines \
+ "A U Thor <author@example.com>" \
+ "A U Thor <author@example.com>" \
+ "[ v2 updated patch description ]" \
+ "A U Thor" \
+ " <author@example.com>" >expect &&
test_cmp expect actual
'
-test_expect_success 'pretty format %(trailers) combining separator/key/valueonly' '
+test_expect_success '%(trailers:key=foo,keyonly,valueonly) shows nothing' '
+ git log --no-walk --pretty="format:%(trailers:key=Acked-by,keyonly,valueonly)" >actual &&
+ echo >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'pretty format %(trailers:separator) changes separator' '
+ git log --no-walk --pretty=format:"X%(trailers:separator=%x00)X" >actual &&
+ (
+ printf "XSigned-off-by: A U Thor <author@example.com>\0" &&
+ printf "Acked-by: A U Thor <author@example.com>\0" &&
+ printf "[ v2 updated patch description ]\0" &&
+ printf "Signed-off-by: A U Thor\n <author@example.com>X"
+ ) >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'pretty format %(trailers:separator=X,unfold) changes separator' '
+ git log --no-walk --pretty=format:"X%(trailers:separator=%x00,unfold)X" >actual &&
+ (
+ printf "XSigned-off-by: A U Thor <author@example.com>\0" &&
+ printf "Acked-by: A U Thor <author@example.com>\0" &&
+ printf "[ v2 updated patch description ]\0" &&
+ printf "Signed-off-by: A U Thor <author@example.com>X"
+ ) >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'pretty format %(trailers:key_value_separator) changes key-value separator' '
+ git log --no-walk --pretty=format:"X%(trailers:key_value_separator=%x00)X" >actual &&
+ (
+ printf "XSigned-off-by\0A U Thor <author@example.com>\n" &&
+ printf "Acked-by\0A U Thor <author@example.com>\n" &&
+ printf "[ v2 updated patch description ]\n" &&
+ printf "Signed-off-by\0A U Thor\n <author@example.com>\nX"
+ ) >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'pretty format %(trailers:key_value_separator,unfold) changes key-value separator' '
+ git log --no-walk --pretty=format:"X%(trailers:key_value_separator=%x00,unfold)X" >actual &&
+ (
+ printf "XSigned-off-by\0A U Thor <author@example.com>\n" &&
+ printf "Acked-by\0A U Thor <author@example.com>\n" &&
+ printf "[ v2 updated patch description ]\n" &&
+ printf "Signed-off-by\0A U Thor <author@example.com>\nX"
+ ) >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'pretty format %(trailers:separator,key_value_separator) changes both separators' '
+ git log --no-walk --pretty=format:"%(trailers:separator=%x00,key_value_separator=%x00%x00,unfold)" >actual &&
+ (
+ printf "Signed-off-by\0\0A U Thor <author@example.com>\0" &&
+ printf "Acked-by\0\0A U Thor <author@example.com>\0" &&
+ printf "[ v2 updated patch description ]\0" &&
+ printf "Signed-off-by\0\0A U Thor <author@example.com>"
+ ) >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'pretty format %(trailers) combining separator/key/keyonly/valueonly' '
git commit --allow-empty -F - <<-\EOF &&
Important fix
@@ -748,6 +836,13 @@
"Does not close any tickets" \
"Another fix #567, #890" \
"Important fix #1234" >expect &&
+ test_cmp expect actual &&
+
+ git log --pretty="%s% (trailers:separator=%x2c%x20,key=Closes,keyonly)" HEAD~3.. >actual &&
+ test_write_lines \
+ "Does not close any tickets" \
+ "Another fix Closes, Closes" \
+ "Important fix Closes" >expect &&
test_cmp expect actual
'
diff --git a/t/t4206-log-follow-harder-copies.sh b/t/t4206-log-follow-harder-copies.sh
index ad29e65..4871a5d 100755
--- a/t/t4206-log-follow-harder-copies.sh
+++ b/t/t4206-log-follow-harder-copies.sh
@@ -7,7 +7,7 @@
'
. ./test-lib.sh
-. "$TEST_DIRECTORY"/diff-lib.sh
+. "$TEST_DIRECTORY"/lib-diff.sh
echo >path0 'Line 1
Line 2
diff --git a/t/t4207-log-decoration-colors.sh b/t/t4207-log-decoration-colors.sh
index 60f040c..b870942 100755
--- a/t/t4207-log-decoration-colors.sh
+++ b/t/t4207-log-decoration-colors.sh
@@ -5,6 +5,9 @@
test_description='Test for "git log --decorate" colors'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
@@ -40,13 +43,13 @@
cat >expected <<EOF
${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}${c_HEAD}HEAD ->\
- ${c_reset}${c_branch}master${c_reset}${c_commit},\
+ ${c_reset}${c_branch}main${c_reset}${c_commit},\
${c_reset}${c_tag}tag: v1.0${c_reset}${c_commit},\
${c_reset}${c_tag}tag: B${c_reset}${c_commit})${c_reset} B
${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}${c_tag}tag: A1${c_reset}${c_commit},\
- ${c_reset}${c_remoteBranch}other/master${c_reset}${c_commit})${c_reset} A1
+ ${c_reset}${c_remoteBranch}other/main${c_reset}${c_commit})${c_reset} A1
${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}${c_stash}refs/stash${c_reset}${c_commit})${c_reset}\
- On master: Changes to A.t
+ On main: Changes to A.t
${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}${c_tag}tag: A${c_reset}${c_commit})${c_reset} A
EOF
diff --git a/t/t4208-log-magic-pathspec.sh b/t/t4208-log-magic-pathspec.sh
index 4c8f3b8..7f0c1dc 100755
--- a/t/t4208-log-magic-pathspec.sh
+++ b/t/t4208-log-magic-pathspec.sh
@@ -2,6 +2,9 @@
test_description='magic pathspec tests using git-log'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup' '
@@ -26,15 +29,10 @@
'
test_expect_success '"git log :/detached -- " should find a commit only in HEAD' '
- test_when_finished "git checkout master" &&
+ test_when_finished "git checkout main" &&
git checkout --detach &&
- # Must manually call `test_tick` instead of using `test_commit`,
- # because the latter additionally creates a tag, which would make
- # the commit reachable not only via HEAD.
- test_tick &&
- git commit --allow-empty -m detached &&
- test_tick &&
- git commit --allow-empty -m something-else &&
+ test_commit --no-tag detached &&
+ test_commit --no-tag something-else &&
git log :/detached --
'
@@ -55,6 +53,10 @@
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' '
@@ -115,7 +117,7 @@
git checkout HEAD^ &&
echo 2 >a &&
git commit -a -m "update a to 2" &&
- test_must_fail git merge master &&
+ test_must_fail git merge main &&
git add a &&
git log --merge -- a
'
diff --git a/t/t4210-log-i18n.sh b/t/t4210-log-i18n.sh
index c379208..d2dfcf1 100755
--- a/t/t4210-log-i18n.sh
+++ b/t/t4210-log-i18n.sh
@@ -10,6 +10,13 @@
# 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 &&
@@ -51,43 +58,77 @@
test_must_be_empty actual
'
-test_expect_success !MINGW 'log --grep does not find non-reencoded values (latin1)' '
+test_expect_success 'log --grep does not find non-reencoded values (latin1)' '
git log --encoding=ISO-8859-1 --format=%s --grep=$utf8_e >actual &&
test_must_be_empty actual
'
+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"
- else
- prereq=""
+ prereq=PCRE
fi
force_regex=
if test $engine != "fixed"
then
- force_regex=.*
+ force_regex='.*'
fi
- test_expect_success !MINGW,!REGEX_ILLSEQ,GETTEXT_LOCALE,$prereq "-c grep.patternType=$engine log --grep does not find non-reencoded values (latin1 + locale)" "
- cat >expect <<-\EOF &&
- latin1
- utf8
- EOF
- LC_ALL=\"$is_IS_locale\" git -c grep.patternType=$engine log --encoding=ISO-8859-1 --format=%s --grep=\"$force_regex$latin1_e\" >actual &&
- test_cmp expect actual
+
+ test_expect_success $prereq "config grep.patternType=$engine" "
+ git config grep.patternType $engine
"
- test_expect_success !MINGW,GETTEXT_LOCALE,$prereq "-c grep.patternType=$engine log --grep does not find non-reencoded values (latin1 + locale)" "
- LC_ALL=\"$is_IS_locale\" git -c grep.patternType=$engine log --encoding=ISO-8859-1 --format=%s --grep=\"$force_regex$utf8_e\" >actual &&
+ test_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
"
- test_expect_success !MINGW,!REGEX_ILLSEQ,GETTEXT_LOCALE,$prereq "-c grep.patternType=$engine log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)" "
- LC_ALL=\"$is_IS_locale\" git -c grep.patternType=$engine log --encoding=ISO-8859-1 --format=%s --grep=\"$force_regex$invalid_e\" >actual &&
- test_must_be_empty actual
- "
+ 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/t/t4211-line-log.sh b/t/t4211-line-log.sh
index cda5818..560127c 100755
--- a/t/t4211-line-log.sh
+++ b/t/t4211-line-log.sh
@@ -1,14 +1,38 @@
#!/bin/sh
test_description='test log -L'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup (import history)' '
- test_oid_init &&
git fast-import < "$TEST_DIRECTORY"/t4211/history.export &&
git reset --hard
'
+test_expect_success 'basic command line parsing' '
+ # This may fail due to "no such path a.c in commit", or
+ # "-L is incompatible with pathspec", depending on the
+ # order the error is checked. Either is acceptable.
+ test_must_fail git log -L1,1:a.c -- a.c &&
+
+ # -L requires there is no pathspec
+ test_must_fail git log -L1,1:b.c -- b.c 2>error &&
+ test_i18ngrep "cannot be used with pathspec" error &&
+
+ # This would fail because --follow wants a single path, but
+ # we may fail due to incompatibility between -L/--follow in
+ # the future. Either is acceptable.
+ test_must_fail git log -L1,1:b.c --follow &&
+ test_must_fail git log --follow -L1,1:b.c &&
+
+ # This would fail because -L wants no pathspec, but
+ # we may fail due to incompatibility between -L/--follow in
+ # the future. Either is acceptable.
+ test_must_fail git log --follow -L1,1:b.c -- b.c
+'
+
canned_test_1 () {
test_expect_$1 "$2" "
git log $2 >actual &&
@@ -215,4 +239,80 @@
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/t/t4211/history.export b/t/t4211/history.export
index f9f41e2..006972a 100644
--- a/t/t4211/history.export
+++ b/t/t4211/history.export
@@ -316,7 +316,7 @@
return s;
}
-commit refs/heads/master
+commit refs/heads/main
mark :19
author Thomas Rast <trast@student.ethz.ch> 1362045024 +0100
committer Thomas Rast <trast@student.ethz.ch> 1362045024 +0100
diff --git a/t/t4214-log-graph-octopus.sh b/t/t4214-log-graph-octopus.sh
index a080325..f70c46b 100755
--- a/t/t4214-log-graph-octopus.sh
+++ b/t/t4214-log-graph-octopus.sh
@@ -2,6 +2,9 @@
test_description='git log --graph of skewed left octopus merge.'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-log-graph.sh
@@ -17,7 +20,7 @@
test_expect_success 'set up merge history' '
test_commit initial &&
for i in 1 2 3 4 ; do
- git checkout master -b $i || return $?
+ git checkout main -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 $?
diff --git a/t/t4216-log-bloom.sh b/t/t4216-log-bloom.sh
new file mode 100755
index 0000000..50f206d
--- /dev/null
+++ b/t/t4216-log-bloom.sh
@@ -0,0 +1,408 @@
+#!/bin/sh
+
+test_description='git log for a path with Bloom filters'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./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 main &&
+ 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=6
+ cat >expect <<- EOF
+ header: 43475048 1 $(test_oid oid_version) $NUM_CHUNKS 0
+ num_commits: $1
+ chunks: oid_fanout oid_lookup commit_metadata generation_data bloom_indexes bloom_data
+ EOF
+ 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..main"
+ 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/t/t4253-am-keep-cr-dos.sh b/t/t4253-am-keep-cr-dos.sh
index 6e1b73e..0ee69d2 100755
--- a/t/t4253-am-keep-cr-dos.sh
+++ b/t/t4253-am-keep-cr-dos.sh
@@ -6,6 +6,9 @@
test_description='git-am mbox with dos line ending.
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
# Three patches which will be added as files with dos line ending.
@@ -43,7 +46,7 @@
test_expect_success 'am with dos files without --keep-cr' '
git checkout -b dosfiles initial &&
- git format-patch -k initial..master &&
+ git format-patch -k initial..main &&
test_must_fail git am -k -3 000*.patch &&
git am --abort &&
rm -rf .git/rebase-apply 000*.patch
@@ -51,23 +54,23 @@
test_expect_success 'am with dos files with --keep-cr' '
git checkout -b dosfiles-keep-cr initial &&
- git format-patch -k --stdout initial..master >output &&
+ git format-patch -k --stdout initial..main >output &&
git am --keep-cr -k -3 output &&
- git diff --exit-code master
+ git diff --exit-code main
'
test_expect_success 'am with dos files config am.keepcr' '
git config am.keepcr 1 &&
git checkout -b dosfiles-conf-keepcr initial &&
- git format-patch -k --stdout initial..master >output &&
+ git format-patch -k --stdout initial..main >output &&
git am -k -3 output &&
- git diff --exit-code master
+ git diff --exit-code main
'
test_expect_success 'am with dos files config am.keepcr overridden by --no-keep-cr' '
git config am.keepcr 1 &&
git checkout -b dosfiles-conf-keepcr-override initial &&
- git format-patch -k initial..master &&
+ git format-patch -k initial..main &&
test_must_fail git am -k -3 --no-keep-cr 000*.patch &&
git am --abort &&
rm -rf .git/rebase-apply 000*.patch
@@ -75,14 +78,14 @@
test_expect_success 'am with dos files with --keep-cr continue' '
git checkout -b dosfiles-keep-cr-continue initial &&
- git format-patch -k initial..master &&
+ git format-patch -k initial..main &&
append_cr <file1a >file &&
git commit -m "different patch" file &&
test_must_fail git am --keep-cr -k -3 000*.patch &&
append_cr <file2 >file &&
git add file &&
git am -3 --resolved &&
- git diff --exit-code master
+ git diff --exit-code main
'
test_expect_success 'am with unix files config am.keepcr overridden by --no-keep-cr' '
@@ -90,9 +93,9 @@
git checkout -b unixfiles-conf-keepcr-override initial &&
cp -f file1 file &&
git commit -m "line ending to unix" file &&
- git format-patch -k initial..master &&
+ git format-patch -k initial..main &&
git am -k -3 --no-keep-cr 000*.patch &&
- git diff --exit-code -w master
+ git diff --exit-code -w main
'
test_done
diff --git a/t/t4254-am-corrupt.sh b/t/t4254-am-corrupt.sh
index fd3bdbf..54be7da 100755
--- a/t/t4254-am-corrupt.sh
+++ b/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 @@
# 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_cmp 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/t/t4255-am-submodule.sh b/t/t4255-am-submodule.sh
index 0ba8194..a7ba08f 100755
--- a/t/t4255-am-submodule.sh
+++ b/t/t4255-am-submodule.sh
@@ -6,17 +6,21 @@
. "$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/t/t4257-am-interactive.sh b/t/t4257-am-interactive.sh
index 5344bd2..aed8f4d 100755
--- a/t/t4257-am-interactive.sh
+++ b/t/t4257-am-interactive.sh
@@ -10,7 +10,7 @@
git format-patch --stdout -2 >mbox &&
git reset --hard unrelated &&
- test_commit conflict-master file master base
+ test_commit conflict-main file main base
'
# Sanity check our setup.
diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
index 37655a2..7204799 100755
--- a/t/t5000-tar-tree.sh
+++ b/t/t5000-tar-tree.sh
@@ -94,6 +94,16 @@
'
}
+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 @@
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 &&
@@ -402,15 +431,33 @@
test_cmp expect actual
'
-test_expect_success TIME_IS_64BIT 'set up repository with far-future commit' '
+test_expect_success TIME_IS_64BIT 'set up repository with far-future (2^34 - 1) commit' '
rm -f .git/index &&
- echo content >file &&
+ echo foo >file &&
git add file &&
- GIT_COMMITTER_DATE="@68719476737 +0000" \
+ GIT_COMMITTER_DATE="@17179869183 +0000" \
git commit -m "tempori parendum"
'
-test_expect_success TIME_IS_64BIT 'generate tar with future mtime' '
+test_expect_success TIME_IS_64BIT 'generate tar with far-future mtime' '
+ git archive HEAD >future.tar
+'
+
+test_expect_success TAR_HUGE,TIME_IS_64BIT,TIME_T_IS_64BIT 'system tar can read our future mtime' '
+ echo 2514 >expect &&
+ tar_info future.tar | cut -d" " -f2 >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success TIME_IS_64BIT 'set up repository with far-far-future (2^36 + 1) commit' '
+ rm -f .git/index &&
+ echo content >file &&
+ git add file &&
+ GIT_TEST_COMMIT_GRAPH=0 GIT_COMMITTER_DATE="@68719476737 +0000" \
+ git commit -m "tempori parendum"
+'
+
+test_expect_success TIME_IS_64BIT 'generate tar with far-far-future mtime' '
git archive HEAD >future.tar
'
diff --git a/t/t5003-archive-zip.sh b/t/t5003-archive-zip.sh
index 106eddb..1e6d18b 100755
--- a/t/t5003-archive-zip.sh
+++ b/t/t5003-archive-zip.sh
@@ -7,12 +7,12 @@
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 @@
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 @@
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/t/t5004-archive-corner-cases.sh b/t/t5004-archive-corner-cases.sh
index 3e7b23c..2d32d0e 100755
--- a/t/t5004-archive-corner-cases.sh
+++ b/t/t5004-archive-corner-cases.sh
@@ -153,7 +153,8 @@
# check the number of entries in the ZIP file directory
expr 65536 + 256 >expect &&
- "$ZIPINFO" many.zip | head -2 | sed -n "2s/.* //p" >actual &&
+ "$ZIPINFO" -h many.zip >zipinfo &&
+ sed -n "2s/.* //p" <zipinfo >actual &&
test_cmp expect actual
'
diff --git a/t/t5150-request-pull.sh b/t/t5150-request-pull.sh
index c1811ea..cb67bac 100755
--- a/t/t5150-request-pull.sh
+++ b/t/t5150-request-pull.sh
@@ -2,6 +2,9 @@
test_description='Test workflows involving pull request.'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
if ! test_have_prereq PERL
@@ -31,13 +34,13 @@
test_tick &&
git commit -m "\"Thirty days\", a reminder of month lengths" &&
git tag -m "version 1" -a initial &&
- git push --tags origin master
+ git push --tags origin main
) &&
(
cd local &&
git remote add upstream "$trash_url/upstream.git" &&
git fetch upstream &&
- git pull upstream master &&
+ git pull upstream main &&
cat <<-\EOT >>mnemonic.txt &&
Of twyecescore-eightt is but eine,
And all the remnante be thrycescore-eine.
@@ -59,7 +62,7 @@
git commit -a -m "Adapt to use modern, simpler English
But keep the old version, too, in case some people prefer it." &&
- git checkout master
+ git checkout main
)
'
@@ -129,7 +132,7 @@
(
cd local &&
git checkout initial &&
- git merge --ff-only master &&
+ git merge --ff-only main &&
test_must_fail git request-pull initial "$downstream_url" \
2>../err
) &&
@@ -145,9 +148,9 @@
(
cd local &&
git checkout initial &&
- git merge --ff-only master &&
- git push origin master:for-upstream &&
- git request-pull initial origin master:for-upstream >../request
+ git merge --ff-only main &&
+ git push origin main:for-upstream &&
+ git request-pull initial origin main:for-upstream >../request
) &&
sed -nf read-request.sed <request >digest &&
{
@@ -172,9 +175,9 @@
(
cd local &&
git checkout initial &&
- git merge --ff-only master &&
- git push --tags origin master simplify &&
- git push origin master:for-upstream &&
+ git merge --ff-only main &&
+ git push --tags origin main simplify &&
+ git push origin main:for-upstream &&
git request-pull initial "$downstream_url" >../request
) &&
sed -nf read-request.sed <request >digest &&
@@ -215,19 +218,19 @@
(
cd local &&
git checkout initial &&
- git merge --ff-only master &&
+ git merge --ff-only main &&
git push origin tags/full &&
git request-pull initial "$downstream_url" tags/full >../request
) &&
<request sed -nf fuzz.sed >request.fuzzy &&
- test_i18ncmp expect request.fuzzy &&
+ test_cmp expect request.fuzzy &&
(
cd local &&
git request-pull initial "$downstream_url" tags/full:refs/tags/full
) >request &&
sed -nf fuzz.sed <request >request.fuzzy &&
- test_i18ncmp expect request.fuzzy &&
+ test_cmp expect request.fuzzy &&
(
cd local &&
@@ -243,9 +246,9 @@
OPTIONS_KEEPDASHDASH=Yes &&
export OPTIONS_KEEPDASHDASH &&
git checkout initial &&
- git merge --ff-only master &&
- git push origin master:for-upstream &&
- git request-pull -- initial "$downstream_url" master:for-upstream >../request
+ git merge --ff-only main &&
+ git push origin main:for-upstream &&
+ git request-pull -- initial "$downstream_url" main:for-upstream >../request
)
'
@@ -257,7 +260,7 @@
(
cd local &&
git checkout initial &&
- git merge --ff-only master &&
+ git merge --ff-only main &&
git tag -mrelease v2.0 &&
git push origin refs/tags/v2.0:refs/tags/v2-0 &&
test_must_fail git request-pull initial "$downstream_url" tags/v2.0 \
@@ -275,7 +278,7 @@
(
cd local &&
git checkout initial &&
- git merge --ff-only master &&
+ git merge --ff-only main &&
git push origin HEAD:refs/tags/full &&
test_must_fail git request-pull initial "$downstream_url" tags/full \
2>../err
@@ -292,7 +295,7 @@
(
cd local &&
git checkout initial &&
- git merge --ff-only master &&
+ git merge --ff-only main &&
git push origin refs/tags/full &&
git tag -f -m"Thirty-one days" full &&
test_must_fail git request-pull initial "$downstream_url" tags/full \
diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index 410a09b..d586fdc 100755
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh
@@ -412,22 +412,22 @@
'
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
'
-test_expect_success !PTHREADS,C_LOCALE_OUTPUT 'index-pack --threads=N or pack.threads=N warns when no pthreads' '
+test_expect_success !PTHREADS 'index-pack --threads=N or pack.threads=N warns when no pthreads' '
test_must_fail git index-pack --threads=2 2>err &&
grep ^warning: err >warnings &&
test_line_count = 1 warnings &&
@@ -445,7 +445,7 @@
grep -F "no threads support, ignoring pack.threads" err
'
-test_expect_success !PTHREADS,C_LOCALE_OUTPUT 'pack-objects --threads=N or pack.threads=N warns when no pthreads' '
+test_expect_success !PTHREADS 'pack-objects --threads=N or pack.threads=N warns when no pthreads' '
git pack-objects --threads=2 --stdout --all </dev/null >/dev/null 2>err &&
grep ^warning: err >warnings &&
test_line_count = 1 warnings &&
@@ -496,4 +496,40 @@
)
'
+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/t/t5302-pack-index.sh b/t/t5302-pack-index.sh
index ad07f2f..7c9d687 100755
--- a/t/t5302-pack-index.sh
+++ b/t/t5302-pack-index.sh
@@ -7,65 +7,64 @@
. ./test-lib.sh
test_expect_success 'setup' '
- test_oid_init &&
- 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
+ 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"
@@ -75,13 +74,13 @@
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")
@@ -91,21 +90,21 @@
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
@@ -120,135 +119,143 @@
# 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" &&
- 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'
+ '[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 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 v1] 6) newly created pack is BAD !' \
- 'test_must_fail git verify-pack -v "test-4-${pack4}.pack"'
+ '[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] 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"'
+ '[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] 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'
+ '[index v2] 4) confirm that the pack is actually corrupted' '
+ test_must_fail git fsck --full $commit
+'
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] 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] 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'
-
-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) * 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"
+ '[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
@@ -256,18 +263,25 @@
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/t/t5304-prune.sh b/t/t5304-prune.sh
index df60f18..b447ce5 100755
--- a/t/t5304-prune.sh
+++ b/t/t5304-prune.sh
@@ -4,6 +4,9 @@
#
test_description='prune'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
day=$((60*60*24))
@@ -119,7 +122,7 @@
test_expect_success 'prune: prune former HEAD after checking out branch' '
head_oid=$(git rev-parse HEAD) &&
- git checkout --quiet master &&
+ git checkout --quiet main &&
git prune -v >prune_actual &&
grep "$head_oid" prune_actual
diff --git a/t/t5305-include-tag.sh b/t/t5305-include-tag.sh
index a5eca21..44bd9ef 100755
--- a/t/t5305-include-tag.sh
+++ b/t/t5305-include-tag.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='git pack-object --include-tag'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
TRASH=$(pwd)
@@ -111,7 +114,7 @@
test_expect_success 'single-branch clone can transfer tag' '
rm -rf clone.git &&
- git clone --no-local --single-branch -b master . clone.git &&
+ git clone --no-local --single-branch -b main . clone.git &&
git -C clone.git fsck
'
diff --git a/t/t5308-pack-detect-duplicates.sh b/t/t5308-pack-detect-duplicates.sh
index 6845c1f..693b241 100755
--- a/t/t5308-pack-detect-duplicates.sh
+++ b/t/t5308-pack-detect-duplicates.sh
@@ -4,23 +4,27 @@
. ./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/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh
index 8318781..40b9f63 100755
--- a/t/t5310-pack-bitmaps.sh
+++ b/t/t5310-pack-bitmaps.sh
@@ -1,7 +1,12 @@
#!/bin/sh
test_description='exercise basic bitmap functionality'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-bundle.sh
+. "$TEST_DIRECTORY"/lib-bitmap.sh
objpath () {
echo ".git/objects/$(echo "$1" | sed -e 's|\(..\)|\1/|')"
@@ -20,84 +25,172 @@
grep -Ff "$1" "$2"
}
+# To ensure the logic for "maximal commits" is exercised, make
+# the repository a bit more complicated.
+#
+# other second
+# * *
+# (99 commits) (99 commits)
+# * *
+# |\ /|
+# | * octo-other octo-second * |
+# |/|\_________ ____________/|\|
+# | \ \/ __________/ |
+# | | ________/\ / |
+# * |/ * merge-right *
+# | _|__________/ \____________ |
+# |/ | \|
+# (l1) * * merge-left * (r1)
+# | / \________________________ |
+# |/ \|
+# (l2) * * (r2)
+# \___________________________ |
+# \|
+# * (base)
+#
+# We only push bits down the first-parent history, which
+# makes some of these commits unimportant!
+#
+# The important part for the maximal commit algorithm is how
+# the bitmasks are extended. Assuming starting bit positions
+# for second (bit 0) and other (bit 1), the bitmasks at the
+# end should be:
+#
+# second: 1 (maximal, selected)
+# other: 01 (maximal, selected)
+# (base): 11 (maximal)
+#
+# This complicated history was important for a previous
+# version of the walk that guarantees never walking a
+# commit multiple times. That goal might be important
+# again, so preserve this complicated case. For now, this
+# test will guarantee that the bitmaps are computed
+# correctly, even with the repeat calculations.
+
test_expect_success 'setup repo with moderate-sized history' '
- test_commit_bulk --id=file 100 &&
+ test_commit_bulk --id=file 10 &&
+ git branch -M second &&
git checkout -b other HEAD~5 &&
test_commit_bulk --id=side 10 &&
- git checkout master &&
- bitmaptip=$(git rev-parse master) &&
+
+ # add complicated history setup, including merges and
+ # ambiguous merge-bases
+
+ git checkout -b merge-left other~2 &&
+ git merge second~2 -m "merge-left" &&
+
+ git checkout -b merge-right second~1 &&
+ git merge other~1 -m "merge-right" &&
+
+ git checkout -b octo-second second &&
+ git merge merge-left merge-right -m "octopus-second" &&
+
+ git checkout -b octo-other other &&
+ git merge merge-left merge-right -m "octopus-other" &&
+
+ git checkout other &&
+ git merge octo-other -m "pull octopus" &&
+
+ git checkout second &&
+ git merge octo-second -m "pull octopus" &&
+
+ # Remove these branches so they are not selected
+ # as bitmap tips
+ git branch -D merge-left &&
+ git branch -D merge-right &&
+ git branch -D octo-other &&
+ git branch -D octo-second &&
+
+ # add padding to make these merges less interesting
+ # and avoid having them selected for bitmaps
+ test_commit_bulk --id=file 100 &&
+ git checkout other &&
+ test_commit_bulk --id=side 100 &&
+ git checkout second &&
+
+ bitmaptip=$(git rev-parse second) &&
blob=$(echo tagged-blob | git hash-object -w --stdin) &&
git tag tagged-blob $blob &&
git config repack.writebitmaps true
'
test_expect_success 'full repack creates bitmaps' '
- git repack -ad &&
+ GIT_TRACE2_EVENT_NESTING=4 GIT_TRACE2_EVENT="$(pwd)/trace" \
+ git repack -ad &&
ls .git/objects/pack/ | grep bitmap >output &&
- test_line_count = 1 output
+ test_line_count = 1 output &&
+ grep "\"key\":\"num_selected_commits\",\"value\":\"106\"" trace &&
+ grep "\"key\":\"num_maximal_commits\",\"value\":\"107\"" trace
'
test_expect_success 'rev-list --test-bitmap verifies bitmaps' '
git rev-list --test-bitmap HEAD
'
-rev_list_tests() {
- state=$1
-
- test_expect_success "counting commits via bitmap ($state)" '
- git rev-list --count HEAD >expect &&
- git rev-list --use-bitmap-index --count HEAD >actual &&
+rev_list_tests_head () {
+ test_expect_success "counting commits via bitmap ($state, $branch)" '
+ git rev-list --count $branch >expect &&
+ git rev-list --use-bitmap-index --count $branch >actual &&
test_cmp expect actual
'
- test_expect_success "counting partial commits via bitmap ($state)" '
- git rev-list --count HEAD~5..HEAD >expect &&
- git rev-list --use-bitmap-index --count HEAD~5..HEAD >actual &&
+ test_expect_success "counting partial commits via bitmap ($state, $branch)" '
+ git rev-list --count $branch~5..$branch >expect &&
+ git rev-list --use-bitmap-index --count $branch~5..$branch >actual &&
test_cmp expect actual
'
- test_expect_success "counting commits with limit ($state)" '
- git rev-list --count -n 1 HEAD >expect &&
- git rev-list --use-bitmap-index --count -n 1 HEAD >actual &&
+ test_expect_success "counting commits with limit ($state, $branch)" '
+ git rev-list --count -n 1 $branch >expect &&
+ git rev-list --use-bitmap-index --count -n 1 $branch >actual &&
test_cmp expect actual
'
- test_expect_success "counting non-linear history ($state)" '
- git rev-list --count other...master >expect &&
- git rev-list --use-bitmap-index --count other...master >actual &&
+ test_expect_success "counting non-linear history ($state, $branch)" '
+ git rev-list --count other...second >expect &&
+ git rev-list --use-bitmap-index --count other...second >actual &&
test_cmp expect actual
'
- test_expect_success "counting commits with limiting ($state)" '
- git rev-list --count HEAD -- 1.t >expect &&
- git rev-list --use-bitmap-index --count HEAD -- 1.t >actual &&
+ test_expect_success "counting commits with limiting ($state, $branch)" '
+ git rev-list --count $branch -- 1.t >expect &&
+ git rev-list --use-bitmap-index --count $branch -- 1.t >actual &&
test_cmp expect actual
'
- test_expect_success "counting objects via bitmap ($state)" '
- git rev-list --count --objects HEAD >expect &&
- git rev-list --use-bitmap-index --count --objects HEAD >actual &&
+ test_expect_success "counting objects via bitmap ($state, $branch)" '
+ git rev-list --count --objects $branch >expect &&
+ git rev-list --use-bitmap-index --count --objects $branch >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_expect_success "enumerate commits ($state, $branch)" '
+ git rev-list --use-bitmap-index $branch >actual &&
+ git rev-list $branch >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_expect_success "enumerate --objects ($state, $branch)" '
+ git rev-list --objects --use-bitmap-index $branch >actual &&
+ git rev-list --objects $branch >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 &&
+ test_expect_success "bitmap --objects handles non-commit objects ($state, $branch)" '
+ git rev-list --objects --use-bitmap-index $branch tagged-blob >actual &&
grep $blob actual
'
}
+rev_list_tests () {
+ state=$1
+
+ for branch in "second" "other"
+ do
+ rev_list_tests_head
+ done
+}
+
rev_list_tests 'full bitmap'
test_expect_success 'clone from bitmapped repository' '
@@ -128,7 +221,7 @@
rev_list_tests 'partial bitmap'
test_expect_success 'fetch (partial bitmap)' '
- git --git-dir=clone.git fetch origin master:master &&
+ git --git-dir=clone.git fetch origin second:second &&
git rev-parse HEAD >expect &&
git --git-dir=clone.git rev-parse HEAD >actual &&
test_cmp expect actual
@@ -230,7 +323,7 @@
'
test_expect_success 'fetch (full bitmap)' '
- git --git-dir=clone.git fetch origin master:master &&
+ git --git-dir=clone.git fetch origin second:second &&
git rev-parse HEAD >expect &&
git --git-dir=clone.git rev-parse HEAD >actual &&
test_cmp expect actual
@@ -277,7 +370,7 @@
git pack-objects --stdout --revs <revs >/dev/null
'
-test_expect_success JGIT 'we can read jgit bitmaps' '
+test_expect_success JGIT,SHA1 'we can read jgit bitmaps' '
git clone --bare . compat-jgit.git &&
(
cd compat-jgit.git &&
@@ -287,7 +380,7 @@
)
'
-test_expect_success JGIT 'jgit can read our bitmaps' '
+test_expect_success JGIT,SHA1 'jgit can read our bitmaps' '
git clone --bare . compat-us.git &&
(
cd compat-us.git &&
@@ -343,7 +436,20 @@
test_must_be_empty actual
'
-test_expect_success 'truncated bitmap fails gracefully' '
+test_expect_success 'truncated bitmap fails gracefully (ewah)' '
+ test_config pack.writebitmaphashcache false &&
+ git repack -ad &&
+ git rev-list --use-bitmap-index --count --all >expect &&
+ bitmap=$(ls .git/objects/pack/*.bitmap) &&
+ test_when_finished "rm -f $bitmap" &&
+ test_copy_bytes 256 <$bitmap >$bitmap.tmp &&
+ mv -f $bitmap.tmp $bitmap &&
+ git rev-list --use-bitmap-index --count --all >actual 2>stderr &&
+ test_cmp expect actual &&
+ test_i18ngrep corrupt.ewah.bitmap stderr
+'
+
+test_expect_success 'truncated bitmap fails gracefully (cache)' '
git repack -ad &&
git rev-list --use-bitmap-index --count --all >expect &&
bitmap=$(ls .git/objects/pack/*.bitmap) &&
@@ -352,7 +458,7 @@
mv -f $bitmap.tmp $bitmap &&
git rev-list --use-bitmap-index --count --all >actual 2>stderr &&
test_cmp expect actual &&
- test_i18ngrep corrupt stderr
+ test_i18ngrep corrupted.bitmap.index stderr
'
# have_delta <obj> <expected_base>
diff --git a/t/t5312-prune-corruption.sh b/t/t5312-prune-corruption.sh
index da9d599..11423b3 100755
--- a/t/t5312-prune-corruption.sh
+++ b/t/t5312-prune-corruption.sh
@@ -8,6 +8,9 @@
OK to proceed as if it did not exist. Otherwise we might silently
delete objects that cannot be recovered.
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'disable reflogs' '
@@ -16,7 +19,7 @@
'
test_expect_success 'create history reachable only from a bogus-named ref' '
- test_tick && git commit --allow-empty -m master &&
+ test_tick && git commit --allow-empty -m main &&
base=$(git rev-parse HEAD) &&
test_tick && git commit --allow-empty -m bogus &&
bogus=$(git rev-parse HEAD) &&
@@ -51,7 +54,7 @@
'
# We create two new objects here, "one" and "two". Our
-# master branch points to "two", which is deleted,
+# main branch points to "two", which is deleted,
# corrupting the repository. But we'd like to make sure
# that the otherwise unreachable "one" is not pruned
# (since it is the user's best bet for recovering
@@ -81,7 +84,7 @@
test_expect_success 'pack-refs does not silently delete broken loose ref' '
git pack-refs --all --prune &&
echo $missing >expect &&
- git rev-parse refs/heads/master >actual &&
+ git rev-parse refs/heads/main >actual &&
test_cmp expect actual
'
@@ -89,25 +92,25 @@
# actually pack it, as it is perfectly reasonable to
# skip processing a broken ref
test_expect_success 'create packed-refs file with broken ref' '
- rm -f .git/refs/heads/master &&
+ rm -f .git/refs/heads/main &&
cat >.git/packed-refs <<-EOF &&
- $missing refs/heads/master
+ $missing refs/heads/main
$recoverable refs/heads/other
EOF
echo $missing >expect &&
- git rev-parse refs/heads/master >actual &&
+ git rev-parse refs/heads/main >actual &&
test_cmp expect actual
'
test_expect_success 'pack-refs does not silently delete broken packed ref' '
git pack-refs --all --prune &&
- git rev-parse refs/heads/master >actual &&
+ git rev-parse refs/heads/main >actual &&
test_cmp expect actual
'
test_expect_success 'pack-refs does not drop broken refs during deletion' '
git update-ref -d refs/heads/other &&
- git rev-parse refs/heads/master >actual &&
+ git rev-parse refs/heads/main >actual &&
test_cmp expect actual
'
diff --git a/t/t5313-pack-bounds-checks.sh b/t/t5313-pack-bounds-checks.sh
index 2a4557e..535313e 100755
--- a/t/t5313-pack-bounds-checks.sh
+++ b/t/t5313-pack-bounds-checks.sh
@@ -45,7 +45,6 @@
}
test_expect_success 'setup' '
- test_oid_init &&
test_oid_cache <<-EOF
oid000 sha1:1485
oid000 sha256:4222
diff --git a/t/t5315-pack-objects-compression.sh b/t/t5315-pack-objects-compression.sh
index df970d7..8bacd96 100755
--- a/t/t5315-pack-objects-compression.sh
+++ b/t/t5315-pack-objects-compression.sh
@@ -4,12 +4,6 @@
. ./test-lib.sh
-# This should be moved to test-lib.sh together with the
-# copy in t0021 after both topics have graduated to 'master'.
-file_size () {
- test-tool path-utils file-size "$1"
-}
-
test_expect_success setup '
printf "%2000000s" X |
git hash-object -w --stdin >object-name &&
@@ -24,7 +18,7 @@
test_expect_success "pack-objects with $config" '
test_when_finished "rm -f pack-*.*" &&
git $config pack-objects pack <object-name &&
- sz=$(file_size pack-*.pack) &&
+ sz=$(test_file_size pack-*.pack) &&
case "$expect" in
small) test "$sz" -le 100000 ;;
large) test "$sz" -ge 100000 ;;
diff --git a/t/t5316-pack-delta-depth.sh b/t/t5316-pack-delta-depth.sh
index 0f06c40..a8c1bc0 100755
--- a/t/t5316-pack-delta-depth.sh
+++ b/t/t5316-pack-delta-depth.sh
@@ -84,14 +84,14 @@
pack=$(git pack-objects --all --window=0 </dev/null pack) &&
echo 9 >expect &&
max_chain pack-$pack.pack >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success '--depth limits depth' '
pack=$(git pack-objects --all --depth=5 </dev/null pack) &&
echo 5 >expect &&
max_chain pack-$pack.pack >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_done
diff --git a/t/t5317-pack-objects-filter-objects.sh b/t/t5317-pack-objects-filter-objects.sh
index dc04465..13ed3eb 100755
--- a/t/t5317-pack-objects-filter-objects.sh
+++ b/t/t5317-pack-objects-filter-objects.sh
@@ -2,6 +2,9 @@
test_description='git pack-objects using object filtering'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
# Test blob:none filter.
@@ -382,7 +385,7 @@
awk -f print_2.awk ls_files_result |
sort >expected &&
- git -C r4 pack-objects --revs --stdout --filter=sparse:oid=master:pattern >filter.pack <<-EOF &&
+ git -C r4 pack-objects --revs --stdout --filter=sparse:oid=main:pattern >filter.pack <<-EOF &&
HEAD
EOF
git -C r4 index-pack ../filter.pack &&
diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh
index 9bf920a..edeb6d6 100755
--- a/t/t5318-commit-graph.sh
+++ b/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' '
@@ -40,15 +50,6 @@
git repack
'
-test_expect_success 'exit with correct error on bad input to --stdin-commits' '
- cd "$TRASH_DIRECTORY/full" &&
- echo HEAD | test_expect_code 1 git commit-graph write --stdin-commits 2>stderr &&
- test_i18ngrep "invalid commit object id" stderr &&
- # valid tree OID, but not a commit OID
- git rev-parse HEAD^{tree} | test_expect_code 1 git commit-graph write --stdin-commits 2>stderr &&
- test_i18ngrep "invalid commit object id" stderr
-'
-
graph_git_two_modes() {
git -c core.commitGraph=true $1 >output
git -c core.commitGraph=false $1 >expect
@@ -75,13 +76,13 @@
graph_read_expect() {
OPTIONAL=""
NUM_CHUNKS=3
- if test ! -z $2
+ if test ! -z "$2"
then
OPTIONAL=" $2"
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
@@ -89,11 +90,34 @@
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 generation_data
+'
+
test_expect_success 'write graph' '
cd "$TRASH_DIRECTORY/full" &&
git commit-graph write &&
test_path_is_file $objdir/info/commit-graph &&
- graph_read_expect "3"
+ graph_read_expect "3" generation_data
+'
+
+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
@@ -127,7 +151,7 @@
test_expect_success 'commit-graph write progress off for redirected stderr' '
cd "$TRASH_DIRECTORY/full" &&
git commit-graph write 2>err &&
- test_line_count = 0 err
+ test_must_be_empty err
'
test_expect_success 'commit-graph write force progress on for stderr' '
@@ -139,13 +163,34 @@
test_expect_success 'commit-graph write with the --no-progress option' '
cd "$TRASH_DIRECTORY/full" &&
git commit-graph write --no-progress 2>err &&
- test_line_count = 0 err
+ test_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_line_count = 0 err
+ test_must_be_empty err
'
test_expect_success 'commit-graph verify force progress on for stderr' '
@@ -157,7 +202,7 @@
test_expect_success 'commit-graph verify with the --no-progress option' '
cd "$TRASH_DIRECTORY/full" &&
git commit-graph verify --no-progress 2>err &&
- test_line_count = 0 err
+ test_must_be_empty err
'
# Current graph structure:
@@ -174,7 +219,7 @@
cd "$TRASH_DIRECTORY/full" &&
git commit-graph write &&
test_path_is_file $objdir/info/commit-graph &&
- graph_read_expect "10" "extra_edges"
+ graph_read_expect "10" "generation_data extra_edges"
'
graph_git_behavior 'merge 1 vs 2' full merge/1 merge/2
@@ -209,7 +254,7 @@
cd "$TRASH_DIRECTORY/full" &&
git commit-graph write &&
test_path_is_file $objdir/info/commit-graph &&
- graph_read_expect "11" "extra_edges"
+ graph_read_expect "11" "generation_data extra_edges"
'
graph_git_behavior 'full graph, commit 8 vs merge 1' full commits/8 merge/1
@@ -219,7 +264,7 @@
cd "$TRASH_DIRECTORY/full" &&
git commit-graph write &&
test_path_is_file $objdir/info/commit-graph &&
- graph_read_expect "11" "extra_edges"
+ graph_read_expect "11" "generation_data extra_edges"
'
graph_git_behavior 'cleared graph, commit 8 vs merge 1' full commits/8 merge/1
@@ -229,7 +274,7 @@
cd "$TRASH_DIRECTORY/full" &&
cat new-idx | git commit-graph write --stdin-packs &&
test_path_is_file $objdir/info/commit-graph &&
- graph_read_expect "9" "extra_edges"
+ graph_read_expect "9" "generation_data extra_edges"
'
graph_git_behavior 'graph from pack, commit 8 vs merge 1' full commits/8 merge/1
@@ -242,7 +287,7 @@
git rev-parse merge/1 >>commits-in &&
cat commits-in | git commit-graph write --stdin-commits &&
test_path_is_file $objdir/info/commit-graph &&
- graph_read_expect "6"
+ graph_read_expect "6" "generation_data"
'
graph_git_behavior 'graph from commits, commit 8 vs merge 1' full commits/8 merge/1
@@ -252,7 +297,7 @@
cd "$TRASH_DIRECTORY/full" &&
git rev-parse merge/3 | git commit-graph write --stdin-commits --append &&
test_path_is_file $objdir/info/commit-graph &&
- graph_read_expect "10" "extra_edges"
+ graph_read_expect "10" "generation_data extra_edges"
'
graph_git_behavior 'append graph, commit 8 vs merge 1' full commits/8 merge/1
@@ -262,7 +307,7 @@
cd "$TRASH_DIRECTORY/full" &&
git commit-graph write --reachable &&
test_path_is_file $objdir/info/commit-graph &&
- graph_read_expect "11" "extra_edges"
+ graph_read_expect "11" "generation_data extra_edges"
'
graph_git_behavior 'append graph, commit 8 vs merge 1' full commits/8 merge/1
@@ -283,7 +328,7 @@
cd "$TRASH_DIRECTORY/bare" &&
git commit-graph write &&
test_path_is_file $baredir/info/commit-graph &&
- graph_read_expect "11" "extra_edges"
+ graph_read_expect "11" "generation_data extra_edges"
'
graph_git_behavior 'bare repo with graph, commit 8 vs merge 1' bare commits/8 merge/1
@@ -372,6 +417,56 @@
)
'
+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
+ )
+'
+
+test_expect_success 'lower layers have overflow chunk' '
+ cd "$TRASH_DIRECTORY/full" &&
+ UNIX_EPOCH_ZERO="@0 +0000" &&
+ FUTURE_DATE="@2147483646 +0000" &&
+ rm -f .git/objects/info/commit-graph &&
+ test_commit --date "$FUTURE_DATE" future-1 &&
+ test_commit --date "$UNIX_EPOCH_ZERO" old-1 &&
+ git commit-graph write --reachable &&
+ test_commit --date "$FUTURE_DATE" future-2 &&
+ test_commit --date "$UNIX_EPOCH_ZERO" old-2 &&
+ git commit-graph write --reachable --split=no-merge &&
+ test_commit extra &&
+ git commit-graph write --reachable --split=no-merge &&
+ git commit-graph write --reachable &&
+ graph_read_expect 16 "generation_data generation_data_overflow extra_edges" &&
+ mv .git/objects/info/commit-graph commit-graph-upgraded &&
+ git commit-graph write --reachable &&
+ graph_read_expect 16 "generation_data generation_data_overflow extra_edges" &&
+ test_cmp .git/objects/info/commit-graph commit-graph-upgraded
+'
+
# 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
@@ -380,8 +475,9 @@
test_expect_success 'git commit-graph verify' '
cd "$TRASH_DIRECTORY/full" &&
- git rev-parse commits/8 | git commit-graph write --stdin-commits &&
- git commit-graph verify >output
+ git rev-parse commits/8 | GIT_TEST_COMMIT_GRAPH_NO_GDAT=1 git commit-graph write --stdin-commits &&
+ git commit-graph verify >output &&
+ graph_read_expect 9 extra_edges
'
NUM_COMMITS=9
@@ -421,7 +517,8 @@
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() {
@@ -434,7 +531,8 @@
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
}
@@ -453,7 +551,7 @@
zero_pos=${4:-${orig_size}} &&
printf "$data" | dd of="$objdir/info/commit-graph" bs=1 seek="$pos" conv=notrunc &&
dd of="$objdir/info/commit-graph" bs=1 seek="$zero_pos" if=/dev/null &&
- generate_zero_bytes $(($orig_size - $zero_pos)) >>"$objdir/info/commit-graph" &&
+ test-tool genzeros $(($orig_size - $zero_pos)) >>"$objdir/info/commit-graph" &&
corrupt_graph_verify "$grepstr"
}
@@ -486,8 +584,8 @@
'
test_expect_success 'detect low chunk count' '
- corrupt_graph_and_verify $GRAPH_BYTE_CHUNK_COUNT "\02" \
- "missing the .* chunk"
+ corrupt_graph_and_verify $GRAPH_BYTE_CHUNK_COUNT "\01" \
+ "final chunk has non-zero id"
'
test_expect_success 'detect missing OID fanout chunk' '
@@ -572,7 +670,8 @@
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)' '
@@ -664,4 +763,56 @@
)
'
+# We test the overflow-related code with the following repo history:
+#
+# 4:F - 5:N - 6:U
+# / \
+# 1:U - 2:N - 3:U M:N
+# \ /
+# 7:N - 8:F - 9:N
+#
+# Here the commits denoted by U have committer date of zero seconds
+# since Unix epoch, the commits denoted by N have committer date
+# starting from 1112354055 seconds since Unix epoch (default committer
+# date for the test suite), and the commits denoted by F have committer
+# date of (2 ^ 31 - 2) seconds since Unix epoch.
+#
+# The largest offset observed is 2 ^ 31, just large enough to overflow.
+#
+
+test_expect_success 'set up and verify repo with generation data overflow chunk' '
+ objdir=".git/objects" &&
+ UNIX_EPOCH_ZERO="@0 +0000" &&
+ FUTURE_DATE="@2147483646 +0000" &&
+ test_oid_cache <<-EOF &&
+ oid_version sha1:1
+ oid_version sha256:2
+ EOF
+ cd "$TRASH_DIRECTORY" &&
+ mkdir repo &&
+ cd repo &&
+ git init &&
+ test_commit --date "$UNIX_EPOCH_ZERO" 1 &&
+ test_commit 2 &&
+ test_commit --date "$UNIX_EPOCH_ZERO" 3 &&
+ git commit-graph write --reachable &&
+ graph_read_expect 3 generation_data &&
+ test_commit --date "$FUTURE_DATE" 4 &&
+ test_commit 5 &&
+ test_commit --date "$UNIX_EPOCH_ZERO" 6 &&
+ git branch left &&
+ git reset --hard 3 &&
+ test_commit 7 &&
+ test_commit --date "$FUTURE_DATE" 8 &&
+ test_commit 9 &&
+ git branch right &&
+ git reset --hard 3 &&
+ test_merge M left right &&
+ git commit-graph write --reachable &&
+ graph_read_expect 10 "generation_data generation_data_overflow" &&
+ git commit-graph verify
+'
+
+graph_git_behavior 'generation data overflow chunk repo' repo left right
+
test_done
diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh
index 43a7a66..b4afab1 100755
--- a/t/t5319-multi-pack-index.sh
+++ b/t/t5319-multi-pack-index.sh
@@ -3,8 +3,11 @@
test_description='multi-pack-indexes'
. ./test-lib.sh
+GIT_TEST_MULTI_PACK_INDEX=0
objdir=.git/objects
+HASH_LEN=$(test_oid rawsz)
+
midx_read_expect () {
NUM_PACKS=$1
NUM_OBJECTS=$2
@@ -13,7 +16,7 @@
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:
@@ -29,7 +32,6 @@
}
test_expect_success 'setup' '
- test_oid_init &&
test_oid_cache <<-EOF
idxoff sha1:2999
idxoff sha256:3739
@@ -42,10 +44,15 @@
EOF
'
-test_expect_success 'write midx with no packs' '
- test_when_finished rm -f pack/multi-pack-index &&
- git multi-pack-index --object-dir=. write &&
- midx_read_expect 0 0 4 .
+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 () {
@@ -131,7 +138,7 @@
compare_results_with_midx "one v2 pack"
-test_expect_success 'corrupt idx not opened' '
+test_expect_success 'corrupt idx reports errors' '
idx=$(test-tool read-midx $objdir | grep "\.idx\$") &&
mv $objdir/pack/$idx backup-$idx &&
test_when_finished "mv backup-\$idx \$objdir/pack/\$idx" &&
@@ -142,7 +149,7 @@
test_copy_bytes 1064 <backup-$idx >$objdir/pack/$idx &&
git -c core.multiPackIndex=true rev-list --objects --all 2>err &&
- test_must_be_empty err
+ grep "index unavailable" err
'
test_expect_success 'add more objects' '
@@ -167,12 +174,12 @@
'
test_expect_success 'write force progress on for stderr' '
- git multi-pack-index --object-dir=$objdir --progress write 2>err &&
+ GIT_PROGRESS_DELAY=0 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 &&
+ GIT_PROGRESS_DELAY=0 git multi-pack-index --object-dir=$objdir --no-progress write 2>err &&
test_line_count = 0 err
'
@@ -194,6 +201,40 @@
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
'
@@ -239,7 +280,6 @@
"multi-pack-index signature"
'
-HASH_LEN=$(test_oid rawsz)
NUM_OBJECTS=74
MIDX_BYTE_VERSION=4
MIDX_BYTE_OID_VERSION=5
@@ -268,18 +308,18 @@
'
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"
'
test_expect_success 'verify truncated chunk count' '
corrupt_midx_and_verify $MIDX_BYTE_CHUNK_COUNT "\01" $objdir \
- "missing required"
+ "final chunk has non-zero id"
'
test_expect_success 'verify extended chunk count' '
corrupt_midx_and_verify $MIDX_BYTE_CHUNK_COUNT "\07" $objdir \
- "terminating multi-pack-index chunk id appears earlier than expected"
+ "terminating chunk id appears earlier than expected"
'
test_expect_success 'verify missing required chunk' '
@@ -289,7 +329,7 @@
test_expect_success 'verify invalid chunk offset' '
corrupt_midx_and_verify $MIDX_BYTE_CHUNK_OFFSET "\01" $objdir \
- "invalid chunk offset (too large)"
+ "improper chunk offset(s)"
'
test_expect_success 'verify packnames out of order' '
@@ -329,26 +369,66 @@
'
test_expect_success 'repack progress off for redirected stderr' '
- git multi-pack-index --object-dir=$objdir repack 2>err &&
+ GIT_PROGRESS_DELAY=0 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 &&
+ GIT_PROGRESS_DELAY=0 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 &&
+ GIT_PROGRESS_DELAY=0 git multi-pack-index --object-dir=$objdir --no-progress repack 2>err &&
test_line_count = 0 err
'
-test_expect_success 'repack removes multi-pack-index' '
+test_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' '
@@ -483,7 +563,7 @@
test_expect_success 'expire force progress on for stderr' '
(
cd dup &&
- git multi-pack-index --progress expire 2>err &&
+ GIT_PROGRESS_DELAY=0 git multi-pack-index --progress expire 2>err &&
test_file_not_empty err
)
'
@@ -491,7 +571,7 @@
test_expect_success 'expire with the --no-progress option' '
(
cd dup &&
- git multi-pack-index --no-progress expire 2>err &&
+ GIT_PROGRESS_DELAY=0 git multi-pack-index --no-progress expire 2>err &&
test_line_count = 0 err
)
'
@@ -521,10 +601,10 @@
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 &&
@@ -533,6 +613,33 @@
)
'
+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 &&
@@ -603,14 +710,16 @@
PACKA=$(ls .git/objects/pack/a-pack*\.pack | sed s/\.pack\$//) &&
touch $PACKA.keep &&
git multi-pack-index expire &&
- ls -S .git/objects/pack/a-pack* | grep $PACKA >a-pack-files &&
- test_line_count = 3 a-pack-files &&
+ test_path_is_file $PACKA.idx &&
+ test_path_is_file $PACKA.keep &&
+ test_path_is_file $PACKA.pack &&
test-tool read-midx .git/objects | grep idx >midx-list &&
test_line_count = 2 midx-list
)
'
test_expect_success 'repack --batch-size=0 repacks everything' '
+ cp -r dup dup2 &&
(
cd dup &&
rm .git/objects/pack/*.keep &&
@@ -630,4 +739,47 @@
)
'
+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_expect_success 'load reverse index when missing .idx, .pack' '
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+
+ git config core.multiPackIndex true &&
+
+ test_commit base &&
+ git repack -ad &&
+ git multi-pack-index write &&
+
+ git rev-parse HEAD >tip &&
+ pack=$(ls .git/objects/pack/pack-*.pack) &&
+ idx=$(ls .git/objects/pack/pack-*.idx) &&
+
+ mv $idx $idx.bak &&
+ git cat-file --batch-check="%(objectsize:disk)" <tip &&
+
+ mv $idx.bak $idx &&
+
+ mv $pack $pack.bak &&
+ git cat-file --batch-check="%(objectsize:disk)" <tip
+ )
+'
+
test_done
diff --git a/t/t5319/no-objects.midx b/t/t5319/no-objects.midx
new file mode 100644
index 0000000..e466b8e
--- /dev/null
+++ b/t/t5319/no-objects.midx
Binary files differ
diff --git a/t/t5322-pack-objects-sparse.sh b/t/t5322-pack-objects-sparse.sh
index 7124b55..61cb907 100755
--- a/t/t5322-pack-objects-sparse.sh
+++ b/t/t5322-pack-objects-sparse.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='pack-objects object selection using sparse algorithm'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup repo' '
@@ -18,7 +21,7 @@
git commit -m "Initialized trees" &&
for i in $(test_seq 1 3)
do
- git checkout -b topic$i master &&
+ git checkout -b topic$i main &&
echo change-$i >f$i/f$i/data.txt &&
git commit -a -m "Changed f$i/f$i/data.txt"
done &&
@@ -105,14 +108,16 @@
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/t/t5323-pack-redundant.sh b/t/t5323-pack-redundant.sh
index 6b4d1ca..8b01793 100755
--- a/t/t5323-pack-redundant.sh
+++ b/t/t5323-pack-redundant.sh
@@ -6,7 +6,7 @@
test_description='Test git pack-redundant
In order to test git-pack-redundant, we will create a number of objects and
-packs in the repository `master.git`. The relationship between packs (P1-P8)
+packs in the repository `main.git`. The relationship between packs (P1-P8)
and objects (T, A-R) is showed in the following chart. Objects of a pack will
be marked with letter x, while objects of redundant packs will be marked with
exclamation point, and redundant pack itself will be marked with asterisk.
@@ -25,7 +25,7 @@
ALL | x x x x x x x x x x x x x x x x x x x
Another repository `shared.git` has unique objects (X-Z), while other objects
-(marked with letter s) are shared through alt-odb (of `master.git`). The
+(marked with letter s) are shared through alt-odb (of `main.git`). The
relationship between packs and objects is as follows:
| T A B C D E F G H I J K L M N O P Q R X Y Z
@@ -36,9 +36,11 @@
. ./test-lib.sh
-master_repo=master.git
+main_repo=main.git
shared_repo=shared.git
+git_pack_redundant='git pack-redundant --i-still-use-this'
+
# Create commits in <repo> and assign each commit's oid to shell variables
# given in the arguments (A, B, and C). E.g.:
#
@@ -69,7 +71,7 @@
shift ||
return 1
done &&
- git -C "$repo" update-ref refs/heads/master $oid
+ git -C "$repo" update-ref refs/heads/main $oid
}
# Create pack in <repo> and assign pack id to variable given in the 2nd argument
@@ -107,9 +109,48 @@
sort
}
-test_expect_success 'setup master repo' '
- git init --bare "$master_repo" &&
- create_commits_in "$master_repo" A B C D E F G H I J K L M N O P Q R
+test_expect_success 'setup main repo' '
+ git init --bare "$main_repo" &&
+ create_commits_in "$main_repo" A B C D E F G H I J K L M N O P Q R
+'
+
+test_expect_success 'master: pack-redundant works with no packfile' '
+ (
+ cd "$master_repo" &&
+ cat >expect <<-EOF &&
+ fatal: Zero packs found!
+ EOF
+ test_must_fail $git_pack_redundant --all >actual 2>&1 &&
+ test_cmp expect actual
+ )
+'
+
+#############################################################################
+# Chart of packs and objects for this test case
+#
+# | T A B C D E F G H I J K L M N O P Q R
+# ----+--------------------------------------
+# P1 | x x x x x x x x
+# ----+--------------------------------------
+# ALL | x x x x x x x x
+#
+#############################################################################
+test_expect_success 'main: pack-redundant works with one packfile' '
+ create_pack_in "$main_repo" P1 <<-EOF &&
+ $T
+ $A
+ $B
+ $C
+ $D
+ $E
+ $F
+ $R
+ EOF
+ (
+ cd "$main_repo" &&
+ $git_pack_redundant --all >out &&
+ test_must_be_empty out
+ )
'
#############################################################################
@@ -124,18 +165,8 @@
# ALL | x x x x x x x x x x x x x x x
#
#############################################################################
-test_expect_success 'master: no redundant for pack 1, 2, 3' '
- create_pack_in "$master_repo" P1 <<-EOF &&
- $T
- $A
- $B
- $C
- $D
- $E
- $F
- $R
- EOF
- create_pack_in "$master_repo" P2 <<-EOF &&
+test_expect_success 'main: no redundant for pack 1, 2, 3' '
+ create_pack_in "$main_repo" P2 <<-EOF &&
$B
$C
$D
@@ -144,7 +175,7 @@
$H
$I
EOF
- create_pack_in "$master_repo" P3 <<-EOF &&
+ create_pack_in "$main_repo" P3 <<-EOF &&
$F
$I
$J
@@ -153,8 +184,8 @@
$M
EOF
(
- cd "$master_repo" &&
- git pack-redundant --all >out &&
+ cd "$main_repo" &&
+ $git_pack_redundant --all >out &&
test_must_be_empty out
)
'
@@ -173,26 +204,26 @@
# ALL | x x x x x x x x x x x x x x x x x x
#
#############################################################################
-test_expect_success 'master: one of pack-2/pack-3 is redundant' '
- create_pack_in "$master_repo" P4 <<-EOF &&
+test_expect_success 'main: one of pack-2/pack-3 is redundant' '
+ create_pack_in "$main_repo" P4 <<-EOF &&
$J
$K
$L
$M
$P
EOF
- create_pack_in "$master_repo" P5 <<-EOF &&
+ create_pack_in "$main_repo" P5 <<-EOF &&
$G
$H
$N
$O
EOF
(
- cd "$master_repo" &&
+ cd "$main_repo" &&
cat >expect <<-EOF &&
P3:$P3
EOF
- git pack-redundant --all >out &&
+ $git_pack_redundant --all >out &&
format_packfiles <out >actual &&
test_cmp expect actual
)
@@ -214,24 +245,24 @@
# ALL | x x x x x x x x x x x x x x x x x x x
#
#############################################################################
-test_expect_success 'master: pack 2, 4, and 6 are redundant' '
- create_pack_in "$master_repo" P6 <<-EOF &&
+test_expect_success 'main: pack 2, 4, and 6 are redundant' '
+ create_pack_in "$main_repo" P6 <<-EOF &&
$N
$O
$Q
EOF
- create_pack_in "$master_repo" P7 <<-EOF &&
+ create_pack_in "$main_repo" P7 <<-EOF &&
$P
$Q
EOF
(
- cd "$master_repo" &&
+ cd "$main_repo" &&
cat >expect <<-EOF &&
P2:$P2
P4:$P4
P6:$P6
EOF
- git pack-redundant --all >out &&
+ $git_pack_redundant --all >out &&
format_packfiles <out >actual &&
test_cmp expect actual
)
@@ -254,57 +285,57 @@
# ALL | x x x x x x x x x x x x x x x x x x x
#
#############################################################################
-test_expect_success 'master: pack-8 (subset of pack-1) is also redundant' '
- create_pack_in "$master_repo" P8 <<-EOF &&
+test_expect_success 'main: pack-8 (subset of pack-1) is also redundant' '
+ create_pack_in "$main_repo" P8 <<-EOF &&
$A
EOF
(
- cd "$master_repo" &&
+ cd "$main_repo" &&
cat >expect <<-EOF &&
P2:$P2
P4:$P4
P6:$P6
P8:$P8
EOF
- git pack-redundant --all >out &&
+ $git_pack_redundant --all >out &&
format_packfiles <out >actual &&
test_cmp expect actual
)
'
-test_expect_success 'master: clean loose objects' '
+test_expect_success 'main: clean loose objects' '
(
- cd "$master_repo" &&
+ cd "$main_repo" &&
git prune-packed &&
find objects -type f | sed -e "/objects\/pack\//d" >out &&
test_must_be_empty out
)
'
-test_expect_success 'master: remove redundant packs and pass fsck' '
+test_expect_success 'main: remove redundant packs and pass fsck' '
(
- cd "$master_repo" &&
- git pack-redundant --all | xargs rm &&
+ cd "$main_repo" &&
+ $git_pack_redundant --all | xargs rm &&
git fsck &&
- git pack-redundant --all >out &&
+ $git_pack_redundant --all >out &&
test_must_be_empty out
)
'
# The following test cases will execute inside `shared.git`, instead of
-# inside `master.git`.
+# inside `main.git`.
test_expect_success 'setup shared.git' '
- git clone --mirror "$master_repo" "$shared_repo" &&
+ git clone --mirror "$main_repo" "$shared_repo" &&
(
cd "$shared_repo" &&
- printf "../../$master_repo/objects\n" >objects/info/alternates
+ printf "../../$main_repo/objects\n" >objects/info/alternates
)
'
test_expect_success 'shared: all packs are redundant, but no output without --alt-odb' '
(
cd "$shared_repo" &&
- git pack-redundant --all >out &&
+ $git_pack_redundant --all >out &&
test_must_be_empty out
)
'
@@ -312,7 +343,7 @@
#############################################################################
# Chart of packs and objects for this test case
#
-# ================ master.git ===============
+# ================= main.git ================
# | T A B C D E F G H I J K L M N O P Q R <----------+
# ----+-------------------------------------- |
# P1 | x x x x x x x x |
@@ -343,7 +374,7 @@
P5:$P5
P7:$P7
EOF
- git pack-redundant --all --verbose >out 2>out.err &&
+ $git_pack_redundant --all --verbose >out 2>out.err &&
test_must_be_empty out &&
grep "pack$" out.err | format_packfiles >actual &&
test_cmp expect actual
@@ -356,9 +387,9 @@
cat >expect <<-EOF &&
fatal: Zero packs found!
EOF
- git pack-redundant --all --alt-odb | xargs rm &&
+ $git_pack_redundant --all --alt-odb | xargs rm &&
git fsck &&
- test_must_fail git pack-redundant --all --alt-odb >actual 2>&1 &&
+ test_must_fail $git_pack_redundant --all --alt-odb >actual 2>&1 &&
test_cmp expect actual
)
'
@@ -386,7 +417,7 @@
test_expect_success 'shared: no redundant without --alt-odb' '
(
cd "$shared_repo" &&
- git pack-redundant --all >out &&
+ $git_pack_redundant --all >out &&
test_must_be_empty out
)
'
@@ -394,7 +425,7 @@
#############################################################################
# Chart of packs and objects for this test case
#
-# ================ master.git ===============
+# ================= main.git ================
# | T A B C D E F G H I J K L M N O P Q R <----------------+
# ----+-------------------------------------- |
# P1 | x x x x x x x x |
@@ -417,7 +448,7 @@
test_expect_success 'shared: one pack is redundant with --alt-odb' '
(
cd "$shared_repo" &&
- git pack-redundant --all --alt-odb >out &&
+ $git_pack_redundant --all --alt-odb >out &&
format_packfiles <out >actual &&
test_line_count = 1 actual
)
@@ -426,7 +457,7 @@
#############################################################################
# Chart of packs and objects for this test case
#
-# ================ master.git ===============
+# ================= main.git ================
# | T A B C D E F G H I J K L M N O P Q R <----------------+
# ----+-------------------------------------- |
# P1 | x x x x x x x x |
@@ -454,7 +485,7 @@
Px1:$Px1
Px2:$Px2
EOF
- git pack-redundant --all --alt-odb >out <<-EOF &&
+ $git_pack_redundant --all --alt-odb >out <<-EOF &&
$X
$Y
$Z
diff --git a/t/t5324-split-commit-graph.sh b/t/t5324-split-commit-graph.sh
index 53b2e6b..8e90f34 100755
--- a/t/t5324-split-commit-graph.sh
+++ b/t/t5324-split-commit-graph.sh
@@ -4,6 +4,7 @@
. ./test-lib.sh
GIT_TEST_COMMIT_GRAPH=0
+GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=0
test_expect_success 'setup repo' '
git init &&
@@ -11,13 +12,15 @@
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
+ shallow sha1:2132
+ shallow sha256:2436
- base sha1:1376
- base sha256:1496
+ base sha1:1408
+ base sha256:1528
+
+ oid_version sha1:1
+ oid_version sha256:2
EOM
'
@@ -28,14 +31,18 @@
NUM_BASE=$2
fi
cat >expect <<- EOF
- header: 43475048 1 1 3 $NUM_BASE
+ header: 43475048 1 $(test_oid oid_version) 4 $NUM_BASE
num_commits: $1
- chunks: oid_fanout oid_lookup commit_metadata
+ chunks: oid_fanout oid_lookup commit_metadata generation_data
EOF
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
@@ -210,8 +217,14 @@
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
) &&
@@ -351,4 +364,274 @@
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_expect_success 'prevent regression for duplicate commits across layers' '
+ git init dup &&
+ git -C dup commit --allow-empty -m one &&
+ git -C dup -c core.commitGraph=false commit-graph write --split=no-merge --reachable 2>err &&
+ test_i18ngrep "attempting to write a commit-graph" err &&
+ git -C dup commit-graph write --split=no-merge --reachable &&
+ git -C dup commit --allow-empty -m two &&
+ git -C dup commit-graph write --split=no-merge --reachable &&
+ git -C dup commit --allow-empty -m three &&
+ git -C dup commit-graph write --split --reachable &&
+ git -C dup commit-graph verify
+'
+
+NUM_FIRST_LAYER_COMMITS=64
+NUM_SECOND_LAYER_COMMITS=16
+NUM_THIRD_LAYER_COMMITS=7
+NUM_FOURTH_LAYER_COMMITS=8
+NUM_FIFTH_LAYER_COMMITS=16
+SECOND_LAYER_SEQUENCE_START=$(($NUM_FIRST_LAYER_COMMITS + 1))
+SECOND_LAYER_SEQUENCE_END=$(($SECOND_LAYER_SEQUENCE_START + $NUM_SECOND_LAYER_COMMITS - 1))
+THIRD_LAYER_SEQUENCE_START=$(($SECOND_LAYER_SEQUENCE_END + 1))
+THIRD_LAYER_SEQUENCE_END=$(($THIRD_LAYER_SEQUENCE_START + $NUM_THIRD_LAYER_COMMITS - 1))
+FOURTH_LAYER_SEQUENCE_START=$(($THIRD_LAYER_SEQUENCE_END + 1))
+FOURTH_LAYER_SEQUENCE_END=$(($FOURTH_LAYER_SEQUENCE_START + $NUM_FOURTH_LAYER_COMMITS - 1))
+FIFTH_LAYER_SEQUENCE_START=$(($FOURTH_LAYER_SEQUENCE_END + 1))
+FIFTH_LAYER_SEQUENCE_END=$(($FIFTH_LAYER_SEQUENCE_START + $NUM_FIFTH_LAYER_COMMITS - 1))
+
+# Current split graph chain:
+#
+# 16 commits (No GDAT)
+# ------------------------
+# 64 commits (GDAT)
+#
+test_expect_success 'setup repo for mixed generation commit-graph-chain' '
+ graphdir=".git/objects/info/commit-graphs" &&
+ test_oid_cache <<-EOF &&
+ oid_version sha1:1
+ oid_version sha256:2
+ EOF
+ git init mixed &&
+ (
+ cd mixed &&
+ git config core.commitGraph true &&
+ git config gc.writeCommitGraph false &&
+ for i in $(test_seq $NUM_FIRST_LAYER_COMMITS)
+ do
+ test_commit $i &&
+ git branch commits/$i || return 1
+ done &&
+ git commit-graph write --reachable --split &&
+ graph_read_expect $NUM_FIRST_LAYER_COMMITS &&
+ test_line_count = 1 $graphdir/commit-graph-chain &&
+ for i in $(test_seq $SECOND_LAYER_SEQUENCE_START $SECOND_LAYER_SEQUENCE_END)
+ do
+ test_commit $i &&
+ git branch commits/$i || return 1
+ done &&
+ GIT_TEST_COMMIT_GRAPH_NO_GDAT=1 git commit-graph write --reachable --split=no-merge &&
+ test_line_count = 2 $graphdir/commit-graph-chain &&
+ test-tool read-graph >output &&
+ cat >expect <<-EOF &&
+ header: 43475048 1 $(test_oid oid_version) 4 1
+ num_commits: $NUM_SECOND_LAYER_COMMITS
+ chunks: oid_fanout oid_lookup commit_metadata
+ EOF
+ test_cmp expect output &&
+ git commit-graph verify &&
+ cat $graphdir/commit-graph-chain
+ )
+'
+
+# The new layer will be added without generation data chunk as it was not
+# present on the layer underneath it.
+#
+# 7 commits (No GDAT)
+# ------------------------
+# 16 commits (No GDAT)
+# ------------------------
+# 64 commits (GDAT)
+#
+test_expect_success 'do not write generation data chunk if not present on existing tip' '
+ git clone mixed mixed-no-gdat &&
+ (
+ cd mixed-no-gdat &&
+ for i in $(test_seq $THIRD_LAYER_SEQUENCE_START $THIRD_LAYER_SEQUENCE_END)
+ do
+ test_commit $i &&
+ git branch commits/$i || return 1
+ done &&
+ git commit-graph write --reachable --split=no-merge &&
+ test_line_count = 3 $graphdir/commit-graph-chain &&
+ test-tool read-graph >output &&
+ cat >expect <<-EOF &&
+ header: 43475048 1 $(test_oid oid_version) 4 2
+ num_commits: $NUM_THIRD_LAYER_COMMITS
+ chunks: oid_fanout oid_lookup commit_metadata
+ EOF
+ test_cmp expect output &&
+ git commit-graph verify
+ )
+'
+
+# Number of commits in each layer of the split-commit graph before merge:
+#
+# 8 commits (No GDAT)
+# ------------------------
+# 7 commits (No GDAT)
+# ------------------------
+# 16 commits (No GDAT)
+# ------------------------
+# 64 commits (GDAT)
+#
+# The top two layers are merged and do not have generation data chunk as layer below them does
+# not have generation data chunk.
+#
+# 15 commits (No GDAT)
+# ------------------------
+# 16 commits (No GDAT)
+# ------------------------
+# 64 commits (GDAT)
+#
+test_expect_success 'do not write generation data chunk if the topmost remaining layer does not have generation data chunk' '
+ git clone mixed-no-gdat mixed-merge-no-gdat &&
+ (
+ cd mixed-merge-no-gdat &&
+ for i in $(test_seq $FOURTH_LAYER_SEQUENCE_START $FOURTH_LAYER_SEQUENCE_END)
+ do
+ test_commit $i &&
+ git branch commits/$i || return 1
+ done &&
+ git commit-graph write --reachable --split --size-multiple 1 &&
+ test_line_count = 3 $graphdir/commit-graph-chain &&
+ test-tool read-graph >output &&
+ cat >expect <<-EOF &&
+ header: 43475048 1 $(test_oid oid_version) 4 2
+ num_commits: $(($NUM_THIRD_LAYER_COMMITS + $NUM_FOURTH_LAYER_COMMITS))
+ chunks: oid_fanout oid_lookup commit_metadata
+ EOF
+ test_cmp expect output &&
+ git commit-graph verify
+ )
+'
+
+# Number of commits in each layer of the split-commit graph before merge:
+#
+# 16 commits (No GDAT)
+# ------------------------
+# 15 commits (No GDAT)
+# ------------------------
+# 16 commits (No GDAT)
+# ------------------------
+# 64 commits (GDAT)
+#
+# The top three layers are merged and has generation data chunk as the topmost remaining layer
+# has generation data chunk.
+#
+# 47 commits (GDAT)
+# ------------------------
+# 64 commits (GDAT)
+#
+test_expect_success 'write generation data chunk if topmost remaining layer has generation data chunk' '
+ git clone mixed-merge-no-gdat mixed-merge-gdat &&
+ (
+ cd mixed-merge-gdat &&
+ for i in $(test_seq $FIFTH_LAYER_SEQUENCE_START $FIFTH_LAYER_SEQUENCE_END)
+ do
+ test_commit $i &&
+ git branch commits/$i || return 1
+ done &&
+ git commit-graph write --reachable --split --size-multiple 1 &&
+ test_line_count = 2 $graphdir/commit-graph-chain &&
+ test-tool read-graph >output &&
+ cat >expect <<-EOF &&
+ header: 43475048 1 $(test_oid oid_version) 5 1
+ num_commits: $(($NUM_SECOND_LAYER_COMMITS + $NUM_THIRD_LAYER_COMMITS + $NUM_FOURTH_LAYER_COMMITS + $NUM_FIFTH_LAYER_COMMITS))
+ chunks: oid_fanout oid_lookup commit_metadata generation_data
+ EOF
+ test_cmp expect output
+ )
+'
+
+test_expect_success 'write generation data chunk when commit-graph chain is replaced' '
+ git clone mixed mixed-replace &&
+ (
+ cd mixed-replace &&
+ git commit-graph write --reachable --split=replace &&
+ test_path_is_file $graphdir/commit-graph-chain &&
+ test_line_count = 1 $graphdir/commit-graph-chain &&
+ verify_chain_files_exist $graphdir &&
+ graph_read_expect $(($NUM_FIRST_LAYER_COMMITS + $NUM_SECOND_LAYER_COMMITS)) &&
+ git commit-graph verify
+ )
+'
+
test_done
diff --git a/t/t5325-reverse-index.sh b/t/t5325-reverse-index.sh
new file mode 100755
index 0000000..da453f6
--- /dev/null
+++ b/t/t5325-reverse-index.sh
@@ -0,0 +1,120 @@
+#!/bin/sh
+
+test_description='on-disk reverse index'
+. ./test-lib.sh
+
+# The below tests want control over the 'pack.writeReverseIndex' setting
+# themselves to assert various combinations of it with other options.
+sane_unset GIT_TEST_WRITE_REV_INDEX
+
+packdir=.git/objects/pack
+
+test_expect_success 'setup' '
+ test_commit base &&
+
+ pack=$(git pack-objects --all $packdir/pack) &&
+ rev=$packdir/pack-$pack.rev &&
+
+ test_path_is_missing $rev
+'
+
+test_index_pack () {
+ rm -f $rev &&
+ conf=$1 &&
+ shift &&
+ # remove the index since Windows won't overwrite an existing file
+ rm $packdir/pack-$pack.idx &&
+ git -c pack.writeReverseIndex=$conf index-pack "$@" \
+ $packdir/pack-$pack.pack
+}
+
+test_expect_success 'index-pack with pack.writeReverseIndex' '
+ test_index_pack "" &&
+ test_path_is_missing $rev &&
+
+ test_index_pack false &&
+ test_path_is_missing $rev &&
+
+ test_index_pack true &&
+ test_path_is_file $rev
+'
+
+test_expect_success 'index-pack with --[no-]rev-index' '
+ for conf in "" true false
+ do
+ test_index_pack "$conf" --rev-index &&
+ test_path_exists $rev &&
+
+ test_index_pack "$conf" --no-rev-index &&
+ test_path_is_missing $rev
+ done
+'
+
+test_expect_success 'index-pack can verify reverse indexes' '
+ test_when_finished "rm -f $rev" &&
+ test_index_pack true &&
+
+ test_path_is_file $rev &&
+ git index-pack --rev-index --verify $packdir/pack-$pack.pack &&
+
+ # Intentionally corrupt the reverse index.
+ chmod u+w $rev &&
+ printf "xxxx" | dd of=$rev bs=1 count=4 conv=notrunc &&
+
+ test_must_fail git index-pack --rev-index --verify \
+ $packdir/pack-$pack.pack 2>err &&
+ grep "validation error" err
+'
+
+test_expect_success 'index-pack infers reverse index name with -o' '
+ git index-pack --rev-index -o other.idx $packdir/pack-$pack.pack &&
+ test_path_is_file other.idx &&
+ test_path_is_file other.rev
+'
+
+test_expect_success 'pack-objects respects pack.writeReverseIndex' '
+ test_when_finished "rm -fr pack-1-*" &&
+
+ git -c pack.writeReverseIndex= pack-objects --all pack-1 &&
+ test_path_is_missing pack-1-*.rev &&
+
+ git -c pack.writeReverseIndex=false pack-objects --all pack-1 &&
+ test_path_is_missing pack-1-*.rev &&
+
+ git -c pack.writeReverseIndex=true pack-objects --all pack-1 &&
+ test_path_is_file pack-1-*.rev
+'
+
+test_expect_success 'reverse index is not generated when available on disk' '
+ test_index_pack true &&
+ test_path_is_file $rev &&
+
+ git rev-parse HEAD >tip &&
+ GIT_TEST_REV_INDEX_DIE_IN_MEMORY=1 git cat-file \
+ --batch-check="%(objectsize:disk)" <tip
+'
+
+test_expect_success 'revindex in-memory vs on-disk' '
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+
+ test_commit commit &&
+
+ git rev-list --objects --no-object-names --all >objects &&
+
+ git -c pack.writeReverseIndex=false repack -ad &&
+ test_path_is_missing $packdir/pack-*.rev &&
+ git cat-file --batch-check="%(objectsize:disk) %(objectname)" \
+ <objects >in-core &&
+
+ git -c pack.writeReverseIndex=true repack -ad &&
+ test_path_is_file $packdir/pack-*.rev &&
+ git cat-file --batch-check="%(objectsize:disk) %(objectname)" \
+ <objects >on-disk &&
+
+ test_cmp on-disk in-core
+ )
+'
+test_done
diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index b84618c..3f81f16 100755
--- a/t/t5400-send-pack.sh
+++ b/t/t5400-send-pack.sh
@@ -6,6 +6,9 @@
test_description='See why rewinding head breaks send-pack
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
cnt=64
@@ -21,14 +24,15 @@
i=0 &&
while test $i -le $cnt
do
- i=$(($i+1)) &&
- test_tick &&
- echo "Commit #$i" >mozart/is/pink &&
- git update-index --add mozart/is/pink &&
- tree=$(git write-tree) &&
- commit=$(echo "Commit #$i" | git commit-tree $tree -p $parent) &&
- git update-ref refs/tags/commit$i $commit &&
- parent=$commit || return 1
+ i=$(($i+1)) &&
+ test_tick &&
+ echo "Commit #$i" >mozart/is/pink &&
+ git update-index --add mozart/is/pink &&
+ tree=$(git write-tree) &&
+ commit=$(echo "Commit #$i" |
+ git commit-tree $tree -p $parent) &&
+ git update-ref refs/tags/commit$i $commit &&
+ parent=$commit || return 1
done &&
git update-ref HEAD "$commit" &&
git clone ./. victim &&
@@ -38,14 +42,14 @@
i=0 &&
while test $i -le $cnt
do
- i=$(($i+1)) &&
- test_tick &&
- echo "Rebase #$i" >mozart/is/pink &&
- git update-index --add mozart/is/pink &&
- tree=$(git write-tree) &&
- commit=$(echo "Rebase #$i" | git commit-tree $tree -p $parent) &&
- git update-ref refs/tags/rebase$i $commit &&
- parent=$commit || return 1
+ i=$(($i+1)) &&
+ test_tick &&
+ echo "Rebase #$i" >mozart/is/pink &&
+ git update-index --add mozart/is/pink &&
+ tree=$(git write-tree) &&
+ commit=$(echo "Rebase #$i" | git commit-tree $tree -p $parent) &&
+ git update-ref refs/tags/rebase$i $commit &&
+ parent=$commit || return 1
done &&
git update-ref HEAD "$commit" &&
echo Rebase &&
@@ -57,40 +61,40 @@
'
test_expect_success 'pack the destination repository' '
- (
- cd victim &&
- git repack -a -d &&
- git prune
- )
+ (
+ cd victim &&
+ git repack -a -d &&
+ git prune
+ )
'
test_expect_success 'refuse pushing rewound head without --force' '
- pushed_head=$(git rev-parse --verify master) &&
- victim_orig=$(cd victim && git rev-parse --verify master) &&
- test_must_fail git send-pack ./victim master &&
- victim_head=$(cd victim && git rev-parse --verify master) &&
+ pushed_head=$(git rev-parse --verify main) &&
+ victim_orig=$(cd victim && git rev-parse --verify main) &&
+ test_must_fail git send-pack ./victim main &&
+ victim_head=$(cd victim && git rev-parse --verify main) &&
test "$victim_head" = "$victim_orig" &&
# this should update
- git send-pack --force ./victim master &&
- victim_head=$(cd victim && git rev-parse --verify master) &&
+ git send-pack --force ./victim main &&
+ victim_head=$(cd victim && git rev-parse --verify main) &&
test "$victim_head" = "$pushed_head"
'
test_expect_success 'push can be used to delete a ref' '
- ( cd victim && git branch extra master ) &&
- git send-pack ./victim :extra master &&
+ ( cd victim && git branch extra main ) &&
+ git send-pack ./victim :extra main &&
( cd victim &&
test_must_fail git rev-parse --verify extra )
'
test_expect_success 'refuse deleting push with denyDeletes' '
(
- cd victim &&
- test_might_fail git branch -D extra &&
- git config receive.denyDeletes true &&
- git branch extra master
+ cd victim &&
+ test_might_fail git branch -D extra &&
+ git config receive.denyDeletes true &&
+ git branch extra main
) &&
- test_must_fail git send-pack ./victim :extra master
+ test_must_fail git send-pack ./victim :extra main
'
test_expect_success 'cannot override denyDeletes with git -c send-pack' '
@@ -98,10 +102,10 @@
cd victim &&
test_might_fail git branch -D extra &&
git config receive.denyDeletes true &&
- git branch extra master
+ git branch extra main
) &&
test_must_fail git -c receive.denyDeletes=false \
- send-pack ./victim :extra master
+ send-pack ./victim :extra main
'
test_expect_success 'override denyDeletes with git -c receive-pack' '
@@ -109,22 +113,22 @@
cd victim &&
test_might_fail git branch -D extra &&
git config receive.denyDeletes true &&
- git branch extra master
+ git branch extra main
) &&
git send-pack \
--receive-pack="git -c receive.denyDeletes=false receive-pack" \
- ./victim :extra master
+ ./victim :extra main
'
test_expect_success 'denyNonFastforwards trumps --force' '
(
- cd victim &&
- test_might_fail git branch -D extra &&
- git config receive.denyNonFastforwards true
+ cd victim &&
+ test_might_fail git branch -D extra &&
+ git config receive.denyNonFastforwards true
) &&
- victim_orig=$(cd victim && git rev-parse --verify master) &&
- test_must_fail git send-pack --force ./victim master^:master &&
- victim_head=$(cd victim && git rev-parse --verify master) &&
+ victim_orig=$(cd victim && git rev-parse --verify main) &&
+ test_must_fail git send-pack --force ./victim main^:main &&
+ victim_head=$(cd victim && git rev-parse --verify main) &&
test "$victim_orig" = "$victim_head"
'
@@ -143,16 +147,16 @@
test_expect_success 'push --all excludes remote-tracking hierarchy' '
mkdir parent &&
(
- cd parent &&
- git init && : >file && git add file && git commit -m add
+ cd parent &&
+ git init && : >file && git add file && git commit -m add
) &&
git clone parent child &&
(
- cd child && git push --all
+ cd child && git push --all
) &&
(
- cd parent &&
- test -z "$(git for-each-ref refs/remotes/origin)"
+ cd parent &&
+ test -z "$(git for-each-ref refs/remotes/origin)"
)
'
@@ -160,33 +164,33 @@
rm -rf parent child &&
git init parent &&
(
- # Setup a repo with 2 packs
- cd parent &&
- echo "Some text" >file.txt &&
- git add . &&
- git commit -m "Initial commit" &&
- git repack -adl &&
- echo "Some more text" >>file.txt &&
- git commit -a -m "Second commit" &&
- git repack
+ # Setup a repo with 2 packs
+ cd parent &&
+ echo "Some text" >file.txt &&
+ git add . &&
+ git commit -m "Initial commit" &&
+ git repack -adl &&
+ echo "Some more text" >>file.txt &&
+ git commit -a -m "Second commit" &&
+ git repack
) &&
cp -R parent child &&
(
- # Set the child to auto-pack if more than one pack exists
- cd child &&
- git config gc.autopacklimit 1 &&
- git config gc.autodetach false &&
- git branch test_auto_gc &&
- # And create a file that follows the temporary object naming
- # convention for the auto-gc to remove
- : >.git/objects/tmp_test_object &&
- test-tool chmtime =-1209601 .git/objects/tmp_test_object
+ # Set the child to auto-pack if more than one pack exists
+ cd child &&
+ git config gc.autopacklimit 1 &&
+ git config gc.autodetach false &&
+ git branch test_auto_gc &&
+ # And create a file that follows the temporary object naming
+ # convention for the auto-gc to remove
+ : >.git/objects/tmp_test_object &&
+ test-tool chmtime =-1209601 .git/objects/tmp_test_object
) &&
(
- cd parent &&
- echo "Even more text" >>file.txt &&
- git commit -a -m "Third commit" &&
- git send-pack ../child HEAD:refs/heads/test_auto_gc
+ cd parent &&
+ echo "Even more text" >>file.txt &&
+ git commit -a -m "Third commit" &&
+ git send-pack ../child HEAD:refs/heads/test_auto_gc
) &&
test ! -e child/.git/objects/tmp_test_object
'
@@ -195,63 +199,63 @@
rm -rf parent child &&
mkdir parent &&
(
- cd parent &&
- git init &&
- echo one >file && git add file && git commit -m one &&
- git config receive.denyCurrentBranch warn &&
- echo two >file && git commit -a -m two
+ cd parent &&
+ git init &&
+ echo one >file && git add file && git commit -m one &&
+ git config receive.denyCurrentBranch warn &&
+ echo two >file && git commit -a -m two
) &&
git clone parent child &&
(
- cd child && git reset --hard HEAD^
+ cd child && git reset --hard HEAD^
)
}
test_expect_success 'pushing explicit refspecs respects forcing' '
rewound_push_setup &&
- parent_orig=$(cd parent && git rev-parse --verify master) &&
+ parent_orig=$(cd parent && git rev-parse --verify main) &&
(
- cd child &&
- test_must_fail git send-pack ../parent \
- refs/heads/master:refs/heads/master
+ cd child &&
+ test_must_fail git send-pack ../parent \
+ refs/heads/main:refs/heads/main
) &&
- parent_head=$(cd parent && git rev-parse --verify master) &&
+ parent_head=$(cd parent && git rev-parse --verify main) &&
test "$parent_orig" = "$parent_head" &&
(
- cd child &&
- git send-pack ../parent \
- +refs/heads/master:refs/heads/master
+ cd child &&
+ git send-pack ../parent \
+ +refs/heads/main:refs/heads/main
) &&
- parent_head=$(cd parent && git rev-parse --verify master) &&
- child_head=$(cd child && git rev-parse --verify master) &&
+ parent_head=$(cd parent && git rev-parse --verify main) &&
+ child_head=$(cd child && git rev-parse --verify main) &&
test "$parent_head" = "$child_head"
'
test_expect_success 'pushing wildcard refspecs respects forcing' '
rewound_push_setup &&
- parent_orig=$(cd parent && git rev-parse --verify master) &&
+ parent_orig=$(cd parent && git rev-parse --verify main) &&
(
- cd child &&
- test_must_fail git send-pack ../parent \
- "refs/heads/*:refs/heads/*"
+ cd child &&
+ test_must_fail git send-pack ../parent \
+ "refs/heads/*:refs/heads/*"
) &&
- parent_head=$(cd parent && git rev-parse --verify master) &&
+ parent_head=$(cd parent && git rev-parse --verify main) &&
test "$parent_orig" = "$parent_head" &&
(
- cd child &&
- git send-pack ../parent \
- "+refs/heads/*:refs/heads/*"
+ cd child &&
+ git send-pack ../parent \
+ "+refs/heads/*:refs/heads/*"
) &&
- parent_head=$(cd parent && git rev-parse --verify master) &&
- child_head=$(cd child && git rev-parse --verify master) &&
+ parent_head=$(cd parent && git rev-parse --verify main) &&
+ child_head=$(cd child && git rev-parse --verify main) &&
test "$parent_head" = "$child_head"
'
test_expect_success 'deny pushing to delete current branch' '
rewound_push_setup &&
(
- cd child &&
- test_must_fail git send-pack ../parent :refs/heads/master 2>errs
+ cd child &&
+ test_must_fail git send-pack ../parent :refs/heads/main 2>errs
)
'
@@ -282,14 +286,14 @@
local=$(git -C fork rev-parse HEAD) &&
shared=$(git -C shared rev-parse only-shared) &&
cat >expect <<-EOF &&
- $local refs/heads/master
+ $local refs/heads/main
$local refs/remotes/origin/HEAD
- $local refs/remotes/origin/master
+ $local refs/remotes/origin/main
$shared .have
EOF
GIT_TRACE_PACKET=$(pwd)/trace GIT_TEST_PROTOCOL_VERSION=0 \
- git push \
+ git push \
--receive-pack="unset GIT_TRACE_PACKET; git-receive-pack" \
fork HEAD:foo &&
extract_ref_advertisement <trace >refs &&
diff --git a/t/t5401-update-hooks.sh b/t/t5401-update-hooks.sh
index 956d69f..6012cc8 100755
--- a/t/t5401-update-hooks.sh
+++ b/t/t5401-update-hooks.sh
@@ -15,11 +15,11 @@
git update-index a &&
tree1=$(git write-tree) &&
commit1=$(echo modify | git commit-tree $tree1 -p $commit0) &&
- git update-ref refs/heads/master $commit0 &&
+ git update-ref refs/heads/main $commit0 &&
git update-ref refs/heads/tofail $commit1 &&
git clone --bare ./. victim.git &&
GIT_DIR=victim.git git update-ref refs/heads/tofail $commit1 &&
- git update-ref refs/heads/master $commit1 &&
+ git update-ref refs/heads/main $commit1 &&
git update-ref refs/heads/tofail $commit0
'
@@ -38,7 +38,7 @@
read x; printf %s "$x" >$GIT_DIR/update.stdin
echo STDOUT update $1
echo STDERR update $1 >&2
-test "$1" = refs/heads/master || exit
+test "$1" = refs/heads/main || exit
EOF
chmod u+x victim.git/hooks/update
@@ -62,11 +62,11 @@
test_expect_success push '
test_must_fail git send-pack --force ./victim.git \
- master tofail >send.out 2>send.err
+ main tofail >send.out 2>send.err
'
test_expect_success 'updated as expected' '
- test $(GIT_DIR=victim.git git rev-parse master) = $commit1 &&
+ test $(GIT_DIR=victim.git git rev-parse main) = $commit1 &&
test $(GIT_DIR=victim.git git rev-parse tofail) = $commit1
'
@@ -82,24 +82,24 @@
'
test_expect_success 'pre-receive hook input' '
- (echo $commit0 $commit1 refs/heads/master &&
+ (echo $commit0 $commit1 refs/heads/main &&
echo $commit1 $commit0 refs/heads/tofail
) | test_cmp - victim.git/pre-receive.stdin
'
test_expect_success 'update hook arguments' '
- (echo refs/heads/master $commit0 $commit1 &&
+ (echo refs/heads/main $commit0 $commit1 &&
echo refs/heads/tofail $commit1 $commit0
) | test_cmp - victim.git/update.args
'
test_expect_success 'post-receive hook input' '
- echo $commit0 $commit1 refs/heads/master |
+ echo $commit0 $commit1 refs/heads/main |
test_cmp - victim.git/post-receive.stdin
'
test_expect_success 'post-update hook arguments' '
- echo refs/heads/master |
+ echo refs/heads/main |
test_cmp - victim.git/post-update.args
'
@@ -120,8 +120,8 @@
cat <<EOF >expect
remote: STDOUT pre-receive
remote: STDERR pre-receive
-remote: STDOUT update refs/heads/master
-remote: STDERR update refs/heads/master
+remote: STDOUT update refs/heads/main
+remote: STDERR update refs/heads/main
remote: STDOUT update refs/heads/tofail
remote: STDERR update refs/heads/tofail
remote: error: hook declined to update refs/heads/tofail
@@ -143,7 +143,7 @@
for v in $(test_seq 100 999)
do
- git branch branch_$v master || return
+ git branch branch_$v main || return
done &&
git push ./victim.git "+refs/heads/*:refs/heads/*"
'
diff --git a/t/t5402-post-merge-hook.sh b/t/t5402-post-merge-hook.sh
index 6eb2ffd..3e5e19c 100755
--- a/t/t5402-post-merge-hook.sh
+++ b/t/t5402-post-merge-hook.sh
@@ -4,6 +4,9 @@
#
test_description='Test the post-merge hook.'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
@@ -15,7 +18,7 @@
git update-index a &&
tree1=$(git write-tree) &&
commit1=$(echo modify | git commit-tree $tree1 -p $commit0) &&
- git update-ref refs/heads/master $commit0 &&
+ git update-ref refs/heads/main $commit0 &&
git clone ./. clone1 &&
GIT_DIR=clone1/.git git update-index --add a &&
git clone ./. clone2 &&
@@ -23,34 +26,34 @@
'
for clone in 1 2; do
- cat >clone${clone}/.git/hooks/post-merge <<'EOF'
+ cat >clone${clone}/.git/hooks/post-merge <<'EOF'
#!/bin/sh
echo $@ >> $GIT_DIR/post-merge.args
EOF
- chmod u+x clone${clone}/.git/hooks/post-merge
+ chmod u+x clone${clone}/.git/hooks/post-merge
done
test_expect_success 'post-merge does not run for up-to-date ' '
- GIT_DIR=clone1/.git git merge $commit0 &&
+ GIT_DIR=clone1/.git git merge $commit0 &&
! test -f clone1/.git/post-merge.args
'
test_expect_success 'post-merge runs as expected ' '
- GIT_DIR=clone1/.git git merge $commit1 &&
+ GIT_DIR=clone1/.git git merge $commit1 &&
test -e clone1/.git/post-merge.args
'
test_expect_success 'post-merge from normal merge receives the right argument ' '
- grep 0 clone1/.git/post-merge.args
+ grep 0 clone1/.git/post-merge.args
'
test_expect_success 'post-merge from squash merge runs as expected ' '
- GIT_DIR=clone2/.git git merge --squash $commit1 &&
+ GIT_DIR=clone2/.git git merge --squash $commit1 &&
test -e clone2/.git/post-merge.args
'
test_expect_success 'post-merge from squash merge receives the right argument ' '
- grep 1 clone2/.git/post-merge.args
+ grep 1 clone2/.git/post-merge.args
'
test_done
diff --git a/t/t5403-post-checkout-hook.sh b/t/t5403-post-checkout-hook.sh
index a39b3b5..1ec9e23 100755
--- a/t/t5403-post-checkout-hook.sh
+++ b/t/t5403-post-checkout-hook.sh
@@ -4,6 +4,9 @@
#
test_description='Test the post-checkout hook.'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
@@ -20,7 +23,7 @@
test_expect_success 'post-checkout receives the right arguments with HEAD unchanged ' '
test_when_finished "rm -f .git/post-checkout.args" &&
- git checkout master &&
+ git checkout main &&
read old new flag <.git/post-checkout.args &&
test $old = $new && test $flag = 1
'
@@ -41,14 +44,14 @@
test_expect_success 'post-checkout receives the right args when not switching branches ' '
test_when_finished "rm -f .git/post-checkout.args" &&
- git checkout master -- three.t &&
+ git checkout main -- three.t &&
read old new flag <.git/post-checkout.args &&
test $old = $new && test $flag = 0
'
test_expect_success 'post-checkout is triggered on rebase' '
test_when_finished "rm -f .git/post-checkout.args" &&
- git checkout -b rebase-test master &&
+ git checkout -b rebase-test main &&
rm -f .git/post-checkout.args &&
git rebase rebase-on-me &&
read old new flag <.git/post-checkout.args &&
diff --git a/t/t5404-tracking-branches.sh b/t/t5404-tracking-branches.sh
index 2762f42..cc07889 100755
--- a/t/t5404-tracking-branches.sh
+++ b/t/t5404-tracking-branches.sh
@@ -2,6 +2,9 @@
test_description='tracking branch update checks for git push'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup' '
@@ -30,9 +33,9 @@
git checkout -b b2 origin/b2 &&
echo aa-b2 >>file &&
git commit -a -m aa-b2 &&
- git checkout master &&
- echo aa-master >>file &&
- git commit -a -m aa-master
+ git checkout main &&
+ echo aa-main >>file &&
+ git commit -a -m aa-main
'
test_expect_success 'mixed-success push returns error' '
@@ -40,7 +43,7 @@
'
test_expect_success 'check tracking branches updated correctly after push' '
- test "$(git rev-parse origin/master)" = "$(git rev-parse master)"
+ test "$(git rev-parse origin/main)" = "$(git rev-parse main)"
'
test_expect_success 'check tracking branches not updated for failed refs' '
diff --git a/t/t5405-send-pack-rewind.sh b/t/t5405-send-pack-rewind.sh
index 235fb76..11f0323 100755
--- a/t/t5405-send-pack-rewind.sh
+++ b/t/t5405-send-pack-rewind.sh
@@ -2,6 +2,9 @@
test_description='forced push to replace commit we do not have'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
@@ -13,7 +16,7 @@
mkdir another && (
cd another &&
git init &&
- git fetch --update-head-ok .. master:master
+ git fetch --update-head-ok .. main:main
) &&
>file2 && git add file2 && test_tick &&
@@ -25,7 +28,7 @@
(
cd another &&
- test_must_fail git push .. master:master
+ test_must_fail git push .. main:main
)
'
@@ -34,7 +37,7 @@
(
cd another &&
- git push .. +master:master
+ git push .. +main:main
)
'
diff --git a/t/t5407-post-rewrite-hook.sh b/t/t5407-post-rewrite-hook.sh
index 80750a8..5bb23cc 100755
--- a/t/t5407-post-rewrite-hook.sh
+++ b/t/t5407-post-rewrite-hook.sh
@@ -4,6 +4,9 @@
#
test_description='Test the post-rewrite hook.'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup' '
@@ -14,7 +17,7 @@
git checkout A^0 &&
test_commit E bar E &&
test_commit F foo F &&
- git checkout master
+ git checkout main
'
mkdir .git/hooks
diff --git a/t/t5410-receive-pack-alternates.sh b/t/t5410-receive-pack-alternates.sh
index f00d0da..0b28e4e 100755
--- a/t/t5410-receive-pack-alternates.sh
+++ b/t/t5410-receive-pack-alternates.sh
@@ -2,14 +2,17 @@
test_description='git receive-pack with alternate ref filtering'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup' '
test_commit base &&
git clone -s --bare . fork &&
- git checkout -b public/branch master &&
+ git checkout -b public/branch main &&
test_commit public &&
- git checkout -b private/branch master &&
+ git checkout -b private/branch main &&
test_commit private
'
diff --git a/t/t5411-proc-receive-hook.sh b/t/t5411-proc-receive-hook.sh
new file mode 100755
index 0000000..98b0e81
--- /dev/null
+++ b/t/t5411-proc-receive-hook.sh
@@ -0,0 +1,120 @@
+#!/bin/sh
+#
+# Copyright (c) 2020 Jiang Xin
+#
+
+test_description='Test proc-receive hook'
+
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./test-lib.sh
+
+. "$TEST_DIRECTORY"/t5411/common-functions.sh
+
+setup_upstream_and_workbench () {
+ # Refs of upstream : main(A)
+ # Refs of workbench: main(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 main &&
+ git update-ref refs/heads/main $A $B &&
+ git -C ../upstream.git update-ref \
+ refs/heads/main $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 : main(A)
+# Refs of workbench: main(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/t/t5411/common-functions.sh b/t/t5411/common-functions.sh
new file mode 100644
index 0000000..6694858
--- /dev/null
+++ b/t/t5411/common-functions.sh
@@ -0,0 +1,75 @@
+# 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/main $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. The emitted human-readable errors are
+# redundant to the more machine-readable output the tests already assert.
+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"
+}
+
+filter_out_user_friendly_and_stable_output () {
+ make_user_friendly_and_stable_output |
+ sed -n ${1+"$@"}
+}
+
+test_cmp_refs () {
+ indir=
+ if test "$1" = "-C"
+ then
+ shift
+ indir="$1"
+ shift
+ fi
+ indir=${indir:+"$indir"/}
+ cat >show-ref.expect &&
+ git ${indir:+ -C "$indir"} show-ref >show-ref.pristine &&
+ make_user_friendly_and_stable_output <show-ref.pristine >show-ref.filtered &&
+ test_cmp show-ref.expect show-ref.filtered
+}
diff --git a/t/t5411/once-0010-report-status-v1.sh b/t/t5411/once-0010-report-status-v1.sh
new file mode 100644
index 0000000..1233a46
--- /dev/null
+++ b/t/t5411/once-0010-report-status-v1.sh
@@ -0,0 +1,91 @@
+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/main/topic1" \
+ -r "option fall-through" \
+ -r "ok refs/for/main/topic2" \
+ -r "option refname refs/for/changes/23/123/1" \
+ -r "option new-oid $A" \
+ -r "ok refs/for/main/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 : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : (B) refs/for/main/topic1(A) foo(A) refs/for/next/topic(A) refs/for/main/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/main\0report-status\n" \
+ $A $B | packetize
+ else
+ printf "%s %s refs/heads/main\0report-status object-format=$GIT_DEFAULT_HASH\n" \
+ $A $B | packetize
+ fi &&
+ printf "%s %s refs/for/main/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/main/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/main
+ pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/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/main/topic2
+ # proc-receive hook
+ proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic1
+ proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic
+ proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic2
+ proc-receive> ok refs/for/main/topic1
+ proc-receive> option fall-through
+ proc-receive> ok refs/for/main/topic2
+ proc-receive> option refname refs/for/changes/23/123/1
+ proc-receive> option new-oid <COMMIT-A>
+ proc-receive> ok refs/for/main/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
+ 0017ok refs/heads/main
+ 001cok refs/for/main/topic1
+ 0016ok refs/heads/foo
+ 0033ng refs/for/next/topic target branch not exist
+ 001cok refs/for/main/topic2
+ 0000# post-receive hook
+ post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main
+ post-receive< <ZERO-OID> <COMMIT-A> refs/for/main/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 &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/for/main/topic1
+ <COMMIT-A> refs/heads/foo
+ <COMMIT-B> refs/heads/main
+ EOF
+'
diff --git a/t/t5411/test-0000-standard-git-push.sh b/t/t5411/test-0000-standard-git-push.sh
new file mode 100644
index 0000000..e1e0175
--- /dev/null
+++ b/t/t5411/test-0000-standard-git-push.sh
@@ -0,0 +1,134 @@
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git-push : main(B) next(A)
+test_expect_success "git-push ($PROTOCOL)" '
+ git -C workbench push origin \
+ $B:refs/heads/main \
+ 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/main
+ remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next
+ remote: # post-receive hook
+ remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main
+ remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next
+ To <URL/of/upstream.git>
+ <OID-A>..<OID-B> <COMMIT-B> -> main
+ * [new branch] HEAD -> next
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-B> refs/heads/main
+ <COMMIT-A> refs/heads/next
+ EOF
+'
+
+# Refs of upstream : main(B) next(A)
+# Refs of workbench: main(A) tags/v123
+# git-push --atomic: main(A) next(B)
+test_expect_success "git-push --atomic ($PROTOCOL)" '
+ test_must_fail git -C workbench push --atomic origin \
+ main \
+ $B:refs/heads/next \
+ >out-$test_count 2>&1 &&
+ filter_out_user_friendly_and_stable_output \
+ -e "/^To / { p; }" \
+ -e "/^ ! / { p; }" \
+ <out-$test_count >actual &&
+ cat >expect <<-EOF &&
+ To <URL/of/upstream.git>
+ ! [rejected] main -> main (non-fast-forward)
+ ! [rejected] <COMMIT-B> -> next (atomic push failed)
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-B> refs/heads/main
+ <COMMIT-A> refs/heads/next
+ EOF
+'
+
+# Refs of upstream : main(B) next(A)
+# Refs of workbench: main(A) tags/v123
+# git-push : main(A) next(B)
+test_expect_success "non-fast-forward git-push ($PROTOCOL)" '
+ test_must_fail git \
+ -C workbench \
+ -c advice.pushUpdateRejected=false \
+ push origin \
+ main \
+ $B:refs/heads/next \
+ >out-$test_count 2>&1 &&
+ make_user_friendly_and_stable_output <out-$test_count >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] main -> main (non-fast-forward)
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-B> refs/heads/main
+ <COMMIT-B> refs/heads/next
+ EOF
+'
+
+# Refs of upstream : main(B) next(B)
+# Refs of workbench: main(A) tags/v123
+# git-push -f : main(A) NULL tags/v123 refs/review/main/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 \
+ main \
+ main:refs/review/main/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/main
+ 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/main/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/main
+ 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/main/topic
+ remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/a/b/c
+ To <URL/of/upstream.git>
+ + <OID-B>...<OID-A> main -> main (forced update)
+ - [deleted] next
+ * [new tag] v123 -> v123
+ * [new reference] main -> refs/review/main/topic
+ * [new branch] HEAD -> a/b/c
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/a/b/c
+ <COMMIT-A> refs/heads/main
+ <COMMIT-A> refs/review/main/topic
+ <TAG-v123> refs/tags/v123
+ EOF
+'
+
+# Refs of upstream : main(A) tags/v123 refs/review/main/topic(A) a/b/c(A)
+# Refs of workbench: main(A) tags/v123
+test_expect_success "cleanup ($PROTOCOL)" '
+ (
+ cd "$upstream" &&
+ git update-ref -d refs/review/main/topic &&
+ git update-ref -d refs/tags/v123 &&
+ git update-ref -d refs/heads/a/b/c
+ )
+'
diff --git a/t/t5411/test-0001-standard-git-push--porcelain.sh b/t/t5411/test-0001-standard-git-push--porcelain.sh
new file mode 100644
index 0000000..bcbda72
--- /dev/null
+++ b/t/t5411/test-0001-standard-git-push--porcelain.sh
@@ -0,0 +1,138 @@
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git-push : main(B) next(A)
+test_expect_success "git-push ($PROTOCOL/porcelain)" '
+ git -C workbench push --porcelain origin \
+ $B:refs/heads/main \
+ 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/main
+ remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next
+ remote: # post-receive hook
+ remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main
+ remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next
+ To <URL/of/upstream.git>
+ <COMMIT-B>:refs/heads/main <OID-A>..<OID-B>
+ * HEAD:refs/heads/next [new branch]
+ Done
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-B> refs/heads/main
+ <COMMIT-A> refs/heads/next
+ EOF
+'
+
+# Refs of upstream : main(B) next(A)
+# Refs of workbench: main(A) tags/v123
+# git-push --atomic: main(A) next(B)
+test_expect_success "git-push --atomic ($PROTOCOL/porcelain)" '
+ test_must_fail git -C workbench push --atomic --porcelain origin \
+ main \
+ $B:refs/heads/next \
+ >out-$test_count 2>&1 &&
+ filter_out_user_friendly_and_stable_output \
+ -e "s/^# GETTEXT POISON #//" \
+ -e "/^To / { p; }" \
+ -e "/^! / { p; }" \
+ <out-$test_count >actual &&
+ cat >expect <<-EOF &&
+ To <URL/of/upstream.git>
+ ! refs/heads/main:refs/heads/main [rejected] (non-fast-forward)
+ ! <COMMIT-B>:refs/heads/next [rejected] (atomic push failed)
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-B> refs/heads/main
+ <COMMIT-A> refs/heads/next
+ EOF
+'
+
+# Refs of upstream : main(B) next(A)
+# Refs of workbench: main(A) tags/v123
+# git-push : main(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 \
+ main \
+ $B:refs/heads/next \
+ >out-$test_count 2>&1 &&
+ make_user_friendly_and_stable_output <out-$test_count >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/main:refs/heads/main [rejected] (non-fast-forward)
+ Done
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-B> refs/heads/main
+ <COMMIT-B> refs/heads/next
+ EOF
+'
+
+# Refs of upstream : main(B) next(B)
+# Refs of workbench: main(A) tags/v123
+# git-push -f : main(A) NULL tags/v123 refs/review/main/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 \
+ main \
+ main:refs/review/main/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/main
+ 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/main/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/main
+ 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/main/topic
+ remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/a/b/c
+ To <URL/of/upstream.git>
+ + refs/heads/main:refs/heads/main <OID-B>...<OID-A> (forced update)
+ - :refs/heads/next [deleted]
+ * refs/tags/v123:refs/tags/v123 [new tag]
+ * refs/heads/main:refs/review/main/topic [new reference]
+ * HEAD:refs/heads/a/b/c [new branch]
+ Done
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/a/b/c
+ <COMMIT-A> refs/heads/main
+ <COMMIT-A> refs/review/main/topic
+ <TAG-v123> refs/tags/v123
+ EOF
+'
+
+# Refs of upstream : main(A) tags/v123 refs/review/main/topic(A) a/b/c(A)
+# Refs of workbench: main(A) tags/v123
+test_expect_success "cleanup ($PROTOCOL/porcelain)" '
+ (
+ cd "$upstream" &&
+ git update-ref -d refs/review/main/topic &&
+ git update-ref -d refs/tags/v123 &&
+ git update-ref -d refs/heads/a/b/c
+ )
+'
diff --git a/t/t5411/test-0002-pre-receive-declined.sh b/t/t5411/test-0002-pre-receive-declined.sh
new file mode 100644
index 0000000..0c3490c
--- /dev/null
+++ b/t/t5411/test-0002-pre-receive-declined.sh
@@ -0,0 +1,31 @@
+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 : main(A)
+# Refs of workbench: main(A) tags/v123
+# git-push : main(B) next(A)
+test_expect_success "git-push is declined ($PROTOCOL)" '
+ test_must_fail git -C workbench push origin \
+ $B:refs/heads/main \
+ HEAD:refs/heads/next \
+ >out-$test_count 2>&1 &&
+ make_user_friendly_and_stable_output <out-$test_count >actual &&
+ cat >expect <<-EOF &&
+ To <URL/of/upstream.git>
+ ! [remote rejected] <COMMIT-B> -> main (pre-receive hook declined)
+ ! [remote rejected] HEAD -> next (pre-receive hook declined)
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
+
+test_expect_success "cleanup ($PROTOCOL)" '
+ mv "$upstream/hooks/pre-receive.ok" "$upstream/hooks/pre-receive"
+'
diff --git a/t/t5411/test-0003-pre-receive-declined--porcelain.sh b/t/t5411/test-0003-pre-receive-declined--porcelain.sh
new file mode 100644
index 0000000..e9c9db5
--- /dev/null
+++ b/t/t5411/test-0003-pre-receive-declined--porcelain.sh
@@ -0,0 +1,32 @@
+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 : main(A)
+# Refs of workbench: main(A) tags/v123
+# git-push : main(B) next(A)
+test_expect_success "git-push is declined ($PROTOCOL/porcelain)" '
+ test_must_fail git -C workbench push --porcelain origin \
+ $B:refs/heads/main \
+ HEAD:refs/heads/next \
+ >out-$test_count 2>&1 &&
+ make_user_friendly_and_stable_output <out-$test_count >actual &&
+ cat >expect <<-EOF &&
+ To <URL/of/upstream.git>
+ ! <COMMIT-B>:refs/heads/main [remote rejected] (pre-receive hook declined)
+ ! HEAD:refs/heads/next [remote rejected] (pre-receive hook declined)
+ Done
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
+
+test_expect_success "cleanup ($PROTOCOL/porcelain)" '
+ mv "$upstream/hooks/pre-receive.ok" "$upstream/hooks/pre-receive"
+'
diff --git a/t/t5411/test-0010-proc-receive-settings.sh b/t/t5411/test-0010-proc-receive-settings.sh
new file mode 100644
index 0000000..a368099
--- /dev/null
+++ b/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/t/t5411/test-0011-no-hook-error.sh b/t/t5411/test-0011-no-hook-error.sh
new file mode 100644
index 0000000..3ef136e
--- /dev/null
+++ b/t/t5411/test-0011-no-hook-error.sh
@@ -0,0 +1,60 @@
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : next(A) refs/for/main/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/main/topic \
+ >out-$test_count 2>&1 &&
+ make_user_friendly_and_stable_output <out-$test_count >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/main/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/main/topic (fail to run proc-receive hook)
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ <COMMIT-A> refs/heads/next
+ EOF
+'
+
+# Refs of upstream : main(A) next(A)
+# Refs of workbench: main(A) tags/v123
+test_expect_success "cleanup ($PROTOCOL)" '
+ git -C "$upstream" update-ref -d refs/heads/next
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push --atomic: (B) next(A) refs/for/main/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:main \
+ HEAD:next \
+ HEAD:refs/for/main/topic >out-$test_count 2>&1 &&
+ make_user_friendly_and_stable_output <out-$test_count >actual &&
+ cat >expect <<-EOF &&
+ remote: # pre-receive hook
+ remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main
+ remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next
+ remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: error: cannot find hook "proc-receive"
+ To <URL/of/upstream.git>
+ ! [remote rejected] <COMMIT-B> -> main (fail to run proc-receive hook)
+ ! [remote rejected] HEAD -> next (fail to run proc-receive hook)
+ ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
diff --git a/t/t5411/test-0012-no-hook-error--porcelain.sh b/t/t5411/test-0012-no-hook-error--porcelain.sh
new file mode 100644
index 0000000..19f66fb
--- /dev/null
+++ b/t/t5411/test-0012-no-hook-error--porcelain.sh
@@ -0,0 +1,62 @@
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : next(A) refs/for/main/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/main/topic \
+ >out-$test_count 2>&1 &&
+ make_user_friendly_and_stable_output <out-$test_count >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/main/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/main/topic [remote rejected] (fail to run proc-receive hook)
+ Done
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ <COMMIT-A> refs/heads/next
+ EOF
+'
+
+# Refs of upstream : main(A) next(A)
+# Refs of workbench: main(A) tags/v123
+test_expect_success "cleanup ($PROTOCOL/porcelain)" '
+ git -C "$upstream" update-ref -d refs/heads/next
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push --atomic: (B) next(A) refs/for/main/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:main \
+ HEAD:next \
+ HEAD:refs/for/main/topic >out-$test_count 2>&1 &&
+ make_user_friendly_and_stable_output <out-$test_count >actual &&
+ cat >expect <<-EOF &&
+ remote: # pre-receive hook
+ remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main
+ remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next
+ remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: error: cannot find hook "proc-receive"
+ To <URL/of/upstream.git>
+ ! <COMMIT-B>:refs/heads/main [remote rejected] (fail to run proc-receive hook)
+ ! HEAD:refs/heads/next [remote rejected] (fail to run proc-receive hook)
+ ! HEAD:refs/for/main/topic [remote rejected] (fail to run proc-receive hook)
+ Done
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
diff --git a/t/t5411/test-0013-bad-protocol.sh b/t/t5411/test-0013-bad-protocol.sh
new file mode 100644
index 0000000..095e613
--- /dev/null
+++ b/t/t5411/test-0013-bad-protocol.sh
@@ -0,0 +1,302 @@
+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 : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/main/topic(A)
+test_expect_success "proc-receive: bad protocol (unknown version, $PROTOCOL)" '
+ test_must_fail git -C workbench push origin \
+ HEAD:refs/for/main/topic \
+ >out-$test_count 2>&1 &&
+ make_user_friendly_and_stable_output <out-$test_count >actual &&
+
+ # Check status report for git-push
+ sed -n \
+ -e "/^To / { p; }" \
+ -e "/^ ! / { p; }" \
+ <actual >actual-report &&
+ cat >expect <<-EOF &&
+ To <URL/of/upstream.git>
+ ! [remote rejected] HEAD -> refs/for/main/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 &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
+
+test_expect_success "setup proc-receive hook (hook --die-read-version, $PROTOCOL)" '
+ write_script "$upstream/hooks/proc-receive" <<-EOF
+ printf >&2 "# proc-receive hook\n"
+ test-tool proc-receive -v --die-read-version
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/main/topic(A)
+test_expect_success "proc-receive: bad protocol (hook --die-read-version, $PROTOCOL)" '
+ test_must_fail git -C workbench push origin \
+ HEAD:refs/for/main/topic \
+ >out-$test_count 2>&1 &&
+ filter_out_user_friendly_and_stable_output \
+ -e "/^To / { p; }" \
+ -e "/^ ! / { p; }" \
+ <out-$test_count >actual &&
+ cat >expect <<-EOF &&
+ To <URL/of/upstream.git>
+ ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
+ EOF
+ test_cmp expect actual &&
+ grep "remote: fatal: die with the --die-read-version option" out-$test_count &&
+ grep "remote: error: fail to negotiate version with proc-receive hook" out-$test_count &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
+
+test_expect_success "setup proc-receive hook (hook --die-write-version, $PROTOCOL)" '
+ write_script "$upstream/hooks/proc-receive" <<-EOF
+ printf >&2 "# proc-receive hook\n"
+ test-tool proc-receive -v --die-write-version
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/main/topic(A)
+test_expect_success "proc-receive: bad protocol (hook --die-write-version, $PROTOCOL)" '
+ test_must_fail git -C workbench push origin \
+ HEAD:refs/for/main/topic \
+ >out-$test_count 2>&1 &&
+ filter_out_user_friendly_and_stable_output \
+ -e "/^To / { p; }" \
+ -e "/^ ! / { p; }" \
+ <out-$test_count >actual &&
+ cat >expect <<-EOF &&
+ To <URL/of/upstream.git>
+ ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
+ EOF
+ test_cmp expect actual &&
+ grep "remote: fatal: die with the --die-write-version option" out-$test_count &&
+ grep "remote: error: fail to negotiate version with proc-receive hook" out-$test_count &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
+
+test_expect_success "setup proc-receive hook (hook --die-read-commands, $PROTOCOL)" '
+ write_script "$upstream/hooks/proc-receive" <<-EOF
+ printf >&2 "# proc-receive hook\n"
+ test-tool proc-receive -v --die-read-commands
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/main/topic(A)
+test_expect_success "proc-receive: bad protocol (hook --die-read-commands, $PROTOCOL)" '
+ test_must_fail git -C workbench push origin \
+ HEAD:refs/for/main/topic \
+ >out-$test_count 2>&1 &&
+ filter_out_user_friendly_and_stable_output \
+ -e "/^To / { p; }" \
+ -e "/^ ! / { p; }" \
+ <out-$test_count >actual &&
+ cat >expect <<-EOF &&
+ To <URL/of/upstream.git>
+ ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
+ EOF
+ test_cmp expect actual &&
+ grep "remote: fatal: die with the --die-read-commands option" out-$test_count &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
+
+test_expect_success "setup proc-receive hook (hook --die-read-push-options, $PROTOCOL)" '
+ write_script "$upstream/hooks/proc-receive" <<-EOF
+ printf >&2 "# proc-receive hook\n"
+ test-tool proc-receive -v --die-read-push-options
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/main/topic(A)
+test_expect_success "proc-receive: bad protocol (hook --die-read-push-options, $PROTOCOL)" '
+ git -C "$upstream" config receive.advertisePushOptions true &&
+ test_must_fail git -C workbench push origin \
+ -o reviewers=user1,user2 \
+ HEAD:refs/for/main/topic \
+ >out-$test_count 2>&1 &&
+ filter_out_user_friendly_and_stable_output \
+ -e "/^To / { p; }" \
+ -e "/^ ! / { p; }" \
+ <out-$test_count >actual &&
+ cat >expect <<-EOF &&
+ To <URL/of/upstream.git>
+ ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
+ EOF
+ test_cmp expect actual &&
+ grep "remote: fatal: die with the --die-read-push-options option" out-$test_count &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
+
+test_expect_success "setup proc-receive hook (hook --die-write-report, $PROTOCOL)" '
+ write_script "$upstream/hooks/proc-receive" <<-EOF
+ printf >&2 "# proc-receive hook\n"
+ test-tool proc-receive -v --die-write-report
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/main/topic(A)
+test_expect_success "proc-receive: bad protocol (hook --die-write-report, $PROTOCOL)" '
+ test_must_fail git -C workbench push origin \
+ HEAD:refs/for/main/topic \
+ >out-$test_count 2>&1 &&
+ filter_out_user_friendly_and_stable_output \
+ -e "/^To / { p; }" \
+ -e "/^ ! / { p; }" \
+ <out-$test_count >actual &&
+ cat >expect <<-EOF &&
+ To <URL/of/upstream.git>
+ ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
+ EOF
+ test_cmp expect actual &&
+ grep "remote: fatal: die with the --die-write-report option" out-$test_count &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
+
+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 : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : next(A) refs/for/main/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/main/topic >out-$test_count 2>&1 &&
+ make_user_friendly_and_stable_output <out-$test_count >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/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/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/main/topic (proc-receive failed to report status)
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ <COMMIT-A> refs/heads/next
+ EOF
+'
+
+# Refs of upstream : main(A) next(A)
+# Refs of workbench: main(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 : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/main/topic
+test_expect_success "proc-receive: bad protocol (no ref, $PROTOCOL)" '
+ test_must_fail git -C workbench push origin \
+ HEAD:refs/for/main/topic\
+ >out-$test_count 2>&1 &&
+ make_user_friendly_and_stable_output <out-$test_count >actual &&
+ cat >expect <<-EOF &&
+ remote: # pre-receive hook
+ remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: proc-receive> ok
+ remote: error: proc-receive reported incomplete status line: "ok"
+ To <URL/of/upstream.git>
+ ! [remote rejected] HEAD -> refs/for/main/topic (proc-receive failed to report status)
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
+
+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/main/topic"
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/main/topic
+test_expect_success "proc-receive: bad protocol (unknown status, $PROTOCOL)" '
+ test_must_fail git -C workbench push origin \
+ HEAD:refs/for/main/topic \
+ >out-$test_count 2>&1 &&
+ make_user_friendly_and_stable_output <out-$test_count >actual &&
+ cat >expect <<-EOF &&
+ remote: # pre-receive hook
+ remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: proc-receive> xx refs/for/main/topic
+ remote: error: proc-receive reported bad status "xx" on ref "refs/for/main/topic"
+ To <URL/of/upstream.git>
+ ! [remote rejected] HEAD -> refs/for/main/topic (proc-receive failed to report status)
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
diff --git a/t/t5411/test-0014-bad-protocol--porcelain.sh b/t/t5411/test-0014-bad-protocol--porcelain.sh
new file mode 100644
index 0000000..a446497
--- /dev/null
+++ b/t/t5411/test-0014-bad-protocol--porcelain.sh
@@ -0,0 +1,304 @@
+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 : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/main/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/main/topic \
+ >out-$test_count 2>&1 &&
+ make_user_friendly_and_stable_output <out-$test_count >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/main/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 &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
+
+test_expect_success "setup proc-receive hook (hook --die-read-version, $PROTOCOL/porcelain)" '
+ write_script "$upstream/hooks/proc-receive" <<-EOF
+ printf >&2 "# proc-receive hook\n"
+ test-tool proc-receive -v --die-read-version
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/main/topic(A)
+test_expect_success "proc-receive: bad protocol (hook --die-read-version, $PROTOCOL/porcelain)" '
+ test_must_fail git -C workbench push --porcelain origin \
+ HEAD:refs/for/main/topic \
+ >out-$test_count 2>&1 &&
+ filter_out_user_friendly_and_stable_output \
+ -e "/^To / { p; n; p; n; p; }" \
+ <out-$test_count >actual &&
+ cat >expect <<-EOF &&
+ To <URL/of/upstream.git>
+ ! HEAD:refs/for/main/topic [remote rejected] (fail to run proc-receive hook)
+ Done
+ EOF
+ test_cmp expect actual &&
+ grep "remote: fatal: die with the --die-read-version option" out-$test_count &&
+ grep "remote: error: fail to negotiate version with proc-receive hook" out-$test_count &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
+
+test_expect_success "setup proc-receive hook (hook --die-write-version, $PROTOCOL/porcelain)" '
+ write_script "$upstream/hooks/proc-receive" <<-EOF
+ printf >&2 "# proc-receive hook\n"
+ test-tool proc-receive -v --die-write-version
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/main/topic(A)
+test_expect_success "proc-receive: bad protocol (hook --die-write-version, $PROTOCOL/porcelain)" '
+ test_must_fail git -C workbench push --porcelain origin \
+ HEAD:refs/for/main/topic \
+ >out-$test_count 2>&1 &&
+ filter_out_user_friendly_and_stable_output \
+ -e "/^To / { p; n; p; n; p; }" \
+ <out-$test_count >actual &&
+ cat >expect <<-EOF &&
+ To <URL/of/upstream.git>
+ ! HEAD:refs/for/main/topic [remote rejected] (fail to run proc-receive hook)
+ Done
+ EOF
+ test_cmp expect actual &&
+ grep "remote: fatal: die with the --die-write-version option" out-$test_count &&
+ grep "remote: error: fail to negotiate version with proc-receive hook" out-$test_count &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
+
+test_expect_success "setup proc-receive hook (hook --die-read-commands, $PROTOCOL/porcelain)" '
+ write_script "$upstream/hooks/proc-receive" <<-EOF
+ printf >&2 "# proc-receive hook\n"
+ test-tool proc-receive -v --die-read-commands
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/main/topic(A)
+test_expect_success "proc-receive: bad protocol (hook --die-read-commands, $PROTOCOL/porcelain)" '
+ test_must_fail git -C workbench push --porcelain origin \
+ HEAD:refs/for/main/topic \
+ >out-$test_count 2>&1 &&
+ filter_out_user_friendly_and_stable_output \
+ -e "/^To / { p; n; p; n; p; }" \
+ <out-$test_count >actual &&
+ cat >expect <<-EOF &&
+ To <URL/of/upstream.git>
+ ! HEAD:refs/for/main/topic [remote rejected] (fail to run proc-receive hook)
+ Done
+ EOF
+ test_cmp expect actual &&
+ grep "remote: fatal: die with the --die-read-commands option" out-$test_count &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
+
+test_expect_success "setup proc-receive hook (hook --die-read-push-options, $PROTOCOL/porcelain)" '
+ write_script "$upstream/hooks/proc-receive" <<-EOF
+ printf >&2 "# proc-receive hook\n"
+ test-tool proc-receive -v --die-read-push-options
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/main/topic(A)
+test_expect_success "proc-receive: bad protocol (hook --die-read-push-options, $PROTOCOL/porcelain)" '
+ git -C "$upstream" config receive.advertisePushOptions true &&
+ test_must_fail git -C workbench push --porcelain origin \
+ -o reviewers=user1,user2 \
+ HEAD:refs/for/main/topic \
+ >out-$test_count 2>&1 &&
+ filter_out_user_friendly_and_stable_output \
+ -e "/^To / { p; n; p; n; p; }" \
+ <out-$test_count >actual &&
+ cat >expect <<-EOF &&
+ To <URL/of/upstream.git>
+ ! HEAD:refs/for/main/topic [remote rejected] (fail to run proc-receive hook)
+ Done
+ EOF
+ test_cmp expect actual &&
+ grep "remote: fatal: die with the --die-read-push-options option" out-$test_count &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
+
+test_expect_success "setup proc-receive hook (hook --die-write-report, $PROTOCOL/porcelain)" '
+ write_script "$upstream/hooks/proc-receive" <<-EOF
+ printf >&2 "# proc-receive hook\n"
+ test-tool proc-receive -v --die-write-report
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/main/topic(A)
+test_expect_success "proc-receive: bad protocol (hook --die-write-report, $PROTOCOL/porcelain)" '
+ test_must_fail git -C workbench push --porcelain origin \
+ HEAD:refs/for/main/topic \
+ >out-$test_count 2>&1 &&
+ filter_out_user_friendly_and_stable_output \
+ -e "/^To / { p; n; p; n; p; }" \
+ <out-$test_count >actual &&
+ cat >expect <<-EOF &&
+ To <URL/of/upstream.git>
+ ! HEAD:refs/for/main/topic [remote rejected] (fail to run proc-receive hook)
+ Done
+ EOF
+ test_cmp expect actual &&
+ grep "remote: fatal: die with the --die-write-report option" out-$test_count &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
+
+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 : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : next(A) refs/for/main/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/main/topic >out-$test_count 2>&1 &&
+ make_user_friendly_and_stable_output <out-$test_count >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/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/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/main/topic [remote rejected] (proc-receive failed to report status)
+ Done
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ <COMMIT-A> refs/heads/next
+ EOF
+'
+
+# Refs of upstream : main(A) next(A)
+# Refs of workbench: main(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 : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/main/topic
+test_expect_success "proc-receive: bad protocol (no ref, $PROTOCOL/porcelain)" '
+ test_must_fail git -C workbench push --porcelain origin \
+ HEAD:refs/for/main/topic\
+ >out-$test_count 2>&1 &&
+ make_user_friendly_and_stable_output <out-$test_count >actual &&
+ cat >expect <<-EOF &&
+ remote: # pre-receive hook
+ remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: proc-receive> ok
+ remote: error: proc-receive reported incomplete status line: "ok"
+ To <URL/of/upstream.git>
+ ! HEAD:refs/for/main/topic [remote rejected] (proc-receive failed to report status)
+ Done
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
+
+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/main/topic"
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/main/topic
+test_expect_success "proc-receive: bad protocol (unknown status, $PROTOCOL/porcelain)" '
+ test_must_fail git -C workbench push --porcelain origin \
+ HEAD:refs/for/main/topic \
+ >out-$test_count 2>&1 &&
+ make_user_friendly_and_stable_output <out-$test_count >actual &&
+ cat >expect <<-EOF &&
+ remote: # pre-receive hook
+ remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: proc-receive> xx refs/for/main/topic
+ remote: error: proc-receive reported bad status "xx" on ref "refs/for/main/topic"
+ To <URL/of/upstream.git>
+ ! HEAD:refs/for/main/topic [remote rejected] (proc-receive failed to report status)
+ Done
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
diff --git a/t/t5411/test-0020-report-ng.sh b/t/t5411/test-0020-report-ng.sh
new file mode 100644
index 0000000..ad2c8f6
--- /dev/null
+++ b/t/t5411/test-0020-report-ng.sh
@@ -0,0 +1,63 @@
+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/main/topic"
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/main/topic
+test_expect_success "proc-receive: fail to update (ng, no message, $PROTOCOL)" '
+ test_must_fail git -C workbench push origin \
+ HEAD:refs/for/main/topic \
+ >out-$test_count 2>&1 &&
+ make_user_friendly_and_stable_output <out-$test_count >actual &&
+ cat >expect <<-EOF &&
+ remote: # pre-receive hook
+ remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: proc-receive> ng refs/for/main/topic
+ To <URL/of/upstream.git>
+ ! [remote rejected] HEAD -> refs/for/main/topic (failed)
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
+
+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/main/topic error msg"
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/main/topic
+test_expect_success "proc-receive: fail to update (ng, with message, $PROTOCOL)" '
+ test_must_fail git -C workbench push origin \
+ HEAD:refs/for/main/topic \
+ >out-$test_count 2>&1 &&
+ make_user_friendly_and_stable_output <out-$test_count >actual &&
+ cat >expect <<-EOF &&
+ remote: # pre-receive hook
+ remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: proc-receive> ng refs/for/main/topic error msg
+ To <URL/of/upstream.git>
+ ! [remote rejected] HEAD -> refs/for/main/topic (error msg)
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
diff --git a/t/t5411/test-0021-report-ng--porcelain.sh b/t/t5411/test-0021-report-ng--porcelain.sh
new file mode 100644
index 0000000..d8ae9d3
--- /dev/null
+++ b/t/t5411/test-0021-report-ng--porcelain.sh
@@ -0,0 +1,65 @@
+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/main/topic"
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/main/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/main/topic \
+ >out-$test_count 2>&1 &&
+ make_user_friendly_and_stable_output <out-$test_count >actual &&
+ cat >expect <<-EOF &&
+ remote: # pre-receive hook
+ remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: proc-receive> ng refs/for/main/topic
+ To <URL/of/upstream.git>
+ ! HEAD:refs/for/main/topic [remote rejected] (failed)
+ Done
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
+
+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/main/topic error msg"
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/main/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/main/topic \
+ >out-$test_count 2>&1 &&
+ make_user_friendly_and_stable_output <out-$test_count >actual &&
+ cat >expect <<-EOF &&
+ remote: # pre-receive hook
+ remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: proc-receive> ng refs/for/main/topic error msg
+ To <URL/of/upstream.git>
+ ! HEAD:refs/for/main/topic [remote rejected] (error msg)
+ Done
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
diff --git a/t/t5411/test-0022-report-unexpect-ref.sh b/t/t5411/test-0022-report-unexpect-ref.sh
new file mode 100644
index 0000000..dbed467
--- /dev/null
+++ b/t/t5411/test-0022-report-unexpect-ref.sh
@@ -0,0 +1,43 @@
+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/main"
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : (B) refs/for/main/topic
+test_expect_success "proc-receive: report unexpected ref ($PROTOCOL)" '
+ test_must_fail git -C workbench push origin \
+ $B:refs/heads/main \
+ HEAD:refs/for/main/topic \
+ >out-$test_count 2>&1 &&
+ make_user_friendly_and_stable_output <out-$test_count >actual &&
+ cat >expect <<-EOF &&
+ remote: # pre-receive hook
+ remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main
+ remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: proc-receive> ok refs/heads/main
+ remote: error: proc-receive reported status on unexpected ref: refs/heads/main
+ remote: # post-receive hook
+ remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main
+ To <URL/of/upstream.git>
+ <OID-A>..<OID-B> <COMMIT-B> -> main
+ ! [remote rejected] HEAD -> refs/for/main/topic (proc-receive failed to report status)
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-B> refs/heads/main
+ EOF
+'
+
+# Refs of upstream : main(B)
+# Refs of workbench: main(A) tags/v123
+test_expect_success "cleanup ($PROTOCOL)" '
+ git -C "$upstream" update-ref refs/heads/main $A
+'
diff --git a/t/t5411/test-0023-report-unexpect-ref--porcelain.sh b/t/t5411/test-0023-report-unexpect-ref--porcelain.sh
new file mode 100644
index 0000000..e89096f
--- /dev/null
+++ b/t/t5411/test-0023-report-unexpect-ref--porcelain.sh
@@ -0,0 +1,44 @@
+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/main"
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : (B) refs/for/main/topic
+test_expect_success "proc-receive: report unexpected ref ($PROTOCOL/porcelain)" '
+ test_must_fail git -C workbench push --porcelain origin \
+ $B:refs/heads/main \
+ HEAD:refs/for/main/topic \
+ >out-$test_count 2>&1 &&
+ make_user_friendly_and_stable_output <out-$test_count >actual &&
+ cat >expect <<-EOF &&
+ remote: # pre-receive hook
+ remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main
+ remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: proc-receive> ok refs/heads/main
+ remote: error: proc-receive reported status on unexpected ref: refs/heads/main
+ remote: # post-receive hook
+ remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main
+ To <URL/of/upstream.git>
+ <COMMIT-B>:refs/heads/main <OID-A>..<OID-B>
+ ! HEAD:refs/for/main/topic [remote rejected] (proc-receive failed to report status)
+ Done
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-B> refs/heads/main
+ EOF
+'
+
+# Refs of upstream : main(B)
+# Refs of workbench: main(A) tags/v123
+test_expect_success "cleanup ($PROTOCOL/porcelain)" '
+ git -C "$upstream" update-ref refs/heads/main $A
+'
diff --git a/t/t5411/test-0024-report-unknown-ref.sh b/t/t5411/test-0024-report-unknown-ref.sh
new file mode 100644
index 0000000..7720424
--- /dev/null
+++ b/t/t5411/test-0024-report-unknown-ref.sh
@@ -0,0 +1,32 @@
+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/main/topic"
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(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-$test_count 2>&1 &&
+ make_user_friendly_and_stable_output <out-$test_count >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/main/topic
+ remote: error: proc-receive reported status on unknown ref: refs/for/main/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 &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
diff --git a/t/t5411/test-0025-report-unknown-ref--porcelain.sh b/t/t5411/test-0025-report-unknown-ref--porcelain.sh
new file mode 100644
index 0000000..eeb1ce6
--- /dev/null
+++ b/t/t5411/test-0025-report-unknown-ref--porcelain.sh
@@ -0,0 +1,33 @@
+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/main/topic"
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(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-$test_count 2>&1 &&
+ make_user_friendly_and_stable_output <out-$test_count >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/main/topic
+ remote: error: proc-receive reported status on unknown ref: refs/for/main/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 &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
diff --git a/t/t5411/test-0026-push-options.sh b/t/t5411/test-0026-push-options.sh
new file mode 100644
index 0000000..1ec2cb9
--- /dev/null
+++ b/t/t5411/test-0026-push-options.sh
@@ -0,0 +1,133 @@
+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/main/topic"
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push -o ... : refs/for/main/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/main/topic \
+ >out-$test_count 2>&1 &&
+ make_user_friendly_and_stable_output <out-$test_count >actual &&
+ test_i18ngrep "fatal: the receiving end does not support push options" \
+ actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
+
+test_expect_success "enable push options ($PROTOCOL)" '
+ git -C "$upstream" config receive.advertisePushOptions true
+'
+
+test_expect_success "setup version=0 for proc-receive hook ($PROTOCOL)" '
+ write_script "$upstream/hooks/proc-receive" <<-EOF
+ printf >&2 "# proc-receive hook\n"
+ test-tool proc-receive -v \
+ --version 0 \
+ -r "ok refs/for/main/topic"
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push -o ... : next(A) refs/for/main/topic
+test_expect_success "proc-receive: ignore push-options for version 0 ($PROTOCOL)" '
+ git -C workbench push \
+ --atomic \
+ -o issue=123 \
+ -o reviewer=user1 \
+ origin \
+ HEAD:refs/heads/next \
+ HEAD:refs/for/main/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/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: proc-receive> ok refs/for/main/topic
+ remote: # post-receive hook
+ remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next
+ remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ To <URL/of/upstream.git>
+ * [new branch] HEAD -> next
+ * [new reference] HEAD -> refs/for/main/topic
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ <COMMIT-A> refs/heads/next
+ EOF
+'
+
+test_expect_success "restore 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/main/topic"
+ EOF
+'
+
+# Refs of upstream : main(A) next(A)
+# Refs of workbench: main(A) tags/v123
+test_expect_success "cleanup ($PROTOCOL)" '
+ git -C "$upstream" update-ref -d refs/heads/next
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push -o ... : next(A) refs/for/main/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/main/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/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive: atomic push_options
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: proc-receive< issue=123
+ remote: proc-receive< reviewer=user1
+ remote: proc-receive> ok refs/for/main/topic
+ remote: # post-receive hook
+ remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next
+ remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ To <URL/of/upstream.git>
+ * [new branch] HEAD -> next
+ * [new reference] HEAD -> refs/for/main/topic
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ <COMMIT-A> refs/heads/next
+ EOF
+'
+
+# Refs of upstream : main(A) next(A)
+# Refs of workbench: main(A) tags/v123
+test_expect_success "cleanup ($PROTOCOL)" '
+ git -C "$upstream" update-ref -d refs/heads/next
+'
diff --git a/t/t5411/test-0027-push-options--porcelain.sh b/t/t5411/test-0027-push-options--porcelain.sh
new file mode 100644
index 0000000..447fbfe
--- /dev/null
+++ b/t/t5411/test-0027-push-options--porcelain.sh
@@ -0,0 +1,138 @@
+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/main/topic"
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push -o ... : refs/for/main/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/main/topic \
+ >out-$test_count 2>&1 &&
+ make_user_friendly_and_stable_output <out-$test_count >actual &&
+ test_i18ngrep "fatal: the receiving end does not support push options" \
+ actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
+
+test_expect_success "enable push options ($PROTOCOL/porcelain)" '
+ git -C "$upstream" config receive.advertisePushOptions true
+'
+
+test_expect_success "setup version=0 for proc-receive hook ($PROTOCOL/porcelain)" '
+ write_script "$upstream/hooks/proc-receive" <<-EOF
+ printf >&2 "# proc-receive hook\n"
+ test-tool proc-receive -v \
+ --version 0 \
+ -r "ok refs/for/main/topic"
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push -o ... : next(A) refs/for/main/topic
+test_expect_success "proc-receive: ignore push-options for version 0 ($PROTOCOL/porcelain)" '
+ git -C workbench push \
+ --porcelain \
+ --atomic \
+ -o issue=123 \
+ -o reviewer=user1 \
+ origin \
+ HEAD:refs/heads/next \
+ HEAD:refs/for/main/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/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: proc-receive> ok refs/for/main/topic
+ remote: # post-receive hook
+ remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next
+ remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ To <URL/of/upstream.git>
+ * HEAD:refs/heads/next [new branch]
+ * HEAD:refs/for/main/topic [new reference]
+ Done
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ <COMMIT-A> refs/heads/next
+ EOF
+'
+
+test_expect_success "restore 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/main/topic"
+ EOF
+'
+
+# Refs of upstream : main(A) next(A)
+# Refs of workbench: main(A) tags/v123
+test_expect_success "cleanup ($PROTOCOL/porcelain)" '
+ git -C "$upstream" update-ref -d refs/heads/next
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push -o ... : next(A) refs/for/main/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/main/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/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive: atomic push_options
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: proc-receive< issue=123
+ remote: proc-receive< reviewer=user1
+ remote: proc-receive> ok refs/for/main/topic
+ remote: # post-receive hook
+ remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next
+ remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ To <URL/of/upstream.git>
+ * HEAD:refs/heads/next [new branch]
+ * HEAD:refs/for/main/topic [new reference]
+ Done
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ <COMMIT-A> refs/heads/next
+ EOF
+'
+
+# Refs of upstream : main(A) next(A)
+# Refs of workbench: main(A) tags/v123
+test_expect_success "cleanup ($PROTOCOL/porcelain)" '
+ git -C "$upstream" update-ref -d refs/heads/next
+'
diff --git a/t/t5411/test-0030-report-ok.sh b/t/t5411/test-0030-report-ok.sh
new file mode 100644
index 0000000..8acb4f2
--- /dev/null
+++ b/t/t5411/test-0030-report-ok.sh
@@ -0,0 +1,33 @@
+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/main/topic"
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/main/topic
+test_expect_success "proc-receive: ok ($PROTOCOL)" '
+ git -C workbench push origin \
+ HEAD:refs/for/main/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/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: proc-receive> ok refs/for/main/topic
+ remote: # post-receive hook
+ remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ To <URL/of/upstream.git>
+ * [new reference] HEAD -> refs/for/main/topic
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
diff --git a/t/t5411/test-0031-report-ok--porcelain.sh b/t/t5411/test-0031-report-ok--porcelain.sh
new file mode 100644
index 0000000..a967718
--- /dev/null
+++ b/t/t5411/test-0031-report-ok--porcelain.sh
@@ -0,0 +1,34 @@
+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/main/topic"
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/main/topic
+test_expect_success "proc-receive: ok ($PROTOCOL/porcelain)" '
+ git -C workbench push --porcelain origin \
+ HEAD:refs/for/main/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/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: proc-receive> ok refs/for/main/topic
+ remote: # post-receive hook
+ remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ To <URL/of/upstream.git>
+ * HEAD:refs/for/main/topic [new reference]
+ Done
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
diff --git a/t/t5411/test-0032-report-with-options.sh b/t/t5411/test-0032-report-with-options.sh
new file mode 100644
index 0000000..437ade0
--- /dev/null
+++ b/t/t5411/test-0032-report-with-options.sh
@@ -0,0 +1,253 @@
+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 : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A)
+test_expect_success "proc-receive: report option without matching ok ($PROTOCOL)" '
+ test_must_fail git -C workbench push origin \
+ HEAD:refs/for/main/topic \
+ >out-$test_count 2>&1 &&
+ make_user_friendly_and_stable_output <out-$test_count >actual &&
+ cat >expect <<-EOF &&
+ remote: # pre-receive hook
+ remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/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/main/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/main/topic" \
+ -r "option refname refs/pull/123/head"
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A)
+test_expect_success "proc-receive: report option refname ($PROTOCOL)" '
+ git -C workbench push origin \
+ HEAD:refs/for/main/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/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: proc-receive> ok refs/for/main/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/main/topic" \
+ -r "option refname refs/pull/123/head" \
+ -r "option forced-update"
+ EOF
+'
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A)
+test_expect_success "proc-receive: report option refname and forced-update ($PROTOCOL)" '
+ git -C workbench push origin \
+ HEAD:refs/for/main/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/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: proc-receive> ok refs/for/main/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/main/topic" \
+ -r "option refname refs/pull/123/head" \
+ -r "option old-oid $B"
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A)
+test_expect_success "proc-receive: report option refname and old-oid ($PROTOCOL)" '
+ git -C workbench push origin \
+ HEAD:refs/for/main/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/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: proc-receive> ok refs/for/main/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/main/topic" \
+ -r "option old-oid $B"
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A)
+test_expect_success "proc-receive: report option old-oid ($PROTOCOL)" '
+ git -C workbench push origin \
+ HEAD:refs/for/main/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/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: proc-receive> ok refs/for/main/topic
+ remote: proc-receive> option old-oid <COMMIT-B>
+ remote: # post-receive hook
+ remote: post-receive< <COMMIT-B> <COMMIT-A> refs/for/main/topic
+ To <URL/of/upstream.git>
+ <OID-B>..<OID-A> HEAD -> refs/for/main/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/main/topic" \
+ -r "option old-oid $A" \
+ -r "option new-oid $B"
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A)
+test_expect_success "proc-receive: report option old-oid and new-oid ($PROTOCOL)" '
+ git -C workbench push origin \
+ HEAD:refs/for/main/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/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: proc-receive> ok refs/for/main/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/main/topic
+ To <URL/of/upstream.git>
+ <OID-A>..<OID-B> HEAD -> refs/for/main/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/main/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 : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/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/main/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/main/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/main/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/main/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 &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
diff --git a/t/t5411/test-0033-report-with-options--porcelain.sh b/t/t5411/test-0033-report-with-options--porcelain.sh
new file mode 100644
index 0000000..1148672
--- /dev/null
+++ b/t/t5411/test-0033-report-with-options--porcelain.sh
@@ -0,0 +1,262 @@
+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 : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/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/main/topic \
+ >out-$test_count 2>&1 &&
+ make_user_friendly_and_stable_output <out-$test_count >actual &&
+ cat >expect <<-EOF &&
+ remote: # pre-receive hook
+ remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/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/main/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/main/topic" \
+ -r "option refname refs/pull/123/head"
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A)
+test_expect_success "proc-receive: report option refname ($PROTOCOL/porcelain)" '
+ git -C workbench push --porcelain origin \
+ HEAD:refs/for/main/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/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: proc-receive> ok refs/for/main/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/main/topic" \
+ -r "option refname refs/pull/123/head" \
+ -r "option forced-update"
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A)
+test_expect_success "proc-receive: report option refname and forced-update ($PROTOCOL/porcelain)" '
+ git -C workbench push --porcelain origin \
+ HEAD:refs/for/main/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/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: proc-receive> ok refs/for/main/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/main/topic" \
+ -r "option refname refs/pull/123/head" \
+ -r "option old-oid $B"
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A)
+test_expect_success "proc-receive: report option refname and old-oid ($PROTOCOL/porcelain)" '
+ git -C workbench push --porcelain origin \
+ HEAD:refs/for/main/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/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: proc-receive> ok refs/for/main/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/main/topic" \
+ -r "option old-oid $B"
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/topic(A)
+test_expect_success "proc-receive: report option old-oid ($PROTOCOL/porcelain)" '
+ git -C workbench push --porcelain origin \
+ HEAD:refs/for/main/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/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: proc-receive> ok refs/for/main/topic
+ remote: proc-receive> option old-oid <COMMIT-B>
+ remote: # post-receive hook
+ remote: post-receive< <COMMIT-B> <COMMIT-A> refs/for/main/topic
+ To <URL/of/upstream.git>
+ HEAD:refs/for/main/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/main/topic" \
+ -r "option old-oid $A" \
+ -r "option new-oid $B"
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/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/main/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/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: proc-receive> ok refs/for/main/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/main/topic
+ To <URL/of/upstream.git>
+ HEAD:refs/for/main/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/main/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 : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/next/topic(A) refs/for/a/b/c/topic(A) refs/for/main/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/main/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/main/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/main/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/main/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 &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
diff --git a/t/t5411/test-0034-report-ft.sh b/t/t5411/test-0034-report-ft.sh
new file mode 100644
index 0000000..6e0d08b
--- /dev/null
+++ b/t/t5411/test-0034-report-ft.sh
@@ -0,0 +1,42 @@
+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/main/topic" \
+ -r "option fall-through"
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/main/topic(B)
+test_expect_success "proc-receive: fall throught, let receive-pack to execute ($PROTOCOL)" '
+ git -C workbench push origin \
+ $B:refs/for/main/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/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive< <ZERO-OID> <COMMIT-B> refs/for/main/topic
+ remote: proc-receive> ok refs/for/main/topic
+ remote: proc-receive> option fall-through
+ remote: # post-receive hook
+ remote: post-receive< <ZERO-OID> <COMMIT-B> refs/for/main/topic
+ To <URL/of/upstream.git>
+ * [new reference] <COMMIT-B> -> refs/for/main/topic
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-B> refs/for/main/topic
+ <COMMIT-A> refs/heads/main
+ EOF
+'
+
+# Refs of upstream : main(A) refs/for/main/topic(A)
+# Refs of workbench: main(A) tags/v123
+test_expect_success "cleanup ($PROTOCOL)" '
+ git -C "$upstream" update-ref -d refs/for/main/topic
+'
diff --git a/t/t5411/test-0035-report-ft--porcelain.sh b/t/t5411/test-0035-report-ft--porcelain.sh
new file mode 100644
index 0000000..81bae9f
--- /dev/null
+++ b/t/t5411/test-0035-report-ft--porcelain.sh
@@ -0,0 +1,43 @@
+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/main/topic" \
+ -r "option fall-through"
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/main/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/main/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/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive< <ZERO-OID> <COMMIT-B> refs/for/main/topic
+ remote: proc-receive> ok refs/for/main/topic
+ remote: proc-receive> option fall-through
+ remote: # post-receive hook
+ remote: post-receive< <ZERO-OID> <COMMIT-B> refs/for/main/topic
+ To <URL/of/upstream.git>
+ * <COMMIT-B>:refs/for/main/topic [new reference]
+ Done
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-B> refs/for/main/topic
+ <COMMIT-A> refs/heads/main
+ EOF
+'
+
+# Refs of upstream : main(A) refs/for/main/topic(A)
+# Refs of workbench: main(A) tags/v123
+test_expect_success "cleanup ($PROTOCOL/porcelain)" '
+ git -C "$upstream" update-ref -d refs/for/main/topic
+'
diff --git a/t/t5411/test-0036-report-multi-rewrite-for-one-ref.sh b/t/t5411/test-0036-report-multi-rewrite-for-one-ref.sh
new file mode 100644
index 0000000..be9b18b
--- /dev/null
+++ b/t/t5411/test-0036-report-multi-rewrite-for-one-ref.sh
@@ -0,0 +1,221 @@
+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/main/topic" \
+ -r "option old-oid $A" \
+ -r "option new-oid $B" \
+ -r "ok refs/for/main/topic" \
+ -r "option refname refs/changes/24/124/1" \
+ -r "option old-oid $ZERO_OID" \
+ -r "option new-oid $A" \
+ -r "ok refs/for/main/topic" \
+ -r "option refname refs/changes/25/125/1" \
+ -r "option old-oid $A" \
+ -r "option new-oid $B"
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/main/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/main/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/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: proc-receive> ok refs/for/main/topic
+ remote: proc-receive> option old-oid <COMMIT-A>
+ remote: proc-receive> option new-oid <COMMIT-B>
+ remote: proc-receive> ok refs/for/main/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/main/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/main/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/main/topic
+ * [new reference] HEAD -> refs/changes/24/124/1
+ <OID-A>..<OID-B> HEAD -> refs/changes/25/125/1
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
+
+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/main/topic
+ EOF
+ test_cmp expect actual &&
+ git -C workbench update-ref -d refs/t/for/main/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/main/topic" \
+ -r "option refname refs/changes/24/124/1" \
+ -r "option old-oid $ZERO_OID" \
+ -r "option new-oid $A" \
+ -r "ok refs/for/main/topic" \
+ -r "option old-oid $A" \
+ -r "option new-oid $B" \
+ -r "ok refs/for/main/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 : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/main/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/main/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/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: proc-receive> ok refs/for/main/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/main/topic
+ remote: proc-receive> option old-oid <COMMIT-A>
+ remote: proc-receive> option new-oid <COMMIT-B>
+ remote: proc-receive> ok refs/for/main/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/main/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/main/topic
+ + <OID-B>...<OID-A> HEAD -> refs/changes/25/125/1 (forced update)
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
+
+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/main/topic
+ EOF
+ test_cmp expect actual &&
+ git -C workbench update-ref -d refs/t/for/main/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/main/topic" \
+ -r "option refname refs/changes/23/123/1" \
+ -r "ok refs/for/main/topic" \
+ -r "option refname refs/changes/24/124/2" \
+ -r "option old-oid $A" \
+ -r "option new-oid $B"
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/main/topic(A)
+test_expect_success "proc-receive: multiple rewrites for one ref ($PROTOCOL)" '
+ git -C workbench push origin \
+ HEAD:refs/for/main/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/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: proc-receive> ok refs/for/main/topic
+ remote: proc-receive> option refname refs/changes/23/123/1
+ remote: proc-receive> ok refs/for/main/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 &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
+
+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/t/t5411/test-0037-report-multi-rewrite-for-one-ref--porcelain.sh b/t/t5411/test-0037-report-multi-rewrite-for-one-ref--porcelain.sh
new file mode 100644
index 0000000..95fb89c
--- /dev/null
+++ b/t/t5411/test-0037-report-multi-rewrite-for-one-ref--porcelain.sh
@@ -0,0 +1,166 @@
+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/main/topic" \
+ -r "option old-oid $A" \
+ -r "option new-oid $B" \
+ -r "ok refs/for/main/topic" \
+ -r "option refname refs/changes/24/124/1" \
+ -r "option old-oid $ZERO_OID" \
+ -r "option new-oid $A" \
+ -r "ok refs/for/main/topic" \
+ -r "option refname refs/changes/25/125/1" \
+ -r "option old-oid $A" \
+ -r "option new-oid $B"
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/main/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/main/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/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: proc-receive> ok refs/for/main/topic
+ remote: proc-receive> option old-oid <COMMIT-A>
+ remote: proc-receive> option new-oid <COMMIT-B>
+ remote: proc-receive> ok refs/for/main/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/main/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/main/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/main/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 &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
+
+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/main/topic" \
+ -r "option refname refs/changes/24/124/1" \
+ -r "option old-oid $ZERO_OID" \
+ -r "option new-oid $A" \
+ -r "ok refs/for/main/topic" \
+ -r "option old-oid $A" \
+ -r "option new-oid $B" \
+ -r "ok refs/for/main/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 : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/main/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/main/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/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: proc-receive> ok refs/for/main/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/main/topic
+ remote: proc-receive> option old-oid <COMMIT-A>
+ remote: proc-receive> option new-oid <COMMIT-B>
+ remote: proc-receive> ok refs/for/main/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/main/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/main/topic <OID-A>..<OID-B>
+ + HEAD:refs/changes/25/125/1 <OID-B>...<OID-A> (forced update)
+ Done
+ EOF
+ test_cmp expect actual &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
+
+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/main/topic" \
+ -r "option refname refs/changes/23/123/1" \
+ -r "ok refs/for/main/topic" \
+ -r "option refname refs/changes/24/124/2" \
+ -r "option old-oid $A" \
+ -r "option new-oid $B"
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : refs/for/main/topic(A)
+test_expect_success "proc-receive: multiple rewrites for one ref ($PROTOCOL/porcelain)" '
+ git -C workbench push --porcelain origin \
+ HEAD:refs/for/main/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/main/topic
+ remote: # proc-receive hook
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: proc-receive> ok refs/for/main/topic
+ remote: proc-receive> option refname refs/changes/23/123/1
+ remote: proc-receive> ok refs/for/main/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 &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
diff --git a/t/t5411/test-0038-report-mixed-refs.sh b/t/t5411/test-0038-report-mixed-refs.sh
new file mode 100644
index 0000000..5e00529
--- /dev/null
+++ b/t/t5411/test-0038-report-mixed-refs.sh
@@ -0,0 +1,87 @@
+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/main/topic" \
+ -r "option refname refs/for/main/topic" \
+ -r "option old-oid $A" \
+ -r "option new-oid $B"
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : (B) bar(A) baz(A) refs/for/next/topic(A) foo(A) refs/for/main/topic(A)
+test_expect_success "proc-receive: report update of mixed refs ($PROTOCOL)" '
+ test_must_fail git -C workbench push origin \
+ $B:refs/heads/main \
+ 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/main/topic \
+ HEAD:refs/for/next/topic3 \
+ >out-$test_count 2>&1 &&
+ make_user_friendly_and_stable_output <out-$test_count >actual &&
+ cat >expect <<-EOF &&
+ remote: # pre-receive hook
+ remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main
+ 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/main/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/main/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/main/topic
+ remote: proc-receive> option refname refs/for/main/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/main
+ 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/main/topic
+ To <URL/of/upstream.git>
+ <OID-A>..<OID-B> <COMMIT-B> -> main
+ * [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/main/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 &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/bar
+ <COMMIT-A> refs/heads/baz
+ <COMMIT-A> refs/heads/foo
+ <COMMIT-B> refs/heads/main
+ EOF
+'
+
+# Refs of upstream : main(B) foo(A) bar(A)) baz(A)
+# Refs of workbench: main(A) tags/v123
+test_expect_success "cleanup ($PROTOCOL)" '
+ (
+ cd "$upstream" &&
+ git update-ref refs/heads/main $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/t/t5411/test-0039-report-mixed-refs--porcelain.sh b/t/t5411/test-0039-report-mixed-refs--porcelain.sh
new file mode 100644
index 0000000..8f891c5
--- /dev/null
+++ b/t/t5411/test-0039-report-mixed-refs--porcelain.sh
@@ -0,0 +1,89 @@
+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/main/topic" \
+ -r "option refname refs/for/main/topic" \
+ -r "option old-oid $A" \
+ -r "option new-oid $B"
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : (B) bar(A) baz(A) refs/for/next/topic(A) foo(A) refs/for/main/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/main \
+ 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/main/topic \
+ HEAD:refs/for/next/topic3 \
+ >out-$test_count 2>&1 &&
+ make_user_friendly_and_stable_output <out-$test_count >actual &&
+ cat >expect <<-EOF &&
+ remote: # pre-receive hook
+ remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main
+ 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/main/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/main/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/main/topic
+ remote: proc-receive> option refname refs/for/main/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/main
+ 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/main/topic
+ To <URL/of/upstream.git>
+ <COMMIT-B>:refs/heads/main <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/main/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 &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/bar
+ <COMMIT-A> refs/heads/baz
+ <COMMIT-A> refs/heads/foo
+ <COMMIT-B> refs/heads/main
+ EOF
+'
+
+# Refs of upstream : main(B) foo(A) bar(A)) baz(A)
+# Refs of workbench: main(A) tags/v123
+test_expect_success "cleanup ($PROTOCOL/porcelain)" '
+ (
+ cd "$upstream" &&
+ git update-ref refs/heads/main $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/t/t5411/test-0040-process-all-refs.sh b/t/t5411/test-0040-process-all-refs.sh
new file mode 100644
index 0000000..fdcdcc7
--- /dev/null
+++ b/t/t5411/test-0040-process-all-refs.sh
@@ -0,0 +1,111 @@
+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 : main(A)
+# Refs of workbench: main(A) tags/v123
+test_expect_success "setup upstream branches ($PROTOCOL)" '
+ (
+ cd "$upstream" &&
+ git update-ref refs/heads/main $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/main" \
+ -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/main/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 : main(B) foo(A) bar(A)) baz(A)
+# Refs of workbench: main(A) tags/v123
+# git push -f : main(A) (NULL) (B) refs/for/main/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/main \
+ :refs/heads/foo \
+ $B:refs/heads/bar \
+ HEAD:refs/for/main/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/main
+ remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/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/main
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic
+ remote: proc-receive> ok refs/heads/main
+ 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/main/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/main
+ 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 -> main (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 &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-B> refs/heads/bar
+ <COMMIT-A> refs/heads/baz
+ <COMMIT-A> refs/heads/main
+ EOF
+'
+
+# Refs of upstream : main(A) bar(A) baz(B)
+# Refs of workbench: main(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/t/t5411/test-0041-process-all-refs--porcelain.sh b/t/t5411/test-0041-process-all-refs--porcelain.sh
new file mode 100644
index 0000000..73b35fe
--- /dev/null
+++ b/t/t5411/test-0041-process-all-refs--porcelain.sh
@@ -0,0 +1,112 @@
+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 : main(A)
+# Refs of workbench: main(A) tags/v123
+test_expect_success "setup upstream branches ($PROTOCOL/porcelain)" '
+ (
+ cd "$upstream" &&
+ git update-ref refs/heads/main $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/main" \
+ -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/main/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 : main(B) foo(A) bar(A)) baz(A)
+# Refs of workbench: main(A) tags/v123
+# git push -f : main(A) (NULL) (B) refs/for/main/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/main \
+ :refs/heads/foo \
+ $B:refs/heads/bar \
+ HEAD:refs/for/main/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/main
+ remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/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/main
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic
+ remote: proc-receive> ok refs/heads/main
+ 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/main/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/main
+ 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/main <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 &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-B> refs/heads/bar
+ <COMMIT-A> refs/heads/baz
+ <COMMIT-A> refs/heads/main
+ EOF
+'
+
+# Refs of upstream : main(A) bar(A) baz(B)
+# Refs of workbench: main(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/t/t5411/test-0050-proc-receive-refs-with-modifiers.sh b/t/t5411/test-0050-proc-receive-refs-with-modifiers.sh
new file mode 100644
index 0000000..7214647
--- /dev/null
+++ b/t/t5411/test-0050-proc-receive-refs-with-modifiers.sh
@@ -0,0 +1,129 @@
+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/main &&
+ 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/main" \
+ -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 : main(A)
+# Refs of workbench: main(A) tags/v123
+# git push : main(B) tags/v123
+test_expect_success "proc-receive: update branch and new tag ($PROTOCOL)" '
+ git -C workbench push origin \
+ $B:refs/heads/main \
+ 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/main
+ remote: pre-receive< <ZERO-OID> <TAG-v123> refs/tags/v123
+ remote: # proc-receive hook
+ remote: proc-receive< <COMMIT-A> <COMMIT-B> refs/heads/main
+ remote: proc-receive< <ZERO-OID> <TAG-v123> refs/tags/v123
+ remote: proc-receive> ok refs/heads/main
+ 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 &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(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 &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ <COMMIT-A> refs/heads/topic
+ <TAG-v123> refs/tags/v123
+ EOF
+'
+
+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/main" \
+ -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 : main(A) topic(A) tags/v123
+# Refs of workbench: main(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/main \
+ $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/main
+ 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/main
+ remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/heads/next
+ remote: proc-receive> ok refs/heads/main
+ 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 &&
+
+ test_cmp_refs -C "$upstream" <<-EOF
+ <COMMIT-A> refs/heads/main
+ <COMMIT-B> refs/heads/topic
+ EOF
+'
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
index baa1a99..8a5d349 100755
--- a/t/t5500-fetch-pack.sh
+++ b/t/t5500-fetch-pack.sh
@@ -5,6 +5,9 @@
test_description='Testing multi_ack pack fetching'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
# Test fetch-pack/upload-pack pair.
@@ -385,6 +388,54 @@
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 main. The first is common; the rest are
+ # not.
+ test_commit -C myserver first_main_commit &&
+ git clone "file://$(pwd)/myserver" myclient &&
+ test_commit_bulk -C myclient 255 &&
+
+ # Another linked list of commits on anotherbranch with no connection to
+ # main. 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 main &&
+ 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 main 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 &&
@@ -496,7 +547,7 @@
cd client &&
test_must_fail git fetch-pack --no-progress .. refs/heads/xyzzy 2>../error-m
) &&
- test_i18ncmp expect-error error-m
+ test_cmp expect-error error-m
'
test_expect_success 'test missing ref after existing' '
@@ -504,7 +555,7 @@
cd client &&
test_must_fail git fetch-pack --no-progress .. refs/heads/A refs/heads/xyzzy 2>../error-em
) &&
- test_i18ncmp expect-error error-em
+ test_cmp expect-error error-em
'
test_expect_success 'test missing ref before existing' '
@@ -512,7 +563,7 @@
cd client &&
test_must_fail git fetch-pack --no-progress .. refs/heads/xyzzy refs/heads/A 2>../error-me
) &&
- test_i18ncmp expect-error error-me
+ test_cmp expect-error error-me
'
test_expect_success 'test --all, --depth, and explicit head' '
@@ -589,7 +640,7 @@
mkdir repo2 &&
cd repo2 &&
git init &&
- git fetch --depth=2 ../.git master:branch &&
+ git fetch --depth=2 ../.git main:branch &&
git fsck
)
'
@@ -614,7 +665,7 @@
git init client &&
git -C client fetch-pack ../server \
- $(git -C server rev-parse refs/heads/master)
+ $(git -C server rev-parse refs/heads/main)
'
test_expect_success 'fetch-pack can fetch a raw sha1 overlapping a named ref' '
@@ -640,7 +691,7 @@
# Some protocol versions (e.g. 2) support fetching
# unadvertised objects, so restrict this test to v0.
test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 git -C client fetch-pack ../server \
- $(git -C server rev-parse refs/heads/master^) 2>err &&
+ $(git -C server rev-parse refs/heads/main^) 2>err &&
test_i18ngrep "Server does not allow request for unadvertised object" err
'
@@ -774,7 +825,7 @@
test_expect_success 'fetch shallow since ...' '
git -C shallow11 fetch --shallow-since "200000000 +0700" origin &&
- git -C shallow11 log --pretty=tformat:%s origin/master >actual &&
+ git -C shallow11 log --pretty=tformat:%s origin/main >actual &&
cat >expected <<-\EOF &&
three
two
@@ -815,7 +866,7 @@
(
cd shallow-since-graph &&
test_commit base &&
- test_commit master &&
+ test_commit main &&
git checkout -b other HEAD^ &&
test_commit other &&
git commit-graph write --reachable &&
@@ -823,9 +874,10 @@
GIT_PROTOCOL=version=2 git upload-pack . <<-EOF >/dev/null
0012command=fetch
+ $(echo "object-format=$(test_oid algo)" | packetize)
00010013deepen-since 1
- 0032want $(git rev-parse other)
- 0032have $(git rev-parse master)
+ $(echo "want $(git rev-parse other)" | packetize)
+ $(echo "have $(git rev-parse main)" | packetize)
0000
EOF
)
@@ -847,7 +899,7 @@
test_expect_success 'fetch exclude tag one' '
git -C shallow12 fetch --shallow-exclude one origin &&
- git -C shallow12 log --pretty=tformat:%s origin/master >actual &&
+ git -C shallow12 log --pretty=tformat:%s origin/main >actual &&
test_write_lines three two >expected &&
test_cmp expected actual
'
@@ -861,11 +913,11 @@
test_commit three &&
git clone --depth 1 "file://$(pwd)/." deepen &&
test_commit four &&
- git -C deepen log --pretty=tformat:%s master >actual &&
+ git -C deepen log --pretty=tformat:%s main >actual &&
echo three >expected &&
test_cmp expected actual &&
git -C deepen fetch --deepen=1 &&
- git -C deepen log --pretty=tformat:%s origin/master >actual &&
+ git -C deepen log --pretty=tformat:%s origin/main >actual &&
cat >expected <<-\EOF &&
four
three
@@ -951,7 +1003,6 @@
test_config -C "$SERVER" uploadpack.allowfilter 1 &&
git clone "$URL" client &&
- test_config -C client extensions.partialclone origin &&
test_commit -C "$SERVER" two &&
diff --git a/t/t5501-fetch-push-alternates.sh b/t/t5501-fetch-push-alternates.sh
index 1bc57ac..66f19a4 100755
--- a/t/t5501-fetch-push-alternates.sh
+++ b/t/t5501-fetch-push-alternates.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='fetch/push involving alternates'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
count_objects () {
@@ -45,7 +48,7 @@
test_expect_success 'pushing into a repository with the same alternate' '
(
cd one &&
- git push ../receiver master:refs/heads/it
+ git push ../receiver main:refs/heads/it
) &&
(
cd receiver &&
@@ -57,7 +60,7 @@
test_expect_success 'fetching from a repository with the same alternate' '
(
cd fetcher &&
- git fetch ../one master:refs/heads/it &&
+ git fetch ../one main:refs/heads/it &&
count_objects >../fetcher.count
) &&
test_cmp one.count fetcher.count
diff --git a/t/t5502-quickfetch.sh b/t/t5502-quickfetch.sh
index 7a46cbd..8c05c77 100755
--- a/t/t5502-quickfetch.sh
+++ b/t/t5502-quickfetch.sh
@@ -2,6 +2,9 @@
test_description='test quickfetch from local'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
@@ -108,14 +111,14 @@
q
}"
) ) &&
- origin_master=$( (
+ origin_main=$( (
cd quickclone &&
- git rev-parse origin/master
+ git rev-parse origin/main
) ) &&
echo "loose objects: $obj_cnt, packfiles: $pck_cnt" &&
test $obj_cnt -eq 0 &&
test $pck_cnt -eq 0 &&
- test z$origin_master = z$(git rev-parse master)
+ test z$origin_main = z$(git rev-parse main)
'
diff --git a/t/t5503-tagfollow.sh b/t/t5503-tagfollow.sh
index 6041a4d..195fc64 100755
--- a/t/t5503-tagfollow.sh
+++ b/t/t5503-tagfollow.sh
@@ -2,6 +2,9 @@
test_description='test automatic tag following'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
# End state of the repository:
@@ -11,7 +14,7 @@
# L - A ------ O ------ B
# \ \ \
# \ C - origin/cat \
-# origin/master master
+# origin/main main
test_expect_success setup '
test_tick &&
@@ -57,7 +60,7 @@
(
cd cloned &&
GIT_TRACE_PACKET=$UPATH git fetch &&
- test $A = $(git rev-parse --verify origin/master)
+ test $A = $(git rev-parse --verify origin/main)
) &&
get_needs $U >actual &&
test_cmp expect actual
@@ -72,7 +75,7 @@
git add file &&
git commit -m C &&
C=$(git rev-parse --verify HEAD) &&
- git checkout master
+ git checkout main
'
test_expect_success 'setup expect' '
@@ -123,7 +126,7 @@
(
cd cloned &&
GIT_TRACE_PACKET=$UPATH git fetch &&
- test $B = $(git rev-parse --verify origin/master) &&
+ test $B = $(git rev-parse --verify origin/main) &&
test $B = $(git rev-parse --verify tag2^0) &&
test $S = $(git rev-parse --verify tag2)
) &&
@@ -138,7 +141,7 @@
EOF
'
-test_expect_success 'new clone fetch master and tags' '
+test_expect_success 'new clone fetch main and tags' '
test_might_fail git branch -D cat &&
rm -f $U &&
(
@@ -147,7 +150,7 @@
git init &&
git remote add origin .. &&
GIT_TRACE_PACKET=$UPATH git fetch &&
- test $B = $(git rev-parse --verify origin/master) &&
+ test $B = $(git rev-parse --verify origin/main) &&
test $S = $(git rev-parse --verify tag2) &&
test $B = $(git rev-parse --verify tag2^0) &&
test $T = $(git rev-parse --verify tag1) &&
diff --git a/t/t5504-fetch-receive-strict.sh b/t/t5504-fetch-receive-strict.sh
index 645b4c7..6e5a9c2 100755
--- a/t/t5504-fetch-receive-strict.sh
+++ b/t/t5504-fetch-receive-strict.sh
@@ -1,10 +1,12 @@
#!/bin/sh
test_description='fetch/receive strict mode'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup and inject "corrupt or missing" object' '
- test_oid_init &&
echo hello >greetings &&
git add greetings &&
git commit -m greetings &&
@@ -26,7 +28,7 @@
cd dst &&
git config fetch.fsckobjects false &&
git config transfer.fsckobjects false &&
- test_must_fail git fetch ../.git master
+ test_must_fail git fetch ../.git main
)
'
@@ -37,7 +39,7 @@
cd dst &&
git config fetch.fsckobjects false &&
git config transfer.fsckobjects true &&
- test_must_fail git fetch ../.git master
+ test_must_fail git fetch ../.git main
)
'
@@ -48,7 +50,7 @@
cd dst &&
git config fetch.fsckobjects true &&
git config transfer.fsckobjects false &&
- test_must_fail git fetch ../.git master
+ test_must_fail git fetch ../.git main
)
'
@@ -58,13 +60,14 @@
(
cd dst &&
git config transfer.fsckobjects true &&
- test_must_fail git fetch ../.git master
+ test_must_fail git fetch ../.git main
)
'
cat >exp <<EOF
To dst
-! refs/heads/master:refs/heads/test [remote rejected] (missing necessary objects)
+! refs/heads/main:refs/heads/test [remote rejected] (missing necessary objects)
+Done
EOF
test_expect_success 'push without strict' '
@@ -75,7 +78,7 @@
git config fetch.fsckobjects false &&
git config transfer.fsckobjects false
) &&
- test_must_fail git push --porcelain dst master:refs/heads/test >act &&
+ test_must_fail git push --porcelain dst main:refs/heads/test >act &&
test_cmp exp act
'
@@ -87,13 +90,13 @@
git config receive.fsckobjects false &&
git config transfer.fsckobjects true
) &&
- test_must_fail git push --porcelain dst master:refs/heads/test >act &&
+ test_must_fail git push --porcelain dst main:refs/heads/test >act &&
test_cmp exp act
'
cat >exp <<EOF
To dst
-! refs/heads/master:refs/heads/test [remote rejected] (unpacker error)
+! refs/heads/main:refs/heads/test [remote rejected] (unpacker error)
EOF
test_expect_success 'push with receive.fsckobjects' '
@@ -104,7 +107,7 @@
git config receive.fsckobjects true &&
git config transfer.fsckobjects false
) &&
- test_must_fail git push --porcelain dst master:refs/heads/test >act &&
+ test_must_fail git push --porcelain dst main:refs/heads/test >act &&
test_cmp exp act
'
@@ -115,7 +118,7 @@
cd dst &&
git config transfer.fsckobjects true
) &&
- test_must_fail git push --porcelain dst master:refs/heads/test >act &&
+ test_must_fail git push --porcelain dst main:refs/heads/test >act &&
test_cmp exp act
'
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index dda81b7..8c462f2 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -2,12 +2,15 @@
test_description='git remote porcelain-ish'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
setup_repository () {
mkdir "$1" && (
cd "$1" &&
- git init &&
+ git init -b main &&
>file &&
git add file &&
test_tick &&
@@ -17,7 +20,7 @@
git add elif &&
test_tick &&
git commit -m "Second" &&
- git checkout master
+ git checkout main
)
}
@@ -56,12 +59,12 @@
git remote add myremote git@host.com:team/repo.git
'
-test_expect_success C_LOCALE_OUTPUT 'remote information for the origin' '
+test_expect_success 'remote information for the origin' '
(
cd test &&
tokens_match origin "$(git remote)" &&
- check_remote_track origin master side &&
- check_tracking_branch origin HEAD master side
+ check_remote_track origin main side &&
+ check_tracking_branch origin HEAD main side
)
'
@@ -70,7 +73,7 @@
cd test &&
git remote add -f second ../two &&
tokens_match "origin second" "$(git remote)" &&
- check_tracking_branch second master side another &&
+ check_tracking_branch second main side another &&
git for-each-ref "--format=%(refname)" refs/remotes |
sed -e "/^refs\/remotes\/origin\//d" \
-e "/^refs\/remotes\/second\//d" >actual &&
@@ -78,11 +81,11 @@
)
'
-test_expect_success C_LOCALE_OUTPUT 'check remote-tracking' '
+test_expect_success 'check remote-tracking' '
(
cd test &&
- check_remote_track origin master side &&
- check_remote_track second master side another
+ check_remote_track origin main side &&
+ check_remote_track second main side another
)
'
@@ -99,16 +102,16 @@
test_expect_success 'remove remote' '
(
cd test &&
- git symbolic-ref refs/remotes/second/HEAD refs/remotes/second/master &&
+ git symbolic-ref refs/remotes/second/HEAD refs/remotes/second/main &&
git remote rm second
)
'
-test_expect_success C_LOCALE_OUTPUT 'remove remote' '
+test_expect_success 'remove remote' '
(
cd test &&
tokens_match origin "$(git remote)" &&
- check_remote_track origin master side &&
+ check_remote_track origin main side &&
git for-each-ref "--format=%(refname)" refs/remotes |
sed -e "/^refs\/remotes\/origin\//d" >actual &&
test_must_be_empty actual
@@ -121,13 +124,13 @@
cat >expect1 <<-\EOF &&
Note: A branch outside the refs/remotes/ hierarchy was not removed;
to delete it, use:
- git branch -d master
+ git branch -d main
EOF
cat >expect2 <<-\EOF &&
Note: Some branches outside the refs/remotes/ hierarchy were not removed;
to delete them, use:
git branch -d foobranch
- git branch -d master
+ git branch -d main
EOF
git tag footag &&
git config --add remote.oops.fetch "+refs/*:refs/*" &&
@@ -137,23 +140,23 @@
git remote rm oops 2>actual2 &&
git branch -d foobranch &&
git tag -d footag &&
- test_i18ncmp expect1 actual1 &&
- test_i18ncmp expect2 actual2
+ test_cmp expect1 actual1 &&
+ test_cmp expect2 actual2
)
'
test_expect_success 'remove errors out early when deleting non-existent branch' '
(
cd test &&
- echo "fatal: No such remote: '\''foo'\''" >expect &&
- test_must_fail git remote rm foo 2>actual &&
- test_i18ncmp expect actual
+ echo "error: No such remote: '\''foo'\''" >expect &&
+ test_expect_code 2 git remote rm foo 2>actual &&
+ test_cmp expect actual
)
'
test_expect_success 'remove remote with a branch without configured merge' '
test_when_finished "(
- git -C test checkout master;
+ git -C test checkout main;
git -C test branch -D two;
git -C test config --remove-section remote.two;
git -C test config --remove-section branch.second;
@@ -163,9 +166,9 @@
cd test &&
git remote add two ../two &&
git fetch two &&
- git checkout -b second two/master^0 &&
+ git checkout -b second two/main^0 &&
git config branch.second.remote two &&
- git checkout master &&
+ git checkout main &&
git remote rm two
)
'
@@ -173,67 +176,80 @@
test_expect_success 'rename errors out early when deleting non-existent branch' '
(
cd test &&
- echo "fatal: No such remote: '\''foo'\''" >expect &&
- test_must_fail git remote rename foo bar 2>actual &&
- test_i18ncmp expect actual
+ echo "error: No such remote: '\''foo'\''" >expect &&
+ test_expect_code 2 git remote rename foo bar 2>actual &&
+ test_cmp expect actual
)
'
+test_expect_success 'rename errors out early when when new name is invalid' '
+ test_config remote.foo.vcs bar &&
+ echo "fatal: '\''invalid...name'\'' is not a valid remote name" >expect &&
+ test_must_fail git remote rename foo invalid...name 2>actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'add existing foreign_vcs remote' '
test_config remote.foo.vcs bar &&
- echo "fatal: remote foo already exists." >expect &&
- test_must_fail git remote add foo bar 2>actual &&
- test_i18ncmp expect actual
+ echo "error: remote foo already exists." >expect &&
+ test_expect_code 3 git remote add foo bar 2>actual &&
+ test_cmp expect actual
'
test_expect_success 'add existing foreign_vcs remote' '
test_config remote.foo.vcs bar &&
test_config remote.bar.vcs bar &&
- echo "fatal: remote bar already exists." >expect &&
- test_must_fail git remote rename foo bar 2>actual &&
- test_i18ncmp expect actual
+ echo "error: remote bar already exists." >expect &&
+ test_expect_code 3 git remote rename foo bar 2>actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'add invalid foreign_vcs remote' '
+ echo "fatal: '\''invalid...name'\'' is not a valid remote name" >expect &&
+ test_must_fail git remote add invalid...name bar 2>actual &&
+ test_cmp expect actual
'
cat >test/expect <<EOF
* remote origin
Fetch URL: $(pwd)/one
Push URL: $(pwd)/one
- HEAD branch: master
+ HEAD branch: main
Remote branches:
- master new (next fetch will store in remotes/origin)
- side tracked
+ main new (next fetch will store in remotes/origin)
+ side tracked
Local branches configured for 'git pull':
- ahead merges with remote master
- master merges with remote master
+ ahead merges with remote main
+ main merges with remote main
octopus merges with remote topic-a
and with remote topic-b
and with remote topic-c
- rebase rebases onto remote master
+ rebase rebases onto remote main
Local refs configured for 'git push':
- master pushes to master (local out of date)
- master pushes to upstream (create)
+ main pushes to main (local out of date)
+ main pushes to upstream (create)
* remote two
Fetch URL: ../two
Push URL: ../three
- HEAD branch: master
+ HEAD branch: main
Local refs configured for 'git push':
- ahead forces to master (fast-forwardable)
- master pushes to another (up to date)
+ ahead forces to main (fast-forwardable)
+ main pushes to another (up to date)
EOF
test_expect_success 'show' '
(
cd test &&
- git config --add remote.origin.fetch refs/heads/master:refs/heads/upstream &&
+ git config --add remote.origin.fetch refs/heads/main:refs/heads/upstream &&
git fetch &&
- git checkout -b ahead origin/master &&
+ git checkout -b ahead origin/main &&
echo 1 >>file &&
test_tick &&
git commit -m update file &&
- git checkout master &&
- git branch --track octopus origin/master &&
- git branch --track rebase origin/master &&
- git branch -d -r origin/master &&
+ git checkout main &&
+ git branch --track octopus origin/main &&
+ git branch --track rebase origin/main &&
+ git branch -d -r origin/main &&
git config --add remote.two.url ../two &&
git config --add remote.two.pushurl ../three &&
git config branch.rebase.rebase true &&
@@ -245,13 +261,13 @@
git commit -m update file
) &&
git config --add remote.origin.push : &&
- git config --add remote.origin.push refs/heads/master:refs/heads/upstream &&
+ git config --add remote.origin.push refs/heads/main:refs/heads/upstream &&
git config --add remote.origin.push +refs/tags/lastbackup &&
- git config --add remote.two.push +refs/heads/ahead:refs/heads/master &&
- git config --add remote.two.push refs/heads/master:refs/heads/another &&
+ git config --add remote.two.push +refs/heads/ahead:refs/heads/main &&
+ git config --add remote.two.push refs/heads/main:refs/heads/another &&
git remote show origin two >output &&
git branch -d rebase octopus &&
- test_i18ncmp expect output
+ test_cmp expect output
)
'
@@ -261,14 +277,14 @@
Push URL: $(pwd)/one
HEAD branch: (not queried)
Remote branches: (status not queried)
- master
+ main
side
Local branches configured for 'git pull':
- ahead merges with remote master
- master merges with remote master
+ ahead merges with remote main
+ main merges with remote main
Local refs configured for 'git push' (status not queried):
(matching) pushes to (matching)
- refs/heads/master pushes to refs/heads/upstream
+ refs/heads/main pushes to refs/heads/upstream
refs/tags/lastbackup forces to refs/tags/lastbackup
EOF
@@ -278,7 +294,7 @@
cd test &&
git remote show -n origin >output &&
mv ../one.unreachable ../one &&
- test_i18ncmp expect output
+ test_cmp expect output
)
'
@@ -309,7 +325,7 @@
(
cd test &&
git remote set-head --auto origin &&
- echo refs/remotes/origin/master >expect &&
+ echo refs/remotes/origin/main >expect &&
git symbolic-ref refs/remotes/origin/HEAD >output &&
test_cmp expect output
)
@@ -320,8 +336,8 @@
cd test &&
git fetch two "refs/heads/*:refs/remotes/two/*" &&
git remote set-head --auto two >output 2>&1 &&
- echo "two/HEAD set to master" >expect &&
- test_i18ncmp expect output
+ echo "two/HEAD set to main" >expect &&
+ test_cmp expect output
)
'
@@ -334,7 +350,7 @@
cd test &&
git remote set-head origin side2 &&
git symbolic-ref refs/remotes/origin/HEAD >output &&
- git remote set-head origin master &&
+ git remote set-head origin main &&
test_cmp expect output
)
'
@@ -353,7 +369,7 @@
git remote prune --dry-run origin >output &&
git rev-parse refs/remotes/origin/side2 &&
test_must_fail git rev-parse refs/remotes/origin/side &&
- test_i18ncmp expect output
+ test_cmp expect output
)
'
@@ -381,7 +397,7 @@
test_expect_success 'add --mirror=fetch' '
mkdir mirror-fetch &&
- git init mirror-fetch/parent &&
+ git init -b main mirror-fetch/parent &&
(
cd mirror-fetch/parent &&
test_commit one
@@ -397,7 +413,7 @@
(
cd mirror-fetch/parent &&
git branch new &&
- git branch -m master renamed
+ git branch -m main renamed
) &&
(
cd mirror-fetch/child &&
@@ -411,7 +427,7 @@
(
cd mirror-fetch/child &&
git remote prune parent &&
- test_must_fail git rev-parse --verify refs/heads/master
+ test_must_fail git rev-parse --verify refs/heads/main
)
'
@@ -452,7 +468,7 @@
test_expect_success 'add --mirror=push' '
mkdir mirror-push &&
git init --bare mirror-push/public &&
- git init mirror-push/private &&
+ git init -b main mirror-push/private &&
(
cd mirror-push/private &&
test_commit one &&
@@ -464,14 +480,14 @@
(
cd mirror-push/private &&
git branch new &&
- git branch -m master renamed &&
+ git branch -m main renamed &&
git push public
) &&
(
cd mirror-push/private &&
git rev-parse --verify refs/heads/new &&
git rev-parse --verify refs/heads/renamed &&
- test_must_fail git rev-parse --verify refs/heads/master
+ test_must_fail git rev-parse --verify refs/heads/main
)
'
@@ -597,10 +613,10 @@
'
cat >one/expect <<\EOF
- apis/master
+ apis/main
apis/side
drosophila/another
- drosophila/master
+ drosophila/main
drosophila/side
EOF
@@ -617,11 +633,11 @@
cat >one/expect <<\EOF
drosophila/another
- drosophila/master
+ drosophila/main
drosophila/side
- manduca/master
+ manduca/main
manduca/side
- megaloprepus/master
+ megaloprepus/main
megaloprepus/side
EOF
@@ -660,11 +676,11 @@
'
cat >one/expect <<-\EOF
- apis/master
+ apis/main
apis/side
- manduca/master
+ manduca/main
manduca/side
- megaloprepus/master
+ megaloprepus/main
megaloprepus/side
EOF
@@ -684,7 +700,7 @@
cat >one/expect <<\EOF
drosophila/another
- drosophila/master
+ drosophila/main
drosophila/side
EOF
@@ -738,14 +754,14 @@
git clone one four &&
(
cd four &&
- git config branch.master.pushRemote origin &&
+ git config branch.main.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 symbolic-ref refs/remotes/upstream/HEAD)" = "refs/remotes/upstream/main" &&
+ test "$(git rev-parse upstream/main)" = "$(git rev-parse main)" &&
test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/remotes/upstream/*" &&
- test "$(git config branch.master.remote)" = "upstream" &&
- test "$(git config branch.master.pushRemote)" = "upstream" &&
+ test "$(git config branch.main.remote)" = "upstream" &&
+ test "$(git config branch.main.pushRemote)" = "upstream" &&
test "$(git config --global remote.pushDefault)" = "origin"
)
'
@@ -791,7 +807,7 @@
git config remote.origin.fetch +refs/heads/*:refs/heads/origin/* &&
git remote rename origin upstream &&
test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/heads/origin/*" &&
- git rev-parse -q origin/master
+ git rev-parse -q origin/main
)
'
@@ -811,7 +827,7 @@
cd four.three &&
git remote add o git://example.com/repo.git &&
git remote rename o upstream &&
- test "$(git rev-parse origin/master)" = "$(git rev-parse master)"
+ test "$(git rev-parse origin/main)" = "$(git rev-parse main)"
)
'
@@ -827,11 +843,11 @@
git clone one four.five &&
(
cd four.five &&
- git config branch.master.pushRemote origin &&
+ git config branch.main.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_must_fail git config branch.main.remote &&
+ test_must_fail git config branch.main.pushRemote &&
test "$(git config --global remote.pushDefault)" = "origin"
)
'
@@ -872,9 +888,9 @@
cat >remotes_origin <<EOF
URL: $(pwd)/one
-Push: refs/heads/master:refs/heads/upstream
+Push: refs/heads/main:refs/heads/upstream
Push: refs/heads/next:refs/heads/upstream2
-Pull: refs/heads/master:refs/heads/origin
+Pull: refs/heads/main:refs/heads/origin
Pull: refs/heads/next:refs/heads/origin2
EOF
@@ -890,11 +906,11 @@
test_path_is_missing .git/remotes/origin &&
test "$(git config remote.origin.url)" = "$origin_url" &&
cat >push_expected <<-\EOF &&
- refs/heads/master:refs/heads/upstream
+ refs/heads/main:refs/heads/upstream
refs/heads/next:refs/heads/upstream2
EOF
cat >fetch_expected <<-\EOF &&
- refs/heads/master:refs/heads/origin
+ refs/heads/main:refs/heads/origin
refs/heads/next:refs/heads/origin2
EOF
git config --get-all remote.origin.push >push_actual &&
@@ -910,12 +926,12 @@
(
cd six &&
git remote rm origin &&
- echo "$origin_url" >.git/branches/origin &&
+ echo "$origin_url#main" >.git/branches/origin &&
git remote rename origin origin &&
test_path_is_missing .git/branches/origin &&
test "$(git config remote.origin.url)" = "$origin_url" &&
- test "$(git config remote.origin.fetch)" = "refs/heads/master:refs/heads/origin" &&
- test "$(git config remote.origin.push)" = "HEAD:refs/heads/master"
+ test "$(git config remote.origin.fetch)" = "refs/heads/main:refs/heads/origin" &&
+ test "$(git config remote.origin.push)" = "HEAD:refs/heads/main"
)
'
@@ -938,7 +954,7 @@
(
cd one &&
git checkout side2 &&
- git branch -D master
+ git branch -D main
) &&
(
cd eight &&
@@ -981,24 +997,24 @@
EOF
sort <<-\EOF >expect.replace &&
+refs/heads/maint:refs/remotes/scratch/maint
- +refs/heads/master:refs/remotes/scratch/master
+ +refs/heads/main:refs/remotes/scratch/main
+refs/heads/next:refs/remotes/scratch/next
EOF
sort <<-\EOF >expect.add-two &&
+refs/heads/maint:refs/remotes/scratch/maint
- +refs/heads/master:refs/remotes/scratch/master
+ +refs/heads/main:refs/remotes/scratch/main
+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 &&
- refs/heads/master:refs/remotes/scratch/master
+ refs/heads/main:refs/remotes/scratch/main
+refs/heads/next:refs/remotes/scratch/next
EOF
sort <<-\EOF >expect.respect-ffonly &&
- refs/heads/master:refs/remotes/scratch/master
+ refs/heads/main:refs/remotes/scratch/main
+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 &&
@@ -1012,23 +1028,23 @@
git config --get-all remote.scratch.fetch >config-result &&
sort <config-result >../actual.add &&
- git remote set-branches scratch maint master next &&
+ git remote set-branches scratch maint main next &&
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 &&
git config --unset-all remote.scratch.fetch &&
git config remote.scratch.fetch \
- refs/heads/master:refs/remotes/scratch/master &&
+ refs/heads/main:refs/remotes/scratch/main &&
git config --add remote.scratch.fetch \
+refs/heads/next:refs/remotes/scratch/next &&
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
) &&
@@ -1042,14 +1058,14 @@
test_expect_success 'remote set-branches with --mirror' '
echo "+refs/*:refs/*" >expect.initial &&
- echo "+refs/heads/master:refs/heads/master" >expect.replace &&
+ echo "+refs/heads/main:refs/heads/main" >expect.replace &&
git clone --mirror .git/ setbranches-mirror &&
(
cd setbranches-mirror &&
git remote rename origin scratch &&
git config --get-all remote.scratch.fetch >../actual.initial &&
- git remote set-branches scratch heads/master &&
+ git remote set-branches scratch heads/main &&
git config --get-all remote.scratch.fetch >../actual.replace
) &&
test_cmp expect.initial actual.initial &&
@@ -1295,7 +1311,7 @@
test_extra_arg add nick url
test_extra_arg rename origin newname
test_extra_arg remove origin
-test_extra_arg set-head origin master
+test_extra_arg set-head origin main
# set-branches takes any number of args
test_extra_arg get-url origin newurl
test_extra_arg set-url origin newurl oldurl
@@ -1312,7 +1328,7 @@
test_when_finished "(cd test && git tag -d some-tag)" &&
(
cd test &&
- git tag -a -m "Some tag" some-tag master &&
+ git tag -a -m "Some tag" some-tag main &&
exit_with=true &&
for type in commit tag tree blob
do
@@ -1338,7 +1354,7 @@
test_expect_success 'refs/remotes/* <src> refspec and unqualified <dst> DWIM and advice' '
(
cd two &&
- git tag -a -m "Some tag" my-tag master &&
+ git tag -a -m "Some tag" my-tag main &&
git update-ref refs/trees/my-head-tree HEAD^{tree} &&
git update-ref refs/blobs/my-file-blob HEAD:file
) &&
diff --git a/t/t5506-remote-groups.sh b/t/t5506-remote-groups.sh
index 83d5558..8f150c0 100755
--- a/t/t5506-remote-groups.sh
+++ b/t/t5506-remote-groups.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='git remote group handling'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
mark() {
@@ -31,8 +34,8 @@
test_expect_success 'setup' '
mkdir one && (cd one && git init) &&
mkdir two && (cd two && git init) &&
- git remote add -m master one one &&
- git remote add -m master two two
+ git remote add -m main one one &&
+ git remote add -m main two two
'
test_expect_success 'no group updates all' '
diff --git a/t/t5509-fetch-push-namespaces.sh b/t/t5509-fetch-push-namespaces.sh
index a67f792..31553b4 100755
--- a/t/t5509-fetch-push-namespaces.sh
+++ b/t/t5509-fetch-push-namespaces.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='fetch/push involving ref namespaces'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
@@ -27,9 +30,9 @@
test_expect_success 'pushing into a repository using a ref namespace' '
(
cd original &&
- git push pushee-namespaced master &&
+ git push pushee-namespaced main &&
git ls-remote pushee-namespaced >actual &&
- printf "$commit1\trefs/heads/master\n" >expected &&
+ printf "$commit1\trefs/heads/main\n" >expected &&
test_cmp expected actual &&
git push pushee-namespaced --tags &&
git ls-remote pushee-namespaced >actual &&
@@ -56,7 +59,7 @@
cd puller &&
git remote add -f pushee-namespaced "ext::git --namespace=namespace %s ../pushee" &&
git for-each-ref refs/ >actual &&
- printf "$commit1 commit\trefs/remotes/pushee-namespaced/master\n" >expected &&
+ printf "$commit1 commit\trefs/remotes/pushee-namespaced/main\n" >expected &&
printf "$commit0 commit\trefs/tags/0\n" >>expected &&
printf "$commit1 commit\trefs/tags/1\n" >>expected &&
test_cmp expected actual
@@ -76,7 +79,7 @@
(
cd mirror &&
git for-each-ref refs/ >actual &&
- printf "$commit1 commit\trefs/namespaces/namespace/refs/heads/master\n" >expected &&
+ printf "$commit1 commit\trefs/namespaces/namespace/refs/heads/main\n" >expected &&
printf "$commit0 commit\trefs/namespaces/namespace/refs/tags/0\n" >>expected &&
printf "$commit1 commit\trefs/namespaces/namespace/refs/tags/1\n" >>expected &&
test_cmp expected actual
@@ -87,7 +90,7 @@
GIT_NAMESPACE=namespace \
git -C pushee -c transfer.hideRefs=refs/tags \
ls-remote "ext::git %s ." >actual &&
- printf "$commit1\trefs/heads/master\n" >expected &&
+ printf "$commit1\trefs/heads/main\n" >expected &&
test_cmp expected actual
'
@@ -95,7 +98,7 @@
GIT_NAMESPACE=namespace \
git -C pushee -c transfer.hideRefs=refs/namespaces/namespace/refs/tags \
ls-remote "ext::git %s ." >actual &&
- printf "$commit1\trefs/heads/master\n" >expected &&
+ printf "$commit1\trefs/heads/main\n" >expected &&
printf "$commit0\trefs/tags/0\n" >>expected &&
printf "$commit1\trefs/tags/1\n" >>expected &&
test_cmp expected actual
@@ -105,23 +108,23 @@
GIT_NAMESPACE=namespace \
git -C pushee -c transfer.hideRefs="^refs/namespaces/namespace/refs/tags" \
ls-remote "ext::git %s ." >actual &&
- printf "$commit1\trefs/heads/master\n" >expected &&
+ printf "$commit1\trefs/heads/main\n" >expected &&
test_cmp expected actual
'
test_expect_success 'try to update a hidden ref' '
- test_config -C pushee transfer.hideRefs refs/heads/master &&
- test_must_fail git -C original push pushee-namespaced master
+ test_config -C pushee transfer.hideRefs refs/heads/main &&
+ test_must_fail git -C original push pushee-namespaced main
'
test_expect_success 'try to update a ref that is not hidden' '
- test_config -C pushee transfer.hideRefs refs/namespaces/namespace/refs/heads/master &&
- git -C original push pushee-namespaced master
+ test_config -C pushee transfer.hideRefs refs/namespaces/namespace/refs/heads/main &&
+ git -C original push pushee-namespaced main
'
test_expect_success 'try to update a hidden full ref' '
- test_config -C pushee transfer.hideRefs "^refs/namespaces/namespace/refs/heads/master" &&
- test_must_fail git -C original push pushee-namespaced master
+ test_config -C pushee transfer.hideRefs "^refs/namespaces/namespace/refs/heads/main" &&
+ test_must_fail git -C original push pushee-namespaced main
'
test_expect_success 'set up ambiguous HEAD' '
@@ -157,9 +160,9 @@
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 &&
+ test_must_fail git push unborn-namespaced HEAD:main &&
git -C unborn config receive.denyCurrentBranch updateInstead &&
- git push unborn-namespaced HEAD:master
+ git push unborn-namespaced HEAD:main
)
'
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index a66dbe0..e83b2a6 100755
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -5,27 +5,20 @@
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-bundle.sh
D=$(pwd)
-test_bundle_object_count () {
- git verify-pack -v "$1" >verify.out &&
- test "$2" = $(grep "^$OID_REGEX " verify.out | wc -l)
-}
-
-convert_bundle_to_pack () {
- while read x && test -n "$x"
- do
- :;
- done
- cat
-}
-
test_expect_success setup '
echo >file original &&
git add file &&
- git commit -a -m original'
+ git commit -a -m original &&
+ git branch -M main
+'
test_expect_success "clone and setup child repos" '
git clone . one &&
@@ -37,19 +30,19 @@
git clone . two &&
(
cd two &&
- git config branch.master.remote one &&
+ git config branch.main.remote one &&
git config remote.one.url ../one/.git/ &&
- git config remote.one.fetch refs/heads/master:refs/heads/one
+ git config remote.one.fetch refs/heads/main:refs/heads/one
) &&
git clone . three &&
(
cd three &&
- git config branch.master.remote two &&
- git config branch.master.merge refs/heads/one &&
+ git config branch.main.remote two &&
+ git config branch.main.merge refs/heads/one &&
mkdir -p .git/remotes &&
{
echo "URL: ../two/.git/"
- echo "Pull: refs/heads/master:refs/heads/two"
+ echo "Pull: refs/heads/main:refs/heads/two"
echo "Pull: refs/heads/one:refs/heads/one"
} >.git/remotes/two
) &&
@@ -65,7 +58,7 @@
git fetch &&
git rev-parse --verify refs/heads/one &&
mine=$(git rev-parse refs/heads/one) &&
- his=$(cd ../one && git rev-parse refs/heads/master) &&
+ his=$(cd ../one && git rev-parse refs/heads/main) &&
test "z$mine" = "z$his"
'
@@ -75,11 +68,11 @@
git fetch &&
git rev-parse --verify refs/heads/two &&
git rev-parse --verify refs/heads/one &&
- master_in_two=$(cd ../two && git rev-parse master) &&
+ main_in_two=$(cd ../two && git rev-parse main) &&
one_in_two=$(cd ../two && git rev-parse one) &&
{
echo "$one_in_two "
- echo "$master_in_two not-for-merge"
+ echo "$main_in_two not-for-merge"
} >expected &&
cut -f -2 .git/FETCH_HEAD >actual &&
test_cmp expected actual'
@@ -88,7 +81,7 @@
cd "$D" &&
git clone . prune &&
cd prune &&
- git update-ref refs/remotes/origin/extrabranch master &&
+ git update-ref refs/remotes/origin/extrabranch main &&
git fetch --prune origin &&
test_must_fail git rev-parse origin/extrabranch
@@ -98,9 +91,9 @@
cd "$D" &&
git clone . prune-branch &&
cd prune-branch &&
- git update-ref refs/remotes/origin/extrabranch master &&
+ git update-ref refs/remotes/origin/extrabranch main &&
- git fetch --prune origin master &&
+ git fetch --prune origin main &&
git rev-parse origin/extrabranch
'
@@ -110,18 +103,18 @@
cd prune-namespace &&
git fetch --prune origin refs/heads/a/*:refs/remotes/origin/a/* &&
- git rev-parse origin/master
+ git rev-parse origin/main
'
test_expect_success 'fetch --prune handles overlapping refspecs' '
cd "$D" &&
- git update-ref refs/pull/42/head master &&
+ git update-ref refs/pull/42/head main &&
git clone . prune-overlapping &&
cd prune-overlapping &&
git config --add remote.origin.fetch refs/pull/*/head:refs/remotes/origin/pr/* &&
git fetch --prune origin &&
- git rev-parse origin/master &&
+ git rev-parse origin/main &&
git rev-parse origin/pr/42 &&
git config --unset-all remote.origin.fetch &&
@@ -129,7 +122,7 @@
git config --add remote.origin.fetch refs/heads/*:refs/remotes/origin/* &&
git fetch --prune origin &&
- git rev-parse origin/master &&
+ git rev-parse origin/main &&
git rev-parse origin/pr/42
'
@@ -137,13 +130,13 @@
cd "$D" &&
git clone . prune-tags &&
cd prune-tags &&
- git tag sometag master &&
+ git tag sometag main &&
# Create what looks like a remote-tracking branch from an earlier
# fetch that has since been deleted from the remote:
- git update-ref refs/remotes/origin/fake-remote master &&
+ git update-ref refs/remotes/origin/fake-remote main &&
git fetch --prune --tags origin &&
- git rev-parse origin/master &&
+ git rev-parse origin/main &&
test_must_fail git rev-parse origin/fake-remote &&
git rev-parse sometag
'
@@ -152,10 +145,10 @@
cd "$D" &&
git clone . prune-tags-branch &&
cd prune-tags-branch &&
- git tag sometag master &&
- git update-ref refs/remotes/origin/extrabranch master &&
+ git tag sometag main &&
+ git update-ref refs/remotes/origin/extrabranch main &&
- git fetch --prune --tags origin master &&
+ git fetch --prune --tags origin main &&
git rev-parse origin/extrabranch &&
git rev-parse sometag
'
@@ -164,9 +157,9 @@
cd "$D" &&
git clone . prune-tags-refspec &&
cd prune-tags-refspec &&
- git tag sometag master &&
- git update-ref refs/remotes/origin/foo/otherbranch master &&
- git update-ref refs/remotes/origin/extrabranch master &&
+ git tag sometag main &&
+ git update-ref refs/remotes/origin/foo/otherbranch main &&
+ git update-ref refs/remotes/origin/extrabranch main &&
git fetch --prune --tags origin refs/heads/foo/*:refs/remotes/origin/foo/* &&
test_must_fail git rev-parse refs/remotes/origin/foo/otherbranch &&
@@ -174,23 +167,191 @@
git rev-parse sometag
'
+test_expect_success 'fetch --atomic works with a single branch' '
+ test_when_finished "rm -rf \"$D\"/atomic" &&
+
+ cd "$D" &&
+ git clone . atomic &&
+ git branch atomic-branch &&
+ oid=$(git rev-parse atomic-branch) &&
+ echo "$oid" >expected &&
+
+ git -C atomic fetch --atomic origin &&
+ git -C atomic rev-parse origin/atomic-branch >actual &&
+ test_cmp expected actual &&
+ test $oid = "$(git -C atomic rev-parse --verify FETCH_HEAD)"
+'
+
+test_expect_success 'fetch --atomic works with multiple branches' '
+ test_when_finished "rm -rf \"$D\"/atomic" &&
+
+ cd "$D" &&
+ git clone . atomic &&
+ git branch atomic-branch-1 &&
+ git branch atomic-branch-2 &&
+ git branch atomic-branch-3 &&
+ git rev-parse refs/heads/atomic-branch-1 refs/heads/atomic-branch-2 refs/heads/atomic-branch-3 >actual &&
+
+ git -C atomic fetch --atomic origin &&
+ git -C atomic rev-parse refs/remotes/origin/atomic-branch-1 refs/remotes/origin/atomic-branch-2 refs/remotes/origin/atomic-branch-3 >expected &&
+ test_cmp expected actual
+'
+
+test_expect_success 'fetch --atomic works with mixed branches and tags' '
+ test_when_finished "rm -rf \"$D\"/atomic" &&
+
+ cd "$D" &&
+ git clone . atomic &&
+ git branch atomic-mixed-branch &&
+ git tag atomic-mixed-tag &&
+ git rev-parse refs/heads/atomic-mixed-branch refs/tags/atomic-mixed-tag >actual &&
+
+ git -C atomic fetch --tags --atomic origin &&
+ git -C atomic rev-parse refs/remotes/origin/atomic-mixed-branch refs/tags/atomic-mixed-tag >expected &&
+ test_cmp expected actual
+'
+
+test_expect_success 'fetch --atomic prunes references' '
+ test_when_finished "rm -rf \"$D\"/atomic" &&
+
+ cd "$D" &&
+ git branch atomic-prune-delete &&
+ git clone . atomic &&
+ git branch --delete atomic-prune-delete &&
+ git branch atomic-prune-create &&
+ git rev-parse refs/heads/atomic-prune-create >actual &&
+
+ git -C atomic fetch --prune --atomic origin &&
+ test_must_fail git -C atomic rev-parse refs/remotes/origin/atomic-prune-delete &&
+ git -C atomic rev-parse refs/remotes/origin/atomic-prune-create >expected &&
+ test_cmp expected actual
+'
+
+test_expect_success 'fetch --atomic aborts with non-fast-forward update' '
+ test_when_finished "rm -rf \"$D\"/atomic" &&
+
+ cd "$D" &&
+ git branch atomic-non-ff &&
+ git clone . atomic &&
+ git rev-parse HEAD >actual &&
+
+ git branch atomic-new-branch &&
+ parent_commit=$(git rev-parse atomic-non-ff~) &&
+ git update-ref refs/heads/atomic-non-ff $parent_commit &&
+
+ test_must_fail git -C atomic fetch --atomic origin refs/heads/*:refs/remotes/origin/* &&
+ test_must_fail git -C atomic rev-parse refs/remotes/origin/atomic-new-branch &&
+ git -C atomic rev-parse refs/remotes/origin/atomic-non-ff >expected &&
+ test_cmp expected actual &&
+ test_must_be_empty atomic/.git/FETCH_HEAD
+'
+
+test_expect_success 'fetch --atomic executes a single reference transaction only' '
+ test_when_finished "rm -rf \"$D\"/atomic" &&
+
+ cd "$D" &&
+ git clone . atomic &&
+ git branch atomic-hooks-1 &&
+ git branch atomic-hooks-2 &&
+ head_oid=$(git rev-parse HEAD) &&
+
+ cat >expected <<-EOF &&
+ prepared
+ $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-1
+ $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-2
+ committed
+ $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-1
+ $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-2
+ EOF
+
+ rm -f atomic/actual &&
+ write_script atomic/.git/hooks/reference-transaction <<-\EOF &&
+ ( echo "$*" && cat ) >>actual
+ EOF
+
+ git -C atomic fetch --atomic origin &&
+ test_cmp expected atomic/actual
+'
+
+test_expect_success 'fetch --atomic aborts all reference updates if hook aborts' '
+ test_when_finished "rm -rf \"$D\"/atomic" &&
+
+ cd "$D" &&
+ git clone . atomic &&
+ git branch atomic-hooks-abort-1 &&
+ git branch atomic-hooks-abort-2 &&
+ git branch atomic-hooks-abort-3 &&
+ git tag atomic-hooks-abort &&
+ head_oid=$(git rev-parse HEAD) &&
+
+ cat >expected <<-EOF &&
+ prepared
+ $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-1
+ $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-2
+ $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-3
+ $ZERO_OID $head_oid refs/tags/atomic-hooks-abort
+ aborted
+ $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-1
+ $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-2
+ $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-3
+ $ZERO_OID $head_oid refs/tags/atomic-hooks-abort
+ EOF
+
+ rm -f atomic/actual &&
+ write_script atomic/.git/hooks/reference-transaction <<-\EOF &&
+ ( echo "$*" && cat ) >>actual
+ exit 1
+ EOF
+
+ git -C atomic for-each-ref >expected-refs &&
+ test_must_fail git -C atomic fetch --tags --atomic origin &&
+ git -C atomic for-each-ref >actual-refs &&
+ test_cmp expected-refs actual-refs &&
+ test_must_be_empty atomic/.git/FETCH_HEAD
+'
+
+test_expect_success 'fetch --atomic --append appends to FETCH_HEAD' '
+ test_when_finished "rm -rf \"$D\"/atomic" &&
+
+ cd "$D" &&
+ git clone . atomic &&
+ oid=$(git rev-parse HEAD) &&
+
+ git branch atomic-fetch-head-1 &&
+ git -C atomic fetch --atomic origin atomic-fetch-head-1 &&
+ test_line_count = 1 atomic/.git/FETCH_HEAD &&
+
+ git branch atomic-fetch-head-2 &&
+ git -C atomic fetch --atomic --append origin atomic-fetch-head-2 &&
+ test_line_count = 2 atomic/.git/FETCH_HEAD &&
+ cp atomic/.git/FETCH_HEAD expected &&
+
+ write_script atomic/.git/hooks/reference-transaction <<-\EOF &&
+ exit 1
+ EOF
+
+ git branch atomic-fetch-head-3 &&
+ test_must_fail git -C atomic fetch --atomic --append origin atomic-fetch-head-3 &&
+ test_cmp expected atomic/.git/FETCH_HEAD
+'
+
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 rev-parse remotes/origin/main >old &&
+ git -C remote-refs update-ref refs/remotes/origin/main main~1 &&
+ git -C remote-refs rev-parse remotes/origin/main >new &&
git -C remote-refs fetch --refmap= origin "+refs/heads/*:refs/hidden/origin/*" &&
- git -C remote-refs rev-parse remotes/origin/master >actual &&
+ git -C remote-refs rev-parse remotes/origin/main >actual &&
test_cmp new actual &&
git -C remote-refs fetch origin &&
- git -C remote-refs rev-parse remotes/origin/master >actual &&
+ git -C remote-refs rev-parse remotes/origin/main >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 update-ref refs/remotes/origin/foo/otherbranch main &&
+ git -C remote-refs update-ref refs/hidden/foo/otherbranch main &&
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 &&
@@ -213,7 +374,7 @@
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 &&
@@ -250,7 +411,7 @@
test_i18ngrep "new tag.* -> descriptive-tag$" actual &&
test_i18ngrep "new ref.* -> crazy$" actual
) &&
- git checkout master
+ git checkout main
'
test_expect_success 'fetch must not resolve short tag name' '
@@ -281,40 +442,42 @@
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 main^..main
'
test_expect_success 'header of bundle looks right' '
- head -n 4 "$D"/bundle1 &&
- head -n 1 "$D"/bundle1 | grep "^#" &&
- head -n 2 "$D"/bundle1 | grep "^-$OID_REGEX " &&
- head -n 3 "$D"/bundle1 | grep "^$OID_REGEX " &&
- head -n 4 "$D"/bundle1 | grep "^$"
+ cat >expect <<-EOF &&
+ # v3 git bundle
+ @object-format=$(test_oid algo)
+ -OID updated by origin
+ OID refs/heads/main
+
+ EOF
+ sed -e "s/$OID_REGEX/OID/g" -e "5q" "$D"/bundle1 >actual &&
+ test_cmp expect actual
'
test_expect_success 'create bundle 2' '
cd "$D" &&
- git bundle create bundle2 master~2..master
+ git bundle create bundle2 main~2..main
'
test_expect_success 'unbundle 1' '
cd "$D/bundle" &&
git checkout -b some-branch &&
- test_must_fail git fetch "$D/bundle1" master:master
+ test_must_fail git fetch "$D/bundle1" main:main
'
test_expect_success 'bundle 1 has only 3 files ' '
cd "$D" &&
- convert_bundle_to_pack <bundle1 >bundle.pack &&
- git index-pack bundle.pack &&
- test_bundle_object_count bundle.pack 3
+ test_bundle_object_count bundle1 3
'
test_expect_success 'unbundle 2' '
cd "$D/bundle" &&
- git fetch ../bundle2 master:master &&
- test "tip" = "$(git log -1 --pretty=oneline master | cut -d" " -f2)"
+ git fetch ../bundle2 main:main &&
+ test "tip" = "$(git log -1 --pretty=oneline main | cut -d" " -f2)"
'
test_expect_success 'bundle does not prerequisite objects' '
@@ -323,22 +486,20 @@
git add file2 &&
git commit -m add.file2 file2 &&
git bundle create bundle3 -1 HEAD &&
- convert_bundle_to_pack <bundle3 >bundle.pack &&
- git index-pack bundle.pack &&
- test_bundle_object_count bundle.pack 3
+ test_bundle_object_count bundle3 3
'
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 main &&
git bundle create bundle4 v1.0
'
test_expect_success 'fetch with a non-applying branch.<name>.merge' '
- git config branch.master.remote yeti &&
- git config branch.master.merge refs/heads/bigfoot &&
+ git config branch.main.remote yeti &&
+ git config branch.main.merge refs/heads/bigfoot &&
git config remote.blub.url one &&
git config remote.blub.fetch "refs/heads/*:refs/remotes/one/*" &&
git fetch blub
@@ -358,8 +519,8 @@
# the merge spec matches the branch the remote HEAD points to
test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [2]' '
one_ref=$(cd one && git symbolic-ref HEAD) &&
- git config branch.master.remote blub &&
- git config branch.master.merge "$one_ref" &&
+ git config branch.main.remote blub &&
+ git config branch.main.merge "$one_ref" &&
git update-ref -d FETCH_HEAD &&
git fetch one &&
test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
@@ -369,7 +530,7 @@
# URL supplied to fetch matches the url of the configured branch's remote, but
# the merge spec does not match the branch the remote HEAD points to
test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [3]' '
- git config branch.master.merge "${one_ref}_not" &&
+ git config branch.main.merge "${one_ref}_not" &&
git update-ref -d FETCH_HEAD &&
git fetch one &&
test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
@@ -385,9 +546,9 @@
test_expect_success 'bundle should record HEAD correctly' '
cd "$D" &&
- git bundle create bundle5 HEAD master &&
+ git bundle create bundle5 HEAD main &&
git bundle list-heads bundle5 >actual &&
- for h in HEAD refs/heads/master
+ for h in HEAD refs/heads/main
do
echo "$(git rev-parse --verify $h) $h"
done >expect &&
@@ -395,10 +556,10 @@
'
-test_expect_success 'mark initial state of origin/master' '
+test_expect_success 'mark initial state of origin/main' '
(
cd three &&
- git tag base-origin-master refs/remotes/origin/master
+ git tag base-origin-main refs/remotes/origin/main
)
'
@@ -408,10 +569,10 @@
git branch -f side &&
(
cd three &&
- git update-ref refs/remotes/origin/master base-origin-master &&
- o=$(git rev-parse --verify refs/remotes/origin/master) &&
- git fetch origin master &&
- n=$(git rev-parse --verify refs/remotes/origin/master) &&
+ git update-ref refs/remotes/origin/main base-origin-main &&
+ o=$(git rev-parse --verify refs/remotes/origin/main) &&
+ git fetch origin main &&
+ n=$(git rev-parse --verify refs/remotes/origin/main) &&
test "$o" != "$n" &&
test_must_fail git rev-parse --verify refs/remotes/origin/side
)
@@ -423,10 +584,10 @@
git branch -f side &&
(
cd three &&
- git update-ref refs/remotes/origin/master base-origin-master &&
- o=$(git rev-parse --verify refs/remotes/origin/master) &&
- git pull origin master &&
- n=$(git rev-parse --verify refs/remotes/origin/master) &&
+ git update-ref refs/remotes/origin/main base-origin-main &&
+ o=$(git rev-parse --verify refs/remotes/origin/main) &&
+ git pull origin main &&
+ n=$(git rev-parse --verify refs/remotes/origin/main) &&
test "$o" != "$n" &&
test_must_fail git rev-parse --verify refs/remotes/origin/side
)
@@ -445,13 +606,13 @@
git branch -f side &&
(
cd three &&
- git update-ref refs/remotes/origin/master base-origin-master &&
- o=$(git rev-parse --verify refs/remotes/origin/master) &&
- git fetch --refmap="refs/heads/*:refs/remotes/other/*" origin master &&
- n=$(git rev-parse --verify refs/remotes/origin/master) &&
+ git update-ref refs/remotes/origin/main base-origin-main &&
+ o=$(git rev-parse --verify refs/remotes/origin/main) &&
+ git fetch --refmap="refs/heads/*:refs/remotes/other/*" origin main &&
+ n=$(git rev-parse --verify refs/remotes/origin/main) &&
test "$o" = "$n" &&
test_must_fail git rev-parse --verify refs/remotes/origin/side &&
- git rev-parse --verify refs/remotes/other/master
+ git rev-parse --verify refs/remotes/other/main
)
'
@@ -460,10 +621,10 @@
git branch -f side &&
(
cd three &&
- git update-ref refs/remotes/origin/master base-origin-master &&
- o=$(git rev-parse --verify refs/remotes/origin/master) &&
- git fetch --refmap="" origin master &&
- n=$(git rev-parse --verify refs/remotes/origin/master) &&
+ git update-ref refs/remotes/origin/main base-origin-main &&
+ o=$(git rev-parse --verify refs/remotes/origin/main) &&
+ git fetch --refmap="" origin main &&
+ n=$(git rev-parse --verify refs/remotes/origin/main) &&
test "$o" = "$n" &&
test_must_fail git rev-parse --verify refs/remotes/origin/side
)
@@ -475,10 +636,10 @@
git branch -f side &&
(
cd three &&
- git update-ref refs/remotes/origin/master base-origin-master &&
- o=$(git rev-parse --verify refs/remotes/origin/master) &&
+ git update-ref refs/remotes/origin/main base-origin-main &&
+ o=$(git rev-parse --verify refs/remotes/origin/main) &&
git fetch origin &&
- n=$(git rev-parse --verify refs/remotes/origin/master) &&
+ n=$(git rev-parse --verify refs/remotes/origin/main) &&
test "$o" != "$n" &&
git rev-parse --verify refs/remotes/origin/side
)
@@ -489,12 +650,12 @@
git update-ref refs/odd/location HEAD &&
(
cd three &&
- git update-ref refs/remotes/origin/master base-origin-master &&
+ git update-ref refs/remotes/origin/main base-origin-main &&
git config --add remote.origin.fetch \
refs/odd/location:refs/remotes/origin/odd &&
- o=$(git rev-parse --verify refs/remotes/origin/master) &&
- git fetch origin master &&
- n=$(git rev-parse --verify refs/remotes/origin/master) &&
+ o=$(git rev-parse --verify refs/remotes/origin/main) &&
+ git fetch origin main &&
+ n=$(git rev-parse --verify refs/remotes/origin/main) &&
test "$o" != "$n" &&
test_must_fail git rev-parse --verify refs/remotes/origin/odd
)
@@ -520,7 +681,7 @@
git tag -a -m $i excess-$i || exit 1
done
) &&
- git checkout master &&
+ git checkout main &&
(
cd follow &&
git fetch
@@ -529,20 +690,33 @@
test_expect_success 'refuse to fetch into the current branch' '
- test_must_fail git fetch . side:master
+ test_must_fail git fetch . side:main
'
test_expect_success 'fetch into the current branch with --update-head-ok' '
- git fetch --update-head-ok . side:master
+ git fetch --update-head-ok . side:main
'
-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
'
@@ -551,7 +725,7 @@
(
cd dups &&
git init &&
- git config branch.master.remote three &&
+ git config branch.main.remote three &&
git config remote.three.url ../three/.git &&
git config remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
git config --add remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
@@ -797,7 +971,7 @@
"--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 ""
@@ -860,14 +1034,12 @@
test_commit oneside &&
git checkout HEAD^ &&
test_commit otherside &&
- git checkout master &&
+ git checkout main &&
test_tick &&
git merge otherside &&
ad=$(git log --no-walk --format=%ad HEAD) &&
- git bundle create twoside-boundary.bdl master --since="$ad" &&
- convert_bundle_to_pack <twoside-boundary.bdl >twoside-boundary.pack &&
- pack=$(git index-pack --fix-thin --stdin <twoside-boundary.pack) &&
- test_bundle_object_count .git/objects/pack/pack-${pack##pack }.pack 3
+ git bundle create twoside-boundary.bdl main --since="$ad" &&
+ test_bundle_object_count --thin twoside-boundary.bdl 3
'
test_expect_success 'fetch --prune prints the remotes url' '
@@ -879,7 +1051,7 @@
git fetch --prune origin 2>&1 | head -n1 >../actual
) &&
echo "From ${D}/." >expect &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'branchname D/F conflict resolved by --prune' '
@@ -919,13 +1091,13 @@
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
)
'
-test_expect_success C_LOCALE_OUTPUT 'fetch aligned output' '
+test_expect_success 'fetch aligned output' '
git clone . full-output &&
test_commit looooooooooooong-tag &&
(
@@ -934,13 +1106,13 @@
grep -e "->" actual | cut -c 22- >../actual
) &&
cat >expect <<-\EOF &&
- master -> origin/master
+ main -> origin/main
looooooooooooong-tag -> looooooooooooong-tag
EOF
test_cmp expect actual
'
-test_expect_success C_LOCALE_OUTPUT 'fetch compact output' '
+test_expect_success 'fetch compact output' '
git clone . compact &&
test_commit extraaa &&
(
@@ -949,7 +1121,7 @@
grep -e "->" actual | cut -c 22- >../actual
) &&
cat >expect <<-\EOF &&
- master -> origin/*
+ main -> origin/*
extraaa -> *
EOF
test_cmp expect actual
@@ -984,7 +1156,7 @@
USE_PROTOCOL_V2="$3"
rm -rf "$SERVER" client trace &&
- git init "$SERVER" &&
+ git init -b main "$SERVER" &&
test_commit -C "$SERVER" alpha_1 &&
test_commit -C "$SERVER" alpha_2 &&
git -C "$SERVER" checkout --orphan beta &&
@@ -1000,7 +1172,7 @@
fi &&
test_commit -C "$SERVER" beta_s &&
- git -C "$SERVER" checkout master &&
+ git -C "$SERVER" checkout main &&
test_commit -C "$SERVER" alpha_s &&
git -C "$SERVER" tag -d alpha_1 alpha_2 beta_1 beta_2
}
diff --git a/t/t5511-refspec.sh b/t/t5511-refspec.sh
index f541f30..be025b9 100755
--- a/t/t5511-refspec.sh
+++ b/t/t5511-refspec.sh
@@ -33,7 +33,7 @@
test_refspec push 'refs/heads/*:refs/remotes/frotz/*'
test_refspec push 'refs/heads/*:refs/remotes/frotz' invalid
test_refspec push 'refs/heads:refs/remotes/frotz/*' invalid
-test_refspec push 'refs/heads/master:refs/remotes/frotz/xyzzy'
+test_refspec push 'refs/heads/main:refs/remotes/frotz/xyzzy'
# These have invalid LHS, but we do not have a formal "valid sha-1
@@ -41,23 +41,25 @@
# code. They will be caught downstream anyway, but we may want to
# have tighter check later...
-: test_refspec push 'refs/heads/master::refs/remotes/frotz/xyzzy' invalid
+: test_refspec push 'refs/heads/main::refs/remotes/frotz/xyzzy' invalid
: test_refspec push 'refs/heads/maste :refs/remotes/frotz/xyzzy' invalid
test_refspec fetch 'refs/heads/*:refs/remotes/frotz/*'
test_refspec fetch 'refs/heads/*:refs/remotes/frotz' invalid
test_refspec fetch 'refs/heads:refs/remotes/frotz/*' invalid
-test_refspec fetch 'refs/heads/master:refs/remotes/frotz/xyzzy'
-test_refspec fetch 'refs/heads/master::refs/remotes/frotz/xyzzy' invalid
+test_refspec fetch 'refs/heads/main:refs/remotes/frotz/xyzzy'
+test_refspec fetch 'refs/heads/main::refs/remotes/frotz/xyzzy' invalid
test_refspec fetch 'refs/heads/maste :refs/remotes/frotz/xyzzy' invalid
-test_refspec push 'master~1:refs/remotes/frotz/backup'
-test_refspec fetch 'master~1:refs/remotes/frotz/backup' invalid
+test_refspec push 'main~1:refs/remotes/frotz/backup'
+test_refspec fetch 'main~1:refs/remotes/frotz/backup' invalid
test_refspec push 'HEAD~4:refs/remotes/frotz/new'
test_refspec fetch 'HEAD~4:refs/remotes/frotz/new' invalid
test_refspec push 'HEAD'
test_refspec fetch 'HEAD'
+test_refspec push '@'
+test_refspec fetch '@'
test_refspec push 'refs/heads/ nitfol' invalid
test_refspec fetch 'refs/heads/ nitfol' invalid
diff --git a/t/t5512-ls-remote.sh b/t/t5512-ls-remote.sh
index 04b3540..f53f588 100755
--- a/t/t5512-ls-remote.sh
+++ b/t/t5512-ls-remote.sh
@@ -2,8 +2,19 @@
test_description='git ls-remote'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./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 +24,11 @@
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 +54,31 @@
'
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 +100,7 @@
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' '
@@ -113,7 +121,7 @@
echo "From $URL" >exp_err &&
git remote add other $URL &&
- git config branch.master.remote other &&
+ git config branch.main.remote other &&
git ls-remote 2>actual_err >actual &&
test_cmp exp_err actual_err &&
@@ -124,9 +132,9 @@
if test_have_prereq MINGW
then
# Windows does not like asterisks in pathname
- does_not_exist=master
+ does_not_exist=main
else
- does_not_exist="refs*master"
+ does_not_exist="refs*main"
fi &&
cat >exp <<-EOF &&
fatal: '\''$does_not_exist'\'' does not appear to be a git repository
@@ -139,10 +147,10 @@
# Do not expect "git ls-remote <pattern>" to work; ls-remote needs
# <remote> if you want to feed <pattern>, just like you cannot say
# fetch <branch>.
- # We could just as easily have used "master"; the "*" emphasizes its
+ # We could just as easily have used "main"; the "*" emphasizes its
# role as a pattern.
test_must_fail git ls-remote "$does_not_exist" >actual 2>&1 &&
- test_i18ncmp exp actual
+ test_cmp exp actual
'
test_expect_success 'die with non-2 for wrong repository even with --exit-code' '
@@ -180,8 +188,8 @@
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,17 +220,18 @@
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/main HEAD" >expect &&
+ generate_references \
+ HEAD \
+ refs/heads/main >>expect &&
+ oid=$(git rev-parse HEAD) &&
+ echo "$oid refs/remotes/origin/HEAD" >>expect &&
+ generate_references \
+ refs/remotes/origin/main \
+ 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=0 git ls-remote --symref >actual &&
@@ -232,7 +241,7 @@
test_expect_success 'ls-remote with filtered symref (refname)' '
rev=$(git rev-parse HEAD) &&
cat >expect <<-EOF &&
- ref: refs/heads/master HEAD
+ ref: refs/heads/main HEAD
$rev HEAD
EOF
# Protocol v2 supports sending symrefs for refs other than HEAD, so use
@@ -246,7 +255,7 @@
cat >expect <<-EOF &&
ref: refs/tags/mark refs/heads/foo
$rev refs/heads/foo
- $rev refs/heads/master
+ $rev refs/heads/main
EOF
# Protocol v2 supports sending symrefs for refs other than HEAD, so use
# protocol v0 here.
@@ -257,7 +266,7 @@
test_expect_success 'ls-remote --symref omits filtered-out matches' '
cat >expect <<-EOF &&
$rev refs/heads/foo
- $rev refs/heads/master
+ $rev refs/heads/main
EOF
# Protocol v2 supports sending symrefs for refs other than HEAD, so use
# protocol v0 here.
@@ -324,10 +333,10 @@
test_expect_success 'ls-remote patterns work with all protocol versions' '
git for-each-ref --format="%(objectname) %(refname)" \
- refs/heads/master refs/remotes/origin/master >expect &&
- git -c protocol.version=1 ls-remote . master >actual.v1 &&
+ refs/heads/main refs/remotes/origin/main >expect &&
+ git -c protocol.version=1 ls-remote . main >actual.v1 &&
test_cmp expect actual.v1 &&
- git -c protocol.version=2 ls-remote . master >actual.v2 &&
+ git -c protocol.version=2 ls-remote . main >actual.v2 &&
test_cmp expect actual.v2
'
diff --git a/t/t5514-fetch-multiple.sh b/t/t5514-fetch-multiple.sh
index de8e2f1..511ba3b 100755
--- a/t/t5514-fetch-multiple.sh
+++ b/t/t5514-fetch-multiple.sh
@@ -2,6 +2,9 @@
test_description='fetch --all works correctly'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
setup_repository () {
@@ -17,7 +20,7 @@
git add elif &&
test_tick &&
git commit -m "Second" &&
- git checkout master
+ git checkout main
)
}
@@ -32,16 +35,16 @@
'
cat > test/expect << EOF
- one/master
+ one/main
one/side
- origin/HEAD -> origin/master
- origin/master
+ origin/HEAD -> origin/main
+ origin/main
origin/side
three/another
- three/master
+ three/main
three/side
two/another
- two/master
+ two/main
two/side
EOF
@@ -70,15 +73,15 @@
test_expect_success 'git fetch --all does not allow non-option arguments' '
(cd test &&
test_must_fail git fetch --all origin &&
- test_must_fail git fetch --all origin master)
+ test_must_fail git fetch --all origin main)
'
cat > expect << EOF
- origin/HEAD -> origin/master
- origin/master
+ origin/HEAD -> origin/main
+ origin/main
origin/side
three/another
- three/master
+ three/main
three/side
EOF
@@ -92,10 +95,10 @@
'
cat > expect << EOF
- one/master
+ one/main
one/side
two/another
- two/master
+ two/main
two/side
EOF
@@ -108,7 +111,7 @@
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
)
'
@@ -133,13 +136,13 @@
'
cat > expect << EOF
- one/master
+ one/main
one/side
three/another
- three/master
+ three/main
three/side
two/another
- two/master
+ two/main
two/side
EOF
diff --git a/t/t5515-fetch-merge-logic.sh b/t/t5515-fetch-merge-logic.sh
index 9d6a46f..50f1410 100755
--- a/t/t5515-fetch-merge-logic.sh
+++ b/t/t5515-fetch-merge-logic.sh
@@ -11,11 +11,14 @@
GIT_TEST_PROTOCOL_VERSION=0
export GIT_TEST_PROTOCOL_VERSION
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
build_script () {
script="$1" &&
- for i in one three_file master master2 one_tree three two two2 three2
+ for i in one three_file main topic_2 one_tree three two two2 three2
do
echo "s/$(test_oid --hash=sha1 "$i")/$(test_oid "$i")/g" >>"$script"
done
@@ -40,8 +43,8 @@
three_file sha1:0e3b14047d3ee365f4f2a1b673db059c3972589c
three_file sha256:bc4447d50c07497a8bfe6eef817f2364ecca9d471452e43b52756cc1a908bd32
- master sha1:6c9dec2b923228c9ff994c6cfe4ae16c12408dc5
- master sha256:8521c3072461fcfe8f32d67f95cc6e6b832a2db2fa29769ffc788bce85ebcd75
+ main sha1:ecf3b3627b498bdcb735cc4343bf165f76964e9a
+ main sha256:fff666109892bb4b1c80cd1649d2d8762a0663db8b5d46c8be98360b64fbba5f
one_tree sha1:22feea448b023a2d864ef94b013735af34d238ba
one_tree sha256:6e4743f4ef2356b881dda5e91f5c7cdffe870faf350bf7b312f80a20935f5d83
@@ -52,8 +55,8 @@
two sha1:525b7fb068d59950d185a8779dc957c77eed73ba
two sha256:3b21de3440cd38c2a9e9b464adb923f7054949ed4c918e1a0ac4c95cd52774db
- master2 sha1:754b754407bf032e9a2f9d5a9ad05ca79a6b228f
- master2 sha256:6c7abaea8a6d8ef4d89877e68462758dc6774690fbbbb0e6d7dd57415c9abde0
+ topic_2 sha1:b4ab76b1a01ea602209932134a44f1e6bd610832
+ topic_2 sha256:380ebae0113f877ce46fcdf39d5bc33e4dc0928db5c5a4d5fdc78381c4d55ae3
two2 sha1:6134ee8f857693b96ff1cc98d3e2fd62b199e5a8
two2 sha256:87a2d3ee29c83a3dc7afd41c0606b11f67603120b910a7be7840accdc18344d4
@@ -80,9 +83,9 @@
git tag -a -m "Tag Three file" tag-three-file HEAD^{tree}:file &&
git branch three &&
- echo master >> file &&
- git commit -a -m Master &&
- git tag -a -m "Tag Master" tag-master &&
+ echo main >> file &&
+ git commit -a -m Main &&
+ git tag -a -m "Tag Main" tag-main &&
git checkout three &&
@@ -91,7 +94,7 @@
git config remote.origin.url ../.git/ &&
git config remote.config-explicit.url ../.git/ &&
- git config remote.config-explicit.fetch refs/heads/master:remotes/rem/master &&
+ git config remote.config-explicit.fetch refs/heads/main:remotes/rem/main &&
git config --add remote.config-explicit.fetch refs/heads/one:remotes/rem/one &&
git config --add remote.config-explicit.fetch two:remotes/rem/two &&
git config --add remote.config-explicit.fetch refs/heads/three:remotes/rem/three &&
@@ -104,7 +107,7 @@
mkdir -p .git/remotes &&
{
echo "URL: ../.git/"
- echo "Pull: refs/heads/master:remotes/rem/master"
+ echo "Pull: refs/heads/main:remotes/rem/main"
echo "Pull: refs/heads/one:remotes/rem/one"
echo "Pull: two:remotes/rem/two"
echo "Pull: refs/heads/three:remotes/rem/three"
@@ -149,7 +152,7 @@
# but does depend on Pull: or fetch lines.
# Use two branches completely unrelated from the arguments,
# the clone default and one without branch properties
-for branch in master br-unconfig ; do
+for branch in main br-unconfig ; do
echo $branch
for remote in $remotes ; do
echo $branch $remote
@@ -158,7 +161,7 @@
# Merge logic does not depend on branch properties
# neither in the Pull: or .fetch config
-for branch in master br-unconfig ; do
+for branch in main br-unconfig ; do
cat <<EOF
$branch ../.git
$branch ../.git one
diff --git a/t/t5515/fetch.br-branches-default b/t/t5515/fetch.br-branches-default
index a1bc3d5..0bed09c 100644
--- a/t/t5515/fetch.br-branches-default
+++ b/t/t5515/fetch.br-branches-default
@@ -1,6 +1,6 @@
# br-branches-default
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f branch 'master' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832 branch 'main' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-branches-default-merge b/t/t5515/fetch.br-branches-default-merge
index 12ab08e..59eef63 100644
--- a/t/t5515/fetch.br-branches-default-merge
+++ b/t/t5515/fetch.br-branches-default-merge
@@ -1,7 +1,7 @@
# br-branches-default-merge
0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832 not-for-merge branch 'main' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-branches-default-merge_branches-default b/t/t5515/fetch.br-branches-default-merge_branches-default
index 5442752..490186c 100644
--- a/t/t5515/fetch.br-branches-default-merge_branches-default
+++ b/t/t5515/fetch.br-branches-default-merge_branches-default
@@ -1,7 +1,7 @@
# br-branches-default-merge branches-default
0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832 not-for-merge branch 'main' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-branches-default-octopus b/t/t5515/fetch.br-branches-default-octopus
index 498a761..d484138 100644
--- a/t/t5515/fetch.br-branches-default-octopus
+++ b/t/t5515/fetch.br-branches-default-octopus
@@ -1,8 +1,8 @@
# br-branches-default-octopus
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832 not-for-merge branch 'main' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-branches-default-octopus_branches-default b/t/t5515/fetch.br-branches-default-octopus_branches-default
index 0857f13..b79a5fe 100644
--- a/t/t5515/fetch.br-branches-default-octopus_branches-default
+++ b/t/t5515/fetch.br-branches-default-octopus_branches-default
@@ -1,8 +1,8 @@
# br-branches-default-octopus branches-default
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832 not-for-merge branch 'main' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-branches-default_branches-default b/t/t5515/fetch.br-branches-default_branches-default
index 8cbd718..1c866d8 100644
--- a/t/t5515/fetch.br-branches-default_branches-default
+++ b/t/t5515/fetch.br-branches-default_branches-default
@@ -1,6 +1,6 @@
# br-branches-default branches-default
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f branch 'master' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832 branch 'main' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-branches-one b/t/t5515/fetch.br-branches-one
index c98f670..6925a77 100644
--- a/t/t5515/fetch.br-branches-one
+++ b/t/t5515/fetch.br-branches-one
@@ -1,6 +1,6 @@
# br-branches-one
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-branches-one-merge b/t/t5515/fetch.br-branches-one-merge
index 54a7742..8525703 100644
--- a/t/t5515/fetch.br-branches-one-merge
+++ b/t/t5515/fetch.br-branches-one-merge
@@ -1,7 +1,7 @@
# br-branches-one-merge
0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-branches-one-merge_branches-one b/t/t5515/fetch.br-branches-one-merge_branches-one
index b4d1bb0..3a63a7f 100644
--- a/t/t5515/fetch.br-branches-one-merge_branches-one
+++ b/t/t5515/fetch.br-branches-one-merge_branches-one
@@ -1,7 +1,7 @@
# br-branches-one-merge branches-one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-branches-one-octopus b/t/t5515/fetch.br-branches-one-octopus
index 97c4b54..46af763 100644
--- a/t/t5515/fetch.br-branches-one-octopus
+++ b/t/t5515/fetch.br-branches-one-octopus
@@ -1,7 +1,7 @@
# br-branches-one-octopus
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-branches-one-octopus_branches-one b/t/t5515/fetch.br-branches-one-octopus_branches-one
index df705f7..becfde9 100644
--- a/t/t5515/fetch.br-branches-one-octopus_branches-one
+++ b/t/t5515/fetch.br-branches-one-octopus_branches-one
@@ -1,7 +1,7 @@
# br-branches-one-octopus branches-one
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-branches-one_branches-one b/t/t5515/fetch.br-branches-one_branches-one
index 96890e5..9ba34c6 100644
--- a/t/t5515/fetch.br-branches-one_branches-one
+++ b/t/t5515/fetch.br-branches-one_branches-one
@@ -1,6 +1,6 @@
# br-branches-one branches-one
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-config-explicit b/t/t5515/fetch.br-config-explicit
index 68fc927..7466a73 100644
--- a/t/t5515/fetch.br-config-explicit
+++ b/t/t5515/fetch.br-config-explicit
@@ -1,9 +1,9 @@
# br-config-explicit
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832 branch 'main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-config-explicit-merge b/t/t5515/fetch.br-config-explicit-merge
index 5ce764a..9375b7d 100644
--- a/t/t5515/fetch.br-config-explicit-merge
+++ b/t/t5515/fetch.br-config-explicit-merge
@@ -1,9 +1,9 @@
# br-config-explicit-merge
0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832 not-for-merge branch 'main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-config-explicit-merge_config-explicit b/t/t5515/fetch.br-config-explicit-merge_config-explicit
index b1152b7..6335e2b 100644
--- a/t/t5515/fetch.br-config-explicit-merge_config-explicit
+++ b/t/t5515/fetch.br-config-explicit-merge_config-explicit
@@ -1,9 +1,9 @@
# br-config-explicit-merge config-explicit
0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832 not-for-merge branch 'main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-config-explicit-octopus b/t/t5515/fetch.br-config-explicit-octopus
index 110577b..c379aa9 100644
--- a/t/t5515/fetch.br-config-explicit-octopus
+++ b/t/t5515/fetch.br-config-explicit-octopus
@@ -1,9 +1,9 @@
# br-config-explicit-octopus
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832 not-for-merge branch 'main' of ../
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-config-explicit-octopus_config-explicit b/t/t5515/fetch.br-config-explicit-octopus_config-explicit
index a29dd8b..7fb3a3e 100644
--- a/t/t5515/fetch.br-config-explicit-octopus_config-explicit
+++ b/t/t5515/fetch.br-config-explicit-octopus_config-explicit
@@ -1,9 +1,9 @@
# br-config-explicit-octopus config-explicit
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832 not-for-merge branch 'main' of ../
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-config-explicit_config-explicit b/t/t5515/fetch.br-config-explicit_config-explicit
index b19b016..86045a7 100644
--- a/t/t5515/fetch.br-config-explicit_config-explicit
+++ b/t/t5515/fetch.br-config-explicit_config-explicit
@@ -1,9 +1,9 @@
# br-config-explicit config-explicit
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832 branch 'main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-config-glob b/t/t5515/fetch.br-config-glob
index 946d70c..bfeef2b 100644
--- a/t/t5515/fetch.br-config-glob
+++ b/t/t5515/fetch.br-config-glob
@@ -1,9 +1,9 @@
# br-config-glob
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832 not-for-merge branch 'main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-config-glob-merge b/t/t5515/fetch.br-config-glob-merge
index 89f2596..5376a4a 100644
--- a/t/t5515/fetch.br-config-glob-merge
+++ b/t/t5515/fetch.br-config-glob-merge
@@ -1,9 +1,9 @@
# br-config-glob-merge
0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832 not-for-merge branch 'main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-config-glob-merge_config-glob b/t/t5515/fetch.br-config-glob-merge_config-glob
index 2ba4832..7dfc2fe 100644
--- a/t/t5515/fetch.br-config-glob-merge_config-glob
+++ b/t/t5515/fetch.br-config-glob-merge_config-glob
@@ -1,9 +1,9 @@
# br-config-glob-merge config-glob
0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832 not-for-merge branch 'main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-config-glob-octopus b/t/t5515/fetch.br-config-glob-octopus
index 64994df..1084030 100644
--- a/t/t5515/fetch.br-config-glob-octopus
+++ b/t/t5515/fetch.br-config-glob-octopus
@@ -1,9 +1,9 @@
# br-config-glob-octopus
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832 not-for-merge branch 'main' of ../
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-config-glob-octopus_config-glob b/t/t5515/fetch.br-config-glob-octopus_config-glob
index 681a725..839866d 100644
--- a/t/t5515/fetch.br-config-glob-octopus_config-glob
+++ b/t/t5515/fetch.br-config-glob-octopus_config-glob
@@ -1,9 +1,9 @@
# br-config-glob-octopus config-glob
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832 not-for-merge branch 'main' of ../
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-config-glob_config-glob b/t/t5515/fetch.br-config-glob_config-glob
index 19daf0c..7b0cb91 100644
--- a/t/t5515/fetch.br-config-glob_config-glob
+++ b/t/t5515/fetch.br-config-glob_config-glob
@@ -1,9 +1,9 @@
# br-config-glob config-glob
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832 not-for-merge branch 'main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-remote-explicit b/t/t5515/fetch.br-remote-explicit
index ab44bc5..d6619e7 100644
--- a/t/t5515/fetch.br-remote-explicit
+++ b/t/t5515/fetch.br-remote-explicit
@@ -1,9 +1,9 @@
# br-remote-explicit
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832 branch 'main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-remote-explicit-merge b/t/t5515/fetch.br-remote-explicit-merge
index d018b35..5b49b7c 100644
--- a/t/t5515/fetch.br-remote-explicit-merge
+++ b/t/t5515/fetch.br-remote-explicit-merge
@@ -1,9 +1,9 @@
# br-remote-explicit-merge
0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832 not-for-merge branch 'main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-remote-explicit-merge_remote-explicit b/t/t5515/fetch.br-remote-explicit-merge_remote-explicit
index 0d3d780..417261d 100644
--- a/t/t5515/fetch.br-remote-explicit-merge_remote-explicit
+++ b/t/t5515/fetch.br-remote-explicit-merge_remote-explicit
@@ -1,9 +1,9 @@
# br-remote-explicit-merge remote-explicit
0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832 not-for-merge branch 'main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-remote-explicit-octopus b/t/t5515/fetch.br-remote-explicit-octopus
index 6f84304..2edef64 100644
--- a/t/t5515/fetch.br-remote-explicit-octopus
+++ b/t/t5515/fetch.br-remote-explicit-octopus
@@ -1,9 +1,9 @@
# br-remote-explicit-octopus
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832 not-for-merge branch 'main' of ../
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-remote-explicit-octopus_remote-explicit b/t/t5515/fetch.br-remote-explicit-octopus_remote-explicit
index 3546a83..ceb8752 100644
--- a/t/t5515/fetch.br-remote-explicit-octopus_remote-explicit
+++ b/t/t5515/fetch.br-remote-explicit-octopus_remote-explicit
@@ -1,9 +1,9 @@
# br-remote-explicit-octopus remote-explicit
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832 not-for-merge branch 'main' of ../
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-remote-explicit_remote-explicit b/t/t5515/fetch.br-remote-explicit_remote-explicit
index 01e014e..b7abbd2 100644
--- a/t/t5515/fetch.br-remote-explicit_remote-explicit
+++ b/t/t5515/fetch.br-remote-explicit_remote-explicit
@@ -1,9 +1,9 @@
# br-remote-explicit remote-explicit
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832 branch 'main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-remote-glob b/t/t5515/fetch.br-remote-glob
index 09bfcee..645412c 100644
--- a/t/t5515/fetch.br-remote-glob
+++ b/t/t5515/fetch.br-remote-glob
@@ -1,9 +1,9 @@
# br-remote-glob
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832 not-for-merge branch 'main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-remote-glob-merge b/t/t5515/fetch.br-remote-glob-merge
index 7e1a433..8512cfd 100644
--- a/t/t5515/fetch.br-remote-glob-merge
+++ b/t/t5515/fetch.br-remote-glob-merge
@@ -1,9 +1,9 @@
# br-remote-glob-merge
0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832 not-for-merge branch 'main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-remote-glob-merge_remote-glob b/t/t5515/fetch.br-remote-glob-merge_remote-glob
index 53571bb..7394164 100644
--- a/t/t5515/fetch.br-remote-glob-merge_remote-glob
+++ b/t/t5515/fetch.br-remote-glob-merge_remote-glob
@@ -1,9 +1,9 @@
# br-remote-glob-merge remote-glob
0567da4d5edd2ff4bb292a465ba9e64dcad9536b branch 'three' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832 not-for-merge branch 'main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-remote-glob-octopus b/t/t5515/fetch.br-remote-glob-octopus
index c7c8b6d..0ca4719 100644
--- a/t/t5515/fetch.br-remote-glob-octopus
+++ b/t/t5515/fetch.br-remote-glob-octopus
@@ -1,9 +1,9 @@
# br-remote-glob-octopus
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832 not-for-merge branch 'main' of ../
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-remote-glob-octopus_remote-glob b/t/t5515/fetch.br-remote-glob-octopus_remote-glob
index 36076fb..7e7b0ba 100644
--- a/t/t5515/fetch.br-remote-glob-octopus_remote-glob
+++ b/t/t5515/fetch.br-remote-glob-octopus_remote-glob
@@ -1,9 +1,9 @@
# br-remote-glob-octopus remote-glob
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832 not-for-merge branch 'main' of ../
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-remote-glob_remote-glob b/t/t5515/fetch.br-remote-glob_remote-glob
index 20ba5cb..7bae5ec 100644
--- a/t/t5515/fetch.br-remote-glob_remote-glob
+++ b/t/t5515/fetch.br-remote-glob_remote-glob
@@ -1,9 +1,9 @@
# br-remote-glob remote-glob
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832 not-for-merge branch 'main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-unconfig b/t/t5515/fetch.br-unconfig
index 887ccfc..ccaa54f 100644
--- a/t/t5515/fetch.br-unconfig
+++ b/t/t5515/fetch.br-unconfig
@@ -1,9 +1,9 @@
# br-unconfig
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832 not-for-merge branch 'main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-unconfig_--tags_.._.git b/t/t5515/fetch.br-unconfig_--tags_.._.git
index 0f70f66..3afb4f8 100644
--- a/t/t5515/fetch.br-unconfig_--tags_.._.git
+++ b/t/t5515/fetch.br-unconfig_--tags_.._.git
@@ -1,6 +1,6 @@
# br-unconfig --tags ../.git
0567da4d5edd2ff4bb292a465ba9e64dcad9536b ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-unconfig_.._.git_one_tag_tag-one_tag_tag-three-file b/t/t5515/fetch.br-unconfig_.._.git_one_tag_tag-one_tag_tag-three-file
index 7411536..525713a 100644
--- a/t/t5515/fetch.br-unconfig_.._.git_one_tag_tag-one_tag_tag-three-file
+++ b/t/t5515/fetch.br-unconfig_.._.git_one_tag_tag-one_tag_tag-three-file
@@ -2,7 +2,7 @@
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 tag 'tag-one' of ../
0e3b14047d3ee365f4f2a1b673db059c3972589c not-for-merge tag 'tag-three-file' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
525b7fb068d59950d185a8779dc957c77eed73ba not-for-merge tag 'tag-two' of ../
diff --git a/t/t5515/fetch.br-unconfig_.._.git_tag_tag-one-tree_tag_tag-three-file b/t/t5515/fetch.br-unconfig_.._.git_tag_tag-one-tree_tag_tag-three-file
index 7726983..18c871f 100644
--- a/t/t5515/fetch.br-unconfig_.._.git_tag_tag-one-tree_tag_tag-three-file
+++ b/t/t5515/fetch.br-unconfig_.._.git_tag_tag-one-tree_tag_tag-three-file
@@ -1,7 +1,7 @@
# br-unconfig ../.git tag tag-one-tree tag tag-three-file
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
0e3b14047d3ee365f4f2a1b673db059c3972589c not-for-merge tag 'tag-three-file' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
525b7fb068d59950d185a8779dc957c77eed73ba not-for-merge tag 'tag-two' of ../
diff --git a/t/t5515/fetch.br-unconfig_.._.git_tag_tag-one_tag_tag-three b/t/t5515/fetch.br-unconfig_.._.git_tag_tag-one_tag_tag-three
index 7b3750c..7328d30 100644
--- a/t/t5515/fetch.br-unconfig_.._.git_tag_tag-one_tag_tag-three
+++ b/t/t5515/fetch.br-unconfig_.._.git_tag_tag-one_tag_tag-three
@@ -1,7 +1,7 @@
# br-unconfig ../.git tag tag-one tag tag-three
8e32a6d901327a23ef831511badce7bf3bf46689 tag 'tag-one' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 tag 'tag-three' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
0e3b14047d3ee365f4f2a1b673db059c3972589c not-for-merge tag 'tag-three-file' of ../
525b7fb068d59950d185a8779dc957c77eed73ba not-for-merge tag 'tag-two' of ../
diff --git a/t/t5515/fetch.br-unconfig_branches-default b/t/t5515/fetch.br-unconfig_branches-default
index da30e3c..3d82f94 100644
--- a/t/t5515/fetch.br-unconfig_branches-default
+++ b/t/t5515/fetch.br-unconfig_branches-default
@@ -1,6 +1,6 @@
# br-unconfig branches-default
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f branch 'master' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832 branch 'main' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-unconfig_branches-one b/t/t5515/fetch.br-unconfig_branches-one
index e461431..948ed0c 100644
--- a/t/t5515/fetch.br-unconfig_branches-one
+++ b/t/t5515/fetch.br-unconfig_branches-one
@@ -1,6 +1,6 @@
# br-unconfig branches-one
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-unconfig_config-explicit b/t/t5515/fetch.br-unconfig_config-explicit
index ed323c9..65aaec8 100644
--- a/t/t5515/fetch.br-unconfig_config-explicit
+++ b/t/t5515/fetch.br-unconfig_config-explicit
@@ -1,9 +1,9 @@
# br-unconfig config-explicit
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832 branch 'main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-unconfig_config-glob b/t/t5515/fetch.br-unconfig_config-glob
index 2372ed0..1aa3d45 100644
--- a/t/t5515/fetch.br-unconfig_config-glob
+++ b/t/t5515/fetch.br-unconfig_config-glob
@@ -1,9 +1,9 @@
# br-unconfig config-glob
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832 not-for-merge branch 'main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-unconfig_remote-explicit b/t/t5515/fetch.br-unconfig_remote-explicit
index 6318dd1..16438d2 100644
--- a/t/t5515/fetch.br-unconfig_remote-explicit
+++ b/t/t5515/fetch.br-unconfig_remote-explicit
@@ -1,9 +1,9 @@
# br-unconfig remote-explicit
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832 branch 'main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-unconfig_remote-glob b/t/t5515/fetch.br-unconfig_remote-glob
index 1d9afad..7a01d2e 100644
--- a/t/t5515/fetch.br-unconfig_remote-glob
+++ b/t/t5515/fetch.br-unconfig_remote-glob
@@ -1,9 +1,9 @@
# br-unconfig remote-glob
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832 not-for-merge branch 'main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.master b/t/t5515/fetch.main
similarity index 78%
rename from t/t5515/fetch.master
rename to t/t5515/fetch.main
index 9b29d67..819ed33 100644
--- a/t/t5515/fetch.master
+++ b/t/t5515/fetch.main
@@ -1,9 +1,9 @@
-# master
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
+# main
+b4ab76b1a01ea602209932134a44f1e6bd610832 not-for-merge branch 'main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.master_--tags_.._.git b/t/t5515/fetch.main_--tags_.._.git
similarity index 80%
rename from t/t5515/fetch.master_--tags_.._.git
rename to t/t5515/fetch.main_--tags_.._.git
index ab473a6..ddf67a6 100644
--- a/t/t5515/fetch.master_--tags_.._.git
+++ b/t/t5515/fetch.main_--tags_.._.git
@@ -1,6 +1,6 @@
-# master --tags ../.git
+# main --tags ../.git
0567da4d5edd2ff4bb292a465ba9e64dcad9536b ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.master_.._.git b/t/t5515/fetch.main_.._.git
similarity index 72%
rename from t/t5515/fetch.master_.._.git
rename to t/t5515/fetch.main_.._.git
index 66d1aad..285e57e 100644
--- a/t/t5515/fetch.master_.._.git
+++ b/t/t5515/fetch.main_.._.git
@@ -1,2 +1,2 @@
-# master ../.git
+# main ../.git
0567da4d5edd2ff4bb292a465ba9e64dcad9536b ../
diff --git a/t/t5515/fetch.master_.._.git_one b/t/t5515/fetch.main_.._.git_one
similarity index 74%
rename from t/t5515/fetch.master_.._.git_one
rename to t/t5515/fetch.main_.._.git_one
index 35deddb..f9f511e 100644
--- a/t/t5515/fetch.master_.._.git_one
+++ b/t/t5515/fetch.main_.._.git_one
@@ -1,2 +1,2 @@
-# master ../.git one
+# main ../.git one
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
diff --git a/t/t5515/fetch.master_.._.git_one_tag_tag-one_tag_tag-three-file b/t/t5515/fetch.main_.._.git_one_tag_tag-one_tag_tag-three-file
similarity index 77%
rename from t/t5515/fetch.master_.._.git_one_tag_tag-one_tag_tag-three-file
rename to t/t5515/fetch.main_.._.git_one_tag_tag-one_tag_tag-three-file
index 0672d12..187643e 100644
--- a/t/t5515/fetch.master_.._.git_one_tag_tag-one_tag_tag-three-file
+++ b/t/t5515/fetch.main_.._.git_one_tag_tag-one_tag_tag-three-file
@@ -1,8 +1,8 @@
-# master ../.git one tag tag-one tag tag-three-file
+# main ../.git one tag tag-one tag tag-three-file
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 tag 'tag-one' of ../
0e3b14047d3ee365f4f2a1b673db059c3972589c not-for-merge tag 'tag-three-file' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
525b7fb068d59950d185a8779dc957c77eed73ba not-for-merge tag 'tag-two' of ../
diff --git a/t/t5515/fetch.master_.._.git_one_two b/t/t5515/fetch.main_.._.git_one_two
similarity index 83%
rename from t/t5515/fetch.master_.._.git_one_two
rename to t/t5515/fetch.main_.._.git_one_two
index 35ec578..048ad97 100644
--- a/t/t5515/fetch.master_.._.git_one_two
+++ b/t/t5515/fetch.main_.._.git_one_two
@@ -1,3 +1,3 @@
-# master ../.git one two
+# main ../.git one two
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
diff --git a/t/t5515/fetch.master_.._.git_tag_tag-one-tree_tag_tag-three-file b/t/t5515/fetch.main_.._.git_tag_tag-one-tree_tag_tag-three-file
similarity index 75%
rename from t/t5515/fetch.master_.._.git_tag_tag-one-tree_tag_tag-three-file
rename to t/t5515/fetch.main_.._.git_tag_tag-one-tree_tag_tag-three-file
index 0fd737c..df5f2a7 100644
--- a/t/t5515/fetch.master_.._.git_tag_tag-one-tree_tag_tag-three-file
+++ b/t/t5515/fetch.main_.._.git_tag_tag-one-tree_tag_tag-three-file
@@ -1,7 +1,7 @@
-# master ../.git tag tag-one-tree tag tag-three-file
+# main ../.git tag tag-one-tree tag tag-three-file
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
0e3b14047d3ee365f4f2a1b673db059c3972589c not-for-merge tag 'tag-three-file' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
525b7fb068d59950d185a8779dc957c77eed73ba not-for-merge tag 'tag-two' of ../
diff --git a/t/t5515/fetch.master_.._.git_tag_tag-one_tag_tag-three b/t/t5515/fetch.main_.._.git_tag_tag-one_tag_tag-three
similarity index 75%
rename from t/t5515/fetch.master_.._.git_tag_tag-one_tag_tag-three
rename to t/t5515/fetch.main_.._.git_tag_tag-one_tag_tag-three
index e488986..a40b728 100644
--- a/t/t5515/fetch.master_.._.git_tag_tag-one_tag_tag-three
+++ b/t/t5515/fetch.main_.._.git_tag_tag-one_tag_tag-three
@@ -1,7 +1,7 @@
-# master ../.git tag tag-one tag tag-three
+# main ../.git tag tag-one tag tag-three
8e32a6d901327a23ef831511badce7bf3bf46689 tag 'tag-one' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 tag 'tag-three' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
0e3b14047d3ee365f4f2a1b673db059c3972589c not-for-merge tag 'tag-three-file' of ../
525b7fb068d59950d185a8779dc957c77eed73ba not-for-merge tag 'tag-two' of ../
diff --git a/t/t5515/fetch.master_branches-one b/t/t5515/fetch.main_branches-default
similarity index 70%
copy from t/t5515/fetch.master_branches-one
copy to t/t5515/fetch.main_branches-default
index 901ce21..e3466e8 100644
--- a/t/t5515/fetch.master_branches-one
+++ b/t/t5515/fetch.main_branches-default
@@ -1,6 +1,6 @@
-# master branches-one
-8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+# main branches-default
+b4ab76b1a01ea602209932134a44f1e6bd610832 branch 'main' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.master_branches-one b/t/t5515/fetch.main_branches-one
similarity index 81%
rename from t/t5515/fetch.master_branches-one
rename to t/t5515/fetch.main_branches-one
index 901ce21..a94f11a 100644
--- a/t/t5515/fetch.master_branches-one
+++ b/t/t5515/fetch.main_branches-one
@@ -1,6 +1,6 @@
-# master branches-one
+# main branches-one
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.master b/t/t5515/fetch.main_config-explicit
similarity index 78%
copy from t/t5515/fetch.master
copy to t/t5515/fetch.main_config-explicit
index 9b29d67..16d04c1 100644
--- a/t/t5515/fetch.master
+++ b/t/t5515/fetch.main_config-explicit
@@ -1,9 +1,9 @@
-# master
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
+# main config-explicit
+b4ab76b1a01ea602209932134a44f1e6bd610832 branch 'main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
-0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.master b/t/t5515/fetch.main_config-glob
similarity index 78%
copy from t/t5515/fetch.master
copy to t/t5515/fetch.main_config-glob
index 9b29d67..f6a6f56 100644
--- a/t/t5515/fetch.master
+++ b/t/t5515/fetch.main_config-glob
@@ -1,9 +1,9 @@
-# master
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
+# main config-glob
+b4ab76b1a01ea602209932134a44f1e6bd610832 not-for-merge branch 'main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.master b/t/t5515/fetch.main_remote-explicit
similarity index 78%
copy from t/t5515/fetch.master
copy to t/t5515/fetch.main_remote-explicit
index 9b29d67..bf4fd65 100644
--- a/t/t5515/fetch.master
+++ b/t/t5515/fetch.main_remote-explicit
@@ -1,9 +1,9 @@
-# master
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
+# main remote-explicit
+b4ab76b1a01ea602209932134a44f1e6bd610832 branch 'main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
-0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.master b/t/t5515/fetch.main_remote-glob
similarity index 78%
copy from t/t5515/fetch.master
copy to t/t5515/fetch.main_remote-glob
index 9b29d67..91dc2e2 100644
--- a/t/t5515/fetch.master
+++ b/t/t5515/fetch.main_remote-glob
@@ -1,9 +1,9 @@
-# master
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
+# main remote-glob
+b4ab76b1a01ea602209932134a44f1e6bd610832 not-for-merge branch 'main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a not-for-merge tag 'tag-main' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
diff --git a/t/t5515/fetch.master_branches-default b/t/t5515/fetch.master_branches-default
deleted file mode 100644
index 2eedd3b..0000000
--- a/t/t5515/fetch.master_branches-default
+++ /dev/null
@@ -1,8 +0,0 @@
-# master branches-default
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f branch 'master' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
-8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
-22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
-c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
-0e3b14047d3ee365f4f2a1b673db059c3972589c not-for-merge tag 'tag-three-file' of ../
-525b7fb068d59950d185a8779dc957c77eed73ba not-for-merge tag 'tag-two' of ../
diff --git a/t/t5515/fetch.master_config-explicit b/t/t5515/fetch.master_config-explicit
deleted file mode 100644
index 251c826..0000000
--- a/t/t5515/fetch.master_config-explicit
+++ /dev/null
@@ -1,11 +0,0 @@
-# master config-explicit
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f branch 'master' of ../
-8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
-6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
-0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
-8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
-22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
-c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
-0e3b14047d3ee365f4f2a1b673db059c3972589c not-for-merge tag 'tag-three-file' of ../
-525b7fb068d59950d185a8779dc957c77eed73ba not-for-merge tag 'tag-two' of ../
diff --git a/t/t5515/fetch.master_config-glob b/t/t5515/fetch.master_config-glob
deleted file mode 100644
index 27c158e..0000000
--- a/t/t5515/fetch.master_config-glob
+++ /dev/null
@@ -1,11 +0,0 @@
-# master config-glob
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
-8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
-0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
-6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
-8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
-22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
-c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
-0e3b14047d3ee365f4f2a1b673db059c3972589c not-for-merge tag 'tag-three-file' of ../
-525b7fb068d59950d185a8779dc957c77eed73ba not-for-merge tag 'tag-two' of ../
diff --git a/t/t5515/fetch.master_remote-explicit b/t/t5515/fetch.master_remote-explicit
deleted file mode 100644
index b3cfe6b..0000000
--- a/t/t5515/fetch.master_remote-explicit
+++ /dev/null
@@ -1,11 +0,0 @@
-# master remote-explicit
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f branch 'master' of ../
-8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
-6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
-0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
-8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
-22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
-c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
-0e3b14047d3ee365f4f2a1b673db059c3972589c not-for-merge tag 'tag-three-file' of ../
-525b7fb068d59950d185a8779dc957c77eed73ba not-for-merge tag 'tag-two' of ../
diff --git a/t/t5515/fetch.master_remote-glob b/t/t5515/fetch.master_remote-glob
deleted file mode 100644
index 118befd..0000000
--- a/t/t5515/fetch.master_remote-glob
+++ /dev/null
@@ -1,11 +0,0 @@
-# master remote-glob
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
-8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
-0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
-6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 not-for-merge tag 'tag-master' of ../
-8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
-22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
-c61a82b60967180544e3c19f819ddbd0c9f89899 not-for-merge tag 'tag-three' of ../
-0e3b14047d3ee365f4f2a1b673db059c3972589c not-for-merge tag 'tag-three-file' of ../
-525b7fb068d59950d185a8779dc957c77eed73ba not-for-merge tag 'tag-two' of ../
diff --git a/t/t5515/refs.br-branches-default b/t/t5515/refs.br-branches-default
index 21917c1..dc4f2b7 100644
--- a/t/t5515/refs.br-branches-default
+++ b/t/t5515/refs.br-branches-default
@@ -1,10 +1,10 @@
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/heads/branches-default
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/heads/branches-default
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-branches-default-merge b/t/t5515/refs.br-branches-default-merge
index 21917c1..dc4f2b7 100644
--- a/t/t5515/refs.br-branches-default-merge
+++ b/t/t5515/refs.br-branches-default-merge
@@ -1,10 +1,10 @@
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/heads/branches-default
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/heads/branches-default
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-branches-default-merge_branches-default b/t/t5515/refs.br-branches-default-merge_branches-default
index 21917c1..dc4f2b7 100644
--- a/t/t5515/refs.br-branches-default-merge_branches-default
+++ b/t/t5515/refs.br-branches-default-merge_branches-default
@@ -1,10 +1,10 @@
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/heads/branches-default
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/heads/branches-default
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-branches-default-octopus b/t/t5515/refs.br-branches-default-octopus
index 21917c1..dc4f2b7 100644
--- a/t/t5515/refs.br-branches-default-octopus
+++ b/t/t5515/refs.br-branches-default-octopus
@@ -1,10 +1,10 @@
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/heads/branches-default
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/heads/branches-default
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-branches-default-octopus_branches-default b/t/t5515/refs.br-branches-default-octopus_branches-default
index 21917c1..dc4f2b7 100644
--- a/t/t5515/refs.br-branches-default-octopus_branches-default
+++ b/t/t5515/refs.br-branches-default-octopus_branches-default
@@ -1,10 +1,10 @@
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/heads/branches-default
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/heads/branches-default
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-branches-default_branches-default b/t/t5515/refs.br-branches-default_branches-default
index 21917c1..dc4f2b7 100644
--- a/t/t5515/refs.br-branches-default_branches-default
+++ b/t/t5515/refs.br-branches-default_branches-default
@@ -1,10 +1,10 @@
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/heads/branches-default
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/heads/branches-default
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-branches-one b/t/t5515/refs.br-branches-one
index 8a705a5..e8f79bf 100644
--- a/t/t5515/refs.br-branches-one
+++ b/t/t5515/refs.br-branches-one
@@ -1,10 +1,10 @@
8e32a6d901327a23ef831511badce7bf3bf46689 refs/heads/branches-one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-branches-one-merge b/t/t5515/refs.br-branches-one-merge
index 8a705a5..e8f79bf 100644
--- a/t/t5515/refs.br-branches-one-merge
+++ b/t/t5515/refs.br-branches-one-merge
@@ -1,10 +1,10 @@
8e32a6d901327a23ef831511badce7bf3bf46689 refs/heads/branches-one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-branches-one-merge_branches-one b/t/t5515/refs.br-branches-one-merge_branches-one
index 8a705a5..e8f79bf 100644
--- a/t/t5515/refs.br-branches-one-merge_branches-one
+++ b/t/t5515/refs.br-branches-one-merge_branches-one
@@ -1,10 +1,10 @@
8e32a6d901327a23ef831511badce7bf3bf46689 refs/heads/branches-one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-branches-one-octopus b/t/t5515/refs.br-branches-one-octopus
index 8a705a5..e8f79bf 100644
--- a/t/t5515/refs.br-branches-one-octopus
+++ b/t/t5515/refs.br-branches-one-octopus
@@ -1,10 +1,10 @@
8e32a6d901327a23ef831511badce7bf3bf46689 refs/heads/branches-one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-branches-one-octopus_branches-one b/t/t5515/refs.br-branches-one-octopus_branches-one
index 8a705a5..e8f79bf 100644
--- a/t/t5515/refs.br-branches-one-octopus_branches-one
+++ b/t/t5515/refs.br-branches-one-octopus_branches-one
@@ -1,10 +1,10 @@
8e32a6d901327a23ef831511badce7bf3bf46689 refs/heads/branches-one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-branches-one_branches-one b/t/t5515/refs.br-branches-one_branches-one
index 8a705a5..e8f79bf 100644
--- a/t/t5515/refs.br-branches-one_branches-one
+++ b/t/t5515/refs.br-branches-one_branches-one
@@ -1,10 +1,10 @@
8e32a6d901327a23ef831511badce7bf3bf46689 refs/heads/branches-one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-config-explicit b/t/t5515/refs.br-config-explicit
index 9bbbfd9..a28fa5f 100644
--- a/t/t5515/refs.br-config-explicit
+++ b/t/t5515/refs.br-config-explicit
@@ -1,13 +1,13 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-config-explicit-merge b/t/t5515/refs.br-config-explicit-merge
index 9bbbfd9..a28fa5f 100644
--- a/t/t5515/refs.br-config-explicit-merge
+++ b/t/t5515/refs.br-config-explicit-merge
@@ -1,13 +1,13 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-config-explicit-merge_config-explicit b/t/t5515/refs.br-config-explicit-merge_config-explicit
index 9bbbfd9..a28fa5f 100644
--- a/t/t5515/refs.br-config-explicit-merge_config-explicit
+++ b/t/t5515/refs.br-config-explicit-merge_config-explicit
@@ -1,13 +1,13 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-config-explicit-octopus b/t/t5515/refs.br-config-explicit-octopus
index 9bbbfd9..a28fa5f 100644
--- a/t/t5515/refs.br-config-explicit-octopus
+++ b/t/t5515/refs.br-config-explicit-octopus
@@ -1,13 +1,13 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-config-explicit-octopus_config-explicit b/t/t5515/refs.br-config-explicit-octopus_config-explicit
index 9bbbfd9..a28fa5f 100644
--- a/t/t5515/refs.br-config-explicit-octopus_config-explicit
+++ b/t/t5515/refs.br-config-explicit-octopus_config-explicit
@@ -1,13 +1,13 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-config-explicit_config-explicit b/t/t5515/refs.br-config-explicit_config-explicit
index 9bbbfd9..a28fa5f 100644
--- a/t/t5515/refs.br-config-explicit_config-explicit
+++ b/t/t5515/refs.br-config-explicit_config-explicit
@@ -1,13 +1,13 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-config-glob b/t/t5515/refs.br-config-glob
index 9bbbfd9..a28fa5f 100644
--- a/t/t5515/refs.br-config-glob
+++ b/t/t5515/refs.br-config-glob
@@ -1,13 +1,13 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-config-glob-merge b/t/t5515/refs.br-config-glob-merge
index 9bbbfd9..a28fa5f 100644
--- a/t/t5515/refs.br-config-glob-merge
+++ b/t/t5515/refs.br-config-glob-merge
@@ -1,13 +1,13 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-config-glob-merge_config-glob b/t/t5515/refs.br-config-glob-merge_config-glob
index 9bbbfd9..a28fa5f 100644
--- a/t/t5515/refs.br-config-glob-merge_config-glob
+++ b/t/t5515/refs.br-config-glob-merge_config-glob
@@ -1,13 +1,13 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-config-glob-octopus b/t/t5515/refs.br-config-glob-octopus
index 9bbbfd9..a28fa5f 100644
--- a/t/t5515/refs.br-config-glob-octopus
+++ b/t/t5515/refs.br-config-glob-octopus
@@ -1,13 +1,13 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-config-glob-octopus_config-glob b/t/t5515/refs.br-config-glob-octopus_config-glob
index 9bbbfd9..a28fa5f 100644
--- a/t/t5515/refs.br-config-glob-octopus_config-glob
+++ b/t/t5515/refs.br-config-glob-octopus_config-glob
@@ -1,13 +1,13 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-config-glob_config-glob b/t/t5515/refs.br-config-glob_config-glob
index 9bbbfd9..a28fa5f 100644
--- a/t/t5515/refs.br-config-glob_config-glob
+++ b/t/t5515/refs.br-config-glob_config-glob
@@ -1,13 +1,13 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-remote-explicit b/t/t5515/refs.br-remote-explicit
index 9bbbfd9..a28fa5f 100644
--- a/t/t5515/refs.br-remote-explicit
+++ b/t/t5515/refs.br-remote-explicit
@@ -1,13 +1,13 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-remote-explicit-merge b/t/t5515/refs.br-remote-explicit-merge
index 9bbbfd9..a28fa5f 100644
--- a/t/t5515/refs.br-remote-explicit-merge
+++ b/t/t5515/refs.br-remote-explicit-merge
@@ -1,13 +1,13 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-remote-explicit-merge_remote-explicit b/t/t5515/refs.br-remote-explicit-merge_remote-explicit
index 9bbbfd9..a28fa5f 100644
--- a/t/t5515/refs.br-remote-explicit-merge_remote-explicit
+++ b/t/t5515/refs.br-remote-explicit-merge_remote-explicit
@@ -1,13 +1,13 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-remote-explicit-octopus b/t/t5515/refs.br-remote-explicit-octopus
index 9bbbfd9..a28fa5f 100644
--- a/t/t5515/refs.br-remote-explicit-octopus
+++ b/t/t5515/refs.br-remote-explicit-octopus
@@ -1,13 +1,13 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-remote-explicit-octopus_remote-explicit b/t/t5515/refs.br-remote-explicit-octopus_remote-explicit
index 9bbbfd9..a28fa5f 100644
--- a/t/t5515/refs.br-remote-explicit-octopus_remote-explicit
+++ b/t/t5515/refs.br-remote-explicit-octopus_remote-explicit
@@ -1,13 +1,13 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-remote-explicit_remote-explicit b/t/t5515/refs.br-remote-explicit_remote-explicit
index 9bbbfd9..a28fa5f 100644
--- a/t/t5515/refs.br-remote-explicit_remote-explicit
+++ b/t/t5515/refs.br-remote-explicit_remote-explicit
@@ -1,13 +1,13 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-remote-glob b/t/t5515/refs.br-remote-glob
index 9bbbfd9..a28fa5f 100644
--- a/t/t5515/refs.br-remote-glob
+++ b/t/t5515/refs.br-remote-glob
@@ -1,13 +1,13 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-remote-glob-merge b/t/t5515/refs.br-remote-glob-merge
index 9bbbfd9..a28fa5f 100644
--- a/t/t5515/refs.br-remote-glob-merge
+++ b/t/t5515/refs.br-remote-glob-merge
@@ -1,13 +1,13 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-remote-glob-merge_remote-glob b/t/t5515/refs.br-remote-glob-merge_remote-glob
index 9bbbfd9..a28fa5f 100644
--- a/t/t5515/refs.br-remote-glob-merge_remote-glob
+++ b/t/t5515/refs.br-remote-glob-merge_remote-glob
@@ -1,13 +1,13 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-remote-glob-octopus b/t/t5515/refs.br-remote-glob-octopus
index 9bbbfd9..a28fa5f 100644
--- a/t/t5515/refs.br-remote-glob-octopus
+++ b/t/t5515/refs.br-remote-glob-octopus
@@ -1,13 +1,13 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-remote-glob-octopus_remote-glob b/t/t5515/refs.br-remote-glob-octopus_remote-glob
index 9bbbfd9..a28fa5f 100644
--- a/t/t5515/refs.br-remote-glob-octopus_remote-glob
+++ b/t/t5515/refs.br-remote-glob-octopus_remote-glob
@@ -1,13 +1,13 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-remote-glob_remote-glob b/t/t5515/refs.br-remote-glob_remote-glob
index 9bbbfd9..a28fa5f 100644
--- a/t/t5515/refs.br-remote-glob_remote-glob
+++ b/t/t5515/refs.br-remote-glob_remote-glob
@@ -1,13 +1,13 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-unconfig b/t/t5515/refs.br-unconfig
index 13e4ad2..f2ab01f 100644
--- a/t/t5515/refs.br-unconfig
+++ b/t/t5515/refs.br-unconfig
@@ -1,9 +1,9 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-unconfig_--tags_.._.git b/t/t5515/refs.br-unconfig_--tags_.._.git
index 13e4ad2..f2ab01f 100644
--- a/t/t5515/refs.br-unconfig_--tags_.._.git
+++ b/t/t5515/refs.br-unconfig_--tags_.._.git
@@ -1,9 +1,9 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-unconfig_.._.git b/t/t5515/refs.br-unconfig_.._.git
index 70962ea..4a74b68 100644
--- a/t/t5515/refs.br-unconfig_.._.git
+++ b/t/t5515/refs.br-unconfig_.._.git
@@ -1,5 +1,5 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
diff --git a/t/t5515/refs.br-unconfig_.._.git_one b/t/t5515/refs.br-unconfig_.._.git_one
index 70962ea..4a74b68 100644
--- a/t/t5515/refs.br-unconfig_.._.git_one
+++ b/t/t5515/refs.br-unconfig_.._.git_one
@@ -1,5 +1,5 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
diff --git a/t/t5515/refs.br-unconfig_.._.git_one_tag_tag-one_tag_tag-three-file b/t/t5515/refs.br-unconfig_.._.git_one_tag_tag-one_tag_tag-three-file
index 13e4ad2..f2ab01f 100644
--- a/t/t5515/refs.br-unconfig_.._.git_one_tag_tag-one_tag_tag-three-file
+++ b/t/t5515/refs.br-unconfig_.._.git_one_tag_tag-one_tag_tag-three-file
@@ -1,9 +1,9 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-unconfig_.._.git_one_two b/t/t5515/refs.br-unconfig_.._.git_one_two
index 70962ea..4a74b68 100644
--- a/t/t5515/refs.br-unconfig_.._.git_one_two
+++ b/t/t5515/refs.br-unconfig_.._.git_one_two
@@ -1,5 +1,5 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
diff --git a/t/t5515/refs.br-unconfig_.._.git_tag_tag-one-tree_tag_tag-three-file b/t/t5515/refs.br-unconfig_.._.git_tag_tag-one-tree_tag_tag-three-file
index 13e4ad2..f2ab01f 100644
--- a/t/t5515/refs.br-unconfig_.._.git_tag_tag-one-tree_tag_tag-three-file
+++ b/t/t5515/refs.br-unconfig_.._.git_tag_tag-one-tree_tag_tag-three-file
@@ -1,9 +1,9 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-unconfig_.._.git_tag_tag-one_tag_tag-three b/t/t5515/refs.br-unconfig_.._.git_tag_tag-one_tag_tag-three
index 13e4ad2..f2ab01f 100644
--- a/t/t5515/refs.br-unconfig_.._.git_tag_tag-one_tag_tag-three
+++ b/t/t5515/refs.br-unconfig_.._.git_tag_tag-one_tag_tag-three
@@ -1,9 +1,9 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-unconfig_branches-default b/t/t5515/refs.br-unconfig_branches-default
index 21917c1..dc4f2b7 100644
--- a/t/t5515/refs.br-unconfig_branches-default
+++ b/t/t5515/refs.br-unconfig_branches-default
@@ -1,10 +1,10 @@
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/heads/branches-default
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/heads/branches-default
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-unconfig_branches-one b/t/t5515/refs.br-unconfig_branches-one
index 8a705a5..e8f79bf 100644
--- a/t/t5515/refs.br-unconfig_branches-one
+++ b/t/t5515/refs.br-unconfig_branches-one
@@ -1,10 +1,10 @@
8e32a6d901327a23ef831511badce7bf3bf46689 refs/heads/branches-one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-unconfig_config-explicit b/t/t5515/refs.br-unconfig_config-explicit
index 9bbbfd9..a28fa5f 100644
--- a/t/t5515/refs.br-unconfig_config-explicit
+++ b/t/t5515/refs.br-unconfig_config-explicit
@@ -1,13 +1,13 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-unconfig_config-glob b/t/t5515/refs.br-unconfig_config-glob
index 9bbbfd9..a28fa5f 100644
--- a/t/t5515/refs.br-unconfig_config-glob
+++ b/t/t5515/refs.br-unconfig_config-glob
@@ -1,13 +1,13 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-unconfig_remote-explicit b/t/t5515/refs.br-unconfig_remote-explicit
index 9bbbfd9..a28fa5f 100644
--- a/t/t5515/refs.br-unconfig_remote-explicit
+++ b/t/t5515/refs.br-unconfig_remote-explicit
@@ -1,13 +1,13 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-unconfig_remote-glob b/t/t5515/refs.br-unconfig_remote-glob
index 9bbbfd9..a28fa5f 100644
--- a/t/t5515/refs.br-unconfig_remote-glob
+++ b/t/t5515/refs.br-unconfig_remote-glob
@@ -1,13 +1,13 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.master b/t/t5515/refs.main
similarity index 81%
rename from t/t5515/refs.master
rename to t/t5515/refs.main
index 13e4ad2..f2ab01f 100644
--- a/t/t5515/refs.master
+++ b/t/t5515/refs.main
@@ -1,9 +1,9 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.master b/t/t5515/refs.main_--tags_.._.git
similarity index 81%
copy from t/t5515/refs.master
copy to t/t5515/refs.main_--tags_.._.git
index 13e4ad2..f2ab01f 100644
--- a/t/t5515/refs.master
+++ b/t/t5515/refs.main_--tags_.._.git
@@ -1,9 +1,9 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.master_.._.git b/t/t5515/refs.main_.._.git
similarity index 79%
rename from t/t5515/refs.master_.._.git
rename to t/t5515/refs.main_.._.git
index 70962ea..4a74b68 100644
--- a/t/t5515/refs.master_.._.git
+++ b/t/t5515/refs.main_.._.git
@@ -1,5 +1,5 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
diff --git a/t/t5515/refs.master_.._.git b/t/t5515/refs.main_.._.git_one
similarity index 79%
copy from t/t5515/refs.master_.._.git
copy to t/t5515/refs.main_.._.git_one
index 70962ea..4a74b68 100644
--- a/t/t5515/refs.master_.._.git
+++ b/t/t5515/refs.main_.._.git_one
@@ -1,5 +1,5 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
diff --git a/t/t5515/refs.master b/t/t5515/refs.main_.._.git_one_tag_tag-one_tag_tag-three-file
similarity index 81%
copy from t/t5515/refs.master
copy to t/t5515/refs.main_.._.git_one_tag_tag-one_tag_tag-three-file
index 13e4ad2..f2ab01f 100644
--- a/t/t5515/refs.master
+++ b/t/t5515/refs.main_.._.git_one_tag_tag-one_tag_tag-three-file
@@ -1,9 +1,9 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.master_.._.git b/t/t5515/refs.main_.._.git_one_two
similarity index 79%
copy from t/t5515/refs.master_.._.git
copy to t/t5515/refs.main_.._.git_one_two
index 70962ea..4a74b68 100644
--- a/t/t5515/refs.master_.._.git
+++ b/t/t5515/refs.main_.._.git_one_two
@@ -1,5 +1,5 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
diff --git a/t/t5515/refs.master b/t/t5515/refs.main_.._.git_tag_tag-one-tree_tag_tag-three-file
similarity index 81%
copy from t/t5515/refs.master
copy to t/t5515/refs.main_.._.git_tag_tag-one-tree_tag_tag-three-file
index 13e4ad2..f2ab01f 100644
--- a/t/t5515/refs.master
+++ b/t/t5515/refs.main_.._.git_tag_tag-one-tree_tag_tag-three-file
@@ -1,9 +1,9 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.master b/t/t5515/refs.main_.._.git_tag_tag-one_tag_tag-three
similarity index 81%
copy from t/t5515/refs.master
copy to t/t5515/refs.main_.._.git_tag_tag-one_tag_tag-three
index 13e4ad2..f2ab01f 100644
--- a/t/t5515/refs.master
+++ b/t/t5515/refs.main_.._.git_tag_tag-one_tag_tag-three
@@ -1,9 +1,9 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.master_branches-one b/t/t5515/refs.main_branches-default
similarity index 74%
copy from t/t5515/refs.master_branches-one
copy to t/t5515/refs.main_branches-default
index 8a705a5..dc4f2b7 100644
--- a/t/t5515/refs.master_branches-one
+++ b/t/t5515/refs.main_branches-default
@@ -1,10 +1,10 @@
-8e32a6d901327a23ef831511badce7bf3bf46689 refs/heads/branches-one
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/heads/branches-default
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.master_branches-one b/t/t5515/refs.main_branches-one
similarity index 82%
rename from t/t5515/refs.master_branches-one
rename to t/t5515/refs.main_branches-one
index 8a705a5..e8f79bf 100644
--- a/t/t5515/refs.master_branches-one
+++ b/t/t5515/refs.main_branches-one
@@ -1,10 +1,10 @@
8e32a6d901327a23ef831511badce7bf3bf46689 refs/heads/branches-one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.master_config-explicit b/t/t5515/refs.main_config-explicit
similarity index 79%
rename from t/t5515/refs.master_config-explicit
rename to t/t5515/refs.main_config-explicit
index 9bbbfd9..a28fa5f 100644
--- a/t/t5515/refs.master_config-explicit
+++ b/t/t5515/refs.main_config-explicit
@@ -1,13 +1,13 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.master_config-explicit b/t/t5515/refs.main_config-glob
similarity index 79%
copy from t/t5515/refs.master_config-explicit
copy to t/t5515/refs.main_config-glob
index 9bbbfd9..a28fa5f 100644
--- a/t/t5515/refs.master_config-explicit
+++ b/t/t5515/refs.main_config-glob
@@ -1,13 +1,13 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.master_config-explicit b/t/t5515/refs.main_remote-explicit
similarity index 79%
copy from t/t5515/refs.master_config-explicit
copy to t/t5515/refs.main_remote-explicit
index 9bbbfd9..a28fa5f 100644
--- a/t/t5515/refs.master_config-explicit
+++ b/t/t5515/refs.main_remote-explicit
@@ -1,13 +1,13 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.master_config-explicit b/t/t5515/refs.main_remote-glob
similarity index 79%
copy from t/t5515/refs.master_config-explicit
copy to t/t5515/refs.main_remote-glob
index 9bbbfd9..a28fa5f 100644
--- a/t/t5515/refs.master_config-explicit
+++ b/t/t5515/refs.main_remote-glob
@@ -1,13 +1,13 @@
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.master_--tags_.._.git b/t/t5515/refs.master_--tags_.._.git
deleted file mode 100644
index 13e4ad2..0000000
--- a/t/t5515/refs.master_--tags_.._.git
+++ /dev/null
@@ -1,11 +0,0 @@
-0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
-8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
-0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
-6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
-8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
-22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
-c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
-0e3b14047d3ee365f4f2a1b673db059c3972589c refs/tags/tag-three-file
-525b7fb068d59950d185a8779dc957c77eed73ba refs/tags/tag-two
diff --git a/t/t5515/refs.master_.._.git_one b/t/t5515/refs.master_.._.git_one
deleted file mode 100644
index 70962ea..0000000
--- a/t/t5515/refs.master_.._.git_one
+++ /dev/null
@@ -1,5 +0,0 @@
-0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
-8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
-0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
-6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
diff --git a/t/t5515/refs.master_.._.git_one_tag_tag-one_tag_tag-three-file b/t/t5515/refs.master_.._.git_one_tag_tag-one_tag_tag-three-file
deleted file mode 100644
index 13e4ad2..0000000
--- a/t/t5515/refs.master_.._.git_one_tag_tag-one_tag_tag-three-file
+++ /dev/null
@@ -1,11 +0,0 @@
-0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
-8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
-0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
-6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
-8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
-22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
-c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
-0e3b14047d3ee365f4f2a1b673db059c3972589c refs/tags/tag-three-file
-525b7fb068d59950d185a8779dc957c77eed73ba refs/tags/tag-two
diff --git a/t/t5515/refs.master_.._.git_one_two b/t/t5515/refs.master_.._.git_one_two
deleted file mode 100644
index 70962ea..0000000
--- a/t/t5515/refs.master_.._.git_one_two
+++ /dev/null
@@ -1,5 +0,0 @@
-0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
-8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
-0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
-6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
diff --git a/t/t5515/refs.master_.._.git_tag_tag-one-tree_tag_tag-three-file b/t/t5515/refs.master_.._.git_tag_tag-one-tree_tag_tag-three-file
deleted file mode 100644
index 13e4ad2..0000000
--- a/t/t5515/refs.master_.._.git_tag_tag-one-tree_tag_tag-three-file
+++ /dev/null
@@ -1,11 +0,0 @@
-0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
-8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
-0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
-6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
-8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
-22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
-c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
-0e3b14047d3ee365f4f2a1b673db059c3972589c refs/tags/tag-three-file
-525b7fb068d59950d185a8779dc957c77eed73ba refs/tags/tag-two
diff --git a/t/t5515/refs.master_.._.git_tag_tag-one_tag_tag-three b/t/t5515/refs.master_.._.git_tag_tag-one_tag_tag-three
deleted file mode 100644
index 13e4ad2..0000000
--- a/t/t5515/refs.master_.._.git_tag_tag-one_tag_tag-three
+++ /dev/null
@@ -1,11 +0,0 @@
-0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
-8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
-0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
-6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
-8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
-22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
-c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
-0e3b14047d3ee365f4f2a1b673db059c3972589c refs/tags/tag-three-file
-525b7fb068d59950d185a8779dc957c77eed73ba refs/tags/tag-two
diff --git a/t/t5515/refs.master_branches-default b/t/t5515/refs.master_branches-default
deleted file mode 100644
index 21917c1..0000000
--- a/t/t5515/refs.master_branches-default
+++ /dev/null
@@ -1,12 +0,0 @@
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/heads/branches-default
-0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
-8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
-0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
-6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
-8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
-22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
-c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
-0e3b14047d3ee365f4f2a1b673db059c3972589c refs/tags/tag-three-file
-525b7fb068d59950d185a8779dc957c77eed73ba refs/tags/tag-two
diff --git a/t/t5515/refs.master_config-glob b/t/t5515/refs.master_config-glob
deleted file mode 100644
index 9bbbfd9..0000000
--- a/t/t5515/refs.master_config-glob
+++ /dev/null
@@ -1,15 +0,0 @@
-0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
-8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
-0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
-6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
-8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
-0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
-6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
-8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
-22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
-c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
-0e3b14047d3ee365f4f2a1b673db059c3972589c refs/tags/tag-three-file
-525b7fb068d59950d185a8779dc957c77eed73ba refs/tags/tag-two
diff --git a/t/t5515/refs.master_remote-explicit b/t/t5515/refs.master_remote-explicit
deleted file mode 100644
index 9bbbfd9..0000000
--- a/t/t5515/refs.master_remote-explicit
+++ /dev/null
@@ -1,15 +0,0 @@
-0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
-8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
-0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
-6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
-8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
-0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
-6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
-8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
-22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
-c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
-0e3b14047d3ee365f4f2a1b673db059c3972589c refs/tags/tag-three-file
-525b7fb068d59950d185a8779dc957c77eed73ba refs/tags/tag-two
diff --git a/t/t5515/refs.master_remote-glob b/t/t5515/refs.master_remote-glob
deleted file mode 100644
index 9bbbfd9..0000000
--- a/t/t5515/refs.master_remote-glob
+++ /dev/null
@@ -1,15 +0,0 @@
-0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
-8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
-0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
-6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
-8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
-0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
-6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
-8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
-22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
-c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
-0e3b14047d3ee365f4f2a1b673db059c3972589c refs/tags/tag-three-file
-525b7fb068d59950d185a8779dc957c77eed73ba refs/tags/tag-two
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index 9ff041a..f11742e 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -14,6 +14,9 @@
* reflogs
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
D=$(pwd)
@@ -120,13 +123,13 @@
git add path1 &&
test_tick &&
git commit -a -m repo &&
- the_first_commit=$(git show-ref -s --verify refs/heads/master) &&
+ the_first_commit=$(git show-ref -s --verify refs/heads/main) &&
>path2 &&
git add path2 &&
test_tick &&
git commit -a -m second &&
- the_commit=$(git show-ref -s --verify refs/heads/master)
+ the_commit=$(git show-ref -s --verify refs/heads/main)
'
@@ -134,9 +137,9 @@
mk_empty testrepo &&
(
cd testrepo &&
- git fetch .. refs/heads/master:refs/remotes/origin/master &&
+ git fetch .. refs/heads/main:refs/remotes/origin/main &&
- echo "$the_commit commit refs/remotes/origin/master" >expect &&
+ echo "$the_commit commit refs/remotes/origin/main" >expect &&
git for-each-ref refs/remotes/origin >actual &&
test_cmp expect actual
)
@@ -150,7 +153,7 @@
git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
git fetch up &&
- echo "$the_commit commit refs/remotes/origin/master" >expect &&
+ echo "$the_commit commit refs/remotes/origin/main" >expect &&
git for-each-ref refs/remotes/origin >actual &&
test_cmp expect actual
)
@@ -166,7 +169,7 @@
git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
git fetch up &&
- echo "$the_commit commit refs/remotes/origin/master" >expect &&
+ echo "$the_commit commit refs/remotes/origin/main" >expect &&
git for-each-ref refs/remotes/origin >actual &&
test_cmp expect actual
)
@@ -182,7 +185,7 @@
git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
git fetch up &&
- echo "$the_commit commit refs/remotes/origin/master" >expect &&
+ echo "$the_commit commit refs/remotes/origin/main" >expect &&
git for-each-ref refs/remotes/origin >actual &&
test_cmp expect actual
)
@@ -191,10 +194,10 @@
test_expect_success 'push without wildcard' '
mk_empty testrepo &&
- git push testrepo refs/heads/master:refs/remotes/origin/master &&
+ git push testrepo refs/heads/main:refs/remotes/origin/main &&
(
cd testrepo &&
- echo "$the_commit commit refs/remotes/origin/master" >expect &&
+ echo "$the_commit commit refs/remotes/origin/main" >expect &&
git for-each-ref refs/remotes/origin >actual &&
test_cmp expect actual
)
@@ -206,7 +209,7 @@
git push testrepo "refs/heads/*:refs/remotes/origin/*" &&
(
cd testrepo &&
- echo "$the_commit commit refs/remotes/origin/master" >expect &&
+ echo "$the_commit commit refs/remotes/origin/main" >expect &&
git for-each-ref refs/remotes/origin >actual &&
test_cmp expect actual
)
@@ -216,10 +219,10 @@
mk_empty testrepo &&
TRASH="$(pwd)/" &&
test_config "url.$TRASH.insteadOf" trash/ &&
- git push trash/testrepo refs/heads/master:refs/remotes/origin/master &&
+ git push trash/testrepo refs/heads/main:refs/remotes/origin/main &&
(
cd testrepo &&
- echo "$the_commit commit refs/remotes/origin/master" >expect &&
+ echo "$the_commit commit refs/remotes/origin/main" >expect &&
git for-each-ref refs/remotes/origin >actual &&
test_cmp expect actual
)
@@ -229,10 +232,10 @@
mk_empty testrepo &&
TRASH="$(pwd)/" &&
test_config "url.$TRASH.pushInsteadOf" trash/ &&
- git push trash/testrepo refs/heads/master:refs/remotes/origin/master &&
+ git push trash/testrepo refs/heads/main:refs/remotes/origin/main &&
(
cd testrepo &&
- echo "$the_commit commit refs/remotes/origin/master" >expect &&
+ echo "$the_commit commit refs/remotes/origin/main" >expect &&
git for-each-ref refs/remotes/origin >actual &&
test_cmp expect actual
)
@@ -244,10 +247,10 @@
test_config "url.trash3/.pushInsteadOf" trash/wrong &&
test_config remote.r.url trash/wrong &&
test_config remote.r.pushurl "testrepo/" &&
- git push r refs/heads/master:refs/remotes/origin/master &&
+ git push r refs/heads/main:refs/remotes/origin/main &&
(
cd testrepo &&
- echo "$the_commit commit refs/remotes/origin/master" >expect &&
+ echo "$the_commit commit refs/remotes/origin/main" >expect &&
git for-each-ref refs/remotes/origin >actual &&
test_cmp expect actual
)
@@ -255,101 +258,101 @@
test_expect_success 'push with matching heads' '
- mk_test testrepo heads/master &&
+ mk_test testrepo heads/main &&
git push testrepo : &&
- check_push_result testrepo $the_commit heads/master
+ check_push_result testrepo $the_commit heads/main
'
test_expect_success 'push with matching heads on the command line' '
- mk_test testrepo heads/master &&
+ mk_test testrepo heads/main &&
git push testrepo : &&
- check_push_result testrepo $the_commit heads/master
+ check_push_result testrepo $the_commit heads/main
'
test_expect_success 'failed (non-fast-forward) push with matching heads' '
- mk_test testrepo heads/master &&
+ mk_test testrepo heads/main &&
git push testrepo : &&
git commit --amend -massaged &&
test_must_fail git push testrepo &&
- check_push_result testrepo $the_commit heads/master &&
+ check_push_result testrepo $the_commit heads/main &&
git reset --hard $the_commit
'
test_expect_success 'push --force with matching heads' '
- mk_test testrepo heads/master &&
+ mk_test testrepo heads/main &&
git push testrepo : &&
git commit --amend -massaged &&
git push --force testrepo : &&
- ! check_push_result testrepo $the_commit heads/master &&
+ ! check_push_result testrepo $the_commit heads/main &&
git reset --hard $the_commit
'
test_expect_success 'push with matching heads and forced update' '
- mk_test testrepo heads/master &&
+ mk_test testrepo heads/main &&
git push testrepo : &&
git commit --amend -massaged &&
git push testrepo +: &&
- ! check_push_result testrepo $the_commit heads/master &&
+ ! check_push_result testrepo $the_commit heads/main &&
git reset --hard $the_commit
'
test_expect_success 'push with no ambiguity (1)' '
- mk_test testrepo heads/master &&
- git push testrepo master:master &&
- check_push_result testrepo $the_commit heads/master
+ mk_test testrepo heads/main &&
+ git push testrepo main:main &&
+ check_push_result testrepo $the_commit heads/main
'
test_expect_success 'push with no ambiguity (2)' '
- mk_test testrepo remotes/origin/master &&
- git push testrepo master:origin/master &&
- check_push_result testrepo $the_commit remotes/origin/master
+ mk_test testrepo remotes/origin/main &&
+ git push testrepo main:origin/main &&
+ check_push_result testrepo $the_commit remotes/origin/main
'
test_expect_success 'push with colon-less refspec, no ambiguity' '
- mk_test testrepo heads/master heads/t/master &&
- git branch -f t/master master &&
- git push testrepo master &&
- check_push_result testrepo $the_commit heads/master &&
- check_push_result testrepo $the_first_commit heads/t/master
+ mk_test testrepo heads/main heads/t/main &&
+ git branch -f t/main main &&
+ git push testrepo main &&
+ check_push_result testrepo $the_commit heads/main &&
+ check_push_result testrepo $the_first_commit heads/t/main
'
test_expect_success 'push with weak ambiguity (1)' '
- mk_test testrepo heads/master remotes/origin/master &&
- git push testrepo master:master &&
- check_push_result testrepo $the_commit heads/master &&
- check_push_result testrepo $the_first_commit remotes/origin/master
+ mk_test testrepo heads/main remotes/origin/main &&
+ git push testrepo main:main &&
+ check_push_result testrepo $the_commit heads/main &&
+ check_push_result testrepo $the_first_commit remotes/origin/main
'
test_expect_success 'push with weak ambiguity (2)' '
- mk_test testrepo heads/master remotes/origin/master remotes/another/master &&
- git push testrepo master:master &&
- check_push_result testrepo $the_commit heads/master &&
- check_push_result testrepo $the_first_commit remotes/origin/master remotes/another/master
+ mk_test testrepo heads/main remotes/origin/main remotes/another/main &&
+ git push testrepo main:main &&
+ check_push_result testrepo $the_commit heads/main &&
+ check_push_result testrepo $the_first_commit remotes/origin/main remotes/another/main
'
test_expect_success 'push with ambiguity' '
mk_test testrepo heads/frotz tags/frotz &&
- test_must_fail git push testrepo master:frotz &&
+ test_must_fail git push testrepo main:frotz &&
check_push_result testrepo $the_first_commit heads/frotz tags/frotz
'
@@ -357,7 +360,7 @@
test_expect_success 'push with colon-less refspec (1)' '
mk_test testrepo heads/frotz tags/frotz &&
- git branch -f frotz master &&
+ git branch -f frotz main &&
git push testrepo frotz &&
check_push_result testrepo $the_commit heads/frotz &&
check_push_result testrepo $the_first_commit tags/frotz
@@ -385,7 +388,7 @@
then
git tag -d frotz
fi &&
- git branch -f frotz master &&
+ git branch -f frotz main &&
git push testrepo frotz &&
check_push_result testrepo $the_commit heads/frotz &&
test 1 = $( cd testrepo && git show-ref | wc -l )
@@ -408,7 +411,7 @@
test_expect_success 'push head with non-existent, incomplete dest' '
mk_test testrepo &&
- git push testrepo master:branch &&
+ git push testrepo main:branch &&
check_push_result testrepo $the_commit heads/branch
'
@@ -425,236 +428,235 @@
test_expect_success 'push sha1 with non-existent, incomplete dest' '
mk_test testrepo &&
- test_must_fail git push testrepo $(git rev-parse master):foo
+ test_must_fail git push testrepo $(git rev-parse main):foo
'
test_expect_success 'push ref expression with non-existent, incomplete dest' '
mk_test testrepo &&
- test_must_fail git push testrepo master^:branch
+ test_must_fail git push testrepo main^:branch
'
-test_expect_success 'push with HEAD' '
+for head in HEAD @
+do
- mk_test testrepo heads/master &&
- git checkout master &&
- git push testrepo HEAD &&
- check_push_result testrepo $the_commit heads/master
+ test_expect_success "push with $head" '
+ mk_test testrepo heads/main &&
+ git checkout main &&
+ git push testrepo $head &&
+ check_push_result testrepo $the_commit heads/main
+ '
-'
+ test_expect_success "push with $head nonexisting at remote" '
+ mk_test testrepo heads/main &&
+ git checkout -b local main &&
+ test_when_finished "git checkout main; git branch -D local" &&
+ git push testrepo $head &&
+ check_push_result testrepo $the_commit heads/local
+ '
-test_expect_success 'push with HEAD nonexisting at remote' '
+ test_expect_success "push with +$head" '
+ mk_test testrepo heads/main &&
+ git checkout -b local main &&
+ test_when_finished "git checkout main; git branch -D local" &&
+ git push testrepo main local &&
+ check_push_result testrepo $the_commit heads/main &&
+ check_push_result testrepo $the_commit heads/local &&
- mk_test testrepo heads/master &&
- git checkout -b local master &&
- git push testrepo HEAD &&
- check_push_result testrepo $the_commit heads/local
-'
+ # Without force rewinding should fail
+ git reset --hard $head^ &&
+ test_must_fail git push testrepo $head &&
+ check_push_result testrepo $the_commit heads/local &&
-test_expect_success 'push with +HEAD' '
+ # With force rewinding should succeed
+ git push testrepo +$head &&
+ check_push_result testrepo $the_first_commit heads/local
+ '
- mk_test testrepo heads/master &&
- git checkout master &&
- git branch -D local &&
- git checkout -b local &&
- git push testrepo master local &&
- check_push_result testrepo $the_commit heads/master &&
- check_push_result testrepo $the_commit heads/local &&
+ test_expect_success "push $head with non-existent, incomplete dest" '
+ mk_test testrepo &&
+ git checkout main &&
+ git push testrepo $head:branch &&
+ check_push_result testrepo $the_commit heads/branch
- # Without force rewinding should fail
- git reset --hard HEAD^ &&
- test_must_fail git push testrepo HEAD &&
- check_push_result testrepo $the_commit heads/local &&
+ '
- # With force rewinding should succeed
- git push testrepo +HEAD &&
- check_push_result testrepo $the_first_commit heads/local
+ test_expect_success "push with config remote.*.push = $head" '
+ mk_test testrepo heads/local &&
+ git checkout main &&
+ git branch -f local $the_commit &&
+ test_when_finished "git branch -D local" &&
+ (
+ cd testrepo &&
+ git checkout local &&
+ git reset --hard $the_first_commit
+ ) &&
+ test_config remote.there.url testrepo &&
+ test_config remote.there.push $head &&
+ test_config branch.main.remote there &&
+ git push &&
+ check_push_result testrepo $the_commit heads/main &&
+ check_push_result testrepo $the_first_commit heads/local
+ '
-'
-
-test_expect_success 'push HEAD with non-existent, incomplete dest' '
-
- mk_test testrepo &&
- git checkout master &&
- git push testrepo HEAD:branch &&
- check_push_result testrepo $the_commit heads/branch
-
-'
-
-test_expect_success 'push with config remote.*.push = HEAD' '
-
- mk_test testrepo heads/local &&
- git checkout master &&
- git branch -f local $the_commit &&
- (
- cd testrepo &&
- git checkout local &&
- git reset --hard $the_first_commit
- ) &&
- test_config remote.there.url testrepo &&
- test_config remote.there.push HEAD &&
- test_config branch.master.remote there &&
- git push &&
- check_push_result testrepo $the_commit heads/master &&
- check_push_result testrepo $the_first_commit heads/local
-'
+done
test_expect_success 'push with remote.pushdefault' '
- mk_test up_repo heads/master &&
- mk_test down_repo heads/master &&
+ mk_test up_repo heads/main &&
+ mk_test down_repo heads/main &&
test_config remote.up.url up_repo &&
test_config remote.down.url down_repo &&
- test_config branch.master.remote up &&
+ test_config branch.main.remote up &&
test_config remote.pushdefault down &&
test_config push.default matching &&
git push &&
- check_push_result up_repo $the_first_commit heads/master &&
- check_push_result down_repo $the_commit heads/master
+ check_push_result up_repo $the_first_commit heads/main &&
+ check_push_result down_repo $the_commit heads/main
'
test_expect_success 'push with config remote.*.pushurl' '
- mk_test testrepo heads/master &&
- git checkout master &&
+ mk_test testrepo heads/main &&
+ git checkout main &&
test_config remote.there.url test2repo &&
test_config remote.there.pushurl testrepo &&
git push there : &&
- check_push_result testrepo $the_commit heads/master
+ check_push_result testrepo $the_commit heads/main
'
test_expect_success 'push with config branch.*.pushremote' '
- mk_test up_repo heads/master &&
- mk_test side_repo heads/master &&
- mk_test down_repo heads/master &&
+ mk_test up_repo heads/main &&
+ mk_test side_repo heads/main &&
+ mk_test down_repo heads/main &&
test_config remote.up.url up_repo &&
test_config remote.pushdefault side_repo &&
test_config remote.down.url down_repo &&
- test_config branch.master.remote up &&
- test_config branch.master.pushremote down &&
+ test_config branch.main.remote up &&
+ test_config branch.main.pushremote down &&
test_config push.default matching &&
git push &&
- check_push_result up_repo $the_first_commit heads/master &&
- check_push_result side_repo $the_first_commit heads/master &&
- check_push_result down_repo $the_commit heads/master
+ check_push_result up_repo $the_first_commit heads/main &&
+ check_push_result side_repo $the_first_commit heads/main &&
+ check_push_result down_repo $the_commit heads/main
'
test_expect_success 'branch.*.pushremote config order is irrelevant' '
- mk_test one_repo heads/master &&
- mk_test two_repo heads/master &&
+ mk_test one_repo heads/main &&
+ mk_test two_repo heads/main &&
test_config remote.one.url one_repo &&
test_config remote.two.url two_repo &&
- test_config branch.master.pushremote two_repo &&
+ test_config branch.main.pushremote two_repo &&
test_config remote.pushdefault one_repo &&
test_config push.default matching &&
git push &&
- check_push_result one_repo $the_first_commit heads/master &&
- check_push_result two_repo $the_commit heads/master
+ check_push_result one_repo $the_first_commit heads/main &&
+ check_push_result two_repo $the_commit heads/main
'
test_expect_success 'push with dry-run' '
- mk_test testrepo heads/master &&
- old_commit=$(git -C testrepo show-ref -s --verify refs/heads/master) &&
+ mk_test testrepo heads/main &&
+ old_commit=$(git -C testrepo show-ref -s --verify refs/heads/main) &&
git push --dry-run testrepo : &&
- check_push_result testrepo $old_commit heads/master
+ check_push_result testrepo $old_commit heads/main
'
test_expect_success 'push updates local refs' '
- mk_test testrepo heads/master &&
+ mk_test testrepo heads/main &&
mk_child testrepo child &&
(
cd child &&
- git pull .. master &&
+ git pull .. main &&
git push &&
- test $(git rev-parse master) = \
- $(git rev-parse remotes/origin/master)
+ test $(git rev-parse main) = \
+ $(git rev-parse remotes/origin/main)
)
'
test_expect_success 'push updates up-to-date local refs' '
- mk_test testrepo heads/master &&
+ mk_test testrepo heads/main &&
mk_child testrepo child1 &&
mk_child testrepo child2 &&
- (cd child1 && git pull .. master && git push) &&
+ (cd child1 && git pull .. main && git push) &&
(
cd child2 &&
- git pull ../child1 master &&
+ git pull ../child1 main &&
git push &&
- test $(git rev-parse master) = \
- $(git rev-parse remotes/origin/master)
+ test $(git rev-parse main) = \
+ $(git rev-parse remotes/origin/main)
)
'
test_expect_success 'push preserves up-to-date packed refs' '
- mk_test testrepo heads/master &&
+ mk_test testrepo heads/main &&
mk_child testrepo child &&
(
cd child &&
git push &&
- ! test -f .git/refs/remotes/origin/master
+ ! test -f .git/refs/remotes/origin/main
)
'
test_expect_success 'push does not update local refs on failure' '
- mk_test testrepo heads/master &&
+ mk_test testrepo heads/main &&
mk_child testrepo child &&
mkdir testrepo/.git/hooks &&
echo "#!/no/frobnication/today" >testrepo/.git/hooks/pre-receive &&
chmod +x testrepo/.git/hooks/pre-receive &&
(
cd child &&
- git pull .. master &&
+ git pull .. main &&
test_must_fail git push &&
- test $(git rev-parse master) != \
- $(git rev-parse remotes/origin/master)
+ test $(git rev-parse main) != \
+ $(git rev-parse remotes/origin/main)
)
'
test_expect_success 'allow deleting an invalid remote ref' '
- mk_test testrepo heads/master &&
+ mk_test testrepo heads/main &&
rm -f testrepo/.git/objects/??/* &&
- git push testrepo :refs/heads/master &&
- (cd testrepo && test_must_fail git rev-parse --verify refs/heads/master)
+ git push testrepo :refs/heads/main &&
+ (cd testrepo && test_must_fail git rev-parse --verify refs/heads/main)
'
test_expect_success 'pushing valid refs triggers post-receive and post-update hooks' '
- mk_test_with_hooks testrepo heads/master heads/next &&
- orgmaster=$(cd testrepo && git show-ref -s --verify refs/heads/master) &&
- newmaster=$(git show-ref -s --verify refs/heads/master) &&
+ mk_test_with_hooks testrepo heads/main heads/next &&
+ orgmain=$(cd testrepo && git show-ref -s --verify refs/heads/main) &&
+ newmain=$(git show-ref -s --verify refs/heads/main) &&
orgnext=$(cd testrepo && git show-ref -s --verify refs/heads/next) &&
newnext=$ZERO_OID &&
- git push testrepo refs/heads/master:refs/heads/master :refs/heads/next &&
+ git push testrepo refs/heads/main:refs/heads/main :refs/heads/next &&
(
cd testrepo/.git &&
cat >pre-receive.expect <<-EOF &&
- $orgmaster $newmaster refs/heads/master
+ $orgmain $newmain refs/heads/main
$orgnext $newnext refs/heads/next
EOF
cat >update.expect <<-EOF &&
- refs/heads/master $orgmaster $newmaster
+ refs/heads/main $orgmain $newmain
refs/heads/next $orgnext $newnext
EOF
cat >post-receive.expect <<-EOF &&
- $orgmaster $newmaster refs/heads/master
+ $orgmain $newmain refs/heads/main
$orgnext $newnext refs/heads/next
EOF
cat >post-update.expect <<-EOF &&
- refs/heads/master
+ refs/heads/main
refs/heads/next
EOF
@@ -666,25 +668,25 @@
'
test_expect_success 'deleting dangling ref triggers hooks with correct args' '
- mk_test_with_hooks testrepo heads/master &&
+ mk_test_with_hooks testrepo heads/main &&
rm -f testrepo/.git/objects/??/* &&
- git push testrepo :refs/heads/master &&
+ git push testrepo :refs/heads/main &&
(
cd testrepo/.git &&
cat >pre-receive.expect <<-EOF &&
- $ZERO_OID $ZERO_OID refs/heads/master
+ $ZERO_OID $ZERO_OID refs/heads/main
EOF
cat >update.expect <<-EOF &&
- refs/heads/master $ZERO_OID $ZERO_OID
+ refs/heads/main $ZERO_OID $ZERO_OID
EOF
cat >post-receive.expect <<-EOF &&
- $ZERO_OID $ZERO_OID refs/heads/master
+ $ZERO_OID $ZERO_OID refs/heads/main
EOF
cat >post-update.expect <<-EOF &&
- refs/heads/master
+ refs/heads/main
EOF
test_cmp pre-receive.expect pre-receive.actual &&
@@ -695,28 +697,28 @@
'
test_expect_success 'deletion of a non-existent ref is not fed to post-receive and post-update hooks' '
- mk_test_with_hooks testrepo heads/master &&
- orgmaster=$(cd testrepo && git show-ref -s --verify refs/heads/master) &&
- newmaster=$(git show-ref -s --verify refs/heads/master) &&
- git push testrepo master :refs/heads/nonexistent &&
+ mk_test_with_hooks testrepo heads/main &&
+ orgmain=$(cd testrepo && git show-ref -s --verify refs/heads/main) &&
+ newmain=$(git show-ref -s --verify refs/heads/main) &&
+ git push testrepo main :refs/heads/nonexistent &&
(
cd testrepo/.git &&
cat >pre-receive.expect <<-EOF &&
- $orgmaster $newmaster refs/heads/master
+ $orgmain $newmain refs/heads/main
$ZERO_OID $ZERO_OID refs/heads/nonexistent
EOF
cat >update.expect <<-EOF &&
- refs/heads/master $orgmaster $newmaster
+ refs/heads/main $orgmain $newmain
refs/heads/nonexistent $ZERO_OID $ZERO_OID
EOF
cat >post-receive.expect <<-EOF &&
- $orgmaster $newmaster refs/heads/master
+ $orgmain $newmain refs/heads/main
EOF
cat >post-update.expect <<-EOF &&
- refs/heads/master
+ refs/heads/main
EOF
test_cmp pre-receive.expect pre-receive.actual &&
@@ -727,7 +729,7 @@
'
test_expect_success 'deletion of a non-existent ref alone does trigger post-receive and post-update hooks' '
- mk_test_with_hooks testrepo heads/master &&
+ mk_test_with_hooks testrepo heads/main &&
git push testrepo :refs/heads/nonexistent &&
(
cd testrepo/.git &&
@@ -747,42 +749,42 @@
'
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 &&
- orgmaster=$(cd testrepo && git show-ref -s --verify refs/heads/master) &&
- newmaster=$(git show-ref -s --verify refs/heads/master) &&
+ mk_test_with_hooks testrepo heads/main heads/next heads/seen &&
+ orgmain=$(cd testrepo && git show-ref -s --verify refs/heads/main) &&
+ newmain=$(git show-ref -s --verify refs/heads/main) &&
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) &&
- git push testrepo refs/heads/master:refs/heads/master \
- refs/heads/master:refs/heads/pu :refs/heads/next \
+ orgseen=$(cd testrepo && git show-ref -s --verify refs/heads/seen) &&
+ newseen=$(git show-ref -s --verify refs/heads/main) &&
+ git push testrepo refs/heads/main:refs/heads/main \
+ refs/heads/main:refs/heads/seen :refs/heads/next \
:refs/heads/nonexistent &&
(
cd testrepo/.git &&
cat >pre-receive.expect <<-EOF &&
- $orgmaster $newmaster refs/heads/master
+ $orgmain $newmain refs/heads/main
$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/main $orgmain $newmain
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
+ $orgmain $newmain refs/heads/main
$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/main
refs/heads/next
- refs/heads/pu
+ refs/heads/seen
EOF
test_cmp pre-receive.expect pre-receive.actual &&
@@ -793,15 +795,15 @@
'
test_expect_success 'allow deleting a ref using --delete' '
- mk_test testrepo heads/master &&
+ mk_test testrepo heads/main &&
(cd testrepo && git config receive.denyDeleteCurrent warn) &&
- git push testrepo --delete master &&
- (cd testrepo && test_must_fail git rev-parse --verify refs/heads/master)
+ git push testrepo --delete main &&
+ (cd testrepo && test_must_fail git rev-parse --verify refs/heads/main)
'
test_expect_success 'allow deleting a tag using --delete' '
- mk_test testrepo heads/master &&
- git tag -a -m dummy_message deltag heads/master &&
+ mk_test testrepo heads/main &&
+ git tag -a -m dummy_message deltag heads/main &&
git push testrepo --tags &&
(cd testrepo && git rev-parse --verify -q refs/tags/deltag) &&
git push testrepo --delete tag deltag &&
@@ -809,56 +811,61 @@
'
test_expect_success 'push --delete without args aborts' '
- mk_test testrepo heads/master &&
+ mk_test testrepo heads/main &&
test_must_fail git push testrepo --delete
'
test_expect_success 'push --delete refuses src:dest refspecs' '
+ mk_test testrepo heads/main &&
+ test_must_fail git push testrepo --delete main:foo
+'
+
+test_expect_success 'push --delete refuses empty string' '
mk_test testrepo heads/master &&
- test_must_fail git push testrepo --delete master:foo
+ test_must_fail git push testrepo --delete ""
'
test_expect_success 'warn on push to HEAD of non-bare repository' '
- mk_test testrepo heads/master &&
+ mk_test testrepo heads/main &&
(
cd testrepo &&
- git checkout master &&
+ git checkout main &&
git config receive.denyCurrentBranch warn
) &&
- git push testrepo master 2>stderr &&
+ git push testrepo main 2>stderr &&
grep "warning: updating the current branch" stderr
'
test_expect_success 'deny push to HEAD of non-bare repository' '
- mk_test testrepo heads/master &&
+ mk_test testrepo heads/main &&
(
cd testrepo &&
- git checkout master &&
+ git checkout main &&
git config receive.denyCurrentBranch true
) &&
- test_must_fail git push testrepo master
+ test_must_fail git push testrepo main
'
test_expect_success 'allow push to HEAD of bare repository (bare)' '
- mk_test testrepo heads/master &&
+ mk_test testrepo heads/main &&
(
cd testrepo &&
- git checkout master &&
+ git checkout main &&
git config receive.denyCurrentBranch true &&
git config core.bare true
) &&
- git push testrepo master 2>stderr &&
+ git push testrepo main 2>stderr &&
! grep "warning: updating the current branch" stderr
'
test_expect_success 'allow push to HEAD of non-bare repository (config)' '
- mk_test testrepo heads/master &&
+ mk_test testrepo heads/main &&
(
cd testrepo &&
- git checkout master &&
+ git checkout main &&
git config receive.denyCurrentBranch false
) &&
- git push testrepo master 2>stderr &&
+ git push testrepo main 2>stderr &&
! grep "warning: updating the current branch" stderr
'
@@ -874,7 +881,7 @@
git for-each-ref refs/heads >actual &&
test_cmp expect actual
) &&
- git checkout master
+ git checkout main
'
test_expect_success 'fetch with branches containing #' '
@@ -887,7 +894,7 @@
git for-each-ref refs/heads >actual &&
test_cmp expect actual
) &&
- git checkout master
+ git checkout main
'
test_expect_success 'push with branches' '
@@ -897,7 +904,7 @@
git push branch1 &&
(
cd testrepo &&
- echo "$the_first_commit commit refs/heads/master" >expect &&
+ echo "$the_first_commit commit refs/heads/main" >expect &&
git for-each-ref refs/heads >actual &&
test_cmp expect actual
)
@@ -913,11 +920,11 @@
git for-each-ref refs/heads >actual &&
test_cmp expect actual
) &&
- git checkout master
+ git checkout main
'
test_expect_success 'push into aliased refs (consistent)' '
- mk_test testrepo heads/master &&
+ mk_test testrepo heads/main &&
mk_child testrepo child1 &&
mk_child testrepo child2 &&
(
@@ -939,7 +946,7 @@
'
test_expect_success 'push into aliased refs (inconsistent)' '
- mk_test testrepo heads/master &&
+ mk_test testrepo heads/main &&
mk_child testrepo child1 &&
mk_child testrepo child2 &&
(
@@ -970,7 +977,7 @@
tag_args=$2
test_expect_success "force pushing required to update $tag_type_description" "
- mk_test testrepo heads/master &&
+ mk_test testrepo heads/main &&
mk_child testrepo child1 &&
mk_child testrepo child2 &&
(
@@ -1016,7 +1023,7 @@
tag_args=$2
test_expect_success "fetch will not clobber an existing $tag_type_description without --force" "
- mk_test testrepo heads/master &&
+ mk_test testrepo heads/main &&
mk_child testrepo child1 &&
mk_child testrepo child2 &&
(
@@ -1039,12 +1046,12 @@
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/main:refs/remotes/origin/main [new reference]" &&
echo >>.git/foo "Done" &&
- git push >.git/bar --porcelain testrepo refs/heads/master:refs/remotes/origin/master &&
+ git push >.git/bar --porcelain testrepo refs/heads/main:refs/remotes/origin/main &&
(
cd testrepo &&
- echo "$the_commit commit refs/remotes/origin/master" >expect &&
+ echo "$the_commit commit refs/remotes/origin/main" >expect &&
git for-each-ref refs/remotes/origin >actual &&
test_cmp expect actual
) &&
@@ -1053,51 +1060,52 @@
test_expect_success 'push --porcelain bad url' '
mk_empty testrepo &&
- test_must_fail git push >.git/bar --porcelain asdfasdfasd refs/heads/master:refs/remotes/origin/master &&
+ test_must_fail git push >.git/bar --porcelain asdfasdfasd refs/heads/main:refs/remotes/origin/main &&
! grep -q Done .git/bar
'
test_expect_success 'push --porcelain rejected' '
mk_empty testrepo &&
- git push testrepo refs/heads/master:refs/remotes/origin/master &&
+ git push testrepo refs/heads/main:refs/remotes/origin/main &&
(cd testrepo &&
- git reset --hard origin/master^ &&
+ git reset --hard origin/main^ &&
git config receive.denyCurrentBranch true) &&
echo >.git/foo "To testrepo" &&
- echo >>.git/foo "! refs/heads/master:refs/heads/master [remote rejected] (branch is currently checked out)" &&
+ echo >>.git/foo "! refs/heads/main:refs/heads/main [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_must_fail git push >.git/bar --porcelain testrepo refs/heads/main:refs/heads/main &&
test_cmp .git/foo .git/bar
'
test_expect_success 'push --porcelain --dry-run rejected' '
mk_empty testrepo &&
- git push testrepo refs/heads/master:refs/remotes/origin/master &&
+ git push testrepo refs/heads/main:refs/remotes/origin/main &&
(cd testrepo &&
- git reset --hard origin/master &&
+ git reset --hard origin/main &&
git config receive.denyCurrentBranch true) &&
echo >.git/foo "To testrepo" &&
- echo >>.git/foo "! refs/heads/master^:refs/heads/master [rejected] (non-fast-forward)" &&
+ echo >>.git/foo "! refs/heads/main^:refs/heads/main [rejected] (non-fast-forward)" &&
echo >>.git/foo "Done" &&
- test_must_fail git push >.git/bar --porcelain --dry-run testrepo refs/heads/master^:refs/heads/master &&
+ test_must_fail git push >.git/bar --porcelain --dry-run testrepo refs/heads/main^:refs/heads/main &&
test_cmp .git/foo .git/bar
'
test_expect_success 'push --prune' '
- mk_test testrepo heads/master heads/second heads/foo heads/bar &&
+ mk_test testrepo heads/main heads/second heads/foo heads/bar &&
git push --prune testrepo : &&
- check_push_result testrepo $the_commit heads/master &&
+ check_push_result testrepo $the_commit heads/main &&
check_push_result testrepo $the_first_commit heads/second &&
! check_push_result testrepo $the_first_commit heads/foo heads/bar
'
test_expect_success 'push --prune refspec' '
- mk_test testrepo tmp/master tmp/second tmp/foo tmp/bar &&
+ mk_test testrepo tmp/main tmp/second tmp/foo tmp/bar &&
git push --prune testrepo "refs/heads/*:refs/tmp/*" &&
- check_push_result testrepo $the_commit tmp/master &&
+ check_push_result testrepo $the_commit tmp/main &&
check_push_result testrepo $the_first_commit tmp/second &&
! check_push_result testrepo $the_first_commit tmp/foo tmp/bar
'
@@ -1105,18 +1113,18 @@
for configsection in transfer receive
do
test_expect_success "push to update a ref hidden by $configsection.hiderefs" '
- mk_test testrepo heads/master hidden/one hidden/two hidden/three &&
+ mk_test testrepo heads/main hidden/one hidden/two hidden/three &&
(
cd testrepo &&
git config $configsection.hiderefs refs/hidden
) &&
# push to unhidden ref succeeds normally
- git push testrepo master:refs/heads/master &&
- check_push_result testrepo $the_commit heads/master &&
+ git push testrepo main:refs/heads/main &&
+ check_push_result testrepo $the_commit heads/main &&
# push to update a hidden ref should fail
- test_must_fail git push testrepo master:refs/hidden/one &&
+ test_must_fail git push testrepo main:refs/hidden/one &&
check_push_result testrepo $the_first_commit hidden/one &&
# push to delete a hidden ref should fail
@@ -1130,8 +1138,8 @@
done
test_expect_success 'fetch exact SHA1' '
- mk_test testrepo heads/master hidden/one &&
- git push testrepo master:refs/hidden/one &&
+ mk_test testrepo heads/main hidden/one &&
+ git push testrepo main:refs/hidden/one &&
(
cd testrepo &&
git config transfer.hiderefs refs/hidden
@@ -1162,7 +1170,7 @@
git config uploadpack.allowtipsha1inwant true
) &&
- git fetch -v ../testrepo $the_commit:refs/heads/copy master:refs/heads/extra &&
+ git fetch -v ../testrepo $the_commit:refs/heads/copy main:refs/heads/extra &&
cat >expect <<-EOF &&
$the_commit
$the_first_commit
@@ -1176,8 +1184,8 @@
'
test_expect_success 'fetch exact SHA1 in protocol v2' '
- mk_test testrepo heads/master hidden/one &&
- git push testrepo master:refs/hidden/one &&
+ mk_test testrepo heads/main hidden/one &&
+ git push testrepo main:refs/hidden/one &&
git -C testrepo config transfer.hiderefs refs/hidden &&
check_push_result testrepo $the_commit hidden/one &&
@@ -1253,23 +1261,25 @@
git cat-file commit $SHA1_2 &&
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
+ # ideally we would insist this be on a "remote error:"
+ # line, but it is racy; see the commit message
+ test_i18ngrep "not our ref.*$SHA1_3\$" err
)
'
done
test_expect_success 'fetch follows tags by default' '
- mk_test testrepo heads/master &&
+ mk_test testrepo heads/main &&
rm -fr src dst &&
git init src &&
(
cd src &&
- git pull ../testrepo master &&
+ git pull ../testrepo main &&
git tag -m "annotated" tag &&
git for-each-ref >tmp1 &&
(
cat tmp1
- sed -n "s|refs/heads/master$|refs/remotes/origin/master|p" tmp1
+ sed -n "s|refs/heads/main$|refs/remotes/origin/main|p" tmp1
) |
sort -k 3 >../expect
) &&
@@ -1277,8 +1287,8 @@
(
cd dst &&
git remote add origin ../src &&
- git config branch.master.remote origin &&
- git config branch.master.merge refs/heads/master &&
+ git config branch.main.remote origin &&
+ git config branch.main.merge refs/heads/main &&
git pull &&
git for-each-ref >../actual
) &&
@@ -1297,74 +1307,74 @@
'
test_expect_success 'pushing a specific ref applies remote.$name.push as refmap' '
- mk_test testrepo heads/master &&
+ mk_test testrepo heads/main &&
rm -fr src dst &&
git init src &&
git init --bare dst &&
(
cd src &&
- git pull ../testrepo master &&
+ git pull ../testrepo main &&
git branch next &&
git config remote.dst.url ../dst &&
git config remote.dst.push "+refs/heads/*:refs/remotes/src/*" &&
- git push dst master &&
- git show-ref refs/heads/master |
+ git push dst main &&
+ git show-ref refs/heads/main |
sed -e "s|refs/heads/|refs/remotes/src/|" >../dst/expect
) &&
(
cd dst &&
test_must_fail git show-ref refs/heads/next &&
- test_must_fail git show-ref refs/heads/master &&
- git show-ref refs/remotes/src/master >actual
+ test_must_fail git show-ref refs/heads/main &&
+ git show-ref refs/remotes/src/main >actual
) &&
test_cmp dst/expect dst/actual
'
test_expect_success 'with no remote.$name.push, it is not used as refmap' '
- mk_test testrepo heads/master &&
+ mk_test testrepo heads/main &&
rm -fr src dst &&
git init src &&
git init --bare dst &&
(
cd src &&
- git pull ../testrepo master &&
+ git pull ../testrepo main &&
git branch next &&
git config remote.dst.url ../dst &&
git config push.default matching &&
- git push dst master &&
- git show-ref refs/heads/master >../dst/expect
+ git push dst main &&
+ git show-ref refs/heads/main >../dst/expect
) &&
(
cd dst &&
test_must_fail git show-ref refs/heads/next &&
- git show-ref refs/heads/master >actual
+ git show-ref refs/heads/main >actual
) &&
test_cmp dst/expect dst/actual
'
test_expect_success 'with no remote.$name.push, upstream mapping is used' '
- mk_test testrepo heads/master &&
+ mk_test testrepo heads/main &&
rm -fr src dst &&
git init src &&
git init --bare dst &&
(
cd src &&
- git pull ../testrepo master &&
+ git pull ../testrepo main &&
git branch next &&
git config remote.dst.url ../dst &&
git config remote.dst.fetch "+refs/heads/*:refs/remotes/dst/*" &&
git config push.default upstream &&
- git config branch.master.merge refs/heads/trunk &&
- git config branch.master.remote dst &&
+ git config branch.main.merge refs/heads/trunk &&
+ git config branch.main.remote dst &&
- git push dst master &&
- git show-ref refs/heads/master |
- sed -e "s|refs/heads/master|refs/heads/trunk|" >../dst/expect
+ git push dst main &&
+ git show-ref refs/heads/main |
+ sed -e "s|refs/heads/main|refs/heads/trunk|" >../dst/expect
) &&
(
cd dst &&
- test_must_fail git show-ref refs/heads/master &&
+ test_must_fail git show-ref refs/heads/main &&
test_must_fail git show-ref refs/heads/next &&
git show-ref refs/heads/trunk >actual
) &&
@@ -1372,20 +1382,20 @@
'
test_expect_success 'push does not follow tags by default' '
- mk_test testrepo heads/master &&
+ mk_test testrepo heads/main &&
rm -fr src dst &&
git init src &&
git init --bare dst &&
(
cd src &&
- git pull ../testrepo master &&
+ git pull ../testrepo main &&
git tag -m "annotated" tag &&
git checkout -b another &&
git commit --allow-empty -m "future commit" &&
git tag -m "future" future &&
- git checkout master &&
- git for-each-ref refs/heads/master >../expect &&
- git push ../dst master
+ git checkout main &&
+ git for-each-ref refs/heads/main >../expect &&
+ git push ../dst main
) &&
(
cd dst &&
@@ -1395,20 +1405,20 @@
'
test_expect_success 'push --follow-tags only pushes relevant tags' '
- mk_test testrepo heads/master &&
+ mk_test testrepo heads/main &&
rm -fr src dst &&
git init src &&
git init --bare dst &&
(
cd src &&
- git pull ../testrepo master &&
+ git pull ../testrepo main &&
git tag -m "annotated" tag &&
git checkout -b another &&
git commit --allow-empty -m "future commit" &&
git tag -m "future" future &&
- git checkout master &&
- git for-each-ref refs/heads/master refs/tags/tag >../expect &&
- git push --follow-tags ../dst master
+ git checkout main &&
+ git for-each-ref refs/heads/main refs/tags/tag >../expect &&
+ git push --follow-tags ../dst main
) &&
(
cd dst &&
@@ -1426,12 +1436,12 @@
git commit -am initial &&
git init no-thin &&
git --git-dir=no-thin/.git config receive.unpacklimit 0 &&
- git push no-thin/.git refs/heads/master:refs/heads/foo &&
+ git push no-thin/.git refs/heads/main:refs/heads/foo &&
echo modified >> path1 &&
git commit -am modified &&
git repack -adf &&
rcvpck="git receive-pack --reject-thin-pack-for-testing" &&
- git push --no-thin --receive-pack="$rcvpck" no-thin/.git refs/heads/master:refs/heads/foo
+ git push --no-thin --receive-pack="$rcvpck" no-thin/.git refs/heads/main:refs/heads/foo
'
test_expect_success 'pushing a tag pushes the tagged object' '
@@ -1454,12 +1464,12 @@
# double push to test both with and without
# the actual pack transfer
- git push dst.git master:one &&
+ git push dst.git main:one &&
echo "one@{0} push" >expect &&
git -C dst.git log -g --format="%gd %gs" one >actual &&
test_cmp expect actual &&
- git push dst.git master:two &&
+ git push dst.git main:two &&
echo "two@{0} push" >expect &&
git -C dst.git log -g --format="%gd %gs" two >actual &&
test_cmp expect actual
@@ -1474,20 +1484,20 @@
# as above, we double-fetch to test both
# with and without pack transfer
- git fetch .. master:one &&
- echo "one@{0} fetch .. master:one: storing head" >expect &&
+ git fetch .. main:one &&
+ echo "one@{0} fetch .. main:one: storing head" >expect &&
git log -g --format="%gd %gs" one >actual &&
test_cmp expect actual &&
- git fetch .. master:two &&
- echo "two@{0} fetch .. master:two: storing head" >expect &&
+ git fetch .. main:two &&
+ echo "two@{0} fetch .. main:two: storing head" >expect &&
git log -g --format="%gd %gs" two >actual &&
test_cmp expect actual
)
'
test_expect_success 'receive.denyCurrentBranch = updateInstead' '
- git push testrepo master &&
+ git push testrepo main &&
(
cd testrepo &&
git reset --hard &&
@@ -1496,7 +1506,7 @@
test_commit third path2 &&
# Try pushing into a repository with pristine working tree
- git push testrepo master &&
+ git push testrepo main &&
(
cd testrepo &&
git update-index -q --refresh &&
@@ -1513,7 +1523,7 @@
test $(git -C .. rev-parse HEAD^) = $(git rev-parse HEAD) &&
test-tool chmtime +100 path1
) &&
- git push testrepo master &&
+ git push testrepo main &&
(
cd testrepo &&
git update-index -q --refresh &&
@@ -1533,7 +1543,7 @@
cd testrepo &&
echo changed >path1
) &&
- test_must_fail git push testrepo master &&
+ test_must_fail git push testrepo main &&
(
cd testrepo &&
test $(git -C .. rev-parse HEAD^) = $(git rev-parse HEAD) &&
@@ -1547,7 +1557,7 @@
echo changed >path1 &&
git add path1
) &&
- test_must_fail git push testrepo master &&
+ test_must_fail git push testrepo main &&
(
cd testrepo &&
test $(git -C .. rev-parse HEAD^) = $(git rev-parse HEAD) &&
@@ -1564,7 +1574,7 @@
git reset --hard &&
echo changed >path3
) &&
- test_must_fail git push testrepo master &&
+ test_must_fail git push testrepo main &&
(
cd testrepo &&
test $(git -C .. rev-parse HEAD^^) = $(git rev-parse HEAD) &&
@@ -1580,7 +1590,7 @@
echo fifth >path3 &&
git add path3
) &&
- test_must_fail git push testrepo master &&
+ test_must_fail git push testrepo main &&
(
cd testrepo &&
test $(git -C .. rev-parse HEAD^^) = $(git rev-parse HEAD) &&
@@ -1595,17 +1605,17 @@
cd void &&
git config receive.denyCurrentBranch updateInstead
) &&
- git push void master &&
+ git push void main &&
(
cd void &&
- test $(git -C .. rev-parse master) = $(git rev-parse HEAD) &&
+ test $(git -C .. rev-parse main) = $(git rev-parse HEAD) &&
git diff --quiet &&
git diff --cached --quiet
) &&
# (6) updateInstead intervened by fast-forward check
- test_must_fail git push void master^:master &&
- test $(git -C void rev-parse HEAD) = $(git rev-parse master) &&
+ test_must_fail git push void main^:main &&
+ test $(git -C void rev-parse HEAD) = $(git rev-parse main) &&
git -C void diff --quiet &&
git -C void diff --cached --quiet
'
@@ -1615,7 +1625,7 @@
git init testrepo &&
(
cd testrepo &&
- git pull .. master &&
+ git pull .. main &&
git reset --hard HEAD^^ &&
git tag initial &&
git config receive.denyCurrentBranch updateInstead &&
@@ -1633,7 +1643,7 @@
) &&
# Try pushing into a pristine
- git push testrepo master &&
+ git push testrepo main &&
(
cd testrepo &&
git diff --quiet &&
@@ -1647,7 +1657,7 @@
git reset --hard initial &&
echo conflicting >path2
) &&
- test_must_fail git push testrepo master &&
+ test_must_fail git push testrepo main &&
(
cd testrepo &&
test $(git rev-parse initial) = $(git rev-parse HEAD) &&
@@ -1663,7 +1673,7 @@
echo irrelevant >path5 &&
git add path5
) &&
- git push testrepo master &&
+ git push testrepo main &&
(
cd testrepo &&
test "$(cat path1)" = unrelated &&
@@ -1703,7 +1713,7 @@
EOF
) &&
- git push void master &&
+ git push void main &&
(
cd void &&
git diff --quiet &&
diff --git a/t/t5517-push-mirror.sh b/t/t5517-push-mirror.sh
index e4edd56..a448e16 100755
--- a/t/t5517-push-mirror.sh
+++ b/t/t5517-push-mirror.sh
@@ -2,6 +2,9 @@
test_description='pushing to a mirror repository'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
D=$(pwd)
@@ -15,16 +18,16 @@
}
mk_repo_pair () {
- rm -rf master mirror &&
+ rm -rf main mirror &&
mkdir mirror &&
(
cd mirror &&
git init &&
git config receive.denyCurrentBranch warn
) &&
- mkdir master &&
+ mkdir main &&
(
- cd master &&
+ cd main &&
git init &&
git remote add $1 up ../mirror
)
@@ -36,13 +39,13 @@
mk_repo_pair &&
(
- cd master &&
+ cd main &&
echo one >foo && git add foo && git commit -m one &&
git push --mirror up
) &&
- master_master=$(cd master && git show-ref -s --verify refs/heads/master) &&
- mirror_master=$(cd mirror && git show-ref -s --verify refs/heads/master) &&
- test "$master_master" = "$mirror_master"
+ main_main=$(cd main && git show-ref -s --verify refs/heads/main) &&
+ mirror_main=$(cd mirror && git show-ref -s --verify refs/heads/main) &&
+ test "$main_main" = "$mirror_main"
'
@@ -50,15 +53,15 @@
mk_repo_pair &&
(
- cd master &&
+ cd main &&
echo one >foo && git add foo && git commit -m one &&
git push --mirror up &&
echo two >foo && git add foo && git commit -m two &&
git push --mirror up
) &&
- master_master=$(cd master && git show-ref -s --verify refs/heads/master) &&
- mirror_master=$(cd mirror && git show-ref -s --verify refs/heads/master) &&
- test "$master_master" = "$mirror_master"
+ main_main=$(cd main && git show-ref -s --verify refs/heads/main) &&
+ mirror_main=$(cd mirror && git show-ref -s --verify refs/heads/main) &&
+ test "$main_main" = "$mirror_main"
'
@@ -66,7 +69,7 @@
mk_repo_pair &&
(
- cd master &&
+ cd main &&
echo one >foo && git add foo && git commit -m one &&
git push --mirror up &&
echo two >foo && git add foo && git commit -m two &&
@@ -74,9 +77,9 @@
git reset --hard HEAD^ &&
git push --mirror up
) &&
- master_master=$(cd master && git show-ref -s --verify refs/heads/master) &&
- mirror_master=$(cd mirror && git show-ref -s --verify refs/heads/master) &&
- test "$master_master" = "$mirror_master"
+ main_main=$(cd main && git show-ref -s --verify refs/heads/main) &&
+ mirror_main=$(cd mirror && git show-ref -s --verify refs/heads/main) &&
+ test "$main_main" = "$mirror_main"
'
@@ -84,9 +87,9 @@
mk_repo_pair &&
(
- cd master &&
+ cd main &&
echo one >foo && git add foo && git commit -m one &&
- git branch remove master &&
+ git branch remove main &&
git push --mirror up &&
git branch -D remove &&
git push --mirror up
@@ -102,21 +105,21 @@
mk_repo_pair &&
(
- cd master &&
+ cd main &&
echo one >foo && git add foo && git commit -m one &&
- git branch remove master &&
+ git branch remove main &&
git push --mirror up &&
git branch -D remove &&
- git branch add master &&
+ git branch add main &&
echo two >foo && git add foo && git commit -m two &&
git push --mirror up
) &&
- master_master=$(cd master && git show-ref -s --verify refs/heads/master) &&
- master_add=$(cd master && git show-ref -s --verify refs/heads/add) &&
- mirror_master=$(cd mirror && git show-ref -s --verify refs/heads/master) &&
+ main_main=$(cd main && git show-ref -s --verify refs/heads/main) &&
+ main_add=$(cd main && git show-ref -s --verify refs/heads/add) &&
+ mirror_main=$(cd mirror && git show-ref -s --verify refs/heads/main) &&
mirror_add=$(cd mirror && git show-ref -s --verify refs/heads/add) &&
- test "$master_master" = "$mirror_master" &&
- test "$master_add" = "$mirror_add" &&
+ test "$main_main" = "$mirror_main" &&
+ test "$main_add" = "$mirror_add" &&
(
cd mirror &&
invert git show-ref -s --verify refs/heads/remove
@@ -130,14 +133,14 @@
mk_repo_pair &&
(
- cd master &&
+ cd main &&
echo one >foo && git add foo && git commit -m one &&
- git tag -f tmaster master &&
+ git tag -f tmain main &&
git push --mirror up
) &&
- master_master=$(cd master && git show-ref -s --verify refs/tags/tmaster) &&
- mirror_master=$(cd mirror && git show-ref -s --verify refs/tags/tmaster) &&
- test "$master_master" = "$mirror_master"
+ main_main=$(cd main && git show-ref -s --verify refs/tags/tmain) &&
+ mirror_main=$(cd mirror && git show-ref -s --verify refs/tags/tmain) &&
+ test "$main_main" = "$mirror_main"
'
@@ -145,17 +148,17 @@
mk_repo_pair &&
(
- cd master &&
+ cd main &&
echo one >foo && git add foo && git commit -m one &&
- git tag -f tmaster master &&
+ git tag -f tmain main &&
git push --mirror up &&
echo two >foo && git add foo && git commit -m two &&
- git tag -f tmaster master &&
+ git tag -f tmain main &&
git push --mirror up
) &&
- master_master=$(cd master && git show-ref -s --verify refs/tags/tmaster) &&
- mirror_master=$(cd mirror && git show-ref -s --verify refs/tags/tmaster) &&
- test "$master_master" = "$mirror_master"
+ main_main=$(cd main && git show-ref -s --verify refs/tags/tmain) &&
+ mirror_main=$(cd mirror && git show-ref -s --verify refs/tags/tmain) &&
+ test "$main_main" = "$mirror_main"
'
@@ -163,20 +166,20 @@
mk_repo_pair &&
(
- cd master &&
+ cd main &&
echo one >foo && git add foo && git commit -m one &&
- git tag -f tmaster master &&
+ git tag -f tmain main &&
git push --mirror up &&
echo two >foo && git add foo && git commit -m two &&
- git tag -f tmaster master &&
+ git tag -f tmain main &&
git push --mirror up &&
git reset --hard HEAD^ &&
- git tag -f tmaster master &&
+ git tag -f tmain main &&
git push --mirror up
) &&
- master_master=$(cd master && git show-ref -s --verify refs/tags/tmaster) &&
- mirror_master=$(cd mirror && git show-ref -s --verify refs/tags/tmaster) &&
- test "$master_master" = "$mirror_master"
+ main_main=$(cd main && git show-ref -s --verify refs/tags/tmain) &&
+ mirror_main=$(cd mirror && git show-ref -s --verify refs/tags/tmain) &&
+ test "$main_main" = "$mirror_main"
'
@@ -184,9 +187,9 @@
mk_repo_pair &&
(
- cd master &&
+ cd main &&
echo one >foo && git add foo && git commit -m one &&
- git tag -f tremove master &&
+ git tag -f tremove main &&
git push --mirror up &&
git tag -d tremove &&
git push --mirror up
@@ -202,23 +205,23 @@
mk_repo_pair &&
(
- cd master &&
+ cd main &&
echo one >foo && git add foo && git commit -m one &&
- git tag -f tmaster master &&
- git tag -f tremove master &&
+ git tag -f tmain main &&
+ git tag -f tremove main &&
git push --mirror up &&
git tag -d tremove &&
- git tag tadd master &&
+ git tag tadd main &&
echo two >foo && git add foo && git commit -m two &&
- git tag -f tmaster master &&
+ git tag -f tmain main &&
git push --mirror up
) &&
- master_master=$(cd master && git show-ref -s --verify refs/tags/tmaster) &&
- master_add=$(cd master && git show-ref -s --verify refs/tags/tadd) &&
- mirror_master=$(cd mirror && git show-ref -s --verify refs/tags/tmaster) &&
+ main_main=$(cd main && git show-ref -s --verify refs/tags/tmain) &&
+ main_add=$(cd main && git show-ref -s --verify refs/tags/tadd) &&
+ mirror_main=$(cd mirror && git show-ref -s --verify refs/tags/tmain) &&
mirror_add=$(cd mirror && git show-ref -s --verify refs/tags/tadd) &&
- test "$master_master" = "$mirror_master" &&
- test "$master_add" = "$mirror_add" &&
+ test "$main_main" = "$mirror_main" &&
+ test "$main_add" = "$mirror_add" &&
(
cd mirror &&
invert git show-ref -s --verify refs/tags/tremove
@@ -230,10 +233,10 @@
mk_repo_pair --mirror &&
(
- cd master &&
+ cd main &&
echo one >foo && git add foo && git commit -m one &&
- git branch keep master &&
- git branch remove master &&
+ git branch keep main &&
+ git branch remove main &&
git push up &&
git branch -D remove &&
git push up
@@ -250,10 +253,10 @@
mk_repo_pair &&
(
- cd master &&
+ cd main &&
echo one >foo && git add foo && git commit -m one &&
git config --add remote.up.mirror no &&
- git branch keep master &&
+ git branch keep main &&
git push --mirror up &&
git branch -D keep &&
git push up :
@@ -268,10 +271,10 @@
test_expect_success 'push to mirrored repository with refspec fails' '
mk_repo_pair &&
(
- cd master &&
+ cd main &&
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_must_fail git push up main
)
'
diff --git a/t/t5518-fetch-exit-status.sh b/t/t5518-fetch-exit-status.sh
index c2060bb..5c4ac25 100755
--- a/t/t5518-fetch-exit-status.sh
+++ b/t/t5518-fetch-exit-status.sh
@@ -5,6 +5,9 @@
test_description='fetch exit status test'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
@@ -17,20 +20,20 @@
echo side >file &&
git commit -a -m side &&
- git checkout master &&
+ git checkout main &&
echo next >file &&
git commit -a -m next
'
test_expect_success 'non-fast-forward fetch' '
- test_must_fail git fetch . master:side
+ test_must_fail git fetch . main:side
'
test_expect_success 'forced update' '
- git fetch . +master:side
+ git fetch . +main:side
'
diff --git a/t/t5519-push-alternates.sh b/t/t5519-push-alternates.sh
index 11fcd37..20ba604 100755
--- a/t/t5519-push-alternates.sh
+++ b/t/t5519-push-alternates.sh
@@ -2,6 +2,9 @@
test_description='push to a repository that borrows from elsewhere'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
@@ -17,7 +20,7 @@
>file &&
git add . &&
git commit -m initial &&
- git push ../alice-pub master
+ git push ../alice-pub main
) &&
# Project Bob is a fork of project Alice
@@ -31,7 +34,7 @@
git clone alice-pub bob-work &&
(
cd bob-work &&
- git push ../bob-pub master
+ git push ../bob-pub main
)
'
@@ -54,7 +57,7 @@
# has at her public repository are available to it
# via its alternates.
cd bob-work &&
- git pull ../alice-pub master &&
+ git pull ../alice-pub main &&
echo more bob >file &&
git commit -a -m third &&
git push ../bob-pub :
@@ -93,7 +96,7 @@
test_expect_success 'bob works and pushes' '
(
# This time Bob does not pull from Alice, and
- # the master branch at her public repository points
+ # the main branch at her public repository points
# at a commit Bob does not know about. This should
# not prevent the push by Bob from succeeding.
cd bob-work &&
@@ -122,11 +125,11 @@
test_expect_success 'bob works and pushes again' '
(
cd alice-pub &&
- git cat-file commit master >../bob-work/commit
+ git cat-file commit main >../bob-work/commit
) &&
(
# This time Bob does not pull from Alice, and
- # the master branch at her public repository points
+ # the main branch at her public repository points
# at a commit Bob does not fully know about, but
# he happens to have the commit object (but not the
# necessary tree) in his repository from Alice.
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 2f86fca..a094113 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -2,6 +2,9 @@
test_description='pulling into void'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
modify () {
@@ -10,11 +13,13 @@
}
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_cmp_rev HEAD^"$expect_parent_num" copy &&
echo dirty >expect &&
test_cmp expect new_file &&
echo "modified again" >expect &&
@@ -26,7 +31,7 @@
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 '
@@ -46,11 +51,11 @@
test_cmp file cloned/file
'
-test_expect_success 'pulling into void using master:master' '
+test_expect_success 'pulling into void using main:main' '
git init cloned-uho &&
(
cd cloned-uho &&
- git pull .. master:master
+ git pull .. main:main
) &&
test_path_is_file file &&
test_path_is_file cloned-uho/file &&
@@ -62,7 +67,7 @@
(
cd cloned-untracked &&
echo untracked >file &&
- test_must_fail git pull .. master &&
+ test_must_fail git pull .. main &&
echo untracked >expect &&
test_cmp expect file
)
@@ -74,7 +79,7 @@
cd cloned-staged-colliding &&
echo "alternate content" >file &&
git add file &&
- test_must_fail git pull .. master &&
+ test_must_fail git pull .. main &&
echo "alternate content" >expect &&
test_cmp expect file &&
git cat-file blob :file >file.index &&
@@ -88,7 +93,7 @@
cd cloned-staged-new &&
echo "new tracked file" >newfile &&
git add newfile &&
- git pull .. master &&
+ git pull .. main &&
echo "new tracked file" >expect &&
test_cmp expect newfile &&
git cat-file blob :newfile >newfile.index &&
@@ -100,15 +105,15 @@
git init cloned-octopus &&
(
cd cloned-octopus &&
- test_must_fail git pull .. master master &&
+ test_must_fail git pull .. main main &&
test_path_is_missing file
)
'
test_expect_success 'test . as a remote' '
- git branch copy master &&
+ git branch copy main &&
git config branch.copy.remote . &&
- git config branch.copy.merge refs/heads/master &&
+ git config branch.copy.merge refs/heads/main &&
echo updated >file &&
git commit -a -m updated &&
git checkout copy &&
@@ -124,7 +129,7 @@
'
test_expect_success 'the default remote . should not break explicit pull' '
- git checkout -b second master^ &&
+ git checkout -b second main^ &&
echo modified >file &&
git commit -a -m modified &&
git checkout copy &&
@@ -359,7 +364,7 @@
test_expect_success '--rebase fails with multiple branches' '
git reset --hard before-rebase &&
- test_must_fail git pull --rebase . copy master 2>err &&
+ test_must_fail git pull --rebase . copy main 2>err &&
test_cmp_rev HEAD before-rebase &&
test_i18ngrep "Cannot rebase onto multiple branches" err &&
echo modified >expect &&
@@ -369,22 +374,22 @@
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' '
@@ -402,13 +407,40 @@
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 &&
@@ -422,7 +454,7 @@
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' '
@@ -471,7 +503,7 @@
test_i18ngrep ! "verify-signatures" err
'
-# add a feature branch, keep-merge, that is merged into master, so the
+# add a feature branch, keep-merge, that is merged into main, so the
# test can try preserving the merge commit (or not) with various
# --rebase flags/pull.rebase settings.
test_expect_success 'preserve merge setup' '
@@ -670,12 +702,12 @@
'
test_expect_success 'pull --rebase works on branch yet to be born' '
- git rev-parse master >expect &&
+ git rev-parse main >expect &&
mkdir empty_repo &&
(
cd empty_repo &&
git init &&
- git pull --rebase .. master &&
+ git pull --rebase .. main &&
git rev-parse HEAD >../actual
) &&
test_cmp expect actual
@@ -691,7 +723,7 @@
echo staged-file >expect &&
git ls-files >actual &&
test_cmp expect actual &&
- test_must_fail git pull --rebase .. master 2>err &&
+ test_must_fail git pull --rebase .. main 2>err &&
git ls-files >actual &&
test_cmp expect actual &&
git show :staged-file >actual &&
@@ -750,7 +782,7 @@
(
cd dst &&
test_might_fail git rebase --abort &&
- git reset --hard origin/master
+ git reset --hard origin/main
) &&
git clone --bare src src-replace.git &&
rm -rf src &&
diff --git a/t/t5521-pull-options.sh b/t/t5521-pull-options.sh
index ccde8ba..63a688b 100755
--- a/t/t5521-pull-options.sh
+++ b/t/t5521-pull-options.sh
@@ -2,6 +2,9 @@
test_description='pull options'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup' '
@@ -11,10 +14,10 @@
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 +33,10 @@
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 +49,10 @@
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 +65,36 @@
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 &&
@@ -92,13 +102,13 @@
cat >>.git/config <<-\EOF &&
[remote "one"]
url = ../parent
- fetch = refs/heads/master:refs/heads/mirror
+ fetch = refs/heads/main:refs/heads/mirror
[remote "two"]
url = ../parent
- fetch = refs/heads/master:refs/heads/origin
- [branch "master"]
+ fetch = refs/heads/main:refs/heads/origin
+ [branch "main"]
remote = two
- merge = refs/heads/master
+ merge = refs/heads/main
EOF
git pull two &&
test_commit A &&
@@ -117,9 +127,9 @@
[remote "two"]
url = ../parent
fetch = refs/heads/*:refs/remotes/two/*
- [branch "master"]
+ [branch "main"]
remote = one
- merge = refs/heads/master
+ merge = refs/heads/main
EOF
git pull --all
)
@@ -132,7 +142,7 @@
cd clonedry &&
git pull --dry-run ../parent &&
test_path_is_missing .git/FETCH_HEAD &&
- test_path_is_missing .git/refs/heads/master &&
+ test_path_is_missing .git/refs/heads/main &&
test_path_is_missing .git/index &&
test_path_is_missing file
)
@@ -146,7 +156,7 @@
git remote add origin ../parent &&
git pull --all --dry-run &&
test_path_is_missing .git/FETCH_HEAD &&
- test_path_is_missing .git/refs/remotes/origin/master &&
+ test_path_is_missing .git/refs/remotes/origin/main &&
test_path_is_missing .git/index &&
test_path_is_missing file
)
diff --git a/t/t5523-push-upstream.sh b/t/t5523-push-upstream.sh
index c0df81a..9fbe7f7 100755
--- a/t/t5523-push-upstream.sh
+++ b/t/t5523-push-upstream.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='push with --set-upstream'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-terminal.sh
@@ -26,35 +29,35 @@
test_cmp expect.$1 actual.$1
}
-test_expect_success 'push -u master:master' '
- git push -u upstream master:master &&
- check_config master upstream refs/heads/master
+test_expect_success 'push -u main:main' '
+ git push -u upstream main:main &&
+ check_config main upstream refs/heads/main
'
-test_expect_success 'push -u master:other' '
- git push -u upstream master:other &&
- check_config master upstream refs/heads/other
+test_expect_success 'push -u main:other' '
+ git push -u upstream main:other &&
+ check_config main upstream refs/heads/other
'
-test_expect_success 'push -u --dry-run master:otherX' '
- git push -u --dry-run upstream master:otherX &&
- check_config master upstream refs/heads/other
+test_expect_success 'push -u --dry-run main:otherX' '
+ git push -u --dry-run upstream main:otherX &&
+ check_config main 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' '
@@ -74,7 +77,7 @@
test_expect_success TTY 'progress messages go to tty' '
ensure_fresh_upstream &&
- test_terminal git push -u upstream master >out 2>err &&
+ test_terminal git push -u upstream main >out 2>err &&
test_i18ngrep "Writing objects" err
'
@@ -82,7 +85,7 @@
ensure_fresh_upstream &&
# skip progress messages, since stderr is non-tty
- git push -u upstream master >out 2>err &&
+ git push -u upstream main >out 2>err &&
test_i18ngrep ! "Writing objects" err
'
@@ -90,21 +93,21 @@
ensure_fresh_upstream &&
# force progress messages to stderr, even though it is non-tty
- git push -u --progress upstream master >out 2>err &&
+ git push -u --progress upstream main >out 2>err &&
test_i18ngrep "Writing objects" err
'
test_expect_success TTY 'push -q suppresses progress' '
ensure_fresh_upstream &&
- test_terminal git push -u -q upstream master >out 2>err &&
+ test_terminal git push -u -q upstream main >out 2>err &&
test_i18ngrep ! "Writing objects" err
'
test_expect_success TTY 'push --no-progress suppresses progress' '
ensure_fresh_upstream &&
- test_terminal git push -u --no-progress upstream master >out 2>err &&
+ test_terminal git push -u --no-progress upstream main >out 2>err &&
test_i18ngrep ! "Unpacking objects" err &&
test_i18ngrep ! "Writing objects" err
'
@@ -112,7 +115,7 @@
test_expect_success TTY 'quiet push' '
ensure_fresh_upstream &&
- test_terminal git push --quiet --no-progress upstream master 2>&1 | tee output &&
+ test_terminal git push --quiet --no-progress upstream main 2>&1 | tee output &&
test_must_be_empty output
'
diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh
index 63205df..ed11569 100755
--- a/t/t5526-fetch-submodules.sh
+++ b/t/t5526-fetch-submodules.sh
@@ -3,6 +3,9 @@
test_description='Recursive "git fetch" for submodules'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
pwd=$(pwd)
@@ -18,7 +21,7 @@
head2=$(git rev-parse --short HEAD) &&
echo "Fetching submodule submodule" > ../expect.err &&
echo "From $pwd/submodule" >> ../expect.err &&
- echo " $head1..$head2 master -> origin/master" >> ../expect.err
+ echo " $head1..$head2 sub -> origin/sub" >> ../expect.err
) &&
(
cd deepsubmodule &&
@@ -30,7 +33,7 @@
head2=$(git rev-parse --short HEAD) &&
echo "Fetching submodule submodule/subdir/deepsubmodule" >> ../expect.err
echo "From $pwd/deepsubmodule" >> ../expect.err &&
- echo " $head1..$head2 master -> origin/master" >> ../expect.err
+ echo " $head1..$head2 deep -> origin/deep" >> ../expect.err
)
}
@@ -41,7 +44,8 @@
git init &&
echo deepsubcontent > deepsubfile &&
git add deepsubfile &&
- git commit -m new deepsubfile
+ git commit -m new deepsubfile &&
+ git branch -M deep
) &&
mkdir submodule &&
(
@@ -50,10 +54,12 @@
echo subcontent > subfile &&
git add subfile &&
git submodule add "$pwd/deepsubmodule" subdir/deepsubmodule &&
- git commit -a -m new
+ git commit -a -m new &&
+ git branch -M sub
) &&
git submodule add "$pwd/submodule" submodule &&
git commit -am initial &&
+ git branch -M super &&
git clone . downstream &&
(
cd downstream &&
@@ -68,7 +74,7 @@
git fetch --recurse-submodules >../actual.out 2>../actual.err
) &&
test_must_be_empty actual.out &&
- test_i18ncmp expect.err actual.err
+ test_cmp expect.err actual.err
'
test_expect_success "submodule.recurse option triggers recursive fetch" '
@@ -78,7 +84,7 @@
git -c submodule.recurse fetch >../actual.out 2>../actual.err
) &&
test_must_be_empty actual.out &&
- test_i18ncmp expect.err actual.err
+ test_cmp expect.err actual.err
'
test_expect_success "fetch --recurse-submodules -j2 has the same output behaviour" '
@@ -88,7 +94,7 @@
GIT_TRACE="$TRASH_DIRECTORY/trace.out" git fetch --recurse-submodules -j2 2>../actual.err
) &&
test_must_be_empty actual.out &&
- test_i18ncmp expect.err actual.err &&
+ test_cmp expect.err actual.err &&
grep "2 tasks" trace.out
'
@@ -118,7 +124,7 @@
git fetch >../actual.out 2>../actual.err
) &&
test_must_be_empty actual.out &&
- test_i18ncmp expect.err actual.err
+ test_cmp expect.err actual.err
'
test_expect_success "--no-recurse-submodules overrides .gitmodules config" '
@@ -149,7 +155,7 @@
git config --unset submodule.submodule.fetchRecurseSubmodules
) &&
test_must_be_empty actual.out &&
- test_i18ncmp expect.err actual.err
+ test_cmp expect.err actual.err
'
test_expect_success "--quiet propagates to submodules" '
@@ -177,7 +183,7 @@
git fetch --recurse-submodules --dry-run >../actual.out 2>../actual.err
) &&
test_must_be_empty actual.out &&
- test_i18ncmp expect.err actual.err
+ test_cmp expect.err actual.err
'
test_expect_success "Without --dry-run propagates to submodules" '
@@ -186,7 +192,7 @@
git fetch --recurse-submodules >../actual.out 2>../actual.err
) &&
test_must_be_empty actual.out &&
- test_i18ncmp expect.err actual.err
+ test_cmp expect.err actual.err
'
test_expect_success "recurseSubmodules=true propagates into submodules" '
@@ -197,7 +203,7 @@
git fetch >../actual.out 2>../actual.err
) &&
test_must_be_empty actual.out &&
- test_i18ncmp expect.err actual.err
+ test_cmp expect.err actual.err
'
test_expect_success "--recurse-submodules overrides config in submodule" '
@@ -211,7 +217,7 @@
git fetch --recurse-submodules >../actual.out 2>../actual.err
) &&
test_must_be_empty actual.out &&
- test_i18ncmp expect.err actual.err
+ test_cmp expect.err actual.err
'
test_expect_success "--no-recurse-submodules overrides config setting" '
@@ -245,13 +251,13 @@
git commit -m "new submodule" &&
head2=$(git rev-parse --short HEAD) &&
echo "From $pwd/." > expect.err.sub &&
- echo " $head1..$head2 master -> origin/master" >>expect.err.sub &&
+ echo " $head1..$head2 super -> origin/super" >>expect.err.sub &&
head -3 expect.err >> expect.err.sub &&
(
cd downstream &&
git fetch >../actual.out 2>../actual.err
) &&
- test_i18ncmp expect.err.sub actual.err &&
+ test_cmp expect.err.sub actual.err &&
test_must_be_empty actual.out
'
@@ -263,13 +269,13 @@
git commit -m "new file" &&
head2=$(git rev-parse --short HEAD) &&
echo "From $pwd/." > expect.err.file &&
- echo " $head1..$head2 master -> origin/master" >> expect.err.file &&
+ echo " $head1..$head2 super -> origin/super" >> expect.err.file &&
(
cd downstream &&
git fetch >../actual.out 2>../actual.err
) &&
test_must_be_empty actual.out &&
- test_i18ncmp expect.err.file actual.err
+ test_cmp expect.err.file actual.err
'
test_expect_success "Recursion picks up config in submodule" '
@@ -287,7 +293,7 @@
git commit -m "new submodule" &&
head2=$(git rev-parse --short HEAD) &&
echo "From $pwd/." > expect.err.sub &&
- echo " $head1..$head2 master -> origin/master" >> expect.err.sub &&
+ echo " $head1..$head2 super -> origin/super" >> expect.err.sub &&
cat expect.err >> expect.err.sub &&
(
cd downstream &&
@@ -297,7 +303,7 @@
git config --unset fetch.recurseSubmodules
)
) &&
- test_i18ncmp expect.err.sub actual.err &&
+ test_cmp expect.err.sub actual.err &&
test_must_be_empty actual.out
'
@@ -316,21 +322,21 @@
head2=$(git rev-parse --short HEAD) &&
echo "Fetching submodule submodule" > ../expect.err.sub &&
echo "From $pwd/submodule" >> ../expect.err.sub &&
- echo " $head1..$head2 master -> origin/master" >> ../expect.err.sub
+ echo " $head1..$head2 sub -> origin/sub" >> ../expect.err.sub
) &&
head1=$(git rev-parse --short HEAD) &&
git add submodule &&
git commit -m "new submodule" &&
head2=$(git rev-parse --short HEAD) &&
echo "From $pwd/." > expect.err.2 &&
- echo " $head1..$head2 master -> origin/master" >> expect.err.2 &&
+ echo " $head1..$head2 super -> origin/super" >> expect.err.2 &&
cat expect.err.sub >> expect.err.2 &&
tail -3 expect.err >> expect.err.2 &&
(
cd downstream &&
git fetch >../actual.out 2>../actual.err
) &&
- test_i18ncmp expect.err.2 actual.err &&
+ test_cmp expect.err.2 actual.err &&
test_must_be_empty actual.out
'
@@ -349,7 +355,7 @@
head2=$(git rev-parse --short HEAD) &&
echo Fetching submodule submodule > ../expect.err.sub &&
echo "From $pwd/submodule" >> ../expect.err.sub &&
- echo " $head1..$head2 master -> origin/master" >> ../expect.err.sub
+ echo " $head1..$head2 sub -> origin/sub" >> ../expect.err.sub
) &&
(
cd downstream &&
@@ -368,7 +374,7 @@
head2=$(git rev-parse --short HEAD) &&
tail -3 expect.err > expect.err.deepsub &&
echo "From $pwd/." > expect.err &&
- echo " $head1..$head2 master -> origin/master" >>expect.err &&
+ echo " $head1..$head2 super -> origin/super" >>expect.err &&
cat expect.err.sub >> expect.err &&
cat expect.err.deepsub >> expect.err &&
(
@@ -386,7 +392,7 @@
)
) &&
test_must_be_empty actual.out &&
- test_i18ncmp expect.err actual.err
+ test_cmp expect.err actual.err
'
test_expect_success "'--recurse-submodules=on-demand' stops when no new submodule commits are found in the superproject (and ignores config)" '
@@ -397,13 +403,13 @@
git commit -m "new file" &&
head2=$(git rev-parse --short HEAD) &&
echo "From $pwd/." > expect.err.file &&
- echo " $head1..$head2 master -> origin/master" >> expect.err.file &&
+ echo " $head1..$head2 super -> origin/super" >> expect.err.file &&
(
cd downstream &&
git fetch --recurse-submodules=on-demand >../actual.out 2>../actual.err
) &&
test_must_be_empty actual.out &&
- test_i18ncmp expect.err.file actual.err
+ test_cmp expect.err.file actual.err
'
test_expect_success "'fetch.recurseSubmodules=on-demand' overrides global config" '
@@ -418,7 +424,7 @@
git commit -m "new submodule" &&
head2=$(git rev-parse --short HEAD) &&
echo "From $pwd/." > expect.err.2 &&
- echo " $head1..$head2 master -> origin/master" >>expect.err.2 &&
+ echo " $head1..$head2 super -> origin/super" >>expect.err.2 &&
head -3 expect.err >> expect.err.2 &&
(
cd downstream &&
@@ -431,7 +437,7 @@
git config --unset fetch.recurseSubmodules
) &&
test_must_be_empty actual.out &&
- test_i18ncmp expect.err.2 actual.err
+ test_cmp expect.err.2 actual.err
'
test_expect_success "'submodule.<sub>.fetchRecurseSubmodules=on-demand' overrides fetch.recurseSubmodules" '
@@ -446,7 +452,7 @@
git commit -m "new submodule" &&
head2=$(git rev-parse --short HEAD) &&
echo "From $pwd/." > expect.err.2 &&
- echo " $head1..$head2 master -> origin/master" >>expect.err.2 &&
+ echo " $head1..$head2 super -> origin/super" >>expect.err.2 &&
head -3 expect.err >> expect.err.2 &&
(
cd downstream &&
@@ -459,7 +465,7 @@
git config --unset submodule.submodule.fetchRecurseSubmodules
) &&
test_must_be_empty actual.out &&
- test_i18ncmp expect.err.2 actual.err
+ test_cmp expect.err.2 actual.err
'
test_expect_success "don't fetch submodule when newly recorded commits are already present" '
@@ -472,16 +478,16 @@
git commit -m "submodule rewound" &&
head2=$(git rev-parse --short HEAD) &&
echo "From $pwd/." > expect.err &&
- echo " $head1..$head2 master -> origin/master" >> expect.err &&
+ echo " $head1..$head2 super -> origin/super" >> expect.err &&
(
cd downstream &&
git fetch >../actual.out 2>../actual.err
) &&
test_must_be_empty actual.out &&
- test_i18ncmp expect.err actual.err &&
+ test_cmp expect.err actual.err &&
(
cd submodule &&
- git checkout -q master
+ git checkout -q sub
)
'
@@ -497,7 +503,7 @@
git commit -m "new submodule without .gitmodules" &&
head2=$(git rev-parse --short HEAD) &&
echo "From $pwd/." >expect.err.2 &&
- echo " $head1..$head2 master -> origin/master" >>expect.err.2 &&
+ echo " $head1..$head2 super -> origin/super" >>expect.err.2 &&
head -3 expect.err >>expect.err.2 &&
(
cd downstream &&
@@ -514,7 +520,7 @@
git reset --hard
) &&
test_must_be_empty actual.out &&
- test_i18ncmp expect.err.2 actual.err &&
+ test_cmp expect.err.2 actual.err &&
git checkout HEAD^ -- .gitmodules &&
git add .gitmodules &&
git commit -m "new submodule restored .gitmodules"
@@ -663,9 +669,9 @@
git config -f .gitmodules --remove-section submodule.sub1 &&
git add .gitmodules &&
git commit -m "delete gitmodules file" &&
- git checkout -B master &&
+ git checkout -B super &&
git -C downstream fetch &&
- git -C downstream checkout origin/master &&
+ git -C downstream checkout origin/super &&
C=$(git -C submodule commit-tree -m "yet another change outside refs/heads" HEAD^{tree}) &&
git -C submodule update-ref refs/changes/7 $C &&
@@ -719,4 +725,121 @@
)
'
+add_commit_push () {
+ dir="$1" &&
+ msg="$2" &&
+ shift 2 &&
+ git -C "$dir" add "$@" &&
+ git -C "$dir" commit -a -m "$msg" &&
+ git -C "$dir" push
+}
+
+compare_refs_in_dir () {
+ fail= &&
+ if test "x$1" = 'x!'
+ then
+ fail='!' &&
+ shift
+ fi &&
+ git -C "$1" rev-parse --verify "$2" >expect &&
+ git -C "$3" rev-parse --verify "$4" >actual &&
+ eval $fail test_cmp expect actual
+}
+
+
+test_expect_success 'setup nested submodule fetch test' '
+ # does not depend on any previous test setups
+
+ for repo in outer middle inner
+ do
+ git init --bare $repo &&
+ git clone $repo ${repo}_content &&
+ echo "$repo" >"${repo}_content/file" &&
+ add_commit_push ${repo}_content "initial" file ||
+ return 1
+ done &&
+
+ git clone outer A &&
+ git -C A submodule add "$pwd/middle" &&
+ git -C A/middle/ submodule add "$pwd/inner" &&
+ add_commit_push A/middle/ "adding inner sub" .gitmodules inner &&
+ add_commit_push A/ "adding middle sub" .gitmodules middle &&
+
+ git clone outer B &&
+ git -C B/ submodule update --init middle &&
+
+ compare_refs_in_dir A HEAD B HEAD &&
+ compare_refs_in_dir A/middle HEAD B/middle HEAD &&
+ test_path_is_file B/file &&
+ test_path_is_file B/middle/file &&
+ test_path_is_missing B/middle/inner/file &&
+
+ echo "change on inner repo of A" >"A/middle/inner/file" &&
+ add_commit_push A/middle/inner "change on inner" file &&
+ add_commit_push A/middle "change on inner" inner &&
+ add_commit_push A "change on inner" middle
+'
+
+test_expect_success 'fetching a superproject containing an uninitialized sub/sub project' '
+ # depends on previous test for setup
+
+ git -C B/ fetch &&
+ compare_refs_in_dir A origin/HEAD B origin/HEAD
+'
+
+fetch_with_recursion_abort () {
+ # In a regression the following git call will run into infinite recursion.
+ # To handle that, we connect the sed command to the git call by a pipe
+ # so that sed can kill the infinite recursion when detected.
+ # The recursion creates git output like:
+ # Fetching submodule sub
+ # Fetching submodule sub/sub <-- [1]
+ # Fetching submodule sub/sub/sub
+ # ...
+ # [1] sed will stop reading and cause git to eventually stop and die
+
+ git -C "$1" fetch --recurse-submodules 2>&1 |
+ sed "/Fetching submodule $2[^$]/q" >out &&
+ ! grep "Fetching submodule $2[^$]" out
+}
+
+test_expect_success 'setup recursive fetch with uninit submodule' '
+ # does not depend on any previous test setups
+
+ test_create_repo super &&
+ test_commit -C super initial &&
+ test_create_repo sub &&
+ test_commit -C sub initial &&
+ git -C sub rev-parse HEAD >expect &&
+
+ git -C super submodule add ../sub &&
+ git -C super commit -m "add sub" &&
+
+ git clone super superclone &&
+ git -C superclone submodule status >out &&
+ sed -e "s/^-//" -e "s/ sub.*$//" out >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'recursive fetch with uninit submodule' '
+ # depends on previous test for setup
+
+ fetch_with_recursion_abort superclone sub &&
+ git -C superclone submodule status >out &&
+ sed -e "s/^-//" -e "s/ sub$//" out >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'recursive fetch after deinit a submodule' '
+ # depends on previous test for setup
+
+ git -C superclone submodule update --init sub &&
+ git -C superclone submodule deinit -f sub &&
+
+ fetch_with_recursion_abort superclone sub &&
+ git -C superclone submodule status >out &&
+ sed -e "s/^-//" -e "s/ sub$//" out >actual &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t5527-fetch-odd-refs.sh b/t/t5527-fetch-odd-refs.sh
index 3b0cb98..e2770e4 100755
--- a/t/t5527-fetch-odd-refs.sh
+++ b/t/t5527-fetch-odd-refs.sh
@@ -1,17 +1,20 @@
#!/bin/sh
test_description='test fetching of oddly-named refs'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
# afterwards we will have:
# HEAD - two
-# refs/for/refs/heads/master - one
-# refs/heads/master - three
+# refs/for/refs/heads/main - one
+# refs/heads/main - three
test_expect_success 'setup repo with odd suffix ref' '
echo content >file &&
git add . &&
git commit -m one &&
- git update-ref refs/for/refs/heads/master HEAD &&
+ git update-ref refs/for/refs/heads/main HEAD &&
echo content >>file &&
git commit -a -m two &&
echo content >>file &&
@@ -22,7 +25,7 @@
test_expect_success 'suffix ref is ignored during fetch' '
git clone --bare file://"$PWD" suffix &&
echo three >expect &&
- git --git-dir=suffix log -1 --format=%s refs/heads/master >actual &&
+ git --git-dir=suffix log -1 --format=%s refs/heads/main >actual &&
test_cmp expect actual
'
@@ -33,7 +36,7 @@
(
cd long &&
test_commit long &&
- test_commit master
+ test_commit main
) &&
if git -C long update-ref refs/heads/$ref1440 long; then
test_set_prereq LONG_REF
@@ -46,7 +49,7 @@
git fetch long refs/heads/*:refs/remotes/long/* &&
cat >expect <<-\EOF &&
long
- master
+ main
EOF
git for-each-ref --format="%(subject)" refs/remotes/long >actual &&
test_cmp expect actual
@@ -55,7 +58,7 @@
test_expect_success LONG_REF 'push handles extremely long refname' '
git push long :refs/heads/$ref1440 &&
git -C long for-each-ref --format="%(subject)" refs/heads >actual &&
- echo master >expect &&
+ echo main >expect &&
test_cmp expect actual
'
diff --git a/t/t5528-push-default.sh b/t/t5528-push-default.sh
index 4d1e0c3..f280e00 100755
--- a/t/t5528-push-default.sh
+++ b/t/t5528-push-default.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='check various push.default settings'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup bare remotes' '
@@ -41,7 +44,7 @@
# $1 = success or failure
# $2 = push.default value
-# $3 = branch to check for actual output (master or foo)
+# $3 = branch to check for actual output (main or foo)
# $4 = [optional] switch to triangular workflow
test_pushdefault_workflow () {
workflow=central
@@ -51,8 +54,8 @@
pushdefault=parent2
fi
test_expect_success "push.default = $2 $1 in $workflow workflows" "
- test_config branch.master.remote parent1 &&
- test_config branch.master.merge refs/heads/foo &&
+ test_config branch.main.remote parent1 &&
+ test_config branch.main.merge refs/heads/foo &&
test_config remote.pushdefault $pushdefault &&
test_commit commit-for-$2${4+-triangular} &&
test_push_$1 $2 $3 ${4+repo2}
@@ -60,32 +63,32 @@
}
test_expect_success '"upstream" pushes to configured upstream' '
- git checkout master &&
- test_config branch.master.remote parent1 &&
- test_config branch.master.merge refs/heads/foo &&
+ git checkout main &&
+ test_config branch.main.remote parent1 &&
+ test_config branch.main.merge refs/heads/foo &&
test_commit two &&
test_push_success upstream foo
'
test_expect_success '"upstream" does not push on unconfigured remote' '
- git checkout master &&
- test_unconfig branch.master.remote &&
+ git checkout main &&
+ test_unconfig branch.main.remote &&
test_commit three &&
test_push_failure upstream
'
test_expect_success '"upstream" does not push on unconfigured branch' '
- git checkout master &&
- test_config branch.master.remote parent1 &&
- test_unconfig branch.master.merge &&
+ git checkout main &&
+ test_config branch.main.remote parent1 &&
+ test_unconfig branch.main.merge &&
test_commit four &&
test_push_failure upstream
'
test_expect_success '"upstream" does not push when remotes do not match' '
- git checkout master &&
- test_config branch.master.remote parent1 &&
- test_config branch.master.merge refs/heads/foo &&
+ git checkout main &&
+ test_config branch.main.remote parent1 &&
+ test_config branch.main.merge refs/heads/foo &&
test_config push.default upstream &&
test_commit five &&
test_must_fail git push parent2
@@ -98,6 +101,12 @@
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 &&
@@ -115,99 +124,99 @@
'
test_expect_success 'push to existing branch, with no upstream configured' '
- test_config branch.master.remote repo1 &&
- git checkout master &&
+ test_config branch.main.remote repo1 &&
+ git checkout main &&
test_push_failure simple &&
test_push_failure upstream
'
test_expect_success 'push to existing branch, upstream configured with same name' '
- test_config branch.master.remote repo1 &&
- test_config branch.master.merge refs/heads/master &&
- git checkout master &&
+ test_config branch.main.remote repo1 &&
+ test_config branch.main.merge refs/heads/main &&
+ git checkout main &&
test_commit six &&
- test_push_success upstream master &&
+ test_push_success upstream main &&
test_commit seven &&
- test_push_success simple master
+ test_push_success simple main
'
test_expect_success 'push to existing branch, upstream configured with different name' '
- test_config branch.master.remote repo1 &&
- test_config branch.master.merge refs/heads/other-name &&
- git checkout master &&
+ test_config branch.main.remote repo1 &&
+ test_config branch.main.merge refs/heads/other-name &&
+ git checkout main &&
test_commit eight &&
test_push_success upstream other-name &&
test_commit nine &&
test_push_failure simple &&
git --git-dir=repo1 log -1 --format="%h %s" "other-name" >expect-other-name &&
- test_push_success current master &&
+ test_push_success current main &&
git --git-dir=repo1 log -1 --format="%h %s" "other-name" >actual-other-name &&
test_cmp expect-other-name actual-other-name
'
-# We are on 'master', which integrates with 'foo' from parent1
+# We are on 'main', which integrates with 'foo' from parent1
# remote (set in test_pushdefault_workflow helper). Push to
# parent1 in centralized, and push to parent2 in triangular workflow.
-# The parent1 repository has 'master' and 'foo' branches, while
-# the parent2 repository has only 'master' branch.
+# The parent1 repository has 'main' and 'foo' branches, while
+# the parent2 repository has only 'main' branch.
#
# test_pushdefault_workflow() arguments:
# $1 = success or failure
# $2 = push.default value
-# $3 = branch to check for actual output (master or foo)
+# $3 = branch to check for actual output (main or foo)
# $4 = [optional] switch to triangular workflow
-# update parent1's master (which is not our upstream)
-test_pushdefault_workflow success current master
+# update parent1's main (which is not our upstream)
+test_pushdefault_workflow success current main
# update parent1's foo (which is our upstream)
test_pushdefault_workflow success upstream foo
# upstream is foo which is not the name of the current branch
-test_pushdefault_workflow failure simple master
+test_pushdefault_workflow failure simple main
-# master and foo are updated
-test_pushdefault_workflow success matching master
+# main and foo are updated
+test_pushdefault_workflow success matching main
-# master is updated
-test_pushdefault_workflow success current master triangular
+# main is updated
+test_pushdefault_workflow success current main triangular
# upstream mode cannot be used in triangular
test_pushdefault_workflow failure upstream foo triangular
# in triangular, 'simple' works as 'current' and update the branch
# with the same name.
-test_pushdefault_workflow success simple master triangular
+test_pushdefault_workflow success simple main triangular
-# master is updated (parent2 does not have foo)
-test_pushdefault_workflow success matching master triangular
+# main is updated (parent2 does not have foo)
+test_pushdefault_workflow success matching main triangular
# default tests, when no push-default is specified. This
# should behave the same as "simple" in non-triangular
# settings, and as "current" otherwise.
test_expect_success 'default behavior allows "simple" push' '
- test_config branch.master.remote parent1 &&
- test_config branch.master.merge refs/heads/master &&
+ test_config branch.main.remote parent1 &&
+ test_config branch.main.merge refs/heads/main &&
test_config remote.pushdefault parent1 &&
- test_commit default-master-master &&
- test_push_success "" master
+ test_commit default-main-main &&
+ test_push_success "" main
'
test_expect_success 'default behavior rejects non-simple push' '
- test_config branch.master.remote parent1 &&
- test_config branch.master.merge refs/heads/foo &&
+ test_config branch.main.remote parent1 &&
+ test_config branch.main.merge refs/heads/foo &&
test_config remote.pushdefault parent1 &&
- test_commit default-master-foo &&
+ test_commit default-main-foo &&
test_push_failure ""
'
test_expect_success 'default triangular behavior acts like "current"' '
- test_config branch.master.remote parent1 &&
- test_config branch.master.merge refs/heads/foo &&
+ test_config branch.main.remote parent1 &&
+ test_config branch.main.merge refs/heads/foo &&
test_config remote.pushdefault parent2 &&
test_commit default-triangular &&
- test_push_success "" master repo2
+ test_push_success "" main repo2
'
test_done
diff --git a/t/t5529-push-errors.sh b/t/t5529-push-errors.sh
index 9871307..ce85fd3 100755
--- a/t/t5529-push-errors.sh
+++ b/t/t5529-push-errors.sh
@@ -32,7 +32,7 @@
test_expect_success 'detect missing sha1 expressions early' '
echo no >rp-ran &&
echo no >expect &&
- test_must_fail git push origin master~2:master &&
+ test_must_fail git push origin main~2:main &&
test_cmp expect rp-ran
'
diff --git a/t/t5530-upload-pack-error.sh b/t/t5530-upload-pack-error.sh
index 4ce9a9f..7c1460e 100755
--- a/t/t5530-upload-pack-error.sh
+++ b/t/t5530-upload-pack-error.sh
@@ -14,7 +14,6 @@
}
test_expect_success 'setup and corrupt repository' '
- test_oid_init &&
echo file >file &&
git add file &&
git rev-parse :file &&
@@ -89,6 +88,23 @@
grep "pack-objects died" output.err
'
+test_expect_success 'upload-pack tolerates EOF just after stateless client wants' '
+ test_commit initial &&
+ head=$(git rev-parse HEAD) &&
+
+ {
+ packetize "want $head" &&
+ packetize "shallow $head" &&
+ packetize "deepen 1" &&
+ printf "0000"
+ } >request &&
+
+ printf "0000" >expect &&
+
+ git upload-pack --stateless-rpc . <request >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'create empty repository' '
mkdir foo &&
@@ -99,7 +115,7 @@
test_expect_success 'fetch fails' '
- test_must_fail git fetch .. master
+ test_must_fail git fetch .. main
'
diff --git a/t/t5531-deep-submodule-push.sh b/t/t5531-deep-submodule-push.sh
index 4ad059e..d573ca4 100755
--- a/t/t5531-deep-submodule-push.sh
+++ b/t/t5531-deep-submodule-push.sh
@@ -2,6 +2,9 @@
test_description='test push with submodules'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
@@ -30,7 +33,7 @@
test_expect_success 'push works with recorded gitlink' '
(
cd work &&
- git push ../pub.git master
+ git push ../pub.git main
)
'
@@ -45,7 +48,7 @@
cd work &&
git add gar/bage &&
git commit -m "Second commit for gar/bage" &&
- git push --recurse-submodules=check ../pub.git master
+ git push --recurse-submodules=check ../pub.git main
)
'
@@ -66,21 +69,21 @@
git commit -m "Third commit for gar/bage" &&
# the push should fail with --recurse-submodules=check
# on the command line...
- test_must_fail git push --recurse-submodules=check ../pub.git master &&
+ test_must_fail git push --recurse-submodules=check ../pub.git main &&
# ...or if specified in the configuration..
- test_must_fail git -c push.recurseSubmodules=check push ../pub.git master
+ test_must_fail git -c push.recurseSubmodules=check push ../pub.git main
)
'
test_expect_success 'push succeeds after commit was pushed to remote' '
(
cd work/gar/bage &&
- git push origin master
+ git push origin main
) &&
(
cd work &&
- git push --recurse-submodules=check ../pub.git master
+ git push --recurse-submodules=check ../pub.git main
)
'
@@ -95,13 +98,13 @@
cd work &&
git add gar/bage &&
git commit -m "Recurse on-demand on command line for gar/bage" &&
- git push --recurse-submodules=on-demand ../pub.git master &&
+ git push --recurse-submodules=on-demand ../pub.git main &&
# Check that the supermodule commit got there
git fetch ../pub.git &&
- git diff --quiet FETCH_HEAD master &&
+ git diff --quiet FETCH_HEAD main &&
# Check that the submodule commit got there too
cd gar/bage &&
- git diff --quiet origin/master master
+ git diff --quiet origin/main main
)
'
@@ -116,13 +119,13 @@
cd work &&
git add gar/bage &&
git commit -m "Recurse on-demand from config for gar/bage" &&
- git -c push.recurseSubmodules=on-demand push ../pub.git master &&
+ git -c push.recurseSubmodules=on-demand push ../pub.git main &&
# Check that the supermodule commit got there
git fetch ../pub.git &&
- git diff --quiet FETCH_HEAD master &&
+ git diff --quiet FETCH_HEAD main &&
# Check that the submodule commit got there too
cd gar/bage &&
- git diff --quiet origin/master master
+ git diff --quiet origin/main main
)
'
@@ -137,13 +140,13 @@
cd work &&
git add gar/bage &&
git commit -m "Recurse submodule.recurse from config for gar/bage" &&
- git -c submodule.recurse push ../pub.git master &&
+ git -c submodule.recurse push ../pub.git main &&
# Check that the supermodule commit got there
git fetch ../pub.git &&
- git diff --quiet FETCH_HEAD master &&
+ git diff --quiet FETCH_HEAD main &&
# Check that the submodule commit got there too
cd gar/bage &&
- git diff --quiet origin/master master
+ git diff --quiet origin/main main
)
'
@@ -161,34 +164,34 @@
# Ensure that we can override on-demand in the config
# to just check submodules
- test_must_fail git -c push.recurseSubmodules=on-demand push --recurse-submodules=check ../pub.git master &&
+ test_must_fail git -c push.recurseSubmodules=on-demand push --recurse-submodules=check ../pub.git main &&
# Check that the supermodule commit did not get there
git fetch ../pub.git &&
- git diff --quiet FETCH_HEAD master^ &&
+ git diff --quiet FETCH_HEAD main^ &&
# Check that the submodule commit did not get there
- (cd gar/bage && git diff --quiet origin/master master^) &&
+ (cd gar/bage && git diff --quiet origin/main main^) &&
# Ensure that we can override check in the config to
# disable submodule recursion entirely
- (cd gar/bage && git diff --quiet origin/master master^) &&
- git -c push.recurseSubmodules=on-demand push --recurse-submodules=no ../pub.git master &&
+ (cd gar/bage && git diff --quiet origin/main main^) &&
+ git -c push.recurseSubmodules=on-demand push --recurse-submodules=no ../pub.git main &&
git fetch ../pub.git &&
- git diff --quiet FETCH_HEAD master &&
- (cd gar/bage && git diff --quiet origin/master master^) &&
+ git diff --quiet FETCH_HEAD main &&
+ (cd gar/bage && git diff --quiet origin/main main^) &&
# Ensure that we can override check in the config to
# disable submodule recursion entirely (alternative form)
- git -c push.recurseSubmodules=on-demand push --no-recurse-submodules ../pub.git master &&
+ git -c push.recurseSubmodules=on-demand push --no-recurse-submodules ../pub.git main &&
git fetch ../pub.git &&
- git diff --quiet FETCH_HEAD master &&
- (cd gar/bage && git diff --quiet origin/master master^) &&
+ git diff --quiet FETCH_HEAD main &&
+ (cd gar/bage && git diff --quiet origin/main main^) &&
# Ensure that we can override check in the config to
# push the submodule too
- git -c push.recurseSubmodules=check push --recurse-submodules=on-demand ../pub.git master &&
+ git -c push.recurseSubmodules=check push --recurse-submodules=on-demand ../pub.git main &&
git fetch ../pub.git &&
- git diff --quiet FETCH_HEAD master &&
- (cd gar/bage && git diff --quiet origin/master master)
+ git diff --quiet FETCH_HEAD main &&
+ (cd gar/bage && git diff --quiet origin/main main)
)
'
@@ -205,31 +208,31 @@
git commit -m "Recurse on command-line overriding earlier command-line for gar/bage" &&
# should result in "check"
- test_must_fail git push --recurse-submodules=on-demand --recurse-submodules=check ../pub.git master &&
+ test_must_fail git push --recurse-submodules=on-demand --recurse-submodules=check ../pub.git main &&
# Check that the supermodule commit did not get there
git fetch ../pub.git &&
- git diff --quiet FETCH_HEAD master^ &&
+ git diff --quiet FETCH_HEAD main^ &&
# Check that the submodule commit did not get there
- (cd gar/bage && git diff --quiet origin/master master^) &&
+ (cd gar/bage && git diff --quiet origin/main main^) &&
# should result in "no"
- git push --recurse-submodules=on-demand --recurse-submodules=no ../pub.git master &&
+ git push --recurse-submodules=on-demand --recurse-submodules=no ../pub.git main &&
# Check that the supermodule commit did get there
git fetch ../pub.git &&
- git diff --quiet FETCH_HEAD master &&
+ git diff --quiet FETCH_HEAD main &&
# Check that the submodule commit did not get there
- (cd gar/bage && git diff --quiet origin/master master^) &&
+ (cd gar/bage && git diff --quiet origin/main main^) &&
# should result in "no"
- git push --recurse-submodules=on-demand --no-recurse-submodules ../pub.git master &&
+ git push --recurse-submodules=on-demand --no-recurse-submodules ../pub.git main &&
# Check that the submodule commit did not get there
- (cd gar/bage && git diff --quiet origin/master master^) &&
+ (cd gar/bage && git diff --quiet origin/main main^) &&
# But the options in the other order should push the submodule
- git push --recurse-submodules=check --recurse-submodules=on-demand ../pub.git master &&
+ git push --recurse-submodules=check --recurse-submodules=on-demand ../pub.git main &&
# Check that the submodule commit did get there
git fetch ../pub.git &&
- (cd gar/bage && git diff --quiet origin/master master)
+ (cd gar/bage && git diff --quiet origin/main main)
)
'
@@ -244,13 +247,13 @@
cd work &&
git add gar/bage &&
git commit -m "Recurse on-demand on command-line overriding config for gar/bage" &&
- git -c push.recurseSubmodules=check push --recurse-submodules=on-demand ../pub.git master &&
+ git -c push.recurseSubmodules=check push --recurse-submodules=on-demand ../pub.git main &&
# Check that the supermodule commit got there
git fetch ../pub.git &&
- git diff --quiet FETCH_HEAD master &&
+ git diff --quiet FETCH_HEAD main &&
# Check that the submodule commit got there
cd gar/bage &&
- git diff --quiet origin/master master
+ git diff --quiet origin/main main
)
'
@@ -265,14 +268,14 @@
cd work &&
git add gar/bage &&
git commit -m "Recurse disable on command-line overriding config for gar/bage" &&
- git -c push.recurseSubmodules=check push --recurse-submodules=no ../pub.git master &&
+ git -c push.recurseSubmodules=check push --recurse-submodules=no ../pub.git main &&
# Check that the supermodule commit got there
git fetch ../pub.git &&
- git diff --quiet FETCH_HEAD master &&
+ git diff --quiet FETCH_HEAD main &&
# But that the submodule commit did not
- ( cd gar/bage && git diff --quiet origin/master master^ ) &&
+ ( cd gar/bage && git diff --quiet origin/main main^ ) &&
# Now push it to avoid confusing future tests
- git push --recurse-submodules=on-demand ../pub.git master
+ git push --recurse-submodules=on-demand ../pub.git main
)
'
@@ -287,14 +290,14 @@
cd work &&
git add gar/bage &&
git commit -m "Recurse disable on command-line alternative overriding config for gar/bage" &&
- git -c push.recurseSubmodules=check push --no-recurse-submodules ../pub.git master &&
+ git -c push.recurseSubmodules=check push --no-recurse-submodules ../pub.git main &&
# Check that the supermodule commit got there
git fetch ../pub.git &&
- git diff --quiet FETCH_HEAD master &&
+ git diff --quiet FETCH_HEAD main &&
# But that the submodule commit did not
- ( cd gar/bage && git diff --quiet origin/master master^ ) &&
+ ( cd gar/bage && git diff --quiet origin/main main^ ) &&
# Now push it to avoid confusing future tests
- git push --recurse-submodules=on-demand ../pub.git master
+ git push --recurse-submodules=on-demand ../pub.git main
)
'
@@ -304,7 +307,7 @@
git -C work update-index --cacheinfo 160000 "$tag" gar/bage &&
git -C work commit -m "bad commit" &&
test_when_finished "git -C work reset --hard HEAD^" &&
- test_must_fail git -C work push --recurse-submodules=on-demand ../pub.git master 2>err &&
+ test_must_fail git -C work push --recurse-submodules=on-demand ../pub.git main 2>err &&
test_i18ngrep "is a tag, not a commit" err
'
@@ -319,9 +322,9 @@
cd work &&
git add gar/bage &&
git commit -m "Recurse push fails if recurse submodules option passed as yes for gar/bage" &&
- test_must_fail git push --recurse-submodules=yes ../pub.git master &&
- test_must_fail git -c push.recurseSubmodules=yes push ../pub.git master &&
- git push --recurse-submodules=on-demand ../pub.git master
+ test_must_fail git push --recurse-submodules=yes ../pub.git main &&
+ test_must_fail git -c push.recurseSubmodules=yes push ../pub.git main &&
+ git push --recurse-submodules=on-demand ../pub.git main
)
'
@@ -363,7 +366,7 @@
) &&
git add b &&
git commit -m "added submodule" &&
- git push --recurse-submodules=check origin master
+ git push --recurse-submodules=check origin main
)
'
@@ -372,21 +375,21 @@
cd work &&
(
cd gar/bage &&
- git checkout master &&
+ git checkout main &&
>junk5 &&
git add junk5 &&
git commit -m "Fifth junk" &&
git push &&
- git rev-parse origin/master >../../../expected
+ git rev-parse origin/main >../../../expected
) &&
- git checkout master &&
+ git checkout main &&
git add gar/bage &&
git commit -m "Fifth commit for gar/bage" &&
- git push --recurse-submodules=on-demand ../pub.git master
+ git push --recurse-submodules=on-demand ../pub.git main
) &&
(
cd submodule.git &&
- git rev-parse master >../actual
+ git rev-parse main >../actual
) &&
test_cmp expected actual
'
@@ -394,7 +397,7 @@
test_expect_success 'push unpushed submodules when not needed 2' '
(
cd submodule.git &&
- git rev-parse master >../expected
+ git rev-parse main >../expected
) &&
(
cd work &&
@@ -407,11 +410,11 @@
>junk2 &&
git add junk2 &&
git commit -m "Second junk for work" &&
- git push --recurse-submodules=on-demand ../pub.git master
+ git push --recurse-submodules=on-demand ../pub.git main
) &&
(
cd submodule.git &&
- git rev-parse master >../actual
+ git rev-parse main >../actual
) &&
test_cmp expected actual
'
@@ -421,20 +424,20 @@
cd work &&
(
cd gar/bage &&
- git checkout master &&
+ git checkout main &&
> junk7 &&
git add junk7 &&
git commit -m "Seventh junk" &&
- git rev-parse master >../../../expected
+ git rev-parse main >../../../expected
) &&
- git checkout master &&
+ git checkout main &&
git add gar/bage &&
git commit -m "Seventh commit for gar/bage" &&
- git push --recurse-submodules=on-demand ../pub.git master
+ git push --recurse-submodules=on-demand ../pub.git main
) &&
(
cd submodule.git &&
- git rev-parse master >../actual
+ git rev-parse main >../actual
) &&
test_cmp expected actual
'
@@ -444,64 +447,64 @@
cd work &&
(
cd gar/bage &&
- git rev-parse origin/master >../../../expected &&
- git checkout master~0 &&
+ git rev-parse origin/main >../../../expected &&
+ git checkout main~0 &&
> junk8 &&
git add junk8 &&
git commit -m "Eighth junk"
) &&
git add gar/bage &&
git commit -m "Eighth commit for gar/bage" &&
- test_must_fail git push --recurse-submodules=on-demand ../pub.git master
+ test_must_fail git push --recurse-submodules=on-demand ../pub.git main
) &&
(
cd submodule.git &&
- git rev-parse master >../actual
+ git rev-parse main >../actual
) &&
- test_when_finished git -C work reset --hard master^ &&
+ test_when_finished git -C work reset --hard main^ &&
test_cmp expected actual
'
test_expect_success 'push --dry-run does not recursively update submodules' '
(
cd work/gar/bage &&
- git checkout master &&
- git rev-parse master >../../../expected_submodule &&
+ git checkout main &&
+ git rev-parse main >../../../expected_submodule &&
> junk9 &&
git add junk9 &&
git commit -m "Ninth junk" &&
# Go up to 'work' directory
cd ../.. &&
- git checkout master &&
- git rev-parse master >../expected_pub &&
+ git checkout main &&
+ git rev-parse main >../expected_pub &&
git add gar/bage &&
git commit -m "Ninth commit for gar/bage" &&
- git push --dry-run --recurse-submodules=on-demand ../pub.git master
+ git push --dry-run --recurse-submodules=on-demand ../pub.git main
) &&
- git -C submodule.git rev-parse master >actual_submodule &&
- git -C pub.git rev-parse master >actual_pub &&
+ git -C submodule.git rev-parse main >actual_submodule &&
+ git -C pub.git rev-parse main >actual_pub &&
test_cmp expected_pub actual_pub &&
test_cmp expected_submodule actual_submodule
'
test_expect_success 'push --dry-run does not recursively update submodules' '
- git -C work push --dry-run --recurse-submodules=only ../pub.git master &&
+ git -C work push --dry-run --recurse-submodules=only ../pub.git main &&
- git -C submodule.git rev-parse master >actual_submodule &&
- git -C pub.git rev-parse master >actual_pub &&
+ git -C submodule.git rev-parse main >actual_submodule &&
+ git -C pub.git rev-parse main >actual_pub &&
test_cmp expected_pub actual_pub &&
test_cmp expected_submodule actual_submodule
'
test_expect_success 'push only unpushed submodules recursively' '
- git -C work/gar/bage rev-parse master >expected_submodule &&
- git -C pub.git rev-parse master >expected_pub &&
+ git -C work/gar/bage rev-parse main >expected_submodule &&
+ git -C pub.git rev-parse main >expected_pub &&
- git -C work push --recurse-submodules=only ../pub.git master &&
+ git -C work push --recurse-submodules=only ../pub.git main &&
- git -C submodule.git rev-parse master >actual_submodule &&
- git -C pub.git rev-parse master >actual_pub &&
+ git -C submodule.git rev-parse main >actual_submodule &&
+ git -C pub.git rev-parse main >actual_pub &&
test_cmp expected_submodule actual_submodule &&
test_cmp expected_pub actual_pub
'
@@ -517,14 +520,14 @@
git -C work commit -m "Tenth junk added to gar/bage" &&
# Fails when submodule does not have a matching remote
- test_must_fail git -C work push --recurse-submodules=on-demand pub master &&
+ test_must_fail git -C work push --recurse-submodules=on-demand pub main &&
# Succeeds when submodules has matching remote and refspec
- git -C work push --recurse-submodules=on-demand origin master &&
+ git -C work push --recurse-submodules=on-demand origin main &&
- git -C submodule.git rev-parse master >actual_submodule &&
- git -C pub.git rev-parse master >actual_pub &&
- git -C work/gar/bage rev-parse master >expected_submodule &&
- git -C work rev-parse master >expected_pub &&
+ git -C submodule.git rev-parse main >actual_submodule &&
+ git -C pub.git rev-parse main >actual_pub &&
+ git -C work/gar/bage rev-parse main >expected_submodule &&
+ git -C work rev-parse main >expected_pub &&
test_cmp expected_submodule actual_submodule &&
test_cmp expected_pub actual_pub
'
@@ -548,7 +551,7 @@
test_must_fail git -C work push --recurse-submodules=on-demand origin \
HEAD:refs/heads/branch2 &&
- git -C work/gar/bage branch branch2 master &&
+ git -C work/gar/bage branch branch2 main &&
git -C work push --recurse-submodules=on-demand origin branch2 &&
git -C submodule.git rev-parse branch2 >actual_submodule &&
diff --git a/t/t5533-push-cas.sh b/t/t5533-push-cas.sh
index 0b0eb1d..cba26a8 100755
--- a/t/t5533-push-cas.sh
+++ b/t/t5533-push-cas.sh
@@ -2,6 +2,9 @@
test_description='compare & swap push force/delete safety'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
setup_srcdst_basic () {
@@ -13,6 +16,46 @@
)
}
+# For tests with "--force-if-includes".
+setup_src_dup_dst () {
+ rm -fr src dup dst &&
+ git init --bare dst &&
+ git clone --no-local dst src &&
+ git clone --no-local dst dup
+ (
+ cd src &&
+ test_commit A &&
+ test_commit B &&
+ test_commit C &&
+ git push origin
+ ) &&
+ (
+ cd dup &&
+ git fetch &&
+ git merge origin/main &&
+ git switch -c branch main~2 &&
+ test_commit D &&
+ test_commit E &&
+ git push origin --all
+ ) &&
+ (
+ cd src &&
+ git switch main &&
+ git fetch --all &&
+ git branch branch --track origin/branch &&
+ git rebase origin/main
+ ) &&
+ (
+ cd dup &&
+ git switch main &&
+ test_commit F &&
+ test_commit G &&
+ git switch branch &&
+ test_commit H &&
+ git push origin --all
+ )
+}
+
test_expect_success setup '
# create template repository
test_commit A &&
@@ -25,11 +68,11 @@
(
cd dst &&
test_commit D &&
- test_must_fail git push --force-with-lease=master:master origin master 2>err &&
+ test_must_fail git push --force-with-lease=main:main origin main 2>err &&
grep "stale info" err
) &&
- git ls-remote . refs/heads/master >expect &&
- git ls-remote src refs/heads/master >actual &&
+ git ls-remote . refs/heads/main >expect &&
+ git ls-remote src refs/heads/main >actual &&
test_cmp expect actual
'
@@ -38,11 +81,11 @@
(
cd dst &&
test_commit D &&
- git push --force --force-with-lease=master:master origin master 2>err &&
+ git push --force --force-with-lease=main:main origin main 2>err &&
grep "forced update" err
) &&
- git ls-remote dst refs/heads/master >expect &&
- git ls-remote src refs/heads/master >actual &&
+ git ls-remote dst refs/heads/main >expect &&
+ git ls-remote src refs/heads/main >actual &&
test_cmp expect actual
'
@@ -50,20 +93,20 @@
setup_srcdst_basic &&
(
cd src &&
- git checkout master &&
+ git checkout main &&
test_commit D &&
git checkout HEAD^0
) &&
- git ls-remote src refs/heads/master >expect &&
+ git ls-remote src refs/heads/main >expect &&
(
cd dst &&
test_commit E &&
- git ls-remote . refs/remotes/origin/master >expect &&
- test_must_fail git push --force-with-lease=master origin master &&
- git ls-remote . refs/remotes/origin/master >actual &&
+ git ls-remote . refs/remotes/origin/main >expect &&
+ test_must_fail git push --force-with-lease=main origin main &&
+ git ls-remote . refs/remotes/origin/main >actual &&
test_cmp expect actual
) &&
- git ls-remote src refs/heads/master >actual &&
+ git ls-remote src refs/heads/main >actual &&
test_cmp expect actual
'
@@ -71,18 +114,18 @@
setup_srcdst_basic &&
(
cd src &&
- git checkout master &&
+ git checkout main &&
test_commit D &&
git checkout HEAD^0
) &&
(
cd dst &&
test_commit E &&
- git ls-remote . refs/remotes/origin/master >expect &&
- git push --force --force-with-lease=master origin master
+ git ls-remote . refs/remotes/origin/main >expect &&
+ git push --force --force-with-lease=main origin main
) &&
- git ls-remote dst refs/heads/master >expect &&
- git ls-remote src refs/heads/master >actual &&
+ git ls-remote dst refs/heads/main >expect &&
+ git ls-remote src refs/heads/main >actual &&
test_cmp expect actual
'
@@ -91,10 +134,10 @@
(
cd dst &&
test_commit D &&
- git push --force-with-lease=master:master^ origin master
+ git push --force-with-lease=main:main^ origin main
) &&
- git ls-remote dst refs/heads/master >expect &&
- git ls-remote src refs/heads/master >actual &&
+ git ls-remote dst refs/heads/main >expect &&
+ git ls-remote src refs/heads/main >actual &&
test_cmp expect actual
'
@@ -103,11 +146,11 @@
(
cd dst &&
test_commit D &&
- git push --force-with-lease=master origin master 2>err &&
+ git push --force-with-lease=main origin main 2>err &&
! grep "forced update" err
) &&
- git ls-remote dst refs/heads/master >expect &&
- git ls-remote src refs/heads/master >actual &&
+ git ls-remote dst refs/heads/main >expect &&
+ git ls-remote src refs/heads/main >actual &&
test_cmp expect actual
'
@@ -117,22 +160,22 @@
cd dst &&
git reset --hard HEAD^ &&
test_commit D &&
- git push --force-with-lease=master origin master 2>err &&
+ git push --force-with-lease=main origin main 2>err &&
grep "forced update" err
) &&
- git ls-remote dst refs/heads/master >expect &&
- git ls-remote src refs/heads/master >actual &&
+ git ls-remote dst refs/heads/main >expect &&
+ git ls-remote src refs/heads/main >actual &&
test_cmp expect actual
'
test_expect_success 'push to delete (protected)' '
setup_srcdst_basic &&
- git ls-remote src refs/heads/master >expect &&
+ git ls-remote src refs/heads/main >expect &&
(
cd dst &&
- test_must_fail git push --force-with-lease=master:master^ origin :master
+ test_must_fail git push --force-with-lease=main:main^ origin :main
) &&
- git ls-remote src refs/heads/master >actual &&
+ git ls-remote src refs/heads/main >actual &&
test_cmp expect actual
'
@@ -140,9 +183,9 @@
setup_srcdst_basic &&
(
cd dst &&
- git push --force --force-with-lease=master:master^ origin :master
+ git push --force --force-with-lease=main:main^ origin :main
) &&
- git ls-remote src refs/heads/master >actual &&
+ git ls-remote src refs/heads/main >actual &&
test_must_be_empty actual
'
@@ -150,10 +193,10 @@
setup_srcdst_basic &&
(
cd dst &&
- git push --force-with-lease=master origin :master 2>err &&
+ git push --force-with-lease=main origin :main 2>err &&
grep deleted err
) &&
- git ls-remote src refs/heads/master >actual &&
+ git ls-remote src refs/heads/main >actual &&
test_must_be_empty actual
'
@@ -161,12 +204,12 @@
setup_srcdst_basic &&
(
cd src &&
- git branch naster master^
+ git branch nain main^
) &&
git ls-remote src refs/heads/\* >expect &&
(
cd dst &&
- test_must_fail git push --force-with-lease origin master master:naster
+ test_must_fail git push --force-with-lease origin main main:nain
) &&
git ls-remote src refs/heads/\* >actual &&
test_cmp expect actual
@@ -176,16 +219,16 @@
setup_srcdst_basic &&
(
cd src &&
- git branch naster master^
+ git branch nain main^
) &&
(
cd dst &&
git fetch &&
- git push --force-with-lease origin master master:naster
+ git push --force-with-lease origin main main:nain
) &&
- git ls-remote dst refs/heads/master |
- sed -e "s/master/naster/" >expect &&
- git ls-remote src refs/heads/naster >actual &&
+ git ls-remote dst refs/heads/main |
+ sed -e "s/main/nain/" >expect &&
+ git ls-remote src refs/heads/nain >actual &&
test_cmp expect actual
'
@@ -193,7 +236,7 @@
setup_srcdst_basic &&
(
cd dst &&
- git branch branch master &&
+ git branch branch main &&
git push --force-with-lease=branch origin branch
) &&
git ls-remote dst refs/heads/branch >expect &&
@@ -205,7 +248,7 @@
setup_srcdst_basic &&
(
cd dst &&
- git branch branch master &&
+ git branch branch main &&
git push --force-with-lease=branch: origin branch
) &&
git ls-remote dst refs/heads/branch >expect &&
@@ -217,12 +260,12 @@
setup_srcdst_basic &&
(
cd src &&
- git checkout -b branch master &&
+ git checkout -b branch main &&
test_commit F
) &&
(
cd dst &&
- git branch branch master &&
+ git branch branch main &&
test_must_fail git push --force-with-lease=branch: origin branch
)
'
@@ -237,7 +280,7 @@
cd dst &&
test_commit G &&
git remote add origin-push ../src.bare &&
- git push origin-push master:master
+ git push origin-push main:main
) &&
git clone --no-local src.bare dst2 &&
test_when_finished "rm -rf dst2" &&
@@ -256,4 +299,101 @@
)
'
+test_expect_success 'background updates to remote can be mitigated with "--force-if-includes"' '
+ setup_src_dup_dst &&
+ test_when_finished "rm -fr dst src dup" &&
+ git ls-remote dst refs/heads/main >expect.main &&
+ git ls-remote dst refs/heads/branch >expect.branch &&
+ (
+ cd src &&
+ git switch branch &&
+ test_commit I &&
+ git switch main &&
+ test_commit J &&
+ git fetch --all &&
+ test_must_fail git push --force-with-lease --force-if-includes --all
+ ) &&
+ git ls-remote dst refs/heads/main >actual.main &&
+ git ls-remote dst refs/heads/branch >actual.branch &&
+ test_cmp expect.main actual.main &&
+ test_cmp expect.branch actual.branch
+'
+
+test_expect_success 'background updates to remote can be mitigated with "push.useForceIfIncludes"' '
+ setup_src_dup_dst &&
+ test_when_finished "rm -fr dst src dup" &&
+ git ls-remote dst refs/heads/main >expect.main &&
+ (
+ cd src &&
+ git switch branch &&
+ test_commit I &&
+ git switch main &&
+ test_commit J &&
+ git fetch --all &&
+ git config --local push.useForceIfIncludes true &&
+ test_must_fail git push --force-with-lease=main origin main
+ ) &&
+ git ls-remote dst refs/heads/main >actual.main &&
+ test_cmp expect.main actual.main
+'
+
+test_expect_success '"--force-if-includes" should be disabled for --force-with-lease="<refname>:<expect>"' '
+ setup_src_dup_dst &&
+ test_when_finished "rm -fr dst src dup" &&
+ git ls-remote dst refs/heads/main >expect.main &&
+ (
+ cd src &&
+ git switch branch &&
+ test_commit I &&
+ git switch main &&
+ test_commit J &&
+ remote_head="$(git rev-parse refs/remotes/origin/main)" &&
+ git fetch --all &&
+ test_must_fail git push --force-if-includes --force-with-lease="main:$remote_head" 2>err &&
+ grep "stale info" err
+ ) &&
+ git ls-remote dst refs/heads/main >actual.main &&
+ test_cmp expect.main actual.main
+'
+
+test_expect_success '"--force-if-includes" should allow forced update after a rebase ("pull --rebase")' '
+ setup_src_dup_dst &&
+ test_when_finished "rm -fr dst src dup" &&
+ (
+ cd src &&
+ git switch branch &&
+ test_commit I &&
+ git switch main &&
+ test_commit J &&
+ git pull --rebase origin main &&
+ git push --force-if-includes --force-with-lease="main"
+ )
+'
+
+test_expect_success '"--force-if-includes" should allow forced update after a rebase ("pull --rebase", local rebase)' '
+ setup_src_dup_dst &&
+ test_when_finished "rm -fr dst src dup" &&
+ (
+ cd src &&
+ git switch branch &&
+ test_commit I &&
+ git switch main &&
+ test_commit J &&
+ git pull --rebase origin main &&
+ git rebase --onto HEAD~4 HEAD~1 &&
+ git push --force-if-includes --force-with-lease="main"
+ )
+'
+
+test_expect_success '"--force-if-includes" should allow deletes' '
+ setup_src_dup_dst &&
+ test_when_finished "rm -fr dst src dup" &&
+ (
+ cd src &&
+ git switch branch &&
+ git pull --rebase origin branch &&
+ git push --force-if-includes --force-with-lease="branch" origin :branch
+ )
+'
+
test_done
diff --git a/t/t5534-push-signed.sh b/t/t5534-push-signed.sh
index 030331f..bba768f 100755
--- a/t/t5534-push-signed.sh
+++ b/t/t5534-push-signed.sh
@@ -2,6 +2,9 @@
test_description='signed push'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-gpg.sh
@@ -9,11 +12,11 @@
rm -fr dst &&
test_create_repo dst &&
- git push dst master:noop master:ff master:noff
+ git push dst main:noop main:ff main:noff
}
test_expect_success setup '
- # master, ff and noff branches pointing at the same commit
+ # main, ff and noff branches pointing at the same commit
test_tick &&
git commit --allow-empty -m initial &&
@@ -273,4 +276,26 @@
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/t/t5537-fetch-shallow.sh b/t/t5537-fetch-shallow.sh
index 4f681db..11d5ea5 100755
--- a/t/t5537-fetch-shallow.sh
+++ b/t/t5537-fetch-shallow.sh
@@ -2,6 +2,9 @@
test_description='fetch/clone from a shallow clone'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
commit() {
@@ -16,7 +19,7 @@
commit 3 &&
commit 4 &&
git config --global transfer.fsckObjects true &&
- test_oid_cache <<-EOF
+ test_oid_cache <<-\EOF
perl sha1:s/0034shallow %s/0036unshallow %s/
perl sha256:s/004cshallow %s/004eunshallow %s/
EOF
@@ -25,10 +28,7 @@
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
'
@@ -38,10 +38,7 @@
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
)
'
@@ -55,12 +52,8 @@
cd shallow2 &&
git fetch &&
git fsck &&
- git log --format=%s origin/master >actual &&
- cat <<EOF >expect &&
-5
-4
-3
-EOF
+ git log --format=%s origin/main >actual &&
+ test_write_lines 5 4 3 >expect &&
test_cmp expect actual
)
'
@@ -74,11 +67,8 @@
cd shallow2 &&
git fetch --depth=2 &&
git fsck &&
- git log --format=%s origin/master >actual &&
- cat <<EOF >expect &&
-6
-5
-EOF
+ git log --format=%s origin/main >actual &&
+ test_write_lines 6 5 >expect &&
test_cmp expect actual
)
'
@@ -88,13 +78,22 @@
cd shallow2 &&
git fetch --unshallow &&
git fsck &&
- git log --format=%s origin/master >actual &&
- cat <<EOF >expect &&
-6
-5
-4
-3
-EOF
+ git log --format=%s origin/main >actual &&
+ 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/main --format=%s >actual &&
+ test_write_lines 4 3 2 1 >expect &&
test_cmp expect actual
)
'
@@ -108,18 +107,13 @@
git commit -m add-1-back &&
(
cd shallow2 &&
- git fetch ../.git +refs/heads/master:refs/remotes/top/master &&
+ git fetch ../.git +refs/heads/main:refs/remotes/top/main &&
git fsck &&
- git log --format=%s top/master >actual &&
- cat <<EOF >expect &&
-add-1-back
-4
-3
-EOF
+ git log --format=%s top/main >actual &&
+ 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' '
@@ -131,16 +125,12 @@
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
)
'
@@ -148,7 +138,7 @@
test_expect_success 'fetch --update-shallow' '
(
cd shallow &&
- git checkout master &&
+ git checkout main &&
commit 7 &&
git tag -m foo heavy-tag HEAD^ &&
git tag light-tag HEAD^:tracked
@@ -158,21 +148,44 @@
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/main
+ 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
+ git log --format=%s shallow/main >actual &&
+ 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 main &&
+ 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/main
+ 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/main >actual &&
+ test_write_lines 8 7 6 5 4 3 >expect &&
test_cmp expect actual
)
'
@@ -183,10 +196,7 @@
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
'
@@ -199,7 +209,7 @@
test_commit -C shallow-server E &&
test_commit -C shallow-server D &&
d="$(git -C shallow-server rev-parse --verify D^0)" &&
- git -C shallow-server checkout master &&
+ git -C shallow-server checkout main &&
git clone --depth=1 --no-tags --no-single-branch \
"file://$PWD/shallow-server" shallow-client &&
@@ -237,7 +247,7 @@
git -C "$REPO" config protocol.version 2 &&
git -C client config protocol.version 2 &&
- git -C client fetch --depth=2 "$HTTPD_URL/one_time_perl/repo" master:a_branch &&
+ git -C client fetch --depth=2 "$HTTPD_URL/one_time_perl/repo" main: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
@@ -249,7 +259,7 @@
>"$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_perl/repo" \
- master:a_branch &&
+ main:a_branch &&
# Ensure that the one-time-perl script was used.
! test -e "$HTTPD_ROOT_PATH/one-time-perl" &&
diff --git a/t/t5538-push-shallow.sh b/t/t5538-push-shallow.sh
index ecbf84d..e91fcc1 100755
--- a/t/t5538-push-shallow.sh
+++ b/t/t5538-push-shallow.sh
@@ -2,6 +2,9 @@
test_description='push from/to a shallow clone'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
commit() {
@@ -44,9 +47,9 @@
(
cd shallow &&
commit 5 &&
- git push ../.git +master:refs/remotes/shallow/master
+ git push ../.git +main:refs/remotes/shallow/main
) &&
- git log --format=%s shallow/master >actual &&
+ git log --format=%s shallow/main >actual &&
git fsck &&
cat <<EOF >expect &&
5
@@ -61,10 +64,10 @@
test_expect_success 'push from shallow clone, with grafted roots' '
(
cd shallow2 &&
- test_must_fail git push ../.git +master:refs/remotes/shallow2/master 2>err &&
- grep "shallow2/master.*shallow update not allowed" err
+ test_must_fail git push ../.git +main:refs/remotes/shallow2/main 2>err &&
+ grep "shallow2/main.*shallow update not allowed" err
) &&
- test_must_fail git rev-parse shallow2/master &&
+ test_must_fail git rev-parse shallow2/main &&
git fsck
'
@@ -72,9 +75,9 @@
test_config receive.shallowupdate true &&
(
cd shallow2 &&
- git push ../.git +master:refs/remotes/shallow2/master
+ git push ../.git +main:refs/remotes/shallow2/main
) &&
- git log --format=%s shallow2/master >actual &&
+ git log --format=%s shallow2/main >actual &&
git fsck &&
cat <<EOF >expect &&
c
@@ -87,12 +90,12 @@
(
cd shallow &&
git --git-dir=../shallow2/.git config receive.shallowupdate true &&
- git push ../shallow2/.git +master:refs/remotes/shallow/master &&
+ git push ../shallow2/.git +main:refs/remotes/shallow/main &&
git --git-dir=../shallow2/.git config receive.shallowupdate false
) &&
(
cd shallow2 &&
- git log --format=%s shallow/master >actual &&
+ git log --format=%s shallow/main >actual &&
git fsck &&
cat <<EOF >expect &&
5
@@ -106,10 +109,10 @@
test_expect_success 'push from full to shallow' '
! git --git-dir=shallow2/.git cat-file blob $(echo 1|git hash-object --stdin) &&
commit 1 &&
- git push shallow2/.git +master:refs/remotes/top/master &&
+ git push shallow2/.git +main:refs/remotes/top/main &&
(
cd shallow2 &&
- git log --format=%s top/master >actual &&
+ git log --format=%s top/main >actual &&
git fsck &&
cat <<EOF >expect &&
1
diff --git a/t/t5539-fetch-http-shallow.sh b/t/t5539-fetch-http-shallow.sh
index c0d02de..3ea75d3 100755
--- a/t/t5539-fetch-http-shallow.sh
+++ b/t/t5539-fetch-http-shallow.sh
@@ -2,6 +2,9 @@
test_description='fetch/clone from a shallow clone over http'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-httpd.sh
start_httpd
@@ -9,10 +12,12 @@
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 &&
@@ -30,7 +35,7 @@
(
cd clone &&
git fsck &&
- git log --format=%s origin/master >actual &&
+ git log --format=%s origin/main >actual &&
cat <<EOF >expect &&
7
6
@@ -48,7 +53,6 @@
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 &&
@@ -59,13 +63,14 @@
refs/heads/unrelated$i:refs/heads/unrelated$i ||
exit 1
done &&
- git checkout master &&
+ git checkout main &&
test_commit new &&
- git push "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" master
+ git push "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" main
) &&
(
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.
@@ -93,7 +98,7 @@
test_expect_success 'fetch shallow since ...' '
git -C shallow11 fetch --shallow-since "200000000 +0700" origin &&
- git -C shallow11 log --pretty=tformat:%s origin/master >actual &&
+ git -C shallow11 log --pretty=tformat:%s origin/main >actual &&
cat >expected <<-\EOF &&
three
two
@@ -118,7 +123,7 @@
test_expect_success 'fetch exclude tag one' '
git -C shallow12 fetch --shallow-exclude one origin &&
- git -C shallow12 log --pretty=tformat:%s origin/master >actual &&
+ git -C shallow12 log --pretty=tformat:%s origin/main >actual &&
test_write_lines three two >expected &&
test_cmp expected actual
'
@@ -134,12 +139,12 @@
git clone --depth 1 $HTTPD_URL/smart/shallow-deepen.git deepen &&
mv "$HTTPD_DOCUMENT_ROOT_PATH/shallow-deepen.git" .git &&
test_commit four &&
- git -C deepen log --pretty=tformat:%s master >actual &&
+ git -C deepen log --pretty=tformat:%s main >actual &&
echo three >expected &&
test_cmp expected actual &&
mv .git "$HTTPD_DOCUMENT_ROOT_PATH/shallow-deepen.git" &&
git -C deepen fetch --deepen=1 &&
- git -C deepen log --pretty=tformat:%s origin/master >actual &&
+ git -C deepen log --pretty=tformat:%s origin/main >actual &&
cat >expected <<-\EOF &&
four
three
diff --git a/t/t5540-http-push-webdav.sh b/t/t5540-http-push-webdav.sh
index d476c33..8b68bb3 100755
--- a/t/t5540-http-push-webdav.sh
+++ b/t/t5540-http-push-webdav.sh
@@ -7,6 +7,9 @@
This test runs various sanity checks on http-push.'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
if git http-push > /dev/null 2>&1 || [ $? -eq 128 ]
@@ -71,7 +74,7 @@
test_expect_success 'push to remote repository with unpacked refs' '
(cd "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git &&
rm packed-refs &&
- git update-ref refs/heads/master $ORIG_HEAD &&
+ git update-ref refs/heads/main $ORIG_HEAD &&
git --bare update-server-info) &&
git push &&
(cd "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git &&
@@ -91,7 +94,7 @@
git remote rm origin &&
git reflog expire --expire=0 --all &&
git prune &&
- git push -f -v $HTTPD_URL/dumb/test_repo_unpacked.git master)
+ git push -f -v $HTTPD_URL/dumb/test_repo_unpacked.git main)
'
test_expect_success 'http-push fetches packed objects' '
@@ -111,7 +114,7 @@
git remote remove origin &&
git reflog expire --expire=0 --all &&
git prune &&
- git push -f -v $HTTPD_URL/dumb/test_repo_packed.git master)
+ git push -f -v $HTTPD_URL/dumb/test_repo_packed.git main)
'
test_expect_success 'create and delete remote branch' '
@@ -126,6 +129,22 @@
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
@@ -147,7 +166,7 @@
'
test_http_push_nonff "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git \
- "$ROOT_PATH"/test_repo_clone master
+ "$ROOT_PATH"/test_repo_clone main
test_expect_success 'push to password-protected repository (user in URL)' '
test_commit pw-user &&
diff --git a/t/t5541-http-push-smart.sh b/t/t5541-http-push-smart.sh
index 23be8ce..c024fa2 100755
--- a/t/t5541-http-push-smart.sh
+++ b/t/t5541-http-push-smart.sh
@@ -4,6 +4,9 @@
#
test_description='test smart pushing over http via http-backend'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
ROOT_PATH="$PWD"
@@ -115,7 +118,7 @@
git commit -m dev2 &&
test_must_fail git push origin dev2 2>act &&
sed -e "/^remote: /s/ *$//" <act >cmp &&
- test_i18ncmp exp cmp
+ test_cmp exp cmp
'
rm -f "$HTTPD_DOCUMENT_ROOT_PATH/test_repo.git/hooks/update"
@@ -142,23 +145,23 @@
'
test_http_push_nonff "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git \
- "$ROOT_PATH"/test_repo_clone master success
+ "$ROOT_PATH"/test_repo_clone main success
test_expect_success 'push fails for non-fast-forward refs unmatched by remote helper' '
# create a dissimilarly-named remote ref so that git is unable to match the
# two refs (viz. local, remote) unless an explicit refspec is provided.
- git push origin master:retsam &&
+ git push origin main:niam &&
echo "change changed" > path2 &&
git commit -a -m path2 --amend &&
- # push master too; this ensures there is at least one '"'push'"' command to
+ # push main too; this ensures there is at least one '"'push'"' command to
# the remote helper and triggers interaction with the helper.
- test_must_fail git push -v origin +master master:retsam >output 2>&1'
+ test_must_fail git push -v origin +main main:niam >output 2>&1'
test_expect_success 'push fails for non-fast-forward refs unmatched by remote helper: remote output' '
- grep "^ + [a-f0-9]*\.\.\.[a-f0-9]* *master -> master (forced update)$" output &&
- grep "^ ! \[rejected\] *master -> retsam (non-fast-forward)$" output
+ grep "^ + [a-f0-9]*\.\.\.[a-f0-9]* *main -> main (forced update)$" output &&
+ grep "^ ! \[rejected\] *main -> niam (non-fast-forward)$" output
'
test_expect_success 'push fails for non-fast-forward refs unmatched by remote helper: our output' '
@@ -167,7 +170,7 @@
'
test_expect_success 'push (chunked)' '
- git checkout master &&
+ git checkout main &&
test_commit commit path3 &&
HEAD=$(git rev-parse --verify HEAD) &&
test_config http.postbuffer 4 &&
@@ -177,6 +180,9 @@
test $HEAD = $(git rev-parse --verify HEAD))
'
+## References of remote: atomic1(1) main(2) collateral(2) other(2)
+## References of local : atomic2(2) main(1) collateral(3) other(2) collateral1(3) atomic(1)
+## Atomic push : main(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 &&
@@ -189,14 +195,15 @@
test_commit atomic2 &&
git branch collateral &&
git branch other &&
- git push "$up" master collateral other &&
+ git push "$up" atomic1 main collateral other &&
+ git tag -d atomic1 &&
# collateral is a valid push, but should be failed by atomic push
git checkout collateral &&
test_commit collateral1 &&
- # Make master incompatible with upstream to provoke atomic
- git checkout master &&
+ # Make main incompatible with upstream to provoke atomic
+ git checkout main &&
git reset --hard HEAD^ &&
# Add a new branch which should be failed by atomic push. This is a
@@ -204,7 +211,7 @@
git branch atomic &&
# --atomic should cause entire push to be rejected
- test_must_fail git push --atomic "$up" master atomic collateral 2>output &&
+ test_must_fail git push --atomic "$up" main atomic collateral 2>output &&
# the new branch should not have been created upstream
test_must_fail git -C "$d" show-ref --verify refs/heads/atomic &&
@@ -212,19 +219,23 @@
# upstream should still reflect atomic2, the last thing we pushed
# successfully
git rev-parse atomic2 >expected &&
- # on master...
- git -C "$d" rev-parse refs/heads/master >actual &&
+ # on main...
+ git -C "$d" rev-parse refs/heads/main >actual &&
test_cmp expected actual &&
# ...and collateral.
git -C "$d" rev-parse refs/heads/collateral >actual &&
test_cmp expected actual &&
# the failed refs should be indicated to the user
- grep "^ ! .*rejected.* master -> master" output &&
+ grep "^ ! .*rejected.* main -> main" output &&
# 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' '
@@ -456,11 +467,41 @@
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" \
+ +main:main &&
+ # should have been scrubbed down to vanilla URL
+ git log -g main >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 \
-c color.push=always \
- push origin origin/master^:master 2>act &&
+ push origin origin/main^:main 2>act &&
test_decode_color <act >decoded &&
test_i18ngrep "<RED>.*rejected.*<RESET>" decoded &&
test_i18ngrep "<RED>error: failed to push some refs" decoded &&
diff --git a/t/t5542-push-http-shallow.sh b/t/t5542-push-http-shallow.sh
index ddc1db7..c2cc831 100755
--- a/t/t5542-push-http-shallow.sh
+++ b/t/t5542-push-http-shallow.sh
@@ -2,6 +2,9 @@
test_description='push from/to a shallow clone over http'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-httpd.sh
start_httpd
@@ -51,12 +54,12 @@
(
cd full &&
commit 9 &&
- git push $HTTPD_URL/smart/repo.git +master:refs/remotes/top/master
+ git push $HTTPD_URL/smart/repo.git +main:refs/remotes/top/main
) &&
(
cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
git fsck &&
- git log --format=%s top/master >actual &&
+ git log --format=%s top/main >actual &&
cat <<EOF >expect &&
9
4
@@ -74,11 +77,11 @@
git config http.receivepack true
) &&
commit 10 &&
- git push $HTTPD_URL/smart/repo.git +master:refs/remotes/top/master &&
+ git push $HTTPD_URL/smart/repo.git +main:refs/remotes/top/main &&
(
cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
git fsck &&
- git log --format=%s top/master >actual &&
+ git log --format=%s top/main >actual &&
cat <<EOF >expect &&
10
4
diff --git a/t/t5543-atomic-push.sh b/t/t5543-atomic-push.sh
index 7079bcf..bfee461 100755
--- a/t/t5543-atomic-push.sh
+++ b/t/t5543-atomic-push.sh
@@ -2,6 +2,9 @@
test_description='pushing to a repository using the atomic push option'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
mk_repo_pair () {
@@ -27,6 +30,12 @@
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 &&
(
@@ -34,9 +43,9 @@
test_commit one &&
git push --mirror up &&
test_commit two &&
- git push --atomic up master
+ git push --atomic up main
) &&
- test_refs master master
+ test_refs main main
'
test_expect_success 'atomic push works for two branches' '
@@ -49,9 +58,9 @@
test_commit two &&
git checkout second &&
test_commit three &&
- git push --atomic up master second
+ git push --atomic up main second
) &&
- test_refs master master &&
+ test_refs main main &&
test_refs second second
'
@@ -64,7 +73,7 @@
test_commit two &&
git push --atomic --mirror up
) &&
- test_refs master master &&
+ test_refs main main &&
test_refs second second
'
@@ -73,7 +82,7 @@
(
cd workbench &&
test_commit one &&
- git branch second master &&
+ git branch second main &&
test_commit two_a &&
git checkout second &&
test_commit two_b &&
@@ -81,36 +90,36 @@
test_commit four &&
git push --mirror up &&
# The actual test is below
- git checkout master &&
+ git checkout main &&
test_commit three_a &&
git checkout second &&
git reset --hard HEAD^ &&
- git push --force --atomic up master second
+ git push --force --atomic up main second
) &&
- test_refs master master &&
+ test_refs main main &&
test_refs second second
'
-# set up two branches where master can be pushed but second can not
+# set up two branches where main can be pushed but second can not
# (non-fast-forward). Since second can not be pushed the whole operation
-# will fail and leave master untouched.
+# will fail and leave main untouched.
test_expect_success 'atomic push fails if one branch fails' '
mk_repo_pair &&
(
cd workbench &&
test_commit one &&
- git checkout -b second master &&
+ git checkout -b second main &&
test_commit two &&
test_commit three &&
test_commit four &&
git push --mirror up &&
git reset --hard HEAD~2 &&
test_commit five &&
- git checkout master &&
+ git checkout main &&
test_commit six &&
test_must_fail git push --atomic --all up
) &&
- test_refs master HEAD@{7} &&
+ test_refs main HEAD@{7} &&
test_refs second HEAD@{4}
'
@@ -120,7 +129,7 @@
(
cd workbench &&
test_commit one &&
- git checkout -b second master &&
+ git checkout -b second main &&
test_commit two &&
git push --mirror up
) &&
@@ -133,14 +142,14 @@
# see if we can now push both branches.
(
cd workbench &&
- git checkout master &&
+ git checkout main &&
test_commit three &&
git checkout second &&
test_commit four &&
git tag test_tag &&
- test_must_fail git push --tags --atomic up master second
+ test_must_fail git push --tags --atomic up main second
) &&
- test_refs master HEAD@{3} &&
+ test_refs main HEAD@{3} &&
test_refs second HEAD@{1}
'
@@ -149,7 +158,7 @@
(
cd workbench &&
test_commit one &&
- git checkout -b second master &&
+ git checkout -b second main &&
test_commit two &&
git push --mirror up
) &&
@@ -159,19 +168,19 @@
HOOK="$HOOKDIR/update" &&
mkdir -p "$HOOKDIR" &&
write_script "$HOOK" <<-\EOF
- # only allow update to master from now on
- test "$1" = "refs/heads/master"
+ # only allow update to main from now on
+ test "$1" = "refs/heads/main"
EOF
) &&
(
cd workbench &&
- git checkout master &&
+ git checkout main &&
test_commit three &&
git checkout second &&
test_commit four &&
- test_must_fail git push --atomic up master second
+ test_must_fail git push --atomic up main second
) &&
- test_refs master HEAD@{3} &&
+ test_refs main HEAD@{3} &&
test_refs second HEAD@{1}
'
@@ -186,9 +195,92 @@
test_commit one &&
git push --mirror up &&
test_commit two &&
- test_must_fail git push --atomic up master
+ test_must_fail git push --atomic up main
) &&
- test_refs master HEAD@{1}
+ test_refs main HEAD@{1}
+'
+
+# References in upstream : main(1) one(1) foo(1)
+# References in workbench: main(2) foo(1) two(2) bar(2)
+# Atomic push : main(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 main 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 main two bar >out 2>&1 &&
+ fmt_status_report <out >actual &&
+ cat >expect <<-EOF &&
+ To ../upstream
+ ! [remote rejected] main -> main (atomic push failure)
+ ! [remote rejected] two -> two (atomic push failure)
+ ! [remote rejected] bar -> bar (hook declined)
+ EOF
+ test_cmp expect actual
+'
+
+# References in upstream : main(1) one(1) foo(1)
+# References in workbench: main(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] main -> main (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 : main(2) one(1) foo(1)
+# References in workbench: main(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 main &&
+ git reset --hard HEAD^
+ ) &&
+ test_must_fail git -C workbench \
+ push --atomic up main foo bar >out 2>&1 &&
+ fmt_status_report <out >actual &&
+ cat >expect <<-EOF &&
+ To ../upstream
+ ! [rejected] main -> main (non-fast-forward)
+ ! [rejected] bar -> bar (atomic push failed)
+ EOF
+ test_cmp expect actual
'
test_done
diff --git a/t/t5544-pack-objects-hook.sh b/t/t5544-pack-objects-hook.sh
index 4357af1..dd5f44d 100755
--- a/t/t5544-pack-objects-hook.sh
+++ b/t/t5544-pack-objects-hook.sh
@@ -59,4 +59,14 @@
test_path_is_missing .git/hook.stdout
'
+test_expect_success 'hook works with partial clone' '
+ clear_hook_results &&
+ test_config_global uploadpack.packObjectsHook ./hook &&
+ test_config_global uploadpack.allowFilter true &&
+ git clone --bare --no-local --filter=blob:none . dst.git &&
+ git -C dst.git rev-list --objects --missing=allow-any --no-object-names --all >objects &&
+ git -C dst.git cat-file --batch-check="%(objecttype)" <objects >types &&
+ ! grep blob types
+'
+
test_done
diff --git a/t/t5545-push-options.sh b/t/t5545-push-options.sh
index 38e6f73..58c7add 100755
--- a/t/t5545-push-options.sh
+++ b/t/t5545-push-options.sh
@@ -2,6 +2,9 @@
test_description='pushing to a repository using push options'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
mk_repo_pair () {
@@ -63,9 +66,9 @@
test_commit one &&
git push --mirror up &&
test_commit two &&
- git push --push-option=asdf up master
+ git push --push-option=asdf up main
) &&
- test_refs master master &&
+ test_refs main main &&
echo "asdf" >expect &&
test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
test_cmp expect upstream/.git/hooks/post-receive.push_options
@@ -79,9 +82,9 @@
test_commit one &&
git push --mirror up &&
test_commit two &&
- test_must_fail git push --push-option=asdf up master
+ test_must_fail git push --push-option=asdf up main
) &&
- test_refs master HEAD@{1}
+ test_refs main HEAD@{1}
'
test_expect_success 'two push options work' '
@@ -92,9 +95,9 @@
test_commit one &&
git push --mirror up &&
test_commit two &&
- git push --push-option=asdf --push-option="more structured text" up master
+ git push --push-option=asdf --push-option="more structured text" up main
) &&
- test_refs master master &&
+ test_refs main main &&
printf "asdf\nmore structured text\n" >expect &&
test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
test_cmp expect upstream/.git/hooks/post-receive.push_options
@@ -123,14 +126,14 @@
git -C parent push \
--push-option=asdf --push-option="more structured text" \
- --recurse-submodules=on-demand up master &&
+ --recurse-submodules=on-demand up main &&
- git -C upstream rev-parse --verify master >expect &&
- git -C parent/workbench rev-parse --verify master >actual &&
+ git -C upstream rev-parse --verify main >expect &&
+ git -C parent/workbench rev-parse --verify main >actual &&
test_cmp expect actual &&
- git -C parent_upstream rev-parse --verify master >expect &&
- git -C parent rev-parse --verify master >actual &&
+ git -C parent_upstream rev-parse --verify main >expect &&
+ git -C parent rev-parse --verify main >actual &&
test_cmp expect actual &&
printf "asdf\nmore structured text\n" >expect &&
@@ -148,9 +151,9 @@
test_commit one &&
git push --mirror up &&
test_commit two &&
- git -c push.pushOption=default push up master
+ git -c push.pushOption=default push up main
) &&
- test_refs master master &&
+ test_refs main main &&
echo "default" >expect &&
test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
test_cmp expect upstream/.git/hooks/post-receive.push_options
@@ -164,9 +167,9 @@
test_commit one &&
git push --mirror up &&
test_commit two &&
- git -c push.pushOption=default1 -c push.pushOption=default2 push up master
+ git -c push.pushOption=default1 -c push.pushOption=default2 push up main
) &&
- test_refs master master &&
+ test_refs main main &&
printf "default1\ndefault2\n" >expect &&
test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
test_cmp expect upstream/.git/hooks/post-receive.push_options
@@ -180,9 +183,9 @@
test_commit one &&
git push --mirror up &&
test_commit two &&
- git -c push.pushOption=default push --push-option=manual up master
+ git -c push.pushOption=default push --push-option=manual up main
) &&
- test_refs master master &&
+ test_refs main main &&
echo "manual" >expect &&
test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
test_cmp expect upstream/.git/hooks/post-receive.push_options
@@ -196,9 +199,9 @@
test_commit one &&
git push --mirror up &&
test_commit two &&
- git -c push.pushOption=default1 -c push.pushOption= -c push.pushOption=default2 push up master
+ git -c push.pushOption=default1 -c push.pushOption= -c push.pushOption=default2 push up main
) &&
- test_refs master master &&
+ test_refs main main &&
echo "default2" >expect &&
test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
test_cmp expect upstream/.git/hooks/post-receive.push_options
@@ -212,16 +215,16 @@
test_commit one &&
git push --mirror up &&
test_commit two &&
- test_must_fail git -c push.pushOption push up master
+ test_must_fail git -c push.pushOption push up main
) &&
- test_refs master HEAD@{1}
+ test_refs main HEAD@{1}
'
test_expect_success 'push options keep quoted characters intact (direct)' '
mk_repo_pair &&
git -C upstream config receive.advertisePushOptions true &&
test_commit -C workbench one &&
- git -C workbench push --push-option="\"embedded quotes\"" up master &&
+ git -C workbench push --push-option="\"embedded quotes\"" up main &&
echo "\"embedded quotes\"" >expect &&
test_cmp expect upstream/.git/hooks/pre-receive.push_options
'
@@ -244,28 +247,28 @@
test_expect_success 'push option denied properly by http server' '
mk_http_pair false &&
test_commit -C test_http_clone one &&
- test_must_fail git -C test_http_clone push --push-option=asdf origin master 2>actual &&
+ test_must_fail git -C test_http_clone push --push-option=asdf origin main 2>actual &&
test_i18ngrep "the receiving end does not support push options" actual &&
- git -C test_http_clone push origin master
+ git -C test_http_clone push origin main
'
test_expect_success 'push options work properly across http' '
mk_http_pair true &&
test_commit -C test_http_clone one &&
- git -C test_http_clone push origin master &&
- git -C "$HTTPD_DOCUMENT_ROOT_PATH"/upstream.git rev-parse --verify master >expect &&
- git -C test_http_clone rev-parse --verify master >actual &&
+ git -C test_http_clone push origin main &&
+ git -C "$HTTPD_DOCUMENT_ROOT_PATH"/upstream.git rev-parse --verify main >expect &&
+ git -C test_http_clone rev-parse --verify main >actual &&
test_cmp expect actual &&
test_commit -C test_http_clone two &&
- git -C test_http_clone push --push-option=asdf --push-option="more structured text" origin master &&
+ git -C test_http_clone push --push-option=asdf --push-option="more structured text" origin main &&
printf "asdf\nmore structured text\n" >expect &&
test_cmp expect "$HTTPD_DOCUMENT_ROOT_PATH"/upstream.git/hooks/pre-receive.push_options &&
test_cmp expect "$HTTPD_DOCUMENT_ROOT_PATH"/upstream.git/hooks/post-receive.push_options &&
- git -C "$HTTPD_DOCUMENT_ROOT_PATH"/upstream.git rev-parse --verify master >expect &&
- git -C test_http_clone rev-parse --verify master >actual &&
+ git -C "$HTTPD_DOCUMENT_ROOT_PATH"/upstream.git rev-parse --verify main >expect &&
+ git -C test_http_clone rev-parse --verify main >actual &&
test_cmp expect actual
'
@@ -273,7 +276,7 @@
mk_http_pair true &&
test_commit -C test_http_clone one &&
- git -C test_http_clone push --push-option="\"embedded quotes\"" origin master &&
+ git -C test_http_clone push --push-option="\"embedded quotes\"" origin main &&
echo "\"embedded quotes\"" >expect &&
test_cmp expect "$HTTPD_DOCUMENT_ROOT_PATH"/upstream.git/hooks/pre-receive.push_options
'
diff --git a/t/t5548-push-porcelain.sh b/t/t5548-push-porcelain.sh
new file mode 100755
index 0000000..5a761f3
--- /dev/null
+++ b/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/main $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 : main(B) foo(A) bar(A) baz(A)
+ # Workbench after setup : main(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/main $A &&
+ git push origin \
+ $B:refs/heads/main \
+ $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 : main(B) foo(A) bar(A) baz(A)
+ # Refs of workbench: main(A) baz(A) next(A)
+ # git-push : main(A) NULL (B) baz(A) next(A)
+ test_expect_success "porcelain output of successful git-push ($PROTOCOL)" '
+ (
+ cd workbench &&
+ git update-ref refs/heads/main $A &&
+ git update-ref refs/heads/baz $A &&
+ git update-ref refs/heads/next $A &&
+ git push --porcelain --force origin \
+ main \
+ :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/main:refs/heads/main <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/main
+ <COMMIT-A> refs/heads/next
+ EOF
+ test_cmp expect actual
+ '
+
+ # Refs of upstream : main(A) bar(B) baz(A) next(A)
+ # Refs of workbench: main(B) bar(A) baz(A) next(A)
+ # git-push : main(B) bar(A) NULL next(A)
+ test_expect_success "atomic push failed ($PROTOCOL)" '
+ (
+ cd workbench &&
+ git update-ref refs/heads/main $B &&
+ git update-ref refs/heads/bar $A &&
+ test_must_fail git push --atomic --porcelain origin \
+ main \
+ 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/main:refs/heads/main [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/main
+ <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 : main(A) bar(B) baz(A) next(A)
+ # Refs of workbench: main(B) bar(A) baz(A) next(A)
+ # git-push : main(B) bar(A) NULL next(A)
+ test_expect_success "pre-receive hook declined ($PROTOCOL)" '
+ (
+ cd workbench &&
+ git update-ref refs/heads/main $B &&
+ git update-ref refs/heads/bar $A &&
+ test_must_fail git push --porcelain --force origin \
+ main \
+ 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/main:refs/heads/main [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/main
+ <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 : main(A) bar(B) baz(A) next(A)
+ # Refs of workbench: main(B) bar(A) baz(A) next(A)
+ # git-push : main(B) bar(A) NULL next(A)
+ test_expect_success "non-fastforward push ($PROTOCOL)" '
+ (
+ cd workbench &&
+ test_must_fail git push --porcelain origin \
+ main \
+ 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/main:refs/heads/main <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/main
+ <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/t/t5550-http-fetch-dumb.sh b/t/t5550-http-fetch-dumb.sh
index ea2688b..6d9142a 100755
--- a/t/t5550-http-fetch-dumb.sh
+++ b/t/t5550-http-fetch-dumb.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='test dumb fetching over http via static file'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-httpd.sh
start_httpd
@@ -26,7 +29,7 @@
hooks/post-update
) &&
git remote add public "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
- git push public master:master
+ git push public main:main
'
test_expect_success 'clone http repository' '
@@ -37,8 +40,8 @@
test_expect_success 'list refs from outside any repository' '
cat >expect <<-EOF &&
- $(git rev-parse master) HEAD
- $(git rev-parse master) refs/heads/master
+ $(git rev-parse main) HEAD
+ $(git rev-parse main) refs/heads/main
EOF
nongit git ls-remote "$HTTPD_URL/dumb/repo.git" >actual &&
test_cmp expect actual
@@ -50,6 +53,24 @@
"$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' '
@@ -163,8 +184,8 @@
HEAD=$(git rev-parse --verify HEAD) &&
(cd clone2 &&
- git http-fetch -a -w heads/master-new $HEAD $(git config remote.origin.url) &&
- git checkout master-new &&
+ git http-fetch -a -w heads/main-new $HEAD $(git config remote.origin.url) &&
+ git checkout main-new &&
test $HEAD = $(git rev-parse --verify HEAD)) &&
test_cmp file clone2/file
'
@@ -174,19 +195,19 @@
HEAD=$(git rev-parse --verify HEAD) &&
(cd clone3 &&
- git http-fetch -w heads/master-new $HEAD $(git config remote.origin.url) &&
- git checkout master-new &&
+ git http-fetch -w heads/main-new $HEAD $(git config remote.origin.url) &&
+ git checkout main-new &&
test $HEAD = $(git rev-parse --verify HEAD)) &&
test_cmp file clone3/file
'
test_expect_success 'http remote detects correct HEAD' '
- git push public master:other &&
+ git push public main:other &&
(cd clone &&
git remote set-head origin -d &&
git remote set-head origin -a &&
git symbolic-ref refs/remotes/origin/HEAD > output &&
- echo refs/remotes/origin/master > expect &&
+ echo refs/remotes/origin/main > expect &&
test_cmp expect output
)
'
@@ -199,6 +220,31 @@
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 \
+ --index-pack-arg=index-pack --index-pack-arg=--stdin \
+ --index-pack-arg=--keep \
+ "$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 +260,14 @@
)
'
+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 +302,7 @@
'
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' '
@@ -370,7 +422,7 @@
evil=$HTTPD_DOCUMENT_ROOT_PATH/evil.git &&
git init --bare "$evil" &&
# do this by hand to avoid object existence check
- printf "%s\\t%s\\n" $sha1 refs/heads/master >"$evil/info/refs"
+ printf "%s\\t%s\\n" $sha1 refs/heads/main >"$evil/info/refs"
'
# Here we'll just redirect via HTTP. In a real-world attack these would be on
diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh
index 6788aef..984dba2 100755
--- a/t/t5551-http-fetch-smart.sh
+++ b/t/t5551-http-fetch-smart.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='test smart fetching over http via http-backend'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-httpd.sh
start_httpd
@@ -18,7 +21,7 @@
git --bare init
) &&
git remote add public "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
- git push public master:master
+ git push public main:main
'
setup_askpass_helper
@@ -185,6 +188,40 @@
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
@@ -204,9 +241,9 @@
test_expect_success 'create namespaced refs' '
test_commit namespaced &&
- git push public HEAD:refs/namespaces/ns/refs/heads/master &&
+ git push public HEAD:refs/namespaces/ns/refs/heads/main &&
git --git-dir="$HTTPD_DOCUMENT_ROOT_PATH/repo.git" \
- symbolic-ref refs/namespaces/ns/HEAD refs/namespaces/ns/refs/heads/master
+ symbolic-ref refs/namespaces/ns/HEAD refs/namespaces/ns/refs/heads/main
'
test_expect_success 'smart clone respects namespace' '
@@ -237,7 +274,7 @@
EOF
git config http.cookiefile cookies.txt &&
git config http.savecookies true &&
- git ls-remote $HTTPD_URL/smart_cookies/repo.git master &&
+ git ls-remote $HTTPD_URL/smart_cookies/repo.git main &&
# NEEDSWORK: If the overspecification of the expected result is reduced, we
# might be able to run this test in all protocol versions.
@@ -310,12 +347,12 @@
test_expect_success 'test allowreachablesha1inwant' '
test_when_finished "rm -rf test_reachable.git" &&
server="$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
- master_sha=$(git -C "$server" rev-parse refs/heads/master) &&
+ main_sha=$(git -C "$server" rev-parse refs/heads/main) &&
git -C "$server" config uploadpack.allowreachablesha1inwant 1 &&
git init --bare test_reachable.git &&
git -C test_reachable.git remote add origin "$HTTPD_URL/smart/repo.git" &&
- git -C test_reachable.git fetch origin "$master_sha"
+ git -C test_reachable.git fetch origin "$main_sha"
'
test_expect_success 'test allowreachablesha1inwant with unreachable' '
@@ -329,7 +366,7 @@
git push public :refs/heads/doomed &&
server="$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
- master_sha=$(git -C "$server" rev-parse refs/heads/master) &&
+ main_sha=$(git -C "$server" rev-parse refs/heads/main) &&
git -C "$server" config uploadpack.allowreachablesha1inwant 1 &&
git init --bare test_reachable.git &&
@@ -351,7 +388,7 @@
git push public :refs/heads/doomed &&
server="$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
- master_sha=$(git -C "$server" rev-parse refs/heads/master) &&
+ main_sha=$(git -C "$server" rev-parse refs/heads/main) &&
git -C "$server" config uploadpack.allowreachablesha1inwant 1 &&
git init --bare test_reachable.git &&
@@ -410,8 +447,8 @@
test_commit -C "$SERVER" bar &&
git -C client -c protocol.version=0 fetch &&
- git -C "$SERVER" rev-parse master >expect &&
- git -C client rev-parse origin/master >actual &&
+ git -C "$SERVER" rev-parse main >expect &&
+ git -C client rev-parse origin/main >actual &&
test_cmp expect actual
'
@@ -430,27 +467,39 @@
--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/t/t5552-skipping-fetch-negotiator.sh b/t/t5552-skipping-fetch-negotiator.sh
index 156c704..7b9fb4f 100755
--- a/t/t5552-skipping-fetch-negotiator.sh
+++ b/t/t5552-skipping-fetch-negotiator.sh
@@ -100,7 +100,7 @@
git -C server checkout --orphan anotherbranch &&
test_commit -C server to_fetch &&
- # The server advertising "c3" (as "refs/heads/master") means that we do
+ # The server advertising "c3" (as "refs/heads/main") means that we do
# not need to send any ancestors of "c3", but we still need to send "c3"
# itself.
test_config -C client fetch.negotiationalgorithm skipping &&
diff --git a/t/t5553-set-upstream.sh b/t/t5553-set-upstream.sh
index 81975ad..b1d614c 100755
--- a/t/t5553-set-upstream.sh
+++ b/t/t5553-set-upstream.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='"git fetch/pull --set-upstream" basic tests.'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
check_config () {
@@ -32,9 +35,9 @@
git remote add upstream parent
'
-test_expect_success 'setup commit on master and other fetch' '
+test_expect_success 'setup commit on main and other fetch' '
test_commit one &&
- git push upstream master &&
+ git push upstream main &&
git checkout -b other &&
test_commit two &&
git push upstream other
@@ -43,47 +46,47 @@
# 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 &&
+ clear_config main other &&
+ git checkout main &&
git fetch --set-upstream upstream &&
- check_config_missing master &&
+ check_config_missing main &&
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 &&
+test_expect_success 'fetch --set-upstream upstream main sets branch main but not other' '
+ clear_config main other &&
+ git fetch --set-upstream upstream main &&
+ check_config main upstream refs/heads/main &&
check_config_missing other
'
test_expect_success 'fetch --set-upstream upstream other sets branch other' '
- clear_config master other &&
+ clear_config main other &&
git fetch --set-upstream upstream other &&
- check_config master upstream refs/heads/other &&
+ check_config main upstream refs/heads/other &&
check_config_missing other
'
-test_expect_success 'fetch --set-upstream master:other does not set the branch other2' '
+test_expect_success 'fetch --set-upstream main:other does not set the branch other2' '
clear_config other2 &&
- git fetch --set-upstream upstream master:other2 &&
+ git fetch --set-upstream upstream main: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
+ # main explicitly not cleared, we check that it is not touched from previous value
clear_config other other2 &&
test_must_fail git fetch --set-upstream http://nosuchdomain.example.com &&
- check_config master upstream refs/heads/other &&
+ check_config main 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"'" &&
+ url="file://$PWD" &&
git fetch --set-upstream "$url" &&
- check_config master "$url" HEAD &&
+ check_config main "$url" HEAD &&
check_config_missing other &&
check_config_missing other2
'
@@ -96,30 +99,30 @@
git remote add upstream parent
'
-test_expect_success 'setup commit on master and other pull' '
+test_expect_success 'setup commit on main and other pull' '
test_commit three &&
- git push --tags upstream master &&
+ git push --tags upstream main &&
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 &&
+test_expect_success 'pull --set-upstream upstream main sets branch main but not other' '
+ clear_config main other &&
+ git pull --set-upstream upstream main &&
+ check_config main upstream refs/heads/main &&
check_config_missing other
'
-test_expect_success 'pull --set-upstream master:other2 does not set the branch other2' '
+test_expect_success 'pull --set-upstream main:other2 does not set the branch other2' '
clear_config other2 &&
- git pull --set-upstream upstream master:other2 &&
+ git pull --set-upstream upstream main:other2 &&
check_config_missing other2
'
-test_expect_success 'pull --set-upstream upstream other sets branch master' '
- clear_config master other &&
+test_expect_success 'pull --set-upstream upstream other sets branch main' '
+ clear_config main other &&
git pull --set-upstream upstream other &&
- check_config master upstream refs/heads/other &&
+ check_config main upstream refs/heads/other &&
check_config_missing other
'
@@ -130,47 +133,47 @@
'
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
+ # main explicitly not cleared, we check that it is not touched from previous value
clear_config other other2 three &&
test_must_fail git pull --set-upstream http://nosuchdomain.example.com &&
- check_config master upstream refs/heads/other &&
+ check_config main 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 &&
+ clear_config main other &&
git pull --set-upstream upstream HEAD &&
- check_config master upstream HEAD &&
+ check_config main 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 &&
+ clear_config main three &&
+ git pull --set-upstream upstream main three &&
+ check_config_missing main &&
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"'" &&
+ clear_config main other other2 &&
+ git checkout main &&
+ url="file://$PWD" &&
git pull --set-upstream "$url" &&
- check_config master "$url" HEAD &&
+ check_config main "$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 &&
+ clear_config main other other2 &&
+ git checkout main &&
+ url="file://$PWD" &&
+ git pull --set-upstream "$url" main &&
+ check_config main "$url" refs/heads/main &&
check_config_missing other &&
check_config_missing other2
'
diff --git a/t/t5554-noop-fetch-negotiator.sh b/t/t5554-noop-fetch-negotiator.sh
new file mode 100755
index 0000000..2ac7b58
--- /dev/null
+++ b/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/t/t5560-http-backend-noserver.sh b/t/t5560-http-backend-noserver.sh
index 9fafcf1..d30cf4f 100755
--- a/t/t5560-http-backend-noserver.sh
+++ b/t/t5560-http-backend-noserver.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='test git-http-backend-noserver'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
HTTPD_DOCUMENT_ROOT_PATH="$TRASH_DIRECTORY"
diff --git a/t/t5561-http-backend.sh b/t/t5561-http-backend.sh
index 6eb0294..9c57d84 100755
--- a/t/t5561-http-backend.sh
+++ b/t/t5561-http-backend.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='test git-http-backend'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-httpd.sh
@@ -39,9 +42,9 @@
grep '^[^#]' >exp <<EOF
-### refs/heads/master
+### refs/heads/main
###
-GET /smart/repo.git/refs/heads/master HTTP/1.1 404 -
+GET /smart/repo.git/refs/heads/main HTTP/1.1 404 -
### getanyfile default
###
diff --git a/t/t5562-http-backend-content-length.sh b/t/t5562-http-backend-content-length.sh
index 4a110b3..e5d3d15 100755
--- a/t/t5562-http-backend-content-length.sh
+++ b/t/t5562-http-backend-content-length.sh
@@ -53,15 +53,20 @@
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" "$ZERO_OID" "$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/t/t556x_common b/t/t556x_common
index 359fcfe..670fb89 100755
--- a/t/t556x_common
+++ b/t/t556x_common
@@ -22,7 +22,7 @@
: >objects/info/http-alternates
) &&
git remote add public "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
- git push public master:master &&
+ git push public main:main &&
(cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
git repack -a -d
@@ -31,7 +31,7 @@
echo other >file &&
git add file &&
git commit -m two &&
- git push public master:master &&
+ git push public main:main &&
LOOSE_URL=$(find_file objects/??) &&
PACK_URL=$(find_file objects/pack/*.pack) &&
@@ -51,8 +51,8 @@
SMART=smart
GIT_HTTP_EXPORT_ALL=1 && export GIT_HTTP_EXPORT_ALL
-test_expect_success 'direct refs/heads/master not found' '
- GET refs/heads/master "404 Not Found"
+test_expect_success 'direct refs/heads/main not found' '
+ GET refs/heads/main "404 Not Found"
'
test_expect_success 'static file is ok' '
get_static_files "200 OK"
diff --git a/t/t5570-git-daemon.sh b/t/t5570-git-daemon.sh
index 34487bb..82c31ab 100755
--- a/t/t5570-git-daemon.sh
+++ b/t/t5570-git-daemon.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='test fetching over git protocol'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-git-daemon.sh
@@ -26,7 +29,7 @@
: >git-daemon-export-ok
) &&
git remote add public "$GIT_DAEMON_DOCUMENT_ROOT_PATH/repo.git" &&
- git push public master:master
+ git push public main:main
'
test_expect_success 'clone git repository' '
@@ -55,12 +58,12 @@
'
test_expect_success 'remote detects correct HEAD' '
- git push public master:other &&
+ git push public main:other &&
(cd clone &&
git remote set-head -d origin &&
git remote set-head -a origin &&
git symbolic-ref refs/remotes/origin/HEAD > output &&
- echo refs/remotes/origin/master > expect &&
+ echo refs/remotes/origin/main > expect &&
test_cmp expect output
)
'
@@ -103,6 +106,11 @@
)
'
+test_expect_success 'client refuses to ask for repo with newline' '
+ test_must_fail git clone "$GIT_DAEMON_URL/repo$LF.git" dst 2>stderr &&
+ test_i18ngrep newline.is.forbidden stderr
+'
+
test_remote_error()
{
do_export=YesPlease
@@ -147,18 +155,18 @@
}
msg="access denied or repository not exported"
-test_expect_success 'clone non-existent' "test_remote_error '$msg' clone nowhere.git "
-test_expect_success 'push disabled' "test_remote_error '$msg' push repo.git master"
-test_expect_success 'read access denied' "test_remote_error -x '$msg' fetch repo.git "
-test_expect_success 'not exported' "test_remote_error -n '$msg' fetch repo.git "
+test_expect_success 'clone non-existent' "test_remote_error '$msg' clone nowhere.git"
+test_expect_success 'push disabled' "test_remote_error '$msg' push repo.git main"
+test_expect_success 'read access denied' "test_remote_error -x '$msg' fetch repo.git"
+test_expect_success 'not exported' "test_remote_error -n '$msg' fetch repo.git"
stop_git_daemon
start_git_daemon --informative-errors
-test_expect_success 'clone non-existent' "test_remote_error 'no such repository' clone nowhere.git "
-test_expect_success 'push disabled' "test_remote_error 'service not enabled' push repo.git master"
-test_expect_success 'read access denied' "test_remote_error -x 'no such repository' fetch repo.git "
-test_expect_success 'not exported' "test_remote_error -n 'repository not exported' fetch repo.git "
+test_expect_success 'clone non-existent' "test_remote_error 'no such repository' clone nowhere.git"
+test_expect_success 'push disabled' "test_remote_error 'service not enabled' push repo.git main"
+test_expect_success 'read access denied' "test_remote_error -x 'no such repository' fetch repo.git"
+test_expect_success 'not exported' "test_remote_error -n 'repository not exported' fetch repo.git"
stop_git_daemon
start_git_daemon --interpolated-path="$GIT_DAEMON_DOCUMENT_ROOT_PATH/%H%D"
@@ -192,10 +200,10 @@
fake_nc "$GIT_DAEMON_HOST_PORT" <input >output &&
depacketize <output >output.raw &&
- # just pick out the value of master, which avoids any protocol
+ # just pick out the value of main, which avoids any protocol
# particulars
- perl -lne "print \$1 if m{^(\\S+) refs/heads/master}" <output.raw >actual &&
- git -C "$repo" rev-parse master >expect &&
+ perl -lne "print \$1 if m{^(\\S+) refs/heads/main}" <output.raw >actual &&
+ git -C "$repo" rev-parse main >expect &&
test_cmp expect actual
'
diff --git a/t/t5571-pre-push-hook.sh b/t/t5571-pre-push-hook.sh
index ac53d63..ad8d580 100755
--- a/t/t5571-pre-push-hook.sh
+++ b/t/t5571-pre-push-hook.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='check pre-push hooks'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
# Setup hook that always succeeds
@@ -48,11 +51,11 @@
cat >expected <<EOF
parent1
repo1
-refs/heads/master $COMMIT2 refs/heads/foreign $COMMIT1
+refs/heads/main $COMMIT2 refs/heads/foreign $COMMIT1
EOF
test_expect_success 'push with hook' '
- git push parent1 master:foreign &&
+ git push parent1 main:foreign &&
diff expected actual
'
diff --git a/t/t5572-pull-submodule.sh b/t/t5572-pull-submodule.sh
index f916729..29537f4 100755
--- a/t/t5572-pull-submodule.sh
+++ b/t/t5572-pull-submodule.sh
@@ -13,34 +13,38 @@
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 &&
@@ -97,7 +101,12 @@
test_path_is_file super/sub/merge_strategy_4.t
'
-test_expect_success 'recursive rebasing pull' '
+test_expect_success 'pull --rebase --recurse-submodules (remote superproject submodule changes, local submodule changes)' '
+ # This tests the following scenario :
+ # - local submodule has new commits
+ # - local superproject does not have new commits
+ # - upstream superproject has new commits that change the submodule pointer
+
# change upstream
test_commit -C child rebase_strategy &&
git -C parent submodule update --remote &&
@@ -112,7 +121,10 @@
test_path_is_file super/sub/local_stuff.t
'
-test_expect_success 'pull rebase recursing fails with conflicts' '
+test_expect_success 'pull --rebase --recurse-submodules fails if both sides record submodule changes' '
+ # This tests the following scenario :
+ # - local superproject has new commits that change the submodule pointer
+ # - upstream superproject has new commits that change the submodule pointer
# local changes in submodule recorded in superproject:
test_commit -C super/sub local_stuff_2 &&
@@ -132,6 +144,50 @@
test_i18ngrep "locally recorded submodule modifications" err
'
+test_expect_success 'pull --rebase --recurse-submodules (no submodule changes, no fork-point)' '
+ # This tests the following scenario :
+ # - local submodule does not have new commits
+ # - local superproject has new commits that *do not* change the submodule pointer
+ # - upstream superproject has new commits that *do not* change the submodule pointer
+ # - local superproject branch has no fork-point with its remote-tracking counter-part
+
+ # create upstream superproject
+ test_create_repo submodule &&
+ test_commit -C submodule first_in_sub &&
+
+ test_create_repo superprojet &&
+ test_commit -C superprojet first_in_super &&
+ git -C superprojet submodule add ../submodule &&
+ git -C superprojet commit -m "add submodule" &&
+ test_commit -C superprojet third_in_super &&
+
+ # clone superproject
+ git clone --recurse-submodules superprojet superclone &&
+
+ # add commits upstream
+ test_commit -C superprojet fourth_in_super &&
+
+ # create topic branch in clone, not based on any remote-tracking branch
+ git -C superclone checkout -b feat HEAD~1 &&
+ test_commit -C superclone first_on_feat &&
+ git -C superclone pull --rebase --recurse-submodules origin HEAD
+'
+
+# NOTE:
+#
+# This test is particular because there is only a single commit in the upstream superproject
+# 'parent' (which adds the submodule 'a-submodule'). The clone of the superproject
+# ('child') hard-resets its branch to a new root commit with the same tree as the one
+# from the upstream superproject, so that its branch has no merge-base with its
+# remote-tracking counterpart, and then calls 'git pull --recurse-submodules --rebase'.
+# The result is that the local branch is reset to the remote-tracking branch (as it was
+# originally before the hard-reset).
+
+# The only commit in the range generated by 'submodule.c::submodule_touches_in_range' and
+# passed to 'submodule.c::collect_changed_submodules' is the new (regenerated) initial commit,
+# which adds the submodule.
+# However, 'submodule_touches_in_range' does not error (even though this commit adds the submodule)
+# because 'combine-diff.c::diff_tree_combined' returns early, as the initial commit has no parents.
test_expect_success 'branch has no merge base with remote-tracking counterpart' '
rm -rf parent child &&
@@ -144,8 +200,8 @@
git clone parent child &&
- # Reset master so that it has no merge base with
- # refs/remotes/origin/master.
+ # Reset the current branch so that it has no merge base with
+ # the remote-tracking branch.
OTHER=$(git -C child commit-tree -m bar \
$(git -C child rev-parse HEAD^{tree})) &&
git -C child reset --hard "$OTHER" &&
diff --git a/t/t5580-unc-paths.sh b/t/t5580-unc-paths.sh
index cf768b3..cd803ae 100755
--- a/t/t5580-unc-paths.sh
+++ b/t/t5580-unc-paths.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='various Windows-only path tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
if test_have_prereq CYGWIN
@@ -53,7 +56,7 @@
git init to-fetch &&
(
cd to-fetch &&
- git fetch "$UNCPATH" master
+ git fetch "$UNCPATH" main
)
'
diff --git a/t/t5581-http-curl-verbose.sh b/t/t5581-http-curl-verbose.sh
index 5129b07..cded79c 100755
--- a/t/t5581-http-curl-verbose.sh
+++ b/t/t5581-http-curl-verbose.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='test GIT_CURL_VERBOSE'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-httpd.sh
start_httpd
@@ -13,14 +16,14 @@
git add file &&
git commit -m one &&
git remote add public "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
- git push public master:master
+ git push public main:main
'
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/t/t5582-fetch-negative-refspec.sh b/t/t5582-fetch-negative-refspec.sh
new file mode 100755
index 0000000..f345097
--- /dev/null
+++ b/t/t5582-fetch-negative-refspec.sh
@@ -0,0 +1,243 @@
+#!/bin/sh
+# Copyright (c) 2020, Jacob Keller.
+
+test_description='"git fetch" with negative refspecs.
+
+'
+
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./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 main
+ ) &&
+ git clone . two &&
+ (
+ cd two &&
+ git config branch.main.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/main &&
+ mine=$(git rev-parse refs/remotes/one/main) &&
+ his=$(cd ../one && git rev-parse refs/heads/main) &&
+ 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/main &&
+ 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 &&
+ main_in_one=$(cd ../one && git rev-parse refs/heads/main) &&
+ test_must_fail git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^$main_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) &&
+ main_in_one=$(cd ../one && git rev-parse refs/heads/main) &&
+ echo $alternate_in_one >expect &&
+ echo $main_in_one >>expect &&
+ git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^main &&
+ 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_expect_success "push with matching : and negative refspec" '
+ # Manually handle cleanup, since test_config is not
+ # prepared to take arbitrary options like --add
+ test_when_finished "test_unconfig -C two remote.one.push" &&
+
+ # For convenience, we use "master" to refer to the name of
+ # the branch created by default in the following.
+ #
+ # Repositories two and one have branches other than "master"
+ # but they have no overlap---"master" is the only one that
+ # is shared between them. And the master branch at two is
+ # behind the master branch at one by one commit.
+ git -C two config --add remote.one.push : &&
+
+ # A matching push tries to update master, fails due to non-ff
+ test_must_fail git -C two push one &&
+
+ # "master" may actually not be "master"---find it out.
+ current=$(git symbolic-ref HEAD) &&
+
+ # If master is in negative refspec, then the command will not attempt
+ # to push and succeed.
+ git -C two config --add remote.one.push "^$current" &&
+
+ # With "master" excluded, this push is a no-op. Nothing gets
+ # pushed and it succeeds.
+ git -C two push -v one
+'
+
+test_expect_success "push with matching +: and negative refspec" '
+ test_when_finished "test_unconfig -C two remote.one.push" &&
+
+ # The same set-up as above, whose side-effect was a no-op.
+ git -C two config --add remote.one.push +: &&
+
+ # The push refuses to update the "master" branch that is checked
+ # out in the "one" repository, even when it is forced with +:
+ test_must_fail git -C two push one &&
+
+ # "master" may actually not be "master"---find it out.
+ current=$(git symbolic-ref HEAD) &&
+
+ # If master is in negative refspec, then the command will not attempt
+ # to push and succeed
+ git -C two config --add remote.one.push "^$current" &&
+
+ # With "master" excluded, this push is a no-op. Nothing gets
+ # pushed and it succeeds.
+ git -C two push -v one
+'
+
+test_done
diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
index 84ea2a3..e7e6c08 100755
--- a/t/t5601-clone.sh
+++ b/t/t5601-clone.sh
@@ -2,6 +2,9 @@
test_description=clone
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
X=
@@ -37,7 +40,7 @@
'
-test_expect_success C_LOCALE_OUTPUT 'output from clone' '
+test_expect_success 'output from clone' '
rm -fr dst &&
git clone -n "file://$(pwd)/src" dst >output 2>&1 &&
test $(grep Clon output | wc -l) = 1
@@ -217,7 +220,7 @@
rm -fr dst &&
git clone src dst &&
cd dst &&
- actual="z$(git config branch.master.rebase)" &&
+ actual="z$(git config branch.main.rebase)" &&
test ztrue = $actual
)
'
@@ -271,7 +274,9 @@
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' '
@@ -589,7 +594,7 @@
(
cd src &&
- git checkout -b another master
+ git checkout -b another main
) &&
git clone src target-11 &&
test "z$( cd target-11 && git symbolic-ref HEAD )" = zrefs/heads/another
@@ -629,6 +634,20 @@
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" &&
@@ -667,7 +686,8 @@
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 +722,7 @@
# 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
'
diff --git a/t/t5604-clone-reference.sh b/t/t5604-clone-reference.sh
index 0c74b4e..e845d62 100755
--- a/t/t5604-clone-reference.sh
+++ b/t/t5604-clone-reference.sh
@@ -4,6 +4,9 @@
#
test_description='test clone --reference'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
base_dir=$(pwd)
@@ -49,7 +52,7 @@
'
test_expect_success 'pulling from reference' '
- git -C C pull ../B master
+ git -C C pull ../B main
'
test_expect_success 'that reference gets used' '
@@ -70,7 +73,7 @@
'
test_expect_success 'pulling from reference' '
- git -C D pull ../B master
+ git -C D pull ../B main
'
test_expect_success 'that reference gets used' '
@@ -136,11 +139,11 @@
git clone A J &&
(
cd J &&
- git checkout -b other master^ &&
+ git checkout -b other main^ &&
echo other >otherfile &&
git add otherfile &&
git commit -m other &&
- git checkout master
+ git checkout main
)
'
@@ -152,9 +155,9 @@
git remote add J "file://$base_dir/J" &&
GIT_TRACE_PACKET=$U.K git fetch J
) &&
- master_object=$(cd A && git for-each-ref --format="%(objectname)" refs/heads/master) &&
+ main_object=$(cd A && git for-each-ref --format="%(objectname)" refs/heads/main) &&
test -s "$U.K" &&
- ! grep " want $master_object" "$U.K" &&
+ ! grep " want $main_object" "$U.K" &&
tag_object=$(cd A && git for-each-ref --format="%(objectname)" refs/tags/HEAD) &&
! grep " want $tag_object" "$U.K"
'
@@ -175,7 +178,7 @@
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,7 +329,7 @@
for raw in $(ls T*.raw)
do
sed -e "s!/../!/Y/!; s![0-9a-f]\{38,\}!Z!" -e "/commit-graph/d" \
- -e "/multi-pack-index/d" <$raw >$raw.de-sha-1 &&
+ -e "/multi-pack-index/d" -e "/rev/d" <$raw >$raw.de-sha-1 &&
sort $raw.de-sha-1 >$raw.de-sha || return 1
done &&
diff --git a/t/t5605-clone-local.sh b/t/t5605-clone-local.sh
index af23419..7d63365 100755
--- a/t/t5605-clone-local.sh
+++ b/t/t5605-clone-local.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='test local clone'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
repo_is_hardlinked() {
@@ -15,7 +18,7 @@
test "$(cd a.git && git config --bool core.bare)" = true &&
test "$(cd x && git config --bool core.bare)" = true &&
git bundle create b1.bundle --all &&
- git bundle create b2.bundle master &&
+ git bundle create b2.bundle main &&
mkdir dir &&
cp b1.bundle dir/b3 &&
cp b1.bundle b4
@@ -84,7 +87,7 @@
git clone b2.bundle b2 &&
(cd b2 &&
git fetch &&
- test_must_fail git rev-parse --verify refs/heads/master)
+ test_must_fail git rev-parse --verify refs/heads/main)
'
test_expect_success 'clone empty repository' '
@@ -98,9 +101,9 @@
echo "content" >> foo &&
git add foo &&
git commit -m "Initial commit" &&
- git push origin master &&
- expected=$(git rev-parse master) &&
- actual=$(git --git-dir=../empty/.git rev-parse master) &&
+ git push origin main &&
+ expected=$(git rev-parse main) &&
+ actual=$(git --git-dir=../empty/.git rev-parse main) &&
test $actual = $expected)
'
diff --git a/t/t5606-clone-options.sh b/t/t5606-clone-options.sh
index 9e24ec8..1da6ddb 100755
--- a/t/t5606-clone-options.sh
+++ b/t/t5606-clone-options.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='basic clone options'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup' '
@@ -15,7 +18,73 @@
test_expect_success 'clone -o' '
git clone -o foo parent clone-o &&
- (cd clone-o && git rev-parse --verify refs/remotes/foo/master)
+ git -C clone-o rev-parse --verify refs/remotes/foo/main
+
+'
+
+test_expect_success 'rejects invalid -o/--origin' '
+
+ test_must_fail git clone -o "bad...name" parent clone-bad-name 2>err &&
+ test_i18ngrep "'\''bad...name'\'' is not a valid remote name" err
+
+'
+
+test_expect_success 'disallows --bare with --origin' '
+
+ test_must_fail git clone -o foo --bare parent clone-bare-o 2>err &&
+ test_debug "cat err" &&
+ test_i18ngrep -e "--bare and --origin foo options are incompatible" err
+
+'
+
+test_expect_success 'disallows --bare with --separate-git-dir' '
+
+ test_must_fail git clone --bare --separate-git-dir dot-git-destiation parent clone-bare-sgd 2>err &&
+ test_debug "cat err" &&
+ test_i18ngrep -e "--bare and --separate-git-dir are incompatible" err
+
+'
+
+test_expect_success 'uses "origin" for default remote name' '
+
+ git clone parent clone-default-origin &&
+ git -C clone-default-origin rev-parse --verify refs/remotes/origin/main
+
+'
+
+test_expect_success 'prefers --template config over normal config' '
+
+ template="$TRASH_DIRECTORY/template-with-config" &&
+ mkdir "$template" &&
+ git config --file "$template/config" foo.bar from_template &&
+ test_config_global foo.bar from_global &&
+ git clone "--template=$template" parent clone-template-config &&
+ test "$(git -C clone-template-config config --local foo.bar)" = "from_template"
+
+'
+
+test_expect_success 'prefers -c config over --template config' '
+
+ template="$TRASH_DIRECTORY/template-with-ignored-config" &&
+ mkdir "$template" &&
+ git config --file "$template/config" foo.bar from_template &&
+ git clone "--template=$template" -c foo.bar=inline parent clone-template-inline-config &&
+ test "$(git -C clone-template-inline-config config --local foo.bar)" = "inline"
+
+'
+
+test_expect_success 'prefers config "clone.defaultRemoteName" over default' '
+
+ test_config_global clone.defaultRemoteName from_config &&
+ git clone parent clone-config-origin &&
+ git -C clone-config-origin rev-parse --verify refs/remotes/from_config/main
+
+'
+
+test_expect_success 'prefers --origin over -c config' '
+
+ git clone -c clone.defaultRemoteName=inline --origin from_option parent clone-o-and-inline-config &&
+ git -C clone-o-and-inline-config rev-parse --verify refs/remotes/from_option/main
'
@@ -35,4 +104,33 @@
'
+test_expect_success 'chooses correct default initial branch name' '
+ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+ git -c init.defaultBranch=foo init --bare empty &&
+ test_config -C empty lsrefs.unborn advertise &&
+ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+ git -c init.defaultBranch=up -c protocol.version=2 clone empty whats-up &&
+ test refs/heads/foo = $(git -C whats-up symbolic-ref HEAD) &&
+ test refs/heads/foo = $(git -C whats-up config branch.foo.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_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+ 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_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+ 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/t/t5607-clone-bundle.sh b/t/t5607-clone-bundle.sh
index 9108ff6..f4c383c 100755
--- a/t/t5607-clone-bundle.sh
+++ b/t/t5607-clone-bundle.sh
@@ -1,9 +1,16 @@
#!/bin/sh
test_description='some bundle related tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./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 &&
@@ -15,8 +22,8 @@
'
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 &&
+ git bundle create tip.bundle -1 main &&
+ nongit test_must_fail git bundle verify ../tip.bundle 2>err &&
test_i18ngrep "need a repository" err
'
@@ -34,16 +41,16 @@
test_must_fail git bundle create adir --all
'
-test_expect_failure 'bundle --stdin' '
- echo master | git bundle create stdin-bundle.bdl --stdin &&
+test_expect_success 'bundle --stdin' '
+ echo main | git bundle create stdin-bundle.bdl --stdin &&
git ls-remote stdin-bundle.bdl >output &&
- grep master output
+ grep main output
'
-test_expect_failure 'bundle --stdin <rev-list options>' '
- echo master | git bundle create hybrid-bundle.bdl --stdin tag &&
+test_expect_success 'bundle --stdin <rev-list options>' '
+ echo main | git bundle create hybrid-bundle.bdl --stdin tag &&
git ls-remote hybrid-bundle.bdl >output &&
- grep master output
+ grep main output
'
test_expect_success 'empty bundle file is rejected' '
@@ -79,14 +86,14 @@
test_expect_success 'failed bundle creation does not leave cruft' '
# This fails because the bundle would be empty.
- test_must_fail git bundle create fail.bundle master..master &&
+ test_must_fail git bundle create fail.bundle main..main &&
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 bundle create tip.bundle -1 main &&
git -C foo rev-parse HEAD >hash &&
# Exercise to ensure that fetching a SHA-1 from a bundle works with no
@@ -94,4 +101,31 @@
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/t/t5608-clone-2gb.sh b/t/t5608-clone-2gb.sh
index eee0842..87a8cd9 100755
--- a/t/t5608-clone-2gb.sh
+++ b/t/t5608-clone-2gb.sh
@@ -5,12 +5,11 @@
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 &&
@@ -27,7 +26,7 @@
i=$(($i+1)) ||
echo $? > exit-status
done &&
- echo "commit refs/heads/master" &&
+ echo "commit refs/heads/main" &&
echo "author A U Thor <author@email.com> 123456789 +0000" &&
echo "committer C O Mitter <committer@email.com> 123456789 +0000" &&
echo "data 5" &&
@@ -38,13 +37,13 @@
'
-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/t/t5609-clone-branch.sh b/t/t5609-clone-branch.sh
index 6e7a7be..f86a674 100755
--- a/t/t5609-clone-branch.sh
+++ b/t/t5609-clone-branch.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='clone --branch option'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
check_HEAD() {
@@ -20,7 +23,7 @@
echo one >file && git add file && git commit -m one &&
git checkout -b two &&
echo two >file && git add file && git commit -m two &&
- git checkout master) &&
+ git checkout main) &&
mkdir empty &&
(cd empty && git init)
'
@@ -28,7 +31,7 @@
test_expect_success 'vanilla clone chooses HEAD' '
git clone parent clone &&
(cd clone &&
- check_HEAD master &&
+ check_HEAD main &&
check_file one
)
'
@@ -53,7 +56,7 @@
test_expect_success 'clone -b does not munge remotes/origin/HEAD' '
(cd clone-two &&
- echo refs/remotes/origin/master >expect &&
+ echo refs/remotes/origin/main >expect &&
git symbolic-ref refs/remotes/origin/HEAD >actual &&
test_cmp expect actual
)
diff --git a/t/t5610-clone-detached.sh b/t/t5610-clone-detached.sh
index 8b0d607..a7ec21e 100755
--- a/t/t5610-clone-detached.sh
+++ b/t/t5610-clone-detached.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='test cloning a repository with detached HEAD'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
head_is_detached() {
@@ -20,7 +23,7 @@
'
test_expect_success 'clone repo (detached HEAD points to branch)' '
- git checkout master^0 &&
+ git checkout main^0 &&
git clone "file://$PWD" detached-branch
'
test_expect_success 'cloned HEAD matches' '
@@ -59,7 +62,7 @@
'
test_expect_success 'clone repo (orphan detached HEAD)' '
- git checkout master^0 &&
+ git checkout main^0 &&
echo four >file &&
git commit -a -m four &&
git clone "file://$PWD" detached-orphan
diff --git a/t/t5611-clone-config.sh b/t/t5611-clone-config.sh
index 60c1ba9..9f555b8 100755
--- a/t/t5611-clone-config.sh
+++ b/t/t5611-clone-config.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='tests for git clone -c key=value'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'clone -c sets config in cloned repo' '
@@ -47,16 +50,16 @@
test_expect_success 'clone -c remote.origin.fetch=<refspec> works' '
rm -rf child &&
- git update-ref refs/grab/it refs/heads/master &&
- git update-ref refs/leave/out refs/heads/master &&
+ git update-ref refs/grab/it refs/heads/main &&
+ git update-ref refs/leave/out refs/heads/main &&
git clone -c "remote.origin.fetch=+refs/grab/*:refs/grab/*" . child &&
git -C child for-each-ref --format="%(refname)" >actual &&
cat >expect <<-\EOF &&
refs/grab/it
- refs/heads/master
+ refs/heads/main
refs/remotes/origin/HEAD
- refs/remotes/origin/master
+ refs/remotes/origin/main
EOF
test_cmp expect actual
'
@@ -68,9 +71,9 @@
cat >expect <<-\EOF &&
refs/grab/it
- refs/heads/master
+ refs/heads/main
refs/remotes/origin/HEAD
- refs/remotes/origin/master
+ refs/remotes/origin/main
EOF
test_cmp expect actual
'
@@ -85,31 +88,24 @@
cat >expect <<-\EOF &&
refs/grab/it
- refs/heads/master
+ refs/heads/main
refs/remotes/upstream/HEAD
- refs/remotes/upstream/master
+ refs/remotes/upstream/main
EOF
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/t/t5612-clone-refspec.sh b/t/t5612-clone-refspec.sh
index e36ac01..6a6af74 100755
--- a/t/t5612-clone-refspec.sh
+++ b/t/t5612-clone-refspec.sh
@@ -1,10 +1,13 @@
#!/bin/sh
test_description='test refspec written by clone-command'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup' '
- # Make two branches, "master" and "side"
+ # Make two branches, "main" and "side"
echo one >file &&
git add file &&
git commit -m one &&
@@ -16,7 +19,7 @@
git checkout -b side &&
echo four >file &&
git commit -a -m four &&
- git checkout master &&
+ git checkout main &&
git tag five &&
# default clone
@@ -25,18 +28,18 @@
# default clone --no-tags
git clone --no-tags . dir_all_no_tags &&
- # default --single that follows HEAD=master
- git clone --single-branch . dir_master &&
+ # default --single that follows HEAD=main
+ git clone --single-branch . dir_main &&
- # default --single that follows HEAD=master with no tags
- git clone --single-branch --no-tags . dir_master_no_tags &&
+ # default --single that follows HEAD=main with no tags
+ git clone --single-branch --no-tags . dir_main_no_tags &&
# default --single that follows HEAD=side
git checkout side &&
git clone --single-branch . dir_side &&
# explicit --single that follows side
- git checkout master &&
+ git checkout main &&
git clone --single-branch --branch side . dir_side2 &&
# default --single with --mirror
@@ -55,11 +58,11 @@
# explicit --single with tag and --no-tags
git clone --single-branch --no-tags --branch two . dir_tag_no_tags &&
- # advance both "master" and "side" branches
+ # advance both "main" and "side" branches
git checkout side &&
echo five >file &&
git commit -a -m five &&
- git checkout master &&
+ git checkout main &&
echo six >file &&
git commit -a -m six &&
@@ -71,11 +74,11 @@
(
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
+ # follow both main and side
git for-each-ref refs/heads >expect &&
test_cmp expect actual
'
@@ -87,7 +90,7 @@
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
'
@@ -100,20 +103,20 @@
test_must_be_empty actual
'
-test_expect_success '--single-branch while HEAD pointing at master' '
+test_expect_success '--single-branch while HEAD pointing at main' '
(
- cd dir_master &&
+ cd dir_main &&
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 &&
+ # only follow main
+ git for-each-ref refs/heads/main >expect &&
# get & check latest tags
test_cmp expect actual &&
(
- cd dir_master &&
+ cd dir_main &&
git fetch --tags --force &&
git for-each-ref refs/tags >../actual
) &&
@@ -122,20 +125,20 @@
test_line_count = 2 actual
'
-test_expect_success '--single-branch while HEAD pointing at master and --no-tags' '
+test_expect_success '--single-branch while HEAD pointing at main and --no-tags' '
(
- cd dir_master_no_tags &&
+ cd dir_main_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 &&
+ # only follow main
+ git for-each-ref refs/heads/main >expect &&
test_cmp expect actual &&
# get tags (noop)
(
- cd dir_master_no_tags &&
+ cd dir_main_no_tags &&
git fetch &&
git for-each-ref refs/tags >../actual
) &&
@@ -143,7 +146,7 @@
test_line_count = 0 actual &&
# get tags with --tags overrides tagOpt
(
- cd dir_master_no_tags &&
+ cd dir_main_no_tags &&
git fetch --tags &&
git for-each-ref refs/tags >../actual
) &&
@@ -156,9 +159,9 @@
(
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 +172,9 @@
(
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 +226,9 @@
(
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/t/t5614-clone-submodules-shallow.sh b/t/t5614-clone-submodules-shallow.sh
index e4e6ea4..5504b51 100755
--- a/t/t5614-clone-submodules-shallow.sh
+++ b/t/t5614-clone-submodules-shallow.sh
@@ -7,7 +7,7 @@
pwd=$(pwd)
test_expect_success 'setup' '
- git checkout -b master &&
+ git checkout -b main &&
test_commit commit1 &&
test_commit commit2 &&
mkdir sub &&
diff --git a/t/t5616-partial-clone.sh b/t/t5616-partial-clone.sh
index 77bb91e..5cb4153 100755
--- a/t/t5616-partial-clone.sh
+++ b/t/t5616-partial-clone.sh
@@ -2,6 +2,9 @@
test_description='git partial clone'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
# create a normal "src" repo where we can later create new commits.
@@ -49,16 +52,16 @@
test_expect_success 'verify that .promisor file contains refs fetched' '
ls pc1/.git/objects/pack/pack-*.promisor >promisorlist &&
test_line_count = 1 promisorlist &&
- git -C srv.bare rev-list HEAD >headhash &&
+ git -C srv.bare rev-parse --verify HEAD >headhash &&
grep "$(cat headhash) HEAD" $(cat promisorlist) &&
- grep "$(cat headhash) refs/heads/master" $(cat promisorlist)
+ grep "$(cat headhash) refs/heads/main" $(cat promisorlist)
'
-# checkout master to force dynamic object fetch of blobs at HEAD.
+# checkout main to force dynamic object fetch of blobs at HEAD.
test_expect_success 'verify checkout with dynamic object fetch' '
git -C pc1 rev-list --quiet --objects --missing=print HEAD >observed &&
test_line_count = 4 observed &&
- git -C pc1 checkout master &&
+ git -C pc1 checkout main &&
git -C pc1 rev-list --quiet --objects --missing=print HEAD >observed &&
test_line_count = 0 observed
'
@@ -73,8 +76,8 @@
git -C src add file.1.txt
git -C src commit -m "mod $x"
done &&
- git -C src blame master -- file.1.txt >expect.blame &&
- git -C src push -u srv master
+ git -C src blame main -- file.1.txt >expect.blame &&
+ git -C src push -u srv main
'
# (partial) fetch in the partial clone repo from the promisor remote.
@@ -83,26 +86,26 @@
test_expect_success 'partial fetch inherits filter settings' '
git -C pc1 fetch origin &&
git -C pc1 rev-list --quiet --objects --missing=print \
- master..origin/master >observed &&
+ main..origin/main >observed &&
test_line_count = 5 observed
'
# force dynamic object fetch using diff.
-# we should only get 1 new blob (for the file in origin/master).
+# we should only get 1 new blob (for the file in origin/main).
test_expect_success 'verify diff causes dynamic object fetch' '
- git -C pc1 diff master..origin/master -- file.1.txt &&
+ git -C pc1 diff main..origin/main -- file.1.txt &&
git -C pc1 rev-list --quiet --objects --missing=print \
- master..origin/master >observed &&
+ main..origin/main >observed &&
test_line_count = 4 observed
'
# force full dynamic object fetch of the file's history using blame.
# we should get the intermediate blobs for the file.
test_expect_success 'verify blame causes dynamic object fetch' '
- git -C pc1 blame origin/master -- file.1.txt >observed.blame &&
+ git -C pc1 blame origin/main -- file.1.txt >observed.blame &&
test_cmp expect.blame observed.blame &&
git -C pc1 rev-list --quiet --objects --missing=print \
- master..origin/master >observed &&
+ main..origin/main >observed &&
test_line_count = 0 observed
'
@@ -115,7 +118,7 @@
git -C src add file.2.txt
git -C src commit -m "mod $x"
done &&
- git -C src push -u srv master
+ git -C src push -u srv main
'
# Do FULL fetch by disabling inherited filter-spec using --no-filter.
@@ -123,7 +126,7 @@
test_expect_success 'override inherited filter-spec using --no-filter' '
git -C pc1 fetch --no-filter origin &&
git -C pc1 rev-list --quiet --objects --missing=print \
- master..origin/master >observed &&
+ main..origin/main >observed &&
test_line_count = 0 observed
'
@@ -136,7 +139,7 @@
git -C src add file.3.txt
git -C src commit -m "mod $x"
done &&
- git -C src push -u srv master
+ git -C src push -u srv main
'
# Do a partial fetch and then try to manually fetch the missing objects.
@@ -146,7 +149,7 @@
git -C pc1 fetch --filter=blob:none origin &&
git -C pc1 rev-list --quiet --objects --missing=print \
- master..origin/master >revs &&
+ main..origin/main >revs &&
awk -f print_1.awk revs |
sed "s/?//" |
sort >observed.oids &&
@@ -155,7 +158,7 @@
git -C pc1 fetch-pack --stdin "file://$(pwd)/srv.bare" <observed.oids &&
git -C pc1 rev-list --quiet --objects --missing=print \
- master..origin/master >revs &&
+ main..origin/main >revs &&
awk -f print_1.awk revs |
sed "s/?//" |
sort >observed.oids &&
@@ -163,6 +166,22 @@
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 &&
@@ -180,7 +199,7 @@
echo "in dir" >src/dir/file.txt &&
git -C src add dir/file.txt &&
git -C src commit -m "file in dir" &&
- git -C src push -u srv master &&
+ git -C src push -u srv main &&
SUBTREE=$(git -C src rev-parse HEAD:dir) &&
rm -rf dst &&
@@ -188,7 +207,7 @@
git -C dst fsck &&
# Make sure we only have commits, and all trees and blobs are missing.
- git -C dst rev-list --missing=allow-any --objects master \
+ git -C dst rev-list --missing=allow-any --objects main \
>fetched_objects &&
awk -f print_1.awk fetched_objects |
xargs -n1 git -C dst cat-file -t >fetched_types &&
@@ -205,7 +224,7 @@
git -C dst fsck &&
# Auto-fetch all remaining trees and blobs with --missing=error
- git -C dst rev-list --missing=error --objects master >fetched_objects &&
+ git -C dst rev-list --missing=error --objects main >fetched_objects &&
test_line_count = 70 fetched_objects &&
awk -f print_1.awk fetched_objects |
@@ -235,6 +254,55 @@
test_cmp unique_types.expected unique_types.actual
'
+test_expect_success 'upload-pack complains of bogus filter config' '
+ printf 0000 |
+ test_must_fail git \
+ -c uploadpackfilter.tree.maxdepth \
+ upload-pack . >/dev/null 2>err &&
+ test_i18ngrep "unable to parse.*tree.maxdepth" err
+'
+
+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 &&
+
+ git clone --no-checkout --filter=tree:0 "file://$(pwd)/srv.bare" pc4 &&
+
+ test_config -C srv.bare uploadpackfilter.tree.maxDepth 5 &&
+ git clone --no-checkout --filter=tree:5 "file://$(pwd)/srv.bare" pc5 &&
+ test_must_fail ok=sigpipe git clone --no-checkout --filter=tree:6 \
+ "file://$(pwd)/srv.bare" pc6 2>err &&
+ test_i18ngrep "tree filter allows max depth 5, but got 6" err
+'
+
test_expect_success 'partial clone fetches blobs pointed to by refs even if normally filtered out' '
rm -rf src dst &&
git init src &&
@@ -282,7 +350,7 @@
test_expect_success 'partial clone with sparse filter succeeds' '
rm -rf dst.git &&
git clone --no-local --bare \
- --filter=sparse:oid=master:only-one \
+ --filter=sparse:oid=main:only-one \
sparse-src dst.git &&
(
cd dst.git &&
@@ -295,11 +363,11 @@
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 \
+ --filter=sparse:oid=main:no-such-name \
sparse-src dst.git 2>err &&
- test_i18ngrep "unable to access sparse blob in .master:no-such-name" err &&
+ test_i18ngrep "unable to access sparse blob in .main:no-such-name" err &&
test_must_fail git clone --no-local --bare \
- --filter=sparse:oid=master \
+ --filter=sparse:oid=main \
sparse-src dst.git 2>err &&
test_i18ngrep "unable to parse sparse filter data in" err
'
@@ -354,7 +422,7 @@
# 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 &&
+ fetch "file://$(pwd)/server" main &&
# Verify the assumption that the client needed to fetch the delta base
# to resolve the delta.
@@ -373,7 +441,7 @@
# 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 &&
+ fetch "file://$(pwd)/server" main &&
# Verify that protocol version 2 was used.
grep "fetch< version 2" trace &&
@@ -384,12 +452,31 @@
grep "want $(cat hash)" trace
'
-# The following two tests must be in this order, or else
-# the first will not fail. It is important that the srv.bare
-# repository did not have tags during clone, but has tags
+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_failure 'verify fetch succeeds when asking for new tags' '
+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
@@ -415,6 +502,52 @@
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
diff --git a/t/t5617-clone-submodules-remote.sh b/t/t5617-clone-submodules-remote.sh
index 1a041df..e2dbb4e 100755
--- a/t/t5617-clone-submodules-remote.sh
+++ b/t/t5617-clone-submodules-remote.sh
@@ -2,12 +2,15 @@
test_description='Test cloning repos with submodules using remote-tracking branches'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
pwd=$(pwd)
test_expect_success 'setup' '
- git checkout -b master &&
+ git checkout -b main &&
test_commit commit1 &&
mkdir sub &&
(
@@ -39,7 +42,7 @@
git clone --recurse-submodules --remote-submodules "file://$pwd/." super_clone &&
(
cd super_clone/sub &&
- git diff --exit-code remotes/origin/master
+ git diff --exit-code remotes/origin/main
)
'
@@ -57,7 +60,7 @@
git clone --recurse-submodules --single-branch "file://$pwd/." super_clone &&
(
cd super_clone/sub &&
- git rev-parse --verify origin/master &&
+ git rev-parse --verify origin/main &&
test_must_fail git rev-parse --verify origin/other
)
'
diff --git a/t/t5700-protocol-v1.sh b/t/t5700-protocol-v1.sh
index 022901b..468bd3e 100755
--- a/t/t5700-protocol-v1.sh
+++ b/t/t5700-protocol-v1.sh
@@ -8,6 +8,9 @@
GIT_TEST_PROTOCOL_VERSION=0
export GIT_TEST_PROTOCOL_VERSION
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
# Test protocol v1 with 'git://' transport
@@ -41,7 +44,7 @@
GIT_TRACE_PACKET=1 git -C daemon_child -c protocol.version=1 \
fetch 2>log &&
- git -C daemon_child log -1 --format=%s origin/master >actual &&
+ git -C daemon_child log -1 --format=%s origin/main >actual &&
git -C "$daemon_parent" log -1 --format=%s >expect &&
test_cmp expect actual &&
@@ -69,7 +72,7 @@
test_commit -C daemon_child three &&
# Push to another branch, as the target repository has the
- # master branch checked out and we cannot push into it.
+ # main branch checked out and we cannot push into it.
GIT_TRACE_PACKET=1 git -C daemon_child -c protocol.version=1 \
push origin HEAD:client_branch 2>log &&
@@ -110,7 +113,7 @@
GIT_TRACE_PACKET=1 git -C file_child -c protocol.version=1 \
fetch 2>log &&
- git -C file_child log -1 --format=%s origin/master >actual &&
+ git -C file_child log -1 --format=%s origin/main >actual &&
git -C file_parent log -1 --format=%s >expect &&
test_cmp expect actual &&
@@ -134,7 +137,7 @@
test_commit -C file_child three &&
# Push to another branch, as the target repository has the
- # master branch checked out and we cannot push into it.
+ # main branch checked out and we cannot push into it.
GIT_TRACE_PACKET=1 git -C file_child -c protocol.version=1 \
push origin HEAD:client_branch 2>log &&
@@ -188,7 +191,7 @@
fetch 2>log &&
expect_ssh git-upload-pack &&
- git -C ssh_child log -1 --format=%s origin/master >actual &&
+ git -C ssh_child log -1 --format=%s origin/main >actual &&
git -C ssh_parent log -1 --format=%s >expect &&
test_cmp expect actual &&
@@ -213,7 +216,7 @@
test_commit -C ssh_child three &&
# Push to another branch, as the target repository has the
- # master branch checked out and we cannot push into it.
+ # main branch checked out and we cannot push into it.
GIT_TRACE_PACKET=1 git -C ssh_child -c protocol.version=1 \
push origin HEAD:client_branch 2>log &&
expect_ssh git-receive-pack &&
@@ -257,7 +260,7 @@
GIT_TRACE_PACKET=1 git -C http_child -c protocol.version=1 \
fetch 2>log &&
- git -C http_child log -1 --format=%s origin/master >actual &&
+ git -C http_child log -1 --format=%s origin/main >actual &&
git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" log -1 --format=%s >expect &&
test_cmp expect actual &&
@@ -281,7 +284,7 @@
test_commit -C http_child three &&
# Push to another branch, as the target repository has the
- # master branch checked out and we cannot push into it.
+ # main branch checked out and we cannot push into it.
GIT_TRACE_PACKET=1 git -C http_child -c protocol.version=1 \
push origin HEAD:client_branch && #2>log &&
diff --git a/t/t5701-git-serve.sh b/t/t5701-git-serve.sh
index ffb9613..509f379 100755
--- a/t/t5701-git-serve.sh
+++ b/t/t5701-git-serve.sh
@@ -2,15 +2,23 @@
test_description='test protocol v2 server commands'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./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
+ ls-refs=unborn
fetch=shallow
server-option
+ object-format=$(test_oid algo)
0000
EOF
@@ -45,6 +53,7 @@
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 +63,7 @@
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,26 +71,38 @@
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' '
test_commit one &&
- git branch dev master &&
+ git branch dev main &&
test_commit two &&
- git symbolic-ref refs/heads/release refs/heads/master &&
+ git symbolic-ref refs/heads/release refs/heads/main &&
git tag -a -m "annotated tag" annotated-tag
'
test_expect_success 'basics of ls-refs' '
test-tool pkt-line pack >in <<-EOF &&
command=ls-refs
+ object-format=$(test_oid algo)
0000
EOF
cat >expect <<-EOF &&
$(git rev-parse HEAD) HEAD
$(git rev-parse refs/heads/dev) refs/heads/dev
- $(git rev-parse refs/heads/master) refs/heads/master
+ $(git rev-parse refs/heads/main) refs/heads/main
$(git rev-parse refs/heads/release) refs/heads/release
$(git rev-parse refs/tags/annotated-tag) refs/tags/annotated-tag
$(git rev-parse refs/tags/one) refs/tags/one
@@ -96,14 +118,15 @@
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/heads/main
ref-prefix refs/tags/one
0000
EOF
cat >expect <<-EOF &&
- $(git rev-parse refs/heads/master) refs/heads/master
+ $(git rev-parse refs/heads/main) refs/heads/main
$(git rev-parse refs/tags/one) refs/tags/one
0000
EOF
@@ -116,6 +139,7 @@
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
@@ -123,7 +147,7 @@
cat >expect <<-EOF &&
$(git rev-parse refs/heads/dev) refs/heads/dev
- $(git rev-parse refs/heads/master) refs/heads/master
+ $(git rev-parse refs/heads/main) refs/heads/main
$(git rev-parse refs/heads/release) refs/heads/release
0000
EOF
@@ -136,6 +160,7 @@
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 +182,7 @@
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/
@@ -165,8 +191,8 @@
cat >expect <<-EOF &&
$(git rev-parse refs/heads/dev) refs/heads/dev
- $(git rev-parse refs/heads/master) refs/heads/master
- $(git rev-parse refs/heads/release) refs/heads/release symref-target:refs/heads/master
+ $(git rev-parse refs/heads/main) refs/heads/main
+ $(git rev-parse refs/heads/release) refs/heads/release symref-target:refs/heads/main
0000
EOF
@@ -178,6 +204,7 @@
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 +227,7 @@
test-tool pkt-line pack >in <<-EOF &&
command=fetch
+ object-format=$(test_oid algo)
0001
this-is-not-a-command
0000
diff --git a/t/t5702-protocol-v2.sh b/t/t5702-protocol-v2.sh
index 5039e66..2e1243c 100755
--- a/t/t5702-protocol-v2.sh
+++ b/t/t5702-protocol-v2.sh
@@ -4,6 +4,9 @@
TEST_NO_CREATE_REPO=1
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
# Test protocol v2 with 'git://' transport
@@ -36,10 +39,10 @@
test_when_finished "rm -f log" &&
GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
- ls-remote "$GIT_DAEMON_URL/parent" master >actual &&
+ ls-remote "$GIT_DAEMON_URL/parent" main >actual &&
cat >expect <<-EOF &&
- $(git -C "$daemon_parent" rev-parse refs/heads/master)$(printf "\t")refs/heads/master
+ $(git -C "$daemon_parent" rev-parse refs/heads/main)$(printf "\t")refs/heads/main
EOF
test_cmp expect actual
@@ -69,7 +72,7 @@
GIT_TRACE_PACKET="$(pwd)/log" git -C daemon_child -c protocol.version=2 \
fetch &&
- git -C daemon_child log -1 --format=%s origin/master >actual &&
+ git -C daemon_child log -1 --format=%s origin/main >actual &&
git -C "$daemon_parent" log -1 --format=%s >expect &&
test_cmp expect actual &&
@@ -118,7 +121,7 @@
test_commit -C daemon_child three &&
# Push to another branch, as the target repository has the
- # master branch checked out and we cannot push into it.
+ # main branch checked out and we cannot push into it.
GIT_TRACE_PACKET="$(pwd)/log" git -C daemon_child -c protocol.version=2 \
push origin HEAD:client_branch &&
@@ -158,10 +161,10 @@
test_when_finished "rm -f log" &&
GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
- ls-remote "file://$(pwd)/file_parent" master >actual &&
+ ls-remote "file://$(pwd)/file_parent" main >actual &&
cat >expect <<-EOF &&
- $(git -C file_parent rev-parse refs/heads/master)$(printf "\t")refs/heads/master
+ $(git -C file_parent rev-parse refs/heads/main)$(printf "\t")refs/heads/main
EOF
test_cmp expect actual
@@ -171,10 +174,10 @@
test_when_finished "rm -f log" &&
GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
- ls-remote -o hello -o world "file://$(pwd)/file_parent" master >actual &&
+ ls-remote -o hello -o world "file://$(pwd)/file_parent" main >actual &&
cat >expect <<-EOF &&
- $(git -C file_parent rev-parse refs/heads/master)$(printf "\t")refs/heads/master
+ $(git -C file_parent rev-parse refs/heads/main)$(printf "\t")refs/heads/main
EOF
test_cmp expect actual &&
@@ -184,7 +187,7 @@
test_expect_success 'warn if using server-option with ls-remote with legacy protocol' '
test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 git -c protocol.version=0 \
- ls-remote -o hello -o world "file://$(pwd)/file_parent" master 2>err &&
+ ls-remote -o hello -o world "file://$(pwd)/file_parent" main 2>err &&
test_i18ngrep "see protocol.version in" err &&
test_i18ngrep "server options require protocol version 2 or later" err
@@ -209,6 +212,31 @@
grep "ref-prefix refs/tags/" log
'
+test_expect_success 'clone of empty repo propagates name of default branch' '
+ test_when_finished "rm -rf file_empty_parent file_empty_child" &&
+
+ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+ git -c init.defaultBranch=mydefaultbranch init file_empty_parent &&
+
+ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+ git -c init.defaultBranch=main -c protocol.version=2 \
+ clone "file://$(pwd)/file_empty_parent" file_empty_child &&
+ grep "refs/heads/mydefaultbranch" file_empty_child/.git/HEAD
+'
+
+test_expect_success '...but not if explicitly forbidden by config' '
+ test_when_finished "rm -rf file_empty_parent file_empty_child" &&
+
+ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+ git -c init.defaultBranch=mydefaultbranch init file_empty_parent &&
+ test_config -C file_empty_parent lsrefs.unborn ignore &&
+
+ GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+ git -c init.defaultBranch=main -c protocol.version=2 \
+ clone "file://$(pwd)/file_empty_parent" file_empty_child &&
+ ! grep "refs/heads/mydefaultbranch" file_empty_child/.git/HEAD
+'
+
test_expect_success 'fetch with file:// using protocol v2' '
test_when_finished "rm -f log" &&
@@ -217,7 +245,7 @@
GIT_TRACE_PACKET="$(pwd)/log" git -C file_child -c protocol.version=2 \
fetch origin &&
- git -C file_child log -1 --format=%s origin/master >actual &&
+ git -C file_child log -1 --format=%s origin/main >actual &&
git -C file_parent log -1 --format=%s >expect &&
test_cmp expect actual &&
@@ -232,13 +260,13 @@
git -C file_parent branch unwanted-branch three &&
GIT_TRACE_PACKET="$(pwd)/log" git -C file_child -c protocol.version=2 \
- fetch origin master &&
+ fetch origin main &&
- git -C file_child log -1 --format=%s origin/master >actual &&
+ git -C file_child log -1 --format=%s origin/main >actual &&
git -C file_parent log -1 --format=%s >expect &&
test_cmp expect actual &&
- grep "refs/heads/master" log &&
+ grep "refs/heads/main" log &&
! grep "refs/heads/unwanted-branch" log
'
@@ -248,9 +276,9 @@
test_commit -C file_parent four &&
GIT_TRACE_PACKET="$(pwd)/log" git -C file_child -c protocol.version=2 \
- fetch -o hello -o world origin master &&
+ fetch -o hello -o world origin main &&
- git -C file_child log -1 --format=%s origin/master >actual &&
+ git -C file_child log -1 --format=%s origin/main >actual &&
git -C file_parent log -1 --format=%s >expect &&
test_cmp expect actual &&
@@ -264,7 +292,7 @@
git init temp_child &&
test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 git -C temp_child -c protocol.version=0 \
- fetch -o hello -o world "file://$(pwd)/file_parent" master 2>err &&
+ fetch -o hello -o world "file://$(pwd)/file_parent" main 2>err &&
test_i18ngrep "see protocol.version in" err &&
test_i18ngrep "server options require protocol version 2 or later" err
@@ -325,7 +353,7 @@
grep "version 2" trace &&
# Ensure that the old version of the file is missing
- git -C client rev-list --quiet --objects --missing=print master \
+ git -C client rev-list --quiet --objects --missing=print main \
>observed.oids &&
grep "$(git -C server rev-parse message1:a.txt)" observed.oids &&
@@ -348,10 +376,9 @@
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 &&
+ fetch --filter=blob:none "$SERVER" main:refs/heads/other &&
grep "version 2" trace &&
# Ensure that the old version of the file is missing
@@ -394,8 +421,9 @@
# 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)
+ want $(git -C server rev-parse main)
filter blob:none
0000
EOF
@@ -539,7 +567,7 @@
test_commit -C server four &&
# Sanity check that only "three" is downloaded
- git -C client log --pretty=tformat:%s master >actual &&
+ git -C client log --pretty=tformat:%s main >actual &&
echo three >expected &&
test_cmp expected actual &&
@@ -548,7 +576,7 @@
# Ensure that protocol v2 is used
grep "fetch< version 2" trace &&
- git -C client log --pretty=tformat:%s origin/master >actual &&
+ git -C client log --pretty=tformat:%s origin/main >actual &&
cat >expected <<-\EOF &&
four
three
@@ -586,6 +614,53 @@
! 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" &&
@@ -623,7 +698,7 @@
GIT_TRACE_PACKET="$(pwd)/log" git -C http_child -c protocol.version=2 \
fetch &&
- git -C http_child log -1 --format=%s origin/master >actual &&
+ git -C http_child log -1 --format=%s origin/main >actual &&
git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" log -1 --format=%s >expect &&
test_cmp expect actual &&
@@ -651,11 +726,11 @@
test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/nsrepo" one &&
test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/nsrepo" two &&
git -C "$HTTPD_DOCUMENT_ROOT_PATH/nsrepo" \
- update-ref refs/namespaces/ns/refs/heads/master one &&
+ update-ref refs/namespaces/ns/refs/heads/main one &&
GIT_TRACE_PACKET="$(pwd)/log" git -C http_child -c protocol.version=2 \
fetch "$HTTPD_URL/smart_namespace/nsrepo" \
- refs/heads/master:refs/heads/theirs &&
+ refs/heads/main:refs/heads/theirs &&
# Server responded using protocol v2
grep "fetch< version 2" log &&
@@ -686,7 +761,7 @@
test_commit -C http_child three &&
# Push to another branch, as the target repository has the
- # master branch checked out and we cannot push into it.
+ # main branch checked out and we cannot push into it.
GIT_TRACE_PACKET="$(pwd)/log" git -C http_child -c protocol.version=2 \
push origin HEAD:client_branch &&
@@ -748,6 +823,218 @@
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 3 packfiles with associated .idx
+ ls http_child/.git/objects/pack/*.pack \
+ http_child/.git/objects/pack/*.idx >filelist &&
+ test_line_count = 6 filelist
+'
+
+test_expect_success 'packfile URIs with fetch instead of clone' '
+ 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 &&
+
+ git init http_child &&
+
+ GIT_TEST_SIDEBAND_ALL=1 \
+ git -C http_child -c protocol.version=2 \
+ -c fetch.uriprotocols=http,https \
+ fetch "$HTTPD_URL/smart/http_parent"
+'
+
+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 2 packfiles with associated .idx
+ ls http_child/.git/objects/pack/*.pack \
+ http_child/.git/objects/pack/*.idx >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
+'
+
+test_expect_success 'packfile-uri with transfer.fsckobjects succeeds when .gitmodules is separate from tree' '
+ P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
+ rm -rf "$P" http_child &&
+
+ git init "$P" &&
+ git -C "$P" config "uploadpack.allowsidebandall" "true" &&
+
+ echo "[submodule libfoo]" >"$P/.gitmodules" &&
+ echo "path = include/foo" >>"$P/.gitmodules" &&
+ echo "url = git://example.com/git/lib.git" >>"$P/.gitmodules" &&
+ git -C "$P" add .gitmodules &&
+ git -C "$P" commit -m x &&
+
+ configure_exclusion "$P" .gitmodules >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 2 packfiles with associated .idx
+ ls http_child/.git/objects/pack/*.pack \
+ http_child/.git/objects/pack/*.idx >filelist &&
+ test_line_count = 4 filelist
+'
+
+test_expect_success 'packfile-uri with transfer.fsckobjects fails when .gitmodules separate from tree is invalid' '
+ P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
+ rm -rf "$P" http_child err &&
+
+ git init "$P" &&
+ git -C "$P" config "uploadpack.allowsidebandall" "true" &&
+
+ echo "[submodule \"..\"]" >"$P/.gitmodules" &&
+ echo "path = include/foo" >>"$P/.gitmodules" &&
+ echo "url = git://example.com/git/lib.git" >>"$P/.gitmodules" &&
+ git -C "$P" add .gitmodules &&
+ git -C "$P" commit -m x &&
+
+ configure_exclusion "$P" .gitmodules >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>err &&
+ test_i18ngrep "disallowed submodule name" 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.
diff --git a/t/t5703-upload-pack-ref-in-want.sh b/t/t5703-upload-pack-ref-in-want.sh
index 7fba306..e9e4716 100755
--- a/t/t5703-upload-pack-ref-in-want.sh
+++ b/t/t5703-upload-pack-ref-in-want.sh
@@ -2,6 +2,9 @@
test_description='upload-pack ref-in-want'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
get_actual_refs () {
@@ -13,13 +16,11 @@
}
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 >objs &&
- grep commit objs | cut -d" " -f1 | sort >actual_commits
+ sed -n -e 's/\([0-9a-f][0-9a-f]*\) commit .*/\1/p' objs >objs.sed &&
+ sort >actual_commits <objs.sed
}
check_output () {
@@ -30,15 +31,24 @@
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)
# \ /
-# b e(baz) f(master)
+# b e(baz) f(main)
# \__ | __/
# \ | /
# a
test_expect_success 'setup repository' '
- test_oid_init &&
test_commit a &&
+ git branch -M main &&
git checkout -b o/foo &&
test_commit b &&
test_commit c &&
@@ -46,26 +56,29 @@
test_commit d &&
git checkout -b baz a &&
test_commit e &&
- git checkout master &&
+ git checkout main &&
test_commit f
'
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
@@ -80,16 +93,16 @@
test_expect_success 'basic want-ref' '
oid=$(git rev-parse f) &&
cat >expected_refs <<-EOF &&
- $oid refs/heads/master
+ $oid refs/heads/main
EOF
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
+ want-ref refs/heads/main
have $oid
done
0000
@@ -110,7 +123,7 @@
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
@@ -127,15 +140,15 @@
test_expect_success 'mix want and want-ref' '
oid=$(git rev-parse f) &&
cat >expected_refs <<-EOF &&
- $oid refs/heads/master
+ $oid refs/heads/main
EOF
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
+ want-ref refs/heads/main
want $(git rev-parse e)
have $(git rev-parse a)
done
@@ -155,7 +168,7 @@
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
@@ -174,7 +187,7 @@
# $REPO
# c(o/foo) d(o/bar)
# \ /
-# b e(baz) f(master)
+# b e(baz) f(main)
# \__ | __/
# \ | /
# a
@@ -185,10 +198,10 @@
# .
# .
# |
-# a(master)
+# a(main)
test_expect_success 'setup repos for fetching with ref-in-want tests' '
(
- git init "$REPO" &&
+ git init -b main "$REPO" &&
cd "$REPO" &&
test_commit a &&
@@ -201,7 +214,7 @@
test_commit_bulk --id=s 33 &&
# Add novel commits to upstream
- git checkout master &&
+ git checkout main &&
cd "$REPO" &&
git checkout -b o/foo &&
test_commit b &&
@@ -210,7 +223,7 @@
test_commit d &&
git checkout -b baz a &&
test_commit e &&
- git checkout master &&
+ git checkout main &&
test_commit f
) &&
git -C "$REPO" config uploadpack.allowRefInWant true &&
@@ -237,12 +250,12 @@
rm -rf local &&
cp -r "$LOCAL_PRISTINE" local &&
- GIT_TRACE_PACKET="$(pwd)/log" git -C local fetch origin master baz &&
+ GIT_TRACE_PACKET="$(pwd)/log" git -C local fetch origin main baz &&
- git -C "$REPO" rev-parse "master" "baz" >expected &&
- git -C local rev-parse refs/remotes/origin/master refs/remotes/origin/baz >actual &&
+ git -C "$REPO" rev-parse "main" "baz" >expected &&
+ git -C local rev-parse refs/remotes/origin/main refs/remotes/origin/baz >actual &&
test_cmp expected actual &&
- grep "want-ref refs/heads/master" log &&
+ grep "want-ref refs/heads/main" log &&
grep "want-ref refs/heads/baz" log
'
@@ -253,13 +266,13 @@
cp -r "$LOCAL_PRISTINE" local &&
oid=$(git -C "$REPO" rev-parse b) &&
GIT_TRACE_PACKET="$(pwd)/log" git -C local fetch origin \
- master "$oid":refs/heads/actual &&
+ main "$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 &&
+ git -C "$REPO" rev-parse "main" "b" >expected &&
+ git -C local rev-parse refs/remotes/origin/main refs/heads/actual >actual &&
test_cmp expected actual &&
grep "want $oid" log &&
- grep "want-ref refs/heads/master" log
+ grep "want-ref refs/heads/main" log
'
test_expect_success 'fetching with wildcard that does not match any refs' '
@@ -293,7 +306,7 @@
test_expect_success 'setup repos for change-while-negotiating test' '
(
- git init "$REPO" &&
+ git init -b main "$REPO" &&
cd "$REPO" &&
>.git/git-daemon-export-ok &&
test_commit m1 &&
@@ -308,7 +321,7 @@
test_commit_bulk --id=s 33 &&
# Add novel commits to upstream
- git checkout master &&
+ git checkout main &&
cd "$REPO" &&
test_commit m2 &&
test_commit m3 &&
@@ -334,7 +347,7 @@
git -C "$REPO" config uploadpack.allowRefInWant false &&
rm -rf local &&
cp -r "$LOCAL_PRISTINE" local &&
- inconsistency master $(test_oid numeric) &&
+ inconsistency main $(test_oid numeric) &&
test_must_fail git -C local fetch 2>err &&
test_i18ngrep "fatal: remote error: upload-pack: not our ref" err
'
@@ -343,11 +356,11 @@
git -C "$REPO" config uploadpack.allowRefInWant true &&
rm -rf local &&
cp -r "$LOCAL_PRISTINE" local &&
- inconsistency master $(test_oid numeric) &&
+ inconsistency main $(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 &&
+ git -C "$REPO" rev-parse --verify main >expected &&
+ git -C local rev-parse --verify refs/remotes/origin/main >actual &&
test_cmp expected actual
'
@@ -355,11 +368,11 @@
git -C "$REPO" config uploadpack.allowRefInWant false &&
rm -rf local &&
cp -r "$LOCAL_PRISTINE" local &&
- inconsistency master "master^" &&
+ inconsistency main "main^" &&
git -C local fetch &&
- git -C "$REPO" rev-parse --verify "master^" >expected &&
- git -C local rev-parse --verify refs/remotes/origin/master >actual &&
+ git -C "$REPO" rev-parse --verify "main^" >expected &&
+ git -C local rev-parse --verify refs/remotes/origin/main >actual &&
test_cmp expected actual
'
@@ -367,11 +380,11 @@
git -C "$REPO" config uploadpack.allowRefInWant true &&
rm -rf local &&
cp -r "$LOCAL_PRISTINE" local &&
- inconsistency master "master^" &&
+ inconsistency main "main^" &&
git -C local fetch &&
- git -C "$REPO" rev-parse --verify "master" >expected &&
- git -C local rev-parse --verify refs/remotes/origin/master >actual &&
+ git -C "$REPO" rev-parse --verify "main" >expected &&
+ git -C local rev-parse --verify refs/remotes/origin/main >actual &&
test_cmp expected actual
'
@@ -379,10 +392,10 @@
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" &&
+ echo "s/main/rain/" >"$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
+ test_i18ngrep "fatal: remote error: unknown ref refs/heads/rain" err
'
# DO NOT add non-httpd-specific tests here, because the last part of this
diff --git a/t/t5704-protocol-violations.sh b/t/t5704-protocol-violations.sh
new file mode 100755
index 0000000..5c94194
--- /dev/null
+++ b/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/t/t5705-session-id-in-capabilities.sh b/t/t5705-session-id-in-capabilities.sh
new file mode 100755
index 0000000..f1d189d
--- /dev/null
+++ b/t/t5705-session-id-in-capabilities.sh
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+test_description='session ID in capabilities'
+
+. ./test-lib.sh
+
+REPO="$(pwd)/repo"
+LOCAL_PRISTINE="$(pwd)/local_pristine"
+
+test_expect_success 'setup repos for session ID capability tests' '
+ git init "$REPO" &&
+ test_commit -C "$REPO" a &&
+ git clone "file://$REPO" "$LOCAL_PRISTINE" &&
+ test_commit -C "$REPO" b
+'
+
+for PROTO in 0 1 2
+do
+ test_expect_success "session IDs not advertised by default (fetch v${PROTO})" '
+ test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
+ cp -r "$LOCAL_PRISTINE" local &&
+ GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
+ git -c protocol.version=$PROTO -C local fetch \
+ --upload-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-upload-pack" \
+ origin &&
+ test -z "$(grep \"key\":\"server-sid\" tr2-client-events)" &&
+ test -z "$(grep \"key\":\"client-sid\" tr2-server-events)"
+ '
+
+ test_expect_success "session IDs not advertised by default (push v${PROTO})" '
+ test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
+ test_when_finished "git -C local push --delete origin new-branch" &&
+ cp -r "$LOCAL_PRISTINE" local &&
+ git -C local pull --no-rebase origin &&
+ GIT_TRACE2_EVENT_NESTING=5 \
+ GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
+ git -c protocol.version=$PROTO -C local push \
+ --receive-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-receive-pack" \
+ origin HEAD:new-branch &&
+ test -z "$(grep \"key\":\"server-sid\" tr2-client-events)" &&
+ test -z "$(grep \"key\":\"client-sid\" tr2-server-events)"
+ '
+done
+
+test_expect_success 'enable SID advertisement' '
+ git -C "$REPO" config transfer.advertiseSID true &&
+ git -C "$LOCAL_PRISTINE" config transfer.advertiseSID true
+'
+
+for PROTO in 0 1 2
+do
+ test_expect_success "session IDs advertised (fetch v${PROTO})" '
+ test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
+ cp -r "$LOCAL_PRISTINE" local &&
+ GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
+ git -c protocol.version=$PROTO -C local fetch \
+ --upload-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-upload-pack" \
+ origin &&
+ grep \"key\":\"server-sid\" tr2-client-events &&
+ grep \"key\":\"client-sid\" tr2-server-events
+ '
+
+ test_expect_success "session IDs advertised (push v${PROTO})" '
+ test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
+ test_when_finished "git -C local push --delete origin new-branch" &&
+ cp -r "$LOCAL_PRISTINE" local &&
+ git -C local pull --no-rebase origin &&
+ GIT_TRACE2_EVENT_NESTING=5 \
+ GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
+ git -c protocol.version=$PROTO -C local push \
+ --receive-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-receive-pack" \
+ origin HEAD:new-branch &&
+ grep \"key\":\"server-sid\" tr2-client-events &&
+ grep \"key\":\"client-sid\" tr2-server-events
+ '
+done
+
+test_done
diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
index 121e5c6..d386076 100755
--- a/t/t5801-remote-helpers.sh
+++ b/t/t5801-remote-helpers.sh
@@ -5,15 +5,24 @@
test_description='Test remote-helper import and export commands'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-gpg.sh
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' '
@@ -65,18 +74,18 @@
(cd local &&
git fetch
) &&
- compare_refs server master local refs/remotes/origin/master &&
+ compare_refs server main local refs/remotes/origin/main &&
compare_refs server new local refs/remotes/origin/new
'
test_expect_success 'push when remote has extra refs' '
(cd local &&
- git reset --hard origin/master &&
+ git reset --hard origin/main &&
echo content >>file &&
git commit -a -m six &&
git push
) &&
- compare_refs local master server master
+ compare_refs local main server main
'
test_expect_success 'push new branch by name' '
@@ -168,7 +177,7 @@
test_expect_success 'push all with existing object' '
(cd local &&
- git branch dup2 master &&
+ git branch dup2 main &&
git push origin --all
) &&
compare_refs local dup2 server dup2
@@ -176,7 +185,7 @@
test_expect_success 'push ref with existing object' '
(cd local &&
- git branch dup master &&
+ git branch dup main &&
git push origin dup
) &&
compare_refs local dup server dup
@@ -184,17 +193,17 @@
test_expect_success GPG 'push signed tag' '
(cd local &&
- git checkout master &&
+ git checkout main &&
git tag -s -m signed-tag 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' '
(cd local &&
- git checkout master &&
+ git checkout main &&
git tag -s -m signed-tag signed-tag-2 &&
GIT_REMOTE_TESTGIT_SIGNED_TAGS=1 git push origin signed-tag-2
) &&
@@ -203,7 +212,7 @@
test_expect_success 'push update refs' '
(cd local &&
- git checkout -b update master &&
+ git checkout -b update main &&
echo update >>file &&
git commit -a -m update &&
git push origin update &&
@@ -254,7 +263,7 @@
test_expect_success 'proper failure checks for pushing' '
test_when_finished "rm -rf local/git.marks local/testgit.marks" &&
(cd local &&
- git checkout -b crash master &&
+ git checkout -b crash main &&
echo crash >>file &&
git commit -a -m crash &&
test_must_fail env GIT_REMOTE_TESTGIT_FAILURE=1 git push --all &&
@@ -266,7 +275,7 @@
test_expect_success 'push messages' '
(cd local &&
- git checkout -b new_branch master &&
+ git checkout -b new_branch main &&
echo new >>file &&
git commit -a -m new &&
git push origin new_branch &&
@@ -280,7 +289,7 @@
test_expect_success 'fetch HEAD' '
(cd server &&
- git checkout master &&
+ git checkout main &&
echo more >>file &&
git commit -a -m more
) &&
@@ -292,7 +301,7 @@
test_expect_success 'fetch url' '
(cd server &&
- git checkout master &&
+ git checkout main &&
echo more >>file &&
git commit -a -m more
) &&
diff --git a/t/t5801/git-remote-testgit b/t/t5801/git-remote-testgit
index 6b9f0b5..1544d6d 100755
--- a/t/t5801/git-remote-testgit
+++ b/t/t5801/git-remote-testgit
@@ -52,9 +52,11 @@
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 @@
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/t/t6000-rev-list-misc.sh b/t/t6000-rev-list-misc.sh
index 3dc1ad8..12def7b 100755
--- a/t/t6000-rev-list-misc.sh
+++ b/t/t6000-rev-list-misc.sh
@@ -2,12 +2,16 @@
test_description='miscellaneous rev-list tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
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 +25,7 @@
mkdir foo &&
>foo/file &&
git add foo/file &&
+ test_tick &&
git commit -m two &&
git rev-list --objects HEAD -- foo >output &&
@@ -69,6 +74,7 @@
'
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 &&
@@ -82,12 +88,12 @@
'
test_expect_success 'symleft flag bit is propagated down from tag' '
- git log --format="%m %s" --left-right v1.0...master >actual &&
+ git log --format="%m %s" --left-right v1.0...main >actual &&
cat >expect <<-\EOF &&
- > two
- > one
< another
< that
+ > two
+ > one
EOF
test_cmp expect actual
'
@@ -125,8 +131,8 @@
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' '
diff --git a/t/t6001-rev-list-graft.sh b/t/t6001-rev-list-graft.sh
index 7504ba4..90d93f7 100755
--- a/t/t6001-rev-list-graft.sh
+++ b/t/t6001-rev-list-graft.sh
@@ -2,6 +2,9 @@
test_description='Revision traversal vs grafts and path limiter'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
@@ -20,7 +23,7 @@
git commit -a -m "Third in one history." &&
A2=$(git rev-parse --verify HEAD) &&
- rm -f .git/refs/heads/master .git/index &&
+ rm -f .git/refs/heads/main .git/index &&
echo >fileA fileA again &&
echo >subdir/fileB fileB again &&
diff --git a/t/t6002-rev-list-bisect.sh b/t/t6002-rev-list-bisect.sh
index a661408..b95a021 100755
--- a/t/t6002-rev-list-bisect.sh
+++ b/t/t6002-rev-list-bisect.sh
@@ -263,4 +263,49 @@
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/t/t6004-rev-list-path-optim.sh b/t/t6004-rev-list-path-optim.sh
index 3e8c42e..cd4f420 100755
--- a/t/t6004-rev-list-path-optim.sh
+++ b/t/t6004-rev-list-path-optim.sh
@@ -4,7 +4,7 @@
d/z1
b0 b1
- o------------------------*----o master
+ o------------------------*----o main
/ /
o---------o----o----o----o side
a0 c0 c1 a1 c2
@@ -13,6 +13,9 @@
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
@@ -55,18 +58,18 @@
git add c &&
test_tick &&
git commit -m "Side makes yet another irrelevant commit" &&
- git checkout master &&
+ git checkout main &&
echo Another >b &&
echo Munged >d/z &&
git add b d/z &&
test_tick &&
- git commit -m "Master touches b" &&
- git tag master_b0 &&
+ git commit -m "Main touches b" &&
+ git tag main_b0 &&
git merge side &&
echo Touched >b &&
git add b &&
test_tick &&
- git commit -m "Master touches b again"
+ git commit -m "Main touches b again"
'
test_expect_success 'path optimization 2' '
@@ -76,13 +79,13 @@
'
test_expect_success 'pathspec with leading path' '
- git rev-parse master^ master_b0 side_c0 initial >expected &&
+ git rev-parse main^ main_b0 side_c0 initial >expected &&
git rev-list HEAD -- d >actual &&
test_cmp expected actual
'
test_expect_success 'pathspec with glob (1)' '
- git rev-parse master^ master_b0 side_c0 initial >expected &&
+ git rev-parse main^ main_b0 side_c0 initial >expected &&
git rev-list HEAD -- "d/*" >actual &&
test_cmp expected actual
'
diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh
index 7e82e43..35a2f62 100755
--- a/t/t6006-rev-list-format.sh
+++ b/t/t6006-rev-list-format.sh
@@ -5,6 +5,9 @@
test_description='git rev-list --pretty=format test'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-terminal.sh
@@ -32,7 +35,6 @@
truncate_count=20
test_expect_success 'setup' '
- test_oid_init &&
: >foo &&
git add foo &&
git config i18n.commitEncoding $test_encoding &&
@@ -54,7 +56,7 @@
test_format () {
cat >expect.$1
test_expect_${3:-success} "format $1" "
- git rev-list --pretty=format:'$2' master >output.$1 &&
+ git rev-list --pretty=format:'$2' main >output.$1 &&
test_cmp expect.$1 output.$1
"
}
@@ -185,13 +187,13 @@
<RED>foo<GREEN>bar<BLUE>baz<RESET>xyzzy
EOF
format="%Credfoo%Cgreenbar%Cbluebaz%Cresetxyzzy" &&
- git rev-list --color --format="$format" -1 master >actual.raw &&
+ git rev-list --color --format="$format" -1 main >actual.raw &&
test_decode_color <actual.raw >actual &&
test_cmp expect actual
'
test_expect_success '%S is not a placeholder for rev-list yet' '
- git rev-list --format="%S" -1 master | grep "%S"
+ git rev-list --format="%S" -1 main | grep "%S"
'
test_expect_success 'advanced colors' '
@@ -200,7 +202,7 @@
<BOLD;RED;BYELLOW>foo<RESET>
EOF
format="%C(red yellow bold)foo%C(reset)" &&
- git rev-list --color --format="$format" -1 master >actual.raw &&
+ git rev-list --color --format="$format" -1 main >actual.raw &&
test_decode_color <actual.raw >actual &&
test_cmp expect actual
'
@@ -340,7 +342,7 @@
.. (hinzugef${added_utf8_part_iso88591}gt) foo
EOF
-test_expect_success 'prepare expected messages (for test %b)' '
+test_expect_success 'setup expected messages (for test %b)' '
cat <<-EOF >expected.utf-8 &&
commit $head3
This commit message is much longer than the others,
@@ -407,7 +409,7 @@
test_expect_success '%ad respects --date=' '
echo 2005-04-07 >expect.ad-short &&
- git log -1 --date=short --pretty=tformat:%ad >output.ad-short master &&
+ git log -1 --date=short --pretty=tformat:%ad >output.ad-short main &&
test_cmp expect.ad-short output.ad-short
'
@@ -495,8 +497,8 @@
'
test_expect_success '%gd shortens ref name' '
- echo "master@{0}" >expect.gd-short &&
- git log -g -1 --format=%gd refs/heads/master >actual.gd-short &&
+ echo "main@{0}" >expect.gd-short &&
+ git log -g -1 --format=%gd refs/heads/main >actual.gd-short &&
test_cmp expect.gd-short actual.gd-short
'
diff --git a/t/t6007-rev-list-cherry-pick-file.sh b/t/t6007-rev-list-cherry-pick-file.sh
index f026837..aebe4b6 100755
--- a/t/t6007-rev-list-cherry-pick-file.sh
+++ b/t/t6007-rev-list-cherry-pick-file.sh
@@ -2,6 +2,9 @@
test_description='test git rev-list --cherry-pick -- file'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
# A---B---D---F
@@ -31,7 +34,7 @@
test_tick &&
git commit -m "E" &&
git tag E &&
- git checkout master &&
+ git checkout main &&
git checkout branch foo &&
test_tick &&
git commit -m "B" &&
@@ -233,7 +236,7 @@
test_tick &&
git commit -m "independent, too" foo &&
test -z "$(git rev-list --left-right --cherry-pick \
- HEAD...master -- foo)"
+ HEAD...main -- foo)"
'
cat >expect <<EOF
@@ -245,6 +248,18 @@
test_cmp expect actual
'
+test_expect_success '--cherry-pick with duplicates on each side' '
+ git checkout -b dup-orig &&
+ test_commit dup-base &&
+ git revert dup-base &&
+ git cherry-pick dup-base &&
+ git checkout -b dup-side HEAD~3 &&
+ test_tick &&
+ git cherry-pick -3 dup-orig &&
+ git rev-list --cherry-pick dup-orig...dup-side >actual &&
+ test_must_be_empty actual
+'
+
# Corrupt the object store deliberately to make sure
# the object is not even checked for its existence.
remove_loose_object () {
diff --git a/t/t6008-rev-list-submodule.sh b/t/t6008-rev-list-submodule.sh
index c4af9ca..3153a0d 100755
--- a/t/t6008-rev-list-submodule.sh
+++ b/t/t6008-rev-list-submodule.sh
@@ -5,6 +5,9 @@
test_description='git rev-list involving submodules that this repo has'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup' '
@@ -36,7 +39,7 @@
'
test_expect_success "Ilari's test" '
- git rev-list --objects super master ^super^
+ git rev-list --objects super main ^super^
'
test_done
diff --git a/t/t6009-rev-list-parent.sh b/t/t6009-rev-list-parent.sh
index 916d969..63fa7c8 100755
--- a/t/t6009-rev-list-parent.sh
+++ b/t/t6009-rev-list-parent.sh
@@ -2,6 +2,9 @@
test_description='ancestor culling and limiting by parent number'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
check_revlist () {
@@ -45,7 +48,7 @@
test_commit seven &&
git checkout -b yetanotherbranch four &&
test_commit eight &&
- git checkout master &&
+ git checkout main &&
test_tick &&
git merge --allow-unrelated-histories -m normalmerge newroot &&
git tag normalmerge &&
@@ -56,7 +59,7 @@
test_tick &&
git merge -m tetrapus sidebranch anotherbranch yetanotherbranch &&
git tag tetrapus &&
- git checkout master
+ git checkout main
'
test_expect_success 'rev-list roots' '
@@ -123,7 +126,7 @@
roots="$roots root$i" ||
return
done &&
- git checkout master &&
+ git checkout main &&
test_tick &&
git merge -m dodecapus $roots &&
git tag dodecapus &&
diff --git a/t/t6012-rev-list-simplify.sh b/t/t6012-rev-list-simplify.sh
index a10f0df..4f7fa8b 100755
--- a/t/t6012-rev-list-simplify.sh
+++ b/t/t6012-rev-list-simplify.sh
@@ -2,6 +2,9 @@
test_description='merge simplification'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
note () {
@@ -43,7 +46,7 @@
git add side &&
test_tick && git commit -m "Side root" &&
note J &&
- git checkout master &&
+ git checkout main &&
echo "Hello" >file &&
echo "second" >lost &&
@@ -65,7 +68,7 @@
note D &&
test_tick &&
- test_must_fail git merge -m "merge" master &&
+ test_must_fail git merge -m "merge" main &&
>lost && git commit -a -m "merge" &&
note E &&
@@ -74,7 +77,7 @@
test_tick && git commit -m "Irrelevant change" &&
note F &&
- git checkout master &&
+ git checkout main &&
echo "Yet another" >elif &&
git add elif &&
test_tick && git commit -m "Another irrelevant change" &&
@@ -87,7 +90,7 @@
test_tick && git commit -a -m "Final change" &&
note I &&
- git checkout master &&
+ git checkout main &&
test_tick && git merge --allow-unrelated-histories -m "Coolest" unrelated &&
note K &&
@@ -154,4 +157,124 @@
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 'setup 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/t/t6013-rev-list-reverse-parents.sh b/t/t6013-rev-list-reverse-parents.sh
index 89458d3..39793cb 100755
--- a/t/t6013-rev-list-reverse-parents.sh
+++ b/t/t6013-rev-list-reverse-parents.sh
@@ -2,6 +2,9 @@
test_description='--reverse combines with --parents'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
@@ -18,24 +21,24 @@
commit two &&
git checkout -b side HEAD^ &&
commit three &&
- git checkout master &&
+ git checkout main &&
git merge -s ours side &&
commit five
'
test_expect_success '--reverse --parents --full-history combines correctly' '
- git rev-list --parents --full-history master -- foo |
+ git rev-list --parents --full-history main -- foo |
perl -e "print reverse <>" > expected &&
- git rev-list --reverse --parents --full-history master -- foo \
+ git rev-list --reverse --parents --full-history main -- foo \
> actual &&
test_cmp expected actual
'
test_expect_success '--boundary does too' '
- git rev-list --boundary --parents --full-history master ^root -- foo |
+ git rev-list --boundary --parents --full-history main ^root -- foo |
perl -e "print reverse <>" > expected &&
git rev-list --boundary --reverse --parents --full-history \
- master ^root -- foo > actual &&
+ main ^root -- foo > actual &&
test_cmp expected actual
'
diff --git a/t/t6016-rev-list-graph-simplify-history.sh b/t/t6016-rev-list-graph-simplify-history.sh
index f5e6e92..54b0a6f 100755
--- a/t/t6016-rev-list-graph-simplify-history.sh
+++ b/t/t6016-rev-list-graph-simplify-history.sh
@@ -7,14 +7,23 @@
test_description='--graph and simplified history'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-log-graph.sh
+
+check_graph () {
+ cat >expect &&
+ lib_test_cmp_graph --format=%s "$@"
+}
test_expect_success 'set up rev-list --graph test' '
# 3 commits on branch A
test_commit A1 foo.txt &&
test_commit A2 bar.txt &&
test_commit A3 bar.txt &&
- git branch -m master A &&
+ git branch -m main A &&
# 2 commits on branch B, started from A1
git checkout -b B A1 &&
@@ -28,7 +37,7 @@
# Octopus merge B and C into branch A
git checkout A &&
- git merge B C &&
+ git merge B C -m A4 &&
git tag A4 &&
test_commit A5 bar.txt &&
@@ -38,81 +47,64 @@
test_commit C3 foo.txt &&
test_commit C4 bar.txt &&
git checkout A &&
- git merge -s ours C &&
+ git merge -s ours C -m A6 &&
git tag A6 &&
- test_commit A7 bar.txt &&
-
- # Store commit names in variables for later use
- A1=$(git rev-parse --verify A1) &&
- A2=$(git rev-parse --verify A2) &&
- A3=$(git rev-parse --verify A3) &&
- A4=$(git rev-parse --verify A4) &&
- A5=$(git rev-parse --verify A5) &&
- A6=$(git rev-parse --verify A6) &&
- A7=$(git rev-parse --verify A7) &&
- B1=$(git rev-parse --verify B1) &&
- B2=$(git rev-parse --verify B2) &&
- C1=$(git rev-parse --verify C1) &&
- C2=$(git rev-parse --verify C2) &&
- C3=$(git rev-parse --verify C3) &&
- C4=$(git rev-parse --verify C4)
- '
+ test_commit A7 bar.txt
+'
test_expect_success '--graph --all' '
- rm -f expected &&
- echo "* $A7" >> expected &&
- echo "* $A6" >> expected &&
- echo "|\\ " >> expected &&
- echo "| * $C4" >> expected &&
- echo "| * $C3" >> expected &&
- echo "* | $A5" >> expected &&
- echo "| | " >> expected &&
- echo "| \\ " >> expected &&
- echo "*-. | $A4" >> expected &&
- echo "|\\ \\| " >> expected &&
- echo "| | * $C2" >> expected &&
- echo "| | * $C1" >> expected &&
- echo "| * | $B2" >> expected &&
- echo "| * | $B1" >> expected &&
- echo "* | | $A3" >> expected &&
- echo "| |/ " >> expected &&
- echo "|/| " >> expected &&
- echo "* | $A2" >> expected &&
- echo "|/ " >> expected &&
- echo "* $A1" >> expected &&
- git rev-list --graph --all > actual &&
- test_cmp expected actual
- '
+ check_graph --all <<-\EOF
+ * A7
+ * A6
+ |\
+ | * C4
+ | * C3
+ * | A5
+ | |
+ | \
+ *-. | A4
+ |\ \|
+ | | * C2
+ | | * C1
+ | * | B2
+ | * | B1
+ * | | A3
+ | |/
+ |/|
+ * | A2
+ |/
+ * A1
+ EOF
+'
# Make sure the graph_is_interesting() code still realizes
# that undecorated merges are interesting, even with --simplify-by-decoration
test_expect_success '--graph --simplify-by-decoration' '
- rm -f expected &&
git tag -d A4 &&
- echo "* $A7" >> expected &&
- echo "* $A6" >> expected &&
- echo "|\\ " >> expected &&
- echo "| * $C4" >> expected &&
- echo "| * $C3" >> expected &&
- echo "* | $A5" >> expected &&
- echo "| | " >> expected &&
- echo "| \\ " >> expected &&
- echo "*-. | $A4" >> expected &&
- echo "|\\ \\| " >> expected &&
- echo "| | * $C2" >> expected &&
- echo "| | * $C1" >> expected &&
- echo "| * | $B2" >> expected &&
- echo "| * | $B1" >> expected &&
- echo "* | | $A3" >> expected &&
- echo "| |/ " >> expected &&
- echo "|/| " >> expected &&
- echo "* | $A2" >> expected &&
- echo "|/ " >> expected &&
- echo "* $A1" >> expected &&
- git rev-list --graph --all --simplify-by-decoration > actual &&
- test_cmp expected actual
- '
+ check_graph --all --simplify-by-decoration <<-\EOF
+ * A7
+ * A6
+ |\
+ | * C4
+ | * C3
+ * | A5
+ | |
+ | \
+ *-. | A4
+ |\ \|
+ | | * C2
+ | | * C1
+ | * | B2
+ | * | B1
+ * | | A3
+ | |/
+ |/|
+ * | A2
+ |/
+ * A1
+ EOF
+'
test_expect_success 'setup: get rid of decorations on B' '
git tag -d B2 &&
@@ -122,142 +114,133 @@
# Graph with branch B simplified away
test_expect_success '--graph --simplify-by-decoration prune branch B' '
- rm -f expected &&
- echo "* $A7" >> expected &&
- echo "* $A6" >> expected &&
- echo "|\\ " >> expected &&
- echo "| * $C4" >> expected &&
- echo "| * $C3" >> expected &&
- echo "* | $A5" >> expected &&
- echo "* | $A4" >> expected &&
- echo "|\\| " >> expected &&
- echo "| * $C2" >> expected &&
- echo "| * $C1" >> expected &&
- echo "* | $A3" >> expected &&
- echo "|/ " >> expected &&
- echo "* $A2" >> expected &&
- echo "* $A1" >> expected &&
- git rev-list --graph --simplify-by-decoration --all > actual &&
- test_cmp expected actual
- '
+ check_graph --simplify-by-decoration --all <<-\EOF
+ * A7
+ * A6
+ |\
+ | * C4
+ | * C3
+ * | A5
+ * | A4
+ |\|
+ | * C2
+ | * C1
+ * | A3
+ |/
+ * A2
+ * A1
+ EOF
+'
test_expect_success '--graph --full-history -- bar.txt' '
- rm -f expected &&
- echo "* $A7" >> expected &&
- echo "* $A6" >> expected &&
- echo "|\\ " >> expected &&
- echo "| * $C4" >> expected &&
- echo "* | $A5" >> expected &&
- echo "* | $A4" >> expected &&
- echo "|\\| " >> expected &&
- echo "* | $A3" >> expected &&
- echo "|/ " >> expected &&
- echo "* $A2" >> expected &&
- git rev-list --graph --full-history --all -- bar.txt > actual &&
- test_cmp expected actual
- '
+ check_graph --full-history --all -- bar.txt <<-\EOF
+ * A7
+ * A6
+ |\
+ | * C4
+ * | A5
+ * | A4
+ |\|
+ * | A3
+ |/
+ * A2
+ EOF
+'
test_expect_success '--graph --full-history --simplify-merges -- bar.txt' '
- rm -f expected &&
- echo "* $A7" >> expected &&
- echo "* $A6" >> expected &&
- echo "|\\ " >> expected &&
- echo "| * $C4" >> expected &&
- echo "* | $A5" >> expected &&
- echo "* | $A3" >> expected &&
- echo "|/ " >> expected &&
- echo "* $A2" >> expected &&
- git rev-list --graph --full-history --simplify-merges --all \
- -- bar.txt > actual &&
- test_cmp expected actual
- '
+ check_graph --full-history --simplify-merges --all -- bar.txt <<-\EOF
+ * A7
+ * A6
+ |\
+ | * C4
+ * | A5
+ * | A3
+ |/
+ * A2
+ EOF
+'
test_expect_success '--graph -- bar.txt' '
- rm -f expected &&
- echo "* $A7" >> expected &&
- echo "* $A5" >> expected &&
- echo "* $A3" >> expected &&
- echo "| * $C4" >> expected &&
- echo "|/ " >> expected &&
- echo "* $A2" >> expected &&
- git rev-list --graph --all -- bar.txt > actual &&
- test_cmp expected actual
- '
+ check_graph --all -- bar.txt <<-\EOF
+ * A7
+ * A5
+ * A3
+ | * C4
+ |/
+ * A2
+ EOF
+'
test_expect_success '--graph --sparse -- bar.txt' '
- rm -f expected &&
- echo "* $A7" >> expected &&
- echo "* $A6" >> expected &&
- echo "* $A5" >> expected &&
- echo "* $A4" >> expected &&
- echo "* $A3" >> expected &&
- echo "| * $C4" >> expected &&
- echo "| * $C3" >> expected &&
- echo "| * $C2" >> expected &&
- echo "| * $C1" >> expected &&
- echo "|/ " >> expected &&
- echo "* $A2" >> expected &&
- echo "* $A1" >> expected &&
- git rev-list --graph --sparse --all -- bar.txt > actual &&
- test_cmp expected actual
- '
+ check_graph --sparse --all -- bar.txt <<-\EOF
+ * A7
+ * A6
+ * A5
+ * A4
+ * A3
+ | * C4
+ | * C3
+ | * C2
+ | * C1
+ |/
+ * A2
+ * A1
+ EOF
+'
test_expect_success '--graph ^C4' '
- rm -f expected &&
- echo "* $A7" >> expected &&
- echo "* $A6" >> expected &&
- echo "* $A5" >> expected &&
- echo "* $A4" >> expected &&
- echo "|\\ " >> expected &&
- echo "| * $B2" >> expected &&
- echo "| * $B1" >> expected &&
- echo "* $A3" >> expected &&
- git rev-list --graph --all ^C4 > actual &&
- test_cmp expected actual
- '
+ check_graph --all ^C4 <<-\EOF
+ * A7
+ * A6
+ * A5
+ * A4
+ |\
+ | * B2
+ | * B1
+ * A3
+ EOF
+'
test_expect_success '--graph ^C3' '
- rm -f expected &&
- echo "* $A7" >> expected &&
- echo "* $A6" >> expected &&
- echo "|\\ " >> expected &&
- echo "| * $C4" >> expected &&
- echo "* $A5" >> expected &&
- echo "* $A4" >> expected &&
- echo "|\\ " >> expected &&
- echo "| * $B2" >> expected &&
- echo "| * $B1" >> expected &&
- echo "* $A3" >> expected &&
- git rev-list --graph --all ^C3 > actual &&
- test_cmp expected actual
- '
+ check_graph --all ^C3 <<-\EOF
+ * A7
+ * A6
+ |\
+ | * C4
+ * A5
+ * A4
+ |\
+ | * B2
+ | * B1
+ * A3
+ EOF
+'
# I don't think the ordering of the boundary commits is really
# that important, but this test depends on it. If the ordering ever changes
# in the code, we'll need to update this test.
test_expect_success '--graph --boundary ^C3' '
- rm -f expected &&
- echo "* $A7" >> expected &&
- echo "* $A6" >> expected &&
- echo "|\\ " >> expected &&
- echo "| * $C4" >> expected &&
- echo "* | $A5" >> expected &&
- echo "| | " >> expected &&
- echo "| \\ " >> expected &&
- echo "*-. \\ $A4" >> expected &&
- echo "|\\ \\ \\ " >> expected &&
- echo "| * | | $B2" >> expected &&
- echo "| * | | $B1" >> expected &&
- echo "* | | | $A3" >> expected &&
- echo "o | | | $A2" >> expected &&
- echo "|/ / / " >> expected &&
- echo "o / / $A1" >> expected &&
- echo " / / " >> expected &&
- echo "| o $C3" >> expected &&
- echo "|/ " >> expected &&
- echo "o $C2" >> expected &&
- git rev-list --graph --boundary --all ^C3 > actual &&
- test_cmp expected actual
- '
+ check_graph --boundary --all ^C3 <<-\EOF
+ * A7
+ * A6
+ |\
+ | * C4
+ * | A5
+ | |
+ | \
+ *-. \ A4
+ |\ \ \
+ | * | | B2
+ | * | | B1
+ * | | | A3
+ o | | | A2
+ |/ / /
+ o / / A1
+ / /
+ | o C3
+ |/
+ o C2
+ EOF
+'
test_done
diff --git a/t/t6017-rev-list-stdin.sh b/t/t6017-rev-list-stdin.sh
index 667b375..0516251 100755
--- a/t/t6017-rev-list-stdin.sh
+++ b/t/t6017-rev-list-stdin.sh
@@ -5,6 +5,9 @@
test_description='log family learns --stdin'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
check () {
@@ -40,7 +43,7 @@
done &&
for i in $them
do
- git checkout -b side-$i master~$i &&
+ git checkout -b side-$i main~$i &&
echo updated $i >file-$i &&
git add file-$i &&
test_tick &&
@@ -49,7 +52,7 @@
)
'
-check master
+check main
check side-1 ^side-4
check side-1 ^side-7 --
check side-1 ^side-7 -- file-1
@@ -66,11 +69,11 @@
file-2
EOF
cat >input <<-EOF &&
- ^master^
+ ^main^
--
file-2
EOF
- git log --pretty=tformat:%s --name-only --stdin master -- file-1 \
+ git log --pretty=tformat:%s --name-only --stdin main -- file-1 \
<input >actual &&
test_cmp expect actual
'
diff --git a/t/t6018-rev-list-glob.sh b/t/t6018-rev-list-glob.sh
index bb5aeac..24b34ad 100755
--- a/t/t6018-rev-list-glob.sh
+++ b/t/t6018-rev-list-glob.sh
@@ -2,6 +2,9 @@
test_description='rev-list/rev-parse --glob'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
commit () {
@@ -20,23 +23,23 @@
test_expect_success 'setup' '
- commit master &&
- git checkout -b subspace/one master &&
+ commit main &&
+ git checkout -b subspace/one main &&
commit one &&
- git checkout -b subspace/two master &&
+ git checkout -b subspace/two main &&
commit two &&
- git checkout -b subspace-x master &&
+ git checkout -b subspace-x main &&
commit subspace-x &&
- git checkout -b other/three master &&
+ git checkout -b other/three main &&
commit three &&
- git checkout -b someref master &&
+ git checkout -b someref main &&
commit some &&
- git checkout master &&
- commit master2 &&
- git tag foo/bar master &&
- commit master3 &&
- git update-ref refs/remotes/foo/baz master &&
- commit master4 &&
+ git checkout main &&
+ commit topic_2 &&
+ git tag foo/bar main &&
+ commit topic_3 &&
+ git update-ref refs/remotes/foo/baz main &&
+ 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 &&
@@ -83,7 +86,7 @@
test_expect_failure 'rev-parse is not confused by option-like glob' '
- compare rev-parse "master" "--glob --symbolic master"
+ compare rev-parse "main" "--glob --symbolic main"
'
@@ -111,15 +114,15 @@
'
-test_expect_success 'rev-parse --glob=heads/someref/* master' '
+test_expect_success 'rev-parse --glob=heads/someref/* main' '
- compare rev-parse "master" "--glob=heads/someref/* master"
+ compare rev-parse "main" "--glob=heads/someref/* main"
'
test_expect_success 'rev-parse --glob=heads/*' '
- compare rev-parse "master other/three someref subspace-x subspace/one subspace/two" "--glob=heads/*"
+ compare rev-parse "main other/three someref subspace-x subspace/one subspace/two" "--glob=heads/*"
'
@@ -136,7 +139,7 @@
'
test_expect_success 'rev-parse --exclude with --branches' '
- compare rev-parse "--exclude=*/* --branches" "master someref subspace-x"
+ compare rev-parse "--exclude=*/* --branches" "main someref subspace-x"
'
test_expect_success 'rev-parse --exclude with --all' '
@@ -221,7 +224,7 @@
test_expect_success 'rev-list not confused by option-like --glob arg' '
- compare rev-list "master" "--glob -0 master"
+ compare rev-list "main" "--glob -0 main"
'
@@ -269,13 +272,13 @@
test_expect_success 'rev-list --branches' '
- compare rev-list "master subspace-x someref other/three subspace/one subspace/two" "--branches"
+ compare rev-list "main subspace-x someref other/three subspace/one subspace/two" "--branches"
'
-test_expect_success 'rev-list --glob=heads/someref/* master' '
+test_expect_success 'rev-list --glob=heads/someref/* main' '
- compare rev-list "master" "--glob=heads/someref/* master"
+ compare rev-list "main" "--glob=heads/someref/* main"
'
@@ -287,7 +290,7 @@
test_expect_success 'rev-list --glob=heads/*' '
- compare rev-list "master other/three someref subspace-x subspace/one subspace/two" "--glob=heads/*"
+ compare rev-list "main other/three someref subspace-x subspace/one subspace/two" "--glob=heads/*"
'
@@ -310,7 +313,7 @@
'
test_expect_success 'rev-list --exclude with --branches' '
- compare rev-list "--exclude=*/* --branches" "master someref subspace-x"
+ compare rev-list "--exclude=*/* --branches" "main someref subspace-x"
'
test_expect_success 'rev-list --exclude with --all' '
@@ -345,17 +348,22 @@
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 &&
compare shortlog \
- "master subspace-x someref other/three subspace/one subspace/two" \
+ "main subspace-x someref other/three subspace/one subspace/two" \
--branches &&
- compare shortlog master "--glob=heads/someref/* master" &&
+ compare shortlog main "--glob=heads/someref/* main" &&
compare shortlog "subspace/one subspace/two other/three" \
"--glob=heads/subspace/* --glob=heads/other/*" &&
compare shortlog \
- "master other/three someref subspace-x subspace/one subspace/two" \
+ "main other/three someref subspace-x subspace/one subspace/two" \
"--glob=heads/*" &&
compare shortlog foo/bar --tags=foo &&
compare shortlog "foo/bar qux/one qux/two qux/x" --tags &&
@@ -366,14 +374,14 @@
test_expect_failure 'shortlog accepts --glob as detached option' '
compare shortlog \
- "master other/three someref subspace-x subspace/one subspace/two" \
+ "main other/three someref subspace-x subspace/one subspace/two" \
"--glob heads/*"
'
test_expect_failure 'shortlog --glob is not confused by option-like argument' '
- compare shortlog master "--glob -e master"
+ compare shortlog main "--glob -e main"
'
diff --git a/t/t6019-rev-list-ancestry-path.sh b/t/t6019-rev-list-ancestry-path.sh
index 353f843..20adbec 100755
--- a/t/t6019-rev-list-ancestry-path.sh
+++ b/t/t6019-rev-list-ancestry-path.sh
@@ -21,6 +21,9 @@
# --ancestry-path G..M -- G.t == L
# --ancestry-path --simplify-merges G^..M -- G.t == G L
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_merge () {
@@ -128,15 +131,15 @@
(cd criss-cross &&
git init &&
test_commit A &&
- git checkout -b xb master &&
+ git checkout -b xb main &&
test_commit B &&
- git checkout -b xc master &&
+ git checkout -b xc main &&
test_commit C &&
git checkout -b xbc xb -- &&
git merge xc &&
git checkout -b xcb xc -- &&
git merge xb &&
- git checkout master)
+ git checkout main)
'
# no commits in bc descend from cb
diff --git a/t/t6020-bundle-misc.sh b/t/t6020-bundle-misc.sh
new file mode 100755
index 0000000..881f72f
--- /dev/null
+++ b/t/t6020-bundle-misc.sh
@@ -0,0 +1,463 @@
+#!/bin/sh
+#
+# Copyright (c) 2021 Jiang Xin
+#
+
+test_description='Test git-bundle'
+
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-bundle.sh
+
+# Create a commit or tag and set the variable with the object ID.
+test_commit_setvar () {
+ notick=
+ signoff=
+ indir=
+ merge=
+ tag=
+ var=
+
+ while test $# != 0
+ do
+ case "$1" in
+ --merge)
+ merge=t
+ ;;
+ --tag)
+ tag=t
+ ;;
+ --notick)
+ notick=t
+ ;;
+ --signoff)
+ signoff="$1"
+ ;;
+ -C)
+ shift
+ indir="$1"
+ ;;
+ -*)
+ echo >&2 "error: unknown option $1"
+ return 1
+ ;;
+ *)
+ break
+ ;;
+ esac
+ shift
+ done
+ if test $# -lt 2
+ then
+ echo >&2 "error: test_commit_setvar must have at least 2 arguments"
+ return 1
+ fi
+ var=$1
+ shift
+ indir=${indir:+"$indir"/}
+ if test -z "$notick"
+ then
+ test_tick
+ fi &&
+ if test -n "$merge"
+ then
+ git ${indir:+ -C "$indir"} merge --no-edit --no-ff \
+ ${2:+-m "$2"} "$1" &&
+ oid=$(git ${indir:+ -C "$indir"} rev-parse HEAD)
+ elif test -n "$tag"
+ then
+ git ${indir:+ -C "$indir"} tag -m "$1" "$1" "${2:-HEAD}" &&
+ oid=$(git ${indir:+ -C "$indir"} rev-parse "$1")
+ else
+ file=${2:-"$1.t"} &&
+ echo "${3-$1}" >"$indir$file" &&
+ git ${indir:+ -C "$indir"} add "$file" &&
+ git ${indir:+ -C "$indir"} commit $signoff -m "$1" &&
+ oid=$(git ${indir:+ -C "$indir"} rev-parse HEAD)
+ fi &&
+ eval $var=$oid
+}
+
+# Format the output of git 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/${A%${A#???????}}[0-9a-f]*/<COMMIT-A>/g" \
+ -e "s/${B%${B#???????}}[0-9a-f]*/<COMMIT-B>/g" \
+ -e "s/${C%${C#???????}}[0-9a-f]*/<COMMIT-C>/g" \
+ -e "s/${D%${D#???????}}[0-9a-f]*/<COMMIT-D>/g" \
+ -e "s/${E%${E#???????}}[0-9a-f]*/<COMMIT-E>/g" \
+ -e "s/${F%${F#???????}}[0-9a-f]*/<COMMIT-F>/g" \
+ -e "s/${G%${G#???????}}[0-9a-f]*/<COMMIT-G>/g" \
+ -e "s/${H%${H#???????}}[0-9a-f]*/<COMMIT-H>/g" \
+ -e "s/${I%${I#???????}}[0-9a-f]*/<COMMIT-I>/g" \
+ -e "s/${J%${J#???????}}[0-9a-f]*/<COMMIT-J>/g" \
+ -e "s/${K%${K#???????}}[0-9a-f]*/<COMMIT-K>/g" \
+ -e "s/${L%${L#???????}}[0-9a-f]*/<COMMIT-L>/g" \
+ -e "s/${M%${M#???????}}[0-9a-f]*/<COMMIT-M>/g" \
+ -e "s/${N%${N#???????}}[0-9a-f]*/<COMMIT-N>/g" \
+ -e "s/${O%${O#???????}}[0-9a-f]*/<COMMIT-O>/g" \
+ -e "s/${P%${P#???????}}[0-9a-f]*/<COMMIT-P>/g" \
+ -e "s/${TAG1%${TAG1#???????}}[0-9a-f]*/<TAG-1>/g" \
+ -e "s/${TAG2%${TAG2#???????}}[0-9a-f]*/<TAG-2>/g" \
+ -e "s/${TAG3%${TAG3#???????}}[0-9a-f]*/<TAG-3>/g" \
+ -e "s/ *\$//"
+}
+
+# (C) (D, pull/1/head, topic/1)
+# o --- o
+# / \ (L)
+# / \ o (H, topic/2) (M, tag:v2)
+# / (F) \ / (N, tag:v3)
+# / o --------- o (G, pull/2/head) o --- o --- o (release)
+# / / \ \ / \
+# o --- o --- o -------- o -- o ------------------ o ------- o --- o (main)
+# (A) (B) (E, tag:v1) (I) (J) (K) (O) (P)
+#
+test_expect_success 'setup' '
+ # 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 &&
+
+ # branch main: commit A & B
+ test_commit_setvar A "Commit A" main.txt &&
+ test_commit_setvar B "Commit B" main.txt &&
+
+ # branch topic/1: commit C & D, refs/pull/1/head
+ git checkout -b topic/1 &&
+ test_commit_setvar C "Commit C" topic-1.txt &&
+ test_commit_setvar D "Commit D" topic-1.txt &&
+ git update-ref refs/pull/1/head HEAD &&
+
+ # branch topic/1: commit E, tag v1
+ git checkout main &&
+ test_commit_setvar E "Commit E" main.txt &&
+ test_commit_setvar --tag TAG1 v1 &&
+
+ # branch topic/2: commit F & G, refs/pull/2/head
+ git checkout -b topic/2 &&
+ test_commit_setvar F "Commit F" topic-2.txt &&
+ test_commit_setvar G "Commit G" topic-2.txt &&
+ git update-ref refs/pull/2/head HEAD &&
+ test_commit_setvar H "Commit H" topic-2.txt &&
+
+ # branch main: merge commit I & J
+ git checkout main &&
+ test_commit_setvar --merge I topic/1 "Merge commit I" &&
+ test_commit_setvar --merge J refs/pull/2/head "Merge commit J" &&
+
+ # branch main: commit K
+ git checkout main &&
+ test_commit_setvar K "Commit K" main.txt &&
+
+ # branch release:
+ git checkout -b release &&
+ test_commit_setvar L "Commit L" release.txt &&
+ test_commit_setvar M "Commit M" release.txt &&
+ test_commit_setvar --tag TAG2 v2 &&
+ test_commit_setvar N "Commit N" release.txt &&
+ test_commit_setvar --tag TAG3 v3 &&
+
+ # branch main: merge commit O, commit P
+ git checkout main &&
+ test_commit_setvar --merge O tags/v2 "Merge commit O" &&
+ test_commit_setvar P "Commit P" main.txt
+'
+
+test_expect_success 'create bundle from special rev: main^!' '
+ git bundle create special-rev.bdl "main^!" &&
+
+ git bundle list-heads special-rev.bdl |
+ make_user_friendly_and_stable_output >actual &&
+ cat >expect <<-\EOF &&
+ <COMMIT-P> refs/heads/main
+ EOF
+ test_cmp expect actual &&
+
+ git bundle verify special-rev.bdl |
+ make_user_friendly_and_stable_output >actual &&
+ cat >expect <<-\EOF &&
+ The bundle contains this ref:
+ <COMMIT-P> refs/heads/main
+ The bundle requires this ref:
+ <COMMIT-O>
+ EOF
+ test_cmp expect actual &&
+
+ test_bundle_object_count special-rev.bdl 3
+'
+
+test_expect_success 'create bundle with --max-count option' '
+ git bundle create max-count.bdl --max-count 1 \
+ main \
+ "^release" \
+ refs/tags/v1 \
+ refs/pull/1/head \
+ refs/pull/2/head &&
+
+ git bundle verify max-count.bdl |
+ make_user_friendly_and_stable_output >actual &&
+ cat >expect <<-\EOF &&
+ The bundle contains these 2 refs:
+ <COMMIT-P> refs/heads/main
+ <TAG-1> refs/tags/v1
+ The bundle requires this ref:
+ <COMMIT-O>
+ EOF
+ test_cmp expect actual &&
+
+ test_bundle_object_count max-count.bdl 4
+'
+
+test_expect_success 'create bundle with --since option' '
+ git log -1 --pretty="%ad" $M >actual &&
+ cat >expect <<-\EOF &&
+ Thu Apr 7 15:26:13 2005 -0700
+ EOF
+ test_cmp expect actual &&
+
+ git bundle create since.bdl \
+ --since "Thu Apr 7 15:27:00 2005 -0700" \
+ --all &&
+
+ git bundle verify since.bdl |
+ make_user_friendly_and_stable_output >actual &&
+ cat >expect <<-\EOF &&
+ The bundle contains these 5 refs:
+ <COMMIT-P> refs/heads/main
+ <COMMIT-N> refs/heads/release
+ <TAG-2> refs/tags/v2
+ <TAG-3> refs/tags/v3
+ <COMMIT-P> HEAD
+ The bundle requires these 2 refs:
+ <COMMIT-M>
+ <COMMIT-K>
+ EOF
+ test_cmp expect actual &&
+
+ test_bundle_object_count --thin since.bdl 13
+'
+
+test_expect_success 'create bundle 1 - no prerequisites' '
+ # create bundle from args
+ git bundle create 1.bdl topic/1 topic/2 &&
+
+ # create bundle from stdin
+ cat >input <<-\EOF &&
+ topic/1
+ topic/2
+ EOF
+ git bundle create stdin-1.bdl --stdin <input &&
+
+ cat >expect <<-\EOF &&
+ The bundle contains these 2 refs:
+ <COMMIT-D> refs/heads/topic/1
+ <COMMIT-H> refs/heads/topic/2
+ The bundle records a complete history.
+ EOF
+
+ # verify bundle, which has no prerequisites
+ git bundle verify 1.bdl |
+ make_user_friendly_and_stable_output >actual &&
+ test_cmp expect actual &&
+
+ git bundle verify stdin-1.bdl |
+ make_user_friendly_and_stable_output >actual &&
+ test_cmp expect actual &&
+
+ test_bundle_object_count 1.bdl 24 &&
+ test_bundle_object_count stdin-1.bdl 24
+'
+
+test_expect_success 'create bundle 2 - has prerequisites' '
+ # create bundle from args
+ git bundle create 2.bdl \
+ --ignore-missing \
+ ^topic/deleted \
+ ^$D \
+ ^topic/2 \
+ release &&
+
+ # create bundle from stdin
+ # input has a non-exist reference: "topic/deleted"
+ cat >input <<-EOF &&
+ ^topic/deleted
+ ^$D
+ ^topic/2
+ EOF
+ git bundle create stdin-2.bdl \
+ --ignore-missing \
+ --stdin \
+ release <input &&
+
+ cat >expect <<-\EOF &&
+ The bundle contains this ref:
+ <COMMIT-N> refs/heads/release
+ The bundle requires these 3 refs:
+ <COMMIT-D>
+ <COMMIT-E>
+ <COMMIT-G>
+ EOF
+
+ git bundle verify 2.bdl |
+ make_user_friendly_and_stable_output >actual &&
+ test_cmp expect actual &&
+
+ git bundle verify stdin-2.bdl |
+ make_user_friendly_and_stable_output >actual &&
+ test_cmp expect actual &&
+
+ test_bundle_object_count 2.bdl 16 &&
+ test_bundle_object_count stdin-2.bdl 16
+'
+
+test_expect_success 'fail to verify bundle without prerequisites' '
+ git init --bare test1.git &&
+
+ cat >expect <<-\EOF &&
+ error: Repository lacks these prerequisite commits:
+ error: <COMMIT-D>
+ error: <COMMIT-E>
+ error: <COMMIT-G>
+ EOF
+
+ test_must_fail git -C test1.git bundle verify ../2.bdl 2>&1 |
+ make_user_friendly_and_stable_output >actual &&
+ test_cmp expect actual &&
+
+ test_must_fail git -C test1.git bundle verify ../stdin-2.bdl 2>&1 |
+ make_user_friendly_and_stable_output >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'create bundle 3 - two refs, same object' '
+ # create bundle from args
+ git bundle create --version=3 3.bdl \
+ ^release \
+ ^topic/1 \
+ ^topic/2 \
+ main \
+ HEAD &&
+
+ # create bundle from stdin
+ cat >input <<-\EOF &&
+ ^release
+ ^topic/1
+ ^topic/2
+ EOF
+ git bundle create --version=3 stdin-3.bdl \
+ --stdin \
+ main HEAD <input &&
+
+ cat >expect <<-\EOF &&
+ The bundle contains these 2 refs:
+ <COMMIT-P> refs/heads/main
+ <COMMIT-P> HEAD
+ The bundle requires these 2 refs:
+ <COMMIT-M>
+ <COMMIT-K>
+ EOF
+
+ git bundle verify 3.bdl |
+ make_user_friendly_and_stable_output >actual &&
+ test_cmp expect actual &&
+
+ git bundle verify stdin-3.bdl |
+ make_user_friendly_and_stable_output >actual &&
+ test_cmp expect actual &&
+
+ test_bundle_object_count 3.bdl 4 &&
+ test_bundle_object_count stdin-3.bdl 4
+'
+
+test_expect_success 'create bundle 4 - with tags' '
+ # create bundle from args
+ git bundle create 4.bdl \
+ ^main \
+ ^release \
+ ^topic/1 \
+ ^topic/2 \
+ --all &&
+
+ # create bundle from stdin
+ cat >input <<-\EOF &&
+ ^main
+ ^release
+ ^topic/1
+ ^topic/2
+ EOF
+ git bundle create stdin-4.bdl \
+ --ignore-missing \
+ --stdin \
+ --all <input &&
+
+ cat >expect <<-\EOF &&
+ The bundle contains these 3 refs:
+ <TAG-1> refs/tags/v1
+ <TAG-2> refs/tags/v2
+ <TAG-3> refs/tags/v3
+ The bundle records a complete history.
+ EOF
+
+ git bundle verify 4.bdl |
+ make_user_friendly_and_stable_output >actual &&
+ test_cmp expect actual &&
+
+ git bundle verify stdin-4.bdl |
+ make_user_friendly_and_stable_output >actual &&
+ test_cmp expect actual &&
+
+ test_bundle_object_count 4.bdl 3 &&
+ test_bundle_object_count stdin-4.bdl 3
+'
+
+test_expect_success 'clone from bundle' '
+ git clone --mirror 1.bdl mirror.git &&
+ git -C mirror.git show-ref |
+ make_user_friendly_and_stable_output >actual &&
+ cat >expect <<-\EOF &&
+ <COMMIT-D> refs/heads/topic/1
+ <COMMIT-H> refs/heads/topic/2
+ EOF
+ test_cmp expect actual &&
+
+ git -C mirror.git fetch ../2.bdl "+refs/*:refs/*" &&
+ git -C mirror.git show-ref |
+ make_user_friendly_and_stable_output >actual &&
+ cat >expect <<-\EOF &&
+ <COMMIT-N> refs/heads/release
+ <COMMIT-D> refs/heads/topic/1
+ <COMMIT-H> refs/heads/topic/2
+ EOF
+ test_cmp expect actual &&
+
+ git -C mirror.git fetch ../3.bdl "+refs/*:refs/*" &&
+ git -C mirror.git show-ref |
+ make_user_friendly_and_stable_output >actual &&
+ cat >expect <<-\EOF &&
+ <COMMIT-P> refs/heads/main
+ <COMMIT-N> refs/heads/release
+ <COMMIT-D> refs/heads/topic/1
+ <COMMIT-H> refs/heads/topic/2
+ EOF
+ test_cmp expect actual &&
+
+ git -C mirror.git fetch ../4.bdl "+refs/*:refs/*" &&
+ git -C mirror.git show-ref |
+ make_user_friendly_and_stable_output >actual &&
+ cat >expect <<-\EOF &&
+ <COMMIT-P> refs/heads/main
+ <COMMIT-N> refs/heads/release
+ <COMMIT-D> refs/heads/topic/1
+ <COMMIT-H> refs/heads/topic/2
+ <TAG-1> refs/tags/v1
+ <TAG-2> refs/tags/v2
+ <TAG-3> refs/tags/v3
+ EOF
+ test_cmp expect actual
+'
+
+test_done
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index 821a0c8..32bb66e 100755
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -6,6 +6,9 @@
exec </dev/null
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
add_line_into_file()
@@ -82,9 +85,16 @@
git bisect bad $HASH4
'
-test_expect_success 'bisect reset: back in the master branch' '
+test_expect_success 'bisect start without -- takes unknown arg as pathspec' '
git bisect reset &&
- echo "* master" > branch.expect &&
+ git bisect start foo bar &&
+ grep foo ".git/BISECT_NAMES" &&
+ grep bar ".git/BISECT_NAMES"
+'
+
+test_expect_success 'bisect reset: back in the main branch' '
+ git bisect reset &&
+ echo "* main" > branch.expect &&
git branch > branch.output &&
cmp branch.expect branch.output
'
@@ -95,7 +105,7 @@
git bisect good $HASH1 &&
git bisect bad $HASH3 &&
git bisect reset &&
- echo " master" > branch.expect &&
+ echo " main" > branch.expect &&
echo "* other" >> branch.expect &&
git branch > branch.output &&
cmp branch.expect branch.output
@@ -148,7 +158,7 @@
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 +176,7 @@
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 +185,7 @@
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 +253,30 @@
'
# 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 +303,17 @@
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 +321,13 @@
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
'
@@ -351,7 +351,7 @@
test_expect_success 'bisect starting with a detached HEAD' '
git bisect reset &&
- git checkout master^ &&
+ git checkout main^ &&
HEAD=$(git rev-parse --verify HEAD) &&
git bisect start &&
test $HEAD = $(cat .git/BISECT_START) &&
@@ -458,6 +458,24 @@
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 &&
@@ -485,7 +503,7 @@
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
@@ -560,9 +578,9 @@
test "$para3" = "$PARA_HASH3"
'
-test_expect_success 'erroring out when using bad path parameters' '
+test_expect_success 'erroring out when using bad path arguments' '
test_must_fail git bisect start $PARA_HASH7 $HASH1 -- foobar 2> error.txt &&
- test_i18ngrep "bad path parameters" error.txt
+ test_i18ngrep "bad path arguments" error.txt
'
test_expect_success 'test bisection on bare repo - --no-checkout specified' '
@@ -701,7 +719,7 @@
test_expect_success 'bisect: demonstrate identification of damage boundary' "
git bisect reset &&
git checkout broken &&
- git bisect start broken master --no-checkout &&
+ git bisect start broken main --no-checkout &&
test_must_fail git bisect run \"\$SHELL_PATH\" -c '
GOOD=\$(git for-each-ref \"--format=%(objectname)\" refs/bisect/good-*) &&
git rev-list --objects BISECT_HEAD --not \$GOOD >tmp.\$\$ &&
@@ -792,6 +810,13 @@
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 &&
@@ -804,7 +829,7 @@
test_must_fail git bisect terms 1 2 &&
test_must_fail git bisect terms 2>actual &&
echo "error: no terms defined" >expected &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'bisect terms shows good/bad after start' '
@@ -859,7 +884,9 @@
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 &&
@@ -876,7 +903,7 @@
Your current terms are two for the old state
and one for the new state.
EOF
- test_i18ncmp expected actual &&
+ test_cmp expected actual &&
git bisect terms --term-bad >actual &&
echo one >expected &&
test_cmp expected actual &&
@@ -902,14 +929,26 @@
git bisect bad $HASH4 &&
git bisect reset &&
test -z "$(git for-each-ref "refs/bisect/*")" &&
- test_path_is_missing "$GIT_DIR/BISECT_EXPECTED_REV" &&
- test_path_is_missing "$GIT_DIR/BISECT_ANCESTORS_OK" &&
- test_path_is_missing "$GIT_DIR/BISECT_LOG" &&
- test_path_is_missing "$GIT_DIR/BISECT_RUN" &&
- test_path_is_missing "$GIT_DIR/BISECT_TERMS" &&
- test_path_is_missing "$GIT_DIR/head-name" &&
- test_path_is_missing "$GIT_DIR/BISECT_HEAD" &&
- test_path_is_missing "$GIT_DIR/BISECT_START"
+ test_path_is_missing ".git/BISECT_EXPECTED_REV" &&
+ test_path_is_missing ".git/BISECT_ANCESTORS_OK" &&
+ test_path_is_missing ".git/BISECT_LOG" &&
+ test_path_is_missing ".git/BISECT_RUN" &&
+ test_path_is_missing ".git/BISECT_TERMS" &&
+ test_path_is_missing ".git/head-name" &&
+ test_path_is_missing ".git/BISECT_HEAD" &&
+ test_path_is_missing ".git/BISECT_START"
+'
+
+test_expect_success 'bisect handles annotated tags' '
+ test_commit commit-one &&
+ git tag -m foo tag-one &&
+ test_commit commit-two &&
+ git tag -m foo tag-two &&
+ git bisect start &&
+ git bisect good tag-one &&
+ git bisect bad tag-two >output &&
+ bad=$(git rev-parse --verify tag-two^{commit}) &&
+ grep "$bad is the first bad commit" output
'
test_done
diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh
index ad1922b..a313849 100755
--- a/t/t6040-tracking-info.sh
+++ b/t/t6040-tracking-info.sh
@@ -2,6 +2,9 @@
test_description='remote tracking stats'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
advance () {
@@ -34,7 +37,7 @@
git branch -d brokenbase &&
git checkout -b b6 origin
) &&
- git checkout -b follower --track master &&
+ git checkout -b follower --track main &&
advance h
'
@@ -54,16 +57,16 @@
git branch -v
) |
sed -n -e "$t6040_script" >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
cat >expect <<\EOF
-b1 [origin/master: ahead 1, behind 1] d
-b2 [origin/master: ahead 1, behind 1] d
-b3 [origin/master: behind 1] b
-b4 [origin/master: ahead 2] f
+b1 [origin/main: ahead 1, behind 1] d
+b2 [origin/main: ahead 1, behind 1] d
+b3 [origin/main: behind 1] b
+b4 [origin/main: ahead 2] f
b5 [brokenbase: gone] g
-b6 [origin/master] c
+b6 [origin/main] c
EOF
test_expect_success 'branch -vv' '
@@ -72,7 +75,7 @@
git branch -vv
) |
sed -n -e "$t6040_script" >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'checkout (diverged from upstream)' '
@@ -83,7 +86,7 @@
'
test_expect_success 'checkout with local tracked branch' '
- git checkout master &&
+ git checkout main &&
git checkout follower >actual &&
test_i18ngrep "is ahead of" actual
'
@@ -100,7 +103,7 @@
(
cd test && git checkout b6
) >actual &&
- test_i18ngrep "Your branch is up to date with .origin/master" actual
+ test_i18ngrep "Your branch is up to date with .origin/main" actual
'
test_expect_success 'status (diverged from upstream)' '
@@ -130,11 +133,11 @@
# reports nothing to commit
test_must_fail git commit --dry-run
) >actual &&
- test_i18ngrep "Your branch is up to date with .origin/master" actual
+ test_i18ngrep "Your branch is up to date with .origin/main" actual
'
cat >expect <<\EOF
-## b1...origin/master [ahead 1, behind 1]
+## b1...origin/main [ahead 1, behind 1]
EOF
test_expect_success 'status -s -b (diverged from upstream)' '
@@ -143,11 +146,11 @@
git checkout b1 >/dev/null &&
git status -s -b | head -1
) >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
cat >expect <<\EOF
-## b1...origin/master [different]
+## b1...origin/main [different]
EOF
test_expect_success 'status -s -b --no-ahead-behind (diverged from upstream)' '
@@ -156,11 +159,11 @@
git checkout b1 >/dev/null &&
git status -s -b --no-ahead-behind | head -1
) >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
cat >expect <<\EOF
-## b1...origin/master [different]
+## b1...origin/main [different]
EOF
test_expect_success 'status.aheadbehind=false status -s -b (diverged from upstream)' '
@@ -169,12 +172,12 @@
git checkout b1 >/dev/null &&
git -c status.aheadbehind=false status -s -b | head -1
) >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
cat >expect <<\EOF
On branch b1
-Your branch and 'origin/master' have diverged,
+Your branch and 'origin/main' have diverged,
and have 1 and 1 different commits each, respectively.
EOF
@@ -184,7 +187,7 @@
git checkout b1 >/dev/null &&
git status --long -b | head -3
) >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'status --long --branch' '
@@ -193,12 +196,12 @@
git checkout b1 >/dev/null &&
git -c status.aheadbehind=true status --long -b | head -3
) >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
cat >expect <<\EOF
On branch b1
-Your branch and 'origin/master' refer to different commits.
+Your branch and 'origin/main' refer to different commits.
EOF
test_expect_success 'status --long --branch --no-ahead-behind' '
@@ -207,7 +210,7 @@
git checkout b1 >/dev/null &&
git status --long -b --no-ahead-behind | head -2
) >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'status.aheadbehind=false status --long --branch' '
@@ -216,7 +219,7 @@
git checkout b1 >/dev/null &&
git -c status.aheadbehind=false status --long -b | head -2
) >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
cat >expect <<\EOF
@@ -229,11 +232,11 @@
git checkout b5 >/dev/null &&
git status -s -b | head -1
) >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
cat >expect <<\EOF
-## b6...origin/master
+## b6...origin/main
EOF
test_expect_success 'status -s -b (up-to-date with upstream)' '
@@ -242,11 +245,11 @@
git checkout b6 >/dev/null &&
git status -s -b | head -1
) >actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'fail to track lightweight tags' '
- git checkout master &&
+ git checkout main &&
git tag light &&
test_must_fail git branch --track lighttrack light >actual &&
test_i18ngrep ! "set up to track" actual &&
@@ -254,7 +257,7 @@
'
test_expect_success 'fail to track annotated tags' '
- git checkout master &&
+ git checkout main &&
git tag -m heavy heavy &&
test_must_fail git branch --track heavytrack heavy >actual &&
test_i18ngrep ! "set up to track" actual &&
@@ -262,29 +265,29 @@
'
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 config branch.from-master.merge > actual &&
- git rev-parse from-master2 >actual2 &&
- grep -q "^refs/heads/master$" actual &&
+ git branch from-main main &&
+ git branch --set-upstream-to main from-main &&
+ git branch from-topic_2 main &&
+ 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 main from-topic_2 &&
+ git config branch.from-main.merge > actual &&
+ git rev-parse from-topic_2 >actual2 &&
+ grep -q "^refs/heads/main$" 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 branch --set-upstream-to @{-1} from-master &&
- git config branch.from-master.merge > actual &&
- git config branch.from-master2.merge > actual2 &&
- git branch --set-upstream-to follower from-master &&
- git config branch.from-master.merge > expect &&
+ git checkout from-topic_2 &&
+ git config branch.from-topic_2.merge > expect2 &&
+ git branch --set-upstream-to @{-1} from-main &&
+ git config branch.from-main.merge > actual &&
+ git config branch.from-topic_2.merge > actual2 &&
+ git branch --set-upstream-to follower from-main &&
+ git config branch.from-main.merge > expect &&
test_cmp expect2 actual2 &&
test_cmp expect actual
'
diff --git a/t/t6041-bisect-submodule.sh b/t/t6041-bisect-submodule.sh
index 62b8a2e..df1eff0 100755
--- a/t/t6041-bisect-submodule.sh
+++ b/t/t6041-bisect-submodule.sh
@@ -10,7 +10,12 @@
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 bad $BAD
}
-test_submodule_switch "git_bisect"
+test_submodule_switch_func "git_bisect"
test_done
diff --git a/t/t6045-merge-rename-delete.sh b/t/t6045-merge-rename-delete.sh
deleted file mode 100755
index 5d33577..0000000
--- a/t/t6045-merge-rename-delete.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-test_description='Merge-recursive rename/delete conflict message'
-. ./test-lib.sh
-
-test_expect_success 'rename/delete' '
- echo foo >A &&
- git add A &&
- git commit -m "initial" &&
-
- git checkout -b rename &&
- git mv A B &&
- git commit -m "rename" &&
-
- git checkout master &&
- git rm A &&
- 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_done
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index e7e64e0..e33d512 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -4,6 +4,9 @@
#
test_description='Tests replace refs functionality'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY/lib-gpg.sh"
@@ -129,13 +132,13 @@
EOF
test_expect_success 'tag replaced commit' '
- git mktag <tag.sig >.git/refs/tags/mytag 2>message
+ git mktag <tag.sig >.git/refs/tags/mytag
'
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 &&
+ git fsck main >fsck_main.out &&
+ test_i18ngrep "dangling commit $R" fsck_main.out &&
+ test_i18ngrep "dangling tag $(git show-ref -s refs/tags/mytag)" fsck_main.out &&
test -z "$(git fsck)"
'
@@ -218,7 +221,7 @@
git cherry-pick $HASH6 &&
PARA6=$(git rev-parse --verify HEAD) &&
git replace $HASH6 $PARA6 &&
- git checkout master &&
+ git checkout main &&
cur=$(git rev-parse --verify HEAD) &&
test "$cur" = "$HASH7" &&
git log --pretty=oneline | grep $PARA2 &&
@@ -461,7 +464,7 @@
git commit -m "hello: 2 more lines from a test branch" &&
HASH9=$(git rev-parse --verify HEAD) &&
git tag -s -m "tag for testing with a mergetag" test_tag HEAD &&
- git checkout master &&
+ git checkout main &&
git merge -s ours test_tag &&
HASH10=$(git rev-parse --verify HEAD) &&
git cat-file commit $HASH10 | grep "^mergetag object"
diff --git a/t/t6100-rev-list-in-order.sh b/t/t6100-rev-list-in-order.sh
index b2bb0a7..e934bc2 100755
--- a/t/t6100-rev-list-in-order.sh
+++ b/t/t6100-rev-list-in-order.sh
@@ -22,7 +22,7 @@
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 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/t/t6101-rev-parse-parents.sh b/t/t6101-rev-parse-parents.sh
index 7683e4a..78b5851 100755
--- a/t/t6101-rev-parse-parents.sh
+++ b/t/t6101-rev-parse-parents.sh
@@ -5,6 +5,9 @@
test_description='Test git rev-parse with different parent options'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_cmp_rev_output () {
@@ -18,7 +21,7 @@
test_commit second &&
git checkout --orphan tmp &&
test_commit start2 &&
- git checkout master &&
+ git checkout main &&
git merge -m next --allow-unrelated-histories start2 &&
test_commit final &&
@@ -34,7 +37,7 @@
'
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/t/t6110-rev-list-sparse.sh b/t/t6110-rev-list-sparse.sh
index 656ac7f..13c1da5 100755
--- a/t/t6110-rev-list-sparse.sh
+++ b/t/t6110-rev-list-sparse.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='operations that cull histories in unusual ways'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
@@ -10,7 +13,7 @@
git checkout -b side HEAD^ &&
test_commit D &&
test_commit E &&
- git merge master
+ git merge main
'
test_expect_success 'rev-list --first-parent --boundary' '
diff --git a/t/t6111-rev-list-treesame.sh b/t/t6111-rev-list-treesame.sh
index 4244638..e07b607 100755
--- a/t/t6111-rev-list-treesame.sh
+++ b/t/t6111-rev-list-treesame.sh
@@ -13,6 +13,9 @@
test_description='TREESAME and limiting'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
note () {
@@ -33,13 +36,13 @@
git checkout other-branch &&
test_commit "Added other" other "Hello" C &&
- git checkout master &&
+ git checkout main &&
test_merge D other-branch &&
git checkout third-branch &&
test_commit "Third file" third "Nothing" E &&
- git checkout master &&
+ git checkout main &&
test_commit "file=Blah" file "Blah" F &&
test_tick && git merge --no-commit third-branch &&
@@ -56,7 +59,7 @@
test_tick && git revert I && note J &&
- git checkout master &&
+ git checkout main &&
test_tick && git merge --no-ff fiddler-branch &&
note K &&
diff --git a/t/t6112-rev-list-filters-objects.sh b/t/t6112-rev-list-filters-objects.sh
index de0e5a5..31457d1 100755
--- a/t/t6112-rev-list-filters-objects.sh
+++ b/t/t6112-rev-list-filters-objects.sh
@@ -2,6 +2,9 @@
test_description='git rev-list using object filtering'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
# Test the blob:none filter.
@@ -223,7 +226,7 @@
sort >expected &&
git -C r3 rev-list --quiet --objects --filter-print-omitted \
- --filter=sparse:oid=master:pattern HEAD >revs &&
+ --filter=sparse:oid=main:pattern HEAD >revs &&
awk -f print_1.awk revs |
sed "s/~//" |
sort >observed &&
@@ -436,7 +439,7 @@
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 \
+ --filter=combine:tree:3+blob:limit=40+sparse:oid=main:pattern \
HEAD >actual &&
expect_has HEAD "" &&
@@ -454,7 +457,7 @@
cp actual expect &&
git -C r3 rev-list --objects \
- --filter=combine:tree:3+blob:limit=40+sparse:oid=master:pattern1%2brenamed%25 \
+ --filter=combine:tree:3+blob:limit=40+sparse:oid=main:pattern1%2brenamed%25 \
HEAD >actual &&
test_cmp expect actual &&
@@ -464,23 +467,23 @@
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" \
+ --filter=sparse:oid="main:p;at%ter+n" \
HEAD >actual &&
test_cmp expect actual &&
- grep "Add to combine filter-spec: sparse:oid=master:p%3bat%25ter%2bn" \
+ grep "Add to combine filter-spec: sparse:oid=main: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=sparse:oid=main:^~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" \
+ grep "Add to combine filter-spec: sparse:oid=main:%5e%7epattern" \
trace2
'
diff --git a/t/t6113-rev-list-bitmap-filters.sh b/t/t6113-rev-list-bitmap-filters.sh
index 145603f..3f88994 100755
--- a/t/t6113-rev-list-bitmap-filters.sh
+++ b/t/t6113-rev-list-bitmap-filters.sh
@@ -2,6 +2,7 @@
test_description='rev-list combining bitmaps and filters'
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-bitmap.sh
test_expect_success 'set up bitmapped repo' '
# one commit will have bitmaps, the other will not
@@ -53,4 +54,25 @@
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/t/t6115-rev-list-du.sh b/t/t6115-rev-list-du.sh
new file mode 100755
index 0000000..b4aef32
--- /dev/null
+++ b/t/t6115-rev-list-du.sh
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+test_description='basic tests of rev-list --disk-usage'
+. ./test-lib.sh
+
+# we want a mix of reachable and unreachable, as well as
+# objects in the bitmapped pack and some outside of it
+test_expect_success 'set up repository' '
+ test_commit --no-tag one &&
+ test_commit --no-tag two &&
+ git repack -adb &&
+ git reset --hard HEAD^ &&
+ test_commit --no-tag three &&
+ test_commit --no-tag four &&
+ git reset --hard HEAD^
+'
+
+# We don't want to hardcode sizes, because they depend on the exact details of
+# packing, zlib, etc. We'll assume that the regular rev-list and cat-file
+# machinery works and compare the --disk-usage output to that.
+disk_usage_slow () {
+ git rev-list --no-object-names "$@" |
+ git cat-file --batch-check="%(objectsize:disk)" |
+ perl -lne '$total += $_; END { print $total}'
+}
+
+# check behavior with given rev-list options; note that
+# whitespace is not preserved in args
+check_du () {
+ args=$*
+
+ test_expect_success "generate expected size ($args)" "
+ disk_usage_slow $args >expect
+ "
+
+ test_expect_success "rev-list --disk-usage without bitmaps ($args)" "
+ git rev-list --disk-usage $args >actual &&
+ test_cmp expect actual
+ "
+
+ test_expect_success "rev-list --disk-usage with bitmaps ($args)" "
+ git rev-list --disk-usage --use-bitmap-index $args >actual &&
+ test_cmp expect actual
+ "
+}
+
+check_du HEAD
+check_du --objects HEAD
+check_du --objects HEAD^..HEAD
+
+test_done
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index 34502e3..e89b674 100755
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -11,6 +11,9 @@
#
# First parent of a merge commit is on the same line, second parent below.
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
check_describe () {
@@ -102,7 +105,7 @@
check_describe B --tags HEAD^^2^
check_describe e --tags HEAD^^^
-check_describe heads/master --all HEAD
+check_describe heads/main --all HEAD
check_describe tags/c-* --all HEAD^
check_describe tags/e --all HEAD^^^
@@ -129,12 +132,30 @@
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_cmp 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
'
@@ -385,15 +406,15 @@
i=1 &&
while test $i -lt 8000
do
- echo "commit refs/heads/master
+ echo "commit refs/heads/main
committer A U Thor <author@example.com> $((1000000000 + $i * 100)) +0200
data <<EOF
commit #$i
EOF"
- test $i = 1 && echo "from refs/heads/master^0"
+ test $i = 1 && echo "from refs/heads/main^0"
i=$(($i + 1))
done | git fast-import &&
- git checkout master &&
+ git checkout main &&
git tag far-far-away HEAD^ &&
echo "HEAD~4000 tags/far-far-away~3999" >expect &&
git name-rev HEAD~4000 >actual &&
@@ -424,7 +445,7 @@
'
test_expect_success 'name-rev a rev shortly after epoch' '
- test_when_finished "git checkout master" &&
+ test_when_finished "git checkout main" &&
git checkout --orphan no-timestamp-underflow &&
# Any date closer to epoch than the CUTOFF_DATE_SLOP constant
@@ -438,7 +459,7 @@
test_cmp expect actual
'
-# A--------------master
+# A--------------main
# \ /
# \----------M2
# \ /
@@ -469,10 +490,10 @@
git checkout $A &&
git merge --no-ff HEAD@{1} && # M2
- git checkout master &&
+ git checkout main &&
git merge --no-ff HEAD@{1} &&
- echo "$B master^2^2~1^2" >expect &&
+ echo "$B main^2^2~1^2" >expect &&
git name-rev $B >actual &&
test_cmp expect actual
@@ -498,7 +519,7 @@
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 &&
+ git merge --no-ff --allow-unrelated-histories main -m x &&
check_describe "A-3-*" HEAD
)
@@ -524,7 +545,7 @@
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 &&
+ git merge --no-ff --allow-unrelated-histories main -m x &&
check_describe "B-3-*" HEAD
)
diff --git a/t/t6132-pathspec-exclude.sh b/t/t6132-pathspec-exclude.sh
index 2462b19..30328b8 100755
--- a/t/t6132-pathspec-exclude.sh
+++ b/t/t6132-pathspec-exclude.sh
@@ -211,4 +211,37 @@
)
'
+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/t/t6134-pathspec-in-submodule.sh b/t/t6134-pathspec-in-submodule.sh
index c670668..0f1cb49 100755
--- a/t/t6134-pathspec-in-submodule.sh
+++ b/t/t6134-pathspec-in-submodule.sh
@@ -21,7 +21,7 @@
test_expect_success 'error message for path inside submodule' '
echo a >sub/a &&
test_must_fail git add sub/a 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'error message for path inside submodule from within submodule' '
diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh
index 8a72b4c..44f55d9 100755
--- a/t/t6200-fmt-merge-msg.sh
+++ b/t/t6200-fmt-merge-msg.sh
@@ -5,7 +5,11 @@
test_description='fmt-merge-msg test'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
+. "$TEST_DIRECTORY/lib-gpg.sh"
test_expect_success setup '
echo one >one &&
@@ -73,20 +77,42 @@
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 &&
- git checkout master &&
+ git checkout main &&
git fetch . left &&
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
test_cmp expected actual
'
+test_expect_success GPG 'message for merging local tag signed by good key' '
+ git checkout main &&
+ 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 main &&
+ 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 &&
- git checkout master &&
+ git checkout main &&
git fetch "$(pwd)" left &&
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
@@ -110,7 +136,7 @@
test_config merge.log true &&
test_unconfig merge.summary &&
- git checkout master &&
+ git checkout main &&
test_tick &&
git fetch . left &&
@@ -119,7 +145,7 @@
test_unconfig merge.log &&
test_config merge.summary true &&
- git checkout master &&
+ git checkout main &&
test_tick &&
git fetch . left &&
@@ -130,7 +156,7 @@
'
test_expect_success 'setup FETCH_HEAD' '
- git checkout master &&
+ git checkout main &&
test_tick &&
git fetch . left
'
@@ -258,7 +284,7 @@
test_unconfig merge.log &&
test_unconfig merge.summary &&
- git checkout master &&
+ git checkout main &&
git fetch "$(pwd)" left &&
git fmt-merge-msg -m "Sync with left" <.git/FETCH_HEAD >actual &&
git fmt-merge-msg --log -m "Sync with left" \
@@ -300,28 +326,28 @@
test_expect_success 'shortlog for two branches' '
test_config merge.log true &&
test_unconfig merge.summary &&
- git checkout master &&
+ git checkout main &&
test_tick &&
git fetch . left right &&
git fmt-merge-msg <.git/FETCH_HEAD >actual1 &&
test_unconfig merge.log &&
test_config merge.summary true &&
- git checkout master &&
+ git checkout main &&
test_tick &&
git fetch . left right &&
git fmt-merge-msg <.git/FETCH_HEAD >actual2 &&
test_config merge.log yes &&
test_unconfig merge.summary &&
- git checkout master &&
+ git checkout main &&
test_tick &&
git fetch . left right &&
git fmt-merge-msg <.git/FETCH_HEAD >actual3 &&
test_unconfig merge.log &&
test_config merge.summary yes &&
- git checkout master &&
+ git checkout main &&
test_tick &&
git fetch . left right &&
git fmt-merge-msg <.git/FETCH_HEAD >actual4 &&
@@ -335,7 +361,7 @@
test_expect_success 'merge-msg -F' '
test_unconfig merge.log &&
test_config merge.summary yes &&
- git checkout master &&
+ git checkout main &&
test_tick &&
git fetch . left right &&
git fmt-merge-msg -F .git/FETCH_HEAD >actual &&
@@ -345,7 +371,7 @@
test_expect_success 'merge-msg -F in subdirectory' '
test_unconfig merge.log &&
test_config merge.summary yes &&
- git checkout master &&
+ git checkout main &&
test_tick &&
git fetch . left right &&
mkdir sub &&
@@ -385,7 +411,7 @@
test_unconfig merge.log &&
test_config merge.summary yes &&
- git checkout master &&
+ git checkout main &&
test_tick &&
git fetch . tag tag-r3 &&
@@ -415,7 +441,7 @@
test_unconfig merge.log &&
test_config merge.summary yes &&
- git checkout master &&
+ git checkout main &&
test_tick &&
git fetch . tag tag-r3 tag tag-l5 &&
@@ -445,7 +471,7 @@
test_unconfig merge.log &&
test_config merge.summary yes &&
- git checkout master &&
+ git checkout main &&
test_tick &&
git fetch . tag tag-r3 left &&
@@ -472,7 +498,7 @@
test_config merge.summary yes &&
- git checkout master &&
+ git checkout main &&
test_tick &&
git fetch . long &&
@@ -483,11 +509,11 @@
test_expect_success 'merge-msg with "merging" an annotated tag' '
test_config merge.log true &&
- git checkout master^0 &&
+ git checkout main^0 &&
git commit --allow-empty -m "One step ahead" &&
git tag -a -m "An annotated one" annote HEAD &&
- git checkout master &&
+ git checkout main &&
git fetch . annote &&
git fmt-merge-msg <.git/FETCH_HEAD >actual &&
@@ -519,4 +545,24 @@
test_cmp expected .git/MERGE_MSG
'
+test_expect_success 'merge.suppressDest configuration' '
+ git checkout -B side main &&
+ git commit --allow-empty -m "One step ahead" &&
+ git checkout main &&
+ 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 main" 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 main$" actual &&
+
+ git -c merge.suppressDest="ma?*[rn]" fmt-merge-msg <.git/FETCH_HEAD >full.3 &&
+ head -n1 full.3 >actual &&
+ grep -e "Merge branch .side." actual &&
+ ! grep -e " into main$" actual
+'
+
test_done
diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index 9c910ce..cac7f44 100755
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -5,6 +5,9 @@
test_description='for-each-ref test'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-gpg.sh
. "$TEST_DIRECTORY"/lib-terminal.sh
@@ -20,16 +23,21 @@
}
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 &&
git commit -m "Initial" &&
+ git branch -M main &&
setdate_and_increment &&
git tag -a -m "Tagging at $datestamp" testtag &&
- git update-ref refs/remotes/origin/master master &&
+ git update-ref refs/remotes/origin/main main &&
git remote add origin nowhere &&
- git config branch.master.remote origin &&
- git config branch.master.merge refs/heads/master &&
+ git config branch.main.remote origin &&
+ git config branch.main.merge refs/heads/main &&
git remote add myfork elsewhere &&
git config remote.pushdefault myfork &&
git config push.default current
@@ -37,7 +45,7 @@
test_atom() {
case "$1" in
- head) ref=refs/heads/master ;;
+ head) ref=refs/heads/main ;;
tag) ref=refs/tags/testtag ;;
sym) ref=refs/heads/sym ;;
*) ref=$1 ;;
@@ -48,49 +56,77 @@
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
}
-test_atom head refname refs/heads/master
-test_atom head refname: refs/heads/master
-test_atom head refname:short master
-test_atom head refname:lstrip=1 heads/master
-test_atom head refname:lstrip=2 master
-test_atom head refname:lstrip=-1 master
-test_atom head refname:lstrip=-2 heads/master
+hexlen=$(test_oid hexsz)
+disklen=$(test_oid disklen)
+
+test_atom head refname refs/heads/main
+test_atom head refname: refs/heads/main
+test_atom head refname:short main
+test_atom head refname:lstrip=1 heads/main
+test_atom head refname:lstrip=2 main
+test_atom head refname:lstrip=-1 main
+test_atom head refname:lstrip=-2 heads/main
test_atom head refname:rstrip=1 refs/heads
test_atom head refname:rstrip=2 refs
test_atom head refname:rstrip=-1 refs
test_atom head refname:rstrip=-2 refs/heads
-test_atom head refname:strip=1 heads/master
-test_atom head refname:strip=2 master
-test_atom head refname:strip=-1 master
-test_atom head refname:strip=-2 heads/master
-test_atom head upstream refs/remotes/origin/master
-test_atom head upstream:short origin/master
-test_atom head upstream:lstrip=2 origin/master
-test_atom head upstream:lstrip=-2 origin/master
+test_atom head refname:strip=1 heads/main
+test_atom head refname:strip=2 main
+test_atom head refname:strip=-1 main
+test_atom head refname:strip=-2 heads/main
+test_atom head upstream refs/remotes/origin/main
+test_atom head upstream:short origin/main
+test_atom head upstream:lstrip=2 origin/main
+test_atom head upstream:lstrip=-2 origin/main
test_atom head upstream:rstrip=2 refs/remotes
test_atom head upstream:rstrip=-2 refs/remotes
-test_atom head upstream:strip=2 origin/master
-test_atom head upstream:strip=-2 origin/master
-test_atom head push refs/remotes/myfork/master
-test_atom head push:short myfork/master
-test_atom head push:lstrip=1 remotes/myfork/master
-test_atom head push:lstrip=-1 master
+test_atom head upstream:strip=2 origin/main
+test_atom head upstream:strip=-2 origin/main
+test_atom head push refs/remotes/myfork/main
+test_atom head push:short myfork/main
+test_atom head push:lstrip=1 remotes/myfork/main
+test_atom head push:lstrip=-1 main
test_atom head push:rstrip=1 refs/remotes/myfork
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 push:strip=1 remotes/myfork/main
+test_atom head push:strip=-1 main
test_atom head objecttype commit
-test_atom head objectsize 171
-test_atom head objectsize:disk 138
-test_atom head deltabase 0000000000000000000000000000000000000000
-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 objectsize $((131 + hexlen))
+test_atom head objectsize:disk $disklen
+test_atom head deltabase $ZERO_OID
+test_atom head objectname $(git rev-parse refs/heads/main)
+test_atom head objectname:short $(git rev-parse --short refs/heads/main)
+test_atom head objectname:short=1 $(git rev-parse --short=1 refs/heads/main)
+test_atom head objectname:short=10 $(git rev-parse --short=10 refs/heads/main)
+test_atom head tree $(git rev-parse refs/heads/main^{tree})
+test_atom head tree:short $(git rev-parse --short refs/heads/main^{tree})
+test_atom head tree:short=1 $(git rev-parse --short=1 refs/heads/main^{tree})
+test_atom head tree:short=10 $(git rev-parse --short=10 refs/heads/main^{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 +135,26 @@
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 +168,51 @@
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 head objectname:short=1 $(git rev-parse --short=1 refs/heads/main)
+test_atom head objectname:short=10 $(git rev-parse --short=10 refs/heads/main)
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 ''
@@ -201,7 +257,7 @@
author_date=$3 &&
tagger_date=$4 &&
cat >expected <<-EOF &&
- 'refs/heads/master' '$committer_date' '$author_date'
+ 'refs/heads/main' '$committer_date' '$author_date'
'refs/tags/testtag' '$tagger_date'
EOF
(
@@ -323,8 +379,8 @@
'
cat >expected <<\EOF
-refs/heads/master
-refs/remotes/origin/master
+refs/heads/main
+refs/remotes/origin/main
refs/tags/testtag
EOF
@@ -336,8 +392,8 @@
cat >expected <<\EOF
refs/tags/testtag
-refs/remotes/origin/master
-refs/heads/master
+refs/remotes/origin/main
+refs/heads/main
EOF
test_expect_success 'Verify descending sort' '
@@ -372,8 +428,8 @@
'
cat >expected <<\EOF
-'refs/heads/master'
-'refs/remotes/origin/master'
+'refs/heads/main'
+'refs/remotes/origin/main'
'refs/tags/testtag'
EOF
@@ -393,8 +449,8 @@
'
cat >expected <<\EOF
-"refs/heads/master"
-"refs/remotes/origin/master"
+"refs/heads/main"
+"refs/remotes/origin/main"
"refs/tags/testtag"
EOF
@@ -421,8 +477,8 @@
test_expect_success 'setup for push:track[short]' '
test_commit third &&
- git update-ref refs/remotes/myfork/master master &&
- git reset master~1
+ git update-ref refs/remotes/myfork/main main &&
+ git reset main~1
'
test_atom head push:track '[behind 1]'
@@ -438,8 +494,8 @@
[gone]
EOF
- test_when_finished "git config branch.master.merge refs/heads/master" &&
- git config branch.master.merge refs/heads/does-not-exist &&
+ test_when_finished "git config branch.main.merge refs/heads/main" &&
+ git config branch.main.merge refs/heads/does-not-exist &&
git for-each-ref \
--format="%(upstream:track)$LF%(upstream:trackshort)" \
refs/heads >actual &&
@@ -452,9 +508,9 @@
test_expect_success 'set up color tests' '
cat >expected.color <<-EOF &&
- $(git rev-parse --short refs/heads/master) <GREEN>master<RESET>
- $(git rev-parse --short refs/remotes/myfork/master) <GREEN>myfork/master<RESET>
- $(git rev-parse --short refs/remotes/origin/master) <GREEN>origin/master<RESET>
+ $(git rev-parse --short refs/heads/main) <GREEN>main<RESET>
+ $(git rev-parse --short refs/remotes/myfork/main) <GREEN>myfork/main<RESET>
+ $(git rev-parse --short refs/remotes/origin/main) <GREEN>origin/main<RESET>
$(git rev-parse --short refs/tags/testtag) <GREEN>testtag<RESET>
$(git rev-parse --short refs/tags/third) <GREEN>third<RESET>
$(git rev-parse --short refs/tags/two) <GREEN>two<RESET>
@@ -486,8 +542,8 @@
'
cat >expected <<\EOF
-heads/master
-tags/master
+heads/main
+tags/main
EOF
test_expect_success 'Check ambiguous head and tag refs (strict)' '
@@ -497,19 +553,19 @@
git add one &&
git commit -m "Branch" &&
setdate_and_increment &&
- git tag -m "Tagging at $datestamp" master &&
- git for-each-ref --format "%(refname:short)" refs/heads/master refs/tags/master >actual &&
+ git tag -m "Tagging at $datestamp" main &&
+ git for-each-ref --format "%(refname:short)" refs/heads/main refs/tags/main >actual &&
test_cmp expected actual
'
cat >expected <<\EOF
-heads/master
-master
+heads/main
+main
EOF
test_expect_success 'Check ambiguous head and tag refs (loose)' '
git config --bool core.warnambiguousrefs false &&
- git for-each-ref --format "%(refname:short)" refs/heads/master refs/tags/master >actual &&
+ git for-each-ref --format "%(refname:short)" refs/heads/main refs/tags/main >actual &&
test_cmp expected actual
'
@@ -519,7 +575,7 @@
EOF
test_expect_success 'Check ambiguous head and tag refs II (loose)' '
- git checkout master &&
+ git checkout main &&
git tag ambiguous testtag^0 &&
git branch ambiguous testtag^0 &&
git for-each-ref --format "%(refname:short)" refs/heads/ambiguous refs/tags/ambiguous >actual &&
@@ -538,10 +594,14 @@
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'
@@ -565,6 +625,7 @@
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
'
@@ -585,6 +646,7 @@
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
@@ -617,6 +679,7 @@
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 ''
@@ -624,6 +687,7 @@
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 ''
@@ -632,6 +696,7 @@
$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"
@@ -643,20 +708,81 @@
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/main^{tree} &&
+ git update-ref refs/myblobs/first refs/heads/main: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" &&
+ test_when_finished "git checkout main" &&
git for-each-ref --format="%(HEAD) %(refname:short)" refs/heads/ >actual &&
sed -e "s/^\* / /" actual >expect &&
git checkout --orphan orphaned-branch &&
@@ -688,84 +814,163 @@
EOF
'
-test_expect_success '%(trailers:unfold) unfolds trailers' '
- git for-each-ref --format="%(trailers:unfold)" refs/heads/master >actual &&
- {
- unfold <trailers
- echo
- } >expect &&
- test_cmp expect actual
-'
+test_trailer_option () {
+ title=$1 option=$2
+ cat >expect
+ test_expect_success "$title" '
+ git for-each-ref --format="%($option)" refs/heads/main >actual &&
+ test_cmp expect actual &&
+ git for-each-ref --format="%(contents:$option)" refs/heads/main >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 &&
- test_cmp expect actual
-'
+test_trailer_option '%(trailers:unfold) unfolds trailers' \
+ 'trailers:unfold' <<-EOF
+ $(unfold <trailers)
-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
-'
+ EOF
-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_trailer_option '%(trailers:only) shows only "key: value" trailers' \
+ 'trailers:only' <<-EOF
+ $(grep -v patch.description <trailers)
-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
-'
+ EOF
-test_expect_success '%(contents:trailers:only) and %(contents:trailers:unfold) work together' '
- 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_trailer_option '%(trailers:only=no,only=true) shows only "key: value" trailers' \
+ 'trailers:only=no,only=true' <<-EOF
+ $(grep -v patch.description <trailers)
-test_expect_success '%(trailers) rejects unknown trailers arguments' '
- # error message cannot be checked under i18n
- cat >expect <<-EOF &&
+ EOF
+
+test_trailer_option '%(trailers:only=yes) shows only "key: value" trailers' \
+ 'trailers:only=yes' <<-EOF
+ $(grep -v patch.description <trailers)
+
+ EOF
+
+test_trailer_option '%(trailers:only=no) shows all trailers' \
+ 'trailers:only=no' <<-EOF
+ $(cat trailers)
+
+ EOF
+
+test_trailer_option '%(trailers:only) and %(trailers:unfold) work together' \
+ 'trailers:only,unfold' <<-EOF
+ $(grep -v patch.description <trailers | unfold)
+
+ EOF
+
+test_trailer_option '%(trailers:unfold) and %(trailers:only) work together' \
+ 'trailers:unfold,only' <<-EOF
+ $(grep -v patch.description <trailers | unfold)
+
+ EOF
+
+test_trailer_option '%(trailers:key=foo) shows that trailer' \
+ 'trailers:key=Signed-off-by' <<-EOF
+ Signed-off-by: A U Thor <author@example.com>
+
+ EOF
+
+test_trailer_option '%(trailers:key=foo) is case insensitive' \
+ 'trailers:key=SiGned-oFf-bY' <<-EOF
+ Signed-off-by: A U Thor <author@example.com>
+
+ EOF
+
+test_trailer_option '%(trailers:key=foo:) trailing colon also works' \
+ 'trailers:key=Signed-off-by:' <<-EOF
+ Signed-off-by: A U Thor <author@example.com>
+
+ EOF
+
+test_trailer_option '%(trailers:key=foo) multiple keys' \
+ 'trailers:key=Reviewed-by:,key=Signed-off-by' <<-EOF
+ Reviewed-by: A U Thor <author@example.com>
+ Signed-off-by: A U Thor <author@example.com>
+
+ EOF
+
+test_trailer_option '%(trailers:key=nonexistent) becomes empty' \
+ 'trailers:key=Shined-off-by:' <<-EOF
+
+ EOF
+
+test_trailer_option '%(trailers:key=foo) handles multiple lines even if folded' \
+ 'trailers:key=Acked-by' <<-EOF
+ $(grep -v patch.description <trailers | grep -v Signed-off-by | grep -v Reviewed-by)
+
+ EOF
+
+test_trailer_option '%(trailers:key=foo,unfold) properly unfolds' \
+ 'trailers:key=Signed-Off-by,unfold' <<-EOF
+ $(unfold <trailers | grep Signed-off-by)
+
+ EOF
+
+test_trailer_option '%(trailers:key=foo,only=no) also includes nontrailer lines' \
+ 'trailers:key=Signed-off-by,only=no' <<-EOF
+ Signed-off-by: A U Thor <author@example.com>
+ $(grep patch.description <trailers)
+
+ EOF
+
+test_trailer_option '%(trailers:key=foo,valueonly) shows only value' \
+ 'trailers:key=Signed-off-by,valueonly' <<-EOF
+ A U Thor <author@example.com>
+
+ EOF
+
+test_trailer_option '%(trailers:separator) changes separator' \
+ 'trailers:separator=%x2C,key=Reviewed-by,key=Signed-off-by:' <<-EOF
+ Reviewed-by: A U Thor <author@example.com>,Signed-off-by: A U Thor <author@example.com>
+ EOF
+
+test_trailer_option '%(trailers:key_value_separator) changes key-value separator' \
+ 'trailers:key_value_separator=%x2C,key=Reviewed-by,key=Signed-off-by:' <<-EOF
+ Reviewed-by,A U Thor <author@example.com>
+ Signed-off-by,A U Thor <author@example.com>
+
+ EOF
+
+test_trailer_option '%(trailers:separator,key_value_separator) changes both separators' \
+ 'trailers:separator=%x2C,key_value_separator=%x2C,key=Reviewed-by,key=Signed-off-by:' <<-EOF
+ Reviewed-by,A U Thor <author@example.com>,Signed-off-by,A U Thor <author@example.com>
+ EOF
+
+test_failing_trailer_option () {
+ title=$1 option=$2
+ cat >expect
+ test_expect_success "$title" '
+ # error message cannot be checked under i18n
+ test_must_fail git for-each-ref --format="%($option)" refs/heads/main 2>actual &&
+ test_i18ncmp expect actual &&
+ test_must_fail git for-each-ref --format="%(contents:$option)" refs/heads/main 2>actual &&
+ test_i18ncmp expect actual
+ '
+}
+
+test_failing_trailer_option '%(trailers) rejects unknown trailers arguments' \
+ 'trailers:unsupported' <<-\EOF
fatal: unknown %(trailers) argument: unsupported
EOF
- test_must_fail git for-each-ref --format="%(trailers:unsupported)" 2>actual &&
- test_i18ncmp expect actual
-'
-test_expect_success '%(contents:trailers) rejects unknown trailers arguments' '
- # error message cannot be checked under i18n
- cat >expect <<-EOF &&
- fatal: unknown %(trailers) argument: unsupported
+test_failing_trailer_option '%(trailers:key) without value is error' \
+ 'trailers:key' <<-\EOF
+ fatal: expected %(trailers:key=<value>)
EOF
- test_must_fail git for-each-ref --format="%(contents:trailers:unsupported)" 2>actual &&
+
+test_expect_success 'if arguments, %(contents:trailers) shows error if colon is missing' '
+ cat >expect <<-EOF &&
+ fatal: unrecognized %(contents) argument: trailersonly
+ EOF
+ test_must_fail git for-each-ref --format="%(contents:trailersonly)" 2>actual &&
test_i18ncmp expect actual
'
test_expect_success 'basic atom: head contents:trailers' '
- git for-each-ref --format="%(contents:trailers)" refs/heads/master >actual &&
+ git for-each-ref --format="%(contents:trailers)" refs/heads/main >actual &&
sanitize_pgp <actual >actual.clean &&
# git for-each-ref ends with a blank line
cat >expect <<-EOF &&
@@ -794,16 +999,16 @@
echo "trailer: right" &&
echo
} >expect &&
- git for-each-ref --format="%(trailers)" refs/heads/master >actual &&
+ git for-each-ref --format="%(trailers)" refs/heads/main >actual &&
test_cmp expect actual
'
test_expect_success 'Add symbolic ref for the following tests' '
- git symbolic-ref refs/heads/sym refs/heads/master
+ git symbolic-ref refs/heads/sym refs/heads/main
'
cat >expected <<EOF
-refs/heads/master
+refs/heads/main
EOF
test_expect_success 'Verify usage of %(symref) atom' '
@@ -812,7 +1017,7 @@
'
cat >expected <<EOF
-heads/master
+heads/main
EOF
test_expect_success 'Verify usage of %(symref:short) atom' '
@@ -821,8 +1026,8 @@
'
cat >expected <<EOF
-master
-heads/master
+main
+heads/main
EOF
test_expect_success 'Verify usage of %(symref:lstrip) atom' '
@@ -851,22 +1056,23 @@
(
cd remote-tests &&
test_commit initial &&
+ git branch -M main &&
git remote add from fifth.coffee:blub &&
- git config branch.master.remote from &&
- git config branch.master.merge refs/heads/stable &&
+ git config branch.main.remote from &&
+ git config branch.main.merge refs/heads/stable &&
git remote add to southridge.audio:repo &&
git config remote.to.push "refs/heads/*:refs/heads/pushed/*" &&
- git config branch.master.pushRemote to &&
+ git config branch.main.pushRemote to &&
for pair in "%(upstream)=refs/remotes/from/stable" \
"%(upstream:remotename)=from" \
"%(upstream:remoteref)=refs/heads/stable" \
- "%(push)=refs/remotes/to/pushed/master" \
+ "%(push)=refs/remotes/to/pushed/main" \
"%(push:remotename)=to" \
- "%(push:remoteref)=refs/heads/pushed/master"
+ "%(push:remoteref)=refs/heads/pushed/main"
do
echo "${pair#*=}" >expect &&
git for-each-ref --format="${pair%=*}" \
- refs/heads/master >actual &&
+ refs/heads/main >actual &&
test_cmp expect actual
done &&
git branch push-simple &&
@@ -879,12 +1085,52 @@
'
test_expect_success 'for-each-ref --ignore-case ignores case' '
- git for-each-ref --format="%(refname)" refs/heads/MASTER >actual &&
+ git for-each-ref --format="%(refname)" refs/heads/MAIN >actual &&
test_must_be_empty actual &&
- echo refs/heads/master >expect &&
+ echo refs/heads/main >expect &&
git for-each-ref --format="%(refname)" --ignore-case \
- refs/heads/MASTER >actual &&
+ refs/heads/MAIN >actual &&
+ 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
'
diff --git a/t/t6301-for-each-ref-errors.sh b/t/t6301-for-each-ref-errors.sh
index 49cc65b..40edf9d 100755
--- a/t/t6301-for-each-ref-errors.sh
+++ b/t/t6301-for-each-ref-errors.sh
@@ -5,9 +5,9 @@
. ./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 &&
@@ -20,8 +20,8 @@
test_when_finished "rm -f .git/$r" &&
echo "warning: ignoring broken ref $r" >broken-err &&
git for-each-ref >out 2>err &&
- test_i18ncmp full-list out &&
- test_i18ncmp broken-err err
+ test_cmp full-list out &&
+ test_cmp broken-err err
'
test_expect_success 'NULL_SHA1 refs are reported correctly' '
@@ -31,10 +31,10 @@
echo "warning: ignoring broken ref $r" >zeros-err &&
git for-each-ref >out 2>err &&
test_cmp full-list out &&
- test_i18ncmp zeros-err err &&
+ test_cmp zeros-err err &&
git for-each-ref --format="%(objectname) %(refname)" >brief-out 2>brief-err &&
test_cmp brief-list brief-out &&
- test_i18ncmp zeros-err brief-err
+ test_cmp zeros-err brief-err
'
test_expect_success 'Missing objects are reported correctly' '
@@ -43,7 +43,7 @@
test_when_finished "rm -f .git/$r" &&
echo "fatal: missing object $MISSING for $r" >missing-err &&
test_must_fail git for-each-ref 2>err &&
- test_i18ncmp missing-err err &&
+ test_cmp missing-err err &&
(
cat brief-list &&
echo "$MISSING $r"
diff --git a/t/t6302-for-each-ref-filter.sh b/t/t6302-for-each-ref-filter.sh
index 35408d5..9866b1b 100755
--- a/t/t6302-for-each-ref-filter.sh
+++ b/t/t6302-for-each-ref-filter.sh
@@ -2,11 +2,15 @@
test_description='test for-each-refs usage of ref-filter APIs'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-gpg.sh
test_expect_success 'setup some history and refs' '
test_commit one &&
+ git branch -M main &&
test_commit two &&
test_commit three &&
git checkout -b side &&
@@ -26,17 +30,17 @@
git tag $sign -m "A signed tag" signed-tag &&
git tag $sign -m "Signed doubly" doubly-signed-tag signed-tag &&
- git checkout master &&
- git update-ref refs/odd/spot master
+ git checkout main &&
+ git update-ref refs/odd/spot main
'
test_expect_success 'filtering with --points-at' '
cat >expect <<-\EOF &&
- refs/heads/master
+ refs/heads/main
refs/odd/spot
refs/tags/three
EOF
- git for-each-ref --format="%(refname)" --points-at=master >actual &&
+ git for-each-ref --format="%(refname)" --points-at=main >actual &&
test_cmp expect actual
'
@@ -53,13 +57,13 @@
test_expect_success 'filtering with --merged' '
cat >expect <<-\EOF &&
- refs/heads/master
+ refs/heads/main
refs/odd/spot
refs/tags/one
refs/tags/three
refs/tags/two
EOF
- git for-each-ref --format="%(refname)" --merged=master >actual &&
+ git for-each-ref --format="%(refname)" --merged=main >actual &&
test_cmp expect actual
'
@@ -72,13 +76,13 @@
refs/tags/four
refs/tags/signed-tag
EOF
- git for-each-ref --format="%(refname)" --no-merged=master >actual &&
+ git for-each-ref --format="%(refname)" --no-merged=main >actual &&
test_cmp expect actual
'
test_expect_success 'filtering with --contains' '
cat >expect <<-\EOF &&
- refs/heads/master
+ refs/heads/main
refs/heads/side
refs/odd/spot
refs/tags/annotated-tag
@@ -115,7 +119,7 @@
test_expect_success 'left alignment is default' '
cat >expect <<-\EOF &&
- refname is refs/heads/master |refs/heads/master
+ refname is refs/heads/main |refs/heads/main
refname is refs/heads/side |refs/heads/side
refname is refs/odd/spot |refs/odd/spot
refname is refs/tags/annotated-tag|refs/tags/annotated-tag
@@ -133,7 +137,7 @@
test_expect_success 'middle alignment' '
cat >expect <<-\EOF &&
- | refname is refs/heads/master |refs/heads/master
+ | refname is refs/heads/main |refs/heads/main
| refname is refs/heads/side |refs/heads/side
| refname is refs/odd/spot |refs/odd/spot
|refname is refs/tags/annotated-tag|refs/tags/annotated-tag
@@ -151,7 +155,7 @@
test_expect_success 'right alignment' '
cat >expect <<-\EOF &&
- | refname is refs/heads/master|refs/heads/master
+ | refname is refs/heads/main|refs/heads/main
| refname is refs/heads/side|refs/heads/side
| refname is refs/odd/spot|refs/odd/spot
|refname is refs/tags/annotated-tag|refs/tags/annotated-tag
@@ -168,7 +172,7 @@
'
cat >expect <<-\EOF
-| refname is refs/heads/master |refs/heads/master
+| refname is refs/heads/main |refs/heads/main
| refname is refs/heads/side |refs/heads/side
| refname is refs/odd/spot |refs/odd/spot
| refname is refs/tags/annotated-tag |refs/tags/annotated-tag
@@ -215,7 +219,7 @@
test_expect_success 'alignment with format quote' "
cat >expect <<-\EOF &&
- |' '\''master| A U Thor'\'' '|
+ |' '\''main| A U Thor'\'' '|
|' '\''side| A U Thor'\'' '|
|' '\''odd/spot| A U Thor'\'' '|
|' '\''annotated-tag| '\'' '|
@@ -233,7 +237,7 @@
test_expect_success 'nested alignment with quote formatting' "
cat >expect <<-\EOF &&
- |' master '|
+ |' main '|
|' side '|
|' odd/spot '|
|' annotated-tag '|
@@ -251,7 +255,7 @@
test_expect_success 'check `%(contents:lines=1)`' '
cat >expect <<-\EOF &&
- master |three
+ main |three
side |four
odd/spot |three
annotated-tag |An annotated tag
@@ -269,7 +273,7 @@
test_expect_success 'check `%(contents:lines=0)`' '
cat >expect <<-\EOF &&
- master |
+ main |
side |
odd/spot |
annotated-tag |
@@ -287,7 +291,7 @@
test_expect_success 'check `%(contents:lines=99999)`' '
cat >expect <<-\EOF &&
- master |three
+ main |three
side |four
odd/spot |three
annotated-tag |An annotated tag
@@ -360,7 +364,7 @@
test_expect_success 'check %(if)...%(then)...%(end) atoms' '
git for-each-ref --format="%(refname)%(if)%(authorname)%(then) Author: %(authorname)%(end)" >actual &&
cat >expect <<-\EOF &&
- refs/heads/master Author: A U Thor
+ refs/heads/main Author: A U Thor
refs/heads/side Author: A U Thor
refs/odd/spot Author: A U Thor
refs/tags/annotated-tag
@@ -381,7 +385,7 @@
test_expect_success 'check %(if)...%(then)...%(else)...%(end) atoms' '
git for-each-ref --format="%(if)%(authorname)%(then)%(authorname)%(else)No author%(end): %(refname)" >actual &&
cat >expect <<-\EOF &&
- A U Thor: refs/heads/master
+ A U Thor: refs/heads/main
A U Thor: refs/heads/side
A U Thor: refs/odd/spot
No author: refs/tags/annotated-tag
@@ -401,7 +405,7 @@
test_expect_success 'ignore spaces in %(if) atom usage' '
git for-each-ref --format="%(refname:short): %(if)%(HEAD)%(then)Head ref%(else)Not Head ref%(end)" >actual &&
cat >expect <<-\EOF &&
- master: Head ref
+ main: Head ref
side: Not Head ref
odd/spot: Not Head ref
annotated-tag: Not Head ref
@@ -420,34 +424,34 @@
'
test_expect_success 'check %(if:equals=<string>)' '
- git for-each-ref --format="%(if:equals=master)%(refname:short)%(then)Found master%(else)Not master%(end)" refs/heads/ >actual &&
+ git for-each-ref --format="%(if:equals=main)%(refname:short)%(then)Found main%(else)Not main%(end)" refs/heads/ >actual &&
cat >expect <<-\EOF &&
- Found master
- Not master
+ Found main
+ Not main
EOF
test_cmp expect actual
'
test_expect_success 'check %(if:notequals=<string>)' '
- git for-each-ref --format="%(if:notequals=master)%(refname:short)%(then)Not master%(else)Found master%(end)" refs/heads/ >actual &&
+ git for-each-ref --format="%(if:notequals=main)%(refname:short)%(then)Not main%(else)Found main%(end)" refs/heads/ >actual &&
cat >expect <<-\EOF &&
- Found master
- Not master
+ Found main
+ Not main
EOF
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' '
cat >expect <<-EOF &&
- master: $(pwd)
- master_worktree: $(pwd)/worktree_dir
+ main: $(pwd)
+ main_worktree: $(pwd)/worktree_dir
side: not checked out
EOF
- git worktree add -b master_worktree worktree_dir master &&
+ git worktree add -b main_worktree worktree_dir main &&
git for-each-ref --format="%(refname:short): %(if)%(worktreepath)%(then)%(worktreepath)%(else)not checked out%(end)" refs/heads/ >actual &&
rm -r worktree_dir &&
git worktree prune &&
diff --git a/t/t6020-merge-df.sh b/t/t6400-merge-df.sh
similarity index 84%
rename from t/t6020-merge-df.sh
rename to t/t6400-merge-df.sh
index 400a4cd..38700d2 100755
--- a/t/t6020-merge-df.sh
+++ b/t/t6400-merge-df.sh
@@ -4,6 +4,9 @@
#
test_description='Test merge with directory/file conflicts'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'prepare repository' '
@@ -24,12 +27,12 @@
'
test_expect_success 'Merge with d/f conflicts' '
- test_expect_code 1 git merge -m "merge msg" master
+ test_expect_code 1 git merge -m "merge msg" main
'
test_expect_success 'F/D conflict' '
git reset --hard &&
- git checkout master &&
+ git checkout main &&
rm .git/index &&
mkdir before &&
@@ -47,7 +50,7 @@
git add . &&
git commit -m para &&
- git merge master
+ git merge main
'
test_expect_success 'setup modify/delete + directory/file conflict' '
@@ -81,7 +84,12 @@
test 5 -eq $(git ls-files -s | wc -l) &&
test 4 -eq $(git ls-files -u | wc -l) &&
- test 1 -eq $(git ls-files -o | wc -l) &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ test 0 -eq $(git ls-files -o | wc -l)
+ else
+ test 1 -eq $(git ls-files -o | wc -l)
+ fi &&
test_path_is_file letters/file &&
test_path_is_file letters.txt &&
@@ -97,7 +105,12 @@
test 5 -eq $(git ls-files -s | wc -l) &&
test 4 -eq $(git ls-files -u | wc -l) &&
- test 1 -eq $(git ls-files -o | wc -l) &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ test 0 -eq $(git ls-files -o | wc -l)
+ else
+ test 1 -eq $(git ls-files -o | wc -l)
+ fi &&
test_path_is_file letters/file &&
test_path_is_file letters.txt &&
@@ -124,7 +137,7 @@
git add . &&
git commit -m initial &&
- git branch main &&
+ git branch topic &&
git branch other &&
git checkout other &&
@@ -132,10 +145,10 @@
git add -u &&
git commit -m other &&
- git checkout main &&
- echo main >foo/bar/baz &&
+ git checkout topic &&
+ echo topic >foo/bar/baz &&
git add -u &&
- git commit -m main &&
+ git commit -m topic &&
git merge other &&
git ls-files -s >out &&
diff --git a/t/t6021-merge-criss-cross.sh b/t/t6401-merge-criss-cross.sh
similarity index 100%
rename from t/t6021-merge-criss-cross.sh
rename to t/t6401-merge-criss-cross.sh
diff --git a/t/t6022-merge-rename.sh b/t/t6402-merge-rename.sh
similarity index 84%
rename from t/t6022-merge-rename.sh
rename to t/t6402-merge-rename.sh
index bbbba3d..425dad9 100755
--- a/t/t6022-merge-rename.sh
+++ b/t/t6402-merge-rename.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='Merge-recursive merging renames'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
modify () {
@@ -54,9 +57,9 @@
git branch change &&
git branch change+rename &&
- sed -e "/^g /s/.*/g : master changes a line/" <A >A+ &&
+ sed -e "/^g /s/.*/g : main changes a line/" <A >A+ &&
mv A+ A &&
- git commit -a -m "master updates A" &&
+ git commit -a -m "main updates A" &&
git checkout yellow &&
rm -f M &&
@@ -94,7 +97,7 @@
git update-index --add B &&
git commit -q -a -m "changed and renamed" &&
- git checkout master
+ git checkout main
'
test_expect_success 'pull renaming branch into unrenaming one' \
@@ -109,7 +112,7 @@
sed -ne "/^g/{
p
q
- }" B | grep master &&
+ }" B | grep main &&
git diff --exit-code white N
'
@@ -134,7 +137,7 @@
'
git reset --hard &&
git show-branch &&
- test_expect_code 1 git pull . master &&
+ test_expect_code 1 git pull . main &&
git ls-files -u B >b.stages &&
test_line_count = 3 b.stages &&
git ls-files -s N >n.stages &&
@@ -187,7 +190,7 @@
test_expect_success 'interference with untracked working tree file' '
git reset --hard &&
rm -f A M &&
- git checkout -f master &&
+ git checkout -f main &&
git tag -f anchor &&
git show-branch &&
git pull . yellow &&
@@ -198,7 +201,7 @@
test_expect_success 'updated working tree file should prevent the merge' '
git reset --hard &&
rm -f A M &&
- git checkout -f master &&
+ git checkout -f main &&
git tag -f anchor &&
git show-branch &&
echo >>M one line addition &&
@@ -211,7 +214,7 @@
test_expect_success 'updated working tree file should prevent the merge' '
git reset --hard &&
rm -f A M &&
- git checkout -f master &&
+ git checkout -f main &&
git tag -f anchor &&
git show-branch &&
echo >>M one line addition &&
@@ -229,7 +232,7 @@
git tag -f anchor &&
git show-branch &&
echo >M this file should not matter &&
- git pull . master &&
+ git pull . main &&
test_path_is_file M &&
! {
git ls-files -s |
@@ -320,7 +323,12 @@
test_i18ngrep "CONFLICT (modify/delete): dir/file-in-the-way" output &&
test_i18ngrep "Auto-merging dir" output &&
- test_i18ngrep "Adding as dir~HEAD instead" output &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ test_i18ngrep "moving it to dir~HEAD instead" output
+ else
+ test_i18ngrep "Adding as dir~HEAD instead" output
+ fi &&
test 3 -eq "$(git ls-files -u | wc -l)" &&
test 2 -eq "$(git ls-files -u dir/file-in-the-way | wc -l)" &&
@@ -342,7 +350,12 @@
! grep "error: refusing to lose untracked file at" errors &&
test_i18ngrep "CONFLICT (modify/delete): dir/file-in-the-way" output &&
test_i18ngrep "Auto-merging dir" output &&
- test_i18ngrep "Adding as dir~renamed-file-has-no-conflicts instead" output &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ test_i18ngrep "moving it to dir~renamed-file-has-no-conflicts instead" output
+ else
+ test_i18ngrep "Adding as dir~renamed-file-has-no-conflicts instead" output
+ fi &&
test 3 -eq "$(git ls-files -u | wc -l)" &&
test 2 -eq "$(git ls-files -u dir/file-in-the-way | wc -l)" &&
@@ -397,7 +410,12 @@
test_must_fail git merge --strategy=recursive dir-in-way &&
test 5 -eq "$(git ls-files -u | wc -l)" &&
- test 3 -eq "$(git ls-files -u dir | grep -v file-in-the-way | wc -l)" &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ test 3 -eq "$(git ls-files -u dir~HEAD | wc -l)"
+ else
+ test 3 -eq "$(git ls-files -u dir | grep -v file-in-the-way | wc -l)"
+ fi &&
test 2 -eq "$(git ls-files -u dir/file-in-the-way | wc -l)" &&
test_must_fail git diff --quiet &&
@@ -415,7 +433,12 @@
test_must_fail git merge --strategy=recursive renamed-file-has-conflicts &&
test 5 -eq "$(git ls-files -u | wc -l)" &&
- test 3 -eq "$(git ls-files -u dir | grep -v file-in-the-way | wc -l)" &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ test 3 -eq "$(git ls-files -u dir~renamed-file-has-conflicts | wc -l)"
+ else
+ test 3 -eq "$(git ls-files -u dir | grep -v file-in-the-way | wc -l)"
+ fi &&
test 2 -eq "$(git ls-files -u dir/file-in-the-way | wc -l)" &&
test_must_fail git diff --quiet &&
@@ -471,7 +494,12 @@
git checkout -q rename-dest^0 &&
test_must_fail git merge --strategy=recursive source-conflict &&
- test 1 -eq "$(git ls-files -u | wc -l)" &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ test 2 -eq "$(git ls-files -u | wc -l)"
+ else
+ test 1 -eq "$(git ls-files -u | wc -l)"
+ fi &&
test_must_fail git diff --quiet &&
@@ -505,34 +533,63 @@
git commit -m "Rename one/file -> two"
'
-test_expect_success 'pair rename to parent of other (D/F conflicts) w/ untracked dir' '
- git checkout -q rename-one^0 &&
- mkdir one &&
- test_must_fail git merge --strategy=recursive rename-two &&
+if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+then
+ test_expect_success 'pair rename to parent of other (D/F conflicts) w/ untracked dir' '
+ git checkout -q rename-one^0 &&
+ mkdir one &&
+ test_must_fail git merge --strategy=recursive rename-two &&
- test 2 -eq "$(git ls-files -u | wc -l)" &&
- test 1 -eq "$(git ls-files -u one | wc -l)" &&
- test 1 -eq "$(git ls-files -u two | wc -l)" &&
+ test 4 -eq "$(git ls-files -u | wc -l)" &&
+ test 2 -eq "$(git ls-files -u one | wc -l)" &&
+ test 2 -eq "$(git ls-files -u two | wc -l)" &&
- test_must_fail git diff --quiet &&
+ test_must_fail git diff --quiet &&
- test 4 -eq $(find . | grep -v .git | wc -l) &&
+ test 3 -eq $(find . | grep -v .git | wc -l) &&
- test_path_is_dir one &&
- test_path_is_file one~rename-two &&
- test_path_is_file two &&
- test "other" = $(cat one~rename-two) &&
- test "stuff" = $(cat two)
-'
+ test_path_is_file one &&
+ test_path_is_file two &&
+ test "other" = $(cat one) &&
+ test "stuff" = $(cat two)
+ '
+else
+ test_expect_success 'pair rename to parent of other (D/F conflicts) w/ untracked dir' '
+ git checkout -q rename-one^0 &&
+ mkdir one &&
+ test_must_fail git merge --strategy=recursive rename-two &&
+
+ test 2 -eq "$(git ls-files -u | wc -l)" &&
+ test 1 -eq "$(git ls-files -u one | wc -l)" &&
+ test 1 -eq "$(git ls-files -u two | wc -l)" &&
+
+ test_must_fail git diff --quiet &&
+
+ test 4 -eq $(find . | grep -v .git | wc -l) &&
+
+ test_path_is_dir one &&
+ test_path_is_file one~rename-two &&
+ test_path_is_file two &&
+ test "other" = $(cat one~rename-two) &&
+ test "stuff" = $(cat two)
+ '
+fi
test_expect_success 'pair rename to parent of other (D/F conflicts) w/ clean start' '
git reset --hard &&
git clean -fdqx &&
test_must_fail git merge --strategy=recursive rename-two &&
- test 2 -eq "$(git ls-files -u | wc -l)" &&
- test 1 -eq "$(git ls-files -u one | wc -l)" &&
- test 1 -eq "$(git ls-files -u two | wc -l)" &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ test 4 -eq "$(git ls-files -u | wc -l)" &&
+ test 2 -eq "$(git ls-files -u one | wc -l)" &&
+ test 2 -eq "$(git ls-files -u two | wc -l)"
+ else
+ test 2 -eq "$(git ls-files -u | wc -l)" &&
+ test 1 -eq "$(git ls-files -u one | wc -l)" &&
+ test 1 -eq "$(git ls-files -u two | wc -l)"
+ fi &&
test_must_fail git diff --quiet &&
@@ -572,12 +629,22 @@
git checkout -q first-rename^0 &&
test_must_fail git merge --strategy=recursive second-rename &&
- test 5 -eq "$(git ls-files -s | wc -l)" &&
- test 3 -eq "$(git ls-files -u | wc -l)" &&
- test 1 -eq "$(git ls-files -u one | wc -l)" &&
- test 1 -eq "$(git ls-files -u two | wc -l)" &&
- test 1 -eq "$(git ls-files -u original | wc -l)" &&
- test 2 -eq "$(git ls-files -o | wc -l)" &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ test 5 -eq "$(git ls-files -s | wc -l)" &&
+ test 3 -eq "$(git ls-files -u | wc -l)" &&
+ test 1 -eq "$(git ls-files -u one~HEAD | wc -l)" &&
+ test 1 -eq "$(git ls-files -u two~second-rename | wc -l)" &&
+ test 1 -eq "$(git ls-files -u original | wc -l)" &&
+ test 0 -eq "$(git ls-files -o | wc -l)"
+ else
+ test 5 -eq "$(git ls-files -s | wc -l)" &&
+ test 3 -eq "$(git ls-files -u | wc -l)" &&
+ test 1 -eq "$(git ls-files -u one | wc -l)" &&
+ test 1 -eq "$(git ls-files -u two | wc -l)" &&
+ test 1 -eq "$(git ls-files -u original | wc -l)" &&
+ test 2 -eq "$(git ls-files -o | wc -l)"
+ fi &&
test_path_is_file one/file &&
test_path_is_file two/file &&
@@ -700,7 +767,7 @@
git rm -rf df &&
git commit -mB &&
- git checkout master &&
+ git checkout main &&
git rm -rf df &&
echo bla >df &&
git add -A &&
@@ -708,7 +775,7 @@
'
test_expect_success 'avoid unnecessary update, dir->(file,nothing)' '
- git checkout -q master^0 &&
+ git checkout -q main^0 &&
test-tool chmtime --get -3600 df >expect &&
git merge side &&
test-tool chmtime --get df >actual &&
@@ -730,14 +797,14 @@
git rm -f file &&
git commit -m "Delete file" &&
- git checkout master &&
+ git checkout main &&
echo bla >file &&
git add -A &&
git commit -m "Modify file"
'
test_expect_success 'avoid unnecessary update, modify/delete' '
- git checkout -q master^0 &&
+ git checkout -q main^0 &&
test-tool chmtime --get -3600 file >expect &&
test_must_fail git merge side &&
test-tool chmtime --get file >actual &&
@@ -759,13 +826,13 @@
git add -A &&
git commit -m "Add file copy" &&
- git checkout master &&
+ git checkout main &&
git mv file newfile &&
git commit -m "Rename file"
'
test_expect_success 'avoid unnecessary update, rename/add-dest' '
- git checkout -q master^0 &&
+ git checkout -q main^0 &&
test-tool chmtime --get -3600 newfile >expect &&
git merge side &&
test-tool chmtime --get newfile >actual &&
@@ -815,15 +882,15 @@
git mv original_file renamed_file &&
git commit -mB &&
- git checkout master &&
+ git checkout main &&
echo 8.5 >>original_file &&
git add original_file &&
git commit -mC
'
-test_expect_success 'merge master into rename has correct extended markers' '
+test_expect_success 'merge main into rename has correct extended markers' '
git checkout rename^0 &&
- test_must_fail git merge -s recursive master^0 &&
+ test_must_fail git merge -s recursive main^0 &&
cat >expected <<-\EOF &&
1
@@ -838,14 +905,14 @@
9
=======
8.5
- >>>>>>> master^0:original_file
+ >>>>>>> main^0:original_file
EOF
test_cmp expected renamed_file
'
-test_expect_success 'merge rename into master has correct extended markers' '
+test_expect_success 'merge rename into main has correct extended markers' '
git reset --hard &&
- git checkout master^0 &&
+ git checkout main^0 &&
test_must_fail git merge -s recursive rename^0 &&
cat >expected <<-\EOF &&
@@ -881,13 +948,13 @@
git mv original_file renamed_file &&
git commit -mB &&
- git checkout master &&
+ git checkout main &&
git rm original_file &&
git commit -mC
'
test_expect_success 'no spurious "refusing to lose untracked" message' '
- git checkout master^0 &&
+ git checkout main^0 &&
test_must_fail git merge rename^0 2>errors.txt &&
! grep "refusing to lose untracked file" errors.txt
'
diff --git a/t/t6023-merge-file.sh b/t/t6403-merge-file.sh
similarity index 100%
rename from t/t6023-merge-file.sh
rename to t/t6403-merge-file.sh
diff --git a/t/t6024-recursive-merge.sh b/t/t6404-recursive-merge.sh
similarity index 82%
rename from t/t6024-recursive-merge.sh
rename to t/t6404-recursive-merge.sh
index 332cfc5..eaf48e9 100755
--- a/t/t6024-recursive-merge.sh
+++ b/t/t6404-recursive-merge.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='Test merge without common ancestors'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
# This scenario is based on a real-world repository of Shawn Pearce.
@@ -15,15 +18,17 @@
export GIT_COMMITTER_DATE
test_expect_success 'setup tests' '
+ GIT_TEST_COMMIT_GRAPH=0 &&
+ export GIT_TEST_COMMIT_GRAPH &&
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 &&
+ git checkout -b A main &&
echo A >a1 &&
GIT_AUTHOR_DATE="2006-12-12 23:00:01" git commit -m A a1 &&
- git checkout -b B master &&
+ git checkout -b B main &&
echo B >a1 &&
GIT_AUTHOR_DATE="2006-12-12 23:00:02" git commit -m B a1 &&
@@ -66,7 +71,7 @@
'
test_expect_success 'combined merge conflicts' '
- test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git merge -m final G
+ test_must_fail git merge -m final G
'
test_expect_success 'result contains a conflict' '
@@ -82,6 +87,7 @@
'
test_expect_success 'virtual trees were processed' '
+ # TODO: fragile test, relies on ambigious merge-base resolution
git ls-files --stage >out &&
cat >expect <<-EOF &&
@@ -118,12 +124,22 @@
test_tick &&
git commit -m rename &&
test_must_fail git merge delete &&
- test 1 = $(git ls-files --unmerged | wc -l) &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ test 2 = $(git ls-files --unmerged | wc -l)
+ else
+ test 1 = $(git ls-files --unmerged | wc -l)
+ fi &&
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) &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ test 2 = $(git ls-files --unmerged | wc -l)
+ else
+ test 1 = $(git ls-files --unmerged | wc -l)
+ fi &&
test_must_fail git rev-parse --verify :2:a2 &&
git rev-parse --verify :3:a2
'
diff --git a/t/t6025-merge-symlinks.sh b/t/t6405-merge-symlinks.sh
similarity index 76%
rename from t/t6025-merge-symlinks.sh
rename to t/t6405-merge-symlinks.sh
index 6c0a90d..7435fce 100755
--- a/t/t6025-merge-symlinks.sh
+++ b/t/t6405-merge-symlinks.sh
@@ -8,6 +8,9 @@
This tests that git merge-recursive writes merge results as plain files
if core.symlinks is false.'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup' '
@@ -19,7 +22,7 @@
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 commit -m main &&
git checkout b-symlink &&
l=$(printf file-different | git hash-object -t blob -w --stdin) &&
echo "120000 $l symlink" | git update-index --index-info &&
@@ -30,28 +33,28 @@
git commit -m b-file
'
-test_expect_success 'merge master into b-symlink, which has a different symbolic link' '
+test_expect_success 'merge main into b-symlink, which has a different symbolic link' '
git checkout b-symlink &&
- test_must_fail git merge master
+ test_must_fail git merge main
'
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' '
+test_expect_success 'merge main 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_must_fail git merge main
'
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' '
+test_expect_success 'merge b-file, which has a file instead of a symbolic link, into main' '
git reset --hard &&
- git checkout master &&
+ git checkout main &&
test_must_fail git merge b-file
'
diff --git a/t/t6026-merge-attr.sh b/t/t6406-merge-attr.sh
similarity index 89%
rename from t/t6026-merge-attr.sh
rename to t/t6406-merge-attr.sh
index 5900358..d5a4ac2 100755
--- a/t/t6026-merge-attr.sh
+++ b/t/t6406-merge-attr.sh
@@ -5,6 +5,9 @@
test_description='per path merge controlled by merge attribute'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
@@ -19,10 +22,10 @@
git branch side &&
for f in text binary union
do
- echo Master >>$f && git add $f || return 1
+ echo Main >>$f && git add $f || return 1
done &&
test_tick &&
- git commit -m Master &&
+ git commit -m Main &&
git checkout side &&
for f in text binary union
@@ -64,7 +67,7 @@
echo "union merge=union"
} >.gitattributes &&
- if git merge master
+ if git merge main
then
echo Gaah, should have conflicted
false
@@ -87,7 +90,7 @@
grep "<<<<<<<" text &&
cmp binary-orig binary &&
! grep "<<<<<<<" union &&
- grep Master union &&
+ grep Main union &&
grep Side union
'
@@ -115,14 +118,14 @@
git config --replace-all \
merge.custom.name "custom merge driver for testing" &&
- git merge master &&
+ git merge main &&
cmp binary union &&
sed -e 1,3d text >check-1 &&
- o=$(git unpack-file master^:text) &&
+ o=$(git unpack-file main^:text) &&
a=$(git unpack-file side^:text) &&
- b=$(git unpack-file master:text) &&
- sh -c "./custom-merge $o $a $b 0 'text'" &&
+ b=$(git unpack-file main: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
@@ -136,7 +139,7 @@
git config --replace-all \
merge.custom.name "custom merge driver for testing" &&
- if git merge master
+ if git merge main
then
echo "Eh? should have conflicted"
false
@@ -146,10 +149,10 @@
cmp binary union &&
sed -e 1,3d text >check-1 &&
- o=$(git unpack-file master^:text) &&
+ o=$(git unpack-file main^:text) &&
a=$(git unpack-file anchor:text) &&
- b=$(git unpack-file master:text) &&
- sh -c "./custom-merge $o $a $b 0 'text'" &&
+ b=$(git unpack-file main: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 &&
@@ -176,7 +179,7 @@
test_tick &&
(
cd repo1 &&
- git fetch ../repo2 master &&
+ git fetch ../repo2 main &&
git merge --allow-unrelated-histories FETCH_HEAD
)
'
@@ -201,7 +204,7 @@
# By packaging the command in test_when_finished, we get both
# the correctness check and the clean-up.
test_when_finished "kill \$(cat sleep.pid)" &&
- git merge master
+ git merge main
'
test_done
diff --git a/t/t6027-merge-binary.sh b/t/t6407-merge-binary.sh
similarity index 85%
rename from t/t6027-merge-binary.sh
rename to t/t6407-merge-binary.sh
index 4e6c7cb..d4273f2 100755
--- a/t/t6027-merge-binary.sh
+++ b/t/t6407-merge-binary.sh
@@ -2,6 +2,9 @@
test_description='ask merge-recursive to merge binary files'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
@@ -20,7 +23,7 @@
git ls-files -s a >E0 &&
git ls-files -s m | sed -e "s/ 0 / 3 /" >E3 &&
test_tick &&
- git commit -m "master adds some" &&
+ git commit -m "main adds some" &&
git checkout side &&
echo rezrov >>m &&
@@ -39,7 +42,7 @@
rm -f a* m* &&
git reset --hard anchor &&
- if git merge -s resolve master
+ if git merge -s resolve main
then
echo Oops, should not have succeeded
false
@@ -54,7 +57,7 @@
rm -f a* m* &&
git reset --hard anchor &&
- if git merge -s recursive master
+ if git merge -s recursive main
then
echo Oops, should not have succeeded
false
diff --git a/t/t6028-merge-up-to-date.sh b/t/t6408-merge-up-to-date.sh
similarity index 100%
rename from t/t6028-merge-up-to-date.sh
rename to t/t6408-merge-up-to-date.sh
diff --git a/t/t6029-merge-subtree.sh b/t/t6409-merge-subtree.sh
similarity index 79%
rename from t/t6029-merge-subtree.sh
rename to t/t6409-merge-subtree.sh
index 793f0c8..d406b23 100755
--- a/t/t6029-merge-subtree.sh
+++ b/t/t6409-merge-subtree.sh
@@ -2,6 +2,9 @@
test_description='subtree merge strategy'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
@@ -14,10 +17,10 @@
echo >>hello world &&
git add hello &&
git commit -m second &&
- git checkout master &&
+ git checkout main &&
for i in mundo $s; do echo $i; done >hello &&
git add hello &&
- git commit -m master
+ git commit -m main
'
@@ -35,11 +38,11 @@
test_commit foo
'
-test_expect_success 'setup branch main' '
- git checkout -b main master &&
+test_expect_success 'setup topic branch' '
+ git checkout -b topic main &&
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 +52,9 @@
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
@@ -77,8 +80,8 @@
test_expect_success 'initial merge' '
git remote add -f gui ../git-gui &&
- git merge -s ours --no-commit --allow-unrelated-histories gui/master &&
- git read-tree --prefix=git-gui/ -u gui/master &&
+ git merge -s ours --no-commit --allow-unrelated-histories gui/main &&
+ git read-tree --prefix=git-gui/ -u gui/main &&
git commit -m "Merge git-gui as our subdirectory" &&
git checkout -b work &&
git ls-files -s >actual &&
@@ -94,10 +97,10 @@
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" &&
@@ -108,10 +111,10 @@
test_expect_success 'initial ambiguous subtree' '
cd ../git &&
- git reset --hard master &&
- git checkout -b master2 &&
- git merge -s ours --no-commit gui/master &&
- git read-tree --prefix=git-gui2/ -u gui/master &&
+ git reset --hard main &&
+ git checkout -b topic_2 &&
+ git merge -s ours --no-commit gui/main &&
+ git read-tree --prefix=git-gui2/ -u gui/main &&
git commit -m "Merge git-gui2 as our subdirectory" &&
git checkout -b work2 &&
git ls-files -s >actual &&
@@ -125,8 +128,8 @@
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 +141,8 @@
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/t/t6031-merge-filemode.sh b/t/t6411-merge-filemode.sh
similarity index 89%
rename from t/t6031-merge-filemode.sh
rename to t/t6411-merge-filemode.sh
index 87741ef..f54c915 100755
--- a/t/t6031-merge-filemode.sh
+++ b/t/t6411-merge-filemode.sh
@@ -1,17 +1,20 @@
#!/bin/sh
test_description='merge: handle file mode'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'set up mode change in one branch' '
: >file1 &&
git add file1 &&
git commit -m initial &&
- git checkout -b a1 master &&
+ git checkout -b a1 main &&
: >dummy &&
git add dummy &&
git commit -m a &&
- git checkout -b b1 master &&
+ git checkout -b b1 main &&
test_chmod +x file1 &&
git add file1 &&
git commit -m b1
@@ -39,12 +42,12 @@
test_expect_success 'set up mode change in both branches' '
git reset --hard HEAD &&
- git checkout -b a2 master &&
+ git checkout -b a2 main &&
: >file2 &&
H=$(git hash-object file2) &&
test_chmod +x file2 &&
git commit -m a2 &&
- git checkout -b b2 master &&
+ git checkout -b b2 main &&
: >file2 &&
git add file2 &&
git commit -m b2 &&
@@ -76,7 +79,7 @@
test_expect_success 'set up delete/modechange scenario' '
git reset --hard &&
- git checkout -b deletion master &&
+ git checkout -b deletion main &&
git rm file1 &&
git commit -m deletion
'
diff --git a/t/t6032-merge-large-rename.sh b/t/t6412-merge-large-rename.sh
similarity index 91%
rename from t/t6032-merge-large-rename.sh
rename to t/t6412-merge-large-rename.sh
index 8077738..c50d315 100755
--- a/t/t6032-merge-large-rename.sh
+++ b/t/t6412-merge-large-rename.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='merging with large rename matrix'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
count() {
@@ -30,7 +33,7 @@
test_expect_success "rename ($1, $2)" '
n='$1' &&
expect='$2' &&
- git checkout -f master &&
+ git checkout -f main &&
test_might_fail git branch -D test$n &&
git reset --hard initial &&
for i in $(count $n); do
@@ -50,8 +53,8 @@
git add . &&
git commit -m change+rename=$n &&
case "$expect" in
- ok) git merge master ;;
- *) test_must_fail git merge master ;;
+ ok) git merge main ;;
+ *) test_must_fail git merge main ;;
esac
'
}
diff --git a/t/t6033-merge-crlf.sh b/t/t6413-merge-crlf.sh
similarity index 89%
rename from t/t6033-merge-crlf.sh
rename to t/t6413-merge-crlf.sh
index e8d65ee..affea25 100755
--- a/t/t6033-merge-crlf.sh
+++ b/t/t6413-merge-crlf.sh
@@ -8,6 +8,9 @@
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
@@ -24,7 +27,7 @@
echo line from b | append_cr >file &&
git commit -m "add line from b" file &&
git tag b &&
- git checkout master
+ git checkout main
'
test_expect_success 'Check "ours" is CRLF' '
diff --git a/t/t6034-merge-rename-nocruft.sh b/t/t6414-merge-rename-nocruft.sh
similarity index 96%
rename from t/t6034-merge-rename-nocruft.sh
rename to t/t6414-merge-rename-nocruft.sh
index a25e730..d7e3c1f 100755
--- a/t/t6034-merge-rename-nocruft.sh
+++ b/t/t6414-merge-rename-nocruft.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='Merge-recursive merging renames'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup' '
@@ -65,7 +68,7 @@
git update-index A &&
git commit -m "blue modify A" &&
- git checkout master
+ git checkout main
'
# This test broke in 65ac6e9c3f47807cb603af07a6a9e1a43bc119ae
diff --git a/t/t6035-merge-dir-to-symlink.sh b/t/t6415-merge-dir-to-symlink.sh
similarity index 89%
rename from t/t6035-merge-dir-to-symlink.sh
rename to t/t6415-merge-dir-to-symlink.sh
index 2eddcc7..2ce104a 100755
--- a/t/t6035-merge-dir-to-symlink.sh
+++ b/t/t6415-merge-dir-to-symlink.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='merging when a directory was replaced with a symlink'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'create a commit where dir a/b changed to symlink' '
@@ -19,7 +22,7 @@
test_expect_success 'checkout does not clobber untracked symlink' '
git checkout HEAD^0 &&
- git reset --hard master &&
+ git reset --hard main &&
git rm --cached a/b &&
git commit -m "untracked symlink remains" &&
test_must_fail git checkout start^0
@@ -27,7 +30,7 @@
test_expect_success 'a/b-2/c/d is kept when clobbering symlink b' '
git checkout HEAD^0 &&
- git reset --hard master &&
+ git reset --hard main &&
git rm --cached a/b &&
git commit -m "untracked symlink remains" &&
git checkout -f start^0 &&
@@ -36,7 +39,7 @@
test_expect_success 'checkout should not have deleted a/b-2/c/d' '
git checkout HEAD^0 &&
- git reset --hard master &&
+ git reset --hard main &&
git checkout start^0 &&
test_path_is_file a/b-2/c/d
'
@@ -53,7 +56,7 @@
test_expect_success 'Handle D/F conflict, do not lose a/b-2/c/d in merge (resolve)' '
git reset --hard &&
git checkout baseline^0 &&
- git merge -s resolve master &&
+ git merge -s resolve main &&
test_path_is_file a/b-2/c/d
'
@@ -64,7 +67,7 @@
test_expect_success 'Handle D/F conflict, do not lose a/b-2/c/d in merge (recursive)' '
git reset --hard &&
git checkout baseline^0 &&
- git merge -s recursive master &&
+ git merge -s recursive main &&
test_path_is_file a/b-2/c/d
'
@@ -74,7 +77,7 @@
test_expect_success 'Handle F/D conflict, do not lose a/b-2/c/d in merge (resolve)' '
git reset --hard &&
- git checkout master^0 &&
+ git checkout main^0 &&
git merge -s resolve baseline^0 &&
test_path_is_file a/b-2/c/d
'
@@ -85,7 +88,7 @@
test_expect_success 'Handle F/D conflict, do not lose a/b-2/c/d in merge (recursive)' '
git reset --hard &&
- git checkout master^0 &&
+ git checkout main^0 &&
git merge -s recursive baseline^0 &&
test_path_is_file a/b-2/c/d
'
@@ -98,7 +101,7 @@
git reset --hard &&
git checkout baseline^0 &&
>a/b/c/e &&
- test_must_fail git merge -s resolve master &&
+ test_must_fail git merge -s resolve main &&
test_path_is_file a/b/c/e &&
test_path_is_file a/b-2/c/d
'
@@ -107,7 +110,7 @@
git reset --hard &&
git checkout baseline^0 &&
>a/b/c/e &&
- test_must_fail git merge -s recursive master &&
+ test_must_fail git merge -s recursive main &&
test_path_is_file a/b/c/e &&
test_path_is_file a/b-2/c/d
'
@@ -116,14 +119,14 @@
git reset --hard &&
git checkout baseline^0 &&
echo more content >>a/b/c/d &&
- test_must_fail git merge -s resolve master
+ test_must_fail git merge -s resolve main
'
test_expect_success 'do not lose modifications in merge (recursive)' '
git reset --hard &&
git checkout baseline^0 &&
echo more content >>a/b/c/d &&
- test_must_fail git merge -s recursive master
+ test_must_fail git merge -s recursive main
'
test_expect_success 'setup a merge where dir a/b-2 changed to symlink' '
diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6416-recursive-corner-cases.sh
similarity index 90%
rename from t/t6036-recursive-corner-cases.sh
rename to t/t6416-recursive-corner-cases.sh
index b3bf462..84f5082 100755
--- a/t/t6036-recursive-corner-cases.sh
+++ b/t/t6416-recursive-corner-cases.sh
@@ -2,7 +2,11 @@
test_description='recursive merge corner cases involving criss-cross merges'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-merge.sh
#
# L1 L2
@@ -384,7 +388,7 @@
test_line_count = 2 out &&
git rev-parse >expect \
- master:file B:file &&
+ main:file B:file &&
git rev-parse >actual \
:1:file :2:file &&
test_cmp expect actual
@@ -406,7 +410,7 @@
test_line_count = 2 out &&
git rev-parse >expect \
- master:file B:file &&
+ main:file B:file &&
git rev-parse >actual \
:1:file :3:file &&
test_cmp expect actual
@@ -452,7 +456,7 @@
#
# 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
@@ -537,9 +541,15 @@
git checkout B^0 &&
test_must_fail git merge C^0 &&
- git clean -fd &&
- git rm -rf a/ &&
- git rm a &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ git rm -rf a/ &&
+ git rm a~HEAD
+ else
+ git clean -fd &&
+ git rm -rf a/ &&
+ git rm a
+ fi &&
git cat-file -p B:a >a2 &&
git add a2 &&
git commit -m D2 &&
@@ -558,7 +568,12 @@
git checkout C^0 &&
test_must_fail git merge B^0 &&
- git clean -fd &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ git rm a~B^0
+ else
+ git clean -fd
+ fi &&
git rm -rf a/ &&
test_write_lines 1 2 3 4 5 6 7 8 >a &&
git add a &&
@@ -567,9 +582,15 @@
git checkout C^0 &&
test_must_fail git merge B^0 &&
- git clean -fd &&
- git rm -rf a/ &&
- git rm a &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ git rm -rf a/ &&
+ git rm a~B^0
+ else
+ git clean -fd &&
+ git rm -rf a/ &&
+ git rm a
+ fi &&
test_write_lines 1 2 3 4 5 6 7 8 >a2 &&
git add a2 &&
git commit -m E4 &&
@@ -587,18 +608,34 @@
test_must_fail git merge -s recursive E1^0 &&
- git ls-files -s >out &&
- test_line_count = 2 out &&
- git ls-files -u >out &&
- test_line_count = 1 out &&
- git ls-files -o >out &&
- test_line_count = 1 out &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ git ls-files -s >out &&
+ test_line_count = 3 out &&
+ git ls-files -u >out &&
+ test_line_count = 2 out &&
+ git ls-files -o >out &&
+ test_line_count = 1 out &&
- git rev-parse >expect \
- A:ignore-me B:a &&
- git rev-parse >actual \
- :0:ignore-me :2:a &&
- test_cmp expect actual
+ git rev-parse >expect \
+ A:ignore-me B:a D1:a &&
+ git rev-parse >actual \
+ :0:ignore-me :1:a :2:a &&
+ test_cmp expect actual
+ else
+ git ls-files -s >out &&
+ test_line_count = 2 out &&
+ git ls-files -u >out &&
+ test_line_count = 1 out &&
+ git ls-files -o >out &&
+ test_line_count = 1 out &&
+
+ git rev-parse >expect \
+ A:ignore-me B:a &&
+ git rev-parse >actual \
+ :0:ignore-me :2:a &&
+ test_cmp expect actual
+ fi
)
'
@@ -612,18 +649,34 @@
test_must_fail git merge -s recursive D1^0 &&
- git ls-files -s >out &&
- test_line_count = 2 out &&
- git ls-files -u >out &&
- test_line_count = 1 out &&
- git ls-files -o >out &&
- test_line_count = 1 out &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ git ls-files -s >out &&
+ test_line_count = 3 out &&
+ git ls-files -u >out &&
+ test_line_count = 2 out &&
+ git ls-files -o >out &&
+ test_line_count = 1 out &&
- git rev-parse >expect \
- A:ignore-me B:a &&
- git rev-parse >actual \
- :0:ignore-me :3:a &&
- test_cmp expect actual
+ git rev-parse >expect \
+ A:ignore-me B:a D1:a &&
+ git rev-parse >actual \
+ :0:ignore-me :1:a :3:a &&
+ test_cmp expect actual
+ else
+ git ls-files -s >out &&
+ test_line_count = 2 out &&
+ git ls-files -u >out &&
+ test_line_count = 1 out &&
+ git ls-files -o >out &&
+ test_line_count = 1 out &&
+
+ git rev-parse >expect \
+ A:ignore-me B:a &&
+ git rev-parse >actual \
+ :0:ignore-me :3:a &&
+ test_cmp expect actual
+ fi
)
'
@@ -637,17 +690,32 @@
test_must_fail git merge -s recursive E2^0 &&
- git ls-files -s >out &&
- test_line_count = 4 out &&
- git ls-files -u >out &&
- test_line_count = 3 out &&
- git ls-files -o >out &&
- test_line_count = 2 out &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ git ls-files -s >out &&
+ test_line_count = 5 out &&
+ git ls-files -u >out &&
+ test_line_count = 4 out &&
+ git ls-files -o >out &&
+ test_line_count = 1 out &&
- git rev-parse >expect \
- B:a E2:a/file C:a/file A:ignore-me &&
- git rev-parse >actual \
- :2:a :3:a/file :1:a/file :0:ignore-me &&
+ git rev-parse >expect \
+ B:a D1:a E2:a/file C:a/file A:ignore-me &&
+ git rev-parse >actual \
+ :1:a~HEAD :2:a~HEAD :3:a/file :1:a/file :0:ignore-me
+ else
+ git ls-files -s >out &&
+ test_line_count = 4 out &&
+ git ls-files -u >out &&
+ test_line_count = 3 out &&
+ git ls-files -o >out &&
+ test_line_count = 2 out &&
+
+ git rev-parse >expect \
+ B:a E2:a/file C:a/file A:ignore-me &&
+ git rev-parse >actual \
+ :2:a :3:a/file :1:a/file :0:ignore-me
+ fi &&
test_cmp expect actual &&
test_path_is_file a~HEAD
@@ -664,17 +732,32 @@
test_must_fail git merge -s recursive D1^0 &&
- git ls-files -s >out &&
- test_line_count = 4 out &&
- git ls-files -u >out &&
- test_line_count = 3 out &&
- git ls-files -o >out &&
- test_line_count = 2 out &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ git ls-files -s >out &&
+ test_line_count = 5 out &&
+ git ls-files -u >out &&
+ test_line_count = 4 out &&
+ git ls-files -o >out &&
+ test_line_count = 1 out &&
- git rev-parse >expect \
- B:a E2:a/file C:a/file A:ignore-me &&
- git rev-parse >actual \
- :3:a :2:a/file :1:a/file :0:ignore-me &&
+ git rev-parse >expect \
+ B:a D1:a E2:a/file C:a/file A:ignore-me &&
+ git rev-parse >actual \
+ :1:a~D1^0 :3:a~D1^0 :2:a/file :1:a/file :0:ignore-me
+ else
+ git ls-files -s >out &&
+ test_line_count = 4 out &&
+ git ls-files -u >out &&
+ test_line_count = 3 out &&
+ git ls-files -o >out &&
+ test_line_count = 2 out &&
+
+ git rev-parse >expect \
+ B:a E2:a/file C:a/file A:ignore-me &&
+ git rev-parse >actual \
+ :3:a :2:a/file :1:a/file :0:ignore-me
+ fi &&
test_cmp expect actual &&
test_path_is_file a~D1^0
@@ -706,7 +789,7 @@
)
'
-test_expect_success 'merge of D1 & E4 notifies user a and a2 are related' '
+test_expect_merge_algorithm failure success 'merge of D1 & E4 puts merge of a and a2 in both a and a2' '
test_when_finished "git -C directory-file reset --hard" &&
test_when_finished "git -C directory-file clean -fdqx" &&
(
@@ -724,7 +807,7 @@
test_line_count = 1 out &&
git rev-parse >expect \
- A:ignore-me B:a D1:a E4:a2 &&
+ A:ignore-me B:a E4:a2 E4:a2 &&
git rev-parse >actual \
:0:ignore-me :1:a~Temporary\ merge\ branch\ 2 :2:a :3:a2 &&
test_cmp expect actual
@@ -1069,7 +1152,7 @@
)
'
-test_expect_failure 'check symlink modify/modify' '
+test_expect_merge_algorithm failure success 'check symlink modify/modify' '
(
cd symlink-modify-modify &&
@@ -1135,7 +1218,7 @@
)
'
-test_expect_failure 'check symlink add/add' '
+test_expect_merge_algorithm failure success 'check symlink add/add' '
(
cd symlink-add-add &&
@@ -1144,7 +1227,7 @@
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 &&
@@ -1223,7 +1306,7 @@
)
'
-test_expect_failure 'check submodule modify/modify' '
+test_expect_merge_algorithm failure success 'check submodule modify/modify' '
(
cd submodule-modify-modify &&
@@ -1311,7 +1394,7 @@
)
'
-test_expect_failure 'check submodule add/add' '
+test_expect_merge_algorithm failure success 'check submodule add/add' '
(
cd submodule-add-add &&
@@ -1386,7 +1469,7 @@
)
'
-test_expect_failure 'check conflicting entry types (submodule vs symlink)' '
+test_expect_merge_algorithm failure success 'check conflicting entry types (submodule vs symlink)' '
(
cd submodule-symlink-add-add &&
@@ -1473,12 +1556,12 @@
# Setup:
# L1---L2
# / \ / \
-# master X ?
+# main X ?
# \ / \ /
# R1---R2
#
# Where:
-# master has two files, named 'b' and 'a'
+# main has two files, named 'b' and 'a'
# branches L1 and R1 both modify each of the two files in conflicting ways
#
# L2 is a merge of R1 into L1; more on it later.
@@ -1583,7 +1666,7 @@
cd nested_conflicts &&
git clean -f &&
- MASTER=$(git rev-parse --short master) &&
+ MAIN=$(git rev-parse --short main) &&
git checkout L2^0 &&
# Merge must fail; there is a conflict
@@ -1599,24 +1682,24 @@
test_line_count = 1 out &&
# Create a and b from virtual merge base X
- git cat-file -p master:a >base &&
+ git cat-file -p main:a >base &&
git cat-file -p L1:a >ours &&
git cat-file -p R1:a >theirs &&
test_must_fail git merge-file --diff3 \
-L "Temporary merge branch 1" \
- -L "$MASTER" \
+ -L "$MAIN" \
-L "Temporary merge branch 2" \
ours \
base \
theirs &&
sed -e "s/^\([<|=>]\)/\1\1/" ours >vmb_a &&
- git cat-file -p master:b >base &&
+ git cat-file -p main:b >base &&
git cat-file -p L1:b >ours &&
git cat-file -p R1:b >theirs &&
test_must_fail git merge-file --diff3 \
-L "Temporary merge branch 1" \
- -L "$MASTER" \
+ -L "$MAIN" \
-L "Temporary merge branch 2" \
ours \
base \
@@ -1668,12 +1751,12 @@
# Setup:
# L1---L2---L3
# / \ / \ / \
-# master X1 X2 ?
+# main X1 X2 ?
# \ / \ / \ /
# R1---R2---R3
#
# Where:
-# master has one file named 'content'
+# main has one file named 'content'
# branches L1 and R1 both modify each of the two files in conflicting ways
#
# L<n> (n>1) is a merge of R<n-1> into L<n-1>
@@ -1754,7 +1837,7 @@
(
cd virtual_merge_base_has_nested_conflicts &&
- MASTER=$(git rev-parse --short master) &&
+ MAIN=$(git rev-parse --short main) &&
git checkout L3^0 &&
# Merge must fail; there is a conflict
@@ -1777,13 +1860,13 @@
# Imitate X1 merge base, except without long enough conflict
# markers because a subsequent sed will modify them. Put
# result into vmb.
- git cat-file -p master:content >base &&
+ git cat-file -p main:content >base &&
git cat-file -p L:content >left &&
git cat-file -p R:content >right &&
cp left merged-once &&
test_must_fail git merge-file --diff3 \
-L "Temporary merge branch 1" \
- -L "$MASTER" \
+ -L "$MAIN" \
-L "Temporary merge branch 2" \
merged-once \
base \
diff --git a/t/t6037-merge-ours-theirs.sh b/t/t6417-merge-ours-theirs.sh
similarity index 75%
rename from t/t6037-merge-ours-theirs.sh
rename to t/t6417-merge-ours-theirs.sh
index 0aebc6c..ac9aee9 100755
--- a/t/t6037-merge-ours-theirs.sh
+++ b/t/t6417-merge-ours-theirs.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='Merge-recursive ours and theirs variants'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
@@ -20,11 +23,11 @@
sed -e "s/9/nueve/" >file <elif &&
git commit -a -m theirs &&
- git checkout master^0
+ git checkout main^0
'
test_expect_success 'plain recursive - should conflict' '
- git reset --hard master &&
+ git reset --hard main &&
test_must_fail git merge -s recursive side &&
grep nine file &&
grep nueve file &&
@@ -34,7 +37,7 @@
'
test_expect_success 'recursive favouring theirs' '
- git reset --hard master &&
+ git reset --hard main &&
git merge -s recursive -Xtheirs side &&
! grep nine file &&
grep nueve file &&
@@ -44,7 +47,7 @@
'
test_expect_success 'recursive favouring ours' '
- git reset --hard master &&
+ git reset --hard main &&
git merge -s recursive -X ours side &&
grep nine file &&
! grep nueve file &&
@@ -56,26 +59,26 @@
test_expect_success 'binary file with -Xours/-Xtheirs' '
echo file binary >.gitattributes &&
- git reset --hard master &&
+ git reset --hard main &&
git merge -s recursive -X theirs side &&
git diff --exit-code side HEAD -- file &&
- git reset --hard master &&
+ git reset --hard main &&
git merge -s recursive -X ours side &&
- git diff --exit-code master HEAD -- file
+ git diff --exit-code main HEAD -- file
'
test_expect_success 'pull passes -X to underlying merge' '
- git reset --hard master && git pull -s recursive -Xours . side &&
- git reset --hard master && git pull -s recursive -X ours . side &&
- git reset --hard master && git pull -s recursive -Xtheirs . side &&
- git reset --hard master && git pull -s recursive -X theirs . side &&
- git reset --hard master && test_must_fail git pull -s recursive -X bork . side
+ git reset --hard main && git pull -s recursive -Xours . side &&
+ git reset --hard main && git pull -s recursive -X ours . side &&
+ git reset --hard main && git pull -s recursive -Xtheirs . side &&
+ git reset --hard main && git pull -s recursive -X theirs . side &&
+ git reset --hard main && test_must_fail git pull -s recursive -X bork . side
'
test_expect_success SYMLINKS 'symlink with -Xours/-Xtheirs' '
- git reset --hard master &&
- git checkout -b two master &&
+ git reset --hard main &&
+ git checkout -b two main &&
ln -s target-zero link &&
git add link &&
git commit -m "add link pointing to zero" &&
diff --git a/t/t6038-merge-text-auto.sh b/t/t6418-merge-text-auto.sh
similarity index 85%
rename from t/t6038-merge-text-auto.sh
rename to t/t6418-merge-text-auto.sh
index 5e8d5fa..1e0296d 100755
--- a/t/t6038-merge-text-auto.sh
+++ b/t/t6418-merge-text-auto.sh
@@ -2,16 +2,19 @@
test_description='CRLF merge conflict across text=auto change
-* [master] remove .gitattributes
+* [main] remove .gitattributes
! [side] add line from b
--
+ [side] add line from b
-* [master] remove .gitattributes
-* [master^] add line from a
-* [master~2] normalize file
+* [main] remove .gitattributes
+* [main^] add line from a
+* [main~2] normalize file
*+ [side^] Initial
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_have_prereq SED_STRIPS_CR && SED_OPTIONS=-b
@@ -64,7 +67,7 @@
git commit -m "add line from b" &&
git tag b &&
- git checkout master
+ git checkout main
'
test_expect_success 'set up fuzz_conflict() helper' '
@@ -158,7 +161,7 @@
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 +171,12 @@
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 +186,9 @@
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' '
@@ -209,9 +198,10 @@
git reset --hard initial &&
git rm file &&
git commit -m "remove file" &&
- git checkout master &&
+ git checkout main &&
git reset --hard a^ &&
- git merge side
+ git merge side &&
+ test_path_is_missing file
'
test_done
diff --git a/t/t6039-merge-ignorecase.sh b/t/t6419-merge-ignorecase.sh
similarity index 84%
rename from t/t6039-merge-ignorecase.sh
rename to t/t6419-merge-ignorecase.sh
index 531850d..b64b75a 100755
--- a/t/t6039-merge-ignorecase.sh
+++ b/t/t6419-merge-ignorecase.sh
@@ -2,6 +2,9 @@
test_description='git-merge with case-changing rename on case-insensitive file system'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
if ! test_have_prereq CASE_INSENSITIVE_FS
@@ -20,18 +23,18 @@
>foo &&
git add foo &&
git commit -m "intervening commit" &&
- git checkout master &&
+ git checkout main &&
git rm TestCase &&
>testcase &&
git add testcase &&
git commit -m "rename to testcase" &&
git checkout with-camel &&
- git merge master -m "merge" &&
+ git merge main -m "merge" &&
test_path_is_file testcase
'
test_expect_success 'merge with case-changing rename on both sides' '
- git checkout master &&
+ git checkout main &&
git reset --hard baseline &&
git branch -D with-camel &&
git checkout -b with-camel &&
@@ -40,13 +43,13 @@
>foo &&
git add foo &&
git commit -m "intervening commit" &&
- git checkout master &&
+ git checkout main &&
git rm TestCase &&
>testcase &&
git add testcase &&
git commit -m "rename to testcase" &&
git checkout with-camel &&
- git merge master -m "merge" &&
+ git merge main -m "merge" &&
test_path_is_file testcase
'
diff --git a/t/t6042-merge-rename-corner-cases.sh b/t/t6422-merge-rename-corner-cases.sh
similarity index 87%
rename from t/t6042-merge-rename-corner-cases.sh
rename to t/t6422-merge-rename-corner-cases.sh
index b047cf1..bf4ce3c 100755
--- a/t/t6042-merge-rename-corner-cases.sh
+++ b/t/t6422-merge-rename-corner-cases.sh
@@ -3,7 +3,11 @@
test_description="recursive merge corner cases w/ renames but not criss-crosses"
# t6036 has corner cases that involve both criss-cross merges and renames
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-merge.sh
test_setup_rename_delete_untracked () {
test_create_repo rename-delete-untracked &&
@@ -312,15 +316,18 @@
git ls-files -u >out &&
test_line_count = 1 out &&
git ls-files -o >out &&
- test_line_count = 2 out &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ test_line_count = 1 out
+ else
+ test_line_count = 2 out
+ fi &&
echo 0 >expect &&
git cat-file -p base:file >>expect &&
echo 7 >>expect &&
test_cmp expect newfile~HEAD &&
- test $(git rev-parse :2:newfile) = $(git hash-object expect) &&
-
test_path_is_file newfile/realfile &&
test_path_is_file newfile~HEAD
)
@@ -343,7 +350,12 @@
git ls-files -u >out &&
test_line_count = 3 out &&
git ls-files -o >out &&
- test_line_count = 2 out &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ test_line_count = 1 out
+ else
+ test_line_count = 2 out
+ fi &&
git cat-file -p left-conflict:newfile >left &&
git cat-file -p base:file >base &&
@@ -355,10 +367,16 @@
left base right &&
test_cmp left newfile~HEAD &&
- git rev-parse >expect \
- base:file left-conflict:newfile right:file &&
- git rev-parse >actual \
- :1:newfile :2:newfile :3:newfile &&
+ git rev-parse >expect \
+ base:file left-conflict:newfile right:file &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ git rev-parse >actual \
+ :1:newfile~HEAD :2:newfile~HEAD :3:newfile~HEAD
+ else
+ git rev-parse >actual \
+ :1:newfile :2:newfile :3:newfile
+ fi &&
test_cmp expect actual &&
test_path_is_file newfile/realfile &&
@@ -457,7 +475,7 @@
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 &&
@@ -503,7 +521,7 @@
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 &&
@@ -583,7 +601,7 @@
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 &&
@@ -878,7 +896,7 @@
)
}
-test_expect_failure 'rad-check: rename/add/delete conflict' '
+test_expect_merge_algorithm failure success 'rad-check: rename/add/delete conflict' '
test_setup_rad &&
(
cd rad &&
@@ -886,12 +904,17 @@
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 &&
@@ -899,14 +922,14 @@
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.
@@ -946,7 +969,7 @@
)
}
-test_expect_failure 'rrdd-check: rename/rename(2to1)/delete/delete conflict' '
+test_expect_merge_algorithm failure success 'rrdd-check: rename/rename(2to1)/delete/delete conflict' '
test_setup_rrdd &&
(
cd rrdd &&
@@ -954,11 +977,17 @@
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 &&
@@ -967,15 +996,15 @@
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.
@@ -1029,7 +1058,7 @@
)
}
-test_expect_failure 'mod6-check: chains of rename/rename(1to2) and rename/rename(2to1)' '
+test_expect_merge_algorithm failure success 'mod6-check: chains of rename/rename(1to2) and rename/rename(2to1)' '
test_setup_mod6 &&
(
cd mod6 &&
@@ -1042,25 +1071,25 @@
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 \
@@ -1075,6 +1104,7 @@
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 &&
@@ -1103,7 +1133,7 @@
# Setup:
# L
# / \
- # master ?
+ # main ?
# \ /
# R
#
@@ -1233,7 +1263,7 @@
:2:three \
:3:three &&
git rev-parse >expected \
- master:irrelevant_file \
+ main:irrelevant_file \
file_v2 \
file_v4 &&
test_cmp expected actual &&
@@ -1263,12 +1293,12 @@
# Setup:
# L
# / \
-# master ?
+# main ?
# \ /
# R
#
# Where:
-# master has two files, named 'one' and 'two'.
+# main has two files, named 'one' and 'two'.
# branches L and R both modify 'one', in conflicting ways.
# branches L and R both modify 'two', in conflicting ways.
# branch L also renames 'one' to 'three'.
@@ -1349,7 +1379,7 @@
test_line_count = 1 out &&
# Compare :2:three to expected values
- git cat-file -p master:one >base &&
+ git cat-file -p main:one >base &&
git cat-file -p L:three >ours &&
git cat-file -p R:one >theirs &&
test_must_fail git merge-file \
@@ -1360,7 +1390,7 @@
test_cmp expect L-three &&
# Compare :2:three to expected values
- git cat-file -p master:two >base &&
+ git cat-file -p main:two >base &&
git cat-file -p L:two >ours &&
git cat-file -p R:three >theirs &&
test_must_fail git merge-file \
@@ -1379,4 +1409,59 @@
)
'
+# 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/t/t6043-merge-rename-directories.sh b/t/t6423-merge-rename-directories.sh
similarity index 77%
rename from t/t6043-merge-rename-directories.sh
rename to t/t6423-merge-rename-directories.sh
index 83792c5..5d3b711 100755
--- a/t/t6043-merge-rename-directories.sh
+++ b/t/t6423-merge-rename-directories.sh
@@ -26,6 +26,7 @@
# files that might be renamed into each other's paths.)
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-merge.sh
###########################################################################
@@ -275,7 +276,7 @@
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 &&
@@ -301,11 +302,20 @@
git cat-file -p :2:x/wham >expect &&
git cat-file -p :3:x/wham >other &&
>empty &&
- test_must_fail git merge-file \
- -L "HEAD" \
- -L "" \
- -L "B^0" \
- expect empty other &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ test_must_fail git merge-file \
+ -L "HEAD:y/wham" \
+ -L "" \
+ -L "B^0:z/wham" \
+ expect empty other
+ else
+ test_must_fail git merge-file \
+ -L "HEAD" \
+ -L "" \
+ -L "B^0" \
+ expect empty other
+ fi &&
test_cmp expect x/wham
)
'
@@ -1176,10 +1186,18 @@
git ls-files -u >out &&
test_line_count = 1 out &&
git ls-files -o >out &&
- test_line_count = 2 out &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ test_line_count = 1 out &&
- git rev-parse >actual \
- :0:y/b :0:y/c :0:z/d :0:y/f :2:y/d :0:y/d/e &&
+ git rev-parse >actual \
+ :0:y/b :0:y/c :0:z/d :0:y/f :2:y/d~HEAD :0:y/d/e
+ else
+ test_line_count = 2 out &&
+
+ git rev-parse >actual \
+ :0:y/b :0:y/c :0:z/d :0:y/f :2:y/d :0:y/d/e
+ fi &&
git rev-parse >expect \
O:z/b O:z/c B:z/d B:z/f A:y/d B:y/d/e &&
test_cmp expect actual &&
@@ -1262,35 +1280,144 @@
test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
test_i18ngrep "CONFLICT (rename/delete).*z/c.*y/c" out &&
- git ls-files -s >out &&
- test_line_count = 2 out &&
- git ls-files -u >out &&
- test_line_count = 1 out &&
- git ls-files -o >out &&
- test_line_count = 1 out &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ git ls-files -s >out &&
+ test_line_count = 3 out &&
+ git ls-files -u >out &&
+ test_line_count = 2 out &&
+ git ls-files -o >out &&
+ test_line_count = 1 out &&
- git rev-parse >actual \
- :0:y/b :3:y/c &&
- git rev-parse >expect \
- O:z/b O:z/c &&
+ git rev-parse >actual \
+ :0:y/b :1:y/c :3:y/c &&
+ git rev-parse >expect \
+ O:z/b O:z/c O:z/c
+ else
+ git ls-files -s >out &&
+ test_line_count = 2 out &&
+ git ls-files -u >out &&
+ test_line_count = 1 out &&
+ git ls-files -o >out &&
+ test_line_count = 1 out &&
+
+ git rev-parse >actual \
+ :0:y/b :3:y/c &&
+ git rev-parse >expect \
+ O:z/b O:z/c
+ fi &&
test_cmp expect actual
)
'
-# Testcase 6b, Same rename done on both sides
+# Testcase 6b1, Same rename done on both sides
+# (Related to testcase 6b2 and 8e)
+# Commit O: z/{b,c,d,e}
+# Commit A: y/{b,c,d}, x/e
+# Commit B: y/{b,c,d}, z/{e,f}
+# Expected: y/{b,c,d,f}, x/e
+# Note: Directory rename detection says A renamed z/ -> y/ (3 paths renamed
+# to y/ and only 1 renamed to x/), therefore the new file 'z/f' in B
+# should be moved to 'y/f'.
+#
+# This is a bit of an edge case where any behavior might surprise users,
+# whether that is treating A as renaming z/ -> y/, treating A as renaming
+# z/ -> x/, or treating A as not doing any directory rename. However, I
+# think this answer is the least confusing and most consistent with the
+# rules elsewhere.
+#
+# A note about z/ -> x/, since it may not be clear how that could come
+# about: If we were to ignore files renamed by both sides
+# (i.e. z/{b,c,d}), as directory rename detection did in git-2.18 thru
+# at least git-2.28, then we would note there are no renames from z/ to
+# y/ and one rename from z/ to x/ and thus come to the conclusion that
+# A renamed z/ -> x/. This seems more confusing for end users than a
+# rename of z/ to y/, it makes directory rename detection behavior
+# harder for them to predict. As such, we modified the rule, changed
+# the behavior on testcases 6b2 and 8e, and introduced this 6b1 testcase.
+
+test_setup_6b1 () {
+ test_create_repo 6b1 &&
+ (
+ cd 6b1 &&
+
+ mkdir z &&
+ echo b >z/b &&
+ echo c >z/c &&
+ echo d >z/d &&
+ echo e >z/e &&
+ git add z &&
+ test_tick &&
+ git commit -m "O" &&
+
+ git branch O &&
+ git branch A &&
+ git branch B &&
+
+ git checkout A &&
+ git mv z y &&
+ mkdir x &&
+ git mv y/e x/e &&
+ test_tick &&
+ git commit -m "A" &&
+
+ git checkout B &&
+ git mv z y &&
+ mkdir z &&
+ git mv y/e z/e &&
+ echo f >z/f &&
+ git add z/f &&
+ test_tick &&
+ git commit -m "B"
+ )
+}
+
+test_expect_merge_algorithm failure success '6b1: Same renames done on both sides, plus another rename' '
+ test_setup_6b1 &&
+ (
+ cd 6b1 &&
+
+ git checkout A^0 &&
+
+ git -c merge.directoryRenames=true merge -s recursive B^0 &&
+
+ git ls-files -s >out &&
+ test_line_count = 5 out &&
+ git ls-files -u >out &&
+ test_line_count = 0 out &&
+ git ls-files -o >out &&
+ test_line_count = 1 out &&
+
+ git rev-parse >actual \
+ HEAD:y/b HEAD:y/c HEAD:y/d HEAD:x/e HEAD:y/f &&
+ git rev-parse >expect \
+ O:z/b O:z/c O:z/d O:z/e B:z/f &&
+ test_cmp expect actual
+ )
+'
+
+# Testcase 6b2, Same rename done on both sides
# (Related to testcases 6c and 8e)
# Commit O: z/{b,c}
# Commit A: y/{b,c}
# Commit B: y/{b,c}, z/d
-# Expected: y/{b,c}, z/d
-# Note: If we did directory rename detection here, we'd move z/d into y/,
-# 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.
+# Expected: y/{b,c,d}
+# Alternate: y/{b,c}, z/d
+# Note: Directory rename detection says A renamed z/ -> y/, therefore the new
+# file 'z/d' in B should be moved to 'y/d'.
+#
+# We could potentially ignore the renames of z/{b,c} on side A since
+# those were renamed on both sides. However, it's a bit of a corner
+# case because what if there was also a z/e that side A moved to x/e
+# and side B left alone? If we used the "ignore renames done on both
+# sides" logic, then we'd compute that A renamed z/ -> x/, and move
+# z/d to x/d. That seems more surprising and uglier than allowing
+# the z/ -> y/ rename.
-test_setup_6b () {
- test_create_repo 6b &&
+test_setup_6b2 () {
+ test_create_repo 6b2 &&
(
- cd 6b &&
+ cd 6b2 &&
mkdir z &&
echo b >z/b &&
@@ -1318,10 +1445,10 @@
)
}
-test_expect_success '6b: Same rename done on both sides' '
- test_setup_6b &&
+test_expect_merge_algorithm failure success '6b2: Same rename done on both sides' '
+ test_setup_6b2 &&
(
- cd 6b &&
+ cd 6b2 &&
git checkout A^0 &&
@@ -1335,7 +1462,7 @@
test_line_count = 1 out &&
git rev-parse >actual \
- HEAD:y/b HEAD:y/c HEAD:z/d &&
+ HEAD:y/b HEAD:y/c HEAD:y/d &&
git rev-parse >expect \
O:z/b O:z/c B:z/d &&
test_cmp expect actual
@@ -1343,7 +1470,7 @@
'
# Testcase 6c, Rename only done on same side
-# (Related to testcases 6b and 8e)
+# (Related to testcases 6b1, 6b2, and 8e)
# Commit O: z/{b,c}
# Commit A: z/{b,c} (no change)
# Commit B: y/{b,c}, z/d
@@ -1686,7 +1813,7 @@
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 &&
@@ -1705,11 +1832,20 @@
git cat-file -p :2:y/d >expect &&
git cat-file -p :3:y/d >other &&
>empty &&
- test_must_fail git merge-file \
- -L "HEAD" \
- -L "" \
- -L "B^0" \
- expect empty other &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ test_must_fail git merge-file \
+ -L "HEAD:y/d" \
+ -L "" \
+ -L "B^0:z/d" \
+ expect empty other
+ else
+ test_must_fail git merge-file \
+ -L "HEAD" \
+ -L "" \
+ -L "B^0" \
+ expect empty other
+ fi &&
test_cmp expect y/d
)
'
@@ -1831,17 +1967,32 @@
test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
test_i18ngrep "CONFLICT (rename/delete).*x/d.*y/d" out &&
- git ls-files -s >out &&
- test_line_count = 3 out &&
- git ls-files -u >out &&
- test_line_count = 1 out &&
- git ls-files -o >out &&
- test_line_count = 1 out &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ git ls-files -s >out &&
+ test_line_count = 4 out &&
+ git ls-files -u >out &&
+ test_line_count = 2 out &&
+ git ls-files -o >out &&
+ test_line_count = 1 out &&
- git rev-parse >actual \
- :0:y/b :0:y/c :3:y/d &&
- git rev-parse >expect \
- O:z/b O:z/c O:x/d &&
+ git rev-parse >actual \
+ :0:y/b :0:y/c :1:y/d :3:y/d &&
+ git rev-parse >expect \
+ O:z/b O:z/c O:x/d O:x/d
+ else
+ git ls-files -s >out &&
+ test_line_count = 3 out &&
+ git ls-files -u >out &&
+ test_line_count = 1 out &&
+ git ls-files -o >out &&
+ test_line_count = 1 out &&
+
+ git rev-parse >actual \
+ :0:y/b :0:y/c :3:y/d &&
+ git rev-parse >expect \
+ O:z/b O:z/c O:x/d
+ fi &&
test_cmp expect actual
)
'
@@ -1922,17 +2073,32 @@
test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
test_i18ngrep "CONFLICT (rename/delete).*x/d.*y/d" out &&
- git ls-files -s >out &&
- test_line_count = 5 out &&
- git ls-files -u >out &&
- test_line_count = 1 out &&
- git ls-files -o >out &&
- test_line_count = 2 out &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ git ls-files -s >out &&
+ test_line_count = 6 out &&
+ git ls-files -u >out &&
+ test_line_count = 2 out &&
+ git ls-files -o >out &&
+ test_line_count = 1 out &&
- git rev-parse >actual \
- :0:x/d/f :0:y/d/g :0:y/b :0:y/c :3:y/d &&
- git rev-parse >expect \
- A:x/d/f A:y/d/g O:z/b O:z/c O:x/d &&
+ git rev-parse >actual \
+ :0:x/d/f :0:y/d/g :0:y/b :0:y/c :1:y/d~B^0 :3:y/d~B^0 &&
+ git rev-parse >expect \
+ A:x/d/f A:y/d/g O:z/b O:z/c O:x/d O:x/d
+ else
+ git ls-files -s >out &&
+ test_line_count = 5 out &&
+ git ls-files -u >out &&
+ test_line_count = 1 out &&
+ git ls-files -o >out &&
+ test_line_count = 2 out &&
+
+ git rev-parse >actual \
+ :0:x/d/f :0:y/d/g :0:y/b :0:y/c :3:y/d &&
+ git rev-parse >expect \
+ A:x/d/f A:y/d/g O:z/b O:z/c O:x/d
+ fi &&
test_cmp expect actual &&
git hash-object y/d~B^0 >actual &&
@@ -2260,24 +2426,31 @@
# 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. This is much like testcase 6b2 (where commit B moves all
+# the original paths out of z/ but opted to keep d within z/).
#
-# 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.
+# It was not clear in the past what should be done with this testcase;
+# in fact, I noted that I "just picked one" previously. However,
+# following the new logic for testcase 6b2, we should take the rename
+# and move z/d to y/d.
+#
+# 6b1, 6b2, and this case are definitely somewhat fuzzy in terms of
+# whether they are optimal for end users, but (a) the default for
+# directory rename detection is to mark these all as conflicts
+# anyway, (b) it feels like this is less prone to higher order corner
+# case confusion, and (c) the current algorithm requires less global
+# knowledge (i.e. less coupling in the algorithm between renames done
+# on both sides) which thus means users are better able to predict
+# the behavior, and predict it without computing as many details.
test_setup_8e () {
test_create_repo 8e &&
@@ -2732,7 +2905,7 @@
)
}
-test_expect_success C_LOCALE_OUTPUT '9e: N-to-1 whammo' '
+test_expect_success '9e: N-to-1 whammo' '
test_setup_9e &&
(
cd 9e &&
@@ -2844,6 +3017,14 @@
# Commit A: priority/{alpha,bravo}/$more_files
# Commit B: goal/{a,b}/$more_files, goal/c
# Expected: priority/{alpha,bravo}/$more_files, priority/c
+# 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 &&
@@ -2880,6 +3061,7 @@
}
test_expect_failure '9g: Renamed directory that only contained immediate subdirs, immediate subdirs renamed' '
+ test_setup_9g &&
(
cd 9g &&
@@ -3032,6 +3214,7 @@
echo important >z/d &&
test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
+ test_path_is_missing .git/MERGE_HEAD &&
test_i18ngrep "The following untracked working tree files would be overwritten by merge" err &&
git ls-files -s >out &&
@@ -3101,21 +3284,34 @@
echo contents >y/e &&
test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
- test_i18ngrep "CONFLICT (rename/delete).*Version B\^0 of y/d left in tree at y/d~B\^0" out &&
- test_i18ngrep "Error: Refusing to lose untracked file at y/e; writing to y/e~B\^0 instead" out &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ test_path_is_missing .git/MERGE_HEAD &&
+ test_i18ngrep "error: The following untracked working tree files would be overwritten by merge" err &&
- git ls-files -s >out &&
- test_line_count = 3 out &&
- git ls-files -u >out &&
- test_line_count = 2 out &&
- git ls-files -o >out &&
- test_line_count = 5 out &&
+ git ls-files -s >out &&
+ test_line_count = 1 out &&
+ git ls-files -u >out &&
+ test_line_count = 0 out &&
+ git ls-files -o >out &&
+ test_line_count = 5 out
+ else
+ test_i18ngrep "CONFLICT (rename/delete).*Version B\^0 of y/d left in tree at y/d~B\^0" out &&
+ test_i18ngrep "Error: Refusing to lose untracked file at y/e; writing to y/e~B\^0 instead" out &&
- git rev-parse >actual \
- :0:y/b :3:y/d :3:y/e &&
- git rev-parse >expect \
- O:z/b O:z/c B:z/e &&
- test_cmp expect actual &&
+ git ls-files -s >out &&
+ test_line_count = 3 out &&
+ git ls-files -u >out &&
+ test_line_count = 2 out &&
+ git ls-files -o >out &&
+ test_line_count = 5 out &&
+
+ git rev-parse >actual \
+ :0:y/b :3:y/d :3:y/e &&
+ git rev-parse >expect \
+ O:z/b O:z/c B:z/e &&
+ test_cmp expect actual
+ fi &&
echo very >expect &&
test_cmp expect y/c &&
@@ -3178,25 +3374,38 @@
echo important >y/c &&
test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
- test_i18ngrep "CONFLICT (rename/rename)" out &&
- test_i18ngrep "Refusing to lose untracked file at y/c; adding as y/c~B\^0 instead" out &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ test_path_is_missing .git/MERGE_HEAD &&
+ test_i18ngrep "error: The following untracked working tree files would be overwritten by merge" err &&
- git ls-files -s >out &&
- test_line_count = 6 out &&
- git ls-files -u >out &&
- test_line_count = 3 out &&
- git ls-files -o >out &&
- test_line_count = 3 out &&
+ git ls-files -s >out &&
+ test_line_count = 4 out &&
+ git ls-files -u >out &&
+ test_line_count = 0 out &&
+ git ls-files -o >out &&
+ test_line_count = 3 out
+ else
+ test_i18ngrep "CONFLICT (rename/rename)" out &&
+ test_i18ngrep "Refusing to lose untracked file at y/c; adding as y/c~B\^0 instead" out &&
- git rev-parse >actual \
- :0:y/a :0:y/b :0:x/d :1:x/c :2:w/c :3:y/c &&
- git rev-parse >expect \
- O:z/a O:z/b O:x/d O:x/c O:x/c O:x/c &&
- test_cmp expect actual &&
+ git ls-files -s >out &&
+ test_line_count = 6 out &&
+ git ls-files -u >out &&
+ test_line_count = 3 out &&
+ git ls-files -o >out &&
+ test_line_count = 3 out &&
- git hash-object y/c~B^0 >actual &&
- git rev-parse O:x/c >expect &&
- test_cmp expect actual &&
+ git rev-parse >actual \
+ :0:y/a :0:y/b :0:x/d :1:x/c :2:w/c :3:y/c &&
+ git rev-parse >expect \
+ O:z/a O:z/b O:x/d O:x/c O:x/c O:x/c &&
+ test_cmp expect actual &&
+
+ git hash-object y/c~B^0 >actual &&
+ git rev-parse O:x/c >expect &&
+ test_cmp expect actual
+ fi &&
echo important >expect &&
test_cmp expect y/c
@@ -3216,25 +3425,38 @@
echo important >y/c &&
test_must_fail git -c merge.directoryRenames=true merge -s recursive A^0 >out 2>err &&
- test_i18ngrep "CONFLICT (rename/rename)" out &&
- test_i18ngrep "Refusing to lose untracked file at y/c; adding as y/c~HEAD instead" out &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ test_path_is_missing .git/MERGE_HEAD &&
+ test_i18ngrep "error: The following untracked working tree files would be overwritten by merge" err &&
- git ls-files -s >out &&
- test_line_count = 6 out &&
- git ls-files -u >out &&
- test_line_count = 3 out &&
- git ls-files -o >out &&
- test_line_count = 3 out &&
+ git ls-files -s >out &&
+ test_line_count = 4 out &&
+ git ls-files -u >out &&
+ test_line_count = 0 out &&
+ git ls-files -o >out &&
+ test_line_count = 3 out
+ else
+ test_i18ngrep "CONFLICT (rename/rename)" out &&
+ test_i18ngrep "Refusing to lose untracked file at y/c; adding as y/c~HEAD instead" out &&
- git rev-parse >actual \
- :0:y/a :0:y/b :0:x/d :1:x/c :3:w/c :2:y/c &&
- git rev-parse >expect \
- O:z/a O:z/b O:x/d O:x/c O:x/c O:x/c &&
- test_cmp expect actual &&
+ git ls-files -s >out &&
+ test_line_count = 6 out &&
+ git ls-files -u >out &&
+ test_line_count = 3 out &&
+ git ls-files -o >out &&
+ test_line_count = 3 out &&
- git hash-object y/c~HEAD >actual &&
- git rev-parse O:x/c >expect &&
- test_cmp expect actual &&
+ git rev-parse >actual \
+ :0:y/a :0:y/b :0:x/d :1:x/c :3:w/c :2:y/c &&
+ git rev-parse >expect \
+ O:z/a O:z/b O:x/d O:x/c O:x/c O:x/c &&
+ test_cmp expect actual &&
+
+ git hash-object y/c~HEAD >actual &&
+ git rev-parse O:x/c >expect &&
+ test_cmp expect actual
+ fi &&
echo important >expect &&
test_cmp expect y/c
@@ -3292,37 +3514,50 @@
echo important >y/wham &&
test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
- test_i18ngrep "CONFLICT (rename/rename)" out &&
- test_i18ngrep "Refusing to lose untracked file at y/wham" out &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ test_path_is_missing .git/MERGE_HEAD &&
+ test_i18ngrep "error: The following untracked working tree files would be overwritten by merge" err &&
- git ls-files -s >out &&
- test_line_count = 6 out &&
- git ls-files -u >out &&
- test_line_count = 2 out &&
- git ls-files -o >out &&
- test_line_count = 3 out &&
+ git ls-files -s >out &&
+ test_line_count = 6 out &&
+ git ls-files -u >out &&
+ test_line_count = 0 out &&
+ git ls-files -o >out &&
+ test_line_count = 3 out
+ else
+ test_i18ngrep "CONFLICT (rename/rename)" out &&
+ test_i18ngrep "Refusing to lose untracked file at y/wham" out &&
- git rev-parse >actual \
- :0:y/a :0:y/b :0:y/d :0:y/e :2:y/wham :3:y/wham &&
- git rev-parse >expect \
- O:z/a O:z/b O:x/d O:x/e O:z/c O:x/f &&
- test_cmp expect actual &&
+ git ls-files -s >out &&
+ test_line_count = 6 out &&
+ git ls-files -u >out &&
+ test_line_count = 2 out &&
+ git ls-files -o >out &&
+ test_line_count = 3 out &&
- test_must_fail git rev-parse :1:y/wham &&
+ git rev-parse >actual \
+ :0:y/a :0:y/b :0:y/d :0:y/e :2:y/wham :3:y/wham &&
+ git rev-parse >expect \
+ O:z/a O:z/b O:x/d O:x/e O:z/c O:x/f &&
+ test_cmp expect actual &&
+
+ test_must_fail git rev-parse :1:y/wham &&
+
+ # Test that two-way merge in y/wham~merged is as expected
+ git cat-file -p :2:y/wham >expect &&
+ git cat-file -p :3:y/wham >other &&
+ >empty &&
+ test_must_fail git merge-file \
+ -L "HEAD" \
+ -L "" \
+ -L "B^0" \
+ expect empty other &&
+ test_cmp expect y/wham~merged
+ fi &&
echo important >expect &&
- test_cmp expect y/wham &&
-
- # Test that the two-way merge in y/wham~merged is as expected
- git cat-file -p :2:y/wham >expect &&
- git cat-file -p :3:y/wham >other &&
- >empty &&
- test_must_fail git merge-file \
- -L "HEAD" \
- -L "" \
- -L "B^0" \
- expect empty other &&
- test_cmp expect y/wham~merged
+ test_cmp expect y/wham
)
'
@@ -3361,7 +3596,8 @@
)
}
-test_expect_failure '10e: Does git complain about untracked file that is not really in the way?' '
+test_expect_merge_algorithm failure success '10e: Does git complain about untracked file that is not really in the way?' '
+ test_setup_10e &&
(
cd 10e &&
@@ -3451,28 +3687,35 @@
echo stuff >>z/c &&
test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
- test_i18ngrep "Refusing to lose dirty file at z/c" out &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ test_path_is_missing .git/MERGE_HEAD &&
+ test_i18ngrep "error: Your local changes to the following files would be overwritten by merge" err
+ else
+ test_i18ngrep "Refusing to lose dirty file at z/c" out &&
+
+ git ls-files -s >out &&
+ test_line_count = 2 out &&
+ git ls-files -u >out &&
+ test_line_count = 1 out &&
+ git ls-files -o >out &&
+ test_line_count = 3 out &&
+
+ git rev-parse >actual \
+ :0:z/a :2:z/c &&
+ git rev-parse >expect \
+ O:z/a B:z/b &&
+ test_cmp expect actual &&
+
+ git hash-object z/c~HEAD >actual &&
+ git rev-parse B:z/b >expect &&
+ test_cmp expect actual
+ fi &&
test_seq 1 10 >expected &&
echo stuff >>expected &&
- test_cmp expected z/c &&
+ test_cmp expected z/c
- git ls-files -s >out &&
- test_line_count = 2 out &&
- git ls-files -u >out &&
- test_line_count = 1 out &&
- git ls-files -o >out &&
- test_line_count = 4 out &&
-
- git rev-parse >actual \
- :0:z/a :2:z/c &&
- git rev-parse >expect \
- O:z/a B:z/b &&
- test_cmp expect actual &&
-
- git hash-object z/c~HEAD >actual &&
- git rev-parse B:z/b >expect &&
- test_cmp expect actual
)
'
@@ -3523,32 +3766,39 @@
git checkout A^0 &&
echo stuff >>z/c &&
- git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
- test_i18ngrep "Refusing to lose dirty file at z/c" out &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
+ test_path_is_missing .git/MERGE_HEAD &&
+ test_i18ngrep "error: Your local changes to the following files would be overwritten by merge" err
+ else
+ git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
+ test_i18ngrep "Refusing to lose dirty file at z/c" out &&
+
+ git ls-files -s >out &&
+ test_line_count = 3 out &&
+ git ls-files -u >out &&
+ test_line_count = 0 out &&
+ git ls-files -m >out &&
+ test_line_count = 0 out &&
+ git ls-files -o >out &&
+ test_line_count = 3 out &&
+
+ git rev-parse >actual \
+ :0:x/b :0:y/a :0:y/c &&
+ git rev-parse >expect \
+ O:x/b O:z/a B:x/c &&
+ test_cmp expect actual &&
+
+ git hash-object y/c >actual &&
+ git rev-parse B:x/c >expect &&
+ test_cmp expect actual
+ fi &&
grep -q stuff z/c &&
test_seq 1 10 >expected &&
echo stuff >>expected &&
- test_cmp expected z/c &&
-
- git ls-files -s >out &&
- test_line_count = 3 out &&
- git ls-files -u >out &&
- test_line_count = 0 out &&
- git ls-files -m >out &&
- test_line_count = 0 out &&
- git ls-files -o >out &&
- test_line_count = 4 out &&
-
- git rev-parse >actual \
- :0:x/b :0:y/a :0:y/c &&
- git rev-parse >expect \
- O:x/b O:z/a B:x/c &&
- test_cmp expect actual &&
-
- git hash-object y/c >actual &&
- git rev-parse B:x/c >expect &&
- test_cmp expect actual
+ test_cmp expected z/c
)
'
@@ -3600,7 +3850,13 @@
echo stuff >>y/c &&
test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
- test_i18ngrep "following files would be overwritten by merge" err &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ test_path_is_missing .git/MERGE_HEAD &&
+ test_i18ngrep "error: Your local changes to the following files would be overwritten by merge" err
+ else
+ test_i18ngrep "following files would be overwritten by merge" err
+ fi &&
grep -q stuff y/c &&
test_seq 1 10 >expected &&
@@ -3668,29 +3924,35 @@
echo stuff >>z/c &&
test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
- test_i18ngrep "Refusing to lose dirty file at z/c" out &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ test_path_is_missing .git/MERGE_HEAD &&
+ test_i18ngrep "error: Your local changes to the following files would be overwritten by merge" err
+ else
+ test_i18ngrep "Refusing to lose dirty file at z/c" out &&
+
+ git ls-files -s >out &&
+ test_line_count = 4 out &&
+ git ls-files -u >out &&
+ test_line_count = 1 out &&
+ git ls-files -o >out &&
+ test_line_count = 4 out &&
+
+ git rev-parse >actual \
+ :0:x/b :0:y/a :0:y/c/d :3:y/c &&
+ git rev-parse >expect \
+ O:x/b O:z/a B:y/c/d B:x/c &&
+ test_cmp expect actual &&
+
+ git hash-object y/c~HEAD >actual &&
+ git rev-parse B:x/c >expect &&
+ test_cmp expect actual
+ fi &&
grep -q stuff z/c &&
test_seq 1 10 >expected &&
echo stuff >>expected &&
- test_cmp expected z/c &&
-
- git ls-files -s >out &&
- test_line_count = 4 out &&
- git ls-files -u >out &&
- test_line_count = 1 out &&
- git ls-files -o >out &&
- test_line_count = 5 out &&
-
- git rev-parse >actual \
- :0:x/b :0:y/a :0:y/c/d :3:y/c &&
- git rev-parse >expect \
- O:x/b O:z/a B:y/c/d B:x/c &&
- test_cmp expect actual &&
-
- git hash-object y/c~HEAD >actual &&
- git rev-parse B:x/c >expect &&
- test_cmp expect actual
+ test_cmp expected z/c
)
'
@@ -3748,37 +4010,43 @@
echo mods >>y/c &&
test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
- test_i18ngrep "CONFLICT (rename/rename)" out &&
- test_i18ngrep "Refusing to lose dirty file at y/c" out &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ test_path_is_missing .git/MERGE_HEAD &&
+ test_i18ngrep "error: Your local changes to the following files would be overwritten by merge" err
+ else
+ test_i18ngrep "CONFLICT (rename/rename)" out &&
+ test_i18ngrep "Refusing to lose dirty file at y/c" out &&
- git ls-files -s >out &&
- test_line_count = 7 out &&
- git ls-files -u >out &&
- test_line_count = 4 out &&
- git ls-files -o >out &&
- test_line_count = 3 out &&
+ git ls-files -s >out &&
+ test_line_count = 7 out &&
+ git ls-files -u >out &&
+ test_line_count = 4 out &&
+ git ls-files -o >out &&
+ test_line_count = 3 out &&
+
+ git rev-parse >actual \
+ :0:y/a :0:y/b :0:x/d :1:x/c :2:w/c :2:y/c :3:y/c &&
+ git rev-parse >expect \
+ O:z/a O:z/b O:x/d O:x/c O:x/c A:y/c O:x/c &&
+ test_cmp expect actual &&
+
+ # See if y/c~merged has expected contents; requires manually
+ # doing the expected file merge
+ git cat-file -p A:y/c >c1 &&
+ git cat-file -p B:z/c >c2 &&
+ >empty &&
+ test_must_fail git merge-file \
+ -L "HEAD" \
+ -L "" \
+ -L "B^0" \
+ c1 empty c2 &&
+ test_cmp c1 y/c~merged
+ fi &&
echo different >expected &&
echo mods >>expected &&
- test_cmp expected y/c &&
-
- git rev-parse >actual \
- :0:y/a :0:y/b :0:x/d :1:x/c :2:w/c :2:y/c :3:y/c &&
- git rev-parse >expect \
- O:z/a O:z/b O:x/d O:x/c O:x/c A:y/c O:x/c &&
- test_cmp expect actual &&
-
- # See if y/c~merged has expected contents; requires manually
- # doing the expected file merge
- git cat-file -p A:y/c >c1 &&
- git cat-file -p B:z/c >c2 &&
- >empty &&
- test_must_fail git merge-file \
- -L "HEAD" \
- -L "" \
- -L "B^0" \
- c1 empty c2 &&
- test_cmp c1 y/c~merged
+ test_cmp expected y/c
)
'
@@ -3831,38 +4099,44 @@
echo important >>y/wham &&
test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
- test_i18ngrep "CONFLICT (rename/rename)" out &&
- test_i18ngrep "Refusing to lose dirty file at y/wham" out &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ test_path_is_missing .git/MERGE_HEAD &&
+ test_i18ngrep "error: Your local changes to the following files would be overwritten by merge" err
+ else
+ test_i18ngrep "CONFLICT (rename/rename)" out &&
+ test_i18ngrep "Refusing to lose dirty file at y/wham" out &&
- git ls-files -s >out &&
- test_line_count = 4 out &&
- git ls-files -u >out &&
- test_line_count = 2 out &&
- git ls-files -o >out &&
- test_line_count = 3 out &&
+ git ls-files -s >out &&
+ test_line_count = 4 out &&
+ git ls-files -u >out &&
+ test_line_count = 2 out &&
+ git ls-files -o >out &&
+ test_line_count = 3 out &&
+
+ test_must_fail git rev-parse :1:y/wham &&
+
+ git rev-parse >actual \
+ :0:y/a :0:y/b :2:y/wham :3:y/wham &&
+ git rev-parse >expect \
+ O:z/a O:z/b O:x/c O:x/d &&
+ test_cmp expect actual &&
+
+ # Test that two-way merge in y/wham~merged is as expected
+ git cat-file -p :2:y/wham >expect &&
+ git cat-file -p :3:y/wham >other &&
+ >empty &&
+ test_must_fail git merge-file \
+ -L "HEAD" \
+ -L "" \
+ -L "B^0" \
+ expect empty other &&
+ test_cmp expect y/wham~merged
+ fi &&
test_seq 1 10 >expected &&
echo important >>expected &&
- test_cmp expected y/wham &&
-
- test_must_fail git rev-parse :1:y/wham &&
-
- git rev-parse >actual \
- :0:y/a :0:y/b :2:y/wham :3:y/wham &&
- git rev-parse >expect \
- O:z/a O:z/b O:x/c O:x/d &&
- test_cmp expect actual &&
-
- # Test that the two-way merge in y/wham~merged is as expected
- git cat-file -p :2:y/wham >expect &&
- git cat-file -p :3:y/wham >other &&
- >empty &&
- test_must_fail git merge-file \
- -L "HEAD" \
- -L "" \
- -L "B^0" \
- expect empty other &&
- test_cmp expect y/wham~merged
+ test_cmp expected y/wham
)
'
@@ -3938,31 +4212,35 @@
)
'
-# Testcase 12b, Moving two directory hierarchies into each other
+# Testcase 12b1, Moving two directory hierarchies into each other
# (Related to testcases 1c and 12c)
# Commit O: node1/{leaf1, leaf2}, node2/{leaf3, leaf4}
# Commit A: node1/{leaf1, leaf2, node2/{leaf3, leaf4}}
# Commit B: node2/{leaf3, leaf4, node1/{leaf1, leaf2}}
-# Expected: node1/node2/node1/{leaf1, leaf2},
-# node2/node1/node2/{leaf3, leaf4}
-# NOTE: Without directory renames, we would expect
-# node2/node1/{leaf1, leaf2},
-# node1/node2/{leaf3, leaf4}
-# with directory rename detection, we note that
+# Expected: node1/node2/{leaf3, leaf4}
+# node2/node1/{leaf1, leaf2}
+# NOTE: If there were new files added to the old node1/ or node2/ directories,
+# then we would need to detect renames for those directories and would
+# find that:
# commit A renames node2/ -> node1/node2/
# commit B renames node1/ -> node2/node1/
-# therefore, applying those directory renames to the initial result
-# (making all four paths experience a transitive renaming), yields
-# the expected result.
-#
-# You may ask, is it weird to have two directories rename each other?
-# To which, I can do no more than shrug my shoulders and say that
-# even simple rules give weird results when given weird inputs.
+# Applying those directory renames to the initial result (making all
+# four paths experience a transitive renaming), yields
+# node1/node2/node1/{leaf1, leaf2}
+# node2/node1/node2/{leaf3, leaf4}
+# as the result. It may be really weird to have two directories
+# rename each other, but simple rules give weird results when given
+# weird inputs. HOWEVER, the "If" at the beginning of those NOTE was
+# false; there were no new files added and thus there is no directory
+# rename detection to perform. As such, we just have simple renames
+# and the expected answer is:
+# node1/node2/{leaf3, leaf4}
+# node2/node1/{leaf1, leaf2}
-test_setup_12b () {
- test_create_repo 12b &&
+test_setup_12b1 () {
+ test_create_repo 12b1 &&
(
- cd 12b &&
+ cd 12b1 &&
mkdir -p node1 node2 &&
echo leaf1 >node1/leaf1 &&
@@ -3989,10 +4267,10 @@
)
}
-test_expect_success '12b: Moving two directory hierarchies into each other' '
- test_setup_12b &&
+test_expect_merge_algorithm failure success '12b1: Moving two directory hierarchies into each other' '
+ test_setup_12b1 &&
(
- cd 12b &&
+ cd 12b1 &&
git checkout A^0 &&
@@ -4002,10 +4280,10 @@
test_line_count = 4 out &&
git rev-parse >actual \
- HEAD:node1/node2/node1/leaf1 \
- HEAD:node1/node2/node1/leaf2 \
- HEAD:node2/node1/node2/leaf3 \
- HEAD:node2/node1/node2/leaf4 &&
+ HEAD:node2/node1/leaf1 \
+ HEAD:node2/node1/leaf2 \
+ HEAD:node1/node2/leaf3 \
+ HEAD:node1/node2/leaf4 &&
git rev-parse >expect \
O:node1/leaf1 \
O:node1/leaf2 \
@@ -4015,7 +4293,104 @@
)
'
-# Testcase 12c, Moving two directory hierarchies into each other w/ content merge
+# Testcase 12b2, Moving two directory hierarchies into each other
+# (Related to testcases 1c and 12c)
+# Commit O: node1/{leaf1, leaf2}, node2/{leaf3, leaf4}
+# Commit A: node1/{leaf1, leaf2, leaf5, node2/{leaf3, leaf4}}
+# Commit B: node2/{leaf3, leaf4, leaf6, node1/{leaf1, leaf2}}
+# Expected: node1/node2/{node1/{leaf1, leaf2}, leaf6}
+# node2/node1/{node2/{leaf3, leaf4}, leaf5}
+# NOTE: Without directory renames, we would expect
+# A: node2/leaf3 -> node1/node2/leaf3
+# A: node2/leaf1 -> node1/node2/leaf4
+# A: Adds node1/leaf5
+# B: node1/leaf1 -> node2/node1/leaf1
+# B: node1/leaf2 -> node2/node1/leaf2
+# B: Adds node2/leaf6
+# with directory rename detection, we note that
+# commit A renames node2/ -> node1/node2/
+# commit B renames node1/ -> node2/node1/
+# therefore, applying A's directory rename to the paths added in B gives:
+# B: node1/leaf1 -> node1/node2/node1/leaf1
+# B: node1/leaf2 -> node1/node2/node1/leaf2
+# B: Adds node1/node2/leaf6
+# and applying B's directory rename to the paths added in A gives:
+# A: node2/leaf3 -> node2/node1/node2/leaf3
+# A: node2/leaf1 -> node2/node1/node2/leaf4
+# A: Adds node2/node1/leaf5
+# resulting in the expected
+# node1/node2/{node1/{leaf1, leaf2}, leaf6}
+# node2/node1/{node2/{leaf3, leaf4}, leaf5}
+#
+# You may ask, is it weird to have two directories rename each other?
+# To which, I can do no more than shrug my shoulders and say that
+# even simple rules give weird results when given weird inputs.
+
+test_setup_12b2 () {
+ test_create_repo 12b2 &&
+ (
+ cd 12b2 &&
+
+ mkdir -p node1 node2 &&
+ echo leaf1 >node1/leaf1 &&
+ echo leaf2 >node1/leaf2 &&
+ echo leaf3 >node2/leaf3 &&
+ echo leaf4 >node2/leaf4 &&
+ git add node1 node2 &&
+ test_tick &&
+ git commit -m "O" &&
+
+ git branch O &&
+ git branch A &&
+ git branch B &&
+
+ git checkout A &&
+ git mv node2/ node1/ &&
+ echo leaf5 >node1/leaf5 &&
+ git add node1/leaf5 &&
+ test_tick &&
+ git commit -m "A" &&
+
+ git checkout B &&
+ git mv node1/ node2/ &&
+ echo leaf6 >node2/leaf6 &&
+ git add node2/leaf6 &&
+ test_tick &&
+ git commit -m "B"
+ )
+}
+
+test_expect_success '12b2: Moving two directory hierarchies into each other' '
+ test_setup_12b2 &&
+ (
+ cd 12b2 &&
+
+ git checkout A^0 &&
+
+ git -c merge.directoryRenames=true merge -s recursive B^0 &&
+
+ git ls-files -s >out &&
+ test_line_count = 6 out &&
+
+ git rev-parse >actual \
+ HEAD:node1/node2/node1/leaf1 \
+ HEAD:node1/node2/node1/leaf2 \
+ HEAD:node2/node1/node2/leaf3 \
+ HEAD:node2/node1/node2/leaf4 \
+ HEAD:node2/node1/leaf5 \
+ HEAD:node1/node2/leaf6 &&
+ git rev-parse >expect \
+ O:node1/leaf1 \
+ O:node1/leaf2 \
+ O:node2/leaf3 \
+ O:node2/leaf4 \
+ A:node1/leaf5 \
+ B:node2/leaf6 &&
+ test_cmp expect actual
+ )
+'
+
+# Testcase 12c1, Moving two directory hierarchies into each other w/ content merge
# (Related to testcase 12b)
# Commit O: node1/{ leaf1_1, leaf2_1}, node2/{leaf3_1, leaf4_1}
# Commit A: node1/{ leaf1_2, leaf2_2, node2/{leaf3_2, leaf4_2}}
@@ -4023,13 +4398,13 @@
# Expected: Content merge conflicts for each of:
# node1/node2/node1/{leaf1, leaf2},
# node2/node1/node2/{leaf3, leaf4}
-# NOTE: This is *exactly* like 12c, except that every path is modified on
+# NOTE: This is *exactly* like 12b1, except that every path is modified on
# each side of the merge.
-test_setup_12c () {
- test_create_repo 12c &&
+test_setup_12c1 () {
+ test_create_repo 12c1 &&
(
- cd 12c &&
+ cd 12c1 &&
mkdir -p node1 node2 &&
printf "1\n2\n3\n4\n5\n6\n7\n8\nleaf1\n" >node1/leaf1 &&
@@ -4060,10 +4435,10 @@
)
}
-test_expect_success '12c: Moving one directory hierarchy into another w/ content merge' '
- test_setup_12c &&
+test_expect_merge_algorithm failure success '12c1: Moving one directory hierarchy into another w/ content merge' '
+ test_setup_12c1 &&
(
- cd 12c &&
+ cd 12c1 &&
git checkout A^0 &&
@@ -4073,6 +4448,102 @@
test_line_count = 12 out &&
git rev-parse >actual \
+ :1:node2/node1/leaf1 \
+ :1:node2/node1/leaf2 \
+ :1:node1/node2/leaf3 \
+ :1:node1/node2/leaf4 \
+ :2:node2/node1/leaf1 \
+ :2:node2/node1/leaf2 \
+ :2:node1/node2/leaf3 \
+ :2:node1/node2/leaf4 \
+ :3:node2/node1/leaf1 \
+ :3:node2/node1/leaf2 \
+ :3:node1/node2/leaf3 \
+ :3:node1/node2/leaf4 &&
+ git rev-parse >expect \
+ O:node1/leaf1 \
+ O:node1/leaf2 \
+ O:node2/leaf3 \
+ O:node2/leaf4 \
+ A:node1/leaf1 \
+ A:node1/leaf2 \
+ A:node1/node2/leaf3 \
+ A:node1/node2/leaf4 \
+ B:node2/node1/leaf1 \
+ B:node2/node1/leaf2 \
+ B:node2/leaf3 \
+ B:node2/leaf4 &&
+ test_cmp expect actual
+ )
+'
+
+# Testcase 12c2, Moving two directory hierarchies into each other w/ content merge
+# (Related to testcase 12b)
+# Commit O: node1/{ leaf1_1, leaf2_1}, node2/{leaf3_1, leaf4_1}
+# Commit A: node1/{ leaf1_2, leaf2_2, node2/{leaf3_2, leaf4_2}, leaf5}
+# Commit B: node2/{node1/{leaf1_3, leaf2_3}, leaf3_3, leaf4_3, leaf6}
+# Expected: Content merge conflicts for each of:
+# node1/node2/node1/{leaf1, leaf2}
+# node2/node1/node2/{leaf3, leaf4}
+# plus
+# node2/node1/leaf5
+# node1/node2/leaf6
+# NOTE: This is *exactly* like 12b2, except that every path from O is modified
+# on each side of the merge.
+
+test_setup_12c2 () {
+ test_create_repo 12c2 &&
+ (
+ cd 12c2 &&
+
+ mkdir -p node1 node2 &&
+ printf "1\n2\n3\n4\n5\n6\n7\n8\nleaf1\n" >node1/leaf1 &&
+ printf "1\n2\n3\n4\n5\n6\n7\n8\nleaf2\n" >node1/leaf2 &&
+ printf "1\n2\n3\n4\n5\n6\n7\n8\nleaf3\n" >node2/leaf3 &&
+ printf "1\n2\n3\n4\n5\n6\n7\n8\nleaf4\n" >node2/leaf4 &&
+ git add node1 node2 &&
+ test_tick &&
+ git commit -m "O" &&
+
+ git branch O &&
+ git branch A &&
+ git branch B &&
+
+ git checkout A &&
+ git mv node2/ node1/ &&
+ for i in `git ls-files`; do echo side A >>$i; done &&
+ git add -u &&
+ echo leaf5 >node1/leaf5 &&
+ git add node1/leaf5 &&
+ test_tick &&
+ git commit -m "A" &&
+
+ git checkout B &&
+ git mv node1/ node2/ &&
+ for i in `git ls-files`; do echo side B >>$i; done &&
+ git add -u &&
+ echo leaf6 >node2/leaf6 &&
+ git add node2/leaf6 &&
+ test_tick &&
+ git commit -m "B"
+ )
+}
+
+test_expect_success '12c2: Moving one directory hierarchy into another w/ content merge' '
+ test_setup_12c2 &&
+ (
+ cd 12c2 &&
+
+ git checkout A^0 &&
+
+ test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 &&
+
+ git ls-files -s >out &&
+ test_line_count = 14 out &&
+ git ls-files -u >out &&
+ test_line_count = 12 out &&
+
+ git rev-parse >actual \
:1:node1/node2/node1/leaf1 \
:1:node1/node2/node1/leaf2 \
:1:node2/node1/node2/leaf3 \
@@ -4084,7 +4555,9 @@
:3:node1/node2/node1/leaf1 \
:3:node1/node2/node1/leaf2 \
:3:node2/node1/node2/leaf3 \
- :3:node2/node1/node2/leaf4 &&
+ :3:node2/node1/node2/leaf4 \
+ :0:node2/node1/leaf5 \
+ :0:node1/node2/leaf6 &&
git rev-parse >expect \
O:node1/leaf1 \
O:node1/leaf2 \
@@ -4097,7 +4570,9 @@
B:node2/node1/leaf1 \
B:node2/node1/leaf2 \
B:node2/leaf3 \
- B:node2/leaf4 &&
+ B:node2/leaf4 \
+ A:node1/leaf5 \
+ B:node2/leaf6 &&
test_cmp expect actual
)
'
@@ -4218,6 +4693,208 @@
)
'
+# Testcase 12f, Rebase of patches with big directory rename
+# Commit O:
+# dir/subdir/{a,b,c,d,e_O,Makefile_TOP_O}
+# dir/subdir/tweaked/{f,g,h,Makefile_SUB_O}
+# dir/unchanged/<LOTS OF FILES>
+# Commit A:
+# (Remove f & g, move e into newsubdir, rename dir/->folder/, modify files)
+# folder/subdir/{a,b,c,d,Makefile_TOP_A}
+# folder/subdir/newsubdir/e_A
+# folder/subdir/tweaked/{h,Makefile_SUB_A}
+# folder/unchanged/<LOTS OF FILES>
+# Commit B1:
+# (add newfile.{c,py}, modify underscored files)
+# dir/{a,b,c,d,e_B1,Makefile_TOP_B1,newfile.c}
+# dir/tweaked/{f,g,h,Makefile_SUB_B1,newfile.py}
+# dir/unchanged/<LOTS OF FILES>
+# Commit B2:
+# (Modify e further, add newfile.rs)
+# dir/{a,b,c,d,e_B2,Makefile_TOP_B1,newfile.c,newfile.rs}
+# dir/tweaked/{f,g,h,Makefile_SUB_B1,newfile.py}
+# dir/unchanged/<LOTS OF FILES>
+# Expected:
+# B1-picked:
+# folder/subdir/{a,b,c,d,Makefile_TOP_Merge1,newfile.c}
+# folder/subdir/newsubdir/e_Merge1
+# folder/subdir/tweaked/{h,Makefile_SUB_Merge1,newfile.py}
+# folder/unchanged/<LOTS OF FILES>
+# B2-picked:
+# folder/subdir/{a,b,c,d,Makefile_TOP_Merge1,newfile.c,newfile.rs}
+# folder/subdir/newsubdir/e_Merge2
+# folder/subdir/tweaked/{h,Makefile_SUB_Merge1,newfile.py}
+# folder/unchanged/<LOTS OF FILES>
+# Things being checked here:
+# 1. dir/subdir/newfile.c does not get pushed into folder/subdir/newsubdir/.
+# dir/subdir/{a,b,c,d} -> folder/subdir/{a,b,c,d} looks like
+# dir/ -> folder/,
+# whereas dir/subdir/e -> folder/subdir/newsubdir/e looks like
+# dir/subdir/ -> folder/subdir/newsubdir/
+# and if we note that newfile.c is found in dir/subdir/, we might overlook
+# the dir/ -> folder/ rule that has more weight. Older git versions did
+# this.
+# 2. The code to do trivial directory resolves. Note that
+# dir/subdir/unchanged/ is unchanged and can be deleted, and files in the
+# new folder/subdir/unchanged/ are not needed as a target to any renames.
+# Thus, in the second collect_merge_info_callback() we can just resolve
+# these two directories trivially without recursing.)
+# 3. Exercising the codepaths for caching renames and deletes from one cherry
+# pick and re-applying them in the subsequent one.
+
+test_setup_12f () {
+ test_create_repo 12f &&
+ (
+ cd 12f &&
+
+ mkdir -p dir/unchanged &&
+ mkdir -p dir/subdir/tweaked &&
+ echo a >dir/subdir/a &&
+ echo b >dir/subdir/b &&
+ echo c >dir/subdir/c &&
+ echo d >dir/subdir/d &&
+ test_seq 1 10 >dir/subdir/e &&
+ test_seq 10 20 >dir/subdir/Makefile &&
+ echo f >dir/subdir/tweaked/f &&
+ echo g >dir/subdir/tweaked/g &&
+ echo h >dir/subdir/tweaked/h &&
+ test_seq 20 30 >dir/subdir/tweaked/Makefile &&
+ for i in `test_seq 1 88`; do
+ echo content $i >dir/unchanged/file_$i
+ done &&
+ git add . &&
+ git commit -m "O" &&
+
+ git branch O &&
+ git branch A &&
+ git branch B &&
+
+ git switch A &&
+ git rm dir/subdir/tweaked/f dir/subdir/tweaked/g &&
+ test_seq 2 10 >dir/subdir/e &&
+ test_seq 11 20 >dir/subdir/Makefile &&
+ test_seq 21 30 >dir/subdir/tweaked/Makefile &&
+ mkdir dir/subdir/newsubdir &&
+ git mv dir/subdir/e dir/subdir/newsubdir/ &&
+ git mv dir folder &&
+ git add . &&
+ git commit -m "A" &&
+
+ git switch B &&
+ mkdir dir/subdir/newsubdir/ &&
+ echo c code >dir/subdir/newfile.c &&
+ echo python code >dir/subdir/newsubdir/newfile.py &&
+ test_seq 1 11 >dir/subdir/e &&
+ test_seq 10 21 >dir/subdir/Makefile &&
+ test_seq 20 31 >dir/subdir/tweaked/Makefile &&
+ git add . &&
+ git commit -m "B1" &&
+
+ echo rust code >dir/subdir/newfile.rs &&
+ test_seq 1 12 >dir/subdir/e &&
+ git add . &&
+ git commit -m "B2"
+ )
+}
+
+test_expect_merge_algorithm failure success '12f: Trivial directory resolve, caching, all kinds of fun' '
+ test_setup_12f &&
+ (
+ cd 12f &&
+
+ git checkout A^0 &&
+ git branch Bmod B &&
+
+ GIT_TRACE2_PERF="$(pwd)/trace.output" git -c merge.directoryRenames=true rebase A Bmod &&
+
+ echo Checking the pick of B1... &&
+
+ test_must_fail git rev-parse Bmod~1:dir &&
+
+ git ls-tree -r Bmod~1 >out &&
+ test_line_count = 98 out &&
+
+ git diff --name-status A Bmod~1 >actual &&
+ q_to_tab >expect <<-\EOF &&
+ MQfolder/subdir/Makefile
+ AQfolder/subdir/newfile.c
+ MQfolder/subdir/newsubdir/e
+ AQfolder/subdir/newsubdir/newfile.py
+ MQfolder/subdir/tweaked/Makefile
+ EOF
+ test_cmp expect actual &&
+
+ # Three-way merged files
+ test_seq 2 11 >e_Merge1 &&
+ test_seq 11 21 >Makefile_TOP &&
+ test_seq 21 31 >Makefile_SUB &&
+ git hash-object >expect \
+ e_Merge1 \
+ Makefile_TOP \
+ Makefile_SUB &&
+ git rev-parse >actual \
+ Bmod~1:folder/subdir/newsubdir/e \
+ Bmod~1:folder/subdir/Makefile \
+ Bmod~1:folder/subdir/tweaked/Makefile &&
+ test_cmp expect actual &&
+
+ # New files showed up at the right location with right contents
+ git rev-parse >expect \
+ B~1:dir/subdir/newfile.c \
+ B~1:dir/subdir/newsubdir/newfile.py &&
+ git rev-parse >actual \
+ Bmod~1:folder/subdir/newfile.c \
+ Bmod~1:folder/subdir/newsubdir/newfile.py &&
+ test_cmp expect actual &&
+
+ # Removed files
+ test_path_is_missing folder/subdir/tweaked/f &&
+ test_path_is_missing folder/subdir/tweaked/g &&
+
+ # Unchanged files or directories
+ git rev-parse >actual \
+ Bmod~1:folder/subdir/a \
+ Bmod~1:folder/subdir/b \
+ Bmod~1:folder/subdir/c \
+ Bmod~1:folder/subdir/d \
+ Bmod~1:folder/unchanged \
+ Bmod~1:folder/subdir/tweaked/h &&
+ git rev-parse >expect \
+ O:dir/subdir/a \
+ O:dir/subdir/b \
+ O:dir/subdir/c \
+ O:dir/subdir/d \
+ O:dir/unchanged \
+ O:dir/subdir/tweaked/h &&
+ test_cmp expect actual &&
+
+ echo Checking the pick of B2... &&
+
+ test_must_fail git rev-parse Bmod:dir &&
+
+ git ls-tree -r Bmod >out &&
+ test_line_count = 99 out &&
+
+ git diff --name-status Bmod~1 Bmod >actual &&
+ q_to_tab >expect <<-\EOF &&
+ AQfolder/subdir/newfile.rs
+ MQfolder/subdir/newsubdir/e
+ EOF
+ test_cmp expect actual &&
+
+ # Three-way merged file
+ test_seq 2 12 >e_Merge2 &&
+ git hash-object e_Merge2 >expect &&
+ git rev-parse Bmod:folder/subdir/newsubdir/e >actual &&
+ test_cmp expect actual &&
+
+ grep region_enter.*collect_merge_info trace.output >collect &&
+ test_line_count = 4 collect &&
+ grep region_enter.*process_entries$ trace.output >process &&
+ test_line_count = 2 process
+ )
+'
+
###########################################################################
# SECTION 13: Checking informational and conflict messages
#
@@ -4403,7 +5080,7 @@
# 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
diff --git a/t/t6044-merge-unrelated-index-changes.sh b/t/t6424-merge-unrelated-index-changes.sh
similarity index 100%
rename from t/t6044-merge-unrelated-index-changes.sh
rename to t/t6424-merge-unrelated-index-changes.sh
diff --git a/t/t6425-merge-rename-delete.sh b/t/t6425-merge-rename-delete.sh
new file mode 100755
index 0000000..459b431
--- /dev/null
+++ b/t/t6425-merge-rename-delete.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+test_description='Merge-recursive rename/delete conflict message'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./test-lib.sh
+
+test_expect_success 'rename/delete' '
+ echo foo >A &&
+ git add A &&
+ git commit -m "initial" &&
+
+ git checkout -b rename &&
+ git mv A B &&
+ git commit -m "rename" &&
+
+ git checkout main &&
+ git rm A &&
+ git commit -m "delete" &&
+
+ test_must_fail git merge --strategy=recursive rename >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/t/t6046-merge-skip-unneeded-updates.sh b/t/t6426-merge-skip-unneeded-updates.sh
similarity index 96%
rename from t/t6046-merge-skip-unneeded-updates.sh
rename to t/t6426-merge-skip-unneeded-updates.sh
index 1ddc9e6..7b5f1c1 100755
--- a/t/t6046-merge-skip-unneeded-updates.sh
+++ b/t/t6426-merge-skip-unneeded-updates.sh
@@ -23,6 +23,7 @@
# files that might be renamed into each other's paths.)
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-merge.sh
###########################################################################
@@ -374,7 +375,7 @@
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 "CONFLICT (.*/add):" out &&
test_must_be_empty err &&
# Make sure c WAS updated
@@ -491,7 +492,9 @@
test_cmp expect actual &&
test_must_fail git rev-parse HEAD:bq HEAD:foo/bq &&
- test_path_is_missing bq foo/bq foo/whatever
+ test_path_is_missing bq &&
+ test_path_is_missing foo/bq &&
+ test_path_is_missing foo/whatever
)
'
@@ -521,7 +524,9 @@
test_cmp expect actual &&
test_must_fail git rev-parse HEAD:bq HEAD:foo/bq &&
- test_path_is_missing bq foo/bq foo/whatever
+ test_path_is_missing bq &&
+ test_path_is_missing foo/bq &&
+ test_path_is_missing foo/whatever
)
'
@@ -587,7 +592,9 @@
test_cmp expect actual &&
test_must_fail git rev-parse HEAD:bq HEAD:foo/bq &&
- test_path_is_missing bq foo/bq foo/whatever
+ test_path_is_missing bq &&
+ test_path_is_missing foo/bq &&
+ test_path_is_missing foo/whatever
)
'
@@ -617,7 +624,9 @@
test_cmp expect actual &&
test_must_fail git rev-parse HEAD:bq HEAD:foo/bq &&
- test_path_is_missing bq foo/bq foo/whatever
+ test_path_is_missing bq &&
+ test_path_is_missing foo/bq &&
+ test_path_is_missing foo/whatever
)
'
@@ -661,12 +670,12 @@
}
# 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: Change on A, change on B subset of A, dirty mods present' '
+test_expect_merge_algorithm failure success '4a: Change on A, change on B subset of A, dirty mods present' '
test_setup_4a &&
(
cd 4a &&
diff --git a/t/t6047-diff3-conflict-markers.sh b/t/t6427-diff3-conflict-markers.sh
similarity index 92%
rename from t/t6047-diff3-conflict-markers.sh
rename to t/t6427-diff3-conflict-markers.sh
index f4655bb..25c4b72 100755
--- a/t/t6047-diff3-conflict-markers.sh
+++ b/t/t6427-diff3-conflict-markers.sh
@@ -2,6 +2,9 @@
test_description='recursive merge diff3 style conflict markers'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
# Setup:
@@ -43,7 +46,7 @@
# Setup:
# L1
# / \
-# master ?
+# main ?
# \ /
# R1
#
@@ -90,18 +93,18 @@
cd unique_merge_base &&
git checkout L^0 &&
- MASTER=$(git rev-parse --short master) &&
+ MAIN=$(git rev-parse --short main) &&
test_must_fail git -c merge.conflictstyle=diff3 merge -s recursive R^0 &&
- grep "|||||| $MASTER:content" renamed
+ grep "|||||| $MAIN:content" renamed
)
'
# Setup:
# L1---L2--L3
# / \ / \
-# master X1 ?
+# main X1 ?
# \ / \ /
# R1---R2--R3
#
@@ -191,10 +194,10 @@
(
cd rebase &&
test_commit base file &&
- test_commit master file &&
+ test_commit main file &&
git checkout -b side HEAD^ &&
test_commit side file &&
- test_must_fail git -c merge.conflictstyle=diff3 rebase --merge master &&
+ test_must_fail git -c merge.conflictstyle=diff3 rebase --merge main &&
grep "||||||| parent of" file
)
'
@@ -203,7 +206,7 @@
(
cd rebase &&
git rebase --abort &&
- test_must_fail git -c merge.conflictstyle=diff3 rebase --apply master &&
+ test_must_fail git -c merge.conflictstyle=diff3 rebase --apply main &&
grep "||||||| constructed merge base" file
)
'
diff --git a/t/t3030-merge-recursive.sh b/t/t6430-merge-recursive.sh
similarity index 97%
rename from t/t3030-merge-recursive.sh
rename to t/t6430-merge-recursive.sh
index d48d211..ffcc01f 100755
--- a/t/t3030-merge-recursive.sh
+++ b/t/t6430-merge-recursive.sh
@@ -2,7 +2,11 @@
test_description='merge-recursive backend test'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-merge.sh
test_expect_success 'setup 1' '
@@ -34,7 +38,7 @@
git add a d/e &&
test_tick &&
- git commit -m "master modifies a and d/e" &&
+ git commit -m "main modifies a and d/e" &&
c1=$(git rev-parse --verify HEAD) &&
( git ls-tree -r HEAD && git ls-files -s ) >actual &&
(
@@ -465,7 +469,7 @@
git checkout -b branch1 &&
git commit --allow-empty -m "empty commit" &&
- git checkout master &&
+ git checkout main &&
git rm foo &&
mkdir foo &&
>foo/bar &&
@@ -474,7 +478,7 @@
git checkout branch1 &&
- git cherry-pick master &&
+ git cherry-pick main &&
test_path_is_dir foo &&
test_path_is_file foo/bar
)
@@ -489,8 +493,8 @@
test_expect_success 'reset and bind merge' '
- git reset --hard master &&
- git read-tree --prefix=M/ master &&
+ git reset --hard main &&
+ git read-tree --prefix=M/ main &&
git ls-files -s >actual &&
(
echo "100644 $o1 0 M/a" &&
@@ -504,7 +508,7 @@
) >expected &&
test_cmp expected actual &&
- git read-tree --prefix=a1/ master &&
+ git read-tree --prefix=a1/ main &&
git ls-files -s >actual &&
(
echo "100644 $o1 0 M/a" &&
@@ -522,7 +526,7 @@
) >expected &&
test_cmp expected actual &&
- git read-tree --prefix=z/ master &&
+ git read-tree --prefix=z/ main &&
git ls-files -s >actual &&
(
echo "100644 $o1 0 M/a" &&
@@ -598,11 +602,11 @@
test_expect_success 'merge removes empty directories' '
- git reset --hard master &&
+ git reset --hard main &&
git checkout -b rm &&
git rm d/e &&
git commit -mremoved-d/e &&
- git checkout master &&
+ git checkout main &&
git merge -s recursive rm &&
test_path_is_missing d
'
@@ -641,7 +645,7 @@
test_cmp expected actual
'
-test_expect_failure 'merge-recursive rename vs. rename/symlink' '
+test_expect_merge_algorithm failure success 'merge-recursive rename vs. rename/symlink' '
git checkout -f rename &&
git merge rename-ln &&
@@ -663,7 +667,7 @@
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 &&
@@ -682,7 +686,7 @@
test_tick &&
git commit -a -m changesimplefile &&
- git checkout main &&
+ git checkout topic &&
git rm sub1 &&
git mv sub2 sub1 &&
test_tick &&
diff --git a/t/t3031-merge-criscross.sh b/t/t6431-merge-criscross.sh
similarity index 100%
rename from t/t3031-merge-criscross.sh
rename to t/t6431-merge-criscross.sh
diff --git a/t/t3032-merge-recursive-space-options.sh b/t/t6432-merge-recursive-space-options.sh
similarity index 97%
rename from t/t3032-merge-recursive-space-options.sh
rename to t/t6432-merge-recursive-space-options.sh
index b56180e..db4b77e 100755
--- a/t/t3032-merge-recursive-space-options.sh
+++ b/t/t6432-merge-recursive-space-options.sh
@@ -2,15 +2,18 @@
test_description='merge-recursive space options
-* [master] Clarify
+* [main] Clarify
! [remote] Remove cruft
--
+ [remote] Remove cruft
-* [master] Clarify
+* [main] Clarify
*+ [remote^] Initial revision
* ok 1: setup
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_have_prereq SED_STRIPS_CR && SED_OPTIONS=-b
@@ -87,7 +90,7 @@
mv text.txt+ text.txt &&
git commit -a -m "Remove cruft" &&
- git checkout master &&
+ git checkout main &&
sed -e "
s/\(not in his right mind\),\(.*\)/\1;\2Q/
s/Quite correct\(.*\)/It is too correct\1Q/
diff --git a/t/t3033-merge-toplevel.sh b/t/t6433-merge-toplevel.sh
similarity index 81%
rename from t/t3033-merge-toplevel.sh
rename to t/t6433-merge-toplevel.sh
index d314599..b160314 100755
--- a/t/t3033-merge-toplevel.sh
+++ b/t/t6433-merge-toplevel.sh
@@ -2,10 +2,13 @@
test_description='"git merge" top-level frontend'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
t3033_reset () {
- git checkout -B master two &&
+ git checkout -B main two &&
git branch -f left three &&
git branch -f right four
}
@@ -21,7 +24,7 @@
test_commit four &&
git checkout --orphan newroot &&
test_commit five &&
- git checkout master
+ git checkout main
'
# Local branches
@@ -61,7 +64,7 @@
test_expect_success 'merge octopus, fast-forward (does not ff)' '
t3033_reset &&
git merge left right &&
- # two (master) is not an ancestor of three (left) and four (right)
+ # two (main) is not an ancestor of three (left) and four (right)
test_must_fail git rev-parse --verify HEAD^4 &&
git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
git rev-parse two three four | sort >expect &&
@@ -118,7 +121,7 @@
t3033_reset &&
git fetch . left right &&
git merge FETCH_HEAD &&
- # two (master) is not an ancestor of three (left) and four (right)
+ # two (main) is not an ancestor of three (left) and four (right)
test_must_fail git rev-parse --verify HEAD^4 &&
git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
git rev-parse two three four | sort >expect &&
@@ -142,6 +145,17 @@
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 +163,15 @@
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/t/t3034-merge-recursive-rename-options.sh b/t/t6434-merge-recursive-rename-options.sh
similarity index 98%
rename from t/t3034-merge-recursive-rename-options.sh
rename to t/t6434-merge-recursive-rename-options.sh
index 3d9fae6..a117078 100755
--- a/t/t3034-merge-recursive-rename-options.sh
+++ b/t/t6434-merge-recursive-rename-options.sh
@@ -5,11 +5,11 @@
Test rename detection by examining rename/delete conflicts.
* (HEAD -> rename) rename
-| * (master) delete
+| * (main) delete
|/
* base
-git diff --name-status base master
+git diff --name-status base main
D 0-old
D 1-old
D 2-old
@@ -26,6 +26,9 @@
mentions this in a different context).
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
get_expected_stages () {
@@ -118,7 +121,7 @@
get_expected_stages 2 &&
get_expected_stages 3 &&
check_50="false" &&
- tail="HEAD^ -- HEAD master"
+ tail="HEAD^ -- HEAD main"
'
test_expect_success 'setup thresholds' '
diff --git a/t/t3035-merge-sparse.sh b/t/t6435-merge-sparse.sh
similarity index 100%
rename from t/t3035-merge-sparse.sh
rename to t/t6435-merge-sparse.sh
diff --git a/t/t7607-merge-overwrite.sh b/t/t6436-merge-overwrite.sh
similarity index 87%
rename from t/t7607-merge-overwrite.sh
rename to t/t6436-merge-overwrite.sh
index dd8ab7e..84b4aac 100755
--- a/t/t7607-merge-overwrite.sh
+++ b/t/t6436-merge-overwrite.sh
@@ -4,6 +4,9 @@
Do not overwrite changes.'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup' '
@@ -97,11 +100,19 @@
git mv c1.c other.c &&
git commit -m rename &&
cp important other.c &&
- test_must_fail git merge c1a >out &&
- test_i18ngrep "Refusing to lose dirty file at other.c" out &&
- test_path_is_file other.c~HEAD &&
- test $(git hash-object other.c~HEAD) = $(git rev-parse c1a:c1.c) &&
- test_cmp important other.c
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ test_must_fail git merge c1a >out 2>err &&
+ test_i18ngrep "would be overwritten by merge" err &&
+ test_cmp important other.c &&
+ test_path_is_missing .git/MERGE_HEAD
+ else
+ test_must_fail git merge c1a >out &&
+ test_i18ngrep "Refusing to lose dirty file at other.c" out &&
+ test_path_is_file other.c~HEAD &&
+ test $(git hash-object other.c~HEAD) = $(git rev-parse c1a:c1.c) &&
+ test_cmp important other.c
+ fi
'
test_expect_success 'will not overwrite untracked subtree' '
@@ -128,7 +139,7 @@
cp important sub &&
cp important sub2 &&
test_must_fail git merge sub 2>out &&
- test_i18ncmp out expect &&
+ test_cmp out expect &&
test_path_is_missing .git/MERGE_HEAD &&
test_cmp important sub &&
test_cmp important sub2 &&
@@ -163,7 +174,7 @@
git checkout --orphan new &&
cp important c0.c &&
test_must_fail git merge c0 2>out &&
- test_i18ncmp out expect
+ test_cmp out expect
'
test_expect_success 'will not overwrite untracked file on unborn branch .git/MERGE_HEAD sanity etc.' '
@@ -185,7 +196,7 @@
'
test_expect_success 'will not clobber WT/index when merging into unborn' '
- git merge master &&
+ git merge main &&
grep foo tracked-file &&
git show :tracked-file >expect &&
grep foo expect &&
diff --git a/t/t7405-submodule-merge.sh b/t/t6437-submodule-merge.sh
similarity index 92%
rename from t/t7405-submodule-merge.sh
rename to t/t6437-submodule-merge.sh
index aa33978..0f92bcf 100755
--- a/t/t7405-submodule-merge.sh
+++ b/t/t6437-submodule-merge.sh
@@ -2,6 +2,9 @@
test_description='merging with submodules'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
#
@@ -27,7 +30,7 @@
test_tick &&
git commit -m root &&
- git checkout -b a master &&
+ git checkout -b a main &&
(cd sub &&
echo A > file &&
git add file &&
@@ -37,7 +40,7 @@
test_tick &&
git commit -m a &&
- git checkout -b b master &&
+ git checkout -b b main &&
(cd sub &&
echo B > file &&
git add file &&
@@ -127,7 +130,12 @@
git checkout -b test-nonforward b &&
(cd sub &&
git rev-parse sub-d > ../expect) &&
- test_must_fail git merge c 2> actual &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ test_must_fail git merge c >actual
+ else
+ test_must_fail git merge c 2> actual
+ fi &&
grep $(cat expect) actual > /dev/null &&
git reset --hard)
'
@@ -138,9 +146,21 @@
(cd sub &&
git checkout -b ambiguous sub-b &&
git merge sub-c &&
- git rev-parse sub-d > ../expect1 &&
- git rev-parse ambiguous > ../expect2) &&
- test_must_fail git merge c 2> actual &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ git rev-parse --short sub-d >../expect1 &&
+ git rev-parse --short ambiguous >../expect2
+ else
+ git rev-parse sub-d > ../expect1 &&
+ git rev-parse ambiguous > ../expect2
+ fi
+ ) &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ test_must_fail git merge c >actual
+ else
+ test_must_fail git merge c 2> actual
+ fi &&
grep $(cat expect1) actual > /dev/null &&
grep $(cat expect2) actual > /dev/null &&
git reset --hard)
@@ -195,7 +215,7 @@
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 +234,7 @@
url = $TRASH_DIRECTORY/sub
EOF
cat >expect <<EOF &&
-U0000000000000000000000000000000000000000 sub
+U$ZERO_OID sub
EOF
git submodule status > actual &&
test_cmp expect actual &&
@@ -237,22 +257,22 @@
(cd sub &&
git init &&
test_commit a &&
- git checkout -b sub-b master &&
+ git checkout -b sub-b main &&
test_commit b &&
- git checkout -b sub-c master &&
+ git checkout -b sub-c main &&
test_commit c &&
git checkout -b sub-bc sub-b &&
git merge sub-c &&
git checkout -b sub-cb sub-c &&
git merge sub-b &&
- git checkout master) &&
+ git checkout main) &&
git add sub &&
git commit -m a &&
- git checkout -b top-b master &&
+ git checkout -b top-b main &&
(cd sub && git checkout sub-b) &&
git add sub &&
git commit -m b &&
- git checkout -b top-c master &&
+ git checkout -b top-c main &&
(cd sub && git checkout sub-c) &&
git add sub &&
git commit -m c &&
diff --git a/t/t7613-merge-submodule.sh b/t/t6438-submodule-directory-file-conflicts.sh
similarity index 64%
rename from t/t7613-merge-submodule.sh
rename to t/t6438-submodule-directory-file-conflicts.sh
index d1e9fcc..04bf4be 100755
--- a/t/t7613-merge-submodule.sh
+++ b/t/t6438-submodule-directory-file-conflicts.sh
@@ -6,14 +6,14 @@
. "$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/t/t7609-merge-co-error-msgs.sh b/t/t6439-merge-co-error-msgs.sh
similarity index 90%
rename from t/t7609-merge-co-error-msgs.sh
rename to t/t6439-merge-co-error-msgs.sh
index e904132..5bfb027 100755
--- a/t/t7609-merge-co-error-msgs.sh
+++ b/t/t6439-merge-co-error-msgs.sh
@@ -2,6 +2,9 @@
test_description='unpack-trees error messages'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
@@ -18,7 +21,7 @@
git add two three four five &&
git commit -m Second &&
- git checkout master &&
+ git checkout main &&
echo other >two &&
echo other >three &&
echo other >four &&
@@ -37,14 +40,14 @@
test_expect_success 'untracked files overwritten by merge (fast and non-fast forward)' '
test_must_fail git merge branch 2>out &&
- test_i18ncmp out expect &&
+ test_cmp out expect &&
git commit --allow-empty -m empty &&
(
GIT_MERGE_VERBOSITY=0 &&
export GIT_MERGE_VERBOSITY &&
test_must_fail git merge branch 2>out2
) &&
- test_i18ncmp out2 expect &&
+ test_cmp out2 expect &&
git reset --hard HEAD^
'
@@ -65,7 +68,7 @@
git add three &&
git add four &&
test_must_fail git merge branch 2>out &&
- test_i18ncmp out expect
+ test_cmp out expect
'
cat >expect <<\EOF
@@ -83,11 +86,11 @@
echo two >rep/two &&
git add rep/one rep/two &&
git commit -m Fourth &&
- git checkout master &&
+ git checkout main &&
echo uno >rep/one &&
echo dos >rep/two &&
test_must_fail git checkout branch 2>out &&
- test_i18ncmp out expect
+ test_cmp out expect
'
cat >expect <<\EOF
@@ -101,7 +104,7 @@
test_expect_success 'not uptodate file porcelain checkout error' '
git add rep/one rep/two &&
test_must_fail git checkout branch 2>out &&
- test_i18ncmp out expect
+ test_cmp out expect
'
cat >expect <<\EOF
@@ -126,13 +129,13 @@
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 &&
+ git checkout main &&
>rep/untracked-file &&
>rep2/untracked-file &&
test_must_fail git checkout branch 2>out &&
- test_i18ncmp out ../expect
+ test_cmp out ../expect
'
test_done
diff --git a/t/t6500-gc.sh b/t/t6500-gc.sh
index 0a69a67..60d961b 100755
--- a/t/t6500-gc.sh
+++ b/t/t6500-gc.sh
@@ -10,7 +10,24 @@
# 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' '
@@ -61,7 +78,7 @@
git gc &&
( cd .git/objects/pack && ls *.pack ) >pack-list &&
test_line_count = 1 pack-list &&
- BASE_PACK=.git/objects/pack/pack-*.pack &&
+ cp pack-list base-pack-list &&
test_commit four &&
git repack -d &&
test_commit five &&
@@ -73,7 +90,7 @@
test_line_count = 2 pack-list &&
awk "/^P /{print \$2}" <.git/objects/info/packs >pack-info &&
test_line_count = 2 pack-info &&
- test_path_is_file $BASE_PACK &&
+ test_path_is_file .git/objects/pack/$(cat base-pack-list) &&
git fsck
)
'
@@ -85,21 +102,21 @@
# 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 &&
+ ls .git/objects/pack/pack-*.pack | sort >existing_packs &&
+ test_commit "$(test_oid obj3)" &&
+ test_commit "$(test_oid obj4)" &&
git gc --auto 2>err &&
test_i18ngrep ! "^warning:" err &&
- ls .git/objects/pack/ | sort >post_packs &&
+ ls .git/objects/pack/pack-*.pack | sort >post_packs &&
comm -1 -3 existing_packs post_packs >new &&
comm -2 -3 existing_packs post_packs >del &&
test_line_count = 0 del && # No packs are deleted
- test_line_count = 2 new # There is one new pack and its .idx
+ test_line_count = 1 new # There is one new pack
'
test_expect_success 'gc --no-quiet' '
diff --git a/t/t6501-freshen-objects.sh b/t/t6501-freshen-objects.sh
index f30b484..75210f0 100755
--- a/t/t6501-freshen-objects.sh
+++ b/t/t6501-freshen-objects.sh
@@ -25,6 +25,9 @@
# to refer to an existing tree).
test_description='check pruning of dependent objects'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
# We care about reachability, so we do not want to use
@@ -67,7 +70,7 @@
git checkout -b experiment &&
commit abandon &&
maybe_repack &&
- git checkout master &&
+ git checkout main &&
git branch -D experiment
'
@@ -128,9 +131,9 @@
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
@@ -143,8 +146,8 @@
'
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 -q 2>stderr &&
@@ -153,8 +156,8 @@
'
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
diff --git a/t/t6600-test-reach.sh b/t/t6600-test-reach.sh
index b24d850..e2d33a8 100755
--- a/t/t6600-test-reach.sh
+++ b/t/t6600-test-reach.sh
@@ -51,12 +51,17 @@
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_TEST_COMMIT_GRAPH_NO_GDAT=1 git commit-graph write --reachable &&
+ mv .git/objects/info/commit-graph commit-graph-no-gdat &&
+ chmod u+w commit-graph-no-gdat &&
git config core.commitGraph true
'
-run_three_modes () {
+run_all_modes () {
test_when_finished rm -rf .git/objects/info/commit-graph &&
"$@" <input >actual &&
test_cmp expect actual &&
@@ -65,11 +70,14 @@
test_cmp expect actual &&
cp commit-graph-half .git/objects/info/commit-graph &&
"$@" <input >actual &&
+ test_cmp expect actual &&
+ cp commit-graph-no-gdat .git/objects/info/commit-graph &&
+ "$@" <input >actual &&
test_cmp expect actual
}
-test_three_modes () {
- run_three_modes test-tool reach "$@"
+test_all_modes () {
+ run_all_modes test-tool reach "$@"
}
test_expect_success 'ref_newer:miss' '
@@ -78,7 +86,7 @@
B:commit-4-9
EOF
echo "ref_newer(A,B):0" >expect &&
- test_three_modes ref_newer
+ test_all_modes ref_newer
'
test_expect_success 'ref_newer:hit' '
@@ -87,7 +95,7 @@
B:commit-2-3
EOF
echo "ref_newer(A,B):1" >expect &&
- test_three_modes ref_newer
+ test_all_modes ref_newer
'
test_expect_success 'in_merge_bases:hit' '
@@ -96,7 +104,7 @@
B:commit-8-8
EOF
echo "in_merge_bases(A,B):1" >expect &&
- test_three_modes in_merge_bases
+ test_all_modes in_merge_bases
'
test_expect_success 'in_merge_bases:miss' '
@@ -105,7 +113,37 @@
B:commit-5-9
EOF
echo "in_merge_bases(A,B):0" >expect &&
- test_three_modes in_merge_bases
+ test_all_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_all_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_all_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_all_modes in_merge_bases_many
'
test_expect_success 'is_descendant_of:hit' '
@@ -116,7 +154,7 @@
X:commit-1-1
EOF
echo "is_descendant_of(A,X):1" >expect &&
- test_three_modes is_descendant_of
+ test_all_modes is_descendant_of
'
test_expect_success 'is_descendant_of:miss' '
@@ -127,7 +165,7 @@
X:commit-7-6
EOF
echo "is_descendant_of(A,X):0" >expect &&
- test_three_modes is_descendant_of
+ test_all_modes is_descendant_of
'
test_expect_success 'get_merge_bases_many' '
@@ -142,7 +180,7 @@
git rev-parse commit-5-6 \
commit-4-7 | sort
} >expect &&
- test_three_modes get_merge_bases_many
+ test_all_modes get_merge_bases_many
'
test_expect_success 'reduce_heads' '
@@ -164,7 +202,7 @@
commit-2-8 \
commit-1-10 | sort
} >expect &&
- test_three_modes reduce_heads
+ test_all_modes reduce_heads
'
test_expect_success 'can_all_from_reach:hit' '
@@ -187,7 +225,7 @@
Y:commit-8-1
EOF
echo "can_all_from_reach(X,Y):1" >expect &&
- test_three_modes can_all_from_reach
+ test_all_modes can_all_from_reach
'
test_expect_success 'can_all_from_reach:miss' '
@@ -209,7 +247,7 @@
Y:commit-8-5
EOF
echo "can_all_from_reach(X,Y):0" >expect &&
- test_three_modes can_all_from_reach
+ test_all_modes can_all_from_reach
'
test_expect_success 'can_all_from_reach_with_flag: tags case' '
@@ -232,7 +270,7 @@
Y:commit-8-1
EOF
echo "can_all_from_reach_with_flag(X,_,_,0,0):1" >expect &&
- test_three_modes can_all_from_reach_with_flag
+ test_all_modes can_all_from_reach_with_flag
'
test_expect_success 'commit_contains:hit' '
@@ -248,8 +286,8 @@
X:commit-9-3
EOF
echo "commit_contains(_,A,X,_):1" >expect &&
- test_three_modes commit_contains &&
- test_three_modes commit_contains --tag
+ test_all_modes commit_contains &&
+ test_all_modes commit_contains --tag
'
test_expect_success 'commit_contains:miss' '
@@ -265,8 +303,8 @@
X:commit-9-3
EOF
echo "commit_contains(_,A,X,_):0" >expect &&
- test_three_modes commit_contains &&
- test_three_modes commit_contains --tag
+ test_all_modes commit_contains &&
+ test_all_modes commit_contains --tag
'
test_expect_success 'rev-list: basic topo-order' '
@@ -278,7 +316,7 @@
commit-6-2 commit-5-2 commit-4-2 commit-3-2 commit-2-2 commit-1-2 \
commit-6-1 commit-5-1 commit-4-1 commit-3-1 commit-2-1 commit-1-1 \
>expect &&
- run_three_modes git rev-list --topo-order commit-6-6
+ run_all_modes git rev-list --topo-order commit-6-6
'
test_expect_success 'rev-list: first-parent topo-order' '
@@ -290,7 +328,7 @@
commit-6-2 \
commit-6-1 commit-5-1 commit-4-1 commit-3-1 commit-2-1 commit-1-1 \
>expect &&
- run_three_modes git rev-list --first-parent --topo-order commit-6-6
+ run_all_modes git rev-list --first-parent --topo-order commit-6-6
'
test_expect_success 'rev-list: range topo-order' '
@@ -302,7 +340,7 @@
commit-6-2 commit-5-2 commit-4-2 \
commit-6-1 commit-5-1 commit-4-1 \
>expect &&
- run_three_modes git rev-list --topo-order commit-3-3..commit-6-6
+ run_all_modes git rev-list --topo-order commit-3-3..commit-6-6
'
test_expect_success 'rev-list: range topo-order' '
@@ -314,7 +352,7 @@
commit-6-2 commit-5-2 commit-4-2 \
commit-6-1 commit-5-1 commit-4-1 \
>expect &&
- run_three_modes git rev-list --topo-order commit-3-8..commit-6-6
+ run_all_modes git rev-list --topo-order commit-3-8..commit-6-6
'
test_expect_success 'rev-list: first-parent range topo-order' '
@@ -326,7 +364,7 @@
commit-6-2 \
commit-6-1 commit-5-1 commit-4-1 \
>expect &&
- run_three_modes git rev-list --first-parent --topo-order commit-3-8..commit-6-6
+ run_all_modes git rev-list --first-parent --topo-order commit-3-8..commit-6-6
'
test_expect_success 'rev-list: ancestry-path topo-order' '
@@ -336,7 +374,7 @@
commit-6-4 commit-5-4 commit-4-4 commit-3-4 \
commit-6-3 commit-5-3 commit-4-3 \
>expect &&
- run_three_modes git rev-list --topo-order --ancestry-path commit-3-3..commit-6-6
+ run_all_modes git rev-list --topo-order --ancestry-path commit-3-3..commit-6-6
'
test_expect_success 'rev-list: symmetric difference topo-order' '
@@ -350,7 +388,7 @@
commit-3-8 commit-2-8 commit-1-8 \
commit-3-7 commit-2-7 commit-1-7 \
>expect &&
- run_three_modes git rev-list --topo-order commit-3-8...commit-6-6
+ run_all_modes git rev-list --topo-order commit-3-8...commit-6-6
'
test_expect_success 'get_reachable_subset:all' '
@@ -370,7 +408,7 @@
commit-1-7 \
commit-5-6 | sort
) >expect &&
- test_three_modes get_reachable_subset
+ test_all_modes get_reachable_subset
'
test_expect_success 'get_reachable_subset:some' '
@@ -388,7 +426,7 @@
git rev-parse commit-3-3 \
commit-1-7 | sort
) >expect &&
- test_three_modes get_reachable_subset
+ test_all_modes get_reachable_subset
'
test_expect_success 'get_reachable_subset:none' '
@@ -402,7 +440,7 @@
Y:commit-2-8
EOF
echo "get_reachable_subset(X,Y)" >expect &&
- test_three_modes get_reachable_subset
+ test_all_modes get_reachable_subset
'
test_done
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index c978b6d..25bb9bb 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -3,74 +3,74 @@
test_description='git mv in subdirs'
. ./test-lib.sh
-test_expect_success \
- 'prepare reference tree' \
- 'mkdir path0 path1 &&
- cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
- git add path0/COPYING &&
- git commit -m add -a'
+test_expect_success 'prepare reference tree' '
+ mkdir path0 path1 &&
+ cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
+ git add path0/COPYING &&
+ git commit -m add -a
+'
-test_expect_success \
- 'moving the file out of subdirectory' \
- 'cd path0 && git mv COPYING ../path1/COPYING'
+test_expect_success 'moving the file out of subdirectory' '
+ git -C path0 mv COPYING ../path1/COPYING
+'
# in path0 currently
-test_expect_success \
- 'commiting the change' \
- 'cd .. && git commit -m move-out -a'
+test_expect_success 'commiting the change' '
+ git commit -m move-out -a
+'
-test_expect_success \
- 'checking the commit' \
- 'git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
- grep "^R100..*path0/COPYING..*path1/COPYING" actual'
+test_expect_success 'checking the commit' '
+ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+ grep "^R100..*path0/COPYING..*path1/COPYING" actual
+'
-test_expect_success \
- 'moving the file back into subdirectory' \
- 'cd path0 && git mv ../path1/COPYING COPYING'
+test_expect_success 'moving the file back into subdirectory' '
+ git -C path0 mv ../path1/COPYING COPYING
+'
# in path0 currently
-test_expect_success \
- 'commiting the change' \
- 'cd .. && git commit -m move-in -a'
+test_expect_success 'commiting the change' '
+ git commit -m move-in -a
+'
-test_expect_success \
- 'checking the commit' \
- 'git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
- grep "^R100..*path1/COPYING..*path0/COPYING" actual'
+test_expect_success 'checking the commit' '
+ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+ grep "^R100..*path1/COPYING..*path0/COPYING" actual
+'
-test_expect_success \
- 'mv --dry-run does not move file' \
- 'git mv -n path0/COPYING MOVED &&
- test -f path0/COPYING &&
- test ! -f MOVED'
+test_expect_success 'mv --dry-run does not move file' '
+ git mv -n path0/COPYING MOVED &&
+ test -f path0/COPYING &&
+ test ! -f MOVED
+'
-test_expect_success \
- 'checking -k on non-existing file' \
- 'git mv -k idontexist path0'
+test_expect_success 'checking -k on non-existing file' '
+ git mv -k idontexist path0
+'
-test_expect_success \
- 'checking -k on untracked file' \
- 'touch untracked1 &&
- git mv -k untracked1 path0 &&
- test -f untracked1 &&
- test ! -f path0/untracked1'
+test_expect_success 'checking -k on untracked file' '
+ >untracked1 &&
+ git mv -k untracked1 path0 &&
+ test -f untracked1 &&
+ test ! -f path0/untracked1
+'
-test_expect_success \
- 'checking -k on multiple untracked files' \
- 'touch untracked2 &&
- git mv -k untracked1 untracked2 path0 &&
- test -f untracked1 &&
- test -f untracked2 &&
- test ! -f path0/untracked1 &&
- test ! -f path0/untracked2'
+test_expect_success 'checking -k on multiple untracked files' '
+ >untracked2 &&
+ git mv -k untracked1 untracked2 path0 &&
+ test -f untracked1 &&
+ test -f untracked2 &&
+ test ! -f path0/untracked1 &&
+ test ! -f path0/untracked2
+'
-test_expect_success \
- 'checking -f on untracked file with existing target' \
- 'touch path0/untracked1 &&
- test_must_fail git mv -f untracked1 path0 &&
- test ! -f .git/index.lock &&
- test -f untracked1 &&
- test -f path0/untracked1'
+test_expect_success 'checking -f on untracked file with existing target' '
+ >path0/untracked1 &&
+ test_must_fail git mv -f untracked1 path0 &&
+ test ! -f .git/index.lock &&
+ test -f untracked1 &&
+ test -f path0/untracked1
+'
# clean up the mess in case bad things happen
rm -f idontexist untracked1 untracked2 \
@@ -78,87 +78,89 @@
.git/index.lock
rmdir path1
-test_expect_success \
- 'moving to absent target with trailing slash' \
- 'test_must_fail git mv path0/COPYING no-such-dir/ &&
- test_must_fail git mv path0/COPYING no-such-dir// &&
- git mv path0/ no-such-dir/ &&
- test_path_is_dir no-such-dir'
+test_expect_success 'moving to absent target with trailing slash' '
+ test_must_fail git mv path0/COPYING no-such-dir/ &&
+ test_must_fail git mv path0/COPYING no-such-dir// &&
+ git mv path0/ no-such-dir/ &&
+ test_path_is_dir no-such-dir
+'
-test_expect_success \
- 'clean up' \
- 'git reset --hard'
+test_expect_success 'clean up' '
+ git reset --hard
+'
-test_expect_success \
- 'moving to existing untracked target with trailing slash' \
- 'mkdir path1 &&
- git mv path0/ path1/ &&
- test_path_is_dir path1/path0/'
+test_expect_success 'moving to existing untracked target with trailing slash' '
+ mkdir path1 &&
+ git mv path0/ path1/ &&
+ test_path_is_dir path1/path0/
+'
-test_expect_success \
- 'moving to existing tracked target with trailing slash' \
- 'mkdir path2 &&
- >path2/file && git add path2/file &&
- git mv path1/path0/ path2/ &&
- test_path_is_dir path2/path0/'
+test_expect_success 'moving to existing tracked target with trailing slash' '
+ mkdir path2 &&
+ >path2/file && git add path2/file &&
+ git mv path1/path0/ path2/ &&
+ test_path_is_dir path2/path0/
+'
-test_expect_success \
- 'clean up' \
- 'git reset --hard'
+test_expect_success 'clean up' '
+ git reset --hard
+'
-test_expect_success \
- 'adding another file' \
- 'cp "$TEST_DIRECTORY"/../README.md path0/README &&
- git add path0/README &&
- git commit -m add2 -a'
+test_expect_success 'adding another file' '
+ cp "$TEST_DIRECTORY"/../README.md path0/README &&
+ git add path0/README &&
+ git commit -m add2 -a
+'
-test_expect_success \
- 'moving whole subdirectory' \
- 'git mv path0 path2'
+test_expect_success 'moving whole subdirectory' '
+ git mv path0 path2
+'
-test_expect_success \
- 'commiting the change' \
- 'git commit -m dir-move -a'
+test_expect_success 'commiting the change' '
+ git commit -m dir-move -a
+'
-test_expect_success \
- 'checking the commit' \
- 'git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
- grep "^R100..*path0/COPYING..*path2/COPYING" actual &&
- grep "^R100..*path0/README..*path2/README" actual'
+test_expect_success 'checking the commit' '
+ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+ grep "^R100..*path0/COPYING..*path2/COPYING" actual &&
+ grep "^R100..*path0/README..*path2/README" actual
+'
-test_expect_success \
- 'succeed when source is a prefix of destination' \
- 'git mv path2/COPYING path2/COPYING-renamed'
+test_expect_success 'succeed when source is a prefix of destination' '
+ git mv path2/COPYING path2/COPYING-renamed
+'
-test_expect_success \
- 'moving whole subdirectory into subdirectory' \
- 'git mv path2 path1'
+test_expect_success 'moving whole subdirectory into subdirectory' '
+ git mv path2 path1
+'
-test_expect_success \
- 'commiting the change' \
- 'git commit -m dir-move -a'
+test_expect_success 'commiting the change' '
+ git commit -m dir-move -a
+'
-test_expect_success \
- 'checking the commit' \
- 'git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
- grep "^R100..*path2/COPYING..*path1/path2/COPYING" actual &&
- grep "^R100..*path2/README..*path1/path2/README" actual'
+test_expect_success 'checking the commit' '
+ git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+ grep "^R100..*path2/COPYING..*path1/path2/COPYING" actual &&
+ grep "^R100..*path2/README..*path1/path2/README" actual
+'
-test_expect_success \
- 'do not move directory over existing directory' \
- 'mkdir path0 && mkdir path0/path2 && test_must_fail git mv path2 path0'
+test_expect_success 'do not move directory over existing directory' '
+ mkdir path0 &&
+ mkdir path0/path2 &&
+ test_must_fail git mv path2 path0
+'
-test_expect_success \
- 'move into "."' \
- 'git mv path1/path2/ .'
+test_expect_success 'move into "."' '
+ git mv path1/path2/ .
+'
test_expect_success "Michael Cassar's test case" '
rm -fr .git papers partA &&
git init &&
mkdir -p papers/unsorted papers/all-papers partA &&
- echo a > papers/unsorted/Thesis.pdf &&
- echo b > partA/outline.txt &&
- echo c > papers/unsorted/_another &&
+ echo a >papers/unsorted/Thesis.pdf &&
+ echo b >partA/outline.txt &&
+ echo c >papers/unsorted/_another &&
git add papers partA &&
T1=$(git write-tree) &&
@@ -177,47 +179,46 @@
date >ab.c &&
date >ab/d &&
git add ab.c ab &&
- git commit -m 'initial' &&
+ git commit -m "initial" &&
git mv ab a
'
-test_expect_success 'absolute pathname' '(
+test_expect_success 'absolute pathname' '
+ (
+ rm -fr mine &&
+ mkdir mine &&
+ cd mine &&
+ test_create_repo one &&
+ cd one &&
+ mkdir sub &&
+ >sub/file &&
+ git add sub/file &&
- rm -fr mine &&
- mkdir mine &&
- cd mine &&
- test_create_repo one &&
- cd one &&
- mkdir sub &&
- >sub/file &&
- git add sub/file &&
+ git mv sub "$(pwd)/in" &&
+ ! test -d sub &&
+ test -d in &&
+ git ls-files --error-unmatch in/file
+ )
+'
- git mv sub "$(pwd)/in" &&
- ! test -d sub &&
- test -d in &&
- git ls-files --error-unmatch in/file
+test_expect_success 'absolute pathname outside should fail' '
+ (
+ rm -fr mine &&
+ mkdir mine &&
+ cd mine &&
+ out=$(pwd) &&
+ test_create_repo one &&
+ cd one &&
+ mkdir sub &&
+ >sub/file &&
+ git add sub/file &&
-
-)'
-
-test_expect_success 'absolute pathname outside should fail' '(
-
- rm -fr mine &&
- mkdir mine &&
- cd mine &&
- out=$(pwd) &&
- test_create_repo one &&
- cd one &&
- mkdir sub &&
- >sub/file &&
- git add sub/file &&
-
- test_must_fail git mv sub "$out/out" &&
- test -d sub &&
- ! test -d ../in &&
- git ls-files --error-unmatch sub/file
-
-)'
+ test_must_fail git mv sub "$out/out" &&
+ test -d sub &&
+ ! test -d ../in &&
+ git ls-files --error-unmatch sub/file
+ )
+'
test_expect_success 'git mv to move multiple sources into a directory' '
rm -fr .git && git init &&
@@ -227,23 +228,24 @@
git add dir/?.txt &&
git mv dir/a.txt dir/b.txt other &&
git ls-files >actual &&
- { echo other/a.txt; echo other/b.txt; } >expect &&
+ cat >expect <<-\EOF &&
+ other/a.txt
+ other/b.txt
+ EOF
test_cmp expect actual
'
test_expect_success 'git mv should not change sha1 of moved cache entry' '
-
rm -fr .git &&
git init &&
echo 1 >dirty &&
git add dirty &&
entry="$(git ls-files --stage dirty | cut -f 1)" &&
git mv dirty dirty2 &&
- [ "$entry" = "$(git ls-files --stage dirty2 | cut -f 1)" ] &&
+ test "$entry" = "$(git ls-files --stage dirty2 | cut -f 1)" &&
echo 2 >dirty2 &&
git mv dirty2 dirty &&
- [ "$entry" = "$(git ls-files --stage dirty | cut -f 1)" ]
-
+ test "$entry" = "$(git ls-files --stage dirty | cut -f 1)"
'
rm -f dirty dirty2
@@ -266,7 +268,6 @@
'
test_expect_success 'git mv should overwrite symlink to a file' '
-
rm -fr .git &&
git init &&
echo 1 >moved &&
@@ -279,13 +280,11 @@
test "$(cat symlink)" = 1 &&
git update-index --refresh &&
git diff-files --quiet
-
'
rm -f moved symlink
test_expect_success 'git mv should overwrite file with a symlink' '
-
rm -fr .git &&
git init &&
echo 1 >moved &&
@@ -296,11 +295,9 @@
! test -e symlink &&
git update-index --refresh &&
git diff-files --quiet
-
'
test_expect_success SYMLINKS 'check moved symlink' '
-
test -h moved
'
@@ -335,11 +332,8 @@
mkdir mod &&
git mv sub mod/sub &&
! test -e sub &&
- [ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
- (
- cd mod/sub &&
- git status
- ) &&
+ test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
+ git -C mod/sub status &&
git update-index --refresh &&
git diff-files --quiet
'
@@ -358,11 +352,8 @@
mkdir mod &&
git mv sub mod/sub &&
! test -e sub &&
- [ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
- (
- cd mod/sub &&
- git status
- ) &&
+ test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
+ git -C mod/sub status &&
echo mod/sub >expected &&
git config -f .gitmodules submodule.sub.path >actual &&
test_cmp expected actual &&
@@ -376,16 +367,10 @@
git submodule update &&
entry="$(git ls-files --stage sub | cut -f 1)" &&
mkdir mod &&
- (
- cd mod &&
- git mv ../sub/ .
- ) &&
+ git -C mod mv ../sub/ . &&
! test -e sub &&
- [ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
- (
- cd mod/sub &&
- git status
- ) &&
+ test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
+ git -C mod/sub status &&
echo mod/sub >expected &&
git config -f .gitmodules submodule.sub.path >actual &&
test_cmp expected actual &&
@@ -403,11 +388,8 @@
git mv sub mod/sub 2>actual.err &&
test_must_be_empty actual.err &&
! test -e sub &&
- [ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
- (
- cd mod/sub &&
- git status
- ) &&
+ test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
+ git -C mod/sub status &&
git update-index --refresh &&
git diff-files --quiet
'
@@ -427,11 +409,8 @@
git mv sub mod/sub 2>actual.err &&
test_must_be_empty actual.err &&
! test -e sub &&
- [ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
- (
- cd mod/sub &&
- git status
- ) &&
+ test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
+ git -C mod/sub status &&
git update-index --refresh &&
git diff-files --quiet
'
@@ -446,13 +425,10 @@
echo "warning: Could not find section in .gitmodules where path=sub" >expect.err &&
mkdir mod &&
git mv sub mod/sub 2>actual.err &&
- test_i18ncmp expect.err actual.err &&
+ test_cmp expect.err actual.err &&
! test -e sub &&
- [ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
- (
- cd mod/sub &&
- git status
- ) &&
+ test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
+ git -C mod/sub status &&
git update-index --refresh &&
git diff-files --quiet
'
@@ -515,15 +491,17 @@
test_expect_success 'moving nested submodules' '
git commit -am "cleanup commit" &&
mkdir sub_nested_nested &&
- (cd sub_nested_nested &&
- touch nested_level2 &&
+ (
+ cd sub_nested_nested &&
+ >nested_level2 &&
git init &&
git add . &&
git commit -m "nested level 2"
) &&
mkdir sub_nested &&
- (cd sub_nested &&
- touch nested_level1 &&
+ (
+ cd sub_nested &&
+ >nested_level1 &&
git init &&
git add . &&
git commit -m "nested level 1" &&
diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh
index e23de7d..1c55695 100755
--- a/t/t7003-filter-branch.sh
+++ b/t/t7003-filter-branch.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='git filter-branch'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY/lib-gpg.sh"
@@ -13,7 +16,7 @@
mkdir dir &&
test_commit dir/D &&
test_commit E &&
- git checkout master &&
+ git checkout main &&
test_commit C &&
git checkout branch &&
git merge C &&
@@ -25,7 +28,7 @@
# * G
# * Merge commit 'C' into branch
# |\
-# | * (master) C
+# | * (main) C
# * | E
# * | dir/D
# * | D
@@ -162,15 +165,15 @@
'
test_expect_success 'more setup' '
- git checkout master &&
+ git checkout main &&
mkdir subdir &&
echo A > subdir/new &&
git add subdir/new &&
test_tick &&
- git commit -m "subdir on master" subdir/new &&
+ git commit -m "subdir on main" subdir/new &&
git rm A.t &&
test_tick &&
- git commit -m "again subdir on master" &&
+ git commit -m "again subdir on main" &&
git merge branch
'
@@ -199,7 +202,7 @@
git branch preserved-author &&
(sane_unset GIT_AUTHOR_NAME &&
git filter-branch -f --msg-filter "cat; \
- test \$GIT_COMMIT != $(git rev-parse master) || \
+ test \$GIT_COMMIT != $(git rev-parse main) || \
echo Hallo" \
preserved-author) &&
git rev-list --author="B V Uips" preserved-author >actual &&
@@ -218,7 +221,7 @@
else\
git commit-tree \"\$@\";\
fi" removed-author &&
- cnt1=$(git rev-list master | wc -l) &&
+ cnt1=$(git rev-list main | wc -l) &&
cnt2=$(git rev-list removed-author | wc -l) &&
test $cnt1 -eq $(($cnt2 + 1)) &&
git rev-list --author="B V Uips" removed-author >actual &&
@@ -226,7 +229,7 @@
'
test_expect_success 'barf on invalid name' '
- test_must_fail git filter-branch -f master xy-problem &&
+ test_must_fail git filter-branch -f main xy-problem &&
test_must_fail git filter-branch -f HEAD^
'
@@ -236,8 +239,8 @@
mapped=\$(map \$parent) &&
actual=\$(echo \"\$@\" | sed \"s/^.*-p //\") &&
test \$mapped = \$actual &&
- git commit-tree \"\$@\";" master~2..master &&
- git rev-parse --verify master
+ git commit-tree \"\$@\";" main~2..main &&
+ git rev-parse --verify main
'
test_expect_success 'Name needing quotes' '
@@ -256,7 +259,7 @@
test_expect_success 'Subdirectory filter with disappearing trees' '
git reset --hard &&
- git checkout master &&
+ git checkout main &&
mkdir foo &&
touch foo/bar &&
@@ -275,7 +278,7 @@
git commit -m "Re-adding foo" &&
git filter-branch -f --subdirectory-filter foo &&
- git rev-list master >actual &&
+ git rev-list main >actual &&
test_line_count = 3 actual
'
@@ -332,7 +335,7 @@
test_cmp expect actual
'
test_expect_success 'setup --prune-empty comparisons' '
- git checkout --orphan master-no-a &&
+ git checkout --orphan main-no-a &&
git rm -rf . &&
unset test_tick &&
test_tick &&
@@ -343,7 +346,7 @@
mkdir dir &&
test_commit dir/D dir/D.t dir/D dir/Dx &&
test_commit E E.t E Ex &&
- git checkout master-no-a &&
+ git checkout main-no-a &&
test_commit C C.t C Cx &&
git checkout branch-no-a &&
git merge Cx -m "Merge tag '\''C'\'' into branch" &&
@@ -397,7 +400,7 @@
'
test_expect_success '--remap-to-ancestor with filename filters' '
- git checkout master &&
+ git checkout main &&
git reset --hard A &&
test_commit add-foo foo 1 &&
git branch moved-foo &&
@@ -407,15 +410,15 @@
git branch moved-bar &&
test_commit change-foo foo 2 &&
git filter-branch -f --remap-to-ancestor \
- moved-foo moved-bar A..master \
+ moved-foo moved-bar A..main \
-- -- foo &&
test $(git rev-parse moved-foo) = $(git rev-parse moved-bar) &&
- test $(git rev-parse moved-foo) = $(git rev-parse master^) &&
+ test $(git rev-parse moved-foo) = $(git rev-parse main^) &&
test $orig_invariant = $(git rev-parse invariant)
'
test_expect_success 'automatic remapping to ancestor with filename filters' '
- git checkout master &&
+ git checkout main &&
git reset --hard A &&
test_commit add-foo2 foo 1 &&
git branch moved-foo2 &&
@@ -425,10 +428,10 @@
git branch moved-bar2 &&
test_commit change-foo2 foo 2 &&
git filter-branch -f \
- moved-foo2 moved-bar2 A..master \
+ moved-foo2 moved-bar2 A..main \
-- -- foo &&
test $(git rev-parse moved-foo2) = $(git rev-parse moved-bar2) &&
- test $(git rev-parse moved-foo2) = $(git rev-parse master^) &&
+ test $(git rev-parse moved-foo2) = $(git rev-parse main^) &&
test $orig_invariant = $(git rev-parse invariant2)
'
@@ -463,10 +466,11 @@
'
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/t/t7004-tag.sh b/t/t7004-tag.sh
index 6db92bd..2f72c5c 100755
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -7,6 +7,9 @@
Tests for operations with tags.'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-gpg.sh
. "$TEST_DIRECTORY"/lib-terminal.sh
@@ -17,6 +20,13 @@
git show-ref --quiet --verify refs/tags/"$1"
}
+test_expect_success 'setup' '
+ test_oid_cache <<-EOM
+ othersigheader sha1:gpgsig-sha256
+ othersigheader sha256:gpgsig
+ EOM
+'
+
test_expect_success 'listing all tags in an empty tree should succeed' '
git tag -l &&
git tag
@@ -88,7 +98,7 @@
git tag --create-reflog tag_with_reflog &&
git reflog exists refs/tags/tag_with_reflog &&
sed -e "s/^.* //" .git/logs/refs/tags/tag_with_reflog >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'annotated tag with --create-reflog has correct message' '
@@ -99,7 +109,7 @@
git tag -m "annotated tag" --create-reflog tag_with_reflog &&
git reflog exists refs/tags/tag_with_reflog &&
sed -e "s/^.* //" .git/logs/refs/tags/tag_with_reflog >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success '--create-reflog does not create reflog on failure' '
@@ -1371,6 +1381,24 @@
'test_config gpg.program echo &&
test_must_fail git tag -s -m tail tag-gpg-failure'
+# try to produce invalid signature
+test_expect_success GPG 'git verifies tag is valid with double signature' '
+ git tag -s -m tail tag-gpg-double-sig &&
+ git cat-file tag tag-gpg-double-sig >tag &&
+ othersigheader=$(test_oid othersigheader) &&
+ sed -ne "/^\$/q;p" tag >new-tag &&
+ cat <<-EOM >>new-tag &&
+ $othersigheader -----BEGIN PGP SIGNATURE-----
+ someinvaliddata
+ -----END PGP SIGNATURE-----
+ EOM
+ sed -e "1,/^tagger/d" tag >>new-tag &&
+ new_tag=$(git hash-object -t tag -w new-tag) &&
+ git update-ref refs/tags/tag-gpg-double-sig $new_tag &&
+ git verify-tag tag-gpg-double-sig &&
+ git fsck
+'
+
# try to sign with bad user.signingkey
test_expect_success GPGSM \
'git tag -s fails if gpgsm is misconfigured (bad key)' \
@@ -1406,7 +1434,7 @@
# check the first line --- should be empty
echo >first.expect &&
sed -e 1q <actual >first.actual &&
- test_i18ncmp first.expect first.actual
+ test_cmp first.expect first.actual
'
test_expect_success \
@@ -1583,7 +1611,7 @@
"
test_expect_success 'merging original branch into this branch' '
- git merge --strategy=ours master &&
+ git merge --strategy=ours main &&
git tag v4.0
'
@@ -1726,9 +1754,10 @@
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
+ test_cmp expect actual
'
test_expect_success 'multiple --points-at are OR-ed together' '
@@ -1943,15 +1972,15 @@
i=1 &&
while test $i -lt 8000
do
- echo "commit refs/heads/master
+ echo "commit refs/heads/main
committer A U Thor <author@example.com> $((1000000000 + $i * 100)) +0200
data <<EOF
commit #$i
EOF"
- test $i = 1 && echo "from refs/heads/master^0"
+ test $i = 1 && echo "from refs/heads/main^0"
i=$(($i + 1))
done | git fast-import &&
- git checkout master &&
+ git checkout main &&
git tag far-far-away HEAD^ &&
run_with_limited_stack git tag --contains HEAD >actual &&
test_must_be_empty actual &&
@@ -2014,8 +2043,8 @@
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/t/t7006-pager.sh b/t/t7006-pager.sh
index 00e09a3..0e7cf75 100755
--- a/t/t7006-pager.sh
+++ b/t/t7006-pager.sh
@@ -19,7 +19,7 @@
test_expect_success TTY 'some commands use a pager' '
rm -f paginated.out &&
test_terminal git log &&
- test -e paginated.out
+ test_path_is_file paginated.out
'
test_expect_failure TTY 'pager runs from subdir' '
@@ -65,49 +65,49 @@
test_expect_success TTY 'some commands do not use a pager' '
rm -f paginated.out &&
test_terminal git rev-list HEAD &&
- ! test -e paginated.out
+ test_path_is_missing paginated.out
'
test_expect_success 'no pager when stdout is a pipe' '
rm -f paginated.out &&
git log | cat &&
- ! test -e paginated.out
+ test_path_is_missing paginated.out
'
test_expect_success 'no pager when stdout is a regular file' '
rm -f paginated.out &&
git log >file &&
- ! test -e paginated.out
+ test_path_is_missing paginated.out
'
test_expect_success TTY 'git --paginate rev-list uses a pager' '
rm -f paginated.out &&
test_terminal git --paginate rev-list HEAD &&
- test -e paginated.out
+ test_path_is_file paginated.out
'
test_expect_success 'no pager even with --paginate when stdout is a pipe' '
rm -f file paginated.out &&
git --paginate log | cat &&
- ! test -e paginated.out
+ test_path_is_missing paginated.out
'
test_expect_success TTY 'no pager with --no-pager' '
rm -f paginated.out &&
test_terminal git --no-pager log &&
- ! test -e paginated.out
+ test_path_is_missing paginated.out
'
test_expect_success TTY 'configuration can disable pager' '
rm -f paginated.out &&
test_unconfig pager.grep &&
test_terminal git grep initial &&
- test -e paginated.out &&
+ test_path_is_file paginated.out &&
rm -f paginated.out &&
test_config pager.grep false &&
test_terminal git grep initial &&
- ! test -e paginated.out
+ test_path_is_missing paginated.out
'
test_expect_success TTY 'configuration can enable pager (from subdir)' '
@@ -122,107 +122,107 @@
test_terminal git bundle unbundle ../test.bundle
) &&
{
- test -e paginated.out ||
- test -e subdir/paginated.out
+ test_path_is_file paginated.out ||
+ test_path_is_file subdir/paginated.out
}
'
test_expect_success TTY 'git tag -l defaults to paging' '
rm -f paginated.out &&
test_terminal git tag -l &&
- test -e paginated.out
+ test_path_is_file paginated.out
'
test_expect_success TTY 'git tag -l respects pager.tag' '
rm -f paginated.out &&
test_terminal git -c pager.tag=false tag -l &&
- ! test -e paginated.out
+ test_path_is_missing paginated.out
'
test_expect_success TTY 'git tag -l respects --no-pager' '
rm -f paginated.out &&
test_terminal git -c pager.tag --no-pager tag -l &&
- ! test -e paginated.out
+ test_path_is_missing paginated.out
'
test_expect_success TTY 'git tag with no args defaults to paging' '
# no args implies -l so this should page like -l
rm -f paginated.out &&
test_terminal git tag &&
- test -e paginated.out
+ test_path_is_file paginated.out
'
test_expect_success TTY 'git tag with no args respects pager.tag' '
# no args implies -l so this should page like -l
rm -f paginated.out &&
test_terminal git -c pager.tag=false tag &&
- ! test -e paginated.out
+ test_path_is_missing paginated.out
'
test_expect_success TTY 'git tag --contains defaults to paging' '
# --contains implies -l so this should page like -l
rm -f paginated.out &&
test_terminal git tag --contains &&
- test -e paginated.out
+ test_path_is_file paginated.out
'
test_expect_success TTY 'git tag --contains respects pager.tag' '
# --contains implies -l so this should page like -l
rm -f paginated.out &&
test_terminal git -c pager.tag=false tag --contains &&
- ! test -e paginated.out
+ test_path_is_missing paginated.out
'
test_expect_success TTY 'git tag -a defaults to not paging' '
test_when_finished "git tag -d newtag" &&
rm -f paginated.out &&
test_terminal git tag -am message newtag &&
- ! test -e paginated.out
+ test_path_is_missing paginated.out
'
test_expect_success TTY 'git tag -a ignores pager.tag' '
test_when_finished "git tag -d newtag" &&
rm -f paginated.out &&
test_terminal git -c pager.tag tag -am message newtag &&
- ! test -e paginated.out
+ test_path_is_missing paginated.out
'
test_expect_success TTY 'git tag -a respects --paginate' '
test_when_finished "git tag -d newtag" &&
rm -f paginated.out &&
test_terminal git --paginate tag -am message newtag &&
- test -e paginated.out
+ test_path_is_file paginated.out
'
test_expect_success TTY 'git tag as alias ignores pager.tag with -a' '
test_when_finished "git tag -d newtag" &&
rm -f paginated.out &&
test_terminal git -c pager.tag -c alias.t=tag t -am message newtag &&
- ! test -e paginated.out
+ test_path_is_missing paginated.out
'
test_expect_success TTY 'git tag as alias respects pager.tag with -l' '
rm -f paginated.out &&
test_terminal git -c pager.tag=false -c alias.t=tag t -l &&
- ! test -e paginated.out
+ test_path_is_missing paginated.out
'
test_expect_success TTY 'git branch defaults to paging' '
rm -f paginated.out &&
test_terminal git branch &&
- test -e paginated.out
+ test_path_is_file paginated.out
'
test_expect_success TTY 'git branch respects pager.branch' '
rm -f paginated.out &&
test_terminal git -c pager.branch=false branch &&
- ! test -e paginated.out
+ test_path_is_missing paginated.out
'
test_expect_success TTY 'git branch respects --no-pager' '
rm -f paginated.out &&
test_terminal git --no-pager branch &&
- ! test -e paginated.out
+ test_path_is_missing paginated.out
'
test_expect_success TTY 'git branch --edit-description ignores pager.branch' '
@@ -232,8 +232,8 @@
touch editor.used
EOF
EDITOR=./editor test_terminal git -c pager.branch branch --edit-description &&
- ! test -e paginated.out &&
- test -e editor.used
+ test_path_is_missing paginated.out &&
+ test_path_is_file editor.used
'
test_expect_success TTY 'git branch --set-upstream-to ignores pager.branch' '
@@ -242,13 +242,13 @@
test_when_finished "git branch -D other" &&
test_terminal git -c pager.branch branch --set-upstream-to=other &&
test_when_finished "git branch --unset-upstream" &&
- ! test -e paginated.out
+ test_path_is_missing paginated.out
'
test_expect_success TTY 'git config ignores pager.config when setting' '
rm -f paginated.out &&
test_terminal git -c pager.config config foo.bar bar &&
- ! test -e paginated.out
+ test_path_is_missing paginated.out
'
test_expect_success TTY 'git config --edit ignores pager.config' '
@@ -257,33 +257,33 @@
touch editor.used
EOF
EDITOR=./editor test_terminal git -c pager.config config --edit &&
- ! test -e paginated.out &&
- test -e editor.used
+ test_path_is_missing paginated.out &&
+ test_path_is_file editor.used
'
test_expect_success TTY 'git config --get ignores pager.config' '
rm -f paginated.out &&
test_terminal git -c pager.config config --get foo.bar &&
- ! test -e paginated.out
+ test_path_is_missing paginated.out
'
test_expect_success TTY 'git config --get-urlmatch defaults to paging' '
rm -f paginated.out &&
test_terminal git -c http."https://foo.com/".bar=foo \
config --get-urlmatch http https://foo.com &&
- test -e paginated.out
+ test_path_is_file paginated.out
'
test_expect_success TTY 'git config --get-all respects pager.config' '
rm -f paginated.out &&
test_terminal git -c pager.config=false config --get-all foo.bar &&
- ! test -e paginated.out
+ test_path_is_missing paginated.out
'
test_expect_success TTY 'git config --list defaults to paging' '
rm -f paginated.out &&
test_terminal git config --list &&
- test -e paginated.out
+ test_path_is_file paginated.out
'
@@ -392,7 +392,7 @@
export PATH &&
$full_command
) &&
- test -e default_pager_used
+ test_path_is_file default_pager_used
"
}
@@ -406,7 +406,7 @@
PAGER='wc >PAGER_used' &&
export PAGER &&
$full_command &&
- test -e PAGER_used
+ test_path_is_file PAGER_used
"
}
@@ -432,7 +432,7 @@
export PAGER &&
test_config core.pager 'wc >core.pager_used' &&
$full_command &&
- ${if_local_config}test -e core.pager_used
+ ${if_local_config}test_path_is_file core.pager_used
"
}
@@ -464,7 +464,7 @@
cd sub &&
$full_command
) &&
- ${if_local_config}test -e core.pager_used
+ ${if_local_config}test_path_is_file core.pager_used
"
}
@@ -477,7 +477,7 @@
GIT_PAGER='wc >GIT_PAGER_used' &&
export GIT_PAGER &&
$full_command &&
- test -e GIT_PAGER_used
+ test_path_is_file GIT_PAGER_used
"
}
@@ -489,7 +489,7 @@
GIT_PAGER='wc >GIT_PAGER_used' &&
export GIT_PAGER &&
$full_command &&
- ! test -e GIT_PAGER_used
+ test_path_is_missing GIT_PAGER_used
"
}
@@ -656,4 +656,134 @@
test_cmp expect actual
'
+test_expect_success 'setup trace2' '
+ GIT_TRACE2_BRIEF=1 &&
+ export GIT_TRACE2_BRIEF
+'
+
+test_expect_success TTY 'git returns SIGPIPE on early pager exit' '
+ test_when_finished "rm pager-used trace.normal" &&
+ test_config core.pager ">pager-used; head -n 1; exit 0" &&
+ GIT_TRACE2="$(pwd)/trace.normal" &&
+ export GIT_TRACE2 &&
+ test_when_finished "unset GIT_TRACE2" &&
+
+ if test_have_prereq !MINGW
+ then
+ OUT=$( ((test_terminal git log; echo $? 1>&3) | :) 3>&1 ) &&
+ test_match_signal 13 "$OUT"
+ else
+ test_terminal git log
+ fi &&
+
+ grep child_exit trace.normal >child-exits &&
+ test_line_count = 1 child-exits &&
+ grep " code:0 " child-exits &&
+ test_path_is_file pager-used
+'
+
+test_expect_success TTY 'git returns SIGPIPE on early pager non-zero exit' '
+ test_when_finished "rm pager-used trace.normal" &&
+ test_config core.pager ">pager-used; head -n 1; exit 1" &&
+ GIT_TRACE2="$(pwd)/trace.normal" &&
+ export GIT_TRACE2 &&
+ test_when_finished "unset GIT_TRACE2" &&
+
+ if test_have_prereq !MINGW
+ then
+ OUT=$( ((test_terminal git log; echo $? 1>&3) | :) 3>&1 ) &&
+ test_match_signal 13 "$OUT"
+ else
+ test_terminal git log
+ fi &&
+
+ grep child_exit trace.normal >child-exits &&
+ test_line_count = 1 child-exits &&
+ grep " code:1 " child-exits &&
+ test_path_is_file pager-used
+'
+
+test_expect_success TTY 'git discards pager non-zero exit without SIGPIPE' '
+ test_when_finished "rm pager-used trace.normal" &&
+ test_config core.pager "wc >pager-used; exit 1" &&
+ GIT_TRACE2="$(pwd)/trace.normal" &&
+ export GIT_TRACE2 &&
+ test_when_finished "unset GIT_TRACE2" &&
+
+ if test_have_prereq !MINGW
+ then
+ OUT=$( ((test_terminal git log; echo $? 1>&3) | :) 3>&1 ) &&
+ test "$OUT" -eq 0
+ else
+ test_terminal git log
+ fi &&
+
+ grep child_exit trace.normal >child-exits &&
+ test_line_count = 1 child-exits &&
+ grep " code:1 " child-exits &&
+ test_path_is_file pager-used
+'
+
+test_expect_success TTY 'git discards nonexisting pager without SIGPIPE' '
+ test_when_finished "rm pager-used trace.normal" &&
+ test_config core.pager "wc >pager-used; does-not-exist" &&
+ GIT_TRACE2="$(pwd)/trace.normal" &&
+ export GIT_TRACE2 &&
+ test_when_finished "unset GIT_TRACE2" &&
+
+ if test_have_prereq !MINGW
+ then
+ OUT=$( ((test_terminal git log; echo $? 1>&3) | :) 3>&1 ) &&
+ test "$OUT" -eq 0
+ else
+ test_terminal git log
+ fi &&
+
+ grep child_exit trace.normal >child-exits &&
+ test_line_count = 1 child-exits &&
+ grep " code:127 " child-exits &&
+ test_path_is_file pager-used
+'
+
+test_expect_success TTY 'git attempts to page to nonexisting pager command, gets SIGPIPE' '
+ test_when_finished "rm trace.normal" &&
+ test_config core.pager "does-not-exist" &&
+ GIT_TRACE2="$(pwd)/trace.normal" &&
+ export GIT_TRACE2 &&
+ test_when_finished "unset GIT_TRACE2" &&
+
+ if test_have_prereq !MINGW
+ then
+ OUT=$( ((test_terminal git log; echo $? 1>&3) | :) 3>&1 ) &&
+ test_match_signal 13 "$OUT"
+ else
+ test_terminal git log
+ fi &&
+
+ grep child_exit trace.normal >child-exits &&
+ test_line_count = 1 child-exits &&
+ grep " code:-1 " child-exits
+'
+
+test_expect_success TTY 'git returns SIGPIPE on propagated signals from pager' '
+ test_when_finished "rm pager-used trace.normal" &&
+ test_config core.pager ">pager-used; test-tool sigchain" &&
+ GIT_TRACE2="$(pwd)/trace.normal" &&
+ export GIT_TRACE2 &&
+ test_when_finished "unset GIT_TRACE2" &&
+
+ if test_have_prereq !MINGW
+ then
+ OUT=$( ((test_terminal git log; echo $? 1>&3) | :) 3>&1 ) &&
+ test_match_signal 13 "$OUT"
+ else
+ test_terminal git log
+ fi &&
+
+ grep child_exit trace.normal >child-exits &&
+ test_line_count = 1 child-exits &&
+ grep " code:143 " child-exits &&
+ test_path_is_file pager-used
+'
+
test_done
diff --git a/t/t7011-skip-worktree-reading.sh b/t/t7011-skip-worktree-reading.sh
index 37525ca..2685258 100755
--- a/t/t7011-skip-worktree-reading.sh
+++ b/t/t7011-skip-worktree-reading.sh
@@ -109,15 +109,6 @@
test -z "$(git ls-files -m)"
'
-test_expect_success 'grep with skip-worktree file' '
- git update-index --no-skip-worktree 1 &&
- echo test > 1 &&
- git update-index 1 &&
- git update-index --skip-worktree 1 &&
- rm 1 &&
- test "$(git grep --no-ext-grep test)" = "1:test"
-'
-
echo ":000000 100644 $ZERO_OID $EMPTY_BLOB A 1" > expected
test_expect_success 'diff-index does not examine skip-worktree absent entries' '
setup_absent &&
diff --git a/t/t7012-skip-worktree-writing.sh b/t/t7012-skip-worktree-writing.sh
index 7476781..f2a8e76 100755
--- a/t/t7012-skip-worktree-writing.sh
+++ b/t/t7012-skip-worktree-writing.sh
@@ -125,13 +125,13 @@
test_expect_success 'git-clean, absent case' '
setup_absent &&
git clean -n > result &&
- test_i18ncmp expected result
+ test_cmp expected result
'
test_expect_success 'git-clean, dirty case' '
setup_dirty &&
git clean -n > result &&
- test_i18ncmp expected result
+ test_cmp expected result
'
test_expect_success '--ignore-skip-worktree-entries leaves worktree alone' '
@@ -149,6 +149,94 @@
--diff-filter=D -- keep-me.t
'
+test_expect_success 'stash restore in sparse checkout' '
+ test_create_repo stash-restore &&
+ (
+ cd stash-restore &&
+
+ mkdir subdir &&
+ echo A >subdir/A &&
+ echo untouched >untouched &&
+ echo removeme >removeme &&
+ echo modified >modified &&
+ git add . &&
+ git commit -m Initial &&
+
+ echo AA >>subdir/A &&
+ echo addme >addme &&
+ echo tweaked >>modified &&
+ rm removeme &&
+ git add addme &&
+
+ git stash push &&
+
+ git sparse-checkout set subdir &&
+
+ # Ensure after sparse-checkout we only have expected files
+ cat >expect <<-EOF &&
+ S modified
+ S removeme
+ H subdir/A
+ S untouched
+ EOF
+ git ls-files -t >actual &&
+ test_cmp expect actual &&
+
+ test_path_is_missing addme &&
+ test_path_is_missing modified &&
+ test_path_is_missing removeme &&
+ test_path_is_file subdir/A &&
+ test_path_is_missing untouched &&
+
+ # Put a file in the working directory in the way
+ echo in the way >modified &&
+ git stash apply &&
+
+ # Ensure stash vivifies modifies paths...
+ cat >expect <<-EOF &&
+ H addme
+ H modified
+ H removeme
+ H subdir/A
+ S untouched
+ EOF
+ git ls-files -t >actual &&
+ test_cmp expect actual &&
+
+ # ...and that the paths show up in status as changed...
+ cat >expect <<-EOF &&
+ A addme
+ M modified
+ D removeme
+ M subdir/A
+ ?? actual
+ ?? expect
+ ?? modified.stash.XXXXXX
+ EOF
+ git status --porcelain | \
+ sed -e s/stash......./stash.XXXXXX/ >actual &&
+ test_cmp expect actual &&
+
+ # ...and that working directory reflects the files correctly
+ test_path_is_file addme &&
+ test_path_is_file modified &&
+ test_path_is_missing removeme &&
+ test_path_is_file subdir/A &&
+ test_path_is_missing untouched &&
+
+ # ...including that we have the expected "modified" file...
+ cat >expect <<-EOF &&
+ modified
+ tweaked
+ EOF
+ test_cmp expect modified &&
+
+ # ...and that the other "modified" file is still present...
+ echo in the way >expect &&
+ test_cmp expect modified.stash.*
+ )
+'
+
#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/t/t7030-verify-tag.sh b/t/t7030-verify-tag.sh
index 5c5bc32..3cefde9 100755
--- a/t/t7030-verify-tag.sh
+++ b/t/t7030-verify-tag.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='signed tag tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY/lib-gpg.sh"
@@ -17,7 +20,7 @@
echo 3 >elif && git add elif &&
test_tick && git commit -m "third on side" &&
- git checkout master &&
+ git checkout main &&
test_tick && git merge -S side &&
git tag -s -m merge merge &&
diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh
index d521874..0f4344c 100755
--- a/t/t7060-wtstatus.sh
+++ b/t/t7060-wtstatus.sh
@@ -2,6 +2,9 @@
test_description='basic work tree status reporting'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
@@ -51,11 +54,11 @@
git checkout -b side HEAD^ &&
git rm foo &&
git commit -m delete &&
- test_must_fail git merge master &&
+ test_must_fail git merge main &&
test_must_fail git commit --dry-run >../actual &&
- test_i18ncmp ../expect ../actual &&
+ test_cmp ../expect ../actual &&
git status >../actual &&
- test_i18ncmp ../expect ../actual
+ test_cmp ../expect ../actual
)
'
@@ -124,18 +127,18 @@
test_expect_success 'status when conflicts with add and rm advice (deleted by them)' '
git reset --hard &&
- git checkout master &&
+ git checkout main &&
test_commit init main.txt init &&
git checkout -b second_branch &&
git rm main.txt &&
git commit -m "main.txt deleted on second_branch" &&
test_commit second conflict.txt second &&
- git checkout master &&
+ git checkout main &&
test_commit on_second main.txt on_second &&
- test_commit master conflict.txt master &&
+ test_commit main conflict.txt main &&
test_must_fail git merge second_branch &&
cat >expected <<\EOF &&
-On branch master
+On branch main
You have unmerged paths.
(fix conflicts and run "git commit")
(use "git merge --abort" to abort the merge)
@@ -148,7 +151,7 @@
no changes added to commit (use "git add" and/or "git commit -a")
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -157,8 +160,8 @@
git checkout -b conflict &&
test_commit one main.txt one &&
git branch conflict_second &&
- git mv main.txt sub_master.txt &&
- git commit -m "main.txt renamed in sub_master.txt" &&
+ git mv main.txt sub_main.txt &&
+ git commit -m "main.txt renamed in sub_main.txt" &&
git checkout conflict_second &&
git mv main.txt sub_second.txt &&
git commit -m "main.txt renamed in sub_second.txt"
@@ -176,20 +179,20 @@
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
both deleted: main.txt
- added by them: sub_master.txt
+ added by them: sub_main.txt
added by us: sub_second.txt
no changes added to commit (use "git add" and/or "git commit -a")
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'status when conflicts with only rm advice (both deleted)' '
git reset --hard conflict_second &&
test_must_fail git merge conflict &&
- git add sub_master.txt &&
+ git add sub_main.txt &&
git add sub_second.txt &&
cat >expected <<\EOF &&
On branch conflict_second
@@ -198,7 +201,7 @@
(use "git merge --abort" to abort the merge)
Changes to be committed:
- new file: sub_master.txt
+ new file: sub_main.txt
Unmerged paths:
(use "git rm <file>..." to mark resolution)
@@ -207,14 +210,14 @@
Untracked files not listed (use -u option to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual &&
+ test_cmp expected actual &&
git reset --hard &&
- git checkout master
+ git checkout main
'
test_expect_success 'status --branch with detached HEAD' '
git reset --hard &&
- git checkout master^0 &&
+ git checkout main^0 &&
git status --branch --porcelain >actual &&
cat >expected <<-EOF &&
## HEAD (no branch)
@@ -224,13 +227,13 @@
?? expected
?? mdconflict/
EOF
- test_i18ncmp expected actual
+ test_cmp expected actual
'
## Duplicate the above test and verify --porcelain=v1 arg parsing.
test_expect_success 'status --porcelain=v1 --branch with detached HEAD' '
git reset --hard &&
- git checkout master^0 &&
+ git checkout main^0 &&
git status --branch --porcelain=v1 >actual &&
cat >expected <<-EOF &&
## HEAD (no branch)
@@ -240,7 +243,7 @@
?? expected
?? mdconflict/
EOF
- test_i18ncmp expected actual
+ test_cmp expected actual
'
## Verify parser error on invalid --porcelain argument.
diff --git a/t/t7061-wtstatus-ignore.sh b/t/t7061-wtstatus-ignore.sh
index e4cf548..2f9bea9 100755
--- a/t/t7061-wtstatus-ignore.sh
+++ b/t/t7061-wtstatus-ignore.sh
@@ -30,6 +30,31 @@
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
diff --git a/t/t7063-status-untracked-cache.sh b/t/t7063-status-untracked-cache.sh
index 190ae14..accefde 100755
--- a/t/t7063-status-untracked-cache.sh
+++ b/t/t7063-status-untracked-cache.sh
@@ -2,6 +2,9 @@
test_description='test untracked cache'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
# On some filesystems (e.g. FreeBSD's ext2 and ufs) directory mtime
@@ -18,7 +21,7 @@
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 +33,30 @@
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 +78,24 @@
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 +113,17 @@
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 +132,8 @@
: >../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 +154,8 @@
: >../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 +177,7 @@
: >../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 +187,7 @@
?? four
?? three
EOF
+ test_cmp ../status.expect ../status.iuc &&
test_cmp ../status.expect ../actual &&
cat >../trace.expect <<EOF &&
node creation: 0
@@ -160,18 +203,18 @@
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 +226,7 @@
: >../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 +236,7 @@
?? dtwo/
?? three
EOF
+ test_cmp ../status.expect ../status.iuc &&
test_cmp ../status.expect ../actual &&
cat >../trace.expect <<EOF &&
node creation: 0
@@ -207,18 +252,18 @@
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 +275,7 @@
: >../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 +283,7 @@
?? .gitignore
?? dtwo/
EOF
+ test_cmp ../status.expect ../status.iuc &&
test_cmp ../status.expect ../actual &&
cat >../trace.expect <<EOF &&
node creation: 0
@@ -250,16 +297,16 @@
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 +316,14 @@
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 +333,7 @@
: >../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 +341,7 @@
?? dtwo/
?? two
EOF
+ test_cmp ../status.expect ../status.iuc &&
test_cmp ../status.expect ../actual &&
cat >../trace.expect <<EOF &&
node creation: 0
@@ -306,17 +355,17 @@
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 +375,14 @@
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 +392,7 @@
: >../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 +400,7 @@
?? .gitignore
?? dtwo/
EOF
+ test_cmp ../status.expect ../status.iuc &&
test_cmp ../status.expect ../actual &&
cat >../trace.expect <<EOF &&
node creation: 0
@@ -363,16 +414,16 @@
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 +441,12 @@
: >../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 +460,16 @@
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
@@ -425,7 +478,7 @@
test_expect_success 'set up sparse checkout' '
echo "done/[a-z]*" >.git/info/sparse-checkout &&
test_config core.sparsecheckout true &&
- git checkout master &&
+ git checkout main &&
git update-index --force-untracked-cache &&
git status --porcelain >/dev/null && # prime the cache
test_path_is_missing done/.gitignore &&
@@ -447,12 +500,14 @@
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 +521,17 @@
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 +542,14 @@
: >../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 +571,7 @@
: >../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 +579,7 @@
?? 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 +593,22 @@
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 +619,8 @@
: >../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 +634,7 @@
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 +642,14 @@
?? 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 +657,7 @@
?? done/sub/
?? dtwo/
EOF
+ test_cmp ../status.expect ../status.iuc &&
test_cmp ../status.expect ../status.actual
'
@@ -666,19 +731,19 @@
cp -R done dthree dtwo four three ../other_worktree &&
GIT_WORK_TREE=../other_worktree git status 2>../err &&
echo "warning: untracked cache is disabled on this system or location" >../expect &&
- test_i18ncmp ../expect ../err
+ test_cmp ../expect ../err
'
test_expect_success 'untracked cache survives a checkout' '
git commit --allow-empty -m empty &&
test-tool dump-untracked-cache >../before &&
- test_when_finished "git checkout master" &&
+ test_when_finished "git checkout main" &&
git checkout -b other_branch &&
test-tool dump-untracked-cache >../after &&
test_cmp ../before ../after &&
test_commit test &&
test-tool dump-untracked-cache >../before &&
- git checkout master &&
+ git checkout main &&
test-tool dump-untracked-cache >../after &&
test_cmp ../before ../after
'
@@ -713,7 +778,7 @@
git checkout HEAD~ &&
status_is_clean &&
status_is_clean &&
- git checkout master &&
+ git checkout main &&
avoid_racy &&
status_is_clean &&
status_is_clean
@@ -724,7 +789,7 @@
git checkout HEAD~ &&
status_is_clean &&
status_is_clean &&
- git checkout master &&
+ git checkout main &&
avoid_racy &&
status_is_clean &&
status_is_clean
@@ -748,14 +813,14 @@
git checkout HEAD~ &&
status_is_clean &&
status_is_clean &&
- git checkout master &&
+ git checkout main &&
avoid_racy &&
status_is_clean &&
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
@@ -766,7 +831,7 @@
git checkout HEAD~ &&
status_is_clean &&
status_is_clean &&
- git checkout master &&
+ git checkout main &&
avoid_racy &&
status_is_clean &&
status_is_clean
diff --git a/t/t7064-wtstatus-pv2.sh b/t/t7064-wtstatus-pv2.sh
index 537787e..4613882 100755
--- a/t/t7064-wtstatus-pv2.sh
+++ b/t/t7064-wtstatus-pv2.sh
@@ -5,10 +5,14 @@
This test exercises porcelain V2 output for git status.'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
+ git checkout -f --orphan initial-branch &&
test_tick &&
git config core.autocrlf false &&
echo x >file_x &&
@@ -22,7 +26,7 @@
test_expect_success 'before initial commit, nothing added, only untracked' '
cat >expect <<-EOF &&
# branch.oid (initial)
- # branch.head master
+ # branch.head initial-branch
? actual
? dir1/
? expect
@@ -45,7 +49,7 @@
cat >expect <<-EOF &&
# branch.oid (initial)
- # branch.head master
+ # branch.head initial-branch
1 A. N... 000000 100644 100644 $ZERO_OID $OID_A dir1/file_a
1 A. N... 000000 100644 100644 $ZERO_OID $OID_B dir1/file_b
1 A. N... 000000 100644 100644 $ZERO_OID $OID_X file_x
@@ -62,7 +66,7 @@
test_expect_success 'before initial commit, things added (-z)' '
lf_to_nul >expect <<-EOF &&
# branch.oid (initial)
- # branch.head master
+ # branch.head initial-branch
1 A. N... 000000 100644 100644 $ZERO_OID $OID_A dir1/file_a
1 A. N... 000000 100644 100644 $ZERO_OID $OID_B dir1/file_b
1 A. N... 000000 100644 100644 $ZERO_OID $OID_X file_x
@@ -81,7 +85,7 @@
H0=$(git rev-parse HEAD) &&
cat >expect <<-EOF &&
# branch.oid $H0
- # branch.head master
+ # branch.head initial-branch
? actual
? expect
EOF
@@ -98,7 +102,7 @@
cat >expect <<-EOF &&
# branch.oid $H0
- # branch.head master
+ # branch.head initial-branch
1 .M N... 100644 100644 100644 $OID_X $OID_X file_x
1 .D N... 100644 100644 000000 $OID_Z $OID_Z file_z
? actual
@@ -126,7 +130,7 @@
cat >expect <<-EOF &&
# branch.oid $H0
- # branch.head master
+ # branch.head initial-branch
1 M. N... 100644 100644 100644 $OID_X $OID_X1 file_x
1 D. N... 100644 000000 000000 $OID_Z $ZERO_OID file_z
? actual
@@ -143,7 +147,7 @@
q_to_tab >expect <<-EOF &&
# branch.oid $H0
- # branch.head master
+ # branch.head initial-branch
1 M. N... 100644 100644 100644 $OID_X $OID_X1 file_x
1 D. N... 100644 000000 000000 $OID_Z $ZERO_OID file_z
2 R. N... 100644 100644 100644 $OID_Y $OID_Y R100 renamed_yQfile_y
@@ -161,7 +165,7 @@
## Lines use NUL path separator and line terminator, so double transform here.
q_to_nul <<-EOF | lf_to_nul >expect &&
# branch.oid $H0
- # branch.head master
+ # branch.head initial-branch
1 M. N... 100644 100644 100644 $OID_X $OID_X1 file_x
1 D. N... 100644 000000 000000 $OID_Z $ZERO_OID file_z
2 R. N... 100644 100644 100644 $OID_Y $OID_Y R100 renamed_yQfile_y
@@ -179,7 +183,7 @@
cat >expect <<-EOF &&
# branch.oid $H1
- # branch.head master
+ # branch.head initial-branch
? actual
? expect
EOF
@@ -231,7 +235,7 @@
cat >expect <<-EOF &&
# branch.oid $H1
- # branch.head master
+ # branch.head initial-branch
EOF
git status --porcelain=v2 --branch >actual &&
@@ -257,14 +261,14 @@
test_expect_success 'verify AA (add-add) conflict' '
test_when_finished "git reset --hard" &&
- git branch AA_A master &&
+ git branch AA_A initial-branch &&
git checkout AA_A &&
echo "Branch AA_A" >conflict.txt &&
OID_AA_A=$(git hash-object -t blob -- conflict.txt) &&
git add conflict.txt &&
git commit -m "branch aa_a" &&
- git branch AA_B master &&
+ git branch AA_B initial-branch &&
git checkout AA_B &&
echo "Branch AA_B" >conflict.txt &&
OID_AA_B=$(git hash-object -t blob -- conflict.txt) &&
@@ -290,7 +294,7 @@
test_expect_success 'verify UU (edit-edit) conflict' '
test_when_finished "git reset --hard" &&
- git branch UU_ANC master &&
+ git branch UU_ANC initial-branch &&
git checkout UU_ANC &&
echo "Ancestor" >conflict.txt &&
OID_UU_ANC=$(git hash-object -t blob -- conflict.txt) &&
@@ -328,18 +332,18 @@
'
test_expect_success 'verify upstream fields in branch header' '
- git checkout master &&
+ git checkout initial-branch &&
test_when_finished "rm -rf sub_repo" &&
git clone . sub_repo &&
(
- ## Confirm local master tracks remote master.
+ ## Confirm local initial-branch tracks remote initial-branch.
cd sub_repo &&
HUF=$(git rev-parse HEAD) &&
cat >expect <<-EOF &&
# branch.oid $HUF
- # branch.head master
- # branch.upstream origin/master
+ # branch.head initial-branch
+ # branch.upstream origin/initial-branch
# branch.ab +0 -0
EOF
@@ -355,8 +359,8 @@
cat >expect <<-EOF &&
# branch.oid $HUF
- # branch.head master
- # branch.upstream origin/master
+ # branch.head initial-branch
+ # branch.upstream origin/initial-branch
# branch.ab +1 -0
EOF
@@ -367,9 +371,9 @@
git status --porcelain=v2 --untracked-files=all >actual &&
test_must_be_empty actual &&
- ## Test upstream-gone case. Fake this by pointing origin/master at
- ## a non-existing commit.
- OLD=$(git rev-parse origin/master) &&
+ ## Test upstream-gone case. Fake this by pointing
+ ## origin/initial-branch at a non-existing commit.
+ OLD=$(git rev-parse origin/initial-branch) &&
NEW=$ZERO_OID &&
mv .git/packed-refs .git/old-packed-refs &&
sed "s/$OLD/$NEW/g" <.git/old-packed-refs >.git/packed-refs &&
@@ -378,8 +382,8 @@
cat >expect <<-EOF &&
# branch.oid $HUF
- # branch.head master
- # branch.upstream origin/master
+ # branch.head initial-branch
+ # branch.upstream origin/initial-branch
EOF
git status --porcelain=v2 --branch --untracked-files=all >actual &&
@@ -388,19 +392,19 @@
'
test_expect_success 'verify --[no-]ahead-behind with V2 format' '
- git checkout master &&
+ git checkout initial-branch &&
test_when_finished "rm -rf sub_repo" &&
git clone . sub_repo &&
(
- ## Confirm local master tracks remote master.
+ ## Confirm local initial-branch tracks remote initial-branch.
cd sub_repo &&
HUF=$(git rev-parse HEAD) &&
# Confirm --no-ahead-behind reports traditional branch.ab with 0/0 for equal branches.
cat >expect <<-EOF &&
# branch.oid $HUF
- # branch.head master
- # branch.upstream origin/master
+ # branch.head initial-branch
+ # branch.upstream origin/initial-branch
# branch.ab +0 -0
EOF
@@ -410,8 +414,8 @@
# Confirm --ahead-behind reports traditional branch.ab with 0/0.
cat >expect <<-EOF &&
# branch.oid $HUF
- # branch.head master
- # branch.upstream origin/master
+ # branch.head initial-branch
+ # branch.upstream origin/initial-branch
# branch.ab +0 -0
EOF
@@ -428,8 +432,8 @@
# Confirm --no-ahead-behind reports branch.ab with ?/? for non-equal branches.
cat >expect <<-EOF &&
# branch.oid $HUF
- # branch.head master
- # branch.upstream origin/master
+ # branch.head initial-branch
+ # branch.upstream origin/initial-branch
# branch.ab +? -?
EOF
@@ -439,8 +443,8 @@
# Confirm --ahead-behind reports traditional branch.ab with 1/0.
cat >expect <<-EOF &&
# branch.oid $HUF
- # branch.head master
- # branch.upstream origin/master
+ # branch.head initial-branch
+ # branch.upstream origin/initial-branch
# branch.ab +1 -0
EOF
@@ -458,7 +462,7 @@
'
test_expect_success 'create and add submodule, submodule appears clean (A. S...)' '
- git checkout master &&
+ git checkout initial-branch &&
git clone . sub_repo &&
git clone . super_repo &&
( cd super_repo &&
@@ -471,8 +475,8 @@
cat >expect <<-EOF &&
# branch.oid $HSUP
- # branch.head master
- # branch.upstream origin/master
+ # branch.head initial-branch
+ # branch.upstream origin/initial-branch
# branch.ab +0 -0
1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
1 A. S... 000000 160000 160000 $ZERO_OID $HSUB sub1
@@ -496,8 +500,8 @@
cat >expect <<-EOF &&
# branch.oid $HSUP
- # branch.head master
- # branch.upstream origin/master
+ # branch.head initial-branch
+ # branch.upstream origin/initial-branch
# branch.ab +0 -0
1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
1 AM S..U 000000 160000 160000 $ZERO_OID $HSUB sub1
@@ -521,8 +525,8 @@
cat >expect <<-EOF &&
# branch.oid $HSUP
- # branch.head master
- # branch.upstream origin/master
+ # branch.head initial-branch
+ # branch.upstream origin/initial-branch
# branch.ab +0 -0
1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
1 AM S.M. 000000 160000 160000 $ZERO_OID $HSUB sub1
@@ -548,8 +552,8 @@
cat >expect <<-EOF &&
# branch.oid $HSUP
- # branch.head master
- # branch.upstream origin/master
+ # branch.head initial-branch
+ # branch.upstream origin/initial-branch
# branch.ab +0 -0
1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
1 AM S.M. 000000 160000 160000 $ZERO_OID $HSUB sub1
@@ -575,8 +579,8 @@
cat >expect <<-EOF &&
# branch.oid $HSUP
- # branch.head master
- # branch.upstream origin/master
+ # branch.head initial-branch
+ # branch.upstream origin/initial-branch
# branch.ab +0 -0
1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
1 AM S.MU 000000 160000 160000 $ZERO_OID $HSUB sub1
@@ -602,8 +606,8 @@
cat >expect <<-EOF &&
# branch.oid $HSUP
- # branch.head master
- # branch.upstream origin/master
+ # branch.head initial-branch
+ # branch.upstream origin/initial-branch
# branch.ab +0 -0
1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
1 AM SC.. 000000 160000 160000 $ZERO_OID $HSUB sub1
@@ -625,8 +629,8 @@
cat >expect <<-EOF &&
# branch.oid $HSUP
- # branch.head master
- # branch.upstream origin/master
+ # branch.head initial-branch
+ # branch.upstream origin/initial-branch
# branch.ab +1 -0
EOF
@@ -646,8 +650,8 @@
cat >expect <<-EOF &&
# branch.oid $HSUP
- # branch.head master
- # branch.upstream origin/master
+ # branch.head initial-branch
+ # branch.upstream origin/initial-branch
# branch.ab +1 -0
1 .M S.M. 160000 160000 160000 $HSUB $HSUB sub1
EOF
diff --git a/t/t7101-reset-empty-subdirs.sh b/t/t7101-reset-empty-subdirs.sh
index 96e163f..bfce05a 100755
--- a/t/t7101-reset-empty-subdirs.sh
+++ b/t/t7101-reset-empty-subdirs.sh
@@ -6,16 +6,15 @@
test_description='git reset should cull empty subdirs'
. ./test-lib.sh
-test_expect_success \
- 'creating initial files' \
- 'mkdir path0 &&
+test_expect_success 'creating initial files' '
+ mkdir path0 &&
cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
git add path0/COPYING &&
- git commit -m add -a'
+ git commit -m add -a
+'
-test_expect_success \
- 'creating second files' \
- 'mkdir path1 &&
+test_expect_success 'creating second files' '
+ mkdir path1 &&
mkdir path1/path2 &&
cp "$TEST_DIRECTORY"/../COPYING path1/path2/COPYING &&
cp "$TEST_DIRECTORY"/../COPYING path1/COPYING &&
@@ -25,39 +24,40 @@
git add path1/COPYING &&
git add COPYING &&
git add path0/COPYING-TOO &&
- git commit -m change -a'
+ git commit -m change -a
+'
-test_expect_success \
- 'resetting tree HEAD^' \
- 'git reset --hard HEAD^'
+test_expect_success 'resetting tree HEAD^' '
+ git reset --hard HEAD^
+'
-test_expect_success \
- 'checking initial files exist after rewind' \
- 'test -d path0 &&
- test -f path0/COPYING'
+test_expect_success 'checking initial files exist after rewind' '
+ test -d path0 &&
+ test -f path0/COPYING
+'
-test_expect_success \
- 'checking lack of path1/path2/COPYING' \
- '! test -f path1/path2/COPYING'
+test_expect_success 'checking lack of path1/path2/COPYING' '
+ ! test -f path1/path2/COPYING
+'
-test_expect_success \
- 'checking lack of path1/COPYING' \
- '! test -f path1/COPYING'
+test_expect_success 'checking lack of path1/COPYING' '
+ ! test -f path1/COPYING
+'
-test_expect_success \
- 'checking lack of COPYING' \
- '! test -f COPYING'
+test_expect_success 'checking lack of COPYING' '
+ ! test -f COPYING
+'
-test_expect_success \
- 'checking checking lack of path1/COPYING-TOO' \
- '! test -f path0/COPYING-TOO'
+test_expect_success 'checking checking lack of path1/COPYING-TOO' '
+ ! test -f path0/COPYING-TOO
+'
-test_expect_success \
- 'checking lack of path1/path2' \
- '! test -d path1/path2'
+test_expect_success 'checking lack of path1/path2' '
+ ! test -d path1/path2
+'
-test_expect_success \
- 'checking lack of path1' \
- '! test -d path1'
+test_expect_success 'checking lack of path1' '
+ ! test -d path1
+'
test_done
diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index 97be0d9..601b2bf 100755
--- a/t/t7102-reset.sh
+++ b/t/t7102-reset.sh
@@ -7,6 +7,9 @@
Documented tests for git reset'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
commit_msg () {
@@ -37,17 +40,23 @@
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
@@ -64,27 +73,27 @@
test_expect_success 'reset --hard message' '
hex=$(git log -1 --format="%h") &&
- git reset --hard > .actual &&
- echo HEAD is now at $hex $(commit_msg) > .expected &&
- test_i18ncmp .expected .actual
+ git reset --hard >.actual &&
+ echo HEAD is now at $hex $(commit_msg) >.expected &&
+ test_cmp .expected .actual
'
test_expect_success 'reset --hard message (ISO8859-1 logoutputencoding)' '
hex=$(git log -1 --format="%h") &&
- git -c "i18n.logOutputEncoding=$test_encoding" reset --hard > .actual &&
- echo HEAD is now at $hex $(commit_msg $test_encoding) > .expected &&
- test_i18ncmp .expected .actual
+ git -c "i18n.logOutputEncoding=$test_encoding" reset --hard >.actual &&
+ echo HEAD is now at $hex $(commit_msg $test_encoding) >.expected &&
+ test_cmp .expected .actual
'
->.diff_expect
->.cached_expect
-cat >.cat_expect <<EOF
-secondfile:
-1st line 2nd file
-2nd line 2nd file
-EOF
-
test_expect_success 'giving a non existing revision should fail' '
+ >.diff_expect &&
+ >.cached_expect &&
+ cat >.cat_expect <<-\EOF &&
+ secondfile:
+ 1st line 2nd file
+ 2nd line 2nd file
+ EOF
+
test_must_fail git reset aaaaaa &&
test_must_fail git reset --mixed aaaaaa &&
test_must_fail git reset --soft aaaaaa &&
@@ -94,15 +103,14 @@
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 &&
git rm --cached -- un
'
-test_expect_success \
- 'giving paths with options different than --mixed should fail' '
+test_expect_success 'giving paths with options different than --mixed should fail' '
test_must_fail git reset --soft -- first &&
test_must_fail git reset --hard -- first &&
test_must_fail git reset --soft HEAD^ -- first &&
@@ -122,8 +130,7 @@
check_changes $head5
'
-test_expect_success \
- 'trying to do reset --soft with pending merge should fail' '
+test_expect_success 'trying to do reset --soft with pending merge should fail' '
git branch branch1 &&
git branch branch2 &&
@@ -141,13 +148,12 @@
printf "1st line 2nd file\n2nd line 2nd file\n3rd line" >secondfile &&
git commit -a -m "the change in branch2" &&
- git checkout master &&
+ git checkout main &&
git branch -D branch1 branch2 &&
check_changes $head5
'
-test_expect_success \
- 'trying to do reset --soft with pending checkout merge should fail' '
+test_expect_success 'trying to do reset --soft with pending checkout merge should fail' '
git branch branch3 &&
git branch branch4 &&
@@ -164,13 +170,12 @@
printf "1st line 2nd file\n2nd line 2nd file\n3rd line" >secondfile &&
git commit -a -m "the line in branch3" &&
- git checkout master &&
+ git checkout main &&
git branch -D branch3 branch4 &&
check_changes $head5
'
-test_expect_success \
- 'resetting to HEAD with no changes should succeed and do nothing' '
+test_expect_success 'resetting to HEAD with no changes should succeed and do nothing' '
git reset --hard &&
check_changes $head5 &&
git reset --hard HEAD &&
@@ -189,39 +194,38 @@
check_changes $head5
'
->.diff_expect
-cat >.cached_expect <<EOF
-diff --git a/secondfile b/secondfile
-index 1bbba79..44c5b58 100644
---- a/secondfile
-+++ b/secondfile
-@@ -1 +1,2 @@
--2nd file
-+1st line 2nd file
-+2nd line 2nd file
-EOF
-cat >.cat_expect <<EOF
-secondfile:
-1st line 2nd file
-2nd line 2nd file
-EOF
test_expect_success '--soft reset only should show changes in diff --cached' '
+ >.diff_expect &&
+ cat >.cached_expect <<-EOF &&
+ diff --git a/secondfile b/secondfile
+ index $head5p1s..$head5s 100644
+ --- a/secondfile
+ +++ b/secondfile
+ @@ -1 +1,2 @@
+ -2nd file
+ +1st line 2nd file
+ +2nd line 2nd file
+ EOF
+ cat >.cat_expect <<-\EOF &&
+ secondfile:
+ 1st line 2nd file
+ 2nd line 2nd file
+ EOF
git reset --soft HEAD^ &&
- check_changes d1a4bc3abce4829628ae2dcb0d60ef3d1a78b1c4 &&
+ check_changes $head5p1 &&
test "$(git rev-parse ORIG_HEAD)" = \
$head5
'
->.diff_expect
->.cached_expect
-cat >.cat_expect <<EOF
-secondfile:
-1st line 2nd file
-2nd line 2nd file
-3rd line 2nd file
-EOF
-test_expect_success \
- 'changing files and redo the last commit should succeed' '
+test_expect_success 'changing files and redo the last commit should succeed' '
+ >.diff_expect &&
+ >.cached_expect &&
+ cat >.cat_expect <<-\EOF &&
+ secondfile:
+ 1st line 2nd file
+ 2nd line 2nd file
+ 3rd line 2nd file
+ EOF
echo "3rd line 2nd file" >>secondfile &&
git commit -a -C ORIG_HEAD &&
head4=$(git rev-parse --verify HEAD) &&
@@ -230,106 +234,102 @@
$head5
'
->.diff_expect
->.cached_expect
-cat >.cat_expect <<EOF
-first:
-1st file
-2nd line 1st file
-second:
-2nd file
-EOF
-test_expect_success \
- '--hard reset should change the files and undo commits permanently' '
+test_expect_success '--hard reset should change the files and undo commits permanently' '
+ >.diff_expect &&
+ >.cached_expect &&
+ cat >.cat_expect <<-\EOF &&
+ first:
+ 1st file
+ 2nd line 1st file
+ second:
+ 2nd file
+ EOF
git reset --hard HEAD~2 &&
- check_changes ddaefe00f1da16864591c61fdc7adb5d7cd6b74e &&
+ check_changes $head5p2 &&
test "$(git rev-parse ORIG_HEAD)" = \
$head4
'
->.diff_expect
-cat >.cached_expect <<EOF
-diff --git a/first b/first
-deleted file mode 100644
-index 8206c22..0000000
---- a/first
-+++ /dev/null
-@@ -1,2 +0,0 @@
--1st file
--2nd line 1st file
-diff --git a/second b/second
-deleted file mode 100644
-index 1bbba79..0000000
---- a/second
-+++ /dev/null
-@@ -1 +0,0 @@
--2nd file
-diff --git a/secondfile b/secondfile
-new file mode 100644
-index 0000000..44c5b58
---- /dev/null
-+++ b/secondfile
-@@ -0,0 +1,2 @@
-+1st line 2nd file
-+2nd line 2nd file
-EOF
-cat >.cat_expect <<EOF
-secondfile:
-1st line 2nd file
-2nd line 2nd file
-EOF
-test_expect_success \
- 'redoing changes adding them without commit them should succeed' '
+test_expect_success 'redoing changes adding them without commit them should succeed' '
+ >.diff_expect &&
+ cat >.cached_expect <<-EOF &&
+ diff --git a/first b/first
+ deleted file mode 100644
+ index $head5p2f..0000000
+ --- a/first
+ +++ /dev/null
+ @@ -1,2 +0,0 @@
+ -1st file
+ -2nd line 1st file
+ diff --git a/second b/second
+ deleted file mode 100644
+ index $head5p1s..0000000
+ --- a/second
+ +++ /dev/null
+ @@ -1 +0,0 @@
+ -2nd file
+ diff --git a/secondfile b/secondfile
+ new file mode 100644
+ index 0000000..$head5s
+ --- /dev/null
+ +++ b/secondfile
+ @@ -0,0 +1,2 @@
+ +1st line 2nd file
+ +2nd line 2nd file
+ EOF
+ cat >.cat_expect <<-\EOF &&
+ secondfile:
+ 1st line 2nd file
+ 2nd line 2nd file
+ EOF
git rm first &&
git mv second secondfile &&
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
---- a/first
-+++ /dev/null
-@@ -1,2 +0,0 @@
--1st file
--2nd line 1st file
-diff --git a/second b/second
-deleted file mode 100644
-index 1bbba79..0000000
---- a/second
-+++ /dev/null
-@@ -1 +0,0 @@
--2nd file
-EOF
->.cached_expect
-cat >.cat_expect <<EOF
-secondfile:
-1st line 2nd file
-2nd line 2nd file
-EOF
test_expect_success '--mixed reset to HEAD should unadd the files' '
+ cat >.diff_expect <<-EOF &&
+ diff --git a/first b/first
+ deleted file mode 100644
+ index $head5p2f..0000000
+ --- a/first
+ +++ /dev/null
+ @@ -1,2 +0,0 @@
+ -1st file
+ -2nd line 1st file
+ diff --git a/second b/second
+ deleted file mode 100644
+ index $head5p1s..0000000
+ --- a/second
+ +++ /dev/null
+ @@ -1 +0,0 @@
+ -2nd file
+ EOF
+ >.cached_expect &&
+ cat >.cat_expect <<-\EOF &&
+ secondfile:
+ 1st line 2nd file
+ 2nd line 2nd file
+ EOF
git reset &&
- check_changes ddaefe00f1da16864591c61fdc7adb5d7cd6b74e &&
- test "$(git rev-parse ORIG_HEAD)" = \
- ddaefe00f1da16864591c61fdc7adb5d7cd6b74e
+ check_changes $head5p2 &&
+ test "$(git rev-parse ORIG_HEAD)" = $head5p2
'
->.diff_expect
->.cached_expect
-cat >.cat_expect <<EOF
-secondfile:
-1st line 2nd file
-2nd line 2nd file
-EOF
test_expect_success 'redoing the last two commits should succeed' '
+ >.diff_expect &&
+ >.cached_expect &&
+ cat >.cat_expect <<-\EOF &&
+ secondfile:
+ 1st line 2nd file
+ 2nd line 2nd file
+ EOF
git add secondfile &&
- git reset --hard ddaefe00f1da16864591c61fdc7adb5d7cd6b74e &&
-
+ git reset --hard $head5p2 &&
git rm first &&
git mv second secondfile &&
git commit -a -m "remove 1st and rename 2nd" &&
@@ -342,15 +342,15 @@
check_changes $head5
'
->.diff_expect
->.cached_expect
-cat >.cat_expect <<EOF
-secondfile:
-1st line 2nd file
-2nd line 2nd file
-3rd line in branch2
-EOF
test_expect_success '--hard reset to HEAD should clear a failed merge' '
+ >.diff_expect &&
+ >.cached_expect &&
+ cat >.cat_expect <<-\EOF &&
+ secondfile:
+ 1st line 2nd file
+ 2nd line 2nd file
+ 3rd line in branch2
+ EOF
git branch branch1 &&
git branch branch2 &&
@@ -368,15 +368,14 @@
check_changes $head3
'
->.diff_expect
->.cached_expect
-cat >.cat_expect <<EOF
-secondfile:
-1st line 2nd file
-2nd line 2nd file
-EOF
-test_expect_success \
- '--hard reset to ORIG_HEAD should clear a fast-forward merge' '
+test_expect_success '--hard reset to ORIG_HEAD should clear a fast-forward merge' '
+ >.diff_expect &&
+ >.cached_expect &&
+ cat >.cat_expect <<-\EOF &&
+ secondfile:
+ 1st line 2nd file
+ 2nd line 2nd file
+ EOF
git reset --hard HEAD^ &&
check_changes $head5 &&
@@ -384,57 +383,64 @@
git reset --hard ORIG_HEAD &&
check_changes $head5 &&
- git checkout master &&
+ git checkout main &&
git branch -D branch1 branch2 &&
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 &&
+ 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 &&
+ 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 &&
+ 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 &&
+ 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
'
test_expect_success 'test resetting the index at give paths' '
-
mkdir sub &&
>sub/file1 &&
>sub/file2 &&
@@ -447,7 +453,6 @@
echo "$U" &&
test_must_fail git diff-index --cached --exit-code "$T" &&
test "$T" != "$U"
-
'
test_expect_success 'resetting an unmodified path is a no-op' '
@@ -457,15 +462,14 @@
git diff-index --cached --exit-code HEAD
'
-cat > expect << EOF
-Unstaged changes after reset:
-M file2
-EOF
-
test_expect_success '--mixed refreshes the index' '
- echo 123 >> file2 &&
- git reset --mixed HEAD > output &&
- test_i18ncmp expect output
+ cat >expect <<-\EOF &&
+ Unstaged changes after reset:
+ M file2
+ EOF
+ echo 123 >>file2 &&
+ git reset --mixed HEAD >output &&
+ test_cmp expect output
'
test_expect_success 'resetting specific path that is unmerged' '
@@ -485,7 +489,6 @@
'
test_expect_success 'disambiguation (1)' '
-
git reset --hard &&
>secondfile &&
git add secondfile &&
@@ -494,11 +497,9 @@
test -z "$(git diff --cached --name-only)" &&
test -f secondfile &&
test_must_be_empty secondfile
-
'
test_expect_success 'disambiguation (2)' '
-
git reset --hard &&
>secondfile &&
git add secondfile &&
@@ -506,11 +507,9 @@
test_must_fail git reset secondfile &&
test -n "$(git diff --cached --name-only -- secondfile)" &&
test ! -f secondfile
-
'
test_expect_success 'disambiguation (3)' '
-
git reset --hard &&
>secondfile &&
git add secondfile &&
@@ -519,11 +518,9 @@
test_must_fail git diff --quiet &&
test -z "$(git diff --cached --name-only)" &&
test ! -f secondfile
-
'
test_expect_success 'disambiguation (4)' '
-
git reset --hard &&
>secondfile &&
git add secondfile &&
diff --git a/t/t7104-reset-hard.sh b/t/t7104-reset-hard.sh
index 16faa07..7948ec3 100755
--- a/t/t7104-reset-hard.sh
+++ b/t/t7104-reset-hard.sh
@@ -33,7 +33,7 @@
'
-test_expect_success 'reset --hard did not corrupt index or cached-tree' '
+test_expect_success 'reset --hard did not corrupt index or cache-tree' '
T=$(git write-tree) &&
rm -f .git/index &&
diff --git a/t/t7107-reset-pathspec-file.sh b/t/t7107-reset-pathspec-file.sh
index cad3a9d..15ccb14 100755
--- a/t/t7107-reset-pathspec-file.sh
+++ b/t/t7107-reset-pathspec-file.sh
@@ -22,7 +22,12 @@
verify_expect () {
git status --porcelain -- fileA.t fileB.t fileC.t fileD.t >actual &&
- test_cmp expect 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' '
@@ -131,7 +136,7 @@
cat >expect <<-\EOF &&
D fileA.t
EOF
- test_must_fail verify_expect
+ verify_expect !
'
test_expect_success 'only touches what was listed' '
diff --git a/t/t7112-reset-submodule.sh b/t/t7112-reset-submodule.sh
index a1cb9ff..19830d9 100755
--- a/t/t7112-reset-submodule.sh
+++ b/t/t7112-reset-submodule.sh
@@ -5,7 +5,6 @@
. ./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_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/t/t7113-post-index-change-hook.sh b/t/t7113-post-index-change-hook.sh
index f011ad7..688fa99 100755
--- a/t/t7113-post-index-change-hook.sh
+++ b/t/t7113-post-index-change-hook.sh
@@ -2,6 +2,9 @@
test_description='post index change hook'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup' '
@@ -85,7 +88,7 @@
EOF
: force index to be dirty &&
test-tool chmtime +60 dir1/file1.txt &&
- git checkout master &&
+ git checkout main &&
test_path_is_file testsuccess && rm -f testsuccess &&
test_path_is_missing testfailure &&
test-tool chmtime +60 dir1/file1.txt &&
diff --git a/t/t7201-co.sh b/t/t7201-co.sh
index b696bae..7f6e23a 100755
--- a/t/t7201-co.sh
+++ b/t/t7201-co.sh
@@ -5,10 +5,10 @@
test_description='git checkout tests.
-Creates master, forks renamer and side branches from it.
+Creates main, forks renamer and side branches from it.
Test switching across them.
- ! [master] Initial A one, A two
+ ! [main] Initial A one, A two
* [renamer] Renamer R one->uno, M two
! [side] Side M one, D two, A three
! [simple] Simple D one, M two
@@ -16,10 +16,13 @@
+ [simple] Simple D one, M two
+ [side] Side M one, D two, A three
* [renamer] Renamer R one->uno, M two
- +*++ [master] Initial A one, A two
+ +*++ [main] Initial A one, A two
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_tick
@@ -33,8 +36,7 @@
test_expect_success setup '
-
- fill x y z > same &&
+ fill x y z >same &&
fill 1 2 3 4 5 6 7 8 >one &&
fill a b c d e >two &&
git add same one two &&
@@ -47,32 +49,30 @@
fill a b c d e f >two &&
git commit -a -m "Renamer R one->uno, M two" &&
- git checkout -b side master &&
+ git checkout -b side main &&
fill 1 2 3 4 5 6 7 >one &&
fill A B C D E >three &&
rm -f two &&
git update-index --add --remove one two three &&
git commit -m "Side M one, D two, A three" &&
- git checkout -b simple master &&
+ git checkout -b simple main &&
rm -f one &&
- fill a c e > two &&
+ fill a c e >two &&
git commit -a -m "Simple D one, M two" &&
- git checkout master
+ git checkout main
'
-test_expect_success "checkout from non-existing branch" '
-
- git checkout -b delete-me master &&
+test_expect_success 'checkout from non-existing branch' '
+ git checkout -b delete-me main &&
git update-ref -d --no-deref refs/heads/delete-me &&
test refs/heads/delete-me = "$(git symbolic-ref HEAD)" &&
- git checkout master &&
- test refs/heads/master = "$(git symbolic-ref HEAD)"
+ git checkout main &&
+ test refs/heads/main = "$(git symbolic-ref HEAD)"
'
-test_expect_success "checkout with dirty tree without -m" '
-
+test_expect_success 'checkout with dirty tree without -m' '
fill 0 1 2 3 4 5 6 7 8 >one &&
if git checkout side
then
@@ -81,12 +81,10 @@
else
echo "happy - failed correctly"
fi
-
'
-test_expect_success "checkout with unrelated dirty tree without -m" '
-
- git checkout -f master &&
+test_expect_success 'checkout with unrelated dirty tree without -m' '
+ git checkout -f main &&
fill 0 1 2 3 4 5 6 7 8 >same &&
cp same kept &&
git checkout side >messages &&
@@ -95,22 +93,21 @@
test_cmp messages.expect messages
'
-test_expect_success "checkout -m with dirty tree" '
-
- git checkout -f master &&
+test_expect_success 'checkout -m with dirty tree' '
+ git checkout -f main &&
git clean -f &&
fill 0 1 2 3 4 5 6 7 8 >one &&
- git checkout -m side > messages &&
+ git checkout -m side >messages &&
test "$(git symbolic-ref HEAD)" = "refs/heads/side" &&
printf "M\t%s\n" one >expect.messages &&
test_cmp expect.messages messages &&
- fill "M one" "A three" "D two" >expect.master &&
- git diff --name-status master >current.master &&
- test_cmp expect.master current.master &&
+ fill "M one" "A three" "D two" >expect.main &&
+ git diff --name-status main >current.main &&
+ test_cmp expect.main current.main &&
fill "M one" >expect.side &&
git diff --name-status side >current.side &&
@@ -120,9 +117,8 @@
test_must_be_empty current.index
'
-test_expect_success "checkout -m with dirty tree, renamed" '
-
- git checkout -f master && git clean -f &&
+test_expect_success 'checkout -m with dirty tree, renamed' '
+ git checkout -f main && git clean -f &&
fill 1 2 3 4 5 7 8 >one &&
if git checkout renamer
@@ -139,12 +135,10 @@
! test -f one &&
git diff --cached >current &&
test_must_be_empty current
-
'
test_expect_success 'checkout -m with merge conflict' '
-
- git checkout -f master && git clean -f &&
+ git checkout -f main && git clean -f &&
fill 1 T 3 4 5 6 S 8 >one &&
if git checkout renamer
@@ -157,7 +151,7 @@
git checkout -m renamer &&
- git diff master:one :3:uno |
+ git diff main:one :3:uno |
sed -e "1,/^@@/d" -e "/^ /d" -e "s/^-/d/" -e "s/^+/a/" >current &&
fill d2 aT d7 aS >expect &&
test_cmp expect current &&
@@ -166,10 +160,10 @@
'
test_expect_success 'format of merge conflict from checkout -m' '
+ git checkout -f main &&
+ git clean -f &&
- git checkout -f master && git clean -f &&
-
- fill b d > two &&
+ fill b d >two &&
git checkout -m simple &&
git ls-files >current &&
@@ -190,10 +184,11 @@
'
test_expect_success 'checkout --merge --conflict=diff3 <branch>' '
+ git checkout -f main &&
+ git reset --hard &&
+ git clean -f &&
- git checkout -f master && git reset --hard && git clean -f &&
-
- fill b d > two &&
+ fill b d >two &&
git checkout --merge --conflict=diff3 simple &&
cat <<-EOF >expect &&
@@ -201,7 +196,7 @@
a
c
e
- ||||||| master
+ ||||||| main
a
b
c
@@ -216,8 +211,9 @@
'
test_expect_success 'switch to another branch while carrying a deletion' '
-
- git checkout -f master && git reset --hard && git clean -f &&
+ git checkout -f main &&
+ git reset --hard &&
+ git clean -f &&
git rm two &&
test_must_fail git checkout simple 2>errs &&
@@ -228,14 +224,15 @@
'
test_expect_success 'checkout to detach HEAD (with advice declined)' '
-
git config advice.detachedHead false &&
- git checkout -f renamer && git clean -f &&
+ 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) &&
+ M=$(git show-ref -s --verify refs/heads/main) &&
test "z$H" = "z$M" &&
if git symbolic-ref HEAD >/dev/null 2>&1
then
@@ -248,12 +245,14 @@
test_expect_success 'checkout to detach HEAD' '
git config advice.detachedHead true &&
- git checkout -f renamer && git clean -f &&
- GIT_TEST_GETTEXT_POISON=false git checkout renamer^ 2>messages &&
- grep "HEAD is now at 7329388" messages &&
+ rev=$(git rev-parse --short renamer^) &&
+ git checkout -f renamer &&
+ git clean -f &&
+ git checkout renamer^ 2>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) &&
+ M=$(git show-ref -s --verify refs/heads/main) &&
test "z$H" = "z$M" &&
if git symbolic-ref HEAD >/dev/null 2>&1
then
@@ -265,11 +264,11 @@
'
test_expect_success 'checkout to detach HEAD with branchname^' '
-
- git checkout -f master && git clean -f &&
+ git checkout -f main &&
+ git clean -f &&
git checkout renamer^ &&
H=$(git rev-parse --verify HEAD) &&
- M=$(git show-ref -s --verify refs/heads/master) &&
+ M=$(git show-ref -s --verify refs/heads/main) &&
test "z$H" = "z$M" &&
if git symbolic-ref HEAD >/dev/null 2>&1
then
@@ -281,11 +280,11 @@
'
test_expect_success 'checkout to detach HEAD with :/message' '
-
- git checkout -f master && git clean -f &&
+ git checkout -f main &&
+ git clean -f &&
git checkout ":/Initial" &&
H=$(git rev-parse --verify HEAD) &&
- M=$(git show-ref -s --verify refs/heads/master) &&
+ M=$(git show-ref -s --verify refs/heads/main) &&
test "z$H" = "z$M" &&
if git symbolic-ref HEAD >/dev/null 2>&1
then
@@ -297,11 +296,11 @@
'
test_expect_success 'checkout to detach HEAD with HEAD^0' '
-
- git checkout -f master && git clean -f &&
+ git checkout -f main &&
+ git clean -f &&
git checkout HEAD^0 &&
H=$(git rev-parse --verify HEAD) &&
- M=$(git show-ref -s --verify refs/heads/master) &&
+ M=$(git show-ref -s --verify refs/heads/main) &&
test "z$H" = "z$M" &&
if git symbolic-ref HEAD >/dev/null 2>&1
then
@@ -313,30 +312,27 @@
'
test_expect_success 'checkout with ambiguous tag/branch names' '
-
git tag both side &&
- git branch both master &&
+ git branch both main &&
git reset --hard &&
- git checkout master &&
+ git checkout main &&
git checkout both &&
H=$(git rev-parse --verify HEAD) &&
- M=$(git show-ref -s --verify refs/heads/master) &&
+ M=$(git show-ref -s --verify refs/heads/main) &&
test "z$H" = "z$M" &&
name=$(git symbolic-ref HEAD 2>/dev/null) &&
test "z$name" = zrefs/heads/both
-
'
test_expect_success 'checkout with ambiguous tag/branch names' '
-
git reset --hard &&
- git checkout master &&
+ git checkout main &&
git tag frotz side &&
- git branch frotz master &&
+ git branch frotz main &&
git reset --hard &&
- git checkout master &&
+ git checkout main &&
git checkout tags/frotz &&
H=$(git rev-parse --verify HEAD) &&
@@ -349,26 +345,19 @@
else
: happy
fi
-
'
test_expect_success 'switch branches while in subdirectory' '
-
git reset --hard &&
- git checkout master &&
+ git checkout main &&
mkdir subs &&
- (
- cd subs &&
- git checkout side
- ) &&
+ git -C subs checkout side &&
! test -f subs/one &&
rm -fr subs
-
'
test_expect_success 'checkout specific path while in subdirectory' '
-
git reset --hard &&
git checkout side &&
mkdir subs &&
@@ -376,65 +365,60 @@
git add subs/bero &&
git commit -m "add subs/bero" &&
- git checkout master &&
+ git checkout main &&
mkdir -p subs &&
- (
- cd subs &&
- git checkout side -- bero
- ) &&
+ git -C subs checkout side -- bero &&
test -f subs/bero
-
'
-test_expect_success \
- 'checkout w/--track sets up tracking' '
+test_expect_success 'checkout w/--track sets up tracking' '
git config branch.autosetupmerge false &&
- git checkout master &&
+ git checkout main &&
git checkout --track -b track1 &&
test "$(git config branch.track1.remote)" &&
- test "$(git config branch.track1.merge)"'
+ test "$(git config branch.track1.merge)"
+'
-test_expect_success \
- 'checkout w/autosetupmerge=always sets up tracking' '
+test_expect_success 'checkout w/autosetupmerge=always sets up tracking' '
test_when_finished git config branch.autosetupmerge false &&
git config branch.autosetupmerge always &&
- git checkout master &&
+ git checkout main &&
git checkout -b track2 &&
test "$(git config branch.track2.remote)" &&
- test "$(git config branch.track2.merge)"'
+ test "$(git config branch.track2.merge)"
+'
test_expect_success 'checkout w/--track from non-branch HEAD fails' '
- git checkout master^0 &&
+ git checkout main^0 &&
test_must_fail git symbolic-ref HEAD &&
test_must_fail git checkout --track -b track &&
test_must_fail git rev-parse --verify track &&
test_must_fail git symbolic-ref HEAD &&
- test "z$(git rev-parse master^0)" = "z$(git rev-parse HEAD)"
+ test "z$(git rev-parse main^0)" = "z$(git rev-parse HEAD)"
'
test_expect_success 'checkout w/--track from tag fails' '
- git checkout master^0 &&
+ git checkout main^0 &&
test_must_fail git symbolic-ref HEAD &&
test_must_fail git checkout --track -b track frotz &&
test_must_fail git rev-parse --verify track &&
test_must_fail git symbolic-ref HEAD &&
- test "z$(git rev-parse master^0)" = "z$(git rev-parse HEAD)"
+ test "z$(git rev-parse main^0)" = "z$(git rev-parse HEAD)"
'
test_expect_success 'detach a symbolic link HEAD' '
- git checkout master &&
+ git checkout main &&
git config --bool core.prefersymlinkrefs yes &&
git checkout side &&
- git checkout master &&
+ git checkout main &&
it=$(git symbolic-ref HEAD) &&
- test "z$it" = zrefs/heads/master &&
- here=$(git rev-parse --verify refs/heads/master) &&
+ test "z$it" = zrefs/heads/main &&
+ here=$(git rev-parse --verify refs/heads/main) &&
git checkout side^ &&
- test "z$(git rev-parse --verify refs/heads/master)" = "z$here"
+ test "z$(git rev-parse --verify refs/heads/main)" = "z$here"
'
-test_expect_success \
- 'checkout with --track fakes a sensible -b <name>' '
+test_expect_success 'checkout with --track fakes a sensible -b <name>' '
git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" &&
git update-ref refs/remotes/origin/koala/bear renamer &&
@@ -442,22 +426,22 @@
test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&
- git checkout master && git branch -D koala/bear &&
+ git checkout main && git branch -D koala/bear &&
git checkout --track refs/remotes/origin/koala/bear &&
test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&
- git checkout master && git branch -D koala/bear &&
+ git checkout main && git branch -D koala/bear &&
git checkout --track remotes/origin/koala/bear &&
test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)"
'
-test_expect_success \
- 'checkout with --track, but without -b, fails with too short tracked name' '
- test_must_fail git checkout --track renamer'
+test_expect_success 'checkout with --track, but without -b, fails with too short tracked name' '
+ test_must_fail git checkout --track renamer
+'
setup_conflicting_index () {
rm -f .git/index &&
@@ -601,18 +585,17 @@
'
test_expect_success 'failing checkout -b should not break working tree' '
- git reset --hard master &&
- git symbolic-ref HEAD refs/heads/master &&
+ git reset --hard main &&
+ git symbolic-ref HEAD refs/heads/main &&
test_must_fail git checkout -b renamer side^ &&
- test $(git symbolic-ref HEAD) = refs/heads/master &&
+ test $(git symbolic-ref HEAD) = refs/heads/main &&
git diff --exit-code &&
git diff --cached --exit-code
-
'
test_expect_success 'switch out of non-branch' '
- git reset --hard master &&
- git checkout master^0 &&
+ git reset --hard main &&
+ git checkout main^0 &&
echo modified >one &&
test_must_fail git checkout renamer 2>error.log &&
! grep "^Previous HEAD" error.log
diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh
index cb5e34d..a74816c 100755
--- a/t/t7300-clean.sh
+++ b/t/t7300-clean.sh
@@ -110,7 +110,7 @@
'
-test_expect_success C_LOCALE_OUTPUT 'git clean with relative prefix' '
+test_expect_success 'git clean with relative prefix' '
mkdir -p build docs &&
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
@@ -123,7 +123,7 @@
verbose test "$would_clean" = ../src/part3.c
'
-test_expect_success C_LOCALE_OUTPUT 'git clean with absolute path' '
+test_expect_success 'git clean with absolute path' '
mkdir -p build docs &&
touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
@@ -407,7 +407,7 @@
'
-test_expect_success C_LOCALE_OUTPUT 'core.excludesfile' '
+test_expect_success 'core.excludesfile' '
echo excludes >excludes &&
echo included >included &&
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index e3e2aab..a924fdb 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -9,6 +9,9 @@
subcommands of git submodule.
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'submodule deinit works on empty repository' '
@@ -52,7 +55,7 @@
EOF
git init repo-no-commits &&
test_must_fail git submodule add ../a ./repo-no-commits 2>actual &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'status should ignore inner git repo when not added' '
@@ -124,7 +127,7 @@
}
test_expect_success 'submodule add' '
- echo "refs/heads/master" >expect &&
+ echo "refs/heads/main" >expect &&
(
cd addtest &&
@@ -182,7 +185,7 @@
git add --force .gitignore &&
git commit -m"Ignore everything" &&
! git submodule add "$submodurl" submod >actual 2>&1 &&
- test_i18ncmp expect actual
+ test_cmp expect actual
)
'
@@ -223,7 +226,7 @@
echo "refs/heads/initial" >expect-head &&
cat <<-\EOF >expect-heads &&
refs/heads/initial
- refs/heads/master
+ refs/heads/main
EOF
(
@@ -241,7 +244,7 @@
'
test_expect_success 'submodule add with ./ in path' '
- echo "refs/heads/master" >expect &&
+ echo "refs/heads/main" >expect &&
(
cd addtest &&
@@ -257,7 +260,7 @@
'
test_expect_success 'submodule add with /././ in path' '
- echo "refs/heads/master" >expect &&
+ echo "refs/heads/main" >expect &&
(
cd addtest &&
@@ -273,7 +276,7 @@
'
test_expect_success 'submodule add with // in path' '
- echo "refs/heads/master" >expect &&
+ echo "refs/heads/main" >expect &&
(
cd addtest &&
@@ -289,7 +292,7 @@
'
test_expect_success 'submodule add with /.. in path' '
- echo "refs/heads/master" >expect &&
+ echo "refs/heads/main" >expect &&
(
cd addtest &&
@@ -305,7 +308,7 @@
'
test_expect_success 'submodule add with ./, /.. and // in path' '
- echo "refs/heads/master" >expect &&
+ echo "refs/heads/main" >expect &&
(
cd addtest &&
@@ -335,7 +338,7 @@
'
test_expect_success 'submodule add in subdirectory' '
- echo "refs/heads/master" >expect &&
+ echo "refs/heads/main" >expect &&
mkdir addtest/sub &&
(
@@ -557,7 +560,7 @@
test_expect_success 'checkout superproject with subproject already present' '
git checkout initial &&
- git checkout master
+ git checkout main
'
test_expect_success 'apply submodule diff' '
@@ -574,7 +577,7 @@
git checkout second &&
git apply --index P.diff &&
- git diff --cached master >staged &&
+ git diff --cached main >staged &&
test_must_be_empty staged
'
@@ -938,7 +941,7 @@
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 &&
@@ -1010,7 +1013,7 @@
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 &&
@@ -1231,7 +1234,7 @@
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
'
@@ -1260,7 +1263,7 @@
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
'
@@ -1271,7 +1274,7 @@
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
'
@@ -1290,7 +1293,7 @@
-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
'
@@ -1307,12 +1310,12 @@
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
)
@@ -1328,7 +1331,7 @@
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
'
@@ -1345,7 +1348,7 @@
--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
'
@@ -1373,7 +1376,7 @@
--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 &&
@@ -1382,7 +1385,7 @@
# 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/t/t7401-submodule-summary.sh b/t/t7401-submodule-summary.sh
index 9bc841d..9c3cc4c 100755
--- a/t/t7401-submodule-summary.sh
+++ b/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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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_cmp 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_cmp expected actual
"
rm -rf sm1 &&
@@ -199,10 +208,10 @@
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_cmp expected actual
"
rm -f sm1 &&
@@ -211,22 +220,22 @@
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_cmp 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
- test_i18ncmp expected actual
+ EOF
+ test_cmp expected actual
"
commit_file sm1 &&
@@ -234,9 +243,9 @@
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 '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 @@
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_cmp - 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/t/t7403-submodule-sync.sh b/t/t7403-submodule-sync.sh
index 0726799..7d2ac33 100755
--- a/t/t7403-submodule-sync.sh
+++ b/t/t7403-submodule-sync.sh
@@ -8,6 +8,9 @@
These tests exercise the "git submodule sync" subcommand.
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success setup '
@@ -78,7 +81,7 @@
(
cd super &&
cd submodule &&
- git checkout master &&
+ git checkout main &&
git pull
) &&
mv submodule moved-submodule &&
@@ -112,7 +115,7 @@
)" &&
(
cd super-clone/submodule &&
- git checkout master &&
+ git checkout main &&
git pull
) &&
(
@@ -140,7 +143,7 @@
)" &&
(
cd super-clone/submodule/sub-submodule &&
- git checkout master &&
+ git checkout main &&
git pull
)
'
@@ -168,7 +171,7 @@
)" &&
(
cd super-clone/submodule &&
- git checkout master &&
+ git checkout main &&
git pull
) &&
(
@@ -199,7 +202,7 @@
)" &&
(
cd super-clone/submodule/sub-submodule &&
- git checkout master &&
+ git checkout main &&
git pull
)
'
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index 4fb447a..ff3ba54 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -9,15 +9,18 @@
submodule and "git submodule update --rebase/--merge" does not detach the HEAD.
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
compare_head()
{
- sha_master=$(git rev-list --max-count=1 master)
+ sha_main=$(git rev-list --max-count=1 main)
sha_head=$(git rev-list --max-count=1 HEAD)
- test "$sha_master" = "$sha_head"
+ test "$sha_main" = "$sha_head"
}
@@ -70,6 +73,22 @@
)
'
+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
@@ -136,9 +155,9 @@
cd tmp &&
git submodule update --init --recursive ../super >../../actual 2>../../actual2
) &&
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
sort actual2 >actual2.sorted &&
- test_i18ncmp expect2 actual2.sorted
+ test_cmp expect2 actual2.sorted
'
cat <<EOF >expect2
@@ -155,7 +174,7 @@
git submodule update --init sub 2>../../actual2
)
) &&
- test_i18ncmp expect2 actual2
+ test_cmp expect2 actual2
'
test_expect_success 'submodule update does not fetch already present commits' '
@@ -173,7 +192,7 @@
(cd super &&
git submodule update > ../actual 2> ../actual.err
) &&
- test_i18ncmp expected actual &&
+ test_cmp expected actual &&
test_must_be_empty actual.err
'
@@ -246,14 +265,14 @@
cd super &&
git submodule update --remote --force submodule &&
git -C submodule log -1 --oneline >actual &&
- git -C ../submodule log -1 --oneline master >expect &&
+ git -C ../submodule log -1 --oneline main >expect &&
test_cmp expect actual &&
git checkout -b test-branch &&
git submodule update --remote --force submodule &&
git -C submodule log -1 --oneline >actual &&
git -C ../submodule log -1 --oneline test-branch >expect &&
test_cmp expect actual &&
- git checkout master &&
+ git checkout main &&
git branch -d test-branch &&
git reset --hard HEAD^
)
@@ -266,7 +285,7 @@
git add file &&
test_tick &&
git commit -m "upstream line5" &&
- git checkout master
+ git checkout main
) &&
(cd super &&
git config submodule.submodule.branch test-branch &&
@@ -276,9 +295,9 @@
)
'
-test_expect_success 'submodule update --rebase staying on master' '
+test_expect_success 'submodule update --rebase staying on main' '
(cd super/submodule &&
- git checkout master
+ git checkout main
) &&
(cd super &&
(cd submodule &&
@@ -290,7 +309,7 @@
)
'
-test_expect_success 'submodule update --merge staying on master' '
+test_expect_success 'submodule update --merge staying on main' '
(cd super/submodule &&
git reset --hard HEAD~1
) &&
@@ -442,7 +461,7 @@
(cd super &&
test_must_fail git submodule update submodule 2>../actual
) &&
- test_i18ncmp actual expect
+ test_cmp actual expect
'
cat << EOF >expect
@@ -460,7 +479,7 @@
mkdir tmp && cd tmp &&
test_must_fail git submodule update ../submodule 2>../../actual
) &&
- test_i18ncmp actual expect
+ test_cmp actual expect
'
test_expect_success 'submodule update - command run for initial population of submodule' '
@@ -469,7 +488,7 @@
EOF
rm -rf super/submodule &&
test_must_fail git -C super submodule update 2>actual &&
- test_i18ncmp expect actual &&
+ test_cmp expect actual &&
git -C super submodule update --checkout
'
@@ -490,7 +509,7 @@
mkdir -p tmp && cd tmp &&
test_must_fail git submodule update --recursive ../super 2>../../actual
) &&
- test_i18ncmp actual expect
+ test_cmp actual expect
'
test_expect_success 'submodule init does not copy command into .git/config' '
@@ -593,7 +612,7 @@
(cd super &&
git config submodule.submodule.update none &&
(cd submodule &&
- git checkout master &&
+ git checkout main &&
compare_head
) &&
git diff --name-only >out &&
@@ -613,7 +632,7 @@
(cd super &&
git config submodule.submodule.update none &&
(cd submodule &&
- git checkout master &&
+ git checkout main &&
compare_head
) &&
git diff --name-only >out &&
@@ -673,7 +692,7 @@
test_expect_success 'submodule update continues after recursive checkout error' '
(cd super &&
git reset --hard HEAD &&
- git checkout master &&
+ git checkout main &&
git submodule update &&
(cd submodule &&
git submodule add ../submodule subsubmodule &&
@@ -717,7 +736,7 @@
test_expect_success 'submodule update exit immediately in case of merge conflict' '
(cd super &&
- git checkout master &&
+ git checkout main &&
git reset --hard HEAD &&
(cd submodule &&
(cd subsubmodule &&
@@ -735,7 +754,7 @@
git add submodule2 &&
git commit -m "two_new_submodule_commits" &&
(cd submodule &&
- git checkout master &&
+ git checkout main &&
test_commit "conflict" file &&
echo "conflict" > file
) &&
@@ -754,7 +773,7 @@
test_expect_success 'submodule update exit immediately after recursive rebase error' '
(cd super &&
- git checkout master &&
+ git checkout main &&
git reset --hard HEAD &&
(cd submodule &&
git reset --hard HEAD &&
@@ -770,7 +789,7 @@
git add submodule2 &&
git commit -m "two_new_submodule_commits" &&
(cd submodule &&
- git checkout master &&
+ git checkout main &&
test_commit "conflict2" file &&
echo "conflict" > file
) &&
@@ -862,21 +881,21 @@
git clone subsubsuper_update_r subsubsuper_update_r2 &&
(cd subsubsuper_update_r2 &&
test_commit "update_subsubsuper" file &&
- git push origin master
+ git push origin main
) &&
git clone subsuper_update_r subsuper_update_r2 &&
(cd subsuper_update_r2 &&
test_commit "update_subsuper" file &&
git submodule add ../subsubsuper_update_r subsubmodule &&
git commit -am "subsubmodule" &&
- git push origin master
+ git push origin main
) &&
git clone super_update_r super_update_r2 &&
(cd super_update_r2 &&
test_commit "update_super" file &&
git submodule add ../subsuper_update_r submodule &&
git commit -am "submodule" &&
- git push origin master
+ git push origin main
) &&
rm -rf super_update_r2 &&
git clone super_update_r super_update_r2 &&
@@ -895,7 +914,7 @@
test_expect_success 'submodule add properly re-creates deeper level submodules' '
(cd super &&
- git reset --hard master &&
+ git reset --hard main &&
rm -rf deeper/ &&
git submodule add --force ../submodule deeper/submodule
)
@@ -1006,4 +1025,16 @@
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/t/t7407-submodule-foreach.sh b/t/t7407-submodule-foreach.sh
index 6b2aa91..e2f110b 100755
--- a/t/t7407-submodule-foreach.sh
+++ b/t/t7407-submodule-foreach.sh
@@ -9,6 +9,9 @@
that are currently checked out.
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
@@ -77,7 +80,7 @@
git config foo.bar zar &&
git submodule foreach "git config --file \"\$toplevel/.git/config\" foo.bar"
) &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
cat >expect <<EOF
@@ -93,7 +96,7 @@
cd clone/sub &&
git submodule foreach "echo \$toplevel-\$name-\$sm_path-\$displaypath-\$sha1" >../../actual
) &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'setup nested submodules' '
@@ -174,7 +177,7 @@
cd clone2 &&
git submodule foreach --recursive "true" > ../actual
) &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
cat > expect <<EOF
@@ -194,7 +197,7 @@
cd untracked &&
git submodule foreach --recursive >../../actual
) &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
sub1sha1=$(cd clone2/sub1 && git rev-parse HEAD)
sub2sha1=$(cd clone2/sub2 && git rev-parse HEAD)
@@ -226,7 +229,7 @@
cd clone2/untracked &&
git submodule foreach --recursive "echo toplevel: \$toplevel name: \$name path: \$sm_path displaypath: \$displaypath hash: \$sha1" >../../actual
) &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
cat > expect <<EOF
@@ -277,13 +280,13 @@
sub2sha1_short=$(cd clone3/sub2 && git rev-parse --short HEAD)
cat > expect <<EOF
- $nested1sha1 nested1 (heads/master)
- $nested2sha1 nested1/nested2 (heads/master)
- $nested3sha1 nested1/nested2/nested3 (heads/master)
- $submodulesha1 nested1/nested2/nested3/submodule (heads/master)
+ $nested1sha1 nested1 (heads/main)
+ $nested2sha1 nested1/nested2 (heads/main)
+ $nested3sha1 nested1/nested2/nested3 (heads/main)
+ $submodulesha1 nested1/nested2/nested3/submodule (heads/main)
$sub1sha1 sub1 ($sub1sha1_short)
$sub2sha1 sub2 ($sub2sha1_short)
- $sub3sha1 sub3 (heads/master)
+ $sub3sha1 sub3 (heads/main)
EOF
test_expect_success 'test "status --recursive"' '
@@ -295,10 +298,10 @@
'
cat > expect <<EOF
- $nested1sha1 nested1 (heads/master)
+ $nested1sha1 nested1 (heads/main)
+$nested2sha1 nested1/nested2 (file2~1)
- $nested3sha1 nested1/nested2/nested3 (heads/master)
- $submodulesha1 nested1/nested2/nested3/submodule (heads/master)
+ $nested3sha1 nested1/nested2/nested3 (heads/main)
+ $submodulesha1 nested1/nested2/nested3/submodule (heads/main)
EOF
test_expect_success 'ensure "status --cached --recursive" preserves the --cached flag' '
@@ -316,13 +319,13 @@
nested2sha1=$(git -C clone3/nested1/nested2 rev-parse HEAD)
cat > expect <<EOF
- $nested1sha1 ../nested1 (heads/master)
+ $nested1sha1 ../nested1 (heads/main)
+$nested2sha1 ../nested1/nested2 (file2)
- $nested3sha1 ../nested1/nested2/nested3 (heads/master)
- $submodulesha1 ../nested1/nested2/nested3/submodule (heads/master)
+ $nested3sha1 ../nested1/nested2/nested3 (heads/main)
+ $submodulesha1 ../nested1/nested2/nested3/submodule (heads/main)
$sub1sha1 ../sub1 ($sub1sha1_short)
$sub2sha1 ../sub2 ($sub2sha1_short)
- $sub3sha1 ../sub3 (heads/master)
+ $sub3sha1 ../sub3 (heads/main)
EOF
test_expect_success 'test "status --recursive" from sub directory' '
diff --git a/t/t7408-submodule-reference.sh b/t/t7408-submodule-reference.sh
index 34ac28c..a3892f4 100755
--- a/t/t7408-submodule-reference.sh
+++ b/t/t7408-submodule-reference.sh
@@ -122,8 +122,8 @@
# 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 @@
# 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 @@
# 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/t/t7409-submodule-detached-work-tree.sh b/t/t7409-submodule-detached-work-tree.sh
index fc018e3..e17ac81 100755
--- a/t/t7409-submodule-detached-work-tree.sh
+++ b/t/t7409-submodule-detached-work-tree.sh
@@ -10,6 +10,9 @@
'
TEST_NO_CREATE_REPO=1
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'submodule on detached working tree' '
@@ -35,7 +38,7 @@
git rev-parse --verify HEAD >actual &&
test_cmp ../../../../expect actual
) &&
- git push origin master
+ git push origin main
) &&
mkdir home2 &&
(
@@ -44,7 +47,7 @@
GIT_WORK_TREE="$(pwd)" &&
GIT_DIR="$(pwd)/.dotfiles" &&
export GIT_WORK_TREE GIT_DIR &&
- git checkout master &&
+ git checkout main &&
git submodule update --init &&
(
unset GIT_WORK_TREE GIT_DIR &&
@@ -64,10 +67,10 @@
git clone --bare ../remote "$GIT_DIR" &&
git config core.bare false &&
git config core.worktree .. &&
- git checkout master &&
+ git checkout main &&
git submodule add ../bundle1 .vim/bundle/dupe &&
test_commit "dupe" &&
- git push origin master
+ git push origin main
) &&
(
cd home &&
diff --git a/t/t7416-submodule-dash-url.sh b/t/t7416-submodule-dash-url.sh
index eec96e0..d21dc8b 100755
--- a/t/t7416-submodule-dash-url.sh
+++ b/t/t7416-submodule-dash-url.sh
@@ -201,4 +201,19 @@
grep gitmodulesUrl err
'
+test_expect_success 'fsck rejects embedded newline in git url' '
+ git checkout --orphan git-newline &&
+ cat >.gitmodules <<-\EOF &&
+ [submodule "foo"]
+ url = "git://example.com:1234/repo%0a.git"
+ EOF
+ git add .gitmodules &&
+ git commit -m "git 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/t/t7417-submodule-path-url.sh b/t/t7417-submodule-path-url.sh
index f7e7e94..f0f6b9f 100755
--- a/t/t7417-submodule-path-url.sh
+++ b/t/t7417-submodule-path-url.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='check handling of .gitmodule path with dash'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'create submodule with dash in path' '
@@ -36,7 +39,7 @@
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 &&
+ git -C super update-ref refs/heads/main $commit &&
test_must_fail git clone --recurse-submodules super dst 2>err &&
test_i18ngrep "sub " err
diff --git a/t/t7419-submodule-set-branch.sh b/t/t7419-submodule-set-branch.sh
index fd25f78..3b925c3 100755
--- a/t/t7419-submodule-set-branch.sh
+++ b/t/t7419-submodule-set-branch.sh
@@ -52,12 +52,13 @@
'
test_expect_success 'test submodule set-branch --default' '
+ test_commit -C submodule c &&
(cd super &&
git submodule set-branch --default submodule &&
! 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 -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 -d' '
+ test_commit -C submodule d &&
(cd super &&
git submodule set-branch -d submodule &&
! 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/t/t7421-submodule-summary-add.sh b/t/t7421-submodule-summary-add.sh
new file mode 100755
index 0000000..b070f13
--- /dev/null
+++ b/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/t/t7500-commit-template-squash-signoff.sh b/t/t7500-commit-template-squash-signoff.sh
index 6d19ece..e41ac18 100755
--- a/t/t7500-commit-template-squash-signoff.sh
+++ b/t/t7500-commit-template-squash-signoff.sh
@@ -15,7 +15,7 @@
printf "%s" "$(git log --pretty=format:%s%b -1)" >"$actual" &&
printf "%s" "$1" >"$expect" &&
- test_i18ncmp "$expect" "$actual"
+ test_cmp "$expect" "$actual"
}
# A sanity check to see if commit is working at all.
@@ -356,7 +356,7 @@
touch commit-template-check &&
git add commit-template-check &&
GIT_EDITOR="cat >editor-input" git commit --untracked-files=no --allow-empty-message &&
- test_i18ncmp expected-template editor-input
+ test_cmp expected-template editor-input
'
test_expect_success 'setup empty commit with unstaged rename and copy' '
diff --git a/t/t7501-commit-basic-functionality.sh b/t/t7501-commit-basic-functionality.sh
index 110b4bf..512ae27 100755
--- a/t/t7501-commit-basic-functionality.sh
+++ b/t/t7501-commit-basic-functionality.sh
@@ -7,8 +7,11 @@
# signoff
test_description='git commit'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
-. "$TEST_DIRECTORY/diff-lib.sh"
+. "$TEST_DIRECTORY/lib-diff.sh"
author='The Real Author <someguy@his.email.org>'
@@ -603,7 +606,7 @@
echo zero >zero &&
git add zero &&
git commit -m "add zero" &&
- git checkout master &&
+ git checkout main &&
git merge -s ours side -m "empty ok" &&
git diff HEAD^ HEAD >actual &&
diff --git a/t/t7502-commit-porcelain.sh b/t/t7502-commit-porcelain.sh
index 14c92e4..6396897 100755
--- a/t/t7502-commit-porcelain.sh
+++ b/t/t7502-commit-porcelain.sh
@@ -2,6 +2,9 @@
test_description='git commit porcelain-ish'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
commit_msg_is () {
@@ -10,7 +13,7 @@
printf "%s" "$(git log --pretty=format:%s%b -1)" >$actual &&
printf "%s" "$1" >$expect &&
- test_i18ncmp $expect $actual
+ test_cmp $expect $actual
}
# Arguments: [<prefix] [<commit message>] [<commit options>]
@@ -32,7 +35,7 @@
SUMMARY_POSTFIX="$(git log -1 --pretty='format:%h')"
echo "[$SUMMARY_PREFIX $SUMMARY_POSTFIX] $2" >exp &&
- test_i18ncmp exp act
+ test_cmp exp act
}
test_expect_success 'output summary format' '
@@ -76,7 +79,7 @@
output_tests_cleanup() {
# this is needed for "do not fire editor in the presence of conflicts"
- git checkout master &&
+ git checkout main &&
# this is needed for the "partial removal" test to pass
git rm file1 &&
@@ -297,7 +300,7 @@
# with '#' will be ignored, and an empty message aborts the commit." >expect
test_expect_success 'cleanup commit messages (strip option,-F,-e): output' '
- test_i18ncmp expect actual
+ test_cmp expect actual
'
test_expect_success 'cleanup commit message (fail on invalid cleanup mode option)' '
@@ -440,7 +443,7 @@
git add g &&
git commit -m "add g" &&
git branch second &&
- echo master >g &&
+ echo main >g &&
echo g >h &&
git add g h &&
git commit -m "modify g and add h" &&
@@ -449,7 +452,7 @@
git add g &&
git commit -m second &&
# Must fail due to conflict
- test_must_fail git cherry-pick -n master &&
+ test_must_fail git cherry-pick -n main &&
echo "editor not started" >.git/result &&
(
GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" &&
@@ -478,9 +481,9 @@
test_expect_success 'Hand committing of a redundant merge removes dups' '
- git rev-parse second master >expect &&
- test_must_fail git merge second master &&
- git checkout master g &&
+ git rev-parse second main >expect &&
+ test_must_fail git merge second main &&
+ git checkout main g &&
EDITOR=: git commit -a &&
git cat-file commit HEAD >raw &&
sed -n -e "s/^parent //p" -e "/^$/q" raw >actual &&
diff --git a/t/t7503-pre-commit-and-pre-merge-commit-hooks.sh b/t/t7503-pre-commit-and-pre-merge-commit-hooks.sh
index b348545..606d8d0 100755
--- a/t/t7503-pre-commit-and-pre-merge-commit-hooks.sh
+++ b/t/t7503-pre-commit-and-pre-merge-commit-hooks.sh
@@ -2,6 +2,9 @@
test_description='pre-commit and pre-merge-commit hooks'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
HOOKDIR="$(git rev-parse --git-dir)/hooks"
@@ -44,16 +47,16 @@
git add foo &&
git commit -m "make it non-ff" &&
git branch side-orig side &&
- git checkout master
+ git checkout main
'
test_expect_success 'setup conflicting branches' '
- test_when_finished "git checkout master" &&
- git checkout -b conflicting-a master &&
+ test_when_finished "git checkout main" &&
+ git checkout -b conflicting-a main &&
echo a >conflicting &&
git add conflicting &&
git commit -m conflicting-a &&
- git checkout -b conflicting-b master &&
+ git checkout -b conflicting-b main &&
echo b >conflicting &&
git add conflicting &&
git commit -m conflicting-b
@@ -71,8 +74,8 @@
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 &&
+ git merge -m "merge main" main &&
+ git checkout main &&
test_path_is_missing actual_hooks
'
@@ -88,8 +91,8 @@
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 &&
+ git merge --no-verify -m "merge main" main &&
+ git checkout main &&
test_path_is_missing actual_hooks
'
@@ -108,15 +111,15 @@
cp "$HOOKDIR/success.sample" "$PREMERGE" &&
echo "$PREMERGE" >expected_hooks &&
git checkout side &&
- git merge -m "merge master" master &&
- git checkout master &&
+ git merge -m "merge main" main &&
+ git checkout main &&
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" &&
+ test_when_finished "git checkout main" &&
cp "$HOOKDIR/success.sample" "$PREMERGE" &&
cp "$HOOKDIR/success.sample" "$PRECOMMIT" &&
@@ -145,8 +148,8 @@
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 &&
+ git merge --no-verify -m "merge main" main &&
+ git checkout main &&
test_path_is_missing actual_hooks
'
@@ -174,8 +177,8 @@
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_must_fail git merge -m "merge main" main &&
+ git checkout main &&
test_cmp expected_hooks actual_hooks
'
@@ -184,8 +187,8 @@
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 &&
+ git merge --no-verify -m "merge main" main &&
+ git checkout main &&
test_path_is_missing actual_hooks
'
@@ -212,8 +215,8 @@
cp "$HOOKDIR/non-exec.sample" "$PREMERGE" &&
git branch -f side side-orig &&
git checkout side &&
- git merge -m "merge master" master &&
- git checkout master &&
+ git merge -m "merge main" main &&
+ git checkout main &&
test_path_is_missing actual_hooks
'
@@ -222,8 +225,8 @@
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 &&
+ git merge --no-verify -m "merge main" main &&
+ git checkout main &&
test_path_is_missing actual_hooks
'
diff --git a/t/t7504-commit-msg-hook.sh b/t/t7504-commit-msg-hook.sh
index 31b9c6a..4e75925 100755
--- a/t/t7504-commit-msg-hook.sh
+++ b/t/t7504-commit-msg-hook.sh
@@ -2,6 +2,9 @@
test_description='commit-msg hook'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'with no hook' '
@@ -142,12 +145,12 @@
test_expect_success 'merge fails with failing hook' '
test_when_finished "git branch -D newbranch" &&
- test_when_finished "git checkout -f master" &&
+ test_when_finished "git checkout -f main" &&
git checkout --orphan newbranch &&
: >file2 &&
git add file2 &&
git commit --no-verify file2 -m in-side-branch &&
- test_must_fail git merge --allow-unrelated-histories master &&
+ test_must_fail git merge --allow-unrelated-histories main &&
commit_msg_is "in-side-branch" # HEAD before merge
'
@@ -155,14 +158,14 @@
test_expect_success 'merge bypasses failing hook with --no-verify' '
test_when_finished "git branch -D newbranch" &&
- test_when_finished "git checkout -f master" &&
+ test_when_finished "git checkout -f main" &&
git checkout --orphan newbranch &&
git rm -f file &&
: >file2 &&
git add file2 &&
git commit --no-verify file2 -m in-side-branch &&
- git merge --no-verify --allow-unrelated-histories master &&
- commit_msg_is "Merge branch '\''master'\'' into newbranch"
+ git merge --no-verify --allow-unrelated-histories main &&
+ commit_msg_is "Merge branch '\''main'\'' into newbranch"
'
@@ -248,28 +251,28 @@
test_expect_success 'hook called in git-merge picks up commit message' '
test_when_finished "git branch -D newbranch" &&
- test_when_finished "git checkout -f master" &&
+ test_when_finished "git checkout -f main" &&
git checkout --orphan newbranch &&
git rm -f file &&
: >file2 &&
git add file2 &&
git commit --no-verify file2 -m in-side-branch &&
- git merge --allow-unrelated-histories master &&
+ git merge --allow-unrelated-histories main &&
commit_msg_is "new message"
'
test_expect_failure 'merge --continue remembers --no-verify' '
test_when_finished "git branch -D newbranch" &&
- test_when_finished "git checkout -f master" &&
- git checkout master &&
+ test_when_finished "git checkout -f main" &&
+ git checkout main &&
echo a >file2 &&
git add file2 &&
- git commit --no-verify -m "add file2 to master" &&
- git checkout -b newbranch master^ &&
+ git commit --no-verify -m "add file2 to main" &&
+ git checkout -b newbranch main^ &&
echo b >file2 &&
git add file2 &&
git commit --no-verify file2 -m in-side-branch &&
- git merge --no-verify -m not-rewritten-by-hook master &&
+ git merge --no-verify -m not-rewritten-by-hook main &&
# resolve conflict:
echo c >file2 &&
git add file2 &&
diff --git a/t/t7505-prepare-commit-msg-hook.sh b/t/t7505-prepare-commit-msg-hook.sh
index 94f85cd..7a8194c 100755
--- a/t/t7505-prepare-commit-msg-hook.sh
+++ b/t/t7505-prepare-commit-msg-hook.sh
@@ -2,6 +2,9 @@
test_description='prepare-commit-msg hook'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'set up commits for rebasing' '
@@ -15,7 +18,7 @@
do
test_commit rebase-$i c $i
done &&
- git checkout master &&
+ git checkout main &&
cat >rebase-todo <<-EOF
pick $(git rev-parse rebase-a)
@@ -190,7 +193,7 @@
test_expect_success 'with hook (merge)' '
- test_when_finished "git checkout -f master" &&
+ test_when_finished "git checkout -f main" &&
git checkout -B other HEAD@{1} &&
echo "more" >>file &&
git add file &&
@@ -202,7 +205,7 @@
test_expect_success 'with hook and editor (merge)' '
- test_when_finished "git checkout -f master" &&
+ test_when_finished "git checkout -f main" &&
git checkout -B other HEAD@{1} &&
echo "more" >>file &&
git add file &&
@@ -215,10 +218,10 @@
test_rebase () {
expect=$1 &&
mode=$2 &&
- test_expect_$expect C_LOCALE_OUTPUT "with hook (rebase ${mode:--i})" '
+ test_expect_$expect "with hook (rebase ${mode:--i})" '
test_when_finished "\
git rebase --abort
- git checkout -f master
+ git checkout -f main
git branch -D tmp" &&
git checkout -b tmp rebase-me &&
GIT_SEQUENCE_EDITOR="cp rebase-todo" &&
@@ -250,14 +253,14 @@
test_have_prereq !REBASE_P || test_rebase success -p
test_expect_success 'with hook (cherry-pick)' '
- test_when_finished "git checkout -f master" &&
+ test_when_finished "git checkout -f main" &&
git checkout -B other b &&
git cherry-pick rebase-1 &&
test "$(git log -1 --pretty=format:%s)" = "message (no editor)"
'
test_expect_success 'with hook and editor (cherry-pick)' '
- test_when_finished "git checkout -f master" &&
+ test_when_finished "git checkout -f main" &&
git checkout -B other b &&
git cherry-pick -e rebase-1 &&
test "$(git log -1 --pretty=format:%s)" = merge
@@ -270,7 +273,7 @@
test_expect_success 'with failing hook' '
- test_when_finished "git checkout -f master" &&
+ test_when_finished "git checkout -f main" &&
head=$(git rev-parse HEAD) &&
echo "more" >> file &&
git add file &&
@@ -280,7 +283,7 @@
test_expect_success 'with failing hook (--no-verify)' '
- test_when_finished "git checkout -f master" &&
+ test_when_finished "git checkout -f main" &&
head=$(git rev-parse HEAD) &&
echo "more" >> file &&
git add file &&
@@ -290,7 +293,7 @@
test_expect_success 'with failing hook (merge)' '
- test_when_finished "git checkout -f master" &&
+ test_when_finished "git checkout -f main" &&
git checkout -B other HEAD@{1} &&
echo "more" >> file &&
git add file &&
@@ -304,8 +307,8 @@
'
-test_expect_success C_LOCALE_OUTPUT 'with failing hook (cherry-pick)' '
- test_when_finished "git checkout -f master" &&
+test_expect_success 'with failing hook (cherry-pick)' '
+ test_when_finished "git checkout -f main" &&
git checkout -B other b &&
test_must_fail git cherry-pick rebase-1 2>actual &&
test $(grep -c prepare-commit-msg actual) = 1
diff --git a/t/t7506-status-submodule.sh b/t/t7506-status-submodule.sh
index 08629a6..3fcb447 100755
--- a/t/t7506-status-submodule.sh
+++ b/t/t7506-status-submodule.sh
@@ -22,6 +22,10 @@
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_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 @@
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 @@
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 @@
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/t/t7508-status.sh b/t/t7508-status.sh
index 482ce35..2b72451 100755
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -37,11 +37,11 @@
git checkout -b upstream &&
test_commit upstream1 &&
test_commit upstream2 &&
- # leave the first commit on master as root because several
+ # leave the first commit on main as root because several
# tests depend on this case; for our upstream we only
# care about commit counts anyway, so a totally divergent
# history is OK
- git checkout --orphan master
+ git checkout --orphan main
'
test_expect_success 'setup' '
@@ -88,7 +88,7 @@
test_expect_success 'status --column' '
cat >expect <<\EOF &&
-# On branch master
+# On branch main
# Your branch and '\''upstream'\'' have diverged,
# and have 1 and 2 different commits each, respectively.
# (use "git pull" to merge the remote branch into yours)
@@ -109,17 +109,17 @@
#
EOF
COLUMNS=50 git -c status.displayCommentPrefix=true status --column="column dense" >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'status --column status.displayCommentPrefix=false' '
strip_comments expect &&
COLUMNS=49 git -c status.displayCommentPrefix=false status --column="column dense" >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
cat >expect <<\EOF
-# On branch master
+# On branch main
# Your branch and 'upstream' have diverged,
# and have 1 and 2 different commits each, respectively.
# (use "git pull" to merge the remote branch into yours)
@@ -144,19 +144,19 @@
test_expect_success 'status with status.displayCommentPrefix=true' '
git -c status.displayCommentPrefix=true status >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'status with status.displayCommentPrefix=false' '
strip_comments expect &&
git -c status.displayCommentPrefix=false status >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'status -v' '
(cat expect && git diff --cached) >expect-with-v &&
git status -v >output &&
- test_i18ncmp expect-with-v output
+ test_cmp expect-with-v output
'
test_expect_success 'status -v -v' '
@@ -167,7 +167,7 @@
echo "Changes not staged for commit:" &&
git -c diff.mnemonicprefix=true diff) >expect-with-v &&
git status -v -v >output &&
- test_i18ncmp expect-with-v output
+ test_cmp expect-with-v output
'
test_expect_success 'setup fake editor' '
@@ -193,7 +193,7 @@
'
cat >expect <<\EOF
-On branch master
+On branch main
Your branch and 'upstream' have diverged,
and have 1 and 2 different commits each, respectively.
@@ -214,7 +214,7 @@
test_expect_success 'status (advice.statusHints false)' '
test_config advice.statusHints false &&
git status >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
@@ -266,7 +266,7 @@
test_cmp expect output &&
cat >expect <<\EOF &&
-On branch master
+On branch main
Your branch and '\''upstream'\'' have diverged,
and have 1 and 2 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
@@ -296,7 +296,7 @@
EOF
git status --ignored >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'status with gitignore (nothing untracked)' '
@@ -331,7 +331,7 @@
test_cmp expect output &&
cat >expect <<\EOF &&
-On branch master
+On branch main
Your branch and '\''upstream'\'' have diverged,
and have 1 and 2 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
@@ -358,7 +358,7 @@
EOF
git status --ignored >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
cat >.gitignore <<\EOF
@@ -368,7 +368,7 @@
EOF
cat >expect <<\EOF
-## master...upstream [ahead 1, behind 2]
+## main...upstream [ahead 1, behind 2]
M dir1/modified
A dir2/added
?? dir1/untracked
@@ -380,7 +380,7 @@
test_expect_success 'status -s -b' '
git status -s -b >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
@@ -390,7 +390,7 @@
git status -s -z -b >output &&
nul_to_q <output >output.q &&
mv output.q output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'setup dir3' '
@@ -401,7 +401,7 @@
test_expect_success 'status -uno' '
cat >expect <<EOF &&
-On branch master
+On branch main
Your branch and '\''upstream'\'' have diverged,
and have 1 and 2 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
@@ -418,18 +418,18 @@
Untracked files not listed (use -u option to show untracked files)
EOF
git status -uno >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'status (status.showUntrackedFiles no)' '
test_config status.showuntrackedfiles no &&
git status >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'status -uno (advice.statusHints false)' '
cat >expect <<EOF &&
-On branch master
+On branch main
Your branch and '\''upstream'\'' have diverged,
and have 1 and 2 different commits each, respectively.
@@ -443,7 +443,7 @@
EOF
test_config advice.statusHints false &&
git status -uno >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
cat >expect << EOF
@@ -463,7 +463,7 @@
test_expect_success 'status -unormal' '
cat >expect <<EOF &&
-On branch master
+On branch main
Your branch and '\''upstream'\'' have diverged,
and have 1 and 2 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
@@ -487,13 +487,13 @@
EOF
git status -unormal >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'status (status.showUntrackedFiles normal)' '
test_config status.showuntrackedfiles normal &&
git status >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
cat >expect <<EOF
@@ -518,7 +518,7 @@
test_expect_success 'status -uall' '
cat >expect <<EOF &&
-On branch master
+On branch main
Your branch and '\''upstream'\'' have diverged,
and have 1 and 2 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
@@ -543,13 +543,13 @@
EOF
git status -uall >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'status (status.showUntrackedFiles all)' '
test_config status.showuntrackedfiles all &&
git status >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'teardown dir3' '
@@ -578,7 +578,7 @@
test_expect_success 'status with relative paths' '
cat >expect <<\EOF &&
-On branch master
+On branch main
Your branch and '\''upstream'\'' have diverged,
and have 1 and 2 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
@@ -601,7 +601,7 @@
EOF
(cd dir1 && git status) >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
cat >expect <<\EOF
@@ -646,7 +646,7 @@
test_expect_success TTY 'status with color.ui' '
cat >expect <<\EOF &&
-On branch <GREEN>master<RESET>
+On branch <GREEN>main<RESET>
Your branch and '\''upstream'\'' have diverged,
and have 1 and 2 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
@@ -670,13 +670,13 @@
EOF
test_config color.ui auto &&
test_terminal git status | test_decode_color >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success TTY 'status with color.status' '
test_config color.status auto &&
test_terminal git status | test_decode_color >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
cat >expect <<\EOF
@@ -706,7 +706,7 @@
'
cat >expect <<\EOF
-## <YELLOW>master<RESET>...<CYAN>upstream<RESET> [ahead <YELLOW>1<RESET>, behind <CYAN>2<RESET>]
+## <YELLOW>main<RESET>...<CYAN>upstream<RESET> [ahead <YELLOW>1<RESET>, behind <CYAN>2<RESET>]
<RED>M<RESET> dir1/modified
<GREEN>A<RESET> dir2/added
<BLUE>??<RESET> dir1/untracked
@@ -718,7 +718,7 @@
test_expect_success TTY 'status -s -b with color.status' '
test_terminal git status -s -b | test_decode_color >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
@@ -757,7 +757,7 @@
git status --porcelain -b >output &&
{
- echo "## master...upstream [ahead 1, behind 2]" &&
+ echo "## main...upstream [ahead 1, behind 2]" &&
cat expect
} >tmp &&
mv tmp expect &&
@@ -769,7 +769,7 @@
test_expect_success 'status without relative paths' '
cat >expect <<\EOF &&
-On branch master
+On branch main
Your branch and '\''upstream'\'' have diverged,
and have 1 and 2 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
@@ -793,7 +793,7 @@
EOF
test_config status.relativePaths false &&
(cd dir1 && git status) >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
@@ -814,9 +814,36 @@
'
+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
+On branch main
Your branch and '\''upstream'\'' have diverged,
and have 1 and 2 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
@@ -833,11 +860,11 @@
EOF
git commit --dry-run dir1/modified >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
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_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 &&
@@ -858,7 +897,7 @@
test_expect_success 'status submodule summary is disabled by default' '
cat >expect <<EOF &&
-On branch master
+On branch main
Your branch and '\''upstream'\'' have diverged,
and have 1 and 2 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
@@ -882,13 +921,13 @@
EOF
git status >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
# we expect the same as the previous test
test_expect_success 'status --untracked-files=all does not show submodule' '
git status --untracked-files=all >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
cat >expect <<EOF
@@ -915,7 +954,7 @@
test_expect_success 'status submodule summary' '
cat >expect <<EOF &&
-On branch master
+On branch main
Your branch and '\''upstream'\'' have diverged,
and have 1 and 2 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
@@ -945,13 +984,13 @@
EOF
git config status.submodulesummary 10 &&
git status >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'status submodule summary with status.displayCommentPrefix=false' '
strip_comments expect &&
git -c status.displayCommentPrefix=false status >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'commit with submodule summary ignores status.displayCommentPrefix' '
@@ -974,7 +1013,7 @@
test_expect_success 'status submodule summary (clean submodule): commit' '
cat >expect <<EOF &&
-On branch master
+On branch main
Your branch and '\''upstream'\'' have diverged,
and have 2 and 2 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
@@ -996,9 +1035,9 @@
git commit -m "commit submodule" &&
git config status.submodulesummary 10 &&
test_must_fail git commit --dry-run >output &&
- test_i18ncmp expect output &&
+ test_cmp expect output &&
git status >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
cat >expect <<EOF
@@ -1022,7 +1061,7 @@
test_expect_success 'commit --dry-run submodule summary (--amend)' '
cat >expect <<EOF &&
-On branch master
+On branch main
Your branch and '\''upstream'\'' have diverged,
and have 2 and 2 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
@@ -1052,7 +1091,7 @@
EOF
git config status.submodulesummary 10 &&
git commit --dry-run --amend >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success POSIXPERM,SANITY 'status succeeds in a read-only repository' '
@@ -1074,7 +1113,7 @@
test_expect_success '--ignore-submodules=untracked suppresses submodules with untracked content' '
cat > expect << EOF &&
-On branch master
+On branch main
Your branch and '\''upstream'\'' have diverged,
and have 2 and 2 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
@@ -1104,17 +1143,17 @@
EOF
echo modified sm/untracked &&
git status --ignore-submodules=untracked >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success '.gitmodules ignore=untracked suppresses submodules with untracked content' '
test_config diff.ignoreSubmodules dirty &&
git status >output &&
- test_i18ncmp expect output &&
+ test_cmp expect output &&
git config --add -f .gitmodules submodule.subname.ignore untracked &&
git config --add -f .gitmodules submodule.subname.path sm &&
git status >output &&
- test_i18ncmp expect output &&
+ test_cmp expect output &&
git config -f .gitmodules --remove-section submodule.subname
'
@@ -1124,14 +1163,14 @@
git config --add submodule.subname.ignore untracked &&
git config --add submodule.subname.path sm &&
git status >output &&
- test_i18ncmp expect output &&
+ test_cmp expect output &&
git config --remove-section submodule.subname &&
git config --remove-section -f .gitmodules submodule.subname
'
test_expect_success '--ignore-submodules=dirty suppresses submodules with untracked content' '
git status --ignore-submodules=dirty >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success '.gitmodules ignore=dirty suppresses submodules with untracked content' '
@@ -1141,7 +1180,7 @@
git config --add -f .gitmodules submodule.subname.ignore dirty &&
git config --add -f .gitmodules submodule.subname.path sm &&
git status >output &&
- test_i18ncmp expect output &&
+ test_cmp expect output &&
git config -f .gitmodules --remove-section submodule.subname
'
@@ -1151,7 +1190,7 @@
git config --add submodule.subname.ignore dirty &&
git config --add submodule.subname.path sm &&
git status >output &&
- test_i18ncmp expect output &&
+ test_cmp expect output &&
git config --remove-section submodule.subname &&
git config -f .gitmodules --remove-section submodule.subname
'
@@ -1159,14 +1198,14 @@
test_expect_success '--ignore-submodules=dirty suppresses submodules with modified content' '
echo modified >sm/foo &&
git status --ignore-submodules=dirty >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success '.gitmodules ignore=dirty suppresses submodules with modified content' '
git config --add -f .gitmodules submodule.subname.ignore dirty &&
git config --add -f .gitmodules submodule.subname.path sm &&
git status >output &&
- test_i18ncmp expect output &&
+ test_cmp expect output &&
git config -f .gitmodules --remove-section submodule.subname
'
@@ -1176,14 +1215,14 @@
git config --add submodule.subname.ignore dirty &&
git config --add submodule.subname.path sm &&
git status >output &&
- test_i18ncmp expect output &&
+ test_cmp expect output &&
git config --remove-section submodule.subname &&
git config -f .gitmodules --remove-section submodule.subname
'
test_expect_success "--ignore-submodules=untracked doesn't suppress submodules with modified content" '
cat > expect << EOF &&
-On branch master
+On branch main
Your branch and '\''upstream'\'' have diverged,
and have 2 and 2 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
@@ -1214,14 +1253,14 @@
EOF
git status --ignore-submodules=untracked > output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success ".gitmodules ignore=untracked doesn't suppress submodules with modified content" '
git config --add -f .gitmodules submodule.subname.ignore untracked &&
git config --add -f .gitmodules submodule.subname.path sm &&
git status >output &&
- test_i18ncmp expect output &&
+ test_cmp expect output &&
git config -f .gitmodules --remove-section submodule.subname
'
@@ -1231,7 +1270,7 @@
git config --add submodule.subname.ignore untracked &&
git config --add submodule.subname.path sm &&
git status >output &&
- test_i18ncmp expect output &&
+ test_cmp expect output &&
git config --remove-section submodule.subname &&
git config -f .gitmodules --remove-section submodule.subname
'
@@ -1240,7 +1279,7 @@
test_expect_success "--ignore-submodules=untracked doesn't suppress submodule summary" '
cat > expect << EOF &&
-On branch master
+On branch main
Your branch and '\''upstream'\'' have diverged,
and have 2 and 2 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
@@ -1275,14 +1314,14 @@
EOF
git status --ignore-submodules=untracked > output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success ".gitmodules ignore=untracked doesn't suppress submodule summary" '
git config --add -f .gitmodules submodule.subname.ignore untracked &&
git config --add -f .gitmodules submodule.subname.path sm &&
git status >output &&
- test_i18ncmp expect output &&
+ test_cmp expect output &&
git config -f .gitmodules --remove-section submodule.subname
'
@@ -1292,20 +1331,20 @@
git config --add submodule.subname.ignore untracked &&
git config --add submodule.subname.path sm &&
git status >output &&
- test_i18ncmp expect output &&
+ test_cmp expect output &&
git config --remove-section submodule.subname &&
git config -f .gitmodules --remove-section submodule.subname
'
test_expect_success "--ignore-submodules=dirty doesn't suppress submodule summary" '
git status --ignore-submodules=dirty > output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success ".gitmodules ignore=dirty doesn't suppress submodule summary" '
git config --add -f .gitmodules submodule.subname.ignore dirty &&
git config --add -f .gitmodules submodule.subname.path sm &&
git status >output &&
- test_i18ncmp expect output &&
+ test_cmp expect output &&
git config -f .gitmodules --remove-section submodule.subname
'
@@ -1315,13 +1354,13 @@
git config --add submodule.subname.ignore dirty &&
git config --add submodule.subname.path sm &&
git status >output &&
- test_i18ncmp expect output &&
+ test_cmp expect output &&
git config --remove-section submodule.subname &&
git config -f .gitmodules --remove-section submodule.subname
'
cat > expect << EOF
-; On branch master
+; On branch main
; Your branch and 'upstream' have diverged,
; and have 2 and 2 different commits each, respectively.
; (use "git pull" to merge the remote branch into yours)
@@ -1359,7 +1398,7 @@
test_expect_success "status (core.commentchar with submodule summary)" '
test_config core.commentchar ";" &&
git -c status.displayCommentPrefix=true status >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success "status (core.commentchar with two chars with submodule summary)" '
@@ -1369,7 +1408,7 @@
test_expect_success "--ignore-submodules=all suppresses submodule summary" '
cat > expect << EOF &&
-On branch master
+On branch main
Your branch and '\''upstream'\'' have diverged,
and have 2 and 2 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
@@ -1390,12 +1429,12 @@
no changes added to commit (use "git add" and/or "git commit -a")
EOF
git status --ignore-submodules=all > output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success '.gitmodules ignore=all suppresses unstaged submodule summary' '
cat > expect << EOF &&
-On branch master
+On branch main
Your branch and '\''upstream'\'' have diverged,
and have 2 and 2 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
@@ -1421,7 +1460,7 @@
git config --add -f .gitmodules submodule.subname.ignore all &&
git config --add -f .gitmodules submodule.subname.path sm &&
git status > output &&
- test_i18ncmp expect output &&
+ test_cmp expect output &&
git config -f .gitmodules --remove-section submodule.subname
'
@@ -1431,7 +1470,7 @@
git config --add submodule.subname.ignore all &&
git config --add submodule.subname.path sm &&
git status > output &&
- test_i18ncmp expect output &&
+ test_cmp expect output &&
git config --remove-section submodule.subname &&
git config -f .gitmodules --remove-section submodule.subname
'
@@ -1471,7 +1510,7 @@
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"' '
@@ -1515,7 +1554,7 @@
git reset HEAD^ &&
git add sm &&
cat >expect << EOF &&
-On branch master
+On branch main
Your branch and '\''upstream'\'' have diverged,
and have 2 and 2 different commits each, respectively.
(use "git pull" to merge the remote branch into yours)
@@ -1532,7 +1571,7 @@
Untracked files not listed (use -u option to show untracked files)
EOF
git commit -uno --dry-run >output &&
- test_i18ncmp expect output &&
+ test_cmp expect output &&
git status -s --ignore-submodules=dirty >output &&
test_i18ngrep "^M. sm" output
'
diff --git a/t/t7509-commit-authorship.sh b/t/t7509-commit-authorship.sh
index 500ab2f..ee6c474 100755
--- a/t/t7509-commit-authorship.sh
+++ b/t/t7509-commit-authorship.sh
@@ -18,11 +18,8 @@
}
test_expect_success '-C option copies authorship and message' '
- echo "Initial" >foo &&
- git add foo &&
- test_tick &&
- git commit -m "Initial Commit" --author Frigate\ \<flying@over.world\> &&
- git tag Initial &&
+ test_commit --author Frigate\ \<flying@over.world\> \
+ "Initial Commit" foo Initial Initial &&
echo "Test 1" >>foo &&
test_tick &&
git commit -a -C Initial &&
diff --git a/t/t7510-signed-commit.sh b/t/t7510-signed-commit.sh
index 0c06d22..8df5a74 100755
--- a/t/t7510-signed-commit.sh
+++ b/t/t7510-signed-commit.sh
@@ -1,11 +1,19 @@
#!/bin/sh
test_description='signed commit tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
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 &&
@@ -20,7 +28,7 @@
echo 3 >elif && git add elif &&
test_tick && git commit -m "third on side" &&
- git checkout master &&
+ git checkout main &&
test_tick && git merge -S side &&
git tag merge &&
@@ -155,6 +163,11 @@
)
'
+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 &&
@@ -162,7 +175,7 @@
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 "^gpgsig.* " >cat.commit &&
test_cmp show.commit commit &&
test_cmp show.gpg verify.2 &&
test_cmp cat.commit verify.1
@@ -299,10 +312,10 @@
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 &&
@@ -324,4 +337,45 @@
test_cmp expect actual
'
+
+test_expect_success GPG 'verify-commit verifies multiply signed commits' '
+ git init multiply-signed &&
+ cd multiply-signed &&
+ test_commit first &&
+ echo 1 >second &&
+ git add second &&
+ tree=$(git write-tree) &&
+ parent=$(git rev-parse HEAD^{commit}) &&
+ git commit --gpg-sign -m second &&
+ git cat-file commit HEAD &&
+ # Avoid trailing whitespace.
+ sed -e "s/^Q//" -e "s/^Z/ /" >commit <<-EOF &&
+ Qtree $tree
+ Qparent $parent
+ Qauthor A U Thor <author@example.com> 1112912653 -0700
+ Qcommitter C O Mitter <committer@example.com> 1112912653 -0700
+ Qgpgsig -----BEGIN PGP SIGNATURE-----
+ QZ
+ Q iHQEABECADQWIQRz11h0S+chaY7FTocTtvUezd5DDQUCX/uBDRYcY29tbWl0dGVy
+ Q QGV4YW1wbGUuY29tAAoJEBO29R7N3kMNd+8AoK1I8mhLHviPH+q2I5fIVgPsEtYC
+ Q AKCTqBh+VabJceXcGIZuF0Ry+udbBQ==
+ Q =tQ0N
+ Q -----END PGP SIGNATURE-----
+ Qgpgsig-sha256 -----BEGIN PGP SIGNATURE-----
+ QZ
+ Q iHQEABECADQWIQRz11h0S+chaY7FTocTtvUezd5DDQUCX/uBIBYcY29tbWl0dGVy
+ Q QGV4YW1wbGUuY29tAAoJEBO29R7N3kMN/NEAn0XO9RYSBj2dFyozi0JKSbssYMtO
+ Q AJwKCQ1BQOtuwz//IjU8TiS+6S4iUw==
+ Q =pIwP
+ Q -----END PGP SIGNATURE-----
+ Q
+ Qsecond
+ EOF
+ head=$(git hash-object -t commit -w commit) &&
+ git reset --hard $head &&
+ git verify-commit $head 2>actual &&
+ grep "Good signature from" actual &&
+ ! grep "BAD signature from" actual
+'
+
test_done
diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh
index 29518e0..7f2956d 100755
--- a/t/t7512-status-help.sh
+++ b/t/t7512-status-help.sh
@@ -7,6 +7,9 @@
test_description='git status advice'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-rebase.sh
@@ -17,14 +20,14 @@
git config --global advice.statusuoption false &&
test_commit init main.txt init &&
git branch conflicts &&
- test_commit on_master main.txt on_master &&
+ test_commit on_main main.txt on_main &&
git checkout conflicts &&
test_commit on_conflicts main.txt on_conflicts
'
test_expect_success 'status when conflicts unresolved' '
- test_must_fail git merge master &&
+ test_must_fail git merge main &&
cat >expected <<\EOF &&
On branch conflicts
You have unmerged paths.
@@ -38,13 +41,13 @@
no changes added to commit (use "git add" and/or "git commit -a")
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'status when conflicts resolved before commit' '
git reset --hard conflicts &&
- test_must_fail git merge master &&
+ test_must_fail git merge main &&
echo one >main.txt &&
git add main.txt &&
cat >expected <<\EOF &&
@@ -58,12 +61,12 @@
Untracked files not listed (use -u option to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'prepare for rebase conflicts' '
- git reset --hard master &&
+ git reset --hard main &&
git checkout -b rebase_conflicts &&
test_commit one_rebase main.txt one &&
test_commit two_rebase main.txt two &&
@@ -90,7 +93,7 @@
no changes added to commit (use "git add" and/or "git commit -a")
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -113,16 +116,16 @@
Untracked files not listed (use -u option to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'prepare for rebase_i_conflicts' '
- git reset --hard master &&
+ git reset --hard main &&
git checkout -b rebase_i_conflicts &&
test_commit one_unmerge main.txt one_unmerge &&
git branch rebase_i_conflicts_second &&
- test_commit one_master main.txt one_master &&
+ test_commit one_main main.txt one_main &&
git checkout rebase_i_conflicts_second &&
test_commit one_second main.txt one_second
'
@@ -151,7 +154,7 @@
no changes added to commit (use "git add" and/or "git commit -a")
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -177,12 +180,12 @@
Untracked files not listed (use -u option to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'status when rebasing -i in edit mode' '
- git reset --hard master &&
+ git reset --hard main &&
git checkout -b rebase_i_edit &&
test_commit one_rebase_i main.txt one &&
test_commit two_rebase_i main.txt two &&
@@ -207,12 +210,12 @@
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'status when splitting a commit' '
- git reset --hard master &&
+ git reset --hard main &&
git checkout -b split_commit &&
test_commit one_split main.txt one &&
test_commit two_split main.txt two &&
@@ -246,12 +249,12 @@
no changes added to commit (use "git add" and/or "git commit -a")
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'status after editing the last commit with --amend during a rebase -i' '
- git reset --hard master &&
+ git reset --hard main &&
git checkout -b amend_last &&
test_commit one_amend main.txt one &&
test_commit two_amend main.txt two &&
@@ -279,12 +282,12 @@
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'prepare for several edits' '
- git reset --hard master &&
+ git reset --hard main &&
git checkout -b several_edits &&
test_commit one_edits main.txt one &&
test_commit two_edits main.txt two &&
@@ -318,7 +321,7 @@
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -353,7 +356,7 @@
no changes added to commit (use "git add" and/or "git commit -a")
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -384,7 +387,7 @@
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -415,7 +418,7 @@
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -451,7 +454,7 @@
no changes added to commit (use "git add" and/or "git commit -a")
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -483,7 +486,7 @@
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -516,7 +519,7 @@
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -554,7 +557,7 @@
no changes added to commit (use "git add" and/or "git commit -a")
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -588,12 +591,12 @@
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'prepare am_session' '
- git reset --hard master &&
+ git reset --hard main &&
git checkout -b am_session &&
test_commit one_am one.txt "one" &&
test_commit two_am two.txt "two" &&
@@ -616,7 +619,7 @@
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -638,7 +641,7 @@
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -661,12 +664,12 @@
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'status when bisecting' '
- git reset --hard master &&
+ git reset --hard main &&
git checkout -b bisect &&
test_commit one_bisect main.txt one &&
test_commit two_bisect main.txt two &&
@@ -684,12 +687,12 @@
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'status when rebase --apply conflicts with statushints disabled' '
- git reset --hard master &&
+ git reset --hard main &&
git checkout -b statushints_disabled &&
test_when_finished "git config --local advice.statushints true" &&
git config --local advice.statushints false &&
@@ -709,12 +712,12 @@
no changes added to commit
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'prepare for cherry-pick conflicts' '
- git reset --hard master &&
+ git reset --hard main &&
git checkout -b cherry_branch &&
test_commit one_cherry main.txt one &&
test_commit two_cherries main.txt two &&
@@ -743,7 +746,7 @@
no changes added to commit (use "git add" and/or "git commit -a")
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
@@ -767,7 +770,7 @@
Untracked files not listed (use -u option to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'status when cherry-picking after committing conflict resolution' '
@@ -786,7 +789,7 @@
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'status shows cherry-pick with invalid oid' '
@@ -795,7 +798,7 @@
git status --untracked-files=no >actual 2>err &&
git cherry-pick --quit &&
test_must_be_empty err &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'status does not show error if .git/sequencer is a file' '
@@ -813,7 +816,7 @@
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual &&
+ test_cmp expected actual &&
git reset --hard HEAD^ &&
cat >expected <<\EOF &&
@@ -821,11 +824,11 @@
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'status while reverting commit (conflicts)' '
- git checkout master &&
+ git checkout main &&
echo before >to-revert.txt &&
test_commit before to-revert.txt &&
echo old >to-revert.txt &&
@@ -835,7 +838,7 @@
TO_REVERT=$(git rev-parse --short HEAD^) &&
test_must_fail git revert $TO_REVERT &&
cat >expected <<EOF &&
-On branch master
+On branch main
You are currently reverting commit $TO_REVERT.
(fix conflicts and run "git revert --continue")
(use "git revert --skip" to skip this patch)
@@ -849,14 +852,14 @@
no changes added to commit (use "git add" and/or "git commit -a")
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'status while reverting commit (conflicts resolved)' '
echo reverted >to-revert.txt &&
git add to-revert.txt &&
cat >expected <<EOF &&
-On branch master
+On branch main
You are currently reverting commit $TO_REVERT.
(all conflicts fixed: run "git revert --continue")
(use "git revert --skip" to skip this patch)
@@ -869,17 +872,17 @@
Untracked files not listed (use -u option to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'status after reverting commit' '
git revert --continue &&
cat >expected <<\EOF &&
-On branch master
+On branch main
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'status while reverting after committing conflict resolution' '
@@ -889,7 +892,7 @@
echo reverted >to-revert.txt &&
git commit -a &&
cat >expected <<EOF &&
-On branch master
+On branch main
Revert currently in progress.
(run "git revert --continue" to continue)
(use "git revert --skip" to skip this patch)
@@ -898,11 +901,11 @@
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'prepare for different number of commits rebased' '
- git reset --hard master &&
+ git reset --hard main &&
git checkout -b several_commits &&
test_commit one_commit main.txt one &&
test_commit two_commit main.txt two &&
@@ -928,7 +931,7 @@
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'status: two commands done with some white lines in done file' '
@@ -956,7 +959,7 @@
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'status: two remaining commands with some white lines in todo file' '
@@ -985,7 +988,7 @@
nothing to commit (use -u to show untracked files)
EOF
git status --untracked-files=no >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_expect_success 'status: handle not-yet-started rebase -i gracefully' '
@@ -1004,7 +1007,7 @@
nothing to commit (use -u to show untracked files)
EOF
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_done
diff --git a/t/t7517-per-repo-email.sh b/t/t7517-per-repo-email.sh
index b2401ce..405420a 100755
--- a/t/t7517-per-repo-email.sh
+++ b/t/t7517-per-repo-email.sh
@@ -6,6 +6,9 @@
test_description='per-repo forced setting of email address'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup a likely user.useConfigOnly use case' '
@@ -47,24 +50,24 @@
test_expect_success 'fast-forward rebase does not care about ident' '
git checkout -B tmp side-without-commit &&
- git rebase master
+ git rebase main
'
test_expect_success 'non-fast-forward rebase refuses to write commits' '
test_when_finished "git rebase --abort || true" &&
git checkout -B tmp side-with-commit &&
- test_must_fail git rebase master
+ test_must_fail git rebase main
'
test_expect_success 'fast-forward rebase does not care about ident (interactive)' '
git checkout -B tmp side-without-commit &&
- git rebase -i master
+ git rebase -i main
'
test_expect_success 'non-fast-forward rebase refuses to write commits (interactive)' '
test_when_finished "git rebase --abort || true" &&
git checkout -B tmp side-with-commit &&
- test_must_fail git rebase -i master
+ test_must_fail git rebase -i main
'
test_expect_success 'noop interactive rebase does not care about ident' '
@@ -75,14 +78,14 @@
test_expect_success REBASE_P \
'fast-forward rebase does not care about ident (preserve)' '
git checkout -B tmp side-without-commit &&
- git rebase -p master
+ git rebase -p main
'
test_expect_success REBASE_P \
'non-fast-forward rebase refuses to write commits (preserve)' '
test_when_finished "git rebase --abort || true" &&
git checkout -B tmp side-with-commit &&
- test_must_fail git rebase -p master
+ test_must_fail git rebase -p main
'
test_expect_success 'author.name overrides user.name' '
diff --git a/t/t7518-ident-corner-cases.sh b/t/t7518-ident-corner-cases.sh
index b22f631..905957b 100755
--- a/t/t7518-ident-corner-cases.sh
+++ b/t/t7518-ident-corner-cases.sh
@@ -13,7 +13,7 @@
sane_unset GIT_AUTHOR_EMAIL &&
GIT_AUTHOR_NAME= &&
test_must_fail git commit --allow-empty -m foo 2>err &&
- test_i18ngrep ! null err
+ test_i18ngrep ! "(null)" err
)
'
@@ -29,7 +29,18 @@
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/t/t7519-status-fsmonitor.sh b/t/t7519-status-fsmonitor.sh
index fbfdcca..45d025f 100755
--- a/t/t7519-status-fsmonitor.sh
+++ b/t/t7519-status-fsmonitor.sh
@@ -236,7 +236,7 @@
git reset HEAD~1 &&
git status >actual &&
git -c core.fsmonitor= status >expect &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
# test fsmonitor with and without preloadIndex
@@ -273,7 +273,7 @@
git add dir2/new &&
git status >actual &&
git -c core.fsmonitor= status >expect &&
- test_i18ncmp expect actual
+ test_cmp expect actual
'
# Make sure it's actually skipping the check for modified and untracked
diff --git a/t/t7521-ignored-mode.sh b/t/t7521-ignored-mode.sh
index 9179094..a88b02b 100755
--- a/t/t7521-ignored-mode.sh
+++ b/t/t7521-ignored-mode.sh
@@ -30,7 +30,7 @@
dir/ignored/ignored_1.ign dir/ignored/ignored_2.ign &&
git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'Verify status behavior on directory with tracked & ignored files' '
@@ -55,7 +55,7 @@
git commit -m "commit tracked files" &&
git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'Verify status behavior on directory with untracked and ignored files' '
@@ -80,7 +80,7 @@
dir/untracked_ignored/ignored_1.ign dir/untracked_ignored/ignored_2.ign &&
git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'Verify status matching ignored files on ignored directory' '
@@ -96,7 +96,7 @@
ignored_dir/ignored_1.ign ignored_dir/ignored_2.ign &&
git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'Verify status behavior on ignored directory containing tracked file' '
@@ -117,7 +117,7 @@
git add -f ignored_dir/tracked &&
git commit -m "Force add file in ignored directory" &&
git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'Verify matching ignored files with --untracked-files=normal' '
@@ -136,7 +136,7 @@
ignored_files/ignored_1.ign ignored_files/ignored_2.ign \
untracked_dir/untracked &&
git status --porcelain=v2 --ignored=matching --untracked-files=normal >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'Verify matching ignored files with --untracked-files=normal' '
@@ -155,7 +155,7 @@
ignored_files/ignored_1.ign ignored_files/ignored_2.ign \
untracked_dir/untracked &&
git status --porcelain=v2 --ignored=matching --untracked-files=normal >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'Verify status behavior on ignored directory containing tracked file' '
@@ -176,7 +176,7 @@
git add -f ignored_dir/tracked &&
git commit -m "Force add file in ignored directory" &&
git status --porcelain=v2 --ignored=matching --untracked-files=normal >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'Verify behavior of status with --ignored=no' '
@@ -191,7 +191,7 @@
dir/ignored/ignored_1.ign dir/ignored/ignored_2.ign &&
git status --porcelain=v2 --ignored=no --untracked-files=all >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'Verify behavior of status with --ignored=traditional and --untracked-files=all' '
@@ -210,7 +210,7 @@
dir/ignored/ignored_1.ign dir/ignored/ignored_2.ign &&
git status --porcelain=v2 --ignored=traditional --untracked-files=all >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_expect_success 'Verify behavior of status with --ignored=traditional and --untracked-files=normal' '
@@ -227,7 +227,7 @@
dir/ignored/ignored_1.ign dir/ignored/ignored_2.ign &&
git status --porcelain=v2 --ignored=traditional --untracked-files=normal >output &&
- test_i18ncmp expect output
+ test_cmp expect output
'
test_done
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 1326088..1cbc971 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -14,9 +14,9 @@
! [c4] c4
! [c5] c5
! [c6] c6
- * [master] Merge commit 'c1'
+ * [main] Merge commit 'c1'
--------
- - [master] Merge commit 'c1'
+ - [main] Merge commit 'c1'
+ * [c1] commit 1
+ [c6] c6
+ [c5] c5
@@ -26,18 +26,25 @@
+++++++* [c0] commit 0
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./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 +88,7 @@
}
verify_parents () {
- printf '%s\n' "$@" >parents.expected &&
+ test_write_lines "$@" >parents.expected &&
>parents.actual &&
i=1 &&
while test $i -le $#
@@ -95,7 +102,7 @@
}
verify_mergeheads () {
- printf '%s\n' "$@" >mergehead.expected &&
+ test_write_lines "$@" >mergehead.expected &&
while read sha1 rest
do
git rev-parse $sha1
@@ -199,13 +206,13 @@
test_debug 'git log --graph --decorate --oneline --all'
test_expect_success 'merge from unborn branch' '
- git checkout -f master &&
+ git checkout -f main &&
test_might_fail git branch -D kid &&
echo "OBJID HEAD@{0}: initial pull" >reflog.expected &&
git checkout --orphan kid &&
- test_when_finished "git checkout -f master" &&
+ test_when_finished "git checkout -f main" &&
git rm -fr . &&
test_tick &&
git merge --ff-only c1 &&
@@ -242,7 +249,7 @@
# 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,8 +271,8 @@
# file
EOF
git cat-file commit HEAD >raw &&
- sed -e '1,/^$/d' raw >actual &&
- test_i18ncmp expect actual
+ sed -e "1,/^$/d" raw >actual &&
+ test_cmp expect actual
'
test_expect_success 'merge c3 with c7 with --squash commit.cleanup = scissors' '
@@ -288,8 +295,8 @@
# file
EOF
git cat-file commit HEAD >raw &&
- sed -e '1,/^$/d' raw >actual &&
- test_i18ncmp expect actual
+ sed -e "1,/^$/d" raw >actual &&
+ test_cmp expect actual
'
test_debug 'git log --graph --decorate --oneline --all'
@@ -409,7 +416,7 @@
test_expect_success 'merge c1 with c2 (no-commit in config)' '
git reset --hard c1 &&
- test_config branch.master.mergeoptions "--no-commit" &&
+ test_config branch.main.mergeoptions "--no-commit" &&
git merge c2 &&
verify_merge file result.1-5 &&
verify_head $c1 &&
@@ -423,7 +430,7 @@
git merge --log c2 &&
git show -s --pretty=tformat:%s%n%b >expect &&
- test_config branch.master.mergeoptions "--log" &&
+ test_config branch.main.mergeoptions "--log" &&
git reset --hard c1 &&
git merge c2 &&
git show -s --pretty=tformat:%s%n%b >actual &&
@@ -436,7 +443,7 @@
git merge c2 &&
git show -s --pretty=tformat:%s%n%b >expect &&
- test_config branch.master.mergeoptions "--no-log" &&
+ test_config branch.main.mergeoptions "--no-log" &&
test_config merge.log "true" &&
git reset --hard c1 &&
git merge c2 &&
@@ -447,7 +454,7 @@
test_expect_success 'merge c1 with c2 (squash in config)' '
git reset --hard c1 &&
- test_config branch.master.mergeoptions "--squash" &&
+ test_config branch.main.mergeoptions "--squash" &&
git merge c2 &&
verify_merge file result.1-5 &&
verify_head $c1 &&
@@ -459,7 +466,7 @@
test_expect_success 'override config option -n with --summary' '
git reset --hard c1 &&
- test_config branch.master.mergeoptions "-n" &&
+ test_config branch.main.mergeoptions "-n" &&
test_tick &&
git merge --summary c2 >diffstat.txt &&
verify_merge file result.1-5 msg.1-5 &&
@@ -473,7 +480,7 @@
test_expect_success 'override config option -n with --stat' '
git reset --hard c1 &&
- test_config branch.master.mergeoptions "-n" &&
+ test_config branch.main.mergeoptions "-n" &&
test_tick &&
git merge --stat c2 >diffstat.txt &&
verify_merge file result.1-5 msg.1-5 &&
@@ -489,7 +496,7 @@
test_expect_success 'override config option --stat' '
git reset --hard c1 &&
- test_config branch.master.mergeoptions "--stat" &&
+ test_config branch.main.mergeoptions "--stat" &&
test_tick &&
git merge -n c2 >diffstat.txt &&
verify_merge file result.1-5 msg.1-5 &&
@@ -505,7 +512,7 @@
test_expect_success 'merge c1 with c2 (override --no-commit)' '
git reset --hard c1 &&
- test_config branch.master.mergeoptions "--no-commit" &&
+ test_config branch.main.mergeoptions "--no-commit" &&
test_tick &&
git merge --commit c2 &&
verify_merge file result.1-5 msg.1-5 &&
@@ -516,7 +523,7 @@
test_expect_success 'merge c1 with c2 (override --squash)' '
git reset --hard c1 &&
- test_config branch.master.mergeoptions "--squash" &&
+ test_config branch.main.mergeoptions "--squash" &&
test_tick &&
git merge --no-squash c2 &&
verify_merge file result.1-5 msg.1-5 &&
@@ -545,9 +552,9 @@
'
test_debug 'git log --graph --decorate --oneline --all'
-test_expect_success 'combine branch.master.mergeoptions with merge.ff' '
+test_expect_success 'combine branch.main.mergeoptions with merge.ff' '
git reset --hard c0 &&
- test_config branch.master.mergeoptions "--ff" &&
+ test_config branch.main.mergeoptions "--ff" &&
test_config merge.ff "false" &&
test_tick &&
git merge c1 &&
@@ -589,7 +596,7 @@
test_expect_success 'merge c0 with c1 (ff overrides no-ff)' '
git reset --hard c0 &&
- test_config branch.master.mergeoptions "--no-ff" &&
+ test_config branch.main.mergeoptions "--no-ff" &&
git merge --ff c1 &&
verify_merge file result.1 &&
verify_head $c1
@@ -602,7 +609,7 @@
test_must_be_empty msg.act &&
git reset --hard c0 &&
- test_config branch.master.mergeoptions "--no-ff" &&
+ test_config branch.main.mergeoptions "--no-ff" &&
git merge --no-log c2 &&
git show -s --pretty=format:%b HEAD >msg.act &&
test_must_be_empty msg.act &&
@@ -675,6 +682,134 @@
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
@@ -818,10 +953,10 @@
git add file &&
git commit -m base &&
- # one side changes the first line of each to "master"
- sed s/-1/-master/ file >tmp &&
+ # one side changes the first line of each to "main"
+ sed s/-1/-main/ file >tmp &&
mv tmp file &&
- git commit -am master &&
+ git commit -am main &&
# and the other to "side"; merging the two will
# yield 256 separate conflicts
@@ -833,12 +968,12 @@
test_expect_success 'merge detects mod-256 conflicts (recursive)' '
git reset --hard &&
- test_must_fail git merge -s recursive master
+ test_must_fail git merge -s recursive main
'
test_expect_success 'merge detects mod-256 conflicts (resolve)' '
git reset --hard &&
- test_must_fail git merge -s resolve master
+ test_must_fail git merge -s resolve main
'
test_expect_success 'merge nothing into void' '
diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh
index c6c44ec..52e8ccc 100755
--- a/t/t7601-merge-pull-config.sh
+++ b/t/t7601-merge-pull-config.sh
@@ -27,6 +27,122 @@
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 'pull.rebase not set (not-fast-forward)' '
+ git reset --hard c2 &&
+ git -c color.advice=always pull . c1 2>err &&
+ test_decode_color <err >decoded &&
+ test_i18ngrep "<YELLOW>hint: " decoded &&
+ test_i18ngrep "Pulling without specifying how to reconcile" decoded
+'
+
+test_expect_success 'pull.rebase not set and pull.ff=true (not-fast-forward)' '
+ git reset --hard c2 &&
+ 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 (not-fast-forward)' '
+ git reset --hard c2 &&
+ 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 (not-fast-forward)' '
+ git reset --hard c2 &&
+ test_config pull.ff only &&
+ test_must_fail git pull . c1 2>err &&
+ test_i18ngrep ! "Pulling without specifying how to reconcile" err
+'
+
+test_expect_success 'pull.rebase not set and --rebase given (not-fast-forward)' '
+ git reset --hard c2 &&
+ 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 (not-fast-forward)' '
+ git reset --hard c2 &&
+ 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 (not-fast-forward)' '
+ git reset --hard c2 &&
+ 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 (not-fast-forward)' '
+ git reset --hard c2 &&
+ 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 (not-fast-forward)' '
+ git reset --hard c2 &&
+ test_must_fail 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/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh
index 6abe441..a9c816b 100755
--- a/t/t7602-merge-octopus-many.sh
+++ b/t/t7602-merge-octopus-many.sh
@@ -66,7 +66,7 @@
test_expect_success 'merge output uses pretty names' '
git reset --hard c1 &&
git merge c2 c3 c4 >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
cat >expected <<\EOF
@@ -77,8 +77,14 @@
EOF
test_expect_success 'merge reduces irrelevant remote heads' '
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ mv expected expected.tmp &&
+ sed s/recursive/ort/ expected.tmp >expected &&
+ rm expected.tmp
+ fi &&
GIT_MERGE_VERBOSITY=0 git merge c4 c5 >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
cat >expected <<\EOF
@@ -95,7 +101,7 @@
test_expect_success 'merge fast-forward output uses pretty names' '
git reset --hard c0 &&
git merge c1 c2 >actual &&
- test_i18ncmp expected actual
+ test_cmp expected actual
'
test_done
diff --git a/t/t7606-merge-custom.sh b/t/t7606-merge-custom.sh
index 8e8c4d7..81fb7c4 100755
--- a/t/t7606-merge-custom.sh
+++ b/t/t7606-merge-custom.sh
@@ -4,7 +4,7 @@
Testing a custom strategy.
-* (HEAD, master) Merge commit 'c3'
+* (HEAD, main) Merge commit 'c3'
|\
| * (tag: c3) c3
* | (tag: c1) c1
diff --git a/t/t7608-merge-messages.sh b/t/t7608-merge-messages.sh
index 8e7e0a5..0b908ab 100755
--- a/t/t7608-merge-messages.sh
+++ b/t/t7608-merge-messages.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='test auto-generated merge messages'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
check_oneline() {
@@ -10,51 +13,51 @@
}
test_expect_success 'merge local branch' '
- test_commit master-1 &&
+ test_commit main-1 &&
git checkout -b local-branch &&
test_commit branch-1 &&
- git checkout master &&
- test_commit master-2 &&
+ git checkout main &&
+ test_commit main-2 &&
git merge local-branch &&
check_oneline "Merge branch Qlocal-branchQ"
'
test_expect_success 'merge octopus branches' '
- git checkout -b octopus-a master &&
+ git checkout -b octopus-a main &&
test_commit octopus-1 &&
- git checkout -b octopus-b master &&
+ git checkout -b octopus-b main &&
test_commit octopus-2 &&
- git checkout master &&
+ git checkout main &&
git merge octopus-a octopus-b &&
check_oneline "Merge branches Qoctopus-aQ and Qoctopus-bQ"
'
test_expect_success 'merge tag' '
- git checkout -b tag-branch master &&
+ git checkout -b tag-branch main &&
test_commit tag-1 &&
- git checkout master &&
- test_commit master-3 &&
+ git checkout main &&
+ test_commit main-3 &&
git merge tag-1 &&
check_oneline "Merge tag Qtag-1Q"
'
test_expect_success 'ambiguous tag' '
- git checkout -b ambiguous master &&
+ git checkout -b ambiguous main &&
test_commit ambiguous &&
- git checkout master &&
- test_commit master-4 &&
+ git checkout main &&
+ test_commit main-4 &&
git merge ambiguous &&
check_oneline "Merge tag QambiguousQ"
'
test_expect_success 'remote-tracking branch' '
- git checkout -b remote master &&
+ git checkout -b remote main &&
test_commit remote-1 &&
- git update-ref refs/remotes/origin/master remote &&
- git checkout master &&
- test_commit master-5 &&
- git merge origin/master &&
- check_oneline "Merge remote-tracking branch Qorigin/masterQ"
+ git update-ref refs/remotes/origin/main remote &&
+ git checkout main &&
+ test_commit main-5 &&
+ git merge origin/main &&
+ check_oneline "Merge remote-tracking branch Qorigin/mainQ"
'
test_done
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index ad288dd..8cc6472 100755
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
@@ -7,22 +7,25 @@
Testing basic merge tool invocation'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
# All the mergetool test work by checking out a temporary branch based
-# off 'branch1' and then merging in master and checking the results of
+# off 'branch1' and then merging in main and checking the results of
# running mergetool
test_expect_success 'setup' '
test_config rerere.enabled true &&
- echo master >file1 &&
- echo master spaced >"spaced name" &&
- echo master file11 >file11 &&
- echo master file12 >file12 &&
- echo master file13 >file13 &&
- echo master file14 >file14 &&
+ echo main >file1 &&
+ echo main spaced >"spaced name" &&
+ echo main file11 >file11 &&
+ echo main file12 >file12 &&
+ echo main file13 >file13 &&
+ echo main file14 >file14 &&
mkdir subdir &&
- echo master sub >subdir/file3 &&
+ echo main sub >subdir/file3 &&
test_create_repo submod &&
(
cd submod &&
@@ -34,7 +37,7 @@
git add file1 "spaced name" file1[1-4] subdir/file3 .gitmodules submod &&
git commit -m "add initial versions" &&
- git checkout -b branch1 master &&
+ git checkout -b branch1 main &&
git submodule update -N &&
echo branch1 change >file1 &&
echo branch1 newfile >file2 &&
@@ -71,39 +74,39 @@
test_write_lines one two 3 >c/c/file.txt &&
git commit -a -m"move to c" &&
- git checkout -b stash1 master &&
+ git checkout -b stash1 main &&
echo stash1 change file11 >file11 &&
git add file11 &&
git commit -m "stash1 changes" &&
- git checkout -b stash2 master &&
+ git checkout -b stash2 main &&
echo stash2 change file11 >file11 &&
git add file11 &&
git commit -m "stash2 changes" &&
- git checkout master &&
+ git checkout main &&
git submodule update -N &&
- echo master updated >file1 &&
- echo master new >file2 &&
- echo master updated spaced >"spaced name" &&
- echo master both added >both &&
- echo master updated file12 >file12 &&
- echo master updated file14 >file14 &&
- echo master new sub >subdir/file3 &&
+ echo main updated >file1 &&
+ echo main new >file2 &&
+ echo main updated spaced >"spaced name" &&
+ echo main both added >both &&
+ echo main updated file12 >file12 &&
+ echo main updated file14 >file14 &&
+ echo main new sub >subdir/file3 &&
(
cd submod &&
- echo master submodule >bar &&
+ echo main submodule >bar &&
git add bar &&
- git commit -m "Add bar on master" &&
- git checkout -b submod-master
+ git commit -m "Add bar on main" &&
+ git checkout -b submod-main
) &&
git add file1 "spaced name" file12 file14 file2 subdir/file3 submod &&
git add both &&
git rm file11 &&
- git commit -m "master updates" &&
+ git commit -m "main updates" &&
git clean -fdx &&
- git checkout -b order-file-start master &&
+ git checkout -b order-file-start main &&
echo start >a &&
echo start >b &&
git add a b &&
@@ -130,7 +133,7 @@
test_when_finished "git reset --hard" &&
git checkout -b test$test_count branch1 &&
git submodule update -N &&
- test_must_fail git merge master &&
+ test_must_fail git merge main &&
yes "" | git mergetool both &&
yes "" | git mergetool file1 file1 &&
yes "" | git mergetool file2 "spaced name" &&
@@ -138,11 +141,11 @@
yes "d" | git mergetool file11 &&
yes "d" | git mergetool file12 &&
yes "l" | git mergetool submod &&
- echo "master updated" >expect &&
+ echo "main updated" >expect &&
test_cmp expect file1 &&
- echo "master new" >expect &&
+ echo "main new" >expect &&
test_cmp expect file2 &&
- echo "master new sub" >expect &&
+ echo "main new sub" >expect &&
test_cmp expect subdir/file3 &&
echo "branch1 submodule" >expect &&
test_cmp expect submod/bar &&
@@ -156,7 +159,7 @@
test_when_finished "git reset --hard" &&
git checkout -b test$test_count branch1 &&
git submodule update -N &&
- test_must_fail git merge master &&
+ test_must_fail git merge main &&
yes "" | git mergetool --gui both &&
yes "" | git mergetool -g file1 file1 &&
yes "" | git mergetool --gui file2 "spaced name" &&
@@ -164,11 +167,11 @@
yes "d" | git mergetool --gui file11 &&
yes "d" | git mergetool --gui file12 &&
yes "l" | git mergetool --gui submod &&
- echo "gui master updated" >expect &&
+ echo "gui main updated" >expect &&
test_cmp expect file1 &&
- echo "gui master new" >expect &&
+ echo "gui main new" >expect &&
test_cmp expect file2 &&
- echo "gui master new sub" >expect &&
+ echo "gui main new sub" >expect &&
test_cmp expect subdir/file3 &&
echo "branch1 submodule" >expect &&
test_cmp expect submod/bar &&
@@ -179,7 +182,7 @@
test_when_finished "git reset --hard" &&
git checkout -b test$test_count branch1 &&
git submodule update -N &&
- test_must_fail git merge master &&
+ test_must_fail git merge main &&
yes "" | git mergetool --gui both &&
yes "" | git mergetool -g file1 file1 &&
yes "" | git mergetool --gui file2 "spaced name" &&
@@ -187,11 +190,11 @@
yes "d" | git mergetool --gui file11 &&
yes "d" | git mergetool --gui file12 &&
yes "l" | git mergetool --gui submod &&
- echo "master updated" >expect &&
+ echo "main updated" >expect &&
test_cmp expect file1 &&
- echo "master new" >expect &&
+ echo "main new" >expect &&
test_cmp expect file2 &&
- echo "master new sub" >expect &&
+ echo "main new sub" >expect &&
test_cmp expect subdir/file3 &&
echo "branch1 submodule" >expect &&
test_cmp expect submod/bar &&
@@ -206,7 +209,7 @@
# test_when_finished is LIFO.)
test_config core.autocrlf true &&
git checkout -b test$test_count branch1 &&
- test_must_fail git merge master &&
+ test_must_fail git merge main &&
yes "" | git mergetool file1 &&
yes "" | git mergetool file2 &&
yes "" | git mergetool "spaced name" &&
@@ -215,11 +218,11 @@
yes "d" | git mergetool file11 &&
yes "d" | git mergetool file12 &&
yes "r" | git mergetool submod &&
- test "$(printf x | cat file1 -)" = "$(printf "master updated\r\nx")" &&
- test "$(printf x | cat file2 -)" = "$(printf "master new\r\nx")" &&
- test "$(printf x | cat subdir/file3 -)" = "$(printf "master new sub\r\nx")" &&
+ test "$(printf x | cat file1 -)" = "$(printf "main updated\r\nx")" &&
+ test "$(printf x | cat file2 -)" = "$(printf "main new\r\nx")" &&
+ test "$(printf x | cat subdir/file3 -)" = "$(printf "main new sub\r\nx")" &&
git submodule update -N &&
- echo "master submodule" >expect &&
+ echo "main submodule" >expect &&
test_cmp expect submod/bar &&
git commit -m "branch1 resolved with mergetool - autocrlf"
'
@@ -230,9 +233,9 @@
git submodule update -N &&
(
cd subdir &&
- test_must_fail git merge master &&
+ test_must_fail git merge main &&
yes "" | git mergetool file3 &&
- echo "master new sub" >expect &&
+ echo "main new sub" >expect &&
test_cmp expect file3
)
'
@@ -243,7 +246,7 @@
git submodule update -N &&
(
cd subdir &&
- test_must_fail git merge master &&
+ test_must_fail git merge main &&
yes "" | git mergetool file3 &&
yes "" | git mergetool ../file1 &&
yes "" | git mergetool ../file2 ../spaced\ name &&
@@ -251,9 +254,9 @@
yes "d" | git mergetool ../file11 &&
yes "d" | git mergetool ../file12 &&
yes "l" | git mergetool ../submod &&
- echo "master updated" >expect &&
+ echo "main updated" >expect &&
test_cmp expect ../file1 &&
- echo "master new" >expect &&
+ echo "main new" >expect &&
test_cmp expect ../file2 &&
echo "branch1 submodule" >expect &&
test_cmp expect ../submod/bar &&
@@ -265,7 +268,7 @@
test_when_finished "git reset --hard" &&
git checkout -b test$test_count branch1 &&
git submodule update -N &&
- test_must_fail git merge master &&
+ test_must_fail git merge main &&
test -n "$(git ls-files -u)" &&
yes "d" | git mergetool file11 &&
yes "d" | git mergetool file12 &&
@@ -280,17 +283,17 @@
test_config rerere.enabled false &&
(
cd subdir &&
- test_must_fail git merge master &&
+ test_must_fail git merge main &&
yes "r" | git mergetool ../submod &&
yes "d" "d" | git mergetool --no-prompt &&
- echo "master updated" >expect &&
+ echo "main updated" >expect &&
test_cmp expect ../file1 &&
- echo "master new" >expect &&
+ echo "main new" >expect &&
test_cmp expect ../file2 &&
- echo "master new sub" >expect &&
+ echo "main new sub" >expect &&
test_cmp expect file3 &&
( cd .. && git submodule update -N ) &&
- echo "master submodule" >expect &&
+ echo "main submodule" >expect &&
test_cmp expect ../submod/bar &&
git commit -m "branch2 resolved by mergetool from subdir"
)
@@ -303,17 +306,17 @@
rm -rf .git/rr-cache &&
(
cd subdir &&
- test_must_fail git merge master &&
+ test_must_fail git merge main &&
yes "r" | git mergetool ../submod &&
yes "d" "d" | git mergetool --no-prompt &&
- echo "master updated" >expect &&
+ echo "main updated" >expect &&
test_cmp expect ../file1 &&
- echo "master new" >expect &&
+ echo "main new" >expect &&
test_cmp expect ../file2 &&
- echo "master new sub" >expect &&
+ echo "main new sub" >expect &&
test_cmp expect file3 &&
( cd .. && git submodule update -N ) &&
- echo "master submodule" >expect &&
+ echo "main submodule" >expect &&
test_cmp expect ../submod/bar &&
git commit -m "branch2 resolved by mergetool from subdir"
)
@@ -325,7 +328,7 @@
rm -rf .git/rr-cache &&
git checkout -b test$test_count branch1 &&
git submodule update -N &&
- test_must_fail git merge master &&
+ test_must_fail git merge main &&
yes "l" | git mergetool --no-prompt submod &&
yes "d" "d" | git mergetool --no-prompt &&
git submodule update -N &&
@@ -366,11 +369,11 @@
test_config rerere.enabled false &&
git checkout -b test$test_count branch1 &&
git submodule update -N &&
- test_must_fail git merge master &&
+ test_must_fail git merge main &&
yes "" | git mergetool subdir &&
- echo "master new sub" >expect &&
+ echo "main new sub" >expect &&
test_cmp expect subdir/file3
'
@@ -434,7 +437,7 @@
git rm --cached submod &&
git commit -m "Submodule deleted from branch" &&
git checkout -b test$test_count.a test$test_count &&
- test_must_fail git merge master &&
+ test_must_fail git merge main &&
test -n "$(git ls-files -u)" &&
yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
yes "" | git mergetool both &&
@@ -444,7 +447,7 @@
echo "branch1 submodule" >expect &&
test_cmp expect submod/bar &&
git submodule update -N &&
- echo "master submodule" >expect &&
+ echo "main submodule" >expect &&
test_cmp expect submod/bar &&
output="$(git mergetool --no-prompt)" &&
test "$output" = "No files need merging" &&
@@ -453,7 +456,7 @@
mv submod submod-movedaside &&
git checkout -b test$test_count.b test$test_count &&
git submodule update -N &&
- test_must_fail git merge master &&
+ test_must_fail git merge main &&
test -n "$(git ls-files -u)" &&
yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
yes "" | git mergetool both &&
@@ -465,7 +468,7 @@
git commit -m "Merge resolved by deleting module" &&
mv submod-movedaside submod &&
- git checkout -b test$test_count.c master &&
+ git checkout -b test$test_count.c main &&
git submodule update -N &&
test_must_fail git merge test$test_count &&
test -n "$(git ls-files -u)" &&
@@ -481,7 +484,7 @@
git commit -m "Merge resolved by deleting module" &&
mv submod.orig submod &&
- git checkout -b test$test_count.d master &&
+ git checkout -b test$test_count.d main &&
git submodule update -N &&
test_must_fail git merge test$test_count &&
test -n "$(git ls-files -u)" &&
@@ -489,10 +492,10 @@
yes "" | git mergetool both &&
yes "d" | git mergetool file11 file12 &&
yes "l" | git mergetool submod &&
- echo "master submodule" >expect &&
+ echo "main submodule" >expect &&
test_cmp expect submod/bar &&
git submodule update -N &&
- echo "master submodule" >expect &&
+ echo "main submodule" >expect &&
test_cmp expect submod/bar &&
output="$(git mergetool --no-prompt)" &&
test "$output" = "No files need merging" &&
@@ -509,7 +512,7 @@
git add submod &&
git commit -m "Submodule path becomes file" &&
git checkout -b test$test_count.a branch1 &&
- test_must_fail git merge master &&
+ test_must_fail git merge main &&
test -n "$(git ls-files -u)" &&
yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
yes "" | git mergetool both &&
@@ -519,7 +522,7 @@
echo "branch1 submodule" >expect &&
test_cmp expect submod/bar &&
git submodule update -N &&
- echo "master submodule" >expect &&
+ echo "main submodule" >expect &&
test_cmp expect submod/bar &&
output="$(git mergetool --no-prompt)" &&
test "$output" = "No files need merging" &&
@@ -527,12 +530,19 @@
mv submod submod-movedaside &&
git checkout -b test$test_count.b test$test_count &&
- test_must_fail git merge master &&
+ test_must_fail git merge main &&
test -n "$(git ls-files -u)" &&
yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
yes "" | git mergetool both &&
yes "d" | git mergetool file11 file12 &&
- yes "l" | git mergetool submod &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ yes "c" | git mergetool submod~HEAD &&
+ git rm submod &&
+ git mv submod~HEAD submod
+ else
+ yes "l" | git mergetool submod
+ fi &&
git submodule update -N &&
echo "not a submodule" >expect &&
test_cmp expect submod &&
@@ -540,7 +550,7 @@
test "$output" = "No files need merging" &&
git commit -m "Merge resolved by keeping file" &&
- git checkout -b test$test_count.c master &&
+ git checkout -b test$test_count.c main &&
rmdir submod && mv submod-movedaside submod &&
test ! -e submod.orig &&
git submodule update -N &&
@@ -549,7 +559,15 @@
yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
yes "" | git mergetool both &&
yes "d" | git mergetool file11 file12 &&
- yes "r" | git mergetool submod &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ mv submod submod.orig &&
+ git rm --cached submod &&
+ yes "c" | git mergetool submod~test19 &&
+ git mv submod~test19 submod
+ else
+ yes "r" | git mergetool submod
+ fi &&
test -d submod.orig &&
git submodule update -N &&
echo "not a submodule" >expect &&
@@ -558,7 +576,7 @@
test "$output" = "No files need merging" &&
git commit -m "Merge resolved by keeping file" &&
- git checkout -b test$test_count.d master &&
+ git checkout -b test$test_count.d main &&
rmdir submod && mv submod.orig submod &&
git submodule update -N &&
test_must_fail git merge test$test_count &&
@@ -567,10 +585,14 @@
yes "" | git mergetool both &&
yes "d" | git mergetool file11 file12 &&
yes "l" | git mergetool submod &&
- echo "master submodule" >expect &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ yes "d" | git mergetool submod~test19
+ fi &&
+ echo "main submodule" >expect &&
test_cmp expect submod/bar &&
git submodule update -N &&
- echo "master submodule" >expect &&
+ echo "main submodule" >expect &&
test_cmp expect submod/bar &&
output="$(git mergetool --no-prompt)" &&
test "$output" = "No files need merging" &&
@@ -653,7 +675,7 @@
git add submod/file16 &&
git commit -m "Submodule path becomes directory" &&
- test_must_fail git merge master &&
+ test_must_fail git merge main &&
test -n "$(git ls-files -u)" &&
yes "l" | git mergetool submod &&
echo "not a submodule" >expect &&
@@ -661,10 +683,17 @@
rm -rf submod.orig &&
git reset --hard &&
- test_must_fail git merge master &&
+ test_must_fail git merge main &&
test -n "$(git ls-files -u)" &&
test ! -e submod.orig &&
- yes "r" | git mergetool submod &&
+ if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+ then
+ yes "r" | git mergetool submod~main &&
+ git mv submod submod.orig &&
+ git mv submod~main submod
+ else
+ yes "r" | git mergetool submod
+ fi &&
test -d submod.orig &&
echo "not a submodule" >expect &&
test_cmp expect submod.orig/file16 &&
@@ -672,18 +701,18 @@
mv submod-movedaside/.git submod &&
( cd submod && git clean -f && git reset --hard ) &&
git submodule update -N &&
- echo "master submodule" >expect &&
+ echo "main submodule" >expect &&
test_cmp expect submod/bar &&
git reset --hard &&
rm -rf submod-movedaside &&
- git checkout -b test$test_count.c master &&
+ git checkout -b test$test_count.c main &&
git submodule update -N &&
test_must_fail git merge test$test_count &&
test -n "$(git ls-files -u)" &&
yes "l" | git mergetool submod &&
git submodule update -N &&
- echo "master submodule" >expect &&
+ echo "main submodule" >expect &&
test_cmp expect submod/bar &&
git reset --hard &&
@@ -695,7 +724,7 @@
echo "not a submodule" >expect &&
test_cmp expect submod/file16 &&
- git reset --hard master &&
+ git reset --hard main &&
( cd submod && git clean -f && git reset --hard ) &&
git submodule update -N
'
@@ -703,7 +732,7 @@
test_expect_success 'file with no base' '
test_when_finished "git reset --hard" &&
git checkout -b test$test_count branch1 &&
- test_must_fail git merge master &&
+ test_must_fail git merge main &&
git mergetool --no-prompt --tool mybase -- both &&
test_must_be_empty both
'
@@ -713,9 +742,9 @@
git checkout -b test$test_count branch1 &&
test_config mergetool.defaults.cmd "cat \"\$REMOTE\" >\"\$MERGED\"" &&
test_config mergetool.defaults.trustExitCode true &&
- test_must_fail git merge master &&
+ test_must_fail git merge main &&
git mergetool --no-prompt --tool defaults -- both &&
- echo master both added >expected &&
+ echo main both added >expected &&
test_cmp expected both
'
@@ -725,7 +754,7 @@
test_config mergetool.writeToTemp false &&
test_config mergetool.myecho.cmd "echo \"\$LOCAL\"" &&
test_config mergetool.myecho.trustExitCode true &&
- test_must_fail git merge master &&
+ test_must_fail git merge main &&
git mergetool --no-prompt --tool myecho -- both >actual &&
grep ^\./both_LOCAL_ actual
'
@@ -742,7 +771,7 @@
test_config mergetool.writeToTemp true &&
test_config mergetool.myecho.cmd "echo \"\$LOCAL\"" &&
test_config mergetool.myecho.trustExitCode true &&
- test_must_fail git merge master &&
+ test_must_fail git merge main &&
git mergetool --no-prompt --tool myecho -- both >actual &&
! grep ^\./both_LOCAL_ actual &&
grep /both_LOCAL_ actual
@@ -802,4 +831,33 @@
test_cmp expect actual
'
+test_expect_success 'mergetool --tool-help shows recognized tools' '
+ # Check a few known tools are correctly shown
+ git mergetool --tool-help >mergetools &&
+ grep vimdiff mergetools &&
+ grep vimdiff3 mergetools &&
+ grep gvimdiff2 mergetools &&
+ grep araxis mergetools &&
+ grep xxdiff mergetools &&
+ grep meld mergetools
+'
+
+test_expect_success 'mergetool hideResolved' '
+ test_config mergetool.hideResolved true &&
+ test_when_finished "git reset --hard" &&
+ git checkout -b test${test_count}_b main &&
+ test_write_lines >file1 base "" a &&
+ git commit -a -m "base" &&
+ test_write_lines >file1 base "" c &&
+ git commit -a -m "remote update" &&
+ git checkout -b test${test_count}_a HEAD~ &&
+ test_write_lines >file1 local "" b &&
+ git commit -a -m "local update" &&
+ test_must_fail git merge test${test_count}_b &&
+ yes "" | git mergetool file1 &&
+ test_write_lines >expect local "" c &&
+ test_cmp expect file1 &&
+ git commit -m "test resolved with mergetool"
+'
+
test_done
diff --git a/t/t7611-merge-abort.sh b/t/t7611-merge-abort.sh
index 7c84a51..c0e9425 100755
--- a/t/t7611-merge-abort.sh
+++ b/t/t7611-merge-abort.sh
@@ -7,7 +7,7 @@
There are three files foo/bar/baz, and the following graph illustrates the
content of these files in each commit:
-# foo/bar/baz --- foo/bar/bazz <-- master
+# foo/bar/baz --- foo/bar/bazz <-- main
# \
# --- foo/barf/bazf <-- conflict_branch
# \
@@ -22,6 +22,9 @@
- changed/unchanged worktree after merge
- changed/unchanged index after merge
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup' '
@@ -40,7 +43,7 @@
git checkout -b clean_branch HEAD^ &&
echo bart > bar &&
git commit -a -m "clean" &&
- git checkout master
+ git checkout main
'
pre_merge_head="$(git rev-parse HEAD)"
diff --git a/t/t7612-merge-verify-signatures.sh b/t/t7612-merge-verify-signatures.sh
index a426f3a..61330f7 100755
--- a/t/t7612-merge-verify-signatures.sh
+++ b/t/t7612-merge-verify-signatures.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='merge signature verification tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
. "$TEST_DIRECTORY/lib-gpg.sh"
@@ -31,7 +34,7 @@
echo 3 >baz && git add baz &&
test_tick && git commit -SB7227189 -m "untrusted on side" &&
- git checkout master
+ git checkout main
'
test_expect_success GPG 'merge unsigned commit with verification' '
diff --git a/t/t7614-merge-signoff.sh b/t/t7614-merge-signoff.sh
index c1b8446..fee258d 100755
--- a/t/t7614-merge-signoff.sh
+++ b/t/t7614-merge-signoff.sh
@@ -5,23 +5,26 @@
This test runs git merge --signoff and makes sure that it works.
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
# Setup test files
test_setup() {
# Expected commit message after merge --signoff
cat >expected-signed <<EOF &&
-Merge branch 'master' into other-branch
+Merge branch 'main' into other-branch
Signed-off-by: $(git var GIT_COMMITTER_IDENT | sed -e "s/>.*/>/")
EOF
# Expected commit message after merge without --signoff (or with --no-signoff)
cat >expected-unsigned <<EOF &&
-Merge branch 'master' into other-branch
+Merge branch 'main' into other-branch
EOF
- # Initial commit and feature branch to merge master into it.
+ # Initial commit and feature branch to merge main into it.
git commit --allow-empty -m "Initial empty commit" &&
git checkout -b other-branch &&
test_commit other-branch file1 1
@@ -38,30 +41,30 @@
# Test with --signoff flag
test_expect_success 'git merge --signoff adds a sign-off line' '
- git checkout master &&
- test_commit master-branch-2 file2 2 &&
+ git checkout main &&
+ test_commit main-branch-2 file2 2 &&
git checkout other-branch &&
- git merge master --signoff --no-edit &&
+ git merge main --signoff --no-edit &&
git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
test_cmp expected-signed actual
'
# Test without --signoff flag
test_expect_success 'git merge does not add a sign-off line' '
- git checkout master &&
- test_commit master-branch-3 file3 3 &&
+ git checkout main &&
+ test_commit main-branch-3 file3 3 &&
git checkout other-branch &&
- git merge master --no-edit &&
+ git merge main --no-edit &&
git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
test_cmp expected-unsigned actual
'
# Test for --no-signoff flag
test_expect_success 'git merge --no-signoff flag cancels --signoff flag' '
- git checkout master &&
- test_commit master-branch-4 file4 4 &&
+ git checkout main &&
+ test_commit main-branch-4 file4 4 &&
git checkout other-branch &&
- git merge master --no-edit --signoff --no-signoff &&
+ git merge main --no-edit --signoff --no-signoff &&
git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
test_cmp expected-unsigned actual
'
diff --git a/t/t7701-repack-unpack-unreachable.sh b/t/t7701-repack-unpack-unreachable.sh
index 48261ba..937f89e 100755
--- a/t/t7701-repack-unpack-unreachable.sh
+++ b/t/t7701-repack-unpack-unreachable.sh
@@ -2,6 +2,9 @@
test_description='git repack works correctly'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
fsha1=
@@ -22,7 +25,7 @@
git commit -a -m more_content &&
csha1=$(git rev-parse HEAD^{commit}) &&
tsha1=$(git rev-parse HEAD^{tree}) &&
- git checkout master &&
+ git checkout main &&
echo even more content >> file1 &&
test_tick &&
git commit -a -m even_more_content &&
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 29b9290..3e041e8 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -8,6 +8,9 @@
Testing basic diff tool invocation
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
difftool_test_setup ()
@@ -35,23 +38,23 @@
test_i18ngrep ^usage: output
'
-# Create a file on master and change it on branch
+# Create a file on main and change it on branch
test_expect_success 'setup' '
- echo master >file &&
+ echo main >file &&
git add file &&
git commit -m "added file" &&
- git checkout -b branch master &&
+ git checkout -b branch main &&
echo branch >file &&
git commit -a -m "branch changed file" &&
- git checkout master
+ git checkout main
'
# Configure a custom difftool.<tool>.cmd and use it
test_expect_success 'custom commands' '
difftool_test_setup &&
test_config difftool.test-tool.cmd "cat \"\$REMOTE\"" &&
- echo master >expect &&
+ echo main >expect &&
git difftool --no-prompt branch >actual &&
test_cmp expect actual &&
@@ -63,7 +66,7 @@
test_expect_success 'custom tool commands override built-ins' '
test_config difftool.vimdiff.cmd "cat \"\$REMOTE\"" &&
- echo master >expect &&
+ echo main >expect &&
git difftool --tool vimdiff --no-prompt branch >actual &&
test_cmp expect actual
'
@@ -311,21 +314,21 @@
test_expect_success 'difftool --extcmd=cat' '
echo branch >expect &&
- echo master >>expect &&
+ echo main >>expect &&
git difftool --no-prompt --extcmd=cat branch >actual &&
test_cmp expect actual
'
test_expect_success 'difftool --extcmd cat' '
echo branch >expect &&
- echo master >>expect &&
+ echo main >>expect &&
git difftool --no-prompt --extcmd=cat branch >actual &&
test_cmp expect actual
'
test_expect_success 'difftool -x cat' '
echo branch >expect &&
- echo master >>expect &&
+ echo main >>expect &&
git difftool --no-prompt -x cat branch >actual &&
test_cmp expect actual
'
@@ -338,7 +341,7 @@
'
test_expect_success 'difftool --extcmd cat arg1' '
- echo master >expect &&
+ echo main >expect &&
git difftool --no-prompt \
--extcmd sh\ -c\ \"cat\ \$1\" branch >actual &&
test_cmp expect actual
@@ -351,7 +354,7 @@
test_cmp expect actual
'
-# Create a second file on master and a different version on branch
+# Create a second file on main and a different version on branch
test_expect_success 'setup with 2 files different' '
echo m2 >file2 &&
git add file2 &&
@@ -361,7 +364,7 @@
echo br2 >file2 &&
git add file2 &&
git commit -a -m "branch changed file2" &&
- git checkout master
+ git checkout main
'
test_expect_success 'say no to the first file' '
@@ -369,14 +372,14 @@
git difftool -x cat branch <input >output &&
grep m2 output &&
grep br2 output &&
- ! grep master output &&
+ ! grep main output &&
! grep branch output
'
test_expect_success 'say no to the second file' '
(echo && echo n) >input &&
git difftool -x cat branch <input >output &&
- grep master output &&
+ grep main output &&
grep branch output &&
! grep m2 output &&
! grep br2 output
@@ -384,7 +387,7 @@
test_expect_success 'ending prompt input with EOF' '
git difftool -x cat branch </dev/null >output &&
- ! grep master output &&
+ ! grep main output &&
! grep branch output &&
! grep m2 output &&
! grep br2 output
@@ -396,9 +399,9 @@
'
test_expect_success 'setup change in subdirectory' '
- git checkout master &&
+ git checkout main &&
mkdir sub &&
- echo master >sub/sub &&
+ echo main >sub/sub &&
git add sub/sub &&
git commit -m "added sub/sub" &&
git tag v1 &&
@@ -440,20 +443,20 @@
run_dir_diff_test 'difftool -d' '
git difftool -d $symlinks --extcmd ls branch >output &&
- grep sub output &&
- grep file output
+ grep "^sub$" output &&
+ grep "^file$" output
'
run_dir_diff_test 'difftool --dir-diff' '
git difftool --dir-diff $symlinks --extcmd ls branch >output &&
- grep sub output &&
- grep file output
+ grep "^sub$" output &&
+ grep "^file$" output
'
run_dir_diff_test 'difftool --dir-diff ignores --prompt' '
git difftool --dir-diff $symlinks --prompt --extcmd ls branch >output &&
- grep sub output &&
- grep file output
+ grep "^sub$" output &&
+ grep "^file$" output
'
run_dir_diff_test 'difftool --dir-diff branch from subdirectory' '
@@ -462,11 +465,11 @@
git difftool --dir-diff $symlinks --extcmd ls branch >output &&
# "sub" must only exist in "right"
# "file" and "file2" must be listed in both "left" and "right"
- grep sub output >sub-output &&
+ grep "^sub$" output >sub-output &&
test_line_count = 1 sub-output &&
- grep file"$" output >file-output &&
+ grep "^file$" output >file-output &&
test_line_count = 2 file-output &&
- grep file2 output >file2-output &&
+ grep "^file2$" output >file2-output &&
test_line_count = 2 file2-output
)
'
@@ -477,11 +480,11 @@
git difftool --dir-diff $symlinks --extcmd ls v1 >output &&
# "sub" and "file" exist in both v1 and HEAD.
# "file2" is unchanged.
- grep sub output >sub-output &&
+ grep "^sub$" output >sub-output &&
test_line_count = 2 sub-output &&
- grep file output >file-output &&
+ grep "^file$" output >file-output &&
test_line_count = 2 file-output &&
- ! grep file2 output
+ ! grep "^file2$" output
)
'
@@ -491,9 +494,9 @@
git difftool --dir-diff $symlinks --extcmd ls branch -- .>output &&
# "sub" only exists in "right"
# "file" and "file2" must not be listed
- grep sub output >sub-output &&
+ grep "^sub$" output >sub-output &&
test_line_count = 1 sub-output &&
- ! grep file output
+ ! grep "^file$" output
)
'
@@ -503,9 +506,9 @@
git difftool --dir-diff $symlinks --extcmd ls v1 -- .>output &&
# "sub" exists in v1 and HEAD
# "file" is filtered out by the pathspec
- grep sub output >sub-output &&
+ grep "^sub$" output >sub-output &&
test_line_count = 2 sub-output &&
- ! grep file output
+ ! grep "^file$" output
)
'
@@ -518,16 +521,16 @@
cd sub &&
git difftool --dir-diff $symlinks --extcmd ls \
branch -- sub >output &&
- grep sub output &&
- ! grep file output
+ grep "^sub$" output &&
+ ! grep "^file$" output
)
'
run_dir_diff_test 'difftool --dir-diff when worktree file is missing' '
test_when_finished git reset --hard &&
rm file2 &&
- git difftool --dir-diff $symlinks --extcmd ls branch master >output &&
- grep file2 output
+ git difftool --dir-diff $symlinks --extcmd ls branch main >output &&
+ grep "^file2$" output
'
run_dir_diff_test 'difftool --dir-diff with unmerged files' '
@@ -543,7 +546,7 @@
echo b >>file &&
git add file &&
git commit -m conflict-b &&
- git checkout master &&
+ git checkout main &&
git merge conflict-a &&
test_must_fail git merge conflict-b &&
cat >expect <<-EOF &&
@@ -720,6 +723,27 @@
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 'difftool --cached with unmerged files' '
+ test_when_finished git reset --hard &&
+
+ test_commit conflicting &&
+ test_commit conflict-a conflict.t a &&
+ git reset --hard conflicting &&
+ test_commit conflict-b conflict.t b &&
+ test_must_fail git merge conflict-a &&
+
+ git difftool --cached --no-prompt >output &&
+ test_must_be_empty output
+'
+
test_expect_success 'outside worktree' '
echo 1 >1 &&
echo 2 >2 &&
@@ -738,4 +762,36 @@
test_must_fail git difftool --gui --tool=test-tool --extcmd=cat
'
+test_expect_success 'difftool --rotate-to' '
+ difftool_test_setup &&
+ test_when_finished git reset --hard &&
+ echo 1 >1 &&
+ echo 2 >2 &&
+ echo 4 >4 &&
+ git add 1 2 4 &&
+ git commit -a -m "124" &&
+ git difftool --no-prompt --extcmd=cat --rotate-to="2" HEAD^ >output&&
+ cat >expect <<-\EOF &&
+ 2
+ 4
+ 1
+ EOF
+ test_cmp output expect
+'
+
+test_expect_success 'difftool --skip-to' '
+ difftool_test_setup &&
+ test_when_finished git reset --hard &&
+ git difftool --no-prompt --extcmd=cat --skip-to="2" HEAD^ >output &&
+ cat >expect <<-\EOF &&
+ 2
+ 4
+ EOF
+ test_cmp output expect
+'
+
+test_expect_success 'difftool --rotate/skip-to error condition' '
+ test_must_fail git difftool --no-prompt --extcmd=cat --rotate-to="3" HEAD^ &&
+ test_must_fail git difftool --no-prompt --extcmd=cat --skip-to="3" HEAD^
+'
test_done
diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
index 7d7b396..edfaa9a 100755
--- a/t/t7810-grep.sh
+++ b/t/t7810-grep.sh
@@ -6,6 +6,9 @@
test_description='git grep various.
'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
cat >hello.c <<EOF
@@ -72,6 +75,11 @@
# 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 +489,48 @@
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
@@ -640,21 +690,9 @@
'
test_expect_success 'log grep setup' '
- echo a >>file &&
- test_tick &&
- GIT_AUTHOR_NAME="With * Asterisk" \
- GIT_AUTHOR_EMAIL="xyzzy@frotz.com" \
- git commit -a -m "second" &&
-
- echo a >>file &&
- test_tick &&
- git commit -a -m "third" &&
-
- echo a >>file &&
- test_tick &&
- GIT_AUTHOR_NAME="Night Fall" \
- GIT_AUTHOR_EMAIL="nitfol@frobozz.com" \
- git commit -a -m "fourth"
+ test_commit --append --author "With * Asterisk <xyzzy@frotz.com>" second file a &&
+ test_commit --append third file a &&
+ test_commit --append --author "Night Fall <nitfol@frobozz.com>" fourth file a
'
test_expect_success 'log grep (1)' '
@@ -931,7 +969,7 @@
"
done
-test_expect_success !PTHREADS,C_LOCALE_OUTPUT 'grep --threads=N or pack.threads=N warns when no pthreads' '
+test_expect_success !PTHREADS 'grep --threads=N or pack.threads=N warns when no pthreads' '
git grep --threads=2 Hello hello_world 2>err &&
grep ^warning: err >warnings &&
test_line_count = 1 warnings &&
@@ -1159,19 +1197,19 @@
'
test_expect_success 'dashdash disambiguates rev as rev' '
- test_when_finished "rm -f master" &&
- echo content >master &&
- echo master:hello.c >expect &&
- git grep -l o master -- hello.c >actual &&
+ test_when_finished "rm -f main" &&
+ echo content >main &&
+ echo main:hello.c >expect &&
+ git grep -l o main -- hello.c >actual &&
test_cmp expect actual
'
test_expect_success 'dashdash disambiguates pathspec as pathspec' '
- test_when_finished "git rm -f master" &&
- echo content >master &&
- git add master &&
- echo master:content >expect &&
- git grep o -- master >actual &&
+ test_when_finished "git rm -f main" &&
+ echo content >main &&
+ git add main &&
+ echo main:content >expect &&
+ git grep o -- main >actual &&
test_cmp expect actual
'
@@ -1207,15 +1245,15 @@
'
test_expect_success 'grep --no-index complains of revs' '
- test_must_fail git grep --no-index o master -- 2>err &&
+ test_must_fail git grep --no-index o main -- 2>err &&
test_i18ngrep "cannot be used with revs" err
'
test_expect_success 'grep --no-index prefers paths to revs' '
- test_when_finished "rm -f master" &&
- echo content >master &&
- echo master:content >expect &&
- git grep --no-index o master >actual &&
+ test_when_finished "rm -f main" &&
+ echo content >main &&
+ echo main:content >expect &&
+ git grep --no-index o main >actual &&
test_cmp expect actual
'
diff --git a/t/t7812-grep-icase-non-ascii.sh b/t/t7812-grep-icase-non-ascii.sh
index 03dba66..e5d1e4e 100755
--- a/t/t7812-grep-icase-non-ascii.sh
+++ b/t/t7812-grep-icase-non-ascii.sh
@@ -57,7 +57,12 @@
printf "\\200\\n" >invalid-0x80 &&
echo "ævar" >expected &&
cat expected >>invalid-0x80 &&
- git add invalid-0x80
+ git add invalid-0x80 &&
+
+ # Test for PCRE2_MATCH_INVALID_UTF bug
+ # https://bugs.exim.org/show_bug.cgi?id=2642
+ printf "\\345Aæ\\n" >invalid-0xe5 &&
+ git add invalid-0xe5
'
test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep ASCII from invalid UTF-8 data' '
@@ -67,6 +72,13 @@
test_cmp expected actual
'
+test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep ASCII from invalid UTF-8 data (PCRE2 bug #2642)' '
+ git grep -h "Aæ" invalid-0xe5 >actual &&
+ test_cmp invalid-0xe5 actual &&
+ git grep -h "(*NO_JIT)Aæ" invalid-0xe5 >actual &&
+ test_cmp invalid-0xe5 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 &&
@@ -74,14 +86,41 @@
test_cmp expected actual
'
+test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep non-ASCII from invalid UTF-8 data (PCRE2 bug #2642)' '
+ git grep -h "Aæ" invalid-0xe5 >actual &&
+ test_cmp invalid-0xe5 actual &&
+ git grep -h "(*NO_JIT)Aæ" invalid-0xe5 >actual &&
+ test_cmp invalid-0xe5 actual
+'
+
+test_lazy_prereq PCRE2_MATCH_INVALID_UTF '
+ test-tool pcre2-config has-PCRE2_MATCH_INVALID_UTF
+'
+
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_might_fail git grep -hi "(*NO_JIT)Æ" invalid-0x80 >actual
+'
+
+test_expect_success GETTEXT_LOCALE,LIBPCRE2,PCRE2_MATCH_INVALID_UTF 'PCRE v2: grep non-ASCII from invalid UTF-8 data with -i' '
+ git grep -hi "Æ" invalid-0x80 >actual &&
+ test_cmp expected actual &&
+ git grep -hi "(*NO_JIT)Æ" invalid-0x80 >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success GETTEXT_LOCALE,LIBPCRE2,PCRE2_MATCH_INVALID_UTF 'PCRE v2: grep non-ASCII from invalid UTF-8 data with -i (PCRE2 bug #2642)' '
+ git grep -hi "Æ" invalid-0xe5 >actual &&
+ test_cmp invalid-0xe5 actual &&
+ git grep -hi "(*NO_JIT)Æ" invalid-0xe5 >actual &&
+ test_cmp invalid-0xe5 actual &&
+
+ # Only the case of grepping the ASCII part in a way that
+ # relies on -i fails
+ git grep -hi "aÆ" invalid-0xe5 >actual &&
+ test_cmp invalid-0xe5 actual &&
+ git grep -hi "(*NO_JIT)aÆ" invalid-0xe5 >actual &&
+ test_cmp invalid-0xe5 actual
'
test_done
diff --git a/t/t7817-grep-sparse-checkout.sh b/t/t7817-grep-sparse-checkout.sh
new file mode 100755
index 0000000..590b99b
--- /dev/null
+++ b/t/t7817-grep-sparse-checkout.sh
@@ -0,0 +1,174 @@
+#!/bin/sh
+
+test_description='grep in sparse checkout
+
+This test creates a repo with the following structure:
+
+.
+|-- a
+|-- b
+|-- dir
+| `-- c
+|-- sub
+| |-- A
+| | `-- a
+| `-- B
+| `-- b
+`-- sub2
+ `-- a
+
+Where the outer repository has non-cone mode sparsity patterns, sub is a
+submodule with cone mode sparsity patterns and sub2 is a submodule that is
+excluded by the superproject sparsity patterns. The resulting sparse checkout
+should leave the following structure in the working tree:
+
+.
+|-- a
+|-- sub
+| `-- B
+| `-- b
+`-- sub2
+ `-- a
+
+But note that sub2 should have the SKIP_WORKTREE bit set.
+'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+ echo "text" >a &&
+ echo "text" >b &&
+ mkdir dir &&
+ echo "text" >dir/c &&
+
+ git init sub &&
+ (
+ cd sub &&
+ mkdir A B &&
+ echo "text" >A/a &&
+ echo "text" >B/b &&
+ git add A B &&
+ git commit -m sub &&
+ git sparse-checkout init --cone &&
+ git sparse-checkout set B
+ ) &&
+
+ git init sub2 &&
+ (
+ cd sub2 &&
+ echo "text" >a &&
+ git add a &&
+ git commit -m sub2
+ ) &&
+
+ git submodule add ./sub &&
+ git submodule add ./sub2 &&
+ git add a b dir &&
+ git commit -m super &&
+ git sparse-checkout init --no-cone &&
+ git sparse-checkout set "/*" "!b" "!/*/" "sub" &&
+
+ git tag -am tag-to-commit tag-to-commit HEAD &&
+ tree=$(git rev-parse HEAD^{tree}) &&
+ git tag -am tag-to-tree tag-to-tree $tree &&
+
+ test_path_is_missing b &&
+ test_path_is_missing dir &&
+ test_path_is_missing sub/A &&
+ test_path_is_file a &&
+ test_path_is_file sub/B/b &&
+ test_path_is_file sub2/a &&
+ git branch -m main
+'
+
+# The test below covers a special case: the sparsity patterns exclude '/b' and
+# sparse checkout is enabled, but the path exists in the working tree (e.g.
+# manually created after `git sparse-checkout init`). git grep should skip it.
+test_expect_success 'working tree grep honors sparse checkout' '
+ cat >expect <<-EOF &&
+ a:text
+ EOF
+ test_when_finished "rm -f b" &&
+ echo "new-text" >b &&
+ git grep "text" >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'grep searches unmerged file despite not matching sparsity patterns' '
+ cat >expect <<-EOF &&
+ b:modified-b-in-branchX
+ b:modified-b-in-branchY
+ EOF
+ test_when_finished "test_might_fail git merge --abort && \
+ git checkout main && git sparse-checkout init" &&
+
+ git sparse-checkout disable &&
+ git checkout -b branchY main &&
+ test_commit modified-b-in-branchY b &&
+ git checkout -b branchX main &&
+ test_commit modified-b-in-branchX b &&
+
+ git sparse-checkout init &&
+ test_path_is_missing b &&
+ test_must_fail git merge branchY &&
+ git grep "modified-b" >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'grep --cached searches entries with the SKIP_WORKTREE bit' '
+ cat >expect <<-EOF &&
+ a:text
+ b:text
+ dir/c:text
+ EOF
+ git grep --cached "text" >actual &&
+ test_cmp expect actual
+'
+
+# Note that sub2/ is present in the worktree but it is excluded by the sparsity
+# patterns, so grep should not recurse into it.
+test_expect_success 'grep --recurse-submodules honors sparse checkout in submodule' '
+ cat >expect <<-EOF &&
+ a:text
+ sub/B/b:text
+ EOF
+ git grep --recurse-submodules "text" >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'grep --recurse-submodules --cached searches entries with the SKIP_WORKTREE bit' '
+ cat >expect <<-EOF &&
+ a:text
+ b:text
+ dir/c:text
+ sub/A/a:text
+ sub/B/b:text
+ sub2/a:text
+ EOF
+ git grep --recurse-submodules --cached "text" >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'working tree grep does not search the index with CE_VALID and SKIP_WORKTREE' '
+ cat >expect <<-EOF &&
+ a:text
+ EOF
+ test_when_finished "git update-index --no-assume-unchanged b" &&
+ git update-index --assume-unchanged b &&
+ git grep text >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'grep --cached searches index entries with both CE_VALID and SKIP_WORKTREE' '
+ cat >expect <<-EOF &&
+ a:text
+ b:text
+ dir/c:text
+ EOF
+ test_when_finished "git update-index --no-assume-unchanged b" &&
+ git update-index --assume-unchanged b &&
+ git grep --cached text >actual &&
+ test_cmp expect actual
+'
+
+test_done
diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh
new file mode 100755
index 0000000..2412d8c
--- /dev/null
+++ b/t/t7900-maintenance.sh
@@ -0,0 +1,648 @@
+#!/bin/sh
+
+test_description='git maintenance builtin'
+
+. ./test-lib.sh
+
+GIT_TEST_COMMIT_GRAPH=0
+GIT_TEST_MULTI_PACK_INDEX=0
+
+test_lazy_prereq XMLLINT '
+ xmllint --version
+'
+
+test_xmllint () {
+ if test_have_prereq XMLLINT
+ then
+ xmllint --noout "$@"
+ else
+ true
+ fi
+}
+
+test_expect_success 'help text' '
+ test_expect_code 129 git maintenance -h 2>err &&
+ test_i18ngrep "usage: git maintenance <subcommand>" 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.auto config option' '
+ GIT_TRACE2_EVENT="$(pwd)/default" git commit --quiet --allow-empty -m 1 &&
+ test_subcommand git maintenance run --auto --quiet <default &&
+ GIT_TRACE2_EVENT="$(pwd)/true" \
+ git -c maintenance.auto=true \
+ commit --quiet --allow-empty -m 2 &&
+ test_subcommand git maintenance run --auto --quiet <true &&
+ GIT_TRACE2_EVENT="$(pwd)/false" \
+ git -c maintenance.auto=false \
+ commit --quiet --allow-empty -m 3 &&
+ test_subcommand ! git maintenance run --auto --quiet <false
+'
+
+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 'core.commitGraph=false prevents write process' '
+ GIT_TRACE2_EVENT="$(pwd)/no-commit-graph.txt" \
+ git -c core.commitGraph=false maintenance run \
+ --task=commit-graph 2>/dev/null &&
+ test_subcommand ! git commit-graph write --split --reachable --no-progress \
+ <no-commit-graph.txt
+'
+
+test_expect_success 'commit-graph auto condition' '
+ COMMAND="maintenance run --task=commit-graph --auto --quiet" &&
+
+ GIT_TRACE2_EVENT="$(pwd)/cg-no.txt" \
+ git -c maintenance.commit-graph.auto=1 $COMMAND &&
+ GIT_TRACE2_EVENT="$(pwd)/cg-negative-means-yes.txt" \
+ git -c maintenance.commit-graph.auto="-1" $COMMAND &&
+
+ test_commit first &&
+
+ GIT_TRACE2_EVENT="$(pwd)/cg-zero-means-no.txt" \
+ git -c maintenance.commit-graph.auto=0 $COMMAND &&
+ GIT_TRACE2_EVENT="$(pwd)/cg-one-satisfied.txt" \
+ git -c maintenance.commit-graph.auto=1 $COMMAND &&
+
+ git commit --allow-empty -m "second" &&
+ git commit --allow-empty -m "third" &&
+
+ GIT_TRACE2_EVENT="$(pwd)/cg-two-satisfied.txt" \
+ git -c maintenance.commit-graph.auto=2 $COMMAND &&
+
+ COMMIT_GRAPH_WRITE="git commit-graph write --split --reachable --no-progress" &&
+ test_subcommand ! $COMMIT_GRAPH_WRITE <cg-no.txt &&
+ test_subcommand $COMMIT_GRAPH_WRITE <cg-negative-means-yes.txt &&
+ test_subcommand ! $COMMIT_GRAPH_WRITE <cg-zero-means-no.txt &&
+ test_subcommand $COMMIT_GRAPH_WRITE <cg-one-satisfied.txt &&
+ test_subcommand $COMMIT_GRAPH_WRITE <cg-two-satisfied.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_expect_success 'run --task=prefetch with no remotes' '
+ git maintenance run --task=prefetch 2>err &&
+ test_must_be_empty err
+'
+
+test_expect_success 'prefetch multiple remotes' '
+ git clone . clone1 &&
+ git clone . clone2 &&
+ git remote add remote1 "file://$(pwd)/clone1" &&
+ git remote add remote2 "file://$(pwd)/clone2" &&
+ git -C clone1 switch -c one &&
+ git -C clone2 switch -c two &&
+ test_commit -C clone1 one &&
+ test_commit -C clone2 two &&
+ GIT_TRACE2_EVENT="$(pwd)/run-prefetch.txt" git maintenance run --task=prefetch 2>/dev/null &&
+ fetchargs="--prune --no-tags --no-write-fetch-head --recurse-submodules=no --refmap= --quiet" &&
+ test_subcommand git fetch remote1 $fetchargs +refs/heads/\\*:refs/prefetch/remote1/\\* <run-prefetch.txt &&
+ test_subcommand git fetch remote2 $fetchargs +refs/heads/\\*:refs/prefetch/remote2/\\* <run-prefetch.txt &&
+ test_path_is_missing .git/refs/remotes &&
+ git log prefetch/remote1/one &&
+ git log prefetch/remote2/two &&
+ git fetch --all &&
+ test_cmp_rev refs/remotes/remote1/one refs/prefetch/remote1/one &&
+ test_cmp_rev refs/remotes/remote2/two refs/prefetch/remote2/two &&
+
+ test_cmp_config refs/prefetch/ log.excludedecoration &&
+ git log --oneline --decorate --all >log &&
+ ! grep "prefetch" log
+'
+
+test_expect_success 'prefetch and existing log.excludeDecoration values' '
+ git config --unset-all log.excludeDecoration &&
+ git config log.excludeDecoration refs/remotes/remote1/ &&
+ git maintenance run --task=prefetch &&
+
+ git config --get-all log.excludeDecoration >out &&
+ grep refs/remotes/remote1/ out &&
+ grep refs/prefetch/ out &&
+
+ git log --oneline --decorate --all >log &&
+ ! grep "prefetch" log &&
+ ! grep "remote1" log &&
+ grep "remote2" log &&
+
+ # a second run does not change the config
+ git maintenance run --task=prefetch &&
+ git log --oneline --decorate --all >log2 &&
+ test_cmp log log2
+'
+
+test_expect_success 'loose-objects task' '
+ # Repack everything so we know the state of the object dir
+ git repack -adk &&
+
+ # Hack to stop maintenance from running during "git commit"
+ echo in use >.git/objects/maintenance.lock &&
+
+ # Assuming that "git commit" creates at least one loose object
+ test_commit create-loose-object &&
+ rm .git/objects/maintenance.lock &&
+
+ ls .git/objects >obj-dir-before &&
+ test_file_not_empty obj-dir-before &&
+ ls .git/objects/pack/*.pack >packs-before &&
+ test_line_count = 1 packs-before &&
+
+ # The first run creates a pack-file
+ # but does not delete loose objects.
+ git maintenance run --task=loose-objects &&
+ ls .git/objects >obj-dir-between &&
+ test_cmp obj-dir-before obj-dir-between &&
+ ls .git/objects/pack/*.pack >packs-between &&
+ test_line_count = 2 packs-between &&
+ ls .git/objects/pack/loose-*.pack >loose-packs &&
+ test_line_count = 1 loose-packs &&
+
+ # The second run deletes loose objects
+ # but does not create a pack-file.
+ git maintenance run --task=loose-objects &&
+ ls .git/objects >obj-dir-after &&
+ cat >expect <<-\EOF &&
+ info
+ pack
+ EOF
+ test_cmp expect obj-dir-after &&
+ ls .git/objects/pack/*.pack >packs-after &&
+ test_cmp packs-between packs-after
+'
+
+test_expect_success 'maintenance.loose-objects.auto' '
+ git repack -adk &&
+ GIT_TRACE2_EVENT="$(pwd)/trace-lo1.txt" \
+ git -c maintenance.loose-objects.auto=1 maintenance \
+ run --auto --task=loose-objects 2>/dev/null &&
+ test_subcommand ! git prune-packed --quiet <trace-lo1.txt &&
+ printf data-A | git hash-object -t blob --stdin -w &&
+ GIT_TRACE2_EVENT="$(pwd)/trace-loA" \
+ git -c maintenance.loose-objects.auto=2 \
+ maintenance run --auto --task=loose-objects 2>/dev/null &&
+ test_subcommand ! git prune-packed --quiet <trace-loA &&
+ printf data-B | git hash-object -t blob --stdin -w &&
+ GIT_TRACE2_EVENT="$(pwd)/trace-loB" \
+ git -c maintenance.loose-objects.auto=2 \
+ maintenance run --auto --task=loose-objects 2>/dev/null &&
+ test_subcommand git prune-packed --quiet <trace-loB &&
+ GIT_TRACE2_EVENT="$(pwd)/trace-loC" \
+ git -c maintenance.loose-objects.auto=2 \
+ maintenance run --auto --task=loose-objects 2>/dev/null &&
+ test_subcommand git prune-packed --quiet <trace-loC
+'
+
+test_expect_success 'incremental-repack task' '
+ packDir=.git/objects/pack &&
+ for i in $(test_seq 1 5)
+ do
+ test_commit $i || return 1
+ done &&
+
+ # Create three disjoint pack-files with size BIG, small, small.
+ echo HEAD~2 | git pack-objects --revs $packDir/test-1 &&
+ test_tick &&
+ git pack-objects --revs $packDir/test-2 <<-\EOF &&
+ HEAD~1
+ ^HEAD~2
+ EOF
+ test_tick &&
+ git pack-objects --revs $packDir/test-3 <<-\EOF &&
+ HEAD
+ ^HEAD~1
+ EOF
+
+ # Delete refs that have not been repacked in these packs.
+ git for-each-ref --format="delete %(refname)" \
+ refs/prefetch refs/tags >refs &&
+ git update-ref --stdin <refs &&
+
+ # Replace the object directory with this pack layout.
+ rm -f $packDir/pack-* &&
+ rm -f $packDir/loose-* &&
+ ls $packDir/*.pack >packs-before &&
+ test_line_count = 3 packs-before &&
+
+ # the job repacks the two into a new pack, but does not
+ # delete the old ones.
+ git maintenance run --task=incremental-repack &&
+ ls $packDir/*.pack >packs-between &&
+ test_line_count = 4 packs-between &&
+
+ # the job deletes the two old packs, and does not write
+ # a new one because the batch size is not high enough to
+ # pack the largest pack-file.
+ git maintenance run --task=incremental-repack &&
+ ls .git/objects/pack/*.pack >packs-after &&
+ test_line_count = 2 packs-after
+'
+
+test_expect_success EXPENSIVE 'incremental-repack 2g limit' '
+ test_config core.compression 0 &&
+
+ for i in $(test_seq 1 5)
+ do
+ test-tool genrandom foo$i $((512 * 1024 * 1024 + 1)) >>big ||
+ return 1
+ done &&
+ git add big &&
+ git commit -qm "Add big file (1)" &&
+
+ # ensure any possible loose objects are in a pack-file
+ git maintenance run --task=loose-objects &&
+
+ rm big &&
+ for i in $(test_seq 6 10)
+ do
+ test-tool genrandom foo$i $((512 * 1024 * 1024 + 1)) >>big ||
+ return 1
+ done &&
+ git add big &&
+ git commit -qm "Add big file (2)" &&
+
+ # ensure any possible loose objects are in a pack-file
+ git maintenance run --task=loose-objects &&
+
+ # Now run the incremental-repack task and check the batch-size
+ GIT_TRACE2_EVENT="$(pwd)/run-2g.txt" git maintenance run \
+ --task=incremental-repack 2>/dev/null &&
+ test_subcommand git multi-pack-index repack \
+ --no-progress --batch-size=2147483647 <run-2g.txt
+'
+
+test_expect_success 'maintenance.incremental-repack.auto' '
+ git repack -adk &&
+ git config core.multiPackIndex true &&
+ git multi-pack-index write &&
+ GIT_TRACE2_EVENT="$(pwd)/midx-init.txt" git \
+ -c maintenance.incremental-repack.auto=1 \
+ maintenance run --auto --task=incremental-repack 2>/dev/null &&
+ test_subcommand ! git multi-pack-index write --no-progress <midx-init.txt &&
+ test_commit A &&
+ git pack-objects --revs .git/objects/pack/pack <<-\EOF &&
+ HEAD
+ ^HEAD~1
+ EOF
+ GIT_TRACE2_EVENT=$(pwd)/trace-A git \
+ -c maintenance.incremental-repack.auto=2 \
+ maintenance run --auto --task=incremental-repack 2>/dev/null &&
+ test_subcommand ! git multi-pack-index write --no-progress <trace-A &&
+ test_commit B &&
+ git pack-objects --revs .git/objects/pack/pack <<-\EOF &&
+ HEAD
+ ^HEAD~1
+ EOF
+ GIT_TRACE2_EVENT=$(pwd)/trace-B git \
+ -c maintenance.incremental-repack.auto=2 \
+ maintenance run --auto --task=incremental-repack 2>/dev/null &&
+ test_subcommand git multi-pack-index write --no-progress <trace-B
+'
+
+test_expect_success 'pack-refs task' '
+ for n in $(test_seq 1 5)
+ do
+ git branch -f to-pack/$n HEAD || return 1
+ done &&
+ GIT_TRACE2_EVENT="$(pwd)/pack-refs.txt" \
+ git maintenance run --task=pack-refs &&
+ ls .git/refs/heads/ >after &&
+ test_must_be_empty after &&
+ test_subcommand git pack-refs --all --prune <pack-refs.txt
+'
+
+test_expect_success '--auto and --schedule incompatible' '
+ test_must_fail git maintenance run --auto --schedule=daily 2>err &&
+ test_i18ngrep "at most one" err
+'
+
+test_expect_success 'invalid --schedule value' '
+ test_must_fail git maintenance run --schedule=annually 2>err &&
+ test_i18ngrep "unrecognized --schedule" err
+'
+
+test_expect_success '--schedule inheritance weekly -> daily -> hourly' '
+ git config maintenance.loose-objects.enabled true &&
+ git config maintenance.loose-objects.schedule hourly &&
+ git config maintenance.commit-graph.enabled true &&
+ git config maintenance.commit-graph.schedule daily &&
+ git config maintenance.incremental-repack.enabled true &&
+ git config maintenance.incremental-repack.schedule weekly &&
+
+ GIT_TRACE2_EVENT="$(pwd)/hourly.txt" \
+ git maintenance run --schedule=hourly 2>/dev/null &&
+ test_subcommand git prune-packed --quiet <hourly.txt &&
+ test_subcommand ! git commit-graph write --split --reachable \
+ --no-progress <hourly.txt &&
+ test_subcommand ! git multi-pack-index write --no-progress <hourly.txt &&
+
+ GIT_TRACE2_EVENT="$(pwd)/daily.txt" \
+ git maintenance run --schedule=daily 2>/dev/null &&
+ test_subcommand git prune-packed --quiet <daily.txt &&
+ test_subcommand git commit-graph write --split --reachable \
+ --no-progress <daily.txt &&
+ test_subcommand ! git multi-pack-index write --no-progress <daily.txt &&
+
+ GIT_TRACE2_EVENT="$(pwd)/weekly.txt" \
+ git maintenance run --schedule=weekly 2>/dev/null &&
+ test_subcommand git prune-packed --quiet <weekly.txt &&
+ test_subcommand git commit-graph write --split --reachable \
+ --no-progress <weekly.txt &&
+ test_subcommand git multi-pack-index write --no-progress <weekly.txt
+'
+
+test_expect_success 'maintenance.strategy inheritance' '
+ for task in commit-graph loose-objects incremental-repack
+ do
+ git config --unset maintenance.$task.schedule || return 1
+ done &&
+
+ test_when_finished git config --unset maintenance.strategy &&
+ git config maintenance.strategy incremental &&
+
+ GIT_TRACE2_EVENT="$(pwd)/incremental-hourly.txt" \
+ git maintenance run --schedule=hourly --quiet &&
+ GIT_TRACE2_EVENT="$(pwd)/incremental-daily.txt" \
+ git maintenance run --schedule=daily --quiet &&
+ GIT_TRACE2_EVENT="$(pwd)/incremental-weekly.txt" \
+ git maintenance run --schedule=weekly --quiet &&
+
+ test_subcommand git commit-graph write --split --reachable \
+ --no-progress <incremental-hourly.txt &&
+ test_subcommand ! git prune-packed --quiet <incremental-hourly.txt &&
+ test_subcommand ! git multi-pack-index write --no-progress \
+ <incremental-hourly.txt &&
+ test_subcommand ! git pack-refs --all --prune \
+ <incremental-hourly.txt &&
+
+ test_subcommand git commit-graph write --split --reachable \
+ --no-progress <incremental-daily.txt &&
+ test_subcommand git prune-packed --quiet <incremental-daily.txt &&
+ test_subcommand git multi-pack-index write --no-progress \
+ <incremental-daily.txt &&
+ test_subcommand ! git pack-refs --all --prune \
+ <incremental-daily.txt &&
+
+ test_subcommand git commit-graph write --split --reachable \
+ --no-progress <incremental-weekly.txt &&
+ test_subcommand git prune-packed --quiet <incremental-weekly.txt &&
+ test_subcommand git multi-pack-index write --no-progress \
+ <incremental-weekly.txt &&
+ test_subcommand git pack-refs --all --prune \
+ <incremental-weekly.txt &&
+
+ # Modify defaults
+ git config maintenance.commit-graph.schedule daily &&
+ git config maintenance.loose-objects.schedule hourly &&
+ git config maintenance.incremental-repack.enabled false &&
+
+ GIT_TRACE2_EVENT="$(pwd)/modified-hourly.txt" \
+ git maintenance run --schedule=hourly --quiet &&
+ GIT_TRACE2_EVENT="$(pwd)/modified-daily.txt" \
+ git maintenance run --schedule=daily --quiet &&
+
+ test_subcommand ! git commit-graph write --split --reachable \
+ --no-progress <modified-hourly.txt &&
+ test_subcommand git prune-packed --quiet <modified-hourly.txt &&
+ test_subcommand ! git multi-pack-index write --no-progress \
+ <modified-hourly.txt &&
+
+ test_subcommand git commit-graph write --split --reachable \
+ --no-progress <modified-daily.txt &&
+ test_subcommand git prune-packed --quiet <modified-daily.txt &&
+ test_subcommand ! git multi-pack-index write --no-progress \
+ <modified-daily.txt
+'
+
+test_expect_success 'register and unregister' '
+ test_when_finished git config --global --unset-all maintenance.repo &&
+ git config --global --add maintenance.repo /existing1 &&
+ git config --global --add maintenance.repo /existing2 &&
+ git config --global --get-all maintenance.repo >before &&
+
+ git maintenance register &&
+ test_cmp_config false maintenance.auto &&
+ git config --global --get-all maintenance.repo >between &&
+ cp before expect &&
+ pwd >>expect &&
+ test_cmp expect between &&
+
+ git maintenance unregister &&
+ git config --global --get-all maintenance.repo >actual &&
+ test_cmp before actual
+'
+
+test_expect_success !MINGW 'register and unregister with regex metacharacters' '
+ META="a+b*c" &&
+ git init "$META" &&
+ git -C "$META" maintenance register &&
+ git config --get-all --show-origin maintenance.repo &&
+ git config --get-all --global --fixed-value \
+ maintenance.repo "$(pwd)/$META" &&
+ git -C "$META" maintenance unregister &&
+ test_must_fail git config --get-all --global --fixed-value \
+ maintenance.repo "$(pwd)/$META"
+'
+
+test_expect_success 'start from empty cron table' '
+ GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance start &&
+
+ # start registers the repo
+ git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
+
+ grep "for-each-repo --config=maintenance.repo maintenance run --schedule=daily" cron.txt &&
+ grep "for-each-repo --config=maintenance.repo maintenance run --schedule=hourly" cron.txt &&
+ grep "for-each-repo --config=maintenance.repo maintenance run --schedule=weekly" cron.txt
+'
+
+test_expect_success 'stop from existing schedule' '
+ GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance stop &&
+
+ # stop does not unregister the repo
+ git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
+
+ # Operation is idempotent
+ GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance stop &&
+ test_must_be_empty cron.txt
+'
+
+test_expect_success 'start preserves existing schedule' '
+ echo "Important information!" >cron.txt &&
+ GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance start &&
+ grep "Important information!" cron.txt
+'
+
+test_expect_success 'magic markers are correct' '
+ grep "GIT MAINTENANCE SCHEDULE" cron.txt >actual &&
+ cat >expect <<-\EOF &&
+ # BEGIN GIT MAINTENANCE SCHEDULE
+ # END GIT MAINTENANCE SCHEDULE
+ EOF
+ test_cmp actual expect
+'
+
+test_expect_success 'stop preserves surrounding schedule' '
+ echo "Crucial information!" >>cron.txt &&
+ GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance stop &&
+ grep "Important information!" cron.txt &&
+ grep "Crucial information!" cron.txt
+'
+
+test_expect_success 'start and stop macOS maintenance' '
+ # ensure $HOME can be compared against hook arguments on all platforms
+ pfx=$(cd "$HOME" && pwd) &&
+
+ write_script print-args <<-\EOF &&
+ echo $* | sed "s:gui/[0-9][0-9]*:gui/[UID]:" >>args
+ EOF
+
+ rm -f args &&
+ GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start &&
+
+ # start registers the repo
+ git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
+
+ ls "$HOME/Library/LaunchAgents" >actual &&
+ cat >expect <<-\EOF &&
+ org.git-scm.git.daily.plist
+ org.git-scm.git.hourly.plist
+ org.git-scm.git.weekly.plist
+ EOF
+ test_cmp expect actual &&
+
+ rm -f expect &&
+ for frequency in hourly daily weekly
+ do
+ PLIST="$pfx/Library/LaunchAgents/org.git-scm.git.$frequency.plist" &&
+ test_xmllint "$PLIST" &&
+ grep schedule=$frequency "$PLIST" &&
+ echo "bootout gui/[UID] $PLIST" >>expect &&
+ echo "bootstrap gui/[UID] $PLIST" >>expect || return 1
+ done &&
+ test_cmp expect args &&
+
+ rm -f args &&
+ GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance stop &&
+
+ # stop does not unregister the repo
+ git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
+
+ printf "bootout gui/[UID] $pfx/Library/LaunchAgents/org.git-scm.git.%s.plist\n" \
+ hourly daily weekly >expect &&
+ test_cmp expect args &&
+ ls "$HOME/Library/LaunchAgents" >actual &&
+ test_line_count = 0 actual
+'
+
+test_expect_success 'start and stop Windows maintenance' '
+ write_script print-args <<-\EOF &&
+ echo $* >>args
+ while test $# -gt 0
+ do
+ case "$1" in
+ /xml) shift; xmlfile=$1; break ;;
+ *) shift ;;
+ esac
+ done
+ test -z "$xmlfile" || cp "$xmlfile" "$xmlfile.xml"
+ EOF
+
+ rm -f args &&
+ GIT_TEST_MAINT_SCHEDULER="schtasks:./print-args" git maintenance start &&
+
+ # start registers the repo
+ git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
+
+ for frequency in hourly daily weekly
+ do
+ grep "/create /tn Git Maintenance ($frequency) /f /xml" args &&
+ file=$(ls .git/schedule_${frequency}*.xml) &&
+ test_xmllint "$file" || return 1
+ done &&
+
+ rm -f args &&
+ GIT_TEST_MAINT_SCHEDULER="schtasks:./print-args" git maintenance stop &&
+
+ # stop does not unregister the repo
+ git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
+
+ printf "/delete /tn Git Maintenance (%s) /f\n" \
+ hourly daily weekly >expect &&
+ test_cmp expect args
+'
+
+test_expect_success 'register preserves existing strategy' '
+ git config maintenance.strategy none &&
+ git maintenance register &&
+ test_config maintenance.strategy none &&
+ git config --unset maintenance.strategy &&
+ git maintenance register &&
+ test_config maintenance.strategy incremental
+'
+
+test_expect_success 'fails when running outside of a repository' '
+ nongit test_must_fail git maintenance run &&
+ nongit test_must_fail git maintenance stop &&
+ nongit test_must_fail git maintenance start &&
+ nongit test_must_fail git maintenance register &&
+ nongit test_must_fail git maintenance unregister
+'
+
+test_expect_success 'register and unregister bare repo' '
+ test_when_finished "git config --global --unset-all maintenance.repo || :" &&
+ test_might_fail git config --global --unset-all maintenance.repo &&
+ git init --bare barerepo &&
+ (
+ cd barerepo &&
+ git maintenance register &&
+ git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
+ git maintenance unregister &&
+ test_must_fail git config --global --get-all maintenance.repo
+ )
+'
+
+test_done
diff --git a/t/t8001-annotate.sh b/t/t8001-annotate.sh
index 72176e4..a536a62 100755
--- a/t/t8001-annotate.sh
+++ b/t/t8001-annotate.sh
@@ -1,13 +1,16 @@
#!/bin/sh
test_description='git annotate'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
PROG='git annotate'
. "$TEST_DIRECTORY"/annotate-tests.sh
test_expect_success 'annotate old revision' '
- git annotate file master >actual &&
+ git annotate file main >actual &&
awk "{ print \$3; }" <actual >authors &&
test 2 = $(grep A <authors | wc -l) &&
test 2 = $(grep B <authors | wc -l)
diff --git a/t/t8002-blame.sh b/t/t8002-blame.sh
index eea048e..5bb302b 100755
--- a/t/t8002-blame.sh
+++ b/t/t8002-blame.sh
@@ -1,11 +1,18 @@
#!/bin/sh
test_description='git blame'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
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 +112,32 @@
'
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/t/t8003-blame-corner-cases.sh b/t/t8003-blame-corner-cases.sh
index 9130b88..da80f81 100755
--- a/t/t8003-blame-corner-cases.sh
+++ b/t/t8003-blame-corner-cases.sh
@@ -1,12 +1,14 @@
#!/bin/sh
test_description='git blame corner cases'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
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 &&
@@ -162,13 +164,13 @@
test_expect_success 'blame during cherry-pick with file rename conflict' '
- test_when_finished "git reset --hard && git checkout master" &&
+ test_when_finished "git reset --hard && git checkout main" &&
git checkout HEAD~3 &&
echo MOUSE >> mouse &&
git mv mouse rodent &&
git add rodent &&
GIT_AUTHOR_NAME=Rodent git commit -m "rodent" &&
- git checkout --detach master &&
+ git checkout --detach main &&
(git cherry-pick HEAD@{1} || test $? -eq 1) &&
git show HEAD@{1}:rodent > rodent &&
git add rodent &&
@@ -274,18 +276,14 @@
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
@@ -294,6 +292,7 @@
EOF
git add giraffe &&
git commit -m "interior SPLIT line" &&
+ split=$(git rev-parse HEAD) &&
cat >giraffe <<-\EOF &&
ABC
@@ -301,12 +300,25 @@
EOF
git add giraffe &&
git commit -m "same contents as original" &&
+ final=$(git rev-parse HEAD)
+'
+test_expect_success 'blame coalesce' '
cat >expect <<-EOF &&
- $oid 1) ABC
- $oid 2) DEF
+ $orig 1 1 2
+ $orig 2 2
EOF
- git -c core.abbrev=40 blame -s giraffe >actual &&
+ 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 &&
+ $orig 1) ABC
+ $orig 3) DEF
+ EOF
+ git blame --no-abbrev -s -L1,1 -L3,3 $split giraffe >actual &&
test_cmp expect actual
'
diff --git a/t/t8004-blame-with-conflicts.sh b/t/t8004-blame-with-conflicts.sh
index 9c353ab..35414a5 100755
--- a/t/t8004-blame-with-conflicts.sh
+++ b/t/t8004-blame-with-conflicts.sh
@@ -3,6 +3,9 @@
# Based on a test case submitted by Björn Steinbrink.
test_description='git blame on conflicted files'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup first case' '
@@ -21,16 +24,16 @@
git add file2 &&
git commit --author "U Gly <ug@localhost>" -m ugly &&
- # Back to master and change something
- git checkout master &&
+ # Back to main and change something
+ git checkout main &&
echo "
bla" >> file1 &&
git commit --author "Old Line <ol@localhost>" -a -m file1.b &&
- # Back to foo and merge master
+ # Back to foo and merge main
git checkout foo &&
- if git merge master; then
+ if git merge main; then
echo needed conflict here
exit 1
else
@@ -44,8 +47,8 @@
git rm file1 &&
git commit --author "M Result <mr@localhost>" -a -m merged &&
- # Back to master and change file1 again
- git checkout master &&
+ # Back to main and change file1 again
+ git checkout main &&
sed s/bla/foo/ <file1 >X &&
rm file1 &&
mv X file1 &&
@@ -53,7 +56,7 @@
# Try to merge into foo again
git checkout foo &&
- if git merge master; then
+ if git merge main; then
echo needed conflict here
exit 1
else
diff --git a/t/t8011-blame-split-file.sh b/t/t8011-blame-split-file.sh
index 8311250..bdda0c0 100755
--- a/t/t8011-blame-split-file.sh
+++ b/t/t8011-blame-split-file.sh
@@ -54,7 +54,7 @@
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/t/t8012-blame-colors.sh b/t/t8012-blame-colors.sh
index ed38f74..90c75db 100755
--- a/t/t8012-blame-colors.sh
+++ b/t/t8012-blame-colors.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='colored git blame'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
PROG='git blame -c'
diff --git a/t/t8013-blame-ignore-revs.sh b/t/t8013-blame-ignore-revs.sh
index 36dc31e..b18633d 100755
--- a/t/t8013-blame-ignore-revs.sh
+++ b/t/t8013-blame-ignore-revs.sh
@@ -21,6 +21,7 @@
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 @@
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 silently accepted
+test_expect_success 'validate --ignore-revs-file' '
+ git rev-parse X^{tree} >ignore_x &&
+ 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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
git tag C &&
git blame file --ignore-rev B >blame_raw
- '
+'
# Resetting the repo and creating:
#
@@ -269,6 +286,6 @@
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/t/t8014-blame-ignore-fuzzy.sh b/t/t8014-blame-ignore-fuzzy.sh
index 6e61882..e68e611 100755
--- a/t/t8014-blame-ignore-fuzzy.sh
+++ b/t/t8014-blame-ignore-fuzzy.sh
@@ -248,7 +248,7 @@
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/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 90f61c3..4eee9c3 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='git send-email'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
# May be altered later in the test
@@ -42,7 +45,8 @@
}
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
@@ -1167,10 +1171,10 @@
'
test_expect_success $PREREQ 'detects ambiguous reference/file conflict' '
- echo master >master &&
- git add master &&
- git commit -m"add master" &&
- test_must_fail git send-email --dry-run master 2>errors &&
+ echo main >main &&
+ git add main &&
+ git commit -m"add main" &&
+ test_must_fail git send-email --dry-run main 2>errors &&
grep disambiguate errors
'
@@ -1184,7 +1188,7 @@
outdir/000?-*.patch 2>errors >out &&
grep "^Subject: " out >subjects &&
test "z$(sed -n -e 1p subjects)" = "zSubject: [PATCH 1/2] Second." &&
- test "z$(sed -n -e 2p subjects)" = "zSubject: [PATCH 2/2] add master"
+ test "z$(sed -n -e 2p subjects)" = "zSubject: [PATCH 2/2] add main"
'
test_expect_success $PREREQ 'in-reply-to but no threading' '
@@ -1219,6 +1223,17 @@
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 \
@@ -1539,7 +1554,7 @@
--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 +1571,7 @@
--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 +1597,7 @@
--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 +1627,7 @@
--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 +1644,7 @@
--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
'
@@ -2025,7 +2040,7 @@
--cc="Cc2 <cc2@example.com>" \
--bcc="bcc1@example.com" \
--bcc="bcc2@example.com" \
- 0001-add-master.patch | replace_variable_fields \
+ 0001-add-main.patch | replace_variable_fields \
>expected-list
'
@@ -2037,7 +2052,7 @@
--to="to3@example.com" \
--cc="Cc 1 <cc1@example.com>, Cc2 <cc2@example.com>" \
--bcc="bcc1@example.com, bcc2@example.com" \
- 0001-add-master.patch | replace_variable_fields \
+ 0001-add-main.patch | replace_variable_fields \
>actual-list &&
test_cmp expected-list actual-list
'
@@ -2053,7 +2068,7 @@
--to="To 1 <to1@example.com>, to2, to3@example.com" \
--cc="cc1, Cc2 <cc2@example.com>" \
--bcc="bcc1@example.com, bcc2@example.com" \
- 0001-add-master.patch | replace_variable_fields \
+ 0001-add-main.patch | replace_variable_fields \
>actual-list &&
test_cmp expected-list actual-list
'
@@ -2077,7 +2092,7 @@
--cc="Cc2 <cc2@example.com>" \
--bcc="$BCC1" \
--bcc="bcc2@example.com" \
- 0001-add-master.patch | replace_variable_fields \
+ 0001-add-main.patch | replace_variable_fields \
>actual-list &&
test_cmp expected-list actual-list
'
@@ -2096,8 +2111,8 @@
false
;;
esac &&
- test -f 0001-add-master.patch &&
- grep "add master" "$1"
+ test -f 0001-add-main.patch &&
+ grep "add main" "$1"
EOF
mkdir subdir &&
@@ -2109,10 +2124,10 @@
--from="Example <nobody@example.com>" \
--to=nobody@example.com \
--smtp-server="$(pwd)/../fake.sendmail" \
- ../0001-add-master.patch &&
+ ../0001-add-main.patch &&
# Verify error message when a patch is rejected by the hook
- sed -e "s/add master/x/" ../0001-add-master.patch >../another.patch &&
+ sed -e "s/add main/x/" ../0001-add-main.patch >../another.patch &&
test_must_fail git send-email \
--from="Example <nobody@example.com>" \
--to=nobody@example.com \
@@ -2127,7 +2142,36 @@
--from="Example <nobody@example.com>" \
--to=nobody@example.com \
--smtp-server="$(pwd)/fake.sendmail" \
- "$(pwd)/0001-add-master.patch"
+ "$(pwd)/0001-add-main.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/t/t9003-help-autocorrect.sh b/t/t9003-help-autocorrect.sh
index b1c7919..f00deaf 100755
--- a/t/t9003-help-autocorrect.sh
+++ b/t/t9003-help-autocorrect.sh
@@ -37,16 +37,27 @@
grep "^ distimdistim" actual
'
-test_expect_success 'autocorrect running commands' '
- git config help.autocorrect -1 &&
+for immediate in -1 immediate
+do
+ test_expect_success 'autocorrect running commands' '
+ git config help.autocorrect $immediate &&
- git lfg >actual &&
- echo "a single log entry" >expect &&
- test_cmp expect actual &&
+ git lfg >actual &&
+ echo "a single log entry" >expect &&
+ test_cmp expect actual &&
- git distimdist >actual &&
- echo "distimdistim was called" >expect &&
- test_cmp expect actual
+ git distimdist >actual &&
+ echo "distimdistim was called" >expect &&
+ test_cmp expect actual
+ '
+done
+
+test_expect_success 'autocorrect can be declined altogether' '
+ git config help.autocorrect never &&
+
+ test_must_fail git lfg 2>actual &&
+ grep "is not a git command" actual &&
+ test_line_count = 1 actual
'
test_done
diff --git a/t/t9010-svn-fe.sh b/t/t9010-svn-fe.sh
deleted file mode 100755
index c90fdc5..0000000
--- a/t/t9010-svn-fe.sh
+++ /dev/null
@@ -1,1105 +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"
-}
-
-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_must_be_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/t/t9011-svn-da.sh b/t/t9011-svn-da.sh
deleted file mode 100755
index ab1ef28..0000000
--- a/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/t/t9020-remote-svn.sh b/t/t9020-remote-svn.sh
deleted file mode 100755
index 6fca08e..0000000
--- a/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/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh
index 2c309a5..1d3fdcc 100755
--- a/t/t9100-git-svn-basic.sh
+++ b/t/t9100-git-svn-basic.sh
@@ -6,6 +6,9 @@
test_description='git svn basic tests'
GIT_SVN_LC_ALL=${LC_ALL:-$LANG}
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./lib-git-svn.sh
case "$GIT_SVN_LC_ALL" in
@@ -63,16 +66,16 @@
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 +203,19 @@
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 +225,20 @@
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 \
@@ -261,7 +278,7 @@
test refs/heads/my-bar = $(git symbolic-ref HEAD) &&
git log refs/remotes/bar | grep "change 1" &&
! git log refs/remotes/bar | grep "change 2" &&
- git checkout master &&
+ git checkout main &&
git branch -D my-bar
'
diff --git a/t/t9101-git-svn-props.sh b/t/t9101-git-svn-props.sh
index c26c4b0..8b5681d 100755
--- a/t/t9101-git-svn-props.sh
+++ b/t/t9101-git-svn-props.sh
@@ -160,11 +160,13 @@
/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/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh
index 5e0ad19..67eed2f 100755
--- a/t/t9104-git-svn-follow-parent.sh
+++ b/t/t9104-git-svn-follow-parent.sh
@@ -161,6 +161,7 @@
'
test_expect_success "follow-parent is atomic" '
+ record_size=$(($(test_oid rawsz) + 4)) &&
(
cd wc &&
svn_cmd up &&
@@ -186,7 +187,7 @@
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/t/t9108-git-svn-glob.sh b/t/t9108-git-svn-glob.sh
index 6990f64..d5939d4 100755
--- a/t/t9108-git-svn-glob.sh
+++ b/t/t9108-git-svn-glob.sh
@@ -48,7 +48,7 @@
"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 $(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/t/t9109-git-svn-multi-glob.sh b/t/t9109-git-svn-multi-glob.sh
index c1e7542..648dcee 100755
--- a/t/t9109-git-svn-multi-glob.sh
+++ b/t/t9109-git-svn-multi-glob.sh
@@ -48,7 +48,7 @@
"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 $(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 $(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/t/t9141-git-svn-multiple-branches.sh b/t/t9141-git-svn-multiple-branches.sh
index 8e7f7d6..bf168a3 100755
--- a/t/t9141-git-svn-multiple-branches.sh
+++ b/t/t9141-git-svn-multiple-branches.sh
@@ -90,10 +90,10 @@
) &&
( 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/t/t9145-git-svn-master-branch.sh b/t/t9145-git-svn-master-branch.sh
index 3bbf341..f863e43 100755
--- a/t/t9145-git-svn-master-branch.sh
+++ b/t/t9145-git-svn-master-branch.sh
@@ -2,7 +2,10 @@
#
# Copyright (c) 2009 Eric Wong
#
-test_description='git svn initial master branch is "trunk" if possible'
+test_description='git svn initial main branch is "trunk" if possible'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./lib-git-svn.sh
test_expect_success 'setup test repository' '
@@ -13,12 +16,12 @@
svn_cmd import -m b/b i "$svnrepo/branches/b"
'
-test_expect_success 'git svn clone --stdlayout sets up trunk as master' '
+test_expect_success 'git svn clone --stdlayout sets up trunk as main' '
git svn clone -s "$svnrepo" g &&
(
cd g &&
test x$(git rev-parse --verify refs/remotes/origin/trunk^0) = \
- x$(git rev-parse --verify refs/heads/master^0)
+ x$(git rev-parse --verify refs/heads/main^0)
)
'
diff --git a/t/t9151-svn-mergeinfo.sh b/t/t9151-svn-mergeinfo.sh
index 4f6c06e..1fbe84f 100755
--- a/t/t9151-svn-mergeinfo.sh
+++ b/t/t9151-svn-mergeinfo.sh
@@ -5,53 +5,53 @@
test_description='git-svn svn mergeinfo properties'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./lib-git-svn.sh
test_expect_success 'load svn dump' "
svnadmin load -q '$rawsvnrepo' \
- < '$TEST_DIRECTORY/t9151/svn-mergeinfo.dump' &&
+ <'$TEST_DIRECTORY/t9151/svn-mergeinfo.dump' &&
git svn init --minimize-url -R svnmerge \
--rewrite-root=http://svn.example.org \
-T trunk -b branches '$svnrepo' &&
git svn fetch --all
- "
+"
test_expect_success 'all svn merges became git merge commits' '
- unmarked=$(git rev-list --parents --all --grep=Merge |
- grep -v " .* " | cut -f1 -d" ") &&
- [ -z "$unmarked" ]
- '
+ git rev-list --all --no-merges --grep=Merge >unmarked &&
+ test_must_be_empty unmarked
+'
test_expect_success 'cherry picks did not become git merge commits' '
- bad_cherries=$(git rev-list --parents --all --grep=Cherry |
- grep " .* " | cut -f1 -d" ") &&
- [ -z "$bad_cherries" ]
- '
+ git rev-list --all --merges --grep=Cherry >bad-cherries &&
+ test_must_be_empty bad-cherries
+'
test_expect_success 'svn non-merge merge commits did not become git merge commits' '
- bad_non_merges=$(git rev-list --parents --all --grep=non-merge |
- grep " .* " | cut -f1 -d" ") &&
- [ -z "$bad_non_merges" ]
- '
+ git rev-list --all --merges --grep=non-merge >bad-non-merges &&
+ test_must_be_empty bad-non-merges
+'
test_expect_success 'commit made to merged branch is reachable from the merge' '
before_commit=$(git rev-list --all --grep="trunk commit before merging trunk to b2") &&
merge_commit=$(git rev-list --all --grep="Merge trunk to b2") &&
- not_reachable=$(git rev-list -1 $before_commit --not $merge_commit) &&
- [ -z "$not_reachable" ]
- '
+ git rev-list -1 $before_commit --not $merge_commit >not-reachable &&
+ test_must_be_empty not-reachable
+'
test_expect_success 'merging two branches in one commit is detected correctly' '
f1_commit=$(git rev-list --all --grep="make f1 branch from trunk") &&
f2_commit=$(git rev-list --all --grep="make f2 branch from trunk") &&
merge_commit=$(git rev-list --all --grep="Merge f1 and f2 to trunk") &&
- not_reachable=$(git rev-list -1 $f1_commit $f2_commit --not $merge_commit) &&
- [ -z "$not_reachable" ]
- '
+ git rev-list -1 $f1_commit $f2_commit --not $merge_commit >not-reachable &&
+ test_must_be_empty not-reachable
+'
test_expect_failure 'everything got merged in the end' '
- unmerged=$(git rev-list --all --not master) &&
- [ -z "$unmerged" ]
- '
+ git rev-list --all --not main >unmerged &&
+ test_must_be_empty unmerged
+'
test_done
diff --git a/t/t9155-git-svn-fetch-deleted-tag.sh b/t/t9155-git-svn-fetch-deleted-tag.sh
index 184336f..3258374 100755
--- a/t/t9155-git-svn-fetch-deleted-tag.sh
+++ b/t/t9155-git-svn-fetch-deleted-tag.sh
@@ -2,6 +2,9 @@
test_description='git svn fetch deleted tag'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./lib-git-svn.sh
test_expect_success 'setup svn repo' '
@@ -36,7 +39,7 @@
git svn fetch &&
git diff --exit-code origin/mybranch:trunk/subdir/file origin/tags/mytag:file &&
- git diff --exit-code master:subdir/file origin/tags/mytag^:file
+ git diff --exit-code main:subdir/file origin/tags/mytag^:file
'
test_done
diff --git a/t/t9156-git-svn-fetch-deleted-tag-2.sh b/t/t9156-git-svn-fetch-deleted-tag-2.sh
index 7a6e33b..2b75c40 100755
--- a/t/t9156-git-svn-fetch-deleted-tag-2.sh
+++ b/t/t9156-git-svn-fetch-deleted-tag-2.sh
@@ -2,6 +2,9 @@
test_description='git svn fetch deleted tag 2'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./lib-git-svn.sh
test_expect_success 'setup svn repo' '
@@ -36,9 +39,9 @@
cd git_project &&
git svn fetch &&
- git diff --exit-code master:subdir3/file origin/tags/mytag:file &&
- git diff --exit-code master:subdir2/file origin/tags/mytag^:file &&
- git diff --exit-code master:subdir1/file origin/tags/mytag^^:file
+ git diff --exit-code main:subdir3/file origin/tags/mytag:file &&
+ git diff --exit-code main:subdir2/file origin/tags/mytag^:file &&
+ git diff --exit-code main:subdir1/file origin/tags/mytag^^:file
'
test_done
diff --git a/t/t9160-git-svn-preserve-empty-dirs.sh b/t/t9160-git-svn-preserve-empty-dirs.sh
index 0ede3cf..36c6b1a 100755
--- a/t/t9160-git-svn-preserve-empty-dirs.sh
+++ b/t/t9160-git-svn-preserve-empty-dirs.sh
@@ -86,8 +86,8 @@
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/t/t9163-git-svn-reset-clears-caches.sh b/t/t9163-git-svn-reset-clears-caches.sh
index d6245ce..978eb62 100755
--- a/t/t9163-git-svn-reset-clears-caches.sh
+++ b/t/t9163-git-svn-reset-clears-caches.sh
@@ -4,6 +4,9 @@
#
test_description='git svn reset clears memoized caches'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./lib-git-svn.sh
svn_ver="$(svn --version --quiet)"
@@ -59,7 +62,7 @@
test_expect_success 'rebase looses SVN merge (m)' '
git svn rebase &&
git svn fetch &&
- test 1 = $(git cat-file -p master|grep parent|wc -l)
+ test 1 = $(git cat-file -p main|grep parent|wc -l)
'
# git svn fetch creates correct history with merge commit
diff --git a/t/t9164-git-svn-dcommit-concurrent.sh b/t/t9164-git-svn-dcommit-concurrent.sh
index 90346ff..8466269 100755
--- a/t/t9164-git-svn-dcommit-concurrent.sh
+++ b/t/t9164-git-svn-dcommit-concurrent.sh
@@ -92,7 +92,7 @@
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 @@
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/t/t9168-git-svn-partially-globbed-names.sh b/t/t9168-git-svn-partially-globbed-names.sh
index bdf6e84..854b341 100755
--- a/t/t9168-git-svn-partially-globbed-names.sh
+++ b/t/t9168-git-svn-partially-globbed-names.sh
@@ -49,7 +49,7 @@
"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 $(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 $(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 $(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/t/t9169-git-svn-dcommit-crlf.sh b/t/t9169-git-svn-dcommit-crlf.sh
index 54b1f61..7080b5d 100755
--- a/t/t9169-git-svn-dcommit-crlf.sh
+++ b/t/t9169-git-svn-dcommit-crlf.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='git svn dcommit CRLF'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./lib-git-svn.sh
test_expect_success 'setup commit repository' '
@@ -14,7 +17,7 @@
p=$(git rev-parse HEAD) &&
t=$(git write-tree) &&
cmt=$(git commit-tree -p $p $t <cmt) &&
- git update-ref refs/heads/master $cmt &&
+ git update-ref refs/heads/main $cmt &&
git cat-file commit HEAD | tail -n4 >out &&
test_cmp cmt out &&
git svn dcommit &&
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 3e41c58..5c47ac4 100755
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -4,8 +4,11 @@
#
test_description='test git fast-import utility'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
-. "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash
+. "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash
verify_packs () {
for p in .git/objects/pack/*.pack
@@ -62,7 +65,7 @@
mark :4
data $file4_len
$file4_data
- commit refs/heads/master
+ commit refs/heads/main
mark :5
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
data <<COMMIT
@@ -92,7 +95,7 @@
EOF
reset refs/tags/to-be-deleted
- from 0000000000000000000000000000000000000000
+ from $ZERO_OID
tag nested
mark :6
@@ -102,7 +105,7 @@
EOF
reset refs/tags/nested
- from 0000000000000000000000000000000000000000
+ from $ZERO_OID
tag nested
mark :7
@@ -117,7 +120,7 @@
INPUT_END
git fast-import --export-marks=marks.out <input &&
- git whatchanged master
+ git whatchanged main
'
test_expect_success 'A: verify pack' '
@@ -131,7 +134,7 @@
initial
EOF
- git cat-file commit master | sed 1d >actual &&
+ git cat-file commit main | sed 1d >actual &&
test_cmp expect actual
'
@@ -141,31 +144,31 @@
100644 blob file3
100755 blob file4
EOF
- git cat-file -p master^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
+ git cat-file -p main^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
test_cmp expect actual
'
test_expect_success 'A: verify file2' '
echo "$file2_data" >expect &&
- git cat-file blob master:file2 >actual &&
+ git cat-file blob main:file2 >actual &&
test_cmp expect actual
'
test_expect_success 'A: verify file3' '
echo "$file3_data" >expect &&
- git cat-file blob master:file3 >actual &&
+ git cat-file blob main:file3 >actual &&
test_cmp expect actual
'
test_expect_success 'A: verify file4' '
printf "$file4_data" >expect &&
- git cat-file blob master:file4 >actual &&
+ git cat-file blob main:file4 >actual &&
test_cmp expect actual
'
test_expect_success 'A: verify tag/series-A' '
cat >expect <<-EOF &&
- object $(git rev-parse refs/heads/master)
+ object $(git rev-parse refs/heads/main)
type commit
tag series-A
@@ -177,7 +180,7 @@
test_expect_success 'A: verify tag/series-A-blob' '
cat >expect <<-EOF &&
- object $(git rev-parse refs/heads/master:file3)
+ object $(git rev-parse refs/heads/main:file3)
type blob
tag series-A-blob
@@ -193,13 +196,13 @@
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)
+ :2 $(git rev-parse --verify main:file2)
+ :3 $(git rev-parse --verify main:file3)
+ :4 $(git rev-parse --verify main:file4)
+ :5 $(git rev-parse --verify main^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)
+ :8 $(git rev-parse --verify main^0)
EOF
test_cmp expect marks.out
'
@@ -217,7 +220,7 @@
new_blob=$(echo testing | git hash-object --stdin) &&
cat >input <<-INPUT_END &&
tag series-A-blob-2
- from $(git rev-parse refs/heads/master:file3)
+ from $(git rev-parse refs/heads/main:file3)
data <<EOF
Tag blob by sha1.
EOF
@@ -243,7 +246,7 @@
INPUT_END
cat >expect <<-EOF &&
- object $(git rev-parse refs/heads/master:file3)
+ object $(git rev-parse refs/heads/main:file3)
type blob
tag series-A-blob-2
@@ -284,12 +287,13 @@
'
test_expect_success 'A: verify diff' '
+ copy=$(git rev-parse --verify main: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 &&
+ git diff-tree -M -r main verify--import-marks >actual &&
compare_diff_raw expect actual &&
- test $(git rev-parse --verify master:file2) \
+ test $(git rev-parse --verify main:file2) \
= $(git rev-parse --verify verify--import-marks:copy-of-file2)
'
@@ -363,8 +367,8 @@
corrupt
COMMIT
- from refs/heads/master
- M 755 0000000000000000000000000000000000000001 zero1
+ from refs/heads/main
+ M 755 $(echo $ZERO_OID | sed -e "s/0$/1/") zero1
INPUT_END
@@ -380,7 +384,7 @@
tag base
COMMIT
- from refs/heads/master
+ from refs/heads/main
INPUT_END
@@ -389,7 +393,7 @@
git prune" &&
git fast-import <input &&
test -f .git/TEMP_TAG &&
- test $(git rev-parse master) = $(git rev-parse TEMP_TAG^)
+ test $(git rev-parse main) = $(git rev-parse TEMP_TAG^)
'
test_expect_success 'B: accept empty committer' '
@@ -410,6 +414,34 @@
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
@@ -499,7 +531,8 @@
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) &&
+ oldf=$(git rev-parse --verify main:file2) &&
+ thrf=$(git rev-parse --verify main:file3) &&
test_tick &&
cat >input <<-INPUT_END &&
commit refs/heads/branch
@@ -508,7 +541,7 @@
second
COMMIT
- from refs/heads/master
+ from refs/heads/main
M 644 $oldf file2/oldf
M 755 $newf file2/newf
D file3
@@ -530,7 +563,7 @@
test_expect_success 'C: verify commit' '
cat >expect <<-EOF &&
- parent $(git rev-parse --verify master^0)
+ parent $(git rev-parse --verify main^0)
author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
@@ -542,12 +575,13 @@
'
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 &&
+ git diff-tree -M -r main branch >actual &&
compare_diff_raw expect actual
'
@@ -586,9 +620,11 @@
'
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
@@ -751,12 +787,13 @@
'
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
@@ -907,14 +944,15 @@
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' '
@@ -976,7 +1014,7 @@
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 &&
@@ -997,7 +1035,7 @@
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 &&
@@ -1018,7 +1056,7 @@
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 &&
@@ -1039,11 +1077,11 @@
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 &&
@@ -1069,7 +1107,7 @@
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 &&
@@ -1101,9 +1139,9 @@
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 &&
@@ -1134,9 +1172,9 @@
'
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 &&
@@ -1155,9 +1193,9 @@
'
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 &&
@@ -1226,9 +1264,9 @@
'
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 &&
@@ -1247,12 +1285,12 @@
'
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
@@ -1312,10 +1350,10 @@
'
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 &&
@@ -1594,7 +1632,10 @@
INPUT_END
git fast-import <input &&
- test 8 = $(find .git/objects/pack -type f | grep -v multi-pack-index | wc -l) &&
+ ls -la .git/objects/pack/pack-*.pack >packlist &&
+ ls -la .git/objects/pack/pack-*.pack >idxlist &&
+ test_line_count = 4 idxlist &&
+ test_line_count = 4 packlist &&
test $(git rev-parse refs/tags/O3-2nd) = $(git rev-parse O3^) &&
git log --reverse --pretty=oneline O3 | sed s/^.*z// >actual &&
test_cmp expect actual
@@ -1663,7 +1704,7 @@
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
data 8
initial
- from refs/heads/master
+ from refs/heads/main
M 100644 :3 .gitmodules
M 160000 :2 sub
@@ -1698,8 +1739,8 @@
(
cd sub &&
git init &&
- git fetch --update-head-ok .. refs/heads/sub:refs/heads/master &&
- git checkout master
+ git fetch --update-head-ok .. refs/heads/sub:refs/heads/main &&
+ git checkout main
) &&
git submodule init &&
git submodule update
@@ -1723,7 +1764,7 @@
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
data 8
initial
- from refs/heads/master
+ from refs/heads/main
M 100644 :1 .gitmodules
M 160000 $SUBPREV sub
@@ -2698,7 +2739,7 @@
rm -f io.marks &&
blob=$(echo hi | git hash-object --stdin) &&
cat >expect <<-EOF &&
- :3 0000000000000000000000000000000000000000
+ :3 $ZERO_OID
:1 $blob
:2 $blob
EOF
@@ -3049,7 +3090,7 @@
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
'
@@ -3089,6 +3130,9 @@
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
'
@@ -3109,7 +3153,7 @@
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 &&
@@ -3134,7 +3178,7 @@
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 &&
@@ -3159,7 +3203,7 @@
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 &&
@@ -3381,4 +3425,113 @@
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/main
+commit refs/heads/main
+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/main
+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/main
+commit refs/heads/main
+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/main
+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/main
+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
+ Ymain sha1:9afed2f9161ddf416c0a1863b8b0725b00070504
+ Ymain 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 main)" = "$(test_oid Ymain)"
+ )
+'
+
test_done
diff --git a/t/t9301-fast-import-notes.sh b/t/t9301-fast-import-notes.sh
index ca223dc..1ae4d7c 100755
--- a/t/t9301-fast-import-notes.sh
+++ b/t/t9301-fast-import-notes.sh
@@ -4,12 +4,15 @@
#
test_description='test git fast-import of notes objects'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_tick
cat >input <<INPUT_END
-commit refs/heads/master
+commit refs/heads/main
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
data <<COMMIT
first commit
@@ -30,7 +33,7 @@
file baz/xyzzy in first commit
EOF
-commit refs/heads/master
+commit refs/heads/main
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
data <<COMMIT
second commit
@@ -46,7 +49,7 @@
file baz/xyzzy in second commit
EOF
-commit refs/heads/master
+commit refs/heads/main
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
data <<COMMIT
third commit
@@ -57,7 +60,7 @@
file foo in third commit
EOF
-commit refs/heads/master
+commit refs/heads/main
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
data <<COMMIT
fourth commit
@@ -70,13 +73,13 @@
INPUT_END
-test_expect_success 'set up master branch' '
+test_expect_success 'set up main branch' '
git fast-import <input &&
- git whatchanged master
+ git whatchanged main
'
-commit4=$(git rev-parse refs/heads/master)
+commit4=$(git rev-parse refs/heads/main)
commit3=$(git rev-parse "$commit4^")
commit2=$(git rev-parse "$commit4~2")
commit1=$(git rev-parse "$commit4~3")
@@ -470,12 +473,13 @@
'
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 +522,7 @@
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 +597,7 @@
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 +620,7 @@
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 +650,6 @@
'
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 +659,7 @@
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/t/t9302-fast-import-unpack-limit.sh b/t/t9302-fast-import-unpack-limit.sh
index bb1c39c..f519e4f 100755
--- a/t/t9302-fast-import-unpack-limit.sh
+++ b/t/t9302-fast-import-unpack-limit.sh
@@ -5,7 +5,7 @@
test_expect_success 'create loose objects on import' '
test_tick &&
cat >input <<-INPUT_END &&
- commit refs/heads/master
+ commit refs/heads/main
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
data <<COMMIT
initial
@@ -23,12 +23,12 @@
test_expect_success 'bigger packs are preserved' '
test_tick &&
cat >input <<-INPUT_END &&
- commit refs/heads/master
+ commit refs/heads/main
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
data <<COMMIT
incremental should create a pack
COMMIT
- from refs/heads/master^0
+ from refs/heads/main^0
commit refs/heads/branch
committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
@@ -48,7 +48,7 @@
test_expect_success 'lookups after checkpoint works' '
hello_id=$(echo hello | git hash-object --stdin -t blob) &&
id="$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE" &&
- before=$(git rev-parse refs/heads/master^0) &&
+ before=$(git rev-parse refs/heads/main^0) &&
(
cat <<-INPUT_END &&
blob
@@ -56,13 +56,13 @@
data 6
hello
- commit refs/heads/master
+ commit refs/heads/main
mark :2
committer $id
data <<COMMIT
checkpoint after this
COMMIT
- from refs/heads/master^0
+ from refs/heads/main^0
M 100644 :1 hello
# pre-checkpoint
@@ -86,10 +86,10 @@
n=$(($n + 1))
fi &&
sleep 1 &&
- from=$(git rev-parse refs/heads/master^0)
+ from=$(git rev-parse refs/heads/main^0)
done &&
cat <<-INPUT_END &&
- commit refs/heads/master
+ commit refs/heads/main
committer $id
data <<COMMIT
make sure from "unpacked sha1 reference" works, too
diff --git a/t/t9303-fast-import-compression.sh b/t/t9303-fast-import-compression.sh
index 5045f02..57d9165 100755
--- a/t/t9303-fast-import-compression.sh
+++ b/t/t9303-fast-import-compression.sh
@@ -3,12 +3,6 @@
test_description='compression setting of fast-import utility'
. ./test-lib.sh
-# This should be moved to test-lib.sh together with the
-# copy in t0021 after both topics have graduated to 'master'.
-file_size () {
- test-tool path-utils file-size "$1"
-}
-
import_large () {
(
echo blob
@@ -24,7 +18,7 @@
test_when_finished "rm -f .git/objects/pack/pack-*.*" &&
test_when_finished "rm -rf .git/objects/??" &&
import_large -c fastimport.unpacklimit=0 $config &&
- sz=$(file_size .git/objects/pack/pack-*.pack) &&
+ sz=$(test_file_size .git/objects/pack/pack-*.pack) &&
case "$expect" in
small) test "$sz" -le 100000 ;;
large) test "$sz" -ge 100000 ;;
@@ -47,7 +41,7 @@
test_when_finished "rm -f .git/objects/pack/pack-*.*" &&
test_when_finished "rm -rf .git/objects/??" &&
import_large -c fastimport.unpacklimit=9 $config &&
- sz=$(file_size .git/objects/??/????*) &&
+ sz=$(test_file_size .git/objects/??/????*) &&
case "$expect" in
small) test "$sz" -le 100000 ;;
large) test "$sz" -ge 100000 ;;
diff --git a/t/t9304-fast-import-marks.sh b/t/t9304-fast-import-marks.sh
new file mode 100755
index 0000000..d4359db
--- /dev/null
+++ b/t/t9304-fast-import-marks.sh
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+test_description='test exotic situations with marks'
+. ./test-lib.sh
+
+test_expect_success 'setup dump of basic history' '
+ test_commit one &&
+ git fast-export --export-marks=marks HEAD >dump
+'
+
+test_expect_success 'setup large marks file' '
+ # normally a marks file would have a lot of useful, unique
+ # marks. But for our purposes, just having a lot of nonsense
+ # ones is fine. Start at 1024 to avoid clashing with marks
+ # legitimately used in our tiny dump.
+ blob=$(git rev-parse HEAD:one.t) &&
+ for i in $(test_seq 1024 16384)
+ do
+ echo ":$i $blob"
+ done >>marks
+'
+
+test_expect_success 'import with large marks file' '
+ git fast-import --import-marks=marks <dump
+'
+
+test_expect_success 'setup dump with submodule' '
+ git submodule add "$PWD" sub &&
+ git commit -m "add submodule" &&
+ git fast-export HEAD >dump
+'
+
+test_expect_success 'setup submodule mapping with large id' '
+ old=$(git rev-parse HEAD:sub) &&
+ new=$(echo $old | sed s/./a/g) &&
+ echo ":12345 $old" >from &&
+ echo ":12345 $new" >to
+'
+
+test_expect_success 'import with submodule mapping' '
+ git init dst &&
+ git -C dst fast-import \
+ --rewrite-submodules-from=sub:../from \
+ --rewrite-submodules-to=sub:../to \
+ <dump &&
+ git -C dst rev-parse HEAD:sub >actual &&
+ echo "$new" >expect &&
+ test_cmp expect actual
+'
+
+test_done
diff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh
index 690c90f..409b48e 100755
--- a/t/t9350-fast-export.sh
+++ b/t/t9350-fast-export.sh
@@ -4,6 +4,9 @@
#
test_description='git fast-export'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
test_expect_success 'setup' '
@@ -31,13 +34,13 @@
git commit -m sitzt file2 &&
test_tick &&
git tag -a -m valentin muss &&
- git merge -s ours master
+ git merge -s ours main
'
test_expect_success 'fast-export | fast-import' '
- MASTER=$(git rev-parse --verify master) &&
+ MAIN=$(git rev-parse --verify main) &&
REIN=$(git rev-parse --verify rein) &&
WER=$(git rev-parse --verify wer) &&
MUSS=$(git rev-parse --verify muss) &&
@@ -46,7 +49,7 @@
git fast-export --all >actual &&
(cd new &&
git fast-import &&
- test $MASTER = $(git rev-parse --verify refs/heads/master) &&
+ test $MAIN = $(git rev-parse --verify refs/heads/main) &&
test $REIN = $(git rev-parse --verify refs/tags/rein) &&
test $WER = $(git rev-parse --verify refs/heads/wer) &&
test $MUSS = $(git rev-parse --verify refs/tags/muss)) <actual
@@ -80,35 +83,35 @@
test_cmp expected actual
'
-test_expect_success 'fast-export master~2..master' '
+test_expect_success 'fast-export main~2..main' '
- git fast-export master~2..master >actual &&
- sed "s/master/partial/" actual |
+ git fast-export main~2..main >actual &&
+ sed "s/main/partial/" actual |
(cd new &&
git fast-import &&
- test $MASTER != $(git rev-parse --verify refs/heads/partial) &&
- git diff --exit-code master partial &&
- git diff --exit-code master^ partial^ &&
+ test $MAIN != $(git rev-parse --verify refs/heads/partial) &&
+ git diff --exit-code main partial &&
+ git diff --exit-code main^ partial^ &&
test_must_fail git rev-parse partial~2)
'
-test_expect_success 'fast-export --reference-excluded-parents master~2..master' '
+test_expect_success 'fast-export --reference-excluded-parents main~2..main' '
- git fast-export --reference-excluded-parents master~2..master >actual &&
- grep commit.refs/heads/master actual >commit-count &&
+ git fast-export --reference-excluded-parents main~2..main >actual &&
+ grep commit.refs/heads/main actual >commit-count &&
test_line_count = 2 commit-count &&
- sed "s/master/rewrite/" actual |
+ sed "s/main/rewrite/" actual |
(cd new &&
git fast-import &&
- test $MASTER = $(git rev-parse --verify refs/heads/rewrite))
+ test $MAIN = $(git rev-parse --verify refs/heads/rewrite))
'
test_expect_success 'fast-export --show-original-ids' '
- git fast-export --show-original-ids master >output &&
+ git fast-export --show-original-ids main >output &&
grep ^original-oid output| sed -e s/^original-oid.// | sort >actual &&
- git rev-list --objects master muss >objects-and-names &&
+ git rev-list --objects main muss >objects-and-names &&
awk "{print \$1}" objects-and-names | sort >commits-trees-blobs &&
comm -23 actual commits-trees-blobs >unfound &&
test_must_be_empty unfound
@@ -116,8 +119,8 @@
test_expect_success 'fast-export --show-original-ids | git fast-import' '
- git fast-export --show-original-ids master muss | git fast-import --quiet &&
- test $MASTER = $(git rev-parse --verify refs/heads/master) &&
+ git fast-export --show-original-ids main muss | git fast-import --quiet &&
+ test $MAIN = $(git rev-parse --verify refs/heads/main) &&
test $MUSS = $(git rev-parse --verify refs/tags/muss)
'
@@ -132,12 +135,12 @@
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 &&
@@ -164,12 +167,12 @@
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 &&
@@ -192,7 +195,7 @@
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)
@@ -200,7 +203,7 @@
test_expect_success 'import/export-marks' '
- git checkout -b marks master &&
+ git checkout -b marks main &&
git fast-export --export-marks=tmp-marks HEAD &&
test -s tmp-marks &&
test_line_count = 3 tmp-marks &&
@@ -265,7 +268,7 @@
test_expect_success 'setup submodule' '
- git checkout -f master &&
+ git checkout -f main &&
mkdir sub &&
(
cd sub &&
@@ -290,17 +293,17 @@
test_expect_success 'submodule fast-export | fast-import' '
- SUBENT1=$(git ls-tree master^ sub) &&
- SUBENT2=$(git ls-tree master sub) &&
+ SUBENT1=$(git ls-tree main^ sub) &&
+ SUBENT2=$(git ls-tree main sub) &&
rm -rf new &&
mkdir new &&
git --git-dir=new/.git init &&
git fast-export --signed-tags=strip --all >actual &&
(cd new &&
git fast-import &&
- test "$SUBENT1" = "$(git ls-tree refs/heads/master^ sub)" &&
- test "$SUBENT2" = "$(git ls-tree refs/heads/master sub)" &&
- git checkout master &&
+ test "$SUBENT1" = "$(git ls-tree refs/heads/main^ sub)" &&
+ test "$SUBENT2" = "$(git ls-tree refs/heads/main sub)" &&
+ git checkout main &&
git submodule init &&
git submodule update &&
cmp sub/file ../sub/file) <actual
@@ -352,7 +355,7 @@
'
-test_expect_success 'fast-export | fast-import when master is tagged' '
+test_expect_success 'fast-export | fast-import when main is tagged' '
git tag -m msg last &&
git fast-export -C -C --signed-tags=strip --all > output &&
@@ -467,8 +470,8 @@
data 3
hi
-reset refs/heads/master
-commit refs/heads/master
+reset refs/heads/main
+commit refs/heads/main
mark :3
author A U Thor <author@example.com> 1112912713 -0700
committer C O Mitter <committer@example.com> 1112912713 -0700
@@ -482,7 +485,7 @@
test_expect_failure 'no exact-ref revisions included' '
(
cd limit-by-paths &&
- git fast-export master~2..master~1 > output &&
+ git fast-export main~2..main~1 > output &&
test_cmp expected output
)
'
@@ -524,7 +527,7 @@
'
test_expect_success 'set-up a few more tags for tag export tests' '
- git checkout -f master &&
+ git checkout -f main &&
HEAD_TREE=$(git show -s --pretty=raw HEAD | grep tree | sed "s/tree //") &&
git tag tree_tag -m "tagging a tree" $HEAD_TREE &&
git tag -a tree_tag-obj -m "tagging a tree" $HEAD_TREE &&
@@ -549,7 +552,7 @@
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 tag -a -m "Tag of a blob" blobtag $(git rev-parse main:file) &&
git fast-export blobtag >actual &&
cat >expect <<-EOF &&
blob
@@ -592,10 +595,10 @@
) &&
(
cd dirtosymlink &&
- git fast-export master -- foo |
+ git fast-export main -- foo |
(cd ../result && git fast-import --quiet)
) &&
- (cd result && git show master:foo)
+ (cd result && git show main:foo)
'
test_expect_success 'fast-export quotes pathnames' '
@@ -643,7 +646,7 @@
data 5
bump
-commit refs/heads/master
+commit refs/heads/main
mark :14
author A U Thor <author@example.com> 1112912773 -0700
committer C O Mitter <committer@example.com> 1112912773 -0700
@@ -657,18 +660,18 @@
test_expect_success 'avoid uninteresting refs' '
> tmp-marks &&
git fast-export --import-marks=tmp-marks \
- --export-marks=tmp-marks master > /dev/null &&
+ --export-marks=tmp-marks main > /dev/null &&
git tag v1.0 &&
git branch uninteresting &&
echo bump > file &&
git commit -a -m bump &&
git fast-export --import-marks=tmp-marks \
- --export-marks=tmp-marks ^uninteresting ^v1.0 master > actual &&
+ --export-marks=tmp-marks ^uninteresting ^v1.0 main > actual &&
test_cmp expected actual
'
cat > expected << EOF
-reset refs/heads/master
+reset refs/heads/main
from :14
EOF
@@ -676,14 +679,14 @@
test_expect_success 'refs are updated even if no commits need to be exported' '
> tmp-marks &&
git fast-export --import-marks=tmp-marks \
- --export-marks=tmp-marks master > /dev/null &&
+ --export-marks=tmp-marks main > /dev/null &&
git fast-export --import-marks=tmp-marks \
- --export-marks=tmp-marks master > actual &&
+ --export-marks=tmp-marks main > actual &&
test_cmp expected actual
'
test_expect_success 'use refspec' '
- git fast-export --refspec refs/heads/master:refs/heads/foobar master >actual2 &&
+ git fast-export --refspec refs/heads/main:refs/heads/foobar main >actual2 &&
grep "^commit " actual2 | sort | uniq >actual &&
echo "commit refs/heads/foobar" > expected &&
test_cmp expected actual
@@ -694,7 +697,7 @@
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
@@ -704,7 +707,7 @@
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
@@ -736,13 +739,13 @@
test_commit initial &&
git checkout -b topic &&
test_commit on-topic &&
- git checkout master &&
- test_commit on-master &&
+ git checkout main &&
+ test_commit on-main &&
test_tick &&
git merge --no-ff -m Yeah topic &&
echo ":1 $(git rev-parse HEAD^^)" >marks &&
- git fast-export --import-marks=marks master >out &&
+ git fast-export --import-marks=marks main >out &&
grep Yeah out
)
'
diff --git a/t/t9351-fast-export-anonymize.sh b/t/t9351-fast-export-anonymize.sh
index 897dc50..1c6e6fc 100755
--- a/t/t9351-fast-export-anonymize.sh
+++ b/t/t9351-fast-export-anonymize.sh
@@ -1,20 +1,32 @@
#!/bin/sh
test_description='basic tests for fast-export --anonymize'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
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 +38,23 @@
! 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 main stream &&
! grep mytag stream
'
@@ -57,42 +80,44 @@
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' '
shape () {
git log --format="%m %ct" --left-right --boundary "$@"
} &&
- (cd .. && shape master...other) >expect &&
- shape master...$other_branch >actual &&
+ (cd .. && shape main...other) >expect &&
+ 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/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
index a5e5dca..2d29d48 100755
--- a/t/t9400-git-cvsserver-server.sh
+++ b/t/t9400-git-cvsserver-server.sh
@@ -8,6 +8,9 @@
tests read access to a git repository with the
cvs CLI client via git-cvsserver server'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
if ! test_have_prereq PERL; then
@@ -45,7 +48,7 @@
touch secondrootfile &&
git add secondrootfile &&
git commit -m "second root") &&
- git fetch secondroot master &&
+ git fetch secondroot main &&
git merge --allow-unrelated-histories FETCH_HEAD &&
git clone -q --bare "$WORKDIR/.git" "$SERVERDIR" >/dev/null 2>&1 &&
GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
@@ -57,7 +60,7 @@
# note that cvs doesn't accept absolute pathnames
# as argument to co -d
test_expect_success 'basic checkout' \
- 'GIT_CONFIG="$git_config" cvs -Q co -d cvswork master &&
+ 'GIT_CONFIG="$git_config" cvs -Q co -d cvswork main &&
test "$(echo $(grep -v ^D cvswork/CVS/Entries|cut -d/ -f2,3,5 | head -n 1))" = "empty/1.1/" &&
test "$(echo $(grep -v ^D cvswork/CVS/Entries|cut -d/ -f2,3,5 | sed -ne \$p))" = "secondrootfile/1.1/"'
@@ -226,7 +229,7 @@
test_expect_success 'gitcvs.enabled = false' \
'GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled false &&
- if GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1
+ if GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1
then
echo unexpected cvs success
false
@@ -240,14 +243,14 @@
test_expect_success 'gitcvs.ext.enabled = true' \
'GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled false &&
- GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1 &&
+ GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1 &&
test_cmp cvswork cvswork2'
rm -fr cvswork2
test_expect_success 'gitcvs.ext.enabled = false' \
'GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled false &&
GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
- if GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1
+ if GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1
then
echo unexpected cvs success
false
@@ -261,21 +264,21 @@
test_expect_success 'gitcvs.dbname' \
'GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
GIT_DIR="$SERVERDIR" git config gitcvs.dbname %Ggitcvs.%a.%m.sqlite &&
- GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1 &&
+ GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1 &&
test_cmp cvswork cvswork2 &&
- test -f "$SERVERDIR/gitcvs.ext.master.sqlite" &&
- cmp "$SERVERDIR/gitcvs.master.sqlite" "$SERVERDIR/gitcvs.ext.master.sqlite"'
+ test -f "$SERVERDIR/gitcvs.ext.main.sqlite" &&
+ cmp "$SERVERDIR/gitcvs.main.sqlite" "$SERVERDIR/gitcvs.ext.main.sqlite"'
rm -fr cvswork2
test_expect_success 'gitcvs.ext.dbname' \
'GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
GIT_DIR="$SERVERDIR" git config gitcvs.ext.dbname %Ggitcvs1.%a.%m.sqlite &&
GIT_DIR="$SERVERDIR" git config gitcvs.dbname %Ggitcvs2.%a.%m.sqlite &&
- GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1 &&
+ GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1 &&
test_cmp cvswork cvswork2 &&
- test -f "$SERVERDIR/gitcvs1.ext.master.sqlite" &&
- test ! -f "$SERVERDIR/gitcvs2.ext.master.sqlite" &&
- cmp "$SERVERDIR/gitcvs.master.sqlite" "$SERVERDIR/gitcvs1.ext.master.sqlite"'
+ test -f "$SERVERDIR/gitcvs1.ext.main.sqlite" &&
+ test ! -f "$SERVERDIR/gitcvs2.ext.main.sqlite" &&
+ cmp "$SERVERDIR/gitcvs.main.sqlite" "$SERVERDIR/gitcvs1.ext.main.sqlite"'
#------------
@@ -457,7 +460,7 @@
test_expect_success 'cvs update (module list supports packed refs)' '
GIT_DIR="$SERVERDIR" git pack-refs --all &&
GIT_CONFIG="$git_config" cvs -n up -d 2> out &&
- grep "cvs update: New directory \`master'\''" < out
+ grep "cvs update: New directory \`main'\''" < out
'
#------------
@@ -499,8 +502,8 @@
cd "$WORKDIR"
test_expect_success 'cvs co -c (shows module database)' '
GIT_CONFIG="$git_config" cvs co -c > out &&
- grep "^master[ ][ ]*master$" <out &&
- ! grep -v "^master[ ][ ]*master$" <out
+ grep "^main[ ][ ]*main$" <out &&
+ ! grep -v "^main[ ][ ]*main$" <out
'
#------------
@@ -526,7 +529,7 @@
sed -e 's/^x//' -e 's/SP$/ /' > "$WORKDIR/expect" <<EOF
x
-xRCS file: $WORKDIR/gitcvs.git/master/merge,v
+xRCS file: $WORKDIR/gitcvs.git/main/merge,v
xWorking file: merge
xhead: 1.4
xbranch:
@@ -603,7 +606,7 @@
cd cvswork &&
CVS_SERVER=$WORKDIR/remote-cvs &&
export CVS_SERVER &&
- test_must_fail cvs log merge
+ ! cvs log merge
)
'
diff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh
index 84787ee..a34805a 100755
--- a/t/t9401-git-cvsserver-crlf.sh
+++ b/t/t9401-git-cvsserver-crlf.sh
@@ -9,6 +9,9 @@
tests -kb mode for binary files when accessing a git
repository using cvs CLI client via git-cvsserver server'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
marked_as () {
@@ -105,14 +108,14 @@
'
test_expect_success 'cvs co (default crlf)' '
- GIT_CONFIG="$git_config" cvs -Q co -d cvswork master >cvs.log 2>&1 &&
+ GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
test x"$(grep '/-k' cvswork/CVS/Entries cvswork/subdir/CVS/Entries)" = x""
'
rm -rf cvswork
test_expect_success 'cvs co (allbinary)' '
GIT_DIR="$SERVERDIR" git config --bool gitcvs.allbinary true &&
- GIT_CONFIG="$git_config" cvs -Q co -d cvswork master >cvs.log 2>&1 &&
+ GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
marked_as cvswork textfile.c -kb &&
marked_as cvswork binfile.bin -kb &&
marked_as cvswork .gitattributes -kb &&
@@ -125,7 +128,7 @@
rm -rf cvswork cvs.log
test_expect_success 'cvs co (use attributes/allbinary)' '
GIT_DIR="$SERVERDIR" git config --bool gitcvs.usecrlfattr true &&
- GIT_CONFIG="$git_config" cvs -Q co -d cvswork master >cvs.log 2>&1 &&
+ GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
marked_as cvswork textfile.c "" &&
marked_as cvswork binfile.bin -kb &&
marked_as cvswork .gitattributes -kb &&
@@ -138,7 +141,7 @@
rm -rf cvswork
test_expect_success 'cvs co (use attributes)' '
GIT_DIR="$SERVERDIR" git config --bool gitcvs.allbinary false &&
- GIT_CONFIG="$git_config" cvs -Q co -d cvswork master >cvs.log 2>&1 &&
+ GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
marked_as cvswork textfile.c "" &&
marked_as cvswork binfile.bin -kb &&
marked_as cvswork .gitattributes "" &&
@@ -167,10 +170,10 @@
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 &&
@@ -194,7 +197,7 @@
rm -rf cvswork
test_expect_success 'cvs co (use attributes/guess)' '
GIT_DIR="$SERVERDIR" git config gitcvs.allbinary guess &&
- GIT_CONFIG="$git_config" cvs -Q co -d cvswork master >cvs.log 2>&1 &&
+ GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
marked_as cvswork textfile.c "" &&
marked_as cvswork binfile.bin -kb &&
marked_as cvswork .gitattributes "" &&
@@ -224,7 +227,7 @@
rm -rf cvswork
test_expect_success 'cvs co (guess)' '
GIT_DIR="$SERVERDIR" git config --bool gitcvs.usecrlfattr false &&
- GIT_CONFIG="$git_config" cvs -Q co -d cvswork master >cvs.log 2>&1 &&
+ GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
marked_as cvswork textfile.c "" &&
marked_as cvswork binfile.bin -kb &&
marked_as cvswork .gitattributes "" &&
@@ -239,7 +242,7 @@
'
test_expect_success 'cvs co another copy (guess)' '
- GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1 &&
+ GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1 &&
marked_as cvswork2 textfile.c "" &&
marked_as cvswork2 binfile.bin -kb &&
marked_as cvswork2 .gitattributes "" &&
@@ -335,7 +338,7 @@
echo "starting update/merge" >> "${WORKDIR}/marked.log"
test_expect_success 'update/merge full other copy (guess)' '
- git pull gitcvs.git master &&
+ git pull gitcvs.git main &&
sed "s/3/replaced_3/" < multilineTxt.c > ml.temp &&
mv ml.temp multilineTxt.c &&
git add multilineTxt.c &&
diff --git a/t/t9402-git-cvsserver-refs.sh b/t/t9402-git-cvsserver-refs.sh
index cf31ace..2ee41f9 100755
--- a/t/t9402-git-cvsserver-refs.sh
+++ b/t/t9402-git-cvsserver-refs.sh
@@ -5,6 +5,9 @@
tests ability for git-cvsserver to switch between and compare
tags, branches and other git refspecs'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./test-lib.sh
#########
@@ -115,7 +118,7 @@
rm -rf cvswork
test_expect_success 'cvs co v1' '
- cvs -f -Q co -r v1 -d cvswork master >cvs.log 2>&1 &&
+ cvs -f -Q co -r v1 -d cvswork main >cvs.log 2>&1 &&
check_start_tree cvswork &&
check_file cvswork textfile.c v1 &&
check_file cvswork t2 v1 &&
@@ -128,7 +131,7 @@
rm -rf cvswork
test_expect_success 'cvs co b1' '
- cvs -f co -r b1 -d cvswork master >cvs.log 2>&1 &&
+ cvs -f co -r b1 -d cvswork main >cvs.log 2>&1 &&
check_start_tree cvswork &&
check_file cvswork textfile.c v1 &&
check_file cvswork t2 v1 &&
@@ -140,7 +143,7 @@
'
test_expect_success 'cvs co b1 [cvswork3]' '
- cvs -f co -r b1 -d cvswork3 master >cvs.log 2>&1 &&
+ cvs -f co -r b1 -d cvswork3 main >cvs.log 2>&1 &&
check_start_tree cvswork3 &&
check_file cvswork3 textfile.c v1 &&
check_file cvswork3 t2 v1 &&
@@ -178,7 +181,7 @@
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
'
@@ -265,7 +268,7 @@
'
test_expect_success 'cvs co b2 [into cvswork2]' '
- cvs -f co -r b2 -d cvswork2 master >cvs.log 2>&1 &&
+ cvs -f co -r b2 -d cvswork2 main >cvs.log 2>&1 &&
check_start_tree cvswork &&
check_file cvswork textfile.c v1 &&
check_file cvswork t2 v1 &&
diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh
index cc8d463..0333065 100755
--- a/t/t9500-gitweb-standalone-no-errors.sh
+++ b/t/t9500-gitweb-standalone-no-errors.sh
@@ -10,7 +10,10 @@
or warnings to log.'
-. ./gitweb-lib.sh
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./lib-gitweb.sh
# ----------------------------------------------------------------------
# no commits (empty, just initialized repository)
@@ -53,7 +56,7 @@
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 +142,7 @@
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 +182,7 @@
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 +200,14 @@
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 +216,8 @@
# 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 +226,18 @@
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,10 +327,10 @@
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 &&
+ git checkout main &&
git merge b &&
git tag merge_commit'
@@ -342,29 +345,29 @@
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'
+ git checkout main'
test_expect_success \
'commit(1): large commit' \
@@ -402,7 +405,7 @@
test_expect_success \
'tags: list of different types of tags' \
- 'git checkout master &&
+ 'git checkout main &&
git tag -a -m "Tag commit object" tag-commit HEAD &&
git tag -a -m "" tag-commit-nomessage HEAD &&
git tag -a -m "Tag tag object" tag-tag tag-commit &&
@@ -443,8 +446,8 @@
test_expect_success \
'logs: history (implicit HEAD, deleted file)' \
- 'git checkout master &&
- echo "to be deleted" > deleted_file &&
+ 'git checkout main &&
+ echo "to be deleted" >deleted_file &&
git add deleted_file &&
git commit -m "Add file to be deleted" &&
git rm deleted_file &&
@@ -463,11 +466,11 @@
test_expect_success \
'path_info: project/branch:file' \
- 'gitweb_run "" "/.git/master:file"'
+ 'gitweb_run "" "/.git/main:file"'
test_expect_success \
'path_info: project/branch:dir/' \
- 'gitweb_run "" "/.git/master:foo/"'
+ 'gitweb_run "" "/.git/main:foo/"'
test_expect_success \
'path_info: project/branch (non-existent)' \
@@ -479,16 +482,16 @@
test_expect_success \
'path_info: project/branch:file (non-existent)' \
- 'gitweb_run "" "/.git/master:non-existent"'
+ 'gitweb_run "" "/.git/main:non-existent"'
test_expect_success \
'path_info: project/branch:dir/ (non-existent)' \
- 'gitweb_run "" "/.git/master:non-existent/"'
+ 'gitweb_run "" "/.git/main:non-existent/"'
test_expect_success \
'path_info: project/branch:/file' \
- 'gitweb_run "" "/.git/master:/file"'
+ 'gitweb_run "" "/.git/main:/file"'
test_expect_success \
'path_info: project/:/file (implicit HEAD)' \
@@ -522,7 +525,7 @@
'. "$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 +535,7 @@
'. "$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 +624,22 @@
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 +688,8 @@
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 +717,7 @@
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 +725,7 @@
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 +742,11 @@
'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 +767,8 @@
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 +782,8 @@
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'
@@ -791,7 +804,7 @@
git checkout orphan_branch ||
git checkout --orphan orphan_branch
} &&
- test_when_finished "git checkout master" &&
+ test_when_finished "git checkout main" &&
gitweb_run "p=.git;a=summary"'
test_done
diff --git a/t/t9501-gitweb-standalone-http-status.sh b/t/t9501-gitweb-standalone-http-status.sh
index 2a0ffed..32814e7 100755
--- a/t/t9501-gitweb-standalone-http-status.sh
+++ b/t/t9501-gitweb-standalone-http-status.sh
@@ -10,7 +10,10 @@
code and message.'
-. ./gitweb-lib.sh
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./lib-gitweb.sh
#
# Gitweb only provides the functionality tested by the 'modification times'
@@ -85,7 +88,7 @@
# snapshot hash ids
test_expect_success 'snapshots: good tree-ish id' '
- gitweb_run "p=.git;a=snapshot;h=master;sf=tgz" &&
+ gitweb_run "p=.git;a=snapshot;h=main;sf=tgz" &&
grep "Status: 200 OK" gitweb.output
'
test_debug 'cat gitweb.headers'
@@ -123,7 +126,7 @@
# modification times (Last-Modified and If-Modified-Since)
test_expect_success DATE_PARSER 'modification: feed last-modified' '
- gitweb_run "p=.git;a=atom;h=master" &&
+ gitweb_run "p=.git;a=atom;h=main" &&
grep "Status: 200 OK" gitweb.headers &&
grep "Last-modified: Thu, 7 Apr 2005 22:14:13 +0000" gitweb.headers
'
@@ -133,7 +136,7 @@
HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" &&
export HTTP_IF_MODIFIED_SINCE &&
test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
- gitweb_run "p=.git;a=atom;h=master" &&
+ gitweb_run "p=.git;a=atom;h=main" &&
grep "Status: 200 OK" gitweb.headers
'
test_debug 'cat gitweb.headers'
@@ -142,13 +145,13 @@
HTTP_IF_MODIFIED_SINCE="Thu, 7 Apr 2005 22:14:13 +0000" &&
export HTTP_IF_MODIFIED_SINCE &&
test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
- gitweb_run "p=.git;a=atom;h=master" &&
+ gitweb_run "p=.git;a=atom;h=main" &&
grep "Status: 304 Not Modified" gitweb.headers
'
test_debug 'cat gitweb.headers'
test_expect_success DATE_PARSER 'modification: snapshot last-modified' '
- gitweb_run "p=.git;a=snapshot;h=master;sf=tgz" &&
+ gitweb_run "p=.git;a=snapshot;h=main;sf=tgz" &&
grep "Status: 200 OK" gitweb.headers &&
grep "Last-modified: Thu, 7 Apr 2005 22:14:13 +0000" gitweb.headers
'
@@ -158,7 +161,7 @@
HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" &&
export HTTP_IF_MODIFIED_SINCE &&
test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
- gitweb_run "p=.git;a=snapshot;h=master;sf=tgz" &&
+ gitweb_run "p=.git;a=snapshot;h=main;sf=tgz" &&
grep "Status: 200 OK" gitweb.headers
'
test_debug 'cat gitweb.headers'
@@ -167,7 +170,7 @@
HTTP_IF_MODIFIED_SINCE="Thu, 7 Apr 2005 22:14:13 +0000" &&
export HTTP_IF_MODIFIED_SINCE &&
test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
- gitweb_run "p=.git;a=snapshot;h=master;sf=tgz" &&
+ gitweb_run "p=.git;a=snapshot;h=main;sf=tgz" &&
grep "Status: 304 Not Modified" gitweb.headers
'
test_debug 'cat gitweb.headers'
diff --git a/t/t9502-gitweb-standalone-parse-output.sh b/t/t9502-gitweb-standalone-parse-output.sh
index e38cbc9..3167473 100755
--- a/t/t9502-gitweb-standalone-parse-output.sh
+++ b/t/t9502-gitweb-standalone-parse-output.sh
@@ -10,7 +10,10 @@
in the HTTP header or the actual script output.'
-. ./gitweb-lib.sh
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./lib-gitweb.sh
# ----------------------------------------------------------------------
# snapshot file name and prefix
@@ -79,10 +82,10 @@
'
test_debug 'cat gitweb.headers && cat file_list'
-test_expect_success 'snapshot: short branch name (master)' '
- gitweb_run "p=.git;a=snapshot;h=master;sf=tar" &&
- ID=$(git rev-parse --verify --short=7 master) &&
- check_snapshot ".git-master-$ID"
+test_expect_success 'snapshot: short branch name (main)' '
+ gitweb_run "p=.git;a=snapshot;h=main;sf=tar" &&
+ ID=$(git rev-parse --verify --short=7 main) &&
+ check_snapshot ".git-main-$ID"
'
test_debug 'cat gitweb.headers && cat file_list'
@@ -93,10 +96,10 @@
'
test_debug 'cat gitweb.headers && cat file_list'
-test_expect_success 'snapshot: full branch name (refs/heads/master)' '
- gitweb_run "p=.git;a=snapshot;h=refs/heads/master;sf=tar" &&
- ID=$(git rev-parse --verify --short=7 master) &&
- check_snapshot ".git-master-$ID"
+test_expect_success 'snapshot: full branch name (refs/heads/main)' '
+ gitweb_run "p=.git;a=snapshot;h=refs/heads/main;sf=tar" &&
+ ID=$(git rev-parse --verify --short=7 main) &&
+ check_snapshot ".git-main-$ID"
'
test_debug 'cat gitweb.headers && cat file_list'
diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
index 251fdd6..5680849 100755
--- a/t/t9600-cvsimport.sh
+++ b/t/t9600-cvsimport.sh
@@ -1,6 +1,9 @@
#!/bin/sh
test_description='git cvsimport basic tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./lib-cvs.sh
if ! test_have_prereq NOT_ROOT; then
@@ -159,6 +162,6 @@
'
-test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master'
+test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree main'
test_done
diff --git a/t/t9601-cvsimport-vendor-branch.sh b/t/t9601-cvsimport-vendor-branch.sh
index 827d39f..116cddb 100755
--- a/t/t9601-cvsimport-vendor-branch.sh
+++ b/t/t9601-cvsimport-vendor-branch.sh
@@ -32,6 +32,9 @@
# tag has been removed.
test_description='git cvsimport handling of vendor branches'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./lib-cvs.sh
setup_cvs_test_repository t9601
@@ -42,43 +45,43 @@
'
-test_expect_success PERL 'check HEAD out of cvs repository' 'test_cvs_co master'
+test_expect_success PERL 'check HEAD out of cvs repository' 'test_cvs_co main'
-test_expect_success PERL 'check master out of git repository' 'test_git_co master'
+test_expect_success PERL 'check main out of git repository' 'test_git_co main'
test_expect_success PERL 'check a file that was imported once' '
- test_cmp_branch_file master imported-once.txt
+ test_cmp_branch_file main imported-once.txt
'
test_expect_failure PERL 'check a file that was imported twice' '
- test_cmp_branch_file master imported-twice.txt
+ test_cmp_branch_file main imported-twice.txt
'
test_expect_success PERL 'check a file that was imported then modified on HEAD' '
- test_cmp_branch_file master imported-modified.txt
+ test_cmp_branch_file main imported-modified.txt
'
test_expect_success PERL 'check a file that was imported, modified, then imported again' '
- test_cmp_branch_file master imported-modified-imported.txt
+ test_cmp_branch_file main imported-modified-imported.txt
'
test_expect_success PERL 'check a file that was added to HEAD then imported' '
- test_cmp_branch_file master added-imported.txt
+ test_cmp_branch_file main added-imported.txt
'
test_expect_success PERL 'a vendor branch whose tag has been removed' '
- test_cmp_branch_file master imported-anonymously.txt
+ test_cmp_branch_file main imported-anonymously.txt
'
diff --git a/t/t9602-cvsimport-branches-tags.sh b/t/t9602-cvsimport-branches-tags.sh
index e1db323..e5266c9 100755
--- a/t/t9602-cvsimport-branches-tags.sh
+++ b/t/t9602-cvsimport-branches-tags.sh
@@ -4,6 +4,9 @@
# t9602/README.
test_description='git cvsimport handling of branches and tags'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./lib-cvs.sh
setup_cvs_test_repository t9602
@@ -14,9 +17,9 @@
'
-test_expect_success PERL 'test branch master' '
+test_expect_success PERL 'test branch main' '
- test_cmp_branch_tree master
+ test_cmp_branch_tree main
'
diff --git a/t/t9603-cvsimport-patchsets.sh b/t/t9603-cvsimport-patchsets.sh
index 3e64b11..0e9daa5 100755
--- a/t/t9603-cvsimport-patchsets.sh
+++ b/t/t9603-cvsimport-patchsets.sh
@@ -12,28 +12,31 @@
# bug.
test_description='git cvsimport testing for correct patchset estimation'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./lib-cvs.sh
setup_cvs_test_repository t9603
test_expect_failure PERL 'import with criss cross times on revisions' '
-
- git cvsimport -p"-x" -C module-git module &&
- (cd module-git &&
- git log --pretty=format:%s > ../actual-master &&
- git log A~2..A --pretty="format:%s %ad" -- > ../actual-A &&
- echo "" >> ../actual-master &&
- echo "" >> ../actual-A
- ) &&
- echo "Rev 4
+ git cvsimport -p"-x" -C module-git module &&
+ (
+ cd module-git &&
+ git log --pretty=format:%s > ../actual-main &&
+ git log A~2..A --pretty="format:%s %ad" -- > ../actual-A &&
+ echo "" >> ../actual-main &&
+ echo "" >> ../actual-A
+ ) &&
+ echo "Rev 4
Rev 3
Rev 2
-Rev 1" > expect-master &&
- test_cmp expect-master actual-master &&
+Rev 1" > expect-main &&
+ test_cmp expect-main actual-main &&
- echo "Rev 5 Branch A Wed Mar 11 19:09:10 2009 +0000
+ echo "Rev 5 Branch A Wed Mar 11 19:09:10 2009 +0000
Rev 4 Branch A Wed Mar 11 19:03:52 2009 +0000" > expect-A &&
- test_cmp expect-A actual-A
+ test_cmp expect-A actual-A
'
test_done
diff --git a/t/t9700/test.pl b/t/t9700/test.pl
index 34cd013..e046f7d 100755
--- a/t/t9700/test.pl
+++ b/t/t9700/test.pl
@@ -23,6 +23,8 @@
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 @@
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 @@
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 @@
# 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/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh
index c98c1df..81bc8e8 100755
--- a/t/t9800-git-p4-basic.sh
+++ b/t/t9800-git-p4-basic.sh
@@ -2,6 +2,9 @@
test_description='git p4 tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./lib-git-p4.sh
test_expect_success 'start p4d' '
@@ -226,7 +229,7 @@
git config --get --bool core.bare true &&
git rev-parse --verify refs/remotes/p4/master &&
git rev-parse --verify refs/remotes/p4/HEAD &&
- git rev-parse --verify refs/heads/master &&
+ git rev-parse --verify refs/heads/main &&
git rev-parse --verify HEAD
)
'
diff --git a/t/t9801-git-p4-branch.sh b/t/t9801-git-p4-branch.sh
index 67ff271..56e6469 100755
--- a/t/t9801-git-p4-branch.sh
+++ b/t/t9801-git-p4-branch.sh
@@ -2,6 +2,9 @@
test_description='git p4 tests for p4 branches'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./lib-git-p4.sh
test_expect_success 'start p4d' '
@@ -67,7 +70,7 @@
(
cd "$git" &&
git log --oneline --graph --decorate --all &&
- git rev-list master >wc &&
+ git rev-list main -- >wc &&
test_line_count = 4 wc
)
'
@@ -78,7 +81,7 @@
(
cd "$git" &&
git log --oneline --graph --decorate --all &&
- git rev-list master >wc &&
+ git rev-list main -- >wc &&
test_line_count = 2 wc
)
'
@@ -89,7 +92,7 @@
(
cd "$git" &&
git log --oneline --graph --decorate --all &&
- git rev-list master >wc &&
+ git rev-list main -- >wc &&
test_line_count = 2 wc
)
'
@@ -100,7 +103,7 @@
(
cd "$git" &&
git log --oneline --graph --decorate --all &&
- git rev-list master >wc &&
+ git rev-list main -- >wc &&
test_line_count = 8 wc
)
'
@@ -114,7 +117,7 @@
git log --oneline --graph --decorate --all &&
# 4 main commits
- git rev-list master >wc &&
+ git rev-list main -- >wc &&
test_line_count = 4 wc &&
# 3 main, 1 integrate, 1 on branch2
@@ -137,7 +140,7 @@
git log --oneline --graph --decorate --all &&
# 4 main commits
- git rev-list master >wc &&
+ git rev-list main -- >wc &&
test_line_count = 4 wc &&
# 3 main, 1 integrate, 1 on branch2
@@ -484,7 +487,7 @@
(
cd "$git" &&
git p4 sync --detect-branches --use-client-spec //depot/usecs@all &&
- git checkout -b master p4/usecs/b1 &&
+ git checkout -b main p4/usecs/b1 &&
test_path_is_file b1-file1 &&
test_path_is_missing b2-file2 &&
test_path_is_missing b1 &&
@@ -537,7 +540,7 @@
(
cd "$git" &&
git p4 sync --detect-branches --use-client-spec //depot/usecs@all &&
- git checkout -b master p4/usecs/b3 &&
+ git checkout -b main p4/usecs/b3 &&
test_path_is_file b1-file1 &&
test_path_is_file b3-file3_2 &&
test_path_is_missing b3-file3_1
diff --git a/t/t9806-git-p4-options.sh b/t/t9806-git-p4-options.sh
index 4e794a0..c26d297 100755
--- a/t/t9806-git-p4-options.sh
+++ b/t/t9806-git-p4-options.sh
@@ -2,6 +2,9 @@
test_description='git p4 options'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./lib-git-p4.sh
test_expect_success 'start p4d' '
@@ -27,14 +30,14 @@
test_must_fail git p4 clone --git-dir=xx //depot
'
-test_expect_success 'clone --branch should checkout master' '
+test_expect_success 'clone --branch should checkout main' '
git p4 clone --branch=refs/remotes/p4/sb --dest="$git" //depot &&
test_when_finished cleanup_git &&
(
cd "$git" &&
git rev-parse refs/remotes/p4/sb >sb &&
- git rev-parse refs/heads/master >master &&
- test_cmp sb master &&
+ git rev-parse refs/heads/main >main &&
+ test_cmp sb main &&
git rev-parse HEAD >head &&
test_cmp sb head
)
@@ -147,22 +150,22 @@
test_must_fail git p4 clone --changesfile="$TRASH_DIRECTORY/cf" --dest="$git" //depot@all
'
-# imports both master and p4/master in refs/heads
+# imports both main and p4/master in refs/heads
# requires --import-local on sync to find p4 refs/heads
-# does not update master on sync, just p4/master
+# does not update main on sync, just p4/master
test_expect_success 'clone/sync --import-local' '
git p4 clone --import-local --dest="$git" //depot@1,2 &&
test_when_finished cleanup_git &&
(
cd "$git" &&
- git log --oneline refs/heads/master >lines &&
+ git log --oneline refs/heads/main >lines &&
test_line_count = 2 lines &&
git log --oneline refs/heads/p4/master >lines &&
test_line_count = 2 lines &&
test_must_fail git p4 sync &&
git p4 sync --import-local &&
- git log --oneline refs/heads/master >lines &&
+ git log --oneline refs/heads/main >lines &&
test_line_count = 2 lines &&
git log --oneline refs/heads/p4/master >lines &&
test_line_count = 3 lines
@@ -174,7 +177,7 @@
test_when_finished cleanup_git &&
(
cd "$git" &&
- git log --oneline refs/heads/master >lines &&
+ git log --oneline refs/heads/main >lines &&
test_line_count = 2 lines
)
'
@@ -237,7 +240,7 @@
git init &&
git config git-p4.useClientSpec true &&
git p4 sync //depot/... &&
- git checkout -b master p4/master &&
+ git checkout -b main p4/master &&
test_path_is_file bus/dir/f4 &&
test_path_is_missing file1
)
diff --git a/t/t9807-git-p4-submit.sh b/t/t9807-git-p4-submit.sh
index eaaae41..7d4109f 100755
--- a/t/t9807-git-p4-submit.sh
+++ b/t/t9807-git-p4-submit.sh
@@ -2,6 +2,9 @@
test_description='git p4 submit'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./lib-git-p4.sh
test_expect_success 'start p4d' '
@@ -114,7 +117,7 @@
git config git-p4.skipSubmitEdit true &&
git config git-p4.allowSubmit "nobranch" &&
test_must_fail git p4 submit &&
- git config git-p4.allowSubmit "nobranch,master" &&
+ git config git-p4.allowSubmit "nobranch,main" &&
git p4 submit
)
'
diff --git a/t/t9811-git-p4-label-import.sh b/t/t9811-git-p4-label-import.sh
index c1446f2..5ac5383 100755
--- a/t/t9811-git-p4-label-import.sh
+++ b/t/t9811-git-p4-label-import.sh
@@ -2,6 +2,9 @@
test_description='git p4 label tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./lib-git-p4.sh
test_expect_success 'start p4d' '
@@ -185,7 +188,7 @@
git add main/f12 &&
git commit -m "adding f12" &&
git tag -m "tag on a_branch" GIT_TAG_ON_A_BRANCH &&
- git checkout master &&
+ git checkout main &&
git p4 submit --export-labels
) &&
(
diff --git a/t/t9819-git-p4-case-folding.sh b/t/t9819-git-p4-case-folding.sh
index 600ce1e..b4d93f0 100755
--- a/t/t9819-git-p4-case-folding.sh
+++ b/t/t9819-git-p4-case-folding.sh
@@ -30,7 +30,7 @@
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/t/t9831-git-p4-triggers.sh b/t/t9831-git-p4-triggers.sh
index d743ca3..ff6c035 100755
--- a/t/t9831-git-p4-triggers.sh
+++ b/t/t9831-git-p4-triggers.sh
@@ -58,7 +58,7 @@
(
cd "$git" &&
git p4 sync
- )&&
+ ) &&
(
p4 triggers -i <<-EOF
Triggers:
diff --git a/t/t9832-unshelve.sh b/t/t9832-unshelve.sh
index e9276c4..6b3cb04 100755
--- a/t/t9832-unshelve.sh
+++ b/t/t9832-unshelve.sh
@@ -29,8 +29,11 @@
)
'
+# 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' '
@@ -65,7 +68,8 @@
cd "$git" &&
change=$(last_shelved_change) &&
git p4 unshelve $change &&
- git show refs/remotes/p4-unshelved/$change | grep -q "Further description" &&
+ git show refs/remotes/p4-unshelved/$change >actual &&
+ grep -q "Further description" actual &&
git cherry-pick refs/remotes/p4-unshelved/$change &&
test_path_is_file file2 &&
test_cmp file1 "$cli"/file1 &&
diff --git a/t/t9834-git-p4-file-dir-bug.sh b/t/t9834-git-p4-file-dir-bug.sh
new file mode 100755
index 0000000..dac67e8
--- /dev/null
+++ b/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/t/t9902-completion.sh b/t/t9902-completion.sh
index 5505e5a..04ce884 100755
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -1,10 +1,13 @@
#!/bin/sh
#
-# Copyright (c) 2012 Felipe Contreras
+# Copyright (c) 2012-2020 Felipe Contreras
#
test_description='test bash completion'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./lib-bash.sh
complete ()
@@ -136,7 +139,7 @@
test_expect_success 'setup for __git_find_repo_path/__gitdir tests' '
mkdir -p subdir/subsubdir &&
mkdir -p non-repo &&
- git init otherrepo
+ git init -b main otherrepo
'
test_expect_success '__git_find_repo_path - from command line (through $__git_dir)' '
@@ -494,7 +497,7 @@
'
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 +545,37 @@
'
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
'
@@ -614,12 +617,13 @@
test_expect_success 'setup for ref completion' '
git commit --allow-empty -m initial &&
+ git branch -M main &&
git branch matching-branch &&
git tag matching-tag &&
(
cd otherrepo &&
git commit --allow-empty -m initial &&
- git branch -m master master-in-other &&
+ git branch -m main main-in-other &&
git branch branch-in-other &&
git tag tag-in-other
) &&
@@ -632,10 +636,10 @@
test_expect_success '__git_refs - simple' '
cat >expected <<-EOF &&
HEAD
- master
+ main
matching-branch
other/branch-in-other
- other/master-in-other
+ other/main-in-other
matching-tag
EOF
(
@@ -647,10 +651,10 @@
test_expect_success '__git_refs - full refs' '
cat >expected <<-EOF &&
- refs/heads/master
+ refs/heads/main
refs/heads/matching-branch
refs/remotes/other/branch-in-other
- refs/remotes/other/master-in-other
+ refs/remotes/other/main-in-other
refs/tags/matching-tag
EOF
(
@@ -664,7 +668,7 @@
cat >expected <<-EOF &&
HEAD
branch-in-other
- master-in-other
+ main-in-other
tag-in-other
EOF
(
@@ -679,7 +683,7 @@
cat >expected <<-EOF &&
HEAD
branch-in-other
- master-in-other
+ main-in-other
tag-in-other
EOF
(
@@ -692,7 +696,7 @@
test_expect_success '__git_refs - remote on local file system - full refs' '
cat >expected <<-EOF &&
refs/heads/branch-in-other
- refs/heads/master-in-other
+ refs/heads/main-in-other
refs/tags/tag-in-other
EOF
(
@@ -706,7 +710,7 @@
cat >expected <<-EOF &&
HEAD
branch-in-other
- master-in-other
+ main-in-other
EOF
(
cur= &&
@@ -719,7 +723,7 @@
cat >expected <<-EOF &&
HEAD
refs/heads/branch-in-other
- refs/heads/master-in-other
+ refs/heads/main-in-other
refs/tags/tag-in-other
EOF
(
@@ -733,7 +737,7 @@
cat >expected <<-EOF &&
HEAD
branch-in-other
- master-in-other
+ main-in-other
EOF
(
cd thirdrepo &&
@@ -748,7 +752,7 @@
cat >expected <<-EOF &&
HEAD
refs/heads/branch-in-other
- refs/heads/master-in-other
+ refs/heads/main-in-other
refs/tags/tag-in-other
EOF
(
@@ -764,7 +768,7 @@
cat >expected <<-EOF &&
HEAD
branch-in-other
- master-in-other
+ main-in-other
EOF
mkdir other &&
test_when_finished "rm -rf other" &&
@@ -779,7 +783,7 @@
cat >expected <<-EOF &&
HEAD
branch-in-other
- master-in-other
+ main-in-other
tag-in-other
EOF
(
@@ -793,7 +797,7 @@
cat >expected <<-EOF &&
HEAD
refs/heads/branch-in-other
- refs/heads/master-in-other
+ refs/heads/main-in-other
refs/tags/tag-in-other
EOF
(
@@ -849,23 +853,23 @@
test_expect_success '__git_refs - unique remote branches for git checkout DWIMery' '
cat >expected <<-EOF &&
HEAD
- master
+ main
matching-branch
other/ambiguous
other/branch-in-other
- other/master-in-other
+ other/main-in-other
remote/ambiguous
remote/branch-in-remote
matching-tag
branch-in-other
branch-in-remote
- master-in-other
+ main-in-other
EOF
for remote_ref in refs/remotes/other/ambiguous \
refs/remotes/remote/ambiguous \
refs/remotes/remote/branch-in-remote
do
- git update-ref $remote_ref master &&
+ git update-ref $remote_ref main &&
test_when_finished "git update-ref -d $remote_ref"
done &&
(
@@ -878,10 +882,10 @@
test_expect_success '__git_refs - after --opt=' '
cat >expected <<-EOF &&
HEAD
- master
+ main
matching-branch
other/branch-in-other
- other/master-in-other
+ other/main-in-other
matching-tag
EOF
(
@@ -893,10 +897,10 @@
test_expect_success '__git_refs - after --opt= - full refs' '
cat >expected <<-EOF &&
- refs/heads/master
+ refs/heads/main
refs/heads/matching-branch
refs/remotes/other/branch-in-other
- refs/remotes/other/master-in-other
+ refs/remotes/other/main-in-other
refs/tags/matching-tag
EOF
(
@@ -906,13 +910,13 @@
test_cmp expected "$actual"
'
-test_expect_success '__git refs - exluding refs' '
+test_expect_success '__git refs - excluding refs' '
cat >expected <<-EOF &&
^HEAD
- ^master
+ ^main
^matching-branch
^other/branch-in-other
- ^other/master-in-other
+ ^other/main-in-other
^matching-tag
EOF
(
@@ -922,12 +926,12 @@
test_cmp expected "$actual"
'
-test_expect_success '__git refs - exluding full refs' '
+test_expect_success '__git refs - excluding full refs' '
cat >expected <<-EOF &&
- ^refs/heads/master
+ ^refs/heads/main
^refs/heads/matching-branch
^refs/remotes/other/branch-in-other
- ^refs/remotes/other/master-in-other
+ ^refs/remotes/other/main-in-other
^refs/tags/matching-tag
EOF
(
@@ -948,17 +952,17 @@
test_expect_success '__git_refs - do not filter refs unless told so' '
cat >expected <<-EOF &&
HEAD
- master
+ main
matching-branch
matching/branch
other/branch-in-other
- other/master-in-other
+ other/main-in-other
other/matching/branch-in-other
matching-tag
matching/tag
EOF
(
- cur=master &&
+ cur=main &&
__git_refs >"$actual"
) &&
test_cmp expected "$actual"
@@ -992,7 +996,7 @@
test_expect_success '__git_refs - only matching refs - remote on local file system' '
cat >expected <<-EOF &&
- master-in-other
+ main-in-other
matching/branch-in-other
EOF
(
@@ -1004,7 +1008,7 @@
test_expect_success '__git_refs - only matching refs - configured remote' '
cat >expected <<-EOF &&
- master-in-other
+ main-in-other
matching/branch-in-other
EOF
(
@@ -1016,7 +1020,7 @@
test_expect_success '__git_refs - only matching refs - remote - full refs' '
cat >expected <<-EOF &&
- refs/heads/master-in-other
+ refs/heads/main-in-other
refs/heads/matching/branch-in-other
EOF
(
@@ -1038,7 +1042,7 @@
refs/remotes/remote/ambiguous \
refs/remotes/remote/branch-in-remote
do
- git update-ref $remote_ref master &&
+ git update-ref $remote_ref main &&
test_when_finished "git update-ref -d $remote_ref"
done &&
(
@@ -1057,11 +1061,11 @@
test_expect_success '__git_refs - for-each-ref format specifiers in prefix' '
cat >expected <<-EOF &&
- evil-%%-%42-%(refname)..master
+ evil-%%-%42-%(refname)..main
EOF
(
- cur="evil-%%-%42-%(refname)..mas" &&
- __git_refs "" "" "evil-%%-%42-%(refname).." mas >"$actual"
+ cur="evil-%%-%42-%(refname)..mai" &&
+ __git_refs "" "" "evil-%%-%42-%(refname).." mai >"$actual"
) &&
test_cmp expected "$actual"
'
@@ -1069,10 +1073,10 @@
test_expect_success '__git_complete_refs - simple' '
sed -e "s/Z$//" >expected <<-EOF &&
HEAD Z
- master Z
+ main Z
matching-branch Z
other/branch-in-other Z
- other/master-in-other Z
+ other/main-in-other Z
matching-tag Z
EOF
(
@@ -1100,7 +1104,7 @@
sed -e "s/Z$//" >expected <<-EOF &&
HEAD Z
branch-in-other Z
- master-in-other Z
+ main-in-other Z
EOF
(
cur= &&
@@ -1113,13 +1117,13 @@
test_expect_success '__git_complete_refs - track' '
sed -e "s/Z$//" >expected <<-EOF &&
HEAD Z
- master Z
+ main Z
matching-branch Z
other/branch-in-other Z
- other/master-in-other Z
+ other/main-in-other Z
matching-tag Z
branch-in-other Z
- master-in-other Z
+ main-in-other Z
EOF
(
cur= &&
@@ -1158,10 +1162,10 @@
test_expect_success '__git_complete_refs - suffix' '
cat >expected <<-EOF &&
HEAD.
- master.
+ main.
matching-branch.
other/branch-in-other.
- other/master-in-other.
+ other/main-in-other.
matching-tag.
EOF
(
@@ -1176,7 +1180,7 @@
sed -e "s/Z$//" >expected <<-EOF &&
HEAD:HEAD Z
branch-in-other:branch-in-other Z
- master-in-other:master-in-other Z
+ main-in-other:main-in-other Z
EOF
(
cur= &&
@@ -1202,7 +1206,7 @@
sed -e "s/Z$//" >expected <<-EOF &&
+HEAD:HEAD Z
+branch-in-other:branch-in-other Z
- +master-in-other:master-in-other Z
+ +main-in-other:main-in-other Z
EOF
(
cur="+" &&
@@ -1215,7 +1219,7 @@
test_expect_success '__git_complete_fetch_refspecs - fully qualified' '
sed -e "s/Z$//" >expected <<-EOF &&
refs/heads/branch-in-other:refs/heads/branch-in-other Z
- refs/heads/master-in-other:refs/heads/master-in-other Z
+ refs/heads/main-in-other:refs/heads/main-in-other Z
refs/tags/tag-in-other:refs/tags/tag-in-other Z
EOF
(
@@ -1229,7 +1233,7 @@
test_expect_success '__git_complete_fetch_refspecs - fully qualified & prefix' '
sed -e "s/Z$//" >expected <<-EOF &&
+refs/heads/branch-in-other:refs/heads/branch-in-other Z
- +refs/heads/master-in-other:refs/heads/master-in-other Z
+ +refs/heads/main-in-other:refs/heads/main-in-other Z
+refs/tags/tag-in-other:refs/tags/tag-in-other Z
EOF
(
@@ -1240,6 +1244,513 @@
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
+ main Z
+ main-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
+ main Z
+ main-in-other Z
+ matching-branch Z
+ matching-tag Z
+ other/branch-in-other Z
+ other/main-in-other Z
+ EOF
+'
+
+test_expect_success 'git switch - with --no-guess, complete only local branches' '
+ test_completion "git switch --no-guess " <<-\EOF
+ main 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
+ main 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
+ main Z
+ main-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
+ main Z
+ main-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
+ main 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
+ main Z
+ matching-branch Z
+ matching-tag Z
+ other/branch-in-other Z
+ other/main-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
+ main Z
+ main-in-other Z
+ matching-branch Z
+ matching-tag Z
+ other/branch-in-other Z
+ other/main-in-other Z
+ EOF
+'
+
+test_expect_success 'git checkout - with --no-guess, only completes refs' '
+ test_completion "git checkout --no-guess " <<-\EOF
+ HEAD Z
+ main Z
+ matching-branch Z
+ matching-tag Z
+ other/branch-in-other Z
+ other/main-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
+ main Z
+ main-in-other Z
+ matching-branch Z
+ matching-tag Z
+ other/branch-in-other Z
+ other/main-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
+ main Z
+ matching-branch Z
+ matching-tag Z
+ other/branch-in-other Z
+ other/main-in-other Z
+ EOF
+'
+
+test_expect_success 'git checkout - with checkout.guess = false, only completes refs' '
+ test_config checkout.guess false &&
+ test_completion "git checkout " <<-\EOF
+ HEAD Z
+ main Z
+ matching-branch Z
+ matching-tag Z
+ other/branch-in-other Z
+ other/main-in-other Z
+ EOF
+'
+
+test_expect_success 'git checkout - with checkout.guess = true, completes refs and unique remote branches for DWIM' '
+ test_config checkout.guess true &&
+ test_completion "git checkout " <<-\EOF
+ HEAD Z
+ branch-in-other Z
+ main Z
+ main-in-other Z
+ matching-branch Z
+ matching-tag Z
+ other/branch-in-other Z
+ other/main-in-other Z
+ EOF
+'
+
+test_expect_success 'git checkout - a later --guess overrides previous checkout.guess = false, complete refs and unique remote branches for DWIM' '
+ test_config checkout.guess false &&
+ test_completion "git checkout --guess " <<-\EOF
+ HEAD Z
+ branch-in-other Z
+ main Z
+ main-in-other Z
+ matching-branch Z
+ matching-tag Z
+ other/branch-in-other Z
+ other/main-in-other Z
+ EOF
+'
+
+test_expect_success 'git checkout - a later --no-guess overrides previous checkout.guess = true, complete only refs' '
+ test_config checkout.guess true &&
+ test_completion "git checkout --no-guess " <<-\EOF
+ HEAD Z
+ main Z
+ matching-branch Z
+ matching-tag Z
+ other/branch-in-other Z
+ other/main-in-other Z
+ EOF
+'
+
+test_expect_success 'git switch - with --detach, complete all references' '
+ test_completion "git switch --detach " <<-\EOF
+ HEAD Z
+ main Z
+ matching-branch Z
+ matching-tag Z
+ other/branch-in-other Z
+ other/main-in-other Z
+ EOF
+'
+
+test_expect_success 'git checkout - with --detach, complete only references' '
+ test_completion "git checkout --detach " <<-\EOF
+ HEAD Z
+ main Z
+ matching-branch Z
+ matching-tag Z
+ other/branch-in-other Z
+ other/main-in-other Z
+ EOF
+'
+
+test_expect_success 'git switch - with -d, complete all references' '
+ test_completion "git switch -d " <<-\EOF
+ HEAD Z
+ main Z
+ matching-branch Z
+ matching-tag Z
+ other/branch-in-other Z
+ other/main-in-other Z
+ EOF
+'
+
+test_expect_success 'git checkout - with -d, complete only references' '
+ test_completion "git checkout -d " <<-\EOF
+ HEAD Z
+ main Z
+ matching-branch Z
+ matching-tag Z
+ other/branch-in-other Z
+ other/main-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/main-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/main-in-other Z
+ EOF
+'
+
+test_expect_success 'git switch - with --no-track, complete only local branch names' '
+ test_completion "git switch --no-track " <<-\EOF
+ main 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
+ main Z
+ matching-branch Z
+ matching-tag Z
+ other/branch-in-other Z
+ other/main-in-other Z
+ EOF
+'
+
+test_expect_success 'git switch - with -c, complete all references' '
+ test_completion "git switch -c new-branch " <<-\EOF
+ HEAD Z
+ main Z
+ matching-branch Z
+ matching-tag Z
+ other/branch-in-other Z
+ other/main-in-other Z
+ EOF
+'
+
+test_expect_success 'git switch - with -C, complete all references' '
+ test_completion "git switch -C new-branch " <<-\EOF
+ HEAD Z
+ main Z
+ matching-branch Z
+ matching-tag Z
+ other/branch-in-other Z
+ other/main-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
+ main Z
+ matching-branch Z
+ matching-tag Z
+ other/branch-in-other Z
+ other/main-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
+ main Z
+ matching-branch Z
+ matching-tag Z
+ other/branch-in-other Z
+ other/main-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
+ main Z
+ matching-branch Z
+ matching-tag Z
+ other/branch-in-other Z
+ other/main-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
+ main Z
+ matching-branch Z
+ matching-tag Z
+ other/branch-in-other Z
+ other/main-in-other Z
+ EOF
+'
+
+test_expect_success 'git checkout - with -b, complete all references' '
+ test_completion "git checkout -b new-branch " <<-\EOF
+ HEAD Z
+ main Z
+ matching-branch Z
+ matching-tag Z
+ other/branch-in-other Z
+ other/main-in-other Z
+ EOF
+'
+
+test_expect_success 'git checkout - with -B, complete all references' '
+ test_completion "git checkout -B new-branch " <<-\EOF
+ HEAD Z
+ main Z
+ matching-branch Z
+ matching-tag Z
+ other/branch-in-other Z
+ other/main-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
+ main Z
+ matching-branch Z
+ matching-tag Z
+ other/branch-in-other Z
+ other/main-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
+ main Z
+ matching-branch Z
+ matching-tag Z
+ other/branch-in-other Z
+ other/main-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
+ main Z
+ matching-branch Z
+ matching-tag Z
+ other/branch-in-other Z
+ other/main-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
+ main Z
+ matching-branch Z
+ matching-tag Z
+ other/branch-in-other Z
+ other/main-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
+ main Z
+ main-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
+ main Z
+ main-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
+ main 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
+ main 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
+ main 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
+ main 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
+ main Z
+ main-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
+ main Z
+ main-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
+ main 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
+ main 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
+ main 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
+ main 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
+ main Z
+ main-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 main " <<-\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
+ main Z
+ main-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 main " <<-\EOF
+ HEAD Z
+ main Z
+ matching-branch Z
+ matching-tag Z
+ other/branch-in-other Z
+ other/main-in-other Z
+ EOF
+'
+
test_expect_success 'teardown after ref completion' '
git branch -d matching-branch &&
git tag -d matching-tag &&
@@ -1560,7 +2071,7 @@
test_expect_success 'checkout completes ref names' '
test_completion "git checkout m" <<-\EOF
- master Z
+ main Z
mybranch Z
mytag Z
EOF
@@ -1574,7 +2085,7 @@
test_expect_success 'show completes all refs' '
test_completion "git show m" <<-\EOF
- master Z
+ main Z
mybranch Z
mytag Z
EOF
@@ -1611,7 +2122,7 @@
--cover-from-description=Z
--cover-letter Z
EOF
- test_completion "git send-email ma" "master "
+ test_completion "git send-email ma" "main "
'
test_expect_success 'complete files' '
@@ -1638,6 +2149,11 @@
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 &&
@@ -1683,10 +2199,29 @@
test_completion "git add mom" "momified"
'
+test_expect_success "simple alias" '
+ test_config alias.co checkout &&
+ test_completion "git co m" <<-\EOF
+ main Z
+ mybranch Z
+ mytag Z
+ EOF
+'
+
+test_expect_success "recursive alias" '
+ test_config alias.co checkout &&
+ test_config alias.cod "co --detached" &&
+ test_completion "git cod m" <<-\EOF
+ main Z
+ mybranch Z
+ mytag Z
+ EOF
+'
+
test_expect_success "completion uses <cmd> completion for alias: !sh -c 'git <cmd> ...'" '
test_config alias.co "!sh -c '"'"'git checkout ...'"'"'" &&
test_completion "git co m" <<-\EOF
- master Z
+ main Z
mybranch Z
mytag Z
EOF
@@ -1695,7 +2230,7 @@
test_expect_success 'completion uses <cmd> completion for alias: !f () { VAR=val git <cmd> ... }' '
test_config alias.co "!f () { VAR=val git checkout ... ; } f" &&
test_completion "git co m" <<-\EOF
- master Z
+ main Z
mybranch Z
mytag Z
EOF
@@ -1704,7 +2239,7 @@
test_expect_success 'completion used <cmd> completion for alias: !f() { : git <cmd> ; ... }' '
test_config alias.co "!f() { : git checkout ; if ... } f" &&
test_completion "git co m" <<-\EOF
- master Z
+ main Z
mybranch Z
mytag Z
EOF
@@ -1735,7 +2270,7 @@
do
test_expect_success "__git_complete_remote_or_refspec - push $flag other" '
sed -e "s/Z$//" >expected <<-EOF &&
- master-in-other Z
+ main-in-other Z
EOF
(
words=(git push '$flag' other ma) &&
@@ -1748,7 +2283,7 @@
test_expect_failure "__git_complete_remote_or_refspec - push other $flag" '
sed -e "s/Z$//" >expected <<-EOF &&
- master-in-other Z
+ main-in-other Z
EOF
(
words=(git push other '$flag' ma) &&
@@ -1831,7 +2366,6 @@
'
test_expect_success 'sourcing the completion script clears cached merge strategies' '
- GIT_TEST_GETTEXT_POISON=false &&
__git_compute_merge_strategies &&
verbose test -n "$__git_merge_strategies" &&
. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
@@ -1848,4 +2382,24 @@
verbose test -z "$__gitcomp_builtin_notes_edit"
'
+test_expect_success '__git_complete' '
+ unset -f __git_wrap__git_main &&
+
+ __git_complete foo __git_main &&
+ __git_have_func __git_wrap__git_main &&
+ unset -f __git_wrap__git_main &&
+
+ __git_complete gf _git_fetch &&
+ __git_have_func __git_wrap_git_fetch &&
+
+ __git_complete foo git &&
+ __git_have_func __git_wrap__git_main &&
+ unset -f __git_wrap__git_main &&
+
+ __git_complete gd git_diff &&
+ __git_have_func __git_wrap_git_diff &&
+
+ test_must_fail __git_complete ga missing
+'
+
test_done
diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh
index ab5da2c..bbd513b 100755
--- a/t/t9903-bash-prompt.sh
+++ b/t/t9903-bash-prompt.sh
@@ -5,6 +5,9 @@
test_description='test git-specific bash prompt functions'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
. ./lib-bash.sh
. "$GIT_BUILD_DIR/contrib/completion/git-prompt.sh"
@@ -28,7 +31,7 @@
echo 3 >file &&
git commit -m "third b1" file &&
git tag -a -m msg2 t2 &&
- git checkout -b b2 master &&
+ git checkout -b b2 main &&
echo 0 >file &&
git commit -m "second b2" file &&
echo 00 >file &&
@@ -37,20 +40,20 @@
git commit -m "yet another b2" file &&
mkdir ignored_dir &&
echo "ignored_dir/" >>.gitignore &&
- git checkout master
+ git checkout main
'
test_expect_success 'prompt - branch name' '
- printf " (master)" >expected &&
+ printf " (main)" >expected &&
__git_ps1 >"$actual" &&
test_cmp expected "$actual"
'
test_expect_success SYMLINKS 'prompt - branch name - symlink symref' '
- printf " (master)" >expected &&
- test_when_finished "git checkout master" &&
+ printf " (main)" >expected &&
+ test_when_finished "git checkout main" &&
test_config core.preferSymlinkRefs true &&
- git checkout master &&
+ git checkout main &&
__git_ps1 >"$actual" &&
test_cmp expected "$actual"
'
@@ -58,7 +61,7 @@
test_expect_success 'prompt - unborn branch' '
printf " (unborn)" >expected &&
git checkout --orphan unborn &&
- test_when_finished "git checkout master" &&
+ test_when_finished "git checkout main" &&
__git_ps1 >"$actual" &&
test_cmp expected "$actual"
'
@@ -72,7 +75,7 @@
with
newline" &&
mkdir "$repo_with_newline" &&
- printf " (master)" >expected &&
+ printf " (main)" >expected &&
git init "$repo_with_newline" &&
test_when_finished "rm -rf \"$repo_with_newline\"" &&
mkdir "$repo_with_newline"/subdir &&
@@ -87,7 +90,7 @@
printf " ((%s...))" $(git log -1 --format="%h" --abbrev=13 b1^) >expected &&
test_config core.abbrev 13 &&
git checkout b1^ &&
- test_when_finished "git checkout master" &&
+ test_when_finished "git checkout main" &&
__git_ps1 >"$actual" &&
test_cmp expected "$actual"
'
@@ -95,7 +98,7 @@
test_expect_success 'prompt - describe detached head - contains' '
printf " ((t2~1))" >expected &&
git checkout b1^ &&
- test_when_finished "git checkout master" &&
+ test_when_finished "git checkout main" &&
(
GIT_PS1_DESCRIBE_STYLE=contains &&
__git_ps1 >"$actual"
@@ -106,7 +109,7 @@
test_expect_success 'prompt - describe detached head - branch' '
printf " ((tags/t2~1))" >expected &&
git checkout b1^ &&
- test_when_finished "git checkout master" &&
+ test_when_finished "git checkout main" &&
(
GIT_PS1_DESCRIBE_STYLE=branch &&
__git_ps1 >"$actual"
@@ -117,7 +120,7 @@
test_expect_success 'prompt - describe detached head - describe' '
printf " ((t1-1-g%s))" $(git log -1 --format="%h" b1^) >expected &&
git checkout b1^ &&
- test_when_finished "git checkout master" &&
+ test_when_finished "git checkout main" &&
(
GIT_PS1_DESCRIBE_STYLE=describe &&
__git_ps1 >"$actual"
@@ -128,7 +131,7 @@
test_expect_success 'prompt - describe detached head - default' '
printf " ((t2))" >expected &&
git checkout --detach b1 &&
- test_when_finished "git checkout master" &&
+ test_when_finished "git checkout main" &&
__git_ps1 >"$actual" &&
test_cmp expected "$actual"
'
@@ -152,7 +155,7 @@
'
test_expect_success 'prompt - inside bare repository' '
- printf " (BARE:master)" >expected &&
+ printf " (BARE:main)" >expected &&
git init --bare bare.git &&
test_when_finished "rm -rf bare.git" &&
(
@@ -172,7 +175,7 @@
test_when_finished "rm -f fake_editor.sh" &&
test_set_editor "$TRASH_DIRECTORY/fake_editor.sh" &&
git checkout b1 &&
- test_when_finished "git checkout master" &&
+ test_when_finished "git checkout main" &&
git rebase -i HEAD^ &&
test_when_finished "git rebase --abort" &&
__git_ps1 >"$actual" &&
@@ -182,7 +185,7 @@
test_expect_success 'prompt - rebase merge' '
printf " (b2|REBASE 1/3)" >expected &&
git checkout b2 &&
- test_when_finished "git checkout master" &&
+ test_when_finished "git checkout main" &&
test_must_fail git rebase --merge b1 b2 &&
test_when_finished "git rebase --abort" &&
__git_ps1 >"$actual" &&
@@ -192,7 +195,7 @@
test_expect_success 'prompt - rebase am' '
printf " (b2|REBASE 1/3)" >expected &&
git checkout b2 &&
- test_when_finished "git checkout master" &&
+ test_when_finished "git checkout main" &&
test_must_fail git rebase --apply b1 b2 &&
test_when_finished "git rebase --abort" &&
__git_ps1 >"$actual" &&
@@ -202,7 +205,7 @@
test_expect_success 'prompt - merge' '
printf " (b1|MERGING)" >expected &&
git checkout b1 &&
- test_when_finished "git checkout master" &&
+ test_when_finished "git checkout main" &&
test_must_fail git merge b2 &&
test_when_finished "git reset --hard" &&
__git_ps1 >"$actual" &&
@@ -210,7 +213,7 @@
'
test_expect_success 'prompt - cherry-pick' '
- printf " (master|CHERRY-PICKING)" >expected &&
+ printf " (main|CHERRY-PICKING)" >expected &&
test_must_fail git cherry-pick b1 b1^ &&
test_when_finished "git cherry-pick --abort" &&
__git_ps1 >"$actual" &&
@@ -222,7 +225,7 @@
'
test_expect_success 'prompt - revert' '
- printf " (master|REVERTING)" >expected &&
+ printf " (main|REVERTING)" >expected &&
test_must_fail git revert b1^ b1 &&
test_when_finished "git revert --abort" &&
__git_ps1 >"$actual" &&
@@ -234,7 +237,7 @@
'
test_expect_success 'prompt - bisect' '
- printf " (master|BISECTING)" >expected &&
+ printf " (main|BISECTING)" >expected &&
git bisect start &&
test_when_finished "git bisect reset" &&
__git_ps1 >"$actual" &&
@@ -242,7 +245,7 @@
'
test_expect_success 'prompt - dirty status indicator - clean' '
- printf " (master)" >expected &&
+ printf " (main)" >expected &&
(
GIT_PS1_SHOWDIRTYSTATE=y &&
__git_ps1 >"$actual"
@@ -251,7 +254,7 @@
'
test_expect_success 'prompt - dirty status indicator - dirty worktree' '
- printf " (master *)" >expected &&
+ printf " (main *)" >expected &&
echo "dirty" >file &&
test_when_finished "git reset --hard" &&
(
@@ -262,7 +265,7 @@
'
test_expect_success 'prompt - dirty status indicator - dirty index' '
- printf " (master +)" >expected &&
+ printf " (main +)" >expected &&
echo "dirty" >file &&
test_when_finished "git reset --hard" &&
git add -u &&
@@ -274,7 +277,7 @@
'
test_expect_success 'prompt - dirty status indicator - dirty index and worktree' '
- printf " (master *+)" >expected &&
+ printf " (main *+)" >expected &&
echo "dirty index" >file &&
test_when_finished "git reset --hard" &&
git add -u &&
@@ -288,7 +291,7 @@
test_expect_success 'prompt - dirty status indicator - orphan branch - clean' '
printf " (orphan #)" >expected &&
- test_when_finished "git checkout master" &&
+ test_when_finished "git checkout main" &&
git checkout --orphan orphan &&
git reset --hard &&
(
@@ -300,7 +303,7 @@
test_expect_success 'prompt - dirty status indicator - orphan branch - dirty index' '
printf " (orphan +)" >expected &&
- test_when_finished "git checkout master" &&
+ test_when_finished "git checkout main" &&
git checkout --orphan orphan &&
(
GIT_PS1_SHOWDIRTYSTATE=y &&
@@ -311,7 +314,7 @@
test_expect_success 'prompt - dirty status indicator - orphan branch - dirty index and worktree' '
printf " (orphan *+)" >expected &&
- test_when_finished "git checkout master" &&
+ test_when_finished "git checkout main" &&
git checkout --orphan orphan &&
>file &&
(
@@ -322,7 +325,7 @@
'
test_expect_success 'prompt - dirty status indicator - shell variable unset with config disabled' '
- printf " (master)" >expected &&
+ printf " (main)" >expected &&
echo "dirty" >file &&
test_when_finished "git reset --hard" &&
test_config bash.showDirtyState false &&
@@ -334,7 +337,7 @@
'
test_expect_success 'prompt - dirty status indicator - shell variable unset with config enabled' '
- printf " (master)" >expected &&
+ printf " (main)" >expected &&
echo "dirty" >file &&
test_when_finished "git reset --hard" &&
test_config bash.showDirtyState true &&
@@ -346,7 +349,7 @@
'
test_expect_success 'prompt - dirty status indicator - shell variable set with config disabled' '
- printf " (master)" >expected &&
+ printf " (main)" >expected &&
echo "dirty" >file &&
test_when_finished "git reset --hard" &&
test_config bash.showDirtyState false &&
@@ -358,7 +361,7 @@
'
test_expect_success 'prompt - dirty status indicator - shell variable set with config enabled' '
- printf " (master *)" >expected &&
+ printf " (main *)" >expected &&
echo "dirty" >file &&
test_when_finished "git reset --hard" &&
test_config bash.showDirtyState true &&
@@ -382,7 +385,7 @@
'
test_expect_success 'prompt - stash status indicator - no stash' '
- printf " (master)" >expected &&
+ printf " (main)" >expected &&
(
GIT_PS1_SHOWSTASHSTATE=y &&
__git_ps1 >"$actual"
@@ -391,7 +394,7 @@
'
test_expect_success 'prompt - stash status indicator - stash' '
- printf " (master $)" >expected &&
+ printf " (main $)" >expected &&
echo 2 >file &&
git stash &&
test_when_finished "git stash drop" &&
@@ -417,7 +420,7 @@
'
test_expect_success 'prompt - untracked files status indicator - no untracked files' '
- printf " (master)" >expected &&
+ printf " (main)" >expected &&
(
GIT_PS1_SHOWUNTRACKEDFILES=y &&
cd otherrepo &&
@@ -427,7 +430,7 @@
'
test_expect_success 'prompt - untracked files status indicator - untracked files' '
- printf " (master %%)" >expected &&
+ printf " (main %%)" >expected &&
(
GIT_PS1_SHOWUNTRACKEDFILES=y &&
__git_ps1 >"$actual"
@@ -436,7 +439,7 @@
'
test_expect_success 'prompt - untracked files status indicator - empty untracked dir' '
- printf " (master)" >expected &&
+ printf " (main)" >expected &&
mkdir otherrepo/untracked-dir &&
test_when_finished "rm -rf otherrepo/untracked-dir" &&
(
@@ -448,7 +451,7 @@
'
test_expect_success 'prompt - untracked files status indicator - non-empty untracked dir' '
- printf " (master %%)" >expected &&
+ printf " (main %%)" >expected &&
mkdir otherrepo/untracked-dir &&
test_when_finished "rm -rf otherrepo/untracked-dir" &&
>otherrepo/untracked-dir/untracked-file &&
@@ -461,7 +464,7 @@
'
test_expect_success 'prompt - untracked files status indicator - untracked files outside cwd' '
- printf " (master %%)" >expected &&
+ printf " (main %%)" >expected &&
(
mkdir -p ignored_dir &&
cd ignored_dir &&
@@ -472,7 +475,7 @@
'
test_expect_success 'prompt - untracked files status indicator - shell variable unset with config disabled' '
- printf " (master)" >expected &&
+ printf " (main)" >expected &&
test_config bash.showUntrackedFiles false &&
(
sane_unset GIT_PS1_SHOWUNTRACKEDFILES &&
@@ -482,7 +485,7 @@
'
test_expect_success 'prompt - untracked files status indicator - shell variable unset with config enabled' '
- printf " (master)" >expected &&
+ printf " (main)" >expected &&
test_config bash.showUntrackedFiles true &&
(
sane_unset GIT_PS1_SHOWUNTRACKEDFILES &&
@@ -492,7 +495,7 @@
'
test_expect_success 'prompt - untracked files status indicator - shell variable set with config disabled' '
- printf " (master)" >expected &&
+ printf " (main)" >expected &&
test_config bash.showUntrackedFiles false &&
(
GIT_PS1_SHOWUNTRACKEDFILES=y &&
@@ -502,7 +505,7 @@
'
test_expect_success 'prompt - untracked files status indicator - shell variable set with config enabled' '
- printf " (master %%)" >expected &&
+ printf " (main %%)" >expected &&
test_config bash.showUntrackedFiles true &&
(
GIT_PS1_SHOWUNTRACKEDFILES=y &&
@@ -522,13 +525,13 @@
'
test_expect_success 'prompt - format string starting with dash' '
- printf -- "-master" >expected &&
+ printf -- "-main" >expected &&
__git_ps1 "-%s" >"$actual" &&
test_cmp expected "$actual"
'
test_expect_success 'prompt - pc mode' '
- printf "BEFORE: (\${__git_ps1_branch_name}):AFTER\\nmaster" >expected &&
+ printf "BEFORE: (\${__git_ps1_branch_name}):AFTER\\nmain" >expected &&
(
__git_ps1 "BEFORE:" ":AFTER" >"$actual" &&
test_must_be_empty "$actual" &&
@@ -538,7 +541,7 @@
'
test_expect_success 'prompt - bash color pc mode - branch name' '
- printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear}):AFTER\\nmaster" >expected &&
+ printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear}):AFTER\\nmain" >expected &&
(
GIT_PS1_SHOWCOLORHINTS=y &&
__git_ps1 "BEFORE:" ":AFTER" >"$actual" &&
@@ -550,7 +553,7 @@
test_expect_success 'prompt - bash color pc mode - detached head' '
printf "BEFORE: (${c_red}\${__git_ps1_branch_name}${c_clear}):AFTER\\n(%s...)" $(git log -1 --format="%h" b1^) >expected &&
git checkout b1^ &&
- test_when_finished "git checkout master" &&
+ test_when_finished "git checkout main" &&
(
GIT_PS1_SHOWCOLORHINTS=y &&
__git_ps1 "BEFORE:" ":AFTER" &&
@@ -560,7 +563,7 @@
'
test_expect_success 'prompt - bash color pc mode - dirty status indicator - dirty worktree' '
- printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_red}*${c_clear}):AFTER\\nmaster" >expected &&
+ printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_red}*${c_clear}):AFTER\\nmain" >expected &&
echo "dirty" >file &&
test_when_finished "git reset --hard" &&
(
@@ -573,7 +576,7 @@
'
test_expect_success 'prompt - bash color pc mode - dirty status indicator - dirty index' '
- printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_green}+${c_clear}):AFTER\\nmaster" >expected &&
+ printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_green}+${c_clear}):AFTER\\nmain" >expected &&
echo "dirty" >file &&
test_when_finished "git reset --hard" &&
git add -u &&
@@ -587,7 +590,7 @@
'
test_expect_success 'prompt - bash color pc mode - dirty status indicator - dirty index and worktree' '
- printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_red}*${c_green}+${c_clear}):AFTER\\nmaster" >expected &&
+ printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_red}*${c_green}+${c_clear}):AFTER\\nmain" >expected &&
echo "dirty index" >file &&
test_when_finished "git reset --hard" &&
git add -u &&
@@ -602,7 +605,7 @@
'
test_expect_success 'prompt - bash color pc mode - dirty status indicator - before root commit' '
- printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_green}#${c_clear}):AFTER\\nmaster" >expected &&
+ printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_green}#${c_clear}):AFTER\\nmain" >expected &&
(
GIT_PS1_SHOWDIRTYSTATE=y &&
GIT_PS1_SHOWCOLORHINTS=y &&
@@ -628,7 +631,7 @@
'
test_expect_success 'prompt - bash color pc mode - stash status indicator' '
- printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_lblue}\$${c_clear}):AFTER\\nmaster" >expected &&
+ printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_lblue}\$${c_clear}):AFTER\\nmain" >expected &&
echo 2 >file &&
git stash &&
test_when_finished "git stash drop" &&
@@ -642,7 +645,7 @@
'
test_expect_success 'prompt - bash color pc mode - untracked files status indicator' '
- printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_red}%%${c_clear}):AFTER\\nmaster" >expected &&
+ printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_red}%%${c_clear}):AFTER\\nmain" >expected &&
(
GIT_PS1_SHOWUNTRACKEDFILES=y &&
GIT_PS1_SHOWCOLORHINTS=y &&
@@ -653,7 +656,7 @@
'
test_expect_success 'prompt - zsh color pc mode' '
- printf "BEFORE: (%%F{green}master%%f):AFTER" >expected &&
+ printf "BEFORE: (%%F{green}main%%f):AFTER" >expected &&
(
ZSH_VERSION=5.0.0 &&
GIT_PS1_SHOWCOLORHINTS=y &&
@@ -664,7 +667,7 @@
'
test_expect_success 'prompt - hide if pwd ignored - env var unset, config disabled' '
- printf " (master)" >expected &&
+ printf " (main)" >expected &&
test_config bash.hideIfPwdIgnored false &&
(
cd ignored_dir &&
@@ -685,7 +688,7 @@
'
test_expect_success 'prompt - hide if pwd ignored - env var unset, config unset' '
- printf " (master)" >expected &&
+ printf " (main)" >expected &&
(
cd ignored_dir &&
__git_ps1 >"$actual"
@@ -704,7 +707,7 @@
'
test_expect_success 'prompt - hide if pwd ignored - env var set, config disabled' '
- printf " (master)" >expected &&
+ printf " (main)" >expected &&
test_config bash.hideIfPwdIgnored false &&
(
cd ignored_dir &&
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 352c213..6348e8d 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -32,11 +32,6 @@
export EDITOR
}
-test_set_index_version () {
- GIT_INDEX_VERSION="$1"
- export GIT_INDEX_VERSION
-}
-
test_decode_color () {
awk '
function name(n) {
@@ -116,13 +111,6 @@
tr '\015' Q | sed -e 's/Q$//'
}
-# Generate an output of $1 bytes of all zeroes (NULs, not ASCII zeroes).
-# If $1 is 'infinity', output forever or until the receiving pipe stops reading,
-# whichever comes first.
-generate_zero_bytes () {
- test-tool genzeros "$@"
-}
-
# In some bourne shell implementations, the "unset" builtin returns
# nonzero status when a variable to be unset was not set in the first
# place.
@@ -178,34 +166,60 @@
GIT_DEBUGGER="${GIT_DEBUGGER}" "$@" <&6 >&5 2>&7
}
-# Call test_commit with the arguments
-# [-C <directory>] <message> [<file> [<contents> [<tag>]]]"
+# Usage: test_commit [options] <message> [<file> [<contents> [<tag>]]]
+# -C <dir>:
+# Run all git commands in directory <dir>
+# --notick
+# Do not call test_tick before making a commit
+# --append
+# Use "echo >>" instead of "echo >" when writing "<contents>" to
+# "<file>"
+# --signoff
+# Invoke "git commit" with --signoff
+# --author <author>
+# Invoke "git commit" with --author <author>
#
# This will commit a file with the given contents and the given commit
# message, and tag the resulting commit with the given tag name.
#
# <file>, <contents>, and <tag> all default to <message>.
-#
-# If the first argument is "-C", the second argument is used as a path for
-# the git invocations.
test_commit () {
notick= &&
+ append= &&
+ author= &&
signoff= &&
indir= &&
+ no_tag= &&
while test $# != 0
do
case "$1" in
--notick)
notick=yes
;;
+ --append)
+ append=yes
+ ;;
+ --author)
+ author="$2"
+ shift
+ ;;
--signoff)
signoff="$1"
;;
+ --date)
+ notick=yes
+ GIT_COMMITTER_DATE="$2"
+ GIT_AUTHOR_DATE="$2"
+ shift
+ ;;
-C)
indir="$2"
shift
;;
+ --no-tag)
+ no_tag=yes
+ ;;
*)
break
;;
@@ -214,14 +228,24 @@
done &&
indir=${indir:+"$indir"/} &&
file=${2:-"$1.t"} &&
- echo "${3-$1}" > "$indir$file" &&
+ if test -n "$append"
+ then
+ echo "${3-$1}" >>"$indir$file"
+ else
+ echo "${3-$1}" >"$indir$file"
+ fi &&
git ${indir:+ -C "$indir"} add "$file" &&
if test -z "$notick"
then
test_tick
fi &&
- git ${indir:+ -C "$indir"} commit $signoff -m "$1" &&
- git ${indir:+ -C "$indir"} tag "${4:-$1}"
+ git ${indir:+ -C "$indir"} commit \
+ ${author:+ --author "$author"} \
+ $signoff -m "$1" &&
+ if test -z "$no_tag"
+ then
+ git ${indir:+ -C "$indir"} tag "${4:-$1}"
+ fi
}
# Call test_merge with the arguments "<message> <commit>", where <commit>
@@ -367,9 +391,14 @@
git update-index --add "--chmod=$@"
}
-# Get the modebits from a file.
+# Get the modebits from a file or directory, ignoring the setgid bit (g+s).
+# This bit is inherited by subdirectories at their creation. So we remove it
+# from the returning string to prevent callers from having to worry about the
+# state of the bit in the test directory.
+#
test_modebits () {
- ls -l "$1" | sed -e 's|^\(..........\).*|\1|'
+ ls -ld "$1" | sed -e 's|^\(..........\).*|\1|' \
+ -e 's|^\(......\)S|\1-|' -e 's|^\(......\)s|\1x|'
}
# Unset a configuration variable, but don't fail if it doesn't exist.
@@ -423,7 +452,7 @@
# - Explicitly using test_have_prereq.
#
# - Implicitly by specifying the prerequisite tag in the calls to
-# test_expect_{success,failure,code}.
+# test_expect_{success,failure} and test_external{,_without_stderr}.
#
# The single parameter is the prerequisite tag (a simple word, in all
# capital letters by convention).
@@ -474,15 +503,15 @@
test_run_lazy_prereq_ () {
script='
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-'"$1"'" &&
(
- cd "$TRASH_DIRECTORY/prereq-test-dir" &&'"$2"'
+ cd "$TRASH_DIRECTORY/prereq-test-dir-'"$1"'" &&'"$2"'
)'
say >&3 "checking prerequisite: $1"
say >&3 "$script"
test_eval_ "$script"
eval_ret=$?
- rm -rf "$TRASH_DIRECTORY/prereq-test-dir"
+ rm -rf "$TRASH_DIRECTORY/prereq-test-dir-$1"
if test "$eval_ret" = 0; then
say >&3 "prerequisite $1 ok"
else
@@ -701,34 +730,37 @@
}
# debugging-friendly alternatives to "test [-f|-d|-e]"
-# The commands test the existence or non-existence of $1. $2 can be
-# given to provide a more precise diagnosis.
+# The commands test the existence or non-existence of $1
test_path_is_file () {
+ test "$#" -ne 1 && BUG "1 param"
if ! test -f "$1"
then
- echo "File $1 doesn't exist. $2"
+ echo "File $1 doesn't exist"
false
fi
}
test_path_is_dir () {
+ test "$#" -ne 1 && BUG "1 param"
if ! test -d "$1"
then
- echo "Directory $1 doesn't exist. $2"
+ echo "Directory $1 doesn't exist"
false
fi
}
test_path_exists () {
+ test "$#" -ne 1 && BUG "1 param"
if ! test -e "$1"
then
- echo "Path $1 doesn't exist. $2"
+ echo "Path $1 doesn't exist"
false
fi
}
# Check if the directory exists and is empty as expected, barf otherwise.
test_dir_is_empty () {
+ test "$#" -ne 1 && BUG "1 param"
test_path_is_dir "$1" &&
if test -n "$(ls -a1 "$1" | egrep -v '^\.\.?$')"
then
@@ -740,6 +772,7 @@
# Check if the file exists and has a size greater than zero
test_file_not_empty () {
+ test "$#" = 2 && BUG "2 param"
if ! test -s "$1"
then
echo "'$1' is not a non-empty file."
@@ -748,6 +781,7 @@
}
test_path_is_missing () {
+ test "$#" -ne 1 && BUG "1 param"
if test -e "$1"
then
echo "Path exists:"
@@ -783,6 +817,11 @@
fi
}
+test_file_size () {
+ test "$#" -ne 1 && BUG "1 param"
+ test-tool path-utils file-size "$1"
+}
+
# Returns success if a comma separated string of keywords ($1) contains a
# given keyword ($2).
# Examples:
@@ -798,6 +837,37 @@
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:
#
@@ -817,6 +887,17 @@
# 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
@@ -828,6 +909,11 @@
_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
@@ -904,8 +990,9 @@
# - cmp's output is not nearly as easy to read as diff -u
# - not all diff versions understand "-u"
-test_cmp() {
- $GIT_TEST_CMP "$@"
+test_cmp () {
+ test "$#" -ne 2 && BUG "2 param"
+ eval "$GIT_TEST_CMP" '"$@"'
}
# Check that the given config key has the expected value.
@@ -917,7 +1004,7 @@
#
# test_cmp_config foo core.bar
#
-test_cmp_config() {
+test_cmp_config () {
local GD &&
if test "$1" = "-C"
then
@@ -933,23 +1020,21 @@
# test_cmp_bin - helper to compare binary files
-test_cmp_bin() {
+test_cmp_bin () {
+ test "$#" -ne 2 && BUG "2 param"
cmp "$@"
}
-# Use this instead of test_cmp to compare files that contain expected and
-# actual output from git commands that can be translated. When running
-# under GIT_TEST_GETTEXT_POISON this pretends that the command produced expected
-# results.
+# Wrapper for test_cmp which used to be used for
+# GIT_TEST_GETTEXT_POISON=false. Only here as a shim for other
+# in-flight changes. Should not be used and will be removed soon.
test_i18ncmp () {
- ! test_have_prereq C_LOCALE_OUTPUT || test_cmp "$@"
+ test_cmp "$@"
}
-# Use this instead of "grep expected-string actual" to see if the
-# output from a git command that can be translated either contains an
-# expected string, or does not contain an unwanted one. When running
-# under GIT_TEST_GETTEXT_POISON this pretends that the command produced expected
-# results.
+# Wrapper for grep which used to be used for
+# GIT_TEST_GETTEXT_POISON=false. Only here as a shim for other
+# in-flight changes. Should not be used and will be removed soon.
test_i18ngrep () {
eval "last_arg=\${$#}"
@@ -962,12 +1047,6 @@
BUG "too few parameters to test_i18ngrep"
fi
- if test_have_prereq !C_LOCALE_OUTPUT
- then
- # pretend success
- return 0
- fi
-
if test "x!" = "x$1"
then
shift
@@ -1003,6 +1082,7 @@
# otherwise.
test_must_be_empty () {
+ test "$#" -ne 1 && BUG "1 param"
test_path_is_file "$1" &&
if test -s "$1"
then
@@ -1026,7 +1106,7 @@
fi
if test $# != 2
then
- error "bug in the test script: test_cmp_rev requires two revisions, but got $#"
+ BUG "test_cmp_rev requires two revisions, but got $#"
else
local r1 r2
r1=$(git rev-parse --verify "$1") &&
@@ -1137,7 +1217,7 @@
# doing so on Bash is better than nothing (the test will
# silently pass on other shells).
test "${BASH_SUBSHELL-0}" = 0 ||
- error "bug in test script: test_atexit does nothing in a subshell"
+ BUG "test_atexit does nothing in a subshell"
test_atexit_cleanup="{ $*
} && (exit \"\$eval_ret\"); eval_ret=\$?; $test_atexit_cleanup"
}
@@ -1151,7 +1231,9 @@
mkdir -p "$repo"
(
cd "$repo" || error "Cannot setup test environment"
- "${GIT_TEST_INSTALLED:-$GIT_EXEC_PATH}/git$X" init \
+ "${GIT_TEST_INSTALLED:-$GIT_EXEC_PATH}/git$X" -c \
+ init.defaultBranch="${GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME-master}" \
+ init \
"--template=$GIT_BUILD_DIR/templates/blt/" >&3 2>&4 ||
error "cannot run git init -- have you built things yet?"
mv .git/hooks .git/hooks-disabled
@@ -1362,14 +1444,22 @@
)
} 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).
-packetize() {
- cat >packetize.tmp &&
- len=$(wc -c <packetize.tmp) &&
- printf '%04x%s' "$(($len + 4))" &&
- cat packetize.tmp &&
- rm -f packetize.tmp
+# 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 () {
+ 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.
@@ -1409,9 +1499,7 @@
# 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
@@ -1460,7 +1548,17 @@
# 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.
@@ -1517,29 +1615,87 @@
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:
+# 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.
#
-# - regular output is in traversal order, whereas bitmap is split by type,
-# with non-packed objects at the end
+# test_subcommand [!] <command> <args>... < <trace>
#
-# - regular output has a space and the pathname appended to non-commit
-# objects; bitmap output omits this
+# For example, to look for an invocation of "git upload-pack
+# /path/to/repo"
#
-# 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"
+# 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
- elif cmp "$1" "$2"
+ fi
+
+ local expr=$(printf '"%s",' "$@")
+ expr="${expr%,}"
+
+ if test -n "$negate"
then
- echo >&2 "identical raw outputs; are you sure bitmaps were used?"
+ ! grep "\[$expr\]"
+ else
+ grep "\[$expr\]"
+ fi
+}
+
+# Check that the given command was invoked as part of the
+# trace2-format trace on stdin.
+#
+# test_region [!] <category> <label> git <command> <args>...
+#
+# For example, to look for trace2_region_enter("index", "do_read_index", repo)
+# in an invocation of "git checkout HEAD~1", run
+#
+# GIT_TRACE2_EVENT="$(pwd)/trace.txt" GIT_TRACE2_EVENT_NESTING=10 \
+# git checkout HEAD~1 &&
+# test_region index do_read_index <trace.txt
+#
+# If the first parameter passed is !, this instead checks that
+# the given region was not entered.
+#
+test_region () {
+ local expect_exit=0
+ if test "$1" = "!"
+ then
+ expect_exit=1
+ shift
+ fi
+
+ grep -e '"region_enter".*"category":"'"$1"'","label":"'"$2"\" "$3"
+ exitcode=$?
+
+ if test $exitcode != $expect_exit
+ then
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"
+ fi
+
+ grep -e '"region_leave".*"category":"'"$1"'","label":"'"$2"\" "$3"
+ exitcode=$?
+
+ if test $exitcode != $expect_exit
+ then
+ return 1
+ fi
+
+ return 0
}
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 0ea1e5a..d3f6af6 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -78,20 +78,23 @@
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 @@
-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#--*=} ;;
@@ -160,8 +163,8 @@
;;
--stress-jobs=*)
stress=t;
- stress=${opt#--*=}
- case "$stress" in
+ stress_jobs=${opt#--*=}
+ case "$stress_jobs" in
*[!0-9]*|0*|"")
echo "error: --stress-jobs=<N> requires the number of jobs to run" >&2
exit 1
@@ -185,12 +188,42 @@
*)
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
@@ -229,9 +262,9 @@
: # Don't stress test again.
elif test -n "$stress"
then
- if test "$stress" != t
+ if test -n "$stress_jobs"
then
- job_count=$stress
+ job_count=$stress_jobs
elif test -n "$GIT_TEST_STRESS_LOAD"
then
job_count="$GIT_TEST_STRESS_LOAD"
@@ -371,15 +404,6 @@
export LANG LC_ALL PAGER TZ
EDITOR=:
-# GIT_TEST_GETTEXT_POISON should not influence git commands executed
-# during initialization of test-lib and the test repo. Back it up,
-# unset and then restore after initialization is finished.
-if test -n "$GIT_TEST_GETTEXT_POISON"
-then
- GIT_TEST_GETTEXT_POISON_ORIG=$GIT_TEST_GETTEXT_POISON
- unset GIT_TEST_GETTEXT_POISON
-fi
-
# A call to "unset" with no arguments causes at least Solaris 10
# /usr/xpg4/bin/sh and /bin/ksh to bail out. So keep the unsets
# deriving from the command substitution clustered with the other
@@ -408,51 +432,27 @@
TEST_AUTHOR_DOMAIN=example.com
GIT_AUTHOR_EMAIL=${TEST_AUTHOR_LOCALNAME}@${TEST_AUTHOR_DOMAIN}
GIT_AUTHOR_NAME='A U Thor'
+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
-check_var_migration () {
- # the warnings and hints given from this helper depends
- # on end-user settings, which will disrupt the self-test
- # done on the test framework itself.
- case "$GIT_TEST_FRAMEWORK_SELFTEST" in
- t) return ;;
- esac
-
- old_name=$1 new_name=$2
- eval "old_isset=\${${old_name}:+isset}"
- eval "new_isset=\${${new_name}:+isset}"
-
- case "$old_isset,$new_isset" in
- isset,)
- echo >&2 "warning: $old_name is now $new_name"
- echo >&2 "hint: set $new_name too during the transition period"
- eval "$new_name=\$$old_name"
- ;;
- isset,isset)
- # do this later
- # echo >&2 "warning: $old_name is now $new_name"
- # echo >&2 "hint: remove $old_name"
- ;;
- esac
-}
-
-check_var_migration GIT_FSMONITOR_TEST GIT_TEST_FSMONITOR
-check_var_migration TEST_GIT_INDEX_VERSION GIT_TEST_INDEX_VERSION
-check_var_migration GIT_FORCE_PRELOAD_TEST GIT_TEST_PRELOAD_INDEX
-
# Use specific version of the index file format
if test -n "${GIT_TEST_INDEX_VERSION:+isset}"
then
@@ -460,6 +460,12 @@
export GIT_INDEX_VERSION
fi
+if test -n "$GIT_TEST_PERL_FATAL_WARNINGS"
+then
+ GIT_PERL_FATAL_WARNINGS=1
+ export GIT_PERL_FATAL_WARNINGS
+fi
+
# Add libc MALLOC and MALLOC_PERTURB test
# only if we are not executing the test with valgrind
if test -n "$valgrind" ||
@@ -494,21 +500,6 @@
;;
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='
'
@@ -745,15 +736,17 @@
}
match_test_selector_list () {
+ operation="$1"
+ shift
title="$1"
shift
arg="$1"
shift
test -z "$1" && return 0
- # Both commas and whitespace are accepted as separators.
+ # Commas are accepted as separators.
OLDIFS=$IFS
- IFS=' ,'
+ IFS=','
set -- $1
IFS=$OLDIFS
@@ -781,13 +774,13 @@
*-*)
if expr "z${selector%%-*}" : "z[0-9]*[^0-9]" >/dev/null
then
- echo "error: $title: invalid non-numeric in range" \
+ echo "error: $operation: invalid non-numeric in range" \
"start: '$orig_selector'" >&2
exit 1
fi
if expr "z${selector#*-}" : "z[0-9]*[^0-9]" >/dev/null
then
- echo "error: $title: invalid non-numeric in range" \
+ echo "error: $operation: invalid non-numeric in range" \
"end: '$orig_selector'" >&2
exit 1
fi
@@ -795,9 +788,11 @@
*)
if expr "z$selector" : "z[0-9]*[^0-9]" >/dev/null
then
- echo "error: $title: invalid non-numeric in test" \
- "selector: '$orig_selector'" >&2
- exit 1
+ case "$title" in *${selector}*)
+ include=$positive
+ ;;
+ esac
+ continue
fi
esac
@@ -882,6 +877,7 @@
fi
}
+trace_level_=0
want_trace () {
test "$trace" = t && {
test "$verbose" = t || test "$verbose_log" = t
@@ -895,7 +891,7 @@
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
$*"
}
@@ -926,7 +922,8 @@
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
@@ -1005,7 +1002,7 @@
skipped_reason="GIT_SKIP_TESTS"
fi
if test -z "$to_skip" && test -n "$run_list" &&
- ! match_test_selector_list '--run' $test_count "$run_list"
+ ! match_test_selector_list '--run' "$1" $test_count "$run_list"
then
to_skip=t
skipped_reason="--run"
@@ -1032,7 +1029,6 @@
" <skipped message=\"$message\" />"
fi
- say_color skip >&3 "skipping test: $@"
say_color skip "ok $test_count # skip $1 ($skipped_reason)"
: true
;;
@@ -1085,6 +1081,7 @@
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"
@@ -1383,6 +1380,21 @@
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
@@ -1454,12 +1466,6 @@
test_set_prereq SED_STRIPS_CR
test_set_prereq GREP_STRIPS_CR
;;
-FreeBSD)
- test_set_prereq REGEX_ILLSEQ
- test_set_prereq POSIXPERM
- test_set_prereq BSLASHPSPEC
- test_set_prereq EXECKEEPSPID
- ;;
*)
test_set_prereq POSIXPERM
test_set_prereq BSLASHPSPEC
@@ -1467,26 +1473,22 @@
;;
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
test -z "$NO_PYTHON" && test_set_prereq PYTHON
-test -n "$USE_LIBPCRE1$USE_LIBPCRE2" && test_set_prereq PCRE
-test -n "$USE_LIBPCRE1" && test_set_prereq LIBPCRE1
+test -n "$USE_LIBPCRE2" && test_set_prereq PCRE
test -n "$USE_LIBPCRE2" && test_set_prereq LIBPCRE2
test -z "$NO_GETTEXT" && test_set_prereq GETTEXT
-if test -n "$GIT_TEST_GETTEXT_POISON_ORIG"
-then
- GIT_TEST_GETTEXT_POISON=$GIT_TEST_GETTEXT_POISON_ORIG
- export GIT_TEST_GETTEXT_POISON
- unset GIT_TEST_GETTEXT_POISON_ORIG
-fi
-
-test_lazy_prereq C_LOCALE_OUTPUT '
- ! test_bool_env GIT_TEST_GETTEXT_POISON false
-'
-
if test -z "$GIT_TEST_CHECK_CACHE_TREE"
then
GIT_TEST_CHECK_CACHE_TREE=true
@@ -1606,7 +1608,7 @@
}
test_lazy_prereq CMDLINE_LIMIT '
- test_have_prereq !MINGW,!CYGWIN &&
+ test_have_prereq !HPPA,!MINGW,!CYGWIN &&
run_with_limited_cmdline true
'
@@ -1615,10 +1617,19 @@
}
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"
@@ -1639,9 +1650,20 @@
# 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 '
test -z "$GIT_TEST_SKIP_REBASE_P"
'
+
+# Ensure that no test accidentally triggers a Git command
+# that runs the actual maintenance scheduler, affecting a user's
+# system permanently.
+# Tests that verify the scheduler integration must set this locally
+# to avoid errors.
+GIT_TEST_MAINT_SCHEDULER="none:exit 1"
diff --git a/t/test-terminal.perl b/t/test-terminal.perl
index 46bf618..1bcf01a 100755
--- a/t/test-terminal.perl
+++ b/t/test-terminal.perl
@@ -81,24 +81,24 @@
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/tag.c b/tag.c
index 71b5444..3e18a41 100644
--- a/tag.c
+++ b/tag.c
@@ -13,26 +13,27 @@
static int run_gpg_verify(const char *buf, unsigned long size, unsigned flags)
{
struct signature_check sigc;
- size_t payload_size;
+ struct strbuf payload = STRBUF_INIT;
+ struct strbuf signature = STRBUF_INIT;
int ret;
memset(&sigc, 0, sizeof(sigc));
- payload_size = parse_signature(buf, size);
-
- if (size == payload_size) {
+ if (!parse_signature(buf, size, &payload, &signature)) {
if (flags & GPG_VERIFY_VERBOSE)
- write_in_full(1, buf, payload_size);
+ write_in_full(1, buf, size);
return error("no signature found");
}
- ret = check_signature(buf, payload_size, buf + payload_size,
- size - payload_size, &sigc);
+ ret = check_signature(payload.buf, payload.len, signature.buf,
+ signature.len, &sigc);
if (!(flags & GPG_VERIFY_OMIT_STATUS))
print_signature_buffer(&sigc, flags);
signature_check_clear(&sigc);
+ strbuf_release(&payload);
+ strbuf_release(&signature);
return ret;
}
@@ -103,7 +104,7 @@
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)
diff --git a/tempfile.c b/tempfile.c
index d43ad8c..94aa18f 100644
--- a/tempfile.c
+++ b/tempfile.c
@@ -130,17 +130,17 @@
}
/* 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/tempfile.h b/tempfile.h
index cddda0a..4de3bc7 100644
--- a/tempfile.h
+++ b/tempfile.h
@@ -88,8 +88,16 @@
* 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/templates/hooks--pre-push.sample b/templates/hooks--pre-push.sample
index 6187dbf..4ce688d 100755
--- a/templates/hooks--pre-push.sample
+++ b/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/templates/hooks--push-to-checkout.sample b/templates/hooks--push-to-checkout.sample
new file mode 100755
index 0000000..af5a0c0
--- /dev/null
+++ b/templates/hooks--push-to-checkout.sample
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# An example hook script to update a checked-out tree on a git push.
+#
+# This hook is invoked by git-receive-pack(1) when it reacts to git
+# push and updates reference(s) in its repository, and when the push
+# tries to update the branch that is currently checked out and the
+# receive.denyCurrentBranch configuration variable is set to
+# updateInstead.
+#
+# By default, such a push is refused if the working tree and the index
+# of the remote repository has any difference from the currently
+# checked out commit; when both the working tree and the index match
+# the current commit, they are updated to match the newly pushed tip
+# of the branch. This hook is to be used to override the default
+# behaviour; however the code below reimplements the default behaviour
+# as a starting point for convenient modification.
+#
+# The hook receives the commit with which the tip of the current
+# branch is going to be updated:
+commit=$1
+
+# It can exit with a non-zero status to refuse the push (when it does
+# so, it must not modify the index or the working tree).
+die () {
+ echo >&2 "$*"
+ exit 1
+}
+
+# Or it can make any necessary changes to the working tree and to the
+# index to bring them to the desired state when the tip of the current
+# branch is updated to the new commit, and exit with a zero status.
+#
+# For example, the hook can simply run git read-tree -u -m HEAD "$1"
+# in order to emulate git fetch that is run in the reverse direction
+# with git push, as the two-tree form of git read-tree -u -m is
+# essentially the same as git switch or git checkout that switches
+# branches while keeping the local changes in the working tree that do
+# not interfere with the difference between the branches.
+
+# The below is a more-or-less exact translation to shell of the C code
+# for the default behaviour for git's push-to-checkout hook defined in
+# the push_to_deploy() function in builtin/receive-pack.c.
+#
+# Note that the hook will be executed from the repository directory,
+# not from the working tree, so if you want to perform operations on
+# the working tree, you will have to adapt your code accordingly, e.g.
+# by adding "cd .." or using relative paths.
+
+if ! git update-index -q --ignore-submodules --refresh
+then
+ die "Up-to-date check failed"
+fi
+
+if ! git diff-files --quiet --ignore-submodules --
+then
+ die "Working directory has unstaged changes"
+fi
+
+# This is a rough translation of:
+#
+# head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX
+if git cat-file -e HEAD 2>/dev/null
+then
+ head=HEAD
+else
+ head=$(git hash-object -t tree --stdin </dev/null)
+fi
+
+if ! git diff-index --quiet --cached --ignore-submodules $head --
+then
+ die "Working directory has staged changes"
+fi
+
+if ! git read-tree -u -m "$commit"
+then
+ die "Could not update working tree to new HEAD"
+fi
diff --git a/templates/hooks--update.sample b/templates/hooks--update.sample
index 5014c4b..c4d426b 100755
--- a/templates/hooks--update.sample
+++ b/templates/hooks--update.sample
@@ -60,7 +60,7 @@
# --- 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/tmp-objdir.c b/tmp-objdir.c
index 91c0056..b8d880e 100644
--- a/tmp-objdir.c
+++ b/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 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 @@
* 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 @@
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 @@
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());
@@ -185,9 +185,11 @@
return 1;
if (ends_with(name, ".pack"))
return 2;
- if (ends_with(name, ".idx"))
+ if (ends_with(name, ".rev"))
return 3;
- return 4;
+ if (ends_with(name, ".idx"))
+ return 4;
+ return 5;
}
static int pack_copy_cmp(const char *a, const char *b)
@@ -283,7 +285,7 @@
{
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/trace.c b/trace.c
index b3ef0e6..f726686 100644
--- a/trace.c
+++ b/trace.c
@@ -29,7 +29,7 @@
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 @@
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 @@
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)
@@ -112,7 +124,7 @@
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);
@@ -383,7 +395,7 @@
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/trace.h b/trace.h
index 9826618..0dbbad0 100644
--- a/trace.h
+++ b/trace.h
@@ -102,6 +102,12 @@
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.
*/
diff --git a/trace2.c b/trace2.c
index c7b4f14..256120c 100644
--- a/trace2.c
+++ b/trace2.c
@@ -121,6 +121,7 @@
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 @@
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)
{
@@ -783,3 +792,8 @@
va_end(ap);
}
#endif
+
+const char *trace2_session_id(void)
+{
+ return tr2_sid_get();
+}
diff --git a/trace2.h b/trace2.h
index e5e81c0..ede18c2 100644
--- a/trace2.h
+++ b/trace2.h
@@ -183,6 +183,19 @@
#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 "important".
*
@@ -487,4 +500,6 @@
} while (0)
#endif
+const char *trace2_session_id(void);
+
#endif /* TRACE2_H */
diff --git a/trace2/tr2_cfg.c b/trace2/tr2_cfg.c
index caa7f06..ec9ac1a 100644
--- a/trace2/tr2_cfg.c
+++ b/trace2/tr2_cfg.c
@@ -7,6 +7,10 @@
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 @@
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 @@
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/trace2/tr2_cfg.h b/trace2/tr2_cfg.h
index d9c98f6..a11d71f 100644
--- a/trace2/tr2_cfg.h
+++ b/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_free_patterns(void);
+void tr2_cfg_free_env_vars(void);
+
#endif /* TR2_CFG_H */
diff --git a/trace2/tr2_sysenv.c b/trace2/tr2_sysenv.c
index 3c3792e..a380dcf 100644
--- a/trace2/tr2_sysenv.c
+++ b/trace2/tr2_sysenv.c
@@ -29,6 +29,8 @@
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" },
diff --git a/trace2/tr2_sysenv.h b/trace2/tr2_sysenv.h
index d4364a7..3292ee1 100644
--- a/trace2/tr2_sysenv.h
+++ b/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,
diff --git a/trailer.c b/trailer.c
index 0c414f2..be4e972 100644
--- a/trailer.c
+++ b/trailer.c
@@ -174,7 +174,7 @@
static struct trailer_item *trailer_from_arg(struct arg_item *arg_tok)
{
- struct trailer_item *new_item = xcalloc(sizeof(*new_item), 1);
+ struct trailer_item *new_item = xcalloc(1, sizeof(*new_item));
new_item->token = arg_tok->token;
new_item->value = arg_tok->value;
arg_tok->token = arg_tok->value = NULL;
@@ -221,15 +221,13 @@
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;
@@ -447,7 +445,7 @@
}
/* Item does not already exists, create it */
- item = xcalloc(sizeof(*item), 1);
+ CALLOC_ARRAY(item, 1);
duplicate_conf(&item->conf, &default_conf_info);
item->conf.name = xstrdup(name);
@@ -666,7 +664,7 @@
static struct trailer_item *add_trailer_item(struct list_head *head, char *tok,
char *val)
{
- struct trailer_item *new_item = xcalloc(sizeof(*new_item), 1);
+ struct trailer_item *new_item = xcalloc(1, sizeof(*new_item));
new_item->token = tok;
new_item->value = val;
list_add_tail(&new_item->list, head);
@@ -677,7 +675,7 @@
const struct conf_info *conf,
const struct new_trailer_item *new_trailer_item)
{
- struct arg_item *new_item = xcalloc(sizeof(*new_item), 1);
+ struct arg_item *new_item = xcalloc(1, sizeof(*new_item));
new_item->token = tok;
new_item->value = val;
duplicate_conf(&new_item->conf, conf);
@@ -1133,7 +1131,9 @@
size_t i;
/* If we want the whole block untouched, we can take the fast path. */
- if (!opts->only_trailers && !opts->unfold && !opts->filter && !opts->separator) {
+ if (!opts->only_trailers && !opts->unfold && !opts->filter &&
+ !opts->separator && !opts->key_only && !opts->value_only &&
+ !opts->key_value_separator) {
strbuf_add(out, info->trailer_start,
info->trailer_end - info->trailer_start);
return;
@@ -1155,8 +1155,15 @@
if (opts->separator && out->len != origlen)
strbuf_addbuf(out, opts->separator);
if (!opts->value_only)
- strbuf_addf(out, "%s: ", tok.buf);
- strbuf_addbuf(out, &val);
+ strbuf_addbuf(out, &tok);
+ if (!opts->key_only && !opts->value_only) {
+ if (opts->key_value_separator)
+ strbuf_addbuf(out, opts->key_value_separator);
+ else
+ strbuf_addstr(out, ": ");
+ }
+ if (!opts->key_only)
+ strbuf_addbuf(out, &val);
if (!opts->separator)
strbuf_addch(out, '\n');
}
@@ -1185,3 +1192,39 @@
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/trailer.h b/trailer.h
index 203acf4..795d2fc 100644
--- a/trailer.h
+++ b/trailer.h
@@ -2,8 +2,7 @@
#define TRAILER_H
#include "list.h"
-
-struct strbuf;
+#include "strbuf.h"
enum trailer_where {
WHERE_DEFAULT,
@@ -72,8 +71,10 @@
int only_input;
int unfold;
int no_divider;
+ int key_only;
int value_only;
const struct strbuf *separator;
+ const struct strbuf *key_value_separator;
int (*filter)(const struct strbuf *, void *);
void *filter_data;
};
@@ -103,4 +104,46 @@
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/transport-helper.c b/transport-helper.c
index 20a7185..4cd7636 100644
--- a/transport-helper.c
+++ b/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,8 @@
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
@@ -127,17 +128,17 @@
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)
@@ -207,6 +208,8 @@
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"),
@@ -410,10 +413,11 @@
exit(128);
if (skip_prefix(buf.buf, "lock ", &name)) {
- if (transport->pack_lockfile)
+ 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 &&
@@ -435,13 +439,13 @@
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, "--allow-unsafe-features");
- 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;
@@ -462,17 +466,17 @@
/* 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);
@@ -719,13 +723,61 @@
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) {
+ CALLOC_ARRAY(state->hint->report, 1);
+ state->report = state->hint->report;
+ } else {
+ state->report = state->hint->report;
+ while (state->report->next)
+ state->report = state->report->next;
+ CALLOC_ARRAY(state->report->next, 1);
+ 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;
@@ -775,22 +827,26 @@
status = REF_STATUS_REJECT_STALE;
FREE_AND_NULL(msg);
}
+ else if (!strcmp(msg, "remote ref updated since checkout")) {
+ status = REF_STATUS_REJECT_REMOTE_UPDATED;
+ FREE_AND_NULL(msg);
+ }
else if (!strcmp(msg, "forced update")) {
forced = 1;
FREE_AND_NULL(msg);
}
}
- 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'.
@@ -799,9 +855,11 @@
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);
}
@@ -809,37 +867,57 @@
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;
-
- if (push_update_ref_status(&buf, &ref, remote_refs))
- continue;
-
- if (flags & TRANSPORT_PUSH_DRY_RUN || !data->rs.nr || data->no_private_update)
- continue;
-
- /* propagate back the update to the remote namespace */
- private = apply_refspecs(&data->rs, ref->name);
- if (!private)
- continue;
- update_ref("update by helper", private, &ref->new_oid, NULL,
- 0, 0);
- free(private);
+ push_update_ref_status(&buf, &state, remote_refs);
}
strbuf_release(&buf);
- return ret;
+
+ if (flags & TRANSPORT_PUSH_DRY_RUN || !data->rs.nr || data->no_private_update)
+ return 0;
+
+ /* propagate back the update to the remote namespace */
+ for (ref = remote_refs; ref; ref = ref->next) {
+ char *private;
+
+ if (ref->status != REF_STATUS_OK)
+ continue;
+
+ 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);
+ }
+ }
+ }
+ return 0;
}
static void set_common_push_options(struct transport *transport,
@@ -860,6 +938,11 @@
if (set_helper_option(transport, TRANS_OPT_ATOMIC, "true") != 0)
die(_("helper %s does not support --atomic"), name);
+ if (flags & TRANSPORT_PUSH_FORCE_IF_INCLUDES)
+ if (set_helper_option(transport, TRANS_OPT_FORCE_IF_INCLUDES, "true") != 0)
+ die(_("helper %s does not support --%s"),
+ name, TRANS_OPT_FORCE_IF_INCLUDES);
+
if (flags & TRANSPORT_PUSH_OPTIONS) {
struct string_list_item *item;
for_each_string_list_item(item, transport->push_options)
@@ -893,7 +976,9 @@
case REF_STATUS_REJECT_NONFASTFORWARD:
case REF_STATUS_REJECT_STALE:
case REF_STATUS_REJECT_ALREADY_EXISTS:
+ case REF_STATUS_REJECT_REMOTE_UPDATED:
if (atomic) {
+ reject_atomic_push(remote_refs, mirror);
string_list_clear(&cas_options, 0);
return 0;
} else
@@ -1045,7 +1130,7 @@
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;
}
@@ -1077,13 +1162,14 @@
}
static struct ref *get_refs_list(struct transport *transport, int for_push,
- const struct argv_array *ref_prefixes)
+ struct transport_ls_refs_options *transport_options)
{
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 transport->vtable->get_refs_list(transport, for_push,
+ transport_options);
}
return get_refs_list_using_list(transport, for_push);
@@ -1102,6 +1188,12 @@
data->get_refs_list_called = 1;
helper = get_helper(transport);
+ 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)
write_str_in_full(helper->in, "list for-push\n");
else
@@ -1114,6 +1206,17 @@
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)
@@ -1126,7 +1229,7 @@
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;
@@ -1488,3 +1591,25 @@
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/transport-internal.h b/transport-internal.h
index 1cde625..b60f1ba 100644
--- a/transport-internal.h
+++ b/transport-internal.h
@@ -3,7 +3,8 @@
struct ref;
struct transport;
-struct argv_array;
+struct strvec;
+struct transport_ls_refs_options;
struct transport_vtable {
/**
@@ -18,19 +19,12 @@
* the transport to try to share connections, for_push is a
* hint as to whether the ultimate operation is a push or a fetch.
*
- * If communicating using protocol v2 a list of prefixes can be
- * provided to be sent to the server to enable it to limit the ref
- * advertisement. Since ref filtering is done on the server's end, and
- * only when using protocol v2, this list will be ignored when not
- * using protocol v2 meaning this function can return refs which don't
- * match the provided ref_prefixes.
- *
* If the transport is able to determine the remote hash for
* the ref without a huge amount of effort, it should store it
* 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);
+ struct transport_ls_refs_options *transport_options);
/**
* Fetch the objects for the given refs. Note that this gets
diff --git a/transport.c b/transport.c
index 1fdc7da..1c4ab67 100644
--- a/transport.c
+++ b/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"
@@ -127,7 +127,7 @@
static struct ref *get_refs_from_bundle(struct transport *transport,
int for_push,
- const struct argv_array *ref_prefixes)
+ struct transport_ls_refs_options *transport_options)
{
struct bundle_transport_data *data = transport->data;
struct ref *result = NULL;
@@ -143,6 +143,9 @@
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);
@@ -157,11 +160,14 @@
int nr_heads, struct ref **to_fetch)
{
struct bundle_transport_data *data = transport->data;
+ int ret;
if (!data->get_refs_from_bundle_called)
get_refs_from_bundle(transport, 0, NULL);
- return unbundle(the_repository, &data->header, data->fd,
- transport->progress ? BUNDLE_VERBOSE : 0);
+ 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)
@@ -226,9 +232,6 @@
} 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);
@@ -277,12 +280,14 @@
* remote refs.
*/
static struct ref *handshake(struct transport *transport, int for_push,
- const struct argv_array *ref_prefixes,
+ struct transport_ls_refs_options *options,
int must_list_refs)
{
struct git_transport_data *data = transport->data;
struct ref *refs = NULL;
struct packet_reader reader;
+ int sid_len;
+ const char *server_sid;
connect_setup(transport, for_push);
@@ -294,10 +299,13 @@
data->version = discover_version(&reader);
switch (data->version) {
case protocol_v2:
+ if (server_feature_v2("session-id", &server_sid))
+ trace2_data_string("transfer", NULL, "server-sid", server_sid);
if (must_list_refs)
get_remote_refs(data->fd[1], &reader, &refs, for_push,
- ref_prefixes,
- transport->server_options);
+ options,
+ transport->server_options,
+ transport->stateless_rpc);
break;
case protocol_v1:
case protocol_v0:
@@ -306,11 +314,18 @@
for_push ? REF_NORMAL : 0,
&data->extra_have,
&data->shallow);
+ server_sid = server_feature_value("session-id", &sid_len);
+ if (server_sid) {
+ char *sid = xstrndup(server_sid, sid_len);
+ trace2_data_string("transfer", NULL, "server-sid", sid);
+ free(sid);
+ }
break;
case protocol_unknown_version:
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()");
@@ -319,9 +334,9 @@
}
static struct ref *get_refs_via_connect(struct transport *transport, int for_push,
- const struct argv_array *ref_prefixes)
+ struct transport_ls_refs_options *options)
{
- return handshake(transport, for_push, ref_prefixes, 1);
+ return handshake(transport, for_push, options, 1);
}
static int fetch_refs_via_pack(struct transport *transport,
@@ -351,7 +366,6 @@
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;
@@ -369,24 +383,15 @@
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]);
@@ -437,37 +442,67 @@
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
@@ -481,9 +516,11 @@
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);
@@ -493,24 +530,52 @@
}
}
-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";
@@ -519,16 +584,17 @@
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) {
@@ -540,65 +606,94 @@
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_REMOTE_UPDATED:
+ print_ref_status('!', "[rejected]", ref, ref->peer_ref,
+ "remote ref updated since checkout",
+ 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];
@@ -663,6 +758,8 @@
*reject_reasons |= REJECT_FETCH_FIRST;
} else if (ref->status == REF_STATUS_REJECT_NEEDS_FORCE) {
*reject_reasons |= REJECT_NEEDS_FORCE;
+ } else if (ref->status == REF_STATUS_REJECT_REMOTE_UPDATED) {
+ *reject_reasons |= REJECT_REF_NEEDS_UPDATE;
}
}
free(head);
@@ -715,7 +812,15 @@
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;
@@ -766,7 +871,7 @@
BUG("taking over transport requires non-NULL "
"smart_options field.");
- data = xcalloc(1, sizeof(*data));
+ CALLOC_ARRAY(data, 1);
data->options = *transport->smart_options;
data->conn = child;
data->fd[0] = data->conn->out;
@@ -921,6 +1026,7 @@
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()");
@@ -988,9 +1094,16 @@
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)
{
@@ -1089,6 +1202,7 @@
if (!r->peer_ref) continue;
if (r->status == REF_STATUS_REJECT_NONFASTFORWARD) continue;
if (r->status == REF_STATUS_REJECT_STALE) continue;
+ if (r->status == REF_STATUS_REJECT_REMOTE_UPDATED) continue;
if (r->status == REF_STATUS_UPTODATE) continue;
strbuf_reset(&buf);
@@ -1138,19 +1252,20 @@
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 transport_ls_refs_options transport_options =
+ TRANSPORT_LS_REFS_OPTIONS_INIT;
if (check_push_refs(local_refs, rs) < 0)
return -1;
- refspec_ref_prefixes(rs, &ref_prefixes);
+ refspec_ref_prefixes(rs, &transport_options.ref_prefixes);
trace2_region_enter("transport_push", "get_refs_list", r);
remote_refs = transport->vtable->get_refs_list(transport, 1,
- &ref_prefixes);
+ &transport_options);
trace2_region_leave("transport_push", "get_refs_list", r);
- argv_array_clear(&ref_prefixes);
+ strvec_clear(&transport_options.ref_prefixes);
if (flags & TRANSPORT_PUSH_ALL)
match_flags |= MATCH_REFS_ALL;
@@ -1240,20 +1355,6 @@
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,
@@ -1280,12 +1381,12 @@
}
const struct ref *transport_get_remote_refs(struct transport *transport,
- const struct argv_array *ref_prefixes)
+ struct transport_ls_refs_options *transport_options)
{
if (!transport->got_remote_refs) {
transport->remote_refs =
transport->vtable->get_refs_list(transport, 0,
- ref_prefixes);
+ transport_options);
transport->got_remote_refs = 1;
}
@@ -1330,10 +1431,11 @@
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/transport.h b/transport.h
index e0131da..24e1579 100644
--- a/transport.h
+++ b/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 @@
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 @@
*/
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 git_transport_options *smart_options;
enum transport_family family;
+
+ const struct git_hash_algo *hash_algo;
};
#define TRANSPORT_PUSH_ALL (1<<0)
@@ -133,6 +136,7 @@
#define TRANSPORT_PUSH_ATOMIC (1<<13)
#define TRANSPORT_PUSH_OPTIONS (1<<14)
#define TRANSPORT_RECURSE_SUBMODULES_ONLY (1<<15)
+#define TRANSPORT_PUSH_FORCE_IF_INCLUDES (1<<16)
int transport_summary_width(const struct ref *refs);
@@ -199,18 +203,15 @@
/* 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"
+/* Require remote changes to be integrated locally. */
+#define TRANS_OPT_FORCE_IF_INCLUDES "force-if-includes"
+
/**
* Returns 0 if the option was used, non-zero otherwise. Prints a
* message to stderr if the option is not used.
@@ -220,29 +221,51 @@
void transport_set_verbosity(struct transport *transport, int verbosity,
int force_progress);
-#define REJECT_NON_FF_HEAD 0x01
-#define REJECT_NON_FF_OTHER 0x02
-#define REJECT_ALREADY_EXISTS 0x04
-#define REJECT_FETCH_FIRST 0x08
-#define REJECT_NEEDS_FORCE 0x10
+#define REJECT_NON_FF_HEAD 0x01
+#define REJECT_NON_FF_OTHER 0x02
+#define REJECT_ALREADY_EXISTS 0x04
+#define REJECT_FETCH_FIRST 0x08
+#define REJECT_NEEDS_FORCE 0x10
+#define REJECT_REF_NEEDS_UPDATE 0x20
int transport_push(struct repository *repo,
struct transport *connection,
struct refspec *rs, int flags,
unsigned int * reject_reasons);
+struct transport_ls_refs_options {
+ /*
+ * Optionally, a list of ref prefixes can be provided which can be sent
+ * to the server (when communicating using protocol v2) to enable it to
+ * limit the ref advertisement. Since ref filtering is done on the
+ * server's end (and only when using protocol v2),
+ * transport_get_remote_refs() could return refs which don't match the
+ * provided ref_prefixes.
+ */
+ struct strvec ref_prefixes;
+
+ /*
+ * If unborn_head_target is not NULL, and the remote reports HEAD as
+ * pointing to an unborn branch, transport_get_remote_refs() stores the
+ * unborn branch in unborn_head_target. It should be freed by the
+ * caller.
+ */
+ char *unborn_head_target;
+};
+#define TRANSPORT_LS_REFS_OPTIONS_INIT { STRVEC_INIT }
+
/*
* Retrieve refs from a remote.
- *
- * Optionally a list of ref prefixes can be provided which can be sent to the
- * server (when communicating using protocol v2) to enable it to limit the ref
- * advertisement. Since ref filtering is done on the server's end (and only
- * when using protocol v2), this can return refs which don't match the provided
- * ref_prefixes.
*/
const struct ref *transport_get_remote_refs(struct transport *transport,
- const struct argv_array *ref_prefixes);
+ struct transport_ls_refs_options *transport_options);
+/*
+ * 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);
@@ -265,4 +288,7 @@
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/tree-diff.c b/tree-diff.c
index 33ded7f..7cebbb3 100644
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -29,9 +29,9 @@
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 @@
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 @@
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 @@
}
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/tree-walk.c b/tree-walk.c
index bb0ad34..2d6226d 100644
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -4,6 +4,7 @@
#include "object-store.h"
#include "tree.h"
#include "pathspec.h"
+#include "json-writer.h"
static const char *get_mode(const char *str, unsigned int *modep)
{
@@ -167,6 +168,25 @@
return 1;
}
+static int traverse_trees_atexit_registered;
+static int traverse_trees_count;
+static int traverse_trees_cur_depth;
+static int traverse_trees_max_depth;
+
+static void trace2_traverse_trees_statistics_atexit(void)
+{
+ struct json_writer jw = JSON_WRITER_INIT;
+
+ jw_object_begin(&jw, 0);
+ jw_object_intmax(&jw, "traverse_trees_count", traverse_trees_count);
+ jw_object_intmax(&jw, "traverse_trees_max_depth", traverse_trees_max_depth);
+ jw_end(&jw);
+
+ trace2_data_json("traverse_trees", the_repository, "statistics", &jw);
+
+ jw_release(&jw);
+}
+
void setup_traverse_info(struct traverse_info *info, const char *base)
{
size_t pathlen = strlen(base);
@@ -180,6 +200,11 @@
info->namelen = pathlen;
if (pathlen)
info->prev = &dummy;
+
+ if (trace2_is_enabled() && !traverse_trees_atexit_registered) {
+ atexit(trace2_traverse_trees_statistics_atexit);
+ traverse_trees_atexit_registered = 1;
+ }
}
char *make_traverse_path(char *path, size_t pathlen,
@@ -416,6 +441,12 @@
int interesting = 1;
char *traverse_path;
+ traverse_trees_count++;
+ traverse_trees_cur_depth++;
+
+ if (traverse_trees_cur_depth > traverse_trees_max_depth)
+ traverse_trees_max_depth = traverse_trees_cur_depth;
+
if (n >= ARRAY_SIZE(entry))
BUG("traverse_trees() called with too many trees (%d)", n);
@@ -515,6 +546,8 @@
free(traverse_path);
info->traverse_path = NULL;
strbuf_release(&base);
+
+ traverse_trees_cur_depth--;
return error;
}
@@ -851,7 +884,14 @@
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;
}
diff --git a/tree.c b/tree.c
index 1466bcc..a524798 100644
--- a/tree.c
+++ b/tree.c
@@ -144,7 +144,7 @@
return ret;
}
-static int cmp_cache_name_compare(const void *a_, const void *b_)
+int cmp_cache_name_compare(const void *a_, const void *b_)
{
const struct cache_entry *ce1, *ce2;
@@ -200,7 +200,7 @@
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)
diff --git a/tree.h b/tree.h
index 9383745..3eb0484 100644
--- a/tree.h
+++ b/tree.h
@@ -28,6 +28,8 @@
/* Parses and returns the tree in the given ent, chasing tags and commits. */
struct tree *parse_tree_indirect(const struct object_id *oid);
+int cmp_cache_name_compare(const void *a_, const void *b_);
+
#define READ_TREE_RECURSIVE 1
typedef int (*read_tree_fn_t)(const struct object_id *, struct strbuf *, const char *, unsigned int, int, void *);
diff --git a/unpack-trees.c b/unpack-trees.c
index 1ecdab3..9298fe1 100644
--- a/unpack-trees.c
+++ b/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"
@@ -24,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.",
@@ -43,17 +43,20 @@
/* 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_ORPHANED_OVERWRITTEN */
- "Working tree file '%s' would be overwritten by sparse checkout update.",
-
- /* ERROR_WOULD_LOSE_ORPHANED_REMOVED */
- "Working tree file '%s' would be removed by sparse checkout update.",
-
/* ERROR_WOULD_LOSE_SUBMODULE */
"Submodule '%s' cannot checkout new HEAD.",
+
+ /* NB_UNPACK_TREES_ERROR_TYPES; just a meta value */
+ "",
+
+ /* WARNING_SPARSE_NOT_UPTODATE_FILE */
+ "Path '%s' not uptodate; will not remove from working tree.",
+
+ /* 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) \
@@ -103,7 +106,7 @@
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
@@ -121,7 +124,7 @@
"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");
@@ -142,7 +145,7 @@
"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
@@ -160,7 +163,7 @@
"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
@@ -168,15 +171,16 @@
*/
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++)
@@ -185,7 +189,7 @@
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));
}
@@ -226,7 +230,7 @@
/*
* 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;
@@ -237,13 +241,16 @@
*/
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));
@@ -251,10 +258,36 @@
}
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,
@@ -300,10 +333,10 @@
}
}
-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;
@@ -357,12 +390,12 @@
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;
@@ -371,6 +404,7 @@
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);
@@ -381,7 +415,10 @@
if (o->clone)
setup_collided_checkout_detection(&state, index);
- progress = get_progress(o);
+ progress = get_progress(o, index);
+
+ /* Start with clean cache to avoid using any possibly outdated info. */
+ invalidate_lstat_cache();
git_attr_set_direction(GIT_ATTR_CHECKOUT);
@@ -422,9 +459,8 @@
continue;
oid_array_append(&to_fetch, &ce->oid);
}
- if (to_fetch.nr)
- promisor_remote_get_direct(the_repository,
- 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++) {
@@ -504,19 +540,39 @@
* 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)
{
@@ -1493,6 +1549,16 @@
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)
+{
+ if (get_sparse_checkout_patterns(pl) < 0)
+ o->skip_sparse_checkout = 1;
+ else
+ o->pl = pl;
+}
+
+
static int verify_absent(const struct cache_entry *,
enum unpack_trees_error_types,
struct unpack_trees_options *);
@@ -1507,22 +1573,20 @@
int i, ret;
static struct cache_entry *dfc;
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(&pl, 0, sizeof(pl));
+ trace2_region_enter("unpack_trees", "unpack_trees", the_repository);
+
if (!core_apply_sparse_checkout || !o->update)
o->skip_sparse_checkout = 1;
if (!o->skip_sparse_checkout && !o->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);
+ memset(&pl, 0, sizeof(pl));
+ free_pattern_list = 1;
+ populate_from_existing_patterns(o, &pl);
}
memset(&o->result, 0, sizeof(o->result));
@@ -1548,8 +1612,8 @@
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;
+ o->result.fsmonitor_last_update =
+ xstrdup_or_null(o->src_index->fsmonitor_last_update);
/*
* Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries
@@ -1590,7 +1654,9 @@
}
trace_performance_enter();
+ trace2_region_enter("unpack_trees", "traverse_trees", the_repository);
ret = traverse_trees(o->src_index, len, t, &info);
+ trace2_region_leave("unpack_trees", "traverse_trees", the_repository);
trace_performance_leave("traverse_trees");
if (ret < 0)
goto return_failed;
@@ -1614,11 +1680,9 @@
}
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->pl, &o->result,
@@ -1638,43 +1702,29 @@
* 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;
- }
+ verify_absent(ce, WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN, o))
+ 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;
-
+ 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) {
if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0))
cache_tree_verify(the_repository, &o->result);
- if (!o->result.cache_tree)
- o->result.cache_tree = cache_tree();
if (!cache_tree_fully_valid(o->result.cache_tree))
cache_tree_update(&o->result,
WRITE_TREE_SILENT |
@@ -1690,9 +1740,10 @@
o->src_index = NULL;
done:
- trace_performance_leave("unpack_trees");
- if (!o->keep_pattern_list)
+ if (free_pattern_list)
clear_pattern_list(&pl);
+ trace2_region_leave("unpack_trees", "unpack_trees", the_repository);
+ trace_performance_leave("unpack_trees");
return ret;
return_failed:
@@ -1705,6 +1756,74 @@
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,
@@ -1789,7 +1908,7 @@
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);
}
/*
@@ -1815,9 +1934,6 @@
/*
* 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,
@@ -2030,11 +2146,7 @@
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,
@@ -2067,7 +2179,7 @@
}
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);
@@ -2096,7 +2208,7 @@
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);
diff --git a/unpack-trees.h b/unpack-trees.h
index ae1557f..2e87875 100644
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -2,7 +2,7 @@
#define UNPACK_TREES_H
#include "cache.h"
-#include "argv-array.h"
+#include "strvec.h"
#include "string-list.h"
#include "tree-walk.h"
@@ -22,11 +22,15 @@
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,
};
/*
@@ -59,20 +63,19 @@
quiet,
exiting_early,
show_all_errors,
- dry_run,
- keep_pattern_list;
+ dry_run;
const char *prefix;
int cache_bottom;
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;
@@ -85,11 +88,21 @@
struct index_state result;
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/upload-pack.c b/upload-pack.c
index c53249c..e19583a 100644
--- a/upload-pack.c
+++ b/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,132 @@
#define ALL_FLAGS (THEY_HAVE | OUR_REF | WANTED | COMMON_KNOWN | SHALLOW | \
NOT_SHALLOW | CLIENT_SHALLOW | HIDDEN_REF)
-static timestamp_t oldest_have;
+/* 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
+};
-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).
+/*
+ * 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 */
-static int filter_capability_requested;
-static int allow_filter;
-static int allow_ref_in_want;
-static struct list_objects_filter_options filter_options;
+ 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;
-static int allow_sideband_all;
+ unsigned int timeout; /* v0 only */
+ enum {
+ NO_MULTI_ACK = 0,
+ MULTI_ACK = 1,
+ MULTI_ACK_DETAILED = 2
+ } multi_ack; /* v0 only */
-static void reset_timeout(void)
+ /* 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 */
+ unsigned advertise_sid : 1;
+};
+
+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);
+
+ data->keepalive = 5;
+ data->advertise_sid = 0;
+}
+
+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, 0);
+
+ free((char *)data->pack_objects_hook);
+}
+
+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,80 +192,150 @@
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");
+ 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");
- 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.choice) {
+ 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(&filter_options);
- if (pack_objects.use_shell) {
- struct strbuf buf = STRBUF_INIT;
- sq_quote_buf(&buf, spec);
- argv_array_pushf(&pack_objects.args, "--filter=%s", buf.buf);
- strbuf_release(&buf);
- } else {
- argv_array_pushf(&pack_objects.args, "--filter=%s",
- spec);
- }
+ expand_list_objects_filter_spec(&pack_data->filter_options);
+ 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;
pack_objects.err = -1;
+ pack_objects.clean_on_exit = 1;
if (start_command(&pack_objects))
die("git upload-pack: unable to fork git-pack-objects");
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);
@@ -186,10 +346,10 @@
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;
@@ -210,8 +370,11 @@
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) {
@@ -227,7 +390,8 @@
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;
@@ -238,39 +402,17 @@
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);
}
/*
@@ -283,7 +425,7 @@
* 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);
}
@@ -295,32 +437,26 @@
}
/* 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) {
@@ -330,36 +466,45 @@
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)
{
- uint32_t min_generation = GENERATION_NUMBER_ZERO;
+ 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);
+}
- if (!have_obj->nr)
+static int ok_to_give_up(struct upload_pack_data *data)
+{
+ timestamp_t min_generation = GENERATION_NUMBER_ZERO;
+
+ 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];
@@ -372,34 +517,37 @@
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
@@ -409,19 +557,19 @@
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;
}
@@ -432,10 +580,10 @@
}
}
-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);
}
@@ -444,15 +592,15 @@
*/
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;
@@ -470,35 +618,34 @@
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);
@@ -507,14 +654,14 @@
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;
@@ -523,7 +670,8 @@
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) {
@@ -554,13 +702,13 @@
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;
/*
@@ -585,14 +733,12 @@
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;
@@ -601,18 +747,18 @@
* 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",
@@ -621,32 +767,30 @@
}
}
-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;
/*
@@ -662,10 +806,10 @@
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);
@@ -674,17 +818,16 @@
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;
@@ -695,87 +838,80 @@
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;
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;
}
@@ -848,43 +984,95 @@
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 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;
+ struct strbuf buf = STRBUF_INIT;
+ va_list ap;
- shallow_nr = 0;
- packet_writer_init(&writer, 1);
+ 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)
+{
+ int has_non_tip = 0;
+
+ data->shallow_nr = 0;
for (;;) {
struct object *o;
const char *features;
struct object_id oid_buf;
const char *arg;
+ int feature_len;
- 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");
- list_objects_filter_die_if_populated(&filter_options);
- 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 +1082,39 @@
"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;
+
+ arg = parse_feature_value(features, "session-id", &feature_len, NULL);
+ if (arg) {
+ char *client_sid = xstrndup(arg, feature_len);
+ trace2_data_string("transfer", NULL, "client-sid", client_sid);
+ free(client_sid);
+ }
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 +1122,10 @@
}
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 +1137,16 @@
* 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 */
@@ -989,6 +1182,11 @@
strbuf_addf(buf, " symref=%s:%s", item->string, (char *)item->util);
}
+static void format_session_id(struct strbuf *buf, struct upload_pack_data *d) {
+ if (d->advertise_sid)
+ strbuf_addf(buf, " session-id=%s", trace2_session_id());
+}
+
static int send_ref(const char *refname, const struct object_id *oid,
int flag, void *cb_data)
{
@@ -997,31 +1195,37 @@
" 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;
if (capabilities) {
struct strbuf symref_info = STRBUF_INIT;
+ struct strbuf session_id = 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);
+ format_session_id(&session_id, data);
+ packet_write_fmt(1, "%s %s%c%s%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" : "",
+ session_id.buf,
+ the_hash_algo->name,
git_user_agent_sanitized());
strbuf_release(&symref_info);
+ strbuf_release(&session_id);
} else {
packet_write_fmt(1, "%s %s\n", oid_to_hex(oid), refname_nons);
}
capabilities = NULL;
- if (!peel_ref(refname, &peeled))
+ if (!peel_iterated_oid(oid, &peeled))
packet_write_fmt(1, "%s %s^{}\n", oid_to_hex(&peeled), refname_nons);
return 0;
}
@@ -1042,133 +1246,138 @@
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);
+ } else if (!strcmp("transfer.advertisesid", var)) {
+ data->advertise_sid = git_config_bool(var, value);
}
if (current_config_scope() != CONFIG_SCOPE_LOCAL &&
- current_config_scope() != CONFIG_SCOPE_WORKTREE) {
+ 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);
}
+ if (parse_object_filter_config(var, value, data) < 0)
+ return -1;
+
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;
- stateless_rpc = options->stateless_rpc;
- timeout = options->timeout;
- daemon_mode = options->daemon_mode;
+ upload_pack_data_init(&data);
- git_config(upload_pack_config, NULL);
+ git_config(upload_pack_config, &data);
- head_ref_namespaced(find_symref, &symref);
+ data.stateless_rpc = options->stateless_rpc;
+ data.daemon_mode = options->daemon_mode;
+ data.timeout = options->timeout;
- if (options->advertise_refs || !stateless_rpc) {
- reset_timeout();
- head_ref_namespaced(send_ref, &symref);
- for_each_namespaced_ref(send_ref, &symref);
+ head_ref_namespaced(find_symref, &data.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);
+
+ /*
+ * An EOF at this exact point in negotiation should be
+ * acceptable from stateless clients as they will consume the
+ * shallow list before doing subsequent rpc with haves/etc.
+ */
+ if (data.stateless_rpc)
+ reader.options |= PACKET_READ_GENTLE_ON_EOF;
+
+ if (data.want_obj.nr &&
+ packet_reader_peek(&reader) != PACKET_READ_EOF) {
+ reader.options &= ~PACKET_READ_GENTLE_ON_EOF;
+ 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,
@@ -1249,19 +1458,18 @@
}
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))
@@ -1269,19 +1477,19 @@
/* 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")) {
@@ -1305,101 +1513,89 @@
continue;
}
- if (allow_filter && skip_prefix(arg, "filter ", &p)) {
- list_objects_filter_die_if_populated(&filter_options);
- 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 {
@@ -1431,8 +1627,7 @@
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 &&
@@ -1441,14 +1636,9 @@
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);
}
@@ -1460,27 +1650,25 @@
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.
@@ -1500,18 +1688,21 @@
}
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:
@@ -1520,8 +1711,6 @@
}
upload_pack_data_clear(&data);
- object_array_clear(&have_obj);
- object_array_clear(&want_obj);
return 0;
}
@@ -1532,6 +1721,7 @@
int allow_filter_value;
int allow_ref_in_want;
int allow_sideband_all_value;
+ char *str = NULL;
strbuf_addstr(value, "shallow");
@@ -1553,6 +1743,14 @@
&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/upload-pack.h b/upload-pack.h
index 4bafe16..27ddcdc 100644
--- a/upload-pack.h
+++ b/upload-pack.h
@@ -11,9 +11,9 @@
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/urlmatch.c b/urlmatch.c
index 29272a5..33a2ccd 100644
--- a/urlmatch.c
+++ b/urlmatch.c
@@ -572,10 +572,14 @@
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;
diff --git a/urlmatch.h b/urlmatch.h
index 2407520..6ff42f8 100644
--- a/urlmatch.h
+++ b/urlmatch.h
@@ -59,6 +59,11 @@
* 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/usage.c b/usage.c
index 58fb5ff..1b206de 100644
--- a/usage.c
+++ b/usage.c
@@ -81,6 +81,12 @@
static void warn_builtin(const char *warn, va_list params)
{
+ /*
+ * We call this trace2 function first and expect it to va_copy 'params'
+ * before using it (because an 'ap' can only be walked once).
+ */
+ trace2_cmd_error_va(warn, params);
+
vreportf("warning: ", warn, params);
}
@@ -108,33 +114,33 @@
/* If we are in a dlopen()ed .so write to a global variable would segfault
* (ugh), so keep things static. */
-static NORETURN_PTR void (*usage_routine)(const char *err, va_list params) = usage_builtin;
-static NORETURN_PTR void (*die_routine)(const char *err, va_list params) = die_builtin;
-static void (*error_routine)(const char *err, va_list params) = error_builtin;
-static void (*warn_routine)(const char *err, va_list params) = warn_builtin;
+static NORETURN_PTR report_fn usage_routine = usage_builtin;
+static NORETURN_PTR report_fn die_routine = die_builtin;
+static report_fn error_routine = error_builtin;
+static report_fn warn_routine = warn_builtin;
static int (*die_is_recursing)(void) = die_is_recursing_builtin;
-void set_die_routine(NORETURN_PTR void (*routine)(const char *err, va_list params))
+void set_die_routine(NORETURN_PTR report_fn routine)
{
die_routine = routine;
}
-void set_error_routine(void (*routine)(const char *err, va_list params))
+void set_error_routine(report_fn routine)
{
error_routine = routine;
}
-void (*get_error_routine(void))(const char *err, va_list params)
+report_fn get_error_routine(void)
{
return error_routine;
}
-void set_warn_routine(void (*routine)(const char *warn, va_list params))
+void set_warn_routine(report_fn routine)
{
warn_routine = routine;
}
-void (*get_warn_routine(void))(const char *warn, va_list params)
+report_fn get_warn_routine(void)
{
return warn_routine;
}
@@ -260,6 +266,10 @@
static NORETURN void BUG_vfl(const char *file, int line, const char *fmt, va_list params)
{
char prefix[256];
+ va_list params_copy;
+ static int in_bug;
+
+ va_copy(params_copy, params);
/* truncation via snprintf is OK here */
if (file)
@@ -268,6 +278,13 @@
snprintf(prefix, sizeof(prefix), "BUG: ");
vreportf(prefix, fmt, params);
+
+ if (in_bug)
+ abort();
+ in_bug = 1;
+
+ trace2_cmd_error_va(fmt, params_copy);
+
if (BUG_exit_code)
exit(BUG_exit_code);
abort();
diff --git a/userdiff.c b/userdiff.c
index efbe05e..3f81a22 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -23,6 +23,27 @@
"[a-zA-Z][a-zA-Z0-9_]*"
"|[-+]?[0-9][0-9#_.aAbBcCdDeEfF]*([eE][+-]?[0-9_]+)?"
"|=>|\\.\\.|\\*\\*|:=|/=|>=|<=|<<|>>|<>"),
+PATTERNS("bash",
+ /* Optional leading indentation */
+ "^[ \t]*"
+ /* Start of captured text */
+ "("
+ "("
+ /* POSIX identifier with mandatory parentheses */
+ "[a-zA-Z_][a-zA-Z0-9_]*[ \t]*\\([ \t]*\\))"
+ "|"
+ /* Bashism identifier with optional parentheses */
+ "(function[ \t]+[a-zA-Z_][a-zA-Z0-9_]*(([ \t]*\\([ \t]*\\))|([ \t]+))"
+ ")"
+ /* Optional whitespace */
+ "[ \t]*"
+ /* Compound command starting with `{`, `(`, `((` or `[[` */
+ "(\\{|\\(\\(?|\\[\\[)"
+ /* End of captured text */
+ ")",
+ /* -- */
+ /* Characters not in the default $IFS value */
+ "[^ \t]+"),
PATTERNS("dts",
"!;\n"
"!=\n"
@@ -46,10 +67,14 @@
/* 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])\\."
@@ -79,6 +104,9 @@
"|[-+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
@@ -140,7 +168,7 @@
"|=~|!~"
"|<<|<>|<=>|>>"),
PATTERNS("php",
- "^[\t ]*(((public|protected|private|static)[\t ]+)*function.*)$\n"
+ "^[\t ]*(((public|protected|private|static|abstract|final)[\t ]+)*function.*)$\n"
"^[\t ]*((((final|abstract)[\t ]+)?class|interface|trait).*)$",
/* -- */
"[a-zA-Z_][a-zA-Z0-9_]*"
@@ -158,7 +186,7 @@
"|[-+0-9.e]+|0[xXbB]?[0-9a-fA-F]+|\\?(\\\\C-)?(\\\\M-)?."
"|//=?|[-+*/<>%&^|=!]=|<<=?|>>=?|===|\\.{1,3}|::|[!=]~"),
PATTERNS("rust",
- "^[\t ]*((pub(\\([^\\)]+\\))?[\t ]+)?((async|const|unsafe|extern([\t ]+\"[^\"]+\"))[\t ]+)?(struct|enum|union|mod|trait|fn|impl)[< \t]+[^;]*)$",
+ "^[\t ]*((pub(\\([^\\)]+\\))?[\t ]+)?((async|const|unsafe|extern([\t ]+\"[^\"]+\"))[\t ]+)?(struct|enum|union|mod|trait|fn|impl|macro_rules!)[< \t]+[^;]*)$",
/* -- */
"[a-zA-Z_][a-zA-Z0-9_]*"
"|[0-9][0-9_a-fA-Fiosuxz]*(\\.([0-9]*[eE][+-]?)?[0-9_fF]*)?"
@@ -193,7 +221,7 @@
"|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->"),
IPATTERN("css",
"![:;][[:space:]]*$\n"
- "^[_a-z0-9].*$",
+ "^[:[@.#]?[_a-z0-9].*$",
/* -- */
/*
* This regex comes from W3C CSS specs. Should theoretically also
@@ -222,7 +250,7 @@
{ 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++) {
@@ -266,7 +294,7 @@
{
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/vcs-svn/LICENSE b/vcs-svn/LICENSE
deleted file mode 100644
index eb91858..0000000
--- a/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/vcs-svn/fast_export.c b/vcs-svn/fast_export.c
deleted file mode 100644
index b5b8913..0000000
--- a/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/vcs-svn/fast_export.h b/vcs-svn/fast_export.h
deleted file mode 100644
index 9dcf933..0000000
--- a/vcs-svn/fast_export.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef FAST_EXPORT_H
-#define FAST_EXPORT_H
-
-struct strbuf;
-struct line_buffer;
-
-void fast_export_init(int fd);
-void fast_export_deinit(void);
-
-void fast_export_delete(const char *path);
-void fast_export_modify(const char *path, uint32_t mode, const char *dataref);
-void fast_export_note(const char *committish, const char *dataref);
-void fast_export_begin_note(uint32_t revision, const char *author,
- const char *log, timestamp_t timestamp, const char *note_ref);
-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);
-void fast_export_end_commit(uint32_t revision);
-void fast_export_data(uint32_t mode, off_t len, struct line_buffer *input);
-void fast_export_buf_to_data(const struct strbuf *data);
-void fast_export_blob_delta(uint32_t mode,
- uint32_t old_mode, const char *old_data,
- off_t len, struct line_buffer *input);
-
-/* If there is no such file at that rev, returns -1, errno == ENOENT. */
-int fast_export_ls_rev(uint32_t rev, const char *path,
- uint32_t *mode_out, struct strbuf *dataref_out);
-int fast_export_ls(const char *path,
- uint32_t *mode_out, struct strbuf *dataref_out);
-
-void fast_export_copy(uint32_t revision, const char *src, const char *dst);
-const char *fast_export_read_path(const char *path, uint32_t *mode_out);
-
-#endif
diff --git a/vcs-svn/line_buffer.c b/vcs-svn/line_buffer.c
deleted file mode 100644
index e416caf..0000000
--- a/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/vcs-svn/line_buffer.h b/vcs-svn/line_buffer.h
deleted file mode 100644
index e192aed..0000000
--- a/vcs-svn/line_buffer.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef LINE_BUFFER_H
-#define LINE_BUFFER_H
-
-#include "strbuf.h"
-
-#define LINE_BUFFER_LEN 10000
-
-struct line_buffer {
- char line_buffer[LINE_BUFFER_LEN];
- FILE *infile;
-};
-#define LINE_BUFFER_INIT { "", NULL }
-
-int buffer_init(struct line_buffer *buf, const char *filename);
-int buffer_fdinit(struct line_buffer *buf, int fd);
-int buffer_deinit(struct line_buffer *buf);
-
-int buffer_tmpfile_init(struct line_buffer *buf);
-FILE *buffer_tmpfile_rewind(struct line_buffer *buf); /* prepare to write. */
-long buffer_tmpfile_prepare_to_read(struct line_buffer *buf);
-
-int buffer_ferror(struct line_buffer *buf);
-char *buffer_read_line(struct line_buffer *buf);
-int buffer_read_char(struct line_buffer *buf);
-size_t buffer_read_binary(struct line_buffer *buf, struct strbuf *sb, size_t len);
-/* Returns number of bytes read (not necessarily written). */
-off_t buffer_copy_bytes(struct line_buffer *buf, off_t len);
-off_t buffer_skip_bytes(struct line_buffer *buf, off_t len);
-
-#endif
diff --git a/vcs-svn/line_buffer.txt b/vcs-svn/line_buffer.txt
deleted file mode 100644
index 8e139eb..0000000
--- a/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/vcs-svn/sliding_window.c b/vcs-svn/sliding_window.c
deleted file mode 100644
index 06d273c..0000000
--- a/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/vcs-svn/sliding_window.h b/vcs-svn/sliding_window.h
deleted file mode 100644
index a7fc099..0000000
--- a/vcs-svn/sliding_window.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef SLIDING_WINDOW_H
-#define SLIDING_WINDOW_H
-
-#include "strbuf.h"
-
-struct sliding_view {
- struct line_buffer *file;
- off_t off;
- size_t width;
- off_t max_off; /* -1 means unlimited */
- struct strbuf buf;
-};
-
-#define SLIDING_VIEW_INIT(input, len) { (input), 0, 0, (len), STRBUF_INIT }
-
-int move_window(struct sliding_view *view, off_t off, size_t width);
-
-#endif
diff --git a/vcs-svn/svndiff.c b/vcs-svn/svndiff.c
deleted file mode 100644
index 75c7531..0000000
--- a/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/vcs-svn/svndiff.h b/vcs-svn/svndiff.h
deleted file mode 100644
index 625d950..0000000
--- a/vcs-svn/svndiff.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef SVNDIFF_H
-#define SVNDIFF_H
-
-struct line_buffer;
-struct sliding_view;
-
-int svndiff0_apply(struct line_buffer *delta, off_t delta_len,
- struct sliding_view *preimage, FILE *postimage);
-
-#endif
diff --git a/vcs-svn/svndump.c b/vcs-svn/svndump.c
deleted file mode 100644
index 08d136b..0000000
--- a/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/vcs-svn/svndump.h b/vcs-svn/svndump.h
deleted file mode 100644
index 26faed5..0000000
--- a/vcs-svn/svndump.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef SVNDUMP_H
-#define SVNDUMP_H
-
-int svndump_init(const char *filename);
-int svndump_init_fd(int in_fd, int back_fd);
-void svndump_read(const char *url, const char *local_ref, const char *notes_ref);
-void svndump_deinit(void);
-void svndump_reset(void);
-
-#endif
diff --git a/worktree.c b/worktree.c
index eba4fd3..f35ac40 100644
--- a/worktree.c
+++ b/worktree.c
@@ -15,13 +15,14 @@
free(worktrees[i]->id);
free(worktrees[i]->head_ref);
free(worktrees[i]->lock_reason);
+ free(worktrees[i]->prune_reason);
free(worktrees[i]);
}
free (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)
{
@@ -49,12 +50,10 @@
struct worktree *worktree = NULL;
struct strbuf worktree_path = STRBUF_INIT;
- strbuf_add_absolute_path(&worktree_path, get_git_common_dir());
- strbuf_strip_suffix(&worktree_path, "/.");
- if (!strbuf_strip_suffix(&worktree_path, "/.git"))
- strbuf_strip_suffix(&worktree_path, "/.");
+ strbuf_add_real_path(&worktree_path, get_git_common_dir());
+ strbuf_strip_suffix(&worktree_path, "/.git");
- worktree = xcalloc(1, sizeof(*worktree));
+ CALLOC_ARRAY(worktree, 1);
worktree->path = strbuf_detach(&worktree_path, NULL);
/*
* NEEDSWORK: If this function is called from a secondary worktree and
@@ -66,8 +65,6 @@
worktree->is_bare = (is_bare_repository_cfg == 1) ||
is_bare_repository();
add_head_info(worktree);
-
- strbuf_release(&worktree_path);
return worktree;
}
@@ -84,18 +81,10 @@
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_strip_suffix(&worktree_path, "/.git");
- strbuf_reset(&path);
- strbuf_addf(&path, "%s/worktrees/%s/HEAD", get_git_common_dir(), id);
-
- worktree = xcalloc(1, sizeof(*worktree));
+ CALLOC_ARRAY(worktree, 1);
worktree->path = strbuf_detach(&worktree_path, NULL);
worktree->id = xstrdup(id);
add_head_info(worktree);
@@ -123,14 +112,7 @@
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;
@@ -161,13 +143,6 @@
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;
}
@@ -226,17 +201,20 @@
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);
+ strbuf_release(&wt_path);
return *list;
}
@@ -247,7 +225,8 @@
const char *worktree_lock_reason(struct worktree *wt)
{
- assert(!is_main_worktree(wt));
+ if (is_main_worktree(wt))
+ return NULL;
if (!wt->lock_reason_valid) {
struct strbuf path = STRBUF_INIT;
@@ -268,6 +247,25 @@
return wt->lock_reason;
}
+const char *worktree_prune_reason(struct worktree *wt, timestamp_t expire)
+{
+ struct strbuf reason = STRBUF_INIT;
+ char *path = NULL;
+
+ if (is_main_worktree(wt))
+ return NULL;
+ if (wt->prune_reason_valid)
+ return wt->prune_reason;
+
+ if (should_prune_worktree(wt->id, &reason, &path, expire))
+ wt->prune_reason = strbuf_detach(&reason, NULL);
+ wt->prune_reason_valid = 1;
+
+ strbuf_release(&reason);
+ free(path);
+ return wt->prune_reason;
+}
+
/* convenient wrapper to deal with NULL strbuf */
static void strbuf_addf_gently(struct strbuf *buf, const char *fmt, ...)
{
@@ -285,6 +283,7 @@
unsigned flags)
{
struct strbuf wt_path = STRBUF_INIT;
+ struct strbuf realpath = STRBUF_INIT;
char *path = NULL;
int err, ret = -1;
@@ -336,7 +335,8 @@
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'"),
@@ -344,6 +344,7 @@
done:
free(path);
strbuf_release(&wt_path);
+ strbuf_release(&realpath);
return ret;
}
@@ -372,13 +373,12 @@
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;
}
@@ -386,15 +386,15 @@
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;
}
/*
@@ -412,7 +412,7 @@
if (worktrees)
free_worktrees(worktrees);
- worktrees = get_worktrees(0);
+ worktrees = get_worktrees();
for (i = 0; worktrees[i]; i++) {
struct worktree *wt = worktrees[i];
@@ -450,7 +450,7 @@
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;
@@ -464,18 +464,16 @@
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"));
@@ -559,21 +557,13 @@
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;
@@ -582,14 +572,261 @@
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;
+}
+
+/*
+ * If both the main worktree and linked worktree have been moved, then the
+ * gitfile /path/to/worktree/.git won't point into the repository, thus we
+ * won't know which <repo>/worktrees/<id>/gitdir to repair. However, we may
+ * be able to infer the gitdir by manually reading /path/to/worktree/.git,
+ * extracting the <id>, and checking if <repo>/worktrees/<id> exists.
+ */
+static char *infer_backlink(const char *gitfile)
+{
+ struct strbuf actual = STRBUF_INIT;
+ struct strbuf inferred = STRBUF_INIT;
+ const char *id;
+
+ if (strbuf_read_file(&actual, gitfile, 0) < 0)
+ goto error;
+ if (!starts_with(actual.buf, "gitdir:"))
+ goto error;
+ if (!(id = find_last_dir_sep(actual.buf)))
+ goto error;
+ strbuf_trim(&actual);
+ id++; /* advance past '/' to point at <id> */
+ if (!*id)
+ goto error;
+ strbuf_git_common_path(&inferred, the_repository, "worktrees/%s", id);
+ if (!is_directory(inferred.buf))
+ goto error;
+
+ strbuf_release(&actual);
+ return strbuf_detach(&inferred, NULL);
+
+error:
+ strbuf_release(&actual);
+ strbuf_release(&inferred);
+ return NULL;
+}
+
+/*
+ * 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 == READ_GITFILE_ERR_NOT_A_REPO) {
+ if (!(backlink = infer_backlink(realdotgit.buf))) {
+ fn(1, realdotgit.buf, _("unable to locate repository; .git file does not reference a repository"), 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);
+}
+
+int should_prune_worktree(const char *id, struct strbuf *reason, char **wtpath, timestamp_t expire)
+{
+ struct stat st;
+ char *path;
+ int fd;
+ size_t len;
+ ssize_t read_result;
+
+ *wtpath = NULL;
+ if (!is_directory(git_path("worktrees/%s", 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_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, _("unable to read gitdir file (%s)"),
+ strerror(errno));
+ return 1;
+ }
+ len = xsize_t(st.st_size);
+ path = xmallocz(len);
+
+ read_result = read_in_full(fd, path, len);
+ if (read_result < 0) {
+ strbuf_addf(reason, _("unable to read gitdir file (%s)"),
+ strerror(errno));
+ close(fd);
+ free(path);
+ return 1;
+ }
+ close(fd);
+
+ if (read_result != len) {
+ strbuf_addf(reason,
+ _("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_addstr(reason, _("invalid gitdir file"));
+ free(path);
+ return 1;
+ }
+ path[len] = '\0';
+ if (!file_exists(path)) {
+ if (stat(git_path("worktrees/%s/index", id), &st) ||
+ st.st_mtime <= expire) {
+ strbuf_addstr(reason, _("gitdir file points to non-existent location"));
+ free(path);
+ return 1;
+ } else {
+ *wtpath = path;
+ return 0;
+ }
+ }
+ *wtpath = path;
+ return 0;
+}
diff --git a/worktree.h b/worktree.h
index d242a6e..8b7c408 100644
--- a/worktree.h
+++ b/worktree.h
@@ -11,26 +11,23 @@
char *id;
char *head_ref; /* NULL if HEAD is broken or detached */
char *lock_reason; /* private - use worktree_lock_reason */
+ char *prune_reason; /* private - use worktree_prune_reason */
struct object_id head_oid;
int is_detached;
int is_bare;
int is_current;
int lock_reason_valid; /* private */
+ int prune_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.
@@ -78,6 +75,27 @@
*/
const char *worktree_lock_reason(struct worktree *wt);
+/*
+ * Return the reason string if the given worktree should be pruned, otherwise
+ * NULL if it should not be pruned. `expire` defines a grace period to prune
+ * the worktree when its path does not exist.
+ */
+const char *worktree_prune_reason(struct worktree *wt, timestamp_t expire);
+
+/*
+ * Return true if worktree entry should be pruned, along with the reason for
+ * pruning. Otherwise, return false and the worktree's path in `wtpath`, or
+ * NULL if it cannot be determined. Caller is responsible for freeing
+ * returned path.
+ *
+ * `expire` defines a grace period to prune the worktree when its path
+ * does not exist.
+ */
+int should_prune_worktree(const char *id,
+ struct strbuf *reason,
+ char **wtpath,
+ timestamp_t expire);
+
#define WT_VALIDATE_WORKTREE_MISSING_OK (1 << 0)
/*
@@ -94,6 +112,29 @@
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)
*/
@@ -141,11 +182,4 @@
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/wrapper.c b/wrapper.c
index e1eaef2..bcda41e 100644
--- a/wrapper.c
+++ b/wrapper.c
@@ -105,14 +105,25 @@
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)
die("Out of memory, realloc failed");
return ret;
@@ -218,7 +229,7 @@
{
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) {
@@ -240,7 +251,7 @@
{
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) {
diff --git a/wt-status.c b/wt-status.c
index cc6f945..1aed68c 100644
--- a/wt-status.c
+++ b/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 @@
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 @@
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 @@
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);
@@ -458,7 +456,7 @@
it = string_list_insert(&s->change, p->two->path);
d = it->util;
if (!d) {
- d = xcalloc(1, sizeof(*d));
+ CALLOC_ARRAY(d, 1);
it->util = d;
}
if (!d->worktree_status)
@@ -542,7 +540,7 @@
it = string_list_insert(&s->change, p->two->path);
d = it->util;
if (!d) {
- d = xcalloc(1, sizeof(*d));
+ CALLOC_ARRAY(d, 1);
it->util = d;
}
if (!d->index_status)
@@ -608,7 +606,9 @@
if (s->ignore_submodule_arg) {
rev.diffopt.flags.override_submodule_config = 1;
handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
- }
+ } else if (!rev.diffopt.flags.ignore_submodule_set &&
+ s->show_untracked_files != SHOW_NO_UNTRACKED_FILES)
+ handle_ignore_submodules_arg(&rev.diffopt, "none");
rev.diffopt.format_callback = wt_status_collect_changed_cb;
rev.diffopt.format_callback_data = s;
rev.diffopt.detect_rename = s->detect_rename >= 0 ? s->detect_rename : rev.diffopt.detect_rename;
@@ -671,7 +671,7 @@
it = string_list_insert(&s->change, ce->name);
d = it->util;
if (!d) {
- d = xcalloc(1, sizeof(*d));
+ CALLOC_ARRAY(d, 1);
it->util = d;
}
if (ce_stage(ce)) {
@@ -703,7 +703,7 @@
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 +722,17 @@
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 +778,14 @@
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 +914,16 @@
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 +971,7 @@
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 +1232,7 @@
* 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 +1282,7 @@
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);
@@ -1486,6 +1484,18 @@
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
*/
@@ -1564,10 +1574,10 @@
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;
@@ -1625,6 +1635,31 @@
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)
@@ -1638,13 +1673,13 @@
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);
@@ -1660,6 +1695,7 @@
}
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)
@@ -1683,6 +1719,9 @@
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)
@@ -1705,9 +1744,9 @@
} else if (s->state.detached_from) {
branch_name = s->state.detached_from;
if (s->state.detached_at)
- on_what = HEAD_DETACHED_AT;
+ on_what = _("HEAD detached at ");
else
- on_what = HEAD_DETACHED_FROM;
+ on_what = _("HEAD detached from ");
} else {
branch_name = "";
on_what = _("Not currently on any branch.");
@@ -1767,29 +1806,36 @@
; /* 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);
@@ -1812,12 +1858,12 @@
}
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);
}
}
@@ -1830,37 +1876,28 @@
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);
}
}
@@ -1869,13 +1906,13 @@
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);
}
}
@@ -1996,7 +2033,7 @@
* [# 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.
*
@@ -2190,9 +2227,9 @@
*/
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)
@@ -2278,7 +2315,7 @@
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,
@@ -2311,7 +2348,7 @@
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/wt-status.h b/wt-status.h
index 71c3f25..0d32799b 100644
--- a/wt-status.h
+++ b/wt-status.h
@@ -38,9 +38,22 @@
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;
@@ -64,8 +77,7 @@
STATUS_FORMAT_UNSPECIFIED
};
-#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 +89,7 @@
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;
@@ -136,7 +149,14 @@
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/xdiff/xdiff.h b/xdiff/xdiff.h
index 032e3a9..7a04605 100644
--- a/xdiff/xdiff.h
+++ b/xdiff/xdiff.h
@@ -79,6 +79,10 @@
typedef struct s_xpparam {
unsigned long flags;
+ /* -I<regex> */
+ regex_t **ignore_regex;
+ size_t ignore_regex_nr;
+
/* See Documentation/diff-options.txt. */
char **anchors;
size_t anchors_nr;
diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c
index bd03513..380eb72 100644
--- a/xdiff/xdiffi.c
+++ b/xdiff/xdiffi.c
@@ -998,7 +998,7 @@
return 0;
}
-static void xdl_mark_ignorable(xdchange_t *xscr, xdfenv_t *xe, long flags)
+static void xdl_mark_ignorable_lines(xdchange_t *xscr, xdfenv_t *xe, long flags)
{
xdchange_t *xch;
@@ -1019,6 +1019,46 @@
}
}
+static int record_matches_regex(xrecord_t *rec, xpparam_t const *xpp) {
+ regmatch_t regmatch;
+ int i;
+
+ for (i = 0; i < xpp->ignore_regex_nr; i++)
+ if (!regexec_buf(xpp->ignore_regex[i], rec->ptr, rec->size, 1,
+ ®match, 0))
+ return 1;
+
+ return 0;
+}
+
+static void xdl_mark_ignorable_regex(xdchange_t *xscr, const xdfenv_t *xe,
+ xpparam_t const *xpp)
+{
+ xdchange_t *xch;
+
+ for (xch = xscr; xch; xch = xch->next) {
+ xrecord_t **rec;
+ int ignore = 1;
+ long i;
+
+ /*
+ * Do not override --ignore-blank-lines.
+ */
+ if (xch->ignore)
+ continue;
+
+ rec = &xe->xdf1.recs[xch->i1];
+ for (i = 0; i < xch->chg1 && ignore; i++)
+ ignore = record_matches_regex(rec[i], xpp);
+
+ rec = &xe->xdf2.recs[xch->i2];
+ for (i = 0; i < xch->chg2 && ignore; i++)
+ ignore = record_matches_regex(rec[i], xpp);
+
+ xch->ignore = ignore;
+ }
+}
+
int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
xdemitconf_t const *xecfg, xdemitcb_t *ecb) {
xdchange_t *xscr;
@@ -1038,7 +1078,10 @@
}
if (xscr) {
if (xpp->flags & XDF_IGNORE_BLANK_LINES)
- xdl_mark_ignorable(xscr, &xe, xpp->flags);
+ xdl_mark_ignorable_lines(xscr, &xe, xpp->flags);
+
+ if (xpp->ignore_regex)
+ xdl_mark_ignorable_regex(xscr, &xe, xpp);
if (ef(&xe, xscr, ecb, xecfg) < 0) {
diff --git a/xdiff/xhistogram.c b/xdiff/xhistogram.c
index c7b35a9..e694bfd 100644
--- a/xdiff/xhistogram.c
+++ b/xdiff/xhistogram.c
@@ -235,6 +235,8 @@
int line1, int count1, int line2, int count2)
{
xpparam_t xpparam;
+
+ memset(&xpparam, 0, sizeof(xpparam));
xpparam.flags = xpp->flags & ~XDF_DIFF_ALGORITHM_MASK;
return xdl_fall_back_diff(env, &xpparam,
diff --git a/xdiff/xpatience.c b/xdiff/xpatience.c
index 3c5601b..20699a6 100644
--- a/xdiff/xpatience.c
+++ b/xdiff/xpatience.c
@@ -318,6 +318,8 @@
int line1, int count1, int line2, int count2)
{
xpparam_t xpp;
+
+ memset(&xpp, 0, sizeof(xpp));
xpp.flags = map->xpp->flags & ~XDF_DIFF_ALGORITHM_MASK;
return xdl_fall_back_diff(map->env, &xpp,
